let's dev 12/15/2017

added ice floor toggle
made silver arrows always default
fixed small key count corruption
maybe fixed bomb capacity corruption?

LTTP_RND_GeneralBugfixes.asm

@@ -26,7 +26,7 @@ org $3FFFFF ; <- 1FFFFF
 db #$00 ; expand file to 2mb
 
 org $1FFFF8 ; <- FFFF8 timestamp rom
-db #$20, #$17, #$12, #$03 ; year/month/day
+db #$20, #$17, #$12, #$15 ; year/month/day
 
 ;================================================================================
 

hooks.asm

@@ -311,6 +311,16 @@ dw $0000, $0002, $0004, $0032, $0004, $0006, $0030
 ;NOP #6
 ;--------------------------------------------------------------------------------
 
+;================================================================================
+; Ice Floor Toggle
+;--------------------------------------------------------------------------------
+org $07D234 ; <- 3D234 - Bank07.asm : 12758 (LDA $0348 : AND.b #$11 : BEQ .notWalkingOnIce)
+JSL.l LoadModifiedIceFloorValue_a11 : NOP
+;--------------------------------------------------------------------------------
+org $07D26E ; <- 3D26E - Bank07.asm : 12786 (LDA $0348 : AND.b #$01 : BNE BRANCH_RESH)
+JSL.l LoadModifiedIceFloorValue_a01 : NOP
+;--------------------------------------------------------------------------------
+
 ;================================================================================
 ; Sword Upgrade Randomization
 ;--------------------------------------------------------------------------------

newitems.asm

@@ -172,10 +172,15 @@ AddReceivedItemExpandedGetItem:
 	;	LDA.b #$01 : STA $7F50A0
 	;	BRL .done
 	;++
-	
+	;STA $FFFFFF
 	LDA $02D8 ; check inventory
 	JSL.l FreeDungeonItemNotice
-	CMP.b #$4C : BNE + ; 50 bombs
+	CMP.b #$0B : BNE + ; Bow
+		LDA $7EF414 : AND.b #$40 : BEQ ++
+			LDA.b #03 : STA $7EF340 ; set bow silver
+		++
+		BRL .done
+	+ CMP.b #$4C : BNE + ; 50 bombs
 		;LDA.b #$07 : STA $7EF370 ; upgrade bombs
 		LDA.b #50 : !SUB.l StartingMaxBombs : STA $7EF370 ; upgrade bombs
 		LDA.b #50 : STA $7EF375 ; fill bombs
@@ -225,6 +230,9 @@ AddReceivedItemExpandedGetItem:
 		%ProgrammableItemLogic(3)
 		BRL .done
 	+ CMP.b #$58 : BNE + ; Upgrade-Only Sivler Arrows
+		LDA $7EF340 : BEQ ++ : CMP.b #$03 : !BGE ++
+			!ADD.b #$02 : STA $7EF340 ; switch to silver bow
+		++
 	+ CMP.b #$59 : BNE + ; 1 Rupoor
 		REP #$20 : LDA $7EF360 : !SUB RupoorDeduction : STA $7EF360 : SEP #$20 ; Take 1 rupee
 		BRL .done

stats.asm

@@ -201,7 +201,7 @@ IncrementSmallKeys:
 	JSL.l UpdateKeys
 	PHY : LDY.b #24 : JSL.l FullInventoryExternal : PLY
 	JSL.l HUD_RebuildLong
-;RTL
+RTL
 ;--------------------------------------------------------------------------------
 DecrementSmallKeys:
 	STA $7EF36F ; thing we wrote over, write small key count

swordswap.asm

@@ -75,6 +75,15 @@ LoadModifiedMagicLevel:
 	LDA $7F50C3 ; load normal magic value
 RTL
 ;================================================================================
+; $7E0348 - Ice Value
+; $7F50C7 - Ice Modifier
+LoadModifiedIceFloorValue_a11:
+	LDA.w $0348 : ORA $7F50C7 : AND.b #$11
+RTL
+LoadModifiedIceFloorValue_a01:
+	LDA.w $0348 : ORA $7F50C7 : AND.b #$01
+RTL
+;================================================================================
 CheckTabletSword:
 	LDA.l AllowHammerTablets : BEQ +
 	LDA $7EF34B : BEQ + ; check for hammer

tables.asm

@@ -1338,7 +1338,7 @@ org $30B000 ; PC 0x183000
 StartingEquipment:
 dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
 dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
-dw $0000, $0000, $0000, $0000, $0000, $0000, $1818, $0000
+dw $0000, $0000, $0000, $0000, $0000, $0000, $1818, $FF00
 dw $0000, $0000, $0000, $0000, $F800, $0000, $0000, $0000
 dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
 ;===============================================================================