Merge branch 'OWMain' into overworld_kara

- allow killing red baris with fire rod/bombos
- allow medallions to kill bunny beams

LTTP_RND_GeneralBugfixes.asm

@@ -77,7 +77,7 @@ dw !ROM_VERSION_HIGH
 function hexto555(h) = ((((h&$FF)/8)<<10)|(((h>>8&$FF)/8)<<5)|(((h>>16&$FF)/8)<<0))
 
 ; Feature flags, run asar with -DFEATURE_X=1 to enable
-!FEATURE_NEW_TEXT ?= 0
+!FEATURE_NEW_TEXT ?= 1
 
 ;================================================================================
 
@@ -229,6 +229,9 @@ warnpc $A58000
 ;org $228000 ; contrib area
 org $A28000 ; contrib area
 incsrc contrib.asm
+incsrc special_weapons.asm
+incsrc item_on_b.asm
+incsrc variable_ganon_vulnerability.asm
 warnpc $A38000
 
 org $A38000
@@ -307,6 +310,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
@@ -326,6 +339,7 @@ if !FEATURE_NEW_TEXT
 	incbin newfont.bin
 	NewFontInverted:
 	incbin newfont_inverted.bin
+
 	org $0CD7DF
 	incbin text_unscramble1.bin
 	org $0CE4D5
@@ -644,6 +658,12 @@ Player_HaltDashAttackLong:
 org $07999D
 Link_ReceiveItem:
 
+org $079F82
+Link_UseHammer:
+
+org $07AFEE
+Link_UseBugNet:
+
 org $07A985
 SetGameModeLikeMirror:
 

darkroomitems.asm

@@ -1,13 +1,13 @@
 CheckReceivedItemPropertiesBeforeLoad:
     LDA $A0 : BEQ .normalCode
     LDA $7EC005 : BNE .lightOff
-    .normalCode
-    LDA.l AddReceivedItemExpanded_properties, X ;Restore Rando Code
+.normalCode
+    JSL LoadReceivedItemExpandedProperties ; get palette
     RTL
 
 .lightOff
     PHX : PHY : PHB
-    LDA.l AddReceivedItemExpanded_properties, X ; get palette
+    JSL LoadReceivedItemExpandedProperties ; get palette
 
     REP #$30
     AND #$0007 ; mask out palette

darkworldspawn.asm

@@ -165,22 +165,25 @@ RefreshRainAmmo:
 	.done
 RTL
 ;--------------------------------------------------------------------------------
-!INFINITE_ARROWS = "$7F50C8"
-!INFINITE_BOMBS = "$7F50C9"
-!INFINITE_MAGIC = "$7F50CA"
 SetEscapeAssist:
 	LDA ProgressIndicator : CMP.b #$01 : BNE .no_train ; check if we're in rain state
 	.rain
 		LDA.l EscapeAssist
-		BIT.b #$04 : BEQ + : STA !INFINITE_MAGIC : +
-		BIT.b #$02 : BEQ + : STA !INFINITE_BOMBS : +
-		BIT.b #$01 : BEQ + : STA !INFINITE_ARROWS : +
+		BIT.b #$04 : BEQ + : STA InfiniteMagicModifier : +
+		BIT.b #$02 : BEQ + : STA InfiniteBombsModifier : +
+		BIT.b #$01 : BEQ + : STA InfiniteArrowsModifier : +
 		BRA ++
 	.no_train ; choo choo
-		LDA.l EscapeAssist : BIT.b #$04 : BEQ + : LDA.b #$00 : STA !INFINITE_MAGIC : +
-		LDA.l EscapeAssist : BIT.b #$02 : BEQ + : LDA.b #$00 : STA !INFINITE_BOMBS : +
-		LDA.l EscapeAssist : BIT.b #$01 : BEQ + : LDA.b #$00 : STA !INFINITE_ARROWS : +
+		LDA.l EscapeAssist
+		BIT.b #$40 : BEQ + : STA InfiniteMagicModifier : +
+		BIT.b #$20 : BEQ + : STA InfiniteBombsModifier : +
+		BIT.b #$10 : BEQ + : STA InfiniteArrowsModifier : +
 	++
+
+	LDA.l SpecialWeapons : AND.b #$7F : CMP #$01 : BNE +
+	LDA.l SpecialWeaponLevel : BEQ +
+	LDA #$01 : STA InfiniteBombsModifier
+	+
 RTL
 ;--------------------------------------------------------------------------------
 SetSilverBowMode:

dialog.asm

@@ -269,7 +269,6 @@ DialogFairyThrow:
 	LDA.l Restrict_Ponds : BEQ .normal
 	LDA BottleContentsOne
 		ORA BottleContentsTwo : ORA BottleContentsThree : ORA BottleContentsFour : BNE .normal
-	
 	.noInventory
 	LDA $0D80, X : !ADD #$08 : STA $0D80, X
 	LDA.b #$51
@@ -304,24 +303,57 @@ DialogGanon2:
 
 	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 #$007F
+		CMP.w #$0001 : BEQ .bombs ; bombs if special bomb mode
+	.silver_arrows
 		LDA.l BowTracking
 
 		BIT.w #$0080 : BNE + ; branch if bow
-        LDA.w #$0192 : BRA ++
+		LDA.w #$0192 : JMP .done
 	+
 		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
-        LDA.w #$0194 : BRA ++
+		LDA.w #$0194 : JMP .done
 	+
 		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 EquipmentWRAM-1, X : PLX : AND #$00FF : BNE +
+		LDA.w #$0192 : JMP .done
+	+
+		LDA.w #$0195 : BRA .done
+	.bombs
+		LDA.l BombsEquipment : AND #$00FF : BNE +
+		LDA.l InfiniteBombsModifier : AND #$00FF : BNE + ; check for infinite bombs
+		LDA.w #$0192 : BRA .done
+	+
+		LDA.w #$0195 : BRA .done
+	.powder
+		LDA.l InventoryTracking : AND #$0010 : BNE + ; check for powder
+		LDA.w #$0192 : BRA .done
+	+
+		LDA.w #$0195 : BRA .done
+	.bee
+		LDA.l BottleContentsOne   : AND #$00FF : CMP.w #$0007 : BEQ + : CMP.w #$0008 : BEQ +
+		LDA.l BottleContentsTwo   : AND #$00FF : CMP.w #$0007 : BEQ + : CMP.w #$0008 : BEQ +
+		LDA.l BottleContentsThree : AND #$00FF : CMP.w #$0007 : BEQ + : CMP.w #$0008 : BEQ +
+		LDA.l BottleContentsFour  : 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
@@ -334,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 ++
-		LDA HammerEquipment : BEQ .yesText : BRA .noText
-	++
-		LDA SwordEquipment : CMP.b #$FF : BEQ .yesText : CMP.b #$02 : BCS .noText
-	;++
+	JSL CheckTabletSword : BMI .yesText
+	CMP.b #$02 : !BGE .noText
 	.yesText
 	PLA
 	LDA.b #$0C
@@ -356,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 ++
-		LDA HammerEquipment : BEQ .yesText : BRA .noText
-	++
-		LDA SwordEquipment : CMP.b #$FF : BEQ .yesText : CMP.b #$02 : !BGE .noText
-	;++
+	JSL CheckTabletSword : BMI .yesText
+	CMP.b #$02 : !BGE .noText
 	.yesText
 	PLA
 	LDA.b #$0D

doorrando/hudadditions.asm

@@ -62,7 +62,7 @@ HudAdditions:
             + lda #$207f
             .reminder sta $7ec702
             + lda.w DRFlags : and #$0004 : beq .restore
-            lda MapField : and.l $0098c0, x : beq .restore
+            ; lda MapField : and.l $0098c0, x : beq .restore
                 txa : lsr : tax
 
 				lda.l GenericKeys : and #$00ff : bne +
@@ -133,7 +133,7 @@ DrHudDungeonItemsAdditions:
         			jsr ConvertToDisplay2 : sta $1644, y
         		+ iny #2 : lda.w #$24f5 : sta $1644, y
         		phx : ldx $00
-        			lda MapField : and.l $0098c0, x : beq + ; must have map
+        			; lda MapField : and.l $0098c0, x : beq + ; must have map
         				plx : sep #$30 : lda.l ChestKeys, x : sta $02
         				lda.l GenericKeys : bne +++
         					lda $02 : !sub DungeonCollectedKeys, x : sta $02

events.asm

@@ -59,9 +59,9 @@ RTL
 OnUncleItemGet:
 	PHA
 		LDA.l EscapeAssist
-		BIT.b #$04 : BEQ + : STA !INFINITE_MAGIC : +
-		BIT.b #$02 : BEQ + : STA !INFINITE_BOMBS : +
-		BIT.b #$01 : BEQ + : STA !INFINITE_ARROWS : +
+		BIT.b #$04 : BEQ + : STA InfiniteMagicModifier : +
+		BIT.b #$02 : BEQ + : STA InfiniteBombsModifier : +
+		BIT.b #$01 : BEQ + : STA InfiniteArrowsModifier : +
 
 		LDA UncleItem_Player : STA !MULTIWORLD_ITEM_PLAYER_ID
 	PLA
@@ -73,7 +73,7 @@ OnUncleItemGet:
 	LDA.b #70 : STA.l ArrowsFiller
 
 	LDA.l ArrowMode : BEQ +
