1
0
Fork 0
mirror of https://github.com/notwa/mm synced 2024-11-05 02:49:02 -08:00

make entrance names less than bad

This commit is contained in:
Connor Olding 2016-01-17 15:49:01 -08:00
parent 55ad6351af
commit 0d832b1f3b

View file

@ -1,4 +1,3 @@
-- TODO: fix "from Market Entrance" ones that should just be "from Market"
local bad="[crash]"
return {[0]=
{name="Inside the Deku Tree",
@ -331,7 +330,7 @@ return {[0]=
{name="Link's House",
[0]={"from Save Warp", 0x00BB},
{"from Kokiri Forest", 0x0272},
-- [0]={"Bed Entrance, from Savewarp", 0x00C0},
-- [0]={"Bed Entrance, from SaveWarp", 0x00C0},
},
{name="Back Alley House (Dog Lady)",
@ -409,7 +408,7 @@ return {[0]=
{name="Shooting Gallery",
[0]={"from Kakariko Village", 0x003B},
{"from Market Entrance", 0x016D},
{"from Market", 0x016D},
-- [0]={"from Kakariko Village", 0x02EA},
-- [0]={"from Kakariko Village", 0x02F0},
},
@ -429,7 +428,7 @@ return {[0]=
{name="Chamber of the Sages",
[0]={"?", 0x006F},
{"??? (Forest Medallion?)", 0x02CE},
{"?", 0x02CE},
-- [0]={"?", 0x0071},
},
@ -498,24 +497,24 @@ return {[0]=
},
{name="Hyrule Field",
[0]={"from After Zelda Escape, 2nd+ Impa Escort", 0x00CD},
[0]={"after Zelda Escape cutscene", 0x00CD},
{"from Kakariko Village", 0x017D},
{"from Zora River, Land", 0x0181},
{"from Zora River (land)", 0x0181},
{"from Lost Woods", 0x0185},
{"from Lake Hylia", 0x0189},
{"from Gerudo Valley", 0x018D},
{"from Lon Lon Ranch", 0x01F9},
{"from Market Entrance", 0x01FD},
{"Positioned near Lake Hylia", 0x027A},
{"Owl Drop Spot, from Lake Hylia", 0x027E},
{"Unused Location", 0x0282},
{"from Lon Lon Ranch, Southern Fence Jump", 0x028A},
{"from Lon Lon Ranch, Western Fence Jump", 0x028E},
{"from Lon Lon Ranch, Eastern Fence Jump", 0x0292},
{"from Zora River, Water", 0x0311},
{"from Lon Lon Ranch, Front Gate Jump", 0x0476},
{"Get Ocarina of Time", 0x050F},
{"After Impa Escort cutscene", 0x0594},
{"near Lake Hylia?", 0x027A},
{"from Owl", 0x027E},
{"unused", 0x0282},
{"from Lon Lon Ranch (south fence)", 0x028A},
{"from Lon Lon Ranch (west fence)", 0x028E},
{"from Lon Lon Ranch (east fence)", 0x0292},
{"from Zora River (water)", 0x0311},
{"from Lon Lon Ranch (front gate)", 0x0476},
{"after getting Ocarina of Time", 0x050F},
{"after Impa Escort cutscene", 0x0594},
-- [0]={"from After Zelda Escape, 2nd+ Impa Escort", 0x00D1},
-- [0]={"from After Zelda Escape, 2nd+ Impa Escort", 0x00D2},
-- [0]={"from After Zelda Escape, 2nd+ Impa Escort", 0x00D4},
@ -533,17 +532,17 @@ return {[0]=
{"from Graveyard", 0x0195},
{"from Bazaar", 0x0201},
{"from Bottom of the Well", 0x02A6},
{"from Cow Heartpiece House (Door)", 0x0345},
{"from Kakariko Village House, Boss's House", 0x0349},
{"from Impa's House", 0x0345},
{"from Boss's House", 0x0349},
{"from Granny's Potion Shop", 0x034D},
{"from ?, Windmill", 0x0351},
{"from Kakariko Potion Shop", 0x044B},
{"from Windmill", 0x0351},
{"from regular Potion Shop", 0x044B},
{"from Shooting Gallery", 0x0463},
{"from House of Skulltula", 0x04EE},
{"from Kakariko Potion Shop, Back Entrance", 0x04FF},
{"from regular Potion Shop (back)", 0x04FF},
{"from Nocturne cutscene", 0x0513},
{"Owl Drop Spot, from Death Mountain Crater, Owl Teleport", 0x0554},
{"from Impa's House, Cow Exit", 0x05DC},
{"from Owl", 0x0554},
{"from Impa's House (cow)", 0x05DC},
-- [0]={"from Hyrule Field", 0x00DF},
-- [0]={"from Hyrule Field", 0x00E0},
-- [0]={"from Hyrule Field", 0x00E1},
@ -555,38 +554,38 @@ return {[0]=
[0]={"from Kakariko Village", 0x00E4},
{"from Shadow Temple", 0x0205},
{"from Gravekeeper's Hut", 0x0355},
{"from ?, Dampe's Grave", 0x0359},
{"from Grave with Shield", 0x035D},
{"from Grave with Redead", 0x0361},
{"from Dampe's Grave", 0x0359},
{"from Grave (shield)", 0x035D},
{"from Grave (Redead)", 0x0361},
{"from Royal Family's Tomb", 0x050B},
{"Nocturne Warp", 0x0568},
{"from Shadow Temple Boss, Blue Warp", 0x0580},
{"from Nocturne Warp", 0x0568},
{"from Blue Warp", 0x0580},
-- [0]={"from Kakariko Village", 0x00E8},
-- [0]={"from Kakariko Village", 0x00E9},
},
{name="Zora's River",
[0]={"Land Entrance, from Hyrule Field", 0x00EA},
{"Dropped from top of Waterfall", 0x0199},
{name="Zora River",
[0]={"from Hyrule Field (land)", 0x00EA},
{"from waterfall", 0x0199},
{"from Zora's Domain", 0x019D},
{"Water Entrance, from Hyrule Field", 0x01D9},
{"from Hyrule Field (water)", 0x01D9},
{"from Lost Woods", 0x01DD},
},
{name="Kokiri Forest",
[0]={"from After Forest Medallion cutscene", 0x00EE},
[0]={"after Medallion cutscene", 0x00EE},
{"from Deku Tree", 0x0209},
{"from Lost Woods, Hyrule Bridge", 0x020D},
{"from Lost Woods (bridge)", 0x020D},
{"from Link's House", 0x0211},
{"from Kokiri Shop", 0x0266},
{"from Know-it-all Brothers", 0x026A},
{"from Lost Woods", 0x0286},
{"Spawn on Link's House", 0x0338},
{"atop Link's House (unused?)", 0x0338},
{"from House of Twins", 0x033C},
{"from Mido's House", 0x0443},
{"from Saria's House", 0x0447},
{"After Deku Tree Death cutscene, from Kokiri Forest", 0x0457},
{"Deku Sprout cutscene", 0x05E8},
{"after Deku Tree death cutscene", 0x0457},
{"after Deku Sprout cutscene", 0x05E8},
-- [0]={"from After Forest Medallion cutscene", 0x00F2},
-- [0]={"from After Forest Medallion cutscene", 0x00F3},
-- [0]={"from After Forest Medallion cutscene", 0x00F4},
@ -598,8 +597,8 @@ return {[0]=
{name="Sacred Forest Meadow",
[0]={"from Lost Woods", 0x00FC},
{"from Forest Temple", 0x0215},
{"Minuet Warp", 0x0600},
{"from Forest Temple Boss, Blue Warp", 0x0608},
{"from Minuet Warp", 0x0600},
{"from Blue Warp", 0x0608},
-- [0]={"from Lost Woods", 0x0100},
-- [0]={"from Lost Woods", 0x0101},
-- [0]={"from Lost Woods", 0x02EE},
@ -615,13 +614,13 @@ return {[0]=
[0]={"from Hyrule Field", 0x0102},
{"from Gerudo Valley", 0x0219},
{"from Water Temple", 0x021D},
{"Hyrule Field Entrance", 0x03C8},
{"from Hyrule Field (dupe?)", 0x03C8},
{"from Lakeside Laboratory", 0x03CC},
{"Serenade Entrance", 0x04E6},
{"after Serenade cutscene", 0x04E6},
{"from Fishing Pond", 0x0309},
{"from Zora's Domain", 0x0560},
{"Serenade Warp", 0x0604},
{"from Water Temple Boss, Blue Warp", 0x060C},
{"from Serenade Warp", 0x0604},
{"from Blue Warp", 0x060C},
-- [0]={"from Hyrule Field", 0x0106},
-- [0]={"from Hyrule Field", 0x0107},
-- [2]={"from Water Temple", 0x021E},
@ -639,12 +638,12 @@ return {[0]=
},
{name="Zora's Fountain",
[0]={"Sapphire cutscene Entrance", 0x010E},
[0]={"after Sapphire cutscene", 0x010E},
{"from Inside Jabu Jabu's Belly", 0x0221},
{"from Zora's Domain", 0x0225},
{"from Ice Cavern", 0x03D4},
{"SE corner facing fallen tree", 0x03D8},
{"from Great Fairy's Fountain (Spells)", 0x0394},
{"unused?", 0x03D8},
{"from Great Fairy's Fountain", 0x0394},
-- [0]={"Sapphire cutscene Entrance", 0x0112},
-- [0]={"Sapphire cutscene Entrance", 0x0113},
-- [0]={"Sapphire cutscene Entrance", 0x0114},
@ -654,8 +653,8 @@ return {[0]=
{name="Gerudo Valley",
[0]={"from Hyrule Field", 0x0117},
{"Thrown out of Gerudo Fortress, from Caught without usable hookshot", 0x01A5},
{"Triggers Fortress Loading Zone", 0x0229},
{"thrown out of Fortress without Hookshot", 0x01A5},
{"unused (spawns on exit)", 0x0229},
{"from Gerudo Fortress", 0x022D},
{"from Carpenter's Tent", 0x03D0},
-- [0]={"from Hyrule Field", 0x011B},
@ -666,68 +665,68 @@ return {[0]=
{name="Lost Woods",
[0]={"from Kokiri Forest", 0x011E},
{"from Sacred Forest Meadow", 0x01A9},
{"Mushroom Timeout (Adult)", 0x01AD},
{"start from the tree opposite of the main entrance", 0x01B1},
{"??? placed west of Cojiro Guy map", 0x04C6},
{"Exit point clockwise from SFM exit", 0x04D2},
{"Mushroom Timeout", 0x01AD},
{"north entrance (unused?)", 0x01B1},
{"west entrance (unused?)", 0x04C6},
{"near Goron City entrance (unused?)", 0x04D2},
{"from Goron City", 0x04D6},
{"from Zora River", 0x04DA},
{"from Hyrule Field", 0x04DE},
{"from Kokiri Forest, Hyrule Exit", 0x05E0},
{"from Kokiri Forest (bridge)", 0x05E0},
},
{name="Desert Colossus",
[0]={"from Haunted Wasteland", 0x0123},
{"from Spirit Temple", 0x01E1},
{"from Spirit Temple, Gauntlets Entrance", 0x01E5},
{"from Spirit Temple, Mirror Shield Entrance", 0x01E9},
{"After Requiem cutscene", 0x01ED},
{"Requiem Entrance", 0x01F1},
{"Nabooru Capture cutscene Entrance", 0x01F5},
{"from Great Fairy's Fountain (Spells)", 0x057C},
{"from Spirit Temple Boss, Blue Warp", 0x0610},
{"from Spirit Temple (Gauntlets)", 0x01E5},
{"from Spirit Temple (Mirror Shield)", 0x01E9},
{"after Requiem cutscene", 0x01ED},
{"from Requiem Warp", 0x01F1},
{"after Nabooru capture cutscene", 0x01F5},
{"from Great Fairy's Fountain", 0x057C},
{"from Blue Warp", 0x0610},
-- [0]={"from Haunted Wasteland", 0x0127},
-- [0]={"from Haunted Wasteland", 0x0128},
},
{name="Gerudo's Fortress",
[0]={"from Gerudo Valley", 0x0129},
{"from Thieves' Hideout", 0x0231},
{"from Thieves' Hideout", 0x0235},
{"from Thieves' Hideout", 0x0239},
{"from Thieves' Hideout", 0x02AA},
{"from Thieves' Hideout", 0x02BA},
{"from Thieves' Hideout", 0x02BE},
{"from Thieves' Hideout", 0x02C2},
{"from Thieves' Hideout", 0x02C6},
{"from Thieves' Hideout", 0x02D2},
{"from Thieves' Hideout", 0x02D6},
{"from Thieves' Hideout", 0x02DA},
{"from Thieves' Hideout", 0x02DE},
{"from Thieves' Hideout", 0x03A4},
{"from Thieves' Hideout", 0x03A8},
{"from Thieves' Hideout 1", 0x0231}, -- bottom left
{"from Thieves' Hideout 2", 0x0235}, -- bottom middle left
{"from Thieves' Hideout 3", 0x0239}, -- bottom middle right
{"from Thieves' Hideout 6", 0x02AA}, -- middle middle
{"from Thieves' Hideout 4", 0x02BA}, -- bottom right
{"from Thieves' Hideout 5", 0x02BE}, -- middle left
{"from Thieves' Hideout 7", 0x02C2}, -- middle right
{"from Thieves' Hideout 11", 0x02C6}, -- upper far right
{"from Thieves' Hideout 10", 0x02D2}, -- upper right
{"from Thieves' Hideout 9", 0x02D6}, -- upper middle
{"from Thieves' Hideout 12", 0x02DA}, -- nearest to jail, under chest
{"from Thieves' Hideout 13", 0x02DE}, -- above jail
{"from Thieves' Hideout 8", 0x03A4}, -- upper left
{"from Gerudo Training Ground", 0x03A8},
{"from Haunted Wasteland", 0x03AC},
{"After Horseback Archery, from Gerudo Fortress", 0x03B0},
{"Captured First Time with Hookshot", 0x03B4},
{"Captured Second Time", 0x05F8},
{"from Gerudo Valley", 0x012D},
{"from Gerudo Valley", 0x012E},
{"after Horseback Archery", 0x03B0},
{"captured (without Hookshot)", 0x03B4},
{"captured (with Hookshot)", 0x05F8},
{"from Gerudo Valley (dupe?)", 0x012D},
{"from Gerudo Valley (dupe??)", 0x012E},
},
{name="Haunted Wasteland",
[0]={"from Gerudo Fortress", 0x0130},
{"from Desert Colossus", 0x0365},
{"Crashes (Bad Map)", 0x0369},
{"[crash]", 0x0369},
},
{name="Hyrule Castle",
[0]={"from Market Entrance", 0x0138},
[0]={"from Market", 0x0138},
{"from Castle Courtyard", 0x023D},
{"from Great Fairy's Fountain (Spells)", 0x0340},
{"from Castle Courtyard, Caught by guard", 0x04FA},
{"Guard Capture (Outside)", 0x047E},
{"from Great Fairy's Fountain", 0x0340},
{"after being caught (inside)", 0x04FA},
{"after being caught (outside)", 0x047E},
-- [1]={"from Castle Courtyard", 0x0241},
-- [2]={"from Great Fairy's Fountain (Spells)", 0x0344},
-- [2]={"from Great Fairy's Fountain", 0x0344},
-- [3]={"from Castle Courtyard, Caught by guard", 0x04FE},
},
@ -736,7 +735,7 @@ return {[0]=
{"from Goron City", 0x01B9},
{"from Death Mountain Crater", 0x01BD},
{"from Dodongo's Cavern", 0x0242},
{"from Great Fairy's Fountain (Upgrades)", 0x045B},
{"from Great Fairy's Fountain", 0x045B},
{"Goron Ruby cutscene", 0x047A},
-- [0]={"from Kakariko Village", 0x0141},
-- [0]={"from Kakariko Village", 0x0142},
@ -747,9 +746,9 @@ return {[0]=
[0]={"from Death Mountain Trail", 0x0147},
{"from Goron City", 0x0246},
{"from Fire Temple", 0x024A},
{"from Great Fairy's Fountain (Upgrades)", 0x0482},
{"Bolero Entrance", 0x04F6},
{"from Fire Temple Boss, Blue Warp", 0x0564},
{"from Great Fairy's Fountain", 0x0482},
{"from Bolero Warp", 0x04F6},
{"from Blue Warp", 0x0564},
},
{name="Goron City",
@ -762,28 +761,28 @@ return {[0]=
{name="Lon Lon Ranch",
[0]={"from Hyrule Field", 0x0157},
{"Epona's Song cutscene", 0x02AE},
{"Near South Gate", 0x02E2},
{"Near West Gate", 0x02E6},
{"after Epona's Song cutscene", 0x02AE},
{"near South gate", 0x02E2}, -- unused?
{"near West gate", 0x02E6}, -- unused?
{"from Ranch House, Talon's House", 0x0378},
{"from Stables", 0x042F},
{"Pay Ingo to Ride", 0x04CA},
{"Beat Ingo Both Times", 0x04CE},
{"You're too slow!", 0x0558},
{"after paying Ingo", 0x04CA},
{"after beating Ingo twice", 0x04CE},
{"?", 0x0558}, -- "You're too slow!" the hell does that mean?
{"??? (Near Ingo/Malon)", 0x055C},
{"from Ranch Buildings, Back Tower", 0x05D4},
{"from Cow in House", 0x05D4},
-- [0]={"from Hyrule Field", 0x015B},
-- [0]={"from Hyrule Field", 0x015C},
-- [0]={"from Hyrule Field", 0x015D},
},
{name="Ganon's Castle Exterior",
[0]={"from Market Entrance", 0x013A},
[0]={"from Market", 0x013A},
{"from Inside Ganon's Castle", 0x023F},
{"from Great Fairy's Fountain (Upgrades)", 0x0342},
{"Crashes (Bad Map)", 0x0480},
{"from Castle Courtyard, Caught by guard", 0x04FC},
-- [0]={"from Market Entrance", 0x013C},
{"from Great Fairy's Fountain", 0x0342},
{"[crash]", 0x0480},
{"unused?", 0x04FC},
-- [0]={"from Market", 0x013C},
},
{name=bad},