mirror of
https://github.com/notwa/mm
synced 2024-11-05 02:49:02 -08:00
tweaks
This commit is contained in:
parent
f3bdbd282a
commit
0f1245b0e8
3 changed files with 62 additions and 54 deletions
|
|
@ -25,6 +25,7 @@ end
|
|||
local seen = {}
|
||||
local seen_strs = {}
|
||||
local seen_strs_sorted = {}
|
||||
local last_any = 0
|
||||
|
||||
while true do
|
||||
local any = 0
|
||||
|
|
@ -36,9 +37,15 @@ while true do
|
|||
T(0, 1, ("sum:%3i"):format(any), nil, "bottomright")
|
||||
|
||||
if any == 0 then
|
||||
if #seen_strs_sorted > 0 then -- lazy way of doing this once
|
||||
for i = 1, 5 do
|
||||
print()
|
||||
end
|
||||
end
|
||||
seen = {}
|
||||
seen_strs = {}
|
||||
console.clear()
|
||||
seen_strs_sorted = {}
|
||||
--console.clear()
|
||||
end
|
||||
|
||||
local seen_new = false
|
||||
|
|
@ -47,7 +54,7 @@ while true do
|
|||
local actor_index = 0
|
||||
local once = false
|
||||
local i = 0
|
||||
while any > 0 do
|
||||
while any > 0 and last_any ~= any do
|
||||
if once and actor_type == 2 and actor_index == 0 then break end
|
||||
actor_index = actor_index + 1
|
||||
|
||||
|
|
@ -85,7 +92,7 @@ while true do
|
|||
seen_new = true
|
||||
local str
|
||||
if name:sub(1,1) == "?" then
|
||||
str = ("%s (%04X)"):format(name, num)
|
||||
str = ("%s (%03X)"):format(name, num)
|
||||
else
|
||||
str = ("%s"):format(name)
|
||||
end
|
||||
|
|
@ -95,16 +102,16 @@ while true do
|
|||
|
||||
if name == nil and num < 0x300 then
|
||||
actor_names[num] = "NEW"
|
||||
print(('\t[0x%03X]="NEW",'):format(num))
|
||||
print(("\t[0x%03X]=\"NEW\","):format(num))
|
||||
|
||||
local dmg = bit.band(addr + actor_t.damage_table.addr, 0x7FFFFFFF)
|
||||
if dmg == 0 then
|
||||
print("(no damage table)")
|
||||
else
|
||||
local hp = R1(addr + actor_t.hp.addr)
|
||||
s = ('%04X\t%02X\t%02X'):format(num, actor_type, hp)
|
||||
s = ("%04X\t%02X\t%02X"):format(num, actor_type, hp)
|
||||
for i = 0, 31 do
|
||||
s = s..('\t%02X'):format(R1(dmg + i))
|
||||
s = s..("\t%02X"):format(R1(dmg + i))
|
||||
end
|
||||
print(s)
|
||||
end
|
||||
|
|
@ -115,6 +122,8 @@ while true do
|
|||
once = true
|
||||
end
|
||||
|
||||
last_any = any
|
||||
|
||||
function sort_by_key(t)
|
||||
local sorted = {}
|
||||
local i = 1
|
||||
|
|
@ -140,7 +149,7 @@ while true do
|
|||
local z = target or cursor
|
||||
if z then
|
||||
local num = R2(z)
|
||||
T(0, 0, seen_strs[num], nil, 'topright')
|
||||
T(0, 0, seen_strs[num], nil, "topright")
|
||||
end
|
||||
|
||||
emu.yield()
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
local unset="unset"
|
||||
return {
|
||||
[0x000]="Link",
|
||||
[0x001]="Wall Punch Effect",
|
||||
[0x001]="Wall Punch / Ground Pound Effect",
|
||||
[0x002]="Store Item", -- TODO: double check
|
||||
[0x003]="?",
|
||||
[0x004]="Flame Prop", -- also ice?
|
||||
|
|
@ -18,7 +18,7 @@ return {
|
|||
[0x00C]="Keese",
|
||||
[0x00D]="Epona (Cutscene)",
|
||||
[0x00E]="Collectables",
|
||||
[0x00F]="Arrow Details", -- arrows, steam, flames...
|
||||
[0x00F]="Arrow Details", -- arrows, steam, flames... deku bubble?
|
||||
[0x010]="Tatl",
|
||||
[0x011]="Cucco",
|
||||
[0x012]="Tektite",
|
||||
|
|
@ -57,8 +57,8 @@ return {
|
|||
[0x033]="Deku Baba",
|
||||
[0x034]="Deku Nuts",
|
||||
[0x035]="Spin Attack/Sword Beam",
|
||||
[0x036]="Blacksmith Smoke", -- also in goron village -- Barn Roof
|
||||
-- [0x037]=unset,
|
||||
[0x036]="?", -- Blacksmith Smoke, also in goron village and field skullkid cutscene -- Barn Roof -- a lot of things apparently
|
||||
[0x037]=unset,
|
||||
[0x038]="Blue Warp",
|
||||
[0x039]="Torch",
|
||||
[0x03A]="Heart Container",
|
||||
|
|
@ -67,24 +67,24 @@ return {
|
|||
[0x03D]="Hookshot",
|
||||
[0x03E]="Blue Bubble",
|
||||
[0x03F]="Fountain Water",
|
||||
-- [0x040]=unset,
|
||||
[0x040]=unset,
|
||||
[0x041]="Trees & Bushes",
|
||||
-- [0x042]=unset,
|
||||
[0x042]=unset,
|
||||
[0x043]="Gomess",
|
||||
[0x044]="Gomess Bats", -- TODO: verify
|
||||
-- [0x045]=unset
|
||||
-- [0x046]=unset
|
||||
[0x045]=unset,
|
||||
[0x046]=unset,
|
||||
[0x047]="Beamos",
|
||||
[0x048]="Demo_Effect",
|
||||
[0x048]="Demo_Effect", -- Sun Block disappearing effect?
|
||||
[0x049]="Environment Sparkles", -- Various Environment Effects
|
||||
[0x04A]="Floormaster",
|
||||
-- [0x04B]=unset,
|
||||
[0x04B]=unset,
|
||||
[0x04C]="Redead / Gibdo",
|
||||
[0x04D]="Grey Stone Elevator",
|
||||
[0x04E]="Golden Gauntlets Rock",
|
||||
[0x04F]="Group of Bugs/Fish/Butterflies",
|
||||
[0x050]="Skullwalltula",
|
||||
[0x051]="?fvo3", -- snow??
|
||||
[0x051]="?fvo3", -- seen: frozen mountain village, field skullkid cutscene
|
||||
[0x052]=unset,
|
||||
[0x053]=unset,
|
||||
[0x054]="Child Epona",
|
||||
|
|
@ -126,7 +126,7 @@ return {
|
|||
[0x078]=unset,
|
||||
[0x079]="Fishing Pond Owner",
|
||||
[0x07A]="Pushable Block", -- snowhead temple
|
||||
[0x07B]="Eff_Dust",
|
||||
[0x07B]="Charging Spin Attack Particles",
|
||||
[0x07C]="Horse Jumping Fence", -- also Epona path nodes?
|
||||
[0x07D]="Fire Arrow",
|
||||
[0x07E]="Ice Arrow",
|
||||
|
|
@ -150,10 +150,10 @@ return {
|
|||
[0x090]="Grass",
|
||||
[0x091]="Floating Bean Plant",
|
||||
[0x092]="Bombable Rock",
|
||||
[0x093]="Floor Switch (b)",
|
||||
[0x093]="Floor Switch",
|
||||
[0x094]=unset,
|
||||
[0x095]="Brown Elevator (Dampé)",
|
||||
[0x096]="Stone Hookshot Target Pillar",
|
||||
[0x095]="Brown Elevator (Dampé)",
|
||||
[0x096]="Stone Hookshot Pillar",
|
||||
[0x097]="En_Okarina_Tag",
|
||||
[0x098]=unset,
|
||||
[0x099]="Rolling Boulder/Snowball",
|
||||
|
|
@ -191,7 +191,7 @@ return {
|
|||
[0x0B9]="Rock Sirloin",
|
||||
[0x0BA]=unset,
|
||||
[0x0BB]=unset,
|
||||
[0x0BC]="? En_Weather_Tag", -- seen: anywhere frozen mountain village
|
||||
[0x0BC]="? En_Weather_Tag", -- seen: anywhere frozen mountain village, atop clock tower
|
||||
[0x0BD]="Part-Timer", -- Kakariko roof guy
|
||||
[0x0BE]=unset,
|
||||
[0x0BF]="Moon child",
|
||||
|
|
@ -201,7 +201,7 @@ return {
|
|||
[0x0C3]=unset,
|
||||
[0x0C4]="Song of Storms Effect (a)",
|
||||
[0x0C5]="Title Logo",
|
||||
[0x0C6]="Green Tatl Target",
|
||||
[0x0C6]="Green Tatl Target", -- pirate boards, mirrors
|
||||
[0x0C7]="Floating Stone Platform",
|
||||
[0x0C8]=unset,
|
||||
[0x0C9]=unset,
|
||||
|
|
@ -217,7 +217,7 @@ return {
|
|||
[0x0D3]="On-screen Timer",
|
||||
[0x0D4]="Cursed Skulltula Man",
|
||||
[0x0D5]=unset,
|
||||
[0x0D6]="Zelda's Lullaby Effect",
|
||||
[0x0D6]="Song of Time Effect", -- Zelda's Lullaby as well
|
||||
[0x0D7]="Song of Storms Effect (b)",
|
||||
[0x0D8]="? Obj_Demo",
|
||||
[0x0D9]="Mad Jelly - Jelly Droplets", -- TODO: verify
|
||||
|
|
@ -253,7 +253,7 @@ return {
|
|||
[0x0F7]=unset,
|
||||
[0x0F8]="Walking Zora", -- Zora
|
||||
[0x0F9]=unset,
|
||||
[0x0FA]="Gerudo (Aveil)", -- TODO: verify
|
||||
[0x0FA]="Aveil (Gerudo)",
|
||||
[0x0FB]=unset,
|
||||
[0x0FC]="Bronze Boulder",
|
||||
[0x0FD]="? Crash",
|
||||
|
|
@ -272,7 +272,7 @@ return {
|
|||
[0x10A]=unset,
|
||||
[0x10B]="? Obj_Grass", -- seen: lens cave
|
||||
[0x10C]="? Obj_Grass_Carry", -- seen: lens cave, termina field clock tower
|
||||
[0x10D]="? Grass Cluster", -- spinout: Random blue polygons
|
||||
[0x10D]="Grass Cluster", -- used for loading
|
||||
[0x10E]=unset,
|
||||
[0x10F]=unset,
|
||||
[0x110]="Proximity Fire Wall (a)",
|
||||
|
|
@ -286,7 +286,7 @@ return {
|
|||
[0x118]="Blue Target Spot (a)",
|
||||
[0x119]="Blue Target Spot (b)",
|
||||
[0x11A]="Blue Target Spot (c)",
|
||||
[0x11B]="? En_Encount4",
|
||||
[0x11B]="? Keeta Encounter Script", -- rename
|
||||
[0x11C]="? Bomber", -- seen: first part of first time playing SoT cutscene (TODO: wtf, verify?)
|
||||
[0x11D]="Swamp Shooting Gallery Manager",
|
||||
[0x11E]=unset,
|
||||
|
|
@ -325,7 +325,7 @@ return {
|
|||
[0x13F]="Horizontal Spike Log",
|
||||
[0x140]="Remains",
|
||||
[0x141]="Shooting Gallery Wolfos",
|
||||
[0x142]="Frozen Movable Block",
|
||||
[0x142]="Pushable Ice Block",
|
||||
[0x143]="Frozen Enemy Ice Block",
|
||||
[0x144]="Snapper (Miniboss)", -- Gekko & Snapper
|
||||
[0x145]="Shooting Gallery Deku Scrub",
|
||||
|
|
@ -343,7 +343,7 @@ return {
|
|||
[0x151]="Bank Shutter", -- hi keeta
|
||||
[0x152]="Child Zelda",
|
||||
[0x153]="Stray Fairy Group",
|
||||
[0x154]="? nothing",
|
||||
[0x154]="? nothing", -- opening area? (first time SOT cutscene)
|
||||
[0x155]="Nejiron",
|
||||
[0x156]="Vertical Spike Log",
|
||||
[0x157]="Smoke (Ranch)",
|
||||
|
|
@ -351,13 +351,13 @@ return {
|
|||
[0x159]="Kafei",
|
||||
[0x15A]="Three-Day Timer", -- in loading-zone positions for some reason
|
||||
[0x15B]="Bad Bat",
|
||||
[0x15C]="Song Pedestals / Mikau's Grave",
|
||||
[0x15C]="Song Pedestal / Mikau's Grave",
|
||||
[0x15D]="Wizzrobe",
|
||||
[0x15E]="Warp Platform (Wizzrobe)",
|
||||
[0x15F]="Fire Attack (Wizzrobe)",
|
||||
[0x160]="Camera Focus (Statue Spawning Effect)",
|
||||
[0x161]="Beam of Light (Elegy Statue)", -- TODO: verify
|
||||
[0x162]="Circle of Flames", -- TODO: check keeta chest
|
||||
[0x162]="Circle of Flames",
|
||||
[0x163]="Ladder",
|
||||
[0x164]="Boe",
|
||||
[0x165]="? Demo_Getitem",
|
||||
|
|
@ -371,7 +371,7 @@ return {
|
|||
[0x16D]="Boulder Blocking Racetrack", -- also ranch?
|
||||
[0x16E]="Yellow Target Spot",
|
||||
[0x16F]="Real Bombchu",
|
||||
[0x170]="Water Droplets",
|
||||
[0x170]="Water Droplets", -- or falling lava blocks in STT
|
||||
[0x171]="Bush (Keaton)",
|
||||
[0x172]="Proximity Fire Wall (b)",
|
||||
[0x173]=unset,
|
||||
|
|
@ -382,8 +382,8 @@ return {
|
|||
[0x178]="Telescope (Pirate's)",
|
||||
[0x179]="Drifting Ice Platform",
|
||||
[0x17A]="Deku Palace Guard",
|
||||
[0x17B]="Bugs",
|
||||
[0x17C]="? En_Fall", -- considering the filename and number of places it's in, could this affect voiding out?
|
||||
[0x17B]="3 Bugs",
|
||||
[0x17C]="? En_Fall", -- considering the filename and number of places it's in, could this affect voiding out? or what if it means the moon can fall in this area?
|
||||
[0x17D]="Postman (Home)",
|
||||
[0x17E]="Deku Shrine Closing Door",
|
||||
[0x17F]="Deku Butler",
|
||||
|
|
@ -398,18 +398,18 @@ return {
|
|||
[0x188]="Kotake",
|
||||
[0x189]=unset,
|
||||
[0x18A]=unset,
|
||||
[0x18B]="? En_Test5",
|
||||
[0x18C]="? Night", -- seen: sot cutscene -- spinout: Night/Day Change
|
||||
[0x18B]="? En_Test5", -- southern swamp region
|
||||
[0x18C]="SoT Effect Circles?", -- seen: SoT cutscene -- spinout: Night/Day Change
|
||||
[0x18D]="Beaver Brothers",
|
||||
[0x18E]="Rubble (Eyegore)",
|
||||
[0x18F]="Central Pillar (Snowhead)", -- TODO: verify
|
||||
[0x190]="Opening Cutscene Object", -- spinout: Big square of grass
|
||||
[0x191]="Skullkid", -- cutscene?
|
||||
[0x192]="Tatl & Tael (Cutscene)",
|
||||
[0x192]="Tatl / Tael (Cutscene)",
|
||||
[0x193]="Woodfall Temple Rises (Cutscene)",
|
||||
[0x194]="Clock Tower Roof", -- TODO: verify
|
||||
[0x195]="Happy Mask Salesman (Cutscene)",
|
||||
[0x196]="Tatl & Tael (Cutscene) (Early)",
|
||||
[0x196]="Tatl / Tael (Cutscene) (Early)",
|
||||
[0x197]="Mask (Cutscene)",
|
||||
[0x198]="Mountain Village Thawing (Cutscene)", -- TODO: verify
|
||||
[0x199]="Indigo-Go's Milk Bar Stage (Cutscene)",
|
||||
|
|
@ -432,7 +432,7 @@ return {
|
|||
[0x1AA]="Elevator Triforce Texture",
|
||||
[0x1AB]="? En_Time_Tag", -- rug in inn?
|
||||
[0x1AC]="Wooden Deku Door",
|
||||
[0x1AD]="Spotlights",
|
||||
[0x1AD]="Reflectable Spotlight",
|
||||
[0x1AE]="Platform (H&D)",
|
||||
[0x1AF]="Pouring Water (Bottle)",
|
||||
[0x1B0]="Stray Fairy",
|
||||
|
|
@ -461,16 +461,16 @@ return {
|
|||
[0x1C7]="Town Soldier (Guarding)",
|
||||
[0x1C8]="Ice Block",
|
||||
[0x1C9]="Scrub Playground Deku",
|
||||
[0x1CA]="Dampé",
|
||||
[0x1CA]="Dampé",
|
||||
[0x1CB]=unset,
|
||||
[0x1CC]="West Clock Town Stairs",
|
||||
[0x1CD]="Scrub Playground Elevator",
|
||||
[0x1CE]="Song of Soaring Cutscene",
|
||||
[0x1CF]="Sun Block",
|
||||
[0x1D0]="Mirror Shield Light Ray", -- TODO: verify
|
||||
[0x1D0]="Spotlight",
|
||||
[0x1D1]="Dexihand",
|
||||
[0x1D2]="Large Rupee (a)", -- TODO: verify unused?
|
||||
[0x1D3]="Elevator & Stairs (Dampé's)",
|
||||
[0x1D3]="Elevator & Stairs (Dampé's)",
|
||||
[0x1D4]="Snowy Tree",
|
||||
[0x1D5]="Postman (Town)",
|
||||
[0x1D6]="Termina Field Song Wall",
|
||||
|
|
@ -485,7 +485,7 @@ return {
|
|||
[0x1DF]="? Music Monkey", -- spinout: Invisible speaking spot
|
||||
[0x1E0]="Goron Shrine Gate",
|
||||
[0x1E1]="? En_Tag_Obj",
|
||||
[0x1E2]="Dampé's House Facade", -- in Stone Tower too?
|
||||
[0x1E2]="Dampé's House Facade", -- in Stone Tower too?
|
||||
[0x1E3]="Gravestone",
|
||||
[0x1E4]="Goron Pound Switch",
|
||||
[0x1E5]=unset,
|
||||
|
|
@ -545,7 +545,7 @@ return {
|
|||
[0x21B]="See-Saw (GBT)",
|
||||
[0x21C]="Water Spout (GBT)",
|
||||
[0x21D]="Gerudo Pirate",
|
||||
[0x21E]="Pirate Guard",
|
||||
[0x21E]="Pirate Guard", -- or is Gerudo Guard better?
|
||||
[0x21F]="Romani",
|
||||
[0x220]="Cremia",
|
||||
[0x221]="Lower Carnival Platform", -- "String of Flags"
|
||||
|
|
@ -560,12 +560,12 @@ return {
|
|||
[0x22A]="Mesh Elevator", -- ??
|
||||
[0x22B]="Pirates' Interior Door",
|
||||
[0x22C]="Pirate Boat",
|
||||
[0x22D]="Barrel",
|
||||
[0x22D]="Barrel", -- also pirate boards
|
||||
[0x22E]="Switch-Activated Geyser", -- TODO: verify
|
||||
[0x22F]="Boat Cruise Target", -- koume
|
||||
[0x230]="Mirror Shield Light Ray", -- TODO: verify
|
||||
[0x230]="Mirror Shield Light Ray",
|
||||
[0x231]="Japas (Bassist)",
|
||||
[0x232]="? Elf_Msg6",
|
||||
[0x232]="? Elf_Msg6", -- SCT
|
||||
[0x233]="Sakon's Hideout Object", -- I guess
|
||||
[0x234]="Toto (Manager)",
|
||||
[0x235]="Circle Gibdo",
|
||||
|
|
@ -584,7 +584,7 @@ return {
|
|||
[0x242]="Goron",
|
||||
[0x243]="Anju's Grandmother",
|
||||
[0x244]="Juggler",
|
||||
[0x245]="Monkey-Faced",
|
||||
[0x245]="Monkey-Faced Elegy Block",
|
||||
[0x246]="Elegy of Emptiness Switch",
|
||||
[0x247]="Composer Brother",
|
||||
[0x248]="Guru-Guru (Music Box)",
|
||||
|
|
@ -632,11 +632,11 @@ return {
|
|||
[0x272]="Moon Crashing Into Clock Town Effect", -- TODO: verify
|
||||
[0x273]="Ikana Castle Pillar Segments",
|
||||
[0x274]="Business Scrub",
|
||||
[0x275]="?sotct3", -- seen: guess --also "Skullkid Screams to Call Moon Down Effect"
|
||||
[0x275]="?sotct3", -- skull kid glowing eyes perhaps?
|
||||
[0x276]="Link-goro",
|
||||
[0x277]="Racetrack Goron",
|
||||
[0x278]="Igos du Ikana's Henchman", -- TODO: verify
|
||||
[0x279]="? Skulltula House 2",
|
||||
[0x279]="? Skulltula House 2", -- loaded in termina field
|
||||
[0x27A]="Kamaro",
|
||||
[0x27B]="Rosa Sister",
|
||||
[0x27C]="Rupee",
|
||||
|
|
@ -666,7 +666,7 @@ return {
|
|||
[0x294]="Inn Window",
|
||||
[0x295]="Ikana Curse Lifting Effect",
|
||||
[0x296]="Moon (Cutscene)",
|
||||
[0x297]="Colorful Hookshot Pillar",
|
||||
[0x297]="Hookshot Pillar",
|
||||
[0x298]="Bombable Wall (Trial)",
|
||||
[0x299]="Anju in Wedding Dress",
|
||||
[0x29A]="Invader Poe (Cutscene)", -- aliens.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
local versions = {
|
||||
versions = {
|
||||
['D6133ACE5AFAA0882CF214CF88DABA39E266C078'] = "US10",
|
||||
['2F0744F2422B0421697A74B305CB1EF27041AB11'] = "USDE",
|
||||
['9743AA026E9269B339EB0E3044CD5830A440C1FD'] = "USGC",
|
||||
|
|
@ -11,7 +11,6 @@ local versions = {
|
|||
['1438FD501E3E5B25461770AF88C02AB1E41D3A7E'] = "JPGC",
|
||||
}
|
||||
|
||||
local hash, version, addrs
|
||||
--while version == nil do
|
||||
-- emu.yield() -- wait until a known ROM is loaded (doesn't work)
|
||||
hash = gameinfo.getromhash()
|
||||
|
|
|
|||
Loading…
Reference in a new issue