diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c
index 95c6940a7e..2e605ca643 100644
--- a/src/code/z_collision_check.c
+++ b/src/code/z_collision_check.c
@@ -12,7 +12,7 @@ typedef s32 (*ColChkLineFunc)(PlayState*, CollisionCheckContext*, Collider*, Vec
 
 #define SAC_ENABLE (1 << 0)
 
-#pragma increment_block_number "gc-eu:64 gc-eu-mq:0 gc-jp:64 gc-jp-ce:64 gc-jp-mq:64 gc-us:64 gc-us-mq:64"
+#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"
 
 #if OOT_DEBUG
 /**
diff --git a/src/code/z_debug.c b/src/code/z_debug.c
index 51ce1c880b..4b2d41fd4a 100644
--- a/src/code/z_debug.c
+++ b/src/code/z_debug.c
@@ -1,6 +1,6 @@
 #include "global.h"
 
-#pragma increment_block_number "gc-eu:128 gc-eu-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"
 
 typedef struct DebugCamTextBufferEntry {
     /* 0x0 */ u8 x;
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index f75aceff66..2d0117e10f 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -212,7 +212,7 @@ s16 sLightningFlashAlpha;
 s16 sSunDepthTestX;
 s16 sSunDepthTestY;
 
-#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:96 gc-jp-ce:96 gc-jp-mq:96 gc-us:96 gc-us-mq:96"
 
 LightNode* sNGameOverLightNode;
 LightInfo sNGameOverLightInfo;
diff --git a/src/code/z_message.c b/src/code/z_message.c
index 92469e2c68..cfda0b4b1b 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -166,6 +166,8 @@ s16 gOcarinaSongItemMap[] = {
     OCARINA_SONG_SARIAS,   OCARINA_SONG_SUNS,    OCARINA_SONG_TIME,     OCARINA_SONG_STORMS,
 };
 
+#pragma increment_block_number "gc-eu:128"
+
 s32 sCharTexSize;
 s32 sCharTexScale;
 s16 sOcarinaButtonAPrimR;
diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c
index d4fb1dd228..e75a5020c6 100644
--- a/src/overlays/actors/ovl_Fishing/z_fishing.c
+++ b/src/overlays/actors/ovl_Fishing/z_fishing.c
@@ -14,7 +14,7 @@
 #include "cic6105.h"
 #endif
 
-#pragma increment_block_number "gc-eu:156 gc-eu-mq:156 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192"
+#pragma increment_block_number "gc-eu:156 gc-eu-mq:156 gc-jp:158 gc-jp-ce:158 gc-jp-mq:158 gc-us:158 gc-us-mq:158"
 
 #define FLAGS ACTOR_FLAG_4