26.1147%

progress/progress.global_asm.csv

@@ -2302,7 +2302,7 @@ us,.code,func_8063D608,48,yes
 us,.code,func_8067E6E4,32,yes
 us,.code,func_8072F59C,824,no
 us,.code,func_80737B58,200,no
-us,.code,func_8068304C,268,no
+us,.code,func_8068304C,268,yes
 us,.code,func_806D2D38,140,yes
 us,.code,func_806E6318,80,yes
 us,.code,func_806DA320,196,yes
@@ -2632,7 +2632,7 @@ us,.code,func_806A3C6C,308,no
 us,.code,func_807317FC,176,yes
 us,.code,func_8071E1C8,548,yes
 us,.code,func_80714638,40,yes
-us,.code,func_80644CC0,144,no
+us,.code,func_80644CC0,144,yes
 us,.code,func_80650ECC,2108,no
 us,.code,func_806EA9B4,144,yes
 us,.code,func_806116E0,68,yes
@@ -2959,7 +2959,7 @@ us,.code,func_806DD874,572,yes
 us,.code,func_80611688,8,yes
 us,.code,func_8063E5B4,256,no
 us,.code,func_80699070,184,yes
-us,.code,func_80685708,276,no
+us,.code,func_80685708,276,yes
 us,.code,func_806025D4,1216,no
 us,.code,func_806A0864,784,no
 us,.code,func_806E3040,444,no

progress/progress.jetpac.csv

@@ -22,7 +22,7 @@ us,.code,func_80027728,1216,no
 us,.code,func_80029C1C,496,no
 us,.code,func_80024408,564,no
 us,.code,func_80028BD0,108,yes
-us,.code,func_80029E0C,368,no
+us,.code,func_80029E0C,368,yes
 us,.code,func_80026A3C,116,yes
 us,.code,func_80028CF8,268,no
 us,.code,func_80025C40,96,yes

progress/progress.total.csv

@@ -2302,7 +2302,7 @@ us,.code,func_8063D608,48,yes
 us,.code,func_8067E6E4,32,yes
 us,.code,func_8072F59C,824,no
 us,.code,func_80737B58,200,no
-us,.code,func_8068304C,268,no
+us,.code,func_8068304C,268,yes
 us,.code,func_806D2D38,140,yes
 us,.code,func_806E6318,80,yes
 us,.code,func_806DA320,196,yes
@@ -2632,7 +2632,7 @@ us,.code,func_806A3C6C,308,no
 us,.code,func_807317FC,176,yes
 us,.code,func_8071E1C8,548,yes
 us,.code,func_80714638,40,yes
-us,.code,func_80644CC0,144,no
+us,.code,func_80644CC0,144,yes
 us,.code,func_80650ECC,2108,no
 us,.code,func_806EA9B4,144,yes
 us,.code,func_806116E0,68,yes
@@ -2959,7 +2959,7 @@ us,.code,func_806DD874,572,yes
 us,.code,func_80611688,8,yes
 us,.code,func_8063E5B4,256,no
 us,.code,func_80699070,184,yes
-us,.code,func_80685708,276,no
+us,.code,func_80685708,276,yes
 us,.code,func_806025D4,1216,no
 us,.code,func_806A0864,784,no
 us,.code,func_806E3040,444,no
@@ -3798,7 +3798,7 @@ us,.code,func_80027728,1216,no
 us,.code,func_80029C1C,496,no
 us,.code,func_80024408,564,no
 us,.code,func_80028BD0,108,yes
-us,.code,func_80029E0C,368,no
+us,.code,func_80029E0C,368,yes
 us,.code,func_80026A3C,116,yes
 us,.code,func_80028CF8,268,no
 us,.code,func_80025C40,96,yes

progress/progress_global_asm.svg

