From a12d1683a482a2cd743bd646ff4885b475ecdc4b Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Fri, 20 Mar 2015 17:07:47 -0700 Subject: [PATCH] more work on actor names --- Lua/actor names oot.lua | 84 ++++++++++++++++++++--------------------- Lua/actor names.lua | 20 +++++----- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/Lua/actor names oot.lua b/Lua/actor names oot.lua index 3a1d8e8..fc7f99e 100644 --- a/Lua/actor names oot.lua +++ b/Lua/actor names oot.lua @@ -1,13 +1,13 @@ local unset="unset" return { - [0x000]="Link", + [0x000]="Link", -- also camera fixed positions [0x001]=unset, [0x002]="Stalfos", [0x003]=unset, [0x004]="Shop Data", [0x005]=unset, [0x006]=unset, - [0x007]="???", + [0x007]="? Enemy Death Effect?", [0x008]="Flame", [0x009]="Wooden Door", [0x00A]="Treasure Chest", @@ -21,8 +21,8 @@ return { [0x012]="Dodongo", [0x013]="Keese", [0x014]="Epona", - [0x015]="Collectable / Dungeon Items", - [0x016]="Small Orange Flame (Fades Away)", + [0x015]="Collectable", -- "Dungeon Items" + [0x016]="? Slingshot Projectile?", -- "Small Orange Flame (Fades Away)" [0x017]=unset, [0x018]="Navi / Fairy", [0x019]="Cucco", @@ -40,10 +40,10 @@ return { [0x025]="Lizalfos / Dinalfos", [0x026]="Flagpole", [0x027]="King Dodongo", - [0x028]="Gohma", - [0x029]="Child Zelda (Cutscene 05 & 06)", - [0x02A]="???", - [0x02B]="Gohma Larva", + [0x028]="Gohma / Larva", + [0x029]="Child Zelda (Cutscene)", + [0x02A]="? Ganondorf Cutscene", + [0x02B]="? Gohma Larva", [0x02C]="???", [0x02D]="Shabom", [0x02E]="Dungeon Door", @@ -77,25 +77,25 @@ return { [0x04A]="Drawbridge", [0x04B]="Moblin", [0x04C]="Bomb Flower", - [0x04D]="Adult Zelda (Cutscenes)", + [0x04D]="Adult Zelda (Cutscene)", [0x04E]="???", [0x04F]="Kokiri Girl (Early)", - [0x050]="Floating Square Platform (Deku Tree)", + [0x050]="Floating Platform", [0x051]="Spiked Log / Dropdown Ladder", [0x052]="Phantom Ganon", [0x053]=unset, [0x054]="Armos", [0x055]="Deku Baba", - [0x056]="???", - [0x057]="???", + [0x056]="? Deku Nut Projectile", + [0x057]="? Sword Spin Charge", [0x058]="Elevator Platform (Dodongo's Cavern)", [0x059]="Bombable Wall", [0x05A]="Jabu-Jabu", [0x05B]="Zelda's Horse", [0x05C]="Bombable Stairs", - [0x05D]="Blue Warp / Rupee-Shaped Prism", + [0x05D]="Blue Warp", -- and its Prism [0x05E]="Torch", - [0x05F]="Heart Container / Heart Piece???", + [0x05F]="Heart Container", --- "Heart Piece???" [0x060]="Mad Scrub", [0x061]="Rotating Ring", [0x062]="Statue Eye Targets", @@ -119,7 +119,7 @@ return { [0x074]=unset, [0x075]=unset, [0x076]=unset, - [0x077]="Grass / Trees", + [0x077]="Foliage", [0x078]=unset, [0x079]=unset, [0x07A]=unset, @@ -139,11 +139,11 @@ return { [0x088]="Rotating Pre-Boss Room", [0x089]="Collapsing Checkerboard Ceiling", [0x08A]="Beamos", - [0x08B]="??? Swallowable by Jabu-Jabu?", - [0x08C]="???", + [0x08B]="? Spiritual Stone Objects", -- "Swallowable by Jabu-Jabu?" + [0x08C]="? Triforce?", [0x08D]="???", [0x08E]="Floormaster", - [0x08F]="Hylian Soldier (Castle Hedge Maze)", + [0x08F]="Hylian Soldier (Maze)", [0x090]="Redead / Gibdo", [0x091]="Poe Sisters", [0x092]="Golden Gauntlets Rock", @@ -179,7 +179,7 @@ return { [0x0B0]="Charon's Boat", [0x0B1]="Spinning Scythes", [0x0B2]=unset, - [0x0B3]="Hylian Soldier (Castle Gate Guard/Castle Courtyard/Kakariko Village)", + [0x0B3]="Hylian Soldier (Guard)", [0x0B4]="Falling Boulder Spawner", [0x0B5]="Flaming Debris", [0x0B6]="Stunnable Jelly Platform", @@ -201,8 +201,8 @@ return { [0x0C6]="Big Octorok", [0x0C7]="Wilted Deku Baba", [0x0C8]="Inside Jabu-Jabu's Belly Objects", - [0x0C9]="Saria (Cutscenes)", - [0x0CA]="Goron (Cutscenes)", + [0x0C9]="Saria (Cutscene)", + [0x0CA]="Goron (Cutscene)", [0x0CB]="Ingo", [0x0CC]="Kotake / Koume", [0x0CD]="Boulder Blocking Dodongo's Cavern", @@ -217,7 +217,7 @@ return { [0x0D6]="Ice Cavern Objects", [0x0D7]="Moat Water (Bottom of the Well)", [0x0D8]=unset, - [0x0D9]="Adult Malon (Stable & Lon Lon Ranch - Ingo Ousted)", + [0x0D9]="Adult Malon (Stable)", -- & Lon Lon Ranch - Ingo Ousted)", [0x0DA]="Bombchu Placed by Link", [0x0DB]="???", [0x0DC]="Twinrova", @@ -260,7 +260,7 @@ return { [0x101]="Particles Inhaled by Jabu-Jabu", [0x102]="Windmill Blades", [0x103]="Wooden Well Beams", - [0x104]="Well Water (Kakariko Village)", + [0x104]="Well Water", [0x105]="Torch (Poe Sisters)", [0x106]="Ganondorf's Lair Floor Tile", [0x107]="Lon Lon Milk Crate", @@ -276,14 +276,14 @@ return { [0x111]="Pot", [0x112]="Invisible Collectable", [0x113]="Iron Knuckle", - [0x114]="Iron Knuckle (Cutscenes)", + [0x114]="Iron Knuckle (Cutscene)", [0x115]="Skullkid", [0x116]="Skullkid's Needle", [0x117]="Silver Rupee", [0x118]="Kotake & Koume's Portal", [0x119]="Bongo Bongo's Shadow", - [0x11A]="Business Scrub (After Surrender)", - [0x11B]="Navi Message (Automatically Triggered)", + [0x11A]="Business Scrub (Friendly)", + [0x11B]="Navi Info (Auto)", [0x11C]="Eye Switch (Shoots Flames)", [0x11D]="Flying Pot", [0x11E]="???", @@ -293,21 +293,21 @@ return { [0x122]="Dampé's Ghost", [0x123]="Dampé's Relay Objects", [0x124]="Diving Game Zora", - [0x125]="Grass", + [0x125]="Grass", -- bushes? [0x126]="Bean Planting Spot", [0x127]="Bombable Boulder", [0x128]=unset, [0x129]=unset, - [0x12A]="Bronze Switch/Diamond Switch/Eye Switch", + [0x12A]="Switch (Misc.)", [0x12B]="Stone Elevator", [0x12C]="Deku Tree Elevator", [0x12D]="Hookshot Target Pillar", [0x12E]="Ocarina Spot", [0x12F]="???", [0x130]="Rolling Boulder", - [0x131]="Rupee (Deku Target Game)", + [0x131]="Rupee (Deku Target Game)", -- FIXME: also in castle maze [0x132]="Carpenter Boss", - [0x133]="Carpenter (Thieves' Hideout & Carpenters' Tent)", + [0x133]="Carpenter (Valley)", [0x134]=unset, [0x135]="Cucco Chick", [0x136]="Dark Link's Illusion Room", @@ -319,15 +319,15 @@ return { [0x13C]="Chicken Lady", [0x13D]="Medigoron", [0x13E]="Bean Seller", - [0x13F]="Carpenter Boss's Son (Lost Woods)", + [0x13F]="Carpenter Boss's Son (Woods)", [0x140]="Gate to Ingo's Ranch", [0x141]="Sign", - [0x142]="Hylian Soldier (Hyrule Castle)", + [0x142]="Hylian Soldier (Castle)", [0x143]="???", [0x144]="Cucco (Attacking)", [0x145]="Rocks Blocking the Bottom of the Well", [0x146]="Saria", - [0x147]="???", + [0x147]="? Graveyard Effect?", [0x148]="Rainbow Bridge", [0x149]="Potion Shop Granny", [0x14A]="Lake Scientist", @@ -371,12 +371,12 @@ return { [0x170]="Song of Storms Effect", [0x171]="Title Screen Overlay", [0x172]="Thieves' Hideout Jail Cell Door", - [0x173]="Navi Message (Targetable)", + [0x173]="Navi Info (Target)", [0x174]="???", [0x175]="Big Poe", [0x176]="???", [0x177]="Gate Barring Escape From Ganon's Tower", - [0x178]="Hylian Soldier (Hyrule Castle Town/Kakariko Village)", + [0x178]="Hylian Soldier (Misc.)", [0x179]="Adult Zelda (Normal Gameplay)", [0x17A]="Ganon", [0x17B]="Pierre (Lake Hylia)", @@ -394,7 +394,7 @@ return { [0x187]="???", [0x188]="Skulltula House Resident (Cursed)", [0x189]="Skulltula House Resident (Curse Lifted)", - [0x18A]="Song of Time Effect", + [0x18A]="Song of Time Effect", -- also Zelda's Lullaby [0x18B]="Song of Storms Effect", [0x18C]="Stinger (Water)", [0x18D]="Sacred Forest Meadow Pond Bottom", @@ -402,11 +402,11 @@ return { [0x18F]="Iron Knuckle Debris", [0x190]="Gate to the Haunted Wasteland", [0x191]="Gate to the Gerudo Training Ground", - [0x192]="Hint-Giving Deku Scrubs", + [0x192]="Hint-Giving Deku Scrub", [0x193]="Deku Scrub Projectile", [0x194]="Broken Drawbridge", - [0x195]="Business Scrub (Attacking)", - [0x196]="Collectable Grave-Digging Game Items", + [0x195]="Business Scrub (Hostile)", + [0x196]="Collectable Grave-Digging Items", [0x197]="Gerudo Fighter", [0x198]="Epona's Song Effect", [0x199]="Saria's Song Effect", @@ -422,7 +422,7 @@ return { [0x1A3]="Deku Scrub (Deku Target Game)", [0x1A4]="Happy Mask Shop Customer", [0x1A5]="Bombchu Bowling Alley Walls", - [0x1A6]="Carpenter Boss's Son (Kakariko Village)", + [0x1A6]="Carpenter Boss's Son (Village)", [0x1A7]="Ganon's Castle Barrier", [0x1A8]="Bombable Wall (Zora's Fountain)", [0x1A9]="Bombable Wall (Death Mountain Crater)", @@ -444,7 +444,7 @@ return { [0x1B9]="Gossip Stone", [0x1BA]="Bombable Wall (Water Temple)", [0x1BB]="Water Temple Gate", - [0x1BC]="Kakariko Village - Carpenter", + [0x1BC]="Carpenter (Village)", [0x1BD]="Bombchu Bowling Alley Walls", [0x1BE]="???", [0x1BF]="Guiding Poe (Haunted Wasteland)", @@ -467,7 +467,7 @@ return { [0x1D0]="Nabooru's Second-in-Command", [0x1D1]="Time Block", [0x1D2]="Bronze Boulder (Breakable Using Hammer)", - [0x1D3]="Child Zelda (Normal Gameplay & Cutscene 04)", + [0x1D3]="Child Zelda", [0x1D4]="Carpenters' Tent & Race - Running Man", [0x1D5]="???", [0x1D6]="Time Block", diff --git a/Lua/actor names.lua b/Lua/actor names.lua index 76c3ee4..f7bd1ae 100755 --- a/Lua/actor names.lua +++ b/Lua/actor names.lua @@ -75,7 +75,7 @@ return { [0x045]=unset, [0x046]=unset, [0x047]="Beamos", - [0x048]="Demo_Effect", -- Sun Block disappearing effect? + [0x048]="Demo_Effect", -- Sun Block disappearing effect? also great fairy disappearing [0x049]="Environment Sparkles", -- Various Environment Effects [0x04A]="Floormaster", [0x04B]=unset, @@ -131,7 +131,7 @@ return { [0x07D]="Fire Arrow", [0x07E]="Ice Arrow", [0x07F]="Light Arrow", - [0x080]="Items Misc.", + [0x080]="Item (Misc.)", [0x081]="Small Wooden Crate", [0x082]="Pot", [0x083]=unset, @@ -165,7 +165,7 @@ return { [0x09F]="Gerudo Lieutenant", [0x0A0]="Pushable Block Stop Effect", -- snowhead temple [0x0A1]="Dynamic Shadow", - [0x0A2]="Explosion Smoke", + [0x0A2]="Explosion Smoke", -- or just Explosion Effect [0x0A3]=unset, [0x0A4]="Gorman", [0x0A5]="Bean Seller", @@ -219,7 +219,7 @@ return { [0x0D5]=unset, [0x0D6]="Song of Time Effect", -- Zelda's Lullaby as well [0x0D7]="Song of Storms Effect (b)", - [0x0D8]="? Obj_Demo", + [0x0D8]="Cutscene Trigger", -- Obj_Demo [0x0D9]="Mad Jelly - Jelly Droplets", -- TODO: verify [0x0DA]="Deku Nut Projectile", [0x0DB]=unset, @@ -236,7 +236,7 @@ return { [0x0E6]=unset, [0x0E7]="Blue Tatl Target", -- Related to En_Hs Grog? [0x0E8]="Rupee Cluster", - [0x0E9]="Honey & Darling (b)", + [0x0E9]="Honey & Darling (b)", -- Cutscene-only? [0x0EA]=unset, [0x0EB]=unset, [0x0EC]="Wolfos", @@ -280,7 +280,7 @@ return { [0x112]="Circle of Light", -- TODO: verify [0x113]="Garo Master", [0x114]="Collapsing Stone Bridge", - [0x115]="Windows & Skeletons", -- Igos du Ikana. TODO: verify + [0x115]="Ikana Skeletons", -- Igos du Ikana and Henchmen [0x116]="Warp to Start", -- moon challenges? [0x117]="Dog Lady (Mamamu Yan)", [0x118]="Blue Target Spot (a)", @@ -305,8 +305,8 @@ return { [0x12B]="Gyorg", [0x12C]="Wart", [0x12D]="Bio Deku Baba", - [0x12E]="? Igos du Ikana", -- TODO: verify - [0x12F]="Majora", + [0x12E]="Burnable Curtains", + [0x12F]="Majora / Remains", [0x130]="Great Fairy", [0x131]=unset, [0x132]="Blue Target Spot (e)", @@ -632,10 +632,10 @@ return { [0x272]="Moon Crashing Into Clock Town Effect", -- TODO: verify [0x273]="Ikana Castle Pillar Segments", [0x274]="Business Scrub", - [0x275]="?sotct3", -- skull kid glowing eyes perhaps? + [0x275]="?sotct3", -- it's way above the area, maybe the mask outline effect? [0x276]="Link-goro", [0x277]="Racetrack Goron", - [0x278]="Igos du Ikana's Henchman", -- TODO: verify + [0x278]="Ghost Skeleton Heads", -- Ikana Castle [0x279]="? Skulltula House 2", -- loaded in termina field [0x27A]="Kamaro", [0x27B]="Rosa Sister",