decomp few more trap funcs and fix some names

This commit is contained in:
Seth Barberee
2024-01-06 10:23:18 -08:00
parent 5b9a0c743b
commit 3635d87b57
8 changed files with 91 additions and 175 deletions

View File

@@ -22,7 +22,8 @@ enum TrapID
TRAP_CHESTNUT_TRAP,
TRAP_WONDER_TILE,
TRAP_POKEMON_TRAP,
TRAP_SPIKE_TRAP
TRAP_SPIKE_TRAP,
NUM_TRAPS
};
#endif // GUARD_CONSTANTS_TRAP_H
#endif // GUARD_CONSTANTS_TRAP_H

View File

@@ -187,9 +187,8 @@ typedef struct Dungeon
u8 fill1356D[0x13570 - 0x1356D];
/* 0x13570 */ u8 unk13570;
u8 fill13571[0x13574 - 0x13571];
/* 0x13574 */ u16 unk13574;
/* 0x13576 */ u16 unk13576;
/* 0x13578 */ u8 unk13578;
/* 0x13574 */ Position trapPos;
/* 0x13578 */ u8 trapID;
/* 0x13579 */ u8 unk13579;
u8 fill1357A[0x1357C - 0x1357A];
/* 0x1357C */ Entity *teamPokemon[MAX_TEAM_MEMBERS];

View File

@@ -4,5 +4,6 @@
#include "structs/str_position.h"
bool8 CanLayTrap(Position *pos);
bool8 LayTrap(Position *pos, u8 trapID, u8 param_3);
#endif