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_Room5/scripts.inc
+2 -2
View File
@@ -1,7 +1,7 @@
SSAnne_1F_Room5_MapScripts:: @ 8160C66
SSAnne_1F_Room5_MapScripts::
.byte 0
SSAnne_1F_Room5_EventScript_Arthur:: @ 8160C67
SSAnne_1F_Room5_EventScript_Arthur::
trainerbattle_single TRAINER_GENTLEMAN_ARTHUR, SSAnne_1F_Room5_Text_ArthurIntro, SSAnne_1F_Room5_Text_ArthurDefeat
msgbox SSAnne_1F_Room5_Text_ArthurPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/SSAnne_1F_Room5/text.inc
+3 -3
View File
@@ -1,12 +1,12 @@
SSAnne_1F_Room5_Text_ArthurIntro:: @ 8173BD1
SSAnne_1F_Room5_Text_ArthurIntro::
.string "You insolent pup!\n"
.string "How dare you barge in!$"
SSAnne_1F_Room5_Text_ArthurDefeat:: @ 8173BFA
SSAnne_1F_Room5_Text_ArthurDefeat::
.string "Humph! You rude child!\n"
.string "You have no sense of courtesy!$"
SSAnne_1F_Room5_Text_ArthurPostBattle:: @ 8173C30
SSAnne_1F_Room5_Text_ArthurPostBattle::
.string "I wish to be left alone!\n"
.string "Get out!$"