diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 05:43:06 -0500 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 05:43:06 -0500 |
commit | ef67f2d33b45348d76d722f250cdbcc8485be264 (patch) | |
tree | 2fb5d08a962dea3329bcd876ea2d237cf8c6d3c1 /include/global.h | |
parent | 68cdd7b1cb5a293b3de42185fe17d85b4067b3ad (diff) |
Merge master into ObjEvent rename and prune accidental inclusions
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 bc73b82fa..e721a93ba 100644 --- a/include/global.h +++ b/include/global.h @@ -331,7 +331,7 @@ struct BattleFrontier /*0xCA8*/ u8 challengeStatus; /*0xCA9*/ u8 lvlMode:2; /*0xCA9*/ u8 challengePaused:1; - /*0xCA9*/ u8 field_CA9_b:1; + /*0xCA9*/ u8 disableRecordBattle:1; /*0xCA9*/ u8 unused_CA9_c:1; /*0xCA9*/ u8 unused_CA9_d:1; /*0xCA9*/ u8 unused_CA9_e:1; |