falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Identify setupParseObject

This commit is contained in:
Ryan Dwyer 2019-11-16 17:23:41 +10:00
parent ecf276f11d
commit 7aed121eda
8 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/chr/chr.c
View File

@ -5652,7 +5652,7 @@ glabel func0f022214
/* f022258: 02002025 */ or $a0,$s0,$zero
/* f02225c: 24050001 */ addiu $a1,$zero,0x1
/* f022260: 30cf0004 */ andi $t7,$a2,0x4
/* f022264: 0fc1ab4b */ jal func0f06ad2c
/* f022264: 0fc1ab4b */ jal setupParseObject
/* f022268: 01e03025 */ or $a2,$t7,$zero
/* f02226c: 1000007e */ beqz $zero,.L0f022468
/* f022270: 8fbf002c */ lw $ra,0x2c($sp)

12
src/game/game_066310.c
View File

@ -6728,7 +6728,7 @@ glabel func0f06ac90
);
GLOBAL_ASM(
glabel func0f06ad2c
glabel setupParseObject
/* f06ad2c: 27bdffa0 */ addiu $sp,$sp,-96
/* f06ad30: afbf0024 */ sw $ra,0x24($sp)
/* f06ad34: afb20020 */ sw $s2,0x20($sp)
@ -7169,7 +7169,7 @@ glabel func0f06ad2c
void setupParseObjectWithArg2False(u32 *ptr, bool arg1)
{
func0f06ad2c(ptr, arg1, false);
setupParseObject(ptr, arg1, false);
}
GLOBAL_ASM(
@ -13035,7 +13035,7 @@ glabel func0f0706f8
/* f07072c: 00e02025 */ or $a0,$a3,$zero
/* f070730: 24050001 */ addiu $a1,$zero,0x1
/* f070734: 30d80004 */ andi $t8,$a2,0x4
/* f070738: 0fc1ab4b */ jal func0f06ad2c
/* f070738: 0fc1ab4b */ jal setupParseObject
/* f07073c: 03003025 */ or $a2,$t8,$zero
/* f070740: 10000011 */ beqz $zero,.L0f070788
/* f070744: 8fbf0024 */ lw $ra,0x24($sp)
@ -13084,7 +13084,7 @@ glabel func0f07079c
/* f0707d4: 02202025 */ or $a0,$s1,$zero
/* f0707d8: 24050001 */ addiu $a1,$zero,0x1
/* f0707dc: 30cf0004 */ andi $t7,$a2,0x4
/* f0707e0: 0fc1ab4b */ jal func0f06ad2c
/* f0707e0: 0fc1ab4b */ jal setupParseObject
/* f0707e4: 01e03025 */ or $a2,$t7,$zero
/* f0707e8: 1000004b */ beqz $zero,.L0f070918
/* f0707ec: 8fbf0024 */ lw $ra,0x24($sp)
@ -28752,7 +28752,7 @@ glabel func0f07e758
/* f07e93c: 02002025 */ or $a0,$s0,$zero
/* f07e940: 00002825 */ or $a1,$zero,$zero
/* f07e944: 30d90004 */ andi $t9,$a2,0x4
/* f07e948: 0fc1ab4b */ jal func0f06ad2c
/* f07e948: 0fc1ab4b */ jal setupParseObject
/* f07e94c: 03203025 */ or $a2,$t9,$zero
/* f07e950: 1000035a */ beqz $zero,.L0f07f6bc
/* f07e954: 24020001 */ addiu $v0,$zero,0x1
@ -40450,7 +40450,7 @@ glabel func0f088840
/* f088fc4: 01a02025 */ or $a0,$t5,$zero
/* f088fc8: 00002825 */ or $a1,$zero,$zero
/* f088fcc: 30cf0004 */ andi $t7,$a2,0x4
/* f088fd0: 0fc1ab4b */ jal func0f06ad2c
/* f088fd0: 0fc1ab4b */ jal setupParseObject
/* f088fd4: 01e03025 */ or $a2,$t7,$zero
/* f088fd8: 1000000a */ beqz $zero,.L0f089004
/* f088fdc: 24020001 */ addiu $v0,$zero,0x1

6
src/game/game_0b28d0.c
View File

@ -18438,7 +18438,7 @@ glabel func0f0c2364
/* f0c29ec: 33190004 */ andi $t9,$t8,0x4
/* f0c29f0: 53200004 */ beqzl $t9,.L0f0c2a04
/* f0c29f4: 8e020174 */ lw $v0,0x174($s0)
/* f0c29f8: 0fc1ab4b */ jal func0f06ad2c
/* f0c29f8: 0fc1ab4b */ jal setupParseObject
/* f0c29fc: 00003025 */ or $a2,$zero,$zero
/* f0c2a00: 8e020174 */ lw $v0,0x174($s0)
.L0f0c2a04:
@ -18450,7 +18450,7 @@ glabel func0f0c2364
/* f0c2a18: 31090004 */ andi $t1,$t0,0x4
/* f0c2a1c: 51200004 */ beqzl $t1,.L0f0c2a30
/* f0c2a20: 8faa0100 */ lw $t2,0x100($sp)
/* f0c2a24: 0fc1ab4b */ jal func0f06ad2c
/* f0c2a24: 0fc1ab4b */ jal setupParseObject
/* f0c2a28: 00003025 */ or $a2,$zero,$zero
/* f0c2a2c: 8faa0100 */ lw $t2,0x100($sp)
.L0f0c2a30:
@ -19299,4 +19299,4 @@ glabel func0f0c33f0
/* f0c3614: 00000000 */ sll $zero,$zero,0x0
/* f0c3618: 00000000 */ sll $zero,$zero,0x0
/* f0c361c: 00000000 */ sll $zero,$zero,0x0
);
);

