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
+6 -6
View File
@@ -1,22 +1,22 @@
SafariZone_North_MapScripts:: @ 8162398
SafariZone_North_MapScripts::
.byte 0
SafariZone_North_EventScript_RestHouseSign:: @ 8162399
SafariZone_North_EventScript_RestHouseSign::
msgbox SafariZone_North_Text_RestHouse, MSGBOX_SIGN
end
SafariZone_North_EventScript_TrainerTips1:: @ 81623A2
SafariZone_North_EventScript_TrainerTips1::
msgbox SafariZone_North_Text_SecretHouseStillAhead, MSGBOX_SIGN
end
SafariZone_North_EventScript_AreaSign:: @ 81623AB
SafariZone_North_EventScript_AreaSign::
msgbox SafariZone_North_Text_Area2, MSGBOX_SIGN
end
SafariZone_North_EventScript_TrainerTips2:: @ 81623B4
SafariZone_North_EventScript_TrainerTips2::
msgbox SafariZone_North_Text_ZigzagThroughTallGrass, MSGBOX_SIGN
end
SafariZone_North_EventScript_TrainerTips3:: @ 81623BD
SafariZone_North_EventScript_TrainerTips3::
msgbox SafariZone_North_Text_WinFreeHMFindSecretHouse, MSGBOX_SIGN
end
+5 -5
View File
@@ -1,20 +1,20 @@
SafariZone_North_Text_RestHouse:: @ 817789D
SafariZone_North_Text_RestHouse::
.string "REST HOUSE$"
SafariZone_North_Text_SecretHouseStillAhead:: @ 81778A8
SafariZone_North_Text_SecretHouseStillAhead::
.string "TRAINER TIPS\p"
.string "The SECRET HOUSE is still ahead.$"
SafariZone_North_Text_Area2:: @ 81778D6
SafariZone_North_Text_Area2::
.string "AREA 2$"
SafariZone_North_Text_ZigzagThroughTallGrass:: @ 81778DD
SafariZone_North_Text_ZigzagThroughTallGrass::
.string "TRAINER TIPS\p"
.string "POKéMON hide in tall grass.\p"
.string "Zigzag through grassy areas to\n"
.string "flush them out.$"
SafariZone_North_Text_WinFreeHMFindSecretHouse:: @ 8177935
SafariZone_North_Text_WinFreeHMFindSecretHouse::
.string "TRAINER TIPS\p"
.string "Win a free HM for finding the\n"
.string "SECRET HOUSE.$"