Archive/TRX
0
0
Fork 0
mirror of https://github.com/LostArtefacts/TRX.git synced 2025-05-08 03:28:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

port LaraColStepRight

Browse source
This commit is contained in:
rr- 2021-02-17 14:10:07 +01:00
parent 7ff797f6e8
commit c821ba65f7
4 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
docs/progress.svg
View file

@ -371,7 +371,7 @@
<rect width="12.00" height="12.00" x="252.00" y="115.00" fill="forestgreen"/>
<rect width="12.00" height="12.00" x="266.00" y="115.00" fill="forestgreen"/>
<rect width="12.00" height="12.00" x="280.00" y="115.00" fill="forestgreen"/>
<rect width="12.00" height="12.00" x="294.00" y="115.00" fill="lightpink"/>
<rect width="12.00" height="12.00" x="294.00" y="115.00" fill="forestgreen"/>
<rect width="12.00" height="12.00" x="308.00" y="115.00" fill="lightpink"/>
<rect width="12.00" height="12.00" x="322.00" y="115.00" fill="lightpink"/>
<rect width="12.00" height="12.00" x="336.00" y="115.00" fill="lightpink"/>
@ -941,7 +941,7 @@
<rect width="13.04" height="13.87" x="667.97" y="322.93" fill="lightpink"/>
<rect width="12.99" height="13.87" x="683.01" y="322.93" fill="lightpink"/>
<rect width="13.01" height="13.80" x="498.73" y="338.80" fill="lightpink"/>
<rect width="13.01" height="13.75" x="498.73" y="354.60" fill="lightpink"/>
<rect width="13.01" height="13.75" x="498.73" y="354.60" fill="forestgreen"/>
<rect width="13.01" height="13.75" x="498.73" y="370.35" fill="lightpink"/>
<rect width="13.01" height="13.75" x="498.73" y="386.10" fill="mistyrose"/>
<rect width="13.01" height="13.60" x="498.73" y="401.85" fill="forestgreen"/>
@ -1403,10 +1403,10 @@
<rect width="-0.56" height="0.65" x="696.56" y="534.29" fill="mistyrose"/>
<rect width="0.16" height="-0.94" x="695.12" y="536.94" fill="mistyrose"/>
<rect width="-1.28" height="-0.94" x="697.28" y="536.94" fill="lightpink"/>
<rect width="12.00" height="12.00" x="0.00" y="564.50" fill="forestgreen"/><text alignment-baseline="central" x="17.00" y="570.50" style="font-family: sans-serif; font-size: 15px">Functions decompiled (count): 13.98%</text>
<rect width="12.00" height="12.00" x="0.00" y="582.50" fill="forestgreen"/><text alignment-baseline="central" x="17.00" y="588.50" style="font-family: sans-serif; font-size: 15px">Functions decompiled (bytesize): 7.12%</text>
<rect width="12.00" height="12.00" x="0.00" y="600.50" fill="lightpink"/><text alignment-baseline="central" x="17.00" y="606.50" style="font-family: sans-serif; font-size: 15px">Functions not decompiled, but with known names (count): 70.33%</text>
<rect width="12.00" height="12.00" x="0.00" y="618.50" fill="lightpink"/><text alignment-baseline="central" x="17.00" y="624.50" style="font-family: sans-serif; font-size: 15px">Functions not decompiled, but with known names (bytesize): 75.29%</text>
<rect width="12.00" height="12.00" x="0.00" y="564.50" fill="forestgreen"/><text alignment-baseline="central" x="17.00" y="570.50" style="font-family: sans-serif; font-size: 15px">Functions decompiled (count): 14.12%</text>
<rect width="12.00" height="12.00" x="0.00" y="582.50" fill="forestgreen"/><text alignment-baseline="central" x="17.00" y="588.50" style="font-family: sans-serif; font-size: 15px">Functions decompiled (bytesize): 7.24%</text>
<rect width="12.00" height="12.00" x="0.00" y="600.50" fill="lightpink"/><text alignment-baseline="central" x="17.00" y="606.50" style="font-family: sans-serif; font-size: 15px">Functions not decompiled, but with known names (count): 70.19%</text>
<rect width="12.00" height="12.00" x="0.00" y="618.50" fill="lightpink"/><text alignment-baseline="central" x="17.00" y="624.50" style="font-family: sans-serif; font-size: 15px">Functions not decompiled, but with known names (bytesize): 75.17%</text>
<rect width="12.00" height="12.00" x="0.00" y="636.50" fill="mistyrose"/><text alignment-baseline="central" x="17.00" y="642.50" style="font-family: sans-serif; font-size: 15px">Functions not decompiled, with unknown names (count): 15.69%</text>
<rect width="12.00" height="12.00" x="0.00" y="654.50" fill="mistyrose"/><text alignment-baseline="central" x="17.00" y="660.50" style="font-family: sans-serif; font-size: 15px">Functions not decompiled, with unknown names (bytesize): 17.59%</text>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 105 KiB

