map6_s02: func_800D0500

Author: emoose

configs/maps/sym.map6_s02.txt

@@ -115,6 +115,7 @@ MAP_MESSAGES                        = 0x800D3A4C; // type:u32 size:0x64
 //----------------------------------------------------
 //--- PA: 0x00A538   VA: 0x800D3AB0   subsegment: data
 //----------------------------------------------------
+D_800D3B44                          = 0x800D3B44; // size:0x28
 sharedData_800DFB6C_0_s00           = 0x800D3CAC; // type:s32
 sharedData_800DFB70_0_s00           = 0x800D3CB0; // type:s32
 sharedData_800E1FF8_1_s02           = 0x800D3CBC; // size:0x14

configs/maps/sym.map7_s03.txt

@@ -122,14 +122,14 @@ Ai_Alessa_Init                      = 0x800D3660; // type:func
 //--- PA: 0x00A10C   VA: 0x800D3684   subsegment: c, Chara_BloodyIncubator
 //------------------------------------------------------------------------
 Ai_BloodyIncubator_Update           = 0x800D3684; // type:func
-Ai_BloodyIncubator_AnimUpdate = 0x800D36F8; // type:func
+Ai_BloodyIncubator_AnimUpdate       = 0x800D36F8; // type:func
 Ai_BloodyIncubator_Init             = 0x800D3BA4; // type:func
 
 //------------------------------------------------------------------
 //--- PA: 0x00A64C   VA: 0x800D3BC4   subsegment: c, Chara_Incubator
 //------------------------------------------------------------------
 Ai_Incubator_Update                 = 0x800D3BC4; // type:func
-Ai_Incubator_AnimUpdate = 0x800D3C38; // type:func
+Ai_Incubator_AnimUpdate             = 0x800D3C38; // type:func
 Ai_Incubator_Init                   = 0x800D3F38; // type:func
 
 //-----------------------------------------------------------------

include/bodyprog/bodyprog.h

@@ -3271,9 +3271,9 @@ s32 func_80046DCC(s32 idx);
 
 void func_80046E00(void);
 
-void func_8004729C(u16 arg0);
+void func_8004729C(u16 sfx);
 
-void func_800472BC(s32 arg0);
+void func_800472BC(s32 sfx);
 
 void func_80047308(void);
 

include/bodyprog/sound_effects.h

@@ -223,6 +223,8 @@ typedef enum _SfxId
     Sfx_Unk1609 = 1609, // } Pair.
     Sfx_Unk1610 = 1610, // }
     Sfx_Unk1611 = 1611,
+    Sfx_Unk1612 = 1612,
+    Sfx_Unk1613 = 1613,
 
     Sfx_Unk1617 = 1617,
 
@@ -279,6 +281,12 @@ typedef enum _SfxId
 
     Sfx_Unk1916 = 1916,
 
+    Sfx_Unk4108 = 4108,
+
+    Sfx_Unk4658 = 4658,
+
+    Sfx_Unk4661 = 4661,
+
     Sfx_Unk4664 = 4664,
 
     Sfx_Unk4699 = 4699,

include/event_flags.h

@@ -306,6 +306,8 @@ typedef enum _EventFlag
     EventFlag_412 = 412,
 
     EventFlag_417 = 417,
+    EventFlag_418 = 418,
+    EventFlag_419 = 419,
 
     EventFlag_423 = 423,
     EventFlag_424 = 424,
@@ -437,6 +439,7 @@ typedef enum _EventFlag
     EventFlag_584 = 584,
     EventFlag_586 = 586,
     EventFlag_587 = 587,
+    EventFlag_588 = 588,
 
     /** `MAP0_S01` common item pickups. */
 

include/maps/map6/map6_s02.h

@@ -13,7 +13,7 @@
 
 extern u16 D_800D3B40;
 
-extern s_FsImageDesc D_800D3B44[2];
+extern s_FsImageDesc D_800D3B44[5];
 
 extern u16 D_800D3B6C;
 
@@ -32,6 +32,14 @@ extern s32 D_800D3C90;
 
 extern s16 D_800D3C94;
 
+extern s32 D_800D3C98;
+
+extern u8 D_800D3C9C;
+
+extern s16 D_800D3C9E;
+
+extern s32 D_800D3CA0;
+
 extern u8 D_800D4E08;
 extern s8 D_800D4E09;
 
@@ -41,9 +49,17 @@ extern VECTOR3 D_800D4E1C;
 
 extern s32 D_800D4E28;
 
+extern s8 D_800D4E2C;
+
+extern s8 D_800D4E2D;
+
 void func_800CF0B8(void);
 
 /** Func related to the UFO ending cutscene? */
 void func_800CFC34(void);
 
+void func_800D0500(void);
+
+void func_800D1330(s16);
+
 #endif

src/bodyprog/libsd/bodyprog_80045A7C.c

@@ -2067,14 +2067,14 @@ void func_80046E00(void) // 0x80046E00
     }
 }
 
-void func_8004729C(u16 arg0) // 0x8004729C
+void func_8004729C(u16 sfx) // 0x8004729C
 {
-    func_800472BC(arg0);
+    func_800472BC(sfx);
 }
 
-void func_800472BC(s32 arg0) // 0x800472BC
+void func_800472BC(s32 sfx) // 0x800472BC
 {
-    D_800C1658.field_2 = arg0 & 0xFFF;
+    D_800C1658.field_2 = sfx & 0xFFF;
     D_800C37DC = 1;
 
     if (D_800C1658.field_4 != 0)

src/maps/map0_s01/map0_s01_events.c

@@ -226,12 +226,12 @@ void MapEvent_CafeCutscene() // 0x800DA980
 
         case 21:
             SysWork_StateStepIncrementAfterTime(&g_Timer0, Q12(10.0f), Q12(141.0f), Q12(159.0f), true, true);
-            func_8004729C(4108);
+            func_8004729C(Sfx_Unk4108);
             break;
 
         case 22:
             func_80085EB8(0, &g_SysWork.npcs_1A0[0], 7, false);
-            Sd_EngineCmd(4108);
+            Sd_EngineCmd(Sfx_Unk4108);
             SysWork_StateStepIncrement(0);
 
         case 23: