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

Clean Up Sprite Constant Labeling

Browse source 
Also improved struct labeling.
This commit is contained in:
gamemasterplc 2024-03-10 22:36:14 -05:00
parent d12b5c62aa
commit 504e565727
10 changed files with 434 additions and 425 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/game/board/main.c
View file

@ -2018,17 +2018,17 @@ void BoardLast5GfxInit(void)
}
BoardSpriteCreate(spr_file, prio, NULL, &work->sprites[i]);
HuSprGrpMemberSet(work->group, i, work->sprites[i]);
HuSprAttrSet(work->group, i, SPRITE_ATTR_BILINEAR);
HuSprAttrSet(work->group, i, HUSPR_ATTR_LINEAR);
HuSprPosSet(work->group, i, last5GfxPosTbl[lastF][i][0], last5GfxPosTbl[lastF][i][1]);
}
if(!work->is_last) {
SpriteData *sprite = &HuSprData[HuSprGrpData[work->group].members[1]];
HuSprite *sprite = &HuSprData[HuSprGrpData[work->group].members[1]];
HuSprBankSet(work->group, 1, 0);
sprite->frame = turn_remain;
} else {
HuSprAttrSet(work->group, 1, SPRITE_ATTR_HIDDEN);
HuSprAttrSet(work->group, 1, HUSPR_ATTR_DISPOFF);
}
HuSprAttrSet(work->group, 1, SPRITE_ATTR_PAUSED);
HuSprAttrSet(work->group, 1, HUSPR_ATTR_NOANIM);
object->trans.x = 0.0f;
HuSprGrpTPLvlSet(work->group, object->trans.x);
HuSprGrpPosSet(work->group, 288, 72);
@ -2105,12 +2105,12 @@ void BoardLast5GfxShowSet(s32 show)
work = OM_GET_WORK_PTR(last5GfxObj, Last5GfxWork);
for(i=0; i<3; i++) {
if(show) {
HuSprAttrReset(work->group, i, SPRITE_ATTR_HIDDEN);
HuSprAttrReset(work->group, i, HUSPR_ATTR_DISPOFF);
} else {
HuSprAttrSet(work->group, i, SPRITE_ATTR_HIDDEN);
HuSprAttrSet(work->group, i, HUSPR_ATTR_DISPOFF);
}
if(work->is_last) {
HuSprAttrSet(work->group, 1, SPRITE_ATTR_HIDDEN);
HuSprAttrSet(work->group, 1, HUSPR_ATTR_DISPOFF);
}
}
}

12
src/game/board/space.c
View file

@ -1000,15 +1000,15 @@ void BoardSpaceInit(s32 data_num)
size = bmp->sizeX;
spaceHiliteTexFmt = -1;
switch(bmp->dataFmt) {
case SPRITE_BMP_RGBA8:
case ANIM_BMP_RGBA8:
spaceHiliteTexFmt = GX_TF_RGBA8;
break;
case SPRITE_BMP_RGB5A3_DUPE:
case ANIM_BMP_RGB5A3_DUPE:
spaceHiliteTexFmt = GX_TF_RGB5A3;
break;
case SPRITE_BMP_CMPR:
case ANIM_BMP_CMPR:
spaceHiliteTexFmt = GX_TF_CMPR;
break;
}
@ -1032,15 +1032,15 @@ void BoardSpaceInit(s32 data_num)
size = bmp->sizeX;
spaceTexFmt = -1;
switch(bmp->dataFmt) {
case SPRITE_BMP_RGBA8:
case ANIM_BMP_RGBA8:
spaceTexFmt = GX_TF_RGBA8;
break;
case SPRITE_BMP_RGB5A3_DUPE:
case ANIM_BMP_RGB5A3_DUPE:
spaceTexFmt = GX_TF_RGB5A3;
break;
case SPRITE_BMP_CMPR:
case ANIM_BMP_CMPR:
spaceTexFmt = GX_TF_CMPR;
break;
}