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/RustboroCity_Gym/scripts.inc
+40 -40
View File
@@ -1,7 +1,7 @@
RustboroCity_Gym_MapScripts:: @ 8212F30
RustboroCity_Gym_MapScripts::
.byte 0
RustboroCity_Gym_EventScript_Roxanne:: @ 8212F31
RustboroCity_Gym_EventScript_Roxanne::
trainerbattle_single TRAINER_ROXANNE_1, RustboroCity_Gym_Text_RoxanneIntro, RustboroCity_Gym_Text_RoxanneDefeat, RustboroCity_Gym_EventScript_RoxanneDefeated, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
@@ -11,7 +11,7 @@ RustboroCity_Gym_EventScript_Roxanne:: @ 8212F31
release
end
RustboroCity_Gym_EventScript_RoxanneDefeated:: @ 8212F66
RustboroCity_Gym_EventScript_RoxanneDefeated::
message RustboroCity_Gym_Text_ReceivedStoneBadge
waitmessage
call Common_EventScript_PlayGymBadgeFanfare
@@ -27,7 +27,7 @@ RustboroCity_Gym_EventScript_RoxanneDefeated:: @ 8212F66
goto RustboroCity_Gym_EventScript_GiveRockTomb
end
RustboroCity_Gym_EventScript_GiveRockTomb:: @ 8212FA4
RustboroCity_Gym_EventScript_GiveRockTomb::
giveitem ITEM_TM39
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
@@ -36,27 +36,27 @@ RustboroCity_Gym_EventScript_GiveRockTomb:: @ 8212FA4
release
end
RustboroCity_Gym_EventScript_RoxanneRematch:: @ 8212FC8
RustboroCity_Gym_EventScript_RoxanneRematch::
trainerbattle_rematch_double TRAINER_ROXANNE_1, RustboroCity_Gym_Text_RoxannePreRematch, RustboroCity_Gym_Text_RoxanneRematchDefeat, RustboroCity_Gym_Text_RoxanneRematchNeedTwoMons
msgbox RustboroCity_Gym_Text_RoxannePostRematch, MSGBOX_AUTOCLOSE
end
RustboroCity_Gym_EventScript_Josh:: @ 8212FE3
RustboroCity_Gym_EventScript_Josh::
trainerbattle_single TRAINER_JOSH, RustboroCity_Gym_Text_JoshIntro, RustboroCity_Gym_Text_JoshDefeat
msgbox RustboroCity_Gym_Text_JoshPostBattle, MSGBOX_AUTOCLOSE
end
RustboroCity_Gym_EventScript_Tommy:: @ 8212FFA
RustboroCity_Gym_EventScript_Tommy::
trainerbattle_single TRAINER_TOMMY, RustboroCity_Gym_Text_TommyIntro, RustboroCity_Gym_Text_TommyDefeat
msgbox RustboroCity_Gym_Text_TommyPostBattle, MSGBOX_AUTOCLOSE
end
RustboroCity_Gym_EventScript_Marc:: @ 8213011
RustboroCity_Gym_EventScript_Marc::
trainerbattle_single TRAINER_MARC, RustboroCity_Gym_Text_MarcIntro, RustboroCity_Gym_Text_MarcDefeat
msgbox RustboroCity_Gym_Text_MarcPostBattle, MSGBOX_AUTOCLOSE
end
RustboroCity_Gym_EventScript_GymGuide:: @ 8213028
RustboroCity_Gym_EventScript_GymGuide::
lock
faceplayer
goto_if_set FLAG_DEFEATED_RUSTBORO_GYM, RustboroCity_Gym_EventScript_GymGuidePostVictory
@@ -64,34 +64,34 @@ RustboroCity_Gym_EventScript_GymGuide:: @ 8213028
release
end
RustboroCity_Gym_EventScript_GymGuidePostVictory:: @ 821303D
RustboroCity_Gym_EventScript_GymGuidePostVictory::
msgbox RustboroCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT
release
end
RustboroCity_Gym_EventScript_LeftGymStatue:: @ 8213047
RustboroCity_Gym_EventScript_LeftGymStatue::
lockall
goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_GymStatueCertified
goto RustboroCity_Gym_EventScript_GymStatue
end
RustboroCity_Gym_EventScript_RightGymStatue:: @ 8213057
RustboroCity_Gym_EventScript_RightGymStatue::
lockall
goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_GymStatueCertified
goto RustboroCity_Gym_EventScript_GymStatue
end
RustboroCity_Gym_EventScript_GymStatueCertified:: @ 8213067
RustboroCity_Gym_EventScript_GymStatueCertified::
msgbox RustboroCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT
releaseall
end
RustboroCity_Gym_EventScript_GymStatue:: @ 8213071
RustboroCity_Gym_EventScript_GymStatue::
msgbox RustboroCity_Gym_Text_GymStatue, MSGBOX_DEFAULT
releaseall
end
RustboroCity_Gym_EventScript_RegisterRoxanne:: @ 821307B
RustboroCity_Gym_EventScript_RegisterRoxanne::
lockall
pokenavcall RustboroCity_Gym_Text_RoxanneRegisterCall
waitmessage
@@ -106,7 +106,7 @@ RustboroCity_Gym_EventScript_RegisterRoxanne:: @ 821307B
releaseall
end
RustboroCity_Gym_Text_GymGuideAdvice: @ 821309D
RustboroCity_Gym_Text_GymGuideAdvice:
.string "Yo, how's it going?\p"
.string "Listen, my friend!\n"
.string "Would you like to become the CHAMPION?\p"
@@ -128,7 +128,7 @@ RustboroCity_Gym_Text_GymGuideAdvice: @ 821309D
.string "the GYM LEADER.\p"
.string "Well, go for it!$"
RustboroCity_Gym_Text_GymGuidePostVictory: @ 82132E2
RustboroCity_Gym_Text_GymGuidePostVictory:
.string "Whoa! What a breathtaking victory!\n"
.string "My cheering must've worked!\p"
.string "Great!\n"
@@ -140,45 +140,45 @@ RustboroCity_Gym_Text_GymGuidePostVictory: @ 82132E2
.string "the stairs to the CHAMPIONSHIP!\p"
.string "That's got to feel awesome!$"
RustboroCity_Gym_Text_JoshIntro: @ 82133E9
RustboroCity_Gym_Text_JoshIntro:
.string "Don't take us GYM TRAINERS lightly!\n"
.string "I'll show you why we're better!$"
RustboroCity_Gym_Text_JoshDefeat: @ 821342D
RustboroCity_Gym_Text_JoshDefeat:
.string "You were too good for me…$"
RustboroCity_Gym_Text_JoshPostBattle: @ 8213447
RustboroCity_Gym_Text_JoshPostBattle:
.string "You haven't seen anything of the ROCK\n"
.string "type's terrifying power!$"
RustboroCity_Gym_Text_TommyIntro: @ 8213486
RustboroCity_Gym_Text_TommyIntro:
.string "If you can't beat me, you won't stand\n"
.string "a chance against ROXANNE!$"
RustboroCity_Gym_Text_TommyDefeat: @ 82134C6
RustboroCity_Gym_Text_TommyDefeat:
.string "Wow! You've got some potential!$"
RustboroCity_Gym_Text_TommyPostBattle: @ 82134E6
RustboroCity_Gym_Text_TommyPostBattle:
.string "ROXANNE is stronger than me by\n"
.string "several times.\p"
.string "You'd better be on your guard!$"
RustboroCity_Gym_Text_MarcIntro: @ 8213533
RustboroCity_Gym_Text_MarcIntro:
.string "We might be in the middle of town,\n"
.string "but so what?\p"
.string "My ROCK POKéMON need room to\n"
.string "rampage!$"
RustboroCity_Gym_Text_MarcDefeat: @ 8213589
RustboroCity_Gym_Text_MarcDefeat:
.string "Oh, man oh man!\n"
.string "Our challenger is one feisty customer!$"
RustboroCity_Gym_Text_MarcPostBattle: @ 82135C0
RustboroCity_Gym_Text_MarcPostBattle:
.string "I have to hand it to our LEADER.\p"
.string "It took smarts and sense for her to\n"
.string "pick the ROCK type at her young age.$"
RustboroCity_Gym_Text_RoxanneIntro: @ 821362A
RustboroCity_Gym_Text_RoxanneIntro:
.string "Hello, I am ROXANNE, the RUSTBORO\n"
.string "POKéMON GYM LEADER.\p"
.string "I became a GYM LEADER so that I might\n"
@@ -187,7 +187,7 @@ RustboroCity_Gym_Text_RoxanneIntro: @ 821362A
.string "Would you kindly demonstrate how you\n"
.string "battle, and with which POKéMON?$"
RustboroCity_Gym_Text_RoxanneDefeat: @ 821370B
RustboroCity_Gym_Text_RoxanneDefeat:
.string "So…\n"
.string "I lost…\p"
.string "It seems that I still have much more\n"
@@ -199,18 +199,18 @@ RustboroCity_Gym_Text_RoxanneDefeat: @ 821370B
.string "Please accept the official POKéMON\n"
.string "LEAGUE STONE BADGE.$"
RustboroCity_Gym_Text_ReceivedStoneBadge: @ 82137EC
RustboroCity_Gym_Text_ReceivedStoneBadge:
.string "{PLAYER} received the STONE BADGE\n"
.string "from ROXANNE.$"
RustboroCity_Gym_Text_StoneBadgeInfoTakeThis: @ 8213816
RustboroCity_Gym_Text_StoneBadgeInfoTakeThis:
.string "The STONE BADGE heightens the ATTACK\n"
.string "power of your POKéMON.\p"
.string "It also enables them to use the HM move\n"
.string "CUT outside of battle.\p"
.string "Please take this with you, too.$"
RustboroCity_Gym_Text_ExplainRockTomb: @ 82138B1
RustboroCity_Gym_Text_ExplainRockTomb:
.string "That TECHNICAL MACHINE, TM39,\n"
.string "contains ROCK TOMB.\p"
.string "It not only inflicts damage by dropping\n"
@@ -220,21 +220,21 @@ RustboroCity_Gym_Text_ExplainRockTomb: @ 82138B1
.string "Remember, a TM can be used only once,\n"
.string "so think before you use it.$"
RustboroCity_Gym_Text_RoxannePostBattle: @ 82139A7
RustboroCity_Gym_Text_RoxannePostBattle:
.string "Since you are so strong, you should\n"
.string "challenge other GYM LEADERS.\p"
.string "By battling many TRAINERS, you should\n"
.string "learn many things.$"
RustboroCity_Gym_Text_GymStatue: @ 8213A21
RustboroCity_Gym_Text_GymStatue:
.string "RUSTBORO CITY POKéMON GYM$"
RustboroCity_Gym_Text_GymStatueCertified: @ 8213A3B
RustboroCity_Gym_Text_GymStatueCertified:
.string "RUSTBORO CITY POKéMON GYM\p"
.string "ROXANNE'S CERTIFIED TRAINERS:\n"
.string "{PLAYER}$"
RustboroCity_Gym_Text_RoxanneRegisterCall: @ 8213A76
RustboroCity_Gym_Text_RoxanneRegisterCall:
.string "… … … … … …\n"
.string "… … … … … Beep!\p"
.string "ROXANNE: Oh, hello, {PLAYER}?\n"
@@ -251,11 +251,11 @@ RustboroCity_Gym_Text_RoxanneRegisterCall: @ 8213A76
.string "… … … … … …\n"
.string "… … … … … Click!$"
RustboroCity_Gym_Text_RegisteredRoxanne: @ 8213C01
RustboroCity_Gym_Text_RegisteredRoxanne:
.string "Registered GYM LEADER ROXANNE\n"
.string "in the POKéNAV.$"
RustboroCity_Gym_Text_RoxannePreRematch: @ 8213C2F
RustboroCity_Gym_Text_RoxannePreRematch:
.string "ROXANNE: I'm so glad to see you again.\n"
.string "I'm ROXANNE, the GYM LEADER here.\p"
.string "I'm sure we've both experienced many\n"
@@ -263,17 +263,17 @@ RustboroCity_Gym_Text_RoxannePreRematch: @ 8213C2F
.string "I would like to see how much better\n"
.string "we've become. Let us battle!$"
RustboroCity_Gym_Text_RoxanneRematchDefeat: @ 8213CF9
RustboroCity_Gym_Text_RoxanneRematchDefeat:
.string "Grr…\n"
.string "Again, I have lost…$"
RustboroCity_Gym_Text_RoxannePostRematch: @ 8213D12
RustboroCity_Gym_Text_RoxannePostRematch:
.string "ROXANNE: I still have much to learn\n"
.string "when it comes to battling POKéMON.\p"
.string "That awareness makes me love battling\n"
.string "all that much more!$"
RustboroCity_Gym_Text_RoxanneRematchNeedTwoMons: @ 8213D93
RustboroCity_Gym_Text_RoxanneRematchNeedTwoMons:
.string "ROXANNE: I'm so glad to see you again.\n"
.string "I'm ROXANNE, the GYM LEADER here.\p"
.string "I'm sure we've both experienced many\n"