Merge branch 'master' into master

src/actor/ac_airplane.c

@@ -71,9 +71,9 @@ static void Airplane_Actor_draw(ACTOR* actor, GAME* game) {
         GRAPH* g = game->graph;
 
         _texture_z_light_fog_prim(g);
-        Matrix_RotateX(RAD2SHORTANGLE(DEG2RAD(airplane->rotX)), 1);
-        Matrix_RotateZ(RAD2SHORTANGLE(DEG2RAD(airplane->rotZ)), 1);
-        Matrix_scale(50.0f, 50.0f, 50.0f, 1);
+        Matrix_RotateX(RAD2SHORTANGLE(DEG2RAD(airplane->rotX)), MTX_MULT);
+        Matrix_RotateZ(RAD2SHORTANGLE(DEG2RAD(airplane->rotZ)), MTX_MULT);
+        Matrix_scale(50.0f, 50.0f, 50.0f, MTX_MULT);
 
         OPEN_DISP(g);
         gSPMatrix(NOW_POLY_OPA_DISP++, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);

src/actor/ac_animal_logo.c

@@ -110,8 +110,8 @@ static void aAL_actor_dt(ACTOR* actor, GAME* game) {
     Common_Set(clip.animal_logo_clip, NULL);
   }
 
-  if (mEv_CheckTitleDemo() != -1) {
-    mEv_SetTitleDemo(0);
+  if (mEv_CheckTitleDemo() != mEv_TITLEDEMO_LOGO) {
+    mEv_SetTitleDemo(mEv_TITLEDEMO_NONE);
   }
 
   cKF_SkeletonInfo_R_dt(&logo_actor->animal.skeleton);
@@ -431,8 +431,8 @@ static void aAL_tm_draw(GRAPH* graph) {
   Gfx* gfx;
 
   Matrix_push();
-  Matrix_translate(1530.0f, 690.0f, 0.0f, 1);
-  Matrix_scale(0.162082675f, 0.162082675f, 0.162082675f, 1);
+  Matrix_translate(1530.0f, 690.0f, 0.0f, MTX_MULT);
+  Matrix_scale(0.162082675f, 0.162082675f, 0.162082675f, MTX_MULT);
 
   OPEN_DISP(graph);
 
@@ -459,8 +459,8 @@ static void aAL_back_draw(GRAPH* graph, ANIMAL_LOGO_ACTOR* actor) {
   Gfx* gfx;
 
   Matrix_push();
-  Matrix_translate(0.0f, 730.0f, 0.0f, 1);
-  Matrix_scale(0.135f, 0.135f, 0.135f, 1);
+  Matrix_translate(0.0f, 730.0f, 0.0f, MTX_MULT);
+  Matrix_scale(0.135f, 0.135f, 0.135f, MTX_MULT);
 
   OPEN_DISP(graph);
 
@@ -577,8 +577,8 @@ static void aAL_title_draw(GAME* game, ANIMAL_LOGO_ACTOR* actor) {
   GRAPH* graph = game->graph;
 
   Matrix_push();
-  Matrix_translate(0.0f, 730.0f, 0.0f, 1);
-  Matrix_scale(0.135f, 0.135f, 0.135f, 1);
+  Matrix_translate(0.0f, 730.0f, 0.0f, MTX_MULT);
+  Matrix_scale(0.135f, 0.135f, 0.135f, MTX_MULT);
 
   OPEN_DISP(graph);
 

src/actor/ac_arrange_room.c

@@ -120,8 +120,8 @@ static void aAR_DrawFloor(ACTOR* actor, GAME* game) {
 
     graph = game->graph;
 
-    Matrix_translate(0.0f, 0.0f, 0.0f, 0);
-    Matrix_scale(0.0625f, 0.0625f, 0.0625f, 1);
+    Matrix_translate(0.0f, 0.0f, 0.0f, MTX_LOAD);
+    Matrix_scale(0.0625f, 0.0625f, 0.0625f, MTX_MULT);
 
     OPEN_DISP(graph);
 
@@ -147,8 +147,8 @@ static void aAR_DrawWall(ACTOR* actor, GAME* game) {
 
     graph = game->graph;
 
-    Matrix_translate(0.0f, 0.0f, 0.0f, 0);
-    Matrix_scale(0.0625f, 0.0625f, 0.0625f, 1);
+    Matrix_translate(0.0f, 0.0f, 0.0f, MTX_LOAD);
+    Matrix_scale(0.0625f, 0.0625f, 0.0625f, MTX_MULT);
 
     OPEN_DISP(graph);
 

src/actor/ac_ball.c

@@ -768,8 +768,8 @@ static void aBALL_actor_draw(ACTOR* actor, GAME* game) {
 
     OPEN_DISP(graph);
     gfx = NOW_POLY_OPA_DISP;
-    Matrix_translate(0.0f, ball->ball_y, 0.0f, 1);
-    Matrix_rotateXYZ(ball->angle.x, ball->angle.y, ball->angle.z, 1);
+    Matrix_translate(0.0f, ball->ball_y, 0.0f, MTX_MULT);
+    Matrix_rotateXYZ(ball->angle.x, ball->angle.y, ball->angle.z, MTX_MULT);
     gDPPipeSync(gfx++);
     gSPMatrix(gfx++, _Matrix_to_Mtx_new(graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(gfx++, ball_model_tbl[ball->type]);

src/actor/ac_balloon.c

@@ -195,12 +195,12 @@ static void Ac_Balloon_draw_normal(ACTOR* actorx, GAME* game) {
     Matrix_push();
     angle_x = actorx->shape_info.rotation.x - DEG2SHORT_ANGLE2(90.0f);
     angle_y = actorx->shape_info.rotation.y;
-    Matrix_translate(pos->x, pos->y, pos->z, 0);
-    Matrix_RotateY(angle_y, 1);
-    Matrix_RotateX(angle_x, 1);
-    Matrix_RotateZ(DEG2SHORT_ANGLE2(90.0f), 1);
-    Matrix_RotateX(balloon->lean, 1);
-    Matrix_scale(actorx->scale.x, actorx->scale.y, actorx->scale.z, 1);
+    Matrix_translate(pos->x, pos->y, pos->z, MTX_LOAD);
+    Matrix_RotateY(angle_y, MTX_MULT);
+    Matrix_RotateX(angle_x, MTX_MULT);
+    Matrix_RotateZ(DEG2SHORT_ANGLE2(90.0f), MTX_MULT);
+    Matrix_RotateX(balloon->lean, MTX_MULT);
+    Matrix_scale(actorx->scale.x, actorx->scale.y, actorx->scale.z, MTX_MULT);
 
     OPEN_POLY_OPA_DISP(graph);
 

src/actor/ac_boat.c

@@ -150,9 +150,9 @@ static int aBT_actor_draw_before(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int
   switch (joint_idx) {
     case 3:
     {
-      Matrix_translate(boat_actor->actor_class.world.position.x, boat_actor->actor_class.world.position.y, boat_actor->actor_class.world.position.z, 0);
-      Matrix_RotateY(boat_actor->actor_class.shape_info.rotation.y, 1);
-      Matrix_scale(boat_actor->actor_class.scale.x, boat_actor->actor_class.scale.y, boat_actor->actor_class.scale.z, 1);
+      Matrix_translate(boat_actor->actor_class.world.position.x, boat_actor->actor_class.world.position.y, boat_actor->actor_class.world.position.z, MTX_LOAD);
+      Matrix_RotateY(boat_actor->actor_class.shape_info.rotation.y, MTX_MULT);
+      Matrix_scale(boat_actor->actor_class.scale.x, boat_actor->actor_class.scale.y, boat_actor->actor_class.scale.z, MTX_MULT);
       break;
     }
 

src/actor/ac_count02_draw.c_inc

@@ -3,7 +3,7 @@ static int aCOU_actor_draw_before(GAME* game, cKF_SkeletonInfo_R_c* keyframe, in
     STRUCTURE_ACTOR* actor = (STRUCTURE_ACTOR*)arg;
 
     if (joint_idx == 2 && (int)actor->arg0_f != 0) {
-        Matrix_RotateZ((s16)actor->arg1_f << 12, TRUE);
+        Matrix_RotateZ((s16)actor->arg1_f << 12, MTX_MULT);
     }
 
     return TRUE;
@@ -67,7 +67,7 @@ static void aCOU_actor_draw(ACTOR* actorx, GAME* game) {
         gSPSegment(POLY_OPA_DISP++, ANIME_1_TXT_SEG, textbl[digit0]);
         gSPSegment(POLY_OPA_DISP++, ANIME_2_TXT_SEG, textbl[digit1]);
 
-        Matrix_translate(100.0f * xpos_tbl[i], 0.0f, 0.0f, 1);
+        Matrix_translate(100.0f * xpos_tbl[i], 0.0f, 0.0f, MTX_MULT);
 
         CLOSE_POLY_OPA_DISP(graph);
 

src/actor/ac_douzou_draw.c_inc

@@ -34,7 +34,7 @@ static int aDOU_actor_draw_before(GAME* game, cKF_SkeletonInfo_R_c* keyframe, in
 
   if (joint_idx == 2) {
     f32 scale = scltbl[color];
-    Matrix_scale(scale, scale, scale, 1);
+    Matrix_scale(scale, scale, scale, MTX_MULT);
   }
 
   /* Decide which sex of model to draw (keyframes [2, 4] are male, [5, 7] are female) */
@@ -122,7 +122,7 @@ static void aDOU_actor_draw(ACTOR* actor, GAME* game) {
         gSPSegment(gfx++, G_MWO_SEGMENT_8, eye_tbl[eye_type]);
         gSPSegment(gfx++, G_MWO_SEGMENT_9, mouth_tbl[mouth_type]);
 
-        Matrix_translate(xpostbl[i] * 100.0f, 0.0f, zpostbl[i] * 100.0f, 1);
+        Matrix_translate(xpostbl[i] * 100.0f, 0.0f, zpostbl[i] * 100.0f, MTX_MULT);
 
         SET_POLY_OPA_DISP(gfx);
         CLOSE_DISP(graph);

src/actor/ac_douzou_move.c_inc

@@ -18,7 +18,7 @@ static int aDOU_set_check(int house_no) {
     Private_c* priv = Save_GetPointer(private_data[player_no]);
     mHm_hs_c* house = Save_GetPointer(homes[house_no]);
 
-    if (mEv_CheckTitleDemo() != 0 && mEv_CheckTitleDemo() != -1 && mEv_CheckTitleDemo() != -9) {
+    if (mEv_CheckTitleDemo() != mEv_TITLEDEMO_NONE && mEv_CheckTitleDemo() != mEv_TITLEDEMO_LOGO && mEv_CheckTitleDemo() != mEv_TITLEDEMO_STAFFROLL) {
         return FALSE;
     } else if (mLd_PlayerManKindCheckNo(player_no) || mPr_CheckPrivate(priv) == FALSE) {
         return FALSE;
@@ -91,7 +91,7 @@ static int aDOU_setEffect_sub(ACTOR* actor, GAME* game, int house_no, int color)
     xyz_t_move(&wpos, &actor->world.position);
     wpos.x += xpostbl[house_no];
     wpos.z += zpostbl[house_no];
-    Matrix_translate(wpos.x, wpos.y, wpos.z, 0);
+    Matrix_translate(wpos.x, wpos.y, wpos.z, MTX_LOAD);
 
     /* Initialize effect offset */
     xyz_t_move(&ofs, &offset_tbl[color]);

src/actor/ac_dump.c

@@ -174,7 +174,7 @@ static void aDUM_actor_draw(ACTOR* actor, GAME* game) {
     gfx = NOW_POLY_OPA_DISP;
     gSPSegment(gfx++, 0x8, pal);
 
-    Matrix_translate(-6000.0f, 0.0f, -10000.0f, 1);
+    Matrix_translate(-6000.0f, 0.0f,-10000.0f, MTX_MULT);
 
     cur = _Matrix_to_Mtx_new(graph);
 

src/actor/ac_effectbg.c

@@ -1025,8 +1025,8 @@ static void EffectBG_object_draw(EffectBg_c* efbg, GAME* game) {
 
     OPEN_DISP(game->graph);
 
-    Matrix_translate(efbg->base_pos.x, efbg->base_pos.y, efbg->base_pos.z, 0);
-    Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+    Matrix_translate(efbg->base_pos.x, efbg->base_pos.y, efbg->base_pos.z, MTX_LOAD);
+    Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
 
     if (efbg->timer < 70) {
         gDPSetRenderMode(NEXT_POLY_OPA_DISP, G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2);

src/actor/ac_fallSESW_draw.c_inc

@@ -23,7 +23,7 @@ void aFLEW_actor_draw(ACTOR* actor, GAME* game) {
     _texture_z_light_fog_prim_xlu(graph);
 
     if (isWest != FALSE) {
-        Matrix_mult(&flip_mtx, TRUE);
+        Matrix_mult(&flip_mtx, MTX_MULT);
     }
 
     OPEN_DISP(graph);
@@ -63,13 +63,13 @@ void aFLEW_actor_draw(ACTOR* actor, GAME* game) {
             angle =
                 RAD2SHORTANGLE(facos(base_vec_z.z * bboard.z + ((base_vec_z.x * bboard.x) + base_vec_z.y * bboard.y)));
 
-            Matrix_translate(actor->world.position.x, actor->world.position.y, actor->world.position.z, FALSE);
+            Matrix_translate(actor->world.position.x, actor->world.position.y, actor->world.position.z, MTX_LOAD);
             if (actor->npc_id == WATERFALL_WEST) {
-                Matrix_mult(&flip_mtx, TRUE);
+                Matrix_mult(&flip_mtx, MTX_MULT);
             }
-            Matrix_RotateVector(angle, &l, TRUE);
-            Matrix_RotateY(-0x2000, TRUE);
-            Matrix_scale(actor->scale.x, actor->scale.y, actor->scale.z, TRUE);
+            Matrix_RotateVector(angle, &l, MTX_MULT);
+            Matrix_RotateY(-0x2000, MTX_MULT);
+            Matrix_scale(actor->scale.x, actor->scale.y, actor->scale.z, MTX_MULT);
 
             gSPMatrix(gfx++, _Matrix_to_Mtx_new(graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gDPSetRenderMode(gfx++, G_RM_FOG_SHADE_A, G_RM_XLU_SURF2);
@@ -81,4 +81,4 @@ void aFLEW_actor_draw(ACTOR* actor, GAME* game) {
 
     NOW_POLY_XLU_DISP = gfx;
     CLOSE_DISP(graph);
-}
+}

src/actor/ac_fallS_draw.c_inc

@@ -44,9 +44,9 @@ void aFLS_actor_draw(ACTOR* actor, GAME* game) {
             xyz_t_mult_v(&l, 1.0f / vecLen);
             angle = facos(shape_norm_vec.z * bboard.z + ((shape_norm_vec.x * bboard.x) + shape_norm_vec.y * bboard.y));
 
-            Matrix_translate(actor->world.position.x, actor->world.position.y, actor->world.position.z, FALSE);
-            Matrix_RotateVector(RAD2SHORTANGLE(angle), &l, TRUE);
-            Matrix_scale(actor->scale.x, actor->scale.y, actor->scale.z, TRUE);
+            Matrix_translate(actor->world.position.x, actor->world.position.y, actor->world.position.z, MTX_LOAD);
+            Matrix_RotateVector(RAD2SHORTANGLE(angle), &l, MTX_MULT);
+            Matrix_scale(actor->scale.x, actor->scale.y, actor->scale.z, MTX_MULT);
 
             gSPMatrix(gfx++, _Matrix_to_Mtx_new(graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gDPSetRenderMode(gfx++, G_RM_FOG_SHADE_A, G_RM_XLU_SURF2);
@@ -58,4 +58,4 @@ void aFLS_actor_draw(ACTOR* actor, GAME* game) {
 
     NOW_POLY_XLU_DISP = gfx;
     CLOSE_DISP(graph);
-}
+}

src/actor/ac_field_draw.c

@@ -448,8 +448,8 @@ static void aFD_DrawBlock(aFD_block_c* block, ACTOR* actorx, GAME* game) {
     xlu_gfx = mFI_GetBGDisplayListRom_XLU(block->bx, block->bz);
     anime_data = mFI_GetBGTexAnimInfo(&anime_frame_count, block->bx, block->bz);
 
-    Matrix_translate(block->wpos.x, block->wpos.y, block->wpos.z, 0);
-    Matrix_scale(0.0625f, 0.0625f, 0.0625f, 1);
+    Matrix_translate(block->wpos.x, block->wpos.y, block->wpos.z, MTX_LOAD);
+    Matrix_scale(0.0625f, 0.0625f, 0.0625f, MTX_MULT);
     _texture_z_light_fog_prim_xlu(game->graph);
     _texture_z_light_fog_prim_bg(game->graph);
 

src/actor/ac_fuusen.c

@@ -560,11 +560,11 @@ static void aFSN_actor_draw(ACTOR* actorx, GAME* game) {
 
     if (fuusen->action != aFSN_ACTION_ESCAPE || fuusen->escape_timer == aFSN_ESCAPE_TIMER || (fuusen->action == aFSN_ACTION_ESCAPE && fuusen->count == 0)) {
       /* Draw present */
-      Matrix_translate(actorx->world.position.x, actorx->world.position.y, actorx->world.position.z, 0);
-      Matrix_scale(0.01f, 0.01f, 0.01f, 1);
-      Matrix_RotateX(actorx->shape_info.rotation.x, 1);
-      Matrix_RotateZ(actorx->shape_info.rotation.z, 1);
-      Matrix_RotateY(actorx->shape_info.rotation.y, 1);
+      Matrix_translate(actorx->world.position.x, actorx->world.position.y, actorx->world.position.z, MTX_LOAD);
+      Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
+      Matrix_RotateX(actorx->shape_info.rotation.x, MTX_MULT);
+      Matrix_RotateZ(actorx->shape_info.rotation.z, MTX_MULT);
+      Matrix_RotateY(actorx->shape_info.rotation.y, MTX_MULT);
       _texture_z_light_fog_prim(graph);
 
       OPEN_DISP(graph);

src/actor/ac_garagara.c

@@ -172,8 +172,8 @@ static void Garagara_Actor_draw(ACTOR* actorx, GAME* game) {
     xyz_t* pos = &actorx->world.position;
 
     _texture_z_light_fog_prim(game->graph);
-    Matrix_translate(pos->x, pos->y, pos->z, 0);
-    Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+    Matrix_translate(pos->x, pos->y, pos->z, MTX_LOAD);
+    Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
 
     OPEN_DISP(game->graph);
 

src/actor/ac_gyo_kage.c

@@ -221,10 +221,10 @@ static void aGYO_KAGE_actor_draw(ACTOR* actorx, GAME* game) {
     }
     gyo_kage->alpha = alpha;
 
-    Matrix_translate(actorx->world.position.x, actorx->world.position.y, actorx->world.position.z, 0);
-    Matrix_RotateX(angle_x, 1);
-    Matrix_RotateY(angle_y, 1);
-    Matrix_scale(actorx->scale.x * 0.4f, actorx->scale.y, actorx->scale.z, 1);
+    Matrix_translate(actorx->world.position.x, actorx->world.position.y, actorx->world.position.z, MTX_LOAD);
+    Matrix_RotateX(angle_x, MTX_MULT);
+    Matrix_RotateY(angle_y, MTX_MULT);
+    Matrix_scale(actorx->scale.x * 0.4f, actorx->scale.y, actorx->scale.z, MTX_MULT);
 
     OPEN_DISP(graph);
 

src/actor/ac_gyo_release.c

@@ -324,11 +324,11 @@ static void aGYR_actor_draw(ACTOR* actorx, GAME* game) {
 
     Matrix_push();
     _texture_z_light_fog_prim(graph);
-    Matrix_translate(actorx->world.position.x, actorx->world.position.y, actorx->world.position.z, 0);
-    Matrix_RotateX(-gyo_release->angle_xz, 1);
-    Matrix_RotateY(gyo_release->angle_y, 1);
-    Matrix_RotateZ(gyo_release->angle_xz, 1);
-    Matrix_scale(actorx->scale.x * 1.2f, actorx->scale.y, actorx->scale.z, 1);
+    Matrix_translate(actorx->world.position.x, actorx->world.position.y, actorx->world.position.z, MTX_LOAD);
+    Matrix_RotateX(-gyo_release->angle_xz, MTX_MULT);
+    Matrix_RotateY(gyo_release->angle_y, MTX_MULT);
+    Matrix_RotateZ(gyo_release->angle_xz, MTX_MULT);
+    Matrix_scale(actorx->scale.x * 1.2f, actorx->scale.y, actorx->scale.z, MTX_MULT);
 
     OPEN_DISP(graph);
 

src/actor/ac_gyoei_draw.c_inc

@@ -71,8 +71,8 @@ static void aGYO_actor_draw_fish(GRAPH* graph, aGYO_CTRL_ACTOR* ctrl, GAME* game
     int frame;
 
     Matrix_translate(((ACTOR*)ctrl)->world.position.x, ((ACTOR*)ctrl)->world.position.y - aGYO_hosei_y[ctrl->gyo_type],
-                     ((ACTOR*)ctrl)->world.position.z, 0);
-    Matrix_mult(&play->billboard_matrix, 1);
+                     ((ACTOR*)ctrl)->world.position.z, MTX_LOAD);
+    Matrix_mult(&play->billboard_matrix, MTX_MULT);
 
     if (ctrl->gyo_type < (aGYO_TYPE_WHALE + 1) && (ctrl->gyo_flags & 0x200) != 0) {
         int cnt;
@@ -114,10 +114,10 @@ static void aGYO_actor_draw_fish(GRAPH* graph, aGYO_CTRL_ACTOR* ctrl, GAME* game
         }
 
         ctrl->move_angle = DEG2SHORT_ANGLE2(13 * sin_s(ctrl->move_counter));
-        Matrix_RotateY(ctrl->move_angle, 1);
+        Matrix_RotateY(ctrl->move_angle, MTX_MULT);
     }
 
-    Matrix_scale(((ACTOR*)ctrl)->scale.x, ((ACTOR*)ctrl)->scale.y, ((ACTOR*)ctrl)->scale.z, 1);
+    Matrix_scale(((ACTOR*)ctrl)->scale.x, ((ACTOR*)ctrl)->scale.y, ((ACTOR*)ctrl)->scale.z, MTX_MULT);
 
     if ((ctrl->gyo_flags & 0x200) != 0 && ctrl->swork2 <= 0) {
         int cnt;
@@ -178,10 +178,10 @@ static void aGYO_actor_draw_gyoei(GRAPH* graph, aGYO_CTRL_ACTOR* ctrl, GAME* gam
     }
 
     Matrix_translate(((ACTOR*)ctrl)->world.position.x, ((ACTOR*)ctrl)->world.position.y,
-                     ((ACTOR*)ctrl)->world.position.z, 0);
-    Matrix_RotateX(angleX, 1);
-    Matrix_RotateY(angleY, 1);
-    Matrix_scale(((ACTOR*)ctrl)->scale.x * 0.4f, ((ACTOR*)ctrl)->scale.y, ((ACTOR*)ctrl)->scale.z, 1);
+                     ((ACTOR*)ctrl)->world.position.z, MTX_LOAD);
+    Matrix_RotateX(angleX, MTX_MULT);
+    Matrix_RotateY(angleY, MTX_MULT);
+    Matrix_scale(((ACTOR*)ctrl)->scale.x * 0.4f, ((ACTOR*)ctrl)->scale.y, ((ACTOR*)ctrl)->scale.z, MTX_MULT);
 
     OPEN_DISP(graph);
 

src/actor/ac_handOverItem_draw.c_inc

@@ -61,8 +61,8 @@ static void aHOI_actor_draw(ACTOR* actorx, GAME* game) {
     handOverItem->gyo_flag = FALSE;
   }
   else {
-    Matrix_RotateY(master->shape_info.rotation.y + DEG2SHORT_ANGLE(-90.0f), 0);
-    Matrix_translate(handOverItem->trans.x, handOverItem->trans.y, handOverItem->trans.z, 1);
+    Matrix_RotateY(master->shape_info.rotation.y + DEG2SHORT_ANGLE(-90.0f), MTX_LOAD);
+    Matrix_translate(handOverItem->trans.x, handOverItem->trans.y, handOverItem->trans.z, MTX_MULT);
     Matrix_Position_Zero(&why_is_this_here);
     Matrix_put(&handOverItem->tools_class.matrix_work);
     Matrix_Position_Zero(&chase_pos);
@@ -78,7 +78,7 @@ static void aHOI_actor_draw(ACTOR* actorx, GAME* game) {
       aHOI_chase_pos(actorx, &chase_pos);
     }
 
-    Matrix_translate(chase_pos.x, chase_pos.y, chase_pos.z, 0);
+    Matrix_translate(chase_pos.x, chase_pos.y, chase_pos.z, MTX_LOAD);
     _texture_z_light_fog_prim(graph);
 
     if (handOverItem->item_type == aHOI_ITEM_TYPE_FISH) {
@@ -87,7 +87,7 @@ static void aHOI_actor_draw(ACTOR* actorx, GAME* game) {
         handOverItem->gyo_flag = TRUE;
       }
 
-      Matrix_scale(scale, scale, scale, 1);
+      Matrix_scale(scale, scale, scale, MTX_MULT);
       OPEN_DISP(graph);
       gfx = NOW_POLY_OPA_DISP;
 
@@ -98,7 +98,7 @@ static void aHOI_actor_draw(ACTOR* actorx, GAME* game) {
       CLOSE_DISP(graph);
     }
     else {
-      Matrix_scale(scale, scale, scale, 1);
+      Matrix_scale(scale, scale, scale, MTX_MULT);
       OPEN_DISP(graph);
       gfx = NOW_POLY_OPA_DISP;
 

src/actor/ac_house_clock.c

@@ -274,9 +274,9 @@ static int aHC_DrawClockAfter(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int jo
 
         Matrix_Position(&ofs, &pos);
         Matrix_push();
-        Matrix_translate(pos.x, pos.y, pos.z, 0);
-        Matrix_RotateZ(DEG2SHORT_ANGLE2(90.0f) - Common_Get(time).rad_hour, 1);
-        Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+        Matrix_translate(pos.x, pos.y, pos.z, MTX_LOAD);
+        Matrix_RotateZ(DEG2SHORT_ANGLE2(90.0f) - Common_Get(time).rad_hour, MTX_MULT);
+        Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
         gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         Matrix_pull();
         gSPDisplayList(NEXT_POLY_OPA_DISP, aHC_draw_data[clock_num].short_model);
@@ -287,9 +287,9 @@ static int aHC_DrawClockAfter(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int jo
 
         Matrix_Position(&ofs, &pos);
         Matrix_push();
-        Matrix_translate(pos.x, pos.y, pos.z, 0);
-        Matrix_RotateZ(DEG2SHORT_ANGLE2(90.0f) - Common_Get(time).rad_min, 1);
-        Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+        Matrix_translate(pos.x, pos.y, pos.z, MTX_LOAD);
+        Matrix_RotateZ(DEG2SHORT_ANGLE2(90.0f) - Common_Get(time).rad_min, MTX_MULT);
+        Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
         gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         Matrix_pull();
         gSPDisplayList(NEXT_POLY_OPA_DISP, aHC_draw_data[clock_num].long_model);
@@ -308,8 +308,8 @@ static void aHC_DrawClock(ACTOR* actorx, GAME* game) {
     _texture_z_light_fog_prim(game->graph);
     OPEN_DISP(game->graph);
 
-    Matrix_translate(house_clock->clock.pos.x, house_clock->clock.pos.y, house_clock->clock.pos.z, 0);
-    Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+    Matrix_translate(house_clock->clock.pos.x, house_clock->clock.pos.y, house_clock->clock.pos.z, MTX_LOAD);
+    Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
 
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 

src/actor/ac_house_goki.c

@@ -439,10 +439,10 @@ static void aHG_actor_draw(ACTOR* actorx, GAME* game) {
     HOUSE_GOKI_ACTOR* goki = (HOUSE_GOKI_ACTOR*)actorx;
 
     Matrix_push();
-    Matrix_translate(actorx->world.position.x, actorx->world.position.y + 2.0f, actorx->world.position.z, 0);
-    Matrix_scale(actorx->scale.x, actorx->scale.y, actorx->scale.z, 1);
-    Matrix_RotateX(actorx->shape_info.rotation.x, 1);
-    Matrix_RotateY(actorx->shape_info.rotation.y, 1);
+    Matrix_translate(actorx->world.position.x, actorx->world.position.y + 2.0f, actorx->world.position.z, MTX_LOAD);
+    Matrix_scale(actorx->scale.x, actorx->scale.y, actorx->scale.z, MTX_MULT);
+    Matrix_RotateX(actorx->shape_info.rotation.x, MTX_MULT);
+    Matrix_RotateY(actorx->shape_info.rotation.y, MTX_MULT);
     _texture_z_light_fog_prim_xlu(graph);
 
     OPEN_POLY_XLU_DISP(graph);

src/actor/ac_insect_draw.c_inc

@@ -30,43 +30,43 @@ static void aINS_actor_draw_sub(GRAPH* graph, aINS_INSECT_ACTOR* insect, GAME* g
 
         Matrix_translate(insect->tools_actor.actor_class.world.position.x,
                          insect->tools_actor.actor_class.world.position.y + 2.0f,
-                         insect->tools_actor.actor_class.world.position.z, 0);
-        Matrix_RotateX(angleX, 1);
-        Matrix_RotateY(angleY, 1);
+                         insect->tools_actor.actor_class.world.position.z, MTX_LOAD);
+        Matrix_RotateX(angleX, MTX_MULT);
+        Matrix_RotateY(angleY, MTX_MULT);
     } else {
         Matrix_translate(insect->tools_actor.actor_class.world.position.x,
                          insect->tools_actor.actor_class.world.position.y + 2.0f,
-                         insect->tools_actor.actor_class.world.position.z, 0);
+                         insect->tools_actor.actor_class.world.position.z, MTX_LOAD);
 
         switch (insect->type) {
             case aINS_INSECT_TYPE_MOLE_CRICKET:
-                Matrix_RotateY(angleY, 1);
-                Matrix_RotateX(angleX, 1);
-                Matrix_RotateZ(insect->tools_actor.actor_class.shape_info.rotation.z, 1);
+                Matrix_RotateY(angleY, MTX_MULT);
+                Matrix_RotateX(angleX, MTX_MULT);
+                Matrix_RotateZ(insect->tools_actor.actor_class.shape_info.rotation.z, MTX_MULT);
                 break;
             case aINS_INSECT_TYPE_SPIDER:
                 switch (draw_type) {
                     case 2:
-                        Matrix_RotateX(angleX, 1);
-                        Matrix_RotateZ(insect->tools_actor.actor_class.shape_info.rotation.z, 1);
+                        Matrix_RotateX(angleX, MTX_MULT);
+                        Matrix_RotateZ(insect->tools_actor.actor_class.shape_info.rotation.z, MTX_MULT);
                         break;
                     default:
-                        Matrix_RotateX(angleX, 1);
-                        Matrix_RotateY(angleY, 1);
-                        Matrix_RotateZ(insect->tools_actor.actor_class.shape_info.rotation.z, 1);
+                        Matrix_RotateX(angleX, MTX_MULT);
+                        Matrix_RotateY(angleY, MTX_MULT);
+                        Matrix_RotateZ(insect->tools_actor.actor_class.shape_info.rotation.z, MTX_MULT);
                         break;
                 }
                 break;
             default:
-                Matrix_RotateX(angleX, 1);
-                Matrix_RotateY(angleY, 1);
-                Matrix_RotateZ(insect->tools_actor.actor_class.shape_info.rotation.z, 1);
+                Matrix_RotateX(angleX, MTX_MULT);
+                Matrix_RotateY(angleY, MTX_MULT);
+                Matrix_RotateZ(insect->tools_actor.actor_class.shape_info.rotation.z, MTX_MULT);
                 break;
         }
     }
 
     Matrix_scale(insect->tools_actor.actor_class.scale.x, insect->tools_actor.actor_class.scale.y,
-                 insect->tools_actor.actor_class.scale.z, 1);
+                 insect->tools_actor.actor_class.scale.z, MTX_MULT);
 
     OPEN_DISP(graph);
     gfx = NOW_POLY_XLU_DISP;

src/actor/ac_kamakura_indoor.c

@@ -111,8 +111,8 @@ static void aKI_DrawKamakuraIndoorBG(KAMAKURA_INDOOR_ACTOR* k_indoor, GAME* game
     
     OPEN_DISP(game->graph);
 
-    Matrix_translate(0.0f, 0.0f, 0.0f, 0);
-    Matrix_scale(0.0625f, 0.0625f, 0.0625f, 1);
+    Matrix_translate(0.0f, 0.0f, 0.0f, MTX_LOAD);
+    Matrix_scale(0.0625f, 0.0625f, 0.0625f, MTX_MULT);
 
     gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);

src/actor/ac_lighthouse_switch.c

@@ -239,9 +239,9 @@ static void aLS_PoleDraw(aLS_pole_c* pole, GAME* game) {
 
         OPEN_DISP(game->graph);
 
-        Matrix_translate(pole->pos.x, pole->pos.y, pole->pos.z, 0);
-        Matrix_RotateY(0, 1);
-        Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+        Matrix_translate(pole->pos.x, pole->pos.y, pole->pos.z, MTX_LOAD);
+        Matrix_RotateY(0, MTX_MULT);
+        Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
 
         gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPSegment(NEXT_POLY_OPA_DISP, ANIME_1_TXT_SEG, primcolor_gfx);
@@ -263,9 +263,9 @@ static void aLS_SwitchDraw(aLS_switch_c* sw, GAME* game) {
 
         OPEN_DISP(game->graph);
 
-        Matrix_translate(sw->pos.x, sw->pos.y, sw->pos.z, 0);
-        Matrix_RotateY(0, 1);
-        Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+        Matrix_translate(sw->pos.x, sw->pos.y, sw->pos.z, MTX_LOAD);
+        Matrix_RotateY(0, MTX_MULT);
+        Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
 
         gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPSegment(NEXT_POLY_OPA_DISP, ANIME_1_TXT_SEG, primcolor_gfx);

src/actor/ac_mbg.c

@@ -71,8 +71,8 @@ static void Mbg_Actor_draw(ACTOR* actorx, GAME* game) {
     OPEN_DISP(graph);
 
     _texture_z_light_fog_prim(graph);
-    Matrix_translate(pos.x, pos.y, pos.z, 0);
-    Matrix_RotateY(angle_y, 1);
+    Matrix_translate(pos.x, pos.y, pos.z, MTX_LOAD);
+    Matrix_RotateY(angle_y, MTX_MULT);
 
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(NEXT_POLY_OPA_DISP, mbg_model);

src/actor/ac_mikanbox_draw.c_inc

@@ -31,8 +31,8 @@ static void aMIK_copyright_draw(GAME* game) {
     gSP2Triangles(NEXT_FONT_DISP, 0, 1, 2, 0, 0, 2, 3, 0);
 
     Matrix_push();
-    Matrix_translate(0.0f, -900.0f, 0.0f, 1);
-    Matrix_scale(0.85f, 0.85f, 1.0f, 1);
+    Matrix_translate(0.0f, -900.0f, 0.0f, MTX_MULT);
+    Matrix_scale(0.85f, 0.85f, 1.0f, MTX_MULT);
     gSPMatrix(NEXT_FONT_DISP, _Matrix_to_Mtx_new(graph), G_MTX_LOAD | G_MTX_NOPUSH);
     gSPDisplayList(NEXT_FONT_DISP, obj_e_mikanbox_copyrightT_model2);
     Matrix_pull();

src/actor/ac_misin.c

@@ -164,10 +164,10 @@ static void aMSN_DrawDustcloth(aMSN_DustCloth_c* dustcloth, GAME* game) {
             gSPSegment(NEXT_POLY_OPA_DISP, G_MWO_SEGMENT_9, mNW_PaletteIdx2Palette(dustcloth->original_p->palette));
         }
 
-        Matrix_translate(dustcloth->pos.x, dustcloth->pos.y, dustcloth->pos.z, 0);
-        Matrix_RotateY(target_angle_y, 1);
-        Matrix_translate(-dustcloth->target_pos.x, -dustcloth->target_pos.y, -dustcloth->target_pos.z, 1);
-        Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+        Matrix_translate(dustcloth->pos.x, dustcloth->pos.y, dustcloth->pos.z, MTX_LOAD);
+        Matrix_RotateY(target_angle_y, MTX_MULT);
+        Matrix_translate(-dustcloth->target_pos.x, -dustcloth->target_pos.y, -dustcloth->target_pos.z, MTX_MULT);
+        Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
 
         gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(NEXT_POLY_OPA_DISP, obj_misin_cloth_model);
@@ -196,10 +196,10 @@ static int aMSN_DrawMisinAfter(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int j
     if (joint_idx == 3) {
         OPEN_DISP(game->graph);
 
-        Matrix_translate(87.0f, 62.0f + misin->needle_offset.y, 141.0f, 0);
-        Matrix_RotateY(DEG2SHORT_ANGLE(0.0f), 1);
-        Matrix_RotateZ(DEG2SHORT_ANGLE(-90.0f), 1);
-        Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+        Matrix_translate(87.0f, 62.0f + misin->needle_offset.y, 141.0f, MTX_LOAD);
+        Matrix_RotateY(DEG2SHORT_ANGLE(0.0f), MTX_MULT);
+        Matrix_RotateZ(DEG2SHORT_ANGLE(-90.0f), MTX_MULT);
+        Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
 
         gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(NEXT_POLY_OPA_DISP, obj_misin_hari_model);
@@ -223,9 +223,9 @@ static void aMSN_DrawMisin(aMSN_Misin_c* misin, GAME* game) {
     if (belt_gfx != NULL) {
         OPEN_DISP(game->graph);
 
-        Matrix_translate(misin->pos.x, misin->pos.y, misin->pos.z, 0);
-        Matrix_RotateY(DEG2SHORT_ANGLE(0.0f), 1);
-        Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+        Matrix_translate(misin->pos.x, misin->pos.y, misin->pos.z, MTX_LOAD);
+        Matrix_RotateY(DEG2SHORT_ANGLE(0.0f), MTX_MULT);
+        Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
 
         gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 

src/actor/ac_mural.c

@@ -73,8 +73,8 @@ static void Mural_Actor_draw(ACTOR* actorx, GAME* game) {
             OPEN_DISP(game->graph);
 
             Matrix_translate(actorx->world.position.x + x * 24.0f, actorx->world.position.y - y * 24.0f,
-                             actorx->world.position.z, 0);
-            Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+                             actorx->world.position.z, MTX_LOAD);
+            Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
 
             /* Segment 8 holds the palette */
             gSPSegment(NEXT_POLY_OPA_DISP, G_MWO_SEGMENT_8, mural->mural[i].pal_p);

src/actor/ac_museum_fish.c

@@ -869,8 +869,8 @@ void Museum_Fish_Suisou_draw(ACTOR* actorx, GAME* game, int r5) {
     if (r5 < 4) {
         xyz_t* p = &suisou_pos[r5];
         if (mfish_cull_check(game, &suisou_pos[r5], 350.0f, 20.0f, 650.0f)) {
-            Matrix_translate(suisou_pos[r5].x, 0, suisou_pos[r5].z, 0);
-            Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+            Matrix_translate(suisou_pos[r5].x, 0, suisou_pos[r5].z, MTX_LOAD);
+            Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
 
             OPEN_DISP(graph);
             gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(play->game.graph),
@@ -891,7 +891,7 @@ void Museum_Fish_Suisou_draw(ACTOR* actorx, GAME* game, int r5) {
             }
         }
     } else if (mfish_cull_check(game, &suisou_pos[4], 215.0f, 25.0f, 0.0f)) {
-        Matrix_scale(0.0625f, 0.0625f, 0.0625f, 0);
+        Matrix_scale(0.0625f, 0.0625f, 0.0625f, MTX_LOAD);
         OPEN_DISP(graph);
 
         gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(play->game.graph),
@@ -938,8 +938,8 @@ void Museum_Fish_Kusa_Draw(ACTOR* actorx, GAME* game, int r5) {
             mtx = actor->prvKusa[r5].mtx[1];
         }
         OPEN_DISP(game->graph);
-        Matrix_translate(kusa_pos[r5].x, 0, kusa_pos[r5].z, 0);
-        Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+        Matrix_translate(kusa_pos[r5].x, 0, kusa_pos[r5].z, MTX_LOAD);
+        Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
         gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         CLOSE_DISP(game->graph);
         cKF_Si3_draw_R_SV(game, &actor->prvKusa[r5].keyframe, mtx, kusa_before_disp, NULL, &actor->prvKusa[r5]);

src/actor/ac_museum_fish_aroana.c_inc

@@ -255,7 +255,7 @@ BOOL mfish_aroana_before_disp(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int jo
     MUSEUM_FISH_PRIVATE_DATA* actor = (MUSEUM_FISH_PRIVATE_DATA*)arg;
     int v;
     if (joint_idx == 1) {
-        Matrix_scale(1.0, sin_s(actor->_63A + actor->_63C) * 0.025f + 1.0f, sin_s(actor->_63A) * 0.025f + 1.0f, 1);
+        Matrix_scale(1.0, sin_s(actor->_63A + actor->_63C) * 0.025f + 1.0f, sin_s(actor->_63A) * 0.025f + 1.0f, MTX_MULT);
     } else if (joint_idx == 2) {
         v = joint_rot->y - (actor->_618.z << 1);
         joint_rot->y = MIN(MAX(v, DEG2SHORT_ANGLE(-40)), DEG2SHORT_ANGLE(40));
@@ -264,7 +264,7 @@ BOOL mfish_aroana_before_disp(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int jo
         joint_rot->x = MIN(MAX(v, DEG2SHORT_ANGLE(-20)), DEG2SHORT_ANGLE(20));
 
         Matrix_scale(1.0f, sin_s(actor->_63A + DEG2SHORT_ANGLE(270)) * 0.05f + 1.0f,
-                     sin_s(actor->_63A + DEG2SHORT_ANGLE(90)) * 0.05f + 1.0f, 1);
+                     sin_s(actor->_63A + DEG2SHORT_ANGLE(90)) * 0.05f + 1.0f, MTX_MULT);
     }
     return 1;
 }
@@ -278,10 +278,10 @@ void mfish_aroana_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
         mtxp = skele->mtx[1];
     }
     OPEN_DISP(gamex->graph);
-    Matrix_translate(actor->position.x, actor->position.y + actor->_5AC.y, actor->position.z, 0);
-    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, 1);
-    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, 1);
-    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, 1);
+    Matrix_translate(actor->position.x, actor->position.y + actor->_5AC.y, actor->position.z, MTX_LOAD);
+    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, MTX_MULT);
+    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(gamex, &skele->keyframe, mtxp, mfish_aroana_before_disp, NULL, actor);
     CLOSE_DISP(play->game.graph);

src/actor/ac_museum_fish_base.c_inc

@@ -568,14 +568,14 @@ void mfish_onefish_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
 
     graph = play->game.graph;
 
-    Matrix_translate(actor->position.x, actor->position.y + actor->_5AC.y, actor->position.z, 0);
-    Matrix_RotateY(actor->_60C.y, 1);
+    Matrix_translate(actor->position.x, actor->position.y + actor->_5AC.y, actor->position.z, MTX_LOAD);
+    Matrix_RotateY(actor->_60C.y, MTX_MULT);
 
-    Matrix_translate(0.0f, 0.25f * actor->init_data.ofs_y, 1.5f * actor->init_data.ofs_z, 1);
-    Matrix_RotateX(actor->_60C.x, 1);
-    Matrix_RotateZ(MY_CLAMP(-(actor->_618.z >> 1), DEG2SHORT_ANGLE(-20), DEG2SHORT_ANGLE(20)), 1);
-    Matrix_translate(0.0f, 0.25f * -actor->init_data.ofs_y, 0.5f * -actor->init_data.ofs_z, 1);
-    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, 1);
+    Matrix_translate(0.0f, 0.25f * actor->init_data.ofs_y, 1.5f * actor->init_data.ofs_z, MTX_MULT);
+    Matrix_RotateX(actor->_60C.x, MTX_MULT);
+    Matrix_RotateZ(MY_CLAMP(-(actor->_618.z >> 1), DEG2SHORT_ANGLE(-20), DEG2SHORT_ANGLE(20)), MTX_MULT);
+    Matrix_translate(0.0f, 0.25f * -actor->init_data.ofs_y, 0.5f * -actor->init_data.ofs_z, MTX_MULT);
+    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, MTX_MULT);
 
     OPEN_DISP(graph);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(play->game.graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);

src/actor/ac_museum_fish_bass.c_inc

@@ -358,14 +358,14 @@ void mfish_bass_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
 
     graph = play->game.graph;
 
-    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, 0);
-    Matrix_RotateY(actor->_60C.y, 1);
+    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, MTX_LOAD);
+    Matrix_RotateY(actor->_60C.y, MTX_MULT);
 
-    Matrix_translate(0, 0.25f * actor->init_data.ofs_y, 1.5f * actor->init_data.ofs_z, 1);
-    Matrix_RotateX(actor->_60C.x, 1);
-    Matrix_RotateZ(MY_CLAMP(-(actor->_618.z >> 1), DEG2SHORT_ANGLE(-20), DEG2SHORT_ANGLE(20)), 1);
-    Matrix_translate(0, 0.25f * -actor->init_data.ofs_y, 0.5f * -actor->init_data.ofs_z, 1);
-    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, 1);
+    Matrix_translate(0, 0.25f * actor->init_data.ofs_y, 1.5f * actor->init_data.ofs_z, MTX_MULT);
+    Matrix_RotateX(actor->_60C.x, MTX_MULT);
+    Matrix_RotateZ(MY_CLAMP(-(actor->_618.z >> 1), DEG2SHORT_ANGLE(-20), DEG2SHORT_ANGLE(20)), MTX_MULT);
+    Matrix_translate(0, 0.25f * -actor->init_data.ofs_y, 0.5f * -actor->init_data.ofs_z, MTX_MULT);
+    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, MTX_MULT);
 
     OPEN_DISP(graph);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(play->game.graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);

src/actor/ac_museum_fish_big_fish.c_inc

@@ -163,7 +163,7 @@ BOOL mfish_bfish_before_disp(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int joi
         i = joint_rot->y + (int)(actor->_644 * (GETREG(TAKREG, 0x14) * 0.01f + 0.5f) * sin_s(actor->_646));
         joint_rot->y = MY_CLAMP(i, DEG2SHORT_ANGLE(-30), DEG2SHORT_ANGLE(30));
         joint_pos->z += actor->_5AC.x * 0.06f * actor->_644 * sin_s(actor->_646 - DEG2SHORT_ANGLE(90));
-        Matrix_scale(1.0f, 1.0f + v * sin_s(actor->_63A + actor->_63C), 1.0f + v * sin_s(actor->_63A), 1);
+        Matrix_scale(1.0f, 1.0f + v * sin_s(actor->_63A + actor->_63C), 1.0f + v * sin_s(actor->_63A), MTX_MULT);
     } else if (joint_idx == 2) {
         f32 v;
         int i;
@@ -179,7 +179,7 @@ BOOL mfish_bfish_before_disp(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int joi
         i = joint_rot->x - (actor->_618.z >> 1);
         joint_rot->x = MY_CLAMP(i, DEG2SHORT_ANGLE(-20), DEG2SHORT_ANGLE(20));
         Matrix_scale(1.0f, 1.0f + v * sin_s(actor->_63A + DEG2SHORT_ANGLE(270)),
-                     1.0f + v * sin_s(actor->_63A + DEG2SHORT_ANGLE(90)), 1);
+                     1.0f + v * sin_s(actor->_63A + DEG2SHORT_ANGLE(90)), MTX_MULT);
     } else if (joint_idx == 3 && actor->fish_idx == aGYO_TYPE_ARAPAIMA) {
         int i = joint_rot->y - actor->_618.z +
                 (int)(actor->_644 * (1.0f + 0.01f * GETREG(TAKREG, 0x16)) *
@@ -199,10 +199,10 @@ void mfish_big_fish_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
         mtxp = skele->mtx[1];
     }
     OPEN_DISP(gamex->graph);
-    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, 0);
-    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, 1);
-    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, 1);
-    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, 1);
+    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, MTX_LOAD);
+    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, MTX_MULT);
+    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(gamex, &skele->keyframe, mtxp, mfish_bfish_before_disp, NULL, actor);
     CLOSE_DISP(gamex->graph);

src/actor/ac_museum_fish_dojou.c_inc

@@ -199,12 +199,12 @@ void mfish_dojou_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
     }
     s = actor->_60C.x;
     OPEN_DISP(gamex->graph);
-    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, 0);
-    Matrix_RotateY(actor->_60C.y, 1);
-    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z * (0.5f * cos_s(s) + ABS(cos_s(s))), 1);
-    Matrix_RotateX(s, 1);
-    Matrix_translate(0.0f, 0.0f, -actor->init_data.ofs_z * 0.5f * cos_s(s), 1);
-    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, 1);
+    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, MTX_LOAD);
+    Matrix_RotateY(actor->_60C.y, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z * (0.5f * cos_s(s) + ABS(cos_s(s))), MTX_MULT);
+    Matrix_RotateX(s, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, -actor->init_data.ofs_z * 0.5f * cos_s(s), MTX_MULT);
+    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(gamex, &skele->keyframe, mtxp, mfish_dojou_before_disp, NULL, actor);
     CLOSE_DISP(gamex->graph);

src/actor/ac_museum_fish_donko.c_inc

@@ -120,12 +120,12 @@ void mfish_donko_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
         mtxp = skele->mtx[1];
     }
     OPEN_DISP(gamex->graph);
-    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, 0);
-    Matrix_RotateY(actor->_60C.y, 1);
-    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z * 1.5f, 1);
-    Matrix_RotateX(actor->_60C.x, 1);
-    Matrix_translate(0.0f, 0.0f, -actor->init_data.ofs_z * 0.5f, 1);
-    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, 1);
+    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, MTX_LOAD);
+    Matrix_RotateY(actor->_60C.y, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z * 1.5f, MTX_MULT);
+    Matrix_RotateX(actor->_60C.x, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, -actor->init_data.ofs_z * 0.5f, MTX_MULT);
+    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(gamex, &skele->keyframe, mtxp, mfish_donko_before_disp, NULL, actor);
     CLOSE_DISP(gamex->graph);

src/actor/ac_museum_fish_gupi.c_inc

@@ -187,7 +187,7 @@ BOOL mfish_gupi_before_disp(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int join
         joint_rot->x = MY_CLAMP(s, -DEG2SHORT_ANGLE(30), DEG2SHORT_ANGLE(30));
         joint_rot->z += (s16)(actor->_618.x * (-1.3f + GETREG(TAKREG, 0x4e) * 0.1f));
         Matrix_scale((GETREG(TAKREG, 0x4b) * 0.01f) * cos_s(actor->_63A) + 0.05f + 1.0f,
-                     (GETREG(TAKREG, 0x4c) * 0.01f) * sin_s(actor->_63A) + 0.1f + 1.0f, 1.0f, 1);
+                     (GETREG(TAKREG, 0x4c) * 0.01f) * sin_s(actor->_63A) + 0.1f + 1.0f, 1.0f, MTX_MULT);
     }
     return TRUE;
 }
@@ -203,12 +203,12 @@ void mfish_gupi_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
     }
     v = actor->_60C.x * 0.7f;
     OPEN_DISP(gamex->graph);
-    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, 0);
-    Matrix_RotateY(actor->_60C.y, 1);
-    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z * 1.5f, 1);
-    Matrix_RotateX(v, 1);
-    Matrix_translate(0.0f, 0.0f, -actor->init_data.ofs_z * 0.5f, 1);
-    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, 1);
+    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, MTX_LOAD);
+    Matrix_RotateY(actor->_60C.y, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z * 1.5f, MTX_MULT);
+    Matrix_RotateX(v, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, -actor->init_data.ofs_z * 0.5f, MTX_MULT);
+    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(gamex, &skele->keyframe, mtxp, mfish_gupi_before_disp, NULL, actor);
     CLOSE_DISP(gamex->graph);

src/actor/ac_museum_fish_hasu.c_inc

@@ -22,9 +22,9 @@ void mfish_hasu_dw(mfish_hasu_c* actor, GAME* gamex) {
         mtxp = actor->mtx[1];
     }
     OPEN_DISP(gamex->graph);
-    Matrix_translate(hasu_pos.x + GETREG(TAKREG, 0x42) * 0.1f, hasu_pos.y, hasu_pos.z + GETREG(TAKREG, 0x43) * 0.1f, 0);
-    Matrix_RotateY(DEG2SHORT_ANGLE(-180), 1);
-    Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+    Matrix_translate(hasu_pos.x + GETREG(TAKREG, 0x42) * 0.1f, hasu_pos.y, hasu_pos.z + GETREG(TAKREG, 0x43) * 0.1f, MTX_LOAD);
+    Matrix_RotateY(DEG2SHORT_ANGLE(-180), MTX_MULT);
+    Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(gamex, &actor->keyframe, mtxp, NULL, NULL, NULL);
     CLOSE_DISP(gamex->graph);
@@ -197,16 +197,16 @@ void mfish_kaeru_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
     }
 
     OPEN_DISP(gamex->graph);
-    Matrix_translate(hasu_pos.x + GETREG(TAKREG, 0x42) * 0.1f, hasu_pos.y, hasu_pos.z + GETREG(TAKREG, 0x43) * 0.1f, 0);
-    Matrix_RotateY(DEG2SHORT_ANGLE(-180), 1);
-    Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+    Matrix_translate(hasu_pos.x + GETREG(TAKREG, 0x42) * 0.1f, hasu_pos.y, hasu_pos.z + GETREG(TAKREG, 0x43) * 0.1f, MTX_LOAD);
+    Matrix_RotateY(DEG2SHORT_ANGLE(-180), MTX_MULT);
+    Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(gamex, &keyframe->keyframe, mtxp2, hasu_before_disp, hasu_after_disp, actor);
 
-    Matrix_translate(actor->position.x + actor->_5AC.x, actor->position.y, actor->position.z + actor->_5AC.z, 0);
-    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, 1);
-    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, 1);
-    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, 1);
+    Matrix_translate(actor->position.x + actor->_5AC.x, actor->position.y, actor->position.z + actor->_5AC.z, MTX_LOAD);
+    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, MTX_MULT);
+    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(gamex, &skele->keyframe, mtxp, NULL, NULL, actor);
     CLOSE_DISP(gamex->graph);

src/actor/ac_museum_fish_ito.c_inc

@@ -93,7 +93,7 @@ BOOL mfish_ito_before_disp(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int joint
         joint_rot->y = MY_CLAMP(i, DEG2SHORT_ANGLE(-30), DEG2SHORT_ANGLE(30));
         v = actor->_5AC.x * actor->_644 * sin_s(actor->_646 - DEG2SHORT_ANGLE(90));
         joint_pos->z += v;
-        Matrix_scale(1.0f, sin_s(actor->_63A + actor->_63C) * 0.025f + 1.0f, sin_s(actor->_63A) * 0.025f + 1.0f, 1);
+        Matrix_scale(1.0f, sin_s(actor->_63A + actor->_63C) * 0.025f + 1.0f, sin_s(actor->_63A) * 0.025f + 1.0f, MTX_MULT);
     } else if (joint_idx == 2) {
         int i;
         i = joint_rot->y - 2 * actor->_618.z +
@@ -103,7 +103,7 @@ BOOL mfish_ito_before_disp(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int joint
         i = joint_rot->x - (actor->_618.z >> 1);
         joint_rot->x = MY_CLAMP(i, DEG2SHORT_ANGLE(-20), DEG2SHORT_ANGLE(20));
         Matrix_scale(1.0f, sin_s(actor->_63A + DEG2SHORT_ANGLE(270)) * 0.05f + 1.0f,
-                     sin_s(actor->_63A + DEG2SHORT_ANGLE(90)) * 0.05f + 1.0f, 1);
+                     sin_s(actor->_63A + DEG2SHORT_ANGLE(90)) * 0.05f + 1.0f, MTX_MULT);
     }
     return TRUE;
 }
@@ -118,10 +118,10 @@ void mfish_ito_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
         mtxp = skele->mtx[1];
     }
     OPEN_DISP(gamex->graph);
-    Matrix_translate(actor->position.x, actor->position.y + actor->_5AC.y, actor->position.z, 0);
-    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, 1);
-    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, 1);
-    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, 1);
+    Matrix_translate(actor->position.x, actor->position.y + actor->_5AC.y, actor->position.z, MTX_LOAD);
+    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, MTX_MULT);
+    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(gamex, &skele->keyframe, mtxp, mfish_ito_before_disp, NULL, actor);
     CLOSE_DISP(gamex->graph);

src/actor/ac_museum_fish_kaseki.c_inc

@@ -156,14 +156,14 @@ BOOL mfish_kaseki_before_disp(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int jo
         i = joint_rot->x + (int)(actor->_618.z * (GETREG(TAKREG, 0x47) * 0.01f + 0.5f));
         joint_rot->x = MIN(MAX(i, DEG2SHORT_ANGLE(-10)), DEG2SHORT_ANGLE(10));
         Matrix_scale(1.0f, (GETREG(TAKREG, 0x36) * 0.001f + 0.02f) * sin_s(actor->_63A + actor->_63C) + 1.0f,
-                     (GETREG(TAKREG, 0x36) * 0.001f + 0.02f) * sin_s(actor->_63A) + 1.0f, 1);
+                     (GETREG(TAKREG, 0x36) * 0.001f + 0.02f) * sin_s(actor->_63A) + 1.0f, MTX_MULT);
     } else if (joint_idx == 2) {
         i = joint_rot->y - (int)(actor->_618.z * (GETREG(TAKREG, 0x46) * 0.01f + 1.25f));
         joint_rot->y = MIN(MAX(i, DEG2SHORT_ANGLE(-50)), DEG2SHORT_ANGLE(50));
         i = joint_rot->x - (int)(actor->_618.z * (GETREG(TAKREG, 0x48) * 0.01f + 0.25f));
         joint_rot->x = MIN(MAX(i, DEG2SHORT_ANGLE(-10)), DEG2SHORT_ANGLE(10));
         Matrix_scale(1.0f, (GETREG(TAKREG, 0x37) * 0.001f + 0.045f) * sin_s(actor->_63A + DEG2SHORT_ANGLE(270)) + 1.0f,
-                     (GETREG(TAKREG, 0x37) * 0.001f + 0.045f) * sin_s(actor->_63A + DEG2SHORT_ANGLE(90)) + 1.0f, 1);
+                     (GETREG(TAKREG, 0x37) * 0.001f + 0.045f) * sin_s(actor->_63A + DEG2SHORT_ANGLE(90)) + 1.0f, MTX_MULT);
     } else if (joint_idx == 3) {
         i = joint_rot->y - (int)(actor->_618.z * (GETREG(TAKREG, 0x47) * 0.01f + 1.25f));
         joint_rot->y = MIN(MAX(i, DEG2SHORT_ANGLE(-50)), DEG2SHORT_ANGLE(50));
@@ -182,10 +182,10 @@ void mfish_kaseki_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
         mtxp = skele->mtx[1];
     }
     OPEN_DISP(gamex->graph);
-    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, 0);
-    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, 1);
-    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, 1);
-    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, 1);
+    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, MTX_LOAD);
+    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, MTX_MULT);
+    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(gamex, &skele->keyframe, mtxp, mfish_kaseki_before_disp, NULL, actor);
     CLOSE_DISP(gamex->graph);

src/actor/ac_museum_fish_kingyo.c_inc

@@ -236,7 +236,7 @@ BOOL mfish_kingyo_before_disp(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int jo
         joint_rot->z += (int)(actor->_618.x * (-1.3f + 0.1f * GETREG(TAKREG, 0x4e)));
         Matrix_scale(GETREG(TAKREG, 0x4b) * 0.01f * cos_s(actor->_63A) + 0.05f + 1.0f,
                      GETREG(TAKREG, 0x4c) * 0.01f * sin_s(actor->_63A) + 0.1f + 1.0f,
-                     GETREG(TAKREG, 0x4d) * 0.01f * cos_s(actor->_63A) + 0.1f + 1.0f, 1);
+                     GETREG(TAKREG, 0x4d) * 0.01f * cos_s(actor->_63A) + 0.1f + 1.0f, MTX_MULT);
     }
     return TRUE;
 }
@@ -252,12 +252,12 @@ void mfish_kingyo_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
     }
     s = actor->_60C.x * (GETREG(TAKREG, 0x41) * 0.01f + 0.75f);
     OPEN_DISP(gamex->graph);
-    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, 0);
-    Matrix_RotateY(actor->_60C.y, 1);
-    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z * 1.5f, 1);
-    Matrix_RotateX(s, 1);
-    Matrix_translate(0.0f, 0.0f, -actor->init_data.ofs_z * 0.5f, 1);
-    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, 1);
+    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, MTX_LOAD);
+    Matrix_RotateY(actor->_60C.y, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z * 1.5f, MTX_MULT);
+    Matrix_RotateX(s, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, -actor->init_data.ofs_z * 0.5f, MTX_MULT);
+    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(gamex, &skele->keyframe, mtxp, mfish_kingyo_before_disp, NULL, actor);
     CLOSE_DISP(gamex->graph);

