From a1ea8cc82958679baee1c65acc30069d051463c6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 29 Jan 2020 21:03:07 -0500 Subject: Document Routes 3-9 scripts --- data/maps/Route6/map.json | 14 +++++++------- data/maps/Route6/scripts.inc | 4 ++-- data/maps/Route6/text.inc | 38 +++++++++++++++++++------------------- 3 files changed, 28 insertions(+), 28 deletions(-) (limited to 'data/maps/Route6') diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index f67590481..b827521ae 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route6_EventScript_1A9999", + "script": "Route6_EventScript_Keigo", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route6_EventScript_1A9A15", + "script": "Route6_EventScript_Ricky", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route6_EventScript_1A9A91", + "script": "Route6_EventScript_Nancy", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route6_EventScript_1A99D7", + "script": "Route6_EventScript_Elijah", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route6_EventScript_1A9ACF", + "script": "Route6_EventScript_Isabelle", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route6_EventScript_1A9A53", + "script": "Route6_EventScript_Jeff", "flag": "0" } ], @@ -133,7 +133,7 @@ "x": 21, "y": 15, "elevation": 0, - "script": "Route6_EventScript_167FB2" + "script": "Route6_EventScript_UndergroundPathSign" }, { "type": "hidden_item", diff --git a/data/maps/Route6/scripts.inc b/data/maps/Route6/scripts.inc index 00b3efb56..575c05fe6 100644 --- a/data/maps/Route6/scripts.inc +++ b/data/maps/Route6/scripts.inc @@ -1,6 +1,6 @@ Route6_MapScripts:: @ 8167FB1 .byte 0 -Route6_EventScript_167FB2:: @ 8167FB2 - msgbox gUnknown_8184067, MSGBOX_SIGN +Route6_EventScript_UndergroundPathSign:: @ 8167FB2 + msgbox Route6_Text_UndergroundPathSign, MSGBOX_SIGN end diff --git a/data/maps/Route6/text.inc b/data/maps/Route6/text.inc index b8ae84e32..0242ceee8 100644 --- a/data/maps/Route6/text.inc +++ b/data/maps/Route6/text.inc @@ -1,73 +1,73 @@ -Text_183E04:: @ 8183E04 +Route6_Text_RickyIntro:: @ 8183E04 .string "Who's there?\n" .string "Quit listening in on us!$" -Text_183E2A:: @ 8183E2A +Route6_Text_RickyDefeat:: @ 8183E2A .string "I just can't win!$" -Text_183E3C:: @ 8183E3C +Route6_Text_RickyPostBattle:: @ 8183E3C .string "Whisper…\n" .string "Whisper…$" -Text_183E4E:: @ 8183E4E +Route6_Text_NancyIntro:: @ 8183E4E .string "Excuse me!\n" .string "This is a private conversation!$" -Text_183E79:: @ 8183E79 +Route6_Text_NancyDefeat:: @ 8183E79 .string "Ugh!\n" .string "I hate losing.$" -Text_183E8D:: @ 8183E8D +Route6_Text_NancyPostBattle:: @ 8183E8D .string "Whisper…\n" .string "Whisper…$" -Text_183E9F:: @ 8183E9F +Route6_Text_KeigoIntro:: @ 8183E9F .string "There aren't many bugs out here.$" -Text_183EC0:: @ 8183EC0 +Route6_Text_KeigoDefeat:: @ 8183EC0 .string "No!\n" .string "You're kidding!$" -Text_183ED4:: @ 8183ED4 +Route6_Text_KeigoPostBattle:: @ 8183ED4 .string "I like bugs, so I'm going back to\n" .string "VIRIDIAN FOREST.$" -Text_183F07:: @ 8183F07 +Route6_Text_JeffIntro:: @ 8183F07 .string "Huh?\n" .string "You want to talk to me?$" -Text_183F24:: @ 8183F24 +Route6_Text_JeffDefeat:: @ 8183F24 .string "This stinks…\n" .string "I couldn't beat your challenge…$" -Text_183F51:: @ 8183F51 +Route6_Text_JeffPostBattle:: @ 8183F51 .string "I should bring more POKéMON with\n" .string "me. I'll feel safer that way.$" -Text_183F90:: @ 8183F90 +Route6_Text_IsabelleIntro:: @ 8183F90 .string "Me?\n" .string "Well, okay. I'll play!$" -Text_183FAB:: @ 8183FAB +Route6_Text_IsabelleDefeat:: @ 8183FAB .string "Things just didn't work…$" -Text_183FC4:: @ 8183FC4 +Route6_Text_IsabellePostBattle:: @ 8183FC4 .string "I want to get stronger.\n" .string "What's your secret?$" -Text_183FF0:: @ 8183FF0 +Route6_Text_ElijahIntro:: @ 8183FF0 .string "I've never seen you around.\n" .string "Are you good?$" -Text_18401A:: @ 818401A +Route6_Text_ElijahDefeat:: @ 818401A .string "You're too good!$" -Text_18402B:: @ 818402B +Route6_Text_ElijahPostBattle:: @ 818402B .string "Are my POKéMON weak?\n" .string "Or, am I just bad?\l" .string "Which do you think?$" -gUnknown_8184067:: @ 8184067 +Route6_Text_UndergroundPathSign:: @ 8184067 .string "UNDERGROUND PATH\n" .string "CERULEAN CITY - VERMILION CITY$" -- cgit v1.2.3 From 4ab216f309fe2db2cd2abfa775fa235f59178791 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 31 Jan 2020 14:57:57 -0500 Subject: Rename generic building tilesets, SAFFRON_CITY_CLASSIC --- data/maps/Route6/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route6') diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index f67590481..a6016c5fa 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -13,7 +13,7 @@ "battle_scene": "BATTLE_SCENE_0", "connections": [ { - "map": "MAP_SAFFRON_CITY_CLASSIC", + "map": "MAP_SAFFRON_CITY_CONNECTION", "offset": 0, "direction": "up" }, -- cgit v1.2.3 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/Route6/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route6') diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index a6016c5fa..885a1a8ea 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "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/Route6/map.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'data/maps/Route6') diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 885a1a8ea..994d86064 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "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/Route6/map.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route6') diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 994d86064..e6c4c7cf2 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "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_SAFFRON_CITY_CONNECTION", -- 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/Route6/map.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/maps/Route6') diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 4ff0dc898..349f35369 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 3, "y": 16, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 12, "y": 21, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 13, "y": 21, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 20, "y": 25, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 13, "y": 32, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 13, "y": 33, "elevation": 3, -- 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/Route6/map.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'data/maps/Route6') diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 349f35369..fd7a985b5 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -131,10 +131,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 15, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route6_EventScript_UndergroundPathSign" }, { -- cgit v1.2.3