diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index dcf439a1d..f22340a2c 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -625,38 +625,28 @@ glabel func0f153c50 /* f153c84: a0580028 */ sb $t8,0x28($v0) ); -GLOBAL_ASM( -glabel func0f153c88 -/* f153c88: 3c02800a */ lui $v0,%hi(var800a45d0) -/* f153c8c: 244245d0 */ addiu $v0,$v0,%lo(var800a45d0) -/* f153c90: 90590000 */ lbu $t9,0x0($v0) -/* f153c94: 90480029 */ lbu $t0,0x29($v0) -/* f153c98: 8c4e001c */ lw $t6,0x1c($v0) -/* f153c9c: 8c4f0020 */ lw $t7,0x20($v0) -/* f153ca0: c4440024 */ lwc1 $f4,0x24($v0) -/* f153ca4: 90580028 */ lbu $t8,0x28($v0) -/* f153ca8: 03284825 */ or $t1,$t9,$t0 -/* f153cac: a0490000 */ sb $t1,0x0($v0) -/* f153cb0: ac4e000c */ sw $t6,0xc($v0) -/* f153cb4: ac4f0010 */ sw $t7,0x10($v0) -/* f153cb8: e4440014 */ swc1 $f4,0x14($v0) -/* f153cbc: 03e00008 */ jr $ra -/* f153cc0: a0580018 */ sb $t8,0x18($v0) -); +void func0f153c88(void) +{ + var800a45d0.unk0c = var800a45d0.unk1c; + var800a45d0.unk10 = var800a45d0.unk20; + var800a45d0.unk14 = var800a45d0.unk24; + var800a45d0.unk18 = var800a45d0.unk28; + var800a45d0.unk00 |= var800a45d0.unk29; +} void func0f153cc4(s32 arg0, s32 arg1, u32 arg2) { + var800a45d0.unk00 |= 0x02; var800a45d0.unk2c = arg0; var800a45d0.unk30 = arg1; - var800a45d0.unk00 |= 0x02; var800a45d0.unk34 = arg2; } void func0f153ce8(s32 x1, s32 x2, u32 arg2) { + var800a45d0.unk00 |= 0x10; var800a45d0.x1 = x1; var800a45d0.x2 = x2; - var800a45d0.unk00 |= 0x10; var800a45d0.unk40 = arg2; } diff --git a/src/include/game/game_1531a0.h b/src/include/game/game_1531a0.h index 2d378ebf0..738bd3fa4 100644 --- a/src/include/game/game_1531a0.h +++ b/src/include/game/game_1531a0.h @@ -21,7 +21,7 @@ u32 func0f153b40(void); u32 func0f153b6c(void); void func0f153c20(s32 x, s32 y, f32 arg2, s32 arg3); u32 func0f153c50(void); -u32 func0f153c88(void); +void func0f153c88(void); void func0f153ce8(s32 x1, s32 x2, u32 arg2); void func0f153d24(void); void func0f153d3c(void); diff --git a/src/include/types.h b/src/include/types.h index 80c6a77c2..9eb78d054 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -6840,12 +6840,13 @@ struct var800a45d0 { /*0x08*/ u32 unk08; /*0x0c*/ u32 unk0c; /*0x10*/ u32 unk10; - /*0x14*/ u32 unk14; + /*0x14*/ f32 unk14; /*0x18*/ u8 unk18; /*0x1c*/ u32 unk1c; /*0x20*/ u32 unk20; - /*0x24*/ u32 unk24; - /*0x28*/ u16 unk28; + /*0x24*/ f32 unk24; + /*0x28*/ u8 unk28; + /*0x29*/ u8 unk29; /*0x2a*/ u8 unk2a; /*0x2c*/ s32 unk2c; /*0x30*/ s32 unk30;