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
+3 -3
View File
@@ -1,10 +1,10 @@
ThreeIsland_House4_MapScripts:: @ 817190C
ThreeIsland_House4_MapScripts::
.byte 0
ThreeIsland_House4_EventScript_BaldingMan:: @ 817190D
ThreeIsland_House4_EventScript_BaldingMan::
msgbox ThreeIsland_House4_Text_GhostsInBerryForest, MSGBOX_NPC
end
ThreeIsland_House4_EventScript_LittleBoy:: @ 8171916
ThreeIsland_House4_EventScript_LittleBoy::
msgbox ThreeIsland_House4_Text_PapaKeepsLyingToMe, MSGBOX_NPC
end
+2 -2
View File
@@ -1,10 +1,10 @@
ThreeIsland_House4_Text_GhostsInBerryForest:: @ 81A33DB
ThreeIsland_House4_Text_GhostsInBerryForest::
.string "You must never, ever go out to\n"
.string "the BERRY FOREST alone.\p"
.string "Why?\n"
.string "There are ghosts there.$"
ThreeIsland_House4_Text_PapaKeepsLyingToMe:: @ 81A342F
ThreeIsland_House4_Text_PapaKeepsLyingToMe::
.string "Papa keeps lying to me, and won't\n"
.string "let me go out and play!$"