Bee Mode

- hookshot now stuns enemies it would normally damage
- armos knights with L-2 bombs now take same damage as L-1 or L-3

LTTP_RND_GeneralBugfixes.asm

@@ -45,8 +45,9 @@ dw !ROM_VERSION_HIGH
 
 ; Rando Specific SRAM assignments
 !SHOP_PURCHASE_COUNTS = "$7EF302" ;$7EF302 - $7EF33F (temporary home)
-!INVENTORY_SWAP = "$7EF38C" ; [w]
+!INVENTORY_SWAP = "$7EF38C"
-!INVENTORY_SWAP_2 = "$7EF38E" ; [w]
+!INVENTORY_SWAP_2 = "$7EF38E"
+!WEAPON_LEVEL = "$7EF38F"
 !ITEM_LIMIT_COUNTS = "$7EF390" ; $7EF390 - ????
 !NPC_FLAGS   = "$7EF410"
 !NPC_FLAGS_2 = "$7EF411"
@@ -221,6 +222,8 @@ incsrc darkroomitems.asm
 incsrc fastcredits.asm
 incsrc msu.asm
 incsrc dungeonmap.asm
+incsrc special_weapons.asm
+incsrc variable_ganon_vulnerability.asm
 if !FEATURE_NEW_TEXT
     incsrc textrenderer.asm
 endif
@@ -298,6 +301,16 @@ InvertedCastleHole: ;address used by front end. DO NOT MOVE!
 incbin sheet73.gfx
 warnpc $31E501
 
+org $31E800
+Damage_Table_Bombs:
+incbin damage_table_sword_bombs.bin
+warnpc $31F000
+
+org $31F000
+Damage_Table_Pseudo:
+incbin damage_table_pseudo_sword.bin
+warnpc $31F800
+
 org $338000
 GFX_HUD_Palette:
 incbin hudpalette.pal
@@ -317,6 +330,11 @@ if !FEATURE_NEW_TEXT
     incbin newfont.bin
     NewFontInverted:
     incbin newfont_inverted.bin
+
+    org $0CD7DF
+    incbin text_unscramble1.bin
+    org $0CE4D5
+    incbin text_unscramble2.bin
 endif
 
 org $328000

darkworldspawn.asm

@@ -141,10 +141,16 @@ SetEscapeAssist:
 		BIT.b #$01 : BEQ + : STA !INFINITE_ARROWS : +
 		BRA ++
 	.no_train ; choo choo
-		LDA.l EscapeAssist : BIT.b #$04 : BEQ + : LDA.b #$00 : STA !INFINITE_MAGIC : +
+		LDA.l EscapeAssist
-		LDA.l EscapeAssist : BIT.b #$02 : BEQ + : LDA.b #$00 : STA !INFINITE_BOMBS : +
+		BIT.b #$40 : BEQ + : STA !INFINITE_MAGIC : +
-		LDA.l EscapeAssist : BIT.b #$01 : BEQ + : LDA.b #$00 : STA !INFINITE_ARROWS : +
+		BIT.b #$20 : BEQ + : STA !INFINITE_BOMBS : +
+		BIT.b #$10 : BEQ + : STA !INFINITE_ARROWS : +
 	++
+
+	LDA.l SpecialWeapons : CMP #$01 : BNE +
+	LDA.l !WEAPON_LEVEL : BEQ +
+	LDA #$01 : STA !INFINITE_BOMBS
+	+
 RTL
 ;--------------------------------------------------------------------------------
 SetSilverBowMode:

dialog.asm

@@ -299,31 +299,64 @@ RTL
 ; s = silver arrow bow
 ; p = 2nd progressive bow
 DialogGanon2:
-    JSL.l CheckGanonVulnerability
+	JSL.l CheckGanonVulnerability
 
 	REP #$20
 	BCS +
-        LDA.w #$018D : BRA ++
+		LDA.w #$018D : JMP .done
-    +
+	+
+		LDA.l GanonVulnerabilityItem : AND #$00FF : BNE .special_item
+		LDA.l SpecialWeapons : AND.w #$00FF
+		CMP.w #$0001 : BEQ .bombs ; bombs if special bomb mode
+	.silver_arrows
 		LDA.l $7EF38E
 
-        BIT.w #$0080 : BNE + ; branch if bow
+		BIT.w #$0080 : BNE + ; branch if bow
-        LDA.w #$0192 : BRA ++
+		LDA.w #$0192 : JMP .done
-    +
+	+
-        BIT.w #$0040 : BEQ + ; branch if no silvers
+		BIT.w #$0040 : BEQ + ; branch if no silvers
-        LDA.w #$0195 : BRA ++
+		LDA.w #$0195 : JMP .done
-    +
+	+
-        BIT.w #$0020 : BNE + ; branch if p bow
+		BIT.w #$0020 : BNE + ; branch if p bow
-        LDA.w #$0194 : BRA ++
+		LDA.w #$0194 : JMP .done
-    +
+	+
-        BIT.w #$0080 : BEQ + ; branch if no bow
+		BIT.w #$0080 : BEQ + ; branch if no bow
-        LDA.w #$0193 : BRA ++
+		LDA.w #$0193 : JMP .done
-    +
+	+
-        LDA.w #$016E
+		LDA.w #$016E : JMP .done
-    ++
+	.special_item
+		CMP.w #$0001 : BEQ .silver_arrows
+		CMP.w #$0004 : BEQ .bombs
+		CMP.w #$0005 : BEQ .powder
+		CMP.w #$0010 : BEQ .bee
+		PHX : TAX
+		LDA.l $7EF33F, X : PLX : AND #$00FF : BNE +
+		LDA.w #$0192 : JMP .done
+	+
+		LDA.w #$0195 : BRA .done
+	.bombs
+		LDA.l $7EF343 : AND #$00FF : BNE +
+		LDA.l $7F50C9 : AND #$00FF : BNE + ; check for infinite bombs
+		LDA.w #$0192 : BRA .done
+	+
+		LDA.w #$0195 : BRA .done
+	.powder
+		LDA.l $7EF38C : AND #$0010 : BNE +
+		LDA.w #$0192 : BRA .done
+	+
+		LDA.w #$0195 : BRA .done
+	.bee
+		LDA.l $7EF35C : AND #$00FF : CMP.w #$0007 : BEQ + : CMP.w #$0008 : BEQ +
+		LDA.l $7EF35D : AND #$00FF : CMP.w #$0007 : BEQ + : CMP.w #$0008 : BEQ +
+		LDA.l $7EF35E : AND #$00FF : CMP.w #$0007 : BEQ + : CMP.w #$0008 : BEQ +
+		LDA.l $7EF35F : AND #$00FF : CMP.w #$0007 : BEQ + : CMP.w #$0008 : BEQ +
+		LDA.w #$0192 : BRA .done
+	+
+		LDA.w #$0195 : BRA .done
+	.done
 	STA $1CF0
 	SEP #$20
-    JSL.l Sprite_ShowMessageMinimal_Alt
+	JSL.l Sprite_ShowMessageMinimal_Alt
 RTL
 ;--------------------------------------------------------------------------------
 DialogEtherTablet:
@@ -333,11 +366,8 @@ DialogEtherTablet:
 	PLA : JML Sprite_ShowMessageUnconditional ; Wacky Hylian Text
 	+
 	BIT $F4 : BVC - ; Show normal text if Y is not pressed
-	LDA.l AllowHammerTablets : BEQ ++
+	JSL CheckTabletSword : BMI .yesText
-		LDA $7EF34B : BEQ .yesText : BRA .noText
+	CMP.b #$02 : !BGE .noText
-	++
-		LDA $7EF359 : CMP.b #$FF : BEQ .yesText : CMP.b #$02 : BCS .noText
-	;++
 	.yesText
 	PLA
 	LDA.b #$0C
@@ -355,11 +385,8 @@ DialogBombosTablet:
 	PLA : JML Sprite_ShowMessageUnconditional ; Wacky Hylian Text
 	+
 	BIT $F4 : BVC - ; Show normal text if Y is not pressed
-	LDA.l AllowHammerTablets : BEQ ++
+	JSL CheckTabletSword : BMI .yesText
-		LDA $7EF34B : BEQ .yesText : BRA .noText
+	CMP.b #$02 : !BGE .noText
-	++
-		LDA $7EF359 : CMP.b #$FF : BEQ .yesText : CMP.b #$02 : !BGE .noText
-	;++
 	.yesText
 	PLA
 	LDA.b #$0D
@@ -373,7 +400,7 @@ RTL
 DialogSahasrahla:
 	LDA.l $7EF374 : AND #$04 : BEQ + ;Check if player has green pendant
 		LDA.b #$2F
-        LDY.b #$00
+		LDY.b #$00
 		JML Sprite_ShowMessageUnconditional
 	+
 RTL

events.asm

@@ -86,6 +86,7 @@ OnFileCreation:
 	TAX ; what we wrote over
 	LDA StartingEquipment+$4C : STA $700340+$4C ; copy starting equipment swaps to file select screen
 	LDA StartingEquipment+$4E : STA $700340+$4E
+	LDA StartingEquipment+$4F : STA $700340+$4F ; copy starting bomb level
 RTL
 ;--------------------------------------------------------------------------------
 !RNG_ITEM_LOCK_IN = "$7F5090"
@@ -129,13 +130,13 @@ OnNewFile:
 		LDA.l StartingTime : STA $7EF454
 		LDA.l StartingTime+2 : STA $7EF454+2
 
-		LDX.w #$004E : - ; copy over starting equipment
+		LDX.w #$004F : - ; copy over starting equipment
 			LDA StartingEquipment, X : STA $7EF340, X
 			DEX : DEX
 		BPL -
 
 		LDX #$000E : -
-        	LDA $7EF37C, X : STA $7EF4E0, X
+			LDA $7EF37C, X : STA $7EF4E0, X
 			DEX : DEX
 		BPL -
 
@@ -252,6 +253,6 @@ PostItemAnimation:
 			JSL.l IncrementChestTurnCounter
 	+
 
-    STZ $02E9 : LDA $0C5E, X ; thing we wrote over to get here
+	STZ $02E9 : LDA $0C5E, X ; thing we wrote over to get here
 RTL
 ;--------------------------------------------------------------------------------

fileselect.asm

@@ -272,15 +272,16 @@ DrawPlayerFileShared:
 	%fs_drawBottle($70035F,9,23)
 
 	; Sword
+	LDA.l SpecialWeapons : AND.w #$00FF : CMP #$0001 : BEQ .bombSword
 	LDA.l $700359 : AND.w #$00FF : BNE +
 		%fs_drawItemGray(3,26,FileSelectItems_fighters_sword)
-		BRA ++
+		JMP ++
 	+ : DEC : BNE +
 		%fs_drawItem(3,26,FileSelectItems_fighters_sword)
-		BRA ++
+		JMP ++
 	+ : DEC : BNE +
 		%fs_drawItem(3,26,FileSelectItems_master_sword)
-		BRA ++
+		JMP ++
 	+ : DEC : BNE +
 		%fs_drawItem(3,26,FileSelectItems_tempered_sword)
 		BRA ++
@@ -290,6 +291,28 @@ DrawPlayerFileShared:
 	+
 		; a sword value above 4 is either corrupted or 0xFF (a.k.a. swordless)
 		%fs_drawItemGray(3,26,FileSelectItems_fighters_sword)
+	.bombSword
+	LDA.l $70038F : AND.w #$00FF : BNE +
+		%fs_drawItemGray(3,26,FileSelectItems_fighters_bombs)
+		BRA ++
+	+ : DEC : BNE +
+		%fs_drawItem(3,26,FileSelectItems_fighters_bombs)
+		BRA ++
+	+ : DEC : BNE +
+		%fs_drawItem(3,26,FileSelectItems_master_bombs)
+		BRA ++
+	+ : DEC : BNE +
+		%fs_drawItem(3,26,FileSelectItems_tempered_bombs)
+		BRA ++
+	+ : DEC : BNE +
+		%fs_drawItem(3,26,FileSelectItems_gold_bombs)
+		BRA ++
+	+ : DEC : BNE +
+		%fs_drawItem(3,26,FileSelectItems_extra_gold_bombs)
+		BRA ++
+	+
+		; a bomb value above 5 is... who knows, let's just pretend it's 5
+		%fs_drawItem(3,26,FileSelectItems_extra_gold_bombs)
 	++
 
 	; Shield
@@ -560,6 +583,18 @@ FileSelectItems:
 	.good_bee_bottle
 	dw #$0240|!FS_COLOR_BW, #$0241|!FS_COLOR_BW, #$0254|!FS_COLOR_YELLOW, #$0246|!FS_COLOR_YELLOW
 
+	.fighters_bombs
+	dw #$020C|!FS_COLOR_GREEN, #$020D|!FS_COLOR_GREEN, #$021C|!FS_COLOR_GREEN, #$02A1|!FS_COLOR_GREEN
+	.master_bombs
+	dw #$020C|!FS_COLOR_BLUE, #$020D|!FS_COLOR_BLUE, #$021C|!FS_COLOR_BLUE, #$02A2|!FS_COLOR_BLUE
+	.tempered_bombs
+	dw #$020C|!FS_COLOR_RED, #$020D|!FS_COLOR_RED, #$021C|!FS_COLOR_RED, #$02A3|!FS_COLOR_RED
+	.gold_bombs
+	dw #$020C|!FS_COLOR_YELLOW, #$020D|!FS_COLOR_YELLOW, #$021C|!FS_COLOR_YELLOW, #$02A4|!FS_COLOR_YELLOW
+	.extra_gold_bombs
+	dw #$020C|!FS_COLOR_YELLOW, #$020D|!FS_COLOR_YELLOW, #$021C|!FS_COLOR_YELLOW, #$02A5|!FS_COLOR_YELLOW
+
+
 ;--------------------------------------------------------------------------------
 FileSelectDrawHudBar:
 	LDA #$029B|!FS_COLOR_GREEN : %fs_draw16x8(0,10)
@@ -570,11 +605,29 @@ FileSelectDrawHudBar:
 	LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,11)
 	LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,12)
 
+	LDA SpecialWeapons : AND.w #$00FF : CMP #$0001 : BEQ .colorBombs
 	LDA #$028B|!FS_COLOR_BLUE : %fs_draw16x8(0,14)
 	LDA $700343 : AND.w #$00FF
 	JSL.l HexToDec
 	LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,14)
 	LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,15)
+	BRA ++
+	.colorBombs
+	LDA $70038F : AND.w #$00FF : BNE +
+	; no bombs, draw no icon
+	BRA ++
+	+ : DEC : BNE +
+	LDA #$028B|!FS_COLOR_GREEN : %fs_draw16x8(0,14)
+	BRA ++
+	+ : DEC : BNE +
+	LDA #$028B|!FS_COLOR_BLUE : %fs_draw16x8(0,14)
+	BRA ++
+	+ : DEC : BNE +
+	LDA #$028B|!FS_COLOR_RED : %fs_draw16x8(0,14)
+	BRA ++
+	+
+	LDA #$028B|!FS_COLOR_YELLOW : %fs_draw16x8(0,14)
+	++
 
 	LDA.l !FS_INVENTORY_SWAP_2 : AND.w #$0040 : BEQ +
 		LDA #$0299|!FS_COLOR_RED : %fs_draw16x8(0,17)

generate_bomb_table.rb

