dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove address comments

Browse Source
This commit is contained in:
GriffinR
2021-07-20 15:18:31 -04:00
parent bea170e8e9
commit 06351bf63c
576 changed files with 17798 additions and 17798 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/TrainerHill_Entrance/scripts.inc
+69 -69
View File
@@ -3,7 +3,7 @@
.set LOCALID_GIRL, 4
.set LOCALID_MAN, 5
TrainerHill_Entrance_MapScripts:: @ 82680AC
TrainerHill_Entrance_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Entrance_OnResume
map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerHill_Entrance_OnReturn
map_script MAP_SCRIPT_ON_TRANSITION, TrainerHill_Entrance_OnTransition
@@ -11,16 +11,16 @@ TrainerHill_Entrance_MapScripts:: @ 82680AC
map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Entrance_OnFrame
.byte 0
TrainerHill_Entrance_OnTransition: @ 82680C6
TrainerHill_Entrance_OnTransition:
setflag FLAG_LANDMARK_TRAINER_HILL
getplayerxy VAR_TEMP_D, VAR_RESULT
end
@ Unused
TrainerHill_Entrance_OnWarp: @ 82680CF
TrainerHill_Entrance_OnWarp:
end
TrainerHill_Entrance_OnResume: @ 82680D0
TrainerHill_Entrance_OnResume:
trainerhill_resumetimer
setvar VAR_TEMP_0, 0
trainerhill_getusingereader
@@ -30,40 +30,40 @@ TrainerHill_Entrance_OnResume: @ 82680D0
applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
end
TrainerHill_Entrance_EventScript_TryFaceAttendant:: @ 82680FF
TrainerHill_Entrance_EventScript_TryFaceAttendant::
trainerhill_getwon
compare VAR_RESULT, TRUE
goto_if_eq TrainerHill_Entrance_EventScript_PlayerDontFaceAttendant
applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
end
TrainerHill_Entrance_EventScript_PlayerDontFaceAttendant:: @ 826811A
TrainerHill_Entrance_EventScript_PlayerDontFaceAttendant::
end
TrainerHill_Entrance_OnReturn: @ 826811B
TrainerHill_Entrance_OnReturn:
addobject LOCALID_NURSE
addobject LOCALID_ATTENDANT
addobject LOCALID_MAN
addobject LOCALID_GIRL
end
TrainerHill_Entrance_OnLoad: @ 8268128
TrainerHill_Entrance_OnLoad:
compare VAR_TEMP_D, 17
call_if_eq TrainerHill_Entrance_EventScript_OpenCounterDoor
end
TrainerHill_Entrance_EventScript_OpenCounterDoor:: @ 8268134
TrainerHill_Entrance_EventScript_OpenCounterDoor::
setmetatile 17, 10, METATILE_TrainerHill_GreenFloorTile, 0
return
TrainerHill_Entrance_OnFrame: @ 826813E
TrainerHill_Entrance_OnFrame:
map_script_2 VAR_TEMP_0, 0, TrainerHill_Entrance_EventScript_ExitChallenge
map_script_2 VAR_TEMP_D, 17, TrainerHill_Entrance_EventScript_ExitElevator
map_script_2 VAR_TEMP_5, 1, TrainerHill_Entrance_EventScript_EntryTrigger
map_script_2 VAR_TEMP_1, 1, TrainerHill_EventScript_WarpToEntranceCounter
.2byte 0
TrainerHill_Entrance_EventScript_ExitElevator:: @ 8268160
TrainerHill_Entrance_EventScript_ExitElevator::
lockall
applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerExitElevator
waitmovement 0
@@ -75,7 +75,7 @@ TrainerHill_Entrance_EventScript_ExitElevator:: @ 8268160
releaseall
end
TrainerHill_Entrance_EventScript_ExitChallenge:: @ 8268182
TrainerHill_Entrance_EventScript_ExitChallenge::
setvar VAR_TEMP_0, 1
trainerhill_getstatus
switch VAR_RESULT
@@ -83,27 +83,27 @@ TrainerHill_Entrance_EventScript_ExitChallenge:: @ 8268182
case TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED, TrainerHill_Entrance_EventScript_ExitChallengeECard
case TRAINER_HILL_PLAYER_STATUS_NORMAL, TrainerHill_Entrance_EventScript_EndExitChallenge
TrainerHill_Entrance_EventScript_ExitChallengeLost:: @ 82681B5
TrainerHill_Entrance_EventScript_ExitChallengeLost::
lockall
applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
msgbox TrainerHill_Entrance_Text_TooBadTremendousEffort, MSGBOX_DEFAULT
goto TrainerHill_Entrance_EventScript_PlayerExitChallenge
TrainerHill_Entrance_EventScript_ExitChallengeECard:: @ 82681CA
TrainerHill_Entrance_EventScript_ExitChallengeECard::
lockall
applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
msgbox TrainerHill_Entrance_Text_MovedReceptionHereForSwitch, MSGBOX_DEFAULT
TrainerHill_Entrance_EventScript_PlayerExitChallenge:: @ 82681DA
TrainerHill_Entrance_EventScript_PlayerExitChallenge::
closemessage
applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter
waitmovement 0
setvar VAR_TRAINER_HILL_IS_ACTIVE, 0
special HealPlayerParty
releaseall
TrainerHill_Entrance_EventScript_EndExitChallenge:: @ 82681EE
TrainerHill_Entrance_EventScript_EndExitChallenge::
end
TrainerHill_Entrance_EventScript_Nurse:: @ 82681EF
TrainerHill_Entrance_EventScript_Nurse::
setvar VAR_0x800B, LOCALID_NURSE
call Common_EventScript_PkmnCenterNurse
waitmessage
@@ -111,7 +111,7 @@ TrainerHill_Entrance_EventScript_Nurse:: @ 82681EF
release
end
TrainerHill_Entrance_EventScript_Attendant:: @ 82681FD
TrainerHill_Entrance_EventScript_Attendant::
lock
faceplayer
trainerhill_inchallenge
@@ -120,13 +120,13 @@ TrainerHill_Entrance_EventScript_Attendant:: @ 82681FD
msgbox TrainerHill_Entrance_Text_HopeYouGiveItYourBest, MSGBOX_DEFAULT
goto TrainerHill_Entrance_EventScript_AttendantEnd
TrainerHill_Entrance_EventScript_ThanksForPlaying:: @ 826821F
TrainerHill_Entrance_EventScript_ThanksForPlaying::
msgbox TrainerHill_Entrance_Text_ThankYouForPlaying, MSGBOX_DEFAULT
TrainerHill_Entrance_EventScript_AttendantEnd:: @ 8268227
TrainerHill_Entrance_EventScript_AttendantEnd::
release
end
TrainerHill_Entrance_EventScript_EntryTrigger:: @ 8268229
TrainerHill_Entrance_EventScript_EntryTrigger::
lockall
applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_Closed
@@ -140,9 +140,9 @@ TrainerHill_Entrance_EventScript_EntryTrigger:: @ 8268229
msgbox TrainerHill_Entrance_Text_TrainersUpToFloorX, MSGBOX_DEFAULT
goto TrainerHill_Entrance_EventScript_AskChallengeTrainers
TrainerHill_Entrance_EventScript_AllFloorsUsed:: @ 8268275
TrainerHill_Entrance_EventScript_AllFloorsUsed::
msgbox TrainerHill_Entrance_Text_TrainersInEveryRoom, MSGBOX_DEFAULT
TrainerHill_Entrance_EventScript_AskChallengeTrainers:: @ 826827D
TrainerHill_Entrance_EventScript_AskChallengeTrainers::
message TrainerHill_Entrance_Text_LikeToChallengeTrainers
waitmessage
multichoice 15, 6, MULTI_YESNOINFO, FALSE
@@ -153,12 +153,12 @@ TrainerHill_Entrance_EventScript_AskChallengeTrainers:: @ 826827D
case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_CancelEntry
end
TrainerHill_Entrance_EventScript_Info:: @ 82682BA
TrainerHill_Entrance_EventScript_Info::
msgbox TrainerHill_Entrance_Text_ExplainTrainerHill, MSGBOX_DEFAULT
goto TrainerHill_Entrance_EventScript_AskChallengeTrainers
end
TrainerHill_Entrance_EventScript_ChooseChallenge:: @ 82682C8
TrainerHill_Entrance_EventScript_ChooseChallenge::
multichoice 13, 2, MULTI_TAG_MATCH_TYPE, FALSE
switch VAR_RESULT
case 4, TrainerHill_Entrance_EventScript_CancelEntry
@@ -172,7 +172,7 @@ TrainerHill_Entrance_EventScript_ChooseChallenge:: @ 82682C8
releaseall
end
TrainerHill_Entrance_EventScript_CancelEntry:: @ 8268314
TrainerHill_Entrance_EventScript_CancelEntry::
setvar VAR_TEMP_5, 0
msgbox TrainerHill_Entrance_Text_PleaseVisitUsAgain, MSGBOX_DEFAULT
closemessage
@@ -181,7 +181,7 @@ TrainerHill_Entrance_EventScript_CancelEntry:: @ 8268314
releaseall
end
TrainerHill_Entrance_EventScript_SaveGame:: @ 826832E
TrainerHill_Entrance_EventScript_SaveGame::
msgbox TrainerHill_Entrance_Text_SaveGameBeforeEnter, MSGBOX_DEFAULT
trainerhill_setsaved
setvar VAR_TEMP_5, 1
@@ -191,12 +191,12 @@ TrainerHill_Entrance_EventScript_SaveGame:: @ 826832E
trainerhill_setsaved
return
TrainerHill_Entrance_EventScript_SaveFailed:: @ 826835C
TrainerHill_Entrance_EventScript_SaveFailed::
trainerhill_clearsaved
goto TrainerHill_Entrance_EventScript_CancelEntry
end
TrainerHill_Entrance_EventScript_Closed:: @ 826836A
TrainerHill_Entrance_EventScript_Closed::
msgbox TrainerHill_Entrance_Text_StillGettingReady, MSGBOX_DEFAULT
closemessage
applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter
@@ -204,25 +204,25 @@ TrainerHill_Entrance_EventScript_Closed:: @ 826836A
releaseall
end
TrainerHill_Entrance_Movement_PlayerFaceAttendant: @ 826837F
TrainerHill_Entrance_Movement_PlayerFaceAttendant:
face_right
step_end
TrainerHill_Entrance_Movement_PushPlayerBackFromCounter: @ 8268381
TrainerHill_Entrance_Movement_PushPlayerBackFromCounter:
walk_down
step_end
@ Unused
TrainerHill_Entrance_Movement_FaceUp: @ 8268383
TrainerHill_Entrance_Movement_FaceUp:
face_up
step_end
TrainerHill_Entrance_Movement_PlayerExitElevator: @ 8268385
TrainerHill_Entrance_Movement_PlayerExitElevator:
walk_down
walk_down
step_end
TrainerHill_Entrance_EventScript_Records:: @ 8268388
TrainerHill_Entrance_EventScript_Records::
lockall
fadescreen FADE_TO_BLACK
special ShowTrainerHillRecords
@@ -230,25 +230,25 @@ TrainerHill_Entrance_EventScript_Records:: @ 8268388
releaseall
end
TrainerHill_Entrance_EventScript_Man:: @ 8268391
TrainerHill_Entrance_EventScript_Man::
goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_ManTrainerHillClosed
msgbox TrainerHill_Entrance_Text_WhatSortOfTrainersAreAhead, MSGBOX_NPC
end
TrainerHill_Entrance_EventScript_ManTrainerHillClosed:: @ 82683A3
TrainerHill_Entrance_EventScript_ManTrainerHillClosed::
msgbox TrainerHill_Entrance_Text_CantWaitToTestTheWaters, MSGBOX_NPC
end
TrainerHill_Entrance_EventScript_Girl:: @ 82683AC
TrainerHill_Entrance_EventScript_Girl::
goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_GirlTrainerHillClosed
msgbox TrainerHill_Entrance_Text_FriendsTryingToReachTimeBoardTop, MSGBOX_NPC
end
TrainerHill_Entrance_EventScript_GirlTrainerHillClosed:: @ 82683BE
TrainerHill_Entrance_EventScript_GirlTrainerHillClosed::
msgbox TrainerHill_Entrance_Text_DoYouKnowWhenTheyOpen, MSGBOX_NPC
end
TrainerHill_Entrance_EventScript_Clerk:: @ 82683C7
TrainerHill_Entrance_EventScript_Clerk::
lock
faceplayer
message gText_HowMayIServeYou
@@ -260,7 +260,7 @@ TrainerHill_Entrance_EventScript_Clerk:: @ 82683C7
end
.align 2
TrainerHill_Entrance_Pokemart_Basic: @ 82683E8
TrainerHill_Entrance_Pokemart_Basic:
.2byte ITEM_SUPER_POTION
.2byte ITEM_ANTIDOTE
.2byte ITEM_PARALYZE_HEAL
@@ -276,14 +276,14 @@ TrainerHill_Entrance_Pokemart_Basic: @ 82683E8
release
end
TrainerHill_Entrance_EventScript_ExpandedPokemart:: @ 8268402
TrainerHill_Entrance_EventScript_ExpandedPokemart::
pokemart TrainerHill_Entrance_Pokemart_Expanded
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
.align 2
TrainerHill_Entrance_Pokemart_Expanded: @ 8268414
TrainerHill_Entrance_Pokemart_Expanded:
.2byte ITEM_HYPER_POTION
.2byte ITEM_MAX_POTION
.2byte ITEM_FULL_RESTORE
@@ -300,69 +300,69 @@ TrainerHill_Entrance_Pokemart_Expanded: @ 8268414
release
end
TrainerHill_Entrance_Text_StillGettingReady: @ 8268430
TrainerHill_Entrance_Text_StillGettingReady:
.string "This is the TRAINER HILL where\n"
.string "you may enjoy tag battles with many\l"
.string "TRAINERS.\p"
.string "Unfortunately, we're still getting\n"
.string "things ready. Please come back later!$"
TrainerHill_Entrance_Text_WelcomeToTrainerHill: @ 82684C6
TrainerHill_Entrance_Text_WelcomeToTrainerHill:
.string "Welcome!\p"
.string "This is the TRAINER HILL where\n"
.string "you may enjoy tag battles with many\l"
.string "TRAINERS!$"
TrainerHill_Entrance_Text_SaveGameBeforeEnter: @ 826851C
TrainerHill_Entrance_Text_SaveGameBeforeEnter:
.string "Is this your first visit here?\p"
.string "Before you enter, please save\n"
.string "your game.$"
TrainerHill_Entrance_Text_TrainersUpToFloorX: @ 8268564
TrainerHill_Entrance_Text_TrainersUpToFloorX:
.string "Let's see…\n"
.string "The TRAINERS here now are…\p"
.string "Up to floor no. {STR_VAR_1}.$"
TrainerHill_Entrance_Text_TrainersInEveryRoom: @ 826859E
TrainerHill_Entrance_Text_TrainersInEveryRoom:
.string "Let's see…\n"
.string "The TRAINERS here now are…\p"
.string "There appear to be TRAINERS gathered\n"
.string "in every room.$"
TrainerHill_Entrance_Text_LikeToChallengeTrainers: @ 82685F8
TrainerHill_Entrance_Text_LikeToChallengeTrainers:
.string "Would you like to challenge the\n"
.string "waiting TRAINERS?$"
TrainerHill_Entrance_Text_TimeProgessGetSetGo: @ 826862A
TrainerHill_Entrance_Text_TimeProgessGetSetGo:
.string "I will time your progress.\n"
.string "Best of luck!\p"
.string "On your marks…\p"
.string "Get set…\p"
.string "Go!$"
TrainerHill_Entrance_Text_PleaseVisitUsAgain: @ 826866F
TrainerHill_Entrance_Text_PleaseVisitUsAgain:
.string "Please do visit us again!$"
TrainerHill_Entrance_Text_TooBadTremendousEffort: @ 8268689
TrainerHill_Entrance_Text_TooBadTremendousEffort:
.string "That was too bad.\p"
.string "I think you put in a tremendous\n"
.string "effort in your battling.\p"
.string "Please come back and try again!$"
TrainerHill_Entrance_Text_HopeYouGiveItYourBest: @ 82686F4
TrainerHill_Entrance_Text_HopeYouGiveItYourBest:
.string "I hope you give it your best.$"
TrainerHill_Entrance_Text_MovedReceptionHereForSwitch: @ 8268712
TrainerHill_Entrance_Text_MovedReceptionHereForSwitch:
.string "When the TRAINERS switch places,\n"
.string "the movement can be hectic.\p"
.string "To avoid the stampede, we moved\n"
.string "the reception counter here.\p"
.string "I'm sorry for the inconvenience.$"
TrainerHill_Entrance_Text_ThankYouForPlaying: @ 82687AC
TrainerHill_Entrance_Text_ThankYouForPlaying:
.string "Thank you for playing!$"
TrainerHill_Entrance_Text_ExplainTrainerHill: @ 82687C3
TrainerHill_Entrance_Text_ExplainTrainerHill:
.string "Here at the TRAINER HILL, we conduct\n"
.string "an event called the Time Attack.\p"
.string "It is a race that measures how long\n"
@@ -376,13 +376,13 @@ TrainerHill_Entrance_Text_ExplainTrainerHill: @ 82687C3
.string "be awarded.$"
@ Unused
TrainerHill_Entrance_Text_NeedAtLeastTwoPokemon: @ 826890D
TrainerHill_Entrance_Text_NeedAtLeastTwoPokemon:
.string "Oh, I'm sorry, but you appear to have\n"
.string "only one POKéMON with you.\p"
.string "You will need at least two POKéMON\n"
.string "to enter this event.$"
TrainerHill_Roof_Text_YouFinallyCameBravo: @ 8268986
TrainerHill_Roof_Text_YouFinallyCameBravo:
.string "Hm! Hm!\p"
.string "You finally came!\n"
.string "Yes, you have arrived!\p"
@@ -398,15 +398,15 @@ TrainerHill_Roof_Text_YouFinallyCameBravo: @ 8268986
.string "Anyway, I watched you on your way up.\n"
.string "Marvelous battling! Bravo, indeed!$"
TrainerHill_Roof_Text_HaveTheMostMarvelousGift: @ 8268AC5
TrainerHill_Roof_Text_HaveTheMostMarvelousGift:
.string "For a marvelous someone like you,\n"
.string "I have the most marvelous gift!$"
TrainerHill_Roof_Text_FullUpBeBackLaterForThis: @ 8268B07
TrainerHill_Roof_Text_FullUpBeBackLaterForThis:
.string "Oh, no, full up with things!\n"
.string "You'll be back later for this!$"
TrainerHill_Roof_Text_GotHereMarvelouslyQuickly: @ 8268B43
TrainerHill_Roof_Text_GotHereMarvelouslyQuickly:
.string "Oh, hold on here! Did you possibly get\n"
.string "here marvelously quickly?\p"
.string "How splendid! You needn't have\n"
@@ -414,11 +414,11 @@ TrainerHill_Roof_Text_GotHereMarvelouslyQuickly: @ 8268B43
.string "That is so delightful. I'll have the Time\n"
.string "Board at the reception updated!$"
TrainerHill_Roof_Text_YouWerentVeryQuick: @ 8268C03
TrainerHill_Roof_Text_YouWerentVeryQuick:
.string "But, oh…\n"
.string "You weren't very quick getting here.$"
TrainerHill_Roof_Text_ArriveZippierNextTime: @ 8268C31
TrainerHill_Roof_Text_ArriveZippierNextTime:
.string "Perhaps it would please me more if you\n"
.string "arrived zippier next time.\p"
.string "Then, I should be pleased to form\n"
@@ -426,39 +426,39 @@ TrainerHill_Roof_Text_ArriveZippierNextTime: @ 8268C31
.string "Until we meet again, amigo!$"
@ Unused
TrainerHill_Roof_Text_BuiltTrainerHillToFindPartner: @ 8268CC6
TrainerHill_Roof_Text_BuiltTrainerHillToFindPartner:
.string "I had the TRAINER HILL built for but\n"
.string "one reason and one only!\p"
.string "To find the most suitable partner\n"
.string "with whom I may form a tag team!$"
TrainerHill_Entrance_Text_ChallengeTime: @ 8268D47
TrainerHill_Entrance_Text_ChallengeTime:
.string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$"
TrainerHill_Entrance_Text_WhatSortOfTrainersAreAhead: @ 8268D5A
TrainerHill_Entrance_Text_WhatSortOfTrainersAreAhead:
.string "Who knows what sort of TRAINERS\n"
.string "and POKéMON combos are ahead?\p"
.string "All I know is that I'll knock aside\n"
.string "anyone that stands in my way!$"
TrainerHill_Entrance_Text_CantWaitToTestTheWaters: @ 8268DDA
TrainerHill_Entrance_Text_CantWaitToTestTheWaters:
.string "I heard tough TRAINERS come to this\n"
.string "TRAINER HILL from all over.\p"
.string "I can't wait to test the waters!\p"
.string "I'll knock aside anyone that stands\n"
.string "in my way!$"
TrainerHill_Entrance_Text_FriendsTryingToReachTimeBoardTop: @ 8268E6A
TrainerHill_Entrance_Text_FriendsTryingToReachTimeBoardTop:
.string "Do you see the Time Board over there?\p"
.string "My friends and I are trying to see who\n"
.string "can reach the top in the least time.$"
TrainerHill_Entrance_Text_DoYouKnowWhenTheyOpen: @ 8268EDC
TrainerHill_Entrance_Text_DoYouKnowWhenTheyOpen:
.string "Do you know when they're opening\n"
.string "this place up?\p"
.string "I'm waiting here to be the first\n"
.string "challenger ever!$"
TrainerHill_Elevator_Text_ReturnToReception: @ 8268F3E
TrainerHill_Elevator_Text_ReturnToReception:
.string "Would you like to return to\n"
.string "the reception counter?$"