From d5089d3c623e2b147b035cf12569810d604bf47d Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sat, 27 Jun 2020 16:27:30 -0400
Subject: Organize gfx/

---
 engine/overworld/emotion_bubbles.asm | 10 ++++++----
 engine/overworld/healing_machine.asm |  2 +-
 engine/overworld/ledges.asm          |  2 +-
 engine/overworld/ssanne.asm          |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'engine/overworld')

diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm
index ac4276bd..20309fc1 100755
--- a/engine/overworld/emotion_bubbles.asm
+++ b/engine/overworld/emotion_bubbles.asm
@@ -62,13 +62,15 @@ EmotionBubble:
 	jp UpdateSprites
 
 EmotionBubblesPointerTable:
-	dw EmotionBubbles
-	dw EmotionBubbles + $40
-	dw EmotionBubbles + $80
+	dw ShockEmote
+	dw QuestionEmote
+	dw HappyEmote
 
 EmotionBubblesOAM:
 	db $F8,$00,$F9,$00
 	db $FA,$00,$FB,$00
 
 EmotionBubbles:
-	INCBIN "gfx/emotion_bubbles.2bpp"
+ShockEmote:    INCBIN "gfx/emotes/shock.2bpp"
+QuestionEmote: INCBIN "gfx/emotes/question.2bpp"
+HappyEmote:    INCBIN "gfx/emotes/happy.2bpp"
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm
index 73b3fa1f..510f963b 100755
--- a/engine/overworld/healing_machine.asm
+++ b/engine/overworld/healing_machine.asm
@@ -63,7 +63,7 @@ AnimateHealingMachine:
 	jp UpdateSprites
 
 PokeCenterFlashingMonitorAndHealBall:
-	INCBIN "gfx/pokecenter_ball.2bpp"
+	INCBIN "gfx/overworld/heal_machine.2bpp"
 
 PokeCenterOAMData:
 	db $24,$34,$7C,$10 ; heal machine monitor
diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm
index b0ec703a..290c8c80 100755
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
@@ -68,7 +68,7 @@ LoadHoppingShadowOAM:
 	ret
 
 LedgeHoppingShadow:
-	INCBIN "gfx/ledge_hopping_shadow.1bpp"
+	INCBIN "gfx/overworld/shadow.1bpp"
 LedgeHoppingShadowEnd:
 
 LedgeHoppingShadowOAM:
diff --git a/engine/overworld/ssanne.asm b/engine/overworld/ssanne.asm
index c226a5c5..6c26b712 100755
--- a/engine/overworld/ssanne.asm
+++ b/engine/overworld/ssanne.asm
@@ -89,5 +89,5 @@ LoadSmokeTile:
 	jp CopyVideoData
 
 SSAnneSmokePuffTile:
-	INCBIN "gfx/ss_anne_smoke_puff.2bpp"
+	INCBIN "gfx/overworld/smoke.2bpp"
 SSAnneSmokePuffTileEnd:
-- 
cgit v1.3.1-sl0p