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
@@ -1,6 +1,6 @@
Route15_WestEntrance_1F_MapScripts:: @ 8170088
Route15_WestEntrance_1F_MapScripts::
.byte 0
Route15_WestEntrance_1F_EventScript_Guard:: @ 8170089
Route15_WestEntrance_1F_EventScript_Guard::
msgbox Route15_WestEntrance_1F_Text_OaksAideCameByHere, MSGBOX_NPC
end
+1 -1
View File
@@ -1,4 +1,4 @@
Route15_WestEntrance_1F_Text_OaksAideCameByHere:: @ 819F560
Route15_WestEntrance_1F_Text_OaksAideCameByHere::
.string "Are you the kid who's working on\n"
.string "a POKéDEX?\p"
.string "PROF. OAK's AIDE came by here.$"