diff --git a/roomloading.asm b/roomloading.asm index 9dfc4ba..063f06f 100644 --- a/roomloading.asm +++ b/roomloading.asm @@ -62,12 +62,15 @@ macro DrawBombosPlatform(roomX, roomY, quadX, quadY) endMacro IcePalaceBombosSE: + LDA AllowSwordlessMedallionUse : BNE + : RTL : + %DrawBombosPlatform(14, 18, 1, 1) RTL IcePalaceBombosSW: + LDA AllowSwordlessMedallionUse : BNE + : RTL : + %DrawBombosPlatform(14, 18, 0, 1) RTL IcePalaceBombosNE: + LDA AllowSwordlessMedallionUse : BNE + : RTL : + %DrawBombosPlatform(14, 18, 1, 0) RTL diff --git a/swordswap.asm b/swordswap.asm index bfea2da..24ddf82 100644 --- a/swordswap.asm +++ b/swordswap.asm @@ -120,7 +120,7 @@ GetSmithSword: ;================================================================================ CheckMedallionSword: PHB : PHX : PHY - LDA.l AllowSwordlessEntranceMedallion : BNE +++ : BRL + : +++ + LDA.l AllowSwordlessMedallionUse : BNE +++ : BRL + : +++ LDA $1B : BEQ .outdoors .indoors REP #$20 ; set 16-bit accumulator diff --git a/tables.asm b/tables.asm index a005e0f..7ea2440 100644 --- a/tables.asm +++ b/tables.asm @@ -156,8 +156,8 @@ PreopenCurtains: db #$00 ; #$00 = Off (default) - #$01 = On ;-------------------------------------------------------------------------------- org $308041 ; PC 0x180041 -AllowSwordlessEntranceMedallion: -db #$00 ; #$00 = Off (default) - #$01 = On +AllowSwordlessMedallionUse: +db #$00 ; #$00 = Off (default) - #$01 = Medallion Pads - #$02 = Always (Not Implemented) ;-------------------------------------------------------------------------------- org $308042 ; PC 0x180042 PermitSQFromBosses: