dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
parent 23d7c00c62 d6d5290099
commit 2b93687ade
1146 changed files with 40526 additions and 38156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SSAnne_B1F_Room3/scripts.inc
+2 -2
View File
@@ -1,7 +1,7 @@
SSAnne_B1F_Room3_MapScripts:: @ 8160D8E
SSAnne_B1F_Room3_MapScripts::
.byte 0
SSAnne_B1F_Room3_EventScript_Dylan:: @ 8160D8F
SSAnne_B1F_Room3_EventScript_Dylan::
trainerbattle_single TRAINER_SAILOR_DYLAN, SSAnne_B1F_Room3_Text_DylanIntro, SSAnne_B1F_Room3_Text_DylanDefeat
msgbox SSAnne_B1F_Room3_Text_DylanPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/SSAnne_B1F_Room3/text.inc
+3 -3
View File
@@ -1,11 +1,11 @@
SSAnne_B1F_Room3_Text_DylanIntro:: @ 81742A6
SSAnne_B1F_Room3_Text_DylanIntro::
.string "I like feisty kids like you!$"
SSAnne_B1F_Room3_Text_DylanDefeat:: @ 81742C3
SSAnne_B1F_Room3_Text_DylanDefeat::
.string "Argh!\n"
.string "Lost it!$"
SSAnne_B1F_Room3_Text_DylanPostBattle:: @ 81742D2
SSAnne_B1F_Room3_Text_DylanPostBattle::
.string "Sea POKéMON live in deep water.\n"
.string "You'll need a ROD to fish them up!$"