Module:Files/Address - Revision history

Mzxrules at 09:21, 7 March 2018

2018-03-07T09:21:32Z

Mzxrules at 09:19, 7 March 2018

2018-03-07T09:19:21Z

Mzxrules at 09:17, 7 March 2018

2018-03-07T09:17:17Z

Mzxrules at 09:09, 7 March 2018

2018-03-07T09:09:01Z

Mzxrules at 13:27, 19 November 2017

2017-11-19T13:27:00Z

Mzxrules: bug fix

2017-11-19T13:23:34Z

bug fix

Mzxrules: Imported subpage support, updated display values

2017-11-19T13:12:53Z

Imported subpage support, updated display values

Mzxrules at 17:45, 19 June 2017

2017-06-19T17:45:42Z

Playtendo: test 2

2016-08-28T16:35:14Z

test 2

Playtendo: test

2016-08-28T15:44:18Z

test

New page

local p = {}
local origArgs
local args = {}
local root

local yesno = require('Module:Yesno')

local versions = { ["Debug"]=1, ["NTSC 1.0"]=2, ["NTSC 1.1"]=3, ["NTSC 1.2"]=4,
["PAL 1.0"]=5, ["PAL 1.1"]=6, ["NTSC MQ"]=7, ["PAL MQ"]=8, ["iQue"]=9 }

local data = {
ram = {
display="[[VRam]]", ram=true, rom=false, offset=false
},
rom = {
display="[[VRom]]", ram=false, rom=true, offset=false
},
off = {
display="Offset", ram=false, rom=false, offset=true
},
code = {
display="[[Code (File)]]", ram=true, rom=true, offset=true,
["Debug"] = {
rom = { 0xA94000, 0xBCEF30 },
ram = { 0x8001CE60, 0x80157D90 },
},
["NTSC 1.0"] = {
rom = { 0xA87000, 0xB8AD30 },
ram = { 0x800110A0, 0x80114DD0 },
},
["NTSC 1.1"] = {
rom = { 0xA87000, 0xB8AEF0 },
ram = { 0x800110A0, 0 },
},
["NTSC 1.2"] = {
rom = { 0xA87000, 0xB8ADA0 },
ram = { 0x800116E0, 0x80103DA0 },
},
["PAL 1.0"] = {
rom = { 0xA89000, 0 },
ram = { 0x800116E0, 0 },
},
["PAL 1.1"] = {
rom = { 0xA89000, 0 },
ram = { 0x800116E0, 0 },
},
["PAL MQ"] = {
rom = { 0xA88000, 0xB8A230 },
ram = { 0x80010F00, 0x80113130 },
},
},
ovl_player_actor = {
display="[[ovl_player_actor|Link Actor]]", ram=true, rom=true, offset=true,
["Debug"] = {
rom = { 0xC010B0, 0xC27940 },
ram = { 0x80832210, 0x80858B70 },
},
["NTSC 1.0"] = {
rom = { 0xBCDB70, 0xBF40D0 },
ram = { 0x808301C0, 0x808567F0 },
},
["PAL MQ"] = {
rom = { 0xBB8E30, 0xBDF540 },
ram = { 0x8082EC90, 0x80855470 },
},
},
ovl_kaleido_scope={
display="[[ovl_kaleido_scope|Pause Screen]]", ram=true, rom=true, offset=true,
["Debug"] = {
rom = { 0xBE2730, 0xC010B0 },
ram = { 0x80813820, 0x80832210 },
},
["NTSC 1.0"] = {
rom = { 0xBB11E0, 0xBCDB70 },
ram = { 0x808137C0, 0x808301C0 },
},
["PAL MQ"] = {
rom = { 0xB9C470, 0xBB8E30 },
ram = { 0x80812260, 0x8082EC90 },
},
},
gctxt =
{
display="[[Global Context]]", ram=true, rom=false, offset=true,
["Debug"] = { ram = { 0x80212020, 0x80212020+0x012518 }, },
["NTSC 1.0"] = { ram = { 0x801C84A0, 0x801C84A0+0x012518 }, },
["PAL MQ"] = { ram = {0x0, 0x12518}, },
},
}

