From 9026b9edd49918a26f19cb588802fc81399c2dd9 Mon Sep 17 00:00:00 2001 From: Fox Caminiti Date: Thu, 4 Jul 2024 20:37:18 -0400 Subject: [PATCH] test fix for `it_802AF1A4` --- src/melee/it/it_266F.h | 2 +- src/melee/it/it_26B1.c | 2 +- src/melee/it/it_26B1.h | 3 ++- src/melee/it/item.c | 2 +- src/melee/it/item.h | 3 ++- src/melee/it/items/itgamewatchturtle.c | 2 +- src/melee/it/items/itgamewatchturtle.h | 3 ++- src/melee/it/items/itkirbyhammer.c | 4 ++-- src/melee/it/items/itkirbyhammer.h | 3 ++- src/melee/it/items/itlinkbow.c | 2 +- src/melee/it/items/itlinkbow.h | 2 +- 11 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/melee/it/it_266F.h b/src/melee/it/it_266F.h index a55ddc108a..798c2dc7c6 100644 --- a/src/melee/it/it_266F.h +++ b/src/melee/it/it_266F.h @@ -79,7 +79,7 @@ /* 274198 */ void it_80274198(HSD_GObj*, s32); /* 2741F4 */ void it_802741F4(HSD_GObj*, s32); /* 27429C */ void it_8027429C(HSD_GObj*, Vec3*); -/* 2742F4 */ void it_802742F4(HSD_GObj*, HSD_GObj*, u8); +/* 2742F4 */ void it_802742F4(HSD_GObj*, HSD_GObj*, Fighter_Part); /* 274594 */ void it_80274594(Item_GObj*); /* 274658 */ void it_80274658(HSD_GObj*, f32); /* 274740 */ void it_80274740(HSD_GObj* gobj); diff --git a/src/melee/it/it_26B1.c b/src/melee/it/it_26B1.c index 2f4929e76d..56a4d247ea 100644 --- a/src/melee/it/it_26B1.c +++ b/src/melee/it/it_26B1.c @@ -629,7 +629,7 @@ static inline void What(HSD_GObj* gobj, struct ItemStateDesc* itemStateDesc, } /// Transfer item on character transformation (Zelda <-> Sheik) -void it_8026B9A8(HSD_GObj* gobj, HSD_GObj* arg1, u8 arg2) +void it_8026B9A8(HSD_GObj* gobj, HSD_GObj* arg1, Fighter_Part arg2) { Vec3 vec; Item* ip = GET_ITEM(gobj); diff --git a/src/melee/it/it_26B1.h b/src/melee/it/it_26B1.h index 6dbf84acd1..8280981270 100644 --- a/src/melee/it/it_26B1.h +++ b/src/melee/it/it_26B1.h @@ -3,6 +3,7 @@ #include #include "it/forward.h" +#include "ft/types.h" #include "lb/forward.h" #include #include @@ -53,7 +54,7 @@ /* 26B894 */ bool it_8026B894(Item_GObj* gobj, HSD_GObj* referenced_gobj); /* 26B924 */ s32 it_8026B924(Item_GObj* gobj); /* 26B960 */ float it_8026B960(Item_GObj* gobj); -/* 26B9A8 */ void it_8026B9A8(Item_GObj* gobj, HSD_GObj* arg1, u8 arg2); +/* 26B9A8 */ void it_8026B9A8(Item_GObj* gobj, HSD_GObj* arg1, Fighter_Part arg2); /* 26BAE8 */ void it_8026BAE8(Item_GObj* gobj, float scale_mul); /* 26BB20 */ void it_8026BB20(Item_GObj* gobj); /* 26BB44 */ void it_8026BB44(Item_GObj* gobj); diff --git a/src/melee/it/item.c b/src/melee/it/item.c index b80129cb8b..fc5fe07d95 100644 --- a/src/melee/it/item.c +++ b/src/melee/it/item.c @@ -2031,7 +2031,7 @@ void Item_8026A8EC(Item_GObj* gobj) HSD_GObjPLink_80390228(gobj); } -void Item_8026AB54(HSD_GObj* gobj, HSD_GObj* pickup_gfx, u8 pickup_sfx) +void Item_8026AB54(HSD_GObj* gobj, HSD_GObj* pickup_gfx, Fighter_Part pickup_sfx) { u8 _[16]; diff --git a/src/melee/it/item.h b/src/melee/it/item.h index 85cdf447e4..88d4640aee 100644 --- a/src/melee/it/item.h +++ b/src/melee/it/item.h @@ -3,6 +3,7 @@ #include #include "it/forward.h" +#include "ft/types.h" #include #include @@ -35,7 +36,7 @@ struct ItemStateDesc; /* 269CA0 */ void Item_80269CA0(Item* item_data, s32 damage); /* 26A848 */ void Item_8026A848(HSD_GObj* gobj, HSD_GObj* fgobj); /* 26A8EC */ void Item_8026A8EC(Item_GObj* gobj); -/* 26AB54 */ void Item_8026AB54(HSD_GObj* gobj, HSD_GObj* owner_gobj, u8 part); +/* 26AB54 */ void Item_8026AB54(HSD_GObj* gobj, HSD_GObj* owner_gobj, Fighter_Part part); /* 26ABD8 */ void Item_8026ABD8(HSD_GObj* gobj, Vec3* pos, float); /* 26AC74 */ void Item_8026AC74(HSD_GObj* gobj, Vec3*, Vec3*, float); /* 26AD20 */ void Item_8026AD20(HSD_GObj* gobj, Vec3*, Vec3*, float); diff --git a/src/melee/it/items/itgamewatchturtle.c b/src/melee/it/items/itgamewatchturtle.c index f9ea719e03..55b621f0a1 100644 --- a/src/melee/it/items/itgamewatchturtle.c +++ b/src/melee/it/items/itgamewatchturtle.c @@ -25,7 +25,7 @@ ItemStateTable it_803F7918[] = { }, }; -Item_GObj* it_802C6F40(HSD_GObj* parent, Vec3* pos, u8 arg2, f32 dir) +Item_GObj* it_802C6F40(HSD_GObj* parent, Vec3* pos, Fighter_Part arg2, f32 dir) { SpawnItem spawn_item; HSD_GObj* item_gobj; diff --git a/src/melee/it/items/itgamewatchturtle.h b/src/melee/it/items/itgamewatchturtle.h index e35826cd56..56ea957c42 100644 --- a/src/melee/it/items/itgamewatchturtle.h +++ b/src/melee/it/items/itgamewatchturtle.h @@ -4,11 +4,12 @@ #include #include +#include #include extern ItemStateTable it_803F7918[]; -Item_GObj* it_802C6F40(HSD_GObj* parent, Vec3* pos, u8 arg2, f32 dir); +Item_GObj* it_802C6F40(HSD_GObj* parent, Vec3* pos, Fighter_Part arg2, f32 dir); void it_802C7044(Item_GObj* item_gobj); void it_802C7074(Item_GObj* item_gobj); void it_802C70C0(Item_GObj*); diff --git a/src/melee/it/items/itkirbyhammer.c b/src/melee/it/items/itkirbyhammer.c index 8b3162dffc..1a7975e65a 100644 --- a/src/melee/it/items/itkirbyhammer.c +++ b/src/melee/it/items/itkirbyhammer.c @@ -28,7 +28,7 @@ void it_802ADC34(Item_GObj* gobj) } static void setupHammerParticles(HSD_GObj* parent, Item_GObj* item_gobj, - u8 sfx, u32 vars) + Fighter_Part sfx, u32 vars) { HSD_JObj* jobj; u32 particle_id; @@ -47,7 +47,7 @@ static void setupHammerParticles(HSD_GObj* parent, Item_GObj* item_gobj, 0, particle_id, jobj); } -Item_GObj* it_802ADC54(HSD_GObj* parent, Vec3* pos, u8 sfx, u32 vars, f32 dir) +Item_GObj* it_802ADC54(HSD_GObj* parent, Vec3* pos, Fighter_Part sfx, u32 vars, f32 dir) { Item_GObj* item_gobj; SpawnItem spawn; diff --git a/src/melee/it/items/itkirbyhammer.h b/src/melee/it/items/itkirbyhammer.h index 3944f6ace7..901c4e1ec9 100644 --- a/src/melee/it/items/itkirbyhammer.h +++ b/src/melee/it/items/itkirbyhammer.h @@ -3,6 +3,7 @@ #include #include "it/forward.h" +#include "ft/types.h" #include #include @@ -10,7 +11,7 @@ /* 2ADC04 */ void it_802ADC04(Item_GObj* gobj); /* 2ADC34 */ void it_802ADC34(Item_GObj* gobj); -/* 2ADC54 */ Item_GObj* it_802ADC54(HSD_GObj* parent, Vec3* pos, u8 sfx, +/* 2ADC54 */ Item_GObj* it_802ADC54(HSD_GObj* parent, Vec3* pos, Fighter_Part sfx, u32 vars, float dir); /* 2ADD88 */ void it_802ADD88(Item_GObj* gobj); /* 2ADDB0 */ void it_802ADDB0(Item_GObj* gobj, HSD_GObj* ref_gobj); diff --git a/src/melee/it/items/itlinkbow.c b/src/melee/it/items/itlinkbow.c index 64edcef9b3..ffaed74273 100644 --- a/src/melee/it/items/itlinkbow.c +++ b/src/melee/it/items/itlinkbow.c @@ -31,7 +31,7 @@ static s8 it_804D5438[8] = { 0x6A, 0x6F, 0x62, 0x6A, 0x2E, 0x68, 0, 0 }; static s8 it_804D5440[8] = { 0x6A, 0x6F, 0x62, 0x6A, 0, 0, 0, 0 }; HSD_GObj* it_802AF1A4(f32 facing_dir, Fighter_GObj* owner_gobj, Vec3* vec, - u8 arg3, int arg4) + Fighter_Part arg3, int arg4) { Item_GObj* gobj; Item* item; diff --git a/src/melee/it/items/itlinkbow.h b/src/melee/it/items/itlinkbow.h index 206a678b1e..69e0e51246 100644 --- a/src/melee/it/items/itlinkbow.h +++ b/src/melee/it/items/itlinkbow.h @@ -7,7 +7,7 @@ #include "ft/chara/ftLink/ftLk_SpecialN.h" #include "it/items/types.h" -/* 2AF1A4 */ HSD_GObj* it_802AF1A4(f32, Fighter_GObj*, Vec3*, u8, int); +/* 2AF1A4 */ HSD_GObj* it_802AF1A4(f32, Fighter_GObj*, Vec3*, Fighter_Part, int); /* 2AF298 */ void it_802AF298(Item_GObj*); /* 2AF304 */ void it_802AF304(Item_GObj*); /* 2AF434 */ void it_802AF434(Item_GObj*);