Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-25 07:29:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Map Object X/Z Pos Accessors

Browse Source
This commit is contained in:
Adrienn Tindall 2024-05-18 13:40:03 -04:00
parent 4ee4ce6fe3
commit 9e862ed632
30 changed files with 236 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/map_object.h
View File

@ -95,7 +95,7 @@ void MapObject_SetDir(MapObject * param0, int param1);
int MapObject_Dir(const MapObject * param0);
int sub_02062990(const MapObject * param0);
void sub_02062994(MapObject * param0, int param1);
int sub_0206299C(const MapObject * param0);
int MapObject_MoveDir(const MapObject * param0);
void sub_020629A0(MapObject * param0, int param1);
void sub_020629B4(MapObject * param0, int param1, int param2);
int sub_020629D8(const MapObject * param0, int param1);
@ -196,19 +196,19 @@ int sub_02062FF8(const MapObject * param0);
void sub_02062FFC(MapObject * param0, int param1);
int sub_02063000(const MapObject * param0);
void sub_02063004(MapObject * param0, int param1);
int sub_02063008(const MapObject * param0);
int MapObject_XPosPrev(const MapObject * param0);
void sub_0206300C(MapObject * param0, int param1);
int sub_02063010(const MapObject * param0);
void sub_02063014(MapObject * param0, int param1);
int sub_02063018(const MapObject * param0);
int MapObject_ZPosPrev(const MapObject * param0);
void sub_0206301C(MapObject * param0, int param1);
int sub_02063020(const MapObject * param0);
int MapObject_XPos(const MapObject * param0);
void LocalMapObj_SetX(MapObject * param0, int param1);
void sub_02063028(MapObject * param0, int param1);
int sub_02063030(const MapObject * param0);
void sub_02063034(MapObject * param0, int param1);
void sub_02063038(MapObject * param0, int param1);
int sub_02063040(const MapObject * param0);
int MapObject_ZPos(const MapObject * param0);
void LocalMapObj_SetZ(MapObject * param0, int param1);
void sub_02063048(MapObject * param0, int param1);
void sub_02063050(const MapObject * param0, VecFx32 * param1);

6
include/player_avatar.h
View File

@ -18,12 +18,12 @@ void Player_DeleteAll(PlayerAvatar * param0);
MapObject * sub_0205EA24(const MapObjectManager * param0);
int Player_Dir(PlayerAvatar * const param0);
void Player_SetDir(PlayerAvatar * param0, int param1);
int sub_0205EA94(PlayerAvatar * const param0);
int PlayerAvatar_MoveDir(PlayerAvatar * const param0);
int sub_0205EAA0(PlayerAvatar * const param0);
int Player_XPos(PlayerAvatar * const param0);
int Player_ZPos(PlayerAvatar * const param0);
int sub_0205EAD4(PlayerAvatar * const param0);
int sub_0205EAE0(PlayerAvatar * const param0);
int PlayerAvatar_XPosPrev(PlayerAvatar * const param0);
int PlayerAvatar_ZPosPrev(PlayerAvatar * const param0);
void sub_0205EAEC(PlayerAvatar * const param0, VecFx32 * param1);
const VecFx32 * sub_0205EAFC(PlayerAvatar * const param0);
void sub_0205EB08(PlayerAvatar * param0, int param1);

24
src/map_object.c
View File

