fix old evt macro/fn usage

bates64 · Jun 30, 2024 · ba0668d · ba0668d
1 parent ed1ccac
commit ba0668d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/src/world/area_kzn/kzn_11/main.c b/src/world/area_kzn/kzn_11/main.c
@@ -55,7 +55,7 @@ LavaReset N(SafeFloorColliders)[] = {
 EvtScript N(EVS_Main) = {
     Set(GB_WorldLocation, LOCATION_MT_LAVALAVA)
     Call(SetSpriteShading, SHADING_KZN_11)
-    EVT_SETUP_CAMERA_DEFAULT()
+    EVT_SETUP_CAMERA_DEFAULT(0, 0, 0)
     Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs)))
     Call(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8)
     Call(PlayAmbientSounds, AMBIENT_LAVA_1)

diff --git a/src/world/area_kzn/kzn_22/main.c b/src/world/area_kzn/kzn_22/main.c
@@ -2,7 +2,7 @@
 
 #include "../common/SmokeTexPanners.inc.c"
 
-EvtScript N(EVS_ExitWalk_kzn_20_1) = EVT_EXIT_WALK_FIXED(60, kzn_22_ENTRY_0, "kzn_20", kzn_20_ENTRY_1);
+EvtScript N(EVS_ExitWalk_kzn_20_1) = EVT_EXIT_WALK(60, kzn_22_ENTRY_0, "kzn_20", kzn_20_ENTRY_1);
 
 EvtScript N(EVS_BindExitTriggers) = {
     BindTrigger(N(EVS_ExitWalk_kzn_20_1), TRIGGER_FLOOR_TOUCH, COLLIDER_deili1, 1, 0)
@@ -139,7 +139,7 @@ LavaReset N(SafeFloorColliders)[] = {
 EvtScript N(EVS_Main) = {
     Set(GB_WorldLocation, LOCATION_MT_LAVALAVA)
     Call(SetSpriteShading, SHADING_KZN_22)
-    EVT_SETUP_CAMERA_DEFAULT()
+    EVT_SETUP_CAMERA_DEFAULT(0, 0, 0)
     Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs)))
     ExecWait(N(EVS_MakeEntities))
     Set(LVar0, N(EVS_BindExitTriggers))

diff --git a/src/world/area_pra/pra_02/entity.c b/src/world/area_pra/pra_02/entity.c
@@ -176,7 +176,7 @@ EvtScript N(EVS_ItemPrompt_RedPadlock) = {
         Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL)
         Return
     EndIf
-    Call(FindKeyItem, ITEM_RED_KEY, LVar0)
+    Call(FindItem, ITEM_RED_KEY, LVar0)
     Call(RemoveKeyItemAt, LVar0)
     Call(CloseChoicePopup)
     Set(GF_PRA02_UnlockedRedDoor, TRUE)
@@ -213,7 +213,7 @@ EvtScript N(EVS_ItemPrompt_BluePadlock) = {
         Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL)
         Return
     EndIf
-    Call(FindKeyItem, ITEM_BLUE_KEY, LVar0)
+    Call(FindItem, ITEM_BLUE_KEY, LVar0)
     Call(RemoveKeyItemAt, LVar0)
     Call(CloseChoicePopup)
     Set(GF_PRA02_UnlockedBlueDoor, TRUE)

diff --git a/src/world/area_pra/pra_02/npc.c b/src/world/area_pra/pra_02/npc.c
@@ -13,5 +13,4 @@ NpcSettings N(NpcSettings_Unused) = {
 };
 
 #include "world/common/complete/KeyItemChoice.inc.c"
-MAP_STATIC_PAD(1,key_item);
 #include "world/common/complete/NormalItemChoice.inc.c"