From 416ef8f3683e3be20a7434f556b99ed62f376404 Mon Sep 17 00:00:00 2001 From: wyatt-avilla Date: Fri, 22 Mar 2024 18:30:34 -0700 Subject: [PATCH] function scopes in `.c`/`.h` files --- src/melee/it/items/it_27CF.h | 2 +- src/melee/it/items/itfflower.c | 39 ++++++++++++++++++++++------------ src/melee/it/items/itfflower.h | 4 ++++ 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/src/melee/it/items/it_27CF.h b/src/melee/it/items/it_27CF.h index 6353615675..8f8982800e 100644 --- a/src/melee/it/items/it_27CF.h +++ b/src/melee/it/items/it_27CF.h @@ -22,7 +22,7 @@ /* 28FE90 */ void it_8028FE90(Item_GObj*); /* 290938 */ HSD_GObj* it_80290938(HSD_JObj*); /* 291BE0 */ HSD_GObj* it_80291BE0(Vec3*); -/* 292D48 */ HSD_GObj* it_80292D48(Vec3*); +/* 292D48 */ Item_GObj* it_80292D48(Vec3*); /* 294DC0 */ HSD_GObj* it_80294DC0(Vec3*); /* 294E78 */ void it_80294E78(Item_GObj*, float); /* 294EB0 */ void it_80294EB0(Item_GObj*, Vec3*, Vec3*); diff --git a/src/melee/it/items/itfflower.c b/src/melee/it/items/itfflower.c index cb42635f06..a61e10fd6b 100644 --- a/src/melee/it/items/itfflower.c +++ b/src/melee/it/items/itfflower.c @@ -11,8 +11,32 @@ #include -void it_80292FF0(Item_GObj*); /* static */ -void it_8029313C(Item_GObj*); /* static */ +/* 292FF0 */ static void it_80292FF0(Item_GObj* gobj); +/* 293040 */ static bool it_80293040(Item_GObj* gobj); +/* 29310C */ static void it_8029310C(Item_GObj* gobj); +/* 293110 */ static bool it_80293110(Item_GObj* gobj); +/* 29313C */ static void it_8029313C(Item_GObj* gobj); +/* 293164 */ static bool it_80293164(Item_GObj* gobj); +/* 293210 */ static void it_80293210(Item_GObj* gobj); +/* 293240 */ static bool it_80293240(Item_GObj* gobj); +/* 2932AC */ static bool it_802932AC(Item_GObj* gobj); +/* 2933C0 */ static void it_802933C0(Item_GObj* gobj); +/* 293414 */ static void it_80293414(Item_GObj* gobj); +/* 293444 */ static bool it_80293444(Item_GObj* gobj); +/* 29355C */ static bool it_8029355C(Item_GObj* gobj); +/* 293608 */ static void it_80293608(Item_GObj* gobj); +/* 29360C */ static bool it_8029360C(Item_GObj* gobj); + +ItemStateTable it_803F6090[] = { + { 0, it_80293040, it_8029310C, it_80293110 }, + { 0, it_80293164, it_80293210, it_80293240 }, + { 0, it_802932AC, it_802933C0, NULL }, + { 1, it_802932AC, it_802933C0, NULL }, + { 2, it_802932AC, it_802933C0, NULL }, + { 3, it_802932AC, it_802933C0, NULL }, + { 4, it_80293164, it_80293414, it_80293444 }, + { 0, it_8029355C, it_80293608, it_8029360C }, +}; static inline void msid_check(enum_t msid, Item_GObj* gobj, Item* ip) { @@ -336,14 +360,3 @@ void it_80293640(Item_GObj* gobj, Item_GObj* ref) { it_8026B894(gobj, ref); } - -ItemStateTable it_803F6090[] = { - { 0, it_80293040, it_8029310C, it_80293110 }, - { 0, it_80293164, it_80293210, it_80293240 }, - { 0, it_802932AC, it_802933C0, NULL }, - { 1, it_802932AC, it_802933C0, NULL }, - { 2, it_802932AC, it_802933C0, NULL }, - { 3, it_802932AC, it_802933C0, NULL }, - { 4, it_80293164, it_80293414, it_80293444 }, - { 0, it_8029355C, it_80293608, it_8029360C }, -}; diff --git a/src/melee/it/items/itfflower.h b/src/melee/it/items/itfflower.h index a62467dca3..d8312b15d6 100644 --- a/src/melee/it/items/itfflower.h +++ b/src/melee/it/items/itfflower.h @@ -7,8 +7,12 @@ #include "it/items/types.h" #include "it/types.h" +/* 292D48 */ Item_GObj* it_80292D48(Vec3*); /* 292E04 */ void it_80292E04(Item_GObj*); +/* 292E64 */ void it_80292E64(Item_GObj*); +/* 292EAC */ void it_80292EAC(Item_GObj*); /* 292EF8 */ void it_80292EF8(Item_GObj*, Vec3*); +/* 292F14 */ void it_80292F14(Item_GObj*, s32, f32); /* 293284 */ void it_80293284(Item_GObj*); /* 2933C4 */ void it_802933C4(Item_GObj*); /* 2933EC */ void it_802933EC(Item_GObj*);