From c5aaa07f3e0d26cdca73a057a7fdd64368055972 Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 15 Jan 2026 15:47:23 -0700 Subject: [PATCH 1/6] feat: king tomb bonk fix --- boots.asm | 26 +++++++++++++------------- hooks.asm | 8 +++++++- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/boots.asm b/boots.asm index 4e8c771..26fcfad 100644 --- a/boots.asm +++ b/boots.asm @@ -28,16 +28,19 @@ AddBonkTremors: JSL AddDashTremor : JSL Player_ApplyRumbleToSprites ; things we wrote over RTL ;-------------------------------------------------------------------------------- -BonkBreakableWall: - PHX : PHP - SEP #$30 ; set 8-bit accumulator and index registers +ValidDashCheck: + PHP + SEP #$20 LDA.l BootsModifier : CMP.b #$01 : BEQ + - LDA.l BootsEquipment : BNE + ; Check for Boots - PLP : PLX : LDA.w #$0000 : RTL - + - PLP : PLX - LDA.w LinkDashing : AND.w #$00FF ; things we wrote over -RTL + LDA.l BootsEquipment : BEQ .exit + + LDA.w LinkDashing +.exit + BEQ + + PLP : REP #$02 + RTL + + + PLP : SEP #$02 + RTL ;-------------------------------------------------------------------------------- BonkRockPile: LDA.l BootsModifier : CMP.b #$01 : BEQ + @@ -48,10 +51,7 @@ BonkRockPile: RTL ;-------------------------------------------------------------------------------- GravestoneHook: - LDA.l BootsModifier : CMP.b #$01 : BEQ + - LDA.l BootsEquipment : BEQ .done ; Check for Boots - + - LDA.w LinkDashing : BEQ .done ; things we wrote over + JSL ValidDashCheck : BEQ .done ; JML moveGravestone .done JML GravestoneHook_continue diff --git a/hooks.asm b/hooks.asm index 5e5c224..806b773 100644 --- a/hooks.asm +++ b/hooks.asm @@ -117,7 +117,7 @@ JSL AddBonkTremors : NOP #4 ; Bonk Breakable Walls ;-------------------------------------------------------------------------------- org $81CF8E ; CF8E <- Bank01.asm : 11641 (LDA $0372 : AND.w #$00FF) -JSL BonkBreakableWall : NOP #2 +JSL ValidDashCheck : NOP #2 ;-------------------------------------------------------------------------------- ;================================================================================ @@ -136,6 +136,12 @@ GravestoneHook_continue: org $87C106 moveGravestone: ;-------------------------------------------------------------------------------- +org $899A30 +JSL ValidDashCheck : NOP #2 +org $899A3A +JSL ValidDashCheck : NOP #2 +;-------------------------------------------------------------------------------- + ;================================================================================ ; Jump Down Ledge From cc635ddb782c7445425181cf6a04e82321e0252c Mon Sep 17 00:00:00 2001 From: aerinon Date: Fri, 16 Jan 2026 15:29:26 -0700 Subject: [PATCH 2/6] fix: consistency for dungeon counter settings --- doorrando/hudadditions.asm | 2 -- newitems.asm | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/doorrando/hudadditions.asm b/doorrando/hudadditions.asm index d4cd84f..e0007e3 100644 --- a/doorrando/hudadditions.asm +++ b/doorrando/hudadditions.asm @@ -147,9 +147,7 @@ DrHudDungeonItemsAdditions: jsr ConvertToDisplay2 : sta.w $1644, y + iny #2 : lda.w #$24f5 : sta.w $1644, y phx : ldx.b Scrap00 - LDA.l CompassMode : BIT.w #$0002 : BNE .skip_map_check LDA.l MapField : AND.l DungeonMask, x : BEQ .key_info_done ; must have map - .skip_map_check plx : sep #$30 : lda.l ChestKeys, x : sta.b Scrap02 lda.l GenericKeys : bne +++ lda.b Scrap02 : !SUB.l DungeonCollectedKeys, x : sta.b Scrap02 diff --git a/newitems.asm b/newitems.asm index ed261ee..54551ad 100644 --- a/newitems.asm +++ b/newitems.asm @@ -1136,7 +1136,7 @@ MaybeFlagCompassTotalPickup: RTL MaybeFlagMapTotalPickup: -; LDA.l MapHUDMode : AND.b #$0F : BEQ .done + LDA.l MapHUDMode : AND.b #$0F : BEQ .done LDA.w DungeonID : BMI .done LDA.w ItemReceiptID : CMP.b #$33 : BEQ .set_flag REP #$20 @@ -1158,7 +1158,7 @@ MaybeFlagDungeonTotalsEntrance: LDA.l CompassMode : AND.w #$000F : BEQ .maps ; Skip if we're not showing compass counts JSR FlagCompassCount .maps -; LDA.l MapHUDMode : AND.w #$000F : BEQ .done + LDA.l MapHUDMode : AND.w #$000F : BEQ .done LDX.w DungeonID JSR FlagMapCount .done From d0f46511300be05076b7403d71656f3955f3f8fc Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 11 Feb 2026 10:49:57 -0700 Subject: [PATCH 3/6] fix: skip key counter with universal keys --- newhud.asm | 1 + 1 file changed, 1 insertion(+) diff --git a/newhud.asm b/newhud.asm index ec266c5..9705196 100644 --- a/newhud.asm +++ b/newhud.asm @@ -357,6 +357,7 @@ RTS ;================================================================================ DrawMapCounts: 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 BIT.b #$02 : BNE .draw_map_count From 6fb81c0aa8e54cedd7707e8b17c0150821a22c3e Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sun, 15 Mar 2026 10:55:57 -0500 Subject: [PATCH 4/6] Fix buffer sword slash when dashing into water --- bugfixes.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bugfixes.asm b/bugfixes.asm index cdc74c8..f19482d 100644 --- a/bugfixes.asm +++ b/bugfixes.asm @@ -246,7 +246,7 @@ FixSwimBump: .normal LDA.b LinkJumping : BNE .continue ; what we wrote over .not_diving - PLA : PLA : PEA.w $87964E ; skip ahead, not diving + PLA : PLA : PEA.w $87964D ; skip ahead, not diving .continue RTL ;-------------------------------------------------------------------------------- From 37caff7bcf146df2229b9f88a789bde9ca38c7a1 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sun, 15 Mar 2026 14:19:12 -0500 Subject: [PATCH 5/6] Fixed bug with MSU-1 GT2 track not falling back to GT track --- tables.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tables.asm b/tables.asm index e7eddef..655ba5d 100644 --- a/tables.asm +++ b/tables.asm @@ -1484,7 +1484,7 @@ db $19,$1A,$1B,$1C,$1D,$1E,$1F,$20 db $21,$22,$11,$11,$10,$16,$16,$16 db $16,$16,$11,$16,$16,$16,$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: db $01,$02,$03,$04,$05,$06,$07,$08 From 9174bbfba54f94ff51c149ba5d3f9e754dbf61a1 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sun, 15 Mar 2026 16:59:19 -0500 Subject: [PATCH 6/6] Fix for Kiki unfollowing after certain entrance transition conditions --- follower.asm | 1 + 1 file changed, 1 insertion(+) diff --git a/follower.asm b/follower.asm index b33ada0..ef00935 100644 --- a/follower.asm +++ b/follower.asm @@ -857,6 +857,7 @@ RTL Kiki_DontScareTheMonke: LDA.b LinkJumping : BEQ .return 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 LinkThud : BNE .no_spook .spook