summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rwxr-xr-xevent/field_moves.asm2
-rwxr-xr-xgfx/font.asm4
-rw-r--r--gfx/font/weekday_kanji.png (renamed from gfx/unknown/0f8ea4.png)bin142 -> 142 bytes
-rw-r--r--gfx/overworld/headbutt_tree.png (renamed from gfx/unknown/08c893.png)bin197 -> 197 bytes
-rw-r--r--gfx/trade/game_boy_n64.png (renamed from gfx/unknown/172f1f.png)bin787 -> 787 bytes
-rwxr-xr-xmisc/mobile_5c.asm6
7 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 063cdc27b..453ec0f12 100644
--- a/Makefile
+++ b/Makefile
@@ -142,6 +142,7 @@ gfx/title/old_fg.2bpp: tools/gfx += --interleave --width=64
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/170d16.2bpp: tools/gfx += --trim-whitespace
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: ;
diff --git a/event/field_moves.asm b/event/field_moves.asm
index 82660da2f..82bc6d3f8 100755
--- a/event/field_moves.asm
+++ b/event/field_moves.asm
@@ -75,7 +75,7 @@ ShakeHeadbuttTree: ; 8c80a
; 8c893
HeadbuttTreeGFX: ; 8c893
-INCBIN "gfx/unknown/08c893.2bpp"
+INCBIN "gfx/overworld/headbutt_tree.2bpp"
; 8c913
HideHeadbuttTree: ; 8c913
diff --git a/gfx/font.asm b/gfx/font.asm
index 30549b26f..76c87545b 100755
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -50,8 +50,8 @@ TownMapGFX: ; f8ba0
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
diff --git a/gfx/unknown/0f8ea4.png b/gfx/font/weekday_kanji.png
index 6eeb69b11..6eeb69b11 100644
--- a/gfx/unknown/0f8ea4.png
+++ b/gfx/font/weekday_kanji.png
Binary files differ
diff --git a/gfx/unknown/08c893.png b/gfx/overworld/headbutt_tree.png
index 4cbb595f7..4cbb595f7 100644
--- a/gfx/unknown/08c893.png
+++ b/gfx/overworld/headbutt_tree.png
Binary files differ
diff --git a/gfx/unknown/172f1f.png b/gfx/trade/game_boy_n64.png
index 0e324906d..0e324906d 100644
--- a/gfx/unknown/172f1f.png
+++ b/gfx/trade/game_boy_n64.png
Binary files differ
diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm
index 34bdb15ad..d181de745 100755
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -858,7 +858,7 @@ Function172e78: ; 172e78 (5c:6e78)
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 @@ Palette_172edf:
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)