Game-Decompilation/TR2X
1
0
Fork 0
mirror of https://github.com/LostArtefacts/TR2X.git synced 2024-12-02 10:56:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

port Inv_Ring_MotionItemDeselect

Browse Source
This commit is contained in:
Marcin Kurczewski 2024-09-05 17:06:32 +02:00
parent 2f3daf8a69
commit a256869495
No known key found for this signature in database
GPG Key ID: CC65E6FD28CAE42A
6 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docs/progress.svg
View File

@ -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">60.18% (733)</tspan> · <tspan class="known">37.36% (455)</tspan> · <tspan class="todo">0% (0)</tspan> · <tspan class="unused">2.46% (30)</tspan></tspan></text>
<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">60.26% (734)</tspan> · <tspan class="known">37.27% (454)</tspan> · <tspan class="todo">0% (0)</tspan> · <tspan class="unused">2.46% (30)</tspan></tspan></text>
<g transform="translate(0 20)">
<rect width="449.55" height="6" x="0" y="0" class="decompiled"/>
<rect width="279.05" height="6" x="449.55" y="0" class="known"/>
<rect width="450.16" height="6" x="0" y="0" class="decompiled"/>
<rect width="278.44" height="6" x="450.16" y="0" class="known"/>
<rect width="18.40" height="6" x="728.60" y="0" class="unused"/>
</g>
<g transform="translate(0 31)">
@ -436,7 +436,7 @@
<rect width="12" height="12" x="105" y="105" class="decompiled"><title>void __cdecl Inv_Ring_MotionCameraPos(RING_INFO *ring, int16_t target);</title></rect>
<rect width="12" height="12" x="120" y="105" class="decompiled"><title>void __cdecl Inv_Ring_MotionCameraPitch(RING_INFO *ring, int16_t target);</title></rect>
<rect width="12" height="12" x="135" y="105" class="decompiled"><title>void __cdecl Inv_Ring_MotionItemSelect(RING_INFO *ring, INVENTORY_ITEM *inv_item);</title></rect>
<rect width="12" height="12" x="150" y="105" class="known"><title>void __cdecl Inv_Ring_MotionItemDeselect(RING_INFO *ring, INVENTORY_ITEM *inv_item);</title></rect>
<rect width="12" height="12" x="150" y="105" class="decompiled"><title>void __cdecl Inv_Ring_MotionItemDeselect(RING_INFO *ring, INVENTORY_ITEM *inv_item);</title></rect>
<rect width="12" height="12" x="165" y="105" class="decompiled"><title>void __cdecl Requester_Init(REQUEST_INFO *req);</title></rect>
<rect width="12" height="12" x="180" y="105" class="decompiled"><title>void __cdecl Requester_Shutdown(REQUEST_INFO *req);</title></rect>
<rect width="12" height="12" x="195" y="105" class="decompiled"><title>void __cdecl Requester_Item_CenterAlign(REQUEST_INFO *req, TEXTSTRING *txt);</title></rect>
@ -1298,10 +1298,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">64.13%</tspan> · <tspan class="known">35.54%</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">64.16%</tspan> · <tspan class="known">35.51%</tspan> · <tspan class="todo">0%</tspan> · <tspan class="unused">0.33%</tspan></tspan></text>
<g transform="translate(0 20)">
<rect width="479.05" height="6" x="0" y="0" class="decompiled"/>
<rect width="265.51" height="6" x="479.05" y="0" class="known"/>
<rect width="479.27" height="6" x="0" y="0" class="decompiled"/>
<rect width="265.29" height="6" x="479.27" y="0" class="known"/>
<rect width="2.44" height="6" x="744.56" y="0" class="unused"/>
</g>
<g transform="translate(0 31)">
@ -2021,7 +2021,7 @@
<rect width="6.36" height="5.78" x="598.66" y="316.80" class="known"><title>void __cdecl swap_meshes_with_meshswap1(ITEM_INFO *item);</title></rect>
<rect width="6.36" height="5.78" x="598.66" y="325.58" class="known"><title>void __cdecl swap_meshes_with_meshswap2(ITEM_INFO *item);</title></rect>
<rect width="6.36" height="5.78" x="598.66" y="334.36" class="decompiled"><title>void __cdecl Inv_Ring_MotionInit(RING_INFO *ring, int16_t frames, int16_t status, int16_t status_target);</title></rect>
<rect width="6.36" height="5.78" x="598.66" y="343.14" class="known"><title>void __cdecl Inv_Ring_MotionItemDeselect(RING_INFO *ring, INVENTORY_ITEM *inv_item);</title></rect>
<rect width="6.36" height="5.78" x="598.66" y="343.14" class="decompiled"><title>void __cdecl Inv_Ring_MotionItemDeselect(RING_INFO *ring, INVENTORY_ITEM *inv_item);</title></rect>
<rect width="6.36" height="5.69" x="598.66" y="351.92" class="known"><title>void __cdecl InitialiseStartInfo(void);</title></rect>
<rect width="6.36" height="5.69" x="598.66" y="360.62" class="known"><title>void __cdecl IncreaseScreenSize(void);</title></rect>
<rect width="6.36" height="5.69" x="598.66" y="369.31" class="known"><title>void __cdecl DecreaseScreenSize(void);</title></rect>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 364 KiB

