diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-31 14:22:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 14:22:51 -0400 |
| commit | b1ea2592c30a2e5af547dfc69cef56eb65ae85ba (patch) | |
| tree | a65d2af7712a2913afb72329215f2574d92d1668 /src/field_tasks.c | |
| parent | b33db9b96cda2f03d10b9bfeec4e6ac8bc90da13 (diff) | |
| parent | 67ce8c9cc2dc9d018cae17e71b46c2c999cb048a (diff) | |
Merge branch 'master' into doc-partymenu
Diffstat (limited to 'src/field_tasks.c')
| -rw-r--r-- | src/field_tasks.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/field_tasks.c b/src/field_tasks.c index 63539e475..21b2732c3 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -16,6 +16,7 @@ #include "secret_base.h" #include "sound.h" #include "task.h" +#include "constants/field_tasks.h" #include "constants/items.h" #include "constants/songs.h" #include "constants/vars.h" @@ -38,14 +39,14 @@ static void Task_MuddySlope(u8 taskId); static const TaskFunc sPerStepCallbacks[] = { - DummyPerStepCallback, - AshGrassPerStepCallback, - FortreeBridgePerStepCallback, - PacifidlogBridgePerStepCallback, - SootopolisGymIcePerStepCallback, - EndTruckSequence, - SecretBasePerStepCallback, - CrackedFloorPerStepCallback + [STEP_CB_DUMMY] = DummyPerStepCallback, + [STEP_CB_ASH] = AshGrassPerStepCallback, + [STEP_CB_FORTREE_BRIDGE] = FortreeBridgePerStepCallback, + [STEP_CB_PACIFIDLOG_BRIDGE] = PacifidlogBridgePerStepCallback, + [STEP_CB_SOOTOPOLIS_ICE] = SootopolisGymIcePerStepCallback, + [STEP_CB_TRUCK] = EndTruckSequence, + [STEP_CB_SECRET_BASE] = SecretBasePerStepCallback, + [STEP_CB_CRACKED_FLOOR] = CrackedFloorPerStepCallback }; // they are in pairs but declared as 1D array |