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,7 +1,7 @@
FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10
FiveIsland_LostCave_Room4_MapScripts::
.byte 0
FiveIsland_LostCave_Room4_EventScript_Laura:: @ 8164C11
FiveIsland_LostCave_Room4_EventScript_Laura::
trainerbattle_single TRAINER_PSYCHIC_LAURA, FiveIsland_LostCave_Room4_Text_LauraIntro, FiveIsland_LostCave_Room4_Text_LauraDefeat
msgbox FiveIsland_LostCave_Room4_Text_LauraPostBattle, MSGBOX_AUTOCLOSE
end
+3 -3
View File
@@ -1,12 +1,12 @@
FiveIsland_LostCave_Room4_Text_LauraIntro:: @ 817CFC1
FiveIsland_LostCave_Room4_Text_LauraIntro::
.string "I think there is a mysterious power\n"
.string "at work in this cave.$"
FiveIsland_LostCave_Room4_Text_LauraDefeat:: @ 817CFFB
FiveIsland_LostCave_Room4_Text_LauraDefeat::
.string "If you don't go into the right\n"
.string "tunnel, you won't get ahead.$"
FiveIsland_LostCave_Room4_Text_LauraPostBattle:: @ 817D037
FiveIsland_LostCave_Room4_Text_LauraPostBattle::
.string "Earlier, a lady went into the caves\n"
.string "ahead.$"