alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Merge pull request #135 from ardnaxelarak/medallion

Browse Source 
Implement always-allowed medallions
This commit is contained in:
KatDevsGames
2021-07-06 17:44:41 -05:00
committed by GitHub
parent 5d7bfde194 3548a0bbf5
commit 6f2383fafe
3 changed files with 74 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roomloading.asm
View File

@@ -71,15 +71,15 @@ macro DrawBombosPlatform(roomX, roomY, quadX, quadY)
endMacro endMacro
IcePalaceBombosSE: IcePalaceBombosSE:
LDA AllowSwordlessMedallionUse : BNE + : RTL : + LDA AllowSwordlessMedallionUse : CMP #$01 : BEQ + : RTL : +
%DrawBombosPlatform(14, 18, 1, 1) %DrawBombosPlatform(14, 18, 1, 1)
RTL RTL
IcePalaceBombosSW: IcePalaceBombosSW:
LDA AllowSwordlessMedallionUse : BNE + : RTL : + LDA AllowSwordlessMedallionUse : CMP #$01 : BEQ + : RTL : +
%DrawBombosPlatform(14, 18, 0, 1) %DrawBombosPlatform(14, 18, 0, 1)
RTL RTL
IcePalaceBombosNE: IcePalaceBombosNE:
LDA AllowSwordlessMedallionUse : BNE + : RTL : + LDA AllowSwordlessMedallionUse : CMP #$01 : BEQ + : RTL : +
%DrawBombosPlatform(14, 18, 1, 0) %DrawBombosPlatform(14, 18, 1, 0)
RTL RTL

58
swordswap.asm
View File

@@ -165,42 +165,60 @@ GetSmithSword:
JML.l Smithy_AlreadyGotSword JML.l Smithy_AlreadyGotSword
;================================================================================ ;================================================================================
CheckMedallionSword: CheckMedallionSword:
LDA.l AllowSwordlessMedallionUse : BEQ .check_sword
CMP #$01 : BEQ .check_pad
LDA.b #$02 ; Pretend we have master sword
RTL
.check_sword
LDA $7EF359
RTL
.check_pad
PHB : PHX : PHY PHB : PHX : PHY
LDA.l AllowSwordlessMedallionUse : BNE +++ : JMP + : +++
LDA $1B : BEQ .outdoors LDA $1B : BEQ .outdoors
.indoors .indoors
REP #$20 ; set 16-bit accumulator REP #$20 ; set 16-bit accumulator
LDA $A0 ; load room ID LDA $A0 ; load room ID
CMP.w #$000E : BNE ++ : .freezor1 CMP.w #$000E : BNE + ; freezor1
LDA $22 : AND.w #$01FF : CMP.w #368-8 : !BLT .normal : CMP.w #368+32-8 : !BGE .normal ; check x-coord LDA $22 : AND.w #$01FF ; check x-coord
LDA $20 : AND.w #$01FF : CMP.w #400-22 : !BLT .normal : CMP.w #400+32-22 : !BGE .normal ; check y-coord CMP.w #368-8 : !BLT .normal
CMP.w #368+32-8 : !BGE .normal
LDA $20 : AND.w #$01FF ; check y-coord
CMP.w #400-22 : !BLT .normal
CMP.w #400+32-22 : !BGE .normal
JMP .permit JMP .permit
++ : CMP.w #$007E : BNE ++ : .freezor2 + : CMP.w #$007E : BNE + ; freezor2
LDA $22 : AND.w #$01FF : CMP.w #112-8 : !BLT .normal : CMP.w #112+32-8 : !BGE .normal ; check x-coord LDA $22 : AND.w #$01FF ; check x-coord
LDA $20 : AND.w #$01FF : CMP.w #400-22 : !BLT .normal : CMP.w #400+32-22 : !BGE .normal ; check y-coord CMP.w #112-8 : !BLT .normal
CMP.w #112+32-8 : !BGE .normal
LDA $20 : AND.w #$01FF ; check y-coord
CMP.w #400-22 : !BLT .normal
CMP.w #400+32-22 : !BGE .normal
JMP .permit JMP .permit
++ : CMP.w #$00DE : BNE ++ : .kholdstare + : CMP.w #$00DE : BNE + ; kholdstare
LDA $22 : AND.w #$01FF : CMP.w #368-8 : !BLT .normal : CMP.w #368+32-8 : !BGE .normal ; check x-coord LDA $22 : AND.w #$01FF ; check x-coord
LDA $20 : AND.w #$01FF : CMP.w #144-22 : !BLT .normal : CMP.w #144+32-22 : !BGE .normal ; check y-coord CMP.w #368-8 : !BLT .normal
CMP.w #368+32-8 : !BGE .normal
LDA $20 : AND.w #$01FF ; check y-coord
CMP.w #144-22 : !BLT .normal
CMP.w #144+32-22 : !BGE .normal
BRA .permit BRA .permit
++ : .normal + : .normal
SEP #$20 ; set 8-bit accumulator SEP #$20 ; set 8-bit accumulator
BRA .done BRA .done
.outdoors .outdoors
LDA $8A : CMP.b #$70 : BNE ++ LDA $8A : CMP.b #$70 : BNE +
LDA.l MireRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP $0303 : BNE + LDA.l MireRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP $0303 : BNE .done
LDA $7EF2F0 : AND.b #$20 : BNE + LDA $7EF2F0 : AND.b #$20 : BNE .done
LDA.b #$08 : PHA : PLB ; set data bank to $08 LDA.b #$08 : PHA : PLB ; set data bank to $08
LDY.b #$02 : JSL.l Ancilla_CheckIfEntranceTriggered : BCS .permit ; misery mire LDY.b #$02 : JSL.l Ancilla_CheckIfEntranceTriggered : BCS .permit ; misery mire
BRA + BRA .done
++ : CMP.b #$47 : BNE ++ + : CMP.b #$47 : BNE +
LDA.l TRockRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP $0303 : BNE + LDA.l TRockRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP $0303 : BNE .done
LDA $7EF2C7 : AND.b #$20 : BNE + LDA $7EF2C7 : AND.b #$20 : BNE .done
LDA.b #$08 : PHA : PLB ; set data bank to $08 LDA.b #$08 : PHA : PLB ; set data bank to $08
LDY.b #$03 : JSL.l Ancilla_CheckIfEntranceTriggered : BCS .permit ; turtle rock LDY.b #$03 : JSL.l Ancilla_CheckIfEntranceTriggered : BCS .permit ; turtle rock
++
.done
+ +
.done
PLY : PLX : PLB PLY : PLX : PLB
LDA $7EF359 LDA $7EF359
RTL RTL

2
tables.asm
View File

@@ -167,7 +167,7 @@ db #$00 ; #$00 = Off (default) - #$01 = On
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $308041 ; PC 0x180041 org $308041 ; PC 0x180041
AllowSwordlessMedallionUse: AllowSwordlessMedallionUse:
db #$00 ; #$00 = Off (default) - #$01 = Medallion Pads - #$02 = Always (Not Implemented) db #$00 ; #$00 = Off (default) - #$01 = Medallion Pads - #$02 = Always
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $308042 ; PC 0x180042 org $308042 ; PC 0x180042
PermitSQFromBosses: PermitSQFromBosses: