diff --git a/src/game/game_129900.c b/src/game/game_129900.c index 33df13406..ef207cd0b 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -55,25 +55,10 @@ const char var7f1b5568[] = ""; const char var7f1b556c[] = ""; const char var7f1b5570[] = "ecol"; -GLOBAL_ASM( -glabel func0f129900 -/* f129900: 27bdffd0 */ addiu $sp,$sp,-48 -/* f129904: 8fb80040 */ lw $t8,0x40($sp) -/* f129908: afbf002c */ sw $ra,0x2c($sp) -/* f12990c: afa7003c */ sw $a3,0x3c($sp) -/* f129910: 00077400 */ sll $t6,$a3,0x10 -/* f129914: 000e3c03 */ sra $a3,$t6,0x10 -/* f129918: afa00014 */ sw $zero,0x14($sp) -/* f12991c: afa00018 */ sw $zero,0x18($sp) -/* f129920: afa0001c */ sw $zero,0x1c($sp) -/* f129924: afa00020 */ sw $zero,0x20($sp) -/* f129928: 0fc4a7d5 */ jal func0f129f54 -/* f12992c: afb80010 */ sw $t8,0x10($sp) -/* f129930: 8fbf002c */ lw $ra,0x2c($sp) -/* f129934: 27bd0030 */ addiu $sp,$sp,0x30 -/* f129938: 03e00008 */ jr $ra -/* f12993c: 00000000 */ sll $zero,$zero,0x0 -); +bool func0f129900(struct prop *prop, struct coord *pos, s16 *room, s16 arg3, s32 playernum) +{ + return explosionCreate(prop, pos, room, arg3, playernum, 0, 0, 0, 0); +} GLOBAL_ASM( glabel func0f129940 @@ -189,7 +174,7 @@ glabel func0f129940 /* f129ae0: 87a7007e */ lh $a3,0x7e($sp) /* f129ae4: afa80014 */ sw $t0,0x14($sp) /* f129ae8: afa3001c */ sw $v1,0x1c($sp) -/* f129aec: 0fc4a7d5 */ jal func0f129f54 +/* f129aec: 0fc4a7d5 */ jal explosionCreate /* f129af0: afaa0010 */ sw $t2,0x10($sp) .L0f129af4: /* f129af4: 8fbf0034 */ lw $ra,0x34($sp) @@ -397,7 +382,7 @@ void alertNearbyChrsToNoise(f32 *radius, struct coord *noisepos) } GLOBAL_ASM( -glabel func0f129f54 +glabel explosionCreate .late_rodata glabel var7f1b557c .word 0x481c4000 diff --git a/src/game/propobj.c b/src/game/propobj.c index fc70064aa..0f15f9577 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -10910,7 +10910,7 @@ glabel func0f06f314 /* f06f4b8: afa2001c */ sw $v0,0x1c($sp) /* f06f4bc: afab0010 */ sw $t3,0x10($sp) /* f06f4c0: 46062200 */ add.s $f8,$f4,$f6 -/* f06f4c4: 0fc4a7d5 */ jal func0f129f54 +/* f06f4c4: 0fc4a7d5 */ jal explosionCreate /* f06f4c8: e7a80064 */ swc1 $f8,0x64($sp) /* f06f4cc: 10000008 */ beqz $zero,.L0f06f4f0 /* f06f4d0: 00401825 */ or $v1,$v0,$zero @@ -25846,7 +25846,7 @@ glabel var7f1aa698 /* f07c730: 8fa60040 */ lw $a2,0x40($sp) /* f07c734: 2407000d */ addiu $a3,$zero,0xd /* f07c738: afa00010 */ sw $zero,0x10($sp) -/* f07c73c: 0fc4a7d5 */ jal func0f129f54 +/* f07c73c: 0fc4a7d5 */ jal explosionCreate /* f07c740: afb8001c */ sw $t8,0x1c($sp) /* f07c744: 24090001 */ addiu $t1,$zero,0x1 /* f07c748: 10000014 */ beqz $zero,.L0f07c79c @@ -26707,7 +26707,7 @@ glabel var7f1aa6e4 /* f07d2fc: 24450008 */ addiu $a1,$v0,0x8 /* f07d300: 24460028 */ addiu $a2,$v0,0x28 /* f07d304: afa80010 */ sw $t0,0x10($sp) -/* f07d308: 0fc4a7d5 */ jal func0f129f54 +/* f07d308: 0fc4a7d5 */ jal explosionCreate /* f07d30c: afab001c */ sw $t3,0x1c($sp) /* f07d310: 8e0d0040 */ lw $t5,0x40($s0) /* f07d314: 35ae0004 */ ori $t6,$t5,0x4 diff --git a/src/include/game/game_129900.h b/src/include/game/game_129900.h index f67a8adb0..a7a9daf3f 100644 --- a/src/include/game/game_129900.h +++ b/src/include/game/game_129900.h @@ -3,13 +3,13 @@ #include #include "types.h" -u32 func0f129900(struct prop *prop, struct coord *pos, s16 *room, s32 arg3, s32 playernum); +bool func0f129900(struct prop *prop, struct coord *pos, s16 *room, s16 arg3, s32 playernum); u32 func0f129940(void); u32 func0f129b08(void); u32 func0f129ba4(void); u32 func0f129c08(void); void alertNearbyChrsToNoise(f32 *radius, struct coord *noisepos); -u32 func0f129f54(void); +bool explosionCreate(struct prop *prop, struct coord *pos, s16 *room, s16 arg3, s32 playernum, u32 arg5, u32 arg6, u32 arg7, u32 arg8); u32 func0f12acec(void); u32 func0f12af5c(void); u32 func0f12b0e0(void);