diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/field_specials.h | 13 | ||||
| -rw-r--r-- | include/constants/vars.h | 2 | ||||
| -rw-r--r-- | include/event_scripts.h | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/include/constants/field_specials.h b/include/constants/field_specials.h index cbc5e96a3..81c173f75 100644 --- a/include/constants/field_specials.h +++ b/include/constants/field_specials.h @@ -13,6 +13,19 @@ #define SS_TIDAL_LOCATION_ROUTE124 3 #define SS_TIDAL_LOCATION_ROUTE131 4 +#define SS_TIDAL_BOARD_SLATEPORT 1 +#define SS_TIDAL_DEPART_SLATEPORT 2 +#define SS_TIDAL_HALFWAY_LILYCOVE 3 +#define SS_TIDAL_LAND_LILYCOVE 4 +#define SS_TIDAL_BOARD_LILYCOVE 5 +#define SS_TIDAL_DEPART_LILYCOVE 6 +#define SS_TIDAL_HALFWAY_SLATEPORT 7 +#define SS_TIDAL_LAND_SLATEPORT 8 +#define SS_TIDAL_EXIT_CURRENTS_RIGHT 9 +#define SS_TIDAL_EXIT_CURRENTS_LEFT 10 + +#define SS_TIDAL_MAX_STEPS 205 + // Scrollable Multichoice Menus #define SCROLL_MULTI_NONE 0 #define SCROLL_MULTI_GLASS_WORKSHOP_VENDOR 1 diff --git a/include/constants/vars.h b/include/constants/vars.h index ce395ad82..c2865a37a 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -194,7 +194,7 @@ #define VAR_TRICK_HOUSE_PUZZLE_7_STATE 0x40B1 #define VAR_TRICK_HOUSE_PUZZLE_8_STATE 0x40B2 #define VAR_WEATHER_INSTITUTE_STATE 0x40B3 -#define VAR_PORTHOLE_STATE 0x40B4 +#define VAR_SS_TIDAL_STATE 0x40B4 #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 diff --git a/include/event_scripts.h b/include/event_scripts.h index 4c369c2d4..432e702c1 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -557,7 +557,7 @@ extern const u8 Route119_EventScript_ScottWonAtFortreeGymCall[]; extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall[]; extern const u8 RustboroCity_Gym_EventScript_RegisterRoxanne[]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall[]; -extern const u8 SSTidalCorridor_EventScript_23C050[]; +extern const u8 SSTidalCorridor_EventScript_ReachedStepCount[]; extern const u8 EventScript_FallDownHoleMtPyre[]; // Secret Base |