diff options
| -rw-r--r-- | .gitignore | 9 | ||||
| -rwxr-xr-x | engine/events/diploma.asm | 5 | ||||
| -rwxr-xr-x | engine/games/card_flip.asm | 4 | ||||
| -rwxr-xr-x | gfx/card_flip/card_flip_2.png | bin | 1283 -> 466 bytes | |||
| -rw-r--r-- | main.asm | 5 | ||||
| -rw-r--r-- | tools/gfx.py | 24 |
6 files changed, 40 insertions, 7 deletions
@@ -64,3 +64,12 @@ gfx/pokedex/question_mark.2bpp gfx/tilesets/*.2bpp gfx/battle_anims/*.2bpp gfx/title/*.2bpp +gfx/card_flip/card_flip_*.2bpp +gfx/diploma/diploma.2bpp +gfx/dummy_game/dummy_game.2bpp +gfx/pc/pc.2bpp +gfx/unown_puzzle/aerodactyl.2bpp +gfx/unown_puzzle/hooh.2bpp +gfx/unown_puzzle/kabuto.2bpp +gfx/unown_puzzle/omanyte.2bpp +gfx/unown_puzzle/start_cancel.2bpp diff --git a/engine/events/diploma.asm b/engine/events/diploma.asm index d55604e5..22cbcdd7 100755 --- a/engine/events/diploma.asm +++ b/engine/events/diploma.asm @@ -1,3 +1,8 @@ +ret_e0000: + ret + + ret ; unused + _Diploma: call PlaceDiplomaOnScreen call WaitPressAorB_BlinkCursor diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm index 41c7e141..82faf692 100755 --- a/engine/games/card_flip.asm +++ b/engine/games/card_flip.asm @@ -7,7 +7,7 @@ CARDFLIP_DECK_SIZE EQU 4 * 6 Unknown_e0908: ; Graphics for an unused Game Corner ; game were meant to be here. -ret_e0908:: +ret_e0908: ret _CardFlip: @@ -495,7 +495,7 @@ CardFlip_UpdateCoinBalanceDisplay: CardFlip_PrintCoinBalance: hlcoord 9, 15 - ld bc, $0109 + lb bc, 1, 9 call Textbox hlcoord 10, 16 ld de, .CoinStr diff --git a/gfx/card_flip/card_flip_2.png b/gfx/card_flip/card_flip_2.png Binary files differindex d7123061..1ac1e29d 100755 --- a/gfx/card_flip/card_flip_2.png +++ b/gfx/card_flip/card_flip_2.png @@ -316,11 +316,6 @@ INCBIN "gfx/font/font_inversed.1bpp" SECTION "bank38", ROMX -ret_e0000: - ret -; unused - ret - INCLUDE "engine/events/diploma.asm" INCLUDE "engine/events/print_unown_2.asm" INCLUDE "engine/games/card_flip.asm" diff --git a/tools/gfx.py b/tools/gfx.py index e0cc0399..2ad3784d 100644 --- a/tools/gfx.py +++ b/tools/gfx.py @@ -107,6 +107,16 @@ def filepath_rules(filepath): elif name == 'balls': args['width'] = 32 + elif 'gfx/card_flip' in filedir: + if name == 'card_flip_1': + args['width'] = 128 + elif name == 'card_flip_2': + args['width'] = 24 + args['rows'] = [ + (0, 2), (0, 2), (0, 2), (0, 2), (0, 2), (0, 2), (0, 2), (0, 2), + (0, 3), (0, 3), (0, 3), (0, 3), (0, 3), (0, 3), (0, 3), (0, 3), (0, 3), (0, 3), (0, 3), (0, 3) + ] + elif 'gfx/credits' in filedir: if name in ['bellossom', 'togepi', 'elekid', 'sentret']: args['width'] = 32 @@ -119,6 +129,14 @@ def filepath_rules(filepath): if name == 'color_test': args['width'] = 176 + elif 'gfx/diploma' in filedir: + if name == 'diploma': + args['width'] = 128 + + elif 'gfx/dummy_game' in filedir: + if name == 'dummy_game': + args['width'] = 16 + elif 'gfx/font' in filedir: if name == 'font_inversed': args['width'] = 128 @@ -260,6 +278,12 @@ def filepath_rules(filepath): elif name == 'game_boy': args['width'] = 56 + elif 'gfx/unown_puzzle' in filedir: + if name == 'start_cancel': + args['width'] = 152 + elif name == 'tile_borders': + args['width'] = 64 + elif os.path.join(filedir, name) in pics: args['pic'] = True |