@ -504,7 +504,7 @@ static void sub_02061D3C (FieldSystem * param0, MapObject * param1, UnkStruct_02
param2->unk_18 = sub_02062960(param1);
param2->unk_0C = sub_02062968(param1);
param2->unk_0D = MapObject_Dir(param1);
param2->unk_0E = sub_0206299C(param1);
param2->unk_0E = MapObject_MoveDir(param1);
param2->unk_1A = sub_020629D8(param1, 0);
param2->unk_1C = sub_020629D8(param1, 1);
param2->unk_1E = sub_020629D8(param1, 2);
@ -513,9 +513,9 @@ static void sub_02061D3C (FieldSystem * param0, MapObject * param1, UnkStruct_02
param2->unk_20 = sub_02062FF0(param1);
param2->unk_22 = sub_02062FF8(param1);
param2->unk_24 = sub_02063000(param1);
param2->unk_26 = sub_02063020(param1);
param2->unk_26 = MapObject_XPos(param1);
param2->unk_28 = sub_02063030(param1);
param2->unk_2A = sub_02063040(param1);
param2->unk_2A = MapObject_ZPos(param1);
{
VecFx32 v0;
@ -606,14 +606,14 @@ static void sub_02062010 (MapObject * param0)
sub_02063050(param0, &v1);
v0 = sub_02063020(param0);
v0 = MapObject_XPos(param0);
v1.x = (((v0) << 4) * FX32_ONE) + (((16 * FX32_ONE) >> 1));
sub_0206300C(param0, v0);
v0 = sub_02063030(param0);
sub_02063014(param0, v0);
v0 = sub_02063040(param0);
v0 = MapObject_ZPos(param0);
v1.z = (((v0) << 4) * FX32_ONE) + (((16 * FX32_ONE) >> 1));
sub_0206301C(param0, v0);
@ -1387,7 +1387,7 @@ void sub_02062994 (MapObject * param0, int param1)
param0->unk_2C = param1;
}
int sub_0206299C (const MapObject * param0)
int MapObject_MoveDir (const MapObject * param0)
{
return param0->unk_2C;
}
@ -2091,7 +2091,7 @@ void sub_02063004 (MapObject * param0, int param1)
param0->unk_54 = param1;
}
int sub_02063008 (const MapObject * param0)
int MapObject_XPosPrev (const MapObject * param0)
{
return param0->unk_58;
}
@ -2111,7 +2111,7 @@ void sub_02063014 (MapObject * param0, int param1)
param0->unk_5C = param1;
}
int sub_02063018 (const MapObject * param0)
int MapObject_ZPosPrev (const MapObject * param0)
{
return param0->unk_60;
}
@ -2121,7 +2121,7 @@ void sub_0206301C (MapObject * param0, int param1)
param0->unk_60 = param1;
}
int sub_02063020 (const MapObject * param0)
int MapObject_XPos (const MapObject * param0)
{
return param0->unk_64;
}
@ -2151,7 +2151,7 @@ void sub_02063038 (MapObject * param0, int param1)
param0->unk_68 += param1;
}
int sub_02063040 (const MapObject * param0)
int MapObject_ZPos (const MapObject * param0)
{
return param0->unk_6C;
}
@ -2487,12 +2487,12 @@ MapObject * sub_0206326C (const MapObjectManager * param0, int param1, int param
do {
if (sub_020628D0(v1, (1 << 0))) {
if (param3) {
if ((sub_02063008(v1) == param1) && (sub_02063018(v1) == param2)) {
if ((MapObject_XPosPrev(v1) == param1) && (MapObject_ZPosPrev(v1) == param2)) {
return v1;
}
}
if ((sub_02063020(v1) == param1) && (sub_02063040(v1) == param2)) {
if ((MapObject_XPos(v1) == param1) && (MapObject_ZPos(v1) == param2)) {
return v1;
}
}

4
src/overlay005/ov5_021D1C30.c
View File

@ -1151,9 +1151,9 @@ static BOOL ov5_021D2EA4 (FieldSystem * fieldSystem, MapObject ** param1)
sub_020617BC(fieldSystem->playerAvatar, &v1, &v2, &v3);
while (sub_020625B0(fieldSystem->mapObjMan, param1, &v0, (1 << 0))) {
v4 = sub_02063020(*param1);
v4 = MapObject_XPos(*param1);
v5 = ((sub_02063030(*param1) / 2));
v6 = sub_02063040(*param1);
v6 = MapObject_ZPos(*param1);
if ((v2 == v5) && (v1 == v4) && (v3 == v6)) {
return 1;

4
src/overlay005/ov5_021DB888.c
View File

@ -500,8 +500,8 @@ static void ov5_021DBA7C (UnkStruct_ov5_021DBA58 * param0)
case 0x6:
case 0x7:
case 0x8:
v0 = sub_02063020(v11);
v1 = sub_02063040(v11);
v0 = MapObject_XPos(v11);
v1 = MapObject_ZPos(v11);
if ((v0 >= v7) && (v0 <= v8) && (v1 >= v9) && (v1 <= v10)) {
if (ov5_021DBB70(sub_02062948(v11)) == 0) {

18
src/overlay005/ov5_021DFB54.c
View File

@ -268,7 +268,7 @@ static void ov5_021DFC3C (PlayerAvatar * param0)
if (sub_0205F16C(param0) == 1) {
v1 = Player_Dir(param0);
} else {
v1 = sub_0205EA94(param0);
v1 = PlayerAvatar_MoveDir(param0);
}
if (v4 == 0) {
@ -650,9 +650,9 @@ static BOOL ov5_021E0160 (TaskManager * param0)
v0->unk_28 = ov5_021F261C(v0->unk_24, v1, v2, v0->unk_04, 0);
} else {
int v3 = sub_02063020(v0->unk_24);
int v3 = MapObject_XPos(v0->unk_24);
int v4 = ((sub_02063030(v0->unk_24) / 2));
int v5 = sub_02063040(v0->unk_24);
int v5 = MapObject_ZPos(v0->unk_24);
int v6 = sub_0205F108(v0->unk_20);
sub_02061674(v0->unk_20, v0->unk_04, &v3, &v4, &v5);
@ -942,7 +942,7 @@ static int ov5_021E06A8 (FieldSystem * param0, PlayerAvatar * param1)
}
{
int v0 = sub_0205EA94(param1);
int v0 = PlayerAvatar_MoveDir(param1);
MapObject * v1 = ov5_021E10D4(param1, v0);
if (v1 == NULL) {
@ -1096,7 +1096,7 @@ static int ov5_021E08C0 (UnkStruct_ov5_021F9B54 * param0)
}
{
int v0 = sub_0206299C(param0->unk_14);
int v0 = MapObject_MoveDir(param0->unk_14);
u8 v1 = sub_02064238(param0->unk_14, v0);
if (ov5_021E0760(v1, v0) == 1) {
@ -1226,8 +1226,8 @@ static int ov5_021E0A68 (UnkStruct_ov5_021F9B10 * param0)
int v0, v1;
VecFx32 v2, v3;
v0 = sub_02063020(param0->unk_3C) + (sub_0206419C(0) << 1);
v1 = sub_02063040(param0->unk_3C) + (sub_020641A8(0) << 1);
v0 = MapObject_XPos(param0->unk_3C) + (sub_0206419C(0) << 1);
v1 = MapObject_ZPos(param0->unk_3C) + (sub_020641A8(0) << 1);
sub_02064450(v0, v1, &param0->unk_28);
sub_020644A4(param0->unk_34, &param0->unk_28);
@ -1351,8 +1351,8 @@ static int ov5_021E0C34 (UnkStruct_ov5_021F9B10 * param0)
int v0, v1;
VecFx32 v2, v3;
v0 = sub_02063020(param0->unk_3C) + (sub_0206419C(1) << 1);
v1 = sub_02063040(param0->unk_3C) + (sub_020641A8(1) << 1);
v0 = MapObject_XPos(param0->unk_3C) + (sub_0206419C(1) << 1);
v1 = MapObject_ZPos(param0->unk_3C) + (sub_020641A8(1) << 1);
sub_02064450(v0, v1, &param0->unk_28);
sub_020644A4(param0->unk_34, &param0->unk_28);

4
src/overlay005/ov5_021F1CC8.c
View File

@ -188,8 +188,8 @@ static UnkStruct_ov101_021D5D90 * ov5_021F1ECC (const MapObject * param0, int pa
VecFx32 v0;
UnkStruct_ov101_021D5D90 * v1;
UnkStruct_021F1FB8 v2;
int v3 = sub_02063008(param0);
int v4 = sub_02063018(param0);
int v3 = MapObject_XPosPrev(param0);
int v4 = MapObject_ZPosPrev(param0);
fx32 v5 = sub_02063074(param0);
int v6 = MapObject_Dir(param0);
int v7 = sub_02062990(param0);

8
src/overlay005/ov5_021F2D20.c
View File

@ -157,9 +157,9 @@ void ov5_021F2EA4 (MapObject * param0, int param1)
v3 = ov5_021DF578(param0);
v2.unk_00 = sub_02063020(param0);
v2.unk_00 = MapObject_XPos(param0);
v2.unk_04 = sub_02063030(param0);
v2.unk_08 = sub_02063040(param0);
v2.unk_08 = MapObject_ZPos(param0);
v2.unk_10 = v3;
v2.unk_0C = ov5_021DF574(v3);
v2.unk_14 = ov5_021DF55C(v3, 19);
@ -265,8 +265,8 @@ static void ov5_021F2FAC (UnkStruct_ov101_021D5D90 * param0, void * param1)
{
int v5, v6;
v5 = sub_02063020(v2);
v6 = sub_02063040(v2);
v5 = MapObject_XPos(v2);
v6 = MapObject_ZPos(v2);
if ((v1->unk_18.unk_00 != v5) || (v1->unk_18.unk_08 != v6)) {
ov5_021DF74C(param0);

2
src/overlay005/ov5_021F348C.c
View File

@ -120,7 +120,7 @@ static void ov5_021F35E8 (UnkStruct_ov5_021DF47C * param0, MapObject * param1, U
param2->unk_0C = param1;
sub_02063050(param1, param3);
sub_02064450(sub_02063020(param1), sub_02063040(param1), param3);
sub_02064450(MapObject_XPos(param1), MapObject_ZPos(param1), param3);
*param4 = sub_02062758(param1, 2);
}

8
src/overlay005/ov5_021F37A8.c
View File

@ -93,9 +93,9 @@ void ov5_021F3844 (MapObject * param0, int param1)
v3 = ov5_021DF578(param0);
v2.unk_00 = sub_02063020(param0);
v2.unk_00 = MapObject_XPos(param0);
v2.unk_04 = sub_02063030(param0);
v2.unk_08 = sub_02063040(param0);
v2.unk_08 = MapObject_ZPos(param0);
v2.unk_10 = v3;
v2.unk_0C = ov5_021DF574(v3);
v2.unk_14 = ov5_021DF55C(v3, 24);
@ -195,8 +195,8 @@ static void ov5_021F394C (UnkStruct_ov101_021D5D90 * param0, void * param1)
v1->unk_00 = 2;
case 2:
{
int v5 = sub_02063020(v2);
int v6 = sub_02063040(v2);
int v5 = MapObject_XPos(v2);
int v6 = MapObject_ZPos(v2);
if ((v1->unk_18.unk_00 != v5) || (v1->unk_18.unk_08 != v6)) {
ov5_021DF74C(param0);

8
src/overlay005/ov5_021F3A50.c
View File

@ -93,9 +93,9 @@ void ov5_021F3AEC (MapObject * param0, int param1)
v3 = ov5_021DF578(param0);
v2.unk_00 = sub_02063020(param0);
v2.unk_00 = MapObject_XPos(param0);
v2.unk_04 = sub_02063030(param0);
v2.unk_08 = sub_02063040(param0);
v2.unk_08 = MapObject_ZPos(param0);
v2.unk_10 = v3;
v2.unk_0C = ov5_021DF574(v3);
v2.unk_14 = ov5_021DF55C(v3, 25);
@ -196,8 +196,8 @@ static void ov5_021F3C00 (UnkStruct_ov101_021D5D90 * param0, void * param1)
v1->unk_00 = 2;
case 2:
{
int v5 = sub_02063020(v2);
int v6 = sub_02063040(v2);
int v5 = MapObject_XPos(v2);
int v6 = MapObject_ZPos(v2);
if ((v1->unk_18.unk_00 != v5) || (v1->unk_18.unk_08 != v6)) {
ov5_021DF74C(param0);

4
src/overlay005/ov5_021F3D00.c
View File

@ -101,8 +101,8 @@ UnkStruct_ov101_021D5D90 * ov5_021F3D90 (MapObject * param0, int param1)
{
FieldSystem * v4 = ov5_021DF574(v3);
int v5 = sub_02063020(param0);
int v6 = sub_02063040(param0);
int v5 = MapObject_XPos(param0);
int v6 = MapObject_ZPos(param0);
sub_02064450(v5, v6, &v0);
sub_020644A4(v4, &v0);

2
src/overlay005/ov5_021F3E74.c
View File

@ -95,7 +95,7 @@ void ov5_021F3F10 (MapObject * param0)
v0.unk_0C = param0;
sub_02063050(param0, &v3);
sub_02064450(sub_02063020(param0), sub_02063040(param0), &v3);
sub_02064450(MapObject_XPos(param0), MapObject_ZPos(param0), &v3);
v4 = sub_02062758(param0, 2);
v2 = ov5_021DF72C(v1, &Unk_ov5_0220069C, &v3, 0, &v0, v4);

4
src/overlay005/ov5_021F47B0.c
View File

@ -262,9 +262,9 @@ static int ov5_021F4AB4 (const MapObject * param0, int param1, VecFx32 * param2)
GF_ASSERT(param1);
v4 = sub_02063020(param0);
v4 = MapObject_XPos(param0);
v5 = sub_02063030(param0);
v6 = sub_02063040(param0);
v6 = MapObject_ZPos(param0);
v3 = MapObject_Dir(param0);
sub_02063050(param0, &v1);

4
src/overlay005/ov5_021F61BC.c
View File

@ -157,8 +157,8 @@ static void ov5_021F62A0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
{
VecFx32 v4, v5;
int v6 = sub_02063020(v3) + sub_0206419C(v1->unk_04);
int v7 = sub_02063040(v3) + sub_020641A8(v1->unk_04);
int v6 = MapObject_XPos(v3) + sub_0206419C(v1->unk_04);
int v7 = MapObject_ZPos(v3) + sub_020641A8(v1->unk_04);
sub_02064450(v6, v7, &v5);
sub_02063050(v3, &v4);

2
src/overlay005/ov5_021F6454.c
View File

@ -1106,7 +1106,7 @@ BOOL ScrCmd_338 (ScriptContext * ctx)
MapObject * v1 = MapObjMan_LocalMapObjByIndex(ctx->fieldSys->mapObjMan, 15);
if (v1 != NULL)
{
switch (sub_02063020(v1))
switch (MapObject_XPos(v1))
{
case 28:
v0 = 6;

2
src/overlay005/ov5_021F8560.c
View File

@ -169,7 +169,7 @@ static void ov5_021F86E4 (UnkStruct_ov101_021D5D90 * param0, void * param1)
return;
}
v0->unk_04 = sub_0206299C(v1);
v0->unk_04 = MapObject_MoveDir(v1);
v0->unk_34 = sub_0205F108(v2);
GF_ASSERT(v0->unk_04 != -1);

4
src/overlay006/ov6_0223E140.c
View File

@ -842,9 +842,9 @@ static void ov6_0223E7B4 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy
v1 = MapObjMan_LocalMapObjByIndex(fieldSystem->mapObjMan, 0);
GF_ASSERT(v1);
v2 = sub_02063020(v1);
v2 = MapObject_XPos(v1);
v3 = 0;
v4 = sub_02063040(v1);
v4 = MapObject_ZPos(v1);
v0->unk_00 = ov6_02240768(4);
ov6_0224077C(v0->unk_00, v2, v3, v4);

4
src/overlay006/ov6_02248050.c
View File

@ -79,8 +79,8 @@ static void ov6_02248050 (MapObjectManager * param0, u32 param1, UnkStruct_02017
sub_02063050(v4, &v3);
v1 = sub_02063020(v4);
v2 = sub_02063040(v4);
v1 = MapObject_XPos(v4);
v2 = MapObject_ZPos(v4);
v0 = MapObject_Dir(v4);
switch (v0) {

12
src/overlay008/ov8_02249960.c
View File

@ -2740,8 +2740,8 @@ static BOOL ov8_0224B2E8 (UnkStruct_ov8_0224B28C * param0)
if (LocalMapObj_IsAnimationSet(param0->unk_20) == 1) {
int v1 = 0x9a;
int v2 = sub_02063020(v0);
int v3 = sub_02063040(v0);
int v2 = MapObject_XPos(v0);
int v3 = MapObject_ZPos(v0);
if ((v2 == param0->unk_08) && (v3 == param0->unk_0C)) {
return 1;
@ -3151,8 +3151,8 @@ static MapObject * ov8_0224B7D8 (FieldSystem * fieldSystem, int param1, int para
static void ov8_0224B80C (UnkStruct_ov8_0224B80C * param0, MapObject * param1, FieldSystem * param2)
{
param0->unk_08 = param1;
param0->unk_00 = sub_02063020(param1);
param0->unk_04 = sub_02063040(param1);
param0->unk_00 = MapObject_XPos(param1);
param0->unk_04 = MapObject_ZPos(param1);
if (sub_020629D8(param1, 0) == 0) {
param0->unk_0C = ov5_021F4474(param2, param0->unk_00, param0->unk_04, 0);
@ -4124,8 +4124,8 @@ BOOL ov8_0224C5DC (FieldSystem * fieldSystem, void * param1)
{
MapObject * v1 = param1;
sub_02062FF4(v1, sub_02063020(v1));
sub_02063004(v1, sub_02063040(v1));
sub_02062FF4(v1, MapObject_XPos(v1));
sub_02063004(v1, MapObject_ZPos(v1));
sub_020629FC(v1, 2);
sub_02062A04(v1, 2);
sub_020633A8(v1, 0x3);

52
src/overlay009/ov9_02249960.c
View File

@ -2493,7 +2493,7 @@ static BOOL ov9_0224AC58 (UnkStruct_ov9_0224AC58 * param0, MapObject * param1)
if (param0->unk_1C.x >= (16 * FX32_ONE)) {
param0->unk_1C.x -= (16 * FX32_ONE);
v2 = sub_02063020(param1);
v2 = MapObject_XPos(param1);
if (v0->unk_14 > 0) {
v2++;
@ -2525,7 +2525,7 @@ static BOOL ov9_0224AC58 (UnkStruct_ov9_0224AC58 * param0, MapObject * param1)
if (param0->unk_1C.z >= (16 * FX32_ONE)) {
param0->unk_1C.z -= (16 * FX32_ONE);
v2 = sub_02063040(param1);
v2 = MapObject_ZPos(param1);
if (v0->unk_18 > 0) {
v2++;
@ -3357,8 +3357,8 @@ static void ov9_0224BA6C (UnkStruct_ov101_021D5D90 * param0, void * param1)
while (sub_020625B0(
v8, &v9, &v6, (1 << 0)) == 1) {
if (sub_02063030(v9) == v7) {
if (sub_02063040(v9) == v2->unk_08.unk_0A) {
if (sub_02063020(v9) == v2->unk_08.unk_06) {
if (MapObject_ZPos(v9) == v2->unk_08.unk_0A) {
if (MapObject_XPos(v9) == v2->unk_08.unk_06) {
v4 = 1;
break;
}
@ -5002,11 +5002,11 @@ static int ov9_0224D0C8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078
param1->unk_44.x = 0;
param1->unk_44.y = 0;
param1->unk_44.z = 0;
param1->unk_0A = sub_02063020(v1);
param1->unk_0A = MapObject_XPos(v1);
param1->unk_0A += v3->unk_04;
param1->unk_0C = sub_02063030(v1);
param1->unk_0C += ((v3->unk_06) * 2);
param1->unk_0E = sub_02063040(v1);
param1->unk_0E = MapObject_ZPos(v1);
param1->unk_0E += v3->unk_08;
param1->unk_2C.x = (((v3->unk_04) << 4) * FX32_ONE);
param1->unk_2C.y = (((v3->unk_06) << 4) * FX32_ONE);
@ -5329,7 +5329,7 @@ static int ov9_0224D69C (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078
v1 = MapObjMan_LocalMapObjByIndex(param0->unk_00->mapObjMan, (0x80 + 6));
GF_ASSERT(v1 != NULL);
v0 = sub_02063020(v1);
v0 = MapObject_XPos(v1);
GF_ASSERT((u32)(v0 - 88) < 3);
v2 = Unk_ov9_02251384[v0 - 88];
@ -5884,9 +5884,9 @@ static void ov9_0224DF10 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0D
param1->unk_00 = 1;
param1->unk_02 = v1;
param1->unk_04 = *v4;
param1->unk_04.unk_02 = sub_02063020(param2);
param1->unk_04.unk_02 = MapObject_XPos(param2);
param1->unk_04.unk_04 = sub_02063030(param2);
param1->unk_04.unk_06 = sub_02063040(param2);
param1->unk_04.unk_06 = MapObject_ZPos(param2);
param1->unk_04.unk_08 = v3;
param1->unk_1C = param2;
param1->unk_20 = ov9_0224DFA0(param0, param1);
@ -6512,9 +6512,9 @@ static int ov9_0224E798 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1,
if (v0->unk_02 == 1) {
MapObject * v1 = Player_MapObject(param0->unk_00->playerAvatar);
int v2 = sub_02063020(v1) + v0->unk_06;
int v2 = MapObject_XPos(v1) + v0->unk_06;
int v3 = sub_02063030(v1) + ((v0->unk_08) * 2);
int v4 = sub_02063040(v1) + v0->unk_0A;
int v4 = MapObject_ZPos(v1) + v0->unk_0A;
LocalMapObj_SetX(v1, v2);
sub_02063034(v1, v3);
@ -7394,8 +7394,8 @@ BOOL ov9_0224F240 (const MapObject * param0, int param1)
v4 = sub_02062C00(param0);
v3 = v4->unk_1C->unk_00;
v0 = sub_02063020(param0);
v1 = sub_02063040(param0);
v0 = MapObject_XPos(param0);
v1 = MapObject_ZPos(param0);
v0 += sub_0206419C(param1);
v1 += sub_020641A8(param1);
@ -7410,8 +7410,8 @@ static BOOL ov9_0224F284 (const MapObject * param0, u32 * param1)
v3 = sub_02062C00(param0);
v2 = v3->unk_1C->unk_00;
v0 = sub_02063020(param0);
v1 = sub_02063040(param0);
v0 = MapObject_XPos(param0);
v1 = MapObject_ZPos(param0);
return ov9_0224F1F8(v2, v0, v1, param1);
}
@ -7511,7 +7511,7 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0)
sub_02063050(v1, &v0);
v0.y -= FX32_ONE * 2;
sub_02063060(v1, &v0);
sub_020642A4(v1, sub_0206299C(v1), (FX32_ONE * 2));
sub_020642A4(v1, MapObject_MoveDir(v1), (FX32_ONE * 2));
}
param0->unk_18++;
@ -7568,10 +7568,10 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0)
LocalMapObj_SetId(v6, v4);
{
int v7 = sub_0206299C(v6);
int v8 = sub_02063020(v6);
int v7 = MapObject_MoveDir(v6);
int v8 = MapObject_XPos(v6);
int v9 = sub_02063030(v6);
int v10 = sub_02063040(v6);
int v10 = MapObject_ZPos(v6);
v8 += sub_0206419C(v7);
v9 -= (2 * 2);
@ -7680,7 +7680,7 @@ static BOOL ov9_0224F5D8 (UnkStruct_ov9_0224F6EC * param0)
sub_02063050(v1, &v0);
v0.y -= FX32_ONE * 2;
sub_02063060(v1, &v0);
sub_020642A4(v1, sub_0206299C(v1), (FX32_ONE * 2));
sub_020642A4(v1, MapObject_MoveDir(v1), (FX32_ONE * 2));
}
param0->unk_18++;
@ -8303,9 +8303,9 @@ static int ov9_0224FEDC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1,
const UnkStruct_ov9_0224F8C4 * v12 = &v11->unk_00;
VecFx32 v13 = {0, 0, 0};
v8 = sub_02063020(v2) + v12->unk_06;
v8 = MapObject_XPos(v2) + v12->unk_06;
v9 = sub_02063030(v2) + ((v12->unk_08) * 2);
v10 = sub_02063040(v2) + v12->unk_0A;
v10 = MapObject_ZPos(v2) + v12->unk_0A;
LocalMapObj_SetX(v2, v8);
sub_02063034(v2, v9);
@ -8621,9 +8621,9 @@ static int ov9_02250468 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1,
const UnkStruct_ov9_0224F8C4 * v12 = &v11->unk_00;
VecFx32 v13 = {0, 0, 0};
v8 = sub_02063020(v2) + v12->unk_06;
v8 = MapObject_XPos(v2) + v12->unk_06;
v9 = sub_02063030(v2) + ((v12->unk_08) * 2);
v10 = sub_02063040(v2) + v12->unk_0A;
v10 = MapObject_ZPos(v2) + v12->unk_0A;
LocalMapObj_SetX(v2, v8);
sub_02063034(v2, v9);
@ -9499,10 +9499,10 @@ static void ov9_02250F44 (UnkStruct_ov9_02249B04 * param0, int * param1, int * p
{
MapObject * v0 = Player_MapObject(param0->unk_00->playerAvatar);
*param1 = sub_02063020(v0);
*param1 = MapObject_XPos(v0);
*param2 = sub_02063030(v0);
*param2 = ((*param2) / 2);
*param3 = sub_02063040(v0);
*param3 = MapObject_ZPos(v0);
}
BOOL ov9_02250F74 (FieldSystem * param0)

18
src/player_avatar.c
View File

@ -209,9 +209,9 @@ void Player_SetDir (PlayerAvatar * playerAvatar, int dir)
MapObject_SetDir(Player_MapObject(playerAvatar), dir);
}
int sub_0205EA94 (PlayerAvatar * const playerAvatar)
int PlayerAvatar_MoveDir (PlayerAvatar * const playerAvatar)
{
return sub_0206299C(Player_MapObject(playerAvatar));
return MapObject_MoveDir(Player_MapObject(playerAvatar));
}
int sub_0205EAA0 (PlayerAvatar * const playerAvatar)
@ -220,27 +220,27 @@ int sub_0205EAA0 (PlayerAvatar * const playerAvatar)
return Player_Dir(playerAvatar);
}
return sub_0205EA94(playerAvatar);
return PlayerAvatar_MoveDir(playerAvatar);
}
int Player_XPos (PlayerAvatar * const playerAvatar)
{
return sub_02063020(Player_MapObject(playerAvatar));
return MapObject_XPos(Player_MapObject(playerAvatar));
}
int Player_ZPos (PlayerAvatar * const playerAvatar)
{
return sub_02063040(Player_MapObject(playerAvatar));
return MapObject_ZPos(Player_MapObject(playerAvatar));
}
int sub_0205EAD4 (PlayerAvatar * const playerAvatar)
int PlayerAvatar_XPosPrev (PlayerAvatar * const playerAvatar)
{
return sub_02063008(Player_MapObject(playerAvatar));
return MapObject_XPosPrev(Player_MapObject(playerAvatar));
}
int sub_0205EAE0 (PlayerAvatar * const playerAvatar)
int PlayerAvatar_ZPosPrev (PlayerAvatar * const playerAvatar)
{
return sub_02063018(Player_MapObject(playerAvatar));
return MapObject_ZPosPrev(Player_MapObject(playerAvatar));
}
void sub_0205EAEC (PlayerAvatar * const playerAvatar, VecFx32 * param1)

14
src/unk_0203F6C4.c
View File

@ -3004,8 +3004,8 @@ static BOOL ScrCmd_2A1 (ScriptContext * ctx)
}
v10 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021F8E3C) * 64);
v8 = sub_02063020(v4);
v9 = sub_02063040(v4);
v8 = MapObject_XPos(v4);
v9 = MapObject_ZPos(v4);
v11 = 0;
if (v8 < v6) {
@ -3448,8 +3448,8 @@ static BOOL ScrCmd_06A (ScriptContext * ctx)
mapObj = MapObjMan_LocalMapObjByIndex(fieldSystem->mapObjMan, ScriptContext_GetVar(ctx));
v1 = ScriptContext_GetVarPointer(ctx);
v2 = ScriptContext_GetVarPointer(ctx);
*v1 = sub_02063020(mapObj);
*v2 = sub_02063040(mapObj);
*v1 = MapObject_XPos(mapObj);
*v2 = MapObject_ZPos(mapObj);
return 0;
}
@ -4718,7 +4718,7 @@ static BOOL ScrCmd_0C0 (ScriptContext * param0)
if (sub_0205F16C(param0->fieldSys->playerAvatar) == 1) {
v0 = Player_Dir(param0->fieldSys->playerAvatar);
} else {
v0 = sub_0205EA94(param0->fieldSys->playerAvatar);
v0 = PlayerAvatar_MoveDir(param0->fieldSys->playerAvatar);
}
ov5_021E00EC(param0->taskManager, v0, ScriptContext_GetVar(param0));
@ -5942,9 +5942,9 @@ static BOOL ScrCmd_317 (ScriptContext * param0)
{
MapObject * v4 = Player_MapObject(v3->playerAvatar);
*v0 = sub_02063020(v4);
*v0 = MapObject_XPos(v4);
*v2 = ((sub_02063030(v4) / 2));
*v1 = sub_02063040(v4);
*v1 = MapObject_ZPos(v4);
}
return 0;

88
src/unk_0205F180.c
View File

@ -203,9 +203,9 @@ static int sub_0205F22C (PlayerAvatar * param0, int param1)
if ((v2 & (~(1 << 7))) && (sub_0205F108(param0) == 2)) {
FieldSystem * v3 = sub_02062C00(v1);
int v4, v5 = sub_02063020(v1);
int v4, v5 = MapObject_XPos(v1);
int v6, v7 = sub_02063030(v1);
int v8, v9 = sub_02063040(v1);
int v8, v9 = MapObject_ZPos(v1);
v7 = ((v7) / 2);
v4 = v5;
@ -502,7 +502,7 @@ static int sub_0205F6C4 (PlayerAvatar * param0, int param1)
static int sub_0205F6D0 (PlayerAvatar * param0, int param1)
{
MapObject * v0 = Player_MapObject(param0);
int v1 = sub_0206299C(v0);
int v1 = MapObject_MoveDir(v0);
int v2 = sub_0205FAB0(param0, v1);
u32 v3 = sub_02060B7C(param0, v0, v1);
@ -562,7 +562,7 @@ static int sub_0205F808 (PlayerAvatar * param0, int param1)
{
u32 v0;
MapObject * v1 = Player_MapObject(param0);
int v2 = sub_0206299C(v1);
int v2 = MapObject_MoveDir(v1);
Sound_PlayEffect(1620);
@ -618,7 +618,7 @@ static int sub_0205F808 (PlayerAvatar * param0, int param1)
static int sub_0205F95C (PlayerAvatar * param0, int param1)
{
MapObject * v0 = Player_MapObject(param0);
int v1 = sub_0206299C(v0);
int v1 = MapObject_MoveDir(v0);
if (sub_0205EC88(param0) == 1) {
Sound_PlayEffect(1622);
@ -636,7 +636,7 @@ static int sub_0205F95C (PlayerAvatar * param0, int param1)
static int sub_0205F9AC (PlayerAvatar * param0, int param1)
{
MapObject * v0 = Player_MapObject(param0);
int v1 = sub_0206299C(v0);
int v1 = MapObject_MoveDir(v0);
if (sub_0205EC88(param0) == 1) {
Sound_PlayEffect(1622);
@ -870,7 +870,7 @@ static int sub_0205FCC0 (PlayerAvatar * param0, int param1)
int v1 = sub_0205F108(param0);
if ((v1 != 0) && (v1 != 1) && (v1 != 2)) {
v0 = sub_0205EA94(param0);
v0 = PlayerAvatar_MoveDir(param0);
}
}
@ -991,9 +991,9 @@ static void sub_0205FECC (PlayerAvatar * param0, MapObject * param1, int param2,
if ((v0 & (~(1 << 7)))) {
FieldSystem * v3 = sub_02062C00(param1);
int v4 = sub_02063020(param1);
int v4 = MapObject_XPos(param1);
int v5 = sub_02063030(param1);
int v6 = sub_02063040(param1);
int v6 = MapObject_ZPos(param1);
v5 = ((v5) / 2);
sub_02061674(param0, param2, &v4, &v5, &v6);
@ -1378,7 +1378,7 @@ static void sub_02060570 (PlayerAvatar * param0, MapObject * param1, int param2,
} else if ((v0 & (1 << 6))) {
v1 = 0x0;
v2 = 1;
param2 = sub_0206299C(param1);
param2 = MapObject_MoveDir(param1);
sub_02062994(param1, param2);
sub_0205EBC0(param0);
sub_0205EBEC(param0, -1, -1);
@ -1396,7 +1396,7 @@ static void sub_02060570 (PlayerAvatar * param0, MapObject * param1, int param2,
} else {
v1 = 0x0;
v2 = 1;
param2 = sub_0206299C(param1);
param2 = MapObject_MoveDir(param1);
sub_02062994(param1, param2);
sub_0205EBC0(param0);
sub_0205EBEC(param0, -1, -1);
@ -1434,7 +1434,7 @@ static void sub_020606C8 (PlayerAvatar * param0, MapObject * param1, int param2,
int v1;
int v2, v3 = sub_020603EC(param0);
param2 = sub_0205EA94(param0);
param2 = PlayerAvatar_MoveDir(param0);
v0 = sub_02060B7C(param0, param1, param2);
if ((v0 & (1 << 2))) {
@ -1596,7 +1596,7 @@ static void sub_020608E4 (PlayerAvatar * param0, MapObject * param1, int param2,
sub_0205EBC0(param0);
}
} else if ((v0 & (1 << 6))) {
param2 = sub_0206299C(param1);
param2 = MapObject_MoveDir(param1);
v1 = sub_02065838(param2, 0x0);
v2 = 1;
sub_02062994(param1, param2);
@ -1615,7 +1615,7 @@ static void sub_020608E4 (PlayerAvatar * param0, MapObject * param1, int param2,
sub_0205EBC0(param0);
} else {
v2 = 1;
param2 = sub_0206299C(param1);
param2 = MapObject_MoveDir(param1);
v1 = sub_02065838(param2, 0x0);
sub_02062994(param1, param2);
sub_0205EBC0(param0);
@ -1653,7 +1653,7 @@ static void sub_02060AA0 (PlayerAvatar * param0, MapObject * param1, int param2,
int v1;
int v2, v3 = sub_020603EC(param0);
param2 = sub_0205EA94(param0);
param2 = PlayerAvatar_MoveDir(param0);
v0 = sub_02060B7C(param0, param1, param2);
if ((v0 & (1 << 2))) {
@ -1745,9 +1745,9 @@ static u32 sub_02060C24 (PlayerAvatar * param0, MapObject * param1, int param2)
{
VecFx32 v0;
u32 v1, v2;
int v3 = sub_02063020(param1) + sub_0206419C(param2);
int v3 = MapObject_XPos(param1) + sub_0206419C(param2);
int v4 = sub_02063030(param1);
int v5 = sub_02063040(param1) + sub_020641A8(param2);
int v5 = MapObject_ZPos(param1) + sub_020641A8(param2);
sub_02063050(param1, &v0);
@ -1785,8 +1785,8 @@ static int sub_02060CE4 (PlayerAvatar * param0, MapObject * param1, int param2)
{
if (param2 != -1) {
FieldSystem * v0 = sub_02062C00(param1);
int v1 = sub_02063020(param1) + sub_0206419C(param2);
int v2 = sub_02063040(param1) + sub_020641A8(param2);
int v1 = MapObject_XPos(param1) + sub_0206419C(param2);
int v2 = MapObject_ZPos(param1) + sub_020641A8(param2);
if (sub_020683D8(v0, v1, v2, 0, param2) == 1) {
return 1;
@ -1829,8 +1829,8 @@ static int sub_02060D98 (PlayerAvatar * param0, MapObject * param1, int param2)
if (param2 != -1) {
FieldSystem * v1 = sub_02062C00(param1);
int v2 = sub_02063020(param1) + sub_0206419C(param2);
int v3 = sub_02063040(param1) + sub_020641A8(param2);
int v2 = MapObject_XPos(param1) + sub_0206419C(param2);
int v3 = MapObject_ZPos(param1) + sub_020641A8(param2);
u8 v4 = sub_02054F94(v1, v2, v3);
switch (param2) {
@ -1864,8 +1864,8 @@ static int sub_02060E40 (PlayerAvatar * param0, MapObject * param1, int param2)
{
if (param2 != -1) {
FieldSystem * v0 = sub_02062C00(param1);
int v1 = sub_02063020(param1);
int v2 = sub_02063040(param1);
int v1 = MapObject_XPos(param1);
int v2 = MapObject_ZPos(param1);
u8 v3 = sub_02054F94(v0, v1, v2);
switch (param2) {
@ -1907,8 +1907,8 @@ static int sub_02060EE4 (PlayerAvatar * param0, MapObject * param1, int param2)
{
if (param2 != -1) {
FieldSystem * v0 = sub_02062C00(param1);
int v1 = sub_02063020(param1) + sub_0206419C(param2);
int v2 = sub_02063040(param1) + sub_020641A8(param2);
int v1 = MapObject_XPos(param1) + sub_0206419C(param2);
int v2 = MapObject_ZPos(param1) + sub_020641A8(param2);
u8 v3 = sub_02054F94(v0, v1, v2);
if ((param2 == 3) && sub_0205DD90(v3)) {
@ -1927,8 +1927,8 @@ static int sub_02060F4C (PlayerAvatar * param0, MapObject * param1, int param2)
{
if (param2 != -1) {
FieldSystem * v0 = sub_02062C00(param1);
int v1 = sub_02063020(param1) + sub_0206419C(param2);
int v2 = sub_02063040(param1) + sub_020641A8(param2);
int v1 = MapObject_XPos(param1) + sub_0206419C(param2);
int v2 = MapObject_ZPos(param1) + sub_020641A8(param2);
u8 v3 = sub_02054F94(v0, v1, v2);
if (sub_0206406C(param1, v3)) {
@ -1943,8 +1943,8 @@ static int sub_02060FA8 (PlayerAvatar * param0, MapObject * param1, int param2)
{
if (param2 != -1) {
FieldSystem * v0 = sub_02062C00(param1);
int v1 = sub_02063020(param1) + sub_0206419C(param2);
int v2 = sub_02063040(param1) + sub_020641A8(param2);
int v1 = MapObject_XPos(param1) + sub_0206419C(param2);
int v2 = MapObject_ZPos(param1) + sub_020641A8(param2);
u8 v3 = sub_02054F94(v0, v1, v2);
if (sub_0205EB74(param0) == 0x1) {
@ -1977,8 +1977,8 @@ static int sub_02061058 (PlayerAvatar * param0, MapObject * param1, int param2)
{
if ((param2 != -1) && (sub_0205EB74(param0) == 0x1)) {
FieldSystem * v0 = sub_02062C00(param1);
int v1 = sub_02063020(param1) + sub_0206419C(param2);
int v2 = sub_02063040(param1) + sub_020641A8(param2);
int v1 = MapObject_XPos(param1) + sub_0206419C(param2);
int v2 = MapObject_ZPos(param1) + sub_020641A8(param2);
u8 v3 = sub_02054F94(v0, v1, v2);
if (sub_0206406C(param1, v3)) {
@ -2011,9 +2011,9 @@ static int sub_02061100 (PlayerAvatar * param0, MapObject * param1, int param2)
FieldSystem * v1 = sub_02062C00(param1);
if (sub_02071CB4(v1, 9) == 1) {
int v2 = sub_02063020(param1);
int v2 = MapObject_XPos(param1);
int v3 = ((sub_02063030(param1) / 2));
int v4 = sub_02063040(param1);
int v4 = MapObject_ZPos(param1);
sub_02061674(param0, param2, &v2, &v3, &v4);
@ -2039,9 +2039,9 @@ static int sub_02061180 (PlayerAvatar * param0, MapObject * param1, int param2)
if (sub_02071CB4(v0, 9) == 1) {
BOOL v1;
u32 v2;
int v3 = sub_02063020(param1);
int v3 = MapObject_XPos(param1);
int v4 = ((sub_02063030(param1) / 2));
int v5 = sub_02063040(param1);
int v5 = MapObject_ZPos(param1);
sub_02061674(param0, param2, &v3, &v4, &v5);
@ -2090,9 +2090,9 @@ static int sub_02061248 (PlayerAvatar * param0, MapObject * param1, int param2)
if (sub_02071CB4(v1, 9) == 1) {
u32 v2;
int v3 = sub_02063020(param1);
int v3 = MapObject_XPos(param1);
int v4 = ((sub_02063030(param1) / 2));
int v5 = sub_02063040(param1);
int v5 = MapObject_ZPos(param1);
sub_02061674(param0, param2, &v3, &v4, &v5);
@ -2163,7 +2163,7 @@ static int sub_02061348 (PlayerAvatar * param0, u16 param1, u16 param2)
}
{
int v2 = sub_0205EA94(param0);
int v2 = PlayerAvatar_MoveDir(param0);
int v3 = sub_0205EBE0(param0);
int v4 = sub_0205EBE8(param0);
@ -2465,9 +2465,9 @@ u32 sub_020616F0 (PlayerAvatar * param0, int param1)
} else {
MapObject * v1 = Player_MapObject(param0);
FieldSystem * v2 = sub_02062C00(v1);
int v3 = sub_02063020(v1);
int v3 = MapObject_XPos(v1);
int v4 = ((sub_02063030(v1) / 2));
int v5 = sub_02063040(v1);
int v5 = MapObject_ZPos(v1);
sub_02061674(param0, param1, &v3, &v4, &v5);
ov9_02251044(v2, v3, v4, v5, &v0);
@ -2481,9 +2481,9 @@ u32 sub_02061760 (PlayerAvatar * param0)
u32 v0;
MapObject * v1 = Player_MapObject(param0);
FieldSystem * v2 = sub_02062C00(v1);
int v3 = sub_02063020(v1);
int v3 = MapObject_XPos(v1);
int v4 = ((sub_02063030(v1) / 2));
int v5 = sub_02063040(v1);
int v5 = MapObject_ZPos(v1);
if (sub_0205F158(param0) == 0) {
v0 = sub_02054F94(v2, v3, v5);
@ -2499,9 +2499,9 @@ void sub_020617BC (PlayerAvatar * const param0, int * param1, int * param2, int
int v0 = sub_0205EAA0(param0);
MapObject * v1 = Player_MapObject(param0);
*param1 = sub_02063020(v1);
*param1 = MapObject_XPos(v1);
*param2 = ((sub_02063030(v1) / 2));
*param3 = sub_02063040(v1);
*param3 = MapObject_ZPos(v1);
sub_02061674(param0, v0, param1, param2, param3);
}

40
src/unk_02063400.c
View File

@ -465,28 +465,28 @@ static void sub_02063C48 (MapObject * param0, u8 param1, u8 param2, const UnkStr
static void sub_02063C60 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
{
if (sub_0205DE5C(param2) == 1) {
ov5_021F2AE4(param0, sub_02063008(param0), sub_02063010(param0), sub_02063018(param0));
ov5_021F2AE4(param0, MapObject_XPosPrev(param0), sub_02063010(param0), MapObject_ZPosPrev(param0));
}
}
static void sub_02063C94 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
{
if (sub_0205DE5C(param1) == 1) {
ov5_021F2AE4(param0, sub_02063020(param0), sub_02063030(param0), sub_02063040(param0));
ov5_021F2AE4(param0, MapObject_XPos(param0), sub_02063030(param0), MapObject_ZPos(param0));
}
}
static void sub_02063CC8 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
{
if (sub_0205DCE0(param2) == 1) {
ov5_021F2C38(param0, sub_02063008(param0), sub_02063010(param0), sub_02063018(param0));
ov5_021F2C38(param0, MapObject_XPosPrev(param0), sub_02063010(param0), MapObject_ZPosPrev(param0));
}
}
static void sub_02063CFC (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
{
if (sub_0205DCE0(param1) == 1) {
ov5_021F2C38(param0, sub_02063020(param0), sub_02063030(param0), sub_02063040(param0));
ov5_021F2C38(param0, MapObject_XPos(param0), sub_02063030(param0), MapObject_ZPos(param0));
}
}
@ -606,9 +606,9 @@ u32 sub_02063EBC (const MapObject * param0, int param1)
{
int v0, v1, v2;
v0 = sub_02063020(param0) + sub_0206419C(param1);
v0 = MapObject_XPos(param0) + sub_0206419C(param1);
v1 = sub_02063030(param0);
v2 = sub_02063040(param0) + sub_020641A8(param1);
v2 = MapObject_ZPos(param0) + sub_020641A8(param1);
return sub_02063E94(param0, v0, v1, v2, param1);
}
@ -627,8 +627,8 @@ int sub_02063F00 (const MapObject * param0, int param1, int param2, int param3)
if (v4 != param0) {
if (sub_020628D0(v4, (1 << 0))) {
if (sub_020628D0(v4, (1 << 18)) == 0) {
v1 = sub_02063020(v4);
v2 = sub_02063040(v4);
v1 = MapObject_XPos(v4);
v2 = MapObject_ZPos(v4);
if ((v1 == param1) && (v2 == param3)) {
int v5 = sub_02063030(v4);
@ -643,8 +643,8 @@ int sub_02063F00 (const MapObject * param0, int param1, int param2, int param3)
}
}
v1 = sub_02063008(v4);
v2 = sub_02063018(v4);
v1 = MapObject_XPosPrev(v4);
v2 = MapObject_ZPosPrev(v4);
if ((v1 == param1) && (v2 == param3)) {
int v7 = sub_02063030(v4);
@ -851,9 +851,9 @@ int sub_020641A8 (int param0)
void sub_020641B4 (MapObject * param0, int param1)
{
sub_0206300C(param0, sub_02063020(param0));
sub_0206300C(param0, MapObject_XPos(param0));
sub_02063014(param0, sub_02063030(param0));
sub_0206301C(param0, sub_02063040(param0));
sub_0206301C(param0, MapObject_ZPos(param0));
sub_02063028(param0, sub_0206419C(param1));
sub_02063038(param0, 0);
@ -862,15 +862,15 @@ void sub_020641B4 (MapObject * param0, int param1)
void sub_02064208 (MapObject * param0)
{
sub_0206300C(param0, sub_02063020(param0));
sub_0206300C(param0, MapObject_XPos(param0));
sub_02063014(param0, sub_02063030(param0));
sub_0206301C(param0, sub_02063040(param0));
sub_0206301C(param0, MapObject_ZPos(param0));
}
u32 sub_02064238 (MapObject * param0, int param1)
{
int v0 = sub_02063020(param0) + sub_0206419C(param1);
int v1 = sub_02063040(param0) + sub_020641A8(param1);
int v0 = MapObject_XPos(param0) + sub_0206419C(param1);
int v1 = MapObject_ZPos(param0) + sub_020641A8(param1);
FieldSystem * v2 = sub_02062C00(param0);
u8 v3 = sub_02054F94(v2, v0, v1);
@ -951,13 +951,13 @@ int sub_02064390 (MapObject * param0)
u8 v1 = v0;
if (sub_02062FDC(param0) == 0) {
int v2 = sub_02063008(param0);
int v3 = sub_02063018(param0);
int v2 = MapObject_XPosPrev(param0);
int v3 = MapObject_ZPosPrev(param0);
FieldSystem * v4 = sub_02062C00(param0);
v0 = sub_02054F94(v4, v2, v3);
v2 = sub_02063020(param0);
v3 = sub_02063040(param0);
v2 = MapObject_XPos(param0);
v3 = MapObject_ZPos(param0);
v1 = sub_02054F94(v4, v2, v3);
}

36
src/unk_0206450C.c
View File

@ -415,8 +415,8 @@ static int sub_0206489C (MapObject * param0, int param1)
sub_020647A0(param0, &v2);
v0 = sub_02063020(param0) + sub_0206419C(param1);
v1 = sub_02063040(param0) + sub_020641A8(param1);
v0 = MapObject_XPos(param0) + sub_0206419C(param1);
v1 = MapObject_ZPos(param0) + sub_020641A8(param1);
if ((v2.unk_00 > v0) || (v2.unk_08 < v0)) {
return 0;
@ -749,11 +749,11 @@ static int sub_02064CA8 (MapObject * param0, UnkStruct_02064C28 * param1)
v0 = sub_02062FF0(param0);
v1 = sub_02063000(param0);
v2 = sub_02063020(param0);
v3 = sub_02063040(param0);
v2 = MapObject_XPos(param0);
v3 = MapObject_ZPos(param0);
if ((v0 == v2) && (v1 == v3)) {
int v4 = sub_0206447C(sub_0206299C(param0));
int v4 = sub_0206447C(MapObject_MoveDir(param0));
sub_02062994(param0, v4);
@ -769,7 +769,7 @@ static int sub_02064CA8 (MapObject * param0, UnkStruct_02064C28 * param1)
int v5, v6;
u32 v7;
v5 = sub_0206299C(param0);
v5 = MapObject_MoveDir(param0);
v7 = sub_02063EBC(param0, v5);
if ((v7 & (1 << 0))) {
@ -929,14 +929,14 @@ static int sub_02064EEC (MapObject * param0, UnkStruct_02064D98 * param1)
if (param1->unk_01 == param1->unk_02) {
if (param1->unk_03 == 0) {
int v0 = sub_02062FF0(param0);
int v1 = sub_02063020(param0);
int v1 = MapObject_XPos(param0);
if (v0 == v1) {
param1->unk_01++;
}
} else {
int v2 = sub_02063000(param0);
int v3 = sub_02063040(param0);
int v3 = MapObject_ZPos(param0);
if (v2 == v3) {
param1->unk_01++;
@ -947,8 +947,8 @@ static int sub_02064EEC (MapObject * param0, UnkStruct_02064D98 * param1)
if (param1->unk_01 == 3) {
int v4 = sub_02062FF0(param0);
int v5 = sub_02063000(param0);
int v6 = sub_02063020(param0);
int v7 = sub_02063040(param0);
int v6 = MapObject_XPos(param0);
int v7 = MapObject_ZPos(param0);
if ((v4 == v6) && (v5 == v7)) {
param1->unk_01 = 0;
@ -1140,14 +1140,14 @@ static int sub_020651A4 (MapObject * param0, UnkStruct_0206502C * param1)
if (param1->unk_01 == param1->unk_02) {
if (param1->unk_03 == 0) {
int v0 = sub_02062FF0(param0);
int v1 = sub_02063020(param0);
int v1 = MapObject_XPos(param0);
if (v0 == v1) {
sub_02065100(param1);
}
} else {
int v2 = sub_02063000(param0);
int v3 = sub_02063040(param0);
int v3 = MapObject_ZPos(param0);
if (v2 == v3) {
sub_02065100(param1);
@ -1158,8 +1158,8 @@ static int sub_020651A4 (MapObject * param0, UnkStruct_0206502C * param1)
if (param1->unk_01 == 3) {
int v4 = sub_02062FF0(param0);
int v5 = sub_02063000(param0);
int v6 = sub_02063020(param0);
int v7 = sub_02063040(param0);
int v6 = MapObject_XPos(param0);
int v7 = MapObject_ZPos(param0);
if ((v4 == v6) && (v5 == v7)) {
param1->unk_01 = 0;
@ -1323,8 +1323,8 @@ static int sub_0206537C (MapObject * param0)
int v8 = Player_XPos(v2);
int v9 = Player_ZPos(v2);
int v10 = sub_020629D8(param0, 0);
int v11 = sub_02063020(param0);
int v12 = sub_02063040(param0);
int v11 = MapObject_XPos(param0);
int v12 = MapObject_ZPos(param0);
int v13 = v11 - v10;
int v14 = v11 + v10;
int v15 = v12 - v10;
@ -1372,8 +1372,8 @@ static int sub_02065448 (MapObject * param0, int param1, int param2)
{
int v4 = -1, v5 = -1;
int v6 = sub_02063020(param0);
int v7 = sub_02063040(param0);
int v6 = MapObject_XPos(param0);
int v7 = MapObject_ZPos(param0);
FieldSystem * v8 = sub_02062C00(param0);
PlayerAvatar * v9 = sub_0205EF3C(v8);
int v10 = Player_XPos(v9);

12
src/unk_020655F4.c
View File

@ -1567,9 +1567,9 @@ static void sub_02066824 (MapObject * param0, const VecFx32 * param1, int param2
sub_02062A0C(param0, param5);
sub_02062D28(param0);
sub_0206300C(param0, sub_02063020(param0));
sub_0206300C(param0, MapObject_XPos(param0));
sub_02063014(param0, sub_02063030(param0));
sub_0206301C(param0, sub_02063040(param0));
sub_0206301C(param0, MapObject_ZPos(param0));
if (param1->x < 0) {
sub_02063028(param0, -1);
@ -1891,9 +1891,9 @@ static void sub_02066F88 (MapObject * param0, fx32 param1, int param2, int param
sub_02062A0C(param0, param5);
sub_02062D28(param0);
sub_0206300C(param0, sub_02063020(param0));
sub_0206300C(param0, MapObject_XPos(param0));
sub_02063014(param0, sub_02063030(param0));
sub_0206301C(param0, sub_02063040(param0));
sub_0206301C(param0, MapObject_ZPos(param0));
GF_ASSERT(param6 <= 2);
@ -1996,9 +1996,9 @@ static int sub_02067068 (MapObject * param0)
v2->unk_08 -= (16 * FX32_ONE);
v0 = v2->unk_04;
sub_0206300C(param0, sub_02063020(param0));
sub_0206300C(param0, MapObject_XPos(param0));
sub_02063014(param0, sub_02063030(param0));
sub_0206301C(param0, sub_02063040(param0));
sub_0206301C(param0, MapObject_ZPos(param0));
switch (v2->unk_02) {
case 0:

16
src/unk_020673B8.c
View File

@ -89,15 +89,15 @@ static int sub_0206741C (MapObject * param0)
static int sub_02067438 (MapObject * param0)
{
int v0 = sub_02063020(param0);
int v1 = sub_02063008(param0);
int v0 = MapObject_XPos(param0);
int v1 = MapObject_XPosPrev(param0);
if (v0 != v1) {
return 1;
}
v0 = sub_02063040(param0);
v1 = sub_02063018(param0);
v0 = MapObject_ZPos(param0);
v1 = MapObject_ZPosPrev(param0);
if (v0 != v1) {
return 1;
@ -108,15 +108,15 @@ static int sub_02067438 (MapObject * param0)
static int sub_0206746C (MapObject * param0)
{
int v0 = sub_02063020(param0);
int v1 = sub_02063008(param0);
int v0 = MapObject_XPos(param0);
int v1 = MapObject_XPosPrev(param0);
if (v0 != v1) {
return 0;
}
v0 = sub_02063040(param0);
v1 = sub_02063018(param0);
v0 = MapObject_ZPos(param0);
v1 = MapObject_ZPosPrev(param0);
if (v0 != v1) {
return 0;

22
src/unk_02067A84.c
View File

@ -237,10 +237,10 @@ static int sub_02067DC4 (const MapObject * param0, int param1, int param2, int p
{
int v0, v1;
v0 = sub_02063020(param0);
v0 = MapObject_XPos(param0);
if (v0 == param2) {
v1 = sub_02063040(param0);
v1 = MapObject_ZPos(param0);
if ((param3 < v1) && (param3 >= (v1 - param1))) {
return v1 - param3;
@ -254,10 +254,10 @@ static int sub_02067DF0 (const MapObject * param0, int param1, int param2, int p
{
int v0, v1;
v0 = sub_02063020(param0);
v0 = MapObject_XPos(param0);
if (v0 == param2) {
v1 = sub_02063040(param0);
v1 = MapObject_ZPos(param0);
if ((param3 > v1) && (param3 <= (v1 + param1))) {
return param3 - v1;
@ -271,10 +271,10 @@ static int sub_02067E1C (const MapObject * param0, int param1, int param2, int p
{
int v0, v1;
v1 = sub_02063040(param0);
v1 = MapObject_ZPos(param0);
if (v1 == param3) {
v0 = sub_02063020(param0);
v0 = MapObject_XPos(param0);
if ((param2 < v0) && (param2 >= (v0 - param1))) {
return v0 - param2;
@ -288,10 +288,10 @@ static int sub_02067E48 (const MapObject * param0, int param1, int param2, int p
{
int v0, v1;
v1 = sub_02063040(param0);
v1 = MapObject_ZPos(param0);
if (v1 == param3) {
v0 = sub_02063020(param0);
v0 = MapObject_XPos(param0);
if ((param2 > v0) && (param2 <= (v0 + param1))) {
return param2 - v0;
@ -317,8 +317,8 @@ static int sub_02067E74 (const MapObject * param0, int param1, int param2)
return 1;
}
v1 = sub_02063020(param0);
v2 = sub_02063040(param0);
v1 = MapObject_XPos(param0);
v2 = MapObject_ZPos(param0);
v3 = sub_02063030(param0);
v1 += sub_0206419C(param1);
v2 += sub_020641A8(param1);
@ -646,7 +646,7 @@ static int sub_02068264 (UnkStruct_020EF6D0 * param0)
MapObject * v2;
v2 = Player_MapObject(param0->unk_28);
v1 = sub_02064488(sub_02063020(v2), sub_02063040(v2), sub_02063020(param0->unk_24), sub_02063040(param0->unk_24));
v1 = sub_02064488(MapObject_XPos(v2), MapObject_ZPos(v2), MapObject_XPos(param0->unk_24), MapObject_ZPos(param0->unk_24));
if ((Player_Dir(param0->unk_28) != v1) && ((param0->unk_18 == 0) || (param0->unk_14 == 2))) {
if (LocalMapObj_IsAnimationSet(v2) == 1) {

40
src/unk_02069BE0.c
View File

@ -220,10 +220,10 @@ static int sub_02069D8C (MapObject * param0)
{
FieldSystem * v0 = sub_02062C00(param0);
PlayerAvatar * v1 = sub_0205EF3C(v0);
int v2 = sub_02063020(param0);
int v3 = sub_02063040(param0);
int v4 = sub_0205EAD4(v1);
int v5 = sub_0205EAE0(v1);
int v2 = MapObject_XPos(param0);
int v3 = MapObject_ZPos(param0);
int v4 = PlayerAvatar_XPosPrev(v1);
int v5 = PlayerAvatar_ZPosPrev(v1);
if ((v2 != v4) || (v3 != v5)) {
u32 v6 = sub_02069D50(param0);
@ -363,8 +363,8 @@ static int sub_02069F48 (MapObject * param0, UnkStruct_02069F48 * param1)
static void sub_02069FC4 (MapObject * param0, UnkStruct_02069F48 * param1, MapObject * param2)
{
param1->unk_01 = 1;
param1->unk_02 = sub_02063020(param2);
param1->unk_04 = sub_02063040(param2);
param1->unk_02 = MapObject_XPos(param2);
param1->unk_04 = MapObject_ZPos(param2);
param1->unk_06 = 0xff;
param1->unk_08 = param2;
}
@ -372,10 +372,10 @@ static void sub_02069FC4 (MapObject * param0, UnkStruct_02069F48 * param1, MapOb
static int sub_02069FE8 (MapObject * param0, UnkStruct_02069F48 * param1)
{
MapObject * v0 = param1->unk_08;
int v1 = sub_02063020(param0);
int v2 = sub_02063040(param0);
int v3 = sub_02063008(v0);
int v4 = sub_02063018(v0);
int v1 = MapObject_XPos(param0);
int v2 = MapObject_ZPos(param0);
int v3 = MapObject_XPosPrev(v0);
int v4 = MapObject_ZPosPrev(v0);
if (((v1 != v3) || (v2 != v4)) && ((sub_02062D1C(v0) == 1) || (sub_020628D0(v0, ((1 << 11) | (1 << 12) | (1 << 6))) == 0))) {
return 1;
@ -386,12 +386,12 @@ static int sub_02069FE8 (MapObject * param0, UnkStruct_02069F48 * param1)
static int sub_0206A034 (MapObject * param0, UnkStruct_02069F48 * param1)
{
int v0 = sub_02063020(param0);
int v1 = sub_02063040(param0);
int v2 = sub_02063020(param1->unk_08);
int v3 = sub_02063040(param1->unk_08);
int v4 = sub_02063008(param1->unk_08);
int v5 = sub_02063018(param1->unk_08);
int v0 = MapObject_XPos(param0);
int v1 = MapObject_ZPos(param0);
int v2 = MapObject_XPos(param1->unk_08);
int v3 = MapObject_ZPos(param1->unk_08);
int v4 = MapObject_XPosPrev(param1->unk_08);
int v5 = MapObject_ZPosPrev(param1->unk_08);
int v6;
if ((v0 == v2) && (v1 == v3)) {
@ -867,8 +867,8 @@ static BOOL sub_0206A54C (FieldSystem * param0, int param1, int param2, int para
static int sub_0206A574 (MapObject * param0, int param1, int param2)
{
FieldSystem * v0 = sub_02062C00(param0);
int v1 = sub_02063020(param0);
int v2 = sub_02063040(param0);
int v1 = MapObject_XPos(param0);
int v2 = MapObject_ZPos(param0);
BOOL v3 = sub_0206A524(v0, v1, v2, param1, param2);
return v3;
@ -877,8 +877,8 @@ static int sub_0206A574 (MapObject * param0, int param1, int param2)
static int sub_0206A5A4 (MapObject * param0, int param1, int param2)
{
FieldSystem * v0 = sub_02062C00(param0);
int v1 = sub_02063020(param0);
int v2 = sub_02063040(param0);
int v1 = MapObject_XPos(param0);
int v2 = MapObject_ZPos(param0);
BOOL v3 = sub_0206A54C(v0, v1, v2, param1, param2);
return v3;