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_East_RestHouse_MapScripts:: @ 81623FE
SafariZone_East_RestHouse_MapScripts::
.byte 0
SafariZone_East_RestHouse_EventScript_Rocker:: @ 81623FF
SafariZone_East_RestHouse_EventScript_Rocker::
msgbox SafariZone_East_Text_CaughtChanseyAllWorthwhile, MSGBOX_NPC
end
SafariZone_East_RestHouse_EventScript_Scientist:: @ 8162408
SafariZone_East_RestHouse_EventScript_Scientist::
msgbox SafariZone_East_Text_HowManyDidYouCatch, MSGBOX_NPC
end
SafariZone_East_RestHouse_EventScript_BaldingMan:: @ 8162411
SafariZone_East_RestHouse_EventScript_BaldingMan::
msgbox SafariZone_East_Text_TiredFromAllTheFun, MSGBOX_NPC
end
+3 -3
View File
@@ -1,12 +1,12 @@
SafariZone_East_Text_HowManyDidYouCatch:: @ 8177AAE
SafariZone_East_Text_HowManyDidYouCatch::
.string "How many did you catch?\n"
.string "I'm bushed from the effort!$"
SafariZone_East_Text_CaughtChanseyAllWorthwhile:: @ 8177AE2
SafariZone_East_Text_CaughtChanseyAllWorthwhile::
.string "I caught a CHANSEY!\p"
.string "That makes this all worthwhile.$"
SafariZone_East_Text_TiredFromAllTheFun:: @ 8177B16
SafariZone_East_Text_TiredFromAllTheFun::
.string "Whew!\n"
.string "I'm tired from all the fun!$"