mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-08-18 21:17:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Matched some memory.c and other (#55)

Browse Source 
* Matched some memory.c

* And more
This commit is contained in:
CoderStig
2021-11-16 02:39:33 -07:00
committed by GitHub
parent 17648067f8
commit f959f03184
251 changed files with 6736 additions and 16183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_80005FD0.c
+22 -22
View File
@@ -184,7 +184,7 @@ s32 func_800061DC(void *arg0, f32 arg1, s32 arg2) {
} while (temp_a1 < temp_v0_2);
}
} else {
temp_a0 = D_800DDB40;
temp_a0 = camera1;
phi_a0_2 = temp_a0;
phi_a0_3 = temp_a0;
if (phi_v0 > 0) {
@@ -9387,13 +9387,13 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80014D08.s")
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_802ADDC8(void *, ?, f32, f32, f32); // extern
extern ? D_80164668;
extern ? D_801646F0;
extern ? cameras;
void func_80014D30(s32 arg0, s32 arg1) {
void *temp_v0;
temp_v0 = (&D_80164550)[arg1] + (*(&D_80164668 + (arg0 * 2)) * 8);
func_802ADDC8((arg0 * 0xB8) + 0x54 + &D_801646F0, 0x41200000, temp_v0->unk0, temp_v0->unk2 + 30.0f, temp_v0->unk4);
func_802ADDC8((arg0 * 0xB8) + 0x54 + &cameras, 0x41200000, temp_v0->unk0, temp_v0->unk2 + 30.0f, temp_v0->unk4);
}
#else
GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80014D30.s")
@@ -9652,7 +9652,7 @@ void func_80015314(s32 arg0, ? arg1, s32 arg2) {
void *temp_a0;
temp_a1 = &D_800DC4DC[arg0];
temp_a0 = D_800DDB40 + (arg2 * 0xB8);
temp_a0 = camera1 + (arg2 * 0xB8);
temp_a0->unk2C = temp_a1->unk_02E;
func_80015390(temp_a0, temp_a1, 0, arg0);
}
@@ -9729,7 +9729,7 @@ extern ? D_80164638;
extern ? D_80164648;
extern ? D_80164668;
extern ? D_80164688;
extern ? D_801646F0;
extern ? cameras;
void func_80015544(s32 arg0, f32 arg1, s32 arg2, s16 arg3) {
s32 sp2C;
@@ -9780,7 +9780,7 @@ void func_80015544(s32 arg0, f32 arg1, s32 arg2, s16 arg3) {
phi_v1 = temp_v1_2;
}
*(&D_80164648 + temp_t7) = 0.0f;
temp_v0 = (arg2 * 0xB8) + &D_801646F0;
temp_v0 = (arg2 * 0xB8) + &cameras;
temp_v0->unk0 = *temp_a0;
temp_v0->unk4 = *phi_v1;
temp_v0->unk8 = *temp_a1;
@@ -9910,7 +9910,7 @@ extern ? D_80164638;
extern ? D_80164648;
extern ? D_80164668;
extern ? D_80164688;
extern ? D_801646F0;
extern ? cameras;
extern ? gPlayers;
void func_80015A9C(s32 arg0, f32 arg1, s32 arg2, s16 arg3) {
@@ -9952,7 +9952,7 @@ void func_80015A9C(s32 arg0, f32 arg1, s32 arg2, s16 arg3) {
if (temp_f0 < 0.0) {
*temp_t0 = 0.0f;
}
temp_v0 = (arg2 * 0xB8) + &D_801646F0;
temp_v0 = (arg2 * 0xB8) + &cameras;
temp_v0->unk0 = *temp_a0;
temp_v0->unk4 = *temp_a1;
temp_v0->unk8 = *temp_a2_2;
@@ -10172,7 +10172,7 @@ extern ? D_80164648;
extern ? D_80164658;
extern ? D_80164668;
extern ? D_80164688;
extern ? D_801646F0;
extern ? cameras;
extern ? gPlayers;
void func_800162CC(s32 arg0, f32 arg1, s32 arg2, s16 arg3) {
@@ -10209,7 +10209,7 @@ void func_800162CC(s32 arg0, f32 arg1, s32 arg2, s16 arg3) {
*temp_a1 = D_80162FA0.unk8;
temp_f2 = *(&gPlayers + 0x94 + (arg0 * 0xDD8));
*(&D_80164658 + temp_t8) = temp_f2;
temp_v0 = (arg2 * 0xB8) + &D_801646F0;
temp_v0 = (arg2 * 0xB8) + &cameras;
*(&D_80164648 + temp_t8) = temp_f2;
temp_v0->unk0 = temp_f0;
temp_v0->unk4 = *temp_a0;
@@ -10246,7 +10246,7 @@ extern ? D_80164648;
extern ? D_80164658;
extern ? D_80164668;
extern ? D_80164688;
extern ? D_801646F0;
extern ? cameras;
void func_80016C3C(s32 arg0, ? arg1, s32 arg2) {
f32 sp5C;
@@ -10324,7 +10324,7 @@ void func_80016C3C(s32 arg0, ? arg1, s32 arg2) {
func_8000BBD8((bitwise s32) temp_f12, sp44, *phi_s2, 0);
temp_v1_3 = *temp_s1;
temp_t7 = D_80164550;
temp_v0_2 = (arg2 * 0xB8) + &D_801646F0;
temp_v0_2 = (arg2 * 0xB8) + &cameras;
temp_v0_2->unkC = temp_f2 + (D_80162FA0.unk0 * 0.5);
temp_v0_2->unk14 = temp_f12 + (D_80162FA0.unk8 * 0.5);
temp_v0_2->unk10 = (((temp_t7 + (((temp_v1_3 + 6) % temp_s0) * 8))->unk2 + (temp_t7 + (((temp_v1_3 + 5) % temp_s0) * 8))->unk2) * 0.5f) + 8.0;
@@ -10531,7 +10531,7 @@ extern ? D_80164648;
extern ? D_80164658;
extern ? D_80164668;
extern ? D_80164688;
extern ? D_801646F0;
extern ? cameras;
extern ? gPlayers;
void func_80017720(s32 arg0, ? arg1, s32 arg2, s16 arg3) {
@@ -10570,7 +10570,7 @@ void func_80017720(s32 arg0, ? arg1, s32 arg2, s16 arg3) {
*temp_a1 = D_80162FA0.unk8;
temp_f2 = *(&gPlayers + 0x94 + (arg0 * 0xDD8));
*(&D_80164658 + temp_t8) = temp_f2;
temp_v0 = (arg2 * 0xB8) + &D_801646F0;
temp_v0 = (arg2 * 0xB8) + &cameras;
*(&D_80164648 + temp_t8) = temp_f2;
temp_v0->unk0 = temp_f0_2;
temp_v0->unk4 = *temp_a0;
@@ -10605,7 +10605,7 @@ extern ? D_80164648;
extern ? D_80164658;
extern ? D_80164668;
extern ? D_80164688;
extern ? D_801646F0;
extern ? cameras;
extern ? gPlayers;
void func_80017F10(s32 arg0, ? arg1, s32 arg2, s16 arg3) {
@@ -10646,7 +10646,7 @@ void func_80017F10(s32 arg0, ? arg1, s32 arg2, s16 arg3) {
*temp_a1 = D_80162FA0.unk8;
temp_f2 = *(&gPlayers + 0x94 + (arg0 * 0xDD8));
*(&D_80164658 + temp_t9) = temp_f2;
temp_v0_2 = (arg2 * 0xB8) + &D_801646F0;
temp_v0_2 = (arg2 * 0xB8) + &cameras;
*(&D_80164648 + temp_t9) = temp_f2;
temp_v0_2->unk0 = temp_f0_2;
temp_v0_2->unk4 = *temp_a0;
@@ -10682,7 +10682,7 @@ extern ? D_80164648;
extern ? D_80164658;
extern ? D_80164668;
extern ? D_80164688;
extern ? D_801646F0;
extern ? cameras;
extern ? gPlayers;
void func_80018718(s32 arg0, ? arg1, s32 arg2, s16 arg3) {
@@ -10722,7 +10722,7 @@ void func_80018718(s32 arg0, ? arg1, s32 arg2, s16 arg3) {
*(&D_80164658 + temp_t9) = temp_f2;
*(&D_80164648 + temp_t9) = temp_f2;
D_8016448C = 1;
temp_v0_2 = (arg2 * 0xB8) + &D_801646F0;
temp_v0_2 = (arg2 * 0xB8) + &cameras;
temp_v0_2->unk0 = temp_f0_2;
temp_v0_2->unk4 = *temp_a0;
temp_v0_2->unk8 = *temp_a1;
@@ -11013,7 +11013,7 @@ extern ? D_80164638;
extern ? D_80164648;
extern ? D_80164668;
extern ? D_80164688;
extern ? D_801646F0;
extern ? cameras;
void func_80019118(s32 arg0, f32 arg1, s32 arg2, ? arg3) {
s32 sp2C;
@@ -11065,7 +11065,7 @@ void func_80019118(s32 arg0, f32 arg1, s32 arg2, ? arg3) {
phi_v1 = temp_v1;
}
*(&D_80164648 + temp_t6) = 0.0f;
temp_v0_2 = (arg2 * 0xB8) + &D_801646F0;
temp_v0_2 = (arg2 * 0xB8) + &cameras;
temp_v0_2->unk0 = *temp_a0;
temp_v0_2->unk4 = *phi_v1;
temp_v0_2->unk8 = *temp_a1;
@@ -11439,7 +11439,7 @@ void func_80019DF4(void) {
D_80164670 = D_8016467C;
D_80164670 = D_8016467A;
D_80164670 = D_80164678;
D_800DDB40->unkAE = D_80164360;
camera1->unkAE = D_80164360;
D_80164678 = 1;
D_801646CC = 2;
}
@@ -11502,7 +11502,7 @@ void func_80019ED0(void) {
} while (temp_s0 < &D_80164680);
temp_v0_2 = D_800DC5E8;
D_80164360 = temp_v0_2;
D_800DDB40->unkAE = temp_v0_2;
camera1->unkAE = temp_v0_2;
phi_s2 = &D_80164680;
phi_s1 = 0;
phi_s0_2 = &D_80164678;