Merge branch 'KatDevsGames:master' into master

LTTP_RND_GeneralBugfixes.asm

@@ -508,6 +508,9 @@ Sprite_ShowMessageUnconditional:
 org $05EC96
 Sprite_ZeldaLong:
 
+org $0680FA
+Player_ApplyRumbleToSprites:
+
 org $0683E6
 Utility_CheckIfHitBoxesOverlapLong:
 

boots.asm

@@ -3,13 +3,75 @@
 ;--------------------------------------------------------------------------------
 !BOOTS_MODIFIER = "$7F50CE"
 ModifyBoots:
-	PHA
+    PHA
-		LDA !BOOTS_MODIFIER : CMP.b #$01 : BNE +
+        LDA !BOOTS_MODIFIER : CMP.b #$01 : BNE +
-			PLA : AND $7EF379 : ORA.b #$04 : RTL ; yes boots
+            PLA : AND $7EF379 : ORA.b #$04 : RTL ; yes boots
-		+ : CMP #$02 : BNE +
+        + : CMP.b #$02 : BNE +
-			PLA : AND $7EF379 : AND.b #$FB : RTL ; no boots
+            PLA : AND $7EF379 : AND.b #$FB : RTL ; no boots
-		+
+        + : LDA FakeBoots : CMP.b #$01 : BNE +
-	PLA
+            LDA $5B : BEQ ++ : LDA $59 : BNE + ; hover check
-	AND $7EF379 ; regular boots
+                ++ : PLA : AND $7EF379 : ORA.b #$04 : RTL ; yes boots, not hovering
+        +
+    PLA
+    AND $7EF379 ; regular boots
+RTL
+;--------------------------------------------------------------------------------
+AddBonkTremors:
+    PHA
+        LDA $46 : BNE + ; Check for incapacitated Link
+            JSL.l IncrementBonkCounter
+        +
+        LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
+        LDA $7EF355 : BNE + ; Check for Boots
+            PLA : RTL
+        +
+    PLA
+    JSL.l AddDashTremor : JSL.l Player_ApplyRumbleToSprites ; things we wrote over
+RTL
+;--------------------------------------------------------------------------------
+BonkBreakableWall:
+    PHX : PHP
+        SEP #$30 ; set 8-bit accumulator and index registers
+        LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
+        LDA $7EF355 : BNE + ; Check for Boots
+            PLP : PLX : LDA.w #$0000 : RTL
+        +
+    PLP : PLX
+    LDA $0372 : AND.w #$00FF ; things we wrote over
+RTL
+;--------------------------------------------------------------------------------
+BonkRockPile:
+    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
+    LDA $7EF355 : BNE + ; Check for Boots
+        LDA.b #$00 : RTL
+    +
+    LDA $02EF : AND.b #$70 ; things we wrote over
+RTL
+;--------------------------------------------------------------------------------
+GravestoneHook:
+    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
+    LDA $7EF355 : BEQ .done ; Check for Boots
+    +
+    LDA $0372 : BEQ .done ; things we wrote over
+        JML.l moveGravestone
+    .done
+    JML.l GravestoneHook_continue
+;--------------------------------------------------------------------------------
+JumpDownLedge:
+    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
+    LDA $7EF355 : BNE + ; Check for Boots
+        ; Disarm Waterwalk
+        LDA $5B : CMP.b #$01 : BNE +
+            STZ $5B
+    +
+    LDA $1B : BNE .done : LDA.b #$02 : STA $EE ; things we wrote over
+    .done
+RTL
+;--------------------------------------------------------------------------------
+BonkRecoil:
+    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
+    LDA $7EF355 : BNE + ; Check for Boots
+        LDA.b #$16 : STA $29 : RTL
+    +
+    LDA.b #$24 : STA $29 ; things we wrote over
 RTL
-;--------------------------------------------------------------------------------

hooks.asm

@@ -62,6 +62,51 @@ org $079C22 ; <- 39222 - Bank07.asm : 4494 (AND $7EF379 : BEQ .cantDoAction)
 JSL.l ModifyBoots
 ;--------------------------------------------------------------------------------
 
