MAP1_S02: func_800D9EBC

Author: pseregiet

configs/USA/maps/sym.map1_s02.txt

@@ -190,3 +190,4 @@ g_WorldObjectA            = 0x800E5A08; // type:WorldObjectDesc size:0x2E
 g_WorldObjectB            = 0x800E5A38; // type:WorldObjectDesc size:0x2E
 g_WorldObject2            = 0x800E5A68; // type:WorldObjectDesc size:0x2E
 g_CommonWorldObjects      = 0x800E5AA8; // type:WorldObject_0 size:0xA8
+D_800E1210                = 0x800E1210; // type:u16 size:0x54

include/maps/map1/map1_s02.h

@@ -59,6 +59,9 @@ extern u8 D_800E1FD8;
 
 extern q3_12 D_800E1FE4;
 
+extern u8 D_800E1208[8];
+extern u16 D_800E1210[42];
+
 //extern s_WorldObjectDesc D_800E57D8;      // "DOOR_HID", TODO: `g_WorldObject_Door`
 
 //extern s_WorldObjectDescNoRot D_800E58C8; // "BOX_HIDE", TODO: `g_WorldObject_Box`
@@ -105,4 +108,6 @@ void func_800DD494(void);
 
 void func_800DDA84(void);
 
+void func_800D9EBC(void);
+
 #endif

src/maps/map1_s02/map1_s02.c

@@ -178,7 +178,68 @@ INCLUDE_ASM("asm/maps/map1_s02/nonmatchings/map1_s02", sharedFunc_800D99D0_1_s02
 
 #include "maps/shared/Map_RoomIdxGet.h" // 0x800D9E1C
 
-INCLUDE_ASM("asm/maps/map1_s02/nonmatchings/map1_s02", func_800D9EBC);
+void func_800D9EBC(void) // same as `func_800DA4D4` in map1_s03
+{
+    s32 fArg1;
+    s32 roomIdx;
+    s32 flags;
+
+    roomIdx = g_SavegamePtr->mapRoomIdx_A5;
+    flags = D_800E1210[roomIdx];
+    fArg1 = Q12(0.1f);
+
+    switch (roomIdx)
+    {
+        case 23:
+            flags = 1;
+            if (Savegame_MapMarkingGet(MapMarkFlag_AltSchool1F_CourtyardQuestion))
+            {
+                flags = 0x1FE;
+                if (Savegame_MapMarkingGet(MapMarkFlag_308) || Savegame_MapMarkingGet(MapMarkFlag_AltSchool1F_CortyardTopArrows))
+                {
+                    flags = 0x10;
+                }
+            }
+            break;
+
+        case 38:
+            if (Savegame_EventFlagGet(EventFlag_100) && !Savegame_EventFlagGet(EventFlag_107))
+            {
+                flags = 1;
+                fArg1 = Q12(0.3f);
+            }
+            break;
+
+        case 5:
+            if (Savegame_EventFlagGet(EventFlag_121))
+            {
+                fArg1 = Q12(240.0f);
+                if (Savegame_EventFlagGet(EventFlag_96))
+                {
+                    flags |= 8;
+                }
+                else
+                {
+                    flags = 1;
+                }
+            }
+            break;
+
+        case 11:
+            Savegame_EventFlagClear(EventFlag_121);
+            break;
+
+        case 7:
+            if (!Savegame_EventFlagGet(EventFlag_98) && Savegame_EventFlagGet(EventFlag_122))
+            {
+                fArg1 = Q12(240.0f);
+                flags = 1;
+            }
+            break;
+    }
+
+    func_80035F4C(flags, fArg1, D_800E1208);
+}
 
 void func_800DA018(void) {}