1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-08 00:44:42 +00:00

[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
This commit is contained in:
Dragorn421 2024-09-18 21:40:59 +02:00 committed by GitHub
parent 8348132511
commit a1a192b1a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 108 additions and 88 deletions

View file

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

View file

@ -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[];

View file

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

View file

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