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

Merge pull request #50 from gamemasterplc/main

Browse source 
Cleanup for window.c
This commit is contained in:
gamemasterplc 2023-12-22 17:50:36 -06:00 • committed by GitHub
commit 89f85e6d42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1250 additions and 1236 deletions
Download patch file Download diff file Expand all files Collapse all files

12
config/GMPE01_00/symbols.txt
View file

@ -6187,13 +6187,13 @@ winTabSize = .sbss:0x801D3DC9; // type:object size:0x1 scope:local data:byte
mesWInsert = .sbss:0x801D3DCA; // type:object size:0x8 scope:local
winMaxHeight = .sbss:0x801D3DD2; // type:object size:0x2 scope:local data:2byte
winMaxWidth = .sbss:0x801D3DD4; // type:object size:0x2 scope:local data:2byte
messDataNo = .sbss:0x801D3DD8; // type:object size:0x4 data:4byte
messDataNo = .sbss:0x801D3DD8; // type:object size:0x4 scope:local data:4byte
messDataPtr = .sbss:0x801D3DDC; // type:object size:0x4 data:4byte
winProc = .sbss:0x801D3DE0; // type:object size:0x4 data:4byte
cardAnimB = .sbss:0x801D3DE4; // type:object size:0x4 data:4byte
cardAnimA = .sbss:0x801D3DE8; // type:object size:0x4 data:4byte
cursorAnim = .sbss:0x801D3DEC; // type:object size:0x4 data:4byte
iconAnim = .sbss:0x801D3DF0; // type:object size:0x8 data:4byte
winProc = .sbss:0x801D3DE0; // type:object size:0x4 scope:local data:4byte
cardAnimB = .sbss:0x801D3DE4; // type:object size:0x4 scope:local data:4byte
cardAnimA = .sbss:0x801D3DE8; // type:object size:0x4 scope:local data:4byte
cursorAnim = .sbss:0x801D3DEC; // type:object size:0x4 scope:local data:4byte
iconAnim = .sbss:0x801D3DF0; // type:object size:0x4 scope:local data:4byte
UnMountCnt = .sbss:0x801D3DF8; // type:object size:0x1 data:byte
cardWork = .sbss:0x801D3DFC; // type:object size:0x4 scope:local data:4byte
arqIdx = .sbss:0x801D3E00; // type:object size:0x2 scope:local data:2byte

249
include/game/window.h
View file

