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,7 +1,7 @@
SafariZone_SecretHouse_MapScripts:: @ 8162452
SafariZone_SecretHouse_MapScripts::
.byte 0
SafariZone_SecretHouse_EventScript_Attendant:: @ 8162453
SafariZone_SecretHouse_EventScript_Attendant::
lock
faceplayer
goto_if_set FLAG_GOT_HM03, SafariZone_SecretHouse_EventScript_ExplainSurf
@@ -15,12 +15,12 @@ SafariZone_SecretHouse_EventScript_Attendant:: @ 8162453
release
end
SafariZone_SecretHouse_EventScript_NoRoomForHM03:: @ 816249F
SafariZone_SecretHouse_EventScript_NoRoomForHM03::
msgbox SafariZone_SecretHouse_Text_DontHaveRoomForPrize
release
end
SafariZone_SecretHouse_EventScript_ExplainSurf:: @ 81624A9
SafariZone_SecretHouse_EventScript_ExplainSurf::
msgbox SafariZone_SecretHouse_Text_ExplainSurf
release
end
+4 -4
View File
@@ -1,4 +1,4 @@
SafariZone_SecretHouse_Text_CongratsYouveWon:: @ 8177DC1
SafariZone_SecretHouse_Text_CongratsYouveWon::
.string "Ah! Finally!\p"
.string "You're the first person to reach\n"
.string "the SECRET HOUSE!\p"
@@ -9,11 +9,11 @@ SafariZone_SecretHouse_Text_CongratsYouveWon:: @ 8177DC1
.string "Congratulations!\n"
.string "You have won!$"
SafariZone_SecretHouse_Text_ReceivedHM03FromAttendant:: @ 8177E92
SafariZone_SecretHouse_Text_ReceivedHM03FromAttendant::
.string "{PLAYER} received HM03\n"
.string "from the attendant!$"
SafariZone_SecretHouse_Text_ExplainSurf:: @ 8177EB7
SafariZone_SecretHouse_Text_ExplainSurf::
.string "HM03 is SURF.\p"
.string "POKéMON will be able to ferry you\n"
.string "across water using it.\p"
@@ -22,7 +22,7 @@ SafariZone_SecretHouse_Text_ExplainSurf:: @ 8177EB7
.string "You're super lucky for winning this\n"
.string "fabulous prize!$"
SafariZone_SecretHouse_Text_DontHaveRoomForPrize:: @ 8177F72
SafariZone_SecretHouse_Text_DontHaveRoomForPrize::
.string "You don't have room for this\n"
.string "fabulous prize!$"