diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-03 16:22:45 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-03 16:22:45 +0100 |
| commit | 56f960f67679071712dd7d2cd6140eb8833e7344 (patch) | |
| tree | 18f9af70a8a591117a7f0a7845d86462537f777c /src/field/event_data.c | |
| parent | b5ecdfa404a34c66fdf9f96342a2de0f173e6e73 (diff) | |
| parent | 397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff) | |
Merge remote-tracking branch 'upstream/master'
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]; } |