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 @@
Route2_MapScripts:: @ 8167F64
Route2_MapScripts::
.byte 0
Route2_EventScript_RouteSign:: @ 8167F65
Route2_EventScript_RouteSign::
msgbox Route2_Text_RouteSign, MSGBOX_SIGN
end
Route2_EventScript_DiglettsCaveSign:: @ 8167F6E
Route2_EventScript_DiglettsCaveSign::
msgbox Route2_Text_DiglettsCave, MSGBOX_SIGN
end
+2 -2
View File
@@ -1,7 +1,7 @@
Route2_Text_RouteSign:: @ 818345E
Route2_Text_RouteSign::
.string "ROUTE 2\n"
.string "VIRIDIAN CITY - PEWTER CITY$"
Route2_Text_DiglettsCave:: @ 8183482
Route2_Text_DiglettsCave::
.string "DIGLETT'S CAVE$"