more ruby/sapphire differences

14 files changed, 294 insertions, 40 deletions

diff --git a/data/data2.s b/data/data2.s
index df8383ab4..d83c82127 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -7001,11 +7001,21 @@ gUnknown_08393250: @ 8393250
 
 	.global gUnknown_083939EC
 gUnknown_083939EC: @ 83939EC
-	.incbin "baserom.gba", 0x003939ec, 0x20c
+	.ifdef SAPPHIRE
+	.incbin "graphics/title_screen/kyogre_map.bin.lz"
+	.else
+	.incbin "graphics/title_screen/groudon_map.bin.lz"
+	.endif
 
 	.global gUnknown_08393BF8
 gUnknown_08393BF8: @ 8393BF8
-	.incbin "baserom.gba", 0x00393bf8, 0x26c
+	.ifdef SAPPHIRE
+	.incbin "graphics/title_screen/water_map.bin.lz"
+	.else
+	.incbin "graphics/title_screen/lava_map.bin.lz"
+	.endif
+
+	.incbin "graphics/title_screen/logo_shine.4bpp.lz"
 
 	.global gUnknown_08393E64
 gUnknown_08393E64: @ 8393E64
@@ -11404,25 +11414,23 @@ gUnknown_083EDCDC: @ 83EDCDC
 
 	.global gUnknown_083EDCE4
 gUnknown_083EDCE4: @ 83EDCE4
-	.incbin "baserom.gba", 0x3EDCE4, 0x18
-Unknown_83EDCFC:
-	.incbin "baserom.gba", 0x3EDCFC, 0x2
-Unknown_83EDCFE:
-	.incbin "baserom.gba", 0x3EDCFE, 0x2
-Unknown_83EDD00:
-	.incbin "baserom.gba", 0x3EDD00, 0x2
-Unknown_83EDD02:
-	.incbin "baserom.gba", 0x3EDD02, 0x2
-Unknown_83EDD04:
-	.incbin "baserom.gba", 0x3EDD04, 0x4
+	.4byte 0x08E997E8
+
+UnknownPalette_83EDCE8:
+	.ifdef SAPPHIRE
+	.incbin "graphics/unknown/sapphire_83EDD40.gbapal"
+	.else
+	.incbin "graphics/unknown/ruby_83EDCE8.gbapal"
+	.endif
 
+	.align 2
 	.global gUnknown_083EDD08
 gUnknown_083EDD08: @ 83EDD08
-	.4byte Unknown_83EDCFC
-	.4byte Unknown_83EDCFE
-	.4byte Unknown_83EDD00
-	.4byte Unknown_83EDD02
-	.4byte Unknown_83EDD04
+	.4byte UnknownPalette_83EDCE8 + 10 * 2
+	.4byte UnknownPalette_83EDCE8 + 11 * 2
+	.4byte UnknownPalette_83EDCE8 + 12 * 2
+	.4byte UnknownPalette_83EDCE8 + 13 * 2
+	.4byte UnknownPalette_83EDCE8 + 14 * 2
 
 	.global gUnknown_083EDD1C
 gUnknown_083EDD1C: @ 83EDD1C
@@ -13681,22 +13689,33 @@ SystemText_IntroGirl:
 	.string "GIRL$"
 SystemText_IntroNewName:
 	.string "NEW NAME$"
-SystemText_IntroBoyNameLandon:
+
+gDefaultBoyName1::
+	.ifdef SAPPHIRE
+	.string "SEAN$"
+	.else
 	.string "LANDON$"
-SystemText_IntroBoyNameTerry:
+	.endif
+gDefaultBoyName2::
 	.string "TERRY$"
-SystemText_IntroBoyNameSeth:
+gDefaultBoyName3::
 	.string "SETH$"
-SystemText_IntroBoyNameTom:
+gDefaultBoyName4::
 	.string "TOM$"
-SystemText_IntroGirlNameTerra:
+
+gDefaultGirlName1::
+	.ifdef SAPPHIRE
+	.string "MARINA$"
+	.else
 	.string "TERRA$"
-SystemText_IntroGirlNameKimmy:
+	.endif
+gDefaultGirlName2::
 	.string "KIMMY$"