src/actor/ac_museum_fish_koi.c_inc

@@ -498,13 +498,13 @@ void mfish_koi_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
         mtxp = skele->mtx[1];
     }
     OPEN_DISP(gamex->graph);
-    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, 0);
-    Matrix_RotateY(actor->_60C.y, 1);
-    Matrix_translate(0.0f, actor->init_data.ofs_y * 0.25f, actor->init_data.ofs_z * 1.5f, 1);
-    Matrix_RotateX(actor->_60C.x, 1);
-    Matrix_RotateZ(MY_CLAMP(-(actor->_618.z >> 2), DEG2SHORT_ANGLE(-20), DEG2SHORT_ANGLE(20)), 1);
-    Matrix_translate(0.0f, -actor->init_data.ofs_y * 0.25f, -actor->init_data.ofs_z * 0.5f, 1);
-    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, 1);
+    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, MTX_LOAD);
+    Matrix_RotateY(actor->_60C.y, MTX_MULT);
+    Matrix_translate(0.0f, actor->init_data.ofs_y * 0.25f, actor->init_data.ofs_z * 1.5f, MTX_MULT);
+    Matrix_RotateX(actor->_60C.x, MTX_MULT);
+    Matrix_RotateZ(MY_CLAMP(-(actor->_618.z >> 2), DEG2SHORT_ANGLE(-20), DEG2SHORT_ANGLE(20)), MTX_MULT);
+    Matrix_translate(0.0f, -actor->init_data.ofs_y * 0.25f, -actor->init_data.ofs_z * 0.5f, MTX_MULT);
+    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(gamex, &skele->keyframe, mtxp, mfish_koi_before_disp, NULL, actor);
     CLOSE_DISP(gamex->graph);

