diff options
author | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
---|---|---|
committer | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
commit | 99e4de062ae43aa978ad4f1a8cd70bc739c64c9d (patch) | |
tree | 1164d31577e6ebddc1cb313d40bb69ce0d426170 /data/scripts/seagallop.inc | |
parent | 339c2914affc3c62ac9a5725aa1a0c7ccc3161ca (diff) | |
parent | 6af8c04d8fa6aaeaeb6c8b919e7770a65b9a883d (diff) |
Merge branch 'master' into event_object_movement
Diffstat (limited to 'data/scripts/seagallop.inc')
-rw-r--r-- | data/scripts/seagallop.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/scripts/seagallop.inc b/data/scripts/seagallop.inc index c5489d7ee..51fd0c675 100644 --- a/data/scripts/seagallop.inc +++ b/data/scripts/seagallop.inc @@ -138,9 +138,9 @@ VermilionCity_Movement_WalkUp:: @ 81A911C EventScript_SeviiDestinationsPage1:: @ 81A911E setvar VAR_0x8005, 0 - special Special_DrawSeagallopDestinationMenu + special DrawSeagallopDestinationMenu waitstate - specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination + specialvar VAR_0x8006, GetSelectedSeagallopDestination switch VAR_0x8006 case SEAGALLOP_VERMILION_CITY, EventScript_SailToVermilionCity case SEAGALLOP_ONE_ISLAND, EventScript_SailToOneIsland @@ -153,9 +153,9 @@ EventScript_SeviiDestinationsPage1:: @ 81A911E EventScript_SeviiDestinationsPage2:: @ 81A917F setvar VAR_0x8005, 1 - special Special_DrawSeagallopDestinationMenu + special DrawSeagallopDestinationMenu waitstate - specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination + specialvar VAR_0x8006, GetSelectedSeagallopDestination switch VAR_0x8006 case SEAGALLOP_FOUR_ISLAND, EventScript_SailToFourIsland case SEAGALLOP_FIVE_ISLAND, EventScript_SailToFiveIsland |