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

Decompile setupParseObjectWithArg2False

This commit is contained in:
Ryan Dwyer 2019-11-16 17:01:24 +10:00
parent ae0321bd9f
commit ecf276f11d
6 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4216,7 +4216,7 @@ glabel func0f020d44
/* f020e64: 0fc20be2 */ jal func0f082f88
/* f020e68: afa6002c */ sw $a2,0x2c($sp)
/* f020e6c: 8fa4002c */ lw $a0,0x2c($sp)
/* f020e70: 0fc1acd3 */ jal func0f06b34c
/* f020e70: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f020e74: 24050001 */ addiu $a1,$zero,0x1
.L0f020e78:
/* f020e78: 1600ffea */ bnez $s0,.L0f020e24

4
src/game/game_015010.c
View File

@ -90,7 +90,7 @@ glabel setupParseObjects
/* f015054: 01c00008 */ jr $t6
/* f015058: 00000000 */ sll $zero,$zero,0x0
/* f01505c: 02002025 */ or $a0,$s0,$zero
/* f015060: 0fc1acd3 */ jal func0f06b34c
/* f015060: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f015064: 24050001 */ addiu $a1,$zero,0x1
.L0f015068:
/* f015068: 0fc24784 */ jal setupGetCommandLength
@ -148,7 +148,7 @@ glabel setupParseObjects
// case OBJTYPE_HOVERVEHICLE:
// case OBJTYPE_ARMEDVEHICLE:
// case OBJTYPE_ESCALATOR:
// func0f06b34c(ptr, 1);
// setupParseObjectWithArg2False(ptr, 1);
// }
//
// ptr = ptr + setupGetCommandLength(ptr);

45
src/game/game_066310.c
View File

