1 files changed, 537 insertions, 534 deletions
diff --git a/poweruphax.yaml b/poweruphax.yaml
index 550d58c..281c9ea 100644
--- a/poweruphax.yaml
+++ b/poweruphax.yaml
@@ -1,598 +1,601 @@
----
-source_files: [../src/poweruphax.S]
-hooks:
-  - name: GetInfoFromDumbTable
-    type: branch_insn
-    branch_type: b
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x80142650
-    target_func: 'GetInfoFromDumbTable'
-    
-  - name: FukidashiFix
-    type: branch_insn
-    branch_type: b
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x800B1A50
-    target_func: 'FukidashiFix'
-    
-  - name: PlayerGetHeightFix
-    type: branch_insn
-    branch_type: b
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x80132670
-    target_func: 'PlayerGetHeight'
-    
-#  - name: EnItem_BindAnimation_Fix
-#    type: branch_insn
-#    branch_type: b
-#    src_addr_ntsc: 0xdeadbeef
-#    src_addr_pal: 0x80A291E0
-#    target_func: 'EnItem_BindAnimation_Fix'
-    
-  - name: DealWithBlahTable
-    type: branch_insn
-    branch_type: b
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x80141F70
-    target_func: 'DealWithBlahTable'
-    
-  - name: GetAsdfTable
-    type: branch_insn
-    branch_type: b
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x801466C0
-    target_func: 'GetAsdfTable'
-    
-  - name: GetBlahTableOffset
-    type: branch_insn
-    branch_type: bl
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x801421AC
-    target_func: 'GetBlahTableOffset'
-    
-  - name: GetWeirdScaleTable
-    type: branch_insn
-    branch_type: bl
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x8014676C
-    target_func: 'GetWeirdScaleTable'
-    
-  - name: WtfEver
-    type: branch_insn
-    branch_type: bl
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x80133E48
-    target_func: 'WtfEver'
-    
-  - name: YetAnother
-    type: branch_insn
-    branch_type: bl
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x80138840
-    target_func: 'YetAnother'
-    
-  - name: ExtendHammerStruct
-    type: patch
-    addr_ntsc: 0xdeadbeef
-    addr_pal: 0x807FCBA8
-    data: '3860 045C'
-    
-  - name: ThrowHammer
-    type: branch_insn
-    branch_type: b
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x8013BEE4
-    target_func: 'ThrowHammer'
-    
-  - name: MoreProjectileStuff_Fix
-    type: branch_insn
-    branch_type: b
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x8013C3A0
-    target_func: 'MoreProjectileStuff_Fix'
-    
-  - name: ProjectileShootCheck_Fix1
-    type: patch
-    addr_ntsc: 0xdeadbeef
-    addr_pal: 0x8013BB7C
-    data: '4181003C'
-    
-  - name: ProjectileShootCheck_Fix2
-    type: branch_insn
-    branch_type: b
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x8013BBB8
-    target_func: 'ProjectileShootCheck_Fix'
-    
-  - name: QBlockItemChange
-    type: patch
-    addr_ntsc: 0xdeadbeef
-    addr_pal: 0x802ee628
-    data: '00000006'
-    
-  - name: QBlockItemFix
-    type: patch
-    addr_ntsc: 0xdeadbeef
-    addr_pal: 0x8002288c
-    data: '60000000'
-    
-  - name: FixMushroomIfSmallBlock
-    type: patch
-    addr_ntsc: 0xdeadbeef
-    addr_pal: 0x800221ac
-    data: '2800 0003'
-    
-  - name: SomeEnItemFix
-    type: patch
-    addr_ntsc: 0xdeadbeef
-    addr_pal: 0x80A2BE98
-    data: '2800 0003'
-    
-  - name: MushroomEnItemFix
-    type: patch
-    addr_ntsc: 0xdeadbeef
-    addr_pal: 0x80A28598
-    data: '2800 0003'
-    
-  - name: DisablePowerupValidityCheck
-    type: patch
-    addr_ntsc: 0xdeadbeef
-    addr_pal: 0x800611C4
-    data: '60000000'
-    
-  - name: TinyTableFix
-    type: patch
-    addr_ntsc: 0xdeadbeef
-    addr_pal: 0x802F5AEC
-    data: '00000001'
-    
-    #It's not actually a function but who cares?
-  - name: AlwaysLoadBrosArc
-    type: add_func_pointer
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x8098C488
-    target_func: 'BrosArcFileName'
-    
-  - name: AlwaysLoadBrosArc
-    type: add_func_pointer
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x8098C490
-    target_func: 'I_hammerArcFilename'
-    
-  - name: ChangeHammerBrres
-    type: add_func_pointer
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x80AF0FA8
-    target_func: 'I_hammerResFile'
-    
-  - name: ChangeHammerArc
-    type: add_func_pointer
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x80AF0ECC
-    target_func: 'I_hammerArcFilename'
-    
-  - name: ChangeHammerModel
-    type: add_func_pointer
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x80AF1000
-    target_func: 'I_hammerModelName'
-    
-  - name: LetPlayerGetHammerItem
-    type: branch_insn
-    branch_type: bl
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x80A285FC
-    target_func: 'TryToGiveMarioHammerSuit'
-    
-  - name: WeirdAnimLoadHack
-    type: branch_insn
-    branch_type: bl
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x80A27CE4
-    target_func: 'WeirdAnimLoadHack'
-    
-  - name: SetHammerToEnItemDCA
-    type: add_func_pointer
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x80AF117C
-    target_func: 'SetHammerToEnItemDCA'
-    
-  - name: PlumberSetPowerupFix
-    type: branch_insn
-    branch_type: b
-    src_addr_pal: 0x800D47D4
-    target_func: 'PlumberSetPowerupFix'
-    
-  - name: PlumberSetPowerupFix2
-    type: branch_insn
-    branch_type: b
-    src_addr_pal: 0x80141510
-    target_func: 'PlumberSetPowerupFix2'
-    
-  - name: PlumberSetPowerupTextureFix
-    type: branch_insn
-    branch_type: b
-    src_addr_pal: 0x800CA6F8
-    target_func: 'PlumberSetPowerupTextureFix'
-    
-#  - name: PlumberSetPowerupTextureDebug
-#    type: branch_insn
-#    branch_type: b
-#    src_addr_pal: 0x800CA6B0
-#    target_func: 'PlumberSetPowerupTextureDebug'
-    
-  - name: FixPowerupScale_First
-    type: branch_insn
-    branch_type: bl
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x800d6fdc
-    target_func: 'GetPowerupScaleFloatAddr_r6_trash_r0_valshl2_r4_dest'
-    
-  - name: FixPowerupScale_Second
-    type: branch_insn
-    branch_type: bl
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x8004cc80
-    target_func: 'GetPowerupScaleFloatAddr_r6_trash_r0_valshl2_r3_dest'
-    
-  - name: FixPowerupScale_Third
-    type: branch_insn
-    branch_type: bl
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x800d7064
-    target_func: 'GetPowerupScaleFloatAddr_r8_trash_r0_valshl2_r7_dest'
-    
-  - name: FixPowerupScale_Fourth
-    type: branch_insn
-    branch_type: bl
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x801293D0
-    target_func: 'GetPowerupScaleFloatAddr_r6_trash_r0_valshl2_r3_dest'
-    
-  - name: FixPowerupScale_Fifth
-    type: branch_insn
-    branch_type: bl
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x80137CDC
-    target_func: 'GetPowerupScaleFloatAddr_r6_trash_r0_valshl2_r3_dest'
-    
-  - name: FixPowerupScale_Sixth
-    type: branch_insn
-    branch_type: b
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x80141FF4
-    target_func: 'GetPowerupScaleFloatAddr_fixForSixth'
-    
-  - name: FixPowerupScale_Seventh
-    type: branch_insn
-    branch_type: bl
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x8014378C
-    target_func: 'GetPowerupScaleFloatAddr_r6_trash_r0_valshl2_r3_dest'
-    
-  - name: FixPowerupScale_Eighth
-    type: branch_insn
-    branch_type: bl
-    src_addr_ntsc: 0xdeadbeef
-    src_addr_pal: 0x80143884
-    target_func: 'GetPowerupScaleFloatAddr_r8_trash_r0_valshl2_r7_dest'
+---
+source_files: [../src/poweruphax.S]
+hooks:
+  - name: GetInfoFromDumbTable
+    type: branch_insn
+    branch_type: b
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x80142650
+    target_func: 'GetInfoFromDumbTable'
+    
+  - name: FukidashiFix
+    type: branch_insn
+    branch_type: b
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x800B1A50
+    target_func: 'FukidashiFix'
+    
+  - name: PlayerGetHeightFix
+    type: branch_insn
+    branch_type: b
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x80132670
+    target_func: 'PlayerGetHeight'
+    
+#  - name: EnItem_BindAnimation_Fix
+#    type: branch_insn
+#    branch_type: b
+#    src_addr_ntsc: 0xdeadbeef
+#    src_addr_pal: 0x80A291E0
+#    target_func: 'EnItem_BindAnimation_Fix'
+    
+  - name: DealWithBlahTable
+    type: branch_insn
+    branch_type: b
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x80141F70
+    target_func: 'DealWithBlahTable'
+    
+  - name: GetAsdfTable
+    type: branch_insn
+    branch_type: b
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x801466C0
+    target_func: 'GetAsdfTable'
+    
+  - name: GetBlahTableOffset
+    type: branch_insn
+    branch_type: bl
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x801421AC
+    target_func: 'GetBlahTableOffset'
+    
+  - name: GetWeirdScaleTable
+    type: branch_insn
+    branch_type: bl
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x8014676C
+    target_func: 'GetWeirdScaleTable'
+    
+  - name: WtfEver
+    type: branch_insn
+    branch_type: bl
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x80133E48
+    target_func: 'WtfEver'
+    
+  - name: YetAnother
+    type: branch_insn
+    branch_type: bl
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x80138840
+    target_func: 'YetAnother'
+    
+  - name: ExtendHammerStruct
+    type: patch
+    addr_ntsc: 0xdeadbeef
+    addr_pal: 0x807FCBA8
+    data: '3860 045C'
+    
+  - name: ThrowHammer
+    type: branch_insn
+    branch_type: b
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x8013BEE4
+    target_func: 'ThrowHammer'
+    
+  - name: MoreProjectileStuff_Fix
+    type: branch_insn
+    branch_type: b
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x8013C3A0
+    target_func: 'MoreProjectileStuff_Fix'
+    
+  - name: ProjectileShootCheck_Fix1
+    type: patch
+    addr_ntsc: 0xdeadbeef
+    addr_pal: 0x8013BB7C
+    data: '4181003C'
+    
+  - name: ProjectileShootCheck_Fix2
+    type: branch_insn
+    branch_type: b
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x8013BBB8
+    target_func: 'ProjectileShootCheck_Fix'
+    
+  - name: QBlockItemChange
+    type: patch
+    addr_ntsc: 0xdeadbeef
+    addr_pal: 0x802ee628
+    data: '00000006'
+    
+  - name: QBlockItemFix
+    type: patch
+    addr_ntsc: 0xdeadbeef
+    addr_pal: 0x8002288c
+    data: '60000000'
+    
+  - name: FixMushroomIfSmallBlock
+    type: patch
+    addr_ntsc: 0xdeadbeef
+    addr_pal: 0x800221ac
+    data: '2800 0003'
+    
+  - name: SomeEnItemFix
+    type: patch
+    addr_ntsc: 0xdeadbeef
+    addr_pal: 0x80A2BE98
+    data: '2800 0003'
+    
+  - name: MushroomEnItemFix
+    type: patch
+    addr_ntsc: 0xdeadbeef
+    addr_pal: 0x80A28598
+    data: '2800 0003'
+    
+  - name: DisablePowerupValidityCheck
+    type: patch
+    addr_ntsc: 0xdeadbeef
+    addr_pal: 0x800611C4
+    data: '60000000'
+    
+  - name: TinyTableFix
+    type: patch
+    addr_ntsc: 0xdeadbeef
+    addr_pal: 0x802F5AEC
+    data: '00000001'
+    
+    #It's not actually a function but who cares?
+  - name: AlwaysLoadBrosArc
+    type: add_func_pointer
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x8098C488
+    target_func: 'BrosArcFileName'
+    
+  - name: AlwaysLoadBrosArc
+    type: add_func_pointer
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x8098C490
+    target_func: 'I_hammerArcFilename'
+    
+  - name: ChangeHammerBrres
+    type: add_func_pointer
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x80AF0FA8
+    target_func: 'I_hammerResFile'
+    
+  - name: ChangeHammerArc
+    type: add_func_pointer
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x80AF0ECC
+    target_func: 'I_hammerArcFilename'
+    
+  - name: ChangeHammerModel
+    type: add_func_pointer
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x80AF1000
+    target_func: 'I_hammerModelName'
+    
+  - name: LetPlayerGetHammerItem
+    type: branch_insn
+    branch_type: bl
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x80A285FC
+    target_func: 'TryToGiveMarioHammerSuit'
+    
+  - name: WeirdAnimLoadHack
+    type: branch_insn
+    branch_type: bl
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x80A27CE4
+    target_func: 'WeirdAnimLoadHack'
+    
+  - name: SetHammerToEnItemDCA
+    type: add_func_pointer
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x80AF117C
+    target_func: 'SetHammerToEnItemDCA'
+    
+  - name: PlumberSetPowerupFix
+    type: branch_insn
+    branch_type: b
+    src_addr_pal: 0x800D47D4
+    target_func: 'PlumberSetPowerupFix'
+    
+  - name: PlumberSetPowerupFix2
+    type: branch_insn
+    branch_type: b
+    src_addr_pal: 0x80141510
+    target_func: 'PlumberSetPowerupFix2'
+    
+  - name: PlumberSetPowerupTextureFix
+    type: branch_insn
+    branch_type: b
+    src_addr_pal: 0x800CA6F8
+    target_func: 'PlumberSetPowerupTextureFix'
+    
+#  - name: PlumberSetPowerupTextureDebug
+#    type: branch_insn
+#    branch_type: b
+#    src_addr_pal: 0x800CA6B0
+#    target_func: 'PlumberSetPowerupTextureDebug'
+    
+  - name: FixPowerupScale_First
+    type: branch_insn
+    branch_type: bl
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x800d6fdc
+    target_func: 'GetPowerupScaleFloatAddr_r6_trash_r0_valshl2_r4_dest'
+    
+  - name: FixPowerupScale_Second
+    type: branch_insn
+    branch_type: bl
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x8004cc80
+    target_func: 'GetPowerupScaleFloatAddr_r6_trash_r0_valshl2_r3_dest'
+    
+  - name: FixPowerupScale_Third
+    type: branch_insn
+    branch_type: bl
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x800d7064
+    target_func: 'GetPowerupScaleFloatAddr_r8_trash_r0_valshl2_r7_dest'
+    
+  - name: FixPowerupScale_Fourth
+    type: branch_insn
+    branch_type: bl
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x801293D0
+    target_func: 'GetPowerupScaleFloatAddr_r6_trash_r0_valshl2_r3_dest'
+    
+  - name: FixPowerupScale_Fifth
+    type: branch_insn
+    branch_type: bl
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x80137CDC
+    target_func: 'GetPowerupScaleFloatAddr_r6_trash_r0_valshl2_r3_dest'
+    
+  - name: FixPowerupScale_Sixth
+    type: branch_insn
+    branch_type: b
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x80141FF4
+    target_func: 'GetPowerupScaleFloatAddr_fixForSixth'
+    
+  - name: FixPowerupScale_Seventh
+    type: branch_insn
+    branch_type: bl
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x8014378C
+    target_func: 'GetPowerupScaleFloatAddr_r6_trash_r0_valshl2_r3_dest'
+    
+  - name: FixPowerupScale_Eighth
+    type: branch_insn
+    branch_type: bl
+    src_addr_ntsc: 0xdeadbeef
+    src_addr_pal: 0x80143884
+    target_func: 'GetPowerupScaleFloatAddr_r8_trash_r0_valshl2_r7_dest'
 
 
 
 
 # Below Here are added all the Hammer Collision hacks
 