@@ -0,0 +1,74 @@
+def process_values(sprite, values)
+  ret = values.clone
+  if [1, 2].include?(ret[0]) # boomerang
+    if sprite == 0x53 # armos knight
+      ret[0] = 0 # do nothing
+    else
+      ret[0] = 5 # stun very briefly instead of damage
+    end
+  end
+  if ret[6] > 0 && sprite != 0x84 # bow and not red eyegore/mimic
+    ret[6] = 0
+  end
+  if ret[7] == 2 # hookshot
+    ret[7] = 1 # still want to stun
+  end
+  if [1, 2, 7].include?(ret[8]) && sprite != 0x92 # bomb and not helmasaur king
+    ret[8] = 0
+  end
+  if ret[9] > 0 && sprite != 0x84 # silver bow and not red eyegore/mimic
+    ret[9] = 0
+  end
+  if ret[10] == 4 # powder
+    ret[10] = 0
+  end
+  if ret[11] > 0 && ![0xA1, 0xA3, 0xCD].include?(sprite) # fire rod
+    ret[11] = 0
+  end
+  if ret[12] != 3 && sprite != 0xCC # ice rod
+    ret[12] = 0
+  end
+  if ret[13] > 0 && ![0xA3, 0xA1].include?(sprite) # bombos
+    ret[13] = 0
+  end
+  if ret[14] != 1 # ether
+    ret[14] = 0
+  end
+  if [1, 2].include?(ret[15]) # quake
+    ret[15] = 0
+  end
+  if sprite == 0x53 and ret[2] == 3
+    ret[2] = 1 # armos knight? let's make class 2 not suck
+  end
+  return ret
+end
+
+def split_value(byte)
+  return [byte >> 4, byte & 0x0F]
+end
+
+def join_values(value1, value2)
+  return (value1 & 0x0F) << 4 | (value2 & 0x0F)
+end
+
+File.open("damage_table.bin") do |input|
+  File.open("damage_table_sword_bombs.bin", "w") do |output|
+    i_enum = input.each_byte
+    (0...0xD7).each do |sprite|
+      values = []
+      (0...8).each do
+        values += split_value(i_enum.next)
+      end
+      v_enum = process_values(sprite, values).to_enum
+      (0...8).each do
+        output.putc(join_values(v_enum.next, v_enum.next))
+      end
+    end
+    begin
+      while true
+        output.putc(i_enum.next)
+      end
+    rescue StopIteration
+    end
+  end
+end

generate_pseudo_sword_table.rb

@@ -0,0 +1,38 @@
+def process_values(sprite, values)
+  ret = values.clone
+  if (ret[1] == 0 && sprite != 0x40) || sprite == 0xCE
+    # fighter sword does no damage and it's not the evil barrier, or it's Blind
+    ret[5] = 0
+  end
+  return ret
+end
+
+def split_value(byte)
+  return [byte >> 4, byte & 0x0F]
+end
+
+def join_values(value1, value2)
+  return (value1 & 0x0F) << 4 | (value2 & 0x0F)
+end
+
+File.open("damage_table.bin") do |input|
+  File.open("damage_table_pseudo_sword.bin", "w") do |output|
+    i_enum = input.each_byte
+    (0...0xD7).each do |sprite|
+      values = []
+      (0...8).each do
+        values += split_value(i_enum.next)
+      end
+      v_enum = process_values(sprite, values).to_enum
+      (0...8).each do
+        output.putc(join_values(v_enum.next, v_enum.next))
+      end
+    end
+    begin
+      while true
+        output.putc(i_enum.next)
+      end
+    rescue StopIteration
+    end
+  end
+end

hardmode.asm

@@ -76,12 +76,18 @@ GetItemDamageValue:
 	CPX.b #$04 : BEQ .boomerang
 	CPX.b #$05 : BEQ .boomerang
 	CPX.b #$39 : BEQ .hookshot
-	CPX.b #$3b : BEQ .hookshot
+	CPX.b #$3B : BEQ .hookshot
-	CPX.b #$3c : BEQ .hookshot
+	CPX.b #$3C : BEQ .hookshot
-	CPX.b #$3d : BEQ .hookshot
+	CPX.b #$3D : BEQ .hookshot
+
+	LDA.l SpecialWeapons : CMP #$02 : BNE .normal
+	TXA : AND #$78 : CMP #$28 : BNE .normal
+	LDA $0DB8F1, X : BEQ .noDamage
+	LDA #$01
+RTL
 
 	.normal
-	lda $0db8f1,x ;what we wrote over
+	LDA $0DB8F1, X ; what we wrote over
 RTL
 	.boomerang
 		LDA.l StunItemAction : AND #$01 : BNE .normal

hooks.asm

@@ -360,9 +360,6 @@ JSL.l LoadBombCount
 org $098133 ; <- 48133 - ancilla_init.asm : 211 (STA $7EF343 : BNE .bombs_left_over)
 JSL.l StoreBombCount
 ;--------------------------------------------------------------------------------