-SystemText_IntroGirlNameNicola:
+gDefaultGirlName3::
 	.string "NICOLA$"
-SystemText_IntroGirlNameSara:
+gDefaultGirlName4::
 	.string "SARA$"
+
 SystemText_IntroWeCall:
 	.string "This is what we call\na POKéMON.$"
 
@@ -14067,7 +14086,7 @@ OtherText_TheField2:
 OtherText_ThePC:
 	.string "the PC.$"
 
-	.align 1
+	.align 2
 	.global gUnknown_0840E740
 gUnknown_0840E740: @ 840E740
 	.4byte OtherText_TheField3
diff --git a/data/graphics.s b/data/graphics.s
index a24aaf150..717007b9b 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -945,7 +945,11 @@ gUnknown_08E95774: @ 8E95774
 
 	.global gUnknown_08E95A18
 gUnknown_08E95A18: @ 8E95A18
-	.incbin "baserom.gba", 0x00e95a18, 0xa0
+	.ifdef SAPPHIRE
+	.incbin "graphics/slot_machine/sapphire.gbapal"
+	.else
+	.incbin "graphics/slot_machine/ruby.gbapal"
+	.endif
 
 	.global gUnknown_08E95AB8
 gUnknown_08E95AB8: @ 8E95AB8
@@ -1055,7 +1059,9 @@ gUnknown_08E9CA24: @ 8E9CA24
 
 	.global gUnknown_08E9CA44
 gUnknown_08E9CA44: @ 8E9CA44
-	.incbin "baserom.gba", 0x00e9ca44, 0xe88
+	.incbin "baserom.gba", 0x00e9ca44, 0xe68
+
+	.incbin "graphics/title_screen/logo_shine.gbapal"
 
 	.global gUnknown_08E9D8CC
 gUnknown_08E9D8CC: @ 8E9D8CC
diff --git a/data/text/credits.s b/data/text/credits.s
index b9473a170..a871858fc 100644
--- a/data/text/credits.s
+++ b/data/text/credits.s
@@ -271,7 +271,11 @@ Text_RNZFotB:
 Text_CreditsTerminator:
 	.string "$"
 Text_Version:
+	.ifdef SAPPHIRE
+	.string "{PALETTE 9}POKéMON SAPPHIRE VERSION$"
+	.else
 	.string "{PALETTE 9}POKéMON RUBY VERSION$"
+	.endif
 
 @ pointer table
 
