map7_s03: func_800E62CC

Author: emoose

include/bodyprog/sound_effects.h

@@ -304,15 +304,15 @@ typedef enum _SfxId
 
     Sfx_Unk1916 = 1916,
 
-	/** Values starting from `4096` are XA files defined at `g_XaItemData` struct.
-	 * In both `Sd_XaAudioPlayCmdAdd` (call through `Sd_EngineCmd`) and `Sd_XaPreLoadAudioCmdAdd`
-	 * (call through `Sd_XaPreLoadAudio`) when the command get assigned to
-	 * `D_800C1658.xaAudioIdxCheck_2` or `D_800C1658.xaAudioIdxCheck_4` it also pass through a
-	 * AND bitwise operator with the value of `0xFFF`. This make sense as `4096` in hexadecimal
-	 * is `0x1000` meaning that the fourth value (1) is getting ignored and is only considering
-	 * the other values which start from 0.
-	 */
-	
+    /** Values starting from `4096` are XA files defined at `g_XaItemData` struct.
+     * In both `Sd_XaAudioPlayCmdAdd` (call through `Sd_EngineCmd`) and `Sd_XaPreLoadAudioCmdAdd`
+     * (call through `Sd_XaPreLoadAudio`) when the command get assigned to
+     * `D_800C1658.xaAudioIdxCheck_2` or `D_800C1658.xaAudioIdxCheck_4` it also pass through a
+     * AND bitwise operator with the value of `0xFFF`. This make sense as `4096` in hexadecimal
+     * is `0x1000` meaning that the fourth value (1) is getting ignored and is only considering
+     * the other values which start from 0.
+     */
+
     Sfx_XaAudio12 = 4108,
 
     Sfx_XaAudio53 = 4149,
@@ -326,8 +326,13 @@ typedef enum _SfxId
 
     Sfx_XaAudio568 = 4664,
 
+    Sfx_XaAudio596 = 4692,
+
     Sfx_XaAudio600 = 4696,
+
     Sfx_XaAudio603 = 4699,
 
+    Sfx_XaAudio657 = 4753,
+
     Sfx_Hack = NO_VALUE, // @hack Force enum to be treated as `s32`.
 } e_SfxId;

include/maps/map7/map7_s03.h

@@ -38,17 +38,30 @@
 #define MAP_ROOM_MIN_Z    Q12(-160.0f)
 #define MAP_ROOM_MAX_Z    Q12(0.f)
 
+typedef struct
+{
+    VECTOR3 field_0;
+    u8      unk_C[4];
+    u8      unk_10[0x28];
+    s32     flags_38;
+} s_800ED7E0_ptr;
+STATIC_ASSERT_SIZEOF(s_800ED7E0_ptr, 0x3C);
+
 extern s32 D_800ED73C; // } RNG related values?
 extern s32 D_800ED740; // }
 
 extern u16 D_800ED77C;
 
+extern s_800ED7E0_ptr* D_800ED7E0[];
+
 extern u16 D_800ED88C;
 
 extern s32 D_800EDA00;
 
 extern u8 D_800EDA08;
 
+extern s32 D_800EDA0C;
+
 extern s16 D_800F23D0;
 
 extern s32 D_800F23D4;
@@ -89,6 +102,8 @@ extern u8 D_800F481B;
 
 extern s32 D_800F4820;
 
+extern s32 D_800F4824;
+
 extern s32 D_800F4828;
 
 extern s32 D_800F4830;
@@ -121,6 +136,10 @@ void func_800D7CEC(void);
 
 void func_800D7CF8(void);
 
+void func_800D7D74(s32);
+
+void func_800D7E50(VECTOR3*);
+
 void func_800D7ED0(void);
 
 void func_800D7EF0(void);
@@ -129,13 +148,17 @@ PACKET* func_800D7F10(void);
 
 void func_800D7F20(u8* arg0);
 
+void func_800D8858(s32);
+
 void func_800D88C4(void);
 
 void func_800D88CC(void);
 void func_800D88D8(void);
 
 void func_800D9394(void);
 
+void func_800D947C(void);
+
 void func_800DB608(void);
 void func_800DD67C(VECTOR3*, s_SubCharacter*, GsCOORDINATE2*);
 void func_800DD7D0(VECTOR3*);
@@ -144,6 +167,7 @@ u8   func_800DD964(void);
 void func_800DD98C(s32);
 void func_800DD9B0(s_SubCharacter*);
 void func_800DD9D4(s_SubCharacter*);
+void func_800DD9F8(s_SubCharacter*);
 bool Ai_Incubus_Init(s_SubCharacter* chara, GsCOORDINATE2* coords);
 void func_800DDBBC(s_SubCharacter*);
 void func_800DEC74(s_SubCharacter*, GsCOORDINATE2*);
@@ -198,6 +222,8 @@ void func_800E4714(void);
 
 void func_800E514C(void);
 
+void func_800E62CC(void);
+
 void func_800E70F0(void);
 
 void func_800E9260(e_CharacterId, s32);