From 31d4641bbeef0f18334e785323d9b76ef35223ac Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Wed, 12 Aug 2015 01:49:22 -0700 Subject: [PATCH] fix up entrance names a bit --- Lua/data/entrance names.lua | 622 ++++++++++++++++++------------------ 1 file changed, 312 insertions(+), 310 deletions(-) diff --git a/Lua/data/entrance names.lua b/Lua/data/entrance names.lua index 162cf4e..e792307 100644 --- a/Lua/data/entrance names.lua +++ b/Lua/data/entrance names.lua @@ -3,16 +3,16 @@ return { [0]= {[0]= "from road", - "from tourists'", - "from woodfall", - "from deku palace", - "from deku palace (above)", - "from hags'", - "boat cruise", - "from woods of mystery", - "from spider house", - "from ikana", - "from owl", + "from Tourists'", + "from Woodfall", + "from Deku Palace", + "from Deku Palace (above)", + "from Hags'", + "Boat Cruise", + "from Woods of Mystery", + "from Spider House", + "from Ikana", + "from Owl Statue", "from road (no cutscene)", }, @@ -29,29 +29,29 @@ return { {}, {[0]= - "gossip stones", - "gossip stones (skultula)", - "gossip stones (more)", - "friggen gossip stones man", - "generic grotto (5 rupees)", - "hot spring water", - "JP grotto (straight) (A)", - "dodongo", - "JP grotto (vines) A", - "box grotto?", - "cows", - "bio deku baba", - "bean seller", - "pea hat", - "JP grotto (straight) (B)", - "JP grotto (vines) (B)", - "lens of truth", - "more damn gossips", + "Great Bay Gossip Stones", + "Woodfall Gossip Stones", + "Stone Tower Gossip Stones", + "Snowhead Gossip Stones", + "Generic", + "Hot Spring Water", + "JP Grotto (straight) (end?)", + "Dodongo", + "JP Grotto (vines) (lower)", + "Scrub", + "Termina Field Cow", + "Beehive", + "Magic Bean Seller", + "Peahat", + "JP grotto (straight) (start?)", + "JP grotto (vines) (upper)", + "Lens of Truth", + "more damn gossips", -- TODO: what's this? }, {[0]= "from start file", - "skull kid cutscene", + "Skull Kid cutscene", "(crash?)", "(crash?)", "(crash?)", @@ -69,18 +69,18 @@ return { }, {[0]= - "from moon", - "[same]", + "from Moon", + "from Moon (duplicate)", }, {[0]= - "rupees", - "to song of storms", + "Iron Knuckle grave", + "Flat's grave", }, {[0]= "main door", - "kafei's room", + "Kafei's room", "peeking into shop", "after peeking", }, @@ -90,45 +90,46 @@ return { {}, {[0]= - "barn", - "mama's house", + "Barn", + "Mama's House", }, {[0]= "main door", - "[same]", + "main door (duplicate)", }, {[0]= "main door", - "mayor's room", + "Mayor's room", "(crash)", }, {[0]= "from road", - "from spirit house", - "from house", - "from stone tower", - "from owl", - "from beneath the well", - "from sakon's hideout", - "after beating temple", + "from Spirit House", + "from house", -- FIXME: just "house"? + "from Stone Tower", + "from Owl Statue", + "from Beneath the Well", + "from Sakon's Hideout", + "after beating Temple", "from castle", - "gibdo cutscene", - "sharp's cave (cutscene)", - "from fairy's fountain", - "from secret shrine", - "from sharp's cave", - "sharp's cave", + "Gibdo cutscene", + "Sharp's cave (cutscene)", + "from Fairy's Fountain", + "from Secret Shrine", + "from Sharp's cave", + "Sharp's cave", "from road?", }, {[0]= "main door", - "from hookshot room", - "from above hookshot room", - "from 100 rupee room", + "from Hookshot room", + "from above Hookshot room", + "from 100 Rupee room", + -- FIXME: all these pirate room names "egg room 1", "from cannon(?) room", "from egg room 3", @@ -144,7 +145,7 @@ return { {[0]= "main door", - "[same]", + "main door (duplicate)", }, {[0]= @@ -165,14 +166,14 @@ return { {[0]= "main door", - "from ocarina cutscene", + "from Ocarina cutscene", "(crash?)", }, {[0]= "main door", - "from clock tower (unused)", - "after being turned into deku", + "from Clock Tower (unused)", + "after being turned into Deku", "after voiding out?", "part of SoT cutscene", "main door (no cutscene) (unused)", @@ -180,58 +181,58 @@ return { {[0]= "main door", - "deku princess after odolwa", - "deku princess room", + "Deku Princess after Odolwa", + "Deku Princess room", "main door with wrong room loaded (unused?)", }, {[0]= - "from termina field", - "from mountain village", + "from Termina Field", + "from Mountain Village", }, {[0]= - "from beneath the well", - "from ikana canyon", - "from castle main door", - "inside castle main door", - "from above, inbetween redeads", - "from above, floormaster", + "from Beneath the Well", + "from Ikana Canyon", + "from Castle Main Door", + "inside Castle Main Door", + "from above, inbetween Redeads", + "from above, Floormaster", "from boss room", - "from beneath the well (again)", + "from Beneath the Well (duplicate)", }, {[0]= - "from clock town", + "from Clock Town", "after beating minigame", "(crash)", - "from clock town (again)", + "from Clock Town (duplicate)", }, {[0]= "main door", - "[same]", + "main door (duplicate)", }, {[0]= "main door", - "[same]", + "main door (duplicate)", }, {[0]= "main door", - "[same]", + "main door (duplicate)", }, {[0]= - "from termina field", - "from romani's ranch", - "from gorman track behind fence", - "from gorman track", - "from owl", - "from romani's ranch facing the wrong way", - "from gorman track facing the wrong way", - "from termina field (again)", + "from Termina field", + "from Romani's Ranch", + "from Gorman track behind fence", + "from Gorman track", + "from Owl Statue", + "from Romani's Ranch facing the wrong way", + "from Gorman track facing the wrong way", + "from Termina field (duplicate)", }, {[0]= @@ -255,105 +256,105 @@ return { {[0]= "main door", - "[same]", + "main door (duplicate)", }, {[0]= - "from great bay", - "[same]", + "from Great Bay", + "from Great Bay (duplicate)", }, {[0]= - "from clock town", - "from woodfall", - "from snowhead", - "from great bay", - "from ikana canyon", + "from Clock Town", + "from Woodfall", + "from Snowhead", + "from Great Bay", + "from Ikana canyon", "learning magic", "learning spin attack", "learning double magic", "getting double defense", - "getting great fairy's sword", + "getting Great Fairy's sword", }, {[0]= "main door", - "[same]", + "main door (duplicate)", }, {[0]= "main door", - "[same]", + "main door (duplicate)", }, {[0]= - "from clock town", - "from termina field", + "from Clock Town", + "from Termina field", "after telescope", - "from clock town (again?)", + "from Clock Town (duplicate?)", }, {[0]= - "from moon", - "from moon?", + "from Moon", + "from Moon?", }, {[0]= - "from swamp", + "from Swamp", "being kicked out", - "from deku king's chamber", + "from Deku king's chamber", "from monkey", "from what's-it-called", - "from swamp (above)", + "from Swamp (above)", "from JP grotto 1", "from JP grotto 2", "from JP grotto 3", - "from bean seller's grotto", + "from Bean Seller's grotto", "from JP grotto 4", - "from swamp (no cutscene)", + "from Swamp (no cutscene)", }, {[0]= "main door", - "[same]", + "main door (duplicate)", "(crash)", - "[same]", + "main door (duplicate)", }, {[0]= - "from west clock town", - "from road to swamp", - "from great bay", - "from snowhead passage", - "from road to ikana", - "from milk road", - "from south clock town", - "from east clock town", - "from north clock town", - "from observatory", + "from West Clock Town", + "from road to Swamp", + "from Great Bay", + "from Snowhead passage", + "from road to Ikana", + "from Milk Road", + "from South Clock Town", + "from East Clock Town", + "from North Clock Town", + "from Observatory", "telescope", - "near ikana (unused?)", - "moon crashing", - "near east clock town (unused?)", + "near Ikana (unused?)", + "Moon crashing", + "near East Clock Town (unused?)", "after skull kid cutscene", - "from west clock town (no cutscene)", + "from West Clock Town (no cutscene)", }, {[0]= "main door", - "[same]", + "main door (duplicate)", }, {[0]= "main door", - "[same]", + "main door (duplicate)", "(crash)", - "[same]", + "main door (duplicate)", }, {[0]= "from grave", - "from graveyard door", + "from Graveyard door", }, {}, @@ -361,7 +362,7 @@ return { {[0]= "main door", "from shop", - "after lullaby", + "after Lullaby", "main door (no cutscene)", }, @@ -369,10 +370,10 @@ return { "from center", "from turtle", "from shop", - "from mikau's room", - "from evan's room", - "from japa's room", - "from tijo's room", + "from Mikau's room", + "from Evan's room", + "from Japa's room", + "from Tijo's room", "after something?", "after concert?", "main door (no cutscene)", @@ -380,132 +381,133 @@ return { {[0]= "main door", - "[same]", + "main door (duplicate)", "(crash)", - "[same]", + "main door (duplicate)", }, {[0]= "from milk road", "after minigame", - "from barn", + "from Barn", "from mama's house", "from cucco shack", - "from doggy racetrack", - "in front of barn", - "in front of barn (again?)", + "from doggy Racetrack", + -- FIXME: all of these duplicates + "in front of Barn", + "in front of Barn (duplicate?)", "in front of house", - "in front of barn (again??)", - "in front of romani", - "in front of barn, facing other way", - "[crash]", - "in front of barn (again!)", - "in front of barn (again!!)", + "in front of Barn (duplicate??)", + "in front of Romani", + "in front of Barn, facing other way", + "(crash)", + "in front of Barn (duplicate!)", + "in front of Barn (duplicate!!)", }, {[0]= "main door", - "[same]", + "main door (duplicate)", "(crash)", "(crash)", "(crash)", }, {[0]= - "from termina field", - "from zora area", + "from Termina field", + "from Zora area", "from swimming too far", "from pinnacle rock", "from fisherman's hut", - "from pirates' fortress", + "from Pirates' fortress", "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", - "getting kicked out of pirates'", + "from Owl Statue", + "getting kicked out of Pirates'", "after beating minigame", }, {[0]= "from lab area", - "from zora hall", - "from zora hall (turtle)", + "from Zora hall", + "from Zora hall (turtle)", "from swimming too far", "from waterfall rapids", - "from great fairy's fountain", - "from owl", - "from great bay temple", - "after beating great bay temple?", + "from Great Fairy's fountain", + "from Owl Statue", + "from Great Bay Temple", + "after beating Great Bay Temple?", "really high up?", }, {[0]= "main door", - "[same]", + "main door (duplicate)", "(crash)", - "[same]", + "main door (duplicate)", }, {}, {[0]= - "from great bay", - "from outside pirates'", + "from Great Bay", + "from outside Pirates'", "from underwater passage", "from one-way underwater", "being kicked out", "from hookshot platform", "from passage door", - "from great bay (no cutscene)", + "from Great Bay (no cutscene)", }, {[0]= "main door", - "[same]", + "main door (duplicate)", "(crash)", - "[same]", + "main door (duplicate)", }, {[0]= "main door", - "[same]", + "main door (duplicate)", "(crash)", - "[same]", + "main door (duplicate)", }, {[0]= "from main door", - "to monkey", - "princess thanks monkey cutscene", - "in front of king", + "to Monkey", + "Princess thanks Monkey cutscene", + "in front of King", }, {[0]= - "from moon", - "from moon?", - "[crash]", - "from moon??", + "from Moon", + "from Moon?", + "(crash)", + "from Moon??", }, {[0]= - "from termina field", - "from swamp", - "from shooting gallery", - "from termina field (again)", + "from Termina Field", + "from Swamp", + "from Shooting Gallery", + "from Termina Field (duplicate)", }, {[0]= - "from ranch", + "from Ranch", "after beating minigame", - "[crash]", - "from ranch (again)", + "(crash)", + "from Ranch (duplicate)", }, {[0]= - "from ranch", - "getting bunny hood", + "from Ranch", + "getting Bunny Hood", }, {[0]= @@ -513,42 +515,42 @@ return { "from grave 1", "from grave 2", "from grave 3", - "from dampe's door", - "getting captain's hat", + "from Dampe's door", + "getting Captain's Hat", }, {[0]= "main door", - "[same]", + "main door (duplicate)", }, {[0]= "from road", - "from tourists'", - "from woodfall", - "from deku palace", - "from deku palace (above)", - "from hags'", - "boat cruise", - "from woods of mystery", - "from spider house", - "from ikana", - "from owl", - "from road (again?)", + "from Tourists'", + "from Woodfall", + "from Deku Palace", + "from Deku Palace (above)", + "from Hags'", + "Boat Cruise", + "from Woods of Mystery", + "from Spider House", + "from Ikana", + "from Owl Statue", + "from road (no cutscene)", }, {[0]= - "from swamp", - "from temple", - "from great fairy's fountain", - "from deku princess", - "from owl", - "from swamp (no cutscene)", + "from Swamp", + "from Temple", + "from Great Fairy's fountain", + "from Deku princess", + "from Owl Statue", + "from Swamp (no cutscene)", }, {[0]= - "from moon", - "from moon?", + "from Moon", + "from Moon?", }, {[0]= @@ -557,7 +559,7 @@ return { "from shrine", "from lens of truth cave", "from voiding out", - "from road (again)", + "from road (duplicate)", }, {[0]= @@ -566,163 +568,163 @@ return { }, {[0]= - "from great bay", + "from Great Bay", "minigame", "minigame 2?", "after beating minigame?", - "from great bay (no cutscene)", + "from Great Bay (no cutscene)", }, {[0]= - "from ikana canyon", - "from ikana castle", + "from Ikana canyon", + "from Ikana castle", }, {[0]= - "drummer's room", - "bassist's room", - "from mikau's room", - "from keyboardist's room", - "after playing song to bassist", - "zora shop", - "after playing song to keyboardist", - "drummer's room (again)", + "Tijo's room", + "Japas' room", + "from Mikau's room", + "from Evan's room", + "after playing song to Japas", + "Zora Shop", + "after playing song to Evan", + "Tijo's room (duplicate)", }, {[0]= "from road", "from flower?", - "from shrine", - "from lens of truth cave", + "from Shrine", + "from Lens of Truth cave", "from voiding out", - "from road (again)", + "from road (duplicate)", }, {[0]= "main door", - "getting goron mask", + "getting Goron mask", "(crash)", - "[same]", + "main door (duplicate)", }, {[0]= "main door", - "[same]", + "main door (duplicate)", "(crash)", - "[same]", + "main door (duplicate)", }, {[0]= - "after beating snowhead", - "from smithy's", - "from road to village", - "from graveyard", - "from road to snowhead", + "after beating Snowhead", + "from Smithy's", + "from road to Village", + "from Graveyard", + "from road to Snowhead", "on ice?", - "from snowhead passage", + "from Snowhead passage", "from…?", - "from owl", - "after being snowhead (again)", + "from Owl Statue", + "after being Snowhead (duplicate)", }, {[0]= - "from ikana canyon", + "from Ikana canyon", "from minigame", "after beating minigame", - "from ikana canyon (again)", + "from Ikana canyon (duplicate)", }, {[0]= "main door", - "[same]", + "main door (duplicate)", }, {[0]= - "from termina field", - "from ikana canyon", - "from ikana graveyard", - "from termina field (again)", + "from Termina field", + "from Ikana canyon", + "from Ikana Graveyard", + "from Termina field (duplicate)", }, {[0]= "main door", - "[same]", + "main door (duplicate)", "(crash)", - "[same]", + "main door (duplicate)", }, {[0]= "main door", - "[same]", + "main door (duplicate)", "(crash)", - "[same]", + "main door (duplicate)", }, {[0]= "main door", - "[same]", + "main door (duplicate)", "(crash)", - "[same]", + "main door (duplicate)", }, {[0]= "main door", "from boat ride", "in front of desk (unused?)", - "main door (again)", + "main door (duplicate)", }, {[0]= - "from ikana canyon", + "from Ikana canyon", "from inverting", - "from temple", - "from owl", + "from Temple", + "from Owl Statue", }, {[0]= "from inverting", - "from stone tower", + "from stone Tower", "(crash)", "from inverting (no cutscene)", }, {[0]= - "after beating snowhead", - "from smithy's", - "from road to village", - "from graveyard", - "from road to snowhead", + "after beating Snowhead", + "from Smithy's", + "from road to Village", + "from Graveyard", + "from road to Snowhead", "from behind waterfall (unused?)", - "from snowhead passage", - "after beating snowhead (with cutscene)", - "from owl", - "after being snowhead (again)", + "from Snowhead passage", + "after beating Snowhead (with cutscene)", + "from Owl Statue", + "after being Snowhead (duplicate)", }, {[0]= - "from smithy area", - "from snowhead", + "from Smithy area", + "from Snowhead", }, {[0]= "from road", - "from snowhead temple", - "from great fairy's fountain", - "from owl", + "from Snowhead Temple", + "from Great Fairy's fountain", + "from Owl Statue", }, {[0]= - "from smithy area", - "from goron village", - "from goron racetrack", - "from smithy area (again)", + "from Smithy area", + "from Goron Village", + "from Goron Racetrack", + "from Smithy area (duplicate)", }, {[0]= - "from smithy area", - "from goron village", - "from goron racetrack", - "from smithy area (again)", + "from Smithy area", + "from Goron Village", + "from Goron Racetrack", + "from Smithy area (duplicate)", }, {[0]= @@ -732,15 +734,15 @@ return { {[0]= "main door", - "[same]", + "main door (duplicate)", "(crash)", - "[same]", + "main door (duplicate)", }, {[0]= "main door", "upstairs door", - "grandma", + "Grandma", "after talking", "listening to conversation cutscene", "after listening", @@ -753,17 +755,17 @@ return { {[0]= "twisty hallway", - "from clock town", - "getting deku mask", + "from Clock Town", + "getting Deku mask", "after cutscene?", "first SoT cutscene", "from twisty hallway (unused?)", - "salesman talking about mask", + "Salesman talking about mask", "twisty hallway (no cutscene)", }, {[0]= - "from swamp", + "from Swamp", "from grotto?", }, @@ -775,26 +777,26 @@ return { }, {[0]= - "from moon", - "[same]", + "from Moon", + "from Moon (duplicate)", "(crash)", - "[same]", + "main door (duplicate)", }, {[0]= - "moon", - "[same]", + "Moon", + "Moon (duplicate)", }, {[0]= "main door", - "[same]", + "main door (duplicate)", "(crash)", - "[same]", + "main door (duplicate)", }, {[0]= - "giants", + "Giants", "no cutscene", }, @@ -812,16 +814,16 @@ return { "from road", "beginning minigame", "after beating minigame", - "from road (again)", + "from road (duplicate)", }, {[0]= - "from termina field", - "from south clock town (south)", - "from bomber's hideout", - "from south clock town (north)", + "from Termina field", + "from South Clock Town (South)", + "from Bomber's hideout", + "from South Clock Town (North)", "from treasure chest shop", - "from north clock town", + "from North Clock Town", "from honey & darling's", "from mayor's", "from shooting gallery", @@ -831,46 +833,46 @@ return { }, {[0]= - "from termina field", - "from south clock town (south)", - "from south clock town (north)", + "from Termina field", + "from South Clock Town (South)", + "from South Clock Town (North)", "from swordsman's school", "from curiosity shop", "from trading post", "from bomb shop", "from post office", "from lottery shop", - "from termina field (again)", + "from Termina field (duplicate)", }, {[0]= - "from termina field", - "from east clock town", - "from south clock town", - "from great fairy's fountain", - "from deku minigame", - "after bomber minigame", + "from Termina field", + "from East Clock Town", + "from South Clock Town", + "from Great Fairy's fountain", + "from Deku minigame", + "after Bomber minigame", "in the middle (unused?)", "after sakon attacks", }, {[0]= - "from clock tower", - "from termina field", - "from east clock town (north)", - "from west clock town (north)", - "from north clock town", - "from west clock town (south)", + "from Clock Tower", + "from Termina field", + "from East Clock Town (North)", + "from West Clock Town (North)", + "from North Clock Town", + "from West Clock Town (South)", "from laundry pool", - "from east clock town (south)", - "from atop clock tower (unused)", - "from owl", + "from East Clock Town (South)", + "from atop Clock Tower (unused)", + "from Owl Statue", "from SoT cutscene", - "from clock tower (no cutscene)", + "from Clock Tower (no cutscene)", }, {[0]= - "from south clock town", + "from South Clock Town", "from kafei's room", },