From 5e684e6aeba01e7fafeb47f48551d1a88d0f7f5e Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Wed, 13 Jan 2016 09:33:41 -0800 Subject: [PATCH] remove m64p stuff for now; it's too broken --- Lua/README.md | 5 +---- Lua/m64p entry.lua | 52 ---------------------------------------------- 2 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 Lua/m64p entry.lua diff --git a/Lua/README.md b/Lua/README.md index 5138bf5..a94d10d 100644 --- a/Lua/README.md +++ b/Lua/README.md @@ -1,12 +1,9 @@ # Zelda 64 Lua Scripts These are written for -[the latest revision of Bizhawk,][biz] -but some compatiblity is provided for -[a fork of mupen64plus with Lua support.][m64p-lua] +[the latest revision of Bizhawk.][biz] [biz]: https://github.com/TASVideos/bizhawk/ -[m64p-lua]: https://github.com/notwa/mupen64plus-core Note that some scripts lack full support for Ocarina of Time. diff --git a/Lua/m64p entry.lua b/Lua/m64p entry.lua deleted file mode 100644 index 0cc7305..0000000 --- a/Lua/m64p entry.lua +++ /dev/null @@ -1,52 +0,0 @@ -print() -package.path = package.path..';./mm/Lua/?.lua' -require = require "depend" -require "boilerplate" - -local function once() - require "addrs" - print(m64p.rom.settings.MD5, version) -end - ---[[ -80000000 to 80800000 RDRAM -90000000 to 92000000 probably ROM -A0000000 to A0800000 RDRAM mirror? -A3F00000 to A4000000 RDRAM registers -A4000000 to A4900000? -B0000000 to B2000000 ROM mirror? ---]] - -local oldbutts = 0 -local function main() - local butts = addrs.buttons() - if butts & 0x0020 > oldbutts & 0x0020 then -- L button - local ok, err = pcall(dofile, 'mm/Lua/inject.lua') - if not ok then print(err) end - end - oldbutts = butts -end - -local vi_count = 0 ---local lastvf = 0 -local function vi_callback() - vi_count = vi_count + 1 - if vi_count == 1 then - once() - end - if vi_count <= 1 then - return - end - --local vf = addrs.visual_frame() - --if vf > lastvf then - if true then - local ok, err = pcall(main) - if not ok then - print(err) - m64p:unregisterCallback('vi', vi_callback) - return - end - end - --lastvf = vf -end -m64p:registerCallback('vi', vi_callback)