Final batch of PAL maps (#977)

* arn

* dgb

* kzn

* flo

* sam

* pra

* omo

* end

* mgm

* gv

* Clean up floats

* Use MODEL_ constants

* Prefix scripts with EVS_

* Use ACTION_STATE_IDLE

* Find common base for Kammy/Jr. Troopa speed

* Rename TOADHOUSE_ANIM_TALK

* Add TODO

* Calculate FRAME_RATE

* Add calculation for PAL wait duration

include/enums.h

@@ -3044,6 +3044,29 @@ enum ShadingProfile {
     SHADING_MIM_09,
     SHADING_MIM_11,
     SHADING_MIM_12,
+    SHADING_ARN_09 = 0x00080000,
+    SHADING_ARN_10,
+    SHADING_ARN_11,
+    SHADING_ARN_12,
+    SHADING_ARN_13,
+    SHADING_DGB_06 = 0x00090000,
+    SHADING_KZN_01 = 0x000A0000,
+    SHADING_KZN_02,
+    SHADING_KZN_03,
+    SHADING_KZN_04,
+    SHADING_KZN_05,
+    SHADING_KZN_06,
+    SHADING_KZN_07,
+    SHADING_KZN_08,
+    SHADING_KZN_09,
+    SHADING_KZN_10,
+    SHADING_KZN_11,
+    SHADING_KZN_17,
+    SHADING_KZN_18,
+    SHADING_KZN_19,
+    SHADING_KZN_20,
+    SHADING_KZN_22,
+    SHADING_KZN_23,
 };
 #endif
 

src/world/area_arn/arn_03/arn_03_2_main.c

@@ -22,7 +22,11 @@ EvtScript N(EVS_EnterMap) = {
         EVT_CALL(InterpPlayerYaw, 90, 0)
         EVT_CALL(SetNpcPos, NPC_PARTNER, -175, 165, 160)
         EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0)
+#if VERSION_PAL
+        EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4 / DT))
+#else
         EVT_CALL(SetPlayerSpeed, 4)
+#endif
         EVT_CALL(PlayerMoveTo, -55, 160, 0)
         EVT_EXEC(N(EVS_BindExitTriggers))
         EVT_RETURN

src/world/area_arn/arn_03/arn_03_3_npc.c

@@ -38,37 +38,37 @@ EvtScript N(EVS_NpcInteract_Boo_01) = {
 
 EvtScript N(EVS_NpcIdle_Boo_01) = {
     EVT_CALL(DisablePlayerInput, TRUE)
-    EVT_WAIT(25)
+    EVT_WAIT(25 * DT)
     EVT_THREAD
-        EVT_WAIT(50)
+        EVT_WAIT(50 * DT)
         EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
         EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
         EVT_CALL(SetCamDistance, CAM_DEFAULT, 325)
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
         EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_END_THREAD
     EVT_THREAD
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_CALL(GetCurrentPartnerID, LVar6)
         EVT_IF_NE(LVar6, PARTNER_BOW)
             EVT_CALL(BringPartnerOut, PARTNER_BOW)
             EVT_CALL(DisablePartnerAI, 0)
             EVT_WAIT(1)
             EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_SELF, 0)
-            EVT_WAIT(5)
+            EVT_WAIT(5 * DT)
             EVT_CALL(SetNpcJumpscale, NPC_PARTNER, 0)
             EVT_IF_EQ(LVar6, PARTNER_PARAKARRY)
-                EVT_CALL(NpcJump0, NPC_PARTNER, -81, 176, 171, 20)
+                EVT_CALL(NpcJump0, NPC_PARTNER, -81, 176, 171, 20 * DT)
             EVT_ELSE
-                EVT_CALL(NpcJump0, NPC_PARTNER, -81, 186, 171, 20)
+                EVT_CALL(NpcJump0, NPC_PARTNER, -81, 186, 171, 20 * DT)
             EVT_END_IF
             EVT_CALL(EnablePartnerAI)
         EVT_END_IF
     EVT_END_THREAD
     EVT_CALL(SetNpcJumpscale, NPC_SELF, 0)
-    EVT_CALL(NpcJump0, NPC_SELF, -8, 186, 159, 60)
+    EVT_CALL(NpcJump0, NPC_SELF, -8, 186, 159, 60 * DT)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_CALL(DisablePartnerAI, 0)
     EVT_CALL(InterpNpcYaw, NPC_SELF, -4, 0)
     EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 5, MSG_CH3_006E)
@@ -79,22 +79,26 @@ EvtScript N(EVS_NpcIdle_Boo_01) = {
     EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBow_Talk, ANIM_WorldBow_Idle, 5, MSG_CH3_0071)
     EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 5, MSG_CH3_0072)
     EVT_CALL(EnablePartnerAI)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(GetCurrentPartnerID, LVar6)
     EVT_IF_NE(LVar6, PARTNER_BOW)
         EVT_CALL(PutPartnerAway)
     EVT_END_IF
     EVT_THREAD
-        EVT_CALL(NpcMoveTo, NPC_SELF, 30, 125, 30)
+        EVT_CALL(NpcMoveTo, NPC_SELF, 30, 125, 30 * DT)
         EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0)
     EVT_END_THREAD
     EVT_CALL(func_802CF56C, 2)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_SET(GB_StoryProgress, STORY_CH3_ARRIVED_AT_GHOST_TOWN)
     EVT_CALL(DisablePlayerInput, FALSE)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
+#if VERSION_PAL
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3 / DT))
+#else
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, 3)
+#endif
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
@@ -153,7 +157,7 @@ EvtScript N(EVS_NpcInteract_Boo_02) = {
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0, MSG_CH3_007F)
             EVT_CALL(EndSpeech, NPC_SELF, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0)
             EVT_SET(MV_Unk_00, 0)
-            EVT_SET(MV_Unk_01, 450)
+            EVT_SET(MV_Unk_01, 450 * DT)
             EVT_SET(GF_ARN03_WaitingForPackage, TRUE)
             EVT_THREAD
                 EVT_LOOP(0)

src/world/area_arn/arn_05/arn_05_3_npc.c

@@ -329,7 +329,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
     EVT_CALL(NpcFacePlayer, NPC_Boo_03, 1)
     EVT_CALL(PlaySoundAtNpc, NPC_Boo_03, SOUND_262, SOUND_SPACE_MODE_0)
     EVT_CALL(ShowEmote, NPC_Boo_03, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(GetNpcPos, NPC_Boo_03, LVar0, LVar1, LVar2)
     EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5)
     EVT_SUB(LVar0, LVar3)
@@ -342,7 +342,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
     EVT_SUB(LVar5, LVar2)
     EVT_CALL(NpcMoveTo, NPC_Boo_03, LVar3, LVar5, 30)
     EVT_CALL(SetCamType, CAM_DEFAULT, 6, TRUE)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0 / DT))
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
@@ -362,14 +362,14 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
     EVT_CALL(ShowEmote, NPC_Boo_05, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0)
     EVT_CALL(FadeOutMusic, 0, 500)
     EVT_CALL(ClearAmbientSounds, 250)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(InterpNpcYaw, NPC_Boo_03, 90, 1)
     EVT_CALL(InterpNpcYaw, NPC_Boo_05, 90, 1)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(PlaySound, SOUND_BOO_APPEAR)
     EVT_SETF(LVar0, EVT_FLOAT(240.0))
-    EVT_LOOP(20)
+    EVT_LOOP(20 * DT)
-        EVT_SUBF(LVar0, EVT_FLOAT(12.0))
+        EVT_SUBF(LVar0, EVT_FLOAT(240.0 / (s32) (20 * DT)))
         EVT_CALL(func_802CFD30, NPC_Boo_01, FOLD_TYPE_7, LVar0, 0, 0, 0)
         EVT_CALL(func_802CFD30, NPC_Boo_02, FOLD_TYPE_7, LVar0, 0, 0, 0)
         EVT_CALL(func_802CFD30, NPC_Boo_05, FOLD_TYPE_7, LVar0, 0, 0, 0)
@@ -383,8 +383,8 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
     EVT_CALL(EnableNpcShadow, NPC_Boo_05, FALSE)
     EVT_CALL(PlaySound, SOUND_BOO_VANISH)
     EVT_SETF(LVar0, EVT_FLOAT(0.0))
-    EVT_LOOP(20)
+    EVT_LOOP(20 * DT)
-        EVT_ADDF(LVar0, EVT_FLOAT(12.0))
+        EVT_ADDF(LVar0, EVT_FLOAT(240.0 / (s32) (20 * DT)))
         EVT_CALL(func_802CFD30, NPC_Boo_01, FOLD_TYPE_7, LVar0, 0, 0, 0)
         EVT_CALL(func_802CFD30, NPC_Boo_02, FOLD_TYPE_7, LVar0, 0, 0, 0)
         EVT_WAIT(1)
@@ -398,7 +398,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
             EVT_CALL(ShowMessageAtScreenPos, MSG_CH3_00A2, 160, 40)
             EVT_SET(MV_Unk_00, 1)
         EVT_END_THREAD
-        EVT_WAIT(50)
+        EVT_WAIT(50 * DT)
         EVT_CALL(DisablePartnerAI, 0)
         EVT_CALL(SetNpcYaw, NPC_PARTNER, 90)
         EVT_CALL(EnablePartnerAI)
@@ -413,11 +413,11 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
     EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBow_Talk, ANIM_WorldBow_Idle, 0, MSG_CH3_00A3)
     EVT_CALL(EnablePartnerAI)
     EVT_CALL(InterpPlayerYaw, 90, 0)
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_CALL(N(AwaitCDownPress))
     EVT_CALL(CloseMessage)
     EVT_CALL(ForceUsePartner)
-    EVT_WAIT(60)
+    EVT_WAIT(60 * DT)
     EVT_CALL(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 1, 8)
     EVT_CALL(SetCamType, CAM_DEFAULT, 6, TRUE)
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
@@ -430,7 +430,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(SetNpcFlagBits, NPC_Tubba, NPC_FLAG_GRAVITY, TRUE)
-    EVT_CALL(SetNpcSpeed, NPC_Tubba, EVT_FLOAT(2.5))
+    EVT_CALL(SetNpcSpeed, NPC_Tubba, EVT_FLOAT(2.5 / DT))
     EVT_CALL(SetNpcPos, NPC_Tubba, 675, 200, 180)
     EVT_CALL(NpcFaceNpc, NPC_Boo_01, NPC_Tubba, 1)
     EVT_CALL(NpcFaceNpc, NPC_Boo_02, NPC_Tubba, 1)
@@ -441,24 +441,24 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
     EVT_CALL(ShowEmote, NPC_Boo_02, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0)
     EVT_THREAD
         EVT_CALL(PlaySound, SOUND_BOO_APPEAR)
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_SETF(LVar0, EVT_FLOAT(240.0))
-        EVT_LOOP(20)
+        EVT_LOOP(20 * DT)
-            EVT_SUBF(LVar0, EVT_FLOAT(12.0))
+            EVT_SUBF(LVar0, EVT_FLOAT(240.0 / (s32) (20 * DT)))
             EVT_CALL(func_802CFD30, NPC_Boo_01, FOLD_TYPE_7, LVar0, 0, 0, 0)
             EVT_CALL(func_802CFD30, NPC_Boo_02, FOLD_TYPE_7, LVar0, 0, 0, 0)
             EVT_WAIT(1)
         EVT_END_LOOP
         EVT_CALL(SetNpcPos, NPC_Boo_01, NPC_DISPOSE_LOCATION)
         EVT_CALL(SetNpcPos, NPC_Boo_02, NPC_DISPOSE_LOCATION)
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
     EVT_END_THREAD
     EVT_SET(LVar0, 4)
     EVT_EXEC(N(EVS_TubbaWalking))
     EVT_CALL(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim09)
     EVT_CALL(NpcMoveTo, NPC_Tubba, 550, 196, 0)
     EVT_CALL(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim06)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.5))
     EVT_CALL(SetCamDistance, CAM_DEFAULT, 375)
     EVT_CALL(SetCamPosA, CAM_DEFAULT, -40, 206)
@@ -466,7 +466,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
     EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, 0)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, 426, 190, 194)
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_SET(MV_Unk_01, 0)
     EVT_THREAD
         EVT_SET(LVar0, 7)
@@ -488,7 +488,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(SpeakToPlayer, NPC_Boo_03, ANIM_Boo_Tan_Flail, ANIM_Boo_Tan_Flail, 0, MSG_CH3_00A4)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_LOOP(0)
         EVT_WAIT(1)
         EVT_IF_EQ(MV_Unk_01, 1)
@@ -496,19 +496,19 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
         EVT_END_IF
     EVT_END_LOOP
     EVT_CALL(NpcFaceNpc, NPC_Boo_03, NPC_Tubba, 1)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Boo_03, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 5, MSG_CH3_00A5)
     EVT_CALL(SetNpcAnimation, NPC_Boo_03, ANIM_Boo_Tan_Cower)
     EVT_CALL(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim1E)
     EVT_CALL(SetNpcJumpscale, NPC_Boo_03, EVT_FLOAT(0.0))
-    EVT_CALL(NpcJump1, NPC_Boo_03, 265, 206, 212, 3)
+    EVT_CALL(NpcJump1, NPC_Boo_03, 265, 206, 212, 3 * DT)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Tubba, ANIM_WorldTubba_Anim1E, ANIM_WorldTubba_Anim1E, 5, MSG_CH3_00A6)
     EVT_CALL(SetNpcPos, NPC_Boo_03, 303, 237, 228)
     EVT_CALL(SetNpcAnimation, NPC_Boo_03, ANIM_Boo_Tan_Flail)
     EVT_CALL(EnableNpcShadow, NPC_Boo_03, FALSE)
     EVT_CALL(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim1F)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0 / DT))
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-17.0))
     EVT_CALL(SetCamDistance, CAM_DEFAULT, 250)
     EVT_CALL(SetCamPosA, CAM_DEFAULT, -40, 206)
@@ -517,13 +517,13 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
     EVT_CALL(SetPanTarget, CAM_DEFAULT, 280, 169, 206)
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_THREAD
-        EVT_WAIT(50)
+        EVT_WAIT(50 * DT)
         EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_315, SOUND_SPACE_MODE_0)
     EVT_END_THREAD
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_CALL(SetNpcPos, NPC_Boo_03, NPC_DISPOSE_LOCATION)
     EVT_CALL(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim20)
-    EVT_WAIT(80)
+    EVT_WAIT(80 * DT)
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.5))
     EVT_CALL(SetCamDistance, CAM_DEFAULT, 375)
@@ -534,7 +534,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim06)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Tubba, ANIM_WorldTubba_Anim21, ANIM_WorldTubba_Anim06, 5, MSG_CH3_00A7)
     EVT_CALL(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim21)
     EVT_CALL(GetNpcPos, NPC_Tubba, LVar0, LVar1, LVar2)
@@ -542,10 +542,10 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
     EVT_ADD(LVar1, 50)
     EVT_ADD(LVar2, 10)
     EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar0, LVar1, LVar2, 10)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim06)
     EVT_CALL(InterpNpcYaw, NPC_Tubba, 90, 1)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_SET(LVar0, 7)
     EVT_EXEC(N(EVS_TubbaWalking))
     EVT_CALL(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim09)
@@ -563,8 +563,8 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
     EVT_CALL(EnableNpcShadow, NPC_Boo_05, TRUE)
     EVT_CALL(PlaySound, SOUND_BOO_VANISH)
     EVT_SETF(LVar0, EVT_FLOAT(0.0))
-    EVT_LOOP(20)
+    EVT_LOOP(20 * DT)
-        EVT_ADDF(LVar0, EVT_FLOAT(12.5))
+        EVT_ADDF(LVar0, EVT_FLOAT(250.0 / (s32) (20 * DT)))
         EVT_CALL(func_802CFD30, NPC_Boo_01, FOLD_TYPE_7, LVar0, 0, 0, 0)
         EVT_CALL(func_802CFD30, NPC_Boo_02, FOLD_TYPE_7, LVar0, 0, 0, 0)
         EVT_CALL(func_802CFD30, NPC_Boo_05, FOLD_TYPE_7, LVar0, 0, 0, 0)
@@ -573,9 +573,9 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
     EVT_CALL(func_802CFD30, NPC_Boo_01, FOLD_TYPE_NONE, 0, 0, 0, 0)
     EVT_CALL(func_802CFD30, NPC_Boo_02, FOLD_TYPE_NONE, 0, 0, 0, 0)
     EVT_CALL(func_802CFD30, NPC_Boo_05, FOLD_TYPE_NONE, 0, 0, 0, 0)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT))
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)

src/world/area_arn/arn_07/arn_07_2_main.c

@@ -155,19 +155,19 @@ EvtScript N(EVS_Scene_TubbaReunion) = {
     EVT_CALL(RotateModel, MODEL_o39, 80, 0, -1, 0)
     EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0)
     EVT_CALL(SetNpcJumpscale, NPC_TubbasHeart, EVT_FLOAT(2.5))
-    EVT_CALL(NpcJump0, NPC_TubbasHeart, 0, 20, -120, 8)
+    EVT_CALL(NpcJump0, NPC_TubbasHeart, 0, 20, -120, 8 * DT)
     EVT_WAIT(1)
     EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0)
-    EVT_CALL(NpcJump0, NPC_TubbasHeart, 0, 10, -60, 12)
+    EVT_CALL(NpcJump0, NPC_TubbasHeart, 0, 10, -60, 12 * DT)
     EVT_WAIT(1)
     EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0)
-    EVT_CALL(NpcJump0, NPC_TubbasHeart, 0, 0, 0, 12)
+    EVT_CALL(NpcJump0, NPC_TubbasHeart, 0, 0, 0, 12 * DT)
     EVT_WAIT(1)
     EVT_CALL(SetNpcVar, NPC_TubbasHeart, 0, 0)
     EVT_THREAD
         EVT_LOOP(0)
             EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0)
-            EVT_CALL(NpcJump0, NPC_TubbasHeart, 0, 0, 0, 10)
+            EVT_CALL(NpcJump0, NPC_TubbasHeart, 0, 0, 0, 10 * DT)
             EVT_WAIT(1)
             EVT_CALL(GetNpcVar, NPC_TubbasHeart, 0, LVar0)
             EVT_IF_EQ(LVar0, 1)
@@ -205,7 +205,7 @@ EvtScript N(EVS_Scene_TubbaReunion) = {
     EVT_CALL(NpcJump0, NPC_TubbasHeart, 150, 0, 20, 12)
     EVT_WAIT(1)
     EVT_THREAD
-        EVT_WAIT(4)
+        EVT_WAIT(4 * DT)
         EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
         EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(2.0), EVT_FLOAT(-9.0))
         EVT_CALL(SetCamDistance, CAM_DEFAULT, 700)
@@ -222,10 +222,10 @@ EvtScript N(EVS_Scene_TubbaReunion) = {
     EVT_CALL(EnableNpcShadow, NPC_TubbasHeart, FALSE)
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim23)
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim06)
     EVT_END_THREAD
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_THREAD
         EVT_CALL(PlaySoundAtCollider, COLLIDER_tt3, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0)
         EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR)
@@ -239,7 +239,7 @@ EvtScript N(EVS_Scene_TubbaReunion) = {
         EVT_END_LOOP
     EVT_END_THREAD
     EVT_THREAD
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 236, 0, -46)
         EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
         EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(8.0), EVT_FLOAT(-9.0))
@@ -251,7 +251,7 @@ EvtScript N(EVS_Scene_TubbaReunion) = {
     EVT_CALL(SetPlayerPos, 0, 20, -195)
     EVT_CALL(SetNpcPos, NPC_PARTNER, 0, 20, -195)
     EVT_CALL(EnablePartnerAI)
-    EVT_CALL(PlayerMoveTo, 0, 0, 45)
+    EVT_CALL(PlayerMoveTo, 0, 0, 45 * DT)
     EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_tt3, COLLIDER_FLAGS_UPPER_MASK)
     EVT_THREAD
         EVT_CALL(MakeLerp, 80, 0, 10, EASING_LINEAR)
@@ -265,11 +265,11 @@ EvtScript N(EVS_Scene_TubbaReunion) = {
         EVT_END_LOOP
         EVT_CALL(PlaySoundAtCollider, COLLIDER_tt3, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0)
     EVT_END_THREAD
-    EVT_CALL(PlayerMoveTo, 200, 0, 35)
+    EVT_CALL(PlayerMoveTo, 200, 0, 35 * DT)
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Tubba, ANIM_WorldTubba_Anim10, ANIM_WorldTubba_Anim06, 0, MSG_CH3_00C8)
     EVT_CALL(SetNpcVar, NPC_Tubba, 0, 1)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(DisablePlayerInput, FALSE)
     EVT_RETURN
     EVT_END

src/world/area_arn/arn_07/arn_07_5_npc.c

@@ -33,11 +33,11 @@ EvtScript N(EVS_Scene_TubbaRelents) = {
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim08)
     EVT_CALL(SetNpcYaw, NPC_SELF, 90)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldTubba_Anim12, ANIM_WorldTubba_Anim08, 5, MSG_CH3_00CA)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldTubba_Anim12, ANIM_WorldTubba_Anim08, 5, MSG_CH3_00CB)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, 300)
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0))
@@ -50,53 +50,53 @@ EvtScript N(EVS_Scene_TubbaRelents) = {
 };
 
 EvtScript N(EVS_Scene_BossDefeated) = {
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim22)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_LOOP(4)
         EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, SOUND_SPACE_MODE_0)
         EVT_CALL(SetNpcVar, NPC_Boo_02, 0, 1)
-        EVT_WAIT(4)
+        EVT_WAIT(4 * DT)
         EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, SOUND_SPACE_MODE_0)
         EVT_CALL(SetNpcVar, NPC_Boo_05, 0, 1)
-        EVT_WAIT(4)
+        EVT_WAIT(4 * DT)
         EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, SOUND_SPACE_MODE_0)
         EVT_CALL(SetNpcVar, NPC_Boo_01, 0, 1)
-        EVT_WAIT(6)
+        EVT_WAIT(6 * DT)
         EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, SOUND_SPACE_MODE_0)
         EVT_CALL(SetNpcVar, NPC_Boo_03, 0, 1)
-        EVT_WAIT(8)
+        EVT_WAIT(8 * DT)
         EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, SOUND_SPACE_MODE_0)
         EVT_CALL(SetNpcVar, NPC_Boo_04, 0, 1)
-        EVT_WAIT(6)
+        EVT_WAIT(6 * DT)
         EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, SOUND_SPACE_MODE_0)
         EVT_CALL(SetNpcVar, NPC_Boo_06, 0, 1)
-        EVT_WAIT(6)
+        EVT_WAIT(6 * DT)
     EVT_END_LOOP
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim23)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim22)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, SOUND_SPACE_MODE_0)
     EVT_CALL(SetNpcVar, NPC_Boo_02, 0, 1)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim21)
-    EVT_WAIT(45)
+    EVT_WAIT(45 * DT)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 236, 0, -46)
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
     EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
     EVT_SUB(LVar0, 50)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim0F)
     EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldTubba_Anim12, ANIM_WorldTubba_Anim08, 0, MSG_CH3_00CC)
     EVT_THREAD
-        EVT_WAIT(5)
+        EVT_WAIT(5 * DT)
         EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
-        EVT_LOOP(40)
+        EVT_LOOP(40 * DT)
             EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
             EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
             EVT_WAIT(1)
@@ -104,14 +104,14 @@ EvtScript N(EVS_Scene_BossDefeated) = {
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(func_802CF56C, 2)
-        EVT_LOOP(45)
+        EVT_LOOP(45 * DT)
             EVT_CALL(PlayerFaceNpc, NPC_SELF, TRUE)
         EVT_END_LOOP
     EVT_END_THREAD
     EVT_EXEC_GET_TID(N(EVS_TubbaWalking), LVarA)
     EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
     EVT_SUB(LVar0, 800)
-    EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar2, 80)
+    EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar2, 80 * DT)
     EVT_KILL_THREAD(LVarA)
     EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION)
     EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE)
@@ -129,13 +129,13 @@ EvtScript N(EVS_Scene_BossDefeated) = {
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, 30)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_IF_NE(LVar6, PARTNER_BOW)
         EVT_SET(LVar5, 8)
         EVT_CALL(SetNpcPos, NPC_Bow, 257, 25, 0)
         EVT_CALL(func_802CFD30, NPC_Bow, FOLD_TYPE_7, 0, 0, 0, 0)
         EVT_CALL(NpcFacePlayer, NPC_Bow, 0)
-        EVT_CALL(MakeLerp, 0, 240, 20, EASING_LINEAR)
+        EVT_CALL(MakeLerp, 0, 240, 20 * DT, EASING_LINEAR)
         EVT_LOOP(0)
             EVT_CALL(UpdateLerp)
             EVT_CALL(func_802CFD30, NPC_Bow, FOLD_TYPE_7, LVar0, 0, 0, 0)
@@ -146,23 +146,23 @@ EvtScript N(EVS_Scene_BossDefeated) = {
         EVT_END_LOOP
         EVT_CALL(func_802CF56C, 0)
     EVT_END_IF
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_THREAD
         EVT_IF_NE(LVar6, PARTNER_BOW)
             EVT_CALL(DisablePartnerAI, 0)
             EVT_WAIT(1)
             EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Bow, 0)
-            EVT_WAIT(5)
+            EVT_WAIT(5 * DT)
         EVT_END_IF
     EVT_END_THREAD
     EVT_CALL(SpeakToPlayer, LVar5, ANIM_WorldBow_Celebrate, ANIM_WorldBow_Celebrate, 0, MSG_CH3_00CD)
     EVT_CALL(InterpPlayerYaw, 270, 0)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(GetNpcPos, LVar5, LVar0, LVar1, LVar2)
     EVT_ADD(LVar1, -20)
     EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(2.0), LVar0, LVar1, LVar2, EVT_FLOAT(300.0), EVT_FLOAT(15.0), EVT_FLOAT(-7.0))
     EVT_CALL(PlayerFaceNpc, LVar5, FALSE)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, LVar5, ANIM_WorldBow_Talk, ANIM_WorldBow_Idle, 0, MSG_CH3_00CE)
     EVT_CALL(ShowChoice, MSG_Choice_000D)
     EVT_IF_EQ(LVar0, 0)
@@ -172,22 +172,22 @@ EvtScript N(EVS_Scene_BossDefeated) = {
     EVT_END_IF
     EVT_CALL(SpeakToPlayer, LVar5, ANIM_WorldBow_Talk, ANIM_WorldBow_Idle, 0, MSG_CH3_00D1)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 175, 0, 0)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
     EVT_CALL(SetPanTarget, CAM_DEFAULT, 175, 0, 0)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(SetNpcPos, NPC_Bootler, 93, 160, -6)
     EVT_CALL(InterpNpcYaw, NPC_Bootler, 90, 0)
     EVT_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(InterpPlayerYaw, 270, 0)
     EVT_END_THREAD
     EVT_THREAD
         EVT_IF_NE(LVar6, PARTNER_BOW)
-            EVT_WAIT(12)
+            EVT_WAIT(12 * DT)
             EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0)
         EVT_END_IF
     EVT_END_THREAD
-    EVT_CALL(MakeLerp, 160, 31, 70, EASING_LINEAR)
+    EVT_CALL(MakeLerp, 160, 31, 70 * DT, EASING_LINEAR)
     EVT_LOOP(0)
         EVT_CALL(UpdateLerp)
         EVT_CALL(SetNpcPos, NPC_Bootler, 93, LVar0, -6)
@@ -204,17 +204,17 @@ EvtScript N(EVS_Scene_BossDefeated) = {
     EVT_CALL(SpeakToPlayer, LVar5, ANIM_WorldBow_Talk, ANIM_WorldBow_Idle, 0, MSG_CH3_00D2)
     EVT_THREAD
         EVT_IF_NE(LVar6, PARTNER_BOW)
-            EVT_WAIT(12)
+            EVT_WAIT(12 * DT)
             EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0)
         EVT_END_IF
     EVT_END_THREAD
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(InterpPlayerYaw, 270, 0)
     EVT_EXEC(N(EVS_SpawnStarCard))
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_THREAD
         EVT_IF_NE(LVar6, 9)
-            EVT_CALL(MakeLerp, 240, 0, 20, EASING_LINEAR)
+            EVT_CALL(MakeLerp, 240, 0, 20 * DT, EASING_LINEAR)
             EVT_LOOP(0)
                 EVT_CALL(UpdateLerp)
                 EVT_CALL(func_802CFD30, NPC_Bow, FOLD_TYPE_7, LVar0, 0, 0, 0)
@@ -226,14 +226,14 @@ EvtScript N(EVS_Scene_BossDefeated) = {
             EVT_CALL(SetNpcPos, NPC_Bow, NPC_DISPOSE_LOCATION)
             EVT_CALL(EnablePartnerAI)
         EVT_ELSE
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_CALL(ClearPartnerMoveHistory, NPC_PARTNER)
             EVT_CALL(EnablePartnerAI)
         EVT_END_IF
-        EVT_WAIT(8)
+        EVT_WAIT(8 * DT)
         EVT_CALL(func_802CF56C, 2)
     EVT_END_THREAD
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(DisablePlayerInput, FALSE)
     EVT_RETURN
     EVT_END
@@ -263,7 +263,7 @@ EvtScript N(EVS_NpcIdle_Boo) = {
     EVT_END_LOOP
     EVT_THREAD
         EVT_SETF(LVar0, EVT_FLOAT(0.5))
-        EVT_CALL(MakeLerp, 50, 80, 15, EASING_LINEAR)
+        EVT_CALL(MakeLerp, 50, 80, 15 * DT, EASING_LINEAR)
         EVT_LOOP(0)
             EVT_CALL(UpdateLerp)
             EVT_SETF(LVar2, LVar0)
@@ -278,7 +278,7 @@ EvtScript N(EVS_NpcIdle_Boo) = {
     EVT_THREAD
         EVT_CALL(RandInt, 80, LVar2)
         EVT_CALL(RandInt, 10, LVar3)
-        EVT_ADD(LVar3, 5)
+        EVT_ADD(LVar3, 5 * DT)
         EVT_CALL(MakeLerp, LVar2, 240, LVar3, EASING_LINEAR)
         EVT_LOOP(0)
             EVT_CALL(UpdateLerp)
@@ -296,7 +296,7 @@ EvtScript N(EVS_NpcIdle_Boo) = {
     EVT_CALL(RandInt, 100, LVar3)
     EVT_SUB(LVar0, LVar3)
     EVT_ADD(LVar1, 100)
-    EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 20)
+    EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 20 * DT)
     EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION)
     EVT_CALL(SetSelfVar, 0, 0)
     EVT_GOTO(10)
@@ -431,14 +431,14 @@ EvtScript N(EVS_Scene_SkolarRescued) = {
     EVT_WAIT(1)
     EVT_CALL(WaitForPlayerInputEnabled)
     EVT_CALL(DisablePlayerInput, TRUE)
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Skolar, ANIM_WorldSkolar_TalkAngry, ANIM_WorldSkolar_Idle, 512, MSG_CH3_00D3)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0))
     EVT_CALL(SetCamPitch, CAM_DEFAULT, 18, -9)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_CALL(MakeLerp, 0, 360, 10, EASING_LINEAR)
+    EVT_CALL(MakeLerp, 0, 360, 10 * DT, EASING_LINEAR)
     EVT_LOOP(0)
         EVT_CALL(UpdateLerp)
         EVT_CALL(SetNpcRotation, NPC_Skolar, 0, LVar0, 0)
@@ -449,7 +449,7 @@ EvtScript N(EVS_Scene_SkolarRescued) = {
     EVT_END_LOOP
     EVT_CALL(EnableNpcAI, NPC_Skolar, FALSE)
     EVT_CALL(SetNpcAnimation, NPC_Skolar, ANIM_WorldSkolar_Leap)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower)
     EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
@@ -459,51 +459,51 @@ EvtScript N(EVS_Scene_SkolarRescued) = {
     EVT_ADD(LVar3, 30)
     EVT_LOOP(5)
         EVT_PLAY_EFFECT(EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 20)
-        EVT_WAIT(6)
+        EVT_WAIT(6 * DT)
         EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar0, LVar3, LVar2, 20)
-        EVT_WAIT(6)
+        EVT_WAIT(6 * DT)
     EVT_END_LOOP
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(PlaySoundAtPlayer, SOUND_188, SOUND_SPACE_MODE_0)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_ADD(LVar1, 20)
     EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
     EVT_CALL(SetNpcAnimation, NPC_Skolar, ANIM_WorldSkolar_Idle)
     EVT_CALL(EnableNpcAI, NPC_Skolar, TRUE)
     EVT_CALL(N(UpgradeStarPowerCh3))
     EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0193, 160, 40)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(GetNpcPos, NPC_Skolar, LVar0, LVar1, LVar2)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Skolar, ANIM_WorldSkolar_TalkAngry, ANIM_WorldSkolar_Idle, 512, MSG_CH3_00D4)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, -25)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Skolar, ANIM_WorldSkolar_TalkAngry, ANIM_WorldSkolar_Idle, 512, MSG_CH3_00D5)
     EVT_CALL(SetNpcFlagBits, NPC_Skolar, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE)
     EVT_THREAD
         EVT_LOOP(25)
             EVT_CALL(GetNpcPos, NPC_Skolar, LVar0, LVar1, LVar2)
             EVT_PLAY_EFFECT(EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 20)
-            EVT_WAIT(4)
+            EVT_WAIT(4 * DT)
         EVT_END_LOOP
     EVT_END_THREAD
     EVT_THREAD
         EVT_SET(LVar2, 0)
         EVT_SET(LVar3, 1800)
-        EVT_CALL(MakeLerp, LVar2, LVar3, 100, EASING_CUBIC_IN)
+        EVT_CALL(MakeLerp, LVar2, LVar3, 100 * DT, EASING_CUBIC_IN)
         EVT_LOOP(0)
             EVT_CALL(UpdateLerp)
             EVT_CALL(SetNpcRotation, NPC_Skolar, 0, LVar0, 0)
@@ -517,7 +517,7 @@ EvtScript N(EVS_Scene_SkolarRescued) = {
         EVT_CALL(GetNpcPos, NPC_Skolar, LVar2, LVar3, LVar4)
         EVT_SET(LVar5, LVar3)
         EVT_ADD(LVar5, 180)
-        EVT_CALL(MakeLerp, LVar3, LVar5, 100, EASING_CUBIC_IN)
+        EVT_CALL(MakeLerp, LVar3, LVar5, 100 * DT, EASING_CUBIC_IN)
         EVT_LOOP(0)
             EVT_CALL(UpdateLerp)
             EVT_CALL(SetNpcPos, NPC_Skolar, LVar2, LVar0, LVar4)
@@ -529,14 +529,14 @@ EvtScript N(EVS_Scene_SkolarRescued) = {
         EVT_CALL(SetNpcPos, NPC_Skolar, NPC_DISPOSE_LOCATION)
     EVT_END_THREAD
     EVT_THREAD
-        EVT_WAIT(15)
+        EVT_WAIT(15 * DT)
         EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_2045, SOUND_SPACE_MODE_0)
     EVT_END_THREAD
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp)
-    EVT_WAIT(90)
+    EVT_WAIT(90 * DT)
     EVT_CALL(ResetCam, CAM_DEFAULT, 3)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
     EVT_SET(GB_StoryProgress, STORY_CH3_STAR_SPRIT_DEPARTED)
     EVT_EXEC(N(EVS_SetupMusic))

src/world/area_arn/arn_08/arn_08_2_main.c

@@ -50,17 +50,17 @@ EvtScript N(EVS_EnterMap) = {
                 EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim06)
                 EVT_CALL(SetNpcJumpscale, NPC_TubbasHeart, EVT_FLOAT(2.5))
                 EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0)
-                EVT_CALL(NpcJump0, NPC_TubbasHeart, -50, 0, 50, 10)
+                EVT_CALL(NpcJump0, NPC_TubbasHeart, -50, 0, 50, 10 * DT)
                 EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim07)
                 EVT_WAIT(1)
                 EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim06)
                 EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0)
-                EVT_CALL(NpcJump0, NPC_TubbasHeart, -110, 0, 110, 10)
+                EVT_CALL(NpcJump0, NPC_TubbasHeart, -110, 0, 110, 10 * DT)
                 EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim07)
                 EVT_WAIT(1)
                 EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim06)
                 EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0)
-                EVT_CALL(NpcJump0, NPC_TubbasHeart, -180, 0, 180, 10)
+                EVT_CALL(NpcJump0, NPC_TubbasHeart, -180, 0, 180, 10 * DT)
                 EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim07)
                 EVT_WAIT(1)
                 EVT_CALL(MakeLerp, 80, 0, 10, EASING_LINEAR)
@@ -74,7 +74,7 @@ EvtScript N(EVS_EnterMap) = {
                     EVT_END_IF
                 EVT_END_LOOP
                 EVT_CALL(PlaySoundAtCollider, COLLIDER_tts, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0)
-                EVT_WAIT(20)
+                EVT_WAIT(20 * DT)
                 EVT_CALL(SetPlayerPos, 0, 0, 0)
                 EVT_CALL(SetNpcPos, NPC_PARTNER, 0, 0, 0)
                 EVT_SET(GB_StoryProgress, STORY_CH3_HEART_ESCAPED_WINDY_MILL)

src/world/area_arn/arn_09/arn_09_5_npc.c

@@ -22,13 +22,13 @@ EvtScript N(EVS_NpcIdle_TubbasHeart) = {
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim13)
     EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5))
     EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0)
-    EVT_CALL(NpcJump0, NPC_SELF, 0, 25, -10, 6)
+    EVT_CALL(NpcJump0, NPC_SELF, 0, 25, -10, 6 * DT)
     EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2086, SOUND_SPACE_MODE_0)
     EVT_CALL(N(PlaySpringAnimation))
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim13)
     EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5))
     EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0)
-    EVT_CALL(NpcJump0, NPC_SELF, 0, 200, 0, 15)
+    EVT_CALL(NpcJump0, NPC_SELF, 0, 200, 0, 15 * DT)
     EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION)
     EVT_SET(GB_StoryProgress, STORY_CH3_HEART_ESCAPED_WELL)
     EVT_RETURN

src/world/area_arn/arn_11/arn_11_2_main.c

@@ -2,7 +2,7 @@
 
 EvtScript N(EVS_SetupCamera) = {
     EVT_CALL(SetCamType, CAM_DEFAULT, 6, TRUE)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT))
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 60, 30, 0)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, 60, 30, 0)
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(20.0), EVT_FLOAT(-13.0))
@@ -15,35 +15,35 @@ EvtScript N(EVS_SetupCamera) = {
 
 EvtScript N(EVS_Scene_MeetHeart) = {
     EVT_CALL(DisablePlayerInput, TRUE)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
-    EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0))
+    EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT))
     EVT_CALL(PlayerMoveTo, 6, 0, 0)
     EVT_CALL(SpeakToPlayer, NPC_TubbasHeart, ANIM_TubbasHeart_Anim0B, ANIM_TubbasHeart_Anim01, 0, MSG_CH3_00BF)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp)
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_CALL(SpeakToPlayer, NPC_TubbasHeart, ANIM_TubbasHeart_Anim0B, ANIM_TubbasHeart_Anim01, 0, MSG_CH3_00C0)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_MarioW3_ShakeHead)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SpeakToPlayer, NPC_TubbasHeart, ANIM_TubbasHeart_Anim0B, ANIM_TubbasHeart_Anim01, 0, MSG_CH3_00C1)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_MarioW3_ShakeHead)
     EVT_THREAD
         EVT_CALL(SetNpcJumpscale, NPC_TubbasHeart, EVT_FLOAT(2.5))
         EVT_CALL(GetNpcPos, NPC_TubbasHeart, LVar0, LVar1, LVar2)
         EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0)
-        EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 10)
+        EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 10 * DT)
         EVT_WAIT(1)
         EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0)
-        EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 10)
+        EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 10 * DT)
     EVT_END_THREAD
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_CALL(SpeakToPlayer, NPC_TubbasHeart, ANIM_TubbasHeart_Anim0B, ANIM_TubbasHeart_Anim01, 0, MSG_CH3_00C2)
     EVT_CALL(SetPlayerAnimation, ANIM_MarioW3_ShakeHead)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcVar, NPC_TubbasHeart, 0, 1)
     EVT_CALL(DisablePlayerInput, FALSE)
     EVT_RETURN

src/world/area_arn/arn_11/arn_11_3_npc.c

@@ -12,7 +12,7 @@ EvtScript N(EVS_NpcIdle_TubbasHeart) = {
     EVT_END_LOOP
     EVT_THREAD
         EVT_CALL(SetCamType, CAM_DEFAULT, 6, TRUE)
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
         EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
         EVT_ADD(LVar0, 50)
         EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
@@ -80,19 +80,19 @@ EvtScript N(EVS_Scene_HeartEscape) = {
         EVT_CALL(SetCamDistance, CAM_DEFAULT, 450)
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_END_THREAD
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(PlayerFaceNpc, NPC_TubbasHeart, TRUE)
     EVT_LOOP(2)
         EVT_CALL(GetNpcPos, NPC_TubbasHeart, LVar0, LVar1, LVar2)
         EVT_CALL(SetNpcJumpscale, NPC_TubbasHeart, EVT_FLOAT(2.5))
         EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0)
-        EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 12)
+        EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 12 * DT)
         EVT_WAIT(1)
     EVT_END_LOOP
     EVT_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(SetCamType, CAM_DEFAULT, 4, TRUE)
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT))
         EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-7.0))
         EVT_CALL(SetCamDistance, CAM_DEFAULT, 450)
         EVT_CALL(SetCamPosA, CAM_DEFAULT, -56, 70)
@@ -108,7 +108,7 @@ EvtScript N(EVS_Scene_HeartEscape) = {
             EVT_BREAK_LOOP
         EVT_END_IF
         EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0)
-        EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 12)
+        EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 12 * DT)
         EVT_WAIT(1)
     EVT_END_LOOP
     EVT_EXEC(N(EVS_Heart_OpenDoor))
@@ -118,11 +118,11 @@ EvtScript N(EVS_Scene_HeartEscape) = {
             EVT_BREAK_LOOP
         EVT_END_IF
         EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0)
-        EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 12)
+        EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 12 * DT)
         EVT_WAIT(1)
     EVT_END_LOOP
     EVT_EXEC(N(EVS_Heart_CloseDoor))
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetCamType, CAM_DEFAULT, 6, TRUE)
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)

src/world/area_arn/arn_13/arn_13_3_npc.c

@@ -9,21 +9,21 @@ EvtScript N(EVS_NpcIdle_TubbasHeart) = {
     EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
     EVT_SUB(LVar0, 30)
     EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0)
-    EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 8)
+    EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 8 * DT)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim14)
     EVT_WAIT(1)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim13)
     EVT_SUB(LVar0, 80)
     EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5))
     EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0)
-    EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 12)
+    EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 12 * DT)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim14)
     EVT_WAIT(1)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim13)
     EVT_SUB(LVar0, 80)
     EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5))
     EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0)
-    EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 12)
+    EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 12 * DT)
     EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE)
     EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION)
     EVT_SET(GB_StoryProgress, STORY_CH3_HEART_FLED_SECOND_TUNNEL)

src/world/area_dgb/dgb_00/dgb_00_3_npc.c

@@ -51,7 +51,7 @@ EvtScript N(EVS_CloseDoors) = {
 EvtScript N(EVS_AdvanceBoo1) = {
     EVT_CALL(GetNpcPos, NPC_Boo_01, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, 200)
-    EVT_CALL(NpcMoveTo, NPC_Boo_01, LVar0, LVar2, 46)
+    EVT_CALL(NpcMoveTo, NPC_Boo_01, LVar0, LVar2, 46 * DT)
     EVT_RETURN
     EVT_END
 };
@@ -59,7 +59,7 @@ EvtScript N(EVS_AdvanceBoo1) = {
 EvtScript N(EVS_AdvanceBoo2) = {
     EVT_CALL(GetNpcPos, NPC_Boo_02, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, 200)
-    EVT_CALL(NpcMoveTo, NPC_Boo_02, LVar0, LVar2, 50)
+    EVT_CALL(NpcMoveTo, NPC_Boo_02, LVar0, LVar2, 50 * DT)
     EVT_RETURN
     EVT_END
 };
@@ -67,7 +67,7 @@ EvtScript N(EVS_AdvanceBoo2) = {
 EvtScript N(EVS_AdvanceBoo3) = {
     EVT_CALL(GetNpcPos, NPC_Boo_03, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, 200)
-    EVT_CALL(NpcMoveTo, NPC_Boo_03, LVar0, LVar2, 53)
+    EVT_CALL(NpcMoveTo, NPC_Boo_03, LVar0, LVar2, 53 * DT)
     EVT_RETURN
     EVT_END
 };
@@ -75,7 +75,7 @@ EvtScript N(EVS_AdvanceBoo3) = {
 EvtScript N(EVS_AdvanceBoo4) = {
     EVT_CALL(GetNpcPos, NPC_Boo_04, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, 200)
-    EVT_CALL(NpcMoveTo, NPC_Boo_04, LVar0, LVar2, 46)
+    EVT_CALL(NpcMoveTo, NPC_Boo_04, LVar0, LVar2, 46 * DT)
     EVT_RETURN
     EVT_END
 };
@@ -83,7 +83,7 @@ EvtScript N(EVS_AdvanceBoo4) = {
 EvtScript N(EVS_AdvanceBoo5) = {
     EVT_CALL(GetNpcPos, NPC_Boo_05, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, 200)
-    EVT_CALL(NpcMoveTo, NPC_Boo_05, LVar0, LVar2, 50)
+    EVT_CALL(NpcMoveTo, NPC_Boo_05, LVar0, LVar2, 50 * DT)
     EVT_RETURN
     EVT_END
 };
@@ -91,7 +91,7 @@ EvtScript N(EVS_AdvanceBoo5) = {
 EvtScript N(EVS_AdvanceBoo6) = {
     EVT_CALL(GetNpcPos, NPC_Boo_06, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, 200)
-    EVT_CALL(NpcMoveTo, NPC_Boo_06, LVar0, LVar2, 53)
+    EVT_CALL(NpcMoveTo, NPC_Boo_06, LVar0, LVar2, 53 * DT)
     EVT_RETURN
     EVT_END
 };
@@ -109,7 +109,7 @@ EvtScript N(EVS_AdvanceBooPhalanx) = {
 
 EvtScript N(EVS_BraceDoor1) = {
     EVT_CALL(SetNpcJumpscale, NPC_Boo_01, EVT_FLOAT(-0.2))
-    EVT_CALL(NpcJump0, NPC_Boo_01, 257, 30, -90, 5)
+    EVT_CALL(NpcJump0, NPC_Boo_01, 257, 30, -90, 5 * DT)
     EVT_CALL(EnableNpcShadow, NPC_Boo_01, FALSE)
     EVT_CALL(SetNpcAnimation, NPC_Boo_01, ANIM_Boo_Tan_Flail)
     EVT_RETURN
@@ -118,7 +118,7 @@ EvtScript N(EVS_BraceDoor1) = {
 
 EvtScript N(EVS_BraceDoor2) = {
     EVT_CALL(SetNpcJumpscale, NPC_Boo_02, EVT_FLOAT(-0.3))
-    EVT_CALL(NpcJump0, NPC_Boo_02, 272, 112, -81, 12)
+    EVT_CALL(NpcJump0, NPC_Boo_02, 272, 112, -81, 12 * DT)
     EVT_CALL(EnableNpcShadow, NPC_Boo_02, FALSE)
     EVT_CALL(SetNpcAnimation, NPC_Boo_02, ANIM_Boo_Tan_Flail)
     EVT_RETURN
@@ -127,7 +127,7 @@ EvtScript N(EVS_BraceDoor2) = {
 
 EvtScript N(EVS_BraceDoor3) = {
     EVT_CALL(SetNpcJumpscale, NPC_Boo_03, EVT_FLOAT(-0.4))
-    EVT_CALL(NpcJump0, NPC_Boo_03, 237, 120, -118, 10)
+    EVT_CALL(NpcJump0, NPC_Boo_03, 237, 120, -118, 10 * DT)
     EVT_CALL(EnableNpcShadow, NPC_Boo_03, FALSE)
     EVT_CALL(SetNpcAnimation, NPC_Boo_03, ANIM_Boo_Tan_Flail)
     EVT_RETURN
@@ -136,7 +136,7 @@ EvtScript N(EVS_BraceDoor3) = {
 
 EvtScript N(EVS_BraceDoor4) = {
     EVT_CALL(SetNpcJumpscale, NPC_Boo_04, EVT_FLOAT(-0.3))
-    EVT_CALL(NpcJump0, NPC_Boo_04, 280, 60, -79, 8)
+    EVT_CALL(NpcJump0, NPC_Boo_04, 280, 60, -79, 8 * DT)
     EVT_CALL(EnableNpcShadow, NPC_Boo_04, FALSE)
     EVT_CALL(SetNpcAnimation, NPC_Boo_04, ANIM_Boo_Tan_Flail)
     EVT_RETURN
@@ -145,7 +145,7 @@ EvtScript N(EVS_BraceDoor4) = {
 
 EvtScript N(EVS_BraceDoor5) = {
     EVT_CALL(SetNpcJumpscale, NPC_Boo_05, EVT_FLOAT(-0.4))
-    EVT_CALL(NpcJump0, NPC_Boo_05, 250, 81, -97, 9)
+    EVT_CALL(NpcJump0, NPC_Boo_05, 250, 81, -97, 9 * DT)
     EVT_CALL(EnableNpcShadow, NPC_Boo_05, FALSE)
     EVT_CALL(SetNpcAnimation, NPC_Boo_05, ANIM_Boo_Tan_Flail)
     EVT_RETURN
@@ -154,7 +154,7 @@ EvtScript N(EVS_BraceDoor5) = {
 
 EvtScript N(EVS_BraceDoor6) = {
     EVT_CALL(SetNpcJumpscale, NPC_Boo_06, EVT_FLOAT(-0.5))
-    EVT_CALL(NpcJump0, NPC_Boo_06, 227, 43, -123, 15)
+    EVT_CALL(NpcJump0, NPC_Boo_06, 227, 43, -123, 15 * DT)
     EVT_CALL(EnableNpcShadow, NPC_Boo_06, FALSE)
     EVT_CALL(SetNpcAnimation, NPC_Boo_06, ANIM_Boo_Tan_Flail)
     EVT_RETURN
@@ -201,8 +201,8 @@ EvtScript N(EVS_LeaderBooShivering) = {
 EvtScript N(EVS_TubbaTaunting) = {
     EVT_SET_GROUP(EVT_GROUP_EF)
     EVT_LOOP(0)
-        EVT_CALL(RandInt, 50, LVar0)
+        EVT_CALL(RandInt, 50 * DT, LVar0)
-        EVT_ADD(LVar0, 80)
+        EVT_ADD(LVar0, 80 * DT)
         EVT_WAIT(LVar0)
         EVT_IF_EQ(MV_PreventTaunting, FALSE)
             EVT_CALL(DisablePlayerInput, TRUE)
@@ -233,7 +233,7 @@ EvtScript N(EVS_Scene_BoosApproachManor) = {
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_CALL(SetNpcPos, NPC_Boo_01, -60, 10, -70)
     EVT_CALL(SetNpcPos, NPC_Boo_02, -100, 10, -110)
     EVT_CALL(SetNpcPos, NPC_Boo_03, -140, 10, -150)
@@ -241,14 +241,14 @@ EvtScript N(EVS_Scene_BoosApproachManor) = {
     EVT_CALL(SetNpcPos, NPC_Boo_05, -140, 10, -70)
     EVT_CALL(SetNpcPos, NPC_Boo_06, -180, 10, -100)
     EVT_EXEC_WAIT(N(EVS_AdvanceBooPhalanx))
-    EVT_WAIT(60)
+    EVT_WAIT(60 * DT)
     EVT_CALL(InterpNpcYaw, NPC_Boo_01, 270, 1)
     EVT_CALL(SpeakToPlayer, NPC_Boo_01, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 5, MSG_CH3_00DB)
     EVT_CALL(SpeakToPlayer, NPC_Boo_05, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 5, MSG_CH3_00DC)
     EVT_CALL(SpeakToPlayer, NPC_Boo_01, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 5, MSG_CH3_00DD)
     EVT_CALL(PlaySoundAt, SOUND_B4, SOUND_SPACE_MODE_0, 240, 10, -125)
     EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(PlaySoundAt, SOUND_B4, SOUND_SPACE_MODE_0, 240, 10, -125)
     EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0))
     EVT_CALL(InterpNpcYaw, NPC_Boo_01, 90, 1)
@@ -263,7 +263,7 @@ EvtScript N(EVS_Scene_BoosApproachManor) = {
 };
 
 EvtScript N(EVS_Scene_EscapeFromTubba) = {
-    EVT_CALL(SetPlayerSpeed, EVT_FLOAT(8.0))
+    EVT_CALL(SetPlayerSpeed, EVT_FLOAT(8.0 / DT))
     EVT_CALL(PlayerMoveTo, 184, -44, 0)
     EVT_CALL(PlaySoundAtNpc, NPC_Boo_01, SOUND_262, SOUND_SPACE_MODE_0)
     EVT_CALL(PlaySoundAtNpc, NPC_Boo_02, SOUND_262, SOUND_SPACE_MODE_0)
@@ -277,13 +277,13 @@ EvtScript N(EVS_Scene_EscapeFromTubba) = {
     EVT_CALL(ShowEmote, NPC_Boo_04, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0)
     EVT_CALL(ShowEmote, NPC_Boo_05, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0)
     EVT_CALL(ShowEmote, NPC_Boo_06, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0)
-    EVT_WAIT(50)
+    EVT_WAIT(50 * DT)
     EVT_SET(LVar2, 1)
     EVT_EXEC(N(EVS_CloseDoors))
     EVT_EXEC(N(EVS_BoosBraceDoor))
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetCamType, CAM_DEFAULT, 6, TRUE)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(6.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(6.0 / DT))
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-15.0))
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
@@ -295,11 +295,11 @@ EvtScript N(EVS_Scene_EscapeFromTubba) = {
     EVT_CALL(SpeakToPlayer, NPC_Boo_01, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0, MSG_CH3_00DF)
     EVT_KILL_THREAD(LVarA)
     EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Boo_01, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0, MSG_CH3_00E0)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Boo_01, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0, MSG_CH3_00E1)
     EVT_CALL(DisablePartnerAI, 0)
     EVT_CALL(GetCurrentPartnerID, LVar0)
@@ -317,7 +317,7 @@ EvtScript N(EVS_Scene_EscapeFromTubba) = {
     EVT_END_SWITCH
     EVT_CALL(EnablePartnerAI)
     EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(6.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(6.0 / DT))
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
@@ -326,12 +326,12 @@ EvtScript N(EVS_Scene_EscapeFromTubba) = {
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
     EVT_CALL(PlaySoundAt, SOUND_B4, SOUND_SPACE_MODE_0, 240, 10, -125)
     EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0))
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_CALL(PlaySoundAt, SOUND_B4, SOUND_SPACE_MODE_0, 240, 10, -125)
     EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0))
     EVT_CALL(ShowMessageAtScreenPos, MSG_CH3_00E7, 160, 40)
     EVT_EXEC_WAIT(N(EVS_BraceDoor1))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Boo_01, ANIM_Boo_Tan_Flail, ANIM_Boo_Tan_Flail, 5, MSG_CH3_00E8)
     EVT_CALL(SetNpcAnimation, NPC_Boo_01, ANIM_Boo_Tan_Flail)
     EVT_EXEC(N(EVS_TubbaTaunting))

src/world/area_dgb/dgb_10/dgb_10_3_hole.c

@@ -34,6 +34,10 @@ EvtScript N(EVS_SetupHoles) = {
     EVT_CALL(N(AwaitFallInHole))
     EVT_CALL(func_802CA988, 0, LVar2, LVar3, LVar4, LVar5)
     EVT_CALL(N(AwaitFallDownHole))
+#if VERSION_PAL
+    EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE)
+    EVT_CALL(DisablePlayerPhysics, TRUE)
+#endif
     EVT_CALL(InterruptUsePartner)
     EVT_CALL(GotoMap, EVT_PTR("dgb_11"), LVar0)
     EVT_WAIT(100)

src/world/area_end/common/Credits.h

@@ -5,9 +5,17 @@
 #include "message_ids.h"
 
 #define STANDARD_POS_X              160
+
+#ifdef VERSION_PAL
+#define STANDARD_APPEAR_TIME        33
+#define STANDARD_HOLD_TIME          116
+#define STANDARD_VANISH_TIME        25
+#else
 #define STANDARD_APPEAR_TIME        40
 #define STANDARD_HOLD_TIME          174
 #define STANDARD_VANISH_TIME        30
+#endif
+
 #define STANDARD_NEXT_TIME          230
 #define STANDARD_TITLE_NEXT_TIME    270
 

src/world/area_end/common/Credits.inc.c

@@ -1,6 +1,12 @@
 #include "common.h"
 #include "Credits.h"
 
+#if VERSION_PAL
+#define CREDITS_MESSAGE_BUFFER_COUNT (24)
+#else
+#define CREDITS_MESSAGE_BUFFER_COUNT (23)
+#endif
+
 s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 msgScale, s32 overrideCharWidth, u8 flags);
 void msg_get_glyph(s32 font, s32 variation, s32 charIndex, s32 palette, MesasgeFontGlyphData* out);
 void dma_load_msg(u32 msgID, void* dest);
@@ -10,7 +16,7 @@ BSS CreditsData* N(CreditsDataPtr);
 #if !VERSION_IQUE
 BSS s32 N(BSS_PAD_1)[2];
 #endif
-BSS u8 N(CreditsMessageBuffers)[23][256];
+BSS u8 N(CreditsMessageBuffers)[CREDITS_MESSAGE_BUFFER_COUNT][256];
 BSS Mtx N(CreditsProjMatrices)[2];
 
 enum {

src/world/area_end/end_00/credits_jobs_pal.inc.c

@@ -0,0 +1,475 @@
+#include "../common/Credits.h"
+
+CreditsEntry N(Credits_Jobs)[] = {
+    {
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = 0,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 0,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 0,
+        .perCharDelayOut = 0,
+        .next = 195,
+    },
+    {
+        .msgID = MSG_Credits_0009,
+        .posX = STANDARD_POS_X,
+        .posY = 166,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_000A,
+        .posX = STANDARD_POS_X,
+        .posY = 175,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 193,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_000B,
+        .posX = STANDARD_POS_X,
+        .posY = 170,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 455,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 513,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_000C,
+        .posX = STANDARD_POS_X,
+        .posY = 166,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 193,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = 0,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 0,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 0,
+        .perCharDelayOut = 0,
+        .next = 50,
+    },
+    {
+        .msgID = MSG_Credits_000D,
+        .posX = STANDARD_POS_X,
+        .posY = 166,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_000E,
+        .posX = STANDARD_POS_X,
+        .posY = 175,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 193,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_000F,
+        .posX = STANDARD_POS_X,
+        .posY = 166,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 1095,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 1153,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = 0,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 0,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 0,
+        .perCharDelayOut = 0,
+        .next = 50,
+    },
+    {
+        .msgID = MSG_Credits_0010,
+        .posX = STANDARD_POS_X,
+        .posY = 170,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 193,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0011,
+        .posX = STANDARD_POS_X,
+        .posY = 170,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 193,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0023,
+        .posX = STANDARD_POS_X,
+        .posY = 166,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 193,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0012,
+        .posX = STANDARD_POS_X,
+        .posY = 166,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 615,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 673,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = 0,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 0,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 0,
+        .perCharDelayOut = 0,
+        .next = 50,
+    },
+    {
+        .msgID = MSG_Credits_0013,
+        .posX = STANDARD_POS_X,
+        .posY = 170,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 193,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0014,
+        .posX = STANDARD_POS_X,
+        .posY = 166,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0015,
+        .posX = STANDARD_POS_X,
+        .posY = 175,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 193,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0016,
+        .posX = STANDARD_POS_X,
+        .posY = 170,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 193,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0017,
+        .posX = STANDARD_POS_X,
+        .posY = 166,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0018,
+        .posX = STANDARD_POS_X,
+        .posY = 175,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 193,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = 0,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 0,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 0,
+        .perCharDelayOut = 0,
+        .next = 50,
+    },
+    {
+        .msgID = MSG_Credits_001F,
+        .posX = STANDARD_POS_X,
+        .posY = 170,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 193,
+        .flags = CREDITS_FLAG_1,
+    },
+{
+        .msgID = MSG_PAL_Credits_002E,
+        .posX = STANDARD_POS_X,
+        .posY = 170,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 295,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 353,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_PAL_Credits_002F,
+        .posX = STANDARD_POS_X,
+        .posY = 170,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 193,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_PAL_Credits_0030,
+        .posX = STANDARD_POS_X,
+        .posY = 170,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 193,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_PAL_Credits_0031,
+        .posX = STANDARD_POS_X,
+        .posY = 170,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 193,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_PAL_Credits_0032,
+        .posX = STANDARD_POS_X,
+        .posY = 170,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 193,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_PAL_Credits_0033,
+        .posX = STANDARD_POS_X,
+        .posY = 170,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 193,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_PAL_Credits_002D,
+        .posX = STANDARD_POS_X,
+        .posY = 170,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 193,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0024,
+        .posX = STANDARD_POS_X,
+        .posY = 170,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 135,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 193,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0022,
+        .posX = STANDARD_POS_X,
+        .posY = 166,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 295,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = STANDARD_VANISH_TIME,
+        .perCharDelayOut = 0,
+        .next = 353,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = 0,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 0,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 0,
+        .perCharDelayOut = 0,
+        .next = -1,
+    },
+};

src/world/area_end/end_00/credits_title_pal.inc.c

@@ -0,0 +1,35 @@
+#include "../common/Credits.h"
+
+CreditsEntry N(Credits_Title)[] = {
+    {
+        .msgID = MSG_Credits_0000,
+        .posX = STANDARD_POS_X,
+        .posY = 173,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 120 * DT,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 40 * DT,
+        .perCharDelayOut = 0,
+        .next = 40 * DT,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0001,
+        .posX = STANDARD_POS_X,
+        .posY = 191,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 67,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 40 * DT,
+        .perCharDelayOut = 0,
+        .next = -1,
+        .flags = CREDITS_FLAG_1,
+    },
+};

src/world/area_end/end_00/end_00_2_credits.c

@@ -2,9 +2,15 @@
 
 #include "../common/Credits.inc.c"
 
+#if VERSION_PAL
+#include "credits_title_pal.inc.c"
+#include "credits_jobs_pal.inc.c"
+#include "credits_names_pal.inc.c"
+#else
 #include "credits_title.inc.c"
 #include "credits_jobs.inc.c"
 #include "credits_names.inc.c"
+#endif
 
 EvtScript N(EVS_InitCredits) = {
     EVT_CALL(N(InitCredits))

src/world/area_end/end_00/end_00_3_parade_setup.c

@@ -71,7 +71,7 @@ API_CALLABLE(N(UpdateCameraScroll)) {
     Camera* camera = &gCameras[gCurrentCameraID];
 
     camera->panActive = TRUE;
-    camera->movePos.x += PARADE_SCROLL_RATE;
+    camera->movePos.x += PARADE_SCROLL_RATE / DT;
     return ApiStatus_DONE2;
 }
 
@@ -92,7 +92,7 @@ API_CALLABLE(N(AddScrollToNpcPos)) {
         *npc = get_npc_unsafe(evt_get_variable(script, *args++));
     }
 
-    (*npc)->pos.x += PARADE_SCROLL_RATE;
+    (*npc)->pos.x += PARADE_SCROLL_RATE / DT;
 
     return ApiStatus_BLOCK;
 }
@@ -112,7 +112,7 @@ EvtScript N(EVS_UpdateScrollPos) = {
     EVT_LOOP(0)
         EVT_CALL(N(UpdateCameraScroll))
         EVT_CALL(TranslateGroup, MODEL_bg, LVar1, 0, 0)
-        EVT_ADDF(LVar1, EVT_FLOAT(PARADE_SCROLL_RATE))
+        EVT_ADDF(LVar1, EVT_FLOAT(PARADE_SCROLL_RATE / DT))
         EVT_WAIT(1)
     EVT_END_LOOP
     EVT_RETURN
@@ -1151,7 +1151,11 @@ EvtScript N(EVS_ManageNpcPool) = {
 };
 
 EvtScript N(EVS_ParadePhase_PlayCredits) = {
+#if VERSION_PAL
+    EVT_WAIT(180 * DT)
+#else
     EVT_WAIT(240)
+#endif
     EVT_EXEC(N(EVS_InitCredits))
     EVT_EXEC(N(EVS_ShowCredits_Title))
     EVT_EXEC(N(EVS_ShowCredits_Jobs))

src/world/area_end/end_00/end_00_4_allies.c

@@ -3,37 +3,37 @@
 
 EvtScript N(EVS_ParadePhase_Luigi) = {
     EVT_CALL(PlaySound, SOUND_89)
-    EVT_WAIT(80)
+    EVT_WAIT(80 * DT)
     EVT_THREAD
-        EVT_LOOP(9)
+        EVT_LOOP(9 * DT)
             EVT_CALL(PlaySoundAtNpc, NPC_Luigi, SOUND_11, SOUND_SPACE_MODE_0)
             EVT_WAIT(15)
         EVT_END_LOOP
     EVT_END_THREAD
-    EVT_CALL(NpcMoveTo, NPC_Luigi, PARADE_START, 0, 120)
+    EVT_CALL(NpcMoveTo, NPC_Luigi, PARADE_START, 0, 120 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Luigi, ANIM_ParadeLuigi_Idle)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(InterpNpcYaw, NPC_Luigi, 90, 0)
-    EVT_WAIT(25)
+    EVT_WAIT(25 * DT)
     EVT_CALL(StopSound, SOUND_89)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
-        EVT_LOOP(4)
+        EVT_LOOP(4 * DT)
             EVT_CALL(PlaySoundAtNpc, NPC_Luigi, SOUND_14, SOUND_SPACE_MODE_0)
             EVT_WAIT(15)
         EVT_END_LOOP
     EVT_END_THREAD
     EVT_CALL(SetNpcAnimation, NPC_Luigi, ANIM_ParadeLuigi_BlowWhistle)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Luigi, ANIM_ParadeLuigi_MarchInPlace)
-    EVT_WAIT(7)
+    EVT_WAIT(7 * DT)
     EVT_CALL(SetMusicTrack, 0, SONG_PARADE_DAY, 0, 8)
-    EVT_WAIT(120)
+    EVT_WAIT(120 * DT)
-    EVT_WAIT(100)
+    EVT_WAIT(100 * DT)
     EVT_CALL(InterpNpcYaw, NPC_Luigi, 270, 0)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_RETURN
     EVT_END
 };

src/world/area_end/end_00/end_00_6_caravan.c

@@ -4,7 +4,7 @@ EvtScript N(EVS_CaravanStopMarching) = {
     EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3)
     EVT_SETF(LVar1, LVar1)
     EVT_LOOP(0)
-        EVT_ADDF(LVar1, EVT_FLOAT(0.87))
+        EVT_ADDF(LVar1, EVT_FLOAT(0.8702 / DT))
         EVT_CALL(SetNpcPos, LVar0, LVar1, LVar2, LVar3)
         EVT_WAIT(1)
     EVT_END_LOOP
@@ -17,7 +17,7 @@ EvtScript N(EVS_MoustafaStopMarching) = {
     EVT_CALL(GetNpcPos, NPC_Moustafa, LVar0, LVar1, LVar2)
     EVT_SETF(LVar0, LVar0)
     EVT_LOOP(0)
-        EVT_ADDF(LVar0, EVT_FLOAT(0.87))
+        EVT_ADDF(LVar0, EVT_FLOAT(0.8702 / DT))
         EVT_CALL(SetNpcPos, NPC_Moustafa, LVar0, 0, 0)
         EVT_WAIT(1)
     EVT_END_LOOP
@@ -28,103 +28,103 @@ EvtScript N(EVS_MoustafaStopMarching) = {
 EvtScript N(EVS_ParadePhase_Caravan) = {
     EVT_CALL(SetNpcScale, NPC_Rhuff, EVT_FLOAT(0.75), EVT_FLOAT(0.75), EVT_FLOAT(0.75))
     EVT_THREAD
-        EVT_CALL(NpcMoveTo, NPC_Rowf, -1447, -2, 200)
+        EVT_CALL(NpcMoveTo, NPC_Rowf, -1447, -2, 200 * DT)
         EVT_SET(LVar0, NPC_Rowf)
         EVT_EXEC_GET_TID(N(EVS_CaravanStopMarching), LVarA)
         EVT_CALL(SetNpcAnimation, NPC_Rowf, ANIM_Rowf_PackedIdle)
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Rowf, ANIM_Rowf_PackedTalk)
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Rowf, ANIM_Rowf_PackedCheer)
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Rowf, ANIM_Rowf_PackedIdle)
-        EVT_WAIT(60)
+        EVT_WAIT(60 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Rowf, ANIM_Rowf_PackedTalk)
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Rowf, ANIM_Rowf_PackedCheer)
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Rowf, ANIM_Rowf_PackedIdle)
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Rowf, ANIM_Rowf_PackedWalk)
         EVT_KILL_THREAD(LVarA)
-        EVT_CALL(NpcMoveTo, NPC_Rowf, -785, -2, 300)
+        EVT_CALL(NpcMoveTo, NPC_Rowf, -785, -2, 300 * DT)
         EVT_CALL(SetNpcPos, NPC_Rowf, 0, -500, 0)
     EVT_END_THREAD
     EVT_THREAD
-        EVT_CALL(NpcMoveTo, NPC_Rhuff, -1412, -2, 200)
+        EVT_CALL(NpcMoveTo, NPC_Rhuff, -1412, -2, 200 * DT)
         EVT_SET(LVar0, NPC_Rhuff)
         EVT_EXEC_GET_TID(N(EVS_CaravanStopMarching), LVarA)
         EVT_CALL(SetNpcAnimation, NPC_Rhuff, ANIM_Rowf_PackedIdle)
-        EVT_WAIT(220)
+        EVT_WAIT(220 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Rhuff, ANIM_Rowf_PackedWalk)
         EVT_KILL_THREAD(LVarA)
-        EVT_CALL(NpcMoveTo, NPC_Rhuff, -750, -2, 300)
+        EVT_CALL(NpcMoveTo, NPC_Rhuff, -750, -2, 300 * DT)
         EVT_CALL(SetNpcPos, NPC_Rhuff, 0, -500, 0)
     EVT_END_THREAD
     EVT_THREAD
-        EVT_CALL(NpcMoveTo, NPC_Moustafa, -1380, 2, 180)
+        EVT_CALL(NpcMoveTo, NPC_Moustafa, -1380, 2, 180 * DT)
         EVT_SET(LVar0, NPC_Moustafa)
         EVT_EXEC_GET_TID(N(EVS_CaravanStopMarching), LVarA)
         EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Idle)
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Toss)
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Shout)
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Talk)
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_CALL(InterpNpcYaw, NPC_Moustafa, 90, 0)
         EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Shout)
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Talk)
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_CALL(InterpNpcYaw, NPC_Moustafa, 270, 0)
         EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Shout)
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Talk)
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Toss)
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Idle)
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Run)
         EVT_KILL_THREAD(LVarA)
-        EVT_CALL(NpcMoveTo, NPC_Moustafa, -1360, 2, 180)
+        EVT_CALL(NpcMoveTo, NPC_Moustafa, -1360, 2, 180 * DT)
     EVT_END_THREAD
     EVT_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
-        EVT_CALL(NpcMoveTo, NPC_Mouser1, -1342, 2, 180)
+        EVT_CALL(NpcMoveTo, NPC_Mouser1, -1342, 2, 180 * DT)
         EVT_SET(LVar0, NPC_Mouser1)
         EVT_EXEC_GET_TID(N(EVS_CaravanStopMarching), LVarA)
         EVT_CALL(SetNpcAnimation, NPC_Mouser1, ANIM_Mouser_Blue_IdleOnlyBlink)
-        EVT_WAIT(110)
+        EVT_WAIT(110 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Mouser1, ANIM_Mouser_Blue_Whisper)
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Mouser1, ANIM_Mouser_Blue_IdleOnlyBlink)
-        EVT_WAIT(90)
+        EVT_WAIT(90 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Mouser1, ANIM_Mouser_Blue_Run)
         EVT_KILL_THREAD(LVarA)
-        EVT_CALL(NpcMoveTo, NPC_Mouser1, -1330, 2, 180)
+        EVT_CALL(NpcMoveTo, NPC_Mouser1, -1330, 2, 180 * DT)
     EVT_END_THREAD
     EVT_THREAD
         EVT_WAIT(10)
-        EVT_CALL(NpcMoveTo, NPC_Mouser2, -1312, 2, 180)
+        EVT_CALL(NpcMoveTo, NPC_Mouser2, -1312, 2, 180 * DT)
         EVT_SET(LVar0, NPC_Mouser2)
         EVT_EXEC_GET_TID(N(EVS_CaravanStopMarching), LVarA)
         EVT_CALL(SetNpcAnimation, NPC_Mouser2, ANIM_Mouser_Blue_IdleOnlyBlink)
-        EVT_WAIT(230)
+        EVT_WAIT(230 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Mouser2, ANIM_Mouser_Blue_Run)
         EVT_KILL_THREAD(LVarA)
-        EVT_CALL(NpcMoveTo, NPC_Mouser2, -1300, 2, 180)
+        EVT_CALL(NpcMoveTo, NPC_Mouser2, -1300, 2, 180 * DT)
     EVT_END_THREAD
     // tutankoopa is chased around by chomp
     EVT_THREAD
-        EVT_WAIT(240)
+        EVT_WAIT(240 * DT)
-        EVT_CALL(NpcMoveTo, NPC_Tutankoopa1, -1540, 30, 60)
+        EVT_CALL(NpcMoveTo, NPC_Tutankoopa1, -1540, 30, 60 * DT)
-        EVT_WAIT(210)
+        EVT_WAIT(210 * DT)
-        EVT_CALL(SetNpcPos, NPC_Tutankoopa1, -1350, 0, 30)
+        EVT_CALL(SetNpcPos, NPC_Tutankoopa1, -1350, 0, 30 * DT)
         EVT_CALL(SetNpcYaw, NPC_Tutankoopa1, 90)
-        EVT_CALL(NpcMoveTo, NPC_Tutankoopa1, -1110, 30, 30)
+        EVT_CALL(NpcMoveTo, NPC_Tutankoopa1, -1110, 30, 30 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Tutankoopa1, ANIM_Tutankoopa_Anim09)
         EVT_CALL(MakeLerp, 0, 90, 5, EASING_LINEAR)
         EVT_LOOP(5)
@@ -135,9 +135,9 @@ EvtScript N(EVS_ParadePhase_Caravan) = {
                 EVT_BREAK_LOOP
             EVT_END_IF
         EVT_END_LOOP
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
-        EVT_CALL(ShowEmote, NPC_Tutankoopa1, EMOTE_ELLIPSIS, 0, 60, EMOTER_NPC, 0, 0, 0, 0)
+        EVT_CALL(ShowEmote, NPC_Tutankoopa1, EMOTE_ELLIPSIS, 0, 60 * DT, EMOTER_NPC, 0, 0, 0, 0)
-        EVT_WAIT(60)
+        EVT_WAIT(60 * DT)
         EVT_CALL(MakeLerp, 90, 0, 5, EASING_LINEAR)
         EVT_LOOP(5)
             EVT_CALL(UpdateLerp)
@@ -149,24 +149,24 @@ EvtScript N(EVS_ParadePhase_Caravan) = {
         EVT_END_LOOP
         EVT_CALL(SetNpcAnimation, NPC_Tutankoopa1, ANIM_Tutankoopa_Anim01)
         EVT_CALL(InterpNpcYaw, NPC_Tutankoopa1, 270, 7)
-        EVT_WAIT(15)
+        EVT_WAIT(15 * DT)
         EVT_CALL(InterpNpcYaw, NPC_Tutankoopa1, 90, 7)
-        EVT_WAIT(15)
+        EVT_WAIT(15 * DT)
         EVT_CALL(InterpNpcYaw, NPC_Tutankoopa1, 270, 7)
-        EVT_WAIT(15)
+        EVT_WAIT(15 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Tutankoopa1, ANIM_Tutankoopa_Anim04)
         EVT_CALL(SetNpcJumpscale, NPC_Tutankoopa1, EVT_FLOAT(1.0))
-        EVT_CALL(NpcJump0, NPC_Tutankoopa1, -1140, 0, 30, 15)
+        EVT_CALL(NpcJump0, NPC_Tutankoopa1, -1140, 0, 30, 15 * DT)
-        EVT_CALL(NpcJump0, NPC_Tutankoopa1, -1170, 0, 30, 15)
+        EVT_CALL(NpcJump0, NPC_Tutankoopa1, -1170, 0, 30, 15 * DT)
-        EVT_CALL(NpcJump0, NPC_Tutankoopa1, -1200, 0, 30, 15)
+        EVT_CALL(NpcJump0, NPC_Tutankoopa1, -1200, 0, 30, 15 * DT)
     EVT_END_THREAD
     EVT_THREAD
-        EVT_WAIT(240)
+        EVT_WAIT(240 * DT)
-        EVT_CALL(NpcMoveTo, NPC_ChainChomp1, -1480, 30, 60)
+        EVT_CALL(NpcMoveTo, NPC_ChainChomp1, -1480, 30, 60 * DT)
-        EVT_WAIT(210)
+        EVT_WAIT(210 * DT)
-        EVT_CALL(SetNpcPos, NPC_ChainChomp1, -1410, 0, 30)
+        EVT_CALL(SetNpcPos, NPC_ChainChomp1, -1410, 0, 30 * DT)
         EVT_CALL(SetNpcYaw, NPC_ChainChomp1, 90)
-        EVT_CALL(NpcMoveTo, NPC_ChainChomp1, -690, 30, 90)
+        EVT_CALL(NpcMoveTo, NPC_ChainChomp1, -690, 30, 90 * DT)
         EVT_CALL(SetNpcPos, NPC_ChainChomp1, 0, -500, 0)
     EVT_END_THREAD
     EVT_RETURN
@@ -189,37 +189,37 @@ EvtScript N(EVS_ParadePhase_BuzzarNest) = {
             EVT_BREAK_LOOP
         EVT_END_IF
     EVT_END_LOOP
-    EVT_WAIT(200)
+    EVT_WAIT(200 * DT)
     EVT_CALL(ShowEmote, NPC_Buzzar, EMOTE_SHOCK, 45, 30, EMOTER_NPC, 0, 0, 0, 0)
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Buzzar, ANIM_Buzzar_Anim03)
-    EVT_CALL(NpcFlyTo, NPC_Buzzar, -855, 100, -180, 60, 0, EASING_LINEAR)
+    EVT_CALL(NpcFlyTo, NPC_Buzzar, -855, 100, -180, 60 * DT, 0, EASING_LINEAR)
     EVT_CALL(SetNpcAnimation, NPC_VultureChick1, ANIM_ParadeChick_EggTremble)
     EVT_CALL(SetNpcAnimation, NPC_VultureChick2, ANIM_ParadeChick_EggTremble)
     EVT_CALL(SetNpcAnimation, NPC_VultureChick3, ANIM_ParadeChick_EggTremble)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_VultureChick1, ANIM_ParadeChick_BreakEgg)
     EVT_CALL(SetNpcAnimation, NPC_VultureChick2, ANIM_ParadeChick_BreakEggFwd)
     EVT_CALL(SetNpcAnimation, NPC_VultureChick3, ANIM_ParadeChick_BreakEgg)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_VultureChick1, ANIM_ParadeChick_Chirp)
     EVT_CALL(SetNpcAnimation, NPC_VultureChick2, ANIM_ParadeChick_ChirpFwd)
     EVT_CALL(SetNpcAnimation, NPC_VultureChick3, ANIM_ParadeChick_Chirp)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(InterpNpcYaw, NPC_Buzzar, 90, 0)
-    EVT_CALL(NpcFlyTo, NPC_Buzzar, -805, 100, -80, 30, 0, EASING_LINEAR)
+    EVT_CALL(NpcFlyTo, NPC_Buzzar, -805, 100, -80, 30 * DT, 0, EASING_LINEAR)
     EVT_THREAD
         EVT_LOOP(6)
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_CALL(InterpNpcYaw, NPC_Buzzar, 270, 0)
-            EVT_WAIT(40)
+            EVT_WAIT(40 * DT)
             EVT_CALL(InterpNpcYaw, NPC_Buzzar, 90, 0)
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
         EVT_END_LOOP
     EVT_END_THREAD
     EVT_THREAD
         EVT_LOOP(6)
-            EVT_CALL(LoadPath, 80, EVT_PTR(N(BuzzarFlightPath)), ARRAY_COUNT(N(BuzzarFlightPath)), EASING_LINEAR)
+            EVT_CALL(LoadPath, 80 * DT, EVT_PTR(N(BuzzarFlightPath)), ARRAY_COUNT(N(BuzzarFlightPath)), EASING_LINEAR)
             EVT_LOOP(0)
                 EVT_CALL(GetNextPathPos)
                 EVT_CALL(SetNpcPos, NPC_Buzzar, LVar1, LVar2, LVar3)

src/world/area_end/end_00/end_00_7_boos.c

@@ -35,22 +35,22 @@ EvtScript N(EVS_MoveBoosToTubbaBody) = {
 EvtScript N(EVS_ParadePhase_Tutankoopa) = {
     EVT_THREAD
         EVT_CALL(SetNpcPos, NPC_Tutankoopa2, -960, 0, 30)
-        EVT_CALL(NpcMoveTo, NPC_Tutankoopa2, -240, 30, 90)
+        EVT_CALL(NpcMoveTo, NPC_Tutankoopa2, -240, 30, 90 * DT)
         EVT_CALL(SetNpcPos, NPC_Tutankoopa2, 0, -500, 0)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(SetNpcPos, NPC_ChainChomp2, -1020, 0, 30)
-        EVT_CALL(NpcMoveTo, NPC_ChainChomp2, -300, 30, 90)
+        EVT_CALL(NpcMoveTo, NPC_ChainChomp2, -300, 30, 90 * DT)
         EVT_CALL(SetNpcPos, NPC_ChainChomp2, 0, -500, 0)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(SetNpcPos, NPC_ChainChomp3, -1050, 0, 30)
-        EVT_CALL(NpcMoveTo, NPC_ChainChomp3, -330, 30, 90)
+        EVT_CALL(NpcMoveTo, NPC_ChainChomp3, -330, 30, 90 * DT)
         EVT_CALL(SetNpcPos, NPC_ChainChomp3, 0, -500, 0)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(SetNpcPos, NPC_ChainChomp4, -1080, 0, 30)
-        EVT_CALL(NpcMoveTo, NPC_ChainChomp4, -360, 30, 90)
+        EVT_CALL(NpcMoveTo, NPC_ChainChomp4, -360, 30, 90 * DT)
         EVT_CALL(SetNpcPos, NPC_ChainChomp4, 0, -500, 0)
     EVT_END_THREAD
     EVT_RETURN
@@ -75,7 +75,7 @@ EvtScript N(EVS_ParadePhase_Boos) = {
             EVT_BREAK_LOOP
         EVT_END_IF
     EVT_END_LOOP
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(N(SetUnusedAlpha), 255)
     EVT_CALL(func_802CFD30, NPC_Boo1, FOLD_TYPE_7, 0, 0, 0, 0)
     EVT_CALL(func_802CFD30, NPC_Boo2, FOLD_TYPE_7, 0, 0, 0, 0)
@@ -83,19 +83,19 @@ EvtScript N(EVS_ParadePhase_Boos) = {
     EVT_CALL(EnableNpcShadow, NPC_Boo1, FALSE)
     EVT_CALL(EnableNpcShadow, NPC_Boo2, FALSE)
     EVT_CALL(EnableNpcShadow, NPC_Boo3, FALSE)
-    EVT_CALL(NpcMoveTo, NPC_TubbasBody, -460, 0, 100)
+    EVT_CALL(NpcMoveTo, NPC_TubbasBody, -460, 0, 100 * DT)
     EVT_EXEC_GET_TID(N(EVS_MoveBoosToTubbaBody), LVarB)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetNpcPos, NPC_TubbasHeart, -260, 0, 0)
     EVT_CALL(SetNpcJumpscale, NPC_TubbasHeart, EVT_FLOAT(1.0))
-    EVT_CALL(NpcJump0, NPC_TubbasHeart, -290, 0, 0, 10)
+    EVT_CALL(NpcJump0, NPC_TubbasHeart, -290, 0, 0, 10 * DT)
-    EVT_CALL(NpcJump0, NPC_TubbasHeart, -320, 0, 0, 10)
+    EVT_CALL(NpcJump0, NPC_TubbasHeart, -320, 0, 0, 10 * DT)
     EVT_SET(LVar0, 53)
     EVT_EXEC_GET_TID(N(EVS_OffsetNpcScroll), LVarC)
     EVT_CALL(InterpNpcYaw, NPC_TubbasBody, 90, 0)
     EVT_THREAD
-        EVT_CALL(MakeLerp, 0, 255, 30, EASING_LINEAR)
+        EVT_CALL(MakeLerp, 0, 255, 30 * DT, EASING_LINEAR)
-        EVT_LOOP(30)
+        EVT_LOOP(30 * DT)
             EVT_CALL(UpdateLerp)
             EVT_CALL(func_802CFD30, NPC_Boo1, FOLD_TYPE_7, LVar0, 0, 0, 0)
             EVT_CALL(func_802CFD30, NPC_Boo2, FOLD_TYPE_7, LVar0, 0, 0, 0)
@@ -106,14 +106,14 @@ EvtScript N(EVS_ParadePhase_Boos) = {
         EVT_CALL(EnableNpcShadow, NPC_Boo2, TRUE)
         EVT_CALL(EnableNpcShadow, NPC_Boo3, TRUE)
     EVT_END_THREAD
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim0B)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Bootler, ANIM_Bootler_Spook)
     EVT_CALL(SetNpcAnimation, NPC_Boo1, ANIM_Boo_CarryWalk)
     EVT_CALL(SetNpcAnimation, NPC_Boo2, ANIM_Boo_CarryWalk)
     EVT_CALL(SetNpcAnimation, NPC_Boo3, ANIM_Boo_CarryWalk)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_THREAD
         EVT_LOOP(6)
             EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim16)
@@ -122,50 +122,50 @@ EvtScript N(EVS_ParadePhase_Boos) = {
             EVT_WAIT(10)
         EVT_END_LOOP
     EVT_END_THREAD
-    EVT_WAIT(60)
+    EVT_WAIT(60 * DT)
     EVT_KILL_THREAD(LVarA)
     EVT_THREAD
         EVT_CALL(InterpNpcYaw, NPC_Bootler, 270, 0)
         EVT_CALL(SetNpcAnimation, NPC_Bootler, ANIM_Bootler_Talk)
         EVT_CALL(GetNpcPos, NPC_Bootler, LVar0, LVar1, LVar2)
         EVT_SUB(LVar0, 180)
-        EVT_CALL(NpcMoveTo, NPC_Bootler, LVar0, LVar2, 60)
+        EVT_CALL(NpcMoveTo, NPC_Bootler, LVar0, LVar2, 60 * DT)
     EVT_END_THREAD
     EVT_KILL_THREAD(LVarB)
     EVT_THREAD
         EVT_CALL(InterpNpcYaw, NPC_TubbasBody, 270, 0)
         EVT_CALL(GetNpcPos, NPC_TubbasBody, LVar0, LVar1, LVar2)
         EVT_SUB(LVar0, 180)
-        EVT_CALL(NpcMoveTo, NPC_TubbasBody, LVar0, LVar2, 60)
+        EVT_CALL(NpcMoveTo, NPC_TubbasBody, LVar0, LVar2, 60 * DT)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(InterpNpcYaw, NPC_Boo1, 270, 0)
         EVT_CALL(SetNpcAnimation, NPC_Boo1, ANIM_Boo_Wave)
         EVT_CALL(GetNpcPos, NPC_Boo1, LVar0, LVar1, LVar2)
         EVT_SUB(LVar0, 180)
-        EVT_CALL(NpcMoveTo, NPC_Boo1, LVar0, LVar2, 60)
+        EVT_CALL(NpcMoveTo, NPC_Boo1, LVar0, LVar2, 60 * DT)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(InterpNpcYaw, NPC_Boo2, 270, 0)
         EVT_CALL(SetNpcAnimation, NPC_Boo2, ANIM_Boo_Wave)
         EVT_CALL(GetNpcPos, NPC_Boo2, LVar0, LVar1, LVar2)
         EVT_SUB(LVar0, 180)
-        EVT_CALL(NpcMoveTo, NPC_Boo2, LVar0, LVar2, 60)
+        EVT_CALL(NpcMoveTo, NPC_Boo2, LVar0, LVar2, 60 * DT)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(InterpNpcYaw, NPC_Boo3, 270, 0)
         EVT_CALL(SetNpcAnimation, NPC_Boo3, ANIM_Boo_Wave)
         EVT_CALL(GetNpcPos, NPC_Boo3, LVar0, LVar1, LVar2)
         EVT_SUB(LVar0, 180)
-        EVT_CALL(NpcMoveTo, NPC_Boo3, LVar0, LVar2, 60)
+        EVT_CALL(NpcMoveTo, NPC_Boo3, LVar0, LVar2, 60 * DT)
     EVT_END_THREAD
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_KILL_THREAD(LVarC)
     EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim0B)
     EVT_CALL(GetNpcPos, NPC_TubbasHeart, LVar0, LVar1, LVar2)
     EVT_LOOP(6)
         EVT_SUB(LVar0, 45)
-        EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 15)
+        EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 15 * DT)
     EVT_END_LOOP
     EVT_RETURN
     EVT_END

src/world/area_end/end_00/end_00_9_huff_n_puff.c

@@ -130,50 +130,50 @@ EvtScript N(EVS_HoldPosition_GourmetGuy) = {
 };
 
 EvtScript N(EVS_YoshiKids) = {
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetNpcJumpscale, NPC_YoshiKidGreen, EVT_FLOAT(1.0))
-    EVT_CALL(NpcJump0, NPC_YoshiKidGreen, 680, 0, 0, 20)
+    EVT_CALL(NpcJump0, NPC_YoshiKidGreen, 680, 0, 0, 20 * DT)
-    EVT_CALL(NpcJump0, NPC_YoshiKidGreen, 740, 0, 0, 10)
+    EVT_CALL(NpcJump0, NPC_YoshiKidGreen, 740, 0, 0, 10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_YoshiKidGreen, ANIM_YoshiKid_Green_Idle)
     EVT_LOOP(2)
-        EVT_CALL(InterpNpcYaw, NPC_YoshiKidGreen, 270, 7)
+        EVT_CALL(InterpNpcYaw, NPC_YoshiKidGreen, 270, 7 * DT)
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
-        EVT_CALL(InterpNpcYaw, NPC_YoshiKidGreen, 90, 7)
+        EVT_CALL(InterpNpcYaw, NPC_YoshiKidGreen, 90, 7 * DT)
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
     EVT_END_LOOP
-    EVT_CALL(InterpNpcYaw, NPC_YoshiKidGreen, 270, 7)
+    EVT_CALL(InterpNpcYaw, NPC_YoshiKidGreen, 270, 7 * DT)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_THREAD
         EVT_CALL(GetNpcPos, NPC_YoshiKidGreen, LVar0, LVar1, LVar2)
         EVT_CALL(NpcJump0, NPC_YoshiKidGreen, LVar0, LVar1, LVar2, 7)
         EVT_CALL(SetNpcAnimation, NPC_YoshiKidGreen, ANIM_YoshiKid_Green_Run)
-        EVT_CALL(NpcMoveTo, NPC_YoshiKidGreen, 980, 0, 60)
+        EVT_CALL(NpcMoveTo, NPC_YoshiKidGreen, 980, 0, 60 * DT)
         EVT_CALL(SetNpcAnimation, NPC_YoshiKidGreen, ANIM_YoshiKid_Green_LookUp)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(SetNpcPos, NPC_YoshiKidBlue, 660, 0, 0)
-        EVT_CALL(NpcMoveTo, NPC_YoshiKidBlue, 940, 0, 70)
+        EVT_CALL(NpcMoveTo, NPC_YoshiKidBlue, 940, 0, 70 * DT)
         EVT_CALL(SetNpcAnimation, NPC_YoshiKidBlue, ANIM_YoshiKid_Blue_LookUp)
     EVT_END_THREAD
     EVT_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(SetNpcPos, NPC_YoshiKidPurple, 660, 0, 0)
-        EVT_CALL(NpcMoveTo, NPC_YoshiKidPurple, 900, 0, 60)
+        EVT_CALL(NpcMoveTo, NPC_YoshiKidPurple, 900, 0, 60 * DT)
         EVT_CALL(SetNpcAnimation, NPC_YoshiKidPurple, ANIM_YoshiKid_Purple_LookUp)
     EVT_END_THREAD
     EVT_THREAD
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_CALL(SetNpcPos, NPC_YoshiKidYellow, 660, 0, 0)
-        EVT_CALL(NpcMoveTo, NPC_YoshiKidYellow, 860, 0, 50)
+        EVT_CALL(NpcMoveTo, NPC_YoshiKidYellow, 860, 0, 50 * DT)
         EVT_CALL(SetNpcAnimation, NPC_YoshiKidYellow, ANIM_YoshiKid_Yellow_LookUp)
     EVT_END_THREAD
     EVT_THREAD
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_CALL(SetNpcPos, NPC_YoshiKidRed, 660, 0, 0)
-        EVT_CALL(NpcMoveTo, NPC_YoshiKidRed, 820, 0, 40)
+        EVT_CALL(NpcMoveTo, NPC_YoshiKidRed, 820, 0, 40 * DT)
         EVT_CALL(SetNpcAnimation, NPC_YoshiKidRed, ANIM_YoshiKid_Red_LookUp)
     EVT_END_THREAD
-    EVT_WAIT(70)
+    EVT_WAIT(70 * DT)
     EVT_EXEC_GET_TID(N(EVS_HoldPosition_Yoshis), LVarA)
     EVT_LOOP(0)
         EVT_WAIT(1)
@@ -188,20 +188,20 @@ EvtScript N(EVS_YoshiKids) = {
     EVT_CALL(SetNpcAnimation, NPC_YoshiKidYellow, ANIM_YoshiKid_Yellow_Idle)
     EVT_CALL(SetNpcAnimation, NPC_YoshiKidRed, ANIM_YoshiKid_Red_Idle)
     EVT_CALL(InterpNpcYaw, NPC_YoshiKidGreen, 270, 0)
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_LOOP(3)
         EVT_CALL(InterpNpcYaw, NPC_YoshiKidPurple, 270, 0)
-        EVT_WAIT(5)
+        EVT_WAIT(5 * DT)
         EVT_CALL(InterpNpcYaw, NPC_YoshiKidBlue, 270, 0)
-        EVT_WAIT(5)
+        EVT_WAIT(5 * DT)
         EVT_CALL(InterpNpcYaw, NPC_YoshiKidYellow, 270, 0)
-        EVT_WAIT(5)
+        EVT_WAIT(5 * DT)
         EVT_CALL(InterpNpcYaw, NPC_YoshiKidPurple, 90, 0)
-        EVT_WAIT(5)
+        EVT_WAIT(5 * DT)
         EVT_CALL(InterpNpcYaw, NPC_YoshiKidBlue, 90, 0)
-        EVT_WAIT(5)
+        EVT_WAIT(5 * DT)
         EVT_CALL(InterpNpcYaw, NPC_YoshiKidYellow, 90, 0)
-        EVT_WAIT(5)
+        EVT_WAIT(5 * DT)
     EVT_END_LOOP
     EVT_LOOP(0)
         EVT_WAIT(1)
@@ -220,7 +220,7 @@ EvtScript N(EVS_YoshiKids) = {
     EVT_CALL(SetNpcAnimation, NPC_YoshiKidYellow, ANIM_YoshiKid_Yellow_EatMiss)
     EVT_CALL(SetNpcYaw, NPC_YoshiKidRed, 90)
     EVT_CALL(SetNpcAnimation, NPC_YoshiKidRed, ANIM_YoshiKid_Red_EatMiss)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_EXEC(N(EVS_Puffs_Hurt))
     EVT_THREAD
         EVT_CALL(GetNpcPos, NPC_HuffNPuffBody, LVar0, LVar1, LVar2)
@@ -271,47 +271,47 @@ EvtScript N(EVS_YoshiKids) = {
             EVT_END_IF
         EVT_END_LOOP
     EVT_END_THREAD
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_CALL(SetNpcAnimation, NPC_YoshiKidGreen, ANIM_YoshiKid_Green_Exhale)
     EVT_CALL(SetNpcAnimation, NPC_YoshiKidBlue, ANIM_YoshiKid_Blue_Exhale)
     EVT_CALL(SetNpcAnimation, NPC_YoshiKidPurple, ANIM_YoshiKid_Purple_Exhale)
     EVT_CALL(SetNpcAnimation, NPC_YoshiKidYellow, ANIM_YoshiKid_Yellow_Exhale)
     EVT_CALL(SetNpcAnimation, NPC_YoshiKidRed, ANIM_YoshiKid_Red_Exhale)
-    EVT_WAIT(50)
+    EVT_WAIT(50 * DT)
     EVT_KILL_THREAD(LVarA)
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_YoshiKidGreen, ANIM_YoshiKid_Green_Run)
         EVT_CALL(GetNpcPos, NPC_YoshiKidGreen, LVar0, LVar1, LVar2)
         EVT_ADD(LVar0, 300)
-        EVT_CALL(NpcMoveTo, NPC_YoshiKidGreen, LVar0, LVar2, 75)
+        EVT_CALL(NpcMoveTo, NPC_YoshiKidGreen, LVar0, LVar2, 75 * DT)
         EVT_CALL(SetNpcPos, NPC_YoshiKidGreen, 0, -500, 0)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_YoshiKidBlue, ANIM_YoshiKid_Blue_Run)
         EVT_CALL(GetNpcPos, NPC_YoshiKidBlue, LVar0, LVar1, LVar2)
         EVT_ADD(LVar0, 300)
-        EVT_CALL(NpcMoveTo, NPC_YoshiKidBlue, LVar0, LVar2, 75)
+        EVT_CALL(NpcMoveTo, NPC_YoshiKidBlue, LVar0, LVar2, 75 * DT)
         EVT_CALL(SetNpcPos, NPC_YoshiKidBlue, 0, -500, 0)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_YoshiKidPurple, ANIM_YoshiKid_Purple_Run)
         EVT_CALL(GetNpcPos, NPC_YoshiKidPurple, LVar0, LVar1, LVar2)
         EVT_ADD(LVar0, 300)
-        EVT_CALL(NpcMoveTo, NPC_YoshiKidPurple, LVar0, LVar2, 75)
+        EVT_CALL(NpcMoveTo, NPC_YoshiKidPurple, LVar0, LVar2, 75 * DT)
         EVT_CALL(SetNpcPos, NPC_YoshiKidPurple, 0, -500, 0)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_YoshiKidYellow, ANIM_YoshiKid_Yellow_Run)
         EVT_CALL(GetNpcPos, NPC_YoshiKidYellow, LVar0, LVar1, LVar2)
         EVT_ADD(LVar0, 300)
-        EVT_CALL(NpcMoveTo, NPC_YoshiKidYellow, LVar0, LVar2, 75)
+        EVT_CALL(NpcMoveTo, NPC_YoshiKidYellow, LVar0, LVar2, 75 * DT)
         EVT_CALL(SetNpcPos, NPC_YoshiKidYellow, 0, -500, 0)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_YoshiKidRed, ANIM_YoshiKid_Red_Run)
         EVT_CALL(GetNpcPos, NPC_YoshiKidRed, LVar0, LVar1, LVar2)
         EVT_ADD(LVar0, 300)
-        EVT_CALL(NpcMoveTo, NPC_YoshiKidRed, LVar0, LVar2, 75)
+        EVT_CALL(NpcMoveTo, NPC_YoshiKidRed, LVar0, LVar2, 75 * DT)
         EVT_CALL(SetNpcPos, NPC_YoshiKidRed, 0, -500, 0)
     EVT_END_THREAD
     EVT_RETURN
@@ -327,7 +327,7 @@ EvtScript N(EVS_ParadePhase_HuffNPuff) = {
                 EVT_BREAK_LOOP
             EVT_END_IF
         EVT_END_LOOP
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(SetNpcFlagBits, NPC_HuffNPuffBody, NPC_FLAG_TOUCHES_GROUND, FALSE)
         EVT_CALL(SetNpcFlagBits, NPC_HuffNPuffFace, NPC_FLAG_TOUCHES_GROUND, FALSE)
         EVT_CALL(SetNpcFlagBits, NPC_HuffNPuffArms, NPC_FLAG_TOUCHES_GROUND, FALSE)
@@ -349,22 +349,22 @@ EvtScript N(EVS_ParadePhase_HuffNPuff) = {
         EVT_END_IF
     EVT_END_LOOP
     EVT_EXEC_GET_TID(N(EVS_HoldPosition_Puffs), LVarA)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_KILL_THREAD(LVarB)
     EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Leap)
     EVT_CALL(GetNpcPos, NPC_GourmetGuy, LVar0, LVar1, LVar2)
     EVT_CALL(NpcJump0, NPC_GourmetGuy, LVar0, LVar1, LVar2, 10)
     EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_TalkSurprise)
     EVT_EXEC_GET_TID(N(EVS_HoldPosition_GourmetGuy), LVarB)
-    EVT_WAIT(130)
+    EVT_WAIT(130 * DT)
     EVT_EXEC(N(EVS_Puffs_Surprise))
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(InterpNpcYaw, NPC_HuffNPuffBody, 90, 0)
     EVT_CALL(InterpNpcYaw, NPC_HuffNPuffFace, 90, 0)
     EVT_CALL(InterpNpcYaw, NPC_HuffNPuffArms, 90, 0)
     EVT_CALL(InterpNpcYaw, NPC_TuffPuff1, 90, 0)
     EVT_CALL(InterpNpcYaw, NPC_TuffPuff2, 90, 0)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_THREAD
         EVT_CALL(MakeLerp, 0, 90, 3, EASING_LINEAR)
         EVT_LOOP(0)
@@ -394,7 +394,7 @@ EvtScript N(EVS_ParadePhase_HuffNPuff) = {
         EVT_EXEC_WAIT(N(EVS_Puffs_Retreat))
         EVT_EXEC(N(EVS_Puffs_Surprise))
         EVT_EXEC_GET_TID(N(EVS_HoldPosition_Puffs), LVarA)
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_KILL_THREAD(LVarB)
         EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Walk)
         EVT_CALL(GetNpcPos, NPC_GourmetGuy, LVar0, LVar1, LVar2)
@@ -402,47 +402,47 @@ EvtScript N(EVS_ParadePhase_HuffNPuff) = {
         EVT_CALL(NpcMoveTo, NPC_GourmetGuy, LVar0, LVar2, 10)
         EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Idle)
         EVT_EXEC_GET_TID(N(EVS_HoldPosition_GourmetGuy), LVarB)
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
     EVT_END_LOOP
     EVT_KILL_THREAD(LVarA)
     EVT_THREAD
         EVT_CALL(GetNpcPos, NPC_HuffNPuffBody, LVar0, LVar1, LVar2)
-        EVT_CALL(NpcJump0, NPC_HuffNPuffBody, LVar0, LVar1, LVar2, 10)
+        EVT_CALL(NpcJump0, NPC_HuffNPuffBody, LVar0, LVar1, LVar2, 10 * DT)
         EVT_ADD(LVar0, -200)
-        EVT_CALL(NpcMoveTo, NPC_HuffNPuffBody, LVar0, LVar2, 50)
+        EVT_CALL(NpcMoveTo, NPC_HuffNPuffBody, LVar0, LVar2, 50 * DT)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(GetNpcPos, NPC_HuffNPuffFace, LVar0, LVar1, LVar2)
-        EVT_CALL(NpcJump0, NPC_HuffNPuffFace, LVar0, LVar1, LVar2, 10)
+        EVT_CALL(NpcJump0, NPC_HuffNPuffFace, LVar0, LVar1, LVar2, 10 * DT)
         EVT_ADD(LVar0, -200)
-        EVT_CALL(NpcMoveTo, NPC_HuffNPuffFace, LVar0, LVar2, 50)
+        EVT_CALL(NpcMoveTo, NPC_HuffNPuffFace, LVar0, LVar2, 50 * DT)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(GetNpcPos, NPC_HuffNPuffArms, LVar0, LVar1, LVar2)
-        EVT_CALL(NpcJump0, NPC_HuffNPuffArms, LVar0, LVar1, LVar2, 10)
+        EVT_CALL(NpcJump0, NPC_HuffNPuffArms, LVar0, LVar1, LVar2, 10 * DT)
         EVT_ADD(LVar0, -200)
-        EVT_CALL(NpcMoveTo, NPC_HuffNPuffArms, LVar0, LVar2, 50)
+        EVT_CALL(NpcMoveTo, NPC_HuffNPuffArms, LVar0, LVar2, 50 * DT)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(GetNpcPos, NPC_TuffPuff1, LVar0, LVar1, LVar2)
-        EVT_CALL(NpcJump0, NPC_TuffPuff1, LVar0, LVar1, LVar2, 10)
+        EVT_CALL(NpcJump0, NPC_TuffPuff1, LVar0, LVar1, LVar2, 10 * DT)
         EVT_ADD(LVar0, -200)
-        EVT_CALL(NpcMoveTo, NPC_TuffPuff1, LVar0, LVar2, 50)
+        EVT_CALL(NpcMoveTo, NPC_TuffPuff1, LVar0, LVar2, 50 * DT)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(GetNpcPos, NPC_TuffPuff2, LVar0, LVar1, LVar2)
-        EVT_CALL(NpcJump0, NPC_TuffPuff2, LVar0, LVar1, LVar2, 10)
+        EVT_CALL(NpcJump0, NPC_TuffPuff2, LVar0, LVar1, LVar2, 10 * DT)
         EVT_ADD(LVar0, -200)
-        EVT_CALL(NpcMoveTo, NPC_TuffPuff2, LVar0, LVar2, 50)
+        EVT_CALL(NpcMoveTo, NPC_TuffPuff2, LVar0, LVar2, 50 * DT)
     EVT_END_THREAD
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Inspect)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Walk)
     EVT_KILL_THREAD(LVarB)
     EVT_CALL(GetNpcPos, NPC_GourmetGuy, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, -300)
-    EVT_CALL(NpcMoveTo, NPC_GourmetGuy, LVar0, LVar2, 50)
+    EVT_CALL(NpcMoveTo, NPC_GourmetGuy, LVar0, LVar2, 50 * DT)
     EVT_RETURN
     EVT_END
 };

src/world/area_end/end_00/end_00_A_crystal_king.c

@@ -28,18 +28,18 @@ EvtScript N(EVS_ParadePhase_CrystalKing) = {
     EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim09)
     EVT_SET(LVar0, 77)
     EVT_EXEC_GET_TID(N(EVS_OffsetNpcScroll), LVarA)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(InterpNpcYaw, NPC_TrueCrystalKing, 90, 7)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim10)
     EVT_CALL(SetNpcAnimation, NPC_FakeCrystalKing, ANIM_CrystalKing_Anim10)
     EVT_SET(LVar0, 78)
     EVT_EXEC_GET_TID(N(EVS_OffsetNpcScroll), LVarB)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_FakeCrystalKing, ANIM_CrystalKing_Anim1C)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim19)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_KILL_THREAD(LVarA)
     EVT_CALL(GetNpcPos, NPC_TrueCrystalKing, LVar0, LVar1, LVar2)
     EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1)
@@ -49,7 +49,7 @@ EvtScript N(EVS_ParadePhase_CrystalKing) = {
     EVT_CALL(SetNpcPos, NPC_Duplighost1, LVar0, LVar1, LVar2)
     EVT_CALL(SetNpcJumpscale, NPC_Duplighost1, EVT_FLOAT(0.5))
     EVT_ADD(LVar0, -40)
-    EVT_CALL(NpcJump1, NPC_Duplighost1, LVar0, LVar1, LVar2, 20)
+    EVT_CALL(NpcJump1, NPC_Duplighost1, LVar0, LVar1, LVar2, 20 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Duplighost1, ANIM_Duplighost_Anim02)
     EVT_SET(LVar0, 75)
     EVT_EXEC_GET_TID(N(EVS_OffsetNpcScroll), LVarA)
@@ -57,36 +57,36 @@ EvtScript N(EVS_ParadePhase_CrystalKing) = {
     EVT_CALL(SetNpcAnimation, NPC_FakeCrystalKing, ANIM_CrystalKing_Anim0F)
     EVT_CALL(GetNpcPos, NPC_FakeCrystalKing, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, -80)
-    EVT_CALL(NpcMoveTo, NPC_FakeCrystalKing, LVar0, LVar2, 40)
+    EVT_CALL(NpcMoveTo, NPC_FakeCrystalKing, LVar0, LVar2, 40 * DT)
     EVT_SET(LVar0, 78)
     EVT_EXEC_GET_TID(N(EVS_OffsetNpcScroll), LVarB)
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_FakeCrystalKing, ANIM_CrystalKing_Anim10)
-        EVT_WAIT(60)
+        EVT_WAIT(60 * DT)
         EVT_CALL(SetNpcAnimation, NPC_FakeCrystalKing, ANIM_CrystalKing_Anim09)
     EVT_END_THREAD
     EVT_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_LOOP(4)
             EVT_CALL(SetNpcAnimation, NPC_Duplighost1, ANIM_Duplighost_Anim00)
-            EVT_WAIT(10)
+            EVT_WAIT(10 * DT)
             EVT_CALL(SetNpcAnimation, NPC_Duplighost1, ANIM_Duplighost_Anim07)
-            EVT_WAIT(10)
+            EVT_WAIT(10 * DT)
         EVT_END_LOOP
         EVT_CALL(SetNpcAnimation, NPC_Duplighost1, ANIM_Duplighost_Anim02)
     EVT_END_THREAD
-    EVT_WAIT(100)
+    EVT_WAIT(100 * DT)
     EVT_CALL(InterpNpcYaw, NPC_FakeCrystalKing, 90, 7)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_FakeCrystalKing, ANIM_CrystalKing_Anim10)
     EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim10)
     EVT_SET(LVar0, 77)
     EVT_EXEC_GET_TID(N(EVS_OffsetNpcScroll), LVarC)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim1C)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_FakeCrystalKing, ANIM_CrystalKing_Anim19)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_KILL_THREAD(LVarB)
     EVT_CALL(GetNpcPos, NPC_FakeCrystalKing, LVar0, LVar1, LVar2)
     EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1)
@@ -94,7 +94,7 @@ EvtScript N(EVS_ParadePhase_CrystalKing) = {
     EVT_CALL(SetNpcPos, NPC_Duplighost2, LVar0, LVar1, LVar2)
     EVT_CALL(SetNpcJumpscale, NPC_Duplighost2, EVT_FLOAT(0.5))
     EVT_ADD(LVar0, -40)
-    EVT_CALL(NpcJump1, NPC_Duplighost2, LVar0, LVar1, LVar2, 20)
+    EVT_CALL(NpcJump1, NPC_Duplighost2, LVar0, LVar1, LVar2, 20 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Duplighost2, ANIM_Duplighost_Anim02)
     EVT_SET(LVar0, 76)
     EVT_EXEC_GET_TID(N(EVS_OffsetNpcScroll), LVarB)
@@ -102,33 +102,33 @@ EvtScript N(EVS_ParadePhase_CrystalKing) = {
     EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim0F)
     EVT_CALL(GetNpcPos, NPC_TrueCrystalKing, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, -80)
-    EVT_CALL(NpcMoveTo, NPC_TrueCrystalKing, LVar0, LVar2, 40)
+    EVT_CALL(NpcMoveTo, NPC_TrueCrystalKing, LVar0, LVar2, 40 * DT)
     EVT_SET(LVar0, 77)
     EVT_EXEC_GET_TID(N(EVS_OffsetNpcScroll), LVarC)
     EVT_THREAD
         EVT_LOOP(6)
             EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim10)
-            EVT_WAIT(10)
+            EVT_WAIT(10 * DT)
             EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim11)
-            EVT_WAIT(10)
+            EVT_WAIT(10 * DT)
         EVT_END_LOOP
     EVT_END_THREAD
     EVT_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_LOOP(4)
             EVT_CALL(SetNpcAnimation, NPC_Duplighost1, ANIM_Duplighost_Anim00)
             EVT_CALL(SetNpcAnimation, NPC_Duplighost2, ANIM_Duplighost_Anim00)
-            EVT_WAIT(10)
+            EVT_WAIT(10 * DT)
             EVT_CALL(SetNpcAnimation, NPC_Duplighost1, ANIM_Duplighost_Anim07)
             EVT_CALL(SetNpcAnimation, NPC_Duplighost2, ANIM_Duplighost_Anim07)
-            EVT_WAIT(10)
+            EVT_WAIT(10 * DT)
         EVT_END_LOOP
         EVT_CALL(SetNpcAnimation, NPC_Duplighost1, ANIM_Duplighost_Anim02)
         EVT_CALL(SetNpcAnimation, NPC_Duplighost2, ANIM_Duplighost_Anim02)
     EVT_END_THREAD
-    EVT_WAIT(60)
+    EVT_WAIT(60 * DT)
     EVT_THREAD
-        EVT_CALL(LoadPath, 50, EVT_PTR(N(CrystalsFlyInPath)), ARRAY_COUNT(N(CrystalsFlyInPath)), EASING_LINEAR)
+        EVT_CALL(LoadPath, 50 * DT, EVT_PTR(N(CrystalsFlyInPath)), ARRAY_COUNT(N(CrystalsFlyInPath)), EASING_LINEAR)
         EVT_LOOP(0)
             EVT_CALL(GetNextPathPos)
             EVT_SET(LVar4, LVar1)
@@ -146,11 +146,11 @@ EvtScript N(EVS_ParadePhase_CrystalKing) = {
             EVT_END_IF
         EVT_END_LOOP
     EVT_END_THREAD
-    EVT_WAIT(50)
+    EVT_WAIT(50 * DT)
     EVT_KILL_THREAD(LVarC)
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim19)
-        EVT_CALL(LoadPath, 50, EVT_PTR(N(CrystalsFlyOutPath)), ARRAY_COUNT(N(CrystalsFlyInPath)), EASING_LINEAR)
+        EVT_CALL(LoadPath, 50 * DT, EVT_PTR(N(CrystalsFlyOutPath)), ARRAY_COUNT(N(CrystalsFlyInPath)), EASING_LINEAR)
         EVT_LOOP(0)
             EVT_CALL(GetNextPathPos)
             EVT_SET(LVar4, LVar1)
@@ -172,12 +172,12 @@ EvtScript N(EVS_ParadePhase_CrystalKing) = {
     EVT_END_THREAD
     EVT_CALL(SetNpcAnimation, NPC_Duplighost1, ANIM_Duplighost_Anim02)
     EVT_CALL(SetNpcAnimation, NPC_Duplighost2, ANIM_Duplighost_Anim02)
-    EVT_LOOP(50)
+    EVT_LOOP(50 * DT)
         EVT_CALL(NpcFaceNpc, NPC_Duplighost1, NPC_TrueCrystalKing, 0)
         EVT_CALL(NpcFaceNpc, NPC_Duplighost2, NPC_TrueCrystalKing, 0)
         EVT_WAIT(1)
     EVT_END_LOOP
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Duplighost1, ANIM_Duplighost_Anim03)
     EVT_CALL(SetNpcAnimation, NPC_Duplighost2, ANIM_Duplighost_Anim03)
     EVT_KILL_THREAD(LVarA)

src/world/area_end/end_00/end_00_B_bowser.c

@@ -3,8 +3,8 @@
 
 EvtScript N(EVS_JrTroopa_SpinningDodge) = {
     EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff)
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
-    EVT_CALL(MakeLerp, 0, 360, 10, EASING_LINEAR)
+    EVT_CALL(MakeLerp, 0, 360, 10 * DT, EASING_LINEAR)
     EVT_LOOP(0)
         EVT_CALL(UpdateLerp)
         EVT_CALL(SetNpcRotation, NPC_JrTroopa, 0, LVar0, 0)
@@ -18,184 +18,184 @@ EvtScript N(EVS_JrTroopa_SpinningDodge) = {
 };
 
 EvtScript N(EVS_ParadePhase_Bowser) = {
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcJumpscale, NPC_JrTroopa, EVT_FLOAT(0.5))
-    EVT_CALL(NpcJump1, NPC_JrTroopa, 2010, 0, 0, 20)
+    EVT_CALL(NpcJump1, NPC_JrTroopa, 2010, 0, 0, 20 * DT)
     EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Run)
-    EVT_CALL(NpcMoveTo, NPC_JrTroopa, 1930, 0, 20)
+    EVT_CALL(NpcMoveTo, NPC_JrTroopa, 1930, 0, 20 * DT)
     EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle)
     EVT_CALL(InterpNpcYaw, NPC_JrTroopa, 90, 0)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff)
     EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 1930, 0, 0, 2160, 100, 0, 10)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2160, 100, 0, 1930, 0, 0, 10)
     EVT_EXEC(N(EVS_JrTroopa_SpinningDodge))
-    EVT_CALL(NpcJump1, NPC_JrTroopa, 1890, 0, 0, 20)
+    EVT_CALL(NpcJump1, NPC_JrTroopa, 1890, 0, 0, 20 * DT)
     EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle)
-    EVT_CALL(NpcFlyTo, NPC_Kammy, 2060, 60, 0, 10, -10, EASING_LINEAR)
+    EVT_CALL(NpcFlyTo, NPC_Kammy, 2060, 60, 0, 10 * DT, -10, EASING_LINEAR)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F)
     EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2060, 60, 0, 1890, 0, 0, 10)
     EVT_EXEC(N(EVS_JrTroopa_SpinningDodge))
-    EVT_CALL(NpcJump1, NPC_JrTroopa, 2040, 0, 0, 20)
+    EVT_CALL(NpcJump1, NPC_JrTroopa, 2040, 0, 0, 20 * DT)
     EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim14)
-    EVT_CALL(NpcFlyTo, NPC_Kammy, 1940, 60, 0, 20, -10, EASING_LINEAR)
+    EVT_CALL(NpcFlyTo, NPC_Kammy, 1940, 60, 0, 20 * DT, -10, EASING_LINEAR)
     EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 0)
     EVT_CALL(InterpNpcYaw, NPC_JrTroopa, 270, 0)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F)
     EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 1940, 60, 0, 2040, 0, 0, 10)
     EVT_EXEC(N(EVS_JrTroopa_SpinningDodge))
-    EVT_CALL(NpcJump1, NPC_JrTroopa, 2160, 0, 0, 20)
+    EVT_CALL(NpcJump1, NPC_JrTroopa, 2160, 0, 0, 20 * DT)
     EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff)
     EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2160, 0, 0, 1940, 60, 0, 20)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim14)
     EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, 1940, 60, 0, EVT_FLOAT(0.5), 10)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcPos, NPC_Kammy, 0, -500, 0)
     EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, 2100, 60, 0, EVT_FLOAT(0.5), 10)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcPos, NPC_Kammy, 2100, 60, 0)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F)
     EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2100, 60, 0, 2160, 0, 0, 10)
     EVT_EXEC(N(EVS_JrTroopa_SpinningDodge))
-    EVT_CALL(NpcJump1, NPC_JrTroopa, 2100, 0, 0, 20)
+    EVT_CALL(NpcJump1, NPC_JrTroopa, 2100, 0, 0, 20 * DT)
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Run)
-        EVT_CALL(NpcMoveTo, NPC_JrTroopa, 1900, 0, 50)
+        EVT_CALL(NpcMoveTo, NPC_JrTroopa, 1900, 0, 50 * DT)
     EVT_END_THREAD
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim14)
     EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 0)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim12)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim14)
     EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 0)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
-    EVT_CALL(NpcFlyTo, NPC_Kammy, 1900, 40, 0, 25, -10, EASING_LINEAR)
+    EVT_CALL(NpcFlyTo, NPC_Kammy, 1900, 40, 0, 25 * DT, -10, EASING_LINEAR)
-    EVT_WAIT(150)
+    EVT_WAIT(150 * DT)
     EVT_THREAD
-        EVT_WAIT(35)
+        EVT_WAIT(35 * DT)
         EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2040, 60, -20, 2180, 0, 20, 10)
-        EVT_WAIT(35)
+        EVT_WAIT(35 * DT)
         EVT_CALL(SetNpcPos, NPC_Kammy, 2390, 120, -20)
-        EVT_CALL(NpcFlyTo, NPC_Kammy, 2440, 60, -20, 10, -10, EASING_LINEAR)
+        EVT_CALL(NpcFlyTo, NPC_Kammy, 2440, 60, -20, 10 * DT, -10, EASING_LINEAR)
         EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 0)
     EVT_END_THREAD
-    EVT_CALL(SetNpcPos, NPC_JrTroopa, 2040, 0, 20)
+    EVT_CALL(SetNpcPos, NPC_JrTroopa, 2040, 0, 20 * DT)
     EVT_CALL(SetNpcYaw, NPC_JrTroopa, 90)
-    EVT_CALL(NpcMoveTo, NPC_JrTroopa, 2400, 20, 90)
+    EVT_CALL(NpcMoveTo, NPC_JrTroopa, 2400, 20, 90 * DT)
     EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff)
     EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2400, 0, 20, 2440, 60, -20, 10)
     EVT_THREAD
-        EVT_CALL(NpcFlyTo, NPC_Kammy, 2300, 60, -20, 20, -10, EASING_LINEAR)
+        EVT_CALL(NpcFlyTo, NPC_Kammy, 2300, 60, -20, 20 * DT, -10, EASING_LINEAR)
         EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 0)
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E)
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F)
         EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2300, 60, -20, 2390, 40, 0, 10)
     EVT_END_THREAD
     EVT_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Run)
-        EVT_CALL(NpcMoveTo, NPC_JrTroopa, 2480, 20, 20)
+        EVT_CALL(NpcMoveTo, NPC_JrTroopa, 2480, 20, 20 * DT)
         EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle)
         EVT_CALL(InterpNpcYaw, NPC_JrTroopa, 270, 0)
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff)
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff)
         EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2480, 0, 20, 2390, 40, 0, 10)
     EVT_END_THREAD
-    EVT_WAIT(60)
+    EVT_WAIT(60 * DT)
     EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 2390, 40, 5, EVT_FLOAT(5.0), 30)
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_HammerBros1, ANIM_ParadeKoopas_Bowser_HammerBrosPanic)
-        EVT_CALL(NpcMoveTo, NPC_HammerBros1, 2180, 0, 30)
+        EVT_CALL(NpcMoveTo, NPC_HammerBros1, 2180, 0, 30 * DT)
         EVT_CALL(SetNpcPos, NPC_HammerBros1, 0, -500, 0)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_HammerBros2, ANIM_ParadeKoopas_Bowser_HammerBrosPanic)
-        EVT_CALL(NpcMoveTo, NPC_HammerBros2, 2140, 0, 30)
+        EVT_CALL(NpcMoveTo, NPC_HammerBros2, 2140, 0, 30 * DT)
         EVT_CALL(SetNpcPos, NPC_HammerBros2, 0, -500, 0)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_Koopatrol1, ANIM_ParadeKoopas_Bowser_KoopatrolPanic)
-        EVT_CALL(NpcMoveTo, NPC_Koopatrol1, 2680, 0, 50)
+        EVT_CALL(NpcMoveTo, NPC_Koopatrol1, 2680, 0, 50 * DT)
         EVT_CALL(SetNpcPos, NPC_Koopatrol1, 0, -500, 0)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_Koopatrol2, ANIM_ParadeKoopas_Bowser_KoopatrolPanic)
-        EVT_CALL(NpcMoveTo, NPC_Koopatrol2, 2720, 0, 50)
+        EVT_CALL(NpcMoveTo, NPC_Koopatrol2, 2720, 0, 50 * DT)
         EVT_CALL(SetNpcPos, NPC_Koopatrol2, 0, -500, 0)
     EVT_END_THREAD
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcPos, NPC_Bowser, 0, -500, 0)
     EVT_CALL(SetNpcPos, NPC_BowserPropeller, 0, -500, 0)
     EVT_CALL(SetNpcPos, NPC_BurntBowser, 2390, 10, 0)
     EVT_CALL(SetNpcPos, NPC_BurntBowserPropeller, 2390, 10, 0)
-    EVT_WAIT(60)
+    EVT_WAIT(60 * DT)
     EVT_CALL(SetNpcAnimation, NPC_BurntBowser, ANIM_ParadeBurntBowser_BurntDrawBack)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0C)
-        EVT_CALL(NpcFlyTo, NPC_Kammy, 2180, 60, -20, 30, -10, EASING_LINEAR)
+        EVT_CALL(NpcFlyTo, NPC_Kammy, 2180, 60, -20, 30 * DT, -10, EASING_LINEAR)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Run)
-        EVT_CALL(NpcMoveTo, NPC_JrTroopa, 2160, 20, 40)
+        EVT_CALL(NpcMoveTo, NPC_JrTroopa, 2160, 20, 40 * DT)
     EVT_END_THREAD
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_THREAD
-        EVT_CALL(NpcMoveTo, NPC_BurntBowserPropeller, 2270, 0, 60)
+        EVT_CALL(NpcMoveTo, NPC_BurntBowserPropeller, 2270, 0, 60 * DT)
     EVT_END_THREAD
-    EVT_CALL(NpcMoveTo, NPC_BurntBowser, 2270, 0, 60)
+    EVT_CALL(NpcMoveTo, NPC_BurntBowser, 2270, 0, 60 * DT)
     EVT_PLAY_EFFECT(EFFECT_FIRE_BREATH, 0, 2270, 40, -5, 2280, 40, -5, 5, 2, 30, 0, 0, 0)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim07)
         EVT_CALL(SetNpcYaw, NPC_Kammy, 90)
         EVT_CALL(SetNpcPos, NPC_Kammy, 2280, 0, 0)
         EVT_CALL(SetNpcJumpscale, NPC_Kammy, EVT_FLOAT(0.5))
-        EVT_CALL(NpcJump1, NPC_Kammy, 2380, 0, 0, 20)
+        EVT_CALL(NpcJump1, NPC_Kammy, 2380, 0, 0, 20 * DT)
-        EVT_CALL(NpcJump1, NPC_Kammy, 2430, 0, 0, 10)
+        EVT_CALL(NpcJump1, NPC_Kammy, 2430, 0, 0, 10 * DT)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_BurnStill)
         EVT_CALL(SetNpcYaw, NPC_JrTroopa, 90)
         EVT_CALL(SetNpcPos, NPC_JrTroopa, 2320, 0, 0)
         EVT_CALL(SetNpcJumpscale, NPC_JrTroopa, EVT_FLOAT(0.5))
-        EVT_CALL(NpcJump1, NPC_JrTroopa, 2420, 0, 0, 20)
+        EVT_CALL(NpcJump1, NPC_JrTroopa, 2420, 0, 0, 20 * DT)
-        EVT_CALL(NpcJump1, NPC_JrTroopa, 2470, 0, 0, 10)
+        EVT_CALL(NpcJump1, NPC_JrTroopa, 2470, 0, 0, 10 * DT)
     EVT_END_THREAD
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_SETF(LVar0, 2430)
     EVT_SETF(LVar1, 2470)
     EVT_CHILD_THREAD
         EVT_LOOP(0)
-            EVT_ADDF(LVar0, EVT_FLOAT(0.87))
+            EVT_ADDF(LVar0, EVT_FLOAT(0.8702 / DT))
             EVT_CALL(SetNpcPos, NPC_Kammy, LVar0, 0, 0)
-            EVT_ADDF(LVar1, EVT_FLOAT(0.87))
+            EVT_ADDF(LVar1, EVT_FLOAT(0.8702 / DT))
             EVT_CALL(SetNpcPos, NPC_JrTroopa, LVar1, 0, 0)
             EVT_WAIT(1)
         EVT_END_LOOP
@@ -207,7 +207,7 @@ EvtScript N(EVS_ParadePhase_Bowser) = {
             EVT_BREAK_LOOP
         EVT_END_IF
     EVT_END_LOOP
-    EVT_WAIT(100)
+    EVT_WAIT(100 * DT)
     EVT_RETURN
     EVT_END
 };

src/world/area_end/end_01/credits_jobs_pal.inc.c

@@ -0,0 +1,230 @@
+#include "../common/Credits.h"
+
+CreditsEntry N(Credits_Jobs)[] = {
+    {
+        .msgID = MSG_Credits_0019,
+        .posX = STANDARD_POS_X,
+        .posY = 166,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 1735,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 0,
+        .next = 1793,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = 0,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 0,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 0,
+        .perCharDelayOut = 0,
+        .next = 50,
+    },
+    {
+        .msgID = MSG_Credits_001A,
+        .posX = STANDARD_POS_X,
+        .posY = 170,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 175,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 0,
+        .next = 233,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_001B,
+        .posX = STANDARD_POS_X,
+        .posY = 170,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 375,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 0,
+        .next = 433,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_001D,
+        .posX = STANDARD_POS_X,
+        .posY = 170,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 175,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 0,
+        .next = 233,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_001C,
+        .posX = STANDARD_POS_X,
+        .posY = 170,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 375,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 0,
+        .next = 433,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_001E,
+        .posX = STANDARD_POS_X,
+        .posY = 170,
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 2,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 175,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 0,
+        .next = 233,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = 0,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 0,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 0,
+        .perCharDelayOut = 0,
+        .next = 60,
+    },
+    {
+        .msgID = MSG_Credits_0005,
+        .posX = STANDARD_POS_X,
+        .posY = 172,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = 50,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 210,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 40,
+        .perCharDelayOut = 0,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0006,
+        .posX = STANDARD_POS_X,
+        .posY = 188,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = 50,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 210,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 40,
+        .perCharDelayOut = 0,
+        .next = 300,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = 0,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 0,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 0,
+        .perCharDelayOut = 0,
+        .next = 25,
+    },
+    {
+        .msgID = MSG_PAL_Credits_009F,
+        .posX = STANDARD_POS_X,
+        .posY = 166,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = 50,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 210,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 40,
+        .perCharDelayOut = 0,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_PAL_Credits_00A0,
+        .posX = STANDARD_POS_X,
+        .posY = 176,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = 50,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 210,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 40,
+        .perCharDelayOut = 0,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_PAL_Credits_00A1,
+        .posX = STANDARD_POS_X,
+        .posY = 186,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = 50,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 210,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 40,
+        .perCharDelayOut = 0,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_PAL_Credits_00A2,
+        .posX = STANDARD_POS_X,
+        .posY = 200,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = 50,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 210,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 40,
+        .perCharDelayOut = 0,
+        .next = 300,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = 0,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 0,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 0,
+        .perCharDelayOut = 0,
+        .next = -1,
+    },
+};

src/world/area_end/end_01/credits_names_pal.inc.c

@@ -0,0 +1,583 @@
+#include "../common/Credits.h"
+
+CreditsEntry N(Credits_Names)[] = {
+    {
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = 0,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 0,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 0,
+        .perCharDelayOut = 0,
+        .next = 33,
+    },
+    {
+        .msgID = MSG_Credits_0071,
+        .posX = STANDARD_POS_X,
+        .posY = 186,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0072,
+        .posX = STANDARD_POS_X,
+        .posY = 203,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 160,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0066,
+        .posX = STANDARD_POS_X,
+        .posY = 186,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0065,
+        .posX = STANDARD_POS_X,
+        .posY = 203,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 160,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0075,
+        .posX = STANDARD_POS_X,
+        .posY = 186,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0073,
+        .posX = STANDARD_POS_X,
+        .posY = 203,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 160,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0055,
+        .posX = STANDARD_POS_X,
+        .posY = 186,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0051,
+        .posX = STANDARD_POS_X,
+        .posY = 203,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 160,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0059,
+        .posX = STANDARD_POS_X,
+        .posY = 186,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_005A,
+        .posX = STANDARD_POS_X,
+        .posY = 203,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 160,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0053,
+        .posX = STANDARD_POS_X,
+        .posY = 182,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_005B,
+        .posX = STANDARD_POS_X,
+        .posY = 195,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_005C,
+        .posX = STANDARD_POS_X,
+        .posY = 208,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 160,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_005D,
+        .posX = STANDARD_POS_X,
+        .posY = 186,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_005E,
+        .posX = STANDARD_POS_X,
+        .posY = 203,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 160,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_005F,
+        .posX = STANDARD_POS_X,
+        .posY = 182,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0060,
+        .posX = STANDARD_POS_X,
+        .posY = 195,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0061,
+        .posX = STANDARD_POS_X,
+        .posY = 208,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 160,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0068,
+        .posX = STANDARD_POS_X,
+        .posY = 191,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 160,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_PAL_Credits_009E,
+        .posX = STANDARD_POS_X,
+        .posY = 191,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 116,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 160,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0085,
+        .posX = STANDARD_POS_X,
+        .posY = 182,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 102,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 0,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0086,
+        .posX = STANDARD_POS_X,
+        .posY = 195,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 102,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 0,
+        .next = 0,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0087,
+        .posX = STANDARD_POS_X,
+        .posY = 208,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 102,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 0,
+        .next = 160,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = 0,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 0,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 0,
+        .perCharDelayOut = 0,
+        .next = 50,
+    },
+    {
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = 0,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 0,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 0,
+        .perCharDelayOut = 0,
+        .next = 33,
+    },
+    {
+        .msgID = MSG_Credits_0052,
+        .posX = STANDARD_POS_X,
+        .posY = 191,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 142,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 0,
+        .next = 200,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = 0,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 0,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 0,
+        .perCharDelayOut = 0,
+        .next = 33,
+    },
+    {
+        .msgID = MSG_Credits_006A,
+        .posX = STANDARD_POS_X,
+        .posY = 191,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = 40,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 156,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 200,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_0054,
+        .posX = STANDARD_POS_X,
+        .posY = 191,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 142,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 0,
+        .next = 200,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = 0,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 0,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 0,
+        .perCharDelayOut = 0,
+        .next = 33,
+    },
+    {
+        .msgID = MSG_Credits_006D,
+        .posX = STANDARD_POS_X,
+        .posY = 191,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 142,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 0,
+        .next = 200,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = 0,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 0,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 0,
+        .perCharDelayOut = 0,
+        .next = 33,
+    },
+    {
+        .msgID = MSG_Credits_006C,
+        .posX = STANDARD_POS_X,
+        .posY = 191,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 156,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 1,
+        .next = 200,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .msgID = MSG_Credits_006B,
+        .posX = STANDARD_POS_X,
+        .posY = 191,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 1,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 142,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 0,
+        .next = 200,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = 0,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 0,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 0,
+        .perCharDelayOut = 0,
+        .next = 33,
+    },
+    {
+        .msgID = MSG_Credits_006E,
+        .posX = STANDARD_POS_X,
+        .posY = 191,
+        .palette = 1,
+        .appearMode = CREDITS_APPEAR_MODE_00,
+        .appearTime = STANDARD_APPEAR_TIME,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 142,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 25,
+        .perCharDelayOut = 0,
+        .next = 200,
+        .flags = CREDITS_FLAG_1,
+    },
+    {
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = 0,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 0,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 0,
+        .perCharDelayOut = 0,
+        .next = 50,
+    },
+    {
+        .appearMode = CREDITS_APPEAR_MODE_04,
+        .appearTime = 0,
+        .perCharDelayIn = 0,
+        .holdMode = CREDITS_HOLD_MODE_00,
+        .holdTime = 0,
+        .vanishMode = CREDITS_VANISH_MODE_00,
+        .vanishTime = 0,
+        .perCharDelayOut = 0,
+        .next = -1,
+    },
+};

src/world/area_end/end_01/end_01_2_credits.c

@@ -2,8 +2,13 @@
 
 #include "../common/Credits.inc.c"
 
+#if VERSION_PAL
+#include "credits_jobs_pal.inc.c"
+#include "credits_names_pal.inc.c"
+#else
 #include "credits_jobs.inc.c"
 #include "credits_names.inc.c"
+#endif
 
 EvtScript N(EVS_InitCredits) = {
     EVT_CALL(N(InitCredits))

src/world/area_end/end_01/end_01_3_parade_setup.c

@@ -67,7 +67,7 @@ API_CALLABLE(N(UpdateCameraScroll)) {
     Camera* camera = &gCameras[gCurrentCameraID];
 
     camera->panActive = TRUE;
-    camera->movePos.x += PARADE_SCROLL_RATE;
+    camera->movePos.x += PARADE_SCROLL_RATE / DT;
     return ApiStatus_DONE2;
 }
 
@@ -79,7 +79,7 @@ API_CALLABLE(N(AddScrollToNpcPos)) {
         *npc = get_npc_unsafe(evt_get_variable(script, *args++));
     }
 
-    (*npc)->pos.x += PARADE_SCROLL_RATE;
+    (*npc)->pos.x += PARADE_SCROLL_RATE / DT;
 
     return ApiStatus_BLOCK;
 }
@@ -108,7 +108,7 @@ EvtScript N(EVS_UpdateScrollPos) = {
     EVT_LOOP(0)
         EVT_CALL(N(UpdateCameraScroll))
         EVT_CALL(TranslateGroup, MODEL_bg, LVar1, 0, 0)
-        EVT_ADDF(LVar1, EVT_FLOAT(PARADE_SCROLL_RATE))
+        EVT_ADDF(LVar1, EVT_FLOAT(PARADE_SCROLL_RATE / DT))
         EVT_WAIT(1)
     EVT_END_LOOP
     EVT_RETURN

src/world/area_end/end_01/end_01_4_opera_float.c

@@ -309,7 +309,7 @@ EvtScript N(EVS_ParadePhase_Opera) = {
     EVT_EXEC_GET_TID(N(EVS_TexPan_OperaFloat_MainStageLights), LVarA)
     EVT_EXEC_GET_TID(N(EVS_UpdateLightshow), LVarC)
     EVT_CALL(SetNpcFlagBits, NPC_Singer, NPC_FLAG_8, TRUE)
-    EVT_CALL(MakeLerp, 0, 55, 90, EASING_LINEAR)
+    EVT_CALL(MakeLerp, 0, 55, 90 * DT, EASING_LINEAR)
     EVT_LOOP(0)
         EVT_CALL(UpdateLerp)
         EVT_CALL(TranslateModel, MODEL_kino1, 0, LVar0, 0)

src/world/area_end/end_01/end_01_5_flower_float.c

@@ -69,18 +69,18 @@ EvtScript N(EVS_Amayze_Dayzees) = {
 EvtScript N(EVS_Sun) = {
     EVT_THREAD
         EVT_CALL(SetNpcPos, NPC_SunSad, -2185, 130, -30)
-        EVT_CALL(NpcFlyTo, NPC_SunSad, -2185, 50, -30, 10, 0, EASING_LINEAR)
+        EVT_CALL(NpcFlyTo, NPC_SunSad, -2185, 50, -30, 10 * DT, 0, EASING_LINEAR)
-        EVT_CALL(NpcFlyTo, NPC_SunSad, -2045, 50, -30, 70, 0, EASING_LINEAR)
+        EVT_CALL(NpcFlyTo, NPC_SunSad, -2045, 50, -30, 70 * DT, 0, EASING_LINEAR)
         EVT_CALL(SetNpcAnimation, NPC_SunSad, ANIM_Sun_TalkPleased)
-        EVT_CALL(NpcFlyTo, NPC_SunSad, -1645, 50, -30, 200, 0, EASING_LINEAR)
+        EVT_CALL(NpcFlyTo, NPC_SunSad, -1645, 50, -30, 200 * DT, 0, EASING_LINEAR)
         EVT_CALL(SetNpcPos, NPC_SunSad, 0, -500, 0)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(SetNpcPos, NPC_SunHappy, -2185, 130, -30)
-        EVT_CALL(NpcFlyTo, NPC_SunHappy, -2185, 50, -30, 10, 0, EASING_LINEAR)
+        EVT_CALL(NpcFlyTo, NPC_SunHappy, -2185, 50, -30, 10 * DT, 0, EASING_LINEAR)
-        EVT_CALL(NpcFlyTo, NPC_SunHappy, -2045, 50, -30, 70, 0, EASING_LINEAR)
+        EVT_CALL(NpcFlyTo, NPC_SunHappy, -2045, 50, -30, 70 * DT, 0, EASING_LINEAR)
         EVT_CALL(SetNpcAnimation, NPC_SunHappy, ANIM_Sun_FireTalkPleased)
-        EVT_CALL(NpcFlyTo, NPC_SunHappy, -1645, 50, -30, 200, 0, EASING_LINEAR)
+        EVT_CALL(NpcFlyTo, NPC_SunHappy, -1645, 50, -30, 200 * DT, 0, EASING_LINEAR)
         EVT_CALL(SetNpcPos, NPC_SunHappy, 0, -500, 0)
     EVT_END_THREAD
     EVT_RETURN

src/world/area_end/end_01/end_01_7_peach_float.c

@@ -106,8 +106,8 @@ EvtScript N(EVS_Twink) = {
             EVT_BREAK_LOOP
         EVT_END_IF
     EVT_END_LOOP
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
-    EVT_CALL(LoadPath, 60, EVT_PTR(N(TwinkFlightPath)), ARRAY_COUNT(N(TwinkFlightPath)), EASING_LINEAR)
+    EVT_CALL(LoadPath, 60 * DT, EVT_PTR(N(TwinkFlightPath)), ARRAY_COUNT(N(TwinkFlightPath)), EASING_LINEAR)
     EVT_LOOP(0)
         EVT_CALL(GetNextPathPos)
         EVT_CALL(SetNpcPos, NPC_Twink, LVar1, LVar2, LVar3)
@@ -116,10 +116,10 @@ EvtScript N(EVS_Twink) = {
             EVT_BREAK_LOOP
         EVT_END_IF
     EVT_END_LOOP
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(InterpNpcYaw, NPC_Twink, 270, 0)
-    EVT_WAIT(70)
+    EVT_WAIT(70 * DT)
-    EVT_CALL(NpcFlyTo, NPC_Twink, -249, 120, 0, 10, -10, EASING_LINEAR)
+    EVT_CALL(NpcFlyTo, NPC_Twink, -249, 120, 0, 10 * DT, -10, EASING_LINEAR)
     EVT_CALL(SetNpcPos, NPC_Twink, 0, -500, 0)
     EVT_RETURN
     EVT_END
@@ -127,28 +127,28 @@ EvtScript N(EVS_Twink) = {
 
 EvtScript N(EVS_Mario) = {
     EVT_LOOP(5)
-        EVT_CALL(InterpNpcYaw, NPC_Mario, 90, 7)
+        EVT_CALL(InterpNpcYaw, NPC_Mario, 90, 7 * DT)
-        EVT_WAIT(45)
+        EVT_WAIT(45 * DT)
-        EVT_CALL(InterpNpcYaw, NPC_Mario, 270, 7)
+        EVT_CALL(InterpNpcYaw, NPC_Mario, 270, 7 * DT)
-        EVT_WAIT(45)
+        EVT_WAIT(45 * DT)
     EVT_END_LOOP
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Mario, ANIM_ParadeMario_Surprise)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Mario, ANIM_ParadeMario_LookUp)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(InterpNpcYaw, NPC_Mario, 90, 0)
-    EVT_WAIT(70)
+    EVT_WAIT(70 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Mario, ANIM_ParadeMario_WaveUp)
-    EVT_WAIT(60)
+    EVT_WAIT(60 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Mario, ANIM_ParadeMario_LookUp)
-    EVT_WAIT(60)
+    EVT_WAIT(60 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Mario, ANIM_ParadeMario_Idle)
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Mario, ANIM_ParadeMario_NodYes)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Mario, ANIM_ParadeMario_Idle)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Mario, ANIM_ParadeMario_WalkBack)
     EVT_CALL(GetNpcPos, NPC_Mario, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, 5)
@@ -157,7 +157,7 @@ EvtScript N(EVS_Mario) = {
     EVT_LOOP(7)
         EVT_ADD(LVar1, -5)
         EVT_CALL(SetNpcPos, NPC_Mario, LVar0, LVar1, LVar2)
-        EVT_WAIT(5)
+        EVT_WAIT(5 * DT)
     EVT_END_LOOP
     EVT_CALL(SetNpcPos, NPC_Mario, LVar0, 0, LVar2)
     EVT_RETURN
@@ -166,32 +166,32 @@ EvtScript N(EVS_Mario) = {
 
 EvtScript N(EVS_Peach) = {
     EVT_LOOP(5)
-        EVT_CALL(InterpNpcYaw, NPC_Peach, 90, 7)
+        EVT_CALL(InterpNpcYaw, NPC_Peach, 90, 7 * DT)
-        EVT_WAIT(45)
+        EVT_WAIT(45 * DT)
-        EVT_CALL(InterpNpcYaw, NPC_Peach, 270, 7)
+        EVT_CALL(InterpNpcYaw, NPC_Peach, 270, 7 * DT)
-        EVT_WAIT(45)
+        EVT_WAIT(45 * DT)
     EVT_END_LOOP
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_ParadePeach_ShadeRaiseArms)
-    EVT_WAIT(60)
+    EVT_WAIT(60 * DT)
     EVT_CALL(InterpNpcYaw, NPC_Peach, 90, 0)
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_ParadePeach_ShadeWaveFast)
-    EVT_WAIT(60)
+    EVT_WAIT(60 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_ParadePeach_ShadeIdle)
-    EVT_WAIT(60)
+    EVT_WAIT(60 * DT)
     EVT_CALL(InterpNpcYaw, NPC_Peach, 270, 0)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_ParadePeach_ShadeRaiseArms)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_ParadePeach_ShadeTalk)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_ParadePeach_ShadeLowerArms)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_ParadePeach_ShadeIdle)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_ParadePeach_ShadeSlightBow)
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_ParadePeach_ShadeWalkBack)
     EVT_CALL(GetNpcPos, NPC_Peach, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, -5)
@@ -200,7 +200,7 @@ EvtScript N(EVS_Peach) = {
     EVT_LOOP(7)
         EVT_ADD(LVar1, -5)
         EVT_CALL(SetNpcPos, NPC_Peach, LVar0, LVar1, LVar2)
-        EVT_WAIT(5)
+        EVT_WAIT(5 * DT)
     EVT_END_LOOP
     EVT_CALL(SetNpcPos, NPC_Peach, LVar0, 0, LVar2)
     EVT_RETURN
@@ -250,7 +250,7 @@ EvtScript N(EVS_Twirler) = {
             EVT_WAIT(5)
         EVT_END_LOOP
     EVT_END_CHILD_THREAD
-    EVT_CALL(SetNpcSpeed, LVar0, EVT_FLOAT(PARADE_SCROLL_RATE))
+    EVT_CALL(SetNpcSpeed, LVar0, EVT_FLOAT(PARADE_SCROLL_RATE / DT))
     EVT_CALL(GetNpcPos, LVar0, LVar2, LVar3, LVar4)
     EVT_ADD(LVar2, -600)
     EVT_CALL(NpcMoveTo, LVar0, LVar2, LVar4, 0)
@@ -259,7 +259,7 @@ EvtScript N(EVS_Twirler) = {
 };
 
 EvtScript N(EVS_StandardBearer) = {
-    EVT_CALL(SetNpcSpeed, LVar0, EVT_FLOAT(PARADE_SCROLL_RATE))
+    EVT_CALL(SetNpcSpeed, LVar0, EVT_FLOAT(PARADE_SCROLL_RATE / DT))
     EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3)
     EVT_ADD(LVar1, -600)
     EVT_CALL(NpcMoveTo, LVar0, LVar1, LVar2, 0)
@@ -293,7 +293,7 @@ EvtScript N(EVS_ParadePhase_Toads2) = {
     EVT_EXEC(N(EVS_StandardBearer))
     EVT_SETF(LVar0, 0)
     EVT_LOOP(500)
-        EVT_SUBF(LVar0, EVT_FLOAT(PARADE_SCROLL_RATE))
+        EVT_SUBF(LVar0, EVT_FLOAT(PARADE_SCROLL_RATE / DT))
         EVT_CALL(TranslateGroup, MODEL_kinoko, LVar0, 0, 0)
         EVT_WAIT(1)
     EVT_END_LOOP
@@ -304,12 +304,12 @@ EvtScript N(EVS_ParadePhase_Toads2) = {
 EvtScript N(EVS_MarioPeachExit) = {
     // walk away into the distance
     EVT_THREAD
-        EVT_CALL(NpcMoveTo, NPC_Mario, -259, -150, 240)
+        EVT_CALL(NpcMoveTo, NPC_Mario, -259, -150, 240 * DT)
     EVT_END_THREAD
     EVT_THREAD
-        EVT_CALL(NpcMoveTo, NPC_Peach, -229, -150, 240)
+        EVT_CALL(NpcMoveTo, NPC_Peach, -229, -150, 240 * DT)
     EVT_END_THREAD
-    EVT_WAIT(60)
+    EVT_WAIT(60 * DT)
     // slowly pan camera up
     EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_SETF(LVar1, EVT_FLOAT(0.0))

src/world/area_flo/flo_00/flo_00_3_npc.c

@@ -47,30 +47,30 @@ EvtScript N(EVS_Wisterwood_Introduction) = {
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-8.0))
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
-    EVT_WAIT(75)
+    EVT_WAIT(75 * DT)
     EVT_CALL(ShowMessageAtScreenPos, MSG_CH6_0000, 160, 40)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.5))
-    EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 12)
+    EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 12 * DT)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(DisablePartnerAI, 0)
     EVT_CALL(InterpPlayerYaw, 270, 0)
     EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_CALL(InterpPlayerYaw, 90, 0)
     EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, 800)
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-5.8))
     EVT_CALL(SetCamPosA, CAM_DEFAULT, -2, 0)
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Dummy_Wisterwood, -1, -1, 5, MSG_CH6_0001)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
     EVT_CALL(InterpPlayerYaw, 350, 0)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_CALL(ContinueSpeech, NPC_Dummy_Wisterwood, -1, -1, 5, MSG_CH6_0002)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, 333)
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(9.0), EVT_FLOAT(-22.0))
     EVT_CALL(SetCamPosA, CAM_DEFAULT, -2, 0)
@@ -78,16 +78,16 @@ EvtScript N(EVS_Wisterwood_Introduction) = {
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(EnablePartnerAI)
     EVT_CALL(func_802D2C14, 1)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(ShowMessageAtWorldPos, MSG_CH6_0003, 0, 70, -200)
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(16.5), EVT_FLOAT(-11.8))
     EVT_CALL(SetCamDistance, CAM_DEFAULT, 525)
     EVT_CALL(SetCamPosA, CAM_DEFAULT, -14, 0)
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
     EVT_CALL(ShowMessageAtWorldPos, MSG_CH6_0004, 0, 50, -200)
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(9.0), EVT_FLOAT(-22.0))
@@ -95,7 +95,7 @@ EvtScript N(EVS_Wisterwood_Introduction) = {
     EVT_CALL(SetCamPosA, CAM_DEFAULT, -2, 0)
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(ShowMessageAtWorldPos, MSG_CH6_0005, 0, 70, -200)
     EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0))
     EVT_SET(GB_StoryProgress, STORY_CH6_ARRIVED_AT_FLOWER_FIELDS)
@@ -180,14 +180,14 @@ EvtScript N(EVS_Interact_Wisterwood) = {
 
 EvtScript N(EVS_Wisterwood_Farewell) = {
     EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 0, 600, EVT_FLOAT(21.0), EVT_FLOAT(-12.0))
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(ShowMessageAtWorldPos, MSG_CH6_000B, 0, 50, -200)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 0, -30)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, 250)
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(25.0), EVT_FLOAT(-25.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(ShowMessageAtWorldPos, MSG_CH6_000C, 0, 50, -200)
     EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0))
     EVT_RETURN
@@ -457,14 +457,14 @@ EvtScript N(EVS_Scene_RescuedKlevar) = {
     EVT_WAIT(1)
     EVT_CALL(WaitForPlayerInputEnabled)
     EVT_CALL(DisablePlayerInput, TRUE)
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Klevar, ANIM_WorldKlevar_Talk, ANIM_WorldKlevar_Idle, SPEECH_FLAG_200, MSG_CH6_00D8)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0))
     EVT_CALL(SetCamPitch, CAM_DEFAULT, 18, -9)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_CALL(MakeLerp, 0, 360, 10, EASING_LINEAR)
+    EVT_CALL(MakeLerp, 0, 360, 10 * DT, EASING_LINEAR)
     EVT_LOOP(0)
         EVT_CALL(UpdateLerp)
         EVT_CALL(SetNpcRotation, NPC_Klevar, 0, LVar0, 0)
@@ -475,7 +475,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = {
     EVT_END_LOOP
     EVT_CALL(EnableNpcAI, NPC_Klevar, FALSE)
     EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Leap)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower)
     EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
@@ -485,51 +485,51 @@ EvtScript N(EVS_Scene_RescuedKlevar) = {
     EVT_ADD(LVar3, 30)
     EVT_LOOP(5)
         EVT_PLAY_EFFECT(EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 20)
-        EVT_WAIT(6)
+        EVT_WAIT(6 * DT)
         EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar0, LVar3, LVar2, 20)
-        EVT_WAIT(6)
+        EVT_WAIT(6 * DT)
     EVT_END_LOOP
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(PlaySoundAtPlayer, SOUND_188, SOUND_SPACE_MODE_0)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_ADD(LVar1, 20)
     EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
     EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Idle)
     EVT_CALL(EnableNpcAI, NPC_Klevar, TRUE)
     EVT_CALL(N(UpgradeStarPowerCh6))
     EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0196, 160, 40)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(GetNpcPos, NPC_Klevar, LVar0, LVar1, LVar2)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Klevar, ANIM_WorldKlevar_Talk, ANIM_WorldKlevar_Idle, SPEECH_FLAG_200, MSG_CH6_00D9)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, -25)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Klevar, ANIM_WorldKlevar_Talk, ANIM_WorldKlevar_Idle, SPEECH_FLAG_200, MSG_CH6_00DA)
     EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE)
     EVT_THREAD
         EVT_LOOP(25)
             EVT_CALL(GetNpcPos, NPC_Klevar, LVar0, LVar1, LVar2)
             EVT_PLAY_EFFECT(EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 20)
-            EVT_WAIT(4)
+            EVT_WAIT(4 * DT)
         EVT_END_LOOP
     EVT_END_THREAD
     EVT_THREAD
         EVT_SET(LVar2, 0)
         EVT_SET(LVar3, 1800)
-        EVT_CALL(MakeLerp, LVar2, LVar3, 100, EASING_CUBIC_IN)
+        EVT_CALL(MakeLerp, LVar2, LVar3, 100 * DT, EASING_CUBIC_IN)
         EVT_LOOP(0)
             EVT_CALL(UpdateLerp)
             EVT_CALL(SetNpcRotation, NPC_Klevar, 0, LVar0, 0)
@@ -543,7 +543,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = {
         EVT_CALL(GetNpcPos, NPC_Klevar, LVar2, LVar3, LVar4)
         EVT_SET(LVar5, LVar3)
         EVT_ADD(LVar5, 180)
-        EVT_CALL(MakeLerp, LVar3, LVar5, 100, EASING_CUBIC_IN)
+        EVT_CALL(MakeLerp, LVar3, LVar5, 100 * DT, EASING_CUBIC_IN)
         EVT_LOOP(0)
             EVT_CALL(UpdateLerp)
             EVT_CALL(SetNpcPos, NPC_Klevar, LVar2, LVar0, LVar4)
@@ -555,12 +555,12 @@ EvtScript N(EVS_Scene_RescuedKlevar) = {
         EVT_CALL(SetNpcPos, NPC_Klevar, NPC_DISPOSE_LOCATION)
     EVT_END_THREAD
     EVT_THREAD
-        EVT_WAIT(15)
+        EVT_WAIT(15 * DT)
         EVT_CALL(PlaySoundAtNpc, NPC_Klevar, SOUND_2045, SOUND_SPACE_MODE_0)
     EVT_END_THREAD
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp)
-    EVT_WAIT(110)
+    EVT_WAIT(110 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
     EVT_SET(GB_StoryProgress, STORY_CH6_STAR_SPRIT_DEPARTED)
     EVT_EXEC_WAIT(N(EVS_Wisterwood_Farewell))

src/world/area_flo/flo_03/flo_03_3_npc.c

@@ -149,12 +149,12 @@ EvtScript N(EVS_NpcInteract_Petunia) = {
     EVT_SWITCH(GB_StoryProgress)
         EVT_CASE_LT(STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES)
             EVT_SET(MV_PauseBurrowing, TRUE)
-            EVT_SET(LVar4, EVT_FLOAT(3.5))
+            EVT_SET(LVar4, EVT_FLOAT(3.5 / DT))
             EVT_EXEC_WAIT(N(EVS_FocusCamBetween))
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0050)
             EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Petunia_Angry)
             EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes)
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0051)
             EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim12)
             EVT_CALL(SetNpcYaw, NPC_MontyMole_01, 270)
@@ -166,10 +166,10 @@ EvtScript N(EVS_NpcInteract_Petunia) = {
             EVT_CALL(SetCamDistance, CAM_DEFAULT, 200)
             EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
             EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0)
             EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim16)
-            EVT_WAIT(10)
+            EVT_WAIT(10 * DT)
             EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_263, SOUND_SPACE_MODE_0)
             EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_QUESTION, -45, 30, EMOTER_NPC, 0, 0, 0, 0)
             EVT_CALL(GetNpcPos, NPC_MontyMole_02, LVar0, LVar1, LVar2)
@@ -183,11 +183,11 @@ EvtScript N(EVS_NpcInteract_Petunia) = {
             EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
             EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
             EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim00)
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0)
             EVT_CALL(SetNpcPos, NPC_MontyMole_02, LVar0, LVar1, LVar2)
             EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim10)
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0053)
             EVT_CALL(SetNpcYaw, NPC_MontyMole_03, 270)
             EVT_CALL(GetNpcPos, NPC_MontyMole_03, LVar0, LVar1, LVar2)
@@ -197,7 +197,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = {
             EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-8.0))
             EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
             EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_CALL(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim14)
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0054)
             EVT_CALL(SetNpcYaw, NPC_MontyMole_04, 270)
@@ -209,11 +209,11 @@ EvtScript N(EVS_NpcInteract_Petunia) = {
             EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
             EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
             EVT_CALL(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim06)
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_CALL(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim07)
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_CALL(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim08)
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_CALL(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim16)
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0055)
             EVT_CALL(SetNpcPos, NPC_Dayzee, -233, 0, -217)
@@ -227,7 +227,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = {
             EVT_CALL(SetNpcAnimation, NPC_Dayzee, ANIM_Dayzee_Anim0D)
             EVT_CALL(PlaySoundAtNpc, NPC_Dayzee, SOUND_262, SOUND_SPACE_MODE_0)
             EVT_CALL(ShowEmote, NPC_Dayzee, EMOTE_EXCLAMATION, 45, 30, EMOTER_NPC, 0, 0, 0, 0)
-            EVT_WAIT(15)
+            EVT_WAIT(15 * DT)
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0056)
             EVT_SET(LVar4, EVT_FLOAT(90.0))
             EVT_EXEC_WAIT(N(EVS_FocusCamBetween))
@@ -246,15 +246,15 @@ EvtScript N(EVS_NpcInteract_Petunia) = {
                 EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0058)
                 EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Petunia_Angry)
             EVT_ELSE
-                EVT_SET(LVar4, EVT_FLOAT(3.5))
+                EVT_SET(LVar4, EVT_FLOAT(3.5 / DT))
                 EVT_EXEC_WAIT(N(EVS_FocusCamBetween))
                 EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_HappyTalk, ANIM_Petunia_Dance, 0, MSG_CH6_0059)
                 EVT_CALL(EndSpeech, NPC_SELF, ANIM_Petunia_Talk, ANIM_Petunia_Idle, 0)
                 EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Petunia_GiveItem)
-                EVT_WAIT(20)
+                EVT_WAIT(20 * DT)
                 EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Petunia_Idle)
                 EVT_GIVE_KEY_REWARD(ITEM_MAGICAL_BEAN)
-                EVT_WAIT(20)
+                EVT_WAIT(20 * DT)
                 EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_Talk, ANIM_Petunia_Idle, 0, MSG_CH6_005A)
                 EVT_CALL(EndSpeech, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0)
                 EVT_SET(GB_StoryProgress, STORY_CH6_GOT_MAGICAL_BEAN)
@@ -271,7 +271,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = {
                 EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_Talk, ANIM_Petunia_Idle, 0, MSG_CH6_005E)
             EVT_END_IF
     EVT_END_SWITCH
-    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(8.0))
+    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(8.0 / DT))
     EVT_EXEC_WAIT(N(EVS_PopSong))
     EVT_RETURN
     EVT_END

src/world/area_flo/flo_07/flo_07_3_npc.c

@@ -44,7 +44,7 @@ EvtScript N(EVS_MakeCrystalBerry) = {
     EVT_THREAD
         EVT_CALL(SetCamDistance, CAM_DEFAULT, 300)
         EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.0), EVT_FLOAT(-7.5))
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5 / DT))
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_END_THREAD
     EVT_CALL(PlaySound, SOUND_8000006B)
@@ -53,10 +53,10 @@ EvtScript N(EVS_MakeCrystalBerry) = {
     EVT_KILL_THREAD(MV_GroundShakingScript)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, 350)
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.0), EVT_FLOAT(-7.5))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(8.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(8.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_SUB(LVar0, LVar2)
     EVT_IF_LT(LVar0, -250)
@@ -68,7 +68,7 @@ EvtScript N(EVS_MakeCrystalBerry) = {
     EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND)
     EVT_CALL(func_802D62E4, SOUND_3BC)
     EVT_SET(AF_FLO_MadeCrystalBerry, TRUE)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Posie, ANIM_Posie_Talk, ANIM_Posie_Idle, 0, MSG_CH6_006A)
     EVT_SET(GB_StoryProgress, STORY_CH6_GOT_CRYSTAL_BERRY)
     EVT_RETURN
@@ -87,10 +87,10 @@ EvtScript N(EVS_NpcInteract_Posie) = {
                 EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Posie_Talk, ANIM_Posie_Idle, 0, MSG_CH6_0071)
             EVT_END_IF
         EVT_CASE_LT(STORY_CH6_GOT_FERTILE_SOIL)
-            EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), 0, EVT_FLOAT(350.0), EVT_FLOAT(18.0), EVT_FLOAT(-7.5))
+            EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT), 0, EVT_FLOAT(350.0), EVT_FLOAT(18.0), EVT_FLOAT(-7.5))
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Posie_Talk, ANIM_Posie_Idle, 0, MSG_CH6_0065)
             EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Posie_GiveItem)
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Posie_Still)
             EVT_GIVE_KEY_REWARD(ITEM_FERTILE_SOIL)
             EVT_SET(GB_StoryProgress, STORY_CH6_GOT_FERTILE_SOIL)
@@ -98,7 +98,7 @@ EvtScript N(EVS_NpcInteract_Posie) = {
             EVT_IF_EQ(GF_FLO12_RosieRequestedSomethingBeautiful, TRUE)
                 EVT_EXEC_WAIT(N(EVS_MakeCrystalBerry))
             EVT_END_IF
-            EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0))
+            EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
         EVT_CASE_LT(STORY_CH6_GOT_CRYSTAL_BERRY)
             EVT_IF_EQ(GF_FLO12_RosieRequestedSomethingBeautiful, TRUE)
                 EVT_IF_EQ(AF_FLO_MadeCrystalBerry, FALSE)

src/world/area_flo/flo_08/flo_08_4_npc.c

@@ -17,7 +17,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = {
         EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
         EVT_CALL(SetCamDistance, CAM_DEFAULT, 350)
         EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.5), EVT_FLOAT(-7.5))
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
         EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
         EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Yellow_Talk, ANIM_GateFlower_Yellow_Idle, 0, MSG_CH6_0042)
@@ -35,7 +35,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = {
                 EVT_SET(LVar7, LVar0)
                 EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, SOUND_SPACE_MODE_0)
                 EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Yellow_Eat)
-                EVT_WAIT(20)
+                EVT_WAIT(20 * DT)
                 EVT_CALL(RemoveItemEntity, LVar7)
                 EVT_SWITCH(LVar8)
                     EVT_CASE_EQ(160)
@@ -77,7 +77,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = {
                         EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2096, SOUND_SPACE_MODE_0)
                         EVT_CALL(MakeItemEntity, LVar8, 125, 20, 0, ITEM_SPAWN_MODE_DECORATION, 0)
                         EVT_SET(LVar7, LVar0)
-                        EVT_WAIT(5)
+                        EVT_WAIT(5 * DT)
                         EVT_CALL(GetAngleToPlayer, NPC_SELF, LVar0)
                         EVT_IF_LT(LVar0, 180)
                             EVT_CALL(MakeLerp, 0, 100, 7, EASING_LINEAR)
@@ -125,9 +125,9 @@ EvtScript N(EVS_NpcInteract_GateFlower) = {
                 EVT_END_SWITCH
         EVT_END_SWITCH
         EVT_THREAD
-            EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(6.0))
+            EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(6.0 / DT))
         EVT_END_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
     EVT_ELSE
         EVT_IF_LT(GB_StoryProgress, STORY_CH6_STAR_SPIRIT_RESCUED)
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Yellow_HappyTalk, ANIM_GateFlower_Yellow_HappyIdle, 0, MSG_CH6_0047)

src/world/area_flo/flo_10/flo_10_4_fountain.c

@@ -173,12 +173,12 @@ EvtScript N(EVS_FountainSlowing) = {
 };
 
 EvtScript N(EVS_Scene_ReleaseFountain) = {
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still)
     EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar3, LVar4, LVar5)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT))
     EVT_CALL(SetCamDistance, CAM_DEFAULT, 600)
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
@@ -219,24 +219,24 @@ EvtScript N(EVS_Scene_PostReleaseFountain) = {
     EVT_CALL(SetNpcPos, NPC_Lily, -57, -20, -105)
     EVT_CALL(InterpNpcYaw, NPC_Lily, 90, 0)
     EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 0, 450, EVT_FLOAT(25.0), EVT_FLOAT(-6.0))
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_GetUp)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_EXEC_WAIT(N(EVS_PushFlowerSong))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Lily, ANIM_Lily_Talk, ANIM_Lily_Idle, 5, MSG_CH6_0082)
     EVT_CALL(NpcFacePlayer, NPC_Lily, 1)
     EVT_CALL(SpeakToPlayer, NPC_Lily, ANIM_Lily_TalkHappy, ANIM_Lily_IdleHappy, 0, MSG_CH6_0083)
     EVT_CALL(SetNpcAnimation, NPC_Lily, ANIM_Lily_GiveItem)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Lily, ANIM_Lily_Idle)
     EVT_GIVE_KEY_REWARD(ITEM_MIRACLE_WATER)
     EVT_CALL(SpeakToPlayer, NPC_Lily, ANIM_Lily_TalkHappy, ANIM_Lily_IdleHappy, 0, MSG_CH6_0084)
     EVT_CALL(EndSpeech, NPC_Lily, ANIM_Lily_Talk, ANIM_Lily_Idle, 0)
     EVT_CALL(SetNpcAnimation, NPC_Lily, ANIM_Lily_Idle)
-    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0))
+    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
     EVT_EXEC_WAIT(N(EVS_PopSong))
     EVT_CALL(DisablePlayerPhysics, FALSE)
     EVT_CALL(DisablePlayerInput, FALSE)

src/world/area_flo/flo_10/flo_10_5_npc.c

@@ -43,16 +43,16 @@ EvtScript N(EVS_OnInteract_WaterStoneSocket) = {
             EVT_CASE_EQ(-1)
                 EVT_CALL(CloseChoicePopup)
                 EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL)
-                EVT_WAIT(10)
+                EVT_WAIT(10 * DT)
                 EVT_CALL(SpeakToPlayer, NPC_Lily, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 0, MSG_CH6_0081)
             EVT_CASE_DEFAULT
                 EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5)
                 EVT_CALL(PlayerMoveTo, -17, -17, 20)
                 EVT_CALL(func_802CF56C, 2)
                 EVT_CALL(InterpPlayerYaw, 100, 1)
-                EVT_WAIT(10)
+                EVT_WAIT(10 * DT)
-                EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(1.0), 0, 450, EVT_FLOAT(25.0), EVT_FLOAT(-6.0))
+                EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(1.0 / DT), 0, 450, EVT_FLOAT(25.0), EVT_FLOAT(-6.0))
-                EVT_WAIT(10)
+                EVT_WAIT(10 * DT)
                 EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_PlaceItem)
                 EVT_CALL(RemoveKeyItemAt, LVar1)
                 EVT_CALL(MakeItemEntity, ITEM_WATER_STONE, 0, -60, 6, ITEM_SPAWN_MODE_DECORATION, 0)
@@ -75,7 +75,7 @@ EvtScript N(EVS_SetupWaterStoneSocket) = {
 };
 
 EvtScript N(EVS_MovePlayerToTalk) = {
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
     EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5)
     EVT_IF_LT(LVar5, LVar2)
@@ -96,7 +96,7 @@ EvtScript N(EVS_MovePlayerToTalk) = {
                     EVT_ADD(LVar0, 40)
                 EVT_END_IF
                 EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
-                EVT_CALL(PlayerMoveTo, LVar0, LVar5, 15)
+                EVT_CALL(PlayerMoveTo, LVar0, LVar5, 15 * DT)
                 EVT_CALL(PlayerFaceNpc, NPC_Lily, TRUE)
                 EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE)
             EVT_END_THREAD
@@ -115,10 +115,10 @@ EvtScript N(EVS_NpcInteract_Lily) = {
             EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
             EVT_CALL(SetCamDistance, CAM_DEFAULT, 325)
             EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(23.0), EVT_FLOAT(-9.0))
-            EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+            EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
             EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
             EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-            EVT_WAIT(10)
+            EVT_WAIT(10 * DT)
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 5, MSG_CH6_0078)
             EVT_CALL(EndSpeech, NPC_SELF, ANIM_Lily_DreadLoop, ANIM_Lily_Dread, 5)
         EVT_CASE_LT(STORY_CH6_GOT_WATER_STONE)
@@ -129,34 +129,34 @@ EvtScript N(EVS_NpcInteract_Lily) = {
                 EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
                 EVT_CALL(SetCamDistance, CAM_DEFAULT, 325)
                 EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(23.0), EVT_FLOAT(-9.0))
-                EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+                EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
                 EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
                 EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-                EVT_WAIT(10)
+                EVT_WAIT(10 * DT)
                 EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 5, MSG_CH6_0079)
                 EVT_CALL(NpcFacePlayer, NPC_SELF, 1)
                 EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Lily_Idle)
                 EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0)
                 EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0)
-                EVT_WAIT(15)
+                EVT_WAIT(15 * DT)
                 EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Lily_Idle, ANIM_Lily_Idle, 0, MSG_CH6_007A)
                 EVT_CALL(EndSpeech, NPC_SELF, ANIM_Lily_Dread, ANIM_Lily_Idle, 0)
                 EVT_CALL(GetPlayerTargetYaw, LVar0)
                 EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 1)
-                EVT_WAIT(20)
+                EVT_WAIT(20 * DT)
                 EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Lily_Talk, ANIM_Lily_Idle, 5, MSG_CH6_007B)
                 EVT_CALL(NpcFacePlayer, NPC_SELF, 1)
-                EVT_WAIT(20)
+                EVT_WAIT(20 * DT)
                 EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Lily_Talk, ANIM_Lily_Idle, 0, MSG_CH6_007C)
                 EVT_CALL(ShowChoice, MSG_Choice_0011)
-                EVT_WAIT(10)
+                EVT_WAIT(10 * DT)
                 EVT_SWITCH(LVar0)
                     EVT_CASE_EQ(0)
                         EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_Lily_TalkHappy, ANIM_Lily_IdleHappy, 0, MSG_CH6_007D)
                     EVT_CASE_EQ(1)
                         EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 0, MSG_CH6_007E)
                 EVT_END_SWITCH
-                EVT_WAIT(10)
+                EVT_WAIT(10 * DT)
                 EVT_SET(GF_FLO10_LilyRequestedWaterStone, TRUE)
                 EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 0)
             EVT_ELSE
@@ -174,7 +174,7 @@ EvtScript N(EVS_NpcInteract_Lily) = {
         EVT_CASE_DEFAULT
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Lily_Talk, ANIM_Lily_Idle, 0, MSG_CH6_0087)
     EVT_END_SWITCH
-    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0))
+    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
     EVT_EXEC_WAIT(N(EVS_PopSong))
     EVT_RETURN
     EVT_END

src/world/area_flo/flo_11/flo_11_3_npc.c

@@ -77,7 +77,7 @@ EvtScript N(EVS_LakitusFlying_Search) = {
     EVT_SET(LVar0, 5)
     EVT_EXEC_GET_TID(N(EVS_PlayFlightSounds), MV_FlyingSoundsScript)
     EVT_THREAD
-        EVT_CALL(LoadPath, 160, EVT_PTR(N(FlightPath_Lakitu_01_Search)),
+        EVT_CALL(LoadPath, 160 * DT, EVT_PTR(N(FlightPath_Lakitu_01_Search)),
             ARRAY_COUNT(N(FlightPath_Lakitu_01_Search)), EASING_LINEAR)
         EVT_LOOP(0)
             EVT_CALL(GetNextPathPos)
@@ -88,7 +88,7 @@ EvtScript N(EVS_LakitusFlying_Search) = {
             EVT_END_IF
         EVT_END_LOOP
     EVT_END_THREAD
-    EVT_CALL(LoadPath, 160, EVT_PTR(N(FlightPath_Lakitu_02_Search)),
+    EVT_CALL(LoadPath, 160 * DT, EVT_PTR(N(FlightPath_Lakitu_02_Search)),
         ARRAY_COUNT(N(FlightPath_Lakitu_02_Search)), EASING_LINEAR)
     EVT_LOOP(0)
         EVT_CALL(GetNextPathPos)
@@ -105,7 +105,7 @@ EvtScript N(EVS_LakitusFlying_Search) = {
 
 EvtScript N(EVS_LakitusFlying_Gather) = {
     EVT_THREAD
-        EVT_CALL(LoadPath, 30, EVT_PTR(N(FlightPath_Lakitu_01_Gather)),
+        EVT_CALL(LoadPath, 30 * DT, EVT_PTR(N(FlightPath_Lakitu_01_Gather)),
             ARRAY_COUNT(N(FlightPath_Lakitu_01_Gather)), EASING_LINEAR)
         EVT_LOOP(0)
             EVT_CALL(GetNextPathPos)
@@ -116,7 +116,7 @@ EvtScript N(EVS_LakitusFlying_Gather) = {
             EVT_END_IF
         EVT_END_LOOP
     EVT_END_THREAD
-    EVT_CALL(LoadPath, 45, EVT_PTR(N(FlightPath_Lakitu_02_Gather)),
+    EVT_CALL(LoadPath, 45 * DT, EVT_PTR(N(FlightPath_Lakitu_02_Gather)),
         ARRAY_COUNT(N(FlightPath_Lakitu_02_Gather)), EASING_LINEAR)
     EVT_LOOP(0)
         EVT_CALL(GetNextPathPos)
@@ -135,7 +135,7 @@ EvtScript N(EVS_LakitusFlying_Attack) = {
     EVT_SET(LVar0, 4)
     EVT_EXEC_GET_TID(N(EVS_PlayFlightSounds), MV_FlyingSoundsScript)
     EVT_THREAD
-        EVT_CALL(LoadPath, 35, EVT_PTR(N(FlightPath_Lakitu_01_Attack)),
+        EVT_CALL(LoadPath, 35 * DT, EVT_PTR(N(FlightPath_Lakitu_01_Attack)),
             ARRAY_COUNT(N(FlightPath_Lakitu_01_Attack)), EASING_LINEAR)
         EVT_LOOP(0)
             EVT_CALL(GetNextPathPos)
@@ -146,7 +146,7 @@ EvtScript N(EVS_LakitusFlying_Attack) = {
             EVT_END_IF
         EVT_END_LOOP
     EVT_END_THREAD
-    EVT_CALL(LoadPath, 35, EVT_PTR(N(FlightPath_Lakitu_02_Attack)),
+    EVT_CALL(LoadPath, 35 * DT, EVT_PTR(N(FlightPath_Lakitu_02_Attack)),
         ARRAY_COUNT(N(FlightPath_Lakitu_02_Attack)), EASING_LINEAR)
     EVT_LOOP(0)
         EVT_CALL(GetNextPathPos)
@@ -162,7 +162,7 @@ EvtScript N(EVS_LakitusFlying_Attack) = {
 
 EvtScript N(EVS_LakitusFlying_Flee) = {
     EVT_THREAD
-        EVT_CALL(LoadPath, 40, EVT_PTR(N(FlightPath_Lakitu_01_Flee)),
+        EVT_CALL(LoadPath, 40 * DT, EVT_PTR(N(FlightPath_Lakitu_01_Flee)),
             ARRAY_COUNT(N(FlightPath_Lakitu_01_Flee)), EASING_LINEAR)
         EVT_LOOP(0)
             EVT_CALL(GetNextPathPos)
@@ -174,7 +174,7 @@ EvtScript N(EVS_LakitusFlying_Flee) = {
         EVT_END_LOOP
         EVT_CALL(SetNpcPos, NPC_Lakitu_01, NPC_DISPOSE_LOCATION)
     EVT_END_THREAD
-    EVT_CALL(LoadPath, 40, EVT_PTR(N(FlightPath_Lakitu_02_Flee)),
+    EVT_CALL(LoadPath, 40 * DT, EVT_PTR(N(FlightPath_Lakitu_02_Flee)),
         ARRAY_COUNT(N(FlightPath_Lakitu_02_Flee)), EASING_LINEAR)
     EVT_LOOP(0)
         EVT_CALL(GetNextPathPos)
@@ -185,7 +185,7 @@ EvtScript N(EVS_LakitusFlying_Flee) = {
         EVT_END_IF
     EVT_END_LOOP
     EVT_CALL(SetNpcPos, NPC_Lakitu_02, NPC_DISPOSE_LOCATION)
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_KILL_THREAD(MV_FlyingSoundsScript)
     EVT_RETURN
     EVT_END
@@ -232,10 +232,10 @@ EvtScript N(EVS_Scene_LakituAmbush) = {
     EVT_CALL(SetCamPosA, CAM_DEFAULT, 87, 0)
     EVT_CALL(SetCamPosB, CAM_DEFAULT, 0, -50)
     EVT_CALL(SetCamPosC, CAM_DEFAULT, 87, 0)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, 150)
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-16.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
@@ -253,7 +253,7 @@ EvtScript N(EVS_Scene_LakituAmbush) = {
     EVT_CALL(NpcFaceNpc, NPC_Lakitu_02, NPC_Lakitu_01, 1)
     EVT_CALL(SpeakToPlayer, NPC_Lakitu_02, ANIM_Lakitu_Anim16, ANIM_Lakitu_Anim01, 0, MSG_CH6_0089)
     EVT_CALL(InterpNpcYaw, NPC_Lakitu_01, 0, 1)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Lakitu_01, ANIM_Lakitu_Anim16, ANIM_Lakitu_Anim01, 0, MSG_CH6_008A)
     EVT_CALL(SpeakToPlayer, NPC_Lakitu_02, ANIM_Lakitu_Anim16, ANIM_Lakitu_Anim01, 0, MSG_CH6_008B)
     EVT_CALL(SetCamType, CAM_DEFAULT, 1, FALSE)

src/world/area_flo/flo_13/flo_13_4_npc.c

@@ -174,12 +174,12 @@ EvtScript N(EVS_Lakilulu_SpinyToss) = {
     EVT_CALL(SetNpcYaw, NPC_Lakilulu_Spiny, 270)
     EVT_CALL(SetNpcPos, NPC_Lakilulu_Spiny, LVar1, LVar2, LVar3)
     EVT_THREAD
-        EVT_WAIT(5)
+        EVT_WAIT(5 * DT)
         EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail)
     EVT_END_THREAD
     EVT_CALL(ContinueSpeech, NPC_Lakilulu, -1, -1, SPEECH_FLAG_200, MSG_CH6_00A8)
     EVT_THREAD
-        EVT_WAIT(15)
+        EVT_WAIT(15 * DT)
         EVT_CALL(EndSpeech, NPC_Lakilulu, -1, -1, SPEECH_FLAG_200)
     EVT_END_THREAD
     EVT_SET(MV_LakiluluSpinySceneState, 1)
@@ -199,7 +199,7 @@ EvtScript N(EVS_Lakilulu_SpinyToss) = {
     EVT_ADD(LVar2, 10)
     EVT_THREAD
         EVT_CALL(SetNpcJumpscale, NPC_Lakilulu_Spiny, EVT_FLOAT(1.5))
-        EVT_CALL(NpcJump0, NPC_Lakilulu_Spiny, LVar1, LVar2, LVar3, 15)
+        EVT_CALL(NpcJump0, NPC_Lakilulu_Spiny, LVar1, LVar2, LVar3, 15 * DT)
         EVT_CALL(SetNpcPos, NPC_Lakilulu_Spiny, NPC_DISPOSE_LOCATION)
     EVT_END_THREAD
     EVT_THREAD
@@ -233,11 +233,11 @@ EvtScript N(EVS_NpcIdle_Lakilester) = {
     EVT_CALL(ShowMessageAtScreenPos, MSG_CH6_00A0, 160, 40)
     EVT_CALL(InterruptUsePartner)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(InterpPlayerYaw, 270, 1)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(InterpPlayerYaw, 90, 1)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still)
     EVT_CALL(func_802CF56C, 2)
     EVT_CALL(SetNpcAnimation, NPC_Lakilester, ANIM_WorldLakilester_Run)
@@ -245,7 +245,7 @@ EvtScript N(EVS_NpcIdle_Lakilester) = {
         EVT_CALL(N(PlayLakilesterFlightSounds))
     EVT_END_THREAD
     EVT_EXEC_GET_TID(N(EVS_Lakliester_ManageYaw), LVar9)
-    EVT_CALL(LoadPath, 80, EVT_PTR(N(FlightPath_LakilesterAmbush)), ARRAY_COUNT(N(FlightPath_LakilesterAmbush)), EASING_LINEAR)
+    EVT_CALL(LoadPath, 80 * DT, EVT_PTR(N(FlightPath_LakilesterAmbush)), ARRAY_COUNT(N(FlightPath_LakilesterAmbush)), EASING_LINEAR)
     EVT_LABEL(0)
     EVT_CALL(GetNextPathPos)
     EVT_CALL(SetNpcPos, NPC_Lakilester, LVar1, LVar2, LVar3)
@@ -256,7 +256,7 @@ EvtScript N(EVS_NpcIdle_Lakilester) = {
     EVT_KILL_THREAD(LVar9)
     EVT_CALL(SetNpcAnimation, NPC_Lakilester, ANIM_WorldLakilester_Idle)
     EVT_CALL(PlayerFaceNpc, NPC_Lakilester, FALSE)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_CALL(GetNpcPos, NPC_Lakilester, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
@@ -266,17 +266,17 @@ EvtScript N(EVS_NpcIdle_Lakilester) = {
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_THREAD
-        EVT_CALL(PlayerMoveTo, -75, 65, 10)
+        EVT_CALL(PlayerMoveTo, -75, 65, 10 * DT)
         EVT_CALL(PlayerFaceNpc, NPC_Lakilester, FALSE)
     EVT_END_THREAD
     EVT_CALL(SpeakToPlayer, NPC_Lakilester, ANIM_WorldLakilester_Talk, ANIM_WorldLakilester_Idle, 0, MSG_CH6_00A1)
     EVT_CALL(SetNpcAnimation, NPC_Lakilester, ANIM_WorldLakilester_Run)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Lakilester, ANIM_WorldLakilester_Idle)
     EVT_THREAD
         EVT_CALL(SetCamDistance, CAM_DEFAULT, 1000)
         EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-6.0))
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
         EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_END_THREAD
@@ -310,11 +310,11 @@ EvtScript N(EVS_Lakilulu_FlyAway) = {
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_THREAD
-        EVT_CALL(N(PlayLakiluluFlightSounds), 55)
+        EVT_CALL(N(PlayLakiluluFlightSounds), 55 * DT)
     EVT_END_THREAD
     EVT_CALL(SetNpcFlagBits, NPC_Lakilulu, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
     EVT_EXEC_GET_TID(N(EVS_Laklilulu_ManageYaw), LVar9)
-    EVT_CALL(LoadPath, 55, EVT_PTR(N(FlightPath_LakiluluDeparts)), ARRAY_COUNT(N(FlightPath_LakiluluDeparts)), EASING_LINEAR)
+    EVT_CALL(LoadPath, 55 * DT, EVT_PTR(N(FlightPath_LakiluluDeparts)), ARRAY_COUNT(N(FlightPath_LakiluluDeparts)), EASING_LINEAR)
     EVT_LABEL(20)
     EVT_CALL(GetNextPathPos)
     EVT_CALL(SetNpcPos, NPC_Lakilulu, LVar1, LVar2, LVar3)
@@ -331,11 +331,11 @@ EvtScript N(EVS_Lakilulu_FlyAway) = {
         EVT_ADD(LVar1, 20)
         EVT_ADD(LVar2, 20)
         EVT_ADD(LVar3, 20)
-        EVT_CALL(NpcJump0, NPC_PARTNER, LVar1, LVar2, LVar3, 30)
+        EVT_CALL(NpcJump0, NPC_PARTNER, LVar1, LVar2, LVar3, 30 * DT)
     EVT_END_IF
     EVT_CALL(DisablePartnerAI, 0)
     EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0)
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldLakilester_Talk, ANIM_WorldLakilester_Idle, 5, MSG_CH6_00B5)
     EVT_CALL(EnablePartnerAI)
     EVT_CALL(PutPartnerAway)
@@ -347,14 +347,14 @@ EvtScript N(EVS_Lakilulu_FlyAway) = {
 
 EvtScript N(EVS_Scene_LakilesterDefeated) = {
     EVT_CALL(DisablePlayerInput, TRUE)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Lakilester, ANIM_WorldLakilester_TiredTalk, ANIM_WorldLakilester_Tired, 0, MSG_CH6_00A2)
     EVT_CALL(SetNpcPos, NPC_Lakilulu, -290, 120, 45)
     EVT_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldLakilester_Idle)
         EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp)
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_CALL(InterpPlayerYaw, 270, 1)
     EVT_END_THREAD
     EVT_CALL(SpeakToPlayer, NPC_Lakilulu, ANIM_Lakilulu_Talk, ANIM_Lakilulu_Idle, 5, MSG_CH6_00A3)
@@ -372,15 +372,15 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = {
     EVT_THREAD
         EVT_CALL(SetCamDistance, CAM_DEFAULT, 400)
         EVT_CALL(SetCamPosB, CAM_DEFAULT, 130, 60)
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT))
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
         EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_END_THREAD
     EVT_THREAD
-        EVT_CALL(N(PlayLakiluluFlightSounds), 80)
+        EVT_CALL(N(PlayLakiluluFlightSounds), 80 * DT)
     EVT_END_THREAD
     EVT_EXEC_GET_TID(N(EVS_Laklilulu_ManageYaw), LVar9)
-    EVT_CALL(LoadPath, 80, EVT_PTR(N(FlightPath_LakiluluArrives)), ARRAY_COUNT(N(FlightPath_LakiluluArrives)), EASING_LINEAR)
+    EVT_CALL(LoadPath, 80 * DT, EVT_PTR(N(FlightPath_LakiluluArrives)), ARRAY_COUNT(N(FlightPath_LakiluluArrives)), EASING_LINEAR)
     EVT_LABEL(0)
     EVT_CALL(GetNextPathPos)
     EVT_CALL(SetNpcPos, NPC_Lakilulu, LVar1, LVar2, LVar3)
@@ -391,7 +391,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = {
     EVT_KILL_THREAD(LVar9)
     EVT_CALL(SetNpcAnimation, NPC_Lakilulu, ANIM_Lakilulu_ConcernedNod)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(GetNpcPos, NPC_Lakilulu, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, 20)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
@@ -406,7 +406,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = {
     EVT_ADD(LVar0, 40)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, 300)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(SpeakToPlayer, NPC_Lakilulu, ANIM_Lakilulu_Shout, ANIM_Lakilulu_Shout, 0, MSG_CH6_00A5)
@@ -414,7 +414,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = {
     EVT_ADD(LVar0, 20)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, 250)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(SpeakToPlayer, NPC_Lakilester, ANIM_WorldLakilester_Shout, ANIM_WorldLakilester_IdleTough, 0, MSG_CH6_00A6)
@@ -424,7 +424,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = {
     EVT_ADD(LVar0, 40)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, 350)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(10.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(10.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_LABEL(10)
@@ -432,15 +432,15 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = {
     EVT_CALL(ShowChoice, MSG_Choice_0020)
     EVT_IF_NE(LVar0, 0)
         EVT_EXEC_WAIT(N(EVS_Lakilulu_SpinyToss))
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_GOTO(10)
     EVT_ELSE
         EVT_CALL(ContinueSpeech, NPC_Lakilulu, ANIM_Lakilulu_Talk, ANIM_Lakilulu_Idle, 0, MSG_CH6_00A9)
         EVT_CALL(SetNpcAnimation, NPC_Lakilulu, ANIM_Lakilulu_Idle)
         EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes)
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still)
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_CALL(GetNpcPos, NPC_Lakilulu, LVar0, LVar1, LVar2)
         EVT_ADD(LVar0, 20)
         EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
@@ -455,12 +455,12 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = {
         EVT_ADD(LVar0, 40)
         EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
         EVT_CALL(SetCamDistance, CAM_DEFAULT, 350)
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0 / DT))
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
         EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(SpeakToPlayer, NPC_Lakilester, ANIM_WorldLakilester_Shout, ANIM_WorldLakilester_IdleTough, 0, MSG_CH6_00AB)
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(ShowChoice, MSG_Choice_0021)
         EVT_SWITCH(LVar0)
             EVT_CASE_EQ(-1)
@@ -478,24 +478,24 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = {
     EVT_CALL(SetNpcAnimation, NPC_Lakilulu, ANIM_Lakilulu_ConcernedNod)
     EVT_CALL(SpeakToPlayer, NPC_Lakilulu, ANIM_Lakilulu_ConcernedTalk, ANIM_Lakilulu_ConcernedNod, 5, MSG_CH6_00B0)
     EVT_CALL(SpeakToPlayer, NPC_Lakilester, ANIM_WorldLakilester_Talk, ANIM_WorldLakilester_Idle, 0, MSG_CH6_00B1)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Lakilulu, ANIM_Lakilulu_ConcernedTalk, ANIM_Lakilulu_ConcernedNod, 5, MSG_CH6_00B2)
     EVT_CALL(SpeakToPlayer, NPC_Lakilester, ANIM_WorldLakilester_Talk, ANIM_WorldLakilester_Idle, 0, MSG_CH6_00B3)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_THREAD
         EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0))
     EVT_END_THREAD
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, 30)
-    EVT_CALL(SetNpcSpeed, NPC_Lakilester, EVT_FLOAT(3.5))
+    EVT_CALL(SetNpcSpeed, NPC_Lakilester, EVT_FLOAT(3.5 / DT))
     EVT_CALL(NpcMoveTo, NPC_Lakilester, LVar0, 60, 0)
     EVT_CALL(N(ChangeNpcToPartner), 0, 8)
     EVT_CALL(N(LoadPartyImage))
     EVT_EXEC(N(EVS_PushPartnerSong))
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0190, 160, 40)
     EVT_EXEC(N(EVS_PopSong))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
     EVT_SET(GB_StoryProgress, STORY_CH6_LAKILESTER_JOINED_PARTY)
     EVT_CALL(EnablePartnerAI)

src/world/area_flo/flo_18/flo_18_4_npc.c

@@ -59,8 +59,8 @@ EvtScript N(EVS_Scene_LakilesterLikesBeingGood) = {
     EVT_CALL(SetPlayerPos, 30, 0, 50)
     EVT_CALL(InterpPlayerYaw, 90, 0)
     EVT_CALL(SetNpcPos, NPC_PARTNER, 65, 0, 50)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
-    EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(8.0), 0, 300, EVT_FLOAT(19.0), EVT_FLOAT(-8.5))
+    EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(8.0 / DT), 0, 300, EVT_FLOAT(19.0), EVT_FLOAT(-8.5))
     EVT_CALL(GetCurrentPartnerID, LVar0)
     EVT_CALL(BringPartnerOut, PARTNER_LAKILESTER)
     EVT_IF_NE(LVar0, PARTNER_LAKILESTER)
@@ -69,18 +69,18 @@ EvtScript N(EVS_Scene_LakilesterLikesBeingGood) = {
         EVT_ADD(LVar1, 20)
         EVT_ADD(LVar2, 20)
         EVT_ADD(LVar3, 20)
-        EVT_CALL(NpcJump0, NPC_PARTNER, LVar1, LVar2, LVar3, 30)
+        EVT_CALL(NpcJump0, NPC_PARTNER, LVar1, LVar2, LVar3, 30 * DT)
     EVT_END_IF
     EVT_CALL(PlayerFaceNpc, NPC_PARTNER, FALSE)
     EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0)
     EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldLakilester_Talk, ANIM_WorldLakilester_Idle, 5, MSG_CH6_00C9)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(EnablePartnerAI)
     EVT_CALL(PutPartnerAway)
-    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0))
+    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
     EVT_CALL(DisablePlayerInput, FALSE)
     EVT_RETURN
     EVT_END
@@ -91,7 +91,7 @@ EvtScript N(EVS_GangRetreat) = {
         EVT_CALL(PlaySoundAtNpc, NPC_FlyingMagikoopa, SOUND_19E, SOUND_SPACE_MODE_0)
         EVT_CALL(SetNpcFlagBits, NPC_FlyingMagikoopa, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
         EVT_CALL(InterpNpcYaw, NPC_FlyingMagikoopa, 270, 0)
-        EVT_CALL(LoadPath, 60, EVT_PTR(N(RetreatPath_Magikoopa)), ARRAY_COUNT(N(RetreatPath_Magikoopa)), EASING_LINEAR)
+        EVT_CALL(LoadPath, 60 * DT, EVT_PTR(N(RetreatPath_Magikoopa)), ARRAY_COUNT(N(RetreatPath_Magikoopa)), EASING_LINEAR)
         EVT_LOOP(0)
             EVT_CALL(GetNextPathPos)
             EVT_CALL(SetNpcPos, NPC_FlyingMagikoopa, LVar1, LVar2, LVar3)
@@ -101,12 +101,12 @@ EvtScript N(EVS_GangRetreat) = {
             EVT_END_IF
         EVT_END_LOOP
     EVT_END_THREAD
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_THREAD
         EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_01, SOUND_19F, SOUND_SPACE_MODE_0)
         EVT_CALL(SetNpcFlagBits, NPC_Lakitu_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
         EVT_CALL(InterpNpcYaw, NPC_Lakitu_01, 270, 0)
-        EVT_CALL(LoadPath, 60, EVT_PTR(N(RetreatPath_Lakitu_01)), ARRAY_COUNT(N(RetreatPath_Lakitu_01)), EASING_LINEAR)
+        EVT_CALL(LoadPath, 60 * DT, EVT_PTR(N(RetreatPath_Lakitu_01)), ARRAY_COUNT(N(RetreatPath_Lakitu_01)), EASING_LINEAR)
         EVT_LOOP(0)
             EVT_CALL(GetNextPathPos)
             EVT_CALL(SetNpcPos, NPC_Lakitu_01, LVar1, LVar2, LVar3)
@@ -119,7 +119,7 @@ EvtScript N(EVS_GangRetreat) = {
     EVT_THREAD
         EVT_CALL(SetNpcFlagBits, NPC_Lakitu_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
         EVT_CALL(InterpNpcYaw, NPC_Lakitu_02, 270, 0)
-        EVT_CALL(LoadPath, 70, EVT_PTR(N(RetreatPath_Lakitu_02)), ARRAY_COUNT(N(RetreatPath_Lakitu_02)), EASING_LINEAR)
+        EVT_CALL(LoadPath, 70 * DT, EVT_PTR(N(RetreatPath_Lakitu_02)), ARRAY_COUNT(N(RetreatPath_Lakitu_02)), EASING_LINEAR)
         EVT_LOOP(0)
             EVT_CALL(GetNextPathPos)
             EVT_CALL(SetNpcPos, NPC_Lakitu_02, LVar1, LVar2, LVar3)
@@ -132,7 +132,7 @@ EvtScript N(EVS_GangRetreat) = {
     EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_03, SOUND_19F, SOUND_SPACE_MODE_0)
     EVT_CALL(SetNpcFlagBits, NPC_Lakitu_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
     EVT_CALL(InterpNpcYaw, NPC_Lakitu_03, 270, 0)
-    EVT_CALL(LoadPath, 80, EVT_PTR(N(RetreatPath_Lakitu_03)), ARRAY_COUNT(N(RetreatPath_Lakitu_03)), EASING_LINEAR)
+    EVT_CALL(LoadPath, 80 * DT, EVT_PTR(N(RetreatPath_Lakitu_03)), ARRAY_COUNT(N(RetreatPath_Lakitu_03)), EASING_LINEAR)
     EVT_LOOP(0)
         EVT_CALL(GetNextPathPos)
         EVT_CALL(SetNpcPos, NPC_Lakitu_03, LVar1, LVar2, LVar3)
@@ -181,12 +181,12 @@ EvtScript N(EVS_Scene_GangDefeated) = {
     EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2)
     EVT_CALL(SetNpcPos, NPC_PARTNER, 65, LVar1, 80)
     EVT_CALL(SetNpcYaw, NPC_PARTNER, 270)
-    EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(8.0), 0, 450, EVT_FLOAT(17.0), EVT_FLOAT(-6.0))
+    EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(8.0 / DT), 0, 450, EVT_FLOAT(17.0), EVT_FLOAT(-6.0))
     EVT_CALL(SpeakToPlayer, NPC_FlyingMagikoopa, ANIM_FlyingMagikoopa_Yellow_Anim09, ANIM_FlyingMagikoopa_Yellow_Anim01, 0, MSG_CH6_00BB)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_EXEC(N(EVS_GangRetreat))
-    EVT_WAIT(80)
+    EVT_WAIT(80 * DT)
-    EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(8.0), 0, 300, EVT_FLOAT(19.0), EVT_FLOAT(-8.5))
+    EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(8.0 / DT), 0, 300, EVT_FLOAT(19.0), EVT_FLOAT(-8.5))
     EVT_CALL(GetCurrentPartnerID, LVar0)
     EVT_CALL(BringPartnerOut, PARTNER_LAKILESTER)
     EVT_IF_NE(LVar0, PARTNER_LAKILESTER)
@@ -195,15 +195,15 @@ EvtScript N(EVS_Scene_GangDefeated) = {
         EVT_ADD(LVar1, 20)
         EVT_ADD(LVar2, 20)
         EVT_ADD(LVar3, 20)
-        EVT_CALL(NpcJump0, NPC_PARTNER, LVar1, LVar2, LVar3, 30)
+        EVT_CALL(NpcJump0, NPC_PARTNER, LVar1, LVar2, LVar3, 30 * DT)
     EVT_END_IF
     EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0)
     EVT_CALL(DisablePartnerAI, 0)
     EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldLakilester_Talk, ANIM_WorldLakilester_Idle, 5, MSG_CH6_00C1)
     EVT_CALL(EnablePartnerAI)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(PutPartnerAway)
-    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0))
+    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
     EVT_SET(GB_StoryProgress, STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS)
     EVT_CALL(DisablePlayerInput, FALSE)
     EVT_CALL(AwaitPlayerApproach, -250, 0, 50)
@@ -216,7 +216,7 @@ EvtScript N(EVS_Scene_GangDefeated) = {
         EVT_ADD(LVar1, 20)
         EVT_ADD(LVar2, 20)
         EVT_ADD(LVar3, 20)
-        EVT_CALL(NpcJump0, NPC_PARTNER, LVar1, LVar2, LVar3, 30)
+        EVT_CALL(NpcJump0, NPC_PARTNER, LVar1, LVar2, LVar3, 30 * DT)
     EVT_END_IF
     EVT_CALL(PlayerFaceNpc, NPC_PARTNER, FALSE)
     EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0)
@@ -224,7 +224,7 @@ EvtScript N(EVS_Scene_GangDefeated) = {
     EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldLakilester_Talk, ANIM_WorldLakilester_Idle, 5, MSG_CH6_00C2)
     EVT_CALL(EnablePartnerAI)
     EVT_CALL(PutPartnerAway)
-    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0))
+    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
     EVT_CALL(DisablePlayerInput, FALSE)
     EVT_RETURN
     EVT_END
@@ -339,13 +339,13 @@ EvtScript N(EVS_GenericHitReaction) = {
     EVT_CALL(DisablePlayerInput, TRUE)
     EVT_CALL(func_802D2C14, 1)
     EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
-    EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(8.0), 0, 300, EVT_FLOAT(17.0), EVT_FLOAT(-6.0))
+    EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(8.0 / DT), 0, 300, EVT_FLOAT(17.0), EVT_FLOAT(-6.0))
     EVT_EXEC_WAIT(N(EVS_ReactionFacePlayer))
     EVT_SWITCH(AB_FLO_GuardedMachineHitCount)
         EVT_CASE_EQ(0)
             EVT_EXEC_WAIT(N(EVS_FirstReactionDialogue))
             EVT_ADD(AB_FLO_GuardedMachineHitCount, 1)
-            EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0))
+            EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
         EVT_CASE_EQ(1)
             EVT_EXEC_WAIT(N(EVS_SecondReactionDialogue))
     EVT_END_SWITCH
@@ -402,7 +402,7 @@ EvtScript N(EVS_GenericBombReaction) = {
     EVT_CALL(DisablePlayerInput, TRUE)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(8.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(8.0 / DT))
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-6.0))
     EVT_CALL(SetCamDistance, CAM_DEFAULT, 300)
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
@@ -411,7 +411,7 @@ EvtScript N(EVS_GenericBombReaction) = {
     EVT_IF_EQ(AB_FLO_GuardedMachineHitCount, 0)
         EVT_EXEC_WAIT(N(EVS_FirstReactionDialogue))
         EVT_ADD(AB_FLO_GuardedMachineHitCount, 1)
-        EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0))
+        EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
     EVT_ELSE
         EVT_EXEC_WAIT(N(EVS_SecondReactionDialogue))
     EVT_END_IF
@@ -517,7 +517,7 @@ EvtScript N(EVS_NpcInteract_Lakitu) = {
             EVT_END_IF
             EVT_ADD(AB_FLO_GuardLakituTalkCount, 1)
         EVT_CASE_EQ(2)
-            EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(8.0), 0, 300, EVT_FLOAT(19.0), EVT_FLOAT(-9.0))
+            EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(8.0 / DT), 0, 300, EVT_FLOAT(19.0), EVT_FLOAT(-9.0))
             EVT_CALL(GetSelfNpcID, LVar0)
             EVT_IF_EQ(LVar0, 3)
                 EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Magikoopa_Yellow_Anim02, ANIM_Magikoopa_Yellow_Anim01, 5, MSG_CH6_00B8)

src/world/area_flo/flo_23/flo_23_3_npc.c

@@ -17,7 +17,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = {
         EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
         EVT_CALL(SetCamDistance, CAM_DEFAULT, 350)
         EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.5), EVT_FLOAT(-7.5))
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
         EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
         EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Blue_Talk, ANIM_GateFlower_Blue_Idle, 0, MSG_CH6_0049)
@@ -35,7 +35,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = {
                 EVT_SET(LVar7, LVar0)
                 EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, SOUND_SPACE_MODE_0)
                 EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Blue_Eat)
-                EVT_WAIT(20)
+                EVT_WAIT(20 * DT)
                 EVT_CALL(RemoveItemEntity, LVar7)
                 EVT_SWITCH(LVar8)
                     EVT_CASE_EQ(158)
@@ -77,7 +77,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = {
                         EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2096, SOUND_SPACE_MODE_0)
                         EVT_CALL(MakeItemEntity, LVar8, 375, 20, 0, ITEM_SPAWN_MODE_DECORATION, 0)
                         EVT_SET(LVar7, LVar0)
-                        EVT_WAIT(5)
+                        EVT_WAIT(5 * DT)
                         EVT_CALL(GetAngleToPlayer, NPC_SELF, LVar0)
                         EVT_IF_LT(LVar0, 180)
                             EVT_CALL(MakeLerp, 0, 100, 7, EASING_LINEAR)
@@ -125,9 +125,9 @@ EvtScript N(EVS_NpcInteract_GateFlower) = {
                 EVT_END_SWITCH
         EVT_END_SWITCH
         EVT_THREAD
-            EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(6.0))
+            EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(6.0 / DT))
         EVT_END_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
     EVT_ELSE
         EVT_IF_LT(GB_StoryProgress, STORY_CH6_STAR_SPIRIT_RESCUED)
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Blue_HappyTalk, ANIM_GateFlower_Blue_HappyIdle, 0, MSG_CH6_004E)

src/world/area_flo/flo_25/flo_25_3_npc.c

@@ -17,7 +17,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = {
         EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
         EVT_CALL(SetCamDistance, CAM_DEFAULT, 350)
         EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.5), EVT_FLOAT(-7.5))
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
         EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
         EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Red_Talk, ANIM_GateFlower_Red_Idle, 0, MSG_CH6_003B)
@@ -35,7 +35,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = {
                 EVT_SET(LVar7, LVar0)
                 EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, SOUND_SPACE_MODE_0)
                 EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Red_Eat)
-                EVT_WAIT(20)
+                EVT_WAIT(20 * DT)
                 EVT_CALL(RemoveItemEntity, LVar7)
                 EVT_SWITCH(LVar8)
                     EVT_CASE_EQ(159)
@@ -77,7 +77,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = {
                         EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2096, SOUND_SPACE_MODE_0)
                         EVT_CALL(MakeItemEntity, LVar8, -125, 20, 0, ITEM_SPAWN_MODE_DECORATION, 0)
                         EVT_SET(LVar7, LVar0)
-                        EVT_WAIT(5)
+                        EVT_WAIT(5 * DT)
                         EVT_CALL(GetAngleToPlayer, NPC_SELF, LVar0)
                         EVT_IF_LT(LVar0, 180)
                             EVT_CALL(MakeLerp, 0, 100, 7, EASING_LINEAR)
@@ -125,9 +125,9 @@ EvtScript N(EVS_NpcInteract_GateFlower) = {
                 EVT_END_SWITCH
         EVT_END_SWITCH
         EVT_THREAD
-            EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(6.0))
+            EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(6.0 / DT))
         EVT_END_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
     EVT_ELSE
         EVT_IF_LT(GB_StoryProgress, STORY_CH6_STAR_SPIRIT_RESCUED)
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Red_HappyTalk, ANIM_GateFlower_Red_HappyIdle, 0, MSG_CH6_0040)

src/world/area_gv/gv_01/gv_01_1_main.c

@@ -44,6 +44,115 @@ EvtScript N(EVS_DropLastLetter) = {
     //@bug not terminated!
 };
 
+#if VERSION_PAL
+// TODO: define MODEL_ constants for PAL version of gv_01 map
+
+EvtScript N(EVS_E8C6F8) = {
+    EVT_CALL(EnableGroup, 20, 0)
+    EVT_CALL(EnableGroup, 22, 0)
+    EVT_CALL(EnableGroup, 24, 0)
+    EVT_CALL(EnableGroup, 26, 0)
+    EVT_CALL(EnableGroup, 28, 0)
+    EVT_CALL(EnableGroup, 30, 0)
+    EVT_CALL(EnableGroup, 32, 0)
+    EVT_CALL(EnableGroup, 34, 0)
+    EVT_CALL(EnableGroup, 36, 0)
+    EVT_CALL(EnableGroup, 38, 0)
+    EVT_CALL(EnableGroup, 40, 0)
+    EVT_CALL(TranslateGroup, 4, 0, 200, 0)
+    EVT_CALL(TranslateGroup, 6, 0, 200, 0)
+    EVT_CALL(TranslateGroup, 8, 0, 200, 0)
+    EVT_CALL(TranslateGroup, 10, 0, 200, 0)
+    EVT_CALL(TranslateGroup, 12, 0, 200, 0)
+    EVT_CALL(TranslateGroup, 14, 0, 200, 0)
+    EVT_CALL(TranslateGroup, 16, 0, 200, 0)
+    EVT_CALL(TranslateGroup, 18, 0, 200, 0)
+    EVT_WAIT(5)
+    EVT_SET(LVar0, 4)
+    EVT_EXEC(N(EVS_DropLetter))
+    EVT_WAIT(5)
+    EVT_SET(LVar0, 6)
+    EVT_EXEC(N(EVS_DropLetter))
+    EVT_WAIT(10)
+    EVT_SET(LVar0, 8)
+    EVT_EXEC(N(EVS_DropLetter))
+    EVT_WAIT(5)
+    EVT_SET(LVar0, 10)
+    EVT_EXEC(N(EVS_DropLetter))
+    EVT_WAIT(5)
+    EVT_SET(LVar0, 12)
+    EVT_EXEC(N(EVS_DropLetter))
+    EVT_WAIT(5)
+    EVT_SET(LVar0, 14)
+    EVT_EXEC(N(EVS_DropLetter))
+    EVT_WAIT(5)
+    EVT_SET(LVar0, 16)
+    EVT_EXEC(N(EVS_DropLetter))
+    EVT_WAIT(15)
+    EVT_SET(LVar0, 18)
+    EVT_EXEC(N(EVS_DropLastLetter))
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_E8CA04) = {
+    EVT_CALL(EnableGroup, 4, 0)
+    EVT_CALL(EnableGroup, 6, 0)
+    EVT_CALL(EnableGroup, 8, 0)
+    EVT_CALL(EnableGroup, 10, 0)
+    EVT_CALL(EnableGroup, 12, 0)
+    EVT_CALL(EnableGroup, 14, 0)
+    EVT_CALL(EnableGroup, 16, 0)
+    EVT_CALL(EnableGroup, 18, 0)
+    EVT_CALL(TranslateGroup, 20, 0, 200, 0)
+    EVT_CALL(TranslateGroup, 22, 0, 200, 0)
+    EVT_CALL(TranslateGroup, 24, 0, 200, 0)
+    EVT_CALL(TranslateGroup, 26, 0, 200, 0)
+    EVT_CALL(TranslateGroup, 28, 0, 200, 0)
+    EVT_CALL(TranslateGroup, 30, 0, 200, 0)
+    EVT_CALL(TranslateGroup, 32, 0, 200, 0)
+    EVT_CALL(TranslateGroup, 34, 0, 200, 0)
+    EVT_CALL(TranslateGroup, 36, 0, 200, 0)
+    EVT_CALL(TranslateGroup, 38, 0, 200, 0)
+    EVT_CALL(TranslateGroup, 40, 0, 200, 0)
+    EVT_WAIT(5)
+    EVT_SET(LVar0, 20)
+    EVT_EXEC(N(EVS_DropLetter))
+    EVT_WAIT(4)
+    EVT_SET(LVar0, 22)
+    EVT_EXEC(N(EVS_DropLetter))
+    EVT_WAIT(7)
+    EVT_SET(LVar0, 24)
+    EVT_EXEC(N(EVS_DropLetter))
+    EVT_WAIT(4)
+    EVT_SET(LVar0, 26)
+    EVT_EXEC(N(EVS_DropLetter))
+    EVT_WAIT(4)
+    EVT_SET(LVar0, 28)
+    EVT_EXEC(N(EVS_DropLetter))
+    EVT_WAIT(4)
+    EVT_SET(LVar0, 30)
+    EVT_EXEC(N(EVS_DropLetter))
+    EVT_WAIT(7)
+    EVT_SET(LVar0, 32)
+    EVT_EXEC(N(EVS_DropLetter))
+    EVT_WAIT(4)
+    EVT_SET(LVar0, 34)
+    EVT_EXEC(N(EVS_DropLetter))
+    EVT_WAIT(4)
+    EVT_SET(LVar0, 36)
+    EVT_EXEC(N(EVS_DropLetter))
+    EVT_WAIT(4)
+    EVT_SET(LVar0, 38)
+    EVT_EXEC(N(EVS_DropLetter))
+    EVT_WAIT(12)
+    EVT_SET(LVar0, 40)
+    EVT_EXEC(N(EVS_DropLastLetter))
+    EVT_RETURN
+    EVT_END
+};
+#endif
+
 EvtScript N(EVS_Main) = {
     EVT_CALL(DisablePlayerInput, TRUE)
     EVT_CALL(ModifyGlobalOverrideFlags, 0, GLOBAL_OVERRIDES_20000)
@@ -75,12 +184,20 @@ EvtScript N(EVS_Main) = {
     EVT_CALL(SetMusicTrack, 0, SONG_GAME_OVER, 0, 8)
     EVT_CALL(ClearAmbientSounds, 0)
     EVT_THREAD
-        EVT_WAIT(200)
+        EVT_WAIT(200 * DT)
         EVT_CALL(N(FadeToTitleScreen))
         EVT_CALL(N(ChangeStateToTitleScreen))
-        EVT_WAIT(100)
+        EVT_WAIT(100 * DT)
     EVT_END_THREAD
     EVT_CALL(SetMotionBlurParams, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 128, 10)
+#if VERSION_PAL
+    EVT_CALL(GetLanguage, LVar0)
+    EVT_IF_EQ(LVar0, 3)
+        EVT_EXEC(N(EVS_E8CA04))
+    EVT_ELSE
+        EVT_EXEC(N(EVS_E8C6F8))
+    EVT_END_IF
+#else
     EVT_CALL(TranslateGroup, MODEL_g,  0, 200, 0)
     EVT_CALL(TranslateGroup, MODEL_a,  0, 200, 0)
     EVT_CALL(TranslateGroup, MODEL_m,  0, 200, 0)
@@ -131,6 +248,7 @@ EvtScript N(EVS_Main) = {
         EVT_EXEC(N(EVS_DropLastLetter))
 #endif
     EVT_END_THREAD
+#endif
     EVT_THREAD
         EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 10, 0)
         EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 0, 0)
@@ -150,7 +268,7 @@ API_CALLABLE(N(FadeToTitleScreen)) {
         set_curtain_fade(0);
     }
 
-    script->functionTemp[0] += 5;
+    script->functionTemp[0] += (s32)(5 / DT);
     if (script->functionTemp[0] > 255) {
         script->functionTemp[0] = 255;
     }

src/world/area_kzn/kzn_01/kzn_01_2_npc.c

@@ -13,22 +13,22 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = {
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, 270, -200, 0)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, 400)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.5))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.5 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcPos, NPC_SELF, 320, -220, 0)
     EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_LargePiranha_Putrid_Anim17)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_LargePiranha_Putrid_Anim01)
     EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_LargePiranha_Putrid_Anim04, ANIM_LargePiranha_Putrid_Anim01, 0, MSG_CH5_00ED)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_LargePiranha_Putrid_Anim18)
-    EVT_WAIT(25)
+    EVT_WAIT(25 * DT)
     EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION)
-    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0))
+    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0 / DT))
     EVT_SET(GF_KZN01_IntruderAlert, TRUE)
     EVT_CALL(DisablePlayerInput, FALSE)
     EVT_RETURN

src/world/area_kzn/kzn_09/kzn_09_4_npc.c

@@ -41,7 +41,7 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = {
     EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), 0, 400, EVT_FLOAT(15.0), EVT_FLOAT(-7.0))
     EVT_CALL(SetSelfVar, 1, 1)
     EVT_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_LOOP(0)
             EVT_WAIT(1)
             EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE)
@@ -54,7 +54,7 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = {
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(DisablePartnerAI, 0)
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
         EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.0))
         EVT_ADD(LVar0, 20)
@@ -66,7 +66,7 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = {
     EVT_CALL(SetNpcPos, NPC_SELF, -500, 870, -15)
     EVT_WAIT(1)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic)
-    EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0))
+    EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0 / DT))
     EVT_CALL(NpcMoveTo, NPC_SELF, -425, -15, 0)
     EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 3)
     EVT_WAIT(5)
@@ -74,13 +74,13 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = {
     EVT_WAIT(5)
     EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0)
     EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0)
-    EVT_WAIT(25)
+    EVT_WAIT(25 * DT)
     EVT_CALL(SetSelfVar, 0, 2)
     EVT_THREAD
         EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5))
         EVT_LABEL(1)
         EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0)
-        EVT_CALL(NpcJump0, NPC_SELF, -410, 870, -15, 10)
+        EVT_CALL(NpcJump0, NPC_SELF, -410, 870, -15, 10 * DT)
         EVT_CALL(GetSelfVar, 0, LVar0)
         EVT_IF_NE(LVar0, 1)
             EVT_WAIT(15)
@@ -88,7 +88,7 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = {
         EVT_END_IF
         EVT_CALL(SetSelfVar, 0, 0)
     EVT_END_THREAD
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Shout, ANIM_Kolorado_Yell, 0, MSG_CH5_00F4)
     EVT_CALL(SetSelfVar, 0, 1)
     EVT_LABEL(2)
@@ -99,20 +99,20 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = {
     EVT_END_IF
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -310, 870, -15)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, -310, 870, -15)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
-    EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0))
+    EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0 / DT))
     EVT_CALL(NpcMoveTo, NPC_SELF, -390, -15, 0)
     EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.5))
     EVT_SET(LVar3, -350)
     EVT_SET(LVar4, 870)
     EVT_SET(LVar5, -15)
     EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0)
-    EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 10)
+    EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 10 * DT)
     EVT_ADD(LVar3, 90)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Thrown)
     EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0)
-    EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 10)
+    EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 10 * DT)
     EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0)
     EVT_CALL(SetSelfVar, 0, 1)
     EVT_THREAD
@@ -124,11 +124,11 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = {
             EVT_GOTO(3)
         EVT_END_IF
     EVT_END_THREAD
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Walk)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Run)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic)
     EVT_LOOP(10)
         EVT_CALL(SetNpcPos, NPC_SELF, LVar3, LVar4, LVar5)
@@ -155,13 +155,13 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = {
     EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE)
     EVT_CALL(SetSelfVar, 0, 0)
     EVT_CALL(SetSelfVar, 1, 0)
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_CALL(SetSelfVar, 0, 1)
     EVT_THREAD
         EVT_CALL(SetPlayerAnimation, ANIM_Mario1_VacantStare)
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Run)
-        EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0))
+        EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0 / DT))
         EVT_CALL(PlayerMoveTo, -360, 0, 0)
         EVT_CALL(SetPlayerAnimation, ANIM_Mario1_SpinFall)
         EVT_LABEL(5)
@@ -175,9 +175,9 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = {
     EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00F5, 160, 40)
     EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_162, SOUND_SPACE_MODE_0)
     EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(7.0))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetSelfVar, 0, 0)
-    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0))
+    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0 / DT))
     EVT_SET(GB_StoryProgress, STORY_CH5_KOLORADO_FELL_IN_PIT)
     EVT_CALL(DisablePlayerInput, FALSE)
     EVT_RETURN

src/world/area_kzn/kzn_17/kzn_17_3_npc.c

@@ -86,7 +86,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = {
     EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00F7, 160, 40)
     EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
     EVT_CALL(SetNpcPos, NPC_SELF, 290, 0, 30)
-    EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0))
+    EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0 / DT))
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic)
     EVT_CALL(NpcMoveTo, NPC_SELF, 640, 80, 0)
     EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE)

src/world/area_kzn/kzn_18/kzn_18_2_npc.c

@@ -24,7 +24,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = {
         EVT_ELSE
             EVT_SET(LVar2, -360)
         EVT_END_IF
-        EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(10.0))
+        EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(10.0 / DT))
         EVT_CALL(NpcMoveTo, NPC_SELF, 185, LVar2, 0)
         EVT_CALL(NpcFacePlayer, NPC_SELF, 4)
         EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle)
@@ -48,17 +48,17 @@ EvtScript N(EVS_NpcIdle_Kolorado) = {
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0))
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-7.0))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Shout, ANIM_Kolorado_Yell, 0, MSG_CH5_00FD)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_SET(MV_KoloradoJumpDone, FALSE)
     EVT_THREAD
         EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
         EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0))
         EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0)
-        EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10)
+        EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10 * DT)
         EVT_CALL(SetNpcYaw, NPC_SELF, 90)
         EVT_SET(MV_KoloradoJumpDone, TRUE)
     EVT_END_THREAD
@@ -71,14 +71,14 @@ EvtScript N(EVS_NpcIdle_Kolorado) = {
     EVT_END_LOOP
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar3, LVar4, LVar5)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, 420, 250, -350)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Run)
-    EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0))
+    EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0 / DT))
     EVT_CALL(NpcMoveTo, NPC_SELF, 530, -360, 0)
     EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
-    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0))
+    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0 / DT))
     EVT_SET(GB_StoryProgress, STORY_CH5_KOLORADO_IN_TREASURE_ROOM)
     EVT_CALL(DisablePlayerInput, FALSE)
     EVT_RETURN
@@ -110,23 +110,23 @@ EvtScript N(EVS_NpcIdle_Piranha) = {
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, 285, 25, 35)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, 400)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.5))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.5 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcPos, NPC_SELF, 285, 25, 35)
     EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_LargePiranha_Putrid_Anim17)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_LargePiranha_Putrid_Anim01)
     EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_LargePiranha_Putrid_Anim04, ANIM_LargePiranha_Putrid_Anim01, 0, MSG_CH5_00FF)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_LargePiranha_Putrid_Anim18)
-    EVT_WAIT(25)
+    EVT_WAIT(25 * DT)
     EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION)
     EVT_CALL(N(UnsetCamera0Flag1000))
-    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0))
+    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0 / DT))
     EVT_SET(GF_KZN18_IntruderAlert, TRUE)
     EVT_CALL(DisablePlayerInput, FALSE)
     EVT_RETURN

src/world/area_kzn/kzn_19/kzn_19_4_npc.c

@@ -42,9 +42,9 @@ EvtScript N(EVS_NpcIdle_Kolorado) = {
         EVT_CALL(SetSelfVar, 0, 0)
         EVT_LABEL(5)
         EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0)
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0)
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_CALL(GetSelfVar, 0, LVar0)
         EVT_IF_EQ(LVar0, 0)
             EVT_GOTO(5)
@@ -61,26 +61,26 @@ EvtScript N(EVS_Kolorado_Escape) = {
             EVT_GOTO(0)
         EVT_END_IF
     EVT_CALL(DisablePlayerInput, TRUE)
-    EVT_WAIT(60)
+    EVT_WAIT(60 * DT)
     EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
     EVT_CALL(SetNpcPos, NPC_SELF, 70, 25, 60)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic)
-    EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0))
+    EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0 / DT))
     EVT_CALL(NpcMoveTo, NPC_SELF, 170, 0, 0)
     EVT_CALL(NpcMoveTo, NPC_SELF, 280, 70, 0)
     EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Panic, ANIM_Kolorado_Yell, 0, MSG_CH5_0107)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 450, 25, -20)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, 450, 25, -20)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(NpcMoveTo, NPC_SELF, 535, -60, 0)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, 304, 25, -35)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(SetNpcAux, NPC_LavaPiranhaHead, 0)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(FadeOutMusic, 0, 1500)
     EVT_EXEC(N(EVS_TrySpawningStarCard))
     EVT_WAIT(30)
@@ -279,12 +279,12 @@ EvtScript N(EVS_NpcIdle_LavaPiranha) = {
     EVT_CALL(SetSelfVar, 1, 1)
     EVT_CALL(InterpPlayerYaw, 90, 0)
     EVT_THREAD
-        EVT_WAIT(15)
+        EVT_WAIT(15 * DT)
         EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 300, 25, -20)
         EVT_CALL(SetPanTarget, CAM_DEFAULT, 300, 25, -20)
         EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(350.0))
         EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-9.5))
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT))
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_END_THREAD
     EVT_CALL(MakeLerp, 0, 40, 80, EASING_QUADRATIC_OUT)
@@ -298,7 +298,7 @@ EvtScript N(EVS_NpcIdle_LavaPiranha) = {
     EVT_END_LOOP
     EVT_THREAD
         EVT_CALL(InterruptUsePartner)
-        EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0))
+        EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT))
         EVT_CALL(PlayerMoveTo, 200, -30, 0)
         EVT_CALL(InterpPlayerYaw, 90, 0)
     EVT_END_THREAD
@@ -316,30 +316,30 @@ EvtScript N(EVS_NpcIdle_LavaPiranha) = {
             EVT_END_IF
         EVT_END_LOOP
     EVT_END_THREAD
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 235, 25, -20)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, 235, 25, -20)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(420.0))
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(10.0), EVT_FLOAT(-10.7))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_EXEC(N(EVS_PlayVinesAnim_Talk))
     EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_LavaPiranha_Anim0E, ANIM_LavaPiranha_Anim03, 768, -30, 30, MSG_CH5_0102)
     EVT_EXEC(N(EVS_PlayVinesAnim_Idle))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(EndSpeech, NPC_SELF, ANIM_LavaPiranha_Anim0E, ANIM_LavaPiranha_Anim03, 256, -30, 30)
     EVT_EXEC(N(EVS_PlayVinesAnim_Talk))
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_LavaPiranha_Anim0E, ANIM_LavaPiranha_Anim03, 768, -30, 30, MSG_CH5_0103)
     EVT_EXEC(N(EVS_PlayVinesAnim_Idle))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(EndSpeech, NPC_SELF, ANIM_LavaPiranha_Anim0E, ANIM_LavaPiranha_Anim03, 768, -30, 30)
     EVT_EXEC(N(EVS_PlayVinesAnim_Talk))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(EndSpeech, NPC_SELF, ANIM_LavaPiranha_Anim0E, ANIM_LavaPiranha_Anim03, 768, -30, 30)
     EVT_EXEC(N(EVS_PlayVinesAnim_Idle))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(EndSpeech, NPC_SELF, ANIM_LavaPiranha_Anim0E, ANIM_LavaPiranha_Anim03, 768, -30, 30)
     EVT_CHILD_THREAD
         EVT_SET(LVar0, 20)

src/world/area_mgm/mgm_00/mgm_00_3_scoreboard.c

@@ -29,6 +29,27 @@ EvtScript N(D_80243C40_E123E0) = {
     EVT_END
 };
 
+#if VERSION_PAL
+s32  N(pal_unkdata)[] = {
+  230, 238, 234, 246,
+};
+
+s32 N(pal_unkdata_2)[] = {
+    45, 41, 43, 37
+};
+
+Gfx N(Gfx_RecordDisplay_Init)[] = {
+    gsDPSetCycleType(G_CYC_1CYCLE),
+    gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2),
+    gsDPSetCombineMode(G_CC_PRIMITIVE, G_CC_PRIMITIVE),
+    gsDPSetColorDither(G_CD_DISABLE),
+    gsDPSetAlphaDither(G_AD_DISABLE),
+    gsDPSetCombineKey(G_CK_NONE),
+    gsDPSetAlphaCompare(G_AC_NONE),
+    gsDPNoOp(),
+    gsSPEndDisplayList(),
+};
+#else
 Gfx N(Gfx_RecordDisplay_Init)[] = {
     gsDPSetCycleType(G_CYC_1CYCLE),
     gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2),
@@ -45,7 +66,12 @@ Gfx N(Gfx_RecordDisplay_Init)[] = {
     gsDPFillRectangle(44, 132, 276, 133),
     gsSPEndDisplayList(),
 };
+#endif
 
+#if VERSION_PAL
+void N(draw_record_display)(RecordDisplayData* data, s32 alpha);
+INCLUDE_ASM(void, "world/area_mgm/mgm_00/mgm_00_3_scoreboard", N(draw_record_display));
+#else
 void N(draw_record_display)(RecordDisplayData* data, s32 alpha) {
     if (alpha > 0) {
         gSPDisplayList(gMainGfxPos++, N(Gfx_RecordDisplay_Init));
@@ -74,6 +100,7 @@ void N(draw_record_display)(RecordDisplayData* data, s32 alpha) {
         draw_msg(MSG_MGM_0021, 223, 108, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU);
     }
 }
+#endif
 
 void N(animate_and_draw_record)(void* renderData) {
     RecordDisplayData* data = (RecordDisplayData*)evt_get_variable(NULL, MV_RecordDisplayData);

src/world/area_mgm/mgm_01/mgm_01_2_npc.c

@@ -67,7 +67,6 @@ typedef struct JumpGameData {
 
 extern s32 MessagePlural;
 extern s32 MessageSingular;
-extern MessageImageData N(MsgImgs_Panels);
 
 extern s8 N(BlockPosX)[NUM_BLOCKS];
 extern s8 N(BlockPosY)[NUM_BLOCKS];
@@ -657,6 +656,10 @@ API_CALLABLE(N(GetCoinCount)) {
     return ApiStatus_DONE2;
 }
 
+#if VERSION_PAL
+API_CALLABLE(N(SetMsgVars_BlocksRemaining));
+INCLUDE_ASM(ApiStatus, "world/area_mgm/mgm_01/mgm_01_2_npc", N(SetMsgVars_BlocksRemaining))
+#else
 API_CALLABLE(N(SetMsgVars_BlocksRemaining)) {
     Enemy* scorekeeper = get_enemy(SCOREKEEPER_ENEMY_IDX);
     s32 remaining = (scorekeeper->varTable[TOTAL_BLOCKS_VAR_IDX] - scorekeeper->varTable[BROKEN_BLOCKS_VAR_IDX]) + 1;
@@ -666,17 +669,13 @@ API_CALLABLE(N(SetMsgVars_BlocksRemaining)) {
 
     return ApiStatus_DONE2;
 }
+#endif
 
 API_CALLABLE(N(HideCoinCounter)) {
     hide_coin_counter_immediately();
     return ApiStatus_DONE2;
 }
 
-API_CALLABLE(N(SetMsgImgs_Panels)) {
-    set_message_images(&N(MsgImgs_Panels));
-    return ApiStatus_DONE2;
-}
-
 #include "world/common/npc/Toad_Stationary.inc.c"
 
 s8 N(BlockPosX)[NUM_BLOCKS] = {
@@ -996,7 +995,15 @@ EvtScript N(EVS_NpcInteract_Toad) = {
         EVT_WAIT(1)
     EVT_ELSE
         EVT_CALL(N(SetMsgVars_BlocksRemaining))
+#if VERSION_PAL
+        EVT_IF_EQ(LocalVar(13), 1)
+            EVT_CALL(SpeakToPlayer, 0, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_PAL_MGM_0036)
+        EVT_ELSE
+            EVT_CALL(SpeakToPlayer, 0, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0033)
+        EVT_END_IF
+#else
         EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0033)
+#endif
     EVT_END_IF
     EVT_RETURN
     EVT_END

src/world/area_mgm/mgm_01/mgm_01_4_images.c

@@ -50,3 +50,8 @@ MessageImageData N(MsgImgs_Panels)[] = {
         .bitDepth = G_IM_SIZ_4b,
     }
 };
+
+API_CALLABLE(N(SetMsgImgs_Panels)) {
+    set_message_images(N(MsgImgs_Panels));
+    return ApiStatus_DONE2;
+}

src/world/area_mgm/mgm_02/mgm_02_0_header.c

@@ -1,5 +1,10 @@
 #include "mgm_02.h"
 
+#if VERSION_PAL
+s32 N(get_tattle)(void);
+INCLUDE_ASM(void, "world/area_mgm/mgm_02/mgm_02_0_header", N(get_tattle));
+#endif
+
 EntryList N(Entrances) = {
     [mgm_02_ENTRY_0]    { -300.0,  200.0,  200.0,   90.0 },
 };
@@ -8,5 +13,9 @@ MapSettings N(settings) = {
     .main = &N(EVS_Main),
     .entryList = &N(Entrances),
     .entryCount = ENTRY_COUNT(N(Entrances)),
+#if VERSION_PAL
+    .tattle = { .get = &N(get_tattle) },
+#else
     .tattle = { MSG_MapTattle_mgm_02 },
+#endif
 };

src/world/area_mgm/mgm_02/mgm_02_2_npc.c

@@ -11,7 +11,8 @@ void partner_enable_input(void);
 #define SMASH_DATA_VAR_IDX 0
 
 #define PLAY_COST   10
-#define PLAY_TIME   900
+#define PLAY_TIME   ((s32)(900 * DT))
+#define FRAME_RATE ((s32)(30 * DT))
 #define NUM_BOXES   35
 #define NUM_PANELS  10
 
@@ -110,6 +111,14 @@ typedef struct SmashGameData {
     /* 0x02C */ SmashGameBoxData box[NUM_BOXES];
 } SmashGameData; /* size = 0x400 */
 
+#if VERSION_PAL
+#define COUNT_POS_Y 31
+#define TEXT_POS_Y 39
+#else
+#define TEXT_POS_Y 28
+#define COUNT_POS_Y 43
+#endif
+
 void N(appendGfx_score_display)(void* renderData) {
     Enemy* scorekeeper = get_enemy(SCOREKEEPER_ENEMY_IDX);
     SmashGameData* data = scorekeeper->varTablePtr[SMASH_DATA_VAR_IDX];
@@ -163,14 +172,14 @@ void N(appendGfx_score_display)(void* renderData) {
     }
 
     draw_box(0, WINDOW_STYLE_9, data->windowA_posX, 23, 0, 80, 38, 180, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL);
-    draw_msg(MSG_MGM_0047, data->windowA_posX + 42, 28, 255, MSG_PAL_WHITE, 0);
+    draw_msg(MSG_MGM_0047, data->windowA_posX + 42, TEXT_POS_Y, 255, MSG_PAL_WHITE, 0);
-    draw_number(NUM_PANELS - data->found, data->windowA_posX + 65, 43, DRAW_NUMBER_CHARSET_THIN, MSG_PAL_WHITE, 255, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT);
+    draw_number(NUM_PANELS - data->found, data->windowA_posX + 65, COUNT_POS_Y, DRAW_NUMBER_CHARSET_THIN, MSG_PAL_WHITE, 255, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT);
     draw_ci_image_with_clipping(&N(panel_peach_img), 32, 32, G_IM_FMT_CI, G_IM_SIZ_4b, &N(panel_peach_pal),
         data->windowA_posX + 5, 26, 10, 20, 300, 200, 255);
 
     timeLeft = MIN(data->timeLeft, PLAY_TIME);
-    deciseconds = ((f32)(timeLeft % 30) * 10.0) / 30;
+    deciseconds = ((f32)(timeLeft % FRAME_RATE) * 10.0) / FRAME_RATE;
-    seconds = timeLeft / 30;
+    seconds = timeLeft / FRAME_RATE;
 
     draw_box(0, WINDOW_STYLE_11, data->windowB_posX, 27, 0, 60, 20, 180, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL);
     // draw whole seconds
@@ -278,6 +287,10 @@ API_CALLABLE(N(OnHitBox)) {
     return ApiStatus_DONE2;
 }
 
+#if VERSION_PAL
+API_CALLABLE(N(SetBoxContents));
+INCLUDE_ASM(ApiResult, "world/area_mgm/mgm_02/mgm_02_2_npc", N(SetBoxContents));
+#else
 API_CALLABLE(N(SetBoxContents)) {
     s32 initialConfiguration;
     s32 configuration[NUM_BOXES];
@@ -400,7 +413,12 @@ API_CALLABLE(N(SetBoxContents)) {
     }
     return ApiStatus_DONE2;
 }
+#endif
 
+#if VERSION_PAL
+API_CALLABLE(N(RunMinigame));
+INCLUDE_ASM(ApiResult, "world/area_mgm/mgm_02/mgm_02_2_npc", N(RunMinigame));
+#else
 API_CALLABLE(N(RunMinigame)) {
     SmashGameData* data;
     Enemy* enemy;
@@ -825,6 +843,7 @@ API_CALLABLE(N(RunMinigame)) {
 
     return ApiStatus_BLOCK;
 }
+#endif
 
 API_CALLABLE(N(UpdateRecords)) {
     PlayerData* playerData = &gPlayerData;
@@ -832,8 +851,8 @@ API_CALLABLE(N(UpdateRecords)) {
     s32 seconds, deciseconds;
     s32 outScore;
 
-    seconds = data->timeLeft  / 30;
+    seconds = data->timeLeft  / FRAME_RATE;
-    deciseconds = ((f32)(data->timeLeft % 30) * 10.0) / 30;
+    deciseconds = ((f32)(data->timeLeft % FRAME_RATE) * 10.0) / FRAME_RATE;
 
     data->currentScore = (seconds * 10) + deciseconds;
     playerData->smashGameTotal += data->currentScore;
@@ -1036,6 +1055,10 @@ s32 N(PanelModelIDs)[NUM_PANELS] = {
     MODEL_o55, MODEL_o56, MODEL_o57, MODEL_o58, MODEL_o59
 };
 
+#if VERSION_PAL
+s32 N(pal_variable) = 0;
+#endif
+
 EvtScript N(EVS_CreateScoreDisplay) = {
     EVT_CALL(N(CreateScoreDisplay))
     EVT_RETURN
@@ -1641,6 +1664,18 @@ EvtScript N(EVS_Toad_GovernGame) = {
         EVT_CASE_EQ(0)
             EVT_CALL(SetSelfVar, 3, 0)
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0044)
+#if VERSION_PAL
+        EVT_CASE_EQ(1)
+            EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_PAL_MGM_0046)
+            EVT_CALL(ShowCoinCounter, TRUE)
+            EVT_WAIT(10)
+            EVT_CALL(N(GiveCoinReward))
+            EVT_WAIT(15)
+            EVT_CALL(ShowCoinCounter, FALSE)
+            EVT_CALL(SetSelfVar, 3, 0)
+            EVT_WAIT(5)
+            EVT_CALL(ContinueSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0045)
+#endif
         EVT_CASE_DEFAULT
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0042)
             EVT_CALL(ShowCoinCounter, TRUE)

src/world/area_omo/omo_02/omo_02_6_npc.c

@@ -32,21 +32,21 @@ EvtScript N(EVS_PlayShyGuyRunSounds) = {
 EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = {
     EVT_IF_EQ(GF_OMO02_ShyGuyFledBehindWall, FALSE)
         EVT_CALL(DisablePlayerInput, TRUE)
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0))
         EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
-        EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 15)
+        EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 15 * DT)
         EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -570, 0, 0)
         EVT_CALL(SetPanTarget, CAM_DEFAULT, -570, 0, 0)
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT))
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
         EVT_EXEC_GET_TID(N(EVS_PlayShyGuyRunSounds), LVarA)
         EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03)
-        EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(6.0))
+        EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(6.0 / DT))
         EVT_CALL(NpcMoveTo, NPC_SELF, -575, 0, 0)
         EVT_KILL_THREAD(LVarA)
         EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0)
-        EVT_CALL(NpcJump0, NPC_SELF, -460, 0, -20, 40)
+        EVT_CALL(NpcJump0, NPC_SELF, -460, 0, -20, 40 / DT)
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
         EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
         EVT_EXEC_GET_TID(N(EVS_RestrictCamFromBarricade), MV_RestrictCamScript)
@@ -61,9 +61,9 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = {
             EVT_WAIT(1)
             EVT_GOTO(10)
         EVT_END_IF
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0)
-        EVT_CALL(NpcJump0, NPC_SELF, -460, 0, -20, 40)
+        EVT_CALL(NpcJump0, NPC_SELF, -460, 0, -20, 40 / DT)
     EVT_END_IF
     EVT_RETURN
     EVT_END

src/world/area_omo/omo_03/omo_03_2_main.c

@@ -47,6 +47,19 @@ EvtScript N(EVS_Main) = {
     EVT_SET(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX)
     EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_SETUP_CAMERA_ALT_NO_LEAD()
+#if VERSION_PAL
+    EVT_CALL(GetLanguage, LocalVar(0))
+    EVT_SWITCH(LocalVar(0))
+        EVT_IF_GE(LocalVar(0), 2)
+            EVT_SUB(LocalVar(0), 2)
+        EVT_END_IF
+        EVT_CALL(SetModelTexVariant, MODEL_s, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_a, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_t, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_i, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_o, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_n, LocalVar(0))
+#endif
     EVT_SET(AF_OMO_05, FALSE)
     EVT_SET(GF_MAP_ShyGuysToybox, TRUE)
     EVT_CALL(GetEntryID, LVar0)

src/world/area_omo/omo_04/omo_04_6_scenes.c

@@ -122,16 +122,20 @@ EvtScript N(EVS_Scene_KammySetAmbush) = {
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(60)
+    EVT_WAIT(60 * DT)
     EVT_EXEC_GET_TID(N(EVS_PlayKammyFlightSounds), MV_FlightSoundsScriptID)
     EVT_SET(MF_KammyFlying, TRUE)
     EVT_THREAD
-        EVT_WAIT(100)
+        EVT_WAIT(100 * DT)
         EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(350.0))
+#if VERSION_PAL
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2 / DT))
+#else
         EVT_CALL(SetCamSpeed, CAM_DEFAULT, 2)
+#endif
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_END_THREAD
-    EVT_CALL(LoadPath, 150, EVT_PTR(N(FlightPath_Kammy1)), ARRAY_COUNT(N(FlightPath_Kammy1)), EASING_LINEAR)
+    EVT_CALL(LoadPath, 150 * DT, EVT_PTR(N(FlightPath_Kammy1)), ARRAY_COUNT(N(FlightPath_Kammy1)), EASING_LINEAR)
     EVT_LOOP(0)
         EVT_CALL(GetNextPathPos)
         EVT_CALL(SetNpcPos, NPC_Kammy, LVar1, LVar2, LVar3)
@@ -166,7 +170,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = {
         EVT_WAIT(3)
         EVT_CALL(SetNpcRotation, NPC_Kammy, 0, 0, 0)
     EVT_END_THREAD
-    EVT_CALL(LoadPath, 10, EVT_PTR(N(FlightPath_Kammy2)), ARRAY_COUNT(N(FlightPath_Kammy2)), EASING_LINEAR)
+    EVT_CALL(LoadPath, 10 * DT, EVT_PTR(N(FlightPath_Kammy2)), ARRAY_COUNT(N(FlightPath_Kammy2)), EASING_LINEAR)
     EVT_LOOP(0)
         EVT_CALL(GetNextPathPos)
         EVT_CALL(SetNpcPos, NPC_Kammy, LVar1, LVar2, LVar3)
@@ -175,52 +179,52 @@ EvtScript N(EVS_Scene_KammySetAmbush) = {
             EVT_BREAK_LOOP
         EVT_END_IF
     EVT_END_LOOP
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_CALL(SetNpcVar, NPC_Kammy, 0, 1)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim13)
-    EVT_WAIT(45)
+    EVT_WAIT(45 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E)
     EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, 25)
     EVT_ADD(LVar1, 38)
     EVT_CALL(PlaySoundAt, SOUND_207A, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2)
     EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 100)
-    EVT_WAIT(100)
+    EVT_WAIT(100 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F)
     EVT_ADD(LVar0, 55)
     EVT_CALL(PlaySoundAt, SOUND_2098, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2)
     EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, 0, 0, 1, 15, 3, 8)
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2)
         EVT_CALL(SetNpcPos, MV_AmbushID, LVar0, 0, 0)
     EVT_ELSE
         EVT_CALL(MakeItemEntity, MV_AmbushID, LVar0, 0, 0, ITEM_SPAWN_MODE_DECORATION, 0)
     EVT_END_IF
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim13)
-    EVT_WAIT(45)
+    EVT_WAIT(45 * DT)
     EVT_SWITCH(AB_OMO_CurrentPeachChoice)
         EVT_CASE_EQ(0)
             EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim16, ANIM_WorldKammy_Anim13, 517, MSG_CH4_0036)
-            EVT_WAIT(30)
+            EVT_WAIT(30 * DT)
             EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim16, ANIM_WorldKammy_Anim13, 517, MSG_CH4_0037)
         EVT_CASE_EQ(1)
             EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim16, ANIM_WorldKammy_Anim13, 517, MSG_CH4_0038)
-            EVT_WAIT(10)
+            EVT_WAIT(10 * DT)
             EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim16, ANIM_WorldKammy_Anim13, 517, MSG_CH4_0039)
         EVT_CASE_EQ(2)
             EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim16, ANIM_WorldKammy_Anim13, 517, MSG_CH4_0034)
-            EVT_WAIT(30)
+            EVT_WAIT(30 * DT)
             EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim16, ANIM_WorldKammy_Anim13, 517, MSG_CH4_0035)
     EVT_END_SWITCH
     EVT_CALL(SetNpcVar, NPC_Kammy, 0, 0)
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(500.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_EXEC_GET_TID(N(EVS_PlayKammyFlightSounds), MV_FlightSoundsScriptID)
     EVT_SET(MF_KammyFlying, TRUE)
     EVT_THREAD
-        EVT_CALL(LoadPath, 130, EVT_PTR(N(FlightPath_Kammy3)), ARRAY_COUNT(N(FlightPath_Kammy3)), EASING_LINEAR)
+        EVT_CALL(LoadPath, 130 * DT, EVT_PTR(N(FlightPath_Kammy3)), ARRAY_COUNT(N(FlightPath_Kammy3)), EASING_LINEAR)
         EVT_LOOP(0)
             EVT_CALL(GetNextPathPos)
             EVT_CALL(SetNpcPos, NPC_Kammy, LVar1, LVar2, LVar3)
@@ -230,14 +234,14 @@ EvtScript N(EVS_Scene_KammySetAmbush) = {
             EVT_END_IF
         EVT_END_LOOP
     EVT_END_THREAD
-    EVT_WAIT(90)
+    EVT_WAIT(90 * DT)
     EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2)
         EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_263, SOUND_SPACE_MODE_0)
         EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0)
-        EVT_WAIT(5)
+        EVT_WAIT(5 * DT)
     EVT_END_IF
     EVT_CALL(GotoMap, EVT_PTR("omo_04"), omo_04_ENTRY_0)
-    EVT_WAIT(100)
+    EVT_WAIT(100 * DT)
     EVT_RETURN
     EVT_END
 };

src/world/area_omo/omo_05/omo_05_4_npc.c

@@ -60,7 +60,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = {
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 0, LVar2)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, 350)
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.5), EVT_FLOAT(-10.0))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(N(MakeAllConsumablesItemList))
@@ -75,7 +75,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = {
     EVT_CHOOSE_CONSUMABLE_FROM(N(AllConsumables), -1)
     EVT_IF_LE(LVar0, 0)
         EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_SitIdle)
-        EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(8.0))
+        EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(8.0 / DT))
         EVT_CALL(DisablePlayerInput, FALSE)
         EVT_RETURN
     EVT_END_IF
@@ -86,18 +86,18 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = {
     EVT_CALL(SetItemFlags, LVar7, 64, 1)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_Eat)
     EVT_LOOP(6)
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, SOUND_SPACE_MODE_0)
     EVT_END_LOOP
     EVT_IF_NE(LVar9, 2)
-        EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(10.0))
+        EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(10.0 / DT))
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2096, SOUND_SPACE_MODE_0)
         EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_SpitOut)
         EVT_CALL(SetItemFlags, LVar7, 64, 0)
         EVT_CALL(GetAngleToPlayer, NPC_SELF, LVar0)
         EVT_IF_LT(LVar0, 180)
-            EVT_CALL(MakeLerp, 0, 100, 7, EASING_LINEAR)
+            EVT_CALL(MakeLerp, 0, 100, 7 * DT, EASING_LINEAR)
             EVT_LOOP(0)
                 EVT_CALL(UpdateLerp)
                 EVT_SETF(LVar2, EVT_FLOAT(-1.0))
@@ -115,7 +115,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = {
                     EVT_BREAK_LOOP
                 EVT_END_IF
             EVT_END_LOOP
-            EVT_CALL(MakeLerp, 0, 100, 7, EASING_LINEAR)
+            EVT_CALL(MakeLerp, 0, 100, 7 * DT, EASING_LINEAR)
             EVT_LOOP(0)
                 EVT_CALL(UpdateLerp)
                 EVT_SETF(LVar2, EVT_FLOAT(-1.0))
@@ -134,7 +134,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = {
                 EVT_END_IF
             EVT_END_LOOP
         EVT_ELSE
-            EVT_CALL(MakeLerp, 0, 100, 7, EASING_LINEAR)
+            EVT_CALL(MakeLerp, 0, 100, 7 * DT, EASING_LINEAR)
             EVT_LOOP(0)
                 EVT_CALL(UpdateLerp)
                 EVT_SETF(LVar2, EVT_FLOAT(1.0))
@@ -152,7 +152,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = {
                     EVT_BREAK_LOOP
                 EVT_END_IF
             EVT_END_LOOP
-            EVT_CALL(MakeLerp, 0, 100, 7, EASING_LINEAR)
+            EVT_CALL(MakeLerp, 0, 100, 7 * DT, EASING_LINEAR)
             EVT_LOOP(0)
                 EVT_CALL(UpdateLerp)
                 EVT_SETF(LVar2, EVT_FLOAT(1.0))
@@ -191,7 +191,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = {
                 EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Fork, NPC_FLAG_INVISIBLE, FALSE)
                 EVT_CALL(GetNpcPos, NPC_GourmetGuy_Fork, LVar0, LVar1, LVar2)
                 EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_Fork, EVT_FLOAT(0.05))
-                EVT_CALL(NpcJump0, NPC_GourmetGuy_Fork, LVar0, 2, LVar2, 8)
+                EVT_CALL(NpcJump0, NPC_GourmetGuy_Fork, LVar0, 2, LVar2, 8 * DT)
                 EVT_CALL(SetNpcRotationPivot, NPC_GourmetGuy_Fork, 15)
                 EVT_SET(LVar3, 0)
                 EVT_LOOP(5)
@@ -201,15 +201,15 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = {
                 EVT_END_LOOP
                 EVT_ADD(LVar2, 20)
                 EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_Fork, EVT_FLOAT(0.2))
-                EVT_CALL(NpcJump0, NPC_GourmetGuy_Fork, LVar0, -10, LVar2, 8)
+                EVT_CALL(NpcJump0, NPC_GourmetGuy_Fork, LVar0, -10, LVar2, 8 * DT)
-                EVT_WAIT(10)
+                EVT_WAIT(10 * DT)
                 EVT_CALL(RemoveNpc, NPC_GourmetGuy_Fork)
             EVT_END_THREAD
             EVT_THREAD
                 EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Knife, NPC_FLAG_INVISIBLE, FALSE)
                 EVT_CALL(GetNpcPos, NPC_GourmetGuy_Knife, LVar0, LVar1, LVar2)
                 EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_Knife, EVT_FLOAT(0.05))
-                EVT_CALL(NpcJump0, NPC_GourmetGuy_Knife, LVar0, 2, LVar2, 8)
+                EVT_CALL(NpcJump0, NPC_GourmetGuy_Knife, LVar0, 2, LVar2, 8 * DT)
                 EVT_CALL(SetNpcRotationPivot, NPC_GourmetGuy_Knife, 15)
                 EVT_SET(LVar3, 0)
                 EVT_LOOP(5)
@@ -219,45 +219,45 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = {
                 EVT_END_LOOP
                 EVT_ADD(LVar2, 20)
                 EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_Knife, EVT_FLOAT(0.2))
-                EVT_CALL(NpcJump0, NPC_GourmetGuy_Knife, LVar0, -10, LVar2, 8)
+                EVT_CALL(NpcJump0, NPC_GourmetGuy_Knife, LVar0, -10, LVar2, 8 * DT)
-                EVT_WAIT(10)
+                EVT_WAIT(10 * DT)
                 EVT_CALL(RemoveNpc, NPC_GourmetGuy_Knife)
             EVT_END_THREAD
             EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -250, 25, -100)
             EVT_CALL(SetPanTarget, CAM_DEFAULT, -250, 25, -100)
             EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(420.0))
             EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(12.0), EVT_FLOAT(-1.5))
-            EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(25.0))
+            EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(25.0 / DT))
             EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
             EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
             EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_381, SOUND_SPACE_MODE_0)
-            EVT_WAIT(33)
+            EVT_WAIT(33 * DT)
             EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(320.0))
             EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(13.0), EVT_FLOAT(-0.8))
-            EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(25.0))
+            EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(25.0 / DT))
             EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
             EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
             EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_382, SOUND_SPACE_MODE_0)
-            EVT_WAIT(33)
+            EVT_WAIT(33 * DT)
             EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0))
             EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(14.0), EVT_FLOAT(0.0))
-            EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(25.0))
+            EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(25.0 / DT))
             EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
             EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
             EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_383, SOUND_SPACE_MODE_0)
-            EVT_WAIT(18)
+            EVT_WAIT(18 * DT)
             EVT_CALL(SetMusicTrack, 0, SONG_GOURMET_GUY_FREAKOUT, 0, 8)
-            EVT_WAIT(30)
+            EVT_WAIT(30 * DT)
             EVT_CALL(SetMotionBlurParams, 0, 0, 0, 320, 240, 128, 10)
             EVT_LOOP(7)
                 EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(320.0))
                 EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(14.0), EVT_FLOAT(0.0))
-                EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(15.0))
+                EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(15.0 / DT))
                 EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
                 EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
                 EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0))
                 EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(14.0), EVT_FLOAT(0.0))
-                EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(15.0))
+                EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(15.0 / DT))
                 EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
                 EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
             EVT_END_LOOP
@@ -267,7 +267,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = {
             EVT_CALL(RotateModel, MODEL_o328, 105, 0, 1, 0)
             EVT_CALL(RotateModel, MODEL_o329, 105, 0, 1, 0)
             EVT_CALL(RotateModel, MODEL_o330, 105, 0, 1, 0)
-            EVT_WAIT(5)
+            EVT_WAIT(5 * DT)
             EVT_CALL(N(SpinCameraAround))
             EVT_CALL(N(SpinCameraAround))
             EVT_CALL(N(SpinCameraAround))
@@ -289,19 +289,19 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = {
             EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_384, SOUND_SPACE_MODE_0)
             EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_Panic)
             EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
-            EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(20.0))
+            EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(20.0 / DT))
             EVT_CALL(NpcMoveTo, NPC_SELF, 0, 110, 0)
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_384, SOUND_SPACE_MODE_0)
             EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_UPSIDE_DOWN, TRUE)
             EVT_CALL(SetNpcPos, NPC_SELF, 0, 145, 110)
             EVT_CALL(NpcMoveTo, NPC_SELF, -500, 110, 0)
             EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_UPSIDE_DOWN, FALSE)
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_384, SOUND_SPACE_MODE_0)
             EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, -45)
             EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0)
-            EVT_CALL(MakeLerp, 0, 100, 30, EASING_LINEAR)
+            EVT_CALL(MakeLerp, 0, 100, 30 * DT, EASING_LINEAR)
             EVT_LABEL(10)
             EVT_CALL(UpdateLerp)
             EVT_SETF(LVar2, EVT_FLOAT(3.95))
@@ -318,25 +318,25 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = {
             EVT_IF_EQ(LVar1, 1)
                 EVT_GOTO(10)
             EVT_END_IF
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_384, SOUND_SPACE_MODE_0)
             EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0)
             EVT_CALL(SetNpcPos, NPC_SELF, -500, 0, 110)
             EVT_CALL(NpcMoveTo, NPC_SELF, -250, 110, 0)
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_TalkSurprise)
             EVT_THREAD
-                EVT_WAIT(15)
+                EVT_WAIT(15 * DT)
                 EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(-2.5), EVT_FLOAT(-24.0))
-                EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5))
+                EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5 / DT))
                 EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
             EVT_END_THREAD
             EVT_THREAD
-                EVT_WAIT(15)
+                EVT_WAIT(15 * DT)
                 EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_385, SOUND_SPACE_MODE_0)
                 EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_Leap)
                 EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.002))
-                EVT_CALL(NpcJump0, NPC_SELF, -250, 500, 110, 40)
+                EVT_CALL(NpcJump0, NPC_SELF, -250, 500, 110, 40 * DT)
                 EVT_CALL(SetSelfVar, 0, 2)
             EVT_END_THREAD
             EVT_CALL(ShowMessageAtScreenPos, MSG_CH4_0045, 160, 40)
@@ -349,13 +349,13 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = {
             EVT_CALL(SetSelfVar, 0, 0)
             EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
             EVT_CALL(MakeItemEntity, ITEM_COOKBOOK, LVar0, 400, LVar2, ITEM_SPAWN_MODE_FALL_NEVER_VANISH, GF_OMO05_Item_Cookbook)
-            EVT_WAIT(30)
+            EVT_WAIT(30 * DT)
             EVT_CALL(EnablePartnerAI)
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking)
             EVT_WAIT(1)
             EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0))
-            EVT_WAIT(60)
+            EVT_WAIT(60 * DT)
             EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
             EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK)
             EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt2, COLLIDER_FLAGS_UPPER_MASK)

src/world/area_omo/omo_06/omo_06_2_main.c

@@ -37,6 +37,19 @@ EvtScript N(EVS_Main) = {
     EVT_SET(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX)
     EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_SETUP_CAMERA_ALT_NO_LEAD()
+#if VERSION_PAL
+    EVT_CALL(GetLanguage, LocalVar(0))
+    EVT_SWITCH(LocalVar(0))
+        EVT_IF_GE(LocalVar(0), 2)
+            EVT_SUB(LocalVar(0), 2)
+        EVT_END_IF
+        EVT_CALL(SetModelTexVariant, MODEL_s, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_a, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_t, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_i, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_o, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_n, LocalVar(0))
+#endif
     EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs)))
     EVT_EXEC_WAIT(N(EVS_MakeEntities))
     EVT_EXEC_WAIT(N(EVS_SetupGizmos))

src/world/area_omo/omo_06/omo_06_3_gizmos.c

@@ -51,7 +51,7 @@ EvtScript N(EVS_Gizmos_Shutters) = {
 
 EvtScript N(EVS_Scene_PullPinkSwitch) = {
     EVT_CALL(DisablePlayerInput, TRUE)
-    EVT_CALL(MakeLerp, 0, 70, 30, EASING_COS_IN_OUT)
+    EVT_CALL(MakeLerp, 0, 70, 30 * DT, EASING_COS_IN_OUT)
     EVT_LABEL(0)
         EVT_CALL(UpdateLerp)
         EVT_CALL(RotateModel, MODEL_bou1, LVar0, 0, 0, 1)
@@ -62,16 +62,16 @@ EvtScript N(EVS_Scene_PullPinkSwitch) = {
         EVT_END_IF
     EVT_CALL(PlaySoundAt, SOUND_1F1, SOUND_SPACE_MODE_0, -395, 0, -185)
     EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o930, COLLIDER_FLAGS_UPPER_MASK)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 223, 10, -165)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, 223, 10, -165)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(500.0))
     EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-500.0), EVT_FLOAT(-200.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(PlaySoundAt, SOUND_1F2, SOUND_SPACE_MODE_0, 265, 0, -235)
-    EVT_CALL(MakeLerp, 0, 180, 30, EASING_COS_IN_OUT)
+    EVT_CALL(MakeLerp, 0, 180, 30 * DT, EASING_COS_IN_OUT)
     EVT_LABEL(1)
         EVT_CALL(UpdateLerp)
         EVT_CALL(RotateModel, MODEL_o898, LVar0, 1, 0, 0)
@@ -85,7 +85,7 @@ EvtScript N(EVS_Scene_PullPinkSwitch) = {
     EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.0))
     EVT_CALL(GetModelCenter, MODEL_o897)
     EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 3, LVar0, LVar1, LVar2, 0)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_SET(GB_StoryProgress, STORY_CH4_PULLED_SWITCH_SWITCH)
     EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0))
     EVT_CALL(DisablePlayerInput, FALSE)

src/world/area_omo/omo_07/omo_07_6_scenes.c

@@ -81,38 +81,38 @@ EvtScript N(EVS_Scene_KammySetAmbush) = {
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_CALL(SetNpcVar, NPC_Kammy, 0, 1)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim13)
-    EVT_WAIT(25)
+    EVT_WAIT(25 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E)
     EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, 25)
     EVT_ADD(LVar1, 38)
     EVT_CALL(PlaySoundAt, SOUND_207A, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2)
     EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 75)
-    EVT_WAIT(75)
+    EVT_WAIT(75 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F)
     EVT_ADD(LVar0, 55)
     EVT_CALL(PlaySoundAt, SOUND_2098, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2)
     EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, 0, 0, 1, 15, 3, 8)
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2)
         EVT_CALL(SetNpcPos, MV_AmbushID, LVar0, 0, 0)
     EVT_ELSE
         EVT_CALL(MakeItemEntity, MV_AmbushID, LVar0, 0, 0, ITEM_SPAWN_MODE_DECORATION, 0)
     EVT_END_IF
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim13)
     EVT_CALL(SetNpcVar, NPC_Kammy, 0, 0)
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2)
         EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_263, SOUND_SPACE_MODE_0)
         EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0)
-        EVT_WAIT(5)
+        EVT_WAIT(5 * DT)
     EVT_END_IF
     EVT_CALL(GotoMap, EVT_PTR("omo_07"), omo_07_ENTRY_0)
-    EVT_WAIT(100)
+    EVT_WAIT(100 * DT)
     EVT_RETURN
     EVT_END
 };

src/world/area_omo/omo_08/omo_08_2_main.c

@@ -32,6 +32,19 @@ EvtScript N(EVS_Main) = {
     EVT_SET(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX)
     EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_SETUP_CAMERA_ALT_NO_LEAD()
+#if VERSION_PAL
+    EVT_CALL(GetLanguage, LocalVar(0))
+    EVT_SWITCH(LocalVar(0))
+        EVT_IF_GE(LocalVar(0), 2)
+            EVT_SUB(LocalVar(0), 2)
+        EVT_END_IF
+        EVT_CALL(SetModelTexVariant, MODEL_s, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_a, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_t, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_i, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_o, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_n, LocalVar(0))
+#endif
     EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs)))
     EVT_EXEC_WAIT(N(EVS_MakeEntities))
     EVT_EXEC_WAIT(N(EVS_SetupMusic))

src/world/area_omo/omo_09/omo_09_2_main.c

@@ -17,6 +17,14 @@ EvtScript N(EVS_Main) = {
     EVT_END_IF
     EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_SETUP_CAMERA_DEFAULT()
+#if VERSION_PAL
+    EVT_CALL(GetLanguage, LocalVar(0))
+    EVT_IF_EQ(LocalVar(0), 3)
+        EVT_SET(LocalVar(0), 2)
+    EVT_END_IF
+    EVT_CALL(SetModelTexVariant, MODEL_s1, LocalVar(0))
+    EVT_CALL(SetModelTexVariant, MODEL_s2, LocalVar(0))
+#endif
     EVT_IF_EQ(GF_OMO09_SpawnedPeachChoice3, FALSE)
         EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(KammySceneNPCs)))
     EVT_ELSE

src/world/area_omo/omo_09/omo_09_8_scenes.c

@@ -81,38 +81,38 @@ EvtScript N(EVS_Scene_KammySetAmbush) = {
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_CALL(SetNpcVar, NPC_Kammy, 0, 1)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim13)
-    EVT_WAIT(25)
+    EVT_WAIT(25 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E)
     EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, 25)
     EVT_ADD(LVar1, 38)
     EVT_CALL(PlaySoundAt, SOUND_207A, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2)
     EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 75)
-    EVT_WAIT(75)
+    EVT_WAIT(75 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F)
     EVT_ADD(LVar0, 55)
     EVT_CALL(PlaySoundAt, SOUND_2098, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2)
     EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, 150, 0, 1, 15, 3, 8)
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2)
         EVT_CALL(SetNpcPos, MV_AmbushID, LVar0, 150, 0)
     EVT_ELSE
         EVT_CALL(MakeItemEntity, MV_AmbushID, LVar0, 150, 0, ITEM_SPAWN_MODE_DECORATION, 0)
     EVT_END_IF
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim13)
     EVT_CALL(SetNpcVar, NPC_Kammy, 0, 0)
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2)
         EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_263, SOUND_SPACE_MODE_0)
         EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0)
-        EVT_WAIT(5)
+        EVT_WAIT(5 * DT)
     EVT_END_IF
     EVT_CALL(GotoMap, EVT_PTR("omo_09"), omo_09_ENTRY_0)
-    EVT_WAIT(100)
+    EVT_WAIT(100 * DT)
     EVT_RETURN
     EVT_END
 };

src/world/area_omo/omo_10/omo_10_2_main.c

@@ -35,6 +35,19 @@ EvtScript N(EVS_Main) = {
     EVT_SET(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX)
     EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_SETUP_CAMERA_ALT_NO_LEAD()
+#if VERSION_PAL
+    EVT_CALL(GetLanguage, LocalVar(0))
+    EVT_SWITCH(LocalVar(0))
+        EVT_IF_GE(LocalVar(0), 2)
+            EVT_SUB(LocalVar(0), 2)
+        EVT_END_IF
+        EVT_CALL(SetModelTexVariant, MODEL_s, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_a, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_t, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_i, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_o, LocalVar(0))
+        EVT_CALL(SetModelTexVariant, MODEL_n, LocalVar(0))
+#endif
     EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs)))
     EVT_EXEC_WAIT(N(EVS_MakeEntities))
     EVT_EXEC_WAIT(N(EVS_SetupGizmos))

src/world/area_omo/omo_12/omo_12_3_npc.c

@@ -115,12 +115,12 @@ EvtScript N(EVS_EnterScene) = {
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(GetNpcPos, NPC_BigLanternGhost, LVar2, LVar3, LVar4)
     EVT_ADD(LVar2, 32)
     EVT_ADD(LVar3, 10)
     // turn on lantern light
-    EVT_CALL(MakeLerp, 255, 100, 60, EASING_LINEAR)
+    EVT_CALL(MakeLerp, 255, 100, 60 * DT, EASING_LINEAR)
     EVT_LABEL(0)
         EVT_CALL(UpdateLerp)
         EVT_CALL(N(SetLightOriginAndPower), LVar2, LVar3, LVar4, LVar0)
@@ -130,12 +130,12 @@ EvtScript N(EVS_EnterScene) = {
         EVT_END_IF
     EVT_CALL(SpeakToPlayer, NPC_BigLanternGhost, ANIM_BigLanternGhost_Anim05, ANIM_BigLanternGhost_Anim01, 0, MSG_CH4_004F)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, 50, 0, 20)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.7))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.7 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_SET(AB_OMO12_LightSource, LIGHT_FROM_GHOST)
     EVT_SET(AB_OMO12_LightPowerMod, -28)
     EVT_CALL(SetNpcAnimation, NPC_BigLanternGhost, ANIM_BigLanternGhost_Anim06)
-    EVT_CALL(SetNpcSpeed, NPC_BigLanternGhost, EVT_FLOAT(3.0))
+    EVT_CALL(SetNpcSpeed, NPC_BigLanternGhost, EVT_FLOAT(3.0 / DT))
     EVT_CALL(NpcMoveTo, NPC_BigLanternGhost, 0, 20, 0)
     EVT_CALL(SetNpcAnimation, NPC_BigLanternGhost, ANIM_BigLanternGhost_Anim01)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
@@ -144,11 +144,11 @@ EvtScript N(EVS_EnterScene) = {
         EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.5))
     EVT_END_THREAD
     EVT_CALL(SetNpcAnimation, NPC_BigLanternGhost, ANIM_BigLanternGhost_Anim0F)
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Shocked)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_THREAD
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_SET(AB_OMO12_LightSource, LIGHT_FROM_FLICK_OFF)
     EVT_END_THREAD
     EVT_CALL(SetNpcVar, NPC_BigLanternGhost, 0, 1)
@@ -194,7 +194,7 @@ EvtScript N(EVS_Scene_ReleaseWatt) = {
     EVT_CALL(DisablePlayerInput, TRUE)
     EVT_CALL(N(SetCamera0Flag1000))
     EVT_CALL(GetNpcPos, NPC_LaternTop, LVar0, LVar1, LVar2)
-    EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(2.0), LVar0, LVar1, LVar2, EVT_FLOAT(450.0), EVT_FLOAT(15.0), EVT_FLOAT(-6.0))
+    EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(2.0 / DT), LVar0, LVar1, LVar2, EVT_FLOAT(450.0), EVT_FLOAT(15.0), EVT_FLOAT(-6.0))
     EVT_SET(LVarA, 0)
     EVT_CALL(GetOwnerEncounterTrigger, LVar0)
     EVT_IF_EQ(LVar0, ENCOUNTER_TRIGGER_PARTNER)
@@ -213,7 +213,7 @@ EvtScript N(EVS_Scene_ReleaseWatt) = {
             EVT_CASE_DEFAULT
                 EVT_CALL(GetEncounterTriggerHitTier, LVar0)
                 EVT_IF_EQ(LVar0, 0)
-                    EVT_WAIT(25)
+                    EVT_WAIT(25 * DT)
                     EVT_CALL(DisablePlayerInput, FALSE)
                     EVT_RETURN
                 EVT_END_IF
@@ -251,16 +251,16 @@ EvtScript N(EVS_Scene_ReleaseWatt) = {
     EVT_END_IF
     EVT_CALL(func_802D2C14, 1)
     EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
-    EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0))
+    EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT))
     EVT_CALL(PlayerMoveTo, LVar1, 0, 0)
     EVT_CALL(PlayerFaceNpc, NPC_LaternTop, 3)
     EVT_THREAD
         EVT_CALL(SetNpcJumpscale, NPC_LaternTop, 0)
         EVT_CALL(GetNpcPos, NPC_LaternTop, LVar0, 20, LVar2)
-        EVT_CALL(NpcJump0, NPC_LaternTop, LVar0, 20, LVar2, 20)
+        EVT_CALL(NpcJump0, NPC_LaternTop, LVar0, 20, LVar2, 20 * DT)
     EVT_END_THREAD
     EVT_THREAD
-        EVT_WAIT(6)
+        EVT_WAIT(6 * DT)
         EVT_CALL(GetNpcPos, NPC_LaternTop, LVar0, LVar1, LVar2)
         EVT_CALL(SetNpcPos, NPC_Watt, LVar0, 6, LVar2)
         EVT_LOOP(7)
@@ -270,10 +270,10 @@ EvtScript N(EVS_Scene_ReleaseWatt) = {
             EVT_WAIT(1)
         EVT_END_LOOP
     EVT_END_THREAD
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_SET(AB_OMO12_LightSource, LIGHT_FROM_WATT)
     EVT_SET(AB_OMO12_LightPowerMod, 72)
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_SET(AF_OMO_10, TRUE)
     EVT_CALL(SetNpcPos, NPC_LaternTop, NPC_DISPOSE_LOCATION)
     EVT_CALL(SetNpcPos, NPC_LaternBottom, NPC_DISPOSE_LOCATION)
@@ -286,15 +286,15 @@ EvtScript N(EVS_Scene_ReleaseWatt) = {
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, 300)
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-8.0))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_IF_EQ(LVarA, -1)
         EVT_CALL(SpeakToPlayer, NPC_Watt, ANIM_WorldWatt_Strain, ANIM_WorldWatt_Hurt, 0, MSG_CH4_0058)
         EVT_THREAD
-            EVT_WAIT(10)
+            EVT_WAIT(10 * DT)
             EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Pray)
-            EVT_WAIT(15)
+            EVT_WAIT(15 * DT)
             EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
         EVT_END_THREAD
         EVT_CALL(EndSpeech, NPC_Watt, ANIM_WorldWatt_Strain, ANIM_WorldWatt_Hurt, 0)
@@ -303,18 +303,18 @@ EvtScript N(EVS_Scene_ReleaseWatt) = {
         EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes)
     EVT_END_IF
     EVT_CALL(func_802D2C14, 0)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Watt, ANIM_WorldWatt_Idle)
     EVT_CALL(PlaySoundAtNpc, NPC_Watt, SOUND_262, SOUND_SPACE_MODE_0)
     EVT_CALL(ShowEmote, NPC_Watt, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0)
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Watt, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0, MSG_CH4_0059)
     EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_TouchNose)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(EndSpeech, NPC_Watt, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(GetAngleToPlayer, NPC_Watt, LVar0)
     EVT_IF_LT(LVar0, 180)
         EVT_SET(LVar1, -25)
@@ -325,7 +325,7 @@ EvtScript N(EVS_Scene_ReleaseWatt) = {
     EVT_THREAD
         EVT_CALL(DisablePartnerAI, 0)
         EVT_ADD(LVar1, LVar2)
-        EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0))
+        EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0 / DT))
         EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK)
         EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar1, LVar4, 0)
         EVT_CALL(NpcFacePlayer, NPC_PARTNER, 3)
@@ -335,16 +335,16 @@ EvtScript N(EVS_Scene_ReleaseWatt) = {
     EVT_CALL(GetNpcPos, NPC_Watt, LVar7, LVar8, LVar9)
     EVT_CALL(GetAngleToPlayer, NPC_Watt, LVar0)
     EVT_IF_LT(LVar0, 180)
-        EVT_CALL(LoadPath, 15, EVT_PTR(N(WattRightFlightPath)), ARRAY_COUNT(N(WattRightFlightPath)), EASING_LINEAR)
+        EVT_CALL(LoadPath, 15 * DT, EVT_PTR(N(WattRightFlightPath)), ARRAY_COUNT(N(WattRightFlightPath)), EASING_LINEAR)
         EVT_SET(LVar4, 12)
     EVT_ELSE
-        EVT_CALL(LoadPath, 15, EVT_PTR(N(WattLeftFlightPath)), ARRAY_COUNT(N(WattLeftFlightPath)), EASING_LINEAR)
+        EVT_CALL(LoadPath, 15 * DT, EVT_PTR(N(WattLeftFlightPath)), ARRAY_COUNT(N(WattLeftFlightPath)), EASING_LINEAR)
         EVT_SET(LVar4, -12)
     EVT_END_IF
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, LVar4)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 0, 0)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_LABEL(30)
         EVT_CALL(GetNextPathPos)
@@ -358,25 +358,25 @@ EvtScript N(EVS_Scene_ReleaseWatt) = {
             EVT_GOTO(30)
         EVT_END_IF
     EVT_CALL(NpcFacePlayer, NPC_Watt, 3)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Watt, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0, MSG_CH4_005A)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(EndSpeech, NPC_Watt, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0)
     EVT_SET(AB_OMO12_LightSource, LIGHT_FROM_NO_CHANGE)
     EVT_WAIT(1)
     EVT_CALL(N(ChangeNpcToPartner), NPC_Watt, PARTNER_WATT)
     EVT_CALL(N(LoadPartyImage))
     EVT_EXEC(N(EVS_PushPartnerSong))
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_018E, 160, 40)
     EVT_EXEC(N(EVS_PopSong))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_THREAD
         EVT_CALL(GetNpcPos, NPC_PARTNER, LVar2, LVar3, LVar4)
-        EVT_CALL(MakeLerp, 200, 255, 45, EASING_LINEAR)
+        EVT_CALL(MakeLerp, 200, 255, 45 * DT, EASING_LINEAR)
         EVT_LOOP(0)
             EVT_CALL(UpdateLerp)
             EVT_CALL(N(SetLightOriginAndPower), LVar2, LVar3, LVar4, LVar0)
@@ -389,16 +389,16 @@ EvtScript N(EVS_Scene_ReleaseWatt) = {
         EVT_ADD(LVar3, 8)
         EVT_CALL(N(SetLightOriginAndPower), LVar2, LVar3, LVar4, LVar0)
     EVT_END_THREAD
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(CloseMessage)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_EXEC_WAIT(N(EVS_CreateDarkness))
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0, MSG_CH4_005B)
     EVT_CALL(EnablePartnerAI)
     EVT_EXEC(N(EVS_UseWattTutorial))
     EVT_CALL(N(UnsetCamera0Flag1000))
-    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0))
+    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0 / DT))
     EVT_SET(GB_StoryProgress, STORY_CH4_WATT_JOINED_PARTY)
     EVT_CALL(DisablePlayerInput, FALSE)
     EVT_CALL(RemoveNpc, NPC_LaternTop)

src/world/area_omo/omo_14/omo_14_3_npc.c

@@ -94,7 +94,7 @@ Vec2i N(CrowdChaseGoalPositions)[] = {
 };
 
 EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = {
-    EVT_SETF(LVarA, EVT_FLOAT(3.5))
+    EVT_SETF(LVarA, EVT_FLOAT(3.5 / DT))
     EVT_SET(AF_OMO_11, FALSE)
     EVT_CALL(SetNpcSpeed, NPC_SELF, LVarA)
     EVT_LABEL(0)
@@ -114,19 +114,19 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = {
                             EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
                             EVT_IF_EQ(LVar1, 0)
                                 EVT_CALL(PlaySound, SOUND_3ED)
-                                EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10)
+                                EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10 * DT)
                                 EVT_THREAD
                                     EVT_CALL(ShakeCam, CAM_DEFAULT, 1, 4, EVT_FLOAT(1.0))
                                 EVT_END_THREAD
-                                EVT_WAIT(3)
+                                EVT_WAIT(3 * DT)
                                 EVT_CALL(SetPlayerAnimation, ANIM_Mario1_PanicRun)
                                 EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0))
                                 EVT_CALL(PlaySound, SOUND_3EE)
-                                EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 15)
+                                EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 15 * DT)
                                 EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
                             EVT_ELSE
                                 EVT_CALL(GetNpcPos, NPC_SELF, LVar3, LVar4, LVar5)
-                                EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 10)
+                                EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 10 * DT)
                             EVT_END_IF
                             EVT_SET(LVarE, 0)
                         EVT_END_IF
@@ -139,26 +139,26 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = {
                             EVT_IF_NE(LVar9, 6)
                                 EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
                                 EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0))
-                                EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 15)
+                                EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 15 * DT)
                             EVT_END_IF
                             EVT_IF_EQ(AF_OMO_11, FALSE)
                                 EVT_SET(AF_OMO_11, TRUE)
                             EVT_END_IF
                             EVT_USE_BUF(EVT_PTR(N(CrowdChaseGoalPositions)))
                             EVT_BUF_READ2(LVar1, LVar2)
-                            EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0))
+                            EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0 / DT))
                             EVT_CALL(N(SimpleMoveNPC), LVar3, LVar4)
                         EVT_ELSE
                             EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
                             EVT_IF_LT(LVar0, 150)
                                 EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0))
-                                EVT_CALL(NpcJump0, NPC_SELF, LVar3, 0, LVar4, 15)
+                                EVT_CALL(NpcJump0, NPC_SELF, LVar3, 0, LVar4, 15 * DT)
-                                EVT_WAIT(30)
+                                EVT_WAIT(30 * DT)
                             EVT_ELSE
                                 EVT_CALL(DisablePlayerInput, TRUE)
                                 EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0))
-                                EVT_CALL(NpcJump0, NPC_SELF, LVar3, 0, LVar4, 15)
+                                EVT_CALL(NpcJump0, NPC_SELF, LVar3, 0, LVar4, 15 * DT)
-                                EVT_WAIT(30)
+                                EVT_WAIT(30 * DT)
                                 EVT_CALL(DisablePlayerInput, FALSE)
                             EVT_END_IF
                             EVT_CALL(SetSelfVar, 0, 1)
@@ -188,8 +188,8 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = {
                 EVT_CALL(SpeakToPlayer, NPC_SELF, -1, -1, 5, MSG_CH4_005D)
                 EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
                 EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0))
-                EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 15)
+                EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 15 * DT)
-                EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0))
+                EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0 / DT))
                 EVT_CALL(NpcMoveTo, NPC_SELF, 230, 0, 0)
                 EVT_CALL(SetNpcSpeed, NPC_SELF, LVarA)
                 EVT_SET(LVar0, 1)
@@ -197,7 +197,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = {
                     EVT_CALL(SetNpcVar, LVar0, 0, 2)
                     EVT_ADD(LVar0, 1)
                 EVT_END_LOOP
-                EVT_WAIT(45)
+                EVT_WAIT(45 * DT)
                 EVT_CALL(StopSound, SOUND_8000004C)
                 EVT_CALL(SpeakToPlayer, NPC_SELF, -1, -1, 5, MSG_CH4_005E)
                 EVT_THREAD
@@ -215,13 +215,13 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = {
                     EVT_WAIT(1)
                 EVT_END_LOOP
                 EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK)
-                EVT_WAIT(40)
+                EVT_WAIT(40 * DT)
                 EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0)
-                EVT_WAIT(20)
+                EVT_WAIT(20 * DT)
                 EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0))
                 EVT_CALL(NpcMoveTo, NPC_SELF, 300, 0, 0)
                 EVT_SET(GB_StoryProgress, STORY_CH4_OPENED_GENERAL_GUY_ROOM)
-                EVT_WAIT(30)
+                EVT_WAIT(30 * DT)
                 EVT_CALL(DisablePlayerInput, FALSE)
                 EVT_CALL(RemoveNpc, NPC_SELF)
             EVT_END_IF
@@ -235,7 +235,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = {
 EvtScript N(EVS_NpcIdle_ShyGuy_Crowd) = {
     EVT_CALL(RandInt, 15, LVarA)
     EVT_ADD(LVarA, 20)
-    EVT_DIVF(LVarA, EVT_FLOAT(10.0))
+    EVT_DIVF(LVarA, EVT_FLOAT(10.0 * DT))
     EVT_CALL(SetNpcSpeed, NPC_SELF, LVarA)
     EVT_LABEL(0)
     EVT_CALL(GetSelfVar, 0, LVar0)
@@ -253,10 +253,10 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Crowd) = {
                             EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0))
                             EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
                             EVT_IF_EQ(LVar1, 0)
-                                EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10)
+                                EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10 * DT)
                             EVT_ELSE
                                 EVT_CALL(GetNpcPos, NPC_SELF, LVar3, LVar4, LVar5)
-                                EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 10)
+                                EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 10 * DT)
                             EVT_END_IF
                             EVT_SET(LVarE, 0)
                         EVT_END_IF
@@ -265,7 +265,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Crowd) = {
                         EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
                         EVT_IF_NE(LVar9, 6)
                             EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0))
-                            EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 15)
+                            EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 15 * DT)
                         EVT_END_IF
                         EVT_CALL(GetSelfNpcID, LVar5)
                         EVT_USE_BUF(EVT_PTR(N(CrowdChaseGoalPositions)))
@@ -278,7 +278,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Crowd) = {
                             EVT_SET(LVar4, 50)
                         EVT_END_IF
                         EVT_SET(LVarF, LVar0)
-                        EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(7.0))
+                        EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(7.0 / DT))
                         EVT_CALL(N(SimpleMoveNPC), LVar3, LVar4)
                         EVT_CALL(GetNpcVar, NPC_ShyGuy_01, 0, LVar0)
                         EVT_IF_EQ(LVar0, 1)
@@ -301,13 +301,13 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Crowd) = {
             EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
             EVT_CALL(RandInt, 360, LVar0)
             EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 0)
-            EVT_CALL(RandInt, 20, LVar0)
+            EVT_CALL(RandInt, 20 * DT, LVar0)
             EVT_ADD(LVar0, 1)
             EVT_WAIT(LVar0)
             EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0)
             EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
             EVT_CALL(SetNpcJumpscale, NPC_SELF, 2)
-            EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 12)
+            EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 12 * DT)
             EVT_CALL(GetSelfVar, 0, LVar0)
             EVT_IF_EQ(LVar0, 1)
                 EVT_CALL(N(GetActingPartner))
@@ -316,18 +316,18 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Crowd) = {
                 EVT_END_IF
             EVT_END_IF
         EVT_CASE_EQ(2)
-            EVT_CALL(RandInt, 15, LVar0)
+            EVT_CALL(RandInt, 15 * DT, LVar0)
             EVT_ADD(LVar0, 1)
             EVT_WAIT(LVar0)
             EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0)
             EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
             EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0))
-            EVT_CALL(NpcJump0, NPC_SELF, 235, LVar1, LVar2, 20)
+            EVT_CALL(NpcJump0, NPC_SELF, 235, LVar1, LVar2, 20 * DT * DT)
-            EVT_WAIT(30)
+            EVT_WAIT(30 * DT)
             EVT_CALL(SetSelfVar, 0, 3)
         EVT_CASE_EQ(3)
             EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
-            EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0))
+            EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0 / DT))
             EVT_CALL(NpcMoveTo, NPC_SELF, 235, 0, 0)
             EVT_CALL(NpcMoveTo, NPC_SELF, 300, 0, 0)
             EVT_CALL(RemoveNpc, NPC_SELF)

src/world/area_omo/omo_15/omo_15_3_npc.c

@@ -22,33 +22,33 @@ s32 N(BeginSurroundCrowdPositions)[] = {
 
 EvtScript N(EVS_Scene_MeetingGeneralGuy) = {
     EVT_CALL(DisablePlayerInput, TRUE)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(GetPartnerInUse, LVar0)
         EVT_IF_NE(LVar0, PARTNER_NONE)
             EVT_CALL(InterruptUsePartner)
-            EVT_WAIT(30)
+            EVT_WAIT(30 * DT)
             EVT_CALL(func_802D2C14, 1)
             EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
-            EVT_WAIT(45)
+            EVT_WAIT(45 * DT)
             EVT_CALL(func_802D2C14, 0)
         EVT_END_IF
     EVT_END_THREAD
     EVT_CALL(SpeakToPlayer, NPC_GeneralGuy, ANIM_GeneralGuy_Anim0A, ANIM_GeneralGuy_Anim02, 0, MSG_CH4_005F)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 250, -50, 10)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, 250, -50, 10)
     EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(205.0), EVT_FLOAT(11.0))
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SpeakToPlayer, NPC_GeneralGuy, ANIM_GeneralGuy_Anim0A, ANIM_GeneralGuy_Anim02, 0, MSG_CH4_0060)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SpeakToPlayer, NPC_GeneralGuy, ANIM_GeneralGuy_Anim0A, ANIM_GeneralGuy_Anim02, 0, MSG_CH4_0061)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SpeakToPlayer, NPC_GeneralGuy, ANIM_GeneralGuy_Anim0A, ANIM_GeneralGuy_Anim02, 0, MSG_CH4_0062)
-    EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0))
+    EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT))
     EVT_CALL(PlayerMoveTo, -200, 0, 0)
     EVT_SET(LVar0, NPC_ShyGuy_01)
     EVT_LOOP(9)
@@ -58,7 +58,7 @@ EvtScript N(EVS_Scene_MeetingGeneralGuy) = {
     EVT_CALL(SetNpcAnimation, NPC_GeneralGuy, ANIM_GeneralGuy_Anim0C)
     EVT_CALL(ShowMessageAtScreenPos, MSG_CH4_0063, 160, 40)
     EVT_CALL(SetNpcAnimation, NPC_GeneralGuy, ANIM_GeneralGuy_Anim02)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_SET(LVar0, NPC_ShyGuy_01)
     EVT_LOOP(9)
         EVT_CALL(SetNpcAnimation, LVar0, ANIM_ShyGuy_Red_Anim01)
@@ -66,7 +66,7 @@ EvtScript N(EVS_Scene_MeetingGeneralGuy) = {
     EVT_END_LOOP
     EVT_CALL(SpeakToPlayer, NPC_GeneralGuy, ANIM_GeneralGuy_Anim02, ANIM_GeneralGuy_Anim0A, 0, MSG_CH4_0064)
     EVT_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(PlaySound, SOUND_8000004D)
         EVT_SET(LVar0, NPC_ShyGuy_01)
         EVT_LOOP(9)
@@ -90,7 +90,7 @@ EvtScript N(EVS_Scene_MeetingGeneralGuy) = {
         EVT_ADD(LVar0, 1)
     EVT_END_LOOP
     EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0))
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     // wait for battle to be over
     EVT_LABEL(5)
         EVT_CALL(GetNpcVar, NPC_ShyGuy_09, 0, LVar0)
@@ -106,10 +106,10 @@ EvtScript N(EVS_Scene_MeetingGeneralGuy) = {
     EVT_END_IF
     EVT_CALL(InterpPlayerYaw, 90, 0)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, 150, 0, 0)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.5))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.5 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_CALL(FadeOutMusic, 0, 3000)
+    EVT_CALL(FadeOutMusic, 0, 3000 * DT)
     EVT_EXEC(N(EVS_TrySpawningStarCard))
     EVT_CALL(DisablePlayerInput, FALSE)
     EVT_RETURN

src/world/area_pra/pra_01/pra_01_3_npc.c

@@ -55,14 +55,14 @@ EvtScript N(EVS_Scene_RescuedKalmar) = {
     EVT_WAIT(1)
     EVT_CALL(WaitForPlayerInputEnabled)
     EVT_CALL(DisablePlayerInput, TRUE)
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Kalmar, ANIM_WorldKalmar_Talk, ANIM_WorldKalmar_Idle, 512, MSG_CH7_016D)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0))
     EVT_CALL(SetCamPitch, CAM_DEFAULT, 18, -6)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_CALL(MakeLerp, 0, 360, 10, EASING_LINEAR)
+    EVT_CALL(MakeLerp, 0, 360, 10 * DT, EASING_LINEAR)
     EVT_LOOP(0)
         EVT_CALL(UpdateLerp)
         EVT_CALL(SetNpcRotation, NPC_Kalmar, 0, LVar0, 0)
@@ -73,7 +73,7 @@ EvtScript N(EVS_Scene_RescuedKalmar) = {
     EVT_END_LOOP
     EVT_CALL(EnableNpcAI, NPC_Kalmar, FALSE)
     EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Leap)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower)
     EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
@@ -83,51 +83,51 @@ EvtScript N(EVS_Scene_RescuedKalmar) = {
     EVT_ADD(LVar3, 30)
     EVT_LOOP(5)
         EVT_PLAY_EFFECT(EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 20)
-        EVT_WAIT(6)
+        EVT_WAIT(6 * DT)
         EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar0, LVar3, LVar2, 20)
-        EVT_WAIT(6)
+        EVT_WAIT(6 * DT)
     EVT_END_LOOP
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(PlaySoundAtPlayer, SOUND_188, SOUND_SPACE_MODE_0)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_ADD(LVar1, 20)
     EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
     EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Idle)
     EVT_CALL(EnableNpcAI, NPC_Kalmar, TRUE)
     EVT_CALL(N(UpgradeStarPowerCh7))
     EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0197, 160, 40)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(GetNpcPos, NPC_Kalmar, LVar0, LVar1, LVar2)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(350.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Kalmar, ANIM_WorldKalmar_Talk, ANIM_WorldKalmar_Idle, 512, MSG_CH7_016E)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, -25)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Kalmar, ANIM_WorldKalmar_Talk, ANIM_WorldKalmar_Idle, 512, MSG_CH7_016F)
     EVT_CALL(SetNpcFlagBits, NPC_Kalmar, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE)
     EVT_THREAD
         EVT_LOOP(25)
             EVT_CALL(GetNpcPos, NPC_Kalmar, LVar0, LVar1, LVar2)
             EVT_PLAY_EFFECT(EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 20)
-            EVT_WAIT(4)
+            EVT_WAIT(4 * DT)
         EVT_END_LOOP
     EVT_END_THREAD
     EVT_THREAD
         EVT_SET(LVar2, 0)
         EVT_SET(LVar3, 1800)
-        EVT_CALL(MakeLerp, LVar2, LVar3, 100, EASING_CUBIC_IN)
+        EVT_CALL(MakeLerp, LVar2, LVar3, 100 * DT, EASING_CUBIC_IN)
         EVT_LOOP(0)
             EVT_CALL(UpdateLerp)
             EVT_CALL(SetNpcRotation, NPC_Kalmar, 0, LVar0, 0)
@@ -141,7 +141,7 @@ EvtScript N(EVS_Scene_RescuedKalmar) = {
         EVT_CALL(GetNpcPos, NPC_Kalmar, LVar2, LVar3, LVar4)
         EVT_SET(LVar5, LVar3)
         EVT_ADD(LVar5, 180)
-        EVT_CALL(MakeLerp, LVar3, LVar5, 100, EASING_CUBIC_IN)
+        EVT_CALL(MakeLerp, LVar3, LVar5, 100 * DT, EASING_CUBIC_IN)
         EVT_LOOP(0)
             EVT_CALL(UpdateLerp)
             EVT_CALL(SetNpcPos, NPC_Kalmar, LVar2, LVar0, LVar4)
@@ -153,14 +153,18 @@ EvtScript N(EVS_Scene_RescuedKalmar) = {
         EVT_CALL(SetNpcPos, NPC_Kalmar, NPC_DISPOSE_LOCATION)
     EVT_END_THREAD
     EVT_THREAD
-        EVT_WAIT(15)
+        EVT_WAIT(15 * DT)
         EVT_CALL(PlaySoundAtNpc, NPC_Kalmar, SOUND_2045, SOUND_SPACE_MODE_0)
     EVT_END_THREAD
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp)
-    EVT_WAIT(90)
+    EVT_WAIT(90 * DT)
+#if VERSION_PAL
+    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3 / DT))
+#else
     EVT_CALL(ResetCam, CAM_DEFAULT, 3)
-    EVT_WAIT(20)
+#endif
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
     EVT_SET(GB_StoryProgress, STORY_CH7_STAR_SPRIT_DEPARTED)
     EVT_EXEC(N(EVS_SetupMusic))

src/world/area_pra/pra_02/pra_02_4_entity.c

@@ -81,7 +81,7 @@ EvtScript N(EVS_ManagePoundableSwitch) = {
     EVT_END_IF
     EVT_CALL(DisablePlayerInput, TRUE)
     EVT_IF_EQ(GF_PRA02_DoorColorToggle, FALSE)
-        EVT_CALL(MakeLerp, 0, -250, 250, EASING_LINEAR)
+        EVT_CALL(MakeLerp, 0, -250, 250 * DT, EASING_LINEAR)
         EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittse, COLLIDER_FLAGS_UPPER_MASK)
         EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_UPPER_MASK)
         EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilittse2, COLLIDER_FLAGS_UPPER_MASK)
@@ -89,7 +89,7 @@ EvtScript N(EVS_ManagePoundableSwitch) = {
         EVT_SET(GF_PRA02_DoorColorToggle, TRUE)
         EVT_EXEC(N(EVS_LowerPoundableSwitch))
     EVT_ELSE
-        EVT_CALL(MakeLerp, -250, 0, 250, EASING_LINEAR)
+        EVT_CALL(MakeLerp, -250, 0, 250 * DT, EASING_LINEAR)
         EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittse2, COLLIDER_FLAGS_UPPER_MASK)
         EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne2, COLLIDER_FLAGS_UPPER_MASK)
         EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilittse, COLLIDER_FLAGS_UPPER_MASK)
@@ -108,8 +108,8 @@ EvtScript N(EVS_ManagePoundableSwitch) = {
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(PlaySound, SOUND_3F)
-        EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 250, EVT_FLOAT(0.5))
+        EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 250 * DT, EVT_FLOAT(0.5))
-        EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.5))
+        EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10 * DT, EVT_FLOAT(1.5))
         EVT_CALL(PlaySound, SOUND_40)
     EVT_END_THREAD
     EVT_LABEL(0)
@@ -119,7 +119,7 @@ EvtScript N(EVS_ManagePoundableSwitch) = {
         EVT_IF_EQ(LVar1, 1)
             EVT_GOTO(0)
         EVT_END_IF
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_IF_EQ(GF_PRA02_DoorColorToggle, TRUE)
         EVT_CALL(SetGroupVisibility, MODEL_g307, MODEL_GROUP_HIDDEN)
         EVT_CALL(SetGroupVisibility, MODEL_g308, MODEL_GROUP_VISIBLE)

src/world/area_pra/pra_18/pra_18_3_npc.c

@@ -332,6 +332,12 @@ EvtScript N(EVS_NpcInit_Clubba_03_Aux) = {
     EVT_END
 };
 
+#if VERSION_PAL
+#define CLUBBA_EXTRA_FLAGS (ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_TOUCH)
+#else
+#define CLUBBA_EXTRA_FLAGS (0)
+#endif
+
 NpcData N(NpcData_Clubba_01)[] = {
     {
         .id = NPC_Clubba_01,
@@ -339,7 +345,7 @@ NpcData N(NpcData_Clubba_01)[] = {
         .yaw = 270,
         .init = &N(EVS_NpcInit_Clubba_01),
         .settings = &N(NpcSettings_Clubba),
-        .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000,
+        .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | CLUBBA_EXTRA_FLAGS,
         .drops = NO_DROPS,
         .animations = FROST_CLUBBA_ANIMS,
     },
@@ -349,7 +355,7 @@ NpcData N(NpcData_Clubba_01)[] = {
         .yaw = 270,
         .init = &N(EVS_NpcInit_Clubba_01_Aux),
         .settings = &N(NpcSettings_Clubba),
-        .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_400000,
+        .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_400000 | CLUBBA_EXTRA_FLAGS,
         .drops = NO_DROPS,
         .animations = FROST_CLUBBA_ANIMS,
     },
@@ -362,7 +368,7 @@ NpcData N(NpcData_Clubba_02)[] = {
         .yaw = 270,
         .init = &N(EVS_NpcInit_Clubba_02),
         .settings = &N(NpcSettings_Clubba),
-        .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000,
+        .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | CLUBBA_EXTRA_FLAGS,
         .drops = NO_DROPS,
         .animations = FROST_CLUBBA_ANIMS,
     },
@@ -372,7 +378,7 @@ NpcData N(NpcData_Clubba_02)[] = {
         .yaw = 270,
         .init = &N(EVS_NpcInit_Clubba_02_Aux),
         .settings = &N(NpcSettings_Clubba),
-        .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_400000,
+        .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_400000 | CLUBBA_EXTRA_FLAGS,
         .drops = NO_DROPS,
         .animations = FROST_CLUBBA_ANIMS,
     },
@@ -385,7 +391,7 @@ NpcData N(NpcData_Clubba_03)[] = {
         .yaw = 270,
         .init = &N(EVS_NpcInit_Clubba_03),
         .settings = &N(NpcSettings_Clubba),
-        .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000,
+        .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | CLUBBA_EXTRA_FLAGS,
         .drops = NO_DROPS,
         .animations = FROST_CLUBBA_ANIMS,
     },
@@ -395,7 +401,7 @@ NpcData N(NpcData_Clubba_03)[] = {
         .yaw = 270,
         .init = &N(EVS_NpcInit_Clubba_03_Aux),
         .settings = &N(NpcSettings_Clubba),
-        .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_400000,
+        .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_400000 | CLUBBA_EXTRA_FLAGS,
         .drops = NO_DROPS,
         .animations = FROST_CLUBBA_ANIMS,
     },

src/world/area_pra/pra_32/pra_32_3_npc.c

@@ -7,7 +7,7 @@
 EvtScript N(EVS_AnimateCam_CrystalKing) = {
     EVT_SET(MV_CamDistance, 400)
     EVT_THREAD
-        EVT_CALL(MakeLerp, 400, 300, 200, EASING_LINEAR)
+        EVT_CALL(MakeLerp, 400, 300, 200 * DT, EASING_LINEAR)
         EVT_LOOP(0)
             EVT_CALL(UpdateLerp)
             EVT_SET(MV_CamDistance, LVar0)
@@ -17,7 +17,7 @@ EvtScript N(EVS_AnimateCam_CrystalKing) = {
             EVT_END_IF
         EVT_END_LOOP
     EVT_END_THREAD
-    EVT_CALL(MakeLerp, 200, 100, 200, EASING_LINEAR)
+    EVT_CALL(MakeLerp, 200, 100, 200 * DT, EASING_LINEAR)
     EVT_LOOP(0)
         EVT_CALL(UpdateLerp)
         EVT_CALL(SetNpcPos, NPC_CrystalKing_01, 588, LVar0, 116)
@@ -56,11 +56,11 @@ EvtScript N(EVS_Scene_CrystalKingAppears) = {
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_ADD(LVar1, -30)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT))
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(12.0), EVT_FLOAT(-10.0))
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_BeforeJump)
     EVT_CALL(SetPlayerPos, 475, 100, 116)
     EVT_CALL(DisablePartnerAI, 0)
@@ -75,24 +75,24 @@ EvtScript N(EVS_Scene_CrystalKingAppears) = {
         EVT_CALL(GetNpcPos, NPC_CrystalKing_01, LVar0, LVar1, LVar2)
         EVT_ADD(LVar1, 10)
         EVT_PLAY_EFFECT(EFFECT_MISC_PARTICLES, 0, LVar0, LVar1, LVar2, 50, 50, 1, 40, 50)
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_PLAY_EFFECT(EFFECT_MISC_PARTICLES, 0, LVar0, LVar1, LVar2, 50, 50, 1, 40, 50)
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_PLAY_EFFECT(EFFECT_MISC_PARTICLES, 0, LVar0, LVar1, LVar2, 50, 50, 1, 40, 50)
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_PLAY_EFFECT(EFFECT_MISC_PARTICLES, 1, LVar0, LVar1, LVar2, 50, 50, 1, 20, 40)
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_PLAY_EFFECT(EFFECT_MISC_PARTICLES, 1, LVar0, LVar1, LVar2, 50, 50, 1, 20, 40)
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_PLAY_EFFECT(EFFECT_MISC_PARTICLES, 1, LVar0, LVar1, LVar2, 50, 50, 1, 20, 40)
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_PLAY_EFFECT(EFFECT_BIG_SNOWFLAKES, 0, LVar0, LVar1, LVar2)
         EVT_PLAY_EFFECT(EFFECT_SPARKLES, 2, LVar0, LVar1, LVar2, 10)
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_PLAY_EFFECT(EFFECT_BIG_SNOWFLAKES, 0, LVar0, LVar1, LVar2)
         EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 7)
     EVT_END_THREAD
-    EVT_CALL(MakeLerp, 0, 255, 120, EASING_LINEAR)
+    EVT_CALL(MakeLerp, 0, 255, 120 * DT, EASING_LINEAR)
     EVT_LABEL(5)
     EVT_CALL(UpdateLerp)
     EVT_CALL(func_802CFD30, NPC_CrystalKing_01, FOLD_TYPE_7, LVar0, 0, 0, 0)
@@ -101,23 +101,23 @@ EvtScript N(EVS_Scene_CrystalKingAppears) = {
         EVT_GOTO(5)
     EVT_END_IF
     EVT_CALL(EnableNpcShadow, NPC_CrystalKing_01, TRUE)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_EXEC_WAIT(N(EVS_AnimateCam_CrystalKing))
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_CALL(GetNpcPos, NPC_CrystalKing_01, LVar3, LVar4, LVar5)
     EVT_CALL(SetNpcPos, NPC_SELF, LVar3, LVar4, LVar2)
     EVT_ADD(LVar0, LVar3)
     EVT_DIV(LVar0, 2)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT))
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(SpeakToPlayer, NPC_CrystalKing_01, ANIM_CrystalKing_Anim09, ANIM_CrystalKing_Anim09, 0, MSG_CH7_016B)
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Run)
-    EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.5))
+    EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.5 / DT))
     EVT_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1309, 0)
         EVT_CALL(PlayerMoveTo, 564, 116, 0)
     EVT_END_THREAD
@@ -145,7 +145,7 @@ EvtScript N(EVS_Scene_BossDefeated) = {
     EVT_CALL(SpeakToPlayer, NPC_CrystalKing_01, ANIM_CrystalKing_Anim09, ANIM_CrystalKing_Anim09, 0, MSG_CH7_016C)
     EVT_THREAD
         EVT_CALL(SetNpcRotationPivot, NPC_CrystalKing_01, 30)
-        EVT_CALL(MakeLerp, 0, 19 * 360, 210, EASING_COS_IN_OUT)
+        EVT_CALL(MakeLerp, 0, 19 * 360, 210 * DT, EASING_COS_IN_OUT)
         EVT_LOOP(0)
             EVT_CALL(UpdateLerp)
             EVT_CALL(SetNpcRotation, NPC_CrystalKing_01, 0, 0, LVar0)
@@ -156,7 +156,7 @@ EvtScript N(EVS_Scene_BossDefeated) = {
         EVT_END_LOOP
     EVT_END_THREAD
     EVT_THREAD
-        EVT_CALL(MakeLerp, 100, 200, 210, EASING_COS_IN_OUT)
+        EVT_CALL(MakeLerp, 100, 200, 210 * DT, EASING_COS_IN_OUT)
         EVT_LOOP(0)
             EVT_CALL(UpdateLerp)
             EVT_SETF(LVarA, LVar0)
@@ -168,7 +168,7 @@ EvtScript N(EVS_Scene_BossDefeated) = {
             EVT_WAIT(1)
         EVT_END_LOOP
     EVT_END_THREAD
-    EVT_CALL(MakeLerp, 255, 122, 30, EASING_COS_IN_OUT)
+    EVT_CALL(MakeLerp, 255, 122, 30 * DT, EASING_COS_IN_OUT)
     EVT_LOOP(0)
         EVT_CALL(UpdateLerp)
         EVT_CALL(func_802CFD30, NPC_CrystalKing_01, FOLD_TYPE_7, LVar0, 0, 0, 0)
@@ -182,8 +182,8 @@ EvtScript N(EVS_Scene_BossDefeated) = {
         EVT_CALL(GetNpcPos, NPC_CrystalKing_01, LVar0, LVar1, LVar2)
         EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 0, LVar0, LVar1, LVar2, 1, 130)
     EVT_END_THREAD
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
-    EVT_CALL(MakeLerp, 120, 0, 30, EASING_COS_IN_OUT)
+    EVT_CALL(MakeLerp, 120, 0, 30 * DT, EASING_COS_IN_OUT)
     EVT_LOOP(0)
         EVT_CALL(UpdateLerp)
         EVT_CALL(func_802CFD30, NPC_CrystalKing_01, FOLD_TYPE_7, LVar0, 0, 0, 0)
@@ -198,7 +198,7 @@ EvtScript N(EVS_Scene_BossDefeated) = {
     EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar0, LVar1, LVar2, 40)
     EVT_CALL(SetNpcPos, NPC_CrystalKing_01, NPC_DISPOSE_LOCATION)
     EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION)
-    EVT_WAIT(75)
+    EVT_WAIT(75 * DT)
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
     EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1309, SURFACE_TYPE_SNOW)
     EVT_WAIT(25)

src/world/area_sam/sam_01/sam_01_2_main.c

@@ -53,13 +53,13 @@ EvtScript N(EVS_SetupHerringway) = {
         EVT_END_LOOP
         EVT_CALL(SetNpcFlagBits, NPC_Herringway, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
         EVT_CALL(SetNpcAnimation, NPC_Herringway, ANIM_Herringway_Walk)
-        EVT_CALL(NpcMoveTo, NPC_Herringway, -265, 275, 20)
+        EVT_CALL(NpcMoveTo, NPC_Herringway, -265, 275, 20 * DT)
         EVT_EXEC(N(EVS_OpenAndCloseMayorsDoor))
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
-        EVT_CALL(NpcMoveTo, NPC_Herringway, -290, 157, 20)
+        EVT_CALL(NpcMoveTo, NPC_Herringway, -290, 157, 20 * DT)
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_THREAD
-            EVT_CALL(NpcMoveTo, NPC_Herringway, -228, 91, 20)
+            EVT_CALL(NpcMoveTo, NPC_Herringway, -228, 91, 20 * DT)
             EVT_CALL(SetNpcAnimation, NPC_Herringway, ANIM_Herringway_Idle)
             EVT_CALL(InterpNpcYaw, NPC_Herringway, 270, 0)
             EVT_CALL(SetNpcFlagBits, NPC_Herringway, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE)

src/world/area_sam/sam_01/sam_01_3_rooms.c

@@ -81,7 +81,7 @@ EvtScript N(EVS_RoomListener_MayorOffice) = {
                     EVT_CALL(SetNpcFlagBits, NPC_Herringway, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
                     EVT_CALL(SetNpcFlagBits, NPC_Herringway, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
                     EVT_CALL(SetNpcAnimation, NPC_Herringway, ANIM_Penguin_Walk)
-                    EVT_CALL(SetNpcSpeed, NPC_Herringway, EVT_FLOAT(1.5))
+                    EVT_CALL(SetNpcSpeed, NPC_Herringway, EVT_FLOAT(1.5 / DT))
                     EVT_CALL(NpcMoveTo, NPC_Herringway, -252, -55, 0)
                     EVT_CALL(SetNpcAnimation, NPC_Herringway, ANIM_Penguin_Idle)
                     EVT_CALL(SetNpcFlagBits, NPC_Herringway, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE)

src/world/area_sam/sam_01/sam_01_4_npc.c

@@ -84,7 +84,7 @@ EvtScript N(EVS_Mayor_HandOverBucket) = {
         EVT_END_LOOP
         EVT_CALL(SetItemPos, MV_BucketItemID, NPC_DISPOSE_LOCATION)
     EVT_END_THREAD
-    EVT_CALL(NpcMoveTo, NPC_MayorPenguin, LVar0, LVar2, 10)
+    EVT_CALL(NpcMoveTo, NPC_MayorPenguin, LVar0, LVar2, 10 * DT)
     EVT_RETURN
     EVT_END
 };
@@ -121,7 +121,7 @@ EvtScript N(EVS_NpcInteract_MayorPenguin) = {
                 EVT_IF_EQ(LVar1, 1)
                     EVT_GOTO(10)
                 EVT_END_IF
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_CALL(MakeLerp, 70, 0, 30, EASING_LINEAR)
             EVT_LABEL(20)
                 EVT_CALL(UpdateLerp)
@@ -135,7 +135,7 @@ EvtScript N(EVS_NpcInteract_MayorPenguin) = {
             EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MayorPenguin_Carry)
             EVT_CALL(InterpNpcYaw, NPC_SELF, 180, 0)
             EVT_EXEC_GET_TID(N(EVS_Mayor_CarryBucket), LVarA)
-            EVT_WAIT(10)
+            EVT_WAIT(10 * DT)
             EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
             EVT_IF_EQ(MV_PlayerLeftOfMayor, 0)
                 EVT_ADD(LVar2, -40)
@@ -157,7 +157,7 @@ EvtScript N(EVS_NpcInteract_MayorPenguin) = {
             EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
             EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 0, MSG_CH7_003D)
-            EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0))
+            EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0 / DT))
             EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
             EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE)
             EVT_SET(GB_StoryProgress, STORY_CH7_GOT_SNOWMAN_BUCKET)

src/world/area_sam/sam_01/sam_01_5_scenes.c

@@ -86,22 +86,22 @@ EvtScript N(EVS_Scene_MysteryBegins) = {
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0))
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_EXEC_WAIT(N(EVS_OpenMayorsOfficeDoor))
     EVT_THREAD
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_EXEC_WAIT(N(EVS_CloseMayorsOfficeDoor))
     EVT_END_THREAD
     EVT_CALL(SetNpcFlagBits, NPC_MayorPenguinWife, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
     EVT_CALL(SetNpcPos, NPC_MayorPenguinWife, -255, 0, 28)
-    EVT_CALL(SetNpcSpeed, NPC_MayorPenguinWife, EVT_FLOAT(2.0))
+    EVT_CALL(SetNpcSpeed, NPC_MayorPenguinWife, EVT_FLOAT(2.0 / DT))
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Walk)
     EVT_CALL(NpcMoveTo, NPC_MayorPenguinWife, -255, -30, 0)
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Idle)
     EVT_CALL(SpeakToPlayer, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Talk, ANIM_MayorPenguinWife_Idle, 0, MSG_CH7_0005)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, -255, 0, -150)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.4))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.4 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(DisablePartnerAI, 0)
     EVT_CALL(SetPlayerPos, -284, 0, -165)
@@ -118,12 +118,12 @@ EvtScript N(EVS_Scene_MysteryBegins) = {
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Idle)
     EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguinWife, SOUND_262, 0)
     EVT_CALL(ShowEmote, NPC_MayorPenguinWife, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Walk)
-    EVT_CALL(SetNpcSpeed, NPC_MayorPenguinWife, EVT_FLOAT(0.5))
+    EVT_CALL(SetNpcSpeed, NPC_MayorPenguinWife, EVT_FLOAT(0.5 / DT))
     EVT_CALL(NpcMoveTo, NPC_MayorPenguinWife, -255, -200, 0)
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Inspect)
-    EVT_WAIT(35)
+    EVT_WAIT(35 * DT)
     EVT_THREAD
         EVT_CALL(SetMusicTrack, 0, SONG_PENGUIN_WHODUNIT, 0, 8)
         EVT_CALL(SetNpcAnimation, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Horror)
@@ -137,14 +137,14 @@ EvtScript N(EVS_Scene_MysteryBegins) = {
         EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
         EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
         EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(210.0))
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(10.0))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(10.0 / DT))
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
         EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
         EVT_CALL(GetNpcPos, NPC_MayorPenguinWife, LVar0, LVar1, LVar2)
         EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
         EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
         EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0))
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(10.0))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(10.0 / DT))
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
         EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_END_LOOP
@@ -154,17 +154,17 @@ EvtScript N(EVS_Scene_MysteryBegins) = {
             EVT_WAIT(1)
             EVT_GOTO(2)
         EVT_END_IF
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
-    EVT_CALL(SetNpcSpeed, NPC_MayorPenguinWife, EVT_FLOAT(6.0))
+    EVT_CALL(SetNpcSpeed, NPC_MayorPenguinWife, EVT_FLOAT(6.0 / DT))
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Panic)
     EVT_CALL(NpcMoveTo, NPC_MayorPenguinWife, -255, 0, 0)
     EVT_CALL(SetNpcPos, NPC_MayorPenguinWife, -255, 0, 60)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_SET(MF_ContinueScene, FALSE)
     EVT_THREAD
-        EVT_WAIT(20)
+        EVT_WAIT(20 * DT)
         EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail)
-        EVT_WAIT(60)
+        EVT_WAIT(60 * DT)
         EVT_SET(MF_ContinueScene, TRUE)
     EVT_END_THREAD
     EVT_CALL(ShowMessageAtScreenPos, MSG_CH7_0007, 160, 40)
@@ -176,14 +176,14 @@ EvtScript N(EVS_Scene_MysteryBegins) = {
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(600.0))
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-8.0))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.6))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.6 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(InterpPlayerYaw, 180, 5)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(InterpPlayerYaw, 0, 5)
-    EVT_WAIT(90)
+    EVT_WAIT(90 * DT)
     EVT_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(InterpPlayerYaw, 180, 5)
     EVT_END_THREAD
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
@@ -196,25 +196,25 @@ EvtScript N(EVS_Scene_MysteryBegins) = {
     EVT_CALL(SetNpcYaw, NPC_PARTNER, 0)
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SpeakToPlayer, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Horror, ANIM_MayorPenguinWife_Horror, 5, MSG_CH7_0008)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_EXEC_WAIT(N(EVS_OpenMayorsOfficeDoor))
     EVT_THREAD
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_EXEC_WAIT(N(EVS_CloseMayorsOfficeDoor))
     EVT_END_THREAD
     EVT_THREAD
         EVT_SET(MF_ContinueScene, FALSE)
         EVT_CALL(SetNpcPos, NPC_PenguinPatrol, -255, 0, 50)
-        EVT_CALL(SetNpcSpeed, NPC_PenguinPatrol, EVT_FLOAT(2.0))
+        EVT_CALL(SetNpcSpeed, NPC_PenguinPatrol, EVT_FLOAT(2.0 / DT))
         EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Walk)
         EVT_CALL(NpcMoveTo, NPC_PenguinPatrol, -255, -75, 0)
         EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Idle)
         EVT_SET(MF_ContinueScene, TRUE)
     EVT_END_THREAD
     EVT_CALL(SetNpcPos, NPC_MayorPenguinWife, -255, 0, 80)
-    EVT_CALL(SetNpcSpeed, NPC_MayorPenguinWife, EVT_FLOAT(2.0))
+    EVT_CALL(SetNpcSpeed, NPC_MayorPenguinWife, EVT_FLOAT(2.0 / DT))
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Walk)
     EVT_CALL(NpcMoveTo, NPC_MayorPenguinWife, -255, -20, 0)
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Idle)
@@ -225,21 +225,21 @@ EvtScript N(EVS_Scene_MysteryBegins) = {
         EVT_END_IF
     EVT_CALL(SpeakToPlayer, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_PointTalk, ANIM_MayorPenguinWife_Point, 0, MSG_CH7_0009)
     EVT_CALL(InterpNpcYaw, NPC_PenguinPatrol, 180, 0)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(InterpNpcYaw, NPC_PenguinPatrol, 0, 0)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, -255, 0, -150)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.4))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.4 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_THREAD
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
-        EVT_CALL(PlayerMoveTo, -315, -150, 20)
+        EVT_CALL(PlayerMoveTo, -315, -150, 20 * DT)
         EVT_CALL(InterpPlayerYaw, 0, 0)
     EVT_END_THREAD
     EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Walk)
     EVT_CALL(NpcMoveTo, NPC_PenguinPatrol, -255, -180, 0)
     EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Idle)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_THREAD
         EVT_SET(MF_ContinueScene, FALSE)
         EVT_CALL(SetNpcAnimation, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Walk)
@@ -248,7 +248,7 @@ EvtScript N(EVS_Scene_MysteryBegins) = {
         EVT_SET(MF_ContinueScene, TRUE)
     EVT_END_THREAD
     EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Inspect)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Idle)
     EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_000A)
     EVT_LABEL(6)
@@ -257,7 +257,7 @@ EvtScript N(EVS_Scene_MysteryBegins) = {
             EVT_GOTO(6)
         EVT_END_IF
     EVT_CALL(SpeakToPlayer, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_PointTalk, ANIM_MayorPenguinWife_Point, 0, MSG_CH7_000B)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, EVT_FLOAT(-340.5), EVT_FLOAT(0.0), EVT_FLOAT(-180.7))
@@ -270,20 +270,20 @@ EvtScript N(EVS_Scene_MysteryBegins) = {
     EVT_CALL(GetAngleToPlayer, NPC_PenguinPatrol, LVar0)
     EVT_CALL(InterpNpcYaw, NPC_PenguinPatrol, LVar0, 0)
     EVT_CALL(PlayerFaceNpc, NPC_PenguinPatrol, FALSE)
-    EVT_WAIT(13)
+    EVT_WAIT(13 * DT)
     EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_000C)
     EVT_CALL(SetPlayerAnimation, ANIM_MarioW3_ShakeHead)
-    EVT_WAIT(35)
+    EVT_WAIT(35 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
     EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_000D)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SpeakToPlayer, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_PointTalk, ANIM_MayorPenguinWife_Point, 0, MSG_CH7_000E)
     EVT_CALL(SetPlayerAnimation, ANIM_MarioW3_ShakeHead)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
     EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_000F)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
     EVT_CALL(GetCurrentPartnerID, LVar0)
     EVT_SWITCH(LVar0)
@@ -304,10 +304,10 @@ EvtScript N(EVS_Scene_MysteryBegins) = {
         EVT_CASE_EQ(PARTNER_LAKILESTER)
             EVT_CALL(SpeakToNpc, NPC_PARTNER, ANIM_WorldLakilester_Talk, ANIM_WorldLakilester_Idle, 0, NPC_PenguinPatrol, MSG_CH7_0017)
     EVT_END_SWITCH
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_0018)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
@@ -318,7 +318,7 @@ EvtScript N(EVS_Scene_MysteryBegins) = {
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
     EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_TalkThink, ANIM_PenguinPatrol_StillThink, 0, MSG_CH7_0019)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
     EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_001A)
     EVT_CALL(SetNpcPos, NPC_Penguin_05, -150, 0, 0)
@@ -352,7 +352,7 @@ EvtScript N(EVS_Scene_MysterySolved) = {
     EVT_THREAD
         EVT_CALL(DisablePartnerAI, 0)
         EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK)
-        EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0))
+        EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0 / DT))
         EVT_CALL(NpcMoveTo, NPC_PARTNER, -262, -103, 0)
         EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE)
     EVT_END_THREAD
@@ -360,7 +360,7 @@ EvtScript N(EVS_Scene_MysterySolved) = {
     EVT_CALL(InterpNpcYaw, NPC_PenguinPatrol, LVar0, 0)
     EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_001D)
     EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp)
-    EVT_WAIT(40)
+    EVT_WAIT(40 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
     EVT_CALL(GetNpcPos, NPC_PenguinPatrol, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
@@ -370,43 +370,43 @@ EvtScript N(EVS_Scene_MysterySolved) = {
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(SetPlayerPos, -255, 0, -135)
     EVT_CALL(PlayerFaceNpc, NPC_PenguinPatrol, FALSE)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_001E)
     EVT_CALL(GetNpcPos, NPC_PenguinPatrol, LVar0, LVar1, LVar2)
     EVT_SUB(LVar2, 10)
     EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Walk)
-    EVT_CALL(SetNpcSpeed, NPC_PenguinPatrol, EVT_FLOAT(2.0))
+    EVT_CALL(SetNpcSpeed, NPC_PenguinPatrol, EVT_FLOAT(2.0 / DT))
     EVT_CALL(NpcMoveTo, NPC_PenguinPatrol, LVar0, LVar2, 0)
     EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Idle)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Inspect)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Idle)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 5, MSG_CH7_001F)
     EVT_CALL(GetAngleToPlayer, NPC_PenguinPatrol, LVar0)
     EVT_CALL(InterpNpcYaw, NPC_PenguinPatrol, LVar0, 0)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_THREAD
         EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
         EVT_SUB(LVar0, 20)
-        EVT_CALL(PlayerMoveTo, LVar0, LVar2, 20)
+        EVT_CALL(PlayerMoveTo, LVar0, LVar2, 20 * DT)
         EVT_CALL(PlayerFaceNpc, NPC_Herringway, FALSE)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK)
-        EVT_CALL(NpcMoveTo, NPC_PARTNER, -306, -116, 10)
+        EVT_CALL(NpcMoveTo, NPC_PARTNER, -306, -116, 10 * DT)
         EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE)
         EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Herringway, 0)
     EVT_END_THREAD
     EVT_CALL(GetNpcPos, NPC_PenguinPatrol, LVar0, LVar1, LVar2)
     EVT_ADD(LVar2, 20)
     EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Walk)
-    EVT_CALL(SetNpcSpeed, NPC_PenguinPatrol, EVT_FLOAT(2.0))
+    EVT_CALL(SetNpcSpeed, NPC_PenguinPatrol, EVT_FLOAT(2.0 / DT))
     EVT_CALL(NpcMoveTo, NPC_PenguinPatrol, LVar0, LVar2, 0)
     EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Idle)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_0020)
     EVT_CALL(GetNpcPos, NPC_Herringway, LVar0, LVar1, LVar2)
     EVT_CALL(GetNpcPos, NPC_PenguinPatrol, LVar3, LVar4, LVar5)
@@ -417,10 +417,10 @@ EvtScript N(EVS_Scene_MysterySolved) = {
     EVT_DIVF(LVar1, EVT_FLOAT(2.0))
     EVT_DIVF(LVar2, EVT_FLOAT(2.0))
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Herringway, ANIM_Herringway_Talk, ANIM_Herringway_Idle, 0, MSG_CH7_0021)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
@@ -435,7 +435,7 @@ EvtScript N(EVS_Scene_MysterySolved) = {
     EVT_CALL(PlayerFaceNpc, NPC_PenguinPatrol, FALSE)
     EVT_WAIT(1)
     EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_PenguinPatrol, 0)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_TalkThink, ANIM_PenguinPatrol_StillThink, 0, MSG_CH7_0022)
     EVT_CALL(GetAngleBetweenNPCs, NPC_MayorPenguinWife, NPC_Herringway, LVar0)
     EVT_CALL(InterpNpcYaw, NPC_MayorPenguinWife, LVar0, 0)
@@ -444,7 +444,7 @@ EvtScript N(EVS_Scene_MysterySolved) = {
     EVT_CALL(PlayerFaceNpc, NPC_Herringway, FALSE)
     EVT_WAIT(1)
     EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Herringway, 0)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Herringway, ANIM_Herringway_Talk, ANIM_Herringway_Idle, 0, MSG_CH7_0023)
     EVT_CALL(GetAngleBetweenNPCs, NPC_Herringway, NPC_MayorPenguinWife, LVar0)
     EVT_CALL(InterpNpcYaw, NPC_Herringway, LVar0, 0)
@@ -453,7 +453,7 @@ EvtScript N(EVS_Scene_MysterySolved) = {
     EVT_CALL(PlayerFaceNpc, NPC_MayorPenguinWife, FALSE)
     EVT_WAIT(1)
     EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_MayorPenguinWife, 0)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_PointTalk, ANIM_MayorPenguinWife_Point, 0, MSG_CH7_0024)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
@@ -472,20 +472,20 @@ EvtScript N(EVS_Scene_MysterySolved) = {
     EVT_CALL(PlayerFaceNpc, NPC_PenguinPatrol, FALSE)
     EVT_WAIT(1)
     EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_PenguinPatrol, 0)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_TalkThink, ANIM_PenguinPatrol_StillThink, 0, MSG_CH7_0025)
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Twitch)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguin, SOUND_3E4, 0)
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Dead)
-    EVT_WAIT(2)
+    EVT_WAIT(2 * DT)
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Twitch)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguin, SOUND_3E4, 0)
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Dead)
-    EVT_WAIT(2)
+    EVT_WAIT(2 * DT)
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Twitch)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_CALL(N(GetLeftRightPoints), LVar0, LVar2, -95)
     EVT_CALL(SetCamPosA, CAM_DEFAULT, LVar0, LVar1)
@@ -505,14 +505,14 @@ EvtScript N(EVS_Scene_MysterySolved) = {
     EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_MayorPenguin, 0)
     EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguin, SOUND_3E4, 0)
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Dead)
-    EVT_WAIT(2)
+    EVT_WAIT(2 * DT)
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Twitch)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguin, SOUND_3E4, 0)
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Dead)
-    EVT_WAIT(2)
+    EVT_WAIT(2 * DT)
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Twitch)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(GetNpcPos, NPC_MayorPenguin, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, 11)
     EVT_ADD(LVar2, 10)
@@ -520,30 +520,30 @@ EvtScript N(EVS_Scene_MysterySolved) = {
     EVT_CALL(EnableNpcShadow, NPC_MayorPenguin, FALSE)
     EVT_CALL(SetNpcPos, NPC_MayorDummy, -270, 0, -205)
     EVT_THREAD
-        EVT_WAIT(30)
+        EVT_WAIT(30 * DT)
         EVT_CALL(SetNpcPos, NPC_MayorDummy, NPC_DISPOSE_LOCATION)
         EVT_CALL(EnableNpcShadow, NPC_MayorPenguin, TRUE)
     EVT_END_THREAD
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_WakeUp)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Idle)
     EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguin, SOUND_32C, 0)
     EVT_CALL(SetNpcJumpscale, NPC_MayorPenguin, EVT_FLOAT(1.0))
     EVT_CALL(GetNpcPos, NPC_MayorPenguin, LVar0, LVar1, LVar2)
-    EVT_CALL(NpcJump0, NPC_MayorPenguin, LVar0, 0, LVar2, 10)
+    EVT_CALL(NpcJump0, NPC_MayorPenguin, LVar0, 0, LVar2, 10 * DT)
     EVT_CALL(SetMusicTrack, 0, SONG_PENGUIN_WAKES_UP, 0, 8)
     EVT_CALL(SpeakToPlayer, NPC_MayorPenguin, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 0, MSG_CH7_0027)
     EVT_CALL(InterpNpcYaw, NPC_MayorPenguin, 0, 0)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(InterpNpcYaw, NPC_MayorPenguin, 180, 0)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Surprise)
     EVT_CALL(SetNpcJumpscale, NPC_MayorPenguinWife, EVT_FLOAT(1.0))
     EVT_CALL(GetNpcPos, NPC_MayorPenguinWife, LVar0, LVar1, LVar2)
-    EVT_CALL(NpcJump0, NPC_MayorPenguinWife, LVar0, LVar1, LVar2, 20)
+    EVT_CALL(NpcJump0, NPC_MayorPenguinWife, LVar0, LVar1, LVar2, 20 * DT)
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Idle)
     EVT_CALL(SpeakToPlayer, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Talk, ANIM_MayorPenguinWife_Idle, 0, MSG_CH7_0028)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SpeakToPlayer, NPC_MayorPenguin, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 0, MSG_CH7_0029)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
@@ -552,7 +552,7 @@ EvtScript N(EVS_Scene_MysterySolved) = {
     EVT_WAIT(1)
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
     EVT_CALL(SpeakToNpc, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, NPC_MayorPenguin, MSG_CH7_002A)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToNpc, NPC_MayorPenguin, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 0, NPC_PenguinPatrol, MSG_CH7_002B)
     EVT_CALL(GetNpcPos, NPC_MayorPenguin, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
@@ -573,26 +573,26 @@ EvtScript N(EVS_Scene_MysterySolved) = {
         EVT_END_LOOP
     EVT_END_THREAD
     EVT_CALL(SetNpcFlagBits, NPC_Penguin_09, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
-    EVT_CALL(SetNpcSpeed, NPC_MayorPenguin, EVT_FLOAT(3.0))
+    EVT_CALL(SetNpcSpeed, NPC_MayorPenguin, EVT_FLOAT(3.0 / DT))
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Walk)
     EVT_CALL(SetNpcFlagBits, NPC_MayorPenguin, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
     EVT_CALL(NpcMoveTo, NPC_MayorPenguin, -320, -258, 0)
     EVT_CALL(InterpNpcYaw, NPC_MayorPenguin, 180, 0)
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Idle)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_THREAD
-        EVT_WAIT(25)
+        EVT_WAIT(25 * DT)
         EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
         EVT_SUB(LVar0, 30)
-        EVT_CALL(PlayerMoveTo, LVar0, LVar2, 20)
+        EVT_CALL(PlayerMoveTo, LVar0, LVar2, 20 * DT)
         EVT_CALL(PlayerFaceNpc, NPC_MayorPenguin, FALSE)
         EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_MayorPenguin, 0)
-        EVT_WAIT(50)
+        EVT_WAIT(50 * DT)
         EVT_CALL(PlayerFaceNpc, NPC_MayorPenguin, FALSE)
         EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_MayorPenguin, 0)
     EVT_END_THREAD
     EVT_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_SET(LVar0, 0)
         EVT_LOOP(8)
             EVT_CALL(GetNpcPos, NPC_Penguin_09, LVar0, LVar1, LVar2)
@@ -602,22 +602,22 @@ EvtScript N(EVS_Scene_MysterySolved) = {
         EVT_END_LOOP
     EVT_END_THREAD
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_PickUp)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_EXEC_GET_TID(N(EVS_MayorCarryGift), LVarA)
     EVT_CALL(GetNpcPos, NPC_Herringway, LVar0, LVar1, LVar2)
     EVT_ADD(LVar2, -25)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-300.0), EVT_FLOAT(0.0))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.3))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.3 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Carry)
     EVT_CALL(GetNpcPos, NPC_Herringway, LVar0, LVar1, LVar2)
     EVT_ADD(LVar2, -35)
     EVT_CALL(NpcMoveTo, NPC_MayorPenguin, LVar0, LVar2, 0)
     EVT_KILL_THREAD(LVarA)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_LOOP(7)
             EVT_CALL(GetNpcPos, NPC_Penguin_09, LVar0, LVar1, LVar2)
             EVT_ADD(LVar2, 1)
@@ -625,12 +625,12 @@ EvtScript N(EVS_Scene_MysterySolved) = {
             EVT_WAIT(1)
         EVT_END_LOOP
     EVT_END_THREAD
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcFlagBits, NPC_MayorPenguin, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(SpeakToNpc, NPC_MayorPenguin, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 0, NPC_Herringway, MSG_CH7_002D)
     EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Give)
-    EVT_WAIT(60)
+    EVT_WAIT(60 * DT)
     EVT_CALL(GetNpcPos, NPC_Herringway, LVar0, LVar1, LVar2)
     EVT_ADD(LVar2, -5)
     EVT_CALL(NpcMoveTo, NPC_Herringway, LVar0, LVar2, 0)
@@ -642,7 +642,7 @@ EvtScript N(EVS_Scene_MysterySolved) = {
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(InterpNpcYaw, NPC_MayorPenguin, 0, 0)
     EVT_CALL(InterpNpcYaw, NPC_MayorPenguinWife, 0, 0)
     EVT_CALL(InterpNpcYaw, NPC_Herringway, 0, 0)
@@ -650,11 +650,11 @@ EvtScript N(EVS_Scene_MysterySolved) = {
     EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_002F)
     EVT_CALL(GetNpcPos, NPC_Herringway, LVar0, LVar1, LVar2)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.3))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.3 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_THREAD
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
-        EVT_CALL(SetNpcSpeed, NPC_MayorPenguin, EVT_FLOAT(3.0))
+        EVT_CALL(SetNpcSpeed, NPC_MayorPenguin, EVT_FLOAT(3.0 / DT))
         EVT_CALL(SetNpcFlagBits, NPC_MayorPenguin, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
         EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Walk)
         EVT_CALL(NpcMoveTo, NPC_MayorPenguin, -249, -109, 0)
@@ -674,7 +674,7 @@ EvtScript N(EVS_Scene_MysterySolved) = {
         EVT_END_LOOP
     EVT_END_THREAD
     EVT_CALL(SetNpcFlagBits, NPC_PenguinPatrol, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
-    EVT_CALL(SetNpcSpeed, NPC_PenguinPatrol, EVT_FLOAT(3.0))
+    EVT_CALL(SetNpcSpeed, NPC_PenguinPatrol, EVT_FLOAT(3.0 / DT))
     EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Walk)
     EVT_CALL(NpcMoveTo, NPC_PenguinPatrol, -210, -80, 0)
     EVT_CALL(NpcMoveTo, NPC_PenguinPatrol, -250, -10, 0)
@@ -687,7 +687,7 @@ EvtScript N(EVS_Scene_MysterySolved) = {
     EVT_CALL(SpeakToPlayer, NPC_MayorPenguin, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 0, MSG_CH7_0030)
     EVT_CALL(SpeakToPlayer, NPC_Herringway, ANIM_Herringway_TalkCarry, ANIM_Herringway_IdleCarry, 0, MSG_CH7_0031)
     EVT_EXEC_GET_TID(N(EVS_HerringwayCarryPresent), LVarA)
-    EVT_CALL(SetNpcSpeed, NPC_Herringway, EVT_FLOAT(3.0))
+    EVT_CALL(SetNpcSpeed, NPC_Herringway, EVT_FLOAT(3.0 / DT))
     EVT_CALL(SetNpcAnimation, NPC_Herringway, ANIM_Herringway_WalkCarry)
     EVT_CALL(NpcMoveTo, NPC_Herringway, -250, 50, 0)
     EVT_CALL(SetNpcAnimation, NPC_Herringway, ANIM_Herringway_IdleCarry)
@@ -696,18 +696,18 @@ EvtScript N(EVS_Scene_MysterySolved) = {
     EVT_EXEC_WAIT(N(EVS_CloseMayorsOfficeDoor))
     EVT_SET(GB_StoryProgress, STORY_CH7_MAYOR_MURDER_SOLVED)
     EVT_EXEC(N(EVS_SetupMusic))
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SpeakToPlayer, NPC_MayorPenguin, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 5, MSG_CH7_0032)
     EVT_CALL(GetNpcPos, NPC_MayorPenguin, LVar0, LVar1, LVar2)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SpeakToPlayer, NPC_MayorPenguin, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 0, MSG_CH7_0033)
     EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
     EVT_WAIT(1)
     EVT_CALL(SpeakToPlayer, NPC_MayorPenguin, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 0, MSG_CH7_0034)

src/world/area_sam/sam_02/sam_02_4_npc.c

@@ -1,5 +1,11 @@
 #include "sam_02.h"
 
+#if VERSION_PAL
+#include "sprite/npc/ShiverToad.h"
+#define TOADHOUSE_ANIM_TALK ANIM_ShiverToad_Red_Talk
+#define TOADHOUSE_ANIM_IDLE ANIM_ShiverToad_Red_Idle
+#endif
+
 #include "world/common/complete/ToadHouseBlanketAnim.inc.c"
 #include "world/common/atomic/ToadHouse.inc.c"
 #include "world/common/atomic/ToadHouse.data.inc.c"

src/world/area_sam/sam_03/sam_03_3_npc1.c

@@ -24,9 +24,9 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = {
     EVT_CALL(SetMusicTrack, 0, SONG_JR_TROOPA_THEME, 0, 8)
     EVT_CALL(SpeakToPlayer, NPC_JrTroopa, ANIM_JrTroopa_Talk, ANIM_JrTroopa_Idle, 0, MSG_CH7_00D8)
     EVT_CALL(SetNpcJumpscale, NPC_JrTroopa, EVT_FLOAT(1.0))
-    EVT_CALL(NpcJump0, NPC_JrTroopa, 520, 0, -68, 20)
+    EVT_CALL(NpcJump0, NPC_JrTroopa, 520, 0, -68, 20 * DT)
     EVT_CALL(PlayerFaceNpc, NPC_JrTroopa, FALSE)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_CALL(GetNpcPos, NPC_JrTroopa, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, -20)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
@@ -51,7 +51,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = {
     EVT_MULF(LVar6, EVT_FLOAT(0.7))
     EVT_CALL(N(GetAngleToPlayer))
     EVT_CALL(AddVectorPolar, LVar3, LVar5, LVar6, LVar0)
-    EVT_CALL(SetNpcSpeed, NPC_JrTroopa, EVT_FLOAT(4.0))
+    EVT_CALL(SetNpcSpeed, NPC_JrTroopa, EVT_FLOAT(4.0 / DT))
     EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_JrTroopa_Charge)
     EVT_THREAD
         EVT_CALL(NpcMoveTo, NPC_JrTroopa, LVar3, LVar5, 0)
@@ -99,11 +99,11 @@ EvtScript N(EVS_NpcDefeat_JrTroopa) = {
             EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
             EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
             EVT_THREAD
-                EVT_WAIT(5)
+                EVT_WAIT(5 * DT)
                 EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
-                EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0))
+                EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT))
                 EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-                EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0))
+                EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT))
             EVT_END_THREAD
             EVT_CALL(SpeakToPlayer, NPC_JrTroopa, ANIM_JrTroopa_Defeated, ANIM_JrTroopa_Defeated, 5, MSG_CH7_00DF)
             EVT_CALL(GetNpcPos, NPC_JrTroopa, LVar0, LVar1, LVar2)

src/world/area_sam/sam_04/sam_04_3_snowmen.c

@@ -111,23 +111,23 @@ EvtScript N(EVS_SnowmanMove) = {
 };
 
 EvtScript N(EVS_Scene_SnowmenSpeak) = {
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_IF_EQ(LVar0, 0)
         EVT_CALL(GetNpcPos, NPC_Snowman_03, LVar0, LVar1, LVar2)
         EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
         EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
         EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0))
         EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-8.0))
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(10.0))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(10.0 / DT))
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
         EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
         EVT_CALL(SpeakToPlayer, NPC_Snowman_03, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH7_011B)
         EVT_CALL(GetNpcPos, NPC_Snowman_06, LVar0, LVar1, LVar2)
         EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT))
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
         EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-        EVT_WAIT(15)
+        EVT_WAIT(15 * DT)
         EVT_CALL(SpeakToPlayer, NPC_Snowman_06, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH7_011C)
     EVT_ELSE
         EVT_CALL(GetNpcPos, NPC_Snowman_06, LVar0, LVar1, LVar2)
@@ -135,16 +135,16 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = {
         EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
         EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0))
         EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-8.0))
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(10.0))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(10.0 / DT))
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
         EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
         EVT_CALL(SpeakToPlayer, NPC_Snowman_06, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH7_011C)
         EVT_CALL(GetNpcPos, NPC_Snowman_03, LVar0, LVar1, LVar2)
         EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT))
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
         EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-        EVT_WAIT(15)
+        EVT_WAIT(15 * DT)
         EVT_CALL(SpeakToPlayer, NPC_Snowman_03, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH7_011B)
     EVT_END_IF
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, -140)
@@ -161,7 +161,7 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = {
     EVT_CALL(SetNpcFlagBits, NPC_Snowman_06, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
     EVT_WAIT(1)
     EVT_THREAD
-        EVT_WAIT(22)
+        EVT_WAIT(22 * DT)
         EVT_CALL(DisablePlayerPhysics, TRUE)
         EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail)
         EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
@@ -177,30 +177,30 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = {
             EVT_SETF(LVar7, LVar2)
             EVT_CALL(AddVectorPolar, LVar6, LVar7, EVT_FLOAT(20.0), LVar8)
             EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(2.0))
-            EVT_CALL(PlayerJump1, LVar6, 0, LVar7, 16)
+            EVT_CALL(PlayerJump1, LVar6, 0, LVar7, 16 * DT)
             EVT_ADDF(LVar8, EVT_FLOAT(180.0))
-            EVT_WAIT(6)
+            EVT_WAIT(6 * DT)
         EVT_END_LOOP
-        EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(2.0))
+        EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(2.0 / DT))
-        EVT_CALL(PlayerJump1, 0, 0, 0, 16)
+        EVT_CALL(PlayerJump1, 0, 0, 0, 16 * DT)
         EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
         EVT_CALL(InterpPlayerYaw, 0, 0)
         EVT_CALL(DisablePlayerPhysics, FALSE)
     EVT_END_THREAD
     EVT_THREAD
-        EVT_WAIT(110)
+        EVT_WAIT(110 * DT)
         EVT_CALL(DisablePartnerAI, 0)
         EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK)
         EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.0))
         EVT_CALL(NpcJump1, NPC_PARTNER, 50, 0, 0, 22)
         EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE)
-        EVT_WAIT(110)
+        EVT_WAIT(110 * DT)
     EVT_END_THREAD
     EVT_THREAD
-        EVT_WAIT(22)
+        EVT_WAIT(22 * DT)
         EVT_LOOP(5)
-            EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 6, EVT_FLOAT(2.0))
+            EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 6 * DT, EVT_FLOAT(2.0))
-            EVT_WAIT(16)
+            EVT_WAIT(16 * DT)
         EVT_END_LOOP
     EVT_END_THREAD
     EVT_SET(LVar0, NPC_Snowman_01)
@@ -240,7 +240,7 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = {
     EVT_SETF(LVar3, EVT_FLOAT(-180.0))
     EVT_SETF(LVar4, EVT_FLOAT(5.0))
     EVT_EXEC_WAIT(N(EVS_SnowmanMove))
-    EVT_WAIT(80)
+    EVT_WAIT(80 * DT)
     EVT_THREAD
         EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 200, EVT_FLOAT(1.0))
     EVT_END_THREAD
@@ -251,11 +251,11 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = {
                 EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, 0, -260, 0)
                 EVT_ADD(LVar0, 60)
             EVT_END_LOOP
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
         EVT_END_LOOP
     EVT_END_THREAD
     EVT_THREAD
-        EVT_WAIT(40)
+        EVT_WAIT(40 * DT)
         EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, -240)
         EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 0, -240)
         EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0))
@@ -263,7 +263,7 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = {
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_END_THREAD
     EVT_CALL(PlaySoundAt, SOUND_38D, 0, 0, 0, -300)
-    EVT_CALL(MakeLerp, 0, 100, 200, EASING_COS_IN_OUT)
+    EVT_CALL(MakeLerp, 0, 100, 200 * DT, EASING_COS_IN_OUT)
     EVT_LABEL(0)
     EVT_CALL(UpdateLerp)
     EVT_CALL(TranslateModel, MODEL_o65, 0, LVar0, 0)
@@ -273,7 +273,7 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = {
     EVT_IF_EQ(LVar1, 1)
         EVT_GOTO(0)
     EVT_END_IF
-    EVT_WAIT(60)
+    EVT_WAIT(60 * DT)
     EVT_THREAD
         EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 100, EVT_FLOAT(0.3))
     EVT_END_THREAD
@@ -284,7 +284,7 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = {
         EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, 0, LVar2, 0)
     EVT_END_THREAD
     EVT_CALL(PlaySoundAt, SOUND_38E, 0, 0, 0, -300)
-    EVT_CALL(MakeLerp, 0, 80, 100, EASING_COS_IN_OUT)
+    EVT_CALL(MakeLerp, 0, 80, 100 * DT, EASING_COS_IN_OUT)
     EVT_LABEL(1)
     EVT_CALL(UpdateLerp)
     EVT_CALL(TranslateModel, MODEL_o65, 0, 100, 0)
@@ -295,12 +295,12 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = {
     EVT_IF_EQ(LVar1, 1)
         EVT_GOTO(1)
     EVT_END_IF
-    EVT_WAIT(60)
+    EVT_WAIT(60 * DT)
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(10.0))
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(ShowMessageAtScreenPos, MSG_CH7_011E, 160, 40)
     EVT_CALL(EnablePartnerAI)
     EVT_CALL(UpdateColliderTransform, COLLIDER_o78)

src/world/area_sam/sam_05/sam_05_5_scenes.c

@@ -15,13 +15,13 @@ EvtScript N(EVS_Scene_MonstarAppears) = {
     EVT_CALL(ShowMessageAtScreenPos, MSG_CH7_00E0, 160, 40)
     EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Monstar_Idle1)
     EVT_CALL(SetNpcPos, NPC_Monstar, 635, 85, 0)
-    EVT_CALL(NpcMoveTo, NPC_Monstar, 615, 0, 10)
+    EVT_CALL(NpcMoveTo, NPC_Monstar, 615, 0, 10 * DT)
     EVT_LABEL(2)
     EVT_CALL(GetNpcPos, NPC_Monstar, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0))
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-15.0))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT))
     EVT_ADD(LVar0, -25)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
@@ -48,7 +48,7 @@ EvtScript N(EVS_Scene_MonstarAppears) = {
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Monstar, ANIM_Monstar_Talk, ANIM_Monstar_Idle1, 256, 0, 100, MSG_CH7_00E2)
     EVT_CALL(ShowChoice, MSG_Choice_0015)
     EVT_IF_EQ(LVar0, 0)
@@ -58,7 +58,7 @@ EvtScript N(EVS_Scene_MonstarAppears) = {
         EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
         EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(450.0))
         EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-5.0))
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT))
         EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
         EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
         EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
@@ -135,9 +135,9 @@ EvtScript N(EVS_StarKid_LookAroundPanic) = {
     EVT_WAIT(LVar0)
     EVT_LOOP(0)
         EVT_CALL(InterpNpcYaw, LVarA, 90, 0)
-        EVT_WAIT(7)
+        EVT_WAIT(7 * DT)
         EVT_CALL(InterpNpcYaw, LVarA, 270, 0)
-        EVT_WAIT(7)
+        EVT_WAIT(7 * DT)
     EVT_END_LOOP
     EVT_RETURN
     EVT_END
@@ -145,15 +145,15 @@ EvtScript N(EVS_StarKid_LookAroundPanic) = {
 
 EvtScript N(EVS_StarKid_RunAway) = {
     EVT_IF_EQ(LVarA, NPC_StarKid_01)
-        EVT_ADD(LVarB, 40)
+        EVT_ADD(LVarB, 40 * DT)
     EVT_END_IF
     EVT_EXEC_GET_TID(N(EVS_StarKid_LookAroundPanic), LVar9)
-    EVT_ADD(LVarB, 20)
+    EVT_ADD(LVarB, 20 * DT)
     EVT_WAIT(LVarB)
     EVT_KILL_THREAD(LVar9)
     EVT_CALL(PlaySoundAtNpc, LVarA, SOUND_13E, 0)
     EVT_CALL(GetNpcPos, LVarA, LVar7, LVar8, LVar9)
-    EVT_CALL(LoadPath, 60, EVT_PTR(N(RelativeFleePath)), ARRAY_COUNT(N(RelativeFleePath)), EASING_LINEAR)
+    EVT_CALL(LoadPath, 60 * DT, EVT_PTR(N(RelativeFleePath)), ARRAY_COUNT(N(RelativeFleePath)), EASING_LINEAR)
     EVT_LABEL(0)
         EVT_CALL(GetNextPathPos)
         EVT_ADD(LVar1, LVar7)
@@ -202,7 +202,7 @@ EvtScript N(EVS_StarKidsFlee) = {
     EVT_END_LOOP
     EVT_CALL(PlaySoundAtNpc, NPC_Monstar, SOUND_13D, 0)
     EVT_THREAD
-        EVT_CALL(NpcMoveTo, NPC_Monstar, 615, -5, 10)
+        EVT_CALL(NpcMoveTo, NPC_Monstar, 615, -5, 10 * DT)
     EVT_END_THREAD
     EVT_EXEC(N(EVS_StarKid_SpawnSparkles))
     EVT_CALL(MakeLerp, 220, 0, 90, EASING_COS_IN_OUT)
@@ -224,7 +224,7 @@ EvtScript N(EVS_StarKidsFlee) = {
         EVT_GOTO(0)
     EVT_END_IF
     EVT_CALL(SetNpcPos, NPC_Monstar, NPC_DISPOSE_LOCATION)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_USE_BUF(EVT_PTR(N(StarKidList)))
     EVT_SET(LVarB, 0)
     EVT_LOOP(0)
@@ -235,7 +235,7 @@ EvtScript N(EVS_StarKidsFlee) = {
         EVT_EXEC(N(EVS_StarKid_RunAway))
         EVT_ADD(LVarB, 1)
     EVT_END_LOOP
-    EVT_WAIT(100)
+    EVT_WAIT(100 * DT)
     EVT_RETURN
     EVT_END
 };
@@ -268,7 +268,7 @@ EvtScript N(EVS_Scene_MonstarDefeated) = {
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(450.0))
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-5.0))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT))
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
     EVT_EXEC(N(EVS_SetupMusic))

src/world/area_sam/sam_06/sam_06_4_npc.c

@@ -68,6 +68,12 @@ NpcSettings N(NpcSettings_ShiverToad_Stationary) = {
 MAP_STATIC_PAD(1,key_item);
 #include "world/common/complete/NormalItemChoice.inc.c"
 
+#if VERSION_PAL
+#include "sprite/npc/ShiverToad.h"
+#define TOADHOUSE_ANIM_TALK ANIM_ShiverToad_Red_Talk
+#define TOADHOUSE_ANIM_IDLE ANIM_ShiverToad_Red_Idle
+#endif
+
 #include "world/common/complete/ToadHouseBlanketAnim.inc.c"
 #include "world/common/atomic/ToadHouse.inc.c"
 #include "world/common/atomic/ToadHouse.data.inc.c"
@@ -163,7 +169,7 @@ EvtScript N(EVS_Scene_Merle_Greeting) = {
         EVT_CALL(WaitForPlayerTouchingFloor)
     EVT_END_IF
     EVT_CALL(DisablePlayerInput, TRUE)
-    EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0))
+    EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT))
     EVT_CALL(PlayerMoveTo, -240, 300, 0)
     EVT_CALL(PlayerFaceNpc, NPC_Merle, FALSE)
     EVT_CALL(SpeakToPlayer, NPC_Merle, ANIM_Merle_Talk, ANIM_Merle_Idle, 0, MSG_CH7_00E9)
@@ -182,7 +188,7 @@ EvtScript N(EVS_Scene_Merle_Greeting) = {
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Walk)
-    EVT_CALL(SetNpcSpeed, NPC_Merle, EVT_FLOAT(3.0))
+    EVT_CALL(SetNpcSpeed, NPC_Merle, EVT_FLOAT(3.0 / DT))
     EVT_CALL(NpcMoveTo, NPC_Merle, -110, 300, 0)
     EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Idle)
     EVT_CALL(GetAngleToPlayer, NPC_Merle, LVar0)
@@ -198,16 +204,16 @@ EvtScript N(EVS_Scene_Merle_Greeting) = {
         EVT_CALL(BindNpcInteract, NPC_Merle, 0)
         EVT_CALL(SetNpcFlagBits, NPC_Merle, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
         EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Walk)
-        EVT_CALL(SetNpcSpeed, NPC_Merle, EVT_FLOAT(2.0))
+        EVT_CALL(SetNpcSpeed, NPC_Merle, EVT_FLOAT(2.0 / DT))
         EVT_CALL(NpcMoveTo, NPC_Merle, -78, 287, 0)
         EVT_CALL(SetNpcJumpscale, NPC_Merle, EVT_FLOAT(0.5))
         EVT_CALL(NpcJump0, NPC_Merle, -25, 20, 253, 17)
         EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Idle)
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Walk)
         EVT_CALL(NpcJump0, NPC_Merle, -40, 45, 188, 17)
         EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Idle)
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Walk)
         EVT_CALL(NpcMoveTo, NPC_Merle, -90, 190, 0)
         EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Idle)
@@ -257,13 +263,13 @@ EvtScript N(EVS_Scene_Merle_WaitingOnHill) = {
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Walk)
         EVT_CALL(NpcMoveTo, NPC_Merle, -110, 145, 0)
-        EVT_CALL(NpcJump0, NPC_Merle, -131, 60, 91, 20)
+        EVT_CALL(NpcJump0, NPC_Merle, -131, 60, 91, 20 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Idle)
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Walk)
-        EVT_CALL(NpcJump0, NPC_Merle, -117, 90, 7, 20)
+        EVT_CALL(NpcJump0, NPC_Merle, -117, 90, 7, 20 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Idle)
-        EVT_WAIT(10)
+        EVT_WAIT(10 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Walk)
         EVT_CALL(NpcMoveTo, NPC_Merle, 0, -143, 0)
         EVT_CALL(InterpNpcYaw, NPC_Merle, 270, 0)
@@ -328,10 +334,10 @@ EvtScript N(EVS_Scene_Merle_EnterHouse) = {
     EVT_CALL(SpeakToPlayer, NPC_Merle, ANIM_Merle_Talk, ANIM_Merle_Idle, 0, MSG_CH7_00ED)
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Walk)
-        EVT_CALL(SetNpcSpeed, NPC_Merle, EVT_FLOAT(3.0))
+        EVT_CALL(SetNpcSpeed, NPC_Merle, EVT_FLOAT(3.0 / DT))
         EVT_CALL(NpcMoveTo, NPC_Merle, 27, -120, 0)
     EVT_END_THREAD
-    EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0))
+    EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT))
     EVT_CALL(PlayerMoveTo, 15, -90, 0)
     EVT_CALL(SetGroupVisibility, MODEL_k_naiso, MODEL_GROUP_VISIBLE)
     EVT_CALL(PlaySoundAtCollider, COLLIDER_k_d1, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0)
@@ -347,11 +353,11 @@ EvtScript N(EVS_Scene_Merle_EnterHouse) = {
     EVT_CALL(SetGroupVisibility, MODEL_k_naiso, MODEL_GROUP_VISIBLE)
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Walk)
-        EVT_CALL(SetNpcSpeed, NPC_Merle, EVT_FLOAT(4.0))
+        EVT_CALL(SetNpcSpeed, NPC_Merle, EVT_FLOAT(4.0 / DT))
         EVT_CALL(NpcMoveTo, NPC_Merle, 0, -330, 0)
         EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Idle)
     EVT_END_THREAD
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.8))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.8 / DT))
     EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_k_d1, COLLIDER_FLAGS_UPPER_MASK)
     EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_k_d2, COLLIDER_FLAGS_UPPER_MASK)
     EVT_CALL(PlayerMoveTo, 0, -200, 0)
@@ -382,7 +388,7 @@ EvtScript N(EVS_Scene_Merle_EnterHouse) = {
     EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_k_d1, COLLIDER_FLAGS_UPPER_MASK)
     EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_k_d2, COLLIDER_FLAGS_UPPER_MASK)
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(GetAngleToPlayer, NPC_Merle, LVar0)
     EVT_CALL(InterpNpcYaw, NPC_Merle, LVar0, 0)
     EVT_CALL(SpeakToPlayer, NPC_Merle, ANIM_Merle_Talk, ANIM_Merle_Idle, 0, MSG_CH7_00EE)
@@ -396,7 +402,7 @@ EvtScript N(EVS_Scene_Merle_EnterHouse) = {
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Merle, ANIM_Merle_Talk, ANIM_Merle_Idle, 0, MSG_CH7_00EF)
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
@@ -409,34 +415,34 @@ EvtScript N(EVS_Scene_Merle_EnterHouse) = {
     EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(200.7), EVT_FLOAT(-250.0))
     EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(0.7), EVT_FLOAT(-250.0))
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(21.0), EVT_FLOAT(-14.0))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
-    EVT_CALL(SetNpcSpeed, NPC_Merle, EVT_FLOAT(2.0))
+    EVT_CALL(SetNpcSpeed, NPC_Merle, EVT_FLOAT(2.0 / DT))
     EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Walk)
     EVT_EXEC_GET_TID(N(EVS_Merle_CarryScarf), LVarA)
     EVT_CALL(NpcMoveTo, NPC_Merle, 0, -275, 0)
     EVT_KILL_THREAD(LVarA)
     EVT_EXEC_GET_TID(N(EVS_Merle_HandOverScarf), LVarA)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_KILL_THREAD(LVarA)
     EVT_CALL(SetItemPos, MV_ScarfItemID, NPC_DISPOSE_LOCATION)
     EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Idle)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_GIVE_KEY_REWARD(ITEM_SNOWMAN_SCARF)
     EVT_CALL(SpeakToPlayer, NPC_Merle, ANIM_Merle_Talk, ANIM_Merle_Idle, 0, MSG_CH7_00F1)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(200.7), EVT_FLOAT(-321.0))
     EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(0.7), EVT_FLOAT(-321.0))
     EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.7))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
-    EVT_CALL(SetNpcSpeed, NPC_Merle, EVT_FLOAT(2.0))
+    EVT_CALL(SetNpcSpeed, NPC_Merle, EVT_FLOAT(2.0 / DT))
     EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Walk)
     EVT_CALL(NpcMoveTo, NPC_Merle, 0, -330, 0)
     EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Idle)
     EVT_CALL(GetAngleToPlayer, NPC_Merle, LVar0)
     EVT_CALL(InterpNpcYaw, NPC_Merle, LVar0, 0)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Merle, ANIM_Merle_Talk, ANIM_Merle_Idle, 0, MSG_CH7_00F2)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
@@ -482,11 +488,11 @@ EvtScript N(EVS_NpcIdle_Merle) = {
 EvtScript N(EVS_Scene_Merle_OneLastThing) = {
     EVT_THREAD
         EVT_CALL(DisablePartnerAI, 0)
-        EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0))
+        EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0 / DT))
         EVT_CALL(NpcMoveTo, NPC_PARTNER, -28, -80, 0)
         EVT_CALL(EnablePartnerAI)
     EVT_END_THREAD
-    EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0))
+    EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT))
     EVT_CALL(PlayerMoveTo, 0, -100, 0)
     EVT_CALL(SetGroupVisibility, MODEL_k_naiso, MODEL_GROUP_VISIBLE)
     EVT_CALL(SetGroupVisibility, MODEL_km_sita, MODEL_GROUP_VISIBLE)
@@ -500,7 +506,7 @@ EvtScript N(EVS_Scene_Merle_OneLastThing) = {
         EVT_IF_EQ(LVar1, 1)
             EVT_GOTO(0)
         EVT_END_IF
-    EVT_CALL(SetNpcSpeed, NPC_Merle, EVT_FLOAT(3.0))
+    EVT_CALL(SetNpcSpeed, NPC_Merle, EVT_FLOAT(3.0 / DT))
     EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Walk)
     EVT_CALL(NpcMoveTo, NPC_Merle, 40, -140, 0)
     EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Idle)
@@ -522,7 +528,7 @@ EvtScript N(EVS_Scene_Merle_OneLastThing) = {
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(SpeakToPlayer, NPC_Merle, ANIM_Merle_Talk, ANIM_Merle_Idle, 0, MSG_CH7_00F3)
@@ -536,7 +542,7 @@ EvtScript N(EVS_Scene_Merle_OneLastThing) = {
         EVT_IF_EQ(LVar1, 1)
             EVT_GOTO(2)
         EVT_END_IF
-    EVT_CALL(SetNpcSpeed, NPC_Merle, EVT_FLOAT(3.0))
+    EVT_CALL(SetNpcSpeed, NPC_Merle, EVT_FLOAT(3.0 / DT))
     EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Walk)
     EVT_CALL(NpcMoveTo, NPC_Merle, 0, -180, 0)
     EVT_THREAD
@@ -556,7 +562,7 @@ EvtScript N(EVS_Scene_Merle_OneLastThing) = {
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)

src/world/area_sam/sam_08/sam_08_4_npc.c

@@ -66,28 +66,28 @@ EvtScript N(EVS_NpcDefeat_Duplighost) = {
     EVT_SWITCH(LVar0)
         EVT_CASE_EQ(OUTCOME_PLAYER_WON)
             EVT_CALL(SetNpcFlagBits, NPC_Duplighost, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
-            EVT_CALL(SetNpcSpeed, NPC_Duplighost, EVT_FLOAT(3.0))
+            EVT_CALL(SetNpcSpeed, NPC_Duplighost, EVT_FLOAT(3.0 / DT))
             EVT_CALL(SetNpcJumpscale, NPC_Duplighost, EVT_FLOAT(1.5))
             EVT_CALL(SetNpcAnimation, NPC_Duplighost, ANIM_Duplighost_Anim04)
             EVT_CALL(GetNpcPos, NPC_Duplighost, LVar0, LVar1, LVar2)
             EVT_ADD(LVar0, 50)
             EVT_CALL(PlaySoundAtNpc, NPC_Duplighost, SOUND_2CA, 0)
-            EVT_CALL(NpcJump0, NPC_Duplighost, LVar0, LVar1, LVar2, 13)
+            EVT_CALL(NpcJump0, NPC_Duplighost, LVar0, LVar1, LVar2, 13 * DT)
             EVT_CALL(InterpPlayerYaw, 90, 0)
             EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0)
             EVT_ADD(LVar0, 50)
             EVT_CALL(PlaySoundAtNpc, NPC_Duplighost, SOUND_2CA, 0)
-            EVT_CALL(NpcJump0, NPC_Duplighost, LVar0, LVar1, LVar2, 13)
+            EVT_CALL(NpcJump0, NPC_Duplighost, LVar0, LVar1, LVar2, 13 * DT)
             EVT_ADD(LVar0, 50)
             EVT_CALL(PlaySoundAtNpc, NPC_Duplighost, SOUND_2CA, 0)
-            EVT_CALL(NpcJump0, NPC_Duplighost, LVar0, LVar1, LVar2, 13)
+            EVT_CALL(NpcJump0, NPC_Duplighost, LVar0, LVar1, LVar2, 13 * DT)
             EVT_SET(GB_StoryProgress, STORY_CH7_DEFEATED_FIRST_DUPLIGHOST)
             EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, FALSE)
             EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o47, COLLIDER_FLAGS_UPPER_MASK)
             EVT_CALL(DisablePlayerInput, FALSE)
             EVT_ADD(LVar0, 50)
             EVT_CALL(PlaySoundAtNpc, NPC_Duplighost, SOUND_2CA, 0)
-            EVT_CALL(NpcJump0, NPC_Duplighost, LVar0, LVar1, LVar2, 20)
+            EVT_CALL(NpcJump0, NPC_Duplighost, LVar0, LVar1, LVar2, 20 * DT)
         EVT_CASE_EQ(OUTCOME_PLAYER_LOST)
         EVT_CASE_EQ(OUTCOME_PLAYER_FLED)
     EVT_END_SWITCH

src/world/area_sam/sam_08/sam_08_5_scenes.c

@@ -32,7 +32,7 @@ EvtScript N(EVS_TwoKoopesFightingFX) = {
         EVT_ADD(LVar2, 3)
         EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2)
         EVT_CALL(N(AdjustFightingSoundsPos), LVar0, LVar1, LVar2)
-        EVT_WAIT(6)
+        EVT_WAIT(6 * DT)
     EVT_END_LOOP
     EVT_RETURN
     EVT_END
@@ -45,7 +45,7 @@ EvtScript N(EVS_Scene_ImposterAppears) = {
     EVT_THREAD
         EVT_CALL(EnableModel, MODEL_m1_kabe, TRUE)
         EVT_CALL(PlaySoundAtCollider, COLLIDER_m1_kabe, SOUND_39B, 0)
-        EVT_CALL(MakeLerp, -120, 0, 60, EASING_COS_IN_OUT)
+        EVT_CALL(MakeLerp, -120, 0, 60 * DT, EASING_COS_IN_OUT)
         EVT_LABEL(0)
         EVT_CALL(UpdateLerp)
         EVT_CALL(TranslateGroup, MODEL_move1, 0, LVar0, 0)
@@ -64,7 +64,7 @@ EvtScript N(EVS_Scene_ImposterAppears) = {
     EVT_THREAD
         EVT_CALL(SetNpcPos, NPC_Kooper_01A, LVar2, LVar3, LVar4)
         EVT_SUB(LVar5, 30)
-        EVT_CALL(MakeLerp, LVar2, LVar5, 20, EASING_QUADRATIC_OUT)
+        EVT_CALL(MakeLerp, LVar2, LVar5, 20 * DT, EASING_QUADRATIC_OUT)
         EVT_LABEL(1)
         EVT_CALL(UpdateLerp)
         EVT_CALL(SetNpcPos, NPC_Kooper_01A, LVar0, LVar3, LVar4)
@@ -75,7 +75,7 @@ EvtScript N(EVS_Scene_ImposterAppears) = {
     EVT_END_THREAD
     EVT_CALL(SetNpcPos, NPC_Kooper_02A, LVar2, LVar3, LVar4)
     EVT_SUB(LVar5, 60)
-    EVT_CALL(MakeLerp, LVar2, LVar5, 20, EASING_QUADRATIC_OUT)
+    EVT_CALL(MakeLerp, LVar2, LVar5, 20 * DT, EASING_QUADRATIC_OUT)
     EVT_LABEL(2)
     EVT_CALL(UpdateLerp)
     EVT_CALL(SetNpcPos, NPC_Kooper_02A, LVar0, LVar3, LVar4)
@@ -84,7 +84,7 @@ EvtScript N(EVS_Scene_ImposterAppears) = {
         EVT_GOTO(2)
     EVT_END_IF
     EVT_CALL(InterpPlayerYaw, 270, 0)
-    EVT_WAIT(70)
+    EVT_WAIT(70 * DT)
     EVT_CALL(DisablePartnerAI, 0)
     EVT_CALL(SetNpcPos, NPC_PARTNER, NPC_DISPOSE_LOCATION)
     EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_INACTIVE, TRUE)
@@ -92,37 +92,37 @@ EvtScript N(EVS_Scene_ImposterAppears) = {
     EVT_CALL(SetNpcAnimation, NPC_Kooper_02A, ANIM_WorldKooper_Idle)
     EVT_CALL(InterpNpcYaw, NPC_Kooper_01A, 270, 0)
     EVT_CALL(InterpNpcYaw, NPC_Kooper_02A, 90, 0)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_CALL(PlaySoundAtNpc, NPC_Kooper_02A, SOUND_263, 0)
     EVT_CALL(ShowEmote, NPC_Kooper_02A, EMOTE_QUESTION, 45, 20, EMOTER_NPC, 0, 0, 0, 0)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_CALL(PlaySoundAtNpc, NPC_Kooper_01A, SOUND_263, 0)
     EVT_CALL(ShowEmote, NPC_Kooper_01A, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0)
     EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 20, EMOTER_PLAYER, 0, 0, 0, 0)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_CALL(PlaySoundAtNpc, NPC_Kooper_02A, SOUND_263, 0)
     EVT_CALL(ShowEmote, NPC_Kooper_02A, EMOTE_QUESTION, 45, 20, EMOTER_NPC, 0, 0, 0, 0)
-    EVT_WAIT(15)
+    EVT_WAIT(15 * DT)
     EVT_CALL(PlaySoundAtNpc, NPC_Kooper_01A, SOUND_263, 0)
     EVT_CALL(ShowEmote, NPC_Kooper_01A, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0)
     EVT_CALL(SpeakToPlayer, NPC_Kooper_01A, ANIM_WorldKooper_Idle, ANIM_WorldKooper_Idle, 5, MSG_CH7_011F)
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_Kooper_01A, ANIM_WorldKooper_Jump)
         EVT_CALL(SetNpcJumpscale, NPC_Kooper_01A, EVT_FLOAT(1.0))
-        EVT_CALL(NpcJump1, NPC_Kooper_01A, -1062, -120, -37, 15)
+        EVT_CALL(NpcJump1, NPC_Kooper_01A, -1062, -120, -37, 15 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Kooper_01A, ANIM_WorldKooper_Idle)
     EVT_END_THREAD
     EVT_THREAD
         EVT_CALL(SetNpcAnimation, NPC_Kooper_02A, ANIM_WorldKooper_Jump)
         EVT_CALL(SetNpcJumpscale, NPC_Kooper_02A, EVT_FLOAT(1.0))
-        EVT_CALL(NpcJump1, NPC_Kooper_02A, -1172, -120, -37, 15)
+        EVT_CALL(NpcJump1, NPC_Kooper_02A, -1172, -120, -37, 15 * DT)
         EVT_CALL(SetNpcAnimation, NPC_Kooper_02A, ANIM_WorldKooper_Idle)
     EVT_END_THREAD
-    EVT_WAIT(5)
+    EVT_WAIT(5 * DT)
     EVT_CALL(ShowMessageAtScreenPos, MSG_CH7_0120, 160, 40)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
     EVT_CALL(GetNpcPos, NPC_Kooper_01A, LVar1, LVar2, LVar3)
     EVT_CALL(GetPlayerPos, LVar4, LVar5, LVar6)
@@ -149,7 +149,7 @@ EvtScript N(EVS_Scene_ImposterAppears) = {
     EVT_DIVF(LVar8, EVT_FLOAT(2.0))
     EVT_DIVF(LVar9, EVT_FLOAT(2.0))
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar7, LVar8, LVar9)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5 / DT))
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(PlayerFaceNpc, NPC_Kooper_02A, FALSE)
     EVT_CALL(SpeakToPlayer, NPC_Kooper_02A, ANIM_WorldKooper_TalkHappy, ANIM_WorldKooper_Idle, 0, MSG_CH7_0122)
@@ -196,7 +196,7 @@ EvtScript N(EVS_Scene_ImposterAppears) = {
 EvtScript N(EVS_Scene_HitTrueKooper) = {
     EVT_CALL(DisablePlayerInput, TRUE)
     EVT_CALL(SetNpcAnimation, NPC_Kooper_01A, ANIM_WorldKooper_Hurt)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Kooper_01A, ANIM_WorldKooper_Idle)
     EVT_CALL(GetNpcPos, NPC_Kooper_02A, LVar0, LVar1, LVar2)
     EVT_CALL(GetNpcPos, NPC_Kooper_01A, LVar3, LVar4, LVar5)
@@ -219,7 +219,7 @@ EvtScript N(EVS_Scene_HitTrueKooper) = {
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0))
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-8.0))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(SpeakToPlayer, NPC_Kooper_01A, ANIM_WorldKooper_TalkSad, ANIM_WorldKooper_StillSad, 0, MSG_CH7_012C)
@@ -234,7 +234,7 @@ EvtScript N(EVS_Scene_HitTrueKooper) = {
     EVT_DIVF(LVar4, EVT_FLOAT(2.0))
     EVT_DIVF(LVar5, EVT_FLOAT(2.0))
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5 / DT))
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(PlayerFaceNpc, NPC_Kooper_02A, FALSE)
     EVT_CALL(SpeakToPlayer, NPC_Kooper_02A, ANIM_WorldKooper_CelebrateLoop, ANIM_WorldKooper_Idle, 0, MSG_CH7_012D)
@@ -263,7 +263,7 @@ EvtScript N(EVS_Scene_HitTrueKooper) = {
     EVT_DIVF(LVar4, EVT_FLOAT(2.0))
     EVT_DIVF(LVar5, EVT_FLOAT(2.0))
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5 / DT))
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(SpeakToPlayer, NPC_Kooper_02A, ANIM_WorldKooper_TalkHappy, ANIM_WorldKooper_Idle, 0, MSG_CH7_012F)
     EVT_CALL(SetNpcFlagBits, NPC_Kooper_01A, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
@@ -276,8 +276,8 @@ EvtScript N(EVS_Scene_HitTrueKooper) = {
     EVT_CALL(AddVectorPolar, LVar0, LVar2, LVarA, LVar9)
     EVT_CALL(SetNpcJumpscale, NPC_Kooper_01A, EVT_FLOAT(1.0))
     EVT_CALL(SetNpcAnimation, NPC_Kooper_01A, ANIM_WorldKooper_Jump)
-    EVT_CALL(NpcJump0, NPC_Kooper_01A, LVar0, LVar1, LVar2, 20)
+    EVT_CALL(NpcJump0, NPC_Kooper_01A, LVar0, LVar1, LVar2, 20 * DT)
-    EVT_CALL(NpcJump0, NPC_Kooper_01A, LVar3, LVar4, LVar5, 10)
+    EVT_CALL(NpcJump0, NPC_Kooper_01A, LVar3, LVar4, LVar5, 10 * DT)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(GetNpcPos, NPC_Kooper_01A, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
@@ -288,7 +288,7 @@ EvtScript N(EVS_Scene_HitTrueKooper) = {
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_EXEC_GET_TID(N(EVS_TwoKoopesFightingFX), MV_KoopersFightingScript)
     EVT_THREAD
-        EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0))
+        EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT))
         EVT_CALL(PlayerMoveTo, LVar6, LVar8, 0)
     EVT_END_THREAD
     EVT_CALL(SetNpcAnimation, NPC_Kooper_01A, ANIM_WorldKooper_Run)
@@ -304,19 +304,19 @@ EvtScript N(EVS_Scene_HitTrueKooper) = {
         EVT_CALL(GetNpcPos, NPC_Kooper_01A, LVar0, LVar1, LVar2)
         EVT_ADD(LVar2, 3)
         EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2)
-        EVT_WAIT(5)
+        EVT_WAIT(5 * DT)
     EVT_END_LOOP
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_ADD(LVar2, -30)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_THREAD
         EVT_CALL(SetNpcJumpscale, NPC_Kooper_01A, EVT_FLOAT(1.0))
-        EVT_CALL(NpcJump1, NPC_Kooper_01A, LVar0, LVar1, LVar2, 20)
+        EVT_CALL(NpcJump1, NPC_Kooper_01A, LVar0, LVar1, LVar2, 20 * DT)
     EVT_END_THREAD
     EVT_CALL(SetNpcJumpscale, NPC_Kooper_02A, EVT_FLOAT(1.0))
-    EVT_CALL(NpcJump1, NPC_Kooper_02A, LVar0, LVar1, LVar2, 20)
+    EVT_CALL(NpcJump1, NPC_Kooper_02A, LVar0, LVar1, LVar2, 20 * DT)
     EVT_CALL(PlayerFaceNpc, NPC_Kooper_01A, FALSE)
     EVT_LOOP(3)
         EVT_CALL(GetNpcYaw, NPC_Kooper_01A, LVar0)
@@ -328,19 +328,19 @@ EvtScript N(EVS_Scene_HitTrueKooper) = {
         EVT_CALL(GetNpcPos, NPC_Kooper_01A, LVar0, LVar1, LVar2)
         EVT_ADD(LVar2, 3)
         EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2)
-        EVT_WAIT(5)
+        EVT_WAIT(5 * DT)
     EVT_END_LOOP
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_ADD(LVar0, 55)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_THREAD
         EVT_CALL(SetNpcJumpscale, NPC_Kooper_01A, EVT_FLOAT(0.0))
-        EVT_CALL(NpcJump1, NPC_Kooper_01A, LVar0, LVar1, LVar2, 20)
+        EVT_CALL(NpcJump1, NPC_Kooper_01A, LVar0, LVar1, LVar2, 20 * DT)
     EVT_END_THREAD
     EVT_CALL(SetNpcJumpscale, NPC_Kooper_02A, EVT_FLOAT(0.0))
-    EVT_CALL(NpcJump1, NPC_Kooper_02A, LVar0, LVar1, LVar2, 20)
+    EVT_CALL(NpcJump1, NPC_Kooper_02A, LVar0, LVar1, LVar2, 20 * DT)
     EVT_CALL(PlayerFaceNpc, NPC_Kooper_01A, FALSE)
     EVT_LOOP(5)
         EVT_CALL(GetNpcYaw, NPC_Kooper_01A, LVar0)
@@ -352,18 +352,18 @@ EvtScript N(EVS_Scene_HitTrueKooper) = {
         EVT_CALL(GetNpcPos, NPC_Kooper_01A, LVar0, LVar1, LVar2)
         EVT_ADD(LVar2, 3)
         EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2)
-        EVT_WAIT(4)
+        EVT_WAIT(4 * DT)
     EVT_END_LOOP
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT))
     EVT_ADD(LVar2, 30)
     EVT_THREAD
         EVT_CALL(SetNpcJumpscale, NPC_Kooper_01A, EVT_FLOAT(1.0))
-        EVT_CALL(NpcJump1, NPC_Kooper_01A, LVar0, LVar1, LVar2, 20)
+        EVT_CALL(NpcJump1, NPC_Kooper_01A, LVar0, LVar1, LVar2, 20 * DT)
     EVT_END_THREAD
     EVT_CALL(SetNpcJumpscale, NPC_Kooper_02A, EVT_FLOAT(1.0))
-    EVT_CALL(NpcJump1, NPC_Kooper_02A, LVar0, LVar1, LVar2, 20)
+    EVT_CALL(NpcJump1, NPC_Kooper_02A, LVar0, LVar1, LVar2, 20 * DT)
     EVT_CALL(PlayerFaceNpc, NPC_Kooper_01A, FALSE)
     EVT_LOOP(6)
         EVT_CALL(GetNpcYaw, NPC_Kooper_01A, LVar0)
@@ -375,7 +375,7 @@ EvtScript N(EVS_Scene_HitTrueKooper) = {
         EVT_CALL(GetNpcPos, NPC_Kooper_01A, LVar0, LVar1, LVar2)
         EVT_ADD(LVar2, 3)
         EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2)
-        EVT_WAIT(6)
+        EVT_WAIT(6 * DT)
     EVT_END_LOOP
     EVT_CALL(StopSound, SOUND_8000006C)
     EVT_KILL_THREAD(MV_KoopersFightingScript)
@@ -384,27 +384,27 @@ EvtScript N(EVS_Scene_HitTrueKooper) = {
         EVT_THREAD
             EVT_CALL(InterpNpcYaw, NPC_Kooper_01A, 270, 0)
             EVT_CALL(SetNpcJumpscale, NPC_Kooper_01A, EVT_FLOAT(2.0))
-            EVT_CALL(NpcJump1, NPC_Kooper_01A, -1062, -120, -37, 15)
+            EVT_CALL(NpcJump1, NPC_Kooper_01A, -1062, -120, -37, 15 * DT)
         EVT_END_THREAD
         EVT_THREAD
             EVT_CALL(InterpNpcYaw, NPC_Kooper_02A, 90, 0)
             EVT_CALL(SetNpcJumpscale, NPC_Kooper_02A, EVT_FLOAT(2.0))
-            EVT_CALL(NpcJump1, NPC_Kooper_02A, -1172, -120, -37, 15)
+            EVT_CALL(NpcJump1, NPC_Kooper_02A, -1172, -120, -37, 15 * DT)
         EVT_END_THREAD
     EVT_ELSE
         EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
         EVT_THREAD
             EVT_CALL(InterpNpcYaw, NPC_Kooper_01A, 90, 0)
             EVT_CALL(SetNpcJumpscale, NPC_Kooper_01A, EVT_FLOAT(2.0))
-            EVT_CALL(NpcJump1, NPC_Kooper_01A, -1172, -120, -37, 15)
+            EVT_CALL(NpcJump1, NPC_Kooper_01A, -1172, -120, -37, 15 * DT)
         EVT_END_THREAD
         EVT_THREAD
             EVT_CALL(InterpNpcYaw, NPC_Kooper_02A, 270, 0)
             EVT_CALL(SetNpcJumpscale, NPC_Kooper_02A, EVT_FLOAT(2.0))
-            EVT_CALL(NpcJump1, NPC_Kooper_02A, -1062, -120, -37, 15)
+            EVT_CALL(NpcJump1, NPC_Kooper_02A, -1062, -120, -37, 15 * DT)
         EVT_END_THREAD
     EVT_END_IF
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetNpcAnimation, NPC_Kooper_01A, ANIM_WorldKooper_Idle)
     EVT_CALL(SetNpcAnimation, NPC_Kooper_02A, ANIM_WorldKooper_Idle)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
@@ -434,7 +434,7 @@ EvtScript N(EVS_Scene_HitTrueKooper) = {
         EVT_CALL(PlayerFaceNpc, NPC_Kooper_01A, FALSE)
         EVT_CALL(SpeakToPlayer, NPC_Kooper_01A, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH7_0125)
         EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar6, LVar7, LVar8)
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5 / DT))
         EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
         EVT_CALL(PlayerFaceNpc, NPC_Kooper_02A, FALSE)
         EVT_CALL(SpeakToPlayer, NPC_Kooper_02A, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH7_0124)
@@ -468,7 +468,7 @@ EvtScript N(EVS_Scene_HitTrueKooper) = {
         EVT_CALL(PlayerFaceNpc, NPC_Kooper_02A, FALSE)
         EVT_CALL(SpeakToPlayer, NPC_Kooper_02A, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH7_0124)
         EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5)
-        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0))
+        EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT))
         EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
         EVT_CALL(PlayerFaceNpc, NPC_Kooper_01A, FALSE)
         EVT_CALL(SpeakToPlayer, NPC_Kooper_01A, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH7_0125)
@@ -507,22 +507,22 @@ EvtScript N(EVS_Scene_HitFakeKooper) = {
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0))
     EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-8.0))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(SetNpcAnimation, NPC_Kooper_02A, ANIM_WorldKooper_Hurt)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(PlaySoundAtNpc, NPC_Kooper_02A, SOUND_20B8, 0)
     EVT_LOOP(10)
         EVT_CALL(GetNpcPos, NPC_Kooper_02A, LVar0, LVar1, LVar2)
         EVT_ADD(LVar2, 3)
         EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2)
-        EVT_WAIT(5)
+        EVT_WAIT(5 * DT)
     EVT_END_LOOP
     EVT_CALL(PlaySoundAtNpc, NPC_Kooper_02A, SOUND_SMOKE_BURST, 0)
     EVT_CALL(SetNpcPos, NPC_Kooper_02A, NPC_DISPOSE_LOCATION)
     EVT_CALL(EnableNpcShadow, NPC_Kooper_02A, FALSE)
     EVT_CALL(SetNpcPos, NPC_Duplighost, LVar0, LVar1, LVar2)
-    EVT_CALL(MakeLerp, 0, 2880, 40, EASING_QUADRATIC_OUT)
+    EVT_CALL(MakeLerp, 0, 2880, 40 * DT, EASING_QUADRATIC_OUT)
     EVT_LABEL(1)
     EVT_CALL(UpdateLerp)
     EVT_CALL(SetNpcRotation, NPC_Duplighost, 0, LVar0, 0)
@@ -537,7 +537,7 @@ EvtScript N(EVS_Scene_HitFakeKooper) = {
         EVT_CALL(GetAngleToNPC, NPC_Kooper_01A, LVar0)
         EVT_CALL(GetPlayerPos, LVar1, LVar2, LVar3)
         EVT_CALL(AddVectorPolar, LVar1, LVar3, EVT_FLOAT(40.0), LVar0)
-        EVT_CALL(SetNpcSpeed, NPC_Kooper_01A, EVT_FLOAT(3.0))
+        EVT_CALL(SetNpcSpeed, NPC_Kooper_01A, EVT_FLOAT(3.0 / DT))
         EVT_CALL(SetNpcAnimation, NPC_Kooper_01A, ANIM_WorldKooper_Run)
         EVT_CALL(SetNpcFlagBits, NPC_Kooper_01A, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
         EVT_CALL(NpcMoveTo, NPC_Kooper_01A, LVar1, LVar3, 0)
@@ -552,7 +552,7 @@ EvtScript N(EVS_Scene_HitFakeKooper) = {
         EVT_GOTO(0)
     EVT_END_IF
     EVT_CALL(SpeakToPlayer, NPC_Kooper_01A, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 5, MSG_CH7_0131)
-    EVT_WAIT(10)
+    EVT_WAIT(10 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Duplighost, ANIM_Duplighost_Anim05, ANIM_Duplighost_Anim02, 0, MSG_CH7_0132)
     EVT_CALL(SetNpcAnimation, NPC_Duplighost, ANIM_Duplighost_Anim06)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)

src/world/area_sam/sam_09/sam_09_4_sockets.c

@@ -82,7 +82,7 @@ API_CALLABLE(N(CreateConsumableItemList)) {
 
 EvtScript N(EVS_PlaceItemInSocket) = {
     EVT_CALL(PlaySoundAtCollider, LVar4, SOUND_1DD, 0)
-    EVT_CALL(MakeLerp, 0, 130, 30, EASING_LINEAR)
+    EVT_CALL(MakeLerp, 0, 130, 30 * DT, EASING_LINEAR)
     EVT_LABEL(0)
         EVT_CALL(UpdateLerp)
         EVT_CALL(TranslateModel, LVar2, 0, LVar0, 0)
@@ -97,7 +97,7 @@ EvtScript N(EVS_PlaceItemInSocket) = {
 
 EvtScript N(EVS_TakeItemFromSocket) = {
     EVT_CALL(PlaySoundAtCollider, LVar4, SOUND_1DE, 0)
-    EVT_CALL(MakeLerp, 130, 0, 30, EASING_CUBIC_IN)
+    EVT_CALL(MakeLerp, 130, 0, 30 * DT, EASING_CUBIC_IN)
     EVT_LABEL(0)
     EVT_CALL(UpdateLerp)
     EVT_CALL(TranslateModel, LVar2, 0, LVar0, 0)

src/world/area_sam/sam_10/sam_10_4_stairs.c

@@ -67,7 +67,7 @@ EvtScript N(EVS_ItemPrompt_StarStoneSocket) = {
     EVT_CALL(PlaySoundAt, SOUND_1EB, 0, -117, 179, -32)
     EVT_WAIT(30)
     EVT_THREAD
-        EVT_CALL(MakeLerp, -32, -55, 100, EASING_COS_IN_OUT)
+        EVT_CALL(MakeLerp, -32, -55, 100 * DT, EASING_COS_IN_OUT)
         EVT_LABEL(1)
         EVT_CALL(UpdateLerp)
         EVT_CALL(SetItemPos, MV_StarStoneItemID, -117, 179, LVar0)
@@ -77,7 +77,7 @@ EvtScript N(EVS_ItemPrompt_StarStoneSocket) = {
         EVT_END_IF
     EVT_END_THREAD
     EVT_CALL(PlaySoundAtCollider, COLLIDER_o61, SOUND_39C, 0)
-    EVT_CALL(MakeLerp, 0, -23, 100, EASING_COS_IN_OUT)
+    EVT_CALL(MakeLerp, 0, -23, 100 * DT, EASING_COS_IN_OUT)
     EVT_LABEL(2)
     EVT_CALL(UpdateLerp)
     EVT_CALL(TranslateGroup, MODEL_g51, 0, 0, LVar0)

src/world/area_sam/sam_11/sam_11_3_rooms.c

@@ -44,7 +44,7 @@ EvtScript N(EVS_RoomListener_LeftHouse) = {
             EVT_IF_EQ(GB_StoryProgress, STORY_CH7_SPOKE_WITH_HERRINGWAY)
                 EVT_IF_EQ(GF_SAM11_LeftHerringwaysHouse, FALSE)
                     EVT_THREAD
-                        EVT_WAIT(30)
+                        EVT_WAIT(30 * DT)
                         EVT_CALL(MakeLerp, 0, 255, 20, EASING_LINEAR)
                         EVT_LOOP(0)
                             EVT_CALL(UpdateLerp)
@@ -54,10 +54,10 @@ EvtScript N(EVS_RoomListener_LeftHouse) = {
                                 EVT_BREAK_LOOP
                             EVT_END_IF
                         EVT_END_LOOP
-                        EVT_WAIT(10)
+                        EVT_WAIT(10 * DT)
                         EVT_CALL(SetNpcAnimation, NPC_Herringway, ANIM_Herringway_Walk)
                         EVT_CALL(PlayerFaceNpc, NPC_Herringway, FALSE)
-                        EVT_CALL(NpcMoveTo, NPC_Herringway, -500, 0, 50)
+                        EVT_CALL(NpcMoveTo, NPC_Herringway, -500, 0, 50 * DT)
                         EVT_CALL(SetNpcFlagBits, NPC_Herringway, NPC_FLAG_GRAVITY, FALSE)
                         EVT_CALL(SetNpcPos, NPC_Herringway, NPC_DISPOSE_LOCATION)
                     EVT_END_THREAD

src/world/area_sam/sam_11/sam_11_5_npc.c

@@ -142,11 +142,11 @@ EvtScript N(EVS_NpcIdle_PenguinSentry) = {
 EvtScript N(EVS_NpcInteract_Herringway) = {
     EVT_SWITCH(GB_StoryProgress)
         EVT_CASE_LT(STORY_CH7_SPOKE_WITH_HERRINGWAY)
-            EVT_WAIT(30)
+            EVT_WAIT(30 * DT)
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Herringway_Talk, ANIM_Herringway_Idle, 0, MSG_CH7_00CE)
-            EVT_WAIT(10)
+            EVT_WAIT(10 * DT)
             EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
-            EVT_WAIT(5)
+            EVT_WAIT(5 * DT)
             EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
             EVT_CALL(GetNpcPos, NPC_SELF, LVar3, LVar4, LVar5)
             EVT_ADDF(LVar0, LVar3)
@@ -168,16 +168,16 @@ EvtScript N(EVS_NpcInteract_Herringway) = {
             EVT_CALL(SetNpcPos, NPC_PARTNER, -170, 150, -350)
             EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_SELF, 0)
             EVT_CALL(NpcFacePlayer, NPC_SELF, 0)
-            EVT_WAIT(10)
+            EVT_WAIT(10 * DT)
             EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp)
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Herringway_Talk, ANIM_Herringway_Idle, 0, MSG_CH7_00CF)
-            EVT_WAIT(5)
+            EVT_WAIT(5 * DT)
             EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking)
-            EVT_WAIT(30)
+            EVT_WAIT(30 * DT)
             EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Herringway_Talk, ANIM_Herringway_Idle, 0, MSG_CH7_00D0)
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_THREAD
                 EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
                 EVT_LOOP(30)
@@ -187,14 +187,14 @@ EvtScript N(EVS_NpcInteract_Herringway) = {
             EVT_END_THREAD
             EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
             EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
-            EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0))
+            EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0 / DT))
             EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Herringway_Walk)
             EVT_CALL(NpcMoveTo, NPC_SELF, -235, -355, 0)
             EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Herringway_Idle)
             EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE)
-            EVT_WAIT(20)
+            EVT_WAIT(20 * DT)
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Herringway_Talk, ANIM_Herringway_Idle, 0, MSG_CH7_00D1)
-            EVT_WAIT(15)
+            EVT_WAIT(15 * DT)
             EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(0.5))
             EVT_EXEC_WAIT(N(EVS_LowerStaircase))
             EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Herringway_Talk, ANIM_Herringway_Idle, 0, MSG_CH7_00D2)

src/world/area_sam/sam_12/sam_12_4_scenes.c

@@ -113,6 +113,9 @@ EvtScript N(EVS_MarioSleeping) = {
     EVT_END
 };
 
+#define LOOPCOUNT_1 ((s32)(5 * DT) * 10)
+#define LOOPCOUNT_2 ((s32)(10 * DT) * 10)
+
 EvtScript N(EVS_Scene_MeetMerlar) = {
     EVT_LABEL(1)
         EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
@@ -129,23 +132,23 @@ EvtScript N(EVS_Scene_MeetMerlar) = {
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 160, 0, 0)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, 160, 0, 0)
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
-    EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0))
+    EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT))
     EVT_CALL(PlayerMoveTo, 90, 0, 0)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_EXEC_GET_TID(N(EVS_SpawnStarStoneSparkles), LVar9)
-    EVT_WAIT(100)
+    EVT_WAIT(100 * DT)
     EVT_CALL(SetNpcPos, NPC_Merlar, 200, 50, 0)
     EVT_EXEC(N(EVS_SpawnMerlarSparkles))
     EVT_CALL(PlaySoundAtNpc, NPC_Merlar, SOUND_139, 0)
     EVT_SETF(LVar0, EVT_FLOAT(0.0))
-    EVT_LOOP(100)
+    EVT_LOOP(LOOPCOUNT_2)
         EVT_ADDF(LVar0, EVT_FLOAT(1.0))
         EVT_CALL(func_802CFD30, NPC_Merlar, FOLD_TYPE_7, LVar0, 0, 0, 0)
         EVT_WAIT(1)
     EVT_END_LOOP
     EVT_EXEC_GET_TID(N(EVS_MerlarFlickering), LVar8)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SpeakToPlayer, NPC_Merlar, ANIM_Merlar_Talk, ANIM_Merlar_Hover, 0, MSG_CH7_0133)
     EVT_CALL(GetNpcPos, NPC_Merlar, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
@@ -165,8 +168,8 @@ EvtScript N(EVS_Scene_MeetMerlar) = {
     EVT_EXEC_GET_TID(N(EVS_MarioSleeping), LVarA)
     EVT_CALL(EndSpeech, NPC_Merlar, ANIM_Merlar_Talk, ANIM_Merlar_Hover, 0)
     EVT_SETF(LVar0, EVT_FLOAT(0.0))
-    EVT_LOOP(50)
+    EVT_LOOP(LOOPCOUNT_1)
-        EVT_ADDF(LVar0, EVT_FLOAT(5.1))
+        EVT_ADDF(LVar0, EVT_FLOAT(255.0 / LOOPCOUNT_1))
         EVT_CALL(N(SetScreenFadeAmount), LVar0)
         EVT_WAIT(1)
     EVT_END_LOOP
@@ -174,8 +177,8 @@ EvtScript N(EVS_Scene_MeetMerlar) = {
     EVT_THREAD
         EVT_SET(MF_DoneFadingIn, FALSE)
         EVT_SETF(LVar0, EVT_FLOAT(255.0))
-        EVT_LOOP(100)
+        EVT_LOOP(LOOPCOUNT_2)
-            EVT_ADDF(LVar0, EVT_FLOAT(-2.55))
+            EVT_ADDF(LVar0, EVT_FLOAT(-255.0 / LOOPCOUNT_2))
             EVT_CALL(N(SetScreenFadeAmount), LVar0)
             EVT_WAIT(1)
         EVT_END_LOOP
@@ -187,16 +190,16 @@ EvtScript N(EVS_Scene_MeetMerlar) = {
             EVT_WAIT(1)
             EVT_GOTO(6)
         EVT_END_IF
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(RemoveEffect, LVar7)
     EVT_KILL_THREAD(LVarA)
     EVT_CALL(PlaySoundAtPlayer, SOUND_2F1, 0)
     EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_JoltAwake)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes)
-    EVT_WAIT(20)
+    EVT_WAIT(20 * DT)
     EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(GetNpcPos, NPC_Merlar, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
@@ -207,10 +210,10 @@ EvtScript N(EVS_Scene_MeetMerlar) = {
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_CALL(SpeakToPlayer, NPC_Merlar, ANIM_Merlar_Talk, ANIM_Merlar_Hover, 0, MSG_CH7_0137)
-    EVT_WAIT(30)
+    EVT_WAIT(30 * DT)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, 230, 0, 0)
     EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(230.0), EVT_FLOAT(60.0))
-    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT))
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
     EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
     EVT_THREAD
@@ -221,8 +224,8 @@ EvtScript N(EVS_Scene_MeetMerlar) = {
     EVT_END_THREAD
     EVT_WAIT(10)
     EVT_SETF(LVar0, EVT_FLOAT(0.0))
-    EVT_LOOP(50)
+    EVT_LOOP(LOOPCOUNT_1)
-        EVT_ADDF(LVar0, EVT_FLOAT(0.62))
+        EVT_ADDF(LVar0, EVT_FLOAT(31.0 / LOOPCOUNT_1))
         EVT_CALL(N(SetItemPositionF), MV_StarStoneItemID, EVT_FLOAT(230.0), LVar0, EVT_FLOAT(0.0))
         EVT_WAIT(1)
     EVT_END_LOOP
@@ -243,8 +246,8 @@ EvtScript N(EVS_Scene_MeetMerlar) = {
         EVT_END_LOOP
     EVT_END_THREAD
     EVT_SETF(LVar0, EVT_FLOAT(100.0))
-    EVT_LOOP(100)
+    EVT_LOOP(LOOPCOUNT_2)
-        EVT_ADDF(LVar0, EVT_FLOAT(-1.0))
+        EVT_ADDF(LVar0, EVT_FLOAT(-100.0 / LOOPCOUNT_2))
         EVT_CALL(func_802CFD30, NPC_Merlar, FOLD_TYPE_7, LVar0, 0, 0, 0)
         EVT_WAIT(1)
     EVT_END_LOOP

src/world/common/atomic/ToadHouse.data.inc.c

@@ -40,6 +40,14 @@ EvtScript N(EVS_ToadHouse_Unk2) = {
     EVT_END
 };
 
+#ifndef TOADHOUSE_ANIM_TALK
+#define TOADHOUSE_ANIM_TALK ANIM_Toad_Red_Talk
+#endif
+
+#ifndef TOADHOUSE_ANIM_IDLE
+#define TOADHOUSE_ANIM_IDLE ANIM_Toad_Red_Idle
+#endif
+
 EvtScript N(EVS_NpcInteract_ToadHouseKeeper) = {
     EVT_CALL(N(ToadHouse_InitScreenOverlay), 0, 0, 0)
     EVT_EXEC_WAIT(N(EVS_ToadHouse_SetDialogue))
@@ -53,14 +61,14 @@ EvtScript N(EVS_NpcInteract_ToadHouseKeeper) = {
     EVT_IF_EQ(LVar1, 0)
         EVT_SET(LVar8, LVar0)
     EVT_END_IF
-    EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVar8)
+    EVT_CALL(SpeakToPlayer, NPC_SELF, TOADHOUSE_ANIM_TALK, TOADHOUSE_ANIM_IDLE, 0, LVar8)
     EVT_CALL(ShowChoice, MSG_Choice_0006)
     EVT_WAIT(3)
     EVT_IF_EQ(LVar0, 1)
-        EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVar9)
+        EVT_CALL(ContinueSpeech, NPC_SELF, TOADHOUSE_ANIM_TALK, TOADHOUSE_ANIM_IDLE, 0, LVar9)
         EVT_RETURN
     EVT_END_IF
-    EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVarA)
+    EVT_CALL(ContinueSpeech, NPC_SELF, TOADHOUSE_ANIM_TALK, TOADHOUSE_ANIM_IDLE, 0, LVarA)
     EVT_CALL(SetPlayerJumpscale, 1)
     EVT_CALL(DisablePlayerPhysics, TRUE)
     EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
@@ -100,7 +108,7 @@ EvtScript N(EVS_NpcInteract_ToadHouseKeeper) = {
     EVT_EXEC_WAIT(N(EVS_ToadHouse_ReturnFromRest))
     EVT_CALL(DisablePlayerPhysics, FALSE)
     EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE)
-    EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVarB)
+    EVT_CALL(SpeakToPlayer, NPC_SELF, TOADHOUSE_ANIM_TALK, TOADHOUSE_ANIM_IDLE, 0, LVarB)
     EVT_CALL(N(ToadHouse_ShowStatusMenu))
     EVT_RETURN
     EVT_END

ver/pal/asm/nonmatchings/world/area_mgm/mgm_00/mgm_00_3_scoreboard/mgm_00_draw_record_display.s

@@ -0,0 +1,487 @@
+.set noat      /* allow manual use of $at */
+.set noreorder /* don't insert nops after branches */
+
+.section .rodata
+
+glabel D_PAL_80244340
+/* E7F160 80244340 3FE4CCCC */ .word 0x3FE4CCCC
+/* E7F164 80244344 CCCCCCCD */ .word 0xCCCCCCCD
+
+glabel D_PAL_80244348
+/* E7F168 80244348 3FE199999999999A */ .double 0.550000000000000044
+
+
+.section .text
+/* Generated by spimdisasm 1.11.1 */
+
+glabel mgm_00_draw_record_display
+/* E7C000 802411E0 27BDFFB0 */  addiu      $sp, $sp, -0x50
+/* E7C004 802411E4 AFB1002C */  sw         $s1, 0x2C($sp)
+/* E7C008 802411E8 0080882D */  daddu      $s1, $a0, $zero
+/* E7C00C 802411EC AFB60040 */  sw         $s6, 0x40($sp)
+/* E7C010 802411F0 00A0B02D */  daddu      $s6, $a1, $zero
+/* E7C014 802411F4 AFBF004C */  sw         $ra, 0x4C($sp)
+/* E7C018 802411F8 AFBE0048 */  sw         $fp, 0x48($sp)
+/* E7C01C 802411FC AFB70044 */  sw         $s7, 0x44($sp)
+/* E7C020 80241200 AFB5003C */  sw         $s5, 0x3C($sp)
+/* E7C024 80241204 AFB40038 */  sw         $s4, 0x38($sp)
+/* E7C028 80241208 AFB30034 */  sw         $s3, 0x34($sp)
+/* E7C02C 8024120C AFB20030 */  sw         $s2, 0x30($sp)
+/* E7C030 80241210 1AC001B0 */  blez       $s6, .LPAL_802418D4
+/* E7C034 80241214 AFB00028 */   sw        $s0, 0x28($sp)
+/* E7C038 80241218 3C0B8009 */  lui        $t3, %hi(gMainGfxPos)
+/* E7C03C 8024121C 256B6A44 */  addiu      $t3, $t3, %lo(gMainGfxPos)
+/* E7C040 80241220 8D6A0000 */  lw         $t2, 0x0($t3)
+/* E7C044 80241224 0140182D */  daddu      $v1, $t2, $zero
+/* E7C048 80241228 254A0008 */  addiu      $t2, $t2, 0x8
+/* E7C04C 8024122C AD6A0000 */  sw         $t2, 0x0($t3)
+/* E7C050 80241230 3C068015 */  lui        $a2, %hi(gCurrentLanguage)
+/* E7C054 80241234 8CC6AE4C */  lw         $a2, %lo(gCurrentLanguage)($a2)
+/* E7C058 80241238 3C02DE00 */  lui        $v0, (0xDE000000 >> 16)
+/* E7C05C 8024123C AC620000 */  sw         $v0, 0x0($v1)
+/* E7C060 80241240 3C028024 */  lui        $v0, %hi(mgm_00_Gfx_RecordDisplay_Init)
+/* E7C064 80241244 24424030 */  addiu      $v0, $v0, %lo(mgm_00_Gfx_RecordDisplay_Init)
+/* E7C068 80241248 AC620004 */  sw         $v0, 0x4($v1)
+/* E7C06C 8024124C 24020002 */  addiu      $v0, $zero, 0x2
+/* E7C070 80241250 14C20002 */  bne        $a2, $v0, .LPAL_8024125C
+/* E7C074 80241254 0000F02D */   daddu     $fp, $zero, $zero
+/* E7C078 80241258 241E0024 */  addiu      $fp, $zero, 0x24
+.LPAL_8024125C:
+/* E7C07C 8024125C 3C08F600 */  lui        $t0, (0xF60000CC >> 16)
+/* E7C080 80241260 350800CC */  ori        $t0, $t0, (0xF60000CC & 0xFFFF)
+/* E7C084 80241264 3C07F600 */  lui        $a3, (0xF6000214 >> 16)
+/* E7C088 80241268 34E70214 */  ori        $a3, $a3, (0xF6000214 & 0xFFFF)
+/* E7C08C 8024126C 3C09FA00 */  lui        $t1, (0xFA000000 >> 16)
+/* E7C090 80241270 3C02FF00 */  lui        $v0, (0xFF000000 >> 16)
+/* E7C094 80241274 3C058024 */  lui        $a1, %hi(mgm_00_pal_unkdata_2)
+/* E7C098 80241278 24A54020 */  addiu      $a1, $a1, %lo(mgm_00_pal_unkdata_2)
+/* E7C09C 8024127C 00063080 */  sll        $a2, $a2, 2
+/* E7C0A0 80241280 00C52821 */  addu       $a1, $a2, $a1
+/* E7C0A4 80241284 AD420004 */  sw         $v0, 0x4($t2)
+/* E7C0A8 80241288 3C028024 */  lui        $v0, %hi(mgm_00_pal_unkdata)
+/* E7C0AC 8024128C 24424010 */  addiu      $v0, $v0, %lo(mgm_00_pal_unkdata)
+/* E7C0B0 80241290 00C23021 */  addu       $a2, $a2, $v0
+/* E7C0B4 80241294 25430008 */  addiu      $v1, $t2, 0x8
+/* E7C0B8 80241298 AD490000 */  sw         $t1, 0x0($t2)
+/* E7C0BC 8024129C 8CA20000 */  lw         $v0, 0x0($a1)
+/* E7C0C0 802412A0 8CC40000 */  lw         $a0, 0x0($a2)
+/* E7C0C4 802412A4 3C018024 */  lui        $at, %hi(D_PAL_80244340)
+/* E7C0C8 802412A8 D4224340 */  ldc1       $f2, %lo(D_PAL_80244340)($at)
+/* E7C0CC 802412AC 44960000 */  mtc1       $s6, $f0
+/* E7C0D0 802412B0 00000000 */  nop
+/* E7C0D4 802412B4 46800021 */  cvt.d.w    $f0, $f0
+/* E7C0D8 802412B8 AD630000 */  sw         $v1, 0x0($t3)
+/* E7C0DC 802412BC 00441021 */  addu       $v0, $v0, $a0
+/* E7C0E0 802412C0 24420001 */  addiu      $v0, $v0, 0x1
+/* E7C0E4 802412C4 304203FF */  andi       $v0, $v0, 0x3FF
+/* E7C0E8 802412C8 00021380 */  sll        $v0, $v0, 14
+/* E7C0EC 802412CC 00481025 */  or         $v0, $v0, $t0
+/* E7C0F0 802412D0 46220002 */  mul.d      $f0, $f0, $f2
+/* E7C0F4 802412D4 00000000 */  nop
+/* E7C0F8 802412D8 AD420008 */  sw         $v0, 0x8($t2)
+/* E7C0FC 802412DC 8CA20000 */  lw         $v0, 0x0($a1)
+/* E7C100 802412E0 3C0141E0 */  lui        $at, (0x41E00000 >> 16)
+/* E7C104 802412E4 44811800 */  mtc1       $at, $f3
+/* E7C108 802412E8 44801000 */  mtc1       $zero, $f2
+/* E7C10C 802412EC 25430010 */  addiu      $v1, $t2, 0x10
+/* E7C110 802412F0 AD630000 */  sw         $v1, 0x0($t3)
+/* E7C114 802412F4 2442FFFF */  addiu      $v0, $v0, -0x1
+/* E7C118 802412F8 304203FF */  andi       $v0, $v0, 0x3FF
+/* E7C11C 802412FC 00021380 */  sll        $v0, $v0, 14
+/* E7C120 80241300 344200C4 */  ori        $v0, $v0, 0xC4
+/* E7C124 80241304 AD42000C */  sw         $v0, 0xC($t2)
+/* E7C128 80241308 8CA20000 */  lw         $v0, 0x0($a1)
+/* E7C12C 8024130C 25430018 */  addiu      $v1, $t2, 0x18
+/* E7C130 80241310 AD630000 */  sw         $v1, 0x0($t3)
+/* E7C134 80241314 24420001 */  addiu      $v0, $v0, 0x1
+/* E7C138 80241318 304203FF */  andi       $v0, $v0, 0x3FF
+/* E7C13C 8024131C 00021380 */  sll        $v0, $v0, 14
+/* E7C140 80241320 00471025 */  or         $v0, $v0, $a3
+/* E7C144 80241324 AD420010 */  sw         $v0, 0x10($t2)
+/* E7C148 80241328 8CA20000 */  lw         $v0, 0x0($a1)
+/* E7C14C 8024132C 25430020 */  addiu      $v1, $t2, 0x20
+/* E7C150 80241330 AD630000 */  sw         $v1, 0x0($t3)
+/* E7C154 80241334 2442FFFF */  addiu      $v0, $v0, -0x1
+/* E7C158 80241338 304203FF */  andi       $v0, $v0, 0x3FF
+/* E7C15C 8024133C 00021380 */  sll        $v0, $v0, 14
+/* E7C160 80241340 344200C4 */  ori        $v0, $v0, 0xC4
+/* E7C164 80241344 AD420014 */  sw         $v0, 0x14($t2)
+/* E7C168 80241348 8CA20000 */  lw         $v0, 0x0($a1)
+/* E7C16C 8024134C 8CC40000 */  lw         $a0, 0x0($a2)
+/* E7C170 80241350 25430028 */  addiu      $v1, $t2, 0x28
+/* E7C174 80241354 AD630000 */  sw         $v1, 0x0($t3)
+/* E7C178 80241358 00441021 */  addu       $v0, $v0, $a0
+/* E7C17C 8024135C 24420001 */  addiu      $v0, $v0, 0x1
+/* E7C180 80241360 304203FF */  andi       $v0, $v0, 0x3FF
+/* E7C184 80241364 00021380 */  sll        $v0, $v0, 14
+/* E7C188 80241368 00471025 */  or         $v0, $v0, $a3
+/* E7C18C 8024136C AD420018 */  sw         $v0, 0x18($t2)
+/* E7C190 80241370 8CA20000 */  lw         $v0, 0x0($a1)
+/* E7C194 80241374 8CC40000 */  lw         $a0, 0x0($a2)
+/* E7C198 80241378 25430030 */  addiu      $v1, $t2, 0x30
+/* E7C19C 8024137C AD630000 */  sw         $v1, 0x0($t3)
+/* E7C1A0 80241380 00441021 */  addu       $v0, $v0, $a0
+/* E7C1A4 80241384 304203FF */  andi       $v0, $v0, 0x3FF
+/* E7C1A8 80241388 00021380 */  sll        $v0, $v0, 14
+/* E7C1AC 8024138C 344200C4 */  ori        $v0, $v0, 0xC4
+/* E7C1B0 80241390 AD42001C */  sw         $v0, 0x1C($t2)
+/* E7C1B4 80241394 8CA20000 */  lw         $v0, 0x0($a1)
+/* E7C1B8 80241398 8CC40000 */  lw         $a0, 0x0($a2)
+/* E7C1BC 8024139C 25430038 */  addiu      $v1, $t2, 0x38
+/* E7C1C0 802413A0 AD630000 */  sw         $v1, 0x0($t3)
+/* E7C1C4 802413A4 3C03E700 */  lui        $v1, (0xE7000000 >> 16)
+/* E7C1C8 802413A8 00441021 */  addu       $v0, $v0, $a0
+/* E7C1CC 802413AC 24420001 */  addiu      $v0, $v0, 0x1
+/* E7C1D0 802413B0 304203FF */  andi       $v0, $v0, 0x3FF
+/* E7C1D4 802413B4 00021380 */  sll        $v0, $v0, 14
+/* E7C1D8 802413B8 00471025 */  or         $v0, $v0, $a3
+/* E7C1DC 802413BC AD420020 */  sw         $v0, 0x20($t2)
+/* E7C1E0 802413C0 8CA20000 */  lw         $v0, 0x0($a1)
+/* E7C1E4 802413C4 25460034 */  addiu      $a2, $t2, 0x34
+/* E7C1E8 802413C8 AD430028 */  sw         $v1, 0x28($t2)
+/* E7C1EC 802413CC AD40002C */  sw         $zero, 0x2C($t2)
+/* E7C1F0 802413D0 AD490030 */  sw         $t1, 0x30($t2)
+/* E7C1F4 802413D4 2442FFFF */  addiu      $v0, $v0, -0x1
+/* E7C1F8 802413D8 304203FF */  andi       $v0, $v0, 0x3FF
+/* E7C1FC 802413DC 00021380 */  sll        $v0, $v0, 14
+/* E7C200 802413E0 34420210 */  ori        $v0, $v0, 0x210
+/* E7C204 802413E4 4620103E */  c.le.d     $f2, $f0
+/* E7C208 802413E8 00000000 */  nop
+/* E7C20C 802413EC 45010005 */  bc1t       .LPAL_80241404
+/* E7C210 802413F0 AD420024 */   sw        $v0, 0x24($t2)
+/* E7C214 802413F4 4620010D */  trunc.w.d  $f4, $f0
+/* E7C218 802413F8 44042000 */  mfc1       $a0, $f4
+/* E7C21C 802413FC 08090508 */  j          .LPAL_80241420
+/* E7C220 80241400 3C031078 */   lui       $v1, (0x10781800 >> 16)
+.LPAL_80241404:
+/* E7C224 80241404 46220001 */  sub.d      $f0, $f0, $f2
+/* E7C228 80241408 3C028000 */  lui        $v0, (0x80000000 >> 16)
+/* E7C22C 8024140C 4620010D */  trunc.w.d  $f4, $f0
+/* E7C230 80241410 44042000 */  mfc1       $a0, $f4
+/* E7C234 80241414 00000000 */  nop
+/* E7C238 80241418 00822025 */  or         $a0, $a0, $v0
+/* E7C23C 8024141C 3C031078 */  lui        $v1, (0x10781800 >> 16)
+.LPAL_80241420:
+/* E7C240 80241420 34631800 */  ori        $v1, $v1, (0x10781800 & 0xFFFF)
+/* E7C244 80241424 3C0BF600 */  lui        $t3, (0xF6000204 >> 16)
+/* E7C248 80241428 356B0204 */  ori        $t3, $t3, (0xF6000204 & 0xFFFF)
+/* E7C24C 8024142C 24050032 */  addiu      $a1, $zero, 0x32
+/* E7C250 80241430 24070052 */  addiu      $a3, $zero, 0x52
+/* E7C254 80241434 3C0A8009 */  lui        $t2, %hi(gMainGfxPos)
+/* E7C258 80241438 254A6A44 */  addiu      $t2, $t2, %lo(gMainGfxPos)
+/* E7C25C 8024143C 308200FF */  andi       $v0, $a0, 0xFF
+/* E7C260 80241440 00431025 */  or         $v0, $v0, $v1
+/* E7C264 80241444 3C138015 */  lui        $s3, %hi(gCurrentLanguage)
+/* E7C268 80241448 2673AE4C */  addiu      $s3, $s3, %lo(gCurrentLanguage)
+/* E7C26C 8024144C 3C158024 */  lui        $s5, %hi(mgm_00_pal_unkdata_2)
+/* E7C270 80241450 26B54020 */  addiu      $s5, $s5, %lo(mgm_00_pal_unkdata_2)
+/* E7C274 80241454 3C108024 */  lui        $s0, %hi(mgm_00_pal_unkdata)
+/* E7C278 80241458 26104010 */  addiu      $s0, $s0, %lo(mgm_00_pal_unkdata)
+/* E7C27C 8024145C 44961000 */  mtc1       $s6, $f2
+/* E7C280 80241460 00000000 */  nop
+/* E7C284 80241464 468010A1 */  cvt.d.w    $f2, $f2
+/* E7C288 80241468 8D480000 */  lw         $t0, 0x0($t2)
+/* E7C28C 8024146C 24140001 */  addiu      $s4, $zero, 0x1
+/* E7C290 80241470 ACC20000 */  sw         $v0, 0x0($a2)
+/* E7C294 80241474 8E660000 */  lw         $a2, 0x0($s3)
+/* E7C298 80241478 3C018024 */  lui        $at, %hi(D_PAL_80244348)
+/* E7C29C 8024147C D4204348 */  ldc1       $f0, %lo(D_PAL_80244348)($at)
+/* E7C2A0 80241480 00063080 */  sll        $a2, $a2, 2
+/* E7C2A4 80241484 00D52021 */  addu       $a0, $a2, $s5
+/* E7C2A8 80241488 00D03021 */  addu       $a2, $a2, $s0
+/* E7C2AC 8024148C 0100482D */  daddu      $t1, $t0, $zero
+/* E7C2B0 80241490 8C820000 */  lw         $v0, 0x0($a0)
+/* E7C2B4 80241494 8CC30000 */  lw         $v1, 0x0($a2)
+/* E7C2B8 80241498 25080008 */  addiu      $t0, $t0, 0x8
+/* E7C2BC 8024149C 00431021 */  addu       $v0, $v0, $v1
+/* E7C2C0 802414A0 2442FFFD */  addiu      $v0, $v0, -0x3
+/* E7C2C4 802414A4 304203FF */  andi       $v0, $v0, 0x3FF
+/* E7C2C8 802414A8 00021380 */  sll        $v0, $v0, 14
+/* E7C2CC 802414AC 004B1025 */  or         $v0, $v0, $t3
+/* E7C2D0 802414B0 AD220000 */  sw         $v0, 0x0($t1)
+/* E7C2D4 802414B4 8C820000 */  lw         $v0, 0x0($a0)
+/* E7C2D8 802414B8 46201082 */  mul.d      $f2, $f2, $f0
+/* E7C2DC 802414BC 00000000 */  nop
+/* E7C2E0 802414C0 AD480000 */  sw         $t0, 0x0($t2)
+/* E7C2E4 802414C4 24420003 */  addiu      $v0, $v0, 0x3
+/* E7C2E8 802414C8 304203FF */  andi       $v0, $v0, 0x3FF
+/* E7C2EC 802414CC 00021380 */  sll        $v0, $v0, 14
+/* E7C2F0 802414D0 344200D4 */  ori        $v0, $v0, 0xD4
+/* E7C2F4 802414D4 AD220004 */  sw         $v0, 0x4($t1)
+/* E7C2F8 802414D8 3C02E700 */  lui        $v0, (0xE7000000 >> 16)
+/* E7C2FC 802414DC AD020000 */  sw         $v0, 0x0($t0)
+/* E7C300 802414E0 24020006 */  addiu      $v0, $zero, 0x6
+/* E7C304 802414E4 AD000004 */  sw         $zero, 0x4($t0)
+/* E7C308 802414E8 AFA20010 */  sw         $v0, 0x10($sp)
+/* E7C30C 802414EC AFA00014 */  sw         $zero, 0x14($sp)
+/* E7C310 802414F0 AFB40018 */  sw         $s4, 0x18($sp)
+/* E7C314 802414F4 AFB60020 */  sw         $s6, 0x20($sp)
+/* E7C318 802414F8 4620110D */  trunc.w.d  $f4, $f2
+/* E7C31C 802414FC E7A4001C */  swc1       $f4, 0x1C($sp)
+/* E7C320 80241500 8C840000 */  lw         $a0, 0x0($a0)
+/* E7C324 80241504 8CC60000 */  lw         $a2, 0x0($a2)
+/* E7C328 80241508 25080008 */  addiu      $t0, $t0, 0x8
+/* E7C32C 8024150C 0C04B1BE */  jal        msg_draw_frame
+/* E7C330 80241510 AD480000 */   sw        $t0, 0x0($t2)
+/* E7C334 80241514 8E220008 */  lw         $v0, 0x8($s1)
+/* E7C338 80241518 1454004D */  bne        $v0, $s4, .LPAL_80241650
+/* E7C33C 8024151C 3C040008 */   lui       $a0, (0x8001C >> 16)
+/* E7C340 80241520 3484001C */  ori        $a0, $a0, (0x8001C & 0xFFFF)
+/* E7C344 80241524 0C0493E5 */  jal        get_msg_width
+/* E7C348 80241528 0000282D */   daddu     $a1, $zero, $zero
+/* E7C34C 8024152C 3C040008 */  lui        $a0, (0x8001C >> 16)
+/* E7C350 80241530 3484001C */  ori        $a0, $a0, (0x8001C & 0xFFFF)
+/* E7C354 80241534 24060039 */  addiu      $a2, $zero, 0x39
+/* E7C358 80241538 8E630000 */  lw         $v1, 0x0($s3)
+/* E7C35C 8024153C 02C0382D */  daddu      $a3, $s6, $zero
+/* E7C360 80241540 00031880 */  sll        $v1, $v1, 2
+/* E7C364 80241544 00754021 */  addu       $t0, $v1, $s5
+/* E7C368 80241548 00701821 */  addu       $v1, $v1, $s0
+/* E7C36C 8024154C 8C650000 */  lw         $a1, 0x0($v1)
+/* E7C370 80241550 8D030000 */  lw         $v1, 0x0($t0)
+/* E7C374 80241554 3C170008 */  lui        $s7, (0x80025 >> 16)
+/* E7C378 80241558 AFB40010 */  sw         $s4, 0x10($sp)
+/* E7C37C 8024155C AFA00014 */  sw         $zero, 0x14($sp)
+/* E7C380 80241560 00A22823 */  subu       $a1, $a1, $v0
+/* E7C384 80241564 000517C2 */  srl        $v0, $a1, 31
+/* E7C388 80241568 00A22821 */  addu       $a1, $a1, $v0
+/* E7C38C 8024156C 02852807 */  srav       $a1, $a1, $s4
+/* E7C390 80241570 0C049403 */  jal        draw_msg
+/* E7C394 80241574 00652821 */   addu      $a1, $v1, $a1
+/* E7C398 80241578 2406004E */  addiu      $a2, $zero, 0x4E
+/* E7C39C 8024157C 0280382D */  daddu      $a3, $s4, $zero
+/* E7C3A0 80241580 3C128011 */  lui        $s2, %hi(gPlayerData)
+/* E7C3A4 80241584 2652DD90 */  addiu      $s2, $s2, %lo(gPlayerData)
+/* E7C3A8 80241588 24110003 */  addiu      $s1, $zero, 0x3
+/* E7C3AC 8024158C 8E620000 */  lw         $v0, 0x0($s3)
+/* E7C3B0 80241590 9644032E */  lhu        $a0, 0x32E($s2)
+/* E7C3B4 80241594 00021080 */  sll        $v0, $v0, 2
+/* E7C3B8 80241598 00551021 */  addu       $v0, $v0, $s5
+/* E7C3BC 8024159C 8C450000 */  lw         $a1, 0x0($v0)
+/* E7C3C0 802415A0 27D000AE */  addiu      $s0, $fp, 0xAE
+/* E7C3C4 802415A4 AFA00010 */  sw         $zero, 0x10($sp)
+/* E7C3C8 802415A8 AFB60014 */  sw         $s6, 0x14($sp)
+/* E7C3CC 802415AC AFB10018 */  sw         $s1, 0x18($sp)
+/* E7C3D0 802415B0 0C04986F */  jal        draw_number
+/* E7C3D4 802415B4 00B02821 */   addu      $a1, $a1, $s0
+/* E7C3D8 802415B8 2406005D */  addiu      $a2, $zero, 0x5D
+/* E7C3DC 802415BC 8E620000 */  lw         $v0, 0x0($s3)
+/* E7C3E0 802415C0 8E440330 */  lw         $a0, 0x330($s2)
+/* E7C3E4 802415C4 00021080 */  sll        $v0, $v0, 2
+/* E7C3E8 802415C8 00551021 */  addu       $v0, $v0, $s5
+/* E7C3EC 802415CC 8C450000 */  lw         $a1, 0x0($v0)
+/* E7C3F0 802415D0 0280382D */  daddu      $a3, $s4, $zero
+/* E7C3F4 802415D4 AFA00010 */  sw         $zero, 0x10($sp)
+/* E7C3F8 802415D8 AFB60014 */  sw         $s6, 0x14($sp)
+/* E7C3FC 802415DC AFB10018 */  sw         $s1, 0x18($sp)
+/* E7C400 802415E0 0C04986F */  jal        draw_number
+/* E7C404 802415E4 00B02821 */   addu      $a1, $a1, $s0
+/* E7C408 802415E8 2406006C */  addiu      $a2, $zero, 0x6C
+/* E7C40C 802415EC 8E620000 */  lw         $v0, 0x0($s3)
+/* E7C410 802415F0 96440334 */  lhu        $a0, 0x334($s2)
+/* E7C414 802415F4 00021080 */  sll        $v0, $v0, 2
+/* E7C418 802415F8 00551021 */  addu       $v0, $v0, $s5
+/* E7C41C 802415FC 8C450000 */  lw         $a1, 0x0($v0)
+/* E7C420 80241600 0280382D */  daddu      $a3, $s4, $zero
+/* E7C424 80241604 AFA00010 */  sw         $zero, 0x10($sp)
+/* E7C428 80241608 AFB60014 */  sw         $s6, 0x14($sp)
+/* E7C42C 8024160C AFB10018 */  sw         $s1, 0x18($sp)
+/* E7C430 80241610 0C04986F */  jal        draw_number
+/* E7C434 80241614 00B02821 */   addu      $a1, $a1, $s0
+/* E7C438 80241618 9642032E */  lhu        $v0, 0x32E($s2)
+/* E7C43C 8024161C 14540003 */  bne        $v0, $s4, .LPAL_8024162C
+/* E7C440 80241620 36F70025 */   ori       $s7, $s7, (0x80025 & 0xFFFF)
+/* E7C444 80241624 3C170008 */  lui        $s7, (0x80024 >> 16)
+/* E7C448 80241628 36F70024 */  ori        $s7, $s7, (0x80024 & 0xFFFF)
+.LPAL_8024162C:
+/* E7C44C 8024162C 3C110008 */  lui        $s1, (0x80022 >> 16)
+/* E7C450 80241630 8E420330 */  lw         $v0, 0x330($s2)
+/* E7C454 80241634 14540003 */  bne        $v0, $s4, .LPAL_80241644
+/* E7C458 80241638 36310022 */   ori       $s1, $s1, (0x80022 & 0xFFFF)
+/* E7C45C 8024163C 3C110008 */  lui        $s1, (0x80021 >> 16)
+/* E7C460 80241640 36310021 */  ori        $s1, $s1, (0x80021 & 0xFFFF)
+.LPAL_80241644:
+/* E7C464 80241644 96420334 */  lhu        $v0, 0x334($s2)
+/* E7C468 80241648 080905DF */  j          .LPAL_8024177C
+/* E7C46C 8024164C 3C130008 */   lui       $s3, (0x80022 >> 16)
+.LPAL_80241650:
+/* E7C470 80241650 3484001D */  ori        $a0, $a0, (0x8001D & 0xFFFF)
+/* E7C474 80241654 0C0493E5 */  jal        get_msg_width
+/* E7C478 80241658 0000282D */   daddu     $a1, $zero, $zero
+/* E7C47C 8024165C 3C040008 */  lui        $a0, (0x8001D >> 16)
+/* E7C480 80241660 3484001D */  ori        $a0, $a0, (0x8001D & 0xFFFF)
+/* E7C484 80241664 24060039 */  addiu      $a2, $zero, 0x39
+/* E7C488 80241668 8E630000 */  lw         $v1, 0x0($s3)
+/* E7C48C 8024166C 02C0382D */  daddu      $a3, $s6, $zero
+/* E7C490 80241670 00031880 */  sll        $v1, $v1, 2
+/* E7C494 80241674 00754021 */  addu       $t0, $v1, $s5
+/* E7C498 80241678 00701821 */  addu       $v1, $v1, $s0
+/* E7C49C 8024167C 8C650000 */  lw         $a1, 0x0($v1)
+/* E7C4A0 80241680 8D030000 */  lw         $v1, 0x0($t0)
+/* E7C4A4 80241684 3C170008 */  lui        $s7, (0x80025 >> 16)
+/* E7C4A8 80241688 AFB40010 */  sw         $s4, 0x10($sp)
+/* E7C4AC 8024168C AFA00014 */  sw         $zero, 0x14($sp)
+/* E7C4B0 80241690 00A22823 */  subu       $a1, $a1, $v0
+/* E7C4B4 80241694 000517C2 */  srl        $v0, $a1, 31
+/* E7C4B8 80241698 00A22821 */  addu       $a1, $a1, $v0
+/* E7C4BC 8024169C 00052843 */  sra        $a1, $a1, 1
+/* E7C4C0 802416A0 0C049403 */  jal        draw_msg
+/* E7C4C4 802416A4 00652821 */   addu      $a1, $v1, $a1
+/* E7C4C8 802416A8 2406004E */  addiu      $a2, $zero, 0x4E
+/* E7C4CC 802416AC 24070001 */  addiu      $a3, $zero, 0x1
+/* E7C4D0 802416B0 3C128011 */  lui        $s2, %hi(gPlayerData)
+/* E7C4D4 802416B4 2652DD90 */  addiu      $s2, $s2, %lo(gPlayerData)
+/* E7C4D8 802416B8 24110003 */  addiu      $s1, $zero, 0x3
+/* E7C4DC 802416BC 8E620000 */  lw         $v0, 0x0($s3)
+/* E7C4E0 802416C0 96440336 */  lhu        $a0, 0x336($s2)
+/* E7C4E4 802416C4 00021080 */  sll        $v0, $v0, 2
+/* E7C4E8 802416C8 00551021 */  addu       $v0, $v0, $s5
+/* E7C4EC 802416CC 8C450000 */  lw         $a1, 0x0($v0)
+/* E7C4F0 802416D0 27D000AE */  addiu      $s0, $fp, 0xAE
+/* E7C4F4 802416D4 AFA00010 */  sw         $zero, 0x10($sp)
+/* E7C4F8 802416D8 AFB60014 */  sw         $s6, 0x14($sp)
+/* E7C4FC 802416DC AFB10018 */  sw         $s1, 0x18($sp)
+/* E7C500 802416E0 0C04986F */  jal        draw_number
+/* E7C504 802416E4 00B02821 */   addu      $a1, $a1, $s0
+/* E7C508 802416E8 2406005D */  addiu      $a2, $zero, 0x5D
+/* E7C50C 802416EC 8E620000 */  lw         $v0, 0x0($s3)
+/* E7C510 802416F0 8E440338 */  lw         $a0, 0x338($s2)
+/* E7C514 802416F4 00021080 */  sll        $v0, $v0, 2
+/* E7C518 802416F8 00551021 */  addu       $v0, $v0, $s5
+/* E7C51C 802416FC 8C450000 */  lw         $a1, 0x0($v0)
+/* E7C520 80241700 24070001 */  addiu      $a3, $zero, 0x1
+/* E7C524 80241704 AFA00010 */  sw         $zero, 0x10($sp)
+/* E7C528 80241708 AFB60014 */  sw         $s6, 0x14($sp)
+/* E7C52C 8024170C AFB10018 */  sw         $s1, 0x18($sp)
+/* E7C530 80241710 0C04986F */  jal        draw_number
+/* E7C534 80241714 00B02821 */   addu      $a1, $a1, $s0
+/* E7C538 80241718 2406006C */  addiu      $a2, $zero, 0x6C
+/* E7C53C 8024171C 8E620000 */  lw         $v0, 0x0($s3)
+/* E7C540 80241720 9644033C */  lhu        $a0, 0x33C($s2)
+/* E7C544 80241724 00021080 */  sll        $v0, $v0, 2
+/* E7C548 80241728 00551021 */  addu       $v0, $v0, $s5
+/* E7C54C 8024172C 8C450000 */  lw         $a1, 0x0($v0)
+/* E7C550 80241730 24070001 */  addiu      $a3, $zero, 0x1
+/* E7C554 80241734 AFA00010 */  sw         $zero, 0x10($sp)
+/* E7C558 80241738 AFB60014 */  sw         $s6, 0x14($sp)
+/* E7C55C 8024173C AFB10018 */  sw         $s1, 0x18($sp)
+/* E7C560 80241740 0C04986F */  jal        draw_number
+/* E7C564 80241744 00B02821 */   addu      $a1, $a1, $s0
+/* E7C568 80241748 96420336 */  lhu        $v0, 0x336($s2)
+/* E7C56C 8024174C 14540003 */  bne        $v0, $s4, .LPAL_8024175C
+/* E7C570 80241750 36F70025 */   ori       $s7, $s7, (0x80025 & 0xFFFF)
+/* E7C574 80241754 3C170008 */  lui        $s7, (0x80024 >> 16)
+/* E7C578 80241758 36F70024 */  ori        $s7, $s7, (0x80024 & 0xFFFF)
+.LPAL_8024175C:
+/* E7C57C 8024175C 3C110008 */  lui        $s1, (0x80022 >> 16)
+/* E7C580 80241760 8E420338 */  lw         $v0, 0x338($s2)
+/* E7C584 80241764 14540003 */  bne        $v0, $s4, .LPAL_80241774
+/* E7C588 80241768 36310022 */   ori       $s1, $s1, (0x80022 & 0xFFFF)
+/* E7C58C 8024176C 3C110008 */  lui        $s1, (0x80021 >> 16)
+/* E7C590 80241770 36310021 */  ori        $s1, $s1, (0x80021 & 0xFFFF)
+.LPAL_80241774:
+/* E7C594 80241774 3C130008 */  lui        $s3, (0x80022 >> 16)
+/* E7C598 80241778 9642033C */  lhu        $v0, 0x33C($s2)
+.LPAL_8024177C:
+/* E7C59C 8024177C 14540003 */  bne        $v0, $s4, .LPAL_8024178C
+/* E7C5A0 80241780 36730022 */   ori       $s3, $s3, (0x80022 & 0xFFFF)
+/* E7C5A4 80241784 3C130008 */  lui        $s3, (0x80021 >> 16)
+/* E7C5A8 80241788 36730021 */  ori        $s3, $s3, (0x80021 & 0xFFFF)
+.LPAL_8024178C:
+/* E7C5AC 8024178C 3C040008 */  lui        $a0, (0x8001E >> 16)
+/* E7C5B0 80241790 3484001E */  ori        $a0, $a0, (0x8001E & 0xFFFF)
+/* E7C5B4 80241794 3C128015 */  lui        $s2, %hi(gCurrentLanguage)
+/* E7C5B8 80241798 2652AE4C */  addiu      $s2, $s2, %lo(gCurrentLanguage)
+/* E7C5BC 8024179C 2406004E */  addiu      $a2, $zero, 0x4E
+/* E7C5C0 802417A0 8E420000 */  lw         $v0, 0x0($s2)
+/* E7C5C4 802417A4 02C0382D */  daddu      $a3, $s6, $zero
+/* E7C5C8 802417A8 00021080 */  sll        $v0, $v0, 2
+/* E7C5CC 802417AC 3C058024 */  lui        $a1, %hi(mgm_00_pal_unkdata_2)
+/* E7C5D0 802417B0 00A22821 */  addu       $a1, $a1, $v0
+/* E7C5D4 802417B4 8CA54020 */  lw         $a1, %lo(mgm_00_pal_unkdata_2)($a1)
+/* E7C5D8 802417B8 24140001 */  addiu      $s4, $zero, 0x1
+/* E7C5DC 802417BC AFA00010 */  sw         $zero, 0x10($sp)
+/* E7C5E0 802417C0 AFB40014 */  sw         $s4, 0x14($sp)
+/* E7C5E4 802417C4 0C049403 */  jal        draw_msg
+/* E7C5E8 802417C8 24A5000D */   addiu     $a1, $a1, 0xD
+/* E7C5EC 802417CC 3C108024 */  lui        $s0, %hi(mgm_00_pal_unkdata_2)
+/* E7C5F0 802417D0 26104020 */  addiu      $s0, $s0, %lo(mgm_00_pal_unkdata_2)
+/* E7C5F4 802417D4 8E420000 */  lw         $v0, 0x0($s2)
+/* E7C5F8 802417D8 24150002 */  addiu      $s5, $zero, 0x2
+/* E7C5FC 802417DC 1055000B */  beq        $v0, $s5, .LPAL_8024180C
+/* E7C600 802417E0 02E0202D */   daddu     $a0, $s7, $zero
+/* E7C604 802417E4 2406004E */  addiu      $a2, $zero, 0x4E
+/* E7C608 802417E8 02A21004 */  sllv       $v0, $v0, $s5
+/* E7C60C 802417EC 00501021 */  addu       $v0, $v0, $s0
+/* E7C610 802417F0 02C0382D */  daddu      $a3, $s6, $zero
+/* E7C614 802417F4 8C420000 */  lw         $v0, 0x0($v0)
+/* E7C618 802417F8 27C500B2 */  addiu      $a1, $fp, 0xB2
+/* E7C61C 802417FC AFA00010 */  sw         $zero, 0x10($sp)
+/* E7C620 80241800 AFB40014 */  sw         $s4, 0x14($sp)
+/* E7C624 80241804 0C049403 */  jal        draw_msg
+/* E7C628 80241808 00452821 */   addu      $a1, $v0, $a1
+.LPAL_8024180C:
+/* E7C62C 8024180C 3C040008 */  lui        $a0, (0x8001F >> 16)
+/* E7C630 80241810 3484001F */  ori        $a0, $a0, (0x8001F & 0xFFFF)
+/* E7C634 80241814 8E420000 */  lw         $v0, 0x0($s2)
+/* E7C638 80241818 2406005D */  addiu      $a2, $zero, 0x5D
+/* E7C63C 8024181C 00021080 */  sll        $v0, $v0, 2
+/* E7C640 80241820 00501021 */  addu       $v0, $v0, $s0
+/* E7C644 80241824 8C450000 */  lw         $a1, 0x0($v0)
+/* E7C648 80241828 02C0382D */  daddu      $a3, $s6, $zero
+/* E7C64C 8024182C AFA00010 */  sw         $zero, 0x10($sp)
+/* E7C650 80241830 AFB40014 */  sw         $s4, 0x14($sp)
+/* E7C654 80241834 0C049403 */  jal        draw_msg
+/* E7C658 80241838 24A5000D */   addiu     $a1, $a1, 0xD
+/* E7C65C 8024183C 8E420000 */  lw         $v0, 0x0($s2)
+/* E7C660 80241840 1055000B */  beq        $v0, $s5, .LPAL_80241870
+/* E7C664 80241844 0220202D */   daddu     $a0, $s1, $zero
+/* E7C668 80241848 2406005D */  addiu      $a2, $zero, 0x5D
+/* E7C66C 8024184C 00021080 */  sll        $v0, $v0, 2
+/* E7C670 80241850 00501021 */  addu       $v0, $v0, $s0
+/* E7C674 80241854 02C0382D */  daddu      $a3, $s6, $zero
+/* E7C678 80241858 8C420000 */  lw         $v0, 0x0($v0)
+/* E7C67C 8024185C 27C500B2 */  addiu      $a1, $fp, 0xB2
+/* E7C680 80241860 AFA00010 */  sw         $zero, 0x10($sp)
+/* E7C684 80241864 AFB40014 */  sw         $s4, 0x14($sp)
+/* E7C688 80241868 0C049403 */  jal        draw_msg
+/* E7C68C 8024186C 00452821 */   addu      $a1, $v0, $a1
+.LPAL_80241870:
+/* E7C690 80241870 3C040008 */  lui        $a0, (0x80020 >> 16)
+/* E7C694 80241874 34840020 */  ori        $a0, $a0, (0x80020 & 0xFFFF)
+/* E7C698 80241878 8E420000 */  lw         $v0, 0x0($s2)
+/* E7C69C 8024187C 2406006C */  addiu      $a2, $zero, 0x6C
+/* E7C6A0 80241880 00021080 */  sll        $v0, $v0, 2
+/* E7C6A4 80241884 00501021 */  addu       $v0, $v0, $s0
+/* E7C6A8 80241888 8C450000 */  lw         $a1, 0x0($v0)
+/* E7C6AC 8024188C 02C0382D */  daddu      $a3, $s6, $zero
+/* E7C6B0 80241890 AFA00010 */  sw         $zero, 0x10($sp)
+/* E7C6B4 80241894 AFB40014 */  sw         $s4, 0x14($sp)
+/* E7C6B8 80241898 0C049403 */  jal        draw_msg
+/* E7C6BC 8024189C 24A5000D */   addiu     $a1, $a1, 0xD
+/* E7C6C0 802418A0 8E420000 */  lw         $v0, 0x0($s2)
+/* E7C6C4 802418A4 1055000B */  beq        $v0, $s5, .LPAL_802418D4
+/* E7C6C8 802418A8 0260202D */   daddu     $a0, $s3, $zero
+/* E7C6CC 802418AC 2406006C */  addiu      $a2, $zero, 0x6C
+/* E7C6D0 802418B0 00021080 */  sll        $v0, $v0, 2
+/* E7C6D4 802418B4 00501021 */  addu       $v0, $v0, $s0
+/* E7C6D8 802418B8 02C0382D */  daddu      $a3, $s6, $zero
+/* E7C6DC 802418BC 8C420000 */  lw         $v0, 0x0($v0)
+/* E7C6E0 802418C0 27C500B2 */  addiu      $a1, $fp, 0xB2
+/* E7C6E4 802418C4 AFA00010 */  sw         $zero, 0x10($sp)
+/* E7C6E8 802418C8 AFB40014 */  sw         $s4, 0x14($sp)
+/* E7C6EC 802418CC 0C049403 */  jal        draw_msg
+/* E7C6F0 802418D0 00452821 */   addu      $a1, $v0, $a1
+.LPAL_802418D4:
+/* E7C6F4 802418D4 8FBF004C */  lw         $ra, 0x4C($sp)
+/* E7C6F8 802418D8 8FBE0048 */  lw         $fp, 0x48($sp)
+/* E7C6FC 802418DC 8FB70044 */  lw         $s7, 0x44($sp)
+/* E7C700 802418E0 8FB60040 */  lw         $s6, 0x40($sp)
+/* E7C704 802418E4 8FB5003C */  lw         $s5, 0x3C($sp)
+/* E7C708 802418E8 8FB40038 */  lw         $s4, 0x38($sp)
+/* E7C70C 802418EC 8FB30034 */  lw         $s3, 0x34($sp)
+/* E7C710 802418F0 8FB20030 */  lw         $s2, 0x30($sp)
+/* E7C714 802418F4 8FB1002C */  lw         $s1, 0x2C($sp)
+/* E7C718 802418F8 8FB00028 */  lw         $s0, 0x28($sp)
+/* E7C71C 802418FC 03E00008 */  jr         $ra
+/* E7C720 80241900 27BD0050 */   addiu     $sp, $sp, 0x50

ver/pal/asm/nonmatchings/world/area_mgm/mgm_01/mgm_01_2_npc/mgm_01_SetMsgVars_BlocksRemaining.s

@@ -0,0 +1,31 @@
+.set noat      /* allow manual use of $at */
+.set noreorder /* don't insert nops after branches */
+
+/* Generated by spimdisasm 1.11.1 */
+
+glabel func_PAL_802416F8
+/* E80888 802416F8 27BDFFE0 */  addiu      $sp, $sp, -0x20
+/* E8088C 802416FC AFB10014 */  sw         $s1, 0x14($sp)
+/* E80890 80241700 0080882D */  daddu      $s1, $a0, $zero
+/* E80894 80241704 0000202D */  daddu      $a0, $zero, $zero
+/* E80898 80241708 AFBF0018 */  sw         $ra, 0x18($sp)
+/* E8089C 8024170C 0C00FC76 */  jal        get_enemy
+/* E808A0 80241710 AFB00010 */   sw        $s0, 0x10($sp)
+/* E808A4 80241714 8C50007C */  lw         $s0, 0x7C($v0)
+/* E808A8 80241718 8C420074 */  lw         $v0, 0x74($v0)
+/* E808AC 8024171C 0000282D */  daddu      $a1, $zero, $zero
+/* E808B0 80241720 02028023 */  subu       $s0, $s0, $v0
+/* E808B4 80241724 26100001 */  addiu      $s0, $s0, 0x1
+/* E808B8 80241728 0C0491C2 */  jal        set_message_value
+/* E808BC 8024172C 0200202D */   daddu     $a0, $s0, $zero
+/* E808C0 80241730 0220202D */  daddu      $a0, $s1, $zero
+/* E808C4 80241734 3C05FE36 */  lui        $a1, (0xFE363C8D >> 16)
+/* E808C8 80241738 34A53C8D */  ori        $a1, $a1, (0xFE363C8D & 0xFFFF)
+/* E808CC 8024173C 0C0B2C26 */  jal        evt_set_variable
+/* E808D0 80241740 0200302D */   daddu     $a2, $s0, $zero
+/* E808D4 80241744 8FBF0018 */  lw         $ra, 0x18($sp)
+/* E808D8 80241748 8FB10014 */  lw         $s1, 0x14($sp)
+/* E808DC 8024174C 8FB00010 */  lw         $s0, 0x10($sp)
+/* E808E0 80241750 24020002 */  addiu      $v0, $zero, 0x2
+/* E808E4 80241754 03E00008 */  jr         $ra
+/* E808E8 80241758 27BD0020 */   addiu     $sp, $sp, 0x20

ver/pal/asm/nonmatchings/world/area_mgm/mgm_02/mgm_02_0_header/mgm_02_get_tattle.s

@@ -0,0 +1,15 @@
+.set noat      /* allow manual use of $at */
+.set noreorder /* don't insert nops after branches */
+
+/* Generated by spimdisasm 1.11.1 */
+
+glabel mgm_02_get_tattle
+/* E827F0 80240000 3C030019 */  lui        $v1, (0x190008 >> 16)
+/* E827F4 80240004 3C028024 */  lui        $v0, %hi(mgm_02_pal_variable)
+/* E827F8 80240008 8C422A50 */  lw         $v0, %lo(mgm_02_pal_variable)($v0)
+/* E827FC 8024000C 10400002 */  beqz       $v0, .Lmgm_02_80240018
+/* E82800 80240010 34630008 */   ori       $v1, $v1, (0x190008 & 0xFFFF)
+/* E82804 80240014 0000182D */  daddu      $v1, $zero, $zero
+.Lmgm_02_80240018:
+/* E82808 80240018 03E00008 */  jr         $ra
+/* E8280C 8024001C 0060102D */   daddu     $v0, $v1, $zero

ver/pal/asm/nonmatchings/world/area_mgm/mgm_02/mgm_02_2_npc/mgm_02_SetBoxContents.s

@@ -0,0 +1,297 @@
+.set noat      /* allow manual use of $at */
+.set noreorder /* don't insert nops after branches */
+
+/* Generated by spimdisasm 1.11.1 */
+
+glabel mgm_02_SetBoxContents
+/* E82FA0 802407B0 27BDFF40 */  addiu      $sp, $sp, -0xC0
+/* E82FA4 802407B4 24020001 */  addiu      $v0, $zero, 0x1
+/* E82FA8 802407B8 AFBF00BC */  sw         $ra, 0xBC($sp)
+/* E82FAC 802407BC AFB600B8 */  sw         $s6, 0xB8($sp)
+/* E82FB0 802407C0 AFB500B4 */  sw         $s5, 0xB4($sp)
+/* E82FB4 802407C4 AFB400B0 */  sw         $s4, 0xB0($sp)
+/* E82FB8 802407C8 AFB300AC */  sw         $s3, 0xAC($sp)
+/* E82FBC 802407CC AFB200A8 */  sw         $s2, 0xA8($sp)
+/* E82FC0 802407D0 AFB100A4 */  sw         $s1, 0xA4($sp)
+/* E82FC4 802407D4 AFB000A0 */  sw         $s0, 0xA0($sp)
+/* E82FC8 802407D8 3C018024 */  lui        $at, %hi(mgm_02_pal_variable)
+/* E82FCC 802407DC AC222A50 */  sw         $v0, %lo(mgm_02_pal_variable)($at)
+/* E82FD0 802407E0 0C00FC76 */  jal        get_enemy
+/* E82FD4 802407E4 0000202D */   daddu     $a0, $zero, $zero
+/* E82FD8 802407E8 240403E8 */  addiu      $a0, $zero, 0x3E8
+/* E82FDC 802407EC 8C55006C */  lw         $s5, 0x6C($v0)
+/* E82FE0 802407F0 240202F6 */  addiu      $v0, $zero, 0x2F6
+/* E82FE4 802407F4 AEA00004 */  sw         $zero, 0x4($s5)
+/* E82FE8 802407F8 AEA20008 */  sw         $v0, 0x8($s5)
+/* E82FEC 802407FC AEA00020 */  sw         $zero, 0x20($s5)
+/* E82FF0 80240800 AEA00024 */  sw         $zero, 0x24($s5)
+/* E82FF4 80240804 0C00A65F */  jal        rand_int
+/* E82FF8 80240808 AEA00028 */   sw        $zero, 0x28($s5)
+/* E82FFC 8024080C 3C035555 */  lui        $v1, (0x55555556 >> 16)
+/* E83000 80240810 34635556 */  ori        $v1, $v1, (0x55555556 & 0xFFFF)
+/* E83004 80240814 00430018 */  mult       $v0, $v1
+/* E83008 80240818 0000802D */  daddu      $s0, $zero, $zero
+/* E8300C 8024081C 3C068024 */  lui        $a2, %hi(mgm_02_InitialConfigurations)
+/* E83010 80240820 24C6276C */  addiu      $a2, $a2, %lo(mgm_02_InitialConfigurations)
+/* E83014 80240824 27A50010 */  addiu      $a1, $sp, 0x10
+/* E83018 80240828 00021FC3 */  sra        $v1, $v0, 31
+/* E8301C 8024082C 00004010 */  mfhi       $t0
+/* E83020 80240830 01032023 */  subu       $a0, $t0, $v1
+/* E83024 80240834 00041840 */  sll        $v1, $a0, 1
+/* E83028 80240838 00641821 */  addu       $v1, $v1, $a0
+/* E8302C 8024083C 00432023 */  subu       $a0, $v0, $v1
+/* E83030 80240840 000410C0 */  sll        $v0, $a0, 3
+/* E83034 80240844 00441021 */  addu       $v0, $v0, $a0
+/* E83038 80240848 00021080 */  sll        $v0, $v0, 2
+/* E8303C 8024084C 00441023 */  subu       $v0, $v0, $a0
+/* E83040 80240850 00021880 */  sll        $v1, $v0, 2
+.Lmgm_02_80240854:
+/* E83044 80240854 00661021 */  addu       $v0, $v1, $a2
+/* E83048 80240858 24630004 */  addiu      $v1, $v1, 0x4
+/* E8304C 8024085C 8C420000 */  lw         $v0, 0x0($v0)
+/* E83050 80240860 26100001 */  addiu      $s0, $s0, 0x1
+/* E83054 80240864 ACA20000 */  sw         $v0, 0x0($a1)
+/* E83058 80240868 2A020023 */  slti       $v0, $s0, 0x23
+/* E8305C 8024086C 1440FFF9 */  bnez       $v0, .Lmgm_02_80240854
+/* E83060 80240870 24A50004 */   addiu     $a1, $a1, 0x4
+/* E83064 80240874 0000802D */  daddu      $s0, $zero, $zero
+/* E83068 80240878 3C13EA0E */  lui        $s3, (0xEA0EA0EB >> 16)
+/* E8306C 8024087C 3673A0EB */  ori        $s3, $s3, (0xEA0EA0EB & 0xFFFF)
+/* E83070 80240880 27B20010 */  addiu      $s2, $sp, 0x10
+.Lmgm_02_80240884:
+/* E83074 80240884 0C00A65F */  jal        rand_int
+/* E83078 80240888 240403E8 */   addiu     $a0, $zero, 0x3E8
+/* E8307C 8024088C 00530018 */  mult       $v0, $s3
+/* E83080 80240890 240403E8 */  addiu      $a0, $zero, 0x3E8
+/* E83084 80240894 00022FC3 */  sra        $a1, $v0, 31
+/* E83088 80240898 00004010 */  mfhi       $t0
+/* E8308C 8024089C 01021821 */  addu       $v1, $t0, $v0
+/* E83090 802408A0 00031943 */  sra        $v1, $v1, 5
+/* E83094 802408A4 00658823 */  subu       $s1, $v1, $a1
+/* E83098 802408A8 001118C0 */  sll        $v1, $s1, 3
+/* E8309C 802408AC 00711821 */  addu       $v1, $v1, $s1
+/* E830A0 802408B0 00031880 */  sll        $v1, $v1, 2
+/* E830A4 802408B4 00711823 */  subu       $v1, $v1, $s1
+/* E830A8 802408B8 0C00A65F */  jal        rand_int
+/* E830AC 802408BC 00438823 */   subu      $s1, $v0, $v1
+/* E830B0 802408C0 00530018 */  mult       $v0, $s3
+/* E830B4 802408C4 000227C3 */  sra        $a0, $v0, 31
+/* E830B8 802408C8 00004010 */  mfhi       $t0
+/* E830BC 802408CC 01021821 */  addu       $v1, $t0, $v0
+/* E830C0 802408D0 00031943 */  sra        $v1, $v1, 5
+/* E830C4 802408D4 00642023 */  subu       $a0, $v1, $a0
+/* E830C8 802408D8 000418C0 */  sll        $v1, $a0, 3
+/* E830CC 802408DC 00641821 */  addu       $v1, $v1, $a0
+/* E830D0 802408E0 00031880 */  sll        $v1, $v1, 2
+/* E830D4 802408E4 00641823 */  subu       $v1, $v1, $a0
+/* E830D8 802408E8 00432023 */  subu       $a0, $v0, $v1
+/* E830DC 802408EC 12240009 */  beq        $s1, $a0, .Lmgm_02_80240914
+/* E830E0 802408F0 26100001 */   addiu     $s0, $s0, 0x1
+/* E830E4 802408F4 00041880 */  sll        $v1, $a0, 2
+/* E830E8 802408F8 02431821 */  addu       $v1, $s2, $v1
+/* E830EC 802408FC 00111080 */  sll        $v0, $s1, 2
+/* E830F0 80240900 02421021 */  addu       $v0, $s2, $v0
+/* E830F4 80240904 8C440000 */  lw         $a0, 0x0($v0)
+/* E830F8 80240908 8C650000 */  lw         $a1, 0x0($v1)
+/* E830FC 8024090C AC640000 */  sw         $a0, 0x0($v1)
+/* E83100 80240910 AC450000 */  sw         $a1, 0x0($v0)
+.Lmgm_02_80240914:
+/* E83104 80240914 2A022710 */  slti       $v0, $s0, 0x2710
+/* E83108 80240918 1440FFDA */  bnez       $v0, .Lmgm_02_80240884
+/* E8310C 8024091C 2407FFFF */   addiu     $a3, $zero, -0x1
+/* E83110 80240920 0000802D */  daddu      $s0, $zero, $zero
+/* E83114 80240924 3C068024 */  lui        $a2, %hi(mgm_02_BoxColliderIDs)
+/* E83118 80240928 24C6299C */  addiu      $a2, $a2, %lo(mgm_02_BoxColliderIDs)
+/* E8311C 8024092C 3C058024 */  lui        $a1, %hi(mgm_02_BoxModelIDs)
+/* E83120 80240930 24A52910 */  addiu      $a1, $a1, %lo(mgm_02_BoxModelIDs)
+/* E83124 80240934 27A40010 */  addiu      $a0, $sp, 0x10
+/* E83128 80240938 02A0182D */  daddu      $v1, $s5, $zero
+.Lmgm_02_8024093C:
+/* E8312C 8024093C AC67002C */  sw         $a3, 0x2C($v1)
+/* E83130 80240940 AC600030 */  sw         $zero, 0x30($v1)
+/* E83134 80240944 8C820000 */  lw         $v0, 0x0($a0)
+/* E83138 80240948 24840004 */  addiu      $a0, $a0, 0x4
+/* E8313C 8024094C 26100001 */  addiu      $s0, $s0, 0x1
+/* E83140 80240950 AC620034 */  sw         $v0, 0x34($v1)
+/* E83144 80240954 8CA20000 */  lw         $v0, 0x0($a1)
+/* E83148 80240958 24A50004 */  addiu      $a1, $a1, 0x4
+/* E8314C 8024095C AC620038 */  sw         $v0, 0x38($v1)
+/* E83150 80240960 8CC20000 */  lw         $v0, 0x0($a2)
+/* E83154 80240964 24C60004 */  addiu      $a2, $a2, 0x4
+/* E83158 80240968 AC670040 */  sw         $a3, 0x40($v1)
+/* E8315C 8024096C AC670044 */  sw         $a3, 0x44($v1)
+/* E83160 80240970 AC62003C */  sw         $v0, 0x3C($v1)
+/* E83164 80240974 2A020023 */  slti       $v0, $s0, 0x23
+/* E83168 80240978 1440FFF0 */  bnez       $v0, .Lmgm_02_8024093C
+/* E8316C 8024097C 2463001C */   addiu     $v1, $v1, 0x1C
+/* E83170 80240980 2410000A */  addiu      $s0, $zero, 0xA
+.Lmgm_02_80240984:
+/* E83174 80240984 0C00FC76 */  jal        get_enemy
+/* E83178 80240988 0200202D */   daddu     $a0, $s0, $zero
+/* E8317C 8024098C AC40006C */  sw         $zero, 0x6C($v0)
+/* E83180 80240990 26100001 */  addiu      $s0, $s0, 0x1
+/* E83184 80240994 2A02000F */  slti       $v0, $s0, 0xF
+/* E83188 80240998 1440FFFA */  bnez       $v0, .Lmgm_02_80240984
+/* E8318C 8024099C 00000000 */   nop
+/* E83190 802409A0 2410001E */  addiu      $s0, $zero, 0x1E
+.Lmgm_02_802409A4:
+/* E83194 802409A4 0C00FC76 */  jal        get_enemy
+/* E83198 802409A8 0200202D */   daddu     $a0, $s0, $zero
+/* E8319C 802409AC AC40006C */  sw         $zero, 0x6C($v0)
+/* E831A0 802409B0 26100001 */  addiu      $s0, $s0, 0x1
+/* E831A4 802409B4 2A020023 */  slti       $v0, $s0, 0x23
+/* E831A8 802409B8 1440FFFA */  bnez       $v0, .Lmgm_02_802409A4
+/* E831AC 802409BC 00000000 */   nop
+/* E831B0 802409C0 24100064 */  addiu      $s0, $zero, 0x64
+.Lmgm_02_802409C4:
+/* E831B4 802409C4 0C00FC76 */  jal        get_enemy
+/* E831B8 802409C8 0200202D */   daddu     $a0, $s0, $zero
+/* E831BC 802409CC AC40006C */  sw         $zero, 0x6C($v0)
+/* E831C0 802409D0 26100001 */  addiu      $s0, $s0, 0x1
+/* E831C4 802409D4 2A02006E */  slti       $v0, $s0, 0x6E
+/* E831C8 802409D8 1440FFFA */  bnez       $v0, .Lmgm_02_802409C4
+/* E831CC 802409DC 00000000 */   nop
+/* E831D0 802409E0 24100009 */  addiu      $s0, $zero, 0x9
+/* E831D4 802409E4 3C028025 */  lui        $v0, %hi(D_80248600 + 0x24)
+/* E831D8 802409E8 24428704 */  addiu      $v0, $v0, %lo(D_80248600 + 0x24)
+.Lmgm_02_802409EC:
+/* E831DC 802409EC AC400000 */  sw         $zero, 0x0($v0)
+/* E831E0 802409F0 2610FFFF */  addiu      $s0, $s0, -0x1
+/* E831E4 802409F4 0601FFFD */  bgez       $s0, .Lmgm_02_802409EC
+/* E831E8 802409F8 2442FFFC */   addiu     $v0, $v0, -0x4
+/* E831EC 802409FC 24140001 */  addiu      $s4, $zero, 0x1
+/* E831F0 80240A00 3C168025 */  lui        $s6, %hi(D_80248600)
+/* E831F4 80240A04 26D686E0 */  addiu      $s6, $s6, %lo(D_80248600)
+/* E831F8 80240A08 02A0982D */  daddu      $s3, $s5, $zero
+.Lmgm_02_80240A0C:
+/* E831FC 80240A0C 8E630034 */  lw         $v1, 0x34($s3)
+/* E83200 80240A10 1074001B */  beq        $v1, $s4, .Lmgm_02_80240A80
+/* E83204 80240A14 28620002 */   slti      $v0, $v1, 0x2
+/* E83208 80240A18 10400005 */  beqz       $v0, .Lmgm_02_80240A30
+/* E8320C 80240A1C 24020002 */   addiu     $v0, $zero, 0x2
+/* E83210 80240A20 10600009 */  beqz       $v1, .Lmgm_02_80240A48
+/* E83214 80240A24 2402000A */   addiu     $v0, $zero, 0xA
+/* E83218 80240A28 080902E8 */  j          .Lmgm_02_80240BA0
+/* E8321C 80240A2C 2673001C */   addiu     $s3, $s3, 0x1C
+.Lmgm_02_80240A30:
+/* E83220 80240A30 1062002E */  beq        $v1, $v0, .Lmgm_02_80240AEC
+/* E83224 80240A34 24020003 */   addiu     $v0, $zero, 0x3
+/* E83228 80240A38 10620057 */  beq        $v1, $v0, .Lmgm_02_80240B98
+/* E8322C 80240A3C 24020032 */   addiu     $v0, $zero, 0x32
+/* E83230 80240A40 080902E8 */  j          .Lmgm_02_80240BA0
+/* E83234 80240A44 2673001C */   addiu     $s3, $s3, 0x1C
+.Lmgm_02_80240A48:
+/* E83238 80240A48 AE62002C */  sw         $v0, 0x2C($s3)
+/* E8323C 80240A4C 0040882D */  daddu      $s1, $v0, $zero
+.Lmgm_02_80240A50:
+/* E83240 80240A50 0C00FC76 */  jal        get_enemy
+/* E83244 80240A54 0220202D */   daddu     $a0, $s1, $zero
+/* E83248 80240A58 0040802D */  daddu      $s0, $v0, $zero
+/* E8324C 80240A5C 8E02006C */  lw         $v0, 0x6C($s0)
+/* E83250 80240A60 1040003B */  beqz       $v0, .Lmgm_02_80240B50
+/* E83254 80240A64 00000000 */   nop
+/* E83258 80240A68 26310001 */  addiu      $s1, $s1, 0x1
+/* E8325C 80240A6C 2A22000F */  slti       $v0, $s1, 0xF
+/* E83260 80240A70 1440FFF7 */  bnez       $v0, .Lmgm_02_80240A50
+/* E83264 80240A74 00000000 */   nop
+/* E83268 80240A78 080902E8 */  j          .Lmgm_02_80240BA0
+/* E8326C 80240A7C 2673001C */   addiu     $s3, $s3, 0x1C
+.Lmgm_02_80240A80:
+/* E83270 80240A80 2402001E */  addiu      $v0, $zero, 0x1E
+/* E83274 80240A84 AE62002C */  sw         $v0, 0x2C($s3)
+/* E83278 80240A88 0040882D */  daddu      $s1, $v0, $zero
+.Lmgm_02_80240A8C:
+/* E8327C 80240A8C 0C00FC76 */  jal        get_enemy
+/* E83280 80240A90 0220202D */   daddu     $a0, $s1, $zero
+/* E83284 80240A94 0040802D */  daddu      $s0, $v0, $zero
+/* E83288 80240A98 8E02006C */  lw         $v0, 0x6C($s0)
+/* E8328C 80240A9C 1040002C */  beqz       $v0, .Lmgm_02_80240B50
+/* E83290 80240AA0 00000000 */   nop
+/* E83294 80240AA4 26310001 */  addiu      $s1, $s1, 0x1
+/* E83298 80240AA8 2A220023 */  slti       $v0, $s1, 0x23
+/* E8329C 80240AAC 1440FFF7 */  bnez       $v0, .Lmgm_02_80240A8C
+/* E832A0 80240AB0 00000000 */   nop
+/* E832A4 80240AB4 080902E8 */  j          .Lmgm_02_80240BA0
+/* E832A8 80240AB8 2673001C */   addiu     $s3, $s3, 0x1C
+.Lmgm_02_80240ABC:
+/* E832AC 80240ABC 86040008 */  lh         $a0, 0x8($s0)
+/* E832B0 80240AC0 0C00EBF7 */  jal        get_npc_unsafe
+/* E832B4 80240AC4 00000000 */   nop
+/* E832B8 80240AC8 0040902D */  daddu      $s2, $v0, $zero
+/* E832BC 80240ACC 0040202D */  daddu      $a0, $v0, $zero
+/* E832C0 80240AD0 AE14006C */  sw         $s4, 0x6C($s0)
+/* E832C4 80240AD4 0C00EC3B */  jal        disable_npc_shadow
+/* E832C8 80240AD8 AE710040 */   sw        $s1, 0x40($s3)
+/* E832CC 80240ADC 8E420000 */  lw         $v0, 0x0($s2)
+/* E832D0 80240AE0 34420002 */  ori        $v0, $v0, 0x2
+/* E832D4 80240AE4 080902C8 */  j          .Lmgm_02_80240B20
+/* E832D8 80240AE8 AE420000 */   sw        $v0, 0x0($s2)
+.Lmgm_02_80240AEC:
+/* E832DC 80240AEC 24020046 */  addiu      $v0, $zero, 0x46
+/* E832E0 80240AF0 AE62002C */  sw         $v0, 0x2C($s3)
+/* E832E4 80240AF4 24110064 */  addiu      $s1, $zero, 0x64
+.Lmgm_02_80240AF8:
+/* E832E8 80240AF8 0C00FC76 */  jal        get_enemy
+/* E832EC 80240AFC 0220202D */   daddu     $a0, $s1, $zero
+/* E832F0 80240B00 0040802D */  daddu      $s0, $v0, $zero
+/* E832F4 80240B04 8E02006C */  lw         $v0, 0x6C($s0)
+/* E832F8 80240B08 1040FFEC */  beqz       $v0, .Lmgm_02_80240ABC
+/* E832FC 80240B0C 00000000 */   nop
+/* E83300 80240B10 26310001 */  addiu      $s1, $s1, 0x1
+/* E83304 80240B14 2A22006E */  slti       $v0, $s1, 0x6E
+/* E83308 80240B18 1440FFF7 */  bnez       $v0, .Lmgm_02_80240AF8
+/* E8330C 80240B1C 00000000 */   nop
+.Lmgm_02_80240B20:
+/* E83310 80240B20 0000882D */  daddu      $s1, $zero, $zero
+/* E83314 80240B24 02C0202D */  daddu      $a0, $s6, $zero
+.Lmgm_02_80240B28:
+/* E83318 80240B28 0080182D */  daddu      $v1, $a0, $zero
+/* E8331C 80240B2C 8C620000 */  lw         $v0, 0x0($v1)
+/* E83320 80240B30 10400013 */  beqz       $v0, .Lmgm_02_80240B80
+/* E83324 80240B34 00112880 */   sll       $a1, $s1, 2
+/* E83328 80240B38 26310001 */  addiu      $s1, $s1, 0x1
+/* E8332C 80240B3C 2A22000B */  slti       $v0, $s1, 0xB
+/* E83330 80240B40 1440FFF9 */  bnez       $v0, .Lmgm_02_80240B28
+/* E83334 80240B44 24640004 */   addiu     $a0, $v1, 0x4
+/* E83338 80240B48 080902E8 */  j          .Lmgm_02_80240BA0
+/* E8333C 80240B4C 2673001C */   addiu     $s3, $s3, 0x1C
+.Lmgm_02_80240B50:
+/* E83340 80240B50 86040008 */  lh         $a0, 0x8($s0)
+/* E83344 80240B54 0C00EBF7 */  jal        get_npc_unsafe
+/* E83348 80240B58 00000000 */   nop
+/* E8334C 80240B5C 0040902D */  daddu      $s2, $v0, $zero
+/* E83350 80240B60 0240202D */  daddu      $a0, $s2, $zero
+/* E83354 80240B64 AE14006C */  sw         $s4, 0x6C($s0)
+/* E83358 80240B68 0C00EC3B */  jal        disable_npc_shadow
+/* E8335C 80240B6C AE710040 */   sw        $s1, 0x40($s3)
+/* E83360 80240B70 8E420000 */  lw         $v0, 0x0($s2)
+/* E83364 80240B74 34420002 */  ori        $v0, $v0, 0x2
+/* E83368 80240B78 080902E7 */  j          .Lmgm_02_80240B9C
+/* E8336C 80240B7C AE420000 */   sw        $v0, 0x0($s2)
+.Lmgm_02_80240B80:
+/* E83370 80240B80 AC940000 */  sw         $s4, 0x0($a0)
+/* E83374 80240B84 3C028024 */  lui        $v0, %hi(mgm_02_PanelModelIDs)
+/* E83378 80240B88 00451021 */  addu       $v0, $v0, $a1
+/* E8337C 80240B8C 8C422A28 */  lw         $v0, %lo(mgm_02_PanelModelIDs)($v0)
+/* E83380 80240B90 080902E7 */  j          .Lmgm_02_80240B9C
+/* E83384 80240B94 AE620044 */   sw        $v0, 0x44($s3)
+.Lmgm_02_80240B98:
+/* E83388 80240B98 AE62002C */  sw         $v0, 0x2C($s3)
+.Lmgm_02_80240B9C:
+/* E8338C 80240B9C 2673001C */  addiu      $s3, $s3, 0x1C
+.Lmgm_02_80240BA0:
+/* E83390 80240BA0 26A203D4 */  addiu      $v0, $s5, 0x3D4
+/* E83394 80240BA4 0262102A */  slt        $v0, $s3, $v0
+/* E83398 80240BA8 1440FF98 */  bnez       $v0, .Lmgm_02_80240A0C
+/* E8339C 80240BAC 00000000 */   nop
+/* E833A0 80240BB0 8FBF00BC */  lw         $ra, 0xBC($sp)
+/* E833A4 80240BB4 8FB600B8 */  lw         $s6, 0xB8($sp)
+/* E833A8 80240BB8 8FB500B4 */  lw         $s5, 0xB4($sp)
+/* E833AC 80240BBC 8FB400B0 */  lw         $s4, 0xB0($sp)
+/* E833B0 80240BC0 8FB300AC */  lw         $s3, 0xAC($sp)
+/* E833B4 80240BC4 8FB200A8 */  lw         $s2, 0xA8($sp)
+/* E833B8 80240BC8 8FB100A4 */  lw         $s1, 0xA4($sp)
+/* E833BC 80240BCC 8FB000A0 */  lw         $s0, 0xA0($sp)
+/* E833C0 80240BD0 24020002 */  addiu      $v0, $zero, 0x2
+/* E833C4 80240BD4 03E00008 */  jr         $ra
+/* E833C8 80240BD8 27BD00C0 */   addiu     $sp, $sp, 0xC0

ver/pal/symbol_addrs.txt

@@ -25,3 +25,388 @@ dro_02_card_1_gfx = 0x802479F8; // rom:0x9DCF98
 dro_02_card_2_gfx = 0x80247A78; // rom:0x9DD018
 tst_13_shockwave_vtx = 0x802422B0; // rom:0xB8B900 size:0x5B0
 tst_13_shockwave_gfx = 0x80242860; // rom:0xB8BEB0
+dgb_01_img0_png = 0x80246F70; // rom:0xC706F0
+dgb_01_img0_gfx = 0x80247F70; // rom:0xC716F0
+dgb_01_img1_png = 0x80247FF0; // rom:0xC71770
+dgb_01_img1_gfx = 0x80248FF0; // rom:0xC72770
+dgb_01_img2_png = 0x80249070; // rom:0xC727F0
+dgb_01_img2_gfx = 0x80249870; // rom:0xC72FF0
+dgb_01_img3_png = 0x802498F0; // rom:0xC73070
+dgb_01_img3_gfx = 0x80249CF0; // rom:0xC73470
+dgb_01_img4_png = 0x80249D70; // rom:0xC734F0
+dgb_01_img4_gfx = 0x8024A170; // rom:0xC738F0
+dgb_01_img5_png = 0x8024A1F0; // rom:0xC73970
+dgb_01_img5_gfx = 0x8024A5F0; // rom:0xC73D70
+dgb_01_img6_png = 0x8024A670; // rom:0xC73DF0
+dgb_01_img6_gfx = 0x8024AE70; // rom:0xC745F0
+dgb_01_img7_png = 0x8024AEF0; // rom:0xC74670
+dgb_01_img7_gfx = 0x8024B6F0; // rom:0xC74E70
+vtx_C20F40 = 0x80200000; // rom:0xC8CE40
+vtx_C21100 = 0x802001C0; // rom:0xC8D000
+vtx_C21130 = 0x802001F0; // rom:0xC8D030
+vtx_C211E0 = 0x802002A0; // rom:0xC8D0E0
+vtx_C211F0 = 0x802002B0; // rom:0xC8D0F0
+vtx_C21240 = 0x80200300; // rom:0xC8D140
+vtx_C21360 = 0x80200420; // rom:0xC8D260
+vtx_C213C0 = 0x80200480; // rom:0xC8D2C0
+vtx_C215A0 = 0x80200660; // rom:0xC8D4A0
+vtx_C21700 = 0x802007C0; // rom:0xC8D600
+vtx_C21770 = 0x80200830; // rom:0xC8D670
+vtx_C21810 = 0x802008D0; // rom:0xC8D710
+vtx_C21930 = 0x802009F0; // rom:0xC8D830
+vtx_C21AE0 = 0x80200BA0; // rom:0xC8D9E0
+vtx_C21B20 = 0x80200BE0; // rom:0xC8DA20
+vtx_C21BD0 = 0x80200C90; // rom:0xC8DAD0
+vtx_C21C90 = 0x80200D50; // rom:0xC8DB90
+vtx_C21D30 = 0x80200DF0; // rom:0xC8DC30
+vtx_C21DD0 = 0x80200E90; // rom:0xC8DCD0
+vtx_C21E00 = 0x80200EC0; // rom:0xC8DD00
+vtx_C21F30 = 0x80200FF0; // rom:0xC8DE30
+vtx_C22050 = 0x80201110; // rom:0xC8DF50
+vtx_C22190 = 0x80201250; // rom:0xC8E090
+vtx_C222D0 = 0x80201390; // rom:0xC8E1D0
+vtx_C22330 = 0x802013F0; // rom:0xC8E230
+vtx_C224A0 = 0x80201560; // rom:0xC8E3A0
+vtx_C224E0 = 0x802015A0; // rom:0xC8E3E0
+vtx_C22510 = 0x802015D0; // rom:0xC8E410
+vtx_C22620 = 0x802016E0; // rom:0xC8E520
+vtx_C22780 = 0x80201840; // rom:0xC8E680
+vtx_C22810 = 0x802018D0; // rom:0xC8E710
+vtx_C22870 = 0x80201930; // rom:0xC8E770
+vtx_C228F0 = 0x802019B0; // rom:0xC8E7F0
+vtx_C22950 = 0x80201A10; // rom:0xC8E850
+vtx_C229F0 = 0x80201AB0; // rom:0xC8E8F0
+vtx_C22B00 = 0x80201BC0; // rom:0xC8EA00
+vtx_C22C00 = 0x80201CC0; // rom:0xC8EB00
+vtx_C22E00 = 0x80201EC0; // rom:0xC8ED00
+vtx_C22EC0 = 0x80201F80; // rom:0xC8EDC0
+vtx_C230A0 = 0x80202160; // rom:0xC8EFA0
+vtx_C23240 = 0x80202300; // rom:0xC8F140
+vtx_C23260 = 0x80202320; // rom:0xC8F160
+vtx_C232A0 = 0x80202360; // rom:0xC8F1A0
+vtx_C23330 = 0x802023F0; // rom:0xC8F230
+vtx_C233D0 = 0x80202490; // rom:0xC8F2D0
+vtx_C23480 = 0x80202540; // rom:0xC8F380
+vtx_C234B0 = 0x80202570; // rom:0xC8F3B0
+vtx_C235C0 = 0x80202680; // rom:0xC8F4C0
+vtx_C236E0 = 0x802027A0; // rom:0xC8F5E0
+vtx_C23810 = 0x802028D0; // rom:0xC8F710
+vtx_C238B0 = 0x80202970; // rom:0xC8F7B0
+vtx_C239D0 = 0x80202A90; // rom:0xC8F8D0
+vtx_C23A70 = 0x80202B30; // rom:0xC8F970
+vtx_C23B70 = 0x80202C30; // rom:0xC8FA70
+vtx_C23BA0 = 0x80202C60; // rom:0xC8FAA0
+vtx_C23C70 = 0x80202D30; // rom:0xC8FB70
+vtx_C23C90 = 0x80202D50; // rom:0xC8FB90
+vtx_C23CE0 = 0x80202DA0; // rom:0xC8FBE0
+vtx_C23D20 = 0x80202DE0; // rom:0xC8FC20
+vtx_C23D60 = 0x80202E20; // rom:0xC8FC60
+vtx_C23DD0 = 0x80202E90; // rom:0xC8FCD0
+vtx_C23E00 = 0x80202EC0; // rom:0xC8FD00
+vtx_C23E20 = 0x80202EE0; // rom:0xC8FD20
+vtx_C23E50 = 0x80202F10; // rom:0xC8FD50
+vtx_C23F10 = 0x80202FD0; // rom:0xC8FE10
+vtx_C23FD0 = 0x80203090; // rom:0xC8FED0
+vtx_C240D0 = 0x80203190; // rom:0xC8FFD0
+vtx_C241D0 = 0x80203290; // rom:0xC900D0
+vtx_C24350 = 0x80203410; // rom:0xC90250
+vtx_C24510 = 0x802035D0; // rom:0xC90410
+vtx_C24540 = 0x80203600; // rom:0xC90440
+vtx_C24600 = 0x802036C0; // rom:0xC90500
+vtx_C24690 = 0x80203750; // rom:0xC90590
+vtx_C24720 = 0x802037E0; // rom:0xC90620
+vtx_C24730 = 0x802037F0; // rom:0xC90630
+vtx_C24840 = 0x80203900; // rom:0xC90740
+vtx_C24960 = 0x80203A20; // rom:0xC90860
+vtx_C24980 = 0x80203A40; // rom:0xC90880
+vtx_C24AD0 = 0x80203B90; // rom:0xC909D0
+vtx_C24AF0 = 0x80203BB0; // rom:0xC909F0
+vtx_C24CD0 = 0x80203D90; // rom:0xC90BD0
+vtx_C24EB0 = 0x80203F70; // rom:0xC90DB0
+vtx_C24F30 = 0x80203FF0; // rom:0xC90E30
+vtx_C24FB0 = 0x80204070; // rom:0xC90EB0
+vtx_C25050 = 0x80204110; // rom:0xC90F50
+vtx_C25250 = 0x80204310; // rom:0xC91150
+vtx_C25310 = 0x802043D0; // rom:0xC91210
+vtx_C25350 = 0x80204410; // rom:0xC91250
+vtx_C25500 = 0x802045C0; // rom:0xC91400
+vtx_C25600 = 0x802046C0; // rom:0xC91500
+vtx_C256D0 = 0x80204790; // rom:0xC915D0
+vtx_C25710 = 0x802047D0; // rom:0xC91610
+vtx_C257D0 = 0x80204890; // rom:0xC916D0
+vtx_C257F0 = 0x802048B0; // rom:0xC916F0
+vtx_C25900 = 0x802049C0; // rom:0xC91800
+vtx_C25950 = 0x80204A10; // rom:0xC91850
+vtx_C25A30 = 0x80204AF0; // rom:0xC91930
+vtx_C25AB0 = 0x80204B70; // rom:0xC919B0
+vtx_C25B30 = 0x80204BF0; // rom:0xC91A30
+vtx_C25BD0 = 0x80204C90; // rom:0xC91AD0
+vtx_C25C00 = 0x80204CC0; // rom:0xC91B00
+vtx_C25C20 = 0x80204CE0; // rom:0xC91B20
+vtx_C25C80 = 0x80204D40; // rom:0xC91B80
+vtx_C25CF0 = 0x80204DB0; // rom:0xC91BF0
+vtx_C25D30 = 0x80204DF0; // rom:0xC91C30
+vtx_C25DA0 = 0x80204E60; // rom:0xC91CA0
+vtx_C25DD0 = 0x80204E90; // rom:0xC91CD0
+vtx_C25EA0 = 0x80204F60; // rom:0xC91DA0
+vtx_C25F00 = 0x80204FC0; // rom:0xC91E00
+vtx_C25F90 = 0x80205050; // rom:0xC91E90
+vtx_C26040 = 0x80205100; // rom:0xC91F40
+vtx_C26090 = 0x80205150; // rom:0xC91F90
+vtx_C26130 = 0x802051F0; // rom:0xC92030
+vtx_C26250 = 0x80205310; // rom:0xC92150
+vtx_C26290 = 0x80205350; // rom:0xC92190
+vtx_C262D0 = 0x80205390; // rom:0xC921D0
+vtx_C26310 = 0x802053D0; // rom:0xC92210
+vtx_C26350 = 0x80205410; // rom:0xC92250
+vtx_C26390 = 0x80205450; // rom:0xC92290
+vtx_C263D0 = 0x80205490; // rom:0xC922D0
+vtx_C26410 = 0x802054D0; // rom:0xC92310
+vtx_C26450 = 0x80205510; // rom:0xC92350
+vtx_C26490 = 0x80205550; // rom:0xC92390
+vtx_C264D0 = 0x80205590; // rom:0xC923D0
+vtx_C26510 = 0x802055D0; // rom:0xC92410
+vtx_C26550 = 0x80205610; // rom:0xC92450
+vtx_C26590 = 0x80205650; // rom:0xC92490
+vtx_C265D0 = 0x80205690; // rom:0xC924D0
+vtx_C26610 = 0x802056D0; // rom:0xC92510
+vtx_C26650 = 0x80205710; // rom:0xC92550
+vtx_C26690 = 0x80205750; // rom:0xC92590
+vtx_C266D0 = 0x80205790; // rom:0xC925D0
+vtx_C26710 = 0x802057D0; // rom:0xC92610
+vtx_C26750 = 0x80205810; // rom:0xC92650
+vtx_C26890 = 0x80205950; // rom:0xC92790
+vtx_C26A60 = 0x80205B20; // rom:0xC92960
+vtx_C26AE0 = 0x80205BA0; // rom:0xC929E0
+vtx_C26CC0 = 0x80205D80; // rom:0xC92BC0
+vtx_C26EB0 = 0x80205F70; // rom:0xC92DB0
+vtx_C26F40 = 0x80206000; // rom:0xC92E40
+vtx_C26FB0 = 0x80206070; // rom:0xC92EB0
+vtx_C27110 = 0x802061D0; // rom:0xC93010
+vtx_C27180 = 0x80206240; // rom:0xC93080
+vtx_C27220 = 0x802062E0; // rom:0xC93120
+vtx_C27300 = 0x802063C0; // rom:0xC93200
+vtx_C273A0 = 0x80206460; // rom:0xC932A0
+vtx_C27460 = 0x80206520; // rom:0xC93360
+vtx_C27580 = 0x80206640; // rom:0xC93480
+vtx_C27740 = 0x80206800; // rom:0xC93640
+vtx_C27770 = 0x80206830; // rom:0xC93670
+vtx_C27880 = 0x80206940; // rom:0xC93780
+vtx_C27A40 = 0x80206B00; // rom:0xC93940
+vtx_C27A70 = 0x80206B30; // rom:0xC93970
+vtx_C27B80 = 0x80206C40; // rom:0xC93A80
+vtx_C27D60 = 0x80206E20; // rom:0xC93C60
+vtx_C27F20 = 0x80206FE0; // rom:0xC93E20
+vtx_C27FC0 = 0x80207080; // rom:0xC93EC0
+vtx_C27FE0 = 0x802070A0; // rom:0xC93EE0
+vtx_C28080 = 0x80207140; // rom:0xC93F80
+vtx_C28110 = 0x802071D0; // rom:0xC94010
+vtx_C28190 = 0x80207250; // rom:0xC94090
+vtx_C281B0 = 0x80207270; // rom:0xC940B0
+vtx_C281E0 = 0x802072A0; // rom:0xC940E0
+vtx_C282D0 = 0x80207390; // rom:0xC941D0
+vtx_C282F0 = 0x802073B0; // rom:0xC941F0
+vtx_C28310 = 0x802073D0; // rom:0xC94210
+vtx_C28420 = 0x802074E0; // rom:0xC94320
+vtx_C284F0 = 0x802075B0; // rom:0xC943F0
+vtx_C28550 = 0x80207610; // rom:0xC94450
+vtx_C28690 = 0x80207750; // rom:0xC94590
+vtx_C28720 = 0x802077E0; // rom:0xC94620
+vtx_C287A0 = 0x80207860; // rom:0xC946A0
+vtx_C28890 = 0x80207950; // rom:0xC94790
+vtx_C28970 = 0x80207A30; // rom:0xC94870
+vtx_C28A70 = 0x80207B30; // rom:0xC94970
+vtx_C28BB0 = 0x80207C70; // rom:0xC94AB0
+vtx_C28D90 = 0x80207E50; // rom:0xC94C90
+vtx_C28F70 = 0x80208030; // rom:0xC94E70
+vtx_C29150 = 0x80208210; // rom:0xC95050
+vtx_C29330 = 0x802083F0; // rom:0xC95230
+vtx_C29470 = 0x80208530; // rom:0xC95370
+vtx_C294A0 = 0x80208560; // rom:0xC953A0
+vtx_C294F0 = 0x802085B0; // rom:0xC953F0
+vtx_C29540 = 0x80208600; // rom:0xC95440
+vtx_C29570 = 0x80208630; // rom:0xC95470
+vtx_C295B0 = 0x80208670; // rom:0xC954B0
+vtx_C29630 = 0x802086F0; // rom:0xC95530
+vtx_C29650 = 0x80208710; // rom:0xC95550
+vtx_C296C0 = 0x80208780; // rom:0xC955C0
+vtx_C29750 = 0x80208810; // rom:0xC95650
+vtx_C297F0 = 0x802088B0; // rom:0xC956F0
+vtx_C298E0 = 0x802089A0; // rom:0xC957E0
+vtx_C29A40 = 0x80208B00; // rom:0xC95940
+vtx_C29AB0 = 0x80208B70; // rom:0xC959B0
+vtx_C29BB0 = 0x80208C70; // rom:0xC95AB0
+vtx_C29CD0 = 0x80208D90; // rom:0xC95BD0
+vtx_C29E00 = 0x80208EC0; // rom:0xC95D00
+vtx_C29F50 = 0x80209010; // rom:0xC95E50
+vtx_C2A080 = 0x80209140; // rom:0xC95F80
+vtx_C2A180 = 0x80209240; // rom:0xC96080
+vtx_C2A2C0 = 0x80209380; // rom:0xC961C0
+vtx_C2A3C0 = 0x80209480; // rom:0xC962C0
+vtx_C2A540 = 0x80209600; // rom:0xC96440
+vtx_C2A700 = 0x802097C0; // rom:0xC96600
+vtx_C2A740 = 0x80209800; // rom:0xC96640
+vtx_C2A790 = 0x80209850; // rom:0xC96690
+vtx_C2A8D0 = 0x80209990; // rom:0xC967D0
+vtx_C2AAB0 = 0x80209B70; // rom:0xC969B0
+vtx_C2AC90 = 0x80209D50; // rom:0xC96B90
+vtx_C2AD20 = 0x80209DE0; // rom:0xC96C20
+vtx_C2AD70 = 0x80209E30; // rom:0xC96C70
+vtx_C2AE50 = 0x80209F10; // rom:0xC96D50
+vtx_C2AE70 = 0x80209F30; // rom:0xC96D70
+vtx_C2AEB0 = 0x80209F70; // rom:0xC96DB0
+vtx_C2AF60 = 0x8020A020; // rom:0xC96E60
+vtx_C2AF80 = 0x8020A040; // rom:0xC96E80
+vtx_C2B010 = 0x8020A0D0; // rom:0xC96F10
+vtx_C2B050 = 0x8020A110; // rom:0xC96F50
+vtx_C2B220 = 0x8020A2E0; // rom:0xC97120
+vtx_C2B250 = 0x8020A310; // rom:0xC97150
+vtx_C2B2D0 = 0x8020A390; // rom:0xC971D0
+vtx_C2B340 = 0x8020A400; // rom:0xC97240
+vtx_C2B3C0 = 0x8020A480; // rom:0xC972C0
+vtx_C2B3E0 = 0x8020A4A0; // rom:0xC972E0
+vtx_C2B410 = 0x8020A4D0; // rom:0xC97310
+vtx_C2B560 = 0x8020A620; // rom:0xC97460
+vtx_C2B6D0 = 0x8020A790; // rom:0xC975D0
+vtx_C2B800 = 0x8020A8C0; // rom:0xC97700
+vtx_C2B850 = 0x8020A910; // rom:0xC97750
+vtx_C2B8E0 = 0x8020A9A0; // rom:0xC977E0
+vtx_C2B9B0 = 0x8020AA70; // rom:0xC978B0
+vtx_C2BA50 = 0x8020AB10; // rom:0xC97950
+vtx_C2BB50 = 0x8020AC10; // rom:0xC97A50
+vtx_C2BD50 = 0x8020AE10; // rom:0xC97C50
+vtx_C2BE50 = 0x8020AF10; // rom:0xC97D50
+vtx_C2BF50 = 0x8020B010; // rom:0xC97E50
+vtx_C2BF60 = 0x8020B020; // rom:0xC97E60
+vtx_C2BFD0 = 0x8020B090; // rom:0xC97ED0
+vtx_C2C080 = 0x8020B140; // rom:0xC97F80
+vtx_C2C0B0 = 0x8020B170; // rom:0xC97FB0
+vtx_C2C0F0 = 0x8020B1B0; // rom:0xC97FF0
+vtx_C2C130 = 0x8020B1F0; // rom:0xC98030
+vtx_C2C1C0 = 0x8020B280; // rom:0xC980C0
+vtx_C2C300 = 0x8020B3C0; // rom:0xC98200
+vtx_C2C4E0 = 0x8020B5A0; // rom:0xC983E0
+vtx_C2C6C0 = 0x8020B780; // rom:0xC985C0
+vtx_C2C8A0 = 0x8020B960; // rom:0xC987A0
+vtx_C2CA20 = 0x8020BAE0; // rom:0xC98920
+vtx_C2CBA0 = 0x8020BC60; // rom:0xC98AA0
+vtx_C2CD20 = 0x8020BDE0; // rom:0xC98C20
+vtx_C2CEA0 = 0x8020BF60; // rom:0xC98DA0
+vtx_C2CED0 = 0x8020BF90; // rom:0xC98DD0
+vtx_C2CF00 = 0x8020BFC0; // rom:0xC98E00
+vtx_C2CFC0 = 0x8020C080; // rom:0xC98EC0
+vtx_C2D140 = 0x8020C200; // rom:0xC99040
+vtx_C2D170 = 0x8020C230; // rom:0xC99070
+vtx_C2D1A0 = 0x8020C260; // rom:0xC990A0
+vtx_C2D260 = 0x8020C320; // rom:0xC99160
+vtx_C2D3E0 = 0x8020C4A0; // rom:0xC992E0
+vtx_C2D410 = 0x8020C4D0; // rom:0xC99310
+vtx_C2D440 = 0x8020C500; // rom:0xC99340
+vtx_C2D500 = 0x8020C5C0; // rom:0xC99400
+vtx_C2D560 = 0x8020C620; // rom:0xC99460
+vtx_C2D5C0 = 0x8020C680; // rom:0xC994C0
+vtx_C2D620 = 0x8020C6E0; // rom:0xC99520
+vtx_C2D660 = 0x8020C720; // rom:0xC99560
+vtx_C2D6A0 = 0x8020C760; // rom:0xC995A0
+vtx_C2D6E0 = 0x8020C7A0; // rom:0xC995E0
+vtx_C2D830 = 0x8020C8F0; // rom:0xC99730
+vtx_C2D8F0 = 0x8020C9B0; // rom:0xC997F0
+vtx_C2DA20 = 0x8020CAE0; // rom:0xC99920
+vtx_C2DBE0 = 0x8020CCA0; // rom:0xC99AE0
+vtx_C2DCB0 = 0x8020CD70; // rom:0xC99BB0
+vtx_C2DD50 = 0x8020CE10; // rom:0xC99C50
+vtx_C2DD90 = 0x8020CE50; // rom:0xC99C90
+vtx_C2DEA0 = 0x8020CF60; // rom:0xC99DA0
+vtx_C2DFC0 = 0x8020D080; // rom:0xC99EC0
+vtx_C2E020 = 0x8020D0E0; // rom:0xC99F20
+vtx_C2E1E0 = 0x8020D2A0; // rom:0xC9A0E0
+vtx_C2E2B0 = 0x8020D370; // rom:0xC9A1B0
+vtx_C2E360 = 0x8020D420; // rom:0xC9A260
+vtx_C2E390 = 0x8020D450; // rom:0xC9A290
+vtx_C2E4A0 = 0x8020D560; // rom:0xC9A3A0
+vtx_C2E5D0 = 0x8020D690; // rom:0xC9A4D0
+vtx_C2E620 = 0x8020D6E0; // rom:0xC9A520
+vtx_C2E7B0 = 0x8020D870; // rom:0xC9A6B0
+vtx_C2E800 = 0x8020D8C0; // rom:0xC9A700
+vtx_C2E8C0 = 0x8020D980; // rom:0xC9A7C0
+vtx_C2E980 = 0x8020DA40; // rom:0xC9A880
+vtx_C2EA60 = 0x8020DB20; // rom:0xC9A960
+kzn_19_lava_piranha_vine_img = 0x802434D8; // rom:0xCFCFA8
+kzn_19_lava_piranha_vine_pal = 0x802438D8; // rom:0xCFD3A8
+kzn_19_lava_piranha_vine_gfx = 0x80243AD8; // rom:0xCFD5A8
+sam_05_monstar_png = 0x80242770; // rom:0xD86F00
+D_80242970 = 0x80242970; // rom:0xD87100
+D_80242B70 = 0x80242B70; // rom:0xD87300
+D_80242D70 = 0x80242D70; // rom:0xD87500
+sam_05_monstar_pal = 0x80242F70; // rom:0xD87700
+sam_05_monstar_gfx = 0x80246FA0; // rom:0xD8B730
+sam_05_monstar_vtx = 0x802470B0; // rom:0xD8B840 size:0x420
+pra_31_texture_1_img = 0x80243510; // rom:0xDEE260
+pra_31_texture_1_pal = 0x80243D10; // rom:0xDEEA60
+pra_31_texture_1_gfx = 0x80243D30; // rom:0xDEEA80
+pra_31_texture_2_img = 0x80243DF0; // rom:0xDEEB40
+pra_31_texture_2_pal = 0x802445F0; // rom:0xDEF340
+pra_31_texture_2_gfx = 0x80244610; // rom:0xDEF360
+pra_31_texture_3_img = 0x802446C0; // rom:0xDEF410
+pra_31_texture_3_gfx = 0x80244EC0; // rom:0xDEFC10
+pra_31_unk_01_gfx = 0x80244F50; // rom:0xDEFCA0
+pra_31_unk_02_gfx = 0x80244FC8; // rom:0xDEFD18
+pra_31_unk_03_gfx = 0x80245000; // rom:0xDEFD50
+pra_31_unk_04_gfx = 0x80245068; // rom:0xDEFDB8
+pra_31_unk_05_gfx = 0x802450A0; // rom:0xDEFDF0
+pra_31_unk_06_gfx = 0x80245118; // rom:0xDEFE68
+pra_31_unk_07_gfx = 0x80245150; // rom:0xDEFEA0
+pra_31_unk_08_gfx = 0x802451C8; // rom:0xDEFF18
+pra_31_unk_09_gfx = 0x80245200; // rom:0xDEFF50
+pra_31_unk_10_gfx = 0x80245268; // rom:0xDEFFB8
+pra_31_unk_11_gfx = 0x802452A0; // rom:0xDEFFF0
+pra_31_unk_12_gfx = 0x80245318; // rom:0xDF0068
+pra_31_unk_13_gfx = 0x80245350; // rom:0xDF00A0
+pra_31_unk_14_gfx = 0x802453C8; // rom:0xDF0118
+pra_31_unk_15_gfx = 0x80245400; // rom:0xDF0150
+pra_31_unk_16_gfx = 0x80245468; // rom:0xDF01B8
+pra_31_unk_17_gfx = 0x802454A0; // rom:0xDF01F0
+pra_31_unk_18_gfx = 0x80245518; // rom:0xDF0268
+pra_31_unk_19_gfx = 0x80245550; // rom:0xDF02A0
+pra_31_unk_20_gfx = 0x802455C8; // rom:0xDF0318
+pra_31_unk_21_gfx = 0x80245600; // rom:0xDF0350
+pra_31_unk_22_gfx = 0x80245668; // rom:0xDF03B8
+pra_31_unk_23_gfx = 0x802456A0; // rom:0xDF03F0
+pra_31_unk_24_gfx = 0x80245718; // rom:0xDF0468
+pra_31_unk_25_gfx = 0x80245750; // rom:0xDF04A0
+pra_31_unk_26_gfx = 0x802457C8; // rom:0xDF0518
+pra_31_unk_27_gfx = 0x80245800; // rom:0xDF0550
+pra_31_unk_28_gfx = 0x80245868; // rom:0xDF05B8
+pra_31_unk_29_gfx = 0x802458C8; // rom:0xDF0618
+pra_31_unk_30_gfx = 0x80245930; // rom:0xDF0680
+pra_31_unk_31_gfx = 0x80245978; // rom:0xDF06C8
+pra_31_unk_32_gfx = 0x80245A08; // rom:0xDF0758
+pra_31_unk_33_gfx = 0x80245A30; // rom:0xDF0780
+pra_31_unk_34_gfx = 0x80245A58; // rom:0xDF07A8
+pra_31_stairs_lights = 0x80247720; // rom:0xDF2470
+pra_31_unk_30_mtx = 0x80247740; // rom:0xDF2490
+pra_31_unk_26_mtx = 0x80247780; // rom:0xDF24D0
+pra_31_unk_24_mtx = 0x802477C0; // rom:0xDF2510
+pra_31_unk_22_mtx = 0x80247800; // rom:0xDF2550
+pra_31_unk_20_mtx = 0x80247840; // rom:0xDF2590
+pra_31_unk_18_mtx = 0x80247880; // rom:0xDF25D0
+pra_31_unk_16_mtx = 0x802478C0; // rom:0xDF2610
+pra_31_unk_14_mtx = 0x80247900; // rom:0xDF2650
+pra_31_unk_12_mtx = 0x80247940; // rom:0xDF2690
+pra_31_unk_10_mtx = 0x80247980; // rom:0xDF26D0
+pra_31_unk_08_mtx = 0x802479C0; // rom:0xDF2710
+pra_31_unk_06_mtx = 0x80247A00; // rom:0xDF2750
+pra_31_unk_04_mtx = 0x80247A40; // rom:0xDF2790
+pra_31_unk_02_mtx = 0x80247A80; // rom:0xDF27D0
+pra_31_stairs_vtx = 0x80247AC0; // rom:0xDF2810
+pra_31_stairs_vtx = 0x80247AC0; // rom:0xDF2810 size:0x1D0
+mgm_01_panel_1_coin_img = 0x80242D20; // rom:0xE81EB0
+mgm_01_panel_1_coin_pal = 0x80242F20; // rom:0xE820B0
+mgm_01_panel_5_coins_img = 0x80242F40; // rom:0xE820D0
+mgm_01_panel_5_coins_pal = 0x80243140; // rom:0xE822D0
+mgm_01_panel_times_5_img = 0x80243160; // rom:0xE822F0
+mgm_01_panel_times_5_pal = 0x80243360; // rom:0xE824F0
+mgm_01_panel_bowser_img = 0x80243380; // rom:0xE82510
+mgm_01_panel_bowser_pal = 0x80243580; // rom:0xE82710
+mgm_02_panel_peach_img = 0x80248380; // rom:0xE8AB70
+mgm_02_panel_peach_pal = 0x80248580; // rom:0xE8AD70

ver/pal/undefined_syms.txt

@@ -2,6 +2,8 @@ Entity_ScriptSpring_AnimLaunch = 0x1E4;
 Entity_SimpleSpring_AnimLaunch = 0x1E4;
 get_time_freeze_mode = 0x80027110;
 start_rumble = 0x80028E88;
+_heap_malloc = 0x80028FEC;
+_heap_free = 0x8002919C;
 cosine = 0x80029354;
 transform_point = 0x800295A0;
 copy_matrix = 0x800296A0;
@@ -22,6 +24,7 @@ sin_deg = 0x8002A26C;
 cos_deg = 0x8002A2D0;
 update_lerp = 0x8002A334;
 startup_draw_prim_rect_COPY = 0x8002AA44;
+general_heap_create = 0x8002AB80;
 general_heap_malloc = 0x8002ABA8;
 general_heap_free = 0x8002ABF8;
 heap_malloc = 0x8002AC64;
@@ -29,13 +32,20 @@ heap_free = 0x8002ACAC;
 fio_save_game = 0x8002B41C;
 set_curtain_scale_goal = 0x8002C1EC;
 set_curtain_draw_callback = 0x8002C214;
+set_curtain_fade = 0x8002C234;
+create_cameras_a = 0x8002E214;
 get_screen_coords = 0x8002E858;
 set_game_mode = 0x80033810;
+intro_logos_set_fade_alpha = 0x80033B10;
+intro_logos_set_fade_color = 0x80033B20;
 set_map_change_fade_rate = 0x80035CF0;
 state_init_intro = 0x80036550;
+clear_npcs = 0x800389AC;
 create_basic_npc = 0x80038D34;
+create_standard_npc = 0x80038D54;
 free_npc = 0x80038EBC;
 get_npc_by_index = 0x80038FCC;
+npc_get_render_yaw = 0x8003A294;
 npc_move_heading = 0x8003AF44;
 get_npc_unsafe = 0x8003AFDC;
 get_npc_safe = 0x8003B038;
@@ -49,11 +59,13 @@ npc_set_palswap_2 = 0x8003B954;
 func_8003D624 = 0x8003DB14;
 spawn_surface_effects = 0x8003DB50;
 spawn_surface_effects = 0x8003DB50;
+init_encounter_status = 0x8003E828;
 kill_enemy = 0x8003EC9C;
 get_enemy = 0x8003F1D8;
 get_enemy_safe = 0x8003F258;
 SetEncounterStatusFlags = 0x80044670;
 IsStartingConversation = 0x800446E0;
+func_80044238 = 0x80044728;
 MakeNpcs = 0x80044788;
 RemoveNpc = 0x80044830;
 RemoveEncounter = 0x80044968;
@@ -87,6 +99,7 @@ SetEnemyFlagBits = 0x80045B78;
 GetSelfAnimationFromTable = 0x80045C24;
 SetOwnerInstigatorValue = 0x80045CB4;
 SetBattleAsScripted = 0x80045CE8;
+GetEncounterTriggerHitTier = 0x80045CFC;
 func_80045838 = 0x80045D28;
 func_800458CC = 0x80045DBC;
 OnPlayerFled = 0x80045DF0;
@@ -107,6 +120,7 @@ basic_ai_chase = 0x8004A704;
 basic_ai_lose_player = 0x8004A9C8;
 BasicAI_Main = 0x8004AA5C;
 basic_ai_suspend = 0x8004AD1C;
+ai_check_fwd_collisions = 0x8004AD64;
 snd_start_sound = 0x800557C0;
 snd_load_ambient = 0x80055A28;
 snd_ambient_stop_slow = 0x80055AC8;
@@ -118,10 +132,12 @@ snd_ambient_80055760 = 0x80055D40;
 snd_ambient_stop_all = 0x80055DAC;
 snd_ambient_play_only = 0x80055E28;
 snd_song_set_playback_rate = 0x80056318;
+clear_effect_data = 0x8005A27C;
 remove_effect = 0x8005AA30;
 get_current_map_settings = 0x8005B308;
 get_map_IDs_by_name = 0x8005B318;
 load_asset_by_name = 0x8005B408;
+initialize_collision = 0x8005B6B4;
 update_collider_transform = 0x8005C144;
 update_collider_transform = 0x8005C144;
 get_collider_center = 0x8005C530;
@@ -131,6 +147,7 @@ npc_follow_npc = 0x8005E84C;
 osVirtualToPhysical = 0x80062D00;
 sqrtf = 0x80062D60;
 guLookAtHiliteF = 0x80063730;
+guOrtho = 0x800648B0;
 guPositionF = 0x80064D80;
 guPosition = 0x80064F58;
 sins = 0x80065460;
@@ -142,11 +159,14 @@ guScale = 0x80068580;
 guScaleF = 0x80068640;
 guTranslate = 0x800686A0;
 guTranslateF = 0x80068780;
+guMtxXFMF = 0x800688F0;
 guRotateF = 0x800689A0;
 guRotate = 0x80068B00;
 decode_yay0 = 0x8006FD90;
+reset_battle_status = 0x8006FE40;
 gGameStatusPtr = 0x800714AC;
 gMatrixListPos = 0x80071500;
+gCurrentDisplayContextIndex = 0x80071504;
 gCurrentCameraID = 0x80073730;
 D_800779B0 = 0x80073D00;
 EnemyNpcHit = 0x80074310;
@@ -170,6 +190,7 @@ nuGfxCfb_ptr = 0x80096A24;
 gOverrideFlags = 0x80096A28;
 gMainGfxPos = 0x80096A44;
 gDisplayContext = 0x80096A4C;
+wMapTexName = 0x800AF3B8;
 gCurrentEncounter = 0x800AF5E0;
 gCameras = 0x800B0460;
 wMapHitName = 0x800D5938;
@@ -179,12 +200,23 @@ npc_raycast_down_around = 0x800D8EE8;
 npc_raycast_down_sides = 0x800D92EC;
 npc_test_move_taller_with_slipping = 0x800DA254;
 npc_test_move_simple_with_slipping = 0x800DA3B4;
+npc_test_move_simple_without_slipping = 0x800DA45C;
+player_raycast_below_cam_relative = 0x800DABDC;
+clear_player_status = 0x800DC3C0;
+suggest_player_anim_allow_backward = 0x800DC66C;
 get_xz_dist_to_player = 0x800DC7F8;
+disable_player_input = 0x800DC8E8;
+enable_player_input = 0x800DC914;
+player_fall_distance = 0x800DFC48;
+player_check_collision_below = 0x800DFC84;
+phys_get_spin_history = 0x800E20A8;
 set_action_state = 0x800E2514;
 peach_force_disguise_action = 0x800E2B14;
+clear_player_data = 0x800E3B10;
 get_player_data = 0x800E3CD4;
 get_item_count = 0x800E3D5C;
 get_item_empty_count = 0x800E3D90;
+find_item = 0x800E3DB4;
 enforce_hpfp_limits = 0x800E3FDC;
 hide_coin_counter_immediately = 0x800E5F20;
 ShowCoinCounter = 0x800E5F50;
@@ -194,10 +226,13 @@ status_menu_ignore_changes = 0x800E60EC;
 status_menu_respond_to_changes = 0x800E611C;
 func_800E98EC = 0x800E6144;
 func_800E9900 = 0x800E6158;
+decrement_status_menu_disabled = 0x800E6388;
 increment_status_menu_disabled = 0x800E63AC;
 sync_status_menu = 0x800E63C4;
+add_coins = 0x800E6918;
 increment_max_SP = 0x800E6A0C;
 set_max_SP = 0x800E6A30;
+subtract_hp = 0x800E6B8C;
 switch_to_partner = 0x800E79B8;
 func_800EB2A4 = 0x800E7AF4;
 partner_get_ride_script = 0x800E7E88;
@@ -209,6 +244,8 @@ partner_reset_tether_distance = 0x800EBBF4;
 partner_set_goal_pos = 0x800EBC10;
 func_800EF3D4 = 0x800EBC24;
 partner_clear_player_tracking = 0x800EBCAC;
+partner_enable_input = 0x800EBE50;
+partner_disable_input = 0x800EBE78;
 hide_popup_menu = 0x800EDC00;
 destroy_popup_menu = 0x800EDD88;
 create_standard_popup_menu = 0x800F1270;
@@ -216,6 +253,7 @@ draw_box = 0x800F1710;
 gPlayerStatusPtr = 0x800F3F60;
 wPartnerHudScripts = 0x800F4330;
 wDisabledPartnerHudScripts = 0x800F4370;
+HES_StatusCoin = 0x80106D58;
 HES_BlueMeter = 0x801076A4;
 HES_AButton = 0x801076D0;
 HES_MashAButton = 0x80107728;
@@ -230,6 +268,9 @@ gPlayerData = 0x8010DD90;
 exec_entity_commandlist = 0x8010E868;
 get_entity_by_index = 0x8010F0E8;
 get_shadow_by_index = 0x8010F104;
+delete_entity = 0x8010F1D0;
+clear_entity_data = 0x8010F7B8;
+create_entity = 0x801103C4;
 MakeEntity = 0x80110838;
 SetEntityCullMode = 0x8011099C;
 UseDynamicShadow = 0x80110A2C;
@@ -243,11 +284,14 @@ create_shadow_type = 0x80110D60;
 delete_shadow = 0x80110E28;
 entity_raycast_down = 0x801110E8;
 set_standard_shadow_scale = 0x8011135C;
+clear_model_data = 0x80114844;
 get_model_from_list_index = 0x80119830;
 get_model_list_index_from_tree_index = 0x80119B10;
+get_model_center_and_size = 0x80119BEC;
 set_model_group_visibility = 0x8011A2C0;
 func_8011B950 = 0x8011A450;
 enable_world_fog = 0x8011A650;
+disable_world_fog = 0x8011A664;
 set_world_fog_dist = 0x8011A674;
 set_world_fog_color = 0x8011A688;
 set_main_pan_u = 0x8011A71C;
@@ -258,6 +302,7 @@ set_mdl_custom_gfx_set = 0x8011A77C;
 set_background_color_blend = 0x8011A95C;
 get_background_color_blend = 0x8011A980;
 set_model_fog_color_parameters = 0x8011A9B4;
+get_model_fog_color_parameters = 0x8011AA14;
 set_model_env_color_parameters = 0x8011AA98;
 get_model_env_color_parameters = 0x8011AAD4;
 mdl_get_copied_vertices = 0x8011ADB0;
@@ -266,27 +311,39 @@ mdl_project_tex_coords = 0x8011AE2C;
 mdl_draw_hidden_panel_surface = 0x8011C22C;
 mdl_get_next_texture_address = 0x8011C2E4;
 mdl_set_all_fog_mode = 0x8011C32C;
+clear_render_tasks = 0x8011C390;
 queue_render_task = 0x8011C410;
+clear_animator_list = 0x8011CD24;
 update_model_animator = 0x8011D3BC;
 render_animated_model = 0x8011DE04;
 play_model_animation = 0x8011EC48;
+clear_entity_models = 0x8011F6B0;
 get_entity_model = 0x801218DC;
 enable_entity_fog = 0x80121AEC;
 set_entity_fog_dist = 0x80121B10;
 set_entity_fog_color = 0x80121B28;
+clear_worker_list = 0x80121BB8;
 create_worker_world = 0x80121C58;
 create_worker_frontUI = 0x80121D3C;
 free_worker = 0x801220C0;
 get_worker = 0x8012213C;
+clear_printers = 0x80122174;
+load_font = 0x80122234;
+dma_load_msg = 0x80124314;
 set_message_images = 0x8012464C;
 set_message_msg = 0x8012465C;
+set_message_value = 0x80124708;
+msg_get_print_char_width = 0x801247A4;
+get_msg_properties = 0x80124A88;
 get_msg_width = 0x80124F94;
 get_msg_lines = 0x80124FD0;
 draw_msg = 0x8012500C;
 draw_number = 0x801261BC;
 msg_draw_frame = 0x8012C6F8;
+msg_get_glyph = 0x8012D480;
 draw_ci_image_with_clipping = 0x8012D540;
 get_item_entity = 0x8012FAF8;
+clear_item_entity_data = 0x8012FB90;
 make_item_entity_nodelay = 0x80130634;
 set_item_entity_flags = 0x80132CE8;
 clear_item_entity_flags = 0x80132D28;
@@ -298,12 +355,14 @@ set_screen_overlay_color = 0x801369B0;
 set_screen_overlay_center = 0x801369EC;
 set_screen_overlay_center_worldpos = 0x80136A60;
 set_screen_overlay_alpha = 0x80136C74;
+clear_screen_overlays = 0x80136CA8;
 set_map_transition_effect = 0x80136E40;
 update_exit_map_screen_overlay = 0x80136E4C;
 func_8013A704 = 0x801392A4;
 func_8013A854 = 0x801393F4;
 fold_update = 0x8013963C;
 fold_appendGfx_component = 0x80139B10;
+hud_element_clear_cache = 0x8013FCA0;
 hud_element_create = 0x80140054;
 hud_element_draw_clipped = 0x80143358;
 hud_element_set_script = 0x801433AC;
@@ -314,12 +373,17 @@ hud_element_set_render_depth = 0x8014358C;
 hud_element_set_flags = 0x801435B0;
 hud_element_clear_flags = 0x801435DC;
 hud_element_set_alpha = 0x80143A60;
+hud_element_set_tint = 0x80143AAC;
+clear_saved_variables = 0x80143ED0;
 set_global_byte = 0x801440D0;
 get_global_byte = 0x801440E8;
+clear_trigger_data = 0x80144230;
+reset_background_settings = 0x801449A8;
 basic_window_update = 0x80146024;
 basic_hidden_window_update = 0x80146124;
 set_window_update = 0x80146A2C;
 setup_pause_menu_tab = 0x80146AE0;
+clear_sprite_shading_data = 0x80146BF0;
 sprite_shading_set_light_source = 0x80146D04;
 sfx_adjust_env_sound_pos = 0x8014859C;
 sfx_play_sound_with_params = 0x80148668;
@@ -327,6 +391,7 @@ sfx_stop_sound = 0x8014881C;
 sfx_play_sound = 0x80148864;
 sfx_play_sound_at_player = 0x80148888;
 sfx_play_sound_at_position = 0x8014890C;
+sfx_get_spatialized_sound_params = 0x801489B4;
 bgm_set_song = 0x801494C8;
 bgm_adjust_proximity = 0x80149604;
 bgm_set_track_volumes = 0x801496BC;
@@ -336,6 +401,8 @@ func_8014AD40 = 0x801498F0;
 MessagePlural = 0x8014AE40;
 MessagePlural_de = 0x8014AE44;
 MessageSingular = 0x8014AE48;
+gCurrentLanguage = 0x8014AE4C;
+gCurrentModels = 0x8014FE9C;
 gBackgroundFogModePtr = 0x8014FEC0;
 gEntityHideMode = 0x8014FEE0;
 gSpriteShadingProfile = 0x8014FEF8;
@@ -350,6 +417,7 @@ CreatePushBlockGrid = 0x802832F0;
 SetPushBlock = 0x8028348C;
 GetPushBlock = 0x802835D0;
 GetGridIndexFromPos = 0x802836C8;
+SetPushBlockFallEffect = 0x802837BC;
 ItemShopInteract = 0x80284064;
 EnterWalk = 0x80285970;
 EnterWalkShort = 0x80285A70;
@@ -370,6 +438,7 @@ Entity_CymbalPlant = 0x802BC788;
 Entity_PinkFlower = 0x802BC7AC;
 Entity_SpinningFlower = 0x802BC7F4;
 Entity_Tweester = 0x802BCA74;
+Entity_StarBoxLauncher = 0x802BCB44;
 Entity_BellbellPlant = 0x802BCBD8;
 Entity_TrumpetPlant = 0x802BCBFC;
 Entity_Munchlesia = 0x802BCC20;
@@ -378,6 +447,7 @@ Entity_ArrowSign = 0x802BCD9C;
 Entity_BoardedFloor = 0x802BCE84;
 Entity_BombableRock = 0x802BCF00;
 Entity_BombableRock2 = 0x802BCF24;
+clear_script_list = 0x802C61DC;
 start_script = 0x802C63E0;
 kill_script_by_ID = 0x802C70AC;
 does_script_exist = 0x802C7164;
@@ -412,6 +482,7 @@ EnableGroup = 0x802CCB98;
 MakeLocalVertexCopy = 0x802CCC70;
 ModifyColliderFlags = 0x802CCDCC;
 ResetFromLava = 0x802CCED8;
+GetColliderCenter = 0x802CD0AC;
 ParentColliderToModel = 0x802CD114;
 UpdateColliderTransform = 0x802CD188;
 SetZoneEnabled = 0x802CD254;
@@ -426,6 +497,7 @@ PlaySoundAtCollider = 0x802CD614;
 SetCamEnabled = 0x802CD6C0;
 SetCamPerspective = 0x802CD828;
 func_802CA988 = 0x802CD988;
+SetCamViewport = 0x802CDB18;
 func_802CABE8 = 0x802CDBE8;
 SetCamBGColor = 0x802CDD98;
 SetCamTarget = 0x802CDF2C;
@@ -448,6 +520,7 @@ GetCamType = 0x802CEF64;
 GetCamPitch = 0x802CEFF4;
 GetCamDistance = 0x802CF084;
 GetCamPosA = 0x802CF0F4;
+GetCamPosB = 0x802CF184;
 GetCamPosition = 0x802CF2A4;
 WaitForCam = 0x802CF354;
 SetCamProperties = 0x802CF3EC;
@@ -463,6 +536,7 @@ SetAnimatorFlags = 0x802D0418;
 GetAnimatedPositionByTreeIndex = 0x802D07D8;
 GetAnimatedRotationByTreeIndex = 0x802D08F8;
 resolve_npc = 0x802D0AC0;
+DeleteNpc = 0x802D0C1C;
 GetNpcPointer = 0x802D0C58;
 SetNpcPos = 0x802D0CB0;
 SetNpcRotation = 0x802D0DB0;
@@ -536,12 +610,14 @@ GetPlayerTargetYaw = 0x802D4D28;
 SetPlayerFlagBits = 0x802D4D60;
 GetPlayerActionState = 0x802D4DD0;
 GetPlayerPos = 0x802D4DFC;
+GetPlayerAnimation = 0x802D4E94;
 FullyRestoreHPandFP = 0x802D4EC0;
 FullyRestoreSP = 0x802D4EE0;
 EnablePartner = 0x802D4EFC;
 DisablePartner = 0x802D4F38;
 UseExitHeading = 0x802D516C;
 WaitForPlayerTouchingFloor = 0x802D544C;
+func_802D2484 = 0x802D5484;
 IsPlayerOnValidFloor = 0x802D549C;
 WaitForPlayerMoveToComplete = 0x802D54F4;
 WaitForPlayerInputEnabled = 0x802D5508;
@@ -550,6 +626,7 @@ func_802D286C = 0x802D586C;
 FacePlayerTowardPoint = 0x802D5884;
 DisablePulseStone = 0x802D5AA8;
 GetPartnerInUse = 0x802D5B0C;
+ForceUsePartner = 0x802D5B50;
 InterruptUsePartner = 0x802D5B6C;
 Disable8bitMario = 0x802D5B88;
 func_802D2C14 = 0x802D5C14;
@@ -603,6 +680,7 @@ CloseChoicePopup = 0x802D9974;
 HasKeyItem = 0x802D99BC;
 FindKeyItem = 0x802D9A34;
 AddItem = 0x802D9AB8;
+FindItem = 0x802D9B38;
 RemoveItem = 0x802D9BBC;
 MakeItemEntity = 0x802D9CE0;
 DropItemEntity = 0x802D9DE0;
@@ -611,6 +689,7 @@ RemoveItemEntity = 0x802D9FEC;
 AddBadge = 0x802DA018;
 RemoveBadge = 0x802DA070;
 SetItemPos = 0x802DA0F0;
+SetItemFlags = 0x802DA1B4;
 SetItemAlpha = 0x802DA23C;
 AddCoin = 0x802DA298;
 AddStarPieces = 0x802DA310;
@@ -621,6 +700,9 @@ func_802D7B10 = 0x802DAB30;
 func_802D7B44 = 0x802DAB64;
 SetMotionBlurParams = 0x802DAD18;
 ShowSweat = 0x802DAE28;
+ShowSleepBubble = 0x802DB048;
+ShowSleepBubble = 0x802DB048;
+SetSleepBubbleTimeLeft = 0x802DB268;
 PlayEffect = 0x802DB2BC;
 SetSpriteShading = 0x802DC720;
 EnableSpriteShading = 0x802DCA5C;
@@ -642,6 +724,7 @@ fx_rising_bubble = 0x802DD9E0;
 fx_ring_blast = 0x802DDA40;
 fx_smoke_burst = 0x802DDB60;
 fx_sweat = 0x802DDBC0;
+fx_sleep_bubble = 0x802DDC20;
 fx_stars_orbiting = 0x802DDE60;
 fx_radial_shimmer = 0x802DDFE0;
 fx_fire_breath = 0x802DE160;
@@ -660,13 +743,19 @@ fx_lil_oink = 0x802DFB40;
 fx_quizmo_assistant = 0x802DFCC0;
 fx_sun = 0x802DFD80;
 fx_star_spirits_energy = 0x802DFDE0;
+D_802D9D70 = 0x802E0030;
+D_802D9D71 = 0x802E0031;
 StarShrineLightBeamAlpha = 0x802E0032;
+spr_init_sprites = 0x802E3BD8;
 spr_update_player_sprite = 0x802E3D6C;
 spr_draw_player_sprite = 0x802E3F20;
+func_802DDEE4 = 0x802E41C4;
 func_802DDFF8 = 0x802E42D8;
 spr_get_player_raster_info = 0x802E4324;
+func_802DE780 = 0x802E4A60;
 func_802DE894 = 0x802E4B74;
 spr_get_npc_raster_info = 0x802E4CB8;
+spr_allocateBtlComponentsOnWorldHeap = 0x802E5804;
 entity_upgrade_block_hide_content = 0x802EB990;
 Entity_SavePoint = 0x802EFD18;
 Entity_RedSwitch = 0x802EFEB0;
@@ -685,6 +774,7 @@ Entity_Hammer2Block_WideX = 0x802F04C0;
 Entity_Hammer2Block_WideZ = 0x802F04E4;
 Entity_Hammer2BlockTiny = 0x802F0508;
 Entity_Hammer3Block = 0x802F052C;
+Entity_Hammer3Block_WideZ = 0x802F0574;
 Entity_Hammer3BlockTiny = 0x802F0598;
 Entity_PowBlock = 0x802F05E0;
 Entity_YellowBlock = 0x802F0864;
@@ -702,3 +792,4 @@ Entity_Chest = 0x802F1130;
 Entity_WoodenCrate = 0x802F11D4;
 Entity_BlueWarpPipe = 0x802F1280;
 Entity_Signpost = 0x802F12DC;
+heap_spriteHead = 0x8034F800;