sa2: match Knuckles_Glide_UpdateSpeed, fix sa1 sa2 InitGlide consistency

asm/non_matching/game/player__sub_80139B0.inc

@@ -1,168 +0,0 @@
-
-.syntax unified
-.text
-	push {r4, lr}
-	mov ip, r0          @ ip = player
-	movs r1, #0x14
-	ldrsh r3, [r0, r1]
-	cmp r3, #0
-	bge _080139BE
-	rsbs r3, r3, #0     @ r3 = speedGrnd (abs)
-_080139BE:
-	mov r0, ip
-	adds r0, #0xad
-	ldrb r2, [r0]
-	ldr r1, _080139D0 @ =0x000002FF
-	adds r4, r0, #0
-	cmp r3, r1
-	bgt _080139D4
-	adds r3, #6
-	b _080139E4
-	.align 2, 0
-_080139D0: .4byte 0x000002FF
-_080139D4:
-	ldr r0, _08013A14 @ =0x00000EFF
-	cmp r3, r0
-	bgt _080139E4
-	movs r0, #0x7f
-	ands r0, r2
-	cmp r0, #0
-	bne _080139E4
-	adds r3, #3
-_080139E4:
-	mov r1, ip
-	ldr r0, [r1, #0x20]
-	movs r1, #0x40
-	ands r0, r1
-	cmp r0, #0
-	beq _08013A00
-	movs r0, #0xc0
-	lsls r0, r0, #2
-	cmp r3, r0
-	ble _08013A00
-	subs r3, #9
-	cmp r3, r0
-	bge _08013A00
-	adds r3, r0, #0
-_08013A00:
-	ldrb r0, [r4]
-	adds r0, #0x40
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bgt _08013A18
-	rsbs r0, r3, #0
-	mov r1, ip
-	strh r0, [r1, #0x14]
-	b _08013A1C
-	.align 2, 0
-_08013A14: .4byte 0x00000EFF
-_08013A18:
-	mov r0, ip
-	strh r3, [r0, #0x14]
-_08013A1C:
-	mov r0, ip
-	adds r0, #0x5c
-	ldrh r1, [r0]
-	movs r0, #0x20
-	ands r0, r1
-	cmp r0, #0
-	beq _08013A48
-	lsls r1, r2, #0x18
-	lsrs r0, r1, #0x18
-	cmp r0, #0x80
-	beq _08013A7E
-	asrs r0, r1, #0x18
-	cmp r0, #0
-	bge _08013A3E
-	rsbs r0, r0, #0
-	lsls r0, r0, #0x18
-	lsrs r2, r0, #0x18
-_08013A3E:
-	lsls r0, r2, #0x18
-	movs r1, #0x80
-	lsls r1, r1, #0x12
-	adds r0, r0, r1
-	b _08013A7C
-_08013A48:
-	movs r0, #0x10
-	ands r0, r1
-	cmp r0, #0
-	beq _08013A6C
-	lsls r0, r2, #0x18
-	asrs r0, r0, #0x18
-	cmp r0, #0
-	beq _08013A7E
-	cmp r0, #0
-	ble _08013A62
-	rsbs r0, r0, #0
-	lsls r0, r0, #0x18
-	lsrs r2, r0, #0x18
-_08013A62:
-	lsls r0, r2, #0x18
-	movs r2, #0x80
-	lsls r2, r2, #0x12
-	adds r0, r0, r2
-	b _08013A7C
-_08013A6C:
-	lsls r0, r2, #0x18
-	asrs r1, r0, #0x18
-	movs r0, #0x7f
-	ands r0, r1
-	cmp r0, #0
-	beq _08013A7E
-	adds r0, r1, #2
-	lsls r0, r0, #0x18
-_08013A7C:
-	lsrs r2, r0, #0x18
-_08013A7E:
-	strb r2, [r4]
-	ldr r1, _08013AAC @ =gSineTable
-	lsls r0, r2, #0x18
-	lsrs r0, r0, #0x15
-	movs r2, #0x80
-	lsls r2, r2, #2
-	adds r0, r0, r2
-	adds r0, r0, r1
-	ldrh r0, [r0]
-	lsls r0, r0, #0x10
-	asrs r0, r0, #0x16
-	muls r0, r3, r0
-	asrs r0, r0, #8
-	mov r3, ip
-	strh r0, [r3, #0x10]
-	ldrh r1, [r3, #0x12]
-	movs r2, #0x12
-	ldrsh r0, [r3, r2]
-	cmp r0, #0x7f
-	bgt _08013AB0
-	adds r0, r1, #0
-	adds r0, #0x18
-	b _08013AB6
-	.align 2, 0
-_08013AAC: .4byte gSineTable
-_08013AB0:
-	adds r0, r1, #0
-	subs r0, #0x18
-	mov r3, ip
-_08013AB6:
-	strh r0, [r3, #0x12]
-	ldr r1, _08013AC4 @ =gCamera
-	ldr r0, [r1, #0x4c]
-	cmp r0, #0
-	ble _08013AC8
-	subs r0, #2
-	b _08013ACE
-	.align 2, 0
-_08013AC4: .4byte gCamera
-_08013AC8:
-	cmp r0, #0
-	bge _08013AD0
-	adds r0, #4
-_08013ACE:
-	str r0, [r1, #0x4c]
-_08013AD0:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-.syntax divided

src/game/sa1/stage/player_knuckles.c

@@ -29,7 +29,7 @@ struct Task *Player_Knuckles_InitGfx_FloatSplash(Player *p);
 
 extern const u8 gCharStatesKnucklesGlideTurn[];
 
-void Player_Knuckles_GlideInit(Player *p)
+void Player_Knuckles_InitGlide(Player *p)
 {
     p->moveState &= ~MOVESTATE_SPIN_ATTACK;
     PLAYERFN_SET_SHIFT_OFFSETS(p, 6, 6);

src/game/sa2/stage/player_callbacks.c

@@ -1701,18 +1701,17 @@ void sub_801394C(Player *p)
     }
 }
 
-// (76.32%) https://decomp.me/scratch/8fUWD
-// (97.64%) https://decomp.me/scratch/Bd3kQ
-// (98.61%) https://decomp.me/scratch/0zv3B
-NONMATCH("asm/non_matching/game/player__sub_80139B0.inc", void Knuckles_Glide_UpdateSpeed(Player *player))
+// 100% (fake match): https://decomp.me/scratch/63L6J
+void Knuckles_Glide_UpdateSpeed(Player *player)
 {
     s32 speedGrnd = ABS(player->qSpeedGround);
     s8 shift = player->w.kf.shift;
+    s32 cos;
 
     if (speedGrnd < Q_24_8(3.0)) {
         speedGrnd += Q_24_8(6.0 / 256.0);
     } else if (speedGrnd < Q_24_8(15.0)) {
-        if ((player->w.kf.shift & 0x7F) == 0)
+        if ((player->w.kf.shift & 127) == 0)
             speedGrnd += Q_24_8(3.0 / 256.0);
     }
     // _080139E4
@@ -1723,53 +1722,61 @@ NONMATCH("asm/non_matching/game/player__sub_80139B0.inc", void Knuckles_Glide_Up
         }
     }
 
-    {
-        s8 shift = player->w.kf.shift + Q_24_8(0.25);
-        if (shift <= 0) {
-            player->qSpeedGround = -speedGrnd;
-        } else {
-            player->qSpeedGround = +speedGrnd;
-        }
+    if ((s8)(player->w.kf.shift + Q_24_8(0.25)) <= 0) {
+        player->qSpeedGround = -speedGrnd;
+    } else {
+        player->qSpeedGround = +speedGrnd;
     }
 
-    {
-        if (player->heldInput & DPAD_LEFT) {
-            if ((u8)shift != 128) {
-                if (shift < 0)
-                    shift = -shift;
-                shift += 2;
-            }
-            player->w.kf.shift = shift;
-        } else if (player->heldInput & DPAD_RIGHT) {
-            if (shift != 0) {
-                if (shift > 0)
-                    shift = -shift;
-                shift += 2;
-            }
-            player->w.kf.shift = shift;
-        } else {
-            if (shift & 0x7F) {
-                shift += 2;
-            }
-            player->w.kf.shift = shift;
+    if (player->heldInput & DPAD_LEFT) {
+        if ((u8)shift != 128) {
+            if (shift < 0)
+                shift = -shift;
+            shift += 2;
         }
-
-        player->qSpeedAirX = I(COS_24_8(shift << 2) * speedGrnd);
-
-        if (player->qSpeedAirY < Q_24_8(0.5)) {
-            player->qSpeedAirY += Q_24_8(0.09375);
-        } else {
-            player->qSpeedAirY -= Q_24_8(0.09375);
+        player->w.kf.shift = shift;
+    } else if (player->heldInput & DPAD_RIGHT) {
+        if (shift != 0) {
+            if (shift > 0)
+                shift = -shift;
+            shift += 2;
         }
-
-        if (gCamera.unk4C > 0) {
-            gCamera.unk4C -= 2;
-        } else if (gCamera.unk4C < 0) {
-            gCamera.unk4C += 4;
+        player->w.kf.shift = shift;
+    } else {
+        if (shift & 127) {
+            shift += 2;
         }
+        player->w.kf.shift = shift;
+    }
+
+#ifndef NON_MATCHING
+    cos = Q_2_14_TO_Q_24_8(({
+        s32 offset;
+        const u16 *sineTable = gSineTable;
+        asm("lsl %0, %1, #0x18\n\t"
+            "lsr %0, %0, #0x15"
+            : "=r"(offset)
+            : "r"(shift));
+        offset += 0x200;
+        ((s16) * (u16 *)((void *)sineTable + offset));
+    }));
+#else
+    cos = COS_24_8((u8)shift * 4);
+#endif
+    player->qSpeedAirX = Q_24_8_TO_INT(cos * speedGrnd);
+
+    if (player->qSpeedAirY < Q_24_8(0.5)) {
+        player->qSpeedAirY += Q_24_8(0.09375);
+    } else {
+        player->qSpeedAirY -= Q_24_8(0.09375);
+    }
+
+    if (gCamera.unk4C > 0) {
+        gCamera.unk4C -= 2;
+    } else if (gCamera.unk4C < 0) {
+        gCamera.unk4C += 4;
     }
 }
-END_NONMATCH
 
 void Player_Knuckles_InitGlide(Player *p)
 {