From f185cc9b77caf956f772fc8775be0386b60318e2 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 1 Jan 2018 22:40:35 -0500 Subject: sort the symfile by symbol type --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2a746f2ca..9c355212f 100644 --- a/Makefile +++ b/Makefile @@ -77,12 +77,12 @@ endif pokecrystal11.gbc: $(crystal11_obj) pokecrystal.link $(RGBLINK) -n pokecrystal11.sym -m pokecrystal11.map -l pokecrystal.link -o $@ $(crystal11_obj) $(RGBFIX) -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@ - sort pokecrystal11.sym -o pokecrystal11.sym + tools/sort_symfile.sh pokecrystal11.sym pokecrystal.gbc: $(crystal_obj) pokecrystal.link $(RGBLINK) -n pokecrystal.sym -m pokecrystal.map -l pokecrystal.link -o $@ $(crystal_obj) $(RGBFIX) -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ - sort pokecrystal.sym -o pokecrystal.sym + tools/sort_symfile.sh pokecrystal.sym # For files that the compressor can't match, there will be a .lz file suffixed with the md5 hash of the correct uncompressed file. -- cgit v1.2.3 From 41feb29680da2740a1c7c8c781a6ca535037e12d Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 2 Jan 2018 19:33:27 -0500 Subject: Make some graphics easier to edit --- Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2a746f2ca..c0109aa11 100644 --- a/Makefile +++ b/Makefile @@ -195,6 +195,9 @@ gfx/player/kris_back.2bpp: rgbgfx += -h gfx/trainer_card/chris_card.2bpp: rgbgfx += -h gfx/trainer_card/kris_card.2bpp: rgbgfx += -h +gfx/overworld/chris_fish.2bpp: tools/gfx += --trim-whitespace +gfx/overworld/kris_fish.2bpp: tools/gfx += --trim-whitespace + gfx/battle/dude.2bpp: rgbgfx += -h gfx/font/unused_bold_font.1bpp: tools/gfx += --trim-whitespace -- cgit v1.2.3 From 31edd7f803a9df47d76469559065af96d78f1c7d Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 00:23:48 -0500 Subject: Move text/ into data/ --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c0109aa11..e8c219ad4 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,7 @@ home.o \ main.o \ maps.o \ wram.o \ +data/common_text/common_text.o \ data/pokemon/dex_entries.o \ data/pokemon/egg_moves.o \ data/pokemon/evos_attacks.o \ @@ -29,8 +30,7 @@ engine/credits.o \ engine/events.o \ gfx/pics.o \ gfx/sprites.o \ -lib/mobile/main.o \ -text/common_text.o +lib/mobile/main.o crystal11_obj := $(crystal_obj:.o=11.o) -- cgit v1.2.3 From 05e5eaf12fbb422d56615f15c3481d1cf53ed17b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 00:51:53 -0500 Subject: Eliminate version.asm (resolves #464) --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e8c219ad4..12a2278fe 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,8 @@ tools: $(MAKE) -C tools/ -$(crystal11_obj): RGBASMFLAGS = -D CRYSTAL11 +$(crystal_obj): RGBASMFLAGS = -D _CRYSTAL +$(crystal11_obj): RGBASMFLAGS = -D _CRYSTAL -D CRYSTAL11 # The dep rules have to be explicit or else missing files won't be reported. # As a side effect, they're evaluated immediately instead of when the rule is invoked. -- cgit v1.2.3 From cc0fd6e12c0afe9b70f55114eb3123014318e107 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 17:26:40 -0500 Subject: =?UTF-8?q?CRYSTAL11=20=E2=86=92=20=5FCRYSTAL11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 12a2278fe..e91e6e22d 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ tools: $(crystal_obj): RGBASMFLAGS = -D _CRYSTAL -$(crystal11_obj): RGBASMFLAGS = -D _CRYSTAL -D CRYSTAL11 +$(crystal11_obj): RGBASMFLAGS = -D _CRYSTAL -D _CRYSTAL11 # The dep rules have to be explicit or else missing files won't be reported. # As a side effect, they're evaluated immediately instead of when the rule is invoked. -- cgit v1.2.3 From efd91fe3dbc7dbad23a43525f526d3e8fbd47ae7 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 23:00:56 -0500 Subject: Avoid catch-all Makefile rules --- Makefile | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e91e6e22d..94a9dbb5a 100644 --- a/Makefile +++ b/Makefile @@ -120,10 +120,12 @@ gfx/pokemon/girafarig/front.animated.tilemap: gfx/pokemon/girafarig/front.2bpp g ### Pokemon pic graphics rules -gfx/pokemon/%/normal.gbcpal: gfx/pokemon/%/front.png - $(RGBGFX) -p $@ $< +gfx/pokemon/%/front.dimensions: gfx/pokemon/%/front.png + tools/png_dimensions $< $@ gfx/pokemon/%/normal.pal: gfx/pokemon/%/normal.gbcpal tools/palette -p $< > $@ +gfx/pokemon/%/normal.gbcpal: gfx/pokemon/%/front.png + $(RGBGFX) -p $@ $< gfx/pokemon/%/back.2bpp: gfx/pokemon/%/back.png $(RGBGFX) -h -o $@ $< gfx/pokemon/%/bitmask.asm: gfx/pokemon/%/front.animated.tilemap gfx/pokemon/%/front.dimensions @@ -134,9 +136,6 @@ gfx/pokemon/%/front.animated.2bpp: gfx/pokemon/%/front.2bpp gfx/pokemon/%/front. tools/pokemon_animation_graphics -o $@ $^ gfx/pokemon/%/front.animated.tilemap: gfx/pokemon/%/front.2bpp gfx/pokemon/%/front.dimensions tools/pokemon_animation_graphics -t $@ $^ -# Don't use -h, pokemon_animation_graphics takes care of it -#gfx/pokemon/%/front.2bpp: gfx/pokemon/%/front.png -# $(RGBGFX) -o $@ $< ### Misc file-specific graphics rules @@ -147,6 +146,8 @@ gfx/shrink/shrink2.2bpp: rgbgfx += -h gfx/trainers/%.2bpp: rgbgfx += -h gfx/trainers/%.pal: gfx/trainers/%.gbcpal tools/palette -p $< > $@ +gfx/trainers/%.gbcpal: gfx/trainers/%.png + $(RGBGFX) -p $@ $< gfx/mail/dragonite.1bpp: tools/gfx += --remove-whitespace gfx/mail/large_note.1bpp: tools/gfx += --remove-whitespace @@ -227,12 +228,3 @@ gfx/unknown/unknown_egg.2bpp: rgbgfx += -h $(RGBGFX) $(rgbgfx) -d1 -o $@ $< $(if $(tools/gfx),\ tools/gfx $(tools/gfx) -d1 -o $@ $@) - -%.tilemap: %.png - $(RGBGFX) -t $@ $< -%.gbcpal: %.png - $(RGBGFX) -p $@ $< -%.pal: %.gbcpal - tools/palette $< > $@ -%.dimensions: %.png - tools/png_dimensions $< $@ -- cgit v1.2.3 From 68e5a703cbf37597a729834b74b7545c9b0636cc Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 02:10:06 -0500 Subject: Resize SGB graphics --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 94a9dbb5a..23dec21bc 100644 --- a/Makefile +++ b/Makefile @@ -159,6 +159,9 @@ gfx/pokedex/pokedex.2bpp: tools/gfx += --trim-whitespace gfx/pokedex/sgb.2bpp: tools/gfx += --trim-whitespace gfx/pokedex/slowpoke.2bpp: tools/gfx += --trim-whitespace +gfx/pokegear/pokegear.2bpp: rgbgfx += -x2 +gfx/pokegear/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace + gfx/title/crystal.2bpp: tools/gfx += --interleave --png=$< gfx/title/old_fg.2bpp: tools/gfx += --interleave --png=$< gfx/title/logo.2bpp: rgbgfx += -x 4 @@ -204,8 +207,7 @@ gfx/battle/dude.2bpp: rgbgfx += -h gfx/font/unused_bold_font.1bpp: tools/gfx += --trim-whitespace -gfx/pokegear/pokegear.2bpp: rgbgfx += -x2 -gfx/pokegear/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace +gfx/sgb/sgb_border.2bpp: tools/gfx += --trim-whitespace gfx/mobile/ascii_font.2bpp: tools/gfx += --trim-whitespace gfx/mobile/electro_ball.2bpp: tools/gfx += --trim-whitespace -- cgit v1.2.3 From be4510659a8404b31b74c11f65c6c3d09078e560 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 12 Jan 2018 15:30:46 -0500 Subject: Mystery Gift graphics match --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 23dec21bc..169f2e6b8 100644 --- a/Makefile +++ b/Makefile @@ -162,6 +162,8 @@ gfx/pokedex/slowpoke.2bpp: tools/gfx += --trim-whitespace gfx/pokegear/pokegear.2bpp: rgbgfx += -x2 gfx/pokegear/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace +gfx/mystery_gift/mystery_gift.2bpp: tools/gfx += --trim-whitespace + gfx/title/crystal.2bpp: tools/gfx += --interleave --png=$< gfx/title/old_fg.2bpp: tools/gfx += --interleave --png=$< gfx/title/logo.2bpp: rgbgfx += -x 4 -- cgit v1.2.3 From 94bbfe2f0c97f653db21db3bb68fcc3263340e4e Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 16 Jan 2018 19:56:21 -0500 Subject: Move map-related "metadata" files into data/maps/ --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e22a1f3ff..59035a88a 100644 --- a/Makefile +++ b/Makefile @@ -20,9 +20,9 @@ crystal_obj := \ audio.o \ home.o \ main.o \ -maps.o \ wram.o \ data/common_text/common_text.o \ +data/maps/maps.o \ data/pokemon/dex_entries.o \ data/pokemon/egg_moves.o \ data/pokemon/evos_attacks.o \ -- cgit v1.2.3 From fdb81d0a04a38ee384cd233db8e07009c60742f9 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 19 Jan 2018 00:02:58 -0500 Subject: One leader per line --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 59035a88a..db15dc208 100644 --- a/Makefile +++ b/Makefile @@ -201,6 +201,7 @@ gfx/player/kris_back.2bpp: rgbgfx += -h gfx/trainer_card/chris_card.2bpp: rgbgfx += -h gfx/trainer_card/kris_card.2bpp: rgbgfx += -h +gfx/trainer_card/leaders.2bpp: tools/gfx += --trim-whitespace gfx/overworld/chris_fish.2bpp: tools/gfx += --trim-whitespace gfx/overworld/kris_fish.2bpp: tools/gfx += --trim-whitespace -- cgit v1.2.3 From ddec0ee305f25bc9941e19e16c79f499c5e95c23 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 19 Jan 2018 20:48:33 -0500 Subject: More Japanese characters --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index db15dc208..8c3764560 100644 --- a/Makefile +++ b/Makefile @@ -215,6 +215,7 @@ gfx/sgb/sgb_border.2bpp: tools/gfx += --trim-whitespace gfx/mobile/ascii_font.2bpp: tools/gfx += --trim-whitespace gfx/mobile/electro_ball.2bpp: tools/gfx += --trim-whitespace gfx/mobile/electro_ball_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip +gfx/mobile/mobile_adapter.2bpp: tools/gfx += --trim-whitespace gfx/mobile/mobile_splash.2bpp: tools/gfx += --remove-duplicates --remove-xflip gfx/mobile/pichu_animated.2bpp: tools/gfx += --trim-whitespace -- cgit v1.2.3 From a8eb44b6e3b2e376491c68efe4a67e8f1badb0e8 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 21 Jan 2018 13:58:16 -0500 Subject: Separate new_game graphics --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8c3764560..d26e991b4 100644 --- a/Makefile +++ b/Makefile @@ -140,8 +140,8 @@ gfx/pokemon/%/front.animated.tilemap: gfx/pokemon/%/front.2bpp gfx/pokemon/%/fro ### Misc file-specific graphics rules -gfx/shrink/shrink1.2bpp: rgbgfx += -h -gfx/shrink/shrink2.2bpp: rgbgfx += -h +gfx/new_game/shrink1.2bpp: rgbgfx += -h +gfx/new_game/shrink2.2bpp: rgbgfx += -h gfx/trainers/%.2bpp: rgbgfx += -h gfx/trainers/%.pal: gfx/trainers/%.gbcpal -- cgit v1.2.3 From 7fba864883732ccecb1221ae7ff97492d112362a Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 22 Jan 2018 01:03:04 -0500 Subject: Add back catch-all graphics rules. .pal -> .gbcpal has been omitted for now since there's no tool to convert it yet. --- Makefile | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d26e991b4..89d7af7a7 100644 --- a/Makefile +++ b/Makefile @@ -234,3 +234,10 @@ gfx/unknown/unknown_egg.2bpp: rgbgfx += -h $(RGBGFX) $(rgbgfx) -d1 -o $@ $< $(if $(tools/gfx),\ tools/gfx $(tools/gfx) -d1 -o $@ $@) + +%.tilemap: %.png + $(RGBGFX) -t $@ $< +%.gbcpal: %.png + $(RGBGFX) -p $@ $< +%.dimensions: %.png + tools/png_dimensions $< $@ -- cgit v1.2.3