From c3bff3a9cbc69b75aaaac6e021d48de7ef7e5680 Mon Sep 17 00:00:00 2001
From: lahm86 <33758420+lahm86@users.noreply.github.com>
Date: Thu, 24 Oct 2024 11:20:53 +0100
Subject: [PATCH] tr1/data: inject Khamoon trapdoor triggers

This injects dummy triggers in rooms 10 and 18 for trapdoors 33 and 34
in City of Khamoon.

Part of #1744.
---
 data/tr1/ship/data/injections/khamoon_fd.bin | Bin 1036 -> 1080 bytes
 docs/tr1/CHANGELOG.md                        |   1 +
 docs/tr1/README.md                           |   2 +-
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/tr1/ship/data/injections/khamoon_fd.bin b/data/tr1/ship/data/injections/khamoon_fd.bin
index 45f4ec7756f0fafc4be3f0cbce90c43166cf6750..a9bceee83b2bf4530e2d641532b07c36b31b9a1f 100644
GIT binary patch
delta 79
zcmeC-*ulXWV(9C|!N9=4GBMGckz->bKl4Ndj>!ega}2l`Sb>lcD8~fE%pf%#40ehQ
LLJVwJ#FZKV3quNz

delta 34
ocmdnN(Zj(RV(9C|!oa}5GBMGcl?}*{*qF%8JW+vXat`wx0DA%lT>t<8

diff --git a/docs/tr1/CHANGELOG.md b/docs/tr1/CHANGELOG.md
index a7686a427..23d30d190 100644
--- a/docs/tr1/CHANGELOG.md
+++ b/docs/tr1/CHANGELOG.md
@@ -2,6 +2,7 @@
 - added support for wading, similar to TR2+ (#1537)
 - fixed missing pushblock SFX in Natla's Mines (#1714)
 - fixed crash reports not working in certain circumstances (#1738)
+- fixed missing trapdoor triggers in City of Khamoon (#1744)
 - improved enemy item drops by supporting the TR2+ approach of having drops defined in level data (#1713)
 - improved Italian localization for the Config Tool
 
diff --git a/docs/tr1/README.md b/docs/tr1/README.md
index 6f17aa037..68f9821d5 100644
--- a/docs/tr1/README.md
+++ b/docs/tr1/README.md
@@ -444,7 +444,7 @@ Not all options are turned on by default. Refer to `TR1X_ConfigTool.exe` for det
     - **St. Francis' Folly**: moved the music trigger for track 3 in room 4 behind the Neptune door, and restored track 15 to play after using the 4 keys
     - **The Cistern**: missing trigger in room 56 which could result in a softlock
     - **Tomb of Tihocan**: missing trigger in room 62 for enemy 34
-    - **City of Khamoon**: incorrect trapdoor trigger types in rooms 31 and 34
+    - **City of Khamoon**: incorrect trapdoor trigger types in rooms 31 and 34, and missing trapdoor triggers in rooms 10 and 18
     - **Obelisk of Khamoon**: missing switch trigger type in room 66
     - **Natla's Mines**: incorrect flipmap indices in room 85
     - **Atlantean Stronghold**: fixed poorly configured portals between rooms 74 and 12