From 207262809117ccd2117e4af2ab4df0d297e10b78 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 25 Dec 2019 13:10:38 +1000 Subject: [PATCH] Decompile chrRecordLastVisibleTargetTime --- src/game/chr/chr.c | 37 +++++++++++++++++-------------------- src/game/game_129900.c | 2 +- src/include/game/chr/chr.h | 6 +++--- src/include/types.h | 2 +- 4 files changed, 22 insertions(+), 25 deletions(-) diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index c39822e1a..9c28d4b50 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -12572,7 +12572,7 @@ glabel func0f028590 /* f0286c8: 8fcf0000 */ lw $t7,0x0($s8) /* f0286cc: 8ecc0000 */ lw $t4,0x0($s6) /* f0286d0: 00008825 */ or $s1,$zero,$zero -/* f0286d4: 0fc0e56f */ jal chrSaveLastHearTarget +/* f0286d4: 0fc0e56f */ jal chrRecordLastHearTargetTime /* f0286d8: 02ac2021 */ addu $a0,$s5,$t4 /* f0286dc: 0274082b */ sltu $at,$s3,$s4 /* f0286e0: 50200008 */ beqzl $at,.L0f028704 @@ -30925,13 +30925,10 @@ glabel func0f038b9c /* f038f2c: 27bd0110 */ addiu $sp,$sp,0x110 ); -GLOBAL_ASM( -glabel func0f038f30 -/* f038f30: 3c0e800a */ lui $t6,0x800a -/* f038f34: 8dce9fc8 */ lw $t6,-0x6038($t6) -/* f038f38: 03e00008 */ jr $ra -/* f038f3c: ac8e00e4 */ sw $t6,0xe4($a0) -); +void chrRecordLastVisibleTargetTime(struct chrdata *chr) +{ + chr->lastvisibletarget60 = g_Vars.tickcount; +} GLOBAL_ASM( glabel func0f038f40 @@ -31037,7 +31034,7 @@ glabel func0f038f40 /* f0390b4: afa80010 */ sw $t0,0x10($sp) /* f0390b8: 50400014 */ beqzl $v0,.L0f03910c /* f0390bc: 8fa40054 */ lw $a0,0x54($sp) -/* f0390c0: 0fc0e3cc */ jal func0f038f30 +/* f0390c0: 0fc0e3cc */ jal chrRecordLastVisibleTargetTime /* f0390c4: 8fa40078 */ lw $a0,0x78($sp) /* f0390c8: 240a0001 */ addiu $t2,$zero,0x1 /* f0390cc: 1000000e */ beqz $zero,.L0f039108 @@ -31053,7 +31050,7 @@ glabel func0f038f40 /* f0390ec: afab0010 */ sw $t3,0x10($sp) /* f0390f0: 50400006 */ beqzl $v0,.L0f03910c /* f0390f4: 8fa40054 */ lw $a0,0x54($sp) -/* f0390f8: 0fc0e3cc */ jal func0f038f30 +/* f0390f8: 0fc0e3cc */ jal chrRecordLastVisibleTargetTime /* f0390fc: 8fa40078 */ lw $a0,0x78($sp) /* f039100: 240d0001 */ addiu $t5,$zero,0x1 /* f039104: afad0074 */ sw $t5,0x74($sp) @@ -31240,7 +31237,7 @@ u32 func0f039368(struct chrdata *chr) result = func0f03922c(chr, pos->chr, 0); if (result) { - func0f038f30(chr); + chrRecordLastVisibleTargetTime(chr); } return result; @@ -31390,12 +31387,12 @@ glabel func0f039558 /* f0395a8: 00000000 */ sll $zero,$zero,0x0 ); -void chrSaveLastSeeTarget(struct chrdata *chr) +void chrRecordLastSeeTargetTime(struct chrdata *chr) { chr->lastseetarget60 = g_Vars.tickcount; } -void chrSaveLastHearTarget(struct chrdata *chr) +void chrRecordLastHearTargetTime(struct chrdata *chr) { chr->hidden |= CHRHFLAG_00000002; chr->lastheartarget60 = g_Vars.tickcount; @@ -31689,7 +31686,7 @@ glabel func0f03978c .L0f0399f0: /* f0399f0: 10600004 */ beqz $v1,.L0f039a04 /* f0399f4: 8fa40050 */ lw $a0,0x50($sp) -/* f0399f8: 0fc0e56b */ jal chrSaveLastSeeTarget +/* f0399f8: 0fc0e56b */ jal chrRecordLastSeeTargetTime /* f0399fc: afa30028 */ sw $v1,0x28($sp) /* f039a00: 8fa30028 */ lw $v1,0x28($sp) .L0f039a04: @@ -36171,7 +36168,7 @@ glabel func0f03ddf8 /* f03de28: 00000000 */ sll $zero,$zero,0x0 /* f03de2c: 4502001e */ bc1fl .L0f03dea8 /* f03de30: 02002025 */ or $a0,$s0,$zero -/* f03de34: 0fc0e56b */ jal chrSaveLastSeeTarget +/* f03de34: 0fc0e56b */ jal chrRecordLastSeeTargetTime /* f03de38: 02002025 */ or $a0,$s0,$zero /* f03de3c: 12000003 */ beqz $s0,.L0f03de4c /* f03de40: 00001025 */ or $v0,$zero,$zero @@ -36288,7 +36285,7 @@ glabel func0f03df50 /* f03dfc0: 00000000 */ sll $zero,$zero,0x0 /* f03dfc4: 45020007 */ bc1fl .L0f03dfe4 /* f03dfc8: 8fbf001c */ lw $ra,0x1c($sp) -/* f03dfcc: 0fc0e56b */ jal chrSaveLastSeeTarget +/* f03dfcc: 0fc0e56b */ jal chrRecordLastSeeTargetTime /* f03dfd0: 02002025 */ or $a0,$s0,$zero /* f03dfd4: 02002025 */ or $a0,$s0,$zero /* f03dfd8: 0fc0bb4a */ jal func0f02ed28 @@ -36335,7 +36332,7 @@ glabel func0f03dff4 /* f03e064: 00000000 */ sll $zero,$zero,0x0 /* f03e068: 45020006 */ bc1fl .L0f03e084 /* f03e06c: 8fbf001c */ lw $ra,0x1c($sp) -/* f03e070: 0fc0e56b */ jal chrSaveLastSeeTarget +/* f03e070: 0fc0e56b */ jal chrRecordLastSeeTargetTime /* f03e074: 02002025 */ or $a0,$s0,$zero /* f03e078: 0fc0bb57 */ jal chrStop /* f03e07c: 02002025 */ or $a0,$s0,$zero @@ -40699,7 +40696,7 @@ glabel func0f041e48 /* f042054: 314b0200 */ andi $t3,$t2,0x200 /* f042058: 11600003 */ beqz $t3,.L0f042068 /* f04205c: 00000000 */ sll $zero,$zero,0x0 -/* f042060: 0fc0e56b */ jal chrSaveLastSeeTarget +/* f042060: 0fc0e56b */ jal chrRecordLastSeeTargetTime /* f042064: 02002025 */ or $a0,$s0,$zero .L0f042068: /* f042068: 0fc0bb57 */ jal chrStop @@ -43147,7 +43144,7 @@ glabel func0f044208 /* f044344: 0c0077c1 */ jal func0001df04 /* f044348: 00000000 */ sll $zero,$zero,0x0 .L0f04434c: -/* f04434c: 0fc0e56b */ jal chrSaveLastSeeTarget +/* f04434c: 0fc0e56b */ jal chrRecordLastSeeTargetTime /* f044350: 02002025 */ or $a0,$s0,$zero /* f044354: 0fc0bb57 */ jal chrStop /* f044358: 02002025 */ or $a0,$s0,$zero @@ -43182,7 +43179,7 @@ glabel func0f044208 /* f0443c8: 00000000 */ sll $zero,$zero,0x0 /* f0443cc: 45000007 */ bc1f .L0f0443ec /* f0443d0: 00000000 */ sll $zero,$zero,0x0 -/* f0443d4: 0fc0e56b */ jal chrSaveLastSeeTarget +/* f0443d4: 0fc0e56b */ jal chrRecordLastSeeTargetTime /* f0443d8: 02002025 */ or $a0,$s0,$zero /* f0443dc: 0fc0bb57 */ jal chrStop /* f0443e0: 02002025 */ or $a0,$s0,$zero diff --git a/src/game/game_129900.c b/src/game/game_129900.c index 708aec858..5ecd87af0 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -1200,7 +1200,7 @@ glabel func0f129cfc /* f129e38: 45020005 */ bc1fl .L0f129e50 /* f129e3c: 8eb90000 */ lw $t9,0x0($s5) /* f129e40: 8e380000 */ lw $t8,0x0($s1) -/* f129e44: 0fc0e56f */ jal chrSaveLastHearTarget +/* f129e44: 0fc0e56f */ jal chrRecordLastHearTargetTime /* f129e48: 02182021 */ addu $a0,$s0,$t8 /* f129e4c: 8eb90000 */ lw $t9,0x0($s5) .L0f129e50: diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h index dcdd17eeb..10325995b 100644 --- a/src/include/game/chr/chr.h +++ b/src/include/game/chr/chr.h @@ -221,7 +221,7 @@ u32 func0f03843c(struct chrdata *chr, struct coord *coord, s16 *room_id, u32 spe struct path *pathFindById(u32 path_id); u32 func0f038868(void); void func0f038b9c(struct chrdata *chr, struct path *path); -void func0f038f30(struct chrdata *chr); +void chrRecordLastVisibleTargetTime(struct chrdata *chr); u32 func0f038f40(void); u32 func0f0391ec(struct chrdata *chr, struct coord *coord, s16 *room, u32 arg3); u32 func0f03922c(struct chrdata *chr, void *arg1, s32 arg2); @@ -229,8 +229,8 @@ u32 func0f039368(struct chrdata *chr); u32 func0f0393b4(struct chrdata *chr, struct coord *coord, s16 *room); u32 func0f039474(void); u32 func0f039558(void); -void chrSaveLastSeeTarget(struct chrdata *chr); -void chrSaveLastHearTarget(struct chrdata *chr); +void chrRecordLastSeeTargetTime(struct chrdata *chr); +void chrRecordLastHearTargetTime(struct chrdata *chr); u32 func0f0395d8(struct chrdata *chr); u32 func0f03978c(struct chrdata *chr); u32 func0f039a18(struct chrdata *chr); diff --git a/src/include/types.h b/src/include/types.h index fcd9eed39..9f52d23f9 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -326,7 +326,7 @@ struct chrdata { /*0x0d8*/ u32 lastmoveok60; /*0x0dc*/ f32 visionrange; /*0x0e0*/ s32 lastseetarget60; - /*0x0e4*/ u32 lastvisibletarg; + /*0x0e4*/ s32 lastvisibletarget60; /*0x0e8*/ void *unk0e8; /*0x0ec*/ u16 lastshooter; /*0x0ee*/ u16 timeshooter;