src/actor/ac_museum_fish_kurage.c_inc

@@ -196,25 +196,25 @@ void mfish_kurage_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
     a += (actor->_5F4 * sin_s(actor->_632) + 1.0f);
 
     OPEN_DISP(gamex->graph);
-    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, 0);
-    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, 1);
+    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, MTX_LOAD);
+    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, MTX_MULT);
     Matrix_scale(actor->init_data.renderScale * a, actor->init_data.renderScale * (1.0f / SQ(a)),
-                 actor->init_data.renderScale * a, 1);
+                 actor->init_data.renderScale * a, MTX_MULT);
     Matrix_push();
 
-    Matrix_RotateY(actor->_63C, 1);
+    Matrix_RotateY(actor->_63C, MTX_MULT);
     Matrix_scale((GETREG(TAKREG, 0x4b) * 0.01f + 0.1f) * sin_s(actor->_63C) + 1.0f, 1.0f,
-                 (GETREG(TAKREG, 0x4b) * 0.01f + 0.1f) * cos_s(actor->_63C) + 1.0f, 1);
-    Matrix_RotateY(-actor->_63C, 1);
+                 (GETREG(TAKREG, 0x4b) * 0.01f + 0.1f) * cos_s(actor->_63C) + 1.0f, MTX_MULT);
+    Matrix_RotateY(-actor->_63C, MTX_MULT);
     gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(NEXT_POLY_XLU_DISP, act_mus_kurage_sakana_body_model);
 
     Matrix_pull();
 
-    Matrix_RotateY(actor->_63C, 1);
+    Matrix_RotateY(actor->_63C, MTX_MULT);
     Matrix_scale((GETREG(TAKREG, 0x4b) * 0.01f + 0.1f) * sin_s(actor->_63C) + 1.0f, 1.0f,
-                 (GETREG(TAKREG, 0x4b) * 0.01f + 0.1f) * cos_s(actor->_63C) + 1.0f, 1);
-    Matrix_RotateY(-actor->_63C, 1);
+                 (GETREG(TAKREG, 0x4b) * 0.01f + 0.1f) * cos_s(actor->_63C) + 1.0f, MTX_MULT);
+    Matrix_RotateY(-actor->_63C, MTX_MULT);
     gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(NEXT_POLY_XLU_DISP, act_mus_kurage_sakana_foot_model);
 

src/actor/ac_museum_fish_medaka.c_inc

@@ -166,12 +166,12 @@ void mfish_medaka_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
     }
     s = actor->_60C.x * (GETREG(TAKREG, 0x41) * 0.01f + 0.75f);
     OPEN_DISP(gamex->graph);
-    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, 0);
-    Matrix_RotateY(actor->_60C.y, 1);
-    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z * 1.5f, 1);
-    Matrix_RotateX(s, 1);
-    Matrix_translate(0.0f, 0.0f, -actor->init_data.ofs_z * 0.5f, 1);
-    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, 1);
+    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, MTX_LOAD);
+    Matrix_RotateY(actor->_60C.y, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z * 1.5f, MTX_MULT);
+    Matrix_RotateX(s, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, -actor->init_data.ofs_z * 0.5f, MTX_MULT);
+    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(gamex, &skele->keyframe, mtxp, mfish_medaka_before_disp, NULL, actor);
     CLOSE_DISP(gamex->graph);

src/actor/ac_museum_fish_namazu.c_inc

@@ -293,7 +293,7 @@ BOOL mfish_namazu_before_disp(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int jo
         joint_rot->z = MY_CLAMP(s, DEG2SHORT_ANGLE(-30), DEG2SHORT_ANGLE(30));
         s = joint_rot->x + (actor->_618.z >> 2);
         joint_rot->x = MY_CLAMP(s, DEG2SHORT_ANGLE(-20), DEG2SHORT_ANGLE(20));
-        Matrix_scale(1.0f, 1.0f + 0.01f * sin_s(actor->_63A + actor->_63C), 1.0f + 0.01f * sin_s(actor->_63A), 1);
+        Matrix_scale(1.0f, 1.0f + 0.01f * sin_s(actor->_63A + actor->_63C), 1.0f + 0.01f * sin_s(actor->_63A), MTX_MULT);
     } else if (joint_idx == 2) {
         s = joint_rot->y - (actor->_618.z << 1);
         joint_rot->y = MY_CLAMP(s, DEG2SHORT_ANGLE(-60), DEG2SHORT_ANGLE(60));
@@ -302,7 +302,7 @@ BOOL mfish_namazu_before_disp(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int jo
         s = joint_rot->z - (s16)(actor->_640 * (0.6f + GETREG(TAKREG, 0x4E) * 0.01f));
         joint_rot->z = MY_CLAMP(s, DEG2SHORT_ANGLE(-30), DEG2SHORT_ANGLE(30));
         Matrix_scale(1.0f, 1.0f + 0.005f * sin_s(actor->_63A + DEG2SHORT_ANGLE(270)),
-                     1.0f + 0.005f * sin_s(actor->_63A + DEG2SHORT_ANGLE(90)), 1);
+                     1.0f + 0.005f * sin_s(actor->_63A + DEG2SHORT_ANGLE(90)), MTX_MULT);
     }
     return TRUE;
 }
@@ -316,10 +316,10 @@ void mfish_namazu_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
         mtxp = skele->mtx[1];
     }
     OPEN_DISP(gamex->graph);
-    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, 0);
-    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, 1);
-    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, 1);
-    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, 1);
+    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, MTX_LOAD);
+    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, MTX_MULT);
+    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(gamex, &skele->keyframe, mtxp, mfish_namazu_before_disp, NULL, actor);
     CLOSE_DISP(gamex->graph);

src/actor/ac_museum_fish_seafish.c_inc

@@ -220,12 +220,12 @@ BOOL mfish_seafish_before_disp(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int j
         int s = joint_rot->x + (int)(actor->_618.z * (GETREG(TAKREG, 0x37) * 0.01f + 0.5f));
         joint_rot->x = MIN(MAX(s, DEG2SHORT_ANGLE(-15)), DEG2SHORT_ANGLE(15));
         Matrix_scale(1.0f, (GETREG(TAKREG, 0x36) * 0.001f + 0.035f) * sin_s(actor->_63A + actor->_63C) + 1.0f,
-                     (GETREG(TAKREG, 0x36) * 0.001f + 0.035f) * sin_s(actor->_63A) + 1.0f, 1);
+                     (GETREG(TAKREG, 0x36) * 0.001f + 0.035f) * sin_s(actor->_63A) + 1.0f, MTX_MULT);
     } else if (joint_idx == 2) {
         int v = joint_rot->y - (actor->_618.z << 1);
         joint_rot->y = MIN(MAX(v, DEG2SHORT_ANGLE(-80)), DEG2SHORT_ANGLE(80));
         Matrix_scale(1.0f, sin_s(actor->_63A + DEG2SHORT_ANGLE(270)) * 0.07f + 1.0f,
-                     sin_s(actor->_63A + DEG2SHORT_ANGLE(90)) * 0.07f + 1.0f, 1);
+                     sin_s(actor->_63A + DEG2SHORT_ANGLE(90)) * 0.07f + 1.0f, MTX_MULT);
     }
     return TRUE;
 }
@@ -239,10 +239,10 @@ void mfish_seafish_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
         mtxp = skele->mtx[1];
     }
     OPEN_DISP(gamex->graph);
-    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, 0);
-    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, 1);
-    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, 1);
-    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, 1);
+    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, MTX_LOAD);
+    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, MTX_MULT);
+    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(gamex, &skele->keyframe, mtxp, mfish_seafish_before_disp, NULL, actor);
     CLOSE_DISP(gamex->graph);

src/actor/ac_museum_fish_small_fish.c_inc

@@ -191,12 +191,12 @@ void mfish_small_fish_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
     }
     v = actor->_60C.x * 0.7f;
     OPEN_DISP(gamex->graph);
-    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, 0);
-    Matrix_RotateY(actor->_60C.y, 1);
-    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z * 1.5f, 1);
-    Matrix_RotateX(v, 1);
-    Matrix_translate(0.0f, 0.0f, -actor->init_data.ofs_z * 0.5f, 1);
-    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, 1);
+    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, MTX_LOAD);
+    Matrix_RotateY(actor->_60C.y, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z * 1.5f, MTX_MULT);
+    Matrix_RotateX(v, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, -actor->init_data.ofs_z * 0.5f, MTX_MULT);
+    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(gamex, &skele->keyframe, mtxp, mfish_sfish_before_disp, NULL, actor);
     CLOSE_DISP(gamex->graph);

src/actor/ac_museum_fish_tai.c_inc

@@ -268,10 +268,10 @@ void mfish_tai_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
         mtxp = skele->mtx[1];
     }
     OPEN_DISP(gamex->graph);
-    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, 0);
-    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, 1);
-    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, 1);
-    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, 1);
+    Matrix_translate(actor->position.x, actor->position.y, actor->position.z, MTX_LOAD);
+    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, MTX_MULT);
+    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(gamex, &skele->keyframe, mtxp, mfish_tai_before_disp, NULL, actor);
     CLOSE_DISP(gamex->graph);

src/actor/ac_museum_fish_unagi.c_inc

@@ -395,10 +395,10 @@ void mfish_unagi_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
         mtxp = skele->mtx[1];
     }
     OPEN_DISP(gamex->graph);
-    Matrix_translate(actor->position.x + actor->_5AC.x, actor->position.y, actor->position.z + actor->_5AC.z, 0);
-    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, 1);
-    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, 1);
-    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, 1);
+    Matrix_translate(actor->position.x + actor->_5AC.x, actor->position.y, actor->position.z + actor->_5AC.z, MTX_LOAD);
+    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, MTX_MULT);
+    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(gamex, &skele->keyframe, mtxp, mfish_unagi_before_disp, NULL, actor);
     CLOSE_DISP(gamex->graph);

src/actor/ac_museum_fish_zarigani.c_inc

@@ -219,11 +219,11 @@ void mfish_zarigani_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) {
     }
     OPEN_DISP(gamex->graph);
     Matrix_translate(actor->position.x + actor->_5AC.x, actor->position.y + actor->_5AC.y,
-                     actor->position.z + actor->_5AC.z, 0);
-    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, 1);
-    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, 1);
-    Matrix_rotateXYZ(DEG2SHORT_ANGLE(-90), DEG2SHORT_ANGLE(-180), DEG2SHORT_ANGLE(0), 1);
-    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, 1);
+                     actor->position.z + actor->_5AC.z, MTX_LOAD);
+    Matrix_rotateXYZ(actor->_60C.x, actor->_60C.y, actor->_60C.z, MTX_MULT);
+    Matrix_translate(0.0f, 0.0f, actor->init_data.ofs_z, MTX_MULT);
+    Matrix_rotateXYZ(DEG2SHORT_ANGLE(-90), DEG2SHORT_ANGLE(-180), DEG2SHORT_ANGLE(0), MTX_MULT);
+    Matrix_scale(actor->init_data.renderScale, actor->init_data.renderScale, actor->init_data.renderScale, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(gamex, &skele->keyframe, mtxp, mfish_zarigani_before_disp, NULL, actor);
     CLOSE_DISP(gamex->graph);

src/actor/ac_museum_indoor.c

@@ -94,9 +94,9 @@ static void Museum_Indoor_Actor_draw(ACTOR* actorx, GAME* game) {
         mEnv_GetRoomPrimColor(&r, &g, &b, (GAME_PLAY*)game);
         OPEN_DISP(game->graph);
 
-        Matrix_translate(0.0f, 0.0f, 0.0f, 0);
-        Matrix_RotateY(0, 1);
-        Matrix_scale(0.0625f, 0.0625f, 0.0625f, 1);
+        Matrix_translate(0.0f, 0.0f, 0.0f, MTX_LOAD);
+        Matrix_RotateY(0, MTX_MULT);
+        Matrix_scale(0.0625f, 0.0625f, 0.0625f, MTX_MULT);
 
         gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 0, r, g, b, a);

src/actor/ac_museum_insect.c

@@ -861,8 +861,8 @@ void Museum_Insect_Actor_draw(ACTOR* actorx, GAME* game) {
     _texture_z_light_fog_prim_xlu(game->graph);
     Evw_Anime_Set((GAME_PLAY*)game, &obj_museum4_water_evw_anime);
     graph = game->graph;
-    Matrix_translate(100.0f, 0.0f, 0.0f, FALSE);
-    Matrix_scale(0.01f, 0.01f, 0.01f, TRUE);
+    Matrix_translate(100.0f, 0.0f, 0.0f, MTX_LOAD);
+    Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
     OPEN_DISP(graph);
     gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(NEXT_POLY_XLU_DISP, obj_museum4_water_modelT);

src/actor/ac_museum_insect_base.c_inc

@@ -78,9 +78,9 @@ void minsect_amenbo_mv(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
 void minsect_amenbo_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     _texture_z_light_fog_prim_xlu(game->graph);
     OPEN_DISP(game->graph);
-    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z, FALSE);
-    Matrix_scale(actor->_14, actor->_14, actor->_14, TRUE);
-    Matrix_rotateXYZ(actor->_68.x, actor->_68.y + (s16)DEG2SHORT_ANGLE2(180), actor->_68.z, TRUE);
+    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z, MTX_LOAD);
+    Matrix_scale(actor->_14, actor->_14, actor->_14, MTX_MULT);
+    Matrix_rotateXYZ(actor->_68.x, actor->_68.y + (s16)DEG2SHORT_ANGLE2(180), actor->_68.z, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetEnvColor(NEXT_POLY_OPA_DISP, 0, 0xff, 0x9b, 0xff);
     gSPDisplayList(NEXT_POLY_OPA_DISP, minsect_mdl[actor->_00][0]);
@@ -169,9 +169,9 @@ extern Gfx act_m_mu_ariT_model;
 void ari_alone_draw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     _texture_z_light_fog_prim_xlu(game->graph);
     OPEN_DISP(game->graph);
-    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z + actor->_58, FALSE);
-    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, TRUE);
-    Matrix_scale(actor->_14, actor->_14, actor->_14, TRUE);
+    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z + actor->_58, MTX_LOAD);
+    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, MTX_MULT);
+    Matrix_scale(actor->_14, actor->_14, actor->_14, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(NEXT_POLY_OPA_DISP, &act_m_mu_ariT_model);
     CLOSE_DISP(game->graph);
@@ -239,8 +239,8 @@ void minsect_draw_shadow(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     scale = (GETREG(TAKREG, 0x28) * 0.001f + 0.005f);
     scale *= minsect_shadow_scale_tbl[(int)actor->_00];
 
-    Matrix_translate(actor->_1C.x, v, actor->_1C.z, FALSE);
-    Matrix_scale(scale, scale, scale, TRUE);
+    Matrix_translate(actor->_1C.x, v, actor->_1C.z, MTX_LOAD);
+    Matrix_scale(scale, scale, scale, MTX_MULT);
     _texture_z_light_fog_prim_shadow(game->graph);
 
     OPEN_SHADOW_DISP(game->graph);

src/actor/ac_museum_insect_batta.c_inc

@@ -232,10 +232,10 @@ void minsect_batta_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     _texture_z_light_fog_prim(game->graph);
 
     OPEN_DISP(game->graph);
-    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z, FALSE);
-    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, TRUE);
-    Matrix_rotateXYZ(actor->_76, 0, 0, TRUE);
-    Matrix_scale(actor->_14, actor->_14, actor->_14, TRUE);
+    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z, MTX_LOAD);
+    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, MTX_MULT);
+    Matrix_rotateXYZ(actor->_76, 0, 0, MTX_MULT);
+    Matrix_scale(actor->_14, actor->_14, actor->_14, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(NEXT_POLY_OPA_DISP, minsect_mdl[actor->_00][0]);
     CLOSE_DISP(game->graph);
@@ -244,7 +244,7 @@ void minsect_batta_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
         _texture_z_light_fog_prim_xlu(game->graph);
         OPEN_POLY_XLU_DISP(game->graph);
         gDPSetEnvColor(POLY_XLU_DISP++, 0xff, 0xff, 0xff, 0xff);
-        Matrix_scale(actor->_58, 1.0f, 1.0f, TRUE);
+        Matrix_scale(actor->_58, 1.0f, 1.0f, MTX_MULT);
         gSPMatrix(POLY_XLU_DISP++, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, minsect_mdl[actor->_00][1]);
         CLOSE_POLY_XLU_DISP(game->graph);

src/actor/ac_museum_insect_chou.c_inc

@@ -237,11 +237,11 @@ void minsect_chou_mv(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
 void minsect_chou_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     _texture_z_light_fog_prim(game->graph);
     OPEN_DISP(game->graph);
-    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z, FALSE);
-    Matrix_scale(actor->_14, actor->_14, actor->_14, TRUE);
-    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, TRUE);
-    Matrix_scale(GETREG(NMREG, 0) * 0.01f + 1.0f, GETREG(NMREG, 1) * 0.01f + 1.0f, GETREG(NMREG, 2) * 0.01f + 1.0f,
-                 TRUE);
+    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z, MTX_LOAD);
+    Matrix_scale(actor->_14, actor->_14, actor->_14, MTX_MULT);
+    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, MTX_MULT);
+    Matrix_scale(GETREG(NMREG, 0) * 0.01f + 1.0f, GETREG(NMREG, MTX_MULT) * 0.01f + 1.0f, GETREG(NMREG, 2) * 0.01f + 1.0f,
+                 MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetEnvColor(NEXT_POLY_OPA_DISP, 0, 0xff, 0x9b, 0xff);
     gSPDisplayList(NEXT_POLY_OPA_DISP, minsect_mdl[actor->_00][(int)actor->_0C]);

src/actor/ac_museum_insect_dango.c_inc

@@ -181,18 +181,18 @@ void minsect_dango_mv(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
 void minsect_dango_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     _texture_z_light_fog_prim(game->graph);
     OPEN_DISP(game->graph);
-    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z, FALSE);
+    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z, MTX_LOAD);
     if (actor->_7C) {
         Matrix_rotateXYZ(DEG2SHORT_ANGLE2(GETREG(NMREG, 5) + 20.f), DEG2SHORT_ANGLE2(GETREG(NMREG, 6)),
-                         DEG2SHORT_ANGLE2(GETREG(NMREG, 7)), TRUE);
+                         DEG2SHORT_ANGLE2(GETREG(NMREG, 7)), MTX_MULT);
     }
