pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Change how some PNG graphics are formatted

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
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/mail/litebluemail_border.1bpp: tools/gfx += --remove-whitespace
gfx/pokedex/pokedex.2bpp: tools/gfx += --trim-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/question_mark.2bpp: rgbgfx += -h
gfx/pokedex/sgb.2bpp: tools/gfx += --trim-whitespace
gfx/pokedex/slowpoke.2bpp: tools/gfx += --trim-whitespace gfx/pokedex/slowpoke.2bpp: tools/gfx += --trim-whitespace
gfx/pokegear/pokegear.2bpp: rgbgfx += -x2 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_2.2bpp: tools/gfx += --interleave --png=$<
gfx/slots/slots_3.2bpp: tools/gfx += --interleave --png=$< --remove-duplicates --keep-whitespace --remove-xflip 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/card_flip/card_flip_2.2bpp: tools/gfx += --remove-whitespace
gfx/battle_anims/angels.2bpp: tools/gfx += --trim-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/chris_fish.2bpp: tools/gfx += --trim-whitespace
gfx/overworld/kris_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/battle/dude.2bpp: rgbgfx += -h
gfx/font/unused_bold_font.1bpp: tools/gfx += --trim-whitespace gfx/font/unused_bold_font.1bpp: tools/gfx += --trim-whitespace

29
engine/link/mystery_gift.asm
View File

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

69
engine/menus/debug.asm
View File

@ -1,26 +1,26 @@
const_def $6a const_def $6a
const DEBUGTEST_UP_ARROW ; $6a const DEBUGTEST_TICKS_1 ; $6a
const DEBUGTEST_TICKS ; $6b const DEBUGTEST_TICKS_2 ; $6b
const DEBUGTEST_WHITE ; $6c const DEBUGTEST_WHITE ; $6c
const DEBUGTEST_LIGHT ; $6d const DEBUGTEST_LIGHT ; $6d
const DEBUGTEST_DARK ; $6e const DEBUGTEST_DARK ; $6e
const DEBUGTEST_BLACK ; $6f const DEBUGTEST_BLACK ; $6f
const DEBUGTEST_0 ; $70 const DEBUGTEST_0 ; $70
const DEBUGTEST_1 ; $71 const DEBUGTEST_1 ; $71
const DEBUGTEST_2 ; $72 const DEBUGTEST_2 ; $72
const DEBUGTEST_3 ; $73 const DEBUGTEST_3 ; $73
const DEBUGTEST_4 ; $74 const DEBUGTEST_4 ; $74
const DEBUGTEST_5 ; $75 const DEBUGTEST_5 ; $75
const DEBUGTEST_6 ; $76 const DEBUGTEST_6 ; $76
const DEBUGTEST_7 ; $77 const DEBUGTEST_7 ; $77
const DEBUGTEST_8 ; $78 const DEBUGTEST_8 ; $78
const DEBUGTEST_9 ; $79 const DEBUGTEST_9 ; $79
const DEBUGTEST_A ; $7a const DEBUGTEST_A ; $7a
const DEBUGTEST_B ; $7b const DEBUGTEST_B ; $7b
const DEBUGTEST_C ; $7c const DEBUGTEST_C ; $7c
const DEBUGTEST_D ; $7d const DEBUGTEST_D ; $7d
const DEBUGTEST_E ; $7e const DEBUGTEST_E ; $7e
const DEBUGTEST_F ; $7f const DEBUGTEST_F ; $7f
ColorTest: ColorTest:
; A debug menu to test monster and trainer palettes at runtime. ; A debug menu to test monster and trainer palettes at runtime.
@ -147,11 +147,11 @@ Function81948:
ret ret
Function8197c: Function8197c:
ld hl, DebugColorTestGFX + 1 tiles ld hl, DebugColorTestGFX
ld de, vTiles2 tile DEBUGTEST_UP_ARROW ld de, vTiles2 tile DEBUGTEST_TICKS_1
ld bc, 22 tiles ld bc, 22 tiles
call CopyBytes call CopyBytes
ld hl, DebugColorTestGFX ld hl, DebugUpArrowGFX
ld de, vTiles0 ld de, vTiles0
ld bc, 1 tiles ld bc, 1 tiles
call CopyBytes call CopyBytes
@ -392,10 +392,10 @@ Function81bc0:
Function81bde: Function81bde:
push af push af
ld a, DEBUGTEST_UP_ARROW ld a, DEBUGTEST_TICKS_1
ld [hli], a ld [hli], a
ld bc, $f ld bc, $f
ld a, DEBUGTEST_TICKS ld a, DEBUGTEST_TICKS_2
call ByteFill call ByteFill
ld l, e ld l, e
ld h, d ld h, d
@ -1031,6 +1031,9 @@ String_81fcd:
next "いいえ<DOT><DOT>", DEBUGTEST_B ; NO..(B) next "いいえ<DOT><DOT>", DEBUGTEST_B ; NO..(B)
db "@" db "@"
DebugUpArrowGFX:
INCBIN "gfx/debug/up_arrow.2bpp"
DebugColorTestGFX: DebugColorTestGFX:
INCBIN "gfx/debug/color_test.2bpp" INCBIN "gfx/debug/color_test.2bpp"
@ -1047,13 +1050,13 @@ TilesetColorTest:
call WaitBGMap2 call WaitBGMap2
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
ld de, DebugColorTestGFX + 1 tiles ld de, DebugColorTestGFX
ld hl, vTiles2 tile DEBUGTEST_UP_ARROW ld hl, vTiles2 tile DEBUGTEST_TICKS_1
lb bc, BANK(DebugColorTestGFX), 22 lb bc, BANK(DebugColorTestGFX), 22
call Request2bpp call Request2bpp
ld de, DebugColorTestGFX ld de, DebugUpArrowGFX
ld hl, vTiles1 ld hl, vTiles1
lb bc, BANK(DebugColorTestGFX), 1 lb bc, BANK(DebugUpArrowGFX), 1
call Request2bpp call Request2bpp
ld a, HIGH(vBGMap1) ld a, HIGH(vBGMap1)
ldh [hBGMapAddress + 1], a ldh [hBGMapAddress + 1], a
@ -1118,10 +1121,10 @@ Function821f4:
hlcoord 2, 8 hlcoord 2, 8
Function82203: Function82203:
ld a, DEBUGTEST_UP_ARROW ld a, DEBUGTEST_TICKS_1
ld [hli], a ld [hli], a
ld bc, $10 - 1 ld bc, $10 - 1
ld a, DEBUGTEST_TICKS ld a, DEBUGTEST_TICKS_2
call ByteFill call ByteFill
ret ret

