From 34297b120380e46194c2a0d3072b8359089b01df Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 12 Dec 2020 21:58:45 +1000 Subject: [PATCH] Decompile func0f148b40 --- src/game/data/data_020df0.c | 2 +- src/game/game_141820.c | 20 ++++++-------------- src/include/game/data/data_020df0.h | 2 +- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/game/data/data_020df0.c b/src/game/data/data_020df0.c index 6a1afbcec..c33d08b7b 100644 --- a/src/game/data/data_020df0.c +++ b/src/game/data/data_020df0.c @@ -6827,7 +6827,7 @@ u32 var8007f838 = 0x00000000; u32 var8007f83c = 0x00000000; s32 var8007f840 = 0x00000000; u8 var8007f844 = 0; -u32 var8007f848 = 0x00000000; +u8 var8007f848 = 0; u32 var8007f84c = 0x0000005a; u32 var8007f850 = 0x00000003; u32 var8007f854 = 0x00000000; diff --git a/src/game/game_141820.c b/src/game/game_141820.c index 2045d3fca..3bbe813a5 100644 --- a/src/game/game_141820.c +++ b/src/game/game_141820.c @@ -8820,20 +8820,12 @@ glabel func0f14886c /* f148b3c: 00801025 */ or $v0,$a0,$zero ); -GLOBAL_ASM( -glabel func0f148b40 -/* f148b40: 3c018008 */ lui $at,%hi(var8007f840) -/* f148b44: ac20f840 */ sw $zero,%lo(var8007f840)($at) -/* f148b48: 3c018008 */ lui $at,%hi(var8007f848) -/* f148b4c: a020f848 */ sb $zero,%lo(var8007f848)($at) -/* f148b50: 24010003 */ addiu $at,$zero,0x3 -/* f148b54: 00047040 */ sll $t6,$a0,0x1 -/* f148b58: 01c1001b */ divu $zero,$t6,$at -/* f148b5c: 00007812 */ mflo $t7 -/* f148b60: 3c018008 */ lui $at,%hi(var8007f844) -/* f148b64: 03e00008 */ jr $ra -/* f148b68: a02ff844 */ sb $t7,%lo(var8007f844)($at) -); +void func0f148b40(u32 arg0) +{ + var8007f840 = 0; + var8007f848 = 0; + var8007f844 = (arg0 << 1) / 3; +} void func0f148b6c(void) { diff --git a/src/include/game/data/data_020df0.h b/src/include/game/data/data_020df0.h index 24e804d5d..0982c10a2 100644 --- a/src/include/game/data/data_020df0.h +++ b/src/include/game/data/data_020df0.h @@ -184,7 +184,7 @@ extern u32 var8007f75c; extern u32 var8007f7b0; extern s32 var8007f840; extern u8 var8007f844; -extern u32 var8007f848; +extern u8 var8007f848; extern u32 var8007f860; extern u32 var8007f864; extern u32 var8007f868;