summaryrefslogtreecommitdiff
path: root/include/battle_transition.h
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-08-22 17:10:50 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-08-22 17:10:50 +0200
commitbe47f6b54bd4b586d435d6fbff56bc315ff72efc (patch)
tree675cafb3d56bc9f8f04ecb6b76bfdc9766adace3 /include/battle_transition.h
parentfc9f7853a0e8dde9f80c1e16bee3a05978d29d15 (diff)
a really hard math function
Diffstat (limited to 'include/battle_transition.h')
-rw-r--r--include/battle_transition.h34
1 files changed, 19 insertions, 15 deletions
diff --git a/include/battle_transition.h b/include/battle_transition.h
index b2d897493..63ea36b67 100644
--- a/include/battle_transition.h
+++ b/include/battle_transition.h
@@ -18,21 +18,25 @@ enum // TRANSITION_MUGSHOT
#define MUGSHOTS_NO 5
-// credits for the names go to Dyskinesia
+// credits for the names go to Dyskinesia, Tetrable and Dizzy Egg
+// names are naturally subject to change
-#define B_TRANSITION_BLUR 0
-#define B_TRANSITION_SMEAR 1
-#define B_TRANSITION_SHUFFLE 2
-#define B_TRANSITION_BIG_POKEBALL 3
-#define B_TRANSITION_POKEBALLS_WIPEOUT 4
-#define B_TRANSITION_RIPPLE 6
-#define B_TRANSITION_WAVE 7
-#define B_TRANSITION_SLICE 8
-#define B_TRANSITION_SHARDS 11
-#define B_TRANSITION_SYDNEY 12
-#define B_TRANSITION_PHOEBE 13
-#define B_TRANSITION_GLACIA 14
-#define B_TRANSITION_DRAKE 15
-#define B_TRANSITION_STEVEN 16
+#define B_TRANSITION_BLUR 0
+#define B_TRANSITION_SWEARL 1
+#define B_TRANSITION_SHUFFLE 2
+#define B_TRANSITION_BIG_POKEBALL 3
+#define B_TRANSITION_POKEBALLS_WIPEOUT 4
+#define B_TRANSITION_CLOCKWISE_BLACKFADE 5
+#define B_TRANSITION_RIPPLE 6
+#define B_TRANSITION_WAVE 7
+#define B_TRANSITION_SLICE 8
+#define B_TRANSITION_WHITEFADE 9
+#define B_TRANSITION_GRID_SQUARES 10
+#define B_TRANSITION_SHARDS 11
+#define B_TRANSITION_SYDNEY 12
+#define B_TRANSITION_PHOEBE 13
+#define B_TRANSITION_GLACIA 14
+#define B_TRANSITION_DRAKE 15
+#define B_TRANSITION_STEVEN 16
#endif // GUARD_BATTLE_TRANSITION_H