diff options
| author | garakmon <thomastaps194@comcast.net> | 2018-07-07 21:29:11 -0400 |
|---|---|---|
| committer | garakmon <thomastaps194@comcast.net> | 2018-07-07 21:29:11 -0400 |
| commit | 864a69f9bf050eaaa062c8346cd6a5032e617139 (patch) | |
| tree | bd8b133710c813b11becf602067495526c849b6a /src | |
| parent | 47bcba3e1b5140cef7f04edcda3759818408726a (diff) | |
merge conflicts are soooooooooo fun
Diffstat (limited to 'src')
70 files changed, 2396 insertions, 685 deletions
diff --git a/src/battle/anim/aurora.c b/src/battle/anim/aurora.c index 5aff17f48..c17748440 100644 --- a/src/battle/anim/aurora.c +++ b/src/battle/anim/aurora.c @@ -68,7 +68,7 @@ void sub_80D33B4(struct Sprite *sprite) sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + r6; sprite->data[3] = sprite->pos1.y; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); sprite->callback = sub_80D344C; sprite->affineAnimPaused = TRUE; sprite->callback(sprite); @@ -81,7 +81,7 @@ static void sub_80D344C(struct Sprite *sprite) StartSpriteAnim(sprite, 1); sprite->affineAnimPaused = FALSE; } - if (TranslateAnimSpriteByDeltas(sprite) != 0) + if (TranslateAnimLinear(sprite) != 0) DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/blow_kiss.c b/src/battle/anim/blow_kiss.c index 0235794c2..80056614f 100644 --- a/src/battle/anim/blow_kiss.c +++ b/src/battle/anim/blow_kiss.c @@ -33,13 +33,13 @@ void sub_80D1F58(struct Sprite* sprite) sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); sprite->data[3] = sprite->pos1.y; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); sprite->callback = sub_80D1FA4; } static void sub_80D1FA4(struct Sprite* sprite) { - if (TranslateAnimSpriteByDeltas(sprite) == 0) + if (TranslateAnimLinear(sprite) == 0) { sprite->pos2.y += Sin(sprite->data[5], 14); sprite->data[5] = (sprite->data[5] + 4) & 0xFF; diff --git a/src/battle/anim/bubble.c b/src/battle/anim/bubble.c index e024091d7..ceefd82cf 100644 --- a/src/battle/anim/bubble.c +++ b/src/battle/anim/bubble.c @@ -80,7 +80,7 @@ void sub_80D31C8(struct Sprite* sprite) sprite->data[3] = sprite->pos1.y; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); newSpriteId = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy); sprite->data[5] = newSpriteId; @@ -106,7 +106,7 @@ static void sub_80D32E8(struct Sprite *sprite) u16 index = gSprites[spriteId].data[3]; sprite->data[0] = 1; - TranslateAnimSpriteByDeltas(sprite); + TranslateAnimLinear(sprite); sprite->pos2.x += Sin(index / 256, gSprites[spriteId].data[0]); sprite->pos2.y += Cos(index / 256, gSprites[spriteId].data[1]); diff --git a/src/battle/anim/bug.c b/src/battle/anim/bug.c index c4c7fe937..e4ea01f5c 100644 --- a/src/battle/anim/bug.c +++ b/src/battle/anim/bug.c @@ -224,7 +224,7 @@ void sub_80DC824(struct Sprite *sprite) sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } @@ -249,7 +249,7 @@ void sub_80DC8F4(struct Sprite *sprite) sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } @@ -282,7 +282,7 @@ void sub_80DC9A0(struct Sprite *sprite) static void sub_80DCA38(struct Sprite *sprite) { - if (TranslateAnimSpriteByDeltas(sprite)) + if (TranslateAnimLinear(sprite)) { DestroyAnimSprite(sprite); return; @@ -414,7 +414,7 @@ void AnimTranslateStinger(struct Sprite *sprite) sprite->data[2] = lVarX; sprite->data[4] = lVarY; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } @@ -438,7 +438,7 @@ void AnimMissileArc(struct Sprite *sprite) sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[5]; - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); sprite->callback = AnimMissileArcStep; sprite->invisible = TRUE; @@ -448,7 +448,7 @@ static void AnimMissileArcStep(struct Sprite *sprite) { sprite->invisible = FALSE; - if (TranslateAnimSpriteLinearAndSine(sprite)) + if (TranslateAnimArc(sprite)) { DestroyAnimSprite(sprite); } @@ -468,7 +468,7 @@ static void AnimMissileArcStep(struct Sprite *sprite) x2 += x1; y2 += y1; - if (!TranslateAnimSpriteLinearAndSine(sprite)) + if (!TranslateAnimArc(sprite)) { u16 rotation = ArcTan2Neg(sprite->pos1.x + sprite->pos2.x - x2, sprite->pos1.y + sprite->pos2.y - y2); diff --git a/src/battle/anim/bullet.c b/src/battle/anim/bullet.c index 764903247..60c001853 100644 --- a/src/battle/anim/bullet.c +++ b/src/battle/anim/bullet.c @@ -44,7 +44,7 @@ void sub_80CFFD8(struct Sprite* sprite) sprite->data[0] = 20; sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; sprite->affineAnimPaused = 1; StoreSpriteCallbackInData(sprite, sub_80D0030); } diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c index af72edef0..fb7bc4e1c 100644 --- a/src/battle/anim/current.c +++ b/src/battle/anim/current.c @@ -366,7 +366,7 @@ void sub_80D648C(struct Sprite *sprite) sprite->data[3] = sprite->pos1.y; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); sprite->data[5] = gBattleAnimArgs[2]; sprite->data[6] = gBattleAnimArgs[5]; sprite->data[7] = gBattleAnimArgs[4]; @@ -378,7 +378,7 @@ void sub_80D648C(struct Sprite *sprite) static void sub_80D6514(struct Sprite *sprite) { - if (!TranslateAnimSpriteByDeltas(sprite)) + if (!TranslateAnimLinear(sprite)) { sprite->pos2.x += Sin(sprite->data[7], sprite->data[5]); sprite->pos2.y += Cos(sprite->data[7], sprite->data[5]); @@ -857,7 +857,7 @@ static void sub_80D6BB8(u8 taskId) sprite->data[4] = task->data[15]; sprite->data[5] = taskId; - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); StoreSpriteCallbackInData(sprite, sub_80D6D00); sprite->callback = sub_8078600; @@ -887,7 +887,7 @@ static void sub_80D6BB8(u8 taskId) static void sub_80D6CCC(struct Sprite *sprite) { - if (TranslateAnimSpriteByDeltas(sprite)) + if (TranslateAnimLinear(sprite)) { gTasks[sprite->data[5]].data[7]--; DestroySprite(sprite); diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c index 59db85342..09e16b8fe 100644 --- a/src/battle/anim/dark.c +++ b/src/battle/anim/dark.c @@ -402,13 +402,13 @@ void sub_80DFFD0(struct Sprite *sprite) sprite->data[4] = sprite->pos1.y + 12; sprite->data[5] = -12; - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); sprite->callback = sub_80E00D0; } static void sub_80E00D0(struct Sprite *sprite) { - if (TranslateAnimSpriteLinearAndSine(sprite)) + if (TranslateAnimArc(sprite)) move_anim_8074EE0(sprite); } diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c index 163529ecb..0b5b1b88b 100644 --- a/src/battle/anim/dragon.c +++ b/src/battle/anim/dragon.c @@ -242,7 +242,7 @@ void sub_80DF63C(struct Sprite *sprite) StartSpriteAnim(sprite, 1); } sprite->data[0] = gBattleAnimArgs[4]; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, move_anim_8074EE0); } diff --git a/src/battle/anim/energy_wave.c b/src/battle/anim/energy_wave.c index 9ac362b57..cbca5338c 100644 --- a/src/battle/anim/energy_wave.c +++ b/src/battle/anim/energy_wave.c @@ -170,7 +170,7 @@ void sub_80D3554(struct Sprite *sprite) sprite->data[3] = sprite->pos1.y; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); sprite->data[5] = 0xD200 / sprite->data[0]; sprite->data[7] = gBattleAnimArgs[3]; @@ -191,7 +191,7 @@ void sub_80D3554(struct Sprite *sprite) static void sub_80D35DC(struct Sprite *sprite) { - if (TranslateAnimSpriteByDeltas(sprite)) + if (TranslateAnimLinear(sprite)) { DestroyAnimSprite(sprite); } @@ -299,6 +299,6 @@ void sub_80D3728(struct Sprite *sprite) sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, var2) + gBattleAnimArgs[3]; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c index af2af1981..1a534aec7 100644 --- a/src/battle/anim/fight.c +++ b/src/battle/anim/fight.c @@ -567,7 +567,7 @@ void sub_80D92D0(struct Sprite *sprite) } sprite->data[4] = sprite->pos1.y - 20; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, sub_80D9328); } @@ -583,7 +583,7 @@ static void sub_80D9328(struct Sprite *sprite) sprite->pos2.y = 0; sprite->pos2.x = 0; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } } @@ -604,7 +604,7 @@ void sub_80D9378(struct Sprite *sprite) sprite->data[3] = sprite->pos1.y; sprite->data[4] = sprite->pos1.y; - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); sprite->data[5] = gBattleAnimArgs[5]; sprite->data[6] = gBattleAnimArgs[4]; @@ -615,7 +615,7 @@ void sub_80D9378(struct Sprite *sprite) static void sub_80D9404(struct Sprite *sprite) { - if (!TranslateAnimSpriteByDeltas(sprite)) + if (!TranslateAnimLinear(sprite)) { sprite->pos2.y += Sin(sprite->data[7] >> 8, sprite->data[5]); sprite->data[7] += sprite->data[6]; @@ -672,7 +672,7 @@ static void AnimStompFootStep(struct Sprite *sprite) sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, AnimStompFootEnd); } } @@ -846,9 +846,9 @@ static void sub_80D986C(struct Sprite *sprite) sprite->data[3] = sprite->pos1.y; sprite->data[4] = GetBattlerSpriteCoord(sprite->data[7], 3); - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); StoreSpriteCallbackInData(sprite, move_anim_8074EE0); - sprite->callback = TranslateAnimSpriteByDeltasUntil; + sprite->callback = TranslateAnimLinearUntil; } } @@ -941,9 +941,9 @@ void sub_80D9A38(struct Sprite *sprite) sprite->data[3] = sprite->pos1.y; sprite->data[4] = GetBattlerSpriteCoord(bank, 3); - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); StoreSpriteCallbackInData(sprite, DestroyAnimSprite); - sprite->callback = TranslateAnimSpriteByDeltasUntil; + sprite->callback = TranslateAnimLinearUntil; } static void sub_80D9B24(struct Sprite *sprite) diff --git a/src/battle/anim/fire_2.c b/src/battle/anim/fire_2.c index b055d7c80..68e13e1c1 100644 --- a/src/battle/anim/fire_2.c +++ b/src/battle/anim/fire_2.c @@ -241,7 +241,7 @@ static void AnimFireRingStep1(struct Sprite *sprite) sprite->data[3] = sprite->pos1.y; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); sprite->callback = AnimFireRingStep2; } @@ -249,7 +249,7 @@ static void AnimFireRingStep1(struct Sprite *sprite) static void AnimFireRingStep2(struct Sprite *sprite) { - if (TranslateAnimSpriteByDeltas(sprite)) + if (TranslateAnimLinear(sprite)) { sprite->data[0] = 0; diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c index e8c50816c..35022db1f 100644 --- a/src/battle/anim/flying.c +++ b/src/battle/anim/flying.c @@ -496,14 +496,14 @@ void sub_80DA16C(struct Sprite *sprite) sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; sprite->data[3] = sprite->pos1.y; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); sprite->callback = sub_80785E4; StoreSpriteCallbackInData(sprite, sub_80DA1EC); } void sub_80DA1EC(struct Sprite *sprite) { - if (TranslateAnimSpriteByDeltas(sprite) != 0) + if (TranslateAnimLinear(sprite) != 0) { DestroyAnimSprite(sprite); } @@ -543,7 +543,7 @@ void sub_80DA208(struct Sprite *sprite) sprite->data[2] = sprite->data[2] + gBattleAnimArgs[2]; sprite->data[4] = sprite->data[4] + gBattleAnimArgs[3]; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); SeekSpriteAnim(sprite, gBattleAnimArgs[5]); @@ -596,14 +596,14 @@ void sub_80DA38C(struct Sprite *sprite) sprite->data[3] = sprite->pos1.y; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); sprite->callback = sub_80DA410; } void sub_80DA410(struct Sprite *sprite) { sprite->data[0] = 1; - TranslateAnimSpriteByDeltas(sprite); + TranslateAnimLinear(sprite); if (((u16)sprite->data[3] >> 8) > 200) { diff --git a/src/battle/anim/flying_path.c b/src/battle/anim/flying_path.c index b190e9e8c..d2f85ad35 100644 --- a/src/battle/anim/flying_path.c +++ b/src/battle/anim/flying_path.c @@ -102,7 +102,7 @@ void sub_80CBDF4(u8 taskId) gSprites[task->data[2]].data[3] = task->data[9]; gSprites[task->data[2]].data[4] = task->data[7] + (task->data[11] / 2 + 10) * task->data[5]; gSprites[task->data[2]].data[5] = sub_80CC338(&gSprites[task->data[2]]); - InitAnimSpriteTranslationOverDuration(&gSprites[task->data[2]]); + InitAnimArcTranslation(&gSprites[task->data[2]]); task->func = sub_80CBF5C; } @@ -115,7 +115,7 @@ static void sub_80CBF5C(u8 taskId) { case 4: sub_80CC358(task, taskId); - if (TranslateAnimSpriteLinearAndSine(sprite) == 0) + if (TranslateAnimArc(sprite) == 0) { break; } @@ -127,7 +127,7 @@ static void sub_80CBF5C(u8 taskId) break; case 8: sub_80CC358(task, taskId); - if (TranslateAnimSpriteLinearAndSine(sprite) == 0) + if (TranslateAnimArc(sprite) == 0) { break; } @@ -139,7 +139,7 @@ static void sub_80CBF5C(u8 taskId) break; case 0: sub_80CC358(task, taskId); - if (TranslateAnimSpriteLinearAndSine(sprite) == 0) + if (TranslateAnimArc(sprite) == 0) break; task->data[15] = 1; @@ -160,12 +160,12 @@ static void sub_80CBF5C(u8 taskId) task->data[3] = a; sprite->subpriority = task->data[4]; StartSpriteAnim(sprite, task->data[3]); - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); task->data[0]++; break; case 2: sub_80CC358(task, taskId); - if (TranslateAnimSpriteLinearAndSine(sprite) == 0) + if (TranslateAnimArc(sprite) == 0) break; task->data[15] = 3; @@ -185,7 +185,7 @@ static void sub_80CBF5C(u8 taskId) task->data[3] = 2; sprite->subpriority = task->data[4]; StartSpriteAnim(sprite, task->data[3]); - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); task->data[0]++; break; case 5: @@ -203,12 +203,12 @@ static void sub_80CBF5C(u8 taskId) task->data[3] = 3; sprite->subpriority = task->data[4]; StartSpriteAnim(sprite, task->data[3]); - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); task->data[0]++; break; case 6: sub_80CC358(task, taskId); - if (TranslateAnimSpriteLinearAndSine(sprite) == 0) + if (TranslateAnimArc(sprite) == 0) break; task->data[15] = 7; @@ -229,7 +229,7 @@ static void sub_80CBF5C(u8 taskId) task->data[3] = 4; sprite->subpriority = task->data[4]; StartSpriteAnim(sprite, task->data[3]); - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); task->data[0]++; break; case 9: @@ -246,12 +246,12 @@ static void sub_80CBF5C(u8 taskId) task->data[3] = 5; sprite->subpriority = task->data[4]; StartSpriteAnim(sprite, task->data[3]); - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); task->data[0]++; break; case 10: sub_80CC358(task, taskId); - if (TranslateAnimSpriteLinearAndSine(sprite) == 0) + if (TranslateAnimArc(sprite) == 0) { break; } @@ -277,13 +277,13 @@ static void sub_80CBF5C(u8 taskId) task->data[3] = 6; sprite->subpriority = task->data[4]; StartSpriteAnim(sprite, task->data[3]); - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); task->data[0]++; break; } case 12: sub_80CC358(task, taskId); - if (TranslateAnimSpriteLinearAndSine(sprite) != 0) + if (TranslateAnimArc(sprite) != 0) { DestroySprite(sprite); task->data[0]++; diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c index 52d9c7e72..c11cea5a0 100644 --- a/src/battle/anim/ghost.c +++ b/src/battle/anim/ghost.c @@ -242,7 +242,7 @@ static void sub_80DDBD8(struct Sprite *sprite) s16 r0; s16 r2; sub_80DDCC8(sprite); - if (TranslateAnimSpriteByDeltas(sprite)) + if (TranslateAnimLinear(sprite)) { sprite->callback = sub_80DDC4C; return; @@ -265,7 +265,7 @@ static void sub_80DDC4C(struct Sprite *sprite) s16 r2; s16 r0; sprite->data[0] = 1; - TranslateAnimSpriteByDeltas(sprite); + TranslateAnimLinear(sprite); sprite->pos2.x += Sin(sprite->data[5], 10); sprite->pos2.y += Cos(sprite->data[5], 15); diff --git a/src/battle/anim/grip.c b/src/battle/anim/grip.c index 1ec779c09..b5c191449 100644 --- a/src/battle/anim/grip.c +++ b/src/battle/anim/grip.c @@ -67,7 +67,7 @@ void sub_80D0178(struct Sprite* sprite) sprite->data[0] = 6; sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + r8; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + r6; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, sub_80D020C); } diff --git a/src/battle/anim/ground.c b/src/battle/anim/ground.c index 67b4c9c9c..cf73ead2f 100644 --- a/src/battle/anim/ground.c +++ b/src/battle/anim/ground.c @@ -160,13 +160,13 @@ static void AnimBonemerangProjectile(struct Sprite *sprite) sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); sprite->data[5] = -40; - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); sprite->callback = AnimBonemerangProjectileStep; } static void AnimBonemerangProjectileStep(struct Sprite *sprite) { - if (TranslateAnimSpriteLinearAndSine(sprite)) + if (TranslateAnimArc(sprite)) { sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; @@ -176,14 +176,14 @@ static void AnimBonemerangProjectileStep(struct Sprite *sprite) sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); sprite->data[5] = 40; - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); sprite->callback = AnimBonemerangProjectileEnd; } } static void AnimBonemerangProjectileEnd(struct Sprite *sprite) { - if (TranslateAnimSpriteLinearAndSine(sprite)) + if (TranslateAnimArc(sprite)) DestroyAnimSprite(sprite); } @@ -203,7 +203,7 @@ static void AnimBoneHitProjectile(struct Sprite *sprite) sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } @@ -233,7 +233,7 @@ static void AnimDirtScatter(struct Sprite *sprite) sprite->data[0] = gBattleAnimArgs[2]; sprite->data[2] = targetXPos + xOffset; sprite->data[4] = targetYPos + yOffset; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, move_anim_8074EE0); } @@ -537,13 +537,13 @@ static void AnimFissureDirtPlumeParticle(struct Sprite *sprite) sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2]; sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[4]; - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); sprite->callback = AnimFissureDirtPlumeParticleStep; } static void AnimFissureDirtPlumeParticleStep(struct Sprite *sprite) { - if (TranslateAnimSpriteLinearAndSine(sprite)) + if (TranslateAnimArc(sprite)) DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c index 341f74372..b1f194ef5 100644 --- a/src/battle/anim/guard.c +++ b/src/battle/anim/guard.c @@ -61,6 +61,6 @@ void sub_80D3014(struct Sprite *sprite) sprite->data[2] = sprite->pos1.x; sprite->data[4] = sprite->pos1.y - 72; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/guillotine.c b/src/battle/anim/guillotine.c index eb1bc7733..bc0fce4dd 100644 --- a/src/battle/anim/guillotine.c +++ b/src/battle/anim/guillotine.c @@ -71,7 +71,7 @@ void sub_80D0228(struct Sprite* sprite) sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + r9; sprite->data[3] = sprite->pos1.y; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + r6; - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); sprite->data[5] = gBattleAnimArgs[0]; sprite->data[6] = sprite->data[0]; sprite->callback = sub_80D02D0; @@ -79,7 +79,7 @@ void sub_80D0228(struct Sprite* sprite) static void sub_80D02D0(struct Sprite* sprite) { - if (TranslateAnimSpriteByDeltas(sprite) && sprite->animEnded == 1) + if (TranslateAnimLinear(sprite) && sprite->animEnded == 1) { SeekSpriteAnim(sprite, 0); sprite->animPaused = 1; @@ -119,6 +119,6 @@ static void sub_80D0344(struct Sprite* sprite) static void sub_80D03A8(struct Sprite* sprite) { - if (TranslateAnimSpriteByDeltas(sprite) != 0) + if (TranslateAnimLinear(sprite) != 0) DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/heal_bell.c b/src/battle/anim/heal_bell.c index 09029c9ff..c9f26b093 100644 --- a/src/battle/anim/heal_bell.c +++ b/src/battle/anim/heal_bell.c @@ -126,7 +126,7 @@ void sub_80D1C08(struct Sprite* sprite) sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[2]; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[3]; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sub_80D1BA8(sprite, gBattleAnimArgs[5], gBattleAnimArgs[6]); } diff --git a/src/battle/anim/leaf.c b/src/battle/anim/leaf.c index d31e4dbd6..2d36d7360 100644 --- a/src/battle/anim/leaf.c +++ b/src/battle/anim/leaf.c @@ -207,7 +207,7 @@ void AnimTranslateLinearSingleSineWave(struct Sprite* sprite) } sprite->data[5] = gBattleAnimArgs[5]; - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); if (GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget)) { sprite->data[0] = 1; @@ -228,7 +228,7 @@ static void AnimTranslateLinearSingleSineWaveStep(struct Sprite* sprite) s16 r0; sprite->data[0] = 1; - TranslateAnimSpriteLinearAndSine(sprite); + TranslateAnimArc(sprite); r0 = sprite->data[7]; sprite->data[0] = a; if (b > 0xC8 && r0 <= 0x37 && sprite->oam.affineParam == 0) diff --git a/src/battle/anim/musical.c b/src/battle/anim/musical.c index 17836ace7..b67cd17b8 100644 --- a/src/battle/anim/musical.c +++ b/src/battle/anim/musical.c @@ -368,14 +368,14 @@ void sub_80CEE60(struct Sprite* sprite) sprite->data[2] = a + sprite->data[1]; sprite->data[3] = sprite->pos1.y; sprite->data[4] = sprite->data[3] - 40; - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); sprite->data[5] = gBattleAnimArgs[3]; sprite->callback = sub_80CEEE8; } static void sub_80CEEE8(struct Sprite* sprite) { - if (TranslateAnimSpriteByDeltas(sprite) == 0) + if (TranslateAnimLinear(sprite) == 0) { s16 a; a = Sin(sprite->data[5], 8); diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c index e76e0923e..f938a2707 100644 --- a/src/battle/anim/orbit.c +++ b/src/battle/anim/orbit.c @@ -158,7 +158,7 @@ void sub_80CAD54(struct Sprite* sprite) sprite->data[2] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); sprite->data[5] = 0x40; sprite->callback = sub_80CADA8; sub_80CADA8(sprite); @@ -166,7 +166,7 @@ void sub_80CAD54(struct Sprite* sprite) static void sub_80CADA8(struct Sprite* sprite) { - if (!TranslateAnimSpriteByDeltas(sprite)) + if (!TranslateAnimLinear(sprite)) { sprite->pos2.x += Sin(sprite->data[5], 32); sprite->pos2.y += Cos(sprite->data[5], -5); @@ -195,7 +195,7 @@ void sub_80CAE20(struct Sprite* sprite) sprite->data[2] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); sprite->data[5] = 0x40; sprite->callback = sub_80CAE74; sub_80CAE74(sprite); @@ -203,7 +203,7 @@ void sub_80CAE20(struct Sprite* sprite) static void sub_80CAE74(struct Sprite* sprite) { - if (!TranslateAnimSpriteByDeltas(sprite)) + if (!TranslateAnimLinear(sprite)) { sprite->pos2.x += Sin(sprite->data[5], 8); if ((u16)(sprite->data[5] - 0x3B) < 5 || (u16)(sprite->data[5] - 0xBB) < 5) diff --git a/src/battle/anim/orbs.c b/src/battle/anim/orbs.c index af6568bd8..b97f0c246 100644 --- a/src/battle/anim/orbs.c +++ b/src/battle/anim/orbs.c @@ -196,7 +196,7 @@ void sub_80CA7B0(struct Sprite* sprite) sprite->data[0] = gBattleAnimArgs[2]; sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, move_anim_8074EE0); } @@ -207,7 +207,7 @@ void sub_80CA800(struct Sprite* sprite) sprite->data[0] = gBattleAnimArgs[2]; sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } @@ -219,7 +219,7 @@ void sub_80CA858(struct Sprite* sprite) sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); sprite->data[3] = sprite->pos1.y; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); sprite->data[5] = gBattleAnimArgs[3]; sprite->callback = sub_80CA8B4; sub_80CA8B4(sprite); @@ -227,7 +227,7 @@ void sub_80CA858(struct Sprite* sprite) static void sub_80CA8B4(struct Sprite* sprite) { - if (TranslateAnimSpriteByDeltas(sprite)) + if (TranslateAnimLinear(sprite)) { DestroySprite(sprite); } @@ -272,13 +272,13 @@ void sub_80CA9A8(struct Sprite* sprite) sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); sprite->data[5] = gBattleAnimArgs[2]; - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); sprite->callback = sub_80CA9F8; } static void sub_80CA9F8(struct Sprite* sprite) { - if (TranslateAnimSpriteLinearAndSine(sprite)) + if (TranslateAnimArc(sprite)) DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/poison.c b/src/battle/anim/poison.c index 4d6673adf..99f534e1c 100644 --- a/src/battle/anim/poison.c +++ b/src/battle/anim/poison.c @@ -204,14 +204,14 @@ void sub_80D9D70(struct Sprite *sprite) sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); sprite->data[5] = -30; - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); sprite->callback = sub_80D9DD4; } static void sub_80D9DD4(struct Sprite *sprite) // same as sub_80D9E78 { - if (TranslateAnimSpriteLinearAndSine(sprite)) + if (TranslateAnimArc(sprite)) DestroyAnimSprite(sprite); } @@ -232,14 +232,14 @@ void sub_80D9DF0(struct Sprite *sprite) sprite->data[4] = l2 + gBattleAnimArgs[5]; sprite->data[5] = -30; - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); sprite->callback = sub_80D9E78; } static void sub_80D9E78(struct Sprite *sprite) // same as sub_80D9DD4 { - if (TranslateAnimSpriteLinearAndSine(sprite)) + if (TranslateAnimArc(sprite)) DestroyAnimSprite(sprite); } @@ -284,7 +284,7 @@ void sub_80D9F14(struct Sprite *sprite) sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2]; sprite->data[4] = sprite->pos1.y + sprite->data[0]; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c index a63652646..704fa0306 100644 --- a/src/battle/anim/psychic.c +++ b/src/battle/anim/psychic.c @@ -912,7 +912,7 @@ static void sub_80DC1FC(u8 taskId) gSprites[spriteId].data[4] = task->data[14]; gSprites[spriteId].data[5] = task->data[10]; - InitAnimSpriteTranslationOverDuration(&gSprites[spriteId]); + InitAnimArcTranslation(&gSprites[spriteId]); StartSpriteAffineAnim(&gSprites[spriteId], task->data[2] & 3); } @@ -929,7 +929,7 @@ static void sub_80DC1FC(u8 taskId) void sub_80DC2B0(struct Sprite *sprite) { - if (TranslateAnimSpriteLinearAndSine(sprite)) + if (TranslateAnimArc(sprite)) { FreeOamMatrix(sprite->oam.matrixNum); DestroySprite(sprite); diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c index 024728ecc..a2cf618a6 100644 --- a/src/battle/anim/ring.c +++ b/src/battle/anim/ring.c @@ -240,7 +240,7 @@ void sub_80D0FD8(struct Sprite* sprite) void sub_80D1098(struct Sprite* sprite) { - if (TranslateAnimSpriteByDeltas(sprite)) + if (TranslateAnimLinear(sprite)) { FreeSpriteOamMatrix(sprite); DestroyAnimSprite(sprite); @@ -327,7 +327,7 @@ void sub_80D10B8(struct Sprite* sprite) sprite->data[2] = sp0; sprite->data[4] = sp1; sprite->data[0] = gBattleAnimArgs[0]; - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); sprite->callback = sub_80D1098; sub_80D1098(sprite); } diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c index 4e839d3e8..7738e4d0c 100644 --- a/src/battle/anim/rock.c +++ b/src/battle/anim/rock.c @@ -564,7 +564,7 @@ void sub_80DD490(struct Sprite *sprite) sprite->data[2] = sprite->pos1.x; sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[2]; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } @@ -729,7 +729,7 @@ static void sub_80DD774(struct Task *task) gSprites[spriteId].data[5] = -16 - (task->data[1] * 2); gSprites[spriteId].oam.tileNum += var0; - InitAnimSpriteTranslationOverDuration(&gSprites[spriteId]); + InitAnimArcTranslation(&gSprites[spriteId]); task->data[11]++; } @@ -738,7 +738,7 @@ static void sub_80DD774(struct Task *task) void sub_80DD87C(struct Sprite *sprite) { - if (TranslateAnimSpriteLinearAndSine(sprite)) + if (TranslateAnimArc(sprite)) { u8 taskId = FindTaskIdByFunc(sub_80DD604); if (taskId != 0xFF) diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c index 9f427a9c4..409acf549 100644 --- a/src/battle/anim/scan.c +++ b/src/battle/anim/scan.c @@ -77,7 +77,7 @@ static void sub_80CD408(struct Sprite* sprite) sprite->data[0] = 8; sprite->data[2] = sprite->pos1.x + gUnknown_083D6DDC[sprite->data[5] >> 8][0]; sprite->data[4] = sprite->pos1.y + gUnknown_083D6DDC[sprite->data[5] >> 8][1]; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, sub_80CD4B8); sprite->data[5] += 0x100; PlaySE12WithPanning(0xD2, BattleAnimAdjustPanning(0x3F)); @@ -142,7 +142,7 @@ static void sub_80CD4EC(struct Sprite* sprite) sprite->data[0] = 6; sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + a; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + b; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, sub_80CD654); } } diff --git a/src/battle/anim/seed.c b/src/battle/anim/seed.c index 11eebada0..bf8142a49 100644 --- a/src/battle/anim/seed.c +++ b/src/battle/anim/seed.c @@ -61,13 +61,13 @@ void AnimLeechSeed(struct Sprite* sprite) sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[2]; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[5]; - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); sprite->callback = AnimLeechSeedStep; } static void AnimLeechSeedStep(struct Sprite* sprite) { - if (TranslateAnimSpriteLinearAndSine(sprite)) + if (TranslateAnimArc(sprite)) { sprite->invisible = 1; sprite->data[0] = 10; diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c index 0494c42ed..4a9ade286 100644 --- a/src/battle/anim/sonic.c +++ b/src/battle/anim/sonic.c @@ -148,7 +148,7 @@ void AnimSonicBoomProjectile(struct Sprite* sprite) sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = targetXPos; sprite->data[4] = targetYPos; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/sunlight.c b/src/battle/anim/sunlight.c index 7efc85b37..5edb9afea 100644 --- a/src/battle/anim/sunlight.c +++ b/src/battle/anim/sunlight.c @@ -37,6 +37,6 @@ void sub_80D517C(struct Sprite *sprite) sprite->data[0] = 60; sprite->data[2] = 140; sprite->data[4] = 80; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/sword.c b/src/battle/anim/sword.c index 7fb410224..fcb85a794 100644 --- a/src/battle/anim/sword.c +++ b/src/battle/anim/sword.c @@ -50,6 +50,6 @@ static void sub_80CF6B4(struct Sprite* sprite) sprite->data[0] = 6; sprite->data[2] = sprite->pos1.x; sprite->data[4] = sprite->pos1.y - 32; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/tile.c b/src/battle/anim/tile.c index a10850808..12cfd53b3 100644 --- a/src/battle/anim/tile.c +++ b/src/battle/anim/tile.c @@ -175,7 +175,7 @@ static void sub_80CE1AC(struct Sprite* sprite) sprite->data[0] = 30; sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } } diff --git a/src/battle/anim/unused_8.c b/src/battle/anim/unused_8.c index a005bee1c..92f5973db 100644 --- a/src/battle/anim/unused_8.c +++ b/src/battle/anim/unused_8.c @@ -78,7 +78,7 @@ static void sub_80CF490(struct Sprite* sprite) sprite->data[0] = sprite->data[1]; sprite->data[2] = sprite->pos1.x; sprite->data[4] = sprite->pos1.y + 15; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, sub_80CF4B8); } diff --git a/src/battle/anim/water.c b/src/battle/anim/water.c index 0afe133f0..1c354d916 100644 --- a/src/battle/anim/water.c +++ b/src/battle/anim/water.c @@ -198,7 +198,7 @@ void sub_80D37FC(struct Sprite *sprite) sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2]; sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[4]; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c index 32373ca2a..f9e21d704 100644 --- a/src/battle/anim/wisp_orb.c +++ b/src/battle/anim/wisp_orb.c @@ -133,7 +133,7 @@ static void sub_80D5C5C(struct Sprite *sprite) s16 initialData5; s16 newData5; - if (!TranslateAnimSpriteByDeltas(sprite)) + if (!TranslateAnimLinear(sprite)) { sprite->pos2.x += Sin(sprite->data[5], 16); initialData5 = sprite->data[5]; diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c index 75afc2739..87a0f0309 100644 --- a/src/battle/battle_7.c +++ b/src/battle/battle_7.c @@ -1,6 +1,7 @@ #include "global.h" #include "battle.h" #include "battle_anim.h" +#include "battle_anim_813F0F4.h" #include "battle_interface.h" #include "blend_palette.h" #include "contest.h" @@ -95,7 +96,6 @@ const struct SpritePalette gUnknown_0820A4D4[] = extern void c3_0802FDF4(u8); extern void sub_80440EC(); extern void sub_804777C(); -extern void sub_8141828(); extern u8 GetBattlerSpriteCoord(); extern u8 IsBankSpritePresent(u8); extern u8 sub_8077F68(u8); diff --git a/src/battle/battle_anim_812C144.c b/src/battle/battle_anim_812C144.c index bcdd2b693..0e9c45023 100644 --- a/src/battle/battle_anim_812C144.c +++ b/src/battle/battle_anim_812C144.c @@ -169,7 +169,7 @@ void sub_812C2BC(struct Sprite *sprite) sprite->data[0] = gBattleAnimArgs[2]; sprite->data[2] = x; sprite->data[4] = y; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } @@ -349,13 +349,13 @@ void sub_812C720(struct Sprite *sprite) sprite->data[4] = y + gBattleAnimArgs[3]; sprite->data[5] = -50; - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); sprite->callback = sub_812C798; } static void sub_812C798(struct Sprite *sprite) { - if (TranslateAnimSpriteLinearAndSine(sprite)) + if (TranslateAnimArc(sprite)) { sprite->data[0] = 30; sprite->data[1] = 0; @@ -950,7 +950,7 @@ void sub_812D294(struct Sprite *sprite) sprite->data[0] = 20; sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; } } diff --git a/src/battle/battle_anim_813F0F4.c b/src/battle/battle_anim_813F0F4.c new file mode 100755 index 000000000..219395baf --- /dev/null +++ b/src/battle/battle_anim_813F0F4.c @@ -0,0 +1,1897 @@ +#include "global.h" +#include "battle.h" +#include "battle_anim.h" +#include "battle_anim_813F0F4.h" +#include "battle_interface.h" +#include "blend_palette.h" +#include "decompress.h" +#include "ewram.h" +#include "m4a.h" +#include "main.h" +#include "palette.h" +#include "pokeball.h" +#include "rom_8077ABC.h" +#include "sound.h" +#include "sprite.h" +#include "task.h" +#include "trig.h" +#include "util.h" +#include "constants/items.h" +#include "constants/songs.h" + +extern int gUnknown_03005F0C; +extern u16 gUnknown_03005F10; +extern u16 gUnknown_03005F14; + +extern s16 gBattleAnimArgs[]; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; +extern u8 gHealthboxIDs[]; +extern u8 gBankSpriteIds[]; +extern u16 gBattlerPartyIndexes[]; +extern u16 gLastUsedItem; +extern u8 gDoingBattleAnim; +extern u8 gEffectBank; + +extern const u8 gUnknown_08D2EE48[]; +extern const u8 gUnknown_08D2EDFC[]; +extern const u16 gUnknown_08D2E150[]; +extern const struct CompressedSpritePalette gUnknown_0840B2B8[]; +extern const struct SpriteTemplate gSpriteTemplate_840B3B4[]; +extern const struct SpriteTemplate gSpriteTemplate_8402500; +extern const struct SpriteTemplate gBattleAnimSpriteTemplate_84024E8; +extern const u8 gUnknown_0840B378[]; +extern const struct CompressedSpriteSheet gUnknown_0840B258[]; +extern const TaskFunc gUnknown_0840B384[]; +extern const u16 gUnknown_0840B4D4[]; +extern const struct CompressedSpriteSheet gBattleAnimPicTable[]; +extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; + +static void sub_813F300(u8 taskId); +static void sub_813F6CC(u8 taskId); +static void sub_813FD34(u8 taskId); +static void sub_813FD90(struct Sprite *sprite); +static void sub_813FB7C(u8 taskId); +static void sub_813FCBC(u8 taskId); +static void sub_813FDC0(struct Sprite *sprite); +static void sub_813FE70(struct Sprite *sprite); +static void sub_81407B8(struct Sprite *sprite); +static void sub_813FEC8(struct Sprite *sprite); +static void sub_8140014(struct Sprite *sprite); +static void sub_8140058(struct Sprite *sprite); +static void sub_8140410(struct Sprite *sprite); +static void sub_8140158(struct Sprite *sprite); +static void sub_81401A0(struct Sprite *sprite); +static void sub_8140434(struct Sprite *sprite); +static void sub_81405F4(struct Sprite *sprite); +static void sub_8140454(struct Sprite *sprite); +static void sub_81404E4(struct Sprite *sprite); +static void sub_81405C8(struct Sprite *sprite); +static void sub_81406BC(struct Sprite *sprite); +static void sub_81407F4(struct Sprite *sprite); +static void sub_8140A08(struct Sprite *sprite); +static void sub_8140A28(struct Sprite *sprite); +static void sub_8141294(struct Sprite *sprite); +static void sub_8140ECC(struct Sprite *sprite); +static void sub_8140FF8(struct Sprite *sprite); +static void sub_8141230(struct Sprite *sprite); +static void sub_81413DC(u8 taskId); +static void sub_814146C(u8 taskId); +static void sub_81414BC(u8 taskId); +static void sub_814191C(u8 taskId); +static void sub_8141B20(struct Sprite *sprite); +static void sub_8141B74(struct Sprite *sprite); +static void sub_8141AD8(u8 taskId); +static void sub_8141CBC(struct Sprite *sprite); +static void sub_8141CF4(struct Sprite *sprite); +static void sub_8141D20(struct Sprite *sprite); + + +void unref_sub_813F0F4(u8 taskId) +{ + struct Struct_sub_8078914 subStruct; + u8 healthBoxSpriteId; + u8 battler; + u8 spriteId1, spriteId2, spriteId3, spriteId4; + + battler = gAnimBankAttacker; + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; + REG_WININ = 0x3F3F; + REG_WINOUT = 0x3F3D; + REG_DISPCNT |= DISPCNT_OBJWIN_ON; + REG_BLDCNT = 0x3F42; + REG_BLDALPHA = 0x1000; + REG_BG1CNT_BITFIELD.priority = 0; + REG_BG1CNT_BITFIELD.screenSize = 0; + REG_BG1CNT_BITFIELD.areaOverflowMode = 1; + REG_BG1CNT_BITFIELD.charBaseBlock = 1; + + healthBoxSpriteId = gHealthboxIDs[battler]; + spriteId1 = gSprites[healthBoxSpriteId].oam.affineParam; + spriteId2 = gSprites[healthBoxSpriteId].data[5]; + spriteId3 = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy); + spriteId4 = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy); + gSprites[healthBoxSpriteId].oam.priority = 1; + gSprites[spriteId1].oam.priority = 1; + gSprites[spriteId2].oam.priority = 1; + gSprites[spriteId3] = gSprites[healthBoxSpriteId]; + gSprites[spriteId4] = gSprites[spriteId1]; + gSprites[spriteId3].oam.objMode = ST_OAM_OBJ_WINDOW; + gSprites[spriteId4].oam.objMode = ST_OAM_OBJ_WINDOW; + gSprites[spriteId3].callback = SpriteCallbackDummy; + gSprites[spriteId4].callback = SpriteCallbackDummy; + + sub_8078914(&subStruct); + DmaFill32Defvars(3, 0, subStruct.field_4, 0x1000); + LZDecompressVram(&gUnknown_08D2EE48, subStruct.field_4); + LZDecompressVram(&gUnknown_08D2EDFC, subStruct.field_0); + LoadCompressedPalette(gUnknown_08D2E150, subStruct.field_8 << 4, 32); + + gBattle_BG1_X = -gSprites[spriteId3].pos1.x + 32; + gBattle_BG1_Y = -gSprites[spriteId3].pos1.y - 32; + gTasks[taskId].data[1] = 640; + gTasks[taskId].data[0] = spriteId3; + gTasks[taskId].data[2] = spriteId4; + gTasks[taskId].func = sub_813F300; +} + +static void sub_813F300(u8 taskId) +{ + struct Struct_sub_8078914 subStruct; + u8 spriteId1, spriteId2; + u8 battler; + + battler = gAnimBankAttacker; + gTasks[taskId].data[13] += gTasks[taskId].data[1]; + gBattle_BG1_Y += (u16)gTasks[taskId].data[13] >> 8; + gTasks[taskId].data[13] &= 0xFF; + + switch (gTasks[taskId].data[15]) + { + case 0: + if (gTasks[taskId].data[11]++ > 1) + { + gTasks[taskId].data[11] = 0; + gTasks[taskId].data[12]++; + REG_BLDALPHA = ((16 - gTasks[taskId].data[12]) << 8) | gTasks[taskId].data[12]; + if (gTasks[taskId].data[12] == 8) + gTasks[taskId].data[15]++; + } + break; + case 1: + if (++gTasks[taskId].data[10] == 30) + gTasks[taskId].data[15]++; + break; + case 2: + if (gTasks[taskId].data[11]++ > 1) + { + gTasks[taskId].data[11] = 0; + gTasks[taskId].data[12]--; + REG_BLDALPHA = ((16 - gTasks[taskId].data[12]) << 8) | gTasks[taskId].data[12]; + if (gTasks[taskId].data[12] == 0) + { + sub_8076464(0); + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; + REG_WININ = 0x3F3F; + REG_WINOUT = 0x3F3F; + if (!IsContest()) + REG_BG1CNT_BITFIELD.charBaseBlock = 0; + + REG_DISPCNT ^= DISPCNT_OBJWIN_ON; + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + DestroySprite(&gSprites[gTasks[taskId].data[0]]); + DestroySprite(&gSprites[gTasks[taskId].data[2]]); + sub_8078914(&subStruct); + DmaFill32Defvars(3, 0, subStruct.field_4, 0x800); + REG_BG1CNT_BITFIELD.areaOverflowMode = 0; + spriteId1 = gSprites[gHealthboxIDs[battler]].oam.affineParam; + spriteId2 = gSprites[gHealthboxIDs[battler]].data[5]; + gSprites[gHealthboxIDs[battler]].oam.priority = 1; + gSprites[spriteId1].oam.priority = 1; + gSprites[spriteId2].oam.priority = 1; + DestroyAnimVisualTask(taskId); + } + } + break; + } +} + +void sub_813F4EC(u8 taskId) +{ + u8 healthBoxSpriteId; + u8 spriteId1, spriteId2; + u8 paletteNum1, paletteNum2; + u16 offset1, offset2; + + healthBoxSpriteId = gHealthboxIDs[gAnimBankAttacker]; + spriteId1 = gSprites[healthBoxSpriteId].oam.affineParam; + spriteId2 = gSprites[healthBoxSpriteId].data[5]; + paletteNum1 = AllocSpritePalette(0xD709); + paletteNum2 = AllocSpritePalette(0xD70A); + + offset1 = (gSprites[healthBoxSpriteId].oam.paletteNum * 16) + 0x100; + offset2 = (gSprites[spriteId2].oam.paletteNum * 16) + 0x100; + LoadPalette(&gPlttBufferUnfaded[offset1], paletteNum1 * 16 + 0x100, 0x20); + LoadPalette(&gPlttBufferUnfaded[offset2], paletteNum2 * 16 + 0x100, 0x20); + + gSprites[healthBoxSpriteId].oam.paletteNum = paletteNum1; + gSprites[spriteId1].oam.paletteNum = paletteNum1; + gSprites[spriteId2].oam.paletteNum = paletteNum2; + DestroyAnimVisualTask(taskId); +} + +void sub_813F5E8(u8 taskId) +{ + u8 healthBoxSpriteId; + u8 spriteId1, spriteId2; + u8 paletteIndex1, paletteIndex2; + + healthBoxSpriteId = gHealthboxIDs[gAnimBankAttacker]; + spriteId1 = gSprites[healthBoxSpriteId].oam.affineParam; + spriteId2 = gSprites[healthBoxSpriteId].data[5]; + + FreeSpritePaletteByTag(0xD709); + FreeSpritePaletteByTag(0xD70A); + paletteIndex1 = IndexOfSpritePaletteTag(0xD6FF); + paletteIndex2 = IndexOfSpritePaletteTag(0xD704); + gSprites[healthBoxSpriteId].oam.paletteNum = paletteIndex1; + gSprites[spriteId1].oam.paletteNum = paletteIndex1; + gSprites[spriteId2].oam.paletteNum = paletteIndex2; + + DestroyAnimVisualTask(taskId); +} + +void sub_813F6A0(u8 taskId) +{ + gTasks[taskId].data[10] = gBattleAnimArgs[0]; + gTasks[taskId].data[11] = gBattleAnimArgs[1]; + gTasks[taskId].func = sub_813F6CC; +} + +static void sub_813F6CC(u8 taskId) +{ + u8 paletteNum; + int paletteOffset, colorOffset; + + gTasks[taskId].data[0]++; + if (gTasks[taskId].data[0]++ >= gTasks[taskId].data[11]) + { + gTasks[taskId].data[0] = 0; + paletteNum = IndexOfSpritePaletteTag(0xD709); + colorOffset = gTasks[taskId].data[10] == 0 ? 6 : 2; + switch (gTasks[taskId].data[1]) + { + case 0: + gTasks[taskId].data[2] += 2; + if (gTasks[taskId].data[2] > 16) + gTasks[taskId].data[2] = 16; + + paletteOffset = paletteNum * 16 + 0x100; + BlendPalette(paletteOffset + colorOffset, 1, gTasks[taskId].data[2], RGB(20, 27, 31)); + if (gTasks[taskId].data[2] == 16) + gTasks[taskId].data[1]++; + break; + case 1: + gTasks[taskId].data[2] -= 2; + if (gTasks[taskId].data[2] < 0) + gTasks[taskId].data[2] = 0; + + paletteOffset = paletteNum * 16 + 0x100; + BlendPalette(paletteOffset + colorOffset, 1, gTasks[taskId].data[2], RGB(20, 27, 31)); + if (gTasks[taskId].data[2] == 0) + DestroyAnimVisualTask(taskId); + break; + } + } +} + +void sub_813F798(u8 taskId) +{ + u8 spriteId; + + spriteId = gBankSpriteIds[gAnimBankAttacker]; + switch (gTasks[taskId].data[0]) + { + case 0: + sub_8078E70(spriteId, 0); + gTasks[taskId].data[10] = 0x100; + gTasks[taskId].data[0]++; + break; + case 1: + gTasks[taskId].data[10] += 0x30; + obj_id_set_rotscale(spriteId, gTasks[taskId].data[10], gTasks[taskId].data[10], 0); + sub_8079A64(spriteId); + if (gTasks[taskId].data[10] >= 0x2D0) + gTasks[taskId].data[0]++; + break; + case 2: + sub_8078F40(spriteId); + gSprites[spriteId].invisible = 1; + DestroyAnimVisualTask(taskId); + break; + } +} + +void sub_813F844(u8 taskId) +{ + u8 spriteId; + u16 ball; + u8 ballIndex; + u8 x, y; + u8 priority, subpriority; + u32 selectedPalettes; + + spriteId = gBankSpriteIds[gAnimBankAttacker]; + if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER) + ball = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_POKEBALL); + else + ball = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_POKEBALL); + + ballIndex = ball_number_to_ball_processing_index(ball); + switch (gTasks[taskId].data[0]) + { + case 0: + x = GetBattlerSpriteCoord(gAnimBankAttacker, 0); + y = GetBattlerSpriteCoord(gAnimBankAttacker, 1); + priority = gSprites[spriteId].oam.priority; + subpriority = gSprites[spriteId].subpriority; + gTasks[taskId].data[10] = sub_814086C(x, y + 32, priority, subpriority, ballIndex); + selectedPalettes = sub_80791A8(1, 0, 0, 0, 0, 0, 0); + gTasks[taskId].data[11] = sub_8141314(0, gAnimBankAttacker, selectedPalettes, ballIndex); + gTasks[taskId].data[0]++; + break; + case 1: + if (!gTasks[gTasks[taskId].data[10]].isActive && !gTasks[gTasks[taskId].data[11]].isActive) + DestroyAnimVisualTask(taskId); + break; + } +} + +void sub_813F990(u8 taskId) +{ + u8 ballIndex = ball_number_to_ball_processing_index(gLastUsedItem); + sub_80478DC(ballIndex); + DestroyAnimVisualTask(taskId); +} + +void sub_813F9B8(u8 taskId) +{ + u8 ballIndex = ball_number_to_ball_processing_index(gLastUsedItem); + sub_804794C(ballIndex); + DestroyAnimVisualTask(taskId); +} + +void sub_813F9E0(u8 taskId) +{ + if (ewram17840.unk8 == 5) + gBattleAnimArgs[7] = -1; + else + gBattleAnimArgs[7] = 0; + + DestroyAnimVisualTask(taskId); +} + +u8 ball_number_to_ball_processing_index(u16 ballItem) +{ + switch (ballItem) + { + case ITEM_MASTER_BALL: + return 4; + case ITEM_ULTRA_BALL: + return 3; + case ITEM_GREAT_BALL: + return 1; + case ITEM_SAFARI_BALL: + return 2; + case ITEM_NET_BALL: + return 5; + case ITEM_DIVE_BALL: + return 6; + case ITEM_NEST_BALL: + return 7; + case ITEM_REPEAT_BALL: + return 8; + case ITEM_TIMER_BALL: + return 9; + case ITEM_LUXURY_BALL: + return 10; + case ITEM_PREMIER_BALL: + return 11; + case ITEM_POKE_BALL: + default: + return 0; + } +} + +void sub_813FA94(u8 taskId) +{ + u8 ballIndex; + u8 spriteId; + + ballIndex = ball_number_to_ball_processing_index(gLastUsedItem); + spriteId = CreateSprite(&gBallSpriteTemplates[ballIndex], 32, 80, 29); + gSprites[spriteId].data[0] = 34; + gSprites[spriteId].data[1] = GetBattlerSpriteCoord(gAnimBankTarget, 0); + gSprites[spriteId].data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 1) - 16; + gSprites[spriteId].callback = sub_813FD90; + ewram17840.unk9_1 = gSprites[gBankSpriteIds[gAnimBankTarget]].invisible; + gTasks[taskId].data[0] = spriteId; + gTasks[taskId].func = sub_813FB7C; +} + +static void sub_813FB7C(u8 taskId) +{ + u8 spriteId = gTasks[taskId].data[0]; + if ((u16)gSprites[spriteId].data[0] == 0xFFFF) + DestroyAnimVisualTask(taskId); +} + +void sub_813FBB8(u8 taskId) +{ + int x, y; + u8 ballIndex; + u8 subpriority; + u8 spriteId; + + if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL) + { + x = 32; + y = 11; + } + else + { + x = 23; + y = 5; + } + + ballIndex = ball_number_to_ball_processing_index(gLastUsedItem); + subpriority = sub_8079E90(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)) + 1; + spriteId = CreateSprite(&gBallSpriteTemplates[ballIndex], x + 32, y | 80, subpriority); + gSprites[spriteId].data[0] = 34; + gSprites[spriteId].data[1] = GetBattlerSpriteCoord(gAnimBankTarget, 0); + gSprites[spriteId].data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 1) - 16; + gSprites[spriteId].callback = SpriteCallbackDummy; + StartSpriteAnim(&gSprites[gBankSpriteIds[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]], 1); + gTasks[taskId].data[0] = spriteId; + gTasks[taskId].func = sub_813FCBC; +} + +static void sub_813FCBC(u8 taskId) +{ + if (gSprites[gBankSpriteIds[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]].animCmdIndex == 1) + { + PlaySE12WithPanning(SE_NAGERU, 0); + gSprites[gTasks[taskId].data[0]].callback = sub_813FD90; + CreateTask(sub_813FD34, 10); + gTasks[taskId].func = sub_813FB7C; + } +} + +static void sub_813FD34(u8 taskId) +{ + if (gSprites[gBankSpriteIds[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]].animEnded) + { + StartSpriteAnim(&gSprites[gBankSpriteIds[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]], 0); + DestroyTask(taskId); + } +} + +static void sub_813FD90(struct Sprite *sprite) +{ + u16 temp = sprite->data[1]; + u16 temp2 = sprite->data[2]; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = temp; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = temp2; + sprite->data[5] = -40; + InitAnimArcTranslation(sprite); + sprite->callback = sub_813FDC0; +} + +static void sub_813FDC0(struct Sprite *sprite) +{ + int i; + u8 ballIndex; + int ballIndex2; // extra var needed to match + + if (TranslateAnimArc(sprite)) + { + if (ewram17840.unk8 == 5) + { + sprite->callback = sub_81407B8; + } + else + { + StartSpriteAnim(sprite, 1); + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.x = 0; + sprite->pos2.y = 0; + + for (i = 0; i < 8; i++) + { + sprite->data[i] = 0; + } + + sprite->data[5] = 0; + sprite->callback = sub_813FE70; + ballIndex = ball_number_to_ball_processing_index(gLastUsedItem); + ballIndex2 = ballIndex; + if (ballIndex2 > 11) + return; + if (ballIndex2 < 0) + return; + + sub_814086C(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballIndex); + sub_8141314(0, gAnimBankTarget, 14, ballIndex); + } + } +} + +static void sub_813FE70(struct Sprite *sprite) +{ + if (++sprite->data[5] == 10) + { + sprite->data[5] = CreateTask(TaskDummy, 50); + sprite->callback = sub_813FEC8; + gSprites[gBankSpriteIds[gAnimBankTarget]].data[1] = 0; + } +} + +static void sub_813FEC8(struct Sprite *sprite) +{ + u8 spriteId; + u8 taskId; + + spriteId = gBankSpriteIds[gAnimBankTarget]; + taskId = sprite->data[5]; + + if (++gTasks[taskId].data[1] == 11) + PlaySE(SE_SUIKOMU); + + switch (gTasks[taskId].data[0]) + { + case 0: + sub_8078E70(spriteId, 0); + gTasks[taskId].data[10] = 256; + gUnknown_03005F0C = 28; + gUnknown_03005F14 = (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) - (sprite->pos1.y + sprite->pos2.y); + gUnknown_03005F10 = (u32)(gUnknown_03005F14 * 256) / 28; + gTasks[taskId].data[2] = gUnknown_03005F10; + gTasks[taskId].data[0]++; + break; + case 1: + gTasks[taskId].data[10] += 0x20; + obj_id_set_rotscale(spriteId, gTasks[taskId].data[10], gTasks[taskId].data[10], 0); + gTasks[taskId].data[3] += gTasks[taskId].data[2]; + gSprites[spriteId].pos2.y = -gTasks[taskId].data[3] >> 8; + if (gTasks[taskId].data[10] >= 0x480) + gTasks[taskId].data[0]++; + break; + case 2: + sub_8078F40(spriteId); + gSprites[spriteId].invisible = 1; + gTasks[taskId].data[0]++; + break; + default: + if (gTasks[taskId].data[1] > 10) + { + DestroyTask(taskId); + StartSpriteAnim(sprite, 2); + sprite->data[5] = 0; + sprite->callback = sub_8140014; + } + break; + } +} + +static void sub_8140014(struct Sprite *sprite) +{ + int angle; + + if (sprite->animEnded) + { + sprite->data[3] = 0; + sprite->data[4] = 32; + sprite->data[5] = 0; + angle = 0; + sprite->pos1.y += Cos(angle, 32); + sprite->pos2.y = -Cos(angle, sprite->data[4]); + sprite->callback = sub_8140058; + } +} + +static void sub_8140058(struct Sprite *sprite) +{ + bool8 lastBounce; + int bounceCount; + + lastBounce = 0; + + switch (sprite->data[3] & 0xFF) + { + case 0: + sprite->pos2.y = -Cos(sprite->data[5], sprite->data[4]); + sprite->data[5] += (sprite->data[3] >> 8) + 4; + if (sprite->data[5] >= 64) + { + sprite->data[4] -= 10; + sprite->data[3] += 257; + + bounceCount = sprite->data[3] >> 8; + if (bounceCount == 4) + lastBounce = 1; + + // Play a different sound effect for each pokeball bounce. + switch (bounceCount) + { + case 1: + PlaySE(SE_KON); + break; + case 2: + PlaySE(SE_KON2); + break; + case 3: + PlaySE(SE_KON3); + break; + default: + PlaySE(SE_KON4); + break; + } + } + break; + case 1: + sprite->pos2.y = -Cos(sprite->data[5], sprite->data[4]); + sprite->data[5] -= (sprite->data[3] >> 8) + 4; + if (sprite->data[5] <= 0) + { + sprite->data[5] = 0; + sprite->data[3] &= -0x100; + } + break; + } + + if (lastBounce) + { + sprite->data[3] = 0; + sprite->pos1.y += Cos(64, 32); + sprite->pos2.y = 0; + if (ewram17840.unk8 == 0) + { + sprite->data[5] = 0; + sprite->callback = sub_8140410; + } + else + { + sprite->callback = sub_8140158; + sprite->data[4] = 1; + sprite->data[5] = 0; + } + } +} + +static void sub_8140158(struct Sprite *sprite) +{ + if (++sprite->data[3] == 31) + { + sprite->data[3] = 0; + sprite->affineAnimPaused = 1; + StartSpriteAffineAnim(sprite, 1); + ewram17840.unkC = 0; + sprite->callback = sub_81401A0; + PlaySE(SE_BOWA); + } +} + +static void sub_81401A0(struct Sprite *sprite) +{ + s8 state; + u16 var0; + + switch (sprite->data[3] & 0xFF) + { + case 0: + if ((s16)ewram17840.unkC > 0xFF) + { + sprite->pos2.x += sprite->data[4]; + ewram17840.unkC &= 0xFF; + } + else + { + ewram17840.unkC += 0xB0; + } + + sprite->data[5]++; + sprite->affineAnimPaused = 0; + var0 = sprite->data[5] + 7; + if (var0 > 14) + { + ewram17840.unkC = 0; + sprite->data[3]++; + sprite->data[5] = 0; + } + break; + case 1: + if (++sprite->data[5] == 1) + { + sprite->data[5] = 0; + sprite->data[4] = -sprite->data[4]; + sprite->data[3]++; + sprite->affineAnimPaused = 0; + if (sprite->data[4] < 0) + ChangeSpriteAffineAnim(sprite, 2); + else + ChangeSpriteAffineAnim(sprite, 1); + } + else + { + sprite->affineAnimPaused = 1; + } + break; + case 2: + if ((s16)ewram17840.unkC > 0xFF) + { + sprite->pos2.x += sprite->data[4]; + ewram17840.unkC &= 0xFF; + } + else + { + ewram17840.unkC += 0xB0; + } + + sprite->data[5]++; + sprite->affineAnimPaused = 0; + var0 = sprite->data[5] + 12; + if (var0 > 24) + { + ewram17840.unkC = 0; + sprite->data[3]++; + sprite->data[5] = 0; + } + break; + case 3: + if (sprite->data[5]++ < 0) + { + sprite->affineAnimPaused = 1; + break; + } + + sprite->data[5] = 0; + sprite->data[4] = -sprite->data[4]; + sprite->data[3]++; + sprite->affineAnimPaused = 0; + if (sprite->data[4] < 0) + ChangeSpriteAffineAnim(sprite, 2); + else + ChangeSpriteAffineAnim(sprite, 1); + // fall through + case 4: + if ((s16)ewram17840.unkC > 0xFF) + { + sprite->pos2.x += sprite->data[4]; + ewram17840.unkC &= 0xFF; + } + else + { + ewram17840.unkC += 0xB0; + } + + sprite->data[5]++; + sprite->affineAnimPaused = 0; + var0 = sprite->data[5] + 4; + if (var0 > 8) + { + ewram17840.unkC = 0; + sprite->data[3]++; + sprite->data[5] = 0; + sprite->data[4] = -sprite->data[4]; + } + break; + case 5: + sprite->data[3] += 0x100; + state = sprite->data[3] >> 8; + if (state == ewram17840.unk8) + { + sprite->affineAnimPaused = 1; + sprite->callback = sub_8140410; + } + else + { + if (ewram17840.unk8 == 4 && state == 3) + { + sprite->callback = sub_8140434; + sprite->affineAnimPaused = 1; + } + else + { + sprite->data[3]++; + sprite->affineAnimPaused = 1; + } + } + break; + case 6: + default: + if (++sprite->data[5] == 31) + { + sprite->data[5] = 0; + sprite->data[3] &= -0x100; + StartSpriteAffineAnim(sprite, 3); + if (sprite->data[4] < 0) + StartSpriteAffineAnim(sprite, 2); + else + StartSpriteAffineAnim(sprite, 1); + + PlaySE(SE_BOWA); + } + break; + } +} + +static void sub_8140410(struct Sprite *sprite) +{ + if (++sprite->data[5] == 31) + { + sprite->data[5] = 0; + sprite->callback = sub_81405F4; + } +} + +static void sub_8140434(struct Sprite *sprite) +{ + sprite->animPaused = 1; + sprite->callback = sub_8140454; + sprite->data[3] = 0; + sprite->data[4] = 0; + sprite->data[5] = 0; +} + +static void sub_8140454(struct Sprite *sprite) +{ + u8 *battler = &gAnimBankTarget; + + sprite->data[4]++; + if (sprite->data[4] == 40) + return; + + if (sprite->data[4] == 95) + { + gDoingBattleAnim = 0; + UpdateOamPriorityInAllHealthboxes(1); + m4aMPlayAllStop(); + PlaySE(MUS_FANFA5); + } + else if (sprite->data[4] == 315) + { + FreeOamMatrix(gSprites[gBankSpriteIds[*battler]].oam.matrixNum); + DestroySprite(&gSprites[gBankSpriteIds[*battler]]); + sprite->data[0] = 0; + sprite->callback = sub_81404E4; + } +} + +static void sub_81404E4(struct Sprite *sprite) +{ + u8 paletteIndex; + + switch (sprite->data[0]) + { + case 0: + sprite->data[1] = 0; + sprite->data[2] = 0; + sprite->oam.objMode = ST_OAM_OBJ_BLEND; + REG_BLDCNT = 0x3F40; + REG_BLDALPHA = 0x0010; + paletteIndex = IndexOfSpritePaletteTag(sprite->template->paletteTag); + BeginNormalPaletteFade(1 << (paletteIndex + 0x10), 0, 0, 16, RGB(31, 31, 31)); + sprite->data[0]++; + break; + case 1: + if (sprite->data[1]++ > 0) + { + sprite->data[1] = 0; + sprite->data[2]++; + REG_BLDALPHA = (sprite->data[2] << 8) | (16 - sprite->data[2]); + if (sprite->data[2] == 16) + sprite->data[0]++; + } + break; + case 2: + sprite->invisible = 1; + sprite->data[0]++; + break; + default: + if (!gPaletteFade.active) + { + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + sprite->data[0] = 0; + sprite->callback = sub_81405C8; + } + break; + } +} + +static void sub_81405C8(struct Sprite *sprite) +{ + if (sprite->data[0] == 0) + { + sprite->data[0] = -1; + } + else + { + FreeSpriteOamMatrix(sprite); + DestroySprite(sprite); + } +} + +// fakematching. I think the return type of ball_number_to_ball_processing_index() +// is wrong because of the weird required casting. +static void sub_81405F4(struct Sprite *sprite) +{ + u8 ballIndex; + int ballIndex2; // extra var needed to match + + StartSpriteAnim(sprite, 1); + StartSpriteAffineAnim(sprite, 0); + sprite->callback = sub_81406BC; + + ballIndex = ball_number_to_ball_processing_index(gLastUsedItem); + ballIndex2 = ballIndex; + if (ballIndex2 > 11) + goto LABEL; + if (ballIndex2 < 0) + goto LABEL; + + sub_814086C(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballIndex); + sub_8141314(1, gAnimBankTarget, 14, ballIndex); + + LABEL: + gSprites[gBankSpriteIds[gAnimBankTarget]].invisible = 0; + StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gAnimBankTarget]], 1); + AnimateSprite(&gSprites[gBankSpriteIds[gAnimBankTarget]]); + gSprites[gBankSpriteIds[gAnimBankTarget]].data[1] = 0x1000; +} + +static void sub_81406BC(struct Sprite *sprite) +{ + int next = FALSE; + + if (sprite->animEnded) + sprite->invisible = 1; + + if (gSprites[gBankSpriteIds[gAnimBankTarget]].affineAnimEnded) + { + StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gAnimBankTarget]], 0); + next = TRUE; + } + else + { + gSprites[gBankSpriteIds[gAnimBankTarget]].data[1] -= 288; + gSprites[gBankSpriteIds[gAnimBankTarget]].pos2.y = gSprites[gBankSpriteIds[gAnimBankTarget]].data[1] >> 8; + } + + if (sprite->animEnded && next) + { + gSprites[gBankSpriteIds[gAnimBankTarget]].pos2.y = 0; + gSprites[gBankSpriteIds[gAnimBankTarget]].invisible = ewram17840.unk9_1; + sprite->data[0] = 0; + sprite->callback = sub_81405C8; + gDoingBattleAnim = 0; + UpdateOamPriorityInAllHealthboxes(1); + } +} + +static void sub_81407B8(struct Sprite *sprite) +{ + int i; + + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.y = 0; + sprite->pos2.x = 0; + for (i = 0; i < 6; i++) + sprite->data[i] = 0; + + sprite->callback = sub_81407F4; +} + +#ifdef NONMATCHING +// there is some weird typing going on with var0 and var1. +static void sub_81407F4(struct Sprite *sprite) +{ + s16 var0, var1; + + var0 = sprite->data[0] + 0x800; + var1 = sprite->data[1] + 0x680; + sprite->pos2.x -= var1 >> 8; + sprite->pos2.y += var0 >> 8; + sprite->data[0] = var0 & 0xFF; + sprite->data[1] = var1 & 0xFF; + + if (sprite->pos1.y + sprite->pos2.y > 160 + || sprite->pos1.x + sprite->pos2.x < -8) + { + sprite->data[0] = 0; + sprite->callback = sub_81405C8; + gDoingBattleAnim = 0; + UpdateOamPriorityInAllHealthboxes(1); + } +} +#else +NAKED +static void sub_81407F4(struct Sprite *sprite) +{ + asm(".syntax unified\n\ + push {r4,lr}\n\ + adds r4, r0, 0\n\ + movs r0, 0x80\n\ + lsls r0, 4\n\ + adds r2, r0, 0\n\ + ldrh r1, [r4, 0x2E]\n\ + adds r2, r1\n\ + movs r0, 0xD0\n\ + lsls r0, 3\n\ + adds r3, r0, 0\n\ + ldrh r1, [r4, 0x30]\n\ + adds r3, r1\n\ + lsls r1, r3, 16\n\ + asrs r1, 24\n\ + ldrh r0, [r4, 0x24]\n\ + subs r0, r1\n\ + strh r0, [r4, 0x24]\n\ + lsls r0, r2, 16\n\ + asrs r0, 24\n\ + ldrh r1, [r4, 0x26]\n\ + adds r0, r1\n\ + strh r0, [r4, 0x26]\n\ + movs r0, 0xFF\n\ + ands r2, r0\n\ + strh r2, [r4, 0x2E]\n\ + ands r3, r0\n\ + strh r3, [r4, 0x30]\n\ + movs r2, 0x22\n\ + ldrsh r0, [r4, r2]\n\ + movs r2, 0x26\n\ + ldrsh r1, [r4, r2]\n\ + adds r0, r1\n\ + cmp r0, 0xA0\n\ + bgt _0814084A\n\ + movs r1, 0x20\n\ + ldrsh r0, [r4, r1]\n\ + movs r2, 0x24\n\ + ldrsh r1, [r4, r2]\n\ + adds r0, r1\n\ + movs r1, 0x8\n\ + negs r1, r1\n\ + cmp r0, r1\n\ + bge _0814085E\n\ +_0814084A:\n\ + movs r0, 0\n\ + strh r0, [r4, 0x2E]\n\ + ldr r0, _08140864 @ =sub_81405C8\n\ + str r0, [r4, 0x1C]\n\ + ldr r1, _08140868 @ =gDoingBattleAnim\n\ + movs r0, 0\n\ + strb r0, [r1]\n\ + movs r0, 0x1\n\ + bl UpdateOamPriorityInAllHealthboxes\n\ +_0814085E:\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ +_08140864: .4byte sub_81405C8\n\ +_08140868: .4byte gDoingBattleAnim\n\ + .syntax divided\n"); +} +#endif // NONMATCHING + +u8 sub_814086C(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballIndex) +{ + u8 taskId; + + if (GetSpriteTileStartByTag(gUnknown_0840B258[ballIndex].tag) == 0xFFFF) + { + LoadCompressedObjectPic(&gUnknown_0840B258[ballIndex]); + LoadCompressedObjectPalette(&gUnknown_0840B2B8[ballIndex]); + } + + taskId = CreateTask(gUnknown_0840B384[ballIndex], 5); + gTasks[taskId].data[1] = x; + gTasks[taskId].data[2] = y; + gTasks[taskId].data[3] = priority; + gTasks[taskId].data[4] = subpriority; + gTasks[taskId].data[15] = ballIndex; + PlaySE(SE_BOWA2); + if (gMain.inBattle) + ewram17840.unkA++; + + return taskId; +} + +void sub_8140930(u8 taskId) +{ + u8 spriteId; + u8 x, y; + u8 priority, subpriority; + u8 ballIndex; + u8 var0; + + ballIndex = gTasks[taskId].data[15]; + if (gTasks[taskId].data[0] < 16) + { + x = gTasks[taskId].data[1]; + y = gTasks[taskId].data[2]; + priority = gTasks[taskId].data[3]; + subpriority = gTasks[taskId].data[4]; + + spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority); + StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]); + gSprites[spriteId].callback = sub_8140A08; + gSprites[spriteId].oam.priority = priority; + + var0 = (u8)gTasks[taskId].data[0]; + if (var0 >= 8) + var0 -= 8; + + gSprites[spriteId].data[0] = var0 * 32; + if (gTasks[taskId].data[0] == 15) + { + gSprites[spriteId].data[7] = 1; + DestroyTask(taskId); + return; + } + } + + gTasks[taskId].data[0]++; +} + +static void sub_8140A08(struct Sprite *sprite) +{ + if (sprite->data[1] == 0) + sprite->callback = sub_8140A28; + else + sprite->data[1]--; +} + +static void sub_8140A28(struct Sprite *sprite) +{ + sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); + sprite->pos2.y = Cos(sprite->data[0], sprite->data[1]); + sprite->data[1] += 2; + if (sprite->data[1] == 50) + sub_8141294(sprite); +} + +void sub_8140A64(u8 taskId) +{ + u8 i; + u8 x, y, priority, subpriority, ballIndex; + u8 spriteId; + + ballIndex = gTasks[taskId].data[15]; + x = gTasks[taskId].data[1]; + y = gTasks[taskId].data[2]; + priority = gTasks[taskId].data[3]; + subpriority = gTasks[taskId].data[4]; + + for (i = 0; i < 8; i++) + { + spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority); + StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]); + gSprites[spriteId].callback = sub_8140ECC; + gSprites[spriteId].oam.priority = priority; + gSprites[spriteId].data[0] = i * 32; + gSprites[spriteId].data[4] = 10; + gSprites[spriteId].data[5] = 2; + gSprites[spriteId].data[6] = 1; + } + + gSprites[spriteId].data[7] = 1; + DestroyTask(taskId); +} + +void sub_8140B3C(u8 taskId) +{ + u8 i; + u8 x, y, priority, subpriority, ballIndex; + u8 spriteId; + + ballIndex = gTasks[taskId].data[15]; + x = gTasks[taskId].data[1]; + y = gTasks[taskId].data[2]; + priority = gTasks[taskId].data[3]; + subpriority = gTasks[taskId].data[4]; + + for (i = 0; i < 8; i++) + { + spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority); + StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]); + gSprites[spriteId].callback = sub_8140ECC; + gSprites[spriteId].oam.priority = priority; + gSprites[spriteId].data[0] = i * 32; + gSprites[spriteId].data[4] = 10; + gSprites[spriteId].data[5] = 1; + gSprites[spriteId].data[6] = 2; + } + + gSprites[spriteId].data[7] = 1; + DestroyTask(taskId); +} + +void sub_8140C14(u8 taskId) +{ + u8 i; + u8 x, y, priority, subpriority, ballIndex; + u8 spriteId; + + ballIndex = gTasks[taskId].data[15]; + x = gTasks[taskId].data[1]; + y = gTasks[taskId].data[2]; + priority = gTasks[taskId].data[3]; + subpriority = gTasks[taskId].data[4]; + + for (i = 0; i < 8; i++) + { + spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority); + StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]); + gSprites[spriteId].callback = sub_8140ECC; + gSprites[spriteId].oam.priority = priority; + gSprites[spriteId].data[0] = i * 32; + gSprites[spriteId].data[4] = 4; + gSprites[spriteId].data[5] = 1; + gSprites[spriteId].data[6] = 1; + } + + gSprites[spriteId].data[7] = 1; + DestroyTask(taskId); +} + +void sub_8140CE8(u8 taskId) +{ + u8 i; + u8 x, y, priority, subpriority, ballIndex; + u8 spriteId; + + ballIndex = gTasks[taskId].data[15]; + x = gTasks[taskId].data[1]; + y = gTasks[taskId].data[2]; + priority = gTasks[taskId].data[3]; + subpriority = gTasks[taskId].data[4]; + + for (i = 0; i < 10; i++) + { + spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority); + StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]); + gSprites[spriteId].callback = sub_8140ECC; + gSprites[spriteId].oam.priority = priority; + gSprites[spriteId].data[0] = i * 25; + gSprites[spriteId].data[4] = 5; + gSprites[spriteId].data[5] = 1; + gSprites[spriteId].data[6] = 1; + } + + gSprites[spriteId].data[7] = 1; + DestroyTask(taskId); +} + +void sub_8140DC4(u8 taskId) +{ + u8 i; + u8 x, y, priority, subpriority, ballIndex; + u8 spriteId; + + if (gTasks[taskId].data[7]) + { + gTasks[taskId].data[7]--; + } + else + { + ballIndex = gTasks[taskId].data[15]; + x = gTasks[taskId].data[1]; + y = gTasks[taskId].data[2]; + priority = gTasks[taskId].data[3]; + subpriority = gTasks[taskId].data[4]; + + for (i = 0; i < 8; i++) + { + spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority); + StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]); + gSprites[spriteId].callback = sub_8140ECC; + gSprites[spriteId].oam.priority = priority; + gSprites[spriteId].data[0] = i * 32; + gSprites[spriteId].data[4] = 8; + gSprites[spriteId].data[5] = 2; + gSprites[spriteId].data[6] = 2; + } + + gTasks[taskId].data[7] = 8; + if (++gTasks[taskId].data[0] == 2) + { + gSprites[spriteId].data[7] = 1; + DestroyTask(taskId); + } + } +} + +static void sub_8140ECC(struct Sprite *sprite) +{ + sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); + sprite->pos2.y = Cos(sprite->data[0], sprite->data[2]); + sprite->data[0] = (sprite->data[0] + sprite->data[4]) & 0xFF; + sprite->data[1] += sprite->data[5]; + sprite->data[2] += sprite->data[6]; + if (++sprite->data[3] == 51) + sub_8141294(sprite); +} + +void sub_8140F24(u8 taskId) +{ + u8 i; + u8 x, y, priority, subpriority, ballIndex; + u8 spriteId; + + ballIndex = gTasks[taskId].data[15]; + x = gTasks[taskId].data[1]; + y = gTasks[taskId].data[2]; + priority = gTasks[taskId].data[3]; + subpriority = gTasks[taskId].data[4]; + + for (i = 0; i < 12; i++) + { + spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority); + StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]); + gSprites[spriteId].callback = sub_8140FF8; + gSprites[spriteId].oam.priority = priority; + gSprites[spriteId].data[0] = i * 21; + } + + gSprites[spriteId].data[7] = 1; + DestroyTask(taskId); +} + +static void sub_8140FF8(struct Sprite *sprite) +{ + sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); + sprite->pos2.y = Cos(sprite->data[0], Sin(sprite->data[0], sprite->data[2])); + sprite->data[0] = (sprite->data[0] + 6) & 0xFF; + sprite->data[1]++; + sprite->data[2]++; + if (++sprite->data[3] == 51) + sub_8141294(sprite); +} + +void sub_8141058(u8 taskId) +{ + u8 i, j; + u8 x, y, priority, subpriority, ballIndex; + u8 spriteId; + + ballIndex = gTasks[taskId].data[15]; + x = gTasks[taskId].data[1]; + y = gTasks[taskId].data[2]; + priority = gTasks[taskId].data[3]; + subpriority = gTasks[taskId].data[4]; + + for (j = 0; j < 2; j++) + { + for (i = 0; i < 8; i++) + { + spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority); + StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]); + gSprites[spriteId].callback = sub_8140ECC; + gSprites[spriteId].oam.priority = priority; + gSprites[spriteId].data[0] = i * 32; + gSprites[spriteId].data[4] = 8; + + if (j == 0) + { + gSprites[spriteId].data[5] = 2; + gSprites[spriteId].data[6] = 1; + } + else + { + gSprites[spriteId].data[5] = 1; + gSprites[spriteId].data[6] = 2; + } + } + } + + gSprites[spriteId].data[7] = 1; + DestroyTask(taskId); +} + +void sub_8141164(u8 taskId) +{ + u8 i; + u8 x, y, priority, subpriority, ballIndex; + u8 spriteId; + + ballIndex = gTasks[taskId].data[15]; + x = gTasks[taskId].data[1]; + y = gTasks[taskId].data[2]; + priority = gTasks[taskId].data[3]; + subpriority = gTasks[taskId].data[4]; + + for (i = 0; i < 8; i++) + { + spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority); + StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]); + gSprites[spriteId].callback = sub_8141230; + gSprites[spriteId].oam.priority = priority; + gSprites[spriteId].data[0] = i * 32; + } + + gSprites[spriteId].data[7] = 1; + DestroyTask(taskId); +} + +static void sub_8141230(struct Sprite *sprite) +{ + sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); + sprite->pos2.y = Cos(sprite->data[0], Sin(sprite->data[0] & 0x3F, sprite->data[2])); + sprite->data[0] = (sprite->data[0] + 10) & 0xFF; + sprite->data[1]++; + sprite->data[2]++; + if (++sprite->data[3] == 51) + sub_8141294(sprite); +} + +static void sub_8141294(struct Sprite *sprite) +{ + int i; + int temp; + + if (!gMain.inBattle) + { + temp = sprite->data[7]; // temp var needed to match + if (temp == 1) + DestroySpriteAndFreeResources(sprite); + else + DestroySprite(sprite); + } + else if (sprite->data[7] == 1) + { + if (--ewram17840.unkA == 0) + { + for (i = 0; i < 12; i++) + { + FreeSpriteTilesByTag(gUnknown_0840B258[i].tag); + FreeSpritePaletteByTag(gUnknown_0840B2B8[i].tag); + } + + DestroySprite(sprite); + } + else + DestroySprite(sprite); + } + else + DestroySprite(sprite); +} + +u8 sub_8141314(u8 arg0, u8 battler, u32 selectedPalettes, u8 ballIndex) +{ + u8 taskId; + + taskId = CreateTask(sub_81413DC, 5); + gTasks[taskId].data[15] = ballIndex; + gTasks[taskId].data[3] = battler; + gTasks[taskId].data[10] = selectedPalettes; + gTasks[taskId].data[11] = selectedPalettes >> 16; + + if (!arg0) + { + BlendPalette(battler * 16 + 0x100, 16, 0, gUnknown_0840B4D4[ballIndex]); + gTasks[taskId].data[1] = 1; + } + else + { + BlendPalette(battler * 16 + 0x100, 16, 16, gUnknown_0840B4D4[ballIndex]); + gTasks[taskId].data[0] = 16; + gTasks[taskId].data[1] = -1; + gTasks[taskId].func = sub_814146C; + } + + BeginNormalPaletteFade(selectedPalettes, 0, 0, 16, RGB(31, 31, 31)); + return taskId; +} + +static void sub_81413DC(u8 taskId) +{ + u8 ballIndex = gTasks[taskId].data[15]; + + if (gTasks[taskId].data[2] <= 16) + { + BlendPalette(gTasks[taskId].data[3] * 16 + 0x100, 16, gTasks[taskId].data[0], gUnknown_0840B4D4[ballIndex]); + gTasks[taskId].data[0] += gTasks[taskId].data[1]; + gTasks[taskId].data[2]++; + } + else if (!gPaletteFade.active) + { + u32 selectedPalettes = (u16)gTasks[taskId].data[10] | ((u16)gTasks[taskId].data[11] << 16); + BeginNormalPaletteFade(selectedPalettes, 0, 16, 0, RGB(31, 31, 31)); + DestroyTask(taskId); + } +} + +static void sub_814146C(u8 taskId) +{ + if (!gPaletteFade.active) + { + u32 selectedPalettes = (u16)gTasks[taskId].data[10] | ((u16)gTasks[taskId].data[11] << 16); + BeginNormalPaletteFade(selectedPalettes, 0, 16, 0, RGB(31, 31, 31)); + gTasks[taskId].func = sub_81414BC; + } +} + +static void sub_81414BC(u8 taskId) +{ + u8 ballIndex = gTasks[taskId].data[15]; + + if (gTasks[taskId].data[2] <= 16) + { + BlendPalette(gTasks[taskId].data[3] * 16 + 0x100, 16, gTasks[taskId].data[0], gUnknown_0840B4D4[ballIndex]); + gTasks[taskId].data[0] += gTasks[taskId].data[1]; + gTasks[taskId].data[2]++; + } + else + { + DestroyTask(taskId); + } +} + +void sub_814151C(u8 taskId) +{ + u8 spriteId; + u32 x; + u32 done; + + done = FALSE; + spriteId = gBankSpriteIds[gAnimBankAttacker]; + switch (gTasks[taskId].data[10]) + { + case 0: + gTasks[taskId].data[11] = gBattleAnimArgs[0]; + gTasks[taskId].data[0] += 0x500; + if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + gSprites[spriteId].pos2.x += gTasks[taskId].data[0] >> 8; + else + gSprites[spriteId].pos2.x -= gTasks[taskId].data[0] >> 8; + + gTasks[taskId].data[0] &= 0xFF; + x = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x + 32; + if (x > 304) + gTasks[taskId].data[10]++; + break; + case 1: + refresh_graphics_maybe(gAnimBankAttacker, gTasks[taskId].data[11], spriteId); + gTasks[taskId].data[10]++; + break; + case 2: + gTasks[taskId].data[0] += 0x500; + if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + gSprites[spriteId].pos2.x -= gTasks[taskId].data[0] >> 8; + else + gSprites[spriteId].pos2.x += gTasks[taskId].data[0] >> 8; + + gTasks[taskId].data[0] &= 0xFF; + if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + { + if (gSprites[spriteId].pos2.x <= 0) + { + gSprites[spriteId].pos2.x = 0; + // done = FALSE; // fakematching--can't get the tail merge correct + goto DONE; + } + } + else + { + if (gSprites[spriteId].pos2.x >= 0) + { + gSprites[spriteId].pos2.x = 0; + done = TRUE; + } + } + + if (done) + { + DONE: + DestroyAnimVisualTask(taskId); + } + break; + } +} + +void sub_81416C4(u8 taskId) +{ + u8 spriteId; + + switch (gTasks[taskId].data[15]) + { + case 0: + if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1) + REG_BLDCNT = 0x3F42; + else + REG_BLDCNT = 0x3F44; + + REG_BLDALPHA = 0x0010; + gTasks[taskId].data[15]++; + break; + case 1: + if (gTasks[taskId].data[1]++ > 1) + { + gTasks[taskId].data[1] = 0; + gTasks[taskId].data[0]++; + REG_BLDALPHA = (gTasks[taskId].data[0] << 8) | (16 - gTasks[taskId].data[0]); + if (gTasks[taskId].data[0] == 16) + gTasks[taskId].data[15]++; + } + break; + case 2: + spriteId = gBankSpriteIds[gAnimBankAttacker]; + DmaClear32(3, (void *)OBJ_VRAM0 + gSprites[spriteId].oam.tileNum * TILE_SIZE_4BPP, 0x800); + sub_80324E0(gAnimBankAttacker); + DestroyAnimVisualTask(taskId); + break; + } +} + +void sub_81417D8(u8 taskId) +{ + gBattleAnimArgs[7] = ewram17800[gAnimBankAttacker].substituteSprite; + DestroyAnimVisualTask(taskId); +} + +void sub_8141808(u8 taskId) +{ + gAnimBankTarget = gEffectBank; + DestroyAnimVisualTask(taskId); +} + +void sub_8141828(u8 battler, struct Pokemon *mon) +{ + int isShiny; + u32 otId, personality; + u32 shinyValue; + u8 taskId1, taskId2; + + isShiny = 0; + ewram17810[battler].unk0_7 = 1; + otId = GetMonData(mon, MON_DATA_OT_ID); + personality = GetMonData(mon, MON_DATA_PERSONALITY); + + if (IsAnimBankSpriteVisible(battler)) + { + shinyValue = HIHALF(otId) ^ LOHALF(otId) ^ HIHALF(personality) ^ LOHALF(personality); + if (shinyValue < 8) + isShiny = TRUE; + + if (isShiny) + { + if (GetSpriteTileStartByTag(0x27F9) == 0xFFFF) + { + LoadCompressedObjectPic(&gBattleAnimPicTable[233]); + LoadCompressedObjectPalette(&gBattleAnimPaletteTable[233]); + } + + taskId1 = CreateTask(sub_814191C, 10); + taskId2 = CreateTask(sub_814191C, 10); + gTasks[taskId1].data[0] = battler; + gTasks[taskId2].data[0] = battler; + gTasks[taskId1].data[1] = 0; + gTasks[taskId2].data[1] = 1; + return; + } + } + + ewram17810[battler].unk1_0 = 1; +} + +static void sub_814191C(u8 taskId) +{ + u8 battler; + u8 x, y; + u8 spriteId; + u16 counter; + s16 state; + u8 pan; + + if (gTasks[taskId].data[13] < 60) + { + gTasks[taskId].data[13]++; + return; + } + + if (ewram17840.unkA) + return; + + counter = gTasks[taskId].data[10]++; + if (counter & 3) + return; + + battler = gTasks[taskId].data[0]; + x = GetBattlerSpriteCoord(battler, 0); + y = GetBattlerSpriteCoord(battler, 1); + state = gTasks[taskId].data[11]; + if (state == 0) + { + spriteId = CreateSprite(&gBattleAnimSpriteTemplate_84024E8, x, y, 5); + } + else if (state >= 0 && gTasks[taskId].data[11] < 4) + { + spriteId = CreateSprite(&gSpriteTemplate_8402500, x, y, 5); + gSprites[spriteId].oam.tileNum += 4; + } + else + { + spriteId = CreateSprite(&gSpriteTemplate_8402500, x, y, 5); + gSprites[spriteId].oam.tileNum += 5; + } + + if (gTasks[taskId].data[1] == 0) + { + gSprites[spriteId].callback = sub_8141B20; + } + else + { + gSprites[spriteId].callback = sub_8141B74; + gSprites[spriteId].pos2.x = -32; + gSprites[spriteId].pos2.y = 32; + gSprites[spriteId].invisible = 1; + if (gTasks[taskId].data[11] == 0) + { + if (GetBattlerSide(battler) == B_SIDE_PLAYER) + pan = 192; + else + pan = 63; + + PlaySE12WithPanning(SE_REAPOKE, pan); + } + } + + gSprites[spriteId].data[0] = taskId; + gTasks[taskId].data[11]++; + gTasks[taskId].data[12]++; + if (gTasks[taskId].data[11] == 5) + gTasks[taskId].func = sub_8141AD8; +} + +static void sub_8141AD8(u8 taskId) +{ + u8 battler; + + if (gTasks[taskId].data[12] == 0) + { + if (gTasks[taskId].data[1] == 1) + { + battler = gTasks[taskId].data[0]; + ewram17810[battler].unk1_0 = 1; + } + + DestroyTask(taskId); + } +} + +static void sub_8141B20(struct Sprite *sprite) +{ + sprite->pos2.x = Sin(sprite->data[1], 24); + sprite->pos2.y = Cos(sprite->data[1], 24); + sprite->data[1] += 12; + if (sprite->data[1] > 0xFF) + { + gTasks[sprite->data[0]].data[12]--; + FreeSpriteOamMatrix(sprite); + DestroySprite(sprite); + } +} + +static void sub_8141B74(struct Sprite *sprite) +{ + if (sprite->data[1] < 4) + { + sprite->data[1]++; + } + else + { + sprite->invisible = 0; + sprite->pos2.x += 5; + sprite->pos2.y -= 5; + if (sprite->pos2.x > 32) + { + gTasks[sprite->data[0]].data[12]--; + FreeSpriteOamMatrix(sprite); + DestroySprite(sprite); + } + } +} + +void sub_8141BD4(u8 taskId) +{ + u8 paletteIndex; + + LoadCompressedObjectPic(&gBattleAnimPicTable[269]); + LoadCompressedObjectPalette(&gBattleAnimPaletteTable[269]); + paletteIndex = IndexOfSpritePaletteTag(0x281D); // unused + DestroyAnimVisualTask(taskId); +} + +void sub_8141C08(u8 taskId) +{ + FreeSpriteTilesByTag(0x281D); + FreeSpritePaletteByTag(0x281D); + DestroyAnimVisualTask(taskId); +} + +void sub_8141C30(struct Sprite *sprite) +{ + InitAnimSpritePos(sprite, 0); + sprite->data[0] = 30; + sprite->data[2] = GetBattlerSpriteCoord(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), 0) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), 1) + gBattleAnimArgs[3]; + sprite->data[5] = -32; + InitAnimArcTranslation(sprite); + StartSpriteAnim(&gSprites[gBankSpriteIds[gAnimBankAttacker]], 1); + sprite->callback = sub_8141CBC; +} + +static void sub_8141CBC(struct Sprite *sprite) +{ + if (gSprites[gBankSpriteIds[gAnimBankAttacker]].animCmdIndex == 1) + sprite->callback = sub_8141CF4; +} + +static void sub_8141CF4(struct Sprite *sprite) +{ + if (TranslateAnimArc(sprite)) + { + sprite->data[0] = 0; + sprite->invisible = 1; + sprite->callback = sub_8141D20; + } +} + +static void sub_8141D20(struct Sprite *sprite) +{ + if (gSprites[gBankSpriteIds[gAnimBankAttacker]].animEnded) + { + if (++sprite->data[0] > 0) + { + StartSpriteAnim(&gSprites[gBankSpriteIds[gAnimBankAttacker]], 0); + DestroyAnimSprite(sprite); + } + } +} + +void sub_8141D7C(u8 taskId) +{ + gAnimBankAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); + gAnimBankTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); + DestroyAnimVisualTask(taskId); +} + +void sub_8141DAC(u8 taskId) +{ + if (ewram17840.unk0 == 83) + gBattleAnimArgs[0] = 1; + else if (ewram17840.unk0 == 250) + gBattleAnimArgs[0] = 2; + else if (ewram17840.unk0 == 128) + gBattleAnimArgs[0] = 3; + else if (ewram17840.unk0 == 328) + gBattleAnimArgs[0] = 4; + else + gBattleAnimArgs[0] = 0; + + DestroyAnimVisualTask(taskId); +} + +void sub_8141E10(u8 taskId) +{ + gAnimBankAttacker = ewram17840.unk0; + gAnimBankTarget = ewram17840.unk0 >> 8; + DestroyAnimVisualTask(taskId); +} diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c index a759822cd..8ca3d160a 100644 --- a/src/battle/battle_controller_linkopponent.c +++ b/src/battle/battle_controller_linkopponent.c @@ -1,6 +1,7 @@ #include "global.h" #include "battle.h" #include "battle_anim.h" +#include "battle_anim_813F0F4.h" #include "battle_interface.h" #include "data2.h" #include "link.h" @@ -71,7 +72,7 @@ extern void sub_80313A0(struct Sprite *); extern void sub_803757C(void); extern void oamt_add_pos2_onto_pos1(); extern void StoreSpriteCallbackInData(); -extern void StartTranslateAnimSpriteByDeltas(struct Sprite *); +extern void StartAnimLinearTranslation(struct Sprite *); extern void sub_80375B4(void); extern void sub_8010384(struct Sprite *); extern void sub_8037B78(void); @@ -103,7 +104,6 @@ extern u8 move_anim_start_t3(); extern void sub_8037FD8(void); extern void sub_8037F34(void); extern void LinkOpponentBufferExecCompleted(void); -extern void sub_8141828(); extern void sub_804777C(); // this file's functions @@ -1280,7 +1280,7 @@ void LinkOpponentHandleTrainerSlideBack(void) gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280; gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y; - gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas; + gSprites[gBankSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy); gBattleBankFunc[gActiveBattler] = sub_80375B4; } @@ -1631,7 +1631,7 @@ void LinkOpponentHandleTrainerBallThrow(void) gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280; gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y; - gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas; + gSprites[gBankSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], sub_803A3A8); taskId = CreateTask(sub_803A2C4, 5); gTasks[taskId].data[0] = gActiveBattler; diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c index 16aef5791..dff4edfc1 100644 --- a/src/battle/battle_controller_linkpartner.c +++ b/src/battle/battle_controller_linkpartner.c @@ -1,6 +1,7 @@ #include "global.h" #include "battle.h" #include "battle_anim.h" +#include "battle_anim_813F0F4.h" #include "battle_interface.h" #include "data2.h" #include "battle_811DA74.h" @@ -73,7 +74,7 @@ extern u8 sub_8031720(); extern u8 mplay_80342A4(); extern void oamt_add_pos2_onto_pos1(); extern void StoreSpriteCallbackInData(); -extern void StartTranslateAnimSpriteByDeltas(struct Sprite *); +extern void StartAnimLinearTranslation(struct Sprite *); extern void sub_80105EC(struct Sprite *); extern s32 sub_803FC34(u16); extern void LoadPlayerTrainerBankSprite(); @@ -97,7 +98,6 @@ extern void sub_8043DB0(); extern void move_anim_start_t4(); extern void c3_0802FDF4(u8); extern void sub_8031F88(); -extern void sub_8141828(); extern void c2_8011A1C(void); // this file's functions @@ -1224,7 +1224,7 @@ void LinkPartnerHandleTrainerSlideBack(void) gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40; gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y; - gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas; + gSprites[gBankSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy); gBattleBankFunc[gActiveBattler] = sub_811DB1C; } @@ -1576,7 +1576,7 @@ void LinkPartnerHandleTrainerBallThrow(void) gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40; gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y; - gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas; + gSprites[gBankSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gActiveBattler; StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], sub_8030E38); StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1); diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index d8760e21f..ee313c098 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -83,7 +83,7 @@ extern void sub_80313A0(struct Sprite *); extern void sub_8032B4C(void); extern void sub_8031A6C(u16, u8); extern void sub_8032B84(void); -extern void StartTranslateAnimSpriteByDeltas(struct Sprite *); +extern void StartAnimLinearTranslation(struct Sprite *); extern void sub_8032BBC(void); extern void oamt_add_pos2_onto_pos1(); extern void StoreSpriteCallbackInData(); @@ -1284,7 +1284,7 @@ void OpponentHandleTrainerSlideBack(void) gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280; gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y; - gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas; + gSprites[gBankSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy); gBattleBankFunc[gActiveBattler] = sub_8032BBC; } @@ -2223,7 +2223,7 @@ void OpponentHandleTrainerBallThrow(void) gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280; gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y; - gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas; + gSprites[gBankSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], sub_8035C10); taskId = CreateTask(sub_8035C44, 5); gTasks[taskId].data[0] = gActiveBattler; diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index a83946554..654a2c195 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -2,6 +2,7 @@ #include "data2.h" #include "battle.h" #include "battle_anim.h" +#include "battle_anim_813F0F4.h" #include "battle_interface.h" #include "battle_message.h" #include "item.h" @@ -94,7 +95,7 @@ extern void sub_8047858(); extern u8 GetBattlerSide(u8); extern void StartBattleIntroAnim(); extern void oamt_add_pos2_onto_pos1(); -extern void StartTranslateAnimSpriteByDeltas(struct Sprite *); +extern void StartAnimLinearTranslation(struct Sprite *); extern void StoreSpriteCallbackInData(); extern void BattleLoadPlayerMonSprite(); extern bool8 IsDoubleBattle(void); @@ -164,7 +165,6 @@ extern void sub_8010520(struct Sprite *); extern void sub_8010574(struct Sprite *); extern bool8 IsDoubleBattle(); extern void sub_804777C(); -extern void sub_8141828(); extern void sub_8094E20(u8); extern void nullsub_14(void); extern void sub_80A6DCC(void); @@ -2612,7 +2612,7 @@ void PlayerHandleTrainerSlideBack(void) gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40; gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y; - gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas; + gSprites[gBankSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy); StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1); gBattleBankFunc[gActiveBattler] = sub_802D274; @@ -3067,7 +3067,7 @@ void PlayerHandleTrainerBallThrow(void) gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40; gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y; - gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas; + gSprites[gBankSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gActiveBattler; StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], sub_8030E38); StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1); diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c index ed4eadee6..312ef9d12 100644 --- a/src/battle/battle_controller_wally.c +++ b/src/battle/battle_controller_wally.c @@ -1,6 +1,7 @@ #include "global.h" #include "battle.h" #include "battle_anim.h" +#include "battle_anim_813F0F4.h" #include "battle_interface.h" #include "battle_message.h" #include "data2.h" @@ -63,7 +64,6 @@ extern void Emitcmd35(u8, u16); extern void nullsub_14(void); extern void PrepareBagForWallyTutorial(void); -extern void sub_8141828(); extern void sub_8045A5C(); extern void sub_804777C(); extern void sub_8043DFC(); @@ -85,7 +85,7 @@ extern void sub_80304A8(void); extern void sub_8047858(); extern void StartBattleIntroAnim(); extern void oamt_add_pos2_onto_pos1(); -extern void StartTranslateAnimSpriteByDeltas(struct Sprite *); +extern void StartAnimLinearTranslation(struct Sprite *); extern void sub_8030E38(struct Sprite *); extern void StoreSpriteCallbackInData(); extern u8 sub_8046400(); @@ -1482,7 +1482,7 @@ void WallyHandleTrainerBallThrow(void) gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40; gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y; - gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas; + gSprites[gBankSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gActiveBattler; StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], sub_8030E38); StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1); diff --git a/src/battle/battle_records.c b/src/battle/battle_records.c index fed8d6575..d94d88032 100644 --- a/src/battle/battle_records.c +++ b/src/battle/battle_records.c @@ -290,7 +290,7 @@ void ShowLinkBattleRecords(void) { s32 i; Menu_DrawStdWindowFrame(1, 0, 28, 18); - sub_8072BD8(gOtherText_BattleResults, 0, 1, 240); + MenuPrint_Centered(gOtherText_BattleResults, 0, 1, 240); PrintLinkBattleWinsLossesDraws(gSaveBlock1.linkBattleRecords); #if ENGLISH @@ -368,7 +368,7 @@ void ShowBattleTowerRecords(void) { u16 i; Menu_DrawStdWindowFrame(3, 1, 27, 17); - sub_8072BD8(gOtherText_BattleTowerResults, 3, 2, 0xC8); + MenuPrint_Centered(gOtherText_BattleTowerResults, 3, 2, 0xC8); Menu_PrintText(gOtherText_Lv50, 5, 6); Menu_PrintText(gOtherText_Lv100, 5, 12); for (i = 5; i < 26; i++) diff --git a/src/battle/calculate_base_damage.c b/src/battle/calculate_base_damage.c index d983e47a4..0022cf9fe 100644 --- a/src/battle/calculate_base_damage.c +++ b/src/battle/calculate_base_damage.c @@ -23,13 +23,13 @@ extern u16 gBattleMovePower; extern u16 gTrainerBattleOpponent; // Masks for getting PP Up count, also PP Max values -const u8 gUnknown_08208238[] = {0x03, 0x0c, 0x30, 0xc0}; +const u8 gPPUpReadMasks[] = {0x03, 0x0c, 0x30, 0xc0}; // Masks for setting PP Up count -const u8 gUnknown_0820823C[] = {0xFC, 0xF3, 0xCF, 0x3F}; +const u8 gPPUpWriteMasks[] = {0xFC, 0xF3, 0xCF, 0x3F}; // Values added to PP Up count -const u8 gUnknown_08208240[] = {0x01, 0x04, 0x10, 0x40}; +const u8 gPPUpValues[] = {0x01, 0x04, 0x10, 0x40}; const u8 gStatStageRatios[][2] = { diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c index c619141a1..ac15246d6 100644 --- a/src/battle/pokeball.c +++ b/src/battle/pokeball.c @@ -1,6 +1,7 @@ #include "global.h" #include "gba/m4a_internal.h" #include "battle.h" +#include "battle_anim_813F0F4.h" #include "decompress.h" #include "graphics.h" #include "m4a.h" @@ -296,11 +297,8 @@ const struct SpriteTemplate gBallSpriteTemplates[] = }, }; -extern u32 ball_number_to_ball_processing_index(u16); // not sure of return type -extern void InitAnimSpriteTranslationOverDuration(); -extern bool8 TranslateAnimSpriteLinearAndSine(struct Sprite *); -extern u8 sub_814086C(u8, u8, int, int, u8); -extern u8 sub_8141314(u8, u8, int, u8); +extern void InitAnimArcTranslation(); +extern bool8 TranslateAnimArc(struct Sprite *); static void sub_8046464(u8); static void sub_80466E8(struct Sprite *); @@ -397,7 +395,7 @@ static void sub_8046464(u8 taskId) gSprites[spriteId].data[2] = GetBattlerSpriteCoord(gBankTarget, 0); gSprites[spriteId].data[4] = GetBattlerSpriteCoord(gBankTarget, 1) - 16; gSprites[spriteId].data[5] = -40; - InitAnimSpriteTranslationOverDuration(&gSprites[spriteId]); + InitAnimArcTranslation(&gSprites[spriteId]); gSprites[spriteId].oam.affineParam = taskId; gTasks[taskId].data[4] = gBankTarget; gTasks[taskId].func = TaskDummy; @@ -406,7 +404,7 @@ static void sub_8046464(u8 taskId) static void objc_0804ABD4(struct Sprite *sprite) { - if (TranslateAnimSpriteLinearAndSine(sprite)) + if (TranslateAnimArc(sprite)) { u8 taskId = sprite->oam.affineParam; u8 r5 = gTasks[taskId].data[4]; @@ -834,7 +832,7 @@ static void sub_8047074(struct Sprite *sprite) sprite->data[4] = GetBattlerSpriteCoord(sprite->data[6], 3) + 24; sprite->data[5] = -30; sprite->oam.affineParam = sprite->data[6]; - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); sprite->callback = sub_80470C4; } @@ -858,7 +856,7 @@ static void sub_80470C4(struct Sprite *sprite) StartSpriteAffineAnim(sprite, 4); } r4 = sprite->data[0]; - TranslateAnimSpriteByDeltas(sprite); + TranslateAnimLinear(sprite); sprite->data[7] += sprite->data[6] / 3; sprite->pos2.y += Sin(HIBYTE(sprite->data[7]), sprite->data[5]); sprite->oam.affineParam += 0x100; @@ -876,7 +874,7 @@ static void sub_80470C4(struct Sprite *sprite) } else { - if (TranslateAnimSpriteLinearAndSine(sprite)) + if (TranslateAnimArc(sprite)) { sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; diff --git a/src/berry_blender.c b/src/berry_blender.c index 8bf669a92..85c992d8d 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -1784,6 +1784,7 @@ static void sub_804FE70(void) { sub_804FC48(0x2345, var); sub_804FD30(0x2345); + // looks like a bug if (gBerryBlenderData->field_4.win_field_F > 1000) gBerryBlenderData->field_13E = 1000; if (gBerryBlenderData->scores[i][BLENDER_SCORE_MISS] < 999) @@ -2995,7 +2996,7 @@ bool8 Blender_PrintBlendingResults(void) u16 secondsPassed, minutes, seconds; Menu_DrawStdWindowFrame(4, 2, 25, 17); - sub_8072BD8(gOtherText_ResultsOfBlending, 5, 3, 160); + MenuPrint_Centered(gOtherText_ResultsOfBlending, 5, 3, 160); for (i = 0; i < gBerryBlenderData->playersNo; i++) { u8 place = gBerryBlenderData->playerPlaces[i]; @@ -3188,7 +3189,7 @@ static bool8 Blender_PrintBlendingRanking(void) break; case 3: Menu_DrawStdWindowFrame(4, 2, 25, 17); - sub_8072BD8(gOtherText_Ranking, 5, 3, 160); + MenuPrint_Centered(gOtherText_Ranking, 5, 3, 160); gBerryBlenderData->scoreIconIDs[BLENDER_SCORE_BEST] = CreateSprite(&sSpriteTemplate_821645C, 140, 52, 0); gSprites[gBerryBlenderData->scoreIconIDs[BLENDER_SCORE_BEST]].callback = SpriteCallbackDummy; diff --git a/src/cable_club.c b/src/cable_club.c index 1e1f0af07..39027fc08 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -172,7 +172,7 @@ static void sub_8082D18(u32 value) { ConvertIntToDecimalStringN(gStringVar1, value, STR_CONV_MODE_LEFT_ALIGN, 1); Menu_DrawStdWindowFrame(18, 10, 28, 13); - sub_8072BD8(gOtherText_PLink, 19, 11, 72); + MenuPrint_Centered(gOtherText_PLink, 19, 11, 72); } static void sub_8082D4C() diff --git a/src/credits.c b/src/credits.c index 1a810492b..c0c53505d 100644 --- a/src/credits.c +++ b/src/credits.c @@ -810,7 +810,7 @@ static void task_b_81441B8(u8 taskIdB) if (gTasks[taskIdB].data[TDB_CURRENT_PAGE] < PAGE_COUNT) { for (i = 0; i < 5; i++) - sub_8072BD8(gCreditsEntryPointerTable[gTasks[taskIdB].data[TDB_CURRENT_PAGE]][i]->text, 0, 9 + i * 2, 240); + MenuPrint_Centered(gCreditsEntryPointerTable[gTasks[taskIdB].data[TDB_CURRENT_PAGE]][i]->text, 0, 9 + i * 2, 240); gTasks[taskIdB].data[TDB_CURRENT_PAGE] += 1; gTasks[taskIdB].data[TDB_0] += 1; diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c index 508dc048e..e6af3c58d 100644 --- a/src/debug/nakamura_debug_menu.c +++ b/src/debug/nakamura_debug_menu.c @@ -921,7 +921,7 @@ static void NakaGenderTest_PrintSpeciesGender(u8 i) if (gender == MON_MALE) Menu_PrintText(gOtherText_MaleSymbol2, 23, 2 * i + 1); else if (gender == MON_FEMALE) - Menu_PrintText(gOtherText_FemaleSymbolAndLv, 23, 2 * i + 1); + Menu_PrintText(gOtherText_FemaleSymbol2, 23, 2 * i + 1); else Menu_PrintText(sp0, 23, 2 * i + 1); } diff --git a/src/decompress.c b/src/decompress.c index 69edf01aa..d6c52439f 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -49,25 +49,25 @@ void LoadCompressedObjectPalette(const struct CompressedSpritePalette *src) LoadSpritePalette(&dest); } -void LoadCompressedObjectPaletteOverrideBuffer(const struct CompressedSpritePalette *a, void *buffer) +void LoadCompressedObjectPaletteOverrideBuffer(const struct CompressedSpritePalette *src, void *buffer) { struct SpritePalette dest; - LZ77UnCompWram(a->data, buffer); + LZ77UnCompWram(src->data, buffer); dest.data = buffer; - dest.tag = a->tag; + dest.tag = src->tag; LoadSpritePalette(&dest); } -void DecompressPicFromTable_2(const struct CompressedSpriteSheet *src, u8 b, u8 c, void *d, void *buffer, s32 species) +void DecompressPicFromTable_2(const struct CompressedSpriteSheet *src, u8 coords, u8 y_offset, void *d, void *dest, s32 species) { if (species > SPECIES_EGG) - LZ77UnCompWram(gMonFrontPicTable[0].data, buffer); + LZ77UnCompWram(gMonFrontPicTable[0].data, dest); else - LZ77UnCompWram(src->data, buffer); + LZ77UnCompWram(src->data, dest); } -void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *src, u32 b, u32 c, u32 d, void *dest, s32 species, u32 g) +void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *src, u32 coords, u32 y_offset, u32 d, void *dest, s32 species, u32 pid) { u32 frontOrBack; @@ -77,16 +77,16 @@ void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *src, u32 b, u3 else frontOrBack = 1; // frontPic - LoadSpecialPokePic(src, b, c, d, dest, species, g, frontOrBack); + LoadSpecialPokePic(src, coords, y_offset, d, dest, species, pid, frontOrBack); } -void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, u32 b, u32 c, u32 d, void *dest, s32 species, u32 g, u32 frontOrBack) +void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, u32 b, u32 c, u32 d, void *dest, s32 species, u32 pid, u32 frontOrBack) { u8 frontOrBack8 = frontOrBack; if (species == SPECIES_UNOWN) { - u16 i = (((g & 0x3000000) >> 18) | ((g & 0x30000) >> 12) | ((g & 0x300) >> 6) | (g & 3)) % 0x1C; + u16 i = (((pid & 0x3000000) >> 18) | ((pid & 0x30000) >> 12) | ((pid & 0x300) >> 6) | (pid & 3)) % 0x1C; // The other Unowns are separate from Unown A. if (i == 0) @@ -104,7 +104,7 @@ void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, u32 b, u32 c, u else LZ77UnCompWram(src->data, dest); - DrawSpindaSpots(species, g, dest, frontOrBack8); + DrawSpindaSpots(species, pid, dest, frontOrBack8); } void Unused_LZDecompressWramIndirect(const void **src, void *dest) diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index a973b80ca..ffdf926f5 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -100,12 +100,12 @@ static bool8 CheckStandardWildEncounter(u16); static bool8 mapheader_run_first_tag2_script_list_match_conditionally(struct MapPosition *, u16, u8); static bool8 IsWarpMetatileBehavior(u16); static bool8 IsArrowWarpMetatileBehavior(u16, u8); -static s8 FindWarpEventByPosition(struct MapHeader *, struct MapPosition *); +static s8 GetWarpEventAtMapPosition(struct MapHeader *, struct MapPosition *); static void sub_8068C30(struct MapHeader *, s8, struct MapPosition *); static bool8 map_warp_consider_2_to_inside(struct MapPosition *, u16, u8); -static s8 FindWarpEventByCoordsAndId(struct MapHeader *, u16, u16, u8); +static s8 GetWarpEventAtPosition(struct MapHeader *, u16, u16, u8); static u8 *GetCoordEventScriptAtPosition(struct MapHeader *, u16, u16, u8); -static struct BgEvent *FindBackgroundEventByPosition(struct MapHeader *, u16, u16, u8); +static struct BgEvent *GetBackgroundEventAtPosition(struct MapHeader *, u16, u16, u8); static bool8 TryStartCoordEventScript(struct MapPosition *); static bool8 TryStartWarpEventScript(struct MapPosition *, u16); static bool8 TryStartCrackedFloorHoleScript(u16); @@ -400,7 +400,7 @@ static u8 *GetInteractedEventObjectScript(struct MapPosition *position, u8 metat static u8 *GetInteractedBackgroundEventScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) { - struct BgEvent *bgEvent = FindBackgroundEventByPosition(&gMapHeader, position->x - 7, position->y - 7, position->height); + struct BgEvent *bgEvent = GetBackgroundEventAtPosition(&gMapHeader, position->x - 7, position->y - 7, position->height); if (bgEvent == NULL) return NULL; @@ -676,7 +676,7 @@ static bool8 CheckStandardWildEncounter(u16 metatileBehavior) static bool8 mapheader_run_first_tag2_script_list_match_conditionally(struct MapPosition *position, u16 metatileBehavior, u8 direction) { - s8 warpEventId = FindWarpEventByPosition(&gMapHeader, position); + s8 warpEventId = GetWarpEventAtMapPosition(&gMapHeader, position); if (IsArrowWarpMetatileBehavior(metatileBehavior, direction) == TRUE && warpEventId != -1) { @@ -690,7 +690,7 @@ static bool8 mapheader_run_first_tag2_script_list_match_conditionally(struct Map bool8 TryStartWarpEventScript(struct MapPosition *position, u16 metatileBehavior) { - s8 warpEventId = FindWarpEventByPosition(&gMapHeader, position); + s8 warpEventId = GetWarpEventAtMapPosition(&gMapHeader, position); if (warpEventId != -1 && IsWarpMetatileBehavior(metatileBehavior) == TRUE) { @@ -757,9 +757,9 @@ static bool8 IsArrowWarpMetatileBehavior(u16 metatileBehavior, u8 direction) return FALSE; } -static s8 FindWarpEventByPosition(struct MapHeader *mapHeader, struct MapPosition *position) +static s8 GetWarpEventAtMapPosition(struct MapHeader *mapHeader, struct MapPosition *position) { - return FindWarpEventByCoordsAndId(mapHeader, position->x - 7, position->y - 7, position->height); + return GetWarpEventAtPosition(mapHeader, position->x - 7, position->y - 7, position->height); } static void sub_8068C30(struct MapHeader *unused, s8 warpEventId, struct MapPosition *position) @@ -768,17 +768,17 @@ static void sub_8068C30(struct MapHeader *unused, s8 warpEventId, struct MapPosi if (warpEvent->mapNum == 0x7F) { - copy_saved_warp2_bank_and_enter_x_to_warp1(warpEvent->mapGroup); + copy_saved_warp2_bank_and_enter_x_to_warp1(warpEvent->warpId); } else { struct MapHeader *mapHeader; - warp1_set_2(warpEvent->unk7, warpEvent->mapNum, warpEvent->mapGroup); + warp1_set_2(warpEvent->mapGroup, warpEvent->mapNum, warpEvent->warpId); sub_80535C4(position->x, position->y); - mapHeader = Overworld_GetMapHeaderByGroupAndId(warpEvent->unk7, warpEvent->mapNum); - if (mapHeader->events->warps[warpEvent->mapGroup].mapNum == 0x7F) - saved_warp2_set(mapHeader->events->warps[warpEventId].mapGroup, gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum, warpEventId); + mapHeader = Overworld_GetMapHeaderByGroupAndId(warpEvent->mapGroup, warpEvent->mapNum); + if (mapHeader->events->warps[warpEvent->warpId].mapNum == 0x7F) + saved_warp2_set(mapHeader->events->warps[warpEventId].warpId, gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum, warpEventId); } } @@ -795,7 +795,7 @@ static bool8 map_warp_consider_2_to_inside(struct MapPosition *position, u16 met } if (MetatileBehavior_IsWarpDoor(metatileBehavior) == TRUE) { - warpEventId = FindWarpEventByPosition(&gMapHeader, position); + warpEventId = GetWarpEventAtMapPosition(&gMapHeader, position); if (warpEventId != -1 && IsWarpMetatileBehavior(metatileBehavior) == TRUE) { StoreInitialPlayerAvatarState(); @@ -808,7 +808,7 @@ static bool8 map_warp_consider_2_to_inside(struct MapPosition *position, u16 met return FALSE; } -static s8 FindWarpEventByCoordsAndId(struct MapHeader *mapHeader, u16 x, u16 y, u8 warpId) +static s8 GetWarpEventAtPosition(struct MapHeader *mapHeader, u16 x, u16 y, u8 elevation) { s32 i; struct WarpEvent *warpEvent = mapHeader->events->warps; @@ -818,7 +818,7 @@ static s8 FindWarpEventByCoordsAndId(struct MapHeader *mapHeader, u16 x, u16 y, { if ((u16)warpEvent->x == x && (u16)warpEvent->y == y) { - if ((u8)warpEvent->warpId == warpId || (u8)warpEvent->warpId == 0) + if (warpEvent->elevation == elevation || warpEvent->elevation == 0) return i; } } @@ -871,7 +871,7 @@ u8 *GetCoordEventScriptAtMapPosition(struct MapPosition *position) return GetCoordEventScriptAtPosition(&gMapHeader, position->x - 7, position->y - 7, position->height); } -static struct BgEvent *FindBackgroundEventByPosition(struct MapHeader *mapHeader, u16 x, u16 y, u8 elevation) +static struct BgEvent *GetBackgroundEventAtPosition(struct MapHeader *mapHeader, u16 x, u16 y, u8 elevation) { u8 i; struct BgEvent *bgEvents = mapHeader->events->bgEvents; @@ -950,6 +950,6 @@ int SetCableClubWarp(void) GetPlayerMovementDirection(); //unnecessary GetPlayerPosition(&position); MapGridGetMetatileBehaviorAt(position.x, position.y); //unnecessary - sub_8068C30(&gMapHeader, FindWarpEventByPosition(&gMapHeader, &position), &position); + sub_8068C30(&gMapHeader, GetWarpEventAtMapPosition(&gMapHeader, &position), &position); return 0; } diff --git a/src/field_region_map.c b/src/field_region_map.c index a90b8ed6a..10d5a4a5e 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -55,7 +55,7 @@ void CB2_FieldInitRegionMap(void) Menu_EraseScreen(); REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_TXT256x256; Menu_DrawStdWindowFrame(21, 0, 29, 3); - sub_8072BD8(gOtherText_Hoenn, 0x16, 1, 0x38); + MenuPrint_Centered(gOtherText_Hoenn, 0x16, 1, 0x38); Menu_DrawStdWindowFrame(16, 16, 29, 19); sub_813F0C8(); SetMainCallback2(CB2_FieldRegionMap); diff --git a/src/field_specials.c b/src/field_specials.c index f7b14dad8..e8c83b376 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1089,8 +1089,8 @@ static void sub_810E874(void) void DisplayCurrentElevatorFloor(void) { Menu_DrawStdWindowFrame(20, 0, 29, 5); - sub_8072BD8(gOtherText_NowOn, 21, 1, 64); - sub_8072BD8(gUnknown_083F8380[gSpecialVar_0x8005], 21, 3, 64); + MenuPrint_Centered(gOtherText_NowOn, 21, 1, 64); + MenuPrint_Centered(gUnknown_083F8380[gSpecialVar_0x8005], 21, 3, 64); } void sub_810E984(u8 taskId) diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 2536f4898..5ee025eeb 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -1047,7 +1047,7 @@ static void sub_814302C(u8 taskID) static void sub_8143068(u8 a0, u8 a1) { - sub_8072BD8(gMenuText_WelcomeToHOFAndDexRating, 0, a1 + 1, 0xF0); + MenuPrint_Centered(gMenuText_WelcomeToHOFAndDexRating, 0, a1 + 1, 0xF0); } static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 a1, u8 a2) diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 49a470cc1..102254f22 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -103,5 +103,5 @@ void DrawMapNamePopup(void) Menu_LoadStdFrameGraphicsOverrideStyle(0); GetMapSectionName(name, gMapHeader.regionMapSectionId, 0); Menu_DrawStdWindowFrame(0, 0, 13, 3); - sub_8072BD8(name, 1, 1, 0x60); + MenuPrint_Centered(name, 1, 1, 0x60); } diff --git a/src/menu.c b/src/menu.c index 891644750..d50fb4f22 100644 --- a/src/menu.c +++ b/src/menu.c @@ -728,22 +728,22 @@ _08072B3E:\n\ } #endif -void MenuPrint_RightAligned(const u8 *str, u8 left, u8 top) +void MenuPrint_RightAligned(const u8 *str, u8 right, u8 top) { - Text_InitWindow8004D38(gMenuWindowPtr, str, gMenuTextTileOffset, left, top); + Text_InitWindow_RightAligned(gMenuWindowPtr, str, gMenuTextTileOffset, right, top); } -void sub_8072B80(const u8 *src, u8 a2, u8 a3, const u8 *a4) +void sub_8072B80(const u8 *src, u8 a2, u8 a3, const u8 *text) { u8 buffer[64]; - u8 width = GetStringWidth(gMenuWindowPtr, a4); + u8 width = GetStringWidth(gMenuWindowPtr, text); AlignString(gMenuWindowPtr, buffer, src, width, 1); Text_InitWindowAndPrintText(gMenuWindowPtr, buffer, gMenuTextTileOffset, a2, a3); } -void sub_8072BD8(const u8 *a1, u8 a2, u8 a3, u16 a4) +void MenuPrint_Centered(const u8 *text, u8 left, u8 top, u16 width) { - Text_InitWindow8004DB0(gMenuWindowPtr, a1, gMenuTextTileOffset, a2, a3, a4); + Text_InitWindow_Centered(gMenuWindowPtr, text, gMenuTextTileOffset, left, top, width); } u8 *AlignInt1InMenuWindow(u8 *dest, s32 value, u8 alignAmount, u8 alignType) diff --git a/src/money.c b/src/money.c index 12a8b71ff..53800f854 100644 --- a/src/money.c +++ b/src/money.c @@ -154,7 +154,7 @@ void PrintMoneyAmount(u32 amount, u8 size, u8 x, u8 y) } } -void sub_80B7AEC(u32 arg0, u8 left, u8 top) +void sub_80B7AEC(u32 arg0, u8 right, u8 top) { u8 buffer[32]; u8 *ptr; @@ -166,7 +166,7 @@ void sub_80B7AEC(u32 arg0, u8 left, u8 top) ptr = ConvertIntToDecimalString(ptr, arg0); - MenuPrint_RightAligned(buffer, left, top); + MenuPrint_RightAligned(buffer, right, top); #ifdef ENGLISH ptr[0] = 0xFC; diff --git a/src/pokeblock.c b/src/pokeblock.c index a24cb32cf..03939556c 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -462,7 +462,7 @@ void debug_sub_8120F98(void) static void sub_810BB0C(void) { BasicInitMenuWindow(&gWindowTemplate_81E6E34); - sub_8072BD8(ItemId_GetName(ITEM_POKEBLOCK_CASE), 2, 1, 0x48); + MenuPrint_Centered(ItemId_GetName(ITEM_POKEBLOCK_CASE), 2, 1, 0x48); } static void sub_810BB30(void) diff --git a/src/pokedex.c b/src/pokedex.c index 729f72a7c..eb4d1d918 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -3367,7 +3367,7 @@ static void Task_InitSizeScreenMultistep(u8 taskId) string[0] = EOS; StringAppend(string, gDexText_SizeComparedTo); StringAppend(string, gSaveBlock2.playerName); - sub_8072BD8(string, 3, 15, 0xC0); + MenuPrint_Centered(string, 3, 15, 0xC0); gMain.state++; } break; @@ -3815,7 +3815,7 @@ static void sub_8090750(u8 taskId) gTasks[taskId].data[0]++; break; case 3: - sub_8072BD8(gDexText_RegisterComplete, 2, 0, 0xD0); + MenuPrint_Centered(gDexText_RegisterComplete, 2, 0, 0xD0); if (!IsNationalPokedexEnabled()) sub_8091154(NationalToHoennOrder(dexNum), 13, 3); else diff --git a/src/pokemon_1.c b/src/pokemon_1.c index 0622ec614..4f5094024 100644 --- a/src/pokemon_1.c +++ b/src/pokemon_1.c @@ -13,12 +13,7 @@ #include "trainer.h" #include "text.h" #include "ewram.h" - -//Extracts the upper 16 bits of a 32-bit number -#define HIHALF(n) (((n) & 0xFFFF0000) >> 16) - -//Extracts the lower 16 bits of a 32-bit number -#define LOHALF(n) ((n) & 0xFFFF) +#include "util.h" extern u16 gMoveToLearn; diff --git a/src/pokemon_2.c b/src/pokemon_2.c index 9c60ea108..1720159a2 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -44,8 +44,8 @@ extern const struct SpriteTemplate gSpriteTemplate_8208288[]; extern u8 gTrainerClassToPicIndex[]; extern u8 gTrainerClassToNameIndex[]; -extern const u8 gUnknown_08208238[]; -extern const u8 gUnknown_0820823C[]; +extern const u8 gPPUpReadMasks[]; +extern const u8 gPPUpWriteMasks[]; extern void sub_80105A0(struct Sprite *); extern void oac_poke_opponent(struct Sprite *); @@ -1169,19 +1169,19 @@ void GetSpeciesName(u8 *name, u16 species) u8 CalculatePPWithBonus(u16 move, u8 ppBonuses, u8 moveIndex) { u8 basePP = gBattleMoves[move].pp; - return basePP + ((basePP * 20 * ((gUnknown_08208238[moveIndex] & ppBonuses) >> (2 * moveIndex))) / 100); + return basePP + ((basePP * 20 * ((gPPUpReadMasks[moveIndex] & ppBonuses) >> (2 * moveIndex))) / 100); } void RemoveMonPPBonus(struct Pokemon *mon, u8 moveIndex) { u8 ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES, NULL); - ppBonuses &= gUnknown_0820823C[moveIndex]; + ppBonuses &= gPPUpWriteMasks[moveIndex]; SetMonData(mon, MON_DATA_PP_BONUSES, &ppBonuses); } void RemoveBattleMonPPBonus(struct BattlePokemon *mon, u8 moveIndex) { - mon->ppBonuses &= gUnknown_0820823C[moveIndex]; + mon->ppBonuses &= gPPUpWriteMasks[moveIndex]; } void CopyPlayerPartyMonToBattleData(u8 battleIndex, u8 partyIndex) diff --git a/src/pokemon_item_effect.c b/src/pokemon_item_effect.c index d26546f02..59b216af0 100644 --- a/src/pokemon_item_effect.c +++ b/src/pokemon_item_effect.c @@ -35,9 +35,9 @@ static const u8 sGetMonDataEVConstants[] = MON_DATA_SPATK_EV }; -extern u8 gUnknown_08208238[]; -extern u8 gUnknown_0820823C[]; -extern u8 gUnknown_08208240[]; +extern u8 gPPUpReadMasks[]; +extern u8 gPPUpWriteMasks[]; +extern u8 gPPUpValues[]; bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 moveIndex, u8 e); @@ -221,11 +221,11 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo if (r10 & 0x20) { r10 &= ~0x20; - data = (GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) & gUnknown_08208238[moveIndex]) >> (moveIndex * 2); + data = (GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) & gPPUpReadMasks[moveIndex]) >> (moveIndex * 2); sp28 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + moveIndex, NULL), GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), moveIndex); - if (data <= 2 && sp28 > 4) + if (data < 3 && sp28 > 4) { - data = GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) + gUnknown_08208240[moveIndex]; + data = GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) + gPPUpValues[moveIndex]; SetMonData(pkmn, MON_DATA_PP_BONUSES, &data); data = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + moveIndex, NULL), data, moveIndex) - sp28; @@ -450,13 +450,13 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo } break; case 4: - data = (GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) & gUnknown_08208238[moveIndex]) >> (moveIndex * 2); + data = (GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) & gPPUpReadMasks[moveIndex]) >> (moveIndex * 2); if (data < 3) { r4 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + moveIndex, NULL), GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), moveIndex); data = GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL); - data &= gUnknown_0820823C[moveIndex]; - data += gUnknown_08208240[moveIndex] * 3; + data &= gPPUpWriteMasks[moveIndex]; + data += gPPUpValues[moveIndex] * 3; SetMonData(pkmn, MON_DATA_PP_BONUSES, &data); data = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + moveIndex, NULL), data, moveIndex) - r4; diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 770b69813..971d7daf7 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -734,7 +734,7 @@ void sub_809665C(void) u8 *stringVar = gStringVar1; stringVar[0] = EXT_CTRL_CODE_BEGIN; - stringVar[1] = 0x04; // EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW + stringVar[1] = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW; stringVar[2] = 0x0F; // TEXT_COLOR_WHITE2 stringVar[3] = 0x01; // TEXT_COLOR_DARK_GREY stringVar[4] = 0x0E; // TEXT_COLOR_LIGHT_BLUE @@ -744,7 +744,7 @@ void sub_809665C(void) stringVar[0] = CHAR_NEWLINE; stringVar[1] = EXT_CTRL_CODE_BEGIN; - stringVar[2] = 0x11; // EXT_CTRL_CODE_CLEAR + stringVar[2] = EXT_CTRL_CODE_CLEAR; if (nPokemonInBox < 10) stringVar[3] = 0x28; else diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index aabacbe2f..2fd7cb1ca 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -3,6 +3,7 @@ #include "constants/songs.h" #include "constants/species.h" #include "battle.h" +#include "battle_anim_813F0F4.h" #include "contest.h" #include "data2.h" #include "decompress.h" @@ -32,8 +33,8 @@ #include "scanline_effect.h" #include "daycare.h" -static void sub_809FC0C(void); -static void sub_809FEB8(void); +static void SummaryScreen_PrintPokemonInfoLabels(void); +static void SummaryScreen_PrintPokemonSkillsLabels(void); static void sub_809F63C(struct Pokemon *); static void sub_809F650(struct Pokemon *); static void sub_809F664(struct Pokemon *); @@ -43,7 +44,7 @@ static void sub_80A015C(struct Pokemon *); static void sub_809DE44(void); static void sub_809EB40(u8); static void sub_809EBC4(void); -static void sub_809E044(void); +static void SummaryScreen_LoadPalettes(void); static void sub_80A1D84(struct Pokemon *); static void sub_80A18C4(void); static bool8 LoadPokemonSummaryScreenGraphics(void); @@ -53,29 +54,29 @@ static void sub_80A1DCC(struct Pokemon *); static void sub_809FE80(void); static void sub_80A00A4(void); static void sub_80A0390(void); -extern u8 sub_80A1808(struct Pokemon *); -static void sub_80A1F98(s32, u8, u8, u8, u8, u16, s32); +extern u8 SummaryScreen_CreatePokemonSprite(struct Pokemon *); +static void SummaryScreen_PrintColoredIntPixelCoords(s32, u8, u8, u8, u8, u16, s32); static void sub_80A0958(struct Pokemon *); static void PokemonSummaryScreen_PrintTrainerMemo(struct Pokemon *, u8, u8); static void PokemonSummaryScreen_PrintEggTrainerMemo(struct Pokemon *, u8, u8); -static void sub_80A1EF8(const u8 *, u8, u8, u16, s32); -static void sub_80A1F48(const u8 *, u8, u8, u8, u16); +static void SummaryScreen_PrintColoredTextPixelCoords(const u8 *, u8, u8, u16, s32); +static void SummaryScreen_PrintColoredTextCentered(const u8 *, u8, u8, u8, u16); static void PrintHeldItemName(u16, u8, u8); static void PrintNumRibbons(struct Pokemon *); static void DrawExperienceProgressBar(struct Pokemon *, u8, u8); -static void sub_809E13C(u8 taskId); +static void SummaryScreen_DestroyTask(u8 taskId); static void sub_80A1950(void); static void sub_809DE64(void); static void SummaryScreenHandleAButton(u8); static void SummaryScreenHandleUpDownInput(u8, s8); -static bool8 sub_809F7D0(u8); +static bool8 SummaryScreen_CanForgetSelectedMove(u8); static void sub_809F9D0(u8, u8); -static void sub_809EAC8(u8); +static void SummaryScreen_MoveSelect_Cancel(u8); static void sub_809E534(u8); static void sub_809E83C(u8, s8); static void sub_80A1B40(u8); static void sub_80A2078(int); -static void sub_809E3FC(u8); +static void SummaryScreen_MoveSelect_HandleInput(u8); static void SummaryScreenHandleKeyInput(u8); static void sub_80A1B1C(u8); static void sub_80A16CC(u8); @@ -91,7 +92,7 @@ extern s8 sub_809F284(s8); extern s8 sub_809F3CC(s8); static bool8 sub_809F5F8(void); static void sub_80A1DE8(struct Pokemon *); -static u8 sub_809F6B4(struct Pokemon *, u8 *); +static u8 SummaryScreen_LoadPokemonSprite(struct Pokemon *, u8 *); static void DrawPokerusSurvivorDot(struct Pokemon *); static void sub_80A12D0(s8); static void sub_809FAC8(struct Pokemon *); @@ -99,30 +100,30 @@ static void SummaryScreenHandleLeftRightInput(u8, s8); static void sub_809E8F0(); static void sub_80A1654(s8, u8); static void sub_80A1488(s8, u8); -static void sub_809FC34(struct Pokemon *); -static void sub_809FF64(struct Pokemon *); +static void SummaryScreen_PrintPokemonInfo(struct Pokemon *); +static void SummaryScreen_PrintPokemonSkills(struct Pokemon *); static void sub_80A1918(u8, u8); -static void sub_80A198C(u8, u8, u8, u8); +static void SummaryScreen_DrawTypeIcon(u8, u8, u8, u8); static u16 GetMonMove(struct Pokemon *, u8); static void sub_80A04CC(u16); static void sub_80A057C(u16); static void sub_80A0498(u16); static void sub_80A046C(u16); static void sub_80A20A8(u8); -static void sub_809F678(struct Pokemon *); +static void SummaryScreen_GetPokemon(struct Pokemon *); static void sub_80A1BC0(struct Sprite *sprite); -static void sub_80A1888(struct Sprite *); +static void SummaryScreen_SpritePlayCry(struct Sprite *); static void sub_80A0428(struct Pokemon *, u8 *); static void sub_80A18E4(u8); -static u8 *sub_80A1E58(u8 *, u8); +static u8 *SummaryScreen_SetTextColor(u8 *, u8); +static u8 *SummaryScreen_CopyColoredString(u8 *, const u8 *, u8); static void sub_80A0A2C(struct Pokemon *, u8, u8); -static void sub_80A1FF8(const u8 *, u8, u8, u8); +static void SummaryScreen_PrintColoredText(const u8 *, u8, u8, u8); -extern u8 ball_number_to_ball_processing_index(u16); extern u8 StorageSystemGetNextMonIndex(struct BoxPokemon *, u8, u8, u8); extern struct MusicPlayerInfo gMPlay_BGM; -extern u8 gUnknown_08208238[]; +extern u8 gPPUpReadMasks[]; extern TaskFunc gUnknown_03005CF0; extern struct SpriteTemplate gUnknown_02024E8C; @@ -196,120 +197,29 @@ static const struct OamData sOamData_83C109C = { .affineParam = 0, }; -static const union AnimCmd sSpriteAnim_83C10A4[] = { - ANIMCMD_FRAME(0, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C10AC[] = { - ANIMCMD_FRAME(8, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C10B4[] = { - ANIMCMD_FRAME(16, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C10BC[] = { - ANIMCMD_FRAME(24, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C10C4[] = { - ANIMCMD_FRAME(32, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C10CC[] = { - ANIMCMD_FRAME(40, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C10D4[] = { - ANIMCMD_FRAME(48, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C10DC[] = { - ANIMCMD_FRAME(56, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C10E4[] = { - ANIMCMD_FRAME(64, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C10EC[] = { - ANIMCMD_FRAME(72, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C10F4[] = { - ANIMCMD_FRAME(80, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C10FC[] = { - ANIMCMD_FRAME(88, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C1104[] = { - ANIMCMD_FRAME(96, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C110C[] = { - ANIMCMD_FRAME(104, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C1114[] = { - ANIMCMD_FRAME(112, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C111C[] = { - ANIMCMD_FRAME(120, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C1124[] = { - ANIMCMD_FRAME(128, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C112C[] = { - ANIMCMD_FRAME(136, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C1134[] = { - ANIMCMD_FRAME(144, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C113C[] = { - ANIMCMD_FRAME(152, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C1144[] = { - ANIMCMD_FRAME(160, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C114C[] = { - ANIMCMD_FRAME(168, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C1154[] = { - ANIMCMD_FRAME(176, 0), - ANIMCMD_END, -}; +static const union AnimCmd sSpriteAnim_83C10A4[] = { ANIMCMD_FRAME(0, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C10AC[] = { ANIMCMD_FRAME(8, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C10B4[] = { ANIMCMD_FRAME(16, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C10BC[] = { ANIMCMD_FRAME(24, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C10C4[] = { ANIMCMD_FRAME(32, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C10CC[] = { ANIMCMD_FRAME(40, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C10D4[] = { ANIMCMD_FRAME(48, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C10DC[] = { ANIMCMD_FRAME(56, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C10E4[] = { ANIMCMD_FRAME(64, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C10EC[] = { ANIMCMD_FRAME(72, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C10F4[] = { ANIMCMD_FRAME(80, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C10FC[] = { ANIMCMD_FRAME(88, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C1104[] = { ANIMCMD_FRAME(96, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C110C[] = { ANIMCMD_FRAME(104, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C1114[] = { ANIMCMD_FRAME(112, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C111C[] = { ANIMCMD_FRAME(120, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C1124[] = { ANIMCMD_FRAME(128, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C112C[] = { ANIMCMD_FRAME(136, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C1134[] = { ANIMCMD_FRAME(144, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C113C[] = { ANIMCMD_FRAME(152, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C1144[] = { ANIMCMD_FRAME(160, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C114C[] = { ANIMCMD_FRAME(168, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C1154[] = { ANIMCMD_FRAME(176, 0), ANIMCMD_END, }; static const union AnimCmd *const sSpriteAnimTable_83C115C[] = { sSpriteAnim_83C10A4, @@ -367,55 +277,16 @@ static const struct OamData sOamData_83C11F0 = { .affineParam = 0, }; -static const union AnimCmd sSpriteAnim_83C11F8[] = { - ANIMCMD_FRAME(0, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C1200[] = { - ANIMCMD_FRAME(4, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C1208[] = { - ANIMCMD_FRAME(8, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C1210[] = { - ANIMCMD_FRAME(12, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C1218[] = { - ANIMCMD_FRAME(16, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C1220[] = { - ANIMCMD_FRAME(16, 0, .hFlip = TRUE), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C1228[] = { - ANIMCMD_FRAME(20, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C1230[] = { - ANIMCMD_FRAME(24, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C1238[] = { - ANIMCMD_FRAME(24, 0, .hFlip = TRUE), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C1240[] = { - ANIMCMD_FRAME(28, 0), - ANIMCMD_END, -}; +static const union AnimCmd sSpriteAnim_83C11F8[] = { ANIMCMD_FRAME(0, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C1200[] = { ANIMCMD_FRAME(4, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C1208[] = { ANIMCMD_FRAME(8, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C1210[] = { ANIMCMD_FRAME(12, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C1218[] = { ANIMCMD_FRAME(16, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C1220[] = { ANIMCMD_FRAME(16, 0, .hFlip = TRUE), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C1228[] = { ANIMCMD_FRAME(20, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C1230[] = { ANIMCMD_FRAME(24, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C1238[] = { ANIMCMD_FRAME(24, 0, .hFlip = TRUE), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C1240[] = { ANIMCMD_FRAME(28, 0), ANIMCMD_END, }; static const union AnimCmd *const sSpriteAnimTable_83C1248[] = { sSpriteAnim_83C11F8, @@ -459,40 +330,13 @@ static const struct OamData sOamData_83C1298 = { .affineParam = 0, }; -static const union AnimCmd sSpriteAnim_83C12A0[] = { - ANIMCMD_FRAME(0, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C12A8[] = { - ANIMCMD_FRAME(4, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C12B0[] = { - ANIMCMD_FRAME(8, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C12B8[] = { - ANIMCMD_FRAME(12, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C12C0[] = { - ANIMCMD_FRAME(16, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C12C8[] = { - ANIMCMD_FRAME(20, 0), - ANIMCMD_END, -}; - -static const union AnimCmd sSpriteAnim_83C12D0[] = { - ANIMCMD_FRAME(24, 0), - ANIMCMD_END, -}; +static const union AnimCmd sSpriteAnim_83C12A0[] = { ANIMCMD_FRAME(0, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C12A8[] = { ANIMCMD_FRAME(4, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C12B0[] = { ANIMCMD_FRAME(8, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C12B8[] = { ANIMCMD_FRAME(12, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C12C0[] = { ANIMCMD_FRAME(16, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C12C8[] = { ANIMCMD_FRAME(20, 0), ANIMCMD_END, }; +static const union AnimCmd sSpriteAnim_83C12D0[] = { ANIMCMD_FRAME(24, 0), ANIMCMD_END, }; static const union AnimCmd *const sSpriteAnimTable_83C12D8[] = { sSpriteAnim_83C12A0, @@ -531,8 +375,8 @@ static const u16 sUnknown_083C157C[] = { RGB(26, 26, 23) }; static const u16 sUnknown_083C157E[] = { RGB(30, 30, 27) }; static void (*const sUnknown_083C1580[])(void) = { - sub_809FC0C, - sub_809FEB8, + SummaryScreen_PrintPokemonInfoLabels, + SummaryScreen_PrintPokemonSkillsLabels, }; static void (*const sUnknown_083C1588[])(struct Pokemon *) = { @@ -554,16 +398,23 @@ static const u8 sDoubleBattlePartyOrder[] = { 0, 2, 3, 1, 4, 5 }; static const u8 sUnknown_083C15AE[] = _("{STR_VAR_1}{CLEAR_TO 64}"); static const u8 sUnknown_083C15B4[] = _("{STR_VAR_1}{CLEAR_TO 72}"); -asm(".align 2"); // TODO: this array is probably not correctly-typed -static const u8 sUnknown_083C15BC[] = { - 9, 1, 0, 2, - 10, 3, 0, 4, - 8, 5, 0, 6, - 11, 7, 0, 8, - 14, 9, 0, 10, - 12, 11, 0, 12, - 13, 13, 0, 14, - -1, 15, 0, 10, +struct TextColors { + u8 id; + u8 color; + u8 background; + u8 shadow; +}; + +// The TEXT_COLOR constants don't apply. Refer to the palette for this screen. +static const struct TextColors sSummaryScreenTextColors[] = { + { 9, 1, 0, 2 }, // blue + { 10, 3, 0, 4 }, // pink + { 8, 5, 0, 6 }, // yellow + { 11, 7, 0, 8 }, // blue2 + { 14, 9, 0, 10 }, // red + { 12, 11, 0, 12 }, // pink2 + { 13, 13, 0, 14 }, // white + { -1, 15, 0, 10 }, // black }; void sub_809D844(void) @@ -677,7 +528,7 @@ void sub_809DA1C(void) break; case PSS_MODE_MOVES_ONLY: case PSS_MODE_PC_MOVES_ONLY: - pssData.inputHandlingTaskId = CreateTask(sub_809E3FC, 0); + pssData.inputHandlingTaskId = CreateTask(SummaryScreen_MoveSelect_HandleInput, 0); break; } } @@ -741,7 +592,7 @@ bool8 sub_809DA84(void) gMain.state++; break; case 12: - sub_809F678(&pssData.loadedMon); + SummaryScreen_GetPokemon(&pssData.loadedMon); if (!GetMonStatusAndPokerus(&pssData.loadedMon)) sub_80A12D0(0); else @@ -760,14 +611,14 @@ bool8 sub_809DA84(void) gMain.state++; break; case 15: - if ((pssData.monSpriteId = sub_809F6B4(&pssData.loadedMon, &pssData.loadGfxState)) != 0xFF) + if ((pssData.monSpriteId = SummaryScreen_LoadPokemonSprite(&pssData.loadedMon, &pssData.loadGfxState)) != 0xFF) { pssData.loadGfxState = 0; gMain.state++; } break; case 16: - sub_809E044(); + SummaryScreen_LoadPalettes(); DrawSummaryScreenNavigationDots(); gMain.state++; break; @@ -908,7 +759,7 @@ static bool8 LoadPokemonSummaryScreenGraphics(void) return FALSE; } -static void sub_809E044(void) +static void SummaryScreen_LoadPalettes(void) { LoadPalette(gUnknownPalette_81E6692 + 14, 129, 2); LoadPalette(gUnknownPalette_81E6692 + 15, 136, 2); @@ -931,10 +782,10 @@ static void SummaryScreenExit(u8 taskId) { PlaySE(SE_SELECT); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); - gTasks[taskId].func = sub_809E13C; + gTasks[taskId].func = SummaryScreen_DestroyTask; } -static void sub_809E13C(u8 taskId) +static void SummaryScreen_DestroyTask(u8 taskId) { if (sub_8055870() != TRUE && !gPaletteFade.active) { @@ -1015,7 +866,7 @@ static void sub_809E260(u8 taskId) } else if (gMain.newKeys & A_BUTTON) { - if (sub_809F7D0(taskId) == TRUE || pssData.selectedMoveIndex == 4) + if (SummaryScreen_CanForgetSelectedMove(taskId) == TRUE || pssData.selectedMoveIndex == 4) { pssData.switchMoveIndex = pssData.selectedMoveIndex; gSpecialVar_0x8005 = pssData.switchMoveIndex; @@ -1030,12 +881,12 @@ static void sub_809E260(u8 taskId) else if (gMain.newKeys & B_BUTTON) { pssData.switchMoveIndex = 4; - gSpecialVar_0x8005 = 4; + gSpecialVar_0x8005 = pssData.switchMoveIndex; SummaryScreenExit(taskId); } } -static void sub_809E3FC(u8 taskId) +static void SummaryScreen_MoveSelect_HandleInput(u8 taskId) { if (gPaletteFade.active) return; @@ -1072,13 +923,13 @@ static void sub_809E3FC(u8 taskId) else { PlaySE(SE_SELECT); - sub_809EAC8(taskId); + SummaryScreen_MoveSelect_Cancel(taskId); } } else if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); - sub_809EAC8(taskId); + SummaryScreen_MoveSelect_Cancel(taskId); } } @@ -1118,7 +969,7 @@ static void sub_809E534(u8 taskId) } } -static void sub_809E5C4(void) +static void SummaryScreen_SwapMoves_Party(void) { struct Pokemon *party = pssData.monList.partyMons; struct Pokemon *pkmn = &party[pssData.monIndex]; @@ -1131,10 +982,10 @@ static void sub_809E5C4(void) u8 move2pp = GetMonData(pkmn, MON_DATA_PP1 + moveIndex2); u8 ppBonuses = GetMonData(pkmn, MON_DATA_PP_BONUSES); - // Calculate PP bonuses - u8 r9 = gUnknown_08208238[moveIndex1]; + // Swap PP bonuses + u8 r9 = gPPUpReadMasks[moveIndex1]; u8 r2 = (ppBonuses & r9) >> (moveIndex1 * 2); - u8 r3 = gUnknown_08208238[moveIndex2]; + u8 r3 = gPPUpReadMasks[moveIndex2]; u8 r1 = (ppBonuses & r3) >> (moveIndex2 * 2); ppBonuses &= ~r9; ppBonuses &= ~r3; @@ -1148,7 +999,7 @@ static void sub_809E5C4(void) SetMonData(pkmn, MON_DATA_PP_BONUSES, &ppBonuses); } -static void sub_809E6D8(void) +static void SummaryScreen_SwapMoves_Box(void) { struct BoxPokemon *boxMons = pssData.monList.boxMons; struct BoxPokemon *pkmn = &boxMons[pssData.monIndex]; @@ -1161,10 +1012,10 @@ static void sub_809E6D8(void) u8 move2pp = GetBoxMonData(pkmn, MON_DATA_PP1 + moveIndex2); u8 ppBonuses = GetBoxMonData(pkmn, MON_DATA_PP_BONUSES); - // Calculate PP bonuses - u8 r9 = gUnknown_08208238[moveIndex1]; + // Swap PP bonuses + u8 r9 = gPPUpReadMasks[moveIndex1]; u8 r2 = (ppBonuses & r9) >> (moveIndex1 * 2); - u8 r3 = gUnknown_08208238[moveIndex2]; + u8 r3 = gPPUpReadMasks[moveIndex2]; u8 r1 = (ppBonuses & r3) >> (moveIndex2 * 2); ppBonuses &= ~r9; ppBonuses &= ~r3; @@ -1184,7 +1035,7 @@ void sub_809E7F0(u8 taskId) { pssData.loadGfxState = 0; sub_80A0428(&pssData.loadedMon, &pssData.selectedMoveIndex); - gTasks[taskId].func = sub_809E3FC; + gTasks[taskId].func = SummaryScreen_MoveSelect_HandleInput; sub_80A2078(taskId); } } @@ -1201,12 +1052,12 @@ static void sub_809E83C(u8 taskId, s8 b) if (pssData.selectedMoveIndex != pssData.switchMoveIndex) { if (pssData.usingPC == FALSE) - sub_809E5C4(); + SummaryScreen_SwapMoves_Party(); else - sub_809E6D8(); + SummaryScreen_SwapMoves_Box(); pssData.selectedMoveIndex = pssData.switchMoveIndex; - sub_809F678(&pssData.loadedMon); + SummaryScreen_GetPokemon(&pssData.loadedMon); pssData.loadGfxState = 1; gTasks[taskId].func = sub_809E7F0; @@ -1218,7 +1069,7 @@ static void sub_809E83C(u8 taskId, s8 b) sub_80A0428(&pssData.loadedMon, &pssData.selectedMoveIndex); } - gTasks[taskId].func = sub_809E3FC; + gTasks[taskId].func = SummaryScreen_MoveSelect_HandleInput; sub_80A2078(taskId); } @@ -1420,11 +1271,11 @@ static void SummaryScreenHandleAButton(u8 taskId) sub_80A029C(&pssData.loadedMon); sub_80A1A30(9); - gTasks[taskId].func = sub_809E3FC; + gTasks[taskId].func = SummaryScreen_MoveSelect_HandleInput; sub_80A2078(taskId); } -static void sub_809EAC8(u8 taskId) +static void SummaryScreen_MoveSelect_Cancel(u8 taskId) { if (pssData.selectedMoveIndex != 4) { @@ -2055,14 +1906,14 @@ void sub_809F43C(u8 taskId) gMain.state++; break; case 4: - sub_809F678(&pssData.loadedMon); + SummaryScreen_GetPokemon(&pssData.loadedMon); if (GetMonStatusAndPokerus(&pssData.loadedMon)) sub_80A12D0(2); DrawPokerusSurvivorDot(&pssData.loadedMon); gMain.state++; break; case 5: - if ((pssData.monSpriteId = sub_809F6B4(&pssData.loadedMon, &pssData.loadGfxState)) != 0xFF) + if ((pssData.monSpriteId = SummaryScreen_LoadPokemonSprite(&pssData.loadedMon, &pssData.loadGfxState)) != 0xFF) { pssData.loadGfxState = 0; if (GetMonData(&pssData.loadedMon, MON_DATA_IS_EGG)) @@ -2115,13 +1966,13 @@ static bool8 sub_809F5F8(void) static void sub_809F63C(struct Pokemon *mon) { sub_809FE80(); - sub_809FC34(mon); + SummaryScreen_PrintPokemonInfo(mon); } static void sub_809F650(struct Pokemon *mon) { sub_80A00A4(); - sub_809FF64(mon); + SummaryScreen_PrintPokemonSkills(mon); } static void sub_809F664(struct Pokemon *mon) @@ -2130,9 +1981,9 @@ static void sub_809F664(struct Pokemon *mon) sub_80A015C(mon); } -static void sub_809F678(struct Pokemon *mon) +static void SummaryScreen_GetPokemon(struct Pokemon *mon) { - if (pssData.usingPC == FALSE) + if (!pssData.usingPC) { struct Pokemon *mons = pssData.monList.partyMons; *mon = mons[pssData.monIndex]; @@ -2144,17 +1995,17 @@ static void sub_809F678(struct Pokemon *mon) } } -static u8 sub_809F6B4(struct Pokemon *mon, u8 *b) +static u8 SummaryScreen_LoadPokemonSprite(struct Pokemon *mon, u8 *state) { u16 species; u32 personality; u32 otId; const struct CompressedSpritePalette *palette; - switch (*b) + switch (*state) { default: - return sub_80A1808(mon); + return SummaryScreen_CreatePokemonSprite(mon); case 0: species = GetMonData(mon, MON_DATA_SPECIES2); personality = GetMonData(mon, MON_DATA_PERSONALITY); @@ -2167,7 +2018,7 @@ static u8 sub_809F6B4(struct Pokemon *mon, u8 *b) gUnknown_081FAF4C[1], species, personality); - *b += 1; + *state += 1; return 0xFF; case 1: species = GetMonData(mon, MON_DATA_SPECIES2); @@ -2177,7 +2028,7 @@ static u8 sub_809F6B4(struct Pokemon *mon, u8 *b) palette = GetMonSpritePalStructFromOtIdPersonality(species, otId, personality); LoadCompressedObjectPalette(palette); GetMonSpriteTemplate_803C56C(palette->tag, 1); - *b += 1; + *state += 1; return 0xFF; } } @@ -2212,12 +2063,12 @@ static u16 GetMonMovePP(struct Pokemon *mon, u8 moveId) } } -static bool8 sub_809F7D0(u8 taskId) +static bool8 SummaryScreen_CanForgetSelectedMove(u8 taskId) { struct Pokemon mon; u16 move; - sub_809F678(&mon); + SummaryScreen_GetPokemon(&mon); move = GetMonMove(&mon, pssData.selectedMoveIndex); if (IsHMMove(move) == TRUE && pssData.mode != PSS_MODE_UNKNOWN) return FALSE; @@ -2285,11 +2136,11 @@ void sub_809F814(u8 taskId) } } -static void sub_809F9D0(u8 taskId, u8 b) +static void sub_809F9D0(u8 taskId, u8 moveIndex) { s16 *taskData = gTasks[taskId].data; taskData[14] = 0; - taskData[15] = b; + taskData[15] = moveIndex; sub_80A1488(-2, 4); sub_80A1654(-2, 4); @@ -2304,51 +2155,16 @@ u8 sub_809FA30(void) return pssData.switchMoveIndex; } -// void GetStringCenterAlignXOffsetWithLetterSpacing(u8 a, u8 b, u8 c, u8 d) -// { -// u16 *vramAddr = (u16 *)(VRAM + 0xF000); - -// vramAddr[(d * 32) + c] = (b * 0x1000) + (a * 2) + 0x200 + 0x80; -// vramAddr[(d * 32) + c + 32] = (b * 0x1000) + (a * 2) + 0x200 + 0x81; -// } -NAKED -void GetStringCenterAlignXOffsetWithLetterSpacing(u8 a, u8 b, u8 c, u8 d) +static void SummaryScreen_PlaceTextTile(u8 tile, u8 palette, u8 x, u8 y) { - asm(".syntax unified\n\ - push {r4,lr}\n\ - lsls r0, 24\n\ - lsls r1, 24\n\ - lsls r2, 24\n\ - lsls r3, 24\n\ - lsrs r2, 23\n\ - lsrs r3, 18\n\ - ldr r4, _0809FA70 @ =0x0600f000\n\ - adds r3, r4\n\ - adds r2, r3\n\ - lsrs r1, 12\n\ - lsrs r0, 23\n\ - movs r4, 0x80\n\ - lsls r4, 2\n\ - adds r3, r4, 0\n\ - adds r0, r3\n\ - adds r1, r0\n\ - adds r0, r1, 0\n\ - adds r0, 0x80\n\ - strh r0, [r2]\n\ - adds r2, 0x40\n\ - adds r1, 0x81\n\ - strh r1, [r2]\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_0809FA70: .4byte 0x0600f000\n\ - .syntax divided\n"); + u16 *vramAddr = (u16 *)(VRAM + 0xF000) + x + y * 32; + vramAddr[0] = (palette << 12) + 0x200 + tile * 2 + 0x80; + vramAddr[32] = (palette << 12) + 0x200 + tile * 2 + 0x81; } -void GetStringCenterAlignXOffset(u8 a, u8 b, u8 c) +static void SummaryScreen_PlaceTextTile_White(u8 tile, u8 x, u8 y) { - GetStringCenterAlignXOffsetWithLetterSpacing(a, 15, b, c); + SummaryScreen_PlaceTextTile(tile, 15, x, y); } bool8 sub_809FA94(struct Pokemon *mon) @@ -2367,7 +2183,7 @@ bool8 sub_809FA94(struct Pokemon *mon) static void sub_809FAC8(struct Pokemon *mon) { - bool8 shinyDexNum; + bool8 shiny; u16 dexNum; u8 *buffer; @@ -2377,24 +2193,24 @@ static void sub_809FAC8(struct Pokemon *mon) Menu_EraseWindowRect(3, 16, 9, 17); Menu_EraseWindowRect(0, 12, 11, 15); GetMonNickname(mon, gStringVar1); - sub_80A1FF8(gStringVar1, 13, 3, 16); + SummaryScreen_PrintColoredText(gStringVar1, 13, 3, 16); LoadPalette(sUnknown_083C157C, 4, 2); } else { - shinyDexNum = sub_809FA94(mon); + shiny = sub_809FA94(mon); dexNum = SpeciesToPokedexNum(GetMonData(mon, MON_DATA_SPECIES)); if (dexNum != 0xFFFF) { - if (!shinyDexNum) + if (!shiny) { - GetStringCenterAlignXOffset(2, 1, 2); - sub_80A1F98(dexNum, 13, 3, 2, 17, 16, 1); + SummaryScreen_PlaceTextTile_White(2, 1, 2); + SummaryScreen_PrintColoredIntPixelCoords(dexNum, 13, 3, 2, 17, 16, 1); } else { - GetStringCenterAlignXOffsetWithLetterSpacing(2, 8, 1, 2); - sub_80A1F98(dexNum, 8, 3, 2, 17, 16, 1); + SummaryScreen_PlaceTextTile(2, 8, 1, 2); + SummaryScreen_PrintColoredIntPixelCoords(dexNum, 8, 3, 2, 17, 16, 1); } } else @@ -2403,7 +2219,7 @@ static void sub_809FAC8(struct Pokemon *mon) } buffer = gStringVar1; - buffer = sub_80A1E58(buffer, 13); + buffer = SummaryScreen_SetTextColor(buffer, 13); buffer = GetMonNickname(mon, buffer); buffer[0] = EXT_CTRL_CODE_BEGIN; buffer[1] = 0x13; @@ -2425,14 +2241,14 @@ static void sub_809FBE4(void) Menu_EraseWindowRect(11, 4, 29, 18); } -static void sub_809FC0C(void) +static void SummaryScreen_PrintPokemonInfoLabels(void) { Menu_PrintText(gOtherText_Type2, 11, 6); - GetStringCenterAlignXOffset(0, 22, 4); - GetStringCenterAlignXOffset(2, 23, 4); + SummaryScreen_PlaceTextTile_White(0, 22, 4); + SummaryScreen_PlaceTextTile_White(2, 23, 4); } -static void sub_809FC34(struct Pokemon *mon) +static void SummaryScreen_PrintPokemonInfo(struct Pokemon *mon) { u8 i; u8 *buffer; @@ -2448,7 +2264,7 @@ static void sub_809FC34(struct Pokemon *mon) if (GetMonData(mon, MON_DATA_IS_EGG)) { buffer = gStringVar1; - buffer = sub_80A1E58(buffer, 13); + buffer = SummaryScreen_SetTextColor(buffer, 13); buffer = StringCopy(buffer, gOtherText_OriginalTrainer); buffer = StringCopy(buffer, gOtherText_FiveQuestions); buffer[0] = EXT_CTRL_CODE_BEGIN; @@ -2457,15 +2273,15 @@ static void sub_809FC34(struct Pokemon *mon) buffer[3] = EOS; Menu_PrintText(gStringVar1, 11, 4); - sub_80A1EF8(gOtherText_FiveQuestions, 13, 193, 32, 1); - sub_80A198C(9, 120, 48, 0); + SummaryScreen_PrintColoredTextPixelCoords(gOtherText_FiveQuestions, 13, 193, 32, 1); + SummaryScreen_DrawTypeIcon(TYPE_MYSTERY, 120, 48, 0); friendship = GetMonData(mon, MON_DATA_FRIENDSHIP); - if (friendship < 6) + if (friendship <= 5) Menu_PrintText(gOtherText_EggAbout, 11, 9); - else if (friendship < 11) + else if (friendship <= 10) Menu_PrintText(gOtherText_EggSoon, 11, 9); - else if (friendship < 41) + else if (friendship <= 40) Menu_PrintText(gOtherText_EggSomeTime, 11, 9); else Menu_PrintText(gOtherText_EggLongTime, 11, 9); @@ -2479,13 +2295,13 @@ static void sub_809FC34(struct Pokemon *mon) ConvertInternationalString(gStringVar2, language); buffer = gStringVar1; - buffer = sub_80A1E58(buffer, 13); + buffer = SummaryScreen_SetTextColor(buffer, 13); buffer = StringCopy(buffer, gOtherText_OriginalTrainer); if (GetMonData(mon, MON_DATA_OT_GENDER) == MALE) - buffer = sub_80A1E58(buffer, 9); + buffer = SummaryScreen_SetTextColor(buffer, 9); else - buffer = sub_80A1E58(buffer, 10); + buffer = SummaryScreen_SetTextColor(buffer, 10); buffer = StringCopy(buffer, gStringVar2); buffer[0] = EXT_CTRL_CODE_BEGIN; @@ -2494,15 +2310,15 @@ static void sub_809FC34(struct Pokemon *mon) buffer[3] = EOS; Menu_PrintText(gStringVar1, 11, 4); - sub_80A1F98(GetMonData(mon, MON_DATA_OT_ID) & 0xFFFF, 13, 5, 2, 193, 32, 1); + SummaryScreen_PrintColoredIntPixelCoords(GetMonData(mon, MON_DATA_OT_ID) & 0xFFFF, 13, 5, 2, 193, 32, 1); species = GetMonData(mon, MON_DATA_SPECIES); - sub_80A198C(gBaseStats[species].type1, 120, 48, 0); + SummaryScreen_DrawTypeIcon(gBaseStats[species].type1, 120, 48, 0); if (gBaseStats[species].type1 != gBaseStats[species].type2) - sub_80A198C(gBaseStats[species].type2, 160, 48, 1); + SummaryScreen_DrawTypeIcon(gBaseStats[species].type2, 160, 48, 1); ability = GetAbilityBySpecies(GetMonData(mon, MON_DATA_SPECIES), GetMonData(mon, MON_DATA_ALT_ABILITY)); - sub_80A1FF8(gAbilityNames[ability], 13, 11, 9); + SummaryScreen_PrintColoredText(gAbilityNames[ability], 13, 11, 9); Menu_PrintText(gAbilityDescriptions[ability], 11, 11); PokemonSummaryScreen_PrintTrainerMemo(mon, 11, 14); @@ -2511,8 +2327,8 @@ static void sub_809FC34(struct Pokemon *mon) static void sub_809FE6C(struct Pokemon *mon) { - sub_809FC0C(); - sub_809FC34(mon); + SummaryScreen_PrintPokemonInfoLabels(); + SummaryScreen_PrintPokemonInfo(mon); } static void sub_809FE80(void) @@ -2523,21 +2339,21 @@ static void sub_809FE80(void) Menu_EraseWindowRect(11, 14, 28, 17); } -static void sub_809FEB8(void) +static void SummaryScreen_PrintPokemonSkillsLabels(void) { - sub_80A1FF8(gOtherText_ExpPoints, 13, 11, 14); - sub_80A1FF8(gOtherText_NextLv, 13, 11, 16); + SummaryScreen_PrintColoredText(gOtherText_ExpPoints, 13, 11, 14); + SummaryScreen_PrintColoredText(gOtherText_NextLv, 13, 11, 16); Menu_PrintText(gOtherText_Terminator18, 21, 16); - sub_80A1F48(gOtherText_HP, 13, 11, 7, 42); - sub_80A1F48(gOtherText_Attack, 13, 11, 9, 42); - sub_80A1F48(gOtherText_Defense, 13, 11, 11, 42); - sub_80A1F48(gOtherText_SpAtk, 13, 22, 7, 36); - sub_80A1F48(gOtherText_SpDef, 13, 22, 9, 36); - sub_80A1F48(gOtherText_Speed, 13, 22, 11, 36); + SummaryScreen_PrintColoredTextCentered(gOtherText_HP, 13, 11, 7, 42); + SummaryScreen_PrintColoredTextCentered(gOtherText_Attack, 13, 11, 9, 42); + SummaryScreen_PrintColoredTextCentered(gOtherText_Defense, 13, 11, 11, 42); + SummaryScreen_PrintColoredTextCentered(gOtherText_SpAtk, 13, 22, 7, 36); + SummaryScreen_PrintColoredTextCentered(gOtherText_SpDef, 13, 22, 9, 36); + SummaryScreen_PrintColoredTextCentered(gOtherText_Speed, 13, 22, 11, 36); } -static void sub_809FF64(struct Pokemon *mon) +static void SummaryScreen_PrintPokemonSkills(struct Pokemon *mon) { u8 i; u16 heldItem; @@ -2557,19 +2373,19 @@ static void sub_809FF64(struct Pokemon *mon) DrawExperienceProgressBar(mon, 23, 16); ConvertIntToDecimalString(buffer, GetMonData(mon, MON_DATA_ATK)); - sub_8072BD8(buffer, 16, 9, 50); + MenuPrint_Centered(buffer, 16, 9, 50); ConvertIntToDecimalString(buffer, GetMonData(mon, MON_DATA_DEF)); - sub_8072BD8(buffer, 16, 11, 50); + MenuPrint_Centered(buffer, 16, 11, 50); ConvertIntToDecimalString(buffer, GetMonData(mon, MON_DATA_SPATK)); - sub_8072BD8(buffer, 27, 7, 18); + MenuPrint_Centered(buffer, 27, 7, 18); ConvertIntToDecimalString(buffer, GetMonData(mon, MON_DATA_SPDEF)); - sub_8072BD8(buffer, 27, 9, 18); + MenuPrint_Centered(buffer, 27, 9, 18); ConvertIntToDecimalString(buffer, GetMonData(mon, MON_DATA_SPEED)); - sub_8072BD8(buffer, 27, 11, 18); + MenuPrint_Centered(buffer, 27, 11, 18); buffer = AlignInt1InMenuWindow(buffer, GetMonData(mon, MON_DATA_HP), 24, 1); *buffer++ = CHAR_SLASH; @@ -2580,8 +2396,8 @@ static void sub_809FF64(struct Pokemon *mon) static void sub_80A0090(struct Pokemon *mon) { - sub_809FEB8(); - sub_809FF64(mon); + SummaryScreen_PrintPokemonSkillsLabels(); + SummaryScreen_PrintPokemonSkills(mon); } static void sub_80A00A4(void) @@ -2600,13 +2416,13 @@ static void sub_80A00F4(u8 a) { if (pssData.page == PSS_PAGE_BATTLE_MOVES) { - sub_80A1FF8(gOtherText_Power2, 13, 1, 15); - sub_80A1FF8(gOtherText_Accuracy2, 13, 1, 17); + SummaryScreen_PrintColoredText(gOtherText_Power2, 13, 1, 15); + SummaryScreen_PrintColoredText(gOtherText_Accuracy2, 13, 1, 17); } else { - sub_80A1FF8(gOtherText_Appeal2, 13, 1, 15); - sub_80A1FF8(gOtherText_Jam2, 13, 1, 17); + SummaryScreen_PrintColoredText(gOtherText_Appeal2, 13, 1, 15); + SummaryScreen_PrintColoredText(gOtherText_Jam2, 13, 1, 17); } } } @@ -2628,18 +2444,18 @@ static void sub_80A015C(struct Pokemon *mon) if (move == 0) { sub_80A1918(i, 1); - sub_80A1FF8(gOtherText_OneDash, 13, 15, (2 * i) + 4); + SummaryScreen_PrintColoredText(gOtherText_OneDash, 13, 15, (2 * i) + 4); Menu_PrintText(gOtherText_TwoDashes, 26, (2 * i) + 4); } else { if (pssData.page == PSS_PAGE_BATTLE_MOVES) - sub_80A198C(gBattleMoves[move].type, 87, ((2 * i) + 4) * 8, i); + SummaryScreen_DrawTypeIcon(gBattleMoves[move].type, 87, ((2 * i) + 4) * 8, i); else - sub_80A198C(gContestMoves[move].contestCategory + 18, 87, ((2 * i) + 4) * 8, i); + SummaryScreen_DrawTypeIcon(gContestMoves[move].contestCategory + 18, 87, ((2 * i) + 4) * 8, i); - sub_80A1FF8(gMoveNames[move], 13, 15, (2 * i) + 4); - GetStringCenterAlignXOffset(1, 24, (2 * i) + 4); + SummaryScreen_PrintColoredText(gMoveNames[move], 13, 15, (2 * i) + 4); + SummaryScreen_PlaceTextTile_White(1, 24, (2 * i) + 4); ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES); maxPP = CalculatePPWithBonus(move, ppBonuses, i); @@ -2661,23 +2477,23 @@ static void sub_80A029C(struct Pokemon *mon) if (pssData.moveToLearn == 0) { - sub_80A1FF8(gOtherText_CancelNoTerminator, 13, 15, 12); + SummaryScreen_PrintColoredText(gOtherText_CancelNoTerminator, 13, 15, 12); return; } move = pssData.moveToLearn; if (pssData.page == PSS_PAGE_BATTLE_MOVES) - sub_80A198C(gBattleMoves[move].type, 87, 96, 4); + SummaryScreen_DrawTypeIcon(gBattleMoves[move].type, 87, 96, 4); else - sub_80A198C(gContestMoves[move].contestCategory + 18, 87, 96, 4); + SummaryScreen_DrawTypeIcon(gContestMoves[move].contestCategory + 18, 87, 96, 4); if (pssData.page == PSS_PAGE_BATTLE_MOVES) - sub_80A1FF8(gMoveNames[move], 10, 15, 12); + SummaryScreen_PrintColoredText(gMoveNames[move], 10, 15, 12); else - sub_80A1FF8(gMoveNames[move], 9, 15, 12); + SummaryScreen_PrintColoredText(gMoveNames[move], 9, 15, 12); - GetStringCenterAlignXOffset(1, 24, 12); + SummaryScreen_PlaceTextTile_White(1, 24, 12); buffer = gStringVar1; pp = gBattleMoves[move].pp; @@ -3031,13 +2847,13 @@ static void PokemonSummaryScreen_PrintTrainerMemo(struct Pokemon *mon, u8 left, u8 nature = GetNature(mon); #if ENGLISH - ptr = sub_80A1E9C(ptr, gNatureNames[nature], 14); + ptr = SummaryScreen_CopyColoredString(ptr, gNatureNames[nature], 14); if (nature != NATURE_BOLD && nature != NATURE_GENTLE) ptr = StringCopy(ptr, gOtherText_Terminator4); ptr = StringCopy(ptr, gOtherText_Nature); #elif GERMAN ptr = StringCopy(gStringVar4, gOtherText_Nature); - ptr = sub_80A1E9C(ptr, gNatureNames[nature], 14); + ptr = SummaryScreen_CopyColoredString(ptr, gNatureNames[nature], 14); ptr = StringCopy(ptr, gOtherText_Terminator4); #endif @@ -3052,7 +2868,7 @@ static void PokemonSummaryScreen_PrintTrainerMemo(struct Pokemon *mon, u8 left, ptr++; CopyLocationName(gStringVar1, locationMet); - ptr = sub_80A1E9C(ptr, gStringVar1, 14); + ptr = SummaryScreen_CopyColoredString(ptr, gStringVar1, 14); StringCopy(ptr, gOtherText_Egg2); } else if (locationMet >= 88) @@ -3071,7 +2887,7 @@ static void PokemonSummaryScreen_PrintTrainerMemo(struct Pokemon *mon, u8 left, ptr++; CopyLocationName(gStringVar1, locationMet); - ptr = sub_80A1E9C(ptr, gStringVar1, 14); + ptr = SummaryScreen_CopyColoredString(ptr, gStringVar1, 14); StringCopy(ptr, gOtherText_Met); } } @@ -3115,7 +2931,7 @@ static void PokemonSummaryScreen_PrintTrainerMemo(struct Pokemon *mon, u8 left, ptr++; CopyLocationName(gStringVar1, locationMet); - ptr = sub_80A1E9C(ptr, gStringVar1, 14); + ptr = SummaryScreen_CopyColoredString(ptr, gStringVar1, 14); StringCopy(ptr, gOtherText_Met2); } } @@ -3133,7 +2949,7 @@ static void sub_80A0958(struct Pokemon *mon) species = GetMonData(mon, MON_DATA_SPECIES); buffer = gStringVar1; - buffer = sub_80A1E58(buffer, 13); + buffer = SummaryScreen_SetTextColor(buffer, 13); buffer[0] = EXT_CTRL_CODE_BEGIN; buffer[1] = 0x11; buffer[2] = 0x7; @@ -3151,8 +2967,8 @@ static void sub_80A0958(struct Pokemon *mon) level = GetMonData(mon, MON_DATA_LEVEL); - buffer = sub_80A1E58(gStringVar1, 13); - buffer[0] = 0x34; + buffer = SummaryScreen_SetTextColor(gStringVar1, 13); + buffer[0] = CHAR_LV; buffer += 1; buffer = ConvertIntToDecimalString(buffer, level); @@ -3168,7 +2984,7 @@ static void sub_80A0958(struct Pokemon *mon) static void sub_80A0A2C(struct Pokemon *mon, u8 left, u8 top) { const u8 *genderSymbol; - u8 var1; + u8 color; u8 bottom; u16 species = GetMonData(mon, MON_DATA_SPECIES2); @@ -3183,21 +2999,22 @@ static void sub_80A0A2C(struct Pokemon *mon, u8 left, u8 top) return; case MON_MALE: genderSymbol = gOtherText_MaleSymbol2; - var1 = 11; + color = 11; break; case MON_FEMALE: - genderSymbol = gOtherText_FemaleSymbolAndLv; - var1 = 12; + genderSymbol = gOtherText_FemaleSymbol2; + color = 12; break; } - sub_80A1FF8(genderSymbol, var1, left, top); + SummaryScreen_PrintColoredText(genderSymbol, color, left, top); } } u8 GetNumRibbons(struct Pokemon *mon) { - u8 numRibbons = GetMonData(mon, MON_DATA_COOL_RIBBON); + u8 numRibbons = 0; + numRibbons += GetMonData(mon, MON_DATA_COOL_RIBBON); numRibbons += GetMonData(mon, MON_DATA_BEAUTY_RIBBON); numRibbons += GetMonData(mon, MON_DATA_CUTE_RIBBON); numRibbons += GetMonData(mon, MON_DATA_SMART_RIBBON); @@ -3308,12 +3125,11 @@ static void DrawExperienceProgressBar(struct Pokemon *mon, u8 left, u8 top) for (i = 0; i < 8; i++) { u16 tile; - u16 baseTile = 0x2062; - if (numExpProgressBarTicks > 7) - tile = 0x206A; // full exp. bar block + if (numExpProgressBarTicks >= 8) + tile = 0x2062 + 8; // full exp. bar block else - tile = (numExpProgressBarTicks % 8) + baseTile; + tile = 0x2062 + (numExpProgressBarTicks % 8); vramAddr[i] = tile; @@ -3336,7 +3152,7 @@ static void PrintSummaryWindowHeaderText(void) buffer[2] = 0x2; buffer += 3; - buffer = sub_80A1E58(buffer, 13); + buffer = SummaryScreen_SetTextColor(buffer, 13); buffer = StringCopy(buffer, sPageHeaderTexts[pssData.headerTextId]); buffer[0] = EXT_CTRL_CODE_BEGIN; @@ -3348,8 +3164,8 @@ static void PrintSummaryWindowHeaderText(void) if (pssData.headerActionTextId != 0) { - GetStringCenterAlignXOffset(5, 23, 0); - GetStringCenterAlignXOffset(6, 24, 0); + SummaryScreen_PlaceTextTile_White(5, 23, 0); + SummaryScreen_PlaceTextTile_White(6, 24, 0); } else { @@ -3357,7 +3173,7 @@ static void PrintSummaryWindowHeaderText(void) } buffer = gStringVar1; - buffer = sub_80A1E58(buffer, 13); + buffer = SummaryScreen_SetTextColor(buffer, 13); buffer = StringCopy(buffer, sPageHeaderTexts[pssData.headerActionTextId]); buffer[0] = EXT_CTRL_CODE_BEGIN; @@ -3935,7 +3751,7 @@ _080A1286:\n\ movs r1, 0xD\n\ movs r2, 0x1\n\ movs r3, 0x12\n\ - bl sub_80A1FF8\n\ + bl SummaryScreen_PrintColoredText\n\ _080A129A:\n\ bl sub_80A1D18\n\ mov r0, r8\n\ @@ -4026,7 +3842,7 @@ static void sub_80A12D0(s8 a) // if (GetMonStatusAndPokerus(pssData.loadedMon)) // { -// sub_80A1FF8(gOtherText_Status, 13, 1, 18); +// SummaryScreen_PrintColoredText(gOtherText_Status, 13, 1, 18); // } // DestroyTask(taskId); @@ -4179,7 +3995,7 @@ _080A1410:\n\ movs r1, 0xD\n\ movs r2, 0x1\n\ movs r3, 0x12\n\ - bl sub_80A1FF8\n\ + bl SummaryScreen_PrintColoredText\n\ _080A1444:\n\ mov r0, r10\n\ bl DestroyTask\n\ @@ -4375,7 +4191,7 @@ _080A15DC:\n\ movs r1, 0xD\n\ movs r2, 0x1\n\ movs r3, 0x12\n\ - bl sub_80A1FF8\n\ + bl SummaryScreen_PrintColoredText\n\ _080A1610:\n\ mov r0, r10\n\ bl DestroyTask\n\ @@ -4652,7 +4468,7 @@ _080A1804: .4byte gUnknown_08E94550\n\ } #endif // NONMATCHING -u8 sub_80A1808(struct Pokemon *mon) +u8 SummaryScreen_CreatePokemonSprite(struct Pokemon *mon) { u16 species; u8 spriteId; @@ -4663,7 +4479,7 @@ u8 sub_80A1808(struct Pokemon *mon) FreeSpriteOamMatrix(&gSprites[spriteId]); gSprites[spriteId].data[0] = species; - gSprites[spriteId].callback = sub_80A1888; + gSprites[spriteId].callback = SummaryScreen_SpritePlayCry; if (!IsPokeSpriteNotFlipped(species)) gSprites[spriteId].hFlip = TRUE; @@ -4673,7 +4489,7 @@ u8 sub_80A1808(struct Pokemon *mon) return spriteId; } -static void sub_80A1888(struct Sprite *sprite) +static void SummaryScreen_SpritePlayCry(struct Sprite *sprite) { if (!gPaletteFade.active) { @@ -4719,7 +4535,7 @@ static void sub_80A1950(void) } } -static void sub_80A198C(u8 animNum, u8 x, u8 y, u8 d) +static void SummaryScreen_DrawTypeIcon(u8 animNum, u8 x, u8 y, u8 d) { StartSpriteAnim(&gSprites[ewram1A000[d]], animNum); @@ -4860,7 +4676,7 @@ void sub_80A1D18(void) u8 statusAndPkrs; u8 statusAndPkrs2; - sub_809F678(&mon); + SummaryScreen_GetPokemon(&mon); statusAndPkrs = GetMonStatusAndPokerus(&mon); if (statusAndPkrs) @@ -4886,7 +4702,7 @@ void sub_80A1D18(void) push {r4,r5,lr}\n\ sub sp, 0x64\n\ mov r0, sp\n\ - bl sub_809F678\n\ + bl SummaryScreen_GetPokemon\n\ mov r0, sp\n\ bl GetMonStatusAndPokerus\n\ lsls r0, 24\n\ @@ -4940,7 +4756,7 @@ static void sub_80A1D84(struct Pokemon *mon) { struct Sprite *sprite; - sprite = sub_80F7920(0x7533, 0x7533, sSummaryScreenMonMarkingsPalette); + sprite = sub_80F7920(30003, 30003, sSummaryScreenMonMarkingsPalette); gUnknown_020384F4 = sprite; if (sprite != NULL) @@ -4969,20 +4785,20 @@ static void sub_80A1DE8(struct Pokemon *mon) gSprites[pssData.ballSpriteId].oam.priority = 3; } -static u8 *sub_80A1E58(u8 *text, u8 id) +static u8 *SummaryScreen_SetTextColor(u8 *text, u8 id) { if (id != 0xFF) { - const u8 *ptr = sUnknown_083C15BC; + const struct TextColors *colors = sSummaryScreenTextColors; - while (*ptr != 0xFF && *ptr != id) - ptr += 4; + while (colors->id != 0xFF && colors->id != id) + colors++; text[0] = EXT_CTRL_CODE_BEGIN; - text[1] = 4; - text[2] = ptr[1]; - text[3] = ptr[2]; - text[4] = ptr[3]; + text[1] = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW; + text[2] = colors->color; + text[3] = colors->background; + text[4] = colors->shadow; text += 5; } @@ -4990,22 +4806,22 @@ static u8 *sub_80A1E58(u8 *text, u8 id) return text; } -u8 *sub_80A1E9C(u8 *dest, const u8 *src, u8 id) +static u8 *SummaryScreen_CopyColoredString(u8 *dest, const u8 *src, u8 id) { - u8 arr[3]; + u8 colors[3]; - Menu_GetTextColors(&arr[0], &arr[1], &arr[2]); + Menu_GetTextColors(&colors[0], &colors[1], &colors[2]); - dest = sub_80A1E58(dest, id); + dest = SummaryScreen_SetTextColor(dest, id); dest = StringCopy(dest, src); if (id != 0xFF) { dest[0] = EXT_CTRL_CODE_BEGIN; - dest[1] = 4; - dest[2] = arr[0]; - dest[3] = arr[1]; - dest[4] = arr[2]; + dest[1] = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW; + dest[2] = colors[0]; + dest[3] = colors[1]; + dest[4] = colors[2]; dest[5] = 0xFF; dest += 5; @@ -5014,27 +4830,27 @@ u8 *sub_80A1E9C(u8 *dest, const u8 *src, u8 id) return dest; } -static void sub_80A1EF8(const u8 *text, u8 id, u8 left, u16 top, s32 e) +static void SummaryScreen_PrintColoredTextPixelCoords(const u8 *text, u8 id, u8 left, u16 top, s32 e) { - sub_80A1E9C(gStringVar4, text, id); + SummaryScreen_CopyColoredString(gStringVar4, text, id); Menu_PrintTextPixelCoords(gStringVar4, left, top, (bool8)e); } -static void sub_80A1F48(const u8 *text, u8 id, u8 c, u8 d, u16 e) +static void SummaryScreen_PrintColoredTextCentered(const u8 *text, u8 id, u8 left, u8 top, u16 width) { - sub_80A1E9C(gStringVar4, text, id); - sub_8072BD8(gStringVar4, c, d, e); + SummaryScreen_CopyColoredString(gStringVar4, text, id); + MenuPrint_Centered(gStringVar4, left, top, width); } -static void sub_80A1F98(s32 value, u8 id, u8 n, u8 mode, u8 left, u16 top, s32 e) +static void SummaryScreen_PrintColoredIntPixelCoords(s32 value, u8 id, u8 n, u8 mode, u8 left, u16 top, s32 e) { ConvertIntToDecimalStringN(gStringVar1, value, mode, n); - sub_80A1EF8(gStringVar1, id, left, top, e); + SummaryScreen_PrintColoredTextPixelCoords(gStringVar1, id, left, top, e); } -static void sub_80A1FF8(const u8 *text, u8 id, u8 left, u8 top) +static void SummaryScreen_PrintColoredText(const u8 *text, u8 id, u8 left, u8 top) { - sub_80A1E9C(gStringVar4, text, id); + SummaryScreen_CopyColoredString(gStringVar4, text, id); Menu_PrintText(gStringVar4, left, top); } @@ -5042,14 +4858,13 @@ u8 *PokemonSummaryScreen_CopyPokemonLevel(u8 *dest, u8 level) { u8 buffer[12]; - dest[0] = 0x34; - dest++; + *dest++ = CHAR_LV; if (level == 0) level = 5; ConvertIntToDecimalString(buffer, level); - dest = sub_80A1E9C(dest, buffer, 14); + dest = SummaryScreen_CopyColoredString(dest, buffer, 14); dest = StringCopy(dest, gOtherText_Comma); return dest; diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index 00ce3d8df..e81d02251 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -760,18 +760,18 @@ void sub_807867C(struct Sprite *sprite, s16 a2) } } -void InitAnimSpriteTranslationOverDuration(struct Sprite *sprite) +void InitAnimArcTranslation(struct Sprite *sprite) { sprite->data[1] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); sprite->data[6] = 0x8000 / sprite->data[0]; sprite->data[7] = 0; } -bool8 TranslateAnimSpriteLinearAndSine(struct Sprite *sprite) +bool8 TranslateAnimArc(struct Sprite *sprite) { - if (TranslateAnimSpriteByDeltas(sprite)) + if (TranslateAnimLinear(sprite)) return TRUE; sprite->data[7] += sprite->data[6]; sprite->pos2.y += Sin((u8)(sprite->data[7] >> 8), sprite->data[5]); @@ -951,7 +951,7 @@ void InitSpriteDataForLinearTranslation(struct Sprite *sprite) sprite->data[3] = 0; } -void InitAnimSpriteTranslationDeltas(struct Sprite *sprite) +void InitAnimLinearTranslation(struct Sprite *sprite) { int x = sprite->data[2] - sprite->data[1]; int y = sprite->data[4] - sprite->data[3]; @@ -979,16 +979,16 @@ void InitAnimSpriteTranslationDeltas(struct Sprite *sprite) sprite->data[3] = 0; } -void StartTranslateAnimSpriteByDeltas(struct Sprite *sprite) +void StartAnimLinearTranslation(struct Sprite *sprite) { sprite->data[1] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; - InitAnimSpriteTranslationDeltas(sprite); - sprite->callback = TranslateAnimSpriteByDeltasUntil; + InitAnimLinearTranslation(sprite); + sprite->callback = TranslateAnimLinearUntil; sprite->callback(sprite); } -bool8 TranslateAnimSpriteByDeltas(struct Sprite *sprite) +bool8 TranslateAnimLinear(struct Sprite *sprite) { u16 v1, v2, x, y; @@ -1018,9 +1018,9 @@ bool8 TranslateAnimSpriteByDeltas(struct Sprite *sprite) return FALSE; } -void TranslateAnimSpriteByDeltasUntil(struct Sprite *sprite) +void TranslateAnimLinearUntil(struct Sprite *sprite) { - if (TranslateAnimSpriteByDeltas(sprite)) + if (TranslateAnimLinear(sprite)) SetCallbackToStoredInData(sprite); } @@ -1028,7 +1028,7 @@ void sub_8078BD4(struct Sprite *sprite) { int v1 = abs(sprite->data[2] - sprite->data[1]) << 8; sprite->data[0] = v1 / sprite->data[0]; - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); } void sub_8078C00(struct Sprite *sprite) @@ -1036,7 +1036,7 @@ void sub_8078C00(struct Sprite *sprite) sprite->data[1] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; sub_8078BD4(sprite); - sprite->callback = TranslateAnimSpriteByDeltasUntil; + sprite->callback = TranslateAnimLinearUntil; sprite->callback(sprite); } @@ -1420,7 +1420,7 @@ void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite) sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, v2) + gBattleAnimArgs[3]; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } @@ -1433,13 +1433,13 @@ void sub_80794A8(struct Sprite *sprite) sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[5]; - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); sprite->callback = sub_8079518; } void sub_8079518(struct Sprite *sprite) { - if (TranslateAnimSpriteLinearAndSine(sprite)) + if (TranslateAnimArc(sprite)) DestroyAnimSprite(sprite); } @@ -1473,7 +1473,7 @@ void sub_8079534(struct Sprite *sprite) sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = GetBattlerSpriteCoord(slot, 2) + gBattleAnimArgs[2]; sprite->data[4] = GetBattlerSpriteCoord(slot, r7) + gBattleAnimArgs[3]; - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } @@ -2351,6 +2351,6 @@ void sub_807A9BC(struct Sprite *sprite) sprite->pos1.x += x; sprite->pos1.y = gBattleAnimArgs[5] - 80; } - sprite->callback = StartTranslateAnimSpriteByDeltas; + sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c index b292265a6..87ef2517b 100644 --- a/src/script_pokemon_util_80F99CC.c +++ b/src/script_pokemon_util_80F99CC.c @@ -19,7 +19,7 @@ #include "text.h" #include "ewram.h" -extern const u8 gUnknown_08208238[]; +extern const u8 gPPUpReadMasks[]; extern u8 gPlayerPartyCount; extern u16 gSpecialVar_0x8004; @@ -307,11 +307,11 @@ void sub_80F9FDC(struct Pokemon *pkmn, u8 moveIndex1, u8 moveIndex2) u8 pp2 = GetMonData(pkmn, MON_DATA_PP1 + moveIndex2); u8 bonuses = GetMonData(pkmn, MON_DATA_PP_BONUSES); - u8 r2 = (bonuses & gUnknown_08208238[moveIndex1]) >> (moveIndex1 * 2); - u8 r1 = (bonuses & gUnknown_08208238[moveIndex2]) >> (moveIndex2 * 2); + u8 r2 = (bonuses & gPPUpReadMasks[moveIndex1]) >> (moveIndex1 * 2); + u8 r1 = (bonuses & gPPUpReadMasks[moveIndex2]) >> (moveIndex2 * 2); - bonuses &= ~gUnknown_08208238[moveIndex1]; - bonuses &= ~gUnknown_08208238[moveIndex2]; + bonuses &= ~gPPUpReadMasks[moveIndex1]; + bonuses &= ~gPPUpReadMasks[moveIndex2]; bonuses |= (r2 << (moveIndex2 * 2)) + (r1 << (moveIndex1 * 2)); SetMonData(pkmn, MON_DATA_MOVE1 + moveIndex1, &move2); diff --git a/src/strings.c b/src/strings.c index cded04f96..e9d9ea87e 100644 --- a/src/strings.c +++ b/src/strings.c @@ -2,6 +2,7 @@ #include "strings.h" #if ENGLISH + // placeholder strings const u8 gExpandedPlaceholder_Empty[] = _(""); const u8 gExpandedPlaceholder_Kun[] = _(""); @@ -180,7 +181,8 @@ const u8 gOtherText_OneDash[] = _("-"); const u8 gOtherText_TwoDashes[] = _("--"); const u8 gOtherText_ThreeDashes2[] = _("---"); const u8 gOtherText_MaleSymbol2[] = _("♂"); -const u8 gOtherText_FemaleSymbolAndLv[] = _("♀$Lv."); +const u8 gOtherText_FemaleSymbol2[] = _("♀"); +const u8 gOtherText_Lv[] = _("Lv."); const u8 gOtherText_TallPlusAndRightArrow[] = _("{TALL_PLUS}${RIGHT_ARROW}"); const u8 gMenuText_GoBackToPrev[] = _("Go back to the\nprevious menu."); const u8 gOtherText_WhatWillYouDo[] = _("What would you like to do?"); @@ -926,6 +928,7 @@ const u8 gSystemText_SaveFailed[] = _("Save failed..."); const u8 gSystemText_NoSaveFileNoTime[] = _("There is no save file, so the time\ncan’t be set."); const u8 gSystemText_ClockAdjustmentUsable[] = _("The in-game clock adjustment system\nis now useable."); const u8 gSystemText_Saving[] = _("SAVING...\nDON’T TURN OFF THE POWER."); + #elif GERMAN // placeholder strings @@ -1106,7 +1109,8 @@ const u8 gOtherText_OneDash[] = _("-"); const u8 gOtherText_TwoDashes[] = _("--"); const u8 gOtherText_ThreeDashes2[] = _("---"); const u8 gOtherText_MaleSymbol2[] = _("♂"); -const u8 gOtherText_FemaleSymbolAndLv[] = _("♀$Lv."); +const u8 gOtherText_FemaleSymbol2[] = _("♀"); +const u8 gOtherText_Lv[] = _("Lv."); const u8 gOtherText_TallPlusAndRightArrow[] = _("{TALL_PLUS}${RIGHT_ARROW}"); const u8 gMenuText_GoBackToPrev[] = _("Kehre zurück zum\nvorherigen Menü."); const u8 gOtherText_WhatWillYouDo[] = _("Was möchtest du tun?"); diff --git a/src/text.c b/src/text.c index c2f78276b..dbf74ab61 100644 --- a/src/text.c +++ b/src/text.c @@ -2003,7 +2003,7 @@ void Text_InitWindow8002E4C(struct Window *win, const u8 *text, u16 tileDataStar if (a6) val = 255; win->win_field_F = val; - if (val) + if (win->win_field_F) ClipLeft(win); } @@ -3394,7 +3394,7 @@ static u16 GetBlankTileNum(struct Window *win) return retVal; } -static s32 sub_80048D8(struct Window *win, u8 x, u8 y) +static s32 Window_MoveCursor(struct Window *win, u8 x, u8 y) { win->cursorX = x; win->cursorY = y & 0xF8; @@ -3672,25 +3672,26 @@ u8 Text_InitWindow8004D04(struct Window *win, const u8 *text, u16 tileDataStartO return Text_PrintWindow8002F44(win); } -u8 Text_InitWindow8004D38(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top) +u8 Text_InitWindow_RightAligned(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 right, u8 top) { u8 width = GetStringWidth(win, text); - Text_InitWindow(win, text, tileDataStartOffset, left - ((u32)(width + 7) >> 3), top); + Text_InitWindow(win, text, tileDataStartOffset, right - ((u32)(width + 7) >> 3), top); EraseAtCursor(win); width &= 7; if (width) width = 8 - width; - sub_80048D8(win, width, 0); + Window_MoveCursor(win, width, 0); return Text_PrintWindow8002F44(win); } -u8 Text_InitWindow8004DB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top, u16 a6) +u8 Text_InitWindow_Centered(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top, u16 width) { - register u32 val asm("r5") = (u8)((a6 >> 1) - (GetStringWidth(win, text) >> 1)); - left += (val >> 3); + width = (u8)(width / 2 - GetStringWidth(win, text) / 2); + left += (u8)width / 8; Text_InitWindow(win, text, tileDataStartOffset, left, top); EraseAtCursor(win); - sub_80048D8(win, val & 7, 0); + width &= 7; + Window_MoveCursor(win, width, 0); return Text_PrintWindow8002F44(win); } |