Compare commits

...

6 Commits

Author SHA1 Message Date
Connor Olding 0da2663d23 more consistency and capitalization 2019-11-27 07:52:22 -08:00
Connor Olding 0f2c787cfc fix Zora Hall names 2019-11-27 07:52:00 -08:00
Connor Olding 838a5a8e75 consistency 2019-11-27 07:33:01 -08:00
Connor Olding 65e6416fb8 fix more capitalization 2019-11-27 07:32:54 -08:00
Connor Olding 89fef906b0 fix capitalization 2019-11-27 07:29:12 -08:00
Connor Olding 3d090c2fbf clean up MM entrance names 2019-11-27 07:19:15 -08:00
1 changed files with 120 additions and 120 deletions

View File

@ -1,10 +1,10 @@
local bad="[crash]"
return {
custom_order = {
"Intro Map",
"Lost Woods (Gain Control)",
"(Intro Map)",
"Lost Woods",
"(Deku Intro Area before Clock Tower)",
"Clock Tower (Inside)",
"Clock Tower (inside)",
"South Clock Town",
"West Clock Town",
"North Clock Town",
@ -15,7 +15,7 @@ return {
"Fairy's Fountain",
"Termina Field",
"Grottos",
"Atop Clock Tower",
"(Atop Clock Tower)",
"\n",
"Curiosity Shop",
@ -25,7 +25,7 @@ return {
"Post Office",
"Lottery Shop",
"",
"(Deku Flower Minigame)",
"(Deku Flower Minigame Grotto)",
"",
"Mayor's Residence",
"Milk Bar",
@ -38,8 +38,8 @@ return {
"(Road to Swamp)",
"Swamp Shooting Gallery",
"",
"Southern Swamp (Poisoned)",
"Southern Swamp (Clean)",
"Southern Swamp (poisoned)",
"Southern Swamp (clean)",
"Tourist Information",
"Magic Hags' Potion Shop",
"Woods of Mystery",
@ -55,17 +55,17 @@ return {
"\n",
"Snowhead Passage", -- (Road to Mountain Village) ?
"Mountain Village (Frozen)",
"Mountain Village (Thawed)",
"Mountain Village (frozen)",
"Mountain Village (thawed)",
"Mountain Smithy",
"Goron Graveyard",
"",
"(Road to Goron Village) (Frozen)",
"(Road to Goron Village) (Thawed)",
"(Road to Goron Village) (frozen)",
"(Road to Goron Village) (thawed)",
"Goron Racetrack",
"",
"Goron Village (Frozen)",
"Goron Village (Thawed)",
"Goron Village (frozen)",
"Goron Village (thawed)",
"Goron Shrine",
"Goron Shop",
"",
@ -91,9 +91,9 @@ return {
"",
"Pinnacle Rock",
"",
"Pirates' Fortress (Exterior)",
"Pirates' Fortress (Outside)",
"Pirates' Fortress (Inside)",
"Pirates' Fortress (exterior)",
"Pirates' Fortress (outside)",
"Pirates' Fortress (inside)",
"",
"Zora Cape",
"Waterfall Rapids",
@ -130,21 +130,21 @@ return {
"Giants' Chamber",
"Moon",
"Woodfall Trial",
"Snowhead Trial",
"Great Bay Trial",
"Ikana Trial",
"Majora",
"Moon - Odolwa's Trial",
"Moon - Goht's Trial",
"Moon - Gyorg's Trial",
"Moon - Twinmold's Trial",
"Moon - Majora",
},
-- entrance order, not scene order. i know it's confusing.
[0]={name="Southern Swamp (Clean)",
[0]={name="Southern Swamp (clean)",
[0]="from road",
"from Tourists'",
"from Woodfall",
"from Deku Palace",
"from Deku Palace (above)",
"from Deku Palace (lower)",
"from Deku Palace (upper)",
"from Hags'",
"Boat Cruise",
"from Woods of Mystery",
@ -172,21 +172,21 @@ return {
"Snowhead Gossip Stones",
"Generic",
"Hot Spring Water",
"JP Grotto (straight) (end?)",
"JP Grotto (straight) (right side)",
"Dodongo",
"JP Grotto (vines) (lower)",
"JP Grotto (vines) (right side)",
"Deku Merchant",
"Termina Field Cows",
"Beehive",
"Magic Bean Seller",
"Peahat",
"JP Grotto (straight) (start?)",
"JP Grotto (vines) (upper)",
"Lone Peak Shrine (Lens of Truth Cave)",
"JP Grotto (straight) (left side)",
"JP Grotto (vines) (left side)",
"Lone Peak Shrine (Lens of Truth cave)",
},
{name="Intro Map",
[0]="from start file",
{name="(Intro Map)",
[0]="from file start",
"Skull Kid cutscene",
"(crash?)",
"(crash?)",
@ -204,7 +204,7 @@ return {
[0]="main door",
},
{name="Majora",
{name="Moon - Majora",
[0]="from Moon",
},
@ -257,7 +257,7 @@ return {
"from road?",
},
{name="Pirates' Fortress (Outside)",
{name="Pirates' Fortress (outside)",
[0]="main door",
"from Hookshot room",
"from above Hookshot room",
@ -268,7 +268,7 @@ return {
"from twin barrel room",
"from twin barrel room (egg)",
"from nowhere (unused?)",
"through telescope",
"using telescope",
"from nowhere (press start screen?)",
"from far outside",
"from main door (no cutscene)",
@ -292,7 +292,7 @@ return {
"to boss room",
},
{name="Atop Clock Tower",
{name="(Atop Clock Tower)",
[0]="main door",
"from Ocarina cutscene",
"(crash?)",
@ -302,8 +302,8 @@ return {
[0]="main door",
"from Clock Tower (unused)",
"after being turned into Deku",
"after voiding out?",
"part of SoT cutscene",
"from voiding out",
"Song of Time cutscene",
},
{name="Woodfall Temple",
@ -327,7 +327,7 @@ return {
"from boss room",
},
{name="(Deku Flower Minigame)",
{name="(Deku Flower Minigame Grotto)",
[0]="from Clock Town",
"after beating minigame",
},
@ -355,7 +355,7 @@ return {
"from Gorman track facing the wrong way",
},
{name="Pirates' Fortress (Inside)",
{name="Pirates' Fortress (inside)",
[0]="Hookshot room",
"Hookshot room from above",
"100 Rupee room",
@ -410,22 +410,22 @@ return {
"after telescope",
},
{name="Woodfall Trial",
{name="Moon - Odolwa's Trial",
[0]="from Moon",
},
{name="Deku Palace",
[0]="from Swamp",
[0]="from Swamp (lower)",
"being kicked out",
"from Deku king's chamber",
"from Deku King's chamber",
"from Monkey's cell",
"from Deku Shrine",
"from Swamp (above)",
"from JP Grotto 1",
"from JP Grotto 2",
"from JP Grotto 3",
"from Swamp (upper)",
"from JP Grotto (left side, first room)",
"from JP Grotto (left side, second room)",
"from JP Grotto (right side, second room)",
"from Bean Seller's Grotto",
"from JP Grotto 4",
"from JP Grotto (right side, first room)",
},
{name="Mountain Smithy",
@ -443,11 +443,11 @@ return {
"from East Clock Town",
"from North Clock Town",
"from Observatory",
"telescope",
"using telescope",
"near Ikana (unused?)",
"Moon crashing",
"near East Clock Town (unused?)",
"after skull kid cutscene",
"after Skull Kid cutscene",
},
{name="Post Office",
@ -475,12 +475,12 @@ return {
[0]="from center",
"from turtle",
"from shop",
"from Mikau's room",
"from Evan's room",
"from Lulu's room",
"from Evan and Mikau's room",
"from Japa's room",
"from Tijo's room",
"after something?",
"after concert?",
"in front of stage", -- TODO: when is this used exactly?
"on stage", -- TODO: when is this used exactly?
},
{name="Trading Post",
@ -489,15 +489,15 @@ return {
},
{name="Romani Ranch",
[0]="from milk road",
[0]="from Milk Road",
"after minigame",
"from Barn",
"from mama's house",
"from cucco shack",
"from doggy Racetrack",
"in front of Barn (a)",
"from Mama's House",
"from Cucco Shack",
"from Doggy Racetrack",
"in front of Barn (a)", -- TODO: when are these used exactly?
"in front of Barn (b)",
"in front of house",
"in front of House",
"in front of Barn (c)",
"in front of Romani",
"in front of Barn, facing other way",
@ -517,10 +517,10 @@ return {
"from swimming too far (near Pinnacle)",
"from Lab",
"from Spider House",
"getting Zora mask",
"getting Zora Mask",
"in front of Mikau's grave",
"from Owl Statue",
"getting kicked out of Pirates'",
"being kicked out of Pirates'",
"after beating minigame",
},
@ -530,7 +530,7 @@ return {
"from Zora Hall (turtle)",
"from swimming too far",
"from Waterfall Rapids",
"from Great Fairy's fountain",
"from Fairy's Fountain",
"from Owl Statue",
"from Great Bay Temple",
"after beating Great Bay Temple?",
@ -543,7 +543,7 @@ return {
{name=bad},
{name="Pirates' Fortress (Exterior)",
{name="Pirates' Fortress (exterior)",
[0]="from Great Bay",
"from outside Pirates'",
"from underwater passage",
@ -568,7 +568,7 @@ return {
"in front of King",
},
{name="Snowhead Trial",
{name="Moon - Goht's Trial",
[0]="from Moon",
},
@ -601,12 +601,12 @@ return {
[0]="main door",
},
{name="Southern Swamp (Poisoned)",
{name="Southern Swamp (poisoned)",
[0]="from road",
"from Tourists'",
"from Woodfall",
"from Deku Palace",
"from Deku Palace (above)",
"from Deku Palace (lower)",
"from Deku Palace (upper)",
"from Hags'",
"Boat Cruise",
"from Woods of Mystery",
@ -618,20 +618,20 @@ return {
{name="Woodfall",
[0]="from Swamp",
"from Temple",
"from Great Fairy's fountain",
"from Fairy's Fountain",
"from Deku princess",
"from Owl Statue",
},
{name="Great Bay Trial",
{name="Moon - Gyorg's Trial",
[0]="from Moon",
},
{name="Goron Village (Thawed)",
{name="Goron Village (thawed)",
[0]="from road",
"from above (unused?)",
"from shrine",
"from lens of truth cave",
"from Shrine",
"from Lens of Truth cave",
"from voiding out",
},
@ -655,16 +655,16 @@ return {
{name="(Zora Hall Rooms)",
[0]="Tijo's room",
"Japas' room",
"Mikau's room",
"Evan's room",
"Lulu's room",
"Evan and Mikau's room",
"after playing song to Japas",
"Zora Shop",
"after playing song to Evan",
},
{name="Goron Village (Frozen)",
{name="Goron Village (frozen)",
[0]="from road",
"from flower?",
"in front of Deku Flower (unused?)",
"from Shrine",
"from Lens of Truth cave",
"from voiding out",
@ -672,14 +672,14 @@ return {
{name="Goron Graveyard",
[0]="main door",
"getting Goron mask",
"getting Goron Mask",
},
{name="Sakon's Hideout",
[0]="main door",
},
{name="Mountain Village (Frozen)",
{name="Mountain Village (frozen)",
[0]="after beating Snowhead",
"from Smithy's",
"from road to Village",
@ -722,7 +722,7 @@ return {
{name="Tourist Information",
[0]="main door",
"from boat ride",
"in front of desk (unused?)",
"in front of desk", -- presumably after the free boat ride
},
{name="Stone Tower",
@ -737,7 +737,7 @@ return {
"from Stone Tower",
},
{name="Mountain Village (Thawed)",
{name="Mountain Village (thawed)",
[0]="after beating Snowhead",
"from Smithy's",
"from road to Village",
@ -757,17 +757,17 @@ return {
{name="Snowhead",
[0]="from road",
"from Snowhead Temple",
"from Great Fairy's fountain",
"from Fairy's Fountain",
"from Owl Statue",
},
{name="(Road to Goron Village) (Frozen)",
{name="(Road to Goron Village) (frozen)",
[0]="from Smithy area",
"from Goron Village",
"from Goron Racetrack",
},
{name="(Road to Goron Village) (Thawed)",
{name="(Road to Goron Village) (thawed)",
[0]="from Smithy area",
"from Goron Village",
"from Goron Racetrack",
@ -785,24 +785,24 @@ return {
{name="Stock Pot Inn",
[0]="main door",
"upstairs door",
"Grandma",
"after talking",
"listening to conversation cutscene",
"after listening",
"in front of Grandma",
"after meeting with Anju",
"eavesdropping cutscene",
"after eavesdropping",
},
{name="(Cutscene before Great Bay Temple)",
[0]="default",
},
{name="Clock Tower (Inside)",
{name="Clock Tower (inside)",
[0]="twisty hallway",
"from Clock Town",
"getting Deku mask",
"after cutscene?",
"first SoT cutscene",
"getting Deku Mask",
"after Moon crash cutscene",
"Song of Time cutscene",
"from twisty hallway (unused?)",
"Salesman talking about mask",
"talking about Majora's Mask",
},
{name="Woods of Mystery",
@ -810,12 +810,12 @@ return {
-- "from Grotto?", -- did i just dream this up?
},
{name="Lost Woods (Gain Control)",
[0]="kicked off horse",
"first SoT cutscene",
{name="Lost Woods",
[0]="kicked off Epona",
"Song of Time cutscene",
},
{name="Ikana Trial",
{name="Moon - Twinmold's Trial",
[0]="from Moon",
},
@ -832,11 +832,11 @@ return {
},
{name="Gorman Track",
[0]="from milk road",
[0]="from Milk Road",
"?",
"after beating minigame",
"from milk road (behind fence)",
"from milk road (behind fence) (CS?)",
"from Milk Road (behind fence)",
"from Milk Road (behind fence) (CS?)",
"",
"beginning minigame",
},
@ -849,25 +849,25 @@ return {
{name="East Clock Town",
[0]="from Termina Field",
"from South Clock Town (South)",
"from South Clock Town (lower)",
"from Bomber's hideout",
"from South Clock Town (North)",
"from treasure chest shop",
"from South Clock Town (upper)",
"from Treasure Chest Shop",
"from North Clock Town",
"from honey & darling's",
"from mayor's",
"from shooting gallery",
"from stock pot inn",
"from stock pot inn (above)",
"from milk bar",
"from Honey & Darling's",
"from Mayor's Residence",
"from Shooting Gallery",
"from Stock Pot Inn (lower)",
"from Stock Pot Inn (upper)",
"from Milk Bar",
},
{name="West Clock Town",
[0]="from Termina Field",
"from South Clock Town (South)",
"from South Clock Town (North)",
"from South Clock Town (lower)",
"from South Clock Town (upper)",
"from Swordsman's School",
"from curiosity shop",
"from Curiosity Shop",
"from Trading Post",
"from Bomb Shop",
"from Post Office",
@ -879,25 +879,25 @@ return {
[0]="from Termina Field",
"from East Clock Town",
"from South Clock Town",
"from Great Fairy's fountain",
"from Fairy's Fountain",
"from Deku minigame",
"after Bomber minigame",
"in the middle (unused?)",
"after sakon attacks",
"learning Bombers code",
"after Bombers minigame",
"after Sakon attacks",
},
{name="South Clock Town",
[0]="from Clock Tower",
"from Termina Field",
"from East Clock Town (North)",
"from West Clock Town (North)",
"from East Clock Town (upper)",
"from West Clock Town (upper)",
"from North Clock Town",
"from West Clock Town (South)",
"from West Clock Town (lower)",
"from Laundry Pool",
"from East Clock Town (South)",
"from East Clock Town (lower)",
"from atop Clock Tower (unused)",
"from Owl Statue",
"from SoT cutscene",
"Song of Time cutscene",
},
{name="Laundry Pool",