dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove address comments

Browse Source
This commit is contained in:
GriffinR
2022-06-24 21:10:48 -04:00
parent d73f39ae40
commit 9cde4e0f74
802 changed files with 20272 additions and 20272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeruleanCity_Gym/scripts.inc
+11 -11
View File
@@ -1,7 +1,7 @@
CeruleanCity_Gym_MapScripts:: @ 816AAA0
CeruleanCity_Gym_MapScripts::
.byte 0
CeruleanCity_Gym_EventScript_Misty:: @ 816AAA1
CeruleanCity_Gym_EventScript_Misty::
famechecker FAMECHECKER_MISTY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle_single TRAINER_LEADER_MISTY, CeruleanCity_Gym_Text_MistyIntro, CeruleanCity_Gym_Text_MistyDefeat, CeruleanCity_Gym_EventScript_MistyDefeated, NO_MUSIC
goto_if_unset FLAG_GOT_TM03_FROM_MISTY, CeruleanCity_Gym_EventScript_GiveTM03
@@ -9,7 +9,7 @@ CeruleanCity_Gym_EventScript_Misty:: @ 816AAA1
release
end
CeruleanCity_Gym_EventScript_MistyDefeated:: @ 816AAD3
CeruleanCity_Gym_EventScript_MistyDefeated::
famechecker FAMECHECKER_MISTY, 1
setflag FLAG_DEFEATED_MISTY
setflag FLAG_BADGE02_GET
@@ -18,7 +18,7 @@ CeruleanCity_Gym_EventScript_MistyDefeated:: @ 816AAD3
goto CeruleanCity_Gym_EventScript_GiveTM03
end
CeruleanCity_Gym_EventScript_GiveTM03:: @ 816AAF9
CeruleanCity_Gym_EventScript_GiveTM03::
msgbox CeruleanCity_Gym_Text_ExplainCascadeBadge
checkitemspace ITEM_TM03, 1
compare VAR_RESULT, FALSE
@@ -29,23 +29,23 @@ CeruleanCity_Gym_EventScript_GiveTM03:: @ 816AAF9
release
end
CeruleanCity_Gym_EventScript_NoRoomForTM03:: @ 816AB3A
CeruleanCity_Gym_EventScript_NoRoomForTM03::
msgbox CeruleanCity_Gym_Text_BetterMakeRoomForThis
release
end
CeruleanCity_Gym_EventScript_Diana:: @ 816AB44
CeruleanCity_Gym_EventScript_Diana::
trainerbattle_single TRAINER_PICNICKER_DIANA, CeruleanCity_Gym_Text_DianaIntro, CeruleanCity_Gym_Text_DianaDefeat
msgbox CeruleanCity_Gym_Text_DianaPostBattle, MSGBOX_AUTOCLOSE
end
CeruleanCity_Gym_EventScript_Luis:: @ 816AB5B
CeruleanCity_Gym_EventScript_Luis::
trainerbattle_single TRAINER_SWIMMER_MALE_LUIS, CeruleanCity_Gym_Text_LuisIntro, CeruleanCity_Gym_Text_LuisDefeat
famechecker FAMECHECKER_MISTY, 2
msgbox CeruleanCity_Gym_Text_LuisPostBattle, MSGBOX_AUTOCLOSE
end
CeruleanCity_Gym_EventScript_GymGuy:: @ 816AB7F
CeruleanCity_Gym_EventScript_GymGuy::
lock
faceplayer
goto_if_set FLAG_DEFEATED_MISTY, CeruleanCity_Gym_EventScript_GymGuyPostVictory
@@ -53,19 +53,19 @@ CeruleanCity_Gym_EventScript_GymGuy:: @ 816AB7F
release
end
CeruleanCity_Gym_EventScript_GymGuyPostVictory:: @ 816AB94
CeruleanCity_Gym_EventScript_GymGuyPostVictory::
msgbox CeruleanCity_Gym_Text_WeMakePrettyGoodTeam
release
end
CeruleanCity_Gym_EventScript_GymStatue:: @ 816AB9E
CeruleanCity_Gym_EventScript_GymStatue::
lockall
goto_if_set FLAG_BADGE02_GET, CeruleanCity_Gym_EventScript_GymStatuePostVictory
msgbox CeruleanCity_Gym_Text_GymStatue
releaseall
end
CeruleanCity_Gym_EventScript_GymStatuePostVictory:: @ 816ABB2
CeruleanCity_Gym_EventScript_GymStatuePostVictory::
msgbox CeruleanCity_Gym_Text_GymStatuePlayerWon
releaseall
end
data/maps/CeruleanCity_Gym/text.inc
+16 -16
View File
@@ -1,4 +1,4 @@
CeruleanCity_Gym_Text_MistyIntro:: @ 81921EF
CeruleanCity_Gym_Text_MistyIntro::
.string "Hi, you're a new face!\p"
.string "Only those TRAINERS who have a\n"
.string "policy about POKéMON can turn pro.\p"
@@ -7,11 +7,11 @@ CeruleanCity_Gym_Text_MistyIntro:: @ 81921EF
.string "My policy is an all-out offensive\n"
.string "with WATER-type POKéMON!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$"
CeruleanCity_Gym_Text_ExplainTM03:: @ 81922BF
CeruleanCity_Gym_Text_ExplainTM03::
.string "TM03 teaches WATER PULSE.\p"
.string "Use it on an aquatic POKéMON!$"
CeruleanCity_Gym_Text_ExplainCascadeBadge:: @ 81922F7
CeruleanCity_Gym_Text_ExplainCascadeBadge::
.string "The CASCADEBADGE makes all\n"
.string "POKéMON up to Lv. 30 obey.\p"
.string "That includes even outsiders you\n"
@@ -22,46 +22,46 @@ CeruleanCity_Gym_Text_ExplainCascadeBadge:: @ 81922F7
.string "open new pathways.\p"
.string "You can also have my favorite TM.$"
CeruleanCity_Gym_Text_ReceivedTM03FromMisty:: @ 81923F1
CeruleanCity_Gym_Text_ReceivedTM03FromMisty::
.string "{PLAYER} received TM03\n"
.string "from MISTY.$"
CeruleanCity_Gym_Text_BetterMakeRoomForThis:: @ 819240E
CeruleanCity_Gym_Text_BetterMakeRoomForThis::
.string "You better make room for this!$"
CeruleanCity_Gym_Text_MistyDefeat:: @ 819242D
CeruleanCity_Gym_Text_MistyDefeat::
.string "Wow!\n"
.string "You're too much!\p"
.string "All right!\p"
.string "You can have the CASCADEBADGE to\n"
.string "show you beat me.$"
CeruleanCity_Gym_Text_DianaIntro:: @ 8192481
CeruleanCity_Gym_Text_DianaIntro::
.string "What? You?\n"
.string "I'm more than good enough for you!\p"
.string "MISTY won't have to be bothered.$"
CeruleanCity_Gym_Text_DianaDefeat:: @ 81924D0
CeruleanCity_Gym_Text_DianaDefeat::
.string "You overwhelmed me!$"
CeruleanCity_Gym_Text_DianaPostBattle:: @ 81924E4
CeruleanCity_Gym_Text_DianaPostBattle::
.string "You have to face other TRAINERS\n"
.string "to see how good you really are.$"
CeruleanCity_Gym_Text_LuisIntro:: @ 8192524
CeruleanCity_Gym_Text_LuisIntro::
.string "Splash!\p"
.string "I'm first up!\n"
.string "Let's do it!$"
CeruleanCity_Gym_Text_LuisDefeat:: @ 8192547
CeruleanCity_Gym_Text_LuisDefeat::
.string "That can't be!$"
CeruleanCity_Gym_Text_LuisPostBattle:: @ 8192556
CeruleanCity_Gym_Text_LuisPostBattle::
.string "MISTY is a TRAINER who's going to\n"
.string "keep improving.\p"
.string "She won't lose to someone like you!$"
CeruleanCity_Gym_Text_GymGuyAdvice:: @ 81925AC
CeruleanCity_Gym_Text_GymGuyAdvice::
.string "Yo!\n"
.string "Champ in the making!\p"
.string "Let me give you some advice!\p"
@@ -72,19 +72,19 @@ CeruleanCity_Gym_Text_GymGuyAdvice:: @ 81925AC
.string "Or, you might use ELECTRIC-type\n"
.string "POKéMON and zap them!$"
CeruleanCity_Gym_Text_WeMakePrettyGoodTeam:: @ 8192688
CeruleanCity_Gym_Text_WeMakePrettyGoodTeam::
.string "You beat MISTY!\n"
.string "See, what'd I tell ya?\p"
.string "You and me, kid, we make a pretty\n"
.string "darn-good team!$"
CeruleanCity_Gym_Text_GymStatue:: @ 81926E1
CeruleanCity_Gym_Text_GymStatue::
.string "CERULEAN POKéMON GYM\n"
.string "LEADER: MISTY\p"
.string "WINNING TRAINERS:\n"
.string "{RIVAL}$"
CeruleanCity_Gym_Text_GymStatuePlayerWon:: @ 8192719
CeruleanCity_Gym_Text_GymStatuePlayerWon::
.string "CERULEAN POKéMON GYM\n"
.string "LEADER: MISTY\p"
.string "WINNING TRAINERS:\n"