mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-09-13 04:15:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

a few matches (#404)

Browse Source 
* code_8006E9C0: match func_80071818

* Match 800C8F80, 800917B0, 800AEF14
This commit is contained in:
Joshua Peisach
2023-09-08 12:08:47 -04:00
committed by GitHub
parent bba223ffa4
commit b723c1be14
7 changed files with 67 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/audio/external.c
+9 -22
View File
@@ -3996,39 +3996,26 @@ void func_800C8F44(u8 arg0) {
func_800C36C4(0, 0, arg0, 1);
}
#ifdef MIPS_TO_C
//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023
static ? D_800E9F7C; /* unable to generate initializer */
u8 D_800EA0EC[1] = { 0 };
u8 D_800EA108 = 0;
f32 D_800EA1D4[3]; /* unable to generate initializer */
u8 D_800EA1DC = 0;
extern struct Unk_8018EFD8 D_800E9F7C[];
void func_800C8F80(u8 arg0, s32 arg1) {
u8 *temp_v1;
u8 temp_a2;
u8 temp_v0;
u8* temp_v1;
temp_a2 = arg0 & 0xFF;
if (D_800EA108 == 0) {
temp_v1 = &D_800EA0EC[temp_a2];
temp_v1 = &D_800EA0EC[arg0];
temp_v0 = *temp_v1;
if (temp_v0 != 0) {
if (temp_v0 == 2) {
switch(temp_v0) {
case 2:
*temp_v1 = 1;
goto block_4;
}
} else {
block_4:
play_sound((u32) arg1, (temp_a2 * 0x3C) + &D_800E9F7C, temp_a2, D_800EA1D4, D_800EA1D4, &D_800EA1DC);
case 0:
play_sound((u32) arg1, (f32* ) &D_800E9F7C[arg0], arg0, D_800EA1D4, D_800EA1D4, &D_800EA1DC);
break;
}
}
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8F80.s")
#endif
extern struct Unk_8018EFD8 D_800E9F7C[];
void func_800C9018(u8 arg0, s32 arg1) {
func_800C5578((f32*) &D_800E9F7C[arg0], arg1);
}
src/code_8006E9C0.c
+47 -54
View File
@@ -1851,81 +1851,74 @@ void func_80071428(void) {
GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80071428.s")
#endif
#ifdef MIPS_TO_C
//generated by m2c commit 44f261a363c51a295be8efe3d7ca7f4d2c967e9b on Dec-31-2022
? func_8007055C(); /* extern */
? func_80070780(); /* extern */
extern s16 D_801657A2;
extern void func_8006EE7C(s32); /* extern */
extern void func_80070190(); /* extern */
extern void func_8007055C(); /* extern */
extern void func_80070780(); /* extern */
extern s32 D_80183DA0;
extern s32 D_80183DBC;
extern s32 D_8018D158;
extern s32 D_8018D3BC;
extern s32 D_8018D3C0;
extern s32 D_8018D3C4;
void func_80071818(void) {
find_unused_obj_index(&D_80183DA0);
find_unused_obj_index(D_80183DB8);
find_unused_obj_index(&D_80183DBC);
find_unused_obj_index(gItemWindowObjectByPlayerId);
find_unused_obj_index(gItemWindowObjectByPlayerId + 4);
find_unused_obj_index(&gItemWindowObjectByPlayerId[1]);
func_80070190();
func_8007055C();
func_8007055C();
func_80070780();
D_8018CA70->itemBoxX = -0x0052;
D_8018CA70->itemBoxY = 0x0032;
D_8018CA70->slideItemBoxX = 0;
D_8018CA70->slideItemBoxY = 0;
D_8018CA70->unk_4A = 0x0050;
D_8018CA70->unk_4C = 0x0078;
D_8018CA70->rankX = 0x0032;
D_8018CA70->rankY = 0x00D2;
D_8018CA70->slideRankX = 0;
D_8018CA70->slideRankY = 0;
D_8018CA70->timerX = 0x004B;
D_8018CA70->timerY = 0x0010;
D_8018CA70->lapX = 0x0067;
D_8018CA70->lapY = 0x0028;
D_8018CA70[0].itemBoxX = -0x52;
D_8018CA70[0].itemBoxY = 0x32;
D_8018CA70[0].slideItemBoxX = 0;
D_8018CA70[0].slideItemBoxY = 0;
D_8018CA70[0].unk_4A = 0x50;
D_8018CA70[0].unk_4C = 0x78;
D_8018CA70[0].rankX = 0x32;
D_8018CA70[0].rankY = 0xD2;
D_8018CA70[0].slideRankX = 0;
D_8018CA70[0].slideRankY = 0;
D_8018CA70[0].timerX = 0x4B;
D_8018CA70[0].timerY = 0x10;
D_8018CA70[0].lapX = 0x67;
D_8018CA70[0].lapY = 0x28;
func_8006EE7C(*gItemWindowObjectByPlayerId);
D_8018CA70->unkC6 = 0x0043;
D_8018CA70->unkC8 = 0x0032;
D_8018CA70->unkCA = 0;
D_8018CA70->unkCC = 0;
D_8018CA70->unkCE = 0x00F0;
D_8018CA70->unkD0 = 0x0078;
D_8018CA70->unkE6 = 0x00C8;
D_8018CA70->unkE8 = 0x00D2;
D_8018CA70->unkEA = 0;
D_8018CA70->unkEC = 0;
D_8018CA70->unkD2 = 0x00DC;
D_8018CA70->unkDC = 0x0010;
D_8018CA70->unkDE = 0x00F7;
D_8018CA70->unkE4 = 0x0028;
func_8006EE7C(*(gItemWindowObjectByPlayerId + 4));
D_8018CA70->unk88 = 0.5f;
D_8018CA70->stagingPosition = (s16) gGPCurrentRaceRankByPlayerId->unk0;
D_8018CA70->unkEE = (s16) gGPCurrentRaceRankByPlayerId->unk4;
D_8018CA70->rankScaling = D_8018CA70->unk88;
D_8018D3C4 = 0x0000001E;
D_8018D3BC = 0x00000018;
D_8018D3C0 = 0x00000028;
D_801657A2 = 0x0666;
D_8018CA70[1].itemBoxX = 0x43;
D_8018CA70[1].itemBoxY = 0x32;
D_8018CA70[1].slideItemBoxX = 0;
D_8018CA70[1].slideItemBoxY = 0;
D_8018CA70[1].unk_4A = 0xF0;
D_8018CA70[1].unk_4C = 0x78;
D_8018CA70[1].rankX = 0xC8;
D_8018CA70[1].rankY = 0xD2;
D_8018CA70[1].slideRankX = 0;
D_8018CA70[1].slideRankY = 0;
D_8018CA70[1].timerX = 0xDC;
D_8018CA70[1].timerY = 0x10;
D_8018CA70[1].lapX = 0xF7;
D_8018CA70[1].lapY = 0x28;
func_8006EE7C((gItemWindowObjectByPlayerId[1]));
D_8018CA70[1].rankScaling = 0.5f;
D_8018CA70[0].stagingPosition = (s16) gGPCurrentRaceRankByPlayerId[0];
D_8018CA70[1].stagingPosition = (s16) gGPCurrentRaceRankByPlayerId[1];
D_8018CA70[0].rankScaling = D_8018CA70[1].rankScaling;
D_8018D3C4 = 0x1E;
D_8018D3BC = 0x18;
D_8018D3C0 = 0x28;
D_801657A2 = 0x666;
switch (gModeSelection) { /* irregular */
case 0:
D_8018D158 = 8;
return;
break;
case 2:
block_7:
D_8018D158 = 2;
return;
break;
case 3:
goto block_7;
D_8018D158 = 2;
break;
}
}
#else
GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80071818.s")
#endif
void func_80071A20() {
src/code_80091750.c
+11 -22
View File
@@ -1332,28 +1332,21 @@ f64 exponent_by_squaring(f64 base, s32 exponent) {
return 1.0 / result;
}
#ifdef MIPS_TO_C
//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Sep-01-2023
f64 func_8009186C(); /* extern */
f64 func_8009195C(f64, f64); /* extern */
f64 func_8009186C(f64); /* extern */
f64 func_8009195C(f64); /* extern */
f64 func_800917B0(f64 arg0, ? arg0_lo, f64 arg1, ? arg1_lo, s32 arg2) {
s32 temp_f8;
if ((arg1 <= 2147483647.0) && (arg1 >= -2147483647.0)) {
temp_f8 = (s32) arg1;
if (arg1 == (f64) temp_f8) {
return exponent_by_squaring(arg0, temp_f8);
f64 func_800917B0(f64 arg0, f64 arg1) {
if ((arg1 <= 2147483647.0) && (-2147483647.0 <= arg1)) {
if (arg1 == (s32) arg1) {
return exponent_by_squaring(arg0, arg1);
}
}
if (arg0 > 0.0) {
return func_8009195C(func_8009186C() * arg1, arg1);
return func_8009195C(func_8009186C(arg0) * arg1);
}
return 0.0;
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800917B0.s")
#endif
#ifdef MIPS_TO_C
//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Sep-01-2023
@@ -14114,22 +14107,18 @@ void func_800AEEE8(struct_8018D9E0_entry *arg0) {
}
}
#ifdef MIPS_TO_C
//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-28-2023
extern u32 D_8018CA78;
extern s8 D_8018ED90;
void func_800AEF14(struct_8018D9E0_entry *arg0) {
void func_800AEF14(s32* arg0) {
if (D_8018CAE0 != 0) {
if ((u32) D_8018CA78 < (u32) (func_800B4E24(4) & 0xFFFFF)) {
D_8018ED90 = 1;
}
arg0->type = 0;
*arg0 = 0;
}
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AEF14.s")
#endif
void func_800AEF74(struct_8018D9E0_entry *arg0) {
switch (arg0->unk4) { /* irregular */