Rename chr.c to sparkstick.c and game_01e250.c to chr.c
This commit is contained in:
parent
431d868ad5
commit
5978809fa5
|
|
@ -62,8 +62,8 @@
|
|||
src/game/game_01d990.o (section); \
|
||||
src/game/game_01d9f0.o (section); \
|
||||
src/game/game_01de30.o (section); \
|
||||
src/game/sparkstick.o (section); \
|
||||
src/game/chr/chr.o (section); \
|
||||
src/game/game_01e250.o (section); \
|
||||
src/game/game_02cde0.o (section); \
|
||||
src/game/chr/chraction.o (section); \
|
||||
src/game/data/data_00e460.o (section); \
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#include "game/data/data_01a3a0.h"
|
||||
#include "game/data/data_020df0.h"
|
||||
#include "game/data/data_02da90.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_0601b0.h"
|
||||
#include "game/game_092610.h"
|
||||
#include "game/game_097ba0.h"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
#include "game/data/data_020df0.h"
|
||||
#include "game/data/data_02da90.h"
|
||||
#include "game/game_005fd0.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_0601b0.h"
|
||||
#include "game/game_096750.h"
|
||||
#include "game/game_096ca0.h"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
#include "game/data/data_02da90.h"
|
||||
#include "game/debug.h"
|
||||
#include "game/game_005fd0.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_0601b0.h"
|
||||
#include "game/game_092610.h"
|
||||
#include "game/game_095320.h"
|
||||
|
|
|
|||
16468
src/game/chr/chr.c
16468
src/game/chr/chr.c
File diff suppressed because it is too large
Load Diff
|
|
@ -13,7 +13,7 @@
|
|||
#include "game/dlights.h"
|
||||
#include "game/game_005fd0.h"
|
||||
#include "game/game_01b0a0.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_02cde0.h"
|
||||
#include "game/game_0601b0.h"
|
||||
#include "game/game_092610.h"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
#include "constants.h"
|
||||
#include "game/bondmove.h"
|
||||
#include "game/cheats.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/chr/chraction.h"
|
||||
#include "game/chr/chrai.h"
|
||||
#include "game/chr/chraicommands.h"
|
||||
|
|
@ -18,7 +17,7 @@
|
|||
#include "game/dlights.h"
|
||||
#include "game/game_011110.h"
|
||||
#include "game/game_016100.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_0601b0.h"
|
||||
#include "game/game_091e10.h"
|
||||
#include "game/game_092610.h"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#include "game/data/data_02da90.h"
|
||||
#include "game/game_000090.h"
|
||||
#include "game/game_000130.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "gvars/gvars.h"
|
||||
#include "lib/lib_1a500.h"
|
||||
#include "types.h"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#include "game/dlights.h"
|
||||
#include "game/game_005fd0.h"
|
||||
#include "game/game_006bd0.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_0601b0.h"
|
||||
#include "game/game_095320.h"
|
||||
#include "game/game_096750.h"
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include "game/game_0125a0.h"
|
||||
#include "game/game_012d50.h"
|
||||
#include "game/game_0147d0.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_02cde0.h"
|
||||
#include "game/game_0601b0.h"
|
||||
#include "game/game_091e10.h"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
#include "game/data/data_02da90.h"
|
||||
#include "game/data/inventory.h"
|
||||
#include "game/game_011110.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_02cde0.h"
|
||||
#include "game/game_0601b0.h"
|
||||
#include "game/game_091e10.h"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
#include "game/data/data_020df0.h"
|
||||
#include "game/data/data_02da90.h"
|
||||
#include "game/game_0147d0.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_02cde0.h"
|
||||
#include "game/game_0601b0.h"
|
||||
#include "game/game_197600.h"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
#include "game/data/data_020df0.h"
|
||||
#include "game/data/data_02da90.h"
|
||||
#include "game/game_014f10.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_0601b0.h"
|
||||
#include "game/propobj.h"
|
||||
#include "gvars/gvars.h"
|
||||
|
|
|
|||
16338
src/game/game_01e250.c
16338
src/game/game_01e250.c
File diff suppressed because it is too large
Load Diff
|
|
@ -9,7 +9,7 @@
|
|||
#include "game/data/data_01a3a0.h"
|
||||
#include "game/data/data_020df0.h"
|
||||
#include "game/data/data_02da90.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_02cde0.h"
|
||||
#include "game/game_0601b0.h"
|
||||
#include "game/game_096750.h"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#include "game/data/data_020df0.h"
|
||||
#include "game/data/data_02da90.h"
|
||||
#include "game/dlights.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_0601b0.h"
|
||||
#include "game/game_092610.h"
|
||||
#include "game/game_095320.h"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
#include "game/data/data_02da90.h"
|
||||
#include "game/data/inventory.h"
|
||||
#include "game/game_005fd0.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_0601b0.h"
|
||||
#include "game/game_092610.h"
|
||||
#include "game/game_096360.h"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
#include "game/data/data_02da90.h"
|
||||
#include "game/game_006bd0.h"
|
||||
#include "game/game_016100.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_02cde0.h"
|
||||
#include "game/game_0601b0.h"
|
||||
#include "game/game_092610.h"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
#include "game/data/data_01a3a0.h"
|
||||
#include "game/data/data_020df0.h"
|
||||
#include "game/data/data_02da90.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_129210.h"
|
||||
#include "game/propobj.h"
|
||||
#include "gvars/gvars.h"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#include "game/data/data_020df0.h"
|
||||
#include "game/data/data_02da90.h"
|
||||
#include "game/dlights.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_0601b0.h"
|
||||
#include "game/game_091e10.h"
|
||||
#include "game/game_092610.h"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
#include "game/data/data_020df0.h"
|
||||
#include "game/data/data_02da90.h"
|
||||
#include "game/dlights.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_0b3350.h"
|
||||
#include "game/game_12f6c0.h"
|
||||
#include "game/game_166e40.h"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#include "game/dlights.h"
|
||||
#include "game/game_013550.h"
|
||||
#include "game/game_013ee0.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_0601b0.h"
|
||||
#include "game/ceil.h"
|
||||
#include "game/game_097ba0.h"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
#include "game/bondmove.h"
|
||||
#include "game/camdraw.h"
|
||||
#include "game/cheats.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/chr/chraction.h"
|
||||
#include "game/data/data_000000.h"
|
||||
#include "game/data/data_0083d0.h"
|
||||
|
|
@ -55,7 +54,7 @@
|
|||
#include "game/game_01d990.h"
|
||||
#include "game/game_01d9f0.h"
|
||||
#include "game/game_01de30.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_0601b0.h"
|
||||
#include "game/game_095320.h"
|
||||
#include "game/game_097ba0.h"
|
||||
|
|
@ -95,6 +94,7 @@
|
|||
#include "game/mplayer.h"
|
||||
#include "game/pak/pak.h"
|
||||
#include "game/propobj.h"
|
||||
#include "game/sparkstick.h"
|
||||
#include "game/splat.h"
|
||||
#include "game/utils.h"
|
||||
#include "game/wallhit.h"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#include "game/data/data_020df0.h"
|
||||
#include "game/data/data_02da90.h"
|
||||
#include "game/debug.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_0601b0.h"
|
||||
#include "game/game_092610.h"
|
||||
#include "game/game_096750.h"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#include "game/data/data_020df0.h"
|
||||
#include "game/data/data_02da90.h"
|
||||
#include "game/debug.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/ceil.h"
|
||||
#include "game/game_0b0420.h"
|
||||
#include "game/game_0fd660.h"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#include "game/data/data_020df0.h"
|
||||
#include "game/data/data_02da90.h"
|
||||
#include "game/debug.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_092610.h"
|
||||
#include "game/game_097ba0.h"
|
||||
#include "game/game_0b0420.h"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include "game/dlights.h"
|
||||
#include "game/game_006bd0.h"
|
||||
#include "game/game_011110.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_0601b0.h"
|
||||
#include "game/game_091e10.h"
|
||||
#include "game/game_092610.h"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,160 @@
|
|||
#include <ultra64.h>
|
||||
#include "constants.h"
|
||||
#include "game/data/data_000000.h"
|
||||
#include "game/data/data_0083d0.h"
|
||||
#include "game/data/data_00e460.h"
|
||||
#include "game/data/data_0160b0.h"
|
||||
#include "game/data/data_01a3a0.h"
|
||||
#include "game/data/data_020df0.h"
|
||||
#include "game/data/data_02da90.h"
|
||||
#include "gvars/gvars.h"
|
||||
#include "types.h"
|
||||
|
||||
const u32 var7f1a8680[] = {0xb8d1b717};
|
||||
const u32 var7f1a8684[] = {0x00000000};
|
||||
const u32 var7f1a8688[] = {0x00000000};
|
||||
const u32 var7f1a868c[] = {0x00000000};
|
||||
|
||||
GLOBAL_ASM(
|
||||
glabel sparksTick
|
||||
/* f01e050: 27bdffe0 */ addiu $sp,$sp,-32
|
||||
/* f01e054: 3c0b8008 */ lui $t3,%hi(var8007f0b8)
|
||||
/* f01e058: 256bf0b8 */ addiu $t3,$t3,%lo(var8007f0b8)
|
||||
/* f01e05c: 8d6e0000 */ lw $t6,0x0($t3)
|
||||
/* f01e060: afb5001c */ sw $s5,0x1c($sp)
|
||||
/* f01e064: afb40018 */ sw $s4,0x18($sp)
|
||||
/* f01e068: afb30014 */ sw $s3,0x14($sp)
|
||||
/* f01e06c: afb20010 */ sw $s2,0x10($sp)
|
||||
/* f01e070: afb1000c */ sw $s1,0xc($sp)
|
||||
/* f01e074: 11c0006d */ beqz $t6,.L0f01e22c
|
||||
/* f01e078: afb00008 */ sw $s0,0x8($sp)
|
||||
/* f01e07c: ad600000 */ sw $zero,0x0($t3)
|
||||
/* f01e080: 3c02800a */ lui $v0,%hi(var800a3fc8)
|
||||
/* f01e084: 3c017f1b */ lui $at,%hi(var7f1a8680)
|
||||
/* f01e088: 3c15800a */ lui $s5,%hi(g_Vars)
|
||||
/* f01e08c: 3c14800a */ lui $s4,%hi(var800a3fc0)
|
||||
/* f01e090: 3c12800a */ lui $s2,%hi(var800a34d0)
|
||||
/* f01e094: 3c0c8008 */ lui $t4,%hi(sparktable)
|
||||
/* f01e098: 44807000 */ mtc1 $zero,$f14
|
||||
/* f01e09c: 24423fc8 */ addiu $v0,$v0,%lo(var800a3fc8)
|
||||
/* f01e0a0: 258cec80 */ addiu $t4,$t4,%lo(sparktable)
|
||||
/* f01e0a4: 265234d0 */ addiu $s2,$s2,%lo(var800a34d0)
|
||||
/* f01e0a8: 26943fc0 */ addiu $s4,$s4,%lo(var800a3fc0)
|
||||
/* f01e0ac: 26b59fc0 */ addiu $s5,$s5,%lo(g_Vars)
|
||||
/* f01e0b0: c4308680 */ lwc1 $f16,%lo(var7f1a8680)($at)
|
||||
/* f01e0b4: 00001825 */ or $v1,$zero,$zero
|
||||
/* f01e0b8: 2413001c */ addiu $s3,$zero,0x1c
|
||||
/* f01e0bc: 24110001 */ addiu $s1,$zero,0x1
|
||||
/* f01e0c0: 2410000a */ addiu $s0,$zero,0xa
|
||||
/* f01e0c4: 240d0028 */ addiu $t5,$zero,0x28
|
||||
.L0f01e0c8:
|
||||
/* f01e0c8: 8c4f0000 */ lw $t7,0x0($v0)
|
||||
/* f01e0cc: 8c450008 */ lw $a1,0x8($v0)
|
||||
/* f01e0d0: 24630001 */ addiu $v1,$v1,0x1
|
||||
/* f01e0d4: 01ed0019 */ multu $t7,$t5
|
||||
/* f01e0d8: 0000c012 */ mflo $t8
|
||||
/* f01e0dc: 01982021 */ addu $a0,$t4,$t8
|
||||
/* f01e0e0: 94990010 */ lhu $t9,0x10($a0)
|
||||
/* f01e0e4: 00b9082a */ slt $at,$a1,$t9
|
||||
/* f01e0e8: 14200003 */ bnez $at,.L0f01e0f8
|
||||
/* f01e0ec: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f01e0f0: 1000004c */ beqz $zero,.L0f01e224
|
||||
/* f01e0f4: ac400008 */ sw $zero,0x8($v0)
|
||||
.L0f01e0f8:
|
||||
/* f01e0f8: 10a0004a */ beqz $a1,.L0f01e224
|
||||
/* f01e0fc: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f01e100: 8d6e0000 */ lw $t6,0x0($t3)
|
||||
/* f01e104: 00002825 */ or $a1,$zero,$zero
|
||||
/* f01e108: 8ea60038 */ lw $a2,0x38($s5)
|
||||
/* f01e10c: 15c00002 */ bnez $t6,.L0f01e118
|
||||
/* f01e110: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f01e114: ad710000 */ sw $s1,0x0($t3)
|
||||
.L0f01e118:
|
||||
/* f01e118: 18c00042 */ blez $a2,.L0f01e224
|
||||
/* f01e11c: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f01e120: 8c4a0004 */ lw $t2,0x4($v0)
|
||||
/* f01e124: 8c46000c */ lw $a2,0xc($v0)
|
||||
.L0f01e128:
|
||||
/* f01e128: 8c4f0008 */ lw $t7,0x8($v0)
|
||||
/* f01e12c: 00004825 */ or $t1,$zero,$zero
|
||||
/* f01e130: 00d30019 */ multu $a2,$s3
|
||||
/* f01e134: 25f80001 */ addiu $t8,$t7,0x1
|
||||
/* f01e138: ac580008 */ sw $t8,0x8($v0)
|
||||
/* f01e13c: 0000c812 */ mflo $t9
|
||||
/* f01e140: 02594021 */ addu $t0,$s2,$t9
|
||||
/* f01e144: 19400032 */ blez $t2,.L0f01e210
|
||||
/* f01e148: 01003825 */ or $a3,$t0,$zero
|
||||
/* f01e14c: 8cee0018 */ lw $t6,0x18($a3)
|
||||
.L0f01e150:
|
||||
/* f01e150: 25290001 */ addiu $t1,$t1,0x1
|
||||
/* f01e154: 2508001c */ addiu $t0,$t0,0x1c
|
||||
/* f01e158: 11c00026 */ beqz $t6,.L0f01e1f4
|
||||
/* f01e15c: 00000000 */ sll $zero,$zero,0x0
|
||||
/* f01e160: c4e0000c */ lwc1 $f0,0xc($a3)
|
||||
/* f01e164: c4840024 */ lwc1 $f4,0x24($a0)
|
||||
/* f01e168: c4e20010 */ lwc1 $f2,0x10($a3)
|
||||
/* f01e16c: c4ec0014 */ lwc1 $f12,0x14($a3)
|
||||
/* f01e170: 46040182 */ mul.s $f6,$f0,$f4
|
||||
/* f01e174: 46060201 */ sub.s $f8,$f0,$f6
|
||||
/* f01e178: e4e8000c */ swc1 $f8,0xc($a3)
|
||||
/* f01e17c: c48a0024 */ lwc1 $f10,0x24($a0)
|
||||
/* f01e180: c486000c */ lwc1 $f6,0xc($a0)
|
||||
/* f01e184: 460a1482 */ mul.s $f18,$f2,$f10
|
||||
/* f01e188: 46121101 */ sub.s $f4,$f2,$f18
|
||||
/* f01e18c: 46062201 */ sub.s $f8,$f4,$f6
|
||||
/* f01e190: e4e80010 */ swc1 $f8,0x10($a3)
|
||||
/* f01e194: c48a0024 */ lwc1 $f10,0x24($a0)
|
||||
/* f01e198: c4e20010 */ lwc1 $f2,0x10($a3)
|
||||
/* f01e19c: 460a6482 */ mul.s $f18,$f12,$f10
|
||||
/* f01e1a0: 46027032 */ c.eq.s $f14,$f2
|
||||
/* f01e1a4: 46126101 */ sub.s $f4,$f12,$f18
|
||||
/* f01e1a8: 45000003 */ bc1f .L0f01e1b8
|
||||
/* f01e1ac: e4e40014 */ swc1 $f4,0x14($a3)
|
||||
/* f01e1b0: e4f00010 */ swc1 $f16,0x10($a3)
|
||||
/* f01e1b4: c4e20010 */ lwc1 $f2,0x10($a3)
|
||||
.L0f01e1b8:
|
||||
/* f01e1b8: c4e60000 */ lwc1 $f6,0x0($a3)
|
||||
/* f01e1bc: c4e8000c */ lwc1 $f8,0xc($a3)
|
||||
/* f01e1c0: c4f20004 */ lwc1 $f18,0x4($a3)
|
||||
/* f01e1c4: 8cef0018 */ lw $t7,0x18($a3)
|
||||
/* f01e1c8: 46083280 */ add.s $f10,$f6,$f8
|
||||
/* f01e1cc: c4e80014 */ lwc1 $f8,0x14($a3)
|
||||
/* f01e1d0: c4e60008 */ lwc1 $f6,0x8($a3)
|
||||
/* f01e1d4: 46029100 */ add.s $f4,$f18,$f2
|
||||
/* f01e1d8: e4ea0000 */ swc1 $f10,0x0($a3)
|
||||
/* f01e1dc: 25f8ffff */ addiu $t8,$t7,-1
|
||||
/* f01e1e0: 46083280 */ add.s $f10,$f6,$f8
|
||||
/* f01e1e4: e4e40004 */ swc1 $f4,0x4($a3)
|
||||
/* f01e1e8: acf80018 */ sw $t8,0x18($a3)
|
||||
/* f01e1ec: e4ea0008 */ swc1 $f10,0x8($a3)
|
||||
/* f01e1f0: 8c4a0004 */ lw $t2,0x4($v0)
|
||||
.L0f01e1f4:
|
||||
/* f01e1f4: 15140003 */ bne $t0,$s4,.L0f01e204
|
||||
/* f01e1f8: 012a082a */ slt $at,$t1,$t2
|
||||
/* f01e1fc: 10000002 */ beqz $zero,.L0f01e208
|
||||
/* f01e200: 02403825 */ or $a3,$s2,$zero
|
||||
.L0f01e204:
|
||||
/* f01e204: 24e7001c */ addiu $a3,$a3,0x1c
|
||||
.L0f01e208:
|
||||
/* f01e208: 5420ffd1 */ bnezl $at,.L0f01e150
|
||||
/* f01e20c: 8cee0018 */ lw $t6,0x18($a3)
|
||||
.L0f01e210:
|
||||
/* f01e210: 8eb90038 */ lw $t9,0x38($s5)
|
||||
/* f01e214: 24a50001 */ addiu $a1,$a1,0x1
|
||||
/* f01e218: 00b9082a */ slt $at,$a1,$t9
|
||||
/* f01e21c: 5420ffc2 */ bnezl $at,.L0f01e128
|
||||
/* f01e220: 8c46000c */ lw $a2,0xc($v0)
|
||||
.L0f01e224:
|
||||
/* f01e224: 1470ffa8 */ bne $v1,$s0,.L0f01e0c8
|
||||
/* f01e228: 24420024 */ addiu $v0,$v0,0x24
|
||||
.L0f01e22c:
|
||||
/* f01e22c: 8fb00008 */ lw $s0,0x8($sp)
|
||||
/* f01e230: 8fb1000c */ lw $s1,0xc($sp)
|
||||
/* f01e234: 8fb20010 */ lw $s2,0x10($sp)
|
||||
/* f01e238: 8fb30014 */ lw $s3,0x14($sp)
|
||||
/* f01e23c: 8fb40018 */ lw $s4,0x18($sp)
|
||||
/* f01e240: 8fb5001c */ lw $s5,0x1c($sp)
|
||||
/* f01e244: 03e00008 */ jr $ra
|
||||
/* f01e248: 27bd0020 */ addiu $sp,$sp,0x20
|
||||
/* f01e24c: 00000000 */ sll $zero,$zero,0x0
|
||||
);
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
#include "game/data/data_020df0.h"
|
||||
#include "game/data/data_02da90.h"
|
||||
#include "game/dlights.h"
|
||||
#include "game/game_01e250.h"
|
||||
#include "game/chr/chr.h"
|
||||
#include "game/game_0b0420.h"
|
||||
#include "game/game_0b3350.h"
|
||||
#include "game/game_127910.h"
|
||||
|
|
|
|||
|
|
@ -1,10 +1,93 @@
|
|||
#ifndef IN_GAME_CHR_CHR_H
|
||||
#define IN_GAME_CHR_CHR_H
|
||||
#ifndef _IN_GAME_CHR_CHR_H
|
||||
#define _IN_GAME_CHR_CHR_H
|
||||
#include <ultra64.h>
|
||||
#include "types.h"
|
||||
|
||||
void sparksTick(void);
|
||||
|
||||
u32 func0f04e418(void);
|
||||
void func0f01e250(void);
|
||||
u32 chrSetChrnum(struct chrdata *chr, s16 arg1);
|
||||
u32 func0f01e6a4(void);
|
||||
u32 func0f01e7f4(void);
|
||||
u32 func0f01f264(struct chrdata *chr, struct coord *pos, s16 *room, f32 arg3, bool arg4);
|
||||
u32 func0f020538(void);
|
||||
s32 getLowestUnusedChrId(void);
|
||||
struct prop *func0f020b14(struct prop *prop, s32 arg0, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist);
|
||||
void func0f020d44(struct prop *prop, bool arg1);
|
||||
u32 func0f021258(void);
|
||||
u32 func0f02133c(void);
|
||||
u32 func0f0213a0(void);
|
||||
u32 func0f02143c(void);
|
||||
void func0f021fa8(struct chrdata *chr, struct coord *pos, s16 *room);
|
||||
void func0f0220ec(struct chrdata *chr, s32 arg1, s32 arg2);
|
||||
u32 func0f022214(void);
|
||||
u32 func0f022624(void);
|
||||
u32 func0f022be4(void);
|
||||
u32 func0f022cc8(void);
|
||||
u32 func0f022d60(void);
|
||||
u32 func0f022fe0(void);
|
||||
u32 func0f023098(void);
|
||||
void chrDropItems(struct chrdata *chr);
|
||||
u32 chrSetHudpieceVisible(struct chrdata *chr, u32 arg1);
|
||||
void func0f024668(struct chrdata *chr);
|
||||
u32 func0f0246e4(void);
|
||||
u32 func0f024738(void);
|
||||
u32 func0f024b18(void);
|
||||
u32 func0f025074(void);
|
||||
void bodyGetBloodColour(s16 bodynum, u8 *colour1, u32 *colour2);
|
||||
u32 func0f025288(void);
|
||||
u32 func0f025ea4(void);
|
||||
u32 func0f0260c4(void);
|
||||
u32 func0f0268bc(void);
|
||||
u32 func0f0270f4(void);
|
||||
u32 func0f0278a4(void);
|
||||
u32 func0f027994(void);
|
||||
u32 func0f027e1c(void);
|
||||
u32 func0f028498(void);
|
||||
void func0f028590(f32 arg0);
|
||||
u32 func0f028a50(void);
|
||||
u32 func0f028d50(void);
|
||||
u32 func0f028e18(void);
|
||||
u32 func0f028e6c(void);
|
||||
u32 func0f028f7c(void);
|
||||
u32 func0f0291d4(void);
|
||||
u32 func0f0292bc(void);
|
||||
u32 func0f02932c(void);
|
||||
u32 func0f0293ec(void);
|
||||
u32 func0f0294cc(void);
|
||||
u32 func0f0295f8(void);
|
||||
u32 func0f0297a0(void);
|
||||
u32 func0f02983c(void);
|
||||
u32 func0f02b7d4(void);
|
||||
u32 func0f02bdf8(void);
|
||||
u32 func0f02c6e0(void);
|
||||
u32 func0f02c9b0(void);
|
||||
u32 func0f02ccb4(void);
|
||||
s32 getNumChrs(void);
|
||||
void chrInsertToChrsC(s32 chrnum, s32 chrindex);
|
||||
void func0f01e760(s32 arg0);
|
||||
void setVar8006297c(u32 arg0);
|
||||
u32 getVar8006297c(void);
|
||||
void setVar80062980(u32 arg0);
|
||||
u32 getVar80062980(void);
|
||||
void chrSetOrUnsetHiddenFlag00000100(struct chrdata *chr, bool unset);
|
||||
void chrSetMaxDamage(struct chrdata *chr, f32 maxdamage);
|
||||
f32 chrGetMaxDamage(struct chrdata *chr);
|
||||
void chrAddHealth(struct chrdata *chr, f32 health);
|
||||
f32 chrGetArmor(struct chrdata *chr);
|
||||
void chrInit(struct prop *prop, u8 *ailist);
|
||||
struct prop *func0f020cc8(s32 arg0, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist);
|
||||
void propClearReferences(s32 propnum);
|
||||
void func0f022084(struct chrdata *chr, s16 *room);
|
||||
void func0f0220ac(struct chrdata *chr);
|
||||
void chrCloak(struct chrdata *chr, bool arg1);
|
||||
void chrUncloak(struct chrdata *chr, bool value);
|
||||
void chrUncloakTemporarily(struct chrdata *chr);
|
||||
void func0f02472c(void);
|
||||
void func0f028490(f32 arg1);
|
||||
struct chrdata *chrFindByLiteralId(s32 chrnum);
|
||||
struct prop *chrGetEquippedWeaponProp(struct chrdata *chr, s32 hand);
|
||||
struct prop *chrGetEquippedWeaponPropWithCheck(struct chrdata *chr, s32 hand);
|
||||
struct prop *chrGetTargetProp(struct chrdata *chr);
|
||||
bool chrUpdateGeometry(struct prop *prop, struct geo **arg1, struct geo **arg2);
|
||||
void propChrGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,93 +0,0 @@
|
|||
#ifndef _IN_GAME_GAME_01E250_H
|
||||
#define _IN_GAME_GAME_01E250_H
|
||||
#include <ultra64.h>
|
||||
#include "types.h"
|
||||
|
||||
void func0f01e250(void);
|
||||
u32 chrSetChrnum(struct chrdata *chr, s16 arg1);
|
||||
u32 func0f01e6a4(void);
|
||||
u32 func0f01e7f4(void);
|
||||
u32 func0f01f264(struct chrdata *chr, struct coord *pos, s16 *room, f32 arg3, bool arg4);
|
||||
u32 func0f020538(void);
|
||||
s32 getLowestUnusedChrId(void);
|
||||
struct prop *func0f020b14(struct prop *prop, s32 arg0, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist);
|
||||
void func0f020d44(struct prop *prop, bool arg1);
|
||||
u32 func0f021258(void);
|
||||
u32 func0f02133c(void);
|
||||
u32 func0f0213a0(void);
|
||||
u32 func0f02143c(void);
|
||||
void func0f021fa8(struct chrdata *chr, struct coord *pos, s16 *room);
|
||||
void func0f0220ec(struct chrdata *chr, s32 arg1, s32 arg2);
|
||||
u32 func0f022214(void);
|
||||
u32 func0f022624(void);
|
||||
u32 func0f022be4(void);
|
||||
u32 func0f022cc8(void);
|
||||
u32 func0f022d60(void);
|
||||
u32 func0f022fe0(void);
|
||||
u32 func0f023098(void);
|
||||
void chrDropItems(struct chrdata *chr);
|
||||
u32 chrSetHudpieceVisible(struct chrdata *chr, u32 arg1);
|
||||
void func0f024668(struct chrdata *chr);
|
||||
u32 func0f0246e4(void);
|
||||
u32 func0f024738(void);
|
||||
u32 func0f024b18(void);
|
||||
u32 func0f025074(void);
|
||||
void bodyGetBloodColour(s16 bodynum, u8 *colour1, u32 *colour2);
|
||||
u32 func0f025288(void);
|
||||
u32 func0f025ea4(void);
|
||||
u32 func0f0260c4(void);
|
||||
u32 func0f0268bc(void);
|
||||
u32 func0f0270f4(void);
|
||||
u32 func0f0278a4(void);
|
||||
u32 func0f027994(void);
|
||||
u32 func0f027e1c(void);
|
||||
u32 func0f028498(void);
|
||||
void func0f028590(f32 arg0);
|
||||
u32 func0f028a50(void);
|
||||
u32 func0f028d50(void);
|
||||
u32 func0f028e18(void);
|
||||
u32 func0f028e6c(void);
|
||||
u32 func0f028f7c(void);
|
||||
u32 func0f0291d4(void);
|
||||
u32 func0f0292bc(void);
|
||||
u32 func0f02932c(void);
|
||||
u32 func0f0293ec(void);
|
||||
u32 func0f0294cc(void);
|
||||
u32 func0f0295f8(void);
|
||||
u32 func0f0297a0(void);
|
||||
u32 func0f02983c(void);
|
||||
u32 func0f02b7d4(void);
|
||||
u32 func0f02bdf8(void);
|
||||
u32 func0f02c6e0(void);
|
||||
u32 func0f02c9b0(void);
|
||||
u32 func0f02ccb4(void);
|
||||
s32 getNumChrs(void);
|
||||
void chrInsertToChrsC(s32 chrnum, s32 chrindex);
|
||||
void func0f01e760(s32 arg0);
|
||||
void setVar8006297c(u32 arg0);
|
||||
u32 getVar8006297c(void);
|
||||
void setVar80062980(u32 arg0);
|
||||
u32 getVar80062980(void);
|
||||
void chrSetOrUnsetHiddenFlag00000100(struct chrdata *chr, bool unset);
|
||||
void chrSetMaxDamage(struct chrdata *chr, f32 maxdamage);
|
||||
f32 chrGetMaxDamage(struct chrdata *chr);
|
||||
void chrAddHealth(struct chrdata *chr, f32 health);
|
||||
f32 chrGetArmor(struct chrdata *chr);
|
||||
void chrInit(struct prop *prop, u8 *ailist);
|
||||
struct prop *func0f020cc8(s32 arg0, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist);
|
||||
void propClearReferences(s32 propnum);
|
||||
void func0f022084(struct chrdata *chr, s16 *room);
|
||||
void func0f0220ac(struct chrdata *chr);
|
||||
void chrCloak(struct chrdata *chr, bool arg1);
|
||||
void chrUncloak(struct chrdata *chr, bool value);
|
||||
void chrUncloakTemporarily(struct chrdata *chr);
|
||||
void func0f02472c(void);
|
||||
void func0f028490(f32 arg1);
|
||||
struct chrdata *chrFindByLiteralId(s32 chrnum);
|
||||
struct prop *chrGetEquippedWeaponProp(struct chrdata *chr, s32 hand);
|
||||
struct prop *chrGetEquippedWeaponPropWithCheck(struct chrdata *chr, s32 hand);
|
||||
struct prop *chrGetTargetProp(struct chrdata *chr);
|
||||
bool chrUpdateGeometry(struct prop *prop, struct geo **arg1, struct geo **arg2);
|
||||
void propChrGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin);
|
||||
|
||||
#endif
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
#ifndef IN_GAME_SPARKSTICK_H
|
||||
#define IN_GAME_SPARKSTICK_H
|
||||
#include <ultra64.h>
|
||||
#include "types.h"
|
||||
|
||||
void sparksTick(void);
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue