This commit is contained in:
2026-06-08 18:24:42 +09:30
parent f541c35a58
commit 40b9de76cf
55 changed files with 1785 additions and 519 deletions
+61 -18
View File
@@ -35,9 +35,16 @@ SaffronCity_Gym_EventScript_NoRoomForTM04::
end
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
trainerbattle_single TRAINER_PSYCHIC_JOHAN, SaffronCity_Gym_Text_JohanIntro, SaffronCity_Gym_Text_JohanDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
goto_if_eq VAR_RESULT, TRUE, SaffronCity_Gym_EventScript_JohanRematch
msgbox SaffronCity_Gym_Text_JohanPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_JohanRematch::
trainerbattle_rematch TRAINER_PSYCHIC_JOHAN, SaffronCity_Gym_Text_JohanIntro, SaffronCity_Gym_Text_JohanDefeat
msgbox SaffronCity_Gym_Text_JohanPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_Tyron::
trainerbattle_single TRAINER_PSYCHIC_TYRON, SaffronCity_Gym_Text_TyronIntro, SaffronCity_Gym_Text_TyronDefeat
@@ -46,29 +53,64 @@ SaffronCity_Gym_EventScript_Tyron::
end
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
trainerbattle_single TRAINER_PSYCHIC_CAMERON, SaffronCity_Gym_Text_CameronIntro, SaffronCity_Gym_Text_CameronDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
goto_if_eq VAR_RESULT, TRUE, SaffronCity_Gym_EventScript_CameronRematch
msgbox SaffronCity_Gym_Text_CameronPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_CameronRematch::
trainerbattle_rematch TRAINER_PSYCHIC_CAMERON, SaffronCity_Gym_Text_CameronIntro, SaffronCity_Gym_Text_CameronDefeat
msgbox SaffronCity_Gym_Text_CameronPostBattle, MSGBOX_AUTOCLOSE
end
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
trainerbattle_single TRAINER_PSYCHIC_PRESTON, SaffronCity_Gym_Text_PrestonIntro, SaffronCity_Gym_Text_PrestonDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
goto_if_eq VAR_RESULT, TRUE, SaffronCity_Gym_EventScript_PrestonRematch
msgbox SaffronCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_PrestonRematch::
trainerbattle_rematch TRAINER_PSYCHIC_PRESTON, SaffronCity_Gym_Text_PrestonIntro, SaffronCity_Gym_Text_PrestonDefeat
msgbox SaffronCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE
end
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
trainerbattle_single TRAINER_CHANNELER_AMANDA, SaffronCity_Gym_Text_AmandaIntro, SaffronCity_Gym_Text_AmandaDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
goto_if_eq VAR_RESULT, TRUE, SaffronCity_Gym_EventScript_AmandaRematch
msgbox SaffronCity_Gym_Text_AmandaPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_AmandaRematch::
trainerbattle_rematch TRAINER_CHANNELER_AMANDA, SaffronCity_Gym_Text_AmandaIntro, SaffronCity_Gym_Text_AmandaDefeat
msgbox SaffronCity_Gym_Text_AmandaPostBattle, MSGBOX_AUTOCLOSE
end
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
trainerbattle_single TRAINER_CHANNELER_STACY, SaffronCity_Gym_Text_StacyIntro, SaffronCity_Gym_Text_StacyDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
goto_if_eq VAR_RESULT, TRUE, SaffronCity_Gym_EventScript_StacyRematch
msgbox SaffronCity_Gym_Text_StacyPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_StacyRematch::
trainerbattle_rematch TRAINER_CHANNELER_STACY, SaffronCity_Gym_Text_StacyIntro, SaffronCity_Gym_Text_StacyDefeat
msgbox SaffronCity_Gym_Text_StacyPostBattle, MSGBOX_AUTOCLOSE
end
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
trainerbattle_single TRAINER_CHANNELER_TASHA, SaffronCity_Gym_Text_TashaIntro, SaffronCity_Gym_Text_TashaDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
goto_if_eq VAR_RESULT, TRUE, SaffronCity_Gym_EventScript_TashaRematch
msgbox SaffronCity_Gym_Text_TashaPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_TashaRematch::
trainerbattle_rematch TRAINER_CHANNELER_TASHA, SaffronCity_Gym_Text_TashaIntro, SaffronCity_Gym_Text_TashaDefeat
msgbox SaffronCity_Gym_Text_TashaPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_GymGuy::
lock
@@ -94,3 +136,4 @@ SaffronCity_Gym_EventScript_GymStatuePostVictory::
msgbox SaffronCity_Gym_Text_GymStatuePlayerWon
releaseall
end