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 @@
FiveIsland_MapScripts:: @ 8167E8E
FiveIsland_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_OnTransition
.byte 0
FiveIsland_OnTransition:: @ 8167E94
FiveIsland_OnTransition::
setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND
end
FiveIsland_EventScript_IslandSign:: @ 8167E98
FiveIsland_EventScript_IslandSign::
msgbox FiveIsland_Text_IslandSign, MSGBOX_SIGN
end
FiveIsland_EventScript_BugCatcher:: @ 8167EA1
FiveIsland_EventScript_BugCatcher::
msgbox FiveIsland_Text_WeirdBuildingInMeadow, MSGBOX_NPC
end
FiveIsland_EventScript_Fisher:: @ 8167EAA
FiveIsland_EventScript_Fisher::
msgbox FiveIsland_Text_BeenGettingBusierAroundHere, MSGBOX_NPC
end
+3 -3
View File
@@ -1,14 +1,14 @@
FiveIsland_Text_IslandSign:: @ 8182DFB
FiveIsland_Text_IslandSign::
.string "FIVE ISLAND\n"
.string "Chrono Island: Where Time Goes$"
FiveIsland_Text_WeirdBuildingInMeadow:: @ 8182E26
FiveIsland_Text_WeirdBuildingInMeadow::
.string "Oh, this stinks. I wanted to play in\n"
.string "the MEADOW.\p"
.string "But they put up a weird building\n"
.string "on it, so I can't play there.$"
FiveIsland_Text_BeenGettingBusierAroundHere:: @ 8182E96
FiveIsland_Text_BeenGettingBusierAroundHere::
.string "It's been getting busier around\n"
.string "these parts lately.\p"
.string "I haven't been catching many good\n"