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
+2 -2
View File
@@ -1,10 +1,10 @@
TrainerTower_Roof_MapScripts:: @ 8164828
TrainerTower_Roof_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
.byte 0
@ Below script is unused, the identical version in the 1F script is used instead
TrainerTower_Roof_EventScript_Owner:: @ 8164833
TrainerTower_Roof_EventScript_Owner::
call TrainerTower_EventScript_SpeakToOwner
end