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

This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
1146 changed files with 40526 additions and 38156 deletions
@@ -1,14 +1,14 @@
SafariZone_North_RestHouse_MapScripts:: @ 816241A
SafariZone_North_RestHouse_MapScripts::
.byte 0
SafariZone_North_RestHouse_EventScript_Fisher:: @ 816241B
SafariZone_North_RestHouse_EventScript_Fisher::
msgbox SafariZone_East_Text_PrizeInDeepestPartOfSafariZone, MSGBOX_NPC
end
SafariZone_North_RestHouse_EventScript_Scientist:: @ 8162424
SafariZone_North_RestHouse_EventScript_Scientist::
msgbox SafariZone_East_Text_KeepAnyItemFoundOnSafari, MSGBOX_NPC
end
SafariZone_North_RestHouse_EventScript_Gentleman:: @ 816242D
SafariZone_North_RestHouse_EventScript_Gentleman::
msgbox SafariZone_East_Text_MyEeveeEvolvedIntoFlareon, MSGBOX_NPC
end
@@ -1,14 +1,14 @@
SafariZone_East_Text_KeepAnyItemFoundOnSafari:: @ 8177B38
SafariZone_East_Text_KeepAnyItemFoundOnSafari::
.string "You can keep any item you find in\n"
.string "the SAFARI ZONE.\p"
.string "But, you'll run out of time if you\n"
.string "try for all of them at once.$"
SafariZone_East_Text_PrizeInDeepestPartOfSafariZone:: @ 8177BAB
SafariZone_East_Text_PrizeInDeepestPartOfSafariZone::
.string "Go to the deepest part of the\n"
.string "SAFARI ZONE. You will win a prize!$"
SafariZone_East_Text_MyEeveeEvolvedIntoFlareon:: @ 8177BEC
SafariZone_East_Text_MyEeveeEvolvedIntoFlareon::
.string "My EEVEE evolved into FLAREON.\p"
.string "But, a friend's EEVEE turned into a\n"
.string "VAPOREON. I wonder why?$"