Change how some PNG graphics are formatted

This commit is contained in:
Rangi 2020-03-01 17:00:57 -05:00
parent 9bec0e0f78
commit f09b68d945
32 changed files with 133 additions and 125 deletions

View File

@ -169,8 +169,8 @@ gfx/mail/flower_mail_border.1bpp: tools/gfx += --remove-whitespace
gfx/mail/litebluemail_border.1bpp: tools/gfx += --remove-whitespace
gfx/pokedex/pokedex.2bpp: tools/gfx += --trim-whitespace
gfx/pokedex/pokedex_sgb.2bpp: tools/gfx += --trim-whitespace
gfx/pokedex/question_mark.2bpp: rgbgfx += -h
gfx/pokedex/sgb.2bpp: tools/gfx += --trim-whitespace
gfx/pokedex/slowpoke.2bpp: tools/gfx += --trim-whitespace
gfx/pokegear/pokegear.2bpp: rgbgfx += -x2
@ -188,6 +188,7 @@ gfx/slots/slots_1.2bpp: tools/gfx += --trim-whitespace
gfx/slots/slots_2.2bpp: tools/gfx += --interleave --png=$<
gfx/slots/slots_3.2bpp: tools/gfx += --interleave --png=$< --remove-duplicates --keep-whitespace --remove-xflip
gfx/card_flip/card_flip_1.2bpp: tools/gfx += --trim-whitespace
gfx/card_flip/card_flip_2.2bpp: tools/gfx += --remove-whitespace
gfx/battle_anims/angels.2bpp: tools/gfx += --trim-whitespace
@ -220,6 +221,8 @@ gfx/trainer_card/leaders.2bpp: tools/gfx += --trim-whitespace
gfx/overworld/chris_fish.2bpp: tools/gfx += --trim-whitespace
gfx/overworld/kris_fish.2bpp: tools/gfx += --trim-whitespace
gfx/sprites/big_onix.2bpp: tools/gfx += --remove-whitespace --remove-xflip
gfx/battle/dude.2bpp: rgbgfx += -h
gfx/font/unused_bold_font.1bpp: tools/gfx += --trim-whitespace

View File

@ -1261,7 +1261,7 @@ InitMysteryGiftLayout:
ld hl, MysteryGiftGFX
ld de, vTiles2 tile $00
ld a, BANK(MysteryGiftGFX)
ld bc, MysteryGiftGFX.End - MysteryGiftGFX
ld bc, $43 tiles
call FarCopyBytes
hlcoord 0, 0
ld a, $42
@ -1393,7 +1393,6 @@ InitMysteryGiftLayout:
MysteryGiftGFX:
INCBIN "gfx/mystery_gift/mystery_gift.2bpp"
.End
Function105688:
call ClearTilemap
@ -1552,15 +1551,15 @@ Function10578c:
Function1057d7:
call ClearBGPalettes
call DisableLCD
ld hl, MysteryGiftJP_GFX
ld hl, CardTradeGFX
ld de, vTiles2 tile $00
ld a, BANK(MysteryGiftJP_GFX)
lb bc, 4, 0
ld a, BANK(CardTradeGFX)
ld bc, $40 tiles
call FarCopyBytes
ld hl, MysteryGiftJP_GFX + $40 tiles
ld hl, CardTradeSpriteGFX
ld de, vTiles0 tile $00
ld a, BANK(MysteryGiftJP_GFX)
ld bc, $80
ld a, BANK(CardTradeSpriteGFX)
ld bc, 8 tiles
call FarCopyBytes
hlcoord 0, 0
ld a, $3f
@ -1706,6 +1705,8 @@ Function1057d7:
dsprite 1, 1, 13, 4, $06, 0
dsprite 1, 1, 14, 4, $07, 0
; japanese mystery gift gfx
MysteryGiftJP_GFX:
INCBIN "gfx/mystery_gift/mystery_gift_jp.2bpp"
CardTradeGFX:
INCBIN "gfx/mystery_gift/card_trade.2bpp"
CardTradeSpriteGFX:
INCBIN "gfx/mystery_gift/card_sprite.2bpp"

View File

