1
0
Fork 0
mirror of https://github.com/notwa/mm synced 2024-11-05 00:29:02 -08:00

tiny fixes

This commit is contained in:
Connor Olding 2015-03-25 16:31:49 -07:00
parent fb9ff50c70
commit 5a3113af49
4 changed files with 6 additions and 6 deletions

View file

@ -335,7 +335,7 @@ return {
[0x149]="? Crash",
[0x14A]="Chuchu",
[0x14B]="Desbreko",
[0x14C]="Clocktower Spotlight", -- other things as well, or..?
[0x14C]="Clock Tower Spotlight", -- other things as well, or..?
[0x14D]="2D Chimney Backdrop",
[0x14E]="Inn Bell",
[0x14F]="Shooting Gallery Octorok",

View file

@ -130,7 +130,7 @@ return {
[0x07D]="Child Epona",
[0x07E]=unset,
[0x07F]=unset,
[0x080]="Golden Torch Stand",
[0x080]="Torch",
[0x081]=unset,
[0x082]=unset,
[0x083]=unset,

View file

@ -21,7 +21,7 @@ end
function dump_room(start, addr)
local addr = addr or start
printf("# start: %08X", start)
printf("start: %06X", start)
local object_n, objects
local actor_n, actors
@ -48,7 +48,7 @@ function dump_room(start, addr)
return
else
local new_addr = start + offset
printf(" at %08X (+%06X)", new_addr, offset)
printf(" at %06X (+%06X)", new_addr, offset)
return new_addr
end
end

View file

@ -36,7 +36,7 @@ end
function read_ascii(addr, len)
local begin = addr
local bytes = mainmemory.readbyterange(begin, 0x100)
local bytes = mainmemory.readbyterange(begin, len)
local str = ""
-- pairs() won't give us the bytes in order
@ -81,7 +81,7 @@ for off=index*6, 185*6, 6 do
if mainmemory.readbyte(text + 0xA) == 0xFF then
if version == 'US10' then
local begin = text + 0xC
print(off/6 + 1, read_ascii(begin))
print(off/6 + 1, read_ascii(begin, 0x100))
good = true
else
for _=1, 40 do