From f09b68d9450e0770115b764a49342bc9767d75f4 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 1 Mar 2020 17:00:57 -0500 Subject: [PATCH] Change how some PNG graphics are formatted --- Makefile | 5 +- engine/link/mystery_gift.asm | 29 ++-- engine/menus/debug.asm | 69 +++++----- engine/movie/trade_animation.asm | 21 +-- engine/pokedex/pokedex_3.asm | 2 +- engine/pokemon/mail_2.asm | 130 +++++++++--------- gfx/card_flip/card_flip_1.png | Bin 494 -> 476 bytes gfx/debug/color_test.png | Bin 215 -> 200 bytes gfx/debug/up_arrow.png | Bin 0 -> 81 bytes gfx/frames/1.png | Bin 123 -> 122 bytes gfx/frames/2.png | Bin 126 -> 122 bytes gfx/frames/3.png | Bin 114 -> 112 bytes gfx/frames/4.png | Bin 128 -> 126 bytes gfx/frames/5.png | Bin 108 -> 109 bytes gfx/frames/6.png | Bin 117 -> 114 bytes gfx/frames/7.png | Bin 118 -> 119 bytes gfx/frames/8.png | Bin 109 -> 110 bytes gfx/frames/9.png | Bin 111 -> 113 bytes gfx/frames/map_entry_sign.png | Bin 190 -> 169 bytes gfx/mobile/havewant.png | Bin 957 -> 968 bytes gfx/mystery_gift/card_sprite.png | Bin 0 -> 133 bytes gfx/mystery_gift/card_trade.png | Bin 0 -> 620 bytes gfx/mystery_gift/mystery_gift.png | Bin 698 -> 694 bytes gfx/mystery_gift/mystery_gift_jp.png | Bin 686 -> 0 bytes ....82bc0a7b => pokedex_sgb.2bpp.lz.82bc0a7b} | Bin gfx/pokedex/{sgb.png => pokedex_sgb.png} | Bin gfx/sprites/big_onix.png | Bin 262 -> 300 bytes gfx/trade/arrow.png | Bin 98 -> 0 bytes gfx/trade/arrow_left.png | Bin 0 -> 83 bytes gfx/trade/arrow_right.png | Bin 0 -> 83 bytes gfx/unown_puzzle/tile_borders.png | Bin 118 -> 113 bytes mobile/mobile_5f.asm | 2 +- 32 files changed, 133 insertions(+), 125 deletions(-) create mode 100644 gfx/debug/up_arrow.png create mode 100644 gfx/mystery_gift/card_sprite.png create mode 100644 gfx/mystery_gift/card_trade.png delete mode 100644 gfx/mystery_gift/mystery_gift_jp.png rename gfx/pokedex/{sgb.2bpp.lz.82bc0a7b => pokedex_sgb.2bpp.lz.82bc0a7b} (100%) rename gfx/pokedex/{sgb.png => pokedex_sgb.png} (100%) delete mode 100644 gfx/trade/arrow.png create mode 100644 gfx/trade/arrow_left.png create mode 100644 gfx/trade/arrow_right.png diff --git a/Makefile b/Makefile index 2bd491529..f76131877 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index 8479c6f61..49e83c33e 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -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 @@ -1347,11 +1347,11 @@ InitMysteryGiftLayout: ret .Load5GFX: - ld b, 5 + ld b, 5 jr .gfx_loop .Unreferenced_Load6GFX: - ld b, 6 + ld b, 6 jr .gfx_loop .Load16GFX: @@ -1365,7 +1365,7 @@ InitMysteryGiftLayout: ret .Load9Column: - ld b, 9 + ld b, 9 jr .col_loop .Load11Column: @@ -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" diff --git a/engine/menus/debug.asm b/engine/menus/debug.asm index 484556b28..d49902254 100644 --- a/engine/menus/debug.asm +++ b/engine/menus/debug.asm @@ -1,26 +1,26 @@ const_def $6a - const DEBUGTEST_UP_ARROW ; $6a - const DEBUGTEST_TICKS ; $6b - const DEBUGTEST_WHITE ; $6c - const DEBUGTEST_LIGHT ; $6d - const DEBUGTEST_DARK ; $6e - const DEBUGTEST_BLACK ; $6f - const DEBUGTEST_0 ; $70 - const DEBUGTEST_1 ; $71 - const DEBUGTEST_2 ; $72 - const DEBUGTEST_3 ; $73 - const DEBUGTEST_4 ; $74 - const DEBUGTEST_5 ; $75 - const DEBUGTEST_6 ; $76 - const DEBUGTEST_7 ; $77 - const DEBUGTEST_8 ; $78 - const DEBUGTEST_9 ; $79 - const DEBUGTEST_A ; $7a - const DEBUGTEST_B ; $7b - const DEBUGTEST_C ; $7c - const DEBUGTEST_D ; $7d - const DEBUGTEST_E ; $7e - const DEBUGTEST_F ; $7f + const DEBUGTEST_TICKS_1 ; $6a + const DEBUGTEST_TICKS_2 ; $6b + const DEBUGTEST_WHITE ; $6c + const DEBUGTEST_LIGHT ; $6d + const DEBUGTEST_DARK ; $6e + const DEBUGTEST_BLACK ; $6f + const DEBUGTEST_0 ; $70 + const DEBUGTEST_1 ; $71 + const DEBUGTEST_2 ; $72 + const DEBUGTEST_3 ; $73 + const DEBUGTEST_4 ; $74 + const DEBUGTEST_5 ; $75 + const DEBUGTEST_6 ; $76 + const DEBUGTEST_7 ; $77 + const DEBUGTEST_8 ; $78 + const DEBUGTEST_9 ; $79 + const DEBUGTEST_A ; $7a + const DEBUGTEST_B ; $7b + const DEBUGTEST_C ; $7c + const DEBUGTEST_D ; $7d + const DEBUGTEST_E ; $7e + const DEBUGTEST_F ; $7f ColorTest: ; A debug menu to test monster and trainer palettes at runtime. @@ -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 "いいえ", 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 diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm index 7d858662c..d8c467d65 100644 --- a/engine/movie/trade_animation.asm +++ b/engine/movie/trade_animation.asm @@ -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,9 +1457,10 @@ 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" -TradeCableGFX: INCBIN "gfx/trade/cable.2bpp" -TradeBubbleGFX: INCBIN "gfx/trade/bubble.2bpp" -TradeGameBoyLZ: INCBIN "gfx/trade/game_boy.2bpp.lz" -TradeBallGFX: INCBIN "gfx/trade/ball.2bpp" -TradePoofGFX: INCBIN "gfx/trade/poof.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" +TradeBallGFX: INCBIN "gfx/trade/ball.2bpp" +TradePoofGFX: INCBIN "gfx/trade/poof.2bpp" diff --git a/engine/pokedex/pokedex_3.asm b/engine/pokedex/pokedex_3.asm index bd909f8ff..f546c79f1 100644 --- a/engine/pokedex/pokedex_3.asm +++ b/engine/pokedex/pokedex_3.asm @@ -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 diff --git a/engine/pokemon/mail_2.asm b/engine/pokemon/mail_2.asm index 8def4e57a..de7b253ea 100644 --- a/engine/pokemon/mail_2.asm +++ b/engine/pokemon/mail_2.asm @@ -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 diff --git a/gfx/card_flip/card_flip_1.png b/gfx/card_flip/card_flip_1.png index ab3c6594fe4d10d1c3725d5d0dce9c0dea481d79..d3bfef22aba417285bef3809c0bd390273073fe1 100644 GIT binary patch literal 476 zcmeAS@N?(olHy`uVBq!ia0y~yU}#`qU{GLUU|?X_`qMmufq`+cr;B4q#jV^+)_Khi z0&EWqrM)L=Tsk7YphY|4klqSkkz#pm)qO5oL}%HyaBF|x5EOYk@{8JMhO)USf(i$h zKfEuQFk^aohn#ezb%XTW64u$x51H?(rfztCd^JbOk0QO_o3^*wr#<*Mx4YIh#322} z^<~BXZj{ND^W+ISgd}u(pA!ADkzt{+!>Wdz=b0|_J5G{3S>VChkk5Q!M}qM>hT7G; zJG5T3DSC>ay>wkj* zH>1FT8|{3j>(*|bFoDsh_QcA5EAE?V49W5uOBkYgn5{|}e4Wo{TwPxhd8WZ=haOwE zud>2P6Xvf6OOLWl`;xW#Kw9?UC8hUWr~4&ro#{Af4R8IE32}?LR?j-v=9nkC#eJ1Q z`VHX~)1=SMx-rRZspKKO4EF9UMTJ>M^EZet*xvT7#-6u1$>0;W#5>85e4el?*SlxO z**C0hSfzI1=z=+oZ?-MunlI5H$CSk;;?wv~@^UO=spvFb)2E;Q)U&c}vT41t)289? iWtMm9239vE{xGy1+OspNZqf-*w0XMvxvX|fq`+Wr;B4q#jUB6t@D~4 zL|o@9dQ6O2(rNC%8NH!JbA@xtp7|O}_jYDzz24X%GVOa~P-KZ%?TNj{JWAV?Et6js zupj$uX|u##c(R8^b*+^`D|_Hqj-&$uWioE9lS(7iFXUKQx(~*jTX6$^P6j)%UuYLTw4j z>^E4ly_P#S1uqT$A(_xo&h+h-@NRWU`4_qM<_z_=f4_dYe)<0XjcQuEj!(LGRoCaQ zW5jcTBPF7T9R(OV6OAID&xx{RHu8$Or6luk?kth^#?`a_WnH-y-c{ms>t@R8%TC!d zRDzQ1)b3ptT(hRS!MDrZMJLRKGsNZR8wIB`VLxu`{O?s#N^|jZ-t4`G?F5T!pZ7=Yv=X6>|8Ua`@Zi-~U*o=Iy!3EdOf5q-TKzOqr*DtTHX6#pv+o)oddkEx2Pgg&ebxsLQ E0QIv?-2eap literal 215 zcmeAS@N?(olHy`uVBq!ia0y~yVA#RHz`()8z`($us#J8Ifq`M3r;B4q#jV~6j$BTL zJTC0JCp)}*n8hb>Li1m(O_%r2<=r>mdKI;Vst01^^b;{X5v diff --git a/gfx/debug/up_arrow.png b/gfx/debug/up_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..6c623d2a14558c3f5598f30c5f482a2198eb4529 GIT binary patch literal 81 zcmeAS@N?(olHy`uVBq!ia0y~yVBi2@CI$uuhSgVoeq&%@knnVI45_%4oRE-^z@)s6 hP2f@#gVX9T1_tq4%>U^>p=fS?83{1OU`s6t(~W literal 0 HcmV?d00001 diff --git a/gfx/frames/1.png b/gfx/frames/1.png index fee7de870e4c1b56392e8bb67f7a6c651438d092..0de4d8fae82be0073dfb259f786f81266cae6a6f 100644 GIT binary patch literal 122 zcmeAS@N?(olHy`uVBq!ia0y~yV31&7U=UzpU|?WK{{Q0z0|SGjr;B4q#jVsc8#xa+ z@Hk)Omwe#%=@omV#)E4MJT!}oKK2+o#s6T8N!ru@f_L=`nX{Aff@e;id%nsfu^@DM bP}&^vwfT0xU2OAwL56y|`njxgN@xNA9$71H literal 123 zcmeAS@N?(olHy`uVBq!ia0y~yU=UznV31&9U|?XFQ*Bkqz`)?->EaktaVz%hK~4q( z4(0<5%odYYbH}cju>QiVZ^5q~cW887ZDlW+DzsVn>ZS8jJ|-+`X^%2wvA@Jz9IDT3 cmH+)BTWgQqZ*_?`k|0w(UHx3vIVCg!0E@FJP5=M^ diff --git a/gfx/frames/2.png b/gfx/frames/2.png index 0ed5ebbedfd48ba2b2bbb9832962798abbde64df..3ccbb4bf63eed92fbb4d51f1bc3e0485d6415c08 100644 GIT binary patch literal 122 zcmeAS@N?(olHy`uVBq!ia0y~yV31&7U=UzpU|?WK{{Q0z0|SGjr;B4q#Vyya+nfvr z9L%kJ6DIDeI>;EK`XK+{J{>iA_T!#+JexWcT-a}foZDM<-zS*xE b^K%j_%LX^mFwScUAVWP}{an^LB{Ts5WwI!8 literal 126 zcmeAS@N?(olHy`uVBq!ia0y~yU=UznV31&9U|?XFQ*Bkqz`)?@>Eaktam)0~MNS4o z4(5P`%qdIO)jeQXC-mX_fmVsPgg&ebxsLQ01m7r00000 literal 114 zcmeAS@N?(olHy`uVBq!ia0y~yU=UznV31&9U|?XFQ*Bkqz`$VX>EaktaVz-;KMN1X zBYtLq8n%sg&5;RB@;bj~%6BGgVBh$ok;QnRqE8nEX{(ZXdhY2NrYox#C4rITP2aGc<0SrEB)}@WS(Za&Erl f@+eR1nfZ@_^P<&r)f1UzAcH+!{an^LB{Ts5nQkcD literal 128 zcmeAS@N?(olHy`uVBq!ia0y~yU=UznV31&9U|?XFQ*Bkqz`)?{>EaktaVxcVBj*7J z9%g={2De`i>l@Z66-XC+$qRBh+Nh&=Sx{bXQP%9F_YWd`qskvNCQQwET6U6oX?VTL gsW|TDbAM*J>xb{Mdd@pz2?xk%Pgg&ebxsLQ06oMjZ2$lO diff --git a/gfx/frames/5.png b/gfx/frames/5.png index f44542aafbb18f461b6df471c36648fade73e1b7..be4a509d1a9dda4261e0da19970604b83a84ce15 100644 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0y~yV31&7U=UzpU|?WK{{Q0z0|SGJr;B4q#jWHY{A@fo zG~4+9I6UHK7Pw*jXXC^FAJ{!^{{PRv%t1h%^;*LJ`HV~M%H>G3FfmMFb9!+-mF*+Q N98Xt2mvv4FO#sM#B#Hn4 literal 108 zcmeAS@N?(olHy`uVBq!ia0y~yU=UznV31&9U|?XFQ*Bkqz`$Va>EaktaVz-;KMT(b zmc#6IZT374AC9;EXFe=nz2S&_bx9MW&kg2I`yZSOlol-H@hD?psGaHb;?;KtC6FLy?S literal 117 zcmeAS@N?(olHy`uVBq!ia0y~yU=UznV31&9U|?XFQ*Bkqz`$VR>EaktaVz-;KMN1X zBWC*vKWZ8p8J!w-*1tKpss7Ex4*ow5O+RgV7>fVjNEVX+VgG@-H_47)@j%Q3R|fwM V$AwDo6YN0ddAj=*ZR;zz(Bj^;sUnJJEaktaVz-;KMPOB z5qUO+9|w3+Y8f{FI4Cs#?L|&DgG7F1zJ`wT1&^BlvMU^{KOmRFH6ejb$YHW#83V($ VY+LV2JAE~ffu62@F6*2Ung9(MB3l3e diff --git a/gfx/frames/8.png b/gfx/frames/8.png index 2eab8299916c436a725e554d199252a68aa3387f..aa102e680ef717397366ed012193509d1c110b70 100644 GIT binary patch literal 110 zcmeAS@N?(olHy`uVBq!ia0y~yV31&7U=UzpU|?WK{{Q0z0|SGpr;B4q#jV^k8wD8* zIG7yF3RJ$`KgPI2+3OTbcfNzgL3tk@-Ii1D8n;c`JKf7w^1@8x^Lp(0cbtlg^q+nJ O8RY5e=d#Wzp$Pzixg(_j literal 109 zcmeAS@N?(olHy`uVBq!ia0y~yU=UznV31&9U|?XFQ*Bkqz`$VQ>EaktaVz-;KMT(b z7G{AzjKY5$-pN;QI3izN(!}UEaktaVz-;KMRis z3$wrn4IS)pB9dC~aqw(8CvuBTSHFArapE3VAl#8E7L#%q>-*bAw=8U+@=Icx6Dyv^RS WG}EGe!C`BV8$4b8T-G@yGywqL4L#Zb literal 190 zcmeAS@N?(olHy`uVBq!ia0y~yU=UznV6b3fU|?XFecj%jfq|jb)5S5Q;#TRojezSH%MHI??=jrs_9kiDy6;(gH)`xl tU)Z($MW3j8^f!Z86aSx!I_AwkRV|*VnrYDyHLV`xFi%%Mmvv4FO#r-xNN4~6 diff --git a/gfx/mobile/havewant.png b/gfx/mobile/havewant.png index 7aa0a054400cafd653421ebdc94845169c768f2e..63f7dafb187feee10f00170e41ca115b32336822 100644 GIT binary patch literal 968 zcmeAS@N?(olHy`uVBq!ia0y~yU}#`qVDMmKU|?VfjN6sZz`)$^>Eaktack~W$L!l4 zBFE=nyQbKlByIKG_D$l+%!T38Cmw9tyY|RAVT&az0)E+6-I?vbQ{2mIX6u=74V~%} zmlmy0GSb-KmiTS&%!#_{g-pNMv>iWRuKxf1nZC44tKrl)dOiGK9+okl%Y9<|;E~*i z^Sg2-Gio!|-mgC3wW~+s$IH6{3=I<&X21B<)p*&zgXhcD-P{bPS$3qUa0={aU$E$v zHowB56J_Ui9W(s!JwM8L!=hL7&oenx&&@VdI9Sg3z&POR*vQNi#A#6( z?YN<#`WPO8CcUv^)zd|Dk{(bwn8AR{h z%VADn7Vs(i_m{zd^V%dIzugy8zGmNVG>g2_@Un=Igu4~M?_j1@9I%Zc@ zGE8xL$|ZKWW)5TBLHiHN^*usT`z35vHom(&u~kU!MSE34PGlhE&V0Be8-VP7mS}xT2%gjGsDz?(~K8{HrOtHz|`uXlUOF>A>Lu>lgPsv zaQF|ugsZ%~!VXr&Up%K9+djgB)WAhLbkvRW0Vs@s~dEGXNH3>5=Me8rqIO6Q^)9llVtcj0$ z&iQdnXL6w?p%>YwzBNt_Nm>aa}%IVmVJQT{G>_^Al-LHqZQ^>ZSAT_;&Nc`43m@d*1M? cZ+h{6M(>Y`A6-~)`~YQ9Pgg&ebxsLQ0K$#7o&W#< literal 957 zcmeAS@N?(olHy`uVBq!ia0y~yU`POACI$uuhF)g_R|W>=7Ec$)kcwM#r=87Gb{9DA zJ@MIt!%Cdn-djEqsNs4Oy3k$0F;8-$USrSnNRG;Wnc~kUzdL-`RC3@i7q=pNd+f8& zBWB4R8JAbCdbjb|q-mxr-8S9bzp}p8OG0U8aklKbxe{GRISli@GVVC{VE*cDsTaB; zv+GYjm_7eD1A|rnXL|w3l2;F<4j2d6t8P&H+RNY~A@t+7d$web$KSWEOm?ZP3UW*8 zzNs)fcrwsy}P0sTOK%n z+1Oddow(=P9f5BO7g}!QI5uB1Tw}U@1M_>$r)uXGH3%gXl!w|2Fx=pqEwE_WcHO0q z?yTK+RfPS)ddZVVZ?;R^Sk1nVo8{PMH|~tv)wS~vtUjQ%Ftg^$t?vie-`C3gS|)k? zd*Yi3OCG%8ZTxX0kMmFF{WzJ%dR@FpQ z>2GJ?E&85W&ag_|;i>m-g#~N0BeU!x`@9a6|B(K7PM>YB1k=8A3*?#io5~)rJ0Mpu zX{)oKaZOL;UK9HU+T^S6+J!(Dm z@g`6jL7=TpDB1|+_Ft*Fs;=eq3# z6W-+sMXTO$?a%tq_%(k50EaktaVz-;KP!*C z#DN9#9x`+!Wlc!8&=7iY>cCcqc@G(S3I+67m#`jCTDWkbVuGo_TZcAo35KOCjt&fw lT*r1WB-ik=HdnFDFlKP|Qs4bm^t%|yd{0+Dmvv4FO#l>{CgT7A literal 0 HcmV?d00001 diff --git a/gfx/mystery_gift/card_trade.png b/gfx/mystery_gift/card_trade.png new file mode 100644 index 0000000000000000000000000000000000000000..a84915b3104a50f946aa4e24a4a716e6702be3b1 GIT binary patch literal 620 zcmeAS@N?(olHy`uVBq!ia0y~yU}#`qU{GLUU|?X_`qMmufq}``)5S5Q;#Tfu`|R5e zA`BnIw}?1jnDSm>&yFJ!`tDci*!Rns6`9_g;HP-7V&z18hXcVfCq$HZwtdTM?I;UQ z%G;G;Sn)z!L-df`ntk&^{%^m3kn`Q&FYjJjFfI!`e9)c6G-L()oQ7GC4f<|-Zrc`f zpFvdAfcQB#8O=Py!uv3V@13tE}(#_XHXxc-*Q z=TeTpH=>xFqokfxIi54Q6#TT)_gv4CW*NEv%(K))dRybtZoON0@O_7IVA?B&4{EH> zV%{}N3U9yP>S-gyI@k8U=~KNKuiqS<-@WcwY2m`nu8iLfY)%k#)fXw8tm|SZ)E&D( zNJppZ(T}vb9G&+Bq+PCxG#oRP`TgF1ZD?km@X_*!(n)S%jTKG0Tc^a;|5>vx{;p!s zPXBE|J8FMl%2>H7G-zSmKK_paE&0+HR>(8urO#fi8}+LHUm3?Mzim5TdF1`IxUHKq fzs!Hj&ZGYsOf0rA%@(t?10^F*S3j3^P6N9?Z;M;fz5FlV!PBRvP3ZRC*Ww?z#WM23WDRfqsXB7qM9OB0hO8(9I@!wSW0; zEY6NsV)a~G`|-=m%7E0%wizqmZ+2I>wZ?2k)#3$mZ%=eC;Zb%!*2vd#(MV+i-?3TO z&Sh=5bc><*#Njl)*>9a6l(DV*cRboy|G3eaD~Tqu{UO|*^%0-1v0Qs&#ON%Wrn!T$ z;_Nw27M7;-%{(jxm5*Qj-n$?_BBbHzFK62wGHhW9YuSarORR`~+ox%;gR6((+TY~| zV(TBRRhMSE^6~()=jsPKlOx@)JXvx-{a#Vg9ac?p$yhoTo)C@b94UGhP$^c%%*GgJ7g6rrioi@=gIqN_g!>_;dh2zi%##%Ox>9pcR)X$gVjpdd_xJZ zS~}+jAMaz^*XUR9v_&PnDthjwX|Thj-_c+S%a&Q*#<`c%8b69pOJI8P`Ibx(%cm)d z&yO9LxaFdB^t7jD^L8@#I2^NWc(whn=fbT!-E$7;xy%#2qmv=)xW0S+rT3|`je0jQ zeVG>4((tD1?}P6p9Ir#PvJyD!gg>}$`(WJT7%F?=HCK{r>4gQxD;r`?9Mxmg^`E-G zo?};nZ`-RImpOJWDp{y}Rp(v+cTkY<_8`5h z|CQ<-e&#fIl?$zC^J|I@eIb%@C7$7`ynaK<*Z<6am}O<3FPQ!Q!dg&*^mO%eS?83{ F1OWSRKXCv6 literal 698 zcmeAS@N?(olHy`uVBq!ia0y~yU~phyVDMmKU|?X-e7NNt0|Qf|r;B4q#jV=QhS|3r zL>L}i@6ua%aPt4=k3y4`wphIIe-e2_>IkZOp>+x%D>-x$#Np_c)Pbqi6YZ8#WKdYhULLFM;A3J zIxpC)8^BQZ^41awgPA{=UOh@=_GSKaJfdS6$FfL+XeYZ#i+&g0`nork(W-C=pJx=qMMPyX=3=QyiC-&SJgA!j`a=OYF=Vu>&kx8)i7%c-Ou( z{$h+vYN5g$A(!H&ofdJ28x#~h?7s6WG(LX4fo0Jh=_!*QJ3dl-x5u9AVVuDie6vciie3VxM!Ow zy8F|KX$z8GHU(``SRJ%$Tgl^yV+*W;tnwUpofG`iF*T_`HhgxpV%Vhy-L0EhZ>4Og zKP)2C;B|CX!!q#=AGR)^p2p535OTwDhwd7_)gq~mp3AegiXPOwFgH!@f^2Hv75}CP z(N+B`8+S4OT{1r`JHx1?tfB0sa7gCl%hOVWGN#+uF6O%AFgx^}nfkPQXN{AX>k@3r=_HFD%^1{`GzJhP=1-AK2Gz%~06*Le&_QC_P>M KT-G@yGywo>BtAp{ diff --git a/gfx/mystery_gift/mystery_gift_jp.png b/gfx/mystery_gift/mystery_gift_jp.png deleted file mode 100644 index 692cf8732a75753faa64d3e214dfb3c4eddb510a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 686 zcmeAS@N?(olHy`uVBq!ia0y~yU~phyVDMmKU|?X-e7NNt0|Qg3r;B4q#jV^chS|3r zL>L}S&(dsrBr@yf>JN{Eg!jkPEm1x`Rb(FlE6uRhh==;-@d%q zg-2}b0o(m0*2}YQguH(}Z~L8dPZ#N|dt|@i8_ODlt&2_AkKg_BL*o>4f7gcVAMN`9^boM>}D`m?vn#soP-5?A|qN>?{{-d zh-+3la&QmFqt=KJ{#V=EZ?ZHTGu`twe!s!y5QRsYWt~DheLqZ&{xju9u5IIsbsTrR zx-M+Htkm&HNNJJvk=R9H+kAJbirF5WHuqiHg>9Wjek@iEaqM>KIJudld&BK8g~_g7 z;eQ18X-+t~=*22lg=tpGT}6K*TGnq<3VEO?edC|CsAz!k`KqZGy(M3ZO6>jhLC#Bj xYG~Jg5x4Fs@s$zc{wg+XXRqNl5$%Q~loCID+fJUajY diff --git a/gfx/pokedex/sgb.2bpp.lz.82bc0a7b b/gfx/pokedex/pokedex_sgb.2bpp.lz.82bc0a7b similarity index 100% rename from gfx/pokedex/sgb.2bpp.lz.82bc0a7b rename to gfx/pokedex/pokedex_sgb.2bpp.lz.82bc0a7b diff --git a/gfx/pokedex/sgb.png b/gfx/pokedex/pokedex_sgb.png similarity index 100% rename from gfx/pokedex/sgb.png rename to gfx/pokedex/pokedex_sgb.png diff --git a/gfx/sprites/big_onix.png b/gfx/sprites/big_onix.png index 7996be17ea518091b31abb60e37b9474cb6186d4..6002767c217461d5286fbafb05fb5b4bf7f0ccd5 100644 GIT binary patch delta 286 zcmZo;TEjF!yk3Ecfq{WRW}$5-0|UcnPZ!6Kid(7|HhLWn5Mg`pf7{7Rs=Uv{&S8C*%gph10j|kK1W$y)fE$PBiG? zn@xSzjo-Fr=C;-{#;$qGUG`9ef2FZS@)XTovzw~dhlQjh$jx)idh;Qx!J)wC%NeUV zLbA8j9c5-Ny~~xiV&z)FGo5FmRXj9|rKkTWNe$yWRZ{tQ!}^tf+|z0v7ieUQ#&MKA tsXTf}_NYiuT-=AqugPK?)`+M7V_tBgL^*kiY#}HhJYD@<);T3K0RRAyf)xM& delta 247 zcmZ3()W$SHyk3Hdfq{YHOUDjR1_p++o-U3d6}NcLZS*=EAj0FVdQ&MBb@ E09jOUAr-fhfBc&NFx&R< z^@_Ij4--WApZ!b!A%FgZx!jSxTyF6P@BIJBV6sAN>b?(N>p;3ZUHx3vIVCg!08WA; A9RL6T diff --git a/gfx/trade/arrow_left.png b/gfx/trade/arrow_left.png new file mode 100644 index 0000000000000000000000000000000000000000..71520e903f7ed5176ab321ef48ac9c4bdc0da846 GIT binary patch literal 83 zcmeAS@N?(olHy`uVBq!ia0y~yVBi2@CI$uuhSgVoeq&%@kn(hK45_%4{6qfy2lIIk jvuzHC8vNpV_OG9vpdfeKlThtb_Y7`6AsPuU|Q2F>B8X4JnJW;-=BjDd>`r=cJnZZ Wn#H-EP~#H=8R+Ti=d#Wzp$P!y