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
+4 -4
View File
@@ -1,14 +1,14 @@
SafariZone_East_MapScripts:: @ 816237C
SafariZone_East_MapScripts::
.byte 0
SafariZone_East_EventScript_RestHouseSign:: @ 816237D
SafariZone_East_EventScript_RestHouseSign::
msgbox SafariZone_East_Text_RestHouse, MSGBOX_SIGN
end
SafariZone_East_EventScript_TrainerTips:: @ 8162386
SafariZone_East_EventScript_TrainerTips::
msgbox SafariZone_East_Text_TimeDeclinesOnlyWhileYouWalk, MSGBOX_SIGN
end
SafariZone_East_EventScript_AreaSign:: @ 816238F
SafariZone_East_EventScript_AreaSign::
msgbox SafariZone_East_Text_AreaSign, MSGBOX_SIGN
end
+3 -3
View File
@@ -1,12 +1,12 @@
SafariZone_East_Text_RestHouse:: @ 817783B
SafariZone_East_Text_RestHouse::
.string "REST HOUSE$"
SafariZone_East_Text_TimeDeclinesOnlyWhileYouWalk:: @ 8177846
SafariZone_East_Text_TimeDeclinesOnlyWhileYouWalk::
.string "TRAINER TIPS\p"
.string "The remaining time declines only\n"
.string "while you walk.$"
SafariZone_East_Text_AreaSign:: @ 8177884
SafariZone_East_Text_AreaSign::
.string "AREA 1\n"
.string "WEST: CENTER AREA$"