diff --git a/Items/book_of_secrets.asm b/Items/book_of_secrets.asm index d34ae1b..a095e15 100644 --- a/Items/book_of_secrets.asm +++ b/Items/book_of_secrets.asm @@ -52,7 +52,6 @@ Dungeon_RevealSecrets: ; Check if we are in a building LDA $1B : AND #$01 : BEQ .end - ; ---------- ; Check if we have the book of secrets LDA $7EF34D : CMP #$01 : BNE $0F ; if not, go to enable BG2 @@ -68,7 +67,6 @@ Dungeon_RevealSecrets: ; enable BG2 (0x02 = 00000010) LDA $1C : ORA #$02 : STA $1C - ; ---------- .end ; @ $068365, JSL $099F91 old hook diff --git a/Items/portal_rod.asm b/Items/portal_rod.asm index de94ef2..02cd5c0 100644 --- a/Items/portal_rod.asm +++ b/Items/portal_rod.asm @@ -228,84 +228,52 @@ pushpc ; Ancilla_PortalShot: ; { ; LDA $0C54, X : BEQ .traveling_shot - ; JMP Ancilla_ConsumingFire - ; .traveling_shot - ; LDA $11 : BNE .just_draw - ; STZ $0385, X - ; JSR Ancilla_MoveHoriz ; JSR Ancilla_MoveVert - ; JSR Ancilla_CheckSpriteCollision : BCS .collided ; LDA $0C72, X : ORA.b #$08 : STA $0C72, X - ; JSR Ancilla_CheckTileCollision - ; PHP - ; LDA $03E4, X : STA $0385, X - ; PLP : BCS .collided - ; LDA $0C72, X : ORA.b #$0C : STA $0C72, X - ; LDA $028A, X : STA $74 - ; JSR Ancilla_CheckTileCollision - ; PHP - ; LDA $74 : STA $028A, X - ; PLP : BCC .no_collision - ; .collided - ; INC $0C54, X - ; ; Check if it's blue or orange portal ; LDA $0C68, X ; CMP.b #$1F ; BEQ .blue_portal ; JMP .orange_portal - ; .blue_portal ; LDA.b #$20 : STA $0C68, X ; LDA.b #$08 : STA $0C90, X ; LDA.b #$2B : JSR Ancilla_DoSfx2 ; Different sound effect for blue portal ; JMP .portal_created - ; .orange_portal ; LDA.b #$21 : STA $0C68, X ; LDA.b #$08 : STA $0C90, X ; LDA.b #$2C : JSR Ancilla_DoSfx2 ; Different sound effect for orange portal - ; .portal_created ; ; CLC : ADC portal creation logic here if necessary - ; .no_collision - ; INC $0C5E, X - ; LDA $0C72, X : AND.b #$F3 : STA $0C72, X - ; LDA $0385, X : STA $0333 - ; AND.b #$F0 : CMP.b #$C0 : BNE .just_draw - ; LDA $03E4, X : STA $0333 - ; AND.b #$F0 : CMP.b #$C0 : BNE .just_draw - ; .just_draw - ; JSR PortalShot_Draw - ; RTS ; } @@ -313,56 +281,34 @@ pushpc ; PortalShot_Draw: ; { ; JSR Ancilla_BoundsCheck - ; LDA $0280, X : BEQ .default_priority - ; LDA.b #$30 : TSB $04 - ; .default_priority - ; LDA $0C5E, X : AND.b #$0C : STA $02 - ; PHX - ; LDX.b #$02 ; LDY.b #$00 - ; .next_oam_entry - ; STX $03 - ; TXA : ORA $02 : TAX - ; LDA $00 : CLC : ADC .x_offsets, X : STA ($90), Y ; LDA $01 : CLC : ADC .y_offsets, X : INY : STA ($90), Y - ; LDX $03 - ; LDA .chr, X : INY : STA ($90), Y ; LDA $04 : ORA.b #$02 : INY : STA ($90), Y - ; PHY - ; TYA : LSR #2 : TAY - ; LDA.b #$00 : STA ($92), Y - ; PLY : INY - ; DEX : BPL .next_oam_entry - ; PLX - ; RTS - ; .x_offsets ; db 7, 0, 8, 0, 8, 4, 0, 0 ; db 2, 8, 0, 0, 1, 4, 9, 0 - ; .y_offsets ; db 1, 4, 9, 0, 7, 0, 8, 0 ; db 8, 4, 0, 0, 2, 8, 0, 0 - ; .chr ; db $8D, $9D, $9C ; }