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/ViridianCity_Gym/scripts.inc
+17 -17
View File
@@ -1,9 +1,9 @@
.set LOCALID_GIOVANNI, 8
ViridianCity_Gym_MapScripts:: @ 8169EC9
ViridianCity_Gym_MapScripts::
.byte 0
ViridianCity_Gym_EventScript_Giovanni:: @ 8169ECA
ViridianCity_Gym_EventScript_Giovanni::
famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle_single TRAINER_LEADER_GIOVANNI, ViridianCity_Gym_Text_GiovanniIntro, ViridianCity_Gym_Text_GiovanniDefeat, ViridianCity_Gym_EventScript_DefeatedGiovanni, NO_MUSIC
goto_if_unset FLAG_GOT_TM26_FROM_GIOVANNI, ViridianCity_Gym_EventScript_GiveTM26
@@ -15,7 +15,7 @@ ViridianCity_Gym_EventScript_Giovanni:: @ 8169ECA
release
end
ViridianCity_Gym_EventScript_DefeatedGiovanni:: @ 8169F04
ViridianCity_Gym_EventScript_DefeatedGiovanni::
famechecker FAMECHECKER_GIOVANNI, 3
setflag FLAG_HIDE_MISC_KANTO_ROCKETS
setflag FLAG_DEFEATED_LEADER_GIOVANNI
@@ -25,7 +25,7 @@ ViridianCity_Gym_EventScript_DefeatedGiovanni:: @ 8169F04
goto ViridianCity_Gym_EventScript_GiveTM26
end
ViridianCity_Gym_EventScript_GiveTM26:: @ 8169F2F
ViridianCity_Gym_EventScript_GiveTM26::
msgbox ViridianCity_Gym_Text_ExplainEarthBadgeTakeThis
checkitemspace ITEM_TM26, 1
compare VAR_RESULT, FALSE
@@ -36,52 +36,52 @@ ViridianCity_Gym_EventScript_GiveTM26:: @ 8169F2F
release
end
ViridianCity_Gym_EventScript_NoRoomForTM26:: @ 8169F70
ViridianCity_Gym_EventScript_NoRoomForTM26::
msgbox ViridianCity_Gym_Text_YouDoNotHaveSpace
release
end
ViridianCity_Gym_EventScript_Jason:: @ 8169F7A
ViridianCity_Gym_EventScript_Jason::
trainerbattle_single TRAINER_TAMER_JASON, ViridianCity_Gym_Text_JasonIntro, ViridianCity_Gym_Text_JasonDefeat
msgbox ViridianCity_Gym_Text_JasonPostBattle, MSGBOX_AUTOCLOSE
end
ViridianCity_Gym_EventScript_Cole:: @ 8169F91
ViridianCity_Gym_EventScript_Cole::
trainerbattle_single TRAINER_TAMER_COLE, ViridianCity_Gym_Text_ColeIntro, ViridianCity_Gym_Text_ColeDefeat
msgbox ViridianCity_Gym_Text_ColePostBattle, MSGBOX_AUTOCLOSE
end
ViridianCity_Gym_EventScript_Atsushi:: @ 8169FA8
ViridianCity_Gym_EventScript_Atsushi::
trainerbattle_single TRAINER_BLACK_BELT_ATSUSHI, ViridianCity_Gym_Text_AtsushiIntro, ViridianCity_Gym_Text_AtsushiDefeat
msgbox ViridianCity_Gym_Text_AtsushiPostBattle, MSGBOX_AUTOCLOSE
end
ViridianCity_Gym_EventScript_Kiyo:: @ 8169FBF
ViridianCity_Gym_EventScript_Kiyo::
trainerbattle_single TRAINER_BLACK_BELT_KIYO, ViridianCity_Gym_Text_KiyoIntro, ViridianCity_Gym_Text_KiyoDefeat
msgbox ViridianCity_Gym_Text_KiyoPostBattle, MSGBOX_AUTOCLOSE
end
ViridianCity_Gym_EventScript_Takashi:: @ 8169FD6
ViridianCity_Gym_EventScript_Takashi::
trainerbattle_single TRAINER_BLACK_BELT_TAKASHI, ViridianCity_Gym_Text_TakashiIntro, ViridianCity_Gym_Text_TakashiDefeat
msgbox ViridianCity_Gym_Text_TakashiPostBattle, MSGBOX_AUTOCLOSE
end
ViridianCity_Gym_EventScript_Samuel:: @ 8169FED
ViridianCity_Gym_EventScript_Samuel::
trainerbattle_single TRAINER_COOLTRAINER_SAMUEL, ViridianCity_Gym_Text_SamuelIntro, ViridianCity_Gym_Text_SamuelDefeat
msgbox ViridianCity_Gym_Text_SamuelPostBattle, MSGBOX_AUTOCLOSE
end
ViridianCity_Gym_EventScript_Yuji:: @ 816A004
ViridianCity_Gym_EventScript_Yuji::
trainerbattle_single TRAINER_COOLTRAINER_YUJI, ViridianCity_Gym_Text_YujiIntro, ViridianCity_Gym_Text_YujiDefeat
msgbox ViridianCity_Gym_Text_YujiPostBattle, MSGBOX_AUTOCLOSE
end
ViridianCity_Gym_EventScript_Warren:: @ 816A01B
ViridianCity_Gym_EventScript_Warren::
trainerbattle_single TRAINER_COOLTRAINER_WARREN, ViridianCity_Gym_Text_WarrenIntro, ViridianCity_Gym_Text_WarrenDefeat
msgbox ViridianCity_Gym_Text_WarrenPostBattle, MSGBOX_AUTOCLOSE
end
ViridianCity_Gym_EventScript_GymGuy:: @ 816A032
ViridianCity_Gym_EventScript_GymGuy::
lock
faceplayer
goto_if_set FLAG_DEFEATED_LEADER_GIOVANNI, ViridianCity_Gym_EventScript_GymGuyPostVictory
@@ -89,20 +89,20 @@ ViridianCity_Gym_EventScript_GymGuy:: @ 816A032
release
end
ViridianCity_Gym_EventScript_GymGuyPostVictory:: @ 816A047
ViridianCity_Gym_EventScript_GymGuyPostVictory::
famechecker FAMECHECKER_GIOVANNI, 4
msgbox ViridianCity_Gym_Text_GymGuyPostVictory
release
end
ViridianCity_Gym_EventScript_GymStatue:: @ 816A05E
ViridianCity_Gym_EventScript_GymStatue::
lockall
goto_if_set FLAG_BADGE08_GET, ViridianCity_Gym_EventScript_GymStatuePostVictory
msgbox ViridianCity_Gym_Text_GymStatue
releaseall
end
ViridianCity_Gym_EventScript_GymStatuePostVictory:: @ 816A072
ViridianCity_Gym_EventScript_GymStatuePostVictory::
msgbox ViridianCity_Gym_Text_GymStatuePlayerWon
releaseall
end
data/maps/ViridianCity_Gym/text.inc
+35 -35
View File
@@ -1,4 +1,4 @@
ViridianCity_Gym_Text_GiovanniIntro:: @ 818F352
ViridianCity_Gym_Text_GiovanniIntro::
.string "Fwahahaha!\n"
.string "Welcome to my hideout!\p"
.string "It shall be so until I can restore\n"
@@ -9,14 +9,14 @@ ViridianCity_Gym_Text_GiovanniIntro:: @ 818F352
.string "Once more, you shall face\n"
.string "GIOVANNI, the greatest TRAINER!{PLAY_BGM}{MUS_ENCOUNTER_ROCKET}$"
ViridianCity_Gym_Text_GiovanniDefeat:: @ 818F43F
ViridianCity_Gym_Text_GiovanniDefeat::
.string "Ha!\n"
.string "That was a truly intense fight.\l"
.string "You have won!\p"
.string "As proof, here is the EARTHBADGE!\n"
.string "{PAUSE_MUSIC}{PLAY_BGM}{MUS_OBTAIN_BADGE}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}$"
ViridianCity_Gym_Text_GiovanniPostBattle:: @ 818F4A2
ViridianCity_Gym_Text_GiovanniPostBattle::
.string "Having lost in this fashion, \n"
.string "I can't face my followers.\l"
.string "I have betrayed their trust.\p"
@@ -27,7 +27,7 @@ ViridianCity_Gym_Text_GiovanniPostBattle:: @ 818F4A2
.string "Let us meet again someday!\n"
.string "Farewell!$"
ViridianCity_Gym_Text_ExplainEarthBadgeTakeThis:: @ 818F586
ViridianCity_Gym_Text_ExplainEarthBadgeTakeThis::
.string "The EARTHBADGE makes POKéMON of\n"
.string "any level obey without question.\p"
.string "It is evidence of your mastery as\n"
@@ -38,111 +38,111 @@ ViridianCity_Gym_Text_ExplainEarthBadgeTakeThis:: @ 818F586
.string "Consider it a gift for your POKéMON\n"
.string "LEAGUE challenge.$"
ViridianCity_Gym_Text_ReceivedTM26FromGiovanni:: @ 818F675
ViridianCity_Gym_Text_ReceivedTM26FromGiovanni::
.string "{PLAYER} received TM26\n"
.string "from GIOVANNI.$"
ViridianCity_Gym_Text_ExplainTM26:: @ 818F695
ViridianCity_Gym_Text_ExplainTM26::
.string "TM26 contains EARTHQUAKE.\p"
.string "It is a powerful attack that causes\n"
.string "a massive tremor.\p"
.string "I made it when I ran the GYM here,\n"
.string "far too long ago… $"
ViridianCity_Gym_Text_YouDoNotHaveSpace:: @ 818F71B
ViridianCity_Gym_Text_YouDoNotHaveSpace::
.string "You do not have space for this!$"
ViridianCity_Gym_Text_YujiIntro:: @ 818F73B
ViridianCity_Gym_Text_YujiIntro::
.string "Heh!\n"
.string "You must be running out of steam\l"
.string "by now!$"
ViridianCity_Gym_Text_YujiDefeat:: @ 818F769
ViridianCity_Gym_Text_YujiDefeat::
.string "I ran out of gas!$"
ViridianCity_Gym_Text_YujiPostBattle:: @ 818F77B
ViridianCity_Gym_Text_YujiPostBattle::
.string "You'll need power to keep up with\n"
.string "our GYM LEADER.$"
ViridianCity_Gym_Text_AtsushiIntro:: @ 818F7AD
ViridianCity_Gym_Text_AtsushiIntro::
.string "Rrrroar!\n"
.string "I'm working myself into a rage!$"
ViridianCity_Gym_Text_AtsushiDefeat:: @ 818F7D6
ViridianCity_Gym_Text_AtsushiDefeat::
.string "Wargh!$"
ViridianCity_Gym_Text_AtsushiPostBattle:: @ 818F7DD
ViridianCity_Gym_Text_AtsushiPostBattle::
.string "I'm still not worthy!$"
ViridianCity_Gym_Text_JasonIntro:: @ 818F7F3
ViridianCity_Gym_Text_JasonIntro::
.string "POKéMON and I, we make wonderful\n"
.string "music together!$"
ViridianCity_Gym_Text_JasonDefeat:: @ 818F824
ViridianCity_Gym_Text_JasonDefeat::
.string "You are in perfect harmony!$"
ViridianCity_Gym_Text_JasonPostBattle:: @ 818F840
ViridianCity_Gym_Text_JasonPostBattle::
.string "Do you know the identity of our\n"
.string "GYM LEADER?$"
ViridianCity_Gym_Text_KiyoIntro:: @ 818F86C
ViridianCity_Gym_Text_KiyoIntro::
.string "Karate is the ultimate form of\n"
.string "martial arts!$"
ViridianCity_Gym_Text_KiyoDefeat:: @ 818F899
ViridianCity_Gym_Text_KiyoDefeat::
.string "Aiyah!$"
ViridianCity_Gym_Text_KiyoPostBattle:: @ 818F8A0
ViridianCity_Gym_Text_KiyoPostBattle::
.string "If my POKéMON were as good at\n"
.string "karate as I…$"
ViridianCity_Gym_Text_WarrenIntro:: @ 818F8CB
ViridianCity_Gym_Text_WarrenIntro::
.string "The truly talented win with style.$"
ViridianCity_Gym_Text_WarrenDefeat:: @ 818F8EE
ViridianCity_Gym_Text_WarrenDefeat::
.string "I lost my grip!$"
ViridianCity_Gym_Text_WarrenPostBattle:: @ 818F8FE
ViridianCity_Gym_Text_WarrenPostBattle::
.string "The LEADER will scold me for\n"
.string "losing this way…$"
ViridianCity_Gym_Text_TakashiIntro:: @ 818F92C
ViridianCity_Gym_Text_TakashiIntro::
.string "I'm the KARATE KING!\n"
.string "Your fate rests with me!$"
ViridianCity_Gym_Text_TakashiDefeat:: @ 818F95A
ViridianCity_Gym_Text_TakashiDefeat::
.string "Ayah!$"
ViridianCity_Gym_Text_TakashiPostBattle:: @ 818F960
ViridianCity_Gym_Text_TakashiPostBattle::
.string "The POKéMON LEAGUE?\n"
.string "You? Don't get cocky!$"
ViridianCity_Gym_Text_ColeIntro:: @ 818F98A
ViridianCity_Gym_Text_ColeIntro::
.string "Your POKéMON will cower at the\n"
.string "crack of my whip!$"
ViridianCity_Gym_Text_ColeDefeat:: @ 818F9BB
ViridianCity_Gym_Text_ColeDefeat::
.string "Yowch!\n"
.string "Whiplash!$"
ViridianCity_Gym_Text_ColePostBattle:: @ 818F9CC
ViridianCity_Gym_Text_ColePostBattle::
.string "Wait!\n"
.string "I was just careless!$"
ViridianCity_Gym_Text_SamuelIntro:: @ 818F9E7
ViridianCity_Gym_Text_SamuelIntro::
.string "VIRIDIAN GYM was closed for a\n"
.string "long time.\p"
.string "But now, our LEADER is back!$"
ViridianCity_Gym_Text_SamuelDefeat:: @ 818FA2D
ViridianCity_Gym_Text_SamuelDefeat::
.string "I was beaten?$"
ViridianCity_Gym_Text_SamuelPostBattle:: @ 818FA3B
ViridianCity_Gym_Text_SamuelPostBattle::
.string "You can go on to the POKéMON\n"
.string "LEAGUE only by defeating our GYM\l"
.string "LEADER!$"
ViridianCity_Gym_Text_GymGuyAdvice:: @ 818FA81
ViridianCity_Gym_Text_GymGuyAdvice::
.string "Yo!\n"
.string "Champ in the making!\p"
.string "Even I don't know the VIRIDIAN\n"
@@ -153,17 +153,17 @@ ViridianCity_Gym_Text_GymGuyAdvice:: @ 818FA81
.string "Also, I heard that the TRAINERS\n"
.string "here like GROUND-type POKéMON.$"
ViridianCity_Gym_Text_GymGuyPostVictory:: @ 818FB56
ViridianCity_Gym_Text_GymGuyPostVictory::
.string "Blow me away! GIOVANNI was the\n"
.string "GYM LEADER of VIRIDIAN?$"
ViridianCity_Gym_Text_GymStatue:: @ 818FB8D
ViridianCity_Gym_Text_GymStatue::
.string "VIRIDIAN POKéMON GYM\n"
.string "LEADER: ?\p"
.string "WINNING TRAINERS:\n"
.string "{RIVAL}$"
ViridianCity_Gym_Text_GymStatuePlayerWon:: @ 818FBC1
ViridianCity_Gym_Text_GymStatuePlayerWon::
.string "VIRIDIAN POKéMON GYM\n"
.string "LEADER: GIOVANNI\p"
.string "WINNING TRAINERS:\n"