Leahnaya/pokegold
1
0
Fork 0
mirror of https://github.com/pret/pokegold.git synced 2026-04-26 01:47:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reformat and re-reidentify some gfx.

Browse Source
This commit is contained in:
entrpntr 2020-05-25 16:46:33 -04:00
parent b66b8557a6
commit 9bd3a69955
7 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/link/mystery_gift_3.asm
View File

@ -57,7 +57,7 @@ InitMysteryGiftLayout:
ld a, BANK(MysteryGiftGFX)
ld bc, $20 tiles
call FarCopyBytes
farcall LoadMysteryGiftBorderGFX
farcall LoadMysteryGiftBackgroundGFX
farcall LoadMysteryGiftGFX2
ld hl, vTiles2 tile $3d
ld a, $ff

11
engine/link/mystery_gift_gfx.asm
View File

@ -1,7 +1,7 @@
LoadMysteryGiftBorderGFX:
ld hl, MysteryGiftBorderGFX
LoadMysteryGiftBackgroundGFX:
ld hl, MysteryGiftBackgroundGFX
ld de, vTiles2 tile $20
ld a, BANK(MysteryGiftBorderGFX)
ld a, BANK(MysteryGiftBackgroundGFX)
ld bc, wBGMapBufferEnd - wBGMapBuffer
call FarCopyBytesDouble
ld hl, vTiles2 tile $20
@ -23,8 +23,9 @@ LoadMysteryGiftGFX2:
ld bc, 14 tiles
jp FarCopyBytes
MysteryGiftBorderGFX:
INCBIN "gfx/mystery_gift/border.2bpp"
MysteryGiftBackgroundGFX:
INCBIN "gfx/mystery_gift/question_mark.1bpp"
INCBIN "gfx/mystery_gift/border.1bpp"
MysteryGiftGFX2:
INCBIN "gfx/mystery_gift/mystery_gift_2.2bpp"

BIN
gfx/mystery_gift/border.1bpp Normal file
View File

Binary file not shown.

BIN
gfx/mystery_gift/border.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 173 B

After

Width:  |  Height:  |  Size: 118 B

BIN
gfx/mystery_gift/question_mark.1bpp Normal file
View File

Binary file not shown.

BIN
gfx/mystery_gift/question_mark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 142 B

12
tools/gfx.py
View File

@ -93,12 +93,12 @@ def filepath_rules(filepath):
# args['animate'] = True
# startswith to handle back_gold / back_silver
elif name.startswith('back'):
args['pal_file'] = os.path.join(filedir, 'shiny.pal')
args['pal_file'] = os.path.join(filedir, 'normal.pal')
args['pic'] = True
elif 'gfx/trainers' in filedir:
trainer_name = filedir.split('/')[-1]
args['pal_file'] = os.path.join(filedir, trainer_name + '.pal')
args['pal_file'] = os.path.join(filedir, name + '.pal')
args['pic'] = True
elif 'gfx/battle' in filedir:
@ -152,7 +152,6 @@ def filepath_rules(filepath):
elif 'gfx/overworld' in filedir:
if name == 'heal_machine':
args['width'] = 8
args['pal_file'] = os.path.join(filedir, name + '.pal')
elif name in overworld_px8:
args['width'] = 8
elif name in overworld_px16:
@ -190,12 +189,15 @@ def filepath_rules(filepath):
elif name == 'mystery_gift_2':
args['width'] = 128
# TODO: this is incomplete
elif name == 'question_mark':
args['width'] = 40
args['rows'] = [(1, 4), (0, 0), (0, 0), (2, 3), (2, 1)]
elif name == 'border':
args['width'] = 16
args['width'] = 56
elif 'gfx/sgb' in filedir:
args['width'] = 128
args['pal_file'] = os.path.join(filedir, name + '.pal')
#args['pal_file'] = os.path.join(filedir, name + '.pal')
elif 'gfx/slots' in filedir:
if name == 'slots_1':