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

move functions to moveblock.h

Browse source
This commit is contained in:
rr- 2021-03-04 15:42:42 +01:00
parent 20636944ee
commit c350a6c9c7
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/progress.txt
View file

@ -683,7 +683,7 @@ mn_clear_handles ---------- ---------- -
InitialiseMovableBlock 0x0042B430 0x00000030 *
MovableBlockControl 0x0042B460 0x0000014A *
MovableBlockCollision 0x0042B5B0 0x00000208 *
TestBlockMovaable ---------- ---------- +
TestBlockMoveable ---------- ---------- +
TestBlockPush 0x0042B7E0 0x00000142 -
TestBlockPull 0x0042B940 0x00000239 -
InitialiseRollingBlock 0x0042BB90 0x00000024 *

6
src/game/moveblock.h
View file

@ -4,7 +4,13 @@
#include <stdint.h>
// clang-format off
#define InitialiseMovableBlock ((void (*)(int16_t item_num))0x0042B430)
#define MovableBlockCollision ((void (*)(int16_t item_num, ITEM_INFO* litem, COLL_INFO* coll))0x0042B5B0)
#define MovableBlockControl ((void (*)(int16_t item_num))0x0042B460)
#define InitialiseRollingBlock ((void (*)(int16_t item_num))0x0042BB90)
#define RollingBlockControl ((void (*)(int16_t item_num))0x0042BBC0)
#define AlterFloorHeight ((void (*)(ITEM_INFO* item, int32_t height))0x0042BCA0)
#define DrawMovableBlock ((void (*)(ITEM_INFO *item))0x0042BD60)
// clang-format on
#endif

1
src/game/setup.c
View file

@ -15,6 +15,7 @@
#include "game/lightning.h"
#include "game/lion.h"
#include "game/lot.h"
#include "game/moveblock.h"
#include "game/natla.h"
#include "game/objects.h"
#include "game/people.h"

6
src/game/traps.h
View file

@ -6,12 +6,6 @@
// clang-format off
#define MidasCollision ((void (*)(int16_t item_num, ITEM_INFO* litem, COLL_INFO* coll))0x004334C0)
#define InitialiseMovableBlock ((void (*)(int16_t item_num))0x0042B430)
#define MovableBlockControl ((void (*)(int16_t item_num))0x0042B460)
#define MovableBlockCollision ((void (*)(int16_t item_num, ITEM_INFO* litem, COLL_INFO* coll))0x0042B5B0)
#define InitialiseRollingBlock ((void (*)(int16_t item_num))0x0042BB90)
#define RollingBlockControl ((void (*)(int16_t item_num))0x0042BBC0)
#define DrawMovableBlock ((void (*)(ITEM_INFO *item))0x0042BD60)
#define InitialiseRollingBall ((void (*)(int16_t item_num))0x0043A010)
#define RollingBallControl ((void (*)(int16_t item_num))0x0043A050)
#define RollingBallCollision ((void (*)(int16_t item_num, ITEM_INFO* litem, COLL_INFO* coll))0x0043A2B0)