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/SaffronCity_Gym/scripts.inc
+16 -16
View File
@@ -1,7 +1,7 @@
SaffronCity_Gym_MapScripts:: @ 816EDD7
SaffronCity_Gym_MapScripts::
.byte 0
SaffronCity_Gym_EventScript_Sabrina:: @ 816EDD8
SaffronCity_Gym_EventScript_Sabrina::
famechecker FAMECHECKER_SABRINA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle_single TRAINER_LEADER_SABRINA, SaffronCity_Gym_Text_SabrinaIntro, SaffronCity_Gym_Text_SabrinaDefeat, SaffronCity_Gym_EventScript_DefeatedSabrina, NO_MUSIC
goto_if_unset FLAG_GOT_TM04_FROM_SABRINA, SaffronCity_Gym_EventScript_GiveTM04
@@ -9,7 +9,7 @@ SaffronCity_Gym_EventScript_Sabrina:: @ 816EDD8
release
end
SaffronCity_Gym_EventScript_DefeatedSabrina:: @ 816EE0A
SaffronCity_Gym_EventScript_DefeatedSabrina::
famechecker FAMECHECKER_SABRINA, 2
famechecker FAMECHECKER_SABRINA, 3
clearflag FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS
@@ -19,7 +19,7 @@ SaffronCity_Gym_EventScript_DefeatedSabrina:: @ 816EE0A
goto SaffronCity_Gym_EventScript_GiveTM04
end
SaffronCity_Gym_EventScript_GiveTM04:: @ 816EE3D
SaffronCity_Gym_EventScript_GiveTM04::
msgbox SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis
checkitemspace ITEM_TM04, 1
compare VAR_RESULT, FALSE
@@ -30,48 +30,48 @@ SaffronCity_Gym_EventScript_GiveTM04:: @ 816EE3D
release
end
SaffronCity_Gym_EventScript_NoRoomForTM04:: @ 816EE7E
SaffronCity_Gym_EventScript_NoRoomForTM04::
msgbox SaffronCity_Gym_Text_BagFullOfOtherItems
release
end
SaffronCity_Gym_EventScript_Johan:: @ 816EE88
SaffronCity_Gym_EventScript_Johan::
trainerbattle_single TRAINER_PSYCHIC_JOHAN, SaffronCity_Gym_Text_JohanIntro, SaffronCity_Gym_Text_JohanDefeat
msgbox SaffronCity_Gym_Text_JohanPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_Tyron:: @ 816EE9F
SaffronCity_Gym_EventScript_Tyron::
trainerbattle_single TRAINER_PSYCHIC_TYRON, SaffronCity_Gym_Text_TyronIntro, SaffronCity_Gym_Text_TyronDefeat
famechecker FAMECHECKER_SABRINA, 5
msgbox SaffronCity_Gym_Text_TyronPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_Cameron:: @ 816EEC3
SaffronCity_Gym_EventScript_Cameron::
trainerbattle_single TRAINER_PSYCHIC_CAMERON, SaffronCity_Gym_Text_CameronIntro, SaffronCity_Gym_Text_CameronDefeat
msgbox SaffronCity_Gym_Text_CameronPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_Preston:: @ 816EEDA
SaffronCity_Gym_EventScript_Preston::
trainerbattle_single TRAINER_PSYCHIC_PRESTON, SaffronCity_Gym_Text_PrestonIntro, SaffronCity_Gym_Text_PrestonDefeat
msgbox SaffronCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_Amanda:: @ 816EEF1
SaffronCity_Gym_EventScript_Amanda::
trainerbattle_single TRAINER_CHANNELER_AMANDA, SaffronCity_Gym_Text_AmandaIntro, SaffronCity_Gym_Text_AmandaDefeat
msgbox SaffronCity_Gym_Text_AmandaPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_Stacy:: @ 816EF08
SaffronCity_Gym_EventScript_Stacy::
trainerbattle_single TRAINER_CHANNELER_STACY, SaffronCity_Gym_Text_StacyIntro, SaffronCity_Gym_Text_StacyDefeat
msgbox SaffronCity_Gym_Text_StacyPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_Tasha:: @ 816EF1F
SaffronCity_Gym_EventScript_Tasha::
trainerbattle_single TRAINER_CHANNELER_TASHA, SaffronCity_Gym_Text_TashaIntro, SaffronCity_Gym_Text_TashaDefeat
msgbox SaffronCity_Gym_Text_TashaPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_GymGuy:: @ 816EF36
SaffronCity_Gym_EventScript_GymGuy::
lock
faceplayer
goto_if_set FLAG_DEFEATED_SABRINA, SaffronCity_Gym_EventScript_GymGuyPostVictory
@@ -79,19 +79,19 @@ SaffronCity_Gym_EventScript_GymGuy:: @ 816EF36
release
end
SaffronCity_Gym_EventScript_GymGuyPostVictory:: @ 816EF4B
SaffronCity_Gym_EventScript_GymGuyPostVictory::
msgbox SaffronCity_Gym_Text_GymGuyPostVictory
release
end
SaffronCity_Gym_EventScript_GymStatue:: @ 816EF55
SaffronCity_Gym_EventScript_GymStatue::
lockall
goto_if_set FLAG_BADGE06_GET, SaffronCity_Gym_EventScript_GymStatuePostVictory
msgbox SaffronCity_Gym_Text_GymStatue
releaseall
end
SaffronCity_Gym_EventScript_GymStatuePostVictory:: @ 816EF69
SaffronCity_Gym_EventScript_GymStatuePostVictory::
msgbox SaffronCity_Gym_Text_GymStatuePlayerWon
releaseall
end