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

Misc housekeeping

Browse Source
This commit is contained in:
scawful
2024-11-10 18:49:20 -05:00
parent 6044a92a3a
commit 75238da73d
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Items/book_of_secrets.asm
View File

@@ -3,8 +3,9 @@
; Makes BG2 Disappear when holding L in a building ; Makes BG2 Disappear when holding L in a building
; Based on the Parallel Worlds feature ; Based on the Parallel Worlds feature
; ;
; Layer Flags: xxxsabcd (i count BG from 1 to 4 - MathOnNapkins RAM-Map counts from 0 to 3) ; Layer Flags: xxxsabcd
; s - Sprite layer enabled ; (i count BG from 1 to 4 - MathOnNapkins RAM-Map counts from 0 to 3)
; s - Sprite layer enabled
; a - BG4 enabled ; a - BG4 enabled
; b - BG3 enabled ; b - BG3 enabled
; c - BG2 enabled ; c - BG2 enabled
@@ -15,7 +16,7 @@
; ========================================================= ; =========================================================
; long subroutine that is executed every frame ; long subroutine that is executed every frame
org $068365 org $068365
JSL LinkItem_SecretsBook ; overwrite it (originally JSL $099F91) JSL LinkItem_SecretsBook ; overwrite it (originally JSL $099F91)
; ========================================================= ; =========================================================
@@ -33,20 +34,20 @@ LinkItem_SecretsBook:
; load unfiltered joypad 1 register (AXLR|????) ; load unfiltered joypad 1 register (AXLR|????)
; delete all bits except those for L ; delete all bits except those for L
LDA $F2 : AND #$20 LDA $F2 : AND #$20
; L button pressed? (if yes, zero flag is set) ; L button pressed? (if yes, zero flag is set)
SEC : SBC #$20 : BNE $06 ; if not, go to enable BG2 SEC : SBC #$20 : BNE $06 ; if not, go to enable BG2
; load layer flags and disable BG2 (0xFD = 11111101) ; load layer flags and disable BG2 (0xFD = 11111101)
LDA $1C : AND #$FD : BRA $04 ; go to store layer flags LDA $1C : AND #$FD : BRA $04 ; go to store layer flags
; enable BG2 (0x02 = 00000010) ; enable BG2 (0x02 = 00000010)
LDA $1C : ORA #$02 : STA $1C LDA $1C : ORA #$02 : STA $1C
; ---------- ; ----------
.end .end
JSL $099F91 ; at least execute original code JSL $099F91
RTL RTL
} }

1
Oracle_main.asm
View File

@@ -33,7 +33,6 @@
; Glacia Estate 0x12 (Ice Palace) ; Glacia Estate 0x12 (Ice Palace)
; Goron Mines 0x0E (Misery Mire) ; Goron Mines 0x0E (Misery Mire)
; Dragon Ship 0x18 (Turtle Rock) ; Dragon Ship 0x18 (Turtle Rock)
; ========================================================= ; =========================================================
; ZSCustomOverworld version ; ZSCustomOverworld version