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

port LaraColLeftJump

Browse source
This commit is contained in:
rr- 2021-02-17 14:30:56 +01:00
parent 815f60b9ec
commit b98cc8f366
4 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
docs/progress.svg
View file

@ -376,7 +376,7 @@
<rect width="12.00" height="12.00" x="322.00" y="115.00" fill="forestgreen"/> <rect width="12.00" height="12.00" x="322.00" y="115.00" fill="forestgreen"/>
<rect width="12.00" height="12.00" x="336.00" y="115.00" fill="forestgreen"/> <rect width="12.00" height="12.00" x="336.00" y="115.00" fill="forestgreen"/>
<rect width="12.00" height="12.00" x="350.00" y="115.00" fill="forestgreen"/> <rect width="12.00" height="12.00" x="350.00" y="115.00" fill="forestgreen"/>
<rect width="12.00" height="12.00" x="364.00" y="115.00" fill="lightpink"/> <rect width="12.00" height="12.00" x="364.00" y="115.00" fill="forestgreen"/>
<rect width="12.00" height="12.00" x="378.00" y="115.00" fill="lightpink"/> <rect width="12.00" height="12.00" x="378.00" y="115.00" fill="lightpink"/>
<rect width="12.00" height="12.00" x="392.00" y="115.00" fill="lightpink"/> <rect width="12.00" height="12.00" x="392.00" y="115.00" fill="lightpink"/>
<rect width="12.00" height="12.00" x="406.00" y="115.00" fill="lightpink"/> <rect width="12.00" height="12.00" x="406.00" y="115.00" fill="lightpink"/>
@ -1070,7 +1070,7 @@
<rect width="9.13" height="9.17" x="564.49" y="438.71" fill="lightpink"/> <rect width="9.13" height="9.17" x="564.49" y="438.71" fill="lightpink"/>
<rect width="9.13" height="9.10" x="564.49" y="449.88" fill="forestgreen"/> <rect width="9.13" height="9.10" x="564.49" y="449.88" fill="forestgreen"/>
<rect width="9.13" height="9.10" x="564.49" y="460.98" fill="forestgreen"/> <rect width="9.13" height="9.10" x="564.49" y="460.98" fill="forestgreen"/>
<rect width="9.13" height="9.10" x="564.49" y="472.08" fill="lightpink"/> <rect width="9.13" height="9.10" x="564.49" y="472.08" fill="forestgreen"/>
<rect width="9.13" height="9.03" x="564.49" y="483.18" fill="mistyrose"/> <rect width="9.13" height="9.03" x="564.49" y="483.18" fill="mistyrose"/>
<rect width="9.13" height="9.03" x="564.49" y="494.21" fill="mistyrose"/> <rect width="9.13" height="9.03" x="564.49" y="494.21" fill="mistyrose"/>
<rect width="9.13" height="8.96" x="564.49" y="505.25" fill="lightpink"/> <rect width="9.13" height="8.96" x="564.49" y="505.25" fill="lightpink"/>
@ -1403,10 +1403,10 @@
<rect width="-0.56" height="0.65" x="696.56" y="534.29" fill="mistyrose"/> <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="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="-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): 14.69%</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.84%</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.51%</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.58%</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): 69.61%</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): 69.47%</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): 74.90%</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): 74.83%</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="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> <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> </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

@ -379,7 +379,7 @@ LaraColStepLeft 0x004247D0 0x00000136 +
LaraColSlide 0x00424910 0x0000001E + LaraColSlide 0x00424910 0x0000001E +
LaraColBackJump 0x00424930 0x000000A2 + LaraColBackJump 0x00424930 0x000000A2 +
LaraColRightJump 0x004249E0 0x000000A2 + LaraColRightJump 0x004249E0 0x000000A2 +
LaraColLeftJump 0x00424A90 0x000000A2 - LaraColLeftJump 0x00424A90 0x000000A2 +
LaraColUpJump 0x00424B40 0x00000149 - LaraColUpJump 0x00424B40 0x00000149 -
LaraColFallback 0x00424CD0 0x000000A3 - LaraColFallback 0x00424CD0 0x000000A3 -
LaraColHangLeft 0x00424D80 0x00000033 - LaraColHangLeft 0x00424D80 0x00000033 -

7
src/game/lara.c
View file

@ -1335,6 +1335,12 @@ void __cdecl LaraColRightJump(ITEM_INFO* item, COLL_INFO* coll)
LaraColJumper(item, coll); LaraColJumper(item, coll);
} }
void __cdecl LaraColLeftJump(ITEM_INFO* item, COLL_INFO* coll)
{
Lara.move_angle = item->pos.y_rot - 16384;
LaraColJumper(item, coll);
}
void __cdecl LaraColJumper(ITEM_INFO* item, COLL_INFO* coll) void __cdecl LaraColJumper(ITEM_INFO* item, COLL_INFO* coll)
{ {
coll->bad_pos = NO_BAD_POS; coll->bad_pos = NO_BAD_POS;
@ -1503,6 +1509,7 @@ void TR1MInjectLara()
INJECT(0x00424910, LaraColSlide); INJECT(0x00424910, LaraColSlide);
INJECT(0x00424930, LaraColBackJump); INJECT(0x00424930, LaraColBackJump);
INJECT(0x004249E0, LaraColRightJump); INJECT(0x004249E0, LaraColRightJump);
INJECT(0x00424A90, LaraColLeftJump);
INJECT(0x004237A0, LaraAsWaterOut); INJECT(0x004237A0, LaraAsWaterOut);
} }

1
src/game/lara.h
View file

@ -88,6 +88,7 @@ void __cdecl LaraColStepLeft(ITEM_INFO* item, COLL_INFO* coll);
void __cdecl LaraColSlide(ITEM_INFO* item, COLL_INFO* coll); void __cdecl LaraColSlide(ITEM_INFO* item, COLL_INFO* coll);
void __cdecl LaraColBackJump(ITEM_INFO* item, COLL_INFO* coll); void __cdecl LaraColBackJump(ITEM_INFO* item, COLL_INFO* coll);
void __cdecl LaraColRightJump(ITEM_INFO* item, COLL_INFO* coll); void __cdecl LaraColRightJump(ITEM_INFO* item, COLL_INFO* coll);
void __cdecl LaraColLeftJump(ITEM_INFO* item, COLL_INFO* coll);
void __cdecl LaraColJumper(ITEM_INFO* item, COLL_INFO* coll); void __cdecl LaraColJumper(ITEM_INFO* item, COLL_INFO* coll);
void __cdecl GetLaraCollisionInfo(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 LaraHitCeiling(ITEM_INFO* item, COLL_INFO* coll);