diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-13 15:13:30 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-13 15:13:30 -0500 |
| commit | 3b2eaeedbc4c658389c7fceb93e6bbd07e8a6283 (patch) | |
| tree | e9a403e858cf8d93cfee9eb80b5d8c79cc4e4159 /include/global.h | |
| parent | cafbffd5b82836d779ec446e2362a9885fd18c4a (diff) | |
| parent | b4f4d2c0f03462dcdf3492aad27890294600eb2e (diff) | |
Merge branch 'master' into modern_gcc
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 b9df3adff..0ddc2d7bb 100644 --- a/include/global.h +++ b/include/global.h @@ -120,7 +120,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 @@ -699,8 +699,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]; |