From 55ad6351af2b2ce22ad3c6f20730eaf8e47a15df Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Sun, 17 Jan 2016 15:06:58 -0800 Subject: [PATCH] inline scene names alongside entrance lists --- Lua/data/entrance names oot.lua | 427 ++++++++++++++--------------- Lua/data/entrance names.lua | 466 ++++++++++++++++---------------- Lua/data/scene names oot.lua | 113 -------- Lua/data/scene names.lua | 132 --------- Lua/menus/warp oot.lua | 5 +- Lua/menus/warp.lua | 3 +- Lua/monitor exits.lua | 3 +- 7 files changed, 451 insertions(+), 698 deletions(-) delete mode 100644 Lua/data/scene names oot.lua delete mode 100644 Lua/data/scene names.lua diff --git a/Lua/data/entrance names oot.lua b/Lua/data/entrance names oot.lua index 5389131..88dd7c4 100644 --- a/Lua/data/entrance names oot.lua +++ b/Lua/data/entrance names oot.lua @@ -1,73 +1,74 @@ -- TODO: fix "from Market Entrance" ones that should just be "from Market" +local bad="[crash]" return {[0]= - {[0]= - {"from Kokiri Forest", 0x0000}, + {name="Inside the Deku Tree", + [0]={"from Kokiri Forest", 0x0000}, {"from boss door", 0x0252}, }, - {[0]= - {"from Death Mountain Trail", 0x0004}, + {name="Dodongo's Cavern", + [0]={"from Death Mountain Trail", 0x0004}, {"from boss door", 0x00C5}, }, - {[0]= - {"from Zora's Fountain", 0x0028}, + {name="Inside Jabu-Jabu's Belly", + [0]={"from Zora's Fountain", 0x0028}, {"from boss door (wrong room)", 0x0407}, }, - {[0]= - {"from Sacred Forest Meadow", 0x0169}, + {name="Forest Temple", + [0]={"from Sacred Forest Meadow", 0x0169}, {"from boss door", 0x024E}, {"in ceiling crush room", 0x0584}, }, - {[0]= - {"from Death Mountain Crater", 0x0165}, + {name="Fire Temple", + [0]={"from Death Mountain Crater", 0x0165}, {"from boss door", 0x0175}, }, - {[0]= - {"from Lake Hylia", 0x0010}, + {name="Water Temple", + [0]={"from Lake Hylia", 0x0010}, {"from Lake Hylia (dupe?)", 0x0423}, }, - {[0]= - {"from Desert Colossus", 0x0082}, + {name="Spirit Temple", + [0]={"from Desert Colossus", 0x0082}, {"from boss door", 0x02F5}, {"from Silver Gauntlets Chest", 0x03F0}, {"from Mirror Shield Chest", 0x03F4}, -- {"Crashes (Bad Map)", 0x03F8}, }, - {[0]= - {"from Graveyard", 0x0037}, + {name="Shadow Temple", + [0]={"from Graveyard", 0x0037}, {"from boss door", 0x02B2}, -- {"from Shadow Temple Boss, Secret Map #0", 0x02B6}, -- {"?", 0x04EA}, }, - {[0]= - {"from Kakariko Village", 0x0098}, + {name="Bottom of the Well", + [0]={"from Kakariko Village", 0x0098}, {"from Kakariko Village (dupe?)", 0x05CC}, }, - {[0]= - {"from Zora's Fountain", 0x0088}, + {name="Ice Cavern", + [0]={"from Zora's Fountain", 0x0088}, {"to sliding blocks puzzle (wrong room)", 0x05D8}, }, - {[0]= - {"from Inside Ganon's Castle", 0x041B}, + {name="Ganon's Tower", + [0]={"from Inside Ganon's Castle", 0x041B}, {"from boss door", 0x0427}, {"to alt boss door", 0x042B}, }, - {[0]= - {"from Gerudo Fortress", 0x0008}, + {name="Gerudo Training Ground", + [0]={"from Gerudo Fortress", 0x0008}, }, - {[0]= - {"from Gerudo Fortress 1", 0x0486}, -- bottom left + {name="Thieves' Hideout", + [0]={"from Gerudo Fortress 1", 0x0486}, -- bottom left {"from Gerudo Fortress 2", 0x048A}, -- bottom middle left {"from Gerudo Fortress 3", 0x048E}, -- bottom middle right {"from Gerudo Fortress 6", 0x0492}, -- middle middle @@ -82,8 +83,8 @@ return {[0]= {"from Gerudo Fortress 8", 0x0570}, -- upper left }, - {[0]= - {"from Exterior", 0x0467}, + {name="Inside Ganon's Castle", + [0]={"from Exterior", 0x0467}, {"from Ganon's Tower", 0x0534}, {"cleared Forest Trial", 0x0538}, {"cleared Water Trial", 0x053C}, @@ -93,8 +94,8 @@ return {[0]= {"cleared Spirit Trial", 0x054C}, }, - {[0]= - {"bottom of boss room, from Exterior (upper)", 0x0179}, + {name="Ganon's Tower (Collapsing)", + [0]={"bottom of boss room, from Exterior (upper)", 0x0179}, {"bottom of boss room, from Exterior (lower)", 0x0134}, {"burning rocks, from Exterior, (upper)", 0x01B5}, {"burning rocks, from Exterior, (lower)", 0x0256}, @@ -104,55 +105,55 @@ return {[0]= {"staircase down, from Interior Exit", 0x04B6}, }, - {[0]= - {"from Interior, stairs", 0x056C}, + {name="Inside Ganon's Castle (Collapsing)", -- en route to Ganon fight + [0]={"from Interior, stairs", 0x056C}, }, - {[0]= - {"from Market", 0x0063}, + {name="Treasure Chest Shop", + [0]={"from Market", 0x0063}, }, - {[0]= - {"from Deku Tree", 0x040F}, + {name="Gohma's Lair", + [0]={"from Deku Tree", 0x040F}, }, - {[0]= - {"from Dodongo's Cavern", 0x040B}, + {name="King Dodongo's Lair", + [0]={"from Dodongo's Cavern", 0x040B}, }, - {[0]= - {"from Inside Jabu Jabu's Belly", 0x0301}, + {name="Barinade's Lair", + [0]={"from Inside Jabu Jabu's Belly", 0x0301}, }, - {[0]= - {"from Forest Temple", 0x000C}, + {name="Phantom Ganon's Lair", + [0]={"from Forest Temple", 0x000C}, }, - {[0]= - {"from Fire Temple", 0x0305}, + {name="Volvagia's Lair", + [0]={"from Fire Temple", 0x0305}, }, - {[0]= - {"from Water Temple", 0x0417}, + {name="Morpha's Lair", + [0]={"from Water Temple", 0x0417}, }, - {[0]= - {"from Spirit Temple", 0x008D}, - {}, + {name="Twinrova's Lair", + [0]={"from Spirit Temple", 0x008D}, + {name=bad}, {"Inside Boss Map", 0x05EC}, -- [0]={"from Spirit Temple", 0x0091}, }, - {[0]= - {"from Shadow Temple", 0x0413}, + {name="Bongo Bongo's Lair", + [0]={"from Shadow Temple", 0x0413}, }, - {[0]= - {"from Ganon's Tower Climb", 0x041F}, + {name="Ganondorf's Lair", + [0]={"from Ganon's Tower Climb", 0x041F}, }, - {[0]= - {"Death cutscene, from Ganondorf Boss Room", 0x043F}, + {name="Tower Collapse Escape", + [0]={"Death cutscene, from Ganondorf Boss Room", 0x043F}, {"from Tower Collapse Interior, Boss Room Floor (Higher)", 0x04BA}, {"from Tower Collapse Interior, Boss Room Floor (Lower)", 0x032C}, {"from Tower Collapse Interior, Burning Rocks (Higher)", 0x0330}, @@ -162,26 +163,26 @@ return {[0]= {"from Tower Collapse Interior, Stairs", 0x0524}, }, - {[0]= - {"from Market", 0x0033}, + {name="Market Entrance (Day)", + [0]={"from Market", 0x0033}, {"from Hyrule Field", 0x0276}, {"from Guard Post", 0x026E}, }, - {[0]= - {"from Market", 0x0034}, + {name="Market Entrance (Night)", + [0]={"from Market", 0x0034}, {"from Hyrule Field", 0x0277}, {"from Guard Post", 0x026F}, }, - {[0]= - {"from Market", 0x0035}, + {name="Market Entrance (Ruins)", + [0]={"from Market", 0x0035}, {"from Hyrule Field", 0x0278}, {"from Guard Post", 0x0270}, }, - {[0]= - {"from Market (right)", 0x00AD}, + {name="Back Alley (Day)", + [0]={"from Market (right)", 0x00AD}, {"from Market (left)", 0x029A}, {"from Bombchu Shop", 0x03C0}, {"from right house", 0x0067}, @@ -193,8 +194,8 @@ return {[0]= -- [4]={"from Puppy Woman's House", 0x038E}, }, - {[0]= - {"from Market (right)", 0x00AE}, + {name="Back Alley (Night)", + [0]={"from Market (right)", 0x00AE}, {"from Market (left)", 0x029B}, {"from Bombchu Shop", 0x03C1}, {"from right house", 0x0068}, @@ -206,8 +207,8 @@ return {[0]= -- [4]={"from Puppy Woman's House", 0x038F}, }, - {[0]= - {"from Market Entrance", 0x00B1}, + {name="Market (Day)", + [0]={"from Market Entrance", 0x00B1}, {"from Castle", 0x025A}, {"from Temple of Time", 0x025E}, {"from Back Alley right", 0x0262}, @@ -221,8 +222,8 @@ return {[0]= -- [0]={"from Market Entrance", 0x00B5}, }, - {[0]= - {"from Market Entrance", 0x00B2}, + {name="Market (Night)", + [0]={"from Market Entrance", 0x00B2}, {"from Castle", 0x025B}, {"from Temple of Time", 0x025F}, {"from Back Alley right", 0x0263}, @@ -235,8 +236,8 @@ return {[0]= {"from Treasure Box Shop", 0x01D6}, }, - {[0]= - {"from Market Entrance", 0x00B3}, + {name="Market (Ruins)", + [0]={"from Market Entrance", 0x00B3}, {"from Ganon's Castle", 0x025C}, {"from Temple of Time", 0x0260}, {"from Back Alley (right)", 0x0264}, @@ -249,64 +250,64 @@ return {[0]= {"from Treasure Box Shop", 0x01D7}, }, - {[0]= - {"from Market", 0x0171}, + {name="Temple of Time Exterior (Day)", + [0]={"from Market", 0x0171}, {"from Temple of Time", 0x0472}, }, - {[0]= - {"from Market", 0x0172}, + {name="Temple of Time Exterior (Night)", + [0]={"from Market", 0x0172}, {"from Temple of Time", 0x0473}, }, - {[0]= - {"from Market", 0x0173}, + {name="Temple of Time Exterior (Ruins)", + [0]={"from Market", 0x0173}, {"from Temple of Time", 0x0474}, }, - {[0]= - {"from Kokiri Forest", 0x00C9}, + {name="Know-It-All Brothers' House", + [0]={"from Kokiri Forest", 0x00C9}, }, - {[0]= - {"from Kokiri Forest", 0x009C}, + {name="Twins' House", + [0]={"from Kokiri Forest", 0x009C}, }, - {[0]= - {"from Kokiri Forest", 0x0433}, + {name="Mido's House", + [0]={"from Kokiri Forest", 0x0433}, }, - {[0]= - {"from Kokiri Forest", 0x0437}, + {name="Saria's House", + [0]={"from Kokiri Forest", 0x0437}, }, - {[0]= - {"from Kakariko Village", 0x02FD}, + {name="Carpenter Boss's House", + [0]={"from Kakariko Village", 0x02FD}, }, - {[0]= - {"from Back Alley", 0x043B}, + {name="Back Alley House (Man in Green)", + [0]={"from Back Alley", 0x043B}, }, - {[0]= - {"from Kakariko Village", 0x00B7}, + {name="Bazaar", + [0]={"from Kakariko Village", 0x00B7}, {"from Market", 0x052C}, }, - {[0]= - {"from Kokiri Forest", 0x00C1}, + {name="Kokiri Shop", + [0]={"from Kokiri Forest", 0x00C1}, }, - {[0]= - {"from Goron City", 0x037C}, + {name="Goron Shop", + [0]={"from Goron City", 0x037C}, }, - {[0]= - {"from Zora's Domain", 0x0380}, + {name="Zora Shop", + [0]={"from Zora's Domain", 0x0380}, }, - {[0]= - {"from Kakariko Village", 0x0384}, + {name="Kakariko Potion Shop", + [0]={"from Kakariko Village", 0x0384}, {"from Kakariko Village (dupe?)", 0x03E8}, {"from Kakariko Village (back door)", 0x03EC}, -- [0]={"from Kakariko Village", 0x0386}, @@ -314,70 +315,70 @@ return {[0]= -- [2]={"Back Door, from Kakariko Village", 0x03EE}, }, - {[0]= - {"from Market", 0x0388}, + {name="Market Potion Shop", + [0]={"from Market", 0x0388}, }, - {[0]= - {"from Back Alley", 0x0390}, + {name="Bombchu Shop", + [0]={"from Back Alley", 0x0390}, {"from Back Alley (dupe?)", 0x0528}, }, - {[0]= - {"from Market", 0x0530}, + {name="Happy Mask Shop", + [0]={"from Market", 0x0530}, }, - {[0]= - {"from Save Warp", 0x00BB}, + {name="Link's House", + [0]={"from Save Warp", 0x00BB}, {"from Kokiri Forest", 0x0272}, -- [0]={"Bed Entrance, from Savewarp", 0x00C0}, }, - {[0]= - {"from Back Alley", 0x0398}, + {name="Back Alley House (Dog Lady)", + [0]={"from Back Alley", 0x0398}, }, - {[0]= - {"from Lon Lon Ranch", 0x02F9}, + {name="Stable", + [0]={"from Lon Lon Ranch", 0x02F9}, }, - {[0]= - {"from Kakariko Village", 0x039C}, + {name="Impa's House", + [0]={"from Kakariko Village", 0x039C}, {"from Kakariko Village (roof)", 0x05C8}, }, - {[0]= - {"from Lake Hylia", 0x0043}, + {name="Lakeside Laboratory", + [0]={"from Lake Hylia", 0x0043}, {"Eyedrops Timeout?", 0x01C5}, }, - {[0]= - {"from Gerudo Valley", 0x03A0}, + {name="Carpenters' Tent", + [0]={"from Gerudo Valley", 0x03A0}, }, - {[0]= - {"from Graveyard", 0x030D}, + {name="Gravekeeper's Hut", + [0]={"from Graveyard", 0x030D}, }, - {[0]= - {"from Death Mountain Trail", 0x0315}, + {name="Great Fairy's Fountain (Upgrades)", + [0]={"from Death Mountain Trail", 0x0315}, {"from Death Mountain Crater", 0x04BE}, {"from Castle", 0x04C2}, {"unused?", 0x04F2}, }, - {[0]= - {"from Grotto Hole", 0x036D}, + {name="Fairy's Fountain", + [0]={"from Grotto Hole", 0x036D}, }, - {[0]= - {"from Zora's Fountain", 0x0371}, + {name="Great Fairy's Fountain (Spells)", + [0]={"from Zora's Fountain", 0x0371}, {"from Castle", 0x0578}, {"from Desert Colossus", 0x0588}, }, - {[0]= - {"generic", 0x003F}, + {name="Grottos", + [0]={"generic", 0x003F}, {"Big Skulltula", 0x0598}, {"Heart Piece Scrub", 0x059C}, {"Two Redeads", 0x05A0}, @@ -393,28 +394,28 @@ return {[0]= {"Cow", 0x05FC}, }, - {[0]= - {"from Graveyard", 0x031C}, + {name="Grave: Redead", + [0]={"from Graveyard", 0x031C}, }, - {[0]= - {"from Graveyard", 0x004B}, + {name="Grave: Fairy's Fountain", + [0]={"from Graveyard", 0x004B}, }, - {[0]= - {"from Graveyard", 0x002D}, + {name="Royal Family's Tomb", + [0]={"from Graveyard", 0x002D}, {"from Sun Song cutscene", 0x0574}, }, - {[0]= - {"from Kakariko Village", 0x003B}, + {name="Shooting Gallery", + [0]={"from Kakariko Village", 0x003B}, {"from Market Entrance", 0x016D}, -- [0]={"from Kakariko Village", 0x02EA}, -- [0]={"from Kakariko Village", 0x02F0}, }, - {[0]= - {"from Outside Temple of Time", 0x0053}, + {name="Temple of Time", + [0]={"from Outside Temple of Time", 0x0053}, {"n/a", 0}, {"from Master Sword", 0x02CA}, {"facing exit (closer to DoT)", 0x0320}, @@ -426,28 +427,28 @@ return {[0]= -- [0]={"from Outside Temple of Time", 0x005F}, }, - {[0]= - {"?", 0x006F}, + {name="Chamber of the Sages", + [0]={"?", 0x006F}, {"??? (Forest Medallion?)", 0x02CE}, -- [0]={"?", 0x0071}, }, - {[0]= - {"from crawlspace", 0x007A}, + {name="Castle Hedge Maze (Day)", + [0]={"from crawlspace", 0x007A}, {"from Zelda's Courtyard", 0x0296}, -- [0]={"from Castle, Crawlspace", 0x007C}, -- [1]={"from Zelda's Courtyard", 0x0298}, }, - {[0]= - {"from crawlspace", 0x007B}, + {name="Castle Hedge Maze (Night)", + [0]={"from crawlspace", 0x007B}, {"from Zelda's Courtyard", 0x0297}, -- [0]={"from Castle, Crawlspace", 0x007D}, -- [1]={"from Zelda's Courtyard", 0x0299}, }, - {[0]= - {"?", 0x00A4}, + {name="Cutscene Map", + [0]={"?", 0x00A4}, -- [0]={"?", 0x00A5}, -- [0]={"?", 0x00A6}, -- [0]={"?", 0x00A7}, @@ -455,49 +456,49 @@ return {[0]= -- [0]={"?", 0x02EF}, }, - {[0]= - {"from Graveyard", 0x044F}, + {name="Windmill & Dampe's Grave", + [0]={"from Graveyard", 0x044F}, {"from Kakariko Village", 0x0453}, {"from Storms cutscene", 0x0503}, }, - {[0]= - {"from Lake Hylia", 0x045F}, + {name="Fishing Pond", + [0]={"from Lake Hylia", 0x045F}, }, - {[0]= - {"from Castle Courtyard", 0x0400}, + {name="Castle Courtyard", + [0]={"from Castle Courtyard", 0x0400}, {"from Triforce cutscene", 0x05F0}, }, - {[0]= - {"from Market", 0x0507}, + {name="Bombchu Bowling Alley", + [0]={"from Market", 0x0507}, }, - {[0]= - {"from Lon Lon Ranch (Talon's House)", 0x004F}, + {name="Lon Lon Ranch House & Tower", + [0]={"from Lon Lon Ranch (Talon's House)", 0x004F}, {"from Lon Lon Ranch (Cow in House)", 0x05D0}, {"from Cucco minigame", 0x05E4}, }, - {[0]= - {"from Market Entrance", 0x007E}, + {name="Guard House", + [0]={"from Market Entrance", 0x007E}, }, - {[0]= - {"from Kakariko Village", 0x0072}, + {name="Granny's Potion Shop", + [0]={"from Kakariko Village", 0x0072}, }, - {[0]= - {"from Tower Collapse Interior Exit", 0x0517}, + {name="Ganon's Tower Collapse & Battle Arena", + [0]={"from Tower Collapse Interior Exit", 0x0517}, }, - {[0]= - {"from Kakariko Village", 0x0550}, + {name="House of Skulltula", + [0]={"from Kakariko Village", 0x0550}, }, - {[0]= - {"from After Zelda Escape, 2nd+ Impa Escort", 0x00CD}, + {name="Hyrule Field", + [0]={"from After Zelda Escape, 2nd+ Impa Escort", 0x00CD}, {"from Kakariko Village", 0x017D}, {"from Zora River, Land", 0x0181}, {"from Lost Woods", 0x0185}, @@ -526,8 +527,8 @@ return {[0]= -- [0]={"from After Zelda Escape, 2nd+ Impa Escort", 0x00DA}, }, - {[0]= - {"from Hyrule Field", 0x00DB}, + {name="Kakariko Village", + [0]={"from Hyrule Field", 0x00DB}, {"from Death Mountain Trail", 0x0191}, {"from Graveyard", 0x0195}, {"from Bazaar", 0x0201}, @@ -550,8 +551,8 @@ return {[0]= -- [0]={"from Hyrule Field", 0x00E3}, }, - {[0]= - {"from Kakariko Village", 0x00E4}, + {name="Graveyard", + [0]={"from Kakariko Village", 0x00E4}, {"from Shadow Temple", 0x0205}, {"from Gravekeeper's Hut", 0x0355}, {"from ?, Dampe's Grave", 0x0359}, @@ -564,16 +565,16 @@ return {[0]= -- [0]={"from Kakariko Village", 0x00E9}, }, - {[0]= - {"Land Entrance, from Hyrule Field", 0x00EA}, + {name="Zora's River", + [0]={"Land Entrance, from Hyrule Field", 0x00EA}, {"Dropped from top of Waterfall", 0x0199}, {"from Zora's Domain", 0x019D}, {"Water Entrance, from Hyrule Field", 0x01D9}, {"from Lost Woods", 0x01DD}, }, - {[0]= - {"from After Forest Medallion cutscene", 0x00EE}, + {name="Kokiri Forest", + [0]={"from After Forest Medallion cutscene", 0x00EE}, {"from Deku Tree", 0x0209}, {"from Lost Woods, Hyrule Bridge", 0x020D}, {"from Link's House", 0x0211}, @@ -594,8 +595,8 @@ return {[0]= -- [0]={"from After Forest Medallion cutscene", 0x00F8}, }, - {[0]= - {"from Lost Woods", 0x00FC}, + {name="Sacred Forest Meadow", + [0]={"from Lost Woods", 0x00FC}, {"from Forest Temple", 0x0215}, {"Minuet Warp", 0x0600}, {"from Forest Temple Boss, Blue Warp", 0x0608}, @@ -610,8 +611,8 @@ return {[0]= -- [2]={"Minuet Warp", 0x0603}, }, - {[0]= - {"from Hyrule Field", 0x0102}, + {name="Lake Hylia", + [0]={"from Hyrule Field", 0x0102}, {"from Gerudo Valley", 0x0219}, {"from Water Temple", 0x021D}, {"Hyrule Field Entrance", 0x03C8}, @@ -628,8 +629,8 @@ return {[0]= -- [2]={"from Water Temple", 0x0220}, }, - {[0]= - {"from Zora River", 0x0108}, + {name="Zora's Domain", + [0]={"from Zora River", 0x0108}, {"from Zora's Fountain", 0x01A1}, {"from Zora Shop", 0x03C4}, {"Eyeball Frog Timeout", 0x0153}, @@ -637,8 +638,8 @@ return {[0]= -- [0]={"from Zora River", 0x010C}, }, - {[0]= - {"Sapphire cutscene Entrance", 0x010E}, + {name="Zora's Fountain", + [0]={"Sapphire cutscene Entrance", 0x010E}, {"from Inside Jabu Jabu's Belly", 0x0221}, {"from Zora's Domain", 0x0225}, {"from Ice Cavern", 0x03D4}, @@ -651,8 +652,8 @@ return {[0]= -- [0]={"Sapphire cutscene Entrance", 0x0116}, }, - {[0]= - {"from Hyrule Field", 0x0117}, + {name="Gerudo Valley", + [0]={"from Hyrule Field", 0x0117}, {"Thrown out of Gerudo Fortress, from Caught without usable hookshot", 0x01A5}, {"Triggers Fortress Loading Zone", 0x0229}, {"from Gerudo Fortress", 0x022D}, @@ -662,8 +663,8 @@ return {[0]= -- [0]={"from Hyrule Field", 0x011D}, }, - {[0]= - {"from Kokiri Forest", 0x011E}, + {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}, @@ -675,8 +676,8 @@ return {[0]= {"from Kokiri Forest, Hyrule Exit", 0x05E0}, }, - {[0]= - {"from Haunted Wasteland", 0x0123}, + {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}, @@ -689,8 +690,8 @@ return {[0]= -- [0]={"from Haunted Wasteland", 0x0128}, }, - {[0]= - {"from Gerudo Valley", 0x0129}, + {name="Gerudo's Fortress", + [0]={"from Gerudo Valley", 0x0129}, {"from Thieves' Hideout", 0x0231}, {"from Thieves' Hideout", 0x0235}, {"from Thieves' Hideout", 0x0239}, @@ -713,14 +714,14 @@ return {[0]= {"from Gerudo Valley", 0x012E}, }, - {[0]= - {"from Gerudo Fortress", 0x0130}, + {name="Haunted Wasteland", + [0]={"from Gerudo Fortress", 0x0130}, {"from Desert Colossus", 0x0365}, {"Crashes (Bad Map)", 0x0369}, }, - {[0]= - {"from Market Entrance", 0x0138}, + {name="Hyrule Castle", + [0]={"from Market Entrance", 0x0138}, {"from Castle Courtyard", 0x023D}, {"from Great Fairy's Fountain (Spells)", 0x0340}, {"from Castle Courtyard, Caught by guard", 0x04FA}, @@ -730,8 +731,8 @@ return {[0]= -- [3]={"from Castle Courtyard, Caught by guard", 0x04FE}, }, - {[0]= - {"from Kakariko Village", 0x013D}, + {name="Death Mountain Trail", + [0]={"from Kakariko Village", 0x013D}, {"from Goron City", 0x01B9}, {"from Death Mountain Crater", 0x01BD}, {"from Dodongo's Cavern", 0x0242}, @@ -742,8 +743,8 @@ return {[0]= -- [0]={"from Kakariko Village", 0x0144}, }, - {[0]= - {"from Death Mountain Trail", 0x0147}, + {name="Death Mountain Crater", + [0]={"from Death Mountain Trail", 0x0147}, {"from Goron City", 0x0246}, {"from Fire Temple", 0x024A}, {"from Great Fairy's Fountain (Upgrades)", 0x0482}, @@ -751,16 +752,16 @@ return {[0]= {"from Fire Temple Boss, Blue Warp", 0x0564}, }, - {[0]= - {"from Death Mountain Trail", 0x014D}, + {name="Goron City", + [0]={"from Death Mountain Trail", 0x014D}, {"from Death Mountain Crater", 0x01C1}, {"from Goron Shop", 0x03FC}, {"from Lost Woods", 0x04E2}, -- [0]={"from Death Mountain Trail", 0x0152}, }, - {[0]= - {"from Hyrule Field", 0x0157}, + {name="Lon Lon Ranch", + [0]={"from Hyrule Field", 0x0157}, {"Epona's Song cutscene", 0x02AE}, {"Near South Gate", 0x02E2}, {"Near West Gate", 0x02E6}, @@ -776,8 +777,8 @@ return {[0]= -- [0]={"from Hyrule Field", 0x015D}, }, - {[0]= - {"from Market Entrance", 0x013A}, + {name="Ganon's Castle Exterior", + [0]={"from Market Entrance", 0x013A}, {"from Inside Ganon's Castle", 0x023F}, {"from Great Fairy's Fountain (Upgrades)", 0x0342}, {"Crashes (Bad Map)", 0x0480}, @@ -785,23 +786,23 @@ return {[0]= -- [0]={"from Market Entrance", 0x013C}, }, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, } diff --git a/Lua/data/entrance names.lua b/Lua/data/entrance names.lua index bf112a8..603e3d4 100644 --- a/Lua/data/entrance names.lua +++ b/Lua/data/entrance names.lua @@ -1,8 +1,8 @@ --- same order as scene names.lua -return { - [0]= - {[0]= - "from road", +-- entrance order, not scene order. i know it's confusing. +local bad="[crash]" +return {[0]= + {name="Southern Swamp (Clean)", + [0]="from road", "from Tourists'", "from Woodfall", "from Deku Palace", @@ -16,20 +16,20 @@ return { -- "from road (no cutscene)", }, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {[0]= - "Great Bay Gossip Stones", + {name="Grottos", + [0]="Great Bay Gossip Stones", "Woodfall Gossip Stones", "Stone Tower Gossip Stones", "Snowhead Gossip Stones", @@ -48,8 +48,8 @@ return { "Lens of Truth", }, - {[0]= - "from start file", + {name="Intro Map", + [0]="from start file", "Skull Kid cutscene", "(crash?)", "(crash?)", @@ -61,51 +61,51 @@ return { "(crash?)", }, - {}, + {name=bad}, - {[0]= - "main door", + {name="Magic Hags' Potion Shop", + [0]="main door", }, - {[0]= - "from Moon", + {name="Majora", + [0]="from Moon", -- "from Moon (duplicate)", }, - {[0]= - "Iron Knuckle grave", + {name="Beneath the Graveyard", + [0]="Iron Knuckle grave", "Flat's grave", }, - {[0]= - "main door", + {name="Curiosity Shop", + [0]="main door", "Kafei's room", "peeking into shop", "after peeking", }, - {}, + {name=bad}, - {}, + {name=bad}, - {[0]= - "Barn", + {name="Mama's House / Barn", + [0]="Barn", "Mama's House", }, - {[0]= - "main door", + {name="Honey & Darling's Shop", + [0]="main door", -- "main door (duplicate)", }, - {[0]= - "main door", + {name="Mayor's Residence", + [0]="main door", "Mayor's room", -- "(crash)", }, - {[0]= - "from road", + {name="Ikana Canyon", + [0]="from road", "from Spirit House", "from Music Box House", "from Stone Tower", @@ -123,8 +123,8 @@ return { "from road?", }, - {[0]= - "main door", + {name="Pirates' Fortress (Outside)", + [0]="main door", "from Hookshot room", "from above Hookshot room", "from 100 Rupee room", @@ -141,35 +141,35 @@ return { -- "(crash)", }, - {[0]= - "main door", + {name="Milk Bar", + [0]="main door", -- "main door (duplicate)", }, - {[0]= - "main door", + {name="Stone Tower Temple", + [0]="main door", -- "main door (no cutscene)", }, - {[0]= - "main door", + {name="Treasure Chest Shop", + [0]="main door", "after beating minigame", }, - {[0]= - "main door", + {name="Inverted Stone Tower Temple", + [0]="main door", "to boss room", -- "(crash)", }, - {[0]= - "main door", + {name="Atop Clock Tower", + [0]="main door", "from Ocarina cutscene", "(crash?)", }, - {[0]= - "main door", + {name="(Deku Intro Area before Clock Tower)", + [0]="main door", "from Clock Tower (unused)", "after being turned into Deku", "after voiding out?", @@ -177,20 +177,20 @@ return { -- "main door (no cutscene) (unused)", }, - {[0]= - "main door", + {name="Woodfall Temple", + [0]="main door", "Deku Princess after Odolwa", "Deku Princess room", -- "main door with wrong room loaded (unused?)", }, - {[0]= - "from Termina Field", + {name="Snowhead Passage", + [0]="from Termina Field", "from Mountain Village", }, - {[0]= - "from Beneath the Well", + {name="Ikana Castle", + [0]="from Beneath the Well", "from Ikana Canyon", "from Castle Main Door", "inside Castle Main Door", @@ -200,30 +200,30 @@ return { -- "from Beneath the Well (duplicate)", }, - {[0]= - "from Clock Town", + {name="Deku Flower Minigame", + [0]="from Clock Town", "after beating minigame", -- "(crash)", -- "from Clock Town (duplicate)", }, - {[0]= - "main door", + {name="Woodfall Temple - Odolwa", + [0]="main door", -- "main door (duplicate)", }, - {[0]= - "main door", + {name="Town Shooting Gallery", + [0]="main door", -- "main door (duplicate)", }, - {[0]= - "main door", + {name="Snowhead Temple", + [0]="main door", -- "main door (duplicate)", }, - {[0]= - "from Termina Field", + {name="Milk Road", + [0]="from Termina Field", "from Romani's Ranch", "from Gorman track behind fence", "from Gorman track", @@ -233,8 +233,8 @@ return { -- "from Termina Field (duplicate)", }, - {[0]= - "Hookshot room", + {name="Pirates' Fortress (Inside)", + [0]="Hookshot room", "Hookshot room from above", "100 Rupee room", "100 Rupee room (egg)", @@ -252,18 +252,18 @@ return { "(crash)", }, - {[0]= - "main door", + {name="Swamp Shooting Gallery", + [0]="main door", -- "main door (duplicate)", }, - {[0]= - "from Great Bay", + {name="Pinnacle Rock", + [0]="from Great Bay", -- "from Great Bay (duplicate)", }, - {[0]= - "from Clock Town", + {name="Fairy's Fountain", + [0]="from Clock Town", "from Woodfall", "from Snowhead", "from Great Bay", @@ -275,30 +275,30 @@ return { "getting Great Fairy's sword", }, - {[0]= - "main door", + {name="Swamp Spider House", + [0]="main door", -- "main door (duplicate)", }, - {[0]= - "main door", + {name="Oceanside Spider House", + [0]="main door", -- "main door (duplicate)", }, - {[0]= - "from Clock Town", + {name="Astral Observatory (Bomber's Hideout)", + [0]="from Clock Town", "from Termina Field", "after telescope", -- "from Clock Town (duplicate?)", }, - {[0]= - "from Moon", + {name="Woodfall Trial", + [0]="from Moon", -- "from Moon?", }, - {[0]= - "from Swamp", + {name="Deku Palace", + [0]="from Swamp", "being kicked out", "from Deku king's chamber", "from Monkey's cell", @@ -312,15 +312,15 @@ return { -- "from Swamp (no cutscene)", }, - {[0]= - "main door", + {name="Mountain Smithy", + [0]="main door", -- "main door (duplicate)", -- "(crash)", -- "main door (duplicate)", }, - {[0]= - "from West Clock Town", + {name="Termina Field", + [0]="from West Clock Town", "from road to Swamp", "from Great Bay", "from Snowhead passage", @@ -338,34 +338,34 @@ return { -- "from West Clock Town (no cutscene)", }, - {[0]= - "main door", + {name="Post Office", + [0]="main door", -- "main door (duplicate)", }, - {[0]= - "main door", + {name="Marine Research Lab", + [0]="main door", -- "main door (duplicate)", -- "(crash)", -- "main door (duplicate)", }, - {[0]= - "from grave", + {name="Beneath the Graveyard (Dampe)", + [0]="from grave", "from Graveyard door", }, - {}, + {name=bad}, - {[0]= - "main door", + {name="Goron Shrine", + [0]="main door", "from shop", "after Lullaby", -- "main door (no cutscene)", }, - {[0]= - "from center", + {name="Zora Hall", + [0]="from center", "from turtle", "from shop", "from Mikau's room", @@ -377,15 +377,15 @@ return { -- "main door (no cutscene)", }, - {[0]= - "main door", + {name="Trading Post", + [0]="main door", -- "main door (duplicate)", -- "(crash)", -- "main door (duplicate)", }, - {[0]= - "from milk road", + {name="Romani Ranch", + [0]="from milk road", "after minigame", "from Barn", "from mama's house", @@ -402,16 +402,16 @@ return { -- "in front of Barn (e)", }, - {[0]= - "main door", + {name="Stone Tower Temple - Twinmold", + [0]="main door", -- "main door (duplicate)", -- "(crash)", -- "(crash)", -- "(crash)", }, - {[0]= - "from Termina Field", + {name="Great Bay Coast (Lab Area)", + [0]="from Termina Field", "from Zora area", "from swimming too far", "from pinnacle rock", @@ -427,8 +427,8 @@ return { "after beating minigame", }, - {[0]= - "from lab area", + {name="Great Bay Coast (Zora Area)", + [0]="from lab area", "from Zora Hall", "from Zora Hall (turtle)", "from swimming too far", @@ -440,17 +440,17 @@ return { "really high up?", }, - {[0]= - "main door", + {name="Lottery Shop", + [0]="main door", -- "main door (duplicate)", -- "(crash)", -- "main door (duplicate)", }, - {}, + {name=bad}, - {[0]= - "from Great Bay", + {name="Pirates' Fortress (Outside)", + [0]="from Great Bay", "from outside Pirates'", "from underwater passage", "from one-way underwater", @@ -460,55 +460,55 @@ return { -- "from Great Bay (no cutscene)", }, - {[0]= - "main door", + {name="Fisherman's Hut", + [0]="main door", -- "main door (duplicate)", -- "(crash)", -- "main door (duplicate)", }, - {[0]= - "main door", + {name="Goron Shop", + [0]="main door", -- "main door (duplicate)", -- "(crash)", -- "main door (duplicate)", }, - {[0]= - "from main door", + {name="Deku King's Chamber", + [0]="from main door", "to Monkey", "Princess thanks Monkey cutscene", "in front of King", }, - {[0]= - "from Moon", + {name="Snowhead Trial", + [0]="from Moon", -- "from Moon?", -- "(crash)", -- "from Moon??", }, - {[0]= - "from Termina Field", + {name="(Road to Swamp)", + [0]="from Termina Field", "from Swamp", "from Shooting Gallery", -- "from Termina Field (duplicate)", }, - {[0]= - "from Ranch", + {name="Doggy Racetrack", + [0]="from Ranch", "after beating minigame", -- "(crash)", -- "from Ranch (duplicate)", }, - {[0]= - "from Ranch", + {name="Cucco Shack", + [0]="from Ranch", "getting Bunny Hood", }, - {[0]= - "from road", + {name="Ikana Graveyard", + [0]="from road", "from grave 1", "from grave 2", "from grave 3", @@ -516,13 +516,13 @@ return { "getting Captain's Hat", }, - {[0]= - "main door", + {name="Snowhead Temple - Goht", + [0]="main door", -- "main door (duplicate)", }, - {[0]= - "from road", + {name="Southern Swamp (Poisoned)", + [0]="from road", "from Tourists'", "from Woodfall", "from Deku Palace", @@ -536,8 +536,8 @@ return { -- "from road (no cutscene)", }, - {[0]= - "from Swamp", + {name="Woodfall Temple (Outside)", + [0]="from Swamp", "from Temple", "from Great Fairy's fountain", "from Deku princess", @@ -545,13 +545,13 @@ return { -- "from Swamp (no cutscene)", }, - {[0]= - "from Moon", + {name="Great Bay Trial", + [0]="from Moon", -- "from Moon?", }, - {[0]= - "from road", + {name="Goron Village (Thawed)", + [0]="from road", "from above (unused?)", "from shrine", "from lens of truth cave", @@ -559,26 +559,26 @@ return { -- "from road (duplicate)", }, - {[0]= - "from turtle", + {name="Great Bay Temple", + [0]="from turtle", "from turtle (first time)", }, - {[0]= - "from Great Bay", + {name="Waterfall Rapids", + [0]="from Great Bay", "minigame", "minigame 2?", "after beating minigame?", -- "from Great Bay (no cutscene)", }, - {[0]= - "from Ikana canyon", + {name="Beneath the Well", + [0]="from Ikana canyon", "from Ikana castle", }, - {[0]= - "Tijo's room", + {name="(Zora Band Member Rooms)", + [0]="Tijo's room", "Japas' room", "from Mikau's room", "from Evan's room", @@ -588,8 +588,8 @@ return { -- "Tijo's room (duplicate)", }, - {[0]= - "from road", + {name="Goron Village (Frozen)", + [0]="from road", "from flower?", "from Shrine", "from Lens of Truth cave", @@ -597,22 +597,22 @@ return { -- "from road (duplicate)", }, - {[0]= - "main door", + {name="Goron Graveyard", + [0]="main door", "getting Goron mask", -- "(crash)", -- "main door (duplicate)", }, - {[0]= - "main door", + {name="Sakon's Hideout", + [0]="main door", -- "main door (duplicate)", -- "(crash)", -- "main door (duplicate)", }, - {[0]= - "after beating Snowhead", + {name="Mountain Village (Frozen)", + [0]="after beating Snowhead", "from Smithy's", "from road to Village", "from Graveyard", @@ -624,69 +624,69 @@ return { -- "after being Snowhead (duplicate)", }, - {[0]= - "from Ikana canyon", + {name="Ghost Hut", + [0]="from Ikana canyon", "from minigame", "after beating minigame", -- "from Ikana canyon (duplicate)", }, - {[0]= - "main door", + {name="Deku Shrine", + [0]="main door", -- "main door (duplicate)", }, - {[0]= - "from Termina Field", + {name="(Road to Ikana)", + [0]="from Termina Field", "from Ikana canyon", "from Ikana Graveyard", -- "from Termina Field (duplicate)", }, - {[0]= - "main door", + {name="Swordsman's School", + [0]="main door", -- "main door (duplicate)", -- "(crash)", -- "main door (duplicate)", }, - {[0]= - "main door", + {name="Music Box House", + [0]="main door", -- "main door (duplicate)", -- "(crash)", -- "main door (duplicate)", }, - {[0]= - "main door", + {name="Ikana Castle Boss Room", + [0]="main door", -- "main door (duplicate)", -- "(crash)", -- "main door (duplicate)", }, - {[0]= - "main door", + {name="Tourist Information", + [0]="main door", "from boat ride", "in front of desk (unused?)", -- "main door (duplicate)", }, - {[0]= - "from Ikana canyon", + {name="Stone Tower", + [0]="from Ikana canyon", "from inverting", "from Temple", "from Owl Statue", }, - {[0]= - "from inverting", + {name="Inverted Stone Tower", + [0]="from inverting", "from stone Tower", -- "(crash)", -- "from inverting (no cutscene)", }, - {[0]= - "after beating Snowhead", + {name="Mountain Village (Thawed)", + [0]="after beating Snowhead", "from Smithy's", "from road to Village", "from Graveyard", @@ -698,46 +698,46 @@ return { -- "after being Snowhead (duplicate)", }, - {[0]= - "from Smithy area", + {name="(Road to Snowhead Temple)", + [0]="from Smithy area", "from Snowhead", }, - {[0]= - "from road", + {name="Snowhead", + [0]="from road", "from Snowhead Temple", "from Great Fairy's fountain", "from Owl Statue", }, - {[0]= - "from Smithy area", + {name="(Road to Goron Village) (Frozen)", + [0]="from Smithy area", "from Goron Village", "from Goron Racetrack", -- "from Smithy area (duplicate)", }, - {[0]= - "from Smithy area", + {name="(Road to Goron Village) (Thawed)", + [0]="from Smithy area", "from Goron Village", "from Goron Racetrack", -- "from Smithy area (duplicate)", }, - {[0]= - "main door", + {name="Great Bay Temple - Gyorg", + [0]="main door", "immediately falling", }, - {[0]= - "main door", + {name="Secret Shrine", + [0]="main door", -- "main door (duplicate)", -- "(crash)", -- "main door (duplicate)", }, - {[0]= - "main door", + {name="Stone Pot Inn", + [0]="main door", "upstairs door", "Grandma", "after talking", @@ -745,13 +745,13 @@ return { "after listening", }, - {[0]= - "default", + {name="(Cutscene before Great Bay Temple)", + [0]="default", -- "no cutscene", }, - {[0]= - "twisty hallway", + {name="Clock Tower (Inside)", + [0]="twisty hallway", "from Clock Town", "getting Deku mask", "after cutscene?", @@ -761,44 +761,44 @@ return { -- "twisty hallway (no cutscene)", }, - {[0]= - "from Swamp", + {name="Woods of Mystery", + [0]="from Swamp", "from grotto?", }, - {[0]= - "kicked off horse", + {name="Lost Woods (Gain Control)", + [0]="kicked off horse", "first SoT cutscene", -- "(crash)", -- "gain control (no cutscene)", }, - {[0]= - "from Moon", + {name="Ikana Trial", + [0]="from Moon", -- "from Moon (duplicate)", -- "(crash)", -- "main door (duplicate)", }, - {[0]= - "Moon", + {name="Moon", + [0]="Moon", -- "Moon (duplicate)", }, - {[0]= - "main door", + {name="Bomb Shop", + [0]="main door", -- "main door (duplicate)", -- "(crash)", -- "main door (duplicate)", }, - {[0]= - "Giants", + {name="Giants' Chamber", + [0]="Giants", -- "no cutscene", }, - {[0]= - "from milk road", + {name="Gorman Track", + [0]="from milk road", "?", "after beating minigame", "from milk road (behind fence)", @@ -807,15 +807,15 @@ return { "beginning minigame", }, - {[0]= - "from road", + {name="Goron Racetrack", + [0]="from road", "beginning minigame", "after beating minigame", -- "from road (duplicate)", }, - {[0]= - "from Termina Field", + {name="East Clock Town", + [0]="from Termina Field", "from South Clock Town (South)", "from Bomber's hideout", "from South Clock Town (North)", @@ -829,8 +829,8 @@ return { "from milk bar", }, - {[0]= - "from Termina Field", + {name="West Clock Town", + [0]="from Termina Field", "from South Clock Town (South)", "from South Clock Town (North)", "from Swordsman's School", @@ -842,8 +842,8 @@ return { -- "from Termina Field (duplicate)", }, - {[0]= - "from Termina Field", + {name="North Clock Town", + [0]="from Termina Field", "from East Clock Town", "from South Clock Town", "from Great Fairy's fountain", @@ -853,8 +853,8 @@ return { "after sakon attacks", }, - {[0]= - "from Clock Tower", + {name="South Clock Town", + [0]="from Clock Tower", "from Termina Field", "from East Clock Town (North)", "from West Clock Town (North)", @@ -868,38 +868,38 @@ return { -- "from Clock Tower (no cutscene)", }, - {[0]= - "from South Clock Town", + {name="Laundry Pool", + [0]="from South Clock Town", "from Kafei's room", }, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, - {}, + {name=bad}, } diff --git a/Lua/data/scene names oot.lua b/Lua/data/scene names oot.lua deleted file mode 100644 index bdf4001..0000000 --- a/Lua/data/scene names oot.lua +++ /dev/null @@ -1,113 +0,0 @@ --- scene order -- there is no entrance order in OoT...? -return { - [0]="Inside the Deku Tree", - "Dodongo's Cavern", - "Inside Jabu-Jabu's Belly", - "Forest Temple", - "Fire Temple", - "Water Temple", - "Spirit Temple", - "Shadow Temple", - "Bottom of the Well", - "Ice Cavern", - "Ganon's Tower", - "Gerudo Training Ground", - "Thieves' Hideout", - "Inside Ganon's Castle", - "Ganon's Tower (Collapsing)", - "Inside Ganon's Castle (Collapsing)", -- en route to Ganon fight - "Treasure Chest Shop", - "Gohma's Lair", - "King Dodongo's Lair", - "Barinade's Lair", - "Phantom Ganon's Lair", - "Volvagia's Lair", - "Morpha's Lair", - "Twinrova's Lair", - "Bongo Bongo's Lair", - "Ganondorf's Lair", - "Tower Collapse Escape", - "Market Entrance (Day)", - "Market Entrance (Night)", - "Market Entrance (Ruins)", - "Back Alley (Day)", - "Back Alley (Night)", - "Market (Day)", - "Market (Night)", - "Market (Ruins)", - "Temple of Time Exterior (Day)", - "Temple of Time Exterior (Night)", - "Temple of Time Exterior (Ruins)", - "Know-It-All Brothers' House", - "Twins' House", - "Mido's House", - "Saria's House", - "Carpenter Boss's House", - "Back Alley House (Man in Green)", - "Bazaar", - "Kokiri Shop", - "Goron Shop", - "Zora Shop", - "Kakariko Potion Shop", - "Market Potion Shop", - "Bombchu Shop", - "Happy Mask Shop", - "Link's House", - "Back Alley House (Dog Lady)", - "Stable", - "Impa's House", - "Lakeside Laboratory", - "Carpenters' Tent", - "Gravekeeper's Hut", - "Great Fairy's Fountain (Upgrades)", - "Fairy's Fountain", - "Great Fairy's Fountain (Spells)", - "Grottos", - "Grave: Redead", - "Grave: Fairy's Fountain", - "Royal Family's Tomb", - "Shooting Gallery", - "Temple of Time", - "Chamber of the Sages", - "Castle Hedge Maze (Day)", - "Castle Hedge Maze (Night)", - "Cutscene Map", - "Windmill & Dampe's Grave", - "Fishing Pond", - "Castle Courtyard", - "Bombchu Bowling Alley", - "Lon Lon Ranch House & Tower", - "Guard House", - "Granny's Potion Shop", - "Ganon's Tower Collapse & Battle Arena", - "House of Skulltula", - "Hyrule Field", - "Kakariko Village", - "Graveyard", - "Zora's River", - "Kokiri Forest", - "Sacred Forest Meadow", - "Lake Hylia", - "Zora's Domain", - "Zora's Fountain", - "Gerudo Valley", - "Lost Woods", - "Desert Colossus", - "Gerudo's Fortress", - "Haunted Wasteland", - "Hyrule Castle", - "Death Mountain Trail", - "Death Mountain Crater", - "Goron City", - "Lon Lon Ranch", - "Ganon's Castle Exterior", --- "Room 118 - Jungle Gym", --- "Room 116 - Ganondorf Test Room", --- "Room 124 - Depth Test", --- "Room 120 - Stalfos Mini-Boss Room", --- "Room 121 - Stalfos Boss Room", --- "Room 122 - Sutaru", --- "Room 125 - Castle Hedge Maze (Early)", --- "Room 117 - Sasa Test", --- "Room 119 - Treasure Chest Room", -} diff --git a/Lua/data/scene names.lua b/Lua/data/scene names.lua deleted file mode 100644 index 04a41f5..0000000 --- a/Lua/data/scene names.lua +++ /dev/null @@ -1,132 +0,0 @@ --- entrance order, not scene order. i know it's confusing. -local bad="[crash]" -return { - [0]="Southern Swamp (Clean)", - bad, - bad, - bad, - bad, - bad, - bad, - "Grottos", - "Intro Map", - bad, - "Magic Hags' Potion Shop", - "Majora", - "Beneath the Graveyard", - "Curiosity Shop", - bad, - bad, - "Mama's House / Barn", - "Honey & Darling's Shop", - "Mayor's Residence", - "Ikana Canyon", - "Pirates' Fortress (Outside)", - "Milk Bar", - "Stone Tower Temple", - "Treasure Chest Shop", - "Inverted Stone Tower Temple", - "Atop Clock Tower", - "(Deku Intro Area before Clock Tower)", - "Woodfall Temple", - "Snowhead Passage", - "Ikana Castle", - "Deku Flower Minigame", - "Woodfall Temple - Odolwa", - "Town Shooting Gallery", - "Snowhead Temple", - "Milk Road", - "Pirates' Fortress (Inside)", - "Swamp Shooting Gallery", - "Pinnacle Rock", - "Fairy's Fountain", - "Swamp Spider House", - "Oceanside Spider House", - "Astral Observatory (Bomber's Hideout)", - "Woodfall Trial", - "Deku Palace", - "Mountain Smithy", - "Termina Field", - "Post Office", - "Marine Research Lab", - "Beneath the Graveyard (Dampe)", - bad, - "Goron Shrine", - "Zora Hall", - "Trading Post", - "Romani Ranch", - "Stone Tower Temple - Twinmold", - "Great Bay Coast (Lab Area)", - "Great Bay Coast (Zora Area)", - "Lottery Shop", - bad, - "Pirates' Fortress (Outside)", - "Fisherman's Hut", - "Goron Shop", - "Deku King's Chamber", - "Snowhead Trial", - "(Road to Swamp)", - "Doggy Racetrack", - "Cucco Shack", - "Ikana Graveyard", - "Snowhead Temple - Goht", - "Southern Swamp (Poisoned)", - "Woodfall Temple (Outside)", - "Great Bay Trial", - "Goron Village (Thawed)", - "Great Bay Temple", - "Waterfall Rapids", - "Beneath the Well", - "(Zora Band Member Rooms)", - "Goron Village (Frozen)", - "Goron Graveyard", - "Sakon's Hideout", - "Mountain Village (Frozen)", - "Ghost Hut", - "Deku Shrine", - "(Road to Ikana)", - "Swordsman's School", - "Music Box House", - "Ikana Castle Boss Room", - "Tourist Information", - "Stone Tower", - "Inverted Stone Tower", - "Mountain Village (Thawed)", - "(Road to Snowhead Temple)", - "Snowhead", - "(Road to Goron Village) (Frozen)", - "(Road to Goron Village) (Thawed)", - "Great Bay Temple - Gyorg", - "Secret Shrine", - "Stone Pot Inn", - "(Cutscene before Great Bay Temple)", - "Clock Tower (Inside)", - "Woods of Mystery", - "Lost Woods (Gain Control)", - "Ikana Trial", - "Moon", - "Bomb Shop", - "Giants' Chamber", - "Gorman Track", - "Goron Racetrack", - "East Clock Town", - "West Clock Town", - "North Clock Town", - "South Clock Town", - "Laundry Pool", - bad, - bad, - bad, - bad, - bad, - bad, - bad, - bad, - bad, - bad, - bad, - bad, - bad, - bad, - bad, -} diff --git a/Lua/menus/warp oot.lua b/Lua/menus/warp oot.lua index e0df6ba..e7b2793 100644 --- a/Lua/menus/warp oot.lua +++ b/Lua/menus/warp oot.lua @@ -1,7 +1,6 @@ local ins = table.insert -local scene_names = require "data.scene names oot" local entrance_names = require "data.entrance names oot" -local maxscene = #scene_names +local maxscene = #entrance_names local per_page = 16 local pagecount = math.ceil((maxscene + 1)/per_page) @@ -19,7 +18,7 @@ for si=0, maxscene do local entrance_items = {} local entrances = entrance_names[i] - local scene_name = scene_names[i] + local scene_name = entrances.name ins(entrance_items, Text( ("Warp to %s"):format(scene_name) )) diff --git a/Lua/menus/warp.lua b/Lua/menus/warp.lua index 3bb377f..dadfe71 100644 --- a/Lua/menus/warp.lua +++ b/Lua/menus/warp.lua @@ -1,5 +1,4 @@ local ins = table.insert -local scene_names = require "data.scene names" local entrance_names = require "data.entrance names" local scene_id_to_entrance_id = require "data.scene to entrance" @@ -25,7 +24,7 @@ for si=0x00,0x7F do local scene_name = '[crash]' if i ~= nil then entrances = entrance_names[i] - scene_name = scene_names[i] + scene_name = entrances.name end ins(entrance_items, Text( ("Warp to %s"):format(scene_name) )) diff --git a/Lua/monitor exits.lua b/Lua/monitor exits.lua index 0e844dd..ce27830 100644 --- a/Lua/monitor exits.lua +++ b/Lua/monitor exits.lua @@ -2,7 +2,6 @@ require "lib.setup" require "boilerplate" require "addrs" -local scene_names = require "data.scene names" local entrance_names = require "data.entrance names" local open = io.open @@ -33,7 +32,7 @@ local function calc_dump(a, writer) writer("err") return end - writer(scene_names[scene_id]) + writer(t.name) if t[entrance] then writer(t[entrance]) else