local function getRowOrder()
-- Returns a table containing the numbers of the arguments that exist
-- for the specified prefix. For example, if the prefix was 'data', and
-- 'data1', 'data2', and 'data5' exist, it would return {1, 2, 5}.
local prefix = 'ver'
local nums = {}
for k, v in pairs(args) do
local num = tostring(k):match('^' .. prefix .. '([1-9]%d*)$')
if num then
local index = versions[k]
table.insert(nums, tonumber(num)) end
end
table.sort(nums)
return nums
end

local function preprocessSingleArg(argName)
-- If the argument exists and isn't blank, add it to the argument table.
-- Blank arguments are treated as nil to match the behaviour of ParserFunctions.
if origArgs[argName] and origArgs[argName] ~= '' then
args[argName] = origArgs[argName]
end
end

local function preprocessArgs(prefixTable, step)
-- Assign the parameters with the given prefixes to the args table, in order, in batches
-- of the step size specified. This is to prevent references etc. from appearing in the
-- wrong order. The prefixTable should be an array containing tables, each of which has
-- two possible fields, a "prefix" string and a "depend" table. The function always parses
-- parameters containing the "prefix" string, but only parses parameters in the "depend"
-- table if the prefix parameter is present and non-blank.
if type(prefixTable) ~= 'table' then
error("Non-table value detected for the prefix table", 2)
end
if type(step) ~= 'number' then
error("Invalid step value detected", 2)
end

-- Get arguments without a number suffix, and check for bad input.
for i,v in ipairs(prefixTable) do
if type(v) ~= 'table' or type(v.prefix) ~= "string" or (v.depend and type(v.depend) ~= 'table') then
error('Invalid input detected to preprocessArgs prefix table', 2)
end
preprocessSingleArg(v.prefix)
-- Only parse the depend parameter if the prefix parameter is present and not blank.
if args[v.prefix] and v.depend then
for j, dependValue in ipairs(v.depend) do
if type(dependValue) ~= 'string' then
error('Invalid "depend" parameter value detected in preprocessArgs')
end
preprocessSingleArg(dependValue)
end
end
end

-- Get arguments with number suffixes.
local a = 1 -- Counter variable.
local moreArgumentsExist = true
while moreArgumentsExist == true do
moreArgumentsExist = false
for i = a, a + step - 1 do
for j,v in ipairs(prefixTable) do
local prefixArgName = v.prefix .. tostring(i)
if origArgs[prefixArgName] then
moreArgumentsExist = true -- Do another loop if any arguments are found, even blank ones.
preprocessSingleArg(prefixArgName)
end
-- Process the depend table if the prefix argument is present and not blank, or
-- we are processing "prefix1" and "prefix" is present and not blank, and
-- if the depend table is present.
if v.depend and (args[prefixArgName] or (i == 1 and args[v.prefix])) then
for j,dependValue in ipairs(v.depend) do
local dependArgName = dependValue .. tostring(i)
preprocessSingleArg(dependArgName)
end
end
end
end
a = a + step
end
end

local function renderTableTop(spaceRef)

root = mw.html.create('table')
root
:attr('id', 'Addr')
:addClass('wikitable')
:attr('align', 'right')
local caption = root :tag('caption')

if args.name then
if args.space=='ram' or args.space=='rom' then
caption:wikitext(args.name)
else
caption :wikitext(spaceRef.display .. '<br>' .. args.name)
end
else
caption :wikitext(spaceRef.display)
end

local header = root:tag('tr')

header
:tag('th')
:wikitext('Version')

if spaceRef.offset == true and args.hideoff ~= true then
header
:tag('th')
:wikitext('Offset')
end
local colspan = 2
if args.hideend == true then
colspan = 1
end

if spaceRef.rom then
header
:tag('th')
:attr('colspan',colspan)
:wikitext('[[VRom]]')
end

if spaceRef.ram then
header
:tag('th')
:attr('colspan',colspan)
:wikitext('[[VRam]]')
end

