mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-13 04:39:36 +00:00
Code Issues Projects Releases Wiki Activity

Match retail z_fbdemo.c and z_fbdemo_fade.c (#1727)

Browse source 
* Match retail z_fbdemo.c and z_fbdemo_fade.c

* Tweak macro arguments
This commit is contained in:
cadmic 2024-02-06 21:32:23 -08:00 committed by GitHub
parent 2ee7a2b7ff
commit 300b3a8ffd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/code/z_fbdemo.c
View file

@ -40,6 +40,22 @@ Gfx sTransTileSetupDL[] = {
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
#define SET_VERTEX(vtx, x, y, z, s, t, nx, ny, nz, alpha) \
{ \
Vtx_tn* vtxn = &(vtx)->n; \
vtxn->ob[0] = (x); \
vtxn->ob[1] = (y); \
vtxn->ob[2] = (z); \
vtxn->flag = 0; \
vtxn->tc[0] = (s); \
vtxn->tc[1] = (t); \
vtxn->n[0] = (nx); \
vtxn->n[1] = (ny); \
vtxn->n[2] = (nz); \
vtxn->a = (alpha); \
} \
(void)0
void TransitionTile_InitGraphics(TransitionTile* this) { void TransitionTile_InitGraphics(TransitionTile* this) {
s32 frame; s32 frame;
s32 col; s32 col;
@ -61,20 +77,7 @@ void TransitionTile_InitGraphics(TransitionTile* this) {
for (row = 0; row < this->rows + 1; row++) { for (row = 0; row < this->rows + 1; row++) {
colTex = 0; colTex = 0;
for (col = 0; col < this->cols + 1; col++) { for (col = 0; col < this->cols + 1; col++) {
Vtx_tn* vtxn = &vtx->n; SET_VERTEX(vtx++, col * 0x20, row * 0x20, -5, colTex << 6, rowTex << 6, 0, 0, 120, 255);
vtx++;
vtxn->tc[0] = colTex << 6;
vtxn->ob[0] = col * 0x20;
vtxn->ob[1] = row * 0x20;
vtxn->ob[2] = -5;
vtxn->flag = 0;
vtxn->tc[1] = rowTex << 6;
vtxn->n[0] = 0;
vtxn->n[1] = 0;
vtxn->n[2] = 120;
vtxn->a = 255;
colTex += 0x20; colTex += 0x20;
} }

2
src/code/z_fbdemo_fade.c
View file

@ -62,7 +62,7 @@ void TransitionFade_Update(void* thisx, s32 updateRate) {
break; break;
case TRANS_FADE_TYPE_ONE_WAY: case TRANS_FADE_TYPE_ONE_WAY:
this->timer += updateRate; ((TransitionFade*)thisx)->timer += updateRate;
if (this->timer >= gSaveContext.transFadeDuration) { if (this->timer >= gSaveContext.transFadeDuration) {
this->timer = gSaveContext.transFadeDuration; this->timer = gSaveContext.transFadeDuration;
this->isDone = true; this->isDone = true;