Added some backwards compatible lua functions. Cleaned some lua stuff up, added documentation on lua changes to the help file.

This commit is contained in:
adelikat 2009-10-11 21:11:30 +00:00
parent 3cabff32c6
commit 888febcd19
3 changed files with 41 additions and 12 deletions

View File

@ -17,9 +17,8 @@ local KaiserKOFlag = 0x004B -- Setting this to 0 disables his ability to be stun
local OppDodgeStar = 0x0348 -- Counter for how many unstunned stars before the opponent starts to dodge local OppDodgeStar = 0x0348 -- Counter for how many unstunned stars before the opponent starts to dodge
local OpponentIDA = 0x0031 local OpponentIDA = 0x0031
local OPpoenentID = 0 --Stores contents of OpponentIDA local OpponentID = 0 --Stores contents of OpponentIDA
local AltOppIDAddress = 0x0330 --Alternate flag for determining the opponent, 5 = Kaiser, 3 = Flamenco
local OppIDAlt
--Oppenent ID Table --Oppenent ID Table
--Round 1, R2, R3 --Round 1, R2, R3
--36,47,64, 66 Glass Joe 47 = After round 1 Jump back begins --36,47,64, 66 Glass Joe 47 = After round 1 Jump back begins
@ -37,6 +36,28 @@ local OppIDAlt
--105 Super Macho Man --105 Super Macho Man
--34 Mike Tyson (Mr. Dream) --34 Mike Tyson (Mr. Dream)
local AltOppIDAddress = 0x0330 --Alternate flag for determining the opponent
--0 = Kaiser R2, PistonI R1 R2 R3
--1 = Tiger R1
--2 = Don I R2, Don I R3
--3 = Don I R1
--4 = Tyson R1
--5 = Glass Joe R3, Von R1, Von R3, Soda R1
--6 = Piston II R1
--7 = Bull I R1, BullI R1, Sandman R1, Macho R1
--9 = Glass R1, Glass R2, KHippo RI & Don II
local OppIDAlt --stores the contents of 0x0330
local EHP = 0x0398 -- Enemy HP address local EHP = 0x0398 -- Enemy HP address
local EHPx= 178 local EHPx= 178
local EHPy= 14 local EHPy= 14
@ -174,6 +195,9 @@ while true do
end end
--*************************************** --***************************************
----------------------------------------------------------------------------------------------------
----------------------------------------------------------------------------------------------------
--*************************************** --***************************************
--Glass Joe custom mods --Glass Joe custom mods
@ -229,10 +253,10 @@ while true do
if OpponentID == 52 then --Round 1 only if OpponentID == 52 then --Round 1 only
if Timer1 == 0 and Timer2 == 0 then if Timer1 == 0 and Timer2 == 0 then
EMod = 128 EMod = 128
end
end end
if OpponentID == 52 or OpponentID == 62 or OpponentID == 66 then --All rounds end
gui.text(10,10,"King Hippo") if OpponentID == 52 or OpponentID == 62 or OpponentID == 66 then --All rounds
gui.text(10,10,"King Hippo")
if OppJustHit and OppHitToDisplay < 4 and OppHitToDisplay > 0 and EnemyHP > 1 then if OppJustHit and OppHitToDisplay < 4 and OppHitToDisplay > 0 and EnemyHP > 1 then
EMod = EnemyHP + 2 EMod = EnemyHP + 2
end end
@ -242,9 +266,11 @@ while true do
--*************************************** --***************************************
--Great Tiger custom mods --Great Tiger custom mods
--*************************************** --***************************************
if OppIDAlt == 3 then
gui.text(10,10,"Great Tiger")
end
if OpponentID == 230 then --Round 1 Tiger punch only if OpponentID == 230 then --Round 1 Tiger punch only
gui.text(10,10,"Great Tiger") IsTigerDizzy = memory.readbyte(DizzyFlag)
IsTigerDizzy = memory.readbyte(DizzyFlag)
if IsTigerDizzy > 0 then if IsTigerDizzy > 0 then
memory.writebyte(DizzyFlag, 0) memory.writebyte(DizzyFlag, 0)
end end
@ -296,7 +322,8 @@ while true do
--Mike Tyson --Mike Tyson
--*************************************** --***************************************
--*************************************** ----------------------------------------------------------------------------------------------------
----------------------------------------------------------------------------------------------------
FCEU.frameadvance() FCEU.frameadvance()
if EMod > 0 then if EMod > 0 then
memory.writebyte(EHP, EMod) memory.writebyte(EHP, EMod)

View File

@ -2461,6 +2461,8 @@ static const struct luaL_reg emulib [] = {
{"registerbefore", emu_registerbefore}, {"registerbefore", emu_registerbefore},
{"registerafter", emu_registerafter}, {"registerafter", emu_registerafter},
{"registerexit", emu_registerexit}, {"registerexit", emu_registerexit},
{"readonly", movie_getreadonly},
{"setreadonly", movie_setreadonly},
{NULL,NULL} {NULL,NULL}
}; };
@ -2478,12 +2480,12 @@ static const struct luaL_reg memorylib [] = {
{"readbyte", memory_readbyte}, {"readbyte", memory_readbyte},
{"readbyterange", memory_readbyterange}, {"readbyterange", memory_readbyterange},
{"readbytesigned", memory_readbytesigned}, {"readbytesigned", memory_readbytesigned},
// alternate naming scheme for unsigned
{"readbyteunsigned", memory_readbyte},
{"writebyte", memory_writebyte}, {"writebyte", memory_writebyte},
{"getregister", memory_getregister}, {"getregister", memory_getregister},
{"setregister", memory_setregister}, {"setregister", memory_setregister},
// alternate naming scheme for unsigned
{"readbyteunsigned", memory_readbyte},
// memory hooks // memory hooks
{"registerwrite", memory_registerwrite}, {"registerwrite", memory_registerwrite},
//{"registerread", memory_registerread}, TODO //{"registerread", memory_registerread}, TODO

Binary file not shown.