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_Room4/scripts.inc
+3 -3
View File
@@ -1,12 +1,12 @@
SSAnne_B1F_Room4_MapScripts:: @ 8160DA6
SSAnne_B1F_Room4_MapScripts::
.byte 0
SSAnne_B1F_Room4_EventScript_Leonard:: @ 8160DA7
SSAnne_B1F_Room4_EventScript_Leonard::
trainerbattle_single TRAINER_SAILOR_LEONARD, SSAnne_B1F_Room4_Text_LeonardIntro, SSAnne_B1F_Room4_Text_LeonardDefeat
msgbox SSAnne_B1F_Room4_Text_LeonardPostBattle, MSGBOX_AUTOCLOSE
end
SSAnne_B1F_Room4_EventScript_Duncan:: @ 8160DBE
SSAnne_B1F_Room4_EventScript_Duncan::
trainerbattle_single TRAINER_SAILOR_DUNCAN, SSAnne_B1F_Room4_Text_DuncanIntro, SSAnne_B1F_Room4_Text_DuncanDefeat
msgbox SSAnne_B1F_Room4_Text_DuncanPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/SSAnne_B1F_Room4/text.inc
+6 -6
View File
@@ -1,23 +1,23 @@
SSAnne_B1F_Room4_Text_LeonardIntro:: @ 8174315
SSAnne_B1F_Room4_Text_LeonardIntro::
.string "You know what they say about\n"
.string "sailors and battling!$"
SSAnne_B1F_Room4_Text_LeonardDefeat:: @ 8174348
SSAnne_B1F_Room4_Text_LeonardDefeat::
.string "Right!\n"
.string "Good battle, mate!$"
SSAnne_B1F_Room4_Text_LeonardPostBattle:: @ 8174362
SSAnne_B1F_Room4_Text_LeonardPostBattle::
.string "Hahaha!\n"
.string "Want to be a sailor, mate?$"
SSAnne_B1F_Room4_Text_DuncanIntro:: @ 8174385
SSAnne_B1F_Room4_Text_DuncanIntro::
.string "Come on, then!\n"
.string "My sailor's pride is at stake!$"
SSAnne_B1F_Room4_Text_DuncanDefeat:: @ 81743B3
SSAnne_B1F_Room4_Text_DuncanDefeat::
.string "Your spirit sank me!$"
SSAnne_B1F_Room4_Text_DuncanPostBattle:: @ 81743C8
SSAnne_B1F_Room4_Text_DuncanPostBattle::
.string "Did you see the FISHING GURU in\n"
.string "VERMILION CITY?$"