-    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, TRUE);
+    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, MTX_MULT);
     if (actor->_7C) {
         Matrix_scale(GETREG(NMREG, 2) * 0.01f + 1.2f, GETREG(NMREG, 3) * 0.01f + 1.2f, GETREG(NMREG, 4) * 0.01f + 1.2f,
-                     TRUE);
+                     MTX_MULT);
     }
-    Matrix_scale(1.f, 1.f, actor->_58, TRUE);
-    Matrix_scale(actor->_14, actor->_14, actor->_14, TRUE);
+    Matrix_scale(1.f, 1.f, actor->_58, MTX_MULT);
+    Matrix_scale(actor->_14, actor->_14, actor->_14, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     if (actor->_7C) {
         gSPDisplayList(NEXT_POLY_OPA_DISP, minsect_mdl[actor->_00][1]);

src/actor/ac_museum_insect_genji.c_inc

@@ -170,9 +170,9 @@ void genji_light_draw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     b -= (u8)(b * (1.f - actor->_0C));
     _texture_z_light_fog_prim_xlu(game->graph);
     OPEN_POLY_XLU_DISP(game->graph);
-    Matrix_translate(p.x, p.y, p.z, FALSE);
-    Matrix_mult(&((GAME_PLAY*)game)->billboard_matrix, TRUE);
-    Matrix_scale(actor->_14, actor->_14, actor->_14, TRUE);
+    Matrix_translate(p.x, p.y, p.z, MTX_LOAD);
+    Matrix_mult(&((GAME_PLAY*)game)->billboard_matrix, MTX_MULT);
+    Matrix_scale(actor->_14, actor->_14, actor->_14, MTX_MULT);
     gSPMatrix(POLY_XLU_DISP++, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetEnvColor(POLY_XLU_DISP++, 0, 0xff, 0x9b, a);
     gSPDisplayList(POLY_XLU_DISP++, m_genji_disp_tbl[actor->_72]);
@@ -282,11 +282,11 @@ void minsect_genji_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     _texture_z_light_fog_prim(game->graph);
     OPEN_DISP(game->graph);
     Matrix_translate(actor->_1C.x + GETREG(NMREG, 0x10) * 0.01f, actor->_1C.y + GETREG(NMREG, 0x11) * 0.01f,
-                     actor->_1C.z + GETREG(NMREG, 0x12) * 0.01f, FALSE);
-    Matrix_rotateXYZ(0, 0, actor->_68.z, TRUE);
-    Matrix_rotateXYZ(actor->_7E, 0, 0, TRUE);
-    Matrix_rotateXYZ(DEG2SHORT_ANGLE(110), 0, DEG2SHORT_ANGLE2(180), TRUE);
-    Matrix_scale(0.01f, 0.01f, 0.01f, TRUE);
+                     actor->_1C.z + GETREG(NMREG, 0x12) * 0.01f, MTX_LOAD);
+    Matrix_rotateXYZ(0, 0, actor->_68.z, MTX_MULT);
+    Matrix_rotateXYZ(actor->_7E, 0, 0, MTX_MULT);
+    Matrix_rotateXYZ(DEG2SHORT_ANGLE(110), 0, DEG2SHORT_ANGLE2(180), MTX_MULT);
+    Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(NEXT_POLY_OPA_DISP, &act_m_mu_genji_modelT);
     CLOSE_DISP(game->graph);

src/actor/ac_museum_insect_goki.c_inc

@@ -199,16 +199,16 @@ void minsect_goki_mv(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
 void minsect_goki_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     _texture_z_light_fog_prim(game->graph);
     OPEN_DISP(game->graph);
-    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z, FALSE);
-    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, TRUE);
-    Matrix_scale(actor->_14, actor->_14, actor->_14, TRUE);
+    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z, MTX_LOAD);
+    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, MTX_MULT);
+    Matrix_scale(actor->_14, actor->_14, actor->_14, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(NEXT_POLY_OPA_DISP, minsect_mdl[actor->_00][0]);
     CLOSE_DISP(game->graph);
     if (actor->_74) {
         _texture_z_light_fog_prim_xlu(game->graph);
         OPEN_POLY_XLU_DISP(game->graph);
-        Matrix_scale(actor->_58, 1.0f, 1.0f, TRUE);
+        Matrix_scale(actor->_58, 1.0f, 1.0f, MTX_MULT);
         gSPMatrix(POLY_XLU_DISP++, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, minsect_mdl[actor->_00][1]);
         CLOSE_POLY_XLU_DISP(game->graph);

src/actor/ac_museum_insect_hachi.c_inc

@@ -172,17 +172,17 @@ void minsect_hachi_mv(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
 void minsect_hachi_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     _texture_z_light_fog_prim(game->graph);
     OPEN_DISP(game->graph);
-    Matrix_translate(hachi_base_pos.x, hachi_base_pos.y, hachi_base_pos.z, FALSE);
-    Matrix_rotateXYZ(DEG2SHORT_ANGLE(-20), 0, 0, TRUE);
-    Matrix_translate(0.0f, actor->_1C.y, 0.0f, TRUE);
+    Matrix_translate(hachi_base_pos.x, hachi_base_pos.y, hachi_base_pos.z, MTX_LOAD);
+    Matrix_rotateXYZ(DEG2SHORT_ANGLE(-20), 0, 0, MTX_MULT);
+    Matrix_translate(0.0f, actor->_1C.y, 0.0f, MTX_MULT);
     Matrix_translate(-GETREG(NMREG, 0x10) * 0.01f, -GETREG(NMREG, 0x11) * 0.01f, -15.f - GETREG(NMREG, 0xe) * 0.01f,
-                     TRUE);
-    Matrix_rotateXYZ(0, actor->_68.y, 0, TRUE);
-    Matrix_translate(GETREG(NMREG, 0x10) * 0.01f, GETREG(NMREG, 0x11) * 0.01f, 15.f + GETREG(NMREG, 0xe) * 0.01f, TRUE);
-    Matrix_rotateXYZ(0, 0, actor->_68.z, TRUE);
-    Matrix_rotateXYZ(actor->_70, 0, 0, TRUE);
-    Matrix_scale(actor->_14, actor->_14, actor->_14, TRUE);
-    Matrix_rotateXYZ(DEG2SHORT_ANGLE(90), 0, DEG2SHORT_ANGLE(-180), TRUE);
+                     MTX_MULT);
+    Matrix_rotateXYZ(0, actor->_68.y, 0, MTX_MULT);
+    Matrix_translate(GETREG(NMREG, 0x10) * 0.01f, GETREG(NMREG, 0x11) * 0.01f, 15.f + GETREG(NMREG, 0xe) * 0.01f, MTX_MULT);
+    Matrix_rotateXYZ(0, 0, actor->_68.z, MTX_MULT);
+    Matrix_rotateXYZ(actor->_70, 0, 0, MTX_MULT);
+    Matrix_scale(actor->_14, actor->_14, actor->_14, MTX_MULT);
+    Matrix_rotateXYZ(DEG2SHORT_ANGLE(90), 0, DEG2SHORT_ANGLE(-180), MTX_MULT);
 
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetEnvColor(NEXT_POLY_OPA_DISP, 0, 0xff, 0x9b, 0xff);
@@ -192,7 +192,7 @@ void minsect_hachi_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     _texture_z_light_fog_prim_xlu(game->graph);
     OPEN_POLY_XLU_DISP(game->graph);
     gDPSetEnvColor(POLY_XLU_DISP++, 0xff, 0xff, 0xff, 0xff);
-    Matrix_scale(actor->_5C, 1.0f, 1.0f, TRUE);
+    Matrix_scale(actor->_5C, 1.0f, 1.0f, MTX_MULT);
     gSPMatrix(POLY_XLU_DISP++, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, minsect_mdl[actor->_00][1]);
     CLOSE_POLY_XLU_DISP(game->graph);

src/actor/ac_museum_insect_ka.c_inc

@@ -96,9 +96,9 @@ void minsect_ka_mv(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
 void minsect_ka_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     _texture_z_light_fog_prim(game->graph);
     OPEN_DISP(game->graph);
-    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z, FALSE);
-    Matrix_scale(actor->_14, actor->_14, actor->_14, TRUE);
-    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, TRUE);
+    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z, MTX_LOAD);
+    Matrix_scale(actor->_14, actor->_14, actor->_14, MTX_MULT);
+    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(NEXT_POLY_OPA_DISP, minsect_mdl[actor->_00][0]);
     CLOSE_DISP(game->graph);

src/actor/ac_museum_insect_kabuto.c_inc

@@ -115,11 +115,11 @@ void minsect_kabuto_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     _texture_z_light_fog_prim(game->graph);
 
     OPEN_DISP(game->graph);
-    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z, FALSE);
-    Matrix_rotateXYZ(0, 0, actor->_68.z, TRUE);
-    Matrix_rotateXYZ(actor->_74, 0, 0, TRUE);
-    Matrix_scale(actor->_14, actor->_14, actor->_14, TRUE);
-    Matrix_rotateXYZ(DEG2SHORT_ANGLE(90), 0, DEG2SHORT_ANGLE2(180), TRUE);
+    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z, MTX_LOAD);
+    Matrix_rotateXYZ(0, 0, actor->_68.z, MTX_MULT);
+    Matrix_rotateXYZ(actor->_74, 0, 0, MTX_MULT);
+    Matrix_scale(actor->_14, actor->_14, actor->_14, MTX_MULT);
+    Matrix_rotateXYZ(DEG2SHORT_ANGLE(90), 0, DEG2SHORT_ANGLE2(180), MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetEnvColor(NEXT_POLY_OPA_DISP, 0, 0xff, 0x9b, 0xff);
     gSPDisplayList(NEXT_POLY_OPA_DISP, minsect_mdl[actor->_00][0]);

src/actor/ac_museum_insect_kumo.c_inc

@@ -238,15 +238,15 @@ void minsect_kumo_mv(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
 void minsect_kumo_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     _texture_z_light_fog_prim(game->graph);
     OPEN_DISP(game->graph);
-    Matrix_translate(actor->_1C.x, actor->_1C.y + actor->_58, actor->_1C.z, FALSE);
-    Matrix_rotateXYZ(0, actor->_7C, 0, TRUE);
-    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, TRUE);
-    Matrix_rotateXYZ(0, -actor->_7C, 0, TRUE);
-    Matrix_translate(0.f, -actor->_58, 0.f, TRUE);
-    Matrix_rotateXYZ(0, actor->_78, 0, TRUE);
-    Matrix_translate(0.f, 0.f, -2.5f, TRUE);
-    Matrix_rotateXYZ(DEG2SHORT_ANGLE(-90), DEG2SHORT_ANGLE2(180), 0, TRUE);
-    Matrix_scale(actor->_34.x, actor->_34.y, actor->_34.z, TRUE);
+    Matrix_translate(actor->_1C.x, actor->_1C.y + actor->_58, actor->_1C.z, MTX_LOAD);
+    Matrix_rotateXYZ(0, actor->_7C, 0, MTX_MULT);
+    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, MTX_MULT);
+    Matrix_rotateXYZ(0, -actor->_7C, 0, MTX_MULT);
+    Matrix_translate(0.f, -actor->_58, 0.f, MTX_MULT);
+    Matrix_rotateXYZ(0, actor->_78, 0, MTX_MULT);
+    Matrix_translate(0.f, 0.f, -2.5f, MTX_MULT);
+    Matrix_rotateXYZ(DEG2SHORT_ANGLE(-90), DEG2SHORT_ANGLE2(180), 0, MTX_MULT);
+    Matrix_scale(actor->_34.x, actor->_34.y, actor->_34.z, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetEnvColor(NEXT_POLY_OPA_DISP, 0, 0xff, 0x9b, 0xff);
     if (actor->_80) {
@@ -257,26 +257,26 @@ void minsect_kumo_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     CLOSE_DISP(game->graph);
 
     OPEN_DISP(game->graph);
-    Matrix_translate(actor->_1C.x, actor->_1C.y + actor->_58, actor->_1C.z + (GETREG(NMREG, 0x5F)) * 0.01f, FALSE);
-    Matrix_rotateXYZ(0, actor->_7C, 0, TRUE);
-    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, TRUE);
-    Matrix_rotateXYZ(0, -actor->_7C, 0, TRUE);
-    Matrix_translate(0.0f, -actor->_58, 0.0f, TRUE);
-    Matrix_rotateXYZ(0, actor->_78, 0, TRUE);
+    Matrix_translate(actor->_1C.x, actor->_1C.y + actor->_58, actor->_1C.z + (GETREG(NMREG, 0x5F)) * 0.01f, MTX_LOAD);
+    Matrix_rotateXYZ(0, actor->_7C, 0, MTX_MULT);
+    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, MTX_MULT);
+    Matrix_rotateXYZ(0, -actor->_7C, 0, MTX_MULT);
+    Matrix_translate(0.0f, -actor->_58, 0.0f, MTX_MULT);
+    Matrix_rotateXYZ(0, actor->_78, 0, MTX_MULT);
     if (GETREG(NMREG, 5)) {
-        Matrix_translate(GETREG(NMREG, 4) * 0.001f, GETREG(NMREG, 5) * 0.01f, GETREG(NMREG, 6) * 0.01f, TRUE);
+        Matrix_translate(GETREG(NMREG, 4) * 0.001f, GETREG(NMREG, 5) * 0.01f, GETREG(NMREG, 6) * 0.01f, MTX_MULT);
     } else {
-        Matrix_translate(0.0f, 6.5f, 0.f, TRUE);
+        Matrix_translate(0.0f, 6.5f, 0.f, MTX_MULT);
     }
 
     if (GETREG(NMREG, 7)) {
-        Matrix_scale(1.5f, actor->_58 / ((kumo_top_pos.y - kumo_base_pos.y) - (GETREG(NMREG, 7) * 0.01f)), 1.f, TRUE);
+        Matrix_scale(1.5f, actor->_58 / ((kumo_top_pos.y - kumo_base_pos.y) - (GETREG(NMREG, 7) * 0.01f)), 1.f, MTX_MULT);
     } else {
-        Matrix_scale(2.f, actor->_58 / ((kumo_top_pos.y - kumo_base_pos.y) - 10.f), 1.f, TRUE);
+        Matrix_scale(2.f, actor->_58 / ((kumo_top_pos.y - kumo_base_pos.y) - 10.f), 1.f, MTX_MULT);
     }
-    Matrix_translate(0.f, -8.7f + GETREG(NMREG, 0x5d) * 0.01f, 1.f + GETREG(NMREG, 0x5e) * 0.01f, TRUE);
-    Matrix_rotateXYZ(DEG2SHORT_ANGLE(-90), DEG2SHORT_ANGLE2(180), 0, TRUE);
-    Matrix_scale(actor->_14, actor->_14, actor->_14, TRUE);
+    Matrix_translate(0.f, -8.7f + GETREG(NMREG, 0x5d) * 0.01f, 1.f + GETREG(NMREG, 0x5e) * 0.01f, MTX_MULT);
+    Matrix_rotateXYZ(DEG2SHORT_ANGLE(-90), DEG2SHORT_ANGLE2(180), 0, MTX_MULT);
+    Matrix_scale(actor->_14, actor->_14, actor->_14, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetEnvColor(NEXT_POLY_OPA_DISP, 0, 0xff, 0x9b, 0xff);
     gSPDisplayList(NEXT_POLY_OPA_DISP, minsect_mdl[actor->_00][2]);

src/actor/ac_museum_insect_kuwagata.c_inc

@@ -308,13 +308,13 @@ void minsect_kuwagata_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     }
 
     OPEN_DISP(game->graph);
-    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z + 1.5f + GETREG(NMREG, 0xe) * 0.01f, FALSE);
-    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, TRUE);
-    Matrix_rotateXYZ(-0xe38, 0, 0, TRUE);
-    Matrix_rotateXYZ(0, 0, actor->_74, TRUE);
-    Matrix_rotateXYZ(actor->_78, 0, 0, TRUE);
-    Matrix_scale(actor->_14, actor->_14, actor->_14, TRUE);
-    Matrix_rotateXYZ(DEG2SHORT_ANGLE(90), 0, DEG2SHORT_ANGLE2(180), TRUE);
+    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z + 1.5f + GETREG(NMREG, 0xe) * 0.01f, MTX_LOAD);
+    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, MTX_MULT);
+    Matrix_rotateXYZ(-0xe38, 0, 0, MTX_MULT);
+    Matrix_rotateXYZ(0, 0, actor->_74, MTX_MULT);
+    Matrix_rotateXYZ(actor->_78, 0, 0, MTX_MULT);
+    Matrix_scale(actor->_14, actor->_14, actor->_14, MTX_MULT);
+    Matrix_rotateXYZ(DEG2SHORT_ANGLE(90), 0, DEG2SHORT_ANGLE2(180), MTX_MULT);
 
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     cKF_Si3_draw_R_SV(game, &actor->_08->_00, mtx, NULL, NULL, actor);

src/actor/ac_museum_insect_mino.c_inc

