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

add beta release macro to L+R all items

Browse Source
This commit is contained in:
scawful
2024-02-24 09:55:50 -05:00
parent e6fb394ee8
commit 95cfdb9059
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Dungeons/house_tag.asm
View File

@@ -10,7 +10,6 @@ org $01CC18 ; override routine 0x39 "Holes(7)"
org $01CC5A org $01CC5A
HouseTag_Return: HouseTag_Return:
; org $2F8000
pullpc pullpc
HouseTag: HouseTag:
{ {
@@ -41,6 +40,8 @@ HouseTag_Main:
HouseTag_TelepathicPlea: HouseTag_TelepathicPlea:
{ {
LDA #$06 : STA $7EE000 ; Set the time to 6:00am
; ------------------------------- ; -------------------------------
; Set Link's coordinates to this specific position. ; Set Link's coordinates to this specific position.
LDA.b #$40 : STA $0FC2 LDA.b #$40 : STA $0FC2
@@ -63,7 +64,7 @@ HouseTag_WakeUpPlayer:
{ {
; Lighten the screen gradually and then wake Link up partially ; Lighten the screen gradually and then wake Link up partially
LDA $1A : AND.b #$03 : BNE .delay LDA $1A : AND.b #$03 : BNE .delay
LDA $9C : CMP.b #$20 : BEQ .colorTargetReached LDA $9C : CMP.b #$00 : BEQ .colorTargetReached
DEC $9C : DEC $9D DEC $9C : DEC $9D

1
Dungeons/together_warp_tag.asm
View File

@@ -24,7 +24,6 @@ org $01CC5A
; ============================================================================== ; ==============================================================================
; org $338000
pullpc ; Bank 0x2C pullpc ; Bank 0x2C
print "Warp Tag", pc print "Warp Tag", pc
WarpTag: WarpTag:

8
Util/all_items.asm
View File

@@ -53,6 +53,8 @@ lorom
!Crystals = $7EF37A !Crystals = $7EF37A
!MagicUsage = $7EF37B !MagicUsage = $7EF37B
!BetaRelease = $01
org $068365 org $068365
JSL $3CA62A ; Overwrite JSL executed every frame JSL $3CA62A ; Overwrite JSL executed every frame
@@ -60,6 +62,7 @@ org $3CA62A ; Expanded space for our routine
{ {
LDA $F2 : CMP #$30 : BEQ $03 : JMP END ; Check L and R button LDA $F2 : CMP #$30 : BEQ $03 : JMP END ; Check L and R button
if !BetaRelease = 0
; 0 - nothing. 1 - bow w/ no arrows. 2 - bow w/ arrows. 3 - silver arrows ; 0 - nothing. 1 - bow w/ no arrows. 2 - bow w/ arrows. 3 - silver arrows
LDA #$02 : STA !Bow LDA #$02 : STA !Bow
@@ -133,8 +136,6 @@ org $3CA62A ; Expanded space for our routine
LDA #$E7 : STA !Rupees LDA #$E7 : STA !Rupees
LDA #$03 : STA !RupeesGoal LDA #$03 : STA !RupeesGoal
; Pendants: Bit 0 = Courage, Bit 1 = Wisdom, Bit 2 = Power ; Pendants: Bit 0 = Courage, Bit 1 = Wisdom, Bit 2 = Power
LDA #$00 : STA !Pendants LDA #$00 : STA !Pendants
@@ -162,6 +163,9 @@ org $3CA62A ; Expanded space for our routine
; health capacity (maximum number of hearts) ; health capacity (maximum number of hearts)
LDA #$A0 : STA !HealthCapacity LDA #$A0 : STA !HealthCapacity
endif
; fill all hearts ; fill all hearts
LDA #$A0 : STA !Hearts LDA #$A0 : STA !Hearts