diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-03 16:45:53 -0700 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-03 16:45:53 -0700 |
| commit | 4df728666e55b47480467fbea86f48dadcb81c97 (patch) | |
| tree | 6a8413c90ec9d68c54389e1a54f6de9f12bb686c /src/field/event_data.c | |
| parent | 9b2ebe671fe77298d0b1adcb5d87cbb2bd01cd3e (diff) | |
| parent | 397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'src/field/event_data.c')
| -rw-r--r-- | src/field/event_data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field/event_data.c b/src/field/event_data.c index 86045df15..9d6d2372b 100644 --- a/src/field/event_data.c +++ b/src/field/event_data.c @@ -112,10 +112,10 @@ bool32 CanResetRTC(void) u16 *GetVarPointer(u16 id) { - if (id < 0x4000) + if (id < VARS_START) return NULL; if (id < 0x8000) - return &gSaveBlock1.vars[id - 0x4000]; + return &gSaveBlock1.vars[id - VARS_START]; return gSpecialVars[id - 0x8000]; } |