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

Replace EntTrapInfo with Trap

Browse Source
This commit is contained in:
Kermalis
2024-11-10 22:51:33 -05:00
parent afa4b04abc
commit 0df055bcc6
13 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/code_80450F8.h
View File

@@ -3,7 +3,7 @@
#include "structs/dungeon_entity.h"
Entity *sub_8045684(u8 a, Position *pos, u8 c);
Entity *sub_8045684(u8 trapID, Position *pos, u8 c);
Entity *sub_8045708(Position *pos);
void sub_80457DC(Entity* ent);

15
include/dungeon_util.h
View File

@@ -11,13 +11,18 @@ extern const Position gAdjacentTileOffsets[NUM_DIRECTIONS];
bool8 EntityExists(Entity *pokemon);
u32 GetEntityType(Entity *entity);
u8 GetEntityRoom(Entity *entity);
Trap *GetTrapData(Entity *entity);
Trap* GetTrapData_1(Entity *entity);
Item *GetItemData(Entity *entity);
struct Tile *GetTileAtEntitySafe(Entity *entity);
Item *GetItemData_1(Entity *entity);
void sub_804535C(Entity *entity, Position32 *pos);
void SetEntityPixelPos(Entity *entity, s32 x, s32 y);
void IncreaseEntityPixelPos(Entity *entity, s32 x, s32 y);
#endif
static inline EntityInfo *GetEntInfo(Entity *entity)
{
return entity->axObj.info.monster;
}
Item *GetItemData(Entity *entity);
Item *GetItemData_1(Entity *entity);
Trap *GetTrapData(Entity *entity);
Trap* GetTrapData_1(Entity *entity);
#endif // GUARD_DUNGEON_UTIL_H

2
include/structs/axdata.h
View File

@@ -88,7 +88,7 @@ struct axObject
{
struct Item* item;
struct EntityInfo* monster;
struct EntTrapInfo* trap;
struct Trap* trap;
} info;
};

12
include/structs/dungeon_entity.h
View File

@@ -352,13 +352,6 @@ typedef struct EntityInfo
u8 unk204;
} EntityInfo;
// size: 0x4
typedef struct EntTrapInfo
{
/* 0x0 */ u8 unk0;
/* 0x0 */ u8 unk1;
} EntTrapInfo;
// size: 0x74 | Used for Pokémon, items, and traps.
typedef struct Entity
{
@@ -477,9 +470,4 @@ static inline void SetExpMultplier(EntityInfo *info)
SetRegularExpMultiplier(info);
}
static inline EntityInfo *GetEntInfo(Entity *ent)
{
return ent->axObj.info.monster;
}
#endif

3
include/structs/str_dungeon.h
View File

@@ -7,6 +7,7 @@
#include "structs/map.h"
#include "structs/rgb.h"
#include "structs/str_position.h"
#include "structs/str_traps.h"
#include "sprite.h"
#define DUNGEON_MAX_SIZE_X 56
@@ -356,7 +357,7 @@ typedef struct Dungeon
/* 0x3800 */ s16 deoxysForm;
Item unk3804[DUNGEON_MAX_ITEMS];
/* 0x3904 */ s16 unk3904;
EntTrapInfo unk3908[DUNGEON_MAX_TRAPS];
Trap unk3908[DUNGEON_MAX_TRAPS];
/* 0x3A08 */ bool8 unk3A08;
/* 0x3A09 */ bool8 unk3A09;
/* 0x3A0A */ bool8 unk3A0A;

5
include/structs/str_traps.h
View File

@@ -3,10 +3,11 @@
#include "constants/trap.h"
typedef struct Trap
// size: 0x4
typedef struct Trap
{
/* 0x0 */ u8 id;
/* 0x1 */ u8 unk1;
} Trap;
#endif // GUARD_STR_TRAPS_H
#endif // GUARD_STR_TRAPS_H