diff --git a/graphics/slot_machine/ruby.pal b/graphics/slot_machine/ruby.pal
new file mode 100644
index 000000000..fdda7e667
--- /dev/null
+++ b/graphics/slot_machine/ruby.pal
@@ -0,0 +1,83 @@
+JASC-PAL
+0100
+80
+0 0 0
+57 57 49
+230 230 230
+255 255 255
+222 41 0
+246 90 0
+255 164 0
+255 0 255
+222 41 0
+255 164 41
+57 148 255
+164 222 255
+0 49 123
+139 0 0
+98 98 90
+0 0 0
+222 222 222
+255 255 255
+222 41 0
+255 90 0
+222 41 0
+255 90 0
+222 41 0
+255 90 0
+222 41 0
+255 90 0
+222 41 0
+255 90 0
+222 41 0
+255 0 255
+156 0 0
+0 0 0
+0 0 0
+255 255 255
+74 74 213
+115 172 255
+115 164 74
+156 238 74
+255 90 0
+255 164 41
+255 238 32
+222 41 0
+189 189 189
+156 156 156
+123 123 123
+90 90 90
+65 65 65
+0 0 0
+255 0 255
+255 255 255
+222 82 82
+255 131 123
+255 139 131
+255 156 148
+255 164 156
+255 180 172
+255 189 189
+255 205 205
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+0 0 0
+222 222 222
+246 90 0
+246 139 0
+255 255 255
+222 41 0
+0 0 197
+180 65 0
+180 65 0
+0 106 0
+0 106 0
+82 123 255
+246 156 0
+246 156 0
+41 180 82
+41 180 82
+0 0 0
diff --git a/graphics/slot_machine/sapphire.pal b/graphics/slot_machine/sapphire.pal
new file mode 100644
index 000000000..68d7f5b56
--- /dev/null
+++ b/graphics/slot_machine/sapphire.pal
@@ -0,0 +1,83 @@
+JASC-PAL
+0100
+80
+0 0 0
+57 57 49
+230 230 230
+255 255 255
+115 172 255
+49 74 213
+57 115 238
+255 0 255
+57 115 238
+255 164 41
+238 148 0
+255 205 65
+172 82 0
+0 0 106
+98 98 90
+0 0 0
+222 222 222
+255 255 255
+115 172 255
+255 90 0
+222 41 0
+255 90 0
+222 41 0
+255 90 0
+222 41 0
+255 90 0
+222 41 0
+255 90 0
+222 41 0
+255 0 255
+156 0 0
+0 0 0
+0 0 0
+255 255 255
+74 74 213
+115 172 255
+115 164 74
+156 238 74
+230 65 24
+255 164 41
+255 238 32
+115 172 255
+189 189 189
+156 156 156
+123 123 123
+90 90 90
+65 65 65
+0 0 0
+255 0 255
+255 255 255
+82 82 222
+131 131 255
+131 139 255
+148 156 255
+156 164 255
+172 180 255
+189 189 255
+205 205 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+0 0 0
+222 222 222
+65 90 213
+57 115 238
+255 255 255
+115 172 255
+0 0 197
+180 65 0
+180 65 0
+0 106 0
+0 106 0
+82 123 255
+246 156 0
+246 156 0
+41 180 82
+41 180 82
+0 0 0
diff --git a/graphics/title_screen/groudon_map.bin b/graphics/title_screen/groudon_map.bin
new file mode 100644
index 000000000..521a38c13
--- /dev/null
+++ b/graphics/title_screen/groudon_map.bin
diff --git a/graphics/title_screen/kyogre_glow.pal b/graphics/title_screen/kyogre_glow.pal
index 43f83d357..85c483666 100755
--- a/graphics/title_screen/kyogre_glow.pal
+++ b/graphics/title_screen/kyogre_glow.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 106 148 98
-65 0 0
+0 41 82
 255 255 255
-82 0 0
-32 0 0
 0 0 0
 0 0 0
 0 0 0
