diff options
| author | huderlem <huderlem@gmail.com> | 2019-10-31 21:36:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 21:36:56 -0500 |
| commit | 6eaac9ea9d221e37d801064c73ce61dc3467b643 (patch) | |
| tree | c724683997ab8ab5729e02c0232bdd3d171dd120 /data/scripts | |
| parent | 218fcd99b395777e99b3b6b9478a3d97c7a7fc87 (diff) | |
| parent | 27169f634b27a8985945e8b592f3f4ce0a38c53e (diff) | |
Merge pull request #863 from GriffinRichards/doc-partymenu
Document party menu
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/cable_club.inc | 4 | ||||
| -rw-r--r-- | data/scripts/move_tutors.inc | 2 | ||||
| -rw-r--r-- | data/scripts/new_game.inc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 6962d17f8..ccda6afce 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -911,7 +911,7 @@ EventScript_DoLinkRoomExit:: @ 8277513 CableClub_EventScript_UnionRoomAttendant:: @ 827751B lock faceplayer - setvar VAR_FRONTIER_FACILITY, 8 + setvar VAR_FRONTIER_FACILITY, FACILITY_UNION_ROOM goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, IsBadEggInParty compare VAR_RESULT, TRUE @@ -1019,7 +1019,7 @@ CableClub_EventScript_DontAskAboutLinking:: @ 827769A CableClub_EventScript_DirectCornerAttendant:: @ 82776A4 lock faceplayer - setvar VAR_FRONTIER_FACILITY, 9 + setvar VAR_FRONTIER_FACILITY, FACILITY_MULTI_OR_EREADER @ Set preemptively for multi battles, ignored otherwise goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, IsBadEggInParty compare VAR_RESULT, TRUE diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index b6ba75e0d..0d4244023 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -289,7 +289,7 @@ MoveTutor_EventScript_ExplosionTaught:: @ 82C831C end MoveTutor_EventScript_OpenPartyMenu:: @ 82C8326 - special OpenPartyMenuForMoveTutor + special ChooseMonForMoveTutor waitstate lock faceplayer diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index e30dad1cc..4357199c4 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -204,7 +204,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN - setflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO + setflag FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M setflag FLAG_HIDE_ROUTE_128_STEVEN setflag FLAG_HIDE_ROUTE_128_ARCHIE |