ref: 1de1bdbce73672dfa9cc3ddfce528dcb07ec253b
parent: 7c6932fbae357f0e514516a8f3468783efa93c65
parent: 7cd4ca1207f50244306ae6c640dcff7e7a2e93aa
author: yenatch <yenatch@gmail.com>
date: Sun Sep 17 13:07:22 EDT 2017
Merge pull request #388 from surskitty/master Moving a few images out of gfx/unknown
--- a/Makefile
+++ b/Makefile
@@ -142,6 +142,7 @@
gfx/title/logo.2bpp: rgbgfx += -x 4
gfx/trade/ball.2bpp: tools/gfx += --remove-whitespace
+gfx/trade/game_boy_n64.2bpp: tools/gfx += --trim-whitespace
gfx/slots_2.2bpp: tools/gfx += --interleave --width=16
gfx/slots_3.2bpp: tools/gfx += --interleave --width=24 --remove-duplicates --keep-whitespace --remove-xflip
@@ -184,7 +185,6 @@
gfx/unknown/1715a4.2bpp: tools/gfx += --trim-whitespace
gfx/unknown/1715a4_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip
gfx/unknown/171db1.2bpp: tools/gfx += --trim-whitespace
-gfx/unknown/172f1f.2bpp: tools/gfx += --trim-whitespace
%.bin: ;
--- a/event/field_moves.asm
+++ b/event/field_moves.asm
@@ -75,7 +75,7 @@
; 8c893
HeadbuttTreeGFX: ; 8c893
-INCBIN "gfx/unknown/08c893.2bpp"
+INCBIN "gfx/overworld/headbutt_tree.2bpp"
; 8c913
HideHeadbuttTree: ; 8c913
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -50,8 +50,8 @@
INCBIN "gfx/misc/town_map.2bpp.lz"
; f8ea4
-GFX_f8ea4: ; unused kanji
-INCBIN "gfx/unknown/0f8ea4.2bpp"
+WeekdayKanjiGFX: ; unused kanji
+INCBIN "gfx/font/weekday_kanji.2bpp"
; f8f24
OverworldPhoneIconGFX: ; f8f24
binary files /dev/null b/gfx/font/weekday_kanji.png differ
binary files /dev/null b/gfx/overworld/headbutt_tree.png differ
binary files /dev/null b/gfx/trade/game_boy_n64.png differ
binary files a/gfx/unknown/08c893.png /dev/null differ
binary files a/gfx/unknown/0f8ea4.png /dev/null differ
binary files a/gfx/unknown/172f1f.png /dev/null differ
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -858,7 +858,7 @@
ld bc, $168
call ByteFill
call DisableLCD
- ld hl, GFX_172f1f
+ ld hl, GameBoyN64GFX
ld de, VTiles2 tile $00
ld bc, $610
call CopyBytes
@@ -929,8 +929,8 @@
RGB 0, 0, 0
RGB 0, 0, 0
-GFX_172f1f:
-INCBIN "gfx/unknown/172f1f.2bpp"
+GameBoyN64GFX:
+INCBIN "gfx/trade/game_boy_n64.2bpp"
Tilemap_1733af:
IF DEF(CRYSTAL11)