From 5bbc876c44c660cff14f4c5fd200faf618b4b0af Mon Sep 17 00:00:00 2001
From: Estellar <137097857+estellarc@users.noreply.github.com>
Date: Sun, 22 Mar 2026 10:49:38 -0300
Subject: [PATCH] sSpriteImages_Emoticons now uses overworld_frame (#700)

---
 src/trainer_see.c | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/trainer_see.c b/src/trainer_see.c
index 399d3e8a0..a71113bb2 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -578,26 +578,27 @@ static const struct OamData sOamData_Emoticons = {
     .affineParam = 0,
 };
 
-static const struct SpriteFrameImage sSpriteImages_Emoticons[] = {
-    {sGfx_Emoticons + 0x000, 0x80},
-    {sGfx_Emoticons + 0x040, 0x80},
-    {sGfx_Emoticons + 0x080, 0x80},
+static const struct SpriteFrameImage sSpriteImages_Emoticons[] =
+{
+    overworld_frame(sGfx_Emoticons, 2, 2, 0),
+    overworld_frame(sGfx_Emoticons, 2, 2, 1),
+    overworld_frame(sGfx_Emoticons, 2, 2, 2),
 
-    {sGfx_Emoticons + 0x180, 0x80},
-    {sGfx_Emoticons + 0x1C0, 0x80},
-    {sGfx_Emoticons + 0x200, 0x80},
+    overworld_frame(sGfx_Emoticons, 2, 2, 6),
+    overworld_frame(sGfx_Emoticons, 2, 2, 7),
+    overworld_frame(sGfx_Emoticons, 2, 2, 8),
 
-    {sGfx_Emoticons + 0x0C0, 0x80},
-    {sGfx_Emoticons + 0x100, 0x80},
-    {sGfx_Emoticons + 0x140, 0x80},
+    overworld_frame(sGfx_Emoticons, 2, 2, 3),
+    overworld_frame(sGfx_Emoticons, 2, 2, 4),
+    overworld_frame(sGfx_Emoticons, 2, 2, 5),
 
-    {sGfx_Emoticons + 0x240, 0x80},
-    {sGfx_Emoticons + 0x280, 0x80},
-    {sGfx_Emoticons + 0x2C0, 0x80},
+    overworld_frame(sGfx_Emoticons, 2, 2,  9),
+    overworld_frame(sGfx_Emoticons, 2, 2, 10),
+    overworld_frame(sGfx_Emoticons, 2, 2, 11),
 
-    {sGfx_Emoticons + 0x300, 0x80},
-    {sGfx_Emoticons + 0x340, 0x80},
-    {sGfx_Emoticons + 0x380, 0x80},
+    overworld_frame(sGfx_Emoticons, 2, 2, 12),
+    overworld_frame(sGfx_Emoticons, 2, 2, 13),
+    overworld_frame(sGfx_Emoticons, 2, 2, 14),
 };
 
 static const union AnimCmd sAnimCmd_ExclamationMark1[] = {