summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorDragorn421 <Dragorn421@users.noreply.github.com>2024-09-18 21:40:59 +0200
committerGitHub <noreply@github.com>2024-09-18 15:40:59 -0400
commita1a192b1a2dba0ba6b7a4035f9e1ff0a89db6fc4 (patch)
treeb638404c9690c7c90ef70f353d962d01cfd347c6 /src/code
parent834813251146fef1af0abd33ec89f82de189254c (diff)
[headers] z64inventory.h, move savectx/inventory macros to z64save.h (#2209)
* [headers] z64inventory.h * move savectx/inventory macros to z64save.h * commit the file * bss
Diffstat (limited to 'src/code')
-rw-r--r--src/code/graph.c2
-rw-r--r--src/code/main.c2
-rw-r--r--src/code/z_camera.c2
-rw-r--r--src/code/z_common_data.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/code/graph.c b/src/code/graph.c
index 7c562f160..95affaf82 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -6,7 +6,7 @@
#define GFXPOOL_TAIL_MAGIC 0x5678
#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:223"
+ "ntsc-1.2:192"
/**
* The time at which the previous `Graph_Update` ended.
diff --git a/src/code/main.c b/src/code/main.c
index 8024db941..5c3985b42 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: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:168"
+ "ntsc-1.2:167"
extern u8 _buffersSegmentEnd[];
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index 50485d3bc..be7cc4d27 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:112"
+ "ntsc-1.2:111"
s32 Camera_KeepOn4(Camera* camera) {
static Vec3f D_8015BD50;
diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c
index dcd0ee4d2..1c70bfb0f 100644
--- a/src/code/z_common_data.c
+++ b/src/code/z_common_data.c
@@ -3,7 +3,7 @@
#include "versions.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" \
- "ntsc-1.2:192"
+ "ntsc-1.2:224"
ALIGNED(16) SaveContext gSaveContext;
u32 D_8015FA88;