-  - name: HammerPodooboo
-    type: patch
-    addr_pal: 0x80ACE8E4
-    data: '0008820C'
-
-  - name: HammerThwomp
-    type: patch
-    addr_pal: 0x80ACF9D0
-    data: '0008820e'
-
-  - name: HammerBigThwomp
-    type: patch
-    addr_pal: 0x80ACF9F4
-    data: '0008820e'
-
-  - name: HammerBigBoo
-    type: patch
-    addr_pal: 0x80AD4AA0
-    data: '0008a80e'
-
-  - name: HammerBigBooTwo
-    type: patch
-    addr_pal: 0x80AD4AA4
-    data: '20020000'
-
-  - name: HammerAmp
-    type: patch
-    addr_pal: 0x80ACE17C
-    data: '00080a04'
-
-  - name: HammerSpikeBall
-    type: patch
-    addr_pal: 0x80AD4D88
-    data: '00080006'
-
-  - name: HammerBigSpikeBall
-    type: patch
-    addr_pal: 0x80ACDD50
-    data: '00080006'
-
-  - name: HammerUrchin
-    type: patch
-    addr_pal: 0x80AD4F48
-    data: '00088a1e'
-
-  - name: HammerChainChomp
-    type: patch
-    addr_pal: 0x80AD5214
-    data: '00088206'
-
-  - name: HammerFireSnake
-    type: patch
-    addr_pal: 0x80ACFBC4
-    data: '00088206'
-
-  - name: HammerFishbones
-    type: patch
-    addr_pal: 0x80AD2748
-    data: '0008881e'
-
-  - name: HammerBeanGoomba
-    type: patch
-    addr_pal: 0x80acd988
-    data: '0008A2BE'
-
-  - name: HammerPukucoinOne
-    type: patch
-    addr_pal: 0x80AD3C60
-    data: '00088a0e'
+  - name: HammerPodooboo
+    type: patch
+    addr_pal: 0x80ACE8E4
+    data: '0008820C'
+
+  - name: HammerThwomp
+    type: patch
+    addr_pal: 0x80ACF9D0
+    data: '0008820e'
+
+  - name: HammerBigThwomp
+    type: patch
+    addr_pal: 0x80ACF9F4
+    data: '0008820e'
+
+  - name: HammerBigBoo
+    type: patch
+    addr_pal: 0x80AD4AA0
+    data: '0008a80e'
+
+  - name: HammerBigBooTwo
+    type: patch
+    addr_pal: 0x80AD4AA4
+    data: '20020000'
+
+  - name: HammerAmp
+    type: patch
+    addr_pal: 0x80ACE17C
+    data: '00080a04'
+
+  - name: HammerSpikeBall
+    type: patch
+    addr_pal: 0x80AD4D88
+    data: '00080006'
+
+  - name: HammerBigSpikeBall
+    type: patch
+    addr_pal: 0x80ACDD50
+    data: '00080006'
+
+  - name: HammerUrchin
+    type: patch
+    addr_pal: 0x80AD4F48
+    data: '00088a1e'
+
+  - name: HammerChainChomp
+    type: patch
+    addr_pal: 0x80AD5214
+    data: '00088206'
+
+  - name: HammerFireSnake
+    type: patch
+    addr_pal: 0x80ACFBC4
+    data: '00088206'
+
+  - name: HammerFishbones
+    type: patch
+    addr_pal: 0x80AD2748
+    data: '0008881e'
+
+  - name: HammerBeanGoomba
+    type: patch
+    addr_pal: 0x80acd988
+    data: '0008A2BE'
+
+  - name: HammerPukucoinOne
+    type: patch
+    addr_pal: 0x80AD3C60
+    data: '00088a0e'
 
   - name: HammerPukucoinTwo
