minor fixes
This commit is contained in:
+1
-1
@@ -83,7 +83,7 @@ SECTIONS {
|
|||||||
src/daycare.o(.text);
|
src/daycare.o(.text);
|
||||||
asm/battle_interface.o(.text);
|
asm/battle_interface.o(.text);
|
||||||
asm/smokescreen.o(.text);
|
asm/smokescreen.o(.text);
|
||||||
src/pokeball.o(.text);
|
src/pokeball.o(.text);
|
||||||
src/load_save.o(.text);
|
src/load_save.o(.text);
|
||||||
src/trade.o(.text);
|
src/trade.o(.text);
|
||||||
src/trade_scene.o(.text);
|
src/trade_scene.o(.text);
|
||||||
|
|||||||
+2
-3
@@ -705,7 +705,7 @@ static void SpriteCB_TestBallThrow(struct Sprite *sprite)
|
|||||||
u8 noOfShakes = gTasks[taskId].tThrowId;
|
u8 noOfShakes = gTasks[taskId].tThrowId;
|
||||||
|
|
||||||
StartSpriteAnim(sprite, 1);
|
StartSpriteAnim(sprite, 1);
|
||||||
sprite->affineAnimPaused = 1;
|
sprite->affineAnimPaused = TRUE;
|
||||||
sprite->pos1.x += sprite->pos2.x;
|
sprite->pos1.x += sprite->pos2.x;
|
||||||
sprite->pos1.y += sprite->pos2.y;
|
sprite->pos1.y += sprite->pos2.y;
|
||||||
sprite->pos2.x = 0;
|
sprite->pos2.x = 0;
|
||||||
@@ -1216,8 +1216,7 @@ static void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite)
|
|||||||
{
|
{
|
||||||
sprite->pos1.x += sprite->pos2.x;
|
sprite->pos1.x += sprite->pos2.x;
|
||||||
sprite->pos1.y += sprite->pos2.y;
|
sprite->pos1.y += sprite->pos2.y;
|
||||||
sprite->pos2.y = 0;
|
sprite->pos2.y = sprite->pos2.x = 0;
|
||||||
sprite->pos2.x = 0;
|
|
||||||
sprite->sBattler = sprite->oam.affineParam & 0xFF;
|
sprite->sBattler = sprite->oam.affineParam & 0xFF;
|
||||||
sprite->data[0] = 0;
|
sprite->data[0] = 0;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user