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
@@ -1,6 +1,6 @@
SixIsland_WaterPath_House2_MapScripts:: @ 8172178
SixIsland_WaterPath_House2_MapScripts::
.byte 0
SixIsland_WaterPath_House2_EventScript_Man:: @ 8172179
SixIsland_WaterPath_House2_EventScript_Man::
msgbox SixIsland_WaterPath_House2_Text_MyNeighborMeasuredMe, MSGBOX_NPC
end
@@ -1,4 +1,4 @@
SixIsland_WaterPath_House2_Text_MyNeighborMeasuredMe:: @ 81A4D0D
SixIsland_WaterPath_House2_Text_MyNeighborMeasuredMe::
.string "My height is 67.0 inches on the\n"
.string "button.\p"
.string "I know it is this precisely because\n"