summaryrefslogtreecommitdiff
path: root/data/maps/MossdeepCity/scripts.inc
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2020-01-13 20:26:20 -0600
committerMarcus Huderle <huderlem@gmail.com>2020-01-13 20:26:20 -0600
commit5a2d676e71b720e752ca8a624a5795b3b1d7eb6c (patch)
tree6ef755064008dfae8ce2942dc2762670cdabe815 /data/maps/MossdeepCity/scripts.inc
parent5007d279fea5326b41b877703c74fcaa56223364 (diff)
parent22931846d680de2bc585093678db3f5721aab891 (diff)
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
Diffstat (limited to 'data/maps/MossdeepCity/scripts.inc')
-rw-r--r--data/maps/MossdeepCity/scripts.inc192
1 files changed, 96 insertions, 96 deletions
diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc
index 646b1d908..945a92dfb 100644
--- a/data/maps/MossdeepCity/scripts.inc
+++ b/data/maps/MossdeepCity/scripts.inc
@@ -7,86 +7,86 @@ MossdeepCity_OnTransition: @ 81E4A9C
clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
- call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+ call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
end
-MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2
+MossdeepCity_EventScript_PokefanF:: @ 81E4AB2
lock
faceplayer
- goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_1E4AC7
- msgbox MossdeepCity_Text_1E4E90, MSGBOX_DEFAULT
+ goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_PokefanFMagmaGone
+ msgbox MossdeepCity_Text_SpaceCenterReceivedLetter, MSGBOX_DEFAULT
release
end
-MossdeepCity_EventScript_1E4AC7:: @ 81E4AC7
- msgbox MossdeepCity_Text_1E4F15, MSGBOX_DEFAULT
+MossdeepCity_EventScript_PokefanFMagmaGone:: @ 81E4AC7
+ msgbox MossdeepCity_Text_SpaceCenterLaunchingRockets, MSGBOX_DEFAULT
release
end
-MossdeepCity_EventScript_1E4AD1:: @ 81E4AD1
+MossdeepCity_EventScript_Sailor:: @ 81E4AD1
lock
faceplayer
- goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_1E4AE6
- msgbox MossdeepCity_Text_1E4F50, MSGBOX_DEFAULT
+ goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_SailorMagmaGone
+ msgbox MossdeepCity_Text_MossdeepTargetedByMagma, MSGBOX_DEFAULT
release
end
-MossdeepCity_EventScript_1E4AE6:: @ 81E4AE6
- msgbox MossdeepCity_Text_1E5051, MSGBOX_DEFAULT
+MossdeepCity_EventScript_SailorMagmaGone:: @ 81E4AE6
+ msgbox MossdeepCity_Text_FeelReliefOnLand, MSGBOX_DEFAULT
release
end
-MossdeepCity_EventScript_1E4AF0:: @ 81E4AF0
- msgbox MossdeepCity_Text_1E4E22, MSGBOX_NPC
+MossdeepCity_EventScript_NinjaBoy:: @ 81E4AF0
+ msgbox MossdeepCity_Text_WailmerWatching, MSGBOX_NPC
end
-MossdeepCity_EventScript_1E4AF9:: @ 81E4AF9
- msgbox MossdeepCity_Text_1E5135, MSGBOX_NPC
+MossdeepCity_EventScript_ExpertM:: @ 81E4AF9
+ msgbox MossdeepCity_Text_LifeNeedsSeaToLive, MSGBOX_NPC
end
-MossdeepCity_EventScript_1E4B02:: @ 81E4B02
- msgbox MossdeepCity_Text_1E50D9, MSGBOX_NPC
+MossdeepCity_EventScript_Girl:: @ 81E4B02
+ msgbox MossdeepCity_Text_NiceIfWorldCoveredByFlowers, MSGBOX_NPC
end
-MossdeepCity_EventScript_1E4B0B:: @ 81E4B0B
- msgbox MossdeepCity_Text_1E529D, MSGBOX_NPC
+MossdeepCity_EventScript_Woman:: @ 81E4B0B
+ msgbox MossdeepCity_Text_SpecialSpaceCenterRock, MSGBOX_NPC
end
-MossdeepCity_EventScript_1E4B14:: @ 81E4B14
- msgbox MossdeepCity_Text_1E5396, MSGBOX_SIGN
+MossdeepCity_EventScript_WhiteRock:: @ 81E4B14
+ msgbox MossdeepCity_Text_ItsAWhiteRock, MSGBOX_SIGN
end
-MossdeepCity_EventScript_1E4B1D:: @ 81E4B1D
- msgbox MossdeepCity_Text_1E53A9, MSGBOX_SIGN
+MossdeepCity_EventScript_GymSign:: @ 81E4B1D
+ msgbox MossdeepCity_Text_GymSign, MSGBOX_SIGN
end
-MossdeepCity_EventScript_1E4B26:: @ 81E4B26
- msgbox MossdeepCity_Text_1E53F2, MSGBOX_SIGN
+MossdeepCity_EventScript_CitySign:: @ 81E4B26
+ msgbox MossdeepCity_Text_CitySign, MSGBOX_SIGN
end
-MossdeepCity_EventScript_1E4B2F:: @ 81E4B2F
- msgbox MossdeepCity_Text_1E541F, MSGBOX_SIGN
+MossdeepCity_EventScript_SpaceCenterSign:: @ 81E4B2F
+ msgbox MossdeepCity_Text_SpaceCenterSign, MSGBOX_SIGN
end
-MossdeepCity_EventScript_1E4B38:: @ 81E4B38
+MossdeepCity_EventScript_VisitedMossdeep:: @ 81E4B38
setflag FLAG_VISITED_MOSSDEEP_CITY
setvar VAR_TEMP_1, 1
end
-MossdeepCity_EventScript_1E4B41:: @ 81E4B41
+MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter:: @ 81E4B41
lockall
- applymovement 14, MossdeepCity_Movement_1E4BAD
+ applymovement 14, MossdeepCity_Movement_MaxieGestureToSpaceCenter
waitmovement 0
- applymovement 10, MossdeepCity_Movement_1E4BB7
- applymovement 11, MossdeepCity_Movement_1E4BB7
- applymovement 12, MossdeepCity_Movement_1E4BB7
- applymovement 13, MossdeepCity_Movement_1E4BB7
+ applymovement 10, MossdeepCity_Movement_GruntFaceSpaceCenter
+ applymovement 11, MossdeepCity_Movement_GruntFaceSpaceCenter
+ applymovement 12, MossdeepCity_Movement_GruntFaceSpaceCenter
+ applymovement 13, MossdeepCity_Movement_GruntFaceSpaceCenter
waitmovement 0
- applymovement 14, MossdeepCity_Movement_1E4BBC
- applymovement 10, MossdeepCity_Movement_1E4BCA
- applymovement 11, MossdeepCity_Movement_1E4BDD
- applymovement 12, MossdeepCity_Movement_1E4BEF
- applymovement 13, MossdeepCity_Movement_1E4C00
+ applymovement 14, MossdeepCity_Movement_MaxieEnterSpaceCenter
+ applymovement 10, MossdeepCity_Movement_Grunt1EnterSpaceCenter
+ applymovement 11, MossdeepCity_Movement_Grunt2EnterSpaceCenter
+ applymovement 12, MossdeepCity_Movement_Grunt3EnterSpaceCenter
+ applymovement 13, MossdeepCity_Movement_Grunt4EnterSpaceCenter
waitmovement 0
removeobject 14
removeobject 10
@@ -99,7 +99,7 @@ MossdeepCity_EventScript_1E4B41:: @ 81E4B41
releaseall
end
-MossdeepCity_Movement_1E4BAD: @ 81E4BAD
+MossdeepCity_Movement_MaxieGestureToSpaceCenter: @ 81E4BAD
delay_16
face_right
delay_16
@@ -111,14 +111,14 @@ MossdeepCity_Movement_1E4BAD: @ 81E4BAD
delay_16
step_end
-MossdeepCity_Movement_1E4BB7: @ 81E4BB7
+MossdeepCity_Movement_GruntFaceSpaceCenter: @ 81E4BB7
face_right
delay_16
delay_16
delay_16
step_end
-MossdeepCity_Movement_1E4BBC: @ 81E4BBC
+MossdeepCity_Movement_MaxieEnterSpaceCenter: @ 81E4BBC
walk_down
walk_right
walk_right
@@ -134,7 +134,7 @@ MossdeepCity_Movement_1E4BBC: @ 81E4BBC
walk_right
step_end
-MossdeepCity_Movement_1E4BCA: @ 81E4BCA
+MossdeepCity_Movement_Grunt1EnterSpaceCenter: @ 81E4BCA
delay_16
delay_8
walk_down
@@ -155,7 +155,7 @@ MossdeepCity_Movement_1E4BCA: @ 81E4BCA
walk_right
step_end
-MossdeepCity_Movement_1E4BDD: @ 81E4BDD
+MossdeepCity_Movement_Grunt2EnterSpaceCenter: @ 81E4BDD
delay_16
delay_8
walk_down
@@ -175,7 +175,7 @@ MossdeepCity_Movement_1E4BDD: @ 81E4BDD
walk_right
step_end
-MossdeepCity_Movement_1E4BEF: @ 81E4BEF
+MossdeepCity_Movement_Grunt3EnterSpaceCenter: @ 81E4BEF
delay_16
delay_8
walk_down
@@ -194,7 +194,7 @@ MossdeepCity_Movement_1E4BEF: @ 81E4BEF
walk_right
step_end
-MossdeepCity_Movement_1E4C00: @ 81E4C00
+MossdeepCity_Movement_Grunt4EnterSpaceCenter: @ 81E4C00
delay_16
delay_8
walk_right
@@ -212,77 +212,77 @@ MossdeepCity_Movement_1E4C00: @ 81E4C00
walk_right
step_end
-MossdeepCity_EventScript_1E4C10:: @ 81E4C10
+MossdeepCity_EventScript_Man:: @ 81E4C10
lock
faceplayer
- msgbox MossdeepCity_Text_1E5213, MSGBOX_DEFAULT
+ msgbox MossdeepCity_Text_SurfExhilarating, MSGBOX_DEFAULT
applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-MossdeepCity_EventScript_1E4C26:: @ 81E4C26
+MossdeepCity_EventScript_KingsRockBoy:: @ 81E4C26
lock
faceplayer
- goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_1E4C68
- msgbox MossdeepCity_Text_1E4CED, MSGBOX_YESNO
- compare VAR_RESULT, 0
- goto_if_eq MossdeepCity_EventScript_1E4C72
- msgbox MossdeepCity_Text_1E4D5B, MSGBOX_DEFAULT
- giveitem_std ITEM_KINGS_ROCK
- compare VAR_RESULT, 0
+ goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_ReceivedKingsRock
+ msgbox MossdeepCity_Text_WantKingsRockStevenGaveMe, MSGBOX_YESNO
+ compare VAR_RESULT, NO
+ goto_if_eq MossdeepCity_EventScript_DeclineKingsRock
+ msgbox MossdeepCity_Text_YouCanKeepIt, MSGBOX_DEFAULT
+ giveitem ITEM_KINGS_ROCK
+ compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_KINGS_ROCK
release
end
-MossdeepCity_EventScript_1E4C68:: @ 81E4C68
- msgbox MossdeepCity_Text_1E4DB3, MSGBOX_DEFAULT
+MossdeepCity_EventScript_ReceivedKingsRock:: @ 81E4C68
+ msgbox MossdeepCity_Text_StevensHouseOverThere, MSGBOX_DEFAULT
release
end
-MossdeepCity_EventScript_1E4C72:: @ 81E4C72
- msgbox MossdeepCity_Text_1E4DD7, MSGBOX_DEFAULT
+MossdeepCity_EventScript_DeclineKingsRock:: @ 81E4C72
+ msgbox MossdeepCity_Text_WhatToDoWithWeirdRock, MSGBOX_DEFAULT
release
end
-MossdeepCity_EventScript_1E4C7C:: @ 81E4C7C
- msgbox MossdeepCity_Text_1E5581, MSGBOX_NPC
+MossdeepCity_EventScript_BlackBelt:: @ 81E4C7C
+ msgbox MossdeepCity_Text_SootopolisNewGymLeader, MSGBOX_NPC
end
-MossdeepCity_EventScript_1E4C85:: @ 81E4C85
+MossdeepCity_EventScript_Scott:: @ 81E4C85
lock
faceplayer
- msgbox MossdeepCity_Text_1E5453, MSGBOX_DEFAULT
+ msgbox MossdeepCity_Text_ScottSomethingWrongWithTown, MSGBOX_DEFAULT
closemessage
- compare VAR_FACING, 2
- call_if_eq MossdeepCity_EventScript_1E4CB0
- compare VAR_FACING, 4
- call_if_eq MossdeepCity_EventScript_1E4CC2
+ compare VAR_FACING, DIR_NORTH
+ call_if_eq MossdeepCity_EventScript_ScottExitNorth
+ compare VAR_FACING, DIR_EAST
+ call_if_eq MossdeepCity_EventScript_ScottExitEast
addvar VAR_SCOTT_STATE, 1
removeobject 16
release
end
-MossdeepCity_EventScript_1E4CB0:: @ 81E4CB0
- applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_1E4CD4
- applymovement 16, MossdeepCity_Movement_1E4CD8
+MossdeepCity_EventScript_ScottExitNorth:: @ 81E4CB0
+ applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit
+ applymovement 16, MossdeepCity_Movement_ScottExitNorth
waitmovement 0
return
-MossdeepCity_EventScript_1E4CC2:: @ 81E4CC2
- applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_1E4CD4
- applymovement 16, MossdeepCity_Movement_1E4CE2
+MossdeepCity_EventScript_ScottExitEast:: @ 81E4CC2
+ applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit
+ applymovement 16, MossdeepCity_Movement_ScottExitEast
waitmovement 0
return
-MossdeepCity_Movement_1E4CD4: @ 81E4CD4
+MossdeepCity_Movement_PlayerWatchScottExit: @ 81E4CD4
delay_16
delay_16
walk_in_place_fastest_left
step_end
-MossdeepCity_Movement_1E4CD8: @ 81E4CD8
+MossdeepCity_Movement_ScottExitNorth: @ 81E4CD8
walk_left
walk_left
walk_left
@@ -294,7 +294,7 @@ MossdeepCity_Movement_1E4CD8: @ 81E4CD8
walk_left
step_end
-MossdeepCity_Movement_1E4CE2: @ 81E4CE2
+MossdeepCity_Movement_ScottExitEast: @ 81E4CE2
walk_down
walk_left
walk_left
@@ -307,26 +307,26 @@ MossdeepCity_Movement_1E4CE2: @ 81E4CE2
walk_left
step_end
-MossdeepCity_Text_1E4CED: @ 81E4CED
+MossdeepCity_Text_WantKingsRockStevenGaveMe: @ 81E4CED
.string "I got this from STEVEN, but I don't\n"
.string "know what it's good for.\p"
.string "I think it's called KING'S ROCK.\n"
.string "Do you want it?$"
-MossdeepCity_Text_1E4D5B: @ 81E4D5B
+MossdeepCity_Text_YouCanKeepIt: @ 81E4D5B
.string "Why would you want it?\n"
.string "You're weird.\p"
.string "You can keep it, but keep it a secret\n"
.string "from STEVEN.$"
-MossdeepCity_Text_1E4DB3: @ 81E4DB3
+MossdeepCity_Text_StevensHouseOverThere: @ 81E4DB3
.string "STEVEN's house is right over there!$"
-MossdeepCity_Text_1E4DD7: @ 81E4DD7
+MossdeepCity_Text_WhatToDoWithWeirdRock: @ 81E4DD7
.string "Yeah, you think so, too! What are you\n"
.string "supposed to do with some weird rock?$"
-MossdeepCity_Text_1E4E22: @ 81E4E22
+MossdeepCity_Text_WailmerWatching: @ 81E4E22
.string "Around MOSSDEEP, you can see wild\n"
.string "WAILMER.\p"
.string "It's called, uh…\n"
@@ -334,17 +334,17 @@ MossdeepCity_Text_1E4E22: @ 81E4E22
.string "WAI, WAI, WAI…\p"
.string "WAILMER watching!$"
-MossdeepCity_Text_1E4E90: @ 81E4E90
+MossdeepCity_Text_SpaceCenterReceivedLetter: @ 81E4E90
.string "The island's SPACE CENTER has been\n"
.string "launching huge rockets.\p"
.string "There's been some kind of an uproar\n"
.string "over a letter they received recently.$"
-MossdeepCity_Text_1E4F15: @ 81E4F15
+MossdeepCity_Text_SpaceCenterLaunchingRockets: @ 81E4F15
.string "The island's SPACE CENTER has been\n"
.string "launching huge rockets.$"
-MossdeepCity_Text_1E4F50: @ 81E4F50
+MossdeepCity_Text_MossdeepTargetedByMagma: @ 81E4F50
.string "I heard from a SAILOR buddy that\n"
.string "TEAM AQUA set up shop in LILYCOVE.\p"
.string "I also heard that someone came along\n"
@@ -354,18 +354,18 @@ MossdeepCity_Text_1E4F50: @ 81E4F50
.string "If you want to know what they're up to,\n"
.string "go visit the SPACE CENTER.$"
-MossdeepCity_Text_1E5051: @ 81E5051
+MossdeepCity_Text_FeelReliefOnLand: @ 81E5051
.string "I'm a SAILOR, so the sea's obviously\n"
.string "more important to me.\p"
.string "But you know? When I get back on land\n"
.string "after a long voyage, I do feel relief!$"
-MossdeepCity_Text_1E50D9: @ 81E50D9
+MossdeepCity_Text_NiceIfWorldCoveredByFlowers: @ 81E50D9
.string "Wouldn't it be nice?\p"
.string "If the whole world was covered in\n"
.string "plants and flowers like this island?$"
-MossdeepCity_Text_1E5135: @ 81E5135
+MossdeepCity_Text_LifeNeedsSeaToLive: @ 81E5135
.string "All life needs the sea to live, even\n"
.string "though it makes its home on the land.\p"
.string "Life, having run its course, becomes\n"
@@ -374,14 +374,14 @@ MossdeepCity_Text_1E5135: @ 81E5135
.string "the land.\p"
.string "Yes, like the very shoreline here.$"
-MossdeepCity_Text_1E5213: @ 81E5213
+MossdeepCity_Text_SurfExhilarating: @ 81E5213
.string "A voyage on a ship is fine.\p"
.string "But crossing the sea with POKéMON\n"
.string "using SURF…\p"
.string "Now that's an exhilarating trip!\n"
.string "Wouldn't you agree, youngster?$"
-MossdeepCity_Text_1E529D: @ 81E529D
+MossdeepCity_Text_SpecialSpaceCenterRock: @ 81E529D
.string "This rock has a special meaning to\n"
.string "the people at the SPACE CENTER.\p"
.string "They put it here as their wish for\n"
@@ -391,23 +391,23 @@ MossdeepCity_Text_1E529D: @ 81E529D
.string "I use a wish tag to make it happen.\n"
.string "That's what I do.$"
-MossdeepCity_Text_1E5396: @ 81E5396
+MossdeepCity_Text_ItsAWhiteRock: @ 81E5396
.string "It's a white rock.$"
-MossdeepCity_Text_1E53A9: @ 81E53A9
+MossdeepCity_Text_GymSign: @ 81E53A9
.string "MOSSDEEP CITY POKéMON GYM\n"
.string "LEADERS: LIZA & TATE\p"
.string "“The mystic combination!”$"
-MossdeepCity_Text_1E53F2: @ 81E53F2
+MossdeepCity_Text_CitySign: @ 81E53F2
.string "MOSSDEEP CITY\n"
.string "“Our slogan: Cherish POKéMON!”$"
-MossdeepCity_Text_1E541F: @ 81E541F
+MossdeepCity_Text_SpaceCenterSign: @ 81E541F
.string "MOSSDEEP SPACE CENTER\n"
.string "“The closest place to space.”$"
-MossdeepCity_Text_1E5453: @ 81E5453
+MossdeepCity_Text_ScottSomethingWrongWithTown: @ 81E5453
.string "SCOTT: {PLAYER}{KUN}, feeling good?\n"
.string "I'm doing great!\p"
.string "I'd heard MOSSDEEP's GYM LEADER is\n"
@@ -420,7 +420,7 @@ MossdeepCity_Text_1E5453: @ 81E5453
.string "I don't think it concerns me in any\n"
.string "way, though.$"
-MossdeepCity_Text_1E5581: @ 81E5581
+MossdeepCity_Text_SootopolisNewGymLeader: @ 81E5581
.string "Ahh… It feels great letting the waves\n"
.string "wash over my feet…\p"
.string "Speaking of the waves, you know that\n"