-    type: patch
-    addr_pal: 0x80AD3C3C
-    data: '00088a0e'
-
-  - name: HammerBulber
-    type: patch
-    addr_pal: 0x80ACEC60
-    data: '00088a0e'
-
-  - name: HammerFuzzyOne
-    type: patch
-    addr_pal: 0x80ACECF8
-    data: '0008828e'
-
-  - name: HammerFuzzyTwo
-    type: patch
-    addr_pal: 0x80ACED1C
-    data: '0008828e'
-
-  - name: HammerGhostCircle
-    type: patch
-    addr_pal: 0x80AD4158
-    data: '0008a80e'
-
-  - name: HammerPiranhaLily
-    type: patch
-    addr_pal: 0x80AD5538
-    data: '003AFFFE'
-
-
-#  - name: HammerClam
-#    type: patch
-#    addr_pal: 0x80acd4BC
-#    data: '00000047'
+    type: patch
+    addr_pal: 0x80AD3C3C
+    data: '00088a0e'
+
+  - name: HammerBulber
+    type: patch
+    addr_pal: 0x80ACEC60
+    data: '00088a0e'
+
+  - name: HammerFuzzyOne
+    type: patch
+    addr_pal: 0x80ACECF8
+    data: '0008828e'
+
+  - name: HammerFuzzyTwo
+    type: patch
+    addr_pal: 0x80ACED1C
+    data: '0008828e'
+
+  - name: HammerGhostCircle
+    type: patch
+    addr_pal: 0x80AD4158
+    data: '0008a80e'
+
+  - name: HammerPiranhaLily
+    type: patch
+    addr_pal: 0x80AD5538
+    data: '003AFFFE'
+
+
+#  - name: HammerClam
+#    type: patch
+#    addr_pal: 0x80acd4BC
+#    data: '00000047'
 #
