kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix function prototypes

Browse source
This commit is contained in:
gamemasterplc 2023-12-22 17:37:22 -06:00
parent f5343fb9e4
commit 3a297f36b0
2 changed files with 112 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

121
include/game/window.h
View file

@ -44,11 +44,11 @@ typedef struct {
/* 0x066 */ s16 spacing_y; /* 0x066 */ s16 spacing_y;
/* 0x068 */ s16 w; /* 0x068 */ s16 w;
/* 0x06A */ s16 h; /* 0x06A */ s16 h;
/* 0x06C */ f32 pos_x; /* 0x06C */ float pos_x;
/* 0x070 */ f32 pos_y; /* 0x070 */ float pos_y;
/* 0x074 */ f32 scale_x; /* 0x074 */ float scale_x;
/* 0x078 */ f32 scale_y; /* 0x078 */ float scale_y;
/* 0x07C */ f32 rot; /* 0x07C */ float z_rot;
/* 0x080 */ s16 num_chars; /* 0x080 */ s16 num_chars;
/* 0x082 */ s16 max_chars; /* 0x082 */ s16 max_chars;
/* 0x084 */ WinChar *char_data; /* 0x084 */ WinChar *char_data;
@ -74,62 +74,63 @@ typedef struct {
} WindowData; // Size 0x180 } WindowData; // Size 0x180
void HuWindowInit(void); void HuWindowInit(void);
void HuWinInit(s32 arg0); void HuWinInit(s32 mess_data_no);
s16 HuWinCreate(f32 x, f32 y, s16 w, s16 h, s16 frame); s16 HuWinCreate(float x, float y, s16 w, s16 h, s16 frame);
void HuWinKill(s16 arg0); void HuWinKill(s16 window);
void HuWinAllKill(void); void HuWinAllKill(void);
void HuWinHomeClear(s16 arg0); void HuWinHomeClear(s16 window);
void HuWinKeyWaitEntry(s16 arg0); void HuWinKeyWaitEntry(s16 window);
u32 HuWinActivePadGet(WindowData* arg0); u32 HuWinActivePadGet(WindowData *window);
u32 HuWinActiveKeyGetX(WindowData* arg0); u32 HuWinActiveKeyGetX(WindowData *window);
void HuWinPosSet(s16 arg0, f32 arg1, f32 arg2); void HuWinPosSet(s16 window, float x, float y);
void HuWinScaleSet(s16 arg0, f32 arg1, f32 arg2); void HuWinScaleSet(s16 window, float x, float y);
void HuWinZRotSet(s16 arg0, f32 arg1); void HuWinZRotSet(s16 window, float z_rot);
void HuWinCenterPosSet(s16 arg0, f32 arg1, f32 arg2); void HuWinCenterPosSet(s16 window, float x, float y);
void HuWinDrawNoSet(s16 arg0, s16 arg1); void HuWinDrawNoSet(s16 window, s16 draw_no);
void HuWinScissorSet(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4); void HuWinScissorSet(s16 window, s16 x, s16 y, s16 w, s16 h);
void HuWinPriSet(s16 arg0, s16 arg1); void HuWinPriSet(s16 window, s16 prio);
void HuWinAttrSet(s16 arg0, s32 arg1); void HuWinAttrSet(s16 window, u32 attr);
void HuWinAttrReset(s16 arg0, u32 arg1); void HuWinAttrReset(s16 window, u32 attr);
u8 HuWinStatGet(s16 arg0); u8 HuWinStatGet(s16 window);
void HuWinMesColSet(s16 arg0, u8 arg1); void HuWinMesColSet(s16 window, u8 color);
void HuWinMesPalSet(s16 arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4); void HuWinMesPalSet(s16 window, u8 index, u8 r, u8 g, u8 b);
void HuWinBGTPLvlSet(s16 arg0, f32 arg1); void HuWinBGTPLvlSet(s16 window, float tp_level);
void HuWinBGColSet(s16 arg0, GXColor *arg1); void HuWinBGColSet(s16 window, GXColor *bg_color);
void HuWinMesSpeedSet(s16 arg0, s16 arg1); void HuWinMesSpeedSet(s16 window, s16 speed);
void HuWinMesRead(s32 arg0); void HuWinMesRead(s32 mess_data_no);
void HuWinMesSet(s16 arg0, u32 arg1); void HuWinMesSet(s16 window, u32 mess);
void HuWinInsertMesSet(s16 arg0, u32 arg1, s16 arg2); void HuWinInsertMesSet(s16 window, u32 mess, s16 index);
s16 HuWinChoiceGet(s16 arg0, s16 arg1); s16 HuWinChoiceGet(s16 window, s16 start_choice);
s16 HuWinChoiceNumGet(s16 arg0); s16 HuWinChoiceNumGet(s16 window);
void HuWinChoiceDisable(s16 arg0, s16 arg1); void HuWinChoiceDisable(s16 window, s16 choice);
s16 HuWinChoiceNowGet(s16 arg0); s16 HuWinChoiceNowGet(s16 window);
void HuWinMesWait(s16 arg0); void HuWinMesWait(s16 window);
void HuWinAnimSet(s16 arg0, AnimData* arg1, s16 arg2, f32 arg3, f32 arg4); void HuWinAnimSet(s16 window, AnimData *anim, s16 bank, float x, float y);
s16 HuWinSprSet(s16 arg0, s16 arg1, f32 arg2, f32 arg3); s16 HuWinSprSet(s16 window, s16 sprite, float x, float y);
void HuWinSprPosSet(s16 arg0, s16 arg1, f32 arg2, f32 arg3); void HuWinSprPosSet(s16 window, s16 index, float x, float y);
void HuWinSprPriSet(s16 arg0, s16 arg1, s16 arg2); void HuWinSprPriSet(s16 window, s16 index, s16 prio);
s16 HuWinSprIDGet(s16 arg0, s16 arg1); s16 HuWinSprIDGet(s16 window, s16 index);
void HuWinSprKill(s16 arg0, s16 arg1); void HuWinSprKill(s16 window, s16 index);
void HuWinDispOff(s16 arg0); void HuWinDispOff(s16 window);
void HuWinDispOn(s16 arg0); void HuWinDispOn(s16 window);
void HuWinComKeyWait(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s16 arg4); void HuWinComKeyWait(s32 player_1, s32 player_2, s32 player_3, s32 player_4, s16 delay);
void HuWinComKeySet(s32 arg0, s32 arg1, s32 arg2, s32 arg3); void HuWinComKeySet(s32 player_1, s32 player_2, s32 player_3, s32 player_4);
void _HuWinComKeySet(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s16 arg4); void _HuWinComKeySet(s32 player_1, s32 player_2, s32 player_3, s32 player_4, s16 delay);
void HuWinComKeyGet(s16 arg0, u32* arg1); void HuWinComKeyGet(s16 window, u32 *data);
void HuWinComKeyReset(void); void HuWinComKeyReset(void);
void HuWinInsertMesSizeGet(s32 arg0, s16 arg1); void HuWinMesMaxSizeGet(s16 mess_num, float *size, ...);
void HuWinMesSizeCancelCRSet(s32 arg0); void HuWinInsertMesSizeGet(s32 mess, s16 index);
void HuWinMesMaxSizeBetGet(f32* arg0, u32 arg1, u32 arg2); void HuWinMesSizeCancelCRSet(s32 cancel_cr);
s32 HuWinKeyWaitNumGet(u32 arg0); void HuWinMesMaxSizeBetGet(float *size, u32 start, u32 end);
void HuWinPushKeySet(s16 arg0, s16 arg1); s32 HuWinKeyWaitNumGet(u32 mess);
void HuWinDisablePlayerSet(s16 arg0, u8 arg1); void HuWinPushKeySet(s16 window, s16 push_key);
void HuWinDisablePlayerReset(s16 arg0, s32 arg1); void HuWinDisablePlayerSet(s16 window, u8 player);
void HuWinExCreate(f32 arg0, f32 arg1, s16 arg2, s16 arg3, s16 arg4); void HuWinDisablePlayerReset(s16 window, u8 player);
s16 HuWinExCreateStyled(f32 arg0, f32 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5); s16 HuWinExCreate(float x, float y, s16 w, s16 h, s16 portrait);
void HuWinExAnimIn(s16 arg0); s16 HuWinExCreateStyled(float x, float y, s16 w, s16 h, s16 portrait, s16 frame);
void HuWinExAnimOut(s16 arg0); void HuWinExAnimIn(s16 window);
void HuWinExCleanup(s16 arg0); void HuWinExAnimOut(s16 window);
void HuWinExAnimPopIn(s16 arg0, s16 arg1); void HuWinExCleanup(s16 window);
void HuWinExAnimPopIn(s16 window, s16 portrait);
#endif #endif

102
src/game/window.c
View file

@ -47,7 +47,7 @@ void HuAR_ARAMtoMRAM(void*);
void HuDataDirClose(s32); void HuDataDirClose(s32);
void* HuDataReadNum(s32, s32); void* HuDataReadNum(s32, s32);
void mtxTransCat(Mtx, f32, f32, f32); void mtxTransCat(Mtx, float, float, float);
void* MessData_MesPtrGet(void*, u32); void* MessData_MesPtrGet(void*, u32);
extern u16 HuPadBtn[4]; extern u16 HuPadBtn[4];
@ -259,7 +259,7 @@ void HuWinInit(s32 mess_data_no) {
} }
} }
s16 HuWinCreate(f32 x, f32 y, s16 w, s16 h, s16 frame) { s16 HuWinCreate(float x, float y, s16 w, s16 h, s16 frame) {
AnimData *bg_anim; AnimData *bg_anim;
WindowData *window; WindowData *window;
SpriteData *sprite_ptr; SpriteData *sprite_ptr;
@ -362,19 +362,19 @@ s16 HuWinCreate(f32 x, f32 y, s16 w, s16 h, s16 frame) {
return window_id; return window_id;
} }
void HuWinKill(s16 window_id) { void HuWinKill(s16 window) {
WindowData *window = &winData[window_id]; WindowData *window_ptr = &winData[window];
s16 i; s16 i;
if (window->group != -1) { if (window_ptr->group != -1) {
HuMemDirectFree(window->char_data); HuMemDirectFree(window_ptr->char_data);
for (i = 2; i < 30; i++) { for (i = 2; i < 30; i++) {
if (window->sprite_id[i] != -1) { if (window_ptr->sprite_id[i] != -1) {
HuSprGrpMemberKill(window->group, i); HuSprGrpMemberKill(window_ptr->group, i);
} }
} }
HuSprGrpKill(window->group); HuSprGrpKill(window_ptr->group);
window->group = -1; window_ptr->group = -1;
} }
} }
@ -420,14 +420,14 @@ void HuWinAllKill(void) {
static void MesDispFunc(SpriteData *sprite) { static void MesDispFunc(SpriteData *sprite) {
WindowData *window = &winData[sprite->work[0]]; WindowData *window = &winData[sprite->work[0]];
SpriteGroupData *group; SpriteGroupData *group;
f32 uv_maxx; float uv_maxx;
f32 uv_maxy; float uv_maxy;
f32 uv_minx; float uv_minx;
f32 uv_miny; float uv_miny;
f32 char_w; float char_w;
f32 char_x; float char_x;
f32 char_y; float char_y;
f32 char_uv_h; float char_uv_h;
s16 i; s16 i;
u16 alpha; u16 alpha;
s16 color; s16 color;
@ -490,16 +490,16 @@ static void MesDispFunc(SpriteData *sprite) {
} }
GXPosition3f32(char_x + 1.0f, char_y, 0.0f); GXPosition3f32(char_x + 1.0f, char_y, 0.0f);
GXColor4u8(window->mess_pal[color][0], window->mess_pal[color][1], window->mess_pal[color][2], alpha); GXColor4u8(window->mess_pal[color][0], window->mess_pal[color][1], window->mess_pal[color][2], alpha);
GXTexCoord2f32(uv_minx, uv_miny); GXPosition2f32(uv_minx, uv_miny);
GXPosition3f32(char_x + char_w, char_y, 0.0f); GXPosition3f32(char_x + char_w, char_y, 0.0f);
GXColor4u8(window->mess_pal[color][0], window->mess_pal[color][1], window->mess_pal[color][2], alpha); GXColor4u8(window->mess_pal[color][0], window->mess_pal[color][1], window->mess_pal[color][2], alpha);
GXTexCoord2f32(uv_maxx, uv_miny); GXPosition2f32(uv_maxx, uv_miny);
GXPosition3f32(char_x + char_w, char_y + 24.0f, 0.0f); GXPosition3f32(char_x + char_w, char_y + 24.0f, 0.0f);
GXColor4u8(window->mess_pal[color][0], window->mess_pal[color][1], window->mess_pal[color][2], alpha); GXColor4u8(window->mess_pal[color][0], window->mess_pal[color][1], window->mess_pal[color][2], alpha);
GXTexCoord2f32(uv_maxx, uv_maxy); GXPosition2f32(uv_maxx, uv_maxy);
GXPosition3f32(char_x + 1.0f, char_y + 24.0f, 0.0f); GXPosition3f32(char_x + 1.0f, char_y + 24.0f, 0.0f);
GXColor4u8(window->mess_pal[color][0], window->mess_pal[color][1], window->mess_pal[color][2], alpha); GXColor4u8(window->mess_pal[color][0], window->mess_pal[color][1], window->mess_pal[color][2], alpha);
GXTexCoord2f32(uv_minx, uv_maxy); GXPosition2f32(uv_minx, uv_maxy);
} }
GXEnd(); GXEnd();
mesCharCnt++; mesCharCnt++;
@ -934,8 +934,8 @@ static void HuWinSpcFontClear(WindowData* window) {
static void HuWinChoice(WindowData *window) { static void HuWinChoice(WindowData *window) {
WinChoice *choice; WinChoice *choice;
f32 choice_dist; float choice_dist;
f32 min_choice_dist_x; float min_choice_dist_x;
s16 choice_dist_y; s16 choice_dist_y;
s16 key; s16 key;
s16 choice_curr_x; s16 choice_curr_x;
@ -1145,7 +1145,7 @@ u32 HuWinActiveKeyGetX(WindowData *window) {
return button; return button;
} }
void HuWinPosSet(s16 window, f32 x, f32 y) { void HuWinPosSet(s16 window, float x, float y) {
WindowData *window_ptr = &winData[window]; WindowData *window_ptr = &winData[window];
window_ptr->pos_x = x; window_ptr->pos_x = x;
@ -1153,7 +1153,7 @@ void HuWinPosSet(s16 window, f32 x, f32 y) {
HuSprGrpPosSet(window_ptr->group, x, y); HuSprGrpPosSet(window_ptr->group, x, y);
} }
void HuWinScaleSet(s16 window, f32 x, f32 y) { void HuWinScaleSet(s16 window, float x, float y) {
WindowData *window_ptr = &winData[window]; WindowData *window_ptr = &winData[window];
window_ptr->scale_x = x; window_ptr->scale_x = x;
@ -1161,14 +1161,14 @@ void HuWinScaleSet(s16 window, f32 x, f32 y) {
HuSprGrpScaleSet(window_ptr->group, x, y); HuSprGrpScaleSet(window_ptr->group, x, y);
} }
void HuWinZRotSet(s16 window, f32 rot) { void HuWinZRotSet(s16 window, float z_rot) {
WindowData *window_ptr = &winData[window]; WindowData *window_ptr = &winData[window];
window_ptr->rot = rot; window_ptr->z_rot = z_rot;
HuSprGrpZRotSet(window_ptr->group, rot); HuSprGrpZRotSet(window_ptr->group, z_rot);
} }
void HuWinCenterPosSet(s16 window, f32 x, f32 y) { void HuWinCenterPosSet(s16 window, float x, float y) {
WindowData *window_ptr = &winData[window]; WindowData *window_ptr = &winData[window];
HuSprGrpCenterSet(window_ptr->group, window_ptr->w / 2.0f - x, window_ptr->h / 2.0f - y); HuSprGrpCenterSet(window_ptr->group, window_ptr->w / 2.0f - x, window_ptr->h / 2.0f - y);
@ -1200,7 +1200,7 @@ void HuWinPriSet(s16 window, s16 prio) {
window_ptr->prio = prio; window_ptr->prio = prio;
} }
void HuWinAttrSet(s16 window, s32 attr) { void HuWinAttrSet(s16 window, u32 attr) {
WindowData *window_ptr = &winData[window]; WindowData *window_ptr = &winData[window];
window_ptr->attr |= attr; window_ptr->attr |= attr;
@ -1233,7 +1233,7 @@ void HuWinMesPalSet(s16 window, u8 index, u8 r, u8 g, u8 b) {
window_ptr->mess_pal[index][2] = b; window_ptr->mess_pal[index][2] = b;
} }
void HuWinBGTPLvlSet(s16 window, f32 tp_level) { void HuWinBGTPLvlSet(s16 window, float tp_level) {
WindowData *window_ptr = &winData[window]; WindowData *window_ptr = &winData[window];
HuSprTPLvlSet(window_ptr->group, 0, tp_level); HuSprTPLvlSet(window_ptr->group, 0, tp_level);
@ -1372,7 +1372,7 @@ void HuWinMesWait(s16 window) {
} }
} }
void HuWinAnimSet(s16 window, AnimData *anim, s16 bank, f32 x, f32 y) { void HuWinAnimSet(s16 window, AnimData *anim, s16 bank, float x, float y) {
WindowData *window_ptr = &winData[window]; WindowData *window_ptr = &winData[window];
s16 sprite; s16 sprite;
@ -1380,7 +1380,7 @@ void HuWinAnimSet(s16 window, AnimData *anim, s16 bank, f32 x, f32 y) {
HuWinSprSet(window, sprite, x, y); HuWinSprSet(window, sprite, x, y);
} }
s16 HuWinSprSet(s16 window, s16 sprite, f32 x, f32 y) { s16 HuWinSprSet(s16 window, s16 sprite, float x, float y) {
WindowData *window_ptr = &winData[window]; WindowData *window_ptr = &winData[window];
SpriteGroupData *group = &HuSprGrpData[window_ptr->group]; SpriteGroupData *group = &HuSprGrpData[window_ptr->group];
s16 i; s16 i;
@ -1396,18 +1396,18 @@ s16 HuWinSprSet(s16 window, s16 sprite, f32 x, f32 y) {
return i; return i;
} }
void HuWinSprPosSet(s16 window, s16 sprite, f32 x, f32 y) { void HuWinSprPosSet(s16 window, s16 index, float x, float y) {
WindowData *window_ptr = &winData[window]; WindowData *window_ptr = &winData[window];
SpriteGroupData *group = &HuSprGrpData[window_ptr->group]; SpriteGroupData *group = &HuSprGrpData[window_ptr->group];
HuSprPosSet(window_ptr->group, sprite, x - group->center_x, y - group->center_y); HuSprPosSet(window_ptr->group, index, x - group->center_x, y - group->center_y);
} }
void HuWinSprPriSet(s16 window, s16 sprite, s16 prio) { void HuWinSprPriSet(s16 window, s16 index, s16 prio) {
WindowData *window_ptr = &winData[window]; WindowData *window_ptr = &winData[window];
SpriteGroupData *group = &HuSprGrpData[window_ptr->group]; SpriteGroupData *group = &HuSprGrpData[window_ptr->group];
HuSprPriSet(window_ptr->group, sprite, prio); HuSprPriSet(window_ptr->group, index, prio);
} }
s16 HuWinSprIDGet(s16 window, s16 index) { s16 HuWinSprIDGet(s16 window, s16 index) {
@ -1416,11 +1416,11 @@ s16 HuWinSprIDGet(s16 window, s16 index) {
return window_ptr->sprite_id[index]; return window_ptr->sprite_id[index];
} }
void HuWinSprKill(s16 window, s16 sprite) { void HuWinSprKill(s16 window, s16 index) {
WindowData *window_ptr = &winData[window]; WindowData *window_ptr = &winData[window];
HuSprGrpMemberKill(window_ptr->group, sprite); HuSprGrpMemberKill(window_ptr->group, index);
window_ptr->sprite_id[sprite] = -1; window_ptr->sprite_id[index] = -1;
} }
void HuWinDispOff(s16 window) { void HuWinDispOff(s16 window) {
@ -1526,7 +1526,7 @@ void HuWinComKeyReset(void) {
comKeyIdx = comKeyIdxNow = 0; comKeyIdx = comKeyIdxNow = 0;
} }
void HuWinMesMaxSizeGet(s16 mess_num, f32* size, ...) { void HuWinMesMaxSizeGet(s16 mess_num, float *size, ...) {
s16 i; s16 i;
u32 mess; u32 mess;
va_list list; va_list list;
@ -1559,7 +1559,7 @@ void HuWinMesSizeCancelCRSet(s32 cancel_cr) {
cancelCRF = cancel_cr; cancelCRF = cancel_cr;
} }
void HuWinMesMaxSizeBetGet(f32 *size, u32 start, u32 end) { void HuWinMesMaxSizeBetGet(float *size, u32 start, u32 end) {
u32 i; u32 i;
if (end < start) { if (end < start) {
@ -1780,14 +1780,10 @@ void HuWinDisablePlayerSet(s16 window, u8 player) {
window_ptr->player_disable |= player; window_ptr->player_disable |= player;
} }
void HuWinDisablePlayerReset(s16 window, s32 player) { void HuWinDisablePlayerReset(s16 window, u8 player) {
WindowData *window_ptr = &winData[window]; WindowData *window_ptr = &winData[window];
window_ptr->player_disable &= ~player; window_ptr->player_disable &= ~(int)player;
}
void HuWinExCreate(f32 x, f32 y, s16 w, s16 h, s16 arg4) {
HuWinExCreateStyled(x, y, w, h, arg4, 0);
} }
static s32 winPortraitTbl[] = { static s32 winPortraitTbl[] = {
@ -1812,7 +1808,11 @@ static s32 winPortraitTbl[] = {
MAKE_DATA_NUM(DATADIR_WIN, 14) MAKE_DATA_NUM(DATADIR_WIN, 14)
}; };
static void HuWinExCreatePortrait(s16 window, s16 portrait, f32 x, f32 y) { s16 HuWinExCreate(float x, float y, s16 w, s16 h, s16 portrait) {
return HuWinExCreateStyled(x, y, w, h, portrait, 0);
}
static void HuWinExCreatePortrait(s16 window, s16 portrait, float x, float y) {
s16 sprite; s16 sprite;
AnimData *anim; AnimData *anim;
WindowData *window_ptr; WindowData *window_ptr;
@ -1825,7 +1825,7 @@ static void HuWinExCreatePortrait(s16 window, s16 portrait, f32 x, f32 y) {
HuWinSprSet(window, sprite, x, y); HuWinSprSet(window, sprite, x, y);
} }
s16 HuWinExCreateStyled(f32 x, f32 y, s16 w, s16 h, s16 portrait, s16 frame) { s16 HuWinExCreateStyled(float x, float y, s16 w, s16 h, s16 portrait, s16 frame) {
WindowData *window_ptr; WindowData *window_ptr;
s16 window; s16 window;