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/CeladonCity_Gym/scripts.inc
+14 -14
View File
@@ -1,7 +1,7 @@
CeladonCity_Gym_MapScripts:: @ 816D060
CeladonCity_Gym_MapScripts::
.byte 0
CeladonCity_Gym_EventScript_Erika:: @ 816D061
CeladonCity_Gym_EventScript_Erika::
famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle_single TRAINER_LEADER_ERIKA, CeladonCity_Gym_Text_ErikaIntro, CeladonCity_Gym_Text_ErikaDefeat, CeladonCity_Gym_EventScript_DefeatedErika, NO_MUSIC
goto_if_unset FLAG_GOT_TM19_FROM_ERIKA, CeladonCity_Gym_EventScript_GiveTM19
@@ -10,7 +10,7 @@ CeladonCity_Gym_EventScript_Erika:: @ 816D061
release
end
CeladonCity_Gym_EventScript_DefeatedErika:: @ 816D0A0
CeladonCity_Gym_EventScript_DefeatedErika::
famechecker FAMECHECKER_ERIKA, 1
clearflag FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS
setflag FLAG_DEFEATED_ERIKA
@@ -19,7 +19,7 @@ CeladonCity_Gym_EventScript_DefeatedErika:: @ 816D0A0
goto CeladonCity_Gym_EventScript_GiveTM19
end
CeladonCity_Gym_EventScript_GiveTM19:: @ 816D0C6
CeladonCity_Gym_EventScript_GiveTM19::
msgbox CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis
checkitemspace ITEM_TM19, 1
compare VAR_RESULT, FALSE
@@ -30,56 +30,56 @@ CeladonCity_Gym_EventScript_GiveTM19:: @ 816D0C6
release
end
CeladonCity_Gym_EventScript_NoRoomForTM19:: @ 816D107
CeladonCity_Gym_EventScript_NoRoomForTM19::
msgbox CeladonCity_Gym_Text_ShouldMakeRoomForThis
release
end
CeladonCity_Gym_EventScript_Kay:: @ 816D111
CeladonCity_Gym_EventScript_Kay::
trainerbattle_single TRAINER_LASS_KAY, CeladonCity_Gym_Text_KayIntro, CeladonCity_Gym_Text_KayDefeat
msgbox CeladonCity_Gym_Text_KayPostBattle, MSGBOX_AUTOCLOSE
end
CeladonCity_Gym_EventScript_Lisa:: @ 816D128
CeladonCity_Gym_EventScript_Lisa::
trainerbattle_single TRAINER_LASS_LISA, CeladonCity_Gym_Text_LisaIntro, CeladonCity_Gym_Text_LisaDefeat
famechecker FAMECHECKER_ERIKA, 2
msgbox CeladonCity_Gym_Text_LisaPostBattle, MSGBOX_AUTOCLOSE
end
CeladonCity_Gym_EventScript_Tina:: @ 816D14C
CeladonCity_Gym_EventScript_Tina::
trainerbattle_single TRAINER_PICNICKER_TINA, CeladonCity_Gym_Text_TinaIntro, CeladonCity_Gym_Text_TinaDefeat
msgbox CeladonCity_Gym_Text_TinaPostBattle, MSGBOX_AUTOCLOSE
end
CeladonCity_Gym_EventScript_Bridget:: @ 816D163
CeladonCity_Gym_EventScript_Bridget::
trainerbattle_single TRAINER_BEAUTY_BRIDGET, CeladonCity_Gym_Text_BridgetIntro, CeladonCity_Gym_Text_BridgetDefeat
msgbox CeladonCity_Gym_Text_BridgetPostBattle, MSGBOX_AUTOCLOSE
end
CeladonCity_Gym_EventScript_Tamia:: @ 816D17A
CeladonCity_Gym_EventScript_Tamia::
trainerbattle_single TRAINER_BEAUTY_TAMIA, CeladonCity_Gym_Text_TamiaIntro, CeladonCity_Gym_Text_TamiaDefeat
famechecker FAMECHECKER_ERIKA, 3
msgbox CeladonCity_Gym_Text_TamiaPostBattle, MSGBOX_AUTOCLOSE
end
CeladonCity_Gym_EventScript_Lori:: @ 816D19E
CeladonCity_Gym_EventScript_Lori::
trainerbattle_single TRAINER_BEAUTY_LORI, CeladonCity_Gym_Text_LoriIntro, CeladonCity_Gym_Text_LoriDefeat
msgbox CeladonCity_Gym_Text_LoriPostBattle, MSGBOX_AUTOCLOSE
end
CeladonCity_Gym_EventScript_Mary:: @ 816D1B5
CeladonCity_Gym_EventScript_Mary::
trainerbattle_single TRAINER_COOLTRAINER_MARY, CeladonCity_Gym_Text_MaryIntro, CeladonCity_Gym_Text_MaryDefeat
msgbox CeladonCity_Gym_Text_MaryPostBattle, MSGBOX_AUTOCLOSE
end
CeladonCity_Gym_EventScript_GymStatue:: @ 816D1CC
CeladonCity_Gym_EventScript_GymStatue::
lockall
goto_if_set FLAG_BADGE04_GET, CeladonCity_Gym_EventScript_GymStatuePostVictory
msgbox CeladonCity_Gym_Text_GymStatue
releaseall
end
CeladonCity_Gym_EventScript_GymStatuePostVictory:: @ 816D1E0
CeladonCity_Gym_EventScript_GymStatuePostVictory::
msgbox CeladonCity_Gym_Text_GymStatuePlayerWon
releaseall
end
data/maps/CeladonCity_Gym/text.inc
+30 -30
View File
@@ -1,4 +1,4 @@
CeladonCity_Gym_Text_ErikaIntro:: @ 8197114
CeladonCity_Gym_Text_ErikaIntro::
.string "Hello…\n"
.string "Lovely weather, isn't it?\l"
.string "It's so pleasant…\p"
@@ -14,137 +14,137 @@ CeladonCity_Gym_Text_ErikaIntro:: @ 8197114
.string "you wished to challenge me.\p"
.string "Very well, but I shall not lose.{PLAY_BGM MUS_ENCOUNTER_GYM_LEADER}$"
CeladonCity_Gym_Text_ErikaDefeat:: @ 8197260
CeladonCity_Gym_Text_ErikaDefeat::
.string "Oh!\n"
.string "I concede defeat.\l"
.string "You are remarkably strong.\p"
.string "I must confer on you the\n"
.string "RAINBOWBADGE.$"
CeladonCity_Gym_Text_ErikaPostBattle:: @ 81972B8
CeladonCity_Gym_Text_ErikaPostBattle::
.string "You are cataloging POKéMON?\n"
.string "I must say I'm impressed.\p"
.string "I would never collect POKéMON if\n"
.string "they were unattractive.$"
CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis:: @ 8197327
CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis::
.string "The RAINBOWBADGE will make\n"
.string "POKéMON up to Lv. 50 obey.\p"
.string "It also allows POKéMON to use\n"
.string "STRENGTH in and out of battle.\p"
.string "Please also take this with you.$"
CeladonCity_Gym_Text_ReceivedTM19FromErika:: @ 81973BA
CeladonCity_Gym_Text_ReceivedTM19FromErika::
.string "{PLAYER} received TM19\n"
.string "from ERIKA.$"
CeladonCity_Gym_Text_ExplainTM19:: @ 81973D7
CeladonCity_Gym_Text_ExplainTM19::
.string "TM19 contains GIGA DRAIN.\p"
.string "Half the damage it inflicts is\n"
.string "drained to heal your POKéMON.\p"
.string "Wouldn't you agree that it's a\n"
.string "wonderful move?$"
CeladonCity_Gym_Text_ShouldMakeRoomForThis:: @ 819745D
CeladonCity_Gym_Text_ShouldMakeRoomForThis::
.string "You should make room for this.$"
CeladonCity_Gym_Text_KayIntro:: @ 819747C
CeladonCity_Gym_Text_KayIntro::
.string "I should tell you about this GYM.\p"
.string "Only real ladies are allowed in\n"
.string "here!$"
CeladonCity_Gym_Text_KayDefeat:: @ 81974C4
CeladonCity_Gym_Text_KayDefeat::
.string "You're too rough!$"
CeladonCity_Gym_Text_KayPostBattle:: @ 81974D6
CeladonCity_Gym_Text_KayPostBattle::
.string "Bleaah!\n"
.string "I hope ERIKA wipes you out!$"
CeladonCity_Gym_Text_BridgetIntro:: @ 81974FA
CeladonCity_Gym_Text_BridgetIntro::
.string "Oh, welcome.\n"
.string "I was getting bored.$"
CeladonCity_Gym_Text_BridgetDefeat:: @ 819751C
CeladonCity_Gym_Text_BridgetDefeat::
.string "My makeup!$"
CeladonCity_Gym_Text_BridgetPostBattle:: @ 8197527
CeladonCity_Gym_Text_BridgetPostBattle::
.string "GRASS-type POKéMON are tough\n"
.string "against the WATER type.\p"
.string "They also have an edge on ROCK-\n"
.string "and GROUND-type POKéMON.$"
CeladonCity_Gym_Text_TinaIntro:: @ 8197595
CeladonCity_Gym_Text_TinaIntro::
.string "…Weren't you peeking in here\n"
.string "earlier?$"
CeladonCity_Gym_Text_TinaDefeat:: @ 81975BB
CeladonCity_Gym_Text_TinaDefeat::
.string "You're an eye-opener!$"
CeladonCity_Gym_Text_TinaPostBattle:: @ 81975D1
CeladonCity_Gym_Text_TinaPostBattle::
.string "Oh, you were looking at ERIKA…\n"
.string "You weren't looking at me…$"
CeladonCity_Gym_Text_TamiaIntro:: @ 819760B
CeladonCity_Gym_Text_TamiaIntro::
.string "Look, look!\n"
.string "See my POKéMON!\p"
.string "I like the GRASS type.\n"
.string "I like how they're easy to raise.$"
CeladonCity_Gym_Text_TamiaDefeat:: @ 8197660
CeladonCity_Gym_Text_TamiaDefeat::
.string "No!$"
CeladonCity_Gym_Text_TamiaPostBattle:: @ 8197664
CeladonCity_Gym_Text_TamiaPostBattle::
.string "We only use GRASS-type POKéMON at\n"
.string "our GYM.\p"
.string "Why? We also use them for making\n"
.string "flower arrangements!$"
CeladonCity_Gym_Text_LisaIntro:: @ 81976C5
CeladonCity_Gym_Text_LisaIntro::
.string "Oh, hey!\p"
.string "We don't like BUG- or FIRE-type\n"
.string "POKéMON in here!$"
CeladonCity_Gym_Text_LisaDefeat:: @ 81976FF
CeladonCity_Gym_Text_LisaDefeat::
.string "Oh!\n"
.string "You!$"
CeladonCity_Gym_Text_LisaPostBattle:: @ 8197708
CeladonCity_Gym_Text_LisaPostBattle::
.string "Our LEADER ERIKA might be quiet,\n"
.string "but she's famous around here.$"
CeladonCity_Gym_Text_LoriIntro:: @ 8197747
CeladonCity_Gym_Text_LoriIntro::
.string "Pleased to meet you.\n"
.string "My hobby is POKéMON training.$"
CeladonCity_Gym_Text_LoriDefeat:: @ 819777A
CeladonCity_Gym_Text_LoriDefeat::
.string "Oh!\n"
.string "Splendid!$"
CeladonCity_Gym_Text_LoriPostBattle:: @ 8197788
CeladonCity_Gym_Text_LoriPostBattle::
.string "I have a blind date coming up.\n"
.string "I have to learn to be polite,\l"
.string "especially if I have to battle.$"
CeladonCity_Gym_Text_MaryIntro:: @ 81977E5
CeladonCity_Gym_Text_MaryIntro::
.string "Welcome to CELADON GYM!\p"
.string "You'd better not underestimate\n"
.string "the nice ladies here.$"
CeladonCity_Gym_Text_MaryDefeat:: @ 8197832
CeladonCity_Gym_Text_MaryDefeat::
.string "Oh!\n"
.string "Beaten!$"
CeladonCity_Gym_Text_MaryPostBattle:: @ 819783E
CeladonCity_Gym_Text_MaryPostBattle::
.string "I didn't bring my best POKéMON.\n"
.string "Wait until next time!$"
CeladonCity_Gym_Text_GymStatue:: @ 8197874
CeladonCity_Gym_Text_GymStatue::
.string "CELADON POKéMON GYM\n"
.string "LEADER: ERIKA\p"
.string "WINNING TRAINERS:\n"
.string "{RIVAL}$"
CeladonCity_Gym_Text_GymStatuePlayerWon:: @ 81978AB
CeladonCity_Gym_Text_GymStatuePlayerWon::
.string "CELADON POKéMON GYM\n"
.string "LEADER: ERIKA\p"
.string "WINNING TRAINERS:\n"