From c30cf5c6da8283330bc352d58acc037739cd8b72 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Tue, 4 Jan 2022 00:00:31 -0600 Subject: Decomped EvaluateItem() --- include/dungeon_entity.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include/dungeon_entity.h') diff --git a/include/dungeon_entity.h b/include/dungeon_entity.h index 233ef8e..d5c2871 100644 --- a/include/dungeon_entity.h +++ b/include/dungeon_entity.h @@ -164,8 +164,7 @@ struct DungeonEntityData u8 fillFE[0x100 - 0xFE]; /* 0x100 */ u8 targetingDecoy; // If the Pokémon is targeting a decoy, this indicates whether the decoy target is a team or wild Pokémon. u8 fill101[0x104 - 0x101]; - /* 0x104 */ u8 movementSpeed; - u8 fill105[0x108 - 0x105]; + /* 0x104 */ s32 movementSpeed; // The turn counter for movement speed up/down is split into five timers each. Multiple timers are used if the Pokémon is affected by multiple // speed-up/slow effects at once, like using Agility twice. /* 0x108 */ u8 speedUpTurnsLeft[5]; -- cgit v1.2.3 From d9b1ef43a69d9c33791719d8f510ee5be048a7d0 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Thu, 6 Jan 2022 21:52:23 -0600 Subject: Labeled Warp Scarf variables --- include/dungeon_entity.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/dungeon_entity.h') diff --git a/include/dungeon_entity.h b/include/dungeon_entity.h index d5c2871..640183f 100644 --- a/include/dungeon_entity.h +++ b/include/dungeon_entity.h @@ -194,7 +194,9 @@ struct DungeonEntityData u8 unk15D; u8 unk15E; u8 unk15F; - u8 fill160[0x16C - 0x160]; + u8 fill160[0x169 - 0x160]; + u8 turnsSinceWarpScarfActivation; + u8 fill16A[0x16C - 0x16A]; /* 0x16C */ struct Position targetPosition; /* 0x170 */ struct Position posPixel; u32 unk174; -- cgit v1.2.3