mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-30 02:42:04 +00:00
Code Issues Projects Releases Wiki Activity

[ntsc-1.2] Match a bunch of small stuff (#2094)

Browse source 
* Match z_fbdemo_wipe1.c

* Fix gDPSetTileCustom

* Match z_eff_ss_dead.c

* Match src/code/audio_thread_manager.c

* Match z_parameter.c

* Match KaleidoScope_DrawWorldMap

* Format

* 1 -> AUDIOMGR_DEBUG_LEVEL_NO_RSP

* Actually match KaleidoScope_DrawWorldMap

* Add comment on duplicate code

* Revert "Fix gDPSetTileCustom"

This reverts commit de09338d92.
This commit is contained in:
cadmic 2024-08-27 00:33:20 -07:00 • committed by GitHub
parent c00991da29
commit d2aca2239f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 79 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/code/z_fbdemo_wipe1.c
View file

@ -88,7 +88,8 @@ void TransitionWipe_Draw(void* thisx, Gfx** gfxP) {
Gfx* gfx = *gfxP;
Mtx* modelView;
TransitionWipe* this = (TransitionWipe*)thisx;
s32 pad[4];
Color_RGBA8_u32* color;
s32 pad[3];
Gfx* texScroll;
modelView = this->modelView[this->frame];
@ -97,10 +98,15 @@ void TransitionWipe_Draw(void* thisx, Gfx** gfxP) {
guScale(&modelView[0], 0.56f, 0.56f, 1.0f);
guRotate(&modelView[1], 0.0f, 0.0f, 0.0f, 1.0f);
guTranslate(&modelView[2], 0.0f, 0.0f, 0.0f);
gDPPipeSync(gfx++);
texScroll = Gfx_BranchTexScroll(&gfx, this->texX, this->texY, 0, 0);
gSPSegment(gfx++, 8, texScroll);
gDPSetPrimColor(gfx++, 0, 0x80, this->color.r, this->color.g, this->color.b, 255);
color = &this->color;
gDPSetPrimColor(gfx++, 0, 0x80, color->r, color->g, color->b, 255);
gSPMatrix(gfx++, &this->projection, G_MTX_LOAD | G_MTX_PROJECTION);
gSPPerspNormalize(gfx++, this->normal);
gSPMatrix(gfx++, &this->lookAt, G_MTX_MUL | G_MTX_PROJECTION);