-#  - name: HammerClamTwo
-#    type: patch
-#    addr_pal: 0x80acd4e0
-#    data: '00000047'
+#  - name: HammerClamTwo
+#    type: patch
+#    addr_pal: 0x80acd4e0
+#    data: '00000047'
 #
-#  - name: HammerClamNull
-#    type: patch
-#    addr_pal: 0x80AD5BF0
-#    data: '80095C10'
+#  - name: HammerClamNull
+#    type: patch
+#    addr_pal: 0x80AD5BF0
+#    data: '80095C10'
 
-  - name: HammerGiantWigglerNull
-    type: patch
-    addr_pal: 0x80AD7FC8
-    data: '80095C10'
+  - name: HammerGiantWigglerNull
+    type: patch
+    addr_pal: 0x80AD7FC8
+    data: '80095C10'
 
-  - name: HammerParabeetleNull
-    type: patch
-    addr_pal: 0x80B028D8
-    data: '80095C10'
+  - name: HammerParabeetleNull
+    type: patch
+    addr_pal: 0x80B028D8
+    data: '80095C10'
 
-  - name: HammerGiantBuzzyNull
-    type: patch
-    addr_pal: 0x80AD8A10
-    data: '80095C10'
+  - name: HammerGiantBuzzyNull
+    type: patch
+    addr_pal: 0x80AD8A10
+    data: '80095C10'
 
