diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-12 22:04:49 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-12 22:04:49 +0200 |
| commit | f1daf7442dfd25d12daacd7f59b4c42129d48c09 (patch) | |
| tree | 55004ef87c5a271777daf1d1d29f347d08d054f5 /src | |
| parent | 577e6e7c1f73222e47c24cb58505f139de2518c2 (diff) | |
event data review changes
Diffstat (limited to 'src')
| -rw-r--r-- | src/event_data.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/event_data.c b/src/event_data.c index e42f5d514..2cbe50f13 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -25,7 +25,7 @@ EWRAM_DATA u16 gSpecialVar_MonBoxPos = 0; EWRAM_DATA u16 gSpecialVar_0x8014 = 0; EWRAM_DATA static u8 gUnknown_020375FC[16] = {0}; -extern u16 * const gSpecialVars[]; +extern u16 *const gSpecialVars[]; extern void sub_80BB358(void); @@ -166,10 +166,10 @@ u16 *GetVarPointer(u16 id) { if (id < VARS_START) return NULL; - else if (id < VAR_0x8000) + else if (id < SPECIAL_VARS_START) return &gSaveBlock1Ptr->vars[id - VARS_START]; else - return gSpecialVars[id - VAR_0x8000]; + return gSpecialVars[id - SPECIAL_VARS_START]; } u16 VarGet(u16 id) @@ -198,10 +198,10 @@ u8 *GetFlagPointer(u16 id) { if (id == 0) return NULL; - else if (id < FLAG_SPECIAL_FLAG_0x4000) + else if (id < SPECIAL_FLAGS_START) return &gSaveBlock1Ptr->flags[id / 8]; else - return &gUnknown_020375FC[(id - FLAG_SPECIAL_FLAG_0x4000) / 8]; + return &gUnknown_020375FC[(id - SPECIAL_FLAGS_START) / 8]; } u8 FlagSet(u16 id) |