map6_s02: Map_WorldObjectsInit

Author: emoose

configs/maps/sym.map6_s02.txt

@@ -88,6 +88,7 @@ sharedFunc_800D929C_0_s00           = 0x800CE87C; // type:func
 MapEvent_DoorJammed                 = 0x800CEF88; // type:func
 MapEvent_DoorLocked                 = 0x800CF01C; // type:func
 SysWork_StateStepIncrementAfterTime = 0x800CFB9C; // type:func
+Map_WorldObjectsInit                = 0x800D1658; // type:func
 
 
 
@@ -129,3 +130,4 @@ sharedData_800E0CBA_0_s00           = 0x800D4DFA; // type:s8
 sharedData_800E39D8_0_s00           = 0x800D4DFC; // type:s32
 sharedData_800D32A0_0_s02           = 0x800D4E00; // type:s32
 sharedData_800D3150_3_s02           = 0x800D4E04; // type:s32
+g_WorldObject_SavePad               = 0x800D4E3C; // type:WorldObjectDesc size:0x2E

include/event_flags.h

@@ -314,6 +314,7 @@ typedef enum _EventFlag
     EventFlag_425 = 425,
     EventFlag_426 = 426,
     EventFlag_427 = 427,
+    EventFlag_428 = 428,
 
     EventFlag_431 = 431,
 

include/maps/map6/map6_s02.h

@@ -53,6 +53,12 @@ extern s8 D_800D4E2C;
 
 extern s8 D_800D4E2D;
 
+extern s8 D_800D4E6C;
+extern s8 D_800D4E6D;
+extern s8 D_800D4E6E;
+
+extern s16 D_800D4E70;
+
 void func_800CF0B8(void);
 
 /** Func related to the UFO ending cutscene? */
@@ -62,4 +68,6 @@ void func_800D0500(void);
 
 void func_800D1330(s16);
 
+void Map_WorldObjectsInit(void);
+
 #endif

src/maps/map6_s02/map6_s02_2.c

@@ -906,7 +906,27 @@ INCLUDE_ASM("asm/maps/map6_s02/nonmatchings/map6_s02_2", func_800D1040);
 
 INCLUDE_ASM("asm/maps/map6_s02/nonmatchings/map6_s02_2", func_800D1330);
 
-INCLUDE_ASM("asm/maps/map6_s02/nonmatchings/map6_s02_2", func_800D1658);
+extern s_WorldObjectDesc g_WorldObject_SavePad;
+
+void Map_WorldObjectsInit(void) // 0x800D1658
+{
+    WorldObjectPoseInit(&g_WorldObject_SavePad.position_1C, -18.85f, 3.06f, -21.16f, 0.0f, 111.6f, 0.0f);
+    WorldObject_ModelNameSet(&g_WorldObject_SavePad.object_0, D_800A99E4.savePadName_4);
+
+    D_800D4E09 = 0;
+    D_800D4E6C = 0;
+    D_800D4E6D = 0;
+    D_800D4E6E = 0;
+    D_800D4E70 = 0;
+
+    g_SysWork.field_235C = NULL;
+    g_SysWork.field_236C = NULL;
+
+    func_8008D438();
+    func_8003ED74(4, 4);
+
+    Savegame_EventFlagSet(EventFlag_428);
+}
 
 INCLUDE_ASM("asm/maps/map6_s02/nonmatchings/map6_s02_2", func_800D1718);