Skip to content

Commit

Permalink
test fix for it_802AF1A4
Browse files Browse the repository at this point in the history
  • Loading branch information
thefoxcam committed Jul 5, 2024
1 parent ba6822e commit 9026b9e
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/melee/it/it_266F.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/melee/it/it_26B1.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion src/melee/it/it_26B1.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <platform.h>
#include "it/forward.h"
#include "ft/types.h"
#include "lb/forward.h"
#include <dolphin/mtx/forward.h>
#include <baselib/forward.h>
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/melee/it/item.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];

Expand Down
3 changes: 2 additions & 1 deletion src/melee/it/item.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <platform.h>
#include "it/forward.h"
#include "ft/types.h"
#include <dolphin/mtx/forward.h>
#include <baselib/forward.h>

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/melee/it/items/itgamewatchturtle.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion src/melee/it/items/itgamewatchturtle.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
#include <melee/it/forward.h>

#include <melee/it/types.h>
#include <melee/ft/types.h>
#include <melee/it/items/types.h>

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*);
Expand Down
4 changes: 2 additions & 2 deletions src/melee/it/items/itkirbyhammer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion src/melee/it/items/itkirbyhammer.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@

#include <platform.h>
#include "it/forward.h"
#include "ft/types.h"
#include <dolphin/mtx/forward.h>
#include <baselib/forward.h>

#include "it/items/types.h"

/* 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);
Expand Down
2 changes: 1 addition & 1 deletion src/melee/it/items/itlinkbow.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/melee/it/items/itlinkbow.h
Original file line number Diff line number Diff line change
Expand Up @@ -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*);
Expand Down

0 comments on commit 9026b9e

Please sign in to comment.