-org $0DE4BF ; <- 6E4BF - equipment.asm : 1249 (LDA $7EF343 : AND.w #$00FF : BEQ .gotNoBombs)
-JSL.l LoadBombCount16
-;--------------------------------------------------------------------------------
 org $0DDEB3 ; <- 6DEB3 - equipment.asm : 328 (LDA $7EF33F, X)
 JSL.l IsItemAvailable
 ;--------------------------------------------------------------------------------
@@ -961,12 +958,9 @@ LDA.w AddReceivedItemExpanded_item_target_addr+1, X
 org $09861F ; 4861F - ancilla_init.asm:724 (LDA .item_values, Y)
 LDA.w AddReceivedItemExpanded_item_values, Y
 
-org $098627 ; 48627 - ancilla_init.asm:731 (LDA .item_target_addr+0, X)
+org $098624 ; 48624 - ancilla_init.asm:728 (TYA : ASL A : TAX)
-LDA.w AddReceivedItemExpanded_item_target_addr+0, X
+JSL.l UpdateInventoryLocationExpanded
-org $09862C ; 4862C - ancilla_init.asm:722 (LDA .item_target_addr+1, X)
+BRA + : NOP #18 : +
-LDA.w AddReceivedItemExpanded_item_target_addr+1, X
-org $098635 ; 48635 - ancilla_init.asm:727 (LDA .item_values, Y)
-LDA.w AddReceivedItemExpanded_item_values, Y
 
 org $0986AA ; 486AA - ancilla_init.asm:848 (LDA .item_masks, X)
 LDA.w AddReceivedItemExpanded_item_masks, X
@@ -2338,9 +2332,6 @@ NOP #6
 ;--------------------------------------------------------------------------------
 org $09865E ; <- 4865E
 JSL.l $1BEE1B ; fix something i wrote over i shouldn't have
-;--------------------------------------------------------------------------------
-org $098638 ; <- 48638 - ancilla_init.asm:737 - LDA .item_values, Y : BMI .dontWrite (BMI)
-JSL.l ItemDowngradeFix
 ;================================================================================
 
 ;================================================================================
@@ -2759,6 +2750,128 @@ org $01C536 : JSL FixJingleGlitch
 org $01C592 : JSL FixJingleGlitch
 org $01C65F : JSL FixJingleGlitch
 
+;================================================================================
+; Bomb-Only Mode
+;--------------------------------------------------------------------------------
+org $06ECC3 ; Bank06.asm@4704 (PHX : TAX : LDA.l .damage_classes, X : PLX)
+JSL DamageClassCalc
+BRA + : NOP #29 : +
+;--------------------------------------------------------------------------------
+org $0882D4 ; Bank08.asm@445 (PHX : TYX : ... )
+JSL Utility_CheckAncillaOverlapWithSprite
+BRA + : NOP #5 : +
+;--------------------------------------------------------------------------------
+org $088DB1 ; Bank08.asm@1207 (PHY : PHX : TYX : ... )
+JSL Utility_CheckAncillaOverlapWithSprite
+BRA + : NOP #7 : +
+;--------------------------------------------------------------------------------
+org $08E252 ; Bank08.asm@1770 (PHY : PHX : TYX : ... )
+JSL Utility_CheckAncillaOverlapWithSprite
+BRA + : NOP #7 : +
+;--------------------------------------------------------------------------------
+org $0882E8 ; Bank08.asm@456 (LDA $0DB0, Y : CMP.b #$03)
+JSL Utility_CheckHelmasaurKingCollision
+NOP
+;--------------------------------------------------------------------------------
+org $1E838C ; sprite_helmasaur_king.asm@522 (LDA $0301 : AND.b #$0A)
+JSL Utility_CheckHammerHelmasaurKingMask
+NOP
+;--------------------------------------------------------------------------------
+org $06ED94 ; Bank06.asm@4866 (LDA $0E60, X : AND.b #$40)
+JSL Utility_CheckImpervious
+NOP
+;--------------------------------------------------------------------------------
+org $068F94 ; sprite_prep.asm@1984 (INC $0BA0, X : JSL Sprite_InitializedSegmented)
+JSL AllowBombingMoldorm
+BRA + : NOP : +
+;--------------------------------------------------------------------------------
+org $06892F ; sprite_prep.asm@548 (LDA $0D00, X : SUB #$0C : STA $0D00, X : ...)
+JSL AllowBombingBarrier
+RTS : NOP #7
+;--------------------------------------------------------------------------------
+org $0DE4BF ; equipment.asm@1247 (LDA $7EF343 : AND.w #$00FF : BEQ .gotNoBombs : ...)
+JSL DrawBombInMenu
+BRA + : NOP #13 : +
+;--------------------------------------------------------------------------------
+org $0DFB6A ; headsup_display@727 (CPX #$0004 : BNE .bombsNotEquipped : LDA #$0001)
+JSL DrawBombInYBox
+BRA + : NOP #2 : +
+;--------------------------------------------------------------------------------
+org $0DEE05 ; equipment.asm@2065 (LDA $7EF359 : AND.w #$00FF : CMP.w #$00FF : ...)
+JSL DrawSwordInMenu
+BRA + : NOP #16 : +
+;--------------------------------------------------------------------------------
+org $0DFA92 ; headsup_display.asm@622 (PDB : LDA.w #$0149 : ...)
+JSL DrawBombOnHud
+BRA + : NOP #8 : +
+;--------------------------------------------------------------------------------
+org $089EF8 ; ancilla_bomb@1438 (LDA.w #$04 : STA $0B)
+JSL SetBombSpriteColor
+;--------------------------------------------------------------------------------
+; bomb icons with numbers
+org $0DFC51 ; is this being used? I hope not! let's find out if anything breaks!
+db $F5, $20, $F5, $20, $F5, $20, $F5, $20
+db $B2, $3C, $B3, $3C, $C2, $3C, $17, $3C
+db $B2, $2C, $B3, $2C, $C2, $2C, $18, $2C
+db $B2, $24, $B3, $24, $C2, $24, $19, $24
+db $B2, $28, $B3, $28, $C2, $28, $1A, $28
+db $B2, $28, $B3, $28, $C2, $28, $1B, $28
+
+; bomb icons without numbers
+org $0DFC81
+db $F5, $20, $F5, $20, $F5, $20, $F5, $20
+db $B2, $3C, $B3, $3C, $C2, $3C, $C2, $7C
+db $B2, $2C, $B3, $2C, $C2, $2C, $C2, $6C
+db $B2, $24, $B3, $24, $C2, $24, $C2, $64
+db $B2, $28, $B3, $28, $C2, $28, $C2, $68
+db $B2, $28, $B3, $28, $C2, $28, $C2, $68
+;--------------------------------------------------------------------------------
+org $079CE6 ; Bank07.asm@4632 (LDA #$80 : TSB $3A)
+JSL CheckDetonateBomb
+;--------------------------------------------------------------------------------
+org $1EDCF8 ; bank_1E.asm@16086 (LDX $0202 : ...)
+JSL SetBeeType
+BRA + : NOP #15 : +
+;--------------------------------------------------------------------------------
+org $1EB5E8 ; bank_1E.asm@9387 (LDA #$03 : STA $0D80, X)
+JSL ArrghusBoing
+;--------------------------------------------------------------------------------
+org $1EDFAF ; bank_1E.asm@16607 (.next_sprite)
+JSL BeeCheckTarget
+BCS .bee_valid_target
+BRA .bee_unsuitable_target
+NOP #48
+.bee_unsuitable_target
+skip 11
+.bee_valid_target
+;--------------------------------------------------------------------------------
+
+;================================================================================
+; Variable Ganon Vulnerability
+;--------------------------------------------------------------------------------
+org $08BBD4 ; ancilla_magic_powder.asm@253 (LDA #$0A : JSL Ancilla_CheckSpriteDamage.preset_class)
+JSL Ganon_CheckPowderVulnerability
+NOP #2
+;--------------------------------------------------------------------------------
+org $1D8F4E ; sprite_ganon.asm@325 (LDA $04C5 : CMP #$02)
+JSL Ganon_CheckInvincible
+NOP
+;--------------------------------------------------------------------------------
+org $0DD628 ; Bank0D.asm@1266 (LDA $0B6B, Y : AND #$02)
+JSL CheckBeeBoss
+NOP
+;--------------------------------------------------------------------------------
+org $0DD676 ; Bank0D.asm@1303 (TYX : JSL Ancilla_CheckSpriteDamage.preset_class)
+JSL Ganon_CheckBeeVulnerability
+NOP
+;--------------------------------------------------------------------------------
+
+;================================================================================
+; Pseudo-Sword Mode
+;--------------------------------------------------------------------------------
+org $06ED70 ; Bank06.asm@4842 (LDA $06ED39, X : STA $0CF2)
+JSL StoreSwordDamage
+
 ;================================================================================
 ; Text Renderer
 ;--------------------------------------------------------------------------------

inventory.asm

@@ -553,6 +553,14 @@ AddInventory:
 	  CPY.b #$B0 : !BGE +
 		JSR .incrementKey
 		JMP .done
+	+ CPY.b #$B1 : !BLT + ; Items $B1 - $B6 - Bomb Upgrades
+	  CPY.b #$B7 : !BGE +
+		JSR .incrementBombLevel
+		JMP .done
+	+ CPY.b #$B7 : !BLT + ; Items $B7 - $BC - Cane Upgrades
+	  CPY.b #$BD : !BGE +
+		JSR .incrementCaneLevel
+		JMP .done
 	+
 	.done
 	PLP : PLX : PLA
@@ -622,6 +630,14 @@ RTS
 	LDA $7EF422 : !ADD #$20 : STA $7EF422 ; increment sword counter
 RTS
 
+.incrementBombLevel
+	JSR .stampSword ; update "first bomb" timestamp
+RTS
+
+.incrementCaneLevel
+	JSR .stampSword ; update "first cane" timestamp
+RTS
+
 .incrementShield
 	; CHECK FOR DUPLICATE SHIELDS
 	LDA $7EF422 : !ADD #$08 : AND #$18 : TAX
@@ -718,7 +734,13 @@ RTS
 RTL
 
 .incrementBossSword
-	LDA $7EF359
+	LDA SpecialWeapons : CMP #$01 : BEQ +
+	                     CMP #$03 : BEQ +
+	                     CMP #$04 : BEQ +
+	                     CMP #$05 : BEQ +
+	LDA $7EF359 : BRA ++
+	+ : LDA !WEAPON_LEVEL
+	++
 	BNE + : -
 		%TopHalf($7EF452) : RTS
 	+ CMP #$FF : BEQ -

itemdowngrade.asm

@@ -29,6 +29,9 @@ ItemDowngradeFixMain:
 	CPY.b #$13 : BEQ .isShovel ; Shovel
 	CPY.b #$29 : BEQ .isMushroom ; Mushroom
 
+	CPY.b #$B1 : !BLT + : CPY.b #$B6 : !BLT .isBombUpgrade : +
+	CPY.b #$B7 : !BLT + : CPY.b #$BC : !BLT .isCaneUpgrade : +
+
 	.done
 	STA [$00] ; thing we wrote over part 2
 	.dontWrite
@@ -69,5 +72,27 @@ RTS
 			JMP .done
 		+
 	PLA
+JMP .done
+	.isBombUpgrade
+	PHA
+		TYA ; load bomb upgrade item
+		!SUB #$B0 ; convert to bomb level
+		CMP.l !WEAPON_LEVEL : !BGE + ; skip if highest is lower (this is an upgrade)
+			LDA.l !WEAPON_LEVEL : !ADD #$B0 ; convert to item id
+			TAY : PLA : LDA.l !WEAPON_LEVEL ; put bomb level into the thing to write
+			JMP .done
+		+
+	PLA
+JMP .done
+	.isCaneUpgrade
+	PHA
+		TYA ; load cane upgrade item
+		!SUB #$B6 ; convert to cane level
+		CMP.l !WEAPON_LEVEL : !BGE + ; skip if highest is lower (this is an upgrade)
+			LDA.l !WEAPON_LEVEL : !ADD #$B6 ; convert to item id
+			TAY : PLA : LDA.l !WEAPON_LEVEL ; put cane level into the thing to write
+			JMP .done
+		+
+	PLA
 JMP .done
 ;================================================================================

newhud.asm

@@ -8,6 +8,9 @@ SEP #$30
 
 	LDA !INFINITE_BOMBS : BNE .infinite_bombs
 	.finite_bombs
+		LDA.l SpecialWeapons : CMP #$01 : BNE .normal
+		LDA.l !WEAPON_LEVEL : BEQ .no_bombs
+	.normal
 		LDA.l $7EF343 ; bombs
 		JSR HudHexToDec2Digit ;requires 8 bit registers!
 		REP #$20
@@ -15,6 +18,12 @@ SEP #$30
 		LDX.b $07 : TXA : ORA.w #$2400 : STA !BOMBCOUNT_DRAW_ADDRESS+2 ; Draw bombs 1 digit
 		BRA +
 
+	.no_bombs
+		REP #$20
+		LDA.w #$207F : STA !BOMBCOUNT_DRAW_ADDRESS
+		               STA !BOMBCOUNT_DRAW_ADDRESS+2
+		BRA +
+
 	.infinite_bombs
 		REP #$20
 		LDA.w #$2431 : STA !BOMBCOUNT_DRAW_ADDRESS ; infinity (left half)

newitems.asm

@@ -39,6 +39,19 @@
 ; #$80 - Compasses
 ; #$90 - Big Keys
 ; #$A0 - Small Keys
+; #$B0 - reserved for bee traps
+; #$B1 - L-1 Bombs
+; #$B2 - L-2 Bombs
+; #$B3 - L-3 Bombs
+; #$B4 - L-4 Bombs
+; #$B5 - L-5 Bombs
+; #$B6 - Progressive Bombs
+; #$B7 - L-1 Cane
+; #$B8 - L-2 Cane
+; #$B9 - L-3 Cane
+; #$BA - L-4 Cane
+; #$BB - L-5 Cane
+; #$BC - Progressive Cane
 ; #$FE - Server Request (Asychronous Chest)
 ; #$FF - Null Chest
 ;--------------------------------------------------------------------------------
@@ -68,23 +81,23 @@
 ;JML GetAnimatedSpriteGfxFile_return
 ;--------------------------------------------------------------------------------
 GetAnimatedSpriteGfxFile:
-    CMP.b #$0C : BNE +
+	CMP.b #$0C : BNE +
 		LDY.b #$5C : JML GetAnimatedSpriteGfxFile_return
 	+
-    CMP.b #$23 : BNE +
+	CMP.b #$23 : BNE +
 		LDY.b #$5D : JML GetAnimatedSpriteGfxFile_return
 	+
-    CMP.b #$48 : BNE +
+	CMP.b #$48 : BNE +
 		LDY.b #$60 : JML GetAnimatedSpriteGfxFile_return
 	+
 
-    CMP.b #$24 : !BGE +
+	CMP.b #$24 : !BGE +
 		LDY.b #$5B : JML GetAnimatedSpriteGfxFile_return
 	+
-    CMP.b #$37 : !BGE +
+	CMP.b #$37 : !BGE +
 		LDY.b #$5C : JML GetAnimatedSpriteGfxFile_return
 	+
-    CMP.b #$39 : !BGE +
+	CMP.b #$39 : !BGE +
 		LDY.b #$5D : JML GetAnimatedSpriteGfxFile_return
 	+
 		LDY.b #$32
@@ -267,7 +280,7 @@ AddReceivedItemExpandedGetItem:
 	+ CMP.b #$57 : BNE + ; Programmable Object 3
 		%ProgrammableItemLogic(3)
 		JMP .done
-	+ CMP.b #$58 : BNE + ; Upgrade-Only Sivler Arrows
+	+ CMP.b #$58 : BNE + ; Upgrade-Only Silver Arrows
 		LDA.l SilverArrowsUseRestriction : BNE +++
 		LDA.l SilverArrowsAutoEquip : AND.b #$01 : BEQ +++
 			LDA $7EF340 : BEQ ++ : CMP.b #$03 : !BGE ++
@@ -394,11 +407,27 @@ AddReceivedItemExpandedGetItem:
 				LDA $7EF36F : INC : STA $7EF36F
 			++
 			JMP .done
+	+ CMP.b #$B1 : !BLT + : CMP.b #$B7 : !BGE + ; Bomb Upgrades
+		LDA.l SpecialWeapons : CMP #$01 : BNE .done
+			LDA #$01 : STA $7F50C9 ; infinite bombs
+			JMP .done
+	+ : CMP.b #$B7 : !BLT + : CMP.b #$BD : !BGE + ; Cane Upgrades
+		LDA.l SpecialWeapons : CMP #$03 : BEQ .blue_cane
+		                       CMP #$04 : BEQ .red_cane
+			BRA .done
+		.blue_cane
+			LDA #$01 : STA $7EF351
+			BRA .done
+		.red_cane
+			LDA #$01 : STA $7EF350
+			BRA .done
+		BRA .done
 	+
 	.done
 	PLX
 	LDA $02E9 : CMP.b #$01 ; thing we wrote over
 RTL
+;--------------------------------------------------------------------------------
 ; #$70 - Maps
 ; #$80 - Compasses
 ; #$90 - Big Keys
@@ -494,16 +523,16 @@ AddReceivedItemExpanded:
 				LDA.b #$23 : STA $02D8 : JMP .done
 		++ : CMP.b #$61 : BNE ++ ; Progressive Lifting Glove
 			LDA $7EF354 : BNE + ; No Lift
-				LDA.b #$1B : STA $02D8 : BRA .done
+				LDA.b #$1B : STA $02D8 : JMP .done
 			+ ; Everything Else
-				LDA.b #$1C : STA $02D8 : BRA .done
+				LDA.b #$1C : STA $02D8 : JMP .done
 		++ : CMP.b #$64 : BNE ++ : -- ; Progressive Bow
 			LDA $7EF340 : INC : LSR : CMP.l ProgressiveBowLimit : !BLT +
 				LDA.l ProgressiveBowReplacement : STA $02D8 : JMP .done
 			+ : CMP.b #$00 : BNE + ; No Bow
-				LDA.b #$3A : STA $02D8 : BRA .done
+				LDA.b #$3A : STA $02D8 : JMP .done
 			+ ; Any Bow
-				LDA.b #$3B : STA $02D8 : BRA .done
+				LDA.b #$3B : STA $02D8 : JMP .done
 		++ : CMP.b #$65 : BNE ++ ; Progressive Bow 2
 			LDA.l !INVENTORY_SWAP_2 : ORA #$20 : STA.l !INVENTORY_SWAP_2
 			BRA --
@@ -514,45 +543,66 @@ AddReceivedItemExpanded:
 			JSL.l GetRNGItemSingle : STA $02D8
 			XBA : JSR.w MarkRNGItemSingle
 			LDA #$FF : STA !LOCK_IN ; clear lock-in
-			BRA .done
+			JMP .done
 		++ : CMP.b #$63 : BNE ++ ; RNG Item (Multi)
 			JSL.l GetRNGItemMulti : STA $02D8
 			LDA #$FF : STA !LOCK_IN ; clear lock-in
-			BRA .done
+			JMP .done
+		++ : CMP.b #$B6 : BNE ++ ; Progressive Bombs
+			LDA !WEAPON_LEVEL
+			CMP.b #$00 : BNE + ; have no Bombs
+				LDA.b #$B1 : STA $02D8 : JMP .done
+			+ : CMP.b #$01 : BNE + ; have L-1 Bombs
+				LDA.b #$B2 : STA $02D8 : JMP .done
+			+ : CMP.b #$02 : BNE + ; have L-2 Bombs
+				LDA.b #$B3 : STA $02D8 : JMP .done
+			+ : CMP.b #$03 : BNE + ; have L-3 Bombs
+				LDA.b #$B4 : STA $02D8 : JMP .done
+			+ ; Everything Else
+				LDA.b #$B5 : STA $02D8 : JMP .done
+		++ : CMP.b #$BC : BNE ++ ; Progressive Cane
+			LDA !WEAPON_LEVEL
+			CMP.b #$00 : BNE + ; have no Cane
+				LDA.b #$B7 : STA $02D8 : JMP .done
+			+ : CMP.b #$01 : BNE + ; have L-1 Cane
+				LDA.b #$B8 : STA $02D8 : JMP .done
+			+ : CMP.b #$02 : BNE + ; have L-2 Cane
+				LDA.b #$B9 : STA $02D8 : JMP .done
+			+ : CMP.b #$03 : BNE + ; have L-3 Cane
+				LDA.b #$BA : STA $02D8 : JMP .done
+			+ ; Everything Else
+				LDA.b #$BB : STA $02D8 : JMP .done
 		++
 		.done
 	PLX : PLA
 
-    PHB : PHK ; we're skipping the corresponding instructions to grab the data bank
+	PHB : PHK ; we're skipping the corresponding instructions to grab the data bank
 	JML.l AddReceivedItem+2
 }
 ;--------------------------------------------------------------------------------
 ;DATA AddReceivedItemExpanded
 {
-; This is a temporary measure for Fish to have consistent addresses
-org $A08800
-
 .y_offsets
-    db -5, -5, -5, -5, -5, -4, -4, -5
+	db -5, -5, -5, -5, -5, -4, -4, -5
-    db -5, -4, -4, -4, -2, -4, -4, -4
+	db -5, -4, -4, -4, -2, -4, -4, -4
 
-    db -4, -4, -4, -4, -4, -4, -4, -4
+	db -4, -4, -4, -4, -4, -4, -4, -4
-    db -4, -4, -4, -4, -4, -4, -4, -4
+	db -4, -4, -4, -4, -4, -4, -4, -4
 
-    db -4, -4, -4, -5, -4, -4, -4, -4
+	db -4, -4, -4, -5, -4, -4, -4, -4
-    db -4, -4, -2, -4, -4, -4, -4, -4
+	db -4, -4, -2, -4, -4, -4, -4, -4
 
-    db -4, -4, -4, -4, -2, -2, -2, -4
+	db -4, -4, -4, -4, -2, -2, -2, -4
-    db -4, -4, -4, -4, -4, -4, -4, -4
+	db -4, -4, -4, -4, -4, -4, -4, -4
 
-    db -4, -4, -2, -2, -4, -2, -4, -4
+	db -4, -4, -2, -2, -4, -2, -4, -4
-    db -4, -5, -4, -4
+	db -4, -5, -4, -4
 	;new
 	db -4, -4, -4, -4
 	db -5 ; Master Sword (Safe)
 	db -4, -4, -4, -4 ; +5/+10 Bomb Arrows
 	db -4, -4, -4 ; 3x Programmable Item
-	db -4 ; Upgrade-Only Sivler Arrows
+	db -4 ; Upgrade-Only Silver Arrows
 	db -4 ; 1 Rupoor
 	db -4 ; Null Item
 	db -4, -4, -4 ; Red, Blue & Green Clocks
@@ -566,32 +616,35 @@ org $A08800
 	db -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4 ; Free Compass
 	db -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4 ; Free Big Key
 	db -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4 ; Free Small Key
-	db -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4 ; Unused
+	db -4 ; reserved for bee traps
+	db -4, -4, -4, -4, -4, -4 ; Bomb Upgrades
+	db -4, -4, -4, -4, -4, -4 ; Cane Upgrades
+	db -4, -4, -4 ; Unused
 	db -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4 ; Unused
 	db -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4 ; Unused
 	db -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4 ; Unused
 
 .x_offsets
-    db  4,  4,  4,  4,  4,  0,  0,  4
+	db  4,  4,  4,  4,  4,  0,  0,  4
-    db  4,  4,  4,  4,  5,  0,  0,  0
+	db  4,  4,  4,  4,  5,  0,  0,  0
 
-    db  0,  0,  0,  4,  0,  4,  0,  0
+	db  0,  0,  0,  4,  0,  4,  0,  0
-    db  4,  0,  0,  0,  0,  0,  0,  0
+	db  4,  0,  0,  0,  0,  0,  0,  0
 
-    db  0,  0,  0,  0,  4,  0,  0,  0
+	db  0,  0,  0,  0,  4,  0,  0,  0
-    db  0,  0,  5,  0,  0,  0,  0,  0
+	db  0,  0,  5,  0,  0,  0,  0,  0
 
-    db  0,  0,  0,  0,  4,  4,  4,  0
+	db  0,  0,  0,  0,  4,  4,  4,  0
-    db  0,  0,  0,  0,  0,  0,  0,  0
+	db  0,  0,  0,  0,  0,  0,  0,  0
 
-    db  0,  0,  4,  4,  0,  4,  0,  0
+	db  0,  0,  4,  4,  0,  4,  0,  0
-    db  0,  4,  0,  0
+	db  0,  4,  0,  0
 	;new
 	db  0,  0,  0,  0
 	db  4 ; Master Sword (Safe)
 	db  0,  0,  0,  0 ; +5/+10 Bomb Arrows
 	db  0,  0,  0 ; 3x Programmable Item
-	db  0 ; Upgrade-Only Sivler Arrows
+	db  0 ; Upgrade-Only Silver Arrows
 	db  4 ; 1 Rupoor
 	db  0 ; Null Item
 	db  0, 0, 0 ; Red, Blue & Green Clocks
@@ -606,33 +659,36 @@ org $A08800
 	db  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ; Free Big Key
 	;db  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ; *EVENT*
 	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; Free Small Key
-	db  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ; Unused
+	db  0 ; reserved for bee traps
+	db  0, 0, 0, 0, 0, 0 ; Bomb Upgrades
+	db  4, 4, 4, 4, 4, 4 ; Cane Upgrades
+	db  0, 0, 0 ; Unused
 	db  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ; Unused
 	db  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ; Unused
 	db  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ; Unused
 
 .item_graphics_indices
-    db $06, $18, $18, $18, $2D, $20, $2E, $09
+	db $06, $18, $18, $18, $2D, $20, $2E, $09
-    db $09, $0A, $08, $05, $10, $0B, $2C, $1B
+	db $09, $0A, $08, $05, $10, $0B, $2C, $1B
 
-    db $1A, $1C, $14, $19, $0C, $07, $1D, $2F
+	db $1A, $1C, $14, $19, $0C, $07, $1D, $2F
-    db $07, $15, $12, $0D, $0D, $0E, $11, $17
+	db $07, $15, $12, $0D, $0D, $0E, $11, $17
 
-    db $28, $27, $04, $04, $0F, $16, $03, $13
+	db $28, $27, $04, $04, $0F, $16, $03, $13
-    db $01, $1E, $10, $00, $00, $00, $00, $00
+	db $01, $1E, $10, $00, $00, $00, $00, $00
 
-    db $00, $30, $22, $21, $24, $24, $24, $23
+	db $00, $30, $22, $21, $24, $24, $24, $23
-    db $23, $23, $29, $2A, $2C, $2B, $03, $03
+	db $23, $23, $29, $2A, $2C, $2B, $03, $03
 
-    db $34, $35, $31, $33, $02, $32, $36, $37
+	db $34, $35, $31, $33, $02, $32, $36, $37
-    db $2C, $06, $0C, $38
+	db $2C, $06, $0C, $38
 	;new
 	db $39, $3A, $3B, $3C
 	;5x
 	db $18 ; Master Sword (Safe)
 	db $3D, $3E, $3F, $40 ; +5/+10 Bomb Arrows
 	db $00, $00, $00 ; 3x Programmable Item
-	db $41 ; Upgrade-Only Sivler Arrows
+	db $41 ; Upgrade-Only Silver Arrows
 	db $24 ; 1 Rupoor
 	db $47 ; Null Item
 	db $48, $48, $48 ; Red, Blue & Green Clocks
@@ -650,33 +706,35 @@ org $A08800
 	;db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; *EVENT*
 	;db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; *EVENT*
 	;db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; *EVENT*
-
+	db $49 ; reserved for bee traps
-	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; Unused
+	db $13, $13, $13, $13, $13, $13 ; Bomb Upgrades
+	db $07, $07, $07, $07, $07, $07 ; Cane Upgrades
+	db $49, $49, $49 ; Unused
 	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; Unused
 	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; Unused
 	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; Unused
 
 .wide_item_flag
-    db $00, $00, $00, $00, $00, $02, $02, $00
+	db $00, $00, $00, $00, $00, $02, $02, $00
-    db $00, $00, $00, $00, $00, $02, $02, $02
+	db $00, $00, $00, $00, $00, $02, $02, $02
 
-    db $02, $02, $02, $00, $02, $00, $02, $02
+	db $02, $02, $02, $00, $02, $00, $02, $02
-    db $00, $02, $02, $02, $02, $02, $02, $02
+	db $00, $02, $02, $02, $02, $02, $02, $02
 
-    db $02, $02, $02, $02, $00, $02, $02, $02
+	db $02, $02, $02, $02, $00, $02, $02, $02
-    db $02, $02, $00, $02, $02, $02, $02, $02
+	db $02, $02, $00, $02, $02, $02, $02, $02
 
-    db $02, $02, $02, $02, $00, $00, $00, $02
+	db $02, $02, $02, $02, $00, $00, $00, $02
-    db $02, $02, $02, $02, $02, $02, $02, $02
+	db $02, $02, $02, $02, $02, $02, $02, $02
 
-    db $02, $02, $00, $00, $02, $00, $02, $02
+	db $02, $02, $00, $00, $02, $00, $02, $02
-    db $02, $00, $02, $02
+	db $02, $00, $02, $02
 	;new
 	db $02, $02, $02, $02
 	db $00 ; Master Sword (Safe)
 	db $02, $02, $02, $02 ; +5/+10 Bomb Arrows
 	db $02, $02, $02 ; 3x Programmable Item
-	db $02 ; Upgrade-Only Sivler Arrows
+	db $02 ; Upgrade-Only Silver Arrows
 	db $00 ; 1 Rupoor
 	db $02 ; Null Item
 	db $02, $02, $02 ; Red, Blue & Green Clocks
@@ -690,34 +748,36 @@ org $A08800
 	db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02 ; Free Compass
 	db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02 ; Free Big Key
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ; Free Small Key
-
+	db $02 ; reserved for bee traps
-	db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02 ; Unused
+	db $02, $02, $02, $02, $02, $02 ; Bomb Upgrades
+	db $00, $00, $00, $00, $00, $00 ; Cane Upgrades
+	db $02, $02, $02 ; Unused
 	db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02 ; Unused
 	db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02 ; Unused
 	db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02 ; Unused
 	db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02 ; Unused
 
 .properties
-    db  5, -1,  5,  5,  5,  5,  5,  1
+	db  5, -1,  5,  5,  5,  5,  5,  1
-    db  2,  1,  1,  1,  2,  2,  2,  4
+	db  2,  1,  1,  1,  2,  2,  2,  4
 
-    db  4,  4,  1,  1,  2,  1,  1,  1
+	db  4,  4,  1,  1,  2,  1,  1,  1
-    db  2,  1,  2,  1,  4,  4,  2,  1
+	db  2,  1,  2,  1,  4,  4,  2,  1
 
-    db  6,  1,  2,  1,  2,  2,  1,  2
+	db  6,  1,  2,  1,  2,  2,  1,  2
-    db  2,  4,  1,  1,  4,  2,  1,  4
+	db  2,  4,  1,  1,  4,  2,  1,  4
 
-    db  2,  2,  4,  4,  4,  2,  1,  4
+	db  2,  2,  4,  4,  4,  2,  1,  4
-    db  1,  2,  2,  1,  2,  2,  1,  1
+	db  1,  2,  2,  1,  2,  2,  1,  1
 
-    db  4,  4,  1,  2,  2,  4,  4,  4
+	db  4,  4,  1,  2,  2,  4,  4,  4
-    db  2,  5,  2,  1
+	db  2,  5,  2,  1
 	;new
 	db  4,  4,  4,  4
 	db  5 ; Master Sword (Safe)
 	db  4,  4,  4,  4 ; +5/+10 Bomb Arrows
 	db  4,  4,  4 ; 3x Programmable Item
-	db  1 ; Upgrade-Only Sivler Arrows
+	db  1 ; Upgrade-Only Silver Arrows
 	db  3 ; 1 Rupoor
 	db  1 ; Null Item
 	db  1, 2, 4 ; Red, Blue & Green Clocks
@@ -731,7 +791,10 @@ org $A08800
 	db  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 ; Free Compass
 	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; Free Big Key
 	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; Free Small Key
-	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; Unused
+	db  4 ; reserved for bee traps
+	db  4, 2, 1, 5, 5, 5 ; Bomb Upgrades
+	db  5, 5, 5, 5, 5, 5 ; Cane Upgrades
+	db  4, 4, 4 ; Unused
 	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; Unused
 	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; Unused
 	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; Unused
@@ -739,26 +802,26 @@ org $A08800
 
 ; \item Target SRAM addresses for items you receive
 .item_target_addr
-    dw $F359, $F359, $F359, $F359, $F35A, $F35A, $F35A, $F345
+	dw $F359, $F359, $F359, $F359, $F35A, $F35A, $F35A, $F345
-    dw $F346, $F34B, $F342, $F340, $F341, $F344, $F35C, $F347
+	dw $F346, $F34B, $F342, $F340, $F341, $F344, $F35C, $F347
 
-    dw $F348, $F349, $F34A, $F34C, $F34C, $F350, $F35C, $F36B
+	dw $F348, $F349, $F34A, $F34C, $F34C, $F350, $F35C, $F36B
-    dw $F351, $F352, $F353, $F354, $F354, $F34E, $F356, $F357
+	dw $F351, $F352, $F353, $F354, $F354, $F34E, $F356, $F357
 
-    dw $F37A, $F34D, $F35B, $F35B, $F36F, $F364, $F36C, $F375
+	dw $F37A, $F34D, $F35B, $F35B, $F36F, $F364, $F36C, $F375
-    dw $F375, $F344, $F341, $F35C, $F35C, $F35C, $F36D, $F36E
+	dw $F375, $F344, $F341, $F35C, $F35C, $F35C, $F36D, $F36E
 
-    dw $F36E, $F375, $F366, $F368, $F360, $F360, $F360, $F374
+	dw $F36E, $F375, $F366, $F368, $F360, $F360, $F360, $F374
-    dw $F374, $F374, $F340, $F340, $F35C, $F35C, $F36C, $F36C
+	dw $F374, $F374, $F340, $F340, $F35C, $F35C, $F36C, $F36C
 
-    dw $F360, $F360, $F372, $F376, $F376, $F373, $F360, $F360
+	dw $F360, $F360, $F372, $F376, $F376, $F373, $F360, $F360
-    dw $F35C, $F359, $F34C, $F355
+	dw $F35C, $F359, $F34C, $F355
 	;new
 	dw $F375, $F376, $F373, $F373
 	dw $F359 ; Master Sword (Safe)
 	dw $F375, $F375, $F376, $F376 ; +5/+10 Bomb Arrows
 	dw $F41A, $F41C, $F41E ; 3x Programmable Item
-	dw $F340 ; Upgrade-Only Sivler Arrows
+	dw $F340 ; Upgrade-Only Silver Arrows
 	dw $F360 ; 1 Rupoor
 	dw $F36A ; Null Item
 	dw $F454, $F454, $F454 ; Red, Blue & Green Clocks
@@ -772,7 +835,10 @@ org $A08800
 	dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Free Compass
 	dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Free Big Key
 	dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Free Small Key
-	dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Unused
+	dw $F36A ; reserved for bee traps
+	dw $F38F, $F38F, $F38F, $F38F, $F38F, $F38F ; Bomb Upgrades
+	dw $F38F, $F38F, $F38F, $F38F, $F38F, $F38F ; Cane Upgrades
+	dw $F36A, $F36A, $F36A ; Unused
 	dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Unused
 	dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Unused
 	dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Unused
@@ -782,26 +848,26 @@ org $A08800
 ; DATA Values to write to the above SRAM locations.
 {
 .item_values
-    db $01, $02, $03, $04, $01, $02, $03, $01
+	db $01, $02, $03, $04, $01, $02, $03, $01
-    db $01, $01, $01, $01, $01, $02, $FF, $01
+	db $01, $01, $01, $01, $01, $02, $FF, $01
 
-    db $01, $01, $01, $01, $02, $01, $FF, $FF
+	db $01, $01, $01, $01, $02, $01, $FF, $FF
-    db $01, $01, $02, $01, $02, $01, $01, $01
+	db $01, $01, $02, $01, $02, $01, $01, $01
 
-    db $FF, $01, $FF, $02, $FF, $FF, $FF, $FF
+	db $FF, $01, $FF, $02, $FF, $FF, $FF, $FF
-    db $FF, $FF, $02, $FF, $FF, $FF, $FF, $FF
+	db $FF, $FF, $02, $FF, $FF, $FF, $FF, $FF
 
-    db $FF, $FF, $FF, $FF, $FF, $FB, $EC, $FF
+	db $FF, $FF, $FF, $FF, $FF, $FB, $EC, $FF
-    db $FF, $FF, $01, $03, $FF, $FF, $FF, $FF
+	db $FF, $FF, $01, $03, $FF, $FF, $FF, $FF
 
-    db $9C, $CE, $FF, $01, $0A, $FF, $FF, $FF
+	db $9C, $CE, $FF, $01, $0A, $FF, $FF, $FF
-    db $FF, $01, $03, $01
+	db $FF, $01, $03, $01
 	;new
 	db $32, $46, $80, $80
 	db $02 ; Master Sword (Safe)
 	db $FF, $FF, $FF, $FF ; +5/+10 Bomb Arrows
 	db $FF, $FF, $FF ; 3x Programmable Item
-	db $FF ; Upgrade-Only Sivler Arrows
+	db $FF ; Upgrade-Only Silver Arrows
 	db $FF ; 1 Rupoor
 	db $FF ; Null Item
 	db $FF, $FF, $FF ; Red, Blue & Green Clocks
@@ -815,31 +881,34 @@ org $A08800
 	db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF ; Free Compass
 	db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF ; Free Big Key
 	db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF ; Free Small Key
-	db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF ; Unused
+	db $FF ; reserved for bee traps
+	db $01, $02, $03, $04, $05, $FF ; Bomb Upgrades
+	db $01, $02, $03, $04, $05, $FF ; Cane Upgrades
+	db $FF, $FF, $FF ; Unused
 	db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF ; Unused
 	db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF ; Unused
 	db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF ; Unused
 	db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF ; Unused
 
-    ;0x00 - Sewer Passage
+	;0x00 - Sewer Passage
-    ;0x02 - Hyrule Castle
+	;0x02 - Hyrule Castle
-    ;0x04 - Eastern Palace
+	;0x04 - Eastern Palace
-    ;0x06 - Desert Palace
+	;0x06 - Desert Palace
-    ;0x08 - Hyrule Castle 2
+	;0x08 - Hyrule Castle 2
-    ;0x0A - Swamp Palace
+	;0x0A - Swamp Palace
-    ;0x0C - Dark Palace
+	;0x0C - Dark Palace
-    ;0x0E - Misery Mire
+	;0x0E - Misery Mire
-    ;0x10 - Skull Woods
+	;0x10 - Skull Woods
-    ;0x12 - Ice Palace
+	;0x12 - Ice Palace
-    ;0x14 - Tower of Hera
+	;0x14 - Tower of Hera
-    ;0x16 - Gargoyle's Domain
+	;0x16 - Gargoyle's Domain
-    ;0x18 - Turtle Rock
+	;0x18 - Turtle Rock
-    ;0x1A - Ganon's Tower
+	;0x1A - Ganon's Tower
 
 .item_masks ; these are dungeon correlations to $7EF364 - $7EF369 so it knows where to store compasses, etc
     ; sewers and castle get 2 bits active so that they can share their items elegantly
-    dw $C000, $C000, $2000, $1000, $0800, $0400, $0200, $0100
+	dw $C000, $C000, $2000, $1000, $0800, $0400, $0200, $0100
-    dw $0080, $0040, $0020, $0010, $0008, $0004, $0000, $0000
+	dw $0080, $0040, $0020, $0010, $0008, $0004, $0000, $0000
 
 	dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
 	dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
@@ -861,27 +930,27 @@ org $A08800
 }
 ;--------------------------------------------------------------------------------
 BottleListExpanded:
-    db $16, $2B, $2C, $2D, $3D, $3C, $48
+	db $16, $2B, $2C, $2D, $3D, $3C, $48
 
 PotionListExpanded:
-    db $2E, $2F, $30, $FF, $0E
+	db $2E, $2F, $30, $FF, $0E
 ;--------------------------------------------------------------------------------
 Link_ReceiveItemAlternatesExpanded:
 {
-    db -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1
+	db -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1
-    db -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1 ; db -1,  -1,  -1,  -1, $44,  -1,  -1,  -1
+	db -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1 ; db -1,  -1,  -1,  -1, $44,  -1,  -1,  -1
 
-    db -1,  -1, $35,  -1,  -1,  -1,  -1,  -1
+	db -1,  -1, $35,  -1,  -1,  -1,  -1,  -1
-    db -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1
+	db -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1
 
-    db -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1
+	db -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1
-    db -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1 ; db -1,  -1, $46,  -1,  -1,  -1,  -1,  -1
+	db -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1 ; db -1,  -1, $46,  -1,  -1,  -1,  -1,  -1
 
-    db -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1
+	db -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1
-    db -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1
+	db -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1
 
-    db -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1
+	db -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1
-    db -1,  -1,  -1,  -1
+	db -1,  -1,  -1,  -1
 
 	db -1,  -1,  -1,  -1
 	db -1 ; Master Sword (Safe)
@@ -901,7 +970,10 @@ Link_ReceiveItemAlternatesExpanded:
 	db -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 ; Free Compass
 	db -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 ; Free Big Key
 	db -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 ; Free Small Key
-	db -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 ; Unused
+	db -1 ; reserved for bee traps
+	db -1, -1, -1, -1, -1, -1 ; Bomb Upgrades
+	db -1, -1, -1, -1, -1, -1 ; Cane Upgrades
+	db -1, -1, -1 ; Unused
 	db -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 ; Unused
 	db -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 ; Unused
 	db -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 ; Unused
@@ -920,10 +992,10 @@ RTL
 ;DrawHUDSilverArrows:
 ;	LDA $7EF340 : AND.w #$00FF : BNE +
 ;		LDA !INVENTORY_SWAP_2 : AND.w #$0040 : BEQ +
-;	        LDA.w #$2810 : STA $11C8
+;			LDA.w #$2810 : STA $11C8
-;	        LDA.w #$2811 : STA $11CA
+;			LDA.w #$2811 : STA $11CA
-;	        LDA.w #$2820 : STA $1208
+;			LDA.w #$2820 : STA $1208
-;	        LDA.w #$2821 : STA $120A
+;			LDA.w #$2821 : STA $120A
 ;	+
 ;	LDA.w #$11CE : STA $00 ; thing we wrote over
 ;RTL
@@ -1104,20 +1176,20 @@ AttemptItemSubstitution:
 RTS
 ;--------------------------------------------------------------------------------
 CountBottles:
-    PHX
+	PHX
-        LDX.b #$00
+		LDX.b #$00
-        LDA $7EF35C : BEQ ++ : INX
+		LDA $7EF35C : BEQ ++ : INX
-        ++ : LDA $7EF35D : BEQ ++ : INX
+		++ : LDA $7EF35D : BEQ ++ : INX
-        ++ : LDA $7EF35E : BEQ ++ : INX
+		++ : LDA $7EF35E : BEQ ++ : INX
-        ++ : LDA $7EF35F : BEQ ++ : INX
+		++ : LDA $7EF35F : BEQ ++ : INX
-        ++
+		++
-        TXA
+		TXA
-    PLX
+	PLX
 RTS
 ;--------------------------------------------------------------------------------
 ActivateGoal:
-    STZ $11
+	STZ $11
-    STZ $B0
+	STZ $B0
 JML.l StatsFinalPrep
 ;--------------------------------------------------------------------------------
 ChestPrep:
@@ -1126,7 +1198,23 @@ ChestPrep:
 		JSL.l ChestItemServiceRequest
 		RTL
 	+
-    LDY $0C ; get item value
+	LDY $0C ; get item value
 	SEC
 RTL
 ;--------------------------------------------------------------------------------
+UpdateInventoryLocationExpanded:
+{
+	REP #$30
+	TYA : AND #$00FF : ASL A : TAX
+
+	; Tells what inventory location to write to.
+	LDA.w AddReceivedItemExpanded_item_target_addr, X : STA $00
+
+	SEP #$30
+
+	LDA.b #$7E : STA $02
+
+	LDA.w AddReceivedItemExpanded_item_values, Y
+	JSL ItemDowngradeFix
+	RTL
+}

retro.asm

@@ -20,6 +20,7 @@ LoadBombCount16:
 	.infinite
 RTL
 StoreBombCount:
+	JSL IncrementBombsPlacedCounter
 	PHA : LDA !INFINITE_BOMBS : BEQ .finite
 	.infinite
 		PLA : LDA.b #$01 : RTL

rngfixes.asm

@@ -110,6 +110,10 @@ RTL
 ;--------------------------------------------------------------------------------
 !RNG_POINTERS = "$7F5200"
 GetStaticRNG:
+	LDA.l SeededRNG : BNE .seeded
+	JML GetRandomInt
+	RTL
+.seeded
 	PHX : PHP
 	REP #$30 ; set 16-bit accumulator and index registers
 	AND.w #$000F

special_weapons.asm

@@ -0,0 +1,587 @@
+;--------------------------------------------------------------------------------
+!ANCILLA_DAMAGE = "$06EC84"
+; start with X = sprite index, A = ancilla type index
+;--------------------------------------------------------------------------------
+DamageClassCalc:
+	PHA
+	LDA GanonVulnerabilityItem : BEQ +
+	LDA $0E20, X : CMP #$D7 : BNE +
+	PLA
+	JSL Ganon_CheckAncillaVulnerability
+	RTL
++
+	LDA SpecialWeapons : CMP #$06 : BEQ .cane_immune ; only crystal switches in bee mode
+	PLA
+	CMP #$01 : BEQ .red_cane
+	CMP #$2C : BEQ .red_cane
+	CMP #$31 : BEQ .blue_cane
+	CMP #$0C : BEQ .beam
+	BRA .not_cane_or_beam
+.red_cane
+	PHA
+	LDA SpecialWeapons : CMP #$01 : BEQ .cane_immune
+	                     CMP #$03 : BEQ .cane_immune
+	                     CMP #$04 : BEQ .special_cane
+	                     CMP #$05 : BEQ .special_cane
+	BRA .normal
+.blue_cane
+	PHA
+	LDA SpecialWeapons : CMP #$01 : BEQ .cane_immune
+	                     CMP #$03 : BEQ .special_cane
+	                     CMP #$04 : BEQ .cane_immune
+	                     CMP #$05 : BEQ .special_cane
+	BRA .normal
+.cane_immune
+	LDA $0E20, X : CMP.b #$1E : BEQ .normal ; crystal switch
+	PLA
+	BRA .impervious
+.special_cane
+	PLA
+	LDA $0E20, X : CMP.b #$D6 : BEQ .unstunned_ganon
+	CMP.b #$88 : BEQ .mothula
+	BRA .special_level
+.impervious
+	LDA #$FF
+	RTL
+.beam
+	PHA
+	LDA SpecialWeapons : CMP #$02 : BNE .normal
+	PLA
+	LDA #$05
+	RTL
+.normal
+	PLA
+.not_cane_or_beam
+	CMP #$07 : BNE .no_change
+	LDA SpecialWeapons : CMP #$01 : BNE .normal_bombs
+	LDA !WEAPON_LEVEL : BEQ .normal_bombs
+	LDA $0E20, X : CMP.b #$D6 : BEQ .unstunned_ganon
+	CMP.b #$D7 : BEQ .stunned_ganon
+	CMP.b #$88 : BEQ .mothula
+	CMP.b #$91 : BEQ .stalfos_knight
+	CMP.b #$92 : BEQ .helmasaur_king
+.special_level
+	LDA !WEAPON_LEVEL
+	BRA .done
+.mothula
+	LDA !WEAPON_LEVEL
+	CMP #$04 : !BGE .fix_mothula
+	BRA .done
+.fix_mothula
+	LDA #$03
+	BRA .done
+.stalfos_knight
+	LDA !StalfosBombDamage : BEQ .special_level
+	LDA #$08
+	BRA .done
+.helmasaur_king
+	LDA $0DB0, X : CMP #$03 : !BGE .special_level
+	LDA #$08
+	BRA .done
+.unstunned_ganon
+	LDA $04C5 : CMP.b #$02 : BNE .impervious
+	LDA $0EE0, X : BNE .impervious
+	LDA #$34 : STA $0EE0, X ; give the poor pig some iframes
+	BRA .special_level
+.stunned_ganon
+	LDA $0EE0, X : BNE .impervious
+	LDA #$34 : STA $0EE0, X ; give the poor pig some iframes
+	LDA #$20 : STA $0F10, X ; knock ganon back or something? idk
+	LDA #$09
+	BRA .done
+.normal_bombs
+	LDA #$07
+.no_change
+	PHX : TAX
+	LDA.l !ANCILLA_DAMAGE, X
+	PLX
+	CMP.b #$06 : BNE .done ; not arrows
+	LDA $7EF340 : CMP.b #$03 : !BGE .actual_silver_arrows
+.normal_arrows
+	LDA #$06
+.done
+	RTL
+.actual_silver_arrows
+	LDA $0E20, X : CMP.b #$D7 : BNE +
+	LDA SpecialWeapons : CMP #$01 : BEQ .normal_arrows
+	LDA #$20 : STA $0F10, X
+	+
+	LDA #$09
+	RTL
+; end with X = sprite index, A = damage class
+;--------------------------------------------------------------------------------
+!SPRITE_SETUP_HIT_BOX_LONG = "$0683EA"
+!UTILITY_CHECK_IF_HIT_BOXES_OVERLAP_LONG = "$0683E6"
+; start with X = ancilla index, Y = sprite index
+;--------------------------------------------------------------------------------
+Utility_CheckAncillaOverlapWithSprite:
+	LDA $0E20, Y : CMP #$09 : BEQ .giant_moldorm
+	CMP #$CB : BEQ .trinexx
+.not_giant_moldorm ; ordinary collision checking
+	PHY : PHX
+	TYX
+	JSL !SPRITE_SETUP_HIT_BOX_LONG
+	PLX : PLY
+	JSL !UTILITY_CHECK_IF_HIT_BOXES_OVERLAP_LONG
+	RTL
+.giant_moldorm
+	LDA $0E10, Y : BNE .ignore_collision ; Moldy can have little a I-Frames, as a treat
+	LDA.l SpecialWeapons : CMP #$01 : BNE ++
+	LDA $0C4A, X : CMP #$07 : BEQ .check_collision_moldorm
+	BRA .ignore_collision ; don't collide with non-bombs
+++ : LDA.l SpecialWeapons : CMP #$03 : BNE ++
+	LDA $0C4A, X : CMP #$31 : BEQ .check_collision_moldorm
+	BRA .ignore_collision ; don't collide with non-byrna
+++ : LDA.l SpecialWeapons : CMP #$04 : BNE ++
+	LDA $0C4A, X : CMP #$01 : BEQ .check_collision_moldorm
+	               CMP #$2C : BEQ .check_collision_moldorm
+	BRA .ignore_collision ; don't collide with non-somaria
+++ : LDA.l SpecialWeapons : CMP #$05 : BNE .ignore_collision
+	LDA $0C4A, X : CMP #$01 : BEQ .check_collision_moldorm
+	               CMP #$2C : BEQ .check_collision_moldorm
+	               CMP #$31 : BEQ .check_collision_moldorm
+	BRA .ignore_collision ; don't collide with non-canes
+
+.check_collision_moldorm
+	JSR SetUpMoldormHitbox
+	JSL !UTILITY_CHECK_IF_HIT_BOXES_OVERLAP_LONG
+	RTL
+
+.ignore_collision
+	CLC
+	RTL
+
+.trinexx
+	LDA.l SpecialWeapons : CMP #$01 : BNE ++
+	LDA $0C4A, X : CMP #$07 : BEQ .check_collision_trinexx
+	BRA .ignore_collision ; don't collide with non-bombs
+++ : LDA.l SpecialWeapons : CMP #$03 : BNE ++
+	LDA $0C4A, X : CMP #$31 : BEQ .check_collision_trinexx
+	JMP .ignore_collision ; don't collide with non-byrna
+++ : LDA.l SpecialWeapons : CMP #$04 : BNE ++
+	LDA $0C4A, X : CMP #$01 : BEQ .check_collision_trinexx
+	               CMP #$2C : BEQ .check_collision_trinexx
+	JMP .ignore_collision ; don't collide with non-somaria
+++ : LDA.l SpecialWeapons : CMP #$05 : BNE .ignore_collision
+	LDA $0C4A, X : CMP #$01 : BEQ .check_collision_trinexx
+	               CMP #$2C : BEQ .check_collision_trinexx
+	               CMP #$31 : BEQ .check_collision_trinexx
+	JMP .ignore_collision ; don't collide with non-canes
+
+.check_collision_trinexx
+	JSR SetUpTrinexxHitbox
+	JSL !UTILITY_CHECK_IF_HIT_BOXES_OVERLAP_LONG
+	RTL
+; returns carry clear if there was no overlap
+;--------------------------------------------------------------------------------
+SetUpTrinexxHitbox:
+	; rearrange trinexx's hitbox to be her middle instead of her head
+	LDA $0CAA, Y : PHA
+	LDA $0E60, Y : PHA
+	LDA $0D10, Y : PHA
+	LDA $0D30, Y : PHA
+	LDA $0D00, Y : PHA
+	LDA $0D20, Y : PHA
+
+	LDA #$80 : STA $0CAA, Y
+
+	PHX
+	LDA $0E80, Y : !SUB.l $1DAF28 : AND.b #$7F : TAX
+
+	LDA $7FFC00, X : STA $0D10, Y
+	LDA $7FFC80, X : STA $0D30, Y
+	LDA $7FFD00, X : STA $0D00, Y
+	LDA $7FFD80, X : STA $0D20, Y
+
+	TYX
+	STZ $0E60, X
+
+	JSL !SPRITE_SETUP_HIT_BOX_LONG
+	PLX
+
+	PLA : STA $0D20, Y
+	PLA : STA $0D00, Y
+	PLA : STA $0D30, Y
+	PLA : STA $0D10, Y
+	PLA : STA $0E60, Y
+	PLA : STA $0CAA, Y
+	RTS
+;--------------------------------------------------------------------------------
+SetUpMoldormHitbox:
+	; rearrange moldorm's hitbox to be his tail instead of his head
+	LDA $0D90, Y : PHA
+	LDA $0F60, Y : PHA
+	LDA $0D10, Y : PHA
+	LDA $0D30, Y : PHA
+	LDA $0D00, Y : PHA
+	LDA $0D20, Y : PHA
+
+	PHY : PHX
+	LDA $0E80, Y : !SUB.b #$30 : AND.b #$7F : TAX
+
+	LDA $7FFC00, X : STA $0D10, Y
+	LDA $7FFC80, X : STA $0D30, Y
+	LDA $7FFD00, X : STA $0D00, Y
+	LDA $7FFD80, X : STA $0D20, Y
+	LDA #$01 : STA $09D0, Y
+
+	TYX
+	STZ $0F60, X
+
+	JSL !SPRITE_SETUP_HIT_BOX_LONG
+
+	PLX : PLY
+
+	PLA : STA $0D20, Y
+	PLA : STA $0D00, Y
+	PLA : STA $0D30, Y
+	PLA : STA $0D10, Y
+	PLA : STA $0F60, Y
+	PLA : STA $0D90, Y
+	RTS
+;--------------------------------------------------------------------------------
+; start with X = ancilla index, Y = sprite index
+Utility_CheckHelmasaurKingCollision:
+	LDA.l SpecialWeapons : CMP #$01 : BNE ++
+	LDA $0C4A, X : CMP #$07 : BEQ .collide
+	BRA .normal ; normal behavior with non-bombs
+++ : LDA.l SpecialWeapons : CMP #$03 : BNE ++
+	LDA $0C4A, X : CMP #$31 : BEQ .collide
+	BRA .normal ; normal behavior with non-byrna
+++ : LDA.l SpecialWeapons : CMP #$04 : BNE ++
+	LDA $0C4A, X : CMP #$01 : BEQ .collide
+	               CMP #$2C : BEQ .collide
+	BRA .normal ; normal behavior with non-somaria
+++ : LDA.l SpecialWeapons : CMP #$05 : BNE .normal
+	LDA $0C4A, X : CMP #$01 : BEQ .collide
+	               CMP #$2C : BEQ .collide
+	               CMP #$31 : BEQ .collide
+	BRA .normal ; normal behavior with non-canes
+.collide
+	CLC
+	RTL
+.normal
+	LDA $0DB0, Y : CMP.b #$03
+	RTL
+; returns carry set if there is collision immunity
+;--------------------------------------------------------------------------------
+Utility_CheckHammerHelmasaurKingMask:
+	LDA.l SpecialWeapons : CMP #$01 : BEQ .no_effect
+	LDA $0301 : AND #$0A
+	RTL
+.no_effect
+	LDA #$00
+	RTL
+;--------------------------------------------------------------------------------
+Utility_CheckImpervious:
+	LDA $0E20, X : CMP.b #$CB : BNE .normal
+.trinexx
+	LDA SpecialWeapons : CMP #$01 : BEQ +
+	                     CMP #$03 : BEQ +
+	                     CMP #$04 : BEQ +
+	                     CMP #$05 : BEQ +
+	                     CMP #$06 : BEQ .check_sidenexx
+	BRA .normal
++
+	LDA $0301 : AND.b #$0A : BNE .impervious ; impervious to hammer
+.check_sidenexx
+	LDA.w $0DD1 : ORA.w $0DD2 : BNE .impervious ; at least one sidenexx alive
+	LDA.w $0D80, X : CMP.b #$02 : BCS .impervious ; at least one sidenexx alive
+	BRA .not_impervious
+.normal
+	LDA $0E60, X : AND.b #$40 : BNE .impervious
+	LDA $0CF2 : CMP #$FF : BEQ .impervious ; special "always-impervious" class
+	LDA $0E20, X : CMP.b #$CC : BEQ .sidenexx : CMP.b #$CD : BEQ .sidenexx
+	LDA $0301 : AND.b #$0A : BEQ .not_impervious ; normal behavior if not hammer
+	JSL Ganon_CheckHammerVulnerability : BCS .not_impervious
+	LDA SpecialWeapons : CMP #$01 : BEQ +
+	                     CMP #$03 : BEQ +
+	                     CMP #$04 : BEQ +
+	                     CMP #$05 : BEQ +
+	BRA .not_impervious
++
+	LDA $0E20, X : CMP.b #$1E : BEQ .not_impervious ; crystal switch
+	CMP.b #$40 : BEQ .not_impervious ; aga barrier
+	BRA .impervious
+.not_impervious
+	LDA #$00 : RTL
+.impervious
+	LDA #$01 : RTL
+.sidenexx
+	LDA $0CAA, X : AND.b #$04 : BEQ .vulnerable
+	LDA SpecialWeapons : CMP #$01 : BEQ +
+	                     CMP #$03 : BEQ +
+	                     CMP #$04 : BEQ +
+	                     CMP #$05 : BEQ +
+	BRA .not_impervious
++
+	LDA $0CF2 : CMP #$06 : !BLT .impervious ; swords are ineffective
+	BRA .not_impervious
+.vulnerable
+	LDA SpecialWeapons : CMP #$01 : BEQ +
+	                     CMP #$03 : BEQ +
+	                     CMP #$04 : BEQ +
+	                     CMP #$05 : BEQ +
+	BRA .not_impervious
++
+	LDA $0CF2 : CMP #$06 : !BGE .impervious ; non-swords are ineffective
+	BRA .not_impervious
+; returns nonzero A if impervious
+;--------------------------------------------------------------------------------
+!SPRITE_INITIALIZED_SEGMENTED = "$1DD6D1"
+; start with X = sprite index
+;--------------------------------------------------------------------------------
+AllowBombingMoldorm:
+	LDA SpecialWeapons : CMP #$01 : BEQ .no_disable_projectiles
+	                     CMP #$03 : BEQ .no_disable_projectiles
+	                     CMP #$04 : BEQ .no_disable_projectiles
+	                     CMP #$05 : BEQ .no_disable_projectiles
+	                     CMP #$06 : BEQ .no_disable_projectiles
+	INC $0BA0, X
+.no_disable_projectiles
+	JSL !SPRITE_INITIALIZED_SEGMENTED
+	RTL
+;--------------------------------------------------------------------------------
+AllowBombingBarrier:
+	; what we wrote over
+	LDA $0D00, X : !SUB.b #$0C : STA $0D00, X
+	LDA $0E20, X : CMP #$40 : BNE .disable_projectiles
+	LDA SpecialWeapons : CMP #$01 : BEQ .no_disable_projectiles
+	                     CMP #$03 : BEQ .no_disable_projectiles
+	                     CMP #$04 : BEQ .no_disable_projectiles
+	                     CMP #$05 : BEQ .no_disable_projectiles
+	                     CMP #$06 : BEQ .no_disable_projectiles
+.disable_projectiles
+	INC $0BA0, X
+.no_disable_projectiles
+	RTL
+;--------------------------------------------------------------------------------
+DrawBombInMenu:
+	JSL LoadBombCount16 : AND.w #$00FF : BEQ .noBombs
+	LDA SpecialWeapons : AND.w #$00FF : CMP.w #$0001 : BNE .vanillaBombs
+	LDA.l !WEAPON_LEVEL : AND.w #$00FF : BEQ .noBombs : STA $02
+	LDA.w #$FC81 : STA $04
+	BRA .done
+.vanillaBombs
+	LDA.w #$0001 : STA $02
+	LDA.w #$F699 : STA $04
+	BRA .done
+.noBombs
+	LDA.w #$0000 : STA $02
+	LDA.w #$F699 : STA $04
+.done
+	RTL
+;--------------------------------------------------------------------------------
+DrawSwordInMenu:
+	LDA SpecialWeapons : AND.w #$00FF : CMP.w #$0001 : BEQ .specialSword
+	                                    CMP.w #$0003 : BEQ .specialSword
+	                                    CMP.w #$0004 : BEQ .specialSword
+	                                    CMP.w #$0005 : BEQ .specialSword
+	LDA $7EF359 : AND.w #$00FF : CMP.w #$00FF : BEQ .noSword
+.hasSword
+	STA $02
+	LDA.w #$F859 : STA $04
+	RTL
+.noSword
+	LDA.w #$0000 : STA $02
+	LDA.w #$F859 : STA $04
+	RTL
+.specialSword
+	LDA !WEAPON_LEVEL : AND.w #$00FF : STA $02
+	LDA.w #$FC51 : STA $04
+	RTL
+;--------------------------------------------------------------------------------
+DrawBombInYBox:
+	CPX.w #$0004 : BNE .done
+	LDA SpecialWeapons : AND.w #$00FF : CMP.w #$0001 : BNE .vanilla
+	LDA !WEAPON_LEVEL : AND.w #$00FF : CLC : ADC.w #$00BD : BRA .done
+.vanilla
+	LDA.w #$0001
+.done
+	RTL
+;--------------------------------------------------------------------------------
+BombIcon:
+	dw $207F, $207F, $3C88, $3C89, $2C88, $2C89, $2488, $2489, $2888, $2889,$2888, $2889
+DrawBombOnHud:
+	PHB
+	LDA.w #$0149
+	LDX.w #$86B0
+	LDY.w #$C700
+	MVN $7E, $21
+	PLB
+
+	LDA.l SpecialWeapons : AND.w #$00FF : CMP.w #$0001 : BNE .regularBombs
+	LDA.l !WEAPON_LEVEL : AND.w #$00FF : ASL #2 : TAX
+	LDA.l BombIcon, X : STA.l $7EC71A
+	LDA.l BombIcon+2, X : STA.l $7EC71C
+.regularBombs
+	RTL
+;--------------------------------------------------------------------------------
+BombSpriteColor:
+	db $04, $08, $04, $02, $0A, $0A
+SetBombSpriteColor:
+	LDA.l SpecialWeapons : CMP.b #$01 : BNE .normal
+	PHX
+	LDA.l !WEAPON_LEVEL
+	TAX
+	LDA.l BombSpriteColor, X
+	STA $0B
+	PLX
+	RTL
+.normal
+	LDA #$04 : STA $0B
+	RTL
+;--------------------------------------------------------------------------------
+StoreSwordDamage:
+	LDA.l SpecialWeapons : CMP #$02 : BEQ +
+	LDA.l $06ED39, X : RTL
+	+
+	LDA #$05
+	RTL
+;--------------------------------------------------------------------------------
+BeeDamageClass:
+	db $FF
+	db $06, $00, $07, $08, $0A
+	db $0B, $0C, $0D, $0E, $0F
+	db $FF, $03, $FF, $FF, $FF
+	db $FF, $01, $01, $FF, $FF
+CheckDetonateBomb:
+	LDA.l SpecialWeapons : CMP.b #$01 : BNE .not_bomb_mode
+.detonate_bombs
+	LDX.b #09
+.check_ancilla
+	LDA.w $0C4A, X
+	CMP.b #$07
+	BNE .next_ancilla
+	LDA.b #03
+	STA.w $039F, X
+.next_ancilla
+	DEX
+	BPL .check_ancilla
+	BRA .done
+.not_bomb_mode
+	LDA.l SpecialWeapons : CMP.b #$06 : BNE .done
+	LDX.w $0202
+	LDA.l BeeDamageClass, X : CMP.b #$FF : BEQ .nope
+	JSL $1EDCC9
+	BMI .nope
+	LDX.w $0202
+	LDA.l BeeDamageClass, X
+	CMP.b #$06 : BNE .set_bee_class
+	LDA.l $7EF340 : CMP.b #$03 : !BGE .silver_arrows
+	LDA.b #$06
+	BRA .set_bee_class
+.silver_arrows
+	LDA.b #$09
+.set_bee_class
+	STA.w $0ED0, Y
+	BRA .done
+.nope
+	LDA.b #$3C
+	STA.w $0CF8
+	JSL $0DBB67
+	ORA.w $0CF8
+	STA.w $012E
+.done
+	; what we wrote over
+	LDA.b #$80
+	TSB.b $3A
+	RTL
+;--------------------------------------------------------------------------------
+SetBeeType:
+	LDA.l SpecialWeapons : CMP.b #$06 : BEQ .bee_mode
+	LDX.w $0202
+.check_bee_type
+	LDA.l $7EF33F, X
+	TAX
+	LDA.l $7EF35B, X
+	CMP.b #$08
+	BNE .regular_bee
+	LDA.b #$01
+	STA.w $0EB0, Y
+.regular_bee
+	LDA.b #$01
+	STA.w $0ED0, Y
+	RTL
+.bee_mode
+	LDX.w $0202
+	CPX.b #$10 : BEQ .check_bee_type
+	BRA .regular_bee
+;--------------------------------------------------------------------------------
+ArrghusBoing:
+	LDA.l SpecialWeapons : CMP.b #$06 : BNE .done
+	LDA.w $0F60, X : AND.b #$BF : STA.w $0F60, X
+.done
+	; what we wrote over
+	LDA.b #$03
+	STA.w $0D80, X
+	RTL
+;--------------------------------------------------------------------------------
+BeeCheckTarget:
+CPY.w $0FA0
+BEQ .unsuitable_target
+
+LDA.w $0DD0,Y
+CMP.b #$09
+BCC .unsuitable_target
+
+LDA.w $0F00,Y
+BNE .unsuitable_target
+
+; in bee-mode skip targets that the bee can't hurt
+LDA.l SpecialWeapons : CMP.b #$06 : BNE +
+JSR BeeCheckDamage
+CMP.b #$00 : BEQ .unsuitable_target
++
+
+LDA.w $0E40,Y
+BMI .potential_target
+
+LDA.w $0F20,Y
+CMP.w $0F20,X
+BNE .unsuitable_target
+
+LDA.w $0F60,Y
+AND.b #$40
+BEQ +
+LDA.l SpecialWeapons : CMP.b #$06 : BNE .unsuitable_target
+; in bee mode, allow targetting anti-fairies, bunny beams, and keese
+LDA.w $0E20,Y
+CMP.b #$15 : BEQ + ; anti-fairy
+CMP.b #$6F : BEQ + ; keese
+CMP.b #$D1 : BEQ + ; bunny beam
+BRA .unsuitable_target
++
+
+LDA.w $0BA0,Y
+BEQ .valid_target
+BRA .unsuitable_target
+
+.potential_target
+LDA.w $0EB0,X
+BEQ .unsuitable_target
+
+LDA.w $0CD2,Y
+AND.b #$40
+BNE .valid_target
+
+.unsuitable_target
+CLC : RTL
+
+.valid_target
+SEC : RTL
+;--------------------------------------------------------------------------------
+BeeCheckDamage:
+PHX : PHP
+REP #$20
+LDA.w $0E20,Y : AND.w #$00FF
+ASL #4
+SEP #$20
+ORA.w $0ED0,X
+REP #$30
+TAX
+SEP #$20
+JSL LookupDamageLevel
+SEP #$10
+PLP : PLX
+RTS

stats.asm

@@ -1,7 +1,7 @@
 ;================================================================================
 ; Stat Tracking
 ;================================================================================
-; $7EF420 - $7EF468 - Stat Tracking
+; $7EF420 - $7EF46F - Stat Tracking
 ;--------------------------------------------------------------------------------
 ; $7EF420 - bonk counter
 ;--------------------------------------------------------------------------------
@@ -139,6 +139,12 @@
 ;--------------------------------------------------------------------------------
 ; $7EF468 - chest turn counter
 ;--------------------------------------------------------------------------------
+; $7EF46Aw[2] - damage counter
+;--------------------------------------------------------------------------------
+; $7EF46Cw[2] - magic counter
+;--------------------------------------------------------------------------------
+; $7EF46Ew[2] - bombs placed counter
+;--------------------------------------------------------------------------------
 
 ;--------------------------------------------------------------------------------
 !LOCK_STATS = "$7EF443"
@@ -328,6 +334,17 @@ IncrementChestTurnCounter:
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
+!BOMBS_PLACED_COUNTER = "$7EF46E"
+IncrementBombsPlacedCounter:
+	PHA
+		LDA !LOCK_STATS : BNE +
+			PHP : REP #$20
+			LDA !BOMBS_PLACED_COUNTER : INC : STA !BOMBS_PLACED_COUNTER
+			PLP
+		+
+	PLA
+RTL
+;--------------------------------------------------------------------------------
 !CHEST_COUNTER = "$7EF442"
 IncrementChestCounter:
 	LDA.b #$01 : STA $02E9 ; thing we wrote over

stats/creditsnew.asm

@@ -3,15 +3,59 @@
 ;===================================================================================================
 table "creditscharmapbighi.txt"
 YourSpriteCreditsHi:
-db 2
+db 2, 55, "                            " ; $238002
-db 55
-db "                            " ; $238002
 
 table "creditscharmapbiglo.txt"
 YourSpriteCreditsLo:
-db 2
+db 2, 55, "                            " ; $238020
-db 55
+
-db "                            " ; $238020
+table "creditscharmapbighi.txt"
+FirstSwordStatsHi:
+db 2, 55, "FIRST SWORD                 " ; $23803E
+
+table "creditscharmapbiglo.txt"
+FirstSwordStatsLo:
+db 2, 55, "FIRST SWORD                 " ; $23805C
+
+table "creditscharmapbighi.txt"
+SwordlessKillsHi:
+db 2, 55, "SWORDLESS                /13" ; $23807A
+
+table "creditscharmapbiglo.txt"
+SwordlessKillsLo:
+db 2, 55, "SWORDLESS                /13" ; $238098
+
+table "creditscharmapbighi.txt"
+FighterSwordKillsHi:
+db 2, 55, "FIGHTER'S SWORD          /13" ; $2380B6
+
+table "creditscharmapbiglo.txt"
+FighterSwordKillsLo:
+db 2, 55, "FIGHTER'S SWORD          /13" ; $2380D4
+
+table "creditscharmapbighi.txt"
+MasterSwordKillsHi:
+db 2, 55, "MASTER SWORD             /13" ; $2380F2
+
+table "creditscharmapbiglo.txt"
+MasterSwordKillsLo:
+db 2, 55, "MASTER SWORD             /13" ; $238110
+
+table "creditscharmapbighi.txt"
+TemperedSwordKillsHi:
+db 2, 55, "TEMPERED SWORD           /13" ; $23812E
+
+table "creditscharmapbiglo.txt"
+TemperedSwordKillsLo:
+db 2, 55, "TEMPERED SWORD           /13" ; $23814C
+
+table "creditscharmapbighi.txt"
+GoldSwordKillsHi:
+db 2, 55, "GOLD SWORD               /13" ; $23816A
+
+table "creditscharmapbiglo.txt"
+GoldSwordKillsLo:
+db 2, 55, "GOLD SWORD               /13" ; $238188
 
 ;===================================================================================================
 
@@ -596,7 +640,8 @@ endif
 %blankline()
 %blankline()
 
-%bigcreditsleft("FIRST SWORD")
+%addarbline(FirstSwordStatsHi)
+%addarbline(FirstSwordStatsLo)
 
 %blankline()
 
@@ -619,23 +664,28 @@ endif
 %blankline()
 %blankline()
 
-%bigcreditsleft("SWORDLESS                /13")
+%addarbline(SwordlessKillsHi)
+%addarbline(SwordlessKillsLo)
 
 %blankline()
 
-%bigcreditsleft("FIGHTER'S SWORD          /13")
+%addarbline(FighterSwordKillsHi)
+%addarbline(FighterSwordKillsLo)
 
 %blankline()
 
-%bigcreditsleft("MASTER SWORD             /13")
+%addarbline(MasterSwordKillsHi)
+%addarbline(MasterSwordKillsLo)
 
 %blankline()
 
-%bigcreditsleft("TEMPERED SWORD           /13")
+%addarbline(TemperedSwordKillsHi)
+%addarbline(TemperedSwordKillsLo)
 
 %blankline()
 
-%bigcreditsleft("GOLD SWORD               /13")
+%addarbline(GoldSwordKillsHi)
+%addarbline(GoldSwordKillsLo)
 
 %blankline()
 %blankline()
@@ -657,6 +707,10 @@ endif
 
 %blankline()
 
+%bigcreditsleft("BOMBS PLACED")
+
+%blankline()
+
 %bigcreditsleft("SAVE AND QUITS")
 
 %blankline()
@@ -676,11 +730,6 @@ endif
 %bigcreditsleft("TOTAL LAG TIME")
 
 %blankline()
-%blankline()
-
-
-%blankline()
-%blankline()
 
 
 %blankline()
@@ -736,16 +785,18 @@ endif
 !MAGICUSED_Y = 349
 !BONKS_X = 26
 !BONKS_Y = 352
+!BOMBS_X = 26
+!BOMBS_Y = 355
 !SAVE_AND_QUITS_X = 26
-!SAVE_AND_QUITS_Y = 355
+!SAVE_AND_QUITS_Y = 358
 !DEATHS_X = 26
-!DEATHS_Y = 358
+!DEATHS_Y = 361
 !FAERIE_REVIVALS_X = 26
-!FAERIE_REVIVALS_Y = 361
+!FAERIE_REVIVALS_Y = 364
 !TOTAL_MENU_TIME_X = 19
-!TOTAL_MENU_TIME_Y = 364
+!TOTAL_MENU_TIME_Y = 367
 !TOTAL_LAG_TIME_X = 19
-!TOTAL_LAG_TIME_Y = 367
+!TOTAL_LAG_TIME_Y = 370
 !COLLECTION_RATE_X = 22
 !COLLECTION_RATE_Y = 380
 !TOTAL_TIME_X = 19

stats/statConfig.asm

@@ -12,6 +12,7 @@
 %AddStat($7EF46A, 0, 0, 16, 5, !DAMAGETAKEN_X, !DAMAGETAKEN_Y)
 %AddStat($7EF46C, 0, 0, 16, 5, !MAGICUSED_X, !MAGICUSED_Y)
 %AddStat($7EF420, 0, 0, 08, 3, !BONKS_X, !BONKS_Y)
+%AddStat($7EF46E, 0, 0, 16, 4, !BOMBS_X, !BOMBS_Y)
 %AddStat($7EF42D, 0, 0, 08, 2, !SAVE_AND_QUITS_X, !SAVE_AND_QUITS_Y)
 %AddStat($7EF449, 0, 0, 08, 2, !DEATHS_X, !DEATHS_Y)
 %AddStat($7EF453, 0, 0, 08, 3, !FAERIE_REVIVALS_X, !FAERIE_REVIVALS_Y)

swordswap.asm

@@ -39,25 +39,37 @@ LoadSwordForDamage:
 	JSR.w LoadModifiedSwordLevel ; load normal sword value
 RTL
 ;================================================================================
+macro LookupDamageSubclass(table_address)
+	PHP
+	REP #$20 ; set 16-bit accumulator
+	TXA : LSR : TAX : BCS +
+		PLP
+		LDA.l <table_address>, X
+		LSR #4
+		BRA ++
+	+
+		PLP
+		LDA.l <table_address>, X
+		AND.b #$0F
+	++
+endmacro
+;================================================================================
 ;!StalfosBombDamage = "$7F509D"
 LookupDamageLevel:
 	CPX.w #$0918 : BNE +
 		LDA.l !StalfosBombDamage
 		RTL
 	+
-	PHP
+	LDA SpecialWeapons : CMP #$01 : BEQ .bomb_table
-		REP #$20 ; set 16-bit accumulator
+	                     CMP #$02 : BEQ .pseudo_table
-		TXA : LSR : TAX : BCS .lower
+	                     CMP #$03 : BEQ .bomb_table
-.upper
+	                     CMP #$04 : BEQ .bomb_table
-	PLP
+	                     CMP #$05 : BEQ .bomb_table
-	LDA.l Damage_Table, X
+		%LookupDamageSubclass(Damage_Table) : RTL
-	LSR #4
+	.bomb_table
-RTL
+		%LookupDamageSubclass(Damage_Table_Bombs) : RTL
-.lower
+	.pseudo_table
-	PLP
+		%LookupDamageSubclass(Damage_Table_Pseudo) : RTL
-	LDA.l Damage_Table, X
-	AND.b #$0F
-RTL
 ;================================================================================
 ; $7F50C0 - Sword Modifier
 LoadModifiedSwordLevel: ; returns short
@@ -96,29 +108,39 @@ LoadModifiedMagicLevel:
 RTL
 ;================================================================================
 ; $7E0348 - Ice Value
-; $7F50C7 - Ice Modifier
+; $7F50C7 - Temporary Ice Modifier
+; $30802D - Permanent Ice Modifier ($01 bit)
+LoadModifiedIceFloorValue:
+	LDA $A0 : CMP #$91 : BEQ + : CMP #$92 : BEQ + : CMP #$93 : BEQ + ; mire basement currently broken - not sure why
+	LDA $5D : CMP #$01 : BEQ + : CMP #$17 : BEQ + : CMP #$1C : BEQ +
+	LDA $5E : CMP #$02 : BEQ +
+	LDA $5B : BNE +
+	LDA.l $30802D : BIT #$01 : BEQ ++
+	LDA $A0 : CMP #$16 : BEQ ++ ; swamp supertile with current -- fine for temporary physics but impossible without boots for permanent
+	LDA.w $0348 : ORA $7F50C7 : ORA #$10 : RTS
+	++ : LDA.w $0348 : ORA $7F50C7 : RTS
+	+ : LDA.w $0348
+RTS
 LoadModifiedIceFloorValue_a11:
-	LDA $A0 : CMP #$91 : BEQ + : CMP #$92 : BEQ + : CMP #$93 : BEQ + ; mire basement currently broken - not sure why
+  JSR LoadModifiedIceFloorValue : AND.b #$11 : RTL
-	LDA $5D : CMP #$01 : BEQ + : CMP #$17 : BEQ + : CMP #$1C : BEQ +
-	LDA $5E : CMP #$02 : BEQ +
-	LDA $5B : BNE +
-		LDA.w $0348 : ORA $7F50C7 : AND.b #$11 : RTL
-	+ : LDA.w $0348 : AND.b #$11
-RTL
 LoadModifiedIceFloorValue_a01:
-	LDA $A0 : CMP #$91 : BEQ + : CMP #$92 : BEQ + : CMP #$93 : BEQ + ; mire basement currently broken - not sure why
+  JSR LoadModifiedIceFloorValue : AND.b #$01 : RTL
-	LDA $5D : CMP #$01 : BEQ + : CMP #$17 : BEQ + : CMP #$1C : BEQ +
-	LDA $5E : CMP #$02 : BEQ +
-	LDA $5B : BNE +
-		LDA.w $0348 : ORA $7F50C7 : AND.b #$01 : RTL
-	+ : LDA.w $0348 : AND.b #$01
-RTL
 ;================================================================================
 CheckTabletSword:
 	LDA.l AllowHammerTablets : BEQ +
-	LDA $7EF34B : BEQ + ; check for hammer
+	LDA $7EF34B : BNE .allow ; check for hammer
-		LDA.b #$02 : RTL
 	+
+	LDA.l SpecialWeapons : CMP #$01 : BEQ .check_special
+	                       CMP #$03 : BEQ .check_special
+	                       CMP #$04 : BEQ .check_special
+	                       CMP #$05 : BEQ .check_special
+	                       CMP #$06 : BEQ .allow
+	BRA .normal
+	.allow
+		LDA.b #$02 : RTL
+	.check_special
+	LDA !WEAPON_LEVEL : CMP #$02 : !BGE .allow ; check for master bombs
+	.normal
 	LDA $7EF359 ; get actual sword value
 RTL
 ;================================================================================
@@ -134,7 +156,17 @@ CheckGanonHammerDamage:
 	LDA $0E20, X : CMP.b #$D8 ; original behavior except ganon
 RTL
 	+
+	LDA.l GanonVulnerabilityItem : CMP.b #$0C : BEQ +
 	LDA $0E20, X : CMP.b #$D6 ; original behavior
+RTL
+  +
+	LDA $0E20, X : CMP.b #$D8 : BCC +
+RTL
+  +
+  CMP.b #$D6 : BNE +
+RTL
+  +
+  CLC
 RTL
 ;================================================================================
 GetSmithSword:

tables.asm

@@ -98,7 +98,28 @@ db #$02 ; #$02 = Tempered Sword (default)
 ;org $05EBD4 ; PC 0x2EBD4 - sprite_zelda.asm:23 - (LDA $7EF359 : CMP.b #$02 : BCS .hasMasterSword) - Zelda Spawnpoint Sword Check
 ;db #$05 ; #$02 = Tempered Sword (default) - #$05 = All Swords
 ;--------------------------------------------------------------------------------
-; 0x18002B- 0x18002F (Unused)
+; 0x18002B- 0x18002C (Unused)
+;--------------------------------------------------------------------------------
+org $30802D ; PC 0x18003D
+ChallengeModes:
+; ---- ---i
+; i: Permanent Ice Physics
+db #$00 ; #$00 = Default behavior;
+;--------------------------------------------------------------------------------
+org $30802E ; PC 0x18003E
+GanonVulnerabilityItem:
+db #$00 ; #$00 = Default behavior (silver arrows)
+;--------------------------------------------------------------------------------
+org $30802F ; PC 0x18003F
+SpecialWeapons:
+db #$00
+; $00 = Off (default)
+; $01 = Bomb-Only mode
+; $02 = Pseudosword
+; $03 = Byrna-Only mode
+; $04 = Somaria-Only mode
+; $05 = Canes-Only mode
+; $06 = Bee mode
 ;--------------------------------------------------------------------------------
 org $308030 ; PC 0x180030
 EnableSRAMTrace:
@@ -223,10 +244,13 @@ db #$00 ; #$00 = Off (default) - #$01 = On (frog/smith can enter multi-entrance
 org $30804D ; PC 0x18004D
 EscapeAssist: ; ScrubMode:
 db #$00
-;---- -mba
+;-MBA -mba
-;m - Infinite Magic
+;M - Infinite Magic (after escape)
-;b - Infinite Bombs
+;B - Infinite Bombs (after escape)
-;a - Infinite Arrows
+;A - Infinite Arrows (after escape)
+;m - Infinite Magic (during escape)
+;b - Infinite Bombs (during escape)
+;a - Infinite Arrows (during escape)
 ;--------------------------------------------------------------------------------
 org $30804E ; PC 0x18004E
 UncleRefill:
@@ -242,7 +266,7 @@ db #$01 ; #$00 = Off - #$01 = On (default)
 ;--------------------------------------------------------------------------------
 org $308050 ; PC 0x180050 - 0x18005C
 CrystalPendantFlags_2:
-    db $00 ; Sewers
+	db $00 ; Sewers
 	db $00 ; Hyrule Castle
 	db $00 ; Eastern Palace
 	db $00 ; Desert Palace
@@ -250,7 +274,7 @@ CrystalPendantFlags_2:
 	db $40 ; Swamp Palace
 	db $40 ; Palace of Darkness
 	db $40 ; Misery Mire
-    db $40 ; Skull Woods
+	db $40 ; Skull Woods
 	db $40 ; Ice Palace
 .hera
 	db $00 ; Tower of Hera
@@ -392,7 +416,9 @@ org $30808E ; PC 0x18008E
 FakeBoots:
 db $00 ; #$00 = Off (default) - #$01 = On
 ;--------------------------------------------------------------------------------
-; 0x18008F (unused)
+org $30808F ; PC 0x18008F
+SeededRNG:
+db $01 ; #$00 = Off - #$01 = Seeded RNG (default for rando)
 ;--------------------------------------------------------------------------------
 org $308090 ; PC 0x180090 - 0x180097
 ProgressiveSwordLimit:
@@ -652,7 +678,7 @@ dw $6434 ; #6434 - Crystal
 ;--------------------------------------------------------------------------------
 org $02A09B ; PC 0x1209B - Bank02.asm:5802 - (pool MilestoneItem_Flags:)
 CrystalPendantFlags:
-    db $00 ; Sewers
+	db $00 ; Sewers
 	db $00 ; Hyrule Castle
 	db $04 ; Eastern Palace
 	db $02 ; Desert Palace
@@ -660,7 +686,7 @@ CrystalPendantFlags:
 	db $10 ; Swamp Palace
 	db $02 ; Palace of Darkness
 	db $01 ; Misery Mire
-    db $40 ; Skull Woods
+	db $40 ; Skull Woods
 	db $04 ; Ice Palace
 .hera
 	db $01 ; Tower of Hera
@@ -1406,6 +1432,19 @@ db $04
 ;AD - Small Key of Ganon's Tower
 ;AE - Reserved
 ;AF - Generic Small Key
+
+;B0 - reserved for bee traps
+;B1 - L-1 Bombs
+;B2 - L-2 Bombs
+;B3 - L-3 Bombs
+;B4 - L-4 Bombs
+;B5 - L-5 Bombs
+;B6 - Progressive Bombs
+;B7 - L-1 Cane
+;B8 - L-2 Cane
+;B9 - L-3 Cane
+;BA - L-4 Cane
+;BB - L-5 Cane
 ;================================================================================
 ;;Residual Portal
 ;org $0283E0 ; PC 0x103E0 (Bank02.asm:816) (BNE)
@@ -1620,7 +1659,7 @@ dw $0000, $0000, $0000, $0000, $F800, $0000, $0000, $0000
 dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
 dw $0000, $0000
 ;--------------------------------------------------------------------------------
-; 0x182355 - 183FFF (unused)
+; 0x183055 - 183FFF (unused)
 ;================================================================================
 org $30C000 ; PC 0x184000 - 0x184007
 ItemSubstitutionRules:

utilities.asm

@@ -99,19 +99,19 @@ RTL
 ;DATA - Loot Identifier to Sprite ID
 {
 	.gfxSlots
-    db $06, $44, $45, $46, $2D, $20, $2E, $09
+	db $06, $44, $45, $46, $2D, $20, $2E, $09
-    db $09, $0A, $08, $05, $10, $0B, $2C, $1B
+	db $09, $0A, $08, $05, $10, $0B, $2C, $1B
 
-    db $1A, $1C, $14, $19, $0C, $07, $1D, $2F
+	db $1A, $1C, $14, $19, $0C, $07, $1D, $2F
-    db $07, $15, $12, $0D, $0D, $0E, $11, $17
+	db $07, $15, $12, $0D, $0D, $0E, $11, $17
 
-    db $28, $27, $04, $04, $0F, $16, $03, $13
+	db $28, $27, $04, $04, $0F, $16, $03, $13
-    db $01, $1E, $10, $00, $00, $00, $00, $00
+	db $01, $1E, $10, $00, $00, $00, $00, $00
 
-    db $00, $30, $22, $21, $24, $24, $24, $23
+	db $00, $30, $22, $21, $24, $24, $24, $23
-    db $23, $23, $29, $2A, $2C, $2B, $03, $03
+	db $23, $23, $29, $2A, $2C, $2B, $03, $03
 
-    db $34, $35, $31, $33, $02, $32, $36, $37
+	db $34, $35, $31, $33, $02, $32, $36, $37
 	db $2C, $43, $0C, $38, $39, $3A, $F9, $3C
 	; db $2C, $06, $0C, $38, $FF, $FF, $FF, $FF
 
@@ -145,7 +145,12 @@ RTL
 	;Ax
 	db $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F ; Free Small Key
 
-	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; Unused
+	;Bx
+	db $49 ; reserved for bee traps
+	db $13, $13, $13, $13, $13, $13 ; Bomb Upgrades
+
+	db $07, $07, $07, $07, $07, $07 ; Cane Upgrades
+	db $49, $49, $49 ; Unused
 	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; Unused
 	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; Unused
 	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; Unused
@@ -179,7 +184,7 @@ GetSpritePalette:
 	;--------
 	TAX : LDA.l .gfxPalettes, X ; look up item gfx
 	PLB : PLX
-	CMP.b #$F8 : !BGE .specialHandling
+	CMP.b #$F6 : !BGE .specialHandling
 RTL
 	.specialHandling
 	CMP.b #$FD : BNE ++ ; Progressive Sword
@@ -228,6 +233,16 @@ RTL
 			LDA.b #$08 : RTL
 		+ ; Any Bow
 			LDA.b #$02 : RTL
+	++ : CMP.b #$F7 : BNE ++ ; Progressive Bombs
+		LDA !WEAPON_LEVEL
+			CMP.b #$00 : BNE + ; No Bombs
+			LDA.b #$08 : RTL
+		+ : CMP.b #$01 : BNE + ; L1 Bombs
+			LDA.b #$04 : RTL
+		+ : CMP.b #$02 : BNE + ; L2 Bombs
+			LDA.b #$02 : RTL
+		+ ; Everything Else
+			LDA.b #$0A : RTL
 	++ : CMP.b #$FA : BNE ++ ; RNG Item (Single)
 		JSL.l GetRNGItemSingle : JMP GetSpritePalette
 	++ : CMP.b #$FB : BNE ++ ; RNG Item (Multi)
@@ -273,7 +288,10 @@ RTL
 	;db $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 ; *EVENT*
 	db $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 ; Free Big Key
 	db $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 ; Free Small Key
-	db $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 ; Unused
+	db $08 ; reserved for bee traps
+	db $08, $04, $02, $0A, $0A, $F7 ; Bomb Upgrades
+	db $0A, $0A, $0A, $0A, $0A, $0A ; Cane Upgrades
+	db $08, $08, $08 ; Unused
 	db $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 ; Unused
 	db $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 ; Unused
 	db $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 ; Unused
@@ -329,19 +347,19 @@ IsNarrowSprite:
 	++ CMP.b #$63 : BNE ++ ; RNG Item (Multi)
 		JSL.l GetRNGItemMulti
 	++ CMP.b #$64 : BEQ +               ; Progressive Bow
-           CMP.b #$65 : BNE .continue       ; Progressive Bow (alt)
+	   CMP.b #$65 : BNE .continue       ; Progressive Bow (alt)
-                + : LDA $7EF340 : INC : LSR
+		+ : LDA $7EF340 : INC : LSR
-                CMP.l ProgressiveBowLimit : !BLT +
+		CMP.l ProgressiveBowLimit : !BLT +
 			LDA.l ProgressiveBowReplacement
 			JSL.l IsNarrowSprite
-                        JMP .done
+			JMP .done
 	.continue
 	;--------
 
 	LDX.b #$00 ; set index counter to 0
 	;----
 	-
-	CPX.b #$24 : !BGE .false ; finish if we've done the whole list
+	CPX.b #$2A : !BGE .false ; finish if we've done the whole list
 	CMP.l .smallSprites, X : BNE + ; skip to next if we don't match
 	;--
 	SEC ; set true state
@@ -364,7 +382,8 @@ RTL
 	db $15, $18, $24, $2A, $34, $35, $36, $42
 	db $43, $45, $59, $A0, $A1, $A2, $A3, $A4
 	db $A5, $A6, $A7, $A8, $A9, $AA, $AB, $AC
-	db $AD, $AE, $AF, $FF, $FF, $FF, $FF, $FF
+	db $AD, $AE, $AF, $B7, $B8, $B9, $BA, $BB
+	db $BC, $FF, $FF, $FF, $FF, $FF, $FF, $FF
 }
 ;--------------------------------------------------------------------------------
 
@@ -491,12 +510,12 @@ LoadModifiedTileBufferAddress:
 	PHA
 	LDA !TILE_UPLOAD_OFFSET_OVERRIDE : BEQ +
 		TAX
-    	LDY.w #$0002
+		LDY.w #$0002
 		LDA.w #$0000 : STA !TILE_UPLOAD_OFFSET_OVERRIDE
 		BRA .done
 	+
-    LDX.w #$2D40
+	LDX.w #$2D40
-    LDY.w #$0002
+	LDY.w #$0002
 	.done
 	PLA
 RTL
@@ -508,7 +527,7 @@ RTL
 ; out:	Carry - 1 = On Screen, 0 = Off Screen
 ;--------------------------------------------------------------------------------
 Sprite_IsOnscreen:
-    JSR _Sprite_IsOnscreen_DoWork
+	JSR _Sprite_IsOnscreen_DoWork
 	BCS +
 		REP #$20
 		LDA $E2 : PHA : !SUB.w #$0F : STA $E2
@@ -523,11 +542,11 @@ Sprite_IsOnscreen:
 RTL
 
 _Sprite_IsOnscreen_DoWork:
-    LDA $0D10, X : CMP $E2
+	LDA $0D10, X : CMP $E2
-    LDA $0D30, X : SBC $E3 : BNE .offscreen
+	LDA $0D30, X : SBC $E3 : BNE .offscreen
 
-    LDA $0D00, X : CMP $E8
+	LDA $0D00, X : CMP $E8
-    LDA $0D20, X : SBC $E9 : BNE .offscreen
+	LDA $0D20, X : SBC $E9 : BNE .offscreen
 	SEC
 RTS
 	.offscreen

variable_ganon_vulnerability.asm

@@ -0,0 +1,141 @@
+;--------------------------------------------------------------------------------
+!ANCILLA_DAMAGE = "$06EC84"
+; start with X = sprite index, A = ancilla type index
+;--------------------------------------------------------------------------------
+Ganon_CheckAncillaVulnerability:
+	PHA
+	LDA $0EE0, X : BNE .not_vulnerable_pla
+	PLA
+	PHX : PHA
+	LDA.l GanonVulnerabilityItem
+	TAX : PLA
+	CMP.l Ganon_CheckByAncilla, X : BNE +
+	PLX : BRA .vulnerable
++
+	PLX : PHA
+	LDA.l GanonVulnerabilityItem
+	CMP #$01 : BEQ .silver_arrows
+	CMP #$11 : BEQ .somaria
+	BRA .not_vulnerable_pla
+.silver_arrows
+	PLA : CMP #$09 : BNE .not_vulnerable
+	LDA $7EF340 : CMP.b #$03 : !BGE +
+	LDA #$09 : BRA .not_vulnerable
++
+	BRA .vulnerable
+.hammer
+	BRA .not_vulnerable_pla ; NYI
+.golden_bee
+	BRA .not_vulnerable_pla ; NYI
+.somaria
+	PLA : CMP #$01 : BEQ .vulnerable
+	CMP #$2C : BEQ .vulnerable
+	BRA .vulnerable
+.vulnerable
+	PHX
+	LDA.l GanonVulnerabilityItem
+	TAX
+	LDA.l Ganon_IFrameDuration, X
+	PLX
+	STA $0EE0, X ; give the poor pig some iframes
+	LDA #$20 : STA $0F10, X
+	LDA #$09
+	RTL
+.not_vulnerable_pla
+	PLA
+.not_vulnerable
+	PHX : TAX
+	LDA.l !ANCILLA_DAMAGE, X
+	PLX
+	RTL
+; end with X = sprite index, A = damage class
+;--------------------------------------------------------------------------------
+!ANCILLA_CHECK_SPRITE_DAMAGE_PRESET_CLASS = "$06ECE6"
+;--------------------------------------------------------------------------------
+Ganon_CheckPowderVulnerability: ; we know it's powder
+	LDA.l GanonVulnerabilityItem : CMP #$05 : BNE .normal ; ganon not vulnerable to powder
+	LDA $0E20, X : CMP #$D7 : BNE .normal ; not stunned ganon
+	LDA $0EE0, X : BNE .normal ; ganon has iframes
+	LDA.l Ganon_IFrameDuration+$05
+	STA $0EE0, X ; give the poor pig some iframes
+	LDA #$20 : STA $0F10, X
+	LDA #$09
+	BRA .done
+.normal
+	LDA.b #$0A
+.done
+	JSL.l !ANCILLA_CHECK_SPRITE_DAMAGE_PRESET_CLASS
+	RTL
+;--------------------------------------------------------------------------------
+Ganon_CheckBeeVulnerability: ; we know it's a bee
+; X is bee sprite index
+; Y is target sprite index
+	LDA.l GanonVulnerabilityItem : CMP #$10 : BNE .normal ; ganon not vulnerable to bee
+	LDA $0E20, Y : CMP #$D7 : BNE .normal ; not stunned ganon
+	LDA $0EE0, Y : BNE .normal ; ganon has iframes
+	LDA.l Ganon_IFrameDuration+$10
+	STA $0EE0, Y ; give the poor pig some iframes
+	LDA #$20 : STA $0F10, Y
+	LDA #$09
+	BRA .done
+.normal
+	LDA.l SpecialWeapons : CMP.b #$06 : BNE .regular_bee
+	LDA.w $0ED0, X
+	BRA .done
+.regular_bee
+	LDA.b #$01
+.done
+	TYX
+	JSL.l !ANCILLA_CHECK_SPRITE_DAMAGE_PRESET_CLASS
+	RTL
+;--------------------------------------------------------------------------------
+Ganon_CheckInvincible:
+	LDA $04C5 : CMP.b #$02 : BEQ .not_transparent
+	LDA $0E20, X : CMP #$D7 : BNE .transparent ; non-stunned ganon
+  LDA $0301 : AND.b #$0A : BEQ .transparent ; normal behavior if not hammer
+	LDA.l GanonVulnerabilityItem : CMP #$0C : BNE .transparent ; ganon not vulnerable to hammer
+.not_transparent
+	LDA #$00 : RTL
+.transparent
+	LDA #$01 : RTL
+; return non-zero A if ganon should be invincible
+;--------------------------------------------------------------------------------
+Ganon_CheckHammerVulnerability: ; we know it's hammer
+	LDA.l GanonVulnerabilityItem : CMP #$0C : BNE .normal ; ganon not vulnerable to hammer
+	LDA $0E20, X : CMP #$D7 : BNE .normal ; not stunned ganon
+	LDA $0EE0, X : BNE .normal ; ganon has iframes
+	LDA.l Ganon_IFrameDuration+$0C
+	STA $0EE0, X ; give the poor pig some iframes
+	LDA #$20 : STA $0F10, X
+	LDA #$09 : STA $0CF2 ; set damage class to silver
+	SEC : RTL
+.normal
+	CLC : RTL
+; return carry set bit if stunned Ganon and Ganon vulnerable to hammer
+;--------------------------------------------------------------------------------
+CheckBeeBoss:
+; Y is sprite index
+	LDA.l SpecialWeapons : CMP #$06 : BNE .not_bee_mode
+	LDA #$00 : RTL
+.not_bee_mode
+	LDA.l GanonVulnerabilityItem : CMP #$10 : BNE .normal ; ganon not vulnerable to bee
+	LDA $0E20, Y : CMP #$D7 : BNE .normal ; not stunned ganon
+	LDA #$00 : RTL
+.normal
+	LDA $0B6B, Y : AND.b #$02
+	RTL
+; return non-zero A if entity is a boss (and bee should not attack)
+;--------------------------------------------------------------------------------
+Ganon_CheckByAncilla:
+db #$00 ; default behavior--we shouldn't be checking the table here anyway
+db #$00, #$05, #$1F, #$07, #$00
+db #$02, #$0B, #$19, #$18, #$1C
+db #$00, #$00, #$00, #$00, #$00
+db #$00, #$00, #$31, #$00, #$00
+Ganon_IFrameDuration:
+db #$00 ; default behavior--we shouldn't be here anyway
+db #$00, #$00, #$00, #$34, #$00
+db #$00, #$00, #$00, #$00, #$00
+db #$00, #$00, #$00, #$00, #$00
+db #$00, #$00, #$00, #$00, #$00
+;--------------------------------------------------------------------------------

zelda.asm

@@ -9,10 +9,23 @@ SpawnZelda:
 	+ RTL
 ;--------------------------------------------------------------------------------
 EndRainState:
-	LDA $7EF3C5 : CMP.b #$02 : !BGE + ; skip if past escape already
+	LDA $7EF3C5 : CMP.b #$02 : !BGE ++ ; skip if past escape already
-		LDA.b #$00 : STA !INFINITE_ARROWS : STA !INFINITE_BOMBS : STA !INFINITE_MAGIC
+		LDA.l EscapeAssist : AND #$44
+		CMP #$04 : BNE + : LDA #$00 : STA !INFINITE_MAGIC : +
+		CMP #$40 : BNE + : STA !INFINITE_MAGIC : +
+		LDA.l EscapeAssist : AND #$22
+		CMP #$02 : BNE + : LDA #$00 : STA !INFINITE_BOMBS : +
+		CMP #$20 : BNE + : STA !INFINITE_BOMBS : +
+		LDA.l EscapeAssist : AND #$11
+		CMP #$01 : BNE + : LDA #$00 : STA !INFINITE_ARROWS : +
+		CMP #$10 : BNE + : STA !INFINITE_ARROWS : +
+
+		LDA.l SpecialWeapons : CMP #$01 : BNE +
+		LDA.l !WEAPON_LEVEL : BEQ +
+		LDA #$01 : STA !INFINITE_BOMBS
+		+
 		LDA.b #$02 : STA $7EF3C5 ; end rain state
 		JSL MaybeSetPostAgaWorldState
-	+
+	++
 RTL
 ;--------------------------------------------------------------------------------