Merge pull request #124 from DizzyEggg/dump_battlescripts

Dump Battle Scripts
2017-11-27 14:00:29 -06:00
parent 64e6480988 77a6c30bd4
commit 6e317c6463
29 changed files with 8562 additions and 1778 deletions
@@ -74,6 +74,14 @@
 #define B_BUFF_PLACEHOLDER_BEGIN        0xFD
 #define B_BUFF_EOS                      0xFF

+#define PREPARE_FLAVOUR_BUFFER(textVar, flavourId)                          \
+{                                                                           \
+    textVar[0] = B_BUFF_PLACEHOLDER_BEGIN;                                  \
+    textVar[1] = B_BUFF_NEGATIVE_FLAVOUR;                                   \
+    textVar[2] = flavourId;                                                 \
+    textVar[3] = B_BUFF_EOS;                                                \
+}
+
 #define PREPARE_STAT_BUFFER(textVar, statId)                                \
 {                                                                           \
    textVar[0] = B_BUFF_PLACEHOLDER_BEGIN;                                  \
@@ -189,7 +197,7 @@
 struct StringInfoBattle
 {
    u16 currentMove;
-    u16 lastMove;
+    u16 originallyUsedMove;
    u16 lastItem;
    u8 lastAbility;
    u8 scrActive;