summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-12-04 01:40:59 +0100
committerTreeki <treeki@gmail.com>2012-12-04 01:40:59 +0100
commite8ffbf5bdc704c4efb426f4d1c10b21527debdc3 (patch)
treecd84e5e0c99d69984148be63181e35f954390f23 /include
parent49fe08ecf61e59fe13bef6a50fffd119e8909e64 (diff)
downloadkamek-e8ffbf5bdc704c4efb426f4d1c10b21527debdc3.tar.gz
kamek-e8ffbf5bdc704c4efb426f4d1c10b21527debdc3.zip
changed WMwagglewater to groundpound
Diffstat (limited to 'include')
-rw-r--r--include/daEnDosun_c.h2
-rwxr-xr-xinclude/game.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/daEnDosun_c.h b/include/daEnDosun_c.h
index fadaedb..34e770a 100644
--- a/include/daEnDosun_c.h
+++ b/include/daEnDosun_c.h
@@ -21,7 +21,7 @@ public:
void _vf108(ActivePhysics* apThis, ActivePhysics* apOther); // 809f5fe0
void collisionCatD_GroundPound(ActivePhysics* apThis, ActivePhysics* apOther); // 809f7130
void _vf110(ActivePhysics* apThis, ActivePhysics* apOther); // 809f6090
- void collisionCat7_WMWaggleWater(ActivePhysics* apThis, ActivePhysics* apOther); // 809f7120
+ void collisionCat7_GroundPound(ActivePhysics* apThis, ActivePhysics* apOther); // 809f7120
void collisionCat9_RollingObject(ActivePhysics* apThis, ActivePhysics* apOther); // 809f70a0
void collisionCat1_Fireball_E_Explosion(ActivePhysics* apThis, ActivePhysics* apOther); // 809f70e0
bool collisionCat2_IceBall_15_YoshiIce(ActivePhysics* apThis, ActivePhysics* apOther); // 809f70b0
diff --git a/include/game.h b/include/game.h
index 55ab018..403d1b3 100755
--- a/include/game.h
+++ b/include/game.h
@@ -2357,8 +2357,8 @@ public:
virtual void collisionCatD_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther);
virtual void _vf110(ActivePhysics *apThis, ActivePhysics *apOther);
virtual void collisionCat8_FencePunch(ActivePhysics *apThis, ActivePhysics *apOther);
- virtual void collisionCat7_WMWaggleWater(ActivePhysics *apThis, ActivePhysics *apOther);
- virtual void collisionCat7_WMWaggleWaterYoshi(ActivePhysics *apThis, ActivePhysics *apOther);
+ virtual void collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther);
+ virtual void collisionCat7_GroundPoundYoshi(ActivePhysics *apThis, ActivePhysics *apOther);
virtual void _vf120(ActivePhysics *apThis, ActivePhysics *apOther);
virtual void collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther);
virtual void collisionCat11_PipeCannon(ActivePhysics *apThis, ActivePhysics *apOther);