diff options
| author | huderlem <huderlem@gmail.com> | 2019-04-06 12:47:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-06 12:47:23 -0500 |
| commit | 963d165e06f4428605fca5c1369c9f417e8e7156 (patch) | |
| tree | 232aaa6748b6198ebc53225e4e9252c1c0ec433b /include | |
| parent | af33bf4d1c401b78e944d41c229c2b4a39fd3970 (diff) | |
| parent | f072d2595f7a87410f4314973e6e58550bd295ec (diff) | |
Merge pull request #716 from nullableVoidPtr/master
Port water.s from pokeemerald
Diffstat (limited to 'include')
| -rw-r--r-- | include/rom_8077ABC.h | 2 | ||||
| -rw-r--r-- | include/task.h | 2 |
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 |