diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-31 13:30:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-31 13:30:40 -0400 |
| commit | 3e60a7840653e50845abf10bb02cd1b519dcd80f (patch) | |
| tree | cb4a0d227a238ebdeb3b6cb9fdb92781bcc4f5e7 /data/maps/RustboroCity_PokemonCenter_2F | |
| parent | 602855ea99d8015ef5b7709f6fb1e9fd167239e2 (diff) | |
| parent | d391486247cc9f29d85787d6711f7cb993cf6585 (diff) | |
Merge branch 'master' into doc-frontierpass2
Diffstat (limited to 'data/maps/RustboroCity_PokemonCenter_2F')
| -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 |