shithub: pokecrystal

Download patch

ref: 64331ffe1002d2cef7e209193470a60f2c309dad
parent: 0c10ae0e33f566e7f8d2375d01f64810b27a4d2c
parent: b5f55a5f6f6f07bf2c15acac0f3dea5811a6199c
author: Bryan Bishop <kanzure@gmail.com>
date: Thu Mar 12 10:19:51 EDT 2015

Merge pull request #283 from yenatch/master

no more baserom

git/query: bad hash a87f66964cc602ff5575efebf27c388ef03fa94d
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -10,8 +10,6 @@
 	git clone --recursive git://github.com/kanzure/pokecrystal.git
 	cd pokecrystal
 
-- Copy a Pokémon Crystal rom into `pokecrystal/`. Name it **baserom.gbc**. Eventually this will not be required.
-
 To build **pokecrystal.gbc**:
 
 	make
@@ -35,8 +33,6 @@
 	git clone --recursive git://github.com/kanzure/pokecrystal.git
 	cd pokecrystal
 
-- Copy a Pokémon Crystal rom into `pokecrystal/`. Name it **baserom.gbc**. Eventually this will not be required.
-
 To build **pokecrystal.gbc**:
 
 	make
@@ -56,8 +52,6 @@
 	git clone --recursive git://github.com/kanzure/pokecrystal.git
 	cd pokecrystal
 
-- Copy a Pokémon Crystal rom into `C:\cygwin\home\<username>\pokecrystal`. Name it **baserom.gbc**. Eventually this will not be required.
-
 To build:
 
 	make
@@ -91,7 +85,3 @@
 
 	cd /vagrant/pokecrystal
 	make
-
-To make the build work you will need to copy baserom.gbc into the "pokecrystal"
-directory inside the "virtualbox" directory on the host machine. Eventually
-this will not be required.
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 PYTHON := python
+MD5 := md5sum -c --quiet
 
 .SUFFIXES:
 .SUFFIXES: .asm .o .gbc .png .2bpp .1bpp .lz .pal .bin .blk .tilemap
@@ -56,10 +57,9 @@
 clean:
 	rm -f $(roms) $(all_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym)
 
-baserom.gbc: ;
-	@echo "Wait! Need baserom.gbc first. Check README and INSTALL for details." && false
+compare: pokecrystal.gbc pokecrystal11.gbc
+	@$(MD5) roms.md5
 
-
 %.asm: ;
 $(all_obj): $$*.asm $$($$*_dep)
 	@$(gfx) 2bpp $(2bppq); $(eval 2bppq :=)
@@ -70,12 +70,10 @@
 pokecrystal11.gbc: $(crystal11_obj)
 	rgblink -n $*.sym -m $*.map -o $@ $^
 	rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@
-	cmp crystal11.gbc $@
 
 pokecrystal.gbc: $(crystal_obj)
 	rgblink -n $*.sym -m $*.map -o $@ $^
 	rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
-	cmp baserom.gbc $@
 
 
 pngs:
--- a/README.md
+++ b/README.md
@@ -2,9 +2,10 @@
 
 This is a disassembly of Pokémon Crystal.
 
-The following rom is used as a base:
+It builds the following roms:
 
 * Pokemon - Crystal Version (UE) (V1.0) [C][!].gbc `md5: 9f2922b235a5eeb78d65594e82ef5dde`
+* Pokemon - Crystal Version (UE) (V1.1) [C][!].gbc `md5: 301899b8087289a6436b0a241fbbb474`
 
 To set up the repository, see [**INSTALL.md**](INSTALL.md).