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
+2 -2
View File
@@ -1,7 +1,7 @@
SSAnne_2F_Room1_MapScripts:: @ 8160C96
SSAnne_2F_Room1_MapScripts::
.byte 0
SSAnne_2F_Room1_EventScript_Gentleman:: @ 8160C97
SSAnne_2F_Room1_EventScript_Gentleman::
lock
faceplayer
message SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis
+1 -1
View File
@@ -1,4 +1,4 @@
SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis:: @ 8173CE3
SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis::
.string "I've journeyed far and wide, but in\n"
.string "all my travels I've never seen\l"
.string "any POKéMON sleep like this one!\p"