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/FuchsiaCity_Gym/scripts.inc
+15 -15
View File
@@ -1,7 +1,7 @@
FuchsiaCity_Gym_MapScripts:: @ 816D54D
FuchsiaCity_Gym_MapScripts::
.byte 0
FuchsiaCity_Gym_EventScript_Koga:: @ 816D54E
FuchsiaCity_Gym_EventScript_Koga::
famechecker FAMECHECKER_KOGA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle_single TRAINER_LEADER_KOGA, FuchsiaCity_Gym_Text_KogaIntro, FuchsiaCity_Gym_Text_KogaDefeat, FuchsiaCity_Gym_EventScript_DefeatedKoga, NO_MUSIC
goto_if_unset FLAG_GOT_TM06_FROM_KOGA, FuchsiaCity_Gym_EventScript_GiveTM06
@@ -9,7 +9,7 @@ FuchsiaCity_Gym_EventScript_Koga:: @ 816D54E
release
end
FuchsiaCity_Gym_EventScript_DefeatedKoga:: @ 816D580
FuchsiaCity_Gym_EventScript_DefeatedKoga::
famechecker FAMECHECKER_KOGA, 1
clearflag FLAG_HIDE_FAME_CHECKER_KOGA_JOURNAL
setflag FLAG_DEFEATED_KOGA
@@ -18,7 +18,7 @@ FuchsiaCity_Gym_EventScript_DefeatedKoga:: @ 816D580
goto FuchsiaCity_Gym_EventScript_GiveTM06
end
FuchsiaCity_Gym_EventScript_GiveTM06:: @ 816D5A6
FuchsiaCity_Gym_EventScript_GiveTM06::
msgbox FuchsiaCity_Gym_Text_KogaExplainSoulBadge
checkitemspace ITEM_TM06, 1
compare VAR_RESULT, FALSE
@@ -29,43 +29,43 @@ FuchsiaCity_Gym_EventScript_GiveTM06:: @ 816D5A6
release
end
FuchsiaCity_Gym_EventScript_NoRoomForTM06:: @ 816D5E7
FuchsiaCity_Gym_EventScript_NoRoomForTM06::
msgbox FuchsiaCity_Gym_Text_MakeSpaceForThis
release
end
FuchsiaCity_Gym_EventScript_Phil:: @ 816D5F1
FuchsiaCity_Gym_EventScript_Phil::
trainerbattle_single TRAINER_TAMER_PHIL, FuchsiaCity_Gym_Text_PhilIntro, FuchsiaCity_Gym_Text_PhilDefeat
msgbox FuchsiaCity_Gym_Text_PhilPostBattle, MSGBOX_AUTOCLOSE
end
FuchsiaCity_Gym_EventScript_Edgar:: @ 816D608
FuchsiaCity_Gym_EventScript_Edgar::
trainerbattle_single TRAINER_TAMER_EDGAR, FuchsiaCity_Gym_Text_EdgarIntro, FuchsiaCity_Gym_Text_EdgarDefeat
msgbox FuchsiaCity_Gym_Text_EdgarPostBattle, MSGBOX_AUTOCLOSE
end
FuchsiaCity_Gym_EventScript_Kirk:: @ 816D61F
FuchsiaCity_Gym_EventScript_Kirk::
trainerbattle_single TRAINER_JUGGLER_KIRK, FuchsiaCity_Gym_Text_KirkIntro, FuchsiaCity_Gym_Text_KirkDefeat
famechecker FAMECHECKER_KOGA, 2
msgbox FuchsiaCity_Gym_Text_KirkPostBattle, MSGBOX_AUTOCLOSE
end
FuchsiaCity_Gym_EventScript_Shawn:: @ 816D643
FuchsiaCity_Gym_EventScript_Shawn::
trainerbattle_single TRAINER_JUGGLER_SHAWN, FuchsiaCity_Gym_Text_ShawnIntro, FuchsiaCity_Gym_Text_ShawnDefeat
msgbox FuchsiaCity_Gym_Text_ShawnPostBattle, MSGBOX_AUTOCLOSE
end
FuchsiaCity_Gym_EventScript_Kayden:: @ 816D65A
FuchsiaCity_Gym_EventScript_Kayden::
trainerbattle_single TRAINER_JUGGLER_KAYDEN, FuchsiaCity_Gym_Text_KaydenIntro, FuchsiaCity_Gym_Text_KaydenDefeat
msgbox FuchsiaCity_Gym_Text_KaydenPostBattle, MSGBOX_AUTOCLOSE
end
FuchsiaCity_Gym_EventScript_Nate:: @ 816D671
FuchsiaCity_Gym_EventScript_Nate::
trainerbattle_single TRAINER_JUGGLER_NATE, FuchsiaCity_Gym_Text_NateIntro, FuchsiaCity_Gym_Text_NateDefeat
msgbox FuchsiaCity_Gym_Text_NatePostBattle, MSGBOX_AUTOCLOSE
end
FuchsiaCity_Gym_EventScript_GymGuy:: @ 816D688
FuchsiaCity_Gym_EventScript_GymGuy::
lock
faceplayer
goto_if_set FLAG_DEFEATED_KOGA, FuchsiaCity_Gym_EventScript_GymGuyPostVictory
@@ -73,19 +73,19 @@ FuchsiaCity_Gym_EventScript_GymGuy:: @ 816D688
release
end
FuchsiaCity_Gym_EventScript_GymGuyPostVictory:: @ 816D69D
FuchsiaCity_Gym_EventScript_GymGuyPostVictory::
msgbox FuchsiaCity_Gym_Text_GymGuyPostVictory
release
end
FuchsiaCity_Gym_EventScript_GymStatue:: @ 816D6A7
FuchsiaCity_Gym_EventScript_GymStatue::
lockall
goto_if_set FLAG_BADGE05_GET, FuchsiaCity_Gym_EventScript_GymStatuePostVictory
msgbox FuchsiaCity_Gym_Text_GymStatue
releaseall
end
FuchsiaCity_Gym_EventScript_GymStatuePostVictory:: @ 816D6BB
FuchsiaCity_Gym_EventScript_GymStatuePostVictory::
msgbox FuchsiaCity_Gym_Text_GymStatuePlayerWon
releaseall
end
data/maps/FuchsiaCity_Gym/text.inc
+29 -29
View File
@@ -1,4 +1,4 @@
FuchsiaCity_Gym_Text_KogaIntro:: @ 819832E
FuchsiaCity_Gym_Text_KogaIntro::
.string "KOGA: Fwahahaha!\p"
.string "A mere child like you dares to\n"
.string "challenge me?\p"
@@ -11,20 +11,20 @@ FuchsiaCity_Gym_Text_KogaIntro:: @ 819832E
.string "Despair to the creeping horror of\n"
.string "POISON-type POKéMON!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$"
FuchsiaCity_Gym_Text_KogaDefeat:: @ 8198444
FuchsiaCity_Gym_Text_KogaDefeat::
.string "Humph!\n"
.string "You have proven your worth!\p"
.string "Here!\n"
.string "Take the SOULBADGE!$"
FuchsiaCity_Gym_Text_KogaPostBattle:: @ 8198481
FuchsiaCity_Gym_Text_KogaPostBattle::
.string "When afflicted by TOXIC, a POKéMON\n"
.string "suffers more and more.\p"
.string "It suffers worsening damage as the\n"
.string "battle wears on!\p"
.string "It will surely terrorize foes!$"
FuchsiaCity_Gym_Text_KogaExplainSoulBadge:: @ 819850E
FuchsiaCity_Gym_Text_KogaExplainSoulBadge::
.string "Now that you have the SOULBADGE,\n"
.string "the DEFENSE of your POKéMON rises.\p"
.string "It also lets you SURF outside of\n"
@@ -32,103 +32,103 @@ FuchsiaCity_Gym_Text_KogaExplainSoulBadge:: @ 819850E
.string "Ah!\n"
.string "Take this, too!$"
FuchsiaCity_Gym_Text_ReceivedTM06FromKoga:: @ 819858F
FuchsiaCity_Gym_Text_ReceivedTM06FromKoga::
.string "{PLAYER} received TM06\n"
.string "from KOGA.$"
FuchsiaCity_Gym_Text_KogaExplainTM06:: @ 81985AB
FuchsiaCity_Gym_Text_KogaExplainTM06::
.string "Sealed within that TM06 lies\n"
.string "TOXIC!\p"
.string "It is a secret technique dating\n"
.string "back some four hundred years.$"
FuchsiaCity_Gym_Text_MakeSpaceForThis:: @ 819860D
FuchsiaCity_Gym_Text_MakeSpaceForThis::
.string "Make space for this, child!$"
FuchsiaCity_Gym_Text_KaydenIntro:: @ 8198629
FuchsiaCity_Gym_Text_KaydenIntro::
.string "Strength isn't the key for POKéMON.\n"
.string "Do you understand this?\p"
.string "POKéMON is about strategy!\p"
.string "I'll show you how strategy can\n"
.string "beat brute strength.$"
FuchsiaCity_Gym_Text_KaydenDefeat:: @ 81986B4
FuchsiaCity_Gym_Text_KaydenDefeat::
.string "What?\n"
.string "Extraordinary!$"
FuchsiaCity_Gym_Text_KaydenPostBattle:: @ 81986C9
FuchsiaCity_Gym_Text_KaydenPostBattle::
.string "So, you mix brawn with brains?\n"
.string "Good strategy!\p"
.string "That's remarkable for a child\n"
.string "TRAINER.$"
FuchsiaCity_Gym_Text_KirkIntro:: @ 819871E
FuchsiaCity_Gym_Text_KirkIntro::
.string "I was a magician once upon a time.\p"
.string "But I dreamt of becoming a ninja,\n"
.string "so I joined this GYM.$"
FuchsiaCity_Gym_Text_KirkDefeat:: @ 8198779
FuchsiaCity_Gym_Text_KirkDefeat::
.string "I'm done for!$"
FuchsiaCity_Gym_Text_KirkPostBattle:: @ 8198787
FuchsiaCity_Gym_Text_KirkPostBattle::
.string "Even though I've lost, I will keep\n"
.string "training according to the teachings\l"
.string "of KOGA, my ninja master.$"
FuchsiaCity_Gym_Text_NateIntro:: @ 81987E8
FuchsiaCity_Gym_Text_NateIntro::
.string "Let's see you beat my special\n"
.string "techniques!$"
FuchsiaCity_Gym_Text_NateDefeat:: @ 8198812
FuchsiaCity_Gym_Text_NateDefeat::
.string "You had me fooled!$"
FuchsiaCity_Gym_Text_NatePostBattle:: @ 8198825
FuchsiaCity_Gym_Text_NatePostBattle::
.string "I like poison and sleep techniques,\n"
.string "as they linger after battle!$"
FuchsiaCity_Gym_Text_PhilIntro:: @ 8198866
FuchsiaCity_Gym_Text_PhilIntro::
.string "Stop right there!\p"
.string "The famed invisible walls of\n"
.string "FUCHSIA GYM have you frustrated?$"
FuchsiaCity_Gym_Text_PhilDefeat:: @ 81988B6
FuchsiaCity_Gym_Text_PhilDefeat::
.string "Whoa!\n"
.string "You've got it!$"
FuchsiaCity_Gym_Text_PhilPostBattle:: @ 81988CB
FuchsiaCity_Gym_Text_PhilPostBattle::
.string "You impressed me!\n"
.string "Here's a hint!\p"
.string "Look very closely for gaps in the\n"
.string "invisible walls!$"
FuchsiaCity_Gym_Text_EdgarIntro:: @ 819891F
FuchsiaCity_Gym_Text_EdgarIntro::
.string "I also study the way of the ninja\n"
.string "with Master KOGA!\p"
.string "Ninja have a long history of using\n"
.string "animals!$"
FuchsiaCity_Gym_Text_EdgarDefeat:: @ 819897F
FuchsiaCity_Gym_Text_EdgarDefeat::
.string "Awoo!$"
FuchsiaCity_Gym_Text_EdgarPostBattle:: @ 8198985
FuchsiaCity_Gym_Text_EdgarPostBattle::
.string "I still have much to learn.$"
FuchsiaCity_Gym_Text_ShawnIntro:: @ 81989A1
FuchsiaCity_Gym_Text_ShawnIntro::
.string "Master KOGA comes from a long line\n"
.string "of ninjas.\p"
.string "What did you descend from?$"
FuchsiaCity_Gym_Text_ShawnDefeat:: @ 81989EA
FuchsiaCity_Gym_Text_ShawnDefeat::
.string "You're more skilled than I'd\n"
.string "thought!$"
FuchsiaCity_Gym_Text_ShawnPostBattle:: @ 8198A10
FuchsiaCity_Gym_Text_ShawnPostBattle::
.string "Where there is light, there is\n"
.string "shadow!\p"
.string "Light and shadow!\n"
.string "Which do you choose?$"
FuchsiaCity_Gym_Text_GymGuyAdvice:: @ 8198A5E
FuchsiaCity_Gym_Text_GymGuyAdvice::
.string "Yo!\n"
.string "Champ in the making!\p"
.string "FUCHSIA GYM is a tricked-up place.\n"
@@ -138,17 +138,17 @@ FuchsiaCity_Gym_Text_GymGuyAdvice:: @ 8198A5E
.string "You have to find gaps in the walls\n"
.string "to reach him.$"
FuchsiaCity_Gym_Text_GymGuyPostVictory:: @ 8198B1D
FuchsiaCity_Gym_Text_GymGuyPostVictory::
.string "It's amazing how ninja can terrify,\n"
.string "even now!$"
FuchsiaCity_Gym_Text_GymStatue:: @ 8198B4B
FuchsiaCity_Gym_Text_GymStatue::
.string "FUCHSIA POKéMON GYM\n"
.string "LEADER: KOGA\p"
.string "WINNING TRAINERS:\n"
.string "{RIVAL}$"
FuchsiaCity_Gym_Text_GymStatuePlayerWon:: @ 8198B81
FuchsiaCity_Gym_Text_GymStatuePlayerWon::
.string "FUCHSIA POKéMON GYM\n"
.string "LEADER: KOGA\p"
.string "WINNING TRAINERS:\n"