From 703726f050a44c02d87c1d9a1c35d191fe0be507 Mon Sep 17 00:00:00 2001
From: wyatt-avilla <wyattmurphy1@gmail.com>
Date: Thu, 14 Mar 2024 20:51:06 -0700
Subject: [PATCH] proper type usage

---
 src/melee/gm/gm_1601.h       |  2 +-
 src/melee/it/itCommonItems.h |  8 ++++----
 src/melee/it/it_2725.h       |  2 +-
 src/melee/it/items/it_27CF.h |  2 +-
 src/melee/it/items/itcoin.c  | 10 +++++-----
 src/melee/it/items/itcoin.h  |  8 ++++----
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/melee/gm/gm_1601.h b/src/melee/gm/gm_1601.h
index c4fee0c70d..8b8177dfef 100644
--- a/src/melee/gm/gm_1601.h
+++ b/src/melee/gm/gm_1601.h
@@ -38,7 +38,7 @@
 /* 16C6C0 */ /* static */ UNK_RET gm_8016C6C0(UNK_PARAMS);
 /* 16C75C */ /* static */ UNK_RET gm_8016C75C(UNK_PARAMS);
 /* 17E068 */ bool gm_8017E068(void);
-/* 17E280 */ M2C_UNK gm_8017E280(u16, M2C_UNK);
+/* 17E280 */ UNK_T gm_8017E280(u16, M2C_UNK);
 /* 18841C */ bool gm_8018841C(void);
 /* 473A18 */ extern UNK_T gm_80473A18;
 
diff --git a/src/melee/it/itCommonItems.h b/src/melee/it/itCommonItems.h
index 92e51d1d69..6266fe7dd2 100644
--- a/src/melee/it/itCommonItems.h
+++ b/src/melee/it/itCommonItems.h
@@ -208,12 +208,12 @@ typedef struct itCoinAttributes {
 } itCoinAttributes;
 
 typedef struct CoinVars {
-    s32 x0;
-    s32 x4;
+    int x0;
+    int x4;
     f32 x8;
     f32 xC;
-    s32 x10;
-    s32 x14;
+    int x10;
+    int x14;
 } CoinVars;
 
 #endif
diff --git a/src/melee/it/it_2725.h b/src/melee/it/it_2725.h
index b49732575f..cdbbfad8e0 100644
--- a/src/melee/it/it_2725.h
+++ b/src/melee/it/it_2725.h
@@ -30,7 +30,7 @@
 /* 27ADEC */ M2C_UNK it_8027ADEC(M2C_UNK, Item_GObj*, HSD_JObj*, f32);
 /* 27B070 */ void it_8027B070(Item_GObj* gobj, Fighter_GObj* owner_gobj);
 /* 27B378 */ void it_8027B378(Fighter_GObj*, Item_GObj*, float);
-/* 27B798 */ M2C_UNK it_8027B798(Item_GObj*, Vec3*);
+/* 27B798 */ UNK_T it_8027B798(Item_GObj*, Vec3*);
 /* 27C56C */ void it_8027C56C(Item_GObj*, f32);
 /* 27C8B0 */ void it_8027C8B0(Item_GObj*);
 /* 27CBFC */ f32 it_8027CBFC(Item_GObj*);
diff --git a/src/melee/it/items/it_27CF.h b/src/melee/it/items/it_27CF.h
index d3c435230a..6353615675 100644
--- a/src/melee/it/items/it_27CF.h
+++ b/src/melee/it/items/it_27CF.h
@@ -177,7 +177,7 @@
 /* 2F046C */ void it_802F046C(s32);
 /* 2F0AE0 */ void it_802F0AE0(Item_GObj* fighter_gobj, Vec3*, Vec3*, enum_t,
                               bool, float facing_dir, float, float);
