Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-04-25 07:28:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Properly typed callbacks

Browse Source
This commit is contained in:
Mateusz Naściszewski 2024-09-15 21:07:06 +02:00
parent 4b9cc03736
commit be0463ab75
No known key found for this signature in database
GPG Key ID: 6A6067123E4CAF6E
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
include/ground_script.h
View File

@ -78,27 +78,27 @@ typedef struct CallbackData
// size: 0x54
/* 0x00 */ u16 maybeId;
// padding
// (almost?) all callbacks take the parentObject as first parameter
// All callbacks take the parentObject as first parameter
/* 0x04 */ s16 (*getIndex)(void*); // id related
/* 0x08 */ u32 (*getSize)();
/* 0x0C */ u32 (*getHitboxCenter)();
/* 0x10 */ u32 (*getPosHeightAndUnk)();
/* 0x14 */ u32 (*getDirection)();
/* 0x18 */ u32 (*getFlags)();
/* 0x1C */ u32 (*setHitboxPos)();
/* 0x20 */ u32 (*setPositionBounds)();
/* 0x24 */ u32 (*moveReal)();
/* 0x28 */ u32 (*setPosHeight)();
/* 0x2C */ u32 (*setDirection)();
/* 0x30 */ u32 (*setEventIndex)();
/* 0x34 */ u32 (*livesOnlyNullsub)();
/* 0x38 */ u32 (*func38)();
/* 0x3C */ u32 (*setFlags)();
/* 0x40 */ u32 (*clearFlags)();
/* 0x44 */ u32 (*func44_livesOnlySpriteRelated)();
/* 0x48 */ u32 (*moveRelative)();
/* 0x4C */ u32 (*func4C_spriteRelatedCheck)();
/* 0x50 */ u32 (*func50_spriteRelated)();
/* 0x08 */ void (*getSize)(void*, Position32 *out);
/* 0x0C */ void (*getHitboxCenter)(void*, Position32 *out);
/* 0x10 */ void (*getPosHeightAndUnk)(void*, u32 *height, u32 *unk);
/* 0x14 */ void (*getDirection)(void*, s8 *dir);
/* 0x18 */ void (*getFlags)(void*, u32 *flags);
/* 0x1C */ void (*setHitboxPos)(void*, Position32 *posOrNull);
/* 0x20 */ void (*setPositionBounds)(void*, Position32 *from, Position32 *to);
/* 0x24 */ bool8 (*moveReal)(void*, Position32*);
/* 0x28 */ void (*setPosHeight)(void*, u32 height);
/* 0x2C */ void (*setDirection)(void*, s8 dir); // direction must be signed char!
/* 0x30 */ void (*setEventIndex)(void*, u16);
/* 0x34 */ void (*livesOnlyNullsub)(void*, u16);
/* 0x38 */ void (*func38)(void*, s16, u32);
/* 0x3C */ void (*setFlags)(void*, u32 bits);
/* 0x40 */ void (*clearFlags)(void*, u32 bits);
/* 0x44 */ void (*func44_livesOnlySpriteRelated)(void*, u32);
/* 0x48 */ void (*moveRelative)(void*, Position32*);
/* 0x4C */ bool8 (*func4C_spriteRelatedCheck)(void*);
/* 0x50 */ bool8 (*func50_spriteRelated)(void*);
} CallbackData;
typedef struct Action

8
src/ground_script_1.c
View File

@ -968,7 +968,7 @@ s32 ExecuteScriptCommand(Action *action) {
u32 unk[2];
unk[0] = curCmd.arg1 << 8;
unk[1] = curCmd.arg2 << 8;
action->callbacks->moveReal(action->parentObject, unk);
action->callbacks->moveReal(action->parentObject, (Position32*)unk);
scriptData->unk2A = (u8)curCmd.argByte;
return 2;
}
@ -976,7 +976,7 @@ s32 ExecuteScriptCommand(Action *action) {
u32 unk[2];
unk[0] = curCmd.argShort << 8;
unk[1] = curCmd.arg1 << 8;
action->callbacks->moveRelative(action->parentObject, unk);
action->callbacks->moveRelative(action->parentObject, (Position32*)unk);
scriptData->unk2A = (u8)curCmd.argByte;
return 2;
}
@ -984,7 +984,7 @@ s32 ExecuteScriptCommand(Action *action) {
u32 unk[2];
unk[0] = OtherRandInt(curCmd.argShort) << 8;
unk[1] = OtherRandInt(curCmd.arg1) << 8;
action->callbacks->moveRelative(action->parentObject, unk);
action->callbacks->moveRelative(action->parentObject, (Position32*)unk);
scriptData->unk2A = (u8)curCmd.argByte;
return 2;
}
@ -1064,7 +1064,7 @@ s32 ExecuteScriptCommand(Action *action) {
}
case 0x62: case 0x6a: {
u32 pos[2];
action->callbacks->getHitboxCenter(action->parentObject, pos);
action->callbacks->getHitboxCenter(action->parentObject, (Position32*)pos);
scriptData->pos2.x = pos[0] + (curCmd.arg1 << 8);
scriptData->pos2.y = pos[1] + (curCmd.arg2 << 8);
scriptData->unk30 = curCmd.argShort;