fix Pyramid secret trigger

Author: rr-

README.md

@@ -41,7 +41,8 @@ Currently the following configuration options are supported:
     - <kbd>4</kbd>: draw UZI
     - <kbd>8</kbd>: use small medpack
     - <kbd>9</kbd>: use large medpack
-- `healthbar_showing_mode`: change when the healthbar is displayed. Possible values:
+- `healthbar_showing_mode`: change when the healthbar is displayed.
+  Possible values:
     - `always`: always show the healthbar
     - `flashing`: show the healthbar only when Lara's health is 20% or below
     - `default`: show the healthbar at the beginning of a level, after
@@ -50,6 +51,8 @@ Currently the following configuration options are supported:
   Action key held.
 - `fix_tihocan_secret_sound`: disable the secret sound incorrectly playing
   during using the golden key in Tomb of Tihocan.
+- `fix_pyramid_secret_trigger`: fix the secret trigger in the final level not
+  working.
 - `fix_hardcoded_secret_counts`: calculate the number of secrets based on a
   trigger count within a file rather than using hardcoded values.
 

Tomb1Main.json

@@ -13,5 +13,6 @@
     "healthbar_showing_mode": "flashing",
     "fix_end_of_level_freeze": true,
     "fix_tihocan_secret_sound": true,
+    "fix_pyramid_secret_trigger": true,
     "fix_hardcoded_secret_counts": true
 }

src/main.c

@@ -107,6 +107,8 @@ static int Tomb1MReadConfig()
         tr1m_json_get_boolean_value(json, "fix_end_of_level_freeze");
     Tomb1MConfig.fix_tihocan_secret_sound =
         tr1m_json_get_boolean_value(json, "fix_tihocan_secret_sound");
+    Tomb1MConfig.fix_pyramid_secret_trigger =
+        tr1m_json_get_boolean_value(json, "fix_pyramid_secret_trigger");
     Tomb1MConfig.fix_hardcoded_secret_counts =
         tr1m_json_get_boolean_value(json, "fix_hardcoded_secret_counts");
 

src/mod.c

@@ -160,9 +160,8 @@ int Tomb1MGetSecretCount()
 
     for (int i = 0; i < RoomCount; i++) {
         ROOM_INFO* r = &RoomInfo[i];
-        for (int j = 0; j < r->y_size * r->x_size; j++) {
-            FLOOR_INFO* floor = &r->floor[j];
-
+        FLOOR_INFO* floor = &r->floor[0];
+        for (int j = 0; j < r->y_size * r->x_size; j++, floor++) {
             int k = floor->index;
             if (!k) {
                 continue;
@@ -194,9 +193,7 @@ int Tomb1MGetSecretCount()
                         int16_t command = FloorData[k++];
                         if (TRIG_BITS(command) == TO_CAMERA) {
                             k++;
-                        }
-
-                        if (TRIG_BITS(command) == TO_SECRET) {
+                        } else if (TRIG_BITS(command) == TO_SECRET) {
                             int16_t number = command & VALUE_BITS;
                             if (!(secrets & (1 << number))) {
                                 secrets |= (1 << number);
@@ -221,3 +218,75 @@ int Tomb1MGetSecretCount()
 
     return count;
 }
+
+void Tomb1MFixPyramidSecretTrigger()
+{
+    if (CurrentLevel != LV_LEVEL10C) {
+        return;
+    }
+
+    uint32_t global_secrets = 0;
+
+    for (int i = 0; i < RoomCount; i++) {
+        uint32_t room_secrets = 0;
+        ROOM_INFO* r = &RoomInfo[i];
+        FLOOR_INFO* floor = &r->floor[0];
+        for (int j = 0; j < r->y_size * r->x_size; j++, floor++) {
+            int k = floor->index;
+            if (!k) {
+                continue;
+            }
+
+            while (k < FloorDataSize) {
+                uint16_t floor = FloorData[k++];
+
+                switch (floor & DATA_TYPE) {
+                case FT_DOOR:
+                case FT_ROOF:
+                case FT_TILT:
+                    k++;
+                    break;
+
+                case FT_LAVA:
+                    break;
+
+                case FT_TRIGGER: {
+                    uint16_t trig_type = (floor & 0x3F00) >> 8;
+                    k++; // skip basic trigger stuff
+
+                    if (trig_type == TT_SWITCH || trig_type == TT_KEY
+                        || trig_type == TT_PICKUP) {
+                        k++;
+                    }
+
+                    while (1) {
+                        int16_t* command = &FloorData[k++];
+                        if (TRIG_BITS(*command) == TO_CAMERA) {
+                            k++;
+                        } else if (TRIG_BITS(*command) == TO_SECRET) {
+                            int16_t number = *command & VALUE_BITS;
+                            if (global_secrets & (1 << number) && number == 0) {
+                                // the secret number was already used.
+                                // update the number to 2.
+                                *command |= 2;
+                            } else {
+                                room_secrets |= (1 << number);
+                            }
+                        }
+
+                        if (*command & END_BIT) {
+                            break;
+                        }
+                    }
+                    break;
+                }
+                }
+
+                if (floor & END_BIT) {
+                    break;
+                }
+            }
+        }
+        global_secrets |= room_secrets;
+    }
+}

src/mod.h

@@ -31,6 +31,7 @@ struct {
     int8_t healthbar_showing_mode;
     int8_t fix_end_of_level_freeze;
     int8_t fix_tihocan_secret_sound;
+    int8_t fix_pyramid_secret_trigger;
     int8_t fix_hardcoded_secret_counts;
 } Tomb1MConfig;
 
@@ -50,5 +51,6 @@ int Tomb1MGetRenderWidthDownscaled();
 int Tomb1MGetRenderHeight();
 int Tomb1MGetRenderWidth();
 int Tomb1MGetSecretCount();
+void Tomb1MFixPyramidSecretTrigger();
 
 #endif

src/specific/file.c

@@ -290,6 +290,9 @@ int32_t __cdecl S_LoadLevel(int level_id)
         }
     }
 
+    if (Tomb1MConfig.fix_pyramid_secret_trigger) {
+        Tomb1MFixPyramidSecretTrigger();
+    }
     if (Tomb1MConfig.fix_hardcoded_secret_counts) {
         SecretTotals[level_id] = Tomb1MGetSecretCount();
     }