Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
1146 changed files with 40526 additions and 38156 deletions
+4 -4
View File
@@ -1,17 +1,17 @@
PokemonTower_4F_MapScripts:: @ 81633EC
PokemonTower_4F_MapScripts::
.byte 0
PokemonTower_4F_EventScript_Paula:: @ 81633ED
PokemonTower_4F_EventScript_Paula::
trainerbattle_single TRAINER_CHANNELER_PAULA, PokemonTower_4F_Text_PaulaIntro, PokemonTower_4F_Text_PaulaDefeat
msgbox PokemonTower_4F_Text_PaulaPostBattle, MSGBOX_AUTOCLOSE
end
PokemonTower_4F_EventScript_Laurel:: @ 8163404
PokemonTower_4F_EventScript_Laurel::
trainerbattle_single TRAINER_CHANNELER_LAUREL, PokemonTower_4F_Text_LaurelIntro, PokemonTower_4F_Text_LaurelDefeat
msgbox PokemonTower_4F_Text_LaurelPostBattle, MSGBOX_AUTOCLOSE
end
PokemonTower_4F_EventScript_Jody:: @ 816341B
PokemonTower_4F_EventScript_Jody::
trainerbattle_single TRAINER_CHANNELER_JODY, PokemonTower_4F_Text_JodyIntro, PokemonTower_4F_Text_JodyDefeat
msgbox PokemonTower_4F_Text_JodyPostBattle, MSGBOX_AUTOCLOSE
end
+9 -9
View File
@@ -1,33 +1,33 @@
PokemonTower_4F_Text_PaulaIntro:: @ 817A004
PokemonTower_4F_Text_PaulaIntro::
.string "Ghost! No!\n"
.string "Kwaaah!$"
PokemonTower_4F_Text_PaulaDefeat:: @ 817A017
PokemonTower_4F_Text_PaulaDefeat::
.string "Where is the ghost?$"
PokemonTower_4F_Text_PaulaPostBattle:: @ 817A02B
PokemonTower_4F_Text_PaulaPostBattle::
.string "I must have been dreaming…$"
PokemonTower_4F_Text_LaurelIntro:: @ 817A046
PokemonTower_4F_Text_LaurelIntro::
.string "Be cursed with me!\n"
.string "Kwaaah!$"
PokemonTower_4F_Text_LaurelDefeat:: @ 817A061
PokemonTower_4F_Text_LaurelDefeat::
.string "What!$"
PokemonTower_4F_Text_LaurelPostBattle:: @ 817A067
PokemonTower_4F_Text_LaurelPostBattle::
.string "We can't determine the identity of\n"
.string "the ghosts…$"
PokemonTower_4F_Text_JodyIntro:: @ 817A096
PokemonTower_4F_Text_JodyIntro::
.string "Huhuhu…\n"
.string "Beat me not!$"
PokemonTower_4F_Text_JodyDefeat:: @ 817A0AB
PokemonTower_4F_Text_JodyDefeat::
.string "Huh?\n"
.string "Who? What?$"
PokemonTower_4F_Text_JodyPostBattle:: @ 817A0BB
PokemonTower_4F_Text_JodyPostBattle::
.string "May the departed POKéMON rest in\n"
.string "peace…$"