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/PewterCity_Gym/scripts.inc
+13 -13
View File
@@ -1,7 +1,7 @@
PewterCity_Gym_MapScripts:: @ 816A592
PewterCity_Gym_MapScripts::
.byte 0
PewterCity_Gym_EventScript_Brock:: @ 816A593
PewterCity_Gym_EventScript_Brock::
famechecker FAMECHECKER_BROCK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle_single TRAINER_LEADER_BROCK, PewterCity_Gym_Text_BrockIntro, PewterCity_Gym_Text_BrockDefeat, PewterCity_Gym_EventScript_DefeatedBrock, NO_MUSIC
goto_if_unset FLAG_GOT_TM39_FROM_BROCK, PewterCity_Gym_EventScript_GiveTM39
@@ -9,7 +9,7 @@ PewterCity_Gym_EventScript_Brock:: @ 816A593
release
end
PewterCity_Gym_EventScript_DefeatedBrock:: @ 816A5C5
PewterCity_Gym_EventScript_DefeatedBrock::
famechecker FAMECHECKER_BROCK, 1
setflag FLAG_DEFEATED_BROCK
setflag FLAG_BADGE01_GET
@@ -20,7 +20,7 @@ PewterCity_Gym_EventScript_DefeatedBrock:: @ 816A5C5
goto PewterCity_Gym_EventScript_GiveTM39
end
PewterCity_Gym_EventScript_GiveTM39:: @ 816A5F3
PewterCity_Gym_EventScript_GiveTM39::
msgbox PewterCity_Gym_Text_TakeThisWithYou
checkitemspace ITEM_TM39, 1
compare VAR_RESULT, FALSE
@@ -31,17 +31,17 @@ PewterCity_Gym_EventScript_GiveTM39:: @ 816A5F3
release
end
PewterCity_Gym_EventScript_NoRoomForTM39:: @ 816A634
PewterCity_Gym_EventScript_NoRoomForTM39::
msgbox PewterCity_Gym_Text_DontHaveRoomForThis
release
end
PewterCity_Gym_EventScript_Liam:: @ 816A63E
PewterCity_Gym_EventScript_Liam::
trainerbattle_single TRAINER_CAMPER_LIAM, PewterCity_Gym_Text_LiamIntro, PewterCity_Gym_Text_LiamDefeat
msgbox PewterCity_Gym_Text_LiamPostBattle, MSGBOX_AUTOCLOSE
end
PewterCity_Gym_EventScript_GymGuy:: @ 816A655
PewterCity_Gym_EventScript_GymGuy::
lock
faceplayer
goto_if_set FLAG_DEFEATED_BROCK, PewterCity_Gym_EventScript_GymGuyPostVictory
@@ -52,34 +52,34 @@ PewterCity_Gym_EventScript_GymGuy:: @ 816A655
goto_if_eq PewterCity_Gym_EventScript_GymGuyDontTakeMeToTop
end
PewterCity_Gym_EventScript_GymGuyPostVictory:: @ 816A67F
PewterCity_Gym_EventScript_GymGuyPostVictory::
msgbox PewterCity_Gym_Text_YoureChampMaterial
release
end
PewterCity_Gym_EventScript_GymGuyTakeMeToTop:: @ 816A689
PewterCity_Gym_EventScript_GymGuyTakeMeToTop::
msgbox PewterCity_Gym_Text_LetsGetHappening
goto PewterCity_Gym_EventScript_GymGuyAdvice
end
PewterCity_Gym_EventScript_GymGuyDontTakeMeToTop:: @ 816A697
PewterCity_Gym_EventScript_GymGuyDontTakeMeToTop::
msgbox PewterCity_Gym_Text_ItsFreeLetsGetHappening
goto PewterCity_Gym_EventScript_GymGuyAdvice
end
PewterCity_Gym_EventScript_GymGuyAdvice:: @ 816A6A5
PewterCity_Gym_EventScript_GymGuyAdvice::
msgbox PewterCity_Gym_Text_TryDifferentPartyOrders
release
end
PewterCity_Gym_EventScript_GymStatue:: @ 816A6AF
PewterCity_Gym_EventScript_GymStatue::
lockall
goto_if_set FLAG_BADGE01_GET, PewterCity_Gym_EventScript_GymStatuePostVictory
msgbox PewterCity_Gym_Text_GymStatue
releaseall
end
PewterCity_Gym_EventScript_GymStatuePostVictory:: @ 816A6C3
PewterCity_Gym_EventScript_GymStatuePostVictory::
msgbox PewterCity_Gym_Text_GymStatuePlayerWon
releaseall
end
data/maps/PewterCity_Gym/text.inc
+17 -17
View File
@@ -1,4 +1,4 @@
PewterCity_Gym_Text_BrockIntro:: @ 8190CD4
PewterCity_Gym_Text_BrockIntro::
.string "So, you're here. I'm BROCK.\n"
.string "I'm PEWTER's GYM LEADER.\p"
.string "My rock-hard willpower is evident\n"
@@ -17,7 +17,7 @@ PewterCity_Gym_Text_BrockIntro:: @ 8190CD4
@ NOTE: This defeat text actually causes a buffer overflow. It's too long for the gDisplayedStringBattle
@ buffer that it's put into, and it stomps all over the gBattleTextBuffs after, as well as the otherwise
@ unused array after that, gUnknown_2022AE8. Perhaps that's the reason why said array exists.
PewterCity_Gym_Text_BrockDefeat:: @ 8190E4F
PewterCity_Gym_Text_BrockDefeat::
.string "I took you for granted, and so\n"
.string "I lost.\p"
.string "As proof of your victory, I confer\n"
@@ -32,15 +32,15 @@ PewterCity_Gym_Text_BrockDefeat:: @ 8190E4F
.string "Of course, a POKéMON must know the\n"
.string "move FLASH to use it.$"
PewterCity_Gym_Text_TakeThisWithYou:: @ 8190FC1
PewterCity_Gym_Text_TakeThisWithYou::
.string "Wait!\n"
.string "Take this with you.$"
PewterCity_Gym_Text_ReceivedTM39FromBrock:: @ 8190FDB
PewterCity_Gym_Text_ReceivedTM39FromBrock::
.string "{PLAYER} received TM39\n"
.string "from BROCK.$"
PewterCity_Gym_Text_ExplainTM39:: @ 8190FF8
PewterCity_Gym_Text_ExplainTM39::
.string "A TM, Technical Machine, contains a\n"
.string "technique for POKéMON.\p"
.string "Using a TM teaches the move it\n"
@@ -53,7 +53,7 @@ PewterCity_Gym_Text_ExplainTM39:: @ 8190FF8
.string "It hurls boulders at the foe and\n"
.string "lowers its SPEED.$"
PewterCity_Gym_Text_BrockPostBattle:: @ 819110F
PewterCity_Gym_Text_BrockPostBattle::
.string "There are all kinds of TRAINERS in\n"
.string "this huge world of ours.\p"
.string "You appear to be very gifted as a\n"
@@ -62,24 +62,24 @@ PewterCity_Gym_Text_BrockPostBattle:: @ 819110F
.string "Go to the GYM in CERULEAN and test\n"
.string "your abilities.$"
PewterCity_Gym_Text_DontHaveRoomForThis:: @ 81911CE
PewterCity_Gym_Text_DontHaveRoomForThis::
.string "You don't have room for this.$"
PewterCity_Gym_Text_LiamIntro:: @ 81911EC
PewterCity_Gym_Text_LiamIntro::
.string "Stop right there, kid!\p"
.string "You're ten thousand light-years \n"
.string "from facing BROCK!$"
PewterCity_Gym_Text_LiamDefeat:: @ 8191237
PewterCity_Gym_Text_LiamDefeat::
.string "Darn!\p"
.string "Light-years isn't time…\n"
.string "It measures distance!$"
PewterCity_Gym_Text_LiamPostBattle:: @ 819126B
PewterCity_Gym_Text_LiamPostBattle::
.string "You're pretty hot.\n"
.string "…But not as hot as BROCK!$"
PewterCity_Gym_Text_LetMeTakeYouToTheTop:: @ 8191298
PewterCity_Gym_Text_LetMeTakeYouToTheTop::
.string "Hiya!\n"
.string "Do you want to dream big?\p"
.string "Do you dare to dream of becoming\n"
@@ -88,11 +88,11 @@ PewterCity_Gym_Text_LetMeTakeYouToTheTop:: @ 8191298
.string "you on how to win.\p"
.string "Let me take you to the top!$"
PewterCity_Gym_Text_LetsGetHappening:: @ 819133C
PewterCity_Gym_Text_LetsGetHappening::
.string "All right!\n"
.string "Let's get happening!$"
PewterCity_Gym_Text_TryDifferentPartyOrders:: @ 819135C
PewterCity_Gym_Text_TryDifferentPartyOrders::
.string "The first POKéMON out in a match is\n"
.string "at the left of the POKéMON LIST.\p"
.string "By changing the order of POKéMON,\n"
@@ -100,21 +100,21 @@ PewterCity_Gym_Text_TryDifferentPartyOrders:: @ 819135C
.string "Try different orders to suit your\n"
.string "opponent's party.$"
PewterCity_Gym_Text_ItsFreeLetsGetHappening:: @ 8191412
PewterCity_Gym_Text_ItsFreeLetsGetHappening::
.string "It's a free service!\n"
.string "Let's get happening!$"
PewterCity_Gym_Text_YoureChampMaterial:: @ 819143C
PewterCity_Gym_Text_YoureChampMaterial::
.string "Just as I thought!\n"
.string "You're POKéMON champ material!$"
PewterCity_Gym_Text_GymStatue:: @ 819146E
PewterCity_Gym_Text_GymStatue::
.string "PEWTER POKéMON GYM\n"
.string "LEADER: BROCK\p"
.string "WINNING TRAINERS:\n"
.string "{RIVAL}$"
PewterCity_Gym_Text_GymStatuePlayerWon:: @ 81914A4
PewterCity_Gym_Text_GymStatuePlayerWon::
.string "PEWTER POKéMON GYM\n"
.string "LEADER: BROCK\p"
.string "WINNING TRAINERS:\n"