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/Route112/connections.inc | 6 +++--- data/maps/Route112/events.inc | 8 ++++---- data/maps/Route112/header.inc | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/Route112') diff --git a/data/maps/Route112/connections.inc b/data/maps/Route112/connections.inc index 132c4ff76..0fc8da215 100644 --- a/data/maps/Route112/connections.inc +++ b/data/maps/Route112/connections.inc @@ -1,9 +1,9 @@ -Route112_MapConnectionsList: @ 848699C +Route112_MapConnectionsList: connection up, -60, MAP_ROUTE113 connection left, 40, MAP_LAVARIDGE_TOWN connection right, -20, MAP_ROUTE111 -Route112_MapConnections: @ 84869C0 - .4byte 0x3 +Route112_MapConnections: + .4byte 3 .4byte Route112_MapConnectionsList diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc index cfa145e97..4d1b338c3 100644 --- a/data/maps/Route112/events.inc +++ b/data/maps/Route112/events.inc @@ -1,4 +1,4 @@ -Route112_EventObjects: @ 8529974 +Route112_EventObjects: object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0 @@ -14,7 +14,7 @@ Route112_EventObjects: @ 8529974 object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0 object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 31, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0 -Route112_MapWarps: @ 8529AC4 +Route112_MapWarps: warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION warp_def 29, 27, 0, 1, MAP_ROUTE112_CABLE_CAR_STATION warp_def 6, 46, 3, 0, MAP_JAGGED_PASS @@ -22,11 +22,11 @@ Route112_MapWarps: @ 8529AC4 warp_def 11, 36, 0, 0, MAP_FIERY_PATH warp_def 22, 10, 0, 1, MAP_FIERY_PATH -Route112_MapBGEvents: @ 8529AF4 +Route112_MapBGEvents: bg_event 19, 44, 3, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E4F bg_event 22, 37, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E46 bg_event 4, 49, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E58 -Route112_MapEvents:: @ 8529B18 +Route112_MapEvents:: map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index 70e0f2d65..1cc8583a5 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -1,10 +1,10 @@ -Route112: @ 84827AC +Route112: .4byte Route112_Layout .4byte Route112_MapEvents .4byte Route112_MapScripts .4byte Route112_MapConnections .2byte MUS_DOORO_X1 - .2byte 28 + .2byte LAYOUT_ROUTE112 .byte MAPSEC_ROUTE_112 .byte 0 .byte WEATHER_SUNNY -- 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 --- data/maps/Route112/connections.inc | 9 -- data/maps/Route112/events.inc | 32 ----- data/maps/Route112/header.inc | 15 -- data/maps/Route112/map.json | 287 +++++++++++++++++++++++++++++++++++++ 4 files changed, 287 insertions(+), 56 deletions(-) delete mode 100644 data/maps/Route112/connections.inc delete mode 100644 data/maps/Route112/events.inc delete mode 100644 data/maps/Route112/header.inc create mode 100644 data/maps/Route112/map.json (limited to 'data/maps/Route112') diff --git a/data/maps/Route112/connections.inc b/data/maps/Route112/connections.inc deleted file mode 100644 index 0fc8da215..000000000 --- a/data/maps/Route112/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route112_MapConnectionsList: - connection up, -60, MAP_ROUTE113 - connection left, 40, MAP_LAVARIDGE_TOWN - connection right, -20, MAP_ROUTE111 - -Route112_MapConnections: - .4byte 3 - .4byte Route112_MapConnectionsList - diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc deleted file mode 100644 index 4d1b338c3..000000000 --- a/data/maps/Route112/events.inc +++ /dev/null @@ -1,32 +0,0 @@ -Route112_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0 - object_event 5, EVENT_OBJ_GFX_HIKER, 0, 15, 40, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 24, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 23, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 22, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 21, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 0, 0, Route112_EventScript_1F1E61, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route112_EventScript_290DCF, FLAG_ITEM_ROUTE_112_NUGGET - object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 31, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0 - -Route112_MapWarps: - warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION - warp_def 29, 27, 0, 1, MAP_ROUTE112_CABLE_CAR_STATION - warp_def 6, 46, 3, 0, MAP_JAGGED_PASS - warp_def 7, 46, 3, 1, MAP_JAGGED_PASS - warp_def 11, 36, 0, 0, MAP_FIERY_PATH - warp_def 22, 10, 0, 1, MAP_FIERY_PATH - -Route112_MapBGEvents: - bg_event 19, 44, 3, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E4F - bg_event 22, 37, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E46 - bg_event 4, 49, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E58 - -Route112_MapEvents:: - map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents - diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc deleted file mode 100644 index 1cc8583a5..000000000 --- a/data/maps/Route112/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route112: - .4byte Route112_Layout - .4byte Route112_MapEvents - .4byte Route112_MapScripts - .4byte Route112_MapConnections - .2byte MUS_DOORO_X1 - .2byte LAYOUT_ROUTE112 - .byte MAPSEC_ROUTE_112 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json new file mode 100644 index 000000000..937719abf --- /dev/null +++ b/data/maps/Route112/map.json @@ -0,0 +1,287 @@ +{ + "id": "MAP_ROUTE112", + "name": "Route112", + "layout": "LAYOUT_ROUTE112", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_112", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": -60, + "map": "MAP_ROUTE113" + }, + { + "direction": "left", + "offset": 40, + "map": "MAP_LAVARIDGE_TOWN" + }, + { + "direction": "right", + "offset": -20, + "map": "MAP_ROUTE111" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 26, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route112_EventScript_1F1DB7", + "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 24, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route112_EventScript_1F1E6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 29, + "y": 49, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1EE3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 22, + "y": 46, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1EFA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 15, + "y": 40, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1E81", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 27, + "y": 30, + "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": "Route112_EventScript_1F1DB7", + "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 27, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 24, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 28, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 23, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 29, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 22, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 30, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 21, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 8, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route112_EventScript_1F1E61", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 14, + "y": 43, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route112_EventScript_290DCF", + "flag": "FLAG_ITEM_ROUTE_112_NUGGET" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 31, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1F11", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 31, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1F28", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 28, + "y": 27, + "elevation": 0, + "dest_map": "MAP_ROUTE112_CABLE_CAR_STATION", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 27, + "elevation": 0, + "dest_map": "MAP_ROUTE112_CABLE_CAR_STATION", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 46, + "elevation": 3, + "dest_map": "MAP_JAGGED_PASS", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 46, + "elevation": 3, + "dest_map": "MAP_JAGGED_PASS", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 36, + "elevation": 0, + "dest_map": "MAP_FIERY_PATH", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 10, + "elevation": 0, + "dest_map": "MAP_FIERY_PATH", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 19, + "y": 44, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route112_EventScript_1F1E4F" + }, + { + "type": "sign", + "x": 22, + "y": 37, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route112_EventScript_1F1E46" + }, + { + "type": "sign", + "x": 4, + "y": 49, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route112_EventScript_1F1E58" + } + ] +} \ 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/Route112/map.json | 56 ++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'data/maps/Route112') diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index 937719abf..8839cc114 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route112_EventScript_1F1DB7", "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route112_EventScript_1F1E6A", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route112_EventScript_1F1EE3", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route112_EventScript_1F1EFA", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route112_EventScript_1F1E81", "flag": "0" }, @@ -103,8 +103,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": "Route112_EventScript_1F1DB7", "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 24, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "24", "script": "BerryTreeScript", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 23, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "23", "script": "BerryTreeScript", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 22, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "22", "script": "BerryTreeScript", "flag": "0" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 21, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "21", "script": "BerryTreeScript", "flag": "0" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route112_EventScript_1F1E61", "flag": "0" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "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": "Route112_EventScript_290DCF", "flag": "FLAG_ITEM_ROUTE_112_NUGGET" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route112_EventScript_1F1F11", "flag": "0" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route112_EventScript_1F1F28", "flag": "0" } -- cgit v1.2.3 From cea5696f238acc7c2b868e46e92775f4a05ae1f4 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 04:18:43 -0500 Subject: Finish moving pokeruby vars --- data/maps/Route112/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route112') diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 995102fe7..787f680fb 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -4,7 +4,7 @@ Route112_MapScripts:: @ 81F1DA8 Route112_MapScript1_1F1DAE: @ 81F1DAE clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE - setvar VAR_0x40BD, 0 + setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 end Route112_EventScript_1F1DB7:: @ 81F1DB7 -- cgit v1.2.3 From 0de831fd290b44b6b7236fb849e2e0318f9ebe3f Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 20:09:14 -0500 Subject: Name some common single-entry movements --- data/maps/Route112/scripts.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data/maps/Route112') diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 995102fe7..7f479d9f2 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -10,36 +10,36 @@ Route112_MapScript1_1F1DAE: @ 81F1DAE Route112_EventScript_1F1DB7:: @ 81F1DB7 lockall delay 40 - applymovement 1, Route112_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT closemessage - applymovement 1, Route112_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 6, Route112_Movement_2725A4 + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT closemessage - applymovement 6, Route112_Movement_2725A2 + applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 1, Route112_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT closemessage - applymovement 1, Route112_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 6, Route112_Movement_2725A4 + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 msgbox Route112_Text_1F2003, MSGBOX_DEFAULT closemessage - applymovement 6, Route112_Movement_2725A2 + applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -- 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/Route112/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route112') diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 7f479d9f2..8c624fb21 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -1,5 +1,5 @@ Route112_MapScripts:: @ 81F1DA8 - map_script 3, Route112_MapScript1_1F1DAE + map_script MAP_SCRIPT_ON_TRANSITION, Route112_MapScript1_1F1DAE .byte 0 Route112_MapScript1_1F1DAE: @ 81F1DAE -- cgit v1.2.3