@@ -17,7 +17,7 @@
         <text x="38.5" y="14">global_asm</text>
     </g>
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
-        <text x="111.5" y="15" fill="#010101" fill-opacity=".3">26.2345%</text>
-        <text x="110.5" y="14">26.2345%</text>
+        <text x="111.5" y="15" fill="#010101" fill-opacity=".3">26.2904%</text>
+        <text x="110.5" y="14">26.2904%</text>
     </g>
 </svg>

progress/progress_jetpac.svg

@@ -9,7 +9,7 @@
     </mask>
     <g mask="url(#anybadge_1)">
         <path fill="#555" d="M0 0h47v20H0z"/>
-        <path fill="#c05d00" d="M47 0h67v20H47z"/>
+        <path fill="#c06200" d="M47 0h67v20H47z"/>
         <path fill="url(#b)" d="M0 0h114v20H0z"/>
     </g>
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
@@ -17,7 +17,7 @@
         <text x="23.5" y="14">jetpac</text>
     </g>
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
-        <text x="81.5" y="15" fill="#010101" fill-opacity=".3">24.1671%</text>
-        <text x="80.5" y="14">24.1671%</text>
+        <text x="81.5" y="15" fill="#010101" fill-opacity=".3">25.4442%</text>
+        <text x="80.5" y="14">25.4442%</text>
     </g>
 </svg>

progress/progress_total.svg

@@ -17,7 +17,7 @@
         <text x="66.0" y="14">Donkey Kong 64 (US)</text>
     </g>
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
-        <text x="166.5" y="15" fill="#010101" fill-opacity=".3">26.0506%</text>
-        <text x="165.5" y="14">26.0506%</text>
+        <text x="166.5" y="15" fill="#010101" fill-opacity=".3">26.1147%</text>
+        <text x="165.5" y="14">26.1147%</text>
     </g>
 </svg>

src/global_asm/code_42630.c

@@ -793,29 +793,26 @@ void func_806449C0(s32 arg0, s16 arg1, s16 arg2, s32 arg3) {
 
 #pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_42630/func_80644A18.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_42630/func_80644CC0.s")
-
 void func_80644A18(s32, s32, s32, f32);
 
-/*
-void func_80644CC0(void **arg0, s32 arg1, s32 arg2, s32 arg3) {
-    void *sp1C;
-    void *temp_v0;
-    void *var_v1;
+typedef struct {
+    f32 unk0;
+    f32 unk4;
+} Struct80644CC0;
 
-    var_v1 = *arg0;
-    if (var_v1 == NULL) {
-        temp_v0 = malloc(8);
-        *arg0 = temp_v0;
-        temp_v0->unk0 = 0.0f;
-        temp_v0->unk4 = 0.0f;
-        var_v1 = *arg0;
+void func_80644CC0(void **arg0, s32 arg1, s32 arg2, s32 arg3) {
+    Struct80644CC0 *var_v1;
+
+    if (*arg0 == NULL) {
+        var_v1 = malloc(8);
+        *arg0 = var_v1;
+        var_v1->unk0 = 0.0f;
+        var_v1->unk4 = 0.0f;
     }
-    sp1C = var_v1;
+    var_v1 = *arg0;
     func_80644A18(var_v1, 2, 0x16, 1.0f);
-    func_80644A18(sp1C + 4, 4, 0x18, 0.8f);
+    func_80644A18(&var_v1->unk4, 4, 0x18, 0.8f);
 }
-*/
 
 void func_8065A660(f32, f32);
 

src/global_asm/code_80150.c

@@ -759,26 +759,26 @@ void func_80682E38(Struct80682E38_arg0 *arg0) {
     func_80682AB4(arg0);
 }
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_80150/func_8068304C.s")
-
-/*
 typedef struct {
     s32 unk0[5];
 } Struct8074E834;
 
 extern Struct8074E834 D_8074E834;
 
-// TODO: Regalloc
+typedef struct {
+    u8 unk0;
+} AAD_8068304C;
+
 void func_8068304C(void) {
     Struct8074E834 sp2C;
-    u8 *sp28;
-    if ((current_actor_pointer->object_properties_bitfield & 0x10) == 0) {
+    AAD_8068304C *sp28;
+    if (!(current_actor_pointer->object_properties_bitfield & 0x10)) {
         sp2C = D_8074E834;
         sp28 = current_actor_pointer->additional_actor_data;
         current_actor_pointer->object_properties_bitfield |= 0x1000;
         func_8068842C(current_actor_pointer, 0, 1);
         func_80688460(current_actor_pointer, 0, 1);
-        func_806883F4(current_actor_pointer, 0, sp2C.unk0[*sp28], 0);
+        func_806883F4(current_actor_pointer, 0, sp2C.unk0[sp28->unk0], 0);
         func_80614EBC(current_actor_pointer, 0x329);
     }
     current_actor_pointer->unk16D = current_actor_pointer->unk15F;
@@ -786,7 +786,6 @@ void func_8068304C(void) {
     current_actor_pointer->y_rotation &= 0xFFF;
     func_806319C4(current_actor_pointer, 0);
 }
-*/
 
 // Function pointer in a local variable, needs some PaaD untangling
 #pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_80150/func_80683158.s")

src/global_asm/code_89250.c

@@ -335,8 +335,6 @@ void func_80685520(f32 arg0, u8 arg1, f32 arg2, f32 arg3, f32 arg4) {
     }
 }
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_89250/func_80685708.s")
-
 typedef struct {
     s32 unk0[4];
 } Struct8074E898;
