ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-10 07:13:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

define number of map objects

Browse Source
This commit is contained in:
DizzyEggg 2017-09-13 12:17:48 +02:00
parent 1ecd0a7838
commit a08cd8e5a7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/global.h
View File

@ -649,6 +649,7 @@ struct DaycareData
u8 stepCounter; u8 stepCounter;
}; };
#define MAP_OBJECTS_NUMBER 16
#define BERRY_TREES_NUMBER 128 #define BERRY_TREES_NUMBER 128
#define FLAGS_NUMBER 300 #define FLAGS_NUMBER 300
#define VARS_NUMBER 256 #define VARS_NUMBER 256
@ -684,7 +685,7 @@ struct SaveBlock1
/*0x9C2*/ u8 field_9C2[6]; /*0x9C2*/ u8 field_9C2[6];
/*0x9C8*/ u16 trainerRematchStepCounter; /*0x9C8*/ u16 trainerRematchStepCounter;
/*0x9CA*/ u8 trainerRematches[100]; /*0x9CA*/ u8 trainerRematches[100];
/*0xA30*/ struct MapObject mapObjects[16]; /*0xA30*/ struct MapObject mapObjects[MAP_OBJECTS_NUMBER];
/*0xC70*/ struct MapObjectTemplate mapObjectTemplates[64]; /*0xC70*/ struct MapObjectTemplate mapObjectTemplates[64];
/*0x1270*/ u8 flags[FLAGS_NUMBER]; /*0x1270*/ u8 flags[FLAGS_NUMBER];
/*0x139C*/ u16 vars[VARS_NUMBER]; /*0x139C*/ u16 vars[VARS_NUMBER];

2
src/berry.c
View File

@ -1241,7 +1241,7 @@ void ResetBerryTreeSparkleFlags(void)
top = cam_top + 3; top = cam_top + 3;
right = cam_left + 14; right = cam_left + 14;
bottom = top + 8; 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) if (gMapObjects[i].active && gMapObjects[i].animPattern == 12)
{ {