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
+6 -6
View File
@@ -1,4 +1,4 @@
TrainerTower_1F_MapScripts:: @ 81646B8
TrainerTower_1F_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_1F_MapScripts:: @ 81646B8
@ All Trainer Tower floors/roof share these scripts for their object events
TrainerTower_EventScript_DoublesTrainer1:: @ 81646C8
TrainerTower_EventScript_DoublesTrainer1::
call TrainerTower_EventScript_SpeakToDoublesTrainer1
end
TrainerTower_EventScript_SinglesTrainer:: @ 81646CE
TrainerTower_EventScript_SinglesTrainer::
call TrainerTower_EventScript_SpeakToSinglesTrainer
end
TrainerTower_EventScript_KnockoutTrainer:: @ 81646D4
TrainerTower_EventScript_KnockoutTrainer::
call TrainerTower_EventScript_SpeakToKnockoutTrainer
end
TrainerTower_EventScript_DoublesTrainer2:: @ 81646DA
TrainerTower_EventScript_DoublesTrainer2::
call TrainerTower_EventScript_SpeakToDoublesTrainer2
end
TrainerTower_EventScript_Owner:: @ 81646E0
TrainerTower_EventScript_Owner::
call TrainerTower_EventScript_SpeakToOwner
end