Remove address comments
This commit is contained in:
@@ -3,10 +3,10 @@
|
||||
|
||||
.equ SHOWN_REQUESTED_MON, FLAG_TEMP_2
|
||||
|
||||
FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD
|
||||
FiveIsland_ResortGorgeous_House_MapScripts::
|
||||
.byte 0
|
||||
|
||||
FiveIsland_ResortGorgeous_House_EventScript_Selphy:: @ 8171EBE
|
||||
FiveIsland_ResortGorgeous_House_EventScript_Selphy::
|
||||
goto_if_questlog EventScript_ReleaseEnd
|
||||
special QuestLog_CutRecording
|
||||
lock
|
||||
@@ -20,18 +20,18 @@ FiveIsland_ResortGorgeous_House_EventScript_Selphy:: @ 8171EBE
|
||||
goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon
|
||||
end
|
||||
|
||||
FiveIsland_ResortGorgeous_House_EventScript_RequestMon:: @ 8171EFE
|
||||
FiveIsland_ResortGorgeous_House_EventScript_RequestMon::
|
||||
special SampleResortGorgeousMonAndReward
|
||||
msgbox FiveIsland_ResortGorgeous_House_Text_WishToSeeMonPlease
|
||||
release
|
||||
end
|
||||
|
||||
FiveIsland_ResortGorgeous_House_EventScript_RequestTookTooLong:: @ 8171F0B
|
||||
FiveIsland_ResortGorgeous_House_EventScript_RequestTookTooLong::
|
||||
msgbox FiveIsland_ResortGorgeous_House_Text_OhImTiredOfWaiting
|
||||
goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon
|
||||
end
|
||||
|
||||
FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon:: @ 8171F19
|
||||
FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon::
|
||||
copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON
|
||||
specialvar VAR_RESULT, DoesPlayerPartyContainSpecies
|
||||
compare VAR_RESULT, TRUE
|
||||
@@ -39,7 +39,7 @@ FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon:: @ 8171F19
|
||||
goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon
|
||||
end
|
||||
|
||||
FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon:: @ 8171F34
|
||||
FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon::
|
||||
special SampleResortGorgeousMonAndReward
|
||||
msgbox FiveIsland_ResortGorgeous_House_Text_MonYouCaughtForMeThankYou
|
||||
addobject LOCALID_BUTLER
|
||||
@@ -72,7 +72,7 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon:: @ 8171F34
|
||||
release
|
||||
end
|
||||
|
||||
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth:: @ 8171FCD
|
||||
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth::
|
||||
applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestDown
|
||||
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth
|
||||
waitmovement 0
|
||||
@@ -80,14 +80,14 @@ FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth:: @ 8171FC
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth:: @ 8171FE9
|
||||
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth::
|
||||
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth
|
||||
waitmovement 0
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast:: @ 8171FFE
|
||||
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast::
|
||||
applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestLeft
|
||||
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast
|
||||
waitmovement 0
|
||||
@@ -95,12 +95,12 @@ FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast:: @ 8171FFE
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest:: @ 817201A
|
||||
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest::
|
||||
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerWest
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
FiveIsland_ResortGorgeous_House_EventScript_NoRoomForReward:: @ 8172025
|
||||
FiveIsland_ResortGorgeous_House_EventScript_NoRoomForReward::
|
||||
textcolor 0
|
||||
msgbox FiveIsland_ResortGorgeous_House_Text_ButlerBagAppearsToBeFull
|
||||
textcolor 1
|
||||
@@ -110,12 +110,12 @@ FiveIsland_ResortGorgeous_House_EventScript_NoRoomForReward:: @ 8172025
|
||||
release
|
||||
end
|
||||
|
||||
FiveIsland_ResortGorgeous_House_EventScript_JustFulfilledRequest:: @ 8172043
|
||||
FiveIsland_ResortGorgeous_House_EventScript_JustFulfilledRequest::
|
||||
msgbox FiveIsland_ResortGorgeous_House_Text_SelphyWishYouBestOfLuck
|
||||
release
|
||||
end
|
||||
|
||||
FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth:: @ 817204D
|
||||
FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth::
|
||||
walk_left
|
||||
walk_left
|
||||
walk_left
|
||||
@@ -125,13 +125,13 @@ FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth:: @ 817204D
|
||||
walk_in_place_fastest_right
|
||||
step_end
|
||||
|
||||
FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth:: @ 8172055
|
||||
FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth::
|
||||
walk_left
|
||||
walk_left
|
||||
walk_in_place_fastest_down
|
||||
step_end
|
||||
|
||||
FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast:: @ 8172059
|
||||
FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast::
|
||||
walk_left
|
||||
walk_left
|
||||
walk_left
|
||||
@@ -140,15 +140,15 @@ FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast:: @ 8172059
|
||||
|
||||
@ Very odd. If the player is talking to Selphy facing West, then the player has clipped through the table
|
||||
@ In this case rather than approach the player the Butler walks up, which clips the Butler into a wall
|
||||
FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerWest:: @ 817205E
|
||||
FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerWest::
|
||||
walk_up
|
||||
step_end
|
||||
|
||||
FiveIsland_ResortGorgeous_House_Movement_ButlerEnter:: @ 8172060
|
||||
FiveIsland_ResortGorgeous_House_Movement_ButlerEnter::
|
||||
walk_in_place_down
|
||||
step_end
|
||||
|
||||
@ Addressed as "Sebastian" but speaks only as "Butler"
|
||||
FiveIsland_ResortGorgeous_House_EventScript_Butler:: @ 8172062
|
||||
FiveIsland_ResortGorgeous_House_EventScript_Butler::
|
||||
msgbox FiveIsland_ResortGorgeous_House_Text_LadySelphySmileHasBrillianceOfSun, MSGBOX_NPC
|
||||
end
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
FiveIsland_ResortGorgeous_House_Text_PleaseHearMyWish:: @ 81A42A0
|
||||
FiveIsland_ResortGorgeous_House_Text_PleaseHearMyWish::
|
||||
.string "SELPHY: Oh?\n"
|
||||
.string "Do I know you from somewhere?\p"
|
||||
.string "Oh, but that doesn't matter.\p"
|
||||
.string "I am exquisitely bored.\n"
|
||||
.string "Please, hear my wish.$"
|
||||
|
||||
FiveIsland_ResortGorgeous_House_Text_WishToSeeMonPlease:: @ 81A4315
|
||||
FiveIsland_ResortGorgeous_House_Text_WishToSeeMonPlease::
|
||||
.string "I wish to see a POKéMON.\n"
|
||||
.string "A darling {STR_VAR_1}.\p"
|
||||
.string "I want to see one right away.\n"
|
||||
.string "Please, make my wish come true.$"
|
||||
|
||||
FiveIsland_ResortGorgeous_House_Text_OhImTiredOfWaiting:: @ 81A437A
|
||||
FiveIsland_ResortGorgeous_House_Text_OhImTiredOfWaiting::
|
||||
.string "SELPHY: Oh, I'm tired of this.\n"
|
||||
.string "I'm tired of waiting for you.\p"
|
||||
.string "I'll forgive you this time, but\n"
|
||||
.string "please don't fail me next time.$"
|
||||
|
||||
FiveIsland_ResortGorgeous_House_Text_MonYouCaughtForMeThankYou:: @ 81A43F7
|
||||
FiveIsland_ResortGorgeous_House_Text_MonYouCaughtForMeThankYou::
|
||||
.string "SELPHY: Oh, hello, there.\p"
|
||||
.string "Oh, my gracious. That must be the\n"
|
||||
.string "{STR_VAR_1} you caught for me.\p"
|
||||
@@ -32,35 +32,35 @@ FiveIsland_ResortGorgeous_House_Text_MonYouCaughtForMeThankYou:: @ 81A43F7
|
||||
.string "SEBASTIAN!\n"
|
||||
.string "I need you here this instant!$"
|
||||
|
||||
FiveIsland_ResortGorgeous_House_Text_ButlerYesMyLady:: @ 81A450B
|
||||
FiveIsland_ResortGorgeous_House_Text_ButlerYesMyLady::
|
||||
.string "Butler: Yes, my lady.$"
|
||||
|
||||
FiveIsland_ResortGorgeous_House_Text_SelphyGiveTokenOfAppreciation:: @ 81A4521
|
||||
FiveIsland_ResortGorgeous_House_Text_SelphyGiveTokenOfAppreciation::
|
||||
.string "SELPHY: See to it that this person\n"
|
||||
.string "is given a token of appreciation.$"
|
||||
|
||||
FiveIsland_ResortGorgeous_House_Text_ButlerIShallDoAsYouBid:: @ 81A4566
|
||||
FiveIsland_ResortGorgeous_House_Text_ButlerIShallDoAsYouBid::
|
||||
.string "Butler: I shall do as you bid,\n"
|
||||
.string "my lady.$"
|
||||
|
||||
FiveIsland_ResortGorgeous_House_Text_ButlerPleaseAcceptThisAsHerThanks:: @ 81A458E
|
||||
FiveIsland_ResortGorgeous_House_Text_ButlerPleaseAcceptThisAsHerThanks::
|
||||
.string "Butler: I sincerely thank you for\n"
|
||||
.string "pleasing Lady SELPHY.\p"
|
||||
.string "Please accept this as her thanks…$"
|
||||
|
||||
FiveIsland_ResortGorgeous_House_Text_ButlerBagAppearsToBeFull:: @ 81A45E8
|
||||
FiveIsland_ResortGorgeous_House_Text_ButlerBagAppearsToBeFull::
|
||||
.string "Butler: Your BAG appears to be\n"
|
||||
.string "unfortunately full.$"
|
||||
|
||||
FiveIsland_ResortGorgeous_House_Text_OhHowDisappointing:: @ 81A461B
|
||||
FiveIsland_ResortGorgeous_House_Text_OhHowDisappointing::
|
||||
.string "Oh…\n"
|
||||
.string "How disappointing.$"
|
||||
|
||||
FiveIsland_ResortGorgeous_House_Text_SelphyWishYouBestOfLuck:: @ 81A4632
|
||||
FiveIsland_ResortGorgeous_House_Text_SelphyWishYouBestOfLuck::
|
||||
.string "SELPHY: I wish you the best of\n"
|
||||
.string "luck.$"
|
||||
|
||||
FiveIsland_ResortGorgeous_House_Text_LadySelphySmileHasBrillianceOfSun:: @ 81A4657
|
||||
FiveIsland_ResortGorgeous_House_Text_LadySelphySmileHasBrillianceOfSun::
|
||||
.string "Butler: The smile of Lady SELPHY\n"
|
||||
.string "has the brilliance of the sun.\p"
|
||||
.string "Please, I beg you to bring joy\n"
|
||||
|
||||
Reference in New Issue
Block a user