diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-07-13 11:15:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-13 14:15:12 -0400 |
| commit | 803ff1fb1593cdc0c62d14882973af04dc0f988e (patch) | |
| tree | 4cdaed8886c36b6c2fb081d5968019c9d11d42c8 /src/code | |
| parent | 1a003f946034b392050c1aeccb777b3a2a0ed633 (diff) | |
Another General Cleanup (#1651)
* add z64player.h include to z_player.c
* NULL check in func_80AEE374
* Couple formating things
* parameter R_PICTO_PHOTO_STATE
* Remove COLPOLY_NORMAL_FRAC
* DynaPolyActor_Init transformFlags
* Float in ObjDriftice_Init
* aspMainStack
* Add gbi defines to m2ctx
* Add GBI_DEFINES to COMMON_DEFINES in makefile instead of duplicating it
* Add version to build include for m2ctx
* Invadepoh includes
* Sort calc_bss includes like makefile
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_bgcheck.c | 4 | ||||
| -rw-r--r-- | src/code/z_parameter.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index 060954255..1b3c11ed6 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -413,8 +413,8 @@ s32 CollisionPoly_LineVsPoly(BgLineVsPolyTest* a0) { dpA += a0->poly->normal.z * a0->posA->z; dpB += a0->poly->normal.z * a0->posB->z; - dpA *= COLPOLY_NORMAL_FRAC; - dpB *= COLPOLY_NORMAL_FRAC; + dpA = COLPOLY_GET_NORMAL(dpA); + dpB = COLPOLY_GET_NORMAL(dpB); planeDistA += dpA; planeDistB += dpB; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 6002bc5c4..674e7e2e0 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -2368,7 +2368,7 @@ void Interface_UpdateButtonsPart1(PlayState* play) { if (!CHECK_EVENTINF(EVENTINF_41) || (CHECK_EVENTINF(EVENTINF_41) && (CutsceneManager_GetCurrentCsId() == CS_ID_NONE))) { Audio_PlaySfx(NA_SE_SY_CAMERA_SHUTTER); - SREG(89) = 1; + R_PICTO_PHOTO_STATE = PICTO_PHOTO_STATE_SETUP; play->haltAllActors = true; sPictoState = PICTO_BOX_STATE_SETUP_PHOTO; sPictoPhotoBeingTaken = true; |