From 61e56774545c03f4918857872f0d03d6ad886d00 Mon Sep 17 00:00:00 2001 From: palex00 <32203971+palex00@users.noreply.github.com> Date: Wed, 15 May 2024 00:29:04 +0200 Subject: [PATCH 1/6] Updates all access rules --- locations/locations.json | 205 ++++++++++++++++++++++++--------------- 1 file changed, 128 insertions(+), 77 deletions(-) diff --git a/locations/locations.json b/locations/locations.json index 3c5c6d7..f6aced8 100644 --- a/locations/locations.json +++ b/locations/locations.json @@ -1,8 +1,8 @@ [ { "name": "Kanto", - "chest-unopened_img": "UNOPENED", - "chest-opened_img": "OPENED", + "chest_unopened_img": "images/items/itemicon.png", + "chest_opened_img": "images/items/itemicon_opened.png", "children": [ { "name": "Vermilion City", @@ -32,6 +32,12 @@ "access_rules": ["$cut","$surf"], "visibility_rules": ["opt_keyonly_off"] }, + { + "name": "​Lt. Surge", + "item_count": 1, + "access_rules": ["$cut","$surf"], + "visibility_rules": ["opt_keyonly_on"] + }, { "name": "Gym: Sailor", "item_count": 1, @@ -81,6 +87,12 @@ "access_rules": [], "visibility_rules": ["opt_keyonly_off"] }, + { + "name": "​Koga", + "item_count": 1, + "access_rules": [], + "visibility_rules": ["opt_keyonly_on"] + }, { "name": "Gym: Juggler 1", "item_count": 1, @@ -122,7 +134,7 @@ }, { "name": "Route 12 South", - "access_rules": ["$fuchsia","$lavender,$surf","$cerulean,flute"], + "access_rules": ["$fuchsia,$extra_boulders","$lavender,$surf","$cerulean,flute"], "sections": [ { "name": "Fishing Guru's Brother", @@ -146,7 +158,7 @@ "name": "Jr. Trainer M", "item_count": 1, "access_rules": [], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] }, { "name": "Fisherman 5", @@ -231,7 +243,7 @@ { "name": "Gambling Addict", "item_count": 1, - "access_rules": ["coincase"], + "access_rules": [""], "visibility_rules": [""] }, { @@ -246,6 +258,12 @@ "access_rules": ["$cut"], "visibility_rules": ["opt_keyonly_off"] }, + { + "name": "​Erika", + "item_count": 1, + "access_rules": ["$cut"], + "visibility_rules": ["opt_keyonly_on"] + }, { "name": "Gym: Lass 1", "item_count": 1, @@ -268,7 +286,7 @@ "name": "Gym: Jr. Trainer F", "item_count": 1, "access_rules": ["$cut"], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] }, { "name": "Gym: Lass 2", @@ -280,7 +298,7 @@ "name": "Gym: Cool Trainer F", "item_count": 1, "access_rules": ["$cut"], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] }, { "name": "Gym: Beauty 3", @@ -346,10 +364,16 @@ }, { "name": "Giovanni", - "item_count": 1, + "item_count": 2, "access_rules": ["$viridiangym,$cut","$viridiangym,$old_man"], "visibility_rules": ["opt_keyonly_off"] }, + { + "name": "​Giovanni", + "item_count": 1, + "access_rules": ["$viridiangym,$cut","$viridiangym,$old_man"], + "visibility_rules": ["opt_keyonly_on"] + }, { "name": "Item in Gym", "item_count": 1, @@ -366,7 +390,7 @@ "name": "Gym: Blackbelt 1", "item_count": 1, "access_rules": ["$viridiangym,$cut","$viridiangym,$old_man"], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] }, { "name": "Gym: Cooltrainer M 1", @@ -384,7 +408,7 @@ "name": "Gym: Blackbelt 2", "item_count": 1, "access_rules": ["$viridiangym,$cut","$viridiangym,$old_man"], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] }, { "name": "Gym: Tamer 2", @@ -396,7 +420,7 @@ "name": "Gym: Blackbelt 3", "item_count": 1, "access_rules": ["$viridiangym,$cut","$viridiangym,$old_man"], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] }, { "name": "Gym: Cooltrainer M 3", @@ -414,8 +438,8 @@ { "name": "Oak's Aide", "item_count": 1, - "access_rules": [], - "visibility_rules": ["$aide|2"] + "access_rules": ["$aide|2"], + "visibility_rules": [] }, { "name": "South Item", @@ -440,19 +464,25 @@ "name": "Museum Scientist", "item_count": 1, "access_rules": ["$cut"], - "visibility_rules": ["trainer_on"] + "visibility_rules": [""] }, { "name": "Brock", - "item_count": 1, + "item_count": 2, "access_rules": [], "visibility_rules": ["opt_keyonly_off"] }, + { + "name": "​Brock", + "item_count": 1, + "access_rules": [], + "visibility_rules": ["opt_keyonly_on"] + }, { "name": "Gym: Jr. Trainer M", "item_count": 1, "access_rules": [], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] } ], "map_locations": [{ "map": "map", "x": 144, "y": 112, "size": 27, "border_thickness": 4 }] @@ -465,7 +495,7 @@ "name": "Bicycle Shop", "item_count": 1, "access_rules": ["voucher"], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": [""] }, { "name": "HI: Badge Guy's Backyard", @@ -481,10 +511,16 @@ }, { "name": "Misty", - "item_count": 1, + "item_count": 2, "access_rules": [], "visibility_rules": ["opt_keyonly_off"] }, + { + "name": "​Misty", + "item_count": 1, + "access_rules": [], + "visibility_rules": ["opt_keyonly_on"] + }, { "name": "Gym: Swimmer", "item_count": 1, @@ -495,7 +531,7 @@ "name": "Gym: Jr. Trainer F", "item_count": 1, "access_rules": [], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] } ], "map_locations": [{ "map": "map", "x": 400, "y": 80, "size": 27, "border_thickness": 4 }] @@ -544,13 +580,13 @@ "name": "Jr. Trainer M 1", "item_count": 1, "access_rules": [], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] }, { "name": "Jr. Trainer M 2", "item_count": 1, "access_rules": [], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] } ], "map_locations": [{ "map": "map", "x": 400, "y": 48 }] @@ -563,7 +599,7 @@ "name": "Bill", "item_count": 1, "access_rules": [], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": [""] }, { "name": "Item", @@ -623,7 +659,7 @@ "name": "Jr. Trainer M", "item_count": 1, "access_rules": [], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] }, { "name": "Youngster 3", @@ -646,7 +682,6 @@ "sections": [ { "name": "Mr. Fuji", - "item_count": 1, "access_rules": ["fuji"], "visibility_rules": [] } @@ -655,7 +690,7 @@ }, { "name": "Route 12 North", - "access_rules": ["$lavender","$cerulean,$extra_boulders,pokeflute","$fuchsia,$extra_boulders"], + "access_rules": ["$lavender","$cerulean,$extra_boulders,pokeflute","$fuchsia,$extra_boulders,pokeflute"], "sections": [ { "name": "Mourning Girl", @@ -756,7 +791,7 @@ "visibility_rules": ["trainer_on"] }, { - "name": "3F Item ", + "name": "3F Item", "item_count": 1, "access_rules": ["$cardkey(3)"], "visibility_rules": ["opt_keyonly_off"] @@ -822,7 +857,7 @@ "visibility_rules": ["opt_keyonly_off"] }, { - "name": "5F Northwest Item ", + "name": "5F Northwest Item", "item_count": 1, "access_rules": [], "visibility_rules": ["opt_keyonly_off"] @@ -997,7 +1032,7 @@ "visibility_rules": ["trainer_on"] }, { - "name": "HI: 9F Nurse Bed ", + "name": "HI: 9F Nurse Bed", "item_count": 1, "access_rules": ["$hidden"], "visibility_rules": ["opt_hidden_items_on"] @@ -1087,7 +1122,7 @@ "visibility_rules": [""] }, { - "name": "Biker", + "name": "Biker 1", "item_count": 1, "access_rules": ["$cyclingroad,$fuchsia","$cyclingroad,$celadon,pokeflute"], "visibility_rules": ["trainer_on"] @@ -1142,7 +1177,7 @@ "visibility_rules": ["opt_keyonly_off"] }, { - "name": "Jr. TrainerF 1", + "name": "Jr. Trainer F 1", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -1154,7 +1189,7 @@ "visibility_rules": ["trainer_on"] }, { - "name": "Jr. TrainerF 2", + "name": "Jr. Trainer F 2", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -1172,7 +1207,7 @@ "visibility_rules": ["trainer_on"] }, { - "name": "Jr. TrainerF 3", + "name": "Jr. Trainer F 3", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -1196,7 +1231,7 @@ "visibility_rules": ["trainer_on"] }, { - "name": "Jr. TrainerF 4", + "name": "Jr. Trainer F 4", "item_count": 1, "access_rules": ["$cut"], "visibility_rules": ["trainer_on"] @@ -1297,7 +1332,7 @@ "name": "R&D Lab Scientist", "item_count": 1, "access_rules": [], - "visibility_rules": [] + "visibility_rules": ["opt_keyonly_off"] }, { "name": "Blaine", @@ -1305,6 +1340,12 @@ "access_rules": ["secretkey"], "visibility_rules": ["opt_keyonly_off"] }, + { + "name": "​Blaine", + "item_count": 1, + "access_rules": ["secretkey"], + "visibility_rules": ["opt_keyonly_on"] + }, { "name": "Gym: Burglar 1", "item_count": 1, @@ -1352,7 +1393,7 @@ }, { "name": "Saffron City", - "access_rules": ["saffron"], + "access_rules": ["$saffron"], "sections": [ { "name": "Copycat", @@ -1364,14 +1405,20 @@ "name": "Mr. Psychic", "item_count": 1, "access_rules": [], - "visibility_rules": [] + "visibility_rules": ["opt_keyonly_off"] }, { "name": "Sabrina", - "item_count": 1, + "item_count": 2, "access_rules": ["silphco"], "visibility_rules": ["opt_keyonly_off"] }, + { + "name": "​Sabrina", + "item_count": 1, + "access_rules": ["silphco"], + "visibility_rules": ["opt_keyonly_on"] + }, { "name": "HI: Copycat Desk", "item_count": 1, @@ -1424,25 +1471,25 @@ "name": "Fighting Dojo: Blackbelt 1", "item_count": 1, "access_rules": [], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] }, { "name": "Fighting Dojo: Blackbelt 2", "item_count": 1, "access_rules": [], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] }, { "name": "Fighting Dojo: Blackbelt 3", "item_count": 1, "access_rules": [], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] }, { "name": "Fighting Dojo: Blackbelt 4", "item_count": 1, "access_rules": [], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] } ], "map_locations": [{ "map": "map", "x": 400, "y": 176, "size": 27, "border_thickness": 4 }] @@ -1508,7 +1555,7 @@ "visibility_rules": ["opt_hidden_items_on"] }, { - "name": "Jr. TrainerF 1", + "name": "Jr. Trainer F 1", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -1523,7 +1570,7 @@ "name": "Jr. Trainer M 1", "item_count": 1, "access_rules": [], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] }, { "name": "Bug Catcher 1", @@ -1547,7 +1594,7 @@ "name": "Jr. Trainer M 2", "item_count": 1, "access_rules": [], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] }, { "name": "Hiker 3", @@ -1556,7 +1603,7 @@ "visibility_rules": ["trainer_on"] }, { - "name": "Jr. TrainerF 2", + "name": "Jr. Trainer F 2", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -1764,25 +1811,25 @@ { "name": "7F Rocket 1", "item_count": 1, - "access_rules": [], + "access_rules": ["silphscope","opt_pokedoll_skip_on"], "visibility_rules": ["trainer_on"] }, { "name": "7F Rocket 2", "item_count": 1, - "access_rules": [], + "access_rules": ["silphscope","opt_pokedoll_skip_on"], "visibility_rules": ["trainer_on"] }, { "name": "7F Rocket 3", "item_count": 1, - "access_rules": [], + "access_rules": ["silphscope","opt_pokedoll_skip_on"], "visibility_rules": ["trainer_on"] }, { "name": "7F Save Mr. Fuji", "hosted_item": "fuji", - "access_rules": ["silphscope","$celadon,opt_pokedoll_skip_on"] + "access_rules": ["silphscope","opt_pokedoll_skip_on"] } ], "map_locations": [{ "map": "map", "x": 560, "y": 176 }] @@ -2037,7 +2084,7 @@ "name": "2F Blackbelt", "item_count": 1, "access_rules": [], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] }, { "name": "2F Juggler 1", @@ -2070,7 +2117,7 @@ "visibility_rules": ["trainer_on"] }, { - "name": "3F CooltrainerF 1", + "name": "3F Cooltrainer F 1", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -2082,7 +2129,7 @@ "visibility_rules": ["trainer_on"] }, { - "name": "3F CooltrainerF 2", + "name": "3F Cooltrainer F 2", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -2500,19 +2547,19 @@ "visibility_rules": ["trainer_on"] }, { - "name": "1F Jr. TrainerF 1", + "name": "1F Jr. Trainer F 1", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] }, { - "name": "1F Jr. TrainerF 2", + "name": "1F Jr. Trainer F 2", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] }, { - "name": "1F Jr. TrainerF 3", + "name": "1F Jr. Trainer F 3", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -2524,7 +2571,7 @@ "visibility_rules": ["trainer_on"] }, { - "name": "B1F Jr. TrainerF 1", + "name": "B1F Jr. Trainer F 1", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -2548,7 +2595,7 @@ "visibility_rules": ["trainer_on"] }, { - "name": "B1F Jr. TrainerF 2", + "name": "B1F Jr. Trainer F 2", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -2573,7 +2620,7 @@ "access_rules": ["$lavender,$rock_tunnel","$cerulean,$cut"], "sections": [ { - "name": "Jr. TrainerF", + "name": "Jr. Trainer F", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -2598,7 +2645,7 @@ "visibility_rules": ["opt_hidden_items_on"] }, { - "name": "Jr. TrainerF 1", + "name": "Jr. Trainer F 1", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -2610,7 +2657,7 @@ "visibility_rules": ["trainer_on"] }, { - "name": "Jr. TrainerF 2", + "name": "Jr. Trainer F 2", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -2653,7 +2700,7 @@ "visibility_rules": ["opt_hidden_items_on"] }, { - "name": "Jr. TrainerF 1", + "name": "Jr. Trainer F 1", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -2665,7 +2712,7 @@ "visibility_rules": ["trainer_on"] }, { - "name": "Jr. TrainerF 2", + "name": "Jr. Trainer F 2", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -2683,13 +2730,13 @@ "visibility_rules": ["trainer_on"] }, { - "name": "Jr. TrainerF 3", + "name": "Jr. Trainer F 3", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] }, { - "name": "Jr. TrainerF 4", + "name": "Jr. Trainer F 4", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -2937,18 +2984,18 @@ }, { "name": "Underground Tunnel North-South", - "access_rules": ["$cerulean,$hidden"], + "access_rules": ["$cerulean"], "sections": [ { "name": "HI: Near Northern Stairs", "item_count": 1, - "access_rules": [], + "access_rules": ["$hidden"], "visibility_rules": ["opt_hidden_items_on"] }, { "name": "HI: Near Southern Stairs", "item_count": 1, - "access_rules": [], + "access_rules": ["$hidden"], "visibility_rules": ["opt_hidden_items_on"] } ], @@ -2956,18 +3003,18 @@ }, { "name": "Underground Tunnel West-East", - "access_rules": ["$celadon,$hidden"], + "access_rules": ["$celadon"], "sections": [ { "name": "HI: West", "item_count": 1, - "access_rules": [], + "access_rules": ["$hidden"], "visibility_rules": ["opt_hidden_items_on"] }, { "name": "HI: East", "item_count": 1, - "access_rules": [], + "access_rules": ["$hidden"], "visibility_rules": ["opt_hidden_items_on"] } ], @@ -3202,7 +3249,7 @@ "visibility_rules": ["trainer_on"] }, { - "name": "Jr. TrainerF 1", + "name": "Jr. Trainer F 1", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -3226,7 +3273,7 @@ "visibility_rules": ["trainer_on"] }, { - "name": "Jr. TrainerF 2", + "name": "Jr. Trainer F 2", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -3504,7 +3551,7 @@ "visibility_rules": ["trainer_on"] }, { - "name": "Jr. TrainerF 1", + "name": "Jr. Trainer F 1", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -3513,7 +3560,7 @@ "name": "Jr. Trainer M 1", "item_count": 1, "access_rules": [], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] }, { "name": "Bug Catcher 2", @@ -3522,7 +3569,7 @@ "visibility_rules": ["trainer_on"] }, { - "name": "Jr. TrainerF 2", + "name": "Jr. Trainer F 2", "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] @@ -3531,7 +3578,7 @@ "name": "Jr. Trainer M 2", "item_count": 1, "access_rules": [], - "visibility_rules": ["opt_keyonly_off"] + "visibility_rules": ["trainer_on"] } ], "map_locations": [{ "map": "map", "x": 400, "y": 240 }] @@ -3618,7 +3665,11 @@ "item_count": 1, "access_rules": [], "visibility_rules": ["trainer_on"] - } + }, + { + "name": "Beat The Game", + "hosted_item": "champ" + } ], "map_locations": [{ "map": "map", "x": 80, "y": 80, "size": 27, "border_thickness": 4 }] }, From b289dbc41794196c5a3248457e30505e24529d55 Mon Sep 17 00:00:00 2001 From: palex00 <32203971+palex00@users.noreply.github.com> Date: Wed, 15 May 2024 00:30:01 +0200 Subject: [PATCH 2/6] Update location_mapping.lua --- scripts/autotracking/location_mapping.lua | 56 +++++++++++------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/scripts/autotracking/location_mapping.lua b/scripts/autotracking/location_mapping.lua index 3850ccc..e8baf03 100644 --- a/scripts/autotracking/location_mapping.lua +++ b/scripts/autotracking/location_mapping.lua @@ -111,17 +111,17 @@ LOCATION_MAPPING = { [172000107] = {"@Kanto/Rocket Hideout/B4F Southwest Item"}, [172000108] = {"@Kanto/Rocket Hideout/B4F Giovanni Item"}, [172000109] = {"@Kanto/Rocket Hideout/B4F Rocket Grunt Item"}, - [172000110] = {"@Kanto/Silph Co/3F Item (Card Key)"}, + [172000110] = {"@Kanto/Silph Co/3F Item"}, [172000111] = {"@Kanto/Silph Co/4F Card Key Left Item"}, [172000112] = {"@Kanto/Silph Co/4F Card Key Middle Item"}, [172000113] = {"@Kanto/Silph Co/4F Card Key Right Item"}, [172000114] = {"@Kanto/Silph Co/5F Southwest Item"}, - [172000115] = {"@Kanto/Silph Co/5F Northwest Item (Card Key)"}, + [172000115] = {"@Kanto/Silph Co/5F Northwest Item"}, [172000116] = {"@Kanto/Silph Co/5F Southeast Item"}, [172000117] = {"@Kanto/Silph Co/6F Card Key Southwest Item Top"}, [172000118] = {"@Kanto/Silph Co/6F Card Key Southwest Item Bottom"}, [172000119] = {"@Kanto/Silph Co/7F West Item"}, - [172000120] = {"@Kanto/Silph Co/7F East Item (Card Key)"}, + [172000120] = {"@Kanto/Silph Co/7F East Item"}, [172000121] = {"@Kanto/Silph Co/10F Left Item"}, [172000122] = {"@Kanto/Silph Co/10F Bottom Item"}, [172000123] = {"@Kanto/Silph Co/10F Right Item"}, @@ -181,7 +181,7 @@ LOCATION_MAPPING = { [172000177] = {"@Kanto/Pokemon Mansion/HI: B1F Secret Key Room Corner"}, [172000178] = {"@Kanto/Safari Zone/HI: Secret House Statue"}, [172000179] = {"@Kanto/Silph Co/HI: 5F Pot Plant"}, - [172000180] = {"@Kanto/Silph Co/HI: 9F Nurse Bed (Card Key)"}, + [172000180] = {"@Kanto/Silph Co/HI: 9F Nurse Bed"}, [172000181] = {"@Kanto/Saffron City/HI: Copycat Desk"}, [172000182] = {"@Kanto/Cerulean Cave/HI: 1F Center Rocks"}, [172000183] = {"@Kanto/Cerulean Cave/HI: B1F Northeast Rocks"}, @@ -318,11 +318,11 @@ LOCATION_MAPPING = { [172000314] = {"@Kanto/Route 21/Swimmer 3"}, [172000315] = {"@Kanto/Route 21/Swimmer 4"}, [172000316] = {"@Kanto/Route 20 West/Beauty 1"}, - [172000317] = {"@Kanto/Route 20 West/Jr. TrainerF 1"}, + [172000317] = {"@Kanto/Route 20 West/Jr. Trainer F 1"}, [172000318] = {"@Kanto/Route 20 West/Beauty 2"}, [172000319] = {"@Kanto/Route 20 West/Bird Keeper"}, [172000320] = {"@Kanto/Route 20 West/Swimmer 1"}, - [172000321] = {"@Kanto/Route 20 West/Jr. TrainerF 2"}, + [172000321] = {"@Kanto/Route 20 West/Jr. Trainer F 2"}, [172000322] = {"@Kanto/Route 20 East/Beauty 3"}, [172000323] = {"@Kanto/Route 20 East/Beauty 4"}, [172000324] = {"@Kanto/Route 20 East/Swimmer 2"}, @@ -350,22 +350,22 @@ LOCATION_MAPPING = { [172000346] = {"@Kanto/Route 17/Biker 4"}, [172000347] = {"@Kanto/Route 17/Cue Ball 5"}, [172000348] = {"@Kanto/Route 17/Biker 5"}, - [172000349] = {"@Kanto/Route 16/Biker"}, + [172000349] = {"@Kanto/Route 16/Biker 1"}, [172000350] = {"@Kanto/Route 16/Cue Ball 1"}, [172000351] = {"@Kanto/Route 16/Cue Ball 2"}, [172000352] = {"@Kanto/Route 16/Biker 2"}, [172000353] = {"@Kanto/Route 16/Cue Ball 3"}, [172000354] = {"@Kanto/Route 16/Biker 3"}, - [172000355] = {"@Kanto/Route 15/Jr. TrainerF 1"}, + [172000355] = {"@Kanto/Route 15/Jr. Trainer F 1"}, [172000356] = {"@Kanto/Route 15/Beauty 1"}, - [172000357] = {"@Kanto/Route 15/Jr. TrainerF 2"}, + [172000357] = {"@Kanto/Route 15/Jr. Trainer F 2"}, [172000358] = {"@Kanto/Route 15/Biker 1"}, [172000359] = {"@Kanto/Route 15/Biker 2"}, - [172000360] = {"@Kanto/Route 15/Jr. TrainerF 3"}, + [172000360] = {"@Kanto/Route 15/Jr. Trainer F 3"}, [172000361] = {"@Kanto/Route 15/Beauty 2"}, [172000362] = {"@Kanto/Route 15/Bird Keeper 1"}, [172000363] = {"@Kanto/Route 15/Bird Keeper 2"}, - [172000364] = {"@Kanto/Route 15/Jr. TrainerF 4"}, + [172000364] = {"@Kanto/Route 15/Jr. Trainer F 4"}, [172000365] = {"@Kanto/Route 14/Bird Keeper 1"}, [172000366] = {"@Kanto/Route 14/Bird Keeper 2"}, [172000367] = {"@Kanto/Route 14/Bird Keeper 3"}, @@ -376,13 +376,13 @@ LOCATION_MAPPING = { [172000372] = {"@Kanto/Route 14/Biker 3"}, [172000373] = {"@Kanto/Route 14/Biker 4"}, [172000374] = {"@Kanto/Route 14/Bird Keeper 6"}, - [172000375] = {"@Kanto/Route 13/Jr. TrainerF 1"}, + [172000375] = {"@Kanto/Route 13/Jr. Trainer F 1"}, [172000376] = {"@Kanto/Route 13/Bird Keeper 1"}, - [172000377] = {"@Kanto/Route 13/Jr. TrainerF 2"}, + [172000377] = {"@Kanto/Route 13/Jr. Trainer F 2"}, [172000378] = {"@Kanto/Route 13/Beauty 1"}, [172000379] = {"@Kanto/Route 13/Beauty 2"}, - [172000380] = {"@Kanto/Route 13/Jr. TrainerF 3"}, - [172000381] = {"@Kanto/Route 13/Jr. TrainerF 4"}, + [172000380] = {"@Kanto/Route 13/Jr. Trainer F 3"}, + [172000381] = {"@Kanto/Route 13/Jr. Trainer F 4"}, [172000382] = {"@Kanto/Route 13/Bird Keeper 2"}, [172000383] = {"@Kanto/Route 13/Bird Keeper 3"}, [172000384] = {"@Kanto/Route 13/Biker"}, @@ -407,24 +407,24 @@ LOCATION_MAPPING = { [172000403] = {"@Kanto/Rock Tunnel/1F Hiker 1"}, [172000404] = {"@Kanto/Rock Tunnel/1F Hiker 2"}, [172000405] = {"@Kanto/Rock Tunnel/1F Hiker 3"}, - [172000406] = {"@Kanto/Rock Tunnel/1F Jr. TrainerF 1"}, - [172000407] = {"@Kanto/Rock Tunnel/1F Jr. TrainerF 2"}, - [172000408] = {"@Kanto/Rock Tunnel/1F Jr. TrainerF 3"}, + [172000406] = {"@Kanto/Rock Tunnel/1F Jr. Trainer F 1"}, + [172000407] = {"@Kanto/Rock Tunnel/1F Jr. Trainer F 2"}, + [172000408] = {"@Kanto/Rock Tunnel/1F Jr. Trainer F 3"}, [172000409] = {"@Kanto/Rock Tunnel/B1F PokeManiac 1"}, - [172000410] = {"@Kanto/Rock Tunnel/B1F Jr. TrainerF 1"}, + [172000410] = {"@Kanto/Rock Tunnel/B1F Jr. Trainer F 1"}, [172000411] = {"@Kanto/Rock Tunnel/B1F PokeManiac 2"}, [172000412] = {"@Kanto/Rock Tunnel/B1F Hiker 1"}, [172000413] = {"@Kanto/Rock Tunnel/B1F Hiker 2"}, - [172000414] = {"@Kanto/Rock Tunnel/B1F Jr. TrainerF 2"}, + [172000414] = {"@Kanto/Rock Tunnel/B1F Jr. Trainer F 2"}, [172000415] = {"@Kanto/Rock Tunnel/B1F Hiker 3"}, [172000416] = {"@Kanto/Rock Tunnel/B1F PokeManiac 3"}, - [172000417] = {"@Kanto/Route 10 North/Jr. TrainerF"}, + [172000417] = {"@Kanto/Route 10 North/Jr. Trainer F"}, [172000418] = {"@Kanto/Route 10 South/PokeManiac 1"}, - [172000419] = {"@Kanto/Route 10 South/Jr. TrainerF 2"}, + [172000419] = {"@Kanto/Route 10 South/Jr. Trainer F 2"}, [172000420] = {"@Kanto/Route 10 South/Hiker 1"}, [172000421] = {"@Kanto/Route 10 South/Hiker 2"}, [172000422] = {"@Kanto/Route 10 South/PokeManiac"}, - [172000423] = {"@Kanto/Route 9/Jr. TrainerF 1"}, + [172000423] = {"@Kanto/Route 9/Jr. Trainer F 1"}, [172000424] = {"@Kanto/Route 9/Hiker 1"}, [172000425] = {"@Kanto/Route 9/Jr. Trainer M 1"}, [172000426] = {"@Kanto/Route 9/Bug Catcher 1"}, @@ -432,7 +432,7 @@ LOCATION_MAPPING = { [172000428] = {"@Kanto/Route 9/Bug Catcher 2"}, [172000429] = {"@Kanto/Route 9/Jr. Trainer M 2"}, [172000430] = {"@Kanto/Route 9/Hiker 3"}, - [172000431] = {"@Kanto/Route 9/Jr. TrainerF 2"}, + [172000431] = {"@Kanto/Route 9/Jr. Trainer F 2"}, [172000432] = {"@Kanto/Route 8/Lass 1"}, [172000433] = {"@Kanto/Route 8/Gambler 1"}, [172000434] = {"@Kanto/Route 8/Super Nerd 1"}, @@ -443,10 +443,10 @@ LOCATION_MAPPING = { [172000439] = {"@Kanto/Route 8/Gambler 2"}, [172000440] = {"@Kanto/Route 8/Super Nerd 3"}, [172000441] = {"@Kanto/Route 6/Bug Catcher 1"}, - [172000442] = {"@Kanto/Route 6/Jr. TrainerF 1"}, + [172000442] = {"@Kanto/Route 6/Jr. Trainer F 1"}, [172000443] = {"@Kanto/Route 6/Jr. Trainer M 1"}, [172000444] = {"@Kanto/Route 6/Bug Catcher 2"}, - [172000445] = {"@Kanto/Route 6/Jr. TrainerF 2"}, + [172000445] = {"@Kanto/Route 6/Jr. Trainer F 2"}, [172000446] = {"@Kanto/Route 6/Jr. Trainer M 2"}, [172000447] = {"@Kanto/Route 4/Lass"}, [172000448] = {"@Kanto/Route 3/Lass 1"}, @@ -519,9 +519,9 @@ LOCATION_MAPPING = { [172000515] = {"@Kanto/Victory Road/2F Juggler 2"}, [172000516] = {"@Kanto/Victory Road/2F PokeManiac"}, [172000517] = {"@Kanto/Victory Road/3F Cooltrainer M 1"}, - [172000518] = {"@Kanto/Victory Road/3F CooltrainerF 1"}, + [172000518] = {"@Kanto/Victory Road/3F Cooltrainer F 1"}, [172000519] = {"@Kanto/Victory Road/3F Cooltrainer M 2"}, - [172000520] = {"@Kanto/Victory Road/3F CooltrainerF 2"}, + [172000520] = {"@Kanto/Victory Road/3F Cooltrainer F 2"}, [172000521] = {"@Kanto/Indigo Plateau/Lorelei"}, [172000522] = {"@Kanto/Indigo Plateau/Bruno"}, [172000523] = {"@Kanto/Indigo Plateau/Agatha"}, From e2895d8eb324aff91b3c51433df02eba3880bfbc Mon Sep 17 00:00:00 2001 From: palex00 <32203971+palex00@users.noreply.github.com> Date: Wed, 15 May 2024 00:30:33 +0200 Subject: [PATCH 3/6] Adds missing Fly --- items/options.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/items/options.json b/items/options.json index db43fcb..cac25f6 100644 --- a/items/options.json +++ b/items/options.json @@ -477,6 +477,12 @@ "codes": "free_fly, fly_vermilion", "inherit_codes": false }, + { + "name": "Lavender", + "img": "images/items/flavender.png", + "codes": "free_fly, fly_lavender", + "inherit_codes": false + }, { "name": "Celadon", "img": "images/items/fceladon.png", @@ -544,6 +550,12 @@ "codes": "tm_free_fly, fly_vermilion", "inherit_codes": false }, + { + "name": "Lavender", + "img": "images/items/mlavender.png", + "codes": "tm_free_fly, fly_lavender", + "inherit_codes": false + }, { "name": "Celadon", "img": "images/items/mceladon.png", From b6b1979304928234a55cbbe2ff7c08888a18dd43 Mon Sep 17 00:00:00 2001 From: palex00 <32203971+palex00@users.noreply.github.com> Date: Wed, 15 May 2024 00:31:06 +0200 Subject: [PATCH 4/6] Update items.json --- items/items.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/items/items.json b/items/items.json index 40d0faa..1ad0ead 100644 --- a/items/items.json +++ b/items/items.json @@ -340,5 +340,11 @@ "type": "toggle", "img": "images/items/silph.png", "codes": "silphco" + }, + { + "name": "Beat the Champ", + "type": "toggle", + "img": "images/items/champ.png", + "codes": "champ" } ] From cd18485bab49008ce5f8ae3e0a0afeae1f5bfc0d Mon Sep 17 00:00:00 2001 From: palex00 <32203971+palex00@users.noreply.github.com> Date: Wed, 15 May 2024 00:32:05 +0200 Subject: [PATCH 5/6] Add files via upload --- images/items/champ.png | Bin 0 -> 767 bytes images/items/itemicon.png | Bin 0 -> 215 bytes images/items/itemicon_opened.png | Bin 0 -> 215 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 images/items/champ.png create mode 100644 images/items/itemicon.png create mode 100644 images/items/itemicon_opened.png diff --git a/images/items/champ.png b/images/items/champ.png new file mode 100644 index 0000000000000000000000000000000000000000..fefbbdc9a492563845ecbec728185be3504d0ed4 GIT binary patch literal 767 zcmVPx#1ZP1_K>z@;j|==^1poj57*I@9MSyUa7!VNn==kukh^nfp00010RaF200EMP! zc>n+a2y{|TQ~&?}|NsC00N#VWSpWb432;bRa{vGi!vFvd!vV){sAK>D0$fQ%K~zXf zm6qFrgCGn<1-je+|KmL~1O-i9I}a)$hlE?&?fp?(LG;&XugbyJp{=zhhs-Ipfmo%~ z3b~c&n3YCs4u={fkEbA>#!#!Zmi80`TgXZ~x(+2E?mLGX)ASOpO29I6`ecoxYf>^4 ziy06@v`$9fq{*bs)~m!M3z4*;e7j@SZqw*)>>T?5_ur~&x5j=khQdJj2yFE(A}*x{ zsI@5X2H120ba<{BHpN4|+5A9N+n90#Br{=U%8C=N1+5OJTxWVa? zd#;CWK;IOL$^-Tg)TB_=#h|jPt~^MUH1&(BV&yO@Ahg{V%0Y4Zb&H~afoi?h$sAOs zDmpwzoU`Kx5Q0ew{8U(PKpg_T!gkUfI8XATJFrjnYmn>rHTWx#SXio3hSzSP;ah9m>1oG#!#3SWyT%|FfL@8YXaK2yMG0$PRLt5<{pB34cC&m x@f7qP?w84p{=F(S9?~#hY{w-2vSi%*{RegtJhS~oEs6jD002ovPDHLkV1hJtTw(wK literal 0 HcmV?d00001 diff --git a/images/items/itemicon.png b/images/items/itemicon.png new file mode 100644 index 0000000000000000000000000000000000000000..170697e88a1090acd0fe590f37e4b7956339755e GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|>0G|+75fPF932850yZ{Pxsoy&eQdbh>7ySSKe+CDwm0y5-&H|6fVg?4j z!ywFfJby(BP|(HG#W6%9xU|ockHLV0Y3;xN=SAOSmGHT!$%uHDIL#?FOtDxfuwqp} z?*luB)hy5ZUJ1??xV|CekbH8lG~?I3|0cEEWKo#Gr2fv<^EuEw22WQ%mvv4FO#qNS%G|>0G|+75fPCI6DGWP@d7CD(V|-#q^=~$FZloe{|pXVE588woCO|{#S9F5 zhe4R}c>anMprDJVi(`mJaA}_>AA Date: Wed, 15 May 2024 00:42:34 +0200 Subject: [PATCH 6/6] Update manifest.json --- manifest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 49f243d..96ad51a 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { "name": "Pokemon Red/Blue Archipelago Poptracker", "game_name": "Pokemon Red/Blue", - "package_version": "1.0.0.0", + "package_version": "1.0.0", "package_uid": "pokemonrb_ap", - "author": "Coveleski & Palex00", + "author": "Coveleski & palex00", "variants": { "standard": { "display_name": "Map Tracker", @@ -18,4 +18,4 @@ ] } } -} \ No newline at end of file +}