diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-08 21:44:12 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-08 21:44:12 -0600 |
| commit | 0b91d2948a431a5d44166544897a550061c01a31 (patch) | |
| tree | 6e590fbd965b8cd96852ec36474a6841a74dc9b8 /src/battle_pyramid.c | |
| parent | 88ffb0976571c8782a5e632df79d34b7260882c9 (diff) | |
| parent | cceb8ac3314c9ba5a48d0b69bc39c41080335119 (diff) | |
Merge pull request #429 from nullableVoidPtr/master
Various fixes and cleanups
Diffstat (limited to 'src/battle_pyramid.c')
| -rw-r--r-- | src/battle_pyramid.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 23343ba20..6cc09d713 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -21,7 +21,7 @@ #include "main.h" #include "load_save.h" #include "script.h" -#include "malloc.h" +#include "alloc.h" #include "overworld.h" #include "event_scripts.h" #include "constants/battle_frontier.h" @@ -1458,7 +1458,7 @@ static u16 sub_81A9F90(u8 count) do { trainerId = sub_8162548(challengeNum + 1, battleNum); - for (i = 0 ; i < count; i++) + for (i = 0; i < count; i++) { if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId) break; @@ -1470,7 +1470,7 @@ static u16 sub_81A9F90(u8 count) do { trainerId = sub_8162548(challengeNum, battleNum); - for (i = 0 ; i < count; i++) + for (i = 0; i < count; i++) { if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId) break; |