PLAYER_IN_MAP_CHUNK macro for Map_WorldObjectsUpdate (#394)

Author: pseregiet

include/maps/map1/map1_s06.h

@@ -1,7 +1,7 @@
 #ifndef _MAPS_MAP1_S06_H
 #define _MAPS_MAP1_S06_H
 
-extern s8 D_800D7761;
+extern u8 D_800D7761;
 
 extern s16 D_800DAF78;
 
@@ -15,7 +15,7 @@ extern s_WorldObjectDesc D_800DB024;
 
 extern s_WorldObjectDesc D_800DB064;
 
-extern s8 D_800DAFE4;
+extern u8 D_800DAFE4;
 
 void func_800D63B0(void);
 

include/maps/shared.h

@@ -2831,4 +2831,17 @@ static inline void WorldObjectPositionSet(s_WorldObjectPos* eventPos, q19_12 pos
     eventPos->rotation_C.vz         = rotZ;
 }
 
+#define MAP_CHUNK_CHECK_VARIABLE_DECL() s32 __chunkIdx
+/** @hack This macro requires a variable `s32 __chunkIdx` to be declared before using it.
+ * Macro `MAP_CHUNK_CHECK_VARIABLE_DECL` declares that variable, call it before calling this macro!
+ * First argument is `vx` or `vz` which is used as the component name in `VECTOR3`.
+ * Some maps appear to have a bug, where the negative position check will never be true, because they check
+ * if the chunk index will be some positive number. Seems like they forgot to do an ABS ?
+ */
+#define PLAYER_IN_MAP_CHUNK(crd, x1, x2, x3, x4) \
+    (__chunkIdx = g_SysWork.player_4C.chara_0.position_18.crd / FP_METER(40.0f), \
+     ((g_SysWork.player_4C.chara_0.position_18.crd > 0 && (__chunkIdx + x1) == x2) ||\
+       (g_SysWork.player_4C.chara_0.position_18.crd <= 0 && (__chunkIdx + x3) == x4)))
+
+
 #endif

src/maps/map0_s01/map0_s01_events.c

@@ -969,8 +969,7 @@ void Map_WorldObjectsInit() // 0x800DC9C8
 
 void Map_WorldObjectsUpdate(void) // 0x800DCCF4
 {
-    s32  stepX;
-    s32  stepZ;
+    MAP_CHUNK_CHECK_VARIABLE_DECL();
     s32  temp_a1;
     s32  var_a2;
     s32* ptr;
@@ -1086,33 +1085,19 @@ void Map_WorldObjectsUpdate(void) // 0x800DCCF4
         Savegame_EventFlagSet(EventFlag_52);
     }
 
-    stepX = g_SysWork.player_4C.chara_0.position_18.vx / FP_METER(40.0f);
-    if ((g_SysWork.player_4C.chara_0.position_18.vx > FP_METER(0.0f) && stepX == 0) ||
-        (g_SysWork.player_4C.chara_0.position_18.vx <= FP_METER(0.0f) && (stepX - 1) == 1))
+    if (PLAYER_IN_MAP_CHUNK(vx, 0, 0, -1, 1) && PLAYER_IN_MAP_CHUNK(vz, 1, 7, -1, 7))
     {
-        stepZ = g_SysWork.player_4C.chara_0.position_18.vz / FP_METER(40.0f);
-        if ((g_SysWork.player_4C.chara_0.position_18.vz > FP_METER(0.0f) && (stepZ + 1) == 7) ||
-            (g_SysWork.player_4C.chara_0.position_18.vz <= FP_METER(0.0f) && (stepZ - 1) == 7))
+        if (!Savegame_EventFlagGet(EventFlag_M0S01_HealthDrink0))
         {
-            if (!Savegame_EventFlagGet(EventFlag_M0S01_HealthDrink0))
-            {
-                g_WorldGfx_ObjectAdd(&g_CommonWorldObjects[1], &D_800DE12C.position_0, &D_800DE12C.rotation_C);
-            }
+            g_WorldGfx_ObjectAdd(&g_CommonWorldObjects[1], &D_800DE12C.position_0, &D_800DE12C.rotation_C);
         }
     }
 
-    stepX = g_SysWork.player_4C.chara_0.position_18.vx / FP_METER(40.0f);
-    if ((g_SysWork.player_4C.chara_0.position_18.vx > FP_METER(0.0f) && stepX == 0) ||
-        (g_SysWork.player_4C.chara_0.position_18.vx <= FP_METER(0.0f) && (stepX - 1) == 1))
+    if (PLAYER_IN_MAP_CHUNK(vx, 0, 0, -1, 1) && PLAYER_IN_MAP_CHUNK(vz, 1, 7, -1, 7))
     {
-        stepZ = g_SysWork.player_4C.chara_0.position_18.vz / FP_METER(40.0f);
-        if ((g_SysWork.player_4C.chara_0.position_18.vz > FP_METER(0.0f) && (stepZ + 1) == 7) ||
-            (g_SysWork.player_4C.chara_0.position_18.vz <= FP_METER(0.0f) && (stepZ - 1) == 7))
+        if (!Savegame_EventFlagGet(EventFlag_M0S01_HealthDrink1))
         {
-            if (!Savegame_EventFlagGet(EventFlag_M0S01_HealthDrink1))
-            {
-                g_WorldGfx_ObjectAdd(&g_CommonWorldObjects[1], &D_800DE140.position_0, &D_800DE140.rotation_C);
-            }
+            g_WorldGfx_ObjectAdd(&g_CommonWorldObjects[1], &D_800DE140.position_0, &D_800DE140.rotation_C);
         }
     }
 }