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/TrainerTower_2F/scripts.inc
+6 -6
View File
@@ -1,4 +1,4 @@
TrainerTower_2F_MapScripts:: @ 81646E6
TrainerTower_2F_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
@@ -6,22 +6,22 @@ TrainerTower_2F_MapScripts:: @ 81646E6
@ Below scripts are unused, the identical versions in the 1F script are used instead
TrainerTower_2F_EventScript_DoublesTrainer1:: @ 81646F6
TrainerTower_2F_EventScript_DoublesTrainer1::
call TrainerTower_EventScript_SpeakToDoublesTrainer1
end
TrainerTower_2F_EventScript_SinglesTrainer:: @ 81646FC
TrainerTower_2F_EventScript_SinglesTrainer::
call TrainerTower_EventScript_SpeakToSinglesTrainer
end
TrainerTower_2F_EventScript_KnockoutTrainer:: @ 8164702
TrainerTower_2F_EventScript_KnockoutTrainer::
call TrainerTower_EventScript_SpeakToKnockoutTrainer
end
TrainerTower_2F_EventScript_DoublesTrainer2:: @ 8164708
TrainerTower_2F_EventScript_DoublesTrainer2::
call TrainerTower_EventScript_SpeakToDoublesTrainer2
end
TrainerTower_2F_EventScript_Owner:: @ 816470E
TrainerTower_2F_EventScript_Owner::
call TrainerTower_EventScript_SpeakToOwner
end