From 43182b4a895975a6eb7b197bad7b077a37f776a6 Mon Sep 17 00:00:00 2001 From: entrpntr Date: Sun, 5 Apr 2020 05:44:43 -0400 Subject: Create PNGs for remaining gfx binary files. --- .gitignore | 8 ++-- Makefile | 17 +++++--- engine/gfx/color.asm | 4 +- engine/items/pack.asm | 4 +- engine/menus/naming_screen.asm | 6 +-- gfx/icons/mail_big.2bpp | Bin 0 -> 128 bytes gfx/icons/mail_big.png | Bin 0 -> 135 bytes gfx/intro/copyright.png | Bin 0 -> 269 bytes gfx/intro/gamefreak_logo.png | Bin 0 -> 172 bytes gfx/intro/gamefreak_presents.png | Bin 0 -> 180 bytes gfx/intro/logo_sparkle.png | Bin 0 -> 111 bytes gfx/intro/logo_star.png | Bin 0 -> 109 bytes gfx/misc/pack.2bpp | Bin 960 -> 0 bytes gfx/misc/pack_menu.2bpp | Bin 1280 -> 0 bytes gfx/naming_screen/border.png | Bin 0 -> 82 bytes gfx/naming_screen/cursor.png | Bin 0 -> 78 bytes gfx/naming_screen/ed.1bpp | 1 - gfx/naming_screen/end.1bpp | 1 + gfx/naming_screen/end.png | Bin 0 -> 82 bytes gfx/naming_screen/mail_icon.2bpp | Bin 128 -> 0 bytes gfx/naming_screen/middle_line.1bpp | Bin 0 -> 8 bytes gfx/naming_screen/middle_line.png | Bin 0 -> 76 bytes gfx/naming_screen/middleline.1bpp | Bin 8 -> 0 bytes gfx/naming_screen/underline.png | Bin 0 -> 74 bytes gfx/overworld/heal_machine.png | Bin 0 -> 137 bytes gfx/pack/pack.2bpp | Bin 0 -> 960 bytes gfx/pack/pack.png | Bin 0 -> 282 bytes gfx/pack/pack_menu.2bpp | Bin 0 -> 1280 bytes gfx/pack/pack_menu.png | Bin 0 -> 356 bytes gfx/sgb_border/gold.pal | 79 +++++++++++++++++++++++++++++++++++++ gfx/sgb_border/gold.png | Bin 0 -> 926 bytes gfx/sgb_border/pals/gold.pal | 79 ------------------------------------- gfx/sgb_border/pals/silver.pal | 79 ------------------------------------- gfx/sgb_border/silver.pal | 79 +++++++++++++++++++++++++++++++++++++ gfx/sgb_border/silver.png | Bin 0 -> 926 bytes tools/gfx.py | 36 +++++++++++++++++ tools/pokemontools/gfx.py | 2 + 37 files changed, 219 insertions(+), 176 deletions(-) create mode 100644 gfx/icons/mail_big.2bpp create mode 100644 gfx/icons/mail_big.png create mode 100644 gfx/intro/copyright.png create mode 100644 gfx/intro/gamefreak_logo.png create mode 100644 gfx/intro/gamefreak_presents.png create mode 100644 gfx/intro/logo_sparkle.png create mode 100644 gfx/intro/logo_star.png delete mode 100644 gfx/misc/pack.2bpp delete mode 100644 gfx/misc/pack_menu.2bpp create mode 100644 gfx/naming_screen/border.png create mode 100644 gfx/naming_screen/cursor.png delete mode 100644 gfx/naming_screen/ed.1bpp create mode 100644 gfx/naming_screen/end.1bpp create mode 100644 gfx/naming_screen/end.png delete mode 100644 gfx/naming_screen/mail_icon.2bpp create mode 100644 gfx/naming_screen/middle_line.1bpp create mode 100644 gfx/naming_screen/middle_line.png delete mode 100644 gfx/naming_screen/middleline.1bpp create mode 100644 gfx/naming_screen/underline.png create mode 100644 gfx/overworld/heal_machine.png create mode 100644 gfx/pack/pack.2bpp create mode 100644 gfx/pack/pack.png create mode 100644 gfx/pack/pack_menu.2bpp create mode 100644 gfx/pack/pack_menu.png create mode 100755 gfx/sgb_border/gold.pal create mode 100644 gfx/sgb_border/gold.png delete mode 100755 gfx/sgb_border/pals/gold.pal delete mode 100755 gfx/sgb_border/pals/silver.pal create mode 100755 gfx/sgb_border/silver.pal create mode 100644 gfx/sgb_border/silver.png diff --git a/.gitignore b/.gitignore index 1562f245..aa4cb3de 100644 --- a/.gitignore +++ b/.gitignore @@ -40,7 +40,7 @@ pokesilver.txt # osx files .DS_STORE -# compiled graphics -*.lz -*.2bpp -*.1bpp +# compiled graphics (include for now) +#*.lz +#*.2bpp +#*.1bpp diff --git a/Makefile b/Makefile index f67934ed..a36266a3 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ gfx := $(PYTHON) tools/gfx.py ### Build targets .SUFFIXES: -.PHONY: all gold silver clean pngs compare tools +.PHONY: all gold silver clean tidy pngs compare tools .SECONDEXPANSION: .PRECIOUS: .SECONDARY: @@ -47,9 +47,13 @@ all: $(roms) gold: pokegold.gbc silver: pokesilver.gbc +tidy: + rm -f $(roms) $(gold_obj) $(silver_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) + $(MAKE) clean -C tools/ + clean: rm -f $(roms) $(gold_obj) $(silver_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) - find gfx/pokemon gfx/trainers -iname "*.[1,2]bpp" -delete + find gfx -iname "*.png" -delete $(MAKE) clean -C tools/ compare: $(roms) @@ -99,7 +103,8 @@ pokesilver.gbc: $(silver_obj) pokesilver.link tools/sort_symfile.sh pokesilver.sym pngs: - find gfx/pokemon gfx/trainers gfx/mail -iname "*.lz" -exec $(gfx) unlz {} + - find gfx/pokemon gfx/trainers gfx/mail -iname "*.[12]bpp" -exec $(gfx) png {} + - find gfx/pokemon gfx/trainers gfx/mail -iname "*.[12]bpp" -exec touch {} + - find gfx/pokemon gfx/trainers gfx/mail -iname "*.lz" -exec touch {} + + find gfx -iname "*.lz" -exec $(gfx) unlz {} + + find gfx -iname "*.[12]bpp" -exec $(gfx) png {} + + find gfx -iname "*.[12]bpp" -exec touch {} + + find gfx -iname "*.lz" -exec touch {} + + find gfx/pokemon gfx/trainers -iname "*.[1,2]bpp" -delete diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index ca713987..b388675f 100755 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -1304,13 +1304,13 @@ ENDC IF DEF(_GOLD) SGBBorderMap: INCBIN "gfx/sgb_border/gold.map" -SGBBorderPalettes: INCLUDE "gfx/sgb_border/pals/gold.pal" +SGBBorderPalettes: INCLUDE "gfx/sgb_border/gold.pal" SGBBorder: INCBIN "gfx/sgb_border/gold.2bpp" ENDC IF DEF(_SILVER) SGBBorderMap: INCBIN "gfx/sgb_border/silver.map" -SGBBorderPalettes: INCLUDE "gfx/sgb_border/pals/silver.pal" +SGBBorderPalettes: INCLUDE "gfx/sgb_border/silver.pal" SGBBorder: INCBIN "gfx/sgb_border/silver.2bpp" ENDC diff --git a/engine/items/pack.asm b/engine/items/pack.asm index a8c1fedc..1f2d533d 100755 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -1569,5 +1569,5 @@ Text_CantUseItInABattle: text_far Text_YouCantUseItInABattle db "@" -PackMenuGFX: INCBIN "gfx/misc/pack_menu.2bpp" -PackGFX: INCBIN "gfx/misc/pack.2bpp" +PackMenuGFX: INCBIN "gfx/pack/pack_menu.2bpp" +PackGFX: INCBIN "gfx/pack/pack.2bpp" diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index cd88ec28..2101cf84 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -888,8 +888,8 @@ BoxNameInputUpper: db "- ? ! ♂ ♀ / . , &" db "lower DEL END " -NamingScreenGFX_ED: INCBIN "gfx/naming_screen/ed.1bpp" ; leftover from gen 1 -NamingScreenGFX_MiddleLine: INCBIN "gfx/naming_screen/middleline.1bpp" +NamingScreenGFX_ED: INCBIN "gfx/naming_screen/end.1bpp" ; leftover from gen 1 +NamingScreenGFX_MiddleLine: INCBIN "gfx/naming_screen/middle_line.1bpp" NamingScreenGFX_UnderLine: INCBIN "gfx/naming_screen/underline.1bpp" _ComposeMailMessage: @@ -957,7 +957,7 @@ Function12267: ; 12267 (4:6267) ld [hl], $4e ret -MailIcon: INCBIN "gfx/naming_screen/mail_icon.2bpp" +MailIcon: INCBIN "gfx/icons/mail_big.2bpp" Function12341: ; 12341 (4:6341) ld a, $21 diff --git a/gfx/icons/mail_big.2bpp b/gfx/icons/mail_big.2bpp new file mode 100644 index 00000000..18892689 Binary files /dev/null and b/gfx/icons/mail_big.2bpp differ diff --git a/gfx/icons/mail_big.png b/gfx/icons/mail_big.png new file mode 100644 index 00000000..7ad25edb Binary files /dev/null and b/gfx/icons/mail_big.png differ diff --git a/gfx/intro/copyright.png b/gfx/intro/copyright.png new file mode 100644 index 00000000..0ad7c2ef Binary files /dev/null and b/gfx/intro/copyright.png differ diff --git a/gfx/intro/gamefreak_logo.png b/gfx/intro/gamefreak_logo.png new file mode 100644 index 00000000..7038efb5 Binary files /dev/null and b/gfx/intro/gamefreak_logo.png differ diff --git a/gfx/intro/gamefreak_presents.png b/gfx/intro/gamefreak_presents.png new file mode 100644 index 00000000..d5ff5c43 Binary files /dev/null and b/gfx/intro/gamefreak_presents.png differ diff --git a/gfx/intro/logo_sparkle.png b/gfx/intro/logo_sparkle.png new file mode 100644 index 00000000..feaa9c1f Binary files /dev/null and b/gfx/intro/logo_sparkle.png differ diff --git a/gfx/intro/logo_star.png b/gfx/intro/logo_star.png new file mode 100644 index 00000000..8fc2f734 Binary files /dev/null and b/gfx/intro/logo_star.png differ diff --git a/gfx/misc/pack.2bpp b/gfx/misc/pack.2bpp deleted file mode 100644 index 22be5508..00000000 Binary files a/gfx/misc/pack.2bpp and /dev/null differ diff --git a/gfx/misc/pack_menu.2bpp b/gfx/misc/pack_menu.2bpp deleted file mode 100644 index 484bc94c..00000000 Binary files a/gfx/misc/pack_menu.2bpp and /dev/null differ diff --git a/gfx/naming_screen/border.png b/gfx/naming_screen/border.png new file mode 100644 index 00000000..36935ab8 Binary files /dev/null and b/gfx/naming_screen/border.png differ diff --git a/gfx/naming_screen/cursor.png b/gfx/naming_screen/cursor.png new file mode 100644 index 00000000..a0429a3a Binary files /dev/null and b/gfx/naming_screen/cursor.png differ diff --git a/gfx/naming_screen/ed.1bpp b/gfx/naming_screen/ed.1bpp deleted file mode 100644 index 7bbee183..00000000 --- a/gfx/naming_screen/ed.1bpp +++ /dev/null @@ -1 +0,0 @@ -ðÀðÎý  \ No newline at end of file diff --git a/gfx/naming_screen/end.1bpp b/gfx/naming_screen/end.1bpp new file mode 100644 index 00000000..7bbee183 --- /dev/null +++ b/gfx/naming_screen/end.1bpp @@ -0,0 +1 @@ +ðÀðÎý  \ No newline at end of file diff --git a/gfx/naming_screen/end.png b/gfx/naming_screen/end.png new file mode 100644 index 00000000..c8e132b9 Binary files /dev/null and b/gfx/naming_screen/end.png differ diff --git a/gfx/naming_screen/mail_icon.2bpp b/gfx/naming_screen/mail_icon.2bpp deleted file mode 100644 index 18892689..00000000 Binary files a/gfx/naming_screen/mail_icon.2bpp and /dev/null differ diff --git a/gfx/naming_screen/middle_line.1bpp b/gfx/naming_screen/middle_line.1bpp new file mode 100644 index 00000000..9713c883 Binary files /dev/null and b/gfx/naming_screen/middle_line.1bpp differ diff --git a/gfx/naming_screen/middle_line.png b/gfx/naming_screen/middle_line.png new file mode 100644 index 00000000..a34e82bf Binary files /dev/null and b/gfx/naming_screen/middle_line.png differ diff --git a/gfx/naming_screen/middleline.1bpp b/gfx/naming_screen/middleline.1bpp deleted file mode 100644 index 9713c883..00000000 Binary files a/gfx/naming_screen/middleline.1bpp and /dev/null differ diff --git a/gfx/naming_screen/underline.png b/gfx/naming_screen/underline.png new file mode 100644 index 00000000..e92cd4d6 Binary files /dev/null and b/gfx/naming_screen/underline.png differ diff --git a/gfx/overworld/heal_machine.png b/gfx/overworld/heal_machine.png new file mode 100644 index 00000000..f58d6be3 Binary files /dev/null and b/gfx/overworld/heal_machine.png differ diff --git a/gfx/pack/pack.2bpp b/gfx/pack/pack.2bpp new file mode 100644 index 00000000..22be5508 Binary files /dev/null and b/gfx/pack/pack.2bpp differ diff --git a/gfx/pack/pack.png b/gfx/pack/pack.png new file mode 100644 index 00000000..b85fc099 Binary files /dev/null and b/gfx/pack/pack.png differ diff --git a/gfx/pack/pack_menu.2bpp b/gfx/pack/pack_menu.2bpp new file mode 100644 index 00000000..484bc94c Binary files /dev/null and b/gfx/pack/pack_menu.2bpp differ diff --git a/gfx/pack/pack_menu.png b/gfx/pack/pack_menu.png new file mode 100644 index 00000000..aa693cc4 Binary files /dev/null and b/gfx/pack/pack_menu.png differ diff --git a/gfx/sgb_border/gold.pal b/gfx/sgb_border/gold.pal new file mode 100755 index 00000000..047c676e --- /dev/null +++ b/gfx/sgb_border/gold.pal @@ -0,0 +1,79 @@ + RGB 24, 6, 6 + RGB 24, 24, 26 + RGB 14, 15, 20 + RGB 4, 7, 10 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 18, 24, 18 + RGB 31, 26, 15 + RGB 26, 19, 10 + RGB 12, 7, 5 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 18, 6, 31 + RGB 31, 31, 29 + RGB 31, 12, 0 + RGB 0, 0, 0 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 12, 31, 6 + RGB 22, 26, 30 + RGB 16, 17, 21 + RGB 0, 3, 0 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 diff --git a/gfx/sgb_border/gold.png b/gfx/sgb_border/gold.png new file mode 100644 index 00000000..ab03c950 Binary files /dev/null and b/gfx/sgb_border/gold.png differ diff --git a/gfx/sgb_border/pals/gold.pal b/gfx/sgb_border/pals/gold.pal deleted file mode 100755 index 047c676e..00000000 --- a/gfx/sgb_border/pals/gold.pal +++ /dev/null @@ -1,79 +0,0 @@ - RGB 24, 6, 6 - RGB 24, 24, 26 - RGB 14, 15, 20 - RGB 4, 7, 10 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 18, 24, 18 - RGB 31, 26, 15 - RGB 26, 19, 10 - RGB 12, 7, 5 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 18, 6, 31 - RGB 31, 31, 29 - RGB 31, 12, 0 - RGB 0, 0, 0 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 12, 31, 6 - RGB 22, 26, 30 - RGB 16, 17, 21 - RGB 0, 3, 0 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 diff --git a/gfx/sgb_border/pals/silver.pal b/gfx/sgb_border/pals/silver.pal deleted file mode 100755 index cafa90ad..00000000 --- a/gfx/sgb_border/pals/silver.pal +++ /dev/null @@ -1,79 +0,0 @@ - RGB 24, 6, 6 - RGB 31, 27, 22 - RGB 27, 21, 15 - RGB 9, 6, 5 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 18, 24, 18 - RGB 24, 25, 27 - RGB 18, 17, 21 - RGB 4, 7, 10 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 18, 6, 31 - RGB 31, 31, 29 - RGB 31, 12, 0 - RGB 0, 0, 0 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 12, 31, 6 - RGB 22, 26, 30 - RGB 16, 17, 21 - RGB 0, 3, 0 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 - RGB 31, 31, 25 diff --git a/gfx/sgb_border/silver.pal b/gfx/sgb_border/silver.pal new file mode 100755 index 00000000..cafa90ad --- /dev/null +++ b/gfx/sgb_border/silver.pal @@ -0,0 +1,79 @@ + RGB 24, 6, 6 + RGB 31, 27, 22 + RGB 27, 21, 15 + RGB 9, 6, 5 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 18, 24, 18 + RGB 24, 25, 27 + RGB 18, 17, 21 + RGB 4, 7, 10 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 18, 6, 31 + RGB 31, 31, 29 + RGB 31, 12, 0 + RGB 0, 0, 0 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 12, 31, 6 + RGB 22, 26, 30 + RGB 16, 17, 21 + RGB 0, 3, 0 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 diff --git a/gfx/sgb_border/silver.png b/gfx/sgb_border/silver.png new file mode 100644 index 00000000..a9d63b6e Binary files /dev/null and b/gfx/sgb_border/silver.png differ diff --git a/tools/gfx.py b/tools/gfx.py index 36e06010..2e2703be 100644 --- a/tools/gfx.py +++ b/tools/gfx.py @@ -116,6 +116,42 @@ def filepath_rules(filepath): args['width'] = 24 args['whitespace'] = [4] + elif 'gfx/pack' in filedir: + if name == 'pack': + args['width'] = 40 + + elif name == 'pack_menu': + args['width'] = 128 + + elif 'gfx/intro' in filedir: + if name == 'copyright': + args['width'] = 240 + + elif name == 'gamefreak_presents': + args['width'] = 104 + + elif name in ['gamefreak_logo', 'logo_sparkle']: + args['width'] = 24 + + elif name == 'logo_star': + args['width'] = 8 + + elif 'gfx/naming_screen' in filedir: + args['width'] = 8 + + elif 'gfx/icons' in filedir: + if name == 'mail_big': + args['width'] = 16 + + elif 'gfx/overworld' in filedir: + if name == 'heal_machine': + args['width'] = 8 + args['pal_file'] = os.path.join(filedir, name + '.pal') + + elif 'gfx/sgb_border' in filedir: + args['width'] = 128 + args['pal_file'] = os.path.join(filedir, name + '.pal') + elif os.path.join(filedir, name) in pics: args['pic'] = True diff --git a/tools/pokemontools/gfx.py b/tools/pokemontools/gfx.py index 97e4d838..078f44f3 100644 --- a/tools/pokemontools/gfx.py +++ b/tools/pokemontools/gfx.py @@ -389,6 +389,8 @@ def export_2bpp_to_png(filein, fileout=None, pal_file=None, height=0, width=0, t 'pal_file': pal_file, 'tile_padding': tile_padding, 'pic_dimensions': pic_dimensions, + 'rows': kwargs.get('rows', None), + 'whitespace': kwargs.get('whitespace', None) } arguments.update(read_filename_arguments(filein)) -- cgit v1.2.3