diff options
author | KDSKardabox <bollygame94@gmail.com> | 2018-12-09 13:44:41 +0530 |
---|---|---|
committer | KDSKardabox <bollygame94@gmail.com> | 2018-12-09 13:44:41 +0530 |
commit | 8712757d2454a8ee15680a658ea7df8621954bef (patch) | |
tree | 5f0ebfdccc0e22c0e52f8d223ec4889c7597569f /src/battle_pyramid.c | |
parent | f8838491f6c46df771c5414f8b6da781294300b7 (diff) | |
parent | 0b91d2948a431a5d44166544897a550061c01a31 (diff) |
Merge remote-tracking branch 'upstream/master'
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; |