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,6 +1,6 @@
SSAnne_3F_Corridor_MapScripts:: @ 8160A5D
SSAnne_3F_Corridor_MapScripts::
.byte 0
SSAnne_3F_Corridor_EventScript_Sailor:: @ 8160A5E
SSAnne_3F_Corridor_EventScript_Sailor::
msgbox SSAnne_3F_Corridor_Text_CaptainTeachesCutToMons, MSGBOX_NPC
end
+1 -1
View File
@@ -1,4 +1,4 @@
SSAnne_3F_Corridor_Text_CaptainTeachesCutToMons:: @ 817320C
SSAnne_3F_Corridor_Text_CaptainTeachesCutToMons::
.string "Our CAPTAIN is a sword master.\n"
.string "He's awesome at using CUT.\p"
.string "They say he even teaches CUT\n"