diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-01-01 19:03:47 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-01 19:03:47 -0800 |
| commit | 397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (patch) | |
| tree | b4c05276d2e5d65f5bf7cf55a054947c92235f8e /src/field/pokeblock.c | |
| parent | 79a9ff94719b5397647ddf11efc1d3dc1d388e1d (diff) | |
| parent | 664b42470fb6c590dd2bd8b02707a790feda23fe (diff) | |
Merge pull request #503 from huderlem/specials
Label a bunch of specials
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; |