end

local function renderDataCell(row, value, f)
f = f or '%08X'
row :tag('td'):css('font-size', '90%'):tag('tt'):wikitext(string.format(f, value))
end

local function renderDataGroup(row, d)
-- renders cells with a shared header column (i.e. VRam/VRom)
if d.Start < 0 then
renderDataCell(row, "?", "%s")
else
renderDataCell(row, d.Start)
end

if args.hideend ~= true then
if d.End < d.Start or d.End < 0 then
renderDataCell(row, "?", "%s")
else
renderDataCell(row, d.End)
end
end
end

local function renderRow(ver, off, rom, ram)

local row = root:tag('tr')
row :tag('td'):wikitext(ver)

if off.Show and args.hideoff ~= true then
if off.Start < 0 then
renderDataCell(row, '?', '%s')
else
renderDataCell(row, off.Start, '%06X')
end
end

if rom.Show then
renderDataGroup(row, rom)
end

if ram.Show then
renderDataGroup(row, ram)
end

return result
end

local function processRowManual(spaceRef, rowArgs)
if not rowArgs.ver then return end

rowArgs.offset = rowArgs.offset == nil and -1 or tonumber(rowArgs.offset,16)
rowArgs['rom-start'] = rowArgs['rom-start'] == nil and -1 or tonumber(rowArgs['rom-start'],16)
rowArgs['rom-end'] = rowArgs['rom-end'] == nil and -1 or tonumber(rowArgs['rom-end'],16)
rowArgs['ram-start'] = rowArgs['ram-start'] == nil and -1 or tonumber(rowArgs['ram-start'],16)
rowArgs['ram-end'] = rowArgs['ram-end'] == nil and -1 or tonumber(rowArgs['ram-end'],16)

local off = { Show=spaceRef.offset, Start=rowArgs.offset, End=-1 }
local rom = { Show=spaceRef.rom, Start=rowArgs['rom-start'], End=rowArgs['rom-end'] }
local ram = { Show=spaceRef.ram, Start=rowArgs['ram-start'], End=rowArgs['ram-end'] }

renderRow(rowArgs.ver, off,rom,ram)
end

local function processRow(spaceRef, rowArgs)
if not rowArgs.ver or not rowArgs.start then return end
if not rowArgs.ref then
rowArgs.ref = 'off'
elseif rowArgs.ref == 'offset' then
rowArgs.ref = 'off'
end

local verAddr = spaceRef[rowArgs.ver] -- can be nil

local off = { Show=spaceRef.offset, Start=-1, End=-1 }
local rom = { Show=spaceRef.rom, Start=-1, End=-1 }
local ram = { Show=spaceRef.ram, Start=-1, End=-1 }

rowArgs.start = tonumber(rowArgs.start,16) %0x80000000
if rowArgs['end'] then
rowArgs['end'] = tonumber(rowArgs['end'],16) %0x80000000
end
if rowArgs.size then
rowArgs.size = tonumber(rowArgs.size,16)
end

if not rowArgs['end'] and rowArgs.size then
rowArgs['end'] = rowArgs.start + rowArgs.size
end
if not rowArgs['end'] then
rowArgs['end'] = -1 -- avoids proper error checking
end

-- Calculate data

if rowArgs.ref == 'off' then
off.Start = rowArgs.start
off.End = rowArgs['end']
if verAddr and ram.Show then
ram.Start = verAddr.ram[1] + off.Start
ram.End = verAddr.ram[1] + off.End
end
if verAddr and rom.Show then
rom.Start = verAddr.rom[1]+off.Start
rom.End = verAddr.rom[1]+off.End
end

elseif rowArgs.ref == 'ram' then
ram.Start = rowArgs.start + 0x80000000
ram.End = rowArgs['end'] + 0x80000000

if verAddr and off.Show then
off.Start = ram.Start - verAddr.ram[1]
off.End = ram.End - verAddr.ram[1]
end

if verAddr and rom.Show then
rom.Start = verAddr.rom[1]+off.Start
rom.End = verAddr.rom[1]+off.End
end

