MOVEATTR enums; silence return value warning

1 files changed, 24 insertions, 9 deletions

diff --git a/include/move_data.h b/include/move_data.h
index 5267bfb1..a970e1bf 100644
--- a/include/move_data.h
+++ b/include/move_data.h
@@ -3,24 +3,39 @@
 
 struct WazaTbl
 {
-    u16 unk0;
+    u16 effect;
     u8 unk2;
-    u8 unk3;
-    u8 unk4;
-    u8 unk5;
+    u8 power;
+    u8 type;
+    u8 accuracy;
     u8 pp;
-    u8 unk7;
+    u8 effectChance;
     u16 unk8;
-    s8 unkA;
+    s8 priority;
     u8 unkB;
     u8 unkC;
-    u8 unkD;
+    u8 contestType;
     u8 padding[2];
 };
 
+typedef enum MoveAttr {
+    MOVEATTR_EFFECT = 0,
+    MOVEATTR_UNK1,
+    MOVEATTR_POWER,
+    MOVEATTR_TYPE,
+    MOVEATTR_ACCURACY,
+    MOVEATTR_PP,
+    MOVEATTR_EFFECT_CHANCE,
+    MOVEATTR_UNK7,
+    MOVEATTR_PRIORTY,
+    MOVEATTR_UNK9,
+    MOVEATTR_UNK10,
+    MOVEATTR_CONTEST_TYPE,
+} MoveAttr;
+
 void LoadAllWazaTbl(struct WazaTbl * dest);
 u8 WazaGetMaxPp(u16 move, u8 ppUp);
-u32 GetWazaAttr(u16 move, u32 attr);
-u32 GetAttrFromWazaTbl(struct WazaTbl * wazaTbl, u32 attr);
+u32 GetWazaAttr(u16 move, MoveAttr attr);
+u32 GetAttrFromWazaTbl(struct WazaTbl * wazaTbl, MoveAttr attr);
 
 #endif //POKEDIAMOND_MOVE_DATA_H