1
0
Fork 0
mirror of https://github.com/notwa/mm synced 2024-05-14 11:43:24 -07:00

Compare commits

..

No commits in common. "0da2663d23c0020127465d214fafba79eaf91c0a" and "77a88fd5e5722d8030cac70431f1297364679ef5" have entirely different histories.

View File

@ -1,10 +1,10 @@
local bad="[crash]"
return {
custom_order = {
"(Intro Map)",
"Lost Woods",
"Intro Map",
"Lost Woods (Gain Control)",
"(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 Grotto)",
"(Deku Flower Minigame)",
"",
"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",
"Moon - Odolwa's Trial",
"Moon - Goht's Trial",
"Moon - Gyorg's Trial",
"Moon - Twinmold's Trial",
"Moon - Majora",
"Woodfall Trial",
"Snowhead Trial",
"Great Bay Trial",
"Ikana Trial",
"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 (lower)",
"from Deku Palace (upper)",
"from Deku Palace",
"from Deku Palace (above)",
"from Hags'",
"Boat Cruise",
"from Woods of Mystery",
@ -172,21 +172,21 @@ return {
"Snowhead Gossip Stones",
"Generic",
"Hot Spring Water",
"JP Grotto (straight) (right side)",
"JP Grotto (straight) (end?)",
"Dodongo",
"JP Grotto (vines) (right side)",
"JP Grotto (vines) (lower)",
"Deku Merchant",
"Termina Field Cows",
"Beehive",
"Magic Bean Seller",
"Peahat",
"JP Grotto (straight) (left side)",
"JP Grotto (vines) (left side)",
"Lone Peak Shrine (Lens of Truth cave)",
"JP Grotto (straight) (start?)",
"JP Grotto (vines) (upper)",
"Lone Peak Shrine (Lens of Truth Cave)",
},
{name="(Intro Map)",
[0]="from file start",
{name="Intro Map",
[0]="from start file",
"Skull Kid cutscene",
"(crash?)",
"(crash?)",
@ -204,7 +204,7 @@ return {
[0]="main door",
},
{name="Moon - Majora",
{name="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?)",
"using telescope",
"through 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",
"from voiding out",
"Song of Time cutscene",
"after voiding out?",
"part of SoT cutscene",
},
{name="Woodfall Temple",
@ -327,7 +327,7 @@ return {
"from boss room",
},
{name="(Deku Flower Minigame Grotto)",
{name="(Deku Flower Minigame)",
[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="Moon - Odolwa's Trial",
{name="Woodfall Trial",
[0]="from Moon",
},
{name="Deku Palace",
[0]="from Swamp (lower)",
[0]="from Swamp",
"being kicked out",
"from Deku King's chamber",
"from Deku king's chamber",
"from Monkey's cell",
"from Deku Shrine",
"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 Swamp (above)",
"from JP Grotto 1",
"from JP Grotto 2",
"from JP Grotto 3",
"from Bean Seller's Grotto",
"from JP Grotto (right side, first room)",
"from JP Grotto 4",
},
{name="Mountain Smithy",
@ -443,11 +443,11 @@ return {
"from East Clock Town",
"from North Clock Town",
"from Observatory",
"using telescope",
"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 Lulu's room",
"from Evan and Mikau's room",
"from Mikau's room",
"from Evan's room",
"from Japa's room",
"from Tijo's room",
"in front of stage", -- TODO: when is this used exactly?
"on stage", -- TODO: when is this used exactly?
"after something?",
"after concert?",
},
{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)", -- TODO: when are these used exactly?
"from mama's house",
"from cucco shack",
"from doggy Racetrack",
"in front of Barn (a)",
"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",
"being kicked out of Pirates'",
"getting kicked out of Pirates'",
"after beating minigame",
},
@ -530,7 +530,7 @@ return {
"from Zora Hall (turtle)",
"from swimming too far",
"from Waterfall Rapids",
"from Fairy's Fountain",
"from Great 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="Moon - Goht's Trial",
{name="Snowhead 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 (lower)",
"from Deku Palace (upper)",
"from Deku Palace",
"from Deku Palace (above)",
"from Hags'",
"Boat Cruise",
"from Woods of Mystery",
@ -618,20 +618,20 @@ return {
{name="Woodfall",
[0]="from Swamp",
"from Temple",
"from Fairy's Fountain",
"from Great Fairy's fountain",
"from Deku princess",
"from Owl Statue",
},
{name="Moon - Gyorg's Trial",
{name="Great Bay 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",
"Lulu's room",
"Evan and Mikau's room",
"Mikau's room",
"Evan'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",
"in front of Deku Flower (unused?)",
"from flower?",
"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", -- presumably after the free boat ride
"in front of desk (unused?)",
},
{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 Fairy's Fountain",
"from Great 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",
"in front of Grandma",
"after meeting with Anju",
"eavesdropping cutscene",
"after eavesdropping",
"Grandma",
"after talking",
"listening to conversation cutscene",
"after listening",
},
{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 Moon crash cutscene",
"Song of Time cutscene",
"getting Deku mask",
"after cutscene?",
"first SoT cutscene",
"from twisty hallway (unused?)",
"talking about Majora's Mask",
"Salesman talking about mask",
},
{name="Woods of Mystery",
@ -810,12 +810,12 @@ return {
-- "from Grotto?", -- did i just dream this up?
},
{name="Lost Woods",
[0]="kicked off Epona",
"Song of Time cutscene",
{name="Lost Woods (Gain Control)",
[0]="kicked off horse",
"first SoT cutscene",
},
{name="Moon - Twinmold's Trial",
{name="Ikana 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 (lower)",
"from South Clock Town (South)",
"from Bomber's hideout",
"from South Clock Town (upper)",
"from Treasure Chest Shop",
"from South Clock Town (North)",
"from treasure chest shop",
"from North Clock Town",
"from Honey & Darling's",
"from Mayor's Residence",
"from Shooting Gallery",
"from Stock Pot Inn (lower)",
"from Stock Pot Inn (upper)",
"from Milk Bar",
"from honey & darling's",
"from mayor's",
"from shooting gallery",
"from stock pot inn",
"from stock pot inn (above)",
"from milk bar",
},
{name="West Clock Town",
[0]="from Termina Field",
"from South Clock Town (lower)",
"from South Clock Town (upper)",
"from South Clock Town (South)",
"from South Clock Town (North)",
"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 Fairy's Fountain",
"from Great Fairy's fountain",
"from Deku minigame",
"learning Bombers code",
"after Bombers minigame",
"after Sakon attacks",
"after Bomber minigame",
"in the middle (unused?)",
"after sakon attacks",
},
{name="South Clock Town",
[0]="from Clock Tower",
"from Termina Field",
"from East Clock Town (upper)",
"from West Clock Town (upper)",
"from East Clock Town (North)",
"from West Clock Town (North)",
"from North Clock Town",
"from West Clock Town (lower)",
"from West Clock Town (South)",
"from Laundry Pool",
"from East Clock Town (lower)",
"from East Clock Town (South)",
"from atop Clock Tower (unused)",
"from Owl Statue",
"Song of Time cutscene",
"from SoT cutscene",
},
{name="Laundry Pool",