Game-Decompilation/CTR-ModSDK
1
0
Fork 0
mirror of https://github.com/CTR-tools/CTR-ModSDK.git synced 2025-02-18 12:20:27 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

VehGet->VehColl

Browse Source
This commit is contained in:
Niko 2024-03-10 15:06:22 -04:00
parent 5ab6fb988b
commit 848983daed
16 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
decompile/General/Vehicle/VehInit_TireSprites.c
View File

@ -40,7 +40,7 @@ void DECOMP_VehInit_TireSprites(struct Thread *t)
d->numFramesSpentSteering = 10000;
#ifndef REBUILD_PS1
d->terrainMeta1 = VehGetTerrain(10);
d->terrainMeta1 = VehColl_GetTerrain(10);
#endif
d->BattleHUD.numLives = gGT->battleLifeLimit;

4
decompile/WorkInProgress/src/COLL/COLL_StartSearch_NearPlayer.c
View File

@ -275,7 +275,7 @@ void DECOMP_COLL_StartSearch_NearPlayer(struct Thread *th, struct Driver *d)
}
// struct MetaDataScrub*
scrubMeta = VehGetSurface(scrubId);
scrubMeta = VehColl_GetSurface(scrubId);
*(u_short *)&d->fill18_postQuadBlock[6] |= 2;
*(u_int *)(d + 0xac) = *(u_int*)0x1f800170;
@ -362,7 +362,7 @@ void DECOMP_COLL_StartSearch_NearPlayer(struct Thread *th, struct Driver *d)
uVar2 = 0;
// scrub meta
scrubMeta = VehGetSurface(SPS->bspHitbox->id);
scrubMeta = VehColl_GetSurface(SPS->bspHitbox->id);
if ((SPS->bspHitbox->id == 4) ||
(uVar2 = COLL_Scrub(d, th, &SPS->Input1.pos[0], scrubMeta, &d->velocityXYZ[0]), uVar2 == 0))

4
decompile/WorkInProgress/src/VEHICLE/VehGet.c → decompile/WorkInProgress/src/VEHICLE/VehColl.c
View File

@ -2,7 +2,7 @@
// overbudget by 4 bytes each, how?
void* DECOMP_VehGetSurface(u_int scrubId)
void* DECOMP_VehColl_GetSurface(u_int scrubId)
{
if (6 < scrubId)
{
@ -11,7 +11,7 @@ void* DECOMP_VehGetSurface(u_int scrubId)
return &data.MetaDataScrub[scrubId];
}
void* DECOMP_VehGetTerrain(u_char terrainType)
void* DECOMP_VehColl_GetTerrain(u_char terrainType)
{
if (20 < terrainType)
{

10
ghidra/COLL.c
View File

@ -847,7 +847,7 @@ void FUN_8001d944(int param_1,int param_2)
// if driver is high above the quadblock
if (*(int *)(param_2 + 0x2d0) + 0x8000 < *(int *)(param_2 + 0x2d8))
{
// VehGetTerrain (air)
// VehColl_GetTerrain (air)
uVar7 = FUN_80057c68(10);
*(undefined4 *)(param_2 + 0x35c) = uVar7;
}
@ -910,7 +910,7 @@ LAB_8001e4d0:
*(uint *)(param_2 + 0x2c8) = *(uint *)(param_2 + 0x2c8) | 0x40;
}
// VehGetTerrain (air)
// VehColl_GetTerrain (air)
uVar7 = FUN_80057c68(10);
*(undefined4 *)(param_2 + 0x358) = uVar7;
@ -1126,7 +1126,7 @@ LAB_8001e340:
*(byte *)(param_2 + 0xc2) = bVar4;
}
// VehGetTerrain
// VehColl_GetTerrain
uVar7 = FUN_80057c68(uVar6);
*(undefined4 *)(param_2 + 0x358) = uVar7;
*(undefined4 *)(param_2 + 0x35c) = uVar7;
@ -3481,7 +3481,7 @@ void FUN_80020410(undefined4 param_1,int param_2)
*(undefined2 *)(param_2 + 0x364) = uVar2;
}
// VehGetSurface
// VehColl_GetSurface
uVar12 = FUN_80057c44(uVar12);
uVar8 = DAT_1f800170;
@ -3582,7 +3582,7 @@ LAB_800209b0:
iVar5 = 0;
// VehGetSurface
// VehColl_GetSurface
uVar8 = FUN_80057c44((uint)DAT_1f800150[1]);
if ((DAT_1f800150[1] == 4) ||

6
ghidra/zzz_Rest_Of_94426.c
View File

@ -18916,7 +18916,7 @@ void FUN_80057884(undefined *param_1)
}
// VehGetSurface
// VehColl_GetSurface
int FUN_80057c44(uint param_1)
{
@ -18930,7 +18930,7 @@ int FUN_80057c44(uint param_1)
}
// VehGetTerrain
// VehColl_GetTerrain
int FUN_80057c68(uint param_1)
{
@ -20023,7 +20023,7 @@ void FUN_80058c4c(int param_1)
*(undefined2 *)((int)piVar3 + 0x412) = 0x600;
*(undefined2 *)((int)piVar3 + 0x3e6) = 10000;
// VehGetTerrain (air)
// VehColl_GetTerrain (air)
iVar2 = FUN_80057c68(10);
piVar3[0xd6] = iVar2;

4
include/functions.h
View File

@ -936,8 +936,8 @@ void Vector_BakeMatrixTable();
// from this point onwards it's all vehicle stuff
//VehGetSurface()
//VehGetTerrain()
//VehColl_GetSurface()
//VehColl_GetTerrain()
// VehInit

4
symbols/gcc-syms1006.txt
View File

@ -645,8 +645,8 @@ Vector_SpecLightSpin2D = 0x800560a0;
Vector_SpecLightSpin3D = 0x800561ec;
Vector_SpecLightNoSpin3D = 0x80056488;
Vector_BakeMatrixTable = 0x80056654;
VehGetSurface = 0x80056a14;
VehGetTerrain = 0x80056a38;
VehColl_GetSurface = 0x80056a14;
VehColl_GetTerrain = 0x80056a38;
VehInit_TeleportSelf = 0x80056a5c;
VehInit_TeleportAll = 0x80057668;
VehInit_GetModelByName = 0x80057718;

4
symbols/gcc-syms1020.txt
View File

@ -647,8 +647,8 @@ Vector_SpecLightSpin2D = 0x800573b0;
Vector_SpecLightSpin3D = 0x800574fc;
Vector_SpecLightNoSpin3D = 0x80057798;
Vector_BakeMatrixTable = 0x80057964;
VehGetSurface = 0x80057d24;
VehGetTerrain = 0x80057d48;
VehColl_GetSurface = 0x80057d24;
VehColl_GetTerrain = 0x80057d48;
VehInit_TeleportSelf = 0x80057d6c;
VehInit_TeleportAll = 0x80058978;
VehInit_GetModelByName = 0x80058a28;

4
symbols/gcc-syms1111.txt
View File

@ -659,8 +659,8 @@ Vector_SpecLightSpin2D = 0x8005a03c;
Vector_SpecLightSpin3D = 0x8005a188;
Vector_SpecLightNoSpin3D = 0x8005a424;
Vector_BakeMatrixTable = 0x8005a5f0;
VehGetSurface = 0x8005a9b0;
VehGetTerrain = 0x8005a9d4;
VehColl_GetSurface = 0x8005a9b0;
VehColl_GetTerrain = 0x8005a9d4;
VehInit_TeleportSelf = 0x8005a9f8;
VehInit_TeleportAll = 0x8005b608;
VehInit_GetModelByName = 0x8005b6b8;

4
symbols/gcc-syms903.txt
View File

@ -617,8 +617,8 @@ Vector_SpecLightSpin2D = 0x800554f4;
Vector_SpecLightSpin3D = 0x80055640;
Vector_SpecLightNoSpin3D = 0x800558dc;
Vector_BakeMatrixTable = 0x80055aa8;
VehGetSurface = 0x80055e68;
VehGetTerrain = 0x80055e8c;
VehColl_GetSurface = 0x80055e68;
VehColl_GetTerrain = 0x80055e8c;
VehInit_TeleportSelf = 0x80055eb0;
VehInit_TeleportAll = 0x80056988;
VehInit_GetModelByName = 0x80056a38;

4
symbols/gcc-syms926.txt
View File

@ -662,8 +662,8 @@ Vector_SpecLightSpin2D = 0x800572d0;
Vector_SpecLightSpin3D = 0x8005741c;
Vector_SpecLightNoSpin3D = 0x800576b8;
Vector_BakeMatrixTable = 0x80057884;
VehGetSurface = 0x80057c44;
VehGetTerrain = 0x80057c68;
VehColl_GetSurface = 0x80057c44;
VehColl_GetTerrain = 0x80057c68;
VehInit_TeleportSelf = 0x80057c8c;
VehInit_TeleportAll = 0x80058898;
VehInit_GetModelByName = 0x80058948;

4
symbols/syms1006.txt
View File

@ -880,8 +880,8 @@
80056488 Vector_SpecLightNoSpin3D
80056654 Vector_BakeMatrixTable
80056a14 VehGetSurface
80056a38 VehGetTerrain
80056a14 VehColl_GetSurface
80056a38 VehColl_GetTerrain
80056a5c VehInit_TeleportSelf
80057668 VehInit_TeleportAll

4
symbols/syms1020.txt
View File

@ -869,8 +869,8 @@
80057798 Vector_SpecLightNoSpin3D
80057964 Vector_BakeMatrixTable
80057d24 VehGetSurface
80057d48 VehGetTerrain
80057d24 VehColl_GetSurface
80057d48 VehColl_GetTerrain
80057d6c VehInit_TeleportSelf
80058978 VehInit_TeleportAll

4
symbols/syms1111.txt
View File

@ -884,8 +884,8 @@
8005a424 Vector_SpecLightNoSpin3D
8005a5f0 Vector_BakeMatrixTable
8005a9b0 VehGetSurface
8005a9d4 VehGetTerrain
8005a9b0 VehColl_GetSurface
8005a9d4 VehColl_GetTerrain
8005a9f8 VehInit_TeleportSelf
8005b608 VehInit_TeleportAll

4
symbols/syms903.txt
View File

@ -870,8 +870,8 @@
800558dc Vector_SpecLightNoSpin3D
80055aa8 Vector_BakeMatrixTable
80055e68 VehGetSurface
80055e8c VehGetTerrain
80055e68 VehColl_GetSurface
80055e8c VehColl_GetTerrain
80055eb0 VehInit_TeleportSelf
80056988 VehInit_TeleportAll

6
symbols/syms926.txt
View File

@ -829,9 +829,9 @@
800576b8 Vector_SpecLightNoSpin3D
80057884 Vector_BakeMatrixTable
// VehGet
80057c44 VehGetSurface
80057c68 VehGetTerrain
// VehColl
80057c44 VehColl_GetSurface
80057c68 VehColl_GetTerrain
// VehInit
80057c8c VehInit_TeleportSelf