diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-21 01:15:34 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2020-02-12 18:35:27 -0600 |
| commit | 98ca62cf91e7e0bd33f09edfc848a62061015aee (patch) | |
| tree | 6902d9b2183b6f0a379bf141ed3f88b1e2a36598 /include/global.h | |
| parent | 6356dc03c1736df6ba25f2bc999e211d8e30a9f0 (diff) | |
Standardize Event Object to Object Event
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/global.h b/include/global.h index ba9e20813..5e71bd821 100644 --- a/include/global.h +++ b/include/global.h @@ -119,7 +119,7 @@ enum LanguageId #define DAYCARE_MON_COUNT 2 #define POKEBLOCKS_COUNT 40 #define PARTY_SIZE 6 -#define EVENT_OBJECTS_COUNT 16 +#define OBJECT_EVENTS_COUNT 16 #define BERRY_TREES_COUNT 128 #define FLAGS_COUNT 288 #define VARS_COUNT 256 @@ -698,8 +698,8 @@ struct SaveBlock1 /* 0x02025734 */ /*0x972*/ u8 filler_972[0x6]; /*0x978*/ u16 trainerRematchStepCounter; /*0x97A*/ u8 trainerRematches[100]; - /*0x9E0*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT]; - /*0xC20*/ struct EventObjectTemplate eventObjectTemplates[64]; + /*0x9E0*/ struct ObjectEvent objectEvents[OBJECT_EVENTS_COUNT]; + /*0xC20*/ struct ObjectEventTemplate objectEventTemplates[64]; /*0x1220*/ u8 flags[FLAGS_COUNT]; /*0x1340*/ u16 vars[VARS_COUNT]; /*0x1540*/ u32 gameStats[NUM_GAME_STATS]; |