Fix emote bubbles to always appear above actors

chrismaltby · May 17, 2019 · 1d22af9 · 1d22af9
1 parent db22f65
commit 1d22af9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/appData/src/gb/include/Scene.h b/appData/src/gb/include/Scene.h
@@ -12,9 +12,10 @@
 #define ACTOR_HALF_WIDTH 8
 #define ACTOR_MOVE_ENABLED 0x80
 #define ACTOR_NOCLIP 0x40
+#define ACTOR_SPRITE_OFFSET 2
 
-#define BUBBLE_SPRITE_LEFT 38
-#define BUBBLE_SPRITE_RIGHT 39
+#define BUBBLE_SPRITE_LEFT 0
+#define BUBBLE_SPRITE_RIGHT 1
 #define BUBBLE_ANIMATION_FRAMES 15
 #define BUBBLE_TOTAL_FRAMES 60
 

diff --git a/appData/src/gb/src/Scene_b.c b/appData/src/gb/src/Scene_b.c
@@ -843,7 +843,7 @@ void SceneRenderActors_b()
 
     for (i = 0; i != scene_num_actors; ++i)
     {
-      s = MUL_2(i);
+      s = MUL_2(i) + ACTOR_SPRITE_OFFSET;
       x = MUL_4(ACTOR_SPRITE(ptr) + ACTOR_FRAME(ptr) + ACTOR_FRAME_OFFSET(ptr));
       if (ACTOR_FLIP(ptr))
       {
@@ -865,7 +865,7 @@ void SceneRenderActors_b()
 
   for (i = 0; i != scene_num_actors; ++i)
   {
-    s = MUL_2(i);
+    s = MUL_2(i) + ACTOR_SPRITE_OFFSET;
     x = ACTOR_X(ptr) - SCX_REG;
     y = ACTOR_Y(ptr) - SCY_REG;
 
@@ -887,7 +887,7 @@ void SceneRenderActor_b(UBYTE i)
 {
   UBYTE s, flip, frame, fo;
 
-  s = MUL_2(i);
+  s = MUL_2(i) + ACTOR_SPRITE_OFFSET;
   fo = 0;
 
   flip = actors[i].flip;