diff options
| author | cadmic <cadmic24@gmail.com> | 2024-08-19 14:58:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-19 23:58:31 +0200 |
| commit | d191e8714e0b05ab8305951adff89542eb83e7c8 (patch) | |
| tree | 7c2efe8fde8b02b9fc89cee4ea7788cecf6d763f /src/code | |
| parent | 6bc6cedaf8a26b4b73be748b635308fb059c61f1 (diff) | |
Allow building the Debug ROM without debug features (#2052)
* Allow building the Debug ROM without debug features
* Fix bss
* Add comment
* Reword again
* Fix bss
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/main.c | 2 | ||||
| -rw-r--r-- | src/code/z_actor.c | 2 | ||||
| -rw-r--r-- | src/code/z_demo.c | 2 | ||||
| -rw-r--r-- | src/code/z_message.c | 2 | ||||
| -rw-r--r-- | src/code/z_play.c | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/src/code/main.c b/src/code/main.c index 3dada1102..6ba4e17af 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -7,7 +7,7 @@ s32 gScreenWidth = SCREEN_WIDTH; s32 gScreenHeight = SCREEN_HEIGHT; u32 gSystemHeapSize = 0; -#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0" +#pragma increment_block_number "gc-eu:224 gc-eu-mq:224 gc-jp:224 gc-jp-ce:224 gc-jp-mq:224 gc-us:224 gc-us-mq:224" PreNmiBuff* gAppNmiBufferPtr; Scheduler gScheduler; diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 89dd9400c..0be591667 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "assets/objects/object_bdoor/object_bdoor.h" -#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0" +#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" static CollisionPoly* sCurCeilingPoly; static s32 sCurCeilingBgId; diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 5d7dd7f3e..36ae51e99 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -120,7 +120,7 @@ u16 gCamAtSplinePointsAppliedFrame; u16 gCamEyePointAppliedFrame; u16 gCamAtPointAppliedFrame; -#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0" +#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" // Cam ID to return to when a scripted cutscene is finished s16 sReturnToCamId; diff --git a/src/code/z_message.c b/src/code/z_message.c index 620a6d086..2266cd1f9 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -3,6 +3,8 @@ #include "terminal.h" #include "assets/textures/parameter_static/parameter_static.h" +#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" + s16 sTextFade = false; // original name: key_off_flag ? u8 D_8014B2F4 = 0; diff --git a/src/code/z_play.c b/src/code/z_play.c index 5323a2c69..135f24c75 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -4,7 +4,7 @@ #include "z64frame_advance.h" -#pragma increment_block_number "gc-eu:24 gc-eu-mq:24 gc-jp:24 gc-jp-ce:24 gc-jp-mq:24 gc-us:24 gc-us-mq:24" +#pragma increment_block_number "gc-eu:252 gc-eu-mq:252 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0" TransitionTile gTransitionTile; s32 gTransitionTileState; |
