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
+5 -5
View File
@@ -1,19 +1,19 @@
SixIsland_MapScripts:: @ 8167ED8
SixIsland_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_OnTransition
.byte 0
SixIsland_OnTransition:: @ 8167EDE
SixIsland_OnTransition::
setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND
end
SixIsland_EventScript_Hiker:: @ 8167EE2
SixIsland_EventScript_Hiker::
msgbox SixIsland_Text_ThatWayToWaterPathRuinValley, MSGBOX_NPC
end
SixIsland_EventScript_Boy:: @ 8167EEB
SixIsland_EventScript_Boy::
msgbox SixIsland_Text_SkyAtNightIsFantastic, MSGBOX_NPC
end
SixIsland_EventScript_IslandSign:: @ 8167EF4
SixIsland_EventScript_IslandSign::
msgbox SixIsland_Text_IslandSign, MSGBOX_SIGN
end
+3 -3
View File
@@ -1,14 +1,14 @@
SixIsland_Text_IslandSign:: @ 81831C6
SixIsland_Text_IslandSign::
.string "SIX ISLAND\n"
.string "Fortune Island of Aged Wisdom$"
SixIsland_Text_ThatWayToWaterPathRuinValley:: @ 81831EF
SixIsland_Text_ThatWayToWaterPathRuinValley::
.string "Keep going this way and you'll get\n"
.string "to the WATER PATH.\p"
.string "Stay on that and you'll get to\n"
.string "the RUIN VALLEY.$"
SixIsland_Text_SkyAtNightIsFantastic:: @ 8183255
SixIsland_Text_SkyAtNightIsFantastic::
.string "When you're this far away from the\n"
.string "city, the sky at night is fantastic.$"