From fd9593a7b0396ba85bade72bf1a63367d5dc1996 Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Fri, 2 Feb 2024 14:53:41 +0000 Subject: [PATCH] fix EVT_SETUP_CAMERA_DEFAULT (#1162) --- include/script_api/macros.h | 2 +- src/world/area_arn/arn_02/arn_02_2_main.c | 2 +- src/world/area_arn/arn_03/arn_03_2_main.c | 2 +- src/world/area_arn/arn_04/arn_04_2_main.c | 2 +- src/world/area_arn/arn_05/arn_05_2_main.c | 2 +- src/world/area_dgb/dgb_02/dgb_02_2_main.c | 2 +- src/world/area_dgb/dgb_03/dgb_03_2_main.c | 2 +- src/world/area_dgb/dgb_08/dgb_08_2_main.c | 2 +- src/world/area_dgb/dgb_09/dgb_09_2_main.c | 2 +- src/world/area_dgb/dgb_16/dgb_16_2_main.c | 2 +- src/world/area_flo/flo_00/flo_00_2_main.c | 2 +- src/world/area_flo/flo_03/flo_03_2_main.c | 2 +- src/world/area_flo/flo_07/flo_07_2_main.c | 2 +- src/world/area_flo/flo_08/flo_08_3_main.c | 2 +- src/world/area_flo/flo_09/flo_09_2_main.c | 2 +- src/world/area_flo/flo_10/flo_10_3_main.c | 2 +- src/world/area_flo/flo_11/flo_11_2_main.c | 2 +- src/world/area_flo/flo_12/flo_12_2_main.c | 2 +- src/world/area_flo/flo_13/flo_13_3_main.c | 2 +- src/world/area_flo/flo_14/flo_14_2_main.c | 2 +- src/world/area_flo/flo_15/flo_15_2_main.c | 2 +- src/world/area_flo/flo_16/flo_16_2_main.c | 2 +- src/world/area_flo/flo_17/flo_17_2_main.c | 2 +- src/world/area_flo/flo_18/flo_18_2_main.c | 2 +- src/world/area_flo/flo_19/flo_19_3_main.c | 2 +- src/world/area_flo/flo_21/flo_21_2_main.c | 2 +- src/world/area_flo/flo_22/flo_22_2_main.c | 2 +- src/world/area_flo/flo_23/flo_23_2_main.c | 2 +- src/world/area_flo/flo_24/flo_24_2_main.c | 2 +- src/world/area_flo/flo_25/flo_25_2_main.c | 2 +- src/world/area_hos/hos_00/hos_00_2_main.c | 2 +- src/world/area_hos/hos_02/hos_02_2_main.c | 2 +- src/world/area_hos/hos_10/hos_10_4_main.c | 2 +- src/world/area_hos/hos_20/hos_20_1_main.c | 2 +- src/world/area_iwa/iwa_00/iwa_00_1_main.c | 2 +- src/world/area_iwa/iwa_01/iwa_01_1_main.c | 2 +- src/world/area_iwa/iwa_02/iwa_02_1_main.c | 2 +- src/world/area_iwa/iwa_03/iwa_03_1_main.c | 2 +- src/world/area_jan/jan_01/jan_01_2_main.c | 2 +- src/world/area_jan/jan_07/jan_07_2_main.c | 2 +- src/world/area_jan/jan_10/jan_10_2_main.c | 2 +- src/world/area_jan/jan_12/jan_12_1_main.c | 2 +- src/world/area_jan/jan_13/jan_13_1_main.c | 2 +- src/world/area_jan/jan_14/jan_14_1_main.c | 2 +- src/world/area_jan/jan_15/jan_15_1_main.c | 2 +- src/world/area_jan/jan_17/jan_17_2_main.c | 2 +- src/world/area_jan/jan_18/jan_18_2_main.c | 2 +- src/world/area_jan/jan_19/jan_19_2_main.c | 2 +- src/world/area_jan/jan_22/jan_22_2_main.c | 2 +- src/world/area_kkj/kkj_12/kkj_12_1_main.c | 2 +- src/world/area_kkj/kkj_13/kkj_13_2_main.c | 2 +- src/world/area_kkj/kkj_14/kkj_14_2_main.c | 2 +- src/world/area_kkj/kkj_15/kkj_15_2_main.c | 2 +- src/world/area_kkj/kkj_16/kkj_16_1_main.c | 2 +- src/world/area_kkj/kkj_17/kkj_17_1_main.c | 2 +- src/world/area_kkj/kkj_18/kkj_18_2_main.c | 2 +- src/world/area_kkj/kkj_19/kkj_19_2_main.c | 2 +- src/world/area_kkj/kkj_22/kkj_22_2_main.c | 2 +- src/world/area_kkj/kkj_23/kkj_23_2_main.c | 2 +- src/world/area_kkj/kkj_25/kkj_25_1_main.c | 2 +- src/world/area_kkj/kkj_26/kkj_26_1_main.c | 2 +- src/world/area_kkj/kkj_28/kkj_28_1_main.c | 2 +- src/world/area_kmr/kmr_05/kmr_05_2_main.c | 2 +- src/world/area_kmr/kmr_06/kmr_06_2_main.c | 2 +- src/world/area_kmr/kmr_07/kmr_07_2_main.c | 2 +- src/world/area_kmr/kmr_09/kmr_09_2_main.c | 2 +- src/world/area_kmr/kmr_10/kmr_10_2_main.c | 2 +- src/world/area_kmr/kmr_12/kmr_12_2_main.c | 2 +- src/world/area_kpa/kpa_01/kpa_01_2_main.c | 2 +- src/world/area_kpa/kpa_03/kpa_03_2_main.c | 2 +- src/world/area_kpa/kpa_08/kpa_08_2_main.c | 2 +- src/world/area_kpa/kpa_09/kpa_09_2_main.c | 2 +- src/world/area_kpa/kpa_10/kpa_10_2_main.c | 2 +- src/world/area_kpa/kpa_102/kpa_102_2_main.c | 2 +- src/world/area_kpa/kpa_11/kpa_11_2_main.c | 2 +- src/world/area_kpa/kpa_111/kpa_111_2_main.c | 2 +- src/world/area_kpa/kpa_112/kpa_112_2_main.c | 2 +- src/world/area_kpa/kpa_113/kpa_113_2_main.c | 2 +- src/world/area_kpa/kpa_114/kpa_114_2_main.c | 2 +- src/world/area_kpa/kpa_115/kpa_115_2_main.c | 2 +- src/world/area_kpa/kpa_116/kpa_116_2_main.c | 2 +- src/world/area_kpa/kpa_118/kpa_118_2_main.c | 2 +- src/world/area_kpa/kpa_12/kpa_12_2_main.c | 2 +- src/world/area_kpa/kpa_13/kpa_13_2_main.c | 2 +- src/world/area_kpa/kpa_130/kpa_130_2_main.c | 2 +- src/world/area_kpa/kpa_133/kpa_133_2_main.c | 2 +- src/world/area_kpa/kpa_134/kpa_134_2_main.c | 2 +- src/world/area_kpa/kpa_14/kpa_14_2_main.c | 2 +- src/world/area_kpa/kpa_15/kpa_15_2_main.c | 2 +- src/world/area_kpa/kpa_16/kpa_16_2_main.c | 2 +- src/world/area_kpa/kpa_40/kpa_40_2_main.c | 2 +- src/world/area_kpa/kpa_41/kpa_41_2_main.c | 2 +- src/world/area_kpa/kpa_50/kpa_50_2_main.c | 2 +- src/world/area_kpa/kpa_51/kpa_51_2_main.c | 2 +- src/world/area_kpa/kpa_52/kpa_52_3_main.c | 2 +- src/world/area_kpa/kpa_61/kpa_61_2_main.c | 2 +- src/world/area_kpa/kpa_70/kpa_70_2_main.c | 2 +- src/world/area_kpa/kpa_90/kpa_90_2_main.c | 2 +- src/world/area_kpa/kpa_94/kpa_94_2_main.c | 2 +- src/world/area_kzn/kzn_01/kzn_01_1_main.c | 2 +- src/world/area_kzn/kzn_02/kzn_02_1_main.c | 2 +- src/world/area_kzn/kzn_03/kzn_03_1_main.c | 2 +- src/world/area_kzn/kzn_04/kzn_04_1_main.c | 2 +- src/world/area_kzn/kzn_05/kzn_05_1_main.c | 2 +- src/world/area_kzn/kzn_06/kzn_06_1_main.c | 2 +- src/world/area_kzn/kzn_08/kzn_08_1_main.c | 2 +- src/world/area_kzn/kzn_09/kzn_09_1_main.c | 2 +- src/world/area_kzn/kzn_10/kzn_10_1_main.c | 2 +- src/world/area_kzn/kzn_11/kzn_11_1_main.c | 2 +- src/world/area_kzn/kzn_18/kzn_18_1_main.c | 2 +- src/world/area_kzn/kzn_19/kzn_19_2_main.c | 2 +- src/world/area_kzn/kzn_22/kzn_22_2_main.c | 2 +- src/world/area_kzn/kzn_23/kzn_23_2_main.c | 2 +- src/world/area_mac/mac_06/mac_06_1_main.c | 2 +- src/world/area_mac/machi/machi_2_main.c | 2 +- src/world/area_mim/mim_10/mim_10_3_main.c | 2 +- src/world/area_nok/nok_03/nok_03_2_main.c | 2 +- src/world/area_nok/nok_11/nok_11_2_main.c | 2 +- src/world/area_nok/nok_12/nok_12_2_main.c | 2 +- src/world/area_nok/nok_14/nok_14_2_main.c | 2 +- src/world/area_nok/nok_15/nok_15_2_main.c | 2 +- src/world/area_omo/omo_02/omo_02_2_main.c | 2 +- src/world/area_omo/omo_04/omo_04_2_main.c | 2 +- src/world/area_omo/omo_05/omo_05_2_main.c | 2 +- src/world/area_omo/omo_07/omo_07_2_main.c | 2 +- src/world/area_omo/omo_09/omo_09_2_main.c | 2 +- src/world/area_omo/omo_11/omo_11_2_main.c | 2 +- src/world/area_omo/omo_13/omo_13_2_main.c | 2 +- src/world/area_omo/omo_16/omo_16_1_main.c | 2 +- src/world/area_omo/omo_17/omo_17_1_main.c | 2 +- src/world/area_sam/sam_03/sam_03_2_main.c | 2 +- src/world/area_sam/sam_05/sam_05_2_main.c | 2 +- src/world/area_sam/sam_07/sam_07_2_main.c | 2 +- src/world/area_sam/sam_08/sam_08_2_main.c | 2 +- src/world/area_sam/sam_09/sam_09_2_main.c | 2 +- src/world/area_sam/sam_10/sam_10_2_main.c | 2 +- src/world/area_trd/trd_09/trd_09_1_main.c | 2 +- src/world/area_tst/tst_01/tst_01_1_main.c | 2 +- src/world/area_tst/tst_02/tst_02_1_main.c | 2 +- src/world/area_tst/tst_03/tst_03_1_main.c | 2 +- src/world/area_tst/tst_04/tst_04_1_main.c | 2 +- src/world/area_tst/tst_10/tst_10_1_main.c | 2 +- src/world/area_tst/tst_11/tst_11_1_main.c | 2 +- src/world/area_tst/tst_12/tst_12_1_main.c | 2 +- src/world/area_tst/tst_20/tst_20_1_main.c | 2 +- src/world/dead/area_flo/flo_00/flo_00_2_main.c | 2 +- src/world/dead/area_flo/flo_03/flo_03_2_main.c | 2 +- src/world/dead/area_flo/flo_07/flo_07_2_main.c | 2 +- src/world/dead/area_flo/flo_08/flo_08_3_main.c | 2 +- src/world/dead/area_flo/flo_09/flo_09_2_main.c | 2 +- src/world/dead/area_flo/flo_10/flo_10_3_main.c | 2 +- src/world/dead/area_flo/flo_11/flo_11_2_main.c | 2 +- src/world/dead/area_flo/flo_12/flo_12_2_main.c | 2 +- src/world/dead/area_flo/flo_13/flo_13_3_main.c | 2 +- src/world/dead/area_flo/flo_14/flo_14_2_main.c | 2 +- src/world/dead/area_flo/flo_15/flo_15_2_main.c | 2 +- src/world/dead/area_flo/flo_16/flo_16_2_main.c | 2 +- src/world/dead/area_flo/flo_17/flo_17_2_main.c | 2 +- src/world/dead/area_flo/flo_18/flo_18_2_main.c | 2 +- src/world/dead/area_flo/flo_19/flo_19_3_main.c | 2 +- src/world/dead/area_kzn/kzn_11/kzn_11_1_main.c | 2 +- src/world/dead/area_kzn/kzn_18/kzn_18_1_main.c | 2 +- src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c | 2 +- src/world/dead/area_kzn/kzn_22/kzn_22_2_main.c | 2 +- src/world/dead/area_kzn/kzn_23/kzn_23_2_main.c | 2 +- 165 files changed, 165 insertions(+), 165 deletions(-) diff --git a/include/script_api/macros.h b/include/script_api/macros.h index a20899bde6..a0b47752f6 100644 --- a/include/script_api/macros.h +++ b/include/script_api/macros.h @@ -745,7 +745,7 @@ #define SetUP_CAMERA_MINIMAL() \ Call(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) -#define SetUP_CAMERA_DEFAULT() \ +#define EVT_SETUP_CAMERA_DEFAULT() \ Call(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) \ Call(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) \ Call(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_arn/arn_02/arn_02_2_main.c b/src/world/area_arn/arn_02/arn_02_2_main.c index 863652c328..a15d992616 100644 --- a/src/world/area_arn/arn_02/arn_02_2_main.c +++ b/src/world/area_arn/arn_02/arn_02_2_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_GUSTY_GULCH) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupMusic)) diff --git a/src/world/area_arn/arn_03/arn_03_2_main.c b/src/world/area_arn/arn_03/arn_03_2_main.c index 21fca86674..3054749f45 100644 --- a/src/world/area_arn/arn_03/arn_03_2_main.c +++ b/src/world/area_arn/arn_03/arn_03_2_main.c @@ -40,7 +40,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_GUSTY_GULCH) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(AF_ARN_03, FALSE) Set(AF_ARN_04, FALSE) Set(AF_ARN_05, FALSE) diff --git a/src/world/area_arn/arn_04/arn_04_2_main.c b/src/world/area_arn/arn_04/arn_04_2_main.c index b326bfe3f7..bbf370c8ef 100644 --- a/src/world/area_arn/arn_04/arn_04_2_main.c +++ b/src/world/area_arn/arn_04/arn_04_2_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_GUSTY_GULCH) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupMusic)) diff --git a/src/world/area_arn/arn_05/arn_05_2_main.c b/src/world/area_arn/arn_05/arn_05_2_main.c index f78ba163c8..f78200ffcc 100644 --- a/src/world/area_arn/arn_05/arn_05_2_main.c +++ b/src/world/area_arn/arn_05/arn_05_2_main.c @@ -27,7 +27,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_GUSTY_GULCH) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() IfLt(GB_StoryProgress, STORY_CH3_DEFEATED_TUBBA_BLUBBA) Call(MakeNpcs, FALSE, Ref(N(BeforeNPCs))) Else diff --git a/src/world/area_dgb/dgb_02/dgb_02_2_main.c b/src/world/area_dgb/dgb_02/dgb_02_2_main.c index addbc0afaf..fbc360b079 100644 --- a/src/world/area_dgb/dgb_02/dgb_02_2_main.c +++ b/src/world/area_dgb/dgb_02/dgb_02_2_main.c @@ -95,7 +95,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_TUBBAS_MANOR) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() IfLt(GB_StoryProgress, STORY_CH3_STAR_SPIRIT_RESCUED) Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) EndIf diff --git a/src/world/area_dgb/dgb_03/dgb_03_2_main.c b/src/world/area_dgb/dgb_03/dgb_03_2_main.c index 76fbdbbaaa..d56b401bea 100644 --- a/src/world/area_dgb/dgb_03/dgb_03_2_main.c +++ b/src/world/area_dgb/dgb_03/dgb_03_2_main.c @@ -138,7 +138,7 @@ s32 N(KeyList_UpperDoor)[] = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_TUBBAS_MANOR) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() IfLt(GB_StoryProgress, STORY_CH3_STAR_SPIRIT_RESCUED) Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) EndIf diff --git a/src/world/area_dgb/dgb_08/dgb_08_2_main.c b/src/world/area_dgb/dgb_08/dgb_08_2_main.c index 6cf257a2b5..fda02840c5 100644 --- a/src/world/area_dgb/dgb_08/dgb_08_2_main.c +++ b/src/world/area_dgb/dgb_08/dgb_08_2_main.c @@ -54,7 +54,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_TUBBAS_MANOR) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Switch(GB_StoryProgress) CaseLt(STORY_CH3_TUBBA_SMASHED_THE_BRIDGES) Call(MakeNpcs, TRUE, Ref(N(BeforeNPCs))) diff --git a/src/world/area_dgb/dgb_09/dgb_09_2_main.c b/src/world/area_dgb/dgb_09/dgb_09_2_main.c index f7796c56af..791dd30915 100644 --- a/src/world/area_dgb/dgb_09/dgb_09_2_main.c +++ b/src/world/area_dgb/dgb_09/dgb_09_2_main.c @@ -89,7 +89,7 @@ EvtScript N(enterWalk_80243BC4) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_TUBBAS_MANOR) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() IfLt(GB_StoryProgress, STORY_CH3_STAR_SPIRIT_RESCUED) Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) EndIf diff --git a/src/world/area_dgb/dgb_16/dgb_16_2_main.c b/src/world/area_dgb/dgb_16/dgb_16_2_main.c index 1e89a7a2c4..e2d58a0f41 100644 --- a/src/world/area_dgb/dgb_16/dgb_16_2_main.c +++ b/src/world/area_dgb/dgb_16/dgb_16_2_main.c @@ -38,7 +38,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_TUBBAS_MANOR) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() IfLt(GB_StoryProgress, STORY_CH3_STAR_SPIRIT_RESCUED) Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) EndIf diff --git a/src/world/area_flo/flo_00/flo_00_2_main.c b/src/world/area_flo/flo_00/flo_00_2_main.c index 02d3199796..fc29852275 100644 --- a/src/world/area_flo/flo_00/flo_00_2_main.c +++ b/src/world/area_flo/flo_00/flo_00_2_main.c @@ -146,7 +146,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(GF_MAP_FlowerFields, TRUE) IfLt(GB_StoryProgress, STORY_CH6_GREW_MAGIC_BEANSTALK) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o351, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_flo/flo_03/flo_03_2_main.c b/src/world/area_flo/flo_03/flo_03_2_main.c index 865116c632..1b6df6f662 100644 --- a/src/world/area_flo/flo_03/flo_03_2_main.c +++ b/src/world/area_flo/flo_03/flo_03_2_main.c @@ -22,7 +22,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(AF_FLO_TreeDrop_RedBerry1, FALSE) Set(AF_FLO_TreeDrop_RedBerry2, FALSE) Set(AB_FLO_PetuniaDialogue, 0) diff --git a/src/world/area_flo/flo_07/flo_07_2_main.c b/src/world/area_flo/flo_07/flo_07_2_main.c index f2ae0c9220..776ed8168d 100644 --- a/src/world/area_flo/flo_07/flo_07_2_main.c +++ b/src/world/area_flo/flo_07/flo_07_2_main.c @@ -30,7 +30,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(AF_FLO_MadeCrystalBerry, FALSE) Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_SetupFoliage)) diff --git a/src/world/area_flo/flo_08/flo_08_3_main.c b/src/world/area_flo/flo_08/flo_08_3_main.c index 101c2d7fc0..223579f441 100644 --- a/src/world/area_flo/flo_08/flo_08_3_main.c +++ b/src/world/area_flo/flo_08/flo_08_3_main.c @@ -29,7 +29,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupVines)) diff --git a/src/world/area_flo/flo_09/flo_09_2_main.c b/src/world/area_flo/flo_09/flo_09_2_main.c index f553570646..ec6698c28b 100644 --- a/src/world/area_flo/flo_09/flo_09_2_main.c +++ b/src/world/area_flo/flo_09/flo_09_2_main.c @@ -21,7 +21,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) Exec(N(EVS_SetupVines)) Exec(N(EVS_SetupFoliage)) diff --git a/src/world/area_flo/flo_10/flo_10_3_main.c b/src/world/area_flo/flo_10/flo_10_3_main.c index d46e5aa970..6b15488b9c 100644 --- a/src/world/area_flo/flo_10/flo_10_3_main.c +++ b/src/world/area_flo/flo_10/flo_10_3_main.c @@ -20,7 +20,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupFoliage)) diff --git a/src/world/area_flo/flo_11/flo_11_2_main.c b/src/world/area_flo/flo_11/flo_11_2_main.c index d47441a956..5b32316a72 100644 --- a/src/world/area_flo/flo_11/flo_11_2_main.c +++ b/src/world/area_flo/flo_11/flo_11_2_main.c @@ -63,7 +63,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(func_80044238, 5) Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) diff --git a/src/world/area_flo/flo_12/flo_12_2_main.c b/src/world/area_flo/flo_12/flo_12_2_main.c index 51c7ea5256..ff1c5f83cb 100644 --- a/src/world/area_flo/flo_12/flo_12_2_main.c +++ b/src/world/area_flo/flo_12/flo_12_2_main.c @@ -20,7 +20,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(AF_FLO_GivenCrystalBerry, FALSE) Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o180, SURFACE_TYPE_FLOWERS) diff --git a/src/world/area_flo/flo_13/flo_13_3_main.c b/src/world/area_flo/flo_13/flo_13_3_main.c index 84701865d7..b195c8180c 100644 --- a/src/world/area_flo/flo_13/flo_13_3_main.c +++ b/src/world/area_flo/flo_13/flo_13_3_main.c @@ -21,7 +21,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o48, SURFACE_TYPE_FLOWERS) diff --git a/src/world/area_flo/flo_14/flo_14_2_main.c b/src/world/area_flo/flo_14/flo_14_2_main.c index ec6e2d4102..b1aae776cb 100644 --- a/src/world/area_flo/flo_14/flo_14_2_main.c +++ b/src/world/area_flo/flo_14/flo_14_2_main.c @@ -36,7 +36,7 @@ LavaReset N(SafeFloorColliders)[] = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) Exec(N(EVS_MakeEntities)) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o114, SURFACE_TYPE_SPIKES) diff --git a/src/world/area_flo/flo_15/flo_15_2_main.c b/src/world/area_flo/flo_15/flo_15_2_main.c index 94a9de2f22..70c0af8b2c 100644 --- a/src/world/area_flo/flo_15/flo_15_2_main.c +++ b/src/world/area_flo/flo_15/flo_15_2_main.c @@ -12,7 +12,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Call(GetEntryID, LVar0) diff --git a/src/world/area_flo/flo_16/flo_16_2_main.c b/src/world/area_flo/flo_16/flo_16_2_main.c index 8cf53b87d7..c4e311c5fd 100644 --- a/src/world/area_flo/flo_16/flo_16_2_main.c +++ b/src/world/area_flo/flo_16/flo_16_2_main.c @@ -25,7 +25,7 @@ LavaReset N(SafeFloorColliders)[] = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupVines)) diff --git a/src/world/area_flo/flo_17/flo_17_2_main.c b/src/world/area_flo/flo_17/flo_17_2_main.c index e36324c7b3..02922295c2 100644 --- a/src/world/area_flo/flo_17/flo_17_2_main.c +++ b/src/world/area_flo/flo_17/flo_17_2_main.c @@ -44,7 +44,7 @@ LavaReset N(SafeFloorColliders)[] = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupLogBridges)) diff --git a/src/world/area_flo/flo_18/flo_18_2_main.c b/src/world/area_flo/flo_18/flo_18_2_main.c index 607467b709..de0d0f4656 100644 --- a/src/world/area_flo/flo_18/flo_18_2_main.c +++ b/src/world/area_flo/flo_18/flo_18_2_main.c @@ -27,7 +27,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) Exec(N(EVS_SetupFoliage)) Exec(N(EVS_SetupMachine)) diff --git a/src/world/area_flo/flo_19/flo_19_3_main.c b/src/world/area_flo/flo_19/flo_19_3_main.c index 6a24ff5fcf..469007bb8d 100644 --- a/src/world/area_flo/flo_19/flo_19_3_main.c +++ b/src/world/area_flo/flo_19/flo_19_3_main.c @@ -20,7 +20,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_CLOUDY_CLIMB) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(GF_MAP_CloudyClimb, TRUE) ExecWait(N(EVS_MakeEntities)) Call(ParentColliderToModel, COLLIDER_o117, MODEL_o142) diff --git a/src/world/area_flo/flo_21/flo_21_2_main.c b/src/world/area_flo/flo_21/flo_21_2_main.c index 9f3cbe9846..58f56aa91e 100644 --- a/src/world/area_flo/flo_21/flo_21_2_main.c +++ b/src/world/area_flo/flo_21/flo_21_2_main.c @@ -96,7 +96,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_CLOUDY_CLIMB) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) Exec(N(EVS_Scene_HuffNPuffAmbush)) Call(HidePlayerShadow, TRUE) diff --git a/src/world/area_flo/flo_22/flo_22_2_main.c b/src/world/area_flo/flo_22/flo_22_2_main.c index b025b67b7f..fb4bb796e4 100644 --- a/src/world/area_flo/flo_22/flo_22_2_main.c +++ b/src/world/area_flo/flo_22/flo_22_2_main.c @@ -18,7 +18,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) Exec(N(EVS_SetupFoliage)) Exec(N(EVS_SetupWell)) diff --git a/src/world/area_flo/flo_23/flo_23_2_main.c b/src/world/area_flo/flo_23/flo_23_2_main.c index 68914fc288..a0f16a388a 100644 --- a/src/world/area_flo/flo_23/flo_23_2_main.c +++ b/src/world/area_flo/flo_23/flo_23_2_main.c @@ -22,7 +22,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) EVT_FLOWER_SPAWN_REGION( -290, -190, 480, -90, 0) diff --git a/src/world/area_flo/flo_24/flo_24_2_main.c b/src/world/area_flo/flo_24/flo_24_2_main.c index 702ad498a1..25fb773416 100644 --- a/src/world/area_flo/flo_24/flo_24_2_main.c +++ b/src/world/area_flo/flo_24/flo_24_2_main.c @@ -22,7 +22,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() ExecWait(N(EVS_MakeEntities)) Call(MakeTransformGroup, MODEL_g58) Call(MakeTransformGroup, MODEL_g73) diff --git a/src/world/area_flo/flo_25/flo_25_2_main.c b/src/world/area_flo/flo_25/flo_25_2_main.c index 9f06c68892..17ac3052ec 100644 --- a/src/world/area_flo/flo_25/flo_25_2_main.c +++ b/src/world/area_flo/flo_25/flo_25_2_main.c @@ -22,7 +22,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupVines)) diff --git a/src/world/area_hos/hos_00/hos_00_2_main.c b/src/world/area_hos/hos_00/hos_00_2_main.c index f58c6ac25a..7a7d255292 100644 --- a/src/world/area_hos/hos_00/hos_00_2_main.c +++ b/src/world/area_hos/hos_00/hos_00_2_main.c @@ -66,7 +66,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_SHOOTING_STAR_SUMMIT) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(GF_MAP_ShootingStarSummit, TRUE) Set(GF_MAC01_RowfBadgesChosen, FALSE) Call(GetEntryID, LVar0) diff --git a/src/world/area_hos/hos_02/hos_02_2_main.c b/src/world/area_hos/hos_02/hos_02_2_main.c index 21663f273b..2aa824a1fd 100644 --- a/src/world/area_hos/hos_02/hos_02_2_main.c +++ b/src/world/area_hos/hos_02/hos_02_2_main.c @@ -95,7 +95,7 @@ EvtScript N(EVS_EnterStarBeam) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_STAR_WAY) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(GF_MAP_StarWay, TRUE) Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) Call(GetEntryID, LVar0) diff --git a/src/world/area_hos/hos_10/hos_10_4_main.c b/src/world/area_hos/hos_10/hos_10_4_main.c index 93ed687aec..39ae22e87d 100644 --- a/src/world/area_hos/hos_10/hos_10_4_main.c +++ b/src/world/area_hos/hos_10/hos_10_4_main.c @@ -6,7 +6,7 @@ EvtScript N(EVS_Main) = { Wait(75) EndIf Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(GetEntryID, LVar0) Switch(LVar0) CaseEq(hos_10_ENTRY_1) diff --git a/src/world/area_hos/hos_20/hos_20_1_main.c b/src/world/area_hos/hos_20/hos_20_1_main.c index 0160ac28cc..87017db43b 100644 --- a/src/world/area_hos/hos_20/hos_20_1_main.c +++ b/src/world/area_hos/hos_20/hos_20_1_main.c @@ -49,7 +49,7 @@ EvtScript N(EVS_TexPan_MotionLines) = { EvtScript N(EVS_Main) = { Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Exec(N(EVS_TexPan_MotionLines)) Call(GetEntryID, LVar0) Switch(LVar0) diff --git a/src/world/area_iwa/iwa_00/iwa_00_1_main.c b/src/world/area_iwa/iwa_00/iwa_00_1_main.c index 21b7697939..ce152bf126 100644 --- a/src/world/area_iwa/iwa_00/iwa_00_1_main.c +++ b/src/world/area_iwa/iwa_00/iwa_00_1_main.c @@ -26,7 +26,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_RUGGED) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_TexPan_Water)) diff --git a/src/world/area_iwa/iwa_01/iwa_01_1_main.c b/src/world/area_iwa/iwa_01/iwa_01_1_main.c index c8cd6aca19..908a3d4e4e 100644 --- a/src/world/area_iwa/iwa_01/iwa_01_1_main.c +++ b/src/world/area_iwa/iwa_01/iwa_01_1_main.c @@ -50,7 +50,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_RUGGED) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_TexPan_Water)) diff --git a/src/world/area_iwa/iwa_02/iwa_02_1_main.c b/src/world/area_iwa/iwa_02/iwa_02_1_main.c index 94d4564a9c..1389aa4a83 100644 --- a/src/world/area_iwa/iwa_02/iwa_02_1_main.c +++ b/src/world/area_iwa/iwa_02/iwa_02_1_main.c @@ -15,7 +15,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_RUGGED) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Call(SetMusicTrack, 0, SONG_MT_RUGGED, 0, 8) diff --git a/src/world/area_iwa/iwa_03/iwa_03_1_main.c b/src/world/area_iwa/iwa_03/iwa_03_1_main.c index 170e7f21c4..e6a6231afa 100644 --- a/src/world/area_iwa/iwa_03/iwa_03_1_main.c +++ b/src/world/area_iwa/iwa_03/iwa_03_1_main.c @@ -11,7 +11,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_RUGGED) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_BindSlideTriggers)) diff --git a/src/world/area_jan/jan_01/jan_01_2_main.c b/src/world/area_jan/jan_01/jan_01_2_main.c index ab3dd7eee7..a4483dff56 100644 --- a/src/world/area_jan/jan_01/jan_01_2_main.c +++ b/src/world/area_jan/jan_01/jan_01_2_main.c @@ -21,7 +21,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_JADE_JUNGLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupFoliage)) diff --git a/src/world/area_jan/jan_07/jan_07_2_main.c b/src/world/area_jan/jan_07/jan_07_2_main.c index 627757459a..11e4a12fa1 100644 --- a/src/world/area_jan/jan_07/jan_07_2_main.c +++ b/src/world/area_jan/jan_07/jan_07_2_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_JADE_JUNGLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) Exec(N(EVS_SetupTrees)) Exec(N(EVS_SetupBushes)) diff --git a/src/world/area_jan/jan_10/jan_10_2_main.c b/src/world/area_jan/jan_10/jan_10_2_main.c index 545f261584..4d8df814fa 100644 --- a/src/world/area_jan/jan_10/jan_10_2_main.c +++ b/src/world/area_jan/jan_10/jan_10_2_main.c @@ -15,7 +15,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_JADE_JUNGLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupLogs)) diff --git a/src/world/area_jan/jan_12/jan_12_1_main.c b/src/world/area_jan/jan_12/jan_12_1_main.c index f122bde544..cb2bbab16b 100644 --- a/src/world/area_jan/jan_12/jan_12_1_main.c +++ b/src/world/area_jan/jan_12/jan_12_1_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_JADE_JUNGLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupVines)) diff --git a/src/world/area_jan/jan_13/jan_13_1_main.c b/src/world/area_jan/jan_13/jan_13_1_main.c index c32f443341..2cfd5abfce 100644 --- a/src/world/area_jan/jan_13/jan_13_1_main.c +++ b/src/world/area_jan/jan_13/jan_13_1_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_JADE_JUNGLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Exec(N(EVS_MakeEntities)) Exec(N(EVS_SetupPuzzle)) Exec(N(EVS_SetupTrees)) diff --git a/src/world/area_jan/jan_14/jan_14_1_main.c b/src/world/area_jan/jan_14/jan_14_1_main.c index 84291cad3f..b3b211ca0d 100644 --- a/src/world/area_jan/jan_14/jan_14_1_main.c +++ b/src/world/area_jan/jan_14/jan_14_1_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_JADE_JUNGLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) Exec(N(EVS_SetupVines)) Exec(N(EVS_SetupTrees)) diff --git a/src/world/area_jan/jan_15/jan_15_1_main.c b/src/world/area_jan/jan_15/jan_15_1_main.c index 31f429bbff..39efe142cd 100644 --- a/src/world/area_jan/jan_15/jan_15_1_main.c +++ b/src/world/area_jan/jan_15/jan_15_1_main.c @@ -26,7 +26,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_JADE_JUNGLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupTrees)) diff --git a/src/world/area_jan/jan_17/jan_17_2_main.c b/src/world/area_jan/jan_17/jan_17_2_main.c index 8a416ea975..f15b37f664 100644 --- a/src/world/area_jan/jan_17/jan_17_2_main.c +++ b/src/world/area_jan/jan_17/jan_17_2_main.c @@ -19,7 +19,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_JADE_JUNGLE) Call(SetSpriteShading, SHADING_JAN_17) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() ExecWait(N(EVS_MakeEntities)) Call(N(EnableFog)) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitw, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_jan/jan_18/jan_18_2_main.c b/src/world/area_jan/jan_18/jan_18_2_main.c index 2d7dec56fe..fff5442e08 100644 --- a/src/world/area_jan/jan_18/jan_18_2_main.c +++ b/src/world/area_jan/jan_18/jan_18_2_main.c @@ -14,7 +14,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_JADE_JUNGLE) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() ExecWait(N(EVS_MakeEntities)) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitse, COLLIDER_FLAGS_UPPER_MASK) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitn, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_jan/jan_19/jan_19_2_main.c b/src/world/area_jan/jan_19/jan_19_2_main.c index cd667e0535..5055156a99 100644 --- a/src/world/area_jan/jan_19/jan_19_2_main.c +++ b/src/world/area_jan/jan_19/jan_19_2_main.c @@ -19,7 +19,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_JADE_JUNGLE) Call(SetSpriteShading, SHADING_JAN_19) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() ExecWait(N(EVS_MakeEntities)) Call(N(EnableFog)) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitw, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_jan/jan_22/jan_22_2_main.c b/src/world/area_jan/jan_22/jan_22_2_main.c index 1ca603b2ab..a1a1b72e81 100644 --- a/src/world/area_jan/jan_22/jan_22_2_main.c +++ b/src/world/area_jan/jan_22/jan_22_2_main.c @@ -113,7 +113,7 @@ EvtScript N(D_8024202C_B861AC) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_JADE_JUNGLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o304, COLLIDER_FLAGS_UPPER_MASK) Switch(GB_StoryProgress) CaseLt(STORY_CH5_RAPHAEL_MOVED_ROOT) diff --git a/src/world/area_kkj/kkj_12/kkj_12_1_main.c b/src/world/area_kkj/kkj_12/kkj_12_1_main.c index ffabbee799..c447cc52b5 100644 --- a/src/world/area_kkj/kkj_12/kkj_12_1_main.c +++ b/src/world/area_kkj/kkj_12/kkj_12_1_main.c @@ -48,7 +48,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_PEACHS_CASTLE) Call(SetSpriteShading, SHADING_KKJ_12) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() IfEq(GB_StoryProgress, STORY_CH6_BEGAN_PEACH_MISSION) Call(N(SetAvailableDisguise), PEACH_DISGUISE_KOOPATROL) Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) diff --git a/src/world/area_kkj/kkj_13/kkj_13_2_main.c b/src/world/area_kkj/kkj_13/kkj_13_2_main.c index d8ff46427d..58bbb12fe4 100644 --- a/src/world/area_kkj/kkj_13/kkj_13_2_main.c +++ b/src/world/area_kkj/kkj_13/kkj_13_2_main.c @@ -50,7 +50,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_PEACHS_CASTLE) Call(SetSpriteShading, SHADING_KKJ_13) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() IfEq(GB_StoryProgress, STORY_INTRO) Call(MakeNpcs, FALSE, Ref(N(IntroNPCs))) EndIf diff --git a/src/world/area_kkj/kkj_14/kkj_14_2_main.c b/src/world/area_kkj/kkj_14/kkj_14_2_main.c index 2130cd20c6..3e914657d7 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_2_main.c +++ b/src/world/area_kkj/kkj_14/kkj_14_2_main.c @@ -163,7 +163,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_PEACHS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(GetEntryID, LVar0) IfGe(LVar0, kkj_14_ENTRY_3) IfNe(LVar0, kkj_14_ENTRY_B) diff --git a/src/world/area_kkj/kkj_15/kkj_15_2_main.c b/src/world/area_kkj/kkj_15/kkj_15_2_main.c index c14a253d61..c987277d69 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_2_main.c +++ b/src/world/area_kkj/kkj_15/kkj_15_2_main.c @@ -99,7 +99,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_PEACHS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(GetEntryID, LVar0) Switch(LVar0) CaseEq(kkj_15_ENTRY_2) diff --git a/src/world/area_kkj/kkj_16/kkj_16_1_main.c b/src/world/area_kkj/kkj_16/kkj_16_1_main.c index f1d67eaabe..8cc2178dee 100644 --- a/src/world/area_kkj/kkj_16/kkj_16_1_main.c +++ b/src/world/area_kkj/kkj_16/kkj_16_1_main.c @@ -44,7 +44,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_PEACHS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Switch(GB_StoryProgress) CaseOrEq(STORY_CH2_BEGAN_PEACH_MISSION) CaseOrEq(STORY_CH4_BEGAN_PEACH_MISSION) diff --git a/src/world/area_kkj/kkj_17/kkj_17_1_main.c b/src/world/area_kkj/kkj_17/kkj_17_1_main.c index d8806d94b6..7537013ef0 100644 --- a/src/world/area_kkj/kkj_17/kkj_17_1_main.c +++ b/src/world/area_kkj/kkj_17/kkj_17_1_main.c @@ -30,7 +30,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_PEACHS_CASTLE) Call(SetSpriteShading, SHADING_KKJ_17) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupMagicChest)) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) diff --git a/src/world/area_kkj/kkj_18/kkj_18_2_main.c b/src/world/area_kkj/kkj_18/kkj_18_2_main.c index ba62b9e1de..3862655571 100644 --- a/src/world/area_kkj/kkj_18/kkj_18_2_main.c +++ b/src/world/area_kkj/kkj_18/kkj_18_2_main.c @@ -106,7 +106,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_PEACHS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() IfEq(GB_StoryProgress, STORY_CH4_BEGAN_PEACH_MISSION) Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) EndIf diff --git a/src/world/area_kkj/kkj_19/kkj_19_2_main.c b/src/world/area_kkj/kkj_19/kkj_19_2_main.c index 87930b8062..08bc8ca59d 100644 --- a/src/world/area_kkj/kkj_19/kkj_19_2_main.c +++ b/src/world/area_kkj/kkj_19/kkj_19_2_main.c @@ -197,7 +197,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_PEACHS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Switch(GB_StoryProgress) CaseEq(STORY_INTRO) Call(MakeNpcs, FALSE, Ref(N(IntroNPCs))) diff --git a/src/world/area_kkj/kkj_22/kkj_22_2_main.c b/src/world/area_kkj/kkj_22/kkj_22_2_main.c index 3a476e4f15..0b2dc026ef 100644 --- a/src/world/area_kkj/kkj_22/kkj_22_2_main.c +++ b/src/world/area_kkj/kkj_22/kkj_22_2_main.c @@ -22,7 +22,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_PEACHS_CASTLE) Call(SetSpriteShading, SHADING_KKJ_22) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Exec(N(EVS_SetupMusic)) Call(UseDoorSounds, DOOR_SOUNDS_LARGE) BindTrigger(Ref(N(EVS_ExitDoor_kkj_13_1)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) diff --git a/src/world/area_kkj/kkj_23/kkj_23_2_main.c b/src/world/area_kkj/kkj_23/kkj_23_2_main.c index 6bd6d71df9..ba4ef7e837 100644 --- a/src/world/area_kkj/kkj_23/kkj_23_2_main.c +++ b/src/world/area_kkj/kkj_23/kkj_23_2_main.c @@ -54,7 +54,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_PEACHS_CASTLE) Call(SetSpriteShading, SHADING_KKJ_23) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() IfEq(GB_StoryProgress, STORY_CH6_BEGAN_PEACH_MISSION) Call(N(SetAvailableDisguise), PEACH_DISGUISE_KOOPATROL) Call(MakeNpcs, FALSE, Ref(N(PeachNPCs))) diff --git a/src/world/area_kkj/kkj_25/kkj_25_1_main.c b/src/world/area_kkj/kkj_25/kkj_25_1_main.c index 0259d4ef3a..4f5f0ee8c3 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_1_main.c +++ b/src/world/area_kkj/kkj_25/kkj_25_1_main.c @@ -96,7 +96,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_PEACHS_CASTLE) Call(SetSpriteShading, SHADING_KKJ_25) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(SetCamSpeed, CAM_DEFAULT, Float(0.75)) IfEq(GF_KKJ25_Defeated_Bowser, FALSE) IfEq(GF_KKJ25_Defeated_Kammy, FALSE) diff --git a/src/world/area_kkj/kkj_26/kkj_26_1_main.c b/src/world/area_kkj/kkj_26/kkj_26_1_main.c index 3446065c78..a655a05357 100644 --- a/src/world/area_kkj/kkj_26/kkj_26_1_main.c +++ b/src/world/area_kkj/kkj_26/kkj_26_1_main.c @@ -55,7 +55,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_PEACHS_CASTLE) Call(SetSpriteShading, SHADING_KKJ_26) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(GetEntryID, LVar0) IfEq(LVar0, kkj_26_ENTRY_1) Set(GB_StoryProgress, STORY_CH7_BEGAN_PEACH_MISSION) diff --git a/src/world/area_kkj/kkj_28/kkj_28_1_main.c b/src/world/area_kkj/kkj_28/kkj_28_1_main.c index fdbb28492c..d6c91ecec7 100644 --- a/src/world/area_kkj/kkj_28/kkj_28_1_main.c +++ b/src/world/area_kkj/kkj_28/kkj_28_1_main.c @@ -26,7 +26,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_PEACHS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(EnableGroup, MODEL_g40, FALSE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) BindTrigger(Ref(N(EVS_ExitDoor_kkj_10_2)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) diff --git a/src/world/area_kmr/kmr_05/kmr_05_2_main.c b/src/world/area_kmr/kmr_05/kmr_05_2_main.c index e82c84a9c2..43f61e4fc6 100644 --- a/src/world/area_kmr/kmr_05/kmr_05_2_main.c +++ b/src/world/area_kmr/kmr_05/kmr_05_2_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_GOOMBA_VILLAGE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() IfEq(GF_KMR02_ReturnedWithGoompa, FALSE) Call(MakeNpcs, FALSE, Ref(N(NpcsBefore))) Else diff --git a/src/world/area_kmr/kmr_06/kmr_06_2_main.c b/src/world/area_kmr/kmr_06/kmr_06_2_main.c index a9445893bc..349da3c01c 100644 --- a/src/world/area_kmr/kmr_06/kmr_06_2_main.c +++ b/src/world/area_kmr/kmr_06/kmr_06_2_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_GOOMBA_ROAD) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupMusic)) diff --git a/src/world/area_kmr/kmr_07/kmr_07_2_main.c b/src/world/area_kmr/kmr_07/kmr_07_2_main.c index 3467b82df4..fe70d71a85 100644 --- a/src/world/area_kmr/kmr_07/kmr_07_2_main.c +++ b/src/world/area_kmr/kmr_07/kmr_07_2_main.c @@ -32,7 +32,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_GOOMBA_ROAD) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupMusic)) diff --git a/src/world/area_kmr/kmr_09/kmr_09_2_main.c b/src/world/area_kmr/kmr_09/kmr_09_2_main.c index e0e9b71608..06f894cf3c 100644 --- a/src/world/area_kmr/kmr_09/kmr_09_2_main.c +++ b/src/world/area_kmr/kmr_09/kmr_09_2_main.c @@ -14,7 +14,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_GOOMBA_ROAD) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(GF_MAP_GoombaRoad, TRUE) Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) diff --git a/src/world/area_kmr/kmr_10/kmr_10_2_main.c b/src/world/area_kmr/kmr_10/kmr_10_2_main.c index 360844dfcf..3d596e2401 100644 --- a/src/world/area_kmr/kmr_10/kmr_10_2_main.c +++ b/src/world/area_kmr/kmr_10/kmr_10_2_main.c @@ -22,7 +22,7 @@ EvtScript N(D_80240828_8D8CF8) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_GOOMBA_ROAD) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) Call(ClearDefeatedEnemies) ExecWait(N(EVS_MakeEntities)) diff --git a/src/world/area_kmr/kmr_12/kmr_12_2_main.c b/src/world/area_kmr/kmr_12/kmr_12_2_main.c index c30df6803d..4eee44c50f 100644 --- a/src/world/area_kmr/kmr_12/kmr_12_2_main.c +++ b/src/world/area_kmr/kmr_12/kmr_12_2_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_GOOMBA_ROAD) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupMusic)) diff --git a/src/world/area_kpa/kpa_01/kpa_01_2_main.c b/src/world/area_kpa/kpa_01/kpa_01_2_main.c index d4215a38d9..fd5e9553c2 100644 --- a/src/world/area_kpa/kpa_01/kpa_01_2_main.c +++ b/src/world/area_kpa/kpa_01/kpa_01_2_main.c @@ -47,7 +47,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_CreateDarkness)) diff --git a/src/world/area_kpa/kpa_03/kpa_03_2_main.c b/src/world/area_kpa/kpa_03/kpa_03_2_main.c index 39c5872b55..6a0477ad36 100644 --- a/src/world/area_kpa/kpa_03/kpa_03_2_main.c +++ b/src/world/area_kpa/kpa_03/kpa_03_2_main.c @@ -22,7 +22,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_CreateDarkness)) diff --git a/src/world/area_kpa/kpa_08/kpa_08_2_main.c b/src/world/area_kpa/kpa_08/kpa_08_2_main.c index cef7470bc4..94f226df0e 100644 --- a/src/world/area_kpa/kpa_08/kpa_08_2_main.c +++ b/src/world/area_kpa/kpa_08/kpa_08_2_main.c @@ -30,7 +30,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_EnterMap)) diff --git a/src/world/area_kpa/kpa_09/kpa_09_2_main.c b/src/world/area_kpa/kpa_09/kpa_09_2_main.c index 1fc93861d4..f928f4b343 100644 --- a/src/world/area_kpa/kpa_09/kpa_09_2_main.c +++ b/src/world/area_kpa/kpa_09/kpa_09_2_main.c @@ -31,7 +31,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_kpa/kpa_10/kpa_10_2_main.c b/src/world/area_kpa/kpa_10/kpa_10_2_main.c index b8a79ad1c0..ca44616bf5 100644 --- a/src/world/area_kpa/kpa_10/kpa_10_2_main.c +++ b/src/world/area_kpa/kpa_10/kpa_10_2_main.c @@ -35,7 +35,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_EnterMap)) diff --git a/src/world/area_kpa/kpa_102/kpa_102_2_main.c b/src/world/area_kpa/kpa_102/kpa_102_2_main.c index cf4c34d182..ffc54432cb 100644 --- a/src/world/area_kpa/kpa_102/kpa_102_2_main.c +++ b/src/world/area_kpa/kpa_102/kpa_102_2_main.c @@ -33,7 +33,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) Exec(N(EVS_EnterMap)) Exec(N(EVS_SetupMusic)) diff --git a/src/world/area_kpa/kpa_11/kpa_11_2_main.c b/src/world/area_kpa/kpa_11/kpa_11_2_main.c index ff8de4e1b5..93e727c1cd 100644 --- a/src/world/area_kpa/kpa_11/kpa_11_2_main.c +++ b/src/world/area_kpa/kpa_11/kpa_11_2_main.c @@ -70,7 +70,7 @@ LavaReset N(SafeFloorColliders)[] = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(D_80240F84_A53844)) diff --git a/src/world/area_kpa/kpa_111/kpa_111_2_main.c b/src/world/area_kpa/kpa_111/kpa_111_2_main.c index 2173c4fb7f..acf1edb399 100644 --- a/src/world/area_kpa/kpa_111/kpa_111_2_main.c +++ b/src/world/area_kpa/kpa_111/kpa_111_2_main.c @@ -31,7 +31,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupStatues)) diff --git a/src/world/area_kpa/kpa_112/kpa_112_2_main.c b/src/world/area_kpa/kpa_112/kpa_112_2_main.c index 251a5efc35..fde0e5f9f0 100644 --- a/src/world/area_kpa/kpa_112/kpa_112_2_main.c +++ b/src/world/area_kpa/kpa_112/kpa_112_2_main.c @@ -14,7 +14,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Exec(N(EVS_SetupMusic)) Set(LVar0, Ref(N(EVS_BindExitTriggers))) Exec(EnterWalk) diff --git a/src/world/area_kpa/kpa_113/kpa_113_2_main.c b/src/world/area_kpa/kpa_113/kpa_113_2_main.c index fea1b070c1..d26e7bad6b 100644 --- a/src/world/area_kpa/kpa_113/kpa_113_2_main.c +++ b/src/world/area_kpa/kpa_113/kpa_113_2_main.c @@ -34,7 +34,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupStatues)) diff --git a/src/world/area_kpa/kpa_114/kpa_114_2_main.c b/src/world/area_kpa/kpa_114/kpa_114_2_main.c index baf2bb889b..b2b6b36d44 100644 --- a/src/world/area_kpa/kpa_114/kpa_114_2_main.c +++ b/src/world/area_kpa/kpa_114/kpa_114_2_main.c @@ -34,7 +34,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupMusic)) Exec(N(EVS_EnterMap)) diff --git a/src/world/area_kpa/kpa_115/kpa_115_2_main.c b/src/world/area_kpa/kpa_115/kpa_115_2_main.c index 6d8ef4817d..42a2528e46 100644 --- a/src/world/area_kpa/kpa_115/kpa_115_2_main.c +++ b/src/world/area_kpa/kpa_115/kpa_115_2_main.c @@ -15,7 +15,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) Exec(N(EVS_SetupStatues)) Set(LVar0, Ref(N(EVS_BindExitTriggers))) diff --git a/src/world/area_kpa/kpa_116/kpa_116_2_main.c b/src/world/area_kpa/kpa_116/kpa_116_2_main.c index 953e79d7b3..87e8d68a9d 100644 --- a/src/world/area_kpa/kpa_116/kpa_116_2_main.c +++ b/src/world/area_kpa/kpa_116/kpa_116_2_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(LVar0, Ref(N(EVS_BindExitTriggers))) Exec(EnterWalk) Wait(1) diff --git a/src/world/area_kpa/kpa_118/kpa_118_2_main.c b/src/world/area_kpa/kpa_118/kpa_118_2_main.c index 0a88aedc00..0a72a2667a 100644 --- a/src/world/area_kpa/kpa_118/kpa_118_2_main.c +++ b/src/world/area_kpa/kpa_118/kpa_118_2_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(LVar0, Ref(N(EVS_BindExitTriggers))) Exec(EnterWalk) Wait(1) diff --git a/src/world/area_kpa/kpa_12/kpa_12_2_main.c b/src/world/area_kpa/kpa_12/kpa_12_2_main.c index 0891220497..3ffa1124f0 100644 --- a/src/world/area_kpa/kpa_12/kpa_12_2_main.c +++ b/src/world/area_kpa/kpa_12/kpa_12_2_main.c @@ -73,7 +73,7 @@ LavaReset N(SafeFloorColliders)[] = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() IfEq(GF_KPA16_ShutOffLava, FALSE) Call(EnableGroup, MODEL_after, FALSE) Exec(N(EVS_TexPan_Lava)) diff --git a/src/world/area_kpa/kpa_13/kpa_13_2_main.c b/src/world/area_kpa/kpa_13/kpa_13_2_main.c index a422005b6e..ab2f25f229 100644 --- a/src/world/area_kpa/kpa_13/kpa_13_2_main.c +++ b/src/world/area_kpa/kpa_13/kpa_13_2_main.c @@ -49,7 +49,7 @@ LavaReset N(SafeFloorColliders)[] = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() ExecWait(N(EVS_MakeEntities)) IfEq(GF_KPA16_ShutOffLava, FALSE) Call(EnableGroup, MODEL_after, FALSE) diff --git a/src/world/area_kpa/kpa_130/kpa_130_2_main.c b/src/world/area_kpa/kpa_130/kpa_130_2_main.c index 8a3f7ae335..821a431174 100644 --- a/src/world/area_kpa/kpa_130/kpa_130_2_main.c +++ b/src/world/area_kpa/kpa_130/kpa_130_2_main.c @@ -33,7 +33,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) Exec(N(EVS_EnterMap)) diff --git a/src/world/area_kpa/kpa_133/kpa_133_2_main.c b/src/world/area_kpa/kpa_133/kpa_133_2_main.c index 6d67a364a9..54298bab27 100644 --- a/src/world/area_kpa/kpa_133/kpa_133_2_main.c +++ b/src/world/area_kpa/kpa_133/kpa_133_2_main.c @@ -69,7 +69,7 @@ EvtScript N(EVS_BlastWall) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) IfEq(GF_KPA133_Item_BombedWall, FALSE) diff --git a/src/world/area_kpa/kpa_134/kpa_134_2_main.c b/src/world/area_kpa/kpa_134/kpa_134_2_main.c index 5ddfc6f0df..c797d9d474 100644 --- a/src/world/area_kpa/kpa_134/kpa_134_2_main.c +++ b/src/world/area_kpa/kpa_134/kpa_134_2_main.c @@ -42,7 +42,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupChains)) diff --git a/src/world/area_kpa/kpa_14/kpa_14_2_main.c b/src/world/area_kpa/kpa_14/kpa_14_2_main.c index 7d6b6f357c..d54528986e 100644 --- a/src/world/area_kpa/kpa_14/kpa_14_2_main.c +++ b/src/world/area_kpa/kpa_14/kpa_14_2_main.c @@ -214,7 +214,7 @@ EvtScript N(EVS_SetupLavaFall) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() ExecWait(N(EVS_MakeEntities)) IfEq(GF_KPA16_ShutOffLava, FALSE) Call(EnableGroup, MODEL_after, FALSE) diff --git a/src/world/area_kpa/kpa_15/kpa_15_2_main.c b/src/world/area_kpa/kpa_15/kpa_15_2_main.c index 0926b4f3f0..b4a340c11d 100644 --- a/src/world/area_kpa/kpa_15/kpa_15_2_main.c +++ b/src/world/area_kpa/kpa_15/kpa_15_2_main.c @@ -35,7 +35,7 @@ EvtScript N(D_80240800_A59B90) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() ExecWait(N(EVS_MakeEntities)) IfEq(GF_KPA16_ShutOffLava, FALSE) Call(EnableGroup, MODEL_after, FALSE) diff --git a/src/world/area_kpa/kpa_16/kpa_16_2_main.c b/src/world/area_kpa/kpa_16/kpa_16_2_main.c index ceb066aeb7..9c9b887400 100644 --- a/src/world/area_kpa/kpa_16/kpa_16_2_main.c +++ b/src/world/area_kpa/kpa_16/kpa_16_2_main.c @@ -108,7 +108,7 @@ LavaReset N(SafeFloorColliders)[] = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() IfEq(GF_KPA16_Defeated_SwitchGuards, TRUE) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o958, COLLIDER_FLAGS_UPPER_MASK) EndIf diff --git a/src/world/area_kpa/kpa_40/kpa_40_2_main.c b/src/world/area_kpa/kpa_40/kpa_40_2_main.c index 368f07af6d..9905c1c0ac 100644 --- a/src/world/area_kpa/kpa_40/kpa_40_2_main.c +++ b/src/world/area_kpa/kpa_40/kpa_40_2_main.c @@ -43,7 +43,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Exec(N(EVS_EnterMap)) Wait(1) Exec(N(EVS_SetupMusic)) diff --git a/src/world/area_kpa/kpa_41/kpa_41_2_main.c b/src/world/area_kpa/kpa_41/kpa_41_2_main.c index 38edc20625..9e312f9d28 100644 --- a/src/world/area_kpa/kpa_41/kpa_41_2_main.c +++ b/src/world/area_kpa/kpa_41/kpa_41_2_main.c @@ -75,7 +75,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Exec(N(EVS_EnterMap)) Exec(N(EVS_SetupMusic)) Return diff --git a/src/world/area_kpa/kpa_50/kpa_50_2_main.c b/src/world/area_kpa/kpa_50/kpa_50_2_main.c index 99f3246e79..3f6b395ffc 100644 --- a/src/world/area_kpa/kpa_50/kpa_50_2_main.c +++ b/src/world/area_kpa/kpa_50/kpa_50_2_main.c @@ -30,7 +30,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) Call(SetGroupVisibility, MODEL_dw1, MODEL_GROUP_HIDDEN) Call(SetGroupVisibility, MODEL_dw2, MODEL_GROUP_HIDDEN) diff --git a/src/world/area_kpa/kpa_51/kpa_51_2_main.c b/src/world/area_kpa/kpa_51/kpa_51_2_main.c index 8d770085b8..2504d71b11 100644 --- a/src/world/area_kpa/kpa_51/kpa_51_2_main.c +++ b/src/world/area_kpa/kpa_51/kpa_51_2_main.c @@ -40,7 +40,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_kpa/kpa_52/kpa_52_3_main.c b/src/world/area_kpa/kpa_52/kpa_52_3_main.c index 4e22059468..7ebe31824f 100644 --- a/src/world/area_kpa/kpa_52/kpa_52_3_main.c +++ b/src/world/area_kpa/kpa_52/kpa_52_3_main.c @@ -43,7 +43,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_EnterMap)) diff --git a/src/world/area_kpa/kpa_61/kpa_61_2_main.c b/src/world/area_kpa/kpa_61/kpa_61_2_main.c index d518989c51..95c0106c2a 100644 --- a/src/world/area_kpa/kpa_61/kpa_61_2_main.c +++ b/src/world/area_kpa/kpa_61/kpa_61_2_main.c @@ -72,7 +72,7 @@ EvtScript N(EVS_TexPan_Clouds) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_EnterMap)) diff --git a/src/world/area_kpa/kpa_70/kpa_70_2_main.c b/src/world/area_kpa/kpa_70/kpa_70_2_main.c index 20815015f2..a99395eacd 100644 --- a/src/world/area_kpa/kpa_70/kpa_70_2_main.c +++ b/src/world/area_kpa/kpa_70/kpa_70_2_main.c @@ -74,7 +74,7 @@ EvtScript N(EVS_Update_Gears) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) Call(InitAnimatedModels) Exec(N(EVS_SetupChainDrive)) diff --git a/src/world/area_kpa/kpa_90/kpa_90_2_main.c b/src/world/area_kpa/kpa_90/kpa_90_2_main.c index 61d3f63c4e..d55e999000 100644 --- a/src/world/area_kpa/kpa_90/kpa_90_2_main.c +++ b/src/world/area_kpa/kpa_90/kpa_90_2_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(LVar0, Ref(N(EVS_BindExitTriggers))) Exec(EnterWalk) Wait(1) diff --git a/src/world/area_kpa/kpa_94/kpa_94_2_main.c b/src/world/area_kpa/kpa_94/kpa_94_2_main.c index 6574e07609..52584c500e 100644 --- a/src/world/area_kpa/kpa_94/kpa_94_2_main.c +++ b/src/world/area_kpa/kpa_94/kpa_94_2_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitte, COLLIDER_FLAGS_UPPER_MASK) Call(EnableModel, MODEL_o340, FALSE) Set(LVar0, Ref(N(EVS_BindExitTriggers))) diff --git a/src/world/area_kzn/kzn_01/kzn_01_1_main.c b/src/world/area_kzn/kzn_01/kzn_01_1_main.c index d98dcfbb63..7d22ed0e5b 100644 --- a/src/world/area_kzn/kzn_01/kzn_01_1_main.c +++ b/src/world/area_kzn/kzn_01/kzn_01_1_main.c @@ -15,7 +15,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_LAVALAVA) Call(SetSpriteShading, SHADING_KZN_01) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(GF_MAP_MtLavalava, TRUE) IfLt(GB_StoryProgress, STORY_CH5_ENTERED_MT_LAVA_LAVA) Set(GB_StoryProgress, STORY_CH5_ENTERED_MT_LAVA_LAVA) diff --git a/src/world/area_kzn/kzn_02/kzn_02_1_main.c b/src/world/area_kzn/kzn_02/kzn_02_1_main.c index cbc7230c35..4d1f914ea7 100644 --- a/src/world/area_kzn/kzn_02/kzn_02_1_main.c +++ b/src/world/area_kzn/kzn_02/kzn_02_1_main.c @@ -99,7 +99,7 @@ LavaReset N(SafeFloorColliders)[] = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_LAVALAVA) Call(SetSpriteShading, SHADING_KZN_02) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o112, SURFACE_TYPE_LAVA) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o217, SURFACE_TYPE_LAVA) diff --git a/src/world/area_kzn/kzn_03/kzn_03_1_main.c b/src/world/area_kzn/kzn_03/kzn_03_1_main.c index ee0af7b1ee..32ca55eee2 100644 --- a/src/world/area_kzn/kzn_03/kzn_03_1_main.c +++ b/src/world/area_kzn/kzn_03/kzn_03_1_main.c @@ -55,7 +55,7 @@ EvtScript N(EVS_StartTexPanners_Lava) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_LAVALAVA) Call(SetSpriteShading, SHADING_KZN_03) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Call(GetLoadType, LVar1) diff --git a/src/world/area_kzn/kzn_04/kzn_04_1_main.c b/src/world/area_kzn/kzn_04/kzn_04_1_main.c index 8c3ad38450..ab80dcf9b3 100644 --- a/src/world/area_kzn/kzn_04/kzn_04_1_main.c +++ b/src/world/area_kzn/kzn_04/kzn_04_1_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_LAVALAVA) Call(SetSpriteShading, SHADING_KZN_04) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Set(LVar0, Ref(N(EVS_BindExitTriggers))) diff --git a/src/world/area_kzn/kzn_05/kzn_05_1_main.c b/src/world/area_kzn/kzn_05/kzn_05_1_main.c index d2be35c22f..34c17416cf 100644 --- a/src/world/area_kzn/kzn_05/kzn_05_1_main.c +++ b/src/world/area_kzn/kzn_05/kzn_05_1_main.c @@ -15,7 +15,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_LAVALAVA) Call(SetSpriteShading, SHADING_KZN_05) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(LVar0, Ref(N(EVS_BindExitTriggers))) Exec(EnterWalk) Wait(1) diff --git a/src/world/area_kzn/kzn_06/kzn_06_1_main.c b/src/world/area_kzn/kzn_06/kzn_06_1_main.c index 4fa91e8f70..084e45dd37 100644 --- a/src/world/area_kzn/kzn_06/kzn_06_1_main.c +++ b/src/world/area_kzn/kzn_06/kzn_06_1_main.c @@ -52,7 +52,7 @@ LavaReset N(SafeFloorColliders)[] = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_LAVALAVA) Call(SetSpriteShading, SHADING_KZN_06) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(GF_KZN06_Visited, TRUE) ExecWait(N(EVS_MakeEntities)) Call(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) diff --git a/src/world/area_kzn/kzn_08/kzn_08_1_main.c b/src/world/area_kzn/kzn_08/kzn_08_1_main.c index a9f843022a..3ab878eca4 100644 --- a/src/world/area_kzn/kzn_08/kzn_08_1_main.c +++ b/src/world/area_kzn/kzn_08/kzn_08_1_main.c @@ -141,7 +141,7 @@ EvtScript N(EVS_AnimateLavaScale) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_LAVALAVA) Call(SetSpriteShading, SHADING_KZN_08) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Call(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) diff --git a/src/world/area_kzn/kzn_09/kzn_09_1_main.c b/src/world/area_kzn/kzn_09/kzn_09_1_main.c index 10afb8b433..e05427e8b5 100644 --- a/src/world/area_kzn/kzn_09/kzn_09_1_main.c +++ b/src/world/area_kzn/kzn_09/kzn_09_1_main.c @@ -15,7 +15,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_LAVALAVA) Call(SetSpriteShading, SHADING_KZN_09) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Call(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) diff --git a/src/world/area_kzn/kzn_10/kzn_10_1_main.c b/src/world/area_kzn/kzn_10/kzn_10_1_main.c index c16381a288..1271115cd4 100644 --- a/src/world/area_kzn/kzn_10/kzn_10_1_main.c +++ b/src/world/area_kzn/kzn_10/kzn_10_1_main.c @@ -23,7 +23,7 @@ API_CALLABLE(N(func_8024030C_C7E48C)) { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_LAVALAVA) Call(SetSpriteShading, SHADING_KZN_10) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Thread Call(GetEntryID, LVar0) IfEq(LVar0, kzn_10_ENTRY_0) diff --git a/src/world/area_kzn/kzn_11/kzn_11_1_main.c b/src/world/area_kzn/kzn_11/kzn_11_1_main.c index 8e09b7f341..a01926b545 100644 --- a/src/world/area_kzn/kzn_11/kzn_11_1_main.c +++ b/src/world/area_kzn/kzn_11/kzn_11_1_main.c @@ -55,7 +55,7 @@ LavaReset N(SafeFloorColliders)[] = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_LAVALAVA) Call(SetSpriteShading, SHADING_KZN_11) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() 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_18/kzn_18_1_main.c b/src/world/area_kzn/kzn_18/kzn_18_1_main.c index cf1e55e603..0b83900dff 100644 --- a/src/world/area_kzn/kzn_18/kzn_18_1_main.c +++ b/src/world/area_kzn/kzn_18/kzn_18_1_main.c @@ -72,7 +72,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_LAVALAVA) Call(SetSpriteShading, SHADING_KZN_18) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_EnterMap)) diff --git a/src/world/area_kzn/kzn_19/kzn_19_2_main.c b/src/world/area_kzn/kzn_19/kzn_19_2_main.c index 6513901d10..f0021c9f3b 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_2_main.c +++ b/src/world/area_kzn/kzn_19/kzn_19_2_main.c @@ -171,7 +171,7 @@ EvtScript N(EVS_UpdateLavaWaves) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_LAVALAVA) Call(SetSpriteShading, SHADING_KZN_19) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(GetEntryID, LVar0) IfEq(LVar0, kzn_19_ENTRY_3) Call(MakeNpcs, TRUE, Ref(N(EscapeNPCs))) diff --git a/src/world/area_kzn/kzn_22/kzn_22_2_main.c b/src/world/area_kzn/kzn_22/kzn_22_2_main.c index 0eb2262ff3..e3b97e4679 100644 --- a/src/world/area_kzn/kzn_22/kzn_22_2_main.c +++ b/src/world/area_kzn/kzn_22/kzn_22_2_main.c @@ -139,7 +139,7 @@ LavaReset N(SafeFloorColliders)[] = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_LAVALAVA) Call(SetSpriteShading, SHADING_KZN_22) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Set(LVar0, N(EVS_BindExitTriggers)) diff --git a/src/world/area_kzn/kzn_23/kzn_23_2_main.c b/src/world/area_kzn/kzn_23/kzn_23_2_main.c index f27d0b15e3..8e60aa1654 100644 --- a/src/world/area_kzn/kzn_23/kzn_23_2_main.c +++ b/src/world/area_kzn/kzn_23/kzn_23_2_main.c @@ -63,7 +63,7 @@ EvtScript N(EVS_RaiseLava) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_LAVALAVA) Call(SetSpriteShading, SHADING_KZN_23) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) Exec(N(EVS_SetupMusic)) Exec(N(EVS_RaiseLava)) diff --git a/src/world/area_mac/mac_06/mac_06_1_main.c b/src/world/area_mac/mac_06/mac_06_1_main.c index 6c1cfd2b85..56c6f6a303 100644 --- a/src/world/area_mac/mac_06/mac_06_1_main.c +++ b/src/world/area_mac/mac_06/mac_06_1_main.c @@ -48,7 +48,7 @@ EvtScript N(EVS_AnimateWaves) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_TOAD_TOWN) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) Exec(N(EVS_FlyingGull)) Exec(N(EVS_WhaleMain)) diff --git a/src/world/area_mac/machi/machi_2_main.c b/src/world/area_mac/machi/machi_2_main.c index 29443c061c..7bb3c62dc3 100644 --- a/src/world/area_mac/machi/machi_2_main.c +++ b/src/world/area_mac/machi/machi_2_main.c @@ -62,7 +62,7 @@ EvtScript N(EVS_GotoMap_jan_00_0) = { EvtScript N(EVS_Main) = { Call(N(CheckGameVarRanges)) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() ExecWait(N(EVS_MakeEntities)) BindTrigger(Ref(N(EVS_GotoMap_kmr_09_1)), TRIGGER_WALL_PUSH, COLLIDER_deilitn, 1, 0) BindTrigger(Ref(N(EVS_GotoMap_nok_10_0)), TRIGGER_WALL_PUSH, COLLIDER_deilitne, 1, 0) diff --git a/src/world/area_mim/mim_10/mim_10_3_main.c b/src/world/area_mim/mim_10/mim_10_3_main.c index abc1575b74..3ed65c8204 100644 --- a/src/world/area_mim/mim_10/mim_10_3_main.c +++ b/src/world/area_mim/mim_10/mim_10_3_main.c @@ -44,7 +44,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_TOAD_TOWN) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) Exec(N(EVS_SetupBootlerTrigger)) ExecWait(N(EVS_MakeEntities)) diff --git a/src/world/area_nok/nok_03/nok_03_2_main.c b/src/world/area_nok/nok_03/nok_03_2_main.c index cc3867b1f9..c794915e8a 100644 --- a/src/world/area_nok/nok_03/nok_03_2_main.c +++ b/src/world/area_nok/nok_03/nok_03_2_main.c @@ -60,7 +60,7 @@ EvtScript N(EVS_TexPan_Water) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_KOOPA_VILLAGE) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() IfLt(GB_StoryProgress, STORY_CH1_KOOPER_JOINED_PARTY) Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) EndIf diff --git a/src/world/area_nok/nok_11/nok_11_2_main.c b/src/world/area_nok/nok_11/nok_11_2_main.c index 80e35b153a..3b2017a6be 100644 --- a/src/world/area_nok/nok_11/nok_11_2_main.c +++ b/src/world/area_nok/nok_11/nok_11_2_main.c @@ -80,7 +80,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_PLEASANT_PATH) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(GF_MAP_PleasantPath, TRUE) IfEq(GB_StoryProgress, STORY_CH1_STAR_SPRIT_DEPARTED) Call(MakeNpcs, FALSE, Ref(N(JrTroopaNPCs))) diff --git a/src/world/area_nok/nok_12/nok_12_2_main.c b/src/world/area_nok/nok_12/nok_12_2_main.c index c05a14fd97..d9023db040 100644 --- a/src/world/area_nok/nok_12/nok_12_2_main.c +++ b/src/world/area_nok/nok_12/nok_12_2_main.c @@ -117,7 +117,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_PLEASANT_PATH) Call(SetSpriteShading, SHADING_NONE) Set(AF_NOK12_HitSwitch, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(GetDemoState, LVar0) IfEq(LVar0, DEMO_STATE_NONE) Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) diff --git a/src/world/area_nok/nok_14/nok_14_2_main.c b/src/world/area_nok/nok_14/nok_14_2_main.c index 612b333a7a..06c41dae0b 100644 --- a/src/world/area_nok/nok_14/nok_14_2_main.c +++ b/src/world/area_nok/nok_14/nok_14_2_main.c @@ -111,7 +111,7 @@ EvtScript N(EVS_UpdateEnounterStages) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_PLEASANT_PATH) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_TexPan_Flowers)) diff --git a/src/world/area_nok/nok_15/nok_15_2_main.c b/src/world/area_nok/nok_15/nok_15_2_main.c index 3af5b598a5..b474dea927 100644 --- a/src/world/area_nok/nok_15/nok_15_2_main.c +++ b/src/world/area_nok/nok_15/nok_15_2_main.c @@ -98,7 +98,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_PLEASANT_PATH) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupFoliage)) diff --git a/src/world/area_omo/omo_02/omo_02_2_main.c b/src/world/area_omo/omo_02/omo_02_2_main.c index 6d01634ed8..7c89772a21 100644 --- a/src/world/area_omo/omo_02/omo_02_2_main.c +++ b/src/world/area_omo/omo_02/omo_02_2_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) ExecWait(N(EVS_SetupGizmos)) diff --git a/src/world/area_omo/omo_04/omo_04_2_main.c b/src/world/area_omo/omo_04/omo_04_2_main.c index c563fd5730..b152bcbb37 100644 --- a/src/world/area_omo/omo_04/omo_04_2_main.c +++ b/src/world/area_omo/omo_04/omo_04_2_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() IfEq(GF_OMO04_SpawnedPeachChoice1, FALSE) Call(MakeNpcs, TRUE, Ref(N(KammySceneNPCs))) Else diff --git a/src/world/area_omo/omo_05/omo_05_2_main.c b/src/world/area_omo/omo_05/omo_05_2_main.c index 4b6e2c8dbe..aabe3adbbc 100644 --- a/src/world/area_omo/omo_05/omo_05_2_main.c +++ b/src/world/area_omo/omo_05/omo_05_2_main.c @@ -15,7 +15,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) ExecWait(N(EVS_SetupGizmos)) diff --git a/src/world/area_omo/omo_07/omo_07_2_main.c b/src/world/area_omo/omo_07/omo_07_2_main.c index 709f485460..22d719819d 100644 --- a/src/world/area_omo/omo_07/omo_07_2_main.c +++ b/src/world/area_omo/omo_07/omo_07_2_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() IfEq(GF_OMO07_SpawnedPeachChoice2, FALSE) Call(MakeNpcs, TRUE, Ref(N(KammySceneNPCs))) Else diff --git a/src/world/area_omo/omo_09/omo_09_2_main.c b/src/world/area_omo/omo_09/omo_09_2_main.c index e4e9fe2a2f..ad928d290e 100644 --- a/src/world/area_omo/omo_09/omo_09_2_main.c +++ b/src/world/area_omo/omo_09/omo_09_2_main.c @@ -16,7 +16,7 @@ EvtScript N(EVS_Main) = { Set(GF_OMO09_SpawnedPeachChoice3, TRUE) EndIf Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() #if VERSION_PAL Call(GetLanguage, LVar0) IfEq(LVar0, LANGUAGE_ES) diff --git a/src/world/area_omo/omo_11/omo_11_2_main.c b/src/world/area_omo/omo_11/omo_11_2_main.c index 58cea24aa4..ec3368528c 100644 --- a/src/world/area_omo/omo_11/omo_11_2_main.c +++ b/src/world/area_omo/omo_11/omo_11_2_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) ExecWait(N(EVS_SetupMusic)) diff --git a/src/world/area_omo/omo_13/omo_13_2_main.c b/src/world/area_omo/omo_13/omo_13_2_main.c index a14c787dc0..af1064f648 100644 --- a/src/world/area_omo/omo_13/omo_13_2_main.c +++ b/src/world/area_omo/omo_13/omo_13_2_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() IfEq(GF_OMO13_Defeated_AntiGuy, TRUE) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_he, COLLIDER_FLAGS_UPPER_MASK) EndIf diff --git a/src/world/area_omo/omo_16/omo_16_1_main.c b/src/world/area_omo/omo_16/omo_16_1_main.c index c8bfc8c28c..b163c64707 100644 --- a/src/world/area_omo/omo_16/omo_16_1_main.c +++ b/src/world/area_omo/omo_16/omo_16_1_main.c @@ -3,7 +3,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) Call(SetMusicTrack, 0, SONG_TOYBOX_TRAIN, 0, 8) ExecWait(N(EVS_802429C4)) diff --git a/src/world/area_omo/omo_17/omo_17_1_main.c b/src/world/area_omo/omo_17/omo_17_1_main.c index aa2651c20b..29fcc148f5 100644 --- a/src/world/area_omo/omo_17/omo_17_1_main.c +++ b/src/world/area_omo/omo_17/omo_17_1_main.c @@ -17,7 +17,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) ExecWait(N(EVS_SetupGizmos)) diff --git a/src/world/area_sam/sam_03/sam_03_2_main.c b/src/world/area_sam/sam_03/sam_03_2_main.c index e9cb185e89..45e19faf68 100644 --- a/src/world/area_sam/sam_03/sam_03_2_main.c +++ b/src/world/area_sam/sam_03/sam_03_2_main.c @@ -14,7 +14,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_SHIVER_SNOWFIELD) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(GF_MAP_ShiverSnowfield, TRUE) Call(EnableModel, MODEL_o44, FALSE) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o44, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_sam/sam_05/sam_05_2_main.c b/src/world/area_sam/sam_05/sam_05_2_main.c index 5287c615cf..ae6f2ffd4e 100644 --- a/src/world/area_sam/sam_05/sam_05_2_main.c +++ b/src/world/area_sam/sam_05/sam_05_2_main.c @@ -14,7 +14,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_SHIVER_SNOWFIELD) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() IfLt(GB_StoryProgress, STORY_CH7_DEFEATED_MONSTAR) Call(MakeNpcs, FALSE, Ref(N(BeforeNPCs))) Else diff --git a/src/world/area_sam/sam_07/sam_07_2_main.c b/src/world/area_sam/sam_07/sam_07_2_main.c index db251b4493..45d7b099ac 100644 --- a/src/world/area_sam/sam_07/sam_07_2_main.c +++ b/src/world/area_sam/sam_07/sam_07_2_main.c @@ -26,7 +26,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_SHIVER_MOUNTAIN) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(GF_MAP_ShiverMountain, TRUE) Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) diff --git a/src/world/area_sam/sam_08/sam_08_2_main.c b/src/world/area_sam/sam_08/sam_08_2_main.c index 72da81e431..2b773714a4 100644 --- a/src/world/area_sam/sam_08/sam_08_2_main.c +++ b/src/world/area_sam/sam_08/sam_08_2_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_SHIVER_MOUNTAIN) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) ExecWait(N(EVS_SetupMusic)) diff --git a/src/world/area_sam/sam_09/sam_09_2_main.c b/src/world/area_sam/sam_09/sam_09_2_main.c index 2d158c6ce6..d0396c75f9 100644 --- a/src/world/area_sam/sam_09/sam_09_2_main.c +++ b/src/world/area_sam/sam_09/sam_09_2_main.c @@ -14,7 +14,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_SHIVER_MOUNTAIN) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() ExecWait(N(EVS_MakeEntities)) ExecWait(N(EVS_SetupMusic)) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_yuka, SURFACE_TYPE_SNOW) diff --git a/src/world/area_sam/sam_10/sam_10_2_main.c b/src/world/area_sam/sam_10/sam_10_2_main.c index 9e06c37c6b..abf6dfe0fc 100644 --- a/src/world/area_sam/sam_10/sam_10_2_main.c +++ b/src/world/area_sam/sam_10/sam_10_2_main.c @@ -34,7 +34,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_SHIVER_MOUNTAIN) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) ExecWait(N(EVS_SetupMusic)) diff --git a/src/world/area_trd/trd_09/trd_09_1_main.c b/src/world/area_trd/trd_09/trd_09_1_main.c index 7f7b327b42..619780ae47 100644 --- a/src/world/area_trd/trd_09/trd_09_1_main.c +++ b/src/world/area_trd/trd_09/trd_09_1_main.c @@ -47,7 +47,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_KOOPA_BROS_FORTRESS) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(GetDemoState, LVar0) IfNe(LVar0, DEMO_STATE_NONE) Call(MakeNpcs, TRUE, Ref(N(DemoNPCs))) diff --git a/src/world/area_tst/tst_01/tst_01_1_main.c b/src/world/area_tst/tst_01/tst_01_1_main.c index e7c7a90e91..95fb59c16e 100644 --- a/src/world/area_tst/tst_01/tst_01_1_main.c +++ b/src/world/area_tst/tst_01/tst_01_1_main.c @@ -41,7 +41,7 @@ EvtScript N(EVS_GotoMap_tst_02_0) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_TESTING) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() ExecWait(N(EVS_MakeEntities)) BindTrigger(Ref(N(EVS_GotoMap_machi_7)), TRIGGER_WALL_PUSH, COLLIDER_deilitw, 1, 0) BindTrigger(Ref(N(EVS_GotoMap_tst_02_0)), TRIGGER_WALL_PUSH, COLLIDER_deilite, 1, 0) diff --git a/src/world/area_tst/tst_02/tst_02_1_main.c b/src/world/area_tst/tst_02/tst_02_1_main.c index 138517cf3e..b4e5c2bae2 100644 --- a/src/world/area_tst/tst_02/tst_02_1_main.c +++ b/src/world/area_tst/tst_02/tst_02_1_main.c @@ -40,7 +40,7 @@ EvtScript N(EVS_GotoMap_tst_03_0) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_TESTING) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() ExecWait(N(EVS_MakeEntities)) BindTrigger(Ref(N(EVS_GotoMap_tst_01_1)), TRIGGER_WALL_PUSH, COLLIDER_deilitw, 1, 0) BindTrigger(Ref(N(EVS_GotoMap_tst_03_0)), TRIGGER_WALL_PUSH, COLLIDER_deilite, 1, 0) diff --git a/src/world/area_tst/tst_03/tst_03_1_main.c b/src/world/area_tst/tst_03/tst_03_1_main.c index 14ef2fc08e..248a7309c4 100644 --- a/src/world/area_tst/tst_03/tst_03_1_main.c +++ b/src/world/area_tst/tst_03/tst_03_1_main.c @@ -40,7 +40,7 @@ EvtScript N(EVS_GotoMap_tst_04_0) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_TESTING) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() ExecWait(N(EVS_MakeEntities)) BindTrigger(Ref(N(EVS_GotoMap_tst_02_1)), TRIGGER_WALL_PUSH, COLLIDER_deilitw, 1, 0) BindTrigger(Ref(N(EVS_GotoMap_tst_04_0)), TRIGGER_WALL_PUSH, COLLIDER_deilite, 1, 0) diff --git a/src/world/area_tst/tst_04/tst_04_1_main.c b/src/world/area_tst/tst_04/tst_04_1_main.c index a0ffa5dcf5..acbd4603a3 100644 --- a/src/world/area_tst/tst_04/tst_04_1_main.c +++ b/src/world/area_tst/tst_04/tst_04_1_main.c @@ -156,7 +156,7 @@ EvtScript N(EVS_UpdateSpinningWall) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_TESTING) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) BindTrigger(Ref(N(EVS_GotoMap_tst_03_1)), TRIGGER_WALL_PUSH, COLLIDER_deilitw, 1, 0) diff --git a/src/world/area_tst/tst_10/tst_10_1_main.c b/src/world/area_tst/tst_10/tst_10_1_main.c index 5e346a2b3a..ad8090e704 100644 --- a/src/world/area_tst/tst_10/tst_10_1_main.c +++ b/src/world/area_tst/tst_10/tst_10_1_main.c @@ -84,7 +84,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_TESTING) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() ExecWait(N(EVS_MakeEntities)) IfEq(AF_TST_00, TRUE) Call(SetZoneEnabled, ZONE_north, FALSE) diff --git a/src/world/area_tst/tst_11/tst_11_1_main.c b/src/world/area_tst/tst_11/tst_11_1_main.c index 23b3740a6d..2ea968b8ee 100644 --- a/src/world/area_tst/tst_11/tst_11_1_main.c +++ b/src/world/area_tst/tst_11/tst_11_1_main.c @@ -16,7 +16,7 @@ MapSettings N(settings) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_TESTING) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Exec(N(EVS_SetupReflections)) Return End diff --git a/src/world/area_tst/tst_12/tst_12_1_main.c b/src/world/area_tst/tst_12/tst_12_1_main.c index aa2163c4f2..7cf5ea281a 100644 --- a/src/world/area_tst/tst_12/tst_12_1_main.c +++ b/src/world/area_tst/tst_12/tst_12_1_main.c @@ -58,7 +58,7 @@ EvtScript N(D_80240050_B1D340) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_TESTING) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o92, SURFACE_TYPE_FLOWERS) Set(LVar0, 544) Set(LVar1, 0) diff --git a/src/world/area_tst/tst_20/tst_20_1_main.c b/src/world/area_tst/tst_20/tst_20_1_main.c index 589d28e757..9fa9790ecb 100644 --- a/src/world/area_tst/tst_20/tst_20_1_main.c +++ b/src/world/area_tst/tst_20/tst_20_1_main.c @@ -15,7 +15,7 @@ MapSettings N(settings) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_TESTING) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Return End }; diff --git a/src/world/dead/area_flo/flo_00/flo_00_2_main.c b/src/world/dead/area_flo/flo_00/flo_00_2_main.c index 9a5b2e3689..745113ec91 100644 --- a/src/world/dead/area_flo/flo_00/flo_00_2_main.c +++ b/src/world/dead/area_flo/flo_00/flo_00_2_main.c @@ -146,7 +146,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(GF_MAP_FlowerFields, TRUE) IfLt(GB_StoryProgress, STORY_CH6_GREW_MAGIC_BEANSTALK) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o351, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/dead/area_flo/flo_03/flo_03_2_main.c b/src/world/dead/area_flo/flo_03/flo_03_2_main.c index 1d9923491b..121c8b3af0 100644 --- a/src/world/dead/area_flo/flo_03/flo_03_2_main.c +++ b/src/world/dead/area_flo/flo_03/flo_03_2_main.c @@ -22,7 +22,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(AF_FLO_TreeDrop_RedBerry1, FALSE) Set(AF_FLO_TreeDrop_RedBerry2, FALSE) Set(AB_FLO_PetuniaDialogue, 0) diff --git a/src/world/dead/area_flo/flo_07/flo_07_2_main.c b/src/world/dead/area_flo/flo_07/flo_07_2_main.c index 0cda123c21..7537db10b6 100644 --- a/src/world/dead/area_flo/flo_07/flo_07_2_main.c +++ b/src/world/dead/area_flo/flo_07/flo_07_2_main.c @@ -30,7 +30,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(AF_FLO_MadeCrystalBerry, FALSE) Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_SetupFoliage)) diff --git a/src/world/dead/area_flo/flo_08/flo_08_3_main.c b/src/world/dead/area_flo/flo_08/flo_08_3_main.c index 397bf3f9d8..170fb456d7 100644 --- a/src/world/dead/area_flo/flo_08/flo_08_3_main.c +++ b/src/world/dead/area_flo/flo_08/flo_08_3_main.c @@ -29,7 +29,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupVines)) diff --git a/src/world/dead/area_flo/flo_09/flo_09_2_main.c b/src/world/dead/area_flo/flo_09/flo_09_2_main.c index 4dbb8dda2d..07e7b3ea92 100644 --- a/src/world/dead/area_flo/flo_09/flo_09_2_main.c +++ b/src/world/dead/area_flo/flo_09/flo_09_2_main.c @@ -21,7 +21,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) Exec(N(EVS_SetupVines)) Exec(N(EVS_SetupFoliage)) diff --git a/src/world/dead/area_flo/flo_10/flo_10_3_main.c b/src/world/dead/area_flo/flo_10/flo_10_3_main.c index b8f68b4c54..d68e33472d 100644 --- a/src/world/dead/area_flo/flo_10/flo_10_3_main.c +++ b/src/world/dead/area_flo/flo_10/flo_10_3_main.c @@ -20,7 +20,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupFoliage)) diff --git a/src/world/dead/area_flo/flo_11/flo_11_2_main.c b/src/world/dead/area_flo/flo_11/flo_11_2_main.c index 6eaa1a4166..73df110d8c 100644 --- a/src/world/dead/area_flo/flo_11/flo_11_2_main.c +++ b/src/world/dead/area_flo/flo_11/flo_11_2_main.c @@ -63,7 +63,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(func_80044238, 7) Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) diff --git a/src/world/dead/area_flo/flo_12/flo_12_2_main.c b/src/world/dead/area_flo/flo_12/flo_12_2_main.c index 329ff393f9..4f8871fdfe 100644 --- a/src/world/dead/area_flo/flo_12/flo_12_2_main.c +++ b/src/world/dead/area_flo/flo_12/flo_12_2_main.c @@ -20,7 +20,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(AF_FLO_GivenCrystalBerry, FALSE) Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o180, SURFACE_TYPE_FLOWERS) diff --git a/src/world/dead/area_flo/flo_13/flo_13_3_main.c b/src/world/dead/area_flo/flo_13/flo_13_3_main.c index 02fc22d2ad..1154a9bcb6 100644 --- a/src/world/dead/area_flo/flo_13/flo_13_3_main.c +++ b/src/world/dead/area_flo/flo_13/flo_13_3_main.c @@ -21,7 +21,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o48, SURFACE_TYPE_FLOWERS) diff --git a/src/world/dead/area_flo/flo_14/flo_14_2_main.c b/src/world/dead/area_flo/flo_14/flo_14_2_main.c index ec6e2d4102..b1aae776cb 100644 --- a/src/world/dead/area_flo/flo_14/flo_14_2_main.c +++ b/src/world/dead/area_flo/flo_14/flo_14_2_main.c @@ -36,7 +36,7 @@ LavaReset N(SafeFloorColliders)[] = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) Exec(N(EVS_MakeEntities)) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o114, SURFACE_TYPE_SPIKES) diff --git a/src/world/dead/area_flo/flo_15/flo_15_2_main.c b/src/world/dead/area_flo/flo_15/flo_15_2_main.c index 94a9de2f22..70c0af8b2c 100644 --- a/src/world/dead/area_flo/flo_15/flo_15_2_main.c +++ b/src/world/dead/area_flo/flo_15/flo_15_2_main.c @@ -12,7 +12,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Call(GetEntryID, LVar0) diff --git a/src/world/dead/area_flo/flo_16/flo_16_2_main.c b/src/world/dead/area_flo/flo_16/flo_16_2_main.c index 8cf53b87d7..c4e311c5fd 100644 --- a/src/world/dead/area_flo/flo_16/flo_16_2_main.c +++ b/src/world/dead/area_flo/flo_16/flo_16_2_main.c @@ -25,7 +25,7 @@ LavaReset N(SafeFloorColliders)[] = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupVines)) diff --git a/src/world/dead/area_flo/flo_17/flo_17_2_main.c b/src/world/dead/area_flo/flo_17/flo_17_2_main.c index 999ce583bc..f008fb92d5 100644 --- a/src/world/dead/area_flo/flo_17/flo_17_2_main.c +++ b/src/world/dead/area_flo/flo_17/flo_17_2_main.c @@ -44,7 +44,7 @@ LavaReset N(SafeFloorColliders)[] = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_SetupLogBridges)) diff --git a/src/world/dead/area_flo/flo_18/flo_18_2_main.c b/src/world/dead/area_flo/flo_18/flo_18_2_main.c index 607467b709..de0d0f4656 100644 --- a/src/world/dead/area_flo/flo_18/flo_18_2_main.c +++ b/src/world/dead/area_flo/flo_18/flo_18_2_main.c @@ -27,7 +27,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_FLOWER_FIELDS) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, FALSE, Ref(N(DefaultNPCs))) Exec(N(EVS_SetupFoliage)) Exec(N(EVS_SetupMachine)) diff --git a/src/world/dead/area_flo/flo_19/flo_19_3_main.c b/src/world/dead/area_flo/flo_19/flo_19_3_main.c index cf699664ff..8ea9b7b6f4 100644 --- a/src/world/dead/area_flo/flo_19/flo_19_3_main.c +++ b/src/world/dead/area_flo/flo_19/flo_19_3_main.c @@ -28,7 +28,7 @@ EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_CLOUDY_CLIMB) Call(SetSpriteShading, SHADING_NONE) Call(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Set(GF_MAP_CloudyClimb, TRUE) ExecWait(N(EVS_MakeEntities)) Call(ParentColliderToModel, COLLIDER_o117, MODEL_o142) diff --git a/src/world/dead/area_kzn/kzn_11/kzn_11_1_main.c b/src/world/dead/area_kzn/kzn_11/kzn_11_1_main.c index 3ff38dedc7..d7062e29fa 100644 --- a/src/world/dead/area_kzn/kzn_11/kzn_11_1_main.c +++ b/src/world/dead/area_kzn/kzn_11/kzn_11_1_main.c @@ -55,7 +55,7 @@ LavaReset N(SafeFloorColliders)[] = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_LAVALAVA) Call(SetSpriteShading, SHADING_KZN_11) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) Call(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) Call(PlayAmbientSounds, AMBIENT_LAVA_1) diff --git a/src/world/dead/area_kzn/kzn_18/kzn_18_1_main.c b/src/world/dead/area_kzn/kzn_18/kzn_18_1_main.c index d8b9583eb3..857626c5f9 100644 --- a/src/world/dead/area_kzn/kzn_18/kzn_18_1_main.c +++ b/src/world/dead/area_kzn/kzn_18/kzn_18_1_main.c @@ -72,7 +72,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_LAVALAVA) Call(SetSpriteShading, SHADING_KZN_18) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Exec(N(EVS_EnterMap)) diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c b/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c index 7281c860b1..fbf65322fe 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c @@ -171,7 +171,7 @@ EvtScript N(EVS_UpdateLavaWaves) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_LAVALAVA) Call(SetSpriteShading, SHADING_KZN_19) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(GetEntryID, LVar0) IfEq(LVar0, kzn_19_ENTRY_3) Call(MakeNpcs, TRUE, Ref(N(EscapeNPCs))) diff --git a/src/world/dead/area_kzn/kzn_22/kzn_22_2_main.c b/src/world/dead/area_kzn/kzn_22/kzn_22_2_main.c index d0ac5f6405..51742217b1 100644 --- a/src/world/dead/area_kzn/kzn_22/kzn_22_2_main.c +++ b/src/world/dead/area_kzn/kzn_22/kzn_22_2_main.c @@ -139,7 +139,7 @@ LavaReset N(SafeFloorColliders)[] = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_LAVALAVA) Call(SetSpriteShading, SHADING_KZN_22) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) ExecWait(N(EVS_MakeEntities)) Set(LVar0, N(EVS_BindExitTriggers)) diff --git a/src/world/dead/area_kzn/kzn_23/kzn_23_2_main.c b/src/world/dead/area_kzn/kzn_23/kzn_23_2_main.c index 1fde0e765d..8482aebede 100644 --- a/src/world/dead/area_kzn/kzn_23/kzn_23_2_main.c +++ b/src/world/dead/area_kzn/kzn_23/kzn_23_2_main.c @@ -63,7 +63,7 @@ EvtScript N(EVS_RaiseLava) = { EvtScript N(EVS_Main) = { Set(GB_WorldLocation, LOCATION_MT_LAVALAVA) Call(SetSpriteShading, SHADING_KZN_23) - SetUP_CAMERA_DEFAULT() + EVT_SETUP_CAMERA_DEFAULT() Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) Exec(N(EVS_SetupMusic)) Exec(N(EVS_RaiseLava))