pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Second batch of PAL maps (#974)

Browse Source 
* 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
This commit is contained in:
Marijn van der Werf 2023-03-14 09:47:14 +01:00 committed by GitHub
parent 7928eff738
commit d31022e042
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
120 changed files with 5719 additions and 1947 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
include/enums.h
View File

@ -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

34
src/world/area_dro/dro_01/npc_shop_owner.c
View File

@ -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)

8
src/world/area_dro/dro_02/dro_02_5_npc.c
View File

@ -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

2
src/world/area_dro/dro_02/npc_merlee.c
View File

@ -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"

22
src/world/area_dro/dro_02/npc_moustafa.c
View File

@ -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)

82
src/world/area_hos/hos_00/hos_00_6_scenes.c
View File

@ -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

49
src/world/area_hos/hos_01/hos_01_4_npc.c
View File

@ -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

4
src/world/area_hos/hos_01/hos_01_6_star_way.c
View File

@ -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)

18
src/world/area_hos/hos_04/hos_04_6_intro.c
View File

@ -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

16
src/world/area_hos/hos_04/hos_04_8_narrator.c
View File

@ -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
};

28
src/world/area_hos/hos_05/hos_05_4_npc.c
View File

@ -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

156
src/world/area_hos/hos_05/hos_05_5_intro.c
View File

@ -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

90
src/world/area_hos/hos_05/hos_05_6_narrator.c
View File

@ -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
};

12
src/world/area_hos/hos_10/hos_10_6_pre_title.c
View File

@ -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
};

4
src/world/area_isk/isk_01/isk_01_1_music.c
View File

@ -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
};

4
src/world/area_isk/isk_02/isk_02_1_main.c
View File

@ -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

4
src/world/area_isk/isk_03/isk_03_1_main.c
View File

@ -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

4
src/world/area_isk/isk_04/isk_04_1_music.c
View File

@ -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
};

4
src/world/area_isk/isk_05/isk_05_1_main.c
View File

@ -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)

4
src/world/area_isk/isk_06/isk_06_1_main.c
View File

@ -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

4
src/world/area_isk/isk_07/isk_07_1_main.c
View File

@ -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

4
src/world/area_isk/isk_08/isk_08_1_main.c
View File

@ -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

4
src/world/area_isk/isk_09/isk_09_1_music.c
View File

@ -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
};

4
src/world/area_isk/isk_10/isk_10_1_main.c
View File

@ -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

42
src/world/area_isk/isk_11/isk_11_4_scene.c
View File

@ -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)

4
src/world/area_isk/isk_12/isk_12_1_main.c
View File

@ -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

4
src/world/area_isk/isk_13/isk_13_1_main.c
View File

@ -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

4
src/world/area_isk/isk_14/isk_14_1_main.c
View File

@ -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

64
src/world/area_isk/isk_16/isk_16_3_boss.c
View File

@ -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

4
src/world/area_isk/isk_18/isk_18_1_main.c
View File

@ -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)

48
src/world/area_iwa/iwa_04/iwa_04_4_npc.c
View File

@ -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

4
src/world/area_iwa/iwa_10/iwa_10_2_main.c
View File

@ -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)

60
src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c
View File

@ -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

16
src/world/area_jan/jan_01/jan_01_3_npc.c
View File

@ -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)

4
src/world/area_jan/jan_02/jan_02_2_main.c
View File

@ -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)

36
src/world/area_jan/jan_02/jan_02_3_npc.c
View File

@ -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
};

34
src/world/area_jan/jan_04/jan_04_4_npc.c
View File

@ -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)

5
src/world/area_jan/jan_07/jan_07_3_npc.c
View File

@ -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)

28
src/world/area_jan/jan_16/jan_16_3_npc.c
View File

@ -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

250
src/world/area_jan/jan_22/jan_22_3_npc.c
View File

@ -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)

70
src/world/area_jan/jan_23/jan_23_3_npc.c
View File

@ -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

8
src/world/area_kkj/kkj_00/kkj_00_4_scene_intro.c
View File

@ -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

66
src/world/area_kkj/kkj_03/kkj_03_4_scenes.c
View File

@ -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

12
src/world/area_kkj/kkj_12/kkj_12_2_npc.c
View File

@ -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

130
src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c
View File

@ -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

48
src/world/area_kkj/kkj_14/kkj_14_10_chapter2.c
View File

@ -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

14
src/world/area_kkj/kkj_14/kkj_14_11_chapter3.c
View File

@ -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

4
src/world/area_kkj/kkj_14/kkj_14_12_chapter4.c
View File

@ -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

