diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-02-18 20:21:56 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-02-18 20:21:56 -0500 |
| commit | 958dac2cf952ff94767ddec90bc3b1ddd0887a51 (patch) | |
| tree | 41cfe9278c3590493c3ba4ed904fc08e44c377e9 /src/field/pokeblock.c | |
| parent | 2ecf9cb5f3f89ad8c9bbe64957de40ac509e4ea7 (diff) | |
| parent | 2e21a867487e2187a954a351f775bd3f3a9535b1 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into visual_studio
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 b4be44aa2..6804f55d6 100644 --- a/src/field/pokeblock.c +++ b/src/field/pokeblock.c @@ -462,7 +462,7 @@ void debug_sub_8120F98(void) static void sub_810BB0C(void) { BasicInitMenuWindow(&gWindowTemplate_81E6E34); - sub_8072BD8(ItemId_GetItem(ITEM_POKEBLOCK_CASE)->name, 2, 1, 0x48); + sub_8072BD8(ItemId_GetName(ITEM_POKEBLOCK_CASE), 2, 1, 0x48); } static void sub_810BB30(void) @@ -481,7 +481,7 @@ static void sub_810BB88(u8 a0) u8 y; u8 *buf; BasicInitMenuWindow(&gWindowTemplate_81E6E34); - for (i=a0; i<=a0+8; i++) + for (i = a0; i <= a0 + 8; i++) { y = (i - a0) << 1; if (i == gUnknown_02039248.unk2) @@ -1070,7 +1070,7 @@ s8 GetFirstFreePokeblockSlot(void) return -1; } -bool8 sub_810CA34(struct Pokeblock *pokeblock) +bool8 sub_810CA34(const struct Pokeblock *pokeblock) { s8 idx = GetFirstFreePokeblockSlot(); if (idx == -1) |