shithub: pokered

Info  •  Files  •  Log  •  Branches

Merge branch 'master' into comments

git/query: bad hash 7aa016fb528bcc8dcb30c6a887957851623eccc0

--- a/.gitignore

+++ b/.gitignore

@@ -17,7 +17,7 @@

 .*.swp

 # no data from extras/

-extras/*.json

+*.json

 # for any of the poor souls with save game files in their working directory

 baserom.sgm

--- /dev/null

+++ b/.gitmodules

@@ -1,0 +1,3 @@

+[submodule "extras"]

+	path = extras

+	url = git://github.com/kanzure/pokemon-reverse-engineering-tools.git

--- a/Makefile

+++ b/Makefile

@@ -1,17 +1,16 @@

 .SUFFIXES: .asm .tx .o .gbc

-TEXTFILES =	text/oakspeech.tx text/pokedex.tx text/mapRedsHouse1F.tx \

-		text/mapBluesHouse.tx text/mapPalletTown.tx

+TEXTFILES := $(shell find ./ -type f -name '*.asm')

 all: pokered.gbc

-pokered.o: pokered.asm main.tx constants.asm ${TEXTFILES}

-	rgbasm -o pokered.o pokered.asm

+pokered.o: pokered.tx main.tx constants.tx music.tx wram.tx ${TEXTFILES:.asm=.tx}

+	rgbasm -o pokered.o pokered.tx

-pokeblue.o: pokeblue.asm main.tx constants.asm ${TEXTFILES}

-	rgbasm -o pokeblue.o pokeblue.asm

+pokeblue.o: pokeblue.tx main.tx constants.tx music.tx wram.tx ${TEXTFILES:.asm=.tx}

+	rgbasm -o pokeblue.o pokeblue.tx

-redrle: extras/redrle.c

+redrle: extras/redtools/redrle.c

 	${CC} -o $@ $>

 .asm.tx:

@@ -28,6 +27,6 @@

 	cmp blue.gbc $@

 clean:

-	rm -f main.tx pokered.o pokered.gbc pokeblue.o pokeblue.gbc redrle ${TEXTFILES}

+	rm -f pokered.o pokered.gbc pokeblue.o pokeblue.gbc redrle $(TEXTFILES:.asm=.tx)

 more: pokered.gbc pokeblue.gbc