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

let's dev 1/5/18

Browse Source 
added condition to only display medallion pads when active
This commit is contained in:
Karkat
2018-01-05 23:26:15 -05:00
parent 4868a003de
commit d233a5d516
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roomloading.asm
View File

@@ -62,12 +62,15 @@ macro DrawBombosPlatform(roomX, roomY, quadX, quadY)
endMacro endMacro
IcePalaceBombosSE: IcePalaceBombosSE:
LDA AllowSwordlessMedallionUse : BNE + : RTL : +
%DrawBombosPlatform(14, 18, 1, 1) %DrawBombosPlatform(14, 18, 1, 1)
RTL RTL
IcePalaceBombosSW: IcePalaceBombosSW:
LDA AllowSwordlessMedallionUse : BNE + : RTL : +
%DrawBombosPlatform(14, 18, 0, 1) %DrawBombosPlatform(14, 18, 0, 1)
RTL RTL
IcePalaceBombosNE: IcePalaceBombosNE:
LDA AllowSwordlessMedallionUse : BNE + : RTL : +
%DrawBombosPlatform(14, 18, 1, 0) %DrawBombosPlatform(14, 18, 1, 0)
RTL RTL

2
swordswap.asm
View File

@@ -120,7 +120,7 @@ GetSmithSword:
;================================================================================ ;================================================================================
CheckMedallionSword: CheckMedallionSword:
PHB : PHX : PHY PHB : PHX : PHY
LDA.l AllowSwordlessEntranceMedallion : BNE +++ : BRL + : +++ LDA.l AllowSwordlessMedallionUse : BNE +++ : BRL + : +++
LDA $1B : BEQ .outdoors LDA $1B : BEQ .outdoors
.indoors .indoors
REP #$20 ; set 16-bit accumulator REP #$20 ; set 16-bit accumulator

4
tables.asm
View File

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