diff options
author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-03 16:22:45 +0100 |
---|---|---|
committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-03 16:22:45 +0100 |
commit | 56f960f67679071712dd7d2cd6140eb8833e7344 (patch) | |
tree | 18f9af70a8a591117a7f0a7845d86462537f777c /src/field/pokeblock.c | |
parent | b5ecdfa404a34c66fdf9f96342a2de0f173e6e73 (diff) | |
parent | 397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/field/pokeblock.c')
-rw-r--r-- | src/field/pokeblock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c index 4a904fbb1..640d4731f 100644 --- a/src/field/pokeblock.c +++ b/src/field/pokeblock.c @@ -426,7 +426,7 @@ void sub_810BADC(void) SetMainCallback2(sub_810B96C); } -void sub_810BAF4(void) +void OpenPokeblockCaseOnFeeder(void) { sub_810BA7C(3); SetMainCallback2(sub_810B96C); @@ -1041,7 +1041,7 @@ u8 sub_810C9E8(struct Pokeblock *pokeblock) return feel; } -s8 sub_810CA00(void) +s8 GetFirstFreePokeblockSlot(void) { u8 i; for (i=0; i<ARRAY_COUNT(gSaveBlock1.pokeblocks); i++) @@ -1056,7 +1056,7 @@ s8 sub_810CA00(void) bool8 sub_810CA34(struct Pokeblock *pokeblock) { - s8 idx = sub_810CA00(); + s8 idx = GetFirstFreePokeblockSlot(); if (idx == -1) { return FALSE; |