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/PokemonTower_3F/scripts.inc
+4 -4
View File
@@ -1,17 +1,17 @@
PokemonTower_3F_MapScripts:: @ 81633A6
PokemonTower_3F_MapScripts::
.byte 0
PokemonTower_3F_EventScript_Patricia:: @ 81633A7
PokemonTower_3F_EventScript_Patricia::
trainerbattle_single TRAINER_CHANNELER_PATRICIA, PokemonTower_3F_Text_PatriciaIntro, PokemonTower_3F_Text_PatriciaDefeat
msgbox PokemonTower_3F_Text_PatriciaPostBattle, MSGBOX_AUTOCLOSE
end
PokemonTower_3F_EventScript_Carly:: @ 81633BE
PokemonTower_3F_EventScript_Carly::
trainerbattle_single TRAINER_CHANNELER_CARLY, PokemonTower_3F_Text_CarlyIntro, PokemonTower_3F_Text_CarlyDefeat
msgbox PokemonTower_3F_Text_CarlyPostBattle, MSGBOX_AUTOCLOSE
end
PokemonTower_3F_EventScript_Hope:: @ 81633D5
PokemonTower_3F_EventScript_Hope::
trainerbattle_single TRAINER_CHANNELER_HOPE, PokemonTower_3F_Text_HopeIntro, PokemonTower_3F_Text_HopeDefeat
msgbox PokemonTower_3F_Text_HopePostBattle, MSGBOX_AUTOCLOSE
end
data/maps/PokemonTower_3F/text.inc
+9 -9
View File
@@ -1,36 +1,36 @@
PokemonTower_3F_Text_HopeIntro:: @ 8179F09
PokemonTower_3F_Text_HopeIntro::
.string "Urrg… Awaa…\n"
.string "Huhu… Graa…$"
PokemonTower_3F_Text_HopeDefeat:: @ 8179F21
PokemonTower_3F_Text_HopeDefeat::
.string "Hwa!\n"
.string "I'm saved!$"
PokemonTower_3F_Text_HopePostBattle:: @ 8179F31
PokemonTower_3F_Text_HopePostBattle::
.string "The ghosts can be identified by\n"
.string "the SILPH SCOPE.$"
PokemonTower_3F_Text_CarlyIntro:: @ 8179F62
PokemonTower_3F_Text_CarlyIntro::
.string "Kekeke…\n"
.string "Kwaaah!$"
PokemonTower_3F_Text_CarlyDefeat:: @ 8179F72
PokemonTower_3F_Text_CarlyDefeat::
.string "Hmm?\n"
.string "What am I doing?$"
PokemonTower_3F_Text_CarlyPostBattle:: @ 8179F88
PokemonTower_3F_Text_CarlyPostBattle::
.string "Sorry!\n"
.string "I was possessed!$"
PokemonTower_3F_Text_PatriciaIntro:: @ 8179FA0
PokemonTower_3F_Text_PatriciaIntro::
.string "Be gone!\n"
.string "Malevolent spirit!$"
PokemonTower_3F_Text_PatriciaDefeat:: @ 8179FBC
PokemonTower_3F_Text_PatriciaDefeat::
.string "Whew!\n"
.string "The spirit left!$"
PokemonTower_3F_Text_PatriciaPostBattle:: @ 8179FD3
PokemonTower_3F_Text_PatriciaPostBattle::
.string "The others above…\n"
.string "They must have been possessed.$"