From b6586b8c4e204b76e6bcdb669c24c2a454c35ffc Mon Sep 17 00:00:00 2001
From: Marcin Kurczewski <dash@wind.garden>
Date: Sun, 22 Dec 2024 15:17:03 +0100
Subject: [PATCH] tr2: port FX_Turn180

---
 docs/tr2/progress.svg    | 16 ++++++++--------
 docs/tr2/progress.txt    |  2 +-
 src/tr2/decomp/effects.c |  6 ++++++
 src/tr2/decomp/effects.h |  1 +
 src/tr2/global/funcs.h   |  1 -
 src/tr2/inject_exec.c    |  1 +
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/docs/tr2/progress.svg b/docs/tr2/progress.svg
index a4c5cfc28..1ddb82e6d 100644
--- a/docs/tr2/progress.svg
+++ b/docs/tr2/progress.svg
@@ -69,10 +69,10 @@
 </g>
 <g transform="translate(0 116)">
 <text x="0" y="7.50">Tomb2.exe progress according to the physical function order:</text>
-<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">93.97% (1169)</tspan> · <tspan class="known">3.62% (45)</tspan> · <tspan class="todo">0% (0)</tspan> · <tspan class="unused">2.41% (30)</tspan></tspan></text>
+<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">94.05% (1170)</tspan> · <tspan class="known">3.54% (44)</tspan> · <tspan class="todo">0% (0)</tspan> · <tspan class="unused">2.41% (30)</tspan></tspan></text>
 <g transform="translate(0 20)">
-<rect width="701.96" height="6" x="0" y="0" class="decompiled"/>
-<rect width="27.02" height="6" x="701.96" y="0" class="known"/>
+<rect width="702.56" height="6" x="0" y="0" class="decompiled"/>
+<rect width="26.42" height="6" x="702.56" y="0" class="known"/>
 <rect width="18.01" height="6" x="728.99" y="0" class="unused"/>
 </g>
 <g transform="translate(0 31)">
@@ -335,7 +335,7 @@
 <rect width="12" height="12" x="90" y="75" class="decompiled"><title>void __cdecl HotLiquid_Control(int16_t fx_num);</title></rect>
 <rect width="12" height="12" x="105" y="75" class="decompiled"><title>void __cdecl Waterfall_Control(int16_t item_num);</title></rect>
 <rect width="12" height="12" x="120" y="75" class="decompiled"><title>void __cdecl FX_FinishLevel(ITEM *item);</title></rect>
-<rect width="12" height="12" x="135" y="75" class="known"><title>void __cdecl FX_Turn180(ITEM *item);</title></rect>
+<rect width="12" height="12" x="135" y="75" class="decompiled"><title>void __cdecl FX_Turn180(ITEM *item);</title></rect>
 <rect width="12" height="12" x="150" y="75" class="known"><title>void __cdecl FX_FloorShake(ITEM *item);</title></rect>
 <rect width="12" height="12" x="165" y="75" class="known"><title>void __cdecl FX_LaraNormal(ITEM *item);</title></rect>
 <rect width="12" height="12" x="180" y="75" class="known"><title>void __cdecl FX_Boiler(ITEM *item);</title></rect>
@@ -1324,10 +1324,10 @@
 </g>
 <g transform="translate(0 546)">
 <text x="0" y="7.50">Tomb2.exe progress according to the function sizes:</text>
-<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">98.42%</tspan> · <tspan class="known">1.25%</tspan> · <tspan class="todo">0%</tspan> · <tspan class="unused">0.33%</tspan></tspan></text>
+<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">98.43%</tspan> · <tspan class="known">1.25%</tspan> · <tspan class="todo">0%</tspan> · <tspan class="unused">0.33%</tspan></tspan></text>
 <g transform="translate(0 20)">
-<rect width="735.19" height="6" x="0" y="0" class="decompiled"/>
-<rect width="9.37" height="6" x="735.19" y="0" class="known"/>
+<rect width="735.24" height="6" x="0" y="0" class="decompiled"/>
+<rect width="9.32" height="6" x="735.24" y="0" class="known"/>
 <rect width="2.44" height="6" x="744.56" y="0" class="unused"/>
 </g>
 <g transform="translate(0 31)">
@@ -2463,7 +2463,7 @@
 <rect width="1.59" height="1.16" x="745.41" y="340.99" class="unused"><title>sub_44E860</title></rect>
 <rect width="1.28" height="1.46" x="717.27" y="345.15" class="decompiled"><title>void __cdecl SE_GraphicsAdapterSet(HWND hwndDlg, DISPLAY_ADAPTER_NODE *adapter);</title></rect>
 <rect width="1.28" height="1.46" x="721.55" y="345.15" class="decompiled"><title>void __cdecl S_Audio_Sample_OutCloseTrack(int32_t track_id);</title></rect>