6
src/game/game_176d70.c
View File

@ -19001,7 +19001,7 @@ glabel func0f186898
.L0f186b44:
/* f186b44: 00002825 */ or $a1,$zero,$zero
/* f186b48: 30cf0004 */ andi $t7,$a2,0x4
/* f186b4c: 0fc1ab4b */ jal func0f06ad2c
/* f186b4c: 0fc1ab4b */ jal setupParseObject
/* f186b50: 01e03025 */ or $a2,$t7,$zero
/* f186b54: 100001c7 */ beqz $zero,.L0f187274
/* f186b58: 24020001 */ addiu $v0,$zero,0x1
@ -19486,7 +19486,7 @@ glabel func0f186898
/* f187220: 00002825 */ or $a1,$zero,$zero
/* f187224: 90860002 */ lbu $a2,0x2($a0)
/* f187228: 30ca0004 */ andi $t2,$a2,0x4
/* f18722c: 0fc1ab4b */ jal func0f06ad2c
/* f18722c: 0fc1ab4b */ jal setupParseObject
/* f187230: 01403025 */ or $a2,$t2,$zero
/* f187234: 1000000f */ beqz $zero,.L0f187274
/* f187238: 24020001 */ addiu $v0,$zero,0x1
@ -19808,7 +19808,7 @@ glabel func0f187410
/* f18769c: 00002825 */ or $a1,$zero,$zero
/* f1876a0: 90860002 */ lbu $a2,0x2($a0)
/* f1876a4: 30d80004 */ andi $t8,$a2,0x4
/* f1876a8: 0fc1ab4b */ jal func0f06ad2c
/* f1876a8: 0fc1ab4b */ jal setupParseObject
/* f1876ac: 03003025 */ or $a2,$t8,$zero
/* f1876b0: 10000007 */ beqz $zero,.L0f1876d0
/* f1876b4: 24020001 */ addiu $v0,$zero,0x1

8
src/game/game_187770.c
View File

