Decomped EvaluateItem()

4 files changed, 25 insertions, 9 deletions

diff --git a/include/constants/item.h b/include/constants/item.h
index 1268bd8..2f79b4d 100644
--- a/include/constants/item.h
+++ b/include/constants/item.h
@@ -162,18 +162,18 @@
 #define ITEM_ID_CALM_MIND 0x80
 #define ITEM_ID_ROAR 0x81
 #define ITEM_ID_TOXIC 0x82
-#define ITEM_ID_HAIL_ORB 0x83
+#define ITEM_ID_HAIL 0x83
 #define ITEM_ID_BULK_UP 0x84
 #define ITEM_ID_BULLET_SEED 0x85
 #define ITEM_ID_HIDDEN_POWER 0x86
-#define ITEM_ID_SUNNY_ORB 0x87
+#define ITEM_ID_SUNNY_DAY 0x87
 #define ITEM_ID_TAUNT 0x88
 #define ITEM_ID_ICE_BEAM 0x89
 #define ITEM_ID_BLIZZARD 0x8A
 #define ITEM_ID_HYPER_BEAM 0x8B
 #define ITEM_ID_LIGHT_SCREEN 0x8C
 #define ITEM_ID_PROTECT 0x8D
-#define ITEM_ID_RAINY_ORB 0x8E
+#define ITEM_ID_RAIN_DANCE 0x8E
 #define ITEM_ID_GIGA_DRAIN 0x8F
 #define ITEM_ID_SAFEGUARD 0x90
 #define ITEM_ID_FRUSTRATION 0x91
@@ -187,14 +187,14 @@
 #define ITEM_ID_PSYCHIC 0x99
 #define ITEM_ID_SHADOW_BALL 0x9A
 #define ITEM_ID_BRICK_BREAK 0x9B
-#define ITEM_ID_EVASION_ORB 0x9C
+#define ITEM_ID_DOUBLE_TEAM 0x9C
 #define ITEM_ID_REFLECT 0x9D
 #define ITEM_ID_SHOCK_WAVE 0x9E
 #define ITEM_ID_FLAMETHROWER 0x9F
 #define ITEM_ID_SLUDGE_BOMB 0xA0
-#define ITEM_ID_SANDY_ORB 0xA1
+#define ITEM_ID_SANDSTORM 0xA1
 #define ITEM_ID_FIRE_BLAST 0xA2
-#define ITEM_ID_ROCKY_ORB 0xA3
+#define ITEM_ID_ROCK_TOMB 0xA3
 #define ITEM_ID_AERIAL_ACE 0xA4
 #define ITEM_ID_TORMENT 0xA5
 #define ITEM_ID_FACADE 0xA6
@@ -204,7 +204,7 @@
 #define ITEM_ID_THIEF 0xAA
 #define ITEM_ID_STEEL_WING 0xAB
 #define ITEM_ID_SKILL_SWAP 0xAC
-#define ITEM_ID_SNATCH_ORB 0xAD
+#define ITEM_ID_SNATCH 0xAD
 #define ITEM_ID_OVERHEAT 0xAE
 #define ITEM_ID_WIDE_SLASH 0xAF
 #define ITEM_ID_EXCAVATE 0xB0
diff --git a/include/dungeon_ai_item_weight.h b/include/dungeon_ai_item_weight.h
new file mode 100644
index 0000000..705c0ca
--- /dev/null
+++ b/include/dungeon_ai_item_weight.h
@@ -0,0 +1,9 @@
+#ifndef GUARD_DUNGEON_AI_ITEM_WEIGHT_H
+#define GUARD_DUNGEON_AI_ITEM_WEIGHT_H
+
+#include "dungeon_entity.h"
+
+// 0x48F28
+u32 EvaluateItem(struct DungeonEntity *targetPokemon, struct ItemSlot *item, u32 itemTargetFlags);
+
+#endif
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];
diff --git a/include/moves.h b/include/moves.h
new file mode 100644
index 0000000..bba50b3
--- /dev/null
+++ b/include/moves.h
@@ -0,0 +1,8 @@
+#ifndef GUARD_MOVES_H
+#define GUARD_MOVES_H
+
+#include "constants/move.h"
+
+u32 GetMoveMaxPP(struct PokemonMove *move);
+
+#endif