map3_s03: Map_WorldObjectsInit

Author: emoose

configs/USA/maps/sym.map3_s03.txt

@@ -82,6 +82,7 @@ Map_RoomIdxGet              = 0x800D1178; // type:func
 MapEvent_DoorJammed         = 0x800D15B8; // type:func
 MapEvent_DoorLocked         = 0x800D164C; // type:func
 MapEvent_DoorUnlocked       = 0x800D16E0; // type:func
+Map_WorldObjectsInit        = 0x800D3EAC; // type:func
 
 
 
@@ -119,3 +120,16 @@ sharedData_800E0CB8_0_s00   = 0x800D8134; // type:u16
 sharedData_800E0CBA_0_s00   = 0x800D8136; // type:s8
 sharedData_800E39D8_0_s00   = 0x800D8138; // type:s32
 sharedData_800D32A0_0_s02   = 0x800D813C; // type:s32
+g_WorldObject_Dr            = 0x800D8148; // type:WorldObjectDescNoRot size:0xD8
+g_WorldObject_Plate0        = 0x800D8238; // type:WorldObjectDesc size:0x2C
+g_WorldObject_Plate1        = 0x800D8268; // type:WorldObjectDescNoRot size:0x24
+g_WorldObject_Panel         = 0x800D8298; // type:WorldObjectDesc size:0x2C
+g_WorldObject_Blood0        = 0x800D82C8; // type:WorldObjectDesc size:0x2C
+g_WorldObject_Lighter       = 0x800D82F8; // type:WorldObjectDesc size:0x2C
+g_WorldObject_Alcohol       = 0x800D8328; // type:WorldObjectDescNoRot size:0x24
+g_WorldObject_Key           = 0x800D8358; // type:WorldObjectDescNoRot size:0x24
+g_WorldObject_Colors        = 0x800D8388; // type:WorldObject_0 size:0x70
+g_WorldObject_SavePad       = 0x800D83F8; // type:WorldObjectDesc size:0x2C
+g_WorldObject_Blood1        = 0x800D8438; // type:WorldObjectDesc size:0x2C
+g_WorldObject_Blood2        = 0x800D8468; // type:WorldObjectDescNoRot size:0x24
+g_CommonWorldObjects        = 0x800D8498; // type:WorldObject_0 size:0xA8

include/maps/map3/map3_s03.h

@@ -19,6 +19,21 @@ extern u16 D_800D6B54;
 
 extern u8 D_800D6BDA;
 
+extern s_WorldObjectDescNoRot g_WorldObject_Dr[6];
+extern s_WorldObjectDesc      g_WorldObject_Plate0;
+extern s_WorldObjectDescNoRot g_WorldObject_Plate1;
+extern s_WorldObjectDesc      g_WorldObject_Panel;
+extern s_WorldObjectDesc      g_WorldObject_Blood0;
+extern s_WorldObjectDesc      g_WorldObject_Lighter;
+extern s_WorldObjectDescNoRot g_WorldObject_Alcohol;
+extern s_WorldObjectDescNoRot g_WorldObject_Key;
+extern s_WorldObject_0        g_WorldObject_Colors[4];
+extern s_WorldObjectDesc      g_WorldObject_SavePad;
+extern s8                     D_800D8428;
+extern s_WorldObjectDesc      g_WorldObject_Blood1;
+extern s_WorldObjectDescNoRot g_WorldObject_Blood2;
+extern s_WorldObject_0        g_CommonWorldObjects[6];
+
 s32 func_800CE398(s32 arg0);
 
 void func_800D1210(s32 arg0);
@@ -57,4 +72,6 @@ void func_800D30FC(void);
 
 void func_800D3128(void);
 
+void Map_WorldObjectsInit(void);
+
 #endif

src/maps/map3_s03/map3_s03.c

@@ -598,7 +598,49 @@ INCLUDE_RODATA("asm/maps/map3_s03/nonmatchings/map3_s03", D_800CB310);
 
 INCLUDE_ASM("asm/maps/map3_s03/nonmatchings/map3_s03", func_800D3160);
 
