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

port InitialiseBaldy

Browse source
This commit is contained in:
rr- 2021-03-05 21:05:01 +01:00
parent d795442250
commit 05d8f0815f
4 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
docs/progress.svg
View file

@ -551,7 +551,7 @@
<rect width="12.00" height="12.00" x="672.00" y="157.00" class="decompiled"><title>SkateKidControl</title></rect> <rect width="12.00" height="12.00" x="672.00" y="157.00" class="decompiled"><title>SkateKidControl</title></rect>
<rect width="12.00" height="12.00" x="686.00" y="157.00" class="decompiled"><title>DrawSkateKid</title></rect> <rect width="12.00" height="12.00" x="686.00" y="157.00" class="decompiled"><title>DrawSkateKid</title></rect>
<rect width="12.00" height="12.00" x="0.00" y="171.00" class="decompiled"><title>CowboyControl</title></rect> <rect width="12.00" height="12.00" x="0.00" y="171.00" class="decompiled"><title>CowboyControl</title></rect>
<rect width="12.00" height="12.00" x="14.00" y="171.00" class="named"><title>InitialiseBaldy</title></rect> <rect width="12.00" height="12.00" x="14.00" y="171.00" class="decompiled"><title>InitialiseBaldy</title></rect>
<rect width="12.00" height="12.00" x="28.00" y="171.00" class="named"><title>BaldyControl</title></rect> <rect width="12.00" height="12.00" x="28.00" y="171.00" class="named"><title>BaldyControl</title></rect>
<rect width="12.00" height="12.00" x="42.00" y="171.00" class="decompiled"><title>PickUpCollision</title></rect> <rect width="12.00" height="12.00" x="42.00" y="171.00" class="decompiled"><title>PickUpCollision</title></rect>
<rect width="12.00" height="12.00" x="56.00" y="171.00" class="decompiled"><title>PickUpScionCollision</title></rect> <rect width="12.00" height="12.00" x="56.00" y="171.00" class="decompiled"><title>PickUpScionCollision</title></rect>
@ -1353,7 +1353,7 @@
<rect width="3.33" height="3.48" x="676.70" y="490.34" class="decompiled"><title>LaraAsUseKey</title></rect> <rect width="3.33" height="3.48" x="676.70" y="490.34" class="decompiled"><title>LaraAsUseKey</title></rect>
<rect width="3.33" height="3.48" x="682.02" y="490.34" class="named"><title>S_InitialiseScreen</title></rect> <rect width="3.33" height="3.48" x="682.02" y="490.34" class="named"><title>S_InitialiseScreen</title></rect>
<rect width="3.33" height="3.48" x="687.35" y="490.34" class="decompiled"><title>InitialiseSkateKid</title></rect> <rect width="3.33" height="3.48" x="687.35" y="490.34" class="decompiled"><title>InitialiseSkateKid</title></rect>
<rect width="3.33" height="3.48" x="692.67" y="490.34" class="named"><title>InitialiseBaldy</title></rect> <rect width="3.33" height="3.48" x="692.67" y="490.34" class="decompiled"><title>InitialiseBaldy</title></rect>
<rect width="3.34" height="3.47" x="655.40" y="495.82" class="decompiled"><title>T_FlashText</title></rect> <rect width="3.34" height="3.47" x="655.40" y="495.82" class="decompiled"><title>T_FlashText</title></rect>
<rect width="3.34" height="3.33" x="655.40" y="501.28" class="decompiled"><title>FxExplosion</title></rect> <rect width="3.34" height="3.33" x="655.40" y="501.28" class="decompiled"><title>FxExplosion</title></rect>
<rect width="3.34" height="3.33" x="655.40" y="506.61" class="decompiled"><title>Inv_RingMotionRadius</title></rect> <rect width="3.34" height="3.33" x="655.40" y="506.61" class="decompiled"><title>Inv_RingMotionRadius</title></rect>
@ -1463,10 +1463,10 @@
<rect width="-0.06" height="-0.07" x="694.51" y="536.07" class="todo"><title>sub_440EF0</title></rect> <rect width="-0.06" height="-0.07" x="694.51" y="536.07" class="todo"><title>sub_440EF0</title></rect>
<rect width="-0.45" height="-0.55" x="696.45" y="536.07" class="todo"><title>sub_437BC0</title></rect> <rect width="-0.45" height="-0.55" x="696.45" y="536.07" class="todo"><title>sub_437BC0</title></rect>
<rect width="-0.45" height="-1.52" x="696.45" y="537.52" class="named"><title>S_CDVolume</title></rect> <rect width="-0.45" height="-1.52" x="696.45" y="537.52" class="named"><title>S_CDVolume</title></rect>
<rect width="12.00" height="12.00" x="0.00" y="564.50" class="decompiled"/><text x="17.00" y="570.50">Functions decompiled (count): 59.51%</text> <rect width="12.00" height="12.00" x="0.00" y="564.50" class="decompiled"/><text x="17.00" y="570.50">Functions decompiled (count): 59.64%</text>
<rect width="12.00" height="12.00" x="0.00" y="582.50" class="decompiled"/><text x="17.00" y="588.50">Functions decompiled (bytesize): 55.78%</text> <rect width="12.00" height="12.00" x="0.00" y="582.50" class="decompiled"/><text x="17.00" y="588.50">Functions decompiled (bytesize): 55.80%</text>
<rect width="12.00" height="12.00" x="0.00" y="600.50" class="named"/><text x="17.00" y="606.50">Functions not decompiled, but with known names (count): 26.40%</text> <rect width="12.00" height="12.00" x="0.00" y="600.50" class="named"/><text x="17.00" y="606.50">Functions not decompiled, but with known names (count): 26.27%</text>
<rect width="12.00" height="12.00" x="0.00" y="618.50" class="named"/><text x="17.00" y="624.50">Functions not decompiled, but with known names (bytesize): 28.39%</text> <rect width="12.00" height="12.00" x="0.00" y="618.50" class="named"/><text x="17.00" y="624.50">Functions not decompiled, but with known names (bytesize): 28.37%</text>
<rect width="12.00" height="12.00" x="0.00" y="636.50" class="todo"/><text x="17.00" y="642.50">Functions not decompiled, with unknown names (count): 14.09%</text> <rect width="12.00" height="12.00" x="0.00" y="636.50" class="todo"/><text x="17.00" y="642.50">Functions not decompiled, with unknown names (count): 14.09%</text>
<rect width="12.00" height="12.00" x="0.00" y="654.50" class="todo"/><text x="17.00" y="660.50">Functions not decompiled, with unknown names (bytesize): 15.83%</text> <rect width="12.00" height="12.00" x="0.00" y="654.50" class="todo"/><text x="17.00" y="660.50">Functions not decompiled, with unknown names (bytesize): 15.83%</text>
</svg> </svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 158 KiB

