From 5c1667b41a7d31df6d405d272833895bf8472cf6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 29 Jan 2019 16:55:25 -0600 Subject: Define layout constants --- data/maps/FallarborTown_PokemonCenter_1F/events.inc | 6 +++--- data/maps/FallarborTown_PokemonCenter_1F/header.inc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'data/maps/FallarborTown_PokemonCenter_1F') diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc index cb6243c6f..f091ffce1 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/events.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0 +FallarborTown_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE -FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500 +FallarborTown_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN warp_def 6, 8, 3, 2, MAP_FALLARBOR_TOWN warp_def 1, 6, 4, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F -FallarborTown_PokemonCenter_1F_MapEvents:: @ 852E518 +FallarborTown_PokemonCenter_1F_MapEvents:: map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index b30b4874f..a03b385b5 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -FallarborTown_PokemonCenter_1F: @ 8482DE8 +FallarborTown_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte FallarborTown_PokemonCenter_1F_MapEvents .4byte FallarborTown_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE -- cgit v1.2.3 From 29d6221935d3e8e01dc11b4023ba977ff433f3c9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 31 Jan 2019 15:51:20 -0600 Subject: Convert map data to JSON --- .../maps/FallarborTown_PokemonCenter_1F/events.inc | 14 ---- .../maps/FallarborTown_PokemonCenter_1F/header.inc | 15 ---- data/maps/FallarborTown_PokemonCenter_1F/map.json | 95 ++++++++++++++++++++++ 3 files changed, 95 insertions(+), 29 deletions(-) delete mode 100644 data/maps/FallarborTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/FallarborTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/FallarborTown_PokemonCenter_1F/map.json (limited to 'data/maps/FallarborTown_PokemonCenter_1F') diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc deleted file mode 100644 index f091ffce1..000000000 --- a/data/maps/FallarborTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FallarborTown_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE - -FallarborTown_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN - warp_def 6, 8, 3, 2, MAP_FALLARBOR_TOWN - warp_def 1, 6, 4, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F - -FallarborTown_PokemonCenter_1F_MapEvents:: - map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc deleted file mode 100644 index a03b385b5..000000000 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte FallarborTown_PokemonCenter_1F_MapEvents - .4byte FallarborTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json new file mode 100644 index 000000000..a432b8a1a --- /dev/null +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F", + "name": "FallarborTown_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_1F_EventScript_200BE1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_1F_EventScript_200BEF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_1F_EventScript_200BF8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_1F_EventScript_200C01", + "flag": "FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file -- cgit v1.2.3 From 19b76bffda07d8878c1ff1a9005e1b57c549ffce Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 16 Feb 2019 16:40:31 -0600 Subject: Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields --- data/maps/FallarborTown_PokemonCenter_1F/map.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data/maps/FallarborTown_PokemonCenter_1F') diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json index a432b8a1a..b1ea1ed14 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_1F_EventScript_200BE1", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_1F_EventScript_200BEF", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_1F_EventScript_200BF8", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_1F_EventScript_200C01", "flag": "FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE" } -- cgit v1.2.3 From 8816aa527d7f3adfa10988ac661b9842bf78e64b Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 02:28:32 -0500 Subject: Update map script files --- data/maps/FallarborTown_PokemonCenter_1F/scripts.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/FallarborTown_PokemonCenter_1F') diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index c9a7ef27c..d34e139eb 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD - map_script 3, FallarborTown_PokemonCenter_1F_MapScript1_200BD8 - map_script 5, FallarborTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_MapScript1_200BD8 + map_script MAP_SCRIPT_ON_RESUME, FallarborTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8 -- cgit v1.2.3