@@ -273,15 +273,15 @@ void minsect_mino_mv(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
 void minsect_mino_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     _texture_z_light_fog_prim(game->graph);
     OPEN_DISP(game->graph);
-    Matrix_translate(actor->_1C.x, actor->_1C.y + actor->_58, actor->_1C.z, FALSE);
-    Matrix_rotateXYZ(0, actor->_7C, 0, TRUE);
-    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, TRUE);
-    Matrix_rotateXYZ(0, -actor->_7C, 0, TRUE);
-    Matrix_translate(0.f, -actor->_58, 0.f, TRUE);
-    Matrix_rotateXYZ(0, actor->_78, 0, TRUE);
-    Matrix_translate(0.f, 0.f, -2.5f, TRUE);
-    Matrix_rotateXYZ(DEG2SHORT_ANGLE(-90), DEG2SHORT_ANGLE2(180), 0, TRUE);
-    Matrix_scale(actor->_34.x, actor->_34.y, actor->_34.z, TRUE);
+    Matrix_translate(actor->_1C.x, actor->_1C.y + actor->_58, actor->_1C.z, MTX_LOAD);
+    Matrix_rotateXYZ(0, actor->_7C, 0, MTX_MULT);
+    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, MTX_MULT);
+    Matrix_rotateXYZ(0, -actor->_7C, 0, MTX_MULT);
+    Matrix_translate(0.f, -actor->_58, 0.f, MTX_MULT);
+    Matrix_rotateXYZ(0, actor->_78, 0, MTX_MULT);
+    Matrix_translate(0.f, 0.f, -2.5f, MTX_MULT);
+    Matrix_rotateXYZ(DEG2SHORT_ANGLE(-90), DEG2SHORT_ANGLE2(180), 0, MTX_MULT);
+    Matrix_scale(actor->_34.x, actor->_34.y, actor->_34.z, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetEnvColor(NEXT_POLY_OPA_DISP, 0, 0xff, 0x9b, 0xff);
     if (actor->_80) {
@@ -289,27 +289,27 @@ void minsect_mino_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     } else {
         gSPDisplayList(NEXT_POLY_OPA_DISP, minsect_mdl[actor->_00][0]);
     }
-    Matrix_translate(actor->_1C.x, actor->_1C.y + actor->_58, actor->_1C.z, FALSE);
-    Matrix_rotateXYZ(0, actor->_7C, 0, TRUE);
-    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, TRUE);
-    Matrix_rotateXYZ(0, -actor->_7C, 0, TRUE);
-    Matrix_translate(0.0f, -actor->_58, 0.0f, TRUE);
-    Matrix_rotateXYZ(0, actor->_78, 0, TRUE);
+    Matrix_translate(actor->_1C.x, actor->_1C.y + actor->_58, actor->_1C.z, MTX_LOAD);
+    Matrix_rotateXYZ(0, actor->_7C, 0, MTX_MULT);
+    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, MTX_MULT);
+    Matrix_rotateXYZ(0, -actor->_7C, 0, MTX_MULT);
+    Matrix_translate(0.0f, -actor->_58, 0.0f, MTX_MULT);
+    Matrix_rotateXYZ(0, actor->_78, 0, MTX_MULT);
     if (GETREG(NMREG, 5)) {
-        Matrix_translate(GETREG(NMREG, 4) * 0.001f, GETREG(NMREG, 5) * 0.01f, GETREG(NMREG, 6) * 0.01f, TRUE);
+        Matrix_translate(GETREG(NMREG, 4) * 0.001f, GETREG(NMREG, 5) * 0.01f, GETREG(NMREG, 6) * 0.01f, MTX_MULT);
     } else if (actor->_80) {
-        Matrix_translate(0.0f, 7.5f, 0.f, TRUE);
+        Matrix_translate(0.0f, 7.5f, 0.f, MTX_MULT);
     } else {
-        Matrix_translate(0.0f, 5.f, 0.f, TRUE);
+        Matrix_translate(0.0f, 5.f, 0.f, MTX_MULT);
     }
     if (GETREG(NMREG, 7)) {
-        Matrix_scale(1.5f, actor->_58 / ((mino_top_pos.y - mino_base_pos.y) - (GETREG(NMREG, 7) * 0.01f)), 1.f, TRUE);
+        Matrix_scale(1.5f, actor->_58 / ((mino_top_pos.y - mino_base_pos.y) - (GETREG(NMREG, 7) * 0.01f)), 1.f, MTX_MULT);
     } else {
-        Matrix_scale(1.5f, actor->_58 / ((mino_top_pos.y - mino_base_pos.y) - 10.f), 1.f, TRUE);
+        Matrix_scale(1.5f, actor->_58 / ((mino_top_pos.y - mino_base_pos.y) - 10.f), 1.f, MTX_MULT);
     }
-    Matrix_translate(0.31f, -8.7f, -2.5f, TRUE);
-    Matrix_rotateXYZ(DEG2SHORT_ANGLE(-90), DEG2SHORT_ANGLE2(180), 0, TRUE);
-    Matrix_scale(actor->_14, actor->_14, actor->_14, TRUE);
+    Matrix_translate(0.31f, -8.7f, -2.5f, MTX_MULT);
+    Matrix_rotateXYZ(DEG2SHORT_ANGLE(-90), DEG2SHORT_ANGLE2(180), 0, MTX_MULT);
+    Matrix_scale(actor->_14, actor->_14, actor->_14, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetEnvColor(NEXT_POLY_OPA_DISP, 0, 0xff, 0x9b, 0xff);
     gSPDisplayList(NEXT_POLY_OPA_DISP, minsect_mdl[actor->_00][2]);

src/actor/ac_museum_insect_okera.c_inc

@@ -202,11 +202,11 @@ void minsect_okera_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     }
     _texture_z_light_fog_prim(game->graph);
     OPEN_DISP(game->graph);
-    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z, FALSE);
+    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z, MTX_LOAD);
     Matrix_rotateXYZ(actor->_68.x, actor->_68.y + (s16)(DEG2SHORT_ANGLE2(GETREG(TAKREG, 4) + 5.f) * sin_s(actor->_76)),
-                     actor->_68.z, TRUE);
-    Matrix_rotateXYZ(actor->_78, 0, 0, TRUE);
-    Matrix_scale(actor->_14, actor->_14, actor->_14, TRUE);
+                     actor->_68.z, MTX_MULT);
+    Matrix_rotateXYZ(actor->_78, 0, 0, MTX_MULT);
+    Matrix_scale(actor->_14, actor->_14, actor->_14, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetEnvColor(NEXT_POLY_OPA_DISP, 0, 0xff, 0x9b, 0xff);
     gSPDisplayList(NEXT_POLY_OPA_DISP, minsect_mdl[actor->_00][0]);

src/actor/ac_museum_insect_semi.c_inc

@@ -96,10 +96,10 @@ void minsect_semi_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     _texture_z_light_fog_prim(game->graph);
 
     OPEN_DISP(game->graph);
-    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z, FALSE);
-    Matrix_rotateXYZ(actor->_72, 0, 0, TRUE);
-    Matrix_scale(actor->_14, actor->_14, actor->_14, TRUE);
-    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, TRUE);
+    Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z, MTX_LOAD);
+    Matrix_rotateXYZ(actor->_72, 0, 0, MTX_MULT);
+    Matrix_scale(actor->_14, actor->_14, actor->_14, MTX_MULT);
+    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetEnvColor(NEXT_POLY_OPA_DISP, 0, 0xff, 0x9b, 0xff);
     gSPDisplayList(NEXT_POLY_OPA_DISP, minsect_mdl[actor->_00][0]);
@@ -110,7 +110,7 @@ void minsect_semi_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     OPEN_POLY_XLU_DISP(game->graph);
     gDPSetEnvColor(POLY_XLU_DISP++, 0xff, 0xff, 0xff, 0xff);
     Matrix_scale(actor->_58 + (GETREG(NMREG, 1) * 0.01f), GETREG(NMREG, 2) * 0.01f + 1.0f,
-                 GETREG(NMREG, 3) * 0.01f + 1.0f, TRUE);
+                 GETREG(NMREG, 3) * 0.01f + 1.0f, MTX_MULT);
     gSPMatrix(POLY_XLU_DISP++, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, minsect_mdl[actor->_00][1]);
     CLOSE_POLY_XLU_DISP(game->graph);

src/actor/ac_museum_insect_tentou.c_inc

@@ -246,11 +246,11 @@ void minsect_tentou_mv(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
 void minsect_tentou_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
     _texture_z_light_fog_prim(game->graph);
     OPEN_DISP(game->graph);
-    Matrix_translate(actor->_1C.x, actor->_1C.y + actor->_60, actor->_1C.z, FALSE);
-    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, TRUE);
-    Matrix_rotateXYZ(actor->_74 + actor->_78, 0, 0, TRUE);
-    Matrix_scale(actor->_14, actor->_14, actor->_14, TRUE);
-    Matrix_scale(actor->_5C, 1.0f, 1.0f, TRUE);
+    Matrix_translate(actor->_1C.x, actor->_1C.y + actor->_60, actor->_1C.z, MTX_LOAD);
+    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, MTX_MULT);
+    Matrix_rotateXYZ(actor->_74 + actor->_78, 0, 0, MTX_MULT);
+    Matrix_scale(actor->_14, actor->_14, actor->_14, MTX_MULT);
+    Matrix_scale(actor->_5C, 1.0f, 1.0f, MTX_MULT);
     gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetEnvColor(NEXT_POLY_OPA_DISP, 0, 0xff, 0x9b, 0xff);
     gSPDisplayList(NEXT_POLY_OPA_DISP, minsect_mdl[actor->_00][0]);

src/actor/ac_museum_insect_tonbo.c_inc

@@ -574,14 +574,14 @@ void minsect_tonbo_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
         arr[gender].x += g_f[gender] * sin_s(player->actor_class.shape_info.rotation.y);
         arr[gender].z += g_f[gender] * cos_s(player->actor_class.shape_info.rotation.y);
         Matrix_translate(actor->_1C.x - arr[gender].x, actor->_58 + (actor->_1C.y - arr[gender].y),
-                         actor->_1C.z - arr[gender].z, FALSE);
-        Matrix_rotateXYZ(actor->_7E, 0, actor->_80, TRUE);
-        Matrix_translate(arr[gender].x, arr[gender].y, arr[gender].z, TRUE);
+                         actor->_1C.z - arr[gender].z, MTX_LOAD);
+        Matrix_rotateXYZ(actor->_7E, 0, actor->_80, MTX_MULT);
+        Matrix_translate(arr[gender].x, arr[gender].y, arr[gender].z, MTX_MULT);
     } else {
-        Matrix_translate(actor->_1C.x, actor->_1C.y + actor->_58, actor->_1C.z, FALSE);
+        Matrix_translate(actor->_1C.x, actor->_1C.y + actor->_58, actor->_1C.z, MTX_LOAD);
     }
-    Matrix_scale(actor->_14, actor->_14, actor->_14, TRUE);
-    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, TRUE);
+    Matrix_scale(actor->_14, actor->_14, actor->_14, MTX_MULT);
+    Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, MTX_MULT);
 
     OPEN_POLY_XLU_DISP(game->graph);
     gSPMatrix(POLY_XLU_DISP++, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);

src/actor/ac_museum_picture.c

@@ -93,8 +93,8 @@ static void aMP_DrawOneArt(aMP_pos_c* pos_xz, Gfx* disp, GAME* game) {
     pos.z = pos_xz->z * 40.0f + 20.0f;
     pos.y = 40.0f;
 
-    Matrix_translate(pos.x, pos.y, pos.z, 0);
-    Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+    Matrix_translate(pos.x, pos.y, pos.z, MTX_LOAD);
+    Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
 
     OPEN_DISP(graph);
 

src/actor/ac_my_house_draw.c_inc

@@ -52,13 +52,13 @@ static int aMHS_actor_draw_before(GAME* game, cKF_SkeletonInfo_R_c* keyframe, in
             }
 
             if (my_house->arg0 == 0) {
-                Matrix_RotateY(angle, 1);
+                Matrix_RotateY(angle, MTX_MULT);
             } else {
-                Matrix_RotateX(angle, 1);
+                Matrix_RotateX(angle, MTX_MULT);
             }
 
             if (my_house->arg0 == 1) {
-                Matrix_RotateZ(DEG2SHORT_ANGLE(-90.0f), 1);
+                Matrix_RotateZ(DEG2SHORT_ANGLE(-90.0f), MTX_MULT);
             }
         } else {
             *joint_shape = NULL; // do not draw fish decoration joints
@@ -252,8 +252,8 @@ static void aMHS_actor_draw(ACTOR* actorx, GAME* game) {
         cKF_Si3_draw_R_SV((GAME*)play, keyframe, mtx, &aMHS_actor_draw_before, &aMHS_actor_draw_after, my_house);
         shadow_data_pp = shadow_data[my_house->arg0];
         Matrix_translate(my_house->actor_class.world.position.x, my_house->actor_class.world.position.y,
-                         my_house->actor_class.world.position.z, 0);
-        Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+                         my_house->actor_class.world.position.z, MTX_LOAD);
+        Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
         (*Common_Get(clip).bg_item_clip->draw_shadow_proc)((GAME*)play, shadow_data_pp[my_house->action & 1], 0);
         aMHS_actor_draw_ta_clr(my_house, (GAME*)play);
     }

src/actor/ac_my_indoor.c

