diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-02 11:16:06 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-02 11:16:06 -0600 |
| commit | 0f5b0005676cd3db623eb557f86cf92b1e020827 (patch) | |
| tree | 257857a4bed89a1d9410a9945efd63a76ea16582 /src/battle/pokeball.c | |
| parent | 28e98d9df7db41f9dcc813ad4e0b37c568833aee (diff) | |
| parent | 397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff) | |
Merge branch 'master' into decompile_easy_chat
Diffstat (limited to 'src/battle/pokeball.c')
| -rw-r--r-- | src/battle/pokeball.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c index 12fd5e5d9..bcaaebcda 100644 --- a/src/battle/pokeball.c +++ b/src/battle/pokeball.c @@ -376,8 +376,8 @@ static void sub_8046464(u8 taskId) gSprites[spriteId].callback = sub_8047074; break; case 0xFE: - gSprites[spriteId].pos1.x = sub_8077ABC(r5, 0); - gSprites[spriteId].pos1.y = sub_8077ABC(r5, 1) + 24; + gSprites[spriteId].pos1.x = GetBankPosition(r5, 0); + gSprites[spriteId].pos1.y = GetBankPosition(r5, 1) + 24; gBankTarget = r5; gSprites[spriteId].data[0] = 0; gSprites[spriteId].callback = sub_8047254; @@ -394,8 +394,8 @@ static void sub_8046464(u8 taskId) return; } gSprites[spriteId].data[0] = 0x22; - gSprites[spriteId].data[2] = sub_8077ABC(gBankTarget, 0); - gSprites[spriteId].data[4] = sub_8077ABC(gBankTarget, 1) - 16; + gSprites[spriteId].data[2] = GetBankPosition(gBankTarget, 0); + gSprites[spriteId].data[4] = GetBankPosition(gBankTarget, 1) - 16; gSprites[spriteId].data[5] = -40; sub_80786EC(&gSprites[spriteId]); gSprites[spriteId].oam.affineParam = taskId; @@ -830,8 +830,8 @@ static void sub_8046FBC(struct Sprite *sprite) static void sub_8047074(struct Sprite *sprite) { sprite->data[0] = 25; - sprite->data[2] = sub_8077ABC(sprite->data[6], 2); - sprite->data[4] = sub_8077ABC(sprite->data[6], 3) + 24; + sprite->data[2] = GetBankPosition(sprite->data[6], 2); + sprite->data[4] = GetBankPosition(sprite->data[6], 3) + 24; sprite->data[5] = -30; sprite->oam.affineParam = sprite->data[6]; sub_80786EC(sprite); |