dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
parent 23d7c00c62 d6d5290099
commit 2b93687ade
1146 changed files with 40526 additions and 38156 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
data/maps/SaffronCity_Gym/text.inc
+32 -32
View File
@@ -1,4 +1,4 @@
SaffronCity_Gym_Text_SabrinaIntro:: @ 819B53C
SaffronCity_Gym_Text_SabrinaIntro::
.string "I had a vision of your arrival.\p"
.string "I have had psychic powers since\n"
.string "I was a child.\p"
@@ -7,7 +7,7 @@ SaffronCity_Gym_Text_SabrinaIntro:: @ 819B53C
.string "I dislike battling, but if you wish,\n"
.string "I will show you my powers!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$"
SaffronCity_Gym_Text_SabrinaDefeat:: @ 819B602
SaffronCity_Gym_Text_SabrinaDefeat::
.string "This loss shocks me!\n"
.string "But, a loss is a loss.\p"
.string "I admit, I didn't work hard enough\n"
@@ -15,13 +15,13 @@ SaffronCity_Gym_Text_SabrinaDefeat:: @ 819B602
.string "Your victory has earned you the\n"
.string "MARSHBADGE.$"
SaffronCity_Gym_Text_SabrinaPostBattle:: @ 819B685
SaffronCity_Gym_Text_SabrinaPostBattle::
.string "Psychic power isn't something that\n"
.string "only a few people have.\p"
.string "Everyone has psychic power.\n"
.string "People just don't realize it.$"
SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis:: @ 819B6FA
SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis::
.string "The MARSHBADGE makes POKéMON up\n"
.string "to Lv. 70 obey you.\p"
.string "Stronger POKéMON will become wild,\n"
@@ -30,87 +30,87 @@ SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis:: @ 819B6FA
.string "much to avoid that problem.\p"
.string "Wait, please take this TM with you.$"
SaffronCity_Gym_Text_ReceivedTM04FromSabrina:: @ 819B7D3
SaffronCity_Gym_Text_ReceivedTM04FromSabrina::
.string "{PLAYER} received TM04 from\n"
.string "SABRINA.$"
SaffronCity_Gym_Text_ExplainTM04:: @ 819B7F2
SaffronCity_Gym_Text_ExplainTM04::
.string "TM04 is CALM MIND.\p"
.string "It makes the POKéMON concentrate\n"
.string "to raise both SP. ATK and SP. DEF.$"
SaffronCity_Gym_Text_BagFullOfOtherItems:: @ 819B849
SaffronCity_Gym_Text_BagFullOfOtherItems::
.string "Your BAG is full of other items.$"
SaffronCity_Gym_Text_AmandaIntro:: @ 819B86A
SaffronCity_Gym_Text_AmandaIntro::
.string "SABRINA is far younger than I,\n"
.string "but she has earned my respect.$"
SaffronCity_Gym_Text_AmandaDefeat:: @ 819B8A8
SaffronCity_Gym_Text_AmandaDefeat::
.string "Not good enough!$"
SaffronCity_Gym_Text_AmandaPostBattle:: @ 819B8B9
SaffronCity_Gym_Text_AmandaPostBattle::
.string "In a battle of equals, the one\n"
.string "with the stronger will wins.\p"
.string "If you wish to beat SABRINA, focus\n"
.string "and will yourself to victory.$"
SaffronCity_Gym_Text_JohanIntro:: @ 819B936
SaffronCity_Gym_Text_JohanIntro::
.string "Does our unseen power scare you?$"
SaffronCity_Gym_Text_JohanDefeat:: @ 819B957
SaffronCity_Gym_Text_JohanDefeat::
.string "I never foresaw this!$"
SaffronCity_Gym_Text_JohanPostBattle:: @ 819B96D
SaffronCity_Gym_Text_JohanPostBattle::
.string "PSYCHIC POKéMON fear only ghosts\n"
.string "and bugs!$"
SaffronCity_Gym_Text_StacyIntro:: @ 819B998
SaffronCity_Gym_Text_StacyIntro::
.string "POKéMON take on the appearance of\n"
.string "their TRAINERS.\p"
.string "Your POKéMON must be tough, then!$"
SaffronCity_Gym_Text_StacyDefeat:: @ 819B9EC
SaffronCity_Gym_Text_StacyDefeat::
.string "I knew it!$"
SaffronCity_Gym_Text_StacyPostBattle:: @ 819B9F7
SaffronCity_Gym_Text_StacyPostBattle::
.string "I have much to learn still…\p"
.string "I must master PSYCHIC and teach it\n"
.string "to my POKéMON…$"
SaffronCity_Gym_Text_TyronIntro:: @ 819BA45
SaffronCity_Gym_Text_TyronIntro::
.string "You understand, don't you?\p"
.string "That power alone isn't enough to\n"
.string "win in the world of POKéMON?$"
SaffronCity_Gym_Text_TyronDefeat:: @ 819BA9E
SaffronCity_Gym_Text_TyronDefeat::
.string "I don't believe this!$"
SaffronCity_Gym_Text_TyronPostBattle:: @ 819BAB4
SaffronCity_Gym_Text_TyronPostBattle::
.string "SABRINA just wiped out the KARATE\n"
.string "MASTER next door.$"
SaffronCity_Gym_Text_TashaIntro:: @ 819BAE8
SaffronCity_Gym_Text_TashaIntro::
.string "You and I, our POKéMON shall\n"
.string "battle!$"
SaffronCity_Gym_Text_TashaDefeat:: @ 819BB0D
SaffronCity_Gym_Text_TashaDefeat::
.string "I lost after all!$"
SaffronCity_Gym_Text_TashaPostBattle:: @ 819BB1F
SaffronCity_Gym_Text_TashaPostBattle::
.string "I knew that this was going to take\n"
.string "place.$"
SaffronCity_Gym_Text_CameronIntro:: @ 819BB49
SaffronCity_Gym_Text_CameronIntro::
.string "SABRINA is young, but she's also\n"
.string "our highly skilled LEADER.\p"
.string "You won't reach her easily!$"
SaffronCity_Gym_Text_CameronDefeat:: @ 819BBA1
SaffronCity_Gym_Text_CameronDefeat::
.string "Ow!\n"
.string "Down and out!$"
SaffronCity_Gym_Text_CameronPostBattle:: @ 819BBB3
SaffronCity_Gym_Text_CameronPostBattle::
.string "There used to be two POKéMON GYMS\n"
.string "in SAFFRON.\p"
.string "The FIGHTING DOJO next door lost\n"
@@ -118,20 +118,20 @@ SaffronCity_Gym_Text_CameronPostBattle:: @ 819BBB3
.string "We simply creamed them when we\n"
.string "decided to have just one GYM.$"
SaffronCity_Gym_Text_PrestonIntro:: @ 819BC57
SaffronCity_Gym_Text_PrestonIntro::
.string "SAFFRON POKéMON GYM is famous for\n"
.string "training psychics.\p"
.string "You want to see SABRINA, don't\n"
.string "you? I can tell!$"
SaffronCity_Gym_Text_PrestonDefeat:: @ 819BCBC
SaffronCity_Gym_Text_PrestonDefeat::
.string "Arrrgh!$"
SaffronCity_Gym_Text_PrestonPostBattle:: @ 819BCC4
SaffronCity_Gym_Text_PrestonPostBattle::
.string "That's right! I used telepathy to\n"
.string "read your mind!$"
SaffronCity_Gym_Text_GymGuyAdvice:: @ 819BCF6
SaffronCity_Gym_Text_GymGuyAdvice::
.string "Yo!\n"
.string "Champ in the making!\p"
.string "SABRINA's POKéMON use psychic\n"
@@ -141,18 +141,18 @@ SaffronCity_Gym_Text_GymGuyAdvice:: @ 819BCF6
.string "They'll get destroyed before they\n"
.string "can even aim a punch!$"
SaffronCity_Gym_Text_GymGuyPostVictory:: @ 819BDBB
SaffronCity_Gym_Text_GymGuyPostVictory::
.string "Psychic power, huh?\p"
.string "If I had that, I'd make a bundle\n"
.string "at the slots!$"
SaffronCity_Gym_Text_GymStatue:: @ 819BDFE
SaffronCity_Gym_Text_GymStatue::
.string "SAFFRON POKéMON GYM\n"
.string "LEADER: SABRINA\p"
.string "WINNING TRAINERS:\n"
.string "{RIVAL}$"
SaffronCity_Gym_Text_GymStatuePlayerWon:: @ 819BE37
SaffronCity_Gym_Text_GymStatuePlayerWon::
.string "SAFFRON POKéMON GYM\n"
.string "LEADER: SABRINA\p"
.string "WINNING TRAINERS:\n"