Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-09-07 16:45:39 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Move Entity to axObj

Browse Source
This commit is contained in:
Mateon1
2024-09-21 12:44:45 +02:00
parent ac5136a2da
commit 49acc1a1eb
61 changed files with 746 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/structs/dungeon_entity.h
View File

@@ -6,6 +6,7 @@
#include "sprite.h"
#include "structs/str_items.h"
#include "structs/str_moves.h"
#include "axdata.h"
#include "number_util.h"
@@ -351,16 +352,7 @@ typedef struct Entity
// The global spawn index counter starts at 10. Each Pokémon that spawns increments the counter and
// gets assigned the current counter value as its spawn index.
/* 0x26 */ u16 spawnGenID;
/* 0x28*/ EntitySpriteInfo spriteInfo;
OpenedFile *sprite;
s16 unk68;
u8 unk6A;
u8 unk6B;
/* 0x6C */ u8 direction;
/* 0x6D */ u8 direction2; // Duplicate of 0x6C?
u8 unk6E;
u8 unk6F;
/* 0x70 */ EntityInfo *info;
/* 0x28 */ struct axObject axObj;
} Entity;
enum EntityType
@@ -460,7 +452,7 @@ static inline void SetExpMultplier(EntityInfo *info)
static inline EntityInfo *GetEntInfo(Entity *ent)
{
return ent->info;
return ent->axObj.info;
}
#endif