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_Room7/scripts.inc
+2 -2
View File
@@ -1,7 +1,7 @@
SSAnne_1F_Room7_MapScripts:: @ 8160C7E
SSAnne_1F_Room7_MapScripts::
.byte 0
SSAnne_1F_Room7_EventScript_Thomas:: @ 8160C7F
SSAnne_1F_Room7_EventScript_Thomas::
trainerbattle_single TRAINER_GENTLEMAN_THOMAS, SSAnne_1F_Room7_Text_ThomasIntro, SSAnne_1F_Room7_Text_ThomasDefeat
msgbox SSAnne_1F_Room7_Text_ThomasPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/SSAnne_1F_Room7/text.inc
+3 -3
View File
@@ -1,11 +1,11 @@
SSAnne_1F_Room7_Text_ThomasIntro:: @ 8173C52
SSAnne_1F_Room7_Text_ThomasIntro::
.string "I am but a solitary traveler…\p"
.string "My sole companions and friends are\n"
.string "POKéMON I caught on my journeys…$"
SSAnne_1F_Room7_Text_ThomasDefeat:: @ 8173CB4
SSAnne_1F_Room7_Text_ThomasDefeat::
.string "My, my friends…$"
SSAnne_1F_Room7_Text_ThomasPostBattle:: @ 8173CC4
SSAnne_1F_Room7_Text_ThomasPostBattle::
.string "You should be nice to friends!$"