monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pokemon Red and Blue: lua updates (#1216)

This commit is contained in:
Alchav 2022-11-09 09:15:16 -05:00 committed by GitHub
parent 63c0d027e7
commit 350e1e6287
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
data/lua/PKMN_RB/pkmn_rb.lua
View File

@ -28,22 +28,9 @@ local u8 = nil
local wU8 = nil local wU8 = nil
local u16 local u16
--Sets correct memory access functions based on whether NesHawk or QuickNES is loaded
local function defineMemoryFunctions() local function defineMemoryFunctions()
local memDomain = {} local memDomain = {}
local domains = memory.getmemorydomainlist() local domains = memory.getmemorydomainlist()
--if domains[1] == "System Bus" then
-- --NesHawk
-- isNesHawk = true
-- memDomain["systembus"] = function() memory.usememorydomain("System Bus") end
-- memDomain["saveram"] = function() memory.usememorydomain("Battery RAM") end
-- memDomain["rom"] = function() memory.usememorydomain("PRG ROM") end
--elseif domains[1] == "WRAM" then
-- --QuickNES
-- memDomain["systembus"] = function() memory.usememorydomain("System Bus") end
-- memDomain["saveram"] = function() memory.usememorydomain("WRAM") end
-- memDomain["rom"] = function() memory.usememorydomain("PRG ROM") end
--end
memDomain["rom"] = function() memory.usememorydomain("ROM") end memDomain["rom"] = function() memory.usememorydomain("ROM") end
memDomain["wram"] = function() memory.usememorydomain("WRAM") end memDomain["wram"] = function() memory.usememorydomain("WRAM") end
return memDomain return memDomain
@ -148,7 +135,7 @@ function receive()
curstate = STATE_UNINITIALIZED curstate = STATE_UNINITIALIZED
return return
elseif e == 'timeout' then elseif e == 'timeout' then
--print("timeout") -- this keeps happening for some reason? just hide it print("timeout")
return return
elseif e ~= nil then elseif e ~= nil then
print(e) print(e)
@ -200,14 +187,15 @@ function main()
server, error = socket.bind('localhost', 17242) server, error = socket.bind('localhost', 17242)
while true do while true do
frame = frame + 1
if not (curstate == prevstate) then if not (curstate == prevstate) then
print("Current state: "..curstate) print("Current state: "..curstate)
prevstate = curstate prevstate = curstate
end end
if (curstate == STATE_OK) or (curstate == STATE_INITIAL_CONNECTION_MADE) or (curstate == STATE_TENTATIVELY_CONNECTED) then if (curstate == STATE_OK) or (curstate == STATE_INITIAL_CONNECTION_MADE) or (curstate == STATE_TENTATIVELY_CONNECTED) then
if (frame % 60 == 0) then if (frame % 5 == 0) then
receive() receive()
if u8(InGame) == 0xAC then if u8(InGame) == 0xAC and u8(APItemAddress) == 0x00 then
ItemIndex = u16(APIndex) ItemIndex = u16(APIndex)
if ItemsReceived[ItemIndex + 1] ~= nil then if ItemsReceived[ItemIndex + 1] ~= nil then
wU8(APItemAddress, ItemsReceived[ItemIndex + 1] - 172000000) wU8(APItemAddress, ItemsReceived[ItemIndex + 1] - 172000000)