elseif rowArgs.ref == 'rom' then
rom.Start = rowArgs.start
rom.End = rowArgs['end']

if verAddr and off.Show then
off.Start = rom.Start - verAddr.rom[1]
off.End = rom.End - verAddr.rom[1]
end
if verAddr and ram.Show then
ram.Start = verAddr.ram[1] + off.Start
ram.End = verAddr.ram[1] + off.End
end
end
renderRow(rowArgs.ver, off,rom,ram)
end

local function renderRows(space)
local rownums = getRowOrder()

for k, num in ipairs(rownums) do
local ref = args['ref' .. tostring(num)]

if ref and ref == 'manual' then
processRowManual(space,{
ver = args['ver' .. tostring(num)],
offset = args['offset' .. tostring(num)],
['rom-start'] = args['rom-start' .. tostring(num)],
['rom-end'] = args['rom-end' .. tostring(num)],
['ram-start'] = args['ram-start' .. tostring(num)],
['ram-end'] = args['ram-end' .. tostring(num)],
})
else
processRow(space,{
ver = args['ver' .. tostring(num)],
ref = args['ref' .. tostring(num)],
start = args['start' .. tostring(num)],
['end'] = args['end' .. tostring(num)],
size = args['size' .. tostring(num)],
})
end
end
end

local function _address()
local space

if args.space then
space = data[args.space]
else return "<Error: no space set>" end

renderTableTop(space)
renderRows(space)

return tostring(root)
end

-- performs auto-magic calculations by referencing a database
function p.address(frame)
-- If called via #invoke, use the args passed into the invoking template.
-- Otherwise, for testing purposes, assume args are being passed directly in.
if frame == mw.getCurrentFrame() then
origArgs = frame:getParent().args
else
origArgs = frame
end

preprocessSingleArg('space')
preprocessSingleArg('name')
preprocessSingleArg('hideoff')
preprocessSingleArg('hideend')
preprocessArgs({
{ prefix = 'ver'},
{ prefix = 'ref'},
{ prefix = 'start'},
{ prefix = 'end'},
{ prefix = 'size'},

-- For manual declaration of addresses
{ prefix = 'offset' },
{ prefix = 'rom-start'},
{ prefix = 'rom-end'},
{ prefix = 'ram-start'},
{ prefix = 'ram-end'},

},10)

args.hideoff = args.hideoff == nil and false or yesno(args.hideoff)
args.hideend = args.hideend == nil and false or yesno(args.hideend)

return _address()

end

return p

@@ Line 7: / Line 7: @@
 local versions =