20
src/world/area_kkj/kkj_14/kkj_14_13_chapter5.c
View File

@ -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

12
src/world/area_kkj/kkj_14/kkj_14_14_chapter6.c
View File

@ -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

48
src/world/area_kkj/kkj_14/kkj_14_15_chapter7.c
View File

@ -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)

16
src/world/area_kkj/kkj_14/kkj_14_3_interactables.c
View File

@ -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)

22
src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c
View File

@ -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)

154
src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c
View File

@ -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

22
src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c
View File

@ -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)

12
src/world/area_kkj/kkj_15/kkj_15_3_rotating_wall.c
View File

@ -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))

104
src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c
View File

@ -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)

58
src/world/area_kkj/kkj_15/kkj_15_5_chapter1.c
View File

@ -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)

70
src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c
View File

@ -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)

42
src/world/area_kkj/kkj_16/kkj_16_4_stealth.c
View File

@ -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)

94
src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c
View File

@ -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)

184
src/world/area_kkj/kkj_19/kkj_19_5_baking.c
View File

@ -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

40
src/world/area_kkj/kkj_23/kkj_23_5_scene.c
View File

@ -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)

5
src/world/area_kkj/kkj_25/kkj_25_5_arena.c
View File

@ -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)

10
src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c
View File

@ -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)

14
src/world/area_kkj/kkj_26/kkj_26_2_scenes.c
View File

@ -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)

28
src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c
View File

@ -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

138
src/world/area_kkj/kkj_29/kkj_29_3_quiz.c
View File

@ -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)

46
src/world/area_kpa/kpa_16/kpa_16_4_npc.c
View File

@ -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)

6
src/world/area_kpa/kpa_17/kpa_17_4_npc.c
View File

@ -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

22
src/world/area_kpa/kpa_81/kpa_81_3_npc.c
View File

@ -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)

152
src/world/area_kpa/kpa_82/kpa_82_3_npc.c
View File

@ -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)

18
src/world/area_kpa/kpa_83/kpa_83_3_npc.c
View File

@ -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)

2
src/world/area_mac/mac_00/mac_00_2_main.c
View File

@ -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)

2
src/world/area_mac/mac_01/mac_01_2_main.c
View File

@ -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)

2
src/world/area_mac/mac_03/mac_03_2_main.c
View File

@ -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)

52
src/world/area_mim/mim_02/mim_02_3_npc.c
View File

@ -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

6
src/world/area_mim/mim_07/mim_07_6_npc.c
View File

@ -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

50
src/world/area_mim/mim_10/mim_10_4_npc.c
View File

@ -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)

28
src/world/area_mim/mim_11/mim_11_3_gate.c
View File

@ -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)

34
src/world/area_mim/mim_12/mim_12_5_gate.c
View File

@ -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)

4
src/world/area_nok/nok_01/nok_01_2_main.c
View File

@ -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)

57
src/world/area_nok/nok_02/nok_02_6_npc.c
View File

@ -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
#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)

2
src/world/area_nok/nok_03/nok_03_4_npc.c
View File

@ -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)

174
src/world/area_nok/nok_04/nok_04_4_npc.c
View File

@ -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
};

52
src/world/area_nok/nok_11/nok_11_4_npc.c
View File

@ -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

30
src/world/area_obk/obk_01/obk_01_4_portrait.c
View File

@ -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)

8
src/world/area_obk/obk_01/obk_01_5_jump_scare.c
View File

@ -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

6
src/world/area_obk/obk_02/obk_02_5_clock.c
View File

@ -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

12
src/world/area_obk/obk_02/obk_02_6_entity.c
View File

@ -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
};

16
src/world/area_obk/obk_03/obk_03_4_entity.c
View File

@ -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))

12
src/world/area_obk/obk_03/obk_03_5_stairs.c
View File

@ -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)

10
src/world/area_obk/obk_04/obk_04_6_game.c
View File

@ -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)

54
src/world/area_obk/obk_09/obk_09_3_meet_bow.c
View File

@ -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)

14
src/world/area_osr/osr_00/osr_00_5_scenes.c
View File

@ -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

16
src/world/area_osr/osr_03/osr_03_3_intro.c
View File

@ -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)

128
src/world/area_osr/osr_04/osr_04_2_assault.c
View File

@ -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

36
src/world/area_sbk/sbk_02/sbk_02_4_npc.c
View File

@ -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))

62
src/world/area_trd/trd_00/trd_00_3_npc.c
View File

@ -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))

64
src/world/area_trd/trd_01/trd_01_1_main.c
View File

@ -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)

Some files were not shown because too many files have changed in this diff Show More