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,10 +1,10 @@
SafariZone_Center_RestHouse_MapScripts:: @ 81623EB
SafariZone_Center_RestHouse_MapScripts::
.byte 0
SafariZone_Center_RestHouse_EventScript_Sara:: @ 81623EC
SafariZone_Center_RestHouse_EventScript_Sara::
msgbox SafariZone_Center_Text_WhereDidErikGo, MSGBOX_NPC
end
SafariZone_Center_RestHouse_EventScript_Scientist:: @ 81623F5
SafariZone_Center_RestHouse_EventScript_Scientist::
msgbox SafariZone_Center_Text_CatchingMonsAsGifts, MSGBOX_NPC
end
@@ -1,8 +1,8 @@
SafariZone_Center_Text_WhereDidErikGo:: @ 8177A5A
SafariZone_Center_Text_WhereDidErikGo::
.string "SARA: Where did my boyfriend,\n"
.string "ERIK, go?$"
SafariZone_Center_Text_CatchingMonsAsGifts:: @ 8177A82
SafariZone_Center_Text_CatchingMonsAsGifts::
.string "I'm catching POKéMON to take home\n"
.string "as gifts.$"