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_Deck/scripts.inc
+6 -6
View File
@@ -1,24 +1,24 @@
SSAnne_Deck_MapScripts:: @ 8160A68
SSAnne_Deck_MapScripts::
.byte 0
SSAnne_Deck_EventScript_Youngster:: @ 8160A69
SSAnne_Deck_EventScript_Youngster::
msgbox SSAnne_Deck_Text_ShipDepartingSoon, MSGBOX_NPC
end
SSAnne_Deck_EventScript_BaldingMan:: @ 8160A72
SSAnne_Deck_EventScript_BaldingMan::
msgbox SSAnne_Deck_Text_FeelSeasick, MSGBOX_NPC
end
SSAnne_Deck_EventScript_Sailor:: @ 8160A7B
SSAnne_Deck_EventScript_Sailor::
msgbox SSAnne_Deck_Text_ScrubbingDecksHardWork, MSGBOX_NPC
end
SSAnne_Deck_EventScript_Edmond:: @ 8160A84
SSAnne_Deck_EventScript_Edmond::
trainerbattle_single TRAINER_SAILOR_EDMOND, SSAnne_Deck_Text_EdmondIntro, SSAnne_Deck_Text_EdmondDefeat
msgbox SSAnne_Deck_Text_EdmondPostBattle, MSGBOX_AUTOCLOSE
end
SSAnne_Deck_EventScript_Trevor:: @ 8160A9B
SSAnne_Deck_EventScript_Trevor::
trainerbattle_single TRAINER_SAILOR_TREVOR, SSAnne_Deck_Text_TrevorIntro, SSAnne_Deck_Text_TrevorDefeat
msgbox SSAnne_Deck_Text_TrevorPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/SSAnne_Deck/text.inc
+9 -9
View File
@@ -1,35 +1,35 @@
SSAnne_Deck_Text_ShipDepartingSoon:: @ 817326F
SSAnne_Deck_Text_ShipDepartingSoon::
.string "The party's over.\n"
.string "The ship will be departing soon.$"
SSAnne_Deck_Text_ScrubbingDecksHardWork:: @ 81732A2
SSAnne_Deck_Text_ScrubbingDecksHardWork::
.string "Whew!\n"
.string "Scrubbing decks is hard work!$"
SSAnne_Deck_Text_FeelSeasick:: @ 81732C6
SSAnne_Deck_Text_FeelSeasick::
.string "Urf… I feel ill…\p"
.string "I got seasick, so I stepped out to\n"
.string "get some air…$"
SSAnne_Deck_Text_EdmondIntro:: @ 8173308
SSAnne_Deck_Text_EdmondIntro::
.string "Hey, matey!\p"
.string "Let's do a little jig!$"
SSAnne_Deck_Text_EdmondDefeat:: @ 817332B
SSAnne_Deck_Text_EdmondDefeat::
.string "You're impressive!$"
SSAnne_Deck_Text_EdmondPostBattle:: @ 817333E
SSAnne_Deck_Text_EdmondPostBattle::
.string "How many kinds of POKéMON do you\n"
.string "think there are in this big world?$"
SSAnne_Deck_Text_TrevorIntro:: @ 8173382
SSAnne_Deck_Text_TrevorIntro::
.string "Ahoy, there!\n"
.string "Are you seasick?$"
SSAnne_Deck_Text_TrevorDefeat:: @ 81733A0
SSAnne_Deck_Text_TrevorDefeat::
.string "I was just careless!$"
SSAnne_Deck_Text_TrevorPostBattle:: @ 81733B5
SSAnne_Deck_Text_TrevorPostBattle::
.string "My pa said there are 100 kinds of\n"
.string "POKéMON. I think there are more.$"