From d31022e04228b3073e65b33d70ec7c4325d7dc69 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 14 Mar 2023 09:47:14 +0100 Subject: [PATCH] Second batch of PAL maps (#974) * iwa * sbk * dro * isk * trd * nok * hos * kpa * osr * kkj * tst * jan * mim * obk * Use MODEL_ constants * Rename defines * Fix SetCamSpeed invocations * Remove Boo float defines * Simplifly float --- include/enums.h | 43 + src/world/area_dro/dro_01/npc_shop_owner.c | 34 +- src/world/area_dro/dro_02/dro_02_5_npc.c | 8 +- src/world/area_dro/dro_02/npc_merlee.c | 2 + src/world/area_dro/dro_02/npc_moustafa.c | 22 +- src/world/area_hos/hos_00/hos_00_6_scenes.c | 82 +- src/world/area_hos/hos_01/hos_01_4_npc.c | 49 +- src/world/area_hos/hos_01/hos_01_6_star_way.c | 4 + src/world/area_hos/hos_04/hos_04_6_intro.c | 18 +- src/world/area_hos/hos_04/hos_04_8_narrator.c | 16 +- src/world/area_hos/hos_05/hos_05_4_npc.c | 28 +- src/world/area_hos/hos_05/hos_05_5_intro.c | 156 +- src/world/area_hos/hos_05/hos_05_6_narrator.c | 90 +- .../area_hos/hos_10/hos_10_6_pre_title.c | 12 +- src/world/area_isk/isk_01/isk_01_1_music.c | 4 + src/world/area_isk/isk_02/isk_02_1_main.c | 4 + src/world/area_isk/isk_03/isk_03_1_main.c | 4 + src/world/area_isk/isk_04/isk_04_1_music.c | 4 + src/world/area_isk/isk_05/isk_05_1_main.c | 4 + src/world/area_isk/isk_06/isk_06_1_main.c | 4 + src/world/area_isk/isk_07/isk_07_1_main.c | 4 + src/world/area_isk/isk_08/isk_08_1_main.c | 4 + src/world/area_isk/isk_09/isk_09_1_music.c | 4 + src/world/area_isk/isk_10/isk_10_1_main.c | 4 + src/world/area_isk/isk_11/isk_11_4_scene.c | 42 +- src/world/area_isk/isk_12/isk_12_1_main.c | 4 + src/world/area_isk/isk_13/isk_13_1_main.c | 4 + src/world/area_isk/isk_14/isk_14_1_main.c | 4 + src/world/area_isk/isk_16/isk_16_3_boss.c | 64 +- src/world/area_isk/isk_18/isk_18_1_main.c | 4 + src/world/area_iwa/iwa_04/iwa_04_4_npc.c | 48 +- src/world/area_iwa/iwa_10/iwa_10_2_main.c | 4 + .../area_iwa/iwa_10/iwa_10_6_parakarry.c | 60 +- src/world/area_jan/jan_01/jan_01_3_npc.c | 16 +- src/world/area_jan/jan_02/jan_02_2_main.c | 4 + src/world/area_jan/jan_02/jan_02_3_npc.c | 36 +- src/world/area_jan/jan_04/jan_04_4_npc.c | 34 +- src/world/area_jan/jan_07/jan_07_3_npc.c | 5 + src/world/area_jan/jan_16/jan_16_3_npc.c | 28 +- src/world/area_jan/jan_22/jan_22_3_npc.c | 250 +- src/world/area_jan/jan_23/jan_23_3_npc.c | 70 +- .../area_kkj/kkj_00/kkj_00_4_scene_intro.c | 8 +- src/world/area_kkj/kkj_03/kkj_03_4_scenes.c | 66 +- src/world/area_kkj/kkj_12/kkj_12_2_npc.c | 12 +- .../area_kkj/kkj_13/kkj_13_5_intro_scenes.c | 130 +- .../area_kkj/kkj_14/kkj_14_10_chapter2.c | 48 +- .../area_kkj/kkj_14/kkj_14_11_chapter3.c | 14 +- .../area_kkj/kkj_14/kkj_14_12_chapter4.c | 4 +- .../area_kkj/kkj_14/kkj_14_13_chapter5.c | 20 +- .../area_kkj/kkj_14/kkj_14_14_chapter6.c | 12 +- .../area_kkj/kkj_14/kkj_14_15_chapter7.c | 48 +- .../area_kkj/kkj_14/kkj_14_3_interactables.c | 16 +- .../area_kkj/kkj_14/kkj_14_4_npc_guards.c | 22 +- src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c | 154 +- src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c | 22 +- .../area_kkj/kkj_15/kkj_15_3_rotating_wall.c | 12 +- src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c | 104 +- src/world/area_kkj/kkj_15/kkj_15_5_chapter1.c | 58 +- src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c | 70 +- src/world/area_kkj/kkj_16/kkj_16_4_stealth.c | 42 +- src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c | 94 +- src/world/area_kkj/kkj_19/kkj_19_5_baking.c | 184 +- src/world/area_kkj/kkj_23/kkj_23_5_scene.c | 40 +- src/world/area_kkj/kkj_25/kkj_25_5_arena.c | 5 + .../kkj_25/kkj_25_8_bowser_defeated.c | 10 +- src/world/area_kkj/kkj_26/kkj_26_2_scenes.c | 14 +- .../area_kkj/kkj_27/kkj_27_3_rotating_wall.c | 28 +- src/world/area_kkj/kkj_29/kkj_29_3_quiz.c | 138 +- src/world/area_kpa/kpa_16/kpa_16_4_npc.c | 46 +- src/world/area_kpa/kpa_17/kpa_17_4_npc.c | 6 +- src/world/area_kpa/kpa_81/kpa_81_3_npc.c | 22 +- src/world/area_kpa/kpa_82/kpa_82_3_npc.c | 152 +- src/world/area_kpa/kpa_83/kpa_83_3_npc.c | 18 +- src/world/area_mac/mac_00/mac_00_2_main.c | 2 +- src/world/area_mac/mac_01/mac_01_2_main.c | 2 +- src/world/area_mac/mac_03/mac_03_2_main.c | 2 +- src/world/area_mim/mim_02/mim_02_3_npc.c | 52 +- src/world/area_mim/mim_07/mim_07_6_npc.c | 6 +- src/world/area_mim/mim_10/mim_10_4_npc.c | 50 +- src/world/area_mim/mim_11/mim_11_3_gate.c | 28 +- src/world/area_mim/mim_12/mim_12_5_gate.c | 34 +- src/world/area_nok/nok_01/nok_01_2_main.c | 4 + src/world/area_nok/nok_02/nok_02_6_npc.c | 59 +- src/world/area_nok/nok_03/nok_03_4_npc.c | 2 +- src/world/area_nok/nok_04/nok_04_4_npc.c | 174 +- src/world/area_nok/nok_11/nok_11_4_npc.c | 52 +- src/world/area_obk/obk_01/obk_01_4_portrait.c | 30 +- .../area_obk/obk_01/obk_01_5_jump_scare.c | 8 +- src/world/area_obk/obk_02/obk_02_5_clock.c | 6 +- src/world/area_obk/obk_02/obk_02_6_entity.c | 12 +- src/world/area_obk/obk_03/obk_03_4_entity.c | 16 +- src/world/area_obk/obk_03/obk_03_5_stairs.c | 12 +- src/world/area_obk/obk_04/obk_04_6_game.c | 10 +- src/world/area_obk/obk_09/obk_09_3_meet_bow.c | 54 +- src/world/area_osr/osr_00/osr_00_5_scenes.c | 14 +- src/world/area_osr/osr_03/osr_03_3_intro.c | 16 +- src/world/area_osr/osr_04/osr_04_2_assault.c | 128 +- src/world/area_sbk/sbk_02/sbk_02_4_npc.c | 36 +- src/world/area_trd/trd_00/trd_00_3_npc.c | 62 +- src/world/area_trd/trd_01/trd_01_1_main.c | 64 +- src/world/area_trd/trd_03/trd_03_3_npc.c | 42 +- src/world/area_trd/trd_03/trd_03_4_puzzle.c | 72 +- src/world/area_trd/trd_04/trd_04_1_main.c | 50 +- src/world/area_trd/trd_04/trd_04_2_entity.c | 10 +- src/world/area_trd/trd_05/trd_05_4_npc.c | 74 +- src/world/area_trd/trd_06/trd_06_1_main.c | 14 +- src/world/area_trd/trd_06/trd_06_2_falling.c | 6 +- .../area_trd/trd_06/trd_06_3_npc_prisoners.c | 38 +- src/world/area_trd/trd_09/trd_09_3_npc.c | 56 +- src/world/area_trd/trd_10/trd_10_2_npc.c | 34 +- .../area_trd/trd_10/trd_10_3_fake_bowser.c | 2 +- tools/splat_ext/msg_pal_en.yaml | 10 + .../hos_05/A2AAC0/func_802428C8_A2CB08.s | 477 +++ .../hos_05/hos_05_5_intro/AnimBowser_FlyOff.s | 70 + .../hos_05/hos_05_5_intro/AnimKammy_FlyOff.s | 57 + .../kkj_19_5_baking/kkj_19_GetItemNameRaw.s | 40 + ver/pal/splat.yaml | 2581 ++++++++++++++++- ver/pal/symbol_addrs.txt | 12 + ver/pal/undefined_syms.txt | 185 ++ ver/pal/undefined_syms_auto.txt | 1 + 120 files changed, 5719 insertions(+), 1947 deletions(-) create mode 100644 ver/pal/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8_A2CB08.s create mode 100644 ver/pal/asm/nonmatchings/world/area_hos/hos_05/hos_05_5_intro/AnimBowser_FlyOff.s create mode 100644 ver/pal/asm/nonmatchings/world/area_hos/hos_05/hos_05_5_intro/AnimKammy_FlyOff.s create mode 100644 ver/pal/asm/nonmatchings/world/area_kkj/kkj_19/kkj_19_5_baking/kkj_19_GetItemNameRaw.s diff --git a/include/enums.h b/include/enums.h index 8c4f99c20e..117ee85eb8 100644 --- a/include/enums.h +++ b/include/enums.h @@ -3001,6 +3001,49 @@ enum ShadingProfile { SHADING_TIK_24, SHADING_TIK_25, SHADING_KMR_30 = 0x10000, + SHADING_ISK_03 = 0x20000, + SHADING_ISK_04, + SHADING_ISK_05, + SHADING_ISK_06, + SHADING_ISK_07, + SHADING_ISK_08, + SHADING_ISK_09, + SHADING_ISK_10, + SHADING_ISK_11, + SHADING_ISK_12, + SHADING_ISK_13, + SHADING_ISK_14, + SHADING_ISK_16, + SHADING_ISK_UNUSED, + SHADING_ISK_18, + SHADING_ISK_19, + SHADING_HOS_01 = 0x00030000, + SHADING_OSR_02 = 0x00040000, + SHADING_KKJ_10 = 0x00050000, + SHADING_KKJ_11, + SHADING_KKJ_12, + SHADING_KKJ_13, + SHADING_KKJ_17, + SHADING_KKJ_20, + SHADING_KKJ_22, + SHADING_KKJ_23, + SHADING_KKJ_24, + SHADING_KKJ_25, + SHADING_KKJ_26, + SHADING_KKJ_27, + SHADING_JAN_17 = 0x00060000, + SHADING_JAN_19, + SHADING_MIM_01 = 0x00070000, + SHADING_MIM_02, + SHADING_MIM_03, + SHADING_MIM_04, + SHADING_MIM_05, + SHADING_MIM_06, + SHADING_MIM_07, + SHADING_MIM_08, + SHADING_MIM_09, + SHADING_MIM_11, + SHADING_MIM_12, }; #endif diff --git a/src/world/area_dro/dro_01/npc_shop_owner.c b/src/world/area_dro/dro_01/npc_shop_owner.c index ff4d3119a5..c71eaa8da9 100644 --- a/src/world/area_dro/dro_01/npc_shop_owner.c +++ b/src/world/area_dro/dro_01/npc_shop_owner.c @@ -26,7 +26,7 @@ EvtScript N(EVS_NpcIdle_ShopOwner) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, 0, 0, -180) EVT_EXEC_WAIT(N(EVS_OpenShopDoor)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(GetPlayerPos, LVarA, LVarB, LVarC) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVarA, LVarB, LVarC) EVT_CALL(SetPanTarget, CAM_DEFAULT, 32, 0, -67) @@ -34,34 +34,38 @@ EvtScript N(EVS_NpcIdle_ShopOwner) = { EVT_CALL(SetCamPitch, CAM_DEFAULT, 20, -12) 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(UseSettingsFrom, CAM_DEFAULT, LVarA, LVarB, LVarC) EVT_CALL(SetCamDistance, CAM_DEFAULT, -350) +#if VERSION_PAL + EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(0.961)) +#else EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.8)) +#endif EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) EVT_CALL(NpcMoveTo, NPC_SELF, -23, -105, 20) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpNpcYaw, NPC_SELF, 65, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_EXEC_WAIT(N(EVS_CloseShopDoor)) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) - EVT_CALL(NpcMoveTo, NPC_SELF, 37, -27, 20) + EVT_CALL(NpcMoveTo, NPC_SELF, 37, -27, 20 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVarA, LVarB, LVarC) EVT_CALL(SetPanTarget, CAM_DEFAULT, 142, 0, -67) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_CALL(NpcMoveTo, NPC_SELF, 62, -6, 20) - EVT_CALL(NpcMoveTo, NPC_SELF, 103, 11, 20) - EVT_CALL(NpcMoveTo, NPC_SELF, 150, 18, 20) + EVT_CALL(NpcMoveTo, NPC_SELF, 62, -6, 20 * DT) + EVT_CALL(NpcMoveTo, NPC_SELF, 103, 11, 20 * DT) + EVT_CALL(NpcMoveTo, NPC_SELF, 150, 18, 20 * DT) EVT_CALL(EnableNpcBlur, NPC_SELF, TRUE) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_174, SOUND_SPACE_MODE_0) - EVT_CALL(NpcMoveTo, NPC_SELF, 554, -12, 20) + EVT_CALL(NpcMoveTo, NPC_SELF, 554, -12, 20 * DT) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) - EVT_WAIT(30) + EVT_WAIT(30 * DT) 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(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_CALL(PanToTarget, CAM_DEFAULT, 0, 0) @@ -73,13 +77,13 @@ EvtScript N(EVS_NpcIdle_ShopOwner) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_174, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcPos, NPC_SELF, 470, 0, 18) - EVT_CALL(NpcMoveTo, NPC_SELF, 287, 9, 20) - EVT_CALL(NpcMoveTo, NPC_SELF, 102, -14, 20) - EVT_CALL(NpcMoveTo, NPC_SELF, -32, -96, 20) + EVT_CALL(NpcMoveTo, NPC_SELF, 287, 9, 20 * DT) + EVT_CALL(NpcMoveTo, NPC_SELF, 102, -14, 20 * DT) + EVT_CALL(NpcMoveTo, NPC_SELF, -32, -96, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Idle) EVT_EXEC_WAIT(N(EVS_OpenShopDoor)) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) - EVT_CALL(NpcMoveTo, NPC_SELF, 20, -375, 30) + EVT_CALL(NpcMoveTo, NPC_SELF, 20, -375, 30 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Idle) EVT_EXEC_WAIT(N(EVS_CloseShopDoor)) EVT_CALL(EnableNpcBlur, NPC_SELF, FALSE) diff --git a/src/world/area_dro/dro_02/dro_02_5_npc.c b/src/world/area_dro/dro_02/dro_02_5_npc.c index 7f0cb9dd17..d49fd300b6 100644 --- a/src/world/area_dro/dro_02/dro_02_5_npc.c +++ b/src/world/area_dro/dro_02/dro_02_5_npc.c @@ -269,10 +269,10 @@ EvtScript N(EVS_NpcIdle_Mouser_03) = { EVT_CALL(NpcMoveTo, NPC_SELF, 150, 18, 20) EVT_CALL(EnableNpcBlur, NPC_SELF, TRUE) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_174, SOUND_SPACE_MODE_0) - EVT_CALL(NpcMoveTo, NPC_SELF, -83, 11, 20) - EVT_CALL(NpcMoveTo, NPC_SELF, -239, 5, 20) - EVT_CALL(NpcMoveTo, NPC_SELF, -371, 5, 20) - EVT_CALL(NpcMoveTo, NPC_SELF, -487, 5, 20) + EVT_CALL(NpcMoveTo, NPC_SELF, -83, 11, 20 * DT) + EVT_CALL(NpcMoveTo, NPC_SELF, -239, 5, 20 * DT) + EVT_CALL(NpcMoveTo, NPC_SELF, -371, 5, 20 * DT) + EVT_CALL(NpcMoveTo, NPC_SELF, -487, 5, 20 * DT) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_SET(GB_StoryProgress, STORY_CH2_SPOKE_WITH_SHEEK) EVT_RETURN diff --git a/src/world/area_dro/dro_02/npc_merlee.c b/src/world/area_dro/dro_02/npc_merlee.c index f47f98405f..24e8d42921 100644 --- a/src/world/area_dro/dro_02/npc_merlee.c +++ b/src/world/area_dro/dro_02/npc_merlee.c @@ -59,7 +59,9 @@ s8 N(MerleeCoinCosts)[] = { 50, 20, 5, 0, }; +#if !VERSION_PAL s32 N(pad_XX111)[] = { 0 }; +#endif #include "world/area_dro/dro_02/card.png.inc.c" #include "world/area_dro/dro_02/card.pal.inc.c" diff --git a/src/world/area_dro/dro_02/npc_moustafa.c b/src/world/area_dro/dro_02/npc_moustafa.c index 93fac9c964..8e2dcbdd57 100644 --- a/src/world/area_dro/dro_02/npc_moustafa.c +++ b/src/world/area_dro/dro_02/npc_moustafa.c @@ -23,7 +23,7 @@ EvtScript N(EVS_Moustafa_SetCamBetween) = { EVT_DIV(LVar2, 2) EVT_ADD(LVar1, 15) 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(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_RETURN @@ -32,7 +32,7 @@ EvtScript N(EVS_Moustafa_SetCamBetween) = { EvtScript N(EVS_Moustafa_ResetCam) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_RETURN EVT_END @@ -43,12 +43,12 @@ EvtScript N(EVS_Moustafa_Unveiling) = { EVT_CALL(SetNpcFlagBits, NPC_DisguisedMoustafa, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Moustafa, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_GrabCloak) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_ThrownCloak) EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Toss) EVT_CALL(SetNpcPos, NPC_Moustafa, -335, 163, -260) EVT_EXEC(N(EVS_PlayMoustafaMusic)) - EVT_CALL(MakeLerp, 0, 80, 30, EASING_CUBIC_OUT) + EVT_CALL(MakeLerp, 0, 80, 30 * DT, EASING_CUBIC_OUT) EVT_LABEL(10) EVT_CALL(UpdateLerp) EVT_SET(LVar2, -335) @@ -65,7 +65,7 @@ EvtScript N(EVS_Moustafa_Unveiling) = { EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Idle) EVT_CALL(SetNpcFlagBits, NPC_DisguisedMoustafa, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcFlagBits, NPC_Moustafa, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_RETURN EVT_END }; @@ -184,11 +184,11 @@ EvtScript N(EVS_NpcInteract_Moustafa) = { EVT_EXEC(N(EVS_Moustafa_ResetCam)) EVT_CASE_LT(STORY_CH2_GOT_PULSE_STONE) EVT_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(func_802D2C14, 1) EVT_END_THREAD EVT_CALL(SetNpcFlagBits, NPC_DisguisedMoustafa, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlayerMoveTo, -391, -260, 0) EVT_CALL(InterpPlayerYaw, 90, 3) EVT_CALL(SetNpcFlagBits, NPC_DisguisedMoustafa, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) @@ -200,22 +200,22 @@ EvtScript N(EVS_NpcInteract_Moustafa) = { EVT_EXEC_WAIT(N(EVS_Moustafa_Unveiling)) EVT_CALL(func_802D2C14, 0) EVT_CALL(SetNpcJumpscale, NPC_Moustafa, EVT_FLOAT(1.0)) - EVT_CALL(NpcJump0, NPC_Moustafa, -425, 140, -206, 20) + EVT_CALL(NpcJump0, NPC_Moustafa, -425, 140, -206, 20 * DT) EVT_CALL(SpeakToPlayer, NPC_Moustafa, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00C4) EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00C5) EVT_EXEC_WAIT(N(EVS_Moustafa_Unveiling)) EVT_CALL(func_802D2C14, 0) EVT_CALL(SetNpcJumpscale, NPC_Moustafa, EVT_FLOAT(1.0)) - EVT_CALL(NpcJump0, NPC_Moustafa, -425, 140, -206, 20) + EVT_CALL(NpcJump0, NPC_Moustafa, -425, 140, -206, 20 * DT) EVT_CALL(SpeakToPlayer, NPC_Moustafa, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00C6) EVT_END_IF EVT_CALL(SetNpcJumpscale, NPC_Moustafa, EVT_FLOAT(1.0)) - EVT_CALL(NpcJump0, NPC_Moustafa, -337, 140, -200, 20) + EVT_CALL(NpcJump0, NPC_Moustafa, -337, 140, -200, 20 * DT) EVT_CALL(SpeakToPlayer, NPC_Moustafa, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00C7) EVT_CALL(SpeakToPlayer, NPC_Moustafa, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00C8) EVT_CALL(SetNpcJumpscale, NPC_Moustafa, EVT_FLOAT(1.0)) - EVT_CALL(NpcJump0, NPC_Moustafa, -335, 163, -260, 20) + EVT_CALL(NpcJump0, NPC_Moustafa, -335, 163, -260, 20 * DT) EVT_CALL(SpeakToPlayer, NPC_Moustafa, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00C9) EVT_GIVE_KEY_REWARD(ITEM_PULSE_STONE) EVT_SET(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) diff --git a/src/world/area_hos/hos_00/hos_00_6_scenes.c b/src/world/area_hos/hos_00/hos_00_6_scenes.c index fdd15cd05d..320c1cb63e 100644 --- a/src/world/area_hos/hos_00/hos_00_6_scenes.c +++ b/src/world/area_hos/hos_00/hos_00_6_scenes.c @@ -141,9 +141,9 @@ EvtScript N(EVS_UpdateFacingMagikoopa) = { EvtScript N(EVS_ConfusedTwinkLookingAround) = { EVT_LOOP(0) EVT_CALL(InterpNpcYaw, NPC_Twink, 270, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpNpcYaw, NPC_Twink, 90, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_END_LOOP EVT_RETURN EVT_END @@ -195,12 +195,12 @@ EvtScript N(EVS_Scene_MeetingTwink) = { EVT_CALL(func_802CF56C, 2) EVT_THREAD EVT_ADD(LVar0, -20) - EVT_CALL(PlayerMoveTo, LVar0, LVar2, 10) + EVT_CALL(PlayerMoveTo, LVar0, LVar2, 10 * DT) EVT_END_THREAD EVT_CALL(SetNpcPos, NPC_Twink, 50, 180, 0) EVT_CALL(SetNpcJumpscale, NPC_Twink, 0) EVT_ADD(LVar0, -10) - EVT_CALL(NpcJump0, NPC_Twink, LVar0, 20, LVar2, 15) + EVT_CALL(NpcJump0, NPC_Twink, LVar0, 20, LVar2, 15 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_HIT_PLAYER_NORMAL, 0) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_VacantStare) EVT_CALL(SetNpcAnimation, NPC_Twink, ANIM_Twink_Cringe) @@ -209,7 +209,7 @@ EvtScript N(EVS_Scene_MeetingTwink) = { EVT_CALL(SetNpcJumpscale, NPC_Twink, EVT_FLOAT(0.6)) EVT_CALL(GetNpcPos, NPC_Twink, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -100) - EVT_CALL(NpcJump0, NPC_Twink, LVar0, 10, LVar2, 20) + EVT_CALL(NpcJump0, NPC_Twink, LVar0, 10, LVar2, 20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_THREAD @@ -247,29 +247,29 @@ EvtScript N(EVS_Scene_MeetingTwink) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, 275) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(16.0), EVT_FLOAT(-8.5)) - 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(SetNpcSpeed, NPC_Twink, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_Twink, EVT_FLOAT(3.0 / DT)) EVT_CALL(GetNpcPos, NPC_Twink, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 40) EVT_CALL(NpcMoveTo, NPC_Twink, LVar0, LVar2, 0) EVT_CALL(ShowEmote, NPC_Twink, EMOTE_SHOCK, 45, 20, EMOTER_NPC, 0, 0, 0, 0) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_Twink, ANIM_Twink_ShoutJoy) EVT_CALL(SetNpcJumpscale, NPC_Twink, EVT_FLOAT(1.0)) EVT_LOOP(2) EVT_CALL(GetNpcPos, NPC_Twink, LVar0, LVar1, LVar2) - EVT_CALL(NpcJump0, NPC_Twink, LVar0, LVar1, LVar2, 15) + EVT_CALL(NpcJump0, NPC_Twink, LVar0, LVar1, LVar2, 15 * DT) EVT_END_LOOP EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 25) - EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 10) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 10 * DT) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_HOS_000F) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(GetNpcPos, NPC_Twink, LVar4, LVar5, LVar6) - EVT_CALL(LoadPath, 70, EVT_PTR(N(TwinkArrivePath)), ARRAY_COUNT(N(TwinkArrivePath)), EASING_LINEAR) + EVT_CALL(LoadPath, 70 * DT, EVT_PTR(N(TwinkArrivePath)), ARRAY_COUNT(N(TwinkArrivePath)), EASING_LINEAR) EVT_LABEL(1) EVT_CALL(GetNextPathPos) EVT_ADDF(LVar1, LVar4) @@ -282,7 +282,7 @@ EvtScript N(EVS_Scene_MeetingTwink) = { EVT_GOTO(1) EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_Twink, ANIM_Twink_Idle) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_HOS_0010) EVT_CALL(SetNpcYaw, NPC_Twink, 270) EVT_CALL(SetNpcAnimation, NPC_Twink, ANIM_Twink_Back) @@ -297,7 +297,7 @@ EvtScript N(EVS_Scene_MeetingTwink) = { EVT_CALL(ContinueSpeech, NPC_Twink, -1, -1, 512, MSG_HOS_0012) EVT_CALL(GetPlayerPos, LVar5, LVar3, LVar4) EVT_ADD(LVar5, -30) - EVT_CALL(NpcMoveTo, NPC_Twink, LVar5, LVar4, 15) + EVT_CALL(NpcMoveTo, NPC_Twink, LVar5, LVar4, 15 * DT) EVT_KILL_THREAD(LVar9) EVT_KILL_THREAD(LVar8) EVT_THREAD @@ -339,7 +339,7 @@ EvtScript N(EVS_Scene_MeetingTwink) = { EVT_CALL(AddKeyItem, LVar0) EVT_CALL(N(EnableActionCommands)) EVT_CALL(SetNpcAnimation, NPC_Twink, ANIM_Twink_Idle) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_HOS_0013) EVT_CALL(ShowChoice, MSG_Choice_0013) EVT_IF_EQ(LVar0, 1) @@ -369,31 +369,31 @@ EvtScript N(EVS_Scene_MeetingTwink) = { EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_HOS_002F) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_HOS_0030) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_EXEC(N(EVS_PlayKammyKoopaSong)) EVT_CALL(ShowMessageAtScreenPos, MSG_HOS_0031, 320, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, 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_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -250) EVT_DIV(LVar0, 2) EVT_CALL(SetPanTarget, CAM_DEFAULT, -250, 53, 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(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 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_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_EXEC_GET_TID(N(EVS_UpdateFacingMagikoopa), LVarA) - EVT_CALL(LoadPath, 67, EVT_PTR(N(FlightPath_Magikoopa)), ARRAY_COUNT(N(FlightPath_Magikoopa)), EASING_LINEAR) + EVT_CALL(LoadPath, 67 * DT, EVT_PTR(N(FlightPath_Magikoopa)), ARRAY_COUNT(N(FlightPath_Magikoopa)), EASING_LINEAR) EVT_LABEL(2) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_FlyingMagikoopa, LVar1, LVar2, LVar3) @@ -427,11 +427,11 @@ EvtScript N(EVS_Scene_MeetingTwink) = { EVT_CALL(SetNpcRotation, NPC_FlyingMagikoopa, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_EXEC_GET_TID(N(EVS_ConfusedTwinkLookingAround), LVarA) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Still, 5, MSG_HOS_0032) EVT_KILL_THREAD(LVarA) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(GetNpcPos, NPC_FlyingMagikoopa, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, 0, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -446,7 +446,7 @@ EvtScript N(EVS_Scene_MeetingTwink) = { EVT_DIV(LVar0, 2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, 0, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 0, 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(SetNpcVar, NPC_FlyingMagikoopa, 0, 1) EVT_CALL(EnablePartnerAI) @@ -458,7 +458,7 @@ EvtScript N(EVS_Scene_MeetingTwink) = { EvtScript N(EVS_Scene_TwinkDeparts) = { EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_CALL(SetMusicTrack, 0, SONG_TWINK_THEME, 0, 8) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, TRUE) EVT_CALL(GetNpcPos, NPC_Twink, LVar3, LVar1, LVar2) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -474,17 +474,17 @@ EvtScript N(EVS_Scene_TwinkDeparts) = { EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_HOS_0034) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.5)) - EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 15) - EVT_WAIT(10) + EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 15 * DT) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_HOS_0035) EVT_CALL(GetPlayerPos, 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(700.0)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.3)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.3 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(GetNpcPos, NPC_Twink, LVar4, LVar5, LVar6) - EVT_CALL(LoadPath, 85, EVT_PTR(N(TwinkDepartPath1)), ARRAY_COUNT(N(TwinkDepartPath1)), EASING_LINEAR) + EVT_CALL(LoadPath, 85 * DT, EVT_PTR(N(TwinkDepartPath1)), ARRAY_COUNT(N(TwinkDepartPath1)), EASING_LINEAR) EVT_LABEL(0) EVT_CALL(GetNextPathPos) EVT_ADDF(LVar1, LVar4) @@ -496,9 +496,9 @@ EvtScript N(EVS_Scene_TwinkDeparts) = { EVT_IF_EQ(LVar0, 1) EVT_GOTO(0) EVT_END_IF - EVT_WAIT(45) + EVT_WAIT(45 * DT) EVT_THREAD - EVT_CALL(LoadPath, 60, EVT_PTR(N(TwinkReturnPath)), ARRAY_COUNT(N(TwinkReturnPath)), EASING_LINEAR) + EVT_CALL(LoadPath, 60 * DT, EVT_PTR(N(TwinkReturnPath)), ARRAY_COUNT(N(TwinkReturnPath)), EASING_LINEAR) EVT_LABEL(1) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_Twink, LVar1, LVar2, LVar3) @@ -508,7 +508,7 @@ EvtScript N(EVS_Scene_TwinkDeparts) = { EVT_GOTO(1) EVT_END_IF EVT_END_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(GetNpcPos, NPC_Twink, LVar3, LVar1, LVar2) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, LVar3) @@ -517,13 +517,13 @@ EvtScript N(EVS_Scene_TwinkDeparts) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(275.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(16.0), EVT_FLOAT(-8.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_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_HOS_0036) EVT_THREAD EVT_CALL(GetNpcPos, NPC_Twink, LVar4, LVar5, LVar6) - EVT_CALL(LoadPath, 120, EVT_PTR(N(TwinkDepartPath2)), ARRAY_COUNT(N(TwinkDepartPath2)), EASING_QUADRATIC_IN) + EVT_CALL(LoadPath, 120 * DT, EVT_PTR(N(TwinkDepartPath2)), ARRAY_COUNT(N(TwinkDepartPath2)), EASING_QUADRATIC_IN) EVT_LABEL(2) EVT_CALL(GetNextPathPos) EVT_ADDF(LVar1, LVar4) @@ -543,7 +543,7 @@ EvtScript N(EVS_Scene_TwinkDeparts) = { EVT_CALL(SetCamPosB, CAM_DEFAULT, LVar2, LVar3) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcFlagBits, NPC_Twink, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_LOOP(10) @@ -552,7 +552,7 @@ EvtScript N(EVS_Scene_TwinkDeparts) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetNpcFlagBits, NPC_Twink, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, FALSE) - EVT_WAIT(120) + EVT_WAIT(120 * DT) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_CALL(PlayerFaceNpc, NPC_PARTNER, FALSE) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -562,19 +562,19 @@ EvtScript N(EVS_Scene_TwinkDeparts) = { EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(13.0), EVT_FLOAT(-7.5)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_HOS_0037) EVT_CALL(EnablePartnerAI) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_THREAD EVT_SET(GB_StoryProgress, STORY_CH0_TWINK_GAVE_LUCKY_STAR) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_END_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END diff --git a/src/world/area_hos/hos_01/hos_01_4_npc.c b/src/world/area_hos/hos_01/hos_01_4_npc.c index fc8bf40d24..409d14c78a 100644 --- a/src/world/area_hos/hos_01/hos_01_4_npc.c +++ b/src/world/area_hos/hos_01/hos_01_4_npc.c @@ -58,7 +58,7 @@ EvtScript N(EVS_Scene_StarSpiritsPlea) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, -35, 250, -145) EVT_CALL(SetCamDistance, CAM_DEFAULT, 450) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(20.0), EVT_FLOAT(-5.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_CALL(func_802D2C14, 2) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) @@ -66,17 +66,17 @@ EvtScript N(EVS_Scene_StarSpiritsPlea) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 30) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, 0) - EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 15) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_END_THREAD EVT_CALL(SetMusicTrack, 0, SONG_STAR_SPIRIT_THEME, 1, 8) EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 0, MSG_HOS_0000) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_WAIT(1) EVT_CALL(PlayerFaceNpc, NPC_Eldstar, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcJumpscale, NPC_Eldstar, 0) - EVT_CALL(NpcJump0, NPC_Eldstar, 21, 260, -277, 30) + EVT_CALL(NpcJump0, NPC_Eldstar, 21, 260, -277, 30 * DT) EVT_CALL(EnableModel, MODEL_1, TRUE) EVT_CALL(PlaySound, SOUND_64) EVT_CALL(GetNpcPos, NPC_Mamar, LVar0, LVar1, LVar2) @@ -104,20 +104,27 @@ EvtScript N(EVS_Scene_StarSpiritsPlea) = { EVT_CALL(EnableModel, MODEL_6, TRUE) EVT_CALL(EnableModel, MODEL_7, TRUE) EVT_SETF(MV_AlphaAmt_Others, EVT_FLOAT(-80.0)) - EVT_LOOP(20) + EVT_LOOP(20 * DT) +#if VERSION_PAL + EVT_ADDF(MV_AlphaAmt_Others, EVT_FLOAT(7.203)) +#else EVT_ADDF(MV_AlphaAmt_Others, EVT_FLOAT(6.0)) +#endif EVT_WAIT(1) EVT_END_LOOP +#if VERSION_PAL + EVT_SETF(MV_AlphaAmt_Others, EVT_FLOAT(40.0)) +#endif EVT_CALL(EnableNpcShadow, NPC_Mamar, TRUE) EVT_CALL(EnableNpcShadow, NPC_Skolar, TRUE) EVT_CALL(EnableNpcShadow, NPC_Muskular, TRUE) EVT_CALL(EnableNpcShadow, NPC_Misstar, TRUE) EVT_CALL(EnableNpcShadow, NPC_Klevar, TRUE) EVT_CALL(EnableNpcShadow, NPC_Kalmar, TRUE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 0, MSG_HOS_0001) EVT_CALL(SetCamDistance, CAM_DEFAULT, 270) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.8)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.8 / DT)) EVT_CALL(GetNpcPos, NPC_Eldstar, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(20.0), EVT_FLOAT(-6.5)) @@ -155,9 +162,9 @@ EvtScript N(EVS_Scene_StarSpiritsPlea) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_Kalmar, ANIM_WorldKalmar_Talk, ANIM_WorldKalmar_Idle, 0, MSG_HOS_0008) EVT_SET(AB_HOS_StatcAmt_Kalmar, 200) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_SET(AB_HOS_StatcAmt_Kalmar, 0) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_Kalmar, ANIM_WorldKalmar_Talk, ANIM_WorldKalmar_Idle, 0, MSG_HOS_0009) EVT_CALL(GetNpcPos, NPC_Eldstar, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -172,7 +179,7 @@ EvtScript N(EVS_Scene_StarSpiritsPlea) = { EVT_SET(AB_HOS_StatcAmt_Misstar, 200) EVT_SET(AB_HOS_StatcAmt_Klevar, 200) EVT_SET(AB_HOS_StatcAmt_Kalmar, 200) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_SET(AB_HOS_StatcAmt_Eldstar, 0) EVT_SET(AB_HOS_StatcAmt_Mamar, 0) EVT_SET(AB_HOS_StatcAmt_Skolar, 0) @@ -198,11 +205,15 @@ EvtScript N(EVS_Scene_StarSpiritsPlea) = { EVT_SET(AB_HOS_StatcAmt_Kalmar, 100) EVT_SETF(MV_AlphaAmt_Eldstar, EVT_FLOAT(40.0)) EVT_SETF(MV_AlphaAmt_Others, EVT_FLOAT(40.0)) - EVT_LOOP(20) - EVT_ADDF(MV_AlphaAmt_Eldstar, EVT_FLOAT(-6.0)) - EVT_ADDF(MV_AlphaAmt_Others, EVT_FLOAT(-6.0)) + EVT_LOOP(20 * DT) + EVT_ADDF(MV_AlphaAmt_Eldstar, EVT_FLOAT(-6.0 / DT)) + EVT_ADDF(MV_AlphaAmt_Others, EVT_FLOAT(-6.0 / DT)) EVT_WAIT(1) EVT_END_LOOP +#if VERSION_PAL + EVT_SETF(MapVar(0), EVT_FLOAT(-80.0)) + EVT_SETF(MapVar(1), EVT_FLOAT(-80.0)) +#endif EVT_SET(MF_SpiritsGone, TRUE) EVT_SET(AB_HOS_StatcAmt_Eldstar, 0) EVT_SET(AB_HOS_StatcAmt_Mamar, 0) @@ -219,7 +230,7 @@ EvtScript N(EVS_Scene_StarSpiritsPlea) = { EVT_CALL(EnableModel, MODEL_6, FALSE) EVT_CALL(EnableModel, MODEL_7, FALSE) EVT_CALL(DisablePartnerAI, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -229,19 +240,19 @@ EvtScript N(EVS_Scene_StarSpiritsPlea) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 30) EVT_ADD(LVar2, 30) - EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.0 / DT)) EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 0) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PlayerFaceNpc, NPC_PARTNER, FALSE) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_HOS_000C) EVT_CALL(EnablePartnerAI) EVT_THREAD EVT_SET(GB_StoryProgress, STORY_CH0_MET_STAR_SPIRITS) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.5)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.5 / DT)) EVT_END_THREAD - EVT_CALL(FadeOutMusic, 0, 3000) - EVT_WAIT(10) + EVT_CALL(FadeOutMusic, 0, 3000 * DT) + EVT_WAIT(10 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END diff --git a/src/world/area_hos/hos_01/hos_01_6_star_way.c b/src/world/area_hos/hos_01/hos_01_6_star_way.c index e0ba98c6a6..b7678c5e6e 100644 --- a/src/world/area_hos/hos_01/hos_01_6_star_way.c +++ b/src/world/area_hos/hos_01/hos_01_6_star_way.c @@ -32,7 +32,11 @@ EvtScript N(EVS_Scene_StarWayOpened) = { EVT_WAIT(10) EVT_CALL(ShowMessageAtScreenPos, MSG_HOS_005D, 160, 40) EVT_CALL(SetMusicTrack, 0, SONG_STAR_WAY_OPENS, 0, 8) +#if VERSION_PAL + EVT_WAIT(30) +#else EVT_WAIT(10) +#endif EVT_CALL(EnableModel, MODEL_power, TRUE) EVT_SET(MV_StarBeamState, 1) EVT_LABEL(10) diff --git a/src/world/area_hos/hos_04/hos_04_6_intro.c b/src/world/area_hos/hos_04/hos_04_6_intro.c index e547d0e1a8..6356c279cc 100644 --- a/src/world/area_hos/hos_04/hos_04_6_intro.c +++ b/src/world/area_hos/hos_04/hos_04_6_intro.c @@ -92,7 +92,7 @@ API_CALLABLE(N(AnimateBoomLengthPostHeist)) { camera->panActive = TRUE; camera->controlSettings.boomLength = N(CurrentBoomLengthPost); N(TargetBoomLengthPost)++; - if (N(TargetBoomLengthPost) < 70) { + if (N(TargetBoomLengthPost) < (s32)(70 * DT)) { return ApiStatus_BLOCK; } return ApiStatus_DONE1; @@ -112,7 +112,7 @@ API_CALLABLE(N(AnimateViewPitchPostHeist)) { camera->panActive = TRUE; camera->controlSettings.viewPitch = N(CurrentViewPitch); N(TargetViewPitch)++; - if (N(TargetViewPitch) == 200) { + if (N(TargetViewPitch) == (s32)(200 * DT)) { return ApiStatus_DONE2; } return ApiStatus_BLOCK; @@ -140,22 +140,22 @@ EvtScript N(EVS_ControlTwink) = { EVT_CALL(SetNpcAnimation, NPC_Twink, ANIM_Twink_Back) EVT_CALL(SetNpcYaw, NPC_Twink, 180) EVT_CALL(N(AnimateBoomLengthPostHeist)) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpNpcYaw, NPC_Twink, 0, 0) EVT_WAIT(2) EVT_CALL(SetNpcAnimation, NPC_Twink, ANIM_Twink_Still) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(InterpNpcYaw, NPC_Twink, 180, 0) EVT_WAIT(2) EVT_CALL(SetNpcAnimation, NPC_Twink, ANIM_Twink_Back) EVT_END_THREAD EVT_THREAD - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_CALL(N(AnimateViewPitchPostHeist)) EVT_END_THREAD - EVT_CALL(LoadPath, 200, EVT_PTR(N(TwinkFlightPath)), ARRAY_COUNT(N(TwinkFlightPath)), EASING_LINEAR) + EVT_CALL(LoadPath, 200 * DT, EVT_PTR(N(TwinkFlightPath)), ARRAY_COUNT(N(TwinkFlightPath)), EASING_LINEAR) EVT_LABEL(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_Twink, LVar1, LVar2, LVar3) @@ -165,10 +165,10 @@ EvtScript N(EVS_ControlTwink) = { EVT_END_IF EVT_CALL(SetNpcPos, NPC_Twink, NPC_DISPOSE_LOCATION) EVT_THREAD - EVT_WAIT(85) + EVT_WAIT(85 * DT) EVT_CALL(N(BlockForever)) EVT_END_THREAD - EVT_WAIT(120) + EVT_WAIT(120 * DT) EVT_CALL(N(ResumeIntroState)) EVT_RETURN EVT_END diff --git a/src/world/area_hos/hos_04/hos_04_8_narrator.c b/src/world/area_hos/hos_04/hos_04_8_narrator.c index 13d44e479c..6f1de82021 100644 --- a/src/world/area_hos/hos_04/hos_04_8_narrator.c +++ b/src/world/area_hos/hos_04/hos_04_8_narrator.c @@ -2,11 +2,19 @@ #include "../common/Narrator.inc.c" +#if VERSION_PAL +#define DURATION_INTRO_MSG (35) +#define DURATION_BLANK (73) +#else +#define DURATION_INTRO_MSG (44) +#define DURATION_BLANK (89) +#endif + IntroMessage N(HeistMessageList)[] = { - { INTRO_MSG_BLANK, 89 }, - { MSG_Intro_001B, 44 }, - { MSG_Intro_001C, 44 }, - { MSG_Intro_001D, 44 }, + { INTRO_MSG_BLANK, DURATION_BLANK }, + { MSG_Intro_001B, DURATION_INTRO_MSG }, + { MSG_Intro_001C, DURATION_INTRO_MSG }, + { MSG_Intro_001D, DURATION_INTRO_MSG }, {}, // end of list }; diff --git a/src/world/area_hos/hos_05/hos_05_4_npc.c b/src/world/area_hos/hos_05/hos_05_4_npc.c index 66ce890273..b6ef55bd7d 100644 --- a/src/world/area_hos/hos_05/hos_05_4_npc.c +++ b/src/world/area_hos/hos_05/hos_05_4_npc.c @@ -100,7 +100,7 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_THREAD EVT_CALL(func_802D2C14, 1) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(PlayerMoveTo, 0, 80, 10) EVT_CALL(PlayerFaceNpc, NPC_Eldstar, FALSE) EVT_END_THREAD @@ -110,19 +110,19 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { EVT_CALL(SetCamPosA, CAM_DEFAULT, 0, 0) EVT_CALL(SetCamPosB, CAM_DEFAULT, 0, -50) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(10.0), EVT_FLOAT(-2.5)) - 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(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 220, -275) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(-4.5), EVT_FLOAT(-3.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_HOS_0069) EVT_CALL(func_802D2C14, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetSelfVar, 0, 1) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 136, 80) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(600.0)) @@ -240,28 +240,28 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { EVT_END_LOOP EVT_CALL(N(UnlockStarBeam)) EVT_CALL(SetSelfVar, 0, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0198, 160, 40) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 220, -275) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(-4.5), EVT_FLOAT(-3.0)) 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(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_HOS_006A) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 136, 80) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(510.0)) EVT_CALL(SetCamPosA, CAM_DEFAULT, 0, 0) EVT_CALL(SetCamPosB, CAM_DEFAULT, 0, -50) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(8.0), EVT_FLOAT(-7.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_WAIT(30) + EVT_WAIT(30 * DT) EVT_SET(GB_StoryProgress, STORY_CH8_STAR_SHIP_ACTIVATED) EVT_EXEC_WAIT(N(EVS_Starship_Summon)) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 220, -275) @@ -270,9 +270,9 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { 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(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_HOS_006B) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Back) EVT_CALL(SetNpcAnimation, NPC_Muskular, ANIM_WorldMuskular_Back) EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Back) @@ -284,7 +284,7 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.5)) EVT_CALL(EnableModel, MODEL_o362, FALSE) EVT_CALL(EnableModel, MODEL_o397, FALSE) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END diff --git a/src/world/area_hos/hos_05/hos_05_5_intro.c b/src/world/area_hos/hos_05/hos_05_5_intro.c index 2e33ee5842..86314bbb62 100644 --- a/src/world/area_hos/hos_05/hos_05_5_intro.c +++ b/src/world/area_hos/hos_05/hos_05_5_intro.c @@ -712,7 +712,7 @@ API_CALLABLE(N(CamPushIn_BowserInhale)) { } N(CamMoveInhaleTime)++; - if (N(CamMoveInhaleTime) <= 40) { + if (N(CamMoveInhaleTime) <= (s32)(40 * DT)) { return ApiStatus_BLOCK; } return ApiStatus_DONE1; @@ -728,7 +728,7 @@ API_CALLABLE(N(CamPullBack_BowserExhale)) { camera->panActive = TRUE; camera->controlSettings.boomLength = N(BoomLengthExhale); N(CamMoveExhaleTime)++; - if (N(CamMoveExhaleTime) < 21) { + if (N(CamMoveExhaleTime) < (s32)(21 * DT)) { return ApiStatus_BLOCK; } return ApiStatus_DONE1; @@ -757,7 +757,7 @@ API_CALLABLE(N(BowserFlyToStarRod)) { bowserProp->colliderPos.z = bowserProp->pos.z; N(FlyToStarRodTime)++; - if (N(FlyToStarRodTime) <= 40) { + if (N(FlyToStarRodTime) <= (s32)(40 * DT)) { return ApiStatus_BLOCK; } return ApiStatus_DONE1; @@ -823,7 +823,7 @@ API_CALLABLE(N(CamPullBack_BowserHoldingStarRod)) { camera->movePos.z = N(HoldStarRodCamZ); N(HoldStarRodTime)++; - if (N(HoldStarRodTime) <= 90) { + if (N(HoldStarRodTime) <= (s32)(90 * DT)) { return ApiStatus_BLOCK; } return ApiStatus_DONE1; @@ -848,7 +848,7 @@ API_CALLABLE(N(CamPanAcrossRoom)) { camera->controlSettings.points.two.Bz = cos_deg(N(PanAcrossRoomAngle)) * 500.0f; N(PanAcrossRoomTime)++; - if (N(PanAcrossRoomTime) == 170) { + if (N(PanAcrossRoomTime) == (s32)(170 * DT)) { return ApiStatus_DONE1; } return ApiStatus_BLOCK; @@ -875,7 +875,7 @@ API_CALLABLE(N(CamMove_OrbitKammy)) { camera->movePos.y = N(OrbitKammyCamY); N(OrbitKammyTime)++; - if (N(OrbitKammyTime) <= 120) { + if (N(OrbitKammyTime) <= (s32)(120 * DT)) { return ApiStatus_BLOCK; } else { return ApiStatus_DONE1; @@ -1090,7 +1090,7 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(func_802D7B10, ArrayVar(13)) EVT_END_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(func_802D7B10, ArrayVar(3)) EVT_CALL(GetNpcPos, NPC_Skolar, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 1, LVar0, LVar1, LVar2, 4, 20) @@ -1118,7 +1118,7 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_CALL(SetNpcFlagBits, NPC_Skolar, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(func_802D7B10, ArrayVar(10)) EVT_END_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(func_802D7B10, ArrayVar(4)) EVT_CALL(GetNpcPos, NPC_Muskular, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 1, LVar0, LVar1, LVar2, 4, 20) @@ -1146,7 +1146,7 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_CALL(SetNpcFlagBits, NPC_Muskular, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(func_802D7B10, ArrayVar(11)) EVT_END_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(func_802D7B10, ArrayVar(7)) EVT_CALL(GetNpcPos, NPC_Kalmar, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 1, LVar0, LVar1, LVar2, 4, 20) @@ -1174,7 +1174,7 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_CALL(SetNpcFlagBits, NPC_Kalmar, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(func_802D7B10, ArrayVar(14)) EVT_END_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(func_802D7B10, ArrayVar(5)) EVT_CALL(GetNpcPos, NPC_Misstar, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 1, LVar0, LVar1, LVar2, 4, 20) @@ -1202,7 +1202,7 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_CALL(SetNpcFlagBits, NPC_Misstar, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(func_802D7B10, ArrayVar(12)) EVT_END_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(func_802D7B10, ArrayVar(2)) EVT_CALL(GetNpcPos, NPC_Mamar, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 1, LVar0, LVar1, LVar2, 4, 20) @@ -1230,7 +1230,7 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(func_802D7B10, ArrayVar(9)) EVT_END_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_RETURN EVT_END }; @@ -1266,7 +1266,7 @@ API_CALLABLE(N(KammyFlyToBowser)) { kammy->colliderPos.z = kammy->pos.z; N(FlyToBowserTime)++; - if (N(FlyToBowserTime) <= 40) { + if (N(FlyToBowserTime) <= (s32)(40 * DT)) { return ApiStatus_BLOCK; } return ApiStatus_DONE1; @@ -1563,20 +1563,64 @@ s32 N(CurrentStoryPageTime)= 0; u32 N(BowserSilhouetteTime) = 0; s32 N(StoryPageDuration)[] = { - [STORY_PAGE_BLANK] 222, - [STORY_PAGE_STARRY_SKY] 338, - [STORY_PAGE_SHRINE_EXT] 338, - [STORY_PAGE_STAR_ROD] 338, - [STORY_PAGE_SHRINE_INT] 622, + [STORY_PAGE_BLANK] 222 * DT, + [STORY_PAGE_STARRY_SKY] 338 * DT, + [STORY_PAGE_SHRINE_EXT] 338 * DT, + [STORY_PAGE_STAR_ROD] 338 * DT, + [STORY_PAGE_SHRINE_INT] 622 * DT, }; s32 N(NextPageAnimOffsetsX)[] = { +#if VERSION_PAL + 0, 0, 0, -1, -3, -7, -12, -18, -28, -43, -60, -80, -100, -120, -140, -160, -180, -200, -220, -515, -270, +#else 0, 0, 0, -1, -2, -3, -4, -9, -15, -22, -30, -39, -49, -60, -72, -85, -99, -114, -130, -147, -165, -184, -204, -225, -247, -270, +#endif }; +#if VERSION_PAL +static u32 padding = 0; +#endif + u8 N(BowserSilhouetteShakeY)[] = { +#if VERSION_PAL + 240, 240, 240, 240, 210, 185, 174, 168, + 170, 170, 170, 170, 170, 167, 165, 163, + 162, 162, 161, 161, 162, 163, 164, 165, + 167, 173, 175, 176, 176, 175, 171, 170, + 170, 167, 165, 164, 165, 167, 170, 173, + 176, 176, 175, 173, 170, 165, 164, 164, + 165, 167, 173, 175, 176, 176, 175, 170, + 167, 165, 164, 165, 165, 164, 165, 164, + 165, 165, 164, 165, 164, 165, 165, 164, + 164, 165, 167, 173, 175, 176, 176, 176, + 176, 176, 174, 170, 167, 164, 164, 165, + 167, 170, 167, 165, 164, 164, 165, 170, + 170, 167, 165, 164, 165, 167, 170, 170, + 167, 164, 164, 165, 167, 170, 167, 165, + 164, 164, 165, 170, 170, 167, 165, 164, + 165, 167, 170, 170, 167, 164, 165, 166, + 167, 166, 166, 167, 166, 165, 166, 166, + 165, 166, 167, 166, 168, 169, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, + 173, 175, 176, 175, 173, 170, 167, 165, + 164, 165, 167, 170, 173, 176, 176, 175, + 173, 170, 165, 164, 164, 165, 167, 173, + 174, 175, 174, 173, 167, 165, 164, 164, + 165, 170, 173, 175, 176, 176, 173, 170, + 167, 165, 164, 165, 167, 170, 173, 175, + 176, 175, 173, 170, 167, 164, 164, 165, + 167, 169, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 165, 164, 164, 165, + 167, 170, 167, 165, 164, 164, 167, 170, + 173, 175, 176, 175, 173, 170, 167, 165, + 164, 165, 167, 170, 173, 176, 176, 175, + 173, 170, 165, 164, 164, 165, 167, 173, + 175, 176, 176, 175, 170, 167, 165, 164, + 164, 167, 170, +#else 240, 240, 240, 240, 210, 197, 185, 174, 168, 170, 170, 170, 170, 170, 170, 167, 165, 164, 163, 162, 162, 161, 161, 162, @@ -1617,6 +1661,7 @@ u8 N(BowserSilhouetteShakeY)[] = { 175, 173, 170, 167, 165, 164, 164, 165, 167, 170, 173, 175, 176, 176, 175, 173, 170, 167, 165, 164, 164, 165, 167, 170, +#endif }; u16 N(BowserSilhouetteLeapX)[] = { @@ -1627,6 +1672,12 @@ u16 N(BowserSilhouetteLeapY)[] = { 3, 2, -6, -21, -40, -63, -90, -120, -160, -200, -240, -280, -320 }; +#if VERSION_PAL +#define BOWSER_APPEARS_TIME (233) +#else +#define BOWSER_APPEARS_TIME (268) +#endif + API_CALLABLE(N(AnimateStorybookPages)) { switch (N(StoryPageState)) { case STORY_PAGE_STATE_BEGIN: @@ -1646,10 +1697,10 @@ API_CALLABLE(N(AnimateStorybookPages)) { if (N(CurrentStoryPageTime) != 0) { N(CurrentStoryPageTime)--; if (!N(StoryGraphicsPtr)->flipOrder) { - N(StoryGraphicsPtr)->frontImgPosX = N(NextPageAnimOffsetsX)[25 - N(CurrentStoryPageTime)]; + N(StoryGraphicsPtr)->frontImgPosX = N(NextPageAnimOffsetsX)[ARRAY_COUNT(N(NextPageAnimOffsetsX)) - 1 - N(CurrentStoryPageTime)]; N(StoryGraphicsPtr)->frontImgPosY = 0; } else { - N(StoryGraphicsPtr)->backImgPosX = N(NextPageAnimOffsetsX)[25 - N(CurrentStoryPageTime)]; + N(StoryGraphicsPtr)->backImgPosX = N(NextPageAnimOffsetsX)[ARRAY_COUNT(N(NextPageAnimOffsetsX)) - 1 - N(CurrentStoryPageTime)]; N(StoryGraphicsPtr)->backImgPosY = 0; } } else { @@ -1682,7 +1733,7 @@ API_CALLABLE(N(AnimateStorybookPages)) { break; case STORY_PAGE_STATE_BOWSER_ANIM: if (N(CurrentStoryPageTime) != 0) { - if (N(CurrentStoryPageTime) < N(StoryPageDuration)[N(CurrentStoryPageIdx)] - 268) { + if (N(CurrentStoryPageTime) < N(StoryPageDuration)[N(CurrentStoryPageIdx)] - BOWSER_APPEARS_TIME) { u32 timeLeft = N(BowserSilhouetteTime) - ARRAY_COUNT(N(BowserSilhouetteShakeY)); if (N(BowserSilhouetteTime) < ARRAY_COUNT(N(BowserSilhouetteShakeY))) { @@ -1702,7 +1753,7 @@ API_CALLABLE(N(AnimateStorybookPages)) { } N(CurrentStoryPageTime)--; } else { - N(CurrentStoryPageTime) = 26; + N(CurrentStoryPageTime) = ARRAY_COUNT(N(NextPageAnimOffsetsX)); N(StoryPageState)++; N(StoryGraphicsPtr)->tapeAlpha = 255; sfx_play_sound(SOUND_B0); @@ -1712,10 +1763,10 @@ API_CALLABLE(N(AnimateStorybookPages)) { if (N(CurrentStoryPageTime) != 0) { N(CurrentStoryPageTime)--; if (!N(StoryGraphicsPtr)->flipOrder) { - N(StoryGraphicsPtr)->backImgPosX = N(NextPageAnimOffsetsX)[25 - N(CurrentStoryPageTime)]; + N(StoryGraphicsPtr)->backImgPosX = N(NextPageAnimOffsetsX)[ARRAY_COUNT(N(NextPageAnimOffsetsX)) - 1 - N(CurrentStoryPageTime)]; N(StoryGraphicsPtr)->backImgPosY = 0; } else { - N(StoryGraphicsPtr)->frontImgPosX = N(NextPageAnimOffsetsX)[25 - N(CurrentStoryPageTime)]; + N(StoryGraphicsPtr)->frontImgPosX = N(NextPageAnimOffsetsX)[ARRAY_COUNT(N(NextPageAnimOffsetsX)) - 1 - N(CurrentStoryPageTime)]; N(StoryGraphicsPtr)->frontImgPosY = 0; } } else { @@ -1841,6 +1892,11 @@ EvtScript N(EVS_Intro_Main) = { f32 N(AnimBowser_FlyOff_Time) = 0.0; +#if VERSION_PAL +API_CALLABLE(N(AnimBowser_FlyOff)); +INCLUDE_ASM(ApiResult, "world/area_hos/hos_05/hos_05_5_intro", AnimBowser_FlyOff); +asm(".section .data"); +#else API_CALLABLE(N(AnimBowser_FlyOff)) { Npc* bowserMain = resolve_npc(script, NPC_Bowser_Body); Npc* bowserProp = resolve_npc(script, NPC_Bowser_Prop); @@ -1863,9 +1919,14 @@ API_CALLABLE(N(AnimBowser_FlyOff)) { return ApiStatus_BLOCK; } } +#endif f32 N(AnimKammy_FlyOff_Time) = 0.0; +#if VERSION_PAL +API_CALLABLE(N(AnimKammy_FlyOff)); +INCLUDE_ASM(ApiResult, "world/area_hos/hos_05/hos_05_5_intro", AnimKammy_FlyOff); +#else API_CALLABLE(N(AnimKammy_FlyOff)) { Npc* kammy = resolve_npc(script, NPC_Kammy); @@ -1885,6 +1946,7 @@ API_CALLABLE(N(AnimKammy_FlyOff)) { return ApiStatus_BLOCK; } } +#endif API_CALLABLE(N(func_80244934_A2EB74)) { if (isInitialCall) { @@ -1952,14 +2014,14 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, -145, 147, 84) EVT_CALL(LoadSettings, CAM_DEFAULT, EVT_PTR(N(IntroCamSettings6))) EVT_CALL(N(AnimateStorybookPages)) - EVT_WAIT(50) + EVT_WAIT(50 * DT) EVT_CALL(func_802CFD30, NPC_Bowser_Body, FOLD_TYPE_8, 0, 0, 0, 0) EVT_CALL(func_802CFD30, NPC_Bowser_Prop, FOLD_TYPE_8, 0, 0, 0, 0) EVT_CALL(SetNpcPos, NPC_Bowser_Body, -64, 135, 85) EVT_CALL(SetNpcPos, NPC_Bowser_Prop, -64, 135, 85) EVT_THREAD EVT_SET(LVar0, 0) - EVT_LOOP(50) + EVT_LOOP(50 * DT) EVT_ADD(LVar0, 6) EVT_IF_GT(LVar0, 255) EVT_SET(LVar0, 255) @@ -1972,7 +2034,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_THREAD EVT_CALL(InterpNpcYaw, NPC_Bowser_Prop, 90, 0) EVT_SET(LVar0, 0) - EVT_LOOP(40) + EVT_LOOP(40 * DT) EVT_ADD(LVar0, 36) EVT_CALL(SetNpcRotation, NPC_Bowser_Body, 0, LVar0, 0) EVT_WAIT(1) @@ -1988,7 +2050,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_THREAD EVT_CALL(N(FadeAwayTapeGraphic)) EVT_END_THREAD - EVT_WAIT(16) + EVT_WAIT(16 * DT) EVT_THREAD EVT_CALL(N(func_80244934_A2EB74)) EVT_END_THREAD @@ -2003,7 +2065,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(N(SetWorldFogParams), 0, 0, 0, 0, 0, 0, 0, 995, 1000) EVT_WAIT(5) EVT_END_LOOP - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(func_802CFD30, NPC_Bowser_Body, FOLD_TYPE_8, 0, 0, 0, 255) EVT_CALL(func_802CFD30, NPC_Bowser_Prop, FOLD_TYPE_8, 0, 0, 0, 255) EVT_THREAD @@ -2040,7 +2102,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_THREAD EVT_CALL(N(AddKammyHoverOffset)) EVT_END_THREAD - EVT_WAIT(50) + EVT_WAIT(50 * DT) EVT_CALL(N(AdjustCamVfov), 0, 40) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 157, 0) EVT_CALL(LoadSettings, CAM_DEFAULT, EVT_PTR(N(IntroCamSettings7))) @@ -2128,7 +2190,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(N(SetWorldFogParams), 0, 0, 0, 0, 0, 0, 0, 995, 1000) EVT_WAIT(5) EVT_END_LOOP - EVT_WAIT(27) + EVT_WAIT(27 * DT) EVT_CALL(func_802D7B10, ArrayVar(17)) EVT_CALL(N(SetWorldFogParams), 0, 0, 0, 0, 0, 0, 0, 995, 1000) EVT_CALL(N(AdjustCamVfov), 0, 25) @@ -2172,22 +2234,22 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_THREAD EVT_CALL(N(CamPullBack_BowserExhale)) EVT_END_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 0, 0, 180, 0, EVT_FLOAT(0.703125), 30) EVT_THREAD EVT_WAIT(2) EVT_CALL(RemoveEffect, ArrayVar(15)) EVT_END_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(N(AdjustCamVfov), 0, 25) EVT_CALL(SetPanTarget, CAM_DEFAULT, -38, 210, 85) EVT_CALL(LoadSettings, CAM_DEFAULT, EVT_PTR(N(IntroCamSettings9))) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarOpenMouth) EVT_THREAD EVT_CALL(N(BowserFlyToStarRod)) EVT_END_THREAD - EVT_WAIT(25) + EVT_WAIT(25 * DT) EVT_CALL(N(AdjustCamVfov), 0, 35) EVT_CALL(SetPanTarget, CAM_DEFAULT, -240, 200, 113) EVT_CALL(LoadSettings, CAM_DEFAULT, EVT_PTR(N(IntroCamSettings10))) @@ -2235,7 +2297,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_MULF(LVar1, EVT_FLOAT(0.93)) EVT_MULF(LVar2, EVT_FLOAT(0.9)) EVT_CALL(SetNpcPos, NPC_Misstar, LVar0, LVar1, LVar2) - EVT_WAIT(35) + EVT_WAIT(35 * DT) EVT_CALL(N(AdjustCamVfov), 0, 35) EVT_CALL(SetPanTarget, CAM_DEFAULT, 30, 232, 0) EVT_CALL(LoadSettings, CAM_DEFAULT, EVT_PTR(N(IntroCamSettings11))) @@ -2250,9 +2312,9 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_SET(LVar1, 260) EVT_SET(LVar2, -21) EVT_CALL(N(SetLightRayPos)) - EVT_WAIT(35) + EVT_WAIT(35 * DT) EVT_THREAD - EVT_WAIT(70) + EVT_WAIT(70 * DT) EVT_SET(LVar0, 0) EVT_LOOP(10) EVT_ADD(LVar0, 12) @@ -2261,7 +2323,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_WAIT(92) + EVT_WAIT(92 * DT) EVT_CALL(N(SetWorldColorParams), 106, 94, 110, 216, 195, 131, 8) EVT_CALL(N(SetWorldColorParams), 100, 105, 107, 159, 118, 50, 20) EVT_CALL(N(SetWorldColorParams), 122, 180, 110, 0, 0, 0, 15) @@ -2349,7 +2411,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(func_802CFD30, NPC_Kalmar, FOLD_TYPE_7, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(func_802CFD30, NPC_Eldstar, FOLD_TYPE_7, 255, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SOMETHING_ROTATING, 2, -130, 220, 130, 1, 0) EVT_SET(ArrayVar(0), LVarF) @@ -2386,7 +2448,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(func_802D7B10, ArrayVar(8)) EVT_END_THREAD - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(N(AdjustCamVfov), 0, 50) EVT_CALL(SetPanTarget, CAM_DEFAULT, 40, 200, -40) EVT_CALL(LoadSettings, CAM_DEFAULT, EVT_PTR(N(IntroCamSettings13))) @@ -2399,7 +2461,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim12) EVT_EXEC(N(EVS_CaptureSpirits)) EVT_CALL(N(CamPanAcrossRoom)) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim09) EVT_THREAD EVT_WAIT(10) @@ -2417,7 +2479,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_THREAD EVT_CALL(N(CamPullBack_Final)) EVT_END_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_THREAD EVT_CALL(func_80244550_A2E790) EVT_END_THREAD @@ -2434,9 +2496,9 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(N(SetCardCaptureState3)) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0D) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim11) - EVT_WAIT(32) + EVT_WAIT(32 * DT) EVT_CALL(SetNpcJumpscale, NPC_Eldstar, EVT_FLOAT(0.0)) EVT_CALL(SetNpcJumpscale, NPC_Mamar, EVT_FLOAT(0.0)) EVT_CALL(SetNpcJumpscale, NPC_Skolar, EVT_FLOAT(0.0)) @@ -2448,9 +2510,9 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_THREAD EVT_CALL(N(AnimBowser_FlyOff)) EVT_END_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(N(AnimKammy_FlyOff)) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(N(ResumeIntro)) EVT_RETURN EVT_END diff --git a/src/world/area_hos/hos_05/hos_05_6_narrator.c b/src/world/area_hos/hos_05/hos_05_6_narrator.c index 57fc47889e..c704bff9fc 100644 --- a/src/world/area_hos/hos_05/hos_05_6_narrator.c +++ b/src/world/area_hos/hos_05/hos_05_6_narrator.c @@ -2,44 +2,60 @@ #include "../common/Narrator.inc.c" +#if VERSION_PAL +#define DURATION_24 (14) +#define DURATION_30 (19) +#define DURATION_40 (27) +#define DURATION_50 (35) +#define DURATION_56 (40) +#define DURATION_60 (44) +#else +#define DURATION_24 (24) +#define DURATION_30 (30) +#define DURATION_40 (40) +#define DURATION_50 (50) +#define DURATION_56 (56) +#define DURATION_60 (60) +#endif + IntroMessage N(HeistMessageList)[] = { - { INTRO_MSG_BLANK, 30 }, - { MSG_Intro_0001, 50 }, - { MSG_Intro_0002, 50 }, - { INTRO_MSG_BLANK, 50 }, - { MSG_Intro_0003, 50 }, - { MSG_Intro_0004, 50 }, - { MSG_Intro_0005, 50 }, - { INTRO_MSG_BLANK, 50 }, - { MSG_Intro_0006, 50 }, - { MSG_Intro_0007, 50 }, - { MSG_Intro_0008, 50 }, - { INTRO_MSG_BLANK, 50 }, - { MSG_Intro_0009, 50 }, - { MSG_Intro_000A, 50 }, - { MSG_Intro_000B, 50 }, - { INTRO_MSG_BLANK, 50 }, - { MSG_Intro_000C, 30 }, - { MSG_Intro_000D, 30 }, - { MSG_Intro_000E, 50 }, - { MSG_Intro_000F, 30 }, - { MSG_Intro_0010, 30 }, - { MSG_Intro_0011, 30 }, - { MSG_Intro_0012, 50 }, - { MSG_Intro_0013, 30 }, - { INTRO_MSG_BLANK, 40 }, - { MSG_Intro_0014, 56 }, - { INTRO_MSG_BLANK, 50 }, - { MSG_Intro_0015, 30 }, - { INTRO_MSG_BLANK, 30 }, - { MSG_Intro_0016, 50 }, - { INTRO_MSG_BLANK, 30 }, - { MSG_Intro_0017, 50 }, - { MSG_Intro_0018, 50 }, - { INTRO_MSG_BLANK, 60 }, - { MSG_Intro_0019, 50 }, - { INTRO_MSG_BLANK, 24 }, - { MSG_Intro_001A, 30 }, + { INTRO_MSG_BLANK, DURATION_30 }, + { MSG_Intro_0001, DURATION_50 }, + { MSG_Intro_0002, DURATION_50 }, + { INTRO_MSG_BLANK, DURATION_50 }, + { MSG_Intro_0003, DURATION_50 }, + { MSG_Intro_0004, DURATION_50 }, + { MSG_Intro_0005, DURATION_50 }, + { INTRO_MSG_BLANK, DURATION_50 }, + { MSG_Intro_0006, DURATION_50 }, + { MSG_Intro_0007, DURATION_50 }, + { MSG_Intro_0008, DURATION_50 }, + { INTRO_MSG_BLANK, DURATION_50 }, + { MSG_Intro_0009, DURATION_50 }, + { MSG_Intro_000A, DURATION_50 }, + { MSG_Intro_000B, DURATION_50 }, + { INTRO_MSG_BLANK, DURATION_50 }, + { MSG_Intro_000C, DURATION_30 }, + { MSG_Intro_000D, DURATION_30 }, + { MSG_Intro_000E, DURATION_50 }, + { MSG_Intro_000F, DURATION_30 }, + { MSG_Intro_0010, DURATION_30 }, + { MSG_Intro_0011, DURATION_30 }, + { MSG_Intro_0012, DURATION_50 }, + { MSG_Intro_0013, DURATION_30 }, + { INTRO_MSG_BLANK, DURATION_40 }, + { MSG_Intro_0014, DURATION_56 }, + { INTRO_MSG_BLANK, DURATION_50 }, + { MSG_Intro_0015, DURATION_30 }, + { INTRO_MSG_BLANK, DURATION_30 }, + { MSG_Intro_0016, DURATION_50 }, + { INTRO_MSG_BLANK, DURATION_30 }, + { MSG_Intro_0017, DURATION_50 }, + { MSG_Intro_0018, DURATION_50 }, + { INTRO_MSG_BLANK, DURATION_60 }, + { MSG_Intro_0019, DURATION_50 }, + { INTRO_MSG_BLANK, DURATION_24 }, + { MSG_Intro_001A, DURATION_30 }, {}, // end of list }; diff --git a/src/world/area_hos/hos_10/hos_10_6_pre_title.c b/src/world/area_hos/hos_10/hos_10_6_pre_title.c index 90ffc83cf8..e95865eeab 100644 --- a/src/world/area_hos/hos_10/hos_10_6_pre_title.c +++ b/src/world/area_hos/hos_10/hos_10_6_pre_title.c @@ -46,17 +46,17 @@ EvtScript N(EVS_Scene_PreTitle) = { EVT_CALL(EnableTexPanning, MODEL_k12, TRUE) EVT_THREAD EVT_SETF(LVar0, -1800) - EVT_LOOP(450) + EVT_LOOP(450 * DT) EVT_CALL(TranslateModel, MODEL_o3, 0, LVar0, 0) - EVT_ADDF(LVar0, EVT_FLOAT(1.5)) + EVT_ADDF(LVar0, EVT_FLOAT(1.5 / DT)) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_THREAD EVT_SETF(LVar0, -1725) - EVT_LOOP(450) + EVT_LOOP(450 * DT) EVT_CALL(TranslateGroup, MODEL_kumo, 0, LVar0, 0) - EVT_ADDF(LVar0, EVT_FLOAT(2.5)) + EVT_ADDF(LVar0, EVT_FLOAT(2.5 / DT)) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD @@ -70,7 +70,7 @@ EvtScript N(EVS_Scene_PreTitle) = { EVT_END_LOOP EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, 0, -130, 480, 0) EVT_END_THREAD - EVT_CALL(MakeLerp, 350, -200, 400, EASING_LINEAR) + EVT_CALL(MakeLerp, 350, -200, 400 * DT, EASING_LINEAR) EVT_SET(LVar2, 0) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -84,7 +84,7 @@ EvtScript N(EVS_Scene_PreTitle) = { EVT_END_IF EVT_END_LOOP EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_21"), kmr_21_ENTRY_0, TRANSITION_7) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_RETURN EVT_END }; diff --git a/src/world/area_isk/isk_01/isk_01_1_music.c b/src/world/area_isk/isk_01/isk_01_1_music.c index 0c2cce4377..503a7e7f0e 100644 --- a/src/world/area_isk/isk_01/isk_01_1_music.c +++ b/src/world/area_isk/isk_01/isk_01_1_music.c @@ -18,6 +18,9 @@ EvtScript N(EVS_SetupMusic) = { EVT_END_THREAD EVT_RETURN EVT_END_IF +#if VERSION_PAL + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) +#else EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) @@ -26,6 +29,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) EVT_END_SWITCH +#endif EVT_RETURN EVT_END }; diff --git a/src/world/area_isk/isk_02/isk_02_1_main.c b/src/world/area_isk/isk_02/isk_02_1_main.c index a068a53526..a6f9b150aa 100644 --- a/src/world/area_isk/isk_02/isk_02_1_main.c +++ b/src/world/area_isk/isk_02/isk_02_1_main.c @@ -20,6 +20,9 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC_WAIT(N(EVS_SetupLock)) EVT_EXEC(N(EVS_SetupSarcophagi)) +#if VERSION_PAL + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) +#else EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) @@ -28,6 +31,7 @@ EvtScript N(EVS_Main) = { EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) EVT_END_SWITCH +#endif EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_RETURN diff --git a/src/world/area_isk/isk_03/isk_03_1_main.c b/src/world/area_isk/isk_03/isk_03_1_main.c index 99b805a116..603ccadc83 100644 --- a/src/world/area_isk/isk_03/isk_03_1_main.c +++ b/src/world/area_isk/isk_03/isk_03_1_main.c @@ -26,6 +26,9 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupSand)) EVT_EXEC(N(EVS_SetupSwitch)) +#if VERSION_PAL + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) +#else EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) @@ -34,6 +37,7 @@ EvtScript N(EVS_Main) = { EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) EVT_END_SWITCH +#endif EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_RETURN diff --git a/src/world/area_isk/isk_04/isk_04_1_music.c b/src/world/area_isk/isk_04/isk_04_1_music.c index e131cd95b2..26b36e6299 100644 --- a/src/world/area_isk/isk_04/isk_04_1_music.c +++ b/src/world/area_isk/isk_04/isk_04_1_music.c @@ -18,6 +18,9 @@ EvtScript N(EVS_SetupMusic) = { EVT_END_THREAD EVT_RETURN EVT_END_IF +#if VERSION_PAL + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) +#else EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) @@ -26,6 +29,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) EVT_END_SWITCH +#endif EVT_RETURN EVT_END }; diff --git a/src/world/area_isk/isk_05/isk_05_1_main.c b/src/world/area_isk/isk_05/isk_05_1_main.c index 30022404c0..5a05cfa58c 100644 --- a/src/world/area_isk/isk_05/isk_05_1_main.c +++ b/src/world/area_isk/isk_05/isk_05_1_main.c @@ -23,6 +23,9 @@ EvtScript N(EVS_Main) = { EVT_SETUP_CAMERA_ALT_NO_LEAD() EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) +#if VERSION_PAL + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) +#else EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) @@ -31,6 +34,7 @@ EvtScript N(EVS_Main) = { EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) EVT_END_SWITCH +#endif EVT_CALL(TranslateGroup, MODEL_g304, 0, 65, 0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittw, COLLIDER_FLAGS_UPPER_MASK) EVT_IF_EQ(GF_ISK05_Hammer2Block, FALSE) diff --git a/src/world/area_isk/isk_06/isk_06_1_main.c b/src/world/area_isk/isk_06/isk_06_1_main.c index 8f46595fe4..7c3bcb567e 100644 --- a/src/world/area_isk/isk_06/isk_06_1_main.c +++ b/src/world/area_isk/isk_06/isk_06_1_main.c @@ -23,6 +23,9 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupSand)) EVT_EXEC(N(EVS_SetupSwitch)) +#if VERSION_PAL + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) +#else EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) @@ -31,6 +34,7 @@ EvtScript N(EVS_Main) = { EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) EVT_END_SWITCH +#endif EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_RETURN diff --git a/src/world/area_isk/isk_07/isk_07_1_main.c b/src/world/area_isk/isk_07/isk_07_1_main.c index 219ace2d3b..970eacfa82 100644 --- a/src/world/area_isk/isk_07/isk_07_1_main.c +++ b/src/world/area_isk/isk_07/isk_07_1_main.c @@ -22,6 +22,9 @@ EvtScript N(EVS_Main) = { EVT_EXEC(N(EVS_SetupStairs)) EVT_EXEC(N(EVS_SetupSwitch)) EVT_EXEC(N(EVS_SetupSarcophagi)) +#if VERSION_PAL + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) +#else EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) @@ -30,6 +33,7 @@ EvtScript N(EVS_Main) = { EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) EVT_END_SWITCH +#endif EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_RETURN diff --git a/src/world/area_isk/isk_08/isk_08_1_main.c b/src/world/area_isk/isk_08/isk_08_1_main.c index eb141aad5e..364dd5e0c7 100644 --- a/src/world/area_isk/isk_08/isk_08_1_main.c +++ b/src/world/area_isk/isk_08/isk_08_1_main.c @@ -21,6 +21,9 @@ EvtScript N(EVS_Main) = { EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_SetupFlames)) EVT_EXEC_WAIT(N(EVS_SetupBombableWall)) +#if VERSION_PAL + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) +#else EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) @@ -29,6 +32,7 @@ EvtScript N(EVS_Main) = { EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) EVT_END_SWITCH +#endif EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_RETURN diff --git a/src/world/area_isk/isk_09/isk_09_1_music.c b/src/world/area_isk/isk_09/isk_09_1_music.c index 2b1310816b..248b5c3dcb 100644 --- a/src/world/area_isk/isk_09/isk_09_1_music.c +++ b/src/world/area_isk/isk_09/isk_09_1_music.c @@ -18,6 +18,9 @@ EvtScript N(EVS_SetupMusic) = { EVT_END_THREAD EVT_RETURN EVT_END_IF +#if VERSION_PAL + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) +#else EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) @@ -26,6 +29,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) EVT_END_SWITCH +#endif EVT_RETURN EVT_END }; diff --git a/src/world/area_isk/isk_10/isk_10_1_main.c b/src/world/area_isk/isk_10/isk_10_1_main.c index a8ae1b1549..259de20424 100644 --- a/src/world/area_isk/isk_10/isk_10_1_main.c +++ b/src/world/area_isk/isk_10/isk_10_1_main.c @@ -20,6 +20,9 @@ EvtScript N(EVS_Main) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.8)) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC_WAIT(N(EVS_SetupBombableWall)) +#if VERSION_PAL + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) +#else EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) @@ -28,6 +31,7 @@ EvtScript N(EVS_Main) = { EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) EVT_END_SWITCH +#endif EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_RETURN diff --git a/src/world/area_isk/isk_11/isk_11_4_scene.c b/src/world/area_isk/isk_11/isk_11_4_scene.c index 6f48c6de8f..e5478aef33 100644 --- a/src/world/area_isk/isk_11/isk_11_4_scene.c +++ b/src/world/area_isk/isk_11/isk_11_4_scene.c @@ -13,7 +13,7 @@ API_CALLABLE(N(SpawnLensFlare)) { } EvtScript N(EVS_DropHiddenStairs) = { - EVT_CALL(MakeLerp, 0, -300, 30, EASING_LINEAR) + EVT_CALL(MakeLerp, 0, -300, 30 * DT, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) EVT_SET(LVar2, LVar0) @@ -31,7 +31,7 @@ EvtScript N(EVS_DropHiddenStairs) = { EVT_GOTO(10) EVT_END_IF EVT_CALL(PlaySoundAt, SOUND_57, SOUND_SPACE_MODE_0, 16, -562, 621) - EVT_CALL(MakeLerp, LVar0, -550, 25, EASING_LINEAR) + EVT_CALL(MakeLerp, LVar0, -550, 25 * DT, EASING_LINEAR) EVT_CALL(UpdateLerp) EVT_LABEL(20) EVT_CALL(UpdateLerp) @@ -48,7 +48,7 @@ EvtScript N(EVS_DropHiddenStairs) = { EVT_GOTO(20) EVT_END_IF EVT_CALL(PlaySoundAt, SOUND_57, SOUND_SPACE_MODE_0, 41, -587, 618) - EVT_CALL(MakeLerp, LVar0, -800, 25, EASING_LINEAR) + EVT_CALL(MakeLerp, LVar0, -800, 25 * DT, EASING_LINEAR) EVT_CALL(UpdateLerp) EVT_LABEL(30) EVT_CALL(UpdateLerp) @@ -63,7 +63,7 @@ EvtScript N(EVS_DropHiddenStairs) = { EVT_GOTO(30) EVT_END_IF EVT_CALL(PlaySoundAt, SOUND_57, SOUND_SPACE_MODE_0, 66, -612, 616) - EVT_CALL(MakeLerp, LVar0, 0xFFFFFBE6, 25, EASING_LINEAR) + EVT_CALL(MakeLerp, LVar0, 0xFFFFFBE6, 25 * DT, EASING_LINEAR) EVT_CALL(UpdateLerp) EVT_LABEL(40) EVT_CALL(UpdateLerp) @@ -108,23 +108,23 @@ EvtScript N(EVS_ManageSecretPassage) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o2227, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD EVT_CALL(PlaySoundAtCollider, COLLIDER_o2092, SOUND_55, SOUND_SPACE_MODE_0) EVT_CALL(N(SpawnLensFlare), -16, -438, 510, 240) EVT_CALL(N(SpawnLensFlare), 16, -438, 510, 240) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(N(SpawnLensFlare), -27, -438, 508, 240) EVT_CALL(N(SpawnLensFlare), -64, -438, 505, 240) EVT_CALL(N(SpawnLensFlare), 27, -438, 508, 240) EVT_CALL(N(SpawnLensFlare), 64, -438, 505, 240) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(N(SpawnLensFlare), -74, -438, 504, 240) EVT_CALL(N(SpawnLensFlare), -104, -438, 499, 240) EVT_CALL(N(SpawnLensFlare), 74, -438, 504, 240) EVT_CALL(N(SpawnLensFlare), 104, -438, 499, 240) EVT_END_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_THREAD EVT_CALL(PlaySound, SOUND_80000003) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 330, EVT_FLOAT(0.5)) @@ -133,27 +133,31 @@ EvtScript N(EVS_ManageSecretPassage) = { EVT_THREAD EVT_LOOP(12) EVT_PLAY_EFFECT(EFFECT_DUST, 0, 0, -390, 550, 30) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_END_LOOP EVT_END_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_SET(MV_HiddenStairsRevealed, FALSE) EVT_SET(MV_PlayerPanicDone, FALSE) EVT_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_LABEL(20) EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_CarryRun) - EVT_WAIT(8) + EVT_WAIT(8 * DT) EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_CarryAboveRun) - EVT_WAIT(8) + EVT_WAIT(8 * DT) EVT_IF_FALSE(MV_PlayerPanicDone) EVT_GOTO(20) EVT_END_IF EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) +#if VERSION_PAL + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0 / DT)) +#else EVT_CALL(SetPlayerSpeed, 4) +#endif EVT_LABEL(30) EVT_CALL(PlayerMoveTo, 66, 555, 0) EVT_CALL(PlayerMoveTo, -66, 555, 0) @@ -163,7 +167,7 @@ EvtScript N(EVS_ManageSecretPassage) = { EVT_CALL(PlayerMoveTo, 0, 555, 0) EVT_SET(MV_PlayerPanicDone, TRUE) EVT_END_THREAD - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, -520, 530) EVT_CALL(SetCamDistance, CAM_DEFAULT, 140) @@ -177,13 +181,13 @@ EvtScript N(EVS_ManageSecretPassage) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, -520, 530) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, -520, 530) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(10.0), EVT_FLOAT(12.0)) - EVT_WAIT(90) + EVT_WAIT(90 * DT) EVT_EXEC(N(EVS_DropHiddenStairs)) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_SET(MV_HiddenStairsRevealed, TRUE) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) diff --git a/src/world/area_isk/isk_12/isk_12_1_main.c b/src/world/area_isk/isk_12/isk_12_1_main.c index abbfed2e1e..91720d8b49 100644 --- a/src/world/area_isk/isk_12/isk_12_1_main.c +++ b/src/world/area_isk/isk_12/isk_12_1_main.c @@ -27,6 +27,9 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupSand)) EVT_EXEC(N(EVS_SetupSwitches)) +#if VERSION_PAL + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) +#else EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) @@ -35,6 +38,7 @@ EvtScript N(EVS_Main) = { EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) EVT_END_SWITCH +#endif EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_RETURN diff --git a/src/world/area_isk/isk_13/isk_13_1_main.c b/src/world/area_isk/isk_13/isk_13_1_main.c index 85f105d2b4..010b710c3b 100644 --- a/src/world/area_isk/isk_13/isk_13_1_main.c +++ b/src/world/area_isk/isk_13/isk_13_1_main.c @@ -14,6 +14,9 @@ EvtScript N(EVS_Main) = { EVT_SETUP_CAMERA_NO_LEAD() EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) +#if VERSION_PAL + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) +#else EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) @@ -22,6 +25,7 @@ EvtScript N(EVS_Main) = { EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) EVT_END_SWITCH +#endif EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_RETURN diff --git a/src/world/area_isk/isk_14/isk_14_1_main.c b/src/world/area_isk/isk_14/isk_14_1_main.c index 91bd1efcac..86d7607f04 100644 --- a/src/world/area_isk/isk_14/isk_14_1_main.c +++ b/src/world/area_isk/isk_14/isk_14_1_main.c @@ -14,6 +14,9 @@ EvtScript N(EVS_Main) = { EVT_SETUP_CAMERA_NO_LEAD() EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) +#if VERSION_PAL + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) +#else EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) @@ -22,6 +25,7 @@ EvtScript N(EVS_Main) = { EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) EVT_END_SWITCH +#endif EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_RETURN diff --git a/src/world/area_isk/isk_16/isk_16_3_boss.c b/src/world/area_isk/isk_16/isk_16_3_boss.c index b8f36b8fa8..7204a79e35 100644 --- a/src/world/area_isk/isk_16/isk_16_3_boss.c +++ b/src/world/area_isk/isk_16/isk_16_3_boss.c @@ -25,33 +25,33 @@ EvtScript N(EVS_Scene_TutankoopaAppears) = { EVT_CALL(ClearPartnerMoveHistory, NPC_PARTNER) EVT_THREAD EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK) - EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.5)) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.5 / DT)) EVT_CALL(NpcMoveTo, NPC_PARTNER, 311, 487, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) EVT_END_THREAD - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0 / DT)) EVT_CALL(PlayerMoveTo, 343, 460, 0) EVT_EXEC_WAIT(N(EVS_BindExitTriggers)) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetPanTarget, CAM_DEFAULT, 410, -910, 410) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5 / DT)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(ShowMessageAtScreenPos, MSG_CH2_00E2, 160, 40) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcPos, NPC_Tutankoopa_01, 410, -1300, 410) EVT_THREAD - EVT_WAIT(50) + EVT_WAIT(50 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(func_802CFD30, NPC_Tutankoopa_02, FOLD_TYPE_7, 0, 0, 0, 0) EVT_CALL(SetNpcPos, NPC_Tutankoopa_02, 410, -905, 410) EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_02, ANIM_Tutankoopa_Anim10) - EVT_CALL(MakeLerp, 0, 255, 100, EASING_QUADRATIC_IN) + EVT_CALL(MakeLerp, 0, 255, 100 * DT, EASING_QUADRATIC_IN) EVT_LABEL(2) EVT_CALL(UpdateLerp) EVT_CALL(func_802CFD30, NPC_Tutankoopa_02, FOLD_TYPE_7, LVar0, 0, 0, 0) @@ -60,23 +60,27 @@ EvtScript N(EVS_Scene_TutankoopaAppears) = { EVT_GOTO(2) EVT_END_IF EVT_CALL(func_802CFD30, NPC_Tutankoopa_02, FOLD_TYPE_NONE, 0, 0, 0, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_SET(LVar0, 255) - EVT_LOOP(60) + EVT_LOOP(60 * DT) +#if VERSION_PAL + EVT_ADD(LVar0, -5) +#else EVT_ADD(LVar0, -4) +#endif EVT_CALL(N(UnkFunc26), 1, 0, 0, 0, LVar0, 0, 0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(N(UnkFunc26), 1, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(530.0)) - 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_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_CALL(GetNpcPos, NPC_Tutankoopa_02, LVar2, LVar3, LVar4) - EVT_CALL(MakeLerp, 0, 110, 100, EASING_COS_IN_OUT) + EVT_CALL(MakeLerp, 0, 110, 100 * DT, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_ADD(LVar0, LVar3) @@ -86,7 +90,7 @@ EvtScript N(EVS_Scene_TutankoopaAppears) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(GetNpcPos, NPC_Tutankoopa_02, LVar2, LVar3, LVar4) - EVT_CALL(MakeLerp, 0, 100, 60, EASING_COS_IN_OUT) + EVT_CALL(MakeLerp, 0, 100, 60 * DT, EASING_COS_IN_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_SETF(LVar5, EVT_FLOAT(0.47)) @@ -118,16 +122,16 @@ EvtScript N(EVS_Scene_TutankoopaAppears) = { EVT_WAIT(55) EVT_CALL(func_802CFD30, NPC_Tutankoopa_01, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(SetNpcPos, NPC_Tutankoopa_02, 457, -1300, 316) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPanTarget, CAM_DEFAULT, 438, -800, 332) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(225.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(-7.5), EVT_FLOAT(-7.5)) - 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_CALL(SpeakToPlayer, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim0B, ANIM_Tutankoopa_Anim01, 0, MSG_CH2_00E3) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT)) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(EnablePartnerAI) EVT_CALL(SetNpcVar, NPC_Tutankoopa_01, 0, 1) @@ -147,19 +151,19 @@ EvtScript N(EVS_PlayChompSounds) = { EvtScript N(EVS_Scene_TutankoopaDefeated) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) 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_THREAD EVT_CALL(ShowMessageAtScreenPos, MSG_CH2_00E8, 160, 40) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim06) EVT_CALL(SetNpcJumpscale, NPC_Tutankoopa_01, EVT_FLOAT(1.0)) EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_20E3, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_Tutankoopa_01, 442, -910, 393, 30) + EVT_CALL(NpcJump0, NPC_Tutankoopa_01, 442, -910, 393, 30 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_JUMP_3E2, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_Tutankoopa_01, 416, -910, 420, 20) + EVT_CALL(NpcJump0, NPC_Tutankoopa_01, 416, -910, 420, 20 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_JUMP_3E2, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_Tutankoopa_01, 395, -910, 440, 10) - EVT_WAIT(20) + EVT_CALL(NpcJump0, NPC_Tutankoopa_01, 395, -910, 440, 10 * DT) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim01) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 410, -910, 410) EVT_CALL(SetPanTarget, CAM_DEFAULT, 490, -910, 327) @@ -170,9 +174,9 @@ EvtScript N(EVS_Scene_TutankoopaDefeated) = { EVT_CALL(EnableModel, MODEL_o2359, FALSE) EVT_EXEC_GET_TID(N(EVS_PlayChompSounds), LVarA) EVT_CALL(SetNpcPos, NPC_ChainChomp, 516, -910, 263) - EVT_CALL(SetNpcSpeed, NPC_ChainChomp, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_ChainChomp, EVT_FLOAT(3.0 / DT)) EVT_CALL(NpcMoveTo, NPC_ChainChomp, 493, 292, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(GetNpcPos, NPC_Tutankoopa_01, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -184,13 +188,13 @@ EvtScript N(EVS_Scene_TutankoopaDefeated) = { EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim06) EVT_CALL(GetNpcPos, NPC_Tutankoopa_01, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_JUMP_3E2, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_Tutankoopa_01, LVar0, LVar1, LVar2, 20) + EVT_CALL(NpcJump0, NPC_Tutankoopa_01, LVar0, LVar1, LVar2, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim01) EVT_CALL(SpeakToPlayer, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim0B, ANIM_Tutankoopa_Anim01, 5, MSG_CH2_00E9) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_ChainChomp, ANIM_ChainChomp_Anim03) - EVT_CALL(SetNpcSpeed, NPC_ChainChomp, EVT_FLOAT(8.0)) + EVT_CALL(SetNpcSpeed, NPC_ChainChomp, EVT_FLOAT(8.0 / DT)) EVT_CALL(SetNpcPos, NPC_ChainChomp, 486, -910, 340) EVT_CALL(GetNpcPos, NPC_Tutankoopa_01, LVar0, LVar1, LVar2) EVT_CALL(NpcMoveTo, NPC_ChainChomp, LVar0, LVar2, 0) @@ -216,7 +220,7 @@ EvtScript N(EVS_Scene_TutankoopaDefeated) = { EVT_CALL(SetSelfVar, 1, 1) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim02) - EVT_CALL(SetNpcSpeed, NPC_Tutankoopa_01, EVT_FLOAT(8.0)) + EVT_CALL(SetNpcSpeed, NPC_Tutankoopa_01, EVT_FLOAT(8.0 / DT)) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_LookAround) EVT_LOOP(2) EVT_CALL(NpcMoveTo, NPC_Tutankoopa_01, 304, 434, 0) @@ -227,7 +231,7 @@ EvtScript N(EVS_Scene_TutankoopaDefeated) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_CALL(NpcMoveTo, NPC_Tutankoopa_01, 259, 522, 0) EVT_CALL(SetNpcPos, NPC_Tutankoopa_01, 0, -1500, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetSelfVar, 1, 0) EVT_END_THREAD @@ -239,7 +243,7 @@ EvtScript N(EVS_Scene_TutankoopaDefeated) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_SET(GF_ISK16_Defeated_Tutankoopa, TRUE) EVT_CALL(FadeOutMusic, 0, 500) EVT_RETURN diff --git a/src/world/area_isk/isk_18/isk_18_1_main.c b/src/world/area_isk/isk_18/isk_18_1_main.c index 84728fe40d..9ac6b63a64 100644 --- a/src/world/area_isk/isk_18/isk_18_1_main.c +++ b/src/world/area_isk/isk_18/isk_18_1_main.c @@ -16,6 +16,9 @@ EvtScript N(EVS_Main) = { EVT_SETUP_CAMERA_ALT_NO_LEAD() EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_SetupFlames)) +#if VERSION_PAL + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) +#else EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) @@ -24,6 +27,7 @@ EvtScript N(EVS_Main) = { EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) EVT_END_SWITCH +#endif EVT_IF_LT(GB_StoryProgress, STORY_CH2_DRAINED_THIRD_SAND_ROOM) EVT_CALL(EnableModel, MODEL_o1956, FALSE) EVT_CALL(EnableModel, MODEL_o1957, FALSE) diff --git a/src/world/area_iwa/iwa_04/iwa_04_4_npc.c b/src/world/area_iwa/iwa_04/iwa_04_4_npc.c index 7c0c0fc756..fc06e65c49 100644 --- a/src/world/area_iwa/iwa_04/iwa_04_4_npc.c +++ b/src/world/area_iwa/iwa_04/iwa_04_4_npc.c @@ -81,7 +81,7 @@ EvtScript N(EVS_NpcAI_Buzzar) = { EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_NE(LVar0, 0) EVT_CALL(InterruptUsePartner) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_END_IF EVT_CALL(NpcFacePlayer, NPC_SELF, 0) EVT_CALL(ShowMessageAtScreenPos, MSG_CH2_0030, 160, 40) @@ -89,7 +89,7 @@ EvtScript N(EVS_NpcAI_Buzzar) = { EVT_ADD(LVar1, 15) EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetAngleToPlayer, NPC_SELF, LVarA) - EVT_WAIT(4) + EVT_WAIT(4 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 430, 0, -25) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -97,7 +97,7 @@ EvtScript N(EVS_NpcAI_Buzzar) = { EVT_WAIT(1) EVT_CALL(SetPanTarget, CAM_DEFAULT, 30, 180, -600) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(100.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(SpeakToPlayer, NPC_SELF, ANIM_Buzzar_Anim05, ANIM_Buzzar_Anim05, 5, MSG_CH2_0031) @@ -105,7 +105,7 @@ EvtScript N(EVS_NpcAI_Buzzar) = { EVT_CALL(GetNpcPos, NPC_SELF, LVar2, LVar3, LVar4) EVT_SET(LVar5, LVar3) EVT_ADD(LVar5, 150) - EVT_CALL(MakeLerp, LVar3, LVar5, 15, EASING_LINEAR) + EVT_CALL(MakeLerp, LVar3, LVar5, 15 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(SetNpcPos, NPC_SELF, LVar2, LVar0, LVar4) @@ -133,7 +133,7 @@ EvtScript N(EVS_NpcAI_Buzzar) = { EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, 500) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, EVT_FLOAT(0.5), 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(func_802CF56C, 2) @@ -144,7 +144,7 @@ EvtScript N(EVS_NpcAI_Buzzar) = { EVT_CALL(GetNpcPos, NPC_SELF, LVar2, LVar3, LVar4) EVT_SET(LVar5, LVar3) EVT_SUB(LVar5, 150) - EVT_CALL(MakeLerp, LVar3, LVar5, 15, EASING_LINEAR) + EVT_CALL(MakeLerp, LVar3, LVar5, 15 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(SetNpcPos, NPC_SELF, LVar2, LVar0, LVar4) @@ -155,17 +155,17 @@ EvtScript N(EVS_NpcAI_Buzzar) = { EVT_END_LOOP EVT_CALL(SetNpcAnimation, NPC_Buzzar, ANIM_Buzzar_Anim01) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Buzzar, ANIM_Buzzar_Anim07) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Buzzar, ANIM_Buzzar_Anim08) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Buzzar, ANIM_Buzzar_Anim09) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Buzzar, ANIM_Buzzar_Anim0A) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Buzzar, ANIM_Buzzar_Anim01) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, 0, LVar2) EVT_ADD(LVar1, 20) @@ -173,7 +173,7 @@ EvtScript N(EVS_NpcAI_Buzzar) = { EVT_CALL(SetCamDistance, CAM_DEFAULT, 275) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Buzzar_Anim03, ANIM_Buzzar_Anim01, 0, MSG_CH2_0032) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 50, 350, EVT_FLOAT(15.0), EVT_FLOAT(-12.0)) EVT_CALL(ShowChoice, MSG_Choice_0017) @@ -190,7 +190,7 @@ EvtScript N(EVS_NpcAI_Buzzar) = { EVT_SET(LVarB, MSG_CH2_0035) EVT_SET(LVarC, ANIM_Buzzar_Anim04) EVT_END_SWITCH - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, 0, LVar2) EVT_ADD(LVar1, 20) @@ -199,19 +199,19 @@ EvtScript N(EVS_NpcAI_Buzzar) = { 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(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, LVarC, ANIM_Buzzar_Anim01, 0, LVarB) EVT_IF_EQ(LVarA, 1) EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Buzzar_Anim06) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Buzzar_Anim02) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_CALL(GetNpcPos, NPC_SELF, LVar2, LVar3, LVar4) EVT_SET(LVar5, LVar3) EVT_ADD(LVar5, 150) - EVT_CALL(MakeLerp, LVar3, LVar5, 15, EASING_LINEAR) + EVT_CALL(MakeLerp, LVar3, LVar5, 15 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(SetNpcPos, NPC_SELF, LVar2, LVar0, LVar4) @@ -224,13 +224,13 @@ EvtScript N(EVS_NpcAI_Buzzar) = { EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Buzzar_Anim05) 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_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(DisablePlayerInput, FALSE) EVT_ELSE EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) - EVT_WAIT(5) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) + EVT_WAIT(5 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) EVT_END_IF @@ -247,7 +247,7 @@ EvtScript N(EVS_NpcDefeat_Buzzar) = { EVT_CALL(SetNpcPos, NPC_SELF, 530, 15, -20) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Buzzar_Anim0B) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 50, 350, EVT_FLOAT(15.0), EVT_FLOAT(-12.0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, -1, -1, 0, MSG_CH2_0036) EVT_THREAD EVT_CALL(GetNpcYaw, NPC_SELF, LVar0) @@ -258,9 +258,9 @@ EvtScript N(EVS_NpcDefeat_Buzzar) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.75)) - EVT_CALL(NpcJump1, NPC_SELF, 400, -200, -300, 60) + EVT_CALL(NpcJump1, NPC_SELF, 400, -200, -300, 60 * DT) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.5)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.5 / DT)) EVT_CASE_EQ(OUTCOME_PLAYER_LOST) EVT_CASE_EQ(OUTCOME_PLAYER_FLED) EVT_END_SWITCH diff --git a/src/world/area_iwa/iwa_10/iwa_10_2_main.c b/src/world/area_iwa/iwa_10/iwa_10_2_main.c index ff5f34daa7..a3a30468f5 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_2_main.c +++ b/src/world/area_iwa/iwa_10/iwa_10_2_main.c @@ -40,6 +40,10 @@ EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_MT_RUGGED) EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_SETUP_CAMERA_ALT_NO_LEAD() +#if VERSION_PAL + EVT_CALL(GetLanguage, LocalVar(0)) + EVT_CALL(SetModelTexVariant, MODEL_o110, LocalVar(0)) +#endif EVT_SET(GF_MAP_MtRugged, TRUE) EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_CALL(ClearDefeatedEnemies) diff --git a/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c b/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c index aadf29b1f3..9d85383db4 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c +++ b/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c @@ -24,33 +24,33 @@ EvtScript N(EVS_Scene_MeetParakarry) = { EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 20, EMOTER_PLAYER, 0, 0, 0, 0) EVT_END_THREAD - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), 30, 300, EVT_FLOAT(15.0), EVT_FLOAT(-9.5)) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0 / DT), 30, 300, EVT_FLOAT(15.0), EVT_FLOAT(-9.5)) EVT_THREAD EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_LookAround) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(InterpPlayerYaw, 270, 0) - EVT_WAIT(55) + EVT_WAIT(55 * DT) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_END_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcPos, NPC_Parakarry, -400, 215, -510) EVT_CALL(SetNpcFlagBits, NPC_Parakarry, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) EVT_THREAD EVT_CALL(SetNpcRotation, NPC_Parakarry, 0, 0, 15) EVT_CALL(InterpNpcYaw, NPC_Parakarry, 270, 0) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcRotation, NPC_Parakarry, 0, 0, 0) EVT_CALL(InterpNpcYaw, NPC_Parakarry, 90, 0) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetNpcRotation, NPC_Parakarry, 0, 0, -15) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(InterpNpcYaw, NPC_Parakarry, 270, 0) EVT_CALL(SetNpcRotation, NPC_Parakarry, 0, 0, 0) EVT_END_THREAD EVT_SET(MV_ParakarryPosZ, -510) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_THREAD - EVT_CALL(MakeLerp, -510, LVar2, 60, EASING_LINEAR) + EVT_CALL(MakeLerp, -510, LVar2, 60 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_SET(MV_ParakarryPosZ, LVar0) @@ -61,7 +61,7 @@ EvtScript N(EVS_Scene_MeetParakarry) = { EVT_END_LOOP EVT_END_THREAD EVT_ADD(LVar0, 25) - EVT_CALL(MakeLerp, -400, LVar0, 55, EASING_LINEAR) + EVT_CALL(MakeLerp, -400, LVar0, 55 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(SetNpcPos, NPC_Parakarry, LVar0, 220, MV_ParakarryPosZ) @@ -95,14 +95,14 @@ EvtScript N(EVS_Scene_MeetParakarry) = { EVT_CALL(SetNpcJumpscale, NPC_Parakarry, EVT_FLOAT(1.0)) EVT_CALL(GetNpcPos, NPC_Parakarry, LVar0, LVar1, LVar3) EVT_ADD(LVar0, 30) - EVT_CALL(NpcJump1, NPC_Parakarry, LVar0, 215, LVar2, 15) + EVT_CALL(NpcJump1, NPC_Parakarry, LVar0, 215, LVar2, 15 * DT) EVT_ADD(LVar0, 15) EVT_CALL(SetNpcAnimation, NPC_Parakarry, ANIM_WorldParakarry_Hurt) - EVT_CALL(NpcJump1, NPC_Parakarry, LVar0, 215, LVar2, 8) + EVT_CALL(NpcJump1, NPC_Parakarry, LVar0, 215, LVar2, 8 * DT) EVT_END_THREAD EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_SUB(LVar0, 30) - EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 15) + EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 15 * DT) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAt, SOUND_162, SOUND_SPACE_MODE_0, LVarA, LVarB, LVarC) EVT_THREAD @@ -113,42 +113,42 @@ EvtScript N(EVS_Scene_MeetParakarry) = { EVT_CALL(InterpPlayerYaw, 270, 0) EVT_WAIT(1) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Fallen) - EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 8) + EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 8 * DT) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Parakarry, 0) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_GetUp) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Parakarry, ANIM_WorldParakarry_Idle) EVT_CALL(GetNpcPos, NPC_Parakarry, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(NpcJump1, NPC_Parakarry, LVar0, LVar1, LVar2, 8) + EVT_CALL(NpcJump1, NPC_Parakarry, LVar0, LVar1, LVar2, 8 * DT) EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, FALSE) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) - EVT_WAIT(30) - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), 35, 255, EVT_FLOAT(17.5), EVT_FLOAT(-11.5)) + EVT_WAIT(30 * DT) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0 / DT), 35, 255, EVT_FLOAT(17.5), EVT_FLOAT(-11.5)) EVT_CALL(SetNpcAnimation, NPC_Parakarry, ANIM_WorldParakarry_Walk) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 60) EVT_CALL(SetNpcSpeed, NPC_Parakarry, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_Parakarry, LVar0, LVar2, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Parakarry, ANIM_WorldParakarry_Idle) EVT_CALL(SpeakToPlayer, NPC_Parakarry, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 0, MSG_CH2_000F) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(GetNpcPos, NPC_Parakarry, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Parakarry, LVar0, LVar1, LVar2, 10) EVT_CALL(SpeakToPlayer, NPC_Parakarry, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 0, MSG_CH2_0010) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_Parakarry, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 0, MSG_CH2_0011) EVT_SET(GB_StoryProgress, STORY_CH2_SPOKE_WITH_PARAKARRY) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0 / DT)) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(BindNpcAI, NPC_Parakarry, EVT_PTR(N(EVS_NpcIdle_Parakarry))) @@ -184,11 +184,11 @@ EvtScript N(EVS_NpcInteract_Parakarry) = { EVT_ELSE EVT_ADD(LVar4, 30) EVT_END_IF - EVT_CALL(PlayerMoveTo, LVar4, LVar6, 20) + EVT_CALL(PlayerMoveTo, LVar4, LVar6, 20 * DT) EVT_CALL(PlayerFaceNpc, NPC_Parakarry, FALSE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(func_802CF56C, 2) - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), EVT_FLOAT(0.0), EVT_FLOAT(300.0), EVT_FLOAT(17.5), EVT_FLOAT(-10.0)) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT), EVT_FLOAT(0.0), EVT_FLOAT(300.0), EVT_FLOAT(17.5), EVT_FLOAT(-10.0)) EVT_END_IF EVT_END_IF EVT_SET(LVar0, EVT_PTR(N(LetterList))) @@ -208,7 +208,7 @@ EvtScript N(EVS_NpcInteract_Parakarry) = { EVT_CALL(ShowChoice, MSG_Choice_000F) EVT_IF_NE(LVar0, 0) EVT_CALL(ContinueSpeech, NPC_Parakarry, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 0, MSG_CH2_001B) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_RETURN EVT_END_IF EVT_SET(LocalFlag(0), TRUE) @@ -226,7 +226,7 @@ EvtScript N(EVS_NpcInteract_Parakarry) = { EVT_CASE_EQ(3) EVT_CALL(SpeakToPlayer, NPC_Parakarry, ANIM_WorldParakarry_Celebrate, ANIM_WorldParakarry_Idle, 0, MSG_CH2_0018) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Question) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_Parakarry, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 0, MSG_CH2_0019) EVT_CALL(ShowChoice, MSG_Choice_000F) @@ -249,16 +249,16 @@ EvtScript N(EVS_NpcInteract_Parakarry) = { EVT_SET(GB_StoryProgress, STORY_CH2_PARAKARRY_JOINED_PARTY) EVT_CALL(N(LoadPartyImage)) EVT_EXEC(N(EVS_PushSong)) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_018C, 160, 40) EVT_EXEC(N(EVS_PopSong)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 0, MSG_CH2_001E) EVT_CALL(AddKeyItem, ITEM_LETTER_TO_MERLON) EVT_CALL(AddKeyItem, ITEM_LETTER_TO_KOLORADO) EVT_CALL(AddKeyItem, ITEM_LETTER_CHAIN_GOOMPAPA_1) EVT_END_IF - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_CALL(EnablePartnerAI) EVT_RETURN EVT_RETURN diff --git a/src/world/area_jan/jan_01/jan_01_3_npc.c b/src/world/area_jan/jan_01/jan_01_3_npc.c index 2ce0071dd3..745b36530d 100644 --- a/src/world/area_jan/jan_01/jan_01_3_npc.c +++ b/src/world/area_jan/jan_01/jan_01_3_npc.c @@ -20,7 +20,7 @@ EvtScript N(EVS_Kolorado_RunToVillage) = { EVT_EXEC_GET_TID(N(EVS_PlayerWatchKolorado), LVar9) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Run) - EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.5)) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.5 / DT)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 150) EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, 60, 0) @@ -28,7 +28,7 @@ EvtScript N(EVS_Kolorado_RunToVillage) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) EVT_KILL_THREAD(LVar9) EVT_CALL(N(UnsetCamera0Flag1000)) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0 / DT)) EVT_CALL(SetSelfVar, 0, 3) EVT_RETURN EVT_END @@ -50,7 +50,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 25, EMOTER_PLAYER, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 25, EMOTER_NPC, 0, 0, 0, 0) - EVT_WAIT(25) + EVT_WAIT(25 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_LABEL(0) EVT_CALL(GetSelfVar, 0, LVar0) @@ -67,12 +67,12 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_0010, 0, 60) EVT_CALL(InterpPlayerYaw, 270, 4) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) - EVT_CALL(NpcMoveTo, NPC_SELF, 250, 90, 5) + EVT_CALL(NpcMoveTo, NPC_SELF, 250, 90, 5 * DT) EVT_CALL(func_802CF56C, 2) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar0) EVT_ADD(LVar3, -50) - EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, LVar3, LVar2, 0) EVT_ADD(LVar0, LVar3) EVT_DIV(LVar0, 2) @@ -80,11 +80,11 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-7.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(N(SetCamera0Flag1000)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_0011) EVT_SET(GB_StoryProgress, STORY_CH5_KOLORADO_ESCAPED_FUZZIES) EVT_EXEC_WAIT(N(EVS_Kolorado_RunToVillage)) @@ -94,7 +94,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_CALL(func_802D2C14, 1) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Shout, ANIM_Kolorado_Idle, 0, MSG_CH5_000F) EVT_SET(GF_JAN01_SavedKolorado, TRUE) EVT_CALL(SetSelfVar, 0, 2) diff --git a/src/world/area_jan/jan_02/jan_02_2_main.c b/src/world/area_jan/jan_02/jan_02_2_main.c index 213dcbba65..8308abf333 100644 --- a/src/world/area_jan/jan_02/jan_02_2_main.c +++ b/src/world/area_jan/jan_02/jan_02_2_main.c @@ -58,6 +58,10 @@ EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_YOSHIS_VILLAGE) EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_SETUP_CAMERA_NO_LEAD() +#if VERSION_PAL + EVT_CALL(GetLanguage, LocalVar(0)) + EVT_CALL(SetModelTexVariant, MODEL_o120, LocalVar(0)) +#endif EVT_SET(GF_MAP_YoshisVillage, TRUE) EVT_SET(AF_JAN02_RaphaelComment, FALSE) EVT_SET(AF_JAN02_MetCouncillor, FALSE) diff --git a/src/world/area_jan/jan_02/jan_02_3_npc.c b/src/world/area_jan/jan_02/jan_02_3_npc.c index 5772fe12df..cba146377e 100644 --- a/src/world/area_jan/jan_02/jan_02_3_npc.c +++ b/src/world/area_jan/jan_02/jan_02_3_npc.c @@ -29,39 +29,39 @@ EvtScript N(EVS_Scene_GetJadeRaven) = { EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_VillageLeader_Talk, ANIM_VillageLeader_Idle, 0, MSG_CH5_0024) EVT_END_IF - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_VillageLeader_Walk) EVT_CALL(NpcMoveTo, NPC_SELF, 8, -140, 25) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_VillageLeader_Idle) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 25, 15, -150) EVT_CALL(SetPanTarget, CAM_DEFAULT, 25, 15, -150) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(16.0), EVT_FLOAT(-8.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_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(PlayerMoveTo, 58, -140, 25) EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) EVT_CALL(func_802D2C14, 1) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_VillageLeader_Rummage) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_VillageLeader_Rummage, ANIM_VillageLeader_Rummage, 5, MSG_CH5_0025) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_VillageLeader_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_VillageLeader_Talk, ANIM_VillageLeader_Idle, 0, MSG_CH5_0026) EVT_GIVE_KEY_REWARD(ITEM_JADE_RAVEN) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_VillageLeader_Talk, ANIM_VillageLeader_Idle, 0, MSG_CH5_0027) EVT_SET(GB_StoryProgress, STORY_CH5_GOT_JADE_RAVEN) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) EVT_ADD(LVar3, 25) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) - 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(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) @@ -69,7 +69,7 @@ EvtScript N(EVS_Scene_GetJadeRaven) = { EVT_CALL(GetCurrentPartnerID, LVar0) EVT_IF_EQ(LVar0, PARTNER_SUSHIE) EVT_THREAD - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(PlayerFaceNpc, NPC_PARTNER, FALSE) EVT_END_THREAD EVT_CALL(DisablePartnerAI, 0) @@ -78,9 +78,9 @@ EvtScript N(EVS_Scene_GetJadeRaven) = { EVT_CALL(N(SwitchToPartner), PARTNER_SUSHIE) EVT_CALL(SpeakToPlayer, NPC_PARTNER, -1, -1, 5, MSG_CH5_0029) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(GetNpcPos, NPC_PARTNER, LVar2, LVar3, LVar4) - EVT_CALL(MakeLerp, LVar2, 85, 10, EASING_LINEAR) + EVT_CALL(MakeLerp, LVar2, 85, 10 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar3, LVar4) @@ -90,22 +90,22 @@ EvtScript N(EVS_Scene_GetJadeRaven) = { EVT_END_IF EVT_END_LOOP EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PlayerFaceNpc, NPC_PARTNER, FALSE) EVT_END_THREAD EVT_CALL(DisablePartnerAI, 0) EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 5, MSG_CH5_002A) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_END_IF EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 5, MSG_CH5_002B) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 5, MSG_CH5_002C) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(EnablePartnerAI) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0 / DT)) EVT_RETURN EVT_END }; diff --git a/src/world/area_jan/jan_04/jan_04_4_npc.c b/src/world/area_jan/jan_04/jan_04_4_npc.c index 3c9c26c785..fd83526f70 100644 --- a/src/world/area_jan/jan_04/jan_04_4_npc.c +++ b/src/world/area_jan/jan_04/jan_04_4_npc.c @@ -19,32 +19,36 @@ EvtScript N(EVS_ShakeTree_Sushie) = { EVT_IF_EQ(GF_JAN04_SushieTreeHitCounterA, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Sushie, EVT_FLOAT(1.0)) EVT_CALL(PlaySoundAtNpc, NPC_Sushie, SOUND_2A0, 0) - EVT_CALL(NpcJump0, NPC_Sushie, 90, 140, -85, 20) + EVT_CALL(NpcJump0, NPC_Sushie, 90, 140, -85, 20 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 90, 140, -85) EVT_CALL(SetPanTarget, CAM_DEFAULT, 90, 140, -85) EVT_CALL(SetCamDistance, CAM_DEFAULT, 280) EVT_CALL(SetCamPitch, CAM_DEFAULT, 16, EVT_FLOAT(-6.0)) +#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(SpeakToPlayer, NPC_Sushie, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 0, MSG_CH5_00A1) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_SET(GF_JAN04_SushieTreeHitCounterA, TRUE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_SET(AF_JAN_08, FALSE) EVT_ELSE EVT_CALL(SetNpcJumpscale, NPC_Sushie, EVT_FLOAT(1.0)) EVT_CALL(PlaySoundAtNpc, NPC_Sushie, SOUND_2A0, 0) - EVT_CALL(NpcJump0, NPC_Sushie, -10, 112, -80, 15) + EVT_CALL(NpcJump0, NPC_Sushie, -10, 112, -80, 15 * DT) EVT_SET(GF_JAN04_SushieTreeHitCounterA, FALSE) EVT_SET(GF_JAN04_SushieTreeHitCounterB, TRUE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_SET(AF_JAN_08, FALSE) EVT_END_IF EVT_ELSE EVT_CALL(SetNpcJumpscale, NPC_Sushie, EVT_FLOAT(1.0)) EVT_CALL(PlaySoundAtNpc, NPC_Sushie, SOUND_2A0, 0) - EVT_CALL(NpcJump0, NPC_Sushie, 50, 0, 0, 20) + EVT_CALL(NpcJump0, NPC_Sushie, 50, 0, 0, 20 * DT) EVT_SET(GF_JAN04_SushieTreeHitCounterA, TRUE) EVT_CALL(EnableNpcShadow, NPC_Sushie, TRUE) EVT_CALL(SetNpcAnimation, NPC_Sushie, ANIM_WorldSushie_Hurt) @@ -102,11 +106,15 @@ EvtScript N(EVS_Sushie_ShoutAtChildren) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, 30, 140, -60) EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) EVT_CALL(SetCamPitch, CAM_DEFAULT, 16, EVT_FLOAT(-6.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_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldSushie_Hurt, ANIM_WorldSushie_Idle, 0, MSG_CH5_00A0) +#if VERSION_PAL + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3 / DT)) +#else EVT_CALL(ResetCam, CAM_DEFAULT, 3) +#endif EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN @@ -141,33 +149,33 @@ EvtScript N(EVS_NpcIdle_Sushie) = { EVT_END_IF EVT_KILL_THREAD(LVar9) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0 / DT)) EVT_CALL(PlayerMoveTo, 10, 0, 0) EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldSushie_Idle) - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0), 20, 301, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0 / DT), 20, 301, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 0, MSG_CH5_00A4) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 0, MSG_CH5_00A5) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldSushie_Sad) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldSushie_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 0, MSG_CH5_00A6) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 0, MSG_CH5_00A7) EVT_CALL(CloseMessage) EVT_CALL(N(ChangeNpcToPartner), NPC_Sushie, PARTNER_SUSHIE) EVT_CALL(N(LoadPartyImage)) EVT_EXEC(N(EVS_PushNewPartnerSong)) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_018F, 160, 40) EVT_EXEC(N(EVS_PopSong)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) EVT_SET(GB_StoryProgress, STORY_CH5_SUSHIE_JOINED_PARTY) EVT_CALL(EnablePartnerAI) diff --git a/src/world/area_jan/jan_07/jan_07_3_npc.c b/src/world/area_jan/jan_07/jan_07_3_npc.c index 27161205ca..b2479ecd7e 100644 --- a/src/world/area_jan/jan_07/jan_07_3_npc.c +++ b/src/world/area_jan/jan_07/jan_07_3_npc.c @@ -143,6 +143,10 @@ EvtScript N(EVS_NpcInit_YoshiKid) = { }; EvtScript N(EVS_NpcIdle_PutridPiranha) = { +#if VERSION_PAL + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, 1) +#else EVT_CHILD_THREAD EVT_LOOP(0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -156,6 +160,7 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_CHILD_THREAD +#endif EVT_CALL(SetNpcCollisionSize, NPC_PutridPiranha_01, 48, 40) EVT_CALL(SetNpcCollisionSize, NPC_PutridPiranha_02, 48, 40) EVT_CALL(AwaitPlayerApproach, 60, 20, 140) diff --git a/src/world/area_jan/jan_16/jan_16_3_npc.c b/src/world/area_jan/jan_16/jan_16_3_npc.c index 2186aaccd0..bfe5faab1f 100644 --- a/src/world/area_jan/jan_16/jan_16_3_npc.c +++ b/src/world/area_jan/jan_16/jan_16_3_npc.c @@ -38,11 +38,11 @@ EvtScript N(D_802412D4_B812D4) = { EVT_WAIT(10) EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) EVT_CALL(SetCamPitch, CAM_DEFAULT, -13, 1) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.45)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.45 / DT)) EVT_CALL(SetCamPosA, CAM_DEFAULT, -207, -85) EVT_CALL(PanToTarget, CAM_DEFAULT, EVT_FLOAT(0.8), 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_SET(GB_StoryProgress, STORY_CH5_REACHED_RAFAELS_TREE) EVT_END_IF @@ -90,25 +90,25 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_Idle) EVT_CALL(NpcFacePlayer, NPC_SELF, 4) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(4.5), LVar0, LVar1, LVar2, 450, EVT_FLOAT(20.0), EVT_FLOAT(-9.5)) + EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(4.5 / DT), LVar0, LVar1, LVar2, 450, EVT_FLOAT(20.0), EVT_FLOAT(-9.5)) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpPlayerYaw, 90, 0) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_Jump) - EVT_WAIT(8) + EVT_WAIT(8 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_Fall) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_TalkNoFeetAngry) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_TalkNoFeetAngry, ANIM_RaphaelRaven_TalkNoFeetAngry, 5, MSG_CH5_00E1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_IdleNoFeet) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_Idle) EVT_END_THREAD EVT_CALL(SetNpcJumpscale, NPC_SELF, 2) @@ -185,14 +185,18 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven) = { EVT_SUBF(LVar3, EVT_FLOAT(0.05)) EVT_END_LOOP EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o97, COLLIDER_FLAGS_UPPER_MASK) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_Talk, ANIM_RaphaelRaven_Idle, 0, MSG_CH5_00E2) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_Walk) - EVT_CALL(SetNpcSpeed, NPC_RaphaelRaven, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcSpeed, NPC_RaphaelRaven, EVT_FLOAT(4.0 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, 340, 270, 0) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) +#if VERSION_PAL + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5 * DT)) +#else EVT_CALL(ResetCam, CAM_DEFAULT, 5) +#endif EVT_SET(GB_StoryProgress, STORY_CH5_RAFAEL_MOVED_ROOT) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN diff --git a/src/world/area_jan/jan_22/jan_22_3_npc.c b/src/world/area_jan/jan_22/jan_22_3_npc.c index e6e7d88a8e..77b2546476 100644 --- a/src/world/area_jan/jan_22/jan_22_3_npc.c +++ b/src/world/area_jan/jan_22/jan_22_3_npc.c @@ -178,34 +178,34 @@ EvtScript N(EVS_Ravens_LeapIntoTree) = { EVT_CALL(PlaySoundAtNpc, NPC_Raven_02, SOUND_2A6, 0) EVT_CALL(SetNpcFlagBits, NPC_Raven_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Flail) - EVT_CALL(NpcJump0, NPC_Raven_02, 271, 325, -17, 30) + EVT_CALL(NpcJump0, NPC_Raven_02, 271, 325, -17, 30 * DT) EVT_END_CHILD_THREAD EVT_CHILD_THREAD - EVT_WAIT(3) + EVT_WAIT(3 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_2A7, 0) EVT_CALL(SetNpcFlagBits, NPC_Raven_05, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Flail) - EVT_CALL(NpcJump0, NPC_Raven_05, 400, 215, -23, 30) + EVT_CALL(NpcJump0, NPC_Raven_05, 400, 215, -23, 30 * DT) EVT_END_CHILD_THREAD EVT_CHILD_THREAD - EVT_WAIT(6) + EVT_WAIT(6 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Raven_01, SOUND_2A6, 0) EVT_CALL(SetNpcFlagBits, NPC_Raven_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Flail) - EVT_CALL(NpcJump0, NPC_Raven_01, 208, 335, -17, 30) + EVT_CALL(NpcJump0, NPC_Raven_01, 208, 335, -17, 30 * DT) EVT_END_CHILD_THREAD EVT_CHILD_THREAD - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Raven_03, SOUND_2A7, 0) EVT_CALL(SetNpcFlagBits, NPC_Raven_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Flail) - EVT_CALL(NpcJump0, NPC_Raven_03, 327, 200, -8, 30) + EVT_CALL(NpcJump0, NPC_Raven_03, 327, 200, -8, 30 * DT) EVT_END_CHILD_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_2A6, 0) EVT_CALL(SetNpcFlagBits, NPC_Raven_04, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Flail) - EVT_CALL(NpcJump0, NPC_Raven_04, 222, 284, -13, 15) + EVT_CALL(NpcJump0, NPC_Raven_04, 222, 284, -13, 15 * DT) EVT_RETURN EVT_END }; @@ -215,15 +215,15 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven) = { EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-8.5)) - 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(N(SetCamera0Flag1000)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcFlagBits, NPC_RaphaelRaven, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_Talk, ANIM_RaphaelRaven_Idle, 0, MSG_CH5_00C7) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_Talk, ANIM_RaphaelRaven_Idle, 0, MSG_CH5_00C8) EVT_CALL(SetNpcVar, NPC_Raven_01, 0, RAVEN_SCENE_LEAP_INTO_ACTION) EVT_CALL(BindNpcInteract, NPC_SELF, 0) @@ -272,7 +272,7 @@ EvtScript N(EVS_Raven_HopAndWalkAway) = { EVT_WAIT(45) EVT_CALL(NpcJump0, LVar0, 30, 0, -15, 10) EVT_CALL(SetNpcAnimation, LVar0, ANIM_Raven_Walk) - EVT_CALL(SetNpcSpeed, LVar0, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, LVar0, EVT_FLOAT(3.0 / DT)) EVT_CALL(NpcMoveTo, LVar0, -120, 0, 0) EVT_CALL(SetNpcPos, LVar0, NPC_DISPOSE_LOCATION) EVT_RETURN @@ -283,17 +283,17 @@ EvtScript N(EVS_BuildingEffects) = { EVT_CALL(PlaySoundAt, SOUND_8000001E, 0, 270, 130, 0) EVT_LOOP(0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(1.0)) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 8, EVT_FLOAT(1.0)) EVT_CALL(RandInt, 4, LVar0) EVT_ADD(LVar0, 1) EVT_PLAY_EFFECT(EFFECT_DAMAGE_STARS, 3, 290, 155, 0, 240, 0, 0, LVar0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_PLAY_EFFECT(EFFECT_DAMAGE_STARS, 3, 275, 150, 0, 240, 0, 0, 3) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 2, EVT_FLOAT(1.0)) - EVT_WAIT(4) + EVT_WAIT(4 * DT) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 2, EVT_FLOAT(1.0)) - EVT_WAIT(4) + EVT_WAIT(4 * DT) EVT_END_LOOP EVT_RETURN EVT_END @@ -328,11 +328,11 @@ EvtScript N(EVS_ManageRavens) = { EVT_CALL(InterpNpcYaw, NPC_Raven_03, 90, 0) EVT_CALL(InterpNpcYaw, NPC_Raven_04, 90, 0) EVT_CALL(InterpNpcYaw, NPC_Raven_05, 90, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_EXEC_GET_TID(N(EVS_Ravens_LeapIntoTree), LVar9) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_KILL_THREAD(LVar9) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcPos, NPC_Raven_01, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcPos, NPC_Raven_02, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcPos, NPC_Raven_03, NPC_DISPOSE_LOCATION) @@ -344,7 +344,7 @@ EvtScript N(EVS_ManageRavens) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) // repeat the action with a time delay across the sudden camera cut EVT_EXEC(N(EVS_GatherRavensNearRaphael)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_EXEC_WAIT(N(EVS_Ravens_LeapIntoTree)) EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Walk) EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Walk) @@ -355,15 +355,15 @@ EvtScript N(EVS_ManageRavens) = { EVT_THREAD EVT_CALL(SetNpcJumpscale, NPC_Raven_01, EVT_FLOAT(3.0)) EVT_CALL(GetNpcPos, NPC_Raven_01, LVar0, LVar1, LVar2) - EVT_CALL(NpcJump0, NPC_Raven_01, LVar0, LVar1, LVar2, 5) + EVT_CALL(NpcJump0, NPC_Raven_01, LVar0, LVar1, LVar2, 5 * DT) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcJumpscale, NPC_Raven_02, EVT_FLOAT(3.0)) EVT_CALL(GetNpcPos, NPC_Raven_02, LVar0, LVar1, LVar2) - EVT_CALL(NpcJump0, NPC_Raven_02, LVar0, LVar1, LVar2, 5) + EVT_CALL(NpcJump0, NPC_Raven_02, LVar0, LVar1, LVar2, 5 * DT) EVT_CALL(InterpNpcYaw, NPC_Raven_02, 270, 0) EVT_END_THREAD - EVT_WAIT(3) + EVT_WAIT(3 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_20C, 0) EVT_CALL(SetNpcRotation, NPC_Raven_04, 0, 0, 180) EVT_CALL(SetNpcFlagBits, NPC_Raven_04, NPC_FLAG_GRAVITY, TRUE) @@ -377,7 +377,7 @@ EvtScript N(EVS_ManageRavens) = { EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(SetNpcPos, NPC_PARTNER, 115, 0, LVar2) EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) - EVT_WAIT(80) + EVT_WAIT(80 * DT) EVT_CALL(SetNpcRotation, NPC_Raven_04, 0, 0, 0) EVT_CALL(SetSelfVar, 0, RAVEN_SCENE_CONSTRUCTION_WORK) EVT_CASE_EQ(RAVEN_SCENE_CONSTRUCTION_WORK) @@ -386,31 +386,31 @@ EvtScript N(EVS_ManageRavens) = { EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-8.5)) 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(SetNpcFlagBits, NPC_Raven_04, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(NpcMoveTo, NPC_Raven_04, 260, -20, 0) EVT_CALL(SetNpcRotation, NPC_Raven_04, 0, 0, 90) EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Walk) - EVT_CALL(NpcJump0, NPC_Raven_04, 300, 300, -14, 20) + EVT_CALL(NpcJump0, NPC_Raven_04, 300, 300, -14, 20 * DT) EVT_CALL(SetNpcRotation, NPC_Raven_04, 0, 0, 0) EVT_EXEC_GET_TID(N(EVS_BuildingEffects), LVarA) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SpeakToPlayer, NPC_RaphaelRaven, ANIM_RaphaelRaven_Talk, ANIM_RaphaelRaven_Idle, 0, MSG_CH5_00CA) - EVT_WAIT(50) + EVT_WAIT(50 * DT) EVT_CALL(SetNpcVar, NPC_Kolorado_02, 0, 10) - EVT_WAIT(140) + EVT_WAIT(140 * DT) EVT_LABEL(11) EVT_CALL(GetNpcVar, NPC_Kolorado_02, 0, LVar0) EVT_IF_NE(LVar0, 0) EVT_WAIT(1) EVT_GOTO(11) EVT_END_IF - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(StopSound, SOUND_8000001E) EVT_KILL_THREAD(LVarA) EVT_CALL(SetSelfVar, 0, RAVEN_SCENE_FINISH_WORK) EVT_CASE_EQ(RAVEN_SCENE_FINISH_WORK) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetGroupVisibility, MODEL_g39, MODEL_GROUP_VISIBLE) EVT_CALL(SetGroupVisibility, MODEL_g52, MODEL_GROUP_VISIBLE) EVT_CALL(SetGroupVisibility, MODEL_g58, MODEL_GROUP_VISIBLE) @@ -425,10 +425,10 @@ EvtScript N(EVS_ManageRavens) = { EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_2A6, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 60) - EVT_CALL(NpcJump0, NPC_Raven_05, LVar0, 0, 40, 20) - EVT_WAIT(10) + EVT_CALL(NpcJump0, NPC_Raven_05, LVar0, 0, 40, 20 * DT) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Raven_05, ANIM_Raven_Talk, ANIM_Raven_Idle, 0, MSG_CH5_00CC) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Idle) EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Idle) EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Idle) @@ -437,11 +437,11 @@ EvtScript N(EVS_ManageRavens) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, 300, 250, 150) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_2A6, 0) EVT_CALL(SetNpcPos, NPC_Raven_05, 350, 0, 100) EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Flail) - EVT_CALL(NpcJump0, NPC_Raven_05, 400, 215, -23, 20) + EVT_CALL(NpcJump0, NPC_Raven_05, 400, 215, -23, 20 * DT) EVT_CALL(SpeakToPlayer, NPC_Raven_05, ANIM_Raven_Talk, ANIM_Raven_Idle, 0, MSG_CH5_00CD) EVT_THREAD EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_186, 0) @@ -464,14 +464,14 @@ EvtScript N(EVS_ManageRavens) = { EVT_END_LOOP EVT_CALL(SetSelfVar, 0, RAVEN_SCENE_LOWERED_BASKET) EVT_END_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 165, 0, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, 165, 0, 0) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-8.5)) 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(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_RaphaelRaven, ANIM_RaphaelRaven_Talk, ANIM_RaphaelRaven_Idle, 0, MSG_CH5_00CE) EVT_LOOP(0) EVT_WAIT(1) @@ -481,33 +481,33 @@ EvtScript N(EVS_ManageRavens) = { EVT_END_IF EVT_END_LOOP EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_2A6, 0) - EVT_CALL(NpcJump0, NPC_Raven_05, 150, 0, 20, 15) + EVT_CALL(NpcJump0, NPC_Raven_05, 150, 0, 20, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Walk) EVT_THREAD - EVT_CALL(NpcMoveTo, NPC_Raven_05, 65, 25, 30) + EVT_CALL(NpcMoveTo, NPC_Raven_05, 65, 25, 30 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Idle) EVT_CALL(InterpNpcYaw, NPC_Raven_05, 90, 0) EVT_END_THREAD EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_2A7, 0) - EVT_CALL(NpcJump0, NPC_Raven_04, 150, 0, 20, 15) + EVT_CALL(NpcJump0, NPC_Raven_04, 150, 0, 20, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Walk) EVT_THREAD - EVT_CALL(NpcMoveTo, NPC_Raven_04, 80, -10, 25) + EVT_CALL(NpcMoveTo, NPC_Raven_04, 80, -10, 25 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Idle) EVT_CALL(InterpNpcYaw, NPC_Raven_04, 90, 0) EVT_END_THREAD EVT_CALL(PlaySoundAtNpc, NPC_Raven_03, SOUND_2A6, 0) - EVT_CALL(NpcJump0, NPC_Raven_03, 150, 0, 20, 15) + EVT_CALL(NpcJump0, NPC_Raven_03, 150, 0, 20, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Walk) EVT_THREAD - EVT_CALL(NpcMoveTo, NPC_Raven_03, 95, 25, 20) + EVT_CALL(NpcMoveTo, NPC_Raven_03, 95, 25, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Idle) EVT_CALL(InterpNpcYaw, NPC_Raven_03, 90, 0) EVT_END_THREAD EVT_CALL(PlaySoundAtNpc, NPC_Raven_02, SOUND_2A7, 0) - EVT_CALL(NpcJump0, NPC_Raven_02, 150, 0, 20, 15) + EVT_CALL(NpcJump0, NPC_Raven_02, 150, 0, 20, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Walk) - EVT_CALL(NpcMoveTo, NPC_Raven_02, 110, -10, 15) + EVT_CALL(NpcMoveTo, NPC_Raven_02, 110, -10, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Idle) EVT_CALL(InterpNpcYaw, NPC_Raven_02, 90, 0) EVT_CALL(SetNpcVar, NPC_Kolorado_02, 0, 20) @@ -521,42 +521,42 @@ EvtScript N(EVS_ManageRavens) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, 350) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-7.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_GIVE_KEY_REWARD(ITEM_ULTRA_STONE) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(20.0), EVT_FLOAT(-11.5)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.5 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_RaphaelRaven, ANIM_RaphaelRaven_Talk, ANIM_RaphaelRaven_Idle, 0, MSG_CH5_00D1) EVT_SET(LVar0, NPC_Raven_02) EVT_EXEC(N(EVS_Raven_HopAndWalkAway)) EVT_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_SET(LVar0, NPC_Raven_03) EVT_EXEC(N(EVS_Raven_HopAndWalkAway)) EVT_END_THREAD EVT_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_SET(LVar0, NPC_Raven_04) EVT_EXEC(N(EVS_Raven_HopAndWalkAway)) EVT_END_THREAD EVT_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_SET(LVar0, NPC_Raven_05) EVT_EXEC(N(EVS_Raven_HopAndWalkAway)) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_RaphaelRaven, ANIM_RaphaelRaven_Walk) - EVT_CALL(SetNpcSpeed, NPC_RaphaelRaven, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_RaphaelRaven, EVT_FLOAT(3.0 / DT)) EVT_CALL(NpcMoveTo, NPC_RaphaelRaven, -120, 0, 0) EVT_CALL(SetNpcPos, NPC_RaphaelRaven, NPC_DISPOSE_LOCATION) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(BindNpcInteract, NPC_Raven_01, EVT_PTR(N(EVS_NpcInteract_Raven))) EVT_CALL(SetNpcFlagBits, NPC_Raven_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(N(UnsetCamera0Flag1000)) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.5)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.5 / DT)) EVT_SET(GB_StoryProgress, STORY_CH5_ZIP_LINE_READY) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN @@ -607,7 +607,7 @@ EvtScript N(EVS_Scene_RaphaelComingThrough) = { EVT_CALL(SetNpcPos, NPC_PARTNER, -190, 0, -210) EVT_EXEC_WAIT(N(EVS_MoveBushes)) EVT_CALL(SetNpcAnimation, NPC_RaphaelRaven, ANIM_RaphaelRaven_Walk) - EVT_CALL(SetNpcSpeed, NPC_RaphaelRaven, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcSpeed, NPC_RaphaelRaven, EVT_FLOAT(4.0 / DT)) EVT_CALL(NpcMoveTo, NPC_RaphaelRaven, -180, -30, 0) EVT_THREAD EVT_CALL(NpcMoveTo, NPC_RaphaelRaven, 125, -40, 0) @@ -615,9 +615,9 @@ EvtScript N(EVS_Scene_RaphaelComingThrough) = { EVT_CALL(SetNpcFlagBits, NPC_RaphaelRaven, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(InterpNpcYaw, NPC_RaphaelRaven, 270, 0) EVT_END_THREAD - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Run) - EVT_CALL(LoadPath, 45, EVT_PTR(N(RaphaelWalkPath)), ARRAY_COUNT(N(RaphaelWalkPath)), EASING_LINEAR) + EVT_CALL(LoadPath, 45 * DT, EVT_PTR(N(RaphaelWalkPath)), ARRAY_COUNT(N(RaphaelWalkPath)), EASING_LINEAR) EVT_LABEL(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) @@ -629,42 +629,42 @@ EvtScript N(EVS_Scene_RaphaelComingThrough) = { EVT_THREAD EVT_CALL(SetNpcPos, NPC_Raven_01, -200, 0, -190) EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Walk) - EVT_CALL(SetNpcSpeed, NPC_Raven_01, EVT_FLOAT(6.0)) + EVT_CALL(SetNpcSpeed, NPC_Raven_01, EVT_FLOAT(6.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Raven_01, -150, -10, 0) EVT_CALL(NpcMoveTo, NPC_Raven_01, 177, -10, 0) EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Idle) EVT_END_THREAD EVT_THREAD - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcPos, NPC_Raven_02, -200, 0, -230) EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Walk) - EVT_CALL(SetNpcSpeed, NPC_Raven_02, EVT_FLOAT(6.0)) + EVT_CALL(SetNpcSpeed, NPC_Raven_02, EVT_FLOAT(6.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Raven_02, -150, -10, 0) EVT_CALL(NpcMoveTo, NPC_Raven_02, 152, 0, 0) EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Idle) EVT_END_THREAD EVT_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcPos, NPC_Raven_03, -200, 0, -230) EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Walk) - EVT_CALL(SetNpcSpeed, NPC_Raven_03, EVT_FLOAT(6.0)) + EVT_CALL(SetNpcSpeed, NPC_Raven_03, EVT_FLOAT(6.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Raven_03, -150, -10, 0) EVT_CALL(NpcMoveTo, NPC_Raven_03, 127, 5, 0) EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Idle) EVT_END_THREAD EVT_THREAD - EVT_WAIT(45) + EVT_WAIT(45 * DT) EVT_CALL(SetNpcPos, NPC_Raven_04, -200, 0, -230) EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Walk) - EVT_CALL(SetNpcSpeed, NPC_Raven_04, EVT_FLOAT(6.0)) + EVT_CALL(SetNpcSpeed, NPC_Raven_04, EVT_FLOAT(6.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Raven_04, -150, -10, 0) EVT_CALL(NpcMoveTo, NPC_Raven_04, 102, 0, 0) EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Idle) EVT_END_THREAD - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(SetNpcPos, NPC_Raven_05, -200, 0, -230) EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Walk) - EVT_CALL(SetNpcSpeed, NPC_Raven_05, EVT_FLOAT(6.0)) + EVT_CALL(SetNpcSpeed, NPC_Raven_05, EVT_FLOAT(6.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Raven_05, -150, -10, 0) EVT_CALL(NpcMoveTo, NPC_Raven_05, 77, -10, 0) EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Idle) @@ -706,7 +706,7 @@ EvtScript N(EVS_NpcIdle_Kolorado_HeldCaptive) = { EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 25, EMOTER_PLAYER, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 25, EMOTER_NPC, 0, 0, 0, 0) - EVT_WAIT(25) + EVT_WAIT(25 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_LABEL(0) EVT_CALL(GetSelfVar, 0, LVar0) @@ -726,7 +726,7 @@ EvtScript N(EVS_NpcIdle_Kolorado_HeldCaptive) = { EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00C0, 0, 60) EVT_CALL(InterpPlayerYaw, 270, 4) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) - EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0 / DT)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar0) EVT_ADD(LVar3, -50) @@ -737,11 +737,11 @@ EvtScript N(EVS_NpcIdle_Kolorado_HeldCaptive) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-7.5)) - 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(N(SetCamera0Flag1000)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_00C1) EVT_CALL(SetSelfVar, 0, 2) EVT_CALL(func_802D2C14, 0) @@ -751,7 +751,7 @@ EvtScript N(EVS_NpcIdle_Kolorado_HeldCaptive) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_CALL(func_802D2C14, 1) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_IF_EQ(GF_JAN01_SavedKolorado, FALSE) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Shout, ANIM_Kolorado_Idle, 0, MSG_CH5_00BE) EVT_ELSE @@ -772,7 +772,7 @@ EvtScript N(EVS_NpcIdle_Kolorado_HeldCaptive) = { EVT_SET(LVar0, 300) EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Run) - EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.5)) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.5 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, 60, 0) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_SET(GB_StoryProgress, STORY_CH5_KOLORADO_ESCAPED_SPEAR_GUYS) @@ -812,7 +812,7 @@ EvtScript N(EVS_NpcIdle_Kolorado_Before) = { EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 20, EMOTER_PLAYER, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_LABEL(2) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -841,7 +841,7 @@ EvtScript N(EVS_NpcIdle_Kolorado_After) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 60) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Walk) - EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, 60, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) EVT_CALL(SpeakToPlayer, NPC_Kolorado_02, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_00CB) @@ -861,11 +861,11 @@ EvtScript N(EVS_NpcIdle_Kolorado_After) = { EVT_END_THREAD EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Walk) - EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, 190, 60, 0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.5)) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) - EVT_CALL(NpcJump0, NPC_SELF, 200, 0, 0, 20) + EVT_CALL(NpcJump0, NPC_SELF, 200, 0, 0, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) EVT_CALL(SetSelfVar, 0, 21) EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_186, 0) @@ -888,7 +888,7 @@ EvtScript N(EVS_NpcIdle_Kolorado_After) = { EVT_END_IF EVT_END_LOOP EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_186, 0) EVT_CALL(MakeLerp, 170, 0, 60, EASING_CUBIC_OUT) EVT_LOOP(0) @@ -934,7 +934,7 @@ EvtScript N(EVS_NpcInteract_Kolorado_Before) = { EVT_CALL(PlayerMoveTo, LVar2, LVar4, 0) EVT_CALL(PlayerFaceNpc, NPC_Kolorado_02, 3) EVT_END_IF - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_00C2) EVT_CALL(InterpPlayerYaw, 90, 3) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 3) @@ -943,19 +943,19 @@ EvtScript N(EVS_NpcInteract_Kolorado_Before) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(16.0), EVT_FLOAT(-11.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_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 5, MSG_CH5_00C3) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 0, 300, 15, EVT_FLOAT(-6.0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_00C4) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0 / DT)) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) 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, 500, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, -300, 0, 0) @@ -981,9 +981,9 @@ EvtScript N(EVS_NpcHit_Kolorado_HeldCaptive) = { EVT_END_SWITCH EVT_IF_NE(LVar1, 0) EVT_CALL(DisablePlayerInput, TRUE) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_SET(AF_JAN_0A, TRUE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_SpearGuy, ANIM_SpearGuy_Anim0D) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Shout, ANIM_Kolorado_Yell, 0, MSG_CH5_00BD) @@ -1114,7 +1114,7 @@ EvtScript N(EVS_NpcDefeat_SpearGuy) = { EVT_CALL(SetNpcYaw, NPC_Kolorado_01, 90) EVT_CALL(SetNpcAnimation, NPC_Kolorado_01, ANIM_Kolorado_Idle) EVT_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(GetNpcPos, NPC_Kolorado_01, LVar3, LVar1, LVar2) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar4, LVar0) @@ -1131,12 +1131,12 @@ EvtScript N(EVS_NpcDefeat_SpearGuy) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-7.5)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT)) EVT_CALL(N(SetCamera0Flag1000)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(SetNpcFlagBits, NPC_Kolorado_01, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Kolorado_01, ANIM_Kolorado_Run) - EVT_CALL(SetNpcSpeed, NPC_Kolorado_01, EVT_FLOAT(2.5)) + EVT_CALL(SetNpcSpeed, NPC_Kolorado_01, EVT_FLOAT(2.5 / DT)) EVT_CALL(NpcMoveTo, NPC_Kolorado_01, LVar4, LVar2, 0) EVT_CALL(SetNpcAnimation, NPC_Kolorado_01, ANIM_Kolorado_Idle) EVT_CALL(NpcFacePlayer, NPC_Kolorado_01, 0) @@ -1229,8 +1229,8 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) EVT_EXEC(N(EVS_Misstar_CarryingParty)) - EVT_WAIT(30) - EVT_CALL(LoadPath, 45, EVT_PTR(N(MisstarDescentPath)), ARRAY_COUNT(N(MisstarDescentPath)), EASING_LINEAR) + EVT_WAIT(30 * DT) + EVT_CALL(LoadPath, 45 * DT, EVT_PTR(N(MisstarDescentPath)), ARRAY_COUNT(N(MisstarDescentPath)), EASING_LINEAR) EVT_LABEL(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_SELF, LVar1, LVar2, LVar3) @@ -1242,26 +1242,26 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.4)) EVT_SET(AF_JAN22_MisstarReleasedParty, TRUE) - EVT_CALL(NpcJump0, NPC_SELF, 625, 20, 0, 25) + EVT_CALL(NpcJump0, NPC_SELF, 625, 20, 0, 25 * DT) EVT_THREAD - EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(1.0 / DT)) EVT_CALL(NpcMoveTo, NPC_PARTNER, 700, 0, 0) EVT_END_THREAD EVT_SET(AF_JAN22_MisstarReleasedKolorado, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Kolorado_02, NPC_FLAG_GRAVITY, TRUE) - EVT_CALL(NpcJump0, NPC_SELF, 675, 40, 0, 20) + EVT_CALL(NpcJump0, NPC_SELF, 675, 40, 0, 20 * DT) EVT_EXEC_GET_TID(N(EVS_Misstar_Bobbing), LVar9) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 0, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, 325) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(16.0), EVT_FLOAT(-11.5)) - 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(SpeakToPlayer, NPC_Kolorado_02, ANIM_Kolorado_TalkSad, ANIM_Kolorado_IdleSad, 0, MSG_CH5_00D4) EVT_CALL(NpcFaceNpc, NPC_SELF, NPC_Kolorado_02, 1) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldMisstar_TalkAngry, ANIM_WorldMisstar_IdleAngry, 517, MSG_CH5_00D5) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMisstar_Idle) @@ -1273,25 +1273,25 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(EndSpeech, NPC_SELF, ANIM_WorldMisstar_Talk, ANIM_WorldMisstar_Idle, 517) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpNpcYaw, NPC_Kolorado_02, 270, 1) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SpeakToPlayer, NPC_Kolorado_02, ANIM_Kolorado_TalkSad, ANIM_Kolorado_IdleSad, 5, MSG_CH5_00D6) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 30) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 0, LVar2) - 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_CALL(InterpNpcYaw, NPC_Kolorado_02, 90, 10) EVT_EXEC_GET_TID(N(EVS_PartnerFaceMisstar), LVar8) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.5)) - EVT_CALL(NpcJump0, NPC_SELF, 760, 35, 0, 20) + EVT_CALL(NpcJump0, NPC_SELF, 760, 35, 0, 20 * DT) EVT_KILL_THREAD(LVar8) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(NpcFacePlayer, NPC_SELF, 4) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldMisstar_Talk, ANIM_WorldMisstar_Idle, 512, MSG_CH5_00D7) - 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_SELF, 0, LVar0, 0) @@ -1302,7 +1302,7 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_END_LOOP EVT_KILL_THREAD(LVar9) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMisstar_Leap) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) EVT_CALL(PlaySoundAtPlayer, SOUND_139, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -1312,36 +1312,36 @@ EvtScript N(EVS_Scene_Misstar) = { 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, 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_SELF, ANIM_WorldMisstar_Idle) EVT_EXEC_GET_TID(N(EVS_Misstar_Bobbing), LVar9) EVT_CALL(N(UpgradeStarPowerCh5)) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0195, 160, 40) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldMisstar_Talk, ANIM_WorldMisstar_Idle, 512, MSG_CH5_00D8) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_THREAD EVT_LOOP(25) EVT_CALL(GetNpcPos, NPC_SELF, 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, 5 * 360) - 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_SELF, 0, LVar0, 0) @@ -1355,7 +1355,7 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_CALL(GetNpcPos, NPC_SELF, 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_SELF, LVar2, LVar0, LVar4) @@ -1367,23 +1367,27 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_END_THREAD EVT_THREAD - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2045, 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_KILL_THREAD(LVar9) EVT_SET(GB_StoryProgress, STORY_CH5_STAR_SPRIT_DEPARTED) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Kolorado_02, ANIM_Kolorado_TalkSad, ANIM_Kolorado_IdleSad, 0, MSG_CH5_00D9) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(InterpNpcYaw, NPC_Kolorado_02, 270, 4) EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_WalkSad) - EVT_CALL(SetNpcSpeed, NPC_Kolorado_02, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcSpeed, NPC_Kolorado_02, EVT_FLOAT(1.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Kolorado_02, 530, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_Kolorado_02, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcPos, NPC_Kolorado_02, NPC_DISPOSE_LOCATION) diff --git a/src/world/area_jan/jan_23/jan_23_3_npc.c b/src/world/area_jan/jan_23/jan_23_3_npc.c index aad7ff1e14..d9ffa44bcd 100644 --- a/src/world/area_jan/jan_23/jan_23_3_npc.c +++ b/src/world/area_jan/jan_23/jan_23_3_npc.c @@ -234,17 +234,17 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, 460) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(16.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_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_TalkNoFeet, ANIM_RaphaelRaven_IdleNoFeet, 0, MSG_CH5_00DA) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) - EVT_WAIT(35) + EVT_WAIT(35 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_TalkNoFeet, ANIM_RaphaelRaven_IdleNoFeet, 5, MSG_CH5_00DB) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_THREAD EVT_SET(MF_Unk_00, FALSE) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_TalkNoFeetAngry, ANIM_RaphaelRaven_TalkNoFeetAngry, 5, MSG_CH5_00DC) @@ -272,14 +272,14 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_GOTO(2) EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_IdleNoFeet) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 30) EVT_ADD(LVar1, 0) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, 580) - 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_CALL(InterpNpcYaw, NPC_SELF, 90, 1) @@ -379,13 +379,13 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, 535, 200, 215) - 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_WAIT(20) + EVT_WAIT(20 * DT) EVT_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C, 0) EVT_END_THREAD EVT_THREAD @@ -396,7 +396,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_ADD(LVar0, -70) EVT_ADD(LVar1, -7) EVT_ADD(LVar2, 175) - EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 20) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_Idle) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.5)) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_Walk) @@ -404,14 +404,14 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_ADD(LVar0, -100) EVT_ADD(LVar1, -300) EVT_ADD(LVar2, 175) - EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 30) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 30 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_Idle) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) EVT_END_THREAD - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_THREAD - EVT_WAIT(35) + EVT_WAIT(35 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Raven_01, SOUND_20D, 0) EVT_END_THREAD EVT_THREAD @@ -420,7 +420,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_CALL(GetNpcPos, NPC_Raven_01, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -40) EVT_ADD(LVar2, 154) - EVT_CALL(NpcMoveTo, NPC_Raven_01, LVar0, LVar2, 20) + EVT_CALL(NpcMoveTo, NPC_Raven_01, LVar0, LVar2, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Idle) EVT_CALL(SetNpcJumpscale, NPC_Raven_01, EVT_FLOAT(1.5)) EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Walk) @@ -428,14 +428,14 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_ADD(LVar0, -20) EVT_ADD(LVar1, -300) EVT_ADD(LVar2, 154) - EVT_CALL(NpcJump0, NPC_Raven_01, LVar0, LVar1, LVar2, 30) + EVT_CALL(NpcJump0, NPC_Raven_01, LVar0, LVar1, LVar2, 30 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Idle) EVT_CALL(SetNpcPos, NPC_Raven_01, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcFlagBits, NPC_Raven_01, NPC_FLAG_GRAVITY, FALSE) EVT_END_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_THREAD - EVT_WAIT(35) + EVT_WAIT(35 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Raven_02, SOUND_20E, 0) EVT_END_THREAD EVT_THREAD @@ -444,7 +444,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_CALL(GetNpcPos, NPC_Raven_02, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -55) EVT_ADD(LVar2, 110) - EVT_CALL(NpcMoveTo, NPC_Raven_02, LVar0, LVar2, 20) + EVT_CALL(NpcMoveTo, NPC_Raven_02, LVar0, LVar2, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Idle) EVT_CALL(SetNpcJumpscale, NPC_Raven_02, EVT_FLOAT(1.5)) EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Walk) @@ -452,14 +452,14 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_ADD(LVar0, -40) EVT_ADD(LVar1, -300) EVT_ADD(LVar2, 110) - EVT_CALL(NpcJump0, NPC_Raven_02, LVar0, LVar1, LVar2, 30) + EVT_CALL(NpcJump0, NPC_Raven_02, LVar0, LVar1, LVar2, 30 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Idle) EVT_CALL(SetNpcPos, NPC_Raven_02, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcFlagBits, NPC_Raven_02, NPC_FLAG_GRAVITY, FALSE) EVT_END_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_THREAD - EVT_WAIT(35) + EVT_WAIT(35 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Raven_03, SOUND_20C, 0) EVT_END_THREAD EVT_THREAD @@ -468,7 +468,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_CALL(GetNpcPos, NPC_Raven_03, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -75) EVT_ADD(LVar2, 134) - EVT_CALL(NpcMoveTo, NPC_Raven_03, LVar0, LVar2, 20) + EVT_CALL(NpcMoveTo, NPC_Raven_03, LVar0, LVar2, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Idle) EVT_CALL(SetNpcJumpscale, NPC_Raven_03, EVT_FLOAT(1.5)) EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Walk) @@ -476,14 +476,14 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_ADD(LVar0, -70) EVT_ADD(LVar1, -300) EVT_ADD(LVar2, 134) - EVT_CALL(NpcJump0, NPC_Raven_03, LVar0, LVar1, LVar2, 30) + EVT_CALL(NpcJump0, NPC_Raven_03, LVar0, LVar1, LVar2, 30 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Idle) EVT_CALL(SetNpcPos, NPC_Raven_03, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcFlagBits, NPC_Raven_03, NPC_FLAG_GRAVITY, FALSE) EVT_END_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_THREAD - EVT_WAIT(35) + EVT_WAIT(35 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_20D, 0) EVT_END_THREAD EVT_THREAD @@ -492,7 +492,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_CALL(GetNpcPos, NPC_Raven_04, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -110) EVT_ADD(LVar2, 115) - EVT_CALL(NpcMoveTo, NPC_Raven_04, LVar0, LVar2, 20) + EVT_CALL(NpcMoveTo, NPC_Raven_04, LVar0, LVar2, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Idle) EVT_CALL(SetNpcJumpscale, NPC_Raven_04, EVT_FLOAT(1.5)) EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Walk) @@ -500,14 +500,14 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_ADD(LVar0, -110) EVT_ADD(LVar1, -300) EVT_ADD(LVar2, 115) - EVT_CALL(NpcJump0, NPC_Raven_04, LVar0, LVar1, LVar2, 30) + EVT_CALL(NpcJump0, NPC_Raven_04, LVar0, LVar1, LVar2, 30 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Idle) EVT_CALL(SetNpcPos, NPC_Raven_04, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcFlagBits, NPC_Raven_04, NPC_FLAG_GRAVITY, FALSE) EVT_END_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD - EVT_WAIT(45) + EVT_WAIT(45 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_20E, 0) EVT_END_THREAD EVT_CALL(SetNpcFlagBits, NPC_Raven_05, NPC_FLAG_GRAVITY, TRUE) @@ -515,7 +515,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_CALL(GetNpcPos, NPC_Raven_05, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -100) EVT_ADD(LVar2, 161) - EVT_CALL(NpcMoveTo, NPC_Raven_05, LVar0, LVar2, 30) + EVT_CALL(NpcMoveTo, NPC_Raven_05, LVar0, LVar2, 30 * DT) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Idle) EVT_CALL(SetNpcJumpscale, NPC_Raven_05, EVT_FLOAT(1.5)) @@ -524,7 +524,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_ADD(LVar0, -70) EVT_ADD(LVar1, -500) EVT_ADD(LVar2, 161) - EVT_CALL(NpcJump0, NPC_Raven_05, LVar0, LVar1, LVar2, 35) + EVT_CALL(NpcJump0, NPC_Raven_05, LVar0, LVar1, LVar2, 35 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Idle) EVT_CALL(SetNpcPos, NPC_Raven_05, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcFlagBits, NPC_Raven_05, NPC_FLAG_GRAVITY, FALSE) @@ -532,11 +532,11 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, 550, -150, 400) EVT_CALL(SetCamDistance, CAM_DEFAULT, 580) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(16.0), EVT_FLOAT(-4.0)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.8)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.8 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(15) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_WAIT(15 * DT) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0 * DT)) EVT_SET(GB_StoryProgress, STORY_CH5_RAFAEL_LEFT_NEST) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN diff --git a/src/world/area_kkj/kkj_00/kkj_00_4_scene_intro.c b/src/world/area_kkj/kkj_00/kkj_00_4_scene_intro.c index d508fdc107..4866c53618 100644 --- a/src/world/area_kkj/kkj_00/kkj_00_4_scene_intro.c +++ b/src/world/area_kkj/kkj_00/kkj_00_4_scene_intro.c @@ -12,7 +12,7 @@ EvtScript N(EVS_OpenAndCloseFrontDoor_Intro) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(MakeLerp, 80, 0, 8, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -37,11 +37,11 @@ EvtScript N(EVS_Scene_Intro) = { EVT_CALL(NpcMoveTo, NPC_Luigi, 20, 320, 0) EVT_CALL(SetNpcAnimation, NPC_Luigi, ANIM_Luigi_Idle) EVT_END_THREAD - EVT_CALL(func_802D1270, 80, 300, EVT_FLOAT(4.0)) + EVT_CALL(func_802D1270, 80, 300, EVT_FLOAT(4.0 / DT)) EVT_CALL(InterpPlayerYaw, 270, 5) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SpeakToPlayer, NPC_Luigi, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_Intro_0024) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END diff --git a/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c b/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c index 43fa247f71..d59873748b 100644 --- a/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c +++ b/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c @@ -10,67 +10,67 @@ EvtScript N(EVS_Scene_MeetingPeach) = { EVT_END_LOOP EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(FadeOutMusic, 0, 666) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetMusicTrack, 0, SONG_PRISONER_PEACH_THEME, 0, 8) EVT_CALL(PlayerFaceNpc, NPC_Peach, FALSE) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Walk) - EVT_CALL(SetNpcSpeed, NPC_Peach, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcSpeed, NPC_Peach, EVT_FLOAT(2.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Peach, 625, 0, 0) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_RaiseArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_TalkIdle) EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_Intro_004B) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_LowerArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle) EVT_THREAD - EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(5.0), 600, 0, -12, EVT_FLOAT(325.0), EVT_FLOAT(17.0), EVT_FLOAT(-9.0)) + EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(5.0 / DT), 600, 0, -12, EVT_FLOAT(325.0), EVT_FLOAT(17.0), EVT_FLOAT(-9.0)) EVT_END_THREAD - EVT_CALL(PlayerMoveTo, 575, 0, 20) - EVT_WAIT(10) + EVT_CALL(PlayerMoveTo, 575, 0, 20 * DT) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_RaiseArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_TalkIdle) EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_Intro_004C) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_Intro_004D) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_LowerArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(FadeOutMusic, 0, 1000) EVT_THREAD - EVT_WAIT(10) - EVT_CALL(PlayerMoveTo, 590, 0, 10) - EVT_WAIT(5) + EVT_WAIT(10 * DT) + EVT_CALL(PlayerMoveTo, 590, 0, 10 * DT) + EVT_WAIT(5 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, -45, 20, EMOTER_PLAYER, 0, 0, 0, 0) EVT_END_THREAD EVT_THREAD - EVT_CALL(InterpNpcYaw, NPC_Peach, 90, 7) + EVT_CALL(InterpNpcYaw, NPC_Peach, 90, 7 * DT) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Walk) - EVT_CALL(NpcMoveTo, NPC_Peach, 640, 0, 10) + EVT_CALL(NpcMoveTo, NPC_Peach, 640, 0, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle) EVT_CALL(PlaySoundAtNpc, NPC_Peach, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_Peach, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_LookAround) - EVT_WAIT(60) - EVT_CALL(InterpNpcYaw, NPC_Peach, 270, 7) + EVT_WAIT(60 * DT) + EVT_CALL(InterpNpcYaw, NPC_Peach, 270, 7 * DT) EVT_END_THREAD - EVT_WAIT(17) + EVT_WAIT(17 * DT) EVT_THREAD EVT_CALL(PlaySound, SOUND_80000056) - EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 200, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 200 * DT, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(GotoMap, EVT_PTR("osr_04"), osr_04_ENTRY_0) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END @@ -113,33 +113,33 @@ EvtScript N(EVS_Scene_Ascending) = { EVT_CALL(SetPlayerJumpscale, 0) EVT_LOOP(0) EVT_CALL(InterpPlayerYaw, 270, 0) - EVT_CALL(PlayerJump1, 550, 0, 0, 20) + EVT_CALL(PlayerJump1, 550, 0, 0, 20 * DT) EVT_CALL(InterpPlayerYaw, 90, 0) - EVT_CALL(PlayerJump1, 630, 0, 0, 20) + EVT_CALL(PlayerJump1, 630, 0, 0, 20 * DT) EVT_END_LOOP EVT_END_THREAD EVT_THREAD EVT_LOOP(0) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Run) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_CarryAboveRun) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_END_LOOP EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_RunLiftDress) EVT_LOOP(0) - EVT_CALL(NpcMoveTo, NPC_Peach, 600, 0, 20) - EVT_CALL(NpcMoveTo, NPC_Peach, 680, 0, 20) + EVT_CALL(NpcMoveTo, NPC_Peach, 600, 0, 20 * DT) + EVT_CALL(NpcMoveTo, NPC_Peach, 680, 0, 20 * DT) EVT_END_LOOP EVT_END_THREAD EVT_THREAD EVT_CALL(PlaySound, SOUND_80000056) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 200, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_CALL(GotoMap, EVT_PTR("osr_03"), osr_03_ENTRY_1) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END diff --git a/src/world/area_kkj/kkj_12/kkj_12_2_npc.c b/src/world/area_kkj/kkj_12/kkj_12_2_npc.c index 3e0a2a0570..a80e49f3d6 100644 --- a/src/world/area_kkj/kkj_12/kkj_12_2_npc.c +++ b/src/world/area_kkj/kkj_12/kkj_12_2_npc.c @@ -68,7 +68,7 @@ EvtScript N(EVS_NpcInteract_Koopatrol_02) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(N(GetPeachDisguise), LVar0) EVT_IF_EQ(LVar0, PEACH_DISGUISE_CLUBBA) - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0), 0, EVT_FLOAT(350.0), EVT_FLOAT(15.0), EVT_FLOAT(-7.0)) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0 / DT), 0, EVT_FLOAT(350.0), EVT_FLOAT(15.0), EVT_FLOAT(-7.0)) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0147) EVT_THREAD EVT_LOOP(0) @@ -81,28 +81,28 @@ EvtScript N(EVS_NpcInteract_Koopatrol_02) = { EVT_END_THREAD EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim05) - EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, 1050, 0, 0) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0148) EVT_CALL(NpcMoveTo, NPC_SELF, 900, 0, 0) EVT_CALL(SetNpcPos, NPC_SELF, 0, -500, 0) EVT_SET(GF_KKJ12_TrickedGuard, TRUE) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_13_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilit2, 1, 0) - 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_IF EVT_IF_EQ(GF_KKJ11_TrickedGuard, FALSE) - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0), 0, EVT_FLOAT(350.0), EVT_FLOAT(15.0), EVT_FLOAT(-7.0)) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0 / DT), 0, EVT_FLOAT(350.0), EVT_FLOAT(15.0), EVT_FLOAT(-7.0)) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0144) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_SET(LVar0, ITEM_PEACH_KEY1) EVT_CALL(ShowGotItem, LVar0, TRUE, 0) EVT_CALL(AddKeyItem, LVar0) EVT_SET(GF_KKJ11_TrickedGuard, TRUE) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0145) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0 / DT)) EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 16, MSG_Peach_0146) EVT_END_IF diff --git a/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c b/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c index de0ecd1bd5..60302669f7 100644 --- a/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c +++ b/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c @@ -201,8 +201,12 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_THREAD EVT_CALL(PlaySound, SOUND_80000056) +#if VERSION_PAL + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 60 * DT, EVT_FLOAT(0.5)) +#else EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(0.5)) +#endif EVT_CALL(PlaySound, SOUND_33 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(func_802D62E4, SOUND_33) EVT_END_THREAD @@ -210,63 +214,63 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_CALL(SetPlayerJumpscale, 0) EVT_LOOP(2) EVT_CALL(InterpPlayerYaw, 270, 0) - EVT_CALL(PlayerJump1, 550, 0, 0, 20) + EVT_CALL(PlayerJump1, 550, 0, 0, 20 * DT) EVT_CALL(InterpPlayerYaw, 90, 0) - EVT_CALL(PlayerJump1, 630, 0, 0, 20) + EVT_CALL(PlayerJump1, 630, 0, 0, 20 * DT) EVT_END_LOOP - EVT_CALL(PlayerMoveTo, 550, 0, 30) - EVT_CALL(PlayerMoveTo, 575, 0, 30) - EVT_CALL(InterpPlayerYaw, 90, 7) + EVT_CALL(PlayerMoveTo, 550, 0, 30 * DT) + EVT_CALL(PlayerMoveTo, 575, 0, 30 * DT) + EVT_CALL(InterpPlayerYaw, 90, 7 * DT) EVT_END_THREAD EVT_THREAD EVT_LOOP(2) EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_CarryAboveRun) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Run) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_END_LOOP EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_RunLiftDress) EVT_LOOP(2) - EVT_CALL(NpcMoveTo, NPC_Peach, 600, -2, 20) - EVT_CALL(NpcMoveTo, NPC_Peach, 680, -2, 20) + EVT_CALL(NpcMoveTo, NPC_Peach, 600, -2, 20 * DT) + EVT_CALL(NpcMoveTo, NPC_Peach, 680, -2, 20 * DT) EVT_END_LOOP EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Walk) - EVT_CALL(NpcMoveTo, NPC_Peach, 600, -2, 30) - EVT_CALL(NpcMoveTo, NPC_Peach, 625, -2, 30) + EVT_CALL(NpcMoveTo, NPC_Peach, 600, -2, 30 * DT) + EVT_CALL(NpcMoveTo, NPC_Peach, 625, -2, 30 * DT) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle) - EVT_CALL(InterpNpcYaw, NPC_Peach, 270, 7) + EVT_CALL(InterpNpcYaw, NPC_Peach, 270, 7 * DT) EVT_END_THREAD - EVT_WAIT(160) + EVT_WAIT(160 * DT) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_RaiseArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_TalkIdle) EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach2_Talk,ANIM_Peach2_TalkIdle, 0, MSG_Intro_004E) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_LowerArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Peach, SPRITE_ID_BACK_FACING | ANIM_Peach1_Idle) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(GetNpcPos, NPC_Peach, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Peach, LVar0, LVar1, LVar2, 10) - EVT_WAIT(10) - EVT_CALL(InterpPlayerYaw, 0, 7) + EVT_WAIT(10 * DT) + EVT_CALL(InterpPlayerYaw, 0, 7 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 600, 0, -15) EVT_CALL(SetPanTarget, CAM_DEFAULT, 600, 0, -15) - 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_CALL(SpeakToPlayer, NPC_Peach, SPRITE_ID_BACK_FACING | ANIM_Peach1_Idle, SPRITE_ID_BACK_FACING | ANIM_Peach1_Idle, 5, MSG_Intro_004F) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarIdle) EVT_CALL(SetNpcAnimation, NPC_Bowser_Prop, ANIM_WorldBowser_ClownCarPropeller) EVT_CALL(SetNpcYaw, NPC_Bowser_Body, 90) EVT_CALL(SetNpcYaw, NPC_Bowser_Prop, 90) EVT_EXEC(N(EVS_UpdatePropellerSounds_Intro)) - EVT_CALL(LoadPath, 50, EVT_PTR(N(FlyThroughWindowPath)), ARRAY_COUNT(N(FlyThroughWindowPath)), EASING_LINEAR) + EVT_CALL(LoadPath, 50 * DT, EVT_PTR(N(FlyThroughWindowPath)), ARRAY_COUNT(N(FlyThroughWindowPath)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_Bowser_Body, LVar1, LVar2, LVar3) @@ -283,8 +287,8 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0B) EVT_CALL(SetNpcYaw, NPC_Kammy, 90) - EVT_WAIT(10) - EVT_CALL(LoadPath, 50, EVT_PTR(N(FlyThroughWindowPath)), ARRAY_COUNT(N(FlyThroughWindowPath)), EASING_LINEAR) + EVT_WAIT(10 * DT) + EVT_CALL(LoadPath, 50 * DT, EVT_PTR(N(FlyThroughWindowPath)), ARRAY_COUNT(N(FlyThroughWindowPath)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_Kammy, LVar1, LVar2, LVar3) @@ -298,7 +302,7 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_CALL(SetNpcYaw, NPC_Kammy, 270) EVT_END_THREAD EVT_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(N(ScreenWhiteFlashOn)) EVT_CALL(EnableGroup, MODEL_g133, FALSE) EVT_CALL(EnableGroup, MODEL_g147, FALSE) @@ -311,16 +315,16 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_CALL(N(ScreenWhiteFlashOff)) EVT_END_THREAD EVT_THREAD - EVT_WAIT(20) - EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(2.0)) + EVT_WAIT(20 * DT) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10 * DT, EVT_FLOAT(2.0)) EVT_END_THREAD - EVT_LOOP(70) + EVT_LOOP(70 * DT) EVT_WAIT(1) EVT_CALL(PlayerFaceNpc, NPC_Bowser_Body, FALSE) EVT_CALL(NpcFaceNpc, NPC_Peach, NPC_Bowser_Body, 0) EVT_END_LOOP EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcPos, NPC_Bowser_Prop, NPC_DISPOSE_LOCATION) EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_THEME, 0, 8) EVT_THREAD @@ -329,16 +333,16 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_CALL(NpcJump0, NPC_Bowser_Body, 810, 0, 0, 5) EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Body, SOUND_20A0, 0) EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_PostJump) - EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20 * DT, EVT_FLOAT(2.0)) EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Idle) EVT_END_THREAD EVT_CALL(SetPanTarget, CAM_DEFAULT, 740, 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_WAIT(30) + EVT_WAIT(30 * DT) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) - EVT_CALL(NpcMoveTo, NPC_Kammy, 880, 0, 20) + EVT_CALL(NpcMoveTo, NPC_Kammy, 880, 0, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) EVT_END_THREAD EVT_CALL(SpeakToNpc, NPC_Bowser_Body, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Peach, MSG_Intro_0050) @@ -353,24 +357,24 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_CALL(SpeakToNpc, NPC_Bowser_Body, ANIM_WorldBowser_TalkEyesClosed, ANIM_WorldBowser_Idle, 0, NPC_Peach, MSG_Intro_0052) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Walk) - EVT_CALL(NpcMoveTo, NPC_Bowser_Body, 770, 0, 30) + EVT_CALL(NpcMoveTo, NPC_Bowser_Body, 770, 0, 30 * DT) EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Idle) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) - EVT_CALL(NpcMoveTo, NPC_Kammy, 840, 0, 30) + EVT_CALL(NpcMoveTo, NPC_Kammy, 840, 0, 30 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) EVT_END_THREAD - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_SET(LVar0, EVT_FLOAT(90.0)) EVT_EXEC_WAIT(N(EVS_FocusCam_Everyone)) - EVT_WAIT(5) - EVT_CALL(PlayerMoveTo, 660, 0, 15) + EVT_WAIT(5 * DT) + EVT_CALL(PlayerMoveTo, 660, 0, 15 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_BeforeJump) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SpeakToPlayer, NPC_Bowser_Body, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_Intro_0053) EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach2_ArmsCrossedTalk, ANIM_Peach2_ArmsCrossedIdle, 5, MSG_Intro_0054) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_RearUpLaugh) EVT_CALL(SpeakToPlayer, NPC_Bowser_Body, ANIM_WorldBowser_RearUpLaugh, ANIM_WorldBowser_RearUpLaugh, 0, MSG_Intro_0055) EVT_SET(LVar0, EVT_FLOAT(90.0)) @@ -382,7 +386,7 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_WAIT(5) EVT_CALL(PlayerMoveTo, 695, 0, 10) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.75)) - EVT_CALL(PlayerJump, 720, 80, 0, 20) + EVT_CALL(PlayerJump, 720, 80, 0, 20 * DT) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_LOOP(0) EVT_WAIT(1) @@ -398,41 +402,41 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_GaspStill) EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_RearUpLaugh) EVT_EXEC_WAIT(N(EVS_FocusCam_OnPeach)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach2_GaspStill, ANIM_Peach2_GaspStill, 5, MSG_Intro_005D) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 790, 0, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, 790, 0, 0) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Bowser_Body, ANIM_WorldBowser_RearUpLaugh, ANIM_WorldBowser_RearUpLaugh, 5, MSG_Intro_005E) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 5, MSG_Intro_005F) EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Idle) EVT_CALL(InterpNpcYaw, NPC_Bowser_Body, 90, 5) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Brandish) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_BrandishIdle) EVT_CALL(SpeakToNpc, NPC_Bowser_Body, ANIM_WorldBowser_BrandishTalk, ANIM_WorldBowser_BrandishIdle, 0, NPC_Kammy, MSG_Intro_0060) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_SET(LVar0, EVT_FLOAT(90.0)) EVT_EXEC_WAIT(N(EVS_FocusCam_Everyone)) EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Idle) EVT_CALL(InterpNpcYaw, NPC_Bowser_Body, 270, 10) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_Bowser_Body, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5, MSG_Intro_0061) EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Brandish) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(FadeOutMusic, 0, 500) EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Body, SOUND_2121, 0) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, 780, 95, 27, 1, 30) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_THREAD - EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(4.0)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10 * DT, EVT_FLOAT(4.0)) EVT_END_THREAD EVT_CALL(PlaySoundAtPlayer, SOUND_2127, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -441,7 +445,7 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_THREAD EVT_CALL(PlaySoundAtPlayer, SOUND_390, 0) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Hurt) - EVT_CALL(LoadPath, 30, EVT_PTR(N(PlayerThrownPath)), ARRAY_COUNT(N(PlayerThrownPath)), EASING_LINEAR) + EVT_CALL(LoadPath, 30 * DT, EVT_PTR(N(PlayerThrownPath)), ARRAY_COUNT(N(PlayerThrownPath)), EASING_LINEAR) EVT_SET(LVar4, 0) EVT_LOOP(0) EVT_CALL(GetNextPathPos) @@ -454,9 +458,9 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(GotoMap, EVT_PTR("osr_03"), osr_03_ENTRY_2) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN @@ -475,31 +479,31 @@ EvtScript N(EVS_Scene_PeachCaptured) = { EVT_CALL(SetNpcPos, NPC_Kammy, 820, 0, 0) EVT_SET(LVar0, EVT_FLOAT(90.0)) EVT_EXEC_WAIT(N(EVS_FocusCam_Everyone)) - EVT_CALL(SetNpcSpeed, NPC_Peach, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_Peach, EVT_FLOAT(3.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Peach, 570, -130, 0) EVT_CALL(SpeakToPlayer, NPC_Peach, SPRITE_ID_BACK_FACING | ANIM_Peach1_Idle, SPRITE_ID_BACK_FACING | ANIM_Peach1_Idle, 5, MSG_Intro_0062) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim04) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_CaptivePeach, ANIM_WorldKoopatrol_Anim06) EVT_CALL(SetNpcPos, NPC_CaptivePeach, 900, 0, 30) - EVT_CALL(SetNpcSpeed, NPC_CaptivePeach, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcSpeed, NPC_CaptivePeach, EVT_FLOAT(4.0 / DT)) EVT_CALL(NpcMoveTo, NPC_CaptivePeach, 660, 30, 0) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim06) EVT_CALL(SetNpcPos, NPC_Koopatrol_02, 940, 0, 30) - EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(4.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, 700, 30, 0) EVT_END_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 0) EVT_CALL(GotoMap, EVT_PTR("hos_10"), hos_10_ENTRY_5) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END diff --git a/src/world/area_kkj/kkj_14/kkj_14_10_chapter2.c b/src/world/area_kkj/kkj_14/kkj_14_10_chapter2.c index c8f820c0c3..3cd6e5b93f 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_10_chapter2.c +++ b/src/world/area_kkj/kkj_14/kkj_14_10_chapter2.c @@ -86,12 +86,12 @@ EvtScript N(EVS_Scene_Chapter2) = { EVT_CALL(InterpPlayerYaw, 270, 0) EVT_EXEC_WAIT(N(EVS_FocusCam_Door_Ch2)) EVT_EXEC(N(EVS_OpenAndCloseDoor_Ch2)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcPos, NPC_Bowser, -470, 0, -30) EVT_CALL(SetNpcVar, NPC_Bowser, 0, 1) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Walk) - EVT_CALL(SetNpcSpeed, NPC_Bowser, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_Bowser, EVT_FLOAT(3.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Bowser, -30, 30, 0) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) EVT_CALL(SetNpcVar, NPC_Bowser, 0, 0) @@ -113,22 +113,22 @@ EvtScript N(EVS_Scene_Chapter2) = { EVT_CALL(EndSpeech, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ArmsCrossedIdle) EVT_CALL(InterpPlayerYaw, 90, 3) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_ArmsCrossedTalk, ANIM_Peach2_ArmsCrossedIdle, 5, MSG_Peach_005D) EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_TalkEyesClosed, ANIM_WorldBowser_TalkEyesClosed, 5, MSG_Peach_005E) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) EVT_CALL(EndSpeech, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(InterpNpcYaw, NPC_Bowser, 270, 0) EVT_EXEC_WAIT(N(EVS_FocusCam_Door_Ch2)) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_EXEC(N(EVS_OpenDoor_Ch2)) EVT_CALL(SetMusicTrack, 0, SONG_KAMMY_KOOPA_THEME, 0, 8) EVT_CALL(SetNpcPos, NPC_Kammy, -470, 0, -30) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim03) - EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(5.0)) + EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(5.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Kammy, -340, -30, 0) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) EVT_WAIT(10) @@ -136,43 +136,43 @@ EvtScript N(EVS_Scene_Chapter2) = { EVT_CALL(SetCamDistance, CAM_DEFAULT, 350) EVT_CALL(SetPanTarget, CAM_DEFAULT, -30, 0, -30) EVT_CALL(SetCamPosA, CAM_DEFAULT, -287, 32) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim03) - EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(5.0)) + EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(5.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Kammy, -110, 30, 0) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_0060) EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_0061) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) - EVT_CALL(NpcMoveTo, NPC_Kammy, -90, 40, 10) + EVT_CALL(NpcMoveTo, NPC_Kammy, -90, 40, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_0062) EVT_CALL(GetNpcPos, NPC_Bowser, LVar0, LVar1, LVar2) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Shock) - EVT_CALL(NpcJump0, NPC_Bowser, LVar0, LVar1, LVar2, 10) + EVT_CALL(NpcJump0, NPC_Bowser, LVar0, LVar1, LVar2, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_0063) EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_0064) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_ArmsCrossed) - EVT_WAIT(50) + EVT_WAIT(50 * DT) EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_0065) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Walk) - EVT_CALL(SetNpcSpeed, NPC_Bowser, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_Bowser, EVT_FLOAT(3.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Bowser, -470, -30, 0) EVT_END_THREAD EVT_CALL(SetNpcVar, NPC_Kammy, 0, 1) EVT_THREAD - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) - EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(3.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Kammy, -470, -30, 0) EVT_CALL(SetNpcVar, NPC_Kammy, 0, 0) EVT_END_THREAD EVT_THREAD - EVT_CALL(MakeLerp, 350, 400, 100, EASING_LINEAR) + EVT_CALL(MakeLerp, 350, 400, 100 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(SetCamDistance, CAM_DEFAULT, LVar0) @@ -192,12 +192,12 @@ EvtScript N(EVS_Scene_Chapter2) = { EVT_END_IF EVT_END_LOOP EVT_EXEC(N(EVS_CloseDoor_Ch2)) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetMusicTrack, 0, SONG_PRISONER_PEACH_THEME, 0, 8) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) EVT_CALL(SetPanTarget, CAM_DEFAULT, 20, 0, 30) - EVT_WAIT(3) + EVT_WAIT(3 * DT) EVT_THREAD EVT_LOOP(0) EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) @@ -208,7 +208,7 @@ EvtScript N(EVS_Scene_Chapter2) = { EVT_END_LOOP EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_END_THREAD - EVT_CALL(LoadPath, 80, EVT_PTR(N(TwinkEmergePath)), ARRAY_COUNT(N(TwinkEmergePath)), EASING_LINEAR) + EVT_CALL(LoadPath, 80 * DT, EVT_PTR(N(TwinkEmergePath)), ARRAY_COUNT(N(TwinkEmergePath)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) @@ -217,20 +217,20 @@ EvtScript N(EVS_Scene_Chapter2) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_0066) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0067) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0068) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0069) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_006A) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_CALL(EnablePartnerAI) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN diff --git a/src/world/area_kkj/kkj_14/kkj_14_11_chapter3.c b/src/world/area_kkj/kkj_14/kkj_14_11_chapter3.c index 71fdb38886..d6cb363bff 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_11_chapter3.c +++ b/src/world/area_kkj/kkj_14/kkj_14_11_chapter3.c @@ -25,7 +25,7 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_CALL(SetNpcPos, NPC_PARTNER, -40, 90, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), -20, 250, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) - EVT_CALL(LoadPath, 24, EVT_PTR(N(TwinkPacingPath1)), ARRAY_COUNT(N(TwinkPacingPath1)), EASING_LINEAR) + EVT_CALL(LoadPath, 24 * DT, EVT_PTR(N(TwinkPacingPath1)), ARRAY_COUNT(N(TwinkPacingPath1)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) @@ -35,8 +35,8 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_END_IF EVT_END_LOOP EVT_CALL(NpcFacePlayer, NPC_PARTNER, 5) - EVT_WAIT(20) - EVT_CALL(LoadPath, 30, EVT_PTR(N(TwinkPacingPath2)), ARRAY_COUNT(N(TwinkPacingPath2)), EASING_LINEAR) + EVT_WAIT(20 * DT) + EVT_CALL(LoadPath, 30 * DT, EVT_PTR(N(TwinkPacingPath2)), ARRAY_COUNT(N(TwinkPacingPath2)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) @@ -46,8 +46,8 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_END_IF EVT_END_LOOP EVT_CALL(NpcFacePlayer, NPC_PARTNER, 5) - EVT_WAIT(20) - EVT_CALL(LoadPath, 10, EVT_PTR(N(TwinkPacingPath3)), ARRAY_COUNT(N(TwinkPacingPath3)), EASING_LINEAR) + EVT_WAIT(20 * DT) + EVT_CALL(LoadPath, 10 * DT, EVT_PTR(N(TwinkPacingPath3)), ARRAY_COUNT(N(TwinkPacingPath3)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) @@ -57,12 +57,12 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_END_IF EVT_END_LOOP EVT_CALL(NpcFacePlayer, NPC_PARTNER, 5) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_007E) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_007F) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0080) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0081) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0 / DT)) EVT_CALL(EnablePartnerAI) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN diff --git a/src/world/area_kkj/kkj_14/kkj_14_12_chapter4.c b/src/world/area_kkj/kkj_14/kkj_14_12_chapter4.c index 3e8b18793e..dd2f9d1b3c 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_12_chapter4.c +++ b/src/world/area_kkj/kkj_14/kkj_14_12_chapter4.c @@ -7,7 +7,7 @@ EvtScript N(EVS_Scene_Chapter4) = { EVT_CALL(SetNpcPos, NPC_PARTNER, -60, 30, 0) EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), -20, 250, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0097) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0098) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0099) @@ -15,7 +15,7 @@ EvtScript N(EVS_Scene_Chapter4) = { EVT_CALL(NpcFlyTo, NPC_PARTNER, -30, 55, 30, 30, -5, EASING_LINEAR) EVT_CALL(EnablePartnerAI) EVT_END_THREAD - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0 * DT)) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END diff --git a/src/world/area_kkj/kkj_14/kkj_14_13_chapter5.c b/src/world/area_kkj/kkj_14/kkj_14_13_chapter5.c index 61ffbe7ab0..5e6f90026d 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_13_chapter5.c +++ b/src/world/area_kkj/kkj_14/kkj_14_13_chapter5.c @@ -14,33 +14,33 @@ EvtScript N(EVS_Scene_Chapter5) = { EVT_THREAD EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(275.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.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(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_LOOP(2) - EVT_CALL(PlayerMoveTo, -110, 0, 25) - EVT_WAIT(5) - EVT_CALL(PlayerMoveTo, -130, 0, 25) - EVT_WAIT(5) + EVT_CALL(PlayerMoveTo, -110, 0, 25 * DT) + EVT_WAIT(5 * DT) + EVT_CALL(PlayerMoveTo, -130, 0, 25 * DT) + EVT_WAIT(5 * DT) EVT_END_LOOP - EVT_CALL(PlayerMoveTo, -110, 0, 25) + EVT_CALL(PlayerMoveTo, -110, 0, 25 * DT) EVT_CALL(InterpPlayerYaw, 270, 5) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_00EB) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00EC) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_00ED) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00EE) EVT_THREAD - EVT_CALL(NpcFlyTo, NPC_PARTNER, -140, 55, 0, 30, -5, EASING_LINEAR) + EVT_CALL(NpcFlyTo, NPC_PARTNER, -140, 55, 0, 30 * DT, -5, EASING_LINEAR) EVT_CALL(EnablePartnerAI) EVT_END_THREAD - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0 / DT)) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END diff --git a/src/world/area_kkj/kkj_14/kkj_14_14_chapter6.c b/src/world/area_kkj/kkj_14/kkj_14_14_chapter6.c index 221f90599b..80221800be 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_14_chapter6.c +++ b/src/world/area_kkj/kkj_14/kkj_14_14_chapter6.c @@ -12,22 +12,22 @@ EvtScript N(EVS_Scene_Chapter6) = { 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(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_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_012F) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0130) EVT_THREAD - EVT_CALL(NpcFlyTo, NPC_PARTNER, -90, 55, 0, 30, -5, EASING_LINEAR) + EVT_CALL(NpcFlyTo, NPC_PARTNER, -90, 55, 0, 30 * DT, -5, EASING_LINEAR) EVT_CALL(EnablePartnerAI) EVT_END_THREAD - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0 / DT)) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END diff --git a/src/world/area_kkj/kkj_14/kkj_14_15_chapter7.c b/src/world/area_kkj/kkj_14/kkj_14_15_chapter7.c index 8d8639cc4a..dcea14d01d 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_15_chapter7.c +++ b/src/world/area_kkj/kkj_14/kkj_14_15_chapter7.c @@ -17,7 +17,7 @@ Vec3f N(TwinkAttackPath)[] = { EvtScript N(EVS_ApproachPeach) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT)) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_THREAD EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -265,18 +265,18 @@ EvtScript N(EVS_Scene_Chapter7) = { EVT_CALL(RotateModel, MODEL_o84, 80, 0, -1, 0) EVT_CALL(RotateModel, MODEL_o86, 80, 0, 1, 0) EVT_EXEC_WAIT(N(EVS_FocusCam_Door_Ch7)) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_EXEC(N(EVS_OpenAndCloseDoor_Ch7)) EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Walk) EVT_CALL(SetNpcPos, NPC_Ch7_Bowser, -470, 0, -30) - EVT_CALL(SetNpcSpeed, NPC_Ch7_Bowser, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_Ch7_Bowser, EVT_FLOAT(3.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Ch7_Bowser, -290, -30, 0) EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Idle) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_Peach_0161) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_EXEC_WAIT(N(EVS_FocusCam_Bed)) - EVT_CALL(LoadPath, 30, EVT_PTR(N(TwinkHidePath)), ARRAY_COUNT(N(TwinkHidePath)), EASING_LINEAR) + EVT_CALL(LoadPath, 30 / DT, EVT_PTR(N(TwinkHidePath)), ARRAY_COUNT(N(TwinkHidePath)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) @@ -291,10 +291,10 @@ EvtScript N(EVS_Scene_Chapter7) = { EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Walk) EVT_CALL(NpcMoveTo, NPC_Ch7_Bowser, 300, 20, 0) EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Idle) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(325.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.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_CALL(SpeakToPlayer, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_Peach_0162) @@ -303,22 +303,22 @@ EvtScript N(EVS_Scene_Chapter7) = { EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_ArmsCrossedTalk, ANIM_Peach2_ArmsCrossedIdle, 5, MSG_Peach_0163) EVT_CALL(SpeakToPlayer, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5, MSG_Peach_0164) EVT_CALL(InterpPlayerYaw, 270, 5) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_ArmsCrossedTalk, ANIM_Peach2_ArmsCrossedIdle, 5, MSG_Peach_0165) EVT_CALL(SpeakToPlayer, NPC_Ch7_Bowser, ANIM_WorldBowser_TalkEyesClosed, ANIM_WorldBowser_TalkEyesClosed, 5, MSG_Peach_0166) EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Idle) EVT_CALL(EndSpeech, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_ArmsCrossedTalk, ANIM_Peach2_ArmsCrossedIdle, 5, MSG_Peach_0167) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_EXEC_WAIT(N(EVS_FocusCam_Door_Ch7)) EVT_EXEC(N(EVS_OpenDoor_Ch7)) EVT_CALL(SetNpcAnimation, NPC_Ch7_Kammy, ANIM_WorldKammy_Anim03) EVT_CALL(SetNpcPos, NPC_Ch7_Kammy, -470, 0, -30) - EVT_CALL(SetNpcSpeed, NPC_Ch7_Bowser, EVT_FLOAT(5.0)) + EVT_CALL(SetNpcSpeed, NPC_Ch7_Bowser, EVT_FLOAT(5.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Ch7_Kammy, -340, -30, 0) EVT_CALL(SetNpcAnimation, NPC_Ch7_Kammy, ANIM_WorldKammy_Anim01) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToNpc, NPC_Ch7_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Ch7_Bowser, MSG_Peach_0168) EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Idle) EVT_CALL(SetNpcYaw, NPC_Ch7_Bowser, 270) @@ -328,37 +328,37 @@ EvtScript N(EVS_Scene_Chapter7) = { EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(325.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcPos, NPC_Ch7_Kammy, 50, 0, -10) EVT_CALL(SetNpcAnimation, NPC_Ch7_Kammy, ANIM_WorldKammy_Anim03) EVT_CALL(NpcMoveTo, NPC_Ch7_Kammy, 180, -10, 0) EVT_CALL(SetNpcAnimation, NPC_Ch7_Kammy, ANIM_WorldKammy_Anim01) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToNpc, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Ch7_Kammy, MSG_Peach_0169) EVT_CALL(SpeakToNpc, NPC_Ch7_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Ch7_Bowser, MSG_Peach_016A) EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Shock) EVT_CALL(GetNpcPos, NPC_Ch7_Bowser, LVar0, LVar1, LVar2) - EVT_CALL(NpcJump0, NPC_Ch7_Bowser, LVar0, LVar1, LVar2, 10) + EVT_CALL(NpcJump0, NPC_Ch7_Bowser, LVar0, LVar1, LVar2, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Idle) EVT_CALL(SpeakToNpc, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Ch7_Kammy, MSG_Peach_016B) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD 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(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 EVT_CALL(InterpNpcYaw, NPC_Ch7_Bowser, 270, 10) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_Peach_016C) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcPos, NPC_Ch7_Koopatrol_01, 48, 0, 70) EVT_CALL(SetNpcPos, NPC_Ch7_Koopatrol_02, 100, 0, 70) EVT_CALL(SetNpcFlagBits, NPC_Ch7_Koopatrol_01, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Ch7_Koopatrol_02, NPC_FLAG_GRAVITY, TRUE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_EXEC_WAIT(N(EVS_ApproachPeach)) EVT_EXEC_WAIT(N(EVS_TiePeachUp)) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Angry) @@ -411,13 +411,13 @@ EvtScript N(EVS_Scene_Chapter7) = { EVT_CALL(PlaySoundAt, SOUND_HIT_PLAYER_NORMAL, 0, 350, 80, 10) EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, 350, 80, 10, 1, 0) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) - EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(7.5)) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(7.5 / DT)) EVT_CALL(NpcFlyTo, NPC_PARTNER, 500, 130, 10, 0, 0, EASING_LINEAR) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_TiedIdle, ANIM_Peach2_TiedIdle, 5, MSG_Peach_0171) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Idle) EVT_CALL(SpeakToPlayer, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5, MSG_Peach_0172) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CHILD_THREAD EVT_LOOP(0) EVT_CALL(NpcFacePlayer, NPC_Ch7_Bowser, 0) @@ -427,7 +427,7 @@ EvtScript N(EVS_Scene_Chapter7) = { EVT_EXEC_WAIT(N(EVS_PickUpPeach)) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_TiedSideways, ANIM_Peach3_TiedSideways, 5, MSG_Peach_0173) EVT_EXEC_WAIT(N(EVS_CarryPeachAway)) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_EXEC_WAIT(N(EVS_EndPeachChapter7)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(EnablePartnerAI) diff --git a/src/world/area_kkj/kkj_14/kkj_14_3_interactables.c b/src/world/area_kkj/kkj_14/kkj_14_3_interactables.c index 6a99b7fd51..8087f9f39c 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_3_interactables.c +++ b/src/world/area_kkj/kkj_14/kkj_14_3_interactables.c @@ -262,9 +262,9 @@ EvtScript N(EVS_OpenHiddenPassage) = { EVT_CALL(EnableModel, MODEL_o42, FALSE) EVT_CALL(EnableGroup, MODEL_g27, TRUE) EVT_IF_EQ(GB_StoryProgress, STORY_CH1_BEGAN_PEACH_MISSION) - EVT_SET(LVar0, 120) + EVT_SET(LVar0, 120 * DT) EVT_ELSE - EVT_SET(LVar0, 60) + EVT_SET(LVar0, 60 * DT) EVT_END_IF EVT_CALL(PlaySoundAtCollider, COLLIDER_o129, SOUND_FC, 0) EVT_CALL(MakeLerp, 255, 0, LVar0, EASING_LINEAR) @@ -278,13 +278,13 @@ EvtScript N(EVS_OpenHiddenPassage) = { EVT_END_LOOP EVT_CALL(EnableModel, MODEL_o157, FALSE) EVT_CALL(SetModelFlags, MODEL_o157, 16, FALSE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(PlaySoundAt, SOUND_FB, 0, -125, 10, -120) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, -125, 10, -120, EVT_FLOAT(2.0), 30) EVT_END_THREAD - EVT_CALL(MakeLerp, 0, -180, 30, EASING_QUADRATIC_IN) + EVT_CALL(MakeLerp, 0, -180, 30 * DT, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(RotateModel, MODEL_o39, LVar0, 1, 0, 0) @@ -293,7 +293,7 @@ EvtScript N(EVS_OpenHiddenPassage) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o129, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o130, COLLIDER_FLAGS_UPPER_MASK) EVT_SET(GF_KKJ14_OpenedPassage, TRUE) @@ -368,14 +368,14 @@ EvtScript N(EVS_Inspect_HiddenButton_FirstTime) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, -120, 25, 0) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_END_IF EVT_EXEC_WAIT(N(EVS_OpenHiddenPassage)) EVT_IF_EQ(AF_KKJ_05, FALSE) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Delighted) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ShoutJoy, ANIM_Twink_ShoutJoy, 5, MSG_Peach_0047) EVT_SET(AF_KKJ_05, TRUE) diff --git a/src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c b/src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c index bbac730008..bcda45ad1d 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c +++ b/src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c @@ -39,7 +39,7 @@ EvtScript N(EVS_Scene_TossedBackInRoom) = { 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(30) + EVT_WAIT(30 * DT) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o112, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_OPEN, 0) @@ -53,8 +53,8 @@ EvtScript N(EVS_Scene_TossedBackInRoom) = { EVT_END_IF EVT_END_LOOP EVT_THREAD - EVT_WAIT(10) - EVT_CALL(LoadPath, 50, EVT_PTR(N(TwinkFollowPath)), ARRAY_COUNT(N(TwinkFollowPath)), EASING_LINEAR) + EVT_WAIT(10 * DT) + EVT_CALL(LoadPath, 50 * DT, EVT_PTR(N(TwinkFollowPath)), ARRAY_COUNT(N(TwinkFollowPath)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) @@ -90,11 +90,11 @@ EvtScript N(EVS_Scene_TossedBackInRoom) = { EVT_END_LOOP EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_01, ANIM_WorldKoopatrol_Anim12) EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_02, ANIM_WorldKoopatrol_Anim12) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Thrown) EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_01, ANIM_WorldKoopatrol_Anim15) EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_02, ANIM_WorldKoopatrol_Anim15) - EVT_CALL(LoadPath, 15, EVT_PTR(N(PeachTossPath)), ARRAY_COUNT(N(PeachTossPath)), EASING_LINEAR) + EVT_CALL(LoadPath, 15 * DT, EVT_PTR(N(PeachTossPath)), ARRAY_COUNT(N(PeachTossPath)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) @@ -114,19 +114,19 @@ EvtScript N(EVS_Scene_TossedBackInRoom) = { EVT_ADD(LVar3, 5) EVT_LOOP(4) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, LVar1, LVar2, LVar3, 0, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_END_LOOP EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_01, ANIM_WorldKoopatrol_Anim01) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_01, ANIM_WorldKoopatrol_Anim06) EVT_CALL(NpcMoveTo, NPC_Koopatrol_Guard_01, -462, -30, 0) EVT_CALL(SetNpcPos, NPC_Koopatrol_Guard_01, NPC_DISPOSE_LOCATION) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_02, ANIM_WorldKoopatrol_Anim01) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_02, ANIM_WorldKoopatrol_Anim06) EVT_CALL(NpcMoveTo, NPC_Koopatrol_Guard_02, -430, -30, 0) EVT_CALL(SetNpcPos, NPC_Koopatrol_Guard_02, NPC_DISPOSE_LOCATION) @@ -143,8 +143,8 @@ EvtScript N(EVS_Scene_TossedBackInRoom) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_CLOSE, 0) EVT_END_THREAD - EVT_WAIT(60) - EVT_CALL(LoadPath, 50, EVT_PTR(N(TwinkApproachPath)), ARRAY_COUNT(N(TwinkApproachPath)), EASING_LINEAR) + EVT_WAIT(60 * DT) + EVT_CALL(LoadPath, 50 * DT, EVT_PTR(N(TwinkApproachPath)), ARRAY_COUNT(N(TwinkApproachPath)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) @@ -183,7 +183,7 @@ EvtScript N(EVS_Scene_TossedBackInRoom) = { EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, LVar0) EVT_END_IF EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0 / DT)) EVT_CALL(EnablePartnerAI) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c b/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c index 52d600bb15..ea182d56a3 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c +++ b/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c @@ -58,10 +58,10 @@ EvtScript N(EVS_CloseDoor_Ch0) = { EvtScript N(EVS_TwinkTappingOnGlassDoor) = { EVT_LOOP(0) - EVT_CALL(NpcFlyTo, NPC_PARTNER, 520, 70, -60, 30, -10, EASING_LINEAR) - EVT_CALL(NpcFlyTo, NPC_PARTNER, 520, 70, -61, 10, -5, EASING_LINEAR) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 520, 70, -60, 30 * DT, -10, EASING_LINEAR) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 520, 70, -61, 10 * DT, -5, EASING_LINEAR) EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_1D8, 0) - EVT_CALL(NpcFlyTo, NPC_PARTNER, 520, 70, -62, 10, -5, EASING_LINEAR) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 520, 70, -62, 10 * DT, -5, EASING_LINEAR) EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_1D8, 0) EVT_END_LOOP EVT_RETURN @@ -80,40 +80,40 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_CALL(SetNpcYaw, NPC_Bowser, 90) EVT_CALL(SetNpcYaw, NPC_Kammy, 90) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 20, 250, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_SadTalk, ANIM_Peach2_SadStill, 5, MSG_Peach_0016) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(InterpPlayerYaw, 90, 5) - EVT_CALL(PlayerMoveTo, 20, 30, 30) + EVT_CALL(PlayerMoveTo, 20, 30, 30 * DT) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_SadTalk, ANIM_Peach2_SadStill, 5, MSG_Peach_0017) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(InterpPlayerYaw, 270, 5) - EVT_CALL(PlayerMoveTo, -20, 30, 30) + EVT_CALL(PlayerMoveTo, -20, 30, 30 * DT) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_SadTalk, ANIM_Peach2_SadStill, 5, MSG_Peach_0018) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(InterpPlayerYaw, 90, 5) - EVT_CALL(PlayerMoveTo, 20, 30, 30) + EVT_CALL(PlayerMoveTo, 20, 30, 30 * DT) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_SadTalk, ANIM_Peach2_SadStill, 5, MSG_Peach_0019) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(N(ClearPeachDepressed)) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, -45, 30, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpPlayerYaw, 270, 3) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_THEME, 0, 8) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT)) EVT_CALL(SetPanTarget, CAM_DEFAULT, -330, 0, 0) EVT_CALL(SetCamPosA, CAM_DEFAULT, -330, 32) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(3) + EVT_WAIT(3 * DT) EVT_EXEC(N(EVS_OpenDoor_Ch0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcVar, NPC_Bowser, 0, 1) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Walk) - EVT_CALL(SetNpcSpeed, NPC_Bowser, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_Bowser, EVT_FLOAT(3.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Bowser, -300, -20, 0) EVT_CALL(NpcMoveTo, NPC_Bowser, -50, 30, 0) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) @@ -121,14 +121,14 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) - EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(3.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Kammy, -110, 30, 0) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) EVT_END_THREAD EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_THREAD - EVT_WAIT(40) - EVT_CALL(MakeLerp, 250, 300, 80, EASING_LINEAR) + EVT_WAIT(40 * DT) + EVT_CALL(MakeLerp, 250, 300, 80 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(SetCamDistance, CAM_DEFAULT, LVar0) @@ -148,14 +148,14 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_TalkEyesClosed, ANIM_WorldBowser_TalkEyesClosed, 0, MSG_Peach_001A) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) EVT_WAIT(1) EVT_CALL(EndSpeech, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0) EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, MSG_Peach_001B) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Brandish) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_BrandishTalk, ANIM_WorldBowser_BrandishIdle, 0, MSG_Peach_001C) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Startle) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) @@ -164,14 +164,14 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, MSG_Peach_001D) EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_Peach_001E) EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, MSG_Peach_001F) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Walk) EVT_CALL(NpcMoveTo, NPC_Bowser, -450, 30, 0) EVT_END_THREAD EVT_THREAD EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 5) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) EVT_CALL(NpcMoveTo, NPC_Kammy, -510, 30, 0) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) @@ -179,29 +179,29 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_CALL(GetPlayerPos, 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(0.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5 / DT)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(FadeOutMusic, 0, 2000) - EVT_WAIT(60) + EVT_CALL(FadeOutMusic, 0, 2000 * DT) + EVT_WAIT(60 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_0020) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 150) EVT_CALL(PlaySoundAt, SOUND_1D8, 0, LVar0, LVar1, LVar2) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PlaySoundAt, SOUND_1D8, 0, LVar0, LVar1, LVar2) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 20, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(InterpPlayerYaw, 135, 5) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms) EVT_WAIT(10) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle) @@ -213,18 +213,18 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) EVT_CALL(SetCamPosA, CAM_DEFAULT, 338, 44) EVT_CALL(SetCamPosB, CAM_DEFAULT, 413, -66) - 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_END_THREAD - EVT_WAIT(10) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_WAIT(10 * DT) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlayerMoveTo, 179, -4, 0) EVT_CALL(PlayerMoveTo, 439, -16, 0) EVT_SET(AF_KKJ_03, TRUE) EVT_KILL_THREAD(LVarA) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_OpenDoors) EVT_CALL(PlaySoundAtCollider, COLLIDER_tte, SOUND_1CB, 0) EVT_CALL(MakeLerp, 0, 80, 14, EASING_QUADRATIC_OUT) @@ -241,7 +241,7 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_END_LOOP EVT_CALL(SetMusicTrack, 0, SONG_TWINK_THEME, 0, 8) EVT_THREAD - EVT_CALL(LoadPath, 100, EVT_PTR(N(TwinkEnterPath)), ARRAY_COUNT(N(TwinkEnterPath)), EASING_LINEAR) + EVT_CALL(LoadPath, 100 * DT, EVT_PTR(N(TwinkEnterPath)), ARRAY_COUNT(N(TwinkEnterPath)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) @@ -272,17 +272,17 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_CALL(InterpPlayerYaw, 220, 5) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_THREAD - EVT_WAIT(40) - EVT_CALL(func_802D1270, 420, 0, EVT_FLOAT(2.0)) + EVT_WAIT(40 * DT) + EVT_CALL(func_802D1270, 420, 0, EVT_FLOAT(2.0 / DT)) EVT_END_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 370, 30, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, 370, 30, 0) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(370.0), EVT_FLOAT(32.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_LOOP(0) @@ -294,35 +294,35 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, 320, 30, 17) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(200.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-16.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(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0022) EVT_CALL(SetPanTarget, CAM_DEFAULT, 370, 30, 17) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-10.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0023) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0024) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.4)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.4 / DT)) EVT_CALL(SetPanTarget, CAM_DEFAULT, 350, 30, 17) EVT_CALL(PlayerMoveTo, 380, 0, 30) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0025) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0026) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_CALL(SetCamDistance, CAM_DEFAULT, 200) EVT_CALL(SetCamPitch, CAM_DEFAULT, 17, -14) EVT_CALL(SetPanTarget, CAM_DEFAULT, 380, 30, 17) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_0027) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_TalkSad) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT)) EVT_CALL(SetCamPitch, CAM_DEFAULT, 17, -16) EVT_CALL(SetPanTarget, CAM_DEFAULT, 320, 30, 17) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) @@ -332,54 +332,54 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_CALL(SetCamPitch, CAM_DEFAULT, 17, -10) EVT_CALL(SetPanTarget, CAM_DEFAULT, 350, 30, 17) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_0029) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_TalkSad, ANIM_Twink_TalkSad, 0, MSG_Peach_002A) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_002B) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Startle) EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, -45, 30, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_002C) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle) EVT_CALL(EndSpeech, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_GiveItem) - EVT_WAIT(12) + EVT_WAIT(12 * DT) EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) EVT_SUB(LVar2, 10) EVT_ADD(LVar3, 20) EVT_ADD(LVar4, 2) EVT_CALL(MakeItemEntity, ITEM_LUCKY_STAR, LVar2, LVar3, LVar4, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVar9, LVar0) - EVT_WAIT(10) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_WAIT(10 * DT) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0 / DT)) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(200.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-12.5)) EVT_CALL(SetPanTarget, CAM_DEFAULT, 365, 30, 17) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_THREAD - EVT_CALL(NpcFlyTo, NPC_PARTNER, 350, 50, -2, 30, -5, EASING_LINEAR) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 350, 50, -2, 30 * DT, -5, EASING_LINEAR) EVT_END_THREAD - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Wink) - EVT_CALL(MakeLerp, 50, 70, 10, EASING_QUADRATIC_OUT) + EVT_CALL(MakeLerp, 50, 70, 10 * DT, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_ADD(LVar2, -2) EVT_CALL(UpdateLerp) @@ -400,12 +400,12 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_END_LOOP EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Tense) EVT_CALL(RemoveItemEntity, LVar9) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) EVT_CALL(SetCamPitch, CAM_DEFAULT, 17, -10) EVT_CALL(SetPanTarget, CAM_DEFAULT, 355, 30, 17) @@ -419,7 +419,7 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_END_LOOP EVT_CALL(InterpPlayerYaw, 90, 5) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_002E) EVT_SET(AF_KKJ_03, TRUE) @@ -434,7 +434,7 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_END_LOOP EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_END_THREAD - EVT_CALL(LoadPath, 60, EVT_PTR(N(TwinkExitPath)), ARRAY_COUNT(N(TwinkExitPath)), EASING_LINEAR) + EVT_CALL(LoadPath, 60 * DT, EVT_PTR(N(TwinkExitPath)), ARRAY_COUNT(N(TwinkExitPath)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) @@ -458,14 +458,14 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_002F) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) - EVT_CALL(NpcFlyTo, NPC_PARTNER, 420, 60, 0, 20, 0, EASING_LINEAR) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 420, 60, 0, 20 * DT, 0, EASING_LINEAR) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_0030) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_THREAD - 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_PARTNER, 0, LVar0, 0) @@ -481,12 +481,12 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 5) - EVT_WAIT(10) - EVT_CALL(FadeOutMusic, 0, 2000) + EVT_WAIT(10 * DT) + EVT_CALL(FadeOutMusic, 0, 2000 * DT) EVT_CALL(NpcFlyTo, NPC_PARTNER, 600, 100, -80, 40, 0, EASING_LINEAR) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(GotoMap, EVT_PTR("kkj_26"), kkj_26_ENTRY_2) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END diff --git a/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c b/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c index 642d2a16a7..162011b1a4 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c +++ b/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c @@ -4,24 +4,24 @@ EvtScript N(EVS_Scene_Chapter1) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_THREAD - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(0.5), 20, 300, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(0.5 / DT), 20, 300, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) EVT_END_THREAD EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcPos, NPC_PARTNER, -200, 93, -17) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_THREAD - EVT_WAIT(120) - EVT_CALL(NpcFlyTo, NPC_PARTNER, -100, 40, 0, 60, 40, EASING_LINEAR) - EVT_WAIT(5) + EVT_WAIT(120 * DT) + EVT_CALL(NpcFlyTo, NPC_PARTNER, -100, 40, 0, 60 * DT, 40, EASING_LINEAR) + EVT_WAIT(5 * DT) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 5) EVT_END_THREAD EVT_LOOP(3) - EVT_CALL(PlayerMoveTo, -110, 0, 30) - EVT_CALL(PlayerMoveTo, -140, 0, 30) + EVT_CALL(PlayerMoveTo, -110, 0, 30 * DT) + EVT_CALL(PlayerMoveTo, -140, 0, 30 * DT) EVT_END_LOOP - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(InterpPlayerYaw, 90, 5) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0033) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0034) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0035) @@ -29,14 +29,14 @@ EvtScript N(EVS_Scene_Chapter1) = { EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Startle) EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_0037) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0038) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) diff --git a/src/world/area_kkj/kkj_15/kkj_15_3_rotating_wall.c b/src/world/area_kkj/kkj_15/kkj_15_3_rotating_wall.c index 36e444f074..cd280bec80 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_3_rotating_wall.c +++ b/src/world/area_kkj/kkj_15/kkj_15_3_rotating_wall.c @@ -28,11 +28,11 @@ EvtScript N(EVS_AnimateRotatingWall_AlmostCaught) = { EVT_CALL(GetPlayerPos, LVar7, LVar0, LVar8) EVT_CALL(GetNpcPos, NPC_PARTNER, LVar9, LVar0, LVarA) EVT_THREAD - EVT_WAIT(180) + EVT_WAIT(180 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround) EVT_END_THREAD EVT_CALL(PlaySoundAt, SOUND_93, 0, 50, 5, -200) - EVT_CALL(MakeLerp, 0, -1800, 360, EASING_LINEAR) + EVT_CALL(MakeLerp, 0, -1800, 360 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_SETF(LVar2, LVar0) @@ -57,7 +57,7 @@ EvtScript N(EVS_AnimateRotatingWall_Default) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o96, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(GetPlayerPos, LVar7, LVar0, LVar8) EVT_CALL(GetNpcPos, NPC_PARTNER, LVar9, LVar0, LVarA) - EVT_CALL(MakeLerp, -1350, -1800, 90, EASING_LINEAR) + EVT_CALL(MakeLerp, -1350, -1800, 90 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_SETF(LVar2, LVar0) @@ -99,7 +99,11 @@ EvtScript N(EVS_RotatingWall_FirstTime) = { EVT_THREAD EVT_CALL(SetPanTarget, CAM_DEFAULT, 50, 10, -35) EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.8)) +#if VERSION_PAL + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.961)) +#else + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.8 / DT)) +#endif EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_EXEC_WAIT(N(EVS_AnimateRotatingWall_Default)) diff --git a/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c b/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c index b7e434ced8..7f2fda4054 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c +++ b/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c @@ -104,78 +104,78 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { 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(30) + EVT_WAIT(30 * DT) EVT_EXEC(N(EVS_OpenDoor_Ch0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcPos, NPC_Kammy, 270, 0, -78) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) - EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(3.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Kammy, 180, -55, 0) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) EVT_EXEC_WAIT(N(EVS_CloseDoor_Ch0)) EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0000) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) - EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(3.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Kammy, 0, -55, 0) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) EVT_END_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_EXEC_WAIT(N(EVS_FocusCam_BowserWide)) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_CH1_KoopaBros_0001) EVT_CALL(SetPanTarget, CAM_DEFAULT, -20, 0, 0) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(225.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-13.0)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) - EVT_WAIT(10) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0 / DT)) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0002) EVT_CALL(SetPanTarget, CAM_DEFAULT, -50, 0, 0) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-17.0)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) - EVT_WAIT(10) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT)) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Brandish) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_BrandishTalk, ANIM_WorldBowser_BrandishIdle, 0, NPC_Kammy, MSG_Peach_CH1_KoopaBros_0003) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_CH1_KoopaBros_0004) EVT_EXEC_WAIT(N(EVS_FocusCam_BowserWide)) EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0005) EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_CH1_KoopaBros_0006) EVT_CALL(FadeOutMusic, 0, 2000) EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_CH1_KoopaBros_0007, 300, 20) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Bowser, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_Kammy, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_THREAD EVT_LOOP(2) - EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 7) - EVT_WAIT(5) - EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 7) - EVT_WAIT(5) + EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 7 * DT) + EVT_WAIT(5 * DT) + EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 7 * DT) + EVT_WAIT(5 * DT) EVT_END_LOOP - EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 7) + EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 7 * DT) EVT_END_THREAD - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_THREAD EVT_LOOP(2) - EVT_CALL(InterpNpcYaw, NPC_Bowser, 270, 7) - EVT_WAIT(5) - EVT_CALL(InterpNpcYaw, NPC_Bowser, 90, 7) - EVT_WAIT(5) + EVT_CALL(InterpNpcYaw, NPC_Bowser, 270, 7 * DT) + EVT_WAIT(5 * DT) + EVT_CALL(InterpNpcYaw, NPC_Bowser, 90, 7 * DT) + EVT_WAIT(5 * DT) EVT_END_LOOP EVT_END_THREAD - EVT_WAIT(50) + EVT_WAIT(50 * DT) EVT_EXEC_WAIT(N(EVS_FocusCam_WholeRoom)) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_BROS_THEME, 0, 8) EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_CH1_KoopaBros_0008, 300, 20) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_THREAD EVT_CALL(SetNpcPos, NPC_KoopaBros_02, 300, 180, -60) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim12) @@ -278,7 +278,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim1A, ANIM_KoopaBros_Red_Anim1A, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0009) EVT_WAIT(10) EVT_EXEC_WAIT(N(EVS_FocusCam_BowserWide)) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 0) EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_CH1_KoopaBros_000A) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim04) @@ -286,7 +286,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim04) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim04) EVT_EXEC_WAIT(N(EVS_FocusCam_KoopaBros)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim02) EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, 80, -40, 10) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim04) @@ -297,28 +297,28 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_KoopaBros_01, MSG_Peach_CH1_KoopaBros_000C) EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_000D) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_02, 90, 5) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 5, MSG_Peach_CH1_KoopaBros_000E) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -50, 0, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, -50, 0, 0) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(200.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-18.0)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.2)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.2 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_EXEC_GET_TID(N(EVS_PlaySounds_KoopaBrosShowOff), LVarB) EVT_CALL(N(SetLightSourcePos), 100, 0, -40) EVT_CALL(EnableSpriteShading, TRUE) EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 3, 100, 0, -40, 1, LVarA) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_KoopaBros_01, MSG_Peach_CH1_KoopaBros_000F) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_KILL_THREAD(LVarB) EVT_CALL(func_802D7B10, LVarA) EVT_CALL(EnableSpriteShading, FALSE) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_EXEC_WAIT(N(EVS_FocusCam_KoopaBros)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0010) EVT_EXEC_WAIT(N(EVS_FocusCam_WholeRoom)) EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_KoopaBros_01, MSG_Peach_CH1_KoopaBros_0011) @@ -327,10 +327,10 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-17.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_KoopaBros_01, MSG_Peach_CH1_KoopaBros_0013) EVT_EXEC_WAIT(N(EVS_FocusCam_KoopaBros)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(FadeOutMusic, 0, 500) EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_KoopaBros_03, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) @@ -340,30 +340,30 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(ShowEmote, NPC_KoopaBros_04, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_KoopaBros_01, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0014) EVT_CALL(SetPanTarget, CAM_DEFAULT, 30, 0, 0) EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0 / DT)) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim0A) - EVT_CALL(NpcJump0, NPC_KoopaBros_02, 80, 0, -40, 10) + EVT_CALL(NpcJump0, NPC_KoopaBros_02, 80, 0, -40, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim04) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim0A) - EVT_CALL(NpcJump0, NPC_KoopaBros_01, 128, 0, -15, 10) + EVT_CALL(NpcJump0, NPC_KoopaBros_01, 128, 0, -15, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim04) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim0A) - EVT_CALL(NpcJump0, NPC_KoopaBros_03, 140, 0, -90, 10) + EVT_CALL(NpcJump0, NPC_KoopaBros_03, 140, 0, -90, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim04) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim0A) - EVT_CALL(NpcJump0, NPC_KoopaBros_04, 168, 0, -45, 10) + EVT_CALL(NpcJump0, NPC_KoopaBros_04, 168, 0, -45, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim04) EVT_END_THREAD EVT_THREAD @@ -375,35 +375,35 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(InterpNpcYaw, NPC_KoopaBros_02, 90, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_02, TRUE) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim03) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_174, 0) - EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, 200, -60, 10) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, 200, -60, 10 * DT) EVT_END_THREAD EVT_THREAD EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 90, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_01, TRUE) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim03) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_01, TRUE) - EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, 200, -60, 10) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, 200, -60, 10 * DT) EVT_END_THREAD EVT_THREAD EVT_CALL(InterpNpcYaw, NPC_KoopaBros_03, 90, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_03, TRUE) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim03) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_03, TRUE) - EVT_CALL(NpcMoveTo, NPC_KoopaBros_03, 200, -60, 10) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_03, 200, -60, 10 * DT) EVT_END_THREAD EVT_THREAD EVT_CALL(InterpNpcYaw, NPC_KoopaBros_04, 90, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_04, TRUE) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim03) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_04, TRUE) - EVT_CALL(NpcMoveTo, NPC_KoopaBros_04, 200, -60, 10) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_04, 200, -60, 10 * DT) EVT_END_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_EXEC_WAIT(N(EVS_EndPeachChapter0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(DisablePlayerPhysics, FALSE) diff --git a/src/world/area_kkj/kkj_15/kkj_15_5_chapter1.c b/src/world/area_kkj/kkj_15/kkj_15_5_chapter1.c index d3be64d065..c7003c8c36 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_5_chapter1.c +++ b/src/world/area_kkj/kkj_15/kkj_15_5_chapter1.c @@ -23,7 +23,7 @@ Vec3f N(TwinkFollowCh1Path2)[] = { EvtScript N(EVS_ApproachPeach_Ch1) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 10) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT)) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetNpcVar, NPC_Koopatrol_01, 0, 1) EVT_THREAD @@ -54,7 +54,7 @@ EvtScript N(EVS_ApproachPeach_Ch1) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_RETURN EVT_END }; @@ -160,14 +160,14 @@ EvtScript N(EVS_Inspect_BowsersDiary) = { EVT_CALL(InterpPlayerYaw, 225, 0) EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, FALSE) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(NpcJump0, NPC_PARTNER, -225, 50, -80, 20) + EVT_CALL(NpcJump0, NPC_PARTNER, -225, 50, -80, 20 * DT) EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_004B) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Curious) EVT_CALL(ShowChoice, MSG_Choice_0022) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_004C) - EVT_CALL(NpcFlyTo, NPC_PARTNER, -210, 40, -70, 20, 0, EASING_LINEAR) + EVT_CALL(NpcFlyTo, NPC_PARTNER, -210, 40, -70, 20 * DT, 0, EASING_LINEAR) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_004D) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Curious) EVT_CALL(ShowChoice, MSG_Choice_0023) @@ -175,7 +175,7 @@ EvtScript N(EVS_Inspect_BowsersDiary) = { EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_004E) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Cringe) - EVT_CALL(NpcJump0, NPC_PARTNER, -210, 40, -70, 10) + EVT_CALL(NpcJump0, NPC_PARTNER, -210, 40, -70, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Shout, ANIM_Twink_Shout, 0, MSG_Peach_004F) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) @@ -187,22 +187,22 @@ EvtScript N(EVS_Inspect_BowsersDiary) = { EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0051) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Cringe) - EVT_CALL(NpcJump0, NPC_PARTNER, -210, 40, -70, 10) - EVT_CALL(NpcJump0, NPC_PARTNER, -210, 40, -70, 10) + EVT_CALL(NpcJump0, NPC_PARTNER, -210, 40, -70, 10 * DT) + EVT_CALL(NpcJump0, NPC_PARTNER, -210, 40, -70, 10 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Shout, ANIM_Twink_Shout, 0, MSG_Peach_0052) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Shout, ANIM_Peach2_EndShout, 5, MSG_Peach_0053) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Shout, ANIM_Twink_Shout, 0, MSG_Peach_0054) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) - EVT_CALL(NpcFlyTo, NPC_PARTNER, -180, 40, -100, 10, 0, EASING_LINEAR) - EVT_WAIT(10) + EVT_CALL(NpcFlyTo, NPC_PARTNER, -180, 40, -100, 10 * DT, 0, EASING_LINEAR) + EVT_WAIT(10 * DT) EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_THEME, 0, 8) EVT_CALL(SetPanTarget, CAM_DEFAULT, 237, 0, 37) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-12.0)) EVT_CALL(SetCamPosB, CAM_DEFAULT, 170, -20) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_THREAD EVT_CALL(PlaySoundAtCollider, COLLIDER_tte, SOUND_BASIC_DOOR_OPEN, 0) EVT_CALL(MakeLerp, 0, 120, 20, EASING_COS_FAST_OVERSHOOT) @@ -215,43 +215,43 @@ EvtScript N(EVS_Inspect_BowsersDiary) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcPos, NPC_Bowser, 280, 0, -70) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Walk) - EVT_CALL(SetNpcSpeed, NPC_Bowser, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_Bowser, EVT_FLOAT(3.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Bowser, 170, -40, 0) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5, MSG_Peach_0055) EVT_THREAD EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPanTarget, CAM_DEFAULT, -110, 0, -40) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Cringe) EVT_CALL(NpcJump0, NPC_PARTNER, -168, 38, -112, 10) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_SadStill) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Walk) - EVT_CALL(NpcMoveTo, NPC_Bowser, -70, -40, 80) + EVT_CALL(NpcMoveTo, NPC_Bowser, -70, -40, 80 * DT) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Shock) - EVT_CALL(NpcJump0, NPC_Bowser, -70, 0, -40, 10) + EVT_CALL(NpcJump0, NPC_Bowser, -70, 0, -40, 10 * DT) EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_AngryTalk, ANIM_WorldBowser_Idle, 0, MSG_Peach_0056) - EVT_CALL(NpcJump0, NPC_Bowser, -70, 0, -40, 10) + EVT_CALL(NpcJump0, NPC_Bowser, -70, 0, -40, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_AngryTalk, ANIM_WorldBowser_Idle, 0, MSG_Peach_0057) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 240, 0, 37) EVT_CALL(SetPanTarget, CAM_DEFAULT, 240, 0, 37) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0)) EVT_CALL(SetCamPosB, CAM_DEFAULT, 134, -20) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetNpcPos, NPC_Bowser, -100, 0, -70) EVT_CALL(SetNpcYaw, NPC_Bowser, 90) EVT_CALL(SetNpcPos, NPC_Koopatrol_01, 280, 0, -70) @@ -294,9 +294,9 @@ EvtScript N(EVS_Inspect_BowsersDiary) = { EVT_EXEC_WAIT(N(EVS_PickUpPeach_Ch1)) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Carried, ANIM_Peach2_Carried, 5, MSG_Peach_005B) EVT_EXEC_WAIT(N(EVS_CarryPeachAway_Ch1)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcPos, NPC_PARTNER, -70, 120, -70) - EVT_CALL(LoadPath, 80, EVT_PTR(N(TwinkFollowCh1Path1)), ARRAY_COUNT(N(TwinkFollowCh1Path1)), EASING_LINEAR) + EVT_CALL(LoadPath, 80 * DT, EVT_PTR(N(TwinkFollowCh1Path1)), ARRAY_COUNT(N(TwinkFollowCh1Path1)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) @@ -313,10 +313,10 @@ EvtScript N(EVS_Inspect_BowsersDiary) = { EVT_WAIT(5) EVT_END_LOOP EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 7) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) - EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 7) - EVT_CALL(LoadPath, 15, EVT_PTR(N(TwinkFollowCh1Path2)), ARRAY_COUNT(N(TwinkFollowCh1Path2)), EASING_LINEAR) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 7 * DT) + EVT_CALL(LoadPath, 15 * DT, EVT_PTR(N(TwinkFollowCh1Path2)), ARRAY_COUNT(N(TwinkFollowCh1Path2)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) @@ -325,8 +325,8 @@ EvtScript N(EVS_Inspect_BowsersDiary) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_WAIT(30) - EVT_CALL(FadeOutMusic, 0, 1000) + EVT_WAIT(30 * DT) + EVT_CALL(FadeOutMusic, 0, 1000 * DT) EVT_EXEC_WAIT(N(EVS_EndPeachChapter1)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(EnablePartnerAI) diff --git a/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c b/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c index 237a5d2a22..64bbf2a29a 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c +++ b/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c @@ -162,9 +162,9 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_AngryTalk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_0082) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0 / DT)) EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) EVT_CALL(SetPanTarget, CAM_DEFAULT, -50, 0, -20) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) @@ -175,13 +175,13 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp) EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround) EVT_END_THREAD EVT_THREAD - EVT_WAIT(360) + EVT_WAIT(360 * DT) EVT_CALL(SetNpcPos, NPC_PARTNER, 100, 50, -160) - EVT_CALL(LoadPath, 30, EVT_PTR(N(TwinkHideCh3Path)), ARRAY_COUNT(N(TwinkHideCh3Path)), EASING_LINEAR) + EVT_CALL(LoadPath, 30 * DT, EVT_PTR(N(TwinkHideCh3Path)), ARRAY_COUNT(N(TwinkHideCh3Path)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) @@ -194,21 +194,21 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_END_THREAD EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_AngryTalk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_0084) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Tantrum) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_ArmsCrossed) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_0085) EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_0086) EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_0087) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_ArmsCrossed) - EVT_WAIT(30) - EVT_CALL(InterpNpcYaw, NPC_Bowser, 90, 7) - EVT_WAIT(30) - EVT_CALL(InterpNpcYaw, NPC_Bowser, 270, 7) - EVT_WAIT(30) - EVT_CALL(InterpNpcYaw, NPC_Bowser, 90, 7) - EVT_WAIT(30) + EVT_WAIT(30 * DT) + EVT_CALL(InterpNpcYaw, NPC_Bowser, 90, 7 * DT) + EVT_WAIT(30 * DT) + EVT_CALL(InterpNpcYaw, NPC_Bowser, 270, 7 * DT) + EVT_WAIT(30 * DT) + EVT_CALL(InterpNpcYaw, NPC_Bowser, 90, 7 * DT) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Bowser, MSG_Peach_0088) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Delighted) @@ -217,7 +217,7 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, -45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_Kammy, EMOTE_EXCLAMATION, -45, 30, EMOTER_NPC, 0, 0, 0, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcVar, NPC_Bowser, 0, 1) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Shock) @@ -229,19 +229,19 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_END_THREAD EVT_THREAD EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(N(SetPeachDepressed)) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_SadStill) - EVT_CALL(func_802D1270, 30, -10, EVT_FLOAT(2.0)) + EVT_CALL(func_802D1270, 30, -10, EVT_FLOAT(2.0 / DT)) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(N(ClearPeachDepressed)) EVT_CALL(SetNpcVar, NPC_Bowser, 0, 0) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_Shock, ANIM_WorldBowser_Shock, 0, MSG_Peach_0089) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) EVT_CALL(ContinueSpeech, NPC_Bowser, ANIM_WorldBowser_AngryTalk, ANIM_WorldBowser_Idle, 0, MSG_Peach_008A) @@ -253,7 +253,7 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_END_IF EVT_END_LOOP EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_ArmsCrossed) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_Peach_008B) EVT_CALL(ShowChoice, MSG_Choice_0026) @@ -275,7 +275,7 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_END_IF EVT_CALL(ContinueSpeech, NPC_Bowser, ANIM_WorldBowser_TalkEyesClosed, ANIM_WorldBowser_Idle, 0, MSG_Peach_008E) EVT_CALL(InterpNpcYaw, NPC_Bowser, 270, 7) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5, MSG_Peach_008F) EVT_IF_EQ(AF_KKJ_08, FALSE) EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_0090) @@ -284,12 +284,12 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_END_IF EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_TalkEyesClosed, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_0092) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) - EVT_CALL(InterpNpcYaw, NPC_Bowser, 90, 7) - EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_Bowser, 90, 7 * DT) + EVT_WAIT(10 * DT) EVT_CALL(ContinueSpeech, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5, MSG_Peach_0093) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) - EVT_CALL(InterpNpcYaw, NPC_Bowser, 90, 7) - EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_Bowser, 90, 7 * DT) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 5, MSG_Peach_0094) EVT_CALL(RotateModel, MODEL_o2, 120, 0, 1, 0) EVT_CALL(SetNpcPos, NPC_Koopatrol_03, 249, 0, -70) @@ -304,7 +304,7 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Cringe) EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) - EVT_CALL(LoadPath, 80, EVT_PTR(N(TwinkFollowCh3Path1)), ARRAY_COUNT(N(TwinkFollowCh3Path1)), EASING_LINEAR) + EVT_CALL(LoadPath, 80 * DT, EVT_PTR(N(TwinkFollowCh3Path1)), ARRAY_COUNT(N(TwinkFollowCh3Path1)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) @@ -315,16 +315,16 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_END_LOOP EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_TalkSad) EVT_LOOP(2) - EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 7) - EVT_WAIT(5) - EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 7) - EVT_WAIT(5) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 7 * DT) + EVT_WAIT(5 * DT) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 7 * DT) + EVT_WAIT(5 * DT) EVT_END_LOOP EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 7) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) - EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 7) - EVT_CALL(LoadPath, 15, EVT_PTR(N(TwinkFollowCh3Path2)), ARRAY_COUNT(N(TwinkFollowCh3Path2)), EASING_LINEAR) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 7 * DT) + EVT_CALL(LoadPath, 15 * DT, EVT_PTR(N(TwinkFollowCh3Path2)), ARRAY_COUNT(N(TwinkFollowCh3Path2)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) @@ -333,8 +333,8 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_WAIT(30) - EVT_CALL(FadeOutMusic, 0, 1000) + EVT_WAIT(30 * DT) + EVT_CALL(FadeOutMusic, 0, 1000 * DT) EVT_EXEC_WAIT(N(EVS_EndPeachChapter3)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(EnablePartnerAI) diff --git a/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c b/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c index 8cffcdf6dd..0ad238aa9a 100644 --- a/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c +++ b/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c @@ -163,13 +163,13 @@ EvtScript N(EVS_ManageSneakingScenes) = { EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Startle) EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_THREAD - EVT_CALL(NpcFlyTo, NPC_PARTNER, -776, 50, -65, 10, 0, EASING_LINEAR) + EVT_CALL(NpcFlyTo, NPC_PARTNER, -776, 50, -65, 10 * DT, 0, EASING_LINEAR) EVT_END_THREAD EVT_THREAD - EVT_CALL(PlayerMoveTo, -778, -55, 10) + EVT_CALL(PlayerMoveTo, -778, -55, 10 * DT) EVT_CALL(InterpPlayerYaw, 185, 0) EVT_END_THREAD EVT_CALL(SpeakToNpc, NPC_HammerBros, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 0, NPC_Koopatrol_01, MSG_Peach_006E) @@ -187,7 +187,7 @@ EvtScript N(EVS_ManageSneakingScenes) = { EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-10.5)) EVT_CALL(SetCamPosA, CAM_DEFAULT, -775, -50) - 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_PLAYER, ANIM_BattleBow_Talk, ANIM_Peach1_Idle, 5, MSG_Peach_0077) @@ -197,20 +197,20 @@ EvtScript N(EVS_ManageSneakingScenes) = { EVT_CALL(SpeakToNpc, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, NPC_HammerBros, MSG_Peach_007A) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim07) - EVT_CALL(NpcMoveTo, NPC_HammerBros, -820, 50, 30) + EVT_CALL(NpcMoveTo, NPC_HammerBros, -820, 50, 30 * DT) EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim02) EVT_CALL(NpcFacePlayer, NPC_HammerBros, 0) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim06) - EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, -840, 10, 30) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, -840, 10, 30 * DT) EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim01) EVT_CALL(NpcFacePlayer, NPC_Koopatrol_01, 0) EVT_END_THREAD EVT_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Cringe) - EVT_CALL(LoadPath, 20, EVT_PTR(N(TwinkHide1)), ARRAY_COUNT(N(TwinkHide1)), EASING_LINEAR) + EVT_CALL(LoadPath, 20 * DT, EVT_PTR(N(TwinkHide1)), ARRAY_COUNT(N(TwinkHide1)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) @@ -222,21 +222,21 @@ EvtScript N(EVS_ManageSneakingScenes) = { EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0) EVT_END_THREAD EVT_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) - EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 10) + EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 10 * DT) EVT_END_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 0, MSG_Peach_007B) EVT_CALL(SpeakToPlayer, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_007C) EVT_EXEC_WAIT(N(EVS_ApproachPeach)) EVT_EXEC_WAIT(N(EVS_PickUpPeach)) EVT_EXEC_WAIT(N(EVS_CarryPeachAway)) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Carried, ANIM_Peach2_Carried, 5, MSG_Peach_007D) - EVT_WAIT(10) - EVT_CALL(LoadPath, 40, EVT_PTR(N(TwinkFollowPath1)), ARRAY_COUNT(N(TwinkFollowPath1)), EASING_LINEAR) + EVT_WAIT(10 * DT) + EVT_CALL(LoadPath, 40 * DT, EVT_PTR(N(TwinkFollowPath1)), ARRAY_COUNT(N(TwinkFollowPath1)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) @@ -247,15 +247,15 @@ EvtScript N(EVS_ManageSneakingScenes) = { EVT_END_LOOP EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_TalkSad) EVT_LOOP(2) - EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 7) - EVT_WAIT(5) - EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 7) - EVT_WAIT(5) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 7 * DT) + EVT_WAIT(5 * DT) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 7 * DT) + EVT_WAIT(5 * DT) EVT_END_LOOP - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle) EVT_THREAD - EVT_CALL(LoadPath, 30, EVT_PTR(N(TwinkFollowPath2)), ARRAY_COUNT(N(TwinkFollowPath2)), EASING_LINEAR) + EVT_CALL(LoadPath, 30 * DT, EVT_PTR(N(TwinkFollowPath2)), ARRAY_COUNT(N(TwinkFollowPath2)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) @@ -265,8 +265,8 @@ EvtScript N(EVS_ManageSneakingScenes) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_WAIT(15) - EVT_CALL(FadeOutMusic, 0, 1000) + EVT_WAIT(15 * DT) + EVT_CALL(FadeOutMusic, 0, 1000 * DT) EVT_EXEC_WAIT(N(EVS_EndPeachChapter2)) EVT_CALL(EnablePartnerAI) EVT_CALL(DisablePlayerPhysics, FALSE) diff --git a/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c b/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c index a261c21a6f..3852d3aebb 100644 --- a/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c +++ b/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c @@ -197,7 +197,7 @@ EvtScript N(EVS_DropFork) = { 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, -8, LVar2, 8) + EVT_CALL(NpcJump0, NPC_GourmetGuy_Fork, LVar0, -8, LVar2, 8 * DT) EVT_CALL(SetNpcRotationPivot, NPC_GourmetGuy_Fork, 15) EVT_SET(LVar3, 0) EVT_LOOP(5) @@ -208,7 +208,7 @@ EvtScript N(EVS_DropFork) = { EVT_ADD(LVar2, 20) EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_Fork, EVT_FLOAT(0.2)) EVT_CALL(NpcJump0, NPC_GourmetGuy_Fork, LVar0, -20, LVar2, 8) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(RemoveNpc, NPC_GourmetGuy_Fork) EVT_RETURN EVT_END @@ -219,7 +219,7 @@ EvtScript N(EVS_DropKnife) = { EVT_CALL(GetNpcPos, NPC_GourmetGuy_Knife, LVar0, LVar1, LVar2) EVT_CALL(SetNpcRotation, NPC_GourmetGuy_Knife, 0, 0, -25) EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_Knife, EVT_FLOAT(0.05)) - EVT_CALL(NpcJump0, NPC_GourmetGuy_Knife, LVar0, -8, LVar2, 8) + EVT_CALL(NpcJump0, NPC_GourmetGuy_Knife, LVar0, -8, LVar2, 8 * DT) EVT_CALL(SetNpcRotationPivot, NPC_GourmetGuy_Knife, 15) EVT_SET(LVar3, 0) EVT_LOOP(5) @@ -230,7 +230,7 @@ EvtScript N(EVS_DropKnife) = { EVT_ADD(LVar2, 20) EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_Knife, EVT_FLOAT(0.2)) EVT_CALL(NpcJump0, NPC_GourmetGuy_Knife, LVar0, -20, LVar2, -100) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(RemoveNpc, NPC_GourmetGuy_Knife) EVT_RETURN EVT_END @@ -249,25 +249,25 @@ EvtScript N(EVS_GourmetGuy_LovesCake) = { EVT_CALL(SetCamDistance, CAM_DEFAULT, 170) EVT_CALL(SetCamPitch, CAM_DEFAULT, 12, EVT_FLOAT(-2.5)) EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(110.0), EVT_FLOAT(45.5)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(20.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(20.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_381, 0) - EVT_WAIT(33) + EVT_WAIT(33 * DT) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(65.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(7.5), EVT_FLOAT(-1.3)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_382, 0) - EVT_WAIT(33) + EVT_WAIT(33 * DT) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(3.5), 0) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_383, 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_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(12.0)) EVT_LOOP(7) @@ -295,10 +295,10 @@ EvtScript N(EVS_GourmetGuy_RunAround) = { EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Leap) EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy, EVT_FLOAT(0.001953125)) EVT_CALL(GetNpcPos, NPC_GourmetGuy, LVar0, LVar1, LVar2) - EVT_CALL(NpcJump0, NPC_GourmetGuy, LVar0, 200, LVar2, 15) + EVT_CALL(NpcJump0, NPC_GourmetGuy, LVar0, 200, LVar2, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Panic) EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) - EVT_CALL(SetNpcSpeed, NPC_GourmetGuy, EVT_FLOAT(20.0)) + EVT_CALL(SetNpcSpeed, NPC_GourmetGuy, EVT_FLOAT(20.0 / DT)) EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_384, 0) EVT_CALL(SetNpcRotation, NPC_GourmetGuy, 0, 0, -45) EVT_CALL(SetNpcYaw, NPC_GourmetGuy, 90) @@ -318,7 +318,7 @@ EvtScript N(EVS_GourmetGuy_RunAround) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcRotation, NPC_GourmetGuy, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_384, 0) EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy, NPC_FLAG_UPSIDE_DOWN, TRUE) @@ -326,12 +326,12 @@ EvtScript N(EVS_GourmetGuy_RunAround) = { EVT_CALL(SetNpcPos, NPC_GourmetGuy, 250, 160, 50) EVT_CALL(NpcMoveTo, NPC_GourmetGuy, -100, 50, 0) EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy, NPC_FLAG_UPSIDE_DOWN, FALSE) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_384, 0) EVT_CALL(SetNpcYaw, NPC_GourmetGuy, 90) EVT_CALL(SetNpcPos, NPC_GourmetGuy, -100, 0, 70) EVT_CALL(NpcMoveTo, NPC_GourmetGuy, 140, 70, 0) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcVar, NPC_GourmetGuy, 0, 0) EVT_RETURN EVT_END @@ -399,9 +399,9 @@ EvtScript N(EVS_RejectCake) = { EVT_END_SWITCH EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Walk) EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy, 0) - EVT_CALL(NpcJump1, NPC_GourmetGuy, 120, 0, -20, 15) + EVT_CALL(NpcJump1, NPC_GourmetGuy, 120, 0, -20, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Idle) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0 / DT)) EVT_RETURN EVT_END }; @@ -424,28 +424,28 @@ EvtScript N(EVS_SweatyPeach) = { EvtScript N(EVS_Scene_GiveKitchenKey) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 0, MSG_Peach_009A) - EVT_WAIT(10) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0)) + EVT_WAIT(10 * DT) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0 / DT)) EVT_CALL(PlayerMoveTo, -125, 40, 0) EVT_CALL(PlayerMoveTo, 50, 40, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_009B) - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), 35, 300, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT), 35, 300, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_009C) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_009D) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_009E) EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Walk) - EVT_CALL(NpcMoveTo, NPC_GourmetGuy, 100, -20, 10) + EVT_CALL(NpcMoveTo, NPC_GourmetGuy, 100, -20, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Idle) EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_009F) EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Inspect) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_SET(LVar0, ITEM_PEACH_KEY1) EVT_CALL(ShowGotItem, LVar0, TRUE, 0) EVT_CALL(AddKeyItem, LVar0) @@ -455,7 +455,7 @@ EvtScript N(EVS_Scene_GiveKitchenKey) = { EVT_CALL(NpcJump1, NPC_GourmetGuy, 120, 0, -20, 10) EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Idle) EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_00A0) - 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 @@ -481,43 +481,43 @@ EvtScript N(EVS_Scene_JudgeCake) = { EVT_CALL(SpeakToPlayer, NPC_PLAYER, LVar0, LVar1, 5, MSG_Peach_00A2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 120, 0, 10) EVT_CALL(SetPanTarget, CAM_DEFAULT, 120, 0, 10) - 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_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_00A3) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0 / DT)) EVT_CALL(PlayerMoveTo, -125, 40, 0) EVT_CALL(PlayerMoveTo, 15, 40, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(MakeItemEntity, MV_CakeItemIdx, 25, 25, -20, ITEM_SPAWN_MODE_DECORATION, 0) EVT_CALL(SetNpcVar, NPC_GourmetGuy, 7, LVar0) EVT_SET(AF_KKJ_FinishedBakingCake, FALSE) EVT_CALL(N(SetHeldBakingItem), PEACH_BAKING_NONE) EVT_THREAD EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(NpcFlyTo, NPC_PARTNER, -23, 30, 36, 5, 0, EASING_LINEAR) + EVT_CALL(NpcFlyTo, NPC_PARTNER, -23, 30, 36, 5 * DT, 0, EASING_LINEAR) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 5) EVT_END_THREAD - EVT_CALL(PlayerMoveTo, 17, 36, 5) + EVT_CALL(PlayerMoveTo, 17, 36, 5 * DT) EVT_CALL(InterpPlayerYaw, 90, 5) EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_00A4) EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Walk) - EVT_CALL(NpcMoveTo, NPC_GourmetGuy, 90, -20, 20) + EVT_CALL(NpcMoveTo, NPC_GourmetGuy, 90, -20, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Idle) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 90, 0, 10) EVT_CALL(SetPanTarget, CAM_DEFAULT, 90, 0, 10) EVT_CALL(SetCamDistance, CAM_DEFAULT, 250) EVT_CALL(SetCamPitch, CAM_DEFAULT, 17, -14) EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(110.0), EVT_FLOAT(45.5)) - 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(GetNpcVar, NPC_GourmetGuy, 7, LVarA) EVT_CALL(RemoveItemEntity, LVarA) EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Eat) EVT_LOOP(6) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_2095, 0) EVT_END_LOOP EVT_IF_NE(AB_KKJ_CompletedBakeStep, CAKE_TYPE_DONE) @@ -545,7 +545,7 @@ EvtScript N(EVS_Scene_JudgeCake) = { EVT_CALL(InterpNpcYaw, NPC_GourmetGuy, 270, 5) EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 0, MSG_Peach_00AC) EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Walk) - EVT_CALL(SetNpcSpeed, NPC_GourmetGuy, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcSpeed, NPC_GourmetGuy, EVT_FLOAT(2.0 / DT)) EVT_CALL(NpcMoveTo, NPC_GourmetGuy, 80, 70, 0) EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Idle) EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 0, MSG_Peach_00AD) @@ -558,23 +558,23 @@ EvtScript N(EVS_Scene_JudgeCake) = { EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Walk) EVT_CALL(NpcMoveTo, NPC_GourmetGuy, -250, 70, 0) - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(2.0), -20, 300, EVT_FLOAT(17.0), EVT_FLOAT(-10.0)) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(2.0 / DT), -20, 300, EVT_FLOAT(17.0), EVT_FLOAT(-10.0)) EVT_CALL(InterpPlayerYaw, 270, 5) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_00AE) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00AF) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_00B0) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00B1) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 120, 0, 10) EVT_CALL(SetPanTarget, CAM_DEFAULT, 150, 0, 10) EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.2)) - EVT_CALL(LoadPath, 60, EVT_PTR(N(TwinkDepartPath)), ARRAY_COUNT(N(TwinkDepartPath)), EASING_LINEAR) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.2 / DT)) + EVT_CALL(LoadPath, 60 * DT, EVT_PTR(N(TwinkDepartPath)), ARRAY_COUNT(N(TwinkDepartPath)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) @@ -586,9 +586,9 @@ EvtScript N(EVS_Scene_JudgeCake) = { EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 16, MSG_Peach_00B2) EVT_EXEC(N(EVS_OpenAndCloseWindow)) - EVT_WAIT(14) - EVT_CALL(NpcFlyTo, NPC_PARTNER, 250, 70, -25, 30, 0, EASING_LINEAR) - EVT_WAIT(30) + EVT_WAIT(14 * DT) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 250, 70, -25, 30 * DT, 0, EASING_LINEAR) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcPos, NPC_Koopatrol_01, -250, 0, -30) EVT_CALL(SetNpcPos, NPC_Koopatrol_02, -250, 0, -30) EVT_CALL(SetNpcPos, NPC_Kammy, -250, 0, -30) @@ -598,7 +598,7 @@ EvtScript N(EVS_Scene_JudgeCake) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, -180, 0, -30) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-110.0), EVT_FLOAT(45.5)) - 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_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_OPEN, 0) @@ -612,15 +612,15 @@ EvtScript N(EVS_Scene_JudgeCake) = { EVT_END_IF EVT_END_LOOP EVT_THREAD - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -30) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT)) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) - EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(2.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Kammy, -130, -30, 0) EVT_CALL(NpcMoveTo, NPC_Kammy, -120, 80, 0) EVT_CALL(NpcMoveTo, NPC_Kammy, -70, 80, 0) @@ -639,7 +639,7 @@ EvtScript N(EVS_Scene_JudgeCake) = { EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 5) EVT_END_THREAD EVT_EXEC_WAIT(N(EVS_CarryPeachAway)) - EVT_CALL(FadeOutMusic, 0, 1000) + EVT_CALL(FadeOutMusic, 0, 1000 * DT) EVT_EXEC_WAIT(N(EVS_EndPeachChapter4)) EVT_CALL(EnablePartnerAI) EVT_CALL(DisablePlayerPhysics, FALSE) diff --git a/src/world/area_kkj/kkj_19/kkj_19_5_baking.c b/src/world/area_kkj/kkj_19/kkj_19_5_baking.c index f519b65d0a..4f8c556a20 100644 --- a/src/world/area_kkj/kkj_19/kkj_19_5_baking.c +++ b/src/world/area_kkj/kkj_19/kkj_19_5_baking.c @@ -7,11 +7,11 @@ MAP_STATIC_PAD(1,item_choice); #include "world/common/complete/NormalItemChoice.inc.c" -#define MIXING_TIME_IN_FRAMES 10 * 30 +#define MIXING_TIME_IN_FRAMES 10 * 30 * DT #define MIXING_REQUIRED_INPUTS 27 -#define BAKING_TIME_MIN_FRAMES 23 * 30 -#define BAKING_TIME_MAX_FRAMES 36 * 30 +#define BAKING_TIME_MIN_FRAMES 23 * 30 * DT +#define BAKING_TIME_MAX_FRAMES 36 * 30 * DT // similar to CAKE_TYPE with semantically distinct usage enum { @@ -194,6 +194,10 @@ API_CALLABLE(N(AwaitPlayerPressATimer)) { } // unlike the common import, does not mask out 0xF0000 from itemID +#if VERSION_PAL +API_CALLABLE(N(GetItemNameRaw)); +INCLUDE_ASM(ApiResult, "world/area_kkj/kkj_19/kkj_19_5_baking", N(GetItemNameRaw)); +#else API_CALLABLE(N(GetItemNameRaw)) { Bytecode* args = script->ptrReadPos; s32 inOutVar = *args++; @@ -202,6 +206,7 @@ API_CALLABLE(N(GetItemNameRaw)) { evt_set_variable(script, inOutVar, gItemTable[itemID].nameMsg); return ApiStatus_DONE2; } +#endif #include "world/common/todo/GetFloorCollider.inc.c" @@ -249,6 +254,21 @@ API_CALLABLE(N(FadeScreenFromBlack)) { return ApiStatus_BLOCK; } +#if VERSION_PAL +s32 N(BakingIngredientsNames)[] = { + ITEM_BAKING_FLOUR, MSG_Menus_BakingFlour, + ITEM_BAKING_SUGAR, MSG_Menus_BakingSugar, + ITEM_BAKING_SALT, MSG_Menus_BakingSalt, + ITEM_BAKING_EGG, MSG_Menus_BakingEgg, + ITEM_BAKING_MILK, MSG_Menus_BakingMilk, + ITEM_BAKING_STRAWBERRY, MSG_Menus_BakingStrawberry, + ITEM_BAKING_CREAM, MSG_Menus_BakingCream, + ITEM_BAKING_BUTTER, MSG_Menus_BakingButter, + ITEM_BAKING_CLEANSER, MSG_Menus_BakingCleanser, + ITEM_BAKING_WATER, MSG_Menus_BakingWater, +}; +#endif + s32 N(BakingIngredientsList)[] = { ITEM_BAKING_SUGAR, ITEM_BAKING_SALT, @@ -653,7 +673,7 @@ EvtScript N(EVS_FocusCam_Twink) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, 200) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-4.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_RETURN @@ -671,7 +691,7 @@ EvtScript N(EVS_FocusCam_PeachAndTwink) = { EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, 275) - 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_RETURN @@ -683,7 +703,7 @@ EvtScript N(EVS_FocusCam_Oven) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, 130, 0, -100) EVT_CALL(SetCamDistance, CAM_DEFAULT, 250) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-13.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_RETURN @@ -712,14 +732,14 @@ EvtScript N(EVS_Twink_FlyToPlayer) = { EVT_SUB(LVar0, 40) EVT_END_IF EVT_ADD(LVar1, 30) - EVT_CALL(NpcFlyTo, NPC_PARTNER, LVar0, LVar1, LVar2, 15, -5, EASING_LINEAR) + EVT_CALL(NpcFlyTo, NPC_PARTNER, LVar0, LVar1, LVar2, 15 * DT, -5, EASING_LINEAR) EVT_CALL(NpcFacePlayer, NPC_PARTNER, 5) EVT_RETURN EVT_END }; EvtScript N(EVS_Twink_FlyToHighPos) = { - EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.0 / DT)) EVT_CALL(NpcFlyTo, NPC_PARTNER, 390, 50, -70, 0, -5, EASING_LINEAR) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 5) EVT_RETURN @@ -784,23 +804,23 @@ EvtScript N(EVS_EnterKitchen_FirstTime) = { EVT_CALL(NpcFlyTo, NPC_PARTNER, 440, 25, -30, 0, -5, EASING_LINEAR) EVT_CALL(NpcFacePlayer, NPC_PARTNER, 5) EVT_END_THREAD - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0 / DT)) EVT_CALL(PlayerMoveTo, 400, -30, 0) EVT_WAIT(1) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_CALL(InterpPlayerYaw, 90, 5) - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), 0, EVT_FLOAT(300.0), EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT), 0, EVT_FLOAT(300.0), EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_00B9) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPanTarget, CAM_DEFAULT, 630, 85, -140) EVT_CALL(SetCamDistance, CAM_DEFAULT, 200) EVT_CALL(SetCamPosA, CAM_DEFAULT, 112, -200) @@ -809,8 +829,8 @@ EvtScript N(EVS_EnterKitchen_FirstTime) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 5) - EVT_WAIT(10) - EVT_CALL(LoadPath, 60, EVT_PTR(N(FetchBookPath)), ARRAY_COUNT(N(FetchBookPath)), EASING_LINEAR) + EVT_WAIT(10 * DT) + EVT_CALL(LoadPath, 60 * DT, EVT_PTR(N(FetchBookPath)), ARRAY_COUNT(N(FetchBookPath)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) @@ -820,37 +840,37 @@ EvtScript N(EVS_EnterKitchen_FirstTime) = { EVT_END_IF EVT_END_LOOP EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 5) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00BA) EVT_CALL(EnableModel, MODEL_o128, FALSE) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_TakeBook) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 0, 300, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle) - EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0 / DT)) EVT_CALL(NpcFlyTo, NPC_PARTNER, 440, 25, -30, 0, -5, EASING_LINEAR) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_OpenBook) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_IdleBook) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_00BB) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 0, MSG_Peach_00BC) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_00BD) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_SET(AB_KKJ_CompletedBakeStep, CAKE_TYPE_BEGUN) EVT_RETURN @@ -865,14 +885,14 @@ EvtScript N(EVS_EnterKitchen_TryAgain) = { EVT_CALL(SetNpcPos, NPC_PARTNER, 440, 25, -30) EVT_CALL(SetNpcYaw, NPC_PARTNER, 270) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 0, 300, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00C2) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_ArmsCrossedTalk, ANIM_Peach2_ArmsCrossedIdle, 5, MSG_Peach_00C3) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_CALL(ContinueSpeech, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 0, MSG_Peach_00C4) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_OpenBook) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_IdleBook) EVT_RETURN EVT_END @@ -909,9 +929,9 @@ EvtScript N(EVS_ManageBaking) = { EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 5, MSG_Peach_00C6) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_CloseBook) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_EXEC(N(EVS_Twink_FlyToHighPos)) EVT_GOTO(LBL_MIX_RESUME) EVT_END_IF @@ -924,9 +944,9 @@ EvtScript N(EVS_ManageBaking) = { EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 5, MSG_Peach_00C8) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_CloseBook) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_GOTO(LBL_ADD_FLOUR_BUTTER_RESUME) EVT_END_IF EVT_IF_EQ(AB_KKJ_CompletedBakeStep, CAKE_TYPE_READY_TO_BAKE) @@ -938,13 +958,13 @@ EvtScript N(EVS_ManageBaking) = { EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 5, MSG_Peach_00CA) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_CloseBook) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_EXEC(N(EVS_Twink_FlyToHighPos)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(func_802D1270, LVar0, -74, EVT_FLOAT(2.0)) - EVT_CALL(func_802D1270, 287, -74, EVT_FLOAT(2.0)) + EVT_CALL(func_802D1270, LVar0, -74, EVT_FLOAT(2.0 / DT)) + EVT_CALL(func_802D1270, 287, -74, EVT_FLOAT(2.0 / DT)) EVT_GOTO(LBL_BAKE_RESUME) EVT_END_IF EVT_IF_EQ(AB_KKJ_CompletedBakeStep, CAKE_TYPE_BAKED) @@ -989,7 +1009,7 @@ EvtScript N(EVS_ManageBaking) = { EVT_END_THREAD // wait for peach to tell twink shes done EVT_LABEL(LBL_ADD_SUGAR_EGGS_WAITING) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_IF_EQ(LVarA, 0) EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, 0) EVT_CALL(SetNpcVar, NPC_Twink, 1, 1) @@ -1054,19 +1074,19 @@ EvtScript N(EVS_ManageBaking) = { EVT_SET(AB_KKJ19_BakeStepProgress, 0) EVT_SET(AF_KKJ19_CanTakeIngredients, FALSE) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0 / DT)) EVT_CALL(PlayerMoveTo, LVar0, -74, 0) EVT_CALL(PlayerMoveTo, 287, -74, 0) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardIdle) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_00D5) EVT_CALL(RemoveItemEntity, AB_KKJ19_CookwareItemIdx) EVT_EXEC_GET_TID(N(EVS_UpdatePeachMixingAnimations), LVarA) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetMusicTrack, 0, SONG_STIRRING_CAKE, 0, 8) EVT_CALL(PlaySound, SOUND_GENERAL_WHISTLE) EVT_THREAD - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(0.2), 0, 250, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(0.2 / DT), 0, 250, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) EVT_END_THREAD EVT_CALL(N(RunMixingMinigame), MIXING_TIME_IN_FRAMES) EVT_CALL(PlaySound, SOUND_GENERAL_WHISTLE) @@ -1075,12 +1095,12 @@ EvtScript N(EVS_ManageBaking) = { EVT_IF_LT(LVar0, MIXING_REQUIRED_INPUTS) EVT_SET(AF_KKJ19_FailedBakingTask, TRUE) EVT_END_IF - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0 / DT)) EVT_END_THREAD - EVT_CALL(NpcFlyTo, NPC_PARTNER, 337, 35, -74, 30, -5, EASING_LINEAR) - EVT_WAIT(10) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 337, 35, -74, 30 * DT, -5, EASING_LINEAR) + EVT_WAIT(10 * DT) EVT_EXEC(N(EVS_SetupMusic)) EVT_EXEC_WAIT(N(EVS_FocusCam_PeachAndTwink)) EVT_THREAD @@ -1109,10 +1129,10 @@ EvtScript N(EVS_ManageBaking) = { EVT_LABEL(LBL_ADD_FLOUR_BUTTER_FIRST) EVT_EXEC_WAIT(N(EVS_FocusCam_Twink)) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_OpenBook) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 5, MSG_Peach_00D8) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_CloseBook) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) // resume failed step from here EVT_LABEL(LBL_ADD_FLOUR_BUTTER_RESUME) @@ -1130,7 +1150,7 @@ EvtScript N(EVS_ManageBaking) = { EVT_END_THREAD // wait for peach to tell twink shes done EVT_LABEL(LBL_ADD_FLOUR_BUTTER_WAITING) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_IF_EQ(LVarA, 0) EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, 0) EVT_CALL(SetNpcVar, NPC_Twink, 1, 1) @@ -1184,54 +1204,54 @@ EvtScript N(EVS_ManageBaking) = { EVT_LABEL(LBL_BAKE_FIRST) EVT_EXEC_WAIT(N(EVS_FocusCam_Twink)) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_00DB) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0 / DT)) EVT_EXEC(N(EVS_Twink_FlyToHighPos)) // resume failed step from here EVT_LABEL(LBL_BAKE_RESUME) EVT_SET(AB_KKJ19_CurrentBakeStep, BAKE_STEP_BAKING) EVT_SET(AF_KKJ19_CanTakeIngredients, FALSE) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0 / DT)) EVT_CALL(PlayerMoveTo, LVar0, -74, 0) EVT_CALL(PlayerMoveTo, 287, -74, 0) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardIdle) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(RemoveItemEntity, AB_KKJ19_CookwareItemIdx) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_MixingFull) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(N(SetHeldBakingItem), PEACH_BAKING_CAKE_MIXED) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD - EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.0 / DT)) EVT_CALL(NpcFlyTo, NPC_PARTNER, 337, 35, -74, 0, -5, EASING_LINEAR) EVT_END_THREAD - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0 / DT)) EVT_CALL(PlayerMoveTo, 190, -70, 0) EVT_CALL(InterpPlayerYaw, 90, 1) EVT_CALL(PlayerMoveTo, 190, 35, 0) EVT_CALL(PlayerMoveTo, 240, 35, 0) EVT_CALL(InterpPlayerYaw, 350, 5) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach3_PourBatter) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(RemoveItemEntity, AB_KKJ19_CakeItemIdx) EVT_CALL(MakeItemEntity, ITEM_CAKE_BATTER, 230, 16, 0, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(AB_KKJ19_CakeItemIdx, LVar0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(N(SetHeldBakingItem), PEACH_BAKING_NONE) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_CALL(MakeItemEntity, ITEM_CAKE_BOWL, 250, 16, 0, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(AB_KKJ19_CookwareItemIdx, LVar0) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_EXEC_WAIT(N(EVS_FocusCam_Twink)) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_OpenBook) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 0, MSG_Peach_00DC) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_CloseBook) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0 / DT)) EVT_CALL(InterpPlayerYaw, 315, 0) EVT_WAIT(10) EVT_CALL(RemoveItemEntity, AB_KKJ19_CakeItemIdx) @@ -1240,16 +1260,16 @@ EvtScript N(EVS_ManageBaking) = { EVT_WAIT(10) EVT_EXEC(N(EVS_FocusCam_Oven)) EVT_THREAD - EVT_CALL(NpcFlyTo, NPC_PARTNER, 190, 60, -100, 50, -5, EASING_LINEAR) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 190, 60, -100, 50 * DT, -5, EASING_LINEAR) EVT_END_THREAD - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0 / DT)) EVT_CALL(PlayerMoveTo, 190, 30, 0) EVT_CALL(PlayerMoveTo, 190, -100, 0) EVT_CALL(PlayerMoveTo, 125, -100, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00DD) EVT_CALL(InterpPlayerYaw, 315, 5) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(N(AwaitPlayerPressATimer)) EVT_EXEC_WAIT(N(EVS_OpenOverDoor)) EVT_CALL(N(SetHeldBakingItem), PEACH_BAKING_NONE) @@ -1263,15 +1283,15 @@ EvtScript N(EVS_ManageBaking) = { EVT_WAIT(1) EVT_END_LOOP EVT_EXEC_WAIT(N(EVS_CloseOverDoor)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PlaySoundAt, SOUND_FF, 0, 100, 22, -178) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(FadeOutMusic, 0, 500) EVT_CALL(PlaySoundAt, SOUND_394, 0, 100, 22, -178) EVT_CALL(N(AwaitPlayerPressATimer)) EVT_CALL(StopSound, SOUND_394) EVT_CALL(PlaySoundAt, SOUND_3F3, 0, 100, 22, -178) - EVT_WAIT(10) + EVT_WAIT(10 * DT) // check baking time EVT_IF_LT(LVar0, BAKING_TIME_MIN_FRAMES) EVT_SET(AF_KKJ19_FailedBakingTask, TRUE) @@ -1291,7 +1311,7 @@ EvtScript N(EVS_ManageBaking) = { EVT_CALL(N(SetHeldBakingItem), PEACH_BAKING_CAKE_BATTER) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_EXEC_WAIT(N(EVS_CloseOverDoor)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpPlayerYaw, 90, 5) EVT_EXEC_WAIT(N(EVS_FocusCam_PeachAndTwink)) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00DE) @@ -1306,17 +1326,17 @@ EvtScript N(EVS_ManageBaking) = { EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00E0) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 287, 0, -74) EVT_CALL(SetPanTarget, CAM_DEFAULT, 287, 0, -74) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT)) EVT_EXEC(N(EVS_Twink_FlyToHighPos)) EVT_CALL(PlayerMoveTo, 287, -74, 100) EVT_CALL(N(SetHeldBakingItem), PEACH_BAKING_NONE) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_CALL(MakeItemEntity, ITEM_CAKE_BATTER, 287, 16, -40, ITEM_SPAWN_MODE_DECORATION, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(RemoveItemEntity, LVar0) EVT_CALL(MakeItemEntity, ITEM_CAKE_BARE, 287, 20, -30, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(AB_KKJ19_CakeItemIdx, LVar0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_IF_EQ(AF_KKJ19_FailedBakingTask, FALSE) EVT_SET(AB_KKJ_CompletedBakeStep, CAKE_TYPE_BAKED) EVT_END_IF @@ -1325,10 +1345,10 @@ EvtScript N(EVS_ManageBaking) = { EVT_LABEL(LBL_DECORATE_FIRST) EVT_EXEC_WAIT(N(EVS_FocusCam_Twink)) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_OpenBook) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 0, MSG_Peach_00E1) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_CloseBook) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) EVT_SET(LVarA, 0) // resume failed step from here @@ -1340,7 +1360,7 @@ EvtScript N(EVS_ManageBaking) = { EVT_SET(AB_KKJ19_AddedBerries, FALSE) // wait for peach to tell twink shes done EVT_LABEL(LBL_DECORATE_WAITING) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_IF_EQ(LVarA, 0) EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, 0) EVT_CALL(SetNpcVar, NPC_Twink, 1, 1) @@ -1394,7 +1414,7 @@ EvtScript N(EVS_ManageBaking) = { EVT_LABEL(LBL_FINISHED) EVT_SET(AB_KKJ19_CurrentBakeStep, BAKE_STEP_DONE) EVT_SET(AF_KKJ19_CanTakeIngredients, FALSE) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0 / DT)) EVT_EXEC(N(EVS_BindCakePickup)) EVT_CALL(EnablePartnerAI) EVT_CALL(DisablePlayerInput, FALSE) @@ -1418,15 +1438,15 @@ EvtScript N(EVS_ManageBaking) = { EVT_CALL(SetPlayerPos, 400, 0, -30) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 0, 350, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(N(FadeScreenFromBlack)) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00CE) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_ArmsCrossedTalk, ANIM_Peach2_ArmsCrossedIdle, 5, MSG_Peach_00CF) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_CALL(ContinueSpeech, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 0, MSG_Peach_00D0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_OpenBook) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_IdleBook) EVT_GOTO(LBL_TRY_RESUME) EVT_END diff --git a/src/world/area_kkj/kkj_23/kkj_23_5_scene.c b/src/world/area_kkj/kkj_23/kkj_23_5_scene.c index 4c52da16b3..c8ca023701 100644 --- a/src/world/area_kkj/kkj_23/kkj_23_5_scene.c +++ b/src/world/area_kkj/kkj_23/kkj_23_5_scene.c @@ -194,7 +194,7 @@ EvtScript N(EVS_Scene_KammyUnmasksPeach) = { EVT_CALL(SetNpcPos, NPC_Kammy, -50, 0, -50) EVT_EXEC(N(EVS_OpenAndCloseTowerDoors)) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) - EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(2.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Kammy, 30, -50, 0) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) EVT_THREAD @@ -210,9 +210,9 @@ EvtScript N(EVS_Scene_KammyUnmasksPeach) = { EVT_END_THREAD EVT_THREAD EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(func_802D1270, 190, LVar2, EVT_FLOAT(4.0)) - EVT_CALL(func_802D1270, 195, -80, EVT_FLOAT(4.0)) - EVT_CALL(func_802D1270, 190, -80, EVT_FLOAT(4.0)) + EVT_CALL(func_802D1270, 190, LVar2, EVT_FLOAT(4.0 / DT)) + EVT_CALL(func_802D1270, 195, -80, EVT_FLOAT(4.0 / DT)) + EVT_CALL(func_802D1270, 190, -80, EVT_FLOAT(4.0 / DT)) EVT_LOOP(0) EVT_WAIT(1) EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) @@ -224,8 +224,8 @@ EvtScript N(EVS_Scene_KammyUnmasksPeach) = { EVT_END_THREAD EVT_THREAD EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, -10, -130, 20) - EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, -10, -130, 20 * DT) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(4.0 / DT)) EVT_CALL(NpcFlyTo, NPC_PARTNER, 210, -10, -130, 0, 0, EASING_LINEAR) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 5) EVT_LOOP(0) @@ -237,15 +237,15 @@ EvtScript N(EVS_Scene_KammyUnmasksPeach) = { EVT_END_LOOP EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 5) EVT_END_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, -50) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 0, -50) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-9.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_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 5, MSG_Peach_014F) EVT_CALL(SpeakToNpc, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, NPC_Kammy, MSG_Peach_0150) EVT_CALL(SetNpcVar, NPC_Kammy, 0, 1) @@ -265,26 +265,26 @@ EvtScript N(EVS_Scene_KammyUnmasksPeach) = { EVT_CALL(NpcMoveTo, NPC_Kammy, 270, -50, 0) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) EVT_CALL(SetNpcVar, NPC_Kammy, 0, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 5) EVT_CALL(SetPanTarget, CAM_DEFAULT, 230, 0, -50) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 5, MSG_Peach_0151) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) - EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 10) - EVT_WAIT(30) + EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 10 * DT) + EVT_WAIT(30 * DT) EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 5, MSG_Peach_0152) EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 5) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(NpcMoveTo, NPC_Kammy, 280, -50, 0) EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_Kammy, EMOTE_EXCLAMATION, -45, 15, EMOTER_NPC, 0, 0, 0, 0) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 5) EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 5, MSG_Peach_0153) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 90, 5) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim05) EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim05, ANIM_WorldKammy_Anim05, 5, MSG_Peach_0154) @@ -294,7 +294,7 @@ EvtScript N(EVS_Scene_KammyUnmasksPeach) = { EVT_ADD(LVar1, 40) EVT_ADD(LVar2, 27) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, 1, 50) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 5) EVT_CALL(GetNpcPos, NPC_Kammy, LVar3, LVar4, LVar5) @@ -334,11 +334,11 @@ EvtScript N(EVS_Scene_KammyUnmasksPeach) = { EVT_EXEC_WAIT(N(EVS_PickUpPeach)) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Carried, ANIM_Peach2_Carried, 5, MSG_Peach_0158) EVT_EXEC_WAIT(N(EVS_CarryPeachAway)) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(6.0)) EVT_CALL(NpcFlyTo, NPC_PARTNER, 460, -10, -130, 0, 0, EASING_LINEAR) - EVT_WAIT(60) - EVT_CALL(FadeOutMusic, 0, 1000) + EVT_WAIT(60 * DT) + EVT_CALL(FadeOutMusic, 0, 1000 * DT) EVT_EXEC_WAIT(N(EVS_EndPeachChapter6)) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_kkj/kkj_25/kkj_25_5_arena.c b/src/world/area_kkj/kkj_25/kkj_25_5_arena.c index abbfd4073c..f16d0042e7 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_5_arena.c +++ b/src/world/area_kkj/kkj_25/kkj_25_5_arena.c @@ -121,9 +121,14 @@ EvtScript N(EVS_Scene_BowserTrapsMario) = { EVT_WAIT(1) EVT_GOTO(0) EVT_END_IF +#if VERSION_PAL + EVT_CALL(DisablePlayerInput, TRUE) +#endif EVT_THREAD EVT_WAIT(1) +#if !VERSION_PAL EVT_CALL(DisablePlayerInput, TRUE) +#endif EVT_CALL(PlayerFaceNpc, NPC_Bowser_01, FALSE) EVT_CALL(GetPartnerInUse, LVar0) EVT_CALL(GetCurrentPartnerID, LVar1) diff --git a/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c b/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c index fc12a8272c..0a61db0bf6 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c +++ b/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c @@ -301,15 +301,15 @@ EvtScript N(EVS_Scene_BowserDefeated) = { EVT_CALL(ClearAmbientSounds, 150) EVT_WAIT(10) EVT_CALL(SetMusicTrack, 0, SONG_RECOVERED_STAR_ROD, 0, 8) - EVT_CALL(NpcJump0, NPC_StarRod, 230, 18, 0, 25) - EVT_CALL(NpcJump0, NPC_StarRod, 190, 18, 0, 20) + EVT_CALL(NpcJump0, NPC_StarRod, 230, 18, 0, 25 * DT) + EVT_CALL(NpcJump0, NPC_StarRod, 190, 18, 0, 20 * DT) EVT_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_Lift) EVT_END_THREAD - EVT_CALL(NpcJump0, NPC_StarRod, 150, 60, 0, 15) + EVT_CALL(NpcJump0, NPC_StarRod, 150, 60, 0, 15 * DT) EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 14, 150, 60, 0, 1, 330) - EVT_WAIT(310) + EVT_WAIT(310 * DT) EVT_CALL(ShowMessageAtScreenPos, MSG_CH8_00AA, 160, 40) EVT_CALL(PlaySound, SOUND_22D) EVT_CALL(RemoveNpc, NPC_StarRod) diff --git a/src/world/area_kkj/kkj_26/kkj_26_2_scenes.c b/src/world/area_kkj/kkj_26/kkj_26_2_scenes.c index 3daa9ed737..7b0677958e 100644 --- a/src/world/area_kkj/kkj_26/kkj_26_2_scenes.c +++ b/src/world/area_kkj/kkj_26/kkj_26_2_scenes.c @@ -40,26 +40,26 @@ EvtScript N(EVS_Scene_AfterAllSpiritsRescued) = { EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(SetNpcPos, NPC_PARTNER, 500, 50, 0) EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 500, 30, -20) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.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(SetPlayerAnimation, ANIM_Peach2_RaiseArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_015E) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_015F) EVT_CALL(PlayerFaceNpc, NPC_PARTNER, 5) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0160) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(EnablePartnerAI) - EVT_CALL(func_802D1270, 480, -20, EVT_FLOAT(2.0)) + EVT_CALL(func_802D1270, 480, -20, EVT_FLOAT(2.0 / DT)) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_OpenDoors) EVT_SET(LVar0, kkj_26_ENTRY_0) EVT_SET(LVar1, COLLIDER_ttw) @@ -68,7 +68,7 @@ EvtScript N(EVS_Scene_AfterAllSpiritsRescued) = { EVT_SET(LVar4, MODEL_o86) EVT_SET(LVar5, MODEL_o84) EVT_EXEC(ExitSplitDoubleDoor) - EVT_WAIT(17) + EVT_WAIT(17 * DT) EVT_CALL(GotoMap, EVT_PTR("kkj_14"), kkj_14_ENTRY_A) EVT_WAIT(100) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c b/src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c index 691a298736..28035ed317 100644 --- a/src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c +++ b/src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c @@ -36,7 +36,7 @@ EvtScript N(EVS_Scene_RotatingWall) = { EVT_THREAD EVT_CALL(PlaySoundAt, SOUND_93, 0, -250, 5, 0) EVT_CALL(GetPlayerPos, LVar9, LVar0, LVarA) - EVT_CALL(MakeLerp, 0, -450, 120, EASING_LINEAR) + EVT_CALL(MakeLerp, 0, -450, 120 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_SETF(LVar2, LVar0) @@ -53,7 +53,7 @@ EvtScript N(EVS_Scene_RotatingWall) = { EVT_CALL(EnableModel, MODEL_o182, TRUE) EVT_CALL(EnableModel, MODEL_o184, TRUE) EVT_CALL(EnableModel, MODEL_o186, TRUE) - EVT_CALL(MakeLerp, 8, 255, 40, EASING_LINEAR) + EVT_CALL(MakeLerp, 8, 255, 40 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(N(SetSpillLightAmount), LVar0) @@ -63,10 +63,10 @@ EvtScript N(EVS_Scene_RotatingWall) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_WAIT(80) + EVT_WAIT(80 * DT) EVT_SET(GF_KKJ14_SkipSecretPassage, TRUE) EVT_CALL(GotoMap, EVT_PTR("kkj_15"), kkj_15_ENTRY_1) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_RETURN EVT_END }; @@ -74,16 +74,16 @@ EvtScript N(EVS_Scene_RotatingWall) = { EvtScript N(EVS_UseRotatingWall) = { EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlayerMoveTo, -205, -10, 15) + EVT_CALL(PlayerMoveTo, -205, -10, 15 * DT) EVT_CALL(InterpPlayerYaw, 270, 5) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach3_ReachForButton) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PlaySoundAtCollider, COLLIDER_o193, SOUND_FA, 0) EVT_CALL(SetPlayerAnimation, ANIM_Peach3_PressButton) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach3_AfterPressButton) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.0)) EVT_EXEC_WAIT(N(EVS_Scene_RotatingWall)) EVT_CALL(DisablePlayerInput, FALSE) @@ -95,14 +95,14 @@ EvtScript N(EVS_UseRotatingWall_FirstTime) = { EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(FacePlayerTowardPoint, -222, 0, 5) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach3_ReachForButton) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PlaySoundAtCollider, COLLIDER_o193, SOUND_FA, 0) EVT_CALL(SetPlayerAnimation, ANIM_Peach3_PressButton) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach3_AfterPressButton) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Cringe) @@ -112,7 +112,7 @@ EvtScript N(EVS_UseRotatingWall_FirstTime) = { EVT_END_THREAD EVT_THREAD EVT_CALL(InterpPlayerYaw, 270, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Gasp, ANIM_Peach2_GaspStill, 5, MSG_Peach_0048) EVT_END_THREAD diff --git a/src/world/area_kkj/kkj_29/kkj_29_3_quiz.c b/src/world/area_kkj/kkj_29/kkj_29_3_quiz.c index b0a9c09c66..be719bcad2 100644 --- a/src/world/area_kkj/kkj_29/kkj_29_3_quiz.c +++ b/src/world/area_kkj/kkj_29/kkj_29_3_quiz.c @@ -170,9 +170,9 @@ EvtScript N(Script_DoRound) = { EVT_EXEC_WAIT(N(EVS_UpdateScores)) EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, LVar6) EVT_END_IF - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_SET(AB_KKJ29_AnswerScore, ANSWER_NONE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_EXEC_WAIT(N(EVS_SetCam_Contestants)) EVT_RETURN EVT_END @@ -877,7 +877,7 @@ EvtScript N(EVS_TwinkHide) = { EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Cringe) EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 10) - EVT_CALL(LoadPath, 20, EVT_PTR(N(TwinkHidePath)), ARRAY_COUNT(N(TwinkHidePath)), EASING_LINEAR) + EVT_CALL(LoadPath, 20 * DT, EVT_PTR(N(TwinkHidePath)), ARRAY_COUNT(N(TwinkHidePath)), EASING_LINEAR) EVT_EXEC_WAIT(N(EVS_TwinkFollowPath)) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Sad) EVT_RETURN @@ -887,7 +887,7 @@ EvtScript N(EVS_TwinkHide) = { EvtScript N(EVS_PeachSweat) = { EVT_LOOP(0) EVT_CALL(ShowSweat, 0, 1, -45, EMOTER_PLAYER, 0, 0, 0, 0, 20) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_END_LOOP EVT_RETURN EVT_END @@ -896,7 +896,7 @@ EvtScript N(EVS_PeachSweat) = { EvtScript N(EVS_TwinkSweat) = { EVT_LOOP(0) EVT_CALL(ShowSweat, NPC_PARTNER, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_END_LOOP EVT_RETURN EVT_END @@ -907,41 +907,41 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(RotateModel, MODEL_o57, 120, 0, 1, 0) - EVT_CALL(func_802D1270, 250, -30, EVT_FLOAT(2.0)) + EVT_CALL(func_802D1270, 250, -30, EVT_FLOAT(2.0 / DT)) EVT_EXEC_WAIT(N(EVS_CloseDoor)) EVT_CALL(DisablePartnerAI, 0) EVT_EXEC(N(EVS_TwinkHide)) EVT_THREAD EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_END_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_01, SOUND_263, 0) EVT_CALL(ShowEmote, NPC_Koopatrol_01, EMOTE_QUESTION, -45, 15, EMOTER_NPC, 0, 0, 0, 0) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 90, 5) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim17) - EVT_CALL(NpcJump0, NPC_Koopatrol_01, 175, 0, -25, 10) + EVT_CALL(NpcJump0, NPC_Koopatrol_01, 175, 0, -25, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim01) EVT_CALL(SpeakToPlayer, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_00EF) EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim09) - EVT_CALL(SetNpcSpeed, NPC_HammerBros, EVT_FLOAT(5.0)) + EVT_CALL(SetNpcSpeed, NPC_HammerBros, EVT_FLOAT(5.0 / DT)) EVT_CALL(NpcMoveTo, NPC_HammerBros, 130, -25, 0) EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim03) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 190, 0, -25) EVT_CALL(SetPanTarget, CAM_DEFAULT, 190, 0, -25) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(275.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.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_CALL(SpeakToNpc, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, NPC_Koopatrol_01, MSG_Peach_00F0) EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 270, 0) EVT_CALL(SpeakToNpc, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, NPC_HammerBros, MSG_Peach_00F1) EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim06) - EVT_CALL(SetNpcSpeed, NPC_HammerBros, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcSpeed, NPC_HammerBros, EVT_FLOAT(2.0 / DT)) EVT_CALL(NpcMoveTo, NPC_HammerBros, 130, 0, 0) EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim03) EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, MSG_Peach_00F2) @@ -949,11 +949,11 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 40) EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim04) - EVT_CALL(SetNpcSpeed, NPC_Koopatrol_01, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_01, EVT_FLOAT(2.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, LVar0, LVar2, 0) EVT_CALL(SpeakToPlayer, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_00F3) EVT_THREAD - EVT_CALL(func_802D1270, 0, -25, EVT_FLOAT(2.0)) + EVT_CALL(func_802D1270, 0, -25, EVT_FLOAT(2.0 / DT)) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardIdle) EVT_CALL(SetPlayerPos, -230, 23, -140) EVT_END_THREAD @@ -970,52 +970,56 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_CALL(SetNpcPos, NPC_HammerBros, -230, 0, 0) EVT_CALL(SetNpcYaw, NPC_HammerBros, 90) EVT_END_THREAD - EVT_WAIT(60) - EVT_CALL(LoadPath, 50, EVT_PTR(N(TwinkFollowPath1)), ARRAY_COUNT(N(TwinkFollowPath1)), EASING_LINEAR) + EVT_WAIT(60 * DT) + EVT_CALL(LoadPath, 50 * DT, EVT_PTR(N(TwinkFollowPath1)), ARRAY_COUNT(N(TwinkFollowPath1)), EASING_LINEAR) EVT_EXEC_WAIT(N(EVS_TwinkFollowPath)) EVT_EXEC_GET_TID(N(EVS_TwinkSweat), LVarA) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Shout, ANIM_Twink_Shout, 5, MSG_Peach_00F4) EVT_KILL_THREAD(LVarA) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -230, 0, -140) EVT_CALL(SetPanTarget, CAM_DEFAULT, -230, 0, -140) +#if VERSION_PAL + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.961)) +#else EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.8)) +#endif EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Angry) - EVT_CALL(LoadPath, 100, EVT_PTR(N(TwinkFollowPath2)), ARRAY_COUNT(N(TwinkFollowPath2)), EASING_LINEAR) + EVT_CALL(LoadPath, 100 * DT, EVT_PTR(N(TwinkFollowPath2)), ARRAY_COUNT(N(TwinkFollowPath2)), EASING_LINEAR) EVT_EXEC_WAIT(N(EVS_TwinkFollowPath)) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetMusicTrack, 0, SONG_PEACH_QUIZ_INTRO, 0, 8) EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_00F5) EVT_CALL(PlaySound, SOUND_8A) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_00F6) EVT_CALL(PlaySound, SOUND_8A) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround) EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 45, 13, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_WAIT(13) + EVT_WAIT(13 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 13, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_WAIT(13) + EVT_WAIT(13 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 45, 13, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardIdle) EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim06) EVT_CALL(SetNpcFlagBits, NPC_HammerBros, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(NpcMoveTo, NPC_HammerBros, -395, 0, 0) - EVT_CALL(InterpNpcYaw, NPC_HammerBros, 90, 7) + EVT_CALL(InterpNpcYaw, NPC_HammerBros, 90, 7 * DT) EVT_CALL(NpcMoveTo, NPC_HammerBros, -395, -30, 0) EVT_CALL(SetNpcFlagBits, NPC_HammerBros, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim03) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -395, 10, -40) EVT_CALL(SetPanTarget, CAM_DEFAULT, -395, 10, -40) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(275.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-370.0), EVT_FLOAT(40.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(SetMusicTrack, 0, SONG_PEACH_QUIZ_INTRO, 1, 8) @@ -1026,7 +1030,7 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_SET(AB_KKJ29_RightKoopatrolScore, 0) // round 1 EVT_SET(LVar1, MSG_Peach_00FC) - EVT_SET(LVar2, 40) + EVT_SET(LVar2, 40 * DT) EVT_SET(LVar3, MSG_Peach_00FD) EVT_SET(LVar4, MSG_Choice_002C) EVT_SET(LVar5, 1) @@ -1034,7 +1038,7 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_EXEC_WAIT(N(Script_DoRound)) // round 2 EVT_SET(LVar1, MSG_Peach_00FE) - EVT_SET(LVar2, 10) + EVT_SET(LVar2, 10 * DT) EVT_SET(LVar3, MSG_Peach_00FF) EVT_SET(LVar4, MSG_Choice_002D) EVT_SET(LVar5, 0) @@ -1042,7 +1046,7 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_EXEC_WAIT(N(Script_DoRound)) // round 3 EVT_SET(LVar1, MSG_Peach_0100) - EVT_SET(LVar2, 60) + EVT_SET(LVar2, 60 * DT) EVT_SET(LVar3, MSG_Peach_0101) EVT_SET(LVar4, MSG_Choice_002E) EVT_SET(LVar5, 2) @@ -1050,7 +1054,7 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_EXEC_WAIT(N(Script_DoRound)) // round 4 EVT_SET(LVar1, MSG_Peach_0102) - EVT_SET(LVar2, 10) + EVT_SET(LVar2, 10 * DT) EVT_SET(LVar3, MSG_Peach_0103) EVT_SET(LVar4, MSG_Choice_002F) EVT_SET(LVar5, 0) @@ -1058,7 +1062,7 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_EXEC_WAIT(N(Script_DoRound)) // round 5 EVT_SET(LVar1, MSG_Peach_0104) - EVT_SET(LVar2, 30) + EVT_SET(LVar2, 30 * DT) EVT_SET(LVar3, MSG_Peach_0105) EVT_SET(LVar4, MSG_Choice_0030) EVT_SET(LVar5, 2) @@ -1074,7 +1078,7 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_EXEC_WAIT(N(Script_DoRound)) // round 7 EVT_SET(LVar1, MSG_Peach_0108) - EVT_SET(LVar2, 30) + EVT_SET(LVar2, 30 * DT) EVT_SET(LVar3, MSG_Peach_0109) EVT_SET(LVar4, MSG_Choice_0032) EVT_SET(LVar5, 1) @@ -1082,7 +1086,7 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_EXEC_WAIT(N(Script_DoRound)) // round 8 EVT_SET(LVar1, MSG_Peach_010A) - EVT_SET(LVar2, 60) + EVT_SET(LVar2, 60 * DT) EVT_SET(LVar3, MSG_Peach_010B) EVT_SET(LVar4, MSG_Choice_0033) EVT_SET(LVar5, 1) @@ -1090,7 +1094,7 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_EXEC_WAIT(N(Script_DoRound)) // round 9 EVT_SET(LVar1, MSG_Peach_010C) - EVT_SET(LVar2, 60) + EVT_SET(LVar2, 60 * DT) EVT_SET(LVar3, MSG_Peach_010D) EVT_SET(LVar4, MSG_Choice_0034) EVT_SET(LVar5, 0) @@ -1098,7 +1102,7 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_EXEC_WAIT(N(Script_DoRound)) // round 10 EVT_SET(LVar1, MSG_Peach_010E) - EVT_SET(LVar2, 30) + EVT_SET(LVar2, 30 * DT) EVT_SET(LVar3, MSG_Peach_010F) EVT_SET(LVar4, MSG_Choice_0035) EVT_SET(LVar5, 0) @@ -1109,7 +1113,7 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, -230, 0, 0) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-13.0)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5 / DT)) EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim06) EVT_CALL(NpcMoveTo, NPC_HammerBros, -230, 0, 0) EVT_CALL(InterpNpcYaw, NPC_HammerBros, 90, 0) @@ -1118,7 +1122,7 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, MSG_Peach_0125) EVT_CALL(SetNpcVar, NPC_HammerBros, 0, 1) EVT_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(PlayerMoveTo, -185, -140, 20) EVT_CALL(PlayerMoveTo, -185, 0, 70) @@ -1126,23 +1130,23 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_CALL(SetNpcVar, NPC_HammerBros, 0, 0) EVT_END_THREAD EVT_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(NpcFlyTo, NPC_PARTNER, -160, 50, 0, 90, 0, EASING_LINEAR) EVT_END_THREAD EVT_THREAD - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim04) EVT_CALL(SetNpcFlagBits, NPC_Koopatrol_01, NPC_FLAG_GRAVITY, TRUE) - EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(2.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, -400, -140, 0) EVT_CALL(SetNpcFlagBits, NPC_Koopatrol_01, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim01) EVT_END_THREAD EVT_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim04) EVT_CALL(SetNpcFlagBits, NPC_Koopatrol_02, NPC_FLAG_GRAVITY, TRUE) - EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(2.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, 0, -140, 0) EVT_CALL(SetNpcFlagBits, NPC_Koopatrol_02, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcPos, NPC_Koopatrol_02, NPC_DISPOSE_LOCATION) @@ -1155,7 +1159,7 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_END_IF EVT_END_LOOP EVT_CALL(SetPanTarget, CAM_DEFAULT, -190, 0, 70) - 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_CALL(InterpPlayerYaw, 270, 0) @@ -1163,7 +1167,7 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, MSG_Peach_0126) EVT_CALL(ShowGotItem, ITEM_SNEAKY_PARASOL, TRUE, 0) EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, MSG_Peach_0127) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_THEME, 0, 8) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 330, 0, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, 330, 0, 0) @@ -1171,13 +1175,13 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-13.0)) EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(250.0), EVT_FLOAT(40.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcPos, NPC_HammerBros, -350, 0, 0) EVT_CALL(SetNpcPos, NPC_Koopatrol_01, -325, 0, -30) EVT_CALL(SetNpcYaw, NPC_Koopatrol_01, 90) EVT_EXEC(N(EVS_OpenDoor)) EVT_CALL(SetNpcPos, NPC_Bowser, 410, 0, -25) - EVT_CALL(SetNpcSpeed, NPC_Bowser, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcSpeed, NPC_Bowser, EVT_FLOAT(2.0 / DT)) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Walk) EVT_CALL(NpcMoveTo, NPC_Bowser, 250, -25, 0) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) @@ -1204,10 +1208,10 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_END_IF EVT_END_LOOP EVT_KILL_THREAD(LVarA) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpPlayerYaw, 90, 7) - EVT_CALL(func_802D1270, -180, -24, EVT_FLOAT(2.0)) - EVT_CALL(func_802D1270, -120, -24, EVT_FLOAT(2.0)) + EVT_CALL(func_802D1270, -180, -24, EVT_FLOAT(2.0 / DT)) + EVT_CALL(func_802D1270, -120, -24, EVT_FLOAT(2.0 / DT)) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcPos, NPC_PARTNER, -175, 60, -100) @@ -1229,53 +1233,53 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_END_IF EVT_END_LOOP EVT_KILL_THREAD(LVarA) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 5) - EVT_CALL(LoadPath, 50, EVT_PTR(N(TwinkFlyAwayPath)), ARRAY_COUNT(N(TwinkFlyAwayPath)), EASING_LINEAR) + EVT_CALL(LoadPath, 50 * DT, EVT_PTR(N(TwinkFlyAwayPath)), ARRAY_COUNT(N(TwinkFlyAwayPath)), EASING_LINEAR) EVT_EXEC_WAIT(N(EVS_TwinkFollowPath)) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle) EVT_END_THREAD EVT_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPanTarget, CAM_DEFAULT, -300, 0, 0) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) EVT_END_THREAD - EVT_CALL(SetNpcSpeed, NPC_Bowser, EVT_FLOAT(3.75)) + EVT_CALL(SetNpcSpeed, NPC_Bowser, EVT_FLOAT(3.75 / DT)) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Walk) EVT_CALL(NpcMoveTo, NPC_Bowser, -260, 0, 0) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) EVT_CALL(SetNpcVar, NPC_Bowser, 0, 0) EVT_CALL(SetNpcVar, NPC_Bowser, 1, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_LOOP(2) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Talk) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) - EVT_WAIT(3) + EVT_WAIT(3 * DT) EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim0B) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim03) - EVT_WAIT(3) + EVT_WAIT(3 * DT) EVT_END_LOOP - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_HammerBros, MSG_Peach_012A) EVT_CALL(InterpNpcYaw, NPC_Bowser, 90, 5) EVT_CALL(SetPanTarget, CAM_DEFAULT, -190, 0, 0) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) - EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 10) + EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 10 * DT) EVT_CALL(InterpPlayerYaw, 270, 5) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Shock) EVT_CALL(GetNpcPos, NPC_Bowser, LVar0, LVar1, LVar2) - EVT_CALL(NpcJump0, NPC_Bowser, LVar0, LVar1, LVar2, 10) + EVT_CALL(NpcJump0, NPC_Bowser, LVar0, LVar1, LVar2, 10 * DT) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_Shock, ANIM_WorldBowser_Shock, 5, MSG_Peach_012B) EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) @@ -1286,8 +1290,8 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_EXEC_WAIT(N(EVS_PickUpPeach)) EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Carried, ANIM_Peach2_Carried, 5, MSG_Peach_012E) EVT_EXEC_WAIT(N(EVS_CarryPeachAway)) - EVT_WAIT(30) - EVT_CALL(FadeOutMusic, 0, 1000) + EVT_WAIT(30 * DT) + EVT_CALL(FadeOutMusic, 0, 1000 * DT) EVT_EXEC_WAIT(N(EVS_EndPeachChapter5)) EVT_CALL(EnablePartnerAI) EVT_CALL(DisablePlayerPhysics, FALSE) diff --git a/src/world/area_kpa/kpa_16/kpa_16_4_npc.c b/src/world/area_kpa/kpa_16/kpa_16_4_npc.c index 7b2a76e681..ef00ce785c 100644 --- a/src/world/area_kpa/kpa_16/kpa_16_4_npc.c +++ b/src/world/area_kpa/kpa_16/kpa_16_4_npc.c @@ -42,7 +42,7 @@ EvtScript N(EVS_Scene_LavaShutoff) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(350.0)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT)) EVT_CALL(SetPanTarget, CAM_DEFAULT, 330, 230, -150) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(1) @@ -51,7 +51,7 @@ EvtScript N(EVS_Scene_LavaShutoff) = { EVT_THREAD EVT_CALL(N(MuteAmbience)) EVT_SETF(LVar2, 1) - EVT_CALL(MakeLerp, 0, -20, 100, EASING_LINEAR) + EVT_CALL(MakeLerp, 0, -20, 100 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_ADDF(LVar2, EVT_FLOAT(-0.01)) @@ -64,8 +64,8 @@ EvtScript N(EVS_Scene_LavaShutoff) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_WAIT(50) - EVT_CALL(MakeLerp, 0, 255, 50, EASING_LINEAR) + EVT_WAIT(50 * DT) + EVT_CALL(MakeLerp, 0, 255, 50 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(N(SetScreenBlackFadeAmount), LVar0) @@ -89,7 +89,7 @@ EvtScript N(EVS_Scene_LavaShutoff) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o954, COLLIDER_FLAGS_UPPER_MASK) EVT_SET(GF_KPA16_ShutOffLava, TRUE) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) - EVT_CALL(MakeLerp, 255, 0, 50, EASING_LINEAR) + EVT_CALL(MakeLerp, 255, 0, 50 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(N(SetScreenBlackFadeAmount), LVar0) @@ -98,7 +98,7 @@ EvtScript N(EVS_Scene_LavaShutoff) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(GetCurrentPartnerID, LVar0) EVT_SWITCH(LVar0) @@ -127,17 +127,17 @@ EvtScript N(EVS_Scene_LavaShutoff) = { EvtScript N(EVS_ChargeAtPlayer) = { EVT_CHILD_THREAD - EVT_WAIT(15) - EVT_CALL(SetNpcSpeed, NPC_Koopatrol_01, EVT_FLOAT(3.0)) + EVT_WAIT(15 * DT) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_01, EVT_FLOAT(3.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, 650, -145, 0) EVT_END_CHILD_THREAD EVT_CHILD_THREAD - EVT_WAIT(10) - EVT_CALL(SetNpcSpeed, NPC_Koopatrol_03, EVT_FLOAT(3.5)) + EVT_WAIT(10 * DT) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_03, EVT_FLOAT(3.5 / DT)) EVT_CALL(NpcMoveTo, NPC_Koopatrol_03, 650, -165, 0) EVT_END_CHILD_THREAD - EVT_WAIT(5) - EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(4.0)) + EVT_WAIT(5 * DT) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(4.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, 650, -120, 0) EVT_RETURN EVT_END @@ -164,7 +164,7 @@ EvtScript N(EVS_NpcIdle_Guards) = { EVT_CALL(ShowEmote, NPC_Koopatrol_01, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Koopatrol_02, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Koopatrol_03, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 90, 0) EVT_CALL(InterpNpcYaw, NPC_Koopatrol_02, 90, 0) EVT_CALL(InterpNpcYaw, NPC_Koopatrol_03, 90, 0) @@ -172,7 +172,7 @@ EvtScript N(EVS_NpcIdle_Guards) = { EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim06) EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim06) EVT_CALL(SetNpcAnimation, NPC_Koopatrol_03, ANIM_WorldKoopatrol_Anim06) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 555, 230, -150) EVT_CALL(SetPanTarget, CAM_DEFAULT, 555, 230, -150) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) @@ -181,20 +181,20 @@ EvtScript N(EVS_NpcIdle_Guards) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_THREAD - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlayerMoveTo, 680, -145, 0) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_END_THREAD EVT_CALL(SetSelfVar, 0, 0) EVT_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim06) - EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(4.0 / DT)) EVT_LABEL(10) EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, 550, -165, 0) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, 510, -165, 0) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(GetSelfVar, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_GOTO(10) @@ -208,7 +208,7 @@ EvtScript N(EVS_NpcIdle_Guards) = { EVT_WAIT(5) EVT_CALL(SetNpcJumpscale, NPC_Koopatrol_03, EVT_FLOAT(1.0)) EVT_CALL(GetNpcPos, NPC_Koopatrol_03, LVar0, LVar1, LVar2) - EVT_CALL(NpcJump0, NPC_Koopatrol_03, LVar0, LVar1, LVar2, 20) + EVT_CALL(NpcJump0, NPC_Koopatrol_03, LVar0, LVar1, LVar2, 20 * DT) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_Koopatrol_03, ANIM_WorldKoopatrol_Anim06, ANIM_WorldKoopatrol_Anim06, 0, MSG_CH8_0018) EVT_CALL(SetSelfVar, 0, 1) @@ -225,9 +225,9 @@ EvtScript N(EVS_NpcIdle_Guards) = { EVT_CALL(SetNpcAnimation, NPC_Koopatrol_03, ANIM_WorldKoopatrol_Anim01) EVT_CALL(SpeakToPlayer, NPC_Magikoopa, ANIM_Magikoopa_Anim02, ANIM_Magikoopa_Anim01, 0, MSG_CH8_0019) EVT_THREAD - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(InterpNpcYaw, NPC_Koopatrol_03, 90, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 90, 0) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_CH8_001A) @@ -244,7 +244,7 @@ EvtScript N(EVS_NpcIdle_Guards) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcPos, NPC_Koopatrol_01, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcPos, NPC_Koopatrol_02, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcPos, NPC_Koopatrol_03, NPC_DISPOSE_LOCATION) diff --git a/src/world/area_kpa/kpa_17/kpa_17_4_npc.c b/src/world/area_kpa/kpa_17/kpa_17_4_npc.c index 85282b3881..6efb81d6de 100644 --- a/src/world/area_kpa/kpa_17/kpa_17_4_npc.c +++ b/src/world/area_kpa/kpa_17/kpa_17_4_npc.c @@ -68,12 +68,12 @@ EvtScript N(EVS_BlastWall) = { EVT_SET(GF_KPA17_BombedWall, TRUE) EVT_CALL(WaitForPlayerInputEnabled) EVT_CALL(DisablePlayerInput, TRUE) - EVT_WAIT(80) + EVT_WAIT(80 * DT) EVT_CALL(DisablePartnerAI, 0) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH8_0016) EVT_CALL(EnablePartnerAI) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_UNBIND EVT_RETURN diff --git a/src/world/area_kpa/kpa_81/kpa_81_3_npc.c b/src/world/area_kpa/kpa_81/kpa_81_3_npc.c index 85f2ac844a..89428b3c55 100644 --- a/src/world/area_kpa/kpa_81/kpa_81_3_npc.c +++ b/src/world/area_kpa/kpa_81/kpa_81_3_npc.c @@ -38,7 +38,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, 109, 0, 202) - 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(15.0), EVT_FLOAT(-10.0)) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(500.0)) EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(133.0), EVT_FLOAT(100.0)) @@ -47,9 +47,9 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_THREAD EVT_CALL(SetMusicTrack, 0, SONG_FINAL_BOWSER_BATTLE, 1, 8) - EVT_WAIT(150) + EVT_WAIT(150 * DT) EVT_CALL(FadeOutMusic, 0, 250) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_EXEC(N(EVS_SetupMusic)) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0008) @@ -62,13 +62,13 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_WAIT(10) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0 / DT)) EVT_CALL(PlayerMoveTo, -115, LVar2, 0) EVT_CALL(SetCamType, CAM_DEFAULT, 6, FALSE) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, 109, 0, 202) - 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(15.0), EVT_FLOAT(-10.0)) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(500.0)) EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(133.0), EVT_FLOAT(100.0)) @@ -77,9 +77,9 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_THREAD EVT_CALL(SetMusicTrack, 0, SONG_FINAL_BOWSER_BATTLE, 1, 8) - EVT_WAIT(150) + EVT_WAIT(150 * DT) EVT_CALL(FadeOutMusic, 0, 250) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_EXEC(N(EVS_SetupMusic)) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0000) @@ -96,7 +96,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_GOTO(3) EVT_END_IF EVT_ADD(LVar1, 1) - EVT_IF_LE(LVar1, 300) + EVT_IF_LE(LVar1, 300 * DT) EVT_GOTO(100) EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) @@ -151,7 +151,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, 163, -71, 108) - 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(20.0), EVT_FLOAT(-16.0)) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(500.0)) EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(133.0), EVT_FLOAT(100.0)) @@ -174,11 +174,11 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_GOTO(10) EVT_END_IF EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Flail) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicStill) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_161, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) diff --git a/src/world/area_kpa/kpa_82/kpa_82_3_npc.c b/src/world/area_kpa/kpa_82/kpa_82_3_npc.c index 0acebd665e..867c148187 100644 --- a/src/world/area_kpa/kpa_82/kpa_82_3_npc.c +++ b/src/world/area_kpa/kpa_82/kpa_82_3_npc.c @@ -94,7 +94,7 @@ MAP_STATIC_PAD(1,choice); EvtScript N(EVS_SetCam_MeetingDoor) = { 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(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(11.0), EVT_FLOAT(-10.0)) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(450.0)) EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(88.0), EVT_FLOAT(256.6)) @@ -108,7 +108,7 @@ EvtScript N(EVS_SetCam_MeetingDoor) = { EvtScript N(EVS_SetCam_AfterBattle) = { 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(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(5.0), EVT_FLOAT(-14.0)) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(375.0)) EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(88.0), EVT_FLOAT(256.6)) @@ -176,7 +176,7 @@ EvtScript N(EVS_SetCam_BeforeBattle) = { }; EvtScript N(EVS_SetDoorRots) = { - EVT_CALL(MakeLerp, 0, 60, 30, EASING_LINEAR) + EVT_CALL(MakeLerp, 0, 60, 30 * DT, EASING_LINEAR) EVT_CALL(PlaySound, SOUND_225) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -196,7 +196,7 @@ EvtScript N(EVS_SetDoorRots) = { }; EvtScript N(EVS_CloseDoors) = { - EVT_CALL(MakeLerp, 60, 0, 30, EASING_LINEAR) + EVT_CALL(MakeLerp, 60, 0, 30 * DT, EASING_LINEAR) EVT_CALL(PlaySound, SOUND_226) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -220,7 +220,7 @@ EvtScript N(EVS_ReleaseFrom_Door_0) = { EVT_CALL(SetNpcPos, NPC_SELF, -100, 0, 0) EVT_CALL(RandInt, 40, LVar1) EVT_ADD(LVar1, -120) - EVT_CALL(NpcMoveTo, NPC_SELF, LVar1, 150, 30) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar1, 150, 30 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, LVar4) EVT_CALL(BindNpcAI, NPC_SELF, LVar5) EVT_RETURN @@ -232,7 +232,7 @@ EvtScript N(EVS_ReleaseFrom_Door_1) = { EVT_CALL(SetNpcPos, NPC_SELF, 0, 0, 0) EVT_CALL(RandInt, 40, LVar1) EVT_ADD(LVar1, -20) - EVT_CALL(NpcMoveTo, NPC_SELF, LVar1, 150, 30) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar1, 150, 30 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, LVar4) EVT_CALL(BindNpcAI, NPC_SELF, LVar5) EVT_RETURN @@ -244,7 +244,7 @@ EvtScript N(EVS_ReleaseFrom_Door_2) = { EVT_CALL(SetNpcPos, NPC_SELF, 100, 0, 0) EVT_CALL(RandInt, 40, LVar1) EVT_ADD(LVar1, 80) - EVT_CALL(NpcMoveTo, NPC_SELF, LVar1, 150, 30) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar1, 150, 30 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, LVar4) EVT_CALL(BindNpcAI, NPC_SELF, LVar5) EVT_RETURN @@ -253,8 +253,8 @@ EvtScript N(EVS_ReleaseFrom_Door_2) = { EvtScript N(EVS_WithdrawTo_Door_0) = { EVT_CALL(SetNpcAnimation, NPC_SELF, LVar3) - EVT_CALL(RandInt, 20, LVar1) - EVT_ADD(LVar1, 20) + EVT_CALL(RandInt, 20 * DT, LVar1) + EVT_ADD(LVar1, 20 * DT) EVT_CALL(NpcMoveTo, NPC_SELF, -100, 0, LVar1) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_RETURN @@ -263,8 +263,8 @@ EvtScript N(EVS_WithdrawTo_Door_0) = { EvtScript N(EVS_WithdrawTo_Door_1) = { EVT_CALL(SetNpcAnimation, NPC_SELF, LVar3) - EVT_CALL(RandInt, 20, LVar1) - EVT_ADD(LVar1, 20) + EVT_CALL(RandInt, 20 * DT, LVar1) + EVT_ADD(LVar1, 20 * DT) EVT_CALL(NpcMoveTo, NPC_SELF, 0, 0, LVar1) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_RETURN @@ -273,8 +273,8 @@ EvtScript N(EVS_WithdrawTo_Door_1) = { EvtScript N(EVS_WithdrawTo_Door_2) = { EVT_CALL(SetNpcAnimation, NPC_SELF, LVar3) - EVT_CALL(RandInt, 20, LVar1) - EVT_ADD(LVar1, 20) + EVT_CALL(RandInt, 20 * DT, LVar1) + EVT_ADD(LVar1, 20 * DT) EVT_CALL(NpcMoveTo, NPC_SELF, 100, 0, LVar1) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_RETURN @@ -496,42 +496,42 @@ EvtScript N(EVS_Withdraw_Bobomb_Door_0) = { s32 N(QS_Release_Wave_0)[] = { QS_NEXT(NPC_DarkTroopa_01, N(EVS_Release_DarkTroopa)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_Goomba_01, N(EVS_Release_Goomba)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_DarkTroopa_02, N(EVS_Release_DarkTroopa)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_Goomba_02, N(EVS_Release_Goomba)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_Goomba_03, N(EVS_Release_Goomba)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_DarkTroopa_03, N(EVS_Release_DarkTroopa)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_Goomba_04, N(EVS_Release_Goomba)) QS_END }; s32 N(QS_Release_Wave_1)[] = { QS_NEXT(NPC_RedShyGuy_01, N(EVS_Release_RedShyGuy)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_RedShyGuy_02, N(EVS_Release_RedShyGuy)) - QS_WAIT(10) + QS_WAIT(10 * DT) QS_NEXT(NPC_RedShyGuy_03, N(EVS_Release_RedShyGuy)) - QS_WAIT(8) + QS_WAIT(8 * DT) QS_NEXT(NPC_BlueShyGuy_01, N(EVS_Release_BlueShyGuy)) - QS_WAIT(3) + QS_WAIT(3 * DT) QS_NEXT(NPC_BlueShyGuy_02, N(EVS_Release_BlueShyGuy)) - QS_WAIT(6) + QS_WAIT(6 * DT) QS_NEXT(NPC_BlueShyGuy_03, N(EVS_Release_BlueShyGuy)) - QS_WAIT(7) + QS_WAIT(7 * DT) QS_NEXT(NPC_BlueShyGuy_04, N(EVS_Release_BlueShyGuy)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_GreenShyGuy_01, N(EVS_Release_GreenShyGuy)) - QS_WAIT(4) + QS_WAIT(4 * DT) QS_NEXT(NPC_GreenShyGuy_02, N(EVS_Release_GreenShyGuy)) - QS_WAIT(6) + QS_WAIT(6 * DT) QS_NEXT(NPC_GreenShyGuy_03, N(EVS_Release_GreenShyGuy)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_GreenShyGuy_04, N(EVS_Release_GreenShyGuy)) QS_END }; @@ -540,84 +540,84 @@ s32 N(QS_Release_Wave_2)[] = { QS_NEXT(NPC_RedShyGuy_01, N(EVS_Release_RedShyGuy_Door_1)) QS_NEXT(NPC_BlueShyGuy_01, N(EVS_Release_BlueShyGuy_Door_2)) QS_NEXT(NPC_Bobomb_01, N(EVS_Release_Bobomb_Door_0)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_RedShyGuy_02, N(EVS_Release_RedShyGuy_Door_1)) QS_NEXT(NPC_BlueShyGuy_02, N(EVS_Release_BlueShyGuy_Door_2)) QS_NEXT(NPC_Bobomb_02, N(EVS_Release_Bobomb_Door_0)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_BlueShyGuy_03, N(EVS_Release_BlueShyGuy_Door_2)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_BlueShyGuy_04, N(EVS_Release_BlueShyGuy_Door_2)) QS_END }; s32 N(QS_Release_Wave_3)[] = { QS_NEXT(NPC_Goomba_01, N(EVS_Release_Goomba)) - QS_WAIT(8) + QS_WAIT(8 * DT) QS_NEXT(NPC_KoopaTroopa_01, N(EVS_Release_KoopaTroopa)) QS_NEXT(NPC_KoopaTroopa_02, N(EVS_Release_KoopaTroopa)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_BlueShyGuy_01, N(EVS_Release_BlueShyGuy)) QS_NEXT(NPC_GreenShyGuy_01, N(EVS_Release_GreenShyGuy)) QS_NEXT(NPC_BlueShyGuy_02, N(EVS_Release_BlueShyGuy)) - QS_WAIT(8) + QS_WAIT(8 * DT) QS_NEXT(NPC_Goomba_02, N(EVS_Release_Goomba)) QS_NEXT(NPC_BlueShyGuy_03, N(EVS_Release_BlueShyGuy)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_KoopaTroopa_03, N(EVS_Release_KoopaTroopa)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_KoopaTroopa_04, N(EVS_Release_KoopaTroopa)) QS_END }; s32 N(QS_Release_Wave_4)[] = { QS_NEXT(NPC_Goomba_01, N(EVS_Release_Goomba)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_KoopaTroopa_01, N(EVS_Release_KoopaTroopa)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_DarkTroopa_01, N(EVS_Release_DarkTroopa)) QS_END }; s32 N(QS_Release_Wave_5)[] = { QS_NEXT(NPC_RedShyGuy_01, N(EVS_Release_RedShyGuy)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_RedShyGuy_02, N(EVS_Release_RedShyGuy)) - QS_WAIT(4) + QS_WAIT(4 * DT) QS_NEXT(NPC_GreenShyGuy_01, N(EVS_Release_GreenShyGuy)) - QS_WAIT(8) + QS_WAIT(8 * DT) QS_NEXT(NPC_Bobomb_01, N(EVS_Release_Bobomb)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_Bobomb_02, N(EVS_Release_Bobomb)) - QS_WAIT(8) + QS_WAIT(8 * DT) QS_NEXT(NPC_Bobomb_03, N(EVS_Release_Bobomb)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_KoopaTroopa_01, N(EVS_Release_KoopaTroopa)) - QS_WAIT(10) + QS_WAIT(10 * DT) QS_NEXT(NPC_KoopaTroopa_02, N(EVS_Release_KoopaTroopa)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_KoopaTroopa_03, N(EVS_Release_KoopaTroopa)) - QS_WAIT(8) + QS_WAIT(8 * DT) QS_NEXT(NPC_KoopaTroopa_04, N(EVS_Release_KoopaTroopa)) QS_END }; s32 N(QS_Release_Wave_6)[] = { QS_NEXT(NPC_DarkTroopa_01, N(EVS_Release_DarkTroopa)) - QS_WAIT(10) + QS_WAIT(10 * DT) QS_NEXT(NPC_BlueShyGuy_01, N(EVS_Release_BlueShyGuy)) QS_NEXT(NPC_Goomba_01, N(EVS_Release_Goomba)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_BlueShyGuy_02, N(EVS_Release_BlueShyGuy)) QS_NEXT(NPC_Goomba_02, N(EVS_Release_Goomba)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_Goomba_03, N(EVS_Release_Goomba)) QS_NEXT(NPC_DarkTroopa_02, N(EVS_Release_DarkTroopa)) - QS_WAIT(8) + QS_WAIT(8 * DT) QS_NEXT(NPC_DarkTroopa_03, N(EVS_Release_DarkTroopa)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_RedShyGuy_01, N(EVS_Release_RedShyGuy)) - QS_WAIT(5) + QS_WAIT(5 * DT) QS_NEXT(NPC_RedShyGuy_02, N(EVS_Release_RedShyGuy)) QS_END }; @@ -841,7 +841,7 @@ EvtScript N(EVS_AskQuestion) = { EvtScript N(EVS_ShowUnknownCard) = { EVT_CALL(EnableModel, MODEL_m_, TRUE) - EVT_CALL(MakeLerp, 180, LVar0, 60, EASING_QUADRATIC_IN) + EVT_CALL(MakeLerp, 180, LVar0, 60 * DT, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_IF_GE(LVar0, 360) @@ -878,7 +878,7 @@ EvtScript N(EVS_TetherResultCardToDummyPos) = { EvtScript N(EVS_ScaleResultCard) = { EVT_CALL(EnableModel, LVarA, TRUE) - EVT_CALL(MakeLerp, 100, 50, 30, EASING_LINEAR) + EVT_CALL(MakeLerp, 100, 50, 30 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_SETF(LVar6, LVar0) @@ -930,7 +930,7 @@ EvtScript N(EVS_MoveCardToScoreboard) = { EVT_SET(LVar2, 3) EVT_END_SWITCH EVT_CALL(SetNpcJumpscale, NPC_Dummy, EVT_FLOAT(0.0)) - EVT_CALL(NpcJump1, NPC_Dummy, LVar0, LVar1, LVar2, 30) + EVT_CALL(NpcJump1, NPC_Dummy, LVar0, LVar1, LVar2, 30 * DT) EVT_CALL(SetNpcPos, NPC_Dummy, 184, 20, 150) EVT_KILL_THREAD(LVarB) EVT_RETURN @@ -980,33 +980,33 @@ EvtScript N(EVS_GetWrongScoreboardModel) = { }; EvtScript N(EVS_ShowResultCard) = { - EVT_SET(LVar6, EVT_FLOAT(2.0)) + EVT_SET(LVar6, EVT_FLOAT(2.0 / DT)) EVT_EXEC_WAIT(N(EVS_SetCam_ViewRoom)) EVT_WAIT(5) EVT_IF_EQ(MV_LastAnswerResult, ANSWER_CORRECT) EVT_SET(LVar0, 2160) EVT_EXEC_WAIT(N(EVS_ShowUnknownCard)) EVT_CALL(PlaySound, SOUND_21C) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(EnableGroup, MODEL_g47, FALSE) EVT_SET(LVarA, MODEL_m_kai) EVT_EXEC_WAIT(N(EVS_MoveCardToScoreboard)) EVT_EXEC_WAIT(N(EVS_GetCorrectScoreboardModel)) EVT_CALL(EnableModel, MODEL_m_kai, FALSE) EVT_CALL(EnableModel, LVar0, TRUE) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_ELSE EVT_SET(LVar0, 2340) EVT_EXEC_WAIT(N(EVS_ShowUnknownCard)) EVT_CALL(PlaySound, SOUND_MENU_ERROR) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(EnableGroup, MODEL_g47, FALSE) EVT_SET(LVarA, MODEL_b_kai) EVT_EXEC_WAIT(N(EVS_MoveCardToScoreboard)) EVT_EXEC_WAIT(N(EVS_GetWrongScoreboardModel)) EVT_CALL(EnableModel, MODEL_b_kai, FALSE) EVT_CALL(EnableModel, LVar0, TRUE) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_END_IF EVT_EXEC_WAIT(N(EVS_SetCam_AfterResult)) EVT_RETURN @@ -1025,12 +1025,12 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_SET(MF_Sync_MusicChange, FALSE) EVT_THREAD EVT_CALL(SetMusicTrack, 0, SONG_FINAL_BOWSER_BATTLE, 1, 8) - EVT_WAIT(150) + EVT_WAIT(150 * DT) EVT_IF_NE(MF_Sync_MusicChange, FALSE) EVT_GOTO(5) EVT_END_IF EVT_CALL(FadeOutMusic, 0, 250) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_IF_NE(MF_Sync_MusicChange, FALSE) EVT_GOTO(5) EVT_END_IF @@ -1082,24 +1082,24 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_SET(AB_KPA82_RightAnswers, 0) EVT_SET(AB_KPA82_WrongAnswers, 0) EVT_LABEL(10) - EVT_SET(LVar6, EVT_FLOAT(2.0)) + EVT_SET(LVar6, EVT_FLOAT(2.0 / DT)) EVT_EXEC_WAIT(N(EVS_SetCam_ViewRoom)) EVT_SET(MF_Sync_MusicChange, TRUE) EVT_WAIT(2) EVT_CALL(SetMusicTrack, 0, SONG_NORMAL_BATTLE, 0, 8) EVT_EXEC_WAIT(N(EVS_SetDoorRots)) EVT_EXEC_WAIT(N(EVS_Release_Wave)) - EVT_WAIT(200) + EVT_WAIT(200 * DT) EVT_THREAD EVT_CALL(ShowMessageAtScreenPos, MSG_CH8_0034, 300, 200) EVT_SET(MV_Sync_TimesUp, TRUE) EVT_END_THREAD - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_EXEC_WAIT(N(EVS_Withdraw_Wave)) - EVT_WAIT(35) + EVT_WAIT(35 * DT) EVT_EXEC_WAIT(N(EVS_CloseDoors)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_LABEL(12) EVT_WAIT(1) EVT_IF_EQ(MV_Sync_TimesUp, FALSE) @@ -1134,7 +1134,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_GOTO(10) EVT_LABEL(20) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_0041) - EVT_SET(LVar6, EVT_FLOAT(2.0)) + EVT_SET(LVar6, EVT_FLOAT(2.0 / DT)) EVT_EXEC_WAIT(N(EVS_SetCam_ViewRoom)) EVT_CALL(SetNpcPos, NPC_AntiGuy_01, -100, 0, 0) EVT_CALL(SetNpcPos, NPC_AntiGuy_02, 0, 0, 0) @@ -1145,20 +1145,20 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_0042) EVT_CALL(PlayerFaceNpc, NPC_AntiGuy_02, 5) EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) - EVT_SET(LVar6, EVT_FLOAT(3.0)) + EVT_SET(LVar6, EVT_FLOAT(3.0 / DT)) EVT_EXEC_WAIT(N(EVS_SetCam_BeforeBattle)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_AntiGuy_01, ANIM_ShyGuy_Black_Anim04) - EVT_CALL(NpcMoveTo, NPC_AntiGuy_01, LVar0, LVar2, 30) + EVT_CALL(NpcMoveTo, NPC_AntiGuy_01, LVar0, LVar2, 30 * DT) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_AntiGuy_02, ANIM_ShyGuy_Black_Anim04) - EVT_CALL(NpcMoveTo, NPC_AntiGuy_02, LVar0, LVar2, 30) + EVT_CALL(NpcMoveTo, NPC_AntiGuy_02, LVar0, LVar2, 30 * DT) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_AntiGuy_03, ANIM_ShyGuy_Black_Anim04) - EVT_CALL(NpcMoveTo, NPC_AntiGuy_03, LVar0, LVar2, 30) + EVT_CALL(NpcMoveTo, NPC_AntiGuy_03, LVar0, LVar2, 30 * DT) EVT_END_THREAD EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) @@ -1170,7 +1170,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_THREAD EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o166, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlayerMoveTo, 120, 145, 0) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(DisablePlayerPhysics, FALSE) @@ -1178,7 +1178,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_END_THREAD EVT_THREAD EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.5)) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.5 * DT)) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_CALL(NpcMoveTo, NPC_PARTNER, 80, 145, 0) EVT_CALL(EnablePartnerAI) diff --git a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c index 87f353bbcd..e74b3daff7 100644 --- a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c +++ b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c @@ -157,10 +157,10 @@ EvtScript N(EVS_KoopaBros_FlingAway) = { EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlayerMoveTo, -150, LVar2, 0) EVT_CALL(SetCamType, CAM_DEFAULT, 6, FALSE) - EVT_SET(LVar6, EVT_FLOAT(3.0)) + EVT_SET(LVar6, EVT_FLOAT(3.0 / DT)) EVT_EXEC_WAIT(N(EVS_FocusCam_LookAtDoor)) EVT_SET(MF_DoneIntroMessage, FALSE) EVT_THREAD @@ -294,14 +294,14 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_Anim1A) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_Anim1A) EVT_THREAD - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlayerMoveTo, -50, 150, 0) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim1A, ANIM_KoopaBros_Red_Anim1A, 0, MSG_CH8_0054) EVT_SET(LVar3, 0) EVT_SET(LVar4, 0) EVT_SET(LVar5, 150) - EVT_SET(LVar6, EVT_FLOAT(3.0)) + EVT_SET(LVar6, EVT_FLOAT(3.0 / DT)) EVT_EXEC_WAIT(N(EVS_FocusCam_MidRoom)) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim04) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_Anim04) @@ -314,7 +314,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_ELSE EVT_CALL(ContinueSpeech, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, MSG_CH8_0057) EVT_END_IF - EVT_SET(LVar6, EVT_FLOAT(3.0)) + EVT_SET(LVar6, EVT_FLOAT(3.0 / DT)) EVT_EXEC_WAIT(N(EVS_FocusCam_LookAtDoor)) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0058) EVT_SET(LVar3, 0) @@ -407,13 +407,13 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_SET(LVar3, 100) EVT_SET(LVar4, 0) EVT_SET(LVar5, 150) - EVT_SET(LVar6, EVT_FLOAT(3.0)) + EVT_SET(LVar6, EVT_FLOAT(3.0 / DT)) EVT_EXEC_WAIT(N(EVS_FocusCam_JrTroopa)) EVT_CALL(SpeakToPlayer, NPC_JrTroopa, ANIM_JrTroopa_Talk, ANIM_JrTroopa_Idle, 0, MSG_CH8_005C) EVT_SET(LVar3, 0) EVT_SET(LVar4, 0) EVT_SET(LVar5, 150) - EVT_SET(LVar6, EVT_FLOAT(3.0)) + EVT_SET(LVar6, EVT_FLOAT(3.0 / DT)) EVT_EXEC_WAIT(N(EVS_FocusCam_AfterBattle)) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_JrTroopa_ChargeArmsUp) EVT_THREAD @@ -431,7 +431,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_SET(LVar3, 0) EVT_SET(LVar4, 0) EVT_SET(LVar5, 150) - EVT_SET(LVar6, EVT_FLOAT(3.0)) + EVT_SET(LVar6, EVT_FLOAT(3.0 / DT)) EVT_EXEC_WAIT(N(EVS_FocusCam_AfterBattle)) EVT_CALL(ShowMessageAtScreenPos, MSG_CH8_0062, 160, 40) EVT_SET(MV_Sync_AfterBattleCamMovement, 1) @@ -449,7 +449,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_SET(LVar6, EVT_FLOAT(3.0)) + EVT_SET(LVar6, EVT_FLOAT(3.0 / DT)) EVT_EXEC_WAIT(N(EVS_FocusCam_LookAtDoor)) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0063) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) diff --git a/src/world/area_mac/mac_00/mac_00_2_main.c b/src/world/area_mac/mac_00/mac_00_2_main.c index 442aa579ec..7842e3c663 100644 --- a/src/world/area_mac/mac_00/mac_00_2_main.c +++ b/src/world/area_mac/mac_00/mac_00_2_main.c @@ -74,7 +74,7 @@ EvtScript N(EVS_Main) = { EVT_SETUP_CAMERA_NO_LEAD() #if VERSION_PAL EVT_CALL(GetLanguage, LocalVar(0)) - EVT_CALL(SetModelTexVariant, 10, LocalVar(0)) + EVT_CALL(SetModelTexVariant, MODEL_mushroom_kingdom, LocalVar(0)) #endif EVT_IF_GE(GB_StoryProgress, STORY_CH0_KAMMY_RETURNED_TO_BOWSER) EVT_SET(GF_MAP_ToadTown, TRUE) diff --git a/src/world/area_mac/mac_01/mac_01_2_main.c b/src/world/area_mac/mac_01/mac_01_2_main.c index 54266e4593..e077f8dc29 100644 --- a/src/world/area_mac/mac_01/mac_01_2_main.c +++ b/src/world/area_mac/mac_01/mac_01_2_main.c @@ -119,7 +119,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) #if VERSION_PAL EVT_CALL(GetLanguage, LocalVar(0)) - EVT_CALL(SetModelTexVariant, 68, LocalVar(0)) + EVT_CALL(SetModelTexVariant, MODEL_k11, LocalVar(0)) #endif EVT_SET(AF_MAC_0E, FALSE) EVT_SET(AF_MAC_0F, FALSE) diff --git a/src/world/area_mac/mac_03/mac_03_2_main.c b/src/world/area_mac/mac_03/mac_03_2_main.c index f0b4ff3fe7..33381fa309 100644 --- a/src/world/area_mac/mac_03/mac_03_2_main.c +++ b/src/world/area_mac/mac_03/mac_03_2_main.c @@ -62,7 +62,7 @@ EvtScript N(EVS_Main) = { EVT_SETUP_CAMERA_NO_LEAD() #if VERSION_PAL EVT_CALL(GetLanguage, LocalVar(0)) - EVT_CALL(SetModelTexVariant, 57, LocalVar(0)) + EVT_CALL(SetModelTexVariant, MODEL_o110, LocalVar(0)) #endif EVT_SET(AF_MAC_20, FALSE) EVT_SET(AF_MAC_21, FALSE) diff --git a/src/world/area_mim/mim_02/mim_02_3_npc.c b/src/world/area_mim/mim_02/mim_02_3_npc.c index 0595bf5ba7..565b711e54 100644 --- a/src/world/area_mim/mim_02/mim_02_3_npc.c +++ b/src/world/area_mim/mim_02/mim_02_3_npc.c @@ -23,10 +23,10 @@ EvtScript N(EVS_NpcInteract_Oaklie) = { EVT_END_IF EVT_CALL(SpeakToPlayer, NPC_Oaklie, ANIM_Oaklie_Talk, ANIM_Oaklie_Idle, 0, MSG_CH3_0007) EVT_CALL(SetNpcFlagBits, NPC_Oaklie, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Jump) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) EVT_END_THREAD EVT_THREAD @@ -35,62 +35,62 @@ EvtScript N(EVS_NpcInteract_Oaklie) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, -426, 58, -70) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(6.0), EVT_FLOAT(-6.0)) EVT_CALL(SetCamDistance, CAM_DEFAULT, 250) - 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_END_THREAD EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_Oaklie, EVT_FLOAT(1.0)) - EVT_CALL(NpcJump0, NPC_Oaklie, -426, 58, -70, 20) + EVT_CALL(NpcJump0, NPC_Oaklie, -426, 58, -70, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Idle) EVT_CALL(SpeakToPlayer, NPC_Oaklie, ANIM_Oaklie_Talk, ANIM_Oaklie_Idle, 0, MSG_CH3_0008) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_THREAD EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT)) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Jump) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) EVT_END_THREAD EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_Oaklie, -333, 0, -81, 20) + EVT_CALL(NpcJump0, NPC_Oaklie, -333, 0, -81, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Jump) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) EVT_END_THREAD EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_Oaklie, -300, 0, -170, 15) + EVT_CALL(NpcJump0, NPC_Oaklie, -300, 0, -170, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Jump) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) EVT_END_THREAD EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_Oaklie, -226, 0, -245, 15) + EVT_CALL(NpcJump0, NPC_Oaklie, -226, 0, -245, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Jump) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) EVT_END_THREAD EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_Oaklie, -160, 0, -296, 15) + EVT_CALL(NpcJump0, NPC_Oaklie, -160, 0, -296, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetNpcPos, NPC_Oaklie, NPC_DISPOSE_LOCATION) EVT_SET(GB_StoryProgress, STORY_CH3_ALLOWED_INTO_FOREVER_FOREST) EVT_EXEC_WAIT(N(EVS_EnableWestGate)) @@ -109,14 +109,14 @@ EvtScript N(EVS_NpcIdle_Oaklie) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(6.0), EVT_FLOAT(-6.0)) EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) - 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_Oaklie, ANIM_Oaklie_Talk, ANIM_Oaklie_Idle, 0, MSG_CH3_0003) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Jump) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) EVT_END_THREAD EVT_THREAD @@ -125,15 +125,15 @@ EvtScript N(EVS_NpcIdle_Oaklie) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT)) EVT_END_THREAD EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) - EVT_CALL(NpcJump0, NPC_SELF, -455, 0, 0, 20) + EVT_CALL(NpcJump0, NPC_SELF, -455, 0, 0, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Idle) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_IF_LT(GB_StoryProgress, STORY_CH1_RETURNED_TO_TOAD_TOWN) EVT_CALL(SpeakToPlayer, NPC_Oaklie, ANIM_Oaklie_Talk, ANIM_Oaklie_Idle, 0, MSG_CH3_0004) EVT_ELSE diff --git a/src/world/area_mim/mim_07/mim_07_6_npc.c b/src/world/area_mim/mim_07/mim_07_6_npc.c index 1688e979a2..f5bb2e9e2d 100644 --- a/src/world/area_mim/mim_07/mim_07_6_npc.c +++ b/src/world/area_mim/mim_07/mim_07_6_npc.c @@ -107,7 +107,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { EVT_DIV(LVar2, 2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(20.0), EVT_FLOAT(-6.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) @@ -149,11 +149,11 @@ EvtScript N(EVS_NpcDefeat_JrTroopa) = { EVT_CALL(InterpNpcYaw, NPC_SELF, 330, 0) EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_ChargeArmsUp) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar1, 15) EVT_SET(GF_MIM10_Defeated_JrTroopa, TRUE) EVT_EXEC_WAIT(N(EVS_PlayForestMusic)) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_CALL(RemoveNpc, NPC_SELF) EVT_RETURN EVT_END diff --git a/src/world/area_mim/mim_10/mim_10_4_npc.c b/src/world/area_mim/mim_10/mim_10_4_npc.c index edc8a90486..35870f828a 100644 --- a/src/world/area_mim/mim_10/mim_10_4_npc.c +++ b/src/world/area_mim/mim_10/mim_10_4_npc.c @@ -88,13 +88,19 @@ EvtScript N(EVS_Bootler_SpookPlayer) = { EVT_END_LOOP EVT_END_CHILD_THREAD EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Spook, ANIM_Bootler_Spook, 0, MSG_CH3_0002) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; +#if VERSION_PAL +#define VAR_1 (15.0) +#else +#define VAR_1 (12.0) +#endif + EvtScript N(EVS_Scene_BootlersInvitation) = { EVT_CALL(N(AwaitPlayerApproachForest)) EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650) @@ -110,25 +116,25 @@ EvtScript N(EVS_Scene_BootlersInvitation) = { EVT_CALL(func_802CFD30, NPC_Bootler, FOLD_TYPE_7, 0, 0, 0, 0) EVT_SET(MV_Unk_00, TRUE) EVT_CALL(SetMusicTrack, 0, SONG_BOOS_MANSION, 0, 8) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_LookAround) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpPlayerYaw, 270, 0) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(InterpPlayerYaw, 90, 0) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_VANISH, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(0.0)) - EVT_LOOP(20) - EVT_ADDF(LVar0, EVT_FLOAT(12.0)) + EVT_LOOP(20 * DT) + EVT_ADDF(LVar0, EVT_FLOAT(VAR_1)) EVT_CALL(func_802CFD30, NPC_Bootler, FOLD_TYPE_7, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(GetNpcPos, NPC_Bootler, LVarA, LVarB, LVarC) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVarA, LVarB, LVarC) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVarA, LVarB, LVarC) @@ -136,7 +142,7 @@ EvtScript N(EVS_Scene_BootlersInvitation) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_0000) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -144,16 +150,16 @@ EvtScript N(EVS_Scene_BootlersInvitation) = { EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, TRUE) EVT_WAIT(1) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_0001) EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(240.0)) - EVT_LOOP(20) - EVT_SUBF(LVar0, EVT_FLOAT(12.0)) + EVT_LOOP(20 * DT) + EVT_SUBF(LVar0, EVT_FLOAT(VAR_1)) EVT_CALL(func_802CFD30, NPC_Bootler, FOLD_TYPE_7, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_WAIT(25) + EVT_WAIT(25 * DT) EVT_CALL(SetNpcAnimation, NPC_Bootler, ANIM_Bootler_Spook) EVT_THREAD EVT_CALL(GetNpcPos, NPC_Bootler, LVarA, LVarB, LVarC) @@ -161,8 +167,8 @@ EvtScript N(EVS_Scene_BootlersInvitation) = { EVT_CALL(SetNpcPos, NPC_Bootler, LVarA, LVarB, LVarC) EVT_CALL(SetNpcScale, NPC_Bootler, EVT_FLOAT(3.0), EVT_FLOAT(3.0), EVT_FLOAT(3.0)) EVT_SETF(LVar0, EVT_FLOAT(0.0)) - EVT_LOOP(20) - EVT_ADDF(LVar0, EVT_FLOAT(12.0)) + EVT_LOOP(20 * DT) + EVT_ADDF(LVar0, EVT_FLOAT(VAR_1)) EVT_CALL(func_802CFD30, NPC_Bootler, FOLD_TYPE_7, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP @@ -174,8 +180,8 @@ EvtScript N(EVS_Scene_BootlersInvitation) = { EVT_WAIT(1) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_SETF(LVar0, EVT_FLOAT(240.0)) - EVT_LOOP(20) - EVT_SUBF(LVar0, EVT_FLOAT(12.0)) + EVT_LOOP(20 * DT) + EVT_SUBF(LVar0, EVT_FLOAT(VAR_1)) EVT_CALL(func_802CFD30, NPC_Bootler, FOLD_TYPE_7, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP @@ -217,12 +223,12 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(MV_Unk_00, TRUE) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(3.0), LVar0, LVar1, LVar2, 300, 15, -7) + EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(3.0 / DT), LVar0, LVar1, LVar2, 300, 15, -7) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_Talk, ANIM_JrTroopa_Idle, 5, MSG_CH3_0023) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_ChargeArmsUp) EVT_SUB(LVar0, 200) - EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar2, 25) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar2, 25 * DT) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_SET(GF_MIM10_JrTroopaEscaped, TRUE) EVT_SET(MV_Unk_00, FALSE) diff --git a/src/world/area_mim/mim_11/mim_11_3_gate.c b/src/world/area_mim/mim_11/mim_11_3_gate.c index 54bd275725..2e7d943e00 100644 --- a/src/world/area_mim/mim_11/mim_11_3_gate.c +++ b/src/world/area_mim/mim_11/mim_11_3_gate.c @@ -1,7 +1,7 @@ #include "mim_11.h" EvtScript N(D_80242560_BB95D0) = { - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(PlaySoundAtCollider, COLLIDER_mon, SOUND_METAL_GATE_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 80, 30, EASING_LINEAR) EVT_LOOP(0) @@ -14,9 +14,9 @@ EvtScript N(D_80242560_BB95D0) = { EVT_END_IF EVT_END_LOOP EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_mon, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0 / DT)) EVT_CALL(PlayerMoveTo, -101, 17, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_mon, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(MakeLerp, 80, 0, 8, EASING_QUADRATIC_IN) EVT_LOOP(0) @@ -30,8 +30,8 @@ EvtScript N(D_80242560_BB95D0) = { EVT_END_LOOP EVT_CALL(PlaySoundAtCollider, COLLIDER_mon, SOUND_METAL_GATE_CLOSE, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(1.5)) - EVT_WAIT(20) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(20 * DT) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT)) EVT_CALL(SetCamType, CAM_DEFAULT, 0, TRUE) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(19.5), EVT_FLOAT(-14.9)) EVT_CALL(SetCamDistance, CAM_DEFAULT, 350) @@ -44,36 +44,36 @@ EvtScript N(D_80242560_BB95D0) = { EVT_CALL(SetMusicTrack, 0, SONG_BOOS_MANSION, 0, 8) EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_VANISH, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(0.0)) - EVT_LOOP(90) - EVT_ADDF(LVar0, EVT_FLOAT(2.667)) + EVT_LOOP(90 * DT) + EVT_ADDF(LVar0, EVT_FLOAT(2.6667 / DT)) EVT_CALL(func_802CFD30, NPC_Bootler, FOLD_TYPE_7, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_0028) EVT_CALL(SetMusicTrack, 0, SONG_BOOS_MANSION, 1, 8) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(0.0), EVT_FLOAT(-25.0)) EVT_CALL(SetCamDistance, CAM_DEFAULT, 550) 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(ShowMessageAtScreenPos, MSG_CH3_0029, 160, 40) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(19.5), EVT_FLOAT(-14.9)) EVT_CALL(SetCamDistance, CAM_DEFAULT, 350) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_002A) EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(240.0)) - EVT_LOOP(90) - EVT_SUBF(LVar0, EVT_FLOAT(2.667)) + EVT_LOOP(90 * DT) + EVT_SUBF(LVar0, EVT_FLOAT(2.6667 / DT)) EVT_CALL(func_802CFD30, NPC_Bootler, FOLD_TYPE_7, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(RemoveNpc, NPC_Bootler) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) diff --git a/src/world/area_mim/mim_12/mim_12_5_gate.c b/src/world/area_mim/mim_12/mim_12_5_gate.c index ba4d15f7d6..ded9c96239 100644 --- a/src/world/area_mim/mim_12/mim_12_5_gate.c +++ b/src/world/area_mim/mim_12/mim_12_5_gate.c @@ -307,7 +307,7 @@ EvtScript N(EVS_HaveBoosCloseGate) = { EvtScript N(EVS_Scene_UnlockGate) = { EVT_CALL(DisablePlayerInput, TRUE) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(GetCurrentPartnerID, LVar6) EVT_CALL(BringPartnerOut, PARTNER_BOW) EVT_IF_NE(LVar6, PARTNER_BOW) @@ -319,7 +319,7 @@ EvtScript N(EVS_Scene_UnlockGate) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_IF - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBow_Talk, ANIM_WorldBow_Idle, SPEECH_FACE_SPEAKER_ONLY, MSG_CH3_006C) EVT_CALL(EnablePartnerAI) @@ -327,57 +327,57 @@ EvtScript N(EVS_Scene_UnlockGate) = { EVT_CALL(SetNpcPos, NPC_GateBoo_02, -45, 65, -66) EVT_CALL(PlaySoundAtNpc, NPC_GateBoo_01, SOUND_BOO_VANISH, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(0.0)) - EVT_LOOP(20) - EVT_ADDF(LVar0, EVT_FLOAT(12.0)) + EVT_LOOP(20 * DT) + EVT_ADDF(LVar0, EVT_FLOAT(240.0 / (s32)(20 * DT))) EVT_CALL(func_802CFD30, NPC_GateBoo_01, FOLD_TYPE_7, LVar0, 0, 0, 0) EVT_CALL(func_802CFD30, NPC_GateBoo_02, FOLD_TYPE_7, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_EXEC_WAIT(N(EVS_FlyDownToGate)) EVT_EXEC(N(EVS_FadeToGustyShading)) EVT_SET(LVar2, 1) EVT_EXEC(N(EVS_OpenGate)) EVT_EXEC_WAIT(N(EVS_HaveBoosOpenGate)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD - EVT_CALL(PlayerMoveTo, 25, 0, 60) + EVT_CALL(PlayerMoveTo, 25, 0, 60 * DT) EVT_END_THREAD - EVT_WAIT(3) + EVT_WAIT(3 * DT) EVT_CALL(GetCurrentPartnerID, LVar6) EVT_IF_NE(LVar6, PARTNER_BOW) - EVT_CALL(NpcMoveTo, NPC_PARTNER, -38, 23, 60) + EVT_CALL(NpcMoveTo, NPC_PARTNER, -38, 23, 60 * DT) EVT_ELSE - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_END_IF EVT_SET(LVar2, 1) EVT_EXEC(N(EVS_CloseGate)) EVT_EXEC_WAIT(N(EVS_StartGustyMusic)) EVT_EXEC_WAIT(N(EVS_HaveBoosCloseGate)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PlaySoundAtNpc, NPC_GateBoo_01, SOUND_BOO_APPEAR, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(240.0)) - EVT_LOOP(20) - EVT_SUBF(LVar0, EVT_FLOAT(12.0)) + EVT_LOOP(20 * DT) + EVT_SUBF(LVar0, EVT_FLOAT(240.0 / (s32)(20 * DT))) EVT_CALL(func_802CFD30, NPC_GateBoo_01, FOLD_TYPE_7, LVar0, 0, 0, 0) EVT_CALL(func_802CFD30, NPC_GateBoo_02, FOLD_TYPE_7, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetNpcPos, NPC_GateBoo_01, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcPos, NPC_GateBoo_02, NPC_DISPOSE_LOCATION) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBow_Talk, ANIM_WorldBow_Idle, 0, MSG_CH3_006D) EVT_CALL(EnablePartnerAI) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Jump) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.5)) - EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 14) + EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 14 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Land) EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_SET(GB_StoryProgress, STORY_CH3_UNLOCKED_GUSTY_GULCH) EVT_CALL(PutPartnerAway) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_nok/nok_01/nok_01_2_main.c b/src/world/area_nok/nok_01/nok_01_2_main.c index a0175f97ad..43ab9efd69 100644 --- a/src/world/area_nok/nok_01/nok_01_2_main.c +++ b/src/world/area_nok/nok_01/nok_01_2_main.c @@ -87,6 +87,10 @@ EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_KOOPA_VILLAGE) EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_SETUP_CAMERA_NO_LEAD() +#if VERSION_PAL + EVT_CALL(GetLanguage, LocalVar(0)) + EVT_CALL(SetModelTexVariant, MODEL_o340, LocalVar(0)) +#endif EVT_SET(GF_MAP_KoopaVillage, TRUE) EVT_SET(AF_NOK01_Dialogue_RelaxedKoopa, FALSE) EVT_SET(AF_NOK01_Dialogue_Bobomb_01_Crisis, FALSE) diff --git a/src/world/area_nok/nok_02/nok_02_6_npc.c b/src/world/area_nok/nok_02/nok_02_6_npc.c index 067a4baedf..bbfd7993bf 100644 --- a/src/world/area_nok/nok_02/nok_02_6_npc.c +++ b/src/world/area_nok/nok_02/nok_02_6_npc.c @@ -60,11 +60,16 @@ EvtScript N(EVS_NpcInteract_Kooper) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 0, -180) EVT_CALL(SetCamDistance, CAM_DEFAULT, 375) EVT_CALL(SetCamPitch, CAM_DEFAULT, 17, EVT_FLOAT(-5.5)) + +#if VERSION_PAL + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4 / DT)) +#else EVT_CALL(SetCamSpeed, CAM_DEFAULT, 4) +#endif EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(SetGroupVisibility, MODEL_g111, MODEL_GROUP_VISIBLE) EVT_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PlaySoundAt, SOUND_BASIC_DOOR_OPEN, 0, 0, 0, -180) EVT_CALL(MakeLerp, 0, 90, 15, EASING_COS_FAST_OVERSHOOT) EVT_LABEL(10) @@ -76,28 +81,28 @@ EvtScript N(EVS_NpcInteract_Kooper) = { EVT_END_IF EVT_END_THREAD EVT_THREAD - EVT_CALL(PlayerMoveTo, -25, -130, 10) + EVT_CALL(PlayerMoveTo, -25, -130, 10 * DT) EVT_CALL(PlayerFaceNpc, NPC_Kooper, FALSE) EVT_END_THREAD EVT_THREAD EVT_CALL(N(SwitchToPartner), 1) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(NpcMoveTo, NPC_PARTNER, -55, -130, 15) + EVT_CALL(NpcMoveTo, NPC_PARTNER, -55, -130, 15 * DT) EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Kooper, 0) EVT_CALL(EnablePartnerAI) EVT_END_THREAD EVT_CALL(SetNpcFlagBits, NPC_Kooper, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcPos, NPC_Kooper, 0, 0, -207) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_KooperWithoutShell_Idle) - EVT_WAIT(35) + EVT_WAIT(35 * DT) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_KooperWithoutShell_Run) EVT_THREAD - EVT_LOOP(30) + EVT_LOOP(30 * DT) EVT_CALL(PlayerFaceNpc, NPC_Kooper, FALSE) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(NpcMoveTo, NPC_Kooper, 0, -148, 20) + EVT_CALL(NpcMoveTo, NPC_Kooper, 0, -148, 20 * DT) EVT_THREAD EVT_CALL(MakeLerp, 90, 0, 30, EASING_COS_IN_OUT) EVT_LABEL(20) @@ -110,44 +115,56 @@ EvtScript N(EVS_NpcInteract_Kooper) = { EVT_CALL(PlaySoundAt, SOUND_BASIC_DOOR_CLOSE, 0, 0, 0, -180) EVT_CALL(SetGroupVisibility, MODEL_g111, MODEL_GROUP_HIDDEN) EVT_END_THREAD - EVT_CALL(NpcMoveTo, NPC_Kooper, 25, -130, 10) + EVT_CALL(NpcMoveTo, NPC_Kooper, 25, -130, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_KooperWithoutShell_Idle) EVT_CALL(NpcFacePlayer, NPC_Kooper, 0) EVT_CALL(SetNpcFlagBits, NPC_Kooper, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Kooper, ANIM_KooperWithoutShell_Celebrate, ANIM_KooperWithoutShell_Idle, 0, MSG_CH1_00B5) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(EndSpeech, NPC_Kooper, ANIM_KooperWithoutShell_Talk, ANIM_KooperWithoutShell_Idle, 0) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_KooperWithoutShell_Celebrate) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_KooperWithoutShell_Idle) EVT_CALL(EndSpeech, NPC_Kooper, ANIM_KooperWithoutShell_Talk, ANIM_KooperWithoutShell_Idle, 0) +#if VERSION_PAL + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(6 / DT), 30, EVT_FLOAT(225.0), EVT_FLOAT(17.0), EVT_FLOAT(-8.5)) +#else EVT_CALL(AdjustCam, CAM_DEFAULT, 6, 30, EVT_FLOAT(225.0), EVT_FLOAT(17.0), EVT_FLOAT(-8.5)) - EVT_WAIT(5) +#endif + EVT_WAIT(5 * DT) EVT_CALL(SpeakToPlayer, NPC_Kooper, ANIM_KooperWithoutShell_Talk, ANIM_KooperWithoutShell_Idle, 0, MSG_CH1_00B6) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_KooperWithoutShell_Bow) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_KooperWithoutShell_Idle) EVT_CALL(EndSpeech, NPC_Kooper, ANIM_KooperWithoutShell_Talk, ANIM_KooperWithoutShell_Idle, 0) +#if VERSION_PAL + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4 / DT), -30, EVT_FLOAT(225.0), EVT_FLOAT(17.0), EVT_FLOAT(-8.5)) +#else EVT_CALL(AdjustCam, CAM_DEFAULT, 4, -30, EVT_FLOAT(225.0), EVT_FLOAT(17.0), EVT_FLOAT(-8.5)) - EVT_WAIT(10) +#endif + EVT_WAIT(10 * DT) EVT_THREAD - EVT_WAIT(3) + EVT_WAIT(3 * DT) EVT_CALL(PlayerFaceNpc, NPC_PARTNER, FALSE) EVT_END_THREAD EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH1_00B7) EVT_CALL(EnablePartnerAI) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 0, EVT_FLOAT(375.0), EVT_FLOAT(17.0), EVT_FLOAT(-5.5)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PlayerFaceNpc, NPC_Kooper, FALSE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Kooper, ANIM_KooperWithoutShell_Talk, ANIM_KooperWithoutShell_Idle, 0, MSG_CH1_00B8) EVT_CALL(BindNpcInteract, NPC_Kooper, EVT_PTR(N(EVS_NpcInteract_Kooper))) EVT_THREAD - EVT_CALL(ResetCam, CAM_DEFAULT, 3) +#if VERSION_PAL + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0 / DT)) +#else + EVT_CALL(ResetCam, CAM_DEFAULT, 3) +#endif EVT_END_THREAD EVT_RETURN EVT_END_IF @@ -184,12 +201,12 @@ EvtScript N(EVS_FuzzyBoss_PlayerEntersKoopersHouse) = { EVT_LABEL(10) EVT_THREAD EVT_CALL(SetNpcJumpscale, NPC_KoopersShell, 2) - EVT_CALL(NpcJump0, NPC_KoopersShell, LVarD, 0, LVarC, 12) + EVT_CALL(NpcJump0, NPC_KoopersShell, LVarD, 0, LVarC, 12 * DT) EVT_END_THREAD EVT_WAIT(1) EVT_CALL(SetNpcJumpscale, NPC_FuzzyBoss, 2) EVT_CALL(PlaySoundAtNpc, NPC_FuzzyBoss, SOUND_331, 0) - EVT_CALL(NpcJump0, NPC_FuzzyBoss, LVarA, 0, LVarC, 12) + EVT_CALL(NpcJump0, NPC_FuzzyBoss, LVarA, 0, LVarC, 12 * DT) EVT_CALL(IsPlayerWithin, 0, -400, 130, LVar0) EVT_IF_EQ(LVar0, 0) EVT_GOTO(10) @@ -198,7 +215,7 @@ EvtScript N(EVS_FuzzyBoss_PlayerEntersKoopersHouse) = { EVT_SET(LVarB, 0) EVT_SET(LVarC, 0) EVT_SET(LVarD, -514) - EVT_SET(LVarE, 15) + EVT_SET(LVarE, 15 * DT) EVT_THREAD EVT_CALL(SetNpcJumpscale, NPC_KoopersShell, 2) EVT_CALL(NpcJump0, NPC_KoopersShell, LVarB, LVarC, LVarD, LVarE) diff --git a/src/world/area_nok/nok_03/nok_03_4_npc.c b/src/world/area_nok/nok_03/nok_03_4_npc.c index 5814b8e0b8..4a37afe818 100644 --- a/src/world/area_nok/nok_03/nok_03_4_npc.c +++ b/src/world/area_nok/nok_03/nok_03_4_npc.c @@ -21,7 +21,7 @@ EvtScript N(EVS_NpcIdle_FuzzyBoss) = { EVT_IF_LT(LVar6, 100) EVT_ADD(LVar3, 100) EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_Fuzzy_03, LVar3, LVar4, LVar5, 10) + EVT_CALL(NpcJump0, NPC_Fuzzy_03, LVar3, LVar4, LVar5, 10 * DT) EVT_SET(GB_StoryProgress, STORY_CH1_FUZZY_THIEF_RAN_AWAY) EVT_END_IF EVT_IF_GT(LVar3, 1200) diff --git a/src/world/area_nok/nok_04/nok_04_4_npc.c b/src/world/area_nok/nok_04/nok_04_4_npc.c index 0e94cd0cd2..8d6e98b814 100644 --- a/src/world/area_nok/nok_04/nok_04_4_npc.c +++ b/src/world/area_nok/nok_04/nok_04_4_npc.c @@ -353,9 +353,13 @@ EvtScript N(EVS_Scene_ShuffleFuzzyPositions) = { EVT_CALL(SetCamPosB, CAM_DEFAULT, 0, 0) EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, 90, 0, 228) +#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_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(SetNpcJumpscale, NPC_BossFuzzy, 3) EVT_CALL(SetNpcJumpscale, NPC_KoopersShell, 3) @@ -536,7 +540,11 @@ EvtScript N(EVS_Scene_ShuffleFuzzyPositions) = { EVT_WAIT(30) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) +#if VERSION_PAL + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3 / DT)) +#else EVT_CALL(SetCamSpeed, CAM_DEFAULT, 3) +#endif EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN @@ -548,7 +556,7 @@ EvtScript N(EVS_FuzzyBoss_TauntFromTree) = { EVT_IF_EQ(LocalFlag(0), FALSE) EVT_CALL(DisablePlayerInput, TRUE) EVT_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_END_THREAD EVT_END_IF @@ -571,8 +579,8 @@ EvtScript N(EVS_FuzzyBoss_TauntFromTree) = { EVT_END_IF EVT_CALL(SpeakToPlayer, NPC_BossFuzzy, ANIM_Fuzzy_Anim0C, ANIM_Fuzzy_Idle, 5, LVar0) EVT_CALL(SetMusicTrack, 0, SONG_PLAYROOM, 0, 8) - EVT_CALL(N(SetThreadTargetLengthAngle), 0, 0, 30) - EVT_WAIT(30) + EVT_CALL(N(SetThreadTargetLengthAngle), 0, 0, 30 * DT) + EVT_WAIT(30 * DT) EVT_CALL(SetModelFlags, MODEL_o177, MODEL_FLAG_USES_CUSTOM_GFX, FALSE) EVT_CALL(N(AttachThreadFrontNpc), NULL) EVT_CALL(N(AttachThreadBackNpc), NULL) @@ -600,47 +608,51 @@ EvtScript N(EVS_Scene_HideInTree) = { EVT_END_SWITCH EVT_CALL(DisablePlayerInput, TRUE) EVT_THREAD - EVT_WAIT(17) + EVT_WAIT(17 * DT) EVT_CALL(DisablePlayerPhysics, TRUE) +#if VERSION_PAL + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4 / DT)) +#else EVT_CALL(SetPlayerSpeed, 4) +#endif EVT_CALL(PlayerMoveTo, -300, 325, 0) EVT_END_THREAD - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetNpcJumpscale, NPC_BossFuzzy, EVT_FLOAT(0.703)) EVT_CALL(SetNpcJumpscale, NPC_KoopersShell, EVT_FLOAT(0.703)) EVT_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_SET(LVarA, 58) EVT_SET(LVarB, 0) EVT_SET(LVarC, 227) - EVT_SET(LVarD, 80) + EVT_SET(LVarD, 80 * DT) EVT_EXEC(N(EVS_MoveCam_TrackBoss)) EVT_END_THREAD EVT_SET(LVarA, -260) EVT_SET(LVarB, 0) EVT_SET(LVarC, 290) - EVT_SET(LVarD, 20) + EVT_SET(LVarD, 20 * DT) EVT_EXEC(N(EVS_BossJumpTo)) EVT_WAIT(1) EVT_CALL(NpcJump0, NPC_KoopersShell, LVarA, 0, 293, LVarD) EVT_SET(LVarA, -180) EVT_SET(LVarB, 0) EVT_SET(LVarC, 245) - EVT_SET(LVarD, 15) + EVT_SET(LVarD, 15 * DT) EVT_EXEC(N(EVS_BossJumpTo)) EVT_WAIT(1) EVT_CALL(NpcJump0, NPC_KoopersShell, LVarA, LVarB, 248, LVarD) EVT_SET(LVarA, -100) EVT_SET(LVarB, 0) EVT_SET(LVarC, 235) - EVT_SET(LVarD, 15) + EVT_SET(LVarD, 15 * DT) EVT_EXEC(N(EVS_BossJumpTo)) EVT_WAIT(1) EVT_CALL(NpcJump0, NPC_KoopersShell, LVarA, LVarB, 238, LVarD) EVT_SET(LVarA, 85) EVT_SET(LVarB, 0) EVT_SET(LVarC, 217) - EVT_SET(LVarD, 30) + EVT_SET(LVarD, 30 * DT) EVT_EXEC(N(EVS_BossJumpTo)) EVT_WAIT(1) EVT_CALL(NpcJump0, NPC_KoopersShell, LVarA, LVarB, 220, LVarD) @@ -648,7 +660,7 @@ EvtScript N(EVS_Scene_HideInTree) = { EVT_SET(LVarA, LVar0) EVT_SET(LVarB, LVar1) EVT_SET(LVarC, LVar3) - EVT_SET(LVarD, 30) + EVT_SET(LVarD, 30 * DT) EVT_EXEC(N(EVS_BossJumpTo)) EVT_WAIT(1) EVT_ADD(LVarC, 3) @@ -658,7 +670,7 @@ EvtScript N(EVS_Scene_HideInTree) = { EVT_CALL(N(AnimateTreeBranch), 2, 0) EVT_CALL(PlaySound, SOUND_SHAKE_TREE) EVT_CALL(SetPlayerPos, -152, 0, 235) - EVT_CALL(PlayerMoveTo, 58, 227, 60) + EVT_CALL(PlayerMoveTo, 58, 227, 60 * DT) EVT_SET(LocalFlag(0), TRUE) EVT_EXEC(N(EVS_FuzzyBoss_TauntFromTree)) EVT_RETURN @@ -869,17 +881,21 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_CALL(GetCamDistance, CAM_DEFAULT, LVarA) EVT_MULF(LVarA, EVT_FLOAT(0.703125)) EVT_CALL(SetCamDistance, CAM_DEFAULT, LVarA) +#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_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(PlayerMoveTo, -205, 267, 40) EVT_CALL(PlayerFaceNpc, NPC_Kooper, FALSE) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_KooperWithoutShell_RunAngry) EVT_CALL(NpcMoveTo, NPC_Kooper, -246, 290, 30) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_KooperWithoutShell_IdleAngry) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_Kooper, ANIM_KooperWithoutShell_TalkAngry, ANIM_KooperWithoutShell_IdleAngry, 0, MSG_CH1_00C3) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Kooper, 0) @@ -901,16 +917,16 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_KooperWithoutShell_Idle) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_Kooper, ANIM_KooperWithoutShell_Talk, ANIM_KooperWithoutShell_Idle, 0, MSG_CH1_00C7) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_KooperWithoutShell_Celebrate) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_KooperWithoutShell_Idle) EVT_CALL(EndSpeech, NPC_Kooper, ANIM_KooperWithoutShell_Talk, ANIM_KooperWithoutShell_Idle, 0) EVT_CALL(PlayerFaceNpc, NPC_Kooper, FALSE) EVT_CALL(NpcFacePlayer, NPC_Kooper, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_KooperWithoutShell_Still) EVT_CALL(EnableNpcBlur, NPC_KoopersShell, TRUE) @@ -922,31 +938,31 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_SET(LVar4, 6) EVT_EXEC(N(EVS_GetIntoShell)) EVT_CALL(InterpNpcYaw, LVar3, 60, 0) - EVT_CALL(NpcJump0, NPC_KoopersShell, LVar0, LVar1, LVar2, 30) + EVT_CALL(NpcJump0, NPC_KoopersShell, LVar0, LVar1, LVar2, 30 * DT) EVT_CALL(SetNpcPos, NPC_KoopersShell, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcSprite, NPC_Kooper, ANIM_WorldKooper_Idle) EVT_CALL(SetNpcFlagBits, NPC_Kooper, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcSprite, NPC_Kooper, ANIM_WorldKooper_Still) - EVT_WAIT(4) + EVT_WAIT(4 * DT) EVT_CALL(EnableNpcBlur, NPC_KoopersShell, TRUE) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_WorldKooper_Idle) EVT_CALL(SetNpcSprite, NPC_Kooper, ANIM_WorldKooper_Celebrate) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_WorldKooper_Idle) EVT_CALL(SpeakToNpc, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, NPC_Kooper, MSG_CH1_00C8) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_Kooper, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH1_00C9) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 50, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH1_00CA) EVT_CALL(SpeakToPlayer, NPC_Kooper, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH1_00CB) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToNpc, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, NPC_Kooper, MSG_CH1_00CC) EVT_CALL(EnablePartnerAI) EVT_CALL(PlayerFaceNpc, NPC_Kooper, FALSE) @@ -962,7 +978,7 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_CALL(EndSpeech, NPC_Kooper, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0) EVT_CALL(SpeakToPlayer, NPC_Kooper, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH1_00CE) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_WorldKooper_Celebrate) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_WorldKooper_Idle) EVT_CALL(EndSpeech, NPC_Kooper, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0) EVT_SET(GB_StoryProgress, STORY_CH1_KOOPER_JOINED_PARTY) @@ -970,13 +986,17 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_CALL(N(ChangeNpcToPartner), NPC_Kooper, PARTNER_KOOPER) EVT_CALL(N(LoadPartyImage)) EVT_EXEC(N(EVS_PushPartnerSong)) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_018A, 160, 40) EVT_EXEC(N(EVS_PopSong)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(EnablePartnerAI) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) +#if VERSION_PAL + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3 / DT)) +#else EVT_CALL(SetCamSpeed, CAM_DEFAULT, 3) +#endif EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(AwaitPlayerApproach, -400, 400, 100) EVT_CALL(DisablePlayerInput, TRUE) @@ -984,9 +1004,13 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -100, 0, 225) EVT_CALL(SetPanTarget, CAM_DEFAULT, -100, 0, 225) EVT_CALL(SetCamDistance, CAM_DEFAULT, -250) +#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_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_BossFuzzy, ANIM_Fuzzy_Walk) EVT_CALL(SetNpcPos, NPC_BossFuzzy, 63, 0, 212) EVT_CALL(EnableNpcShadow, NPC_BossFuzzy, TRUE) @@ -1004,26 +1028,26 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_LABEL(30) EVT_CALL(SetNpcJumpscale, NPC_BossFuzzy, EVT_FLOAT(2.0)) EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 12) + EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 12 * DT) EVT_IF_EQ(AF_NOK04_TauntMsgDone, FALSE) EVT_GOTO(30) EVT_END_IF EVT_THREAD - EVT_WAIT(27) + EVT_WAIT(27 * DT) EVT_CALL(BindNpcDefeat, NPC_BossFuzzy, EVT_PTR(N(EVS_NpcDefeat_FuzzyBoss))) EVT_CALL(BindNpcAI, NPC_BossFuzzy, EVT_PTR(N(EVS_NpcAI_StartBossBattle))) EVT_END_THREAD EVT_THREAD EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_BossFuzzy, -212, 0, 237, 15) + EVT_CALL(NpcJump0, NPC_BossFuzzy, -212, 0, 237, 15 * DT) EVT_CALL(GetPlayerPos, LVarA, LVarB, LVarC) EVT_ADD(LVarB, 37) EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 20) + EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 20 * DT) EVT_WAIT(2) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicHoverStill) EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 15) + EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 15 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_LABEL(21) EVT_IF_EQ(AF_NOK04_BattleDone, FALSE) @@ -1035,36 +1059,40 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_LABEL(31) EVT_CALL(SetNpcJumpscale, NPC_BossFuzzy, EVT_FLOAT(2.0)) EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 15) + EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 15 * DT) EVT_IF_EQ(AF_NOK04_FleeMsgDone, FALSE) EVT_GOTO(31) EVT_END_IF EVT_ADD(LVarA, 70) EVT_ADD(LVarC, -30) EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 15) + EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 15 * DT) EVT_ADD(LVarA, 70) EVT_ADD(LVarC, -30) EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 20) + EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 20 * DT) EVT_CALL(EnableNpcShadow, NPC_BossFuzzy, FALSE) EVT_CALL(SetNpcPos, NPC_BossFuzzy, NPC_DISPOSE_LOCATION) EVT_END_THREAD EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -260, 0, 284) EVT_CALL(SetPanTarget, CAM_DEFAULT, -260, 0, 284) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) +#if VERSION_PAL + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2 / DT)) +#else EVT_CALL(SetCamSpeed, CAM_DEFAULT, 2) +#endif EVT_THREAD - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetNpcPos, NPC_Fuzzy_01, 63, 0, 212) EVT_CALL(EnableNpcShadow, NPC_Fuzzy_01, TRUE) EVT_CALL(SetNpcJumpscale, NPC_Fuzzy_01, EVT_FLOAT(2.0)) EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_01, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_Fuzzy_01, -100, 0, 225, 10) + EVT_CALL(NpcJump0, NPC_Fuzzy_01, -100, 0, 225, 10 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_01, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_Fuzzy_01, -197, 0, 227, 20) + EVT_CALL(NpcJump0, NPC_Fuzzy_01, -197, 0, 227, 20 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_01, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_Fuzzy_01, -233, 0, 285, 10) + EVT_CALL(NpcJump0, NPC_Fuzzy_01, -233, 0, 285, 10 * DT) EVT_LABEL(22) EVT_IF_EQ(AF_NOK04_BattleDone, FALSE) EVT_WAIT(1) @@ -1075,32 +1103,32 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_LABEL(32) EVT_CALL(SetNpcJumpscale, NPC_Fuzzy_01, EVT_FLOAT(2.0)) EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_01, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_Fuzzy_01, LVarA, LVarB, LVarC, 12) + EVT_CALL(NpcJump0, NPC_Fuzzy_01, LVarA, LVarB, LVarC, 12 * DT) EVT_IF_EQ(AF_NOK04_FleeMsgDone, FALSE) EVT_GOTO(32) EVT_END_IF EVT_ADD(LVarA, 70) EVT_ADD(LVarC, -30) EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_01, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_Fuzzy_01, LVarA, LVarB, LVarC, 10) + EVT_CALL(NpcJump0, NPC_Fuzzy_01, LVarA, LVarB, LVarC, 10 * DT) EVT_ADD(LVarA, 70) EVT_ADD(LVarC, -30) EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_01, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_Fuzzy_01, LVarA, LVarB, LVarC, 20) + EVT_CALL(NpcJump0, NPC_Fuzzy_01, LVarA, LVarB, LVarC, 20 * DT) EVT_CALL(EnableNpcShadow, NPC_Fuzzy_01, FALSE) EVT_CALL(SetNpcPos, NPC_Fuzzy_01, NPC_DISPOSE_LOCATION) EVT_END_THREAD EVT_THREAD - EVT_WAIT(7) + EVT_WAIT(7 * DT) EVT_CALL(SetNpcPos, NPC_Fuzzy_02, 63, 0, 212) EVT_CALL(EnableNpcShadow, NPC_Fuzzy_02, TRUE) EVT_CALL(SetNpcJumpscale, NPC_Fuzzy_02, EVT_FLOAT(2.0)) EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_02, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_Fuzzy_02, -122, 0, 219, 20) + EVT_CALL(NpcJump0, NPC_Fuzzy_02, -122, 0, 219, 20 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_02, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_Fuzzy_02, -177, 0, 242, 10) + EVT_CALL(NpcJump0, NPC_Fuzzy_02, -177, 0, 242, 10 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_02, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_Fuzzy_02, -213, 0, 300, 15) + EVT_CALL(NpcJump0, NPC_Fuzzy_02, -213, 0, 300, 15 * DT) EVT_LABEL(23) EVT_IF_EQ(AF_NOK04_BattleDone, FALSE) EVT_WAIT(1) @@ -1112,32 +1140,32 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_LABEL(33) EVT_CALL(SetNpcJumpscale, NPC_Fuzzy_02, EVT_FLOAT(2.0)) EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_02, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_Fuzzy_02, LVarA, LVarB, LVarC, 12) + EVT_CALL(NpcJump0, NPC_Fuzzy_02, LVarA, LVarB, LVarC, 12 * DT) EVT_IF_EQ(AF_NOK04_FleeMsgDone, FALSE) EVT_GOTO(33) EVT_END_IF EVT_ADD(LVarA, 70) EVT_ADD(LVarC, -30) EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_02, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_Fuzzy_02, LVarA, LVarB, LVarC, 20) + EVT_CALL(NpcJump0, NPC_Fuzzy_02, LVarA, LVarB, LVarC, 20 * DT) EVT_ADD(LVarA, 70) EVT_ADD(LVarC, -30) EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_02, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_Fuzzy_02, LVarA, LVarB, LVarC, 15) + EVT_CALL(NpcJump0, NPC_Fuzzy_02, LVarA, LVarB, LVarC, 15 * DT) EVT_CALL(EnableNpcShadow, NPC_Fuzzy_02, FALSE) EVT_CALL(SetNpcPos, NPC_Fuzzy_02, NPC_DISPOSE_LOCATION) EVT_END_THREAD EVT_THREAD - EVT_WAIT(8) + EVT_WAIT(8 * DT) EVT_CALL(SetNpcPos, NPC_Fuzzy_03, 63, 0, 212) EVT_CALL(EnableNpcShadow, NPC_Fuzzy_03, TRUE) EVT_CALL(SetNpcJumpscale, NPC_Fuzzy_03, EVT_FLOAT(2.0)) EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_Fuzzy_03, -100, 0, 269, 20) + EVT_CALL(NpcJump0, NPC_Fuzzy_03, -100, 0, 269, 20 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_Fuzzy_03, -217, 0, 212, 10) + EVT_CALL(NpcJump0, NPC_Fuzzy_03, -217, 0, 212, 10 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_Fuzzy_03, -253, 0, 270, 10) + EVT_CALL(NpcJump0, NPC_Fuzzy_03, -253, 0, 270, 10 * DT) EVT_LABEL(24) EVT_IF_EQ(AF_NOK04_BattleDone, FALSE) EVT_WAIT(1) @@ -1145,22 +1173,22 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_END_IF EVT_CALL(SetNpcPos, NPC_Fuzzy_03, -183, 0, 257) EVT_CALL(GetNpcPos, NPC_Fuzzy_03, LVarA, LVarB, LVarC) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_LABEL(34) EVT_CALL(SetNpcJumpscale, NPC_Fuzzy_03, EVT_FLOAT(2.0)) EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_Fuzzy_03, LVarA, LVarB, LVarC, 12) + EVT_CALL(NpcJump0, NPC_Fuzzy_03, LVarA, LVarB, LVarC, 12 * DT) EVT_IF_EQ(AF_NOK04_FleeMsgDone, FALSE) EVT_GOTO(34) EVT_END_IF EVT_ADD(LVarA, 70) EVT_ADD(LVarC, -30) EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_Fuzzy_03, LVarA, LVarB, LVarC, 15) + EVT_CALL(NpcJump0, NPC_Fuzzy_03, LVarA, LVarB, LVarC, 15 * DT) EVT_ADD(LVarA, 70) EVT_ADD(LVarC, -30) EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_B0000017, 0) - EVT_CALL(NpcJump0, NPC_Fuzzy_03, LVarA, LVarB, LVarC, 20) + EVT_CALL(NpcJump0, NPC_Fuzzy_03, LVarA, LVarB, LVarC, 20 * DT) EVT_CALL(EnableNpcShadow, NPC_Fuzzy_03, FALSE) EVT_CALL(SetNpcPos, NPC_Fuzzy_03, NPC_DISPOSE_LOCATION) EVT_END_THREAD @@ -1179,10 +1207,10 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, -260, 0, 284) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_SET(AF_NOK04_CamPanDone, TRUE) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END @@ -1298,15 +1326,15 @@ EvtScript N(EVS_HitTree_Correct) = { EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_BossFuzzy, ANIM_Fuzzy_Anim09) EVT_CALL(SpeakToPlayer, NPC_BossFuzzy, ANIM_Fuzzy_Anim0C, ANIM_Fuzzy_Idle, 5, MSG_CH1_00C1) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(N(AttachThreadFrontNpc), NULL) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 40) EVT_CALL(SetNpcJumpscale, NPC_KoopersShell, EVT_FLOAT(0.6)) - EVT_CALL(NpcJump0, NPC_KoopersShell, LVar0, LVar1, LVar2, 10) + EVT_CALL(NpcJump0, NPC_KoopersShell, LVar0, LVar1, LVar2, 10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_GetItem) EVT_THREAD - EVT_WAIT(4) + EVT_WAIT(4 * DT) EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) EVT_ADD(LVar4, 50) EVT_ADD(LVar5, 2) @@ -1320,11 +1348,11 @@ EvtScript N(EVS_HitTree_Correct) = { EVT_CALL(SetNpcPos, NPC_KoopersShell, NPC_DISPOSE_LOCATION) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(AddKeyItem, ITEM_KOOPER_SHELL) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_BossFuzzy, ANIM_Fuzzy_Anim0C, ANIM_Fuzzy_Idle, 5, MSG_CH1_00C2) EVT_CALL(SetNpcAnimation, NPC_BossFuzzy, ANIM_Fuzzy_Anim0B) - EVT_CALL(N(SetThreadTargetLengthAngle), 0, 0, 20) - EVT_WAIT(20) + EVT_CALL(N(SetThreadTargetLengthAngle), 0, 0, 20 * DT) + EVT_WAIT(20 * DT) EVT_CALL(SetModelFlags, MODEL_o177, MODEL_FLAG_USES_CUSTOM_GFX, FALSE) EVT_CALL(N(AttachThreadBackNpc), 0) EVT_CALL(SetNpcPos, NPC_BossFuzzy, NPC_DISPOSE_LOCATION) @@ -1336,7 +1364,11 @@ EvtScript N(EVS_HitTree_Correct) = { EVT_EXEC(N(EVS_Scene_KooperArrives)) EVT_END_SWITCH EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) +#if VERSION_PAL + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3 / DT)) +#else EVT_CALL(SetCamSpeed, CAM_DEFAULT, 3) +#endif EVT_RETURN EVT_END }; diff --git a/src/world/area_nok/nok_11/nok_11_4_npc.c b/src/world/area_nok/nok_11/nok_11_4_npc.c index f5aec6121a..7e6be7ade4 100644 --- a/src/world/area_nok/nok_11/nok_11_4_npc.c +++ b/src/world/area_nok/nok_11/nok_11_4_npc.c @@ -43,63 +43,63 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { EVT_END_CHILD_THREAD EVT_EXEC(N(EVS_PlayJrTroopaSong)) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_Talk, ANIM_JrTroopa_Idle, 5, MSG_CH1_011E) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(90.0), -190, 0, -40, 200, EVT_FLOAT(15.0), EVT_FLOAT(-8.5)) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_SET(LVar0, EVT_PTR(N(SearchBush_Scene))) EVT_EXEC(N(EVS_SearchBush)) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) - EVT_CALL(NpcJump0, NPC_SELF, -230, 0, -157, 15) + EVT_CALL(NpcJump0, NPC_SELF, -230, 0, -157, 15 * DT) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_PointTalk, ANIM_JrTroopa_PointTapFoot, 0, MSG_CH1_011F) - EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(4.0), -140, 0, -40, 400, EVT_FLOAT(15.0), EVT_FLOAT(-5.0)) + EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(4.0 / DT), -140, 0, -40, 400, EVT_FLOAT(15.0), EVT_FLOAT(-5.0)) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Charge) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Trip) EVT_CALL(ShowMessageAtScreenPos, MSG_CH1_0120, 160, 40) EVT_END_THREAD EVT_THREAD EVT_END_THREAD EVT_THREAD - EVT_WAIT(10) - EVT_LOOP(10) + EVT_WAIT(10 * DT) + EVT_LOOP(10 * DT) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, LVar0, LVar1, LVar2, 0, 0) EVT_WAIT(2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(NpcMoveTo, NPC_SELF, -201, -67, 10) + EVT_CALL(NpcMoveTo, NPC_SELF, -201, -67, 10 * DT) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) - EVT_CALL(NpcJump1, NPC_SELF, -191, 0, -32, 5) + EVT_CALL(NpcJump1, NPC_SELF, -191, 0, -32, 5 * DT) EVT_EXEC_GET_TID(N(EVS_JrTroopa_RunFX), LVarA) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_167, SOUND_SPACE_MODE_0) - EVT_CALL(NpcMoveTo, NPC_SELF, -165, 50, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, -165, 50, 15 * DT) EVT_KILL_THREAD(LVarA) EVT_CALL(StopSound, SOUND_167) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_FallHeadfirstBack) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_THREAD - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20AD, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_PLAY_EFFECT(EFFECT_WATER_SPLASH, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.7), 30) EVT_ADD(LVar0, 10) EVT_PLAY_EFFECT(EFFECT_WATER_SPLASH, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.7), 30) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 25) EVT_PLAY_EFFECT(EFFECT_WATER_SPLASH, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.7), 30) EVT_ADD(LVar0, 10) EVT_PLAY_EFFECT(EFFECT_WATER_SPLASH, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.7), 30) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, -15) EVT_PLAY_EFFECT(EFFECT_WATER_SPLASH, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.7), 30) @@ -108,20 +108,20 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { EVT_END_THREAD EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_301, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.5)) - EVT_CALL(NpcJump0, NPC_SELF, -165, -90, 50, 20) - EVT_WAIT(30) + EVT_CALL(NpcJump0, NPC_SELF, -165, -90, 50, 20 * DT) + EVT_WAIT(30 * DT) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_74, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_ScamperBack) EVT_CALL(SetNpcYaw, NPC_SELF, 270) EVT_THREAD - EVT_WAIT(85) + EVT_WAIT(85 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_ClimbUpBack) EVT_END_THREAD EVT_CALL(SetNpcJumpscale, NPC_SELF, 0) - EVT_CALL(NpcJump0, NPC_SELF, -165, 0, 50, 90) - EVT_WAIT(30) + EVT_CALL(NpcJump0, NPC_SELF, -165, 0, 50, 90 * DT) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Charge) - EVT_CALL(NpcMoveTo, NPC_SELF, -190, -45, 10) + EVT_CALL(NpcMoveTo, NPC_SELF, -190, -45, 10 * DT) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_PointTapFoot) EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(90.0), -140, 0, -40, 250, EVT_FLOAT(15.0), EVT_FLOAT(-8.5)) @@ -139,13 +139,13 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { EVT_CALL(EnablePartnerAI) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_PointTalk, ANIM_JrTroopa_PointTapFoot, 0, MSG_CH1_0125) EVT_CALL(ShowChoice, MSG_Choice_0013) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_IF_EQ(LVar0, 0) EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_JrTroopa_PointTalk, ANIM_JrTroopa_PointTapFoot, 0, MSG_CH1_0126) EVT_ELSE EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_JrTroopa_PointTalk, ANIM_JrTroopa_PointTapFoot, 0, MSG_CH1_0127) EVT_END_IF - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(StartBossBattle, SONG_JR_TROOPA_BATTLE) EVT_RETURN EVT_END diff --git a/src/world/area_obk/obk_01/obk_01_4_portrait.c b/src/world/area_obk/obk_01/obk_01_4_portrait.c index 4b32fb8020..940467f295 100644 --- a/src/world/area_obk/obk_01/obk_01_4_portrait.c +++ b/src/world/area_obk/obk_01/obk_01_4_portrait.c @@ -50,20 +50,20 @@ EvtScript N(EVS_Interact_LowerPortrait) = { EVT_SWITCH(LVar0) EVT_CASE_GE(1) EVT_CALL(RemoveKeyItemAt, LVar1) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_Lift) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 40) EVT_CALL(MakeItemEntity, ITEM_BOO_PORTRAIT, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_DECORATION, 0) EVT_CALL(N(SetPortraitItemAlpha)) EVT_SET(LVarA, LVar0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) EVT_SET(LVar6, 40) EVT_ADD(LVar6, LVar4) EVT_SET(LVar7, 70) EVT_ADD(LVar7, LVar4) - EVT_CALL(MakeLerp, LVar6, LVar7, 20, EASING_LINEAR) + EVT_CALL(MakeLerp, LVar6, LVar7, 20 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(SetItemPos, LVarA, LVar3, LVar0, LVar5) @@ -73,7 +73,7 @@ EvtScript N(EVS_Interact_LowerPortrait) = { EVT_END_IF EVT_END_LOOP EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) - EVT_CALL(MakeLerp, 255, 0, 30, EASING_LINEAR) + EVT_CALL(MakeLerp, 255, 0, 30 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(SetItemAlpha, LVarA, LVar0) @@ -82,7 +82,7 @@ EvtScript N(EVS_Interact_LowerPortrait) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(RemoveItemEntity, LVarA) EVT_IF_EQ(GF_OBK01_Met_Portrait, TRUE) EVT_SET(LVar0, 25) @@ -103,26 +103,26 @@ EvtScript N(EVS_Interact_LowerPortrait) = { EVT_CALL(SetPlayerAnimation, SPRITE_ID_BACK_FACING | ANIM_Mario1_Jump) EVT_WAIT(1) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) - EVT_CALL(PlayerJump, 812, -170, -2, 20) + EVT_CALL(PlayerJump, 812, -170, -2, 20 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_D9, SOUND_SPACE_MODE_0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 812, 0, 28) EVT_CALL(SetPanTarget, CAM_DEFAULT, 812, 0, 28) - 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(SetPlayerAnimation, ANIM_Mario1_Jump) EVT_WAIT(1) EVT_CALL(PlaySoundAtPlayer, SOUND_DA, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerPos, 812, 61, -2) - EVT_CALL(PlayerJump, 812, 0, 28, 8) + EVT_CALL(PlayerJump, 812, 0, 28, 8 * DT) EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(EnablePartnerAI) EVT_IF_EQ(GF_OBK01_Portrait_Farewell, FALSE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_SET(LVar0, 5) EVT_EXEC(N(EVS_AnimateSpeakingPortrait)) EVT_CALL(ShowMessageAtScreenPos, MSG_CH3_002F, 160, 40) @@ -148,18 +148,18 @@ EvtScript N(EVS_Interact_UpperPortrait) = { EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_CALL(PlayerJump, 812, 40, -2, 20) EVT_CALL(PlaySoundAtPlayer, SOUND_D9, SOUND_SPACE_MODE_0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 812, -210, 28) EVT_CALL(SetPanTarget, CAM_DEFAULT, 812, -210, 28) - 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(SetPlayerAnimation, ANIM_Mario1_Jump) EVT_WAIT(1) EVT_CALL(PlaySoundAtPlayer, SOUND_DA, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerPos, 812, -146, -2) - EVT_CALL(PlayerJump, 812, -210, 28, 8) + EVT_CALL(PlayerJump, 812, -210, 28, 8 * DT) EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) diff --git a/src/world/area_obk/obk_01/obk_01_5_jump_scare.c b/src/world/area_obk/obk_01/obk_01_5_jump_scare.c index f8a7f83d9a..f1187893aa 100644 --- a/src/world/area_obk/obk_01/obk_01_5_jump_scare.c +++ b/src/world/area_obk/obk_01/obk_01_5_jump_scare.c @@ -7,13 +7,13 @@ EvtScript N(EVS_Scene_JumpScareBoo) = { EVT_ADD(LVar4, 80) EVT_CALL(SetNpcPos, NPC_JumpScareBoo, LVar3, LVar4, LVar5) EVT_THREAD - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_SUB(LVar3, 10) EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 0, LVar3, LVar4, LVar5, EVT_FLOAT(2.8), 50) EVT_END_THREAD EVT_CALL(PlaySoundAtNpc, NPC_JumpScareBoo, SOUND_2094, SOUND_SPACE_MODE_0) EVT_SUB(LVar4, 12) - EVT_CALL(MakeLerp, 10, 450, 8, EASING_QUADRATIC_IN) + EVT_CALL(MakeLerp, 10, 450, 8 * DT, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_SETF(LVar2, LVar0) @@ -30,8 +30,8 @@ EvtScript N(EVS_Scene_JumpScareBoo) = { EVT_END_LOOP EVT_WAIT(15) EVT_SETF(LVar0, EVT_FLOAT(240.0)) - EVT_LOOP(20) - EVT_SUBF(LVar0, EVT_FLOAT(12.0)) + EVT_LOOP(20 * DT) + EVT_SUBF(LVar0, EVT_FLOAT(240.0 / (s32)(20 * DT))) EVT_CALL(func_802CFD30, NPC_JumpScareBoo, FOLD_TYPE_7, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP diff --git a/src/world/area_obk/obk_02/obk_02_5_clock.c b/src/world/area_obk/obk_02/obk_02_5_clock.c index 0cf26e4ab7..a90f512b30 100644 --- a/src/world/area_obk/obk_02/obk_02_5_clock.c +++ b/src/world/area_obk/obk_02/obk_02_5_clock.c @@ -2,7 +2,7 @@ API_CALLABLE(N(GetPendulumAngle)) { script->varTable[0] = sin_deg(script->varTable[1]) * 10.0f; - script->varTable[1] = clamp_angle(script->varTable[1] + 6); + script->varTable[1] = clamp_angle(script->varTable[1] + (s32)(6 * DT)); return ApiStatus_DONE2; } @@ -17,7 +17,7 @@ EvtScript N(EVS_UpdateClock) = { EVT_LABEL(10) EVT_CALL(RotateModel, MODEL_na, LVar0, 0, 0, 1) EVT_ADD(LVar0, -6) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_GOTO(10) EVT_END_THREAD EVT_THREAD @@ -25,7 +25,7 @@ EvtScript N(EVS_UpdateClock) = { EVT_LABEL(20) EVT_CALL(RotateModel, MODEL_mi, LVar0, 0, 0, 1) EVT_ADD(LVar0, -1) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_GOTO(20) EVT_END_THREAD EVT_THREAD diff --git a/src/world/area_obk/obk_02/obk_02_6_entity.c b/src/world/area_obk/obk_02/obk_02_6_entity.c index 237d2490a3..9a5a964e3f 100644 --- a/src/world/area_obk/obk_02/obk_02_6_entity.c +++ b/src/world/area_obk/obk_02/obk_02_6_entity.c @@ -5,7 +5,7 @@ EvtScript N(EVS_ChestTrap) = { EVT_WAIT(15) EVT_THREAD EVT_CALL(PlaySoundAt, SOUND_212A, SOUND_SPACE_MODE_0, 4, 26, -12) - EVT_CALL(MakeLerp, 0, -80, 10, EASING_QUADRATIC_IN) + EVT_CALL(MakeLerp, 0, -80, 10 * DT, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_shiyan, 0, LVar0, 0) @@ -16,9 +16,9 @@ EvtScript N(EVS_ChestTrap) = { EVT_END_LOOP EVT_CALL(PlaySoundAt, SOUND_212B, SOUND_SPACE_MODE_0, 4, 26, -12) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.5)) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(PlaySoundAt, SOUND_212C, SOUND_SPACE_MODE_0, 4, 26, -12) - EVT_CALL(MakeLerp, -80, 0, 20, EASING_LINEAR) + EVT_CALL(MakeLerp, -80, 0, 20 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_shiyan, 0, LVar0, 0) @@ -30,12 +30,12 @@ EvtScript N(EVS_ChestTrap) = { EVT_END_THREAD EVT_WAIT(2) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_FlailArms) - EVT_WAIT(48) + EVT_WAIT(48 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_SET(GF_OBK02_TriggeredChestTrap, TRUE) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_RETURN EVT_END }; diff --git a/src/world/area_obk/obk_03/obk_03_4_entity.c b/src/world/area_obk/obk_03/obk_03_4_entity.c index 21b222c734..e6a0e942f6 100644 --- a/src/world/area_obk/obk_03/obk_03_4_entity.c +++ b/src/world/area_obk/obk_03/obk_03_4_entity.c @@ -73,14 +73,14 @@ EvtScript N(EVS_SecondSwitch_JumpToSafety) = { EVT_RETURN EVT_END_IF EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_FlailArms) - EVT_WAIT(8) + EVT_WAIT(8 * DT) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(2) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(2.0)) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) - EVT_CALL(PlayerJump1, 330, -210, -49, 10) + EVT_CALL(PlayerJump1, 330, -210, -49, 10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_RETURN EVT_END }; @@ -101,14 +101,14 @@ EvtScript N(EVS_ThirdSwitch_JumpToSafety) = { EVT_RETURN EVT_END_IF EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_FlailArms) - EVT_WAIT(8) + EVT_WAIT(8 * DT) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(2) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(2.0)) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) - EVT_CALL(PlayerJump1, 352, -210, -5, 10) + EVT_CALL(PlayerJump1, 352, -210, -5, 10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_RETURN EVT_END }; @@ -122,7 +122,7 @@ EvtScript N(EVS_HitSwitch_First) = { EVT_SET(LVar3, 0) EVT_SET(LVar4, -100) EVT_SET(LVar5, -210) - EVT_SET(LVar6, 20) + EVT_SET(LVar6, 20 * DT) EVT_SET(LVar7, LVar0) EVT_SET(LVar8, 5) EVT_EXEC_WAIT(N(EVS_SecondSwitch_Drop)) @@ -139,7 +139,7 @@ EvtScript N(EVS_HitSwitch_Second) = { EVT_SET(LVar3, 0) EVT_SET(LVar4, -100) EVT_SET(LVar5, -210) - EVT_SET(LVar6, 20) + EVT_SET(LVar6, 20 * DT) EVT_SET(LVar7, LVar0) EVT_SET(LVar8, 30) EVT_EXEC_WAIT(N(EVS_ThirdSwitch_Drop)) diff --git a/src/world/area_obk/obk_03/obk_03_5_stairs.c b/src/world/area_obk/obk_03/obk_03_5_stairs.c index a439d6009e..e24bb53c15 100644 --- a/src/world/area_obk/obk_03/obk_03_5_stairs.c +++ b/src/world/area_obk/obk_03/obk_03_5_stairs.c @@ -39,7 +39,7 @@ EvtScript N(EVS_Cam_FocusOnStairs) = { EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_SUB(LVar1, 15) 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_RETURN EVT_END @@ -70,7 +70,7 @@ EvtScript N(EVS_Cam_ResetFocus) = { EVT_SET(LVarA, delay) \ EVT_EXEC(N(EVS_PlayDropStepFX)) \ EVT_SET(LVar0, dist) \ - EVT_SET(LVar1, 5) \ + EVT_SET(LVar1, 5 * DT) \ EVT_SET(LVar2, modelID) \ EVT_EXEC(N(EVS_DropStep)) \ EVT_WAIT(5) @@ -87,7 +87,7 @@ EvtScript N(EVS_Cam_ResetFocus) = { EVT_SET(LVarA, delay) \ EVT_EXEC(N(EVS_PlayDropStepFX)) \ EVT_SET(LVar0, dist) \ - EVT_SET(LVar1, 5) \ + EVT_SET(LVar1, 5 * DT) \ EVT_SET(LVar2, modelID) \ EVT_EXEC(N(EVS_DropStep)) \ EVT_WAIT(5) @@ -104,7 +104,7 @@ EvtScript N(EVS_Cam_ResetFocus) = { EVT_SET(LVarA, delay) \ EVT_EXEC(N(EVS_PlayDropStepFX)) \ EVT_SET(LVar0, dist) \ - EVT_SET(LVar1, 5) \ + EVT_SET(LVar1, 5 * DT) \ EVT_SET(LVar2, modelID) \ EVT_EXEC(N(EVS_DropStep)) \ EVT_WAIT(5) @@ -121,7 +121,7 @@ EvtScript N(EVS_Cam_ResetFocus) = { EVT_SET(LVarA, delay) \ EVT_EXEC(N(EVS_PlayDropStepFX)) \ EVT_SET(LVar0, dist) \ - EVT_SET(LVar1, 2) \ + EVT_SET(LVar1, 2 * DT) \ EVT_SET(LVar2, modelID) \ EVT_EXEC_WAIT(N(EVS_DropStep)) \ @@ -155,7 +155,7 @@ EvtScript N(EVS_Scene_DropSteps) = { EVT_DROP_STEP_L(-75, -10, 188, 4, 0, MODEL_k8) EVT_CALL(EnableModel, MODEL_kage, TRUE) EVT_CALL(EnableModel, MODEL_kage_no, FALSE) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_k1, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_k2, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_k3, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_obk/obk_04/obk_04_6_game.c b/src/world/area_obk/obk_04/obk_04_6_game.c index d6698efd52..b597d0cba5 100644 --- a/src/world/area_obk/obk_04/obk_04_6_game.c +++ b/src/world/area_obk/obk_04/obk_04_6_game.c @@ -325,9 +325,9 @@ EvtScript N(EVS_Scene_BoosUnleashed) = { EVT_CALL(N(GetItemJumpDest)) EVT_CALL(PlaySoundAtNpc, NPC_DummyBoo, SOUND_THROW, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_DummyBoo, EVT_FLOAT(1.0)) - EVT_CALL(NpcJump0, NPC_DummyBoo, LVar0, LVar1, LVar2, 14) + EVT_CALL(NpcJump0, NPC_DummyBoo, LVar0, LVar1, LVar2, 14 * DT) EVT_CALL(SetNpcPos, NPC_DummyBoo, NPC_DISPOSE_LOCATION) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_THREAD EVT_CALL(MakeLerp, 255, 0, 10, EASING_LINEAR) EVT_LOOP(0) @@ -360,10 +360,10 @@ EvtScript N(EVS_Scene_BoosUnleashed) = { EVT_CALL(N(GetItemJumpDest)) EVT_CALL(PlaySoundAtNpc, NPC_DummyBoo, SOUND_THROW, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_DummyBoo, EVT_FLOAT(1.5)) - EVT_CALL(NpcJump0, NPC_DummyBoo, LVar0, LVar1, LVar2, 14) + EVT_CALL(NpcJump0, NPC_DummyBoo, LVar0, LVar1, LVar2, 14 * DT) EVT_CALL(SetNpcPos, NPC_DummyBoo, NPC_DISPOSE_LOCATION) - EVT_CALL(RandInt, 10, LVar0) - EVT_ADD(LVar0, 5) + EVT_CALL(RandInt, 10 * DT, LVar0) + EVT_ADD(LVar0, 5 * DT) EVT_WAIT(LVar0) EVT_ADD(MV_KeepAwayThrows, -1) EVT_IF_EQ(MV_KeepAwayThrows, 0) diff --git a/src/world/area_obk/obk_09/obk_09_3_meet_bow.c b/src/world/area_obk/obk_09/obk_09_3_meet_bow.c index b93d0cb53e..0deae598b2 100644 --- a/src/world/area_obk/obk_09/obk_09_3_meet_bow.c +++ b/src/world/area_obk/obk_09/obk_09_3_meet_bow.c @@ -11,13 +11,13 @@ EvtScript N(EVS_Scene_MeetBow) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(SetMusicTrack, 0, SONG_CHEERFUL_BOOS_MANSION, 0, 8) EVT_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerPos, -180, 0, 344) EVT_CALL(SetNpcPos, NPC_PARTNER, -180, 20, 344) - EVT_CALL(PlayerMoveTo, 0, 190, 60) + EVT_CALL(PlayerMoveTo, 0, 190, 60 * DT) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_JoltAwake) EVT_END_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetCamType, CAM_DEFAULT, 4, TRUE) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(5.0), EVT_FLOAT(-9.0)) @@ -26,12 +26,12 @@ EvtScript N(EVS_Scene_MeetBow) = { EVT_CALL(SetCamPosB, CAM_DEFAULT, 0, 110) EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, 0) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(48) + EVT_WAIT(48 * DT) EVT_CALL(ShowMessageAtScreenPos, MSG_CH3_0042, 160, 40) EVT_KILL_THREAD(LVarA) EVT_CALL(InterpPlayerYaw, 40, 0) EVT_CALL(SetPlayerAnimation, SPRITE_ID_BACK_FACING | ANIM_Mario1_Idle) - 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(4.0), EVT_FLOAT(-9.0)) EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) EVT_CALL(SetCamPosA, CAM_DEFAULT, 200, 300) @@ -39,26 +39,26 @@ EvtScript N(EVS_Scene_MeetBow) = { EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, 60) 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(SetNpcPos, NPC_Bow, -10, 80, -35) EVT_CALL(SetNpcPos, NPC_Bootler, 30, 70, -75) EVT_CALL(SetNpcYaw, NPC_Bow, 270) EVT_CALL(SetNpcYaw, NPC_Bootler, 270) EVT_CALL(PlaySoundAtNpc, NPC_Bow, SOUND_BOO_VANISH, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(0.0)) - EVT_LOOP(20) - EVT_ADDF(LVar0, EVT_FLOAT(12.0)) + EVT_LOOP(20 * DT) + EVT_ADDF(LVar0, EVT_FLOAT(240.0 / (s32)(20 * DT))) EVT_CALL(func_802CFD30, NPC_Bow, FOLD_TYPE_7, LVar0, 0, 0, 0) EVT_CALL(func_802CFD30, NPC_Bootler, FOLD_TYPE_7, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 50, -70) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(3.0), EVT_FLOAT(-10.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 50, -70) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_Bow, ANIM_WorldBow_Talk, ANIM_WorldBow_Idle, 0, MSG_CH3_0043) EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_0044) EVT_WAIT(10) @@ -68,7 +68,7 @@ EvtScript N(EVS_Scene_MeetBow) = { EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_0046) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) EVT_CALL(SetPanTarget, CAM_DEFAULT, 20, 50, -70) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_0047) EVT_CALL(SetCamType, CAM_DEFAULT, 4, TRUE) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) @@ -78,32 +78,32 @@ EvtScript N(EVS_Scene_MeetBow) = { EVT_CALL(SetCamPosB, CAM_DEFAULT, 0, 80) EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, 0) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Dejected, ANIM_Bootler_Quaver, 0, MSG_CH3_0048) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 50, -70) EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(3.0), EVT_FLOAT(-10.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(SetPanTarget, CAM_DEFAULT, 20, 50, -70) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_0049) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 50, -70) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpNpcYaw, NPC_Bow, 270, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Bow, ANIM_WorldBow_Talk, ANIM_WorldBow_Idle, 5, MSG_CH3_004A) EVT_CALL(InterpNpcYaw, NPC_Bow, 90, 0) EVT_CALL(SpeakToPlayer, NPC_Bow, ANIM_WorldBow_Talk, ANIM_WorldBow_Idle, 5, MSG_CH3_004B) EVT_CALL(SetCamDistance, CAM_DEFAULT, 550) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(3.0), EVT_FLOAT(-12.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(EnableGroup, MODEL_ori, TRUE) EVT_CALL(SetNpcPos, NPC_Skolar, 1, 650, 80) EVT_CALL(EnableNpcShadow, NPC_Skolar, FALSE) EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_8000000F, SOUND_SPACE_MODE_0) - EVT_CALL(MakeLerp, -280, -480, 100, EASING_QUADRATIC_IN) + EVT_CALL(MakeLerp, -280, -480, 100 * DT, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_ori, 0, LVar0, 0) @@ -117,7 +117,7 @@ EvtScript N(EVS_Scene_MeetBow) = { EVT_CALL(StopSound, SOUND_8000000F) EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_9B, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(0.2)) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(SetCamType, CAM_DEFAULT, 4, TRUE) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(30.0), EVT_FLOAT(-18.0)) @@ -126,20 +126,20 @@ EvtScript N(EVS_Scene_MeetBow) = { EVT_CALL(SetCamPosB, CAM_DEFAULT, 0, 0) EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, 0) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_Skolar, ANIM_WorldSkolar_TalkRelaxed, ANIM_WorldSkolar_IdleSad, 0, MSG_CH3_004C) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 50, -70) EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(3.0), EVT_FLOAT(-10.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 50, -70) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcPos, NPC_Skolar, 1, 620, 80) EVT_CALL(EnableNpcShadow, NPC_Skolar, FALSE) EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_8000000F, SOUND_SPACE_MODE_0) - EVT_CALL(MakeLerp, -480, -280, 100, EASING_QUADRATIC_IN) + EVT_CALL(MakeLerp, -480, -280, 100 * DT, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_ori, 0, LVar0, 0) @@ -159,7 +159,7 @@ EvtScript N(EVS_Scene_MeetBow) = { EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Flail, ANIM_Bootler_Quaver, 0, MSG_CH3_0050) EVT_CALL(SpeakToPlayer, NPC_Bow, ANIM_WorldBow_SpookLoop, ANIM_WorldBow_Idle, 0, MSG_CH3_0051) EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Dejected, ANIM_Bootler_Quaver, 0, MSG_CH3_0052) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -170,16 +170,16 @@ EvtScript N(EVS_Scene_MeetBow) = { EVT_CALL(GetNpcPos, NPC_Bow, LVar0, LVar1, LVar2) EVT_SUB(LVar1, 40) EVT_ADD(LVar2, 150) - EVT_CALL(NpcJump0, NPC_Bow, LVar0, LVar1, LVar2, 25) + EVT_CALL(NpcJump0, NPC_Bow, LVar0, LVar1, LVar2, 25 * DT) EVT_CALL(SpeakToPlayer, NPC_Bow, ANIM_WorldBow_Talk, ANIM_WorldBow_Idle, 0, MSG_CH3_0053) EVT_CALL(N(ChangeNpcToPartner), 0, 9) EVT_CALL(N(LoadPartyImage)) EVT_EXEC(N(EVS_PlayNewPartnerSong)) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_018D, 160, 40) EVT_EXEC(N(EVS_ResetMusic)) - EVT_WAIT(10) - EVT_WAIT(10) + EVT_WAIT(10 * DT) + EVT_WAIT(10 * DT) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBow_Celebrate, ANIM_WorldBow_Celebrate, 0, MSG_CH3_0054) EVT_CALL(EnablePartnerAI) diff --git a/src/world/area_osr/osr_00/osr_00_5_scenes.c b/src/world/area_osr/osr_00/osr_00_5_scenes.c index 1a08d828d7..cb488c63e0 100644 --- a/src/world/area_osr/osr_00/osr_00_5_scenes.c +++ b/src/world/area_osr/osr_00/osr_00_5_scenes.c @@ -54,13 +54,13 @@ EvtScript N(EVS_Scene_ShowInvitation) = { EVT_CALL(N(UnkFunc27), 1, -1, FOG_MODE_3) EVT_CALL(N(func_80240678_AACEA8), 200, 200, 200, 40, 40, 40) EVT_CALL(N(func_802406E0_AACF10)) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(ShowMessageAtScreenPos, MSG_Intro_0022, 160, 40) - EVT_WAIT(12) + EVT_WAIT(12 * DT) EVT_CALL(ShowMessageAtScreenPos, MSG_Intro_0023, 160, 40) EVT_WAIT(3) EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_20"), kmr_20_ENTRY_1, TRANSITION_7) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_RETURN EVT_END }; @@ -75,17 +75,17 @@ EvtScript N(EVS_Scene_ApproachParty) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_THREAD - EVT_CALL(PlayerMoveTo, 0, -250, 150) + EVT_CALL(PlayerMoveTo, 0, -250, 150 * DT) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Luigi, ANIM_Luigi_RunBack) EVT_CALL(SetNpcPos, NPC_Luigi, 0, 0, 350) - EVT_CALL(NpcMoveTo, NPC_Luigi, 0, -200, 150) + EVT_CALL(NpcMoveTo, NPC_Luigi, 0, -200, 150 * DT) EVT_CALL(SetNpcAnimation, NPC_Luigi, ANIM_Luigi_IdleBack) EVT_END_THREAD - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_CALL(GotoMap, EVT_PTR("kkj_00"), kkj_00_ENTRY_5) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END diff --git a/src/world/area_osr/osr_03/osr_03_3_intro.c b/src/world/area_osr/osr_03/osr_03_3_intro.c index c196b51613..ea53e6c8ba 100644 --- a/src/world/area_osr/osr_03/osr_03_3_intro.c +++ b/src/world/area_osr/osr_03/osr_03_3_intro.c @@ -57,7 +57,7 @@ EvtScript N(EVS_UnusedFalling2) = { EvtScript N(EVS_AnimateSwingingChains) = { EVT_LOOP(0) - EVT_CALL(MakeLerp, 90, -90, 30, EASING_LINEAR) + EVT_CALL(MakeLerp, 90, -90, 30 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_ku_ta, 0, MV_CastleLiftDist, 0) @@ -73,7 +73,7 @@ EvtScript N(EVS_AnimateSwingingChains) = { EVT_CALL(RotateGroup, MODEL_ku_ta, -20, 0, 0, 1) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(MakeLerp, -90, 90, 30, EASING_LINEAR) + EVT_CALL(MakeLerp, -90, 90, 30 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_ku_ta, 0, MV_CastleLiftDist, 0) @@ -96,7 +96,7 @@ EvtScript N(EVS_AnimateSwingingChains) = { EvtScript N(EVS_AnimateSpinningRing) = { EVT_LOOP(0) - EVT_CALL(MakeLerp, 45, -45, 60, EASING_QUADRATIC_OUT) + EVT_CALL(MakeLerp, 45, -45, 60 * DT, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_wa, 0, MV_CastleLiftDist, 0) @@ -106,7 +106,7 @@ EvtScript N(EVS_AnimateSpinningRing) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(MakeLerp, -45, 45, 60, EASING_QUADRATIC_OUT) + EVT_CALL(MakeLerp, -45, 45, 60 * DT, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_wa, 0, MV_CastleLiftDist, 0) @@ -125,7 +125,7 @@ EvtScript N(EVS_AnimateCastle) = { EVT_SET(MV_CastleLiftDist, 0) EVT_EXEC(N(EVS_AnimateSwingingChains)) EVT_EXEC(N(EVS_AnimateSpinningRing)) - EVT_CALL(MakeLerp, -800, 4500, 400, EASING_LINEAR) + EVT_CALL(MakeLerp, -800, 4500, 400 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_SET(MV_CastleLiftDist, LVar0) @@ -222,9 +222,9 @@ EvtScript N(MV_Scene_CastleAscending) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, -50, 200, 0) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(1000.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.75)) - EVT_WAIT(180) + EVT_WAIT(180 * DT) EVT_CALL(GotoMap, EVT_PTR("kkj_13"), kkj_13_ENTRY_2) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END @@ -267,7 +267,7 @@ EvtScript N(MV_Scene_PlayerTossedOut) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_CHILD_THREAD - EVT_CALL(LoadPath, 90, EVT_PTR(N(FlightPath_TossedOut)), ARRAY_COUNT(N(FlightPath_TossedOut)), EASING_LINEAR) + EVT_CALL(LoadPath, 90 * DT, EVT_PTR(N(FlightPath_TossedOut)), ARRAY_COUNT(N(FlightPath_TossedOut)), EASING_LINEAR) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) diff --git a/src/world/area_osr/osr_04/osr_04_2_assault.c b/src/world/area_osr/osr_04/osr_04_2_assault.c index e56f4e2e5a..87db05458e 100644 --- a/src/world/area_osr/osr_04/osr_04_2_assault.c +++ b/src/world/area_osr/osr_04/osr_04_2_assault.c @@ -15,14 +15,14 @@ API_CALLABLE(N(MakeCastleChainAngle)) { } s32 N(ThinTileSpawnPositions)[] = { - -440, 1100, 30, - -190, 1030, 40, - -105, 1100, 30, - -350, 600, 55, - -230, 1200, 35, - -500, 1050, 30, - -410, 900, 35, - 79, 770, 55, + -440, 1100, 30 * DT, + -190, 1030, 40 * DT, + -105, 1100, 30 * DT, + -350, 600, 55 * DT, + -230, 1200, 35 * DT, + -500, 1050, 30 * DT, + -410, 900, 35 * DT, + 79, 770, 55 * DT, -1, }; @@ -51,13 +51,13 @@ EvtScript N(EVS_DropDebris_ThinTiles) = { }; s32 N(ThickTileSpawnPositions)[] = { - -340, 960, 50, - -410, 900, 55, - -230, 1200, 45, - -500, 940, 40, - -230, 1010, 50, - -500, 940, 40, - -350, 600, 55, + -340, 960, 50 * DT, + -410, 900, 55 * DT, + -230, 1200, 45 * DT, + -500, 940, 40 * DT, + -230, 1010, 50 * DT, + -500, 940, 40 * DT, + -350, 600, 55 * DT, -1, }; @@ -102,9 +102,9 @@ EvtScript N(EVS_DropDebris_Flag) = { }; s32 N(LeafClumpSpawnPositions)[] = { - -350, 600, 60, - -230, 1200, 40, - -340, 960, 40, + -350, 600, 60 * DT, + -230, 1200, 40 * DT, + -340, 960, 40 * DT, -1, }; @@ -149,13 +149,13 @@ EvtScript N(EVS_DropDebris_TreeTrunk) = { }; s32 N(StoneBlockSpawnPositions)[] = { - -500, 940, 20, - 80, 770, 60, - -340, 960, 15, - -340, 960, 45, - -500, 1050, 15, - -230, 1200, 35, - -350, 600, 40, + -500, 940, 20 * DT, + 80, 770, 60 * DT, + -340, 960, 15 * DT, + -340, 960, 45 * DT, + -500, 1050, 15 * DT, + -230, 1200, 35 * DT, + -350, 600, 40 * DT, -1, }; @@ -185,7 +185,7 @@ EvtScript N(EVS_DropDebris_StoneBlocks) = { EvtScript N(EVS_AnimateSwingingChains) = { EVT_LOOP(0) - EVT_CALL(MakeLerp, 90, -90, 30, EASING_LINEAR) + EVT_CALL(MakeLerp, 90, -90, 30 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_ku_ta, 0, MV_CastleLiftDist, 0) @@ -201,7 +201,7 @@ EvtScript N(EVS_AnimateSwingingChains) = { EVT_CALL(RotateGroup, MODEL_ku_ta, -20, 0, 0, 1) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(MakeLerp, -90, 90, 30, EASING_LINEAR) + EVT_CALL(MakeLerp, -90, 90, 30 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_ku_ta, 0, MV_CastleLiftDist, 0) @@ -249,13 +249,13 @@ EvtScript N(EVS_AnimateSpinningRing) = { EvtScript N(EVS_LiftCastleUp) = { EVT_THREAD - EVT_WAIT(120) + EVT_WAIT(120 * DT) EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_ATTACKS, 0, 8) EVT_END_THREAD EVT_SET(MV_CastleLiftDist, 0) EVT_THREAD - EVT_WAIT(20) - EVT_CALL(MakeLerp, 0, 2500, 450, EASING_QUADRATIC_IN) + EVT_WAIT(20 * DT) + EVT_CALL(MakeLerp, 0, 2500, 450 * DT, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_SET(MV_CastleLiftDist, LVar0) @@ -272,7 +272,7 @@ EvtScript N(EVS_LiftCastleUp) = { EVT_EXEC(N(EVS_AnimateSpinningRing)) EVT_THREAD EVT_LOOP(0) - EVT_CALL(MakeLerp, 10, -10, 40, EASING_LINEAR) + EVT_CALL(MakeLerp, 10, -10, 40 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_ADD(MV_CastleLiftDist, LVar0) @@ -282,7 +282,7 @@ EvtScript N(EVS_LiftCastleUp) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(MakeLerp, -10, 10, 40, EASING_LINEAR) + EVT_CALL(MakeLerp, -10, 10, 40 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_ADD(MV_CastleLiftDist, LVar0) @@ -314,11 +314,11 @@ EvtScript N(EVS_LiftCastleUp) = { EVT_EXEC(N(EVS_DropDebris_ThinTiles)) EVT_EXEC(N(EVS_DropDebris_ThickTiles)) EVT_EXEC(N(EVS_DropDebris_StoneBlocks)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_EXEC(N(EVS_DropDebris_Flag)) EVT_EXEC(N(EVS_DropDebris_Leaves)) EVT_EXEC(N(EVS_DropDebris_TreeTrunk)) - EVT_WAIT(150) + EVT_WAIT(150 * DT) EVT_RETURN EVT_END }; @@ -327,7 +327,7 @@ EvtScript N(EVS_RaiseSmokeClouds) = { EVT_SET(MV_SmokeVelY, 0) EVT_THREAD EVT_CALL(PlaySound, SOUND_36) - EVT_CALL(MakeLerp, 0, 650, 40, EASING_CUBIC_OUT) + EVT_CALL(MakeLerp, 0, 650, 40 * DT, EASING_CUBIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_ADD(LVar0, MV_SmokeVelY) @@ -338,7 +338,7 @@ EvtScript N(EVS_RaiseSmokeClouds) = { EVT_END_IF EVT_END_LOOP EVT_LOOP(0) - EVT_CALL(MakeLerp, 600, 650, 25, EASING_CUBIC_OUT) + EVT_CALL(MakeLerp, 600, 650, 25 * DT, EASING_CUBIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_ADD(LVar0, MV_SmokeVelY) @@ -348,7 +348,7 @@ EvtScript N(EVS_RaiseSmokeClouds) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(MakeLerp, 650, 600, 35, EASING_LINEAR) + EVT_CALL(MakeLerp, 650, 600, 35 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_ADD(LVar0, MV_SmokeVelY) @@ -361,9 +361,9 @@ EvtScript N(EVS_RaiseSmokeClouds) = { EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(PlaySound, SOUND_37) - EVT_CALL(MakeLerp, 0, 400, 30, EASING_CUBIC_OUT) + EVT_CALL(MakeLerp, 0, 400, 30 * DT, EASING_CUBIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_kem2, 0, LVar0, 0) @@ -373,7 +373,7 @@ EvtScript N(EVS_RaiseSmokeClouds) = { EVT_END_IF EVT_END_LOOP EVT_LOOP(0) - EVT_CALL(MakeLerp, 350, 400, 12, EASING_CUBIC_OUT) + EVT_CALL(MakeLerp, 350, 400, 12 * DT, EASING_CUBIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_ADD(LVar0, MV_SmokeVelY) @@ -383,7 +383,7 @@ EvtScript N(EVS_RaiseSmokeClouds) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(MakeLerp, 400, 350, 17, EASING_LINEAR) + EVT_CALL(MakeLerp, 400, 350, 17 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_ADD(LVar0, MV_SmokeVelY) @@ -398,7 +398,7 @@ EvtScript N(EVS_RaiseSmokeClouds) = { EVT_THREAD EVT_WAIT(40) EVT_CALL(PlaySound, SOUND_38) - EVT_CALL(MakeLerp, 0, 200, 20, EASING_CUBIC_OUT) + EVT_CALL(MakeLerp, 0, 200, 20 * DT, EASING_CUBIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_kem3, 0, LVar0, 0) @@ -408,7 +408,7 @@ EvtScript N(EVS_RaiseSmokeClouds) = { EVT_END_IF EVT_END_LOOP EVT_LOOP(0) - EVT_CALL(MakeLerp, 150, 200, 25, EASING_CUBIC_OUT) + EVT_CALL(MakeLerp, 150, 200, 25 * DT, EASING_CUBIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_ADD(LVar0, MV_SmokeVelY) @@ -418,7 +418,7 @@ EvtScript N(EVS_RaiseSmokeClouds) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(MakeLerp, 200, 150, 35, EASING_LINEAR) + EVT_CALL(MakeLerp, 200, 150, 35 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_ADD(LVar0, MV_SmokeVelY) @@ -441,13 +441,13 @@ EvtScript N(EVS_Scene_BowsersAssault) = { EVT_CALL(SetPlayerPos, 0, 0, 2000) EVT_THREAD EVT_CALL(PlaySound, SOUND_80000057) - EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 450, EVT_FLOAT(2.0)) - EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 100, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 450 * DT, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 100 * DT, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_WAIT(50) + EVT_WAIT(50 * DT) EVT_THREAD - EVT_WAIT(30) - EVT_CALL(MakeLerp, 0, 45, 30, EASING_LINEAR) + EVT_WAIT(30 * DT) + EVT_CALL(MakeLerp, 0, 45, 30 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(RotateGroup, MODEL_ki1, LVar0, 0, 0, 1) @@ -456,7 +456,7 @@ EvtScript N(EVS_Scene_BowsersAssault) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(MakeLerp, 0, 100, 30, EASING_LINEAR) + EVT_CALL(MakeLerp, 0, 100, 30 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(RotateGroup, MODEL_ki1, 45, 0, 0, 1) @@ -469,8 +469,8 @@ EvtScript N(EVS_Scene_BowsersAssault) = { EVT_CALL(EnableGroup, MODEL_ki1, FALSE) EVT_END_THREAD EVT_THREAD - EVT_WAIT(45) - EVT_CALL(MakeLerp, 0, 30, 30, EASING_QUADRATIC_IN) + EVT_WAIT(45 * DT) + EVT_CALL(MakeLerp, 0, 30, 30 * DT, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(RotateGroup, MODEL_ki2, LVar0, 0, 0, 1) @@ -479,7 +479,7 @@ EvtScript N(EVS_Scene_BowsersAssault) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(MakeLerp, 0, 100, 100, EASING_LINEAR) + EVT_CALL(MakeLerp, 0, 100, 100 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(RotateGroup, MODEL_ki2, 30, 0, 0, 1) @@ -492,8 +492,8 @@ EvtScript N(EVS_Scene_BowsersAssault) = { EVT_CALL(EnableGroup, MODEL_ki2, FALSE) EVT_END_THREAD EVT_THREAD - EVT_WAIT(75) - EVT_CALL(MakeLerp, 0, 100, 100, EASING_LINEAR) + EVT_WAIT(75 * DT) + EVT_CALL(MakeLerp, 0, 100, 100 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_jime, 0, LVar0, 0) @@ -505,7 +505,7 @@ EvtScript N(EVS_Scene_BowsersAssault) = { EVT_END_THREAD EVT_THREAD EVT_CALL(PlaySound, SOUND_35) - EVT_CALL(MakeLerp, 0, 30, 50, EASING_LINEAR) + EVT_CALL(MakeLerp, 0, 30, 50 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_1, 0, LVar0, 0) @@ -516,8 +516,8 @@ EvtScript N(EVS_Scene_BowsersAssault) = { EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_WAIT(10) - EVT_CALL(MakeLerp, 0, 40, 40, EASING_LINEAR) + EVT_WAIT(10 * DT) + EVT_CALL(MakeLerp, 0, 40, 40 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_2, 0, LVar0, 0) @@ -528,7 +528,7 @@ EvtScript N(EVS_Scene_BowsersAssault) = { EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_CALL(MakeLerp, 0, 20, 50, EASING_LINEAR) + EVT_CALL(MakeLerp, 0, 20, 50 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_3, 0, LVar0, 0) @@ -539,8 +539,8 @@ EvtScript N(EVS_Scene_BowsersAssault) = { EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_WAIT(15) - EVT_CALL(MakeLerp, 0, 10, 35, EASING_LINEAR) + EVT_WAIT(15 * DT) + EVT_CALL(MakeLerp, 0, 10, 35 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_4, 0, LVar0, 0) @@ -551,7 +551,7 @@ EvtScript N(EVS_Scene_BowsersAssault) = { EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_CALL(MakeLerp, 0, -20, 50, EASING_LINEAR) + EVT_CALL(MakeLerp, 0, -20, 50 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_5, 0, LVar0, 0) @@ -561,7 +561,7 @@ EvtScript N(EVS_Scene_BowsersAssault) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(MakeLerp, 0, -10, 50, EASING_LINEAR) + EVT_CALL(MakeLerp, 0, -10, 50 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_6, 0, LVar0, 0) @@ -573,7 +573,7 @@ EvtScript N(EVS_Scene_BowsersAssault) = { EVT_EXEC(N(EVS_RaiseSmokeClouds)) EVT_EXEC_WAIT(N(EVS_LiftCastleUp)) EVT_CALL(GotoMap, EVT_PTR("kkj_03"), kkj_03_ENTRY_1) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN diff --git a/src/world/area_sbk/sbk_02/sbk_02_4_npc.c b/src/world/area_sbk/sbk_02/sbk_02_4_npc.c index 9242b97066..6477bfd6a8 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_4_npc.c +++ b/src/world/area_sbk/sbk_02/sbk_02_4_npc.c @@ -56,16 +56,16 @@ EvtScript N(EVS_Scene_RescuedMamar) = { EVT_CALL(WaitForPlayerInputEnabled) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.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_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_Mamar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, SPEECH_FLAG_200, MSG_CH2_00EB) 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_Mamar, 0, LVar0, 0) @@ -76,7 +76,7 @@ EvtScript N(EVS_Scene_RescuedMamar) = { EVT_END_LOOP EVT_CALL(EnableNpcAI, NPC_Mamar, FALSE) EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_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) @@ -86,22 +86,22 @@ EvtScript N(EVS_Scene_RescuedMamar) = { 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_Mamar, ANIM_WorldMamar_Idle) EVT_CALL(EnableNpcAI, NPC_Mamar, TRUE) EVT_CALL(N(UpgradeStarPowerCh2)) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0192, 160, 40) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(GetNpcPos, NPC_Mamar, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0)) @@ -109,24 +109,24 @@ EvtScript N(EVS_Scene_RescuedMamar) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Mamar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, SPEECH_FLAG_200, MSG_CH2_00EC) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_Mamar, LVar3, LVar4, LVar5) EVT_ADD(LVar0, LVar3) EVT_DIV(LVar0, 2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - 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_Mamar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, SPEECH_FLAG_200, MSG_CH2_00ED) EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_THREAD EVT_LOOP(25) EVT_CALL(GetNpcPos, NPC_Mamar, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_WAIT(4) + EVT_WAIT(4 * DT) EVT_END_LOOP EVT_END_THREAD EVT_THREAD @@ -146,7 +146,7 @@ EvtScript N(EVS_Scene_RescuedMamar) = { EVT_CALL(GetNpcPos, NPC_Mamar, 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_Mamar, LVar2, LVar0, LVar4) @@ -158,14 +158,14 @@ EvtScript N(EVS_Scene_RescuedMamar) = { EVT_CALL(SetNpcPos, NPC_Mamar, NPC_DISPOSE_LOCATION) EVT_END_THREAD EVT_THREAD - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Mamar, 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(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_SET(GB_StoryProgress, STORY_CH2_STAR_SPRIT_DEPARTED) EVT_EXEC(N(EVS_SetupMusic)) diff --git a/src/world/area_trd/trd_00/trd_00_3_npc.c b/src/world/area_trd/trd_00/trd_00_3_npc.c index 2c6b416e1a..4b305fb372 100644 --- a/src/world/area_trd/trd_00/trd_00_3_npc.c +++ b/src/world/area_trd/trd_00/trd_00_3_npc.c @@ -45,20 +45,20 @@ EvtScript N(EVS_NpcIdle_KoopaBros) = { EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, 350) EVT_CALL(SetPanTarget, CAM_DEFAULT, -570, 0, 173) - 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_END_THREAD EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim03) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) - EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.5)) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.5 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, -556, 180, 0) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_5, 4, 2, 1, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim1E) - EVT_WAIT(12) + EVT_WAIT(12 * DT) EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim04) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_KoopaBros_Black_Anim14, ANIM_KoopaBros_Black_Anim04, 0, MSG_CH1_00D2) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim02) EVT_CALL(InterpNpcYaw, NPC_SELF, 45, 2) @@ -66,15 +66,15 @@ EvtScript N(EVS_NpcIdle_KoopaBros) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim03) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 8) - EVT_WAIT(8) - EVT_WAIT(12) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 8 * DT) + EVT_WAIT(8 * DT) + EVT_WAIT(12 * DT) EVT_THREAD EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_174, SOUND_SPACE_MODE_0) - EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(8.0)) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(8.0 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, -496, 101, 0) EVT_END_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD EVT_WAIT(8) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) @@ -89,9 +89,9 @@ EvtScript N(EVS_NpcIdle_KoopaBros) = { EVT_GOTO(1) EVT_END_IF EVT_CALL(PlaySoundAtCollider, COLLIDER_tt2, SOUND_METAL_DOOR_CLOSE, SOUND_SPACE_MODE_0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.5 / DT)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(DisablePlayerInput, FALSE) EVT_SET(GB_StoryProgress, STORY_CH1_SPOTTED_BY_KOOPA_BROS) @@ -148,14 +148,14 @@ EvtScript N(D_80241DA4_99BA14) = { EVT_WAIT(1) EVT_CALL(WaitForPlayerInputEnabled) EVT_CALL(DisablePlayerInput, TRUE) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH1_010D) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.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_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_Eldstar, 0, LVar0, 0) @@ -166,7 +166,7 @@ EvtScript N(D_80241DA4_99BA14) = { EVT_END_LOOP EVT_CALL(EnableNpcAI, NPC_Eldstar, FALSE) EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Leap) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -177,22 +177,22 @@ EvtScript N(D_80241DA4_99BA14) = { EVT_ADD(LVar3, 30) EVT_LOOP(6) 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(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_CALL(PlaySoundAtPlayer, SOUND_188, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Idle) EVT_CALL(EnableNpcAI, NPC_Eldstar, TRUE) EVT_CALL(N(UpgradeStarPowerCh1)) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0191, 160, 40) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH1_010E) EVT_CALL(ShowChoice, MSG_Choice_0013) EVT_IF_EQ(LVar0, 1) @@ -216,34 +216,34 @@ EvtScript N(D_80241DA4_99BA14) = { EVT_CALL(FullyRestoreSP) EVT_CALL(N(SyncStatusMenu)) EVT_LABEL(10) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(GetNpcPos, NPC_Eldstar, 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_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH1_0112) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPanTarget, CAM_DEFAULT, -527, 0, 216) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.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_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH1_0113) EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_THREAD EVT_LOOP(25) EVT_CALL(GetNpcPos, NPC_Eldstar, 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, 0x00000708) - 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_Eldstar, 0, LVar0, 0) @@ -257,7 +257,7 @@ EvtScript N(D_80241DA4_99BA14) = { EVT_CALL(GetNpcPos, NPC_Eldstar, 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_Eldstar, LVar2, LVar0, LVar4) @@ -269,14 +269,14 @@ EvtScript N(D_80241DA4_99BA14) = { EVT_CALL(SetNpcPos, NPC_Eldstar, NPC_DISPOSE_LOCATION) EVT_END_THREAD EVT_THREAD - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Eldstar, 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_CH1_STAR_SPRIT_DEPARTED) EVT_EXEC(N(EVS_SetupMusic)) diff --git a/src/world/area_trd/trd_01/trd_01_1_main.c b/src/world/area_trd/trd_01/trd_01_1_main.c index 64b773c66f..e9972d9045 100644 --- a/src/world/area_trd/trd_01/trd_01_1_main.c +++ b/src/world/area_trd/trd_01/trd_01_1_main.c @@ -47,23 +47,23 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_WAIT(1) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_SET(LVar0, 0) EVT_SET(LVar1, 220) EVT_SET(LVar2, 255) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamPitch, CAM_DEFAULT, 18, 12) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.4)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.4 / 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(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o162, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(SetGroupVisibility, MODEL_move_saku, MODEL_GROUP_HIDDEN) EVT_CALL(PlaySound, SOUND_80000006) EVT_CHILD_THREAD EVT_SET_GROUP(EVT_GROUP_00) - EVT_WAIT(4) + EVT_WAIT(4 * DT) EVT_CALL(EnableModel, MODEL_sui1, TRUE) EVT_CALL(EnableModel, MODEL_sui2, TRUE) EVT_CALL(EnableTexPanning, MODEL_sui1, TRUE) @@ -101,81 +101,81 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_END_CHILD_THREAD EVT_THREAD EVT_CALL(PlaySound, SOUND_80000007) - EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(4.0)) - EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(0.7)) - EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 250, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.2)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10 * DT, EVT_FLOAT(4.0)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20 * DT, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 250 * DT, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30 * DT, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10 * DT, EVT_FLOAT(1.2)) EVT_CALL(StopSound, SOUND_80000007) EVT_END_THREAD EVT_THREAD - EVT_WAIT(50) + EVT_WAIT(50 * DT) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 500, LVar2) EVT_END_THREAD EVT_THREAD EVT_CALL(GetNpcPos, NPC_KoopaTroopa_02, LVar4, LVar5, LVar6) EVT_CALL(SetNpcPos, NPC_KoopaTroopa_02, LVar4, -27, LVar6) - EVT_WAIT(100) - EVT_CALL(MakeLerp, -27, 300, 210, EASING_QUADRATIC_OUT) - EVT_LOOP(210) + EVT_WAIT(100 * DT) + EVT_CALL(MakeLerp, -27, 300, 210 * DT, EASING_QUADRATIC_OUT) + EVT_LOOP(210 * DT) EVT_CALL(UpdateLerp) EVT_CALL(SetNpcPos, NPC_KoopaTroopa_02, LVar4, LVar0, LVar6) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_02, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_KoopaTroopa_02, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) - EVT_WAIT(120) + EVT_WAIT(120 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_02, ANIM_KoopaTroopa_ShellExit) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_02, ANIM_KoopaTroopa_Panic) EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_02, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_KoopaTroopa_02, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_LOOP(4) EVT_CALL(InterpNpcYaw, NPC_KoopaTroopa_02, 270, 0) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(InterpNpcYaw, NPC_KoopaTroopa_02, 90, 0) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_WAIT(210) + EVT_WAIT(210 * DT) EVT_SET(NPC_KoopaTroopa_02_DonePanic, TRUE) EVT_END_THREAD EVT_THREAD EVT_CALL(GetNpcPos, NPC_KoopaTroopa_03, LVar4, LVar5, LVar6) EVT_CALL(SetNpcPos, NPC_KoopaTroopa_03, LVar4, -27, LVar6) - EVT_WAIT(85) - EVT_CALL(MakeLerp, -27, 350, 215, EASING_QUADRATIC_OUT) - EVT_LOOP(215) + EVT_WAIT(85 * DT) + EVT_CALL(MakeLerp, -27, 350, 215 * DT, EASING_QUADRATIC_OUT) + EVT_LOOP(215 * DT) EVT_CALL(UpdateLerp) EVT_CALL(SetNpcPos, NPC_KoopaTroopa_03, LVar4, LVar0, LVar6) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_WAIT(25) + EVT_WAIT(25 * DT) EVT_CALL(ShowEmote, NPC_KoopaTroopa_03, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) - EVT_WAIT(120) + EVT_WAIT(120 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_03, ANIM_KoopaTroopa_ShellExit) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_03, ANIM_KoopaTroopa_Panic) EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_03, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_KoopaTroopa_03, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_LOOP(4) EVT_CALL(InterpNpcYaw, NPC_KoopaTroopa_03, 270, 0) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(InterpNpcYaw, NPC_KoopaTroopa_03, 90, 0) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_WAIT(180) + EVT_WAIT(180 * DT) EVT_SET(NPC_KoopaTroopa_03_DonePanic, TRUE) EVT_END_THREAD - EVT_CALL(MakeLerp, -450, 0, 300, EASING_COS_IN_OUT) + EVT_CALL(MakeLerp, -450, 0, 300 * DT, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, MODEL_dan, 0, LVar0, 0) @@ -259,16 +259,16 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_THREAD - EVT_WAIT(28) + EVT_WAIT(28 * DT) EVT_CALL(EnableModel, MODEL_sui1, FALSE) EVT_CALL(EnableModel, MODEL_sui2, FALSE) EVT_END_THREAD EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 220, 255) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(1) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.5)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.5 / DT)) EVT_CALL(StopSound, SOUND_80000006) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) diff --git a/src/world/area_trd/trd_03/trd_03_3_npc.c b/src/world/area_trd/trd_03/trd_03_3_npc.c index ec17ee53c5..3ce71f1196 100644 --- a/src/world/area_trd/trd_03/trd_03_3_npc.c +++ b/src/world/area_trd/trd_03/trd_03_3_npc.c @@ -32,27 +32,27 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_END_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim04) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(InterpNpcYaw, NPC_KoopaBros, 90, 0) - EVT_WAIT(3) + EVT_WAIT(3 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim03) - EVT_CALL(SetNpcSpeed, NPC_KoopaBros, EVT_FLOAT(2.6)) + EVT_CALL(SetNpcSpeed, NPC_KoopaBros, EVT_FLOAT(2.6 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros, -555, 20, 0) EVT_CALL(InterpNpcYaw, NPC_KoopaTroopa_01, 270, 0) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim04) - EVT_WAIT(2) + EVT_WAIT(2 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim14) - EVT_WAIT(25) + EVT_WAIT(25 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim04) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_01, ANIM_KoopaTroopa_Salute) - EVT_WAIT(25) + EVT_WAIT(25 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_01, ANIM_KoopaTroopa_Idle) EVT_THREAD EVT_CALL(PlaySoundAtCollider, COLLIDER_ori1, SOUND_26B, SOUND_SPACE_MODE_0) - EVT_CALL(MakeLerp, 100, 0, 40, EASING_QUADRATIC_IN) + EVT_CALL(MakeLerp, 100, 0, 40 * DT, EASING_QUADRATIC_IN) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, MODEL_0ri, 0, LVar0, -1) @@ -62,19 +62,19 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { EVT_END_IF EVT_CALL(PlaySoundAtCollider, COLLIDER_ori1, SOUND_26C, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_END_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim03) - EVT_CALL(SetNpcSpeed, NPC_KoopaBros, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcSpeed, NPC_KoopaBros, EVT_FLOAT(2.0 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros, -550, 70, 0) EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim04) - EVT_WAIT(15) - EVT_WAIT(10) + EVT_WAIT(15 * DT) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim14, ANIM_KoopaBros_Green_Anim04, 5, MSG_CH1_00D3) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) - EVT_WAIT(10) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) + EVT_WAIT(10 * DT) EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_METAL_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) EVT_LABEL(10) @@ -91,10 +91,10 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { EVT_CALL(InterpNpcYaw, NPC_KoopaBros, 270, 5) EVT_CALL(func_802CFD30, NPC_KoopaBros, FOLD_TYPE_5, 4, 2, 1, 0) EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim1E) - EVT_WAIT(12) + EVT_WAIT(12 * DT) EVT_CALL(func_802CFD30, NPC_KoopaBros, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim04) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim14, ANIM_KoopaBros_Green_Anim04, 0, MSG_CH1_00D4) EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim02) EVT_CALL(InterpNpcYaw, NPC_KoopaBros, 45, 2) @@ -102,10 +102,10 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim03) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros, EVT_FLOAT(0.8)) EVT_CALL(GetNpcPos, NPC_KoopaBros, LVar0, LVar1, LVar2) - EVT_CALL(NpcJump0, NPC_KoopaBros, LVar0, LVar1, LVar2, 8) - EVT_WAIT(8) + EVT_CALL(NpcJump0, NPC_KoopaBros, LVar0, LVar1, LVar2, 8 * DT) + EVT_WAIT(8 * DT) EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros, SOUND_174, SOUND_SPACE_MODE_0) - EVT_CALL(SetNpcSpeed, NPC_KoopaBros, EVT_FLOAT(8.0)) + EVT_CALL(SetNpcSpeed, NPC_KoopaBros, EVT_FLOAT(8.0 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros, -300, 70, 0) EVT_SET(GB_StoryProgress, STORY_CH1_KOOPA_BROS_HID_KEY) EVT_CALL(RemoveNpc, NPC_KoopaBros) diff --git a/src/world/area_trd/trd_03/trd_03_4_puzzle.c b/src/world/area_trd/trd_03/trd_03_4_puzzle.c index bf6906f713..82ddb40626 100644 --- a/src/world/area_trd/trd_03/trd_03_4_puzzle.c +++ b/src/world/area_trd/trd_03/trd_03_4_puzzle.c @@ -81,90 +81,90 @@ EvtScript N(EVS_TogglePlatforms_LeftSwitch) = { EVT_CALL(N(GetLeftRightPoints), -315, -100, 60) EVT_CALL(SetCamPosA, CAM_DEFAULT, LVar0, LVar1) EVT_CALL(SetCamPosB, CAM_DEFAULT, LVar2, LVar3) - 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(15) + EVT_WAIT(15 * DT) EVT_IF_EQ(MV_PlatformsExtended, FALSE) EVT_SET(LVar7, COLLIDER_o73) EVT_SET(LVar8, WALL_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_7) EVT_EXEC(N(EVS_ExtendPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_4) EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_4) EVT_EXEC(N(EVS_ExtendPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_3) EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_3) EVT_EXEC(N(EVS_ExtendPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_o74) EVT_SET(LVar8, WALL_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_6) EVT_EXEC(N(EVS_ExtendPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_2) EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_2) EVT_EXEC(N(EVS_ExtendPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_1) EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_1) EVT_EXEC(N(EVS_ExtendPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_o75) EVT_SET(LVar8, WALL_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_5) EVT_EXEC(N(EVS_ExtendPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(MV_PlatformsExtended, TRUE) EVT_ELSE EVT_SET(LVar7, COLLIDER_o75) EVT_SET(LVar8, WALL_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_5) EVT_EXEC(N(EVS_RetractPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_1) EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_1) EVT_EXEC(N(EVS_RetractPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_2) EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_2) EVT_EXEC(N(EVS_RetractPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_o74) EVT_SET(LVar8, WALL_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_6) EVT_EXEC(N(EVS_RetractPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_3) EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_3) EVT_EXEC(N(EVS_RetractPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_4) EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_4) EVT_EXEC(N(EVS_RetractPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_o73) EVT_SET(LVar8, WALL_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_7) EVT_EXEC(N(EVS_RetractPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(MV_PlatformsExtended, FALSE) EVT_END_IF EVT_WAIT(10) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.5 / 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_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END @@ -183,90 +183,90 @@ EvtScript N(EVS_TogglePlatforms_RightSwitch) = { EVT_CALL(N(GetLeftRightPoints), 210, -100, -60) EVT_CALL(SetCamPosA, CAM_DEFAULT, LVar0, LVar1) EVT_CALL(SetCamPosB, CAM_DEFAULT, LVar2, LVar3) - 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(15) + EVT_WAIT(15 * DT) EVT_IF_EQ(MV_PlatformsExtended, FALSE) EVT_SET(LVar7, COLLIDER_o75) EVT_SET(LVar8, WALL_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_5) EVT_EXEC(N(EVS_ExtendPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_1) EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_1) EVT_EXEC(N(EVS_ExtendPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_2) EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_2) EVT_EXEC(N(EVS_ExtendPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_o74) EVT_SET(LVar8, WALL_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_6) EVT_EXEC(N(EVS_ExtendPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_3) EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_3) EVT_EXEC(N(EVS_ExtendPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_4) EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_4) EVT_EXEC(N(EVS_ExtendPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_o73) EVT_SET(LVar8, WALL_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_7) EVT_EXEC(N(EVS_ExtendPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(MV_PlatformsExtended, TRUE) EVT_ELSE EVT_SET(LVar7, COLLIDER_o73) EVT_SET(LVar8, WALL_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_7) EVT_EXEC(N(EVS_RetractPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_4) EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_4) EVT_EXEC(N(EVS_RetractPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_3) EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_3) EVT_EXEC(N(EVS_RetractPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_o74) EVT_SET(LVar8, WALL_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_6) EVT_EXEC(N(EVS_RetractPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_2) EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_2) EVT_EXEC(N(EVS_RetractPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_1) EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_1) EVT_EXEC(N(EVS_RetractPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(LVar7, COLLIDER_o75) EVT_SET(LVar8, WALL_RETRACT_LENGTH) EVT_SET(LVar9, MODEL_5) EVT_EXEC(N(EVS_RetractPlatform)) - EVT_WAIT(9) + EVT_WAIT(9 * DT) EVT_SET(MV_PlatformsExtended, FALSE) EVT_END_IF EVT_WAIT(10) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.5 / 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_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END diff --git a/src/world/area_trd/trd_04/trd_04_1_main.c b/src/world/area_trd/trd_04/trd_04_1_main.c index 74e67e7526..9bd3416b86 100644 --- a/src/world/area_trd/trd_04/trd_04_1_main.c +++ b/src/world/area_trd/trd_04/trd_04_1_main.c @@ -104,14 +104,14 @@ EvtScript N(EVS_Scene_LowerStairs) = { EVT_SUSPEND_GROUP(EVT_GROUP_01) EVT_SET(GB_StoryProgress, STORY_CH1_LOWERED_FIRST_STAIRS) EVT_CALL(DisablePlayerInput, TRUE) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_THREAD - EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.7)) - EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 320, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.7)) - EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.4)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10 * DT, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 320 * DT, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10 * DT, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10 * DT, EVT_FLOAT(0.4)) EVT_END_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(EnableModel, MODEL_o6, FALSE) EVT_CALL(EnableModel, MODEL_o7, FALSE) EVT_CALL(EnableModel, MODEL_bero2, FALSE) @@ -127,14 +127,14 @@ EvtScript N(EVS_Scene_LowerStairs) = { EVT_CALL(SetNpcPos, NPC_PARTNER, -163, 0, -12) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_CALL(PlaySound, SOUND_80000005) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_THREAD EVT_LOOP(5) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 150) EVT_CALL(PlayEffect, EFFECT_DUST, 0, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 20, LVar0) - EVT_ADD(LVar0, 20) + EVT_CALL(RandInt, 20 * DT, LVar0) + EVT_ADD(LVar0, 20 * DT) EVT_WAIT(LVar0) EVT_END_LOOP EVT_END_THREAD @@ -149,39 +149,39 @@ EvtScript N(EVS_Scene_LowerStairs) = { EVT_ADD(LVar2, 200) EVT_ADD(LVar3, LVar5) EVT_CALL(PlayEffect, EFFECT_SHATTERING_STONES, 0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) + EVT_CALL(RandInt, 30 * DT, LVar0) + EVT_ADD(LVar0, 30 * DT) EVT_WAIT(LVar0) EVT_END_LOOP EVT_END_THREAD EVT_THREAD EVT_CALL(InterpPlayerYaw, 270, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpPlayerYaw, 90, 0) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(InterpPlayerYaw, 270, 0) - EVT_WAIT(12) + EVT_WAIT(12 * DT) EVT_CALL(InterpPlayerYaw, 90, 0) - EVT_WAIT(18) + EVT_WAIT(18 * DT) EVT_CALL(InterpPlayerYaw, 270, 0) - EVT_WAIT(29) + EVT_WAIT(29 * DT) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_END_THREAD EVT_THREAD EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) - EVT_WAIT(13) + EVT_WAIT(13 * DT) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) - EVT_WAIT(17) + EVT_WAIT(17 * DT) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) - EVT_WAIT(18) + EVT_WAIT(18 * DT) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) - EVT_WAIT(17) + EVT_WAIT(17 * DT) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_END_THREAD - EVT_WAIT(20) - EVT_CALL(MakeLerp, 187, 0, 300, EASING_COS_IN_OUT) + EVT_WAIT(20 * DT) + EVT_CALL(MakeLerp, 187, 0, 300 * DT, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, MODEL_k_sokumen, 0, LVar0, 0) @@ -195,14 +195,14 @@ EvtScript N(EVS_Scene_LowerStairs) = { EVT_CALL(UpdateColliderTransform, COLLIDER_o87) EVT_CALL(StopSound, SOUND_80000005) EVT_CALL(PlaySound, SOUND_28) - EVT_WAIT(50) + EVT_WAIT(50 * DT) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 0, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0)) EVT_CALL(SetCamPosA, CAM_DEFAULT, -169, 130) 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(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(2) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) diff --git a/src/world/area_trd/trd_04/trd_04_2_entity.c b/src/world/area_trd/trd_04/trd_04_2_entity.c index c53c85db0f..5797b42d6d 100644 --- a/src/world/area_trd/trd_04/trd_04_2_entity.c +++ b/src/world/area_trd/trd_04/trd_04_2_entity.c @@ -102,15 +102,15 @@ EvtScript N(EVS_Padlock_UpperDoors) = { EvtScript N(EVS_80245198) = { EVT_CALL(DisablePlayerInput, TRUE) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -188, 0, -43) EVT_CALL(SetPanTarget, CAM_DEFAULT, -188, 0, -43) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(510.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(3) + EVT_WAIT(3 * DT) EVT_CALL(PlaySoundAt, SOUND_301, SOUND_SPACE_MODE_0, -180, 175, -35) - EVT_CALL(MakeLerp, 175, 0, 20, EASING_QUADRATIC_IN) + EVT_CALL(MakeLerp, 175, 0, 20 * DT, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(N(SetEntityPosition), MV_Unk_02, -180, LVar0, -35) @@ -121,12 +121,12 @@ EvtScript N(EVS_80245198) = { EVT_END_LOOP EVT_CALL(PlaySoundAt, SOUND_48, SOUND_SPACE_MODE_0, -180, 0, -35) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) - 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, LVar0, 0, 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(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(2) diff --git a/src/world/area_trd/trd_05/trd_05_4_npc.c b/src/world/area_trd/trd_05/trd_05_4_npc.c index 36fcf35cf9..5f38b48ea4 100644 --- a/src/world/area_trd/trd_05/trd_05_4_npc.c +++ b/src/world/area_trd/trd_05/trd_05_4_npc.c @@ -33,19 +33,19 @@ EvtScript N(EVS_KoopaBros_SetTrap) = { EVT_LOOP(8) EVT_CALL(func_802CFD30, NPC_KoopaBros_01, FOLD_TYPE_7, 0, 0, 0, 0) EVT_CALL(func_802CFD30, NPC_KoopaBros_02, FOLD_TYPE_7, 255, 0, 0, 0) - EVT_WAIT(6) + EVT_WAIT(6 * DT) EVT_CALL(func_802CFD30, NPC_KoopaBros_01, FOLD_TYPE_7, 255, 0, 0, 0) EVT_CALL(func_802CFD30, NPC_KoopaBros_02, FOLD_TYPE_7, 0, 0, 0, 0) - EVT_WAIT(6) + EVT_WAIT(6 * DT) EVT_END_LOOP EVT_END_THREAD EVT_THREAD EVT_LOOP(8) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(GetNpcPos, NPC_KoopaBros_02, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 8) EVT_CALL(N(MakeHammerDust)) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(GetNpcPos, NPC_KoopaBros_01, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 8) EVT_CALL(N(MakeHammerDust)) @@ -57,118 +57,118 @@ EvtScript N(EVS_KoopaBros_SetTrap) = { EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Anim1D) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -100, 240, 30) EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 90) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(PlaySound, SOUND_2A) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Anim1D) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -35, 240, -75) EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 270) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(PlaySound, SOUND_29) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Anim1D) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -40, 240, 10) EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 270) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(PlaySound, SOUND_2A) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Anim1D) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -110, 240, -20) EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 90) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(PlaySound, SOUND_29) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Anim1D) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -90, 240, 30) EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 90) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(PlaySound, SOUND_2A) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Anim1D) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -30, 240, -50) EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 270) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, 0, -500, 0) EVT_END_THREAD EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -45, 240, -30) EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 270) EVT_WAIT(1) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(1.6)) - EVT_CALL(NpcJump0, NPC_KoopaBros_01, -45, 240, -30, 6) - EVT_CALL(NpcJump0, NPC_KoopaBros_01, -45, 240, -30, 6) + EVT_CALL(NpcJump0, NPC_KoopaBros_01, -45, 240, -30, 6 * DT) + EVT_CALL(NpcJump0, NPC_KoopaBros_01, -45, 240, -30, 6 * DT) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -120, 240, 20) EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 90) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim1B) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -110, 240, -70) EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 90) EVT_WAIT(1) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(1.6)) - EVT_CALL(NpcJump0, NPC_KoopaBros_01, -110, 240, -70, 6) - EVT_CALL(NpcJump0, NPC_KoopaBros_01, -110, 240, -70, 6) + EVT_CALL(NpcJump0, NPC_KoopaBros_01, -110, 240, -70, 6 * DT) + EVT_CALL(NpcJump0, NPC_KoopaBros_01, -110, 240, -70, 6 * DT) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -35, 240, -51) EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 270) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim1B) - EVT_WAIT(14) + EVT_WAIT(14 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -45, 240, -25) EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 270) EVT_WAIT(1) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(1.6)) - EVT_CALL(NpcJump0, NPC_KoopaBros_01, -45, 240, -25, 6) - EVT_CALL(NpcJump0, NPC_KoopaBros_01, -45, 240, -25, 6) + EVT_CALL(NpcJump0, NPC_KoopaBros_01, -45, 240, -25, 6 * DT) + EVT_CALL(NpcJump0, NPC_KoopaBros_01, -45, 240, -25, 6 * DT) EVT_WAIT(1) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -120, 240, 20) EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 90) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim1B) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -120, 240, 20) EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 90) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim1A) - EVT_WAIT(26) + EVT_WAIT(26 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim02) - EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(4.0 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, -25, -15, 0) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 270, 4) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim05) - EVT_WAIT(25) + EVT_WAIT(25 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim02) - EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(4.0 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, -122, -15, 0) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) - EVT_WAIT(3) + EVT_WAIT(3 * DT) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 90, 5) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim14, ANIM_KoopaBros_Yellow_Anim04, 5, MSG_CH1_00D5) EVT_CALL(GetNpcPos, NPC_KoopaBros_01, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_KoopaBros_01, EMOTE_EXCLAMATION, 0, 25, EMOTER_POS, LVar0, LVar1, LVar2, 40) - EVT_WAIT(25) + EVT_WAIT(25 * DT) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 270, 2) - EVT_WAIT(7) + EVT_WAIT(7 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim05) - EVT_WAIT(25) + EVT_WAIT(25 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) EVT_CALL(GetNpcPos, NPC_KoopaBros_01, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(3.0)) - EVT_CALL(NpcJump0, NPC_KoopaBros_01, LVar0, LVar1, LVar2, 5) + EVT_CALL(NpcJump0, NPC_KoopaBros_01, LVar0, LVar1, LVar2, 5 * DT) EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim14, ANIM_KoopaBros_Yellow_Anim04, 0, MSG_CH1_00D6) EVT_CALL(PlaySound, SOUND_173) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim03) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(0.8)) EVT_CALL(GetNpcPos, NPC_KoopaBros_01, LVar0, LVar1, LVar2) - EVT_CALL(NpcJump0, NPC_KoopaBros_01, LVar0, LVar1, LVar2, 8) - EVT_WAIT(8) + EVT_CALL(NpcJump0, NPC_KoopaBros_01, LVar0, LVar1, LVar2, 8 * DT) + EVT_WAIT(8 * DT) EVT_CALL(PlaySound, SOUND_174) - EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(8.0)) + EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(8.0 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, -400, -10, 0) EVT_EXEC(N(EVS_EndKoopaBrosTheme)) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -270, 0, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, -270, 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_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, NPC_DISPOSE_LOCATION) diff --git a/src/world/area_trd/trd_06/trd_06_1_main.c b/src/world/area_trd/trd_06/trd_06_1_main.c index c4b2bec138..7b489eb6d1 100644 --- a/src/world/area_trd/trd_06/trd_06_1_main.c +++ b/src/world/area_trd/trd_06/trd_06_1_main.c @@ -59,12 +59,12 @@ EvtScript N(EVS_BombWall_Cell) = { EVT_CALL(WaitForPlayerInputEnabled) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GF_TRD06_BombedWall, TRUE) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_THREAD EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_IF_LT(LVar0, 110) EVT_IF_LT(LVar2, 140) - EVT_WAIT(25) + EVT_WAIT(25 * DT) EVT_CALL(SetNpcFlagBits, NPC_Bobomb_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Bobomb_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Bobomb_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) @@ -81,15 +81,17 @@ EvtScript N(EVS_BombWall_Cell) = { EVT_END_THREAD EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldBombette_Walk) - EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.5)) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.5 / DT)) +#if !VERSION_PAL EVT_CALL(NpcMoveTo, NPC_PARTNER, 156, 156, 0) +#endif EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldBombette_Idle) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00E2) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00E3) EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, FALSE) EVT_CALL(EnablePartnerAI) diff --git a/src/world/area_trd/trd_06/trd_06_2_falling.c b/src/world/area_trd/trd_06/trd_06_2_falling.c index f6a13d5863..75e073666c 100644 --- a/src/world/area_trd/trd_06/trd_06_2_falling.c +++ b/src/world/area_trd/trd_06/trd_06_2_falling.c @@ -340,14 +340,14 @@ EvtScript N(EVS_Scene_FallIntoCell) = { EVT_WAIT(1) EVT_CALL(SpeakToPlayer, NPC_Bombette, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00D9) EVT_THREAD - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(EndSpeech, NPC_Bombette, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0) 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(SetNpcVar, NPC_Bombette, 0, 1) EVT_END_IF diff --git a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c index 1d75aa2d71..da0cf545d4 100644 --- a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c +++ b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c @@ -25,18 +25,18 @@ NpcSettings N(NpcSettings_KoopaTroopa) = { EvtScript N(EVS_Bombette_DemonstrateAbility) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, 96, 0, 129) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.6)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.6 / DT)) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldBombette_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, 124, 129, 0) EVT_CALL(GetAngleToPlayer, NPC_PARTNER, LVar0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, LVar0, 5) EVT_END_THREAD - EVT_WAIT(30) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_WAIT(30 * DT) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlayerMoveTo, 96, 129, 0) EVT_CALL(GetAngleToNPC, NPC_PARTNER, LVar0) EVT_CALL(InterpPlayerYaw, LVar0, 5) @@ -49,7 +49,7 @@ EvtScript N(EVS_Bombette_DemonstrateAbility) = { EvtScript N(EVS_NpcInteract_Bombette) = { EVT_THREAD - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0), 0, EVT_FLOAT(300.0), EVT_FLOAT(18.0), EVT_FLOAT(-7.0)) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0 / DT), 0, EVT_FLOAT(300.0), EVT_FLOAT(18.0), EVT_FLOAT(-7.0)) EVT_END_THREAD EVT_CALL(GetAngleToPlayer, NPC_SELF, LVar0) EVT_IF_LT(LVar0, 180) @@ -65,7 +65,7 @@ EvtScript N(EVS_NpcInteract_Bombette) = { EVT_END_IF EVT_IF_LT(LVarA, 20) EVT_ADD(LVar2, LVar1) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlayerMoveTo, LVar2, LVar4, 0) EVT_CALL(PlayerFaceNpc, NPC_Bombette, 3) EVT_END_IF @@ -73,7 +73,7 @@ EvtScript N(EVS_NpcInteract_Bombette) = { EVT_IF_EQ(GF_TRD06_Met_Bombette, FALSE) EVT_SET(GF_TRD06_Met_Bombette, TRUE) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00DA) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_CALL(EndSpeech, NPC_SELF, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) @@ -93,30 +93,30 @@ EvtScript N(EVS_NpcInteract_Bombette) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) 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(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00DE) EVT_CALL(N(ChangeNpcToPartner), NPC_Bombette, PARTNER_BOMBETTE) EVT_SET(GB_StoryProgress, STORY_CH1_BOMBETTE_JOINED_PARTY) EVT_CALL(N(LoadPartyImage)) EVT_EXEC(N(EVS_PushSong)) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_018B, 160, 40) EVT_EXEC(N(EVS_PopSong)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00DF) EVT_WAIT(1) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) - EVT_WAIT(25) + EVT_WAIT(25 * DT) EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, -45, 30, EMOTER_NPC, 0, 0, 0, 0) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00E0) EVT_EXEC_WAIT(N(EVS_Bombette_DemonstrateAbility)) EVT_END_IF - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0 / DT)) EVT_RETURN EVT_END }; @@ -152,9 +152,9 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa) = { EVT_CALL(SetNpcPos, NPC_Jailer_KoopaTroopa, -350, 0, 0) EVT_CALL(SetNpcPos, NPC_Jailer_Bobomb_01, -370, 0, 0) EVT_CALL(SetNpcPos, NPC_Jailer_Bobomb_02, -390, 0, 0) - EVT_CALL(SetNpcSpeed, NPC_Jailer_KoopaTroopa, EVT_FLOAT(4.0)) - EVT_CALL(SetNpcSpeed, NPC_Jailer_Bobomb_01, EVT_FLOAT(4.0)) - EVT_CALL(SetNpcSpeed, NPC_Jailer_Bobomb_02, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcSpeed, NPC_Jailer_KoopaTroopa, EVT_FLOAT(4.0 / DT)) + EVT_CALL(SetNpcSpeed, NPC_Jailer_Bobomb_01, EVT_FLOAT(4.0 / DT)) + EVT_CALL(SetNpcSpeed, NPC_Jailer_Bobomb_02, EVT_FLOAT(4.0 / DT)) EVT_CALL(SetNpcAnimation, NPC_Jailer_KoopaTroopa, ANIM_KoopaTroopa_Run) EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Anim06) EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Anim06) @@ -202,13 +202,13 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa) = { EVT_CALL(NpcMoveTo, NPC_Jailer_Bobomb_01, -254, 144, 0) EVT_CALL(NpcMoveTo, NPC_Jailer_Bobomb_01, -203, 222, 0) EVT_END_THREAD - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(NpcMoveTo, NPC_Jailer_Bobomb_02, -265, 0, 0) EVT_CALL(NpcMoveTo, NPC_Jailer_Bobomb_02, -186, 175, 0) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetNpcJumpscale, NPC_Jailer_KoopaTroopa, EVT_FLOAT(1.0)) EVT_CALL(GetNpcPos, NPC_Jailer_KoopaTroopa, LVar0, LVar1, LVar2) - EVT_CALL(NpcJump0, NPC_Jailer_KoopaTroopa, LVar0, LVar1, LVar2, 10) + EVT_CALL(NpcJump0, NPC_Jailer_KoopaTroopa, LVar0, LVar1, LVar2, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Anim02) EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Anim02) EVT_CALL(SpeakToPlayer, NPC_Jailer_KoopaTroopa, ANIM_KoopaTroopa_Run, ANIM_KoopaTroopa_Idle, 0, MSG_CH1_00F1) diff --git a/src/world/area_trd/trd_09/trd_09_3_npc.c b/src/world/area_trd/trd_09/trd_09_3_npc.c index f4f91ae3a0..89a09300ef 100644 --- a/src/world/area_trd/trd_09/trd_09_3_npc.c +++ b/src/world/area_trd/trd_09/trd_09_3_npc.c @@ -170,22 +170,22 @@ EvtScript N(EVS_NpcAI_KoopaBros_Red) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_WAIT(20) - EVT_CALL(FadeOutMusic, 0, 2000) + EVT_WAIT(20 * DT) + EVT_CALL(FadeOutMusic, 0, 2000 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 1300, 0, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, 1490, 0, 0) EVT_CALL(SetCamPosB, CAM_DEFAULT, 1466, EVT_FLOAT(41.6)) - 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(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetCamPosB, CAM_DEFAULT, 1466, EVT_FLOAT(41.6)) EVT_CALL(SetPanTarget, CAM_DEFAULT, 1490, 60, 0) EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) EVT_CALL(SetCamPitch, CAM_DEFAULT, 25, -9) - 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_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(PlaySound, SOUND_METAL_DOOR_OPEN) EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_BROS_THEME, 0, 8) EVT_CALL(MakeLerp, 0, 110, 10, EASING_COS_IN_OUT) @@ -200,24 +200,24 @@ EvtScript N(EVS_NpcAI_KoopaBros_Red) = { EVT_CALL(SetNpcVar, NPC_KoopaBros_Green, 0, 1) EVT_CALL(SetNpcVar, NPC_KoopaBros_Yellow, 0, 1) EVT_CALL(SetNpcVar, NPC_KoopaBros_Black, 0, 1) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Red_Anim03) - EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) EVT_CALL(NpcMoveTo, NPC_SELF, 1490, 0, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_KoopaBros_Red_Anim1B, ANIM_KoopaBros_Red_Anim1B, 0, MSG_CH1_00F2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 1300, 0, 0) EVT_CALL(SetCamPosB, CAM_DEFAULT, 1466, EVT_FLOAT(41.6)) EVT_CALL(SetPanTarget, CAM_DEFAULT, 1250, 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_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Red_Anim12) - EVT_CALL(NpcJump0, NPC_SELF, 1440, 30, 0, 20) - EVT_CALL(NpcJump0, NPC_SELF, 1380, 0, 0, 20) + EVT_CALL(NpcJump0, NPC_SELF, 1440, 30, 0, 20 * DT) + EVT_CALL(NpcJump0, NPC_SELF, 1380, 0, 0, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Red_Anim03) EVT_CALL(NpcMoveTo, NPC_SELF, 1360, 0, 0) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Red_Anim04) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_KoopaBros_Red_Anim1B, ANIM_KoopaBros_Red_Anim1B, 0, MSG_CH1_00F3) EVT_CALL(SetNpcVar, NPC_KoopaBros_Green, 0, 2) @@ -225,12 +225,12 @@ EvtScript N(EVS_NpcAI_KoopaBros_Red) = { EVT_CALL(SetNpcVar, NPC_KoopaBros_Black, 0, 2) EVT_CALL(SetSelfVar, 0, 1) EVT_CALL(SetMusicTrack, 0, SONG_BULLET_BILL_ASSAULT, 0, 8) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 1300, 0, 0) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - 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(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT)) EVT_SET(GB_StoryProgress, STORY_CH1_KOOPA_BROS_FIRING_BLASTERS) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(RotateModel, MODEL_o60, 0, 0, -1, 0) @@ -273,12 +273,12 @@ EvtScript N(EVS_NpcAI_KoopaBros_Black) = { EVT_GOTO(10) EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim03) - EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) EVT_CALL(NpcMoveTo, NPC_SELF, 1520, 20, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim12) - EVT_CALL(NpcJump0, NPC_SELF, 1470, 30, 30, 20) - EVT_CALL(NpcJump0, NPC_SELF, 1410, 0, 40, 20) + EVT_CALL(NpcJump0, NPC_SELF, 1470, 30, 30, 20 * DT) + EVT_CALL(NpcJump0, NPC_SELF, 1410, 0, 40, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim03) EVT_CALL(NpcMoveTo, NPC_SELF, 1330, 50, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim01) @@ -289,7 +289,7 @@ EvtScript N(EVS_NpcAI_KoopaBros_Black) = { EVT_GOTO(20) EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim1B) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_CALL(RemoveNpc, NPC_SELF) EVT_RETURN EVT_END @@ -304,12 +304,12 @@ EvtScript N(EVS_NpcAI_KoopaBros_Yellow) = { EVT_GOTO(10) EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_Anim03) - EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) EVT_CALL(NpcMoveTo, NPC_SELF, 1505, 5, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_Anim12) - EVT_CALL(NpcJump0, NPC_SELF, 1455, 30, 5, 20) - EVT_CALL(NpcJump0, NPC_SELF, 1395, 0, 5, 20) + EVT_CALL(NpcJump0, NPC_SELF, 1455, 30, 5, 20 * DT) + EVT_CALL(NpcJump0, NPC_SELF, 1395, 0, 5, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_Anim03) EVT_CALL(NpcMoveTo, NPC_SELF, 1315, 5, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_Anim01) @@ -320,7 +320,7 @@ EvtScript N(EVS_NpcAI_KoopaBros_Yellow) = { EVT_GOTO(20) EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_Anim1B) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_CALL(RemoveNpc, NPC_SELF) EVT_RETURN EVT_END @@ -335,12 +335,12 @@ EvtScript N(EVS_NpcAI_KoopaBros_Green) = { EVT_GOTO(10) EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_Anim03) - EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) EVT_CALL(NpcMoveTo, NPC_SELF, 1490, -10, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_Anim12) - EVT_CALL(NpcJump0, NPC_SELF, 1440, 30, -20, 20) - EVT_CALL(NpcJump0, NPC_SELF, 1380, 0, -30, 20) + EVT_CALL(NpcJump0, NPC_SELF, 1440, 30, -20, 20 * DT) + EVT_CALL(NpcJump0, NPC_SELF, 1380, 0, -30, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_Anim03) EVT_CALL(NpcMoveTo, NPC_SELF, 1300, -40, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_Anim01) @@ -351,7 +351,7 @@ EvtScript N(EVS_NpcAI_KoopaBros_Green) = { EVT_GOTO(20) EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_Anim1B) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_CALL(RemoveNpc, NPC_SELF) EVT_RETURN EVT_END diff --git a/src/world/area_trd/trd_10/trd_10_2_npc.c b/src/world/area_trd/trd_10/trd_10_2_npc.c index 2eab89c500..7d64143544 100644 --- a/src/world/area_trd/trd_10/trd_10_2_npc.c +++ b/src/world/area_trd/trd_10/trd_10_2_npc.c @@ -37,7 +37,7 @@ EvtScript N(EVS_NpcAI_KoopaBros_01) = { EVT_WAIT(1) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -240, 0, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, -240, 0, 0) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.2)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.2 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, EVT_FLOAT(0.5), 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) @@ -51,7 +51,7 @@ EvtScript N(EVS_NpcAI_KoopaBros_01) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlayerMoveTo, -220, 0, 0) EVT_CALL(MakeLerp, -80, 0, 10, EASING_LINEAR) EVT_LABEL(11) @@ -64,22 +64,22 @@ EvtScript N(EVS_NpcAI_KoopaBros_01) = { EVT_END_IF EVT_CALL(PlaySound, SOUND_METAL_DOOR_CLOSE) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -32, 0, 0) - EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, -88, 0, 15) - EVT_WAIT(10) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, -88, 0, 15 * DT) + EVT_WAIT(10 * DT) EVT_CALL(func_802CFD30, NPC_KoopaBros_01, FOLD_TYPE_5, 4, 2, 1, 0) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim1E) - EVT_WAIT(12) + EVT_WAIT(12 * DT) EVT_CALL(func_802CFD30, NPC_KoopaBros_01, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim04) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim02, ANIM_KoopaBros_Black_Anim04, 0, MSG_CH1_00F4) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -32, 0, 0) - EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, -64, 0, 10) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, -64, 0, 10 * DT) EVT_CALL(SpeakToPlayer, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim02, ANIM_KoopaBros_Red_Anim04, 0, MSG_CH1_00F5) - EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, 0, 0, 10) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, 0, 0, 10 * DT) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, -10, 4) - EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, 0, 0, 10) - EVT_WAIT(30) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, 0, 0, 10 * DT) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_HAS_SHADOW, FALSE) @@ -92,18 +92,18 @@ EvtScript N(EVS_NpcAI_KoopaBros_01) = { EVT_CALL(PlaySoundAt, SOUND_1E2, SOUND_SPACE_MODE_0, 0, 0, 0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(1.0)) EVT_CALL(ShowMessageAtScreenPos, MSG_CH1_00F9, 300, 100) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(ShowMessageAtScreenPos, MSG_CH1_00FA, 300, 100) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(ShowMessageAtScreenPos, MSG_CH1_00FB, 300, 100) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(ShowMessageAtScreenPos, MSG_CH1_00FC, 300, 100) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -160, 0, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, -160, 0, 0) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.2)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.2 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_SET(AF_TRD_FakeBowserRevealed, TRUE) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -155, 0, 0) EVT_CALL(StartBossBattle, SONG_FAKE_BOWSER_BATTLE) @@ -144,7 +144,7 @@ EvtScript N(EVS_NpcDefeat_KoopaBros_01) = { EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim1C) EVT_WAIT(1) EVT_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(ShowMessageAtScreenPos, MSG_CH1_010B, 160, 40) EVT_END_THREAD EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(0.3)) @@ -164,7 +164,7 @@ EvtScript N(EVS_NpcDefeat_KoopaBros_01) = { EVT_CALL(NpcJump0, NPC_KoopaBros_04, -110, -400, 200, 75) EVT_END_THREAD EVT_THREAD - EVT_WAIT(165) + EVT_WAIT(165 * DT) EVT_EXEC(N(EVS_BossDefeated)) EVT_WAIT(1) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_trd/trd_10/trd_10_3_fake_bowser.c b/src/world/area_trd/trd_10/trd_10_3_fake_bowser.c index 780aa25013..52b8fb0b18 100644 --- a/src/world/area_trd/trd_10/trd_10_3_fake_bowser.c +++ b/src/world/area_trd/trd_10/trd_10_3_fake_bowser.c @@ -50,7 +50,7 @@ EvtScript N(EVS_RevealFakeBowser) = { EVT_WAIT(1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(MakeLerp, 100, -100, 60, EASING_QUADRATIC_OUT) + EVT_CALL(MakeLerp, 100, -100, 60 * DT, EASING_QUADRATIC_OUT) EVT_CALL(PlaySoundAt, SOUND_3BE, SOUND_SPACE_MODE_0, 50, 0, 0) EVT_LABEL(10) EVT_CALL(UpdateLerp) diff --git a/tools/splat_ext/msg_pal_en.yaml b/tools/splat_ext/msg_pal_en.yaml index b60b921b47..290e52f09f 100644 --- a/tools/splat_ext/msg_pal_en.yaml +++ b/tools/splat_ext/msg_pal_en.yaml @@ -5709,6 +5709,16 @@ - [0x1D, 0x01A9, Menus_01A9] - [0x1D, 0x01AA, Menus_01AA] - [0x1D, 0x01AB, Menus_01AB] +- [0x1D, 0x01AC, Menus_BakingFlour] +- [0x1D, 0x01AD, Menus_BakingSugar] +- [0x1D, 0x01AE, Menus_BakingSalt] +- [0x1D, 0x01AF, Menus_BakingEgg] +- [0x1D, 0x01B0, Menus_BakingMilk] +- [0x1D, 0x01B1, Menus_BakingStrawberry] +- [0x1D, 0x01B2, Menus_BakingCream] +- [0x1D, 0x01B3, Menus_BakingButter] +- [0x1D, 0x01B4, Menus_BakingCleanser] +- [0x1D, 0x01B5, Menus_BakingWater] - [0x1E, 0x0000, Choice_0000] - [0x1E, 0x0001, Choice_0001] - [0x1E, 0x0002, Choice_0002] diff --git a/ver/pal/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8_A2CB08.s b/ver/pal/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8_A2CB08.s new file mode 100644 index 0000000000..5af887b255 --- /dev/null +++ b/ver/pal/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8_A2CB08.s @@ -0,0 +1,477 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +.section .rodata + +dlabel jtbl_8024F1F0_A39430 +.word .L8024297C_A2CBBC, .L802429EC_A2CC2C, .L80242A5C_A2CC9C, .L80242ACC_A2CD0C, .L80242BB8_A2CDF8, .L80242C28_A2CE68 + +dlabel D_8024F208_A39448 +.double 51.43 + +dlabel D_8024F210_A39450 +.double 360.01 + +dlabel D_8024F218_A39458 +.double 154.29 + +dlabel D_8024F220_A39460 +.double 205.72 + +dlabel D_8024F228_A39468 +.double 308.58 + +dlabel D_8024F230_A39470 +.double 102.86 + +dlabel D_8024F238_A39478 +.double 257.15 + +.section .text + +glabel func_802428C8_A2CB08 +/* A2CB08 802428C8 27BDFF98 */ addiu $sp, $sp, -0x68 +/* A2CB0C 802428CC AFB30024 */ sw $s3, 0x24($sp) +/* A2CB10 802428D0 0080982D */ daddu $s3, $a0, $zero +/* A2CB14 802428D4 AFBF0034 */ sw $ra, 0x34($sp) +/* A2CB18 802428D8 AFB60030 */ sw $s6, 0x30($sp) +/* A2CB1C 802428DC AFB5002C */ sw $s5, 0x2c($sp) +/* A2CB20 802428E0 AFB40028 */ sw $s4, 0x28($sp) +/* A2CB24 802428E4 AFB20020 */ sw $s2, 0x20($sp) +/* A2CB28 802428E8 AFB1001C */ sw $s1, 0x1c($sp) +/* A2CB2C 802428EC AFB00018 */ sw $s0, 0x18($sp) +/* A2CB30 802428F0 F7BE0060 */ sdc1 $f30, 0x60($sp) +/* A2CB34 802428F4 F7BC0058 */ sdc1 $f28, 0x58($sp) +/* A2CB38 802428F8 F7BA0050 */ sdc1 $f26, 0x50($sp) +/* A2CB3C 802428FC F7B80048 */ sdc1 $f24, 0x48($sp) +/* A2CB40 80242900 F7B60040 */ sdc1 $f22, 0x40($sp) +/* A2CB44 80242904 F7B40038 */ sdc1 $f20, 0x38($sp) +/* A2CB48 80242908 8E70000C */ lw $s0, 0xc($s3) +/* A2CB4C 8024290C 8E050000 */ lw $a1, ($s0) +/* A2CB50 80242910 0C0B1EAF */ jal evt_get_variable +/* A2CB54 80242914 26100004 */ addiu $s0, $s0, 4 +/* A2CB58 80242918 8E050000 */ lw $a1, ($s0) +/* A2CB5C 8024291C 26100004 */ addiu $s0, $s0, 4 +/* A2CB60 80242920 0260202D */ daddu $a0, $s3, $zero +/* A2CB64 80242924 0C0B210B */ jal evt_get_float_variable +/* A2CB68 80242928 0040B02D */ daddu $s6, $v0, $zero +/* A2CB6C 8024292C 8E050000 */ lw $a1, ($s0) +/* A2CB70 80242930 0260202D */ daddu $a0, $s3, $zero +/* A2CB74 80242934 0C0B210B */ jal evt_get_float_variable +/* A2CB78 80242938 E7A00010 */ swc1 $f0, 0x10($sp) +/* A2CB7C 8024293C 0260202D */ daddu $a0, $s3, $zero +/* A2CB80 80242940 3C05F4AC */ lui $a1, 0xf4ac +/* A2CB84 80242944 34A5D480 */ ori $a1, $a1, 0xd480 +/* A2CB88 80242948 0C0B1EAF */ jal evt_get_variable +/* A2CB8C 8024294C 46000706 */ mov.s $f28, $f0 +/* A2CB90 80242950 0040202D */ daddu $a0, $v0, $zero +/* A2CB94 80242954 26C3FFFF */ addiu $v1, $s6, -1 +/* A2CB98 80242958 2C620006 */ sltiu $v0, $v1, 6 +/* A2CB9C 8024295C 104000CE */ beqz $v0, .L80242C98 +/* A2CBA0 80242960 0080882D */ daddu $s1, $a0, $zero +/* A2CBA4 80242964 00031080 */ sll $v0, $v1, 2 +/* A2CBA8 80242968 3C018025 */ lui $at, %hi(jtbl_8024F1F0_A39430) +/* A2CBAC 8024296C 00220821 */ addu $at, $at, $v0 +/* A2CBB0 80242970 8C22F1F0 */ lw $v0, %lo(jtbl_8024F1F0_A39430)($at) +/* A2CBB4 80242974 00400008 */ jr $v0 +/* A2CBB8 80242978 00000000 */ nop +.L8024297C_A2CBBC: +/* A2CBBC 8024297C 3C108025 */ lui $s0, %hi(hos_05_D_8024F3F8) +/* A2CBC0 80242980 2610F3F8 */ addiu $s0, $s0, %lo(hos_05_D_8024F3F8) +/* A2CBC4 80242984 0200902D */ daddu $s2, $s0, $zero +/* A2CBC8 80242988 2415001E */ addiu $s5, $zero, 0x1e +/* A2CBCC 8024298C 8E22000C */ lw $v0, 0xc($s1) +/* A2CBD0 80242990 8C420014 */ lw $v0, 0x14($v0) +/* A2CBD4 80242994 3C0142B4 */ lui $at, 0x42b4 +/* A2CBD8 80242998 4481F000 */ mtc1 $at, $f30 +/* A2CBDC 8024299C 00551021 */ addu $v0, $v0, $s5 +/* A2CBE0 802429A0 44821000 */ mtc1 $v0, $f2 +/* A2CBE4 802429A4 00000000 */ nop +/* A2CBE8 802429A8 468010A1 */ cvt.d.w $f2, $f2 +/* A2CBEC 802429AC 04410006 */ bgez $v0, .L802429C8 +/* A2CBF0 802429B0 24140003 */ addiu $s4, $zero, 3 +/* A2CBF4 802429B4 3C0141F0 */ lui $at, 0x41f0 +/* A2CBF8 802429B8 44810800 */ mtc1 $at, $f1 +/* A2CBFC 802429BC 44800000 */ mtc1 $zero, $f0 +/* A2CC00 802429C0 00000000 */ nop +/* A2CC04 802429C4 46201080 */ add.d $f2, $f2, $f0 +.L802429C8: +/* A2CC08 802429C8 3C014080 */ lui $at, 0x4080 +/* A2CC0C 802429CC 44810000 */ mtc1 $at, $f0 +/* A2CC10 802429D0 46201520 */ cvt.s.d $f20, $f2 +/* A2CC14 802429D4 4600A502 */ mul.s $f20, $f20, $f0 +/* A2CC18 802429D8 00000000 */ nop +/* A2CC1C 802429DC 3C018025 */ lui $at, %hi(D_8024F208_A39448) +/* A2CC20 802429E0 D420F208 */ ldc1 $f0, %lo(D_8024F208_A39448)($at) +/* A2CC24 802429E4 08090B41 */ j .L80242D04 +/* A2CC28 802429E8 4600A521 */ cvt.d.s $f20, $f20 +.L802429EC_A2CC2C: +/* A2CC2C 802429EC 3C108025 */ lui $s0, %hi(hos_05_D_8024F3F8 + 0x28) +/* A2CC30 802429F0 2610F420 */ addiu $s0, $s0, %lo(hos_05_D_8024F3F8 + 0x28) +/* A2CC34 802429F4 0200902D */ daddu $s2, $s0, $zero +/* A2CC38 802429F8 2415001E */ addiu $s5, $zero, 0x1e +/* A2CC3C 802429FC 8E22000C */ lw $v0, 0xc($s1) +/* A2CC40 80242A00 8C420014 */ lw $v0, 0x14($v0) +/* A2CC44 80242A04 3C0142B4 */ lui $at, 0x42b4 +/* A2CC48 80242A08 4481F000 */ mtc1 $at, $f30 +/* A2CC4C 80242A0C 00551021 */ addu $v0, $v0, $s5 +/* A2CC50 80242A10 44821000 */ mtc1 $v0, $f2 +/* A2CC54 80242A14 00000000 */ nop +/* A2CC58 80242A18 468010A1 */ cvt.d.w $f2, $f2 +/* A2CC5C 80242A1C 04410006 */ bgez $v0, .L80242A38 +/* A2CC60 80242A20 24140003 */ addiu $s4, $zero, 3 +/* A2CC64 80242A24 3C0141F0 */ lui $at, 0x41f0 +/* A2CC68 80242A28 44810800 */ mtc1 $at, $f1 +/* A2CC6C 80242A2C 44800000 */ mtc1 $zero, $f0 +/* A2CC70 80242A30 00000000 */ nop +/* A2CC74 80242A34 46201080 */ add.d $f2, $f2, $f0 +.L80242A38: +/* A2CC78 80242A38 3C014080 */ lui $at, 0x4080 +/* A2CC7C 80242A3C 44810000 */ mtc1 $at, $f0 +/* A2CC80 80242A40 46201520 */ cvt.s.d $f20, $f2 +/* A2CC84 80242A44 4600A502 */ mul.s $f20, $f20, $f0 +/* A2CC88 80242A48 00000000 */ nop +/* A2CC8C 80242A4C 3C018025 */ lui $at, %hi(D_8024F210_A39450) +/* A2CC90 80242A50 D420F210 */ ldc1 $f0, %lo(D_8024F210_A39450)($at) +/* A2CC94 80242A54 08090B41 */ j .L80242D04 +/* A2CC98 80242A58 4600A521 */ cvt.d.s $f20, $f20 +.L80242A5C_A2CC9C: +/* A2CC9C 80242A5C 3C108025 */ lui $s0, %hi(hos_05_D_8024F3F8 + 0x50) +/* A2CCA0 80242A60 2610F448 */ addiu $s0, $s0, %lo(hos_05_D_8024F3F8 + 0x50) +/* A2CCA4 80242A64 0200902D */ daddu $s2, $s0, $zero +/* A2CCA8 80242A68 2415001E */ addiu $s5, $zero, 0x1e +/* A2CCAC 80242A6C 8E22000C */ lw $v0, 0xc($s1) +/* A2CCB0 80242A70 8C420014 */ lw $v0, 0x14($v0) +/* A2CCB4 80242A74 3C0142B4 */ lui $at, 0x42b4 +/* A2CCB8 80242A78 4481F000 */ mtc1 $at, $f30 +/* A2CCBC 80242A7C 00551021 */ addu $v0, $v0, $s5 +/* A2CCC0 80242A80 44821000 */ mtc1 $v0, $f2 +/* A2CCC4 80242A84 00000000 */ nop +/* A2CCC8 80242A88 468010A1 */ cvt.d.w $f2, $f2 +/* A2CCCC 80242A8C 04410006 */ bgez $v0, .L80242AA8 +/* A2CCD0 80242A90 24140003 */ addiu $s4, $zero, 3 +/* A2CCD4 80242A94 3C0141F0 */ lui $at, 0x41f0 +/* A2CCD8 80242A98 44810800 */ mtc1 $at, $f1 +/* A2CCDC 80242A9C 44800000 */ mtc1 $zero, $f0 +/* A2CCE0 80242AA0 00000000 */ nop +/* A2CCE4 80242AA4 46201080 */ add.d $f2, $f2, $f0 +.L80242AA8: +/* A2CCE8 80242AA8 3C014080 */ lui $at, 0x4080 +/* A2CCEC 80242AAC 44810000 */ mtc1 $at, $f0 +/* A2CCF0 80242AB0 46201520 */ cvt.s.d $f20, $f2 +/* A2CCF4 80242AB4 4600A502 */ mul.s $f20, $f20, $f0 +/* A2CCF8 80242AB8 00000000 */ nop +/* A2CCFC 80242ABC 3C018025 */ lui $at, %hi(D_8024F218_A39458) +/* A2CD00 80242AC0 D420F218 */ ldc1 $f0, %lo(D_8024F218_A39458)($at) +/* A2CD04 80242AC4 08090B41 */ j .L80242D04 +/* A2CD08 80242AC8 4600A521 */ cvt.d.s $f20, $f20 +.L80242ACC_A2CD0C: +/* A2CD0C 80242ACC 3C108025 */ lui $s0, %hi(hos_05_D_8024F3F8 + 0x78) +/* A2CD10 80242AD0 2610F470 */ addiu $s0, $s0, %lo(hos_05_D_8024F3F8 + 0x78) +/* A2CD14 80242AD4 8E22000C */ lw $v0, 0xc($s1) +/* A2CD18 80242AD8 2415001E */ addiu $s5, $zero, 0x1e +/* A2CD1C 80242ADC 8C420014 */ lw $v0, 0x14($v0) +/* A2CD20 80242AE0 3C0142B4 */ lui $at, 0x42b4 +/* A2CD24 80242AE4 4481F000 */ mtc1 $at, $f30 +/* A2CD28 80242AE8 00551021 */ addu $v0, $v0, $s5 +/* A2CD2C 80242AEC 44821000 */ mtc1 $v0, $f2 +/* A2CD30 80242AF0 00000000 */ nop +/* A2CD34 80242AF4 468010A1 */ cvt.d.w $f2, $f2 +/* A2CD38 80242AF8 04410006 */ bgez $v0, .L80242B14 +/* A2CD3C 80242AFC 0200902D */ daddu $s2, $s0, $zero +/* A2CD40 80242B00 3C0141F0 */ lui $at, 0x41f0 +/* A2CD44 80242B04 44810800 */ mtc1 $at, $f1 +/* A2CD48 80242B08 44800000 */ mtc1 $zero, $f0 +/* A2CD4C 80242B0C 00000000 */ nop +/* A2CD50 80242B10 46201080 */ add.d $f2, $f2, $f0 +.L80242B14: +/* A2CD54 80242B14 3C014080 */ lui $at, 0x4080 +/* A2CD58 80242B18 44810000 */ mtc1 $at, $f0 +/* A2CD5C 80242B1C 46201520 */ cvt.s.d $f20, $f2 +/* A2CD60 80242B20 4600A502 */ mul.s $f20, $f20, $f0 +/* A2CD64 80242B24 00000000 */ nop +/* A2CD68 80242B28 3C018025 */ lui $at, %hi(D_8024F220_A39460) +/* A2CD6C 80242B2C D420F220 */ ldc1 $f0, %lo(D_8024F220_A39460)($at) +/* A2CD70 80242B30 4600A521 */ cvt.d.s $f20, $f20 +/* A2CD74 80242B34 4620A500 */ add.d $f20, $f20, $f0 +/* A2CD78 80242B38 4620A520 */ cvt.s.d $f20, $f20 +/* A2CD7C 80242B3C 0C00A8BB */ jal sin_deg +/* A2CD80 80242B40 4600A306 */ mov.s $f12, $f20 +/* A2CD84 80242B44 4600F306 */ mov.s $f12, $f30 +/* A2CD88 80242B48 3C014248 */ lui $at, 0x4248 +/* A2CD8C 80242B4C 4481B000 */ mtc1 $at, $f22 +/* A2CD90 80242B50 0C00A8BB */ jal sin_deg +/* A2CD94 80242B54 46000606 */ mov.s $f24, $f0 +/* A2CD98 80242B58 46160002 */ mul.s $f0, $f0, $f22 +/* A2CD9C 80242B5C 00000000 */ nop +/* A2CDA0 80242B60 46180002 */ mul.s $f0, $f0, $f24 +/* A2CDA4 80242B64 00000000 */ nop +/* A2CDA8 80242B68 8E22000C */ lw $v0, 0xc($s1) +/* A2CDAC 80242B6C C4420004 */ lwc1 $f2, 4($v0) +/* A2CDB0 80242B70 46001680 */ add.s $f26, $f2, $f0 +/* A2CDB4 80242B74 0C00A8D4 */ jal cos_deg +/* A2CDB8 80242B78 4600A306 */ mov.s $f12, $f20 +/* A2CDBC 80242B7C 46160002 */ mul.s $f0, $f0, $f22 +/* A2CDC0 80242B80 00000000 */ nop +/* A2CDC4 80242B84 8E22000C */ lw $v0, 0xc($s1) +/* A2CDC8 80242B88 C4420008 */ lwc1 $f2, 8($v0) +/* A2CDCC 80242B8C 46001500 */ add.s $f20, $f2, $f0 +/* A2CDD0 80242B90 0C00A8BB */ jal sin_deg +/* A2CDD4 80242B94 4600F306 */ mov.s $f12, $f30 +/* A2CDD8 80242B98 46160002 */ mul.s $f0, $f0, $f22 +/* A2CDDC 80242B9C 00000000 */ nop +/* A2CDE0 80242BA0 46180002 */ mul.s $f0, $f0, $f24 +/* A2CDE4 80242BA4 00000000 */ nop +/* A2CDE8 80242BA8 8E22000C */ lw $v0, 0xc($s1) +/* A2CDEC 80242BAC C442000C */ lwc1 $f2, 0xc($v0) +/* A2CDF0 80242BB0 08090B60 */ j .L80242D80 +/* A2CDF4 80242BB4 24140003 */ addiu $s4, $zero, 3 +.L80242BB8_A2CDF8: +/* A2CDF8 80242BB8 3C108025 */ lui $s0, %hi(hos_05_D_8024F3F8 + 0xA0) +/* A2CDFC 80242BBC 2610F498 */ addiu $s0, $s0, %lo(hos_05_D_8024F3F8 + 0xA0) +/* A2CE00 80242BC0 0200902D */ daddu $s2, $s0, $zero +/* A2CE04 80242BC4 2415001E */ addiu $s5, $zero, 0x1e +/* A2CE08 80242BC8 8E22000C */ lw $v0, 0xc($s1) +/* A2CE0C 80242BCC 8C420014 */ lw $v0, 0x14($v0) +/* A2CE10 80242BD0 3C0142B4 */ lui $at, 0x42b4 +/* A2CE14 80242BD4 4481F000 */ mtc1 $at, $f30 +/* A2CE18 80242BD8 00551021 */ addu $v0, $v0, $s5 +/* A2CE1C 80242BDC 44821000 */ mtc1 $v0, $f2 +/* A2CE20 80242BE0 00000000 */ nop +/* A2CE24 80242BE4 468010A1 */ cvt.d.w $f2, $f2 +/* A2CE28 80242BE8 04410006 */ bgez $v0, .L80242C04 +/* A2CE2C 80242BEC 24140003 */ addiu $s4, $zero, 3 +/* A2CE30 80242BF0 3C0141F0 */ lui $at, 0x41f0 +/* A2CE34 80242BF4 44810800 */ mtc1 $at, $f1 +/* A2CE38 80242BF8 44800000 */ mtc1 $zero, $f0 +/* A2CE3C 80242BFC 00000000 */ nop +/* A2CE40 80242C00 46201080 */ add.d $f2, $f2, $f0 +.L80242C04: +/* A2CE44 80242C04 3C014080 */ lui $at, 0x4080 +/* A2CE48 80242C08 44810000 */ mtc1 $at, $f0 +/* A2CE4C 80242C0C 46201520 */ cvt.s.d $f20, $f2 +/* A2CE50 80242C10 4600A502 */ mul.s $f20, $f20, $f0 +/* A2CE54 80242C14 00000000 */ nop +/* A2CE58 80242C18 3C018025 */ lui $at, %hi(D_8024F228_A39468) +/* A2CE5C 80242C1C D420F228 */ ldc1 $f0, %lo(D_8024F228_A39468)($at) +/* A2CE60 80242C20 08090B41 */ j .L80242D04 +/* A2CE64 80242C24 4600A521 */ cvt.d.s $f20, $f20 +.L80242C28_A2CE68: +/* A2CE68 80242C28 3C108025 */ lui $s0, %hi(hos_05_D_8024F3F8 + 0xC8) +/* A2CE6C 80242C2C 2610F4C0 */ addiu $s0, $s0, %lo(hos_05_D_8024F3F8 + 0xC8) +/* A2CE70 80242C30 0200902D */ daddu $s2, $s0, $zero +/* A2CE74 80242C34 2415001E */ addiu $s5, $zero, 0x1e +/* A2CE78 80242C38 8E22000C */ lw $v0, 0xc($s1) +/* A2CE7C 80242C3C 8C420014 */ lw $v0, 0x14($v0) +/* A2CE80 80242C40 3C0142B4 */ lui $at, 0x42b4 +/* A2CE84 80242C44 4481F000 */ mtc1 $at, $f30 +/* A2CE88 80242C48 00551021 */ addu $v0, $v0, $s5 +/* A2CE8C 80242C4C 44821000 */ mtc1 $v0, $f2 +/* A2CE90 80242C50 00000000 */ nop +/* A2CE94 80242C54 468010A1 */ cvt.d.w $f2, $f2 +/* A2CE98 80242C58 04410006 */ bgez $v0, .L80242C74 +/* A2CE9C 80242C5C 24140003 */ addiu $s4, $zero, 3 +/* A2CEA0 80242C60 3C0141F0 */ lui $at, 0x41f0 +/* A2CEA4 80242C64 44810800 */ mtc1 $at, $f1 +/* A2CEA8 80242C68 44800000 */ mtc1 $zero, $f0 +/* A2CEAC 80242C6C 00000000 */ nop +/* A2CEB0 80242C70 46201080 */ add.d $f2, $f2, $f0 +.L80242C74: +/* A2CEB4 80242C74 3C014080 */ lui $at, 0x4080 +/* A2CEB8 80242C78 44810000 */ mtc1 $at, $f0 +/* A2CEBC 80242C7C 46201520 */ cvt.s.d $f20, $f2 +/* A2CEC0 80242C80 4600A502 */ mul.s $f20, $f20, $f0 +/* A2CEC4 80242C84 00000000 */ nop +/* A2CEC8 80242C88 3C018025 */ lui $at, %hi(D_8024F230_A39470) +/* A2CECC 80242C8C D420F230 */ ldc1 $f0, %lo(D_8024F230_A39470)($at) +/* A2CED0 80242C90 08090B41 */ j .L80242D04 +/* A2CED4 80242C94 4600A521 */ cvt.d.s $f20, $f20 +.L80242C98: +/* A2CED8 80242C98 3C108025 */ lui $s0, %hi(hos_05_D_8024F3F8 + 0xF0) +/* A2CEDC 80242C9C 2610F4E8 */ addiu $s0, $s0, %lo(hos_05_D_8024F3F8 + 0xF0) +/* A2CEE0 80242CA0 0200902D */ daddu $s2, $s0, $zero +/* A2CEE4 80242CA4 2415001E */ addiu $s5, $zero, 0x1e +/* A2CEE8 80242CA8 8C82000C */ lw $v0, 0xc($a0) +/* A2CEEC 80242CAC 8C420014 */ lw $v0, 0x14($v0) +/* A2CEF0 80242CB0 3C0142B4 */ lui $at, 0x42b4 +/* A2CEF4 80242CB4 4481F000 */ mtc1 $at, $f30 +/* A2CEF8 80242CB8 00551021 */ addu $v0, $v0, $s5 +/* A2CEFC 80242CBC 44821000 */ mtc1 $v0, $f2 +/* A2CF00 80242CC0 00000000 */ nop +/* A2CF04 80242CC4 468010A1 */ cvt.d.w $f2, $f2 +/* A2CF08 80242CC8 04410006 */ bgez $v0, .L80242CE4 +/* A2CF0C 80242CCC 24140003 */ addiu $s4, $zero, 3 +/* A2CF10 80242CD0 3C0141F0 */ lui $at, 0x41f0 +/* A2CF14 80242CD4 44810800 */ mtc1 $at, $f1 +/* A2CF18 80242CD8 44800000 */ mtc1 $zero, $f0 +/* A2CF1C 80242CDC 00000000 */ nop +/* A2CF20 80242CE0 46201080 */ add.d $f2, $f2, $f0 +.L80242CE4: +/* A2CF24 80242CE4 3C014080 */ lui $at, 0x4080 +/* A2CF28 80242CE8 44810000 */ mtc1 $at, $f0 +/* A2CF2C 80242CEC 46201520 */ cvt.s.d $f20, $f2 +/* A2CF30 80242CF0 4600A502 */ mul.s $f20, $f20, $f0 +/* A2CF34 80242CF4 00000000 */ nop +/* A2CF38 80242CF8 3C018025 */ lui $at, %hi(D_8024F238_A39478) +/* A2CF3C 80242CFC D420F238 */ ldc1 $f0, %lo(D_8024F238_A39478)($at) +/* A2CF40 80242D00 4600A521 */ cvt.d.s $f20, $f20 +.L80242D04: +/* A2CF44 80242D04 4620A500 */ add.d $f20, $f20, $f0 +/* A2CF48 80242D08 4620A520 */ cvt.s.d $f20, $f20 +/* A2CF4C 80242D0C 0C00A8BB */ jal sin_deg +/* A2CF50 80242D10 4600A306 */ mov.s $f12, $f20 +/* A2CF54 80242D14 4600F306 */ mov.s $f12, $f30 +/* A2CF58 80242D18 3C014248 */ lui $at, 0x4248 +/* A2CF5C 80242D1C 4481B000 */ mtc1 $at, $f22 +/* A2CF60 80242D20 0C00A8BB */ jal sin_deg +/* A2CF64 80242D24 46000606 */ mov.s $f24, $f0 +/* A2CF68 80242D28 46160002 */ mul.s $f0, $f0, $f22 +/* A2CF6C 80242D2C 00000000 */ nop +/* A2CF70 80242D30 46180002 */ mul.s $f0, $f0, $f24 +/* A2CF74 80242D34 00000000 */ nop +/* A2CF78 80242D38 8E22000C */ lw $v0, 0xc($s1) +/* A2CF7C 80242D3C C4420004 */ lwc1 $f2, 4($v0) +/* A2CF80 80242D40 46001680 */ add.s $f26, $f2, $f0 +/* A2CF84 80242D44 0C00A8D4 */ jal cos_deg +/* A2CF88 80242D48 4600A306 */ mov.s $f12, $f20 +/* A2CF8C 80242D4C 46160002 */ mul.s $f0, $f0, $f22 +/* A2CF90 80242D50 00000000 */ nop +/* A2CF94 80242D54 8E22000C */ lw $v0, 0xc($s1) +/* A2CF98 80242D58 C4420008 */ lwc1 $f2, 8($v0) +/* A2CF9C 80242D5C 46001500 */ add.s $f20, $f2, $f0 +/* A2CFA0 80242D60 0C00A8BB */ jal sin_deg +/* A2CFA4 80242D64 4600F306 */ mov.s $f12, $f30 +/* A2CFA8 80242D68 46160002 */ mul.s $f0, $f0, $f22 +/* A2CFAC 80242D6C 00000000 */ nop +/* A2CFB0 80242D70 46180002 */ mul.s $f0, $f0, $f24 +/* A2CFB4 80242D74 00000000 */ nop +/* A2CFB8 80242D78 8E22000C */ lw $v0, 0xc($s1) +/* A2CFBC 80242D7C C442000C */ lwc1 $f2, 0xc($v0) +.L80242D80: +/* A2CFC0 80242D80 46001080 */ add.s $f2, $f2, $f0 +/* A2CFC4 80242D84 E61A0018 */ swc1 $f26, 0x18($s0) +/* A2CFC8 80242D88 E614001C */ swc1 $f20, 0x1c($s0) +/* A2CFCC 80242D8C E6020020 */ swc1 $f2, 0x20($s0) +/* A2CFD0 80242D90 0260202D */ daddu $a0, $s3, $zero +/* A2CFD4 80242D94 3C05FE36 */ lui $a1, 0xfe36 +/* A2CFD8 80242D98 0C0B210B */ jal evt_get_float_variable +/* A2CFDC 80242D9C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A2CFE0 80242DA0 0260202D */ daddu $a0, $s3, $zero +/* A2CFE4 80242DA4 3C05FE36 */ lui $a1, 0xfe36 +/* A2CFE8 80242DA8 34A53C81 */ ori $a1, $a1, 0x3c81 +/* A2CFEC 80242DAC 0C0B210B */ jal evt_get_float_variable +/* A2CFF0 80242DB0 E6400000 */ swc1 $f0, ($s2) +/* A2CFF4 80242DB4 0260202D */ daddu $a0, $s3, $zero +/* A2CFF8 80242DB8 3C05FE36 */ lui $a1, 0xfe36 +/* A2CFFC 80242DBC 34A53C82 */ ori $a1, $a1, 0x3c82 +/* A2D000 80242DC0 0C0B210B */ jal evt_get_float_variable +/* A2D004 80242DC4 E6400004 */ swc1 $f0, 4($s2) +/* A2D008 80242DC8 26510018 */ addiu $s1, $s2, 0x18 +/* A2D00C 80242DCC E6400008 */ swc1 $f0, 8($s2) +/* A2D010 80242DD0 24020002 */ addiu $v0, $zero, 2 +/* A2D014 80242DD4 12C20028 */ beq $s6, $v0, .L80242E78 +/* A2D018 80242DD8 2652000C */ addiu $s2, $s2, 0xc +/* A2D01C 80242DDC 0260202D */ daddu $a0, $s3, $zero +/* A2D020 80242DE0 3C05FE36 */ lui $a1, 0xfe36 +/* A2D024 80242DE4 0C0B210B */ jal evt_get_float_variable +/* A2D028 80242DE8 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A2D02C 80242DEC 461C0002 */ mul.s $f0, $f0, $f28 +/* A2D030 80242DF0 00000000 */ nop +/* A2D034 80242DF4 3C013F80 */ lui $at, 0x3f80 +/* A2D038 80242DF8 4481A000 */ mtc1 $at, $f20 +/* A2D03C 80242DFC 00000000 */ nop +/* A2D040 80242E00 461CA501 */ sub.s $f20, $f20, $f28 +/* A2D044 80242E04 C6220000 */ lwc1 $f2, ($s1) +/* A2D048 80242E08 46141082 */ mul.s $f2, $f2, $f20 +/* A2D04C 80242E0C 00000000 */ nop +/* A2D050 80242E10 0260202D */ daddu $a0, $s3, $zero +/* A2D054 80242E14 46020000 */ add.s $f0, $f0, $f2 +/* A2D058 80242E18 3C05FE36 */ lui $a1, 0xfe36 +/* A2D05C 80242E1C 34A53C81 */ ori $a1, $a1, 0x3c81 +/* A2D060 80242E20 0C0B210B */ jal evt_get_float_variable +/* A2D064 80242E24 E6400000 */ swc1 $f0, ($s2) +/* A2D068 80242E28 461C0002 */ mul.s $f0, $f0, $f28 +/* A2D06C 80242E2C 00000000 */ nop +/* A2D070 80242E30 C6220004 */ lwc1 $f2, 4($s1) +/* A2D074 80242E34 46141082 */ mul.s $f2, $f2, $f20 +/* A2D078 80242E38 00000000 */ nop +/* A2D07C 80242E3C 46020000 */ add.s $f0, $f0, $f2 +/* A2D080 80242E40 C7A40010 */ lwc1 $f4, 0x10($sp) +/* A2D084 80242E44 0260202D */ daddu $a0, $s3, $zero +/* A2D088 80242E48 46040000 */ add.s $f0, $f0, $f4 +/* A2D08C 80242E4C 3C05FE36 */ lui $a1, 0xfe36 +/* A2D090 80242E50 34A53C82 */ ori $a1, $a1, 0x3c82 +/* A2D094 80242E54 0C0B210B */ jal evt_get_float_variable +/* A2D098 80242E58 E6400004 */ swc1 $f0, 4($s2) +/* A2D09C 80242E5C 461C0002 */ mul.s $f0, $f0, $f28 +/* A2D0A0 80242E60 00000000 */ nop +/* A2D0A4 80242E64 C6220008 */ lwc1 $f2, 8($s1) +/* A2D0A8 80242E68 46141082 */ mul.s $f2, $f2, $f20 +/* A2D0AC 80242E6C 00000000 */ nop +/* A2D0B0 80242E70 08090BC8 */ j .L80242F20 +/* A2D0B4 80242E74 46020000 */ add.s $f0, $f0, $f2 +.L80242E78: +/* A2D0B8 80242E78 0260202D */ daddu $a0, $s3, $zero +/* A2D0BC 80242E7C 3C05FE36 */ lui $a1, 0xfe36 +/* A2D0C0 80242E80 0C0B210B */ jal evt_get_float_variable +/* A2D0C4 80242E84 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A2D0C8 80242E88 461C0002 */ mul.s $f0, $f0, $f28 +/* A2D0CC 80242E8C 00000000 */ nop +/* A2D0D0 80242E90 3C013F80 */ lui $at, 0x3f80 +/* A2D0D4 80242E94 4481A000 */ mtc1 $at, $f20 +/* A2D0D8 80242E98 00000000 */ nop +/* A2D0DC 80242E9C 461CA501 */ sub.s $f20, $f20, $f28 +/* A2D0E0 80242EA0 C6220000 */ lwc1 $f2, ($s1) +/* A2D0E4 80242EA4 46141082 */ mul.s $f2, $f2, $f20 +/* A2D0E8 80242EA8 00000000 */ nop +/* A2D0EC 80242EAC 46020000 */ add.s $f0, $f0, $f2 +/* A2D0F0 80242EB0 3C014248 */ lui $at, 0x4248 +/* A2D0F4 80242EB4 4481B000 */ mtc1 $at, $f22 +/* A2D0F8 80242EB8 0260202D */ daddu $a0, $s3, $zero +/* A2D0FC 80242EBC 46160001 */ sub.s $f0, $f0, $f22 +/* A2D100 80242EC0 3C05FE36 */ lui $a1, 0xfe36 +/* A2D104 80242EC4 34A53C81 */ ori $a1, $a1, 0x3c81 +/* A2D108 80242EC8 0C0B210B */ jal evt_get_float_variable +/* A2D10C 80242ECC E6400000 */ swc1 $f0, ($s2) +/* A2D110 80242ED0 461C0002 */ mul.s $f0, $f0, $f28 +/* A2D114 80242ED4 00000000 */ nop +/* A2D118 80242ED8 C6220004 */ lwc1 $f2, 4($s1) +/* A2D11C 80242EDC 46141082 */ mul.s $f2, $f2, $f20 +/* A2D120 80242EE0 00000000 */ nop +/* A2D124 80242EE4 46020000 */ add.s $f0, $f0, $f2 +/* A2D128 80242EE8 C7A40010 */ lwc1 $f4, 0x10($sp) +/* A2D12C 80242EEC 0260202D */ daddu $a0, $s3, $zero +/* A2D130 80242EF0 46040000 */ add.s $f0, $f0, $f4 +/* A2D134 80242EF4 3C05FE36 */ lui $a1, 0xfe36 +/* A2D138 80242EF8 34A53C82 */ ori $a1, $a1, 0x3c82 +/* A2D13C 80242EFC 0C0B210B */ jal evt_get_float_variable +/* A2D140 80242F00 E6400004 */ swc1 $f0, 4($s2) +/* A2D144 80242F04 461C0002 */ mul.s $f0, $f0, $f28 +/* A2D148 80242F08 00000000 */ nop +/* A2D14C 80242F0C C6220008 */ lwc1 $f2, 8($s1) +/* A2D150 80242F10 46141082 */ mul.s $f2, $f2, $f20 +/* A2D154 80242F14 00000000 */ nop +/* A2D158 80242F18 46020000 */ add.s $f0, $f0, $f2 +/* A2D15C 80242F1C 46160001 */ sub.s $f0, $f0, $f22 +.L80242F20: +/* A2D160 80242F20 E6400008 */ swc1 $f0, 8($s2) +/* A2D164 80242F24 AE750084 */ sw $s5, 0x84($s3) +/* A2D168 80242F28 AE700088 */ sw $s0, 0x88($s3) +/* A2D16C 80242F2C AE74008C */ sw $s4, 0x8c($s3) +/* A2D170 80242F30 8FBF0034 */ lw $ra, 0x34($sp) +/* A2D174 80242F34 8FB60030 */ lw $s6, 0x30($sp) +/* A2D178 80242F38 8FB5002C */ lw $s5, 0x2c($sp) +/* A2D17C 80242F3C 8FB40028 */ lw $s4, 0x28($sp) +/* A2D180 80242F40 8FB30024 */ lw $s3, 0x24($sp) +/* A2D184 80242F44 8FB20020 */ lw $s2, 0x20($sp) +/* A2D188 80242F48 8FB1001C */ lw $s1, 0x1c($sp) +/* A2D18C 80242F4C 8FB00018 */ lw $s0, 0x18($sp) +/* A2D190 80242F50 D7BE0060 */ ldc1 $f30, 0x60($sp) +/* A2D194 80242F54 D7BC0058 */ ldc1 $f28, 0x58($sp) +/* A2D198 80242F58 D7BA0050 */ ldc1 $f26, 0x50($sp) +/* A2D19C 80242F5C D7B80048 */ ldc1 $f24, 0x48($sp) +/* A2D1A0 80242F60 D7B60040 */ ldc1 $f22, 0x40($sp) +/* A2D1A4 80242F64 D7B40038 */ ldc1 $f20, 0x38($sp) +/* A2D1A8 80242F68 24020002 */ addiu $v0, $zero, 2 +/* A2D1AC 80242F6C 03E00008 */ jr $ra +/* A2D1B0 80242F70 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/pal/asm/nonmatchings/world/area_hos/hos_05/hos_05_5_intro/AnimBowser_FlyOff.s b/ver/pal/asm/nonmatchings/world/area_hos/hos_05/hos_05_5_intro/AnimBowser_FlyOff.s new file mode 100644 index 0000000000..3362bb6745 --- /dev/null +++ b/ver/pal/asm/nonmatchings/world/area_hos/hos_05/hos_05_5_intro/AnimBowser_FlyOff.s @@ -0,0 +1,70 @@ +.set noat /* allow manual use of $at */ +.set noreorder /* don't insert nops after branches */ + +/* Generated by spimdisasm 1.11.1 */ + +glabel hos_05_AnimBowser_FlyOff +/* A9A8B4 80244774 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* A9A8B8 80244778 AFB00018 */ sw $s0, 0x18($sp) +/* A9A8BC 8024477C 0080802D */ daddu $s0, $a0, $zero +/* A9A8C0 80244780 AFB1001C */ sw $s1, 0x1C($sp) +/* A9A8C4 80244784 00A0882D */ daddu $s1, $a1, $zero +/* A9A8C8 80244788 24050007 */ addiu $a1, $zero, 0x7 +/* A9A8CC 8024478C AFBF0028 */ sw $ra, 0x28($sp) +/* A9A8D0 80244790 AFB30024 */ sw $s3, 0x24($sp) +/* A9A8D4 80244794 0C0B42B0 */ jal resolve_npc +/* A9A8D8 80244798 AFB20020 */ sw $s2, 0x20($sp) +/* A9A8DC 8024479C 0200202D */ daddu $a0, $s0, $zero +/* A9A8E0 802447A0 24050008 */ addiu $a1, $zero, 0x8 +/* A9A8E4 802447A4 0C0B42B0 */ jal resolve_npc +/* A9A8E8 802447A8 0040902D */ daddu $s2, $v0, $zero +/* A9A8EC 802447AC 12200004 */ beqz $s1, .LPAL_802447C0 +/* A9A8F0 802447B0 0040982D */ daddu $s3, $v0, $zero +/* A9A8F4 802447B4 C640003C */ lwc1 $f0, 0x3C($s2) +/* A9A8F8 802447B8 3C018025 */ lui $at, %hi(hos_05_AnimBowser_FlyOff_InitialY) +/* A9A8FC 802447BC E420F314 */ swc1 $f0, %lo(hos_05_AnimBowser_FlyOff_InitialY)($at) +.LPAL_802447C0: +/* A9A900 802447C0 3C018025 */ lui $at, %hi(hos_05_AnimBowser_FlyOff_InitialY) +/* A9A904 802447C4 C420F314 */ lwc1 $f0, %lo(hos_05_AnimBowser_FlyOff_InitialY)($at) +/* A9A908 802447C8 24040003 */ addiu $a0, $zero, 0x3 +/* A9A90C 802447CC 44050000 */ mfc1 $a1, $f0 +/* A9A910 802447D0 3C0143FA */ lui $at, (0x43FA0000 >> 16) +/* A9A914 802447D4 44810000 */ mtc1 $at, $f0 +/* A9A918 802447D8 44853000 */ mtc1 $a1, $f6 +/* A9A91C 802447DC 3C108025 */ lui $s0, %hi(hos_05_AnimBowser_FlyOff_Time) +/* A9A920 802447E0 2610AE70 */ addiu $s0, $s0, %lo(hos_05_AnimBowser_FlyOff_Time) +/* A9A924 802447E4 46003180 */ add.s $f6, $f6, $f0 +/* A9A928 802447E8 3C014220 */ lui $at, (0x42200000 >> 16) +/* A9A92C 802447EC 44811000 */ mtc1 $at, $f2 +/* A9A930 802447F0 8E070000 */ lw $a3, 0x0($s0) +/* A9A934 802447F4 44063000 */ mfc1 $a2, $f6 +/* A9A938 802447F8 2642003C */ addiu $v0, $s2, 0x3C +/* A9A93C 802447FC AFA20014 */ sw $v0, 0x14($sp) +/* A9A940 80244800 0C090439 */ jal interp_value_with_easing +/* A9A944 80244804 E7A20010 */ swc1 $f2, 0x10($sp) +/* A9A948 80244808 C640003C */ lwc1 $f0, 0x3C($s2) +/* A9A94C 8024480C 3C013F80 */ lui $at, (0x3F800000 >> 16) +/* A9A950 80244810 44811000 */ mtc1 $at, $f2 +/* A9A954 80244814 E660003C */ swc1 $f0, 0x3C($s3) +/* A9A958 80244818 C6000000 */ lwc1 $f0, 0x0($s0) +/* A9A95C 8024481C C644003C */ lwc1 $f4, 0x3C($s2) +/* A9A960 80244820 46020000 */ add.s $f0, $f0, $f2 +/* A9A964 80244824 E6440070 */ swc1 $f4, 0x70($s2) +/* A9A968 80244828 C662003C */ lwc1 $f2, 0x3C($s3) +/* A9A96C 8024482C 3C014204 */ lui $at, (0x42040000 >> 16) +/* A9A970 80244830 44812000 */ mtc1 $at, $f4 +/* A9A974 80244834 24020001 */ addiu $v0, $zero, 0x1 +/* A9A978 80244838 E6620070 */ swc1 $f2, 0x70($s3) +/* A9A97C 8024483C 4600203C */ c.lt.s $f4, $f0 +/* A9A980 80244840 00000000 */ nop +/* A9A984 80244844 45010002 */ bc1t .LPAL_80244850 +/* A9A988 80244848 E6000000 */ swc1 $f0, 0x0($s0) +/* A9A98C 8024484C 0000102D */ daddu $v0, $zero, $zero +.LPAL_80244850: +/* A9A990 80244850 8FBF0028 */ lw $ra, 0x28($sp) +/* A9A994 80244854 8FB30024 */ lw $s3, 0x24($sp) +/* A9A998 80244858 8FB20020 */ lw $s2, 0x20($sp) +/* A9A99C 8024485C 8FB1001C */ lw $s1, 0x1C($sp) +/* A9A9A0 80244860 8FB00018 */ lw $s0, 0x18($sp) +/* A9A9A4 80244864 03E00008 */ jr $ra +/* A9A9A8 80244868 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/pal/asm/nonmatchings/world/area_hos/hos_05/hos_05_5_intro/AnimKammy_FlyOff.s b/ver/pal/asm/nonmatchings/world/area_hos/hos_05/hos_05_5_intro/AnimKammy_FlyOff.s new file mode 100644 index 0000000000..9f026e1771 --- /dev/null +++ b/ver/pal/asm/nonmatchings/world/area_hos/hos_05/hos_05_5_intro/AnimKammy_FlyOff.s @@ -0,0 +1,57 @@ +.set noat /* allow manual use of $at */ +.set noreorder /* don't insert nops after branches */ + +/* Generated by spimdisasm 1.11.1 */ + +glabel hos_05_AnimKammy_FlyOff +/* A9A9AC 8024486C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A9A9B0 80244870 AFB00018 */ sw $s0, 0x18($sp) +/* A9A9B4 80244874 00A0802D */ daddu $s0, $a1, $zero +/* A9A9B8 80244878 24050009 */ addiu $a1, $zero, 0x9 +/* A9A9BC 8024487C AFBF0020 */ sw $ra, 0x20($sp) +/* A9A9C0 80244880 0C0B42B0 */ jal resolve_npc +/* A9A9C4 80244884 AFB1001C */ sw $s1, 0x1C($sp) +/* A9A9C8 80244888 12000004 */ beqz $s0, .LPAL_8024489C +/* A9A9CC 8024488C 0040882D */ daddu $s1, $v0, $zero +/* A9A9D0 80244890 C620003C */ lwc1 $f0, 0x3C($s1) +/* A9A9D4 80244894 3C018025 */ lui $at, %hi(hos_05_AnimKammy_FlyOff_InitialY) +/* A9A9D8 80244898 E420F318 */ swc1 $f0, %lo(hos_05_AnimKammy_FlyOff_InitialY)($at) +.LPAL_8024489C: +/* A9A9DC 8024489C 3C018025 */ lui $at, %hi(hos_05_AnimKammy_FlyOff_InitialY) +/* A9A9E0 802448A0 C420F318 */ lwc1 $f0, %lo(hos_05_AnimKammy_FlyOff_InitialY)($at) +/* A9A9E4 802448A4 24040003 */ addiu $a0, $zero, 0x3 +/* A9A9E8 802448A8 44050000 */ mfc1 $a1, $f0 +/* A9A9EC 802448AC 3C0143FA */ lui $at, (0x43FA0000 >> 16) +/* A9A9F0 802448B0 44810000 */ mtc1 $at, $f0 +/* A9A9F4 802448B4 44853000 */ mtc1 $a1, $f6 +/* A9A9F8 802448B8 3C108025 */ lui $s0, %hi(hos_05_AnimKammy_FlyOff_Time) +/* A9A9FC 802448BC 2610AE74 */ addiu $s0, $s0, %lo(hos_05_AnimKammy_FlyOff_Time) +/* A9AA00 802448C0 46003180 */ add.s $f6, $f6, $f0 +/* A9AA04 802448C4 3C014220 */ lui $at, (0x42200000 >> 16) +/* A9AA08 802448C8 44811000 */ mtc1 $at, $f2 +/* A9AA0C 802448CC 8E070000 */ lw $a3, 0x0($s0) +/* A9AA10 802448D0 44063000 */ mfc1 $a2, $f6 +/* A9AA14 802448D4 2622003C */ addiu $v0, $s1, 0x3C +/* A9AA18 802448D8 AFA20014 */ sw $v0, 0x14($sp) +/* A9AA1C 802448DC 0C090439 */ jal interp_value_with_easing +/* A9AA20 802448E0 E7A20010 */ swc1 $f2, 0x10($sp) +/* A9AA24 802448E4 C6020000 */ lwc1 $f2, 0x0($s0) +/* A9AA28 802448E8 3C013F80 */ lui $at, (0x3F800000 >> 16) +/* A9AA2C 802448EC 44810000 */ mtc1 $at, $f0 +/* A9AA30 802448F0 3C014204 */ lui $at, (0x42040000 >> 16) +/* A9AA34 802448F4 44812000 */ mtc1 $at, $f4 +/* A9AA38 802448F8 46001080 */ add.s $f2, $f2, $f0 +/* A9AA3C 802448FC C620003C */ lwc1 $f0, 0x3C($s1) +/* A9AA40 80244900 24020001 */ addiu $v0, $zero, 0x1 +/* A9AA44 80244904 E6200070 */ swc1 $f0, 0x70($s1) +/* A9AA48 80244908 4602203C */ c.lt.s $f4, $f2 +/* A9AA4C 8024490C 00000000 */ nop +/* A9AA50 80244910 45010002 */ bc1t .LPAL_8024491C +/* A9AA54 80244914 E6020000 */ swc1 $f2, 0x0($s0) +/* A9AA58 80244918 0000102D */ daddu $v0, $zero, $zero +.LPAL_8024491C: +/* A9AA5C 8024491C 8FBF0020 */ lw $ra, 0x20($sp) +/* A9AA60 80244920 8FB1001C */ lw $s1, 0x1C($sp) +/* A9AA64 80244924 8FB00018 */ lw $s0, 0x18($sp) +/* A9AA68 80244928 03E00008 */ jr $ra +/* A9AA6C 8024492C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/pal/asm/nonmatchings/world/area_kkj/kkj_19/kkj_19_5_baking/kkj_19_GetItemNameRaw.s b/ver/pal/asm/nonmatchings/world/area_kkj/kkj_19/kkj_19_5_baking/kkj_19_GetItemNameRaw.s new file mode 100644 index 0000000000..4168454e5a --- /dev/null +++ b/ver/pal/asm/nonmatchings/world/area_kkj/kkj_19/kkj_19_5_baking/kkj_19_GetItemNameRaw.s @@ -0,0 +1,40 @@ +.set noat /* allow manual use of $at */ +.set noreorder /* don't insert nops after branches */ + +/* Generated by spimdisasm 1.11.1 */ + +glabel kkj_19_GetItemNameRaw +/* B6435C 80240B8C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B64360 80240B90 AFB10014 */ sw $s1, 0x14($sp) +/* B64364 80240B94 0080882D */ daddu $s1, $a0, $zero +/* B64368 80240B98 AFBF0018 */ sw $ra, 0x18($sp) +/* B6436C 80240B9C AFB00010 */ sw $s0, 0x10($sp) +/* B64370 80240BA0 8E22000C */ lw $v0, 0xC($s1) +/* B64374 80240BA4 8C500000 */ lw $s0, 0x0($v0) +/* B64378 80240BA8 0C0B2AAF */ jal evt_get_variable +/* B6437C 80240BAC 0200282D */ daddu $a1, $s0, $zero +/* B64380 80240BB0 0040282D */ daddu $a1, $v0, $zero +/* B64384 80240BB4 0000202D */ daddu $a0, $zero, $zero +/* B64388 80240BB8 3C038024 */ lui $v1, %hi(kkj_19_BakingIngredientsNames) +/* B6438C 80240BBC 24631E50 */ addiu $v1, $v1, %lo(kkj_19_BakingIngredientsNames) +.LPAL_80240BC0: +/* B64390 80240BC0 8C620000 */ lw $v0, 0x0($v1) +/* B64394 80240BC4 14A20007 */ bne $a1, $v0, .LPAL_80240BE4 +/* B64398 80240BC8 24840001 */ addiu $a0, $a0, 0x1 +/* B6439C 80240BCC 0220202D */ daddu $a0, $s1, $zero +/* B643A0 80240BD0 8C660004 */ lw $a2, 0x4($v1) +/* B643A4 80240BD4 0C0B2C26 */ jal evt_set_variable +/* B643A8 80240BD8 0200282D */ daddu $a1, $s0, $zero +/* B643AC 80240BDC 080902FC */ j .LPAL_80240BF0 +/* B643B0 80240BE0 00000000 */ nop +.LPAL_80240BE4: +/* B643B4 80240BE4 2882000A */ slti $v0, $a0, 0xA +/* B643B8 80240BE8 1440FFF5 */ bnez $v0, .LPAL_80240BC0 +/* B643BC 80240BEC 24630008 */ addiu $v1, $v1, 0x8 +.LPAL_80240BF0: +/* B643C0 80240BF0 8FBF0018 */ lw $ra, 0x18($sp) +/* B643C4 80240BF4 8FB10014 */ lw $s1, 0x14($sp) +/* B643C8 80240BF8 8FB00010 */ lw $s0, 0x10($sp) +/* B643CC 80240BFC 24020002 */ addiu $v0, $zero, 0x2 +/* B643D0 80240C00 03E00008 */ jr $ra +/* B643D4 80240C04 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/pal/splat.yaml b/ver/pal/splat.yaml index 097da0fff3..f802b6bf7d 100644 --- a/ver/pal/splat.yaml +++ b/ver/pal/splat.yaml @@ -113,6 +113,11 @@ segments: - [0x1DA400, bin] + - [0x227080, ci8, title/bg_1, 264, 162] + - [0x231790, palette, title/bg_1] + + - [0x231990, bin] + - name: world_model_anim_kzn_01 dir: world/model_anim/kzn type: code @@ -1067,8 +1072,2582 @@ segments: - [0x977A40, c, kmr_30_1_main] - [0x977D50, c, kmr_30_2_npc] - [0x977D50, c, kmr_30_3_the_end] + - name: iwa_00 + dir: world/area_iwa/iwa_00 + type: code + start: 0x978FB0 + vram: 0x80240000 + subsegments: + - [0x978FB0, c, iwa_00_0_header] + - [0x978FB0, c, iwa_00_1_main] + - [0x978FB0, c, iwa_00_2_entity] + - [0x978FB0, c, iwa_00_3_npc] + - [0x979260, c, iwa_00_4_slide] + - name: iwa_01 + dir: world/area_iwa/iwa_01 + type: code + start: 0x97BA20 + vram: 0x80240000 + subsegments: + - [0x97BA20, c, iwa_01_0_header] + - [0x97BA20, c, iwa_01_1_main] + - [0x97BA20, c, iwa_01_2_entity] + - [0x97BA20, c, iwa_01_3_splash] + - [0x97BF40, c, iwa_01_4_npc] + - [0x97ECD0, c, iwa_01_5_slide] + - [0x97ED00, .data, iwa_01_0_header] + - [0x97ED80, .data, iwa_01_1_main] + - [0x97F2D0, .data, iwa_01_2_entity] + - start: 0x97F3E0 + type: .data + name: iwa_01_3_splash + subsegments: + - [0x97F3E0, i8, splash, 32, 32] + - [0x97F7E0, vtx, splash] + - [0x97F820, gfx, splash] + - [0x97F8E8] + - [0x97F940, .data, iwa_01_4_npc] + - [0x981820, .data, iwa_01_5_slide] + - name: iwa_02 + dir: world/area_iwa/iwa_02 + type: code + start: 0x9820E0 + vram: 0x80240000 + subsegments: + - [0x9820E0, c, iwa_02_0_header] + - [0x9820E0, c, iwa_02_1_main] + - [0x9820E0, c, iwa_02_2_entity] + - [0x9820E0, c, iwa_02_3_npc] + - name: iwa_03 + dir: world/area_iwa/iwa_03 + type: code + start: 0x984F20 + vram: 0x80240000 + subsegments: + - [0x984F20, c, iwa_03_0_header] + - [0x984F20, c, iwa_03_1_main] + - [0x984F20, c, iwa_03_2_entity] + - [0x985260, c, iwa_03_3_npc] + - [0x986240, c, iwa_03_4_slide] + - name: iwa_04 + dir: world/area_iwa/iwa_04 + type: code + start: 0x987C50 + vram: 0x80240000 + subsegments: + - [0x987C50, c, iwa_04_0_header] + - [0x987C50, c, iwa_04_1_music] + - [0x987C50, c, iwa_04_2_main] + - [0x987C50, c, iwa_04_3_entity] + - [0x987CD0, c, iwa_04_4_npc] + - name: iwa_10 + dir: world/area_iwa/iwa_10 + type: code + start: 0x98A8E0 + vram: 0x80240000 + subsegments: + - [0x98A8E0, c, iwa_10_0_header] + - [0x98A8E0, c, iwa_10_1_music] + - [0x98A8E0, c, iwa_10_2_main] + - [0x98A920, c, iwa_10_3_npc] + - [0x98AA40, c, iwa_10_4_train] + - [0x98ABD0, c, iwa_10_5_entity] + - [0x98B910, c, iwa_10_6_parakarry] + - [0x98BDF0, c, iwa_10_7_new_partner] + - [0x98BE90, c, iwa_10_8_foliage] + - name: iwa_11 + dir: world/area_iwa/iwa_11 + type: code + start: 0x992D80 + vram: 0x80240000 + subsegments: + - [0x992D80, c, iwa_11_0_header] + - [0x992D80, c, iwa_11_1_music] + - [0x992D80, c, iwa_11_2_main] + - [0x992DA0, c, iwa_11_3_train] + - [0x993000, c, iwa_11_4_scenery] + - [0x993090, c, iwa_11_5_npc] + - name: sbk_00 + dir: world/area_sbk/sbk_00 + type: code + start: 0x995600 + vram: 0x80240000 + subsegments: + - [0x995600, c, sbk_00_0_header] + - [0x995600, c, sbk_00_1_main] + - [0x995640, c, sbk_00_2_npc] + - [0x995660, c, sbk_00_3_entity] + - name: sbk_01 + dir: world/area_sbk/sbk_01 + type: code + start: 0x995E20 + vram: 0x80240000 + subsegments: + - [0x995E20, c, sbk_01_1_main] + - [0x995E60, c, sbk_01_2_npc] + - name: sbk_02 + dir: world/area_sbk/sbk_02 + type: code + start: 0x996640 + vram: 0x80240000 + subsegments: + - [0x996640, c, sbk_02_0_header] + - [0x996680, c, sbk_02_1_music] + - [0x996680, c, sbk_02_2_main] + - [0x996680, c, sbk_02_3_ruins] + - [0x996D30, c, sbk_02_4_npc] + - [0x997240, c, sbk_02_5_entity] + - name: sbk_03 + dir: world/area_sbk/sbk_03 + type: code + start: 0x99BC40 + vram: 0x80240000 + subsegments: + - [0x99BC40, c, sbk_03_1_main] + - [0x99BC80, c, sbk_03_2_npc] + - name: sbk_04 + dir: world/area_sbk/sbk_04 + type: code + start: 0x99C860 + vram: 0x80240000 + subsegments: + - [0x99C860, c, sbk_04_1_main] + - [0x99C8A0, c, sbk_04_2_npc] + - name: sbk_05 + dir: world/area_sbk/sbk_05 + type: code + start: 0x99D080 + vram: 0x80240000 + subsegments: + - [0x99D080, c, sbk_05_1_main] + - [0x99D0C0, c, sbk_05_2_entity] + - [0x99D0C0, c, sbk_05_3_npc] + - name: sbk_06 + dir: world/area_sbk/sbk_06 + type: code + start: 0x99E950 + vram: 0x80240000 + subsegments: + - [0x99E950, c, sbk_06_1_main] + - [0x99E990, c, sbk_06_2_npc] + - [0x99EA90, c, sbk_06_3_foliage] + - [0x99ECD0, c, sbk_06_4_entity] + - name: sbk_10 + dir: world/area_sbk/sbk_10 + type: code + start: 0x9A0010 + vram: 0x80240000 + subsegments: + - [0x9A0010, c, sbk_10_1_main] + - [0x9A0050, c, sbk_10_2_entity] + - name: sbk_11 + dir: world/area_sbk/sbk_11 + type: code + start: 0x9A03D0 + vram: 0x80240000 + subsegments: + - [0x9A03D0, c, sbk_11_1_main] + - [0x9A0410, c, sbk_11_2_npc] + - name: sbk_12 + dir: world/area_sbk/sbk_12 + type: code + start: 0x9A10D0 + vram: 0x80240000 + subsegments: + - [0x9A10D0, c, sbk_12_1_main] + - [0x9A1110, c, sbk_12_2_npc] + - name: sbk_13 + dir: world/area_sbk/sbk_13 + type: code + start: 0x9A1B70 + vram: 0x80240000 + subsegments: + - [0x9A1B70, c, sbk_13_1_main] + - [0x9A1BB0, c, sbk_13_2_npc] + - name: sbk_14 + dir: world/area_sbk/sbk_14 + type: code + start: 0x9A2A70 + vram: 0x80240000 + subsegments: + - [0x9A2A70, c, sbk_14_1_main] + - [0x9A2AB0, c, sbk_14_2_entity] + - name: sbk_15 + dir: world/area_sbk/sbk_15 + type: code + start: 0x9A3060 + vram: 0x80240000 + subsegments: + - [0x9A3060, c, sbk_15_1_main] + - [0x9A30A0, c, sbk_15_2_npc] + - name: sbk_16 + dir: world/area_sbk/sbk_16 + type: code + start: 0x9A3900 + vram: 0x80240000 + subsegments: + - [0x9A3900, c, sbk_16_1_main] + - [0x9A3940, c, sbk_16_2_foliage] + - name: sbk_20 + dir: world/area_sbk/sbk_20 + type: code + start: 0x9A4920 + vram: 0x80240000 + subsegments: + - [0x9A4920, c, sbk_20_1_main] + - [0x9A4960, c, sbk_20_2_entity] + - [0x9A4960, c, sbk_20_2_npc] + - name: sbk_21 + dir: world/area_sbk/sbk_21 + type: code + start: 0x9A58F0 + vram: 0x80240000 + subsegments: + - [0x9A58F0, c, sbk_21_1_main] + - name: sbk_22 + dir: world/area_sbk/sbk_22 + type: code + start: 0x9A5CC0 + vram: 0x80240000 + subsegments: + - [0x9A5CC0, c, sbk_22_1_main] + - [0x9A5D00, c, sbk_22_2_npc] + - [0x9A5E20, c, sbk_22_3_entity] + - name: sbk_23 + dir: world/area_sbk/sbk_23 + type: code + start: 0x9A6AF0 + vram: 0x80240000 + subsegments: + - [0x9A6AF0, c, sbk_23_1_main] + - [0x9A6B30, c, sbk_23_2_entity] + - name: sbk_24 + dir: world/area_sbk/sbk_24 + type: code + start: 0x9A6FC0 + vram: 0x80240000 + subsegments: + - [0x9A6FC0, c, sbk_24_1_main] + - [0x9A7000, c, sbk_24_2_npc] + - [0x9A7100, c, sbk_24_3_entity] + - [0x9A7100, c, sbk_24_4_foliage] + - name: sbk_25 + dir: world/area_sbk/sbk_25 + type: code + start: 0x9A8610 + vram: 0x80240000 + subsegments: + - [0x9A8610, c, sbk_25_1_main] + - [0x9A8650, c, sbk_25_2_npc] + - [0x9A8750, c, sbk_25_3_foliage] + - [0x9A8990, c, sbk_25_4_entity] + - name: sbk_26 + dir: world/area_sbk/sbk_26 + type: code + start: 0x9AA060 + vram: 0x80240000 + subsegments: + - [0x9AA060, c, sbk_26_1_main] + - [0x9AA0A0, c, sbk_26_2_npc] + - [0x9AA1C0, c, sbk_26_3_foliage] + - name: sbk_30 + dir: world/area_sbk/sbk_30 + type: code + start: 0x9AB940 + vram: 0x80240000 + subsegments: + - [0x9AB940, c, sbk_30_0_header] + - [0x9AB980, c, sbk_30_1_music] + - [0x9AB980, c, sbk_30_2_main] + - [0x9ABCB0, c, sbk_30_3_npc] + - [0x9ACF10, c, sbk_30_4_foliage] + - name: sbk_31 + dir: world/area_sbk/sbk_31 + type: code + start: 0x9B0390 + vram: 0x80240000 + subsegments: + - [0x9B0390, c, sbk_31_1_main] + - [0x9B03D0, c, sbk_31_2_npc] + - name: sbk_32 + dir: world/area_sbk/sbk_32 + type: code + start: 0x9B0DF0 + vram: 0x80240000 + subsegments: + - [0x9B0DF0, c, sbk_32_1_main] + - [0x9B0E30, c, sbk_32_2_npc] + - name: sbk_33 + dir: world/area_sbk/sbk_33 + type: code + start: 0x9B1D60 + vram: 0x80240000 + subsegments: + - [0x9B1D60, c, sbk_33_0_header] + - [0x9B1D60, c, sbk_33_1_entity] + - [0x9B1D60, c, sbk_33_2_main] + - name: sbk_34 + dir: world/area_sbk/sbk_34 + type: code + start: 0x9B2260 + vram: 0x80240000 + subsegments: + - [0x9B2260, c, sbk_34_1_main] + - [0x9B22A0, c, sbk_34_2_npc] + - [0x9B2A00, c, sbk_34_3_foliage] + - name: sbk_35 + dir: world/area_sbk/sbk_35 + type: code + start: 0x9B4A40 + vram: 0x80240000 + subsegments: + - [0x9B4A40, c, sbk_35_1_main] + - [0x9B4A80, c, sbk_35_2_npc] + - [0x9B4B80, c, sbk_35_3_foliage] + - name: sbk_36 + dir: world/area_sbk/sbk_36 + type: code + start: 0x9B61F0 + vram: 0x80240000 + subsegments: + - [0x9B61F0, c, sbk_36_1_main] + - [0x9B6230, c, sbk_36_2_foliage] + - [0x9B6470, c, sbk_36_3_entity] + - name: sbk_40 + dir: world/area_sbk/sbk_40 + type: code + start: 0x9B7730 + vram: 0x80240000 + subsegments: + - [0x9B7730, c, sbk_40_1_main] + - [0x9B7770, c, sbk_40_2_npc] + - [0x9B7870, c, sbk_40_3_entity] + - name: sbk_41 + dir: world/area_sbk/sbk_41 + type: code + start: 0x9B83D0 + vram: 0x80240000 + subsegments: + - [0x9B83D0, c, sbk_41_1_main] + - [0x9B8410, c, sbk_41_2_entity] + - name: sbk_42 + dir: world/area_sbk/sbk_42 + type: code + start: 0x9B88A0 + vram: 0x80240000 + subsegments: + - [0x9B88A0, c, sbk_42_1_main] + - [0x9B88E0, c, sbk_42_2_npc] + - name: sbk_43 + dir: world/area_sbk/sbk_43 + type: code + start: 0x9B9500 + vram: 0x80240000 + subsegments: + - [0x9B9500, c, sbk_43_1_main] + - [0x9B9540, c, sbk_43_2_entity] + - name: sbk_44 + dir: world/area_sbk/sbk_44 + type: code + start: 0x9B9930 + vram: 0x80240000 + subsegments: + - [0x9B9930, c, sbk_44_1_main] + - [0x9B9970, c, sbk_44_2_npc] + - name: sbk_45 + dir: world/area_sbk/sbk_45 + type: code + start: 0x9BA830 + vram: 0x80240000 + subsegments: + - [0x9BA830, c, sbk_45_1_main] + - [0x9BA870, c, sbk_45_2_entity] + - name: sbk_46 + dir: world/area_sbk/sbk_46 + type: code + start: 0x9BAD30 + vram: 0x80240000 + subsegments: + - [0x9BAD30, c, sbk_46_1_main] + - [0x9BAD70, c, sbk_46_2_npc] + - [0x9BAE90, c, sbk_46_3_foliage] + - [0x9BB0D0, c, sbk_46_4_entity] + - name: sbk_50 + dir: world/area_sbk/sbk_50 + type: code + start: 0x9BC9A0 + vram: 0x80240000 + subsegments: + - [0x9BC9A0, c, sbk_50_1_main] + - name: sbk_51 + dir: world/area_sbk/sbk_51 + type: code + start: 0x9BCD00 + vram: 0x80240000 + subsegments: + - [0x9BCD00, c, sbk_51_1_main] + - [0x9BCD40, c, sbk_51_2_npc] + - name: sbk_52 + dir: world/area_sbk/sbk_52 + type: code + start: 0x9BDA00 + vram: 0x80240000 + subsegments: + - [0x9BDA00, c, sbk_52_1_main] + - [0x9BDA40, c, sbk_52_2_entity] + - name: sbk_53 + dir: world/area_sbk/sbk_53 + type: code + start: 0x9BDE70 + vram: 0x80240000 + subsegments: + - [0x9BDE70, c, sbk_53_1_main] + - [0x9BDEB0, c, sbk_53_2_npc] + - name: sbk_54 + dir: world/area_sbk/sbk_54 + type: code + start: 0x9BE910 + vram: 0x80240000 + subsegments: + - [0x9BE910, c, sbk_54_1_main] + - [0x9BE950, c, sbk_54_2_entity] + - name: sbk_55 + dir: world/area_sbk/sbk_55 + type: code + start: 0x9BEDE0 + vram: 0x80240000 + subsegments: + - [0x9BEDE0, c, sbk_55_1_main] + - [0x9BEE20, c, sbk_55_2_npc] + - [0x9BEE40, c, sbk_55_3_foliage] + - [0x9BF080, c, sbk_55_4_entity] + - name: sbk_56 + dir: world/area_sbk/sbk_56 + type: code + start: 0x9C0350 + vram: 0x80240000 + subsegments: + - [0x9C0350, c, sbk_56_1_main] + - [0x9C03D0, c, sbk_56_2_entity] + - [0x9C1110, c, sbk_56_3_foliage] + - name: sbk_60 + dir: world/area_sbk/sbk_60 + type: code + start: 0x9C2D80 + vram: 0x80240000 + subsegments: + - [0x9C2D80, c, sbk_60_1_main] + - [0x9C2DC0, c, sbk_60_2_npc] + - name: sbk_61 + dir: world/area_sbk/sbk_61 + type: code + start: 0x9C3320 + vram: 0x80240000 + subsegments: + - [0x9C3320, c, sbk_61_1_main] + - [0x9C3360, c, sbk_61_2_entity] + - name: sbk_62 + dir: world/area_sbk/sbk_62 + type: code + start: 0x9C36E0 + vram: 0x80240000 + subsegments: + - [0x9C36E0, c, sbk_62_1_main] + - [0x9C3720, c, sbk_62_2_npc] + - name: sbk_63 + dir: world/area_sbk/sbk_63 + type: code + start: 0x9C4100 + vram: 0x80240000 + subsegments: + - [0x9C4100, c, sbk_63_1_main] + - [0x9C4140, c, sbk_63_2_npc] + - name: sbk_64 + dir: world/area_sbk/sbk_64 + type: code + start: 0x9C4920 + vram: 0x80240000 + subsegments: + - [0x9C4920, c, sbk_64_1_main] + - [0x9C4960, c, sbk_64_2_entity] + - name: sbk_65 + dir: world/area_sbk/sbk_65 + type: code + start: 0x9C4CE0 + vram: 0x80240000 + subsegments: + - [0x9C4CE0, c, sbk_65_1_main] + - name: sbk_66 + dir: world/area_sbk/sbk_66 + type: code + start: 0x9C5040 + vram: 0x80240000 + subsegments: + - [0x9C5040, c, sbk_66_1_main] + - [0x9C5080, c, sbk_66_2_npc] + - [0x9C5180, c, sbk_66_3_foliage] + - [0x9C53C0, c, sbk_66_4_entity] + - name: sbk_99 + dir: world/area_sbk/sbk_99 + type: code + start: 0x9C7240 + vram: 0x80240000 + subsegments: + - [0x9C7240, c, sbk_99_1_main] + - [0x9C7240, c, sbk_99_2_entity] + - name: dro_01 + dir: world/area_dro/dro_01 + type: code + start: 0x9C7590 + vram: 0x80240000 + subsegments: + - [0x9C7590, c, dro_01_0_header] + - [0x9C7590, c, dro_01_1_music] + - [0x9C7590, c, dro_01_2_main] + - [0x9C7B70, c, dro_01_3_npc] + - [0x9CA9F0, c, dro_01_4_shop] + - [0x9CAB30, c, dro_01_5_rooms] + - [0x9CAB30, c, dro_01_6_entity] + - [0x9CAE10, c, dro_01_7_foliage] + - name: dro_02 + dir: world/area_dro/dro_02 + type: code + start: 0x9D55A0 + vram: 0x80240000 + subsegments: + - [0x9D55A0, c, dro_02_0_header] + - [0x9D55A0, c, dro_02_1_music] + - [0x9D55A0, c, dro_02_2_entity] + - [0x9D55A0, c, dro_02_3_main] + - [0x9D58A0, c, dro_02_4_rooms] + - [0x9D58A0, c, dro_02_5_npc] + - [0x9D9010, .data, dro_02_0_header] + - [0x9D9090, .data, dro_02_1_music] + - [0x9D9170, .data, dro_02_2_entity] + - [0x9D91E0, .data, dro_02_3_main] + - [0x9D9760, .data, dro_02_4_rooms] + - start: 0x9DA380 + type: .data + name: dro_02_5_npc + subsegments: + - [0x9DA380] + - [0x9DCBC8, ci4, card, 32, 32] + - [0x9DCDC8, palette, card] + - [0x9DCDE8, vtx, card_1] + - [0x9DCE68, vtx, card_2] + - [0x9DCEA8, gfx, card_setup] + - [0x9DCF98, gfx, card_1] + - [0x9DD018, gfx, card_2] + - [0x9DD060] + - [0x9E44F0] + - name: isk_01 + dir: world/area_isk/isk_01 + type: code + start: 0x9E4560 + vram: 0x80240000 + subsegments: + - [0x9E4560, c, isk_01_0_header] + - [0x9E4560, c, isk_01_1_music] + - [0x9E4560, c, isk_01_2_main] + - [0x9E4560, c, isk_01_3_haze] + - [0x9E4560, c, isk_01_4_entity] + - name: isk_02 + dir: world/area_isk/isk_02 + type: code + start: 0x9E4AC0 + vram: 0x80240000 + subsegments: + - [0x9E4AC0, c, isk_02_0_header] + - [0x9E4AC0, c, isk_02_1_main] + - [0x9E4AC0, c, isk_02_2_lock] + - [0x9E4B00, c, isk_02_3_ambush] + - [0x9E4BB0, c, isk_02_4_entity] + - [0x9E4BB0, c, isk_02_5_npc] + - name: isk_03 + dir: world/area_isk/isk_03 + type: code + start: 0x9E6190 + vram: 0x80240000 + subsegments: + - [0x9E6190, c, isk_03_0_header] + - [0x9E6190, c, isk_03_1_main] + - [0x9E6190, c, isk_03_2_sand] + - [0x9E6190, c, isk_03_3_entity] + - [0x9E6190, c, isk_03_4_switch] + - name: isk_04 + dir: world/area_isk/isk_04 + type: code + start: 0x9E7900 + vram: 0x80240000 + subsegments: + - [0x9E7900, c, isk_04_0_header] + - [0x9E7900, c, isk_04_1_music] + - [0x9E7900, c, isk_04_2_main] + - [0x9E7900, c, isk_04_3_obstructions] + - [0x9E7940, c, isk_04_4_entity] + - [0x9E7940, c, isk_04_5_npc] + - [0x9E8230, c, isk_04_6_demo] + - name: isk_05 + dir: world/area_isk/isk_05 + type: code + start: 0x9E9D30 + vram: 0x80240000 + subsegments: + - [0x9E9D30, c, isk_05_0_header] + - [0x9E9D30, c, isk_05_1_main] + - [0x9E9D30, c, isk_05_2_entity] + - [0x9E9D30, c, isk_05_3_npc] + - name: isk_06 + dir: world/area_isk/isk_06 + type: code + start: 0x9ECC10 + vram: 0x80240000 + subsegments: + - [0x9ECC10, c, isk_06_0_header] + - [0x9ECC10, c, isk_06_1_main] + - [0x9ECC10, c, isk_06_2_entity] + - [0x9ECC10, c, isk_06_3_sand] + - [0x9ECC10, c, isk_06_4_switch] + - name: isk_07 + dir: world/area_isk/isk_07 + type: code + start: 0x9EE5C0 + vram: 0x80240000 + subsegments: + - [0x9EE5C0, c, isk_07_0_header] + - [0x9EE5C0, c, isk_07_1_main] + - [0x9EE5C0, c, isk_07_2_entity] + - [0x9EE5C0, c, isk_07_3_npc] + - [0x9EE670, c, isk_07_4_stairs] + - [0x9EE670, c, isk_07_5_lock] + - [0x9EE6B0, c, isk_07_6_switch] + - [0x9EE6D0, c, isk_07_7_ambush] + - name: isk_08 + dir: world/area_isk/isk_08 + type: code + start: 0x9F0F40 + vram: 0x80240000 + subsegments: + - [0x9F0F40, c, isk_08_0_header] + - [0x9F0F40, c, isk_08_1_main] + - [0x9F0F40, c, isk_08_2_npc] + - [0x9F1830, c, isk_08_3_entity] + - name: isk_09 + dir: world/area_isk/isk_09 + type: code + start: 0x9F2580 + vram: 0x80240000 + subsegments: + - [0x9F2580, c, isk_09_0_header] + - [0x9F2580, c, isk_09_1_music] + - [0x9F2580, c, isk_09_2_main] + - [0x9F2580, c, isk_09_3_entity] + - [0x9F2870, c, isk_09_4_stairs] + - [0x9F2870, c, isk_09_5_switch] + - name: isk_10 + dir: world/area_isk/isk_10 + type: code + start: 0x9F4B90 + vram: 0x80240000 + subsegments: + - [0x9F4B90, c, isk_10_0_header] + - [0x9F4B90, c, isk_10_1_main] + - [0x9F4B90, c, isk_10_2_entity] + - [0x9F5940, c, isk_10_3_bombable] + - name: isk_11 + dir: world/area_isk/isk_11 + type: code + start: 0x9F69D0 + vram: 0x80240000 + subsegments: + - [0x9F69D0, c, isk_11_0_header] + - [0x9F69D0, c, isk_11_1_music] + - [0x9F69D0, c, isk_11_2_main] + - [0x9F69D0, c, isk_11_3_entity] + - [0x9F69D0, c, isk_11_4_scene] + - [0x9F6A80, c, isk_11_5_puzzle] + - [0x9F6AF0, c, isk_11_6_lock] + - name: isk_12 + dir: world/area_isk/isk_12 + type: code + start: 0x9F9600 + vram: 0x80240000 + subsegments: + - [0x9F9600, c, isk_12_0_header] + - [0x9F9600, c, isk_12_1_main] + - [0x9F9600, c, isk_12_2_entity] + - [0x9F9600, c, isk_12_3_sand] + - [0x9F9600, c, isk_12_4_switch] + - name: isk_13 + dir: world/area_isk/isk_13 + type: code + start: 0x9FB730 + vram: 0x80240000 + subsegments: + - [0x9FB730, c, isk_13_0_header] + - [0x9FB730, c, isk_13_1_main] + - [0x9FB730, c, isk_13_2_entity] + - [0x9FB730, c, isk_13_3_npc] + - name: isk_14 + dir: world/area_isk/isk_14 + type: code + start: 0x9FE610 + vram: 0x80240000 + subsegments: + - [0x9FE610, c, isk_14_0_header] + - [0x9FE610, c, isk_14_1_main] + - [0x9FE610, c, isk_14_2_entity] + - [0x9FE610, c, isk_14_3_npc] + - name: isk_16 + dir: world/area_isk/isk_16 + type: code + start: 0xA01060 + vram: 0x80240000 + subsegments: + - [0xA01060, c, isk_16_0_header] + - [0xA01060, c, isk_16_1_main] + - [0xA01860, c, isk_16_2_npc] + - [0xA01860, c, isk_16_3_boss] + - [0xA01B60, c, isk_16_4_entity] + - name: isk_18 + dir: world/area_isk/isk_18 + type: code + start: 0xA03DE0 + vram: 0x80240000 + subsegments: + - [0xA03DE0, c, isk_18_0_header] + - [0xA03DE0, c, isk_18_1_main] + - [0xA03DE0, c, isk_18_2_npc] + - [0xA046D0, c, isk_18_3_entity] + - name: isk_19 + dir: world/area_isk/isk_19 + type: code + start: 0xA05540 + vram: 0x80240000 + subsegments: + - [0xA05540, c, isk_19_0_header] + - [0xA05540, c, isk_19_1_music] + - [0xA05540, c, isk_19_2_main] + - [0xA05540, c, isk_19_3_entity] + - name: trd_00 + dir: world/area_trd/trd_00 + type: code + start: 0xA05A70 + vram: 0x80240000 + subsegments: + - [0xA05A70, c, trd_00_0_header] + - [0xA05A70, c, trd_00_1_main] + - [0xA05D80, c, trd_00_2_entity] + - [0xA06040, c, trd_00_3_npc] + - name: trd_01 + dir: world/area_trd/trd_01 + type: code + start: 0xA08790 + vram: 0x80240000 + subsegments: + - [0xA08790, c, trd_01_0_header] + - [0xA08790, c, trd_01_1_main] + - [0xA08AA0, c, trd_01_2_entity] + - [0xA08B80, c, trd_01_3_npc] + - name: trd_02 + dir: world/area_trd/trd_02 + type: code + start: 0xA0CDE0 + vram: 0x80240000 + subsegments: + - [0xA0CDE0, c, trd_02_0_header] + - [0xA0CDE0, c, trd_02_1_main] + - [0xA0CDE0, c, trd_02_2_entity] + - [0xA0CEC0, c, trd_02_3_npc] + - name: trd_03 + dir: world/area_trd/trd_03 + type: code + start: 0xA10450 + vram: 0x80240000 + subsegments: + - [0xA10450, c, trd_03_0_header] + - [0xA10450, c, trd_03_1_main] + - [0xA104F0, c, trd_03_2_entity] + - [0xA104F0, c, trd_03_3_npc] + - [0xA10CD0, c, trd_03_4_puzzle] + - name: trd_04 + dir: world/area_trd/trd_04 + type: code + start: 0xA141F0 + vram: 0x80240000 + subsegments: + - [0xA141F0, c, trd_04_0_header] + - [0xA141F0, c, trd_04_1_main] + - [0xA14500, c, trd_04_2_entity] + - [0xA146A0, c, trd_04_3_npc] + - name: trd_05 + dir: world/area_trd/trd_05 + type: code + start: 0xA1A500 + vram: 0x80240000 + subsegments: + - [0xA1A500, c, trd_05_0_header] + - [0xA1A500, c, trd_05_1_main] + - [0xA1A520, c, trd_05_2_entity] + - [0xA1A520, c, trd_05_3_trap] + - [0xA1AC20, c, trd_05_4_npc] + - name: trd_06 + dir: world/area_trd/trd_06 + type: code + start: 0xA1D590 + vram: 0x80240000 + subsegments: + - [0xA1D590, c, trd_06_0_header] + - [0xA1D590, c, trd_06_1_main] + - [0xA1D8A0, c, trd_06_2_falling] + - [0xA1E080, c, trd_06_3_npc_prisoners] + - [0xA1E210, c, trd_06_4_npc_koopa_bros] + - [0xA1E2B0, c, trd_06_5_entity] + - name: trd_07 + dir: world/area_trd/trd_07 + type: code + start: 0xA22770 + vram: 0x80240000 + subsegments: + - [0xA22770, c, trd_07_0_header] + - [0xA22770, c, trd_07_1_main] + - [0xA22A80, c, trd_07_2_npc] + - [0xA24D70, c, trd_07_3_magic_doors] + - name: trd_08 + dir: world/area_trd/trd_08 + type: code + start: 0xA27090 + vram: 0x80240000 + subsegments: + - [0xA27090, c, trd_08_0_header] + - [0xA27090, c, trd_08_1_main] + - [0xA273A0, c, trd_08_2_entity] + - [0xA273A0, c, trd_08_3_npc] + - name: trd_09 + dir: world/area_trd/trd_09 + type: code + start: 0xA29450 + vram: 0x80240000 + subsegments: + - [0xA29450, c, trd_09_0_header] + - [0xA29450, c, trd_09_1_main] + - [0xA29450, c, trd_09_2_entity] + - [0xA29450, c, trd_09_3_npc] + - [0xA29510, c, trd_09_4_demo] + - name: trd_10 + dir: world/area_trd/trd_10 + type: code + start: 0xA2E700 + vram: 0x80240000 + subsegments: + - [0xA2E700, c, trd_10_0_header] + - [0xA2E700, c, trd_10_1_main] + - [0xA2EF20, c, trd_10_2_npc] + - [0xA2EF50, c, trd_10_3_fake_bowser] + - name: nok_01 + dir: world/area_nok/nok_01 + type: code + start: 0xA311D0 + vram: 0x80240000 + subsegments: + - [0xA311D0, c, nok_01_0_header] + - [0xA311D0, c, nok_01_1_music] + - [0xA311D0, c, nok_01_2_main] + - [0xA311D0, c, nok_01_3_entity] + - [0xA311D0, c, nok_01_4_npc] + - [0xA33930, c, nok_01_5_shop] + - [0xA33930, c, nok_01_6_rooms] + - [0xA33990, c, nok_01_7_radio] + - [0xA33B00, c, nok_01_8_foliage] + - name: nok_02 + dir: world/area_nok/nok_02 + type: code + start: 0xA42E70 + vram: 0x80240000 + subsegments: + - [0xA42E70, c, nok_02_0_header] + - [0xA42E70, c, nok_02_1_music] + - [0xA42E70, c, nok_02_2_main] + - [0xA435C0, c, nok_02_3_entity] + - [0xA437E0, c, nok_02_4_rooms] + - [0xA438F0, c, nok_02_5_bookshelf] + - [0xA438F0, c, nok_02_6_npc] + - [0xA46740, c, nok_02_7_demo] + - [0xA46830, c, nok_02_8_koot_favors] + - [0xA471D0, c, nok_02_9_foliage] + - [0xA47410, c, nok_02_10_epilogue] + - name: nok_03 + dir: world/area_nok/nok_03 + type: code + start: 0xA57680 + vram: 0x80240000 + subsegments: + - [0xA57680, c, nok_03_0_header] + - [0xA57680, c, nok_03_1_music] + - [0xA57680, c, nok_03_2_main] + - [0xA57680, c, nok_03_3_entity] + - [0xA57680, c, nok_03_4_npc] + - name: nok_04 + dir: world/area_nok/nok_04 + type: code + start: 0xA59A80 + vram: 0x80240000 + subsegments: + - [0xA59A80, c, nok_04_0_header] + - [0xA59A80, c, nok_04_1_music] + - [0xA59A80, c, nok_04_2_main] + - [0xA59A80, c, nok_04_3_entity] + - [0xA59A80, c, nok_04_4_npc] + - [0xA5A910, c, nok_04_5_new_partner] + - name: nok_11 + dir: world/area_nok/nok_11 + type: code + start: 0xA608D0 + vram: 0x80240000 + subsegments: + - [0xA608D0, c, nok_11_0_header] + - [0xA608D0, c, nok_11_1_music] + - [0xA608D0, c, nok_11_2_main] + - [0xA608D0, c, nok_11_3_entity] + - [0xA608D0, c, nok_11_4_npc] + - name: nok_12 + dir: world/area_nok/nok_12 + type: code + start: 0xA66680 + vram: 0x80240000 + subsegments: + - [0xA66680, c, nok_12_0_header] + - [0xA66680, c, nok_12_1_music] + - [0xA66680, c, nok_12_2_main] + - [0xA66800, c, nok_12_3_entity] + - [0xA66970, c, nok_12_4_bridge] + - [0xA669B0, c, nok_12_5_foliage] + - [0xA66BF0, c, nok_12_6_npc] + - [0xA68560, c, nok_12_7_demo] + - name: nok_13 + dir: world/area_nok/nok_13 + type: code + start: 0xA6C490 + vram: 0x80240000 + subsegments: + - [0xA6C490, c, nok_13_0_header] + - [0xA6C490, c, nok_13_1_music] + - [0xA6C490, c, nok_13_2_main] + - [0xA6C490, c, nok_13_3_entity] + - [0xA6C490, c, nok_13_4_npc] + - [0xA6D2B0, c, nok_13_5] + - name: nok_14 + dir: world/area_nok/nok_14 + type: code + start: 0xA6E6D0 + vram: 0x80240000 + subsegments: + - [0xA6E6D0, c, nok_14_0_header] + - [0xA6E6D0, c, nok_14_1_music] + - [0xA6E6D0, c, nok_14_2_main] + - [0xA6E850, c, nok_14_3_entity] + - [0xA6E850, c, nok_14_4_bridge] + - [0xA6E890, c, nok_14_5_npc] + - name: nok_15 + dir: world/area_nok/nok_15 + type: code + start: 0xA72D90 + vram: 0x80240000 + subsegments: + - [0xA72D90, c, nok_15_0_header] + - [0xA72D90, c, nok_15_1_music] + - [0xA72D90, c, nok_15_2_main] + - [0xA73070, c, nok_15_3_entity] + - [0xA73070, c, nok_15_4_npc] + - [0xA752D0, c, nok_15_5_foliage] + - name: hos_00 + dir: world/area_hos/hos_00 + type: code + start: 0xA77B80 + vram: 0x80240000 + subsegments: + - [0xA77B80, c, hos_00_0_header] + - [0xA77BD0, c, hos_00_1_music] + - [0xA77BD0, c, hos_00_2_main] + - [0xA78340, c, hos_00_3_unused] + - [0xA78340, c, hos_00_4_npc] + - [0xA78370, c, hos_00_5_entity] + - [0xA78370, c, hos_00_6_scenes] + - [0xA787C0, c, hos_00_7_shade_gfx] + - name: hos_01 + dir: world/area_hos/hos_01 + type: code + start: 0xA7C710 + vram: 0x80240000 + subsegments: + - [0xA7C710, c, hos_01_0_header] + - [0xA7C710, c, hos_01_1_music] + - [0xA7C710, c, hos_01_2_main] + - [0xA7CEB0, c, hos_01_3_model_fx] + - [0xA7D3C0, c, hos_01_4_npc] + - [0xA7D4E0, c, hos_01_5_entity] + - [0xA7D4E0, c, hos_01_6_star_way] + - name: hos_02 + dir: world/area_hos/hos_02 + type: code + start: 0xA820E0 + vram: 0x80240000 + subsegments: + - [0xA820E0, c, hos_02_0_header] + - [0xA820E0, c, hos_02_1_music] + - [0xA820E0, c, hos_02_2_main] + - [0xA820E0, c, hos_02_3_model_fx] + - [0xA830B0, c, hos_02_4_unused] + - [0xA830D0, c, hos_02_5_npc] + - [0xA84BC0, c, hos_02_6_descent] + - name: hos_03 + dir: world/area_hos/hos_03 + type: code + start: 0xA86FC0 + vram: 0x80240000 + subsegments: + - [0xA86FC0, c, hos_03_0_header] + - [0xA86FC0, c, hos_03_1_music] + - [0xA86FC0, c, hos_03_2_main] + - [0xA86FF0, c, hos_03_3_model_fx] + - [0xA87A30, c, hos_03_4_rooms] + - [0xA87A30, c, hos_03_5_foliage] + - [0xA87C70, c, hos_03_6_npc] + - [0xA8A500, c, hos_03_7_shop] + - [0xA8A500, c, hos_03_8_entity] + - name: hos_04 + dir: world/area_hos/hos_04 + type: code + start: 0xA92DD0 + vram: 0x80240000 + subsegments: + - [0xA92DD0, c, hos_04_0_header] + - [0xA92DD0, c, hos_04_1_music] + - [0xA92DD0, c, hos_04_2_main] + - [0xA92DD0, c, hos_04_3_fountains] + - [0xA93390, c, hos_04_4_unused] + - [0xA933B0, c, hos_04_6_intro] + - [0xA93930, c, hos_04_7_starship] + - [0xA939A0, c, hos_04_8_narrator] + - name: hos_05 + dir: world/area_hos/hos_05 + type: code + start: 0xA96140 + vram: 0x80240000 + subsegments: + - [0xA96140, c, hos_05_0_header] + - [0xA96140, c, hos_05_1_music] + - [0xA96140, c, hos_05_2_main] + - [0xA96140, c, hos_05_3_misc] + - [0xA96970, c, hos_05_4_npc] + - [0xA969C0, c, hos_05_5_intro] + - [0xA9AB20, c, hos_05_6_narrator] + - [0xA9ADF0, c, hos_05_7_model_fx] + - [0xA9B8F0, c, hos_05_8_star_ship] + - name: hos_06 + dir: world/area_hos/hos_06 + type: code + start: 0xAA5380 + vram: 0x80240000 + subsegments: + - [0xAA5380, c, hos_06_0_header] + - [0xAA5380, c, hos_06_1_entity] + - [0xAA5380, c, hos_06_2_main] + - [0xAA5690, c, hos_06_3_merlow] + - [0xAA60B0, c, hos_06_4_rooms] + - [0xAA60D0, c, hos_06_5_merluvlee] + - [0xAA7350, c, hos_06_6_chest] + - name: hos_10 + dir: world/area_hos/hos_10 + type: code + start: 0xAAB5E0 + vram: 0x80240000 + subsegments: + - [0xAAB5E0, c, hos_10_0_header] + - [0xAAB600, c, hos_10_1_music] + - [0xAAB600, c, hos_10_2_npc1] + - [0xAAB600, c, hos_10_3_npc2] + - [0xAAB600, c, hos_10_4_main] + - [0xAAB600, c, hos_10_5_intro] + - [0xAABA40, c, hos_10_6_pre_title] + - [0xAABD50, c, hos_10_7_ending] + - name: hos_20 + dir: world/area_hos/hos_20 + type: code + start: 0xAB17D0 + vram: 0x80240000 + subsegments: + - [0xAB17D0, c, hos_20_0_header] + - [0xAB17D0, c, hos_20_1_main] + - [0xAB1AE0, c, hos_20_2_starship] + - name: kpa_01 + dir: world/area_kpa/kpa_01 + type: code + start: 0xAB2E00 + vram: 0x80240000 + subsegments: + - [0xAB2E00, c, kpa_01_0_header] + - [0xAB2E00, c, kpa_01_1_music] + - [0xAB2E00, c, kpa_01_2_main] + - [0xAB2F60, c, kpa_01_3_npc] + - [0xAB3850, c, kpa_01_4_entity] + - name: kpa_03 + dir: world/area_kpa/kpa_03 + type: code + start: 0xAB4460 + vram: 0x80240000 + subsegments: + - [0xAB4460, c, kpa_03_0_header] + - [0xAB4460, c, kpa_03_1_music] + - [0xAB4460, c, kpa_03_2_main] + - [0xAB45C0, c, kpa_03_3_npc] + - [0xAB62B0, c, kpa_03_4_entity] + - name: kpa_04 + dir: world/area_kpa/kpa_04 + type: code + start: 0xAB7E00 + vram: 0x80240000 + subsegments: + - [0xAB7E00, c, kpa_04_0_header] + - [0xAB7E00, c, kpa_04_1_music] + - [0xAB7E00, c, kpa_04_2_main] + - [0xAB7E00, c, kpa_04_3_statues] + - name: kpa_08 + dir: world/area_kpa/kpa_08 + type: code + start: 0xAB88C0 + vram: 0x80240000 + subsegments: + - [0xAB88C0, c, kpa_08_0_header] + - [0xAB88C0, c, kpa_08_1_music] + - [0xAB88C0, c, kpa_08_2_main] + - [0xAB88C0, c, kpa_08_3_entity] + - [0xAB8960, c, kpa_08_4_npc] + - name: kpa_09 + dir: world/area_kpa/kpa_09 + type: code + start: 0xABAEA0 + vram: 0x80240000 + subsegments: + - [0xABAEA0, c, kpa_09_0_header] + - [0xABAEA0, c, kpa_09_1_music] + - [0xABAEA0, c, kpa_09_2_main] + - [0xABAEA0, c, kpa_09_3_entity] + - [0xABAF40, c, kpa_09_4_npc] + - name: kpa_10 + dir: world/area_kpa/kpa_10 + type: code + start: 0xABD820 + vram: 0x80240000 + subsegments: + - [0xABD820, c, kpa_10_0_header] + - [0xABD820, c, kpa_10_1_music] + - [0xABD820, c, kpa_10_2_main] + - [0xABDB30, c, kpa_10_3_npc] + - [0xABDB30, c, kpa_10_4_entity] + - name: kpa_11 + dir: world/area_kpa/kpa_11 + type: code + start: 0xABE760 + vram: 0x80240000 + subsegments: + - [0xABE760, c, kpa_11_0_header] + - [0xABE760, c, kpa_11_1_music] + - [0xABE760, c, kpa_11_2_main] + - [0xABEA70, c, kpa_11_3_entity] + - [0xABEA70, c, kpa_11_4_npc] + - name: kpa_12 + dir: world/area_kpa/kpa_12 + type: code + start: 0xAC07F0 + vram: 0x80240000 + subsegments: + - [0xAC07F0, c, kpa_12_0_header] + - [0xAC0830, c, kpa_12_1_music] + - [0xAC0830, c, kpa_12_2_main] + - [0xAC0B40, c, kpa_12_3_platforms] + - name: kpa_13 + dir: world/area_kpa/kpa_13 + type: code + start: 0xAC1DC0 + vram: 0x80240000 + subsegments: + - [0xAC1DC0, c, kpa_13_0_header] + - [0xAC1E00, c, kpa_13_1_music] + - [0xAC1E00, c, kpa_13_2_main] + - [0xAC2110, c, kpa_13_3_entity] + - [0xAC2110, c, kpa_13_4_platforms] + - name: kpa_14 + dir: world/area_kpa/kpa_14 + type: code + start: 0xAC3350 + vram: 0x80240000 + subsegments: + - [0xAC3350, c, kpa_14_0_header] + - [0xAC3390, c, kpa_14_1_music] + - [0xAC3390, c, kpa_14_2_main] + - [0xAC36D0, c, kpa_14_3_entity] + - [0xAC3A60, c, kpa_14_4_platforms] + - name: kpa_15 + dir: world/area_kpa/kpa_15 + type: code + start: 0xAC5230 + vram: 0x80240000 + subsegments: + - [0xAC5230, c, kpa_15_0_header] + - [0xAC5230, c, kpa_15_1_music] + - [0xAC5230, c, kpa_15_2_main] + - [0xAC5540, c, kpa_15_3_entity] + - name: kpa_16 + dir: world/area_kpa/kpa_16 + type: code + start: 0xAC5ED0 + vram: 0x80240000 + subsegments: + - [0xAC5ED0, c, kpa_16_0_header] + - [0xAC5ED0, c, kpa_16_1_music] + - [0xAC5ED0, c, kpa_16_2_main] + - [0xAC61E0, c, kpa_16_3_entity] + - [0xAC61E0, c, kpa_16_4_npc] + - name: kpa_17 + dir: world/area_kpa/kpa_17 + type: code + start: 0xAC88C0 + vram: 0x80240000 + subsegments: + - [0xAC88C0, c, kpa_17_0_header] + - [0xAC88C0, c, kpa_17_1_music] + - [0xAC88C0, c, kpa_17_2_entity] + - [0xAC88C0, c, kpa_17_3_main] + - [0xAC88C0, c, kpa_17_4_npc] + - name: kpa_32 + dir: world/area_kpa/kpa_32 + type: code + start: 0xAC9F60 + vram: 0x80240000 + subsegments: + - [0xAC9F60, c, kpa_32_0_header] + - [0xAC9F60, c, kpa_32_1_music] + - [0xAC9F60, c, kpa_32_2_entity] + - [0xAC9F60, c, kpa_32_3_main] + - name: kpa_33 + dir: world/area_kpa/kpa_33 + type: code + start: 0xACAF20 + vram: 0x80240000 + subsegments: + - [0xACAF20, c, kpa_33_0_header] + - [0xACAF20, c, kpa_33_1_music] + - [0xACAF20, c, kpa_33_2_entity] + - [0xACAF20, c, kpa_33_3_main] + - name: kpa_40 + dir: world/area_kpa/kpa_40 + type: code + start: 0xACBEE0 + vram: 0x80240000 + subsegments: + - [0xACBEE0, c, kpa_40_0_header] + - [0xACBEE0, c, kpa_40_1_music] + - [0xACBEE0, c, kpa_40_2_main] + - name: kpa_41 + dir: world/area_kpa/kpa_41 + type: code + start: 0xACC310 + vram: 0x80240000 + subsegments: + - [0xACC310, c, kpa_41_0_header] + - [0xACC310, c, kpa_41_1_music] + - [0xACC310, c, kpa_41_2_main] + - name: kpa_50 + dir: world/area_kpa/kpa_50 + type: code + start: 0xACC870 + vram: 0x80240000 + subsegments: + - [0xACC870, c, kpa_50_0_header] + - [0xACC870, c, kpa_50_1_music] + - [0xACC870, c, kpa_50_2_main] + - [0xACC870, c, kpa_50_3_npc] + - name: kpa_51 + dir: world/area_kpa/kpa_51 + type: code + start: 0xACFF30 + vram: 0x80240000 + subsegments: + - [0xACFF30, c, kpa_51_0_header] + - [0xACFF30, c, kpa_51_1_music] + - [0xACFF30, c, kpa_51_2_main] + - [0xACFF80, c, kpa_51_3_npc] + - name: kpa_52 + dir: world/area_kpa/kpa_52 + type: code + start: 0xAD2FA0 + vram: 0x80240000 + subsegments: + - [0xAD2FA0, c, kpa_52_0_header] + - [0xAD2FA0, c, kpa_52_1_music] + - [0xAD2FA0, c, kpa_52_2_entity] + - [0xAD3080, c, kpa_52_3_main] + - [0xAD3080, c, kpa_52_4_npc] + - name: kpa_53 + dir: world/area_kpa/kpa_53 + type: code + start: 0xAD6B40 + vram: 0x80240000 + subsegments: + - [0xAD6B40, c, kpa_53_0_header] + - [0xAD6B40, c, kpa_53_1_music] + - [0xAD6B40, c, kpa_53_2_main] + - [0xAD6B90, c, kpa_53_3_npc] + - [0xAD6CB0, c, kpa_53_4_entity] + - name: kpa_60 + dir: world/area_kpa/kpa_60 + type: code + start: 0xAD89A0 + vram: 0x80240000 + subsegments: + - [0xAD89A0, c, kpa_60_0_header] + - [0xAD89A0, c, kpa_60_1_music] + - [0xAD89A0, c, kpa_60_2_entity] + - [0xAD8A80, c, kpa_60_3_main] + - [0xAD8D90, c, kpa_60_4_scenes] + - name: kpa_61 + dir: world/area_kpa/kpa_61 + type: code + start: 0xADA280 + vram: 0x80240000 + subsegments: + - [0xADA280, c, kpa_61_0_header] + - [0xADA280, c, kpa_61_1_music] + - [0xADA280, c, kpa_61_2_main] + - [0xADA590, c, kpa_61_3_npc] + - [0xADC5C0, c, kpa_61_4_entity] + - name: kpa_62 + dir: world/area_kpa/kpa_62 + type: code + start: 0xADE0C0 + vram: 0x80240000 + subsegments: + - [0xADE0C0, c, kpa_62_0_header] + - [0xADE0C0, c, kpa_62_1_music] + - [0xADE0C0, c, kpa_62_2_entity] + - [0xADE1A0, c, kpa_62_3_main] + - name: kpa_63 + dir: world/area_kpa/kpa_63 + type: code + start: 0xADF450 + vram: 0x80240000 + subsegments: + - [0xADF450, c, kpa_63_0_header] + - [0xADF450, c, kpa_63_1_music] + - [0xADF450, c, kpa_63_2_entity] + - [0xADF450, c, kpa_63_3_main] + - [0xADF450, c, kpa_63_4_scenes] + - name: kpa_70 + dir: world/area_kpa/kpa_70 + type: code + start: 0xAE0710 + vram: 0x80240000 + subsegments: + - [0xAE0710, c, kpa_70_0_header] + - [0xAE0710, c, kpa_70_1_music] + - [0xAE0710, c, kpa_70_2_main] + - [0xAE0A20, c, kpa_70_3_npc] + - [0xAE1200, c, kpa_70_4_chain_skele] + - [0xAE1200, c, kpa_70_5_chain_anim] + - name: kpa_81 + dir: world/area_kpa/kpa_81 + type: code + start: 0xAE4360 + vram: 0x80240000 + subsegments: + - [0xAE4360, c, kpa_81_0_header] + - [0xAE4360, c, kpa_81_1_music] + - [0xAE4360, c, kpa_81_2_main] + - [0xAE43B0, c, kpa_81_3_npc] + - name: kpa_82 + dir: world/area_kpa/kpa_82 + type: code + start: 0xAE63A0 + vram: 0x80240000 + subsegments: + - [0xAE63A0, c, kpa_82_0_header] + - [0xAE63A0, c, kpa_82_1_music] + - [0xAE63A0, c, kpa_82_2_main] + - [0xAE63F0, c, kpa_82_3_npc] + - name: kpa_83 + dir: world/area_kpa/kpa_83 + type: code + start: 0xAEF330 + vram: 0x80240000 + subsegments: + - [0xAEF330, c, kpa_83_0_header] + - [0xAEF330, c, kpa_83_1_music] + - [0xAEF330, c, kpa_83_2_main] + - [0xAEF380, c, kpa_83_3_npc] + - name: kpa_90 + dir: world/area_kpa/kpa_90 + type: code + start: 0xAF2650 + vram: 0x80240000 + subsegments: + - [0xAF2650, c, kpa_90_0_header] + - [0xAF2650, c, kpa_90_1_music] + - [0xAF2650, c, kpa_90_2_main] + - name: kpa_91 + dir: world/area_kpa/kpa_91 + type: code + start: 0xAF28F0 + vram: 0x80240000 + subsegments: + - [0xAF28F0, c, kpa_91_0_header] + - [0xAF28F0, c, kpa_91_1_music] + - [0xAF28F0, c, kpa_91_2_main] + - [0xAF28F0, c, kpa_91_3_npc] + - [0xAF4120, c, kpa_91_4_entity] + - name: kpa_94 + dir: world/area_kpa/kpa_94 + type: code + start: 0xAF8660 + vram: 0x80240000 + subsegments: + - [0xAF8660, c, kpa_94_0_header] + - [0xAF8660, c, kpa_94_1_music] + - [0xAF8660, c, kpa_94_2_main] + - name: kpa_95 + dir: world/area_kpa/kpa_95 + type: code + start: 0xAF8920 + vram: 0x80240000 + subsegments: + - [0xAF8920, c, kpa_95_0_header] + - [0xAF8920, c, kpa_95_1_music] + - [0xAF8920, c, kpa_95_2_entity] + - [0xAF8A00, c, kpa_95_3_main] + - [0xAF8A00, c, kpa_95_4_npc] + - name: kpa_96 + dir: world/area_kpa/kpa_96 + type: code + start: 0xAFE660 + vram: 0x80240000 + subsegments: + - [0xAFE660, c, kpa_96_0_header] + - [0xAFE660, c, kpa_96_1_music] + - [0xAFE660, c, kpa_96_2_main] + - [0xAFE660, c, kpa_96_3_npc] + - name: kpa_100 + dir: world/area_kpa/kpa_100 + type: code + start: 0xAFF000 + vram: 0x80240000 + subsegments: + - [0xAFF000, c, kpa_100_0_header] + - [0xAFF000, c, kpa_100_1_music] + - [0xAFF000, c, kpa_100_2_main] + - [0xAFF050, c, kpa_100_3_entity] + - name: kpa_101 + dir: world/area_kpa/kpa_101 + type: code + start: 0xAFF2E0 + vram: 0x80240000 + subsegments: + - [0xAFF2E0, c, kpa_101_0_header] + - [0xAFF2E0, c, kpa_101_1_music] + - [0xAFF2E0, c, kpa_101_2_main] + - [0xAFF330, c, kpa_101_3_entity] + - name: kpa_102 + dir: world/area_kpa/kpa_102 + type: code + start: 0xAFF5E0 + vram: 0x80240000 + subsegments: + - [0xAFF5E0, c, kpa_102_0_header] + - [0xAFF5E0, c, kpa_102_1_music] + - [0xAFF5E0, c, kpa_102_2_main] + - [0xAFF8F0, c, kpa_102_3_npc] + - name: kpa_111 + dir: world/area_kpa/kpa_111 + type: code + start: 0xB05430 + vram: 0x80240000 + subsegments: + - [0xB05430, c, kpa_111_0_header] + - [0xB05430, c, kpa_111_1_music] + - [0xB05430, c, kpa_111_2_main] + - [0xB05430, c, kpa_111_3_statues] + - [0xB055A0, c, kpa_111_4_npc] + - [0xB067F0, c, kpa_111_5_entity] + - name: kpa_112 + dir: world/area_kpa/kpa_112 + type: code + start: 0xB08830 + vram: 0x80240000 + subsegments: + - [0xB08830, c, kpa_112_0_header] + - [0xB08830, c, kpa_112_1_music] + - [0xB08830, c, kpa_112_2_main] + - name: kpa_113 + dir: world/area_kpa/kpa_113 + type: code + start: 0xB08AD0 + vram: 0x80240000 + subsegments: + - [0xB08AD0, c, kpa_113_0_header] + - [0xB08AD0, c, kpa_113_1_music] + - [0xB08AD0, c, kpa_113_2_main] + - [0xB08AD0, c, kpa_113_3_entity] + - [0xB08B10, c, kpa_113_4_statues] + - [0xB08C80, c, kpa_113_5_npc] + - name: kpa_114 + dir: world/area_kpa/kpa_114 + type: code + start: 0xB0A820 + vram: 0x80240000 + subsegments: + - [0xB0A820, c, kpa_114_0_header] + - [0xB0A820, c, kpa_114_1_music] + - [0xB0A820, c, kpa_114_2_main] + - [0xB0A870, c, kpa_114_3_entity] + - name: kpa_115 + dir: world/area_kpa/kpa_115 + type: code + start: 0xB0ABE0 + vram: 0x80240000 + subsegments: + - [0xB0ABE0, c, kpa_115_0_header] + - [0xB0ABE0, c, kpa_115_1_music] + - [0xB0ABE0, c, kpa_115_2_main] + - [0xB0ABE0, c, kpa_115_3_statues] + - [0xB0AD50, c, kpa_115_4_npc] + - name: kpa_116 + dir: world/area_kpa/kpa_116 + type: code + start: 0xB0DD80 + vram: 0x80240000 + subsegments: + - [0xB0DD80, c, kpa_116_0_header] + - [0xB0DD80, c, kpa_116_1_music] + - [0xB0DD80, c, kpa_116_2_main] + - name: kpa_117 + dir: world/area_kpa/kpa_117 + type: code + start: 0xB0E020 + vram: 0x80240000 + subsegments: + - [0xB0E020, c, kpa_117_0_header] + - [0xB0E020, c, kpa_117_1_music] + - [0xB0E020, c, kpa_117_2_main] + - name: kpa_118 + dir: world/area_kpa/kpa_118 + type: code + start: 0xB0E260 + vram: 0x80240000 + subsegments: + - [0xB0E260, c, kpa_118_0_header] + - [0xB0E260, c, kpa_118_1_music] + - [0xB0E260, c, kpa_118_2_main] + - name: kpa_119 + dir: world/area_kpa/kpa_119 + type: code + start: 0xB0E500 + vram: 0x80240000 + subsegments: + - [0xB0E500, c, kpa_119_0_header] + - [0xB0E500, c, kpa_119_1_music] + - [0xB0E500, c, kpa_119_2_entity] + - [0xB0E500, c, kpa_119_3_main] + - name: kpa_121 + dir: world/area_kpa/kpa_121 + type: code + start: 0xB0E790 + vram: 0x80240000 + subsegments: + - [0xB0E790, c, kpa_121_0_header] + - [0xB0E790, c, kpa_121_1_music] + - [0xB0E790, c, kpa_121_2_main] + - name: kpa_130 + dir: world/area_kpa/kpa_130 + type: code + start: 0xB0EBC0 + vram: 0x80240000 + subsegments: + - [0xB0EBC0, c, kpa_130_0_header] + - [0xB0EBC0, c, kpa_130_1_music] + - [0xB0EBC0, c, kpa_130_2_main] + - [0xB0EBC0, c, kpa_130_3_npc] + - name: kpa_133 + dir: world/area_kpa/kpa_133 + type: code + start: 0xB13320 + vram: 0x80240000 + subsegments: + - [0xB13320, c, kpa_133_0_header] + - [0xB13320, c, kpa_133_1_music] + - [0xB13320, c, kpa_133_2_main] + - [0xB13630, c, kpa_133_3_entity] + - [0xB13790, c, kpa_133_4_npc] + - [0xB13790, c, kpa_133_5_water] + - [0xB13790, c, kpa_133_6] + - name: kpa_134 + dir: world/area_kpa/kpa_134 + type: code + start: 0xB14E40 + vram: 0x80240000 + subsegments: + - [0xB14E40, c, kpa_134_0_header] + - [0xB14E40, c, kpa_134_1_music] + - [0xB14E40, c, kpa_134_2_main] + - [0xB15150, c, kpa_134_3_chains] + - [0xB15350, c, kpa_134_4_npc] + - [0xB15350, c, kpa_134_5_panels] + - [0xB15350, c, kpa_134_6_entity] + - name: osr_00 + dir: world/area_osr/osr_00 + type: code + start: 0xB186D0 + vram: 0x80240000 + subsegments: + - [0xB186D0, c, osr_00_0_header] + - [0xB186D0, c, osr_00_1_music] + - [0xB186D0, c, osr_00_2_main] + - [0xB18A50, c, osr_00_3_npc_intro] + - [0xB18A50, c, osr_00_4_npc_epilogue] + - [0xB18A50, c, osr_00_5_scenes] + - name: osr_01 + dir: world/area_osr/osr_01 + type: code + start: 0xB1BE90 + vram: 0x80240000 + subsegments: + - [0xB1BE90, c, osr_01_0_header] + - [0xB1BEE0, c, osr_01_1_music] + - [0xB1BEE0, c, osr_01_2_main] + - [0xB1C1F0, c, osr_01_3_npc] + - name: osr_02 + dir: world/area_osr/osr_02 + type: code + start: 0xB1E010 + vram: 0x80240000 + subsegments: + - [0xB1E010, c, osr_02_0_header] + - [0xB1E030, c, osr_02_1_main] + - [0xB1E070, c, osr_02_2_entity] + - [0xB1E070, c, osr_02_3_npc] + - [0xB1E130, c, osr_02_4_npc_peach] + - name: osr_03 + dir: world/area_osr/osr_03 + type: code + start: 0xB22130 + vram: 0x80240000 + subsegments: + - [0xB22130, c, osr_03_0_header] + - [0xB22150, c, osr_03_1_main] + - [0xB22150, c, osr_03_2_npc] + - [0xB22150, c, osr_03_3_intro] + - [0xB221C0, c, osr_03_4_starship] + - [0xB221C0, c, osr_03_5_interlude] + - [0xB222D0, c, osr_03_6_ending] + - name: osr_04 + dir: world/area_osr/osr_04 + type: code + start: 0xB25150 + vram: 0x80240000 + subsegments: + - [0xB25150, c, osr_04_0_header] + - [0xB25150, c, osr_04_1_main] + - [0xB25150, c, osr_04_2_assault] + - name: kkj_00 + dir: world/area_kkj/kkj_00 + type: code + start: 0xB27130 + vram: 0x80240000 + subsegments: + - [0xB27130, c, kkj_00_0_header] + - [0xB27170, c, kkj_00_1_music] + - [0xB27170, c, kkj_00_2_main] + - [0xB271E0, c, kkj_00_3_npc_intro] + - [0xB28070, c, kkj_00_4_scene_intro] + - [0xB28070, c, kkj_00_5_npc_ending] + - [0xB28070, c, kkj_00_6_scene_ending] + - name: kkj_01 + dir: world/area_kkj/kkj_01 + type: code + start: 0xB31010 + vram: 0x80240000 + subsegments: + - [0xB31010, c, kkj_01_0_header] + - [0xB31010, c, kkj_01_1_music] + - [0xB31010, c, kkj_01_2_main] + - [0xB31010, c, kkj_01_3_npc] + - name: kkj_02 + dir: world/area_kkj/kkj_02 + type: code + start: 0xB34BC0 + vram: 0x80240000 + subsegments: + - [0xB34BC0, c, kkj_02_0_header] + - [0xB34BC0, c, kkj_02_1_music] + - [0xB34BC0, c, kkj_02_2_main] + - [0xB34BC0, c, kkj_02_3_npc] + - name: kkj_03 + dir: world/area_kkj/kkj_03 + type: code + start: 0xB355B0 + vram: 0x80240000 + subsegments: + - [0xB355B0, c, kkj_03_0_header] + - [0xB355D0, c, kkj_03_1_music] + - [0xB355D0, c, kkj_03_2_main] + - [0xB358E0, c, kkj_03_3_npc] + - [0xB358E0, c, kkj_03_4_scenes] + - name: kkj_10 + dir: world/area_kkj/kkj_10 + type: code + start: 0xB369C0 + vram: 0x80240000 + subsegments: + - [0xB369C0, c, kkj_10_0_header] + - [0xB369C0, c, kkj_10_1_main] + - [0xB36A30, c, kkj_10_2_entity] + - [0xB36A70, c, kkj_10_3_npcs_early] + - [0xB37260, c, kkj_10_4_npcs_later] + - name: kkj_11 + dir: world/area_kkj/kkj_11 + type: code + start: 0xB39FE0 + vram: 0x80240000 + subsegments: + - [0xB39FE0, c, kkj_11_0_header] + - [0xB39FE0, c, kkj_11_1_main] + - [0xB3A050, c, kkj_11_2_entity] + - [0xB3A090, c, kkj_11_3_scene] + - [0xB3A090, c, kkj_11_4_demo] + - [0xB3A090, c, kkj_11_5_npcs_early] + - [0xB3A880, c, kkj_11_6_npcs_later] + - name: kkj_12 + dir: world/area_kkj/kkj_12 + type: code + start: 0xB3FF30 + vram: 0x80240000 + subsegments: + - [0xB3FF30, c, kkj_12_0_header] + - [0xB3FF30, c, kkj_12_1_main] + - [0xB3FFA0, c, kkj_12_2_npc] + - name: kkj_13 + dir: world/area_kkj/kkj_13 + type: code + start: 0xB41D70 + vram: 0x80240000 + subsegments: + - [0xB41D70, c, kkj_13_0_header] + - [0xB41D90, c, kkj_13_1_music] + - [0xB41D90, c, kkj_13_2_main] + - [0xB420A0, c, kkj_13_3_npcs_finale] + - [0xB42100, c, kkj_13_4_npcs_intro] + - [0xB42100, c, kkj_13_5_intro_scenes] + - name: kkj_14 + dir: world/area_kkj/kkj_14 + type: code + start: 0xB46D20 + vram: 0x80240000 + subsegments: + - [0xB46D20, c, kkj_14_0_header] + - [0xB46D70, c, kkj_14_1_music] + - [0xB46D70, c, kkj_14_2_main] + - [0xB470C0, c, kkj_14_3_interactables] + - [0xB471A0, c, kkj_14_4_npc_guards] + - [0xB471A0, c, kkj_14_5_npc_ch0] + - [0xB471A0, c, kkj_14_6_npc_ch2] + - [0xB471A0, c, kkj_14_7_npc_ch7] + - [0xB471A0, c, kkj_14_8_chapter0] + - [0xB471E0, c, kkj_14_9_chapter1] + - [0xB471E0, c, kkj_14_10_chapter2] + - [0xB471E0, c, kkj_14_11_chapter3] + - [0xB471E0, c, kkj_14_12_chapter4] + - [0xB471E0, c, kkj_14_13_chapter5] + - [0xB471E0, c, kkj_14_14_chapter6] + - [0xB471E0, c, kkj_14_15_chapter7] + - name: kkj_15 + dir: world/area_kkj/kkj_15 + type: code + start: 0xB51410 + vram: 0x80240000 + subsegments: + - [0xB51410, c, kkj_15_0_header] + - [0xB51410, c, kkj_15_1_music] + - [0xB51410, c, kkj_15_2_main] + - [0xB51750, c, kkj_15_3_rotating_wall] + - [0xB51910, c, kkj_15_4_chapter0] + - [0xB519E0, c, kkj_15_5_chapter1] + - [0xB519E0, c, kkj_15_6_chapter2] + - [0xB519E0, c, kkj_15_7_chapter3] + - [0xB51A20, c, kkj_15_8_npc_chapter0] + - [0xB51A20, c, kkj_15_9_npc_chapter1] + - [0xB51A20, c, kkj_15_10_npc_chapter3] + - name: kkj_16 + dir: world/area_kkj/kkj_16 + type: code + start: 0xB59290 + vram: 0x80240000 + subsegments: + - [0xB59290, c, kkj_16_0_header] + - [0xB59290, c, kkj_16_1_main] + - [0xB592F0, c, kkj_16_2_npcs_early] + - [0xB59AE0, c, kkj_16_3_npcs_later] + - [0xB5A310, c, kkj_16_4_stealth] + - [0xB5A310, c, kkj_16_5_entity] + - name: kkj_17 + dir: world/area_kkj/kkj_17 + type: code + start: 0xB5DAE0 + vram: 0x80240000 + subsegments: + - [0xB5DAE0, c, kkj_17_0_header] + - [0xB5DAE0, c, kkj_17_1_main] + - [0xB5DAE0, c, kkj_17_2_entity] + - [0xB5DAE0, c, kkj_17_3_chest] + - name: kkj_18 + dir: world/area_kkj/kkj_18 + type: code + start: 0xB5EB20 + vram: 0x80240000 + subsegments: + - [0xB5EB20, c, kkj_18_0_header] + - [0xB5EB20, c, kkj_18_1_music] + - [0xB5EB20, c, kkj_18_2_main] + - [0xB5EE60, c, kkj_18_3_npc] + - [0xB5EE60, c, kkj_18_4_gourmet] + - name: kkj_19 + dir: world/area_kkj/kkj_19 + type: code + start: 0xB637D0 + vram: 0x80240000 + subsegments: + - [0xB637D0, c, kkj_19_0_header] + - [0xB637D0, c, kkj_19_1_music] + - [0xB637D0, c, kkj_19_2_main] + - [0xB63A80, c, kkj_19_3_npcs_intro] + - [0xB63A80, c, kkj_19_4_npcs_peach] + - [0xB63A80, c, kkj_19_5_baking] + - name: kkj_20 + dir: world/area_kkj/kkj_20 + type: code + start: 0xB69A30 + vram: 0x80240000 + subsegments: + - [0xB69A30, c, kkj_20_0_header] + - [0xB69A30, c, kkj_20_1_music] + - [0xB69A30, c, kkj_20_2_main] + - [0xB69A30, c, kkj_20_3_entity] + - [0xB69CF0, c, kkj_20_4_npc] + - name: kkj_21 + dir: world/area_kkj/kkj_21 + type: code + start: 0xB6E190 + vram: 0x80240000 + subsegments: + - [0xB6E190, c, kkj_21_0_header] + - [0xB6E190, c, kkj_21_1_main] + - name: kkj_22 + dir: world/area_kkj/kkj_22 + type: code + start: 0xB6E3E0 + vram: 0x80240000 + subsegments: + - [0xB6E3E0, c, kkj_22_0_header] + - [0xB6E3E0, c, kkj_22_1_music] + - [0xB6E3E0, c, kkj_22_2_main] + - name: kkj_23 + dir: world/area_kkj/kkj_23 + type: code + start: 0xB6E770 + vram: 0x80240000 + subsegments: + - [0xB6E770, c, kkj_23_0_header] + - [0xB6E790, c, kkj_23_1_music] + - [0xB6E790, c, kkj_23_2_main] + - [0xB6E7F0, c, kkj_23_3_npcs_finale] + - [0xB6E850, c, kkj_23_4_npcs_peach] + - [0xB6F080, c, kkj_23_5_scene] + - name: kkj_24 + dir: world/area_kkj/kkj_24 + type: code + start: 0xB72460 + vram: 0x80240000 + subsegments: + - [0xB72460, c, kkj_24_0_header] + - [0xB72460, c, kkj_24_1_music] + - [0xB72460, c, kkj_24_2_main] + - [0xB72480, c, kkj_24_3_entity] + - name: kkj_25 + dir: world/area_kkj/kkj_25 + type: code + start: 0xB728F0 + vram: 0x80240000 + subsegments: + - [0xB728F0, c, kkj_25_0_header] + - [0xB72910, c, kkj_25_1_main] + - [0xB72910, c, kkj_25_2_npc_initial] + - [0xB72940, c, kkj_25_3_npc_midpoint] + - [0xB72970, c, kkj_25_4_npc_final] + - [0xB72970, c, kkj_25_5_arena] + - [0xB72C00, c, kkj_25_6_peach_free] + - [0xB73550, c, kkj_25_7_kammy_defeated] + - [0xB73620, c, kkj_25_8_bowser_defeated] + - [0xB73830, c, kkj_25_9_entity] + - name: kkj_26 + dir: world/area_kkj/kkj_26 + type: code + start: 0xB7F010 + vram: 0x80240000 + subsegments: + - [0xB7F010, c, kkj_26_0_header] + - [0xB7F010, c, kkj_26_1_main] + - [0xB7F040, c, kkj_26_2_scenes] + - [0xB7F040, c, kkj_26_3_demo] + - name: kkj_27 + dir: world/area_kkj/kkj_27 + type: code + start: 0xB7FC60 + vram: 0x80240000 + subsegments: + - [0xB7FC60, c, kkj_27_0_header] + - [0xB7FC60, c, kkj_27_1_music] + - [0xB7FC60, c, kkj_27_2_main] + - [0xB7FF70, c, kkj_27_3_rotating_wall] + - name: kkj_28 + dir: world/area_kkj/kkj_28 + type: code + start: 0xB80D90 + vram: 0x80240000 + subsegments: + - [0xB80D90, c, kkj_28_0_header] + - [0xB80D90, c, kkj_28_1_main] + - name: kkj_29 + dir: world/area_kkj/kkj_29 + type: code + start: 0xB80FA0 + vram: 0x80240000 + subsegments: + - [0xB80FA0, c, kkj_29_0_header] + - [0xB80FA0, c, kkj_29_1_main] + - [0xB80FD0, c, kkj_29_2_npc] + - [0xB80FD0, c, kkj_29_3_quiz] + - name: tst_01 + dir: world/area_tst/tst_01 + type: code + start: 0xB867F0 + vram: 0x80240000 + subsegments: + - [0xB867F0, c, tst_01_1_main] + - [0xB867F0, c, tst_01_2_entity] + - name: tst_02 + dir: world/area_tst/tst_02 + type: code + start: 0xB86B20 + vram: 0x80240000 + subsegments: + - [0xB86B20, c, tst_02_1_main] + - [0xB86B20, c, tst_02_2_entity] + - name: tst_03 + dir: world/area_tst/tst_03 + type: code + start: 0xB86E70 + vram: 0x80240000 + subsegments: + - [0xB86E70, c, tst_03_1_main] + - [0xB86E70, c, tst_03_2_entity] + - name: tst_04 + dir: world/area_tst/tst_04 + type: code + start: 0xB87460 + vram: 0x80240000 + subsegments: + - [0xB87460, c, tst_04_1_main] + - [0xB876C0, c, tst_04_2_entity] + - [0xB876C0, c, tst_04_3_reflection] + - [0xB87AC0, c, tst_04_4_npc] + - name: tst_10 + dir: world/area_tst/tst_10 + type: code + start: 0xB88430 + vram: 0x80240000 + subsegments: + - [0xB88430, c, tst_10_1_main] + - name: tst_11 + dir: world/area_tst/tst_11 + type: code + start: 0xB88940 + vram: 0x80240000 + subsegments: + - [0xB88940, c, tst_11_1_main] + - [0xB88940, c, tst_11_2_extra] + - name: tst_12 + dir: world/area_tst/tst_12 + type: code + start: 0xB891E0 + vram: 0x80240000 + subsegments: + - [0xB891E0, c, tst_12_1_main] + - name: tst_13 + dir: world/area_tst/tst_13 + type: code + start: 0xB89650 + vram: 0x80240000 + subsegments: + - [0xB89650, c, tst_13_1_main] + - start: 0xB89A10 + type: .data + name: tst_13_1_main + subsegments: + - [0xB89A10] + - [0xB8B900, vtx, shockwave] + - [0xB8BEB0, gfx, shockwave] + - [0xB8C240] + - name: tst_20 + dir: world/area_tst/tst_20 + type: code + start: 0xB8C360 + vram: 0x80240000 + subsegments: + - [0xB8C360, c, tst_20_1_main] + - name: jan_00 + dir: world/area_jan/jan_00 + type: code + start: 0xB8C430 + vram: 0x80240000 + subsegments: + - [0xB8C430, c, jan_00_0_header] + - [0xB8C430, c, jan_00_1_main] + - [0xB8C770, c, jan_00_2_npc] + - [0xB8D5D0, c, jan_00_3_entity] + - [0xB8D5D0, c, jan_00_4_whale] + - [0xB8DD90, c, jan_00_5_foliage] + - name: jan_01 + dir: world/area_jan/jan_01 + type: code + start: 0xB93F20 + vram: 0x80240000 + subsegments: + - [0xB93F20, c, jan_01_0_header] + - [0xB93F20, c, jan_01_1_music] + - [0xB93F20, c, jan_01_2_main] + - [0xB94260, c, jan_01_3_npc] + - [0xB950B0, c, jan_01_4_entity] + - [0xB950B0, c, jan_01_5_foliage] + - name: jan_02 + dir: world/area_jan/jan_02 + type: code + start: 0xB98360 + vram: 0x80240000 + subsegments: + - [0xB98360, c, jan_02_0_header] + - [0xB98360, c, jan_02_1_music] + - [0xB98390, c, jan_02_2_main] + - [0xB98790, c, jan_02_3_npc] + - [0xB9AA40, c, jan_02_4_entity] + - [0xB9AA40, c, jan_02_5_foliage] + - name: jan_03 + dir: world/area_jan/jan_03 + type: code + start: 0xBA0B20 + vram: 0x80240000 + subsegments: + - [0xBA0B20, c, jan_03_0_header] + - [0xBA0B20, c, jan_03_1_music] + - [0xBA0B20, c, jan_03_2_main] + - [0xBA1140, c, jan_03_3_shop] + - [0xBA1140, c, jan_03_4_npc] + - [0xBA3AC0, c, jan_03_5_entity] + - [0xBA3B70, c, jan_03_6_rooms] + - [0xBA3B70, c, jan_03_7_foliage] + - name: jan_04 + dir: world/area_jan/jan_04 + type: code + start: 0xBB0700 + vram: 0x80240000 + subsegments: + - [0xBB0700, c, jan_04_0_header] + - [0xBB0740, c, jan_04_1_music] + - [0xBB0740, c, jan_04_2_main] + - [0xBB0A50, c, jan_04_3_entity] + - [0xBB0D10, c, jan_04_4_npc] + - [0xBB0EA0, c, jan_04_5_unused] + - [0xBB0EA0, c, jan_04_6_trees] + - [0xBB10E0, c, jan_04_7_scenes] + - [0xBB1180, c, jan_04_8_treasure] + - [0xBB1480, c, jan_04_9_bushes] + - [0xBB16C0, c, jan_04_10_demo] + - name: jan_05 + dir: world/area_jan/jan_05 + type: code + start: 0xBB6A00 + vram: 0x80240000 + subsegments: + - [0xBB6A00, c, jan_05_0_header] + - [0xBB6A40, c, jan_05_1_music] + - [0xBB6A40, c, jan_05_2_main] + - [0xBB6D50, c, jan_05_3_log] + - [0xBB6EA0, c, jan_05_4_bushes] + - [0xBB71F0, c, jan_05_5_npc] + - [0xBB8E50, c, jan_05_6_trees] + - [0xBB90D0, c, jan_05_7_entity] + - name: jan_06 + dir: world/area_jan/jan_06 + type: code + start: 0xBBE7C0 + vram: 0x80240000 + subsegments: + - [0xBBE7C0, c, jan_06_0_header] + - [0xBBE7C0, c, jan_06_1_main] + - [0xBBEAD0, c, jan_06_2_statue] + - [0xBBEB70, c, jan_06_3_log] + - [0xBBECC0, c, jan_06_4_trees] + - [0xBBEF00, c, jan_06_5_entity] + - [0xBBEF00, c, jan_06_6_npc] + - [0xBC0B60, c, jan_06_7_bushes] + - name: jan_07 + dir: world/area_jan/jan_07 + type: code + start: 0xBC5800 + vram: 0x80240000 + subsegments: + - [0xBC5800, c, jan_07_0_header] + - [0xBC5800, c, jan_07_1_music] + - [0xBC5800, c, jan_07_2_main] + - [0xBC5800, c, jan_07_3_npc] + - [0xBC65A0, c, jan_07_4_trees] + - [0xBC67E0, c, jan_07_5_bushes] + - name: jan_08 + dir: world/area_jan/jan_08 + type: code + start: 0xBCA1B0 + vram: 0x80240000 + subsegments: + - [0xBCA1B0, c, jan_08_0_header] + - [0xBCA1B0, c, jan_08_1_music] + - [0xBCA1B0, c, jan_08_2_main] + - [0xBCA4C0, c, jan_08_3_bushes] + - [0xBCA810, c, jan_08_4_entity] + - [0xBCB550, c, jan_08_5_npc] + - [0xBCC3A0, c, jan_08_6_trees] + - name: jan_09 + dir: world/area_jan/jan_09 + type: code + start: 0xBD19B0 + vram: 0x80240000 + subsegments: + - [0xBD19B0, c, jan_09_0_header] + - [0xBD19B0, c, jan_09_1_main] + - [0xBD1FA0, c, jan_09_2_bushes] + - [0xBD22F0, c, jan_09_3_npc] + - [0xBD3090, c, jan_09_4_trees] + - [0xBD32D0, c, jan_09_5_entity] + - name: jan_10 + dir: world/area_jan/jan_10 + type: code + start: 0xBD8290 + vram: 0x80240000 + subsegments: + - [0xBD8290, c, jan_10_0_header] + - [0xBD8290, c, jan_10_1_music] + - [0xBD8290, c, jan_10_2_main] + - [0xBD85A0, c, jan_10_3_npc] + - [0xBD93C0, c, jan_10_4_log] + - [0xBD9510, c, jan_10_5_trees] + - [0xBD9790, c, jan_10_6_bushes] + - [0xBD99D0, c, jan_10_7_entity] + - name: jan_11 + dir: world/area_jan/jan_11 + type: code + start: 0xBDC760 + vram: 0x80240000 + subsegments: + - [0xBDC760, c, jan_11_0_header] + - [0xBDC760, c, jan_11_1_music] + - [0xBDC760, c, jan_11_2_main] + - [0xBDCF10, c, jan_11_3_npc] + - name: jan_12 + dir: world/area_jan/jan_12 + type: code + start: 0xBDEFB0 + vram: 0x80240000 + subsegments: + - [0xBDEFB0, c, jan_12_0_header] + - [0xBDEFB0, c, jan_12_1_main] + - [0xBDEFB0, c, jan_12_2_vines] + - [0xBDF230, c, jan_12_3_trees] + - [0xBDF470, c, jan_12_4_entity] + - [0xBDF470, c, jan_12_5_npc] + - name: jan_13 + dir: world/area_jan/jan_13 + type: code + start: 0xBE26B0 + vram: 0x80240000 + subsegments: + - [0xBE26B0, c, jan_13_0_header] + - [0xBE26B0, c, jan_13_1_main] + - [0xBE26B0, c, jan_13_2_puzzle] + - [0xBE2A40, c, jan_13_3_trees] + - [0xBE2C80, c, jan_13_4_entity] + - name: jan_14 + dir: world/area_jan/jan_14 + type: code + start: 0xBE5F50 + vram: 0x80240000 + subsegments: + - [0xBE5F50, c, jan_14_0_header] + - [0xBE5F50, c, jan_14_1_main] + - [0xBE5F50, c, jan_14_2_vines] + - [0xBE61D0, c, jan_14_3_trees] + - [0xBE6410, c, jan_14_4_npc] + - name: jan_15 + dir: world/area_jan/jan_15 + type: code + start: 0xBE9820 + vram: 0x80240000 + subsegments: + - [0xBE9820, c, jan_15_0_header] + - [0xBE9820, c, jan_15_1_main] + - [0xBE9820, c, jan_15_2_npc] + - [0xBE98E0, c, jan_15_3_trees] + - [0xBE9B20, c, jan_15_4_entity] + - name: jan_16 + dir: world/area_jan/jan_16 + type: code + start: 0xBEBF00 + vram: 0x80240000 + subsegments: + - [0xBEBF00, c, jan_16_0_header] + - [0xBEBF00, c, jan_16_1_music] + - [0xBEBF00, c, jan_16_2_main] + - [0xBEC200, c, jan_16_3_npc] + - [0xBEC200, c, jan_16_4_entity] + - [0xBEC200, c, jan_16_5_bushes] + - name: jan_17 + dir: world/area_jan/jan_17 + type: code + start: 0xBEF6C0 + vram: 0x80240000 + subsegments: + - [0xBEF6C0, c, jan_17_0_header] + - [0xBEF6C0, c, jan_17_1_music] + - [0xBEF6C0, c, jan_17_2_main] + - [0xBEF6E0, c, jan_17_3_entity] + - name: jan_18 + dir: world/area_jan/jan_18 + type: code + start: 0xBEFA90 + vram: 0x80240000 + subsegments: + - [0xBEFA90, c, jan_18_0_header] + - [0xBEFA90, c, jan_18_1_music] + - [0xBEFA90, c, jan_18_2_main] + - [0xBEFA90, c, jan_18_3_entity] + - name: jan_19 + dir: world/area_jan/jan_19 + type: code + start: 0xBEFD60 + vram: 0x80240000 + subsegments: + - [0xBEFD60, c, jan_19_0_header] + - [0xBEFD60, c, jan_19_1_music] + - [0xBEFD60, c, jan_19_2_main] + - [0xBEFD80, c, jan_19_3_entity] + - name: jan_22 + dir: world/area_jan/jan_22 + type: code + start: 0xBF0080 + vram: 0x80240000 + subsegments: + - [0xBF0080, c, jan_22_0_header] + - [0xBF0080, c, jan_22_1_music] + - [0xBF0080, c, jan_22_2_main] + - [0xBF0080, c, jan_22_3_npc] + - [0xBF10A0, c, jan_22_4_entity] + - [0xBF10A0, c, jan_22_5_zipline] + - [0xBF1450, c, jan_22_6_bushes] + - [0xBF17A0, c, jan_22_7_trees] + - name: jan_23 + dir: world/area_jan/jan_23 + type: code + start: 0xBFBBD0 + vram: 0x80240000 + subsegments: + - [0xBFBBD0, c, jan_23_0_header] + - [0xBFBBD0, c, jan_23_1_music] + - [0xBFBBD0, c, jan_23_2_main] + - [0xBFBBD0, c, jan_23_3_npc] + - name: mim_01 + dir: world/area_mim/mim_01 + type: code + start: 0xBFF340 + vram: 0x80240000 + subsegments: + - [0xBFF340, c, mim_01_0_header] + - [0xBFF340, c, mim_01_1_music] + - [0xBFF340, c, mim_01_2_main] + - [0xBFF3B0, c, mim_01_3_entity] + - [0xBFF3B0, c, mim_01_4_hint] + - [0xBFF840, c, mim_01_5_gate] + - [0xBFF840, c, mim_01_6_npc] + - name: mim_02 + dir: world/area_mim/mim_02 + type: code + start: 0xC03B00 + vram: 0x80240000 + subsegments: + - [0xC03B00, c, mim_02_0_header] + - [0xC03B00, c, mim_02_1_music] + - [0xC03B00, c, mim_02_2_main] + - [0xC03B70, c, mim_02_3_npc] + - [0xC04CE0, c, mim_02_4_gate] + - [0xC04CE0, c, mim_02_5_hint] + - name: mim_03 + dir: world/area_mim/mim_03 + type: code + start: 0xC07380 + vram: 0x80240000 + subsegments: + - [0xC07380, c, mim_03_0_header] + - [0xC07380, c, mim_03_1_music] + - [0xC07380, c, mim_03_2_main] + - [0xC07420, c, mim_03_3_entity] + - [0xC07420, c, mim_03_4_hint] + - [0xC078B0, c, mim_03_5_gate] + - [0xC078B0, c, mim_03_6_npc] + - name: mim_04 + dir: world/area_mim/mim_04 + type: code + start: 0xC09860 + vram: 0x80240000 + subsegments: + - [0xC09860, c, mim_04_0_header] + - [0xC09860, c, mim_04_1_music] + - [0xC09860, c, mim_04_2_main] + - [0xC098D0, c, mim_04_3_entity] + - [0xC098D0, c, mim_04_4_hint] + - [0xC09A60, c, mim_04_5_gate] + - [0xC09A60, c, mim_04_6_npc] + - name: mim_05 + dir: world/area_mim/mim_05 + type: code + start: 0xC0C630 + vram: 0x80240000 + subsegments: + - [0xC0C630, c, mim_05_0_header] + - [0xC0C630, c, mim_05_1_music] + - [0xC0C630, c, mim_05_2_main] + - [0xC0C6A0, c, mim_05_3_entity] + - [0xC0C6A0, c, mim_05_4_hint] + - [0xC0C6A0, c, mim_05_5_gate] + - [0xC0C6A0, c, mim_05_6_npc] + - name: mim_06 + dir: world/area_mim/mim_06 + type: code + start: 0xC10680 + vram: 0x80240000 + subsegments: + - [0xC10680, c, mim_06_0_header] + - [0xC10680, c, mim_06_1_music] + - [0xC10680, c, mim_06_2_main] + - [0xC106F0, c, mim_06_3_entity] + - [0xC106F0, c, mim_06_4_hint] + - [0xC10BF0, c, mim_06_5_gate] + - [0xC10BF0, c, mim_06_6_npc] + - name: mim_07 + dir: world/area_mim/mim_07 + type: code + start: 0xC16040 + vram: 0x80240000 + subsegments: + - [0xC16040, c, mim_07_0_header] + - [0xC16040, c, mim_07_1_music] + - [0xC16040, c, mim_07_2_main] + - [0xC160B0, c, mim_07_3_entity] + - [0xC160B0, c, mim_07_4_hint] + - [0xC162B0, c, mim_07_5_gate] + - [0xC162B0, c, mim_07_6_npc] + - name: mim_08 + dir: world/area_mim/mim_08 + type: code + start: 0xC19840 + vram: 0x80240000 + subsegments: + - [0xC19840, c, mim_08_0_header] + - [0xC19840, c, mim_08_1_music] + - [0xC19840, c, mim_08_2_main] + - [0xC198E0, c, mim_08_3_entity] + - [0xC198E0, c, mim_08_4_gate] + - [0xC198E0, c, mim_08_5_npc] + - name: mim_09 + dir: world/area_mim/mim_09 + type: code + start: 0xC1ED00 + vram: 0x80240000 + subsegments: + - [0xC1ED00, c, mim_09_0_header] + - [0xC1ED00, c, mim_09_1_music] + - [0xC1ED00, c, mim_09_2_main] + - [0xC1EDA0, c, mim_09_3_entity] + - [0xC1EDA0, c, mim_09_4_hint] + - [0xC1EDA0, c, mim_09_5_gate] + - [0xC1EDA0, c, mim_09_6_npc] + - name: mim_10 + dir: world/area_mim/mim_10 + type: code + start: 0xC218E0 + vram: 0x80240000 + subsegments: + - [0xC218E0, c, mim_10_0_header] + - [0xC218E0, c, mim_10_1_music] + - [0xC218E0, c, mim_10_2_entity] + - [0xC218E0, c, mim_10_3_main] + - [0xC218E0, c, mim_10_4_npc] + - name: mim_11 + dir: world/area_mim/mim_11 + type: code + start: 0xC22F70 + vram: 0x80240000 + subsegments: + - [0xC22F70, c, mim_11_0_header] + - [0xC22F70, c, mim_11_1_music] + - [0xC22F70, c, mim_11_2_main] + - [0xC23840, c, mim_11_3_gate] + - [0xC23840, c, mim_11_4_entity] + - [0xC23840, c, mim_11_5_npc] + - [0xC238F0, c, mim_11_6_foliage] + - name: mim_12 + dir: world/area_mim/mim_12 + type: code + start: 0xC27280 + vram: 0x80240000 + subsegments: + - [0xC27280, c, mim_12_0_header] + - [0xC27280, c, mim_12_1_music] + - [0xC27280, c, mim_12_2_entity] + - [0xC27280, c, mim_12_3_main] + - [0xC27280, c, mim_12_4_npc] + - [0xC27280, c, mim_12_5_gate] + - name: obk_01 + dir: world/area_obk/obk_01 + type: code + start: 0xC290A0 + vram: 0x80240000 + subsegments: + - [0xC290A0, c, obk_01_0_header] + - [0xC290A0, c, obk_01_1_music] + - [0xC290A0, c, obk_01_2_main] + - [0xC290A0, c, obk_01_3_chandelier] + - [0xC29830, c, obk_01_4_portrait] + - [0xC29880, c, obk_01_5_jump_scare] + - [0xC29880, c, obk_01_6_npc] + - [0xC2A1E0, c, obk_01_7_entity] + - name: obk_02 + dir: world/area_obk/obk_02 + type: code + start: 0xC2E990 + vram: 0x80240000 + subsegments: + - [0xC2E990, c, obk_02_0_header] + - [0xC2E990, c, obk_02_1_music] + - [0xC2E990, c, obk_02_2_main] + - [0xC2E990, c, obk_02_3_npc] + - [0xC2EBD0, c, obk_02_4_bombable] + - [0xC2EBD0, c, obk_02_5_clock] + - [0xC2EC40, c, obk_02_6_entity] + - name: obk_03 + dir: world/area_obk/obk_03 + type: code + start: 0xC30180 + vram: 0x80240000 + subsegments: + - [0xC30180, c, obk_03_0_header] + - [0xC30180, c, obk_03_1_music] + - [0xC30180, c, obk_03_2_main] + - [0xC30180, c, obk_03_3_shop] + - [0xC30180, c, obk_03_4_entity] + - [0xC302F0, c, obk_03_5_stairs] + - [0xC302F0, c, obk_03_6_npc] + - [0xC30A50, c, obk_03_7_rocking_chair] + - name: obk_04 + dir: world/area_obk/obk_04 + type: code + start: 0xC33D60 + vram: 0x80240000 + subsegments: + - [0xC33D60, c, obk_04_0_header] + - [0xC33D60, c, obk_04_1_music] + - [0xC33D60, c, obk_04_2_entity] + - [0xC33DB0, c, obk_04_3_npc] + - [0xC34670, c, obk_04_4_main] + - [0xC34670, c, obk_04_5_hole] + - [0xC346A0, c, obk_04_6_game] + - name: obk_05 + dir: world/area_obk/obk_05 + type: code + start: 0xC38F60 + vram: 0x80240000 + subsegments: + - [0xC38F60, c, obk_05_0_header] + - [0xC38F60, c, obk_05_1_music] + - [0xC38F60, c, obk_05_2_main] + - [0xC38FB0, c, obk_05_3_rocking_chair] + - [0xC396D0, c, obk_05_4_hole] + - [0xC39700, c, obk_05_5_npc] + - [0xC39940, c, obk_05_6_entity] + - name: obk_06 + dir: world/area_obk/obk_06 + type: code + start: 0xC3A590 + vram: 0x80240000 + subsegments: + - [0xC3A590, c, obk_06_0_header] + - [0xC3A590, c, obk_06_1_music] + - [0xC3A590, c, obk_06_2_main] + - [0xC3A590, c, obk_06_3_bombable] + - [0xC3A590, c, obk_06_4_entity] + - name: obk_07 + dir: world/area_obk/obk_07 + type: code + start: 0xC3AAF0 + vram: 0x80240000 + subsegments: + - [0xC3AAF0, c, obk_07_0_header] + - [0xC3AAF0, c, obk_07_1_music] + - [0xC3AAF0, c, obk_07_2_main] + - [0xC3AAF0, c, obk_07_3_entity] + - [0xC3ADB0, c, obk_07_4_fireplace] + - [0xC3ADB0, c, obk_07_5_npc] + - [0xC3AFF0, c, obk_07_6_phonograph] + - name: obk_08 + dir: world/area_obk/obk_08 + type: code + start: 0xC3F770 + vram: 0x80240000 + subsegments: + - [0xC3F770, c, obk_08_0_header] + - [0xC3F770, c, obk_08_1_music] + - [0xC3F770, c, obk_08_2_main] + - [0xC3F770, c, obk_08_3_cabinets] + - [0xC3FFB0, c, obk_08_4_entity] + - [0xC40010, c, obk_08_5_npc] + - [0xC40990, c, obk_08_6_game] + - name: obk_09 + dir: world/area_obk/obk_09 + type: code + start: 0xC466B0 + vram: 0x80240000 + subsegments: + - [0xC466B0, c, obk_09_0_header] + - [0xC466B0, c, obk_09_1_music] + - [0xC466B0, c, obk_09_2_main] + - [0xC466B0, c, obk_09_3_meet_bow] + - [0xC46840, c, obk_09_4_npc] + - [0xC46A00, c, obk_09_5_new_partner] + - [0xC46AA0, c, obk_09_6_epilogue] - - [0x978FB0, bin] + - [0xC490B0, bin] - start: 0x1e937b8 align: 8 diff --git a/ver/pal/symbol_addrs.txt b/ver/pal/symbol_addrs.txt index 37be4d3b10..40d2048b1c 100644 --- a/ver/pal/symbol_addrs.txt +++ b/ver/pal/symbol_addrs.txt @@ -13,3 +13,15 @@ kmr_23_window_ul_img = 0x802416C8; // rom:0x975468 kmr_23_window_ur_img = 0x80241708; // rom:0x9754A8 kmr_23_window_ll_img = 0x80241748; // rom:0x9754E8 kmr_23_window_lr_img = 0x80241788; // rom:0x975528 +iwa_01_splash_img = 0x802439C0; // rom:0x97F3E0 +iwa_01_splash_vtx = 0x80243DC0; // rom:0x97F7E0 +iwa_01_splash_gfx = 0x80243E00; // rom:0x97F820 +dro_02_card = 0x80247628; // rom:0x9DCBC8 +dro_02_card_pal = 0x80247828; // rom:0x9DCDC8 +dro_02_card_1_vtx = 0x80247848; // rom:0x9DCDE8 +dro_02_card_2_vtx = 0x802478C8; // rom:0x9DCE68 +dro_02_card_setup_gfx = 0x80247908; // rom:0x9DCEA8 +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 diff --git a/ver/pal/undefined_syms.txt b/ver/pal/undefined_syms.txt index e1bbae4dca..e2448032e6 100644 --- a/ver/pal/undefined_syms.txt +++ b/ver/pal/undefined_syms.txt @@ -1,12 +1,19 @@ Entity_ScriptSpring_AnimLaunch = 0x1E4; Entity_SimpleSpring_AnimLaunch = 0x1E4; +get_time_freeze_mode = 0x80027110; +start_rumble = 0x80028E88; +cosine = 0x80029354; transform_point = 0x800295A0; +copy_matrix = 0x800296A0; dma_copy = 0x800296BC; +rand_float = 0x800298B4; rand_int = 0x8002997C; +signF = 0x800299FC; clamp_angle = 0x80029AA4; get_clamped_angle_diff = 0x80029BA8; atan2 = 0x80029C00; dist2D = 0x80029E54; +dist3D = 0x80029EAC; add_vec2D_polar = 0x80029F1C; sin_rad = 0x8002A0EC; cos_rad = 0x8002A150; @@ -14,6 +21,7 @@ sin_cos_deg = 0x8002A1B4; sin_deg = 0x8002A26C; cos_deg = 0x8002A2D0; update_lerp = 0x8002A334; +startup_draw_prim_rect_COPY = 0x8002AA44; general_heap_malloc = 0x8002ABA8; general_heap_free = 0x8002ABF8; heap_malloc = 0x8002AC64; @@ -24,16 +32,21 @@ set_curtain_draw_callback = 0x8002C214; get_screen_coords = 0x8002E858; set_game_mode = 0x80033810; set_map_change_fade_rate = 0x80035CF0; +state_init_intro = 0x80036550; +create_basic_npc = 0x80038D34; +free_npc = 0x80038EBC; get_npc_by_index = 0x80038FCC; npc_move_heading = 0x8003AF44; get_npc_unsafe = 0x8003AFDC; get_npc_safe = 0x8003B038; +enable_npc_shadow = 0x8003B090; disable_npc_shadow = 0x8003B0EC; enable_npc_blur = 0x8003B214; set_npc_yaw = 0x8003B830; npc_set_palswap_mode_A = 0x8003B8C0; npc_set_palswap_1 = 0x8003B93C; npc_set_palswap_2 = 0x8003B954; +func_8003D624 = 0x8003DB14; spawn_surface_effects = 0x8003DB50; spawn_surface_effects = 0x8003DB50; kill_enemy = 0x8003EC9C; @@ -51,6 +64,7 @@ DoNpcDefeat = 0x80044B1C; StartBattle = 0x80044D30; StartBattleWith = 0x80044D50; StartBossBattle = 0x80044D8C; +SetBattleMusic = 0x80044F28; BindNpcAI = 0x80044F68; BindNpcIdle = 0x8004509C; RestartNpcAI = 0x8004511C; @@ -64,30 +78,52 @@ SetSelfVar = 0x8004574C; GetSelfVar = 0x800457B0; SetNpcVar = 0x80045810; GetNpcVar = 0x800458AC; +SetSelfEnemyFlags = 0x800459FC; SetSelfEnemyFlagBits = 0x80045A14; SelfEnemyOverrideSyncPos = 0x80045A70; GetSelfNpcID = 0x80045B04; ClearDefeatedEnemies = 0x80045B30; SetEnemyFlagBits = 0x80045B78; +GetSelfAnimationFromTable = 0x80045C24; +SetOwnerInstigatorValue = 0x80045CB4; +SetBattleAsScripted = 0x80045CE8; +func_80045838 = 0x80045D28; +func_800458CC = 0x80045DBC; +OnPlayerFled = 0x80045DF0; SetTattleMessage = 0x80045F48; +spawn_drops = 0x80048860; is_point_within_region = 0x800495B4; basic_ai_check_player_dist = 0x80049694; +ai_check_player_dist = 0x800499CC; ai_enemy_play_sound = 0x80049AA0; basic_ai_wander_init = 0x80049B80; basic_ai_wander = 0x80049C98; basic_ai_loiter_init = 0x8004A124; basic_ai_loiter = 0x8004A1E4; +basic_ai_found_player_jump_init = 0x8004A41C; +basic_ai_found_player_jump = 0x8004A4AC; +basic_ai_chase_init = 0x8004A55C; +basic_ai_chase = 0x8004A704; +basic_ai_lose_player = 0x8004A9C8; BasicAI_Main = 0x8004AA5C; basic_ai_suspend = 0x8004AD1C; snd_start_sound = 0x800557C0; +snd_load_ambient = 0x80055A28; snd_ambient_stop_slow = 0x80055AC8; snd_ambient_pause = 0x80055B1C; snd_ambient_resume = 0x80055B70; +snd_ambient_mute = 0x80055BF8; snd_ambient_set_volume = 0x80055C4C; +snd_ambient_80055760 = 0x80055D40; +snd_ambient_stop_all = 0x80055DAC; +snd_ambient_play_only = 0x80055E28; +snd_song_set_playback_rate = 0x80056318; remove_effect = 0x8005AA30; get_current_map_settings = 0x8005B308; get_map_IDs_by_name = 0x8005B318; load_asset_by_name = 0x8005B408; +update_collider_transform = 0x8005C144; +update_collider_transform = 0x8005C144; get_collider_center = 0x8005C530; npc_follow_init = 0x8005E5EC; npc_update_npc_tracking = 0x8005E6F4; @@ -95,17 +131,24 @@ npc_follow_npc = 0x8005E84C; osVirtualToPhysical = 0x80062D00; sqrtf = 0x80062D60; guLookAtHiliteF = 0x80063730; +guPositionF = 0x80064D80; +guPosition = 0x80064F58; +sins = 0x80065460; sprintf = 0x80066360; guMtxIdentF = 0x80068320; guMtxF2L = 0x80068380; guMtxCatF = 0x80068480; +guScale = 0x80068580; guScaleF = 0x80068640; +guTranslate = 0x800686A0; guTranslateF = 0x80068780; guRotateF = 0x800689A0; +guRotate = 0x80068B00; decode_yay0 = 0x8006FD90; gGameStatusPtr = 0x800714AC; gMatrixListPos = 0x80071500; gCurrentCameraID = 0x80073730; +D_800779B0 = 0x80073D00; EnemyNpcHit = 0x80074310; EnemyNpcDefeat = 0x8007443C; HES_Item_Unused_08B = 0x8007E698; @@ -119,6 +162,8 @@ gItemIconPaletteOffsets = 0x8008ACEC; D_8008EEC0 = 0x8008B260; gPartnerPopupProperties = 0x8008B2C0; gMoveTable = 0x8008B400; +EVS_800936C0 = 0x8008FA60; +EVS_NpcHitRecoil = 0x8008FA7C; nuGfxZBuffer = 0x800969B0; gCurrentCamID = 0x80096A0C; nuGfxCfb_ptr = 0x80096A24; @@ -132,8 +177,11 @@ wMapShapeName = 0x800D5988; wMapBgName = 0x800D5DD8; npc_raycast_down_around = 0x800D8EE8; npc_raycast_down_sides = 0x800D92EC; +npc_test_move_taller_with_slipping = 0x800DA254; npc_test_move_simple_with_slipping = 0x800DA3B4; get_xz_dist_to_player = 0x800DC7F8; +set_action_state = 0x800E2514; +peach_force_disguise_action = 0x800E2B14; get_player_data = 0x800E3CD4; get_item_count = 0x800E3D5C; get_item_empty_count = 0x800E3D90; @@ -144,10 +192,15 @@ open_status_menu_long = 0x800E5FB8; close_status_menu = 0x800E6010; status_menu_ignore_changes = 0x800E60EC; status_menu_respond_to_changes = 0x800E611C; +func_800E98EC = 0x800E6144; +func_800E9900 = 0x800E6158; +increment_status_menu_disabled = 0x800E63AC; sync_status_menu = 0x800E63C4; +increment_max_SP = 0x800E6A0C; set_max_SP = 0x800E6A30; switch_to_partner = 0x800E79B8; func_800EB2A4 = 0x800E7AF4; +partner_get_ride_script = 0x800E7E88; partner_suspend_ability_script = 0x800E8068; partner_resume_ability_script = 0x800E80B0; func_800EF300 = 0x800EBB50; @@ -163,6 +216,12 @@ draw_box = 0x800F1710; gPlayerStatusPtr = 0x800F3F60; wPartnerHudScripts = 0x800F4330; wDisabledPartnerHudScripts = 0x800F4370; +HES_BlueMeter = 0x801076A4; +HES_AButton = 0x801076D0; +HES_MashAButton = 0x80107728; +HES_SlowlyMashAButton = 0x801077DC; +HES_RunAwayOK = 0x80107DEC; +ui_box_corners5_png = 0x80109D00; wPartnerNpc = 0x8010B420; NpcHitQueryColliderID = 0x8010B468; gPartnerActionStatus = 0x8010D6B0; @@ -179,11 +238,14 @@ AssignSwitchFlag = 0x80110AF8; AssignBlockFlag = 0x80110B6C; AssignChestFlag = 0x80110BB8; AssignPanelFlag = 0x80110C14; +AssignCrateFlag = 0x80110C70; create_shadow_type = 0x80110D60; +delete_shadow = 0x80110E28; entity_raycast_down = 0x801110E8; set_standard_shadow_scale = 0x8011135C; get_model_from_list_index = 0x80119830; get_model_list_index_from_tree_index = 0x80119B10; +set_model_group_visibility = 0x8011A2C0; func_8011B950 = 0x8011A450; enable_world_fog = 0x8011A650; set_world_fog_dist = 0x8011A674; @@ -200,26 +262,38 @@ set_model_env_color_parameters = 0x8011AA98; get_model_env_color_parameters = 0x8011AAD4; mdl_get_copied_vertices = 0x8011ADB0; mdl_get_copied_gfx = 0x8011ADEC; +mdl_project_tex_coords = 0x8011AE2C; mdl_draw_hidden_panel_surface = 0x8011C22C; +mdl_get_next_texture_address = 0x8011C2E4; mdl_set_all_fog_mode = 0x8011C32C; queue_render_task = 0x8011C410; +update_model_animator = 0x8011D3BC; +render_animated_model = 0x8011DE04; play_model_animation = 0x8011EC48; +get_entity_model = 0x801218DC; +enable_entity_fog = 0x80121AEC; +set_entity_fog_dist = 0x80121B10; +set_entity_fog_color = 0x80121B28; create_worker_world = 0x80121C58; create_worker_frontUI = 0x80121D3C; free_worker = 0x801220C0; +get_worker = 0x8012213C; set_message_images = 0x8012464C; set_message_msg = 0x8012465C; get_msg_width = 0x80124F94; +get_msg_lines = 0x80124FD0; draw_msg = 0x8012500C; draw_number = 0x801261BC; msg_draw_frame = 0x8012C6F8; draw_ci_image_with_clipping = 0x8012D540; get_item_entity = 0x8012FAF8; +make_item_entity_nodelay = 0x80130634; set_item_entity_flags = 0x80132CE8; clear_item_entity_flags = 0x80132D28; set_item_entity_position = 0x80132DAC; set_screen_overlay_params_front = 0x80136928; set_screen_overlay_params_back = 0x80136944; +get_screen_overlay_params = 0x80136960; set_screen_overlay_color = 0x801369B0; set_screen_overlay_center = 0x801369EC; set_screen_overlay_center_worldpos = 0x80136A60; @@ -230,39 +304,87 @@ func_8013A704 = 0x801392A4; func_8013A854 = 0x801393F4; fold_update = 0x8013963C; fold_appendGfx_component = 0x80139B10; +hud_element_create = 0x80140054; +hud_element_draw_clipped = 0x80143358; +hud_element_set_script = 0x801433AC; +hud_element_free = 0x801434A4; +hud_element_set_render_pos = 0x80143534; +hud_element_get_render_pos = 0x8014355C; +hud_element_set_render_depth = 0x8014358C; +hud_element_set_flags = 0x801435B0; +hud_element_clear_flags = 0x801435DC; +hud_element_set_alpha = 0x80143A60; set_global_byte = 0x801440D0; get_global_byte = 0x801440E8; +basic_window_update = 0x80146024; +basic_hidden_window_update = 0x80146124; +set_window_update = 0x80146A2C; +setup_pause_menu_tab = 0x80146AE0; +sprite_shading_set_light_source = 0x80146D04; sfx_adjust_env_sound_pos = 0x8014859C; +sfx_play_sound_with_params = 0x80148668; +sfx_stop_sound = 0x8014881C; sfx_play_sound = 0x80148864; +sfx_play_sound_at_player = 0x80148888; sfx_play_sound_at_position = 0x8014890C; +bgm_set_song = 0x801494C8; bgm_adjust_proximity = 0x80149604; bgm_set_track_volumes = 0x801496BC; bgm_clear_track_volumes = 0x80149710; +bgm_set_variation = 0x80149764; func_8014AD40 = 0x801498F0; MessagePlural = 0x8014AE40; MessagePlural_de = 0x8014AE44; MessageSingular = 0x8014AE48; gBackgroundFogModePtr = 0x8014FEC0; gEntityHideMode = 0x8014FEE0; +gSpriteShadingProfile = 0x8014FEF8; +gMusicSettings = 0x801586B0; gCollisionStatus = 0x80159110; gBackgroundImage = 0x80200000; +interp_value_with_easing = 0x802410E4; MakeShop = 0x80281878; MakeShopOwner = 0x80281BF0; CreateMapRoom = 0x80281CBC; CreatePushBlockGrid = 0x802832F0; SetPushBlock = 0x8028348C; +GetPushBlock = 0x802835D0; +GetGridIndexFromPos = 0x802836C8; ItemShopInteract = 0x80284064; EnterWalk = 0x80285970; +EnterWalkShort = 0x80285A70; EnterPostPipe = 0x80285C60; EnterSavePoint = 0x80285CC0; ExitWalk = 0x80285D04; +ExitSingleDoor = 0x80285DBC; +EnterSingleDoor = 0x80285DE4; +ExitSplitSingleDoor = 0x80285E0C; +EnterSplitSingleDoor = 0x80285E34; ExitDoubleDoor = 0x80285E5C; EnterDoubleDoor = 0x80285E84; +ExitSplitDoubleDoor = 0x80285EAC; +EnterSplitDoubleDoor = 0x80285ED4; BaseExitDoor = 0x80285EFC; +BaseEnterDoor = 0x802861C0; +Entity_CymbalPlant = 0x802BC788; +Entity_PinkFlower = 0x802BC7AC; +Entity_SpinningFlower = 0x802BC7F4; +Entity_Tweester = 0x802BCA74; +Entity_BellbellPlant = 0x802BCBD8; +Entity_TrumpetPlant = 0x802BCBFC; +Entity_Munchlesia = 0x802BCC20; Entity_Padlock = 0x802BCD68; +Entity_ArrowSign = 0x802BCD9C; Entity_BoardedFloor = 0x802BCE84; Entity_BombableRock = 0x802BCF00; +Entity_BombableRock2 = 0x802BCF24; +start_script = 0x802C63E0; +kill_script_by_ID = 0x802C70AC; does_script_exist = 0x802C7164; +set_script_timescale = 0x802C71E0; +bind_trigger_1 = 0x802C72A8; +get_script_by_id = 0x802C77A8; +DeleteTrigger = 0x802C9824; evt_get_variable = 0x802CAABC; evt_set_variable = 0x802CB098; evt_get_float_variable = 0x802CB42C; @@ -279,8 +401,10 @@ EnableTexPanning = 0x802CC208; EnableModel = 0x802CC288; SetGroupVisibility = 0x802CC308; SetTexPanOffset = 0x802CC364; +SetCustomGfx = 0x802CC428; SetCustomGfxBuilders = 0x802CC4A0; SetModelFlags = 0x802CC518; +MakeTransformGroup = 0x802CC71C; TranslateGroup = 0x802CC7B4; RotateGroup = 0x802CC8D8; ScaleGroup = 0x802CCA1C; @@ -290,9 +414,11 @@ ModifyColliderFlags = 0x802CCDCC; ResetFromLava = 0x802CCED8; ParentColliderToModel = 0x802CD114; UpdateColliderTransform = 0x802CD188; +SetZoneEnabled = 0x802CD254; GotoMap = 0x802CD400; GotoMapSpecial = 0x802CD420; GetEntryID = 0x802CD460; +GetMapID = 0x802CD490; GetLoadType = 0x802CD4C0; SetRenderMode = 0x802CD4F4; PlaySoundAtModel = 0x802CD558; @@ -300,13 +426,16 @@ PlaySoundAtCollider = 0x802CD614; SetCamEnabled = 0x802CD6C0; SetCamPerspective = 0x802CD828; func_802CA988 = 0x802CD988; +func_802CABE8 = 0x802CDBE8; SetCamBGColor = 0x802CDD98; SetCamTarget = 0x802CDF2C; InterpCamTargetPos = 0x802CE008; ShakeCam = 0x802CE2A8; +exec_ShakeCam1 = 0x802CE56C; SetCamLeadPlayer = 0x802CE680; PanToTarget = 0x802CE79C; UseSettingsFrom = 0x802CE860; +LoadSettings = 0x802CE9F8; SetCamType = 0x802CEAB4; SetCamPitch = 0x802CEB48; SetCamDistance = 0x802CEBE4; @@ -318,6 +447,7 @@ SetCamSpeed = 0x802CEEF0; GetCamType = 0x802CEF64; GetCamPitch = 0x802CEFF4; GetCamDistance = 0x802CF084; +GetCamPosA = 0x802CF0F4; GetCamPosition = 0x802CF2A4; WaitForCam = 0x802CF354; SetCamProperties = 0x802CF3EC; @@ -365,17 +495,26 @@ BringPartnerOut = 0x802D25B8; PutPartnerAway = 0x802D2988; GetCurrentPartnerID = 0x802D2C74; PartnerCanUseAbility = 0x802D2CA0; +PartnerIsFlying = 0x802D2CE8; func_802CFD30 = 0x802D2D30; func_802CFE2C = 0x802D2E2C; +SetNpcPaletteSwapMode = 0x802D2E80; +SetNpcPaletteSwapLower = 0x802D2EEC; +SetNpcPaletteSwapping = 0x802D2FC0; +SetNpcDecoration = 0x802D3118; PlaySoundAtNpc = 0x802D31AC; +SetNpcRenderMode = 0x802D3244; SpeakToPlayer = 0x802D32B0; EndSpeech = 0x802D32CC; ContinueSpeech = 0x802D32E8; SpeakToNpc = 0x802D3304; ShowMessageAtScreenPos = 0x802D3894; +ShowMessageAtWorldPos = 0x802D395C; CloseMessage = 0x802D3A98; +SwitchMessage = 0x802D3AFC; ShowChoice = 0x802D3B6C; CloseChoice = 0x802D3BF8; +CancelMessage = 0x802D3C20; SetMessageText = 0x802D3CEC; SetMessageValue = 0x802D3D44; HidePlayerShadow = 0x802D3DA0; @@ -390,6 +529,7 @@ PlayerMoveTo = 0x802D4134; func_802D1270 = 0x802D4270; PlayerJump = 0x802D48E8; PlayerJump1 = 0x802D4904; +PlayerJump2 = 0x802D4920; InterpPlayerYaw = 0x802D493C; PlayerFaceNpc = 0x802D4B04; GetPlayerTargetYaw = 0x802D4D28; @@ -398,17 +538,23 @@ GetPlayerActionState = 0x802D4DD0; GetPlayerPos = 0x802D4DFC; FullyRestoreHPandFP = 0x802D4EC0; FullyRestoreSP = 0x802D4EE0; +EnablePartner = 0x802D4EFC; +DisablePartner = 0x802D4F38; UseExitHeading = 0x802D516C; +WaitForPlayerTouchingFloor = 0x802D544C; IsPlayerOnValidFloor = 0x802D549C; WaitForPlayerMoveToComplete = 0x802D54F4; WaitForPlayerInputEnabled = 0x802D5508; func_802D2520 = 0x802D5520; func_802D286C = 0x802D586C; FacePlayerTowardPoint = 0x802D5884; +DisablePulseStone = 0x802D5AA8; GetPartnerInUse = 0x802D5B0C; InterruptUsePartner = 0x802D5B6C; +Disable8bitMario = 0x802D5B88; func_802D2C14 = 0x802D5C14; PlaySoundAtPlayer = 0x802D5CD8; +InitVirtualEntityList = 0x802D6398; MakeLerp = 0x802D75B0; UpdateLerp = 0x802D762C; RandInt = 0x802D76B0; @@ -416,12 +562,14 @@ GetAngleBetweenNPCs = 0x802D7708; GetAngleToNPC = 0x802D77B4; GetAngleToPlayer = 0x802D7830; AwaitPlayerApproach = 0x802D78AC; +IsPlayerWithin = 0x802D7964; AwaitPlayerLeave = 0x802D7A5C; AddVectorPolar = 0x802D7B14; func_802D4D14 = 0x802D7D14; func_802D4D88 = 0x802D7D88; LoadPath = 0x802D8430; GetNextPathPos = 0x802D8524; +GetDist2D = 0x802D8770; SetTimeFreezeMode = 0x802D8830; ModifyGlobalOverrideFlags = 0x802D885C; SetValueByRef = 0x802D88E0; @@ -433,6 +581,7 @@ SetMusicTrack = 0x802D8D6C; FadeInMusic = 0x802D8E14; EnableMusicProximityMix = 0x802D8F00; AdjustMusicProximityMix = 0x802D8F48; +SetMusicTrackVolumes = 0x802D8FC4; PopSong = 0x802D8FF8; PushSong = 0x802D9018; ClearAmbientSounds = 0x802D9108; @@ -460,54 +609,89 @@ DropItemEntity = 0x802D9DE0; DropResizableItemEntity = 0x802D9EE0; RemoveItemEntity = 0x802D9FEC; AddBadge = 0x802DA018; +RemoveBadge = 0x802DA070; SetItemPos = 0x802DA0F0; +SetItemAlpha = 0x802DA23C; AddCoin = 0x802DA298; AddStarPieces = 0x802DA310; ShowGotItem = 0x802DA3C4; ShowEmote = 0x802DA8C0; +RemoveEffect = 0x802DAB04; func_802D7B10 = 0x802DAB30; func_802D7B44 = 0x802DAB64; +SetMotionBlurParams = 0x802DAD18; ShowSweat = 0x802DAE28; PlayEffect = 0x802DB2BC; SetSpriteShading = 0x802DC720; +EnableSpriteShading = 0x802DCA5C; GetDemoState = 0x802DCAB0; DemoSetButtons = 0x802DCB54; DemoJoystickXY = 0x802DCC30; +fx_big_smoke_puff = 0x802DCD20; +fx_landing_dust = 0x802DCF00; +fx_walking_dust = 0x802DCF60; +fx_star = 0x802DD260; fx_emote = 0x802DD2C0; fx_sparkles = 0x802DD320; +fx_shape_spell = 0x802DD380; +fx_gather_energy_pink = 0x802DD3E0; +fx_damage_stars = 0x802DD5C0; +fx_explosion = 0x802DD620; fx_lens_flare = 0x802DD680; fx_rising_bubble = 0x802DD9E0; +fx_ring_blast = 0x802DDA40; +fx_smoke_burst = 0x802DDB60; +fx_sweat = 0x802DDBC0; +fx_stars_orbiting = 0x802DDE60; fx_radial_shimmer = 0x802DDFE0; +fx_fire_breath = 0x802DE160; fx_3D = 0x802DE3A0; fx_quizmo_stage = 0x802DEA00; fx_quizmo_answer = 0x802DEAC0; fx_motion_blur_flame = 0x802DEB20; fx_energy_orb_wave = 0x802DEB80; fx_quizmo_audience = 0x802DEC40; +fx_energy_in_out = 0x802DF4E0; fx_misc_particles = 0x802DF780; fx_chapter_change = 0x802DFA20; +fx_ice_shard = 0x802DFA80; fx_spirit_card = 0x802DFAE0; fx_lil_oink = 0x802DFB40; fx_quizmo_assistant = 0x802DFCC0; fx_sun = 0x802DFD80; +fx_star_spirits_energy = 0x802DFDE0; +StarShrineLightBeamAlpha = 0x802E0032; spr_update_player_sprite = 0x802E3D6C; spr_draw_player_sprite = 0x802E3F20; +func_802DDFF8 = 0x802E42D8; spr_get_player_raster_info = 0x802E4324; +func_802DE894 = 0x802E4B74; +spr_get_npc_raster_info = 0x802E4CB8; entity_upgrade_block_hide_content = 0x802EB990; Entity_SavePoint = 0x802EFD18; Entity_RedSwitch = 0x802EFEB0; Entity_BlueSwitch = 0x802EFED4; Entity_HugeBlueSwitch = 0x802EFEF8; Entity_GreenStompSwitch = 0x802EFF1C; +Entity_InertYellowBlock = 0x802F037C; Entity_BrickBlock = 0x802F03C4; Entity_MulticoinBlock = 0x802F03E8; Entity_Hammer1Block = 0x802F040C; Entity_Hammer1Block_WideX = 0x802F0430; +Entity_Hammer1Block_WideZ = 0x802F0454; +Entity_Hammer1BlockTiny = 0x802F0478; Entity_Hammer2Block = 0x802F049C; +Entity_Hammer2Block_WideX = 0x802F04C0; +Entity_Hammer2Block_WideZ = 0x802F04E4; +Entity_Hammer2BlockTiny = 0x802F0508; Entity_Hammer3Block = 0x802F052C; +Entity_Hammer3BlockTiny = 0x802F0598; +Entity_PowBlock = 0x802F05E0; Entity_YellowBlock = 0x802F0864; Entity_HiddenYellowBlock = 0x802F0888; Entity_RedBlock = 0x802F08AC; +Entity_HiddenRedBlock = 0x802F08D0; +Entity_TriggerBlock = 0x802F08F4; Entity_HeartBlock = 0x802F0AE0; Entity_SuperBlock = 0x802F0C10; Entity_ScriptSpring = 0x802F0D30; @@ -515,5 +699,6 @@ Entity_SimpleSpring = 0x802F0D54; Entity_HiddenPanel = 0x802F0E04; Entity_GiantChest = 0x802F110C; Entity_Chest = 0x802F1130; +Entity_WoodenCrate = 0x802F11D4; Entity_BlueWarpPipe = 0x802F1280; Entity_Signpost = 0x802F12DC; diff --git a/ver/pal/undefined_syms_auto.txt b/ver/pal/undefined_syms_auto.txt index e69de29bb2..29fc633b7f 100644 --- a/ver/pal/undefined_syms_auto.txt +++ b/ver/pal/undefined_syms_auto.txt @@ -0,0 +1 @@ +fx_sun_undeclared = fx_sun;