From a08cd8e5a718ad4383a5b66b48e44a50a99dc6bf Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 13 Sep 2017 12:17:48 +0200
Subject: [PATCH] define number of map objects

---
 include/global.h | 3 ++-
 src/berry.c      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/global.h b/include/global.h
index 5340a97904..c5fa7fef3f 100644
--- a/include/global.h
+++ b/include/global.h
@@ -649,6 +649,7 @@ struct DaycareData
     u8 stepCounter;
 };
 
+#define MAP_OBJECTS_NUMBER  16
 #define BERRY_TREES_NUMBER  128
 #define FLAGS_NUMBER        300
 #define VARS_NUMBER         256
@@ -684,7 +685,7 @@ struct SaveBlock1
     /*0x9C2*/ u8 field_9C2[6];
     /*0x9C8*/ u16 trainerRematchStepCounter;
     /*0x9CA*/ u8 trainerRematches[100];
-    /*0xA30*/ struct MapObject mapObjects[16];
+    /*0xA30*/ struct MapObject mapObjects[MAP_OBJECTS_NUMBER];
     /*0xC70*/ struct MapObjectTemplate mapObjectTemplates[64];
     /*0x1270*/ u8 flags[FLAGS_NUMBER];
     /*0x139C*/ u16 vars[VARS_NUMBER];
diff --git a/src/berry.c b/src/berry.c
index ffd30d47f8..17dd5eaf11 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -1241,7 +1241,7 @@ void ResetBerryTreeSparkleFlags(void)
     top = cam_top + 3;
     right = cam_left + 14;
     bottom = top + 8;
-    for (i = 0; i < (u8)ARRAY_COUNT(gSaveBlock1Ptr->mapObjects); i++)
+    for (i = 0; i < MAP_OBJECTS_NUMBER; i++)
     {
         if (gMapObjects[i].active && gMapObjects[i].animPattern == 12)
         {