diff options
author | einstein95 <einstein95@users.noreply.github.com> | 2016-10-08 00:06:00 +1300 |
---|---|---|
committer | einstein95 <einstein95@users.noreply.github.com> | 2016-10-08 00:06:00 +1300 |
commit | 6df644cb99edf0a980958fd227b430dec78ac01c (patch) | |
tree | e2df89b0ead98669a256cb2126259bb9562f72e4 | |
parent | 9549c1069f50adf4e2419ded9d00005cf5fe7ded (diff) |
I'm blue, da ba de da ba dai, da ba de da ba dai
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | README.md | 3 | ||||
-rwxr-xr-x | engine/titlescreen.asm | 7 | ||||
-rw-r--r-- | gfx/blue/blueversion.png | bin | 116 -> 166 bytes | |||
-rw-r--r-- | gfx/blue/sgbborder.map | bin | 1792 -> 1792 bytes | |||
-rw-r--r-- | gfx/blue/sgbborder.png | bin | 1117 -> 1117 bytes | |||
-rw-r--r-- | gfx/blue/slotmachine1.png | bin | 459 -> 462 bytes | |||
-rwxr-xr-x | main.asm | 2 | ||||
-rw-r--r-- | roms.md5 | 4 | ||||
-rwxr-xr-x | text/credits_text.asm | 2 |
10 files changed, 8 insertions, 12 deletions
@@ -1,4 +1,4 @@ -PYTHON := python +PYTHON := python2 MD5 := md5sum -c --quiet 2bpp := $(PYTHON) extras/pokemontools/gfx.py 2bpp @@ -4,7 +4,8 @@ This is a disassembly of Pokémon: Version Rouge. It builds the following roms: -* Pokemon - Version Rouge (F) [S][!].gb `md5: ` +* Pokemon - Version Rouge (F) [S][!].gb `md5: 669700657cb06ed09371cdbdef69e8a3` +* Pokemon - Version Bleue (F) [S][!].gb `md5: 35c8154c81abb2ab850689fd28a03515` To set up the repository, see [**INSTALL.md**](INSTALL.md). diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index f9e3d5d0..90762f00 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -392,9 +392,4 @@ PrintGameVersionOnTitleScreen: ; these point to special tiles specifically loaded for that purpose and are not usual text VersionOnTitleScreenText: -IF DEF(_RED) - db $60,$61,$62,$63,$64,$65,$66,$67,$68,$69,"@" ; "Version Rouge" -ENDC -IF DEF(_BLUE) - db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Blue Version" -ENDC +db $60,$61,$62,$63,$64,$65,$66,$67,$68,$69,"@" ; "Version Rouge" or "Version Bleue"
\ No newline at end of file diff --git a/gfx/blue/blueversion.png b/gfx/blue/blueversion.png Binary files differindex a9c87be8..8eb259e6 100644 --- a/gfx/blue/blueversion.png +++ b/gfx/blue/blueversion.png diff --git a/gfx/blue/sgbborder.map b/gfx/blue/sgbborder.map Binary files differindex b0b0b94b..a996dd97 100644 --- a/gfx/blue/sgbborder.map +++ b/gfx/blue/sgbborder.map diff --git a/gfx/blue/sgbborder.png b/gfx/blue/sgbborder.png Binary files differindex 098df2b6..6e86d538 100644 --- a/gfx/blue/sgbborder.png +++ b/gfx/blue/sgbborder.png diff --git a/gfx/blue/slotmachine1.png b/gfx/blue/slotmachine1.png Binary files differindex 41ebfdea..c2a27c0b 100644 --- a/gfx/blue/slotmachine1.png +++ b/gfx/blue/slotmachine1.png @@ -6480,7 +6480,7 @@ IF DEF(_RED) INCBIN "gfx/red/redversion.1bpp" ; 10 tiles ENDC IF DEF(_BLUE) - INCBIN "gfx/blue/blueversion.1bpp" ; 8 tiles + INCBIN "gfx/blue/blueversion.1bpp" ; 10 tiles ENDC Version_GFXEnd: @@ -1,2 +1,2 @@ -3d45c1ee9abd5738df46d2bdda8b57dc pokered.gbc -50927e843568814f7ed45ec4f944bd8b pokeblue.gbc +669700657cb06ed09371cdbdef69e8a3 pokered.gbc +35c8154c81abb2ab850689fd28a03515 pokeblue.gbc diff --git a/text/credits_text.asm b/text/credits_text.asm index 794a7b50..b4f63e2c 100755 --- a/text/credits_text.asm +++ b/text/credits_text.asm @@ -74,7 +74,7 @@ IF DEF(_RED) db -6, "VERSION ROUGE@" ENDC IF DEF(_BLUE) - db -8, "BLUE VERSION STAFF@" + db -6, "VERSION BLEUE@" ENDC CredTajiri: db -6, "SATOSHI TAJIRI@" |