@ -10740,7 +10740,7 @@ glabel func0f190784
/* f190884: 00002825 */ or $a1,$zero,$zero
/* f190888: 90860002 */ lbu $a2,0x2($a0)
/* f19088c: 30c90004 */ andi $t1,$a2,0x4
/* f190890: 0fc1ab4b */ jal func0f06ad2c
/* f190890: 0fc1ab4b */ jal setupParseObject
/* f190894: 01203025 */ or $a2,$t1,$zero
/* f190898: 12000003 */ beqz $s0,.L0f1908a8
/* f19089c: 00000000 */ sll $zero,$zero,0x0
@ -10837,7 +10837,7 @@ glabel func0f190784
/* f1909ec: 00002825 */ or $a1,$zero,$zero
/* f1909f0: 90860002 */ lbu $a2,0x2($a0)
/* f1909f4: 30ca0004 */ andi $t2,$a2,0x4
/* f1909f8: 0fc1ab4b */ jal func0f06ad2c
/* f1909f8: 0fc1ab4b */ jal setupParseObject
/* f1909fc: 01403025 */ or $a2,$t2,$zero
/* f190a00: 10000073 */ beqz $zero,.L0f190bd0
/* f190a04: 24020002 */ addiu $v0,$zero,0x2
@ -10918,7 +10918,7 @@ glabel func0f190784
/* f190b18: 00002825 */ or $a1,$zero,$zero
/* f190b1c: 90860002 */ lbu $a2,0x2($a0)
/* f190b20: 30ca0004 */ andi $t2,$a2,0x4
/* f190b24: 0fc1ab4b */ jal func0f06ad2c
/* f190b24: 0fc1ab4b */ jal setupParseObject
/* f190b28: 01403025 */ or $a2,$t2,$zero
/* f190b2c: 10000028 */ beqz $zero,.L0f190bd0
/* f190b30: 02001025 */ or $v0,$s0,$zero
@ -10956,7 +10956,7 @@ glabel func0f190784
/* f190bb0: 00002825 */ or $a1,$zero,$zero
/* f190bb4: 90860002 */ lbu $a2,0x2($a0)
/* f190bb8: 30ce0004 */ andi $t6,$a2,0x4
/* f190bbc: 0fc1ab4b */ jal func0f06ad2c
/* f190bbc: 0fc1ab4b */ jal setupParseObject
/* f190bc0: 01c03025 */ or $a2,$t6,$zero
/* f190bc4: 10000002 */ beqz $zero,.L0f190bd0
/* f190bc8: 24020003 */ addiu $v0,$zero,0x3

2
src/game/game_19c990.c
View File

@ -2375,7 +2375,7 @@ glabel func0f19e44c
/* f19e4e0: 26730001 */ addiu $s3,$s3,0x1
/* f19e4e4: 8e510004 */ lw $s1,0x4($s2)
/* f19e4e8: 24060001 */ addiu $a2,$zero,0x1
/* f19e4ec: 0fc1ab4b */ jal func0f06ad2c
/* f19e4ec: 0fc1ab4b */ jal setupParseObject
/* f19e4f0: 02202025 */ or $a0,$s1,$zero
/* f19e4f4: a620004c */ sh $zero,0x4c($s1)
/* f19e4f8: a6400002 */ sh $zero,0x2($s2)

2
src/include/game/game_066310.h
View File

@ -93,7 +93,7 @@ u32 func0f06a730(void);
u32 func0f06ab60(void);
u32 func0f06ac40(void);
u32 func0f06ac90(void);
void func0f06ad2c(u32 *ptr, bool arg1, bool arg2);
void setupParseObject(u32 *ptr, bool arg1, bool arg2);
void setupParseObjectWithArg2False(u32 *ptr, bool arg1);
u32 func0f06b36c(void);
u32 func0f06b39c(void);

13
src/include/props.h
View File

@ -1,6 +1,7 @@
#include "util.h"
// Only used within this file
// len 0x58
#define generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19) \
mkshort(model), \
mkshort(pad), \
@ -53,6 +54,12 @@
mkword(u40), mkword(u41), mkword(u42), mkword(u43), \
mkword(u44), mkword(u45),
#define ammocrate(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, ammotype) \
mkshort(scale), \
mkshort(0x07), \
generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
mkword(ammotype),
#define weapon(scale, model, chr, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, weapon, u20, u21) \
mkshort(scale), \
mkshort(0x08), \
@ -60,12 +67,6 @@
weapon, 0x00, 0x00, 0x00, \
mkword(u20), mkword(u21),
#define ammocrate(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, ammotype) \
mkshort(scale), \
mkshort(0x07), \
generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
mkword(ammotype),
#define chr(unk1, id, pad, body, head, function, target_pad, target_chr, hear_dist, view_dist, props1, bank1flags, team, group, chair, group2, associated) \
mkshort(0), \
mkshort(0x09), \