@@ -420,8 +420,8 @@ static void aMI_DrawMyStep(ACTOR* actorx, GAME* game) {
 
                 OPEN_DISP(graph);
 
-                Matrix_translate(pos->x, pos->y, pos->z, 0);
-                Matrix_scale(aMI_scale_x_table[i] * 0.01f, 0.01f, 0.01f, 1);
+                Matrix_translate(pos->x, pos->y, pos->z, MTX_LOAD);
+                Matrix_scale(aMI_scale_x_table[i] * 0.01f, 0.01f, 0.01f, MTX_MULT);
 
                 gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -450,8 +450,8 @@ static void aMI_DrawMyFloor(ACTOR* actorx, GAME* game) {
         graph = game->graph;
 
         _texture_z_light_fog_prim(graph);
-        Matrix_translate(0.0f, 0.0f, 0.0f, 0);
-        Matrix_scale(0.0625f, 0.0625f, 0.0625f, 1);
+        Matrix_translate(0.0f, 0.0f, 0.0f, MTX_LOAD);
+        Matrix_scale(0.0625f, 0.0625f, 0.0625f, MTX_MULT);
 
         OPEN_DISP(graph);
 
@@ -600,8 +600,8 @@ static void aMI_DrawMyOriginalFloor(ACTOR* actorx, GAME* game) {
         graph = game->graph;
 
         _texture_z_light_fog_prim(graph);
-        Matrix_translate(0.0f, 0.0f, 0.0f, 0);
-        Matrix_scale(0.0625f, 0.0625f, 0.0625f, 1);
+        Matrix_translate(0.0f, 0.0f, 0.0f, MTX_LOAD);
+        Matrix_scale(0.0625f, 0.0625f, 0.0625f, MTX_MULT);
 
         OPEN_DISP(graph);
 
@@ -639,8 +639,8 @@ static void aMI_DrawMyWall(ACTOR* actorx, GAME* game) {
         graph = game->graph;
 
         _texture_z_light_fog_prim(graph);
-        Matrix_translate(0.0f, 0.0f, 0.0f, 0);
-        Matrix_scale(0.0625f, 0.0625f, 0.0625f, 1);
+        Matrix_translate(0.0f, 0.0f, 0.0f, MTX_LOAD);
+        Matrix_scale(0.0625f, 0.0625f, 0.0625f, MTX_MULT);
 
         OPEN_DISP(graph);
 
@@ -681,8 +681,8 @@ static void aMI_DrawMyOriginalWall(ACTOR* actorx, GAME* game) {
         graph = game->graph;
 
         _texture_z_light_fog_prim(graph);
-        Matrix_translate(0.0f, 0.0f, 0.0f, 0);
-        Matrix_scale(0.0625f, 0.0625f, 0.0625f, 1);
+        Matrix_translate(0.0f, 0.0f, 0.0f, MTX_LOAD);
+        Matrix_scale(0.0625f, 0.0625f, 0.0625f, MTX_MULT);
 
         OPEN_DISP(graph);
 

src/actor/ac_my_room_draw.c_inc

@@ -214,55 +214,55 @@ static void aMR_DrawOneFurniture(FTR_ACTOR* ftr_actor, ACTOR* actorx, GAME* game
             aMR_fit_ftr_c* fit_ftr_info_p = &parent_ftr->fit_ftr_table[fit_no & 3];
             xyz_t* pos = &fit_ftr_info_p->pos;
 
-            Matrix_translate(fit_ftr_p->position.x, fit_ftr_p->position.y, fit_ftr_p->position.z, 0);
-            Matrix_RotateY(angle, 1);
-            Matrix_translate(fit_ftr_p->base_position.x, fit_ftr_p->base_position.y, fit_ftr_p->base_position.z, 1);
+            Matrix_translate(fit_ftr_p->position.x, fit_ftr_p->position.y, fit_ftr_p->position.z, MTX_LOAD);
+            Matrix_RotateY(angle, MTX_MULT);
+            Matrix_translate(fit_ftr_p->base_position.x, fit_ftr_p->base_position.y, fit_ftr_p->base_position.z, MTX_MULT);
 
             if (ftr_actor->name == 0x9A) { /* lower alarm clock ftr's height */
-                Matrix_translate(pos->x, pos->y - 4.0f, pos->z, 1);
+                Matrix_translate(pos->x, pos->y - 4.0f, pos->z, MTX_MULT);
             } else {
-                Matrix_translate(pos->x, pos->y, pos->z, 1);
+                Matrix_translate(pos->x, pos->y, pos->z, MTX_MULT);
             }
 
-            Matrix_RotateY(ftr_actor->s_angle_y, 1);
-            Matrix_translate(ftr_actor->base_position.x, ftr_actor->base_position.y, ftr_actor->base_position.z, 1);
+            Matrix_RotateY(ftr_actor->s_angle_y, MTX_MULT);
+            Matrix_translate(ftr_actor->base_position.x, ftr_actor->base_position.y, ftr_actor->base_position.z, MTX_MULT);
 
             if (ftr_actor->state == aFTR_STATE_BIRTH && ftr_actor->shape_type <= aFTR_SHAPE_TYPEB_0) {
-                Matrix_translate(mFI_UT_WORLDSIZE_HALF_X_F, 0.0f, 0.0f, 1);
+                Matrix_translate(mFI_UT_WORLDSIZE_HALF_X_F, 0.0f, 0.0f, MTX_MULT);
             }
-            Matrix_scale(ftr_scale.x, ftr_scale.y, ftr_scale.z, 1);
+            Matrix_scale(ftr_scale.x, ftr_scale.y, ftr_scale.z, MTX_MULT);
 
             if (ftr_actor->state == aFTR_STATE_BIRTH && ftr_actor->shape_type <= aFTR_SHAPE_TYPEB_0) {
-                Matrix_translate(-mFI_UT_WORLDSIZE_HALF_X_F, 0.0f, 0.0f, 1);
+                Matrix_translate(-mFI_UT_WORLDSIZE_HALF_X_F, 0.0f, 0.0f, MTX_MULT);
             }
-            Matrix_scale(scale, scale, scale, 1);
+            Matrix_scale(scale, scale, scale, MTX_MULT);
         } else {
             if (ftr_actor->name == 0x9A) { /* lower alarm clock ftr's height */
-                Matrix_translate(ftr_actor->position.x, ftr_actor->position.y - 4.0f, ftr_actor->position.z, 0);
+                Matrix_translate(ftr_actor->position.x, ftr_actor->position.y - 4.0f, ftr_actor->position.z, MTX_LOAD);
             } else {
-                Matrix_translate(ftr_actor->position.x, ftr_actor->position.y, ftr_actor->position.z, 0);
+                Matrix_translate(ftr_actor->position.x, ftr_actor->position.y, ftr_actor->position.z, MTX_LOAD);
             }
 
-            Matrix_RotateY(ftr_actor->s_angle_y, 1);
+            Matrix_RotateY(ftr_actor->s_angle_y, MTX_MULT);
 
             if (Save_Get(scene_no) == SCENE_MUSEUM_ROOM_FOSSIL &&
                 aFTR_CHECK_INTERACTION(profile->interaction_type, aFTR_INTERACTION_TYPE_FOSSIL) &&
                 profile->shape <= aFTR_SHAPE_TYPEB_0) {
                 Matrix_translate(ftr_actor->base_position.x + 2.5f, ftr_actor->base_position.y,
-                                 ftr_actor->base_position.z, 1);
+                                 ftr_actor->base_position.z, MTX_MULT);
             } else {
-                Matrix_translate(ftr_actor->base_position.x, ftr_actor->base_position.y, ftr_actor->base_position.z, 1);
+                Matrix_translate(ftr_actor->base_position.x, ftr_actor->base_position.y, ftr_actor->base_position.z, MTX_MULT);
             }
 
             if (ftr_actor->state == aFTR_STATE_BIRTH && ftr_actor->shape_type <= aFTR_SHAPE_TYPEB_0) {
-                Matrix_translate(mFI_UT_WORLDSIZE_HALF_X_F, 0.0f, 0.0f, 1);
+                Matrix_translate(mFI_UT_WORLDSIZE_HALF_X_F, 0.0f, 0.0f, MTX_MULT);
             }
-            Matrix_scale(ftr_scale.x, ftr_scale.y, ftr_scale.z, 1);
+            Matrix_scale(ftr_scale.x, ftr_scale.y, ftr_scale.z, MTX_MULT);
 
             if (ftr_actor->state == aFTR_STATE_BIRTH && ftr_actor->shape_type <= aFTR_SHAPE_TYPEB_0) {
-                Matrix_translate(-mFI_UT_WORLDSIZE_HALF_X_F, 0.0f, 0.0f, 1);
+                Matrix_translate(-mFI_UT_WORLDSIZE_HALF_X_F, 0.0f, 0.0f, MTX_MULT);
             }
-            Matrix_scale(scale, scale, scale, 1);
+            Matrix_scale(scale, scale, scale, MTX_MULT);
         }
 
         aMR_SetLoopTextureAnime(ftr_actor, profile, game);
@@ -355,8 +355,8 @@ static void aMR_DrawLeaf(MY_ROOM_ACTOR* my_room, GAME_PLAY* play) {
         OPEN_DISP(game->graph);
 
         _texture_z_light_fog_prim(game->graph);
-        Matrix_translate(my_room->leaf_info.pos.x, my_room->leaf_info.pos.y, my_room->leaf_info.pos.z, 0);
-        Matrix_scale(scale, scale, scale, 1);
+        Matrix_translate(my_room->leaf_info.pos.x, my_room->leaf_info.pos.y, my_room->leaf_info.pos.z, MTX_LOAD);
+        Matrix_scale(scale, scale, scale, MTX_MULT);
 
         gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(NEXT_POLY_OPA_DISP, aMR_IconNo2Gfx1(my_room->pickup_info.icon));

src/actor/ac_my_room_move.c_inc

@@ -2556,9 +2556,9 @@ static void aMR_GetItemPosOnMovingFurniture(MY_ROOM_ACTOR* my_room, FTR_ACTOR* f
         s16 angle = ftr_actor->s_angle_y;
         int i;
 
-        Matrix_translate(ftr_actor->position.x, ftr_actor->position.y, ftr_actor->position.z, 0);
-        Matrix_RotateY(angle - parent_ftr->angle_y, 1);
-        Matrix_translate(ftr_actor->base_position.x, ftr_actor->base_position.y, ftr_actor->base_position.z, 1);
+        Matrix_translate(ftr_actor->position.x, ftr_actor->position.y, ftr_actor->position.z, MTX_LOAD);
+        Matrix_RotateY(angle - parent_ftr->angle_y, MTX_MULT);
+        Matrix_translate(ftr_actor->base_position.x, ftr_actor->base_position.y, ftr_actor->base_position.z, MTX_MULT);
 
         for (i = 0; i < aMR_FIT_FTR_MAX; i++) {
             if (parent_ftr->fit_ftr_table[i].exist_flag == TRUE) {

src/actor/ac_needlework_indoor.c

@@ -172,8 +172,8 @@ static void aNI_DrawManekin(ACTOR* actorx, GAME* game) {
 
         _texture_z_light_fog_prim(game->graph);
         Matrix_translate(actor->cloth_move_bg[i].pos.x, actor->cloth_move_bg[i].pos.y,
-                          actor->cloth_move_bg[i].pos.z, 0);
-        Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+                          actor->cloth_move_bg[i].pos.z, MTX_LOAD);
+        Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
 
         gSPSegment(NEXT_POLY_OPA_DISP, ANIME_1_TXT_SEG, texture);
         gSPSegment(NEXT_POLY_OPA_DISP, ANIME_2_TXT_SEG, palette);
@@ -199,8 +199,8 @@ static void aNI_DrawUmbrella(ACTOR* actorx, GAME* game) {
 
         _texture_z_light_fog_prim(game->graph);
         Matrix_translate(actor->umbrella_move_bg[i].pos.x, actor->umbrella_move_bg[i].pos.y,
-                          actor->umbrella_move_bg[i].pos.z, 0);
-        Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+                          actor->umbrella_move_bg[i].pos.z, MTX_LOAD);
+        Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
 
         gSPSegment(NEXT_POLY_OPA_DISP, ANIME_2_TXT_SEG, texture);
         gSPSegment(NEXT_POLY_OPA_DISP, ANIME_1_TXT_SEG, palette);

src/actor/ac_needlework_shop_draw.c_inc

@@ -108,7 +108,7 @@ static void aNW_actor_draw(ACTOR* actor, GAME* game) {
             CLOSE_DISP(graph);
 
             cKF_Si3_draw_R_SV(game, keyframe, mtx, &aNW_actor_draw_before, &aNW_actor_draw_after, actor);
-            Matrix_translate(0.0f, 60.0f, 0.0f, TRUE);
+            Matrix_translate(0.0f, 60.0f, 0.0f, MTX_MULT);
             (*Common_Get(clip).bg_item_clip->draw_shadow_proc)(game, &aNW_shadow_data, FALSE);
         }
     }

src/actor/ac_psnowman.c

@@ -138,9 +138,9 @@ static void aPSM_actor_draw(ACTOR* actor, GAME* game) {
     gSPMatrix(gfx++, _Matrix_to_Mtx_new(graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(gfx++, act_darumaB_model);
     Matrix_translate(actor->world.position.x, actor->world.position.y + snowman->eye_heigth, actor->world.position.z,
-                     FALSE);
-    Matrix_RotateX(0xF380, TRUE);
-    Matrix_scale(snowman->head_scale, snowman->head_scale, snowman->head_scale, TRUE);
+                     MTX_LOAD);
+    Matrix_RotateX(0xF380, MTX_MULT);
+    Matrix_scale(snowman->head_scale, snowman->head_scale, snowman->head_scale, MTX_MULT);
 
     if (snowman->speed > 20.0f) {
         mRlib_PSnowmanBreakNeckSwing(&snowman->head_angle, snowman->speed, snowman->head);

src/actor/ac_quest_manager.c

@@ -1360,7 +1360,7 @@ static void aQMgr_actor_move_main(ACTOR* actorx, GAME* game) {
 
     u8 mode = *manager->mode;
 
-    if (mEv_CheckTitleDemo() <= 0) {
+    if (mEv_IsNotTitleDemo()) {
         (*move_proc[mode])(manager);
     }
 

src/actor/ac_radio_move.c_inc

@@ -11,7 +11,7 @@ static void aRAD_wait(RADIO_ACTOR* radio, GAME_PLAY* play){
     if(radio->next_action >= 0x24){
         radio->next_action = 0;
         Matrix_push();
-        Matrix_translate(radio->actor_class.world.position.x,radio->actor_class.world.position.y, radio->actor_class.world.position.z, 0);
+        Matrix_translate(radio->actor_class.world.position.x,radio->actor_class.world.position.y, radio->actor_class.world.position.z, MTX_LOAD);
         Matrix_Position(&def, &newPos);
         Matrix_pull();
 

src/actor/ac_shop_goods.c

@@ -289,11 +289,11 @@ static void Shop_Goods_Actor_single_drawR(GAME* game, mActor_name_t item, xyz_t*
             LightsN_list_check(lightsN, play->global_light.list, pos);
             LightsN_disp(lightsN, play->game.graph);
 
-            Matrix_translate(pos->x, pos->y, pos->z, 0);
+            Matrix_translate(pos->x, pos->y, pos->z, MTX_LOAD);
             if ((data_p->flags & aSG_DATA_ROTATE_Y_FLAG) && layer == mCoBG_LAYER1) {
-                Matrix_RotateY(angle_y, 1);
+                Matrix_RotateY(angle_y, MTX_MULT);
             }
-            Matrix_scale(scale->x, scale->y, scale->z, 1);
+            Matrix_scale(scale->x, scale->y, scale->z, MTX_MULT);
 
             gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(NEXT_POLY_OPA_DISP, data_p->gfx0[mode]);
@@ -438,11 +438,11 @@ static void aSG_DrawGoods(GRAPH* graph, Global_light* glight, SHOP_GOODS_ACTOR*
     LightsN_disp(lightsN, graph);
 
     if (gfx0 != NULL || xlu_gfx0 != NULL) {
-        Matrix_translate(pos.x, pos.y, pos.z, 0);
+        Matrix_translate(pos.x, pos.y, pos.z, MTX_LOAD);
         if ((data_p->flags & aSG_DATA_ROTATE_Y_FLAG) && layer == mCoBG_LAYER1) {
-            Matrix_RotateY(SG_angle_y[uz][ux], 1);
+            Matrix_RotateY(SG_angle_y[uz][ux], MTX_MULT);
         }
-        Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+        Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
 
         if (gfx0 != NULL) {
             _texture_z_light_fog_prim(graph);

src/actor/ac_shop_indoor.c

@@ -308,8 +308,8 @@ static void aSI_DrawShopFloor(ACTOR* actorx, GAME* game) {
             gSPSegment(NEXT_POLY_OPA_DISP, ANIME_4_TXT_SEG, tex3);
             gSPSegment(NEXT_POLY_OPA_DISP, ANIME_5_TXT_SEG, pal);
 
-            Matrix_translate(0.0f, 0.0f, 0.0f, 0);
-            Matrix_scale(0.0625f, 0.0625f, 0.0625f, 1);
+            Matrix_translate(0.0f, 0.0f, 0.0f, MTX_LOAD);
+            Matrix_scale(0.0625f, 0.0625f, 0.0625f, MTX_MULT);
 
             gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(NEXT_POLY_OPA_DISP, aSI_disp_data_table[shop_level].floor_gfx);
@@ -327,8 +327,8 @@ static void aSI_DrawShopFloor(ACTOR* actorx, GAME* game) {
             gSPSegment(NEXT_POLY_XLU_DISP, ANIME_4_TXT_SEG, tex3);
             gSPSegment(NEXT_POLY_XLU_DISP, ANIME_5_TXT_SEG, pal);
 
-            Matrix_translate(0.0f, 0.0f, 0.0f, 0);
-            Matrix_scale(0.0625f, 0.0625f, 0.0625f, 1);
+            Matrix_translate(0.0f, 0.0f, 0.0f, MTX_LOAD);
+            Matrix_scale(0.0625f, 0.0625f, 0.0625f, MTX_MULT);
 
             gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(NEXT_POLY_XLU_DISP, aSI_disp_data_table[shop_level].floor_xlu_gfx);
@@ -354,8 +354,8 @@ static void aSI_DrawShopFukubiki(ACTOR* actorx, GAME* game) {
 
         OPEN_DISP(game->graph);
 
-        Matrix_translate(0.0f, 0.0f, 0.0f, 0);
-        Matrix_scale(0.0625f, 0.0625f, 0.0625f, 1);
+        Matrix_translate(0.0f, 0.0f, 0.0f, MTX_LOAD);
+        Matrix_scale(0.0625f, 0.0625f, 0.0625f, MTX_MULT);
 
         gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         Global_kankyo_set_room_prim(game);
@@ -368,8 +368,8 @@ static void aSI_DrawShopFukubiki(ACTOR* actorx, GAME* game) {
         _texture_z_light_fog_prim_xlu(game->graph);
         OPEN_DISP(game->graph);
 
-        Matrix_translate(0.0f, 0.0f, 0.0f, 0);
-        Matrix_scale(0.0625f, 0.0625f, 0.0625f, 1);
+        Matrix_translate(0.0f, 0.0f, 0.0f, MTX_LOAD);
+        Matrix_scale(0.0625f, 0.0625f, 0.0625f, MTX_MULT);
 
         gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(NEXT_POLY_XLU_DISP, aSI_disp_data_table[shop_level].fukubiki_xlu_gfx);
@@ -404,8 +404,8 @@ static void aSI_DrawShopWall(ACTOR* actorx, GAME* game) {
         gSPSegment(NEXT_POLY_OPA_DISP, ANIME_2_TXT_SEG, tex1);
         gSPSegment(NEXT_POLY_OPA_DISP, ANIME_3_TXT_SEG, pal);
 
-        Matrix_translate(0.0f, 0.0f, 0.0f, 0);
-        Matrix_scale(0.0625f, 0.0625f, 0.0625f, 1);
+        Matrix_translate(0.0f, 0.0f, 0.0f, MTX_LOAD);
+        Matrix_scale(0.0625f, 0.0625f, 0.0625f, MTX_MULT);
 
         gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         Global_kankyo_set_room_prim(game);
@@ -426,8 +426,8 @@ static void aSI_DrawShopWall(ACTOR* actorx, GAME* game) {
         gSPSegment(NEXT_POLY_XLU_DISP, ANIME_2_TXT_SEG, tex1);
         gSPSegment(NEXT_POLY_XLU_DISP, ANIME_3_TXT_SEG, pal);
 
-        Matrix_translate(0.0f, 0.0f, 0.0f, 0);
-        Matrix_scale(0.0625f, 0.0625f, 0.0625f, 1);
+        Matrix_translate(0.0f, 0.0f, 0.0f, MTX_LOAD);
+        Matrix_scale(0.0625f, 0.0625f, 0.0625f, MTX_MULT);
 
         gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         Global_kankyo_set_room_prim(game);

src/actor/ac_shop_manekin.c

@@ -264,8 +264,8 @@ static void Shop_Manekin_Actor_draw(ACTOR* actorx, GAME* game) {
             OPEN_DISP(game->graph);
 
             _texture_z_light_fog_prim(game->graph);
-            Matrix_translate(pos.x, pos.y, pos.z, 0);
-            Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+            Matrix_translate(pos.x, pos.y, pos.z, MTX_LOAD);
+            Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
             lights = Global_light_read(&play->global_light, game->graph);
             LightsN_list_check(lights, play->global_light.list, &pos);
             LightsN_disp(lights, game->graph);

src/actor/ac_shop_umbrella.c

@@ -338,8 +338,8 @@ static void Shop_Umbrella_Actor_draw(ACTOR* actorx, GAME* game) {
             lights = Global_light_read(&play->global_light, play->game.graph);
             LightsN_list_check(lights, play->global_light.list, &pos);
             LightsN_disp(lights, play->game.graph);
-            Matrix_translate(pos.x, pos.y, pos.z, 0);
-            Matrix_scale(scale, scale, scale, 1);
+            Matrix_translate(pos.x, pos.y, pos.z, MTX_LOAD);
+            Matrix_scale(scale, scale, scale, MTX_MULT);
 
             gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_LOAD | G_MTX_NOPUSH);
             gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_LOAD | G_MTX_NOPUSH);

src/actor/ac_shrine_move.c_inc

@@ -106,8 +106,8 @@ static void aSHR_Present_move(aSHR_Present_c* present, SHRINE_ACTOR* shrine, GAM
             Matrix_push();
             Matrix_translate(shrine->structure_class.actor_class.world.position.x + present->trans.x,
                              shrine->structure_class.actor_class.world.position.y + present->trans.y,
-                             shrine->structure_class.actor_class.world.position.z + present->trans.z, 0);
-            Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+                             shrine->structure_class.actor_class.world.position.z + present->trans.z, MTX_LOAD);
+            Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
             Matrix_get(&handOverItem->tools_class.matrix_work);
             Matrix_pull();
             handOverItem->tools_class.init_matrix = TRUE;

src/actor/ac_sign.c

@@ -839,8 +839,8 @@ static void aSIGN_single_all_draw(SIGN_ACTOR* sign, GAME* game) {
             player_no = (sign->single[i].item >> 3) & 3;
             my_original_idx = sign->single[i].item & 7;
 
-            Matrix_translate(sign_pos.x, sign_pos.y, sign_pos.z - 1.0f, 0);
-            Matrix_scale(sign->single[i].scale.x, sign->single[i].scale.y, sign->single[i].scale.z, 1);
+            Matrix_translate(sign_pos.x, sign_pos.y, sign_pos.z - 1.0f, MTX_LOAD);
+            Matrix_scale(sign->single[i].scale.x, sign->single[i].scale.y, sign->single[i].scale.z, MTX_MULT);
 
             OPEN_POLY_OPA_DISP(graph);
 

src/actor/ac_snowman.c

@@ -1421,8 +1421,8 @@ static void aSMAN_actor_draw(ACTOR* actorx, GAME* game) {
     int idx;
 
     if ((actor->flags & aSMAN_FLAG_HEAD_JUMP) == 0 || actor->process != aSMAN_process_combine_head) {
-        Matrix_translate(0.0f, actor->y_ofs, 0.0, 1);
-        Matrix_rotateXYZ(actor->head_vec.x, actor->head_vec.y, actor->head_vec.z, 1);
+        Matrix_translate(0.0f, actor->y_ofs, 0.0, MTX_MULT);
+        Matrix_rotateXYZ(actor->head_vec.x, actor->head_vec.y, actor->head_vec.z, MTX_MULT);
         idx = 1;
     } else {
         idx = 0;

src/actor/ac_station_draw.c_inc

@@ -5,10 +5,10 @@ static int aSTA_actor_draw_before(GAME* game, cKF_SkeletonInfo_R_c* keyframe, in
                                    u8* joint_flags, void* arg, s_xyz* joint_rot, xyz_t* joint_pos) {
     switch (joint_idx) {
         case 4:
-            Matrix_RotateZ(-Common_Get(time.rad_hour), 1);
+            Matrix_RotateZ(-Common_Get(time.rad_hour), MTX_MULT);
             break;
         case 2:
-            Matrix_RotateZ(-Common_Get(time.rad_min), 1);
+            Matrix_RotateZ(-Common_Get(time.rad_min), MTX_MULT);
             break;
     }
 

src/actor/ac_tama_draw.c_inc

@@ -14,7 +14,7 @@ static void aTAM_actor_draw(ACTOR* actorx, GAME* game) {
   _texture_z_light_fog_prim(graph);
   gfx = NOW_POLY_OPA_DISP;
   gSPSegment(gfx++, G_MWO_SEGMENT_8, pal);
-  Matrix_translate(0.0f, 0.0f, 4000.0f, 1);
+  Matrix_translate(0.0f, 0.0f, 4000.0f, MTX_MULT);
   mtx = _Matrix_to_Mtx_new(graph);
 
   if (mtx != NULL) {

src/actor/ac_train0_draw.c_inc

@@ -10,8 +10,8 @@ static void aTR0_actor_draw(ACTOR* actor, GAME* game) {
     if (mtx != NULL) {
         _texture_z_light_fog_prim_npc(graph);
         Matrix_push();
-        Matrix_translate(train0->arg0_f, train0->actor_class.world.position.y, train0->actor_class.world.position.z, 0);
-        Matrix_scale(train0->actor_class.scale.x, train0->actor_class.scale.y, train0->actor_class.scale.z, 1);
+        Matrix_translate(train0->arg0_f, train0->actor_class.world.position.y, train0->actor_class.world.position.z, MTX_LOAD);
+        Matrix_scale(train0->actor_class.scale.x, train0->actor_class.scale.y, train0->actor_class.scale.z, MTX_MULT);
 
         OPEN_POLY_OPA_DISP(graph);
 

src/actor/ac_train0_move.c_inc

@@ -33,7 +33,7 @@ static void aTR0_set_effect(ACTOR* actor, GAME* game) {
         pos.x += 36.0f;
         pos.y += 110.0f;
 
-        if (mEv_CheckTitleDemo() == 0) {
+        if (mEv_CheckTitleDemo() == mEv_TITLEDEMO_NONE) {
             eEC_CLIP->effect_make_proc(eEC_EFFECT_KISHA_KEMURI, pos, 1, 0, game, train0->actor_class.npc_id, 0, 0);
         }
     } else {
@@ -52,7 +52,7 @@ static void aTR0_steam_work_sub(ACTOR* actor, GAME* game, int x_idx) {
     pos.y = train0->actor_class.world.position.y + 21.0f;
     pos.z = train0->actor_class.world.position.z + 42.0f;
     unk2c0 = train0->arg2;
-    if (mEv_CheckTitleDemo() == 0) {
+    if (mEv_CheckTitleDemo() == mEv_TITLEDEMO_NONE) {
         (*Common_Get(clip.effect_clip)->effect_make_proc)(eEC_EFFECT_STEAM, pos, 1, angl[x_idx], game,
                                                           train0->actor_class.npc_id, 0, 0);
     }
@@ -177,7 +177,7 @@ static void aTR0_actor_move(ACTOR* actor, GAME* game) {
         aTR0_steam_work(actor, game);
     }
 
-    if (mEv_CheckTitleDemo() == 1) {
+    if (mEv_CheckTitleDemo() == mEv_TITLEDEMO_START1) {
         train0->arg0_f = -125.0f + train0->actor_class.world.position.x;
     } else {
         aTR0_ctrl_back_car(actor);

src/actor/ac_train1_move.c_inc

@@ -112,7 +112,7 @@ static void aTR1_setupAction(TRAIN1_ACTOR* train1, int action) {
     train1->action = action;
 
     if ((train1->action == 6) || (train1->action == 4)) {
-        if ((mEv_CheckTitleDemo() == 0) && (tr_speed != train1->arg0_f)) {
+        if ((mEv_CheckTitleDemo() == mEv_TITLEDEMO_NONE) && (tr_speed != train1->arg0_f)) {
             aTR1_OngenTrgStart((ACTOR*)train1, 43);
         } else {
             tr_speed = end;
@@ -129,7 +129,7 @@ static void aTR1_actor_move(ACTOR* actor, GAME* game) {
     cKF_SkeletonInfo_R_c* keyframe = &train1->keyframe;
 
     train1->keyframe_state = cKF_SkeletonInfo_R_play(keyframe);
-    if (mEv_CheckTitleDemo() <= 0) {
+    if (mEv_IsNotTitleDemo()) {
         aTR1_position_move((ACTOR*)train1);
     }
     aTR1_passenger_ctrl((ACTOR*)train1);

src/actor/ac_train_window.c

@@ -505,8 +505,8 @@ static void Train_Window_Actor_draw(ACTOR* actor, GAME* game) {
     TRAIN_WINDOW_ACTOR* window = (TRAIN_WINDOW_ACTOR*)actor;
 
     GRAPH* graph = game->graph;
-    Matrix_translate(0.0f, 0.0f, 0.0f, FALSE);
-    Matrix_scale(0.05f, 0.05f, 0.05f, TRUE);
+    Matrix_translate(0.0f, 0.0f, 0.0f, MTX_LOAD);
+    Matrix_scale(0.05f, 0.05f, 0.05f, MTX_MULT);
 
     OPEN_DISP(graph);
 

src/actor/ac_uki_draw.c_inc

@@ -19,27 +19,27 @@ static void aUKI_actor_draw(ACTOR* actorx, GAME* game) {
 
     OPEN_POLY_OPA_DISP(graph);
 
-    Matrix_mult(&uki->mtxf, 1);
+    Matrix_mult(&uki->mtxf, MTX_MULT);
     gDPPipeSync(POLY_OPA_DISP++);
 
     switch (uki->proc) {
         case aUKI_PROC_CARRY:
             aUKI_rotate_calc(uki);
-            Matrix_RotateY(player_actor->shape_info.rotation.y, 1);
+            Matrix_RotateY(player_actor->shape_info.rotation.y, MTX_MULT);
             break;
         case aUKI_PROC_READY:
         case aUKI_PROC_AIR:
             uki->uki_angle.x = search_position_angleX(&actorx->world.position, &uki->rod_top_position);
             uki->uki_angle.y = search_position_angleY(&actorx->world.position, &uki->rod_top_position);
             uki->uki_angle.x += DEG2SHORT_ANGLE2(180.0f);
-            Matrix_RotateY(uki->uki_angle.y, 1);
-            Matrix_RotateX(uki->uki_angle.x, 1);
+            Matrix_RotateY(uki->uki_angle.y, MTX_MULT);
+            Matrix_RotateX(uki->uki_angle.x, MTX_MULT);
             break;
         case aUKI_PROC_CAST:
             add_calc_short_angle2(&uki->uki_angle.x, DEG2SHORT_ANGLE2(90.0f), 1.0f - sqrtf(0.95f), 1024, 0);
             uki->uki_angle.y = search_position_angleY(&actorx->world.position, &uki->rod_top_position);
-            Matrix_RotateY(uki->uki_angle.y, 1);
-            Matrix_RotateX(uki->uki_angle.x, 1);
+            Matrix_RotateY(uki->uki_angle.y, MTX_MULT);
+            Matrix_RotateX(uki->uki_angle.x, MTX_MULT);
             break;
         case aUKI_PROC_HIT:
             uki->uki_angle.y = search_position_angleY(&actorx->world.position, &uki->rod_top_position);
@@ -49,8 +49,8 @@ static void aUKI_actor_draw(ACTOR* actorx, GAME* game) {
                 uki->uki_angle.x = search_position_angleX(&actorx->world.position, &uki->rod_top_position);
                 uki->uki_angle.x += DEG2SHORT_ANGLE2(-90.0f);
             }
-            Matrix_RotateY(uki->uki_angle.y, 1);
-            Matrix_RotateX(uki->uki_angle.x, 1);
+            Matrix_RotateY(uki->uki_angle.y, MTX_MULT);
+            Matrix_RotateX(uki->uki_angle.x, MTX_MULT);
             break;
         case aUKI_PROC_WAIT:
             if (uki->cast_timer == 0) {
@@ -60,13 +60,13 @@ static void aUKI_actor_draw(ACTOR* actorx, GAME* game) {
                 add_calc_short_angle2(&uki->uki_angle.x, DEG2SHORT_ANGLE2(90.0f), 1.0f - sqrtf(0.95f), 1024, 0);
             }
             uki->uki_angle.y = search_position_angleY(&actorx->world.position, &uki->rod_top_position);
-            Matrix_RotateY(uki->uki_angle.y, 1);
-            Matrix_RotateX(uki->uki_angle.x, 1);
+            Matrix_RotateY(uki->uki_angle.y, MTX_MULT);
+            Matrix_RotateX(uki->uki_angle.x, MTX_MULT);
             break;
         case aUKI_PROC_BITE:
             if (uki->gyo_status == 4) {
                 add_calc_short_angle2(&uki->uki_angle.x, DEG2SHORT_ANGLE2(-90.0f), 1.0f - sqrtf(0.95f), 1024, 0);
-                Matrix_RotateY(uki->uki_angle.y, 1);
+                Matrix_RotateY(uki->uki_angle.y, MTX_MULT);
             }
             break;
     }
@@ -74,7 +74,7 @@ static void aUKI_actor_draw(ACTOR* actorx, GAME* game) {
     gSPMatrix(POLY_OPA_DISP++, _Matrix_to_Mtx_new(graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetPrimColor(POLY_OPA_DISP++, 0, 128, uki->color[0], uki->color[1], uki->color[2], 255);
 
-    if (mEv_CheckTitleDemo() > 0) {
+    if (mEv_IsTitleDemo()) {
         item = mPlib_Get_controller_data_for_title_demo_p()->equipped_item;
     } else {
         item = Now_Private->equipment;

src/actor/ac_weather.c

@@ -250,7 +250,7 @@ static void aWeather_ChangeEnvSE(ACTOR* actorx, GAME* game, s16 status, s16 leve
         weather->current_sound_effect = -1000;
     }
 
-    if (mEv_CheckTitleDemo() <= 0) {
+    if (mEv_IsNotTitleDemo()) {
         if (Save_Get(scene_no) == SCENE_START_DEMO || Save_Get(scene_no) == SCENE_START_DEMO2 ||
             Save_Get(scene_no) == SCENE_START_DEMO3) {
             return;
@@ -383,14 +383,14 @@ static void Weather_Actor_ct(ACTOR* actor, GAME* game) {
 
     aWeather_SetClip(actor, 0);
 
-    if (mEv_CheckTitleDemo() > 0) {
-        cur = mEv_CheckTitleDemo() - 1;
+    if (mEv_IsTitleDemo()) {
+        cur = mEv_CheckTitleDemo() - mEv_TITLEDEMO_START1;
 
         weather->current_status = DemoWeatherTbl[cur][0];
         weather->next_status = DemoWeatherTbl[cur][0];
         weather->current_level = DemoWeatherTbl[cur][1];
         weather->current_aim_level = DemoWeatherTbl[cur][1];
-    } else if (mFI_GetClimate() == 1) {
+    } else if (mFI_GetClimate() == mFI_CLIMATE_ISLAND) {
         weather->current_status = Common_Get(island_weather);
         weather->next_status = Common_Get(island_weather);
         weather->current_level = Common_Get(island_weather_intensity);
@@ -595,7 +595,7 @@ static void aWeather_ChangeWeatherTime0(ACTOR* actorx) {
     s16 evWeather, evIntensity;
     s16 save_weather;
 
-    if ((mEv_CheckTitleDemo() <= 0)) {
+    if (mEv_IsNotTitleDemo()) {
         if ((Save_Get(scene_no) == SCENE_START_DEMO) || (Save_Get(scene_no) == SCENE_START_DEMO2) ||
             Save_Get(scene_no) == SCENE_START_DEMO3) {
             return;
@@ -607,21 +607,21 @@ static void aWeather_ChangeWeatherTime0(ACTOR* actorx) {
                 rndWeather = evWeather;
                 rndIntensity = evIntensity;
             }
-            if ((mEv_CheckRealArbeit() == 1) && (rndWeather == 1)) {
-                rndWeather = 0;
-                rndIntensity = 0;
+            if ((mEv_CheckRealArbeit() == TRUE) && (rndWeather == mEnv_WEATHER_RAIN)) {
+                rndWeather = mEnv_WEATHER_CLEAR;
+                rndIntensity = mEnv_WEATHER_INTENSITY_NONE;
             }
             mTM_off_renew_time(0);
 
             save_weather = mEnv_SAVE_GET_WEATHER_TYPE(Save_Get(weather));
-            if (rndWeather == 0 || rndWeather == 3) {
-                if (save_weather == 2 || save_weather == 1) {
+            if (rndWeather == mEnv_WEATHER_CLEAR || rndWeather == mEnv_WEATHER_SAKURA) {
+                if (save_weather == mEnv_WEATHER_SNOW || save_weather == mEnv_WEATHER_RAIN) {
                     mEnv_PreRainNowFine_Init();
                 }
             }
             Save_Set(weather, rndIntensity | (rndWeather * 16));
 
-            if (((mEv_CheckTitleDemo() != -9) || (weather->sound_flag != 1)) && (mFI_CheckInIsland() == 0)) {
+            if (((mEv_CheckTitleDemo() != mEv_TITLEDEMO_STAFFROLL) || (weather->sound_flag != 1)) && (mFI_CheckInIsland() == 0)) {
                 aWeather_RequestChangeWeather(actorx, rndWeather, rndIntensity);
             }
             Common_Set(weather_time, Common_Get(time.rtc_time));

src/actor/ac_weather_rain.c

@@ -74,7 +74,7 @@ static void aWeatherRain_make(ACTOR* actor, GAME* game) {
             pos_mod.x += x;
             pos_mod.z += z;
 
-            if (mEv_CheckTitleDemo() == -9) {
+            if (mEv_CheckTitleDemo() == mEv_TITLEDEMO_STAFFROLL) {
                 PLAYER_ACTOR* player = get_player_actor_withoutCheck(play);
 
                 pos_mod.y = 70.0f + (120.0f + player->actor_class.world.position.y);
@@ -108,7 +108,7 @@ static void aWeatherRain_MakePicha(ACTOR* actor, GAME* game, xyz_t pos) {
     f32 y;
 
     if (priv_num != -1) {
-        if (mEv_CheckTitleDemo() == -9) {
+        if (mEv_CheckTitleDemo() == mEv_TITLEDEMO_STAFFROLL) {
             PLAYER_ACTOR* player = get_player_actor_withoutCheck(play);
 
             y = player->actor_class.world.position.y;
@@ -182,9 +182,9 @@ void aWeatherRain_draw(aWeather_Priv* priv, GAME* game) {
 
         disp = disp >> 1;
 
-        Matrix_translate(pos.x, pos.y, pos.z, FALSE);
-        Matrix_mult(&play->billboard_matrix, 1);
-        Matrix_scale(picha_scale[0], picha_scale[1], picha_scale[2], TRUE);
+        Matrix_translate(pos.x, pos.y, pos.z, MTX_LOAD);
+        Matrix_mult(&play->billboard_matrix, MTX_MULT);
+        Matrix_scale(picha_scale[0], picha_scale[1], picha_scale[2], MTX_MULT);
 
         OPEN_DISP(graph);
 

src/actor/npc/ac_npc_ct.c_inc

@@ -343,7 +343,7 @@ static void aNPC_actor_ct(ACTOR* actorx, GAME* game, aNPC_ct_data_c* ct_data) {
 
         nactorx->draw.frame_sub_speed = 1.0f;
 
-        if (mEv_CheckTitleDemo() > 0) {
+        if (mEv_IsTitleDemo()) {
             actorx->status_data.weight = 0;
         }
 

src/actor/npc/ac_npc_ctrl.c_inc

@@ -1046,7 +1046,7 @@ static void aNPC_actor_move_c(ACTOR* actorx, GAME* game) {
     GAME_PLAY* play = (GAME_PLAY*)game;
 
     aNPC_dma_cloth_data(actorx);
-    if (mEv_CheckTitleDemo() <= 0) {
+    if (mEv_IsNotTitleDemo()) {
         aNPC_greeting_area_check(play);
     }
 

src/actor/npc/ac_npc_draw.c_inc

@@ -41,16 +41,16 @@ static void aNPC_set_chn_base(GAME* game, NPC_ACTOR* nactorx, s_xyz* rot_p, xyz_
                             actorx->world.position.z);
     }
 
-    Matrix_scale(0.01f, actorx->scale.y, 0.01f, 1);
-    Matrix_translate(trans_p->x, trans_p->y, trans_p->z, 1);
-    Matrix_scale(actorx->scale.x * 100.0f, 1.0f, actorx->scale.z * 100.0f, 1);
+    Matrix_scale(0.01f, actorx->scale.y, 0.01f, MTX_MULT);
+    Matrix_translate(trans_p->x, trans_p->y, trans_p->z, MTX_MULT);
+    Matrix_scale(actorx->scale.x * 100.0f, 1.0f, actorx->scale.z * 100.0f, MTX_MULT);
     bzero(trans_p, sizeof(xyz_t));
 }
 
 static void aNPC_set_head_angl(GAME* game, NPC_ACTOR* nactorx, s_xyz* rot_p, xyz_t* trans_p) {
     s_xyz world_rot;
 
-    Matrix_to_rotate_new(get_Matrix_now(), &world_rot, 0);
+    Matrix_to_rotate_new(get_Matrix_now(), &world_rot, MTX_LOAD);
     aNPC_search_eye_target(nactorx, (GAME_PLAY*)game, &world_rot, rot_p);
     rot_p->x = nactorx->head.angle_y;
     rot_p->y = nactorx->head.angle_x;
@@ -106,7 +106,7 @@ static void aNPC_set_right_hand_item(GAME* game, NPC_ACTOR* nactorx, int joint_i
         f32 scale = 1.0f / (nactorx->actor_class.scale.x * 100.0f);
 
         Matrix_push();
-        Matrix_scale(scale, scale, scale, 1);
+        Matrix_scale(scale, scale, scale, MTX_MULT);
         Matrix_get(&item_p->matrix_work);
         item_p->init_matrix = TRUE;
         Matrix_pull();
@@ -120,8 +120,8 @@ static void aNPC_set_left_hand_item(GAME* game, NPC_ACTOR* nactorx, int joint_id
     item_p = (TOOLS_ACTOR*)nactorx->left_hand.item_actor_p;
     if (item_p != NULL) {
         Matrix_push();
-        Matrix_translate(nactorx->left_hand.pos.x, nactorx->left_hand.pos.y, nactorx->left_hand.pos.z, 0);
-        Matrix_scale(0.01f, 0.01f, 0.01f, 1);
+        Matrix_translate(nactorx->left_hand.pos.x, nactorx->left_hand.pos.y, nactorx->left_hand.pos.z, MTX_LOAD);
+        Matrix_scale(0.01f, 0.01f, 0.01f, MTX_MULT);
         Matrix_get(&item_p->matrix_work);
         item_p->init_matrix = TRUE;
         Matrix_pull();
@@ -156,7 +156,7 @@ static void aNPC_set_accessory_mtx(NPC_ACTOR* nactorx, int joint_idx) {
             f32 scale = 1.0f / (nactorx->actor_class.scale.x * 100.0f);
 
             Matrix_push();
-            Matrix_scale(scale, scale, scale, 1);
+            Matrix_scale(scale, scale, scale, MTX_MULT);
             Matrix_get(&accessory->matrix_work);
             accessory->init_matrix = TRUE;
             Matrix_pull();

src/actor/npc/ac_npc_save.c_inc

@@ -72,7 +72,7 @@ static void aNPC_actor_save_for_special(ACTOR* actorx) {
 static void aNPC_actor_save(ACTOR* actorx, GAME* game) {
     NPC_ACTOR* nactorx = (NPC_ACTOR*)actorx;
 
-    if (mEv_CheckTitleDemo() <= 0) {
+    if (mEv_IsNotTitleDemo()) {
         if (ITEM_NAME_GET_TYPE(actorx->npc_id) == NAME_TYPE_NPC) {
             aNPC_actor_save_for_normal(actorx);
         } else {

src/actor/npc/ac_npc_sendo_move.c_inc

@@ -1263,11 +1263,11 @@ static void aSEN_set_matrix(NPC_SENDO_ACTOR* sendo) {
 
         if (boat != NULL) {
             Matrix_translate(boat->actor_class.world.position.x, boat->actor_class.world.position.y,
-                             boat->actor_class.world.position.z, 0);
-            Matrix_RotateY(boat->actor_class.shape_info.rotation.y, 1);
-            Matrix_RotateZ(boat->actor_class.shape_info.rotation.z, 1);
-            Matrix_translate(-8.0f, 20.0f, -34.0f, 1);
-            Matrix_RotateY(sendo->npc_class.actor_class.shape_info.rotation.y, 1);
+                             boat->actor_class.world.position.z, MTX_LOAD);
+            Matrix_RotateY(boat->actor_class.shape_info.rotation.y, MTX_MULT);
+            Matrix_RotateZ(boat->actor_class.shape_info.rotation.z, MTX_MULT);
+            Matrix_translate(-8.0f, 20.0f, -34.0f, MTX_MULT);
+            Matrix_RotateY(sendo->npc_class.actor_class.shape_info.rotation.y, MTX_MULT);
             Matrix_get(&aSEN_matrix);
             Matrix_Position_Zero(&sendo->npc_class.actor_class.world.position);
 

src/actor/npc/ac_npc_station_master_schedule.c_inc

@@ -280,7 +280,7 @@ static void aSTM_think_init_proc(NPC_ACTOR* nactorx, GAME_PLAY* play) {
     } else if (mEv_CheckFirstJob() == TRUE) {
         think_idx = aSTM_THINK_5;
     } else {
-        if (mEv_CheckTitleDemo() <= 0) {
+        if (mEv_IsNotTitleDemo()) {
             actorx->world.position.x += mFI_UT_WORLDSIZE_X_F;
         }