mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-14 11:54:39 +00:00
Code Issues Projects Releases Wiki Activity

run fix_bss locally

Browse source 
`ntsc-1.2` refused to comply though
This commit is contained in:
feacur 2024-11-19 18:35:59 +01:00
parent 3530507e46
commit 4b3e0dceb6
11 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/code/fault_gc.c
View file

@ -42,8 +42,8 @@
*/
#if PLATFORM_GC
#pragma increment_block_number "gc-eu:176 gc-eu-mq:176 gc-eu-mq-dbg:176 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192" \
"gc-us-mq:192"
#pragma increment_block_number "gc-eu:176 gc-eu-mq:176 gc-eu-mq-dbg:176 gc-jp:176 gc-jp-ce:176 gc-jp-mq:176 gc-us:176" \
"gc-us-mq:176"
#include "global.h"
#include "alloca.h"

2
src/code/main.c
View file

@ -24,7 +24,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.0:148 ntsc-1.1:148 ntsc-1.2:148 pal-1.0:146 pal-1.1:146"
"ntsc-1.0:145 ntsc-1.1:145 ntsc-1.2:145 pal-1.0:143 pal-1.1:143"
extern u8 _buffersSegmentEnd[];

2
src/code/z_bgcheck.c
View file

@ -1,7 +1,7 @@
#include "global.h"
#include "terminal.h"
#pragma increment_block_number "ntsc-1.0:136 ntsc-1.1:136 ntsc-1.2:136"
#pragma increment_block_number "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:0"
u16 DynaSSNodeList_GetNextNodeIdx(DynaSSNodeList* nodeList);
void BgCheck_GetStaticLookupIndicesFromPos(CollisionContext* colCtx, Vec3f* pos, Vec3i* sector);

2
src/code/z_camera.c
View file

@ -3639,7 +3639,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.0:90 ntsc-1.1:90 ntsc-1.2:90 pal-1.0:88 pal-1.1:88"
"ntsc-1.0:87 ntsc-1.1:87 ntsc-1.2:87 pal-1.0:85 pal-1.1:85"
s32 Camera_KeepOn4(Camera* camera) {
static Vec3f D_8015BD50;

4
src/code/z_demo.c
View file

@ -124,8 +124,8 @@ u16 gCamAtSplinePointsAppliedFrame;
u16 gCamEyePointAppliedFrame;
u16 gCamAtPointAppliedFrame;
#pragma increment_block_number "gc-eu:186 gc-eu-mq:176 gc-jp:188 gc-jp-ce:188 gc-jp-mq:176 gc-us:188 gc-us-mq:176" \
"ntsc-1.0:80 ntsc-1.1:80 ntsc-1.2:80 pal-1.0:80 pal-1.1:80"
#pragma increment_block_number "gc-eu:186 gc-eu-mq:176 gc-jp:186 gc-jp-ce:186 gc-jp-mq:176 gc-us:186 gc-us-mq:176" \
"ntsc-1.0:76 ntsc-1.1:76 ntsc-1.2:80 pal-1.0:76 pal-1.1:76"
// Cam ID to return to when a scripted cutscene is finished
s16 sReturnToCamId;

4
src/code/z_kankyo.c
View file

@ -1,5 +1,5 @@
#pragma increment_block_number "gc-eu:244 gc-eu-mq:244 gc-jp:224 gc-jp-ce:224 gc-jp-mq:224 gc-us:224 gc-us-mq:224" \
"ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:248 pal-1.1:248"
#pragma increment_block_number "gc-eu:240 gc-eu-mq:240 gc-jp:224 gc-jp-ce:224 gc-jp-mq:224 gc-us:224 gc-us-mq:224" \
"ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:244 pal-1.1:244"
#include "global.h"
#include "ultra64.h"

2
src/code/z_message.c
View file

@ -8,7 +8,7 @@
#endif
#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
"ntsc-1.0:96 ntsc-1.1:96 ntsc-1.2:112 pal-1.0:128 pal-1.1:128"
"ntsc-1.0:96 ntsc-1.1:96 ntsc-1.2:0 pal-1.0:128 pal-1.1:128"
#if !PLATFORM_GC
#define OCARINA_BUTTON_A_PRIM_1_R 80