diff --git a/Makefile b/Makefile index 63e461e..fa4423e 100644 --- a/Makefile +++ b/Makefile @@ -315,7 +315,7 @@ clean: @$(RM) -f *.ld # Per-file flag definitions -# build/us/src/global_asm/code_166A0.c.o: OPT_FLAGS = -O3 +# build/us/src/global_asm/rand.c.o: OPT_FLAGS = -O3 # build/us/src/global_asm/code_1E2D0.c.o: OPT_FLAGS = -O3 build/us/src/dk64_boot/dk64_boot_3390.c.o: OPT_FLAGS = -O2 diff --git a/decompressed.us.yaml b/decompressed.us.yaml index 5e7f21a..2d2510f 100644 --- a/decompressed.us.yaml +++ b/decompressed.us.yaml @@ -220,7 +220,7 @@ segments: - [0x2015010, c, code_15010] - [0x2015050, c, heap] - [0x2016550, c, done/code_16550] - - [0x20166A0, c, code_166A0] + - [0x20166A0, c, rand] - [0x20169F0, c, code_169F0] - [0x2016A20, c, code_16A20] - [0x2016B60, bin, code_16B60] @@ -375,7 +375,7 @@ segments: - [0x215BE40, .rodata, code_131B0] - [0x215BF90, .rodata, heap] - [0x215BFD0, .rodata, done/code_16550] - - [0x215BFF0, rodata] # TODO: code_166A0, code_1E2D0 + - [0x215BFF0, rodata] # TODO: rand, code_1E2D0 - [0x215CC70, .rodata, code_2C910] - [0x215CE00, .rodata, code_2DE90] - [0x215CE60, .rodata, code_2F550] diff --git a/progress/progress.global_asm.csv b/progress/progress.global_asm.csv index b3b09e9..afb46b3 100644 --- a/progress/progress.global_asm.csv +++ b/progress/progress.global_asm.csv @@ -1598,7 +1598,7 @@ us,asm,func_global_asm_806E03C8,140,yes us,asm,func_global_asm_8065FEB8,440,yes us,asm,n_alClose,76,yes us,asm,func_global_asm_806C7248,8,yes -us,asm,func_global_asm_806119FC,72,no +us,asm,func_global_asm_806119FC,72,yes us,asm,func_global_asm_806D0378,68,yes us,asm,func_global_asm_80688EE4,144,yes us,asm,func_global_asm_80674884,472,no diff --git a/progress/progress.total.csv b/progress/progress.total.csv index 699bbdd..644ee8a 100644 --- a/progress/progress.total.csv +++ b/progress/progress.total.csv @@ -1598,7 +1598,7 @@ us,asm,func_global_asm_806E03C8,140,yes us,asm,func_global_asm_8065FEB8,440,yes us,asm,n_alClose,76,yes us,asm,func_global_asm_806C7248,8,yes -us,asm,func_global_asm_806119FC,72,no +us,asm,func_global_asm_806119FC,72,yes us,asm,func_global_asm_806D0378,68,yes us,asm,func_global_asm_80688EE4,144,yes us,asm,func_global_asm_80674884,472,no diff --git a/progress/progress_global_asm.svg b/progress/progress_global_asm.svg index ac5b892..d61a7d4 100644 --- a/progress/progress_global_asm.svg +++ b/progress/progress_global_asm.svg @@ -17,7 +17,7 @@ global_asm - 36.4651% - 36.4651% + 36.4710% + 36.4710% diff --git a/progress/progress_total.svg b/progress/progress_total.svg index 566d9ab..93db02b 100644 --- a/progress/progress_total.svg +++ b/progress/progress_total.svg @@ -17,7 +17,7 @@ Donkey Kong 64 (US) - 38.7692% - 38.7692% + 38.7736% + 38.7736% diff --git a/src/global_asm/code_166A0.c b/src/global_asm/rand.c similarity index 93% rename from src/global_asm/code_166A0.c rename to src/global_asm/rand.c index 49877da..09fce86 100644 --- a/src/global_asm/code_166A0.c +++ b/src/global_asm/rand.c @@ -17,7 +17,13 @@ void func_global_asm_806119F0(s32 arg0) { D_global_asm_80746A40 = arg0; } -#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_166A0/func_global_asm_806119FC.s") +f32 func_global_asm_806119FC(void) { + f32 var_f6; + u32 temp_v0; + + var_f6 = func_global_asm_806119A0(); + return var_f6 * 2.3283064e-10f; +} s32 rand(void) { return func_global_asm_806119A0() & 0x7FFFFFFF;