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

fix EVT_SETUP_CAMERA_DEFAULT (#1162)

Browse Source
This commit is contained in:
Alex Bates 2024-02-02 14:53:41 +00:00 committed by GitHub
parent 0d94b5ed7d
commit fd9593a7b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
165 changed files with 165 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/script_api/macros.h
View File

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

2
src/world/area_arn/arn_02/arn_02_2_main.c
View File

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

2
src/world/area_arn/arn_03/arn_03_2_main.c
View File

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

2
src/world/area_arn/arn_04/arn_04_2_main.c
View File

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

2
src/world/area_arn/arn_05/arn_05_2_main.c
View File

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

2
src/world/area_dgb/dgb_02/dgb_02_2_main.c
View File

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

2
src/world/area_dgb/dgb_03/dgb_03_2_main.c
View File

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

2
src/world/area_dgb/dgb_08/dgb_08_2_main.c
View File

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

2
src/world/area_dgb/dgb_09/dgb_09_2_main.c
View File

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

2
src/world/area_dgb/dgb_16/dgb_16_2_main.c
View File

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

2
src/world/area_flo/flo_00/flo_00_2_main.c
View File

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

2
src/world/area_flo/flo_03/flo_03_2_main.c
View File

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

2
src/world/area_flo/flo_07/flo_07_2_main.c
View File

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

2
src/world/area_flo/flo_08/flo_08_3_main.c
View File

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

2
src/world/area_flo/flo_09/flo_09_2_main.c
View File

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

2
src/world/area_flo/flo_10/flo_10_3_main.c
View File

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

2
src/world/area_flo/flo_11/flo_11_2_main.c
View File

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

2
src/world/area_flo/flo_12/flo_12_2_main.c
View File

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

2
src/world/area_flo/flo_13/flo_13_3_main.c
View File

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

2
src/world/area_flo/flo_14/flo_14_2_main.c
View File

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

2
src/world/area_flo/flo_15/flo_15_2_main.c
View File

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

2
src/world/area_flo/flo_16/flo_16_2_main.c
View File

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

2
src/world/area_flo/flo_17/flo_17_2_main.c
View File

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

2
src/world/area_flo/flo_18/flo_18_2_main.c
View File

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

2
src/world/area_flo/flo_19/flo_19_3_main.c
View File

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

2
src/world/area_flo/flo_21/flo_21_2_main.c
View File

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

2
src/world/area_flo/flo_22/flo_22_2_main.c
View File

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

2
src/world/area_flo/flo_23/flo_23_2_main.c
View File

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

2
src/world/area_flo/flo_24/flo_24_2_main.c
View File

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

2
src/world/area_flo/flo_25/flo_25_2_main.c
View File

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

2
src/world/area_hos/hos_00/hos_00_2_main.c
View File

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

2
src/world/area_hos/hos_02/hos_02_2_main.c
View File

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

2
src/world/area_hos/hos_10/hos_10_4_main.c
View File

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

2
src/world/area_hos/hos_20/hos_20_1_main.c
View File

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

2
src/world/area_iwa/iwa_00/iwa_00_1_main.c
View File

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

2
src/world/area_iwa/iwa_01/iwa_01_1_main.c
View File

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

2
src/world/area_iwa/iwa_02/iwa_02_1_main.c
View File

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

2
src/world/area_iwa/iwa_03/iwa_03_1_main.c
View File

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

2
src/world/area_jan/jan_01/jan_01_2_main.c
View File

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

2
src/world/area_jan/jan_07/jan_07_2_main.c
View File

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

2
src/world/area_jan/jan_10/jan_10_2_main.c
View File

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

2
src/world/area_jan/jan_12/jan_12_1_main.c
View File

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

2
src/world/area_jan/jan_13/jan_13_1_main.c
View File

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

2
src/world/area_jan/jan_14/jan_14_1_main.c
View File

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

2
src/world/area_jan/jan_15/jan_15_1_main.c
View File

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

2
src/world/area_jan/jan_17/jan_17_2_main.c
View File

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

2
src/world/area_jan/jan_18/jan_18_2_main.c
View File

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

2
src/world/area_jan/jan_19/jan_19_2_main.c
View File

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

2
src/world/area_jan/jan_22/jan_22_2_main.c
View File

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

2
src/world/area_kkj/kkj_12/kkj_12_1_main.c
View File

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

2
src/world/area_kkj/kkj_13/kkj_13_2_main.c
View File

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

2
src/world/area_kkj/kkj_14/kkj_14_2_main.c
View File

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

2
src/world/area_kkj/kkj_15/kkj_15_2_main.c
View File

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

2
src/world/area_kkj/kkj_16/kkj_16_1_main.c
View File

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

2
src/world/area_kkj/kkj_17/kkj_17_1_main.c
View File

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

2
src/world/area_kkj/kkj_18/kkj_18_2_main.c
View File

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

2
src/world/area_kkj/kkj_19/kkj_19_2_main.c
View File

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

2
src/world/area_kkj/kkj_22/kkj_22_2_main.c
View File

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

2
src/world/area_kkj/kkj_23/kkj_23_2_main.c
View File

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

2
src/world/area_kkj/kkj_25/kkj_25_1_main.c
View File

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

2
src/world/area_kkj/kkj_26/kkj_26_1_main.c
View File

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

2
src/world/area_kkj/kkj_28/kkj_28_1_main.c
View File

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

2
src/world/area_kmr/kmr_05/kmr_05_2_main.c
View File

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

2
src/world/area_kmr/kmr_06/kmr_06_2_main.c
View File

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

2
src/world/area_kmr/kmr_07/kmr_07_2_main.c
View File

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

2
src/world/area_kmr/kmr_09/kmr_09_2_main.c
View File

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

2
src/world/area_kmr/kmr_10/kmr_10_2_main.c
View File

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

2
src/world/area_kmr/kmr_12/kmr_12_2_main.c
View File

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

2
src/world/area_kpa/kpa_01/kpa_01_2_main.c
View File

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

2
src/world/area_kpa/kpa_03/kpa_03_2_main.c
View File

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

2
src/world/area_kpa/kpa_08/kpa_08_2_main.c
View File

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

2
src/world/area_kpa/kpa_09/kpa_09_2_main.c
View File

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

2
src/world/area_kpa/kpa_10/kpa_10_2_main.c
View File

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

2
src/world/area_kpa/kpa_102/kpa_102_2_main.c
View File

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

2
src/world/area_kpa/kpa_11/kpa_11_2_main.c
View File

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

2
src/world/area_kpa/kpa_111/kpa_111_2_main.c
View File

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

2
src/world/area_kpa/kpa_112/kpa_112_2_main.c
View File

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

2
src/world/area_kpa/kpa_113/kpa_113_2_main.c
View File

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

2
src/world/area_kpa/kpa_114/kpa_114_2_main.c
View File

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

2
src/world/area_kpa/kpa_115/kpa_115_2_main.c
View File

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

2
src/world/area_kpa/kpa_116/kpa_116_2_main.c
View File

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

2
src/world/area_kpa/kpa_118/kpa_118_2_main.c
View File

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

2
src/world/area_kpa/kpa_12/kpa_12_2_main.c
View File

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

2
src/world/area_kpa/kpa_13/kpa_13_2_main.c
View File

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

2
src/world/area_kpa/kpa_130/kpa_130_2_main.c
View File

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

2
src/world/area_kpa/kpa_133/kpa_133_2_main.c
View File

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

2
src/world/area_kpa/kpa_134/kpa_134_2_main.c
View File

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

2
src/world/area_kpa/kpa_14/kpa_14_2_main.c
View File

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

2
src/world/area_kpa/kpa_15/kpa_15_2_main.c
View File

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

2
src/world/area_kpa/kpa_16/kpa_16_2_main.c
View File

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

2
src/world/area_kpa/kpa_40/kpa_40_2_main.c
View File

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

2
src/world/area_kpa/kpa_41/kpa_41_2_main.c
View File

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

2
src/world/area_kpa/kpa_50/kpa_50_2_main.c
View File

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

2
src/world/area_kpa/kpa_51/kpa_51_2_main.c
View File

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

2
src/world/area_kpa/kpa_52/kpa_52_3_main.c
View File

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

2
src/world/area_kpa/kpa_61/kpa_61_2_main.c
View File

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

2
src/world/area_kpa/kpa_70/kpa_70_2_main.c
View File

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

2
src/world/area_kpa/kpa_90/kpa_90_2_main.c
View File

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

2
src/world/area_kpa/kpa_94/kpa_94_2_main.c
View File

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

2
src/world/area_kzn/kzn_01/kzn_01_1_main.c
View File

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

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