@@ -351,22 +349,21 @@ typedef struct {
     s8 unk6;
 } AAD_80685708;
 
-/*
-// TODO: Very close, stack/arg1 nonsense
 void func_80685708(Actor *arg0, u8 arg1) {
-    s32 temp;
+    AAD_80685708* aaD;
     Struct8074E898 sp34;
     f32 p1 = (arg0->animation_state->scale_y / D_80759AF8);
+    s32 pad;
 
     sp34 = D_8074E898;
-    if (arg1 != 0) {
+    if (arg1) {
         func_80685520(p1 * D_80759B00, arg1, arg0->x_position, arg0->y_position + 4.0f, arg0->z_position);
         func_80677FA8(ACTOR_SHOCKWAVE_SLAM, sp34.unk0[arg1]);
         func_8067B238(D_807FBB44, arg0, arg0->animation_state->scale_y * 0.5f);
-        ((AAD_80685708*)D_807FBB44->additional_actor_data)->unk6 = arg1 - 1;
+        aaD = D_807FBB44->additional_actor_data;
+        aaD->unk6 = arg1 - 1;
     }
 }
-*/
 
 void func_8068581C(s32 arg0, s16 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, s32 arg6) {
     func_80714998(2);

src/global_asm/code_CEAE0.c

@@ -5369,17 +5369,17 @@ void func_806DF44C(Actor* arg0, PlayerAdditionalActorData *arg1, u8 arg2) {
 // TODO: Fiddly but doable
 void func_806DF494(s16 *arg0, s16 arg1, s16 arg2) {
     s16 temp_v0;
-    s16 phi_a2;
+    s32 temp2;
     s32 phi_t0;
     s16 phi_v0;
 
     arg1 &= 0xFFF;
-    temp_v0 = arg1 - *arg0;
+    temp_v0 = (arg1 - *arg0);
     if (temp_v0) {
-        phi_a2 = ABS(temp_v0);
-        phi_v0 = temp_v0 / phi_a2;
-        if (phi_a2 >= 0x801) {
-            phi_a2 = 0x1000 - phi_a2;
+        arg2 = ABS(temp_v0);
+        phi_v0 = temp_v0 / arg2;
+        if (arg2 >= 0x801) {
+            arg2 = 0x1000 - arg2;
             phi_v0 *= -1;
         }
         if (arg2 > 0) {
@@ -5387,7 +5387,7 @@ void func_806DF494(s16 *arg0, s16 arg1, s16 arg2) {
         } else {
             phi_t0 = -arg2;
         }
-        if (phi_a2 < phi_t0) {
+        if (arg2 < phi_t0) {
             *arg0 = arg1;
         } else {
             *arg0 += (phi_v0 * arg2);

src/jetpac/code_4FC0.c

@@ -23,8 +23,8 @@ void func_800291AC(JetpacStruct5 *arg0) {
     arg0->unk14 = 4;
     arg0->unk2C = 0;
     arg0->unk38 = 0;
-    arg0->unk30 = (s32) ((s32) arg0->unk0 & 0xFFF8);
-    arg0->unk34 = (s32) ((s32) arg0->unk4 & 0xFFF8);
+    arg0->unk30 = (s32)arg0->unk0 & 0xFFF8;
+    arg0->unk34 = (s32)arg0->unk4 & 0xFFF8;
     func_80024E70(5);
 }
 
@@ -40,7 +40,7 @@ void func_80029204(JetpacStruct *arg0) {
         return;
     }
     if (temp_v0 == 4) {
-        func_80025A60(((s8*)(&(*arg0))) + 0x30);
+        func_80025A60(&arg0->unk30);
         if (arg0->unk38 < 7) {
             func_80025700(arg0->unk4C, arg0->unk0, arg0->unk4, ((s8*)(&(*arg0))) + 0x10, arg0->unk18);
         }
@@ -299,14 +299,14 @@ void func_80029B90(JetpacStruct8 *arg0) {
 
 #pragma GLOBAL_ASM("asm/nonmatchings/jetpac/code_4FC0/func_80029C1C.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/jetpac/code_4FC0/func_80029E0C.s")
-
-f32 func_80027210();                          /* extern */
+f32 func_80027210();
 extern void* D_8002E878;
 extern f32 D_8002EBCC;
 extern void func_80029F7C(struct_8002998C*, s32);
 
-/*
+extern s32 D_8002BA6C;
+extern f32 D_8002EBD0;
+
 void func_80029E0C(struct_80029640 *arg0) {
     arg0->unk48 = &func_80029F7C;
     arg0->unk44 = 0x37;
@@ -319,14 +319,13 @@ void func_80029E0C(struct_80029640 *arg0) {
         arg0->unk18 = 1;
     }
     arg0->unk8 = 0.0f;
-    if (*(s32 *)0x8002BA6C) {
+    if (D_8002BA6C) {
         arg0->unkC = D_8002EBCC;
     } else {
-        arg0->unkC = *(f32 *)0x8002EBD0;
+        arg0->unkC = D_8002EBD0;
     }
     arg0->unk4C = &D_8002E878;
 }
-*/
 
 #pragma GLOBAL_ASM("asm/nonmatchings/jetpac/code_4FC0/func_80029F7C.s")
 
@@ -362,17 +361,15 @@ extern f64 D_8002EC08;
 /*
 // TODO: Close
 f32 func_8002A2DC(f32 arg0, f32 arg1) {
-    f32 phi_f14;
-
     if (arg0 < 0.0f) {
-        phi_f14 = arg1 - D_8002EBF0;
+        arg1 -= D_8002EBF0;
     } else {
-        phi_f14 = arg1 + D_8002EBF8;
+        arg1 += D_8002EBF8;
     }
-    if (phi_f14 < D_8002EC00) {
+    if (arg1 < D_8002EC00) {
         return D_8002EC00;
     }
-    return MIN(D_8002EC08, phi_f14);
+    return MIN(D_8002EC08, arg1);
 }
 */
 
@@ -411,7 +408,6 @@ void func_8002A6C0(JetpacStruct *arg0) {
     arg0->unk4C = &D_8002E8A8;
 }
 
-
 #pragma GLOBAL_ASM("asm/nonmatchings/jetpac/code_4FC0/func_8002A758.s")
 
 extern s32 D_8002E8C0;

symbol_addrs.jetpac.us.txt

@@ -18,3 +18,5 @@ D_8002BA52 = 0x8002BA52;
 D_8002E830 = 0x8002E830;
 
 D_8002EA10 = 0x8002EA10;
+
+D_8002EBD0 = 0x8002EBD0;