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

Match a variety of functions, remove an extraneous data file (#140)

Browse Source 
* Match func_800AB290 and func_800AC978

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>

* Match func_800A15EC

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>

* Match func_800A1A20

* Get func_800A1F30 to NON_MATCHING

* Match func_800A3C84

mips_to_c does not currently support labels being in delay slots, although
 practice that is fine. To get around this I put a nop in the delay slot
 instead. No permanent change is being made to the target assembly.

* Update the mips_to_c output for a couple functions

Split asm file containing unused funcs and added mips_to_c output for them.

* Remove extraneous data file

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran
2022-01-16 01:00:31 -05:00
committed by GitHub
parent dc805bf64c
commit b56b43e721
16 changed files with 774 additions and 1504 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_80091750.c
+303 -271
View File
@@ -4721,28 +4721,35 @@ void func_8009A7EC(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
}
#ifdef MIPS_TO_C
void func_80099A94(Mk64_Texture *, s32); /* extern */
segment_address_t func_8009A878(struct_8018DEE0_entry *arg0) {
//generated by mips_to_c commit 0ca3d5f5fa5e3d957908269ac1535e7d4f12bce9
void func_8009A878(struct_8018DEE0_entry *arg0) {
Mk64_Animation_Part *temp_v0;
Mk64_Animation_Part *temp_v1;
Mk64_Texture *temp_v0_2;
s32 temp_t1;
s32 temp_t3;
s32 temp_t8;
Mk64_Animation_Part *phi_v0;
temp_v1 = arg0->textureSequence;
if (arg0->sequenceIndex < 0) {
arg0->sequenceIndex = 0;
arg0->frameCountDown = 0;
}
arg0->frameCountDown--;
if (arg0->frameCountDown <= 0) {
arg0->sequenceIndex++;
temp_v0 = &temp_v1[arg0->sequenceIndex];
temp_t8 = arg0->frameCountDown - 1;
arg0->frameCountDown = temp_t8;
if (temp_t8 <= 0) {
temp_t1 = arg0->sequenceIndex + 1;
temp_t3 = temp_t1 * 8;
arg0->sequenceIndex = temp_t1;
temp_v0 = temp_v1 + temp_t3;
phi_v0 = temp_v0;
if (temp_v0->mk64Texture == 0) {
arg0->sequenceIndex = 0;
temp_v0 = &temp_v1[0];
phi_v0 = &temp_v1[0];
}
arg0->frameCountDown = temp_v0->frame_length;
temp_v0_2 = segmented_to_virtual(temp_v0->mk64Texture);
arg0->frameCountDown = phi_v0->frame_length;
temp_v0_2 = segmented_to_virtual(phi_v0->mk64Texture);
if (arg0->unk14 != 0) {
func_80099A94(temp_v0_2, arg0->D_8018E118_index);
arg0->unk14 = 0;
@@ -4751,62 +4758,209 @@ segment_address_t func_8009A878(struct_8018DEE0_entry *arg0) {
arg0->unk14 = 1;
}
}
return arg0->textureSequence[arg0->sequenceIndex].mk64Texture;
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009A878.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80099E60(s32, s32, s32, void *); // extern
void *segmented_to_virtual(segment_address_t); // extern
s32 func_8009A944(void *arg0, s32 arg1) {
s32 *temp_v0;
s32 temp_a0;
//generated by mips_to_c commit 0ca3d5f5fa5e3d957908269ac1535e7d4f12bce9
void func_8009A944(struct_8018DEE0_entry *arg0, s32 arg1) {
Mk64_Animation_Part *temp_v0;
Mk64_Animation_Part *temp_v1;
Mk64_Texture *temp_a0;
s32 temp_a2;
s32 temp_t1;
s32 temp_t3;
s32 temp_t8;
s32 temp_v1;
void *temp_a3;
s32 *phi_v0;
void *phi_a3;
Mk64_Animation_Part *phi_v0;
temp_a3 = arg0;
temp_v1 = arg0->unk0;
phi_a3 = temp_a3;
if (arg0->unk4 < 0) {
arg0->unk4 = 0;
arg0->unk8 = 0;
temp_v1 = arg0->textureSequence;
if (arg0->sequenceIndex < 0) {
arg0->sequenceIndex = 0;
arg0->frameCountDown = 0;
}
temp_t8 = temp_a3->unk8 - 1;
temp_a3->unk8 = temp_t8;
temp_t8 = arg0->frameCountDown - 1;
arg0->frameCountDown = temp_t8;
if (temp_t8 <= 0) {
temp_t1 = temp_a3->unk4 + 1;
temp_t1 = arg0->sequenceIndex + 1;
temp_t3 = temp_t1 * 8;
temp_a3->unk4 = temp_t1;
arg0->sequenceIndex = temp_t1;
temp_v0 = temp_v1 + temp_t3;
phi_v0 = temp_v0;
if (*temp_v0 == 0) {
temp_a3->unk4 = 0;
phi_v0 = temp_v1 + (0 * 8);
if (temp_v0->mk64Texture == 0) {
arg0->sequenceIndex = 0;
phi_v0 = &temp_v1[0];
}
temp_a3->unk8 = phi_v0->unk4;
arg0 = temp_a3;
temp_a0 = segmented_to_virtual(phi_v0->unk0);
arg0->frameCountDown = phi_v0->frame_length;
arg0 = arg0;
temp_a0 = segmented_to_virtual(phi_v0->mk64Texture);
temp_a2 = arg0->unk14 ^ 1;
arg0->unk14 = temp_a2;
func_80099E60(temp_a0, arg1, temp_a2, arg0);
phi_a3 = arg0;
func_80099E60(temp_a0, arg1, temp_a2);
}
return *(phi_a3->unk0 + (phi_a3->unk4 * 8));
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009A944.s")
#endif
#ifdef MIPS_TO_C
extern s32 D_8018D9B0;
extern ? D_8018E118;
UNUSED void func_8009A9FC(s32 arg0, s32 arg1, u32 arg2, s32 arg3) {
s32 temp_t6;
s32 temp_t7;
s32 temp_t8;
s32 temp_t9;
s32 temp_v1;
u16 temp_a0;
u32 temp_t1;
void *temp_t0;
u16 *phi_v0;
void *phi_t0;
u32 phi_t1;
temp_v1 = D_8018D9B0;
phi_v0 = ((&D_8018E118 + (arg0 * 8))->unk4 * 2) + temp_v1;
phi_t0 = ((&D_8018E118 + (arg1 * 8))->unk4 * 2) + temp_v1;
phi_t1 = 0U;
if (arg2 != 0) {
do {
temp_a0 = *phi_v0;
temp_t1 = phi_t1 + 1;
temp_t6 = (s32) (temp_a0 & 0xF800) >> 0xB;
temp_t7 = (s32) (temp_a0 & 0x7C0) >> 6;
temp_t8 = (s32) (temp_a0 & 0x3E) >> 1;
temp_t0 = phi_t0 + 2;
temp_t9 = (s32) ((temp_t6 * 0x4D) + (temp_t7 * 0x96) + (temp_t8 * 0x1D)) >> 8;
temp_t0->unk-2 = (s16) (((((s32) ((((s32) (temp_t9 * 6) / 8) - temp_t8) * arg3) >> 8) + temp_t8) * 2) + ((((s32) ((((s32) (temp_t9 * 7) / 8) - temp_t7) * arg3) >> 8) + temp_t7) << 6) + ((((s32) ((temp_t9 - temp_t6) * arg3) >> 8) + temp_t6) << 0xB) + (temp_a0 & 1));
phi_v0 += 2;
phi_t0 = temp_t0;
phi_t1 = temp_t1;
} while (temp_t1 < arg2);
}
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009A9FC.s")
#endif
#ifdef MIPS_TO_C
extern s32 D_8018D9B0;
extern ? D_8018E11C;
UNUSED void func_8009AB7C(s32 arg0) {
s32 temp_v1;
u16 *temp_v0;
u16 temp_a1;
u16 temp_a1_2;
u16 temp_a1_3;
u16 temp_a1_4;
u16 *phi_v0;
s32 phi_v1;
phi_v0 = (*(&D_8018E11C + (arg0 * 8)) * 2) + D_8018D9B0;
phi_v1 = 0;
do {
temp_a1 = *phi_v0;
temp_v1 = phi_v1 + 4;
temp_v0 = phi_v0 + 8;
temp_a1_2 = temp_v0->unk-6;
temp_v0->unk-8 = (s16) ((((u32) ((((s32) (temp_a1 & 0xF800) >> 0xB) * 0x4D) + (((s32) (temp_a1 & 0x7C0) >> 6) * 0x96) + (((s32) (temp_a1 & 0x3E) >> 1) * 0x1D)) >> 8) * 0x842) + (temp_a1 & 1));
temp_a1_3 = temp_v0->unk-4;
temp_v0->unk-6 = (u16) ((((u32) ((((s32) (temp_a1_2 & 0xF800) >> 0xB) * 0x4D) + (((s32) (temp_a1_2 & 0x7C0) >> 6) * 0x96) + (((s32) (temp_a1_2 & 0x3E) >> 1) * 0x1D)) >> 8) * 0x842) + (temp_a1_2 & 1));
temp_a1_4 = temp_v0->unk-2;
temp_v0->unk-4 = (u16) ((((u32) ((((s32) (temp_a1_3 & 0xF800) >> 0xB) * 0x4D) + (((s32) (temp_a1_3 & 0x7C0) >> 6) * 0x96) + (((s32) (temp_a1_3 & 0x3E) >> 1) * 0x1D)) >> 8) * 0x842) + (temp_a1_3 & 1));
temp_v0->unk-2 = (u16) ((((u32) ((((s32) (temp_a1_4 & 0xF800) >> 0xB) * 0x4D) + (((s32) (temp_a1_4 & 0x7C0) >> 6) * 0x96) + (((s32) (temp_a1_4 & 0x3E) >> 1) * 0x1D)) >> 8) * 0x842) + (temp_a1_4 & 1));
phi_v0 = temp_v0;
phi_v1 = temp_v1;
} while (temp_v1 != 0x4B000);
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009AB7C.s")
#endif
#ifdef MIPS_TO_C
extern s32 D_8018D9B0;
extern ? D_8018E118;
UNUSED void func_8009AD78(s32 arg0, s32 arg1) {
s32 temp_a2;
s32 temp_a3;
s32 temp_t0;
s32 temp_t0_2;
s32 temp_v1_2;
u16 *temp_v0;
u16 *temp_v0_2;
u16 *temp_v0_3;
u16 temp_a0;
u16 temp_a0_2;
u16 temp_a0_3;
u16 temp_a0_4;
u16 temp_a0_5;
u32 temp_t6;
u32 temp_t6_2;
u32 temp_t7;
u32 temp_t8;
u32 temp_t9;
void *temp_v1;
u16 *phi_v0;
s32 phi_t0;
u16 *phi_v0_2;
s32 phi_t0_2;
temp_v1 = (arg0 * 8) + &D_8018E118;
temp_a2 = temp_v1->unk4;
temp_a3 = temp_v1->unkC - temp_a2;
temp_v0 = (temp_a2 * 2) + D_8018D9B0;
phi_v0 = temp_v0;
phi_t0 = 0;
phi_v0_2 = temp_v0;
phi_t0_2 = 0;
if (temp_a3 != 0) {
temp_v1_2 = temp_a3 & 3;
if (temp_v1_2 != 0) {
do {
temp_a0 = *phi_v0;
temp_t0 = phi_t0 + 1;
temp_v0_2 = phi_v0 + 2;
temp_t6 = (u32) ((((s32) (temp_a0 & 0xF800) >> 0xB) * 0x4D) + (((s32) (temp_a0 & 0x7C0) >> 6) * 0x96) + (((s32) (temp_a0 & 0x3E) >> 1) * 0x1D)) >> 8;
temp_v0_2->unk-2 = (s16) (((temp_t6 + ((u32) ((0x20 - temp_t6) * arg1) >> 8)) * 0x842) + (temp_a0 & 1));
phi_v0 = temp_v0_2;
phi_t0 = temp_t0;
phi_v0_2 = temp_v0_2;
phi_t0_2 = temp_t0;
} while (temp_v1_2 != temp_t0);
if (temp_t0 != temp_a3) {
goto block_5;
}
} else {
block_5:
do {
temp_a0_2 = *phi_v0_2;
temp_t0_2 = phi_t0_2 + 4;
temp_v0_3 = phi_v0_2 + 8;
temp_a0_3 = temp_v0_3->unk-6;
temp_t7 = (u32) ((((s32) (temp_a0_2 & 0xF800) >> 0xB) * 0x4D) + (((s32) (temp_a0_2 & 0x7C0) >> 6) * 0x96) + (((s32) (temp_a0_2 & 0x3E) >> 1) * 0x1D)) >> 8;
temp_v0_3->unk-8 = (s16) (((temp_t7 + ((u32) ((0x20 - temp_t7) * arg1) >> 8)) * 0x842) + (temp_a0_2 & 1));
temp_a0_4 = temp_v0_3->unk-4;
temp_t8 = (u32) ((((s32) (temp_a0_3 & 0xF800) >> 0xB) * 0x4D) + (((s32) (temp_a0_3 & 0x7C0) >> 6) * 0x96) + (((s32) (temp_a0_3 & 0x3E) >> 1) * 0x1D)) >> 8;
temp_v0_3->unk-6 = (u16) (((temp_t8 + ((u32) ((0x20 - temp_t8) * arg1) >> 8)) * 0x842) + (temp_a0_3 & 1));
temp_a0_5 = temp_v0_3->unk-2;
temp_t9 = (u32) ((((s32) (temp_a0_4 & 0xF800) >> 0xB) * 0x4D) + (((s32) (temp_a0_4 & 0x7C0) >> 6) * 0x96) + (((s32) (temp_a0_4 & 0x3E) >> 1) * 0x1D)) >> 8;
temp_v0_3->unk-4 = (u16) (((temp_t9 + ((u32) ((0x20 - temp_t9) * arg1) >> 8)) * 0x842) + (temp_a0_4 & 1));
temp_t6_2 = (u32) ((((s32) (temp_a0_5 & 0xF800) >> 0xB) * 0x4D) + (((s32) (temp_a0_5 & 0x7C0) >> 6) * 0x96) + (((s32) (temp_a0_5 & 0x3E) >> 1) * 0x1D)) >> 8;
temp_v0_3->unk-2 = (u16) (((temp_t6_2 + ((u32) ((0x20 - temp_t6_2) * arg1) >> 8)) * 0x842) + (temp_a0_5 & 1));
phi_v0_2 = temp_v0_3;
phi_t0_2 = temp_t0_2;
} while (temp_t0_2 != temp_a3);
}
}
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009AD78.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 5bd751fca3befef73d6a2e20d84a88cc918a77fe
f64 func_800917B0(f64, f64); /* extern */
@@ -9101,14 +9255,34 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A0FA4.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
/*
Failed to decompile function func_800A10CC:
//generated by mips_to_c commit 0ca3d5f5fa5e3d957908269ac1535e7d4f12bce9
extern s8 *D_800E7940[0x13];
Label L800A1114 refers to a delay slot; this is currently not supported.
Please modify the assembly to work around it (e.g. copy the instruction
to all jump sources and move the label, or add a nop to the delay slot).
*/
void func_800A10CC(struct_8018D9E0_entry *arg0) {
s32 temp_s1;
s32 temp_s3;
s32 temp_v0;
s32 phi_s0;
s8 **phi_s2;
s32 phi_s1;
temp_v0 = arg0->unk4;
if ((temp_v0 == 2) || (temp_v0 == 3) || (temp_v0 == 4) || (temp_v0 == 5)) {
gDisplayListHead = func_80098C18(gDisplayListHead, 0x1E, 0x32, 0x122, 0x6E, 0, 0, 0, 0xFF);
temp_s3 = arg0->unk4 - 2;
set_text_color(3);
phi_s0 = 0x41;
phi_s2 = (temp_s3 * 0x10) + D_800E7940;
phi_s1 = 0;
do {
func_80093324(0x23, phi_s0, *phi_s2, 0, 0.65f, 0.65f);
temp_s1 = phi_s1 + 4;
phi_s0 += 0xD;
phi_s2 += 4;
phi_s1 = temp_s1;
} while (temp_s1 != 0x10);
}
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A10CC.s")
#endif
@@ -9217,75 +9391,39 @@ block_7:
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A1500.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 draw_box(s32, s32, s32, s32, s32, s32, s32, s32, s32); // extern
s32 func_800959A0(s32, s32, s32, s32, s32); // extern
s32 func_8009C204(s32, s32, s32, s32, s32); // extern
s32 func_800B639C(s32); // extern
void *segmented_to_virtual(segment_address_t); // extern
extern ? D_02004A0C;
extern ? D_800E7D74;
extern ? D_800E7DC4;
extern ? gCupCourseOrder;
extern s32 gDisplayListHead;
void func_800A15EC(void *arg0) {
s32 sp44;
s32 temp_a1;
s32 temp_s1;
s32 temp_s1_2;
s32 temp_v0;
s32 temp_v0_2;
s32 temp_v1;
s32 temp_v1_2;
temp_v0 = arg0->unk0 - 0x7C;
temp_a1 = *(&gCupCourseOrder + (((temp_v0 / 4) * 8) + ((temp_v0 % 4) * 2))) * 4;
sp44 = temp_a1;
temp_v0_2 = func_8009C204(gDisplayListHead, segmented_to_virtual(*(&D_800E7D74 + temp_a1)), arg0->unkC, arg0->unk10, 2);
gDisplayListHead = temp_v0_2;
temp_v1 = arg0->unk10;
temp_s1 = arg0->unkC;
gDisplayListHead = draw_box(temp_v0_2, temp_s1, temp_v1 + 0x27, temp_s1 + 0x40, temp_v1 + 0x30, 0, 0, 0, 0xFF);
gDisplayListHead = func_8009C204(gDisplayListHead, segmented_to_virtual(*(&D_800E7DC4 + sp44)), arg0->unkC, arg0->unk10 + 0x27, 3);
if (func_800B639C(arg0->unk0 - 0x7C) >= 0) {
temp_v1_2 = arg0->unk10;
temp_s1_2 = arg0->unkC;
gDisplayListHead = func_800959A0(gDisplayListHead, temp_s1_2 + 0x20, temp_v1_2, temp_s1_2 + 0x3F, temp_v1_2 + 9);
gDisplayListHead = func_8009C204(gDisplayListHead, segmented_to_virtual(&D_02004A0C), arg0->unkC + 0x20, arg0->unk10, 2);
void func_800A15EC(struct_8018D9E0_entry *arg0) {
s16 courseId = gCupCourseOrder[(arg0->type - 0x7C) / 4][(arg0->type - 0x7C) % 4];
gDisplayListHead = func_8009C204(gDisplayListHead, segmented_to_virtual(D_800E7D74[courseId]), arg0->column, arg0->row, 2);
gDisplayListHead = draw_box(gDisplayListHead, arg0->column, arg0->row + 0x27, arg0->column + 0x40, arg0->row + 0x30, 0, 0, 0, 0xFF);
gDisplayListHead = func_8009C204(gDisplayListHead, segmented_to_virtual(D_800E7DC4[courseId]), arg0->column, arg0->row + 0x27, 3);
if (func_800B639C(arg0->type - 0x7C) >= 0) {
// The "^ 0" is required to force the use of v1 instead of a 4th s* register
gDisplayListHead = func_800959A0(gDisplayListHead, arg0->column + 0x20, arg0->row ^ 0, arg0->column + 0x3F, arg0->row + 9);
gDisplayListHead = func_8009C204(gDisplayListHead, segmented_to_virtual(&D_02004A0C), arg0->column + 0x20, arg0->row, 2);
}
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A15EC.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void *func_8009BA74(void *, s32, s32, s32); // extern
void *segmented_to_virtual(segment_address_t); // extern
extern ? D_02001FA4;
extern ? D_800E74D0;
extern void *gDisplayListHead;
//generated by mips_to_c commit 0ca3d5f5fa5e3d957908269ac1535e7d4f12bce9
void func_800A1780(void *arg0) {
void func_800A1780(struct_8018D9E0_entry *arg0) {
Gfx *temp_t0;
RGBA16 *temp_a1;
RGBA16 *temp_v1;
s32 temp_a2;
s32 temp_a3;
s32 temp_v0;
void *temp_a1;
void *temp_t0;
void *temp_v1;
temp_a3 = arg0->unk20;
temp_v1 = &D_800E74D0 + (temp_a3 * 8);
temp_v1 = &D_800E74D0[temp_a3];
temp_v0 = arg0->unk1C;
temp_a2 = 0x100 - temp_v0;
temp_a1 = &D_800E74D0 + (((temp_a3 + 1) % 3) * 8);
temp_a1 = &D_800E74D0[(s32) (temp_a3 + 1) % 3];
temp_t0 = gDisplayListHead;
gDisplayListHead = temp_t0 + 8;
temp_t0->unk0 = 0xFA000000;
temp_t0->unk4 = ((((temp_v1->unk0 * temp_a2) + (temp_a1->unk0 * temp_v0)) / 0x100) << 0x18) | (((((temp_v1->unk2 * temp_a2) + (temp_a1->unk2 * temp_v0)) / 0x100) & 0xFF) << 0x10) | (((((temp_v1->unk4 * temp_a2) + (temp_a1->unk4 * temp_v0)) / 0x100) & 0xFF) << 8) | ((((temp_v1->unk6 * temp_a2) + (temp_a1->unk6 * temp_v0)) / 0x100) & 0xFF);
gDisplayListHead = func_8009BA74(gDisplayListHead, segmented_to_virtual(&D_02001FA4), arg0->unkC, arg0->unk10);
temp_t0->words.w0 = 0xFA000000;
temp_t0->words.w1 = (((s32) ((temp_v1->red * temp_a2) + (temp_a1->red * temp_v0)) / 256) << 0x18) | ((((s32) ((temp_v1->green * temp_a2) + (temp_a1->green * temp_v0)) / 256) & 0xFF) << 0x10) | ((((s32) ((temp_v1->blue * temp_a2) + (temp_a1->blue * temp_v0)) / 256) & 0xFF) << 8) | (((s32) ((temp_v1->alpha * temp_a2) + (temp_a1->alpha * temp_v0)) / 256) & 0xFF);
gDisplayListHead = func_8009BA74(gDisplayListHead, segmented_to_virtual(&D_02001FA4), arg0->column, arg0->row);
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A1780.s")
@@ -9295,7 +9433,7 @@ void func_800A1924(struct_8018D9E0_entry *arg0) {
func_8009A76C(arg0->D_8018DEE0_index, 0x17, 0x84, -1);
if (func_800B639C(gTimeTrialDataCourseIndex) >= TIME_TRIAL_DATA_LUIGI_RACEWAY) {
gDisplayListHead = func_800959A0(gDisplayListHead, 0x57, 0x84, 0x96, 0x95);
gDisplayListHead = func_8009BA74(gDisplayListHead, D_02004A0C, 0x57, 0x84);
gDisplayListHead = func_8009BA74(gDisplayListHead, &D_02004A0C, 0x57, 0x84);
}
func_8004EF9C(gCupCourseOrder[gTimeTrialDataCourseIndex / 4][gTimeTrialDataCourseIndex % 4]);
do {
@@ -9303,56 +9441,29 @@ void func_800A1924(struct_8018D9E0_entry *arg0) {
} while(0);
}
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? draw_text(?, s32, s32, ?, f32, f32); // extern
? func_80093324(?, s32, ? *, ?, f32, f32); // extern
? func_800936B8(?, s32, s32, ?, f32, f32); // extern
? func_800A474C(s32, ?, s32); // extern
? set_text_color(?); // extern
extern ? D_800E7574;
extern ? *D_800E7728;
extern ? *D_800E772C;
extern ? D_800E77D8;
extern ? D_800E77E4;
extern s8 gTimeTrialDataCourseIndex;
extern ? gCupCourseOrder;
void func_800A1A20(struct_8018D9E0_entry *arg0) {
s16 courseId;
s32 recordType;
s32 rowOffset;
void func_800A1A20(void *arg0) {
s16 temp_s1;
s32 temp_s0;
s32 temp_s0_2;
s8 temp_v0;
s32 phi_s0;
s32 phi_s1;
temp_v0 = gTimeTrialDataCourseIndex;
temp_s1 = *(&gCupCourseOrder + (((temp_v0 / 4) * 8) + ((temp_v0 % 4) * 2)));
arg0->unkC = 0x14;
courseId = gCupCourseOrder[gTimeTrialDataCourseIndex / 4][gTimeTrialDataCourseIndex % 4];
arg0->column = 0x14;
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_1);
temp_s0 = temp_s1 * 4;
draw_text(0x69, arg0->unk10 + 0x19, *(&D_800E7574 + temp_s0), 0, 0.75f, 0.75f);
draw_text(0x69, arg0->row + 0x19, D_800E7574[courseId], 0, 0.75f, 0.75f);
set_text_color(TEXT_RED);
func_80093324(0x2D, arg0->unk10 + 0x28, &D_800E77D8, 0, 0.75f, 0.75f);
func_800936B8(0xA5, arg0->unk10 + 0x28, *(&D_800E77E4 + temp_s0), 1, 0.75f, 0.75f);
func_80093324(0x2D, arg0->row + 0x28, &D_800E77D8, 0, 0.75f, 0.75f);
func_800936B8(0xA5, arg0->row + 0x28, D_800E77E4[courseId], 1, 0.75f, 0.75f);
set_text_color(TEXT_YELLOW);
func_80093324(0xA0, arg0->unk10 + 0x86, D_800E7728, 0, 0.75f, 0.75f);
phi_s0 = 0;
phi_s1 = 0;
do {
func_80093324(0xA0, arg0->row + 0x86, D_800E7728, 0, 0.75f, 0.75f);
// Print the 3 Lap Time Trial records
for(recordType = TIME_TRIAL_3LAP_RECORD_1, rowOffset = 0; recordType < TIME_TRIAL_1LAP_RECORD; recordType++, rowOffset += 0xD){
set_text_color(TEXT_RED);
func_800A474C(phi_s0, 0x96, arg0->unk10 + phi_s1 + 0x92);
temp_s0_2 = phi_s0 + 1;
phi_s0 = temp_s0_2;
phi_s1 += 0xD;
} while (temp_s0_2 != 5);
func_800A474C(recordType, 0x96, arg0->row + rowOffset + 0x92);
}
set_text_color(TEXT_YELLOW);
func_80093324(0xA0, arg0->unk10 + 0xD5, D_800E772C, 0, 0.75f, 0.75f);
func_800A474C(5, 0x96, arg0->unk10 + 0xE1);
func_80093324(0xA0, arg0->row + 0xD5, D_800E772C, 0, 0.75f, 0.75f);
func_800A474C(TIME_TRIAL_1LAP_RECORD, 0x96, arg0->row + 0xE1);
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A1A20.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -9484,26 +9595,17 @@ void func_800A1DE0(s32 arg0) {
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A1DE0.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80093324(?, s32, s32, ?, f32, f32); // extern
? set_text_color(?); // extern
extern s32 D_800E7860;
void func_800A1F30(s32 arg0) {
s32 temp_s0;
s32 phi_s0;
s32 *phi_s1;
#ifdef NON_MATCHING
// Equivalent functionality, but the arguments to func_80093324 are
// handled in a slightly different order
void func_800A1F30(struct_8018D9E0_entry *unused) {
s32 row;
char **text;
set_text_color(TEXT_RED);
phi_s0 = 0x49;
phi_s1 = &D_800E7860;
do {
func_80093324(0x2A, phi_s0, *phi_s1, 0, 0.75f, 0.75f);
temp_s0 = phi_s0 + 0x10;
phi_s0 = temp_s0;
phi_s1 += 4;
} while (temp_s0 != 0x69);
for(row = 0x49, text = D_800E7860; row < 0x69; row += 0x10, text++){
func_80093324(0x2A, row, *text, 0, 0.75f, 0.75f);
}
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A1F30.s")
@@ -10472,61 +10574,27 @@ loop_4:
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A3ADC.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? draw_text(s32, s32, s32, ?, f32, f32); // extern
? func_80093324(s32, s32, s32, ?, f32, f32); // extern
? func_800A4550(s32, s32, s32); // extern
? func_800A474C(s32, s32, s32); // extern
? set_text_color(?); // extern
extern ? D_800E7574;
extern s32 D_800E7728;
extern s32 D_800E772C;
extern s32 D_800E7730;
extern f32 D_800F1CC8;
extern s8 gCupSelection;
extern ? gCupCourseOrder;
void func_800A3C84(void *arg0) {
f32 temp_f0;
s32 temp_s0;
s32 temp_s0_2;
s32 phi_s0;
s32 phi_s1;
s32 phi_s0_2;
s32 phi_s1_2;
void func_800A3C84(struct_8018D9E0_entry *arg0) {
s32 recordType;
s32 rowOffset;
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_1);
temp_f0 = D_800F1CC8;
draw_text(arg0->unkC + 0x43, arg0->unk10 + 0x19, *(&D_800E7574 + (*(&gCupCourseOrder + ((gCupSelection * 8) + (gCupCourseSelection * 2))) * 4)), 0, temp_f0, temp_f0);
draw_text(arg0->column + 0x43, arg0->row + 0x19, D_800E7574[gCupCourseOrder[gCupSelection][gCupCourseSelection]], 0, D_800F1CC8, D_800F1CC8);
set_text_color(TEXT_YELLOW);
draw_text(arg0->unkC + 0x46, arg0->unk10 + 0x28, D_800E7730, 0, 0.75f, 0.75f);
phi_s0 = 0;
phi_s1 = 0;
phi_s0_2 = 0;
phi_s1_2 = 0;
do {
func_800A4550(phi_s0, arg0->unkC + 0x17, arg0->unk10 + phi_s1 + 0x37);
temp_s0 = phi_s0 + 1;
phi_s0 = temp_s0;
phi_s1 += 0xF;
} while (temp_s0 < 4);
draw_text(arg0->column + 0x46, arg0->row + 0x28, D_800E7730, 0, 0.75f, 0.75f);
for(recordType = 0, rowOffset = 0; recordType < TIME_TRIAL_3LAP_RECORD_5; recordType += 1, rowOffset += 0xF){
func_800A4550(recordType, arg0->column + 0x17, arg0->row + rowOffset + 0x37);
}
set_text_color(TEXT_YELLOW);
func_80093324(0xB4 - arg0->unkC, arg0->unk10 + 0x86, D_800E7728, 0, 0.75f, 0.75f);
do {
func_80093324(0xB4 - arg0->column, arg0->row + 0x86, D_800E7728, 0, 0.75f, 0.75f);
for(recordType = 0, rowOffset = 0; recordType < TIME_TRIAL_1LAP_RECORD; recordType += 1, rowOffset += 0xD){
set_text_color(TEXT_RED);
func_800A474C(phi_s0_2, 0xAA - arg0->unkC, arg0->unk10 + phi_s1_2 + 0x92);
temp_s0_2 = phi_s0_2 + 1;
phi_s0_2 = temp_s0_2;
phi_s1_2 += 0xD;
} while (temp_s0_2 != 5);
func_800A474C(recordType, 0xAA - arg0->column, arg0->row + rowOffset + 0x92);
}
set_text_color(TEXT_YELLOW);
func_80093324(0xB4 - arg0->unkC, arg0->unk10 + 0xD5, D_800E772C, 0, 0.75f, 0.75f);
func_800A474C(5, 0xAA - arg0->unkC, arg0->unk10 + 0xE1);
func_80093324(0xB4 - arg0->column, arg0->row + 0xD5, D_800E772C, 0, 0.75f, 0.75f);
func_800A474C(TIME_TRIAL_1LAP_RECORD, 0xAA - arg0->column, arg0->row + 0xE1);
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A3C84.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
@@ -14974,31 +15042,12 @@ void func_800AB260(struct_8018D9E0_entry *arg0) {
}
}
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8009A594(s32, ?, s32, void *); // extern
void *segmented_to_virtual_dupe(segment_address_t); // extern
extern ? D_800E7E34;
extern s8 gCupSelection;
extern ? gCupCourseOrder;
void func_800AB290(void *arg0) {
s16 temp_t2;
s8 temp_v0;
void *temp_a3;
temp_v0 = gCupSelection;
temp_a3 = arg0;
if (temp_v0 != arg0->unk1C) {
arg0->unk1C = temp_v0;
temp_t2 = *(&gCupCourseOrder - 0xBE + ((gCupSelection * 8) + (arg0->unk0 * 2)));
arg0 = temp_a3;
func_8009A594(arg0->unk18, 0, segmented_to_virtual_dupe(*(&D_800E7E34 + (temp_t2 * 4))), arg0);
void func_800AB290(struct_8018D9E0_entry *arg0) {
if (arg0->unk1C != gCupSelection) {
arg0->unk1C = gCupSelection;
func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe(D_800E7E34[gCupCourseOrder[gCupSelection][arg0->type - 0x5F]]));
}
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AB290.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -15870,45 +15919,28 @@ loop_41:
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AC458.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800A9208(?); // extern
void func_800AC978(void *arg0) {
s32 temp_v0;
s32 temp_v0_2;
temp_v0 = arg0->unk4;
if (temp_v0 != 0) {
if (temp_v0 != 1) {
if (temp_v0 != 2) {
if (temp_v0 != 3) {
return;
}
temp_v0_2 = arg0->unk1C;
if (temp_v0_2 != 0) {
arg0->unk1C = temp_v0_2 - 0x33;
}
// Duplicate return node #10. Try simplifying control flow for better match
return;
}
// Duplicate return node #10. Try simplifying control flow for better match
return;
}
func_800A9208(0xA0);
if (arg0->unkC == 0xA0) {
void func_800AC978(struct_8018D9E0_entry *arg0) {
switch (arg0->unk4) { /* irregular */
case 0:
arg0->column = 0x14A;
arg0->unk4 = 1;
arg0->unk1C = 0xFF;
break;
case 1:
func_800A9208(arg0, 0xA0);
if (arg0->column == 0xA0) {
arg0->unk4 = 2;
return;
}
return;
break;
case 2:
break;
case 3:
if (arg0->unk1C != 0) {
arg0->unk1C -= 0x33;
}
break;
}
arg0->unkC = 0x14A;
arg0->unk4 = 1;
arg0->unk1C = 0xFF;
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AC978.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
src/code_80091750.h
+28 -5
View File
@@ -25,7 +25,6 @@ s32 func_80092DF8();
s32 get_string_width(char*);
void set_text_color(s32);
void func_800930E4(s32, s32, s32*);
Gfx *func_8009BEF0(Gfx*, s32, f32, f32, s32, f32,f32);
void print_text0(s32, s32, char*, s32, f32, f32, s32);
void func_80093324(s32, s32, char*, s32, f32, f32);
void func_80093358(s32, s32, char*, s32, f32, f32);
@@ -48,6 +47,7 @@ void func_800947B4(struct GfxPool*, s32);
void func_80094A64(Mtx*);
void func_80094C60();
void func_80095574();
Gfx *func_800959A0(Gfx*, s32, s32, s32, s32);
Gfx *func_80098C18(Gfx*, s32, s32, s32, s32, s32, s32, s32, s32);
Gfx *draw_box(Gfx*, s32, s32, s32, s32, s32, s32, s32, s32);
Gfx *func_80098FC8(Gfx*, s32, s32, s32, s32);
@@ -55,6 +55,7 @@ void func_80099110();
void func_80099184(s32);
void *segmented_to_virtual(segment_address_t);
void *segmented_to_virtual_dupe(segment_address_t);
Gfx *func_8009C204(Gfx*, Mk64_Texture*, s32, s32, s32);
void func_8009CA2C();
void func_8009CA6C(s32);
void func_80099A94(Mk64_Texture *, s32);
@@ -67,18 +68,25 @@ void func_8009A594(s32, s32, segment_address_t);
void func_8009A640(s32, s32, s32, segment_address_t);
void func_8009A76C(s32, s32, s32, s32);
void func_8009A7EC(s32, s32, s32, s32, s32);
segment_address_t func_8009A878(struct_8018DEE0_entry*);
void func_8009A878(struct_8018DEE0_entry*);
void func_8009A944(struct_8018DEE0_entry*, s32);
Gfx *func_8009BA74(Gfx *, Mk64_Texture*, s32, s32);
s32 func_8009C434(s32, struct_8018DEE0_entry*, s32, s32, s32);
s32 func_8009C708(s32, struct_8018DEE0_entry *, s32, s32, s32, s32);
Gfx *func_8009BEF0(Gfx*, s32, f32, f32, s32, f32,f32);
Gfx *func_8009C434(Gfx*, struct_8018DEE0_entry*, s32, s32, s32);
Gfx *func_8009C708(Gfx*, struct_8018DEE0_entry *, s32, s32, s32, s32);
void func_8009C918();
void func_8009E1C0();
void func_8009E208();
void func_8009E258();
void add_8018D9E0_entry(s32, s32, s32, s8);
void func_800A0AD0(struct_8018D9E0_entry*);
void func_800A11D0(struct_8018D9E0_entry*, s32, s32);
void func_800A15EC(struct_8018D9E0_entry*);
void func_800A1924(struct_8018D9E0_entry*);
void func_800A1A20(struct_8018D9E0_entry*);
void func_800A3C84(struct_8018D9E0_entry*);
void func_800A4550(s32, s32, s32);
void func_800A474C(s32, s32, s32);
void func_800A4B38(struct_8018D9E0_entry*);
void func_800A4BC8(struct_8018D9E0_entry*);
void func_800A4EF8(struct_8018D9E0_entry*);
@@ -97,6 +105,7 @@ void get_time_record_seconds(s32 , char*);
void get_time_record_centiseconds(s32, char*);
void func_800A8230();
void func_800A8250();
void func_800AB290(struct_8018D9E0_entry*);
void func_800A86E8(struct_8018D9E0_entry*);
void func_800A8E14(struct_8018D9E0_entry*);
void func_800A8EC0(struct_8018D9E0_entry*);
@@ -108,6 +117,7 @@ struct_8018D9E0_entry *func_800AAEF4(s32);
struct_8018D9E0_entry *func_800AAF30(s32);
s32 func_800AAF70(s32);
void func_800AAF94(struct_8018D9E0_entry*, s32);
void func_800AC978(struct_8018D9E0_entry*);
// code_80057C60.c
void func_80057CE4();
@@ -122,8 +132,9 @@ void func_80057CE4();
extern Mk64_Texture D_0200157C;
extern Mk64_Texture D_02001874;
extern Mk64_Texture D_02001FA4;
extern Mk64_Texture D_02004A0C;
extern Gfx D_02004A0C[];
extern Gfx D_02007650[];
extern Gfx D_020076B0[];
extern Gfx D_020077A8[];
@@ -140,22 +151,34 @@ extern Gfx D_06009410[];
extern s16 gGlyphDisplayWidth[]; // D_800EF690
extern RGBA16 D_800E74A8[5];
extern RGBA16 D_800E74D0[3];
extern char *D_800E7500[9];
extern char *D_800E7524[];
extern char *D_800E7574[8];
extern char *D_800E7678[];
extern char *D_800E76CC[4];
extern char *D_800E76DC[4];
extern char *D_800E7728;
extern char *D_800E772C;
extern char *D_800E7730;
extern char *D_800E77A8;
extern char *D_800E77AC;
extern char *D_800E77B0;
extern char *D_800E77D8;
extern char *D_800E77E4[0x14];
extern char *D_800E7860[2];
extern char *D_800E7A88[4];
extern char *D_800E7A98;
extern char *D_800E7A9C[2];
extern Mk64_Texture *D_800E7D74[0x14];
extern Mk64_Texture *D_800E7DC4[0x17];
extern Mk64_Animation_Part *D_800E7E34[0x14];
extern s32 gGlyphTextureLUT[]; // D_800E7E84
extern Mk64_Texture_Group *D_800E82B4[5];
extern f32 D_800E8530;
extern f32 D_800E8534;
extern s8 D_800E86D0[20];
extern f32 D_800F1CC8;
extern f32 D_800F1F04;
extern f32 D_800F1F08;
extern f32 D_800F1F0C;
src/code_800AF9B0.h
+1 -2
View File
@@ -34,6 +34,7 @@ void func_800B46D0();
void func_800B4728(s32);
void reset_save_data_grand_prix_points_and_sound_mode();
s32 func_800B4874(s32);
s32 func_800B639C(s32);
s32 compute_save_data_checksum_1();
s32 compute_save_data_checksum_2();
void func_800B4A10();
@@ -102,7 +103,6 @@ extern s32 D_800E86F4;
extern s8 D_800E86F8;
extern s8 D_800E86FC;
extern s32 gGameModeFromNumPlayersAndRowSelection[SELECTED_PLAYER_DEFINES_TOTAL][MAX_NUM_MAIN_MENU_GAME_TYPES]; // D_800F2B60. 0-4 players, 3 possible game types per player amount
extern s16 gCupCourseOrder[NUM_CUPS][NUM_COURSES_PER_CUP]; // D_800F2BB4
extern u8 D_800F2E60[];
extern u8 D_800F2E64;
extern u8 D_800F2E74;
@@ -141,7 +141,6 @@ extern u32 D_8018EDBC;
extern s8 D_8018EDE5;
extern s8 D_8018EDE6;
extern s8 D_8018EDE7;
extern s8 D_8018EDEC;
extern u8 gSoundMode; // D_8018EDF2
extern s8 D_8018EDF3;
extern s8 gTimeTrialDataCourseIndex; // D_8018EDF7
src/data_0DD0A0_3.inc.c
-364
View File
@@ -1,364 +0,0 @@
#include <ultra64.h>
#include <macros.h>
#include <types.h>
// audio rodata
/*
struct D_800F2F90 D_800F2F90[] = {
L800C0124, L800C0078, L800C0140, L800C0150,
L800C0094, L800C035C, L800C03B4, L800C03EC,
L800C03EC, L800C0438, L800C0448, L800C03EC,
L800BFE40, L800BFE40, L800BFE40, L800C0468,
L800C048C, L800C049C, L800C01E8, L800C034C,
L800BFE40, L800BFE40, L800C02B4, L800C0298,
L800C0288, L800C026C, L800C0254, L800C0238,
L800C021C, L800C01B4, L800C0160, L800C0184,
L800C0304, L800C02D0, L800C0338, L800C04BC,
L800C04AC, L800C0518, L800C0528, L800C0590,
L800C0630, L800BFEC4, L800C00D0, L800C0608,
L800BFE40, L800BFE40, L800C0640, L800C0068,
L800C0040, L800BFFF8, L800BFFF8, L800BFFF8,
L800BFFA0, L800BFF90, L800BFF48, L800BFF10,
L800BFFA0, L800BFFA0, L800BFFA0, L800BFED4,
L800BFEB4, L800C0880, L800BFE7C
};
struct D_800F308C D_800F308C[] = {
L800C0684, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800C07E4, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800C0814, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800C0830, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800C0858, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800C06EC, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800C0708, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800C06BC, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800C06CC, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800C0714, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800C0760, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800BFE40, L800BFE40, L800BFE40, L800BFE40,
L800C077C
};
struct D_800F3350 D_800F3350[] = {
L800C0FF4, L800C0FE4, L800C0AE8, L800C0AE8,
L800C0FD4, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0FC4, L800C0F98, L800C0F98, L800C0F88,
L800C0F78, L800C0F4C, L800C0F30, L800C0F14,
L800C0AE8, L800C0EE8, L800C0DD4, L800C0E50,
L800C0D50, L800C0D50, L800C0D30, L800C0D2C,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0D1C, L800C0CF4, L800C0CAC, L800C0CAC,
L800C0CAC, L800C0C54, L800C0AE8, L800C0C0C,
L800C0BD4, L800C0C54, L800C0C54, L800C0C54,
L800C0B90, L800C0AE8, L800C0AE8, L800C0AE8,
};
struct D_800F3430 D_800F3430[] = {
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C1084, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C1090, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C1098, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C10A0, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8,
L800C0AE8,
0x00000000, 0x00000000, 0x00000000
};
float D_800F35C0 = 3.333333333;
struct D_800F35C4 D_800F35C4[] = {
L800C1A34, L800C1A34, L800C1A34, L800C1A34,
L800C1AEC, L800C1A34
};
float D_800F35DC = 0.1;
float D_800F35E0 = 100000.0;
float D_800F35E4 = 100000.0;
float D_800F35E8 = 0.85;
struct D_800F35EC D_800F35EC[] = {
L800C2A80, L800C2AB8, L800C2AD8, L800C2CDC,
L800C2E40, L800C2F04, L800C3008, L800C3118,
L800C3154, L800C31E4, L800C3218, L800C32B8,
L800C32EC, L800C3430, L800C3390, L800C33E0
};
struct D_800F362C D_800F362C[] = {
L800C3DEC, L800C3E10, L800C3E30, L800C3E70,
L800C3E98, L800C3EBC, L800C3F04
};
float D_800F3648 = 100000.0;
struct D_800F364C D_800F364C[] = {
L800C423C, L800C4268, L800C42A4, L800C42C8,
L800C42FC, L800C4330
};
float D_800F3664 = 100000.0;
float D_800F3668 = 100000.0;
float D_800F366C = 4000000.0;
float D_800F3670 = 10000000000.0;
float D_800F3674 = 0.6;
float D_800F3678 = 0.4;
float D_800F367C = 0.005000;
float D_800F3680 = 0.01;
float D_800F3684 = 12000.0;
float D_800F3688 = 0.03;
float D_800F368C = 0.03;
float D_800F3690 = 0.4;
struct D_800F3694 D_800F3694[] = {
L800C6544, L800C6618, L800C64E4, L800C65B8
L800C65B8, L800C65B8, L800C65B8, L800C65B8
L800C65B8, L800C65B8, L800C65B8, L800C65B8
L800C6544, L800C6544, L800C6618, L800C6618
L800C6544, L800C6618, L800C6618, L800C6618
L800C6618, L800C65B8, L800C65B8, L800C65B8
L800C6618, L800C6618, L800C6618, L800C6618
L800C65B8, L800C65B8, L800C65B8
};
float D_800F3710 = 0.2;
float D_800F3714 = 3500.0;
float D_800F3718 = 3000.0;
float D_800F371C = 0.4;
float D_800F3720 = 0.2;
float D_800F3724 = 0.06;
float D_800F3728 = 0.56;
float D_800F372C = 0.9;
float D_800F3730 = 0.6;
float D_800F3734 = 13000.0;
float D_800F3738 = 0.95;
struct D_800F373C D_800F373C[] = {
L800C69C8, L800C6A0C, L800C6910, L800C6C74,
L800C6CB8, L800C6CFC, L800C6D40, L800C6D84,
L800C6DC8, L800C6E0C, L800C6E50, L800C6E94,
L800C6FA4, L800C6E0C, L800C6A98, L800C6ADC,
L800C6A50, L800C6958, L800C6990, L800C6B20,
L800C7070, L800C6FA4, L800C6FE8, L800C702C,
L800C6B64, L800C6BA8, L800C6BEC, L800C6C30,
L800C6ED8, L800C6F1C, L800C6F60
};
float D_800F37B8 = 3500.0;
struct D_800F37BC
L800C718C, L800C7198, L800C71B0, L800C71BC,
L800C71A4, L800C71F4, L800C71F4, L800C71C8,
L800C71F4, L800C71F4, L800C71F4, L800C71F4,
L800C71EC, L800C71F4, L800C71D4, L800C71E0,
};
struct D_800F37FC D_800F37FC[] = {
L800C7238, L800C7244, L800C725C, L800C7268,
L800C7250, L800C7294, L800C7294, L800C7274,
L800C7294, L800C7294, L800C7294, L800C7294,
L800C7290, L800C7294, L800C7280, L800C7288,
};
struct D_800F383C D_800F383C[] = {
L800C72F8, L800C72B8, L800C742C, L800C73B8,
L800C7378, L800C742C, L800C7338, L800C7428,
L800C742C, L800C7418, L800C7420,
};
struct D_800F3868 D_800F3868[] = {
L800C7494, L800C7454, L800C75C8, L800C7554,
L800C7514, L800C75C8, L800C74D4, L800C75C4,
L800C75C8, L800C75B4, L800C75BC,
};
float D_800F3894 = 0.7;
float D_800F3898 = 0.1;
float D_800F389C = 0.03;
float D_800F38A0 = 0.16;
float D_800F38A4 = 0.15;
float D_800F38A8 = 0.03;
float D_800F38AC = 0.012000;
float D_800F38B0 = 0.85;
float D_800F38B4 = 0.85;
float D_800F38B8 = {
L800C9560, L800C9560, L800C95BC, L800C9618,
L800C9674, L800C96D0, L800C95BC, L800C96D0,
};
float D_800F38D8 = 0.35;
float D_800F38DC = 2.800000;
float D_800F38E0 = 3844.0;
float D_800F38E4 = -0.8;
float D_800F38E8 = 1568.979614;
float D_800F38EC = 1067.777832;
float D_800F38F0 = 2766.064941;
float D_800F38F4 = 0.6;
float D_800F38F8 = 3.200000;
float D_800F38FC = 3844.0;
float D_800F3900 = -1.700000;
float D_800F3904 = 1478.461548;
float D_800F3908 = 784.489807;
float D_800F390C = 12813.334961;
float D_800F3910 = 0.6;
float D_800F3914 = 2.800000;
float D_800F3918 = 3844.0;
float D_800F391C = -0.6;
float D_800F3920 = 1747.272827;
float D_800F3924 = 1130.588257;
float D_800F3928 = 3844.000977;
float D_800F392C = 0.2;
float D_800F3930 = 3844.0;
float D_800F3934 = -0.4;
float D_800F3938 = 2135.555664;
float D_800F393C = 1601.666626;
float D_800F3940 = 3203.333008;
float D_800F3944 = 0.4;
float D_800F3948 = 2.400000;
float D_800F394C = 3844.0;
float D_800F3950 = -0.8;
float D_800F3954 = 1922.0;
float D_800F3958 = 1201.250000;
float D_800F395C = 4805.0;
struct D_800F3960 = {
L800C9B3C, L800C9B3C, L800C9B68, L800C9B94,
L800C9BC0, L800C9BEC, L800C9B68, L800C9BEC,
};
float D_800F3980 = 0.35;
float D_800F3984 = 1568.979614;
float D_800F3988 = 0.6;
float D_800F398C = 1478.461548;
float D_800F3990 = 0.6;
float D_800F3994 = 1747.272827;
float D_800F3998 = 0.2;
float D_800F399C = 2135.555664;
float D_800F39A0 = 0.4;
float D_800F39A4 = 1922.0;
float D_800F39A8 = 0.55;
float D_800F39AC = 0.45;
float D_800F39B0 = 0.7;
float D_800F39B4 = 0.1;
struct D_800F39C0 D_800F39C0[] = {
L800CBE60, L800CBE78, L800CBE90, L800CBEA8,
L800CBEC0, L800CBECC, L800CBF08, L800CBEEC,
};
float D_800F39E0 = 0.017453292;
double D_800F39F0 = {
0.017453292222222222
0x00000000, 0x00000000
};
s8 D_800F3A00[] = {
0x00, 0x14, 0x18, 0x18, 0x1c, 0x1c, 0x1c, 0x1c,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x00, 0x04, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0c,
0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
};
struct D_800F3A20 D_800F3A20[] = {
L800D1668, L800D1630, L800D1610, L800D1474,
L800D1420, L800D15B4, L800D13E8, L800D13F4,
L800D1400,
0x00000000, 0x00000000, 0x00000000
};
struct D_800F3A50 D_800F3A50[] = {
L800D3480, L800D3374, L800D33B4, L800D34A0,
L800D34A0, L800D33F0, L800D3438, 0x00000000
};
double D_800F3A70[] = {
1.0,
-0.16666659550427756,
0.0083330662460821547,
-0.00019809602901937949,
2.6057806379680372e-06
};
double D_800F3A98 = 0.31830988618379069;
double D_800F3AA0 = 3.1415926218032837;
double D_800F3AA8 = 3.1786509547056392e-08;
float D_800F3AB0[] = {
0.0, 0x00000000, 0x00000000, 0x00000000
};
double D_800F3AC0[] = {
1.0,
-0.16666659550427756,
0.0083330662460821547,
-0.00019809602901937949,
2.6057806379680372e-06,
};
double D_800F3AE8 = 0.31830988618379069;
double D_800F3AF0 = 3.1415926218032837;
double D_800F3AF8 = 3.1786509547056392e-08;
float D_800F3B00[] = {
0.0, 0x00000000, 0x00000000, 0x00000000
};
char D_800F3B10[] = "hlL";
char D_800F3B14[] = " +-#0";
s32 D_800F3B1C[] = {
0x00000001, 0x00000002, 0x00000004, 0x00000008,
0x00000010, 0x00000000
};
u16 gCupCourseOrder[] = { // ISSUE CHECK WRONG PREVIEW TEXTURES
0x0008, 0x0009, 0x0006, 0x000b, // mushroom cup: LR, MMF, KTB, KD
0x000a, 0x0005, 0x0001, 0x0000, // flower cup: TT, FS, CM, MR
0x000e, 0x000c, 0x0007, 0x0002, // star cup: WS, SL, RRy, BC
0x0012, 0x0004, 0x0003, 0x000d, // special cup: DKJP, YV, BB, RRd
0x0013, 0x000f, 0x0011, 0x0010, // battle mode: BD, BF, DD, Sky
0x0100,
0x0000,
0x0001, 0x0304
};
s32 D_800F3B1C[] = {
0x00000001, 0x00000002, 0x00000004, 0x00000008, 0x00000010, 0x00000000,
};
*/