diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-12 17:04:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-12 17:04:23 -0500 |
| commit | 92d99d4fd2e5579372b9f4cc39468000553ba3a8 (patch) | |
| tree | 4ff8e60d1ad6a25dad888a4e78011624b46ad9ec /data/maps/TwoIsland_PokemonCenter_2F/scripts.inc | |
| parent | 15ff7eb2f87032797f6ce9ef9bb471c468b48a36 (diff) | |
| parent | 0676e732869d0e62322b001cbab57b8500361005 (diff) | |
Merge pull request #207 from GriffinRichards/sync-script
Sync scripts with pokeemerald
Diffstat (limited to 'data/maps/TwoIsland_PokemonCenter_2F/scripts.inc')
| -rw-r--r-- | data/maps/TwoIsland_PokemonCenter_2F/scripts.inc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc index 01954808c..f8e803ccb 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ TwoIsland_PokemonCenter_2F_MapScripts:: @ 81717DE - map_script 2, TwoIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, TwoIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, TwoIsland_PokemonCenter_2F_MapScript4_1BB1B4 + 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 + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -TwoIsland_PokemonCenter_2F_EventScript_1717F3:: @ 81717F3 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +TwoIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 81717F3 + call CableClub_EventScript_Colosseum end -EventScript_1717F9:: @ 81717F9 - call EventScript_1BB6AB +TwoIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 81717F9 + call CableClub_EventScript_TradeCenter end -EventScript_1717FF:: @ 81717FF - call EventScript_1BB7DE +TwoIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 81717FF + call CableClub_EventScript_RecordCorner end |