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 @@
FiveIsland_House2_MapScripts:: @ 8171D60
FiveIsland_House2_MapScripts::
.byte 0
FiveIsland_House2_EventScript_OldMan:: @ 8171D61
FiveIsland_House2_EventScript_OldMan::
msgbox FiveIsland_House2_Text_MeadowBelongedToFamily, MSGBOX_NPC
end
+1 -1
View File
@@ -1,4 +1,4 @@
FiveIsland_House2_Text_MeadowBelongedToFamily:: @ 81A3D5E
FiveIsland_House2_Text_MeadowBelongedToFamily::
.string "That MEADOW has belonged to our\n"
.string "family for generations.\p"
.string "I should have had a giant mansion\n"