From 6ab1d028bbb94ba35c16d715341444453e895716 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 14 Dec 2017 23:00:54 -0500 Subject: Split items/ and trainers/ into their data/ and engine/ components Move some data into a pokemon/ subdirectory --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d3158c341..8d4aa7900 100644 --- a/Makefile +++ b/Makefile @@ -25,9 +25,9 @@ audio.o \ maps.o \ engine/events.o \ engine/credits.o \ -data/egg_moves.o \ -data/evos_attacks.o \ -data/pokedex/entries.o \ +data/pokemon/egg_moves.o \ +data/pokemon/evos_attacks.o \ +data/pokemon/dex_entries.o \ misc/crystal_misc.o \ text/common_text.o \ gfx/pics.o -- cgit v1.2.3 From dc76bf804f86f884933e9d5a8820e3122b2771ae Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 15 Dec 2017 13:21:47 -0500 Subject: Move all misc/ and unknown/ files to meaningful directories --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8d4aa7900..63d1177e8 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,6 @@ engine/credits.o \ data/pokemon/egg_moves.o \ data/pokemon/evos_attacks.o \ data/pokemon/dex_entries.o \ -misc/crystal_misc.o \ text/common_text.o \ gfx/pics.o @@ -202,8 +201,8 @@ gfx/pokegear/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace gfx/unknown/ascii_font.2bpp: tools/gfx += --trim-whitespace gfx/unknown/bold_font.1bpp: tools/gfx += --trim-whitespace -gfx/unknown/egg_animated.2bpp: tools/gfx += --trim-whitespace -gfx/unknown/egg_animated_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip +gfx/unknown/electro_ball.2bpp: tools/gfx += --trim-whitespace +gfx/unknown/electro_ball_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip gfx/unknown/mobile_splash.2bpp: tools/gfx += --remove-duplicates --remove-xflip gfx/unknown/pichu_animated.2bpp: tools/gfx += --trim-whitespace gfx/unknown/unknown_egg.2bpp: rgbgfx += -h -- cgit v1.2.3 From 2cf5cc1dc7f0dcc4651cdacaefb28d1b607f444c Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 15 Dec 2017 17:50:45 -0500 Subject: Move more unknown graphics into real subfolders --- Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 63d1177e8..83667441a 100644 --- a/Makefile +++ b/Makefile @@ -196,15 +196,17 @@ gfx/trainer_card/kris_card.2bpp: rgbgfx += -h 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/unknown/ascii_font.2bpp: tools/gfx += --trim-whitespace -gfx/unknown/bold_font.1bpp: tools/gfx += --trim-whitespace -gfx/unknown/electro_ball.2bpp: tools/gfx += --trim-whitespace -gfx/unknown/electro_ball_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip -gfx/unknown/mobile_splash.2bpp: tools/gfx += --remove-duplicates --remove-xflip -gfx/unknown/pichu_animated.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_splash.2bpp: tools/gfx += --remove-duplicates --remove-xflip +gfx/mobile/pichu_animated.2bpp: tools/gfx += --trim-whitespace + gfx/unknown/unknown_egg.2bpp: rgbgfx += -h -- cgit v1.2.3 From 25a3960646548c40af70f9f59bed544f4ce8d472 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 16 Dec 2017 19:00:50 -0500 Subject: Move some more main.asm routines into individual files --- Makefile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 83667441a..4a4c640f9 100644 --- a/Makefile +++ b/Makefile @@ -17,19 +17,20 @@ RGBLINK := rgblink crystal_obj := \ -wram.o \ -main.o \ -lib/mobile/main.o \ -home.o \ audio.o \ +home.o \ +main.o \ maps.o \ -engine/events.o \ -engine/credits.o \ +wram.o \ +data/pokemon/dex_entries.o \ data/pokemon/egg_moves.o \ data/pokemon/evos_attacks.o \ -data/pokemon/dex_entries.o \ -text/common_text.o \ -gfx/pics.o +engine/credits.o \ +engine/events.o \ +gfx/pics.o \ +gfx/sprites.o \ +lib/mobile/main.o \ +text/common_text.o crystal11_obj := $(crystal_obj:.o=11.o) -- cgit v1.2.3