From d8f2e9abc67163a366fa2e62ac5d2d7467dfdb65 Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Tue, 25 Jun 2024 15:13:31 -0400 Subject: Move `PlayState` to a new `z64play.h` (#1966) * ActorContext * frameadvance * SfxSource * GameOverContext * RoomContext * TransitionActorContext * fix bss * Move PlayState * Move play functions to new header * SAC_ENABLE * no longer needed * SAC_ENABLE again * z_demo being silly * comment * format headers * fix retail bss * actually fix bss * Cutscene_ProcessScript comment * bss again * Update src/code/z_demo.c Co-authored-by: cadmic * rename to frame_advance and remove it from z64.h * move macros too * review * Rename SequenceContext to SceneSequences --------- Co-authored-by: cadmic --- src/code/z_camera.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/code/z_camera.c') diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 4caafe18c..681fa2d51 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -6,7 +6,7 @@ // For retail BSS ordering, the block number of D_8015BD7C // must be between 88 and 123 inclusive. -#pragma increment_block_number 30 +#pragma increment_block_number 26 s16 Camera_RequestSettingImpl(Camera* camera, s16 requestedSetting, s16 flags); s32 Camera_RequestModeImpl(Camera* camera, s16 requestedMode, u8 forceModeChange); -- cgit v1.2.3