diff options
| author | huderlem <huderlem@gmail.com> | 2019-11-09 08:48:49 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-09 08:48:49 -0600 |
| commit | ed76620d28eed16dc66e50a71fc0046ffd18a737 (patch) | |
| tree | 971154225dfa16e09df740f5b1d26abfb071d03b /include/constants/vars.h | |
| parent | ae1767fe462ac1085d033e8b377a0f4f4ae86089 (diff) | |
| parent | 2b944fd7213baa0d54003e0b876c4e3e5df4dfbd (diff) | |
Merge pull request #880 from GriffinRichards/doc-trickhouse
Document Trick House scripts
Diffstat (limited to 'include/constants/vars.h')
| -rw-r--r-- | include/constants/vars.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/constants/vars.h b/include/constants/vars.h index 2e3ec758e..099c9ac9f 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -179,9 +179,9 @@ #define VAR_SEAFLOOR_CAVERN_STATE 0x40A2 #define VAR_CABLE_CAR_STATION_STATE 0x40A3 #define VAR_SAFARI_ZONE_STATE 0x40A4 // 0: In or out of SZ, 1: Player exiting SZ, 2: Player entering SZ -#define VAR_TRICK_HOUSE_ENTRANCE_STATE_1 0x40A5 -#define VAR_TRICK_HOUSE_ENTRANCE_STATE_2 0x40A6 -#define VAR_TRICK_HOUSE_ENTRANCE_STATE_3 0x40A7 +#define VAR_TRICK_HOUSE_BEING_WATCHED_STATE 0x40A5 +#define VAR_TRICK_HOUSE_FOUND_TRICK_MASTER 0x40A6 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE 0x40A7 #define VAR_UNUSED_0x40A8 0x40A8 // Unused Var #define VAR_CYCLING_CHALLENGE_STATE 0x40A9 #define VAR_SLATEPORT_MUSEUM_1F_STATE 0x40AA @@ -195,8 +195,8 @@ #define VAR_TRICK_HOUSE_PUZZLE_8_STATE 0x40B2 #define VAR_WEATHER_INSTITUTE_STATE 0x40B3 #define VAR_PORTHOLE_STATE 0x40B4 -#define VAR_TRICK_HOUSE_STATE 0x40B5 // TODO: needs some further investigation -#define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2 0x40B6 +#define VAR_TRICK_HOUSE_ENTER_FROM_CORRIDOR 0x40B5 +#define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2 0x40B6 // Leftover from RS, never set #define VAR_SLATEPORT_FAN_CLUB_STATE 0x40B7 #define VAR_UNUSED_0x40B8 0x40B8 // Unused Var #define VAR_MT_PYRE_STATE 0x40B9 |