21
engine/movie/trade_animation.asm
View File

@ -173,15 +173,15 @@ RunTradeAnimScript:
ld hl, TradeGameBoyLZ ld hl, TradeGameBoyLZ
ld de, vTiles2 tile $31 ld de, vTiles2 tile $31
call Decompress call Decompress
ld hl, TradeArrowGFX ld hl, TradeArrowRightGFX
ld de, vTiles0 tile TRADEANIM_RIGHT_ARROW ld de, vTiles0 tile TRADEANIM_RIGHT_ARROW
ld bc, 1 tiles ld bc, 1 tiles
ld a, BANK(TradeArrowGFX) ld a, BANK(TradeArrowRightGFX)
call FarCopyBytes call FarCopyBytes
ld hl, TradeArrowGFX + 1 tiles ld hl, TradeArrowLeftGFX
ld de, vTiles0 tile TRADEANIM_LEFT_ARROW ld de, vTiles0 tile TRADEANIM_LEFT_ARROW
ld bc, 1 tiles ld bc, 1 tiles
ld a, BANK(TradeArrowGFX) ld a, BANK(TradeArrowLeftGFX)
call FarCopyBytes call FarCopyBytes
xor a xor a
ldh [hSCX], a ldh [hSCX], a
@ -1457,9 +1457,10 @@ TradeLinkTubeTilemap:
db $43, $57, $58, $54, $54, $54, $54, $54, $54, $54, $54, $54 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 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"
TradeCableGFX: INCBIN "gfx/trade/cable.2bpp" TradeArrowLeftGFX: INCBIN "gfx/trade/arrow_left.2bpp"
TradeBubbleGFX: INCBIN "gfx/trade/bubble.2bpp" TradeCableGFX: INCBIN "gfx/trade/cable.2bpp"
TradeGameBoyLZ: INCBIN "gfx/trade/game_boy.2bpp.lz" TradeBubbleGFX: INCBIN "gfx/trade/bubble.2bpp"
TradeBallGFX: INCBIN "gfx/trade/ball.2bpp" TradeGameBoyLZ: INCBIN "gfx/trade/game_boy.2bpp.lz"
TradePoofGFX: INCBIN "gfx/trade/poof.2bpp" TradeBallGFX: INCBIN "gfx/trade/ball.2bpp"
TradePoofGFX: INCBIN "gfx/trade/poof.2bpp"

2
engine/pokedex/pokedex_3.asm
View File

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

130
engine/pokemon/mail_2.asm
View File

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

BIN
gfx/card_flip/card_flip_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 494 B

After

Width:  |  Height:  |  Size: 476 B

BIN
gfx/debug/color_test.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 200 B

BIN
gfx/debug/up_arrow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 81 B

BIN
gfx/frames/1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 123 B

After

Width:  |  Height:  |  Size: 122 B

BIN
gfx/frames/2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 126 B

After

Width:  |  Height:  |  Size: 122 B

BIN
gfx/frames/3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 114 B

After

Width:  |  Height:  |  Size: 112 B

BIN
gfx/frames/4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 128 B

After

Width:  |  Height:  |  Size: 126 B

BIN
gfx/frames/5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 108 B

After

Width:  |  Height:  |  Size: 109 B

BIN
gfx/frames/6.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 117 B

After

Width:  |  Height:  |  Size: 114 B

BIN
gfx/frames/7.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 118 B

After

Width:  |  Height:  |  Size: 119 B

BIN
gfx/frames/8.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 109 B

After

Width:  |  Height:  |  Size: 110 B

BIN
gfx/frames/9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 111 B

After

Width:  |  Height:  |  Size: 113 B

BIN
gfx/frames/map_entry_sign.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 190 B

After

Width:  |  Height:  |  Size: 169 B

BIN
gfx/mobile/havewant.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 957 B

After

Width:  |  Height:  |  Size: 968 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 133 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 620 B

BIN
gfx/mystery_gift/mystery_gift.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 698 B

After

Width:  |  Height:  |  Size: 694 B

BIN
gfx/mystery_gift/mystery_gift_jp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 686 B

0
gfx/pokedex/sgb.2bpp.lz.82bc0a7b → gfx/pokedex/pokedex_sgb.2bpp.lz.82bc0a7b
View File

0
gfx/pokedex/sgb.png → gfx/pokedex/pokedex_sgb.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 429 B

After

Width:  |  Height:  |  Size: 429 B

BIN
gfx/sprites/big_onix.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 262 B

After

Width:  |  Height:  |  Size: 300 B

BIN
gfx/trade/arrow.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 98 B

BIN
gfx/trade/arrow_left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 83 B

BIN
gfx/trade/arrow_right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 83 B

BIN
gfx/unown_puzzle/tile_borders.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 118 B

After

Width:  |  Height:  |  Size: 113 B

2
mobile/mobile_5f.asm
View File

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