summaryrefslogtreecommitdiff
path: root/include/global.h
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-06-11 19:11:48 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-06-11 19:11:48 -0500
commitaa9a45c16fbaee2fffc94e4741e0a1f203b244bc (patch)
tree9bdd507453e9b51ff52216d9f04bda62ac799cfb /include/global.h
parented245b677addbb7f5c748193301507de7fed6ec4 (diff)
Rebrand 'map object' and 'field object' to 'event object'
Diffstat (limited to 'include/global.h')
-rw-r--r--include/global.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/global.h b/include/global.h
index 4a0fdb70a..d26184270 100644
--- a/include/global.h
+++ b/include/global.h
@@ -101,7 +101,7 @@ enum LanguageId
// capacities of various saveblock objects
#define DAYCARE_MON_COUNT 2
#define POKEBLOCKS_COUNT 40
-#define MAP_OBJECTS_COUNT 16
+#define EVENT_OBJECTS_COUNT 16
#define BERRY_TREES_COUNT 128
#define FLAGS_COUNT 300
#define VARS_COUNT 256
@@ -796,8 +796,8 @@ struct SaveBlock1
/*0x9C2*/ u8 field_9C2[6];
/*0x9C8*/ u16 trainerRematchStepCounter;
/*0x9CA*/ u8 trainerRematches[100];
- /*0xA30*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT];
- /*0xC70*/ struct MapObjectTemplate mapObjectTemplates[64];
+ /*0xA30*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT];
+ /*0xC70*/ struct EventObjectTemplate eventObjectTemplates[64];
/*0x1270*/ u8 flags[FLAGS_COUNT];
/*0x139C*/ u16 vars[VARS_COUNT];
/*0x159C*/ u32 gameStats[NUM_GAME_STATS];