Configure incbins in version config instead of using the Debug ROM (#2005)

* Run CPP for data/*.s

* Configure incbins in version config instead of using the Debug ROM

8 files changed, 56 insertions, 53 deletions

diff --git a/data/audio_tables.rodata.s b/data/audio_tables.rodata.s
index 5e76a127b..4f6655c86 100644
--- a/data/audio_tables.rodata.s
+++ b/data/audio_tables.rodata.s
@@ -1,22 +1,22 @@
 .include "macro.inc"
 
-# assembler directives
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-.set gp=64     # allow use of 64-bit general purpose registers
+/* assembler directives */
+.set noat      /* allow manual use of $at */
+.set noreorder /* don't insert nops after branches */
+.set gp=64     /* allow use of 64-bit general purpose registers */
 
 .section .rodata
 
 .balign 16
 
 glabel gSoundFontTable
-    .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBCC270, 0x270
+    .incbin "incbin/gSoundFontTable"
 
 glabel gSequenceFontTable
-    .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBCC4E0, 0x1C0
+    .incbin "incbin/gSequenceFontTable"
 
 glabel gSequenceTable
-    .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBCC6A0, 0x6F0
+    .incbin "incbin/gSequenceTable"
 
 glabel gSampleBankTable
-    .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBCCD90, 0x80
+    .incbin "incbin/gSampleBankTable"
diff --git a/data/rsp.rodata.s b/data/rsp.rodata.s
index f3df8983f..bdb9fe991 100644
--- a/data/rsp.rodata.s
+++ b/data/rsp.rodata.s
@@ -1,30 +1,30 @@
 .include "macro.inc"
 
-# assembler directives
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-.set gp=64     # allow use of 64-bit general purpose registers
+/* assembler directives */
+.set noat      /* allow manual use of $at */
+.set noreorder /* don't insert nops after branches */
+.set gp=64     /* allow use of 64-bit general purpose registers */
 
 .section .rodata
 
 .balign 16
 
 glabel aspMainDataStart
-    .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBCCE10, 0x2E0
+    .incbin "incbin/aspMainData"
 glabel aspMainDataEnd
 
 glabel gspF3DZEX2_NoN_PosLight_fifoTextStart
-    .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBCD0F0, 0x1630
+    .incbin "incbin/gspF3DZEX2_NoN_PosLight_fifoText"
 glabel gspF3DZEX2_NoN_PosLight_fifoTextEnd
 
 glabel gspF3DZEX2_NoN_PosLight_fifoDataStart
-    .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBCE720, 0x420
+    .incbin "incbin/gspF3DZEX2_NoN_PosLight_fifoData"
 glabel gspF3DZEX2_NoN_PosLight_fifoDataEnd
 
 glabel gspS2DEX2d_fifoDataStart
-    .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBCEB40, 0x390
+    .incbin "incbin/gspS2DEX2d_fifoData"
 glabel gspS2DEX2d_fifoDataEnd
 
 glabel njpgdspMainDataStart
-    .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBCEED0, 0x60
+    .incbin "incbin/njpgdspMainData"
 glabel njpgdspMainDataEnd
diff --git a/data/rsp.text.s b/data/rsp.text.s
index 045d8d614..fcf48a251 100644
--- a/data/rsp.text.s
+++ b/data/rsp.text.s
@@ -1,22 +1,22 @@
 .include "macro.inc"
 
-# assembler directives
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-.set gp=64     # allow use of 64-bit general purpose registers
+/* assembler directives */
+.set noat      /* allow manual use of $at */
+.set noreorder /* don't insert nops after branches */
+.set gp=64     /* allow use of 64-bit general purpose registers */
 
 .section .text
 
 .balign 16
 
 glabel aspMainTextStart
-    .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xB89260, 0xFB0
+    .incbin "incbin/aspMainText"
 glabel aspMainTextEnd
 
 glabel gspS2DEX2d_fifoTextStart
-    .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xB8A210, 0x18C0
+    .incbin "incbin/gspS2DEX2d_fifoText"
 glabel gspS2DEX2d_fifoTextEnd
 
 glabel njpgdspMainTextStart
-    .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xB8BAD0, 0xAF0
+    .incbin "incbin/njpgdspMainText"
 glabel njpgdspMainTextEnd
diff --git a/data/rsp_boot.text.s b/data/rsp_boot.text.s
index 01fe3f0a7..59c9ffc27 100644
--- a/data/rsp_boot.text.s
+++ b/data/rsp_boot.text.s
@@ -1,14 +1,14 @@
 .include "macro.inc"
 
-# assembler directives
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-.set gp=64     # allow use of 64-bit general purpose registers
+/* assembler directives */
+.set noat      /* allow manual use of $at */
+.set noreorder /* don't insert nops after branches */
+.set gp=64     /* allow use of 64-bit general purpose registers */
 
 .section .text
 
 .balign 16
 
 glabel rspbootTextStart
-    .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0x9F20, 0xD0
+    .incbin "incbin/rspbootText"
 glabel rspbootTextEnd
diff --git a/data/unk_800093F0.data.s b/data/unk_800093F0.data.s
index 380dbe64b..bf8a636c0 100644
--- a/data/unk_800093F0.data.s
+++ b/data/unk_800093F0.data.s
@@ -1,17 +1,18 @@
 .include "macro.inc"
 
-# assembler directives
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-.set gp=64     # allow use of 64-bit general purpose registers
+/* assembler directives */
+.set noat      /* allow manual use of $at */
+.set noreorder /* don't insert nops after branches */
+.set gp=64     /* allow use of 64-bit general purpose registers */
 
 .section .data
 
 .balign 16
 
-# Unused.
-# This appears to be RSP code, however it is not part of
-# rspboot as rspbootTextEnd is at this symbol
+/* Unused.
+ * This appears to be RSP code, however it is not part of
+ * rspboot as rspbootTextEnd is at this symbol.
+ */
 glabel D_800093F0
     .word 0xE80C2001 # sqv     $v12[0], 0x10($zero)
     .word 0x34014000 # li      $1, 0x4000
diff --git a/data/unk_80009410.data.s b/data/unk_80009410.data.s
index d2bded6c3..8ff273e22 100644
--- a/data/unk_80009410.data.s
+++ b/data/unk_80009410.data.s
@@ -1,15 +1,15 @@
 .include "macro.inc"
 
-# assembler directives
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-.set gp=64     # allow use of 64-bit general purpose registers
+/* assembler directives */
+.set noat      /* allow manual use of $at */
+.set noreorder /* don't insert nops after branches */
+.set gp=64     /* allow use of 64-bit general purpose registers */
 
 .section .data
 
 .balign 16
 
-# Unused
+/* Unused */
 glabel D_80009410
     .word osStopThread
     .word __osSetHWIntrRoutine
diff --git a/data/unk_8012ABC0.data.s b/data/unk_8012ABC0.data.s
index 31e03580e..7f99d09e0 100644
--- a/data/unk_8012ABC0.data.s
+++ b/data/unk_8012ABC0.data.s
@@ -1,15 +1,15 @@
 .include "macro.inc"
 
-# assembler directives
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-.set gp=64     # allow use of 64-bit general purpose registers
+/* assembler directives */
+.set noat      /* allow manual use of $at */
+.set noreorder /* don't insert nops after branches */
+.set gp=64     /* allow use of 64-bit general purpose registers */
 
 .section .data
 
 .balign 16
 
-# Unused
+/* Unused */
 glabel D_8012ABC0
     .word fmodf
     .word guScale
diff --git a/data/z_text.data.s b/data/z_text.data.s
index 3fe890cdb..d2a76e0b8 100644
--- a/data/z_text.data.s
+++ b/data/z_text.data.s
@@ -1,18 +1,20 @@
 .include "macro.inc"
 
-# assembler directives
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-.set gp=64     # allow use of 64-bit general purpose registers
+/* assembler directives */
+.set noat      /* allow manual use of $at */
+.set noreorder /* don't insert nops after branches */
+.set gp=64     /* allow use of 64-bit general purpose registers */
 
 .section .data
 
 .balign 16
 
-# temporary file name, rename to something more appropriate when decompiled
+/* temporary file name, rename to something more appropriate when decompiled */
 
+#if OOT_DEBUG
 glabel gMojiFontTLUTs
-    .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBA18E0, 0x80
+    .incbin "incbin/gMojiFontTLUTs"
 
 glabel gMojiFontTex
-    .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBA1960, 0x400
+    .incbin "incbin/gMojiFontTex"
+#endif