@ -7115,7 +7115,7 @@ glabel func0f06ad2c
.L0f06b290:
/* f06b290: 8c440004 */ lw $a0,0x4($v0)
/* f06b294: 24050001 */ addiu $a1,$zero,0x1
/* f06b298: 0fc1acd3 */ jal func0f06b34c
/* f06b298: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f06b29c: afa3002c */ sw $v1,0x2c($sp)
/* f06b2a0: 8fa2002c */ lw $v0,0x2c($sp)
/* f06b2a4: 5440fffa */ bnezl $v0,.L0f06b290
@ -7167,17 +7167,10 @@ glabel func0f06ad2c
/* f06b348: 27bd0060 */ addiu $sp,$sp,0x60
);
GLOBAL_ASM(
glabel func0f06b34c
/* f06b34c: 27bdffe8 */ addiu $sp,$sp,-24
/* f06b350: afbf0014 */ sw $ra,0x14($sp)
/* f06b354: 0fc1ab4b */ jal func0f06ad2c
/* f06b358: 00003025 */ or $a2,$zero,$zero
/* f06b35c: 8fbf0014 */ lw $ra,0x14($sp)
/* f06b360: 27bd0018 */ addiu $sp,$sp,0x18
/* f06b364: 03e00008 */ jr $ra
/* f06b368: 00000000 */ sll $zero,$zero,0x0
);
void setupParseObjectWithArg2False(u32 *ptr, bool arg1)
{
func0f06ad2c(ptr, arg1, false);
}
GLOBAL_ASM(
glabel func0f06b36c
@ -41774,7 +41767,7 @@ glabel func0f089f8c
/* f08a204: 00000000 */ sll $zero,$zero,0x0
/* f08a208: 02092021 */ addu $a0,$s0,$t1
/* f08a20c: 24050001 */ addiu $a1,$zero,0x1
/* f08a210: 0fc1acd3 */ jal func0f06b34c
/* f08a210: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f08a214: afaa0040 */ sw $t2,0x40($sp)
/* f08a218: 3c09800a */ lui $t1,0x800a
/* f08a21c: 8d29ce58 */ lw $t1,-0x31a8($t1)
@ -41808,7 +41801,7 @@ glabel func0f089f8c
/* f08a27c: 01a02025 */ or $a0,$t5,$zero
/* f08a280: 11e00003 */ beqz $t7,.L0f08a290
/* f08a284: 00000000 */ sll $zero,$zero,0x0
/* f08a288: 0fc1acd3 */ jal func0f06b34c
/* f08a288: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f08a28c: 24050001 */ addiu $a1,$zero,0x1
.L0f08a290:
/* f08a290: 1000002f */ beqz $zero,.L0f08a350
@ -41826,7 +41819,7 @@ glabel func0f089f8c
/* f08a2bc: 00000000 */ sll $zero,$zero,0x0
/* f08a2c0: 02092021 */ addu $a0,$s0,$t1
/* f08a2c4: 24050001 */ addiu $a1,$zero,0x1
/* f08a2c8: 0fc1acd3 */ jal func0f06b34c
/* f08a2c8: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f08a2cc: afab003c */ sw $t3,0x3c($sp)
/* f08a2d0: 3c09800a */ lui $t1,0x800a
/* f08a2d4: 8d29ce58 */ lw $t1,-0x31a8($t1)
@ -41860,7 +41853,7 @@ glabel func0f089f8c
/* f08a334: 01c02025 */ or $a0,$t6,$zero
/* f08a338: 13000003 */ beqz $t8,.L0f08a348
/* f08a33c: 00000000 */ sll $zero,$zero,0x0
/* f08a340: 0fc1acd3 */ jal func0f06b34c
/* f08a340: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f08a344: 24050001 */ addiu $a1,$zero,0x1
.L0f08a348:
/* f08a348: 10000001 */ beqz $zero,.L0f08a350
@ -42036,7 +42029,7 @@ glabel func0f08a38c
/* f08a5a0: 51600007 */ beqzl $t3,.L0f08a5c0
/* f08a5a4: 8e8d0000 */ lw $t5,0x0($s4)
/* f08a5a8: 02282021 */ addu $a0,$s1,$t0
/* f08a5ac: 0fc1acd3 */ jal func0f06b34c
/* f08a5ac: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f08a5b0: 24050001 */ addiu $a1,$zero,0x1
/* f08a5b4: 3c08800a */ lui $t0,0x800a
/* f08a5b8: 8d08ce5c */ lw $t0,-0x31a4($t0)
@ -42068,7 +42061,7 @@ glabel func0f08a38c
/* f08a610: 01e02025 */ or $a0,$t7,$zero
/* f08a614: 13000003 */ beqz $t8,.L0f08a624
/* f08a618: 00000000 */ sll $zero,$zero,0x0
/* f08a61c: 0fc1acd3 */ jal func0f06b34c
/* f08a61c: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f08a620: 24050001 */ addiu $a1,$zero,0x1
.L0f08a624:
/* f08a624: 1000002d */ beqz $zero,.L0f08a6dc
@ -42085,7 +42078,7 @@ glabel func0f08a38c
/* f08a64c: 51400007 */ beqzl $t2,.L0f08a66c
/* f08a650: 8e8c0000 */ lw $t4,0x0($s4)
/* f08a654: 02082021 */ addu $a0,$s0,$t0
/* f08a658: 0fc1acd3 */ jal func0f06b34c
/* f08a658: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f08a65c: 24050001 */ addiu $a1,$zero,0x1
/* f08a660: 3c08800a */ lui $t0,0x800a
/* f08a664: 8d08ce5c */ lw $t0,-0x31a4($t0)
@ -42117,7 +42110,7 @@ glabel func0f08a38c
/* f08a6bc: 01c02025 */ or $a0,$t6,$zero
/* f08a6c0: 13000003 */ beqz $t8,.L0f08a6d0
/* f08a6c4: 00000000 */ sll $zero,$zero,0x0
/* f08a6c8: 0fc1acd3 */ jal func0f06b34c
/* f08a6c8: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f08a6cc: 24050001 */ addiu $a1,$zero,0x1
.L0f08a6d0:
/* f08a6d0: 10000002 */ beqz $zero,.L0f08a6dc
@ -42195,7 +42188,7 @@ glabel func0f08a724
/* f08a7c8: 15600009 */ bnez $t3,.L0f08a7f0
/* f08a7cc: 00c72021 */ addu $a0,$a2,$a3
/* f08a7d0: 24050001 */ addiu $a1,$zero,0x1
/* f08a7d4: 0fc1acd3 */ jal func0f06b34c
/* f08a7d4: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f08a7d8: afa60018 */ sw $a2,0x18($sp)
/* f08a7dc: 3c0c800a */ lui $t4,0x800a
/* f08a7e0: 8fa60018 */ lw $a2,0x18($sp)
@ -42230,7 +42223,7 @@ glabel func0f08a724
/* f08a844: 15000009 */ bnez $t0,.L0f08a86c
/* f08a848: 00c72021 */ addu $a0,$a2,$a3
/* f08a84c: 24050001 */ addiu $a1,$zero,0x1
/* f08a850: 0fc1acd3 */ jal func0f06b34c
/* f08a850: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f08a854: afa60018 */ sw $a2,0x18($sp)
/* f08a858: 3c09800a */ lui $t1,0x800a
/* f08a85c: 8fa60018 */ lw $a2,0x18($sp)
@ -42301,7 +42294,7 @@ glabel func0f08a88c
/* f08a930: 15600009 */ bnez $t3,.L0f08a958
/* f08a934: 00c72021 */ addu $a0,$a2,$a3
/* f08a938: 24050001 */ addiu $a1,$zero,0x1
/* f08a93c: 0fc1acd3 */ jal func0f06b34c
/* f08a93c: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f08a940: afa60018 */ sw $a2,0x18($sp)
/* f08a944: 3c0c800a */ lui $t4,0x800a
/* f08a948: 8fa60018 */ lw $a2,0x18($sp)
@ -42336,7 +42329,7 @@ glabel func0f08a88c
/* f08a9ac: 15000009 */ bnez $t0,.L0f08a9d4
/* f08a9b0: 00c72021 */ addu $a0,$a2,$a3
/* f08a9b4: 24050001 */ addiu $a1,$zero,0x1
/* f08a9b8: 0fc1acd3 */ jal func0f06b34c
/* f08a9b8: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f08a9bc: afa60018 */ sw $a2,0x18($sp)
/* f08a9c0: 3c09800a */ lui $t1,0x800a
/* f08a9c4: 8fa60018 */ lw $a2,0x18($sp)
@ -43057,7 +43050,7 @@ glabel func0f08b27c
/* f08b340: 0fc4a640 */ jal func0f129900
/* f08b344: afaa0010 */ sw $t2,0x10($sp)
/* f08b348: 02002025 */ or $a0,$s0,$zero
/* f08b34c: 0fc1acd3 */ jal func0f06b34c
/* f08b34c: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f08b350: 24050001 */ addiu $a1,$zero,0x1
.L0f08b354:
/* f08b354: 0fc180d6 */ jal func0f060358
@ -49696,7 +49689,7 @@ glabel func0f091030
/* f091074: 30680080 */ andi $t0,$v1,0x80
/* f091078: 51000006 */ beqzl $t0,.L0f091094
/* f09107c: 8c420020 */ lw $v0,0x20($v0)
/* f091080: 0fc1acd3 */ jal func0f06b34c
/* f091080: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f091084: 24050001 */ addiu $a1,$zero,0x1
/* f091088: 10000005 */ beqz $zero,.L0f0910a0
/* f09108c: 8fbf0014 */ lw $ra,0x14($sp)

2
src/game/game_097a50.c
View File

@ -9915,7 +9915,7 @@ glabel func0f09fa20
/* f09fa58: 24050001 */ addiu $a1,$zero,0x1
/* f09fa5c: 10c00005 */ beqz $a2,.L0f09fa74
/* f09fa60: 00c02025 */ or $a0,$a2,$zero
/* f09fa64: 0fc1acd3 */ jal func0f06b34c
/* f09fa64: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f09fa68: afa2001c */ sw $v0,0x1c($sp)
/* f09fa6c: 8fa2001c */ lw $v0,0x1c($sp)
/* f09fa70: ac400218 */ sw $zero,0x218($v0)

10
src/game/game_19c990.c
View File

@ -2988,7 +2988,7 @@ glabel func0f19ecdc
/* f19ed80: 8c890014 */ lw $t1,0x14($a0)
/* f19ed84: 51200004 */ beqzl $t1,.L0f19ed98
/* f19ed88: 8e8a0284 */ lw $t2,0x284($s4)
/* f19ed8c: 0fc1acd3 */ jal func0f06b34c
/* f19ed8c: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f19ed90: 24050001 */ addiu $a1,$zero,0x1
/* f19ed94: 8e8a0284 */ lw $t2,0x284($s4)
.L0f19ed98:
@ -3054,7 +3054,7 @@ glabel func0f19ecdc
/* f19ee78: 02002025 */ or $a0,$s0,$zero
/* f19ee7c: 54410005 */ bnel $v0,$at,.L0f19ee94
/* f19ee80: 24010008 */ addiu $at,$zero,0x8
/* f19ee84: 0fc1acd3 */ jal func0f06b34c
/* f19ee84: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f19ee88: 02602825 */ or $a1,$s3,$zero
/* f19ee8c: 92020003 */ lbu $v0,0x3($s0)
/* f19ee90: 24010008 */ addiu $at,$zero,0x8
@ -3098,7 +3098,7 @@ glabel func0f19ecdc
/* f19ef20: 566d0004 */ bnel $s3,$t5,.L0f19ef34
/* f19ef24: 86430002 */ lh $v1,0x2($s2)
.L0f19ef28:
/* f19ef28: 0fc1acd3 */ jal func0f06b34c
/* f19ef28: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f19ef2c: 02602825 */ or $a1,$s3,$zero
/* f19ef30: 86430002 */ lh $v1,0x2($s2)
.L0f19ef34:
@ -6084,7 +6084,7 @@ glabel func0f1a1824
/* f1a1838: 8c84d1a8 */ lw $a0,-0x2e58($a0)
/* f1a183c: 10800003 */ beqz $a0,.L0f1a184c
/* f1a1840: 00000000 */ sll $zero,$zero,0x0
/* f1a1844: 0fc1acd3 */ jal func0f06b34c
/* f1a1844: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f1a1848: 24050001 */ addiu $a1,$zero,0x1
.L0f1a184c:
/* f1a184c: 3c01800b */ lui $at,0x800b
@ -6942,7 +6942,7 @@ glabel func0f1a22d4
/* f1a23e0: 908e0003 */ lbu $t6,0x3($a0)
/* f1a23e4: 566e0004 */ bnel $s3,$t6,.L0f1a23f8
/* f1a23e8: 86030002 */ lh $v1,0x2($s0)
/* f1a23ec: 0fc1acd3 */ jal func0f06b34c
/* f1a23ec: 0fc1acd3 */ jal setupParseObjectWithArg2False
/* f1a23f0: 24050001 */ addiu $a1,$zero,0x1
/* f1a23f4: 86030002 */ lh $v1,0x2($s0)
.L0f1a23f8:

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

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