summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/fame_checker.inc4
-rw-r--r--data/scripts/seagallop.inc163
2 files changed, 84 insertions, 83 deletions
diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc
index 8bf111541..6fe5607dd 100644
--- a/data/scripts/fame_checker.inc
+++ b/data/scripts/fame_checker.inc
@@ -84,11 +84,11 @@ CeruleanCity_PokemonCenter_1F_EventScript_PokemonJournalMisty:: @ 81ACE68
release
end
-VermilionCity_PokemonCenter_1F_EventScript_1ACE83:: @ 81ACE83
+VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge:: @ 81ACE83
lockall
famechecker FAMECHECKER_LTSURGE, 5
textcolor 3
- msgbox gUnknown_81B1558
+ msgbox PokemonJournal_Text_SpecialFeatureLtSurge
releaseall
end
diff --git a/data/scripts/seagallop.inc b/data/scripts/seagallop.inc
index 77ed21b7a..c5489d7ee 100644
--- a/data/scripts/seagallop.inc
+++ b/data/scripts/seagallop.inc
@@ -1,205 +1,206 @@
-EventScript_1A8EC5:: @ 81A8EC5
+@ Separate selection menus for before the Rainbow Pass is obtained
+EventScript_ChooseDestFromOneIsland:: @ 81A8EC5
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
- goto_if_ge EventScript_1A911E
+ goto_if_ge EventScript_SeviiDestinationsPage1
compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4
- goto_if_ge EventScript_1A8F12
+ goto_if_ge EventScript_ChooseDestFromOneIslandVermilionAllowed
multichoice 19, 6, MULTICHOICE_ISLAND_23, FALSE
switch VAR_RESULT
- case 0, EventScript_1A8FF9
- case 1, EventScript_1A9004
+ case 0, EventScript_SailToTwoIsland2
+ case 1, EventScript_SailToThreeIsland2
case 2, EventScript_CancelSail
case SCR_MENU_CANCEL, EventScript_CancelSail
end
-EventScript_1A8F12:: @ 81A8F12
+EventScript_ChooseDestFromOneIslandVermilionAllowed:: @ 81A8F12
multichoice 19, 5, MULTICHOICE_SEAGALLOP_V23, FALSE
switch VAR_RESULT
- case 0, EventScript_1A8FE3
- case 1, EventScript_1A8FF9
- case 2, EventScript_1A9004
+ case 0, EventScript_SailToVermilion2
+ case 1, EventScript_SailToTwoIsland2
+ case 2, EventScript_SailToThreeIsland2
case 3, EventScript_CancelSail
case SCR_MENU_CANCEL, EventScript_CancelSail
end
-EventScript_1A8F54:: @ 81A8F54
+EventScript_ChooseDestFromTwoIsland:: @ 81A8F54
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
- goto_if_ge EventScript_1A911E
+ goto_if_ge EventScript_SeviiDestinationsPage1
compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4
- goto_if_ge EventScript_1A8FA1
+ goto_if_ge EventScript_ChooseDestFromTwoIslandVermilionAllowed
multichoice 19, 6, MULTICHOICE_ISLAND_13, FALSE
switch VAR_RESULT
- case 0, EventScript_1A8FEE
- case 1, EventScript_1A9004
+ case 0, EventScript_SailToOneIsland2
+ case 1, EventScript_SailToThreeIsland2
case 2, EventScript_CancelSail
case SCR_MENU_CANCEL, EventScript_CancelSail
end
-EventScript_1A8FA1:: @ 81A8FA1
+EventScript_ChooseDestFromTwoIslandVermilionAllowed:: @ 81A8FA1
multichoice 19, 5, MULTICHOICE_SEAGALLOP_V13, FALSE
switch VAR_RESULT
- case 0, EventScript_1A8FE3
- case 1, EventScript_1A8FEE
- case 2, EventScript_1A9004
+ case 0, EventScript_SailToVermilion2
+ case 1, EventScript_SailToOneIsland2
+ case 2, EventScript_SailToThreeIsland2
case 3, EventScript_CancelSail
case SCR_MENU_CANCEL, EventScript_CancelSail
end
-EventScript_1A8FE3:: @ 81A8FE3
+EventScript_SailToVermilion2:: @ 81A8FE3
setvar VAR_0x8006, SEAGALLOP_VERMILION_CITY
- goto EventScript_1A909E
+ goto EventScript_SailToDest
end
-EventScript_1A8FEE:: @ 81A8FEE
+EventScript_SailToOneIsland2:: @ 81A8FEE
setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND
- goto EventScript_1A909E
+ goto EventScript_SailToDest
end
-EventScript_1A8FF9:: @ 81A8FF9
+EventScript_SailToTwoIsland2:: @ 81A8FF9
setvar VAR_0x8006, SEAGALLOP_TWO_ISLAND
- goto EventScript_1A909E
+ goto EventScript_SailToDest
end
-EventScript_1A9004:: @ 81A9004
+EventScript_SailToThreeIsland2:: @ 81A9004
setvar VAR_0x8006, SEAGALLOP_THREE_ISLAND
- goto EventScript_1A909E
+ goto EventScript_SailToDest
end
-EventScript_1A900F:: @ 81A900F
+EventScript_ChooseDestFromIsland:: @ 81A900F
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
- goto_if_ge EventScript_1A911E
+ goto_if_ge EventScript_SeviiDestinationsPage1
compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4
- goto_if_ge EventScript_1A905C
+ goto_if_ge EventScript_ChooseDestFromIslandVermilionAllowed
multichoice 19, 6, MULTICHOICE_ISLAND_12, FALSE
switch VAR_RESULT
- case 0, EventScript_1A8FEE
- case 1, EventScript_1A8FF9
+ case 0, EventScript_SailToOneIsland2
+ case 1, EventScript_SailToTwoIsland2
case 2, EventScript_CancelSail
case SCR_MENU_CANCEL, EventScript_CancelSail
end
-EventScript_1A905C:: @ 81A905C
+EventScript_ChooseDestFromIslandVermilionAllowed:: @ 81A905C
multichoice 19, 5, MULTICHOICE_SEAGALLOP_V12, FALSE
switch VAR_RESULT
- case 0, EventScript_1A8FE3
- case 1, EventScript_1A8FEE
- case 2, EventScript_1A8FF9
+ case 0, EventScript_SailToVermilion2
+ case 1, EventScript_SailToOneIsland2
+ case 2, EventScript_SailToTwoIsland2
case 3, EventScript_CancelSail
case SCR_MENU_CANCEL, EventScript_CancelSail
end
-EventScript_1A909E:: @ 81A909E
- specialvar VAR_RESULT, sub_8147500
+EventScript_SailToDest:: @ 81A909E
+ specialvar VAR_RESULT, GetSeagallopNumber
getnumberstring 0, VAR_RESULT
compare VAR_0x8004, SEAGALLOP_VERMILION_CITY
- goto_if_eq EventScript_1A90BE
+ goto_if_eq EventScript_DepartingVermilion
compare VAR_0x8004, SEAGALLOP_VERMILION_CITY
- goto_if_ne EventScript_1A90CC
+ goto_if_ne EventScript_DepartingNotVermilion
end
-EventScript_1A90BE:: @ 81A90BE
- msgbox Text_17FB67
- goto EventScript_1A90DA
+EventScript_DepartingVermilion:: @ 81A90BE
+ msgbox VermilionCity_Text_Seagallop7Departing
+ goto EventScript_SetSail
end
-EventScript_1A90CC:: @ 81A90CC
- msgbox Text_1A641B
- goto EventScript_1A90DA
+EventScript_DepartingNotVermilion:: @ 81A90CC
+ msgbox Text_AllAboardSeagallopNum
+ goto EventScript_SetSail
end
-EventScript_1A90DA:: @ 81A90DA
+EventScript_SetSail:: @ 81A90DA
closemessage
delay 20
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
fadescreen FADE_TO_BLACK
- special ScrSpecial_SeagallopFerry
+ special DoSeagallopFerryScene
waitstate
end
EventScript_CancelSail:: @ 81A90F6
- specialvar VAR_RESULT, sub_8147594
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1A9108
+ specialvar VAR_RESULT, IsPlayerLeftOfVermilionSailor
+ compare VAR_RESULT, TRUE
+ goto_if_eq VermilionCity_EventScript_WalkUpPier
release
end
-EventScript_1A9108:: @ 81A9108
+VermilionCity_EventScript_WalkUpPier:: @ 81A9108
closemessage
- applymovement 6, Movement_FaceOriginalDirection
- applymovement OBJ_EVENT_ID_PLAYER, Movement_1A911C
+ applymovement LOCALID_FERRY_SAILOR, Movement_FaceOriginalDirection
+ applymovement OBJ_EVENT_ID_PLAYER, VermilionCity_Movement_WalkUp
waitmovement 0
releaseall
end
-Movement_1A911C:: @ 81A911C
+VermilionCity_Movement_WalkUp:: @ 81A911C
walk_up
step_end
-EventScript_1A911E:: @ 81A911E
+EventScript_SeviiDestinationsPage1:: @ 81A911E
setvar VAR_0x8005, 0
special Special_DrawSeagallopDestinationMenu
waitstate
specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination
switch VAR_0x8006
case SEAGALLOP_VERMILION_CITY, EventScript_SailToVermilionCity
- case SEAGALLOP_ONE_ISLAND, EventScript_1A91E0
- case SEAGALLOP_TWO_ISLAND, EventScript_1A91EB
- case SEAGALLOP_THREE_ISLAND, EventScript_1A91F6
- case SEAGALLOP_FOUR_ISLAND, EventScript_1A9201
- case SEAGALLOP_MORE, EventScript_1A917F
+ case SEAGALLOP_ONE_ISLAND, EventScript_SailToOneIsland
+ case SEAGALLOP_TWO_ISLAND, EventScript_SailToTwoIsland
+ case SEAGALLOP_THREE_ISLAND, EventScript_SailToThreeIsland
+ case SEAGALLOP_FOUR_ISLAND, EventScript_SailToFourIsland
+ case SEAGALLOP_MORE, EventScript_SeviiDestinationsPage2
case SCR_MENU_CANCEL, EventScript_CancelSail
end
-EventScript_1A917F:: @ 81A917F
+EventScript_SeviiDestinationsPage2:: @ 81A917F
setvar VAR_0x8005, 1
special Special_DrawSeagallopDestinationMenu
waitstate
specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination
switch VAR_0x8006
- case SEAGALLOP_FOUR_ISLAND, EventScript_1A9201
- case SEAGALLOP_FIVE_ISLAND, EventScript_1A920C
- case SEAGALLOP_SIX_ISLAND, EventScript_1A9217
- case SEAGALLOP_SEVEN_ISLAND, EventScript_1A9222
- case SEAGALLOP_MORE, EventScript_1A911E
+ case SEAGALLOP_FOUR_ISLAND, EventScript_SailToFourIsland
+ case SEAGALLOP_FIVE_ISLAND, EventScript_SailToFiveIsland
+ case SEAGALLOP_SIX_ISLAND, EventScript_SailToSixIsland
+ case SEAGALLOP_SEVEN_ISLAND, EventScript_SailToSevenIsland
+ case SEAGALLOP_MORE, EventScript_SeviiDestinationsPage1
case SCR_MENU_CANCEL, EventScript_CancelSail
end
EventScript_SailToVermilionCity:: @ 81A91D5
setvar VAR_0x8006, SEAGALLOP_VERMILION_CITY
- goto EventScript_1A909E
+ goto EventScript_SailToDest
end
-EventScript_1A91E0:: @ 81A91E0
+EventScript_SailToOneIsland:: @ 81A91E0
setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND
- goto EventScript_1A909E
+ goto EventScript_SailToDest
end
-EventScript_1A91EB:: @ 81A91EB
+EventScript_SailToTwoIsland:: @ 81A91EB
setvar VAR_0x8006, SEAGALLOP_TWO_ISLAND
- goto EventScript_1A909E
+ goto EventScript_SailToDest
end
-EventScript_1A91F6:: @ 81A91F6
+EventScript_SailToThreeIsland:: @ 81A91F6
setvar VAR_0x8006, SEAGALLOP_THREE_ISLAND
- goto EventScript_1A909E
+ goto EventScript_SailToDest
end
-EventScript_1A9201:: @ 81A9201
+EventScript_SailToFourIsland:: @ 81A9201
setvar VAR_0x8006, SEAGALLOP_FOUR_ISLAND
- goto EventScript_1A909E
+ goto EventScript_SailToDest
end
-EventScript_1A920C:: @ 81A920C
+EventScript_SailToFiveIsland:: @ 81A920C
setvar VAR_0x8006, SEAGALLOP_FIVE_ISLAND
- goto EventScript_1A909E
+ goto EventScript_SailToDest
end
-EventScript_1A9217:: @ 81A9217
+EventScript_SailToSixIsland:: @ 81A9217
setvar VAR_0x8006, SEAGALLOP_SIX_ISLAND
- goto EventScript_1A909E
+ goto EventScript_SailToDest
end
-EventScript_1A9222:: @ 81A9222
+EventScript_SailToSevenIsland:: @ 81A9222
setvar VAR_0x8006, SEAGALLOP_SEVEN_ISLAND
- goto EventScript_1A909E
+ goto EventScript_SailToDest
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 19:58:16 +0000