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/Route4_PokemonCenter_2F/scripts.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/Route4_PokemonCenter_2F') diff --git a/data/maps/Route4_PokemonCenter_2F/scripts.inc b/data/maps/Route4_PokemonCenter_2F/scripts.inc index bff6832da..b1f69ff32 100644 --- a/data/maps/Route4_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8 - map_script 2, Route4_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, Route4_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, Route4_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, Route4_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route4_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route4_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, Route4_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, Route4_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 Route4_PokemonCenter_2F_EventScript_16F8ED:: @ 816F8ED -- 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/Route4_PokemonCenter_2F/map.json | 2 +- data/maps/Route4_PokemonCenter_2F/scripts.inc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'data/maps/Route4_PokemonCenter_2F') diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index 2501fc3f4..2f53bfcef 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/Route4_PokemonCenter_2F/scripts.inc b/data/maps/Route4_PokemonCenter_2F/scripts.inc index b1f69ff32..e70f53403 100644 --- a/data/maps/Route4_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8 - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route4_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route4_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, Route4_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, Route4_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 Route4_PokemonCenter_2F_EventScript_16F8ED:: @ 816F8ED -- 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/Route4_PokemonCenter_2F/map.json | 10 +++++----- data/maps/Route4_PokemonCenter_2F/scripts.inc | 13 +++++++------ 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'data/maps/Route4_PokemonCenter_2F') diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index 2f53bfcef..f602e0e25 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/Route4_PokemonCenter_2F/scripts.inc b/data/maps/Route4_PokemonCenter_2F/scripts.inc index e70f53403..32b1905a4 100644 --- a/data/maps/Route4_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -Route4_PokemonCenter_2F_EventScript_16F8ED:: @ 816F8ED - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +Route4_PokemonCenter_2F_EventScript_Colosseum:: @ 816F8ED + call CableClub_EventScript_Colosseum end -EventScript_16F8F3:: @ 816F8F3 - call EventScript_1BB6AB +Route4_PokemonCenter_2F_EventScript_TradeCenter:: @ 816F8F3 + call CableClub_EventScript_TradeCenter end -EventScript_16F8F9:: @ 816F8F9 - call EventScript_1BB7DE +Route4_PokemonCenter_2F_EventScript_RecordCorner:: @ 816F8F9 + call CableClub_EventScript_RecordCorner end -- cgit v1.2.3