Set up build system for ique-cn (#2382)

* Set up build system for ique-cn * Fix size of fbdemo_circle assets * Treat iQue as NTSC and Use "NES" for Chinese text * Revert z_kanfont
zeldaret · Dec 21, 2024 · 471fe51 · 471fe51
1 parent 81df2d4
commit 471fe51
Show file tree

Hide file tree

Showing 34 changed files with 3,033 additions and 68 deletions.
diff --git a/Makefile b/Makefile
@@ -66,6 +66,7 @@ ifeq ($(VERSION),ntsc-1.0)
   REGION ?= JP
   PLATFORM := N64
   DEBUG_FEATURES ?= 0
+  BUILD_CREATOR := zelda@srd44
   BUILD_DATE := 98-10-21
   BUILD_TIME := 04:56:31
   REVISION := 0
@@ -74,13 +75,15 @@ else ifeq ($(VERSION),ntsc-1.1)
   REGION ?= JP
   PLATFORM := N64
   DEBUG_FEATURES ?= 0
+  BUILD_CREATOR := zelda@srd44
   BUILD_DATE := 98-10-26
   BUILD_TIME := 10:58:45
   REVISION := 1
 else ifeq ($(VERSION),pal-1.0)
   REGION ?= EU
   PLATFORM := N64
   DEBUG_FEATURES ?= 0
+  BUILD_CREATOR := zelda@srd44
   BUILD_DATE := 98-11-10
   BUILD_TIME := 14:34:22
   REVISION := 0
@@ -89,86 +92,95 @@ else ifeq ($(VERSION),ntsc-1.2)
   REGION ?= JP
   PLATFORM := N64
   DEBUG_FEATURES ?= 0
+  BUILD_CREATOR := zelda@srd44
   BUILD_DATE := 98-11-12
   BUILD_TIME := 18:17:03
   REVISION := 2
 else ifeq ($(VERSION),pal-1.1)
   REGION ?= EU
   PLATFORM := N64
   DEBUG_FEATURES ?= 0
+  BUILD_CREATOR := zelda@srd44
   BUILD_DATE := 98-11-18
   BUILD_TIME := 17:36:49
   REVISION := 1
 else ifeq ($(VERSION),gc-jp)
   REGION ?= JP
   PLATFORM := GC
   DEBUG_FEATURES ?= 0
+  BUILD_CREATOR := zelda@srd022j
   BUILD_DATE := 02-10-29
   BUILD_TIME := 23:49:53
   REVISION := 15
 else ifeq ($(VERSION),gc-jp-mq)
   REGION ?= JP
   PLATFORM := GC
   DEBUG_FEATURES ?= 0
+  BUILD_CREATOR := zelda@srd022j
   BUILD_DATE := 02-10-30
   BUILD_TIME := 00:15:15
   REVISION := 15
 else ifeq ($(VERSION),gc-us)
   REGION ?= US
   PLATFORM := GC
   DEBUG_FEATURES ?= 0
+  BUILD_CREATOR := zelda@srd022j
   BUILD_DATE := 02-12-19
   BUILD_TIME := 13:28:09
   REVISION := 15
 else ifeq ($(VERSION),gc-us-mq)
   REGION ?= US
   PLATFORM := GC
   DEBUG_FEATURES ?= 0
+  BUILD_CREATOR := zelda@srd022j
   BUILD_DATE := 02-12-19
   BUILD_TIME := 14:05:42
   REVISION := 15
 else ifeq ($(VERSION),gc-eu-mq-dbg)
   REGION ?= EU
   PLATFORM := GC
   DEBUG_FEATURES ?= 1
+  BUILD_CREATOR := zelda@srd022j
   BUILD_DATE := 03-02-21
   BUILD_TIME := 00:16:31
   REVISION := 15
 else ifeq ($(VERSION),gc-eu)
   REGION ?= EU
   PLATFORM := GC
   DEBUG_FEATURES ?= 0
+  BUILD_CREATOR := zelda@srd022j
   BUILD_DATE := 03-02-21
   BUILD_TIME := 20:12:23
   REVISION := 15
 else ifeq ($(VERSION),gc-eu-mq)
   REGION ?= EU
   PLATFORM := GC
   DEBUG_FEATURES ?= 0
+  BUILD_CREATOR := zelda@srd022j
   BUILD_DATE := 03-02-21
   BUILD_TIME := 20:37:19
   REVISION := 15
 else ifeq ($(VERSION),gc-jp-ce)
   REGION ?= JP
   PLATFORM := GC
   DEBUG_FEATURES ?= 0
+  BUILD_CREATOR := zelda@srd022j
   BUILD_DATE := 03-10-08
   BUILD_TIME := 21:53:00
   REVISION := 15
+else ifeq ($(VERSION),ique-cn)
+  COMPARE := 0
+  REGION ?= US
+  PLATFORM := IQUE
+  DEBUG_FEATURES ?= 0
+  BUILD_CREATOR := [email protected]
+  BUILD_DATE := 03-10-22
+  BUILD_TIME := 16:23:19
+  REVISION := 0
 else
 $(error Unsupported version $(VERSION))
 endif
 
-ifeq ($(PLATFORM),N64)
-  BUILD_CREATOR := zelda@srd44
-  LIBULTRA_VERSION := I
-  LIBULTRA_PATCH := 1
-else
-  BUILD_CREATOR := zelda@srd022j
-  LIBULTRA_VERSION := L
-  LIBULTRA_PATCH := 0
-endif
-
 # ORIG_COMPILER cannot be combined with a non-IDO compiler. Check for this case and error out if found.
 ifneq ($(COMPILER),ido)
   ifeq ($(ORIG_COMPILER),1)
@@ -196,6 +208,22 @@ VENV := .venv
 MAKE = make
 CPPFLAGS += -P -xc -fno-dollars-in-identifiers
 
+ifeq ($(PLATFORM),N64)
+  CPP_DEFINES += -DPLATFORM_N64=1 -DPLATFORM_GC=0 -DPLATFORM_IQUE=0
+  LIBULTRA_VERSION := I
+  LIBULTRA_PATCH := 1
+else ifeq ($(PLATFORM),GC)
+  CPP_DEFINES += -DPLATFORM_N64=0 -DPLATFORM_GC=1 -DPLATFORM_IQUE=0
+  LIBULTRA_VERSION := L
+  LIBULTRA_PATCH := 0
+else ifeq ($(PLATFORM),IQUE)
+  CPP_DEFINES += -DPLATFORM_N64=0 -DPLATFORM_GC=0 -DPLATFORM_IQUE=1
+  LIBULTRA_VERSION := L
+  LIBULTRA_PATCH := 0
+else
+$(error Unsupported platform $(PLATFORM))
+endif
+
 # Converts e.g. ntsc-1.0 to NTSC_1_0
 VERSION_MACRO := $(shell echo $(VERSION) | tr a-z-. A-Z__)
 CPP_DEFINES += -DOOT_VERSION=$(VERSION_MACRO) -DOOT_REVISION=$(REVISION)
@@ -204,14 +232,6 @@ CPP_DEFINES += -DBUILD_CREATOR="\"$(BUILD_CREATOR)\"" -DBUILD_DATE="\"$(BUILD_DA
 CPP_DEFINES += -DLIBULTRA_VERSION=LIBULTRA_VERSION_$(LIBULTRA_VERSION)
 CPP_DEFINES += -DLIBULTRA_PATCH=$(LIBULTRA_PATCH)
 
-ifeq ($(PLATFORM),N64)
-  CPP_DEFINES += -DPLATFORM_N64=1 -DPLATFORM_GC=0
-else ifeq ($(PLATFORM),GC)
-  CPP_DEFINES += -DPLATFORM_N64=0 -DPLATFORM_GC=1
-else
-  $(error Unsupported platform $(PLATFORM))
-endif
-
 ifeq ($(DEBUG_FEATURES),1)
   CPP_DEFINES += -DDEBUG_FEATURES=1
   OPTFLAGS := -O2

diff --git a/assets/xml/objects/object_mag_ique.xml b/assets/xml/objects/object_mag_ique.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_mag" Segment="6">
+        <Texture Name="gTitleZeldaShieldLogoTex" OutName="title_zelda_shield_logo" Format="rgba32" Width="160" Height="160" Offset="0x0"/>
+        <Texture Name="gTitleCopyright19982003Tex" OutName="title_copyright_19982003" Format="ia8" Width="128" Height="16" Offset="0x19000"/>
+        <Texture Name="gTitleCopyright2003iQueTex" OutName="title_copyright_2003_ique" Format="ia8" Width="128" Height="16" Offset="0x19800"/>
+        <Texture Name="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x1A000"/>
+        <Texture Name="gTitleEffectMask00Tex" OutName="title_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x1A300"/>
+        <Texture Name="gTitleEffectMask01Tex" OutName="title_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0x1AB00"/>
+        <Texture Name="gTitleEffectMask02Tex" OutName="title_effect_mask_0_2" Format="i4" Width="64" Height="64" Offset="0x1B300"/>
+        <Texture Name="gTitleEffectMask10Tex" OutName="title_effect_mask_1_0" Format="i4" Width="64" Height="64" Offset="0x1BB00"/>
+        <Texture Name="gTitleEffectMask11Tex" OutName="title_effect_mask_1_1" Format="i4" Width="64" Height="64" Offset="0x1C300"/>
+        <Texture Name="gTitleEffectMask12Tex" OutName="title_effect_mask_1_2" Format="i4" Width="64" Height="64" Offset="0x1CB00"/>
+        <Texture Name="gTitleEffectMask20Tex" OutName="title_effect_mask_2_0" Format="i4" Width="64" Height="64" Offset="0x1D300"/>
+        <Texture Name="gTitleEffectMask21Tex" OutName="title_effect_mask_2_1" Format="i4" Width="64" Height="64" Offset="0x1DB00"/>
+        <Texture Name="gTitleEffectMask22Tex" OutName="title_effect_mask_2_2" Format="i4" Width="64" Height="64" Offset="0x1E300"/>
+        <Texture Name="gTitleFlameEffectTex" OutName="title_flame_effect" Format="i8" Width="32" Height="32" Offset="0x1EB00"/>
+        <Texture Name="gTitleTheLegendOfTextTex" OutName="title_the_legend_of_text" Format="i8" Width="72" Height="8" Offset="0x1EF00"/>
+        <Texture Name="gTitleOcarinaOfTimeTMTextTex" OutName="title_ocarina_of_time_tm_text" Format="i8" Width="96" Height="8" Offset="0x1F140"/>
+        <Texture Name="gTitleTitleCNTex" OutName="title_title_cn" Format="i8" Width="128" Height="16" Offset="0x1F440"/>
+    </File>
+</Root>
diff --git a/assets/xml/overlays/ovl_End_Title_ique.xml b/assets/xml/overlays/ovl_End_Title_ique.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="ovl_End_Title">
+        <DList Name="sEmptyDL1" Offset="0x0"/>
+        <Texture Name="sIQueTop" OutName="ique_top" Format="ia8" Width="128" Height="24" Offset="0x8"/>
+        <Texture Name="sIQueBottom" OutName="ique_bottom" Format="ia8" Width="128" Height="24" Offset="0xC08"/>
+        <DList Name="sEmptyDL2" Offset="0x1808"/>
+        <Texture Name="sNintendoLeftTex" OutName="nintendo_left" Format="ia8" Width="64" Height="48" Offset="0x1810"/>
+        <DList Name="sEmptyDL3" Offset="0x2410"/>
+        <Texture Name="sNintendoRightTex" OutName="nintendo_right" Format="ia8" Width="64" Height="48" Offset="0x2418"/>
+        <DList Name="sEmptyDL4" Offset="0x3018"/>
+        <Texture Name="sPresentedByTex" OutName="presented_by" Format="ia8" Width="96" Height="16" Offset="0x3020"/>
+        <DList Name="sEmptyDL5" Offset="0x3620"/>
+        <Texture Name="sTheEndTex" OutName="the_end" Format="ia8" Width="80" Height="24" Offset="0x3628"/>
+        <DList Name="sEmptyDL6" Offset="0x3DA8"/>
+        <Texture Name="sTheLegendOfZeldaTex" OutName="the_legend_of_zelda" Format="ia8" Width="120" Height="24" Offset="0x3DB0"/>
+        <DList Name="sEmptyDL7" Offset="0x48F0"/>
+        <Texture Name="sOcarinaOfTimeTex" OutName="ocarina_of_time" Format="ia8" Width="112" Height="16" Offset="0x48F8"/>
+
+        <Array Name="sTriforceVtx" Count="6" Offset="0x4FF8">
+            <Vtx/>
+        </Array>
+        <DList Name="sTriforceDL" Offset="0x5058"/>
+
+        <DList Name="sPresentedByNintendoDL" Offset="0x50B8"/>
+    </File>
+</Root>