+{
 	["debug"]={ k=1, n="Debug" },
 	["j 1.0"]={ k=2, n="J 1.0" },

@@ Line 21: / Line 21: @@
 	["demo"]={ k=10, n="Demo" }
+}
 local data = {

@@ Line 121: / Line 121: @@
          local num = tostring(k):match('^' .. prefix .. '([1-9]%d*)$') --get param group the version is bound to
          if num then
-         	local verId = versions[args[k]:lower()].k
+         	local verId = GetVersionInfo(args[k]).k
          	table.insert(keys, verId);
          	tbl[verId] = tonumber(num) --key is sort order, value is row
@@ Line 211: / Line 211: @@
 	if args.name then
-		if args.space=='ram' or args.space=='rom' then
+		if args.space=='ram' or args.space=='rom' or args.space=='manual' then
 			caption:wikitext(args.name)
 			else
@@ Line 398: / Line 398: @@
 	for k, num in ipairs(rownums) do
 		local ref = args['ref' .. tostring(num)]
-		local version = versions[args['ver' .. tostring(num)]:lower()].n
+		local version = GetVersionInfo(args['ver' .. tostring(num)]).n
 		if ref and ref == 'manual' then
 			processRowManual(space,{
@@ Line 469: / Line 469: @@
      return _address()
 end
 return p

@@ Line 18: / Line 18: @@
 	["jp gc"]={ k=7, n="JP GC" },
 	["usa gc"]={ k=8, n="USA GC" },
-	["pal gc"]={ k=9, n="PAL GC" }
+	["pal gc"]={ k=9, n="PAL GC" },
+}

@@ Line 5: / Line 5: @@
 local yesno = require('Module:Yesno')
 local versions =
+{
-	["Debug"]={ k=1, n="Debug" },
+	["debug"]={ k=1, n="Debug" },
-	["J 1.0"]={ k=2, n="J 1.0" },
+	["j 1.0"]={ k=2, n="J 1.0" },
-	["J 1.1"]={ k=3, n="J 1.1" },
+	["j 1.1"]={ k=3, n="J 1.1" },
-	["U 1.0"]={ k=4, n="U 1.0" },
+	["u 1.0"]={ k=4, n="U 1.0" },
-	["NTSC J 1.0"]={ k=2, n="J 1.0" },
+	["ntsc-j 1.0"]={ k=2, n="J 1.0" },
-	["NTSC J 1.1"]={ k=3, n="J 1.1" },
+	["ntsc-j 1.1"]={ k=3, n="J 1.1" },
-	["NTSC U"]={ k=4, n="U 1.0" },
+	["ntsc-u"]={ k=4, n="U 1.0" },
-	["PAL 1.0"]={ k=5, n="PAL 1.0" },
+	["pal 1.0"]={ k=5, n="PAL 1.0" },
-	["PAL 1.1"]={ k=6, n="PAL 1.1" },
+	["pal 1.1"]={ k=6, n="PAL 1.1" },
-	["JP GC"]={ k=7, n="JP GC" },
+	["jp gc"]={ k=7, n="JP GC" },
-	["USA GC"]={ k=8, n="USA GC" },
+	["usa gc"]={ k=8, n="USA GC" },
-	["PAL GC"]={ k=9, n="PAL GC" }
+	["pal gc"]={ k=9, n="PAL GC" }
+}
@@ Line 38: / Line 37: @@
 			ram = { 0x800B6AC0, 0x802340C0 },
 			},
-		["NTSC-J 1.0"] = {
+		["J 1.0"] = {
 			rom = { 0xB5F000, 0xC9B6F0 },
 			ram = { 0x800A76A0, 0x801E3D90 },
 			},
-		["NTSC-J 1.1"] = {
+		["J 1.1"] = {
 			rom = { 0xB5F000, 0xC9BA60 },
 			ram = { 0x800A75E0, 0x801E4040 },
 			},
-		["NTSC-U"] = {
+		["U 1.0"] = {
 			rom = { 0xB3C000, 0xC7A4E0 },
 			ram = { 0x800A5AC0, 0x801E3FA0 },
@@ Line 77: / Line 76: @@
 			ram = { 0x80833ED0, 0x8086DA20 },
 			},
-		["NTSC-J 1.0"] = {
+		["J 1.0"] = {
 			rom = { 0xCC9A20, 0xCFE660 },
 			ram = { 0x8082E390, 0x808630F0 },
 			},
-		["NTSC-U"] = {
+		["U 1.0"] = {
 			rom = { 0xCA7F00, 0xCDCF60 },
 			ram = { 0x8082DA90, 0x80862B70 },
@@ Line 92: / Line 91: @@
 			ram = { 0x8081A0D0, 0x80833ED0 },
 			},
-		["NTSC-J 1.0"] = {
+		["J 1.0"] = {
 			rom = { 0xCB14B0, 0xCC9A20 },
 			ram = { 0x80815DE0, 0x8082E390 },
 			},
-		["NTSC-U"] = {
+		["U 1.0"] = {
 			rom = { 0xC90550, 0xCA7F00 },
 			ram = { 0x808160A0, 0x8082DA90 },
@@ Line 105: / Line 104: @@
 		display="[[Global Context]]", ram=true, rom=false, offset=true,
 		["Debug"] = { ram = { 0x80448700, 0x80448700+0x019268 }, },
-		["NTSC-J 1.0"] = 	{ ram = { 0x803E6CF0, 0x803E6CF0+0x019238 }, },
+		["J 1.0"] = 	{ ram = { 0x803E6CF0, 0x803E6CF0+0x019238 }, },
-		["NTSC-U"] = { ram = {0x803E6B20, 0x803E6B20+0x19258}, },
+		["U 1.0"] = { ram = {0x803E6B20, 0x803E6B20+0x19258}, },
 		},
+	}
@@ Line 470: / Line 469: @@
 end

@@ Line 39: / Line 39: @@
 	off = {
 		display="Offset", ram=false, rom=false, offset=true
 		},
 	code = {

@@ Line 6: / Line 6: @@
 local yesno = require('Module:Yesno')
-local versions = {
+local versions =
-	["Debug"]=1, ["NTSC-J 1.0"]=2, ["NTSC-J 1.1"]=3, ["NTSC-U"]=4,
-	["PAL 1.0"]=5, ["PAL 1.1"]=6, ["JP GC"]=7, ["USA GC"]=8, ["PAL GC"]=9
+	["Debug"]={ k=1, n="Debug" },
+	["J 1.0"]={ k=2, n="J 1.0" },
 local data = {
@@ Line 104: / Line 115: @@
      -- 'data1', 'data2', and 'data5' exist, it would return {1, 2, 5}.
      local prefix = 'ver'
      local nums = {}
-     for k, v in pairs(args) do
+     for k, v in pairs(args) do --keys, values in arguments
-         local num = tostring(k):match('^' .. prefix .. '([1-9]%d*)$')
+         local num = tostring(k):match('^' .. prefix .. '([1-9]%d*)$') --get param group the version is bound to
          if num then
-         	local index = versions[k]
+         	local verId = versions[args[k]:lower()].k
-         	table.insert(nums, tonumber(num)) end
+         	table.insert(keys, verId);
      end
      table.sort(nums)
      return nums
 end
@@ Line 257: / Line 277: @@
 local function renderRow(ver, off, rom, ram)
 	local row = root:tag('tr')
 	row :tag('td'):wikitext(ver)
@@ Line 296: / Line 319: @@
 	renderRow(rowArgs.ver, off,rom,ram)
 end
 local function processRow(spaceRef, rowArgs)
@@ Line 375: / Line 396: @@
 local function renderRows(space)
 	local rownums = getRowOrder()
 	for k, num in ipairs(rownums) do
 		local ref = args['ref' .. tostring(num)]
+		local version = versions[args['ver' .. tostring(num)]:lower()].n
 		if ref and ref == 'manual' then
 			processRowManual(space,{
-				ver = args['ver' .. tostring(num)],
+				ver = version,
 				offset = args['offset' .. tostring(num)],
 				['rom-start'] = args['rom-start' .. tostring(num)],
@@ Line 390: / Line 410: @@
 		else
 			processRow(space,{
-				ver = args['ver' .. tostring(num)],
+				ver = version,
 				ref = args['ref' .. tostring(num)],
 				start = args['start' .. tostring(num)],
@@ Line 427: / Line 447: @@
      preprocessSingleArg('hideoff')
      preprocessSingleArg('hideend')
      preprocessArgs({
      	{ prefix = 'ver'},
@@ Line 449: / Line 470: @@
 end

@@ Line 6: / Line 6: @@
 local yesno = require('Module:Yesno')
-local versions = { ["Debug"]=1, ["NTSC 1.0"]=2, ["NTSC 1.1"]=3, ["NTSC 1.2"]=4,
+local versions = { ["Debug"]=1, ["NTSC-J 1.0"]=2, ["NTSC-J 1.1"]=3, ["NTSC-U"]=4}
 local data = {
@@ Line 22: / Line 21: @@
 		display="[[Code (File)]]", ram=true, rom=true, offset=true,
 		["Debug"] = {
-			rom = { 0xA94000, 0xBCEF30 },
+			rom = { 0xC95000, 0xE12600 },
-			ram = { 0x8001CE60, 0x80157D90 },
+			ram = { 0x800B6AC0, 0x802340C0 },
 			},
-		["NTSC 1.0"] = {
+		["NTSC-J 1.0"] = {
-			rom = { 0xA87000, 0xB8AD30 },
+			rom = { 0xB5F000, 0xC9B6F0 },
-			ram = { 0x800110A0, 0x80114DD0 },
+			ram = { 0x800A76A0, 0x801E3D90 },
 			},
-		["NTSC 1.1"] = {
+		["NTSC-J 1.1"] = {
-			rom = { 0xA87000, 0xB8AEF0 },
+			rom = { 0xB5F000, 0xC9BA60 },
-			ram = { 0x800110A0, 0 },
+			ram = { 0x800A75E0, 0x801E4040 },
 			},
-		["NTSC 1.2"] = {
+		["NTSC-U"] = {
-			rom = { 0xA87000, 0xB8ADA0 },
+			rom = { 0xB3C000, 0xC7A4E0 },
-			ram = { 0x800116E0, 0x80103DA0 },
+			ram = { 0x800A5AC0, 0x801E3FA0 },
 			},
 		},
@@ Line 53: / Line 40: @@
 		display="[[ovl_player_actor|Link Actor]]", ram=true, rom=true, offset=true,
 		["Debug"] = {
-			rom = { 0xC010B0, 0xC27940 },
+			rom = { 0xE46460, 0xE7FF20 },
-			ram = { 0x80832210, 0x80858B70 },
+			ram = { 0x80833ED0, 0x8086DA20 },
 			},
-		["NTSC 1.0"] = {
+		["NTSC-J 1.0"] = {
-			rom = { 0xBCDB70, 0xBF40D0 },
+			rom = { 0xCC9A20, 0xCFE660 },
-			ram = { 0x808301C0, 0x808567F0 },
+			ram = { 0x8082E390, 0x808630F0 },
 			},
-		["PAL MQ"] = {
+		["NTSC-U"] = {
-			rom = { 0xBB8E30, 0xBDF540 },
+			rom = { 0xCA7F00, 0xCDCF60 },
-			ram = { 0x8082EC90, 0x80855470 },
+			ram = { 0x8082DA90, 0x80862B70 },
 			},
 		},
@@ Line 68: / Line 55: @@
 		display="[[ovl_kaleido_scope|Pause Screen]]", ram=true, rom=true, offset=true,
 		["Debug"] = {
-			rom = { 0xBE2730, 0xC010B0 },
+			rom = { 0xE2C6A0, 0xE46460 },
-			ram = { 0x80813820, 0x80832210 },
+			ram = { 0x8081A0D0, 0x80833ED0 },
 			},
-		["NTSC 1.0"] = {
+		["NTSC-J 1.0"] = {
-			rom = { 0xBB11E0, 0xBCDB70 },
+			rom = { 0xCB14B0, 0xCC9A20 },
-			ram = { 0x808137C0, 0x808301C0 },
+			ram = { 0x80815DE0, 0x8082E390 },
 			},
-		["PAL MQ"] = {
+		["NTSC-U"] = {
-			rom = { 0xB9C470, 0xBB8E30 },
+			rom = { 0xC90550, 0xCA7F00 },
-			ram = { 0x80812260, 0x8082EC90 },
+			ram = { 0x808160A0, 0x8082DA90 },
 			},
 		},
@@ Line 83: / Line 70: @@
+	{
 		display="[[Global Context]]", ram=true, rom=false, offset=true,
-		["Debug"] = { ram = { 0x80212020, 0x80212020+0x012518 }, },
+		["Debug"] = { ram = { 0x80448700, 0x80448700+0x019268 }, },
-		["NTSC 1.0"] = 	{ ram = { 0x801C84A0, 0x801C84A0+0x012518 }, },
+		["NTSC-J 1.0"] = 	{ ram = { 0x803E6CF0, 0x803E6CF0+0x019238 }, },
-		["PAL MQ"] = { ram = {0x0, 0x12518}, },
+		["NTSC-U"] = { ram = {0x803E6B20, 0x803E6B20+0x19258}, },
 		},
+	}