Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-08-14 04:55:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
DizzyEggg
2024-09-19 09:45:01 +02:00
parent 4001c7d884 c4dd5fe96e
commit ccf1db16d6
232 changed files with 3948 additions and 5254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/structs/dungeon_entity.h
View File

@@ -225,7 +225,7 @@ typedef struct EntityInfo
u8 fill95[0x98 - 0x95];
/* 0x98 */ u32 unk98;
/* 0x9C */ u32 unk9C;
/* 0xA0 */ u32 unkA0;
/* 0xA0 */ s32 unkA0;
/* 0xA4 */ u8 clientType;
u8 fillA5[0xA8 - 0xA5];
// Statuses are split into groups based on which ones can't overlap.
@@ -413,4 +413,9 @@ enum VisualFlag
VISUAL_FLAG_RUN_AWAY = 2
};
static inline EntityInfo *GetEntInfo(Entity *ent)
{
return ent->info;
}
#endif

15
include/structs/str_damage.h Normal file
View File

@@ -0,0 +1,15 @@
#ifndef GUARD_STR_DAMAGE_H
#define GUARD_STR_DAMAGE_H
struct DamageStruct
{
s32 dmg;
s32 residualDmgType;
u32 typeEffectiveness;
u8 type;
bool8 isCrit;
u8 unkE;
u8 unkF;
};
#endif

4
include/structs/struct_sub80095e4.h
View File

@@ -39,7 +39,7 @@ typedef struct struct_Sub80095E4_2
(ptr).unk3C[(ptr).unk34].unk10 = a0 + 2; \
\
ResetUnusedInputStruct(); \
sub_800641C((ptr).unk3C, TRUE, TRUE); \
xxx_call_save_unk_text_struct_800641C((ptr).unk3C, TRUE, TRUE); \
}
#define SUB_80095E4_CALL(ptr) \
@@ -58,7 +58,7 @@ typedef struct struct_Sub80095E4_2
(ptr).unk3C[(ptr).unk34].unk10 = newE; \
\
ResetUnusedInputStruct(); \
sub_800641C((ptr).unk3C, TRUE, TRUE); \
xxx_call_save_unk_text_struct_800641C((ptr).unk3C, TRUE, TRUE); \
}
// sub_802BF30 and sub_802C328 use a different function call, and 24 instead of 12