-  - name: HammerGiantBuzzy
-    type: patch
-    addr_pal: 0x80ACDC8C
-    data: '0000004F'
+  - name: HammerGiantBuzzy
+    type: patch
+    addr_pal: 0x80ACDC8C
+    data: '0000004F'
 
-  - name: HammerGiantBuzzy
-    type: patch
-    addr_pal: 0x80ACDC90
-    data: 'FFBAFFBC'
+  - name: HammerGiantBuzzy
+    type: patch
+    addr_pal: 0x80ACDC90
+    data: 'FFBAFFBC'
 
-  - name: HammerKingBill
-    type: patch
-    addr_pal: 0x80AD2618
-    data: '0000004F'
+  - name: HammerKingBill
+    type: patch
+    addr_pal: 0x80AD2618
+    data: '0000004F'
 
-  - name: HammerKingBillTwo
-    type: patch
-    addr_pal: 0x80AD261C
-    data: '00088806'
+  - name: HammerKingBillTwo
+    type: patch
+    addr_pal: 0x80AD261C
+    data: '00088806'
 
-  - name: HammerKingBillNull
-    type: patch
-    addr_pal: 0x80AF72A8
-    data: '80095C10'
+  - name: HammerKingBillNull
+    type: patch
+    addr_pal: 0x80AF72A8
+    data: '80095C10'
 
 
 
