diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-09 11:56:50 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-09 11:56:50 +0100 |
| commit | 4683cdc30cbe81db56b69dfeb7a1fb32fe6641e2 (patch) | |
| tree | c7c791620bcb6849a24b549b4a5c48abec281c10 /src/battle_transition.c | |
| parent | 606fb71392651dac4f5f8773c4117f35de7b087e (diff) | |
| parent | 0b91d2948a431a5d44166544897a550061c01a31 (diff) | |
Merge branch 'master' into weather
Diffstat (limited to 'src/battle_transition.c')
| -rw-r--r-- | src/battle_transition.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c index aa8877148..37a8cd63f 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -7,7 +7,7 @@ #include "field_effect.h" #include "gpu_regs.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "overworld.h" #include "palette.h" #include "random.h" @@ -612,32 +612,32 @@ static const s16 gUnknown_085C8CF2[] = {4, 517, -1}; static const s16 *const gUnknown_085C8CF8[] = { - gUnknown_085C8C90, - gUnknown_085C8CA4, - gUnknown_085C8C98, - gUnknown_085C8C9E, - gUnknown_085C8CEA, - gUnknown_085C8CE4, - gUnknown_085C8CF2, - gUnknown_085C8CDE + gUnknown_085C8C90, + gUnknown_085C8CA4, + gUnknown_085C8C98, + gUnknown_085C8C9E, + gUnknown_085C8CEA, + gUnknown_085C8CE4, + gUnknown_085C8CF2, + gUnknown_085C8CDE }; static const s16 *const gUnknown_085C8D18[] = { - gUnknown_085C8CBC, - gUnknown_085C8CB0, - gUnknown_085C8CB6, - gUnknown_085C8CAA, - gUnknown_085C8CCA, - gUnknown_085C8CD8, - gUnknown_085C8CC4, - gUnknown_085C8CD2 + gUnknown_085C8CBC, + gUnknown_085C8CB0, + gUnknown_085C8CB6, + gUnknown_085C8CAA, + gUnknown_085C8CCA, + gUnknown_085C8CD8, + gUnknown_085C8CC4, + gUnknown_085C8CD2 }; static const s16 *const *const gUnknown_085C8D38[] = { - gUnknown_085C8CF8, - gUnknown_085C8D18 + gUnknown_085C8CF8, + gUnknown_085C8D18 }; static const TransitionStateFunc sPhase2_Groudon_Funcs[] = |