From f87a223365f42394903bd28d018bcfc343073f62 Mon Sep 17 00:00:00 2001
From: Headpenguin <headpenguin.penguinarts@gmail.com>
Date: Mon, 26 Jun 2023 10:21:48 -0400
Subject: [PATCH] Rename some variables in the mario header

---
 include/Game/Player/Mario.h      | 74 ++++++++++++++++----------------
 include/Game/Player/MarioActor.h |  2 +-
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/include/Game/Player/Mario.h b/include/Game/Player/Mario.h
index 39c31364..c4b9f65b 100644
--- a/include/Game/Player/Mario.h
+++ b/include/Game/Player/Mario.h
@@ -327,29 +327,29 @@ public:
 	f32 _74C;
 	u32 _750;
 	u32 _754;
-	MarioWall* _758;
+	MarioWall* mWall;
 	TVec3f _75C;
-    MarioStick* _768;
+    MarioStick* mStick;
 	u16 _76C;
 	f32 _770;
 	u16 _774;
-    MarioRabbit* _778;
-    MarioFoo* _77C;
-    MarioSukekiyo* _780;
-    MarioBury* _784;
-    MarioWait* _788;
-    MarioClimb* _78C;
+    MarioRabbit* mRabbit;
+    MarioFoo* mFoo;
+    MarioSukekiyo* mSukekiyo;
+    MarioBury* mBury;
+    MarioWait* mWait;
+    MarioClimb* mClimb;
 	TVec3f _790;
-	MarioHang* _79C;
-    MarioRecovery* _7A0;
-    MarioWarp* _7A4;
-    MarioFlip* _7A8;
-    MarioSideStep* _7AC;
-    MarioFrontStep* _7B0;
-    MarioSkate* _7B4;
-    MarioTalk* _7B8;
-    MarioTeresa* _7BC;
-    MarioDamage* _7C0;
+	MarioHang* mHang;
+    MarioRecovery* mRecovery;
+    MarioWarp* mWarp;
+    MarioFlip* mFlip;
+    MarioSideStep* mSideStep;
+    MarioFrontStep* mFrontStep;
+    MarioSkate* mSkate;
+    MarioTalk* mTalk;
+    MarioTeresa* mTeresa;
+    MarioDamage* mDamage;
 	TVec3f _7C4;
     u16 _7D0;
     TVec3f _7D4;
@@ -358,26 +358,26 @@ public:
     TVec3f _814;
     Triangle* _820;
     TMtx34f _824;
-	MarioFlow* _854;
-	MarioFireDamage* _858;
-    MarioFireDance* _85C;
-    MarioFireRun* _860;
-    MarioParalyze* _864;
-    MarioStun* _868;
-    MarioCrush* _86C;
-    MarioFreeze* _870;
-    MarioAbyssDamage* _874;
-    MarioDarkDamage* _878;
-    MarioFaint* _87C;
-    MarioBlown* _880;
-    MarioSwim* _884;
-    MarioSlider* _888;
-    MarioStep* _88C;
-    MarioBump* _890;
-    MarioMagic* _894;
+	MarioFlow* mFlow;
+	MarioFireDamage* mFireDamage;
+    MarioFireDance* mFireDance;
+    MarioFireRun* mFireRun;
+    MarioParalyze* mParalyze;
+    MarioStun* mStun;
+    MarioCrush* mCrush;
+    MarioFreeze* mFreeze;
+    MarioAbyssDamage* mAbyssDamage;
+    MarioDarkDamage* mDarkDamage;
+    MarioFaint* mFaint;
+    MarioBlown* mBlown;
+    MarioSwim* mSwim;
+    MarioSlider* mSlider;
+    MarioStep* mStep;
+    MarioBump* mBump;
+    MarioMagic* mMagic;
 	u8 _898;
-    MarioFpView* _89C;
-    MarioMove* _8A0;
+    MarioFpView* mFpView;
+    MarioMove* mMove;
     TVec3f _8A4;
     TVec3f _8B0;
 	TVec3f _8BC;
diff --git a/include/Game/Player/MarioActor.h b/include/Game/Player/MarioActor.h
index ea6ac8e1..00e6b99b 100644
--- a/include/Game/Player/MarioActor.h
+++ b/include/Game/Player/MarioActor.h
@@ -106,7 +106,7 @@ public:
 	
 	void setPunchHitTimer(unsigned char);
 	void initEffect();
-	void addSoundObjectHolder();
+	void addSoundObjHolder();
 	void initParts();
 	void initMorphStringTable();
 	void setupSensors();