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

Merge commit '9174bbfba54f94ff51c149ba5d3f9e754dbf61a1' into codemann_OWMain

Browse Source
This commit is contained in:
karafruit
2026-05-02 23:41:40 -05:00
parent ed2746a27b 9174bbfba5
commit 031a444a4a
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bugfixes.asm
View File

@@ -246,7 +246,7 @@ FixSwimBump:
.normal .normal
LDA.b LinkJumping : BNE .continue ; what we wrote over LDA.b LinkJumping : BNE .continue ; what we wrote over
.not_diving .not_diving
PLA : PLA : PEA.w $87964E ; skip ahead, not diving PLA : PLA : PEA.w $87964D ; skip ahead, not diving
.continue .continue
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------

1
follower.asm
View File

@@ -857,6 +857,7 @@ RTL
Kiki_DontScareTheMonke: Kiki_DontScareTheMonke:
LDA.b LinkJumping : BEQ .return LDA.b LinkJumping : BEQ .return
CMP.b #$02 : BEQ .no_spook ; needed for quake usage CMP.b #$02 : BEQ .no_spook ; needed for quake usage
LDA.b GameMode : CMP.b #$0F : BEQ .no_spook ; needed for entrance transitions
LDA.w NoDamage : BNE .no_spook LDA.w NoDamage : BNE .no_spook
LDA.w LinkThud : BNE .no_spook LDA.w LinkThud : BNE .no_spook
.spook .spook

1
newhud.asm
View File

@@ -386,6 +386,7 @@ RTS
;================================================================================ ;================================================================================
DrawMapCounts: DrawMapCounts:
LDA.l MapHUDMode : BEQ .done LDA.l MapHUDMode : BEQ .done
LDA.l GenericKeys : BNE .done ; generator don't have an accurrate count of key doors in this case
; no map needed if this bit is set ; no map needed if this bit is set
BIT.b #$02 : BNE .draw_map_count BIT.b #$02 : BNE .draw_map_count

2
tables.asm
View File

@@ -1532,7 +1532,7 @@ db $19,$1A,$1B,$1C,$1D,$1E,$1F,$20
db $21,$22,$11,$11,$10,$16,$16,$16 db $21,$22,$11,$11,$10,$16,$16,$16
db $16,$16,$11,$16,$16,$16,$15,$15 db $16,$16,$11,$16,$16,$16,$15,$15
db $15,$15,$15,$15,$15,$15,$15,$15 db $15,$15,$15,$15,$15,$15,$15,$15
db $15,$15,$16,$02,$09,$00,$00,$00 db $15,$15,$2E,$02,$09,$00,$00,$00
MusicShuffleTable: MusicShuffleTable:
db $01,$02,$03,$04,$05,$06,$07,$08 db $01,$02,$03,$04,$05,$06,$07,$08