notwa/mm
1
0
Fork 0
mirror of https://github.com/notwa/mm synced 2024-04-28 06:13:23 -07:00
Code Issues Releases Wiki Activity

Compare commits

base: notwa:77a88fd5e5722d8030cac70431f1297364679ef5
Branches Tags
notwa:master
notwa:m64p
...
compare: notwa:0da2663d23c0020127465d214fafba79eaf91c0a
Branches Tags
notwa:master
notwa:m64p

6 Commits
77a88fd5e5 ... 0da2663d23

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
Show Stats Expand all files Collapse all files

240
Lua/data/entrance names.lua
View File

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