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 @@
SSAnne_2F_Room3_MapScripts:: @ 8160CDF
SSAnne_2F_Room3_MapScripts::
.byte 0
SSAnne_2F_Room3_EventScript_Gentleman:: @ 8160CE0
SSAnne_2F_Room3_EventScript_Gentleman::
msgbox SSAnne_2F_Room3_Text_SeenMonsFerryPeople, MSGBOX_NPC
end
SSAnne_2F_Room3_EventScript_OldMan:: @ 8160CE9
SSAnne_2F_Room3_EventScript_OldMan::
msgbox SSAnne_2F_Room3_Text_SomeTreesCanBeCutDown, MSGBOX_NPC
end
+2 -2
View File
@@ -1,8 +1,8 @@
SSAnne_2F_Room3_Text_SeenMonsFerryPeople:: @ 8173E3A
SSAnne_2F_Room3_Text_SeenMonsFerryPeople::
.string "Ah, yes, I have seen some POKéMON\n"
.string "ferry people across the water!$"
SSAnne_2F_Room3_Text_SomeTreesCanBeCutDown:: @ 8173E7B
SSAnne_2F_Room3_Text_SomeTreesCanBeCutDown::
.string "Small trees can be chopped down\n"
.string "using the move CUT.\p"
.string "But remember this!\n"