Match: Parts of src/66250.c by Bl00D4NGEL · Pull Request #36 · Drahsid/mischief-makers

Bl00D4NGEL · 2026-06-30T21:48:55Z

No description provided.

Drahsid

minor issues: mostly not labeling flags with the enums, missing use of FIXED_POINT, and minor style.

Drahsid · 2026-06-30T21:59:35Z

+    gActors[actor_index].velocityX.raw = Math_ApproachS32(gActors[actor_index].velocityX.raw, 0, 0x4000);
+    gActors[actor_index].velocityY.raw = Math_ApproachS32(gActors[actor_index].velocityY.raw, 0, 0x4000);


0x4000 FixedUnit

Drahsid · 2026-06-30T22:01:09Z

+void func_8007A8B0(u16 actor_index) {
+    u16 sp1E;
+
+    if (!(gActors[actor_index].flags_098 & 2) || (gActors[actor_index].var_150 & 0x100000)) {


Suggested change

if (!(gActors[actor_index].flags_098 & 2) || (gActors[actor_index].var_150 & 0x100000)) {

if (!(gActors[actor_index].flags_098 & ACTOR_FLAG3_UNK1) || (gActors[actor_index].var_150 & 0x100000)) {

Drahsid · 2026-06-30T22:02:02Z

+    }
+
+    sp1E = gActors[actor_index].unk_0D6;
+    gActors[actor_index].graphicFlags &= ~8;


Suggested change

gActors[actor_index].graphicFlags &= ~8;

gActors[actor_index].graphicFlags &= ~ACTOR_GFLAG_ROTZ;

Drahsid · 2026-06-30T22:02:45Z

+        gActors[arg0].flags |= 0x1000;
+        gActors[arg0].var_150 &= ~0x300000;
+        D_800BE704 = 0x10;
+        gActors[arg0 + 1].flags = 2;


Suggested change

gActors[arg0 + 1].flags = 2;

gActors[arg0 + 1].flags = ACTOR_FLAG_ACTIVE;

Drahsid · 2026-06-30T22:03:24Z

+    }
+    else {
+        gActors[arg0].state = 0x10;
+        gActors[arg0].flags |= 0x1000;


Suggested change

gActors[arg0].flags |= 0x1000;

gActors[arg0].flags |= ACTOR_FLAG_UNK12;

Drahsid · 2026-06-30T22:05:37Z

+        var_f0 = -var_f0;
+    }
+    gActors[arg0].rotateZ = var_f0;
+    if (gActors[arg0].flags & 0x20) {


Suggested change

if (gActors[arg0].flags & 0x20) {

if (gActors[arg0].flags & ACTOR_FLAG_FLIPPED) {

Drahsid · 2026-06-30T22:06:31Z

+            gActors[arg0].flags &= ~0x20;
+            gActors[0].flags &= ~0x20;
+        }
+        if (gActors[arg0].velocityX.raw < FIXED_UNIT(-1.5)) {
+            gActors[arg0].flags |= 0x20;
+            gActors[0].flags |= 0x20;


Suggested change

gActors[arg0].flags &= ~0x20;

gActors[0].flags &= ~0x20;

}

if (gActors[arg0].velocityX.raw < FIXED_UNIT(-1.5)) {

gActors[arg0].flags |= 0x20;

gActors[0].flags |= 0x20;

gActors[arg0].flags &= ~ACTOR_FLAG_FLIPPED;

gActors[0].flags &= ~ACTOR_FLAG_FLIPPED;

}

if (gActors[arg0].velocityX.raw < FIXED_UNIT(-1.5)) {

gActors[arg0].flags |= ACTOR_FLAG_FLIPPED;

gActors[0].flags |= ACTOR_FLAG_FLIPPED;

Drahsid · 2026-06-30T22:08:04Z

+    gActors[arg0].flags_098 |= gActors[arg0 + 1].flags_098;
+    if (gActors[arg0].flags_098 & 0x10) {
+        gActors[arg0].velocityY.raw = -FIXED_UNIT(2);
+        gActors[arg0].posY.whole = gActors[arg0 + 1].posY.whole;
+    }
+    if (gActors[arg0].flags_098 & 0x20) {
+        gActors[arg0].velocityY.raw = FIXED_UNIT(2);
+        gActors[arg0].posY.whole = gActors[arg0 + 1].posY.whole;
+    }
+    if ((gActors[arg0].flags_098 & 4) || (func_80012AB4(gActors[arg0 + 1].posX.whole + gActors[arg0 + 1].hitboxBX0, (gActors[arg0 + 1].posY.whole + gActors[arg0 + 1].hitboxBY0) - 8) & 0x80)) {
+        gActors[arg0].velocityX.raw = FIXED_UNIT(2);
+        gActors[arg0].posX.whole = gActors[arg0 + 1].posX.whole;
+        gActors[arg0].var_15C = 0;
+    }
+    if ((gActors[arg0].flags_098 & 8) || (func_80012AB4(gActors[arg0 + 1].posX.whole + gActors[arg0 + 1].hitboxBX1, (gActors[arg0 + 1].posY.whole + gActors[arg0 + 1].hitboxBY0) - 8) & 0x80)) {


Suggested change

gActors[arg0].flags_098 |= gActors[arg0 + 1].flags_098;

if (gActors[arg0].flags_098 & 0x10) {

gActors[arg0].velocityY.raw = -FIXED_UNIT(2);

gActors[arg0].posY.whole = gActors[arg0 + 1].posY.whole;

}

if (gActors[arg0].flags_098 & 0x20) {

gActors[arg0].velocityY.raw = FIXED_UNIT(2);

gActors[arg0].posY.whole = gActors[arg0 + 1].posY.whole;

}

if ((gActors[arg0].flags_098 & 4) || (func_80012AB4(gActors[arg0 + 1].posX.whole + gActors[arg0 + 1].hitboxBX0, (gActors[arg0 + 1].posY.whole + gActors[arg0 + 1].hitboxBY0) - 8) & 0x80)) {

gActors[arg0].velocityX.raw = FIXED_UNIT(2);

gActors[arg0].posX.whole = gActors[arg0 + 1].posX.whole;

gActors[arg0].var_15C = 0;

}

if ((gActors[arg0].flags_098 & 8) || (func_80012AB4(gActors[arg0 + 1].posX.whole + gActors[arg0 + 1].hitboxBX1, (gActors[arg0 + 1].posY.whole + gActors[arg0 + 1].hitboxBY0) - 8) & 0x80)) {

gActors[arg0].flags_098 |= gActors[arg0 + 1].flags_098;

if (gActors[arg0].flags_098 & ACTOR_FLAG3_UNK4) {

gActors[arg0].velocityY.raw = -FIXED_UNIT(2);

gActors[arg0].posY.whole = gActors[arg0 + 1].posY.whole;

}

if (gActors[arg0].flags_098 & ACTOR_FLAG3_UNK5) {

gActors[arg0].velocityY.raw = FIXED_UNIT(2);

gActors[arg0].posY.whole = gActors[arg0 + 1].posY.whole;

}

if ((gActors[arg0].flags_098 & ACTOR_FLAG3_UNK2) || (func_80012AB4(gActors[arg0 + 1].posX.whole + gActors[arg0 + 1].hitboxBX0, (gActors[arg0 + 1].posY.whole + gActors[arg0 + 1].hitboxBY0) - 8) & 0x80)) {

gActors[arg0].velocityX.raw = FIXED_UNIT(2);

gActors[arg0].posX.whole = gActors[arg0 + 1].posX.whole;

gActors[arg0].var_15C = 0;

}

if ((gActors[arg0].flags_098 & ACTOR_FLAG3_UNK3) || (func_80012AB4(gActors[arg0 + 1].posX.whole + gActors[arg0 + 1].hitboxBX1, (gActors[arg0 + 1].posY.whole + gActors[arg0 + 1].hitboxBY0) - 8) & 0x80)) {

Drahsid · 2026-06-30T22:09:35Z

+    } else {
+        if (gButtonHold & gButton_DLeft) {
+            gActors[arg0].var_15C -= 0x4000;
+        } else if (gButtonHold & gButton_DRight) {
+            gActors[arg0].var_15C += 0x4000;
+        } else if (gActors[arg0].flags & 0x20) {
+            gActors[arg0].var_15C = Math_ApproachS32(gActors[arg0].var_15C, -0x8000, 0x1000);
+        } else {
+            gActors[arg0].var_15C = Math_ApproachS32(gActors[arg0].var_15C, 0x8000, 0x1000);
+        }
+    }
+    var_a3 = gButtonHold & gButton_LTrig;
+    if (var_a3 || (gButtonHold & gButton_RTrig)) {
+        gActors[arg0].var_15C = Math_ClampLimit(gActors[arg0].var_15C, 0x28000);
+        var_a3 = 0x40000;
+        var_a3 |= 0x8000;
+    } else {
+        gActors[arg0].var_15C = Math_ClampLimit(gActors[arg0].var_15C, FIXED_UNIT(8));
+        var_a3 = 0x30000;
+        var_a3 |= 0x8000;
+    }
+
+    if (gActors[arg0].unk_118 >= 0.0f) {
+        gActors[arg0].velocityY.raw = Math_ApproachS32(gActors[arg0].velocityY.raw, 0, 0x1000);
+    } else if (gButtonHold & gButton_DUp) {
+        gActors[arg0].velocityY.raw = Math_ApproachS32(gActors[arg0].velocityY.raw, var_a3, 0x4000);
+    } else if (gButtonHold & gButton_DDown) {
+        gActors[arg0].velocityY.raw = Math_ApproachS32(gActors[arg0].velocityY.raw, -var_a3, 0x4000);
+    } else if ((gActors[arg0].velocityX.raw > FIXED_UNIT(2)) || (gActors[arg0].velocityX.raw < FIXED_UNIT(-2))) {
+        gActors[arg0].velocityY.raw = Math_ApproachS32(gActors[arg0].velocityY.raw, 0, 0x4000);
+    } else if (gActiveFrames & 0x10) {
+        gActors[arg0].velocityY.raw = Math_ApproachS32(gActors[arg0].velocityY.raw, 0x18000, 0x4000);
+    } else {
+        gActors[arg0].velocityY.raw = Math_ApproachS32(gActors[arg0].velocityY.raw, -0x18000, 0x4000);
+    }


Suggested change

} else {

if (gButtonHold & gButton_DLeft) {

gActors[arg0].var_15C -= 0x4000;

} else if (gButtonHold & gButton_DRight) {

gActors[arg0].var_15C += 0x4000;

} else if (gActors[arg0].flags & 0x20) {

gActors[arg0].var_15C = Math_ApproachS32(gActors[arg0].var_15C, -0x8000, 0x1000);

} else {

gActors[arg0].var_15C = Math_ApproachS32(gActors[arg0].var_15C, 0x8000, 0x1000);

}

}

var_a3 = gButtonHold & gButton_LTrig;

if (var_a3 || (gButtonHold & gButton_RTrig)) {

gActors[arg0].var_15C = Math_ClampLimit(gActors[arg0].var_15C, 0x28000);

var_a3 = 0x40000;

var_a3 |= 0x8000;

} else {

gActors[arg0].var_15C = Math_ClampLimit(gActors[arg0].var_15C, FIXED_UNIT(8));

var_a3 = 0x30000;

var_a3 |= 0x8000;

}

if (gActors[arg0].unk_118 >= 0.0f) {

gActors[arg0].velocityY.raw = Math_ApproachS32(gActors[arg0].velocityY.raw, 0, 0x1000);

} else if (gButtonHold & gButton_DUp) {

gActors[arg0].velocityY.raw = Math_ApproachS32(gActors[arg0].velocityY.raw, var_a3, 0x4000);

} else if (gButtonHold & gButton_DDown) {

gActors[arg0].velocityY.raw = Math_ApproachS32(gActors[arg0].velocityY.raw, -var_a3, 0x4000);

} else if ((gActors[arg0].velocityX.raw > FIXED_UNIT(2)) || (gActors[arg0].velocityX.raw < FIXED_UNIT(-2))) {

gActors[arg0].velocityY.raw = Math_ApproachS32(gActors[arg0].velocityY.raw, 0, 0x4000);

} else if (gActiveFrames & 0x10) {

gActors[arg0].velocityY.raw = Math_ApproachS32(gActors[arg0].velocityY.raw, 0x18000, 0x4000);

} else {

gActors[arg0].velocityY.raw = Math_ApproachS32(gActors[arg0].velocityY.raw, -0x18000, 0x4000);

}

}

else {

if (gButtonHold & gButton_DLeft) {

gActors[arg0].var_15C -= 0x4000;

}

else if (gButtonHold & gButton_DRight) {

gActors[arg0].var_15C += 0x4000;

}

else if (gActors[arg0].flags & 0x20) {

gActors[arg0].var_15C = Math_ApproachS32(gActors[arg0].var_15C, -0x8000, 0x1000);

}

else {

gActors[arg0].var_15C = Math_ApproachS32(gActors[arg0].var_15C, 0x8000, 0x1000);

}

}

var_a3 = gButtonHold & gButton_LTrig;

if (var_a3 || (gButtonHold & gButton_RTrig)) {

gActors[arg0].var_15C = Math_ClampLimit(gActors[arg0].var_15C, 0x28000);

var_a3 = 0x40000;

var_a3 |= 0x8000;

}

else {

gActors[arg0].var_15C = Math_ClampLimit(gActors[arg0].var_15C, FIXED_UNIT(8));

var_a3 = 0x30000;

var_a3 |= 0x8000;

}

if (gActors[arg0].unk_118 >= 0.0f) {

gActors[arg0].velocityY.raw = Math_ApproachS32(gActors[arg0].velocityY.raw, 0, 0x1000);

}

else if (gButtonHold & gButton_DUp) {

gActors[arg0].velocityY.raw = Math_ApproachS32(gActors[arg0].velocityY.raw, var_a3, 0x4000);

}

else if (gButtonHold & gButton_DDown) {

gActors[arg0].velocityY.raw = Math_ApproachS32(gActors[arg0].velocityY.raw, -var_a3, 0x4000);

}

else if ((gActors[arg0].velocityX.raw > FIXED_UNIT(2)) || (gActors[arg0].velocityX.raw < FIXED_UNIT(-2))) {

gActors[arg0].velocityY.raw = Math_ApproachS32(gActors[arg0].velocityY.raw, 0, 0x4000);

}

else if (gActiveFrames & 0x10) {

gActors[arg0].velocityY.raw = Math_ApproachS32(gActors[arg0].velocityY.raw, 0x18000, 0x4000);

}

else {

gActors[arg0].velocityY.raw = Math_ApproachS32(gActors[arg0].velocityY.raw, -0x18000, 0x4000);

}

Code style: no cuddled else

Drahsid · 2026-06-30T22:10:06Z

+    } else {
+        func_80035A20(arg0);


Suggested change

} else {

func_80035A20(arg0);

}

else {

func_80035A20(arg0);

queueRAM · 2026-07-01T00:21:24Z

+    Actor* temp_v0;
+    s32 var_v1;
+
+    temp_v0 = &gActors[arg0];


Only calling this out since using Actor pointers sometimes prevents matches. Devs seemed to prefer using indexes instead of pointers so I'd recommend matching with: https://decomp.me/scratch/HZDfG

Otherwise, aside from the Drahsid's recommendations. this looks great!

Bl00D4NGEL added 6 commits June 30, 2026 23:09

match: func_8007AB44, func_8007B60C

ef9865a

match: func_8007A8B0

a77e9b8

match: func_8007A84C

2171bdd

match: func_8007A720, func_8007A7C4

219bf87

match: func_8007A3CC, func_8007A4B0

788e8ad

Merge remote-tracking branch 'origin/master' into match/66250

4b67f74

Drahsid requested changes Jun 30, 2026

View reviewed changes

Drahsid marked this pull request as draft June 30, 2026 22:12

queueRAM reviewed Jul 1, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Match: Parts of src/66250.c#36

Match: Parts of src/66250.c#36
Bl00D4NGEL wants to merge 6 commits into
Drahsid:masterfrom
Bl00D4NGEL:match/66250

Bl00D4NGEL commented Jun 30, 2026

Uh oh!

Drahsid left a comment

Uh oh!

Drahsid Jun 30, 2026

Uh oh!

Drahsid Jun 30, 2026

Uh oh!

Drahsid Jun 30, 2026

Uh oh!

Drahsid Jun 30, 2026

Uh oh!

Drahsid Jun 30, 2026

Uh oh!

Drahsid Jun 30, 2026

Uh oh!

Drahsid Jun 30, 2026

Uh oh!

Drahsid Jun 30, 2026

Uh oh!

Drahsid Jun 30, 2026

Uh oh!

Drahsid Jun 30, 2026

Uh oh!

queueRAM Jul 1, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		gActors[actor_index].velocityX.raw = Math_ApproachS32(gActors[actor_index].velocityX.raw, 0, 0x4000);
		gActors[actor_index].velocityY.raw = Math_ApproachS32(gActors[actor_index].velocityY.raw, 0, 0x4000);

	if (!(gActors[actor_index].flags_098 & 2) \|\| (gActors[actor_index].var_150 & 0x100000)) {
	if (!(gActors[actor_index].flags_098 & ACTOR_FLAG3_UNK1) \|\| (gActors[actor_index].var_150 & 0x100000)) {

	gActors[actor_index].graphicFlags &= ~8;
	gActors[actor_index].graphicFlags &= ~ACTOR_GFLAG_ROTZ;

	gActors[arg0 + 1].flags = 2;
	gActors[arg0 + 1].flags = ACTOR_FLAG_ACTIVE;

	gActors[arg0].flags \|= 0x1000;
	gActors[arg0].flags \|= ACTOR_FLAG_UNK12;

	if (gActors[arg0].flags & 0x20) {
	if (gActors[arg0].flags & ACTOR_FLAG_FLIPPED) {

Conversation

Bl00D4NGEL commented Jun 30, 2026

Uh oh!

Drahsid left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants