diff options
author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-02-15 17:04:55 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-15 17:04:55 -0600 |
commit | cfec30413c36f3a571d80162796c11a030f42767 (patch) | |
tree | 4a6cb4912d0ecd13efa6c0c887d850853763d875 /include/constants | |
parent | fcf3f97da94515a34eda2dc1b564f4bc01adc383 (diff) | |
parent | 824699f505d373b1cc1247347b9c69d6ef1ce8ca (diff) |
Merge pull request #209 from DizzyEggg/decompile_overworld
Decompile overworld
Diffstat (limited to 'include/constants')
-rw-r--r-- | include/constants/game_stat.h | 5 | ||||
-rw-r--r-- | include/constants/vars.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/constants/game_stat.h b/include/constants/game_stat.h index b1f3d4197..7ebf3501b 100644 --- a/include/constants/game_stat.h +++ b/include/constants/game_stat.h @@ -51,9 +51,10 @@ #define GAME_STAT_USED_DAYCARE 47 #define GAME_STAT_RODE_CABLE_CAR 48 #define GAME_STAT_ENTERED_HOT_SPRINGS 49 +#define GAME_STAT_50 50 +#define GAME_STAT_51 51 -/*TODO: add new stats added in Emerald*/ - +#define NUM_USED_GAME_STATS 52 #define NUM_GAME_STATS 64 #endif // GUARD_CONSTANTS_GAME_STAT_H diff --git a/include/constants/vars.h b/include/constants/vars.h index c0e3313b6..be21f1730 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -184,7 +184,7 @@ #define VAR_0x40B0 0x40B0 #define VAR_0x40B1 0x40B1 #define VAR_0x40B2 0x40B2 -#define VAR_0x40B3 0x40B3 +#define VAR_WEATHER_INSTITUTE_STATE 0x40B3 #define VAR_PORTHOLE 0x40B4 #define VAR_0x40B5 0x40B5 #define VAR_0x40B6 0x40B6 |