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 zcmV<20VDp2P){_gezFWE~rfua~~@uzC^SYnmvRIEBCNcS=(9kCi4Jxon#Rp z!KdNh8DN-~cZePvSv!Cmopc48gW&_+C1tSZ$Eyf*_;N1$vbTjlX5jIii+w#*FlXr3 zrgQ$-b{=;OZV^CKV2ex274)$Hp))|LfVs~C(2qfq8Od-+34m_{(70eTt^j?jyND|2 zh9OB5PzCgE?gIza47nXE90l014*?{0&cNVf>_Y&EQzr#vV;=&DW*6!mJK!K^89}V2C_Vb)VVx>{nG^QConqM82kW+!o0a! Sev-%l00002L?e^Eo`EM-!7sD0_W6AcY4}^$23X5Oy3!g_3nyC($I zK@b3mVKQ0goLV^pGD=+9A{^nJniPkDtD635)Y?~ybVAzMWUJFcYnUWbVm>C`(-Ew! zdw@-fM?@@ELaddLQCL}S2rP%r_!PdLC3NqjyB_jK-AjnC kXNrsYMsyxocRk;T9}iEQ*?CgIpa1{>07*qoM6N<$f&~lK_y7O^ diff --git a/gfx/debug/color_test.png b/gfx/debug/color_test.png index 1c3ee326b36f786b754c5629eb6686e4b6d38fc3..e33be965470acdfac46a64054f480d3afa47f2a5 100644 GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^8-SRD2}m%QeKoQMQvIGTjv*DddMBLbWHID%X5A@u zr;E#AM^|RiDi2S+0|u*GY|qs3C3hqra-PP-)AQQu{Nn@7yAH-BS5+?DR4adW?kmg9 zo9z>%)OyW41UA^RYwJjGY+Plnv#KXDa)J0+rRW83r{`DrXcnzpr+e>S59|L>v(lZ_ zhj%@7c%i?h!CGvGQ(}ASn+;pftSPyEd3`lwzjEA06|3AsASZgd`njxgN@xNA^|MXg literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^JAjyj2}m%gDixgvQu91r978H@^-gf)ax&y`Vc$L3 z;oZY5K7kXO|7vZzynil#F|nw@!MB_HFPBt?)Tv~nV1|s0@)q2T8V1lXi;UgIa4{CBl*H;uOe)+&)s*yCW^;Ff*BhmVyeouFL z22VEoxU_DkY~ji{z4;Y)pDuooU*Q_dcuF!v1bo*G8k|$A825< zn6#QZcEyDC7iN76e)YIRqw8ubd&yLx&B9kNouBeCVNpwalp%}#CFbH#eP*lt?-$ux Wd+dIzOT3W;nd<54=d#Wzp$Pzsvnfsh 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!ia0vp^5gnp|vd$@?2>@lXC~^P* literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm1SA;dR9h7SDOXPy$B>F!re`j4G8l3&2P|Yx zS+cI~0mC|>58n^m^7vaJAhhL`v7^bqMlnyGF0EBYY>OiQy`N_z5}IPeVHF!$v^m6csL&MGYizP zZM18SOlXqV`8`vFVdQ&MBb@09BwNGXMYp diff --git a/gfx/frames/4.png b/gfx/frames/4.png index c2908c75b74a487a92f29dc05a8e37b0a4856984..1bf1300f0e39fa4244bfe805c49603db47f785d8 100644 GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^5_XHDBJ)5 literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm1SA;dR9h7SDR)m7$B>F!sl6LH4><5J^BXm| z{d!p6utupsy5LJ*kjv3V9mUIn@^Xu^W+%OW5aAnD{-7~oYR1#DlgvxQ>s3z0aW|j) bGs|5+e3#X8-Wf|cKt_AI`njxgN@xNAJ;W<* 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!ia0vp^5P#{b9R z5kIrQ4dXu>AO8Qq?s4<~fBt0-0_v>S68_I;Tyj?~N1}y^VG5hmi|eUuA3^4Ly85}S Ib4q9e0LXqMiU0rr literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm1SA;dR9h7SDPvC;$B>F!$v^m6cwVp^X0L0r z=W+OOyzM{pVfpF}N93zZnizd<%0_P$TE&$ol`r|NsAw%Xu^^uzhWmU-RTM;{rAdR#6s7UIy=0$Axn;B|Jce NdAjF!$v^m6csL$0+fVpW z)6mH1)UdPu&B0CeZzgu||8Z#gY16|{{QpL>ko*t(56rzucKnJ5VkWpU_;)xiRC=Fa P2Qtso)z4*}Q$iB}jZG#& diff --git a/gfx/frames/7.png b/gfx/frames/7.png index 54bdbbecc2e6fbb5bdfa3b03b0b8d20151ed96f5..7338f1213b245d0320d95427c45864c8cbddf1fb 100644 GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^5vX-=hb96B+BFv!ux0LHUfKU)rtpdh@{`1BHit~!;F`VEX}0+NDYo8z SiIuBBCVIO1xvXF!$v^m6cruR2vnl*I zz>`wTu=&S9q4{qwaF!$v^m6cwVqD3;bae z{^RgYzIwwE`RbA;MxPtZo%{-q_|2OBH`|`jsGhLUql|$erroJHM>DbxWR9n+pUXO@ GgeCyKr5{@W diff --git a/gfx/frames/9.png b/gfx/frames/9.png index a23257365671694087d745ade2143c9e21e83f1e..00de7b6e01b4259f85c077bb74d3a86b832778b9 100644 GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^5oK@PS2jtiK%)OGHF!$v^m6csy8`1^zG! z$~Q1MFdccse!A{~yOP9#7Tb;o?Sk?f1RXRv7)`ForPv%%V(7LtakV)78&q Iol`;+0B{W)xc~qF diff --git a/gfx/frames/map_entry_sign.png b/gfx/frames/map_entry_sign.png index 9210137209cba91c81f5fca9de90e2bf83507af3..b9b2ebb5926e1fd1b0401d7990aac124227c8e4d 100644 GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^7C~ip5MrOK!JzFLBoc@ zbq0GXQ`d~zP0S*352vdfYnY;Of9^f~#@Bb(3Mj?ApQn3LT-lMuAuhLNY2LJj%Tyj) zR%q8&UNru@t-7;^>#0@l%fnaYiYs$BaTH6R@tUO{_ChMJMuEj|&YHV3Z?m^7&9rD= RaM&8;22WQ%mvv4FO#t5wJ=y>O literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoR1SA+{U$=J$QmvjYjv*DdO3!T+JfgtEazMF& zk?&2FM7Tr3#q-}87|x1ip;woY!GgW5#Lg2qq^MB(J$l@mPq`OLN|}YsS12rd z$kL*(VlpVOMq&27nUO6gaRU1WD?#(qd;j<5FB=?%F_r8tj1TnTb^*?9!ihYvX7Kzp5QHXy-w0pK%G^^>;|kj+=yy`f6*EH5iX#*g6JlAUw zr~$rNYu(5;&BT4}Ca{5SQb`^#XJEh`1W2k=Nj{<@fb&2GkX*0pyGHM^gfBxbF zjqQ}uV|`P5Kw7pK8;l2k{(?K$0WG#$3I1_17!SU_3jh_~-fRP40}xDh{`~+j3D%NK zPP@@$^=sdOHd)kw^?YMHORrKe+4=Vf^cpU=b33F}r?|wz&@<+eqIdtZ z0F_Y70nie#J)__Pg+MG}b{t3-h&fDQ3<*%f{0|sKA0HsN1tIzj%YlaQoxPyv>6RCX zFEIehm+*m#6kv&f2f=Sh1o}1wJ{^$zL{9*vm!cloDpEfv-V&k|MYw@kP)8F;3r-I7 zeKE!?&r(PW>Kz0m85A^?DNTw86(mHdSrY!HnEN8M0Z+C-Rh|Y&78DrI?O2;>8qY0; z7_4BJ(pxX4D8xfR`8M*XYLViM&Q1uC3;z_vo=QKb0@c7DNqjE~CY4AFp;E^88A1uf zB#bzW>7j;u@hor{^n>z005(~&2OhX7<3)|V;YGlhRtnR_bUB_bXDMdF=g4N{vzhQE qN-Xxrw>NR0;i$gnfclP?bN>NL@gea<1=#oi0000{X#hAVF>!kuHIZmstpTj~sLJ$@f6;vUI@x3JW0z zhh64X#5QAyXw#{x?y<&_mNltHvfaO_e|<_ABAIh*9j=`iip2;qZuJ4U&fuS`wq?+Y zS!;jE;G3WO0026V^FI(7bn4+6z%x)kC9o#-jQ~U#68QT^YZ+`v{q02pK4k?U9;ANu zCIbzzXC?6U-4&w6Ct!_z;5A(h1#D~|godtOC67+(wMYes%}@)_T;AOkD74^1^s$M0 z3t_z0+z|F4(1h4*L4(#YtTnf=1Mey2CeEUO5@2w5RX-2_*bbWzqNcYkrQ+PJzSR^5 z;IA3U#o31#*sBM=3k1fqMhj@$dwrk4tH3IuX?)b$_rM45eH{9x8OQfw?2x43>2V->ZB2IFE}%3vE6Bq$Mb;ehduBKq~TtE6yOF}>!Igi<>A)fOD)u+dbah!(@Lh{UVaqN z;>~X6XWr{>xV$_9&UQ4^anRjxQ;XpoS?p6SRT_)kIRuY~01a~YX?FmsCqU&(yC9&f zD_LqjS&mA;claCr&MyYN7y`b|pdSOjH66e{z#edtwL=jze2iJWG(Uhd=V;9d&AQVS&(l=`Mx?~hPy}3c zpAY_IXV9gq@U+2F98Z9igfho~uasJ;3af%I$`qY~1B|d-mIV~FWK;nRN~oy16e6ck z4${wpD#y=d^+ix&?&~2airm*dkTeaaU~;PL3b-sP$;?Q4%j`d=d2n`oQSjSJ1S%eF z3QQ6e>ljs3$`oC2QNuxMNh&je)TU<^sBnLt2MV0h4lAXWDz8BXkDrGL52B>MMo_?H z{=_3ayOM_fkKm`PpnoQw0eC3~CqT)EN_owPz+^F+ET#pPN_@&G?d4QGdQ|)6?mUj- feh$F!$v^m6dE_MyESUF@ zp(814Lb`>9(2G+CwmJa$J%s{#tV>uAC@oyLP%*(&;H^U&w*fSThlj@wDLwp`x; z6%|OrIGIV&@GJvoh?ONk7(9#y%{xGck~LVSDp{$)Lv_#`0d~|_ zZLtKn?kvrqx9Q?2sCk1G_>ksL_JA!DCrt2o1fB<-R?=yQ$MZb@r~nTSfK6(W8F+%r zruU`aM<-Utfk<%*EDdQ^CdrNA6V&?s%jO8LbVz|;LLzCo=(8S3&Mtnf`n~QMQ?e;2 zp${d?b%Jx(klZwXu0hwBXqKix;Pn>nRSt#<6wKE(@P-rDax>rp{PBi)L!zKpV6HU` z%H)Ha_s%`W6aetohF+wLr~MAW%gUCJi%Y(QPf@fvSp{pZ zwah8&rQla64&ucyeUn6SmtFVJ7lfWg z#L@e>?AhfMz|+97DMML?Sj6)fj1WsHXtCCK*2E8hj*Jc<4rHY`RkJj1ef+VKg0&R0~OeSo78d*6cC?Lmg%*xB+<0&Itqrg3p5t z1aNud>ifN*Z&*}-<@!TCxEuynV66ue_ZX;K?T#rhxC)E_*8QizU4P=OCmRCP>A(X? ztKck?Sx405q~B-Wj$I|7z+i4*d2Yg6pg1ES-Yul?Eq-Be5I(mcFwo8oa|1Q4FNhr> zc$OD9w+wFiKKB)bLz#p|!b3Y``u=o)z3IXdOYXi?7n}Wt%dMumbd!R)m1;iv8gCbO`HIDr#T}eiQIT zw(v8IK~){l>k48;biE9G1dY_;`n-#XTbQX0- z6<1A$>e$l=xuSHTBh@V4PzzF06Sq<>)&C-XK>2KdN_P^dhE9T8Rp=CG)L#JAA1{Dp c_5TC>105abpquZ|tpET307*qoM6N<$g8OhkaR2}S literal 698 zcmV;r0!96aP)BjE6ae7YiY}qSlmCP95|bjdIOtF0S;QpOd0~a%hU?&G-^O zfFP)ug)VD1&9C1KhoxW9TtsDYAe<6J zbAq`zUc-POAxJ*=4#zi(+#8gV<3Zvk?z}$=;a)KGPZB$Ud5__~H;U$?1p&?6 zk3iFI1k-gD88;%*kEwyW0sW+(R%>W7basGt=@V3G zlhc-EQfQYvJ);WJK$}(WHYb+e%`;*HUggi8PZbaG%p9rr^pRaq3t0nez#rVz8R8jt z(xAd3PJiA7&*x-LxgxmZbWY|;>D0p;nnG)ueSX g_3wMIZtXwt2d=efAhGBrGXMYp07*qoM6N<$f@>r`L;wH) 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 zcmV;f0#W^mP)BjE6ae6tYAJ@|6q?zq@Zu5^yc|&r?GGsU^>C1@DTZ_k2_{Q}`~w1>;y|WQA#k*J zD@1NLCqZ2lErtyJ1EE6LgVoo&lkG^MPe?kx(|aeLI04GoLH8|!I8dD`pa_ryP9ZjN zL&1gwo6;4?z+-VNQxu^0SVh5(=Pu!m0y(iJ?@5#-N9pRxCZti4PQx5b@7vR(L<|4y!gZW#C zhYOgp;N*K?5RZdenZd)X%&z@e(9?K1*p_e=u$ba&in+n&K^=72${#Zp*8(;%UL0ib zMVn}T86rP1L6={Rrxw{$3T@=Tv_caRj9FNOtG`A;U|xeF#KF7>;)PgL59+sv*#v;b zHN5p-zc8~@AmS-@i4wU@@RM8ol-O-Of#|LX+)9ejw$mbr;u0dFJH%b0R<=#KB^Eu! zmYwcq(6))h_@gCML5oC)$+HNHu-jH3lSN8b{1Lt>kjbLxss$jHIwOj5{aA#rwjxyE zAsg8KI~5gBGtYXJ(MuWY6&Stx@E%GRl~s!W6h@1bUwK#;PbAr@HjKozDPXz$KPL^_ Uyd^)b-v9sr07*qoM6N<$f@?xNI{*Lx 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 zcmV+(0pb3J0;~d%7k?lE000009HBjl0002Eml0bQ)^3wGfs52-UaW0Wbnn}U0aYJ&5DGo}eSvKL7^tHbKi%Ok+Dd|x{g|6{lYrKDPkmXppm4_CR3^MmSYA1M&OsCt zcb6PP4XSrG!!eyzsoV-i%t|9Gf%cIzl26d^0*M6-B!<5$(9$P^lLln{^H6dOUi-tT xaRwXb`6y8Y;kPVc0hIi}<7eCBnzyXe`yXuFNf6R1LBRk3002ovPDHLkV1ijxaOD61 diff --git a/gfx/trade/arrow.png b/gfx/trade/arrow.png deleted file mode 100644 index b740048ec1983484e88a37986b139de2f7d29a65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^96&6<1SA+-0xLn3rl*TzNX4z>AHU{5%(gvzy`pXX v!vqojXaCZF$e;gUE_Y-vms|Y7JO4j2n5+<+y6=P6I*=|;S3j3^P6Sz4_Z{MJDfPdKorh17t8@c`*6xh(tv52FFLHZw~C&MEKhI8}cT$eOXoD4F{ M)78&qol`;+0D99VX#fBK literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QnsEhjv*Ddk`ovhpV^=JFZtvD z|NrL``nwYtP8t8PXHc>`&}pA=Xr2etnqEm424Ch`KN;E QpBTtMPgg&ebxsLQ0OsT+X8-^I diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 0efaf047d..1184a85ed 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -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