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 @@
OneIsland_House1_MapScripts:: @ 817135B
OneIsland_House1_MapScripts::
.byte 0
OneIsland_House1_EventScript_OldMan:: @ 817135C
OneIsland_House1_EventScript_OldMan::
msgbox OneIsland_House1_Text_GazeUponVolcanoOnSunnyDays, MSGBOX_NPC
end
OneIsland_House1_EventScript_OldWoman:: @ 8171365
OneIsland_House1_EventScript_OldWoman::
msgbox OneIsland_House1_Text_LastTimeMtEmberErupted, MSGBOX_NPC
end
+2 -2
View File
@@ -1,9 +1,9 @@
OneIsland_House1_Text_GazeUponVolcanoOnSunnyDays:: @ 81A2332
OneIsland_House1_Text_GazeUponVolcanoOnSunnyDays::
.string "On sunny days, I step out and gaze\n"
.string "upon the volcano.\p"
.string "That's my daily routine.$"
OneIsland_House1_Text_LastTimeMtEmberErupted:: @ 81A2380
OneIsland_House1_Text_LastTimeMtEmberErupted::
.string "Let me think… When was the last\n"
.string "time MT. EMBER erupted?$"