After

Width:  |  Height:  |  Size: 105 KiB

Before After
Before After

2
docs/progress.txt
View file

@ -374,7 +374,7 @@ LaraColSplat 0x004243F0 0x00000064 +
LaraColLand 0x00424460 0x00000013 +
LaraColCompress 0x00424480 0x00000096 +
LaraColBack 0x00424520 0x00000170 +
LaraColStepRight 0x00424690 0x00000136 -
LaraColStepRight 0x00424690 0x00000136 +
LaraColStepLeft 0x004247D0 0x00000136 -
LaraColSlide 0x00424910 0x0000001E -
LaraColBackJump 0x00424930 0x000000A2 -

29
src/game/lara.c
View file

@ -1262,6 +1262,34 @@ void __cdecl LaraColBack(ITEM_INFO* item, COLL_INFO* coll)
item->pos.y += coll->mid_floor;
}
void __cdecl LaraColStepRight(ITEM_INFO* item, COLL_INFO* coll)
{
Lara.move_angle = item->pos.y_rot + 16384;
item->gravity_status = 0;
item->fall_speed = 0;
coll->bad_pos = STEP_L / 2;
coll->bad_neg = -STEP_L / 2;
coll->bad_ceiling = 0;
coll->slopes_are_walls = 1;
coll->slopes_are_pits = 1;
GetLaraCollisionInfo(item, coll);
if (LaraHitCeiling(item, coll)) {
return;
}
if (LaraDeflectEdge(item, coll)) {
item->anim_number = AA_STOP;
item->frame_number = AF_STOP;
}
if (TestLaraSlide(item, coll)) {
return;
}
item->pos.y += coll->mid_floor;
}
void __cdecl GetLaraCollisionInfo(ITEM_INFO* item, COLL_INFO* coll)
{
coll->facing = Lara.move_angle;
@ -1404,6 +1432,7 @@ void TR1MInjectLara()
INJECT(0x00424460, LaraColLand);
INJECT(0x00424480, LaraColCompress);
INJECT(0x00424520, LaraColBack);
INJECT(0x00424690, LaraColStepRight);
INJECT(0x004237A0, LaraAsWaterOut);
}

1
src/game/lara.h
View file

@ -82,6 +82,7 @@ void __cdecl LaraColSplat(ITEM_INFO* item, COLL_INFO* coll);
void __cdecl LaraColLand(ITEM_INFO* item, COLL_INFO* coll);
void __cdecl LaraColCompress(ITEM_INFO* item, COLL_INFO* coll);
void __cdecl LaraColBack(ITEM_INFO* item, COLL_INFO* coll);
void __cdecl LaraColStepRight(ITEM_INFO *item, COLL_INFO *coll);
void __cdecl GetLaraCollisionInfo(ITEM_INFO* item, COLL_INFO* coll);
int32_t __cdecl LaraHitCeiling(ITEM_INFO* item, COLL_INFO* coll);
int32_t __cdecl LaraDeflectEdge(ITEM_INFO* item, COLL_INFO* coll);