Tidying pass, demagicking

Author: Sezzary

include/bodyprog/bodyprog.h

@@ -3271,9 +3271,9 @@ s32 func_80046DCC(s32 idx);
 
 void func_80046E00(void);
 
-void func_8004729C(u16 sfx);
+void func_8004729C(u16 sfxId);
 
-void func_800472BC(s32 sfx);
+void func_800472BC(s32 sfxId);
 
 void func_80047308(void);
 
@@ -4734,7 +4734,7 @@ void Game_FlashlightToggle(void);
  */
 bool Game_FlashlightIsOn(void);
 
-/** X and Z are guessed. */
+/** Handles character spawn? */
 void func_80089034(e_CharacterId charaId, s32 spawnIdx, q19_12 posX, q19_12 posZ);
 
 /* Does the map zoom in, red lines? Argument types guessed based on f`unc_800E83C0` in MAP2_S00. */

include/event_flags.h

@@ -229,7 +229,7 @@ typedef enum _EventFlag
 
     EventFlag_260 = 260,
 
-    EventFlag_M3S05_CabinedPushed        = 282,
+    EventFlag_M3S05_CabinetPushed        = 282,
     EventFlag_M3S05_AlcoholPouredOnVines = 283,
     EventFlag_284                        = 284,
     EventFlag_285                        = 285,

include/maps/map1/map1_s03.h

@@ -33,26 +33,24 @@ extern s_WorldObjectDesc g_WorldObject7; // 800E62A0
 extern s_WorldObject_0   g_CommonWorldObjects[6]; // 800E62E0
 
 extern SVECTOR3 D_800CBC04;
-extern s32 D_800E20E8;
+extern s32 D_800E20E8; // Angle.
 extern s16 D_800E20EC;
 extern u8 D_800E20EE;
 
 extern u8 D_800E62D0;
 extern u8 D_800E6388;
-extern s32 D_800E638C;
+extern q19_12 D_800E638C; // Time?
 
 extern u16 D_800E2000[1]; // g_MapMsgSounds
 extern s_FsImageDesc D_800E2004;
 extern VECTOR3 D_800E200C;
 extern s16 D_800E2018;
-extern s32 D_800E201C;
+extern q19_12 D_800E201C; // Time.
 extern u8 D_800E2102; // g_MapMsgSoundIdx
 extern VECTOR3 D_800E6160;
 extern VECTOR3 D_800E6170;
 extern s32 D_800E617C;
 
-
-
 extern s_AnimInfo LOCKER_DEAD_BODY_ANIM_INFOS[8];
 
 void Ai_LockerDeadBody_Update(s_SubCharacter* chara, s_AnmHeader* anmHdr, GsCOORDINATE2* coords);
@@ -61,12 +59,14 @@ void func_800DC2E4(void);
 
 void func_800DC9A0(void);
 
-void func_800DE828(void);
+void func_800DCDDC(void);
 
-void func_800DE624(void);
+void func_800DD3AC(void);
 
 void func_800DD688(void);
 
-void func_800DD3AC(void);
+void func_800DE624(void);
+
+void func_800DE828(void);
 
 #endif

include/maps/shared.h

@@ -2629,7 +2629,7 @@ void sharedFunc_800DF24C_2_s00(s_SubCharacter* chara);
 
 s32 sharedFunc_800D2FB4_0_s01(s_SubCharacter* chara, VECTOR3* playerPos, s32 playerField10C);
 
-void sharedFunc_800D72E8_0_s01(s_SubCharacter* chara, s32 field_34, s32 rotationSpeedY);
+void sharedFunc_800D72E8_0_s01(s_SubCharacter* chara, s32 field_34, s32 rotSpeedY);
 
 void sharedFunc_800D6EC4_0_s01(s_SubCharacter* chara);
 

include/maps/shared/sharedFunc_800D6EC4_0_s01.h

@@ -57,7 +57,7 @@ void sharedFunc_800D6EC4_0_s01(s_SubCharacter* chara)
     }
     else
     {
-        sharedFunc_800D72E8_0_s01(chara, 0, 0);
+        sharedFunc_800D72E8_0_s01(chara, 0, FP_ANGLE(0.0f));
     }
 
     tmp0 = sharedFunc_800D71F0_0_s01(chara->rotationSpeed_2C.vx, sharedData_800E21D0_0_s01.field_B4[2][1], sharedData_800E21D0_0_s01.field_B4[2][2], sharedData_800E21D0_0_s01.field_B4[2][3]);

include/screens/credits/credits.h

@@ -6,7 +6,7 @@
 // Used by `func_801E2E28`.
 typedef struct
 {
-    s16 field_0;
+    s16 field_0; // SFX ID.
     s16 field_2;
     s16 field_4;
 } s_801E5558;

src/bodyprog/bodyprog_80085D78.c

@@ -1442,14 +1442,14 @@ void func_80088FF4(e_CharacterId charaId, s32 spawnIdx, s32 spawnFlags) // 0x800
 
 void func_80089034(e_CharacterId charaId, s32 spawnIdx, q19_12 posX, q19_12 posZ) // 0x80089034
 {
-    s_MapPoint2d* ptr0;
-    s_MapPoint2d* ptr1;
+    s_MapPoint2d* mapPoint0;
+    s_MapPoint2d* mapPoint1;
 
-    ptr0              = &g_MapOverlayHeader.charaSpawns_24C[D_800A98FC[charaId] - 1][spawnIdx];
-    ptr0->positionX_0 = posX;
+    mapPoint0              = &g_MapOverlayHeader.charaSpawns_24C[D_800A98FC[charaId] - 1][spawnIdx];
+    mapPoint0->positionX_0 = posX;
 
-    ptr1              = &g_MapOverlayHeader.charaSpawns_24C[D_800A98FC[charaId] - 1][spawnIdx];
-    ptr1->positionZ_8 = posZ;
+    mapPoint1              = &g_MapOverlayHeader.charaSpawns_24C[D_800A98FC[charaId] - 1][spawnIdx];
+    mapPoint1->positionZ_8 = posZ;
 }
 
 void func_80089090(s32 arg0) // 0x80089090
@@ -1992,8 +1992,10 @@ bool func_80089A30(s_SysWork_2514* arg0, s_func_8009ECCC* arg1, s_8002AC04* arg2
                     {
                         ptr->field_10 = NULL;
                     }
+
                     return false;
                 }
+
                 current = current->next_0;
             }
         }

src/bodyprog/libsd/bodyprog_80045A7C.c

@@ -2067,9 +2067,9 @@ void func_80046E00(void) // 0x80046E00
     }
 }
 
-void func_8004729C(u16 sfx) // 0x8004729C
+void func_8004729C(u16 sfxId) // 0x8004729C
 {
-    func_800472BC(sfx);
+    func_800472BC(sfxId);
 }
 
 void func_800472BC(s32 sfx) // 0x800472BC