diff --git a/scripts/autotracking/location_mapping.lua b/scripts/autotracking/location_mapping.lua index e8baf03..e8202d4 100644 --- a/scripts/autotracking/location_mapping.lua +++ b/scripts/autotracking/location_mapping.lua @@ -32,8 +32,8 @@ LOCATION_MAPPING = { [172000028] = {"@Kanto/Celadon City/3F Dept Store Counter Man"}, [172000029] = {"@Kanto/Celadon City/Gambling Addict"}, [172000030] = {"@Kanto/Celadon City/Erika"}, - [172000031] = {"@Kanto/Silph Co/11F Silph Co President"}, - [172000032] = {"@Kanto/Silph Co/2F Woman"}, + [172000031] = {"@Kanto/Silph Co 7F - 11F/11F Silph Co President"}, + [172000032] = {"@Kanto/Silph Co 1F - 6F/2F Woman"}, [172000033] = {"@Kanto/Route 16/Fly House Woman"}, [172000034] = {"@Kanto/Route 15/Oak's Aide"}, [172000035] = {"@Kanto/Fuchsia City/Safari Zone Warden"}, @@ -111,20 +111,20 @@ 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"}, - [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"}, - [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"}, - [172000121] = {"@Kanto/Silph Co/10F Left Item"}, - [172000122] = {"@Kanto/Silph Co/10F Bottom Item"}, - [172000123] = {"@Kanto/Silph Co/10F Right Item"}, + [172000110] = {"@Kanto/Silph Co 1F - 6F/3F Item"}, + [172000111] = {"@Kanto/Silph Co 1F - 6F/4F Card Key Left Item"}, + [172000112] = {"@Kanto/Silph Co 1F - 6F/4F Card Key Middle Item"}, + [172000113] = {"@Kanto/Silph Co 1F - 6F/4F Card Key Right Item"}, + [172000114] = {"@Kanto/Silph Co 1F - 6F/5F Southwest Item"}, + [172000115] = {"@Kanto/Silph Co 1F - 6F/5F Northwest Item"}, + [172000116] = {"@Kanto/Silph Co 1F - 6F/5F Southeast Item"}, + [172000117] = {"@Kanto/Silph Co 1F - 6F/6F Card Key Southwest Item Top"}, + [172000118] = {"@Kanto/Silph Co 1F - 6F/6F Card Key Southwest Item Bottom"}, + [172000119] = {"@Kanto/Silph Co 7F - 11F/7F West Item"}, + [172000120] = {"@Kanto/Silph Co 7F - 11F/7F East Item"}, + [172000121] = {"@Kanto/Silph Co 7F - 11F/10F Left Item"}, + [172000122] = {"@Kanto/Silph Co 7F - 11F/10F Bottom Item"}, + [172000123] = {"@Kanto/Silph Co 7F - 11F/10F Right Item"}, [172000124] = {"@Kanto/Pokemon Mansion/2F Northeast Item"}, [172000125] = {"@Kanto/Pokemon Mansion/3F Southwest Item"}, [172000126] = {"@Kanto/Pokemon Mansion/3F Northeast Item"}, @@ -180,8 +180,8 @@ LOCATION_MAPPING = { [172000176] = {"@Kanto/Route 13/HI: Dead End By Water Corner"}, [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"}, + [172000179] = {"@Kanto/Silph Co 1F - 6F/HI: 5F Pot Plant"}, + [172000180] = {"@Kanto/Silph Co 7F - 11F/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"}, @@ -222,36 +222,36 @@ LOCATION_MAPPING = { [172000218] = {"@Kanto/Pokemon Mansion/3F Burglar"}, [172000219] = {"@Kanto/Pokemon Mansion/B1F Scientist"}, [172000220] = {"@Kanto/Pokemon Mansion/B1F Burglar"}, - [172000221] = {"@Kanto/Silph Co/11F Rocket 1"}, - [172000222] = {"@Kanto/Silph Co/11F Rocket 2"}, - [172000223] = {"@Kanto/Silph Co/10F Scientist"}, - [172000224] = {"@Kanto/Silph Co/10F Rocket"}, - [172000225] = {"@Kanto/Silph Co/9F Rocket 1"}, - [172000226] = {"@Kanto/Silph Co/9F Scientist"}, - [172000227] = {"@Kanto/Silph Co/9F Rocket 2"}, - [172000228] = {"@Kanto/Silph Co/8F Rocket 1"}, - [172000229] = {"@Kanto/Silph Co/8F Rocket 2"}, - [172000230] = {"@Kanto/Silph Co/8F Scientist"}, - [172000231] = {"@Kanto/Silph Co/7F Rocket 1"}, - [172000232] = {"@Kanto/Silph Co/7F Rocket 2"}, - [172000233] = {"@Kanto/Silph Co/7F Scientist"}, - [172000234] = {"@Kanto/Silph Co/7F Rocket 3"}, - [172000235] = {"@Kanto/Silph Co/6F Rocket 1"}, - [172000236] = {"@Kanto/Silph Co/6F Scientist"}, - [172000237] = {"@Kanto/Silph Co/6F Rocket 2"}, - [172000238] = {"@Kanto/Silph Co/5F Rocket 1"}, - [172000239] = {"@Kanto/Silph Co/5F Juggler"}, - [172000240] = {"@Kanto/Silph Co/5F Scientist"}, - [172000241] = {"@Kanto/Silph Co/5F Rocket 2"}, - [172000242] = {"@Kanto/Silph Co/4F Rocket 1"}, - [172000243] = {"@Kanto/Silph Co/4F Rocket 2"}, - [172000244] = {"@Kanto/Silph Co/4F Scientist"}, - [172000245] = {"@Kanto/Silph Co/3F Scientist"}, - [172000246] = {"@Kanto/Silph Co/3F Rocket"}, - [172000247] = {"@Kanto/Silph Co/2F Rocket 1"}, - [172000248] = {"@Kanto/Silph Co/2F Rocket 2"}, - [172000249] = {"@Kanto/Silph Co/2F Scientist 1"}, - [172000250] = {"@Kanto/Silph Co/2F Scientist 2"}, + [172000221] = {"@Kanto/Silph Co 7F - 11F/11F Rocket 1"}, + [172000222] = {"@Kanto/Silph Co 7F - 11F/11F Rocket 2"}, + [172000223] = {"@Kanto/Silph Co 7F - 11F/10F Scientist"}, + [172000224] = {"@Kanto/Silph Co 7F - 11F/10F Rocket"}, + [172000225] = {"@Kanto/Silph Co 7F - 11F/9F Rocket 1"}, + [172000226] = {"@Kanto/Silph Co 7F - 11F/9F Scientist"}, + [172000227] = {"@Kanto/Silph Co 7F - 11F/9F Rocket 2"}, + [172000228] = {"@Kanto/Silph Co 7F - 11F/8F Rocket 1"}, + [172000229] = {"@Kanto/Silph Co 7F - 11F/8F Rocket 2"}, + [172000230] = {"@Kanto/Silph Co 7F - 11F/8F Scientist"}, + [172000231] = {"@Kanto/Silph Co 7F - 11F/7F Rocket 1"}, + [172000232] = {"@Kanto/Silph Co 7F - 11F/7F Rocket 2"}, + [172000233] = {"@Kanto/Silph Co 7F - 11F/7F Scientist"}, + [172000234] = {"@Kanto/Silph Co 7F - 11F/7F Rocket 3"}, + [172000235] = {"@Kanto/Silph Co 1F - 6F/6F Rocket 1"}, + [172000236] = {"@Kanto/Silph Co 1F - 6F/6F Scientist"}, + [172000237] = {"@Kanto/Silph Co 1F - 6F/6F Rocket 2"}, + [172000238] = {"@Kanto/Silph Co 1F - 6F/5F Rocket 1"}, + [172000239] = {"@Kanto/Silph Co 1F - 6F/5F Juggler"}, + [172000240] = {"@Kanto/Silph Co 1F - 6F/5F Scientist"}, + [172000241] = {"@Kanto/Silph Co 1F - 6F/5F Rocket 2"}, + [172000242] = {"@Kanto/Silph Co 1F - 6F/4F Rocket 1"}, + [172000243] = {"@Kanto/Silph Co 1F - 6F/4F Rocket 2"}, + [172000244] = {"@Kanto/Silph Co 1F - 6F/4F Scientist"}, + [172000245] = {"@Kanto/Silph Co 1F - 6F/3F Scientist"}, + [172000246] = {"@Kanto/Silph Co 1F - 6F/3F Rocket"}, + [172000247] = {"@Kanto/Silph Co 1F - 6F/2F Rocket 1"}, + [172000248] = {"@Kanto/Silph Co 1F - 6F/2F Rocket 2"}, + [172000249] = {"@Kanto/Silph Co 1F - 6F/2F Scientist 1"}, + [172000250] = {"@Kanto/Silph Co 1F - 6F/2F Scientist 2"}, [172000251] = {"@Kanto/Rocket Hideout/B1F Rocket 1"}, [172000252] = {"@Kanto/Rocket Hideout/B1F Rocket 2"}, [172000253] = {"@Kanto/Rocket Hideout/B1F Rocket 3"}, @@ -550,15 +550,15 @@ LOCATION_MAPPING = { [172000546] = {"@Kanto/Celadon Game Corner/HI: Near Hooked Guy"}, [172000547] = {"@Kanto/Celadon Game Corner/HI: End of Horizontal Machine Row"}, [172000548] = {"@Kanto/Celadon Game Corner/HI: Front of Horizontal Machine Row"}, - [172000700] = {"@Kanto/Silph Co/1F Receptionist"}, - [172000701] = {"@Kanto/Silph Co/4F Hostage"}, - [172000702] = {"@Kanto/Silph Co/5F Hostage"}, - [172000703] = {"@Kanto/Silph Co/6F Hostage"}, - [172000704] = {"@Kanto/Silph Co/7F Hostage"}, - [172000705] = {"@Kanto/Silph Co/8F Hostage"}, - [172000706] = {"@Kanto/Silph Co/9F Nurse"}, - [172000707] = {"@Kanto/Silph Co/10F Hostage"}, - [172000708] = {"@Kanto/Silph Co/11F Secretary"}, + [172000700] = {"@Kanto/Silph Co 1F - 6F/1F Receptionist"}, + [172000701] = {"@Kanto/Silph Co 1F - 6F/4F Hostage"}, + [172000702] = {"@Kanto/Silph Co 1F - 6F/5F Hostage"}, + [172000703] = {"@Kanto/Silph Co 1F - 6F/6F Hostage"}, + [172000704] = {"@Kanto/Silph Co 7F - 11F/7F Hostage"}, + [172000705] = {"@Kanto/Silph Co 7F - 11F/8F Hostage"}, + [172000706] = {"@Kanto/Silph Co 7F - 11F/9F Nurse"}, + [172000707] = {"@Kanto/Silph Co 7F - 11F/10F Hostage"}, + [172000708] = {"@Kanto/Silph Co 7F - 11F/11F Secretary"}, [172000549] = {"bulbasaur"}, [172000550] = {"ivysaur"},