@ -1,6 +1,6 @@
const_def $6a
const DEBUGTEST_UP_ARROW ; $6a
const DEBUGTEST_TICKS ; $6b
const DEBUGTEST_TICKS_1 ; $6a
const DEBUGTEST_TICKS_2 ; $6b
const DEBUGTEST_WHITE ; $6c
const DEBUGTEST_LIGHT ; $6d
const DEBUGTEST_DARK ; $6e
@ -147,11 +147,11 @@ Function81948:
ret
Function8197c:
ld hl, DebugColorTestGFX + 1 tiles
ld de, vTiles2 tile DEBUGTEST_UP_ARROW
ld hl, DebugColorTestGFX
ld de, vTiles2 tile DEBUGTEST_TICKS_1
ld bc, 22 tiles
call CopyBytes
ld hl, DebugColorTestGFX
ld hl, DebugUpArrowGFX
ld de, vTiles0
ld bc, 1 tiles
call CopyBytes
@ -392,10 +392,10 @@ Function81bc0:
Function81bde:
push af
ld a, DEBUGTEST_UP_ARROW
ld a, DEBUGTEST_TICKS_1
ld [hli], a
ld bc, $f
ld a, DEBUGTEST_TICKS
ld a, DEBUGTEST_TICKS_2
call ByteFill
ld l, e
ld h, d
@ -1031,6 +1031,9 @@ String_81fcd:
next "いいえ<DOT><DOT>", DEBUGTEST_B ; NO..(B)
db "@"
DebugUpArrowGFX:
INCBIN "gfx/debug/up_arrow.2bpp"
DebugColorTestGFX:
INCBIN "gfx/debug/color_test.2bpp"
@ -1047,13 +1050,13 @@ TilesetColorTest:
call WaitBGMap2
xor a
ldh [hBGMapMode], a
ld de, DebugColorTestGFX + 1 tiles
ld hl, vTiles2 tile DEBUGTEST_UP_ARROW
ld de, DebugColorTestGFX
ld hl, vTiles2 tile DEBUGTEST_TICKS_1
lb bc, BANK(DebugColorTestGFX), 22
call Request2bpp
ld de, DebugColorTestGFX
ld de, DebugUpArrowGFX
ld hl, vTiles1
lb bc, BANK(DebugColorTestGFX), 1
lb bc, BANK(DebugUpArrowGFX), 1
call Request2bpp
ld a, HIGH(vBGMap1)
ldh [hBGMapAddress + 1], a
@ -1118,10 +1121,10 @@ Function821f4:
hlcoord 2, 8
Function82203:
ld a, DEBUGTEST_UP_ARROW
ld a, DEBUGTEST_TICKS_1
ld [hli], a
ld bc, $10 - 1
ld a, DEBUGTEST_TICKS
ld a, DEBUGTEST_TICKS_2
call ByteFill
ret

View File

@ -173,15 +173,15 @@ RunTradeAnimScript:
ld hl, TradeGameBoyLZ
ld de, vTiles2 tile $31
call Decompress
ld hl, TradeArrowGFX
ld hl, TradeArrowRightGFX
ld de, vTiles0 tile TRADEANIM_RIGHT_ARROW
ld bc, 1 tiles
ld a, BANK(TradeArrowGFX)
ld a, BANK(TradeArrowRightGFX)
call FarCopyBytes
ld hl, TradeArrowGFX + 1 tiles
ld hl, TradeArrowLeftGFX
ld de, vTiles0 tile TRADEANIM_LEFT_ARROW
ld bc, 1 tiles
ld a, BANK(TradeArrowGFX)
ld a, BANK(TradeArrowLeftGFX)
call FarCopyBytes
xor a
ldh [hSCX], a
@ -1457,7 +1457,8 @@ TradeLinkTubeTilemap:
db $43, $57, $58, $54, $54, $54, $54, $54, $54, $54, $54, $54
db $43, $59, $5a, $43, $43, $43, $43, $43, $43, $43, $43, $43
TradeArrowGFX: INCBIN "gfx/trade/arrow.2bpp"
TradeArrowRightGFX: INCBIN "gfx/trade/arrow_right.2bpp"
TradeArrowLeftGFX: INCBIN "gfx/trade/arrow_left.2bpp"
TradeCableGFX: INCBIN "gfx/trade/cable.2bpp"
TradeBubbleGFX: INCBIN "gfx/trade/bubble.2bpp"
TradeGameBoyLZ: INCBIN "gfx/trade/game_boy.2bpp.lz"

View File

@ -12,7 +12,7 @@ LoadSGBPokedexGFX2:
ret
SGBPokedexGFX_LZ:
INCBIN "gfx/pokedex/sgb.2bpp.lz"
INCBIN "gfx/pokedex/pokedex_sgb.2bpp.lz"
LoadQuestionMarkPic:
ld hl, .QuestionMarkLZ

View File

