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

Almost Match HuSprDisp

Browse source
This commit is contained in:
gamemasterplc 2023-12-03 00:39:20 -06:00
parent 23667d4e97
commit 9b7a5a472e
6 changed files with 193 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
config/GMPE01_00/symbols.txt
View file

@ -5125,7 +5125,7 @@ lbl_80132150 = .data:0x80132150; // type:object size:0x40
lbl_80132190 = .data:0x80132190; // type:object size:0xC data:string
lbl_8013219C = .data:0x8013219C; // type:object size:0xC data:string
lbl_801321A8 = .data:0x801321A8; // type:object size:0xC data:string
lbl_801321B4 = .data:0x801321B4; // type:object size:0xC
SaveFileNameTbl = .data:0x801321B4; // type:object size:0xC
jumptable_801321C0 = .data:0x801321C0; // type:object size:0x34 scope:local
SR_PreRstChk = .data:0x801321F8; // type:object size:0x10
coveropen_en = .data:0x80132208; // type:object size:0x1384 noreloc
@ -5396,8 +5396,8 @@ processjmpbuf = .bss:0x8014C398; // type:object size:0xF8 align:8
HuSprData = .bss:0x8014C490; // type:object size:0x9600
HuSprGrpData = .bss:0x80155A90; // type:object size:0x5400 data:2byte
HuSprOrder = .bss:0x8015AE90; // type:object size:0x1800
bmpNoCC = .bss:0x8015C690; // type:object size:0x20
HuSprLayerDrawNo = .bss:0x8015C6B0; // type:object size:0x10
bmpNoCC = .bss:0x8015C690; // type:object size:0x20 scope:local
HuSprLayerDrawNo = .bss:0x8015C6B0; // type:object size:0x10 scope:local
Model = .bss:0x8015C6C0; // type:object size:0x80
head = .bss:0x8015C740; // type:object size:0x240
lbl_8015C980 = .bss:0x8015C980; // type:object size:0x300 scope:local data:byte
@ -6015,7 +6015,7 @@ processtop = .sbss:0x801D3B44; // type:object size:0x4 scope:local data:4byte
HuSprPauseF = .sbss:0x801D3B48; // type:object size:0x4 scope:local data:4byte
HuSprOrderNo = .sbss:0x801D3B4C; // type:object size:0x2 scope:local data:2byte
HuSprOrderNum = .sbss:0x801D3B4E; // type:object size:0x2 scope:local data:2byte
bmpCCIdx = .sbss:0x801D3B50; // type:object size:0x8 data:2byte
bmpCCIdx = .sbss:0x801D3B50; // type:object size:0x8 scope:local data:2byte
MaterialTop = .sbss:0x801D3B58; // type:object size:0x4 data:4byte
AttributeTop = .sbss:0x801D3B5C; // type:object size:0x4 data:4byte
ClusterTop = .sbss:0x801D3B60; // type:object size:0x4 data:4byte
@ -6231,11 +6231,10 @@ lbl_801D3E90 = .sbss:0x801D3E90; // type:object size:0x4
lbl_801D3E94 = .sbss:0x801D3E94; // type:object size:0x4
lbl_801D3E98 = .sbss:0x801D3E98; // type:object size:0x8
lbl_801D3EA0 = .sbss:0x801D3EA0; // type:object size:0x8
lbl_801D3EA8 = .sbss:0x801D3EA8; // type:object size:0x2 data:2byte
lbl_801D3EAA = .sbss:0x801D3EAA; // type:object size:0x1 data:byte
lbl_801D3EAC = .sbss:0x801D3EAC; // type:object size:0x4
lbl_801D3EB0 = .sbss:0x801D3EB0; // type:object size:0x4 data:4byte
lbl_801D3EB4 = .sbss:0x801D3EB4; // type:object size:0x4 data:4byte
curSlotNo = .sbss:0x801D3EA8; // type:object size:0x2 data:2byte
curBoxNo = .sbss:0x801D3EAA; // type:object size:0x1 data:byte
saveExecF = .sbss:0x801D3EAC; // type:object size:0x4
SLSerialNo = .sbss:0x801D3EB0; // type:object size:0x8 data:4byte
H_ResetReady = .sbss:0x801D3EB8; // type:object size:0x4 scope:local data:4byte
SR_RestartChk = .sbss:0x801D3EBC; // type:object size:0x4 scope:local data:4byte
SR_ExecReset = .sbss:0x801D3EC0; // type:object size:0x4 data:4byte

