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
+2 -2
View File
@@ -1,6 +1,6 @@
SixIsland_House_MapScripts:: @ 8171E5B
SixIsland_House_MapScripts::
.byte 0
SixIsland_House_EventScript_OldMan:: @ 8171E5C
SixIsland_House_EventScript_OldMan::
msgbox SixIsland_House_Text_GoodPlaceForNatureAndHistory, MSGBOX_NPC
end
+1 -1
View File
@@ -1,4 +1,4 @@
SixIsland_House_Text_GoodPlaceForNatureAndHistory:: @ 81A412E
SixIsland_House_Text_GoodPlaceForNatureAndHistory::
.string "There's nothing that young people'd\n"
.string "find exciting here on this island.\p"
.string "But, this is a good place in terms\n"