@ -127,13 +127,13 @@ LoadSurfMailGFX:
push bc
ld hl, vTiles2 tile $31
ld de, SurfMailBorderGFX
ld c, 8 * 8
ld c, 8 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld de, MailLaprasGFX
ld c, 6 * 8
ld c, 6 * LEN_1BPP_TILE
call LoadMailGFX_Color3
ld de, SurfMailWaveGFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color2
jr FinishLoadingSurfLiteBlueMailGFX
@ -141,25 +141,25 @@ LoadLiteBlueMailGFX:
push bc
ld hl, vTiles2 tile $31
ld de, LiteBlueMailBorderGFX
ld c, 8 * 8
ld c, 8 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld de, MailDratiniGFX
ld c, 6 * 8
ld c, 6 * LEN_1BPP_TILE
call LoadMailGFX_Color3
ld de, PortraitMailUnderlineGFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color2
FinishLoadingSurfLiteBlueMailGFX:
ld de, SurfLiteBlueMailSmallShapesGFX
ld c, 2 * 8
ld c, 2 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld c, 2 * 8
ld c, 2 * LEN_1BPP_TILE
call LoadMailGFX_Color1
ld de, SurfLiteBlueMailLargeShapesGFX
ld c, 8 * 8
ld c, 8 * LEN_1BPP_TILE
call LoadMailGFX_Color1
ld c, 8 * 8
ld c, 8 * LEN_1BPP_TILE
call LoadMailGFX_Color2
call DrawMailBorder
@ -211,29 +211,29 @@ LoadEonMailGFX:
push bc
ld hl, vTiles2 tile $31
ld de, EonMailBorder1GFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld de, EonMailBorder2GFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color1
ld de, EonMailBorder2GFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color1
ld de, EonMailBorder1GFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld de, SurfMailBorderGFX + 6 * 8
ld c, 1 * 8
ld de, SurfMailBorderGFX + 6 * LEN_1BPP_TILE
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld de, MailEeveeGFX
ld c, 6 * 8
ld c, 6 * LEN_1BPP_TILE
call LoadMailGFX_Color3
ld hl, vTiles2 tile $3d
ld de, MailLargeCircleGFX
ld c, 4 * 8
ld c, 4 * LEN_1BPP_TILE
call LoadMailGFX_Color1
ld de, EonMailBorder2GFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld a, $31
@ -260,19 +260,19 @@ LoadLovelyMailGFX:
push bc
ld hl, vTiles2 tile $31
ld de, LovelyMailBorderGFX
ld c, 5 * 8
ld c, 5 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld de, MailPoliwagGFX
ld c, 6 * 8
ld c, 6 * LEN_1BPP_TILE
call LoadMailGFX_Color3
ld de, LovelyMailUnderlineGFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld de, LovelyMailLargeHeartGFX
ld c, 4 * 8
ld c, 4 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld de, LovelyMailSmallHeartGFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color1
call DrawMailBorder2
@ -320,25 +320,25 @@ LovelyEonMail_PlaceIcons:
LoadMorphMailGFX:
push bc
ld hl, vTiles2 tile $31
ld bc, 5 * 8
ld bc, 5 * LEN_1BPP_TILE
call MailGFX_GenerateMonochromeTilesColor2
ld de, MorphMailBorderCornerGFX + 3 * 8
ld c, 1 * 8
ld de, MorphMailBorderCornerGFX + 3 * LEN_1BPP_TILE
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld de, MorphMailBorderCornerGFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld de, MorphMailBorderGFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld de, EonMailBorder1GFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color1
ld de, MorphMailDividerGFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld de, MailDittoGFX
ld c, 6 * 8
ld c, 6 * LEN_1BPP_TILE
call LoadMailGFX_Color3
call DrawMailBorder2
ld a, $31
@ -396,31 +396,31 @@ LoadBlueSkyMailGFX:
push bc
ld hl, vTiles2 tile $31
ld de, EonMailBorder1GFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld a, $ff
ld bc, 1 tiles
call ByteFill
ld de, BlueSkyMailGrassGFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color3
ld de, MailDragoniteGFX
ld c, 23 * 8
ld c, 23 * LEN_1BPP_TILE
call LoadMailGFX_Color3
ld de, MailCloudGFX
ld c, 6 * 8
ld c, 6 * LEN_1BPP_TILE
call LoadMailGFX_Color1
ld de, FlowerMailBorderGFX + 6 * 8
ld c, 1 * 8
ld de, FlowerMailBorderGFX + 6 * LEN_1BPP_TILE
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color1
ld de, MailCloudGFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color1
ld de, MailCloudGFX + 2 * 8
ld c, 2 * 8
ld de, MailCloudGFX + 2 * LEN_1BPP_TILE
ld c, 2 * LEN_1BPP_TILE
call LoadMailGFX_Color1
ld de, MailCloudGFX + 5 * 8
ld c, 1 * 8
ld de, MailCloudGFX + 5 * LEN_1BPP_TILE
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color1
ld a, $31
@ -482,18 +482,18 @@ LoadFlowerMailGFX:
push bc
ld hl, vTiles2 tile $31
ld de, FlowerMailBorderGFX
ld c, 8 * 8
ld c, 8 * LEN_1BPP_TILE
call LoadMailGFX_Color1
ld de, MailOddishGFX
ld c, 4 * 8
ld c, 4 * LEN_1BPP_TILE
call LoadMailGFX_Color3
ld de, FlowerMailBorderGFX + 6 * 8
ld c, 1 * 8
ld de, FlowerMailBorderGFX + 6 * LEN_1BPP_TILE
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld de, FlowerMailFlowerGFX
ld c, 4 * 8
ld c, 4 * LEN_1BPP_TILE
call LoadMailGFX_Color1
ld c, 4 * 8
ld c, 4 * LEN_1BPP_TILE
call LoadMailGFX_Color2
call DrawMailBorder
@ -536,17 +536,17 @@ LoadPortraitMailGFX:
push bc
ld hl, vTiles2 tile $31
ld de, PortraitMailBorderGFX
ld c, 5 * 8
ld c, 5 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld de, PortraitMailUnderlineGFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld hl, vTiles2 tile $3d
ld de, PortraitMailLargePokeballGFX
ld c, 4 * 8
ld c, 4 * LEN_1BPP_TILE
call LoadMailGFX_Color1
ld de, PortraitMailSmallPokeballGFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color2
call DrawMailBorder2
@ -566,22 +566,22 @@ LoadMusicMailGFX:
push bc
ld hl, vTiles2 tile $31
ld de, MusicMailBorderGFX
ld c, 4 * 8
ld c, 4 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld de, MorphMailBorderGFX
ld c, 2 * 8
ld c, 2 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld de, MailNatuGFX
ld c, 6 * 8
ld c, 6 * LEN_1BPP_TILE
call LoadMailGFX_Color3
xor a
ld bc, 1 tiles
call ByteFill
ld de, MusicMailLargeNoteGFX
ld c, 3 * 8
ld c, 3 * LEN_1BPP_TILE
call LoadMailGFX_Color1
ld de, MusicMailSmallNoteGFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color1
ld a, $31
@ -607,19 +607,19 @@ LoadMusicMailGFX:
LoadMirageMailGFX:
push bc
ld hl, vTiles2 tile $31
ld bc, 5 * 8
ld bc, 5 * LEN_1BPP_TILE
call MailGFX_GenerateMonochromeTilesColor2
ld de, BlueSkyMailGrassGFX
ld c, 1 * 8
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld de, MailMewGFX
ld c, 18 * 8
ld c, 18 * LEN_1BPP_TILE
call LoadMailGFX_Color2
ld de, LiteBlueMailBorderGFX + 1 * 8
ld c, 1 * 8
ld de, LiteBlueMailBorderGFX + 1 * LEN_1BPP_TILE
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color1
ld de, LiteBlueMailBorderGFX + 6 * 8
ld c, 1 * 8
ld de, LiteBlueMailBorderGFX + 6 * LEN_1BPP_TILE
ld c, 1 * LEN_1BPP_TILE
call LoadMailGFX_Color1
call DrawMailBorder2