+;================================================================================
+; Enable/Disable Bonk Tremors
+;--------------------------------------------------------------------------------
+org $079202 ; 39202 <- Bank07.asm : 2859 (JSL AddDashTremor : JSL Player_ApplyRumbleToSprites)
+JSL.l AddBonkTremors : NOP #4
+;--------------------------------------------------------------------------------
+
+;================================================================================
+; Bonk Breakable Walls
+;--------------------------------------------------------------------------------
+org $01CF8E ; CF8E <- Bank01.asm : 11641 (LDA $0372 : AND.w #$00FF)
+JSL.l BonkBreakableWall : NOP #2
+;--------------------------------------------------------------------------------
+
+;================================================================================
+; Bonk Rock Pile
+;--------------------------------------------------------------------------------
+org $07C196 ; 3C196 <- Bank07.asm : 10310 (LDA $02EF : AND.b #$70)
+JSL.l BonkRockPile : NOP
+;--------------------------------------------------------------------------------
+
+;================================================================================
+; Move Gravestone
+;--------------------------------------------------------------------------------
+org $07C0FD ; 3C0FD <- Bank07.asm : 10197 (LDA $0372 : BNE .moveGravestone)
+JML.l GravestoneHook : NOP
+GravestoneHook_continue:
+org $07C106
+moveGravestone:
+;--------------------------------------------------------------------------------
+
+;================================================================================
+; Jump Down Ledge
+;--------------------------------------------------------------------------------
+org $078966 ; 38966 <- Bank07.asm : 1618 (LDA $1B : BNE .indoors : LDA.b #$02 : STA $EE)
+JSL.l JumpDownLedge : NOP #4
+;--------------------------------------------------------------------------------
+
+;================================================================================
+; Bonk Recoil
+;--------------------------------------------------------------------------------
+org $07922C ; 3922C <- Bank07.asm : 2869 (LDA.b #$24 : STA $29)
+JSL.l BonkRecoil
+;--------------------------------------------------------------------------------
+
 ;================================================================================
 ; Dungeon Exit Hook
 ;--------------------------------------------------------------------------------
@@ -486,9 +531,6 @@ JSL.l CheckGanonHammerDamage : NOP
 ;================================================================================
 ; Stat Hooks
 ;--------------------------------------------------------------------------------
-org $079202 ; 39202 <- Bank07.asm : 2859 (JSL AddDashTremor)
-JSL.l StatBonkCounter
-;--------------------------------------------------------------------------------
 org $02B797 ; <- 13797 - Bank02.asm : 8712 (LDA.b #$19 : STA $10)
 JSL.l StatsFinalPrep
 ;--------------------------------------------------------------------------------

roomloading.asm

@@ -71,15 +71,15 @@ macro DrawBombosPlatform(roomX, roomY, quadX, quadY)
 endMacro
 
 IcePalaceBombosSE:
-	LDA AllowSwordlessMedallionUse : BNE + : RTL : +
+    LDA AllowSwordlessMedallionUse : CMP #$01 : BEQ + : RTL : +
     %DrawBombosPlatform(14, 18, 1, 1)
     RTL
 IcePalaceBombosSW:
-	LDA AllowSwordlessMedallionUse : BNE + : RTL : +
+    LDA AllowSwordlessMedallionUse : CMP #$01 : BEQ + : RTL : +
     %DrawBombosPlatform(14, 18, 0, 1)
     RTL
 IcePalaceBombosNE:
-	LDA AllowSwordlessMedallionUse : BNE + : RTL : +
+    LDA AllowSwordlessMedallionUse : CMP #$01 : BEQ + : RTL : +
     %DrawBombosPlatform(14, 18, 1, 0)
     RTL
 
@@ -165,4 +165,4 @@ RoomCallbackTable:
     db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ; 0Fx
     db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ; 10x
     db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ; 11x
-    db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ; 12x
+    db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ; 12x

stats.asm

@@ -144,16 +144,12 @@
 !LOCK_STATS = "$7EF443"
 ;--------------------------------------------------------------------------------
 !BONK_COUNTER = "$7EF420"
-StatBonkCounter:
+IncrementBonkCounter:
-	PHA
+	LDA !LOCK_STATS : BNE +
-	JSL Ancilla_CheckIfAlreadyExistsLong : BCS +
+		LDA !BONK_COUNTER : INC
-		LDA !LOCK_STATS : BNE +
+		CMP.b #100 : BEQ + ; decimal 100
-			LDA !BONK_COUNTER : INC
+			STA !BONK_COUNTER
-			CMP.b #100 : BEQ + ; decimal 100
-				STA !BONK_COUNTER
 	+
-	PLA
-	JSL.l AddDashTremor ; thing we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 !SAVE_COUNTER = "$7EF42D"

swordswap.asm

@@ -6,11 +6,11 @@
 ;GetFairySword:
 ;	CMP.b #$49 : BNE + : LDA.b #$00 : + ; convert single fighter sword to low id one
 ;	CMP.b #$50 : BNE + : LDA.b #$01 : + ; convert safe master sword to normal one
-;    CMP #$04 : !BLT + : JML.l PyramidFairy_BRANCH_IOTA : + ; for any sword, incl newer
+;	CMP #$04 : !BLT + : JML.l PyramidFairy_BRANCH_IOTA : + ; for any sword, incl newer
-;    JSL ItemCheck_FairySword : BEQ + : JML.l PyramidFairy_BRANCH_IOTA : + ; skip if we already flagged getting this
+;	JSL ItemCheck_FairySword : BEQ + : JML.l PyramidFairy_BRANCH_IOTA : + ; skip if we already flagged getting this
 ;	JSL ItemSet_FairySword ; mark as got
-;    LDA FairySword : STA $0DC0, X ; whichever sword
+;	LDA FairySword : STA $0DC0, X ; whichever sword
-;    LDA.b #$05 : STA $0EB0, X ; something we overwrote, documentation unclear on purpose
+;	LDA.b #$05 : STA $0EB0, X ; something we overwrote, documentation unclear on purpose
 ;
 ;JML.l PyramidFairy_BRANCH_GAMMA
 ;================================================================================
@@ -146,16 +146,16 @@ GetSmithSword:
 	REP #$20 : LDA $7EF360 : CMP #$000A : SEP #$20 : !BGE .buy
 	.cant_afford
 		REP #$10
-	    LDA.b #$7A
+		LDA.b #$7A
-	    LDY.b #$01
+		LDY.b #$01
-	    JSL.l Sprite_ShowMessageUnconditional
+		JSL.l Sprite_ShowMessageUnconditional
 		LDA.b #$3C : STA $012E ; error sound
 		SEP #$10
 		BRA .done
 
 	.buy
-	    LDA.l SmithItem : TAY
+		LDA.l SmithItem : TAY
-	    STZ $02E9 ; Item from NPC
+		STZ $02E9 ; Item from NPC
 		PHX : JSL Link_ReceiveItem : PLX
 
 		REP #$20 : LDA $7EF360 : !SUB.w #$000A : STA $7EF360 : SEP #$20 ; Take 10 rupees
@@ -165,50 +165,68 @@ GetSmithSword:
 		JML.l Smithy_AlreadyGotSword
 ;================================================================================
 CheckMedallionSword:
-	PHB : PHX : PHY
+	LDA.l AllowSwordlessMedallionUse : BEQ .check_sword
-		LDA.l AllowSwordlessMedallionUse : BNE +++ : JMP + : +++
+	CMP #$01 : BEQ .check_pad
-			LDA $1B : BEQ .outdoors
+		LDA.b #$02 ; Pretend we have master sword
-			.indoors
+		RTL
-				REP #$20 ; set 16-bit accumulator
+	.check_sword
-				LDA $A0 ; load room ID
+		LDA $7EF359
-				CMP.w #$000E : BNE ++ : .freezor1
+		RTL
-					LDA $22 : AND.w #$01FF : CMP.w #368-8 : !BLT .normal : CMP.w #368+32-8 : !BGE .normal ; check x-coord
+	.check_pad
-					LDA $20 : AND.w #$01FF : CMP.w #400-22 : !BLT .normal : CMP.w #400+32-22 : !BGE .normal ; check y-coord
+		PHB : PHX : PHY
-					JMP .permit
+		LDA $1B : BEQ .outdoors
-				++ : CMP.w #$007E : BNE ++ : .freezor2
+		.indoors
-					LDA $22 : AND.w #$01FF : CMP.w #112-8 : !BLT .normal : CMP.w #112+32-8 : !BGE .normal ; check x-coord
+			REP #$20 ; set 16-bit accumulator
-					LDA $20 : AND.w #$01FF : CMP.w #400-22 : !BLT .normal : CMP.w #400+32-22 : !BGE .normal ; check y-coord
+			LDA $A0 ; load room ID
-					JMP .permit
+			CMP.w #$000E : BNE + ; freezor1
-				++ : CMP.w #$00DE : BNE ++ : .kholdstare
+				LDA $22 : AND.w #$01FF ; check x-coord
-					LDA $22 : AND.w #$01FF : CMP.w #368-8 : !BLT .normal : CMP.w #368+32-8 : !BGE .normal ; check x-coord
+					CMP.w #368-8 : !BLT .normal
-					LDA $20 : AND.w #$01FF : CMP.w #144-22 : !BLT .normal : CMP.w #144+32-22 : !BGE .normal ; check y-coord
+					CMP.w #368+32-8 : !BGE .normal
-					BRA .permit
+				LDA $20 : AND.w #$01FF ; check y-coord
-				++ : .normal
+					CMP.w #400-22 : !BLT .normal
-				SEP #$20 ; set 8-bit accumulator
+					CMP.w #400+32-22 : !BGE .normal
+				JMP .permit
+			+ : CMP.w #$007E : BNE + ; freezor2
+				LDA $22 : AND.w #$01FF ; check x-coord
+					CMP.w #112-8 : !BLT .normal
+					CMP.w #112+32-8 : !BGE .normal
+				LDA $20 : AND.w #$01FF ; check y-coord
+					CMP.w #400-22 : !BLT .normal
+					CMP.w #400+32-22 : !BGE .normal
+				JMP .permit
+			+ : CMP.w #$00DE : BNE + ; kholdstare
+				LDA $22 : AND.w #$01FF ; check x-coord
+					CMP.w #368-8 : !BLT .normal
+					CMP.w #368+32-8 : !BGE .normal
+				LDA $20 : AND.w #$01FF ; check y-coord
+					CMP.w #144-22 : !BLT .normal
+					CMP.w #144+32-22 : !BGE .normal
+				BRA .permit
+			+ : .normal
+			SEP #$20 ; set 8-bit accumulator
+			BRA .done
+		.outdoors
+			LDA $8A : CMP.b #$70 : BNE +
+				LDA.l MireRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP $0303 : BNE .done
+				LDA $7EF2F0 : AND.b #$20 : BNE .done
+				LDA.b #$08 : PHA : PLB ; set data bank to $08
+				LDY.b #$02 : JSL.l Ancilla_CheckIfEntranceTriggered : BCS .permit ; misery mire
 				BRA .done
-			.outdoors
+			+ : CMP.b #$47 : BNE +
-				LDA $8A : CMP.b #$70 : BNE ++
+				LDA.l TRockRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP $0303 : BNE .done
-					LDA.l MireRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP $0303 : BNE +
+				LDA $7EF2C7 : AND.b #$20 : BNE .done
-					LDA $7EF2F0 : AND.b #$20 : BNE +
+				LDA.b #$08 : PHA : PLB ; set data bank to $08
-					LDA.b #$08 : PHA : PLB ; set data bank to $08
+				LDY.b #$03 : JSL.l Ancilla_CheckIfEntranceTriggered : BCS .permit ; turtle rock
-					LDY.b #$02 : JSL.l Ancilla_CheckIfEntranceTriggered : BCS .permit ; misery mire
+			+
-					BRA +
+	.done
-				++ : CMP.b #$47 : BNE ++
+		PLY : PLX : PLB
-					LDA.l TRockRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP $0303 : BNE +
+		LDA $7EF359
-					LDA $7EF2C7 : AND.b #$20 : BNE +
+		RTL
-					LDA.b #$08 : PHA : PLB ; set data bank to $08
-					LDY.b #$03 : JSL.l Ancilla_CheckIfEntranceTriggered : BCS .permit ; turtle rock
-				++
-			.done
-		+
-	PLY : PLX : PLB
-	LDA $7EF359
-RTL
 	.permit
-	SEP #$20 ; set 8-bit accumulator
+		SEP #$20 ; set 8-bit accumulator
-	PLY : PLX : PLB
+		PLY : PLX : PLB
-	LDA.b #$02 ; Pretend we have master sword
+		LDA.b #$02 ; Pretend we have master sword
-RTL
+		RTL
 .medallion_type
 db #$0F, #$10, #$11
 ;================================================================================

tables.asm

@@ -167,7 +167,7 @@ db #$00 ; #$00 = Off (default) - #$01 = On
 ;--------------------------------------------------------------------------------
 org $308041 ; PC 0x180041
 AllowSwordlessMedallionUse:
-db #$00 ; #$00 = Off (default) - #$01 = Medallion Pads - #$02 = Always (Not Implemented)
+db #$00 ; #$00 = Off (default) - #$01 = Medallion Pads - #$02 = Always
 ;--------------------------------------------------------------------------------
 org $308042 ; PC 0x180042
 PermitSQFromBosses:
@@ -388,7 +388,11 @@ org $30808D ; PC 0x18008D
 InstantPostAgaWorldState:
 db $00 ; #$00 = Off (default) - #$01 = On
 ;--------------------------------------------------------------------------------
-; 0x18008E - 0x18008F (unused)
+org $30808E ; PC 0x18008E
+FakeBoots:
+db $00 ; #$00 = Off (default) - #$01 = On
+;--------------------------------------------------------------------------------
+; 0x18008F (unused)
 ;--------------------------------------------------------------------------------
 org $308090 ; PC 0x180090 - 0x180097
 ProgressiveSwordLimit: