Game-Decompilation/CTR-ModSDK
1
0
Fork 0
mirror of https://github.com/CTR-tools/CTR-ModSDK.git synced 2024-11-27 07:20:46 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

boolPauseCooldown

Browse Source
This commit is contained in:
Niko 2022-11-29 13:41:44 -05:00
parent 97deefc3ec
commit a6337ad205
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
psx-modding-toolchain/games/CrashTeamRacing/ghidra/231.c
View File

@ -759,7 +759,7 @@ undefined4 FUN_800ac4b8(int param_1)
if (
(
// if instance is valid
// if mineWeapon->crateInst
(piVar5[2] != 0) &&
// instance -> thread
@ -770,7 +770,7 @@ undefined4 FUN_800ac4b8(int param_1)
(iVar2 = *(int *)(iVar2 + 0x30), iVar2 != 0)
)
{
// object -> 0x4
// unpause cooldown (boolPauseCooldown)
*(undefined2 *)(iVar2 + 4) = 0;
}
@ -1269,8 +1269,11 @@ void FUN_800acb60(int param_1)
// from the object attached to thread
iVar5 = *(int *)(*(int *)(iVar5 + 0x6c) + 0x30);
// if mineWeapon->crateInst, if inst->thread, if thread->object
if (((piVar13[2] != 0) && (iVar6 = *(int *)(piVar13[2] + 0x6c), iVar6 != 0)) &&
(iVar6 = *(int *)(iVar6 + 0x30), iVar6 != 0)) {
(iVar6 = *(int *)(iVar6 + 0x30), iVar6 != 0))
{
// unpause cooldown (boolPauseCooldown)
*(undefined2 *)(iVar6 + 4) = 0;
}
@ -6823,6 +6826,7 @@ void FUN_800b3d7c(int param_1)
// if cooldown timer is not done
else
{
// if cooldown is not paused (boolPauseCooldown)
if (*(short *)(piVar3 + 1) == 0)
{
// reduce cooldown
@ -6912,6 +6916,9 @@ LAB_800b420c:
{
return 0;
}
// if modelID is a mine of any kind,
// offset4 = 1, prevent crate from growing back
*(undefined2 *)(piVar9 + 1) = 1;
}
return 0;

5
psx-modding-toolchain/games/CrashTeamRacing/ghidra/The_Rest_Of_94426.c
View File

@ -51759,11 +51759,14 @@ LAB_800659ec:
// RB_Hazard_LevInstColl
FUN_800ad9ac(&DAT_1f800108,*(undefined4 *)(iVar5 + 0x6c));
// InstDef -> modelID
sVar2 = *(short *)(*(int *)(DAT_1f800150 + 0x1c) + 0x3c);
// fruit crate or weapon crate
if ((sVar2 == 7) || (sVar2 == 8))
{
// store threaded instance in mineWeapon offset 0x8
// save mineWeapon->crateInst as...
// InstDef -> ptrInstance
puVar16[2] = *(undefined4 *)(*(int *)(DAT_1f800150 + 0x1c) + 0x2c);
}
else

3
psx-modding-toolchain/games/CrashTeamRacing/include/common.h
View File

@ -2679,6 +2679,9 @@ struct Blade
struct Crate
{
int cooldown;
int boolPauseCooldown;
// 0x8 bytes large
};