2
configure.py
View file

@ -244,7 +244,7 @@ config.libs = [
Object(Matching, "game/printfunc.c"),
Object(Matching, "game/process.c"),
Object(Matching, "game/sprman.c"),
Object(NonMatching, "game/sprput.c"),
Object(Matching, "game/sprput.c"),
Object(NonMatching, "game/hsfload.c"),
Object(NonMatching, "game/hsfdraw.c"),
Object(NonMatching, "game/hsfman.c"),

2
include/common_structs.h
View file

@ -159,7 +159,7 @@ typedef struct om_obj_data {
void *data;
} omObjData;
typedef struct anim_time_data {
typedef struct anim_frame_data {
s16 pat;
s16 time;
s16 shiftX;

6
include/dolphin/gx/GXBump.h
View file

@ -21,6 +21,12 @@ void GXSetTevIndirect(GXTevStageID tev_stage, GXIndTexStageID ind_stage, GXIndTe
GXIndTexAlphaSel alpha_sel);
void GXSetTevIndWarp(GXTevStageID tev_stage, GXIndTexStageID ind_stage, GXBool signed_offsets,
GXBool replace_mode, GXIndTexMtxID matrix_sel);
void GXSetTevIndTile (GXTevStageID tev_stage, GXIndTexStageID ind_stage,
u16 tilesize_s, u16 tilesize_t,
u16 tilespacing_s, u16 tilespacing_t,
GXIndTexFormat format, GXIndTexMtxID matrix_sel,
GXIndTexBiasSel bias_sel, GXIndTexAlphaSel alpha_sel);
void GXSetIndTexCoordScale(GXIndTexStageID ind_state, GXIndTexScale scale_s, GXIndTexScale scale_t);
#ifdef __cplusplus

1
include/dolphin/gx/GXTexture.h
View file

@ -30,6 +30,7 @@ void GXInitTexCacheRegion(GXTexRegion* region, GXBool is_32b_mipmap, u32 tmem_ev
GXTexRegionCallback GXSetTexRegionCallback(GXTexRegionCallback callback);
void GXInvalidateTexRegion(const GXTexRegion* region);
void GXSetTexCoordScaleManually(GXTexCoordID coord, GXBool enable, u16 ss, u16 ts);
#ifdef __cplusplus
}
#endif

176
src/game/sprput.c Normal file
View file

@ -0,0 +1,176 @@
#include "common.h"
#include "dolphin/mtx.h"
#include "dolphin/gx.h"
#include "dolphin/vi.h"
static void *bmpNoCC[8];
static s16 HuSprLayerDrawNo[8];
static s16 bmpCCIdx;
void HuSprTexLoad(AnimData *anim, short bmp, short slot, GXTexWrapMode wrap_s, GXTexWrapMode wrap_t, GXTexFilter filter);
void mtxTransCat(Mtx matrix, float x, float y, float z);
void HuSprDispInit(void)
{
Mtx44 proj;
s16 i;
for(i=0; i<8; i++) {
bmpNoCC[i] = NULL;
}
bmpCCIdx = 0;
GXInvalidateTexAll();
MTXOrtho(proj, 0, 480, 0, 576, 0, 10);
GXSetProjection(proj, GX_ORTHOGRAPHIC);
if(RenderMode->field_rendering) {
GXSetViewportJitter(0, 0, 640, 480, 0, 1, VIGetNextField());
} else {
GXSetViewport(0, 0, 640, 480, 0, 1);
}
GXSetScissor(0, 0, 640, 480);
GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
GXSetCullMode(GX_CULL_NONE);
GXSetZMode(GX_FALSE, GX_ALWAYS, GX_FALSE);
}
void HuSprDisp(SpriteData *sprite)
{
s16 i;
AnimData *anim = sprite->data;
AnimPatData *pat = sprite->pat_data;
Vec axis = {0, 0, 1};
Mtx modelview, rot;
GXSetScissor(sprite->scissor_x, sprite->scissor_y, sprite->scissor_w, sprite->scissor_h);
if(sprite->attr & 0x10) {
if(sprite->func) {
void (*func)(SpriteData *);
func = sprite->func;
func(sprite);
}
HuSprDispInit();
} else {
AnimLayerData *layer;
AnimBmpData *bg_bmp;
s16 color_sum;
GXColor color;
GXSetNumTexGens(1);
GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY);
color.r = color.g = color.b = color.a = 255;
GXSetChanAmbColor(GX_COLOR0A0, color);
GXSetChanMatColor(GX_COLOR0A0, color);
color.r = sprite->r;
color.g = sprite->g;
color.b = sprite->b;
color.a = sprite->a;
color_sum = color.r+color.g+color.b+color.a;
GXSetTevOrder(GX_TEVSTAGE1, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0);
GXSetTevColorIn(GX_TEVSTAGE1, GX_CC_ZERO, GX_CC_C0, GX_CC_CPREV, GX_CC_ZERO);
GXSetTevColorOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
GXSetTevAlphaIn(GX_TEVSTAGE1, GX_CA_ZERO, GX_CA_APREV, GX_CA_A0, GX_CA_ZERO);
GXSetTevAlphaOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
GXSetTevOp(GX_TEVSTAGE0, GX_MODULATE);
GXSetNumChans(1);
GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_REG, GX_LIGHT0, GX_DF_CLAMP, GX_AF_SPOT);
if(sprite->attr & 0x80) {
GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_ONE, GX_LO_NOOP);
} else if(sprite->attr & 0x100) {
GXSetBlendMode(GX_BM_BLEND, GX_BL_ZERO, GX_BL_INVDSTCLR, GX_LO_NOOP);
} else {
GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP);
}
if(sprite->bg) {
AnimFrameData *bg_frame = sprite->bg->bank[sprite->bg_bank].frame;
AnimPatData *bg_pat = &sprite->bg->pat[bg_frame->pat];
layer = bg_pat->layer;
bg_bmp = &sprite->bg->bmp[layer->bmpNo];
HuSprTexLoad(sprite->bg, layer->bmpNo, 1, GX_CLAMP, GX_CLAMP, GX_NEAR);
GXSetNumIndStages(1);
GXSetTexCoordScaleManually(GX_TEXCOORD0, GX_TRUE, bg_bmp->sizeX*16, bg_bmp->sizeY*16);
GXSetIndTexOrder(GX_INDTEXSTAGE0, GX_TEXCOORD0, GX_TEXMAP1);
GXSetIndTexCoordScale(GX_INDTEXSTAGE0, GX_ITS_16, GX_ITS_16);
GXSetTevIndTile(GX_TEVSTAGE0, GX_INDTEXSTAGE0, 16, 16, 16, 16, GX_ITF_4, GX_ITM_0, GX_ITB_NONE, GX_ITBA_OFF);
}
GXSetAlphaCompare(GX_GEQUAL, 1, GX_AOP_AND, GX_GEQUAL, 1);
GXSetZCompLoc(GX_FALSE);
if(0 != sprite->z_rot) {
MTXRotAxisDeg(rot, &axis, sprite->z_rot);
MTXScale(modelview, sprite->scale_x, sprite->scale_y, 1.0f);
MTXConcat(rot, modelview, modelview);
} else {
MTXScale(modelview, sprite->scale_x, sprite->scale_y, 1.0f);
}
mtxTransCat(modelview, sprite->x, sprite->y, 0);
MTXConcat(*sprite->group_mtx, modelview, modelview);
GXLoadPosMtxImm(modelview, GX_PNMTX0);
for(i=pat->layerNum-1; i>=0; i--) {
float pos[4][2];
float texcoord_x1, texcoord_y1, texcoord_x2, texcoord_y2;
AnimBmpData *bmp;
layer = &pat->layer[i];
bmp = &anim->bmp[layer->bmpNo];
if(!bmp) {
continue;
}
GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0);
HuSprTexLoad(anim, layer->bmpNo, 0, sprite->wrap_s, sprite->wrap_t, (sprite->attr & 0x8) ? 1 : 0);
if(layer->alpha != 0xFF || color_sum != 1020) {
color.a = (u16)(sprite->a*layer->alpha) >> 8;
GXSetTevColor(GX_TEVSTAGE1, color);
GXSetNumTevStages(2);
} else {
GXSetNumTevStages(1);
}
if(!sprite->bg) {
pos[0][0] = layer->vtx[0]-pat->centerX;
pos[0][1] = layer->vtx[1]-pat->centerY;
pos[1][0] = layer->vtx[2]-pat->centerX;
pos[1][1] = layer->vtx[3]-pat->centerY;
pos[2][0] = layer->vtx[4]-pat->centerX;
pos[2][1] = layer->vtx[5]-pat->centerY;
pos[3][0] = layer->vtx[6]-pat->centerX;
pos[3][1] = layer->vtx[7]-pat->centerY;
if(layer->flip & 0x1) {
texcoord_x2 = layer->startX/(float)bmp->sizeX;
texcoord_x1 = (layer->startX+layer->sizeX)/(float)bmp->sizeX;
} else {
texcoord_x1 = layer->startX/(float)bmp->sizeX;
texcoord_x2 = (layer->startX+layer->sizeX)/(float)bmp->sizeX;
}
if(layer->flip & 0x2) {
texcoord_y2 = layer->startY/(float)bmp->sizeY;
texcoord_y1 = (layer->startY+layer->sizeY)/(float)bmp->sizeY;
} else {
texcoord_y1 = layer->startY/(float)bmp->sizeY;
texcoord_y2 = (layer->startY+layer->sizeY)/(float)bmp->sizeY;
}
} else {
pos[0][0] = pos[3][0] = -(bg_bmp->sizeX*16)/2;
pos[0][1] = pos[1][1] = -(bg_bmp->sizeY*16)/2;
pos[2][0] = pos[1][0] = pos[0][0]+(bg_bmp->sizeX*16);
pos[2][1] = pos[3][1] = pos[0][1]+(bg_bmp->sizeY*16);
texcoord_x1 = texcoord_y1 = 1.0/(bg_bmp->sizeX*16);
texcoord_x2 = texcoord_y2 = 1.0f;
}
GXBegin(GX_QUADS, GX_VTXFMT0, 4);
GXPosition3f32(pos[0][0], pos[0][1], 0);
GXTexCoord2f32(texcoord_x1*sprite->tex_scale_x, texcoord_y1*sprite->tex_scale_y);
GXPosition3f32(pos[1][0], pos[1][1], 0);
GXTexCoord2f32(texcoord_x2*sprite->tex_scale_x, texcoord_y1*sprite->tex_scale_y);
GXPosition3f32(pos[2][0], pos[2][1], 0);
GXTexCoord2f32(texcoord_x2*sprite->tex_scale_x, texcoord_y2*sprite->tex_scale_y);
GXPosition3f32(pos[3][0], pos[3][1], 0);
GXTexCoord2f32(texcoord_x1*sprite->tex_scale_x, texcoord_y2*sprite->tex_scale_y);
GXEnd();
}
if(sprite->bg) {
GXSetNumIndStages(0);
GXSetTevDirect(GX_TEVSTAGE0);
GXSetTexCoordScaleManually(GX_TEXCOORD0, GX_FALSE, 0, 0);
}
}
}