From 2e5bf6c9ef4f4406b1dd725e91a88cbdd10ad5c2 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 8 Jan 2020 19:16:45 -0500 Subject: Use map_script constants, name unique map_script labels --- data/maps/TwoIsland_PokemonCenter_2F/scripts.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/TwoIsland_PokemonCenter_2F/scripts.inc') diff --git a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc index 01954808c..84766419e 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ 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, TwoIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, TwoIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 TwoIsland_PokemonCenter_2F_EventScript_1717F3:: @ 81717F3 -- cgit v1.2.3 From 16dc234d9964e41443b965dc774a0ff60d3338fa Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 8 Jan 2020 23:44:55 -0500 Subject: Some stdscript sync, start syncing cable_club.inc --- data/maps/TwoIsland_PokemonCenter_2F/scripts.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/TwoIsland_PokemonCenter_2F/scripts.inc') diff --git a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc index 84766419e..99da551b4 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ TwoIsland_PokemonCenter_2F_MapScripts:: @ 81717DE - map_script MAP_SCRIPT_ON_FRAME_TABLE, TwoIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, TwoIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, 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 -- cgit v1.2.3 From 0bb7f18b8e609f76a9021420470737bbd16cc2bd Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 10 Jan 2020 16:55:58 -0500 Subject: Sync Cable Club scripts --- data/maps/TwoIsland_PokemonCenter_2F/scripts.inc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'data/maps/TwoIsland_PokemonCenter_2F/scripts.inc') diff --git a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc index 99da551b4..f8e803ccb 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ TwoIsland_PokemonCenter_2F_MapScripts:: @ 81717DE 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 -- cgit v1.2.3