diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | engine/link/mystery_gift.asm | 29 | ||||
| -rw-r--r-- | engine/menus/debug.asm | 69 | ||||
| -rw-r--r-- | engine/movie/trade_animation.asm | 21 | ||||
| -rw-r--r-- | engine/pokedex/pokedex_3.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/mail_2.asm | 130 | ||||
| -rw-r--r-- | gfx/card_flip/card_flip_1.png | bin | 494 -> 476 bytes | |||
| -rw-r--r-- | gfx/debug/color_test.png | bin | 215 -> 200 bytes | |||
| -rw-r--r-- | gfx/debug/up_arrow.png | bin | 0 -> 81 bytes | |||
| -rw-r--r-- | gfx/frames/1.png | bin | 123 -> 122 bytes | |||
| -rw-r--r-- | gfx/frames/2.png | bin | 126 -> 122 bytes | |||
| -rw-r--r-- | gfx/frames/3.png | bin | 114 -> 112 bytes | |||
| -rw-r--r-- | gfx/frames/4.png | bin | 128 -> 126 bytes | |||
| -rw-r--r-- | gfx/frames/5.png | bin | 108 -> 109 bytes | |||
| -rw-r--r-- | gfx/frames/6.png | bin | 117 -> 114 bytes | |||
| -rw-r--r-- | gfx/frames/7.png | bin | 118 -> 119 bytes | |||
| -rw-r--r-- | gfx/frames/8.png | bin | 109 -> 110 bytes | |||
| -rw-r--r-- | gfx/frames/9.png | bin | 111 -> 113 bytes | |||
| -rw-r--r-- | gfx/frames/map_entry_sign.png | bin | 190 -> 169 bytes | |||
| -rw-r--r-- | gfx/mobile/havewant.png | bin | 957 -> 968 bytes | |||
| -rw-r--r-- | gfx/mystery_gift/card_sprite.png | bin | 0 -> 133 bytes | |||
| -rw-r--r-- | gfx/mystery_gift/card_trade.png | bin | 0 -> 620 bytes | |||
| -rw-r--r-- | gfx/mystery_gift/mystery_gift.png | bin | 698 -> 694 bytes | |||
| -rw-r--r-- | gfx/mystery_gift/mystery_gift_jp.png | bin | 686 -> 0 bytes | |||
| -rw-r--r-- | gfx/pokedex/pokedex_sgb.2bpp.lz.82bc0a7b (renamed from gfx/pokedex/sgb.2bpp.lz.82bc0a7b) | bin | 420 -> 420 bytes | |||
| -rw-r--r-- | gfx/pokedex/pokedex_sgb.png (renamed from gfx/pokedex/sgb.png) | bin | 429 -> 429 bytes | |||
| -rw-r--r-- | gfx/sprites/big_onix.png | bin | 262 -> 300 bytes | |||
| -rw-r--r-- | gfx/trade/arrow.png | bin | 98 -> 0 bytes | |||
| -rw-r--r-- | gfx/trade/arrow_left.png | bin | 0 -> 83 bytes | |||
| -rw-r--r-- | gfx/trade/arrow_right.png | bin | 0 -> 83 bytes | |||
| -rw-r--r-- | gfx/unown_puzzle/tile_borders.png | bin | 118 -> 113 bytes | |||
| -rw-r--r-- | mobile/mobile_5f.asm | 2 |
32 files changed, 133 insertions, 125 deletions
@@ -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 "いいえ<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 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 Binary files differindex ab3c6594f..d3bfef22a 100644 --- a/gfx/card_flip/card_flip_1.png +++ b/gfx/card_flip/card_flip_1.png diff --git a/gfx/debug/color_test.png b/gfx/debug/color_test.png Binary files differindex 1c3ee326b..e33be9654 100644 --- a/gfx/debug/color_test.png +++ b/gfx/debug/color_test.png diff --git a/gfx/debug/up_arrow.png b/gfx/debug/up_arrow.png Binary files differnew file mode 100644 index 000000000..6c623d2a1 --- /dev/null +++ b/gfx/debug/up_arrow.png diff --git a/gfx/frames/1.png b/gfx/frames/1.png Binary files differindex fee7de870..0de4d8fae 100644 --- a/gfx/frames/1.png +++ b/gfx/frames/1.png diff --git a/gfx/frames/2.png b/gfx/frames/2.png Binary files differindex 0ed5ebbed..3ccbb4bf6 100644 --- a/gfx/frames/2.png +++ b/gfx/frames/2.png diff --git a/gfx/frames/3.png b/gfx/frames/3.png Binary files differindex c3489ca0d..b10947cb7 100644 --- a/gfx/frames/3.png +++ b/gfx/frames/3.png diff --git a/gfx/frames/4.png b/gfx/frames/4.png Binary files differindex c2908c75b..1bf1300f0 100644 --- a/gfx/frames/4.png +++ b/gfx/frames/4.png diff --git a/gfx/frames/5.png b/gfx/frames/5.png Binary files differindex f44542aaf..be4a509d1 100644 --- a/gfx/frames/5.png +++ b/gfx/frames/5.png diff --git a/gfx/frames/6.png b/gfx/frames/6.png Binary files differindex 3ae386746..e606ad673 100644 --- a/gfx/frames/6.png +++ b/gfx/frames/6.png diff --git a/gfx/frames/7.png b/gfx/frames/7.png Binary files differindex 54bdbbecc..7338f1213 100644 --- a/gfx/frames/7.png +++ b/gfx/frames/7.png diff --git a/gfx/frames/8.png b/gfx/frames/8.png Binary files differindex 2eab82999..aa102e680 100644 --- a/gfx/frames/8.png +++ b/gfx/frames/8.png diff --git a/gfx/frames/9.png b/gfx/frames/9.png Binary files differindex a23257365..00de7b6e0 100644 --- a/gfx/frames/9.png +++ b/gfx/frames/9.png diff --git a/gfx/frames/map_entry_sign.png b/gfx/frames/map_entry_sign.png Binary files differindex 921013720..b9b2ebb59 100644 --- a/gfx/frames/map_entry_sign.png +++ b/gfx/frames/map_entry_sign.png diff --git a/gfx/mobile/havewant.png b/gfx/mobile/havewant.png Binary files differindex 7aa0a0544..63f7dafb1 100644 --- a/gfx/mobile/havewant.png +++ b/gfx/mobile/havewant.png diff --git a/gfx/mystery_gift/card_sprite.png b/gfx/mystery_gift/card_sprite.png Binary files differnew file mode 100644 index 000000000..dd5381424 --- /dev/null +++ b/gfx/mystery_gift/card_sprite.png diff --git a/gfx/mystery_gift/card_trade.png b/gfx/mystery_gift/card_trade.png Binary files differnew file mode 100644 index 000000000..a84915b31 --- /dev/null +++ b/gfx/mystery_gift/card_trade.png diff --git a/gfx/mystery_gift/mystery_gift.png b/gfx/mystery_gift/mystery_gift.png Binary files differindex 83908847a..61d499c36 100644 --- a/gfx/mystery_gift/mystery_gift.png +++ b/gfx/mystery_gift/mystery_gift.png diff --git a/gfx/mystery_gift/mystery_gift_jp.png b/gfx/mystery_gift/mystery_gift_jp.png Binary files differdeleted file mode 100644 index 692cf8732..000000000 --- a/gfx/mystery_gift/mystery_gift_jp.png +++ /dev/null diff --git a/gfx/pokedex/sgb.2bpp.lz.82bc0a7b b/gfx/pokedex/pokedex_sgb.2bpp.lz.82bc0a7b Binary files differindex 6ec9c46b2..6ec9c46b2 100644 --- a/gfx/pokedex/sgb.2bpp.lz.82bc0a7b +++ b/gfx/pokedex/pokedex_sgb.2bpp.lz.82bc0a7b diff --git a/gfx/pokedex/sgb.png b/gfx/pokedex/pokedex_sgb.png Binary files differindex bbacb114d..bbacb114d 100644 --- a/gfx/pokedex/sgb.png +++ b/gfx/pokedex/pokedex_sgb.png diff --git a/gfx/sprites/big_onix.png b/gfx/sprites/big_onix.png Binary files differindex 7996be17e..6002767c2 100644 --- a/gfx/sprites/big_onix.png +++ b/gfx/sprites/big_onix.png diff --git a/gfx/trade/arrow.png b/gfx/trade/arrow.png Binary files differdeleted file mode 100644 index b740048ec..000000000 --- a/gfx/trade/arrow.png +++ /dev/null diff --git a/gfx/trade/arrow_left.png b/gfx/trade/arrow_left.png Binary files differnew file mode 100644 index 000000000..71520e903 --- /dev/null +++ b/gfx/trade/arrow_left.png diff --git a/gfx/trade/arrow_right.png b/gfx/trade/arrow_right.png Binary files differnew file mode 100644 index 000000000..eefc41d6d --- /dev/null +++ b/gfx/trade/arrow_right.png diff --git a/gfx/unown_puzzle/tile_borders.png b/gfx/unown_puzzle/tile_borders.png Binary files differindex 8706905f7..c075d5681 100644 --- a/gfx/unown_puzzle/tile_borders.png +++ b/gfx/unown_puzzle/tile_borders.png 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 |
