changed charmap, some intro stuff and added roms sha1

10 files changed, 52 insertions, 19 deletions

diff --git a/charmap.asm b/charmap.asm
index f0967978..c73989e7 100644
--- a/charmap.asm
+++ b/charmap.asm
@@ -150,20 +150,52 @@
 	charmap "y",         $b8
 	charmap "z",         $b9
 
-	charmap "é",         $ba
-	charmap "'d",        $bb
-	charmap "'l",        $bc
-	charmap "'s",        $bd
-	charmap "'t",        $be
-	charmap "'v",        $bf
+	charmap "à",         $ba
+	charmap "è",         $bb
+	charmap "é",         $bc
+	charmap "ù",         $bd
+	charmap "À",         $be
+	charmap "Á",         $bf
+	charmap "Ä",         $c0
+	charmap "Ö",         $c1
+	charmap "Ü",         $c2
+	charmap "ä",         $c3
+	charmap "ö",         $c4
+	charmap "ü",         $c5
+	charmap "È",         $c6
+	charmap "É",         $c7
+	charmap "Ì",         $c8
+	charmap "Í",         $c9
+	charmap "Ñ",         $ca
+	charmap "Ò",         $cb
+	charmap "Ó",         $cc
+	charmap "Ù",         $cd
+	charmap "Ú",         $ce
+	charmap "á",         $cf
+	charmap "ì",         $d0
+	charmap "í",         $d1
+	charmap "ñ",         $d2
+	charmap "ò",         $d3
+	charmap "ó",         $d4
+	charmap "ú",         $d5
+	charmap "º",         $d6
+	charmap "&",         $d7
+
+	charmap "'d",        $d8
+	charmap "'l",        $d9
+	charmap "'m",        $da
+	charmap "'r",        $db
+	charmap "'s",        $dc
+	charmap "'t",        $dd
+	charmap "'v",        $de
 
 	charmap "'",         $e0
 	charmap "<PK>",      $e1
 	charmap "<MN>",      $e2
 	charmap "-",         $e3
 
-	charmap "'r",        $e4
-	charmap "'m",        $e5
+	charmap "¿",         $e4
+	charmap "¡",         $e5
 
 	charmap "?",         $e6
 	charmap "!",         $e7
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index ef015795..2a405400 100755
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -42,7 +42,7 @@ DisplayTitleScreen:
 	call FarCopyData2
 	ld hl, GamefreakLogoGraphics
 	ld de, vTitleLogo2 tile (16 + 5)
-	ld bc, 9 tiles
+	ld bc, 10 tiles
 	ld a, BANK(GamefreakLogoGraphics)
 	call FarCopyData2
 	ld hl, PokemonLogoGraphics
@@ -111,7 +111,7 @@ DisplayTitleScreen:
 	jr .next
 
 .tileScreenCopyrightTiles
-	db $41,$42,$43,$42,$44,$42,$45,$46,$47,$48,$49,$4A,$4B,$4C,$4D,$4E ; ©'95.'96.'98 GAME FREAK inc.
+	db $41,$42,$43,$44,$42,$43,$4f,$46,$47,$48,$49,$4A,$4B,$4C,$4D,$4E ; ©1995-1999 GAME FREAK inc.
 
 .next
 	call SaveScreenTilesToBuffer2
@@ -376,16 +376,16 @@ LoadCopyrightAndTextBoxTiles:
 LoadCopyrightTiles:
 	ld de, NintendoCopyrightLogoGraphics
 	ld hl, vChars2 tile $60
-	lb bc, BANK(NintendoCopyrightLogoGraphics), (GamefreakLogoGraphicsEnd - NintendoCopyrightLogoGraphics) / $10
+	lb bc, BANK(NintendoCopyrightLogoGraphics), (GamefreakLogoGraphicsEnd - NintendoCopyrightLogoGraphics) / $0f
 	call CopyVideoData
 	hlcoord 2, 7
 	ld de, CopyrightTextString
 	jp PlaceString
 
 CopyrightTextString:
-	db   $60,$61,$62,$61,$63,$61,$64,$7F,$65,$66,$67,$68,$69,$6A             ; ©'95.'96.'98 Nintendo
-	next $60,$61,$62,$61,$63,$61,$64,$7F,$6B,$6C,$6D,$6E,$6F,$70,$71,$72     ; ©'95.'96.'98 Creatures inc.
-	next $60,$61,$62,$61,$63,$61,$64,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B ; ©'95.'96.'98 GAME FREAK inc.
+	db   $60,$61,$62,$63,$61,$62,$7C,$7F,$65,$66,$67,$68,$69,$6A             ; ©1995-1999 Nintendo
+	next $60,$61,$62,$63,$61,$62,$7C,$7F,$6B,$6C,$6D,$6E,$6F,$70,$71,$72     ; ©1995-1999 Creatures inc.
+	next $60,$61,$62,$63,$61,$62,$7C,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B ; ©1995-1999 GAME FREAK inc.
 	db   "@"
 
 INCLUDE "data/pokemon/title_mons.asm"
@@ -399,10 +399,10 @@ PrintGameVersionOnTitleScreen:
 ; these point to special tiles specifically loaded for that purpose and are not usual text
 VersionOnTitleScreenText:
 IF DEF(_RED)
-	db $60,$61,$7F,$65,$66,$67,$68,$69,"@" ; "Red Version"
+	db $60,$61,$62,$63,$64,$65,$66,$67,$68,$69,"@" ; "Edición Roja"
 ENDC
 IF DEF(_BLUE)
-	db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Blue Version"
+	db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Edición Azul"
 ENDC
 
 NintenText: db "NINTEN@"
diff --git a/gfx/font.asm b/gfx/font.asm
index fc2aff4f..5541163d 100644
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -17,6 +17,8 @@ NintendoCopyrightLogoGraphics: INCBIN "gfx/splash/copyright.2bpp"
 
 GamefreakLogoGraphics: INCBIN "gfx/title/gamefreak_inc.2bpp"
 GamefreakLogoGraphicsEnd:
+Unk9Graphic: INCBIN "gfx/splash/unk_9.2bpp"
+Unk9GraphicEnd:
 
 TextBoxGraphics:: INCBIN "gfx/font/font_extra.2bpp"
 TextBoxGraphicsEnd::
diff --git a/gfx/font/font.png b/gfx/font/font.png
index 34e86b4a..9040bed4 100644
--- a/gfx/font/font.png
+++ b/gfx/font/font.png
diff --git a/gfx/font/font_battle_extra.png b/gfx/font/font_battle_extra.png
index d00ae7bc..89428b9c 100644
--- a/gfx/font/font_battle_extra.png
+++ b/gfx/font/font_battle_extra.png
diff --git a/gfx/splash/copyright.png b/gfx/splash/copyright.png
index 49174349..71a2085f 100644
--- a/gfx/splash/copyright.png
+++ b/gfx/splash/copyright.png
diff --git a/gfx/splash/unk_9.png b/gfx/splash/unk_9.png
new file mode 100644
index 00000000..706a169f
--- /dev/null
+++ b/gfx/splash/unk_9.png
diff --git a/gfx/title/blue_version.png b/gfx/title/blue_version.png
index a9c87be8..c0f3aa53 100644
--- a/gfx/title/blue_version.png
+++ b/gfx/title/blue_version.png
diff --git a/gfx/title/red_version.png b/gfx/title/red_version.png
index e41b4295..652d00e0 100644
--- a/gfx/title/red_version.png
+++ b/gfx/title/red_version.png
diff --git a/roms.sha1 b/roms.sha1
index 44e94aaf..1acb07aa 100644
--- a/roms.sha1
+++ b/roms.sha1
@@ -1,3 +1,2 @@
-ea9bcae617fdf159b045185467ae58b2e4a48b9a *pokered.gbc
-d7037c83e1ae5b39bde3c30787637ba1d4c48ce2 *pokeblue.gbc
-5b1456177671b79b263c614ea0e7cc9ac542e9c4 *pokeblue_debug.gbc
+fc17c5b904d551b1b908054ccd1c493f755f832a *pokered.gbc
+7715e7b133e8634df48918b9138374110212a108 *pokeblue.gbc