From 7e68eefff61bf28d1ccca195075659138118bb16 Mon Sep 17 00:00:00 2001
From: Colin Noga <Tempus@Spectrum-Song.local>
Date: Sun, 3 Jul 2011 13:23:59 -0500
Subject: Plenty of hammer collision fixes

---
 growup.yaml     |  21 ++++++
 poweruphax.yaml | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 230 insertions(+)

diff --git a/growup.yaml b/growup.yaml
index 2d1d4a1..8e1dbf8 100644
--- a/growup.yaml
+++ b/growup.yaml
@@ -250,6 +250,27 @@ hooks:
     data: "41C00000"
     addr_pal: 0x802EE81C
 
+  - name: LakituNoMove
+    type: patch
+    data: "80A37DE0"
+    addr_pal: 0x80AF3930
+
+  - name: LakituNoMove
+    type: patch
+    data: "80A37DE0"
+    addr_pal: 0x80AF38A8
+
+  - name: LakituNoMove
+    type: patch
+    data: "80A37DE0"
+    addr_pal: 0x80AF38CC
+
+  - name: LakituNoMove
+    type: patch
+    data: "80A37DE0"
+    addr_pal: 0x80AF38F0
+
+
 
 
 
diff --git a/poweruphax.yaml b/poweruphax.yaml
index e2a9572..263057a 100644
--- a/poweruphax.yaml
+++ b/poweruphax.yaml
@@ -302,6 +302,11 @@ hooks:
     addr_pal: 0x80AD4AA0
     data: '0008a80e'
 
+  - name: HammerBigBooTwo
+    type: patch
+    addr_pal: 0x80AD4AA4
+    data: '20020000'
+
   - name: HammerAmp
     type: patch
     addr_pal: 0x80ACE17C
@@ -378,3 +383,207 @@ hooks:
     data: '003AFFFE'
 
 
+  - name: HammerClam
+    type: patch
+    addr_pal: 0x80acd4BC
+    data: '00000047'
+
+  - name: HammerClamTwo
+    type: patch
+    addr_pal: 0x80acd4e0
+    data: '00000047'
+
+  - name: HammerClamNull
+    type: patch
+    addr_pal: 0x80AD5BF0
+    data: '80095C10'
+
+  - name: HammerGiantWigglerNull
+    type: patch
+    addr_pal: 0x80AD7FC8
+    data: '80095C10'
+
+  - name: HammerParabeetleNull
+    type: patch
+    addr_pal: 0x80B028D8
+    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: 0x80ACDC90
+    data: 'FFBAFFBC'
+
+  - name: HammerKingBill
+    type: patch
+    addr_pal: 0x80AD2618
+    data: '0000004F'
+
+  - name: HammerKingBillTwo
+    type: patch
+    addr_pal: 0x80AD261C
+    data: '00088806'
+
+  - name: HammerKingBillNull
+    type: patch
+    addr_pal: 0x80AF72A8
+    data: '80095C10'
+
+
+
+  - name: HammerBulletBill
+    type: patch
+    addr_pal: 0x80AD22B8
+    data: '03000000'
+
+  - name: HammerBanzaiBill
+    type: patch
+    addr_pal: 0x80ad22Dc
+    data: '03000000'
+
+
+
+
+
+  - name: Icicle
+    type: patch
+    data: "0000004F"
+    addr_pal: 0x80AD0EB4
+
+  - name: IcicleOne
+    type: patch
+    data: "0000004F"
+    addr_pal: 0x80AD0ED8
+
+
+  - name: IcicleTwo
+    type: patch
+    data: "0000004F"
+    addr_pal: 0x80ACFD08
+
+  - name: IcicleThree
+    type: patch
+    data: "0000004F"
+    addr_pal: 0x80ACFD2C
+
+  - name: IcicleFour
+    type: patch
+    data: "0000004F"
+    addr_pal: 0x80acdb58
+
+
+
+
+
+  - name: FuckinCastleLarryNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B76C90
+
+  - name: FuckinLarryNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B81F44
+
+
+  - name: FuckinCastleLemmyNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B777A8
+
+  - name: FuckinLemmyNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B82DF0
+
+
+  - name: FuckinCastleWendyNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B7AD70
+
+  - name: FuckinWendyNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B87644
+
+
+  - name: FuckinCastleLudwigNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B78380
+
+  - name: FuckinLudwigNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B840D8
+
+
+  - name: FuckinCastleIggyNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B75F80
+
+  - name: FuckinIggyNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B7BC28
+
+
+  - name: FuckinCastleMortonNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B79060
+
+  - name: FuckinMortonNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B853A8
+
+
+  - name: FuckinCastleRoyNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B79DC8
+
+  - name: FuckinRoyNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B86410
+
+
+  - name: FuckinKamekNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B7CBDC
+
+
+  - name: FuckinBowserNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B7E800
+
+
+  - name: FuckinJrANull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B804B4
+
+  - name: FuckinJrBNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B80BBC
+
+  - name: FuckinJrCNull
+    type: patch
+    data: "80095C10"
+    addr_pal: 0x80B81468
-- 
cgit v1.2.3