diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | gfx/pokedex/pokedex_sgb.png | bin | 0 -> 429 bytes | |||
| -rw-r--r-- | gfx/pokedex/question_mark.png | bin | 0 -> 238 bytes | |||
| -rw-r--r-- | gfx/pokegear/pokegear.png | bin | 0 -> 531 bytes | |||
| -rw-r--r-- | gfx/printer/hp.png | bin | 0 -> 82 bytes | |||
| -rw-r--r-- | gfx/printer/lv.png | bin | 0 -> 78 bytes | |||
| -rw-r--r-- | main.asm | 4 | ||||
| -rw-r--r-- | tools/gfx.py | 9 |
8 files changed, 13 insertions, 3 deletions
@@ -55,7 +55,10 @@ gfx/battle/dude.2bpp gfx/player/chris_back.2bpp gfx/trade/game_boy.2bpp gfx/pokegear/pokegear_sprites.2bpp +gfx/pokegear/pokegear.2bpp gfx/slots/slots_*.2bpp gfx/pokedex/pokedex.2bpp gfx/pokedex/slowpoke.2bpp +gfx/pokedex/pokedex_sgb.2bpp +gfx/pokedex/question_mark.2bpp gfx/tilesets/*.2bpp diff --git a/gfx/pokedex/pokedex_sgb.png b/gfx/pokedex/pokedex_sgb.png Binary files differnew file mode 100644 index 00000000..bbacb114 --- /dev/null +++ b/gfx/pokedex/pokedex_sgb.png diff --git a/gfx/pokedex/question_mark.png b/gfx/pokedex/question_mark.png Binary files differnew file mode 100644 index 00000000..66d77f7f --- /dev/null +++ b/gfx/pokedex/question_mark.png diff --git a/gfx/pokegear/pokegear.png b/gfx/pokegear/pokegear.png Binary files differnew file mode 100644 index 00000000..c0d0b649 --- /dev/null +++ b/gfx/pokegear/pokegear.png diff --git a/gfx/printer/hp.png b/gfx/printer/hp.png Binary files differnew file mode 100644 index 00000000..adf086ca --- /dev/null +++ b/gfx/printer/hp.png diff --git a/gfx/printer/lv.png b/gfx/printer/lv.png Binary files differnew file mode 100644 index 00000000..0d5c6620 --- /dev/null +++ b/gfx/printer/lv.png @@ -1044,7 +1044,7 @@ SECTION "bank70", ROMX INCLUDE "engine/printer/print_party.asm" -TilesetKantoGFX:: +TilesetKantoGFX: INCBIN "gfx/tilesets/kanto.2bpp.lz" INCLUDE "engine/rtc/print_hours_mins.asm" @@ -1052,7 +1052,7 @@ INCLUDE "engine/pokedex/pokedex_3.asm" INCLUDE "engine/events/catch_tutorial_input.asm" INCLUDE "engine/pokegear/townmap_convertlinebreakcharacters.asm" -PokegearGFX:: +PokegearGFX: INCBIN "gfx/pokegear/pokegear.2bpp.lz" INCLUDE "data/credits_strings.asm" diff --git a/tools/gfx.py b/tools/gfx.py index 520f55d0..c4996552 100644 --- a/tools/gfx.py +++ b/tools/gfx.py @@ -165,13 +165,20 @@ def filepath_rules(filepath): args['pic_dimensions'] = 6, 6 elif 'gfx/pokedex' in filedir: - if name in ['slowpoke', 'pokedex']: + if name in ['slowpoke', 'pokedex', 'pokedex_sgb']: args['width'] = 128 + elif name == 'question_mark': + args['width'] = 56 + args['pic_dimensions'] = 7, 7 + elif 'gfx/pokegear' in filedir: if name == 'pokegear_sprites': args['width'] = 16 + elif name == 'pokegear': + args['width'] = 128 + elif 'gfx/sgb' in filedir: args['width'] = 128 args['pal_file'] = os.path.join(filedir, name + '.pal') |
