scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add support for ring slot 2 and 3

Browse Source
This commit is contained in:
scawful
2024-07-10 22:09:16 -04:00
parent 6c287598b9
commit 1e203c2cd0
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Items/magic_rings.asm
View File

@@ -24,6 +24,8 @@ RingSlot3 = $7EF38E
MagicRing_CheckForSteadfast: MagicRing_CheckForSteadfast:
{ {
LDA.l RingSlot1 : AND.b #$07 : BEQ + LDA.l RingSlot1 : AND.b #$07 : BEQ +
LDA.l RingSlot2 : AND.b #$07 : BEQ +
LDA.l RingSlot3 : AND.b #$07 : BEQ +
STZ.b LinkRecoilX STZ.b LinkRecoilX
STZ.b LinkRecoilY STZ.b LinkRecoilY
+ +
@@ -46,6 +48,8 @@ MagicRing_CheckForLight:
{ {
PHA PHA
LDA.l RingSlot1 : AND.b #$05 : BEQ + LDA.l RingSlot1 : AND.b #$05 : BEQ +
LDA.l RingSlot2 : AND.b #$05 : BEQ +
LDA.l RingSlot3 : AND.b #$05 : BEQ +
PLA PLA
SEC SEC
SBC.b #$10 SBC.b #$10
@@ -69,6 +73,8 @@ MagicRing_CheckForBlast:
{ {
CPX #$07 : BNE + CPX #$07 : BNE +
LDA.l RingSlot1 : AND.b #$06 : BEQ + LDA.l RingSlot1 : AND.b #$06 : BEQ +
LDA.l RingSlot2 : AND.b #$06 : BEQ +
LDA.l RingSlot3 : AND.b #$06 : BEQ +
LDA.b #$0D LDA.b #$0D
RTL RTL
+ +
@@ -89,6 +95,8 @@ pullpc
MagicRings_CheckForHeart: MagicRings_CheckForHeart:
{ {
LDA.l RingSlot1 : AND.b #$04 : BEQ ++ LDA.l RingSlot1 : AND.b #$04 : BEQ ++
LDA.l RingSlot2 : AND.b #$04 : BEQ ++
LDA.l RingSlot3 : AND.b #$04 : BEQ ++
LDA.l CURHP : CMP.l MAXHP : BCS ++ LDA.l CURHP : CMP.l MAXHP : BCS ++
LDA.l FrameCounter : LSR #2 : AND.b #$3F : BEQ + LDA.l FrameCounter : LSR #2 : AND.b #$3F : BEQ +
JMP ++ JMP ++