diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-01-14 15:03:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-15 10:03:13 +1100 |
| commit | 6412ddad50c687b007127f67e92382ec54611270 (patch) | |
| tree | b60cf30bf5c15b0c1a8a7259279901bc8de65ea8 /src/code/z_player_lib.c | |
| parent | 663834cbc087ab7bbc9b20b48d6f06eaae4d4341 (diff) | |
General Cleanup (#1529)
* Cleanup
* vi define cleanup
* kdebugserver
* osmotor
* Remove sqrtf.c
* Move osFlash out of libultra
* PadUtils_Destroy
* BOOT_ADDRESS_ULTRA
* Fault
* Format
* viconfig.h
* More small cleanups
* gfx cleanup
* Format
* Forgot to save
* variables.h
* dListTable -> dListSides
* Fix header includes
Diffstat (limited to 'src/code/z_player_lib.c')
| -rw-r--r-- | src/code/z_player_lib.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 07b772c79..0fa14dc1a 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -1979,7 +1979,7 @@ void func_8012536C(void) { void Player_DrawZoraShield(PlayState* play, Player* player) { u8* phi_a0; Vtx* vtx; - Gfx* dList; + Gfx* gfx; f32 scale = player->unk_B62 * (10.0f / 51.0f); s32 i; @@ -2000,12 +2000,12 @@ void Player_DrawZoraShield(PlayState* play, Player* player) { phi_a0++; } - dList = POLY_XLU_DISP; + gfx = POLY_XLU_DISP; - gSPMatrix(&dList[0], Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(&dList[1], object_link_zora_DL_011760); + gSPMatrix(&gfx[0], Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(&gfx[1], object_link_zora_DL_011760); - POLY_XLU_DISP = &dList[2]; + POLY_XLU_DISP = &gfx[2]; CLOSE_DISPS(play->state.gfxCtx); } @@ -3263,7 +3263,7 @@ void Player_DrawGreatFairysMask(PlayState* play, Player* player) { CLOSE_DISPS(play->state.gfxCtx); } -s32 func_80128640(PlayState* play, Player* player, Gfx* dlist) { +s32 func_80128640(PlayState* play, Player* player, Gfx* dList) { s32 temp_v1 = player->skelAnime.animation == &gPlayerAnim_cl_maskoff; f32 temp_f0; @@ -3334,7 +3334,7 @@ s32 func_80128640(PlayState* play, Player* player, Gfx* dlist) { Matrix_Pop(); CLOSE_DISPS(play->state.gfxCtx); - } else if (dlist == object_link_zora_DL_00E2A0) { // zora guitar + } else if (dList == object_link_zora_DL_00E2A0) { // zora guitar s16 sp26 = Math_SinS(player->unk_B86[0]) * (ABS_ALT(player->upperLimbRot.x) * ((f32)(IREG(52) + 20)) / 100.0f); s16 sp24 = Math_SinS(player->unk_B86[1]) * (ABS_ALT(player->upperLimbRot.y) * ((f32)(IREG(53) + 15)) / 100.0f); |