diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-07 16:10:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-07 16:10:35 -0400 |
| commit | a2655ba9ab82646a54f60abc6078df372179f8d4 (patch) | |
| tree | 95b074a1a4d77d6cd77e413e1d6e72eb55b595b0 /data/maps/RustboroCity_PokemonCenter_2F/scripts.inc | |
| parent | e86d3410a1719fcbf62754bfda93a295aa7e0d57 (diff) | |
| parent | 001a25e49cd6acdac89a62f4230aef80422e78f2 (diff) | |
Merge branch 'master' into doc-union
Diffstat (limited to 'data/maps/RustboroCity_PokemonCenter_2F/scripts.inc')
| -rw-r--r-- | data/maps/RustboroCity_PokemonCenter_2F/scripts.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc index ba7b5b285..693204377 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE +RustboroCity_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,15 +6,15 @@ RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE .byte 0 @ The below 3 are unused and leftover from RS -RustboroCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8214EF3 +RustboroCity_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -RustboroCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8214EF9 +RustboroCity_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -RustboroCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8214EFF +RustboroCity_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end |