diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 9f2e83ca6..83d4ea01c 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -9904,7 +9904,7 @@ glabel func0f025ea4 /* f025ef4: 1000006f */ beqz $zero,.L0f0260b4 /* f025ef8: 8fbf0024 */ lw $ra,0x24($sp) .L0f025efc: -/* f025efc: 0fc0cfe8 */ jal func0f033fa0 +/* f025efc: 0fc0cfe8 */ jal chrGetShield /* f025f00: 00000000 */ sll $zero,$zero,0x0 /* f025f04: 44802000 */ mtc1 $zero,$f4 /* f025f08: 8fa40040 */ lw $a0,0x40($sp) @@ -11762,7 +11762,7 @@ glabel func0f0278a4 /* f02792c: 1612fff0 */ bne $s0,$s2,.L0f0278f0 /* f027930: 26310004 */ addiu $s1,$s1,0x4 /* f027934: 4614b580 */ add.s $f22,$f22,$f20 -/* f027938: 0fc0cfe8 */ jal func0f033fa0 +/* f027938: 0fc0cfe8 */ jal chrGetShield /* f02793c: 02602025 */ or $a0,$s3,$zero /* f027940: 44803000 */ mtc1 $zero,$f6 /* f027944: 3c014120 */ lui $at,0x4120 @@ -11851,7 +11851,7 @@ glabel func0f027994 /* f027a70: 8fac00c0 */ lw $t4,0xc0($sp) /* f027a74: 5180008e */ beqzl $t4,.L0f027cb0 /* f027a78: 8fb800c0 */ lw $t8,0xc0($sp) -/* f027a7c: 0fc0cfe8 */ jal func0f033fa0 +/* f027a7c: 0fc0cfe8 */ jal chrGetShield /* f027a80: 8fa400cc */ lw $a0,0xcc($sp) /* f027a84: 44805000 */ mtc1 $zero,$f10 /* f027a88: 3c014120 */ lui $at,0x4120 @@ -12025,7 +12025,7 @@ glabel func0f027994 /* f027d04: 00000000 */ sll $zero,$zero,0x0 /* f027d08: 4502001f */ bc1fl .L0f027d88 /* f027d0c: 8fb900b8 */ lw $t9,0xb8($sp) -/* f027d10: 0fc0cfe8 */ jal func0f033fa0 +/* f027d10: 0fc0cfe8 */ jal chrGetShield /* f027d14: e7a20068 */ swc1 $f2,0x68($sp) /* f027d18: 44805000 */ mtc1 $zero,$f10 /* f027d1c: c7a20068 */ lwc1 $f2,0x68($sp) @@ -12197,7 +12197,7 @@ glabel func0f027e1c /* f027f84: c62a0018 */ lwc1 $f10,0x18($s1) /* f027f88: 4600548d */ trunc.w.s $f18,$f10 /* f027f8c: 440b9000 */ mfc1 $t3,$f18 -/* f027f90: 0fc0cfe8 */ jal func0f033fa0 +/* f027f90: 0fc0cfe8 */ jal chrGetShield /* f027f94: a7ab0094 */ sh $t3,0x94($sp) /* f027f98: e7a00084 */ swc1 $f0,0x84($sp) /* f027f9c: 0fc2c74a */ jal func0f0b1d28 @@ -13950,7 +13950,7 @@ glabel func0f0297a0 /* f0297bc: 54410006 */ bnel $v0,$at,.L0f0297d8 /* f0297c0: 24010001 */ addiu $at,$zero,0x1 .L0f0297c4: -/* f0297c4: 0fc0cfe8 */ jal func0f033fa0 +/* f0297c4: 0fc0cfe8 */ jal chrGetShield /* f0297c8: 8c640004 */ lw $a0,0x4($v1) /* f0297cc: 10000018 */ beqz $zero,.L0f029830 /* f0297d0: 8fbf0014 */ lw $ra,0x14($sp) @@ -14044,7 +14044,7 @@ glabel func0f02983c /* f029904: 02002025 */ or $a0,$s0,$zero /* f029908: c5e60014 */ lwc1 $f6,0x14($t7) /* f02990c: 46062083 */ div.s $f2,$f4,$f6 -/* f029910: 0fc0cfe8 */ jal func0f033fa0 +/* f029910: 0fc0cfe8 */ jal chrGetShield /* f029914: e7a20170 */ swc1 $f2,0x170($sp) /* f029918: 921402e1 */ lbu $s4,0x2e1($s0) /* f02991c: 960e0188 */ lhu $t6,0x188($s0) @@ -17154,7 +17154,7 @@ glabel func0f02c6e0 /* f02c700: afb10030 */ sw $s1,0x30($sp) /* f02c704: afb0002c */ sw $s0,0x2c($sp) /* f02c708: afa60060 */ sw $a2,0x60($sp) -/* f02c70c: 0fc0cfe8 */ jal func0f033fa0 +/* f02c70c: 0fc0cfe8 */ jal chrGetShield /* f02c710: 00a02025 */ or $a0,$a1,$zero /* f02c714: 44802000 */ mtc1 $zero,$f4 /* f02c718: 3c0e800a */ lui $t6,0x800a @@ -17178,7 +17178,7 @@ glabel func0f02c6e0 /* f02c758: 31090002 */ andi $t1,$t0,0x2 /* f02c75c: 15200015 */ bnez $t1,.L0f02c7b4 /* f02c760: 00000000 */ sll $zero,$zero,0x0 -/* f02c764: 0fc0cfe8 */ jal func0f033fa0 +/* f02c764: 0fc0cfe8 */ jal chrGetShield /* f02c768: 02402025 */ or $a0,$s2,$zero /* f02c76c: 44803000 */ mtc1 $zero,$f6 /* f02c770: 00000000 */ sll $zero,$zero,0x0 @@ -17200,7 +17200,7 @@ glabel func0f02c6e0 /* f02c7ac: 55c00077 */ bnezl $t6,.L0f02c98c /* f02c7b0: 8fbf0044 */ lw $ra,0x44($sp) .L0f02c7b4: -/* f02c7b4: 0fc0cfe8 */ jal func0f033fa0 +/* f02c7b4: 0fc0cfe8 */ jal chrGetShield /* f02c7b8: 02402025 */ or $a0,$s2,$zero /* f02c7bc: 44804000 */ mtc1 $zero,$f8 /* f02c7c0: 3c0f800a */ lui $t7,0x800a @@ -25745,11 +25745,10 @@ glabel func0f0338e0 /* f033f9c: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f033fa0 -/* f033fa0: 03e00008 */ jr $ra -/* f033fa4: c4800180 */ lwc1 $f0,0x180($a0) -); +float chrGetShield(struct chrdata *chr) +{ + return chr->cshield; +} GLOBAL_ASM( glabel func0f033fa8 @@ -25820,7 +25819,7 @@ glabel func0f034080 /* f034088: afa40028 */ sw $a0,0x28($sp) /* f03408c: afa5002c */ sw $a1,0x2c($sp) /* f034090: afa60030 */ sw $a2,0x30($sp) -/* f034094: 0fc0cfe8 */ jal func0f033fa0 +/* f034094: 0fc0cfe8 */ jal chrGetShield /* f034098: afa70034 */ sw $a3,0x34($sp) /* f03409c: 44802000 */ mtc1 $zero,$f4 /* f0340a0: 8fa7002c */ lw $a3,0x2c($sp) @@ -25836,7 +25835,7 @@ glabel func0f034080 /* f0340c8: 31cf00ff */ andi $t7,$t6,0xff /* f0340cc: 15e1000f */ bne $t7,$at,.L0f03410c /* f0340d0: 00000000 */ sll $zero,$zero,0x0 -/* f0340d4: 0fc0cfe8 */ jal func0f033fa0 +/* f0340d4: 0fc0cfe8 */ jal chrGetShield /* f0340d8: 8fa40028 */ lw $a0,0x28($sp) /* f0340dc: 8fb80028 */ lw $t8,0x28($sp) /* f0340e0: 8fb90034 */ lw $t9,0x34($sp) @@ -25953,7 +25952,7 @@ glabel func0f0341dc /* f034264: afa00048 */ sw $zero,0x48($sp) /* f034268: afa00044 */ sw $zero,0x44($sp) /* f03426c: afae0040 */ sw $t6,0x40($sp) -/* f034270: 0fc0cfe8 */ jal func0f033fa0 +/* f034270: 0fc0cfe8 */ jal chrGetShield /* f034274: afa40050 */ sw $a0,0x50($sp) /* f034278: 44802000 */ mtc1 $zero,$f4 /* f03427c: 8fa40050 */ lw $a0,0x50($sp) @@ -26015,7 +26014,7 @@ glabel func0f034330 /* f034344: afa0004c */ sw $zero,0x4c($sp) /* f034348: afa00048 */ sw $zero,0x48($sp) /* f03434c: afa00044 */ sw $zero,0x44($sp) -/* f034350: 0fc0cfe8 */ jal func0f033fa0 +/* f034350: 0fc0cfe8 */ jal chrGetShield /* f034354: afa40050 */ sw $a0,0x50($sp) /* f034358: 44802000 */ mtc1 $zero,$f4 /* f03435c: 8fa40050 */ lw $a0,0x50($sp) @@ -26872,7 +26871,7 @@ glabel func0f034524 .L0f034f94: /* f034f94: 5160006b */ beqzl $t3,.L0f035144 /* f034f98: 44804000 */ mtc1 $zero,$f8 -/* f034f9c: 0fc0cfe8 */ jal func0f033fa0 +/* f034f9c: 0fc0cfe8 */ jal chrGetShield /* f034fa0: 02002025 */ or $a0,$s0,$zero /* f034fa4: 8e0202d4 */ lw $v0,0x2d4($s0) /* f034fa8: 44809000 */ mtc1 $zero,$f18 @@ -26933,7 +26932,7 @@ glabel func0f034524 .L0f03507c: /* f03507c: 02002025 */ or $a0,$s0,$zero .L0f035080: -/* f035080: 0fc0cfe8 */ jal func0f033fa0 +/* f035080: 0fc0cfe8 */ jal chrGetShield /* f035084: e7a20134 */ swc1 $f2,0x134($sp) /* f035088: 8e04001c */ lw $a0,0x1c($s0) /* f03508c: 44050000 */ mfc1 $a1,$f0 @@ -39514,7 +39513,7 @@ glabel func0f03ff2c /* f03ff74: 8defa2d8 */ lw $t7,-0x5d28($t7) /* f03ff78: 55e0000a */ bnezl $t7,.L0f03ffa4 /* f03ff7c: 92180001 */ lbu $t8,0x1($s0) -/* f03ff80: 0fc0cfe8 */ jal func0f033fa0 +/* f03ff80: 0fc0cfe8 */ jal chrGetShield /* f03ff84: 00000000 */ sll $zero,$zero,0x0 /* f03ff88: 44802000 */ mtc1 $zero,$f4 /* f03ff8c: 00000000 */ sll $zero,$zero,0x0 @@ -40991,7 +40990,7 @@ glabel func0f0404d4 /* f0414e8: 8c8e0020 */ lw $t6,0x20($a0) /* f0414ec: 51c00012 */ beqzl $t6,.L0f041538 /* f0414f0: 8faf0278 */ lw $t7,0x278($sp) -/* f0414f4: 0fc0cfe8 */ jal func0f033fa0 +/* f0414f4: 0fc0cfe8 */ jal chrGetShield /* f0414f8: 00000000 */ sll $zero,$zero,0x0 /* f0414fc: 44802000 */ mtc1 $zero,$f4 /* f041500: 8fa40088 */ lw $a0,0x88($sp) @@ -41095,7 +41094,7 @@ glabel func0f0404d4 /* f041668: 8c8d0020 */ lw $t5,0x20($a0) /* f04166c: 51a00012 */ beqzl $t5,.L0f0416b8 /* f041670: 8fb80278 */ lw $t8,0x278($sp) -/* f041674: 0fc0cfe8 */ jal func0f033fa0 +/* f041674: 0fc0cfe8 */ jal chrGetShield /* f041678: 00000000 */ sll $zero,$zero,0x0 /* f04167c: 44805000 */ mtc1 $zero,$f10 /* f041680: 8fa40070 */ lw $a0,0x70($sp) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 47aaf4f5b..7959c08a9 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -4442,7 +4442,7 @@ glabel ai010f /* f052d68: 8fa30024 */ lw $v1,0x24($sp) /* f052d6c: 1040000f */ beqz $v0,.L0f052dac /* f052d70: 00402025 */ or $a0,$v0,$zero -/* f052d74: 0fc0cfe8 */ jal func0f033fa0 +/* f052d74: 0fc0cfe8 */ jal chrGetShield /* f052d78: afa30024 */ sw $v1,0x24($sp) /* f052d7c: c7b00020 */ lwc1 $f16,0x20($sp) /* f052d80: 8fa30024 */ lw $v1,0x24($sp) @@ -4499,7 +4499,7 @@ glabel ai0110 /* f052e24: 8fa30024 */ lw $v1,0x24($sp) /* f052e28: 1040000f */ beqz $v0,.L0f052e68 /* f052e2c: 00402025 */ or $a0,$v0,$zero -/* f052e30: 0fc0cfe8 */ jal func0f033fa0 +/* f052e30: 0fc0cfe8 */ jal chrGetShield /* f052e34: afa30024 */ sw $v1,0x24($sp) /* f052e38: c7b00020 */ lwc1 $f16,0x20($sp) /* f052e3c: 8fa30024 */ lw $v1,0x24($sp) diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index be37edb81..96c249687 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -2803,7 +2803,7 @@ glabel func0f062270 /* f062604: 8e2d0020 */ lw $t5,0x20($s1) /* f062608: 11a00010 */ beqz $t5,.L0f06264c /* f06260c: 00000000 */ sll $zero,$zero,0x0 -/* f062610: 0fc0cfe8 */ jal func0f033fa0 +/* f062610: 0fc0cfe8 */ jal chrGetShield /* f062614: 02202025 */ or $a0,$s1,$zero /* f062618: 4600e03c */ c.lt.s $f28,$f0 /* f06261c: 02202025 */ or $a0,$s1,$zero diff --git a/src/game/game_066310.c b/src/game/game_066310.c index 4b3ad37e4..26f897d1a 100644 --- a/src/game/game_066310.c +++ b/src/game/game_066310.c @@ -8267,7 +8267,7 @@ glabel func0f06c28c /* f06c33c: 8e120020 */ lw $s2,0x20($s0) /* f06c340: e7a000e4 */ swc1 $f0,0xe4($sp) /* f06c344: 46085400 */ add.s $f16,$f10,$f8 -/* f06c348: 0fc0cfe8 */ jal func0f033fa0 +/* f06c348: 0fc0cfe8 */ jal chrGetShield /* f06c34c: e7b000d4 */ swc1 $f16,0xd4($sp) /* f06c350: 4480a000 */ mtc1 $zero,$f20 /* f06c354: c7b200e4 */ lwc1 $f18,0xe4($sp) @@ -18565,7 +18565,7 @@ glabel func0f073c6c /* f075700: 54410009 */ bnel $v0,$at,.L0f075728 /* f075704: 8fae034c */ lw $t6,0x34c($sp) .L0f075708: -/* f075708: 0fc0cfe8 */ jal func0f033fa0 +/* f075708: 0fc0cfe8 */ jal chrGetShield /* f07570c: 8de40004 */ lw $a0,0x4($t7) /* f075710: 4600a03c */ c.lt.s $f20,$f0 /* f075714: 00000000 */ sll $zero,$zero,0x0 @@ -18617,7 +18617,7 @@ glabel func0f073c6c /* f0757bc: 8c4e0088 */ lw $t6,0x88($v0) /* f0757c0: afa70070 */ sw $a3,0x70($sp) /* f0757c4: afa401dc */ sw $a0,0x1dc($sp) -/* f0757c8: 0fc0cfe8 */ jal func0f033fa0 +/* f0757c8: 0fc0cfe8 */ jal chrGetShield /* f0757cc: afae01d4 */ sw $t6,0x1d4($sp) /* f0757d0: 8fa40070 */ lw $a0,0x70($sp) /* f0757d4: 0fc2c74a */ jal func0f0b1d28 @@ -23911,7 +23911,7 @@ glabel func0f079f1c /* f07a410: 8c980020 */ lw $t8,0x20($a0) /* f07a414: 53000012 */ beqzl $t8,.L0f07a460 /* f07a418: 8fac0110 */ lw $t4,0x110($sp) -/* f07a41c: 0fc0cfe8 */ jal func0f033fa0 +/* f07a41c: 0fc0cfe8 */ jal chrGetShield /* f07a420: 00000000 */ sll $zero,$zero,0x0 /* f07a424: 44808000 */ mtc1 $zero,$f16 /* f07a428: 8fa400ac */ lw $a0,0xac($sp) diff --git a/src/game/game_097a50.c b/src/game/game_097a50.c index df5ddada4..8df802ad0 100644 --- a/src/game/game_097a50.c +++ b/src/game/game_097a50.c @@ -19214,7 +19214,7 @@ glabel func0f0a7d98 .L0f0a7ed8: /* f0a7ed8: 8f040004 */ lw $a0,0x4($t8) /* f0a7edc: afa000b0 */ sw $zero,0xb0($sp) -/* f0a7ee0: 0fc0cfe8 */ jal func0f033fa0 +/* f0a7ee0: 0fc0cfe8 */ jal chrGetShield /* f0a7ee4: afa700c8 */ sw $a3,0xc8($sp) /* f0a7ee8: 44802000 */ mtc1 $zero,$f4 /* f0a7eec: 8fa700c8 */ lw $a3,0xc8($sp) diff --git a/src/game/game_0b28d0.c b/src/game/game_0b28d0.c index 1de0f72eb..adc43d668 100644 --- a/src/game/game_0b28d0.c +++ b/src/game/game_0b28d0.c @@ -6404,7 +6404,7 @@ glabel func0f0b7c60 /* f0b7e7c: 00000000 */ sll $zero,$zero,0x0 /* f0b7e80: e44200dc */ swc1 $f2,0xdc($v0) .L0f0b7e84: -/* f0b7e84: 0fc0cfe8 */ jal func0f033fa0 +/* f0b7e84: 0fc0cfe8 */ jal chrGetShield /* f0b7e88: 02002025 */ or $a0,$s0,$zero /* f0b7e8c: 44050000 */ mfc1 $a1,$f0 /* f0b7e90: 0fc0cfea */ jal func0f033fa8 @@ -16442,7 +16442,7 @@ glabel func0f0c07c8 /* f0c0e54: afa6003c */ sw $a2,0x3c($sp) /* f0c0e58: 8e0d0284 */ lw $t5,0x284($s0) /* f0c0e5c: 8db800bc */ lw $t8,0xbc($t5) -/* f0c0e60: 0fc0cfe8 */ jal func0f033fa0 +/* f0c0e60: 0fc0cfe8 */ jal chrGetShield /* f0c0e64: 8f040004 */ lw $a0,0x4($t8) /* f0c0e68: 3c013e00 */ lui $at,0x3e00 /* f0c0e6c: 44816000 */ mtc1 $at,$f12 @@ -17858,7 +17858,7 @@ glabel func0f0c21a4 /* f0c21ac: 27bdffe8 */ addiu $sp,$sp,-24 /* f0c21b0: afbf0014 */ sw $ra,0x14($sp) /* f0c21b4: 8dcf00bc */ lw $t7,0xbc($t6) -/* f0c21b8: 0fc0cfe8 */ jal func0f033fa0 +/* f0c21b8: 0fc0cfe8 */ jal chrGetShield /* f0c21bc: 8de40004 */ lw $a0,0x4($t7) /* f0c21c0: 3c013e00 */ lui $at,0x3e00 /* f0c21c4: 44812000 */ mtc1 $at,$f4 diff --git a/src/game/game_187770.c b/src/game/game_187770.c index 962dae19e..9569936ab 100644 --- a/src/game/game_187770.c +++ b/src/game/game_187770.c @@ -11236,7 +11236,7 @@ glabel func0f190be4 /* f190fa4: 8d6c0004 */ lw $t4,0x4($t3) /* f190fa8: 00008025 */ or $s0,$zero,$zero /* f190fac: 8fa4008c */ lw $a0,0x8c($sp) -/* f190fb0: 0fc0cfe8 */ jal func0f033fa0 +/* f190fb0: 0fc0cfe8 */ jal chrGetShield /* f190fb4: afac0058 */ sw $t4,0x58($sp) /* f190fb8: 3c013e00 */ lui $at,0x3e00 /* f190fbc: 44812000 */ mtc1 $at,$f4 diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c index ec1407223..cd12bd3d0 100644 --- a/src/game/game_1999b0.c +++ b/src/game/game_1999b0.c @@ -663,7 +663,7 @@ glabel func0f199f84 /* f19a16c: 8e0a0020 */ lw $t2,0x20($s0) /* f19a170: 51400011 */ beqzl $t2,.L0f19a1b8 /* f19a174: 02002025 */ or $a0,$s0,$zero -/* f19a178: 0fc0cfe8 */ jal func0f033fa0 +/* f19a178: 0fc0cfe8 */ jal chrGetShield /* f19a17c: 02002025 */ or $a0,$s0,$zero /* f19a180: 4600a03c */ c.lt.s $f20,$f0 /* f19a184: 02002025 */ or $a0,$s0,$zero diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h index 44dfb6f86..0b38e5472 100644 --- a/src/include/game/chr/chr.h +++ b/src/include/game/chr/chr.h @@ -617,7 +617,7 @@ u32 func0f033654(void); u32 func0f0336a8(void); u32 func0f033728(void); u32 func0f0338e0(void); -u32 func0f033fa0(void); +float chrGetShield(struct chrdata *chr); u32 func0f033fa8(void); u32 func0f034080(void); u32 func0f034124(void);