diff --git a/Makefile b/Makefile index 0ef65826..05bcf670 100644 --- a/Makefile +++ b/Makefile @@ -132,6 +132,7 @@ pokesilver_debug_opt = -cjsv -t POKEMON_SLV -i AAXE -k 01 -l 0x33 -m 0x10 -r 3 - %.gbc: $$(%_obj) layout.link $(RGBLINK) -n $*.sym -m $*.map -l layout.link -o $@ $(filter %.o,$^) $(RGBFIX) $($*_opt) $@ + tools/stadium $@ ### LZ compression rules diff --git a/data/stadium/stadium_gold.bin b/data/stadium/stadium_gold.bin deleted file mode 100644 index 1b690363..00000000 --- a/data/stadium/stadium_gold.bin +++ /dev/null @@ -1 +0,0 @@ -N64PS3ènZãÝÔ[ —0ƒ5ÊiBušQ]0U`¢5Ѷ*L¸P%'gìER^]×’îƒÝþþ@jtYÀ„Ôìi¼O8Ѐ²SXõþþXxÃþþþþDTÉ.�*ŽçÄœáš6ë3Ü4Vò_“Uð„-N7�¿óœ„Ke—œRÄÞÔ1ܦz�)—þþþþ§ã^‡@ ‰ýKÅó9’øþþþþþþþþþþþþþþš{muì‡Å¨þþþþþþþþÂôbqþþþþGò6_W›*YÁ‚'.õEþŠþþþþþþþþ)gþþˆyÖÆÇyYk·iuÞ%„þH¬ËKmÀͼB>A²aþþŒ½0¹¬ðÆÑ¥þþü扟\RÕµ°&U+y:;þþ$ÛÎiþþ-òC)=>ˆþþXüþþø¸·Ê·i‰*=þþäéþþe/þþålþþþYþþiÉþþA–ÃíI_þþþþ7þþ©þþby•¶\jþþ<^þþÍa©Ôr}þþ´ÍiØÌþþ¥Ëþþþþþþk쵩Œ1rhê¯þþþþþþâ:þþêËþþДþþmÂþþÔ®þþ±>7á…‚þþþþþþ™þþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþU% \ No newline at end of file diff --git a/data/stadium/stadium_gold_debug.bin b/data/stadium/stadium_gold_debug.bin deleted file mode 100644 index 665a5fcc..00000000 --- a/data/stadium/stadium_gold_debug.bin +++ /dev/null @@ -1 +0,0 @@ -N64PS3�JZßÞnøkl—,ƒ5É]B£u–Q˜1P`¢5Ѷ*L¸P&gìER^]×’îƒóþþ@jtYÀ„Õi¼K8ü–²SXõþþXxÃþþþþD|É.�*ŽçÄœáš6ë3Ü4Vò_“Uð„-N7�¿óœ„Ke—œRÄÞÔ1ܦz�,Ôþþþþ§ù^‡C‡‰ýKÅó{’øþþþþþþþþþþþþþþš{muì‡Å¨þþþþþþþþÂôbqþþþþGò6_W›*YÁ‚'.õEþŠþþþþþþþþ)gþþˆyÖÆÇyYjÎiuÞ%„þH¬ËKmÀͼB>A²aþþŒ½0¹¬ðÆÑ¥þþü扟\RÕµ°&U+y:;þþ$ÛÎiþþ-òC)=>ˆþþXüþþø¸·Ê·i‰*=þþäéþþe/þþålþþþYþþiÉþþA–ÃíI_þþþþ7þþ©þþby•¶\jþþ<^þþÍa©Ôr}þþ´ÍiØÌþþ¥Ëþþþþþþk쵩Œ1rhê¯þþþþþþâ:þþêËþþДþþmÂþþÔ®þþ±>7á…‚þþþþþþÍ|6øþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþUJ \ No newline at end of file diff --git a/data/stadium/stadium_silver.bin b/data/stadium/stadium_silver.bin deleted file mode 100644 index 7e092ab1..00000000 --- a/data/stadium/stadium_silver.bin +++ /dev/null @@ -1,2 +0,0 @@ -N64PS3yPZ©Ý1VB÷–Þ|ÍÇé<%v1Pe0-`�5Ѷ*L¸P%'gìE2^]Öõ§ƒžþþ@jtYÀ„Ô²i¼8$€²SX§þþ¿4±äþþþþCdÉ.h#¿Vå6â6Q©þ2)´w³hdÀ΢™% -ñå—«e‘ØëQ
A²aþþŒ¹0¹¬ðÆÑ¥þþü扟\RÕµ°&U+y:;þþ$ÛÎiþþ-òC)=>ˆþþXüþþø¸·Ê·i‰*=þþäéþþe/þþålþþþYþþiÉþþA–ÃíI_þþþþ7þþ©þþby•¶\jþþ<^þþÍa©Ôr}þþ´ÍiØÌþþ¥Ëþþþþþþk쵩Œ1rhê¯þþþþþþÃ"þþäïþþÝÊþþ{þþÔ®þþ±>7á…‚þþþþþþš¬þþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþR¹ \ No newline at end of file diff --git a/data/stadium/stadium_silver_debug.bin b/data/stadium/stadium_silver_debug.bin deleted file mode 100644 index cd1d857f..00000000 --- a/data/stadium/stadium_silver_debug.bin +++ /dev/null @@ -1,2 +0,0 @@ -N64PS3ø¡Z¥ÝËÎR®–Ú|ÍÈÛ<©v-P 1(`�5Ѷ*L¸P&gìE2^]Öõ§ƒ´þþ@jtYÀ„ÔÈi¼8P–²SX§þþ¿4±äþþþþCŒÉ.h#¿Vå6â6Q©þ2)´w³hdÀ΢™% -ñå—«e‘ØëQ
A²aþþŒ¹0¹¬ðÆÑ¥þþü扟\RÕµ°&U+y:;þþ$ÛÎiþþ-òC)=>ˆþþXüþþø¸·Ê·i‰*=þþäéþþe/þþålþþþYþþiÉþþA–ÃíI_þþþþ7þþ©þþby•¶\jþþ<^þþÍa©Ôr}þþ´ÍiØÌþþ¥Ëþþþþþþk쵩Œ1rhê¯þþþþþþÃ"þþäïþþÝÊþþ{þþÔ®þþ±>7á…‚þþþþþþÍ|7¦þþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþSÇ
\ No newline at end of file
diff --git a/layout.link b/layout.link
index d740a955..ec891bbf 100644
--- a/layout.link
+++ b/layout.link
@@ -251,7 +251,7 @@ ROMX $70
"bank70_2"
ROMX $7f
org $7df8
- "Stadium Data"
+ "Stadium 2 Checksums"
WRAM0
"Audio RAM"
"WRAM"
diff --git a/main.asm b/main.asm
index c01fdf41..31197dbc 100644
--- a/main.asm
+++ b/main.asm
@@ -439,18 +439,12 @@ INCBIN "gfx/pokegear/pokegear.2bpp.lz"
INCLUDE "data/credits_strings.asm"
-SECTION "Stadium Data", ROMX
+SECTION "Stadium 2 Checksums", ROMX[$7DF8], BANK[$7F]
-IF DEF(_GOLD)
-IF DEF(_DEBUG)
-INCBIN "data/stadium/stadium_gold_debug.bin"
-ELSE
-INCBIN "data/stadium/stadium_gold.bin"
-ENDC
-ELIF DEF(_SILVER)
-IF DEF(_DEBUG)
-INCBIN "data/stadium/stadium_silver_debug.bin"
-ELSE
-INCBIN "data/stadium/stadium_silver.bin"
-ENDC
-ENDC
+; The end of the ROM is taken up by checksums of the content, apparently used
+; by Pokémon Stadium 2 due to the checksums' "N64PS3" header. (In Japan,
+; Pokémon Stadium Gold and Silver was the third Stadium release for N64.)
+; This SECTION reserves space for those checksums.
+; If it is removed, also remove the "tools/stadium" command in the Makefile.
+
+ ds $208
diff --git a/tools/Makefile b/tools/Makefile
index 797ee2c9..0d06aa07 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -7,7 +7,8 @@ tools := \
lzcomp \
png_dimensions \
scan_includes \
- gfx
+ gfx \
+ stadium
all: $(tools)
@:
diff --git a/tools/stadium.c b/tools/stadium.c
new file mode 100644
index 00000000..796b7fc2
--- /dev/null
+++ b/tools/stadium.c
@@ -0,0 +1,155 @@
+#include