After

Width:  |  Height:  |  Size: 158 KiB

Before After
Before After

2
docs/progress.txt
View file

@ -775,7 +775,7 @@ InitialiseSkateKid 0x004320B0 0x00000027 +
SkateKidControl 0x004320E0 0x00000458 + SkateKidControl 0x004320E0 0x00000458 +
DrawSkateKid 0x00432550 0x0000004C + DrawSkateKid 0x00432550 0x0000004C +
CowboyControl 0x004325A0 0x000005A7 + CowboyControl 0x004325A0 0x000005A7 +
InitialiseBaldy 0x00432B60 0x00000027 * InitialiseBaldy 0x00432B60 0x00000027 +
BaldyControl 0x00432B90 0x000004CC * BaldyControl 0x00432B90 0x000004CC *
# pickup.cpp # pickup.cpp

17
src/game/people.c
View file

@ -104,6 +104,16 @@ typedef enum {
COWBOY_SHOOT = 6, COWBOY_SHOOT = 6,
} COWBOY_ANIM; } COWBOY_ANIM;
typedef enum {
BALDY_EMPTY = 0,
BALDY_STOP = 1,
BALDY_WALK = 2,
BALDY_RUN = 3,
BALDY_AIM = 4,
BALDY_DEATH = 5,
BALDY_SHOOT = 6,
} BALDY_ANIM;
static BITE_INFO LarsonGun = { -60, 170, 0, 14 }; static BITE_INFO LarsonGun = { -60, 170, 0, 14 };
static BITE_INFO PierreGun1 = { 60, 200, 0, 11 }; static BITE_INFO PierreGun1 = { 60, 200, 0, 11 };
static BITE_INFO PierreGun2 = { -57, 200, 0, 14 }; static BITE_INFO PierreGun2 = { -57, 200, 0, 14 };
@ -949,6 +959,12 @@ void CowboyControl(int16_t item_num)
CreatureAnimation(item_num, angle, 0); CreatureAnimation(item_num, angle, 0);
} }
void InitialiseBaldy(int16_t item_num)
{
InitialiseCreature(item_num);
Items[item_num].current_anim_state = BALDY_RUN;
}
void T1MInjectGamePeople() void T1MInjectGamePeople()
{ {
INJECT(0x00430D80, Targetable); INJECT(0x00430D80, Targetable);
@ -964,4 +980,5 @@ void T1MInjectGamePeople()
INJECT(0x004320E0, SkateKidControl); INJECT(0x004320E0, SkateKidControl);
INJECT(0x00432550, DrawSkateKid); INJECT(0x00432550, DrawSkateKid);
INJECT(0x004325A0, CowboyControl); INJECT(0x004325A0, CowboyControl);
INJECT(0x00432B60, InitialiseBaldy);
} }

3
src/game/people.h
View file

@ -5,7 +5,6 @@
#include <stdint.h> #include <stdint.h>
// clang-format off // clang-format off
#define InitialiseBaldy ((void (*)(int16_t item_num))0x00432B60)
#define BaldyControl ((void (*)(int16_t item_num))0x00432B90) #define BaldyControl ((void (*)(int16_t item_num))0x00432B90)
// clang-format on // clang-format on
@ -35,6 +34,8 @@ void DrawSkateKid(ITEM_INFO* item);
void CowboyControl(int16_t item_num); void CowboyControl(int16_t item_num);
void InitialiseBaldy(int16_t item_num);
void T1MInjectGamePeople(); void T1MInjectGamePeople();
#endif #endif