You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
Merge pull request #242 from yenatch/master
Redone graphics handling and renamed pics.
This commit is contained in:
Bryan Bishop
70
Makefile
70
Makefile
@@ -1,9 +1,15 @@
|
|||||||
PYTHON := python
|
PYTHON := python
|
||||||
POKEMONTOOLS := extras/pokemontools
|
|
||||||
.SUFFIXES: .asm .tx .o .gbc .png .2bpp .1bpp .lz .pal .bin
|
.SUFFIXES:
|
||||||
|
.SUFFIXES: .asm .tx .o .gbc .png .2bpp .1bpp .lz .pal .bin .blk .tilemap
|
||||||
.PHONY: all clean crystal pngs
|
.PHONY: all clean crystal pngs
|
||||||
.SECONDEXPANSION:
|
.SECONDEXPANSION:
|
||||||
|
|
||||||
|
POKEMONTOOLS := extras/pokemontools
|
||||||
|
GFX := $(PYTHON) $(POKEMONTOOLS)/gfx.py
|
||||||
|
INCLUDES := $(PYTHON) $(POKEMONTOOLS)/scan_includes.py
|
||||||
|
PREPROCESS := $(PYTHON) prequeue.py
|
||||||
|
|
||||||
TEXTQUEUE :=
|
TEXTQUEUE :=
|
||||||
|
|
||||||
CRYSTAL_OBJS := \
|
CRYSTAL_OBJS := \
|
||||||
@@ -26,12 +32,8 @@ OBJS := $(CRYSTAL_OBJS)
|
|||||||
|
|
||||||
ROMS := pokecrystal.gbc
|
ROMS := pokecrystal.gbc
|
||||||
|
|
||||||
|
# object dependencies
|
||||||
# generate a list of dependencies for each object file
|
$(shell $(foreach obj, $(OBJS), $(eval $(obj:.o=)_DEPENDENCIES := $(shell $(INCLUDES) $(obj:.o=.asm)))))
|
||||||
$(shell $(foreach obj, $(OBJS), \
|
|
||||||
$(eval $(obj:.o=)_DEPENDENCIES := $(shell $(PYTHON) $(POKEMONTOOLS)/scan_includes.py $(obj:.o=.asm))) \
|
|
||||||
))
|
|
||||||
|
|
||||||
|
|
||||||
all: $(ROMS)
|
all: $(ROMS)
|
||||||
|
|
||||||
@@ -52,7 +54,7 @@ baserom.gbc: ;
|
|||||||
@rm -f $@
|
@rm -f $@
|
||||||
|
|
||||||
$(OBJS): $$*.tx $$(patsubst %.asm, %.tx, $$($$*_DEPENDENCIES))
|
$(OBJS): $$*.tx $$(patsubst %.asm, %.tx, $$($$*_DEPENDENCIES))
|
||||||
@$(PYTHON) prequeue.py $(TEXTQUEUE)
|
@$(PREPROCESS) $(TEXTQUEUE)
|
||||||
$(eval TEXTQUEUE :=)
|
$(eval TEXTQUEUE :=)
|
||||||
rgbasm -o $@ $*.tx
|
rgbasm -o $@ $*.tx
|
||||||
|
|
||||||
@@ -63,49 +65,17 @@ pokecrystal.gbc: $(CRYSTAL_OBJS)
|
|||||||
|
|
||||||
|
|
||||||
pngs:
|
pngs:
|
||||||
$(PYTHON) $(POKEMONTOOLS)/gfx.py mass-decompress
|
find . -iname "*.lz" -exec $(GFX) unlz {} +
|
||||||
$(PYTHON) $(POKEMONTOOLS)/gfx.py dump-pngs
|
find . -iname "*.[12]bpp" -exec $(GFX) png {} +
|
||||||
|
find . -iname "*.[12]bpp" -exec touch {} +
|
||||||
|
find . -iname "*.lz" -exec touch {} +
|
||||||
|
|
||||||
gfx/pics/%/front.lz:: gfx/pics/%/tiles.2bpp gfx/pics/%/front.png
|
%.2bpp: %.png ; $(GFX) 2bpp $<
|
||||||
$(PYTHON) $(POKEMONTOOLS)/gfx.py png-to-lz --front $^
|
%.1bpp: %.png ; $(GFX) 1bpp $<
|
||||||
gfx/pics/%/front.2bpp:: gfx/pics/%/front.lz
|
%.lz: % ; $(GFX) lz $<
|
||||||
$(PYTHON) $(POKEMONTOOLS)/gfx.py front-to-2bpp $<
|
|
||||||
gfx/pics/%/front.png:: gfx/pics/%/front.2bpp
|
|
||||||
$(PYTHON) $(POKEMONTOOLS)/gfx.py 2bpp-to-png $<
|
|
||||||
gfx/pics/%/tiles.2bpp:: gfx/pics/%/front.lz
|
|
||||||
$(PYTHON) $(POKEMONTOOLS)/gfx.py anim-from-front $<
|
|
||||||
|
|
||||||
gfx/pics/%/tiles.2bpp:: gfx/pics/%/tiles.png
|
|
||||||
$(PYTHON) $(POKEMONTOOLS)/gfx.py png-to-2bpp $<
|
|
||||||
gfx/pics/%/tiles.png:: gfx/pics/%/tiles.2bpp
|
|
||||||
$(PYTHON) $(POKEMONTOOLS)/gfx.py 2bpp-to-png $<
|
|
||||||
|
|
||||||
gfx/pics/%/back.lz:: gfx/pics/%/back.png
|
|
||||||
$(PYTHON) $(POKEMONTOOLS)/gfx.py png-to-lz --vert $<
|
|
||||||
gfx/pics/%/back.png:: gfx/pics/%/back.lz
|
|
||||||
$(PYTHON) $(POKEMONTOOLS)/gfx.py lz-to-png --vert $<
|
|
||||||
|
|
||||||
gfx/trainers/%.lz:: gfx/trainers/%.png
|
|
||||||
$(PYTHON) $(POKEMONTOOLS)/gfx.py png-to-lz --vert $<
|
|
||||||
gfx/trainers/%.png:: gfx/trainers/%.lz
|
|
||||||
$(PYTHON) $(POKEMONTOOLS)/gfx.py lz-to-png --vert $<
|
|
||||||
|
|
||||||
|
|
||||||
%.lz:: %.png
|
|
||||||
$(PYTHON) $(POKEMONTOOLS)/gfx.py png-to-lz $<
|
|
||||||
%.png:: %.lz
|
|
||||||
$(PYTHON) $(POKEMONTOOLS)/gfx.py lz-to-png $<
|
|
||||||
|
|
||||||
%.2bpp:: %.png
|
|
||||||
$(PYTHON) $(POKEMONTOOLS)/gfx.py png-to-2bpp $<
|
|
||||||
%.png:: %.2bpp
|
|
||||||
$(PYTHON) $(POKEMONTOOLS)/gfx.py 2bpp-to-png $<
|
|
||||||
|
|
||||||
%.1bpp:: %.png
|
|
||||||
$(PYTHON) $(POKEMONTOOLS)/gfx.py png-to-1bpp $<
|
|
||||||
%.png:: %.1bpp
|
|
||||||
$(PYTHON) $(POKEMONTOOLS)/gfx.py 1bpp-to-png $<
|
|
||||||
|
|
||||||
%.pal: ;
|
%.pal: ;
|
||||||
%.bin: ;
|
%.bin: ;
|
||||||
|
%.blk: ;
|
||||||
|
%.tilemap: ;
|
||||||
|
|
||||||
|
|||||||
@@ -1,42 +1,42 @@
|
|||||||
AnimObj00GFX: ; 84a2e
|
AnimObj00GFX: ; 84a2e
|
||||||
AnimObj01GFX: INCBIN "gfx/fx/001.lz"
|
AnimObj01GFX: INCBIN "gfx/fx/001.2bpp.lz"
|
||||||
AnimObj02GFX: INCBIN "gfx/fx/002.lz"
|
AnimObj02GFX: INCBIN "gfx/fx/002.2bpp.lz"
|
||||||
AnimObj03GFX: INCBIN "gfx/fx/003.lz"
|
AnimObj03GFX: INCBIN "gfx/fx/003.2bpp.lz"
|
||||||
AnimObj04GFX: INCBIN "gfx/fx/004.lz"
|
AnimObj04GFX: INCBIN "gfx/fx/004.2bpp.lz"
|
||||||
AnimObj05GFX: INCBIN "gfx/fx/005.lz"
|
AnimObj05GFX: INCBIN "gfx/fx/005.2bpp.lz"
|
||||||
AnimObj07GFX: INCBIN "gfx/fx/007.lz"
|
AnimObj07GFX: INCBIN "gfx/fx/007.2bpp.lz"
|
||||||
AnimObj08GFX: INCBIN "gfx/fx/008.lz"
|
AnimObj08GFX: INCBIN "gfx/fx/008.2bpp.lz"
|
||||||
AnimObj10GFX: INCBIN "gfx/fx/010.lz"
|
AnimObj10GFX: INCBIN "gfx/fx/010.2bpp.lz"
|
||||||
AnimObj09GFX: INCBIN "gfx/fx/009.lz"
|
AnimObj09GFX: INCBIN "gfx/fx/009.2bpp.lz"
|
||||||
AnimObj12GFX: INCBIN "gfx/fx/012.lz"
|
AnimObj12GFX: INCBIN "gfx/fx/012.2bpp.lz"
|
||||||
AnimObj06GFX: INCBIN "gfx/fx/006.lz"
|
AnimObj06GFX: INCBIN "gfx/fx/006.2bpp.lz"
|
||||||
AnimObj11GFX: INCBIN "gfx/fx/011.lz"
|
AnimObj11GFX: INCBIN "gfx/fx/011.2bpp.lz"
|
||||||
AnimObj13GFX: INCBIN "gfx/fx/013.lz"
|
AnimObj13GFX: INCBIN "gfx/fx/013.2bpp.lz"
|
||||||
AnimObj14GFX: INCBIN "gfx/fx/014.lz"
|
AnimObj14GFX: INCBIN "gfx/fx/014.2bpp.lz"
|
||||||
AnimObj24GFX: INCBIN "gfx/fx/024.lz"
|
AnimObj24GFX: INCBIN "gfx/fx/024.2bpp.lz"
|
||||||
AnimObj15GFX: INCBIN "gfx/fx/015.lz"
|
AnimObj15GFX: INCBIN "gfx/fx/015.2bpp.lz"
|
||||||
AnimObj16GFX: INCBIN "gfx/fx/016.lz"
|
AnimObj16GFX: INCBIN "gfx/fx/016.2bpp.lz"
|
||||||
AnimObj17GFX: INCBIN "gfx/fx/017.lz"
|
AnimObj17GFX: INCBIN "gfx/fx/017.2bpp.lz"
|
||||||
AnimObj18GFX: INCBIN "gfx/fx/018.lz"
|
AnimObj18GFX: INCBIN "gfx/fx/018.2bpp.lz"
|
||||||
AnimObj19GFX: INCBIN "gfx/fx/019.lz"
|
AnimObj19GFX: INCBIN "gfx/fx/019.2bpp.lz"
|
||||||
AnimObj20GFX: INCBIN "gfx/fx/020.lz"
|
AnimObj20GFX: INCBIN "gfx/fx/020.2bpp.lz"
|
||||||
AnimObj22GFX: INCBIN "gfx/fx/022.lz"
|
AnimObj22GFX: INCBIN "gfx/fx/022.2bpp.lz"
|
||||||
AnimObj21GFX: INCBIN "gfx/fx/021.lz"
|
AnimObj21GFX: INCBIN "gfx/fx/021.2bpp.lz"
|
||||||
AnimObj23GFX: INCBIN "gfx/fx/023.lz"
|
AnimObj23GFX: INCBIN "gfx/fx/023.2bpp.lz"
|
||||||
AnimObj26GFX: INCBIN "gfx/fx/026.lz"
|
AnimObj26GFX: INCBIN "gfx/fx/026.2bpp.lz"
|
||||||
AnimObj27GFX: INCBIN "gfx/fx/027.lz"
|
AnimObj27GFX: INCBIN "gfx/fx/027.2bpp.lz"
|
||||||
AnimObj28GFX: INCBIN "gfx/fx/028.lz"
|
AnimObj28GFX: INCBIN "gfx/fx/028.2bpp.lz"
|
||||||
AnimObj29GFX: INCBIN "gfx/fx/029.lz"
|
AnimObj29GFX: INCBIN "gfx/fx/029.2bpp.lz"
|
||||||
AnimObj30GFX: INCBIN "gfx/fx/030.lz"
|
AnimObj30GFX: INCBIN "gfx/fx/030.2bpp.lz"
|
||||||
AnimObj31GFX: INCBIN "gfx/fx/031.lz"
|
AnimObj31GFX: INCBIN "gfx/fx/031.2bpp.lz"
|
||||||
AnimObj32GFX: INCBIN "gfx/fx/032.lz"
|
AnimObj32GFX: INCBIN "gfx/fx/032.2bpp.lz"
|
||||||
AnimObj33GFX: INCBIN "gfx/fx/033.lz"
|
AnimObj33GFX: INCBIN "gfx/fx/033.2bpp.lz"
|
||||||
AnimObj34GFX: INCBIN "gfx/fx/034.lz"
|
AnimObj34GFX: INCBIN "gfx/fx/034.2bpp.lz"
|
||||||
AnimObj25GFX: INCBIN "gfx/fx/025.lz"
|
AnimObj25GFX: INCBIN "gfx/fx/025.2bpp.lz"
|
||||||
AnimObj35GFX: INCBIN "gfx/fx/035.lz"
|
AnimObj35GFX: INCBIN "gfx/fx/035.2bpp.lz"
|
||||||
AnimObj36GFX: INCBIN "gfx/fx/036.lz"
|
AnimObj36GFX: INCBIN "gfx/fx/036.2bpp.lz"
|
||||||
AnimObj37GFX: INCBIN "gfx/fx/037.lz"
|
AnimObj37GFX: INCBIN "gfx/fx/037.2bpp.lz"
|
||||||
AnimObj38GFX: INCBIN "gfx/fx/038.lz"
|
AnimObj38GFX: INCBIN "gfx/fx/038.2bpp.lz"
|
||||||
AnimObj39GFX: INCBIN "gfx/fx/039.lz"
|
AnimObj39GFX: INCBIN "gfx/fx/039.2bpp.lz"
|
||||||
; 8640e
|
; 8640e
|
||||||
|
|
||||||
|
|||||||
@@ -803,13 +803,13 @@ Function109c1c: ; 109c1c (42:5c1c)
|
|||||||
; 109c24 (42:5c24)
|
; 109c24 (42:5c24)
|
||||||
|
|
||||||
|
|
||||||
CreditsBorderGFX: INCBIN "gfx/credits/border.2bpp"
|
CreditsBorderGFX: INCBIN "gfx/credits/border.w72.2bpp"
|
||||||
|
|
||||||
CreditsMonsGFX:
|
CreditsMonsGFX:
|
||||||
CreditsPichuGFX: INCBIN "gfx/credits/pichu.2bpp"
|
CreditsPichuGFX: INCBIN "gfx/credits/pichu.w32.2bpp"
|
||||||
CreditsSmoochumGFX: INCBIN "gfx/credits/smoochum.2bpp"
|
CreditsSmoochumGFX: INCBIN "gfx/credits/smoochum.w32.2bpp"
|
||||||
CreditsDittoGFX: INCBIN "gfx/credits/ditto.2bpp"
|
CreditsDittoGFX: INCBIN "gfx/credits/ditto.w32.2bpp"
|
||||||
CreditsIgglybuffGFX: INCBIN "gfx/credits/igglybuff.2bpp"
|
CreditsIgglybuffGFX: INCBIN "gfx/credits/igglybuff.w32.2bpp"
|
||||||
|
|
||||||
|
|
||||||
CreditsScript: ; 10acb4
|
CreditsScript: ; 10acb4
|
||||||
|
|||||||
@@ -375,15 +375,15 @@ AnimateTitleCrystal: ; 10ef32
|
|||||||
; 10ef46
|
; 10ef46
|
||||||
|
|
||||||
TitleSuicuneGFX: ; 10ef46
|
TitleSuicuneGFX: ; 10ef46
|
||||||
INCBIN "gfx/title/suicune.lz"
|
INCBIN "gfx/title/suicune.w128.2bpp.lz"
|
||||||
; 10f326
|
; 10f326
|
||||||
|
|
||||||
TitleLogoGFX: ; 10f326
|
TitleLogoGFX: ; 10f326
|
||||||
INCBIN "gfx/title/logo.lz"
|
INCBIN "gfx/title/logo.w160.t4.2bpp.lz"
|
||||||
; 10fcee
|
; 10fcee
|
||||||
|
|
||||||
TitleCrystalGFX: ; 10fcee
|
TitleCrystalGFX: ; 10fcee
|
||||||
INCBIN "gfx/title/crystal.lz"
|
INCBIN "gfx/title/crystal.w48.interleave.2bpp.lz"
|
||||||
; 10fede
|
; 10fede
|
||||||
|
|
||||||
TitleScreenPalettes:
|
TitleScreenPalettes:
|
||||||
|
|||||||
2
extras
2
extras
Submodule extras updated: c9f9d7f280...b73c309666
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user