-/* 2F2094 */ Item_GObj* it_802F2094(s32, Vec3*, s32, s32);
+/* 2F2094 */ Item_GObj* it_802F2094(int, Vec3*, int, int);
 /* 2F3330 */ bool it_802F3330(Item_GObj*);
 /* 2F3374 */ void it_802F3374(Item_GObj*, Item_GObj*);
 /* 3F94A0 */ extern ItemStateTable it_803F94A0[];
diff --git a/src/melee/it/items/itcoin.c b/src/melee/it/items/itcoin.c
index 45fff0efe0..a73d2f44bc 100644
--- a/src/melee/it/items/itcoin.c
+++ b/src/melee/it/items/itcoin.c
@@ -51,7 +51,7 @@ ItemStateTable it_803F93C8[] = {
     { -1, it_802F1FD4, it_802F1FDC, it_802F1FE0 },
 };
 
-void it_802F13B4(Item_GObj* gobj, s32 arg1)
+void it_802F13B4(Item_GObj* gobj, int arg1)
 {
     Item* ip = GET_ITEM(gobj);
     itCoinAttributes* attr = ip->xC4_article_data->x4_specialAttributes;
@@ -305,7 +305,7 @@ void it_802F1F48(Item_GObj* gobj)
 {
     Item* ip;
     f32 item_dir;
-    s32 coll_dir;
+    int coll_dir;
 
     ip = GET_ITEM(gobj);
     Item_80268E5C(gobj, 5, ITEM_ANIM_UPDATE);
@@ -338,12 +338,12 @@ bool it_802F1FE0(Item_GObj* gobj)
     return false;
 }
 
-void it_802F2014(Item_GObj* gobj, s32 arg1)
+void it_802F2014(Item_GObj* gobj, int arg1)
 {
     GET_ITEM(gobj)->x378_itemColl.x4C = arg1;
 }
 
-s32 it_802F2020(Item_GObj* gobj)
+int it_802F2020(Item_GObj* gobj)
 {
     Item* ip = GET_ITEM(gobj);
 
@@ -362,7 +362,7 @@ void it_802F202C(Item_GObj* gobj)
     it_802756D0(gobj);
 }
 
-Item_GObj* it_802F2094(s32 arg0, Vec3* pos, s32 arg2, s32 arg3)
+Item_GObj* it_802F2094(int arg0, Vec3* pos, int arg2, int arg3)
 {
     SpawnItem spawn;
     Item_GObj* gobj;
diff --git a/src/melee/it/items/itcoin.h b/src/melee/it/items/itcoin.h
index 6607a1ee61..3d0fcae0aa 100644
--- a/src/melee/it/items/itcoin.h
+++ b/src/melee/it/items/itcoin.h
@@ -7,7 +7,7 @@
 #include "it/items/types.h"
 #include "it/types.h"
 
-/* 2F13B4 */ void it_802F13B4(Item_GObj*, s32);
+/* 2F13B4 */ void it_802F13B4(Item_GObj*, int);
 /* 2F14E4 */ void it_802F14E4(Item_GObj*);
 /* 2F1518 */ void it_802F1518(Item_GObj*);
 /* 2F1888 */ void it_802F1888(Item_GObj*);
@@ -15,10 +15,10 @@
 /* 2F1910 */ bool it_802F1910(Item_GObj*);
 /* 2F1CE0 */ void it_802F1CE0(Item_GObj*);
 /* 2F1F48 */ void it_802F1F48(Item_GObj*);
-/* 2F2014 */ void it_802F2014(Item_GObj*, s32);
-/* 2F2020 */ s32 it_802F2020(Item_GObj*);
+/* 2F2014 */ void it_802F2014(Item_GObj*, int);
+/* 2F2020 */ int it_802F2020(Item_GObj*);
 /* 2F202C */ void it_802F202C(Item_GObj*);
-/* 2F2094 */ Item_GObj* it_802F2094(s32, Vec3*, s32, s32);
+/* 2F2094 */ Item_GObj* it_802F2094(int, Vec3*, int, int);
 /* 3F93C8 */ extern ItemStateTable it_803F93C8[];
 
 #endif