From 4643330fdd2f458a4f714eb7ae1a586d2d24da37 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 14:08:29 -0500 Subject: Name allow_cycling, floor_number header properties --- data/maps/TwoIsland/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/TwoIsland/map.json') diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 556aa49da..0fc86bc84 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", -- cgit v1.2.3 From e94f9c148358f2e25e6ebbd58d39eb9ddd27f7c3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 14:52:42 -0500 Subject: Name allow_escaping, allow_running, show_map_name header properties --- data/maps/TwoIsland/map.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'data/maps/TwoIsland/map.json') diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 0fc86bc84..48381765e 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { -- cgit v1.2.3 From 729c224bf2421c30e64f2082f19907b5e66b8138 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 16:16:03 -0500 Subject: Name battle scene and map type constants --- data/maps/TwoIsland/map.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/TwoIsland/map.json') diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 48381765e..20dd0f53e 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_TWO_ISLAND_CAPE_BRINK", -- cgit v1.2.3 From 1fc8db43b7254f7445b335cec22c7406edb1902d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 23 Feb 2020 17:00:12 -0500 Subject: Sync object event gfx constants --- data/maps/TwoIsland/map.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/TwoIsland/map.json') diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 20dd0f53e..668886176 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -22,7 +22,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CLERK", + "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 28, "y": 4, "elevation": 3, @@ -35,7 +35,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 31, "y": 6, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_WOMAN" }, { - "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 30, "y": 11, "elevation": 3, @@ -61,7 +61,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_BEAUTY" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 26, "y": 5, "elevation": 3, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 27, "y": 6, "elevation": 3, @@ -87,7 +87,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_SUPER_NERD" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 30, "y": 16, "elevation": 3, @@ -100,7 +100,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 39, "y": 16, "elevation": 3, @@ -113,7 +113,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_REVIVE" }, { - "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 37, "y": 12, "elevation": 3, @@ -126,7 +126,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BOY", + "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 24, "y": 12, "elevation": 3, -- cgit v1.2.3 From e80ddc46758bfef075b749af2802ce5d646bd9cd Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 26 Feb 2020 01:46:21 -0500 Subject: Document Two Island scripts --- data/maps/TwoIsland/map.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data/maps/TwoIsland/map.json') diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 668886176..8a258b635 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -31,7 +31,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_16760F", + "script": "TwoIsland_EventScript_Clerk", "flag": "0" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_167755", + "script": "TwoIsland_EventScript_Woman", "flag": "FLAG_HIDE_TWO_ISLAND_WOMAN" }, { @@ -57,7 +57,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_16775E", + "script": "TwoIsland_EventScript_Beauty", "flag": "FLAG_HIDE_TWO_ISLAND_BEAUTY" }, { @@ -70,7 +70,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_16774C", + "script": "TwoIsland_EventScript_Sailor", "flag": "0" }, { @@ -83,7 +83,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_167777", + "script": "TwoIsland_EventScript_SuperNerd", "flag": "FLAG_HIDE_TWO_ISLAND_SUPER_NERD" }, { @@ -122,7 +122,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_167789", + "script": "TwoIsland_EventScript_LittleBoy", "flag": "0" }, { @@ -135,7 +135,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_167780", + "script": "TwoIsland_EventScript_Boy", "flag": "0" } ], @@ -176,21 +176,21 @@ "x": 29, "y": 8, "elevation": 0, - "script": "TwoIsland_EventScript_167792" + "script": "TwoIsland_EventScript_IslandSign" }, { "type": "bg_event_type_0", "x": 40, "y": 10, "elevation": 0, - "script": "TwoIsland_EventScript_16779B" + "script": "TwoIsland_EventScript_JoyfulGameCornerSign" }, { "type": "bg_event_type_0", "x": 8, "y": 3, "elevation": 0, - "script": "TwoIsland_EventScript_1677A4" + "script": "TwoIsland_EventScript_FastCurrentSign" } ] } -- cgit v1.2.3 From 6191739a4d01c4a83c4df721eb05b4f86c747381 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 2 Mar 2020 12:24:05 -0500 Subject: Label sign bg events --- data/maps/TwoIsland/map.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'data/maps/TwoIsland/map.json') diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 8a258b635..295cb3844 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -172,24 +172,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "TwoIsland_EventScript_IslandSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 40, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "TwoIsland_EventScript_JoyfulGameCornerSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "TwoIsland_EventScript_FastCurrentSign" } ] -- cgit v1.2.3 From 42e6e9bd9cc98d9edd214330aba2795766ec95af Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 2 Mar 2020 14:55:20 -0500 Subject: Remove interactwith from field move scripts --- data/maps/TwoIsland/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/TwoIsland/map.json') diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 295cb3844..8fa55df36 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -96,7 +96,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { -- cgit v1.2.3