-  - name: HammerBulletBill
-    type: patch
-    addr_pal: 0x80AD22B8
-    data: '03000000'
+  - name: HammerBulletBill
+    type: patch
+    addr_pal: 0x80AD22B8
+    data: '03000000'
 
-  - name: HammerBanzaiBill
-    type: patch
-    addr_pal: 0x80ad22Dc
-    data: '03000000'
+  - name: HammerBanzaiBill
+    type: patch
+    addr_pal: 0x80ad22Dc
+    data: '03000000'
 
-  - name: HammerPolterOne
-    type: patch
-    addr_pal: 0x80AD3ADC
-    data: '00000047'
+  - name: HammerPolterOne
+    type: patch
+    addr_pal: 0x80AD3ADC
+    data: '00000047'
 
-  - name: HammerPolterTwo
-    type: patch
-    addr_pal: 0x80AD3B00
-    data: '00000047'
+  - name: HammerPolterTwo
+    type: patch
+    addr_pal: 0x80AD3B00
+    data: '00000047'
 
 
 
 
-  - name: Icicle
-    type: patch
-    data: "0000004F"
-    addr_pal: 0x80AD0EB4
+  - name: Icicle
+    type: patch
+    data: "0000004F"
+    addr_pal: 0x80AD0EB4
 
-  - name: IcicleOne
-    type: patch
-    data: "0000004F"
-    addr_pal: 0x80AD0ED8
+  - name: IcicleOne
+    type: patch
+    data: "0000004F"
+    addr_pal: 0x80AD0ED8
 
