From ed77e143b6de64a2ee9681817bd5c15ca7859cae Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Tue, 1 Oct 2024 19:14:54 +0200 Subject: [headers] Create `one_point_cutscene.h`, `z64olib.h` and move stuff to `z64{object,player,scene}.h` (#2250) * [headers] Create `one_point_cutscene.h`, `z64olib.h` and move stuff to `z64{object,player,scene}.h` * bss * sSceneCmdHandlers * bss * bss --- src/code/fault_gc.c | 2 +- src/code/main.c | 2 +- src/code/z_camera.c | 2 +- src/code/z_debug.c | 4 ++-- src/code/z_kankyo.c | 2 +- src/code/z_play.c | 2 +- src/code/z_scene.c | 7 ++++--- 7 files changed, 11 insertions(+), 10 deletions(-) (limited to 'src/code') diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c index 12152f17a..e9b7de4b6 100644 --- a/src/code/fault_gc.c +++ b/src/code/fault_gc.c @@ -42,7 +42,7 @@ */ #if PLATFORM_GC -#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-eu-mq-dbg:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192" \ +#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-eu-mq-dbg:176 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192" \ "gc-us-mq:192" #include "global.h" diff --git a/src/code/main.c b/src/code/main.c index 7bec04a76..03831ffb3 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -23,7 +23,7 @@ extern struct IrqMgr gIrqMgr; #endif #pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160 gc-us-mq:160" \ - "ntsc-1.2:155 pal-1.0:153 pal-1.1:153" + "ntsc-1.2:154 pal-1.0:152 pal-1.1:152" extern u8 _buffersSegmentEnd[]; diff --git a/src/code/z_camera.c b/src/code/z_camera.c index cebb5260a..fee1ae138 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -3638,7 +3638,7 @@ s32 Camera_KeepOn3(Camera* camera) { } #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ - "ntsc-1.2:97 pal-1.0:95 pal-1.1:95" + "ntsc-1.2:96 pal-1.0:94 pal-1.1:94" s32 Camera_KeepOn4(Camera* camera) { static Vec3f D_8015BD50; diff --git a/src/code/z_debug.c b/src/code/z_debug.c index dbbc8fd8d..8feacf15e 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -12,8 +12,8 @@ typedef struct InputCombo { /* 0x2 */ u16 press; } InputCombo; // size = 0x4 -#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ - "ntsc-1.2:128 pal-1.0:128 pal-1.1:128" +#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \ + "ntsc-1.2:192 pal-1.0:192 pal-1.1:192" RegEditor* gRegEditor; diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index 908e01d67..27157ae2e 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -1,5 +1,5 @@ #pragma increment_block_number "gc-eu:248 gc-eu-mq:248 gc-jp:240 gc-jp-ce:240 gc-jp-mq:240 gc-us:240 gc-us-mq:240" \ - "ntsc-1.2:0 pal-1.0:0 pal-1.1:0" + "ntsc-1.2:0 pal-1.0:252 pal-1.1:252" #include "global.h" #include "ultra64.h" diff --git a/src/code/z_play.c b/src/code/z_play.c index dc61dd25f..e4269a2c2 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -10,7 +10,7 @@ #include "z64frame_advance.h" -#pragma increment_block_number "gc-eu:8 gc-eu-mq:8 gc-jp:8 gc-jp-ce:8 gc-jp-mq:8 gc-us:8 gc-us-mq:8" +#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" TransitionTile gTransitionTile; s32 gTransitionTileState; diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 9b04bccec..f96005a4a 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -2,6 +2,7 @@ #include "terminal.h" #include "versions.h" +SceneCmdHandlerFunc sSceneCmdHandlers[SCENE_CMD_ID_MAX]; RomFile sNaviQuestHintFiles[]; /** @@ -191,8 +192,8 @@ s32 Scene_ExecuteCommands(PlayState* play, SceneCmd* sceneCmd) { break; } - if (cmdCode < ARRAY_COUNT(gSceneCmdHandlers)) { - gSceneCmdHandlers[cmdCode](play, sceneCmd); + if (cmdCode < ARRAY_COUNT(sSceneCmdHandlers)) { + sSceneCmdHandlers[cmdCode](play, sceneCmd); } else { PRINTF(VT_FGCOL(RED)); PRINTF(T("code の値が異常です\n", "code variable is abnormal\n")); @@ -515,7 +516,7 @@ void Scene_SetTransitionForNextEntrance(PlayState* play) { play->transitionType = ENTRANCE_INFO_START_TRANS_TYPE(gEntranceTable[entranceIndex].field); } -SceneCmdHandlerFunc gSceneCmdHandlers[SCENE_CMD_ID_MAX] = { +SceneCmdHandlerFunc sSceneCmdHandlers[SCENE_CMD_ID_MAX] = { Scene_CommandPlayerEntryList, // SCENE_CMD_ID_SPAWN_LIST Scene_CommandActorEntryList, // SCENE_CMD_ID_ACTOR_LIST Scene_CommandUnused2, // SCENE_CMD_ID_UNUSED_2 -- cgit v1.2.3