Binary file not shown.

Before

Width:  |  Height:  |  Size: 494 B

After

Width:  |  Height:  |  Size: 476 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 200 B

BIN
gfx/debug/up_arrow.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 123 B

After

Width:  |  Height:  |  Size: 122 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 126 B

After

Width:  |  Height:  |  Size: 122 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 B

After

Width:  |  Height:  |  Size: 112 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 128 B

After

Width:  |  Height:  |  Size: 126 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 108 B

After

Width:  |  Height:  |  Size: 109 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 B

After

Width:  |  Height:  |  Size: 114 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 118 B

After

Width:  |  Height:  |  Size: 119 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 109 B

After

Width:  |  Height:  |  Size: 110 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 111 B

After

Width:  |  Height:  |  Size: 113 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 190 B

After

Width:  |  Height:  |  Size: 169 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 957 B

After

Width:  |  Height:  |  Size: 968 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 133 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 620 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 698 B

After

Width:  |  Height:  |  Size: 694 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 686 B

View File

Before

Width:  |  Height:  |  Size: 429 B

After

Width:  |  Height:  |  Size: 429 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 262 B

After

Width:  |  Height:  |  Size: 300 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 98 B

BIN
gfx/trade/arrow_left.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 B

BIN
gfx/trade/arrow_right.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 118 B

After

Width:  |  Height:  |  Size: 113 B

View File

@ -68,7 +68,7 @@ Function17c000:
ld bc, $80 tiles
call CopyBytes
ld hl, HaveWantGFX + $800
ld hl, HaveWantGFX + $80 tiles
ld de, vTiles1
ld bc, $10 tiles
call CopyBytes