diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 545129cf2..a10cee690 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -7529,18 +7529,18 @@ glabel var7f1a8900 /* f025ea0: 00000000 */ nop ); -void func0f025ea4(struct chrdata *chr, struct prop *prop, s32 arg2, struct coord *coord, struct coord *coord2, struct chrdata *chr2) +void chrEmitSparks(struct chrdata *chr, struct prop *prop, s32 arg2, struct coord *coord, struct coord *coord2, struct chrdata *chr2) { struct prop *chrprop = chr->prop; s32 race; if (chrIsUsingPaintball(chr2)) { - func0f12f9f0(chrprop->rooms[0], chrprop, coord, coord2, 0, 25); + sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, 25); return; } if (chrGetShield(chr) > 0.0f) { - func0f12f9f0(chrprop->rooms[0], chrprop, coord, coord2, 0, 0); + sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, 0); return; } @@ -7549,14 +7549,14 @@ void func0f025ea4(struct chrdata *chr, struct prop *prop, s32 arg2, struct coord || prop->type == PROPTYPE_DOOR || arg2 == 100 || arg2 == 110) { - func0f12f9f0(chrprop->rooms[0], chrprop, coord, coord2, 0, 0); + sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, 0); return; } race = CHRRACE(chr); if (race == RACE_DRCAROLL || race == RACE_ROBOT || race == RACE_EYESPY) { - func0f12f9f0(chrprop->rooms[0], chrprop, coord, coord2, 0, 1); + sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, 1); return; } @@ -7570,11 +7570,11 @@ void func0f025ea4(struct chrdata *chr, struct prop *prop, s32 arg2, struct coord coord3.y = coord2->y * 42.0f + coord->y; coord3.z = coord2->z * 42.0f + coord->z; - func0f12f9f0(chrprop->rooms[0], chrprop, &coord3, coord2, 0, 4); + sparksCreate(chrprop->rooms[0], chrprop, &coord3, coord2, 0, 4); } - func0f12f9f0(chrprop->rooms[0], chrprop, coord, coord2, 0, 2); - func0f12f9f0(chrprop->rooms[0], chrprop, coord, coord2, 0, 3); + sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, 2); + sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, 3); } GLOBAL_ASM( @@ -9728,7 +9728,7 @@ glabel func0f027e1c /* f027f44: 27a700a4 */ addiu $a3,$sp,0xa4 /* f027f48: 8d8d0004 */ lw $t5,0x4($t4) /* f027f4c: afa20044 */ sw $v0,0x44($sp) -/* f027f50: 0fc097a9 */ jal func0f025ea4 +/* f027f50: 0fc097a9 */ jal chrEmitSparks /* f027f54: afad0014 */ sw $t5,0x14($sp) /* f027f58: c6240010 */ lwc1 $f4,0x10($s1) /* f027f5c: 8fa400f0 */ lw $a0,0xf0($sp) diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index 322a60bbd..71fd900e5 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -12967,7 +12967,7 @@ void chrTickDie(struct chrdata *chr) var80068080 -= 5; func0f0939f8(NULL, prop, 0x64, -1, -1, 1024, 0, 0, 0, -1, 0, -1, -1, -1, -1); - func0f12f9f0(prop->rooms[0], prop, &prop->pos, NULL, 0, 1); + sparksCreate(prop->rooms[0], prop, &prop->pos, NULL, 0, 1); } return; @@ -17262,7 +17262,7 @@ glabel var7f1a9184 /* f0416c4: 8fa501cc */ lw $a1,0x1cc($sp) /* f0416c8: 8fa60078 */ lw $a2,0x78($sp) /* f0416cc: 27a70228 */ addiu $a3,$sp,0x228 -/* f0416d0: 0fc097a9 */ jal func0f025ea4 +/* f0416d0: 0fc097a9 */ jal chrEmitSparks /* f0416d4: afb80014 */ sw $t8,0x14($sp) /* f0416d8: 8fac0278 */ lw $t4,0x278($sp) /* f0416dc: 8fab01cc */ lw $t3,0x1cc($sp) @@ -17330,7 +17330,7 @@ glabel var7f1a9184 /* f0417c4: 8fa501cc */ lw $a1,0x1cc($sp) /* f0417c8: 27a60228 */ addiu $a2,$sp,0x228 /* f0417cc: 00003825 */ or $a3,$zero,$zero -/* f0417d0: 0fc4be7c */ jal func0f12f9f0 +/* f0417d0: 0fc4be7c */ jal sparksCreate /* f0417d4: afa00010 */ sw $zero,0x10($sp) /* f0417d8: 10000007 */ b .L0f0417f8 /* f0417dc: 00000000 */ nop @@ -17339,7 +17339,7 @@ glabel var7f1a9184 /* f0417e4: 27a60228 */ addiu $a2,$sp,0x228 /* f0417e8: 00003825 */ or $a3,$zero,$zero /* f0417ec: afa00010 */ sw $zero,0x10($sp) -/* f0417f0: 0fc4be7c */ jal func0f12f9f0 +/* f0417f0: 0fc4be7c */ jal sparksCreate /* f0417f4: afa00014 */ sw $zero,0x14($sp) .L0f0417f8: /* f0417f8: 3c0e800a */ lui $t6,%hi(g_MissionConfig+0x3) @@ -17392,7 +17392,7 @@ glabel var7f1a9184 /* f0418ac: 00002825 */ or $a1,$zero,$zero /* f0418b0: 27a60228 */ addiu $a2,$sp,0x228 /* f0418b4: 00003825 */ or $a3,$zero,$zero -/* f0418b8: 0fc4be7c */ jal func0f12f9f0 +/* f0418b8: 0fc4be7c */ jal sparksCreate /* f0418bc: afa00010 */ sw $zero,0x10($sp) /* f0418c0: 10000008 */ b .L0f0418e4 /* f0418c4: 93ac0260 */ lbu $t4,0x260($sp) @@ -17401,7 +17401,7 @@ glabel var7f1a9184 /* f0418cc: 27a60228 */ addiu $a2,$sp,0x228 /* f0418d0: 00003825 */ or $a3,$zero,$zero /* f0418d4: afa00010 */ sw $zero,0x10($sp) -/* f0418d8: 0fc4be7c */ jal func0f12f9f0 +/* f0418d8: 0fc4be7c */ jal sparksCreate /* f0418dc: afa00014 */ sw $zero,0x14($sp) .L0f0418e0: /* f0418e0: 93ac0260 */ lbu $t4,0x260($sp) @@ -27870,11 +27870,11 @@ bool chrIsAvoiding(struct chrdata *chr) return false; } -void chrEmitSparks(struct chrdata *chr) +void chrDrCarollEmitSparks(struct chrdata *chr) { if (chr && chr->prop) { // Spark/shield sound func0f0939f8(0, chr->prop, 0x64, -1, -1, 0, 0, 0, 0, -1, 0, -1, -1, -1, -1); - func0f12f9f0(chr->prop->rooms[0], chr->prop, &chr->prop->pos, NULL, 0, 1); + sparksCreate(chr->prop->rooms[0], chr->prop, &chr->prop->pos, NULL, 0, 1); } } diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 7deb8e68e..2ed105b76 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -10805,7 +10805,7 @@ bool aiChrEmitSparks(void) struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); if (chr) { - chrEmitSparks(chr); + chrDrCarollEmitSparks(chr); } g_Vars.aioffset += 3; diff --git a/src/game/dlights.c b/src/game/dlights.c index c533762fe..1882e8a5a 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -2159,7 +2159,7 @@ glabel func0f002ef8 /* f0032a8: afad0010 */ sw $t5,0x10($sp) /* f0032ac: afa90014 */ sw $t1,0x14($sp) /* f0032b0: 46045180 */ add.s $f6,$f10,$f4 -/* f0032b4: 0fc4be7c */ jal func0f12f9f0 +/* f0032b4: 0fc4be7c */ jal sparksCreate /* f0032b8: e7a6007c */ swc1 $f6,0x7c($sp) /* f0032bc: 0c004b70 */ jal random /* f0032c0: 00000000 */ nop diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index db978a919..a36c0d6b4 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -1735,7 +1735,7 @@ glabel var7f1a9eb8 /* f061b30: 00002825 */ or $a1,$zero,$zero /* f061b34: 27a60694 */ addiu $a2,$sp,0x694 /* f061b38: 27a70224 */ addiu $a3,$sp,0x224 -/* f061b3c: 0fc4be7c */ jal func0f12f9f0 +/* f061b3c: 0fc4be7c */ jal sparksCreate /* f061b40: afb00014 */ sw $s0,0x14($sp) /* f061b44: 10000003 */ b .L0f061b54 /* f061b48: 00000000 */ nop @@ -1806,7 +1806,7 @@ glabel var7f1a9eb8 /* f061c2c: afa00014 */ sw $zero,0x14($sp) /* f061c30: afaf0010 */ sw $t7,0x10($sp) /* f061c34: 00002825 */ or $a1,$zero,$zero -/* f061c38: 0fc4be7c */ jal func0f12f9f0 +/* f061c38: 0fc4be7c */ jal sparksCreate /* f061c3c: 27a70224 */ addiu $a3,$sp,0x224 /* f061c40: 1000000c */ b .L0f061c74 /* f061c44: 00000000 */ nop @@ -1816,7 +1816,7 @@ glabel var7f1a9eb8 /* f061c50: 00002825 */ or $a1,$zero,$zero /* f061c54: 27a60694 */ addiu $a2,$sp,0x694 /* f061c58: 27a70224 */ addiu $a3,$sp,0x224 -/* f061c5c: 0fc4be7c */ jal func0f12f9f0 +/* f061c5c: 0fc4be7c */ jal sparksCreate /* f061c60: afa00014 */ sw $zero,0x14($sp) /* f061c64: 10000003 */ b .L0f061c74 /* f061c68: 00000000 */ nop @@ -4295,7 +4295,7 @@ glabel var7f1a9f2c /* f063ed4: 00002825 */ or $a1,$zero,$zero /* f063ed8: 02203025 */ or $a2,$s1,$zero /* f063edc: 02403825 */ or $a3,$s2,$zero -/* f063ee0: 0fc4be7c */ jal func0f12f9f0 +/* f063ee0: 0fc4be7c */ jal sparksCreate /* f063ee4: afb30010 */ sw $s3,0x10($sp) /* f063ee8: 0fc25480 */ jal func0f095200 /* f063eec: 00000000 */ nop @@ -4331,7 +4331,7 @@ glabel var7f1a9f2c /* f063f60: 00002825 */ or $a1,$zero,$zero /* f063f64: 02203025 */ or $a2,$s1,$zero /* f063f68: 02403825 */ or $a3,$s2,$zero -/* f063f6c: 0fc4be7c */ jal func0f12f9f0 +/* f063f6c: 0fc4be7c */ jal sparksCreate /* f063f70: afb30010 */ sw $s3,0x10($sp) /* f063f74: 2418000a */ addiu $t8,$zero,0xa /* f063f78: afb80014 */ sw $t8,0x14($sp) @@ -4339,7 +4339,7 @@ glabel var7f1a9f2c /* f063f80: 00002825 */ or $a1,$zero,$zero /* f063f84: 02203025 */ or $a2,$s1,$zero /* f063f88: 02403825 */ or $a3,$s2,$zero -/* f063f8c: 0fc4be7c */ jal func0f12f9f0 +/* f063f8c: 0fc4be7c */ jal sparksCreate /* f063f90: afb30010 */ sw $s3,0x10($sp) /* f063f94: 0fc25480 */ jal func0f095200 /* f063f98: 00000000 */ nop @@ -4375,7 +4375,7 @@ glabel var7f1a9f2c /* f06400c: 00002825 */ or $a1,$zero,$zero /* f064010: 02203025 */ or $a2,$s1,$zero /* f064014: 02403825 */ or $a3,$s2,$zero -/* f064018: 0fc4be7c */ jal func0f12f9f0 +/* f064018: 0fc4be7c */ jal sparksCreate /* f06401c: afb30010 */ sw $s3,0x10($sp) /* f064020: 240d000b */ addiu $t5,$zero,0xb /* f064024: afad0014 */ sw $t5,0x14($sp) @@ -4383,7 +4383,7 @@ glabel var7f1a9f2c /* f06402c: 00002825 */ or $a1,$zero,$zero /* f064030: 02203025 */ or $a2,$s1,$zero /* f064034: 02403825 */ or $a3,$s2,$zero -/* f064038: 0fc4be7c */ jal func0f12f9f0 +/* f064038: 0fc4be7c */ jal sparksCreate /* f06403c: afb30010 */ sw $s3,0x10($sp) /* f064040: 0fc25480 */ jal func0f095200 /* f064044: 00000000 */ nop diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c index 3db9cc3b6..0bfdb271e 100644 --- a/src/game/game_1999b0.c +++ b/src/game/game_1999b0.c @@ -271,7 +271,7 @@ bool aibotDoFarsightThing(struct chrdata *chr, u32 arg1, struct coord *arg2, str func0f03ff2c(oppchr, &oppprop->pos, arg2, &sp172, &sp160, &sp168, &sp164); } - func0f025ea4(oppchr, oppprop, sp160, &oppprop->pos, arg2, chr); + chrEmitSparks(oppchr, oppprop, sp160, &oppprop->pos, arg2, chr); func0f0341dc(oppchr, fVar14, arg2, sp156, chr->prop, 200, oppprop, sp172, sp168, sp164, 0); } } diff --git a/src/game/propobj.c b/src/game/propobj.c index 56374ef6f..c730356a1 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -7969,7 +7969,7 @@ glabel var7f1aa268 /* f06cf20: ace10008 */ sw $at,0x8($a3) /* f06cf24: 86440028 */ lh $a0,0x28($s2) /* f06cf28: afa80014 */ sw $t0,0x14($sp) -/* f06cf2c: 0fc4be7c */ jal func0f12f9f0 +/* f06cf2c: 0fc4be7c */ jal sparksCreate /* f06cf30: afb90010 */ sw $t9,0x10($sp) /* f06cf34: 00163c00 */ sll $a3,$s6,0x10 /* f06cf38: 00074c03 */ sra $t1,$a3,0x10 @@ -17572,7 +17572,7 @@ glabel var7f1aa438 /* f075888: 8ca59930 */ lw $a1,%lo(var80069930)($a1) /* f07588c: 8cc69934 */ lw $a2,%lo(var80069934)($a2) /* f075890: afb90010 */ sw $t9,0x10($sp) -/* f075894: 0fc097a9 */ jal func0f025ea4 +/* f075894: 0fc097a9 */ jal chrEmitSparks /* f075898: afb80014 */ sw $t8,0x14($sp) /* f07589c: 3c098007 */ lui $t1,%hi(var80069930) /* f0758a0: 8d299930 */ lw $t1,%lo(var80069930)($t1) @@ -18050,7 +18050,7 @@ glabel var7f1aa438 /* f075f5c: afb80010 */ sw $t8,0x10($sp) /* f075f60: 02402825 */ or $a1,$s2,$zero /* f075f64: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f075f68: 0fc4be7c */ jal func0f12f9f0 +/* f075f68: 0fc4be7c */ jal sparksCreate /* f075f6c: 27a70150 */ addiu $a3,$sp,0x150 /* f075f70: 1000000a */ b .L0f075f9c /* f075f74: 02402025 */ or $a0,$s2,$zero @@ -18061,7 +18061,7 @@ glabel var7f1aa438 /* f075f84: afaf0014 */ sw $t7,0x14($sp) /* f075f88: afab0010 */ sw $t3,0x10($sp) /* f075f8c: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f075f90: 0fc4be7c */ jal func0f12f9f0 +/* f075f90: 0fc4be7c */ jal sparksCreate /* f075f94: 27a70150 */ addiu $a3,$sp,0x150 /* f075f98: 02402025 */ or $a0,$s2,$zero .L0f075f9c: @@ -23179,7 +23179,7 @@ glabel var7f1aa5a8 /* f07a46c: 8fa50178 */ lw $a1,0x178($sp) /* f07a470: 8fa600b4 */ lw $a2,0xb4($sp) /* f07a474: 27a7013c */ addiu $a3,$sp,0x13c -/* f07a478: 0fc097a9 */ jal func0f025ea4 +/* f07a478: 0fc097a9 */ jal chrEmitSparks /* f07a47c: afac0014 */ sw $t4,0x14($sp) /* f07a480: 8fad0114 */ lw $t5,0x114($sp) /* f07a484: 8fab0178 */ lw $t3,0x178($sp) @@ -23262,7 +23262,7 @@ glabel var7f1aa5a8 /* f07a5a8: 84a40028 */ lh $a0,0x28($a1) /* f07a5ac: afaf0014 */ sw $t7,0x14($sp) /* f07a5b0: afa00010 */ sw $zero,0x10($sp) -/* f07a5b4: 0fc4be7c */ jal func0f12f9f0 +/* f07a5b4: 0fc4be7c */ jal sparksCreate /* f07a5b8: 00003825 */ or $a3,$zero,$zero /* f07a5bc: 10000008 */ b .L0f07a5e0 /* f07a5c0: 27a400a0 */ addiu $a0,$sp,0xa0 @@ -23271,7 +23271,7 @@ glabel var7f1aa5a8 /* f07a5c8: afa00014 */ sw $zero,0x14($sp) /* f07a5cc: afa00010 */ sw $zero,0x10($sp) /* f07a5d0: 27a6013c */ addiu $a2,$sp,0x13c -/* f07a5d4: 0fc4be7c */ jal func0f12f9f0 +/* f07a5d4: 0fc4be7c */ jal sparksCreate /* f07a5d8: 00003825 */ or $a3,$zero,$zero /* f07a5dc: 27a400a0 */ addiu $a0,$sp,0xa0 .L0f07a5e0: @@ -23477,7 +23477,7 @@ glabel var7f1aa5a8 /* f07a8cc: 00002825 */ or $a1,$zero,$zero /* f07a8d0: 27a6013c */ addiu $a2,$sp,0x13c /* f07a8d4: 00003825 */ or $a3,$zero,$zero -/* f07a8d8: 0fc4be7c */ jal func0f12f9f0 +/* f07a8d8: 0fc4be7c */ jal sparksCreate /* f07a8dc: afa00010 */ sw $zero,0x10($sp) /* f07a8e0: 1000000f */ b .L0f07a920 /* f07a8e4: 27a40118 */ addiu $a0,$sp,0x118 @@ -23495,7 +23495,7 @@ glabel var7f1aa5a8 /* f07a908: 27a6013c */ addiu $a2,$sp,0x13c /* f07a90c: 00003825 */ or $a3,$zero,$zero /* f07a910: afa00010 */ sw $zero,0x10($sp) -/* f07a914: 0fc4be7c */ jal func0f12f9f0 +/* f07a914: 0fc4be7c */ jal sparksCreate /* f07a918: afa20014 */ sw $v0,0x14($sp) /* f07a91c: 27a40118 */ addiu $a0,$sp,0x118 .L0f07a920: @@ -26509,7 +26509,7 @@ glabel var7f1aa6e4 /* f07d3cc: 84a40028 */ lh $a0,0x28($a1) /* f07d3d0: afa00014 */ sw $zero,0x14($sp) /* f07d3d4: afa00010 */ sw $zero,0x10($sp) -/* f07d3d8: 0fc4be7c */ jal func0f12f9f0 +/* f07d3d8: 0fc4be7c */ jal sparksCreate /* f07d3dc: 24a60008 */ addiu $a2,$a1,0x8 /* f07d3e0: 100002e0 */ b .L0f07df64 /* f07d3e4: 8fbf004c */ lw $ra,0x4c($sp) @@ -27395,7 +27395,7 @@ glabel var7f1aa6e4 // -1, 1024, 0, 0, 0, -1, 0, -1, -1, -1, -1); // // // Create sparks -// func0f12f9f0(prop->rooms[0], prop, &prop->pos, NULL, 0, 0); +// sparksCreate(prop->rooms[0], prop, &prop->pos, NULL, 0, 0); // } // } else { // // 3e8 @@ -36287,7 +36287,7 @@ glabel func0f085eac /* f086124: 84a40028 */ lh $a0,0x28($a1) /* f086128: afae0014 */ sw $t6,0x14($sp) /* f08612c: afa00010 */ sw $zero,0x10($sp) -/* f086130: 0fc4be7c */ jal func0f12f9f0 +/* f086130: 0fc4be7c */ jal sparksCreate /* f086134: 00003825 */ or $a3,$zero,$zero /* f086138: 10000008 */ b .L0f08615c /* f08613c: 8fa30124 */ lw $v1,0x124($sp) @@ -36296,7 +36296,7 @@ glabel func0f085eac /* f086144: afa00014 */ sw $zero,0x14($sp) /* f086148: afa00010 */ sw $zero,0x10($sp) /* f08614c: 27a60110 */ addiu $a2,$sp,0x110 -/* f086150: 0fc4be7c */ jal func0f12f9f0 +/* f086150: 0fc4be7c */ jal sparksCreate /* f086154: 00003825 */ or $a3,$zero,$zero /* f086158: 8fa30124 */ lw $v1,0x124($sp) .L0f08615c: @@ -45132,7 +45132,7 @@ glabel func0f08ea50 /* f08ebbc: 8e650014 */ lw $a1,0x14($s3) /* f08ebc0: 84a40028 */ lh $a0,0x28($a1) /* f08ebc4: afae0014 */ sw $t6,0x14($sp) -/* f08ebc8: 0fc4be7c */ jal func0f12f9f0 +/* f08ebc8: 0fc4be7c */ jal sparksCreate /* f08ebcc: afb10010 */ sw $s1,0x10($sp) /* f08ebd0: 8e650014 */ lw $a1,0x14($s3) /* f08ebd4: 240f0009 */ addiu $t7,$zero,0x9 @@ -45140,7 +45140,7 @@ glabel func0f08ea50 /* f08ebdc: 84a40028 */ lh $a0,0x28($a1) /* f08ebe0: afaf0014 */ sw $t7,0x14($sp) /* f08ebe4: afb10010 */ sw $s1,0x10($sp) -/* f08ebe8: 0fc4be7c */ jal func0f12f9f0 +/* f08ebe8: 0fc4be7c */ jal sparksCreate /* f08ebec: 02003825 */ or $a3,$s0,$zero /* f08ebf0: 0c004b70 */ jal random /* f08ebf4: 00000000 */ nop @@ -45153,7 +45153,7 @@ glabel func0f08ea50 /* f08ec10: 84a40028 */ lh $a0,0x28($a1) /* f08ec14: afb90014 */ sw $t9,0x14($sp) /* f08ec18: afb10010 */ sw $s1,0x10($sp) -/* f08ec1c: 0fc4be7c */ jal func0f12f9f0 +/* f08ec1c: 0fc4be7c */ jal sparksCreate /* f08ec20: 02003825 */ or $a3,$s0,$zero /* f08ec24: 10000008 */ b .L0f08ec48 /* f08ec28: 00000000 */ nop @@ -45163,7 +45163,7 @@ glabel func0f08ea50 /* f08ec34: 02003825 */ or $a3,$s0,$zero /* f08ec38: 84a40028 */ lh $a0,0x28($a1) /* f08ec3c: afa80014 */ sw $t0,0x14($sp) -/* f08ec40: 0fc4be7c */ jal func0f12f9f0 +/* f08ec40: 0fc4be7c */ jal sparksCreate /* f08ec44: afb10010 */ sw $s1,0x10($sp) .L0f08ec48: /* f08ec48: 0fc25480 */ jal func0f095200 @@ -48295,7 +48295,7 @@ glabel var7f1ab214 /* f091b7c: 8fa60070 */ lw $a2,0x70($sp) /* f091b80: 27a701f0 */ addiu $a3,$sp,0x1f0 /* f091b84: afa00014 */ sw $zero,0x14($sp) -/* f091b88: 0fc097a9 */ jal func0f025ea4 +/* f091b88: 0fc097a9 */ jal chrEmitSparks /* f091b8c: afb80010 */ sw $t8,0x10($sp) /* f091b90: 93b90187 */ lbu $t9,0x187($sp) /* f091b94: 8faa006c */ lw $t2,0x6c($sp) @@ -48354,7 +48354,7 @@ glabel var7f1ab214 /* f091c58: 27a601f0 */ addiu $a2,$sp,0x1f0 /* f091c5c: 00003825 */ or $a3,$zero,$zero /* f091c60: afa00010 */ sw $zero,0x10($sp) -/* f091c64: 0fc4be7c */ jal func0f12f9f0 +/* f091c64: 0fc4be7c */ jal sparksCreate /* f091c68: afa00014 */ sw $zero,0x14($sp) /* f091c6c: 0fc2c74a */ jal func0f0b1d28 /* f091c70: 27a40094 */ addiu $a0,$sp,0x94 @@ -48400,7 +48400,7 @@ glabel var7f1ab214 /* f091d08: 27a601f0 */ addiu $a2,$sp,0x1f0 /* f091d0c: 00003825 */ or $a3,$zero,$zero /* f091d10: afa00010 */ sw $zero,0x10($sp) -/* f091d14: 0fc4be7c */ jal func0f12f9f0 +/* f091d14: 0fc4be7c */ jal sparksCreate /* f091d18: afa00014 */ sw $zero,0x14($sp) .L0f091d1c: /* f091d1c: 93ae01c7 */ lbu $t6,0x1c7($sp) diff --git a/src/game/sparks/sparks.c b/src/game/sparks/sparks.c index fc8a0acd8..3eb243c37 100644 --- a/src/game/sparks/sparks.c +++ b/src/game/sparks/sparks.c @@ -232,7 +232,7 @@ void sparkgroupEnsureFreeSparkSlot(struct sparkgroup *group) } GLOBAL_ASM( -glabel func0f12f9f0 +glabel sparksCreate /* f12f9f0: 27bdff90 */ addiu $sp,$sp,-112 /* f12f9f4: 3c03800a */ lui $v1,%hi(var800a4130) /* f12f9f8: 8fb90084 */ lw $t9,0x84($sp) diff --git a/src/game/weather/weather.c b/src/game/weather/weather.c index 1f5360317..17146cdfa 100644 --- a/src/game/weather/weather.c +++ b/src/game/weather/weather.c @@ -3531,7 +3531,7 @@ glabel var7f1b5780 /* f1343b8: afaf0014 */ sw $t7,0x14($sp) /* f1343bc: afa00010 */ sw $zero,0x10($sp) /* f1343c0: 46044280 */ add.s $f10,$f8,$f4 -/* f1343c4: 0fc4be7c */ jal func0f12f9f0 +/* f1343c4: 0fc4be7c */ jal sparksCreate /* f1343c8: e7aa00dc */ swc1 $f10,0xdc($sp) /* f1343cc: 8fae0d80 */ lw $t6,0xd80($sp) /* f1343d0: 25ccffff */ addiu $t4,$t6,-1 diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h index 840ad2751..f025c7ba1 100644 --- a/src/include/game/chr/chr.h +++ b/src/include/game/chr/chr.h @@ -35,7 +35,7 @@ u32 func0f024b18(void); u32 func0f025074(void); void bodyGetBloodColour(s16 bodynum, u8 *colour1, u32 *colour2); Gfx *propchrRender(struct prop *prop, Gfx *gdl, bool arg2); -void func0f025ea4(struct chrdata *chr, struct prop *prop, s32 arg2, struct coord *coord, struct coord *coord2, struct chrdata *chr2); +void chrEmitSparks(struct chrdata *chr, struct prop *prop, s32 arg2, struct coord *coord, struct coord *coord2, struct chrdata *chr2); u32 func0f0260c4(void); u32 func0f0268bc(void); u32 func0f0270f4(void); diff --git a/src/include/game/chr/chraction.h b/src/include/game/chr/chraction.h index 492146122..3c5b8c113 100644 --- a/src/include/game/chr/chraction.h +++ b/src/include/game/chr/chraction.h @@ -325,6 +325,6 @@ void audioMarkAsRecentlyPlayed(s16 audioid); bool audioWasNotPlayedRecently(s16 audioid); void chrToggleModelPart(struct chrdata *chr, s32 partnum); bool chrIsAvoiding(struct chrdata *chr); -void chrEmitSparks(struct chrdata *chr); +void chrDrCarollEmitSparks(struct chrdata *chr); #endif diff --git a/src/include/game/sparks/sparks.h b/src/include/game/sparks/sparks.h index d4558a5d5..a6a023a66 100644 --- a/src/include/game/sparks/sparks.h +++ b/src/include/game/sparks/sparks.h @@ -5,7 +5,7 @@ u32 func0f12f6c0(void); void sparkgroupEnsureFreeSparkSlot(struct sparkgroup *group); -void func0f12f9f0(s32 room, struct prop *prop, struct coord *pos, struct coord *arg3, s32 arg4, s32 arg5); +void sparksCreate(s32 room, struct prop *prop, struct coord *pos, struct coord *arg3, s32 arg4, s32 arg5); Gfx *func0f130044(Gfx *gdl); #endif