Merge branch 'master' of github.com:pret/pokecrystal

6 files changed, 15 insertions, 14 deletions

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
diff --git a/misc/gfx_41.asm b/misc/gfx_41.asm
index 8f128a7bd..f627c85ff 100755
--- a/misc/gfx_41.asm
+++ b/misc/gfx_41.asm
@@ -632,7 +632,7 @@ HeartEmote:     INCBIN "gfx/emotes/heart.2bpp"
 BoltEmote:      INCBIN "gfx/emotes/bolt.2bpp"
 SleepEmote:     INCBIN "gfx/emotes/sleep.2bpp"
 FishEmote:      INCBIN "gfx/emotes/fish.2bpp"
-JumpShadowGFX:  INCBIN "gfx/ow_fx/shadow.2bpp"
-FishingRodGFX:  INCBIN "gfx/ow_fx/fishing_rod.2bpp"
-BoulderDustGFX: INCBIN "gfx/ow_fx/boulder_dust.2bpp"
-GrassRustleGFX: INCBIN "gfx/ow_fx/grass_rustle.2bpp"
+JumpShadowGFX:  INCBIN "gfx/overworld/shadow.2bpp"
+FishingRodGFX:  INCBIN "gfx/overworld/fishing_rod.2bpp"
+BoulderDustGFX: INCBIN "gfx/overworld/boulder_dust.2bpp"
+GrassRustleGFX: INCBIN "gfx/overworld/grass_rustle.2bpp"
diff --git a/misc/mobile_12.asm b/misc/mobile_12.asm
index ea1e25bb8..efe138162 100755
--- a/misc/mobile_12.asm
+++ b/misc/mobile_12.asm
@@ -1021,10 +1021,10 @@ Function488b9: ; 488b9 (12:48b9)
 ; 488c3 (12:48c3)
 
 GFX_488c3: ; 488c3
-INCBIN "gfx/unknown/0488c3.2bpp"
+INCBIN "gfx/unknown/up_arrow.2bpp"
 
 GFX_488cb: ; 488cb
-INCBIN "gfx/unknown/0488cb.2bpp"
+INCBIN "gfx/unknown/down_arrow.2bpp"
 
 Function488d3: ; 488d3 (12:48d3)
 	call Function48283
diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm
index d317f2af3..679f04342 100755
--- a/misc/mobile_5b.asm
+++ b/misc/mobile_5b.asm
@@ -221,13 +221,13 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
 ; 16c173
 
 .Tiles:
-INCBIN "gfx/unknown/16c173.2bpp"
+INCBIN "gfx/unknown/mobile_splash.2bpp"
 
 .TileMap:
-INCBIN "gfx/unknown/16c633.tilemap"
+INCBIN "gfx/unknown/mobile_splash.tilemap"
 
 .AttrMap:
-INCBIN "gfx/unknown/16c79b.tilemap"
+INCBIN "gfx/unknown/mobile_splash.attrmap"
 
 UnknownMobilePalettes_16c903: ; 16c903
 INCLUDE "gfx/unknown/16c903.pal"
diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm
index 2f1f1555c..5b7418a0f 100755
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -305,10 +305,10 @@ Function170d02: ; 170d02
 ; 170d16
 
 LZ_170d16:
-INCBIN "gfx/unknown/170d16.2bpp.lz"
+INCBIN "gfx/unknown/pichu_animated.2bpp.lz"
 
 LZ_1715a4:
-INCBIN "gfx/unknown/1715a4.2bpp.lz"
+INCBIN "gfx/unknown/egg_animated.2bpp.lz"
 
 GFX_171848:
 INCBIN "gfx/unknown/171848.2bpp"
@@ -817,8 +817,9 @@ Palette_171d71:
 	RGB 21, 21, 20
 	RGB 11, 11, 10
 	RGB  0,  0,  0
+
 GFX_171db1:
-INCBIN "gfx/unknown/171db1.2bpp"
+INCBIN "gfx/unknown/ascii_font.2bpp"
 Tilemap_172491:
 INCBIN "gfx/unknown/172491.tilemap"
 Tilemap_17251d: