Skip to content

Commit c60badb

Browse files
SezzarySezzary
committed
Tidying pass, type conversions
1 parent 1934a1d commit c60badb

13 files changed

Lines changed: 217 additions & 166 deletions

File tree

‎include/bodyprog/bodyprog.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4509,9 +4509,9 @@ bool func_8008074C(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
45094509
void func_8008076C(s32 posX, s32 posZ);
45104510

45114511
/** Returns ground height? */
4512-
q19_12 func_80080884(s32 posX, s32 posZ);
4512+
q19_12 func_80080884(q19_12 posX, q19_12 posZ);
45134513

4514-
s32 func_800808AC(s32 posX, s32 posZ);
4514+
s32 func_800808AC(q19_12 posX, q19_12 posZ);
45154515

45164516
/** Returns a Q shift based on a magnitude. */
45174517
s32 Math_MagnitudeShiftGet(s32 mag);

‎include/maps/map2/map2_s00.h‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,30 @@ extern s_WorldObject_0 g_CommonWorldObjects[6];
7676

7777
extern VECTOR3 D_800F217C;
7878

79+
// TODO: Reorder these decls.
7980

80-
void func_800E5930(s_SubCharacter* chara);
81+
bool func_800DC200(s_SubCharacter* chara);
8182

82-
void func_800EE5D0(void);
83+
s32 func_800DC30C(s_SubCharacter* chara);
84+
85+
void func_800D5974(s_SubCharacter* chara);
86+
87+
s32 func_800DC598(s_SubCharacter* chara);
88+
89+
bool func_800DC67C(s_SubCharacter* chara);
90+
91+
s32 func_800DC98C(s_SubCharacter* chara, VECTOR3* arg1, VECTOR3* arg2, VECTOR3* arg3);
92+
93+
void func_800DE11C(s_SubCharacter* chara);
94+
95+
void func_800DF710(s_SubCharacter* chara);
8396

8497
void func_800E7D54(void);
8598

99+
void func_800E5930(s_SubCharacter* chara);
100+
101+
void func_800EE5D0(void);
102+
86103
void MapEvent_AtWaterWorks(void);
87104

88105
void MapEvent_CherylsSketchbook(void);
@@ -145,20 +162,4 @@ void func_800EAD2C(void);
145162

146163
void func_800EB174(void);
147164

148-
void func_800DF710(s_SubCharacter* chara);
149-
150-
s32 func_800DC30C(s_SubCharacter* chara);
151-
152-
s32 func_800DC598(s_SubCharacter* chara);
153-
154-
void func_800D5974(s_SubCharacter* chara);
155-
156-
s32 func_800DC200(s_SubCharacter* chara);
157-
158-
s32 func_800DC98C(s_SubCharacter* chara, VECTOR3* arg1, VECTOR3* arg2, VECTOR3* arg3);
159-
160-
bool func_800DC67C(s_SubCharacter* chara);
161-
162-
void func_800DE11C(s_SubCharacter* chara);
163-
164165
#endif

‎include/maps/map4/map4_s04.h‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,21 @@ extern u8 D_800D6EF8;
3333

3434
extern s_WorldObjectDesc g_WorldObjectSavepad; // 0x800D6F38
3535
extern s_WorldObjectDescNoRot g_WorldObject0; // 0x800D6F08
36+
3637
extern u8 D_800D335C[8];
37-
extern u16 D_800D3364[60];
38+
extern u16 D_800D3364[60]; // Flags.
3839

3940
void func_800D143C(s32 arg0);
4041

4142
void func_800D1470(void);
4243

44+
/* Same as `func_800CFEEC` in map3_s02. */
45+
void func_800D14B0(void);
46+
4347
void func_800D23E4(void);
4448

4549
void func_800D2D6C(void);
4650

4751
void func_800D2DF4(void);
4852

49-
void func_800D14B0(void);
50-
5153
#endif

‎include/maps/map6/map6_s03.h‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,22 @@ extern VECTOR3 g_WorldObjectPos0; // D_800DFEB0
1111
extern s_WorldObjectDesc g_WorldObject1; // D_800DFEC0
1212
extern s_WorldObjectDescNoRot g_WorldObject2; // D_800DFF00
1313
extern s_WorldObject_0 g_CommonWorldObjects[6]; // D_800DFF30
14+
1415
extern s16 D_800DFEF0;
1516
extern s16 D_800DFEF2;
1617
extern s8 D_800DFEF4;
1718
extern s8 D_800DFEF5;
1819
extern VECTOR3 D_800DBD10;
19-
extern u16 D_800DBCE4[22];
20-
extern u8 D_800DBCDC[8];
20+
extern u16 D_800DBCE4[22]; // Flags.
21+
extern u8 D_800DBCDC[8]; // Distances.
2122

2223
void func_800D4A5C(s_SubCharacter* chara);
2324

25+
// TODO: ifdefs? Completely different impl. than what other maps use.
26+
u8 Map_RoomIdxGet(s32 x, s32 z);
27+
28+
void func_800D7F98(void);
29+
2430
/** @brief Handles a Health Drink or Handgun Bullets item pickup event. */
2531
void MapEvent_CommonItemTake(void);
2632

@@ -33,6 +39,4 @@ void MapEvent_MapTake(void);
3339

3440
void func_800D8818(void);
3541

36-
void func_800D7F98(void);
37-
3842
#endif

‎include/maps/map7/map7_s02.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ void func_800DBB34(void);
150150
/** @brief Handles the Ankh item pickup event. */
151151
void MapEvent_AnkhTake(void);
152152

153+
void func_800DC14C(void);
154+
153155
void func_800DC778(void);
154156

155157
void func_800DCD00(void);

‎include/maps/shared.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1922,7 +1922,7 @@ typedef struct _SfxVolume
19221922
typedef struct
19231923
{
19241924
s_AnimInfo animInfo_0[56];
1925-
s32 unk_380[301][2]; // Unknown size, biggest constant index used is 35.
1925+
s32 unk_380[301][2]; // Unknown size, biggest constant index used is 35. Associated with anims.
19261926
s_SfxVolume sfxVolumes_CE8[11];
19271927
u_Property properties_D14[4];
19281928
s8 unk_D24[36];
@@ -1938,7 +1938,7 @@ typedef struct
19381938
GsCOORDINATE2* coords_8;
19391939
MATRIX* matrices_C;
19401940
s8 unk_10[164];
1941-
s32 field_B4[6][4];
1941+
s32 field_B4[6][4]; // [*][3] is angle.
19421942
s32 field_114;
19431943
s32 field_118;
19441944
VECTOR3 field_11C;
@@ -2689,19 +2689,19 @@ typedef struct
26892689
WorldObjectSet(eventPos, name, Q12(posX), Q12(posY), Q12(posZ), FP_ANGLE(rotX), FP_ANGLE(rotY), FP_ANGLE(rotZ))
26902690

26912691
#define WorldObjectSet(eventPose, name, posX, posY, posZ, rotX, rotY, rotZ) \
2692-
{ \
2693-
Math_Vector3Set(&(eventPose)->position_1C, posX, posY, posZ); \
2694-
Math_SetSVectorFast(&(eventPose)->rotation_28, rotX, rotY, rotZ); \
2695-
WorldObject_ModelNameSet(&(eventPose)->object_0, (name)); \
2696-
}
2692+
{ \
2693+
Math_Vector3Set(&(eventPose)->position_1C, posX, posY, posZ); \
2694+
Math_SetSVectorFast(&(eventPose)->rotation_28, rotX, rotY, rotZ); \
2695+
WorldObject_ModelNameSet(&(eventPose)->object_0, (name)); \
2696+
}
26972697

26982698
#define WorldObjectPoseInit(eventPos, posX, posY, posZ, rotX, rotY, rotZ) \
26992699
WorldObjectPoseSet(eventPos, Q12(posX), Q12(posY), Q12(posZ), FP_ANGLE(rotX), FP_ANGLE(rotY), FP_ANGLE(rotZ))
27002700

27012701
#define WorldObjectPoseSet(eventPose, posX, posY, posZ, rotX, rotY, rotZ) \
2702-
{ \
2703-
Math_Vector3Set(&(eventPose)->position_0, posX, posY, posZ); \
2704-
Math_SetSVectorFast(&(eventPose)->rotation_C, rotX, rotY, rotZ); \
2705-
}
2702+
{ \
2703+
Math_Vector3Set(&(eventPose)->position_0, posX, posY, posZ); \
2704+
Math_SetSVectorFast(&(eventPose)->rotation_C, rotX, rotY, rotZ); \
2705+
}
27062706

27072707
#endif

‎src/bodyprog/bodyprog_80070B84.c‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8560,8 +8560,8 @@ void func_8007FDE0(s8 arg0, e_SfxId* sfx, s8* pitch0, s8* pitch1) // 0x8007FDE0
85608560
mapOverlayId = g_SavegamePtr->mapOverlayId_A4;
85618561
*sfx = Sfx_Unk1330;
85628562

8563-
// @hack Odd redundant load of mapOverlayId_A4, likely there was some optimized-out code above that left side-effects?
8564-
// This just sets `mapOverlayId` to `g_SavegamePtr->mapOverlayId_A4` (again)
8563+
// @hack Odd redundant load of `mapOverlayId_A4`, likely there was some optimized-out code above that left side-effects?
8564+
// This just sets `mapOverlayId` to `g_SavegamePtr->mapOverlayId_A4` (again).
85658565
asm volatile(
85668566
"lui $2, %%hi(g_SavegamePtr)\n"
85678567
"lw $2, %%lo(g_SavegamePtr)($2)\n"
@@ -8573,7 +8573,7 @@ void func_8007FDE0(s8 arg0, e_SfxId* sfx, s8* pitch0, s8* pitch1) // 0x8007FDE0
85738573

85748574
if (mapOverlayId == MapOverlayId_MAP2_S00)
85758575
{
8576-
if (g_SysWork.player_4C.chara_0.position_18.vx >= Q12(95.0f) && g_SysWork.player_4C.chara_0.position_18.vx <= Q12(105.0f) &&
8576+
if (g_SysWork.player_4C.chara_0.position_18.vx >= Q12(95.0f) && g_SysWork.player_4C.chara_0.position_18.vx <= Q12(105.0f) &&
85778577
g_SysWork.player_4C.chara_0.position_18.vz >= Q12(-33.0f) && g_SysWork.player_4C.chara_0.position_18.vz <= Q12(-28.0f))
85788578
{
85798579
*sfx = Sfx_Unk1389;
@@ -8635,7 +8635,7 @@ void func_8007FDE0(s8 arg0, e_SfxId* sfx, s8* pitch0, s8* pitch1) // 0x8007FDE0
86358635
switch (g_SavegamePtr->mapRoomIdx_A5)
86368636
{
86378637
case 20:
8638-
if (g_SysWork.player_4C.chara_0.position_18.vy > 0)
8638+
if (g_SysWork.player_4C.chara_0.position_18.vy > Q12(0.0f))
86398639
{
86408640
*sfx = Sfx_Unk1346;
86418641
}
@@ -8662,23 +8662,22 @@ void func_8007FDE0(s8 arg0, e_SfxId* sfx, s8* pitch0, s8* pitch1) // 0x8007FDE0
86628662

86638663
case MapOverlayId_MAP6_S00:
86648664
if ((g_SysWork.player_4C.chara_0.position_18.vx >= Q12(-160.1f) && g_SysWork.player_4C.chara_0.position_18.vx <= Q12(-158.5f) &&
8665-
g_SysWork.player_4C.chara_0.position_18.vz >= Q12(26.8f) && g_SysWork.player_4C.chara_0.position_18.vz <= Q12(27.4f)) ||
8665+
g_SysWork.player_4C.chara_0.position_18.vz >= Q12(26.8f) && g_SysWork.player_4C.chara_0.position_18.vz <= Q12(27.4f)) ||
86668666

86678667
(g_SysWork.player_4C.chara_0.position_18.vx >= Q12(-160.1f) && g_SysWork.player_4C.chara_0.position_18.vx <= Q12(-158.5f) &&
8668-
g_SysWork.player_4C.chara_0.position_18.vz >= Q12(16.8f) && g_SysWork.player_4C.chara_0.position_18.vz <= Q12(17.5f)) ||
8668+
g_SysWork.player_4C.chara_0.position_18.vz >= Q12(16.8f) && g_SysWork.player_4C.chara_0.position_18.vz <= Q12(17.5f)) ||
86698669

86708670
(g_SysWork.player_4C.chara_0.position_18.vx >= Q12(-170.0f) && g_SysWork.player_4C.chara_0.position_18.vx <= Q12(-165.8f) &&
8671-
g_SysWork.player_4C.chara_0.position_18.vz >= Q12(-16.4f) && g_SysWork.player_4C.chara_0.position_18.vz <= Q12(-14.35f)) ||
8671+
g_SysWork.player_4C.chara_0.position_18.vz >= Q12(-16.4f) && g_SysWork.player_4C.chara_0.position_18.vz <= Q12(-14.35f)) ||
86728672

86738673
(g_SysWork.player_4C.chara_0.position_18.vx >= Q12(-172.7f) && g_SysWork.player_4C.chara_0.position_18.vx <= Q12(-170.9f) &&
8674-
g_SysWork.player_4C.chara_0.position_18.vz >= Q12(-24.9f) && g_SysWork.player_4C.chara_0.position_18.vz <= Q12(-21.25f)) ||
8674+
g_SysWork.player_4C.chara_0.position_18.vz >= Q12(-24.9f) && g_SysWork.player_4C.chara_0.position_18.vz <= Q12(-21.25f)) ||
86758675

86768676
(g_SysWork.player_4C.chara_0.position_18.vx >= Q12(-170.28f) && g_SysWork.player_4C.chara_0.position_18.vx <= Q12(-165.85f) &&
8677-
g_SysWork.player_4C.chara_0.position_18.vz >= Q12(-35.4f) && g_SysWork.player_4C.chara_0.position_18.vz <= Q12(-34.35f)))
8677+
g_SysWork.player_4C.chara_0.position_18.vz >= Q12(-35.4f) && g_SysWork.player_4C.chara_0.position_18.vz <= Q12(-34.35f)))
86788678
{
86798679
*sfx = Sfx_Unk1600;
86808680
}
8681-
86828681
break;
86838682

86848683
case MapOverlayId_MAP6_S01:
@@ -8927,13 +8926,13 @@ void func_8008076C(s32 posX, s32 posZ) // 0x8008076C
89278926
D_800AFC78.field_18 = caseVar;
89288927
}
89298928

8930-
q19_12 func_80080884(s32 posX, s32 posZ) // 0x80080884
8929+
q19_12 func_80080884(q19_12 posX, q19_12 posZ) // 0x80080884
89318930
{
89328931
func_8008076C(posX, posZ);
89338932
return D_800AFC78.position_0.vy;
89348933
}
89358934

8936-
s32 func_800808AC(s32 posX, s32 posZ) // 0x800808AC
8935+
s32 func_800808AC(q19_12 posX, q19_12 posZ) // 0x800808AC
89378936
{
89388937
func_8008076C(posX, posZ);
89398938
return D_800AFC78.field_18;

0 commit comments

Comments
 (0)