@ -2,144 +2,137 @@
#define _GAME_WINDOW_H
#include "game/sprite.h"
#include "dolphin.h"
#define MAKE_MESSID(bank, mess) (((bank) << 16)+(mess))
#define MAKE_MESSID_PTR(ptr) ((u32)(ptr))
typedef struct {
/* 0x00 */ u8 unk00;
/* 0x01 */ u8 unk01;
/* 0x02 */ s16 unk02;
/* 0x04 */ s16 unk04;
/* 0x06 */ s16 unk06;
} UnknownWindowStruct1; // Size 8
/* 0x00 */ u8 color;
/* 0x01 */ u8 fade;
/* 0x02 */ s16 x;
/* 0x04 */ s16 y;
/* 0x06 */ s16 character;
} WinChar; // Size 8
typedef struct {
/* 0x00 */ u8 unk00;
/* 0x01 */ char unk01[1];
/* 0x02 */ s16 unk02;
/* 0x04 */ s16 unk04;
} UnknownWindowStruct2; // Size 6
/* 0x00 */ u8 stat;
/* 0x02 */ s16 x;
/* 0x04 */ s16 y;
} WinChoice; // Size 6
typedef struct {
/* 0x000 */ u8 unk00;
/* 0x001 */ u8 unk01;
/* 0x002 */ u8 unk02;
/* 0x003 */ u8 unk03;
/* 0x004 */ s16 unk04;
/* 0x006 */ s16 unk06[30];
/* 0x042 */ s16 unk42;
/* 0x044 */ s16 unk44;
/* 0x046 */ s16 unk46;
/* 0x048 */ s16 unk48;
/* 0x04A */ char unk4A[2];
/* 0x04C */ u32 unk4C;
/* 0x050 */ AnimData* unk50;
/* 0x054 */ s16 unk54;
/* 0x056 */ s16 unk56;
/* 0x058 */ s16 unk58;
/* 0x05A */ s16 unk5A;
/* 0x05C */ s16 unk5C;
/* 0x05E */ s16 unk5E;
/* 0x060 */ s16 unk60;
/* 0x062 */ s16 unk62;
/* 0x064 */ s16 unk64;
/* 0x066 */ s16 unk66;
/* 0x068 */ s16 unk68;
/* 0x06A */ s16 unk6A;
/* 0x06C */ f32 unk6C;
/* 0x070 */ f32 unk70;
/* 0x074 */ f32 unk74;
/* 0x078 */ f32 unk78;
/* 0x07C */ f32 unk7C;
/* 0x080 */ s16 unk80;
/* 0x082 */ s16 unk82;
/* 0x084 */ UnknownWindowStruct1* unk84;
/* 0x088 */ s16 unk88;
/* 0x08A */ char unk8A[2];
/* 0x000 */ u8 stat;
/* 0x001 */ u8 active_pad;
/* 0x002 */ u8 player_disable;
/* 0x003 */ u8 color_key;
/* 0x004 */ s16 group;
/* 0x006 */ s16 sprite_id[30];
/* 0x042 */ s16 speed;
/* 0x044 */ s16 mess_time;
/* 0x046 */ s16 advance_sprite;
/* 0x048 */ s16 prio;
/* 0x04C */ u32 attr;
/* 0x050 */ AnimData *frame;
/* 0x054 */ s16 mess_rect_x;
/* 0x056 */ s16 mess_rect_w;
/* 0x058 */ s16 mess_rect_y;
/* 0x05A */ s16 mess_rect_h;
/* 0x05C */ s16 mess_x;
/* 0x05E */ s16 mess_y;
/* 0x060 */ s16 mess_color;
/* 0x062 */ s16 mess_shadow_color;
/* 0x064 */ s16 spacing_x;
/* 0x066 */ s16 spacing_y;
/* 0x068 */ s16 w;
/* 0x06A */ s16 h;
/* 0x06C */ float pos_x;
/* 0x070 */ float pos_y;
/* 0x074 */ float scale_x;
/* 0x078 */ float scale_y;
/* 0x07C */ float z_rot;
/* 0x080 */ s16 num_chars;
/* 0x082 */ s16 max_chars;
/* 0x084 */ WinChar *char_data;
/* 0x088 */ s16 mess_stackptr;
/* 0x08C */ s32 unk8C;
/* 0x090 */ u8* unk90;
/* 0x094 */ u8* unk94[1]; // unknown size
/* 0x098 */ char unk98[0x1C];
/* 0x0B4 */ void* unkB4[8];
/* 0x0D4 */ s16 unkD4;
/* 0x0D6 */ s16 unkD6;
/* 0x0D8 */ s16 unkD8;
/* 0x0DA */ u8 unkDA[16];
/* 0x0EA */ UnknownWindowStruct2 unkEA[16];
/* 0x14A */ s16 unk14A;
/* 0x14C */ s16 unk14C;
/* 0x14E */ s16 unk14E;
/* 0x150 */ s16 unk150;
/* 0x152 */ s16 unk152;
/* 0x154 */ s16 unk154;
/* 0x156 */ s16 unk156;
/* 0x158 */ s16 unk158;
/* 0x15A */ char unk15A[6];
/* 0x160 */ u8 unk160[10][3];
/* 0x17E */ char unk17E[2];
} SomeWindowStruct; // Size 0x180
typedef struct {
/* 0x00 */ u8 r;
/* 0x01 */ u8 g;
/* 0x02 */ u8 b;
} ColorRGB; // Size 3
/* 0x090 */ u8 *mess;
/* 0x094 */ u8 *mess_stack[8];
/* 0x0B4 */ u8 *insert_mess[8];
/* 0x0D4 */ s16 num_choices;
/* 0x0D6 */ s16 choice;
/* 0x0D8 */ s16 cursor_sprite;
/* 0x0DA */ u8 choice_disable[16];
/* 0x0EA */ WinChoice choice_data[16];
/* 0x14A */ s16 scissor_x;
/* 0x14C */ s16 scissor_y;
/* 0x14E */ s16 scissor_w;
/* 0x150 */ s16 scissor_h;
/* 0x152 */ s16 tab_w;
/* 0x154 */ s16 push_key;
/* 0x156 */ s16 key_down;
/* 0x158 */ s16 key_auto;
/* 0x160 */ u8 ATTRIBUTE_ALIGN(32) mess_pal[10][3];
} WindowData; // Size 0x180
void HuWindowInit(void);
void HuWinInit(s32 arg0);
s16 HuWinCreate(f32 x, f32 y, s16 w, s16 h, s16 frame);
void HuWinKill(s16 arg0);
void HuWinInit(s32 mess_data_no);
s16 HuWinCreate(float x, float y, s16 w, s16 h, s16 frame);
void HuWinKill(s16 window);
void HuWinAllKill(void);
void HuWinHomeClear(s16 arg0);
void HuWinKeyWaitEntry(s16 arg0);
u32 HuWinActivePadGet(SomeWindowStruct* arg0);
u32 HuWinActiveKeyGetX(SomeWindowStruct* arg0);
void HuWinPosSet(s16 arg0, f32 arg1, f32 arg2);
void HuWinScaleSet(s16 arg0, f32 arg1, f32 arg2);
void HuWinZRotSet(s16 arg0, f32 arg1);
void HuWinCenterPosSet(s16 arg0, f32 arg1, f32 arg2);
void HuWinDrawNoSet(s16 arg0, s16 arg1);
void HuWinScissorSet(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4);
void HuWinPriSet(s16 arg0, s16 arg1);
void HuWinAttrSet(s16 arg0, s32 arg1);
void HuWinAttrReset(s16 arg0, u32 arg1);
u8 HuWinStatGet(s16 arg0);
void HuWinMesColSet(s16 arg0, u8 arg1);
void HuWinMesPalSet(s16 arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4);
void HuWinBGTPLvlSet(s16 arg0, f32 arg1);
void HuWinBGColSet(s16 arg0, ColorRGB* arg1);
void HuWinMesSpeedSet(s16 arg0, s16 arg1);
void HuWinMesRead(s32 arg0);
void HuWinMesSet(s16 arg0, u32 arg1);
void HuWinInsertMesSet(s16 arg0, u32 arg1, s16 arg2);
s16 HuWinChoiceGet(s16 arg0, s16 arg1);
s16 HuWinChoiceNumGet(s16 arg0);
void HuWinChoiceDisable(s16 arg0, s16 arg1);
s16 HuWinChoiceNowGet(s16 arg0);
void HuWinMesWait(s16 arg0);
void HuWinAnimSet(s16 arg0, AnimData* arg1, s16 arg2, f32 arg3, f32 arg4);
s16 HuWinSprSet(s16 arg0, s16 arg1, f32 arg2, f32 arg3);
void HuWinSprPosSet(s16 arg0, s16 arg1, f32 arg2, f32 arg3);
void HuWinSprPriSet(s16 arg0, s16 arg1, s16 arg2);
s16 HuWinSprIDGet(s16 arg0, s16 arg1);
void HuWinSprKill(s16 arg0, s16 arg1);
void HuWinDispOff(s16 arg0);
void HuWinDispOn(s16 arg0);
void HuWinComKeyWait(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s16 arg4);
void HuWinComKeySet(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
void _HuWinComKeySet(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s16 arg4);
void HuWinComKeyGet(s16 arg0, u32* arg1);
void HuWinHomeClear(s16 window);
void HuWinKeyWaitEntry(s16 window);
u32 HuWinActivePadGet(WindowData *window);
u32 HuWinActiveKeyGetX(WindowData *window);
void HuWinPosSet(s16 window, float x, float y);
void HuWinScaleSet(s16 window, float x, float y);
void HuWinZRotSet(s16 window, float z_rot);
void HuWinCenterPosSet(s16 window, float x, float y);
void HuWinDrawNoSet(s16 window, s16 draw_no);
void HuWinScissorSet(s16 window, s16 x, s16 y, s16 w, s16 h);
void HuWinPriSet(s16 window, s16 prio);
void HuWinAttrSet(s16 window, u32 attr);
void HuWinAttrReset(s16 window, u32 attr);
u8 HuWinStatGet(s16 window);
void HuWinMesColSet(s16 window, u8 color);
void HuWinMesPalSet(s16 window, u8 index, u8 r, u8 g, u8 b);
void HuWinBGTPLvlSet(s16 window, float tp_level);
void HuWinBGColSet(s16 window, GXColor *bg_color);
void HuWinMesSpeedSet(s16 window, s16 speed);
void HuWinMesRead(s32 mess_data_no);
void HuWinMesSet(s16 window, u32 mess);
void HuWinInsertMesSet(s16 window, u32 mess, s16 index);
s16 HuWinChoiceGet(s16 window, s16 start_choice);
s16 HuWinChoiceNumGet(s16 window);
void HuWinChoiceDisable(s16 window, s16 choice);
s16 HuWinChoiceNowGet(s16 window);
void HuWinMesWait(s16 window);
void HuWinAnimSet(s16 window, AnimData *anim, s16 bank, float x, float y);
s16 HuWinSprSet(s16 window, s16 sprite, float x, float y);
void HuWinSprPosSet(s16 window, s16 index, float x, float y);
void HuWinSprPriSet(s16 window, s16 index, s16 prio);
s16 HuWinSprIDGet(s16 window, s16 index);
void HuWinSprKill(s16 window, s16 index);
void HuWinDispOff(s16 window);
void HuWinDispOn(s16 window);
void HuWinComKeyWait(s32 player_1, s32 player_2, s32 player_3, s32 player_4, s16 delay);
void HuWinComKeySet(s32 player_1, s32 player_2, s32 player_3, s32 player_4);
void _HuWinComKeySet(s32 player_1, s32 player_2, s32 player_3, s32 player_4, s16 delay);
void HuWinComKeyGet(s16 window, u32 *data);
void HuWinComKeyReset(void);
void HuWinInsertMesSizeGet(s32 arg0, s16 arg1);
void HuWinMesSizeCancelCRSet(s32 arg0);
void HuWinMesMaxSizeBetGet(f32* arg0, u32 arg1, u32 arg2);
s32 HuWinKeyWaitNumGet(u32 arg0);
void HuWinPushKeySet(s16 arg0, s16 arg1);
void HuWinDisablePlayerSet(s16 arg0, u8 arg1);
void HuWinDisablePlayerReset(s16 arg0, s32 arg1);
void HuWinExCreate(f32 arg0, f32 arg1, s16 arg2, s16 arg3, s16 arg4);
s16 HuWinExCreateStyled(f32 arg0, f32 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5);
void HuWinExAnimIn(s16 arg0);
void HuWinExAnimOut(s16 arg0);
void HuWinExCleanup(s16 arg0);
void HuWinExAnimPopIn(s16 arg0, s16 arg1);
void HuWinMesMaxSizeGet(s16 mess_num, float *size, ...);
void HuWinInsertMesSizeGet(s32 mess, s16 index);
void HuWinMesSizeCancelCRSet(s32 cancel_cr);
void HuWinMesMaxSizeBetGet(float *size, u32 start, u32 end);
s32 HuWinKeyWaitNumGet(u32 mess);
void HuWinPushKeySet(s16 window, s16 push_key);
void HuWinDisablePlayerSet(s16 window, u8 player);
void HuWinDisablePlayerReset(s16 window, u8 player);
s16 HuWinExCreate(float x, float y, s16 w, s16 h, s16 portrait);
s16 HuWinExCreateStyled(float x, float y, s16 w, s16 h, s16 portrait, s16 frame);
void HuWinExAnimIn(s16 window);
void HuWinExAnimOut(s16 window);
void HuWinExCleanup(s16 window);
void HuWinExAnimPopIn(s16 window, s16 portrait);
#endif

2225
src/game/window.c
View file

File diff suppressed because it is too large Load diff