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_5F/scripts.inc
+8 -8
View File
@@ -1,11 +1,11 @@
PokemonTower_5F_MapScripts:: @ 8163432
PokemonTower_5F_MapScripts::
.byte 0
PokemonTower_5F_EventScript_Channeler:: @ 8163433
PokemonTower_5F_EventScript_Channeler::
msgbox PokemonTower_5F_Text_RestHereInPurifiedSpace, MSGBOX_NPC
end
PokemonTower_5F_EventScript_PurifiedZone:: @ 816343C
PokemonTower_5F_EventScript_PurifiedZone::
lockall
fadescreen FADE_TO_WHITE
special HealPlayerParty
@@ -15,28 +15,28 @@ PokemonTower_5F_EventScript_PurifiedZone:: @ 816343C
releaseall
end
PokemonTower_5F_EventScript_ExitPurifiedZone:: @ 8163453
PokemonTower_5F_EventScript_ExitPurifiedZone::
lockall
setvar VAR_TEMP_1, 0
releaseall
end
PokemonTower_5F_EventScript_Tammy:: @ 816345B
PokemonTower_5F_EventScript_Tammy::
trainerbattle_single TRAINER_CHANNELER_TAMMY, PokemonTower_5F_Text_TammyIntro, PokemonTower_5F_Text_TammyDefeat
msgbox PokemonTower_5F_Text_TammyPostBattle, MSGBOX_AUTOCLOSE
end
PokemonTower_5F_EventScript_Ruth:: @ 8163472
PokemonTower_5F_EventScript_Ruth::
trainerbattle_single TRAINER_CHANNELER_RUTH, PokemonTower_5F_Text_RuthIntro, PokemonTower_5F_Text_RuthDefeat
msgbox PokemonTower_5F_Text_RuthPostBattle, MSGBOX_AUTOCLOSE
end
PokemonTower_5F_EventScript_Karina:: @ 8163489
PokemonTower_5F_EventScript_Karina::
trainerbattle_single TRAINER_CHANNELER_KARINA, PokemonTower_5F_Text_KarinaIntro, PokemonTower_5F_Text_KarinaDefeat
msgbox PokemonTower_5F_Text_KarinaPostBattle, MSGBOX_AUTOCLOSE
end
PokemonTower_5F_EventScript_Janae:: @ 81634A0
PokemonTower_5F_EventScript_Janae::
trainerbattle_single TRAINER_CHANNELER_JANAE, PokemonTower_5F_Text_JanaeIntro, PokemonTower_5F_Text_JanaeDefeat
msgbox PokemonTower_5F_Text_JanaePostBattle, MSGBOX_AUTOCLOSE
end
data/maps/PokemonTower_5F/text.inc
+14 -14
View File
@@ -1,49 +1,49 @@
PokemonTower_5F_Text_RestHereInPurifiedSpace:: @ 817A0E3
PokemonTower_5F_Text_RestHereInPurifiedSpace::
.string "Come, child!\n"
.string "I have purified this space.\l"
.string "You can rest here.$"
PokemonTower_5F_Text_TammyIntro:: @ 817A11F
PokemonTower_5F_Text_TammyIntro::
.string "Give…me…\n"
.string "your…all…$"
PokemonTower_5F_Text_TammyDefeat:: @ 817A132
PokemonTower_5F_Text_TammyDefeat::
.string "Gasp!$"
PokemonTower_5F_Text_TammyPostBattle:: @ 817A138
PokemonTower_5F_Text_TammyPostBattle::
.string "I was under possession.$"
PokemonTower_5F_Text_RuthIntro:: @ 817A150
PokemonTower_5F_Text_RuthIntro::
.string "You…shall…\n"
.string "join…us…$"
PokemonTower_5F_Text_RuthDefeat:: @ 817A164
PokemonTower_5F_Text_RuthDefeat::
.string "What a nightmare!$"
PokemonTower_5F_Text_RuthPostBattle:: @ 817A176
PokemonTower_5F_Text_RuthPostBattle::
.string "I was possessed.$"
PokemonTower_5F_Text_KarinaIntro:: @ 817A187
PokemonTower_5F_Text_KarinaIntro::
.string "Zombies!$"
PokemonTower_5F_Text_KarinaDefeat:: @ 817A190
PokemonTower_5F_Text_KarinaDefeat::
.string "Ha?$"
PokemonTower_5F_Text_KarinaPostBattle:: @ 817A194
PokemonTower_5F_Text_KarinaPostBattle::
.string "I regained my senses.$"
PokemonTower_5F_Text_JanaeIntro:: @ 817A1AA
PokemonTower_5F_Text_JanaeIntro::
.string "Urgah…\n"
.string "Urff…$"
PokemonTower_5F_Text_JanaeDefeat:: @ 817A1B7
PokemonTower_5F_Text_JanaeDefeat::
.string "Whoo!$"
PokemonTower_5F_Text_JanaePostBattle:: @ 817A1BD
PokemonTower_5F_Text_JanaePostBattle::
.string "I fell to evil spirits despite my\n"
.string "training in the mountains…$"
PokemonTower_5F_Text_PurifiedZoneMonsFullyHealed:: @ 817A1FA
PokemonTower_5F_Text_PurifiedZoneMonsFullyHealed::
.string "Entered the purified and protected\n"
.string "zone.\p"
.string "{PLAYER}'s POKéMON were fully\n"