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_1F_Room2/scripts.inc
+4 -4
View File
@@ -1,16 +1,16 @@
SSAnne_1F_Room2_MapScripts:: @ 8160BE5
SSAnne_1F_Room2_MapScripts::
.byte 0
SSAnne_1F_Room2_EventScript_Woman:: @ 8160BE6
SSAnne_1F_Room2_EventScript_Woman::
msgbox SSAnne_1F_Room2_Text_CruisingAroundWorld, MSGBOX_NPC
end
SSAnne_1F_Room2_EventScript_Ann:: @ 8160BEF
SSAnne_1F_Room2_EventScript_Ann::
trainerbattle_single TRAINER_LASS_ANN, SSAnne_1F_Room2_Text_AnnIntro, SSAnne_1F_Room2_Text_AnnDefeat
msgbox SSAnne_1F_Room2_Text_AnnPostBattle, MSGBOX_AUTOCLOSE
end
SSAnne_1F_Room2_EventScript_Tyler:: @ 8160C06
SSAnne_1F_Room2_EventScript_Tyler::
trainerbattle_single TRAINER_YOUNGSTER_TYLER, SSAnne_1F_Room2_Text_TylerIntro, SSAnne_1F_Room2_Text_TylerDefeat
msgbox SSAnne_1F_Room2_Text_TylerPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/SSAnne_1F_Room2/text.inc
+7 -7
View File
@@ -1,31 +1,31 @@
SSAnne_1F_Room2_Text_TylerIntro:: @ 8173999
SSAnne_1F_Room2_Text_TylerIntro::
.string "I love POKéMON!\n"
.string "Do you?$"
SSAnne_1F_Room2_Text_TylerDefeat:: @ 81739B1
SSAnne_1F_Room2_Text_TylerDefeat::
.string "Wow! \n"
.string "You're great!$"
SSAnne_1F_Room2_Text_TylerPostBattle:: @ 81739C5
SSAnne_1F_Room2_Text_TylerPostBattle::
.string "Listen, listen!\n"
.string "Let me be your friend, okay?\p"
.string "Then we can trade POKéMON and\n"
.string "do stuff.$"
SSAnne_1F_Room2_Text_AnnIntro:: @ 8173A1A
SSAnne_1F_Room2_Text_AnnIntro::
.string "I collected these POKéMON\n"
.string "from all around the world!$"
SSAnne_1F_Room2_Text_AnnDefeat:: @ 8173A4F
SSAnne_1F_Room2_Text_AnnDefeat::
.string "Oh, no!\n"
.string "I went around the world for these!$"
SSAnne_1F_Room2_Text_AnnPostBattle:: @ 8173A7A
SSAnne_1F_Room2_Text_AnnPostBattle::
.string "You hurt my poor POKéMON!\p"
.string "I demand that you heal them at a\n"
.string "POKéMON CENTER!$"
SSAnne_1F_Room2_Text_CruisingAroundWorld:: @ 8173AC5
SSAnne_1F_Room2_Text_CruisingAroundWorld::
.string "We are cruising around the world,\n"
.string "my children and I.$"