dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into pokeball-doc

Browse Source
This commit is contained in:
hondew
2020-08-30 14:14:38 -04:00
parent 328aecc96e a9719c92bf
commit e46b35455d
1455 changed files with 29665 additions and 29517 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokeball.c
+10 -10
View File
@@ -406,7 +406,7 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
gSprites[ballSpriteId].oam.affineParam = taskId;
gTasks[taskId].tOpponentBattler = gBattlerTarget;
gTasks[taskId].func = TaskDummy;
PlaySE(SE_NAGERU);
PlaySE(SE_BALL_THROW);
}
static void SpriteCB_TestBallThrow(struct Sprite *sprite)
@@ -464,7 +464,7 @@ static void sub_807574C(struct Sprite *sprite)
{
sprite->data[5]++;
if (sprite->data[5] == 11)
PlaySE(SE_SUIKOMU);
PlaySE(SE_BALL_TRADE);
if (gSprites[gBattlerSpriteIds[sprite->sBattler]].affineAnimEnded)
{
StartSpriteAnim(sprite, 2);
@@ -514,16 +514,16 @@ static void sub_8075838(struct Sprite *sprite)
switch (sprite->data[3] >> 8)
{
case 1:
PlaySE(SE_KON);
PlaySE(SE_BALL_BOUNCE_1);
break;
case 2:
PlaySE(SE_KON2);
PlaySE(SE_BALL_BOUNCE_2);
break;
case 3:
PlaySE(SE_KON3);
PlaySE(SE_BALL_BOUNCE_3);
break;
default:
PlaySE(SE_KON4);
PlaySE(SE_BALL_BOUNCE_4);
break;
}
}
@@ -565,7 +565,7 @@ static void sub_8075930(struct Sprite *sprite)
sprite->affineAnimPaused = TRUE;
StartSpriteAffineAnim(sprite, 1);
sprite->callback = sub_8075970;
PlaySE(SE_BOWA);
PlaySE(SE_BALL);
}
}
@@ -634,7 +634,7 @@ static void sub_8075970(struct Sprite *sprite)
StartSpriteAffineAnim(sprite, 2);
else
StartSpriteAffineAnim(sprite, 1);
PlaySE(SE_BOWA);
PlaySE(SE_BALL);
}
break;
}
@@ -881,7 +881,7 @@ static void sub_80760F8(struct Sprite *sprite)
{
gDoingBattleAnim = FALSE;
m4aMPlayAllStop();
PlaySE(MUS_FANFA5);
PlaySE(MUS_EVOLVED);
}
else if (sprite->data[4] == 315)
{
@@ -1150,7 +1150,7 @@ static void sub_807687C(struct Sprite *sprite)
sprite->data[5]++;
if (sprite->data[5] == 11)
PlaySE(SE_SUIKOMU);
PlaySE(SE_BALL_TRADE);
r1 = sprite->data[0];
if (gSprites[r1].affineAnimEnded)
{