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

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;

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;