After

Width:  |  Height:  |  Size: 364 KiB

2
docs/progress.txt
View File

@ -3234,7 +3234,7 @@ typedef enum {
0x00425480 0x0025 + void __cdecl Inv_Ring_MotionCameraPos(RING_INFO *ring, int16_t target);
0x004254B0 0x0020 + void __cdecl Inv_Ring_MotionCameraPitch(RING_INFO *ring, int16_t target);
0x004254D0 0x005D + void __cdecl Inv_Ring_MotionItemSelect(RING_INFO *ring, INVENTORY_ITEM *inv_item);
0x00425530 0x0063 - void __cdecl Inv_Ring_MotionItemDeselect(RING_INFO *ring, INVENTORY_ITEM *inv_item);
0x00425530 0x0063 + void __cdecl Inv_Ring_MotionItemDeselect(RING_INFO *ring, INVENTORY_ITEM *inv_item);
# game/invtext.c
0x004255A0 0x0082 + void __cdecl Requester_Init(REQUEST_INFO *req);

15
src/game/inventory/ring.c
View File

@ -275,3 +275,18 @@ void __cdecl Inv_Ring_MotionItemSelect(
imo->item_z_trans_target = inv_item->z_trans_sel;
imo->item_z_trans_rate = inv_item->z_trans_sel / imo->count;
}
void __cdecl Inv_Ring_MotionItemDeselect(
RING_INFO *const ring, const INVENTORY_ITEM *const inv_item)
{
IMOTION_INFO *const imo = ring->imo;
imo->item_pt_x_rot_target = 0;
imo->item_pt_x_rot_rate = -(inv_item->x_rot_pt_sel / imo->count);
imo->item_x_rot_target = inv_item->x_rot_nosel;
imo->item_x_rot_rate =
(inv_item->x_rot_nosel - inv_item->x_rot_sel) / imo->count;
imo->item_y_trans_target = 0;
imo->item_y_trans_rate = -(inv_item->y_trans_sel / imo->count);
imo->item_z_trans_target = 0;
imo->item_z_trans_rate = -(inv_item->z_trans_sel / imo->count);
}

2
src/game/inventory/ring.h
View File

@ -24,3 +24,5 @@ void __cdecl Inv_Ring_MotionCameraPos(RING_INFO *ring, int16_t target);
void __cdecl Inv_Ring_MotionCameraPitch(RING_INFO *ring, int16_t target);
void __cdecl Inv_Ring_MotionItemSelect(
RING_INFO *ring, const INVENTORY_ITEM *inv_item);
void __cdecl Inv_Ring_MotionItemDeselect(
RING_INFO *ring, const INVENTORY_ITEM *inv_item);

1
src/global/funcs.h
View File

@ -105,7 +105,6 @@
#define Inv_RemoveAllItems ((void __cdecl (*)(void))0x00424CB0)
#define Inv_RemoveItem ((int32_t __cdecl (*)(GAME_OBJECT_ID object_num))0x00424CD0)
#define RemoveInventoryText ((void __cdecl (*)(void))0x00424FD0)
#define Inv_Ring_MotionItemDeselect ((void __cdecl (*)(RING_INFO *ring, INVENTORY_ITEM *inv_item))0x00425530)
#define HarpoonBolt_Control ((void __cdecl (*)(int16_t item_num))0x0042C0F0)
#define Rocket_Control ((void __cdecl (*)(int16_t item_num))0x0042C530)
#define Flare_DoLight ((int32_t __cdecl (*)(XYZ_32 *pos, int32_t flare_age))0x0042F7A0)

1
src/inject_exec.c
View File

@ -636,6 +636,7 @@ static void Inject_Inventory(const bool enable)
INJECT(enable, 0x00425480, Inv_Ring_MotionCameraPos);
INJECT(enable, 0x004254B0, Inv_Ring_MotionCameraPitch);
INJECT(enable, 0x004254D0, Inv_Ring_MotionItemSelect);
INJECT(enable, 0x00425530, Inv_Ring_MotionItemDeselect);
}
static void Inject_Lara_Control(const bool enable)