-INCLUDE_ASM("asm/maps/map3_s03/nonmatchings/map3_s03", func_800D3EAC);
+void Map_WorldObjectsInit(void) // 0x800D3EAC
+{
+    D_800D8428 = 0;
+
+    WorldObjectNoRotInit(&g_WorldObject_Dr[0], "DR1L_HID", 19.1f, 0.0f, 59.1f);
+    WorldObjectNoRotInit(&g_WorldObject_Dr[1], "DR1R_HID", 19.1f, 0.0f, 59.1f);
+    WorldObjectNoRotInit(&g_WorldObject_Dr[2], "DR3L_HID", 19.1f, 0.0f, 59.1f);
+    WorldObjectNoRotInit(&g_WorldObject_Dr[3], "DR3R_HID", 19.1f, 0.0f, 59.1f);
+    WorldObjectNoRotInit(&g_WorldObject_Dr[4], "DR2L_HID", 19.1f, 0.0f, 59.1f);
+    WorldObjectNoRotInit(&g_WorldObject_Dr[5], "DR2R_HID", 19.1f, 0.0f, 59.1f);
+
+    WorldObject_ModelNameSet(&g_WorldObject_Colors[0], "BLUE_HID");
+    WorldObject_ModelNameSet(&g_WorldObject_Colors[1], "GREEN_HI");
+    WorldObject_ModelNameSet(&g_WorldObject_Colors[2], "YELLOW_H");
+    WorldObject_ModelNameSet(&g_WorldObject_Colors[3], "RED_HIDE");
+
+    WorldObjectInit(&g_WorldObject_Plate0, "PLATE_HI", -140.15f, 0.0f, 59.75f, 0.0f, 180.0f, 0.0f);
+
+    WorldObjectNoRotInit(&g_WorldObject_Plate1, "PLATE_HI", -20.0f, 0.0f, -19.2f);
+
+    WorldObjectInit(&g_WorldObject_Panel, "PANEL_HI", -140.0f, 0.0f, -20.0f, 0.0f, 90.0f, 0.0f);
+
+    WorldObjectInit(&g_WorldObject_Blood0, "BLOOD_NE", -57.45f, -0.9f, -21.05f, 0.0f, 90.0f, 0.0f);
+
+    WorldObjectInit(&g_WorldObject_Lighter, "LIGHTER_", -100.7f, 0.0f, 57.95f, 0.0f, 180.0f, 0.0f);
+
+    WorldObjectNoRotInit(&g_WorldObject_Alcohol, "ALCOHOL_", -60.8f, 0.0f, 21.6f);
+
+    WorldObjectNoRotInit(&g_WorldObject_Key, "KEY_HIDE", -99.2f, 0.0f, 22.55f);
+
+    WorldObjectInit(&g_WorldObject_SavePad, D_800A99E4.savePadName_4, -58.6104f, -1.0f, -59.1241f, 0.0f, 9.0f, 0.0f);
+
+    WorldObjectInit(&g_WorldObject_Blood1, "BLOOD_HI", -141.5f, 0.0f, 61.4f, 0.0f, -41.0f, 0.0f);
+
+    WorldObjectNoRotInit(&g_WorldObject_Blood2, "BLOOD_HI", -141.7f, -0.05f, 60.2f);
+
+    WorldObject_ModelNameSet(&g_CommonWorldObjects[0], D_800A99E4.firstAidKitName_8);
+    WorldObject_ModelNameSet(&g_CommonWorldObjects[1], D_800A99E4.healthDrinkName_C);
+    WorldObject_ModelNameSet(&g_CommonWorldObjects[2], D_800A99E4.ampouleName_10);
+    WorldObject_ModelNameSet(&g_CommonWorldObjects[3], D_800A99E4.handgunBulletsName_14);
+    WorldObject_ModelNameSet(&g_CommonWorldObjects[4], D_800A99E4.shotgunShellsName_18);
+    WorldObject_ModelNameSet(&g_CommonWorldObjects[5], D_800A99E4.rifleShellsName_1C);
+}
 
 INCLUDE_ASM("asm/maps/map3_s03/nonmatchings/map3_s03", func_800D429C);