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 @@
SixIsland_GreenPath_MapScripts:: @ 8168B2D
SixIsland_GreenPath_MapScripts::
.byte 0
SixIsland_GreenPath_EventScript_RightRouteSign:: @ 8168B2E
SixIsland_GreenPath_EventScript_RightRouteSign::
msgbox SixIsland_GreenPath_Text_LeftRouteSign, MSGBOX_SIGN
end
SixIsland_GreenPath_EventScript_LeftRouteSign:: @ 8168B37
SixIsland_GreenPath_EventScript_LeftRouteSign::
msgbox SixIsland_GreenPath_Text_RightRouteSign, MSGBOX_SIGN
end
+5 -5
View File
@@ -1,21 +1,21 @@
SixIsland_GreenPath_Text_JaclynIntro:: @ 818B7B0
SixIsland_GreenPath_Text_JaclynIntro::
.string "…Huh?\p"
.string "I was envisioning my house, but\n"
.string "this is where I TELEPORT?$"
SixIsland_GreenPath_Text_JaclynDefeat:: @ 818B7F0
SixIsland_GreenPath_Text_JaclynDefeat::
.string "Big boo-boo!$"
SixIsland_GreenPath_Text_JaclynPostBattle:: @ 818B7FD
SixIsland_GreenPath_Text_JaclynPostBattle::
.string "I am so scatterbrained!\p"
.string "I need to focus so I can TELEPORT\n"
.string "properly to my house!$"
SixIsland_GreenPath_Text_LeftRouteSign:: @ 818B84D
SixIsland_GreenPath_Text_LeftRouteSign::
.string "GREEN PATH\n"
.string "PATTERN BUSH AHEAD$"
SixIsland_GreenPath_Text_RightRouteSign:: @ 818B86B
SixIsland_GreenPath_Text_RightRouteSign::
.string "GREEN PATH\n"
.string "Think Green, Keep Nature Clean!$"