summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
Diffstat (limited to 'src/code')
-rw-r--r--src/code/fault_n64.c28
-rw-r--r--src/code/graph.c108
-rw-r--r--src/code/main.c32
-rw-r--r--src/code/speed_meter.c3
-rw-r--r--src/code/sys_math3d.c3
-rw-r--r--src/code/z_actor.c5
-rw-r--r--src/code/z_bgcheck.c2
-rw-r--r--src/code/z_camera.c6
-rw-r--r--src/code/z_collision_check.c5
-rw-r--r--src/code/z_common_data.c3
-rw-r--r--src/code/z_debug.c3
-rw-r--r--src/code/z_demo.c3
-rw-r--r--src/code/z_kaleido_scope_call.c3
-rw-r--r--src/code/z_kankyo.c6
-rw-r--r--src/code/z_message.c8
-rw-r--r--src/code/z_player_call.c3
16 files changed, 125 insertions, 96 deletions
diff --git a/src/code/fault_n64.c b/src/code/fault_n64.c
index eb3019d33..762301b56 100644
--- a/src/code/fault_n64.c
+++ b/src/code/fault_n64.c
@@ -1,10 +1,14 @@
+#if PLATFORM_N64
+
+#pragma increment_block_number "ntsc-1.2:128"
+
#include "global.h"
#include "fault.h"
#include "libc64/os_malloc.h"
#include "stack.h"
#include "terminal.h"
-#if PLATFORM_N64
+#pragma increment_block_number "ntsc-1.2:96"
typedef struct FaultMgr {
OSThread thread;
@@ -80,7 +84,7 @@ const char* sFpExceptionNames[] = {
};
u16 sFaultFontColor = GPACK_RGBA5551(255, 255, 255, 1);
-s32 D_800FF9C4[7] = { 0 }; // Unused (file padding?)
+s32 D_800FF9C4[7] = { 0 }; // Unused
Input sFaultInputs[MAXCONTROLLERS];
@@ -90,12 +94,10 @@ STACK(sFaultStack, 0x400);
StackEntry sFaultStackInfo;
FaultCursorCoords sFaultCursorPos;
-vs32 sFaultExit;
+vs32 gFaultExit;
vs32 gFaultMsgId;
-vs32 sFaultDisplayEnable;
+vs32 gFaultDisplayEnable;
volatile OSThread* gFaultFaultedThread;
-s32 B_80122570[16];
-s32 B_801225B0[8]; // Unused (file padding?)
void Fault_SleepImpl(u32 ms) {
Sleep_Msec(ms);
@@ -653,6 +655,8 @@ void Fault_DrawMemDumpSP(OSThread* thread) {
}
void func_800AF3DC(void) {
+ static s32 B_80122570[16];
+ static s32 B_801225B0[8]; // Unused
s32 i;
Fault_DrawRecBlack(22, 16, 276, 208);
@@ -773,8 +777,8 @@ void Fault_ThreadEntry(void* arg0) {
gFaultFaultedThread = faultedThread;
Fault_LogThreadContext(faultedThread);
osSyncPrintf("%d %s %d:%s = %d\n", osGetThreadId(NULL), "fault.c", 1454, "fault_display_enable",
- sFaultDisplayEnable);
- while (!sFaultDisplayEnable) {
+ gFaultDisplayEnable);
+ while (!gFaultDisplayEnable) {
Fault_SleepImpl(1000);
}
Fault_SleepImpl(500);
@@ -793,8 +797,8 @@ void Fault_ThreadEntry(void* arg0) {
Fault_DrawMemDumpPC(faultedThread);
Fault_WaitForInput();
Fault_ProcessClients();
- } while (!sFaultExit);
- while (!sFaultExit) {}
+ } while (!gFaultExit);
+ while (!gFaultExit) {}
Fault_ResumeThread(faultedThread);
}
}
@@ -806,7 +810,7 @@ void Fault_SetFrameBuffer(void* fb, u16 w, u16 h) {
}
void Fault_Init(void) {
- sFaultDisplayEnable = 1;
+ gFaultDisplayEnable = 1;
gFaultMgr.fb = (u16*)(PHYS_TO_K0(osMemSize) - sizeof(u16[SCREEN_HEIGHT][SCREEN_WIDTH]));
gFaultMgr.fbWidth = SCREEN_WIDTH;
gFaultMgr.fbDepth = 16;
@@ -823,7 +827,7 @@ void Fault_AddHungupAndCrashImpl(const char* exp1, const char* exp2) {
osSyncPrintf("HungUp on Thread %d", osGetThreadId(NULL));
osSyncPrintf("%s\n", exp1 != NULL ? exp1 : "(NULL)");
osSyncPrintf("%s\n", exp2 != NULL ? exp2 : "(NULL)");
- while (sFaultDisplayEnable == 0) {
+ while (gFaultDisplayEnable == 0) {
Fault_SleepImpl(1000);
}
Fault_SleepImpl(500);
diff --git a/src/code/graph.c b/src/code/graph.c
index 2b4777ea6..7c562f160 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -5,7 +5,8 @@
#define GFXPOOL_HEAD_MAGIC 0x1234
#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"
+#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"
/**
* The time at which the previous `Graph_Update` ended.
@@ -19,12 +20,6 @@ OSTime sGraphPrevTaskTimeStart;
#if OOT_DEBUG
FaultClient sGraphFaultClient;
-#endif
-
-CfbInfo sGraphCfbInfos[3];
-
-#if OOT_DEBUG
-FaultClient sGraphUcodeFaultClient;
UCodeInfo D_8012D230[3] = {
{ UCODE_F3DZEX, gspF3DZEX2_NoN_PosLight_fifoTextStart },
@@ -165,11 +160,6 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) {
#if OOT_DEBUG
static Gfx* sPrevTaskWorkBuffer = NULL;
#endif
- static s32 sGraphCfbInfoIdx = 0;
-
- OSTime timeNow;
- OSTimer timer;
- OSMesg msg;
OSTask_t* task = &gfxCtx->task.list.t;
OSScTask* scTask = &gfxCtx->task;
@@ -177,7 +167,8 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) {
osGetTime() - sGraphPrevTaskTimeStart - gAudioThreadUpdateTimeAcc;
{
- CfbInfo* cfb;
+ OSTimer timer;
+ OSMesg msg;
// Schedule a message to be handled in 3 seconds, for RCP timeout
osSetTimer(&timer, OS_USEC_TO_CYCLES(3000000), 0, &gfxCtx->queue, (OSMesg)666);
@@ -212,12 +203,15 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) {
#if OOT_DEBUG
sPrevTaskWorkBuffer = gfxCtx->workBuffer;
#endif
+ }
- if (gfxCtx->callback != NULL) {
- gfxCtx->callback(gfxCtx, gfxCtx->callbackParam);
- }
+ if (gfxCtx->callback != NULL) {
+ gfxCtx->callback(gfxCtx, gfxCtx->callbackParam);
+ }
+
+ {
+ OSTime timeNow = osGetTime();
- timeNow = osGetTime();
if (gAudioThreadUpdateTimeStart != 0) {
// The audio thread update is running
// Add the time already spent to the accumulator and leave the rest for the next cycle
@@ -229,41 +223,45 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) {
gAudioThreadUpdateTimeAcc = 0;
sGraphPrevTaskTimeStart = osGetTime();
+ }
- task->type = M_GFXTASK;
- task->flags = OS_SC_DRAM_DLIST;
- task->ucode_boot = SysUcode_GetUCodeBoot();
- task->ucode_boot_size = SysUcode_GetUCodeBootSize();
- task->ucode = SysUcode_GetUCode();
- task->ucode_data = SysUcode_GetUCodeData();
- task->ucode_size = SP_UCODE_SIZE;
- task->ucode_data_size = SP_UCODE_DATA_SIZE;
- task->dram_stack = gGfxSPTaskStack;
- task->dram_stack_size = sizeof(gGfxSPTaskStack);
- task->output_buff = gGfxSPTaskOutputBuffer;
- task->output_buff_size = gGfxSPTaskOutputBuffer + ARRAY_COUNT(gGfxSPTaskOutputBuffer);
- task->data_ptr = (u64*)gfxCtx->workBuffer;
-
- OPEN_DISPS(gfxCtx, "../graph.c", 828);
- task->data_size = (uintptr_t)WORK_DISP - (uintptr_t)gfxCtx->workBuffer;
- CLOSE_DISPS(gfxCtx, "../graph.c", 830);
-
- task->yield_data_ptr = gGfxSPTaskYieldBuffer;
-
- task->yield_data_size = sizeof(gGfxSPTaskYieldBuffer);
-
- scTask->next = NULL;
- scTask->flags = OS_SC_NEEDS_RSP | OS_SC_NEEDS_RDP | OS_SC_SWAPBUFFER | OS_SC_LAST_TASK;
- if (R_GRAPH_TASKSET00_FLAGS & 1) {
- R_GRAPH_TASKSET00_FLAGS &= ~1;
- scTask->flags &= ~OS_SC_SWAPBUFFER;
- gfxCtx->fbIdx--;
- }
+ task->type = M_GFXTASK;
+ task->flags = OS_SC_DRAM_DLIST;
+ task->ucode_boot = SysUcode_GetUCodeBoot();
+ task->ucode_boot_size = SysUcode_GetUCodeBootSize();
+ task->ucode = SysUcode_GetUCode();
+ task->ucode_data = SysUcode_GetUCodeData();
+ task->ucode_size = SP_UCODE_SIZE;
+ task->ucode_data_size = SP_UCODE_DATA_SIZE;
+ task->dram_stack = gGfxSPTaskStack;
+ task->dram_stack_size = sizeof(gGfxSPTaskStack);
+ task->output_buff = gGfxSPTaskOutputBuffer;
+ task->output_buff_size = gGfxSPTaskOutputBuffer + ARRAY_COUNT(gGfxSPTaskOutputBuffer);
+ task->data_ptr = (u64*)gfxCtx->workBuffer;
+
+ OPEN_DISPS(gfxCtx, "../graph.c", 828);
+ task->data_size = (uintptr_t)WORK_DISP - (uintptr_t)gfxCtx->workBuffer;
+ CLOSE_DISPS(gfxCtx, "../graph.c", 830);
+
+ task->yield_data_ptr = gGfxSPTaskYieldBuffer;
+
+ task->yield_data_size = sizeof(gGfxSPTaskYieldBuffer);
+
+ scTask->next = NULL;
+ scTask->flags = OS_SC_NEEDS_RSP | OS_SC_NEEDS_RDP | OS_SC_SWAPBUFFER | OS_SC_LAST_TASK;
+ if (R_GRAPH_TASKSET00_FLAGS & 1) {
+ R_GRAPH_TASKSET00_FLAGS &= ~1;
+ scTask->flags &= ~OS_SC_SWAPBUFFER;
+ gfxCtx->fbIdx--;
+ }
- scTask->msgQueue = &gfxCtx->queue;
- scTask->msg = NULL;
+ scTask->msgQueue = &gfxCtx->queue;
+ scTask->msg = NULL;
- { s16 pad; }
+ {
+ static CfbInfo sGraphCfbInfos[3];
+ static s32 sGraphCfbInfoIdx = 0;
+ CfbInfo* cfb;
cfb = &sGraphCfbInfos[sGraphCfbInfoIdx];
@@ -279,14 +277,12 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) {
cfb->updateRate = R_UPDATE_RATE;
scTask->framebuffer = cfb;
+ }
- { s16 pad2; }
-
- gfxCtx->schedMsgQueue = &gScheduler.cmdQueue;
+ gfxCtx->schedMsgQueue = &gScheduler.cmdQueue;
- osSendMesg(&gScheduler.cmdQueue, (OSMesg)scTask, OS_MESG_BLOCK);
- Sched_Notify(&gScheduler);
- }
+ osSendMesg(&gScheduler.cmdQueue, (OSMesg)scTask, OS_MESG_BLOCK);
+ Sched_Notify(&gScheduler);
}
void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
@@ -339,6 +335,8 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
}
if (R_HREG_MODE == HREG_MODE_UCODE_DISAS && R_UCODE_DISAS_TOGGLE != 0) {
+ static FaultClient sGraphUcodeFaultClient;
+
if (R_UCODE_DISAS_LOG_MODE == 3) {
Fault_AddClient(&sGraphUcodeFaultClient, Graph_UCodeFaultClient, gfxCtx->workBuffer, "do_count_fault");
}
diff --git a/src/code/main.c b/src/code/main.c
index 34b0bfaf1..8024db941 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -1,18 +1,19 @@
#include "ultra64.h"
-#pragma increment_block_number "gc-eu:80 gc-eu-mq:80 gc-jp:80 gc-jp-ce:80 gc-jp-mq:80 gc-us:80 gc-us-mq:80"
+// Declared before including other headers for BSS ordering
+extern uintptr_t gSegments[NUM_SEGMENTS];
-struct PreNmiBuff* gAppNmiBufferPtr;
+#pragma increment_block_number "gc-eu:252 gc-eu-mq:252 gc-jp:252 gc-jp-ce:252 gc-jp-mq:252 gc-us:252 gc-us-mq:252" \
+ "ntsc-1.2:128"
-#include "segmented_address.h"
-
-struct Scheduler gScheduler;
-struct PadMgr gPadMgr;
-struct IrqMgr gIrqMgr;
-uintptr_t gSegments[NUM_SEGMENTS];
+extern struct PreNmiBuff* gAppNmiBufferPtr;
+extern struct Scheduler gScheduler;
+extern struct PadMgr gPadMgr;
+extern struct IrqMgr gIrqMgr;
#include "global.h"
#include "fault.h"
+#include "segmented_address.h"
#include "stack.h"
#include "terminal.h"
#include "versions.h"
@@ -21,12 +22,21 @@ uintptr_t gSegments[NUM_SEGMENTS];
#include "n64dd.h"
#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"
+
extern u8 _buffersSegmentEnd[];
s32 gScreenWidth = SCREEN_WIDTH;
s32 gScreenHeight = SCREEN_HEIGHT;
u32 gSystemHeapSize = 0;
+PreNmiBuff* gAppNmiBufferPtr;
+Scheduler gScheduler;
+PadMgr gPadMgr;
+IrqMgr gIrqMgr;
+uintptr_t gSegments[NUM_SEGMENTS];
+
OSThread sGraphThread;
STACK(sGraphStack, 0x1800);
STACK(sSchedStack, 0x600);
@@ -38,7 +48,7 @@ StackEntry sSchedStackInfo;
StackEntry sAudioStackInfo;
StackEntry sPadMgrStackInfo;
StackEntry sIrqMgrStackInfo;
-AudioMgr gAudioMgr;
+AudioMgr sAudioMgr;
OSMesgQueue sSerialEventQueue;
OSMesg sSerialMsgBuf[1];
@@ -130,12 +140,12 @@ void Main(void* arg) {
IrqMgr_AddClient(&gIrqMgr, &irqClient, &irqMgrMsgQueue);
StackCheck_Init(&sAudioStackInfo, sAudioStack, STACK_TOP(sAudioStack), 0, 0x100, "audio");
- AudioMgr_Init(&gAudioMgr, STACK_TOP(sAudioStack), THREAD_PRI_AUDIOMGR, THREAD_ID_AUDIOMGR, &gScheduler, &gIrqMgr);
+ AudioMgr_Init(&sAudioMgr, STACK_TOP(sAudioStack), THREAD_PRI_AUDIOMGR, THREAD_ID_AUDIOMGR, &gScheduler, &gIrqMgr);
StackCheck_Init(&sPadMgrStackInfo, sPadMgrStack, STACK_TOP(sPadMgrStack), 0, 0x100, "padmgr");
PadMgr_Init(&gPadMgr, &sSerialEventQueue, &gIrqMgr, THREAD_ID_PADMGR, THREAD_PRI_PADMGR, STACK_TOP(sPadMgrStack));
- AudioMgr_WaitForInit(&gAudioMgr);
+ AudioMgr_WaitForInit(&sAudioMgr);
StackCheck_Init(&sGraphStackInfo, sGraphStack, STACK_TOP(sGraphStack), 0, 0x100, "graph");
osCreateThread(&sGraphThread, THREAD_ID_GRAPH, Graph_ThreadEntry, arg, STACK_TOP(sGraphStack), THREAD_PRI_GRAPH);
diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c
index 903cd0fc7..b3bfa6d7c 100644
--- a/src/code/speed_meter.c
+++ b/src/code/speed_meter.c
@@ -1,4 +1,5 @@
-#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"
+#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"
#include "global.h"
#include "terminal.h"
diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c
index 570da1ab0..c0ebcea86 100644
--- a/src/code/sys_math3d.c
+++ b/src/code/sys_math3d.c
@@ -5,7 +5,8 @@
#include "macros.h"
#include "sys_math3d.h"
-#pragma increment_block_number "gc-eu:106 gc-eu-mq:106 gc-jp:106 gc-jp-ce:106 gc-jp-mq:106 gc-us:106 gc-us-mq:106"
+#pragma increment_block_number "gc-eu:106 gc-eu-mq:106 gc-jp:106 gc-jp-ce:106 gc-jp-mq:106 gc-us:106 gc-us-mq:106" \
+ "ntsc-1.2:79"
s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB,
Vec3f* lineAClosestToB, Vec3f* lineBClosestToA);
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index e0d1c5042..e36110e79 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -11,7 +11,8 @@
#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
#include "assets/objects/object_bdoor/object_bdoor.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"
+#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:0"
static CollisionPoly* sCurCeilingPoly;
static s32 sCurCeilingBgId;
@@ -2019,7 +2020,7 @@ s32 func_8002F9EC(PlayState* play, Actor* actor, CollisionPoly* poly, s32 bgId,
return false;
}
-#pragma increment_block_number "gc-eu:22 gc-eu-mq:22 gc-jp:22 gc-jp-ce:22 gc-jp-mq:22 gc-us:22 gc-us-mq:22"
+#pragma increment_block_number "gc-eu:22 gc-eu-mq:22 gc-jp:22 gc-jp-ce:22 gc-jp-mq:22 gc-us:22 gc-us-mq:22 ntsc-1.2:22"
// Local data used for Farore's Wind light (stored in BSS)
LightInfo D_8015BC00;
diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c
index 415dcd474..dcc2a0df3 100644
--- a/src/code/z_bgcheck.c
+++ b/src/code/z_bgcheck.c
@@ -1,6 +1,8 @@
#include "global.h"
#include "terminal.h"
+#pragma increment_block_number "ntsc-1.2:152"
+
u16 DynaSSNodeList_GetNextNodeIdx(DynaSSNodeList* nodeList);
void BgCheck_GetStaticLookupIndicesFromPos(CollisionContext* colCtx, Vec3f* pos, Vec3i* sector);
s32 BgCheck_PosInStaticBoundingBox(CollisionContext* colCtx, Vec3f* pos);
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index ce2201915..58c6c87ee 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -4,7 +4,8 @@
#include "terminal.h"
#include "overlays/actors/ovl_En_Horse/z_en_horse.h"
-#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"
+#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"
s16 Camera_RequestSettingImpl(Camera* camera, s16 requestedSetting, s16 flags);
s32 Camera_RequestModeImpl(Camera* camera, s16 requestedMode, u8 forceModeChange);
@@ -3636,7 +3637,8 @@ s32 Camera_KeepOn3(Camera* camera) {
return 1;
}
-#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"
+#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"
s32 Camera_KeepOn4(Camera* camera) {
static Vec3f D_8015BD50;
diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c
index 4d5ccbc95..922b7e052 100644
--- a/src/code/z_collision_check.c
+++ b/src/code/z_collision_check.c
@@ -5,7 +5,7 @@
#include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.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:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:224"
typedef s32 (*ColChkResetFunc)(PlayState*, Collider*);
typedef void (*ColChkApplyFunc)(PlayState*, CollisionCheckContext*, Collider*);
@@ -2195,7 +2195,8 @@ void CollisionCheck_ATTrisVsACCyl(PlayState* play, CollisionCheckContext* colChk
}
}
-#pragma increment_block_number "gc-eu:252 gc-eu-mq:252 gc-jp:252 gc-jp-ce:252 gc-jp-mq:252 gc-us:252 gc-us-mq:252"
+#pragma increment_block_number "gc-eu:252 gc-eu-mq:252 gc-jp:252 gc-jp-ce:252 gc-jp-mq:252 gc-us:252 gc-us-mq:252" \
+ "ntsc-1.2:252"
void CollisionCheck_ATCylVsACQuad(PlayState* play, CollisionCheckContext* colChkCtx, Collider* atCol, Collider* acCol) {
static TriNorm tri1;
diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c
index 30a1398df..dcd0ee4d2 100644
--- a/src/code/z_common_data.c
+++ b/src/code/z_common_data.c
@@ -2,7 +2,8 @@
#include "region.h"
#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"
+#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"
ALIGNED(16) SaveContext gSaveContext;
u32 D_8015FA88;
diff --git a/src/code/z_debug.c b/src/code/z_debug.c
index 963e934ff..4ca9b2071 100644
--- a/src/code/z_debug.c
+++ b/src/code/z_debug.c
@@ -12,7 +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"
+#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"
RegEditor* gRegEditor;
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index f46e33a55..29e18394e 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -123,7 +123,8 @@ u16 gCamAtSplinePointsAppliedFrame;
u16 gCamEyePointAppliedFrame;
u16 gCamAtPointAppliedFrame;
-#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"
+#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:96"
// Cam ID to return to when a scripted cutscene is finished
s16 sReturnToCamId;
diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c
index 1f4ea9a50..e97c8a8cf 100644
--- a/src/code/z_kaleido_scope_call.c
+++ b/src/code/z_kaleido_scope_call.c
@@ -1,7 +1,8 @@
#include "global.h"
#include "terminal.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"
+#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"
void (*sKaleidoScopeUpdateFunc)(PlayState* play);
void (*sKaleidoScopeDrawFunc)(PlayState* play);
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index 52be77e44..16ccf3b47 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -7,7 +7,8 @@
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#include "assets/objects/gameplay_field_keep/gameplay_field_keep.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"
+#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:0"
typedef enum LightningBoltState {
/* 0x00 */ LIGHTNING_BOLT_START,
@@ -212,7 +213,8 @@ s16 sLightningFlashAlpha;
s16 sSunDepthTestX;
s16 sSunDepthTestY;
-#pragma increment_block_number "gc-eu:112 gc-eu-mq:112 gc-jp:96 gc-jp-ce:96 gc-jp-mq:96 gc-us:96 gc-us-mq:96"
+#pragma increment_block_number "gc-eu:112 gc-eu-mq:112 gc-jp:96 gc-jp-ce:96 gc-jp-mq:96 gc-us:96 gc-us-mq:96" \
+ "ntsc-1.2:224"
LightNode* sNGameOverLightNode;
LightInfo sNGameOverLightInfo;
diff --git a/src/code/z_message.c b/src/code/z_message.c
index ea603ac42..86b1e2070 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -8,7 +8,8 @@
#include "n64dd.h"
#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"
+#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.2:112"
#if !PLATFORM_GC
#define OCARINA_BUTTON_A_PRIM_1_R 80
@@ -90,6 +91,9 @@
#define OCARINA_ICON_ENV_2_B 130
#endif
+s32 sCharTexSize;
+s32 sCharTexScale;
+
s16 sTextFade = false; // original name: key_off_flag ?
u8 D_8014B2F4 = 0;
@@ -250,8 +254,6 @@ s16 gOcarinaSongItemMap[] = {
OCARINA_SONG_SARIAS, OCARINA_SONG_SUNS, OCARINA_SONG_TIME, OCARINA_SONG_STORMS,
};
-s32 sCharTexSize;
-s32 sCharTexScale;
s16 sOcarinaButtonAPrimR;
s16 sOcarinaButtonAPrimB;
s16 sOcarinaButtonAPrimG;
diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c
index 7b44d6afe..a004f0b53 100644
--- a/src/code/z_player_call.c
+++ b/src/code/z_player_call.c
@@ -3,7 +3,8 @@
#define FLAGS \
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_25 | ACTOR_FLAG_26)
-#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"
+#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"
void (*sPlayerCallInitFunc)(Actor* thisx, PlayState* play);
void (*sPlayerCallDestroyFunc)(Actor* thisx, PlayState* play);
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 11:42:37 +0000