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 @@
ThreeIsland_House3_MapScripts:: @ 8171902
ThreeIsland_House3_MapScripts::
.byte 0
ThreeIsland_House3_EventScript_Beauty:: @ 8171903
ThreeIsland_House3_EventScript_Beauty::
msgbox ThreeIsland_House3_Text_WantedToLiveSomewhereQuiet, MSGBOX_NPC
end
+1 -1
View File
@@ -1,4 +1,4 @@
ThreeIsland_House3_Text_WantedToLiveSomewhereQuiet:: @ 81A3379
ThreeIsland_House3_Text_WantedToLiveSomewhereQuiet::
.string "I bought this house because I\n"
.string "wanted to live somewhere quiet.\p"
.string "Today, I think I'll go out fishing.$"