count secrets automatically

Author: rr-

README.md

@@ -50,6 +50,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_hardcoded_secret_counts`: calculate the number of secrets based on a
+  trigger count within a file rather than using hardcoded values.
 
 ## Decompilation progress
 

Tomb1Main.json

@@ -12,5 +12,6 @@
     "enable_numeric_keys": true,
     "healthbar_showing_mode": "flashing",
     "fix_end_of_level_freeze": true,
-    "fix_tihocan_secret_sound": true
+    "fix_tihocan_secret_sound": true,
+    "fix_hardcoded_secret_counts": true
 }

src/game/const.h

@@ -100,5 +100,9 @@
 #define VAULT_ANGLE (30 * ONE_DEGREE)
 #define HANG_ANGLE (35 * ONE_DEGREE)
 #define FRAME_ROT 10
+#define END_BIT 0x8000
+#define DATA_TYPE 0x00FF
+#define VALUE_BITS 0x03FF
+#define TRIG_BITS(T) ((T & 0x3FFF) >> 10)
 
 #endif

src/game/types.h

@@ -611,6 +611,41 @@ typedef enum {
     RF_UNDERWATER = 1,
 } ROOM_FLAGS;
 
+typedef enum {
+    FT_FLOOR = 0,
+    FT_DOOR = 1,
+    FT_TILT = 2,
+    FT_ROOF = 3,
+    FT_TRIGGER = 4,
+    FT_LAVA = 5,
+} FLOOR_TYPES;
+
+typedef enum {
+    TT_TRIGGER = 0,
+    TT_PAD = 1,
+    TT_SWITCH = 2,
+    TT_KEY = 3,
+    TT_PICKUP = 4,
+    TT_HEAVY = 5,
+    TT_ANTIPAD = 6,
+    TT_COMBAT = 7,
+    TT_DUMMY = 8,
+} TRIGGER_TYPES;
+
+typedef enum {
+    TO_OBJECT,
+    TO_CAMERA,
+    TO_SINK,
+    TO_FLIPMAP,
+    TO_FLIPON,
+    TO_FLIPOFF,
+    TO_TARGET,
+    TO_FINISH,
+    TO_CD,
+    TO_FLIPEFFECT,
+    TO_SECRET
+} TRIGGER_OBJECTS;
+
 #pragma pack(push, 1)
 
 typedef struct {

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_hardcoded_secret_counts =
+        tr1m_json_get_boolean_value(json, "fix_hardcoded_secret_counts");
 
     json_value_free(json);
     free(cfg_data);

src/mod.c

@@ -152,3 +152,72 @@ void Tomb1MRenderBar(int value, int value_max, int bar_type)
         }
     }
 }
+
+int Tomb1MGetSecretCount()
+{
+    int count = 0;
+    uint32_t secrets = 0;
+
+    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];
+
+            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++;
+                        }
+
+                        if (TRIG_BITS(command) == TO_SECRET) {
+                            int16_t number = command & VALUE_BITS;
+                            if (!(secrets & (1 << number))) {
+                                secrets |= (1 << number);
+                                count++;
+                            }
+                        }
+
+                        if (command & END_BIT) {
+                            break;
+                        }
+                    }
+                    break;
+                }
+                }
+
+                if (floor & END_BIT) {
+                    break;
+                }
+            }
+        }
+    }
+
+    return count;
+}

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_hardcoded_secret_counts;
 } Tomb1MConfig;
 
 struct {
@@ -48,5 +49,6 @@ int Tomb1MGetRenderHeightDownscaled();
 int Tomb1MGetRenderWidthDownscaled();
 int Tomb1MGetRenderHeight();
 int Tomb1MGetRenderWidth();
+int Tomb1MGetSecretCount();
 
 #endif

src/specific/file.c

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

src/specific/game.c

@@ -99,8 +99,7 @@ void __cdecl LevelStats(int level_id)
         "SECRETS", // TODO: translation
         secrets_taken,
         "OF", // TODO: translation
-        SecretTotals[level_id] // TODO: calculate this automatically
-    );
+        SecretTotals[level_id]);
     txt = T_Print(0, 40, 0, string);
     T_CentreH(txt, 1);
     T_CentreV(txt, 1);