-255 123 0
-172 82 57
-164 65 49
-156 57 41
-148 41 32
-139 32 24
-115 0 0
-0 32 205
+0 0 0
+0 0 0
+0 0 0
+139 172 255
+106 148 222
+82 123 189
+49 98 156
+24 74 123
+0 49 98
+180 0 0
diff --git a/graphics/title_screen/kyogre_map.bin b/graphics/title_screen/kyogre_map.bin
new file mode 100644
index 000000000..be48f9dac
--- /dev/null
+++ b/graphics/title_screen/kyogre_map.bin
diff --git a/graphics/title_screen/lava_map.bin b/graphics/title_screen/lava_map.bin
new file mode 100644
index 000000000..aec4b50b0
--- /dev/null
+++ b/graphics/title_screen/lava_map.bin
@@ -0,0 +1 @@
+
ðððð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððððððððððððððððððððððððððððððððððð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððððððððððððððððððððððððððððððððððð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððððððððððððððððððððððððððððððððððð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððððððððððððððððððððððððððððððððððð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððððððððððððððððððððððððððððððððððð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððððððððððððððððððððððððððððððððððð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððððððððððððððððððððððððððððððððððð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððð
ðððððððððððððððððððððððððððððððððððð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð!ð"ð#ð$ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð1ð2ð3ð4ð
\ No newline at end of file
diff --git a/graphics/title_screen/logo_shine.pal b/graphics/title_screen/logo_shine.pal
new file mode 100644
index 000000000..561ab8f8f
--- /dev/null
+++ b/graphics/title_screen/logo_shine.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 156 98
+0 0 0
+148 156 164
+180 189 189
+222 222 238
+255 255 255
+255 0 0
+255 0 0
+255 0 0
+255 0 0
+255 0 0
+255 0 0
+255 0 0
+255 0 0
+255 0 0
+255 0 0
diff --git a/graphics/title_screen/logo_shine.png b/graphics/title_screen/logo_shine.png
new file mode 100644
index 000000000..4e17d2877
--- /dev/null
+++ b/graphics/title_screen/logo_shine.png
diff --git a/graphics/title_screen/water_map.bin b/graphics/title_screen/water_map.bin
new file mode 100644
index 000000000..5fda069b9
--- /dev/null
+++ b/graphics/title_screen/water_map.bin
@@ -0,0 +1 @@
+
ððððððððððððððððððððððððð
ððððððððððððððððððððððððððððððððððððððð!ð"ð#ð$ððððððððð
ððððððððððððð!ð"ð#ð$ðððð1ð2ð3ð4ððð
ðððððððððððð
ððððððð1ð2ð3ð4ðððððððððððððððð!ð"ð#ð$ððððððððððððððððððððððð!ð"ð#ð$ððð1ð2ð3ð4ððð!ð"ð#ð$ððððððððððððð
ðððð1ð2ð3ð4ððððððððð1ð2ð3ð4ðððððððððððððððððððððððððððððððððððð
ððððððððð!ð"ð#ð$ððððð
ðððððððððððððððððððððððð1ð2ð3ð4ðððððððððððððððððððð!ð"ð#ð$ðððððððððððððð!ð"ð#ð$ðððððððððððð1ð2ð3ð4ðððððððððððððð1ð2ð3ð4ðð
ðððððððððððððððððððððð
ðððððððððððððððððððððððððððððððððððððððððð!ð"ð#ð$ððððððððððððððððððð!ð"ð#ð$ððððððð1ð2ð3ð4ððððððððððððððððððð1ð2ð3ð4ððððððððððððððððð
ðððððððððððððððððððððððððððððððððððððððððððððððððððððððððððððððð!ð"ð#ð$ððððð
ðððððððððððððððððð
ðððððð1ð2ð3ð4ððððððððððððð
ðððððððððððððððððððððððð!ð"ð#ð$ððððððððððððððð!ð"ð#ð$ððððððððððð1ð2ð3ð4ððððð!ð"ð#ð$ððððððð1ð2ð3ð4ðððððð
ððððððððððððð1ð2ð3ð4ððððððððððððððððððððððð
ðððððððððððððððððð
ððððððð!ð"ð#ð$ððððððððððððððððððððððððððððð1ð2ð3ð4ðððð!ð"ð#ð$ððððððððððððððð!ð"ð#ð$ððððððððððð1ð2ð3ð4ððððððð
ðððððððð1ð2ð3ð4ððððððððððððð
ðððððððððððððððððððððð
ðððððððððððððððððð!ð"ð#ð$ððððððððððððððððððððð!ð"ð#ð$ððððð1ð2ð3ð4ððððððððððð!ð"ð#ð$ððððððð1ð2ð3ð4ððððððððððððððððððð1ð2ð3ð4ðððððððððððððððððððððððððððððððððð
\ No newline at end of file
diff --git a/graphics/unknown/ruby_83EDCE8.pal b/graphics/unknown/ruby_83EDCE8.pal
new file mode 100644
index 000000000..16bd59843
--- /dev/null
+++ b/graphics/unknown/ruby_83EDCE8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+222 222 222
+246 90 0
+246 139 0
+255 255 255
+222 41 0
+0 164 238
+238 131 0
+238 131 0
+0 222 0
+0 222 0
+139 255 255
+255 238 106
+255 238 106
+148 255 148
+148 255 148
+0 0 0
diff --git a/graphics/unknown/sapphire_83EDD40.pal b/graphics/unknown/sapphire_83EDD40.pal
new file mode 100644
index 000000000..87fa9925b
--- /dev/null
+++ b/graphics/unknown/sapphire_83EDD40.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+222 222 222
+65 90 213
+57 115 238
+255 255 255
+115 172 255
+0 180 255
+255 148 0
+255 148 0
+0 238 0
+0 238 0
+139 255 255
+255 238 106
+255 238 106
+148 255 148
+148 255 148
+0 0 0