summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--engine/color.asm2
-rwxr-xr-xengine/mysterygift.asm4
-rw-r--r--gfx/mobile/mobile_adapter.png (renamed from gfx/misc/mobile_adapter.png)bin1633 -> 1633 bytes
-rw-r--r--gfx/mystery_gift/mystery_gift.png (renamed from gfx/misc/mystery_gift.png)bin747 -> 747 bytes
-rw-r--r--gfx/mystery_gift/mystery_gift_jp.png (renamed from gfx/misc/mystery_gift_jp.png)bin686 -> 686 bytes
-rw-r--r--gfx/sgb/gbc_only.2bpp.lz.4a5bba0e (renamed from gfx/misc/gbc_only.2bpp.lz.4a5bba0e)bin1350 -> 1350 bytes
-rw-r--r--gfx/sgb/gbc_only.png (renamed from gfx/misc/gbc_only.png)bin896 -> 896 bytes
-rw-r--r--gfx/sgb/sgb_border.png (renamed from gfx/misc/sgb_border.png)bin632 -> 632 bytes
-rw-r--r--gfx/unknown/unknown_egg.2bpp.lz.a5b6cbfa (renamed from gfx/misc/unknown_egg.2bpp.lz.a5b6cbfa)bin146 -> 146 bytes
-rw-r--r--gfx/unknown/unknown_egg.png (renamed from gfx/misc/unknown_egg.png)bin219 -> 219 bytes
-rw-r--r--main.asm2
-rw-r--r--misc/crystal_misc.asm2
-rw-r--r--misc/gbc_only.asm2
14 files changed, 7 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index be1ca99c7..6979e7ce9 100644
--- a/Makefile
+++ b/Makefile
@@ -197,11 +197,10 @@ gfx/trainer_card/kris_card.2bpp: rgbgfx += -h
gfx/battle/dude.2bpp: rgbgfx += -h
-gfx/misc/unknown_egg.2bpp: rgbgfx += -h
-
gfx/pokegear/pokegear.2bpp: rgbgfx += -x2
gfx/pokegear/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace
+gfx/unknown/unknown_egg.2bpp: rgbgfx += -h
gfx/unknown/0f8f34.1bpp: tools/gfx += --trim-whitespace
gfx/unknown/16c173.2bpp: tools/gfx += --remove-duplicates --remove-xflip
gfx/unknown/170d16.2bpp: tools/gfx += --trim-whitespace
diff --git a/engine/color.asm b/engine/color.asm
index 29b6656d5..add8c24ac 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -1859,7 +1859,7 @@ SGBBorderPalettes:
RGB 31, 31, 25
SGBBorder:
-INCBIN "gfx/misc/sgb_border.2bpp"
+INCBIN "gfx/sgb/sgb_border.2bpp"
Palettes_a8be:
RGB 30, 26, 15
diff --git a/engine/mysterygift.asm b/engine/mysterygift.asm
index ae40d0992..8204ab332 100755
--- a/engine/mysterygift.asm
+++ b/engine/mysterygift.asm
@@ -1411,7 +1411,7 @@ InitMysteryGiftLayout: ; 105153 (41:5153)
ret
MysteryGiftGFX: ; 105258
-INCBIN "gfx/misc/mystery_gift.2bpp"
+INCBIN "gfx/mystery_gift/mystery_gift.2bpp"
MysteryGiftGFXEnd:
Function105688: ; 105688 (41:5688)
@@ -1732,4 +1732,4 @@ Function1057d7: ; 1057d7 (41:57d7)
; japanese mystery gift gfx
MysteryGiftJP_GFX: ; 105930
-INCBIN "gfx/misc/mystery_gift_jp.2bpp"
+INCBIN "gfx/mystery_gift/mystery_gift_jp.2bpp"
diff --git a/gfx/misc/mobile_adapter.png b/gfx/mobile/mobile_adapter.png
index fa5965e92..fa5965e92 100644
--- a/gfx/misc/mobile_adapter.png
+++ b/gfx/mobile/mobile_adapter.png
Binary files differ
diff --git a/gfx/misc/mystery_gift.png b/gfx/mystery_gift/mystery_gift.png
index 0fd458dec..0fd458dec 100644
--- a/gfx/misc/mystery_gift.png
+++ b/gfx/mystery_gift/mystery_gift.png
Binary files differ
diff --git a/gfx/misc/mystery_gift_jp.png b/gfx/mystery_gift/mystery_gift_jp.png
index 692cf8732..692cf8732 100644
--- a/gfx/misc/mystery_gift_jp.png
+++ b/gfx/mystery_gift/mystery_gift_jp.png
Binary files differ
diff --git a/gfx/misc/gbc_only.2bpp.lz.4a5bba0e b/gfx/sgb/gbc_only.2bpp.lz.4a5bba0e
index 9533fbe6d..9533fbe6d 100644
--- a/gfx/misc/gbc_only.2bpp.lz.4a5bba0e
+++ b/gfx/sgb/gbc_only.2bpp.lz.4a5bba0e
Binary files differ
diff --git a/gfx/misc/gbc_only.png b/gfx/sgb/gbc_only.png
index 72bcf0131..72bcf0131 100644
--- a/gfx/misc/gbc_only.png
+++ b/gfx/sgb/gbc_only.png
Binary files differ
diff --git a/gfx/misc/sgb_border.png b/gfx/sgb/sgb_border.png
index 867c36b10..867c36b10 100644
--- a/gfx/misc/sgb_border.png
+++ b/gfx/sgb/sgb_border.png
Binary files differ
diff --git a/gfx/misc/unknown_egg.2bpp.lz.a5b6cbfa b/gfx/unknown/unknown_egg.2bpp.lz.a5b6cbfa
index d8de54c79..d8de54c79 100644
--- a/gfx/misc/unknown_egg.2bpp.lz.a5b6cbfa
+++ b/gfx/unknown/unknown_egg.2bpp.lz.a5b6cbfa
Binary files differ
diff --git a/gfx/misc/unknown_egg.png b/gfx/unknown/unknown_egg.png
index 0642c28cf..0642c28cf 100644
--- a/gfx/misc/unknown_egg.png
+++ b/gfx/unknown/unknown_egg.png
Binary files differ
diff --git a/main.asm b/main.asm
index c65cea3d4..d5354fe72 100644
--- a/main.asm
+++ b/main.asm
@@ -4611,7 +4611,7 @@ Unknown_53d84: ; unreferenced
UnknownEggPic:: ; 53d9c
; Another egg pic. This is shifted up a few pixels.
-INCBIN "gfx/misc/unknown_egg.2bpp.lz"
+INCBIN "gfx/unknown/unknown_egg.2bpp.lz"
SECTION "bank19", ROMX
diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm
index fb9637d4c..aa5c704fd 100644
--- a/misc/crystal_misc.asm
+++ b/misc/crystal_misc.asm
@@ -4,7 +4,7 @@ INCLUDE "includes.asm"
SECTION "Misc Crystal", ROMX
MobileAdapterGFX::
-INCBIN "gfx/misc/mobile_adapter.2bpp"
+INCBIN "gfx/mobile/mobile_adapter.2bpp"
Function17a68f:: ; 17a68f (5e:668f)
diff --git a/misc/gbc_only.asm b/misc/gbc_only.asm
index f4b3eba8b..a77a44d72 100644
--- a/misc/gbc_only.asm
+++ b/misc/gbc_only.asm
@@ -145,5 +145,5 @@ GBCOnlyString: ; 4eb38
GBCOnlyGFX: ; 4eb76
-INCBIN "gfx/misc/gbc_only.2bpp.lz"
+INCBIN "gfx/sgb/gbc_only.2bpp.lz"
; 4f0bc