summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authornullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com>2018-12-21 16:44:49 +0800
committernullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com>2018-12-21 16:44:49 +0800
commit80de1483c6d4b2e42fc2d71195cff1c6fddfac5a (patch)
treef739f2861c46e5b325275fb5f23d52452d1d1360 /include
parente8b149e80e7b1411ce7a128e36ebc5d5490133e1 (diff)
Port water.s from pokeemerald
Diffstat (limited to 'include')
-rw-r--r--include/rom_8077ABC.h2
-rw-r--r--include/task.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h
index 5f5867423..595e38f31 100644
--- a/include/rom_8077ABC.h
+++ b/include/rom_8077ABC.h
@@ -47,7 +47,7 @@ void TranslateAnimLinearUntil(struct Sprite *sprite);
void sub_8078D44(struct Sprite *sprite);
void obj_id_set_rotscale(u8 sprite, s16, s16, u16);
bool8 sub_8078E38();
-void sub_8078E70(u8 sprite, u8);
+void PrepareBattlerSpriteForRotScale(u8 sprite, u8);
void sub_8078F40(u8 sprite);
void sub_8078F9C(u8 sprite);
void sub_8079518(struct Sprite *sprite);
diff --git a/include/task.h b/include/task.h
index a71577ee3..0306cc091 100644
--- a/include/task.h
+++ b/include/task.h
@@ -1,6 +1,8 @@
#ifndef GUARD_TASK_H
#define GUARD_TASK_H
+#define NUM_TASKS 16
+
// general task defines
#define TASK gTasks[taskId]
#define FUNC func