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/ThreeIsland_PokemonCenter_1F/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/ThreeIsland_PokemonCenter_1F') diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index ede9d59ab..e467d8eaf 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "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/ThreeIsland_PokemonCenter_1F/map.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'data/maps/ThreeIsland_PokemonCenter_1F') diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index e467d8eaf..7808db5e3 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ -- 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/ThreeIsland_PokemonCenter_1F/map.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/ThreeIsland_PokemonCenter_1F') diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 7808db5e3..070879098 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { -- 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/ThreeIsland_PokemonCenter_1F/map.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/ThreeIsland_PokemonCenter_1F') diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 070879098..65c74d9d8 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 12, "y": 2, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 4, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 11, "y": 5, "elevation": 3, -- cgit v1.2.3 From d3adca3f9d13ebcc58f4d7e77e57dd0b5a94769d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 26 Feb 2020 16:02:29 -0500 Subject: Document Three Island scripts --- data/maps/ThreeIsland_PokemonCenter_1F/map.json | 8 ++++---- data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc | 14 +++++++------- data/maps/ThreeIsland_PokemonCenter_1F/text.inc | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'data/maps/ThreeIsland_PokemonCenter_1F') diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 65c74d9d8..596ea41cb 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_1F_EventScript_171841", + "script": "ThreeIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_1F_EventScript_17185C", + "script": "ThreeIsland_PokemonCenter_1F_EventScript_Rocker", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_1F_EventScript_171853", + "script": "ThreeIsland_PokemonCenter_1F_EventScript_Lass", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_1F_EventScript_17184A", + "script": "ThreeIsland_PokemonCenter_1F_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc index 15d568a6f..1f66b557d 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc @@ -7,21 +7,21 @@ ThreeIsland_PokemonCenter_1F_OnTransition:: @ 817183D setrespawn SPAWN_THREE_ISLAND end -ThreeIsland_PokemonCenter_1F_EventScript_171841:: @ 8171841 +ThreeIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171841 lock faceplayer call EventScript_PkmnCenterNurse release end -ThreeIsland_PokemonCenter_1F_EventScript_17184A:: @ 817184A - msgbox gUnknown_81A303B, MSGBOX_NPC +ThreeIsland_PokemonCenter_1F_EventScript_Sailor:: @ 817184A + msgbox ThreeIsland_PokemonCenter_1F_Text_ImpossibleToSurfBetweenIslands, MSGBOX_NPC end -ThreeIsland_PokemonCenter_1F_EventScript_171853:: @ 8171853 - msgbox gUnknown_81A30A3, MSGBOX_NPC +ThreeIsland_PokemonCenter_1F_EventScript_Lass:: @ 8171853 + msgbox ThreeIsland_PokemonCenter_1F_Text_AlwaysBerriesInBerryForest, MSGBOX_NPC end -ThreeIsland_PokemonCenter_1F_EventScript_17185C:: @ 817185C - msgbox gUnknown_81A2FB5, MSGBOX_NPC +ThreeIsland_PokemonCenter_1F_EventScript_Rocker:: @ 817185C + msgbox ThreeIsland_PokemonCenter_1F_Text_PCNetworkCanLinkWithKanto, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/text.inc b/data/maps/ThreeIsland_PokemonCenter_1F/text.inc index 449f80d70..a9d553efd 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/text.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/text.inc @@ -1,17 +1,17 @@ -gUnknown_81A2FB5:: @ 81A2FB5 +ThreeIsland_PokemonCenter_1F_Text_PCNetworkCanLinkWithKanto:: @ 81A2FB5 .string "Hey, did you hear the news?\p" .string "The PC network here can now link\n" .string "with PCs in KANTO.\p" .string "I don't know how that came about,\n" .string "but it's fantastic!$" -gUnknown_81A303B:: @ 81A303B +ThreeIsland_PokemonCenter_1F_Text_ImpossibleToSurfBetweenIslands:: @ 81A303B .string "It's impossible to SURF between the\n" .string "islands around these parts.\p" .string "The tides are too fast and\n" .string "treacherous.$" -gUnknown_81A30A3:: @ 81A30A3 +ThreeIsland_PokemonCenter_1F_Text_AlwaysBerriesInBerryForest:: @ 81A30A3 .string "Let's crush BERRIES!\n" .string "…That'd be wasting BERRIES?\p" .string "You can always find some BERRIES\n" -- cgit v1.2.3