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
@@ -1,4 +1,4 @@
CeladonCity_PokemonCenter_2F_MapScripts:: @ 816C61F
CeladonCity_PokemonCenter_2F_MapScripts::
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
@@ -6,14 +6,14 @@ CeladonCity_PokemonCenter_2F_MapScripts:: @ 816C61F
.byte 0
@ The below 3 are unused and leftover from RS
CeladonCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816C634
CeladonCity_PokemonCenter_2F_EventScript_Colosseum::
call CableClub_EventScript_Colosseum
end
CeladonCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816C63A
CeladonCity_PokemonCenter_2F_EventScript_TradeCenter::
call CableClub_EventScript_TradeCenter
end
CeladonCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816C640
CeladonCity_PokemonCenter_2F_EventScript_RecordCorner::
call CableClub_EventScript_RecordCorner
end