summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorTharo <17233964+Thar0@users.noreply.github.com>2024-06-21 03:39:43 +0100
committerGitHub <noreply@github.com>2024-06-20 22:39:43 -0400
commit38921684a5b8e27218536bfcfa90be9dd664c1fb (patch)
tree929ddaf4de69eb63d3d72f15361ea6005059811f /src/code
parent0ddd64fd6cd377492389283c2d260d65e9319794 (diff)
Add point lighting gbi features (#1962)
* Add point lighting gbi features * Maybe fix bss ordering
Diffstat (limited to 'src/code')
-rw-r--r--src/code/sys_math3d.c2
-rw-r--r--src/code/z_demo.c2
-rw-r--r--src/code/z_kankyo.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c
index f0bfb60bc..08578e8fd 100644
--- a/src/code/sys_math3d.c
+++ b/src/code/sys_math3d.c
@@ -7,7 +7,7 @@
// For retail BSS ordering, the block number of cbf in Math3D_CylVsCylOverlapCenterDist
// must be 0.
-#pragma increment_block_number 114
+#pragma increment_block_number 111
s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB,
Vec3f* lineAClosestToB, Vec3f* lineBClosestToA);
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index f7e86f122..8cea75bab 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -115,6 +115,8 @@ void* sUnusedEntranceCsList[] = {
gDekuTreeIntroCs, gJabuJabuIntroCs, gDcOpeningCs, gMinuetCs, gIceCavernSerenadeCs, gTowerBarrierCs,
};
+#pragma increment_block_number 254
+
// Stores the frame the relevant cam data was last applied on
u16 gCamAtSplinePointsAppliedFrame;
u16 gCamEyePointAppliedFrame;
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index aab406904..5a728aac7 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -7,7 +7,7 @@
// For retail BSS ordering, the block number of sLensFlareUnused must be lower
// than the extern variables declared in the header (e.g. gLightningStrike)
// while the block number of sNGameOverLightNode must be higher.
-#pragma increment_block_number 80
+#pragma increment_block_number 78
typedef enum {
/* 0x00 */ LIGHTNING_BOLT_START,