-			LDA.l BowTracking : ORA.b #$80 : STA.l BowTracking ; enable bow toggle
+		LDA.l BowTracking : ORA #$80 : STA.l BowTracking ; enable bow toggle
 		REP #$20 ; set 16-bit accumulator
 		LDA.l CurrentRupees : !ADD.l FreeUncleItemAmount : STA.l CurrentRupees ; rupee arrows, so also give the player some money to start
 		SEP #$20 ; set 8-bit accumulator
@@ -254,17 +254,17 @@ PostItemAnimation:
 		LDA $0403 : STA !MULTIWORLD_ROOMDATA
 	+
 
+	LDA.w $02E9 : CMP.b #$01 : BNE +
+		LDA.b $2F : BEQ +
+			JSL.l IncrementChestTurnCounter
+	+
+
 	LDA !MULTIWORLD_ITEM_PLAYER_ID : BEQ +
 		STZ $02E9
 		LDA #$00 : STA !MULTIWORLD_ITEM_PLAYER_ID
 		JML.l Ancilla_ReceiveItem_objectFinished
 	+
 
-	LDA.w $02E9 : CMP.b #$01 : BNE +
-		LDA.b $2F : BEQ +
-			JSL.l IncrementChestTurnCounter
-	+
-
 	STZ $02E9 : LDA $0C5E, X ; thing we wrote over to get here
 	JML.l Ancilla_ReceiveItem_optimus+6
 ;--------------------------------------------------------------------------------

fileselect.asm

@@ -268,15 +268,16 @@ DrawPlayerFileShared:
 	%fs_drawBottle(EquipmentSRAM+$1F,9,23)
 
 	; Sword
+	LDA.l SpecialWeapons : AND.w #$007F : CMP #$0001 : BEQ .bombSword
 	LDA.l EquipmentSRAM+$19 : 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 ++
@@ -286,6 +287,29 @@ DrawPlayerFileShared:
 	+
 		; a sword value above 4 is either corrupted or 0xFF (a.k.a. swordless)
 		%fs_drawItemGray(3,26,FileSelectItems_fighters_sword)
+		BRA ++
+	.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
@@ -556,6 +580,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)
@@ -566,11 +602,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 #$007F : CMP #$0001 : BEQ .colorBombs
 	LDA #$028B|!FS_COLOR_BLUE : %fs_draw16x8(0,14)
 	LDA EquipmentSRAM+$03 : 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 BowTrackingSRAM : 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 && ![0x23, 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 && ![0x23, 0xA1, 0xA3, 0xD1].include?(sprite) # bombos
+    ret[13] = 0
+  end
+  if ret[14] != 1 && ![0xD1].include?(sprite) # ether
+    ret[14] = 0
+  end
+  if [1, 2].include?(ret[15]) && ![0xD1].include?(sprite) # 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 #$3c : BEQ .hookshot
-	CPX.b #$3d : BEQ .hookshot
+	CPX.b #$3B : BEQ .hookshot
+	CPX.b #$3C : BEQ .hookshot
+	CPX.b #$3D : BEQ .hookshot
+
+	LDA.l SpecialWeapons : AND.b #$7F : CMP.b #$02 : BNE .normal
+	TXA : AND.b #$78 : CMP.b #$28 : BNE .normal
+	LDA.l $0DB8F1, X : BEQ .noDamage
+	LDA.b #$01
+RTL
 
 	.normal
-	lda $0db8f1,x ;what we wrote over
+	LDA.l $0DB8F1, X ; what we wrote over
 RTL
 	.boomerang
 		LDA.l StunItemAction : AND #$01 : BNE .normal

hooks.asm

@@ -396,9 +396,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
 ;--------------------------------------------------------------------------------
@@ -2899,6 +2896,176 @@ org $0AEEF2
 org $008BE5 ; hijack stripes for boss GFX transfer
 	JSL DoDungeonMapBossIcon
 
+	;================================================================================
+	; Terrorpin AI fix
+;--------------------------------------------------------------------------------
+org $1EB2B1 ; sprite_terrorpin.asm(57) : AND.b #$03 : STA $0DE0, X ; 5 bytes
+JSL FixTerrorpin ; 4 bytes
+NOP              ; 1 byte
+;--------------------------------------------------------------------------------
+
+;================================================================================
+; 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 $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 ; we freed this up earlier in hooks; probably shouldn't use it but *shrug*
+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
+; $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
+
+warnpc $0DFC51+197 ; we only filled in 197 NOPs so don't overwrite past that
+;--------------------------------------------------------------------------------
+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
+;--------------------------------------------------------------------------------
+org $07F889 ; free rom from F877 - F88F; the starting part of this is used in quadrant glitch fix in overworld fork, however.
+Link_UseItemLong:
+PER .done-1
+JMP.w ($0000)
+.done
+RTL
+warnpc $07F890
+;--------------------------------------------------------------------------------
+org $06F2DC ; bank_06.asm@22763 (LDA.w $037A : AND.b #$10)
+JSL CheckBugNet : NOP
+
+org $06EB91 ; bank_06.asm@21178 (LDA.w $037A : AND.b #$10)
+JSL CheckBugNet : NOP
+;--------------------------------------------------------------------------------
+org $06ED77 ; bank_06.asm@21597 (LDA.w $0301 : AND.b #$0A : ...)
+JSL SetHammerClass
+BRA + : NOP #7 : +
+;--------------------------------------------------------------------------------
+
+;================================================================================
+; 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
+
+;================================================================================
+; Item-On-B
+;--------------------------------------------------------------------------------
+org $0DEB3C
+JSL DrawBIndicator : BRA + : NOP #3 : +
+;--------------------------------------------------------------------------------
+org $079CE6 ; Bank07.asm@4632 (LDA #$80 : TSB $3A : ...)
+JSL UseItem
+BCC + : RTS : +
+JSR $9C56
+NOP #1
+;--------------------------------------------------------------------------------
+
+;================================================================================
+; Fix quadrant glitch
+org $07A879
+	JSR SwordSpinQuadrantFix
+
+org $07F877 ; free rom
+SwordSpinQuadrantFix:
+	LDA.l AllowAccidentalMajorGlitch
+	BEQ ++
+	JMP.w $07E8D9 ; HandleIndoorCameraAndDoors
+
+++	RTS
+warnpc $07F88C ; hammer-on-B hook uses the end of this free rom section
+
 ;================================================================================
 
 org $01C4B8 : JSL FixJingleGlitch
@@ -2914,13 +3081,6 @@ org $028818
 org $02A463
 	JSL OnMenuLoad
 
-;================================================================================
-; Terrorpin AI fix
-;--------------------------------------------------------------------------------
-org $1EB2B1 ; sprite_terrorpin.asm(57) : AND.b #$03 : STA $0DE0, X ; 5 bytes
-JSL FixTerrorpin ; 4 bytes
-NOP				 ; 1 byte
-
 ;--------------------------------------------------------------------------------
 ; Text Renderer
 ;--------------------------------------------------------------------------------

inventory.asm

@@ -30,9 +30,10 @@
 ProcessMenuButtons:
 	;LDA #$FD : STA InventoryTracking ; DEBUG MODE
 	;LDA $F6 : BIT #$20 : BNE .l_pressed ; check for P1 L-button
-	LDA $F4 : BIT #$40 : BNE .y_pressed ; check for P1 Y-button
-			  BIT #$20 : BNE .sel_pressed ; check for P1 Select button
-	LDA $F0 : BIT #$20 : BNE .sel_held
+	LDA.b $F4 : BIT.b #$40 : BNE .y_pressed ; check for P1 Y-button
+	            BIT.b #$20 : BNE .sel_pressed ; check for P1 Select button
+	            BIT.b #$80 : BNE .b_pressed ; check for P1 B-button
+	LDA.b $F0 : BIT.b #$20 : BNE .sel_held
 	.sel_unheld
 		LDA HudFlag : AND #$20 : BEQ +
 		LDA HudFlag : AND #$DF : STA HudFlag ; select is released, unset hud flag
@@ -48,6 +49,18 @@ RTL
 	LDA HudFlag : ORA #$20 : STA HudFlag ; set hud flag
 	LDA.b #$20 : STA $012F ; menu select sound
 	JSL.l ResetEquipment
+RTL
+	.b_pressed
+	JSR CanPressB : BCC .b_error
+	LDA.w $0202 : CMP.l ItemOnB : BNE .set_b
+	LDA.b #$00
+	.set_b
+	STA.l ItemOnB
+	BRA .b_done
+	.b_error
+	LDA.b #$3C : STA.w $012E ; error sound
+	.b_done
+	SEC
 RTL
 	.y_pressed ; Note: used as entry point by quickswap code. Must preserve X. 
 	LDA.b #$10 : STA $0207
@@ -115,6 +128,27 @@ RTL
 	SEC
 RTL
 ;--------------------------------------------------------------------------------
+CanPressB:
+	PHY : PHP : SEP #$30
+	LDA.l AllowedItemOnB : BEQ .no
+	CMP.b #$FF : BEQ .skip_allow_check
+	CMP.w $0202 : BNE .no
+	.skip_allow_check
+	PHX
+	LDA.w $0202 : TAX
+	LDA.l ValidItemOnB, X : BNE .plx_and_no
+	PLX
+	PLP : PLY
+	SEC
+	RTS
+	.plx_and_no
+	PLX
+	.no
+	PLP : PLY
+	CLC
+	RTS
+;--------------------------------------------------------------------------------
+
 
 ;--------------------------------------------------------------------------------
 ;ProcessBottleMenu:
@@ -548,15 +582,25 @@ AddInventory:
 	  CPY.b #$90 : !BGE +
 		JSL MaybeFlagCompassTotalPickup
 		JSR .incrementCompass
-		JMP .done
+		BRA .done
 	+ CPY.b #$90 : !BLT + ; Items $90 - $9F - Free Big Keys
 	  CPY.b #$A0 : !BGE +
 		JSR .incrementBigKey
-		JMP .done
+		BRA .done
 	+ CPY.b #$A0 : !BLT + ; Items $A0 - $AF - Free Small Keys
 	  CPY.b #$B0 : !BGE +
 		JSR .incrementKey
-		JMP .done
+		BRA .done
+	+ CPY.b #$C0 : BEQ .special_weapon ; Item $C0 - Bomb Upgrade
+	  CPY.b #$C1 : BEQ .special_weapon ; Item $C1 - Cane Upgrade
+	  CPY.b #$C2 : BEQ .special_weapon ; Item $C2 - Bug Net Upgrade
+	BRA .done
+	.special_weapon
+		JSR .stampSword ; update "first bomb" timestamp
+		LDA.l SpecialWeaponLevel ; get current bomb level
+		CMP #$05 : !BGE ++ ; check if already maxed
+		INC : STA.l SpecialWeaponLevel
+		++ BRA .done
 	+
 	.done
 	PLP : PLX : PLA
@@ -653,7 +697,6 @@ RTS
 RTS
 
 .incrementMail
-
 	LDA HighestMail
 	INC : STA $04 : CPX $04 : !BLT +   ; don't increment unless we're getting a better mail
 		TXA : STA HighestMail
@@ -696,7 +739,14 @@ RTS
 RTL
 
 .incrementBossSword
-	LDA SwordEquipment
+	LDA.l SpecialWeapons : AND.b #$7F : CMP.b #$01 : BEQ +
+	                                    CMP.b #$03 : BEQ +
+	                                    CMP.b #$04 : BEQ +
+	                                    CMP.b #$05 : BEQ +
+	                                    CMP.b #$08 : BEQ +
+	LDA SwordEquipment : BRA ++
+	+ : LDA SpecialWeaponLevel
+	++
 	BNE + : -
 		LDA SwordlessBossKills : INC : STA SwordlessBossKills
 		RTS
@@ -771,6 +821,7 @@ AddYMarker:
 	+ CMP.w #$10 : BEQ .drawJarMarker
 
 	.drawNormal
+	JSR CanPressB : BCS .drawBBubble
 	LDA.w #$7C60
 	BRA .drawTile
 
@@ -779,12 +830,20 @@ AddYMarker:
 	LDA $0207 : AND.w #$0020 : BNE .drawXBubble
 
 	.drawYBubble
+	JSR CanPressB : BCC .drawY
+	LDA.w $0207 : AND.w #$0020 : BNE .drawBBubble
+	.drawY
 	LDA.w #$3D4F
 	BRA .drawTile
 
 	.drawXBubble
 	JSR MakeCircleBlue
 	LDA.w #$2D3E
+	BRA .drawTile
+
+	.drawBBubble
+	JSR MakeCircleRed
+	LDA.w #$293F
 
 	.drawTile
 	STA $FFC4, Y
@@ -813,6 +872,24 @@ MakeCircleBlue:
 	LDA $0084, Y : AND.w #$EFFF : STA $0084, Y
 	LDA $007E, Y : AND.w #$EFFF : STA $007E, Y
 RTS
+MakeCircleRed:
+	LDA.w $FFC0, Y : AND.w #$EBFF : STA.w $FFC0, Y
+	LDA.w $FFC2, Y : AND.w #$EBFF : STA.w $FFC2, Y
+ 
+	LDA.w $FFFE, Y : AND.w #$EBFF : STA.w $FFFE, Y
+	LDA.w $0004, Y : AND.w #$EBFF : STA.w $0004, Y
+
+	LDA.w $003E, Y : AND.w #$EBFF : STA.w $003E, Y
+	LDA.w $0044, Y : AND.w #$EBFF : STA.w $0044, Y
+
+	LDA.w $0080, Y : AND.w #$EBFF : STA.w $0080, Y
+	LDA.w $0082, Y : AND.w #$EBFF : STA.w $0082, Y
+
+	LDA.w $FFBE, Y : AND.w #$EBFF : STA.w $FFBE, Y
+	LDA.w $FFC4, Y : AND.w #$EBFF : STA.w $FFC4, Y
+	LDA.w $0084, Y : AND.w #$EBFF : STA.w $0084, Y
+	LDA.w $007E, Y : AND.w #$EBFF : STA.w $007E, Y
+RTS
 ;--------------------------------------------------------------------------------
 
 ;--------------------------------------------------------------------------------

item_on_b.asm

@@ -0,0 +1,98 @@
+;--------------------------------------------------------------------------------
+ItemMenuLocations:
+	dw $11C8 ; Bow
+	dw $11CE ; Boomerang
+	dw $11D4 ; Hookshot
+	dw $11DA ; Bombs
+	dw $11E0 ; Powder / Mushroom
+	dw $1288 ; Fire Rod
+	dw $128E ; Ice Rod
+	dw $1294 ; Bombos
+	dw $129A ; Ether
+	dw $12A0 ; Quake
+	dw $1348 ; Lamp
+	dw $134E ; Hammer
+	dw $1354 ; Flute / Shovel
+	dw $135A ; Bug Net
+	dw $1360 ; Book
+	dw $1408 ; Bottles
+	dw $140E ; Somaria
+	dw $1414 ; Byrna
+	dw $141A ; Cape
+	dw $1420 ; Mirror
+
+DrawBIndicator:
+	LDA.l ItemOnB : AND.w #$00FF : BEQ .done
+	DEC : ASL : TAX
+	LDA.l ItemMenuLocations, X : TAX
+	LDA.w #$3D3B
+	STA.w $0042, X
+
+.done ; what we wrote over
+	LDA.w $0202
+	AND.w #$00FF
+	DEC
+	ASL
+	TAX
+	RTL
+;--------------------------------------------------------------------------------
+ItemHandlerLocs:
+	dw $A003 ; Bow
+	dw $A0B8 ; Boomerang
+	dw $AB23 ; Hookshot
+	dw $A139 ; Bombs
+	dw $FFFF ; Powder / Mushroom
+	dw $9EEC ; Fire Rod
+	dw $9EEC ; Ice Rod
+	dw $A55E ; Bombos
+	dw $A489 ; Ether
+	dw $A640 ; Quake
+	dw $A246 ; Lamp
+	dw $9F82 ; Hammer
+	dw $FFFF ; Flute / Shovel
+	dw $AFEE ; Bug Net
+	dw $A46E ; Book
+	dw $FFFF ; Bottles
+	dw $AEBB ; Somaria
+	dw $FFFF ; Byrna
+	dw $FFFF ; Cape
+	dw $A913 ; Mirror
+ValidItemOnB:
+	db $FF
+	db $00, $00, $00, $00, $FF
+	db $00, $00, $00, $00, $00
+	db $00, $00, $FF, $00, $00
+	db $FF, $00, $FF, $FF, $00
+
+UseItem:
+	JSL CheckDetonateBomb : BCS .normal
+
+	LDA.l ItemOnB : BEQ .normal
+	TAX
+	LDA.b $6C : BNE .prevent_swing
+	CPX.b #$11 : BNE .not_somaria
+	LDA.w $02F5 : BNE .prevent_swing
+	.not_somaria
+	LDA.l ValidItemOnB, X : BNE .normal
+	LDA.b $3A : ORA.b #$40 : STA.b $3A
+	LDA.l $0DFA35, X : STA.w $0304
+	CPX.b #$06 : BEQ .fire_rod
+	CPX.b #$07 : BNE .not_rod
+	.ice_rod
+	LDA.b #$02 : STA.w $0307
+	BRA .not_rod
+	.fire_rod
+	LDA.b #$01 : STA.w $0307
+	.not_rod
+	TXA : DEC : ASL : TAX
+	LDA.l ItemHandlerLocs+1, X : STA.b $01
+	LDA.l ItemHandlerLocs, X : STA.b $00
+	JSL Link_UseItemLong
+	.prevent_swing
+	SEC
+	RTL
+	.normal
+	LDA.b #$80 : TSB.b $3A
+	LDA.b #$01 : TSB.b $50
+	CLC
+	RTL

newhud.asm

@@ -3,18 +3,24 @@ NewDrawHud:
 ;================================================================================
 ; Draw bomb count
 !BOMBCOUNT_DRAW_ADDRESS = "$7EC75A"
-!INFINITE_BOMBS = "$7F50C9"
 ;================================================================================
 
-	LDA !INFINITE_BOMBS : BNE .infinite_bombs
+	LDA InfiniteBombsModifier : BNE .infinite_bombs
 	.finite_bombs
-		LDA.l $7EF343 ; bombs
+		LDA.l SpecialWeapons : AND.b #$7F : CMP #$01 : BNE .normal
+		LDA.l SpecialWeaponLevel : BEQ .no_bombs
+	.normal
+		LDA.l BombsEquipment ; bombs
 		JSR HudHexToDec2Digit ;requires 8 bit registers!
 		REP #$20
 		LDX.b $06 : TXA : ORA.w #$2400 : STA !BOMBCOUNT_DRAW_ADDRESS ; Draw bombs 10 digit
 		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 ; blank
+		STA !BOMBCOUNT_DRAW_ADDRESS+2 ; blank
+		BRA +
 	.infinite_bombs
 		REP #$20
 		LDA.w #$2431 : STA !BOMBCOUNT_DRAW_ADDRESS ; infinity (left half)
@@ -36,14 +42,13 @@ NewDrawHud:
 ;================================================================================
 ; Draw arrow count
 !ARROWCOUNT_DRAW_ADDRESS = "$7EC760"
-!INFINITE_ARROWS = "$7F50C8"
 ;================================================================================
 
 	SEP #$20
 	LDA.l ArrowMode : BNE +
-		LDA !INFINITE_ARROWS : BNE .infinite_arrows
+		LDA InfiniteArrowsModifier : BNE .infinite_arrows
 		.finite_arrows
-			LDA.l $7EF377 ; arrows
+			LDA.l CurrentArrows ; arrows
 			JSR HudHexToDec2Digit
 			REP #$20
 			LDX.b $06 : TXA : ORA.w #$2400 : STA !ARROWCOUNT_DRAW_ADDRESS ; Draw arrows 10 digit
@@ -168,7 +173,6 @@ NewDrawHud:
 
 ;--------------------------------------------------------------------------------
 ; Draw Magic Meter
-!INFINITE_MAGIC = "$7F50CA"
 !DrawMagicMeter_mp_tilemap = "$0DFE0F" 
 ;--------------------------------------------------------------------------------
 	LDA CurrentMagic : AND #$00FF ; crap we wrote over when placing the hook for OnDrawHud
@@ -176,7 +180,7 @@ NewDrawHud:
 	AND #$FFF8
 	TAX						 ; end of crap
 	
-	LDA !INFINITE_MAGIC : AND.w #$00FF : BNE + : JMP .green : +
+	LDA InfiniteMagicModifier : AND.w #$00FF : BNE + : JMP .green : +
 	SEP #$20 : LDA.b #$80 : STA CurrentMagic : REP #$30 ; set magic to max
 	LDX.w #$0080 ; load full magic meter graphics
 	LDA $1A : AND.w #$000C : LSR #2

newitems.asm

@@ -45,7 +45,9 @@
 ; #$B3 - Chicken
 ; #$B4 - Big Magic
 ; #$B5 - Good Bee
-; #$B6/B7 - Reserved for Kara
+; #$C0 - Progressive Bomb
+; #$C1 - Progressive Cane
+; #$C2 - Progressive Bug Net
 ; #$FE - Server Request (Asychronous Chest)
 ; #$FF - Null Chest
 ;--------------------------------------------------------------------------------
@@ -284,7 +286,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 BowEquipment : BEQ ++ : CMP.b #$03 : !BGE ++
@@ -444,15 +446,15 @@ AddReceivedItemExpandedGetItem:
 			LDA.b $21 : SBC.b #$00 : STA.w $0D20,Y ; move up 16 pixels
 		LDA.b $EE : STA.w $0F20,Y ; spawns on same layer as link
 		LDA.b #$FF : STA.w $0B58,Y ; allows them to expire
-		++ BRA .done
+		++ JMP .done
 	+ CMP.b #$B3 : BNE + ; Chicken
-		LDA.b #$0B : JSL Sprite_SpawnDynamically : BMI .done
+		LDA.b #$0B : JSL Sprite_SpawnDynamically : BMI ++
 		LDA $22 : CLC : ADC.b #$03 : AND.b #$F8 : STA $0D10,Y
 			LDA $23 : ADC.b #$00 : STA $0D30,Y ; round X to nearest 8
 		LDA.b $20 : SEC : SBC.b #$08 : STA.w $0D00,Y
 			LDA.b $21 : SBC.b #$00 : STA.w $0D20,Y ; move up 8 pixels
 		LDA.b $EE : STA.w $0F20,Y ; spawns on same layer as link
-		BRA .done
+		++ BRA .done
 	+ CMP.b #$B4 : BNE + ; Big Magic
 		LDA.b #$80 : STA MagicFiller ; fill magic
 		BRA .done
@@ -464,11 +466,28 @@ AddReceivedItemExpandedGetItem:
 		LDA.b $EE : STA.w $0F20,Y ; spawns on same layer as link
 		JSL GoldBee_SpawnSelf_SetProperties
 		BRA .done
+	+ CMP.b #$C0 : BNE + ; Bomb Upgrade
+		LDA #$01 : STA InfiniteBombsModifier ; infinite bombs
+		BRA .done
+	+ CMP.b #$C1 : BNE + ; Cane Upgrade
+		LDA.l SpecialWeapons : AND.b #$7F : CMP.b #$03 : BEQ .blue_cane
+		                                    CMP.b #$04 : BEQ .red_cane
+			BRA .done
+		.blue_cane
+			LDA #$01 : STA ByrnaEquipment
+			BRA .done
+		.red_cane
+			LDA #$01 : STA SomariaEquipment
+			BRA .done
+	+ CMP.b #$C2 : BNE + ; Bug Net Upgrade
+		LDA.b #$01 : STA BugNetEquipment
+		BRA .done
 	+
 	.done
 	PLX
 	LDA $02E9 : CMP.b #$01 ; thing we wrote over
 RTL
+;--------------------------------------------------------------------------------
 ; #$70 - Maps
 ; #$80 - Compasses
 ; #$90 - Big Keys
@@ -585,9 +604,9 @@ AddReceivedItemExpanded:
 			LDA BowEquipment : INC : LSR : CMP.l ProgressiveBowLimit : !BLT +
 				LDA.l ProgressiveBowReplacement : STA $02D8 : JMP .done
 			+ LDA BowEquipment : INC : LSR : 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 !MULTIWORLD_ITEM_PLAYER_ID : BNE +++
 				LDA.l BowTracking : ORA #$20 : STA.l BowTracking
@@ -599,14 +618,14 @@ 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 #$B0 : BNE ++ ; Bee Trap
 			LDA !MULTIWORLD_ITEM_PLAYER_ID : BEQ +++
-				LDA.b #$0E : STA $02D8 : BRA .done ; Bee in a bottle
+				LDA.b #$0E : STA $02D8 : JMP .done ; Bee in a bottle
 			+++
 		++
 		.done
@@ -618,10 +637,6 @@ AddReceivedItemExpanded:
 ;--------------------------------------------------------------------------------
 ;DATA AddReceivedItemExpanded
 {
-; This is a temporary measure for Fish to have consistent addresses
-warnpc $A08A00
-org $A08A00
-
 .y_offsets
 	db -5, -5, -5, -5, -5, -4, -4, -5
 	db -5, -4, -4, -4, -2, -4, -4, -4
@@ -642,7 +657,7 @@ org $A08A00
 	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
@@ -663,7 +678,10 @@ org $A08A00
 	db -4 ; Big Magic
 	db -4 ; Good Bee
 	db -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 ; Bomb Upgrade
+	db -4 ; Cane Upgrade
+	db -4 ; Bug Net Upgrade
+	db -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
 
@@ -687,7 +705,7 @@ org $A08A00
 	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
@@ -709,7 +727,10 @@ org $A08A00
 	db  4 ; Big Magic
 	db  0 ; Good Bee
 	db  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 ; Bomb Upgrade
+	db  4 ; Cane Upgrade
+	db  0 ; Bug Net Upgrade
+	db  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
 
@@ -734,7 +755,7 @@ org $A08A00
 	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
@@ -760,7 +781,10 @@ org $A08A00
 	db $3B ; Big Magic
 	db $47 ; Good Bee
 	db $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 $13 ; Bomb Upgrade
+	db $07 ; Cane Upgrade
+	db $27 ; Bug Net Upgrade
+	db $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
 
@@ -784,7 +808,7 @@ org $A08A00
 	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
@@ -804,9 +828,11 @@ org $A08A00
 	db $02 ; Chicken
 	db $00 ; Big Magic
 	db $02 ; Good Bee
-
 	db $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 ; Bomb Upgrade
+	db $00 ; Cane Upgrade
+	db $02 ; Bug Net Upgrade
+	db $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
@@ -831,7 +857,7 @@ org $A08A00
 	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
@@ -852,7 +878,10 @@ org $A08A00
 	db  4 ; Big Magic
 	db  1 ; Good Bee
 	db  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  5 ; Bomb Upgrade
+	db  5 ; Cane Upgrade
+	db  1 ; Bug Net Upgrade
+	db  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
 	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; Unused
@@ -899,7 +928,10 @@ org $A08A00
 	dw $F373 ; Big Magic
 	dw $F36A ; Good Bee
 	dw $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 $F38F ; Bomb Upgrade
+	dw $F38F ; Cane Upgrade
+	dw $F38F ; Bug Net Upgrade
+	dw $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
 	dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Unused
@@ -927,7 +959,7 @@ org $A08A00
 	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
@@ -948,7 +980,10 @@ org $A08A00
 	db $80 ; Big Magic
 	db $FF ; Good Bee
 	db $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 ; Bomb Upgrade
+	db $FF ; Cane Upgrade
+	db $FF ; Bug Net Upgrade
+	db $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
@@ -1039,7 +1074,10 @@ Link_ReceiveItemAlternatesExpanded:
 	db -1 ; Big Magic
 	db -1 ; Good Bee
 	db -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 ; Bomb Upgrade
+	db -1 ; Cane Upgrade
+	db -1 ; Bug Net Upgrade
+	db -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
 	db -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 ; Unused
@@ -1327,3 +1365,17 @@ MaybeFlagCompassTotalEntrance:
 	.done
 RTL
 ;--------------------------------------------------------------------------------
+LoadReceivedItemExpandedProperties:
+CPX.b #$C0 : BEQ .bomb_upgrade
+	LDA.l AddReceivedItemExpanded_properties, X ; load from table
+	RTL
+.bomb_upgrade
+	LDA SpecialWeaponLevel
+	CMP.b #$01 : BNE + ; L1 Bombs
+		LDA.b #4 : RTL
+	+ : CMP.b #$02 : BNE + ; L2 Bombs
+		LDA.b #2 : RTL
+	+ : CMP.b #$03 : BNE + ; L3 Bombs
+		LDA.b #1 : RTL
+	+ ; Everything Else
+		LDA.b #5 : RTL

quickswap.asm

@@ -33,6 +33,7 @@ QuickSwap:
 	CPX.b #$01 : BEQ + ; bow
 	CPX.b #$05 : BEQ + ; powder
 	CPX.b #$0D : BEQ + ; flute
+	CPX.b #$0E : BEQ + ; bug net
 	CPX.b #$10 : BEQ + ; bottle
 	BRA .store
 	+ STX $0202 : JSL ProcessMenuButtons_y_pressed

retro.asm

@@ -1,6 +1,5 @@
-!INFINITE_BOMBS = "$7F50C9"
 IsItemAvailable:
-	LDA !INFINITE_BOMBS : BEQ .finite
+	LDA InfiniteBombsModifier : BEQ .finite
 	.infinite
 		CPX.b #$04 : BNE .finite
 		LDA.b #$01 : RTL
@@ -8,34 +7,39 @@ IsItemAvailable:
                 LDA EquipmentWRAM-1, X
 RTL
 LoadBombCount:
-	LDA !INFINITE_BOMBS : BNE .infinite
+	LDA InfiniteBombsModifier : BNE .infinite
 	.finite
 		LDA BombsEquipment
 	.infinite
 RTL
 LoadBombCount16:
-	LDA !INFINITE_BOMBS : AND.w #$00FF : BNE .infinite
+	LDA InfiniteBombsModifier : AND.w #$00FF : BNE .infinite
 	.finite
 		LDA BombsEquipment
 	.infinite
 RTL
 StoreBombCount:
-	PHA : LDA !INFINITE_BOMBS : BEQ .finite
+	JSL IncrementBombsPlacedCounter
+	PHA : LDA InfiniteBombsModifier : BEQ .finite
 	.infinite
 		PLA : LDA.b #$01 : RTL
 	.finite
-		PLA : STA BombsEquipment
+		PLA : STA.l BombsEquipment
+		BNE .done
+		LDA.l ItemOnB : CMP #$04 : BNE .done
+		LDA.b #$00 : STA.l ItemOnB
+.done
+LDA.l BombsEquipment
 RTL
 SearchForEquippedItem:
-	LDA !INFINITE_BOMBS : BEQ +
+	LDA InfiniteBombsModifier : BEQ +
 		LDA.b #$01 : LDX.b #$00 : RTL
 	+
 	LDA BowEquipment ; thing we wrote over
 RTL
 
-!INFINITE_ARROWS = "$7F50C8"
 DecrementArrows:
-	LDA !INFINITE_ARROWS : BNE .infinite
+	LDA InfiniteArrowsModifier : BNE .infinite
 	LDA.l ArrowMode : BNE .rupees : BRA .normal
 	.infinite
 		LDA.b #$01 : RTL

rngfixes.asm

@@ -111,6 +111,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,600 @@
+;--------------------------------------------------------------------------------
+!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 : AND.b #$7F : 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 : AND.b #$7F : CMP.b #$04 : BEQ .special_cane
+	                                  CMP.b #$05 : BEQ .special_cane
+	LDA SpecialWeapons : AND.b #$80 : BNE .cane_immune
+	BRA .normal
+.blue_cane
+	PHA
+	LDA SpecialWeapons : AND.b #$7F : CMP.b #$03 : BEQ .special_cane
+	                                  CMP.b #$05 : BEQ .special_cane
+	LDA SpecialWeapons : AND.b #$80 : BNE .cane_immune
+	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 : AND.b #$7F : CMP.b #$02 : BNE .normal
+	PLA
+	LDA #$05
+	RTL
+.normal
+	PLA
+.not_cane_or_beam
+	CMP #$07 : BNE .no_change
+	LDA SpecialWeapons : AND.b #$7F : CMP #$01 : BNE .normal_bombs
+	LDA SpecialWeaponLevel : 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 SpecialWeaponLevel
+	BRA .done
+.mothula
+	LDA SpecialWeaponLevel
+	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 BowEquipment : 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 : AND.b #$7F : 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.w $0E10, Y : BNE .ignore_collision ; Moldy can have little a I-Frames, as a treat
+	LDA.l SpecialWeapons : AND.b #$7F : CMP.b #$01 : BNE ++
+	LDA.w $0C4A, X : CMP.b #$07 : BEQ .check_collision_moldorm
+	BRA .ignore_collision ; don't collide with non-bombs
+++ : CMP.b #$03 : BNE ++
+	LDA.w $0C4A, X : CMP.b #$31 : BEQ .check_collision_moldorm
+	BRA .ignore_collision ; don't collide with non-byrna
+++ : CMP.b #$04 : BNE ++
+	LDA.w $0C4A, X : CMP.b #$01 : BEQ .check_collision_moldorm
+	                 CMP.b #$2C : BEQ .check_collision_moldorm
+	BRA .ignore_collision ; don't collide with non-somaria
+++ : CMP.b #$05 : BNE .ignore_collision
+	LDA.w $0C4A, X : CMP.b #$01 : BEQ .check_collision_moldorm
+	                 CMP.b #$2C : BEQ .check_collision_moldorm
+	                 CMP.b #$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 : AND.b #$7F : CMP.b #$01 : BNE ++
+	LDA.w $0C4A, X : CMP.b #$07 : BEQ .check_collision_trinexx
+	BRA .ignore_collision ; don't collide with non-bombs
+++ : CMP.b #$03 : BNE ++
+	LDA.w $0C4A, X : CMP.b #$31 : BEQ .check_collision_trinexx
+	JMP .ignore_collision ; don't collide with non-byrna
+++ : CMP.b #$04 : BNE ++
+	LDA.w $0C4A, X : CMP.b #$01 : BEQ .check_collision_trinexx
+	                 CMP.b #$2C : BEQ .check_collision_trinexx
+	JMP .ignore_collision ; don't collide with non-somaria
+++ : CMP #$05 : BNE .ignore_collision
+	LDA.w $0C4A, X : CMP.b #$01 : BEQ .check_collision_trinexx
+	                 CMP.b #$2C : BEQ .check_collision_trinexx
+	                 CMP.b #$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 : AND.b #$7F : CMP.b #$01 : BNE ++
+	LDA.w $0C4A, X : CMP.b #$07 : BEQ .collide
+	BRA .normal ; normal behavior with non-bombs
+++ : CMP.b #$03 : BNE ++
+	LDA.w $0C4A, X : CMP.b #$31 : BEQ .collide
+	BRA .normal ; normal behavior with non-byrna
+++ : CMP.b #$04 : BNE ++
+	LDA.w $0C4A, X : CMP.b #$01 : BEQ .collide
+	                 CMP.b #$2C : BEQ .collide
+	BRA .normal ; normal behavior with non-somaria
+++ : CMP.b #$05 : BNE .normal
+	LDA.w $0C4A, X : CMP.b #$01 : BEQ .collide
+	                 CMP.b #$2C : BEQ .collide
+	                 CMP.b #$31 : BEQ .collide
+	BRA .normal ; normal behavior with non-canes
+.collide
+	CLC
+	RTL
+.normal
+	LDA.w $0DB0, Y : CMP.b #$03
+	RTL
+; returns carry set if there is collision immunity
+;--------------------------------------------------------------------------------
+Utility_CheckImpervious:
+	LDA $0E20, X : CMP.b #$CB : BNE .normal
+.trinexx
+	LDA SpecialWeapons : AND.b #$7F : CMP.b #$06 : BEQ .check_sidenexx
+	LDA SpecialWeapons : AND.b #$80 : BNE +
+	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 : AND.b #$80 : BEQ .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.l SpecialWeapons : AND.b #$80 : BEQ .not_impervious
+	LDA $0CF2 : CMP #$06 : !BLT .impervious ; swords are ineffective
+	BRA .not_impervious
+.vulnerable
+	LDA.l SpecialWeapons : AND.b #$80 : BEQ .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.l SpecialWeapons : AND.b #$7F : CMP.b #$01 : BEQ .no_disable_projectiles
+	                                    CMP.b #$03 : BEQ .no_disable_projectiles
+	                                    CMP.b #$04 : BEQ .no_disable_projectiles
+	                                    CMP.b #$05 : BEQ .no_disable_projectiles
+	                                    CMP.b #$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.l SpecialWeapons : AND.b #$7F : CMP.b #$01 : BEQ .no_disable_projectiles
+	                                    CMP.b #$03 : BEQ .no_disable_projectiles
+	                                    CMP.b #$04 : BEQ .no_disable_projectiles
+	                                    CMP.b #$05 : BEQ .no_disable_projectiles
+	                                    CMP.b #$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 #$007F : CMP.w #$0001 : BNE .vanillaBombs
+	LDA.l SpecialWeaponLevel : 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 #$007F : CMP.w #$0001 : BEQ .specialSword
+	                                    CMP.w #$0003 : BEQ .specialSword
+	                                    CMP.w #$0004 : BEQ .specialSword
+	                                    CMP.w #$0005 : BEQ .specialSword
+	                                    CMP.w #$0008 : BEQ .specialSword
+	LDA SwordEquipment : 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 SpecialWeaponLevel : AND.w #$00FF : STA $02
+	LDA.w #$FC51 : STA $04
+	RTL
+;--------------------------------------------------------------------------------
+DrawBombInYBox:
+	CPX.w #$0004 : BNE .done
+	LDA SpecialWeapons : AND.w #$007F : CMP.w #$0001 : BNE .vanilla
+	LDA SpecialWeaponLevel : 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 #$007F : CMP.w #$0001 : BNE .regularBombs
+	LDA.l SpecialWeaponLevel : 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 : AND.b #$7F : CMP.b #$01 : BNE .normal
+	PHX
+	LDA.l SpecialWeaponLevel
+	TAX
+	LDA.l BombSpriteColor, X
+	STA $0B
+	PLX
+	RTL
+.normal
+	LDA #$04 : STA $0B
+	RTL
+;--------------------------------------------------------------------------------
+StoreSwordDamage:
+	LDA.l SpecialWeapons : AND.b #$7F : 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 : AND.b #$7F : CMP.b #$01 : BEQ .detonate_bombs
+	                                    CMP.b #$06 : BEQ .release_bee
+	CLC : RTL
+.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
+	JMP .done
+.release_bee
+	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
+	SEC
+	RTL
+;--------------------------------------------------------------------------------
+SetBeeType:
+	LDA.l SpecialWeapons : AND.b #$7F : 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 : AND.b #$7F : 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 : AND.b #$7F : 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 : AND.b #$7F : 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
+;--------------------------------------------------------------------------------
+CheckBugNet:
+LDA.w $037A : AND.b #$10 : BEQ .done ; normal behavior if not bugnet
+PHP ; we want to preserve the carry bit
+LDA.l SpecialWeapons : AND.b #$7F : CMP.b #$08 : BNE .return_10 ; normal behavior if not bugnet mode
+.bugnet_mode
+LDA.w $0E20, X : CMP.b #$E3 : BEQ .return_10 ; normal behavior if fairy
+                 CMP.b #$79 : BEQ .return_10 ; normal behavior if bee
+                 CMP.b #$B2 : BEQ .return_10 ; normal behavior if bee
+PLP : LDA.b #$00 : RTL
+.return_10
+PLP : LDA.b #$10
+.done
+RTL
+;--------------------------------------------------------------------------------
+SetHammerClass:
+LDA.l SpecialWeapons : AND.b #$7F : CMP.b #$08 : BNE .normal ; normal behavior if not bugnet mode
+LDA.w $037A : AND.b #$10 : BEQ .normal ; normal behavior if not bugnet
+LDA 4, S : TAX ; get sprite index off of stack
+LDA.w $0E20, X : CMP.b #$88 : BNE .not_mothula
+LDA.l SpecialWeaponLevel
+CMP #$04 : !BGE .fix_mothula
+BRA .done
+.fix_mothula
+LDA #$03
+BRA .done
+.not_mothula
+LDA.l SpecialWeaponLevel
+.done
+STA.w $0CF2
+RTL
+.normal
+LDA.w $0301
+AND.b #$0A
+BEQ .not_hammer
+LDA.b #$03
+STA.w $0CF2
+.not_hammer
+RTL
+;--------------------------------------------------------------------------------

sram.asm

@@ -168,13 +168,14 @@ CurrentGenericKeys: skip 1      ; Generic small keys
 ;================================================================================
 ; Tracking & Indicators ($7EF38C - $7EF3F0)
 ;--------------------------------------------------------------------------------
-InventoryTracking: skip 2       ; b r m p n s k f  - - - - - - o q (bitfield)
+InventoryTracking: skip 2       ; - - - - - - o q  b r m p n s k f (bitfield)
                                 ; b = Blue Boomerang   | r = Red Boomerang  | m = Mushroom Current
                                 ; p = Magic Powder     | n = Mushroom Past  | s = Shovel
                                 ; k = Inactive Flute   | f = Active Flute   | o = Any bomb acquired
                                 ; q = Quickswap locked
-BowTracking: skip 2             ; b s p - - - - -  - - - - - - - - (bitfield)
-                                ; b = Bow | s = Silver Arrows Upgrade | p = Second Progressive Bow
+BowTracking: skip 2             ; - - - - - - - -  b s p f - - - - (bitfield)
+                                ; b = Any Bow               | s = Silver Arrows Upgrade | p = Second Progressive Bow
+                                ; f = First progressive bow
                                 ; The front end writes two distinct progressive bow items. p
                                 ; indicates whether the "second" has been found independent of
                                 ; the first
@@ -182,7 +183,9 @@ ItemLimitCounts: skip 16        ; Keeps track of limited non-progressive items s
                                 ; See: ItemSubstitutionRules in tables.asm
                                 ; Right now this is only used for three items but extra space is
                                 ; reserved
-skip 37                         ; Unused
+skip 35                         ; Unused
+SpecialWeaponLevel: skip 1      ; Keeps track of level of weapon in item modes
+ItemOnB: skip 1                 ; same table as $0202; $01 = arrows .. $14 = mirror
 ProgressIndicator: skip 1       ; $00 = Pre-Uncle | $01 = Post-Uncle item | $02 = Zelda Rescued
                                 ; $03 = Agahnim 1 defeated
                                 ; $04 and above don't do anything. $00-$02 used in standard mode
@@ -313,7 +316,8 @@ HeartPieceCounter: skip 1       ; Total Number of heartpieces collected (integer
 CrystalCounter: skip 1          ; Total Number of crystals collected (integer)
 DungeonsCompleted: skip 2       ; Bitfield indicating whether a dungeon's prize has been collected.
                                 ; This has the same shape as the dungeon item bitfields.
-skip 44                         ; Unused
+BombsPlaced: skip 2             ; Total Number of bombs placed (16-bit integer)
+skip 42                         ; Unused
 ServiceSequenceRx:              ; Service sequence receive
 ServiceSequenceTx:              ; Service sequence transmit
 ServiceSequence: skip 8         ; Service request block. See servicerequest.asm
@@ -371,6 +375,26 @@ FileMarker: skip 1              ; $FF = Active save file | $00 = Inactive save f
 skip 13                         ; Unused
 InverseChecksum: skip 2         ; Vanilla Inverse Checksum. Don't write unless computing checksum.
 
+;================================================================================
+; Temporary Effects ($7F50C0 - $7F50CF)
+;--------------------------------------------------------------------------------
+base $7F50C0
+SwordModifier: skip 1
+ShieldModifier: skip 1 ; (not implemented)
+ArmorModifier: skip 1
+MagicModifier: skip 1
+LightConeModifier: skip 1
+CuccoStormModifier: skip 1
+OldManDashModifier: skip 1
+IcePhysicsModifier: skip 1
+InfiniteArrowsModifier: skip 1
+InfiniteBombsModifier: skip 1
+InfiniteMagicModifier: skip 1
+InvertDPadModifier: skip 1
+TemporaryOHKO: skip 1
+SpriteSwapper: skip 1
+BootsModifier: skip 1 ; (0=Off, 1=Always, 2=Never)
+
 ;================================================================================
 ; Expanded SRAM ($7F6000 - $7F6FFF)
 ;--------------------------------------------------------------------------------
@@ -527,6 +551,7 @@ endmacro
 ;--------------------------------------------------------------------------------
 %assertSRAM(InventoryTracking, $7EF38C)
 %assertSRAM(BowTracking, $7EF38E)
+%assertSRAM(SpecialWeaponLevel, $7EF3C3)
 %assertSRAM(ItemLimitCounts, $7EF390)
 ;--------------------------------------------------------------------------------
 %assertSRAM(GameCounter, $7EF3FF)

stats.asm

@@ -184,6 +184,16 @@ IncrementChestTurnCounter:
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
+IncrementBombsPlacedCounter:
+	PHA
+		LDA StatsLocked : BNE +
+			PHP : REP #$20
+			LDA BombsPlaced : INC : STA BombsPlaced
+			PLP
+		+
+	PLA
+RTL
+;--------------------------------------------------------------------------------
 IncrementChestCounter:
 	LDA.b #$01 : STA $02E9 ; thing we wrote over
 	PHA

stats/creditsnew.asm

@@ -3,31 +3,67 @@
 ;===================================================================================================
 table "creditscharmapbighi.txt"
 YourSpriteCreditsHi:
-db 2
-db 55
-db "                            " ; $238002
+db 2, 55, "                            " ; $238002
 
 table "creditscharmapbiglo.txt"
 YourSpriteCreditsLo:
-db 2
-db 55
-db "                            " ; $238020
+db 2, 55, "                            " ; $238020
 
+table "creditscharmapbighi.txt"
 CollectionRateHi:
-db 2, 55
-db $5F, $6B, $68, $68, $61, $5F, $70, $65, $6B, $6A, $9F, $6E, $5D, $70, $61  ; "Collection Rate"
-db $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F ; "        " 8 spaces
-print "Collection Rate High Start: ", pc
-db $9F, $A2 ; " /"
-db $55, $54, $59 ; 216
+db 2, 55, "COLLECTION RATE         /216" ; $23803E, "216" at $238057
 
+table "creditscharmapbiglo.txt"
 CollectionRateLo:
-db 2, 55
-db $85, $91, $8E, $8E, $87, $85, $96, $8B, $91, $90, $9F, $94, $83, $96, $87  ; "Collection Rate"
-db $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F  ; "        " 8 spaces
-print "Collection Rate Low Start: ", pc
-db $9F, $C2 ; " /"
-db $7B, $7A, $7F ; 216
+db 2, 55, "COLLECTION RATE         /216" ; $23805C, "216" at $238075
+
+table "creditscharmapbighi.txt"
+FirstSwordStatsHi:
+db 2, 55, "FIRST SWORD                 " ; $23807A
+
+table "creditscharmapbiglo.txt"
+FirstSwordStatsLo:
+db 2, 55, "FIRST SWORD                 " ; $238098
+
+table "creditscharmapbighi.txt"
+SwordlessKillsHi:
+db 2, 55, "SWORDLESS                /13" ; $2380B6
+
+table "creditscharmapbiglo.txt"
+SwordlessKillsLo:
+db 2, 55, "SWORDLESS                /13" ; $2380D4
+
+table "creditscharmapbighi.txt"
+FighterSwordKillsHi:
+db 2, 55, "FIGHTER'S SWORD          /13" ; $2380F2
+
+table "creditscharmapbiglo.txt"
+FighterSwordKillsLo:
+db 2, 55, "FIGHTER'S SWORD          /13" ; $238110
+
+table "creditscharmapbighi.txt"
+MasterSwordKillsHi:
+db 2, 55, "MASTER SWORD             /13" ; $23812E
+
+table "creditscharmapbiglo.txt"
+MasterSwordKillsLo:
+db 2, 55, "MASTER SWORD             /13" ; $23814C
+
+table "creditscharmapbighi.txt"
+TemperedSwordKillsHi:
+db 2, 55, "TEMPERED SWORD           /13" ; $23816A
+
+table "creditscharmapbiglo.txt"
+TemperedSwordKillsLo:
+db 2, 55, "TEMPERED SWORD           /13" ; $238188
+
+table "creditscharmapbighi.txt"
+GoldSwordKillsHi:
+db 2, 55, "GOLD SWORD               /13" ; $2381A6
+
+table "creditscharmapbiglo.txt"
+GoldSwordKillsLo:
+db 2, 55, "GOLD SWORD               /13" ; $2381C4
 
 ;===================================================================================================
 
@@ -475,11 +511,15 @@ CreditsLineBlank:
 
 %blankline()
 
-%bigcredits("ACHY    ARTHEAU    TARTHORON")
+%bigcredits("ACHY                 ARTHEAU")
 
 %blankline()
 
-%bigcredits("GLAN    PLAGUEDONE   TWROXAS")
+%bigcredits("GLAN                 TWROXAS")
+
+%blankline()
+
+%bigcredits("PLAGUEDONE         TARTHORON")
 
 %blankline()
 %blankline()
@@ -537,7 +577,11 @@ CreditsLineBlank:
 
 %blankline()
 
-%bigcredits("MICHAELK    FOUTON     BONTA")
+%bigcredits("MICHAELK              FOUTON")
+
+%blankline()
+
+%bigcredits("BONTA                EMOSARU")
 
 %blankline()
 
@@ -577,12 +621,6 @@ CreditsLineBlank:
 %emptyline()
 %emptyline()
 %emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
 
 ;===================================================================================================
 
@@ -613,7 +651,8 @@ endif
 %blankline()
 %blankline()
 
-%bigcreditsleft("FIRST SWORD")
+%addarbline(FirstSwordStatsHi)
+%addarbline(FirstSwordStatsLo)
 
 %blankline()
 
@@ -636,23 +675,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()
@@ -674,6 +718,10 @@ endif
 
 %blankline()
 
+%bigcreditsleft("BOMBS PLACED")
+
+%blankline()
+
 %bigcreditsleft("SAVE AND QUITS")
 
 %blankline()
@@ -693,11 +741,6 @@ endif
 %bigcreditsleft("TOTAL LAG TIME")
 
 %blankline()
-%blankline()
-
-
-%blankline()
-%blankline()
 
 
 %blankline()
@@ -729,42 +772,3 @@ endif
 %emptyline()
 
 ;---------------------------------------------------------------------------------------------------
-
-!FIRST_SWORD_X = 19
-!FIRST_SWORD_Y = 310
-!PEGASUS_BOOTS_X = 19
-!PEGASUS_BOOTS_Y = 313
-!FLUTE_X = 19
-!FLUTE_Y = 316
-!MIRROR_X = 19
-!MIRROR_Y = 319
-!SWORDLESS_X = 23
-!SWORDLESS_Y = 327
-!FIGHTERS_SWORD_X = 23
-!FIGHTERS_SWORD_Y = 330
-!MASTER_SWORD_X = 23
-!MASTER_SWORD_Y = 333
-!TEMPERED_SWORD_X = 23
-!TEMPERED_SWORD_Y = 336
-!GOLD_SWORD_X = 23
-!GOLD_SWORD_Y = 339
-!DAMAGETAKEN_X = 26
-!DAMAGETAKEN_Y = 346
-!MAGICUSED_X = 26
-!MAGICUSED_Y = 349
-!BONKS_X = 26
-!BONKS_Y = 352
-!SAVE_AND_QUITS_X = 26
-!SAVE_AND_QUITS_Y = 355
-!DEATHS_X = 26
-!DEATHS_Y = 358
-!FAERIE_REVIVALS_X = 26
-!FAERIE_REVIVALS_Y = 361
-!TOTAL_MENU_TIME_X = 19
-!TOTAL_MENU_TIME_Y = 364
-!TOTAL_LAG_TIME_X = 19
-!TOTAL_LAG_TIME_Y = 367
-!COLLECTION_RATE_X = 22
-!COLLECTION_RATE_Y = 380
-!TOTAL_TIME_X = 19
-!TOTAL_TIME_Y = 383

stats/statConfig.asm

@@ -1,10 +1,51 @@
+!FIRST_SWORD_X = 19
+!FIRST_SWORD_Y = 310
+!PEGASUS_BOOTS_X = 19
+!PEGASUS_BOOTS_Y = 313
+!FLUTE_X = 19
+!FLUTE_Y = 316
+!MIRROR_X = 19
+!MIRROR_Y = 319
+!SWORDLESS_X = 23
+!SWORDLESS_Y = 327
+!FIGHTERS_SWORD_X = 23
+!FIGHTERS_SWORD_Y = 330
+!MASTER_SWORD_X = 23
+!MASTER_SWORD_Y = 333
+!TEMPERED_SWORD_X = 23
+!TEMPERED_SWORD_Y = 336
+!GOLD_SWORD_X = 23
+!GOLD_SWORD_Y = 339
+!DAMAGETAKEN_X = 26
+!DAMAGETAKEN_Y = 346
+!MAGICUSED_X = 26
+!MAGICUSED_Y = 349
+!BONKS_X = 26
+!BONKS_Y = 352
+!BOMBS_X = 26
+!BOMBS_Y = 355
+!SAVE_AND_QUITS_X = 26
+!SAVE_AND_QUITS_Y = 358
+!DEATHS_X = 26
+!DEATHS_Y = 361
+!FAERIE_REVIVALS_X = 26
+!FAERIE_REVIVALS_Y = 364
+!TOTAL_MENU_TIME_X = 19
+!TOTAL_MENU_TIME_Y = 367
+!TOTAL_LAG_TIME_X = 19
+!TOTAL_LAG_TIME_Y = 370
+!COLLECTION_RATE_X = 22
+!COLLECTION_RATE_Y = 380
+!TOTAL_TIME_X = 19
+!TOTAL_TIME_Y = 383
+
 ;(address, type, shiftRight, bits, digits, xPos, lineNumber)
 
 %AddStat(SwordTime, 1, 0, 32, 4, !FIRST_SWORD_X, !FIRST_SWORD_Y)
 %AddStat(BootsTime, 1, 0, 32, 4, !PEGASUS_BOOTS_X, !PEGASUS_BOOTS_Y)
 %AddStat(FluteTime, 1, 0, 32, 4, !FLUTE_X, !FLUTE_Y)
 %AddStat(MirrorTime, 1, 0, 32, 4, !MIRROR_X, !MIRROR_Y)
-%AddStat(SwordlessBossKills, 0, 0, 08, 2, !SWORDLESS_X, !SWORDLESS_Y)
+%AddStat(SwordlessBossKills, 0, 0, 04, 2, !SWORDLESS_X, !SWORDLESS_Y)
 %AddStat(SwordBossKills, 0, 4, 04, 2, !FIGHTERS_SWORD_X, !FIGHTERS_SWORD_Y)
 %AddStat(SwordBossKills, 0, 0, 04, 2, !MASTER_SWORD_X, !MASTER_SWORD_Y)
 %AddStat(SwordBossKills+1, 0, 4, 04, 2, !TEMPERED_SWORD_X, !TEMPERED_SWORD_Y)
@@ -12,6 +53,7 @@
 %AddStat(DamageCounter, 0, 0, 16, 5, !DAMAGETAKEN_X, !DAMAGETAKEN_Y)
 %AddStat(MagicCounter, 0, 0, 16, 5, !MAGICUSED_X, !MAGICUSED_Y)
 %AddStat(BonkCounter, 0, 0, 08, 3, !BONKS_X, !BONKS_Y)
+%AddStat(BombsPlaced, 0, 0, 16, 4, !BOMBS_X, !BOMBS_Y)
 %AddStat(SaveQuitCounter, 0, 0, 08, 2, !SAVE_AND_QUITS_X, !SAVE_AND_QUITS_Y)
 %AddStat(DeathCounter, 0, 0, 08, 2, !DEATHS_X, !DEATHS_Y)
 %AddStat(FaerieRevivalCounter, 0, 0, 08, 3, !FAERIE_REVIVALS_X, !FAERIE_REVIVALS_Y)

swordswap.asm

@@ -39,25 +39,34 @@ 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
-		REP #$20 ; set 16-bit accumulator
-		TXA : LSR : TAX : BCS .lower
-.upper
-	PLP
-	LDA.l Damage_Table, X
-	LSR #4
-RTL
-.lower
-	PLP
-	LDA.l Damage_Table, X
-	AND.b #$0F
-RTL
+	LDA SpecialWeapons : AND.b #$7F : CMP.b #$02 : BEQ .pseudo_table
+	LDA SpecialWeapons : AND.b #$80 : BNE .bomb_table
+		%LookupDamageSubclass(Damage_Table) : RTL
+	.bomb_table
+		%LookupDamageSubclass(Damage_Table_Bombs) : RTL
+	.pseudo_table
+		%LookupDamageSubclass(Damage_Table_Pseudo) : RTL
 ;================================================================================
 ; $7F50C0 - Sword Modifier
 LoadModifiedSwordLevel: ; returns short
@@ -96,29 +105,40 @@ 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
-	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
+  JSR LoadModifiedIceFloorValue : AND.b #$11 : RTL
 LoadModifiedIceFloorValue_a01:
-	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.w $0348 : ORA $7F50C7 : AND.b #$01 : RTL
-	+ : LDA.w $0348 : AND.b #$01
-RTL
+  JSR LoadModifiedIceFloorValue : AND.b #$01 : RTL
 ;================================================================================
 CheckTabletSword:
 	LDA.l AllowHammerTablets : BEQ +
-	LDA HammerEquipment : BEQ + ; check for hammer
-		LDA.b #$02 : RTL
+	LDA HammerEquipment : BNE .allow ; check for hammer
 	+
+	LDA.l SpecialWeapons : AND.b #$7F : CMP.b #$01 : BEQ .check_special
+	                                    CMP.b #$03 : BEQ .check_special
+	                                    CMP.b #$04 : BEQ .check_special
+	                                    CMP.b #$05 : BEQ .check_special
+	                                    CMP.b #$06 : BEQ .allow
+	                                    CMP.b #$08 : BEQ .check_special
+	BRA .normal
+	.allow
+		LDA.b #$02 : RTL
+	.check_special
+	LDA SpecialWeaponLevel : CMP #$02 : !BGE .allow ; check for master bombs
+	.normal
 	LDA SwordEquipment ; get actual sword value
 RTL
 ;================================================================================
@@ -126,15 +146,27 @@ GetSwordLevelForEvilBarrier:
 	LDA.l AllowHammerEvilBarrierWithFighterSword : BEQ +
 	LDA #$FF : RTL
 	+
-	LDA SwordEquipment
-RTL
+	LDA.l SpecialWeapons : AND.b #$7F : CMP.b #$08 : BEQ +
+	LDA.l SwordEquipment : RTL
+	+
+	LDA.l SpecialWeaponLevel : RTL
 ;================================================================================
 CheckGanonHammerDamage:
 	LDA.l HammerableGanon : BEQ +
 	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,44 @@ 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- 0x180030 (Unused)
+; 0x18002B (Unused)
+;--------------------------------------------------------------------------------
+org $30802C ; PC 0x18002C
+AllowedItemOnB:
+db #$00
+; $00 = None (default)
+; $01 - $20 = Only selected item
+; $FF = Any valid
+;--------------------------------------------------------------------------------
+org $30802D ; PC 0x18002D
+ChallengeModes:
+; ---- ---i
+; i: Permanent Ice Physics
+db #$00 ; #$00 = Default behavior;
+;--------------------------------------------------------------------------------
+org $30802E ; PC 0x18002E
+GanonVulnerabilityItem:
+db #$00 ; #$00 = Default behavior (silver arrows)
+;--------------------------------------------------------------------------------
+org $30802F ; PC 0x18002F
+SpecialWeapons:
+db #$00
+; s - - -  m m m m (bitfield)
+; s - only swords damage can hurt enemies
+; m - special weapon mode
+; $00 = Off (default)
+; $01 = Bomb mode
+; $02 = Pseudosword
+; $03 = Byrna mode
+; $04 = Somaria mode
+; $05 = Canes mode
+; $06 = Bee mode
+; $07 = Unused
+; $08 = Bugnet mode
+;--------------------------------------------------------------------------------
+org $308030 ; PC 0x180030
+EnableSRAMTrace:
+db #$00 ; #$00 = Off (default) - #$01 = On
 ;--------------------------------------------------------------------------------
 org $308031 ; PC 0x180031
 EnableEasterEggs:
@@ -214,10 +251,13 @@ db #$00 ; #$00 = Off (default) - #$01 = On (frog/smith can enter multi-entrance
 org $30804D ; PC 0x18004D
 EscapeAssist: ; ScrubMode:
 db #$00
-;---- -mba
-;m - Infinite Magic
-;b - Infinite Bombs
-;a - Infinite Arrows
+;-MBA -mba
+;M - Infinite Magic (after escape)
+;B - Infinite Bombs (after escape)
+;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:
@@ -384,8 +424,6 @@ org $30808F ; PC 0x18008F
 SwapAgaGanonsTower:
 db $00 ; #$00 = Off (default) - #$01 = On
 ;--------------------------------------------------------------------------------
-; 0x18008F (unused)
-;--------------------------------------------------------------------------------
 org $308090 ; PC 0x180090 - 0x180097
 ProgressiveSwordLimit:
 db #$04 ; #$04 - 4 Swords (default)
@@ -426,7 +464,11 @@ org $30809D
 DungeonMapIcons:
 db $01
 ;--------------------------------------------------------------------------------
-; 0x18009E - 0x18009F (unused)
+; 0x18009E (unused)
+;--------------------------------------------------------------------------------
+org $30809F ; PC 0x18009F
+SeededRNG:
+db $01 ; #$00 = Off - #$01 = Seeded RNG (default for rando)
 ;--------------------------------------------------------------------------------
 org $3080A0 ; PC 0x1800A0 - 0x1800A4
 Bugfix_MirrorlessSQToLW:
@@ -1404,6 +1446,16 @@ db $04
 ;AD - Small Key of Ganon's Tower
 ;AE - Reserved
 ;AF - Generic Small Key
+
+;B0 - Bee Trap
+;B1 - Apples
+;B2 - Fairy
+;B3 - Chicken
+;B4 - Big Magic
+;B5 - 5 Arrows
+;C0 - Progressive Bomb
+;C1 - Progressive Cane
+;C2 - Progressive Bug Net
 ;================================================================================
 ;;Residual Portal
 ;org $0283E0 ; PC 0x103E0 (Bank02.asm:816) (BNE)

timer.asm

@@ -2,7 +2,6 @@
 ; Challenge Timer
 ;================================================================================
 !Temp = "$7F5020"
-!TemporaryOHKO = "$7F50CC"
 ;--------------------------------------------------------------------------------
 !CLOCK_HOURS = "$7F5080" ; $7F5080 - $7F5083 - Clock Hours
 !CLOCK_MINUTES = "$7F5084" ; $7F5084 - $7F5087 - Clock Minutes
@@ -176,7 +175,7 @@ DrawChallengeTimer:
 RTL
 ;--------------------------------------------------------------------------------
 OHKOTimer:
-	LDA !TemporaryOHKO : BNE .kill
+	LDA TemporaryOHKO : BNE .kill
 	LDA.l TimeoutBehavior : CMP #$02 : BNE +
 	LDA !Status : AND.b #$02 : BEQ +
 		.kill

utilities.asm

@@ -161,8 +161,10 @@ RTL
 	db $3B ; Big Magic
 	db $4A ; Good Bee
 	db $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 $13 ; Bomb Upgrade
+	db $07 ; Cane Upgrade
+	db $27 ; Bug Net Upgrade
+	db $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
 	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; Reserved
@@ -195,7 +197,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
@@ -245,6 +247,16 @@ RTL
 			LDA.b #$08 : RTL
 		+ ; Any Bow
 			LDA.b #$02 : RTL
+	++ : CMP.b #$F7 : BNE ++ ; Progressive Bombs
+		LDA SpecialWeaponLevel
+			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)
@@ -297,7 +309,10 @@ RTL
 	db $08 ; Big Magic
 	db $04 ; Good Bee
 	db $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 $F7 ; Bomb Upgrade
+	db $0A ; Cane Upgrade
+	db $02 ; Bug Net Upgrade
+	db $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
 	db $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 ; Unused
@@ -387,7 +402,7 @@ 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, $B4, $B5
+	db $AD, $AE, $AF, $B4, $B5, $C1
 	.smallSprites_end
 }
 ;--------------------------------------------------------------------------------

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 : AND.b #$7F : 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 : AND.b #$7F : 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
+;--------------------------------------------------------------------------------