diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 23:44:55 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 23:44:55 -0500 |
| commit | 16dc234d9964e41443b965dc774a0ff60d3338fa (patch) | |
| tree | 2bbdb33e455bdc37e81c388d4005eeebd50e36c0 /data/maps/CinnabarIsland_PokemonCenter_2F | |
| parent | 33a4b6848647bd18ca1d01e44d15624c195305a9 (diff) | |
Some stdscript sync, start syncing cable_club.inc
Diffstat (limited to 'data/maps/CinnabarIsland_PokemonCenter_2F')
| -rw-r--r-- | data/maps/CinnabarIsland_PokemonCenter_2F/map.json | 2 | ||||
| -rw-r--r-- | data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 4bb297599..9eafc6d0a 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc index 6ca90c913..2f0476988 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ CinnabarIsland_PokemonCenter_2F_MapScripts:: @ 816E9E8 - map_script MAP_SCRIPT_ON_FRAME_TABLE, CinnabarIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CinnabarIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script MAP_SCRIPT_ON_LOAD, CinnabarIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_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 CinnabarIsland_PokemonCenter_2F_EventScript_16E9FD:: @ 816E9FD |