Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-10-01 21:38:41 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix ScriptUnion1632

Browse Source
This commit is contained in:
DizzyEggg
2025-06-15 13:13:50 +02:00
parent 44ffeb47f7
commit 5270aaa012
7 changed files with 281 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

203
include/structs/str_ground_script.h Normal file
View File

@@ -0,0 +1,203 @@
#ifndef GUARD_STR_GROUND_SCRIPT_H
#define GUARD_STR_GROUND_SCRIPT_H
#include "structs/str_position.h"
// size: 0x10
typedef struct ScriptCommand
{
/* 0x0 */ u8 op;
/* 0x1 */ u8 argByte;
/* 0x2 */ s16 argShort;
/* 0x4 */ s32 arg1;
/* 0x8 */ s32 arg2;
/* 0xC */ const u8* argPtr;
} ScriptCommand;
// size: 0xC
typedef struct ScriptInfoSmall
{
/* 0x0 */ const ScriptCommand *ptr;
/* 0x4 */ s16 state;
/* 0x6 */ s16 group;
/* 0x8 */ s8 sector;
} ScriptInfoSmall;
// size: 0xC
typedef struct ScriptInfo
{
/* 0x0 */ const ScriptCommand *ptr;
/* 0x4 */ const ScriptCommand *ptr2;
/* 0x8 */ s16 group;
/* 0xA */ s8 sector;
} ScriptInfo;
// size: 0x4
typedef struct ActionUnkIds {
s16 unk0;
s16 unk2;
} ActionUnkIds;
// size: 0x60
typedef struct ScriptData
{
/* 0x00 */ s16 state;
/* 0x02 */ s16 savedState;
/* 0x04 */ ScriptInfo script;
/* 0x10 */ ScriptInfo savedScript;
/* 0x1C */ const ScriptCommand *curPtr;
/* 0x20 */ u8 curScriptOp;
/* 0x22 */ s16 unk22;
/* 0x24 */ u16 unk24;
/* 0x26 */ s8 unk26;
/* 0x28 */ s16 branchDiscriminant;
/* 0x2A */ s16 unk2A;
/* 0x2C */ s16 unk2C;
/* 0x30 */ s32 unk30;
/* 0x34 */ PixelPos pos1;
/* 0x3C */ PixelPos pos2;
/* 0x44 */ u8 unk44[4];
/* 0x48 */ s32 unk48;
/* 0x4C */ u8 unk4C;
/* 0x4D */ u8 unk4D;
// ultimately accessed as ldrb, doesn't work as array of u32-sized structs, needs union
/* 0x50 */ union {
u8 buf[16];
u32 val[4];
} localVars;
} ScriptData;
// size: 0x54
typedef struct CallbackData
{
/* 0x00 */ u16 maybeId;
// All callbacks take the parentObject as first parameter
/* 0x04 */ s16 (*getIndex)(void*); // id related
/* 0x08 */ void (*getSize)(void*, PixelPos *out);
/* 0x0C */ void (*getHitboxCenter)(void*, PixelPos *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*, PixelPos *posOrNull);
/* 0x20 */ void (*setPositionBounds)(void*, PixelPos *from, PixelPos *to);
/* 0x24 */ s32 (*moveReal)(void*, PixelPos*);
/* 0x28 */ void (*setPosHeight)(void*, u32 height);
/* 0x2C */ void (*setDirection)(void*, s32 dir);
/* 0x30 */ void (*setEventIndex)(void*, u16);
/* 0x34 */ void (*livesOnlyNullsub)(void*, u16);
/* 0x38 */ void (*func38)(void*, s32, s32);
/* 0x3C */ void (*setFlags)(void*, u32 bits);
/* 0x40 */ void (*clearFlags)(void*, u32 bits);
/* 0x44 */ void (*func44_livesOnlySpriteRelated)(void*, s32);
/* 0x48 */ s32 (*moveRelative)(void*, PixelPos*);
/* 0x4C */ bool8 (*func4C_spriteRelatedCheck)(void*);
/* 0x50 */ bool8 (*func50_spriteRelated)(void*);
} CallbackData;
// size: 0xE4
typedef struct Action
{
/* 0x00 */ const struct CallbackData *callbacks;
/* 0x04 */ void *parentObject; // struct GroundObject *
/* 0x08 */ ActionUnkIds unk8; // id?
/* 0x0C */ ActionUnkIds unkC;
/* 0x10 */ s16 group;
/* 0x12 */ s8 sector;
/* 0x14 */ const ScriptCommand *predefinedScripts[4];
/* 0x24 */ ScriptData scriptData;
/* 0x84 */ ScriptData scriptData2;
} Action;
// Only used when accessing gGroundMapAction (3001B6C), basically everything else just uses Action
// probably worth moving to ground_map.h together with the main GroundMap struct
// oh well, TODO later I guess
typedef struct GroundMapAction
{
// size: 0x110
/* 0x00 */ Action action;
/* 0xE4 */ s16 groundMapId;
u16 fillE6;
u32 unkE8;
u32 unkEC;
s32 unkF0;
s32 unkF4;
PixelPos unkF8;
u32 unk100;
u32 unk104;
u32 unk108;
u32 unk10C;
} GroundMapAction;
typedef struct ScriptRef
{
s16 id;
s16 type;
u8 *name;
const ScriptCommand *script;
} ScriptRef;
extern const ScriptRef gFunctionScriptTable[];
struct GroundLink {
CompactPos pos;
u8 width;
u8 height;
u8 ret;
u8 unk7;
};
typedef struct GroundLivesData {
u8 kind;
u8 unk1;
u8 width;
u8 height;
CompactPos pos;
const ScriptCommand *scripts[4];
} GroundLivesData;
typedef struct GroundObjectData {
u8 kind;
u8 unk1;
u8 width;
u8 height;
CompactPos pos;
const ScriptCommand *scripts[4];
} GroundObjectData;
typedef struct GroundEffectData {
u8 kind;
u8 unk1;
u8 width;
u8 height;
CompactPos pos;
const ScriptCommand *script;
} GroundEffectData;
typedef struct GroundEventData {
u8 kind;
u8 unk1;
u8 width;
u8 height;
CompactPos pos;
const ScriptRef *script;
} GroundEventData;
struct GroundScriptSector {
u32 nLives;
const GroundLivesData *lives;
u32 nObjects;
const GroundObjectData *objects;
u32 nEffects;
const GroundEffectData *effects;
u32 nEvents;
const GroundEventData *events;
u32 hasStation;
const ScriptRef * const *station;
};
struct GroundScriptGroup {
u32 nSectors;
const struct GroundScriptSector *sectors;
};
struct GroundScriptHeader {
u32 nGroups;
const struct GroundScriptGroup *groups;
const struct GroundLink *links;
};
#endif // GUARD_STR_GROUND_SCRIPT_H