Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

2022-08-10 13:48:30 -04:00
parent 23d7c00c62 d6d5290099
commit 2b93687ade
1146 changed files with 40526 additions and 38156 deletions
@@ -1,6 +1,6 @@
-Route7_MapScripts:: @ 8167FBB
+Route7_MapScripts::
 	.byte 0

-Route7_EventScript_UndergroundPathSign:: @ 8167FBC
+Route7_EventScript_UndergroundPathSign::
 	msgbox Route7_Text_UndergroundPathSign, MSGBOX_SIGN
 	end
@@ -1,4 +1,4 @@
-Route7_Text_UndergroundPathSign:: @ 8184097
+Route7_Text_UndergroundPathSign::
    .string "UNDERGROUND PATH\n"
    .string "CELADON CITY - LAVENDER TOWN$"