-<rect width="1.09" height="1.46" x="725.82" y="345.15" class="known"><title>void __cdecl FX_Turn180(ITEM *item);</title></rect>
+<rect width="1.09" height="1.46" x="725.82" y="345.15" class="decompiled"><title>void __cdecl FX_Turn180(ITEM *item);</title></rect>
 <rect width="1.09" height="1.46" x="729.92" y="345.15" class="known"><title>void __cdecl FX_InvisibilityOff(ITEM *item);</title></rect>
 <rect width="1.09" height="1.46" x="734.01" y="345.15" class="decompiled"><title>void __cdecl BridgeFlat_Floor(const ITEM *item, int32_t x, int32_t y, int32_t z, int32_t *out_height);</title></rect>
 <rect width="1.09" height="1.46" x="738.10" y="345.15" class="decompiled"><title>void __cdecl HWR_BeginScene(void);</title></rect>
diff --git a/docs/tr2/progress.txt b/docs/tr2/progress.txt
index 06c6804d5..a8adebbae 100644
--- a/docs/tr2/progress.txt
+++ b/docs/tr2/progress.txt
@@ -3243,7 +3243,7 @@ typedef enum {
 0x0041CD20  0x00DE  +       void __cdecl HotLiquid_Control(int16_t fx_num);
 0x0041CE00  0x013D  +       void __cdecl Waterfall_Control(int16_t item_num);
 0x0041CF40  0x000B  +       void __cdecl FX_FinishLevel(ITEM *item);
-0x0041CF50  0x0016  -       void __cdecl FX_Turn180(ITEM *item);
+0x0041CF50  0x0016  +       void __cdecl FX_Turn180(ITEM *item);
 0x0041CF70  0x0096  -       void __cdecl FX_FloorShake(ITEM *item);
 0x0041D010  0x0040  -       void __cdecl FX_LaraNormal(ITEM *item);
 0x0041D050  0x001C  -       void __cdecl FX_Boiler(ITEM *item);
diff --git a/src/tr2/decomp/effects.c b/src/tr2/decomp/effects.c
index 862f3cbf5..afe65e352 100644
--- a/src/tr2/decomp/effects.c
+++ b/src/tr2/decomp/effects.c
@@ -382,3 +382,9 @@ void __cdecl FX_FinishLevel(ITEM *const item)
 {
     g_LevelComplete = true;
 }
+
+void __cdecl FX_Turn180(ITEM *const item)
+{
+    item->rot.x = -item->rot.x;
+    item->rot.y += PHD_180;
+}
diff --git a/src/tr2/decomp/effects.h b/src/tr2/decomp/effects.h
index b87b4a9cf..17dc94cc3 100644
--- a/src/tr2/decomp/effects.h
+++ b/src/tr2/decomp/effects.h
@@ -47,3 +47,4 @@ void __cdecl DoLotsOfBlood(
 void __cdecl Richochet(const GAME_VECTOR *pos);
 
 void __cdecl FX_FinishLevel(ITEM *item);
+void __cdecl FX_Turn180(ITEM *item);
diff --git a/src/tr2/global/funcs.h b/src/tr2/global/funcs.h
index 5e141e49c..a2a0321d5 100644
--- a/src/tr2/global/funcs.h
+++ b/src/tr2/global/funcs.h
@@ -6,7 +6,6 @@
 
 // clang-format off
 #define Output_InsertInventoryBackground ((void __cdecl (*)(const int16_t *obj_ptr))0x00401D50)
-#define FX_Turn180 ((void __cdecl (*)(ITEM *item))0x0041CF50)
 #define FX_FloorShake ((void __cdecl (*)(ITEM *item))0x0041CF70)
 #define FX_LaraNormal ((void __cdecl (*)(ITEM *item))0x0041D010)
 #define FX_Boiler ((void __cdecl (*)(ITEM *item))0x0041D050)
diff --git a/src/tr2/inject_exec.c b/src/tr2/inject_exec.c
index 482dc722c..0ff81facd 100644
--- a/src/tr2/inject_exec.c
+++ b/src/tr2/inject_exec.c
@@ -259,6 +259,7 @@ static void M_DecompEffects(const bool enable)
     INJECT(enable, 0x0041C7F0, Richochet);
     INJECT(enable, 0x0041CA90, Splash);
     INJECT(enable, 0x0041CF40, FX_FinishLevel);
+    INJECT(enable, 0x0041CF50, FX_Turn180);
     INJECT(enable, 0x0041D780, FX_LaraHandsFree);
     INJECT(enable, 0x0041DB50, Knife);
     INJECT(enable, 0x00433360, Effect_ExplodingDeath);