summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
Diffstat (limited to 'src/code')
-rw-r--r--src/code/graph.c13
-rw-r--r--src/code/main.c2
-rw-r--r--src/code/ucode_disas.c9
-rw-r--r--src/code/z_bgcheck.c2
-rw-r--r--src/code/z_camera.c2
-rw-r--r--src/code/z_collision_check.c2
-rw-r--r--src/code/z_common_data.c2
-rw-r--r--src/code/z_kankyo.c4
8 files changed, 19 insertions, 17 deletions
diff --git a/src/code/graph.c b/src/code/graph.c
index 95affaf82..5aadf9cc8 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -1,6 +1,7 @@
#include "global.h"
#include "fault.h"
#include "terminal.h"
+#include "ucode_disas.h"
#define GFXPOOL_HEAD_MAGIC 0x1234
#define GFXPOOL_TAIL_MAGIC 0x5678
@@ -22,15 +23,15 @@ OSTime sGraphPrevTaskTimeStart;
FaultClient sGraphFaultClient;
UCodeInfo D_8012D230[3] = {
- { UCODE_F3DZEX, gspF3DZEX2_NoN_PosLight_fifoTextStart },
- { UCODE_UNK, NULL },
- { UCODE_S2DEX, gspS2DEX2d_fifoTextStart },
+ { UCODE_TYPE_F3DZEX, gspF3DZEX2_NoN_PosLight_fifoTextStart },
+ { UCODE_TYPE_UNK, NULL },
+ { UCODE_TYPE_S2DEX, gspS2DEX2d_fifoTextStart },
};
UCodeInfo D_8012D248[3] = {
- { UCODE_F3DZEX, gspF3DZEX2_NoN_PosLight_fifoTextStart },
- { UCODE_UNK, NULL },
- { UCODE_S2DEX, gspS2DEX2d_fifoTextStart },
+ { UCODE_TYPE_F3DZEX, gspF3DZEX2_NoN_PosLight_fifoTextStart },
+ { UCODE_TYPE_UNK, NULL },
+ { UCODE_TYPE_S2DEX, gspS2DEX2d_fifoTextStart },
};
void Graph_FaultClient(void) {
diff --git a/src/code/main.c b/src/code/main.c
index 456f03f5d..010fd9050 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:160"
+ "ntsc-1.2:166"
extern u8 _buffersSegmentEnd[];
diff --git a/src/code/ucode_disas.c b/src/code/ucode_disas.c
index c0bab3f99..e2e782e71 100644
--- a/src/code/ucode_disas.c
+++ b/src/code/ucode_disas.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "ucode_disas.h"
typedef struct F3dzexConst {
/* 0x00 */ u32 value;
@@ -223,7 +224,7 @@ void UCodeDisas_SetCurUCodeImpl(UCodeDisas* this, void* ptr) {
}
if (i >= this->ucodeInfoCount) {
DISAS_LOG(T("マイクロコードが一致しなかった\n", "Microcode did not match\n"));
- this->ucodeType = UCODE_NULL;
+ this->ucodeType = UCODE_TYPE_NULL;
}
}
@@ -800,8 +801,8 @@ void UCodeDisas_Disassemble(UCodeDisas* this, Gfx* ptr) {
default: {
switch (this->ucodeType) {
- case UCODE_F3DZEX:
- case UCODE_UNK: {
+ case UCODE_TYPE_F3DZEX:
+ case UCODE_TYPE_UNK: {
switch (cmd) {
case G_MTX: {
Gdma2 gmtx = ptr->dma2;
@@ -1098,7 +1099,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, Gfx* ptr) {
}
} break;
- case UCODE_S2DEX: {
+ case UCODE_TYPE_S2DEX: {
switch (cmd) {
case G_BG_COPY: {
Gwords words = ptr->words;
diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c
index 3bebeecd5..dcc2a0df3 100644
--- a/src/code/z_bgcheck.c
+++ b/src/code/z_bgcheck.c
@@ -1,7 +1,7 @@
#include "global.h"
#include "terminal.h"
-#pragma increment_block_number "ntsc-1.2:148"
+#pragma increment_block_number "ntsc-1.2:152"
u16 DynaSSNodeList_GetNextNodeIdx(DynaSSNodeList* nodeList);
void BgCheck_GetStaticLookupIndicesFromPos(CollisionContext* colCtx, Vec3f* pos, Vec3i* sector);
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index 58a4cf900..7464b6ffd 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:104"
+ "ntsc-1.2:110"
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 27629dd82..1f6bb36cd 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 ntsc-1.2:216"
+#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*);
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;
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index 13b07c761..402840aca 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -7,7 +7,7 @@
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#include "assets/objects/gameplay_field_keep/gameplay_field_keep.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 ntsc-1.2:0"
+#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:0"
typedef enum LightningBoltState {
/* 0x00 */ LIGHTNING_BOLT_START,
@@ -212,7 +212,7 @@ s16 sLightningFlashAlpha;
s16 sSunDepthTestX;
s16 sSunDepthTestY;
-#pragma increment_block_number "gc-eu:240 gc-eu-mq:240 gc-jp:216 gc-jp-ce:216 gc-jp-mq:216 gc-us:216 gc-us-mq:216" \
+#pragma increment_block_number "gc-eu:112 gc-eu-mq:112 gc-jp:216 gc-jp-ce:216 gc-jp-mq:216 gc-us:216 gc-us-mq:216" \
"ntsc-1.2:224"
LightNode* sNGameOverLightNode;
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-04 11:13:24 +0000