From 0747fe684c46d010d8917c4257dd1f1a52241385 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 12 Jun 2020 20:54:34 -0400
Subject: GetBoxMonDataInternal

---
 include/move_data.h | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 include/move_data.h

(limited to 'include/move_data.h')

diff --git a/include/move_data.h b/include/move_data.h
new file mode 100644
index 00000000..d4e3c128
--- /dev/null
+++ b/include/move_data.h
@@ -0,0 +1,6 @@
+#ifndef POKEDIAMOND_MOVE_DATA_H
+#define POKEDIAMOND_MOVE_DATA_H
+
+u32 FUN_0206AB30(u16 move, u8 ppUp);
+
+#endif //POKEDIAMOND_MOVE_DATA_H
-- 
cgit v1.2.3


From 3646495249e8e553fb0335ffd287f979499204ce Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 13 Jun 2020 12:30:58 -0400
Subject: Through AddBoxMonData

---
 include/move_data.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/move_data.h')

diff --git a/include/move_data.h b/include/move_data.h
index d4e3c128..975bcf8d 100644
--- a/include/move_data.h
+++ b/include/move_data.h
@@ -1,6 +1,6 @@
 #ifndef POKEDIAMOND_MOVE_DATA_H
 #define POKEDIAMOND_MOVE_DATA_H
 
-u32 FUN_0206AB30(u16 move, u8 ppUp);
+int FUN_0206AB30(u16 move, u8 ppUp);
 
 #endif //POKEDIAMOND_MOVE_DATA_H
-- 
cgit v1.2.3


From 654acf33f071db80179fa556097f5663ca4dc311 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 14 Jun 2020 14:00:44 -0400
Subject: through FUN_020697D4

---
 include/move_data.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include/move_data.h')

diff --git a/include/move_data.h b/include/move_data.h
index 975bcf8d..8da864b0 100644
--- a/include/move_data.h
+++ b/include/move_data.h
@@ -2,5 +2,6 @@
 #define POKEDIAMOND_MOVE_DATA_H
 
 int FUN_0206AB30(u16 move, u8 ppUp);
+u32 FUN_0206AB18(u16 move, u32 attr);
 
 #endif //POKEDIAMOND_MOVE_DATA_H
-- 
cgit v1.2.3


From 424076d3a557419bc548346c7625931cc09a34b2 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 16 Jun 2020 08:26:08 -0400
Subject: Decompile move table access routines

---
 include/move_data.h | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'include/move_data.h')

diff --git a/include/move_data.h b/include/move_data.h
index 8da864b0..5267bfb1 100644
--- a/include/move_data.h
+++ b/include/move_data.h
@@ -1,7 +1,26 @@
 #ifndef POKEDIAMOND_MOVE_DATA_H
 #define POKEDIAMOND_MOVE_DATA_H
 
-int FUN_0206AB30(u16 move, u8 ppUp);
-u32 FUN_0206AB18(u16 move, u32 attr);
+struct WazaTbl
+{
+    u16 unk0;
+    u8 unk2;
+    u8 unk3;
+    u8 unk4;
+    u8 unk5;
+    u8 pp;
+    u8 unk7;
+    u16 unk8;
+    s8 unkA;
+    u8 unkB;
+    u8 unkC;
+    u8 unkD;
+    u8 padding[2];
+};
+
+void LoadAllWazaTbl(struct WazaTbl * dest);
+u8 WazaGetMaxPp(u16 move, u8 ppUp);
+u32 GetWazaAttr(u16 move, u32 attr);
+u32 GetAttrFromWazaTbl(struct WazaTbl * wazaTbl, u32 attr);
 
 #endif //POKEDIAMOND_MOVE_DATA_H
-- 
cgit v1.2.3


From 5d533911cd08d174d2e3f716b78e9ebe0746a722 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 18 Jun 2020 19:37:11 -0400
Subject: MOVEATTR enums; silence return value warning

---
 include/move_data.h | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

(limited to 'include/move_data.h')

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
-- 
cgit v1.2.3