diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2026-03-02 16:45:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-02 16:45:07 +0100 |
| commit | e66e6f8f1da067260ced7ec9abd415011cfab8bc (patch) | |
| tree | f0aca4261aec977236c2af50eab9bab919a5015e /include | |
| parent | 3d51e210200ef05059a42b5e1cdb7ab2d59348d6 (diff) | |
gc-eu-dbg OK (#2700)
* gc-eu-dbg OK
* cleanup/fortify makefile and line_numbers.h changes
* fill segments.csv
* add gc-eu-dbg to Jenkinsfile
* cleanup/fortify dmadata_table.h
* add gc-eu-dbg to readme
* fix checksum check and compressed checksum
Diffstat (limited to 'include')
| -rw-r--r-- | include/line_numbers.h | 46 | ||||
| -rw-r--r-- | include/tables/dmadata_table.h | 4 | ||||
| -rw-r--r-- | include/tables/dmadata_table_dbg.h (renamed from include/tables/dmadata_table_mqdbg.h) | 2 | ||||
| -rw-r--r-- | include/versions.h | 13 |
4 files changed, 36 insertions, 29 deletions
diff --git a/include/line_numbers.h b/include/line_numbers.h index adc2d654d..af1c95af4 100644 --- a/include/line_numbers.h +++ b/include/line_numbers.h @@ -7,33 +7,35 @@ // The "LN" macros defined here are not meant to be used directly. See the wrapper macros below. #if OOT_VERSION == NTSC_1_0 -#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (ntsc_1_0) +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (ntsc_1_0) #elif OOT_VERSION == NTSC_1_1 -#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (ntsc_1_1) +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (ntsc_1_1) #elif OOT_VERSION == PAL_1_0 -#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (pal_1_0) +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (pal_1_0) #elif OOT_VERSION == NTSC_1_2 -#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (ntsc_1_2) +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (ntsc_1_2) #elif OOT_VERSION == PAL_1_1 -#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (pal_1_1) +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (pal_1_1) #elif OOT_VERSION == GC_JP -#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_jp) +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_jp) #elif OOT_VERSION == GC_JP_MQ -#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_jp_mq) +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_jp_mq) #elif OOT_VERSION == GC_US -#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_us) +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_us) #elif OOT_VERSION == GC_US_MQ -#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_us_mq) +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_us_mq) #elif OOT_VERSION == GC_EU_MQ_DBG -#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_eu_mq_dbg) +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_eu_mq_dbg) +#elif OOT_VERSION == GC_EU_DBG +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_eu_dbg) #elif OOT_VERSION == GC_EU -#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_eu) +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_eu) #elif OOT_VERSION == GC_EU_MQ -#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_eu_mq) +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_eu_mq) #elif OOT_VERSION == GC_JP_CE -#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_jp_ce) +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (gc_jp_ce) #elif OOT_VERSION == IQUE_CN -#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (ique_cn) +#define LN(ntsc_1_0, ntsc_1_1, pal_1_0, ntsc_1_2, pal_1_1, gc_jp, gc_jp_mq, gc_us, gc_us_mq, gc_eu_mq_dbg, gc_eu_dbg, gc_eu, gc_eu_mq, gc_jp_ce, ique_cn) (ique_cn) #else #error "Unsupported OOT version" #endif @@ -48,22 +50,26 @@ // NTSC 1.0 and all the other versions #define LN1(ntsc_1_0, other) \ - LN(ntsc_1_0, other, other, other, other, other, other, other, other, other, other, other, other, other) + LN(ntsc_1_0, other, other, other, other, other, other, other, other, other, other, other, other, other, other) // NTSC 1.0, NTSC 1.1, and all the other versions #define LN2(ntsc_1_0, ntsc_1_1, other) \ - LN(ntsc_1_0, ntsc_1_1, other, other, other, other, other, other, other, other, other, other, other, other) + LN(ntsc_1_0, ntsc_1_1, other, other, other, other, other, other, other, other, other, other, other, other, other) // NTSC 1.0, iQue, GameCube, and all the other versions #define LN3(ntsc_1_0, other, ique, gc) \ - LN(ntsc_1_0, other, other, other, other, gc, gc, gc, gc, gc, gc, gc, gc, ique) + LN(ntsc_1_0, other, other, other, other, gc, gc, gc, gc, gc, gc, gc, gc, gc, ique) // NTSC 1.0, NTSC 1.1, iQue, GameCube, and all the other versions #define LN4(ntsc_1_0, ntsc_1_1, other, ique, gc) \ - LN(ntsc_1_0, ntsc_1_1, other, other, other, gc, gc, gc, gc, gc, gc, gc, gc, ique) + LN(ntsc_1_0, ntsc_1_1, other, other, other, gc, gc, gc, gc, gc, gc, gc, gc, gc, ique) -// NTSC 1.0, NTSC 1.1, NTSC 1.2/PAL 1.0, iQue, Gamecube US/JP, Gamecube EU, and Gamecube CE +// NTSC 1.0, NTSC 1.1, NTSC 1.2/PAL 1.0, iQue, GameCube US/JP, GameCube EU, and GameCube CE #define LN5(ntsc_1_0, ntsc_1_1, other, pal_1_1, ique, gc_ntsc, gc_eu, gc_jp_ce) \ - LN(ntsc_1_0, ntsc_1_1, other, other, pal_1_1, gc_ntsc, gc_ntsc, gc_ntsc, gc_ntsc, gc_eu, gc_eu, gc_eu, gc_jp_ce, ique) + LN(ntsc_1_0, ntsc_1_1, other, other, pal_1_1, gc_ntsc, gc_ntsc, gc_ntsc, gc_ntsc, gc_eu, gc_eu, gc_eu, gc_eu, gc_jp_ce, ique) + +// GameCube EU Debug and all the other versions +#define LN6(other, gc_eu_dbg) \ + LN(other, other, other, other, other, other, other, other, other, other, gc_eu_dbg, other, other, other, other) #endif diff --git a/include/tables/dmadata_table.h b/include/tables/dmadata_table.h index 739d16e1e..50bbab04b 100644 --- a/include/tables/dmadata_table.h +++ b/include/tables/dmadata_table.h @@ -3,8 +3,8 @@ /** * Select dmadata table for version */ -#if OOT_VERSION == GC_EU_MQ_DBG && !NON_MATCHING -#include "dmadata_table_mqdbg.h" +#if (OOT_VERSION == GC_EU_MQ_DBG || OOT_VERSION == GC_EU_DBG) && !NON_MATCHING +#include "dmadata_table_dbg.h" #else // For retail versions and non-matching builds, dmadata is generated from the specfile segments #include "dmadata_table_spec.h" diff --git a/include/tables/dmadata_table_mqdbg.h b/include/tables/dmadata_table_dbg.h index 9d07de886..fcddf34bd 100644 --- a/include/tables/dmadata_table_mqdbg.h +++ b/include/tables/dmadata_table_dbg.h @@ -1,5 +1,5 @@ /** - * Matching dmadata layout for PAL MQ Debug + * Matching dmadata layout for PAL MQ Debug and PAL Debug * * DEFINE_DMA_ENTRY should be used for all dmadata entries * - Argument 1: Name of the spec segment diff --git a/include/versions.h b/include/versions.h index 620b27999..01a0c1159 100644 --- a/include/versions.h +++ b/include/versions.h @@ -12,13 +12,14 @@ #define GC_US 8 #define GC_US_MQ 9 #define GC_EU_MQ_DBG 10 -#define GC_EU 11 -#define GC_EU_MQ 12 -#define GC_JP_CE 13 -#define IQUE_CN 14 +#define GC_EU_DBG 11 +#define GC_EU 12 +#define GC_EU_MQ 13 +#define GC_JP_CE 14 +#define IQUE_CN 15 // NTSC/PAL -#if OOT_VERSION == PAL_1_0 || OOT_VERSION == PAL_1_1 || OOT_VERSION == GC_EU || OOT_VERSION == GC_EU_MQ || OOT_VERSION == GC_EU_MQ_DBG +#if OOT_VERSION == PAL_1_0 || OOT_VERSION == PAL_1_1 || OOT_VERSION == GC_EU || OOT_VERSION == GC_EU_MQ || OOT_VERSION == GC_EU_DBG || OOT_VERSION == GC_EU_MQ_DBG #define OOT_NTSC 0 #define OOT_PAL 1 #else @@ -50,7 +51,7 @@ // Debug Assets // Due to asset extraction limitations, all versions will not have access to some assets present in debug ROMs // To allow the inclusion of debug features in any version there is a separation between DEBUG_FEATURES and DEBUG_ASSETS -#if OOT_VERSION == GC_EU_MQ_DBG && DEBUG_FEATURES +#if (OOT_VERSION == GC_EU_MQ_DBG || OOT_VERSION == GC_EU_DBG) && DEBUG_FEATURES #define DEBUG_ASSETS 1 #else #define DEBUG_ASSETS 0 |
