diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-15 11:47:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-15 11:47:27 -0500 |
| commit | db8a5c6c2be2ceedadf836a8e61c71eb0ff6407b (patch) | |
| tree | 8b0323bd93c5600c8391d73232242b75135f0401 /include/global.h | |
| parent | 82f55f238125ff42845881189eb9237692c48ba4 (diff) | |
| parent | fee36224eda1acc4329646caf0e65a891928afc0 (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/global.h b/include/global.h index aab601879..bc73b82fa 100644 --- a/include/global.h +++ b/include/global.h @@ -923,7 +923,7 @@ struct SaveBlock1 /*0x9BC*/ u16 berryBlenderRecords[3]; /*0x9C2*/ u8 field_9C2[6]; /*0x9C8*/ u16 trainerRematchStepCounter; - /*0x9CA*/ u8 trainerRematches[100]; + /*0x9CA*/ u8 trainerRematches[MAX_REMATCH_ENTRIES]; /*0xA30*/ struct ObjectEvent objectEvents[OBJECT_EVENTS_COUNT]; /*0xC70*/ struct ObjectEventTemplate objectEventTemplates[OBJECT_EVENT_TEMPLATES_COUNT]; /*0x1270*/ u8 flags[FLAGS_COUNT]; |