diff options
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | src/pokeball.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ld_script.txt b/ld_script.txt index 50cb621ab..741e87828 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -83,7 +83,7 @@ SECTIONS { src/daycare.o(.text); asm/battle_interface.o(.text); asm/smokescreen.o(.text); - src/pokeball.o(.text); + src/pokeball.o(.text); src/load_save.o(.text); src/trade.o(.text); src/trade_scene.o(.text); diff --git a/src/pokeball.c b/src/pokeball.c index 171e1beb9..20dc7bfe5 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -705,7 +705,7 @@ static void SpriteCB_TestBallThrow(struct Sprite *sprite) u8 noOfShakes = gTasks[taskId].tThrowId; StartSpriteAnim(sprite, 1); - sprite->affineAnimPaused = 1; + sprite->affineAnimPaused = TRUE; sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; sprite->pos2.x = 0; @@ -1216,8 +1216,7 @@ static void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite) { sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; - sprite->pos2.y = 0; - sprite->pos2.x = 0; + sprite->pos2.y = sprite->pos2.x = 0; sprite->sBattler = sprite->oam.affineParam & 0xFF; sprite->data[0] = 0; |