diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-06 17:57:45 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-11-06 19:41:19 -0500 |
| commit | 25d026aded10c9a9567d214e46bf41ff4153eb46 (patch) | |
| tree | 3725f968abf9c7f2f7a6c2062c9867209faa9c76 /include/constants | |
| parent | 481c09fcad0db1bacadea534a3cc6cc291e8dfbd (diff) | |
Document Trick House scripts
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/flags.h | 10 | ||||
| -rw-r--r-- | include/constants/vars.h | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index 368f4f287..1d10e2249 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -207,11 +207,11 @@ #define FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F 0xBF #define FLAG_RECEIVED_SUN_STONE_MOSSDEEP 0xC0 #define FLAG_WALLY_SPEECH 0xC1 -#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 0xC2 -#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 0xC3 -#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 0xC4 -#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 0xC5 -#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 0xC6 +#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 0xC2 // Leftover from the RS version of Puzzle Room 7, functionally unused +#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 0xC3 // +#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 0xC4 // +#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 0xC5 // +#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 0xC6 // #define FLAG_RUSTURF_TUNNEL_OPENED 0xC7 #define FLAG_RECEIVED_RED_SCARF 0xC8 #define FLAG_RECEIVED_BLUE_SCARF 0xC9 diff --git a/include/constants/vars.h b/include/constants/vars.h index 64ff6622b..3e476935e 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 |