From 5a3113af495c1ed0b9f7346fffae121c10fcc845 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Wed, 25 Mar 2015 16:31:49 -0700 Subject: [PATCH] tiny fixes --- Lua/actor names.lua | 2 +- Lua/object names.lua | 2 +- Lua/room debug.lua | 4 ++-- Lua/test chests.lua | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Lua/actor names.lua b/Lua/actor names.lua index c547430..1f1747f 100755 --- a/Lua/actor names.lua +++ b/Lua/actor names.lua @@ -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", diff --git a/Lua/object names.lua b/Lua/object names.lua index 6d5eefd..669d733 100644 --- a/Lua/object names.lua +++ b/Lua/object names.lua @@ -130,7 +130,7 @@ return { [0x07D]="Child Epona", [0x07E]=unset, [0x07F]=unset, - [0x080]="Golden Torch Stand", + [0x080]="Torch", [0x081]=unset, [0x082]=unset, [0x083]=unset, diff --git a/Lua/room debug.lua b/Lua/room debug.lua index 1b413d8..024015f 100755 --- a/Lua/room debug.lua +++ b/Lua/room debug.lua @@ -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 diff --git a/Lua/test chests.lua b/Lua/test chests.lua index 2d86c31..52aa31a 100755 --- a/Lua/test chests.lua +++ b/Lua/test chests.lua @@ -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