diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-07 16:10:35 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-07 16:10:35 -0400 |
commit | a2655ba9ab82646a54f60abc6078df372179f8d4 (patch) | |
tree | 95b074a1a4d77d6cd77e413e1d6e72eb55b595b0 /include/constants/vars.h | |
parent | e86d3410a1719fcbf62754bfda93a295aa7e0d57 (diff) | |
parent | 001a25e49cd6acdac89a62f4230aef80422e78f2 (diff) |
Merge branch 'master' into doc-union
Diffstat (limited to 'include/constants/vars.h')
-rw-r--r-- | include/constants/vars.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/constants/vars.h b/include/constants/vars.h index d3d1aba87..2cbe3e9b8 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -149,7 +149,7 @@ #define VAR_LITTLEROOT_HOUSES_STATE_MAY 0x4082 #define VAR_UNUSED_0x4083 0x4083 // Unused Var #define VAR_BIRCH_LAB_STATE 0x4084 -#define VAR_PETALBURG_GYM_STATE 0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman +#define VAR_PETALBURG_GYM_STATE 0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman #define VAR_CONTEST_HALL_STATE 0x4086 #define VAR_CABLE_CLUB_STATE 0x4087 #define VAR_CONTEST_TYPE 0x4088 |