+  - name: IcicleTwo
+    type: patch
+    data: "0000004F"
+    addr_pal: 0x80ACFD08
 
-  - name: IcicleTwo
-    type: patch
-    data: "0000004F"
-    addr_pal: 0x80ACFD08
+  - name: IcicleThree
+    type: patch
+    data: "0000004F"
+    addr_pal: 0x80ACFD2C
 
-  - name: IcicleThree
-    type: patch
-    data: "0000004F"
-    addr_pal: 0x80ACFD2C
+  - name: IcicleNormalNoIceball
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80AEFFFC
 
-  - name: IcicleFour
-    type: patch
-    data: "0000004F"
-    addr_pal: 0x80acdb58
+  - name: IcicleFixationNoIceball
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80AE9DC0
 
 
 
 
+  - name: FuckinCastleLarryNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B76C90
 
-  - name: FuckinCastleLarryNull
-    type: patch
-    data: "80095C10"
-    addr_pal: 0x80B76C90
+  - name: FuckinLarryNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B81F44
 
-  - name: FuckinLarryNull
-    type: patch
-    data: "80095C10"
-    addr_pal: 0x80B81F44
 
+  - name: FuckinCastleLemmyNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B777A8
 
-  - name: FuckinCastleLemmyNull
-    type: patch
-    data: "80095C10"
-    addr_pal: 0x80B777A8
+  - name: FuckinLemmyNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B82DF0
 
-  - name: FuckinLemmyNull
-    type: patch
-    data: "80095C10"
-    addr_pal: 0x80B82DF0
 
+  - name: FuckinCastleWendyNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B7AD70
 
-  - name: FuckinCastleWendyNull
-    type: patch
-    data: "80095C10"
-    addr_pal: 0x80B7AD70
+  - name: FuckinWendyNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B87644
 
-  - name: FuckinWendyNull
-    type: patch
-    data: "80095C10"
-    addr_pal: 0x80B87644
 
+  - name: FuckinCastleLudwigNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B78380
 
-  - name: FuckinCastleLudwigNull
-    type: patch
-    data: "80095C10"
-    addr_pal: 0x80B78380
+  - name: FuckinLudwigNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B840D8
 
-  - name: FuckinLudwigNull
-    type: patch
-    data: "80095C10"
-    addr_pal: 0x80B840D8
 
+  - name: FuckinCastleIggyNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B75F80
 
-  - name: FuckinCastleIggyNull
-    type: patch
-    data: "80095C10"
-    addr_pal: 0x80B75F80
+  - name: FuckinIggyNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B7BC28
 
-  - name: FuckinIggyNull
-    type: patch
-    data: "80095C10"
-    addr_pal: 0x80B7BC28
 
+  - name: FuckinCastleMortonNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B79060
 
-  - name: FuckinCastleMortonNull
-    type: patch
-    data: "80095C10"
-    addr_pal: 0x80B79060
+  - name: FuckinMortonNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B853A8
 
-  - name: FuckinMortonNull
-    type: patch
-    data: "80095C10"
-    addr_pal: 0x80B853A8
 
+  - name: FuckinCastleRoyNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B79DC8
 
-  - name: FuckinCastleRoyNull
-    type: patch
-    data: "80095C10"
-    addr_pal: 0x80B79DC8
+  - name: FuckinRoyNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B86410
 
-  - name: FuckinRoyNull
-    type: patch
-    data: "80095C10"
-    addr_pal: 0x80B86410
 
+  - name: FuckinKamekNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B7CBDC
 
-  - name: FuckinKamekNull
-    type: patch
-    data: "80095C10"
-    addr_pal: 0x80B7CBDC
 
+  - name: FuckinBowserNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B7E800
 
-  - name: FuckinBowserNull
-    type: patch
-    data: "80095C10"
-    addr_pal: 0x80B7E800
 
+  - name: FuckinJrANull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B804B4
 
-  - name: FuckinJrANull
-    type: patch
-    data: "80095C10"
-    addr_pal: 0x80B804B4
+  - name: FuckinJrBNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B80BBC
 
-  - name: FuckinJrBNull
-    type: patch
-    data: "80095C10"
-    addr_pal: 0x80B80BBC
-
-  - name: FuckinJrCNull
-    type: patch
-    data: "80095C10"
-    addr_pal: 0x80B81468
+  - name: FuckinJrCNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B81468