diff options
| author | garak <garakmon@gmail.com> | 2018-12-16 20:05:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 20:05:31 -0500 |
| commit | e292d0ca8375a8c54907d6bcf404e2e084344156 (patch) | |
| tree | b9c59449d47bf73d98d3e38fa26804a163d871ab /src/rayquaza_scene.c | |
| parent | 10237e8d13b35474ea999b4e9139f9a48a80c53d (diff) | |
| parent | d1e6e705ccf05f93933ae4494b1d388550d81d26 (diff) | |
Merge branch 'master' into fldeff
Diffstat (limited to 'src/rayquaza_scene.c')
| -rw-r--r-- | src/rayquaza_scene.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c index 4783f73c0..b22e1db32 100644 --- a/src/rayquaza_scene.c +++ b/src/rayquaza_scene.c @@ -5,7 +5,7 @@ #include "graphics.h" #include "bg.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "scanline_effect.h" #include "menu.h" @@ -89,13 +89,13 @@ static void sub_81D9868(struct Sprite *sprite, u8 animNum, s16 x, s16 y); // const rom data static const TaskFunc sTasksForAnimations[] = { - Task_DuoFightAnim, // RAY_ANIM_DUO_FIGHT_PRE - Task_DuoFightAnim, // RAY_ANIM_DUO_FIGHT - Task_RayTakesFlightAnim, // RAY_ANIM_TAKES_FLIGHT - Task_RayDescendsAnim, // RAY_ANIM_DESCENDS - Task_RayChargesAnim, // RAY_ANIM_CHARGES - Task_RayChasesAwayAnim, // RAY_ANIM_CHACES_AWAY - Task_EndAfterFadeScreen // RAY_ANIM_END + [RAY_ANIM_DUO_FIGHT_PRE] = Task_DuoFightAnim, + [RAY_ANIM_DUO_FIGHT] = Task_DuoFightAnim, + [RAY_ANIM_TAKES_FLIGHT] = Task_RayTakesFlightAnim, + [RAY_ANIM_DESCENDS] = Task_RayDescendsAnim, + [RAY_ANIM_CHARGES] = Task_RayChargesAnim, + [RAY_ANIM_CHACES_AWAY] = Task_RayChasesAwayAnim, + [RAY_ANIM_END] = Task_EndAfterFadeScreen, }; static const struct OamData sOamData_862A6BC = |