diff options
author | garak <garakmon@gmail.com> | 2018-12-17 23:34:16 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-17 23:34:16 -0500 |
commit | 2fb6c5bb7f81c285d973d602dbbe4bbf8fc8aba1 (patch) | |
tree | 003c2daccebd740c288e537216afed0265bfbc59 /src | |
parent | 32c7ec313deaccb4e3dcef5f9da7d9062d09fc27 (diff) | |
parent | 5f202c744b92dcde829c1d24ad323d824c769fec (diff) |
Merge branch 'master' into createsprite
Diffstat (limited to 'src')
143 files changed, 1943 insertions, 1939 deletions
diff --git a/src/battle/anim/alert.c b/src/battle/anim/alert.c index f0d437627..13bdd997d 100644 --- a/src/battle/anim/alert.c +++ b/src/battle/anim/alert.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CF610(struct Sprite* sprite); @@ -47,7 +47,7 @@ void sub_80CF610(struct Sprite* sprite) sub_8078650(sprite); sub_807867C(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; - if (GetBattlerSide(gAnimBankAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != 0) { sprite->hFlip = 1; if (gBattleAnimArgs[2] != 0) diff --git a/src/battle/anim/angel.c b/src/battle/anim/angel.c index 4121e3c70..787691e6d 100644 --- a/src/battle/anim/angel.c +++ b/src/battle/anim/angel.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D2938(struct Sprite* sprite); diff --git a/src/battle/anim/angel_kiss.c b/src/battle/anim/angel_kiss.c index 1b395fded..e38c6f388 100644 --- a/src/battle/anim/angel_kiss.c +++ b/src/battle/anim/angel_kiss.c @@ -6,8 +6,8 @@ #include "random.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D2A38(struct Sprite* sprite); diff --git a/src/battle/anim/anger.c b/src/battle/anim/anger.c index 7abe53ab8..6ed40ad3c 100644 --- a/src/battle/anim/anger.c +++ b/src/battle/anim/anger.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D09C0(struct Sprite* sprite); @@ -40,9 +40,9 @@ void sub_80D09C0(struct Sprite* sprite) { u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; else - bank = gAnimBankTarget; + bank = gBattleAnimTarget; if (GetBattlerSide(bank) == 1) { diff --git a/src/battle/anim/aurora.c b/src/battle/anim/aurora.c index ed41e9e79..b6f446de4 100644 --- a/src/battle/anim/aurora.c +++ b/src/battle/anim/aurora.c @@ -6,8 +6,8 @@ #include "task.h" extern s16 gBattleAnimArgs[8]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void AnimAuroraRings(struct Sprite *sprite); static void AnimGrowAuroraRings(struct Sprite *); @@ -66,15 +66,15 @@ void AnimAuroraRings(struct Sprite *sprite) s16 r6; InitAnimSpritePos(sprite, 1); - if (GetBattlerSide(gAnimBankAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != 0) r6 = -gBattleAnimArgs[2]; else r6 = gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + r6; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + r6; sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; InitAnimLinearTranslation(sprite); sprite->callback = AnimGrowAuroraRings; sprite->affineAnimPaused = TRUE; diff --git a/src/battle/anim/beta_beat_up.c b/src/battle/anim/beta_beat_up.c index bc70b705c..5671755b8 100644 --- a/src/battle/anim/beta_beat_up.c +++ b/src/battle/anim/beta_beat_up.c @@ -4,8 +4,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[8]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D6234(struct Sprite *sprite); static void sub_80D6278(struct Sprite *); @@ -38,7 +38,7 @@ const struct SpriteTemplate gSpriteTemplate_83D980C = void sub_80D6234(struct Sprite *sprite) { - if (GetBattlerSide(gAnimBankAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != 0) { sprite->pos1.x -= gBattleAnimArgs[0]; } diff --git a/src/battle/anim/blow_kiss.c b/src/battle/anim/blow_kiss.c index d66e4aade..f1baef38a 100644 --- a/src/battle/anim/blow_kiss.c +++ b/src/battle/anim/blow_kiss.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D1F58(struct Sprite* sprite); static void sub_80D1FA4(struct Sprite* sprite); @@ -30,9 +30,9 @@ void sub_80D1F58(struct Sprite* sprite) InitAnimSpritePos(sprite, 1); sprite->data[0] = 0x5F; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); InitAnimLinearTranslation(sprite); sprite->callback = sub_80D1FA4; } diff --git a/src/battle/anim/bottle.c b/src/battle/anim/bottle.c index c5b43d7bc..13a3d538e 100644 --- a/src/battle/anim/bottle.c +++ b/src/battle/anim/bottle.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CCF04(struct Sprite* sprite); static void sub_80CCF70(struct Sprite* sprite); @@ -50,8 +50,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6C48 = void sub_80CCF04(struct Sprite* sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + 0xFFE8; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + 0xFFE8; sprite->data[0] = 0; sprite->data[1] = 0; sprite->data[2] = 0; diff --git a/src/battle/anim/brace.c b/src/battle/anim/brace.c index acf31e121..b57a2596e 100644 --- a/src/battle/anim/brace.c +++ b/src/battle/anim/brace.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CDF0C(struct Sprite* sprite); static void sub_80CDF70(struct Sprite* sprite); @@ -43,13 +43,13 @@ void sub_80CDF0C(struct Sprite* sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[2]; } else { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[2]; } sprite->data[0] = 0; diff --git a/src/battle/anim/breath.c b/src/battle/anim/breath.c index b55ff729e..d79cdcf77 100644 --- a/src/battle/anim/breath.c +++ b/src/battle/anim/breath.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D0930(struct Sprite* sprite); @@ -50,20 +50,20 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7764 = void sub_80D0930(struct Sprite* sprite) { - if (GetBattlerSide(gAnimBankAttacker) == 0) + if (GetBattlerSide(gBattleAnimAttacker) == 0) { StartSpriteAnim(sprite, 0); - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + 32; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + 32; sprite->data[1] = 0x40; } else { StartSpriteAnim(sprite, 1); - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) - 32; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) - 32; sprite->data[1] = -0x40; } - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[0] = 0x34; sprite->data[2] = 0; sprite->data[3] = 0; diff --git a/src/battle/anim/bubble.c b/src/battle/anim/bubble.c index 9caf4d918..1870b786d 100644 --- a/src/battle/anim/bubble.c +++ b/src/battle/anim/bubble.c @@ -5,8 +5,8 @@ #include "util.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D31C8(struct Sprite* sprite); static void sub_80D32E8(struct Sprite *sprite); @@ -56,29 +56,29 @@ void sub_80D31C8(struct Sprite* sprite) { u8 newSpriteId; - if (GetBattlerSide(gAnimBankAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) - gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) - gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[1]; } else { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[1]; } sprite->animPaused = 1; - if (GetBattlerSide(gAnimBankAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != 0) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sprite->data[0] = gBattleAnimArgs[6]; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); InitAnimLinearTranslation(sprite); diff --git a/src/battle/anim/bug.c b/src/battle/anim/bug.c index b9429a75a..65b45b6cc 100644 --- a/src/battle/anim/bug.c +++ b/src/battle/anim/bug.c @@ -5,8 +5,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80DC824(struct Sprite *sprite); void sub_80DC8F4(struct Sprite *sprite); @@ -208,7 +208,7 @@ void sub_80DC824(struct Sprite *sprite) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[0] = -gBattleAnimArgs[0]; } - else if (!GetBattlerSide(gAnimBankTarget)) + else if (!GetBattlerSide(gBattleAnimTarget)) { StartSpriteAffineAnim(sprite, 1); gBattleAnimArgs[1] = -gBattleAnimArgs[1]; @@ -217,12 +217,12 @@ void sub_80DC824(struct Sprite *sprite) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; } - sprite->pos1.x = sub_8077EE4(gAnimBankTarget, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 3) + gBattleAnimArgs[1]; + sprite->pos1.x = sub_8077EE4(gBattleAnimTarget, 2) + gBattleAnimArgs[0]; + sprite->pos1.y = sub_8077EE4(gBattleAnimTarget, 3) + gBattleAnimArgs[1]; sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); @@ -236,18 +236,18 @@ void sub_80DC8F4(struct Sprite *sprite) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; StartSpriteAffineAnim(sprite, 2); } - else if (!GetBattlerSide(gAnimBankTarget)) + else if (!GetBattlerSide(gBattleAnimTarget)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; gBattleAnimArgs[0] = -gBattleAnimArgs[0]; } - sprite->pos1.x = sub_8077EE4(gAnimBankTarget, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 3) + gBattleAnimArgs[1]; + sprite->pos1.x = sub_8077EE4(gBattleAnimTarget, 2) + gBattleAnimArgs[0]; + sprite->pos1.y = sub_8077EE4(gBattleAnimTarget, 3) + gBattleAnimArgs[1]; sprite->data[0] = gBattleAnimArgs[2]; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); @@ -267,12 +267,12 @@ void sub_80DC9A0(struct Sprite *sprite) if (!gBattleAnimArgs[4]) { - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); } else { - SetAverageBattlerPositions(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]); + SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->data[2], &sprite->data[4]); } sub_8078BD4(sprite); @@ -295,14 +295,14 @@ static void sub_80DCA38(struct Sprite *sprite) // used in Move_STRING_SHOT void sub_80DCA70(struct Sprite *sprite) { - SetAverageBattlerPositions(gAnimBankTarget, 0, &sprite->pos1.x, &sprite->pos1.y); - if (GetBattlerSide(gAnimBankAttacker)) + SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y); + if (GetBattlerSide(gBattleAnimAttacker)) sprite->pos1.x -= gBattleAnimArgs[0]; else sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; - if (!GetBattlerSide(gAnimBankTarget)) + if (!GetBattlerSide(gBattleAnimTarget)) sprite->pos1.y += 8; sprite->callback = sub_80DCAEC; @@ -377,7 +377,7 @@ void AnimTranslateStinger(struct Sprite *sprite) } else { - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[1] = -gBattleAnimArgs[1]; @@ -387,9 +387,9 @@ void AnimTranslateStinger(struct Sprite *sprite) if (!IsContest()) { - if (GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget)) + if (GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget)) { - if (GetBattlerPosition(gAnimBankTarget) == 0 || GetBattlerPosition(gAnimBankTarget) == 1) + if (GetBattlerPosition(gBattleAnimTarget) == 0 || GetBattlerPosition(gBattleAnimTarget) == 1) { s16 temp1, temp2; @@ -404,8 +404,8 @@ void AnimTranslateStinger(struct Sprite *sprite) InitAnimSpritePos(sprite, 1); - lVarX = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; - lVarY = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; + lVarX = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; + lVarY = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; rot = ArcTan2Neg(lVarX - sprite->pos1.x, lVarY - sprite->pos1.y); rot += 0xC000; sub_8078FDC(sprite, FALSE, 0x100, 0x100, rot); @@ -431,12 +431,12 @@ void AnimMissileArc(struct Sprite *sprite) { InitAnimSpritePos(sprite, 1); - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[5]; InitAnimArcTranslation(sprite); @@ -485,13 +485,13 @@ void sub_80DCE40(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + 18; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + 18; } else { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + 18; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + 18; } StoreSpriteCallbackInData(sprite, move_anim_8074EE0); diff --git a/src/battle/anim/bullet.c b/src/battle/anim/bullet.c index a47cfeccc..043e70563 100644 --- a/src/battle/anim/bullet.c +++ b/src/battle/anim/bullet.c @@ -6,8 +6,8 @@ #include "random.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CFFD8(struct Sprite* sprite); static void sub_80D0030(struct Sprite* sprite); @@ -42,8 +42,8 @@ void sub_80CFFD8(struct Sprite* sprite) { InitAnimSpritePos(sprite, 1); sprite->data[0] = 20; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sprite->callback = StartAnimLinearTranslation; sprite->affineAnimPaused = 1; StoreSpriteCallbackInData(sprite, sub_80D0030); diff --git a/src/battle/anim/copy_orb.c b/src/battle/anim/copy_orb.c index da42814fa..9d078f440 100644 --- a/src/battle/anim/copy_orb.c +++ b/src/battle/anim/copy_orb.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern const union AnimCmd *const gSpriteAnimTable_83D62D4[]; @@ -47,14 +47,14 @@ void sub_80CB4CC(struct Sprite* sprite) { case 0: { - if (GetBattlerSide(gAnimBankTarget) == 0) + if (GetBattlerSide(gBattleAnimTarget) == 0) { s16 a = gBattleAnimArgs[0]; gBattleAnimArgs[0] = -a; } - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[1]; sprite->invisible = 1; sprite->data[0]++; break; @@ -66,8 +66,8 @@ void sub_80CB4CC(struct Sprite* sprite) { ChangeSpriteAffineAnim(sprite, 1); sprite->data[0] = 25; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->callback = sub_8078CC0; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); break; diff --git a/src/battle/anim/cube.c b/src/battle/anim/cube.c index 5dd83c4bd..e807002b4 100644 --- a/src/battle/anim/cube.c +++ b/src/battle/anim/cube.c @@ -6,8 +6,8 @@ #include "constants/songs.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CDFB0(struct Sprite* sprite); static void sub_80CE000(struct Sprite* sprite); @@ -52,8 +52,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6EF0 = void sub_80CDFB0(struct Sprite* sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) - 12; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) - 12; sprite->data[0] = 0; sprite->data[1] = 2; sprite->data[2] = 0; diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c index 8547e9565..8621ca523 100644 --- a/src/battle/anim/current.c +++ b/src/battle/anim/current.c @@ -8,8 +8,8 @@ #include "constants/songs.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u8 gAnimVisualTaskCount; extern const struct SpriteTemplate gBattleAnimSpriteTemplate_83D97D0; @@ -362,9 +362,9 @@ void sub_80D648C(struct Sprite *sprite) sprite->data[0] = gBattleAnimArgs[3]; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); InitAnimLinearTranslation(sprite); sprite->data[5] = gBattleAnimArgs[2]; @@ -411,11 +411,11 @@ static void sub_80D658C(struct Sprite *sprite) void sub_80D65DC(struct Sprite *sprite) { - if (!gMain.inBattle || GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER) + if (!gMain.inBattle || GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) gBattleAnimArgs[1] = -gBattleAnimArgs[1]; - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[2]; sprite->data[3] = gBattleAnimArgs[0]; sprite->data[4] = gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[3]; @@ -428,9 +428,9 @@ void sub_80D6658(struct Sprite *sprite) sprite->data[0] = gBattleAnimArgs[3]; if (gBattleAnimArgs[7] & 0x8000) - bank = gAnimBankTarget; + bank = gBattleAnimTarget; else - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; if (!gMain.inBattle || GetBattlerSide(bank) == B_SIDE_PLAYER) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; @@ -478,8 +478,8 @@ void sub_80D679C(struct Sprite *sprite) void sub_80D681C(u8 taskId) { - gTasks[taskId].data[0] = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[0]; - gTasks[taskId].data[1] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[1]; + gTasks[taskId].data[0] = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[0]; + gTasks[taskId].data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[1]; gTasks[taskId].data[2] = gBattleAnimArgs[2]; gTasks[taskId].func = sub_80D6874; } @@ -813,13 +813,13 @@ void sub_80D6B3C(u8 taskId) if (gBattleAnimArgs[0] == 0) { - task->data[14] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - task->data[15] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + task->data[14] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + task->data[15] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); } else { - task->data[14] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - task->data[15] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + task->data[14] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + task->data[15] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); } task->data[6] = gBattleAnimArgs[1]; @@ -904,13 +904,13 @@ void sub_80D6D18(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); } else { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); } StoreSpriteCallbackInData(sprite, move_anim_8074EE0); @@ -921,13 +921,13 @@ void sub_80D6D70(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); } else { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); } sprite->pos2.x = gBattleAnimArgs[1]; @@ -939,12 +939,12 @@ void sub_80D6D70(struct Sprite *sprite) void sub_80D6DD8(struct Sprite *sprite) { StartSpriteAffineAnim(sprite, 1); - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[6] = GetAnimBattlerSpriteId(0); sprite->data[7] = 16; - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT) + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) sprite->data[7] *= -1; sprite->callback = sub_80D6E38; @@ -977,8 +977,8 @@ void sub_80D6E9C(u8 taskId) { case 0: task->data[15] = GetAnimBattlerSpriteId(0); - task->data[14] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER) + task->data[14] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { task->data[14] = -32; task->data[13] = 2; @@ -1033,19 +1033,19 @@ void sub_80D700C(u8 taskId) switch(task->data[0]) { case 0: - task->data[1] = GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER ? 1 : -1; + task->data[1] = GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER ? 1 : -1; switch (gBattleAnimArgs[0]) { case 0: - task->data[3] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - task->data[5] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + task->data[3] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + task->data[5] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); task->data[4] = (task->data[1] * 128) + 120; break; case 4: task->data[3] = 120 - (task->data[1] * 128); - task->data[5] = GetBattlerSpriteCoord(gAnimBankTarget, 3); - task->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 2) - (task->data[1] * 32); + task->data[5] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + task->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) - (task->data[1] * 32); break; default: if ((gBattleAnimArgs[0] & 1) != 0) @@ -1147,8 +1147,8 @@ void sub_80D727C(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); StartSpriteAffineAnim(sprite, 2); sprite->data[0]++; break; @@ -1166,10 +1166,10 @@ void sub_80D72DC(u8 taskId) switch (task->data[0]) { case 0: - task->data[6] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - task->data[7] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + task->data[6] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + task->data[7] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); task->data[8] = 4; - task->data[10] = GetBattlerSpriteCoord(gAnimBankTarget, 2); + task->data[10] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); task->data[9] = (task->data[10] - task->data[6]) / 5; task->data[4] = 7; task->data[5] = -1; @@ -1290,15 +1290,15 @@ void sub_80D759C(u8 taskId) switch (task->data[0]) { case 0: - task->data[15] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 32; + task->data[15] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 32; task->data[14] = task->data[15]; while (task->data[14] > 16) { task->data[14] -= 32; } - task->data[13] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - task->data[12] = GetBattlerSubpriority(gAnimBankTarget) - 2; + task->data[13] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + task->data[12] = GetBattlerSubpriority(gBattleAnimTarget) - 2; task->data[0]++; break; case 1: diff --git a/src/battle/anim/curtain.c b/src/battle/anim/curtain.c index 3c9e4e84c..a7e330278 100644 --- a/src/battle/anim/curtain.c +++ b/src/battle/anim/curtain.c @@ -6,8 +6,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u16 gBattle_WIN0V; extern u16 gBattle_WIN0H; diff --git a/src/battle/anim/cyclone.c b/src/battle/anim/cyclone.c index 8a7f34d5d..b02f7b858 100644 --- a/src/battle/anim/cyclone.c +++ b/src/battle/anim/cyclone.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D0118(struct Sprite* sprite); @@ -39,7 +39,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D765C = void sub_80D0118(struct Sprite* sprite) { InitAnimSpritePos(sprite, 0); - if (GetBattlerSide(gAnimBankAttacker) == 0) + if (GetBattlerSide(gBattleAnimAttacker) == 0) sprite->pos1.y += 16; sprite->data[0] = gBattleAnimArgs[4]; diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c index fcbced40e..45ef7b831 100644 --- a/src/battle/anim/dark.c +++ b/src/battle/anim/dark.c @@ -12,8 +12,8 @@ #include "constants/battle_constants.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u8 gBankSpriteIds[]; extern u16 gBattle_BG1_X; extern u16 gBattle_BG1_Y; @@ -210,7 +210,7 @@ void sub_80DFC24(u8 taskId) { int bank; gTasks[taskId].data[0] = gBattleAnimArgs[0]; - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; gTasks[taskId].data[1] = 16; REG_BLDALPHA = 16; if (GetBattlerPosition_permutated(bank) == 1) @@ -233,7 +233,7 @@ static void sub_80DFC9C(u8 taskId) gTasks[taskId].data[2] = 0; if (r2 == 16) { - gSprites[gBankSpriteIds[gAnimBankAttacker]].invisible = 1; + gSprites[gBankSpriteIds[gBattleAnimAttacker]].invisible = 1; DestroyAnimVisualTask(taskId); } } @@ -276,7 +276,7 @@ void sub_80DFD58(u8 taskId) void sub_80DFDC0(u8 taskId) { REG_BLDALPHA = 0x1000; - if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1) + if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1) REG_BLDCNT = 0x3F42; else REG_BLDCNT = 0x3F44; @@ -287,10 +287,10 @@ void sub_80DFDC0(u8 taskId) void sub_80DFE14(struct Sprite *sprite) { - sprite->data[1] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->data[3] = GetBattlerSpriteCoord(gAnimBankTarget, 3); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->data[3] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[0] = 0x7E; InitSpriteDataForLinearTranslation(sprite); sprite->data[3] = -sprite->data[1]; @@ -366,9 +366,9 @@ void sub_80DFFD0(struct Sprite *sprite) s8 xOffset; if (gBattleAnimArgs[0] == 0) - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; else - bank = gAnimBankTarget; + bank = gBattleAnimTarget; xOffset = 20; sprite->oam.tileNum += 4; @@ -421,22 +421,22 @@ void sub_80E00EC(u8 taskId) int var0; struct Task *task = &gTasks[taskId]; - task->data[7] = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 31; - task->data[6] = sub_807A100(gAnimBankAttacker, 2) - 7; + task->data[7] = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 31; + task->data[6] = sub_807A100(gBattleAnimAttacker, 2) - 7; task->data[5] = task->data[7]; task->data[4] = task->data[6]; task->data[13] = (task->data[7] - task->data[6]) << 8; - pos = GetBattlerSpriteCoord(gAnimBankAttacker, 0); + pos = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); task->data[14] = pos - 32; task->data[15] = pos + 32; - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) task->data[8] = -12; else task->data[8] = -64; - task->data[3] = GetBattlerPosition_permutated(gAnimBankAttacker); + task->data[3] = GetBattlerPosition_permutated(gBattleAnimAttacker); if (task->data[3] == 1) { sub_8078914(&subStruct); @@ -567,7 +567,7 @@ void sub_80E03BC(u8 taskId) } else { - task->data[3] = GetBattlerPosition_permutated(gAnimBankTarget); + task->data[3] = GetBattlerPosition_permutated(gBattleAnimTarget); if (task->data[3] == 1) { REG_BLDCNT = 0x3F42; @@ -599,14 +599,14 @@ void sub_80E03BC(u8 taskId) task->data[0]++; break; case 2: - task->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 31; - task->data[6] = sub_807A100(gAnimBankTarget, 2) - 7; + task->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 31; + task->data[6] = sub_807A100(gBattleAnimTarget, 2) - 7; task->data[13] = (task->data[7] - task->data[6]) << 8; - pos = GetBattlerSpriteCoord(gAnimBankTarget, 0); + pos = GetBattlerSpriteCoord(gBattleAnimTarget, 0); task->data[14] = pos - 4; task->data[15] = pos + 4; - if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) task->data[8] = -12; else task->data[8] = -64; @@ -955,14 +955,14 @@ static void sub_80E08CC(u8 priority) void sub_80E0918(u8 taskId) { - u8 toBG2 = GetBattlerPosition_permutated(gAnimBankAttacker) ^ 1 ? 1 : 0; - MoveBattlerSpriteToBG(gAnimBankAttacker, toBG2); - gSprites[gBankSpriteIds[gAnimBankAttacker]].invisible = 0; + u8 toBG2 = GetBattlerPosition_permutated(gBattleAnimAttacker) ^ 1 ? 1 : 0; + MoveBattlerSpriteToBG(gBattleAnimAttacker, toBG2); + gSprites[gBankSpriteIds[gBattleAnimAttacker]].invisible = 0; - if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) + if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2)) { - MoveBattlerSpriteToBG(gAnimBankAttacker ^ 2, toBG2 ^ 1); - gSprites[gBankSpriteIds[gAnimBankAttacker ^ 2]].invisible = 0; + MoveBattlerSpriteToBG(gBattleAnimAttacker ^ 2, toBG2 ^ 1); + gSprites[gBankSpriteIds[gBattleAnimAttacker ^ 2]].invisible = 0; } DestroyAnimVisualTask(taskId); @@ -970,10 +970,10 @@ void sub_80E0918(u8 taskId) void sub_80E09C4(u8 taskId) { - u8 toBG2 = GetBattlerPosition_permutated(gAnimBankAttacker) ^ 1 ? 1 : 0; + u8 toBG2 = GetBattlerPosition_permutated(gBattleAnimAttacker) ^ 1 ? 1 : 0; sub_8076464(toBG2); - if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) + if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2)) sub_8076464(toBG2 ^ 1); DestroyAnimVisualTask(taskId); @@ -1011,11 +1011,11 @@ void sub_80E0A4C(u8 taskId) if (IsDoubleBattle() && !IsContest()) { - if (GetBattlerPosition(gAnimBankAttacker) == 3 || GetBattlerPosition(gAnimBankAttacker) == 0) + if (GetBattlerPosition(gBattleAnimAttacker) == 3 || GetBattlerPosition(gBattleAnimAttacker) == 0) { - if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2) == TRUE) + if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2) == TRUE) { - gSprites[gBankSpriteIds[gAnimBankAttacker ^ 2]].oam.priority--; + gSprites[gBankSpriteIds[gBattleAnimAttacker ^ 2]].oam.priority--; REG_BG1CNT_BITFIELD.priority = 1; var0 = 1; } @@ -1028,14 +1028,14 @@ void sub_80E0A4C(u8 taskId) } else { - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) - species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_SPECIES); + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES); else - species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_SPECIES); + species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES); } spriteId = GetAnimBattlerSpriteId(0); - newSpriteId = sub_807A4A0(gAnimBankAttacker, spriteId, species); + newSpriteId = sub_807A4A0(gBattleAnimAttacker, spriteId, species); sub_8078914(&subStruct); DmaClear32(3, subStruct.field_4, 0x1000); @@ -1101,7 +1101,7 @@ static void sub_80E0CD0(u8 taskId) if (gTasks[taskIdCopy].data[6] == 1) { - gSprites[gBankSpriteIds[gAnimBankAttacker ^ 2]].oam.priority++; + gSprites[gBankSpriteIds[gBattleAnimAttacker ^ 2]].oam.priority++; } DestroyAnimVisualTask(taskIdCopy); diff --git a/src/battle/anim/devil.c b/src/battle/anim/devil.c index 8e1010d2b..cc96cc455 100644 --- a/src/battle/anim/devil.c +++ b/src/battle/anim/devil.c @@ -5,7 +5,7 @@ #include "trig.h" extern s16 gBattleAnimArgs[8]; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimTarget; void sub_80D2ABC(struct Sprite *sprite); @@ -45,7 +45,7 @@ void sub_80D2ABC(struct Sprite *sprite) sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; StartSpriteAnim(sprite, 0); - sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) - 1; + sprite->subpriority = GetBattlerSubpriority(gBattleAnimTarget) - 1; sprite->data[2] = 1; } sprite->data[0] += sprite->data[2]; diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c index c9a1d1539..cfb7576d6 100644 --- a/src/battle/anim/dragon.c +++ b/src/battle/anim/dragon.c @@ -6,8 +6,8 @@ #include "scanline_effect.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u8 gBankAttacker; extern u16 gBattle_BG1_X; extern u16 gBattle_BG2_X; @@ -199,9 +199,9 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB100 = void sub_80DF5A0(struct Sprite *sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); - if (GetBattlerSide(gAnimBankAttacker)) + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + if (GetBattlerSide(gBattleAnimAttacker)) { sprite->pos1.x -= gBattleAnimArgs[0]; gBattleAnimArgs[3] = -gBattleAnimArgs[3]; @@ -224,9 +224,9 @@ void sub_80DF5A0(struct Sprite *sprite) void sub_80DF63C(struct Sprite *sprite) { sub_8078650(sprite); - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); - if (GetBattlerSide(gAnimBankAttacker)) + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + if (GetBattlerSide(gBattleAnimAttacker)) { sprite->pos1.x -= gBattleAnimArgs[1]; sprite->pos1.y += gBattleAnimArgs[1]; @@ -252,13 +252,13 @@ void sub_80DF6F0(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); } else { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); } sub_807867C(sprite, gBattleAnimArgs[1]); sprite->pos1.y += gBattleAnimArgs[2]; @@ -270,7 +270,7 @@ void sub_80DF6F0(struct Sprite *sprite) void sub_80DF760(struct Sprite *sprite) { - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) StartSpriteAffineAnim(sprite, 1); sub_80DF63C(sprite); } @@ -281,8 +281,8 @@ void sub_80DF78C(struct Sprite *sprite) { u16 r5; u16 r0; - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[4] = 0; sprite->data[5] = 1; sprite->data[6] = gBattleAnimArgs[0]; @@ -343,7 +343,7 @@ void sub_80DF924(u8 taskId) struct Task *task = &gTasks[taskId]; u16 i; u8 r1; - if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1) + if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1) { sp.dmaDest = ®_BG1HOFS; task->data[2] = gBattle_BG1_X; @@ -356,7 +356,7 @@ void sub_80DF924(u8 taskId) sp.dmaControl = 0xA2600001; sp.initState = 1; sp.unused9 = 0; - r1 = sub_8077FC0(gAnimBankAttacker); + r1 = sub_8077FC0(gBattleAnimAttacker); task->data[3] = r1 - 32; task->data[4] = r1 + 32; if (task->data[3] < 0) @@ -426,8 +426,8 @@ void sub_80DFB28(struct Sprite *sprite) { int r6 = (gBattleAnimArgs[2] * 3) / 5; int i; - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[4]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[4]; sprite->data[1] = Cos(gBattleAnimArgs[1], gBattleAnimArgs[2]); sprite->data[2] = Sin(gBattleAnimArgs[1], r6); sprite->pos1.x += sprite->data[1] * gBattleAnimArgs[0]; diff --git a/src/battle/anim/draw.c b/src/battle/anim/draw.c index b25c4fb9a..90a27eae6 100644 --- a/src/battle/anim/draw.c +++ b/src/battle/anim/draw.c @@ -6,8 +6,8 @@ #include "scanline_effect.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u16 gBattle_BG2_X; extern u16 gBattle_BG1_X; @@ -36,15 +36,15 @@ void sub_80D0C88(u8 taskId) struct ScanlineEffectParams params; s16 i; - task->data[0] = sub_8077FC0(gAnimBankTarget) + 32; + task->data[0] = sub_8077FC0(gBattleAnimTarget) + 32; task->data[1] = 4; task->data[2] = 0; task->data[3] = 0; task->data[4] = 0; task->data[5] = 0; - task->data[15] = sub_807A100(gAnimBankTarget, 0); + task->data[15] = sub_807A100(gBattleAnimTarget, 0); - if (GetBattlerPosition_permutated(gAnimBankTarget) == 1) + if (GetBattlerPosition_permutated(gBattleAnimTarget) == 1) { task->data[6] = gBattle_BG1_X; params.dmaDest = (u16 *)REG_ADDR_BG1HOFS; @@ -120,14 +120,14 @@ static void sub_80D0D68(u8 taskId) void sub_80D0E30(struct Sprite* sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) - 16; - sprite->pos1.y = sub_8077FC0(gAnimBankTarget) + 16; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) - 16; + sprite->pos1.y = sub_8077FC0(gBattleAnimTarget) + 16; sprite->data[0] = 0; sprite->data[1] = 0; sprite->data[2] = 0; sprite->data[3] = 16; sprite->data[4] = 0; - sprite->data[5] = sub_807A100(gAnimBankTarget, 0) + 2; + sprite->data[5] = sub_807A100(gBattleAnimTarget, 0) + 2; sprite->data[6] = BattleAnimAdjustPanning(SOUND_PAN_TARGET); sprite->callback = sub_80D0E8C; } diff --git a/src/battle/anim/energy_wave.c b/src/battle/anim/energy_wave.c index cdf3e3ced..b165a7f28 100644 --- a/src/battle/anim/energy_wave.c +++ b/src/battle/anim/energy_wave.c @@ -6,8 +6,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[8]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern const union AffineAnimCmd *const gSpriteAffineAnimTable_83D752C[]; void sub_80D3554(struct Sprite *sprite); @@ -166,9 +166,9 @@ void sub_80D3554(struct Sprite *sprite) sprite->data[0] = 30; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); InitAnimLinearTranslation(sprite); @@ -228,15 +228,15 @@ void sub_80D3698(struct Sprite *sprite) { u8 subpriority; - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); sprite->pos2.y = -10; - subpriority = GetBattlerSubpriority(gAnimBankAttacker); + subpriority = GetBattlerSubpriority(gBattleAnimAttacker); if (!IsContest()) { - if (GetBattlerSide(gAnimBankAttacker) == 0) + if (GetBattlerSide(gBattleAnimAttacker) == 0) { sprite->pos2.x = 10; sprite->subpriority = subpriority + 2; @@ -268,11 +268,11 @@ void sub_80D3728(struct Sprite *sprite) { int var1, var2; - if (GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget)) + if (GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget)) { gBattleAnimArgs[0] *= -1; - if (GetBattlerPosition(gAnimBankAttacker) == 0 || GetBattlerPosition(gAnimBankAttacker) == 1) + if (GetBattlerPosition(gBattleAnimAttacker) == 0 || GetBattlerPosition(gBattleAnimAttacker) == 1) { gBattleAnimArgs[0] *= -1; } @@ -291,14 +291,14 @@ void sub_80D3728(struct Sprite *sprite) InitAnimSpritePos(sprite, var1); - if (GetBattlerSide(gAnimBankAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != 0) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, var2) + gBattleAnimArgs[3]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, var2) + gBattleAnimArgs[3]; sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/espeed.c b/src/battle/anim/espeed.c index 17d0b383f..143510f3f 100644 --- a/src/battle/anim/espeed.c +++ b/src/battle/anim/espeed.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D1A70(struct Sprite* sprite); static void sub_80D15E0(u8 taskId); @@ -87,7 +87,7 @@ void sub_80D1638(u8 taskId) task->data[2] = 0; task->data[3] = 0; task->data[12] = 3; - if (GetBattlerSide(gAnimBankTarget) == 0) + if (GetBattlerSide(gBattleAnimTarget) == 0) { task->data[13] = 0xFFFF; task->data[14] = 8; @@ -205,8 +205,8 @@ void sub_80D18D4(u8 taskId) task->data[7] = 0; task->data[8] = 0; task->data[13] = 0; - task->data[14] = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - task->data[15] = GetBattlerSpriteCoord(gAnimBankAttacker, 1); + task->data[14] = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + task->data[15] = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); task->func = sub_80D1930; } diff --git a/src/battle/anim/evasion.c b/src/battle/anim/evasion.c index c60618a49..2c3d973aa 100644 --- a/src/battle/anim/evasion.c +++ b/src/battle/anim/evasion.c @@ -7,8 +7,8 @@ #include "blend_palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; static void sub_80CE910(u8 taskId); static void sub_80CE974(struct Sprite* sprite); @@ -47,7 +47,7 @@ void sub_80CE7E0(u8 taskId) } task->func = sub_80CE910; - if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1) + if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1) { REG_DISPCNT &= 0xFDFF; } @@ -62,7 +62,7 @@ void sub_80CE910(u8 taskId) struct Task* task = &gTasks[taskId]; if (!task->data[3]) { - if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1) + if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1) REG_DISPCNT |= 0x200; else REG_DISPCNT |= 0x400; diff --git a/src/battle/anim/fang.c b/src/battle/anim/fang.c index 74de16b56..776dc9f14 100644 --- a/src/battle/anim/fang.c +++ b/src/battle/anim/fang.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CEA04(struct Sprite* sprite); diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c index 76a8f2e7c..499cb0c98 100644 --- a/src/battle/anim/fight.c +++ b/src/battle/anim/fight.c @@ -9,8 +9,8 @@ extern s16 gBattleAnimArgs[]; extern u8 gBankAttacker; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u8 gBankSpriteIds[]; extern u8 gBanksBySide[]; extern u16 gBattle_BG1_X; @@ -444,7 +444,7 @@ void sub_080B08A0(struct Sprite *sprite) void sub_80D902C(struct Sprite *sprite) { - if (gBattleAnimArgs[7] == 1 && GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (gBattleAnimArgs[7] == 1 && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; gBattleAnimArgs[3] = -gBattleAnimArgs[3]; @@ -494,9 +494,9 @@ void sub_80D90F4(struct Sprite *sprite) s16 x, y; if (gBattleAnimArgs[0] == 0) - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; else - bank = gAnimBankTarget; + bank = gBattleAnimTarget; if (gBattleAnimArgs[2] < 0) gBattleAnimArgs[2] = Random() % 5; @@ -590,12 +590,12 @@ static void sub_80D9328(struct Sprite *sprite) void sub_80D9378(struct Sprite *sprite) { - if ((gAnimBankAttacker ^ 2) == gAnimBankTarget && GetBattlerPosition(gAnimBankTarget) < 2) + if ((gBattleAnimAttacker ^ 2) == gBattleAnimTarget && GetBattlerPosition(gBattleAnimTarget) < 2) gBattleAnimArgs[0] *= -1; sub_8078764(sprite, TRUE); - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[3]; @@ -669,8 +669,8 @@ static void AnimStompFootStep(struct Sprite *sprite) if (--sprite->data[0] == -1) { sprite->data[0] = 6; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, AnimStompFootEnd); @@ -713,13 +713,13 @@ void sub_80D95D0(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); } else { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); } sprite->pos1.x += gBattleAnimArgs[1]; @@ -766,13 +766,13 @@ void sub_80D96B8(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[2]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[3]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[2]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[3]; } else { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[2]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[2]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3]; } sprite->oam.tileNum += gBattleAnimArgs[1] * 16; @@ -819,13 +819,13 @@ void sub_80D97CC(struct Sprite *sprite) { sprite->pos1.x = GetBattlerSpriteCoord(gBankAttacker, 2); sprite->pos1.y = GetBattlerSpriteCoord(gBankAttacker, 3); - sprite->oam.priority = sub_8079ED4(gAnimBankAttacker); - sprite->data[7] = gAnimBankTarget; + sprite->oam.priority = sub_8079ED4(gBattleAnimAttacker); + sprite->data[7] = gBattleAnimTarget; } else { - sprite->oam.priority = sub_8079ED4(gAnimBankTarget); - sprite->data[7] = gAnimBankAttacker; + sprite->oam.priority = sub_8079ED4(gBattleAnimTarget); + sprite->data[7] = gBattleAnimAttacker; } sprite->data[0] = 0; @@ -885,10 +885,10 @@ static void sub_80D9934(struct Sprite *sprite) } else { - s16 pos0 = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - s16 pos1 = GetBattlerSpriteCoord(gAnimBankAttacker, 3); - s16 pos2 = GetBattlerSpriteCoord(gAnimBankTarget, 2); - s16 pos3 = GetBattlerSpriteCoord(gAnimBankTarget, 3); + s16 pos0 = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + s16 pos1 = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + s16 pos2 = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + s16 pos3 = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sprite->data[0] = pos2 - pos0; sprite->data[1] = pos3 - pos1; @@ -921,13 +921,13 @@ void sub_80D9A38(struct Sprite *sprite) { sprite->pos1.x = GetBattlerSpriteCoord(gBankAttacker, 2); sprite->pos1.y = GetBattlerSpriteCoord(gBankAttacker, 3); - bank = gAnimBankTarget; - sprite->oam.priority = sub_8079ED4(gAnimBankAttacker); + bank = gBattleAnimTarget; + sprite->oam.priority = sub_8079ED4(gBattleAnimAttacker); } else { - bank = gAnimBankAttacker; - sprite->oam.priority = sub_8079ED4(gAnimBankTarget); + bank = gBattleAnimAttacker; + sprite->oam.priority = sub_8079ED4(gBattleAnimTarget); } if (IsContest()) @@ -958,15 +958,15 @@ void sub_80D9B48(struct Sprite *sprite) { u8 turn; - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sprite->data[1] = gBattleAnimArgs[3]; sprite->data[2] = gBattleAnimArgs[0]; sprite->data[3] = gBattleAnimArgs[1]; sprite->data[4] = gBattleAnimArgs[2]; turn = gAnimMoveTurn; - if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) turn++; if (turn & 1) @@ -992,7 +992,7 @@ void sub_80D9BD4(struct Sprite *sprite) { StartSpriteAnim(sprite, 2); } - else if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + else if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { StartSpriteAnim(sprite, 1); } @@ -1038,7 +1038,7 @@ void sub_80D9C80(u8 taskId) task->data[10] += 2816; - if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) gBattle_BG3_X += task->data[9] >> 8; else gBattle_BG3_X -= task->data[9] >> 8; diff --git a/src/battle/anim/finger.c b/src/battle/anim/finger.c index fd4be79a9..46e493de0 100644 --- a/src/battle/anim/finger.c +++ b/src/battle/anim/finger.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern void sub_80CEF44(u8 bank, struct Sprite* sprite); @@ -138,9 +138,9 @@ void sub_80CF040(struct Sprite* sprite) { u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; else - bank = gAnimBankTarget; + bank = gBattleAnimTarget; sub_80CEF44(bank, sprite); sprite->data[0] = 0; @@ -162,9 +162,9 @@ void sub_80CF0BC(struct Sprite* sprite) { u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; else - bank = gAnimBankTarget; + bank = gBattleAnimTarget; sprite->pos1.x = GetBattlerSpriteCoord(bank, 0); sprite->pos1.y = sub_807A100(bank, 2); @@ -219,9 +219,9 @@ void sub_80CF1C8(struct Sprite* sprite) { u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; else - bank = gAnimBankTarget; + bank = gBattleAnimTarget; sub_80CEF44(bank, sprite); if (GetBattlerSide(bank) == 0) diff --git a/src/battle/anim/fire.c b/src/battle/anim/fire.c index 6262b382d..09e83813b 100644 --- a/src/battle/anim/fire.c +++ b/src/battle/anim/fire.c @@ -4,7 +4,7 @@ #include "trig.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; +extern u8 gBattleAnimAttacker; void sub_80D4ED8(struct Sprite *sprite); void sub_80D4F18(struct Sprite *sprite); @@ -202,7 +202,7 @@ void sub_80D4F5C(struct Sprite *sprite) { sub_8078650(sprite); - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) { sprite->pos1.x -= gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; @@ -224,7 +224,7 @@ void sub_80D4F5C(struct Sprite *sprite) void sub_80D4FCC(struct Sprite *sprite) { - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) { sprite->pos1.x -= gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; @@ -260,7 +260,7 @@ void sub_80D5074(struct Sprite *sprite) { sub_8078650(sprite); - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) { sprite->pos1.x -= gBattleAnimArgs[0]; } diff --git a/src/battle/anim/fire_2.c b/src/battle/anim/fire_2.c index 9db989aac..53d7038cb 100644 --- a/src/battle/anim/fire_2.c +++ b/src/battle/anim/fire_2.c @@ -7,8 +7,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void AnimEmberFlare(struct Sprite *sprite); void sub_80D5210(struct Sprite *sprite); @@ -195,9 +195,9 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D96F8 = // arg 6: ? (todo: something related to which mon the pixel offsets are based on) void AnimEmberFlare(struct Sprite *sprite) { - if (GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget) - && (gAnimBankAttacker == GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT) - || gAnimBankAttacker == GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT))) + if (GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget) + && (gBattleAnimAttacker == GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT) + || gBattleAnimAttacker == GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT))) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->callback = sub_8079534; @@ -237,9 +237,9 @@ static void AnimFireRingStep1(struct Sprite *sprite) { sprite->data[0] = 0x19; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); InitAnimLinearTranslation(sprite); @@ -253,8 +253,8 @@ static void AnimFireRingStep2(struct Sprite *sprite) { sprite->data[0] = 0; - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sprite->pos2.y = 0; sprite->pos2.x = 0; @@ -352,7 +352,7 @@ void sub_80D5470(u8 taskId) // initialize animation task for Move_ERUPTION? task->data[2] = 0; task->data[3] = 0; task->data[4] = gSprites[task->data[15]].pos1.y; - task->data[5] = GetBattlerSide(gAnimBankAttacker); + task->data[5] = GetBattlerSide(gBattleAnimAttacker); task->data[6] = 0; sub_8078E70(task->data[15], 0); @@ -478,7 +478,7 @@ static void sub_80D57C4(u8 spriteId, u8 taskId, u8 a3) u16 y = sub_80D5940(spriteId); u16 x = gSprites[spriteId].pos1.x; - if(!GetBattlerSide(gAnimBankAttacker)) + if(!GetBattlerSide(gBattleAnimAttacker)) { x -= 0xC; sign = 1; @@ -524,7 +524,7 @@ u16 sub_80D5940(u8 spriteId) { u16 var1 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y + gSprites[spriteId].centerToCornerVecY; - if (GetBattlerSide(gAnimBankAttacker) == 0) + if (GetBattlerSide(gBattleAnimAttacker) == 0) { var1 = ((var1 << 16) + 0x4A0000) >> 16; } diff --git a/src/battle/anim/flash.c b/src/battle/anim/flash.c index 2799046c8..34dc291f4 100644 --- a/src/battle/anim/flash.c +++ b/src/battle/anim/flash.c @@ -6,8 +6,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FC8; extern struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FF8; diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c index 4ad4375e6..f9f328283 100644 --- a/src/battle/anim/flying.c +++ b/src/battle/anim/flying.c @@ -8,8 +8,8 @@ #include "random.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u8 gAnimVisualTaskCount; extern struct OamMatrix gOamMatrices[]; extern u8 gBanksBySide[]; @@ -430,15 +430,15 @@ void sub_80DA0DC(u8 taskId) void sub_80DA16C(struct Sprite *sprite) { InitAnimSpritePos(sprite, 1); - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sprite->data[0] = gBattleAnimArgs[4]; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; InitAnimLinearTranslation(sprite); sprite->callback = sub_80785E4; StoreSpriteCallbackInData(sprite, sub_80DA1EC); @@ -454,7 +454,7 @@ void sub_80DA1EC(struct Sprite *sprite) void sub_80DA208(struct Sprite *sprite) { - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { gBattleAnimArgs[0] = -gBattleAnimArgs[0]; gBattleAnimArgs[1] = -gBattleAnimArgs[1]; @@ -468,20 +468,20 @@ void sub_80DA208(struct Sprite *sprite) gBattleAnimArgs[3] = -gBattleAnimArgs[3]; } - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; sprite->data[0] = gBattleAnimArgs[4]; if (gBattleAnimArgs[6] == 0) { - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); } else { - SetAverageBattlerPositions(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]); + SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->data[2], &sprite->data[4]); } sprite->data[2] = sprite->data[2] + gBattleAnimArgs[2]; @@ -521,7 +521,7 @@ void sub_80DA348(struct Sprite *sprite) void sub_80DA38C(struct Sprite *sprite) { - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { sprite->pos1.x = 272; sprite->pos1.y = -32; @@ -535,9 +535,9 @@ void sub_80DA38C(struct Sprite *sprite) sprite->data[0] = gBattleAnimArgs[0]; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); InitAnimLinearTranslation(sprite); sprite->callback = sub_80DA410; @@ -594,11 +594,11 @@ void sub_80DA4D8(struct Sprite *sprite) if (gBattleAnimArgs[7] & 0x100) { - slot = gAnimBankAttacker; + slot = gBattleAnimAttacker; } else { - slot = gAnimBankTarget; + slot = gBattleAnimTarget; } if (GetBattlerSide(slot) == 0) @@ -1881,9 +1881,9 @@ _080DAD2C: .4byte sub_80DA48C\n"); void sub_80DAD30(struct Sprite *sprite) { - sprite->oam.priority = sub_8079ED4(gAnimBankTarget); - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->oam.priority = sub_8079ED4(gBattleAnimTarget); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->callback = TranslateAnimSpriteToTargetMonLocation; } @@ -1899,29 +1899,29 @@ void sub_80DAD84(struct Sprite * sprite) if (gMain.inBattle) { - if (gBanksBySide[gAnimBankTarget] & 1) + if (gBanksBySide[gBattleAnimTarget] & 1) { - sprite->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3]; + sprite->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3]; } else { // 080dade0 - sprite->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 40; + sprite->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 40; } if (gBattleAnimArgs[4]) { - sprite->oam.priority = sub_8079ED4(gAnimBankTarget) + 1; + sprite->oam.priority = sub_8079ED4(gBattleAnimTarget) + 1; // 080dae24 } else { - sprite->oam.priority = sub_8079ED4(gAnimBankTarget); + sprite->oam.priority = sub_8079ED4(gBattleAnimTarget); } } else { - sprite->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3]; + sprite->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3]; } sprite->data[4] = gSineTable[sprite->data[1] & 0xff]; @@ -2181,8 +2181,8 @@ void sub_80DB000(struct Sprite *sprite) sub_8078764(sprite, FALSE); } - if ((!gBattleAnimArgs[2] && !GetBattlerSide(gAnimBankAttacker)) - || (gBattleAnimArgs[2] == 1 && !GetBattlerSide(gAnimBankTarget))) + if ((!gBattleAnimArgs[2] && !GetBattlerSide(gBattleAnimAttacker)) + || (gBattleAnimArgs[2] == 1 && !GetBattlerSide(gBattleAnimTarget))) { sprite->pos1.x += 8; } @@ -2229,8 +2229,8 @@ void sub_80DB0E8(u8 task) gBattleAnimArgs[3] = 3; CreateSpriteAndAnimate(&gBattleAnimSpriteTemplate_83DB538, - GetBattlerSpriteCoord(gAnimBankTarget, 2), - GetBattlerSpriteCoord(gAnimBankTarget, 3), + GetBattlerSpriteCoord(gBattleAnimTarget, 2), + GetBattlerSpriteCoord(gBattleAnimTarget, 3), 3); } @@ -2264,7 +2264,7 @@ void sub_80DB1F4(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); sprite->pos2.y = -sprite->pos1.y - 32; ++sprite->data[0]; break; @@ -2345,13 +2345,13 @@ void sub_80DB374(struct Sprite *sprite) case 0: if (!gBattleAnimArgs[0]) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); } else { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); } sprite->data[1] = 512; @@ -2420,13 +2420,13 @@ _080DB388:\n\ ldrsh r0, [r0, r2]\n\ cmp r0, 0\n\ bne _080DB3A0\n\ - ldr r4, _080DB39C @ =gAnimBankAttacker\n\ + ldr r4, _080DB39C @ =gBattleAnimAttacker\n\ b _080DB3A2\n\ .align 2, 0\n\ _080DB398: .4byte gBattleAnimArgs\n\ -_080DB39C: .4byte gAnimBankAttacker\n\ +_080DB39C: .4byte gBattleAnimAttacker\n\ _080DB3A0:\n\ - ldr r4, _080DB3DC @ =gAnimBankTarget\n\ + ldr r4, _080DB3DC @ =gBattleAnimTarget\n\ _080DB3A2:\n\ ldrb r0, [r4]\n\ movs r1, 0\n\ @@ -2455,7 +2455,7 @@ _080DB3A2:\n\ strh r0, [r5, 0x2E]\n\ b _080DB44C\n\ .align 2, 0\n\ -_080DB3DC: .4byte gAnimBankTarget\n\ +_080DB3DC: .4byte gBattleAnimTarget\n\ _080DB3E0:\n\ movs r1, 0x32\n\ ldrsh r0, [r5, r1]\n\ @@ -2554,13 +2554,13 @@ void sub_80DB458(struct Sprite *sprite) if (gBattleAnimArgs[1] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 32; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 32; } else { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 32; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 32; } sprite->callback = sub_80DB508; @@ -2628,8 +2628,8 @@ void sub_80DB5E4(struct Sprite *sprite) posx = sprite->pos1.x; posy = sprite->pos1.y; - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[4] = sprite->pos1.x << 4; sprite->data[5] = sprite->pos1.y << 4; diff --git a/src/battle/anim/flying_hearts.c b/src/battle/anim/flying_hearts.c index 855b3b8a3..31998b830 100644 --- a/src/battle/anim/flying_hearts.c +++ b/src/battle/anim/flying_hearts.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D2064(struct Sprite* sprite); static void sub_80D2094(struct Sprite* sprite); diff --git a/src/battle/anim/flying_path.c b/src/battle/anim/flying_path.c index c9c506919..6e7dd03f1 100644 --- a/src/battle/anim/flying_path.c +++ b/src/battle/anim/flying_path.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; static void sub_80CBF5C(u8 taskId); static s16 sub_80CC338(struct Sprite* sprite); @@ -84,12 +84,12 @@ void sub_80CBDF4(u8 taskId) { struct Task *task = &gTasks[taskId]; - task->data[4] = GetBattlerSubpriority(gAnimBankTarget) - 1; - task->data[6] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - task->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 3); - task->data[10] = sub_807A100(gAnimBankTarget, 1); - task->data[11] = sub_807A100(gAnimBankTarget, 0); - task->data[5] = (GetBattlerSide(gAnimBankTarget) == 1) ? 1 : -1; + task->data[4] = GetBattlerSubpriority(gBattleAnimTarget) - 1; + task->data[6] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + task->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + task->data[10] = sub_807A100(gBattleAnimTarget, 1); + task->data[11] = sub_807A100(gBattleAnimTarget, 0); + task->data[5] = (GetBattlerSide(gBattleAnimTarget) == 1) ? 1 : -1; task->data[9] = 0x38 - (task->data[5] * 64); task->data[8] = task->data[7] - task->data[9] + task->data[6]; task->data[2] = CreateSprite(&gSpriteTemplate_83D6884, task->data[8], task->data[9], task->data[4]); diff --git a/src/battle/anim/flying_petals.c b/src/battle/anim/flying_petals.c index 7135f4380..4d06b994e 100644 --- a/src/battle/anim/flying_petals.c +++ b/src/battle/anim/flying_petals.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern const union AnimCmd *const gSpriteAnimTable_83D6424[]; extern const union AnimCmd *const gSpriteAnimTable_83D6420[]; @@ -115,9 +115,9 @@ void sub_80CC474(struct Sprite* sprite) { u8 bank; if (!gBattleAnimArgs[6]) - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; else - bank = gAnimBankTarget; + bank = gBattleAnimTarget; if (GetBattlerSide(bank) != 0) { @@ -150,7 +150,7 @@ void sub_80CC474(struct Sprite* sprite) sprite->oam.priority = sub_8079ED4(bank); break; case 3: - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[0]; GetAnimBattlerSpriteId(1); sprite->oam.priority = sub_8079ED4(bank) + 1; break; diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c index 130e7ff92..f67035ac7 100644 --- a/src/battle/anim/ghost.c +++ b/src/battle/anim/ghost.c @@ -12,8 +12,8 @@ extern s16 gBattleAnimArgs[]; extern u8 gBankSpriteIds[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u8 gUnknown_0202F7D2; static void sub_80DDB6C(struct Sprite *sprite); @@ -227,9 +227,9 @@ static void sub_80DDB6C(struct Sprite *sprite) InitAnimSpritePos(sprite, 1); sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sub_8078BD4(sprite); sprite->callback = sub_80DDBD8; sprite->data[6] = 16; @@ -409,8 +409,8 @@ static void InitAnimShadowBall(struct Sprite *sprite) u16 r5, r6; r5 = sprite->pos1.x; r6 = sprite->pos1.y; - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[0] = 0; sprite->data[1] = gBattleAnimArgs[0]; sprite->data[2] = gBattleAnimArgs[1]; @@ -440,8 +440,8 @@ static void AnimShadowBallStep(struct Sprite *sprite) sprite->data[2] -= 1; if (sprite->data[2] > 0) break; - sprite->data[1] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sprite->data[4] = sprite->pos1.x << 4; sprite->data[5] = sprite->pos1.y << 4; sprite->data[6] = ((sprite->data[1] - sprite->pos1.x) << 4) / sprite->data[3]; @@ -456,8 +456,8 @@ static void AnimShadowBallStep(struct Sprite *sprite) sprite->data[3] -= 1; if (sprite->data[3] > 0) break; - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sprite->data[0] += 1; break; case 3: @@ -581,7 +581,7 @@ void sub_80DE1B0(u8 taskId) REG_BLDCNT = 0x3F40; REG_BLDALPHA = (task->data[3] << 8) | task->data[2]; gSprites[task->data[0]].data[0] = 80; - if (GetBattlerSide(gAnimBankTarget) == 0) + if (GetBattlerSide(gBattleAnimTarget) == 0) { gSprites[task->data[0]].data[1] = -144; gSprites[task->data[0]].data[2] = 112; @@ -648,7 +648,7 @@ static void sub_80DE3D4(u8 taskId) { s16 startLine; struct Task *task = &gTasks[taskId]; - u8 position = GetBattlerPosition_permutated(gAnimBankTarget); + u8 position = GetBattlerPosition_permutated(gBattleAnimTarget); switch (task->data[15]) { @@ -750,7 +750,7 @@ static void sub_80DE61C(u8 taskId) static void sub_80DE6B0(u8 taskId) { struct Task *task = &gTasks[taskId]; - u8 position = GetBattlerPosition_permutated(gAnimBankTarget); + u8 position = GetBattlerPosition_permutated(gBattleAnimTarget); switch (task->data[15]) { @@ -791,17 +791,17 @@ static void sub_80DE7B8(struct Sprite *sprite) if (gBattleAnimArgs[0] == 0) { - battler1X = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - battler1Y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 28; - battler2X = GetBattlerSpriteCoord(gAnimBankTarget, 0); - battler2Y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 28; + battler1X = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + battler1Y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 28; + battler2X = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + battler2Y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 28; } else { - battler1X = GetBattlerSpriteCoord(gAnimBankTarget, 0); - battler1Y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 28; - battler2X = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - battler2Y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 28; + battler1X = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + battler1Y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 28; + battler2X = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + battler2Y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 28; } yDiff = battler2Y - battler1Y; @@ -851,14 +851,14 @@ void sub_80DE918(u8 taskId) task->data[9] = 16; task->data[10] = gBattleAnimArgs[0]; - baseX = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - baseY = sub_807A100(gAnimBankAttacker, 3); + baseX = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + baseY = sub_807A100(gBattleAnimAttacker, 3); if (!IsContest()) { for (battler = 0; battler < 4; battler++) { - if (battler != gAnimBankAttacker - && battler != (gAnimBankAttacker ^ 2) + if (battler != gBattleAnimAttacker + && battler != (gBattleAnimAttacker ^ 2) && IsAnimBankSpriteVisible(battler)) { spriteId = CreateSprite(&gSpriteTemplate_83DAF08, baseX, baseY, 55); @@ -994,7 +994,7 @@ void sub_80DECB0(u8 taskId) REG_BLDCNT = 0xC8; REG_BLDY = 0x10; - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER || IsContest()) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER || IsContest()) startX = 40; else startX = 200; @@ -1075,7 +1075,7 @@ static void sub_80DEF3C(struct Sprite *sprite) s16 xDelta2; InitAnimSpritePos(sprite, 1); - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { xDelta = 24; xDelta2 = -2; @@ -1166,7 +1166,7 @@ static void sub_80DF0B8(struct Sprite *sprite) u16 coeffA; sprite->pos2.x = Sin(sprite->data[0], 12); - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) sprite->pos2.x = -sprite->pos2.x; sprite->data[0] = (sprite->data[0] + 6) & 0xFF; @@ -1214,12 +1214,12 @@ void sub_80DF1A4(u8 taskId) task->data[0] = 0; task->data[1] = 16; - task->data[9] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - task->data[10] = sub_8077FC0(gAnimBankAttacker); - task->data[11] = (sub_807A100(gAnimBankAttacker, 1) / 2) + 8; + task->data[9] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + task->data[10] = sub_8077FC0(gBattleAnimAttacker); + task->data[11] = (sub_807A100(gBattleAnimAttacker, 1) / 2) + 8; task->data[7] = 0; - task->data[5] = sub_8079ED4(gAnimBankAttacker); - task->data[6] = GetBattlerSubpriority(gAnimBankAttacker) - 2; + task->data[5] = sub_8079ED4(gBattleAnimAttacker); + task->data[6] = GetBattlerSubpriority(gBattleAnimAttacker) - 2; task->data[3] = 0; task->data[4] = 16; REG_BLDCNT = 0x3F40; @@ -1243,7 +1243,7 @@ static void sub_80DF24C(u8 taskId) if (spriteId != MAX_SPRITES) { gSprites[spriteId].data[0] = taskId; - gSprites[spriteId].data[1] = GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER; + gSprites[spriteId].data[1] = GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER; gSprites[spriteId].data[2] = (i * 42) & 0xFF; gSprites[spriteId].data[3] = task->data[11]; @@ -1344,7 +1344,7 @@ static void sub_80DF3D8(struct Sprite *sprite) static void sub_80DF49C(struct Sprite *sprite) { sprite->invisible = 1; - sprite->data[5] = gBankSpriteIds[gAnimBankAttacker]; + sprite->data[5] = gBankSpriteIds[gBattleAnimAttacker]; sprite->data[0] = 128; sprite->data[1] = 10; sprite->data[2] = gBattleAnimArgs[0]; diff --git a/src/battle/anim/glitter.c b/src/battle/anim/glitter.c index e0ef150ad..894d857f0 100644 --- a/src/battle/anim/glitter.c +++ b/src/battle/anim/glitter.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CD140(struct Sprite* sprite); void sub_80CD190(struct Sprite* sprite); @@ -72,9 +72,9 @@ void sub_80CD190(struct Sprite* sprite) { u8 bank; if (!gBattleAnimArgs[2]) - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; else - bank = gAnimBankTarget; + bank = gBattleAnimTarget; if (IsDoubleBattle() && IsAnimBankSpriteVisible(bank ^ 2)) { diff --git a/src/battle/anim/grip.c b/src/battle/anim/grip.c index 8cf4e4bf9..60d0a46ad 100644 --- a/src/battle/anim/grip.c +++ b/src/battle/anim/grip.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D0178(struct Sprite* sprite); static void sub_80D020C(struct Sprite* sprite); @@ -65,8 +65,8 @@ void sub_80D0178(struct Sprite* sprite) sprite->pos1.x += r7; sprite->pos1.y += r4; sprite->data[0] = 6; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + r8; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + r6; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + r8; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + r6; sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, sub_80D020C); } diff --git a/src/battle/anim/ground.c b/src/battle/anim/ground.c index 9f72cd73e..8c8e1d2a7 100644 --- a/src/battle/anim/ground.c +++ b/src/battle/anim/ground.c @@ -8,8 +8,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u16 gBattle_BG1_X; extern u16 gBattle_BG1_Y; extern u16 gBattle_BG2_X; @@ -154,11 +154,11 @@ const struct SpriteTemplate gDigDirtMoundSpriteTemplate = // a boomerang. After hitting the target mon, it comes back to the user. static void AnimBonemerangProjectile(struct Sprite *sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[0] = 20; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sprite->data[5] = -40; InitAnimArcTranslation(sprite); sprite->callback = AnimBonemerangProjectileStep; @@ -173,8 +173,8 @@ static void AnimBonemerangProjectileStep(struct Sprite *sprite) sprite->pos2.y = 0; sprite->pos2.x = 0; sprite->data[0] = 20; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[5] = 40; InitAnimArcTranslation(sprite); sprite->callback = AnimBonemerangProjectileEnd; @@ -197,12 +197,12 @@ static void AnimBonemerangProjectileEnd(struct Sprite *sprite) static void AnimBoneHitProjectile(struct Sprite *sprite) { sub_8078764(sprite, TRUE); - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } @@ -220,8 +220,8 @@ static void AnimDirtScatter(struct Sprite *sprite) InitAnimSpritePos(sprite, 1); - targetXPos = sub_8077EE4(gAnimBankTarget, 2); - targetYPos = sub_8077EE4(gAnimBankTarget, 3); + targetXPos = sub_8077EE4(gBattleAnimTarget, 2); + targetYPos = sub_8077EE4(gBattleAnimTarget, 3); xOffset = Random() & 0x1F; yOffset = Random() & 0x1F; @@ -247,8 +247,8 @@ static void AnimMudSportDirt(struct Sprite *sprite) sprite->oam.tileNum++; if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[1] > 0 ? 1 : -1; sprite->callback = AnimMudSportDirtRising; } @@ -319,7 +319,7 @@ static void sub_80E1284(u8 taskId) { case 0: task->data[10] = GetAnimBattlerSpriteId(0); - task->data[11] = GetBattlerPosition_permutated(gAnimBankAttacker); + task->data[11] = GetBattlerPosition_permutated(gBattleAnimAttacker); if (task->data[11] == 1) { task->data[12] = gBattle_BG1_X; @@ -331,7 +331,7 @@ static void sub_80E1284(u8 taskId) task->data[13] = gBattle_BG2_Y; } - var0 = sub_8077FC0(gAnimBankAttacker); + var0 = sub_8077FC0(gBattleAnimAttacker); task->data[14] = var0 - 32; task->data[15] = var0 + 32; if (task->data[14] < 0) @@ -388,7 +388,7 @@ static void sub_80E143C(u8 taskId) gSprites[spriteId].pos2.x = 0; gSprites[spriteId].pos2.y = 0; - if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1) + if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1) gBattle_BG1_Y = 0; else gBattle_BG2_Y = 0; @@ -435,13 +435,13 @@ static void sub_80E1560(u8 taskId) { case 0: task->data[10] = GetAnimBattlerSpriteId(0); - task->data[11] = GetBattlerPosition_permutated(gAnimBankAttacker); + task->data[11] = GetBattlerPosition_permutated(gBattleAnimAttacker); if (task->data[11] == 1) task->data[12] = gBattle_BG1_X; else task->data[12] = gBattle_BG2_X; - var0 = sub_8077FC0(gAnimBankAttacker); + var0 = sub_8077FC0(gBattleAnimAttacker); task->data[14] = var0 - 32; task->data[15] = var0 + 32; task->data[0]++; @@ -520,9 +520,9 @@ static void AnimFissureDirtPlumeParticle(struct Sprite *sprite) s16 xOffset; if (gBattleAnimArgs[0] == 0) - battler = gAnimBankAttacker; + battler = gBattleAnimAttacker; else - battler = gAnimBankTarget; + battler = gBattleAnimTarget; xOffset = 24; if (gBattleAnimArgs[1] == 1) @@ -558,9 +558,9 @@ static void AnimDigDirtMound(struct Sprite *sprite) s8 battler; if (gBattleAnimArgs[0] == 0) - battler = gAnimBankAttacker; + battler = gBattleAnimAttacker; else - battler = gAnimBankTarget; + battler = gBattleAnimTarget; sprite->pos1.x = GetBattlerSpriteCoord(battler, 0) - 16 + (gBattleAnimArgs[1] * 32); sprite->pos1.y = sub_8077FC0(battler) + 32; @@ -729,7 +729,7 @@ void sub_80E1B88(u8 taskId) void sub_80E1BB0(u8 taskId) { struct Task *newTask; - u8 battler = (gBattleAnimArgs[0] & 1) ? gAnimBankTarget : gAnimBankAttacker; + u8 battler = (gBattleAnimArgs[0] & 1) ? gBattleAnimTarget : gBattleAnimAttacker; if (gBattleAnimArgs[0] > 1) battler ^= 2; diff --git a/src/battle/anim/grow.c b/src/battle/anim/grow.c index ad535ad7f..aeaeb2c30 100644 --- a/src/battle/anim/grow.c +++ b/src/battle/anim/grow.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; static void sub_80D0904(u8 taskId); diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c index 779895831..9f9685003 100644 --- a/src/battle/anim/guard.c +++ b/src/battle/anim/guard.c @@ -4,8 +4,8 @@ #include "rom_8077ABC.h" extern s16 gBattleAnimArgs[8]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u16 gBattleTypeFlags; void sub_80D3014(struct Sprite *sprite); @@ -44,17 +44,17 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7D74 = void sub_80D3014(struct Sprite *sprite) { - if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) + if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2)) { - SetAverageBattlerPositions(gAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y); + SetAverageBattlerPositions(gBattleAnimAttacker, 0, &sprite->pos1.x, &sprite->pos1.y); sprite->pos1.y += 40; StartSpriteAffineAnim(sprite, 1); } else { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 40; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 40; } sprite->data[0] = 13; diff --git a/src/battle/anim/guillotine.c b/src/battle/anim/guillotine.c index cfad4837b..e2de9a0ec 100644 --- a/src/battle/anim/guillotine.c +++ b/src/battle/anim/guillotine.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D0228(struct Sprite* sprite); static void sub_80D02D0(struct Sprite* sprite); @@ -68,9 +68,9 @@ void sub_80D0228(struct Sprite* sprite) sprite->pos1.y += r4; sprite->data[0] = 6; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + r9; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + r9; sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + r6; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + r6; InitAnimLinearTranslation(sprite); sprite->data[5] = gBattleAnimArgs[0]; sprite->data[6] = sprite->data[0]; diff --git a/src/battle/anim/heal.c b/src/battle/anim/heal.c index c44dd4ba4..0f35d7508 100644 --- a/src/battle/anim/heal.c +++ b/src/battle/anim/heal.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CBAA4(struct Sprite* sprite); diff --git a/src/battle/anim/heal_bell.c b/src/battle/anim/heal_bell.c index 25b1ccc51..e191460ea 100644 --- a/src/battle/anim/heal_bell.c +++ b/src/battle/anim/heal_bell.c @@ -8,8 +8,8 @@ #include "decompress.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern const u8 gBattleAnimSpritePalette_206[]; @@ -120,12 +120,12 @@ static void sub_80D1BA8(struct Sprite* sprite, u8 a, u8 b) void sub_80D1C08(struct Sprite* sprite) { InitAnimSpritePos(sprite, 0); - if (GetBattlerSide(gAnimBankAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != 0) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[3]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[3]; sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sub_80D1BA8(sprite, gBattleAnimArgs[5], gBattleAnimArgs[6]); diff --git a/src/battle/anim/heart_1.c b/src/battle/anim/heart_1.c index 523e0082d..f9e6b5080 100644 --- a/src/battle/anim/heart_1.c +++ b/src/battle/anim/heart_1.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D1C80(struct Sprite* sprite); diff --git a/src/battle/anim/hidden_power_orbit.c b/src/battle/anim/hidden_power_orbit.c index 3d1cd74c0..63557c6e0 100644 --- a/src/battle/anim/hidden_power_orbit.c +++ b/src/battle/anim/hidden_power_orbit.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void AnimOrbitFast(struct Sprite* sprite); void AnimOrbitScatter(struct Sprite* sprite); @@ -53,12 +53,12 @@ const struct SpriteTemplate gHiddenPowerOrbScatterSpriteTemplate = // arg 1: initial wave offset void AnimOrbitFast(struct Sprite* sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->affineAnimPaused = 1; sprite->data[0] = gBattleAnimArgs[0]; sprite->data[1] = gBattleAnimArgs[1]; - sprite->data[7] = GetBattlerSubpriority(gAnimBankAttacker); + sprite->data[7] = GetBattlerSubpriority(gBattleAnimAttacker); sprite->callback = AnimOrbitFastStep; sprite->callback(sprite); } @@ -104,8 +104,8 @@ static void AnimOrbitFastStep(struct Sprite* sprite) // arg 0: initial wave offset void AnimOrbitScatter(struct Sprite* sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[0] = Sin(gBattleAnimArgs[0], 10); sprite->data[1] = Cos(gBattleAnimArgs[0], 7); sprite->callback = AnimOrbitScatterStep; diff --git a/src/battle/anim/homing.c b/src/battle/anim/homing.c index 4b2365542..874b9ea4e 100644 --- a/src/battle/anim/homing.c +++ b/src/battle/anim/homing.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CC6CC(struct Sprite* sprite); static void sub_80CC7D4(struct Sprite* sprite); @@ -41,13 +41,13 @@ void sub_80CC6CC(struct Sprite* sprite) { if (gBattleAnimArgs[0] == 0) { - a = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - b = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + a = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + b = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); } else { - a = GetBattlerSpriteCoord(gAnimBankTarget, 2); - b = GetBattlerSpriteCoord(gAnimBankTarget, 3); + a = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + b = GetBattlerSpriteCoord(gBattleAnimTarget, 3); } sprite->data[0] = gBattleAnimArgs[4]; diff --git a/src/battle/anim/hop.c b/src/battle/anim/hop.c index dcf8ed702..4e3a74ffe 100644 --- a/src/battle/anim/hop.c +++ b/src/battle/anim/hop.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CB94C(struct Sprite* sprite); void sub_80CBA28(struct Sprite* sprite); @@ -57,7 +57,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D671C = .callback = sub_80CB94C, }; -const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6734 = +const struct SpriteTemplate gFallingItemBagTemplate = { .tileTag = ANIM_TAG_ITEM_BAG, .paletteTag = ANIM_TAG_ITEM_BAG, @@ -150,9 +150,9 @@ void sub_80CB94C(struct Sprite* sprite) s16 e1; s16 e2; InitAnimSpritePos(sprite, 0); - e1 = GetBattlerSpriteCoord(gAnimBankTarget, 0); - e2 = GetBattlerSpriteCoord(gAnimBankTarget, 1); - if ((gAnimBankAttacker ^ 2) == gAnimBankTarget) + e1 = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + e2 = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + if ((gBattleAnimAttacker ^ 2) == gBattleAnimTarget) { sprite->data[6] = e1; sprite->data[7] = e2 + 10; @@ -193,8 +193,8 @@ void sub_80CB9C4(struct Sprite* sprite) void sub_80CBA28(struct Sprite* sprite) { - s16 e = GetBattlerSpriteCoord(gAnimBankTarget, 1); - if (GetBattlerSide(gAnimBankTarget) == 0) + s16 e = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + if (GetBattlerSide(gBattleAnimTarget) == 0) { sprite->data[6] = 0; sprite->data[7] = e + 10; diff --git a/src/battle/anim/hop_2.c b/src/battle/anim/hop_2.c index 5ebefd626..83d67c94a 100644 --- a/src/battle/anim/hop_2.c +++ b/src/battle/anim/hop_2.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern void sub_80CB7EC(struct Sprite* sprite, s16 c); extern bool8 sub_80CB814(struct Sprite* sprite); @@ -36,9 +36,9 @@ void sub_80CBAE8(struct Sprite* sprite) s16 p1; s16 p2; sub_8078764(sprite, FALSE); - p1 = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - p2 = GetBattlerSpriteCoord(gAnimBankAttacker, 1); - if ((gAnimBankTarget ^ 2) == gAnimBankAttacker) + p1 = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + p2 = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); + if ((gBattleAnimTarget ^ 2) == gBattleAnimAttacker) { sprite->data[6] = p1; sprite->data[7] = p2 + 10; diff --git a/src/battle/anim/ice.c b/src/battle/anim/ice.c index 5ad79051f..b9f8f2f2c 100644 --- a/src/battle/anim/ice.c +++ b/src/battle/anim/ice.c @@ -11,8 +11,8 @@ #include "random.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u8 gAnimVisualTaskCount; extern u8 gBanksBySide[]; extern u8 gBankSpriteIds[]; @@ -543,10 +543,10 @@ static void sub_80D7704(struct Sprite *sprite) //u8 battler1, battler2, battler3, battler4; - //battler1 = GetBattlerSpriteCoord(gAnimBankTarget, 2); - //battler2 = GetBattlerSpriteCoord(gAnimBankTarget, 3); - //battler3 = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - //battler4 = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + //battler1 = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + //battler2 = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + //battler3 = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + //battler4 = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); //sprite->oam.tileNum += 7; @@ -557,10 +557,10 @@ static void sub_80D7704(struct Sprite *sprite) //sprite->data[3] = battler4 + gBattleAnimArgs[1]; //sprite->data[4] = battler2 + gBattleAnimArgs[3]; - r9 = GetBattlerSpriteCoord(gAnimBankTarget, 2); - r8 = GetBattlerSpriteCoord(gAnimBankTarget, 3); - r3 = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - r6 = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + r9 = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + r8 = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + r3 = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + r6 = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[0] = gBattleAnimArgs[4]; @@ -614,7 +614,7 @@ NAKED static void sub_80D7704(struct Sprite *sprite) "\tands r0, r2\n" "\torrs r0, r1\n" "\tstrh r0, [r5, 0x4]\n" - "\tldr r4, _080D7814 @ =gAnimBankTarget\n" + "\tldr r4, _080D7814 @ =gBattleAnimTarget\n" "\tldrb r0, [r4]\n" "\tmovs r1, 0x2\n" "\tbl GetBattlerSpriteCoord\n" @@ -627,7 +627,7 @@ NAKED static void sub_80D7704(struct Sprite *sprite) "\tlsls r0, 24\n" "\tlsrs r0, 24\n" "\tmov r8, r0\n" - "\tldr r4, _080D7818 @ =gAnimBankAttacker\n" + "\tldr r4, _080D7818 @ =gBattleAnimAttacker\n" "\tldrb r0, [r4]\n" "\tmovs r1, 0x2\n" "\tbl GetBattlerSpriteCoord\n" @@ -728,8 +728,8 @@ NAKED static void sub_80D7704(struct Sprite *sprite) "\t.align 2, 0\n" "_080D780C: .4byte 0x000003ff\n" "_080D7810: .4byte 0xfffffc00\n" - "_080D7814: .4byte gAnimBankTarget\n" - "_080D7818: .4byte gAnimBankAttacker\n" + "_080D7814: .4byte gBattleAnimTarget\n" + "_080D7818: .4byte gBattleAnimAttacker\n" "_080D781C: .4byte gBattleAnimArgs\n" "_080D7820:\n" "\tlsls r1, r3, 16\n" @@ -829,14 +829,14 @@ static void AnimIcePunchSwirlingParticle(struct Sprite *sprite) static void AnimIceBeamParticle(struct Sprite *sprite) { InitAnimSpritePos(sprite, 1); - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) sprite->data[2] -= gBattleAnimArgs[2]; else sprite->data[2] += gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; sprite->data[0] = gBattleAnimArgs[4]; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->callback = StartAnimLinearTranslation; @@ -855,8 +855,8 @@ static void AnimIceEffectParticle(struct Sprite *sprite) } else { - SetAverageBattlerPositions(gAnimBankTarget, 1, &sprite->pos1.x, &sprite->pos1.y); - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->pos1.x, &sprite->pos1.y); + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; sprite->pos1.x += gBattleAnimArgs[0]; @@ -895,15 +895,15 @@ static void AnimSwirlingSnowball_Step1(struct Sprite *sprite) if (!gBattleAnimArgs[5]) { - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; } else { - SetAverageBattlerPositions(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]); + SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->data[2], &sprite->data[4]); } - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) sprite->data[2] -= gBattleAnimArgs[2]; else sprite->data[2] += gBattleAnimArgs[2]; @@ -948,7 +948,7 @@ static void AnimSwirlingSnowball_Step2(struct Sprite *sprite) sprite->pos2.x = 0; sprite->data[0] = 128; - tempVar = GetBattlerSide(gAnimBankAttacker) != 0 ? 20 : 65516; + tempVar = GetBattlerSide(gBattleAnimAttacker) != 0 ? 20 : 65516; sprite->data[3] = Sin(sprite->data[0], tempVar); sprite->data[4] = Cos(sprite->data[0], 0xF); @@ -960,7 +960,7 @@ static void AnimSwirlingSnowball_Step2(struct Sprite *sprite) static void AnimSwirlingSnowball_Step3(struct Sprite *sprite) { s16 tempVar; - tempVar = GetBattlerSide(gAnimBankAttacker) != 0 ? 20 : 65516; + tempVar = GetBattlerSide(gBattleAnimAttacker) != 0 ? 20 : 65516; if (sprite->data[5] <= 31) { @@ -1015,15 +1015,15 @@ static void AnimMoveParticleBeyondTarget(struct Sprite *sprite) if (!gBattleAnimArgs[7]) { - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); } else { - SetAverageBattlerPositions(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]); + SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->data[2], &sprite->data[4]); } - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) sprite->data[2] -= gBattleAnimArgs[2]; else sprite->data[2] += gBattleAnimArgs[2]; @@ -1091,9 +1091,9 @@ static void AnimWaveFromCenterOfTarget(struct Sprite *sprite) } else { - SetAverageBattlerPositions(gAnimBankTarget, 0, &sprite->pos1.x, &sprite->pos1.y); + SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y); - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; sprite->pos1.x += gBattleAnimArgs[0]; @@ -1129,8 +1129,8 @@ static void InitSwirlingFogAnim(struct Sprite *sprite) } else { - SetAverageBattlerPositions(gAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y); - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + SetAverageBattlerPositions(gBattleAnimAttacker, 0, &sprite->pos1.x, &sprite->pos1.y); + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) sprite->pos1.x -= gBattleAnimArgs[0]; else sprite->pos1.x += gBattleAnimArgs[0]; @@ -1138,7 +1138,7 @@ static void InitSwirlingFogAnim(struct Sprite *sprite) sprite->pos1.y += gBattleAnimArgs[1]; } - battler = gAnimBankAttacker; + battler = gBattleAnimAttacker; } else { @@ -1148,8 +1148,8 @@ static void InitSwirlingFogAnim(struct Sprite *sprite) } else { - SetAverageBattlerPositions(gAnimBankTarget, 0, &sprite->pos1.x, &sprite->pos1.y); - if (GetBattlerSide(gAnimBankTarget) != B_SIDE_PLAYER) + SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y); + if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER) sprite->pos1.x -= gBattleAnimArgs[0]; else sprite->pos1.x += gBattleAnimArgs[0]; @@ -1157,7 +1157,7 @@ static void InitSwirlingFogAnim(struct Sprite *sprite) sprite->pos1.y += gBattleAnimArgs[1]; } - battler = gAnimBankTarget; + battler = gBattleAnimTarget; } sprite->data[7] = battler; @@ -1167,7 +1167,7 @@ static void InitSwirlingFogAnim(struct Sprite *sprite) tempVar = 0x40; sprite->data[6] = tempVar; - if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) sprite->pos1.y += 8; sprite->data[0] = gBattleAnimArgs[3]; @@ -1308,8 +1308,8 @@ static void AnimTask_Haze2(u8 taskId) // arg 5: ??? unknown (seems to vibrate target mon somehow) static void AnimThrowMistBall(struct Sprite *sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->callback = TranslateAnimSpriteToTargetMonLocation; } @@ -1416,37 +1416,37 @@ static void InitPoisonGasCloudAnim(struct Sprite *sprite) { sprite->data[0] = gBattleAnimArgs[0]; - if (GetBattlerSpriteCoord(gAnimBankAttacker, 2) < GetBattlerSpriteCoord(gAnimBankTarget, 2)) + if (GetBattlerSpriteCoord(gBattleAnimAttacker, 2) < GetBattlerSpriteCoord(gBattleAnimTarget, 2)) sprite->data[7] = 0x8000; - if (!(gBanksBySide[gAnimBankTarget] & 1)) + if (!(gBanksBySide[gBattleAnimTarget] & 1)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; gBattleAnimArgs[3] = -gBattleAnimArgs[3]; - if ((sprite->data[7] & 0x8000) && !(gBanksBySide[gAnimBankAttacker] & 1)) + if ((sprite->data[7] & 0x8000) && !(gBanksBySide[gBattleAnimAttacker] & 1)) sprite->subpriority = gSprites[GetAnimBattlerSpriteId(1)].subpriority + 1; sprite->data[6] = 1; } - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); if (gBattleAnimArgs[7]) { sprite->data[1] = sprite->pos1.x + gBattleAnimArgs[1]; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[3]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[3]; sprite->data[3] = sprite->pos1.y + gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[4]; - sprite->data[7] |= sub_8079ED4(gAnimBankTarget) << 8; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[4]; + sprite->data[7] |= sub_8079ED4(gBattleAnimTarget) << 8; } else { sprite->data[1] = sprite->pos1.x + gBattleAnimArgs[1]; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[3]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[3]; sprite->data[3] = sprite->pos1.y + gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[4]; - sprite->data[7] |= sub_8079ED4(gAnimBankTarget) << 8; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[4]; + sprite->data[7] |= sub_8079ED4(gBattleAnimTarget) << 8; } if (IsContest()) @@ -1483,14 +1483,14 @@ static void sub_80D8874(struct Sprite *sprite) { value2 = 80; sprite->data[0] = value2; - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); sprite->data[1] = sprite->pos1.x; sprite->data[2] = sprite->pos1.x; sprite->pos1.y += sprite->pos2.y; sprite->data[3] = sprite->pos1.y; sprite->data[4] = sprite->pos1.y + 29; sprite->data[7]++; - if (gMain.inBattle && gBanksBySide[gAnimBankTarget] & 1) + if (gMain.inBattle && gBanksBySide[gBattleAnimTarget] & 1) sprite->data[5] = 204; else sprite->data[5] = value2; @@ -1535,7 +1535,7 @@ static void sub_80D8874(struct Sprite *sprite) sprite->data[1] = sprite->pos1.x += sprite->pos2.x; sprite->data[3] = sprite->pos1.y += sprite->pos2.y; sprite->data[4] = sprite->pos1.y + 4; - if (gMain.inBattle && gBanksBySide[gAnimBankTarget] & 1) + if (gMain.inBattle && gBanksBySide[gBattleAnimTarget] & 1) sprite->data[2] = 0x100; else sprite->data[2] = -0x10; @@ -1619,7 +1619,7 @@ NAKED static void sub_80D8874(struct Sprite *sprite) "_080D88D6:\n" "\tmovs r5, 0x50\n" "\tstrh r5, [r4, 0x2E]\n" - "\tldr r6, _080D8928 @ =gAnimBankTarget\n" + "\tldr r6, _080D8928 @ =gBattleAnimTarget\n" "\tldrb r0, [r6]\n" "\tmovs r1, 0\n" "\tbl GetBattlerSpriteCoord\n" @@ -1658,7 +1658,7 @@ NAKED static void sub_80D8874(struct Sprite *sprite) "\tstrh r0, [r4, 0x38]\n" "\tb _080D893A\n" "\t.align 2, 0\n" - "_080D8928: .4byte gAnimBankTarget\n" + "_080D8928: .4byte gBattleAnimTarget\n" "_080D892C: .4byte gMain\n" "_080D8930: .4byte 0x0000043d\n" "_080D8934: .4byte gBanksBySide\n" @@ -1807,7 +1807,7 @@ NAKED static void sub_80D8874(struct Sprite *sprite) "\tcmp r0, 0\n" "\tbeq _080D8A78\n" "\tldr r1, _080D8A70 @ =gBanksBySide\n" - "\tldr r0, _080D8A74 @ =gAnimBankTarget\n" + "\tldr r0, _080D8A74 @ =gBattleAnimTarget\n" "\tldrb r0, [r0]\n" "\tadds r0, r1\n" "\tldrb r1, [r0]\n" @@ -1822,7 +1822,7 @@ NAKED static void sub_80D8874(struct Sprite *sprite) "_080D8A68: .4byte gMain\n" "_080D8A6C: .4byte 0x0000043d\n" "_080D8A70: .4byte gBanksBySide\n" - "_080D8A74: .4byte gAnimBankTarget\n" + "_080D8A74: .4byte gBattleAnimTarget\n" "_080D8A78:\n" "\tldr r0, _080D8A90 @ =0x0000fff0\n" "_080D8A7A:\n" @@ -2253,11 +2253,11 @@ static void InitIceBallAnim(struct Sprite *sprite) sprite->data[0] = gBattleAnimArgs[4]; - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[5]; InitAnimArcTranslation(sprite); diff --git a/src/battle/anim/kiss_fountain.c b/src/battle/anim/kiss_fountain.c index 4fc340e63..ac7cbfb0f 100644 --- a/src/battle/anim/kiss_fountain.c +++ b/src/battle/anim/kiss_fountain.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D1FDC(struct Sprite* sprite); diff --git a/src/battle/anim/leaf.c b/src/battle/anim/leaf.c index a60390dc5..5f7f9d288 100644 --- a/src/battle/anim/leaf.c +++ b/src/battle/anim/leaf.c @@ -5,8 +5,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CAED8(struct Sprite* sprite); void AnimMoveTwisterParticle(struct Sprite* sprite); @@ -117,8 +117,8 @@ const struct SpriteTemplate gSwiftStarSpriteTemplate = void sub_80CAED8(struct Sprite* sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[0] = gBattleAnimArgs[0]; sprite->data[1] = gBattleAnimArgs[1]; sprite->data[2] = gBattleAnimArgs[2]; @@ -153,7 +153,7 @@ static void sub_80CAF20(struct Sprite* sprite) static void sub_80CAF6C(struct Sprite* sprite) { - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) { sprite->pos2.x = -Sin(sprite->data[0], 0x19); } @@ -188,7 +188,7 @@ static void sub_80CAF6C(struct Sprite* sprite) void AnimTranslateLinearSingleSineWave(struct Sprite* sprite) { InitAnimSpritePos(sprite, 1); - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } @@ -196,19 +196,19 @@ void AnimTranslateLinearSingleSineWave(struct Sprite* sprite) sprite->data[0] = gBattleAnimArgs[4]; if (!gBattleAnimArgs[6]) { - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; } else { - SetAverageBattlerPositions(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]); + SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->data[2], &sprite->data[4]); sprite->data[2] += gBattleAnimArgs[2]; sprite->data[4] += gBattleAnimArgs[3]; } sprite->data[5] = gBattleAnimArgs[5]; InitAnimArcTranslation(sprite); - if (GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget)) + if (GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget)) { sprite->data[0] = 1; } @@ -262,7 +262,7 @@ void AnimMoveTwisterParticle(struct Sprite* sprite) { if (!IsContest() && IsDoubleBattle() == TRUE) { - SetAverageBattlerPositions(gAnimBankTarget, 1, &sprite->pos1.x, &sprite->pos1.y); + SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->pos1.x, &sprite->pos1.y); } sprite->pos1.y += 32; @@ -295,11 +295,11 @@ static void AnimMoveTwisterParticleStep(struct Sprite* sprite) sprite->pos2.y = Sin(sprite->data[5], 5); if (sprite->data[5] <= 0x7F) { - sprite->oam.priority = sub_8079ED4(gAnimBankTarget) - 1; + sprite->oam.priority = sub_8079ED4(gBattleAnimTarget) - 1; } else { - sprite->oam.priority = sub_8079ED4(gAnimBankTarget) + 1; + sprite->oam.priority = sub_8079ED4(gBattleAnimTarget) + 1; } sprite->data[0]--; diff --git a/src/battle/anim/love_bg.c b/src/battle/anim/love_bg.c index 72d9325f2..0400fd9c4 100644 --- a/src/battle/anim/love_bg.c +++ b/src/battle/anim/love_bg.c @@ -7,8 +7,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern const u8 gAttractTilemap[]; extern const u8 gAttractGfx[]; diff --git a/src/battle/anim/lunge.c b/src/battle/anim/lunge.c index 13cabb422..ce6aa58f4 100644 --- a/src/battle/anim/lunge.c +++ b/src/battle/anim/lunge.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u8 gBankSpriteIds[]; @@ -71,9 +71,9 @@ void sub_80CD774(struct Sprite* sprite) static void sub_80CD7CC(struct Sprite* sprite) { sprite->data[0] = 6; - sprite->data[1] = (GetBattlerSide(gAnimBankAttacker)) ? 2 : -2; + sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? 2 : -2; sprite->data[2] = 0; - sprite->data[3] = gBankSpriteIds[gAnimBankAttacker]; + sprite->data[3] = gBankSpriteIds[gBattleAnimAttacker]; StoreSpriteCallbackInData(sprite, sub_80CD81C); sprite->callback = TranslateMonBGUntil; } @@ -82,9 +82,9 @@ static void sub_80CD81C(struct Sprite* sprite) { if (sprite->data[0] == 0) { - sprite->data[3] = gBankSpriteIds[gAnimBankAttacker]; + sprite->data[3] = gBankSpriteIds[gBattleAnimAttacker]; sub_8078E70(sprite->data[3], 0); - sprite->data[4] = (sprite->data[6] = GetBattlerSide(gAnimBankAttacker)) ? 0x300 : 0xFFFFFD00; + sprite->data[4] = (sprite->data[6] = GetBattlerSide(gBattleAnimAttacker)) ? 0x300 : 0xFFFFFD00; sprite->data[5] = 0; } @@ -101,9 +101,9 @@ static void sub_80CD81C(struct Sprite* sprite) static void sub_80CD8A8(struct Sprite* sprite) { sprite->data[0] = 4; - sprite->data[1] = (GetBattlerSide(gAnimBankAttacker)) ? -3 : 3; + sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? -3 : 3; sprite->data[2] = 0; - sprite->data[3] = gBankSpriteIds[gAnimBankAttacker]; + sprite->data[3] = gBankSpriteIds[gBattleAnimAttacker]; StoreSpriteCallbackInData(sprite, sub_80CD9B8); sprite->callback = TranslateMonBGUntil; } @@ -121,9 +121,9 @@ static void sub_80CD91C(struct Sprite* sprite) { if (sprite->data[0] == 0) { - sprite->data[3] = gBankSpriteIds[gAnimBankAttacker]; - sprite->data[6] = GetBattlerSide(gAnimBankAttacker); - if (GetBattlerSide(gAnimBankAttacker)) + sprite->data[3] = gBankSpriteIds[gBattleAnimAttacker]; + sprite->data[6] = GetBattlerSide(gBattleAnimAttacker); + if (GetBattlerSide(gBattleAnimAttacker)) { sprite->data[4] = 0xFC00; sprite->data[5] = 0xC00; @@ -162,8 +162,8 @@ static void sub_80CD9D4(struct Sprite* sprite) { case 0: sprite->data[1] = 0; - sprite->data[2] = gBankSpriteIds[gAnimBankAttacker]; - sprite->data[3] = GetBattlerSide(gAnimBankAttacker); + sprite->data[2] = gBankSpriteIds[gBattleAnimAttacker]; + sprite->data[3] = GetBattlerSide(gBattleAnimAttacker); sprite->data[4] = (sprite->data[3] != 0) ? 0x200 : -0x200; sprite->data[5] = 0; sub_8078E70(sprite->data[2], 0); @@ -196,8 +196,8 @@ void sub_80CDAC8(u8 taskId) { u8 a; - gTasks[taskId].data[0] = gBankSpriteIds[gAnimBankAttacker]; - a = GetBattlerSide(gAnimBankAttacker); + gTasks[taskId].data[0] = gBankSpriteIds[gBattleAnimAttacker]; + a = GetBattlerSide(gBattleAnimAttacker); gTasks[taskId].data[1] = a; gTasks[taskId].data[2] = 0; switch (gBattleAnimArgs[0]) diff --git a/src/battle/anim/money.c b/src/battle/anim/money.c index e23b38012..03af2f8e1 100644 --- a/src/battle/anim/money.c +++ b/src/battle/anim/money.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CFE9C(struct Sprite* sprite); void sub_80CFF50(struct Sprite* sprite); @@ -66,9 +66,9 @@ void sub_80CFE9C(struct Sprite* sprite) u16 var; InitAnimSpritePos(sprite, 1); - r6 = GetBattlerSpriteCoord(gAnimBankTarget, 2); - r7 = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; - if (GetBattlerSide(gAnimBankAttacker) != 0) + r6 = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + r7 = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; + if (GetBattlerSide(gBattleAnimAttacker) != 0) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; r6 += gBattleAnimArgs[2]; @@ -93,7 +93,7 @@ static void sub_80CFF68(struct Sprite* sprite) { sprite->data[0] += 0x80; sprite->pos2.x = sprite->data[0] >> 8; - if (GetBattlerSide(gAnimBankAttacker) == 0) + if (GetBattlerSide(gBattleAnimAttacker) == 0) sprite->pos2.x = -sprite->pos2.x; sprite->pos2.y = Sin(sprite->data[1], sprite->data[2]); diff --git a/src/battle/anim/moon.c b/src/battle/anim/moon.c index fe2e7a849..30639a0e5 100644 --- a/src/battle/anim/moon.c +++ b/src/battle/anim/moon.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CE30C(struct Sprite* sprite); static void sub_80CE354(struct Sprite* sprite); diff --git a/src/battle/anim/musical.c b/src/battle/anim/musical.c index c0269a379..5e4e3e97b 100644 --- a/src/battle/anim/musical.c +++ b/src/battle/anim/musical.c @@ -6,8 +6,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CEB0C(struct Sprite* sprite); void sub_80CECE8(struct Sprite* sprite); @@ -221,8 +221,8 @@ void sub_80CEB0C(struct Sprite* sprite) } else { - a = GetBattlerSpriteCoord(gAnimBankTarget, 2); - b = GetBattlerSpriteCoord(gAnimBankTarget, 3); + a = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + b = GetBattlerSpriteCoord(gBattleAnimTarget, 3); } sprite->data[4] = sprite->pos1.x << 4; @@ -288,14 +288,14 @@ static void sub_80CEC1C(struct Sprite* sprite) void sub_80CECE8(struct Sprite* sprite) { int a; - if (GetBattlerSide(gAnimBankAttacker) == 1) + if (GetBattlerSide(gBattleAnimAttacker) == 1) { a = gBattleAnimArgs[1]; (u16)gBattleAnimArgs[1] = -a; } - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; StartSpriteAnim(sprite, gBattleAnimArgs[0]); sprite->data[2] = 0; sprite->data[3] = 0; @@ -341,8 +341,8 @@ void sub_80CEDF0(struct Sprite* sprite) a = -16; } - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + a; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + 8; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + a; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + 8; sprite->data[0] = 8; sprite->callback = WaitAnimForDuration; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); diff --git a/src/battle/anim/noise.c b/src/battle/anim/noise.c index f4ea10bf9..65d962ace 100644 --- a/src/battle/anim/noise.c +++ b/src/battle/anim/noise.c @@ -3,8 +3,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[8]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D2D68(struct Sprite* sprite); static void sub_80D2E30(struct Sprite *); @@ -26,7 +26,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7CC8 = void sub_80D2D68(struct Sprite* sprite) { int var1; - u8 slot = gBattleAnimArgs[0] == 0 ? gAnimBankAttacker : gAnimBankTarget; + u8 slot = gBattleAnimArgs[0] == 0 ? gBattleAnimAttacker : gBattleAnimTarget; if (GetBattlerSide(slot) == 1) { diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c index 9f0007e97..d42549fc7 100644 --- a/src/battle/anim/normal.c +++ b/src/battle/anim/normal.c @@ -14,8 +14,8 @@ #include "constants/songs.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u8 gHealthboxIDs[]; extern u8 gBattlersCount; extern u8 gBankSpriteIds[]; @@ -313,7 +313,7 @@ static void AnimConfusionDuck(struct Sprite *sprite) sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; sprite->data[0] = gBattleAnimArgs[2]; - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { sprite->data[1] = -gBattleAnimArgs[3]; sprite->data[4] = 1; @@ -362,10 +362,10 @@ static void AnimSimplePaletteBlend(struct Sprite *sprite) // Unpacks a bitfield and returns a bitmask of its selected palettes. // Bits 0-6 of the selector parameter result in the following palettes being selected: // 0: battle background palettes (BG palettes 1, 2, and 3) -// 1: gAnimBankAttacker OBJ palette -// 2: gAnimBankTarget OBJ palette -// 3: gAnimBankAttacker partner OBJ palette -// 4: gAnimBankTarget partner OBJ palette +// 1: gBattleAnimAttacker OBJ palette +// 2: gBattleAnimTarget OBJ palette +// 3: gBattleAnimAttacker partner OBJ palette +// 4: gBattleAnimTarget partner OBJ palette // 5: BG palette 4 // 6: BG palette 5 static u32 UnpackSelectedBattleAnimPalettes(s16 selector) @@ -659,8 +659,8 @@ static void sub_80E22CC(u8 taskId) void sub_80E2324(u8 taskId) { u32 selectedPalettes = 0; - u8 attackerBattler = gAnimBankAttacker; - u8 targetBattler = gAnimBankTarget; + u8 attackerBattler = gBattleAnimAttacker; + u8 targetBattler = gBattleAnimTarget; if (gBattleAnimArgs[0] & 0x100) selectedPalettes = sub_80791A8(1, 0, 0, 0, 0, 0, 0); @@ -694,8 +694,8 @@ void unref_sub_80E23A8(u8 taskId) } gTasks[taskId].data[0]++; - attackerBattler = gAnimBankAttacker; - targetBattler = gAnimBankTarget; + attackerBattler = gBattleAnimAttacker; + targetBattler = gBattleAnimTarget; if (gTasks[taskId].data[2] & 0x100) selectedPalettes = 0x0000FFFF; @@ -790,20 +790,20 @@ static void sub_80E255C(struct Sprite *sprite) static void sub_80E260C(void) { - gSprites[gBankSpriteIds[gAnimBankAttacker]].coordOffsetEnabled = 0; - gSprites[gBankSpriteIds[gAnimBankTarget]].coordOffsetEnabled = 0; + gSprites[gBankSpriteIds[gBattleAnimAttacker]].coordOffsetEnabled = 0; + gSprites[gBankSpriteIds[gBattleAnimTarget]].coordOffsetEnabled = 0; if (gBattleAnimArgs[4] == 2) { - gSprites[gBankSpriteIds[gAnimBankAttacker]].coordOffsetEnabled = 1; - gSprites[gBankSpriteIds[gAnimBankTarget]].coordOffsetEnabled = 1; + gSprites[gBankSpriteIds[gBattleAnimAttacker]].coordOffsetEnabled = 1; + gSprites[gBankSpriteIds[gBattleAnimTarget]].coordOffsetEnabled = 1; } else { if (gBattleAnimArgs[4] == 0) - gSprites[gBankSpriteIds[gAnimBankAttacker]].coordOffsetEnabled = 1; + gSprites[gBankSpriteIds[gBattleAnimAttacker]].coordOffsetEnabled = 1; else - gSprites[gBankSpriteIds[gAnimBankTarget]].coordOffsetEnabled = 1; + gSprites[gBankSpriteIds[gBattleAnimTarget]].coordOffsetEnabled = 1; } } @@ -875,7 +875,7 @@ static void sub_80E27E8(struct Sprite *sprite) static void sub_80E2838(struct Sprite *sprite) { - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER && !IsContest()) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER && !IsContest()) gBattleAnimArgs[1] = -gBattleAnimArgs[1]; sub_80E27A0(sprite); @@ -967,28 +967,28 @@ void sub_80E2A7C(u8 taskId) selectedPalettes = 0; // fall through case 0: - sp[0] = gAnimBankAttacker; + sp[0] = gBattleAnimAttacker; break; case 3: selectedPalettes = 0; // fall through case 1: - sp[0] = gAnimBankTarget; + sp[0] = gBattleAnimTarget; break; case 4: - sp[0] = gAnimBankAttacker; - sp[1] = gAnimBankTarget; + sp[0] = gBattleAnimAttacker; + sp[1] = gBattleAnimTarget; break; case 5: sp[0] = 0xFF; break; case 6: selectedPalettes = 0; - sp[0] = gAnimBankAttacker ^ 2; + sp[0] = gBattleAnimAttacker ^ 2; break; case 7: selectedPalettes = 0; - sp[0] = gAnimBankTarget ^ 2; + sp[0] = gBattleAnimTarget ^ 2; break; } @@ -1201,12 +1201,12 @@ void sub_80E2F2C(u8 taskId) if (IsDoubleBattle() && !IsContest()) { - if (GetBattlerPosition(gAnimBankAttacker) == B_POSITION_OPPONENT_RIGHT - || GetBattlerPosition(gAnimBankAttacker) == B_POSITION_PLAYER_LEFT) + if (GetBattlerPosition(gBattleAnimAttacker) == B_POSITION_OPPONENT_RIGHT + || GetBattlerPosition(gBattleAnimAttacker) == B_POSITION_PLAYER_LEFT) { - if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2) == TRUE) + if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2) == TRUE) { - gSprites[gBankSpriteIds[gAnimBankAttacker ^ 2]].oam.priority -= 1; + gSprites[gBankSpriteIds[gBattleAnimAttacker ^ 2]].oam.priority -= 1; REG_BG1CNT_BITFIELD.priority = 1; var0 = 1; } @@ -1219,14 +1219,14 @@ void sub_80E2F2C(u8 taskId) } else { - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) - species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_SPECIES); + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES); else - species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_SPECIES); + species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES); } spriteId = GetAnimBattlerSpriteId(0); - newSpriteId = sub_807A4A0(gAnimBankAttacker, spriteId, species); + newSpriteId = sub_807A4A0(gBattleAnimAttacker, spriteId, species); sub_8078914(&subStruct); DmaFill32Defvars(3, 0, subStruct.field_4, 0x1000); LZDecompressVram(&gUnknown_08D20A30, subStruct.field_4); @@ -1275,7 +1275,7 @@ static void sub_80E3194(u8 taskId) sub_8078914(&subStruct); DmaFill32Defvars(3, 0, subStruct.field_4, 0x800); if (gTasks[taskId].data[6] == 1) - gSprites[gBankSpriteIds[gAnimBankAttacker ^ 2]].oam.priority++; + gSprites[gBankSpriteIds[gBattleAnimAttacker ^ 2]].oam.priority++; REG_BG1CNT_BITFIELD.areaOverflowMode = 0; do {} while(0); // needed to match. perhaps part of a debug macro @@ -1315,9 +1315,9 @@ static void sub_80E3338(u8 taskId) } if (taskData[2] == 0) - battler1 = gAnimBankAttacker; + battler1 = gBattleAnimAttacker; else - battler1 = gAnimBankTarget; + battler1 = gBattleAnimTarget; battler2 = battler1 ^ 2; if (IsContest() || (taskData[3] && !IsAnimBankSpriteVisible(battler2))) @@ -1576,7 +1576,7 @@ void sub_80E3A08(u8 taskId) for (i = 0; i < 4; i++) { - if (gAnimBankAttacker != i) + if (gBattleAnimAttacker != i) selectedPalettes |= 1 << (i + 16); } @@ -1592,7 +1592,7 @@ void sub_80E3A58(u8 taskId) sub_80789D4(0); newTaskId = CreateTask(sub_80E3AD0, 5); - if (gBattleAnimArgs[2] && GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (gBattleAnimArgs[2] && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { gBattleAnimArgs[0] = -gBattleAnimArgs[0]; gBattleAnimArgs[1] = -gBattleAnimArgs[1]; @@ -1625,19 +1625,19 @@ static void sub_80E3AD0(u8 taskId) void sub_80E3B4C(u8 taskId) { - gBattleAnimArgs[7] = GetBattlerSide(gAnimBankAttacker); + gBattleAnimArgs[7] = GetBattlerSide(gBattleAnimAttacker); DestroyAnimVisualTask(taskId); } void sub_80E3B78(u8 taskId) { - gBattleAnimArgs[7] = GetBattlerSide(gAnimBankTarget); + gBattleAnimArgs[7] = GetBattlerSide(gBattleAnimTarget); DestroyAnimVisualTask(taskId); } void sub_80E3BA4(u8 taskId) { - gBattleAnimArgs[7] = (gAnimBankAttacker ^ 2) == gAnimBankTarget; + gBattleAnimArgs[7] = (gBattleAnimAttacker ^ 2) == gBattleAnimTarget; DestroyAnimVisualTask(taskId); } @@ -1647,7 +1647,7 @@ void sub_80E3BDC(u8 taskId) for (i = 0; i < 4; i++) { - if (i != gAnimBankAttacker && IsAnimBankSpriteVisible(i)) + if (i != gBattleAnimAttacker && IsAnimBankSpriteVisible(i)) gSprites[gBankSpriteIds[i]].invisible = gBattleAnimArgs[0]; } @@ -1772,7 +1772,7 @@ static void sub_80E3E64(u8 taskId) } } -void sub_80E4008(u8 taskId) +void AnimTask_GetBattleTerrain(u8 taskId) { gBattleAnimArgs[0] = gBattleTerrain; DestroyAnimVisualTask(taskId); @@ -1796,11 +1796,11 @@ void sub_80E4028(u8 taskId) } else if (gBattleAnimArgs[0] == 1) { - i = gAnimBankAttacker + 16; + i = gBattleAnimAttacker + 16; } else if (gBattleAnimArgs[0] == 2) { - i = gAnimBankTarget + 16; + i = gBattleAnimTarget + 16; } offset = gBattleAnimArgs[1] * 32; @@ -1830,11 +1830,11 @@ void sub_80E40D0(u8 taskId) } else if (gBattleAnimArgs[0] == 1) { - i = gAnimBankAttacker + 16; + i = gBattleAnimAttacker + 16; } else if (gBattleAnimArgs[0] == 2) { - i = gAnimBankTarget + 16; + i = gBattleAnimTarget + 16; } dest = &((u8 *)gPlttBufferUnfaded)[i * 32]; @@ -1861,11 +1861,11 @@ void sub_80E4178(u8 taskId) } else if (gBattleAnimArgs[0] == 1) { - i = gAnimBankAttacker + 16; + i = gBattleAnimAttacker + 16; } else if (gBattleAnimArgs[0] == 2) { - i = gAnimBankTarget + 16; + i = gBattleAnimTarget + 16; } memcpy(&gPlttBufferUnfaded[i * 16], &gPlttBufferFaded[i * 16], 32); @@ -1884,14 +1884,14 @@ void sub_80E4200(u8 taskId) void sub_80E4234(u8 taskId) { - gAnimBankAttacker = gBankTarget; - gAnimBankTarget = gEffectBank; + gBattleAnimAttacker = gBankTarget; + gBattleAnimTarget = gEffectBank; DestroyAnimVisualTask(taskId); } void sub_80E4264(u8 taskId) { - if (GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget)) + if (GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget)) gBattleAnimArgs[7] = 1; else gBattleAnimArgs[7] = 0; @@ -1901,14 +1901,14 @@ void sub_80E4264(u8 taskId) void sub_80E42B0(u8 taskId) { - gAnimBankTarget = gBankTarget; + gBattleAnimTarget = gBankTarget; DestroyAnimVisualTask(taskId); } void sub_80E42D0(u8 taskId) { - gAnimBankAttacker = gBankAttacker; - gAnimBankTarget = gEffectBank; + gBattleAnimAttacker = gBankAttacker; + gBattleAnimTarget = gEffectBank; DestroyAnimVisualTask(taskId); } @@ -1920,8 +1920,8 @@ void sub_80E4300(u8 taskId) } else { - gTasks[taskId].data[0] = ewram17800[gAnimBankAttacker].invisible; - ewram17800[gAnimBankAttacker].invisible = 1; + gTasks[taskId].data[0] = ewram17800[gBattleAnimAttacker].invisible; + ewram17800[gBattleAnimAttacker].invisible = 1; gTasks[taskId].func = sub_80E4368; gAnimVisualTaskCount--; } @@ -1931,7 +1931,7 @@ static void sub_80E4368(u8 taskId) { if (gBattleAnimArgs[7] == 0x1000) { - ewram17800[gAnimBankAttacker].invisible = gTasks[taskId].data[0] & 1; + ewram17800[gBattleAnimAttacker].invisible = gTasks[taskId].data[0] & 1; DestroyTask(taskId); } } diff --git a/src/battle/anim/note_rain.c b/src/battle/anim/note_rain.c index 26ae96c3a..f849655f8 100644 --- a/src/battle/anim/note_rain.c +++ b/src/battle/anim/note_rain.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; // note_rain (notes rain from a source point, usually a bell.) // Used in Heal Bell. diff --git a/src/battle/anim/note_spin.c b/src/battle/anim/note_spin.c index 899357310..165820cc1 100644 --- a/src/battle/anim/note_spin.c +++ b/src/battle/anim/note_spin.c @@ -4,8 +4,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[8]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern const union AnimCmd *const gSpriteAnimTable_83D70D8[]; diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c index d59adde08..4d937a114 100644 --- a/src/battle/anim/orbit.c +++ b/src/battle/anim/orbit.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CABF8(struct Sprite* sprite); void sub_80CAD54(struct Sprite* sprite); @@ -110,11 +110,11 @@ static void sub_80CAC44(struct Sprite* sprite) sprite->pos2.y = Cos(sprite->data[1], -3) + ((sprite->data[2] += 24) >> 8); if ((u16)(sprite->data[1] - 0x40) < 0x80) { - sprite->oam.priority = (sub_8079ED4(gAnimBankTarget) & 3); + sprite->oam.priority = (sub_8079ED4(gBattleAnimTarget) & 3); } else { - var1 = sub_8079ED4(gAnimBankTarget) + 1; + var1 = sub_8079ED4(gBattleAnimTarget) + 1; if (var1 > 3) { var1 = 3; @@ -137,7 +137,7 @@ void sub_80CACEC(u8 taskId) } else { - if (GetBattlerPosition_permutated(gAnimBankTarget) == 1) + if (GetBattlerPosition_permutated(gBattleAnimTarget) == 1) { REG_BG2CNT_BITFIELD.priority = 3; } @@ -157,7 +157,7 @@ void sub_80CAD54(struct Sprite* sprite) sprite->data[1] = sprite->pos1.x; sprite->data[2] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; InitAnimLinearTranslation(sprite); sprite->data[5] = 0x40; sprite->callback = sub_80CADA8; @@ -172,11 +172,11 @@ static void sub_80CADA8(struct Sprite* sprite) sprite->pos2.y += Cos(sprite->data[5], -5); if ((u16)(sprite->data[5] - 0x40) < 0x80) { - sprite->subpriority = GetBattlerSubpriority(gAnimBankAttacker) - 1; + sprite->subpriority = GetBattlerSubpriority(gBattleAnimAttacker) - 1; } else { - sprite->subpriority = GetBattlerSubpriority(gAnimBankAttacker) + 1; + sprite->subpriority = GetBattlerSubpriority(gBattleAnimAttacker) + 1; } sprite->data[5] = (sprite->data[5] + 5) & 0xFF; @@ -194,7 +194,7 @@ void sub_80CAE20(struct Sprite* sprite) sprite->data[1] = sprite->pos1.x; sprite->data[2] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; InitAnimLinearTranslation(sprite); sprite->data[5] = 0x40; sprite->callback = sub_80CAE74; diff --git a/src/battle/anim/orbs.c b/src/battle/anim/orbs.c index 3301990ec..80cf97a5c 100644 --- a/src/battle/anim/orbs.c +++ b/src/battle/anim/orbs.c @@ -5,8 +5,8 @@ #include "random.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CA7B0(struct Sprite* sprite); void sub_80CA800(struct Sprite* sprite); @@ -194,8 +194,8 @@ void sub_80CA7B0(struct Sprite* sprite) { InitAnimSpritePos(sprite, 1); sprite->data[0] = gBattleAnimArgs[2]; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, move_anim_8074EE0); } @@ -205,8 +205,8 @@ void sub_80CA800(struct Sprite* sprite) InitAnimSpritePos(sprite, 1); StartSpriteAnim(sprite, gBattleAnimArgs[3]); sprite->data[0] = gBattleAnimArgs[2]; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } @@ -216,9 +216,9 @@ void sub_80CA858(struct Sprite* sprite) InitAnimSpritePos(sprite, 1); sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); InitAnimLinearTranslation(sprite); sprite->data[5] = gBattleAnimArgs[3]; sprite->callback = sub_80CA8B4; @@ -235,11 +235,11 @@ static void sub_80CA8B4(struct Sprite* sprite) { if (sprite->data[5] > 0x7F) { - sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) + 1; + sprite->subpriority = GetBattlerSubpriority(gBattleAnimTarget) + 1; } else { - sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) + 6; + sprite->subpriority = GetBattlerSubpriority(gBattleAnimTarget) + 6; } sprite->pos2.x += Sin(sprite->data[5], 5); sprite->pos2.y += Cos(sprite->data[5], 14); @@ -258,7 +258,7 @@ void sub_80CA928(u8 taskId) gBattleAnimArgs[1] = 0; gBattleAnimArgs[2] = 80; gBattleAnimArgs[3] = 0; - CreateSpriteAndAnimate(&gSpriteTemplate_83D631C, 0, 0, GetBattlerSubpriority(gAnimBankTarget) + 1); + CreateSpriteAndAnimate(&gSpriteTemplate_83D631C, 0, 0, GetBattlerSubpriority(gBattleAnimTarget) + 1); } if (gTasks[taskId].data[1] == 15) @@ -269,8 +269,8 @@ void sub_80CA9A8(struct Sprite* sprite) { sub_8078764(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[3]; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[5] = gBattleAnimArgs[2]; InitAnimArcTranslation(sprite); sprite->callback = sub_80CA9F8; @@ -288,9 +288,9 @@ void sub_80CAA14(struct Sprite* sprite) u16 b; StartSpriteAnim(sprite, a & 7); - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); - if (GetBattlerSide(gAnimBankAttacker)) + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + if (GetBattlerSide(gBattleAnimAttacker)) { sprite->pos1.x -= 20; } @@ -302,9 +302,9 @@ void sub_80CAA14(struct Sprite* sprite) b = Random(); sprite->data[0] = (b & 31) + 64; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sub_8078D60(sprite); sprite->data[5] = Random() & 0xFF; sprite->data[6] = sprite->subpriority; diff --git a/src/battle/anim/osmose.c b/src/battle/anim/osmose.c index 36949b3c5..26350cbbe 100644 --- a/src/battle/anim/osmose.c +++ b/src/battle/anim/osmose.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CB768(struct Sprite* sprite); @@ -39,8 +39,8 @@ void sub_80CB768(struct Sprite* sprite) { if (!sprite->data[0]) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1]; sprite->data[1] = gBattleAnimArgs[2]; sprite->data[2] = gBattleAnimArgs[3]; sprite->data[3] = gBattleAnimArgs[4]; diff --git a/src/battle/anim/perceive.c b/src/battle/anim/perceive.c index 0679dc617..921e21687 100644 --- a/src/battle/anim/perceive.c +++ b/src/battle/anim/perceive.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D2920(struct Sprite* sprite); diff --git a/src/battle/anim/poison.c b/src/battle/anim/poison.c index 004b1f478..9ec5bffa6 100644 --- a/src/battle/anim/poison.c +++ b/src/battle/anim/poison.c @@ -4,8 +4,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern const union AnimCmd *const gSpriteAnimTable_83D9310[]; @@ -200,8 +200,8 @@ void sub_80D9D70(struct Sprite *sprite) InitAnimSpritePos(sprite, 1); sprite->data[0] = gBattleAnimArgs[2]; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sprite->data[5] = -30; InitAnimArcTranslation(sprite); @@ -222,9 +222,9 @@ void sub_80D9DF0(struct Sprite *sprite) StartSpriteAnim(sprite, 2); InitAnimSpritePos(sprite, 1); - SetAverageBattlerPositions(gAnimBankTarget, 1, &l1, &l2); + SetAverageBattlerPositions(gBattleAnimTarget, 1, &l1, &l2); - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) gBattleAnimArgs[4] = -gBattleAnimArgs[4]; sprite->data[0] = gBattleAnimArgs[2]; @@ -272,9 +272,9 @@ static void sub_80D9EE8(struct Sprite *sprite) void sub_80D9F14(struct Sprite *sprite) { - SetAverageBattlerPositions(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y); + SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y); - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; sprite->pos1.x += gBattleAnimArgs[0]; @@ -302,9 +302,9 @@ void AnimBubbleEffect(struct Sprite *sprite) } else { - SetAverageBattlerPositions(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y); + SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y); - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; sprite->pos1.x += gBattleAnimArgs[0]; diff --git a/src/battle/anim/powder.c b/src/battle/anim/powder.c index 447f31866..58b34e0f3 100644 --- a/src/battle/anim/powder.c +++ b/src/battle/anim/powder.c @@ -4,7 +4,7 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; +extern u8 gBattleAnimAttacker; void AnimMovePowderParticle(struct Sprite* sprite); static void AnimMovePowderParticleStep(struct Sprite* sprite); @@ -75,7 +75,7 @@ void AnimMovePowderParticle(struct Sprite* sprite) sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = gBattleAnimArgs[3]; - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) { sprite->data[3] = -gBattleAnimArgs[4]; } diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c index 140eadde1..42a2ce387 100644 --- a/src/battle/anim/psychic.c +++ b/src/battle/anim/psychic.c @@ -10,8 +10,8 @@ #include "constants/songs.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u16 gBattle_BG1_X; extern u16 gBattle_BG2_X; extern u8 gBankSpriteIds[]; @@ -428,7 +428,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAA68 = void sub_80DB74C(struct Sprite *sprite) { - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER || IsContest()) + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER || IsContest()) { sprite->oam.priority = 2; sprite->subpriority = 200; @@ -452,7 +452,7 @@ void sub_80DB74C(struct Sprite *sprite) if (!IsContest() && IsDoubleBattle()) { - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { sprite->pos1.x = 72; sprite->pos1.y = 80; @@ -465,11 +465,11 @@ void sub_80DB74C(struct Sprite *sprite) } else { - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1]; } if (IsContest()) @@ -568,7 +568,7 @@ void sub_80DBA4C(struct Sprite *sprite) if (!IsContest() && IsDoubleBattle()) { - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { sprite->pos1.x = 72 - gBattleAnimArgs[0]; sprite->pos1.y = gBattleAnimArgs[1] + 80; @@ -598,10 +598,10 @@ void sub_80DBA4C(struct Sprite *sprite) void sub_80DBAF4(struct Sprite *sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { StartSpriteAnim(sprite, 1); sprite->pos1.x -= 40; @@ -621,16 +621,16 @@ void sub_80DBAF4(struct Sprite *sprite) void sub_80DBB70(struct Sprite *sprite) { - s16 x = sub_807A100(gAnimBankAttacker, 1) / 2; - s16 y = sub_807A100(gAnimBankAttacker, 0) / -2; + s16 x = sub_807A100(gBattleAnimAttacker, 1) / 2; + s16 y = sub_807A100(gBattleAnimAttacker, 0) / -2; - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT) + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) { x = -x; } - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + x; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + y; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + x; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + y; if (sprite->pos1.y < 16) { @@ -696,7 +696,7 @@ void sub_80DBCFC(u8 taskId) task->data[0] = spriteId; task->data[1] = 0; task->data[2] = 0; - task->data[3] = GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER ? 4 : 8; + task->data[3] = GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER ? 4 : 8; sub_80798F4(task, task->data[0], &gSpriteAffineAnim_083DA8C4); task->func = sub_80DBD58; @@ -738,11 +738,11 @@ void sub_80DBE00(u8 taskId) task->data[3] = 16; task->data[4] = 0; - task->data[13] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - task->data[14] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + task->data[13] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + task->data[14] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); - var0 = sub_807A100(gAnimBankAttacker, 1) / 3; - var1 = sub_807A100(gAnimBankAttacker, 0) / 3; + var0 = sub_807A100(gBattleAnimAttacker, 1) / 3; + var1 = sub_807A100(gBattleAnimAttacker, 0) / 3; task->data[12] = var0 > var1 ? var0 : var1; REG_BLDCNT = 0x3F40; @@ -838,8 +838,8 @@ void sub_80DC068(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); } sprite->data[0] = gBattleAnimArgs[1]; @@ -855,18 +855,18 @@ void sub_80DC0B0(u8 taskId) if (gBattleAnimArgs[0] == 1) { task->data[10] = -10; - task->data[11] = sub_807A100(gAnimBankTarget, 5) - 8; - task->data[12] = sub_807A100(gAnimBankTarget, 2) + 8; - task->data[13] = sub_807A100(gAnimBankAttacker, 5) - 8; - task->data[14] = sub_807A100(gAnimBankAttacker, 2) + 8; + task->data[11] = sub_807A100(gBattleAnimTarget, 5) - 8; + task->data[12] = sub_807A100(gBattleAnimTarget, 2) + 8; + task->data[13] = sub_807A100(gBattleAnimAttacker, 5) - 8; + task->data[14] = sub_807A100(gBattleAnimAttacker, 2) + 8; } else { task->data[10] = 10; - task->data[11] = sub_807A100(gAnimBankAttacker, 4) + 8; - task->data[12] = sub_807A100(gAnimBankAttacker, 3) - 8; - task->data[13] = sub_807A100(gAnimBankTarget, 4) + 8; - task->data[14] = sub_807A100(gAnimBankTarget, 3) - 8; + task->data[11] = sub_807A100(gBattleAnimAttacker, 4) + 8; + task->data[12] = sub_807A100(gBattleAnimAttacker, 3) - 8; + task->data[13] = sub_807A100(gBattleAnimTarget, 4) + 8; + task->data[14] = sub_807A100(gBattleAnimTarget, 3) - 8; } } else @@ -874,18 +874,18 @@ void sub_80DC0B0(u8 taskId) if (gBattleAnimArgs[0] == 1) { task->data[10] = -10; - task->data[11] = sub_807A100(gAnimBankTarget, 4) + 8; - task->data[12] = sub_807A100(gAnimBankTarget, 2) + 8; - task->data[13] = sub_807A100(gAnimBankAttacker, 4) + 8; - task->data[14] = sub_807A100(gAnimBankAttacker, 2) + 8; + task->data[11] = sub_807A100(gBattleAnimTarget, 4) + 8; + task->data[12] = sub_807A100(gBattleAnimTarget, 2) + 8; + task->data[13] = sub_807A100(gBattleAnimAttacker, 4) + 8; + task->data[14] = sub_807A100(gBattleAnimAttacker, 2) + 8; } else { task->data[10] = 10; - task->data[11] = sub_807A100(gAnimBankAttacker, 5) - 8; - task->data[12] = sub_807A100(gAnimBankAttacker, 3) - 8; - task->data[13] = sub_807A100(gAnimBankTarget, 5) - 8; - task->data[14] = sub_807A100(gAnimBankTarget, 3) - 8; + task->data[11] = sub_807A100(gBattleAnimAttacker, 5) - 8; + task->data[12] = sub_807A100(gBattleAnimAttacker, 3) - 8; + task->data[13] = sub_807A100(gBattleAnimTarget, 5) - 8; + task->data[14] = sub_807A100(gBattleAnimTarget, 3) - 8; } } @@ -943,7 +943,7 @@ void sub_80DC2D4(u8 taskId) struct ScanlineEffectParams scanlineParams; struct Task *task = &gTasks[taskId]; - var1 = sub_8077FC0(gAnimBankTarget); + var1 = sub_8077FC0(gBattleAnimTarget); task->data[14] = var1 - 32; switch (gBattleAnimArgs[0]) @@ -971,7 +971,7 @@ void sub_80DC2D4(u8 taskId) if (task->data[14] < 0) task->data[14] = 0; - if (GetBattlerPosition_permutated(gAnimBankTarget) == 1) + if (GetBattlerPosition_permutated(gBattleAnimTarget) == 1) { task->data[10] = gBattle_BG1_X; scanlineParams.dmaDest = ®_BG1HOFS; @@ -1244,8 +1244,8 @@ void sub_80DC700(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); if (IsContest()) sprite->pos1.y += 12; diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c index f3d18c89a..398671249 100644 --- a/src/battle/anim/ring.c +++ b/src/battle/anim/ring.c @@ -7,8 +7,8 @@ #include "blend_palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u8 gBankSpriteIds[]; @@ -215,9 +215,9 @@ void sub_80D0FD8(struct Sprite* sprite) u8 r4; if (gBattleAnimArgs[2] == 0) - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; else - bank = gAnimBankTarget; + bank = gBattleAnimTarget; r4 = gBattleAnimArgs[3] ^ 1; if (IsDoubleBattle() && IsAnimBankSpriteVisible(bank ^ 2)) @@ -260,13 +260,13 @@ void sub_80D10B8(struct Sprite* sprite) if (gBattleAnimArgs[5] == 0) { - bankr7 = gAnimBankAttacker; - bankr8 = gAnimBankTarget; + bankr7 = gBattleAnimAttacker; + bankr8 = gBattleAnimTarget; } else { - bankr7 = gAnimBankTarget; - bankr8 = gAnimBankAttacker; + bankr7 = gBattleAnimTarget; + bankr8 = gBattleAnimAttacker; } if (gBattleAnimArgs[6] == 0) @@ -349,7 +349,7 @@ void sub_80D1368(struct Sprite* sprite) { s16 r1; InitAnimSpritePos(sprite, 0); - r1 = (GetBattlerSide(gAnimBankAttacker)) ? -0xA0 : 0xA0; + r1 = (GetBattlerSide(gBattleAnimAttacker)) ? -0xA0 : 0xA0; sprite->data[0] = 0x380; sprite->data[1] = r1; sprite->data[7] = gBattleAnimArgs[2]; @@ -362,7 +362,7 @@ static void sub_80D13AC(struct Sprite* sprite) sprite->pos2.y -= (sprite->data[0] >> 8); sprite->pos2.x = sprite->data[1] >> 8; sprite->data[0] -= 32; - add = (GetBattlerSide(gAnimBankAttacker)) ? -0xA0 : 0xA0; + add = (GetBattlerSide(gBattleAnimAttacker)) ? -0xA0 : 0xA0; sprite->data[1] += add; if (sprite->pos2.y > 0) { diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c index 4a6fcd89e..386ddfac7 100644 --- a/src/battle/anim/rock.c +++ b/src/battle/anim/rock.c @@ -10,8 +10,8 @@ #include "constants/songs.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern s32 gAnimMoveDmg; extern u16 gBattle_BG1_X; extern u16 gBattle_BG1_Y; @@ -321,7 +321,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE30 = void sub_80DCE9C(struct Sprite *sprite) { if (gBattleAnimArgs[3] != 0) - SetAverageBattlerPositions(gAnimBankTarget, 0, &sprite->pos1.x, &sprite->pos1.y); + SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y); sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += 14; @@ -361,7 +361,7 @@ void sub_80DCF60(struct Sprite *sprite) StartSpriteAnim(sprite, gBattleAnimArgs[5]); AnimateSprite(sprite); - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) sprite->pos1.x -= gBattleAnimArgs[0]; else sprite->pos1.x += gBattleAnimArgs[0]; @@ -437,7 +437,7 @@ void do_boulder_dust(u8 taskId) if (IsContest()) sub_80763FC(subStruct.field_8, (u16 *)subStruct.field_4, 0, 0); - if (gBattleAnimArgs[0] != 0 && GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (gBattleAnimArgs[0] != 0 && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) var0 = 1; gTasks[taskId].data[0] = var0; @@ -520,7 +520,7 @@ void AnimDirtParticleAcrossScreen(struct Sprite *sprite) { if (sprite->data[0] == 0) { - if (gBattleAnimArgs[3] != 0 && GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (gBattleAnimArgs[3] != 0 && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { sprite->pos1.x = 304; gBattleAnimArgs[1] = -gBattleAnimArgs[1]; @@ -590,12 +590,12 @@ void sub_80DD4D4(u8 taskId) task = &gTasks[taskId]; - var0 = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - var1 = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 24; - var2 = GetBattlerSpriteCoord(gAnimBankTarget, 2); - var3 = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 24; + var0 = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + var1 = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 24; + var2 = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + var3 = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 24; - if ((gAnimBankAttacker ^ 2) == gAnimBankTarget) + if ((gBattleAnimAttacker ^ 2) == gBattleAnimTarget) var3 = var1; var4 = sub_80DD8BC(); @@ -809,7 +809,7 @@ static void sub_80DD928(struct Sprite *sprite) void sub_80DD978(struct Sprite *sprite) { - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT) + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) StartSpriteAffineAnim(sprite, 1); TranslateAnimSpriteToTargetMonLocation(sprite); @@ -817,8 +817,8 @@ void sub_80DD978(struct Sprite *sprite) void sub_80DD9A4(struct Sprite *sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; diff --git a/src/battle/anim/roots.c b/src/battle/anim/roots.c index 085d678d6..e2dd4a2af 100644 --- a/src/battle/anim/roots.c +++ b/src/battle/anim/roots.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern s16 gUnknown_03000728[]; void sub_80CB59C(struct Sprite* sprite); @@ -83,8 +83,8 @@ void sub_80CB59C(struct Sprite* sprite) { if (!sprite->data[0]) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); sprite->pos2.x = gBattleAnimArgs[0]; sprite->pos2.y = gBattleAnimArgs[1]; sprite->subpriority = gBattleAnimArgs[2] + 30; @@ -101,10 +101,10 @@ void sub_80CB59C(struct Sprite* sprite) void sub_80CB620(struct Sprite *sprite) { - s16 p1 = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - s16 p2 = GetBattlerSpriteCoord(gAnimBankAttacker, 3); - s16 e1 = GetBattlerSpriteCoord(gAnimBankTarget, 2); - s16 e2 = GetBattlerSpriteCoord(gAnimBankTarget, 3); + s16 p1 = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + s16 p2 = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + s16 e1 = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + s16 e2 = GetBattlerSpriteCoord(gBattleAnimTarget, 3); e1 -= p1; e2 -= p2; diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c index 792e832cb..329e28f71 100644 --- a/src/battle/anim/scan.c +++ b/src/battle/anim/scan.c @@ -6,8 +6,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CD3E0(struct Sprite* sprite); void sub_80CD6CC(struct Sprite* sprite); @@ -140,8 +140,8 @@ static void sub_80CD4EC(struct Sprite* sprite) sprite->pos2.y = 0; sprite->pos2.x = 0; sprite->data[0] = 6; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + a; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + b; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + a; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + b; sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, sub_80CD654); } diff --git a/src/battle/anim/scary_face.c b/src/battle/anim/scary_face.c index 5a2c52825..2fe58ce26 100644 --- a/src/battle/anim/scary_face.c +++ b/src/battle/anim/scary_face.c @@ -7,8 +7,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern const u8 gBattleAnimBackgroundTilemap_ScaryFaceContest[]; extern const u8 gBattleAnimBackgroundTilemap_ScaryFacePlayer[]; @@ -43,7 +43,7 @@ void sub_80D23B4(u8 taskId) DmaFill32Defvars(3, 0, subStruct.field_4, 0x1000); if (IsContest()) LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFaceContest, subStruct.field_4); - else if (GetBattlerSide(gAnimBankTarget) == 1) + else if (GetBattlerSide(gBattleAnimTarget) == 1) LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFacePlayer, subStruct.field_4); else LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFaceOpponent, subStruct.field_4); diff --git a/src/battle/anim/seed.c b/src/battle/anim/seed.c index 8065c9a38..9b0d87eca 100644 --- a/src/battle/anim/seed.c +++ b/src/battle/anim/seed.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void AnimLeechSeed(struct Sprite* sprite); static void AnimLeechSeedStep(struct Sprite* sprite); @@ -52,14 +52,14 @@ const struct SpriteTemplate gLeechSeedSpriteTemplate = void AnimLeechSeed(struct Sprite* sprite) { InitAnimSpritePos(sprite, 1); - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[5]; InitAnimArcTranslation(sprite); sprite->callback = AnimLeechSeedStep; diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c index f75572101..9bc88e258 100644 --- a/src/battle/anim/sfx.c +++ b/src/battle/anim/sfx.c @@ -7,8 +7,8 @@ #include "task.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u16 gBattlerPartyIndexes[]; extern u16 gAnimSpeciesByBanks[]; extern u8 gUnknown_0202F7D2; @@ -158,13 +158,13 @@ void sub_812B18C(u8 taskId) { u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; else if (gBattleAnimArgs[0] == 1) - bank = gAnimBankTarget; + bank = gBattleAnimTarget; else if (gBattleAnimArgs[0] == 2) - bank = gAnimBankAttacker ^ 0x2; + bank = gBattleAnimAttacker ^ 0x2; else - bank = gAnimBankTarget ^ 0x2; + bank = gBattleAnimTarget ^ 0x2; if (gBattleAnimArgs[0] == 1 || gBattleAnimArgs[0] == 3) { @@ -202,7 +202,7 @@ void sub_812B2B8(u8 taskId) if (IsContest()) species = shared19348.unk0; else - species = gAnimSpeciesByBanks[gAnimBankAttacker]; + species = gAnimSpeciesByBanks[gBattleAnimAttacker]; if (species != 0) PlayCry3(species, pan, 4); diff --git a/src/battle/anim/shadow_enlarge.c b/src/battle/anim/shadow_enlarge.c index 7662583ac..ab975914a 100644 --- a/src/battle/anim/shadow_enlarge.c +++ b/src/battle/anim/shadow_enlarge.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; static void sub_80D0428(u8 taskId); diff --git a/src/battle/anim/shadow_minimize.c b/src/battle/anim/shadow_minimize.c index 224896d86..e65b4a193 100644 --- a/src/battle/anim/shadow_minimize.c +++ b/src/battle/anim/shadow_minimize.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; static void sub_80D04E0(u8 taskId); void sub_80D0614(struct Task* task, u8 taskId); @@ -27,7 +27,7 @@ void sub_80D0488(u8 taskId) task->data[4] = 0x100; task->data[5] = 0; task->data[6] = 0; - task->data[7] = GetBattlerSubpriority(gAnimBankAttacker); + task->data[7] = GetBattlerSubpriority(gBattleAnimAttacker); task->func = sub_80D04E0; } diff --git a/src/battle/anim/shield.c b/src/battle/anim/shield.c index d71baacc9..9500d66c9 100644 --- a/src/battle/anim/shield.c +++ b/src/battle/anim/shield.c @@ -6,8 +6,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CCD24(struct Sprite* sprite); static void sub_80CCE0C(struct Sprite* sprite); @@ -33,12 +33,12 @@ void sub_80CCD24(struct Sprite* sprite) gBattleAnimArgs[1] += 8; } - sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 0) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 1) + gBattleAnimArgs[1]; - if (GetBattlerSide(gAnimBankAttacker) == 0 || IsContest()) - sprite->oam.priority = sub_8079ED4(gAnimBankAttacker) + 1; + sprite->pos1.x = sub_8077EE4(gBattleAnimAttacker, 0) + gBattleAnimArgs[0]; + sprite->pos1.y = sub_8077EE4(gBattleAnimAttacker, 1) + gBattleAnimArgs[1]; + if (GetBattlerSide(gBattleAnimAttacker) == 0 || IsContest()) + sprite->oam.priority = sub_8079ED4(gBattleAnimAttacker) + 1; else - sprite->oam.priority = sub_8079ED4(gAnimBankAttacker); + sprite->oam.priority = sub_8079ED4(gBattleAnimAttacker); sprite->data[0] = gBattleAnimArgs[2]; sprite->data[2] = (IndexOfSpritePaletteTag(0x2828) << 4) + 0x100; diff --git a/src/battle/anim/shimmer.c b/src/battle/anim/shimmer.c index 78b430094..0cd5580aa 100644 --- a/src/battle/anim/shimmer.c +++ b/src/battle/anim/shimmer.c @@ -6,8 +6,8 @@ #include "blend_palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; // shimmer // Used by Magical Leaf. diff --git a/src/battle/anim/shock.c b/src/battle/anim/shock.c index fac415ade..4459e43b8 100644 --- a/src/battle/anim/shock.c +++ b/src/battle/anim/shock.c @@ -4,8 +4,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[8]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern struct OamMatrix gOamMatrices[]; void sub_80D6294(struct Sprite *sprite); @@ -66,10 +66,10 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9874 = void sub_80D6294(struct Sprite *sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); - if (GetBattlerSide(gAnimBankAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != 0) { sprite->pos1.x -= gBattleAnimArgs[0]; sprite->pos1.y -= gBattleAnimArgs[1]; @@ -98,30 +98,30 @@ void sub_80D6328(struct Sprite *sprite) switch (gBattleAnimArgs[4]) { case 0: - slot = gAnimBankAttacker; + slot = gBattleAnimAttacker; break; case 1: default: - slot = gAnimBankTarget; + slot = gBattleAnimTarget; break; case 2: - if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) + if (!IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2)) { - slot = gAnimBankAttacker; + slot = gBattleAnimAttacker; } else { - slot = gAnimBankAttacker ^ 2; + slot = gBattleAnimAttacker ^ 2; } break; case 3: - if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) + if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2)) { - slot = gAnimBankTarget ^ 2; + slot = gBattleAnimTarget ^ 2; } else { - slot = gAnimBankTarget; + slot = gBattleAnimTarget; } break; } diff --git a/src/battle/anim/silhouette.c b/src/battle/anim/silhouette.c index 00bb24762..f61c0913b 100644 --- a/src/battle/anim/silhouette.c +++ b/src/battle/anim/silhouette.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; static void sub_80CB3A8(u8 taskId); static void sub_80CB438(u8 taskId); @@ -35,7 +35,7 @@ void sub_80CB3A8(u8 taskId) u8 spriteId = GetAnimBattlerSpriteId(1); gTasks[taskId].data[10] += gTasks[taskId].data[0]; gSprites[spriteId].pos2.x = gTasks[taskId].data[10] >> 8; - if (GetBattlerSide(gAnimBankTarget)) + if (GetBattlerSide(gBattleAnimTarget)) { gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x; } diff --git a/src/battle/anim/slash.c b/src/battle/anim/slash.c index c2c1fcb16..e42a6c2ad 100644 --- a/src/battle/anim/slash.c +++ b/src/battle/anim/slash.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CDD74(struct Sprite* sprite); void sub_80CDDDC(struct Sprite* sprite); @@ -76,13 +76,13 @@ void sub_80CDD74(struct Sprite* sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; } else { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[2]; } sprite->data[0] = 0; @@ -93,16 +93,16 @@ void sub_80CDD74(struct Sprite* sprite) void sub_80CDDDC(struct Sprite* sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + 0xFFD0; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + 0xFFD0; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); StoreSpriteCallbackInData(sprite, sub_80CDE78); sprite->callback = sub_8078600; } void sub_80CDE24(struct Sprite* sprite) { - sprite->pos1.x = sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + 0xFFD0 + gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->pos1.x = sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + 0xFFD0 + gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); StartSpriteAnim(sprite, 1); sprite->data[0] = 0; sprite->data[1] = 0; diff --git a/src/battle/anim/sleep.c b/src/battle/anim/sleep.c index 6963624ee..82822c931 100644 --- a/src/battle/anim/sleep.c +++ b/src/battle/anim/sleep.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CD328(struct Sprite* sprite); static void sub_80CD394(struct Sprite* sprite); @@ -73,7 +73,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6D94 = void sub_80CD328(struct Sprite* sprite) { sub_8078650(sprite); - if (GetBattlerSide(gAnimBankAttacker) == 0) + if (GetBattlerSide(gBattleAnimAttacker) == 0) { sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; diff --git a/src/battle/anim/slice.c b/src/battle/anim/slice.c index 329f267d6..7abb2cdcf 100644 --- a/src/battle/anim/slice.c +++ b/src/battle/anim/slice.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void AnimCuttingSlice(struct Sprite* sprite); void sub_80CC9BC(struct Sprite* sprite); @@ -55,9 +55,9 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6B40 = // arg 2: slice direction; 0 = right-to-left, 1 = left-to-right void AnimCuttingSlice(struct Sprite* sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1); - if (GetBattlerSide(gAnimBankTarget) == 0) + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + if (GetBattlerSide(gBattleAnimTarget) == 0) sprite->pos1.y += 8; sprite->callback = AnimSliceStep; @@ -86,28 +86,28 @@ void sub_80CC9BC(struct Sprite* sprite) switch (gBattleAnimArgs[3]) { case 1: - a = GetBattlerSpriteCoord(gAnimBankTarget ^ 2, 0); - b = GetBattlerSpriteCoord(gAnimBankTarget ^ 2, 1); + a = GetBattlerSpriteCoord(gBattleAnimTarget ^ 2, 0); + b = GetBattlerSpriteCoord(gBattleAnimTarget ^ 2, 1); break; case 2: - a = GetBattlerSpriteCoord(gAnimBankTarget, 0); - b = GetBattlerSpriteCoord(gAnimBankTarget, 1); - if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) + a = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + b = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + if (IsAnimBankSpriteVisible(gBattleAnimTarget ^ 2)) { - a = (GetBattlerSpriteCoord(gAnimBankTarget ^ 2, 0) + a) / 2; - b = (GetBattlerSpriteCoord(gAnimBankTarget ^ 2, 1) + b) / 2; + a = (GetBattlerSpriteCoord(gBattleAnimTarget ^ 2, 0) + a) / 2; + b = (GetBattlerSpriteCoord(gBattleAnimTarget ^ 2, 1) + b) / 2; } break; case 0: default: - a = GetBattlerSpriteCoord(gAnimBankTarget, 0); - b = GetBattlerSpriteCoord(gAnimBankTarget, 1); + a = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + b = GetBattlerSpriteCoord(gBattleAnimTarget, 1); break; } sprite->pos1.x = a; sprite->pos1.y = b; - if (GetBattlerSide(gAnimBankTarget) == 0) + if (GetBattlerSide(gBattleAnimTarget) == 0) sprite->pos1.y += 8; sprite->callback = AnimSliceStep; diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c index 1de546780..9cdda992f 100644 --- a/src/battle/anim/sonic.c +++ b/src/battle/anim/sonic.c @@ -7,8 +7,8 @@ #include "battle_anim_80CA710.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u8 gBanksBySide[]; extern u16 gBattleTypeFlags; @@ -129,7 +129,7 @@ void AnimSonicBoomProjectile(struct Sprite* sprite) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } - else if (GetBattlerSide(gAnimBankAttacker) != 0) + else if (GetBattlerSide(gBattleAnimAttacker) != 0) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[1] = -gBattleAnimArgs[1]; @@ -137,8 +137,8 @@ void AnimSonicBoomProjectile(struct Sprite* sprite) } InitAnimSpritePos(sprite, 1); - targetXPos = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; - targetYPos = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; + targetXPos = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; + targetYPos = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; rotation = ArcTan2Neg(targetXPos - sprite->pos1.x, targetYPos - sprite->pos1.y); rotation += 0xF000; if (IsContest()) @@ -296,7 +296,7 @@ void sub_80CFB04(u8 taskId) } else { - if ((gBanksBySide[gAnimBankTarget] & 1) == 0) + if ((gBanksBySide[gBattleAnimTarget] & 1) == 0) { gTasks[taskId].data[4] = 1; gBattleAnimArgs[0] = -gBattleAnimArgs[0]; @@ -307,17 +307,17 @@ void sub_80CFB04(u8 taskId) gBattleAnimArgs[2] |= 1; } } - r6 = gTasks[taskId].data[9] = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - r9 = gTasks[taskId].data[10] = GetBattlerSpriteCoord(gAnimBankAttacker, 1); + r6 = gTasks[taskId].data[9] = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + r9 = gTasks[taskId].data[10] = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) - && IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) + && IsAnimBankSpriteVisible(gBattleAnimTarget ^ 2)) { - SetAverageBattlerPositions(gAnimBankTarget, 0, &sp1, &sp2); + SetAverageBattlerPositions(gBattleAnimTarget, 0, &sp1, &sp2); } else { - sp1 = GetBattlerSpriteCoord(gAnimBankTarget, 0); - sp2 = GetBattlerSpriteCoord(gAnimBankTarget, 1); + sp1 = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + sp2 = GetBattlerSpriteCoord(gBattleAnimTarget, 1); } sp1 = gTasks[taskId].data[11] = sp1 + gBattleAnimArgs[0]; @@ -347,12 +347,12 @@ void sub_80CFB04(u8 taskId) gBattleAnimArgs[4] ^= 0x80; if (gBattleAnimArgs[4] >= 64) { - u16 var = GetBattlerSubpriority(gAnimBankTarget) + (gBattleAnimArgs[4] - 64); + u16 var = GetBattlerSubpriority(gBattleAnimTarget) + (gBattleAnimArgs[4] - 64); gTasks[taskId].data[2] = var; } else { - u16 var = GetBattlerSubpriority(gAnimBankTarget) - gBattleAnimArgs[4]; + u16 var = GetBattlerSubpriority(gBattleAnimTarget) - gBattleAnimArgs[4]; gTasks[taskId].data[2] = var; } } @@ -360,12 +360,12 @@ void sub_80CFB04(u8 taskId) { if (gBattleAnimArgs[4] >= 64) { - u16 var = GetBattlerSubpriority(gAnimBankTarget) + (gBattleAnimArgs[4] - 64); + u16 var = GetBattlerSubpriority(gBattleAnimTarget) + (gBattleAnimArgs[4] - 64); gTasks[taskId].data[2] = var; } else { - u16 var = GetBattlerSubpriority(gAnimBankTarget) - gBattleAnimArgs[4]; + u16 var = GetBattlerSubpriority(gBattleAnimTarget) - gBattleAnimArgs[4]; gTasks[taskId].data[2] = var; } } diff --git a/src/battle/anim/spit.c b/src/battle/anim/spit.c index ee21135ac..44b29e9db 100644 --- a/src/battle/anim/spit.c +++ b/src/battle/anim/spit.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D28AC(struct Sprite* sprite); @@ -46,8 +46,8 @@ static void sub_80D287C(struct Sprite* sprite) void sub_80D28AC(struct Sprite* sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[0] = Sin(gBattleAnimArgs[0], 10); sprite->data[1] = Cos(gBattleAnimArgs[0], 7); sprite->data[2] = gBattleAnimArgs[1]; diff --git a/src/battle/anim/splash.c b/src/battle/anim/splash.c index 7e3d08554..6bf59bc54 100644 --- a/src/battle/anim/splash.c +++ b/src/battle/anim/splash.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; static void AnimTask_SplashStep(u8 taskId); diff --git a/src/battle/anim/startle.c b/src/battle/anim/startle.c index b23c7ac9e..fb1e0f375 100644 --- a/src/battle/anim/startle.c +++ b/src/battle/anim/startle.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; // startle (the pokemon sprite shrivels upward and restores after a brief time.) // Used in Fake Out, Trick, and Astonish. diff --git a/src/battle/anim/strike.c b/src/battle/anim/strike.c index 0eba290a9..303a39d29 100644 --- a/src/battle/anim/strike.c +++ b/src/battle/anim/strike.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CE670(struct Sprite* sprite); static void sub_80CE798(struct Sprite* sprite); @@ -64,8 +64,8 @@ void sub_80CE670(struct Sprite* sprite) sprite->data[0] = 0; sprite->data[1] = gBattleAnimArgs[2]; - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[1]; sprite->data[6] = sprite->pos1.x; sprite->data[7] = sprite->pos1.y; if (IsContest() != 0) @@ -78,7 +78,7 @@ void sub_80CE670(struct Sprite* sprite) sprite->data[4] = sprite->pos1.y << 7; sprite->data[5] = -0xA00 / sprite->data[1]; } - else if (GetBattlerSide(gAnimBankAttacker) == 0) + else if (GetBattlerSide(gBattleAnimAttacker) == 0) { sprite->pos1.x -= 40; sprite->pos1.y += 20; diff --git a/src/battle/anim/struggle.c b/src/battle/anim/struggle.c index 609673fa0..578dd7618 100644 --- a/src/battle/anim/struggle.c +++ b/src/battle/anim/struggle.c @@ -4,8 +4,8 @@ #include "sprite.h" extern s16 gBattleAnimArgs[8]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D2C38(struct Sprite *sprite); static void sub_80D2CC4(struct Sprite *); @@ -55,13 +55,13 @@ void sub_80D2C38(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); } else { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); } if (gBattleAnimArgs[1] == 0) diff --git a/src/battle/anim/switch.c b/src/battle/anim/switch.c index 2b8a87d3d..7667355dd 100644 --- a/src/battle/anim/switch.c +++ b/src/battle/anim/switch.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern const union AffineAnimCmd gSpriteAffineAnim_83D66BC[]; extern const union AffineAnimCmd gSpriteAffineAnim_83D66DC[]; extern const union AnimCmd *const gSpriteAnimTable_83D66B8[]; diff --git a/src/battle/anim/sword.c b/src/battle/anim/sword.c index 8b15288b9..a917a9693 100644 --- a/src/battle/anim/sword.c +++ b/src/battle/anim/sword.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CF690(struct Sprite* sprite); static void sub_80CF6B4(struct Sprite* sprite); diff --git a/src/battle/anim/tendrils.c b/src/battle/anim/tendrils.c index c8a9fefb4..8d7959c21 100644 --- a/src/battle/anim/tendrils.c +++ b/src/battle/anim/tendrils.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CB25C(struct Sprite* sprite); static void sub_80CB298(struct Sprite* sprite); diff --git a/src/battle/anim/thought.c b/src/battle/anim/thought.c index fcaf6a9a8..ee387040f 100644 --- a/src/battle/anim/thought.c +++ b/src/battle/anim/thought.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CEF9C(struct Sprite* sprite); static void sub_80CF008(struct Sprite* sprite); @@ -84,9 +84,9 @@ void sub_80CEF9C(struct Sprite* sprite) u8 a; u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; else - bank = gAnimBankTarget; + bank = gBattleAnimTarget; sub_80CEF44(bank, sprite); a = (GetBattlerSide(bank) == 0) ? 0 : 1; diff --git a/src/battle/anim/thrashing.c b/src/battle/anim/thrashing.c index 38dccb83f..2f00b1acc 100644 --- a/src/battle/anim/thrashing.c +++ b/src/battle/anim/thrashing.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; static void sub_80D0A8C(u8 taskId); static void sub_80D0B3C(u8 taskId); @@ -56,7 +56,7 @@ void sub_80D0AB8(u8 taskId) task->data[7] = 0; task->data[8] = 0; task->data[9] = 2; - if (GetBattlerSide(gAnimBankAttacker) == 1) + if (GetBattlerSide(gBattleAnimAttacker) == 1) task->data[2] *= -1; task->func = sub_80D0B3C; diff --git a/src/battle/anim/thunder.c b/src/battle/anim/thunder.c index 862f0f7a8..b15a5c4f1 100644 --- a/src/battle/anim/thunder.c +++ b/src/battle/anim/thunder.c @@ -3,8 +3,8 @@ #include "rom_8077ABC.h" extern s16 gBattleAnimArgs[8]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u16 gBattleTypeFlags; void sub_80D61C8(struct Sprite *sprite); @@ -41,7 +41,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D97D0 = void sub_80D61C8(struct Sprite *sprite) { - if (GetBattlerSide(gAnimBankAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != 0) { sprite->pos1.x -= gBattleAnimArgs[0]; } diff --git a/src/battle/anim/tile.c b/src/battle/anim/tile.c index de89b80a7..34695ecf4 100644 --- a/src/battle/anim/tile.c +++ b/src/battle/anim/tile.c @@ -6,8 +6,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u8 gBattlersCount; extern u8 gHealthboxIDs[]; @@ -120,8 +120,8 @@ void sub_80CE09C(struct Sprite* sprite) { if (sprite->data[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1]; if (IsContest()) sprite->pos1.y += 10; sprite->data[0]++; @@ -173,8 +173,8 @@ static void sub_80CE1AC(struct Sprite* sprite) { sprite->animPaused = 0; sprite->data[0] = 30; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/twinkle.c b/src/battle/anim/twinkle.c index 0180d5be1..dc26a7432 100644 --- a/src/battle/anim/twinkle.c +++ b/src/battle/anim/twinkle.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CE36C(struct Sprite* sprite); static void sub_80CE3B0(struct Sprite* sprite); @@ -41,7 +41,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FF8 = void sub_80CE36C(struct Sprite* sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[0]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0]; sprite->pos1.y = gBattleAnimArgs[1]; sprite->data[0] = 0; sprite->data[1] = 0; diff --git a/src/battle/anim/unused_1.c b/src/battle/anim/unused_1.c index ee775a0ed..c9712de8f 100644 --- a/src/battle/anim/unused_1.c +++ b/src/battle/anim/unused_1.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CC8C8(struct Sprite* sprite); diff --git a/src/battle/anim/unused_2.c b/src/battle/anim/unused_2.c index 4c12f609d..0209823b8 100644 --- a/src/battle/anim/unused_2.c +++ b/src/battle/anim/unused_2.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CCC50(struct Sprite* sprite); static void sub_80CCCB4(struct Sprite* sprite); @@ -135,7 +135,7 @@ void unref_sub_80CCB6C(struct Sprite* sprite) void sub_80CCC50(struct Sprite* sprite) { sprite->data[0] = gBattleAnimArgs[2]; - if (GetBattlerSide(gAnimBankAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != 0) sprite->pos1.x -= gBattleAnimArgs[0]; else sprite->pos1.x += gBattleAnimArgs[0]; diff --git a/src/battle/anim/unused_3.c b/src/battle/anim/unused_3.c index e222cd512..2ee1984a5 100644 --- a/src/battle/anim/unused_3.c +++ b/src/battle/anim/unused_3.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CD274(struct Sprite* sprite); static void sub_80CD2D4(struct Sprite* sprite); @@ -59,7 +59,7 @@ const struct SpriteTemplate gSpriteTemplate_83D6D08 = void sub_80CD274(struct Sprite* sprite) { sub_8078650(sprite); - if (GetBattlerSide(gAnimBankAttacker) == 0) + if (GetBattlerSide(gBattleAnimAttacker) == 0) { sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; diff --git a/src/battle/anim/unused_5.c b/src/battle/anim/unused_5.c index e6b2f47f4..98cd62bd0 100644 --- a/src/battle/anim/unused_5.c +++ b/src/battle/anim/unused_5.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CF280(struct Sprite* sprite); diff --git a/src/battle/anim/unused_6.c b/src/battle/anim/unused_6.c index ab5678641..27957f27d 100644 --- a/src/battle/anim/unused_6.c +++ b/src/battle/anim/unused_6.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern void sub_80CEF44(u8 bank, struct Sprite* sprite); @@ -41,9 +41,9 @@ void sub_80CF2D0(struct Sprite* sprite) { u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; else - bank = gAnimBankTarget; + bank = gBattleAnimTarget; sub_80CEF44(bank, sprite); sprite->data[0] = 0; diff --git a/src/battle/anim/unused_7.c b/src/battle/anim/unused_7.c index fa3facdda..d2ce1f0a8 100644 --- a/src/battle/anim/unused_7.c +++ b/src/battle/anim/unused_7.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u8 gBankSpriteIds[]; @@ -43,10 +43,10 @@ static void sub_80CF374(struct Sprite* sprite) void sub_80CF3C4(struct Sprite* sprite) { u8 a; - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); - a = gBankSpriteIds[gAnimBankTarget]; - if (GetBattlerSide(gAnimBankAttacker) != 0) + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + a = gBankSpriteIds[gBattleAnimTarget]; + if (GetBattlerSide(gBattleAnimAttacker) != 0) { sprite->pos1.x -= gBattleAnimArgs[0]; } diff --git a/src/battle/anim/unused_8.c b/src/battle/anim/unused_8.c index 586725f33..2a04d4d01 100644 --- a/src/battle/anim/unused_8.c +++ b/src/battle/anim/unused_8.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern const union AffineAnimCmd *const gSpriteAffineAnimTable_83DB1B0[]; void sub_80CF458(struct Sprite* sprite); diff --git a/src/battle/anim/unused_9.c b/src/battle/anim/unused_9.c index 75d236714..a9a42a695 100644 --- a/src/battle/anim/unused_9.c +++ b/src/battle/anim/unused_9.c @@ -6,8 +6,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CFDFC(struct Sprite* sprite); static void sub_80CFE2C(struct Sprite* sprite); diff --git a/src/battle/anim/water.c b/src/battle/anim/water.c index af38ecd7a..207e35083 100644 --- a/src/battle/anim/water.c +++ b/src/battle/anim/water.c @@ -5,8 +5,8 @@ #include "util.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA318[]; extern const union AnimCmd *const gSpriteAnimTable_83D9BC8[]; @@ -331,7 +331,7 @@ _080D3920:\n\ movs r1, 0x4\n\ orrs r0, r1\n\ strb r0, [r2]\n\ - ldr r0, _080D39A0 @ =gAnimBankAttacker\n\ + ldr r0, _080D39A0 @ =gBattleAnimAttacker\n\ ldrb r0, [r0]\n\ bl GetBattlerSide\n\ lsls r0, 24\n\ @@ -346,7 +346,7 @@ _080D3990: .4byte 0x00003f42\n\ _080D3994: .4byte REG_BG1CNT\n\ _080D3998: .4byte 0x040000d4\n\ _080D399C: .4byte 0x85000400\n\ -_080D39A0: .4byte gAnimBankAttacker\n\ +_080D39A0: .4byte gBattleAnimAttacker\n\ _080D39A4: .4byte gUnknown_08E70968\n\ _080D39A8:\n\ ldr r0, _080D39B4 @ =gUnknown_08E70C38\n\ @@ -454,7 +454,7 @@ _080D3A88: .4byte gBattle_BG1_X\n\ _080D3A8C: .4byte 0x0000ffd0\n\ _080D3A90: .4byte gBattle_BG1_Y\n\ _080D3A94:\n\ - ldr r0, _080D3AC4 @ =gAnimBankAttacker\n\ + ldr r0, _080D3AC4 @ =gBattleAnimAttacker\n\ ldrb r0, [r0]\n\ bl GetBattlerSide\n\ lsls r0, 24\n\ @@ -477,7 +477,7 @@ _080D3A94:\n\ strh r1, [r7, 0xE]\n\ b _080D3AEE\n\ .align 2, 0\n\ -_080D3AC4: .4byte gAnimBankAttacker\n\ +_080D3AC4: .4byte gBattleAnimAttacker\n\ _080D3AC8: .4byte 0x0000ff20\n\ _080D3ACC: .4byte gBattle_BG1_X\n\ _080D3AD0: .4byte gBattle_BG1_Y\n\ diff --git a/src/battle/anim/whip.c b/src/battle/anim/whip.c index 91a937d41..8cfebc0dd 100644 --- a/src/battle/anim/whip.c +++ b/src/battle/anim/whip.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CC82C(struct Sprite* sprite); void sub_80CC884(struct Sprite* sprite); @@ -105,7 +105,7 @@ static void sub_80CC810(struct Sprite* sprite) void sub_80CC82C(struct Sprite* sprite) { - if (GetBattlerSide(gAnimBankAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != 0) { sprite->pos1.x -= gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; @@ -122,7 +122,7 @@ void sub_80CC82C(struct Sprite* sprite) void sub_80CC884(struct Sprite* sprite) { - if (GetBattlerSide(gAnimBankAttacker) == 0) + if (GetBattlerSide(gBattleAnimAttacker) == 0) StartSpriteAnim(sprite, 1); sprite->callback = sub_80CC810; diff --git a/src/battle/anim/wisp_fire.c b/src/battle/anim/wisp_fire.c index 01047ebf4..714f59d71 100644 --- a/src/battle/anim/wisp_fire.c +++ b/src/battle/anim/wisp_fire.c @@ -7,8 +7,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankTarget; -extern u8 gAnimBankAttacker; +extern u8 gBattleAnimTarget; +extern u8 gBattleAnimAttacker; extern u8 gBankSpriteIds[]; void sub_80D5CC0(struct Sprite *sprite); @@ -68,9 +68,9 @@ void sub_80D5CC0(struct Sprite *sprite) if (gMain.inBattle) { if (sprite->data[1] < 64 || sprite->data[1] > 195) - sprite->oam.priority = sub_8079ED4(gAnimBankTarget); + sprite->oam.priority = sub_8079ED4(gBattleAnimTarget); else - sprite->oam.priority = sub_8079ED4(gAnimBankTarget) + 1; + sprite->oam.priority = sub_8079ED4(gBattleAnimTarget) + 1; } else { @@ -91,8 +91,8 @@ void sub_80D5DDC(u8 taskId) { struct Task *task = &gTasks[taskId]; - task->data[12] = !GetBattlerSide(gAnimBankAttacker) ? 1 : -1; - task->data[13] = IsAnimBankSpriteVisible(gAnimBankTarget ^ 2) + 1; + task->data[12] = !GetBattlerSide(gBattleAnimAttacker) ? 1 : -1; + task->data[13] = IsAnimBankSpriteVisible(gBattleAnimTarget ^ 2) + 1; task->data[14] = GetAnimBattlerSpriteId(1); task->data[15] = GetAnimBattlerSpriteId(3); @@ -211,7 +211,7 @@ void sub_80D60B4(u8 taskId) } gTasks[taskId].data[0]++; - spriteId = gBankSpriteIds[gAnimBankTarget]; + spriteId = gBankSpriteIds[gBattleAnimTarget]; if (!gTasks[taskId].data[4]) unk = gUnknown_083D9794[gTasks[taskId].data[0] % 10]; diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c index 891d86ee1..dd04e258c 100644 --- a/src/battle/anim/wisp_orb.c +++ b/src/battle/anim/wisp_orb.c @@ -6,8 +6,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[8]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u16 gBattleTypeFlags; extern u8 gUnknown_0202F7D2; @@ -72,7 +72,7 @@ void sub_80D5B0C(struct Sprite *sprite) StartSpriteAnim(sprite, gBattleAnimArgs[2]); sprite->data[7] = gBattleAnimArgs[2]; - if (GetBattlerSide(gAnimBankAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != 0) { sprite->data[4] = 4; } @@ -81,12 +81,12 @@ void sub_80D5B0C(struct Sprite *sprite) sprite->data[4] = -4; } - sprite->oam.priority = sub_8079ED4(gAnimBankTarget); + sprite->oam.priority = sub_8079ED4(gBattleAnimTarget); sprite->data[0]++; break; case 1: sprite->data[1] += 192; - if (GetBattlerSide(gAnimBankAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != 0) { sprite->pos2.y = -(sprite->data[1] >> 8); } @@ -117,9 +117,9 @@ void sub_80D5B0C(struct Sprite *sprite) sprite->data[0] = 256; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sub_8078BD4(sprite); sprite->callback = sub_80D5C5C; diff --git a/src/battle/anim/withdraw.c b/src/battle/anim/withdraw.c index baf5d9b94..a1de45d15 100644 --- a/src/battle/anim/withdraw.c +++ b/src/battle/anim/withdraw.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u8 gBankSpriteIds[]; @@ -17,15 +17,15 @@ static void sub_80CF514(u8 taskId); void sub_80CF4D8(u8 taskId) { - sub_8078E70(gBankSpriteIds[gAnimBankAttacker], 0); + sub_8078E70(gBankSpriteIds[gBattleAnimAttacker], 0); gTasks[taskId].func = sub_80CF514; } void sub_80CF514(u8 taskId) { - u8 a = gBankSpriteIds[gAnimBankAttacker]; + u8 a = gBankSpriteIds[gBattleAnimAttacker]; s16 b; - if (GetBattlerSide(gAnimBankAttacker) == 0) + if (GetBattlerSide(gBattleAnimAttacker) == 0) { b = -gTasks[taskId].data[0]; } diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c index 87a0f0309..6e1ddceaf 100644 --- a/src/battle/battle_7.c +++ b/src/battle/battle_7.c @@ -42,8 +42,8 @@ extern struct MusicPlayerInfo gMPlay_BGM; extern u32 gBitTable[]; extern u16 gBattleTypeFlags; extern u8 gBattleMonForms[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern void (*gAnimScriptCallback)(void); extern u8 gAnimScriptActive; extern const u8 *const gBattleAnims_General[]; @@ -204,8 +204,8 @@ bool8 move_anim_start_t3(u8 a, u8 b, u8 c, u8 d, u16 e) sub_80324E0(a); return TRUE; } - gAnimBankAttacker = b; - gAnimBankTarget = c; + gBattleAnimAttacker = b; + gBattleAnimTarget = c; ewram17840.unk0 = e; LaunchBattleAnimation(gBattleAnims_General, d, 0); taskId = CreateTask(sub_80315E8, 10); @@ -244,8 +244,8 @@ void move_anim_start_t4(u8 a, u8 b, u8 c, u8 d) { u8 taskId; - gAnimBankAttacker = b; - gAnimBankTarget = c; + gBattleAnimAttacker = b; + gBattleAnimTarget = c; LaunchBattleAnimation(gBattleAnims_Special, d, 0); taskId = CreateTask(sub_80316CC, 10); gTasks[taskId].data[0] = a; diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c index 92794f674..287d80ab1 100644 --- a/src/battle/battle_anim.c +++ b/src/battle/battle_anim.c @@ -1304,8 +1304,8 @@ EWRAM_DATA u8 gMonAnimTaskIdArray[2] = {0}; EWRAM_DATA u8 gAnimMoveTurn = 0; EWRAM_DATA u8 sAnimBackgroundFadeState = 0; EWRAM_DATA u16 sAnimMoveIndex = 0; // set but unused. -EWRAM_DATA u8 gAnimBankAttacker = 0; -EWRAM_DATA u8 gAnimBankTarget = 0; +EWRAM_DATA u8 gBattleAnimAttacker = 0; +EWRAM_DATA u8 gBattleAnimTarget = 0; EWRAM_DATA u16 gAnimSpeciesByBanks[4] = {0}; EWRAM_DATA u8 gUnknown_0202F7D2 = 0; // some global pan variable @@ -1457,15 +1457,15 @@ void ClearBattleAnimationVars(void) gAnimMoveTurn = 0; sAnimBackgroundFadeState = 0; sAnimMoveIndex = 0; - gAnimBankAttacker = 0; - gAnimBankTarget = 0; + gBattleAnimAttacker = 0; + gBattleAnimTarget = 0; gUnknown_0202F7D2 = 0; } void DoMoveAnim(u16 move) { - gAnimBankAttacker = gBankAttacker; - gAnimBankTarget = gBankTarget; + gBattleAnimAttacker = gBankAttacker; + gBattleAnimTarget = gBankTarget; LaunchBattleAnimation(gBattleAnims_Moves, move, TRUE); } @@ -1660,7 +1660,7 @@ static void ScriptCmd_createsprite(void) else argVar *= -1; - subpriority = GetBattlerSubpriority(gAnimBankTarget) + (s8)(argVar); + subpriority = GetBattlerSubpriority(gBattleAnimTarget) + (s8)(argVar); } else { @@ -1669,13 +1669,13 @@ static void ScriptCmd_createsprite(void) else argVar *= -1; - subpriority = GetBattlerSubpriority(gAnimBankAttacker) + (s8)(argVar); + subpriority = GetBattlerSubpriority(gBattleAnimAttacker) + (s8)(argVar); } if (subpriority < 3) subpriority = 3; - CreateSpriteAndAnimate(template, GetBattlerSpriteCoord(gAnimBankTarget, 2), GetBattlerSpriteCoord(gAnimBankTarget, 3), subpriority); + CreateSpriteAndAnimate(template, GetBattlerSpriteCoord(gBattleAnimTarget, 2), GetBattlerSpriteCoord(gBattleAnimTarget, 3), subpriority); gAnimVisualTaskCount++; } @@ -1830,9 +1830,9 @@ static void ScriptCmd_monbg(void) animBank = ANIM_BATTLER_DEF_PARTNER; if (animBank == ANIM_BATTLER_ATTACKER || animBank == ANIM_BATTLER_ATK_PARTNER) - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; else - bank = gAnimBankTarget; + bank = gBattleAnimTarget; if (IsAnimBankSpriteVisible(bank)) { @@ -1903,7 +1903,7 @@ bool8 IsAnimBankSpriteVisible(u8 bank) { if (IsContest()) { - if (bank == gAnimBankAttacker) + if (bank == gBattleAnimAttacker) return TRUE; else return FALSE; @@ -2101,9 +2101,9 @@ static void ScriptCmd_clearmonbg(void) animBankId = ANIM_BATTLER_DEF_PARTNER; if (animBankId == ANIM_BATTLER_ATTACKER || animBankId == ANIM_BATTLER_ATK_PARTNER) - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; else - bank = gAnimBankTarget; + bank = gBattleAnimTarget; if (gMonAnimTaskIdArray[0] != 0xFF) gSprites[gBankSpriteIds[bank]].invisible = FALSE; @@ -2164,9 +2164,9 @@ static void ScriptCmd_monbg_22(void) animBankId = ANIM_BATTLER_DEF_PARTNER; if (animBankId == ANIM_BATTLER_ATTACKER || animBankId == ANIM_BATTLER_ATK_PARTNER) - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; else - bank = gAnimBankTarget; + bank = gBattleAnimTarget; if (IsAnimBankSpriteVisible(bank)) { @@ -2210,9 +2210,9 @@ static void ScriptCmd_clearmonbg_23(void) animBankId = ANIM_BATTLER_DEF_PARTNER; if (animBankId == ANIM_BATTLER_ATTACKER || animBankId == ANIM_BATTLER_ATK_PARTNER) - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; else - bank = gAnimBankTarget; + bank = gBattleAnimTarget; if (IsAnimBankSpriteVisible(bank)) gSprites[gBankSpriteIds[bank]].invisible = FALSE; @@ -2400,7 +2400,7 @@ static void ScriptCmd_fadetobgfromset(void) if (IsContest()) gTasks[taskId].tBackgroundId = bg3; - else if (GetBattlerSide(gAnimBankTarget) == 0) + else if (GetBattlerSide(gBattleAnimTarget) == 0) gTasks[taskId].tBackgroundId = bg2; else gTasks[taskId].tBackgroundId = bg1; @@ -2528,16 +2528,16 @@ static void ScriptCmd_changebg(void) /* s8 BattleAnimAdjustPanning(s8 a) { - if (!IsContest() && (EWRAM_17810[gAnimBankAttacker].unk0 & 0x10)) + if (!IsContest() && (EWRAM_17810[gBattleAnimAttacker].unk0 & 0x10)) { - a = GetBattlerSide(gAnimBankAttacker) ? SOUND_PAN_ATTACKER : SOUND_PAN_TARGET; + a = GetBattlerSide(gBattleAnimAttacker) ? SOUND_PAN_ATTACKER : SOUND_PAN_TARGET; } //_08076FDC else { if (IsContest()) { - if (gAnimBankAttacker == gAnimBankTarget && gAnimBankAttacker == 2 + if (gBattleAnimAttacker == gBattleAnimTarget && gBattleAnimAttacker == 2 && a == SOUND_PAN_TARGET) { //jump to _0807707A @@ -2549,9 +2549,9 @@ s8 BattleAnimAdjustPanning(s8 a) //_08077004 else { - if (GetBattlerSide(gAnimBankAttacker) == 0) + if (GetBattlerSide(gBattleAnimAttacker) == 0) { - if (GetBattlerSide(gAnimBankTarget) == 0) + if (GetBattlerSide(gBattleAnimTarget) == 0) } //_08077042 else @@ -2575,7 +2575,7 @@ s8 BattleAnimAdjustPanning(s8 a) lsls r0, 24\n\ cmp r0, 0\n\ bne _08076FDC\n\ - ldr r0, _08076FD4 @ =gAnimBankAttacker\n\ + ldr r0, _08076FD4 @ =gBattleAnimAttacker\n\ ldrb r2, [r0]\n\ lsls r0, r2, 1\n\ adds r0, r2\n\ @@ -2596,15 +2596,15 @@ s8 BattleAnimAdjustPanning(s8 a) movs r4, 0x3F\n\ b _0807706E\n\ .align 2, 0\n\ -_08076FD4: .4byte gAnimBankAttacker\n\ +_08076FD4: .4byte gBattleAnimAttacker\n\ _08076FD8: .4byte gSharedMem + 0x17810\n\ _08076FDC:\n\ bl IsContest\n\ lsls r0, 24\n\ cmp r0, 0\n\ beq _08077004\n\ - ldr r0, _08076FFC @ =gAnimBankAttacker\n\ - ldr r1, _08077000 @ =gAnimBankTarget\n\ + ldr r0, _08076FFC @ =gBattleAnimAttacker\n\ + ldr r1, _08077000 @ =gBattleAnimTarget\n\ ldrb r0, [r0]\n\ ldrb r1, [r1]\n\ cmp r0, r1\n\ @@ -2615,16 +2615,16 @@ _08076FDC:\n\ beq _0807707A\n\ b _08077068\n\ .align 2, 0\n\ -_08076FFC: .4byte gAnimBankAttacker\n\ -_08077000: .4byte gAnimBankTarget\n\ +_08076FFC: .4byte gBattleAnimAttacker\n\ +_08077000: .4byte gBattleAnimTarget\n\ _08077004:\n\ - ldr r0, _0807702C @ =gAnimBankAttacker\n\ + ldr r0, _0807702C @ =gBattleAnimAttacker\n\ ldrb r0, [r0]\n\ bl GetBattlerSide\n\ lsls r0, 24\n\ cmp r0, 0\n\ bne _08077042\n\ - ldr r0, _08077030 @ =gAnimBankTarget\n\ + ldr r0, _08077030 @ =gBattleAnimTarget\n\ ldrb r0, [r0]\n\ bl GetBattlerSide\n\ lsls r0, 24\n\ @@ -2637,8 +2637,8 @@ _08077004:\n\ movs r4, 0xC0\n\ b _0807706E\n\ .align 2, 0\n\ -_0807702C: .4byte gAnimBankAttacker\n\ -_08077030: .4byte gAnimBankTarget\n\ +_0807702C: .4byte gBattleAnimAttacker\n\ +_08077030: .4byte gBattleAnimTarget\n\ _08077034:\n\ movs r0, 0x40\n\ negs r0, r0\n\ @@ -2648,7 +2648,7 @@ _08077034:\n\ lsls r0, 24\n\ b _0807706C\n\ _08077042:\n\ - ldr r0, _08077064 @ =gAnimBankTarget\n\ + ldr r0, _08077064 @ =gBattleAnimTarget\n\ ldrb r0, [r0]\n\ bl GetBattlerSide\n\ lsls r0, 24\n\ @@ -2664,7 +2664,7 @@ _08077042:\n\ movs r4, 0x3F\n\ b _0807706E\n\ .align 2, 0\n\ -_08077064: .4byte gAnimBankTarget\n\ +_08077064: .4byte gBattleAnimTarget\n\ _08077068:\n\ lsls r0, r4, 24\n\ negs r0, r0\n\ @@ -2696,16 +2696,16 @@ _08077088:\n\ s8 BattleAnimAdjustPanning2(s8 pan) { - if (!IsContest() && (EWRAM_17810[gAnimBankAttacker].unk0 & 0x10)) + if (!IsContest() && (EWRAM_17810[gBattleAnimAttacker].unk0 & 0x10)) { - if (GetBattlerSide(gAnimBankAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != 0) pan = SOUND_PAN_TARGET; else pan = SOUND_PAN_ATTACKER; } else { - if (GetBattlerSide(gAnimBankAttacker) != 0 || IsContest() != 0) + if (GetBattlerSide(gBattleAnimAttacker) != 0 || IsContest() != 0) pan = -pan; } return pan; @@ -3094,9 +3094,9 @@ static void ScriptCmd_monbgprio_28(void) sBattleAnimScriptPtr += 2; if (wantedBank != 0) - bank = gAnimBankTarget; + bank = gBattleAnimTarget; else - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; bankIdentity = GetBattlerPosition(bank); if (!IsContest() && (bankIdentity == 0 || bankIdentity == 3)) @@ -3124,12 +3124,12 @@ static void ScriptCmd_monbgprio_2A(void) wantedBank = T1_READ_8(sBattleAnimScriptPtr + 1); sBattleAnimScriptPtr += 2; - if (GetBattlerSide(gAnimBankAttacker) != GetBattlerSide(gAnimBankTarget)) + if (GetBattlerSide(gBattleAnimAttacker) != GetBattlerSide(gBattleAnimTarget)) { if (wantedBank != 0) - bank = gAnimBankTarget; + bank = gBattleAnimTarget; else - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; bankIdentity = GetBattlerPosition(bank); if (!IsContest() && (bankIdentity == 0 || bankIdentity == 3)) { @@ -3174,16 +3174,16 @@ static void ScriptCmd_doublebattle_2D(void) wantedBank = T1_READ_8(sBattleAnimScriptPtr + 1); sBattleAnimScriptPtr += 2; if (!IsContest() && IsDoubleBattle() - && GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget)) + && GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget)) { if (wantedBank == 0) { - r4 = GetBattlerPosition_permutated(gAnimBankAttacker); + r4 = GetBattlerPosition_permutated(gBattleAnimAttacker); spriteId = GetAnimBattlerSpriteId(0); } else { - r4 = GetBattlerPosition_permutated(gAnimBankTarget); + r4 = GetBattlerPosition_permutated(gBattleAnimTarget); spriteId = GetAnimBattlerSpriteId(1); } if (spriteId != 0xFF) @@ -3208,16 +3208,16 @@ static void ScriptCmd_doublebattle_2E(void) wantedBank = T1_READ_8(sBattleAnimScriptPtr + 1); sBattleAnimScriptPtr += 2; if (!IsContest() && IsDoubleBattle() - && GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget)) + && GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget)) { if (wantedBank == 0) { - r4 = GetBattlerPosition_permutated(gAnimBankAttacker); + r4 = GetBattlerPosition_permutated(gBattleAnimAttacker); spriteId = GetAnimBattlerSpriteId(0); } else { - r4 = GetBattlerPosition_permutated(gAnimBankTarget); + r4 = GetBattlerPosition_permutated(gBattleAnimTarget); spriteId = GetAnimBattlerSpriteId(1); } if (spriteId != 0xFF && r4 == 2) diff --git a/src/battle/battle_anim_807B69C.c b/src/battle/battle_anim_807B69C.c index 5daf7bb50..90e6ce38c 100644 --- a/src/battle/battle_anim_807B69C.c +++ b/src/battle/battle_anim_807B69C.c @@ -9,12 +9,12 @@ #include "trig.h" #include "ewram.h" -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern bool8 gAnimScriptActive; extern void (*gAnimScriptCallback)(void); extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimTarget; extern u8 gBankSpriteIds[]; extern const struct CompressedSpriteSheet gBattleAnimPicTable[]; extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; @@ -180,8 +180,8 @@ static void sub_807B8A4(struct Sprite *sprite) void sub_807B920(u8 taskId) { - s16 x = GetBattlerSpriteCoord(gAnimBankTarget, 2) - 32; - s16 y = GetBattlerSpriteCoord(gAnimBankTarget, 3) - 36; + s16 x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) - 32; + s16 y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) - 36; u8 spriteId; if (IsContest()) @@ -336,8 +336,8 @@ void move_anim_start_t2(u8 a, u8 b) { u8 taskId; - gAnimBankAttacker = a; - gAnimBankTarget = a; + gBattleAnimAttacker = a; + gBattleAnimTarget = a; LaunchBattleAnimation(gBattleAnims_StatusConditions, b, 0); taskId = CreateTask(sub_807BDAC, 10); gTasks[taskId].data[0] = a; diff --git a/src/battle/battle_anim_80A7E7C.c b/src/battle/battle_anim_80A7E7C.c index 480cb3d72..7b3e197d7 100644 --- a/src/battle/battle_anim_80A7E7C.c +++ b/src/battle/battle_anim_80A7E7C.c @@ -13,8 +13,8 @@ extern s16 gBattleAnimArgs[8]; extern u8 gBankSpriteIds[]; extern s32 gAnimMoveDmg; extern u16 gAnimMovePower; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; static void AnimTask_ShakeMonStep(u8 taskId); static void AnimTask_ShakeMon2Step(u8 taskId); @@ -203,7 +203,7 @@ void AnimTask_ShakeMon2(u8 taskId) } else { - sprite = gBankSpriteIds[gAnimBankAttacker]; + sprite = gBankSpriteIds[gBattleAnimAttacker]; } if (destroy) @@ -427,7 +427,7 @@ static void sub_80A8488(u8 taskId) // arg 4: speed (valid values are 0-5) void AnimTask_TranslateMonEllipticalRespectSide(u8 taskId) { - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[1] = -gBattleAnimArgs[1]; AnimTask_TranslateMonElliptical(taskId); @@ -440,14 +440,14 @@ void AnimTask_TranslateMonEllipticalRespectSide(u8 taskId) static void DoHorizontalLunge(struct Sprite *sprite) { sprite->invisible = TRUE; - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) sprite->data[1] = -gBattleAnimArgs[1]; else sprite->data[1] = gBattleAnimArgs[1]; sprite->data[0] = gBattleAnimArgs[0]; sprite->data[2] = 0; - sprite->data[3] = gBankSpriteIds[gAnimBankAttacker]; + sprite->data[3] = gBankSpriteIds[gBattleAnimAttacker]; sprite->data[4] = gBattleAnimArgs[0]; StoreSpriteCallbackInData(sprite, ReverseHorizontalLungeDirection); sprite->callback = TranslateMonBGUntil; @@ -498,9 +498,9 @@ static void SlideMonToOriginalPos(struct Sprite *sprite) int something; int monSpriteId; if (!gBattleAnimArgs[0]) - monSpriteId = gBankSpriteIds[gAnimBankAttacker]; + monSpriteId = gBankSpriteIds[gBattleAnimAttacker]; else - monSpriteId = gBankSpriteIds[gAnimBankTarget]; + monSpriteId = gBankSpriteIds[gBattleAnimTarget]; sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = gSprites[monSpriteId].pos1.x + gSprites[monSpriteId].pos2.x; @@ -567,9 +567,9 @@ static void SlideMonToOffset(struct Sprite *sprite) u8 battler; u8 monSpriteId; if (!gBattleAnimArgs[0]) - battler = gAnimBankAttacker; + battler = gBattleAnimAttacker; else - battler = gAnimBankTarget; + battler = gBattleAnimTarget; monSpriteId = gBankSpriteIds[battler]; if (GetBattlerSide(battler) != B_SIDE_PLAYER) @@ -602,11 +602,11 @@ static void sub_80A8818(struct Sprite *sprite) sprite->invisible = TRUE; if (!gBattleAnimArgs[0]) { - v1 = gAnimBankAttacker; + v1 = gBattleAnimAttacker; } else { - v1 = gAnimBankTarget; + v1 = gBattleAnimTarget; } spriteId = gBankSpriteIds[v1]; if (GetBattlerSide(v1)) @@ -659,7 +659,7 @@ static void sub_80A88F0(struct Sprite *sprite) void AnimTask_WindUpLunge(u8 taskId) { s16 wavePeriod = 0x8000 / gBattleAnimArgs[3]; - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; gBattleAnimArgs[5] = -gBattleAnimArgs[5]; @@ -721,27 +721,27 @@ void sub_80A8A80(u8 taskId) spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); break; case 2: - if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) + if (!IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2)) { DestroyAnimVisualTask(taskId); return; } - spriteId = gBankSpriteIds[gAnimBankAttacker ^ 2]; + spriteId = gBankSpriteIds[gBattleAnimAttacker ^ 2]; break; case 3: - if (!IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) + if (!IsAnimBankSpriteVisible(gBattleAnimTarget ^ 2)) { DestroyAnimVisualTask(taskId); return; } - spriteId = gBankSpriteIds[gAnimBankTarget ^ 2]; + spriteId = gBankSpriteIds[gBattleAnimTarget ^ 2]; break; default: DestroyAnimVisualTask(taskId); return; } TASK.data[0] = spriteId; - if (GetBattlerSide(gAnimBankTarget)) + if (GetBattlerSide(gBattleAnimTarget)) { TASK.data[1] = gBattleAnimArgs[1]; } @@ -774,7 +774,7 @@ static void sub_80A8B3C(u8 taskId) void AnimTask_SwayMon(u8 taskId) { u8 spriteId; - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[1] = -gBattleAnimArgs[1]; spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[4]); @@ -785,9 +785,9 @@ void AnimTask_SwayMon(u8 taskId) TASK.data[4] = spriteId; if (gBattleAnimArgs[4] == 0) - TASK.data[5] = gAnimBankAttacker; + TASK.data[5] = gBattleAnimAttacker; else - TASK.data[5] = gAnimBankTarget; + TASK.data[5] = gBattleAnimTarget; TASK.data[12] = 1; TASK.func = AnimTask_SwayMonStep; @@ -909,11 +909,11 @@ void sub_80A8E04(u8 taskId) { if (gBattleAnimArgs[2] == 0) { - TASK.data[7] = !GetBattlerSide(gAnimBankAttacker); + TASK.data[7] = !GetBattlerSide(gBattleAnimAttacker); } else { - TASK.data[7] = !GetBattlerSide(gAnimBankTarget); + TASK.data[7] = !GetBattlerSide(gBattleAnimTarget); } } if (TASK.data[7]) @@ -936,14 +936,14 @@ void sub_80A8EFC(u8 taskId) TASK.data[2] = gBattleAnimArgs[0]; if (gBattleAnimArgs[2] == 0) { - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; } } else { - if (GetBattlerSide(gAnimBankTarget)) + if (GetBattlerSide(gBattleAnimTarget)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; } diff --git a/src/battle/battle_anim_812C144.c b/src/battle/battle_anim_812C144.c index acf8f7749..bae4eef1d 100644 --- a/src/battle/battle_anim_812C144.c +++ b/src/battle/battle_anim_812C144.c @@ -16,8 +16,8 @@ #include "constants/species.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u8 gAnimVisualTaskCount; extern u8 gAnimFriendship; extern s32 gAnimMoveDmg; @@ -888,7 +888,11 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402884[] = gSpriteAffineAnim_8402864, }; -const struct SpriteTemplate gBattleAnimSpriteTemplate_8402894 = +//arg[0]: frame (0-3) +//arg[1]: x +//arg[2]: y +//arg[3]: ??? (time on screen?) +const struct SpriteTemplate gPinkSmokeTemplate = { .tileTag = ANIM_TAG_PINK_CLOUD, .paletteTag = ANIM_TAG_PINK_CLOUD, @@ -1205,8 +1209,8 @@ static void sub_812C184(struct Sprite *sprite) void sub_812C1D0(u8 taskId) { sub_8046234( - GetBattlerSpriteCoord(gAnimBankTarget, 2) + 8, - GetBattlerSpriteCoord(gAnimBankTarget, 3) + 8, + GetBattlerSpriteCoord(gBattleAnimTarget, 2) + 8, + GetBattlerSpriteCoord(gBattleAnimTarget, 3) + 8, 0); DestroyAnimVisualTask(taskId); @@ -1242,8 +1246,8 @@ static void sub_812C2A4(struct Sprite *sprite) static void sub_812C2BC(struct Sprite *sprite) { u16 rotation; - u8 x = GetBattlerSpriteCoord(gAnimBankTarget, 2); - u8 y = GetBattlerSpriteCoord(gAnimBankTarget, 3); + u8 x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + u8 y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sub_8078764(sprite, TRUE); @@ -1427,9 +1431,9 @@ static void sub_812C720(struct Sprite *sprite) u16 y; InitAnimSpritePos(sprite, 1); - SetAverageBattlerPositions(gAnimBankTarget, 0, &x, &y); + SetAverageBattlerPositions(gBattleAnimTarget, 0, &x, &y); - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; @@ -1482,7 +1486,7 @@ static void sub_812C848(struct Sprite *sprite) if (!IsContest()) { - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { sprite->data[1] = gBattleAnimArgs[2]; sprite->data[2] = gBattleAnimArgs[3]; @@ -1522,7 +1526,7 @@ static void sub_812C908(struct Sprite *sprite) void sub_812C924(u8 taskId) { - if (GetBattlerSide(gAnimBankTarget) == B_SIDE_OPPONENT) + if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT) gBattleAnimArgs[7] = 0; else gBattleAnimArgs[7] = 1; @@ -1609,8 +1613,8 @@ static void sub_812CAFC(struct Sprite *sprite) { if (gBattleAnimArgs[3] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); } sprite->pos1.x += gBattleAnimArgs[0]; @@ -1704,13 +1708,13 @@ static void sub_812CCE8(struct Sprite *sprite) int var0; if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); } else { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); } sprite->pos2.y = gBattleAnimArgs[2]; @@ -1757,13 +1761,13 @@ void sub_812CDC8(u8 taskId) if (gBattleAnimArgs[0] == 0) { - var0 = sub_8077FC0(gAnimBankAttacker); - toBG2 = GetBattlerPosition_permutated(gAnimBankAttacker); + var0 = sub_8077FC0(gBattleAnimAttacker); + toBG2 = GetBattlerPosition_permutated(gBattleAnimAttacker); } else { - var0 = sub_8077FC0(gAnimBankTarget); - toBG2 = GetBattlerPosition_permutated(gAnimBankTarget); + var0 = sub_8077FC0(gBattleAnimTarget); + toBG2 = GetBattlerPosition_permutated(gBattleAnimTarget); } task->data[0] = var0 + 36; @@ -1893,8 +1897,8 @@ void sub_812D008(u8 taskId) task->data[0] = 0; task->data[1] = 0; - task->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - task->data[3] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + task->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + task->data[3] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); task->data[4] = 32; task->data[5] = -20; task->data[6] = 0; @@ -2036,8 +2040,8 @@ static void sub_812D294(struct Sprite *sprite) sprite->pos2.x = 0; sprite->pos2.y = 0; sprite->data[0] = 20; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sprite->callback = StartAnimLinearTranslation; } } @@ -2064,8 +2068,8 @@ static void sub_812D3AC(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sub_8078E70(spriteId, 0); sprite->data[1] = 256; sprite->data[2] = 256; @@ -2102,7 +2106,7 @@ static void sub_812D3AC(struct Sprite *sprite) static void sub_812D4B4(struct Sprite *sprite) { - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) sprite->pos1.x = -16; else sprite->pos1.x = 256; @@ -2116,7 +2120,7 @@ static void sub_812D4EC(struct Sprite *sprite) u32 newX; sprite->data[0] += 72; - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) sprite->pos2.x = sprite->data[0] >> 4; else sprite->pos2.x = -(sprite->data[0] >> 4); @@ -2220,7 +2224,7 @@ static void sub_812D724(struct Sprite *sprite) case 0: InitAnimSpritePos(sprite, 0); sprite->data[1] = 0x900; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[0]++; break; case 1: @@ -2261,7 +2265,7 @@ void sub_812D7E8(u8 taskId) { case 0: REG_MOSAIC = 0; - if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1) + if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1) REG_BG1CNT_BITFIELD.mosaic = 1; else REG_BG2CNT_BITFIELD.mosaic = 1; @@ -2281,15 +2285,15 @@ void sub_812D7E8(u8 taskId) } break; case 2: - sub_8031FC4(gAnimBankAttacker, gAnimBankTarget, gTasks[taskId].data[10]); - sub_8078954(&subStruct, gAnimBankAttacker); + sub_8031FC4(gBattleAnimAttacker, gBattleAnimTarget, gTasks[taskId].data[10]); + sub_8078954(&subStruct, gBattleAnimAttacker); if (IsContest()) position = 0; else - position = GetBattlerPosition(gAnimBankAttacker); + position = GetBattlerPosition(gBattleAnimAttacker); - dest = gUnknown_081FAF4C[position] + (gBattleMonForms[gAnimBankAttacker] << 11); + dest = gUnknown_081FAF4C[position] + (gBattleMonForms[gBattleAnimAttacker] << 11); src = subStruct.field_0; DmaCopy32(3, dest, src, 0x800); @@ -2319,11 +2323,11 @@ void sub_812D7E8(u8 taskId) ptr = EWRAM_19348; if (IsSpeciesNotUnown(ptr[1])) - gSprites[gBankSpriteIds[gAnimBankAttacker]].affineAnims = gSpriteAffineAnimTable_81E7C18; + gSprites[gBankSpriteIds[gBattleAnimAttacker]].affineAnims = gSpriteAffineAnimTable_81E7C18; else - gSprites[gBankSpriteIds[gAnimBankAttacker]].affineAnims = gSpriteAffineAnimTable_81E7BEC; + gSprites[gBankSpriteIds[gBattleAnimAttacker]].affineAnims = gSpriteAffineAnimTable_81E7BEC; - StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gAnimBankAttacker]], 0); + StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gBattleAnimAttacker]], 0); } gTasks[taskId].data[0]++; @@ -2342,17 +2346,17 @@ void sub_812D7E8(u8 taskId) break; case 4: REG_MOSAIC = 0; - if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1) + if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1) REG_BG1CNT_BITFIELD.mosaic = 0; else REG_BG2CNT_BITFIELD.mosaic = 0; if (!IsContest()) { - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT) + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) { if (gTasks[taskId].data[10] == 0) - sub_8032984(gAnimBankAttacker, eTransformStatuses[gAnimBankAttacker].species); + sub_8032984(gBattleAnimAttacker, eTransformStatuses[gBattleAnimAttacker].species); } } @@ -2363,13 +2367,13 @@ void sub_812D7E8(u8 taskId) void c3_80DFBE4(u8 taskId) { - gBattleAnimArgs[7] = gSprites[gBankSpriteIds[gAnimBankAttacker]].invisible; + gBattleAnimArgs[7] = gSprites[gBankSpriteIds[gBattleAnimAttacker]].invisible; DestroyAnimVisualTask(taskId); } void sub_812DB58(u8 taskId) { - sub_8031FC4(gAnimBankAttacker, gAnimBankTarget, 1); + sub_8031FC4(gBattleAnimAttacker, gBattleAnimTarget, 1); DestroyAnimVisualTask(taskId); } @@ -2401,7 +2405,7 @@ void sub_812DB84(u8 taskId) } else { - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattle_BG1_X = -135; else gBattle_BG1_X = -10; @@ -2480,8 +2484,8 @@ static void sub_812DEAC(struct Sprite *sprite) if (var0 > 31) var0 = 32 - var0; - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + var0; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 32; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + var0; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 32; sprite->data[1] = gBattleAnimArgs[0]; sprite->data[2] = gBattleAnimArgs[1]; @@ -2598,7 +2602,7 @@ void sub_812E14C(u8 taskId) } else { - u8 position = GetBattlerPosition(gAnimBankTarget); + u8 position = GetBattlerPosition(gBattleAnimTarget); if (IsDoubleBattle() == TRUE) { if (position == B_POSITION_OPPONENT_LEFT) @@ -2627,7 +2631,7 @@ void sub_812E14C(u8 taskId) break; case 1: gTasks[taskId].data[3] = 0; - if (GetBattlerSide(gAnimBankTarget) == B_SIDE_OPPONENT) + if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT) gBattle_BG1_X = gTasks[taskId].data[10] + gUnknown_08402604[gTasks[taskId].data[2]]; else gBattle_BG1_X = gTasks[taskId].data[10] - gUnknown_08402604[gTasks[taskId].data[2]]; @@ -2702,7 +2706,7 @@ static void sub_812E4F0(struct Sprite *sprite) sprite->data[1] += 160; sprite->data[2] += 128; - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) sprite->pos2.x = -(sprite->data[1] >> 8); else sprite->pos2.x = sprite->data[1] >> 8; @@ -2739,9 +2743,9 @@ void sub_812E568(u8 taskId) task->data[15] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); if (gBattleAnimArgs[0] == 0) - side = GetBattlerSide(gAnimBankAttacker); + side = GetBattlerSide(gBattleAnimAttacker); else - side = GetBattlerSide(gAnimBankTarget); + side = GetBattlerSide(gBattleAnimTarget); if (side == B_SIDE_OPPONENT) { @@ -2809,7 +2813,7 @@ static void sub_812E638(u8 taskId) static void sub_812E7A0(struct Sprite *sprite) { - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { sprite->pos1.x = 0; sprite->pos1.y = gBattleAnimArgs[0]; @@ -2828,7 +2832,7 @@ static void sub_812E7A0(struct Sprite *sprite) static void sub_812E7F0(struct Sprite *sprite) { sprite->data[0] += 3; - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { sprite->pos1.x += 5; sprite->pos1.y -= 1; @@ -2944,8 +2948,8 @@ static void sub_812EA4C(struct Sprite *sprite) { if (gBattleAnimArgs[2] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); } sprite->pos1.x += gBattleAnimArgs[0]; @@ -2979,9 +2983,9 @@ void sub_812EB10(u8 taskId) if (gTasks[taskId].data[0] == 0) { if (gBattleAnimArgs[0] == 0) - gTasks[taskId].data[11] = gAnimBankAttacker; + gTasks[taskId].data[11] = gBattleAnimAttacker; else - gTasks[taskId].data[11] = gAnimBankTarget; + gTasks[taskId].data[11] = gBattleAnimTarget; spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); gTasks[taskId].data[10] = spriteId; @@ -3131,8 +3135,8 @@ static void sub_812EE00(struct Sprite *sprite) static void sub_812EEA4(struct Sprite *sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[0] = gBattleAnimArgs[0]; sprite->data[1] = gBattleAnimArgs[1]; sprite->callback = sub_812EEEC; @@ -3146,9 +3150,9 @@ static void sub_812EEEC(struct Sprite *sprite) sprite->data[1] = (sprite->data[1] + 9) & 0xFF; if ((u16)sprite->data[1] < 64 || sprite->data[1] > 195) - sprite->subpriority = GetBattlerSubpriority(gAnimBankAttacker) - 1; + sprite->subpriority = GetBattlerSubpriority(gBattleAnimAttacker) - 1; else - sprite->subpriority = GetBattlerSubpriority(gAnimBankAttacker) + 1; + sprite->subpriority = GetBattlerSubpriority(gBattleAnimAttacker) + 1; if (sprite->data[5] == 0) { @@ -3194,21 +3198,21 @@ void sub_812EFC8(u8 taskId) } else { - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { isBackPic = 0; - personality = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankTarget]], MON_DATA_PERSONALITY); - otId = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankTarget]], MON_DATA_OT_ID); - if (eTransformStatuses[gAnimBankTarget].species == SPECIES_NONE) + personality = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_PERSONALITY); + otId = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_OT_ID); + if (eTransformStatuses[gBattleAnimTarget].species == SPECIES_NONE) { - if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER) - species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankTarget]], MON_DATA_SPECIES); + if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_SPECIES); else - species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gAnimBankTarget]], MON_DATA_SPECIES); + species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_SPECIES); } else { - species = eTransformStatuses[gAnimBankTarget].species; + species = eTransformStatuses[gBattleAnimTarget].species; } xOffset = 20; @@ -3216,27 +3220,27 @@ void sub_812EFC8(u8 taskId) else { isBackPic = 1; - personality = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gAnimBankTarget]], MON_DATA_PERSONALITY); - otId = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gAnimBankTarget]], MON_DATA_OT_ID); - if (eTransformStatuses[gAnimBankTarget].species == SPECIES_NONE) + personality = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_PERSONALITY); + otId = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_OT_ID); + if (eTransformStatuses[gBattleAnimTarget].species == SPECIES_NONE) { - if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER) - species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankTarget]], MON_DATA_SPECIES); + if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_SPECIES); else - species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gAnimBankTarget]], MON_DATA_SPECIES); + species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_SPECIES); } else { - species = eTransformStatuses[gAnimBankTarget].species; + species = eTransformStatuses[gBattleAnimTarget].species; } xOffset = -20; } } - priority = sub_8079ED4(gAnimBankAttacker); - coord1 = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - coord2 = GetBattlerSpriteCoord(gAnimBankAttacker, 1); + priority = sub_8079ED4(gBattleAnimAttacker); + coord1 = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + coord2 = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); spriteId = sub_8079F44(species, isBackPic, 0, coord1 + xOffset, coord2, 5, personality, otId); gSprites[spriteId].oam.priority = priority; @@ -3284,7 +3288,7 @@ void sub_812EFC8(u8 taskId) .align 2, 0\n\ _0812F000: .4byte gSharedMem + 0x19348\n\ _0812F004:\n\ - ldr r0, _0812F070 @ =gAnimBankAttacker\n\ + ldr r0, _0812F070 @ =gBattleAnimAttacker\n\ ldrb r0, [r0]\n\ bl GetBattlerSide\n\ lsls r0, 24\n\ @@ -3293,7 +3297,7 @@ _0812F004:\n\ movs r0, 0\n\ str r0, [sp, 0x14]\n\ ldr r6, _0812F074 @ =gBattlerPartyIndexes\n\ - ldr r4, _0812F078 @ =gAnimBankTarget\n\ + ldr r4, _0812F078 @ =gBattleAnimTarget\n\ ldrb r0, [r4]\n\ lsls r0, 1\n\ adds r0, r6\n\ @@ -3334,9 +3338,9 @@ _0812F004:\n\ adds r0, r7\n\ b _0812F092\n\ .align 2, 0\n\ -_0812F070: .4byte gAnimBankAttacker\n\ +_0812F070: .4byte gBattleAnimAttacker\n\ _0812F074: .4byte gBattlerPartyIndexes\n\ -_0812F078: .4byte gAnimBankTarget\n\ +_0812F078: .4byte gBattleAnimTarget\n\ _0812F07C: .4byte gPlayerParty\n\ _0812F080: .4byte gSharedMem + 0x17800\n\ _0812F084:\n\ @@ -3365,7 +3369,7 @@ _0812F0AC:\n\ movs r2, 0x1\n\ str r2, [sp, 0x14]\n\ ldr r6, _0812F10C @ =gBattlerPartyIndexes\n\ - ldr r4, _0812F110 @ =gAnimBankTarget\n\ + ldr r4, _0812F110 @ =gBattleAnimTarget\n\ ldrb r0, [r4]\n\ lsls r0, 1\n\ adds r0, r6\n\ @@ -3408,7 +3412,7 @@ _0812F0AC:\n\ b _0812F12C\n\ .align 2, 0\n\ _0812F10C: .4byte gBattlerPartyIndexes\n\ -_0812F110: .4byte gAnimBankTarget\n\ +_0812F110: .4byte gBattleAnimTarget\n\ _0812F114: .4byte gEnemyParty\n\ _0812F118: .4byte gSharedMem + 0x17800\n\ _0812F11C: .4byte gPlayerParty\n\ @@ -3432,12 +3436,12 @@ _0812F13A:\n\ _0812F13C:\n\ mov r10, r3\n\ _0812F13E:\n\ - ldr r0, _0812F21C @ =gAnimBankAttacker\n\ + ldr r0, _0812F21C @ =gBattleAnimAttacker\n\ ldrb r0, [r0]\n\ bl sub_8079ED4\n\ lsls r0, 24\n\ lsrs r7, r0, 24\n\ - ldr r5, _0812F21C @ =gAnimBankAttacker\n\ + ldr r5, _0812F21C @ =gBattleAnimAttacker\n\ ldrb r0, [r5]\n\ movs r1, 0\n\ bl GetBattlerSpriteCoord\n\ @@ -3538,7 +3542,7 @@ _0812F13E:\n\ bx r0\n\ .align 2, 0\n\ _0812F218: .4byte 0x0000ffec\n\ -_0812F21C: .4byte gAnimBankAttacker\n\ +_0812F21C: .4byte gBattleAnimAttacker\n\ _0812F220: .4byte gSprites\n\ _0812F224: .4byte 0x00007fff\n\ _0812F228: .4byte REG_BLDCNT\n\ @@ -3589,9 +3593,9 @@ void sub_812F314(u8 taskId) struct Task *task = &gTasks[taskId]; if (gBattleAnimArgs[0] == 0) - battler = gAnimBankAttacker; + battler = gBattleAnimAttacker; else - battler = gAnimBankTarget; + battler = gBattleAnimTarget; task->data[0] = 0; task->data[1] = 0; @@ -3849,11 +3853,11 @@ static void sub_812F948(struct Sprite *sprite) { sprite->data[0] = gBattleAnimArgs[3]; StartSpriteAffineAnim(sprite, gBattleAnimArgs[0]); - if (GetBattlerSide(gAnimBankTarget) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER) gBattleAnimArgs[1] = -gBattleAnimArgs[1]; - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; sprite->callback = sub_80DA48C; } @@ -3962,14 +3966,14 @@ static void sub_812FAF8(u8 taskId) void sub_812FC68(u8 taskId) { - gTasks[taskId].data[15] = gBankSpriteIds[gAnimBankAttacker]; + gTasks[taskId].data[15] = gBankSpriteIds[gBattleAnimAttacker]; gTasks[taskId].data[14] = gBattleAnimArgs[0]; gTasks[taskId].data[0] = gBattleAnimArgs[0]; gTasks[taskId].data[13] = gBattleAnimArgs[6]; if (gBattleAnimArgs[3]) gTasks[taskId].data[6] = gTasks[taskId].data[6] | -0x8000; - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { gTasks[taskId].data[2] = gBattleAnimArgs[1]; gTasks[taskId].data[3] = gBattleAnimArgs[2]; @@ -4007,9 +4011,9 @@ void sub_812FD7C(u8 taskId) task->data[2] = 0; task->data[3] = gBattleAnimArgs[1]; if (gBattleAnimArgs[0] == 0) - battler = gAnimBankAttacker; + battler = gBattleAnimAttacker; else - battler = gAnimBankTarget; + battler = gBattleAnimTarget; task->data[4] = GetBattlerSpriteCoord(battler, 0); task->data[5] = GetBattlerSpriteCoord(battler, 1); @@ -4139,7 +4143,7 @@ void sub_81300A4(u8 taskId) taskId, 0, 0x1A0, - gAnimBankAttacker, + gBattleAnimAttacker, gBattleAnimArgs[0], 10, 2, @@ -4151,11 +4155,11 @@ void sub_81300A4(u8 taskId) static void sub_81300F4(struct Sprite *sprite) { - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT) + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1]; if (gBattleAnimArgs[2] == 0) { sprite->data[0] = 640; @@ -4173,7 +4177,7 @@ static void sub_81300F4(struct Sprite *sprite) sprite->data[0] = 640; } - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { sprite->data[0] = -sprite->data[0]; sprite->hFlip = 1; @@ -4209,14 +4213,14 @@ void sub_81301EC(u8 taskId) task->data[7] = 0; } - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER) - task->data[11] = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + sub_807A100(gAnimBankAttacker, 0) / 4; + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + task->data[11] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + sub_807A100(gBattleAnimAttacker, 0) / 4; else - task->data[11] = GetBattlerSpriteCoord(gAnimBankAttacker, 2) - sub_807A100(gAnimBankAttacker, 0) / 4; + task->data[11] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) - sub_807A100(gBattleAnimAttacker, 0) / 4; - task->data[12] = GetBattlerSpriteCoord(gAnimBankAttacker, 3) - sub_807A100(gAnimBankAttacker, 0) / 4; - task->data[13] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - task->data[14] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + task->data[12] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) - sub_807A100(gBattleAnimAttacker, 0) / 4; + task->data[13] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + task->data[14] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); task->func = sub_81302E4; } @@ -4338,11 +4342,11 @@ void sub_8130554(u8 taskId) { struct Task *task = &gTasks[taskId]; - task->data[11] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - task->data[12] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); - task->data[13] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - task->data[14] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + sub_807A100(gAnimBankTarget, 0) / 4; - task->data[15] = CreateSprite(&gSpriteTemplate_84029AC, task->data[11], task->data[12], GetBattlerSubpriority(gAnimBankTarget) - 5); + task->data[11] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + task->data[12] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + task->data[13] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + task->data[14] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + sub_807A100(gBattleAnimTarget, 0) / 4; + task->data[15] = CreateSprite(&gSpriteTemplate_84029AC, task->data[11], task->data[12], GetBattlerSubpriority(gBattleAnimTarget) - 5); if (task->data[15] != MAX_SPRITES) { gSprites[task->data[15]].data[0] = 16; @@ -4350,7 +4354,7 @@ void sub_8130554(u8 taskId) gSprites[task->data[15]].data[4] = task->data[14]; gSprites[task->data[15]].data[5] = -32; InitAnimArcTranslation(&gSprites[task->data[15]]); - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT) + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) StartSpriteAffineAnim(&gSprites[task->data[15]], 1); task->func = sub_81306A4; @@ -4409,9 +4413,9 @@ static void sub_81307B0(struct Sprite *sprite) u8 battler; if (gBattleAnimArgs[0] == 0) - battler = gAnimBankAttacker; + battler = gBattleAnimAttacker; else - battler = gAnimBankTarget; + battler = gBattleAnimTarget; sprite->oam.tileNum += 16; sprite->data[6] = gBattleAnimArgs[2]; @@ -4524,13 +4528,13 @@ static void sub_8130A2C(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = sub_807A100(gAnimBankAttacker, 2); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = sub_807A100(gBattleAnimAttacker, 2); } else { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->pos1.y = sub_807A100(gAnimBankTarget, 2); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->pos1.y = sub_807A100(gBattleAnimTarget, 2); } if (sprite->pos1.y < 8) @@ -4665,8 +4669,8 @@ void sub_8130D20(u8 taskId) { if (IsDoubleBattle() == TRUE) { - int x = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - int y = GetBattlerSpriteCoord(gAnimBankAttacker ^ 2, 0); + int x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + int y = GetBattlerSpriteCoord(gBattleAnimAttacker ^ 2, 0); if (x > y) task->data[14] = 1; else @@ -4674,7 +4678,7 @@ void sub_8130D20(u8 taskId) } else { - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) task->data[14] = -1; else task->data[14] = 1; @@ -4775,11 +4779,11 @@ static void sub_8130F5C(struct Sprite *sprite) if (gBattleAnimArgs[0] == 0) { InitAnimSpritePos(sprite, 1); - sprite->data[7] = gAnimBankAttacker; + sprite->data[7] = gBattleAnimAttacker; } else { - sprite->data[7] = gAnimBankTarget; + sprite->data[7] = gBattleAnimTarget; } if (GetBattlerSide(sprite->data[7]) == B_SIDE_OPPONENT) @@ -4912,10 +4916,10 @@ static void sub_81311E4(struct Sprite *sprite) static void sub_8131264(struct Sprite *sprite) { - GetBattlerSpriteCoord(gAnimBankTarget, 2); // unused local variable - GetBattlerSpriteCoord(gAnimBankTarget, 3); // unused local variable + GetBattlerSpriteCoord(gBattleAnimTarget, 2); // unused local variable + GetBattlerSpriteCoord(gBattleAnimTarget, 3); // unused local variable - if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER || IsContest()) + if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER || IsContest()) { sprite->data[0] = sprite->pos1.x - gBattleAnimArgs[0]; sprite->data[2] = sprite->pos1.x - gBattleAnimArgs[2]; @@ -4961,11 +4965,11 @@ void sub_81312E4(u8 taskId) } else { - refresh_graphics_maybe(gAnimBankAttacker, 0, spriteId); + refresh_graphics_maybe(gBattleAnimAttacker, 0, spriteId); if (IsContest()) { - gSprites[gBankSpriteIds[gAnimBankAttacker]].affineAnims = gSpriteAffineAnimTable_81E7C18; - StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gAnimBankAttacker]], 0); + gSprites[gBankSpriteIds[gBattleAnimAttacker]].affineAnims = gSpriteAffineAnimTable_81E7C18; + StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gBattleAnimAttacker]], 0); } for (i = 0; i < 16; i++) @@ -5032,18 +5036,18 @@ static void sub_8131564(struct Sprite *sprite) { s16 y2; - if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) { - sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) - 2; + sprite->subpriority = GetBattlerSubpriority(gBattleAnimTarget) - 2; y2 = -144; } else { - sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) + 2; + sprite->subpriority = GetBattlerSubpriority(gBattleAnimTarget) + 2; y2 = -96; } - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sprite->pos2.y = y2; sprite->callback = sub_81315C8; } diff --git a/src/battle/battle_anim_813F0F4.c b/src/battle/battle_anim_813F0F4.c index 7bcae382f..ed3e6d642 100755 --- a/src/battle/battle_anim_813F0F4.c +++ b/src/battle/battle_anim_813F0F4.c @@ -24,8 +24,8 @@ extern u16 gUnknown_03005F10; extern u16 gUnknown_03005F14; extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u8 gHealthboxIDs[]; extern u8 gBankSpriteIds[]; extern u16 gBattlerPartyIndexes[]; @@ -367,7 +367,7 @@ void unref_sub_813F0F4(u8 taskId) u8 battler; u8 spriteId1, spriteId2, spriteId3, spriteId4; - battler = gAnimBankAttacker; + battler = gBattleAnimAttacker; gBattle_WIN0H = 0; gBattle_WIN0V = 0; REG_WININ = 0x3F3F; @@ -415,7 +415,7 @@ static void sub_813F300(u8 taskId) u8 spriteId1, spriteId2; u8 battler; - battler = gAnimBankAttacker; + battler = gBattleAnimAttacker; gTasks[taskId].data[13] += gTasks[taskId].data[1]; gBattle_BG1_Y += (u16)gTasks[taskId].data[13] >> 8; gTasks[taskId].data[13] &= 0xFF; @@ -479,7 +479,7 @@ void sub_813F4EC(u8 taskId) u8 paletteNum1, paletteNum2; u16 offset1, offset2; - healthBoxSpriteId = gHealthboxIDs[gAnimBankAttacker]; + healthBoxSpriteId = gHealthboxIDs[gBattleAnimAttacker]; spriteId1 = gSprites[healthBoxSpriteId].oam.affineParam; spriteId2 = gSprites[healthBoxSpriteId].data[5]; paletteNum1 = AllocSpritePalette(0xD709); @@ -502,7 +502,7 @@ void sub_813F5E8(u8 taskId) u8 spriteId1, spriteId2; u8 paletteIndex1, paletteIndex2; - healthBoxSpriteId = gHealthboxIDs[gAnimBankAttacker]; + healthBoxSpriteId = gHealthboxIDs[gBattleAnimAttacker]; spriteId1 = gSprites[healthBoxSpriteId].oam.affineParam; spriteId2 = gSprites[healthBoxSpriteId].data[5]; @@ -565,7 +565,7 @@ void sub_813F798(u8 taskId) { u8 spriteId; - spriteId = gBankSpriteIds[gAnimBankAttacker]; + spriteId = gBankSpriteIds[gBattleAnimAttacker]; switch (gTasks[taskId].data[0]) { case 0: @@ -597,23 +597,23 @@ void sub_813F844(u8 taskId) u8 priority, subpriority; u32 selectedPalettes; - spriteId = gBankSpriteIds[gAnimBankAttacker]; - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER) - ball = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_POKEBALL); + spriteId = gBankSpriteIds[gBattleAnimAttacker]; + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + ball = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_POKEBALL); else - ball = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_POKEBALL); + ball = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], 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); + x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); priority = gSprites[spriteId].oam.priority; subpriority = gSprites[spriteId].subpriority; gTasks[taskId].data[10] = AnimateBallOpenParticles(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[11] = sub_8141314(0, gBattleAnimAttacker, selectedPalettes, ballIndex); gTasks[taskId].data[0]++; break; case 1: @@ -687,10 +687,10 @@ void sub_813FA94(u8 taskId) 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].data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + gSprites[spriteId].data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) - 16; gSprites[spriteId].callback = sub_813FD90; - ewram17840.unk9_1 = gSprites[gBankSpriteIds[gAnimBankTarget]].invisible; + ewram17840.unk9_1 = gSprites[gBankSpriteIds[gBattleAnimTarget]].invisible; gTasks[taskId].data[0] = spriteId; gTasks[taskId].func = sub_813FB7C; } @@ -724,8 +724,8 @@ void sub_813FBB8(u8 taskId) subpriority = GetBattlerSubpriority(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].data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + gSprites[spriteId].data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) - 16; gSprites[spriteId].callback = SpriteCallbackDummy; StartSpriteAnim(&gSprites[gBankSpriteIds[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]], 1); gTasks[taskId].data[0] = spriteId; @@ -800,7 +800,7 @@ static void sub_813FDC0(struct Sprite *sprite) return; AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballIndex); - sub_8141314(0, gAnimBankTarget, 14, ballIndex); + sub_8141314(0, gBattleAnimTarget, 14, ballIndex); } } } @@ -811,7 +811,7 @@ static void sub_813FE70(struct Sprite *sprite) { sprite->data[5] = CreateTask(TaskDummy, 50); sprite->callback = sub_813FEC8; - gSprites[gBankSpriteIds[gAnimBankTarget]].data[1] = 0; + gSprites[gBankSpriteIds[gBattleAnimTarget]].data[1] = 0; } } @@ -820,7 +820,7 @@ static void sub_813FEC8(struct Sprite *sprite) u8 spriteId; u8 taskId; - spriteId = gBankSpriteIds[gAnimBankTarget]; + spriteId = gBankSpriteIds[gBattleAnimTarget]; taskId = sprite->data[5]; if (++gTasks[taskId].data[1] == 11) @@ -1124,7 +1124,7 @@ static void sub_8140434(struct Sprite *sprite) static void sub_8140454(struct Sprite *sprite) { - u8 *battler = &gAnimBankTarget; + u8 *battler = &gBattleAnimTarget; sprite->data[4]++; if (sprite->data[4] == 40) @@ -1220,13 +1220,13 @@ static void sub_81405F4(struct Sprite *sprite) goto LABEL; AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballIndex); - sub_8141314(1, gAnimBankTarget, 14, ballIndex); + sub_8141314(1, gBattleAnimTarget, 14, ballIndex); LABEL: - gSprites[gBankSpriteIds[gAnimBankTarget]].invisible = 0; - StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gAnimBankTarget]], 1); - AnimateSprite(&gSprites[gBankSpriteIds[gAnimBankTarget]]); - gSprites[gBankSpriteIds[gAnimBankTarget]].data[1] = 0x1000; + gSprites[gBankSpriteIds[gBattleAnimTarget]].invisible = 0; + StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gBattleAnimTarget]], 1); + AnimateSprite(&gSprites[gBankSpriteIds[gBattleAnimTarget]]); + gSprites[gBankSpriteIds[gBattleAnimTarget]].data[1] = 0x1000; } static void sub_81406BC(struct Sprite *sprite) @@ -1236,21 +1236,21 @@ static void sub_81406BC(struct Sprite *sprite) if (sprite->animEnded) sprite->invisible = 1; - if (gSprites[gBankSpriteIds[gAnimBankTarget]].affineAnimEnded) + if (gSprites[gBankSpriteIds[gBattleAnimTarget]].affineAnimEnded) { - StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gAnimBankTarget]], 0); + StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gBattleAnimTarget]], 0); next = TRUE; } else { - gSprites[gBankSpriteIds[gAnimBankTarget]].data[1] -= 288; - gSprites[gBankSpriteIds[gAnimBankTarget]].pos2.y = gSprites[gBankSpriteIds[gAnimBankTarget]].data[1] >> 8; + gSprites[gBankSpriteIds[gBattleAnimTarget]].data[1] -= 288; + gSprites[gBankSpriteIds[gBattleAnimTarget]].pos2.y = gSprites[gBankSpriteIds[gBattleAnimTarget]].data[1] >> 8; } if (sprite->animEnded && next) { - gSprites[gBankSpriteIds[gAnimBankTarget]].pos2.y = 0; - gSprites[gBankSpriteIds[gAnimBankTarget]].invisible = ewram17840.unk9_1; + gSprites[gBankSpriteIds[gBattleAnimTarget]].pos2.y = 0; + gSprites[gBankSpriteIds[gBattleAnimTarget]].invisible = ewram17840.unk9_1; sprite->data[0] = 0; sprite->callback = sub_81405C8; gDoingBattleAnim = 0; @@ -1824,13 +1824,13 @@ void sub_814151C(u8 taskId) u32 done; done = FALSE; - spriteId = gBankSpriteIds[gAnimBankAttacker]; + spriteId = gBankSpriteIds[gBattleAnimAttacker]; switch (gTasks[taskId].data[10]) { case 0: gTasks[taskId].data[11] = gBattleAnimArgs[0]; gTasks[taskId].data[0] += 0x500; - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gSprites[spriteId].pos2.x += gTasks[taskId].data[0] >> 8; else gSprites[spriteId].pos2.x -= gTasks[taskId].data[0] >> 8; @@ -1841,18 +1841,18 @@ void sub_814151C(u8 taskId) gTasks[taskId].data[10]++; break; case 1: - refresh_graphics_maybe(gAnimBankAttacker, gTasks[taskId].data[11], spriteId); + refresh_graphics_maybe(gBattleAnimAttacker, gTasks[taskId].data[11], spriteId); gTasks[taskId].data[10]++; break; case 2: gTasks[taskId].data[0] += 0x500; - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != 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 (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { if (gSprites[spriteId].pos2.x <= 0) { @@ -1886,7 +1886,7 @@ void sub_81416C4(u8 taskId) switch (gTasks[taskId].data[15]) { case 0: - if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1) + if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1) REG_BLDCNT = 0x3F42; else REG_BLDCNT = 0x3F44; @@ -1905,9 +1905,9 @@ void sub_81416C4(u8 taskId) } break; case 2: - spriteId = gBankSpriteIds[gAnimBankAttacker]; + spriteId = gBankSpriteIds[gBattleAnimAttacker]; DmaClear32(3, (void *)OBJ_VRAM0 + gSprites[spriteId].oam.tileNum * TILE_SIZE_4BPP, 0x800); - sub_80324E0(gAnimBankAttacker); + sub_80324E0(gBattleAnimAttacker); DestroyAnimVisualTask(taskId); break; } @@ -1915,13 +1915,13 @@ void sub_81416C4(u8 taskId) void sub_81417D8(u8 taskId) { - gBattleAnimArgs[7] = ewram17800[gAnimBankAttacker].substituteSprite; + gBattleAnimArgs[7] = ewram17800[gBattleAnimAttacker].substituteSprite; DestroyAnimVisualTask(taskId); } void sub_8141808(u8 taskId) { - gAnimBankTarget = gEffectBank; + gBattleAnimTarget = gEffectBank; DestroyAnimVisualTask(taskId); } @@ -2107,13 +2107,13 @@ static void sub_8141C30(struct Sprite *sprite) sprite->data[4] = GetBattlerSpriteCoord(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), 1) + gBattleAnimArgs[3]; sprite->data[5] = -32; InitAnimArcTranslation(sprite); - StartSpriteAnim(&gSprites[gBankSpriteIds[gAnimBankAttacker]], 1); + StartSpriteAnim(&gSprites[gBankSpriteIds[gBattleAnimAttacker]], 1); sprite->callback = sub_8141CBC; } static void sub_8141CBC(struct Sprite *sprite) { - if (gSprites[gBankSpriteIds[gAnimBankAttacker]].animCmdIndex == 1) + if (gSprites[gBankSpriteIds[gBattleAnimAttacker]].animCmdIndex == 1) sprite->callback = sub_8141CF4; } @@ -2129,11 +2129,11 @@ static void sub_8141CF4(struct Sprite *sprite) static void sub_8141D20(struct Sprite *sprite) { - if (gSprites[gBankSpriteIds[gAnimBankAttacker]].animEnded) + if (gSprites[gBankSpriteIds[gBattleAnimAttacker]].animEnded) { if (++sprite->data[0] > 0) { - StartSpriteAnim(&gSprites[gBankSpriteIds[gAnimBankAttacker]], 0); + StartSpriteAnim(&gSprites[gBankSpriteIds[gBattleAnimAttacker]], 0); DestroyAnimSprite(sprite); } } @@ -2141,8 +2141,8 @@ static void sub_8141D20(struct Sprite *sprite) void sub_8141D7C(u8 taskId) { - gAnimBankAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); - gAnimBankTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); + gBattleAnimAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); + gBattleAnimTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); DestroyAnimVisualTask(taskId); } @@ -2164,7 +2164,7 @@ void sub_8141DAC(u8 taskId) void sub_8141E10(u8 taskId) { - gAnimBankAttacker = ewram17840.unk0; - gAnimBankTarget = ewram17840.unk0 >> 8; + gBattleAnimAttacker = ewram17840.unk0; + gBattleAnimTarget = ewram17840.unk0 >> 8; DestroyAnimVisualTask(taskId); } diff --git a/src/berry.c b/src/berry.c index cca07a6bb..162615086 100644 --- a/src/berry.c +++ b/src/berry.c @@ -61,7 +61,7 @@ static const u8 sBerryDescriptionPart1_Cheri[] = _("Blooms with delicate pretty flowers."); static const u8 sBerryDescriptionPart2_Cheri[] = _("The bright red BERRY is very spicy."); -static const u8 sBerryDescriptionPart1_Chesto[] = _("The BERRY’s thick skin and fruit are"); +static const u8 sBerryDescriptionPart1_Chesto[] = _("The BERRY's thick skin and fruit are"); static const u8 sBerryDescriptionPart2_Chesto[] = _("very tough. It is dry-tasting all over."); static const u8 sBerryDescriptionPart1_Pecha[] = _("Very sweet and delicious."); static const u8 sBerryDescriptionPart2_Pecha[] = _("Also very tender - handle with care."); @@ -73,7 +73,7 @@ static const u8 sBerryDescriptionPart1_Leppa[] = _("Grows slower than CHERI and static const u8 sBerryDescriptionPart2_Leppa[] = _("The smaller the BERRY, the tastier."); static const u8 sBerryDescriptionPart1_Oran[] = _("A peculiar BERRY with a mix of flavors."); static const u8 sBerryDescriptionPart2_Oran[] = _("BERRIES grow in half a day."); -static const u8 sBerryDescriptionPart1_Persim[] = _("Loves sunlight. The BERRY’s color"); +static const u8 sBerryDescriptionPart1_Persim[] = _("Loves sunlight. The BERRY's color"); static const u8 sBerryDescriptionPart2_Persim[] = _("grows vivid when exposed to the sun."); static const u8 sBerryDescriptionPart1_Lum[] = _("Slow to grow. If raised with loving"); static const u8 sBerryDescriptionPart2_Lum[] = _("care, it may grow two BERRIES."); @@ -142,7 +142,7 @@ static const u8 sBerryDescriptionPart2_Apicot[] = _("what may happen or how it c static const u8 sBerryDescriptionPart1_Lansat[] = _("Said to be a legendary BERRY."); static const u8 sBerryDescriptionPart2_Lansat[] = _("Holding it supposedly brings joy."); static const u8 sBerryDescriptionPart1_Starf[] = _("So strong, it was abandoned at the"); -static const u8 sBerryDescriptionPart2_Starf[] = _("world’s edge. Considered a mirage."); +static const u8 sBerryDescriptionPart2_Starf[] = _("world's edge. Considered a mirage."); static const u8 sBerryDescriptionPart1_Enigma[] = _("A completely enigmatic BERRY."); static const u8 sBerryDescriptionPart2_Enigma[] = _("Appears to have the power of stars."); #elif defined(GERMAN) diff --git a/src/contest_effect.c b/src/contest_effect.c index 17779a0c6..2cd1e5828 100644 --- a/src/contest_effect.c +++ b/src/contest_effect.c @@ -230,7 +230,7 @@ static void ContestEffect_StartlePrevMons2(void) SetContestantEffectStringID2(shared192D0.contestant, CONTEST_STRING_MESSED_UP2); } -// Shifts the JUDGE’s attention from others. +// Shifts the JUDGE's attention from others. static void ContestEffect_ShiftJudgeAttention(void) { bool32 hitAny = FALSE; @@ -260,7 +260,7 @@ static void ContestEffect_ShiftJudgeAttention(void) } } -// Startles the POKéMON that has the JUDGE’s attention. +// Startles the POKéMON that has the JUDGE's attention. static void ContestEffect_StartleMonWithJudgesAttention(void) { u8 numStartled = 0; @@ -584,7 +584,7 @@ static void ContestEffect_BetterWhenLater(void) SetContestantEffectStringID(shared192D0.contestant, CONTEST_STRING_APPEAL_EXCELLENTLY); } -// The appeal’s quality varies depending on its timing. +// The appeal's quality varies depending on its timing. static void ContestEffect_QualityDependsOnTiming(void) { u8 rval = Random() % 10; @@ -697,7 +697,7 @@ static void ContestEffect_AffectedByPrevAppeal(void) } } -// Ups the user’s condition. Helps prevent nervousness. +// Ups the user's condition. Helps prevent nervousness. static void ContestEffect_ImproveConditionPreventNervousness(void) { if (sContestantStatus[shared192D0.contestant].condition < 30) @@ -710,7 +710,7 @@ static void ContestEffect_ImproveConditionPreventNervousness(void) SetContestantEffectStringID(shared192D0.contestant, CONTEST_STRING_NO_CONDITION_IMPROVE); } -// The appeal works well if the user’s condition is good. +// The appeal works well if the user's condition is good. static void ContestEffect_BetterWithGoodCondition(void) { sContestantStatus[shared192D0.contestant].appealTripleCondition = TRUE; @@ -804,7 +804,7 @@ static void ContestEffect_NextAppealLater(void) } } -// Makes the next turn’s order more easily scrambled. +// Makes the next turn's order more easily scrambled. static void ContestEffect_MakeScramblingTurnOrderEasier(void) { // dummied out? diff --git a/src/data/bard_music_de.h b/src/data/bard_music_de.h index 262fe26a3..90880582e 100644 --- a/src/data/bard_music_de.h +++ b/src/data/bard_music_de.h @@ -697,7 +697,7 @@ static const struct BardSound BardMusic_BATTLE[][6] = { {0x0B}, {0x11}, {0x0B}, {0x11}, {0xFF}, {0xFF} }, { // WHEN I WIN {0x11}, {0x0B}, {0x0B}, {0x11}, {0xFF}, {0xFF} - }, { // CAN’T WIN + }, { // CAN'T WIN {0x11}, {0x0B}, {0x29}, {0x0B}, {0x11}, {0xFF} }, { // CAN WIN {0x02}, {0x11}, {0x0B}, {0xFF}, {0xFF}, {0xFF} @@ -844,7 +844,7 @@ static const struct BardSound BardMusic_GREETINGS[][6] = { {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // THANK YOU {0x02}, {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // I’VE ARRIVED + }, { // I'VE ARRIVED {0x11}, {0x11}, {0x02}, {0xFF}, {0xFF}, {0xFF} }, { // PARDON {0x02}, {0x1A}, {0xFF}, {0xFF}, {0xFF}, {0xFF} @@ -862,7 +862,7 @@ static const struct BardSound BardMusic_GREETINGS[][6] = { {0x0B}, {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // HEY? {0x0B}, {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // WHAT’S UP? + }, { // WHAT'S UP? {0x02}, {0x11}, {0x1A}, {0xFF}, {0xFF}, {0xFF} }, { // HUH? {0x11}, {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF} @@ -909,9 +909,9 @@ static const struct BardSound BardMusic_PEOPLE[][6] = { {0x0B}, {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // YOUR {0x0B, 0xF7}, {0x11}, {0x0B}, {0xFF}, {0xFF}, {0xFF} - }, { // YOU’RE + }, { // YOU'RE {0x29}, {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // YOU’VE + }, { // YOU'VE {0x29}, {0x02}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // MOTHER {0x29}, {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF} @@ -957,9 +957,9 @@ static const struct BardSound BardMusic_PEOPLE[][6] = { {0x1A}, {0x0B}, {0x0B}, {0xFF}, {0xFF}, {0xFF} }, { // HIS {0x0B}, {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // HE’S + }, { // HE'S {0x0B}, {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // AREN’T + }, { // AREN'T {0x11}, {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // SIBLINGS {0x0B}, {0x11}, {0x0B}, {0xFF}, {0xFF}, {0xFF} @@ -981,7 +981,7 @@ static const struct BardSound BardMusic_PEOPLE[][6] = { {0x0B}, {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // I AM {0x11}, {0x02}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // I’VE + }, { // I'VE {0x11}, {0x02}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // WHO {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF}, {0xFF} @@ -995,7 +995,7 @@ static const struct BardSound BardMusic_PEOPLE[][6] = { {0x0B}, {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // WHO IS {0x0B}, {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // IT’S + }, { // IT'S {0x02}, {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // LADY {0x02}, {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF} @@ -1015,9 +1015,9 @@ static const struct BardSound BardMusic_PEOPLE[][6] = { {0x11}, {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // THEIR {0x0B}, {0x29}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // THEY’RE + }, { // THEY'RE {0x11}, {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // THEY’VE + }, { // THEY'VE {0x11}, {0x02}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // WE {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF}, {0xFF} @@ -1027,11 +1027,11 @@ static const struct BardSound BardMusic_PEOPLE[][6] = { {0x11}, {0x29}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // OUR {0x29}, {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // WE’RE + }, { // WE'RE {0x11}, {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // RIVAL {0x11}, {0x02}, {0x0B}, {0xFF}, {0xFF}, {0xFF} - }, { // WE’VE + }, { // WE'VE {0x11}, {0x02}, {0x0B}, {0xFF}, {0xFF}, {0xFF} }, { // WOMAN {0x11}, {0x1A}, {0xFF}, {0xFF}, {0xFF}, {0xFF} @@ -1041,7 +1041,7 @@ static const struct BardSound BardMusic_PEOPLE[][6] = { {0x11}, {0x02}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // TO HER {0x11}, {0x02}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // HER’S + }, { // HER'S {0x0B}, {0x29}, {0x0B}, {0xFF}, {0xFF}, {0xFF} }, { // SHE IS {0x11}, {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF} @@ -1241,7 +1241,7 @@ static const struct BardSound BardMusic_SPEECH[][6] = { {0x0B}, {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // WILD {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // THAT’S + }, { // THAT'S {0x1A}, {0x02}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // JUST {0x1A}, {0xFF}, {0xFF}, {0xFF}, {0xFF}, {0xFF} @@ -1332,9 +1332,9 @@ static const struct BardSound BardMusic_ENDINGS[][6] = { {0x11}, {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // IS {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // ISN’T IT? + }, { // ISN'T IT? {0x11}, {0x02}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // LET’S + }, { // LET'S {0x02}, {0x29}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // OTHER {0x02}, {0x0B}, {0x0B}, {0xFF}, {0xFF}, {0xFF} @@ -1346,15 +1346,15 @@ static const struct BardSound BardMusic_ENDINGS[][6] = { {0x29}, {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // THOSE {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // ISN’T + }, { // ISN'T {0x11}, {0x0B}, {0x11}, {0xFF}, {0xFF}, {0xFF} - }, { // WON’T + }, { // WON'T {0x0B}, {0x0B}, {0x11}, {0xFF}, {0xFF}, {0xFF} - }, { // CAN’T + }, { // CAN'T {0x02}, {0xFF}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // CAN {0x0B}, {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // DON’T + }, { // DON'T {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // DO {0x02}, {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF} @@ -1364,13 +1364,13 @@ static const struct BardSound BardMusic_ENDINGS[][6] = { {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // WHICH {0x0B}, {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // WASN’T + }, { // WASN'T {0x02}, {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // WEREN’T + }, { // WEREN'T {0x1A}, {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // HAVE {0x02}, {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // HAVEN’T + }, { // HAVEN'T {0x02}, {0x0B}, {0x11}, {0xFF}, {0xFF}, {0xFF} }, { // A {0x0B}, {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF} @@ -1428,9 +1428,9 @@ static const struct BardSound BardMusic_ENDINGS[][6] = { {0x0B}, {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // DID {0x0B}, {0x02}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // DIDN’T + }, { // DIDN'T {0x11}, {0x0B}, {0x02}, {0xFF}, {0xFF}, {0xFF} - }, { // DOESN’T + }, { // DOESN'T {0x02}, {0xFF}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // WITHOUT {0x1A}, {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF} @@ -1827,7 +1827,7 @@ static const struct BardSound BardMusic_ACTIONS[][6] = { {0x0B}, {0x02}, {0x29}, {0xFF}, {0xFF}, {0xFF} }, { // USING {0x0B}, {0x0B}, {0x0B}, {0xFF}, {0xFF}, {0xFF} - }, { // COULDN’T + }, { // COULDN'T {0x0B}, {0x0B}, {0x11}, {0xFF}, {0xFF}, {0xFF} }, { // CAPABLE {0x0B}, {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF} @@ -2005,7 +2005,7 @@ static const struct BardSound BardMusic_HOBBIES[][6] = { {0x02}, {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // CHAT {0x02}, {0x29}, {0x0B}, {0xFF}, {0xFF}, {0xFF} - }, { // CHILD’S PLAY + }, { // CHILD'S PLAY {0x11}, {0x0B}, {0x11}, {0xFF}, {0xFF}, {0xFF} }, { // TOYS {0x11}, {0x0B}, {0x29}, {0xFF}, {0xFF}, {0xFF} @@ -2247,7 +2247,7 @@ static const struct BardSound BardMusic_MISC[][6] = { {0x1A}, {0xFF}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // THOSE WERE {0x0B}, {0x29}, {0xFF}, {0xFF}, {0xFF}, {0xFF} - }, { // THAT’S IT! + }, { // THAT'S IT! {0x02}, {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // AM {0x02}, {0x11}, {0xFF}, {0xFF}, {0xFF}, {0xFF} diff --git a/src/data/bard_music_en.h b/src/data/bard_music_en.h index 98f4d4def..d346d4ea2 100644 --- a/src/data/bard_music_en.h +++ b/src/data/bard_music_en.h @@ -694,7 +694,7 @@ {0x0F}, {0x12}, {0x0F}, {0xFF}, {0xFF}, {0xFF} }, { // WHEN I WIN {0x0F}, {0x12}, {0x0F}, {0xFF}, {0xFF}, {0xFF} - }, { // CAN’T WIN + }, { // CAN'T WIN {0x02}, {0x0F}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // CAN WIN {0x00}, {0x0F}, {0x33}, {0xFF}, {0xFF}, {0xFF} @@ -840,7 +840,7 @@ {0x26}, {0x14}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // THANK YOU {0x03}, {0x27}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // I’VE ARRIVED + }, { // I'VE ARRIVED {0x12}, {0x06}, {0x12}, {0x33}, {0xFF}, {0xFF} }, { // PARDON {0x1D}, {0x2A}, {0x33}, {0xFF}, {0xFF}, {0xFF} @@ -858,7 +858,7 @@ {0x00}, {0x0C}, {0x0E}, {0x05}, {0xFF}, {0xFF} }, { // HEY? {0x04}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // WHAT’S UP? + }, { // WHAT'S UP? {0x2C}, {0x2B}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // HUH? {0x2C}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} @@ -904,9 +904,9 @@ {0x27}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // YOUR {0x1A, 0xF7}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // YOU’RE + }, { // YOU'RE {0x26}, {0x32}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // YOU’VE + }, { // YOU'VE {0x2D}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // MOTHER {0x2C}, {0x32}, {0x33}, {0xFF}, {0xFF}, {0xFF} @@ -952,9 +952,9 @@ {0x27}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // HIS {0x10}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // HE’S + }, { // HE'S {0x0C}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // AREN’T + }, { // AREN'T {0x1C}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // SIBLINGS {0x11}, {0x0E}, {0x33}, {0xFF}, {0xFF}, {0xFF} @@ -976,7 +976,7 @@ {0x12}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // I AM {0x12}, {0x02}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // I’VE + }, { // I'VE {0x14}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // WHO {0x29}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} @@ -990,7 +990,7 @@ {0x27}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // WHO IS {0x27}, {0x10}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // IT’S + }, { // IT'S {0x10}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // LADY {0x05}, {0x0E}, {0x33}, {0xFF}, {0xFF}, {0xFF} @@ -1010,9 +1010,9 @@ {0x27}, {0x09}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // THEIR {0x31}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // THEY’RE + }, { // THEY'RE {0x31}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // THEY’VE + }, { // THEY'VE {0x03}, {0x0B}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // WE {0x0C}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} @@ -1022,11 +1022,11 @@ {0x27}, {0x2C}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // OUR {0x21}, {0x32}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // WE’RE + }, { // WE'RE {0x0C}, {0x32}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // RIVAL {0x12}, {0x24}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // WE’VE + }, { // WE'VE {0x0C}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // WOMAN {0x26}, {0x02}, {0x33}, {0xFF}, {0xFF}, {0xFF} @@ -1036,7 +1036,7 @@ {0x0C}, {0x2B}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // TO HER {0x27}, {0x30}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // HER’S + }, { // HER'S {0x30}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // SHE IS {0x0C}, {0x10}, {0x33}, {0xFF}, {0xFF}, {0xFF} @@ -1234,7 +1234,7 @@ {0x2C}, {0x14}, {0x0C}, {0x11}, {0xFF}, {0xFF} }, { // WILD {0x12}, {0x0B}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // THAT’S + }, { // THAT'S {0x00}, {0x0B}, {0xFF}, {0xFF}, {0xFF}, {0xFF} }, { // JUST {0x2C}, {0xFF}, {0x33}, {0xFF}, {0xFF}, {0xFF} @@ -1324,9 +1324,9 @@ {0x26}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // IS {0x10}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // ISN’T IT? + }, { // ISN'T IT? {0x11}, {0x09}, {0x11}, {0xFF}, {0xFF}, {0xFF} - }, { // LET’S + }, { // LET'S {0x0B}, {0xFF}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // OTHER {0x2C}, {0x32}, {0x33}, {0xFF}, {0xFF}, {0xFF} @@ -1338,15 +1338,15 @@ {0x32}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // THOSE {0x18}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // ISN’T + }, { // ISN'T {0x0F}, {0x09}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // WON’T + }, { // WON'T {0x1A}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // CAN’T + }, { // CAN'T {0x00}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // CAN {0x00}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // DON’T + }, { // DON'T {0x1A}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // DO {0x27}, {0xFF}, {0x33}, {0xFF}, {0xFF}, {0xFF} @@ -1356,13 +1356,13 @@ {0x27}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // WHICH {0x11}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // WASN’T + }, { // WASN'T {0x2C}, {0x0F}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // WEREN’T + }, { // WEREN'T {0x32}, {0x0F}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // HAVE {0x00}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // HAVEN’T + }, { // HAVEN'T {0x00}, {0x0F}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // A {0x03}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} @@ -1420,9 +1420,9 @@ {0x14}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // DID {0x11}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // DIDN’T + }, { // DIDN'T {0x11}, {0x0F}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // DOESN’T + }, { // DOESN'T {0x2C}, {0x0F}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // WITHOUT {0x11}, {0x23}, {0xFF}, {0xFF}, {0xFF}, {0xFF} @@ -1816,7 +1816,7 @@ {0x2F}, {0x0A}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // USING {0x2F}, {0x0C}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // COULDN’T + }, { // COULDN'T {0x26}, {0x09}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // CAPABLE {0x05}, {0x2C}, {0x1A}, {0xFF}, {0xFF}, {0xFF} @@ -1992,7 +1992,7 @@ {0x0E}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // CHAT {0x01}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // CHILD’S PLAY + }, { // CHILD'S PLAY {0x14}, {0x26}, {0x04}, {0xFF}, {0xFF}, {0xFF} }, { // TOYS {0x1E}, {0x33}, {0x33}, {0xFF}, {0xFF}, {0xFF} @@ -2232,7 +2232,7 @@ {0x18}, {0x1B}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // THOSE WERE {0x18}, {0x30}, {0x33}, {0xFF}, {0xFF}, {0xFF} - }, { // THAT’S IT! + }, { // THAT'S IT! {0x01}, {0x11}, {0x33}, {0xFF}, {0xFF}, {0xFF} }, { // AM {0x00}, {0x10}, {0x33}, {0xFF}, {0xFF}, {0xFF} diff --git a/src/data/battle_strings_en.h b/src/data/battle_strings_en.h index 7ae5467dd..951807252 100644 --- a/src/data/battle_strings_en.h +++ b/src/data/battle_strings_en.h @@ -362,58 +362,58 @@ const u8 BattleText_BoostedExp[] = _(" a boosted"); const u8 BattleText_GrewLevel[] = _("{STRING 0} grew to\nLV. {STRING 1}!{UNKNOWN_A}\p"); const u8 BattleText_LearnedMove[] = _("{STRING 0} learned\n{STRING 1}!{UNKNOWN_A}\p"); const u8 BattleText_TryingToLearnMove[] = _("{STRING 0} is trying to\nlearn {STRING 1}.\p"); -const u8 BattleText_CantLearnMore[] = _("But, {STRING 0} can’t learn\nmore than four moves.\p"); +const u8 BattleText_CantLearnMore[] = _("But, {STRING 0} can't learn\nmore than four moves.\p"); const u8 BattleText_DeleteMove[] = _("Delete a move to make\nroom for {STRING 1}?"); const u8 BattleText_DeletedMove[] = _("{STRING 0} forgot\n{STRING 1}.\p"); const u8 BattleText_StopLearning[] = _("{PAUSE 32}Stop learning\n{STRING 1}?"); const u8 BattleText_DidNotLearn[] = _("{STRING 0} did not learn\n{STRING 1}.\p"); const u8 BattleText_UseNext[] = _("Use next POKéMON?"); -const u8 BattleText_AttackMissed[] = _("{ATTACKING_MON}’s\nattack missed!"); +const u8 BattleText_AttackMissed[] = _("{ATTACKING_MON}'s\nattack missed!"); const u8 BattleText_ProtectedItself[] = _("{DEFENDING_MON}\nprotected itself!"); const u8 BattleText_AvoidedDamage[] = _("{DEFENDING_MON} avoided\ndamage with {STRING 22}!"); const u8 BattleText_GroundMoveNegate[] = _("{DEFENDING_MON} makes GROUND\nmoves miss with {STRING 22}!"); const u8 BattleText_AvoidedAttack[] = _("{DEFENDING_MON} avoided\nthe attack!"); -const u8 BattleText_DoesntAffect[] = _("It doesn’t affect\n{DEFENDING_MON}..."); +const u8 BattleText_DoesntAffect[] = _("It doesn't affect\n{DEFENDING_MON}..."); const u8 BattleText_AttackingFainted[] = _("{ATTACKING_MON}\nfainted!\p"); const u8 BattleText_DefendingFainted[] = _("{DEFENDING_MON}\nfainted!\p"); const u8 BattleText_WinningPrize[] = _("{STRING 32} got ¥{STRING 0}\nfor winning!\p"); const u8 BattleText_OutOfUsablePoke[] = _("{STRING 32} is out of\nuseable POKéMON!\p"); const u8 BattleText_WhitedOut[] = _("{STRING 32} whited out!{PAUSE_UNTIL_PRESS}"); const u8 BattleText_PreventEscape[] = _("{STRING 16} prevents\nescape with {STRING 23}!\p"); -const u8 BattleText_CantEscape[] = _("Can’t escape!\p"); -const u8 BattleText_AttackingCantEscape[] = _("{ATTACKING_MON}\ncan’t escape!"); +const u8 BattleText_CantEscape[] = _("Can't escape!\p"); +const u8 BattleText_AttackingCantEscape[] = _("{ATTACKING_MON}\ncan't escape!"); const u8 BattleText_HitMulti[] = _("Hit {STRING 0} time(s)!"); const u8 BattleText_FellAsleep[] = _("{STRING 14}\nfell asleep!"); -const u8 BattleText_MadeAsleep[] = _("{STRING 16}’s {STRING 23}\nmade {STRING 14} sleep!"); +const u8 BattleText_MadeAsleep[] = _("{STRING 16}'s {STRING 23}\nmade {STRING 14} sleep!"); const u8 BattleText_DefendingAsleep[] = _("{DEFENDING_MON} is\nalready asleep!"); const u8 BattleText_AttackingAsleep[] = _("{ATTACKING_MON} is\nalready asleep!"); -const u8 BattleText_WasntAffected[] = _("{DEFENDING_MON}\nwasn’t affected!"); +const u8 BattleText_WasntAffected[] = _("{DEFENDING_MON}\nwasn't affected!"); const u8 BattleText_Poisoned[] = _("{STRING 14}\nwas poisoned!"); -const u8 BattleText_Poisoned2[] = _("{STRING 16}’s {STRING 23}\npoisoned {STRING 14}!"); +const u8 BattleText_Poisoned2[] = _("{STRING 16}'s {STRING 23}\npoisoned {STRING 14}!"); const u8 BattleText_PoisonHurt[] = _("{ATTACKING_MON} is hurt\nby poison!"); const u8 BattleText_AlreadyPoisoned[] = _("{DEFENDING_MON} is already\npoisoned."); const u8 BattleText_BadlyPoisoned[] = _("{STRING 14} is badly\npoisoned!"); const u8 BattleText_EnergyDrained[] = _("{DEFENDING_MON} had its\nenergy drained!"); const u8 BattleText_Burned[] = _("{STRING 14} was burned!"); -const u8 BattleText_Burned2[] = _("{STRING 16}’s {STRING 23}\nburned {STRING 14}!"); +const u8 BattleText_Burned2[] = _("{STRING 16}'s {STRING 23}\nburned {STRING 14}!"); const u8 BattleText_BurnHurt[] = _("{ATTACKING_MON} is hurt\nby its burn!"); const u8 BattleText_AlreadyBurned[] = _("{DEFENDING_MON} already\nhas a burn."); const u8 BattleText_Frozen[] = _("{STRING 14} was\nfrozen solid!"); -const u8 BattleText_Frozen2[] = _("{STRING 16}’s {STRING 23}\nfroze {STRING 14} solid!"); +const u8 BattleText_Frozen2[] = _("{STRING 16}'s {STRING 23}\nfroze {STRING 14} solid!"); const u8 BattleText_FrozenSolid[] = _("{ATTACKING_MON} is\nfrozen solid!"); const u8 BattleText_DefendingDefrosted[] = _("{DEFENDING_MON} was\ndefrosted!"); const u8 BattleText_AttackingDefrosted[] = _("{ATTACKING_MON} was\ndefrosted!"); const u8 BattleText_Defrosted[] = _("{ATTACKING_MON} was\ndefrosted by {STRING 17}!"); const u8 BattleText_Paralyzed[] = _("{STRING 14} is paralyzed!\nIt may be unable to move!"); -const u8 BattleText_Paralyzed2[] = _("{STRING 16}’s {STRING 23}\nparalyzed {STRING 14}!\lIt may be unable to move!"); -const u8 BattleText_Paralyzed3[] = _("{ATTACKING_MON} is paralyzed!\nIt can’t move!"); +const u8 BattleText_Paralyzed2[] = _("{STRING 16}'s {STRING 23}\nparalyzed {STRING 14}!\lIt may be unable to move!"); +const u8 BattleText_Paralyzed3[] = _("{ATTACKING_MON} is paralyzed!\nIt can't move!"); const u8 BattleText_AlreadyParalyzed[] = _("{DEFENDING_MON} is\nalready paralyzed!"); const u8 BattleText_ParalysisHealed[] = _("{DEFENDING_MON} was\nhealed of paralysis!"); -const u8 BattleText_DreamEaten[] = _("{DEFENDING_MON}’s\ndream was eaten!"); -const u8 BattleText_AttackingStatNoHigher[] = _("{ATTACKING_MON}’s {STRING 0}\nwon’t go higher!"); -const u8 BattleText_DefendingStatNoHigher[] = _("{DEFENDING_MON}’s {STRING 0}\nwon’t go lower!"); -const u8 BattleText_StoppedWorking[] = _("Your team’s {STRING 0}\nstopped working!"); -const u8 BattleText_StoppedWorking2[] = _("The foe’s {STRING 0}\nstopped working!"); +const u8 BattleText_DreamEaten[] = _("{DEFENDING_MON}'s\ndream was eaten!"); +const u8 BattleText_AttackingStatNoHigher[] = _("{ATTACKING_MON}'s {STRING 0}\nwon't go higher!"); +const u8 BattleText_DefendingStatNoHigher[] = _("{DEFENDING_MON}'s {STRING 0}\nwon't go lower!"); +const u8 BattleText_StoppedWorking[] = _("Your team's {STRING 0}\nstopped working!"); +const u8 BattleText_StoppedWorking2[] = _("The foe's {STRING 0}\nstopped working!"); const u8 BattleText_Confused[] = _("{ATTACKING_MON} is\nconfused!"); const u8 BattleText_ConfusionSnapOut[] = _("{ATTACKING_MON} snapped\nout of confusion!"); const u8 BattleText_BecameConfused[] = _("{STRING 14} became\nconfused!"); @@ -425,14 +425,14 @@ const u8 BattleText_BlownAway[] = _("{DEFENDING_MON} was\nblown away!"); const u8 BattleText_TypeTransform[] = _("{ATTACKING_MON} transformed\ninto the {STRING 0} type!"); const u8 BattleText_Flinched[] = _("{ATTACKING_MON} flinched!"); const u8 BattleText_RegainedHealth[] = _("{DEFENDING_MON} regained\nhealth!"); -const u8 BattleText_HPFull[] = _("{DEFENDING_MON}’s\nHP is full!"); -const u8 BattleText_RaisedSpDef[] = _("{STRING 38}’s {STRING 17}\nraised SP. DEF!"); -const u8 BattleText_RaisedSpDefLittle[] = _("{STRING 38}’s {STRING 17}\nraised SP. DEF a little!"); -const u8 BattleText_RaisedDefense[] = _("{STRING 38}’s {STRING 17}\nraised DEFENSE!"); -const u8 BattleText_RaisedDefenseLittle[] = _("{STRING 38}’s {STRING 17}\nraised DEFENSE a little!"); +const u8 BattleText_HPFull[] = _("{DEFENDING_MON}'s\nHP is full!"); +const u8 BattleText_RaisedSpDef[] = _("{STRING 38}'s {STRING 17}\nraised SP. DEF!"); +const u8 BattleText_RaisedSpDefLittle[] = _("{STRING 38}'s {STRING 17}\nraised SP. DEF a little!"); +const u8 BattleText_RaisedDefense[] = _("{STRING 38}'s {STRING 17}\nraised DEFENSE!"); +const u8 BattleText_RaisedDefenseLittle[] = _("{STRING 38}'s {STRING 17}\nraised DEFENSE a little!"); const u8 BattleText_CoveredVeil[] = _("{STRING 38} is covered\nby a veil!"); const u8 BattleText_SafeguardActive[] = _("{DEFENDING_MON} is protected\nby SAFEGUARD!"); -const u8 BattleText_SafeguardFaded[] = _("{STRING 40}’s SAFEGUARD\nfaded!"); +const u8 BattleText_SafeguardFaded[] = _("{STRING 40}'s SAFEGUARD\nfaded!"); const u8 BattleText_WentToSleep[] = _("{ATTACKING_MON} went\nto sleep!"); const u8 BattleText_SpeltHealthy[] = _("{ATTACKING_MON} slept and\nbecame healthy!"); const u8 BattleText_WhipWhirlwind[] = _("{ATTACKING_MON} whipped\nup a whirlwind!"); @@ -443,7 +443,7 @@ const u8 BattleText_FlewHigh[] = _("{ATTACKING_MON} flew\nup high!"); const u8 BattleText_DugHole[] = _("{ATTACKING_MON} dug a hole!"); const u8 BattleText_HidUnderwater[] = _("{ATTACKING_MON} hid\nunderwater!"); const u8 BattleText_SprangUp[] = _("{ATTACKING_MON} sprang up!"); -const u8 BattleText_SqueezedBind[] = _("{DEFENDING_MON} was squeezed by\n{ATTACKING_MON}’s BIND!"); +const u8 BattleText_SqueezedBind[] = _("{DEFENDING_MON} was squeezed by\n{ATTACKING_MON}'s BIND!"); const u8 BattleText_TrappedVortex[] = _("{DEFENDING_MON} was trapped\nin the vortex!"); const u8 BattleText_SandTombTrapped[] = _("{DEFENDING_MON} was trapped\nby SAND TOMB!"); const u8 BattleText_Wrapped[] = _("{DEFENDING_MON} was WRAPPED by\n{ATTACKING_MON}!"); @@ -458,21 +458,21 @@ const u8 BattleText_HitRecoil[] = _("{ATTACKING_MON} is hit\nwith recoil!"); const u8 BattleText_ProtectedItself2[] = _("{ATTACKING_MON} protected\nitself!"); const u8 BattleText_SandBuffeted[] = _("{ATTACKING_MON} is buffeted\nby the sandstorm!"); const u8 BattleText_HailStricken[] = _("{ATTACKING_MON} is stricken\nby HAIL!"); -const u8 BattleText_WoreOff[] = _("{STRING 36}’s {STRING 0}\nwore off!"); +const u8 BattleText_WoreOff[] = _("{STRING 36}'s {STRING 0}\nwore off!"); const u8 BattleText_WasSeeded[] = _("{DEFENDING_MON} was seeded!"); const u8 BattleText_EvadedAttack[] = _("{DEFENDING_MON} evaded\nthe attack!"); -const u8 BattleText_HealthSapped[] = _("{ATTACKING_MON}’s health is\nsapped by LEECH SEED!"); +const u8 BattleText_HealthSapped[] = _("{ATTACKING_MON}'s health is\nsapped by LEECH SEED!"); const u8 BattleText_FastAsleep[] = _("{ATTACKING_MON} is fast\nasleep."); const u8 BattleText_WokeUp[] = _("{ATTACKING_MON} woke up!"); -const u8 BattleText_UproarAwake[] = _("But {STRING 16}’s UPROAR\nkept it awake!"); +const u8 BattleText_UproarAwake[] = _("But {STRING 16}'s UPROAR\nkept it awake!"); const u8 BattleText_UproarWoke[] = _("{ATTACKING_MON} woke up\nin the UPROAR!"); const u8 BattleText_UproarCaused[] = _("{ATTACKING_MON} caused\nan UPROAR!"); const u8 BattleText_UproarMaking[] = _("{ATTACKING_MON} is making\nan UPROAR!"); const u8 BattleText_CalmedDown[] = _("{ATTACKING_MON} calmed down."); -const u8 BattleText_UproarCantSleep[] = _("But {DEFENDING_MON} can’t\nsleep in an UPROAR!"); +const u8 BattleText_UproarCantSleep[] = _("But {DEFENDING_MON} can't\nsleep in an UPROAR!"); const u8 BattleText_Stockpiled[] = _("{ATTACKING_MON} STOCKPILED\n{STRING 0}!"); -const u8 BattleText_StockpiledCant[] = _("{ATTACKING_MON} can’t\nSTOCKPILE any more!"); -const u8 BattleText_UproarCantSleep2[] = _("But {DEFENDING_MON} can’t\nsleep in an UPROAR!"); +const u8 BattleText_StockpiledCant[] = _("{ATTACKING_MON} can't\nSTOCKPILE any more!"); +const u8 BattleText_UproarCantSleep2[] = _("But {DEFENDING_MON} can't\nsleep in an UPROAR!"); const u8 BattleText_UproarKeptAwake[] = _("But the UPROAR kept\n{DEFENDING_MON} awake!"); const u8 BattleText_StayedAwake[] = _("{DEFENDING_MON} stayed awake\nusing its {STRING 22}!"); const u8 BattleText_StoringEnergy[] = _("{ATTACKING_MON} is storing\nenergy!"); @@ -484,20 +484,20 @@ const u8 BattleText_Transformed[] = _("{ATTACKING_MON} transformed\ninto {STRING const u8 BattleText_SubMade[] = _("{ATTACKING_MON} made\na SUBSTITUTE!"); const u8 BattleText_SubAlready[] = _("{ATTACKING_MON} already\nhas a SUBSTITUTE!"); const u8 BattleText_SubTookDamage[] = _("The SUBSTITUTE took damage\nfor {DEFENDING_MON}!\p"); -const u8 BattleText_SubFaded[] = _("{DEFENDING_MON}’s\nSUBSTITUTE faded!\p"); +const u8 BattleText_SubFaded[] = _("{DEFENDING_MON}'s\nSUBSTITUTE faded!\p"); const u8 BattleText_MustRecharge[] = _("{ATTACKING_MON} must\nrecharge!"); -const u8 BattleText_RageBuilding[] = _("{DEFENDING_MON}’s RAGE\nis building!"); -const u8 BattleText_MoveWasDisabled[] = _("{DEFENDING_MON}’s {STRING 0}\nwas disabled!"); +const u8 BattleText_RageBuilding[] = _("{DEFENDING_MON}'s RAGE\nis building!"); +const u8 BattleText_MoveWasDisabled[] = _("{DEFENDING_MON}'s {STRING 0}\nwas disabled!"); const u8 BattleText_DisabledNoMore[] = _("{ATTACKING_MON} is disabled\nno more!"); const u8 BattleText_EncoreGot[] = _("{DEFENDING_MON} got\nan ENCORE!"); -const u8 BattleText_EncoreEnded[] = _("{ATTACKING_MON}’s ENCORE\nended!"); +const u8 BattleText_EncoreEnded[] = _("{ATTACKING_MON}'s ENCORE\nended!"); const u8 BattleText_TookAim[] = _("{ATTACKING_MON} took aim\nat {DEFENDING_MON}!"); const u8 BattleText_SketchedMove[] = _("{ATTACKING_MON} SKETCHED\n{STRING 0}!"); const u8 BattleText_DestinyBondTake[] = _("{ATTACKING_MON} is trying\nto take its foe with it!"); const u8 BattleText_DestinyBondTaken[] = _("{DEFENDING_MON} took\n{ATTACKING_MON} with it!"); -const u8 BattleText_ReducedBy[] = _("Reduced {DEFENDING_MON}’s\n{STRING 0} by {STRING 1}!"); -const u8 BattleText_StoleSomething[] = _("{ATTACKING_MON} stole\n{DEFENDING_MON}’s {STRING 19}!"); -const u8 BattleText_CantEscapeNow[] = _("{DEFENDING_MON} can’t\nescape now!"); +const u8 BattleText_ReducedBy[] = _("Reduced {DEFENDING_MON}'s\n{STRING 0} by {STRING 1}!"); +const u8 BattleText_StoleSomething[] = _("{ATTACKING_MON} stole\n{DEFENDING_MON}'s {STRING 19}!"); +const u8 BattleText_CantEscapeNow[] = _("{DEFENDING_MON} can't\nescape now!"); const u8 BattleText_NightmareStart[] = _("{DEFENDING_MON} fell into\na NIGHTMARE!"); const u8 BattleText_NightmareLock[] = _("{ATTACKING_MON} is locked\nin a NIGHTMARE!"); const u8 BattleText_CurseLay[] = _("{ATTACKING_MON} cut its own HP\nand laid a CURSE on\l{DEFENDING_MON}!"); @@ -505,24 +505,24 @@ const u8 BattleText_CurseAfflict[] = _("{ATTACKING_MON} is afflicted\nby the CUR const u8 BattleText_SpikesScattered[] = _("{STRING 37} POKéMON team had SPIKES\nscattered around it!"); const u8 BattleText_SpikesHurt[] = _("{STRING 16} is hurt\nby SPIKES!"); const u8 BattleText_IdentifiedPoke[] = _("{ATTACKING_MON} identified\n{DEFENDING_MON}!"); -const u8 BattleText_PerishSongFell[] = _("{ATTACKING_MON}’s PERISH count\nfell to {STRING 0}!"); +const u8 BattleText_PerishSongFell[] = _("{ATTACKING_MON}'s PERISH count\nfell to {STRING 0}!"); const u8 BattleText_BracedItself[] = _("{ATTACKING_MON} braced\nitself!"); const u8 BattleText_EnduredHit[] = _("{DEFENDING_MON} ENDURED\nthe hit!"); const u8 BattleText_MagnitudeCount[] = _("MAGNITUDE {STRING 0}!"); const u8 BattleText_CutHPMaxATK[] = _("{ATTACKING_MON} cut its own HP\nand maximized ATTACK!"); -const u8 BattleText_CopyStatChanges[] = _("{ATTACKING_MON} copied\n{DEFENDING_MON}’s stat changes!"); -const u8 BattleText_GotFreeFrom[] = _("{ATTACKING_MON} got free of\n{DEFENDING_MON}’s {STRING 0}!"); +const u8 BattleText_CopyStatChanges[] = _("{ATTACKING_MON} copied\n{DEFENDING_MON}'s stat changes!"); +const u8 BattleText_GotFreeFrom[] = _("{ATTACKING_MON} got free of\n{DEFENDING_MON}'s {STRING 0}!"); const u8 BattleText_LeechShed[] = _("{ATTACKING_MON} shed\nLEECH SEED!"); const u8 BattleText_SpikesBlownAway[] = _("{ATTACKING_MON} blew away\nSPIKES!"); const u8 BattleText_FledBattle[] = _("{ATTACKING_MON} fled from\nbattle!"); const u8 BattleText_ForesawAttack[] = _("{ATTACKING_MON} foresaw\nan attack!"); -const u8 BattleText_TookAttack[] = _("{DEFENDING_MON} took\n{STRING 0}’s attack!"); +const u8 BattleText_TookAttack[] = _("{DEFENDING_MON} took\n{STRING 0}'s attack!"); const u8 BattleText_ChoseDestiny[] = _("{ATTACKING_MON} chose\n{STRING 17} as its destiny!"); -const u8 BattleText_PokeAttack[] = _("{STRING 0}’s attack!"); +const u8 BattleText_PokeAttack[] = _("{STRING 0}'s attack!"); const u8 BattleText_CenterAttention[] = _("{ATTACKING_MON} became the\ncenter of attention!"); const u8 BattleText_ChargingPower[] = _("{ATTACKING_MON} began\ncharging power!"); const u8 BattleText_NaturePower[] = _("NATURE POWER turned into\n{STRING 17}!"); -const u8 BattleText_StatusNormal[] = _("{ATTACKING_MON}’s status\nreturned to normal!"); +const u8 BattleText_StatusNormal[] = _("{ATTACKING_MON}'s status\nreturned to normal!"); const u8 BattleText_TormentSubject[] = _("{DEFENDING_MON} was subjected\nto TORMENT!"); const u8 BattleText_TightenFocus[] = _("{ATTACKING_MON} is tightening\nits focus!"); const u8 BattleText_TauntFell[] = _("{DEFENDING_MON} fell for\nthe TAUNT!"); @@ -531,93 +531,93 @@ const u8 BattleText_SwitchedItems[] = _("{ATTACKING_MON} switched\nitems with it const u8 BattleText_Obtained1[] = _("{ATTACKING_MON} obtained\n{STRING 0}."); const u8 BattleText_Obtained2[] = _("{DEFENDING_MON} obtained\n{STRING 1}."); const u8 BattleText_Obtained3[] = _("{ATTACKING_MON} obtained\n{STRING 0}.\p{DEFENDING_MON} obtained\n{STRING 1}."); -const u8 BattleText_CopiedObject[] = _("{ATTACKING_MON} copied\n{DEFENDING_MON}’s {STRING 22}!"); +const u8 BattleText_CopiedObject[] = _("{ATTACKING_MON} copied\n{DEFENDING_MON}'s {STRING 22}!"); const u8 BattleText_WishMade[] = _("{ATTACKING_MON} made a WISH!"); -const u8 BattleText_WishTrue[] = _("{STRING 0}’s WISH\ncame true!"); +const u8 BattleText_WishTrue[] = _("{STRING 0}'s WISH\ncame true!"); const u8 BattleText_PlantedRoots[] = _("{ATTACKING_MON} planted its roots!"); const u8 BattleText_AbsorbNutrients[] = _("{ATTACKING_MON} absorbed\nnutrients with its roots!"); const u8 BattleText_AnchoredItself[] = _("{DEFENDING_MON} anchored\nitself with its roots!"); const u8 BattleText_DrowsyMade[] = _("{ATTACKING_MON} made\n{DEFENDING_MON} drowsy!"); -const u8 BattleText_KnockedOffItem[] = _("{ATTACKING_MON} knocked off\n{DEFENDING_MON}’s {STRING 19}!"); +const u8 BattleText_KnockedOffItem[] = _("{ATTACKING_MON} knocked off\n{DEFENDING_MON}'s {STRING 19}!"); const u8 BattleText_AbilitySwap[] = _("{ATTACKING_MON} swapped abilities\nwith its opponent!"); -const u8 BattleText_SealedMove[] = _("{ATTACKING_MON} sealed the\nopponent’s move(s)!"); +const u8 BattleText_SealedMove[] = _("{ATTACKING_MON} sealed the\nopponent's move(s)!"); const u8 BattleText_GrudgeBear[] = _("{ATTACKING_MON} wants the\nopponent to bear a GRUDGE!"); -const u8 BattleText_GrudgeLosePP[] = _("{ATTACKING_MON}’s {STRING 0}\nlost all its PP due to\lthe GRUDGE!"); +const u8 BattleText_GrudgeLosePP[] = _("{ATTACKING_MON}'s {STRING 0}\nlost all its PP due to\lthe GRUDGE!"); const u8 BattleText_ShroudedItself[] = _("{ATTACKING_MON} shrouded\nitself in {STRING 17}!"); -const u8 BattleText_MagicCoatBounce[] = _("{ATTACKING_MON}’s {STRING 17}\nwas bounced back by MAGIC COAT!"); +const u8 BattleText_MagicCoatBounce[] = _("{ATTACKING_MON}'s {STRING 17}\nwas bounced back by MAGIC COAT!"); const u8 BattleText_AwaitMove[] = _("{ATTACKING_MON} awaits its foe\nto make a move!"); -const u8 BattleText_SnatchedMove[] = _("{DEFENDING_MON} SNATCHED\n{STRING 16}’s move!"); -const u8 BattleText_ElecWeakened[] = _("Electricity’s power was\nweakened!"); -const u8 BattleText_FireWeakened[] = _("Fire’s power was\nweakened!"); +const u8 BattleText_SnatchedMove[] = _("{DEFENDING_MON} SNATCHED\n{STRING 16}'s move!"); +const u8 BattleText_ElecWeakened[] = _("Electricity's power was\nweakened!"); +const u8 BattleText_FireWeakened[] = _("Fire's power was\nweakened!"); const u8 BattleText_FoundOne[] = _("{ATTACKING_MON} found\none {STRING 19}!"); const u8 BattleText_SoothingAroma[] = _("A soothing aroma wafted\nthrough the area!"); -const u8 BattleText_CantUseItems[] = _("Items can’t be used now.{PAUSE 64}"); +const u8 BattleText_CantUseItems[] = _("Items can't be used now.{PAUSE 64}"); const u8 BattleText_UnknownString2[] = _("For {STRING 16},\n{STRING 19} {STRING 0}"); const u8 BattleText_HustleUse[] = _("{STRING 16} used\n{STRING 19} to hustle!"); -const u8 BattleText_LostFocus[] = _("{ATTACKING_MON} lost its\nfocus and couldn’t move!"); +const u8 BattleText_LostFocus[] = _("{ATTACKING_MON} lost its\nfocus and couldn't move!"); const u8 BattleText_DraggedOut[] = _("{DEFENDING_MON} was\ndragged out!\p"); const u8 BattleText_BrokeWall[] = _("The wall shattered!"); const u8 BattleText_NoEffect[] = _("But it had no effect!"); const u8 BattleText_NoMovesLeft[] = _("{STRING 15} has no\nmoves left!\p"); -const u8 BattleText_MoveIsDisabled[] = _("{STRING 15}’s {STRING 17}\nis disabled!\p"); -const u8 BattleText_TormentNoUse[] = _("{STRING 15} can’t use the same\nmove twice in a row due to the TORMENT!\p"); -const u8 BattleText_TauntNoUse[] = _("{STRING 15} can’t use\n{STRING 17} after the TAUNT!\p"); -const u8 BattleText_SealedNoUse[] = _("{STRING 15} can’t use the\nsealed {STRING 17}!\p"); -const u8 BattleText_RainMade[] = _("{STRING 16}’s {STRING 23}\nmade it rain!"); -const u8 BattleText_SpeedRisen[] = _("{STRING 16}’s {STRING 23}\nraised its SPEED!"); +const u8 BattleText_MoveIsDisabled[] = _("{STRING 15}'s {STRING 17}\nis disabled!\p"); +const u8 BattleText_TormentNoUse[] = _("{STRING 15} can't use the same\nmove twice in a row due to the TORMENT!\p"); +const u8 BattleText_TauntNoUse[] = _("{STRING 15} can't use\n{STRING 17} after the TAUNT!\p"); +const u8 BattleText_SealedNoUse[] = _("{STRING 15} can't use the\nsealed {STRING 17}!\p"); +const u8 BattleText_RainMade[] = _("{STRING 16}'s {STRING 23}\nmade it rain!"); +const u8 BattleText_SpeedRisen[] = _("{STRING 16}'s {STRING 23}\nraised its SPEED!"); const u8 BattleText_ProtectedBy[] = _("{DEFENDING_MON} was protected\nby {STRING 22}!"); -const u8 BattleText_PreventedBy[] = _("{DEFENDING_MON}’s {STRING 22}\nprevents {ATTACKING_MON}\lfrom using {STRING 17}!"); +const u8 BattleText_PreventedBy[] = _("{DEFENDING_MON}'s {STRING 22}\nprevents {ATTACKING_MON}\lfrom using {STRING 17}!"); const u8 BattleText_HPRestoredUsing[] = _("{DEFENDING_MON} restored HP\nusing its {STRING 22}!"); -const u8 BattleText_MadeUseless[] = _("{DEFENDING_MON}’s {STRING 22}\nmade {STRING 17} useless!"); -const u8 BattleText_MadeType[] = _("{DEFENDING_MON}’s {STRING 22}\nmade it the {STRING 0} type!"); -const u8 BattleText_PreventedPara[] = _("{STRING 14}’s {STRING 22}\nprevents paralysis!"); -const u8 BattleText_PreventedRomance[] = _("{DEFENDING_MON}’s {STRING 22}\nprevents romance!"); -const u8 BattleText_PreventedPoison[] = _("{STRING 14}’s {STRING 22}\nprevents poisoning!"); -const u8 BattleText_PreventedConfusion[] = _("{DEFENDING_MON}’s {STRING 22}\nprevents confusion!"); -const u8 BattleText_RaisedFirePower[] = _("{DEFENDING_MON}’s {STRING 22}\nraised its FIRE power!"); +const u8 BattleText_MadeUseless[] = _("{DEFENDING_MON}'s {STRING 22}\nmade {STRING 17} useless!"); +const u8 BattleText_MadeType[] = _("{DEFENDING_MON}'s {STRING 22}\nmade it the {STRING 0} type!"); +const u8 BattleText_PreventedPara[] = _("{STRING 14}'s {STRING 22}\nprevents paralysis!"); +const u8 BattleText_PreventedRomance[] = _("{DEFENDING_MON}'s {STRING 22}\nprevents romance!"); +const u8 BattleText_PreventedPoison[] = _("{STRING 14}'s {STRING 22}\nprevents poisoning!"); +const u8 BattleText_PreventedConfusion[] = _("{DEFENDING_MON}'s {STRING 22}\nprevents confusion!"); +const u8 BattleText_RaisedFirePower[] = _("{DEFENDING_MON}'s {STRING 22}\nraised its FIRE power!"); const u8 BattleText_AnchorsItself[] = _("{DEFENDING_MON} anchors\nitself with {STRING 22}!"); -const u8 BattleText_CutsAttack[] = _("{STRING 16}’s {STRING 23}\ncuts {DEFENDING_MON}’s ATTACK!"); -const u8 BattleText_PreventedStatLoss[] = _("{STRING 16}’s {STRING 23}\nprevents stat loss!"); -const u8 BattleText_HurtOther[] = _("{DEFENDING_MON}’s {STRING 22}\nhurt {ATTACKING_MON}!"); -const u8 BattleText_Traced[] = _("{STRING 16} TRACED\n{STRING 0}’s {STRING 1}!"); -const u8 BattleText_PreventedBurn[] = _("{STRING 14}’s {STRING 24}\nprevents burns!"); -const u8 BattleText_BlocksOther[] = _("{DEFENDING_MON}’s {STRING 22}\nblocks {STRING 17}!"); -const u8 BattleText_BlocksOther2[] = _("{STRING 16}’s {STRING 23}\nblocks {STRING 17}!"); -const u8 BattleText_RestoredHPByItem[] = _("{ATTACKING_MON}’s {STRING 21}\nrestored some HP!"); -const u8 BattleText_WhipSandstorm[] = _("{STRING 16}’s {STRING 23}\nwhipped up a sandstorm!"); -const u8 BattleText_SunIntensified[] = _("{STRING 16}’s {STRING 23}\nintensified the sun’s rays!"); -const u8 BattleText_PreventedLoss[] = _("{STRING 16}’s {STRING 23}\nprevents {STRING 0} loss!"); -const u8 BattleText_InfatuatedPoke[] = _("{DEFENDING_MON}’s {STRING 22}\ninfatuated {ATTACKING_MON}!"); -const u8 BattleText_MadeIneffective[] = _("{DEFENDING_MON}’s {STRING 22}\nmade {STRING 17} ineffective!"); -const u8 BattleText_CuredProblem[] = _("{STRING 16}’s {STRING 23}\ncured its {STRING 0} problem!"); +const u8 BattleText_CutsAttack[] = _("{STRING 16}'s {STRING 23}\ncuts {DEFENDING_MON}'s ATTACK!"); +const u8 BattleText_PreventedStatLoss[] = _("{STRING 16}'s {STRING 23}\nprevents stat loss!"); +const u8 BattleText_HurtOther[] = _("{DEFENDING_MON}'s {STRING 22}\nhurt {ATTACKING_MON}!"); +const u8 BattleText_Traced[] = _("{STRING 16} TRACED\n{STRING 0}'s {STRING 1}!"); +const u8 BattleText_PreventedBurn[] = _("{STRING 14}'s {STRING 24}\nprevents burns!"); +const u8 BattleText_BlocksOther[] = _("{DEFENDING_MON}'s {STRING 22}\nblocks {STRING 17}!"); +const u8 BattleText_BlocksOther2[] = _("{STRING 16}'s {STRING 23}\nblocks {STRING 17}!"); +const u8 BattleText_RestoredHPByItem[] = _("{ATTACKING_MON}'s {STRING 21}\nrestored some HP!"); +const u8 BattleText_WhipSandstorm[] = _("{STRING 16}'s {STRING 23}\nwhipped up a sandstorm!"); +const u8 BattleText_SunIntensified[] = _("{STRING 16}'s {STRING 23}\nintensified the sun's rays!"); +const u8 BattleText_PreventedLoss[] = _("{STRING 16}'s {STRING 23}\nprevents {STRING 0} loss!"); +const u8 BattleText_InfatuatedPoke[] = _("{DEFENDING_MON}'s {STRING 22}\ninfatuated {ATTACKING_MON}!"); +const u8 BattleText_MadeIneffective[] = _("{DEFENDING_MON}'s {STRING 22}\nmade {STRING 17} ineffective!"); +const u8 BattleText_CuredProblem[] = _("{STRING 16}'s {STRING 23}\ncured its {STRING 0} problem!"); const u8 BattleText_OozeSuckup[] = _("It sucked up the\nLIQUID OOZE!"); const u8 BattleText_Transformed2[] = _("{STRING 16} transformed!"); -const u8 BattleText_TookAttack2[] = _("{DEFENDING_MON}’s {STRING 22}\ntook the attack!"); -const u8 BattleText_PreventedSwitch[] = _("{STRING 0}’s {STRING 20}\nprevents switching!\p"); -const u8 BattleText_PreventedOther[] = _("{DEFENDING_MON}’s {STRING 22}\nprevented {STRING 16}’s\l{STRING 0} from working!"); -const u8 BattleText_MadeIneffective2[] = _("{STRING 16}’s {STRING 23}\nmade it ineffective!"); -const u8 BattleText_PreventedFlinching[] = _("{STRING 14}’s {STRING 24}\nprevents flinching!"); -const u8 BattleText_PreventedOther2[] = _("{ATTACKING_MON}’s {STRING 21}\nprevents {DEFENDING_MON}’s\l{STRING 22} from working!"); -const u8 BattleText_CuredOfProblem[] = _("{STRING 16}’s {STRING 23}\ncured its {STRING 0} problem!"); -const u8 BattleText_NoEffectOn[] = _("{STRING 16}’s {STRING 23}\nhad no effect on {STRING 14}!"); +const u8 BattleText_TookAttack2[] = _("{DEFENDING_MON}'s {STRING 22}\ntook the attack!"); +const u8 BattleText_PreventedSwitch[] = _("{STRING 0}'s {STRING 20}\nprevents switching!\p"); +const u8 BattleText_PreventedOther[] = _("{DEFENDING_MON}'s {STRING 22}\nprevented {STRING 16}'s\l{STRING 0} from working!"); +const u8 BattleText_MadeIneffective2[] = _("{STRING 16}'s {STRING 23}\nmade it ineffective!"); +const u8 BattleText_PreventedFlinching[] = _("{STRING 14}'s {STRING 24}\nprevents flinching!"); +const u8 BattleText_PreventedOther2[] = _("{ATTACKING_MON}'s {STRING 21}\nprevents {DEFENDING_MON}'s\l{STRING 22} from working!"); +const u8 BattleText_CuredOfProblem[] = _("{STRING 16}'s {STRING 23}\ncured its {STRING 0} problem!"); +const u8 BattleText_NoEffectOn[] = _("{STRING 16}'s {STRING 23}\nhad no effect on {STRING 14}!"); const u8 BattleText_Sharply[] = _("sharply "); const u8 BattleText_Rose[] = _("rose!"); const u8 BattleText_Harshly[] = _("harshly "); const u8 BattleText_Fell[] = _("fell!"); -const u8 BattleText_UnknownString7[] = _("{ATTACKING_MON}’s {STRING 0}\n{STRING 1}"); -const u8 BattleText_UnknownString3[] = _("{DEFENDING_MON}’s {STRING 0}\n{STRING 1}"); +const u8 BattleText_UnknownString7[] = _("{ATTACKING_MON}'s {STRING 0}\n{STRING 1}"); +const u8 BattleText_UnknownString3[] = _("{DEFENDING_MON}'s {STRING 0}\n{STRING 1}"); const u8 BattleText_UnknownString4[] = _("Using {STRING 19}, the {STRING 0}\nof {STRING 16} {STRING 1}"); -const u8 BattleText_UnknownString5[] = _("{ATTACKING_MON}’s {STRING 0}\n{STRING 1}"); -const u8 BattleText_UnknownString6[] = _("{DEFENDING_MON}’s {STRING 0}\n{STRING 1}"); -const u8 BattleText_StatNoHigher[] = _("{ATTACKING_MON}’s stats won’t\ngo any higher!"); -const u8 BattleText_StatNoLower[] = _("{DEFENDING_MON}’s stats won’t\ngo any lower!"); +const u8 BattleText_UnknownString5[] = _("{ATTACKING_MON}'s {STRING 0}\n{STRING 1}"); +const u8 BattleText_UnknownString6[] = _("{DEFENDING_MON}'s {STRING 0}\n{STRING 1}"); +const u8 BattleText_StatNoHigher[] = _("{ATTACKING_MON}'s stats won't\ngo any higher!"); +const u8 BattleText_StatNoLower[] = _("{DEFENDING_MON}'s stats won't\ngo any lower!"); const u8 BattleText_Critical[] = _("A critical hit!"); -const u8 BattleText_GrandSlam[] = _("It’s a one-hit KO!"); +const u8 BattleText_GrandSlam[] = _("It's a one-hit KO!"); const u8 BattleText_MoveForget123[] = _("{PAUSE 32}1, {PAUSE 15}2 and...{PAUSE 15} ...{PAUSE 15} ...{PAUSE 15}\n{PAUSE 15}{PLAY_SE SE_KON}Poof!\p"); const u8 BattleText_MoveForgetAnd[] = _("And...\p"); -const u8 BattleText_CantForgetHM[] = _("HM moves can’t be\nforgotten now.\p"); -const u8 BattleText_NotEffective[] = _("It’s not very effective..."); -const u8 BattleText_SuperEffective[] = _("It’s super effective!"); +const u8 BattleText_CantForgetHM[] = _("HM moves can't be\nforgotten now.\p"); +const u8 BattleText_NotEffective[] = _("It's not very effective..."); +const u8 BattleText_SuperEffective[] = _("It's super effective!"); const u8 BattleText_GotAwaySafely[] = _("{PLAY_SE SE_NIGERU}Got away safely!\p"); const u8 BattleText_FledUsingItem[] = _("{PLAY_SE SE_NIGERU}{ATTACKING_MON} fled\nusing its {STRING 19}!\p"); const u8 BattleText_FledUsingOther[] = _("{PLAY_SE SE_NIGERU}{ATTACKING_MON} fled\nusing {STRING 21}!\p"); @@ -630,9 +630,9 @@ const u8 BattleText_PlayerTiedTrainer[] = _("Player tied against\n{STRING 29}!") const u8 BattleText_PlayerTiedTrainers[] = _("Player tied against {STRING 30}\nand {STRING 29}!"); const u8 BattleText_FledSingle[] = _("{PLAY_SE SE_NIGERU}{STRING 29} fled!"); const u8 BattleText_FledDouble[] = _("{PLAY_SE SE_NIGERU}{STRING 29} and\n{STRING 30} fled!"); -const u8 BattleText_NoRunning[] = _("No! There’s no running\nfrom a TRAINER battle!\p"); -const u8 BattleText_CantEscape2[] = _("Can’t escape!\p"); -const u8 BattleText_BirchDontLeaveMe[] = _("PROF. BIRCH: D-don’t leave\nme here like this!\p"); +const u8 BattleText_NoRunning[] = _("No! There's no running\nfrom a TRAINER battle!\p"); +const u8 BattleText_CantEscape2[] = _("Can't escape!\p"); +const u8 BattleText_BirchDontLeaveMe[] = _("PROF. BIRCH: D-don't leave\nme here like this!\p"); const u8 BattleText_Nothing[] = _("But nothing happened!"); const u8 BattleText_Failed[] = _("But it failed!"); const u8 BattleText_HurtItself[] = _("It hurt itself in its\nconfusion!"); @@ -660,26 +660,26 @@ const u8 BattleText_SubWeak[] = _("It was too weak to make\na SUBSTITUTE!"); const u8 BattleText_PainSplit[] = _("The battlers shared\ntheir pain!"); const u8 BattleText_BellChime[] = _("A bell chimed!"); const u8 BattleText_PerishSong[] = _("All affected POKéMON will\nfaint in 3 turns!"); -const u8 BattleText_NoPP1[] = _("There’s no PP left for\nthis move!\p"); +const u8 BattleText_NoPP1[] = _("There's no PP left for\nthis move!\p"); const u8 BattleText_NoPP2[] = _("But there was no PP left\nfor the move!"); const u8 BattleText_IgnoredOrdersSLP[] = _("{ATTACKING_MON} ignored\norders while asleep!"); const u8 BattleText_IgnoredOrders[] = _("{ATTACKING_MON} ignored\norders!"); const u8 BattleText_BeganNap[] = _("{ATTACKING_MON} began to nap!"); const u8 BattleText_LoafingAround[] = _("{ATTACKING_MON} is\nloafing around!"); -const u8 BattleText_WontObey[] = _("{ATTACKING_MON} won’t\nobey!"); +const u8 BattleText_WontObey[] = _("{ATTACKING_MON} won't\nobey!"); const u8 BattleText_TurnedAway[] = _("{ATTACKING_MON} turned away!"); const u8 BattleText_NotNotice[] = _("{ATTACKING_MON} pretended\nto not notice!"); const u8 BattleText_WillSwitch[] = _("{STRING 25} {STRING 26} is\nabout to use {STRING 1}.\pWill {STRING 32} change\nPOKéMON?"); const u8 BattleText_LearnedMove2[] = _("{ATTACKING_MON} learned\n{STRING 0}!"); const u8 BattleText_PlayerDefeatedTrainer2[] = _("Player defeated\n{STRING 25} {STRING 26}!\p"); const u8 BattleText_CreptCloser[] = _("{STRING 32} crept closer to\n{STRING 3}!"); -const u8 BattleText_CantGetCloser[] = _("{STRING 32} can’t get any closer!"); +const u8 BattleText_CantGetCloser[] = _("{STRING 32} can't get any closer!"); const u8 BattleText_WatchingCarefully[] = _("{STRING 3} is watching\ncarefully!"); const u8 BattleText_CuriousAbout[] = _("{STRING 3} is curious about\nthe {STRING 0}!"); const u8 BattleText_EnthralledBy[] = _("{STRING 3} is enthralled by\nthe {STRING 0}!"); const u8 BattleText_IgnoredThing[] = _("{STRING 3} completely ignored\nthe {STRING 0}!"); const u8 BattleText_ThrewBlock[] = _("{STRING 32} threw a {POKEBLOCK}\nat the {STRING 3}!"); -const u8 BattleText_SafariOver[] = _("{PLAY_SE SE_PINPON}ANNOUNCER: You’re out of\nSAFARI BALLS! Game over!\p"); +const u8 BattleText_SafariOver[] = _("{PLAY_SE SE_PINPON}ANNOUNCER: You're out of\nSAFARI BALLS! Game over!\p"); const u8 BattleText_WildAppeared1[] = _("Wild {STRING 3} appeared!\p"); const u8 BattleText_WildAppeared2[] = _("Wild {STRING 3} appeared!\p"); const u8 BattleText_WildAppeared3[] = _("Wild {STRING 3} appeared!{PAUSE 127}"); @@ -700,9 +700,9 @@ const u8 BattleText_SentOutDouble4[] = _("Go! {STRING 2} and\n{STRING 4}!"); const u8 BattleText_SentOutSingle7[] = _("Go! {STRING 0}!"); const u8 BattleText_SentOutSingle8[] = _("Do it! {STRING 0}!"); const u8 BattleText_SentOutSingle9[] = _("Go for it, {STRING 0}!"); -const u8 BattleText_SentOutSingle10[] = _("Your foe’s weak!\nGet’m, {STRING 0}!"); +const u8 BattleText_SentOutSingle10[] = _("Your foe's weak!\nGet'm, {STRING 0}!"); const u8 BattleText_SentOutSingle11[] = _("{STRING 28} sent out\n{STRING 8}!\pGo! {STRING 6}!"); -const u8 BattleText_ComeBackSingle1[] = _("{STRING 0}, that’s enough!\nCome back!"); +const u8 BattleText_ComeBackSingle1[] = _("{STRING 0}, that's enough!\nCome back!"); const u8 BattleText_ComeBackSingle2[] = _("{STRING 0}, come back!"); const u8 BattleText_ComeBackSingle3[] = _("{STRING 0}, OK!\nCome back!"); const u8 BattleText_ComeBackSingle4[] = _("{STRING 0}, good!\nCome back!"); @@ -740,8 +740,8 @@ const u8 BattleText_Used1[] = _("{STRING 32} used\n{STRING 19}!"); const u8 BattleText_TutorialUsed[] = _("WALLY used\n{STRING 19}!"); const u8 BattleText_Used2[] = _("{STRING 25} {STRING 26}\nused {STRING 19}!"); const u8 BattleText_BlockBall[] = _("The TRAINER blocked the BALL!"); -const u8 BattleText_DontBeAThief[] = _("Don’t be a thief!"); -const u8 BattleText_DodgeBall[] = _("It dodged the thrown BALL!\nThis POKéMON can’t be caught!"); +const u8 BattleText_DontBeAThief[] = _("Don't be a thief!"); +const u8 BattleText_DodgeBall[] = _("It dodged the thrown BALL!\nThis POKéMON can't be caught!"); const u8 BattleText_MissPoke[] = _("You missed the POKéMON!"); const u8 BattleText_BallBrokeOhNo[] = _("Oh, no!\nThe POKéMON broke free!"); const u8 BattleText_BallBrokeAppeared[] = _("Aww!\nIt appeared to be caught!"); @@ -751,30 +751,30 @@ const u8 BattleText_BallCaught1[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A const u8 BattleText_BallCaught2[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM MUS_KACHI22}{PAUSE 127}"); const u8 BattleText_GiveNickname[] = _("Give a nickname to the\ncaptured {STRING 3}?"); const u8 BattleText_SentToPC[] = _("{STRING 3} was sent to\n{STRING 35} PC."); -const u8 BattleText_Someone[] = _("someone’s"); -const u8 BattleText_Lanette[] = _("LANETTE’s"); -const u8 BattleText_AddedToDex[] = _("{STRING 3}’s data was\nadded to the POKéDEX.\p"); +const u8 BattleText_Someone[] = _("someone's"); +const u8 BattleText_Lanette[] = _("LANETTE's"); +const u8 BattleText_AddedToDex[] = _("{STRING 3}'s data was\nadded to the POKéDEX.\p"); const u8 BattleText_Raining[] = _("It is raining."); const u8 BattleText_Sandstorm[] = _("A sandstorm is raging."); -const u8 BattleText_BoxFull[] = _("The BOX is full!\nYou can’t catch any more!\p"); +const u8 BattleText_BoxFull[] = _("The BOX is full!\nYou can't catch any more!\p"); const u8 BattleText_EnigmaBerry[] = _("ENIGMA BERRY"); const u8 BattleText_Berry[] = _(" BERRY"); -const u8 BattleText_CuredParalysis[] = _("{STRING 16}’s {STRING 19}\ncured paralysis!"); -const u8 BattleText_CuredPoison[] = _("{STRING 16}’s {STRING 19}\ncured poison!"); -const u8 BattleText_CuredBurn[] = _("{STRING 16}’s {STRING 19}\nhealed its burn!"); -const u8 BattleText_CuredFreeze[] = _("{STRING 16}’s {STRING 19}\ndefrosted it!"); -const u8 BattleText_CuredSleep[] = _("{STRING 16}’s {STRING 19}\nwoke it from its sleep!"); -const u8 BattleText_CuredConfusion[] = _("{STRING 16}’s {STRING 19}\nsnapped it out of confusion!"); -const u8 BattleText_CuredStatus[] = _("{STRING 16}’s {STRING 19}\ncured its {STRING 0} problem!"); -const u8 BattleText_NormalizedStatus[] = _("{STRING 16}’s {STRING 19}\nnormalized its status!"); -const u8 BattleText_RestoredHealth[] = _("{STRING 16}’s {STRING 19}\nrestored health!"); -const u8 BattleText_RestoredPP[] = _("{STRING 16}’s {STRING 19}\nrestored {STRING 0}’s PP!"); -const u8 BattleText_RestoredStatus[] = _("{STRING 16}’s {STRING 19}\nrestored its status!"); -const u8 BattleText_RestoredHPLittle[] = _("{STRING 16}’s {STRING 19}\nrestored its HP a little!"); +const u8 BattleText_CuredParalysis[] = _("{STRING 16}'s {STRING 19}\ncured paralysis!"); +const u8 BattleText_CuredPoison[] = _("{STRING 16}'s {STRING 19}\ncured poison!"); +const u8 BattleText_CuredBurn[] = _("{STRING 16}'s {STRING 19}\nhealed its burn!"); +const u8 BattleText_CuredFreeze[] = _("{STRING 16}'s {STRING 19}\ndefrosted it!"); +const u8 BattleText_CuredSleep[] = _("{STRING 16}'s {STRING 19}\nwoke it from its sleep!"); +const u8 BattleText_CuredConfusion[] = _("{STRING 16}'s {STRING 19}\nsnapped it out of confusion!"); +const u8 BattleText_CuredStatus[] = _("{STRING 16}'s {STRING 19}\ncured its {STRING 0} problem!"); +const u8 BattleText_NormalizedStatus[] = _("{STRING 16}'s {STRING 19}\nnormalized its status!"); +const u8 BattleText_RestoredHealth[] = _("{STRING 16}'s {STRING 19}\nrestored health!"); +const u8 BattleText_RestoredPP[] = _("{STRING 16}'s {STRING 19}\nrestored {STRING 0}'s PP!"); +const u8 BattleText_RestoredStatus[] = _("{STRING 16}'s {STRING 19}\nrestored its status!"); +const u8 BattleText_RestoredHPLittle[] = _("{STRING 16}'s {STRING 19}\nrestored its HP a little!"); const u8 BattleText_ChoiceBand[] = _("{STRING 19} allows the\nuse of only {STRING 17}!\p"); const u8 BattleText_FocusSash[] = _("{DEFENDING_MON} hung on\nusing its {STRING 19}!"); const u8 BattleText_Terminator2[] = _(""); -const u8 BattleText_WallyBall[] = _("You throw a BALL now, right?\nI... I’ll do my best!"); +const u8 BattleText_WallyBall[] = _("You throw a BALL now, right?\nI... I'll do my best!"); const u8 BattleText_StartEvo[] = _("What?\n{STRING 2} is evolving!"); const u8 BattleText_FinishEvo[] = _("Congratulations! Your {STRING 2}\nevolved into {STRING 3}!{UNKNOWN_A}\p"); const u8 BattleText_StopEvo[] = _("Huh? {STRING 2}\nstopped evolving!\p"); @@ -821,7 +821,7 @@ const u8 BattleText_Win[] = _("{HIGHLIGHT TRANSPARENT}Win"); // 8400E48 const u8 BattleText_Loss[] = _("{HIGHLIGHT TRANSPARENT}Loss"); // 8400E4F const u8 BattleText_Tie[] = _("{HIGHLIGHT TRANSPARENT}Tie"); // 8400E57 const u8 BattleText_Format10[] = _(" is"); -const u8 BattleText_Format11[] = _("’s"); +const u8 BattleText_Format11[] = _("'s"); const u8 BattleText_Normal[] = _("a NORMAL move"); const u8 BattleText_Fighting[] = _("a FIGHTING move"); const u8 BattleText_Flying[] = _("a FLYING move"); diff --git a/src/data/item_descriptions_en.h b/src/data/item_descriptions_en.h index e07a5fc19..4d326d834 100644 --- a/src/data/item_descriptions_en.h +++ b/src/data/item_descriptions_en.h @@ -173,7 +173,7 @@ static const u8 gItemDescription_Elixir[] = _( static const u8 gItemDescription_MaxElixir[] = _( "Fully restores the\n" - "PP of a POKéMON’s\n" + "PP of a POKéMON's\n" "moves."); static const u8 gItemDescription_LavaCookie[] = _( @@ -734,7 +734,7 @@ static const u8 gItemDescription_MentalHerb[] = _( "of infatuation."); static const u8 gItemDescription_ChoiceBand[] = _( - "Raises a move’s\n" + "Raises a move's\n" "power, but permits\n" "only that move."); @@ -910,11 +910,11 @@ static const u8 gItemDescription_SeaIncense[] = _( static const u8 gItemDescription_LaxIncense[] = _( "A hold item that\n" "slightly lowers the\n" - "foe’s accuracy."); + "foe's accuracy."); static const u8 gItemDescription_LuckyPunch[] = _( "A hold item that\n" - "raises CHANSEY’s\n" + "raises CHANSEY's\n" "critical-hit rate."); static const u8 gItemDescription_MetalPowder[] = _( @@ -1002,7 +1002,7 @@ static const u8 gItemDescription_WailmerPail[] = _( static const u8 gItemDescription_DevonGoods[] = _( "A package that\n" - "contains DEVON’s\n" + "contains DEVON's\n" "machine parts."); static const u8 gItemDescription_SootSack[] = _( @@ -1296,7 +1296,7 @@ static const u8 gItemDescription_TM39[] = _( static const u8 gItemDescription_TM40[] = _( "An extremely fast\n" - "attack that can’t\n" + "attack that can't\n" "be avoided."); static const u8 gItemDescription_TM41[] = _( @@ -1327,7 +1327,7 @@ static const u8 gItemDescription_TM45[] = _( static const u8 gItemDescription_TM46[] = _( "While attacking,\n" "it may steal the\n" - "foe’s held item."); + "foe's held item."); static const u8 gItemDescription_TM47[] = _( "Spreads hard-edged\n" diff --git a/src/data/items_en.h b/src/data/items_en.h index 60f62752d..518a83173 100644 --- a/src/data/items_en.h +++ b/src/data/items_en.h @@ -2993,7 +2993,7 @@ const struct Item gItems[] = .secondaryId = 0, }, { - .name = _("KING’S ROCK"), + .name = _("KING'S ROCK"), .itemId = ITEM_KINGS_ROCK, .price = 100, .holdEffect = HOLD_EFFECT_FLINCH, diff --git a/src/data/pokedex_entries_de.h b/src/data/pokedex_entries_de.h index 413b73d90..26d8462c6 100644 --- a/src/data/pokedex_entries_de.h +++ b/src/data/pokedex_entries_de.h @@ -595,7 +595,7 @@ static const u8 DexDescription_Pixi_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Vulpix_1[] = _( - "In VULPIX’ Körper brennt eine Flamme,\n" + "In VULPIX' Körper brennt eine Flamme,\n" "die niemals erlischt. Am Tage, wenn die\n" "Temperaturen steigen, stößt dieses"); static const u8 DexDescription_Vulpix_2[] = _( @@ -766,7 +766,7 @@ static const u8 DexDescription_Giflor_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Paras_1[] = _( - "Auf PARAS’ Rücken wachsen parasitäre\n" + "Auf PARAS' Rücken wachsen parasitäre\n" "Pilze, die Tochukaso genannt werden.\n" "Sie wachsen, indem sie diesem"); static const u8 DexDescription_Paras_2[] = _( @@ -775,7 +775,7 @@ static const u8 DexDescription_Paras_2[] = _( "lebensverlängernde Medizin."); #else static const u8 DexDescription_Paras_1[] = _( - "Auf PARAS’ Rücken wachsen parasitäre\n" + "Auf PARAS' Rücken wachsen parasitäre\n" "Pilze, die Tochukaso genannt werden.\n" "Sie wachsen, indem sie dem"); static const u8 DexDescription_Paras_2[] = _( @@ -1319,7 +1319,7 @@ static const u8 DexDescription_Flegmon_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Lahmus_1[] = _( - "An LAHMUS’ Schweif hat sich ein \n" + "An LAHMUS' Schweif hat sich ein \n" "MUSCHAS festgebissen. Daher kann es\n" "ihn nicht mehr zum Fischen benutzen"); static const u8 DexDescription_Lahmus_2[] = _( @@ -1328,7 +1328,7 @@ static const u8 DexDescription_Lahmus_2[] = _( "halten."); #else static const u8 DexDescription_Lahmus_1[] = _( - "An LAHMUS’ Rute hat sich ein MUSCHAS\n" + "An LAHMUS' Rute hat sich ein MUSCHAS\n" "festgebissen. Daher kann es ihn nicht\n" "mehr zum Angeln benutzen"); static const u8 DexDescription_Lahmus_2[] = _( @@ -3161,7 +3161,7 @@ static const u8 DexDescription_Baldorfish_2[] = _( #endif static const u8 DexDescription_Scherox_1[] = _( - "SCHEROX’ Körper ist hart wie Stahl.\n" + "SCHEROX' Körper ist hart wie Stahl.\n" "Gewöhnliche Angriffe jagen ihm keine\n" "Angst ein. Dieses POKéMON schlägt"); static const u8 DexDescription_Scherox_2[] = _( @@ -3974,7 +3974,7 @@ static const u8 DexDescription_Magnayen_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Zigzachs_1[] = _( - "Das Haar auf ZIGZACHS’ Rücken ist\n" + "Das Haar auf ZIGZACHS' Rücken ist\n" "struppig. Es reibt seine Rückenborsten\n" "an Bäumen, um sein Revier zu markieren."); static const u8 DexDescription_Zigzachs_2[] = _( @@ -4429,7 +4429,7 @@ static const u8 DexDescription_Kapilz_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Bummelz_1[] = _( - "BUMMELZ’ Herz schlägt nur ein Mal pro\n" + "BUMMELZ' Herz schlägt nur ein Mal pro\n" "Minute. Dieses POKéMON ist damit\n" "zufrieden, bewegungslos"); static const u8 DexDescription_Bummelz_2[] = _( @@ -5952,7 +5952,7 @@ static const u8 DexDescription_Perlu_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Aalabyss_1[] = _( - "AALABYSS’ Schweif ist wie ein Fisch\n" + "AALABYSS' Schweif ist wie ein Fisch\n" "geformt. Es benutzt ihn, um Beute\n" "anzuziehen und schluckt diese dann"); static const u8 DexDescription_Aalabyss_2[] = _( @@ -6012,7 +6012,7 @@ static const u8 DexDescription_Relicanth_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Liebiskus_1[] = _( - "LIEBISKUS’ herzförmiger Körper ist ein\n" + "LIEBISKUS' herzförmiger Körper ist ein\n" "Symbol der Liebe und der Romantik.\n" "Man sagt, jedem Paar, dem es begegnet,"); static const u8 DexDescription_Liebiskus_2[] = _( diff --git a/src/data/pokedex_entries_en.h b/src/data/pokedex_entries_en.h index 933b1fc7d..8fdbd0ecf 100644 --- a/src/data/pokedex_entries_en.h +++ b/src/data/pokedex_entries_en.h @@ -10,24 +10,24 @@ static const u8 DexDescription_Bulbasaur_1[] = _( "bright sunlight.\n" "There is a seed on its back."); static const u8 DexDescription_Bulbasaur_2[] = _( - "By soaking up the sun’s rays, the seed\n" + "By soaking up the sun's rays, the seed\n" "grows progressively larger."); static const u8 DexDescription_Ivysaur_1[] = _( - "There is a bud on this POKéMON’s back.\n" - "To support its weight, IVYSAUR’s legs\n" + "There is a bud on this POKéMON's back.\n" + "To support its weight, IVYSAUR's legs\n" "and trunk grow thick and strong."); static const u8 DexDescription_Ivysaur_2[] = _( "If it starts spending more time lying\n" - "in the sunlight, it’s a sign that the\n" + "in the sunlight, it's a sign that the\n" "bud will bloom into a large flower soon."); static const u8 DexDescription_Venusaur_1[] = _( - "There is a large flower on VENUSAUR’s\n" + "There is a large flower on VENUSAUR's\n" "back. The flower is said to take on vivid\n" "colors if it gets plenty of nutrition"); static const u8 DexDescription_Venusaur_2[] = _( - "and sunlight. The flower’s aroma\n" + "and sunlight. The flower's aroma\n" "soothes the emotions of people."); static const u8 DexDescription_Charmander_1[] = _( @@ -57,9 +57,9 @@ static const u8 DexDescription_Charizard_2[] = _( "opponent weaker than itself."); static const u8 DexDescription_Squirtle_1[] = _( - "SQUIRTLE’s shell is not merely used\n" + "SQUIRTLE's shell is not merely used\n" "for protection.\n" - "The shell’s rounded shape and the"); + "The shell's rounded shape and the"); static const u8 DexDescription_Squirtle_2[] = _( "grooves on its surface help minimize\n" "resistance in water, enabling this\n" @@ -71,7 +71,7 @@ static const u8 DexDescription_Wartortle_1[] = _( "deeper in color as WARTORTLE ages."); static const u8 DexDescription_Wartortle_2[] = _( "The scratches on its shell are evidence\n" - "of this POKéMON’s toughness as a\n" + "of this POKéMON's toughness as a\n" "battler."); static const u8 DexDescription_Blastoise_1[] = _( @@ -92,7 +92,7 @@ static const u8 DexDescription_Caterpie_2[] = _( "a terrifically strong odor."); static const u8 DexDescription_Metapod_1[] = _( - "The shell covering this POKéMON’s body\n" + "The shell covering this POKéMON's body\n" "is as hard as an iron slab.\n" "METAPOD does not move very much."); static const u8 DexDescription_Metapod_2[] = _( @@ -170,7 +170,7 @@ static const u8 DexDescription_Rattata_2[] = _( "it will make its nest anywhere."); static const u8 DexDescription_Raticate_1[] = _( - "RATICATE’s sturdy fangs grow steadily.\n" + "RATICATE's sturdy fangs grow steadily.\n" "To keep them ground down, it gnaws\n" "on rocks and logs."); static const u8 DexDescription_Raticate_2[] = _( @@ -228,7 +228,7 @@ static const u8 DexDescription_Pikachu_1[] = _( "of electricity."); static const u8 DexDescription_Pikachu_2[] = _( "If you come across a blackened berry,\n" - "it’s evidence that this POKéMON\n" + "it's evidence that this POKéMON\n" "mistook the intensity of its charge."); #endif @@ -247,7 +247,7 @@ static const u8 DexDescription_Raichu_1[] = _( "tail in the ground and discharges."); static const u8 DexDescription_Raichu_2[] = _( "Scorched patches of ground will be\n" - "found near this POKéMON’s nest."); + "found near this POKéMON's nest."); #endif #ifdef SAPPHIRE @@ -260,7 +260,7 @@ static const u8 DexDescription_Sandshrew_2[] = _( "sand to sleep."); #else static const u8 DexDescription_Sandshrew_1[] = _( - "SANDSHREW’s body is configured to\n" + "SANDSHREW's body is configured to\n" "absorb water without waste, enabling it\n" "to survive in an arid desert."); static const u8 DexDescription_Sandshrew_2[] = _( @@ -279,7 +279,7 @@ static const u8 DexDescription_Sandslash_2[] = _( "foe to tear wildly with its sharp claws."); #else static const u8 DexDescription_Sandslash_1[] = _( - "SANDSLASH’s body is covered by tough\n" + "SANDSLASH's body is covered by tough\n" "spikes, which are hardened sections of\n" "its hide. Once a year, the old spikes fall"); static const u8 DexDescription_Sandslash_2[] = _( @@ -305,7 +305,7 @@ static const u8 DexDescription_Nidorina_2[] = _( "nervous if separated from the others."); static const u8 DexDescription_Nidoqueen_1[] = _( - "NIDOQUEEN’s body is encased in\n" + "NIDOQUEEN's body is encased in\n" "extremely hard scales. It is adept at\n" "sending foes flying with harsh tackles."); static const u8 DexDescription_Nidoqueen_2[] = _( @@ -318,7 +318,7 @@ static const u8 DexDescription_NidoranM_1[] = _( "them, the ears can be freely moved in"); static const u8 DexDescription_NidoranM_2[] = _( "any direction. Even the slightest sound\n" - "does not escape this POKéMON’s notice."); + "does not escape this POKéMON's notice."); static const u8 DexDescription_Nidorino_1[] = _( "NIDORINO has a horn that is harder than\n" @@ -329,7 +329,7 @@ static const u8 DexDescription_Nidorino_2[] = _( "the foe with all its might."); static const u8 DexDescription_Nidoking_1[] = _( - "NIDOKING’s thick tail packs enormously\n" + "NIDOKING's thick tail packs enormously\n" "destructive power. With one swing, it\n" "can topple a metal transmission tower."); static const u8 DexDescription_Nidoking_2[] = _( @@ -355,7 +355,7 @@ static const u8 DexDescription_Clefable_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Vulpix_1[] = _( - "Inside VULPIX’s body burns a flame that\n" + "Inside VULPIX's body burns a flame that\n" "never goes out. During the daytime,\n" "when the temperatures rise, this"); static const u8 DexDescription_Vulpix_2[] = _( @@ -385,7 +385,7 @@ static const u8 DexDescription_Ninetales_2[] = _( static const u8 DexDescription_Ninetales_1[] = _( "NINETALES casts a sinister light from\n" "its bright red eyes to gain total\n" - "control over its foe’s mind."); + "control over its foe's mind."); static const u8 DexDescription_Ninetales_2[] = _( "This POKéMON is said to live for a\n" "thousand years."); @@ -401,7 +401,7 @@ static const u8 DexDescription_Jigglypuff_2[] = _( "breathe, endangering its life."); #else static const u8 DexDescription_Jigglypuff_1[] = _( - "JIGGLYPUFF’s vocal chords can freely\n" + "JIGGLYPUFF's vocal chords can freely\n" "adjust the wavelength of its voice.\n" "This POKéMON uses this ability to sing"); static const u8 DexDescription_Jigglypuff_2[] = _( @@ -411,7 +411,7 @@ static const u8 DexDescription_Jigglypuff_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Wigglytuff_1[] = _( - "WIGGLYTUFF’s body is very flexible.\n" + "WIGGLYTUFF's body is very flexible.\n" "By inhaling deeply, this POKéMON can\n" "inflate itself seemingly without end."); static const u8 DexDescription_Wigglytuff_2[] = _( @@ -423,7 +423,7 @@ static const u8 DexDescription_Wigglytuff_1[] = _( "The surfaces of its eyes are always\n" "covered with a thin layer of tears."); static const u8 DexDescription_Wigglytuff_2[] = _( - "If any dust gets in this POKéMON’s\n" + "If any dust gets in this POKéMON's\n" "eyes, it is quickly washed away."); #endif @@ -448,7 +448,7 @@ static const u8 DexDescription_Zubat_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Golbat_1[] = _( "GOLBAT bites down on prey with its four\n" - "fangs and drinks the victim’s blood.\n" + "fangs and drinks the victim's blood.\n" "It becomes active on inky dark"); static const u8 DexDescription_Golbat_2[] = _( "moonless nights, flying around to\n" @@ -469,7 +469,7 @@ static const u8 DexDescription_Oddish_1[] = _( "rich soil, then plants itself.\n" "During the daytime, while it is planted,"); static const u8 DexDescription_Oddish_2[] = _( - "this POKéMON’s feet are thought to\n" + "this POKéMON's feet are thought to\n" "change shape and become similar to\n" "the roots of trees."); #else @@ -503,7 +503,7 @@ static const u8 DexDescription_Gloom_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Vileplume_1[] = _( - "VILEPLUME has the world’s largest\n" + "VILEPLUME has the world's largest\n" "petals. They are used to attract prey\n" "that are then doused with toxic spores."); static const u8 DexDescription_Vileplume_2[] = _( @@ -511,8 +511,8 @@ static const u8 DexDescription_Vileplume_2[] = _( "POKéMON catches and devours them."); #else static const u8 DexDescription_Vileplume_1[] = _( - "VILEPLUME’s toxic pollen triggers\n" - "atrocious allergy attacks. That’s why\n" + "VILEPLUME's toxic pollen triggers\n" + "atrocious allergy attacks. That's why\n" "it is advisable never to approach any"); static const u8 DexDescription_Vileplume_2[] = _( "attractive flowers in a jungle, however\n" @@ -614,15 +614,15 @@ static const u8 DexDescription_Persian_1[] = _( "it a look of toughness. The whiskers \n" "sense air movements to determine what"); static const u8 DexDescription_Persian_2[] = _( - "is in the POKéMON’s surrounding\n" + "is in the POKéMON's surrounding\n" "vicinity. It becomes docile if grabbed\n" "by the whiskers."); #ifdef SAPPHIRE static const u8 DexDescription_Psyduck_1[] = _( "If it uses its mysterious power,\n" - "PSYDUCK can’t remember having done so.\n" - "It apparently can’t form a memory of"); + "PSYDUCK can't remember having done so.\n" + "It apparently can't form a memory of"); static const u8 DexDescription_Psyduck_2[] = _( "such an event because it goes into\n" "an altered state that is much like\n" @@ -658,7 +658,7 @@ static const u8 DexDescription_Golduck_2[] = _( static const u8 DexDescription_Mankey_1[] = _( "When MANKEY starts shaking and its\n" - "nasal breathing turns rough, it’s a sure\n" + "nasal breathing turns rough, it's a sure\n" "sign that it is becoming angry."); static const u8 DexDescription_Mankey_2[] = _( "However, because it goes into a\n" @@ -676,7 +676,7 @@ static const u8 DexDescription_Primeape_2[] = _( static const u8 DexDescription_Growlithe_1[] = _( "GROWLITHE has a superb sense of smell.\n" "Once it smells anything, this POKéMON\n" - "won’t forget the scent, no matter what."); + "won't forget the scent, no matter what."); static const u8 DexDescription_Growlithe_2[] = _( "It uses its advanced olfactory sense\n" "to determine the emotions of other\n" @@ -688,11 +688,11 @@ static const u8 DexDescription_Arcanine_1[] = _( "6,200 miles in a single day and night."); static const u8 DexDescription_Arcanine_2[] = _( "The fire that blazes wildly within this\n" - "POKéMON’s body is its source of power."); + "POKéMON's body is its source of power."); static const u8 DexDescription_Poliwag_1[] = _( "POLIWAG has a very thin skin. It is\n" - "possible to see the POKéMON’s spiral\n" + "possible to see the POKéMON's spiral\n" "innards right through the skin."); static const u8 DexDescription_Poliwag_2[] = _( "Despite its thinness, however, the skin\n" @@ -700,7 +700,7 @@ static const u8 DexDescription_Poliwag_2[] = _( "bounce right off it."); static const u8 DexDescription_Poliwhirl_1[] = _( - "The surface of POLIWHIRL’s body is\n" + "The surface of POLIWHIRL's body is\n" "always wet and slick with an oily fluid.\n" "Because of this greasy covering, it can"); static const u8 DexDescription_Poliwhirl_2[] = _( @@ -708,7 +708,7 @@ static const u8 DexDescription_Poliwhirl_2[] = _( "of any enemy in battle."); static const u8 DexDescription_Poliwrath_1[] = _( - "POLIWRATH’s highly developed, brawny\n" + "POLIWRATH's highly developed, brawny\n" "muscles never grow fatigued, however\n" "much it exercises."); static const u8 DexDescription_Poliwrath_2[] = _( @@ -719,7 +719,7 @@ static const u8 DexDescription_Poliwrath_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Abra_1[] = _( "ABRA needs to sleep for eighteen hours\n" - "a day. If it doesn’t, this POKéMON loses\n" + "a day. If it doesn't, this POKéMON loses\n" "its ability to use telekinetic powers."); static const u8 DexDescription_Abra_2[] = _( "If it is attacked, ABRA escapes using\n" @@ -755,7 +755,7 @@ static const u8 DexDescription_Kadabra_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Alakazam_1[] = _( - "ALAKAZAM’s brain continually grows,\n" + "ALAKAZAM's brain continually grows,\n" "infinitely multiplying brain cells.\n" "This amazing brain gives this POKéMON"); static const u8 DexDescription_Alakazam_2[] = _( @@ -764,7 +764,7 @@ static const u8 DexDescription_Alakazam_2[] = _( "that has occurred in the world."); #else static const u8 DexDescription_Alakazam_1[] = _( - "ALAKAZAM’s brain continually grows,\n" + "ALAKAZAM's brain continually grows,\n" "making its head far too heavy to\n" "support with its neck."); static const u8 DexDescription_Alakazam_2[] = _( @@ -782,7 +782,7 @@ static const u8 DexDescription_Machop_2[] = _( "kinds of martial arts."); #else static const u8 DexDescription_Machop_1[] = _( - "MACHOP’s muscles are special - they\n" + "MACHOP's muscles are special - they\n" "never get sore no matter how much they\n" "are used in exercise."); static const u8 DexDescription_Machop_2[] = _( @@ -801,7 +801,7 @@ static const u8 DexDescription_Machoke_2[] = _( "and train."); #else static const u8 DexDescription_Machoke_1[] = _( - "MACHOKE’s thoroughly toned muscles\n" + "MACHOKE's thoroughly toned muscles\n" "possess the hardness of steel.\n" "This POKéMON has so much strength,"); static const u8 DexDescription_Machoke_2[] = _( @@ -830,7 +830,7 @@ static const u8 DexDescription_Machamp_2[] = _( #endif static const u8 DexDescription_Bellsprout_1[] = _( - "BELLSPROUT’s thin and flexible body\n" + "BELLSPROUT's thin and flexible body\n" "lets it bend and sway to avoid any\n" "attack, however strong it may be."); static const u8 DexDescription_Bellsprout_2[] = _( @@ -864,7 +864,7 @@ static const u8 DexDescription_Tentacool_2[] = _( "crystal-like eyes."); #else static const u8 DexDescription_Tentacool_1[] = _( - "TENTACOOL’s body is largely composed\n" + "TENTACOOL's body is largely composed\n" "of water. If it is removed from the\n" "sea, it dries up like parchment."); static const u8 DexDescription_Tentacool_2[] = _( @@ -887,7 +887,7 @@ static const u8 DexDescription_Tentacruel_1[] = _( "head. The orbs glow before lashing the\n" "vicinity with a harsh ultrasonic blast."); static const u8 DexDescription_Tentacruel_2[] = _( - "This POKéMON’s outburst creates rough\n" + "This POKéMON's outburst creates rough\n" "waves around it."); #endif @@ -906,13 +906,13 @@ static const u8 DexDescription_Geodude_1[] = _( "its edges are chipped and worn away,\n" "making it more rounded in appearance."); static const u8 DexDescription_Geodude_2[] = _( - "However, this POKéMON’s heart will\n" + "However, this POKéMON's heart will\n" "remain hard, craggy, and rough always."); #endif #ifdef SAPPHIRE static const u8 DexDescription_Graveler_1[] = _( - "Rocks are GRAVELER’s favorite food.\n" + "Rocks are GRAVELER's favorite food.\n" "This POKéMON will climb a mountain from\n" "the base to the summit, crunchingly"); static const u8 DexDescription_Graveler_2[] = _( @@ -937,7 +937,7 @@ static const u8 DexDescription_Golem_1[] = _( static const u8 DexDescription_Golem_2[] = _( "grooves have been dug into the sides of\n" "mountains to serve as guideways for\n" - "diverting this POKéMON’s course."); + "diverting this POKéMON's course."); #else static const u8 DexDescription_Golem_1[] = _( "GOLEM live up on mountains.\n" @@ -970,13 +970,13 @@ static const u8 DexDescription_Slowpoke_1[] = _( "river."); static const u8 DexDescription_Slowpoke_2[] = _( "However, this POKéMON often forgets\n" - "what it’s doing and often spends entire\n" - "days just loafing at water’s edge."); + "what it's doing and often spends entire\n" + "days just loafing at water's edge."); static const u8 DexDescription_Slowbro_1[] = _( - "SLOWBRO’s tail has a SHELLDER firmly\n" + "SLOWBRO's tail has a SHELLDER firmly\n" "attached with a bite. As a result, the\n" - "tail can’t be used for fishing anymore."); + "tail can't be used for fishing anymore."); static const u8 DexDescription_Slowbro_2[] = _( "This causes SLOWBRO to grudgingly swim\n" "and catch prey instead."); @@ -1021,7 +1021,7 @@ static const u8 DexDescription_Magneton_2[] = _( #endif static const u8 DexDescription_Farfetchd_1[] = _( - "FARFETCH’D is always seen with a stick\n" + "FARFETCH'D is always seen with a stick\n" "from a plant of some sort. Apparently,\n" "there are good sticks and bad sticks."); static const u8 DexDescription_Farfetchd_2[] = _( @@ -1030,7 +1030,7 @@ static const u8 DexDescription_Farfetchd_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Doduo_1[] = _( - "DODUO’s two heads contain completely\n" + "DODUO's two heads contain completely\n" "identical brains.\n" "A scientific study reported that on"); static const u8 DexDescription_Doduo_2[] = _( @@ -1039,7 +1039,7 @@ static const u8 DexDescription_Doduo_2[] = _( "sets of brains."); #else static const u8 DexDescription_Doduo_1[] = _( - "DODUO’s two heads never sleep at the\n" + "DODUO's two heads never sleep at the\n" "same time.\n" "Its two heads take turns sleeping,"); static const u8 DexDescription_Doduo_2[] = _( @@ -1049,7 +1049,7 @@ static const u8 DexDescription_Doduo_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Dodrio_1[] = _( - "Apparently, the heads aren’t the only\n" + "Apparently, the heads aren't the only\n" "parts of the body that DODRIO has\n" "three of."); static const u8 DexDescription_Dodrio_2[] = _( @@ -1058,11 +1058,11 @@ static const u8 DexDescription_Dodrio_2[] = _( "distances without rest."); #else static const u8 DexDescription_Dodrio_1[] = _( - "Watch out if DODRIO’s three heads are\n" + "Watch out if DODRIO's three heads are\n" "looking in three separate directions.\n" - "It’s a sure sign that it is on its guard."); + "It's a sure sign that it is on its guard."); static const u8 DexDescription_Dodrio_2[] = _( - "Don’t go near this POKéMON if it’s being\n" + "Don't go near this POKéMON if it's being\n" "wary - it may decide to peck you."); #endif @@ -1092,7 +1092,7 @@ static const u8 DexDescription_Grimer_2[] = _( "infested fluid from all over its body."); #else static const u8 DexDescription_Grimer_1[] = _( - "GRIMER’s sludgy and rubbery body can\n" + "GRIMER's sludgy and rubbery body can\n" "be forced through any opening, however\n" "small it may be."); static const u8 DexDescription_Grimer_2[] = _( @@ -1102,7 +1102,7 @@ static const u8 DexDescription_Grimer_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Muk_1[] = _( - "This POKéMON’s favorite food is\n" + "This POKéMON's favorite food is\n" "anything that is repugnantly filthy.\n" "In dirty towns where people think"); static const u8 DexDescription_Muk_2[] = _( @@ -1110,11 +1110,11 @@ static const u8 DexDescription_Muk_2[] = _( "streets, MUK are certain to gather."); #else static const u8 DexDescription_Muk_1[] = _( - "From MUK’s body seeps a foul fluid that\n" + "From MUK's body seeps a foul fluid that\n" "gives off a nose-bendingly horrible\n" "stench."); static const u8 DexDescription_Muk_2[] = _( - "Just one drop of this POKéMON’s body\n" + "Just one drop of this POKéMON's body\n" "fluid can turn a pool stagnant and\n" "rancid."); #endif @@ -1171,7 +1171,7 @@ static const u8 DexDescription_Onix_2[] = _( static const u8 DexDescription_Drowzee_1[] = _( "If your nose becomes itchy while you\n" - "are sleeping, it’s a sure sign that one\n" + "are sleeping, it's a sure sign that one\n" "of these POKéMON is standing above"); static const u8 DexDescription_Drowzee_2[] = _( "your pillow and trying to eat your dream\n" @@ -1224,7 +1224,7 @@ static const u8 DexDescription_Voltorb_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Electrode_1[] = _( - "One of ELECTRODE’s characteristics is\n" + "One of ELECTRODE's characteristics is\n" "its attraction to electricity.\n" "It is a problematical POKéMON that"); static const u8 DexDescription_Electrode_2[] = _( @@ -1270,11 +1270,11 @@ static const u8 DexDescription_Marowak_1[] = _( "that has overcome its sadness at the\n" "loss of its mother and grown tough."); static const u8 DexDescription_Marowak_2[] = _( - "This POKéMON’s tempered and hardened\n" + "This POKéMON's tempered and hardened\n" "spirit is not easily broken."); static const u8 DexDescription_Hitmonlee_1[] = _( - "HITMONLEE’s legs freely contract and\n" + "HITMONLEE's legs freely contract and\n" "stretch. Using these springlike legs, it\n" "bowls over foes with devastating kicks."); static const u8 DexDescription_Hitmonlee_2[] = _( @@ -1340,7 +1340,7 @@ static const u8 DexDescription_Weezing_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Rhyhorn_1[] = _( - "RHYHORN’s brain is very small. It is so\n" + "RHYHORN's brain is very small. It is so\n" "dense, while on a run it forgets why it\n" "started running in the first place."); static const u8 DexDescription_Rhyhorn_2[] = _( @@ -1368,12 +1368,12 @@ static const u8 DexDescription_Rhydon_2[] = _( "hide prevents it from feeling the heat."); #else static const u8 DexDescription_Rhydon_1[] = _( - "RHYDON’s horn can crush even uncut\n" + "RHYDON's horn can crush even uncut\n" "diamonds. One sweeping blow of its tail\n" "can topple a building."); static const u8 DexDescription_Rhydon_2[] = _( - "This POKéMON’s hide is extremely tough.\n" - "Even direct cannon hits don’t leave\n" + "This POKéMON's hide is extremely tough.\n" + "Even direct cannon hits don't leave\n" "a scratch."); #endif @@ -1387,7 +1387,7 @@ static const u8 DexDescription_Chansey_2[] = _( "appetite."); static const u8 DexDescription_Tangela_1[] = _( - "TANGELA’s vines snap off easily if they\n" + "TANGELA's vines snap off easily if they\n" "are grabbed. This happens without pain,\n" "allowing it to make a quick getaway."); static const u8 DexDescription_Tangela_2[] = _( @@ -1399,7 +1399,7 @@ static const u8 DexDescription_Kangaskhan_1[] = _( "playing by itself, you must never\n" "disturb it or attempt to catch it."); static const u8 DexDescription_Kangaskhan_2[] = _( - "The baby POKéMON’s parent is sure to\n" + "The baby POKéMON's parent is sure to\n" "be in the area, and it will become\n" "violently enraged at you."); @@ -1435,7 +1435,7 @@ static const u8 DexDescription_Seadra_1[] = _( "between the branches of coral.\n" "Those trying to harvest coral are"); static const u8 DexDescription_Seadra_2[] = _( - "occasionally stung by this POKéMON’s\n" + "occasionally stung by this POKéMON's\n" "poison barbs if they fail to notice it."); #endif @@ -1452,7 +1452,7 @@ static const u8 DexDescription_Goldeen_2[] = _( static const u8 DexDescription_Goldeen_1[] = _( "GOLDEEN is a very beautiful POKéMON\n" "with fins that billow elegantly in water.\n" - "However, don’t let your guard down"); + "However, don't let your guard down"); static const u8 DexDescription_Goldeen_2[] = _( "around this POKéMON - it could ram you\n" "powerfully with its horn."); @@ -1472,7 +1472,7 @@ static const u8 DexDescription_Seaking_1[] = _( "seen performing courtship dances in\n" "riverbeds to woo females."); static const u8 DexDescription_Seaking_2[] = _( - "During this season, this POKéMON’s body\n" + "During this season, this POKéMON's body\n" "coloration is at its most beautiful."); #endif @@ -1487,7 +1487,7 @@ static const u8 DexDescription_Staryu_2[] = _( "missing pieces and limbs."); #else static const u8 DexDescription_Staryu_1[] = _( - "STARYU’s center section has an organ\n" + "STARYU's center section has an organ\n" "called the core that shines bright red.\n" "If you go to a beach toward the"); static const u8 DexDescription_Staryu_2[] = _( @@ -1503,10 +1503,10 @@ static const u8 DexDescription_Starmie_1[] = _( "were a propeller on a ship."); static const u8 DexDescription_Starmie_2[] = _( "The core at the center of this\n" - "POKéMON’s body glows in seven colors."); + "POKéMON's body glows in seven colors."); #else static const u8 DexDescription_Starmie_1[] = _( - "STARMIE’s center section - the core -\n" + "STARMIE's center section - the core -\n" "glows brightly in seven colors.\n" "Because of its luminous nature, this"); static const u8 DexDescription_Starmie_2[] = _( @@ -1527,7 +1527,7 @@ static const u8 DexDescription_Scyther_1[] = _( "speed enhances the effectiveness of\n" "the twin scythes on its forearms."); static const u8 DexDescription_Scyther_2[] = _( - "This POKéMON’s scythes are so\n" + "This POKéMON's scythes are so\n" "effective, they can slice through thick\n" "logs in one wicked stroke."); @@ -1554,7 +1554,7 @@ static const u8 DexDescription_Magmar_1[] = _( "hot flames from all over its body to\n" "intimidate its opponent."); static const u8 DexDescription_Magmar_2[] = _( - "This POKéMON’s fiery bursts create\n" + "This POKéMON's fiery bursts create\n" "heat waves that ignite grass and trees\n" "in its surroundings."); @@ -1565,7 +1565,7 @@ static const u8 DexDescription_Pinsir_1[] = _( "horns are thorns."); static const u8 DexDescription_Pinsir_2[] = _( "These thorns are driven deeply into the\n" - "foe’s body when the pincer closes,\n" + "foe's body when the pincer closes,\n" "making it tough for the foe to escape."); #else static const u8 DexDescription_Pinsir_1[] = _( @@ -1573,7 +1573,7 @@ static const u8 DexDescription_Pinsir_1[] = _( "grip a foe weighing twice its weight\n" "in its horns and easily lift it."); static const u8 DexDescription_Pinsir_2[] = _( - "This POKéMON’s movements turn sluggish\n" + "This POKéMON's movements turn sluggish\n" "in cold places."); #endif @@ -1607,10 +1607,10 @@ static const u8 DexDescription_Magikarp_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Gyarados_1[] = _( "Once GYARADOS goes on a rampage, its\n" - "ferociously violent blood doesn’t calm\n" + "ferociously violent blood doesn't calm\n" "until it has burned everything down."); static const u8 DexDescription_Gyarados_2[] = _( - "There are records of this POKéMON’s\n" + "There are records of this POKéMON's\n" "rampages lasting a whole month."); #else static const u8 DexDescription_Gyarados_1[] = _( @@ -1619,7 +1619,7 @@ static const u8 DexDescription_Gyarados_1[] = _( "transformation. It is said that this"); static const u8 DexDescription_Gyarados_2[] = _( "transformation is to blame for this\n" - "POKéMON’s wildly violent nature."); + "POKéMON's wildly violent nature."); #endif static const u8 DexDescription_Lapras_1[] = _( @@ -1656,7 +1656,7 @@ static const u8 DexDescription_Vaporeon_2[] = _( "control water."); static const u8 DexDescription_Jolteon_1[] = _( - "JOLTEON’s cells generate a low level of\n" + "JOLTEON's cells generate a low level of\n" "electricity. This power is amplified by\n" "the static electricity of its fur,"); static const u8 DexDescription_Jolteon_2[] = _( @@ -1665,12 +1665,12 @@ static const u8 DexDescription_Jolteon_2[] = _( "of electrically charged needles."); static const u8 DexDescription_Flareon_1[] = _( - "FLAREON’s fluffy fur has a functional\n" + "FLAREON's fluffy fur has a functional\n" "purpose - it releases heat into the air\n" "so that its body does not get"); static const u8 DexDescription_Flareon_2[] = _( "excessively hot.\n" - "This POKéMON’s body temperature can\n" + "This POKéMON's body temperature can\n" "rise to a maximum of 1,650 degrees F."); static const u8 DexDescription_Porygon_1[] = _( @@ -1724,7 +1724,7 @@ static const u8 DexDescription_Aerodactyl_2[] = _( "the skies in ancient times."); static const u8 DexDescription_Snorlax_1[] = _( - "SNORLAX’s typical day consists of\n" + "SNORLAX's typical day consists of\n" "nothing more than eating and sleeping.\n" "It is such a docile POKéMON that there"); static const u8 DexDescription_Snorlax_2[] = _( @@ -1784,7 +1784,7 @@ static const u8 DexDescription_Mewtwo_1[] = _( "by genetic manipulation.\n" "However, even though the scientific"); static const u8 DexDescription_Mewtwo_2[] = _( - "power of humans created this POKéMON’s\n" + "power of humans created this POKéMON's\n" "body, they failed to endow MEWTWO with\n" "a compassionate heart."); @@ -1806,7 +1806,7 @@ static const u8 DexDescription_Chikorita_2[] = _( "atmosphere all around."); static const u8 DexDescription_Bayleef_1[] = _( - "BAYLEEF’s neck is ringed by curled-up\n" + "BAYLEEF's neck is ringed by curled-up\n" "leaves. Inside each tubular leaf is a\n" "small shoot of a tree."); static const u8 DexDescription_Bayleef_2[] = _( @@ -1814,12 +1814,12 @@ static const u8 DexDescription_Bayleef_2[] = _( "people peppy."); static const u8 DexDescription_Meganium_1[] = _( - "The fragrance of MEGANIUM’s flower\n" + "The fragrance of MEGANIUM's flower\n" "soothes and calms emotions.\n" "In battle, this POKéMON gives off more"); static const u8 DexDescription_Meganium_2[] = _( "of its becalming scent to blunt the\n" - "foe’s fighting spirit."); + "foe's fighting spirit."); static const u8 DexDescription_Cyndaquil_1[] = _( "CYNDAQUIL protects itself by flaring up\n" @@ -1849,7 +1849,7 @@ static const u8 DexDescription_Typhlosion_2[] = _( static const u8 DexDescription_Totodile_1[] = _( "Despite the smallness of its body,\n" - "TOTODILE’s jaws are very powerful.\n" + "TOTODILE's jaws are very powerful.\n" "While the POKéMON may think it is just"); static const u8 DexDescription_Totodile_2[] = _( "playfully nipping, its bite has enough\n" @@ -1892,7 +1892,7 @@ static const u8 DexDescription_Furret_2[] = _( static const u8 DexDescription_Hoothoot_1[] = _( "HOOTHOOT has an internal organ that\n" - "senses and tracks the earth’s rotation.\n" + "senses and tracks the earth's rotation.\n" "Using this special organ, this POKéMON"); static const u8 DexDescription_Hoothoot_2[] = _( "begins hooting at precisely the same\n" @@ -1913,7 +1913,7 @@ static const u8 DexDescription_Ledyba_1[] = _( "is used for communicating with others."); static const u8 DexDescription_Ledyba_2[] = _( "This POKéMON conveys its feelings to\n" - "others by altering the fluid’s scent."); + "others by altering the fluid's scent."); static const u8 DexDescription_Ledian_1[] = _( "It is said that in lands with clean air,\n" @@ -1931,10 +1931,10 @@ static const u8 DexDescription_Spinarak_1[] = _( static const u8 DexDescription_Spinarak_2[] = _( "determine what kind of prey is touching\n" "its web just by the tiny vibrations it\n" - "feels through the web’s strands."); + "feels through the web's strands."); static const u8 DexDescription_Ariados_1[] = _( - "ARIADOS’s feet are tipped with tiny\n" + "ARIADOS's feet are tipped with tiny\n" "hooked claws that enable it to scuttle\n" "on ceilings and vertical walls."); static const u8 DexDescription_Ariados_2[] = _( @@ -1953,7 +1953,7 @@ static const u8 DexDescription_Crobat_2[] = _( static const u8 DexDescription_Crobat_1[] = _( "If this POKéMON is flying by fluttering\n" "only a pair of wings on either the\n" - "forelegs or hind legs, it’s proof that"); + "forelegs or hind legs, it's proof that"); static const u8 DexDescription_Crobat_2[] = _( "CROBAT has been flying a long distance.\n" "It switches the wings it uses if it is\n" @@ -1962,9 +1962,9 @@ static const u8 DexDescription_Crobat_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Chinchou_1[] = _( - "CHINCHOU’s two antennas are filled with\n" + "CHINCHOU's two antennas are filled with\n" "cells that generate strong electricity.\n" - "This POKéMON’s cells create so much"); + "This POKéMON's cells create so much"); static const u8 DexDescription_Chinchou_2[] = _( "electrical power, it even makes itself\n" "tingle slightly."); @@ -1984,7 +1984,7 @@ static const u8 DexDescription_Lanturn_1[] = _( "If you peer down into the dark sea from\n" "a ship at night, you can sometimes see"); static const u8 DexDescription_Lanturn_2[] = _( - "this POKéMON’s light rising from the\n" + "this POKéMON's light rising from the\n" "depths where it swims. It gives the sea\n" "an appearance of a starlit night."); #else @@ -2035,7 +2035,7 @@ static const u8 DexDescription_Igglybuff_2[] = _( "emotions of its foes."); #else static const u8 DexDescription_Igglybuff_1[] = _( - "IGGLYBUFF’s vocal chords are not\n" + "IGGLYBUFF's vocal chords are not\n" "sufficiently developed. It would hurt\n" "its throat if it were to sing too much."); static const u8 DexDescription_Igglybuff_2[] = _( @@ -2066,13 +2066,13 @@ static const u8 DexDescription_Natu_1[] = _( "ability. The POKéMON flaps and leaps\n" "onto tree branches that are taller than"); static const u8 DexDescription_Natu_2[] = _( - "grown-up people to pick at the tree’s\n" + "grown-up people to pick at the tree's\n" "new shoots."); #else static const u8 DexDescription_Natu_1[] = _( "NATU cannot fly because its wings are\n" "not yet fully grown. If your eyes meet\n" - "with this POKéMON’s eyes, it will stare"); + "with this POKéMON's eyes, it will stare"); static const u8 DexDescription_Natu_2[] = _( "back intently at you. But if you move\n" "even slightly, it will hop away to safety."); @@ -2098,7 +2098,7 @@ static const u8 DexDescription_Xatu_2[] = _( #endif static const u8 DexDescription_Mareep_1[] = _( - "MAREEP’s fluffy coat of wool rubs\n" + "MAREEP's fluffy coat of wool rubs\n" "together and builds a static charge.\n" "The more static electricity is charged,"); static const u8 DexDescription_Mareep_2[] = _( @@ -2106,7 +2106,7 @@ static const u8 DexDescription_Mareep_2[] = _( "tip of its tail grows."); static const u8 DexDescription_Flaaffy_1[] = _( - "FLAAFFY’s wool quality changes so that\n" + "FLAAFFY's wool quality changes so that\n" "it can generate a high amount of static\n" "electricity with a small amount of wool."); static const u8 DexDescription_Flaaffy_2[] = _( @@ -2135,7 +2135,7 @@ static const u8 DexDescription_Bellossom_1[] = _( "of sunlight, the leaves ringing its body\n" "begin to spin around."); static const u8 DexDescription_Bellossom_2[] = _( - "This POKéMON’s dancing is renowned in\n" + "This POKéMON's dancing is renowned in\n" "the southern lands."); #endif @@ -2145,15 +2145,15 @@ static const u8 DexDescription_Marill_1[] = _( "fast-running stream, MARILL wraps its\n" "tail around the trunk of a tree."); static const u8 DexDescription_Marill_2[] = _( - "This POKéMON’s tail is flexible and\n" + "This POKéMON's tail is flexible and\n" "configured to stretch."); #else static const u8 DexDescription_Marill_1[] = _( - "MARILL’s oil-filled tail acts much like\n" + "MARILL's oil-filled tail acts much like\n" "a life preserver. If you see just its\n" - "tail bobbing on the water’s surface,"); + "tail bobbing on the water's surface,"); static const u8 DexDescription_Marill_2[] = _( - "it’s a sure indication that this POKéMON\n" + "it's a sure indication that this POKéMON\n" "is diving beneath the water to feed on\n" "aquatic plants."); #endif @@ -2168,7 +2168,7 @@ static const u8 DexDescription_Azumarill_2[] = _( "trouble to breathe."); #else static const u8 DexDescription_Azumarill_1[] = _( - "AZUMARILL’s long ears are indispensable\n" + "AZUMARILL's long ears are indispensable\n" "sensors. By focusing its hearing, this\n" "POKéMON can identify what kinds of"); static const u8 DexDescription_Azumarill_2[] = _( @@ -2186,7 +2186,7 @@ static const u8 DexDescription_Sudowoodo_2[] = _( "the winter."); static const u8 DexDescription_Politoed_1[] = _( - "The curled hair on POLITOED’s head is\n" + "The curled hair on POLITOED's head is\n" "proof of its status as a king. It is said\n" "that the longer and more curled the"); static const u8 DexDescription_Politoed_2[] = _( @@ -2202,7 +2202,7 @@ static const u8 DexDescription_Hoppip_2[] = _( "being blown away."); static const u8 DexDescription_Skiploom_1[] = _( - "SKIPLOOM’s flower blossoms when the\n" + "SKIPLOOM's flower blossoms when the\n" "temperature rises above 64 degrees F.\n" "How much the flower opens depends on"); static const u8 DexDescription_Skiploom_2[] = _( @@ -2219,7 +2219,7 @@ static const u8 DexDescription_Jumpluff_2[] = _( "floating."); static const u8 DexDescription_Aipom_1[] = _( - "AIPOM’s tail ends in a hand-like\n" + "AIPOM's tail ends in a hand-like\n" "appendage that can be cleverly\n" "manipulated."); static const u8 DexDescription_Aipom_2[] = _( @@ -2279,7 +2279,7 @@ static const u8 DexDescription_Espeon_2[] = _( static const u8 DexDescription_Umbreon_1[] = _( "UMBREON evolved as a result of exposure\n" - "to the moon’s waves.\n" + "to the moon's waves.\n" "It hides silently in darkness and waits"); static const u8 DexDescription_Umbreon_2[] = _( "for its foes to make a move.\n" @@ -2323,8 +2323,8 @@ static const u8 DexDescription_Unown_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Wobbuffet_1[] = _( "WOBBUFFET does nothing but endure\n" - "attacks - it won’t attack on its own.\n" - "However, it won’t endure an attack on"); + "attacks - it won't attack on its own.\n" + "However, it won't endure an attack on"); static const u8 DexDescription_Wobbuffet_2[] = _( "its tail. When that happens, the\n" "POKéMON will try to take the foe with it\n" @@ -2333,7 +2333,7 @@ static const u8 DexDescription_Wobbuffet_2[] = _( static const u8 DexDescription_Wobbuffet_1[] = _( "If two or more WOBBUFFET meet, they will\n" "turn competitive and try to outdo each\n" - "other’s endurance."); + "other's endurance."); static const u8 DexDescription_Wobbuffet_2[] = _( "However, they may try to see which one\n" "can endure the longest without food.\n" @@ -2342,15 +2342,15 @@ static const u8 DexDescription_Wobbuffet_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Girafarig_1[] = _( - "GIRAFARIG’s rear head contains a tiny\n" + "GIRAFARIG's rear head contains a tiny\n" "brain that is too small for thinking.\n" - "However, the rear head doesn’t need to"); + "However, the rear head doesn't need to"); static const u8 DexDescription_Girafarig_2[] = _( "sleep, so it can keep watch over its\n" "surroundings 24 hours a day."); #else static const u8 DexDescription_Girafarig_1[] = _( - "GIRAFARIG’s rear head also has a brain,\n" + "GIRAFARIG's rear head also has a brain,\n" "but it is small. The rear head attacks in\n" "response to smells and sounds."); static const u8 DexDescription_Girafarig_2[] = _( @@ -2374,7 +2374,7 @@ static const u8 DexDescription_Forretress_1[] = _( "when the POKéMON is catching prey,"); static const u8 DexDescription_Forretress_2[] = _( "but it does so at such a quick pace\n" - "that the shell’s inside cannot be seen."); + "that the shell's inside cannot be seen."); static const u8 DexDescription_Dunsparce_1[] = _( "DUNSPARCE has a drill for its tail.\n" @@ -2397,7 +2397,7 @@ static const u8 DexDescription_Gligar_2[] = _( static const u8 DexDescription_Steelix_1[] = _( "STEELIX lives even further underground\n" "than ONIX. This POKéMON is known to dig\n" - "towards the earth’s core."); + "towards the earth's core."); static const u8 DexDescription_Steelix_2[] = _( "There are records of this POKéMON\n" "reaching a depth of over six-tenths\n" @@ -2458,7 +2458,7 @@ static const u8 DexDescription_Heracross_2[] = _( #else static const u8 DexDescription_Heracross_1[] = _( "HERACROSS charges in a straight line at\n" - "its foe, slips beneath the foe’s grasp,\n" + "its foe, slips beneath the foe's grasp,\n" "and then scoops up and hurls the"); static const u8 DexDescription_Heracross_2[] = _( "opponent with its mighty horn.\n" @@ -2495,14 +2495,14 @@ static const u8 DexDescription_Ursaring_2[] = _( static const u8 DexDescription_Slugma_1[] = _( "SLUGMA does not have any blood in its\n" "body. Instead, intensely hot magma\n" - "circulates throughout this POKéMON’s"); + "circulates throughout this POKéMON's"); static const u8 DexDescription_Slugma_2[] = _( "body, carrying essential nutrients and\n" "oxygen to its organs."); #else static const u8 DexDescription_Slugma_1[] = _( "Molten magma courses throughout\n" - "SLUGMA’s circulatory system.\n" + "SLUGMA's circulatory system.\n" "If this POKéMON is chilled, the magma"); static const u8 DexDescription_Slugma_2[] = _( "cools and hardens. Its body turns\n" @@ -2512,7 +2512,7 @@ static const u8 DexDescription_Slugma_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Magcargo_1[] = _( - "MAGCARGO’s body temperature is\n" + "MAGCARGO's body temperature is\n" "approximately 18,000 degrees F.\n" "Water is vaporized on contact."); static const u8 DexDescription_Magcargo_2[] = _( @@ -2521,7 +2521,7 @@ static const u8 DexDescription_Magcargo_2[] = _( "steam, cloaking the area in a thick fog."); #else static const u8 DexDescription_Magcargo_1[] = _( - "MAGCARGO’s shell is actually its skin\n" + "MAGCARGO's shell is actually its skin\n" "that hardened as a result of cooling.\n" "Its shell is very brittle and fragile -"); static const u8 DexDescription_Magcargo_2[] = _( @@ -2557,7 +2557,7 @@ static const u8 DexDescription_Corsola_2[] = _( "POKéMON migrates to the southern seas."); #else static const u8 DexDescription_Corsola_1[] = _( - "CORSOLA’s branches glitter very\n" + "CORSOLA's branches glitter very\n" "beautifully in seven colors when they\n" "catch sunlight."); static const u8 DexDescription_Corsola_2[] = _( @@ -2593,14 +2593,14 @@ static const u8 DexDescription_Delibird_2[] = _( static const u8 DexDescription_Mantine_1[] = _( "On sunny days, schools of MANTINE can\n" "be seen elegantly leaping over the\n" - "sea’s waves."); + "sea's waves."); static const u8 DexDescription_Mantine_2[] = _( "This POKéMON is not bothered by the\n" "REMORAID that hitches rides."); #ifdef SAPPHIRE static const u8 DexDescription_Skarmory_1[] = _( - "SKARMORY’s steel wings become tattered\n" + "SKARMORY's steel wings become tattered\n" "and bashed in from repeated battles.\n" "Once a year, the battered wings grow"); static const u8 DexDescription_Skarmory_2[] = _( @@ -2621,7 +2621,7 @@ static const u8 DexDescription_Houndour_1[] = _( "They communicate with each other using\n" "a variety of cries to corner their prey."); static const u8 DexDescription_Houndour_2[] = _( - "This POKéMON’s remarkable teamwork is\n" + "This POKéMON's remarkable teamwork is\n" "unparalleled."); static const u8 DexDescription_Houndoom_1[] = _( @@ -2679,12 +2679,12 @@ static const u8 DexDescription_Donphan_2[] = _( "that block mountain trails."); #else static const u8 DexDescription_Donphan_1[] = _( - "DONPHAN’s favorite attack is curling\n" + "DONPHAN's favorite attack is curling\n" "its body into a ball, then charging at\n" "its foe while rolling at high speed."); static const u8 DexDescription_Donphan_2[] = _( "Once it starts rolling, this POKéMON\n" - "can’t stop very easily."); + "can't stop very easily."); #endif static const u8 DexDescription_Porygon2_1[] = _( @@ -2697,7 +2697,7 @@ static const u8 DexDescription_Porygon2_2[] = _( "on its own."); static const u8 DexDescription_Stantler_1[] = _( - "STANTLER’s magnificent antlers were\n" + "STANTLER's magnificent antlers were\n" "traded at high prices as works of art.\n" "As a result, this POKéMON was hunted"); static const u8 DexDescription_Stantler_2[] = _( @@ -2735,7 +2735,7 @@ static const u8 DexDescription_Smoochum_1[] = _( "Whenever the chance arrives, it will"); static const u8 DexDescription_Smoochum_2[] = _( "look for its reflection to make sure its\n" - "face hasn’t become dirty."); + "face hasn't become dirty."); static const u8 DexDescription_Elekid_1[] = _( "ELEKID stores electricity in its body.\n" @@ -2746,7 +2746,7 @@ static const u8 DexDescription_Elekid_2[] = _( "in circles to recharge itself."); static const u8 DexDescription_Magby_1[] = _( - "MAGBY’s state of health is determined\n" + "MAGBY's state of health is determined\n" "by observing the fire it breathes.\n" "If the POKéMON is spouting yellow"); static const u8 DexDescription_Magby_2[] = _( @@ -2759,7 +2759,7 @@ static const u8 DexDescription_Miltank_1[] = _( "on a daily basis. Its sweet milk is\n" "enjoyed by children and grown-ups alike."); static const u8 DexDescription_Miltank_2[] = _( - "People who can’t drink milk turn it into\n" + "People who can't drink milk turn it into\n" "yogurt and eat it instead."); static const u8 DexDescription_Blissey_1[] = _( @@ -2801,7 +2801,7 @@ static const u8 DexDescription_Larvitar_1[] = _( "must eat its way through the soil above."); static const u8 DexDescription_Larvitar_2[] = _( "Until it does so, LARVITAR cannot see\n" - "its parent’s face."); + "its parent's face."); static const u8 DexDescription_Pupitar_1[] = _( "PUPITAR creates a gas inside its body\n" @@ -2821,7 +2821,7 @@ static const u8 DexDescription_Tyranitar_2[] = _( "fight."); static const u8 DexDescription_Lugia_1[] = _( - "LUGIA’s wings pack devastating power -\n" + "LUGIA's wings pack devastating power -\n" "a light fluttering of its wings can blow\n" "apart regular houses."); static const u8 DexDescription_Lugia_2[] = _( @@ -2829,7 +2829,7 @@ static const u8 DexDescription_Lugia_2[] = _( "live out of sight deep under the sea."); static const u8 DexDescription_HoOh_1[] = _( - "HO-OH’s feathers glow in seven colors\n" + "HO-OH's feathers glow in seven colors\n" "depending on the angle at which they\n" "are struck by light."); static const u8 DexDescription_HoOh_2[] = _( @@ -2873,7 +2873,7 @@ static const u8 DexDescription_Grovyle_2[] = _( "fast they may be."); #else static const u8 DexDescription_Grovyle_1[] = _( - "The leaves growing out of GROVYLE’s\n" + "The leaves growing out of GROVYLE's\n" "body are convenient for camouflaging\n" "it from enemies in the forest."); static const u8 DexDescription_Grovyle_2[] = _( @@ -2891,7 +2891,7 @@ static const u8 DexDescription_Sceptile_2[] = _( "forest with loving care."); #else static const u8 DexDescription_Sceptile_1[] = _( - "The leaves growing on SCEPTILE’s body\n" + "The leaves growing on SCEPTILE's body\n" "are very sharp edged. This POKéMON is\n" "very agile - it leaps all over the"); static const u8 DexDescription_Sceptile_2[] = _( @@ -2924,7 +2924,7 @@ static const u8 DexDescription_Combusken_1[] = _( "hot flames it spews from its beak and\n" "with outstandingly destructive kicks."); static const u8 DexDescription_Combusken_2[] = _( - "This POKéMON’s cry is very loud and\n" + "This POKéMON's cry is very loud and\n" "distracting."); #else static const u8 DexDescription_Combusken_1[] = _( @@ -2932,7 +2932,7 @@ static const u8 DexDescription_Combusken_1[] = _( "thighs by running through fields and\n" "mountains."); static const u8 DexDescription_Combusken_2[] = _( - "This POKéMON’s legs possess both speed\n" + "This POKéMON's legs possess both speed\n" "and power, enabling it to dole out ten\n" "kicks in one second."); #endif @@ -2943,7 +2943,7 @@ static const u8 DexDescription_Blaziken_1[] = _( "it can easily clear a 30-story building\n" "in one leap."); static const u8 DexDescription_Blaziken_2[] = _( - "This POKéMON’s blazing punches leave\n" + "This POKéMON's blazing punches leave\n" "its foes scorched and blackened."); #else static const u8 DexDescription_Blaziken_1[] = _( @@ -2952,7 +2952,7 @@ static const u8 DexDescription_Blaziken_1[] = _( "courageously."); static const u8 DexDescription_Blaziken_2[] = _( "The stronger the foe, the more\n" - "intensely this POKéMON’s wrists burn."); + "intensely this POKéMON's wrists burn."); #endif #ifdef SAPPHIRE @@ -2966,7 +2966,7 @@ static const u8 DexDescription_Mudkip_2[] = _( "bigger than itself."); #else static const u8 DexDescription_Mudkip_1[] = _( - "The fin on MUDKIP’s head acts as highly\n" + "The fin on MUDKIP's head acts as highly\n" "sensitive radar. Using this fin to sense\n" "movements of water and air, this"); static const u8 DexDescription_Mudkip_2[] = _( @@ -2978,13 +2978,13 @@ static const u8 DexDescription_Mudkip_2[] = _( static const u8 DexDescription_Marshtomp_1[] = _( "MARSHTOMP is much faster at traveling\n" "through mud than it is at swimming.\n" - "This POKéMON’s hindquarters exhibit"); + "This POKéMON's hindquarters exhibit"); static const u8 DexDescription_Marshtomp_2[] = _( "obvious development, giving it the\n" "ability to walk on just its hind legs."); #else static const u8 DexDescription_Marshtomp_1[] = _( - "The surface of MARSHTOMP’s body is\n" + "The surface of MARSHTOMP's body is\n" "enveloped by a thin, sticky film that\n" "enables it to live on land."); static const u8 DexDescription_Marshtomp_2[] = _( @@ -3050,7 +3050,7 @@ static const u8 DexDescription_Mightyena_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Zigzagoon_1[] = _( - "The hair on ZIGZAGOON’s back is \n" + "The hair on ZIGZAGOON's back is \n" "bristly. It rubs the hard back hair\n" "against trees to leave its territorial"); static const u8 DexDescription_Zigzagoon_2[] = _( @@ -3100,7 +3100,7 @@ static const u8 DexDescription_Wurmple_1[] = _( "WURMPLE peels the bark off trees and\n" "feeds on the sap that oozes out."); static const u8 DexDescription_Wurmple_2[] = _( - "This POKéMON’s feet are tipped with\n" + "This POKéMON's feet are tipped with\n" "suction pads that allow it to cling to\n" "glass without slipping."); #endif @@ -3135,7 +3135,7 @@ static const u8 DexDescription_Beautifly_2[] = _( "it flits around gathering pollen."); #else static const u8 DexDescription_Beautifly_1[] = _( - "BEAUTIFLY’s favorite food is the sweet\n" + "BEAUTIFLY's favorite food is the sweet\n" "pollen of flowers. If you want to see\n" "this POKéMON, just leave a potted"); static const u8 DexDescription_Beautifly_2[] = _( @@ -3203,11 +3203,11 @@ static const u8 DexDescription_Lotad_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Lombre_1[] = _( - "LOMBRE’s entire body is covered by a\n" + "LOMBRE's entire body is covered by a\n" "slippery, slimy film. It feels horribly\n" "unpleasant to be touched by this"); static const u8 DexDescription_Lombre_2[] = _( - "POKéMON’s hands.\n" + "POKéMON's hands.\n" "LOMBRE is often mistaken for a human\n" "child."); #else @@ -3224,7 +3224,7 @@ static const u8 DexDescription_Lombre_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Ludicolo_1[] = _( "Upon hearing an upbeat and cheerful\n" - "rhythm, the cells in LUDICOLO’s body\n" + "rhythm, the cells in LUDICOLO's body\n" "become very energetic and active."); static const u8 DexDescription_Ludicolo_2[] = _( "Even in battle, this POKéMON will\n" @@ -3256,14 +3256,14 @@ static const u8 DexDescription_Seedot_1[] = _( static const u8 DexDescription_Seedot_2[] = _( "hanging off the branch.\n" "The more water it drinks, the glossier\n" - "this POKéMON’s body becomes."); + "this POKéMON's body becomes."); #endif #ifdef SAPPHIRE static const u8 DexDescription_Nuzleaf_1[] = _( "This POKéMON pulls out the leaf on its\n" "head and makes a flute with it.\n" - "The sound of NUZLEAF’s flute strikes"); + "The sound of NUZLEAF's flute strikes"); static const u8 DexDescription_Nuzleaf_2[] = _( "fear and uncertainty in the hearts of\n" "people lost in a forest."); @@ -3279,7 +3279,7 @@ static const u8 DexDescription_Nuzleaf_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Shiftry_1[] = _( - "SHIFTRY’s large fans generate awesome\n" + "SHIFTRY's large fans generate awesome\n" "gusts of wind at a speed close to 100\n" "feet per second. The whipped-up wind"); static const u8 DexDescription_Shiftry_2[] = _( @@ -3322,7 +3322,7 @@ static const u8 DexDescription_Swellow_1[] = _( "Once two SWELLOW are gathered, they"); static const u8 DexDescription_Swellow_2[] = _( "diligently take care of cleaning each\n" - "other’s wings."); + "other's wings."); #else static const u8 DexDescription_Swellow_1[] = _( "SWELLOW flies high above our heads,\n" @@ -3330,7 +3330,7 @@ static const u8 DexDescription_Swellow_1[] = _( "This POKéMON dives at a steep angle as"); static const u8 DexDescription_Swellow_2[] = _( "soon as it spots its prey. The hapless\n" - "prey is tightly grasped by SWELLOW’s\n" + "prey is tightly grasped by SWELLOW's\n" "clawed feet, preventing escape."); #endif @@ -3340,7 +3340,7 @@ static const u8 DexDescription_Wingull_1[] = _( "sea by extending its long and narrow\n" "wings to glide."); static const u8 DexDescription_Wingull_2[] = _( - "This POKéMON’s long beak is useful for\n" + "This POKéMON's long beak is useful for\n" "catching prey."); #else static const u8 DexDescription_Wingull_1[] = _( @@ -3447,7 +3447,7 @@ static const u8 DexDescription_Surskit_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Masquerain_1[] = _( - "MASQUERAIN’s antennas have eyelike\n" + "MASQUERAIN's antennas have eyelike\n" "patterns that usually give it an angry\n" "look. If the “eyes” are droopy and"); static const u8 DexDescription_Masquerain_2[] = _( @@ -3470,7 +3470,7 @@ static const u8 DexDescription_Shroomish_1[] = _( "its body and scatters spores from the\n" "top of its head."); static const u8 DexDescription_Shroomish_2[] = _( - "This POKéMON’s spores are so toxic,\n" + "This POKéMON's spores are so toxic,\n" "they make trees and weeds wilt."); #else static const u8 DexDescription_Shroomish_1[] = _( @@ -3484,11 +3484,11 @@ static const u8 DexDescription_Shroomish_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Breloom_1[] = _( - "The seeds ringing BRELOOM’s tail are\n" + "The seeds ringing BRELOOM's tail are\n" "made of hardened toxic spores. It is\n" "horrible to eat the seeds."); static const u8 DexDescription_Breloom_2[] = _( - "Just taking a bite of this POKéMON’s\n" + "Just taking a bite of this POKéMON's\n" "seed will cause your stomach to rumble."); #else static const u8 DexDescription_Breloom_1[] = _( @@ -3496,13 +3496,13 @@ static const u8 DexDescription_Breloom_1[] = _( "and sprightly footwork, then throws\n" "punches with its stretchy arms."); static const u8 DexDescription_Breloom_2[] = _( - "This POKéMON’s fighting technique puts\n" + "This POKéMON's fighting technique puts\n" "boxers to shame."); #endif #ifdef SAPPHIRE static const u8 DexDescription_Slakoth_1[] = _( - "SLAKOTH’s heart beats just once a\n" + "SLAKOTH's heart beats just once a\n" "minute. Whatever happens, it is\n" "content to loaf around motionless."); static const u8 DexDescription_Slakoth_2[] = _( @@ -3514,7 +3514,7 @@ static const u8 DexDescription_Slakoth_1[] = _( "hours every day. Because it moves so\n" "little, it does not need much food."); static const u8 DexDescription_Slakoth_2[] = _( - "This POKéMON’s sole daily meal consists\n" + "This POKéMON's sole daily meal consists\n" "of just three leaves."); #endif @@ -3530,11 +3530,11 @@ static const u8 DexDescription_Vigoroth_2[] = _( #else static const u8 DexDescription_Vigoroth_1[] = _( "VIGOROTH is always itching and agitated\n" - "to go on a wild rampage. It simply can’t\n" + "to go on a wild rampage. It simply can't\n" "tolerate sitting still for even a minute."); static const u8 DexDescription_Vigoroth_2[] = _( - "This POKéMON’s stress level rises if it\n" - "can’t be moving constantly."); + "This POKéMON's stress level rises if it\n" + "can't be moving constantly."); #endif #ifdef SAPPHIRE @@ -3562,7 +3562,7 @@ static const u8 DexDescription_Nincada_1[] = _( "sharp claws to carve the roots of trees\n" "and absorb moisture and nutrients."); static const u8 DexDescription_Nincada_2[] = _( - "This POKéMON can’t withstand bright\n" + "This POKéMON can't withstand bright\n" "sunlight so avoids it."); #else static const u8 DexDescription_Nincada_1[] = _( @@ -3582,7 +3582,7 @@ static const u8 DexDescription_Ninjask_1[] = _( static const u8 DexDescription_Ninjask_2[] = _( "Because of this quality, this POKéMON\n" "is said to be one that puts the\n" - "TRAINER’s abilities to the test."); + "TRAINER's abilities to the test."); #else static const u8 DexDescription_Ninjask_1[] = _( "NINJASK moves around at such a high\n" @@ -3600,10 +3600,10 @@ static const u8 DexDescription_Shedinja_1[] = _( "BALL after a NINCADA evolves."); static const u8 DexDescription_Shedinja_2[] = _( "This bizarre POKéMON is entirely\n" - "immobile - it doesn’t even breathe."); + "immobile - it doesn't even breathe."); #else static const u8 DexDescription_Shedinja_1[] = _( - "SHEDINJA’s hard body doesn’t move -\n" + "SHEDINJA's hard body doesn't move -\n" "not even a twitch. In fact, its body\n" "appears to be merely a hollow shell."); static const u8 DexDescription_Shedinja_2[] = _( @@ -3622,7 +3622,7 @@ static const u8 DexDescription_Whismur_2[] = _( "POKéMON goes to sleep, all tired out."); #else static const u8 DexDescription_Whismur_1[] = _( - "Normally, WHISMUR’s voice is very quiet -\n" + "Normally, WHISMUR's voice is very quiet -\n" "it is barely audible even if one is\n" "paying close attention."); static const u8 DexDescription_Whismur_2[] = _( @@ -3641,11 +3641,11 @@ static const u8 DexDescription_Loudred_2[] = _( "to be a weak point."); #else static const u8 DexDescription_Loudred_1[] = _( - "LOUDRED’s bellowing can completely\n" + "LOUDRED's bellowing can completely\n" "decimate a wood-frame house. It uses\n" "its voice to punish its foes."); static const u8 DexDescription_Loudred_2[] = _( - "This POKéMON’s round ears serve as\n" + "This POKéMON's round ears serve as\n" "loudspeakers."); #endif @@ -3663,7 +3663,7 @@ static const u8 DexDescription_Exploud_1[] = _( "tremors it creates by bellowing. If this\n" "POKéMON violently inhales from the"); static const u8 DexDescription_Exploud_2[] = _( - "ports on its body, it’s a sign that it is\n" + "ports on its body, it's a sign that it is\n" "preparing to let loose a huge bellow."); #endif @@ -3689,7 +3689,7 @@ static const u8 DexDescription_Makuhita_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Hariyama_1[] = _( - "HARIYAMA’s thick body may appear fat,\n" + "HARIYAMA's thick body may appear fat,\n" "but it is actually a hunk of solid muscle.\n" "If this POKéMON bears down and"); static const u8 DexDescription_Hariyama_2[] = _( @@ -3699,7 +3699,7 @@ static const u8 DexDescription_Hariyama_2[] = _( static const u8 DexDescription_Hariyama_1[] = _( "HARIYAMA practices its straight-arm\n" "slaps in any number of locations.\n" - "One hit of this POKéMON’s powerful,"); + "One hit of this POKéMON's powerful,"); static const u8 DexDescription_Hariyama_2[] = _( "openhanded, straight-arm punches\n" "could snap a telephone pole in two."); @@ -3707,7 +3707,7 @@ static const u8 DexDescription_Hariyama_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Azurill_1[] = _( - "AZURILL’s tail is large and bouncy.\n" + "AZURILL's tail is large and bouncy.\n" "It is packed full of the nutrients this\n" "POKéMON needs to grow."); static const u8 DexDescription_Azurill_2[] = _( @@ -3735,7 +3735,7 @@ static const u8 DexDescription_Nosepass_2[] = _( "little over 3/8 of an inch every year."); #else static const u8 DexDescription_Nosepass_1[] = _( - "NOSEPASS’s magnetic nose is always\n" + "NOSEPASS's magnetic nose is always\n" "pointed to the north. If two of these\n" "POKéMON meet, they cannot turn"); static const u8 DexDescription_Nosepass_2[] = _( @@ -3787,7 +3787,7 @@ static const u8 DexDescription_Sableye_1[] = _( "claws to find rocks that it eats.\n" "Substances in the eaten rocks"); static const u8 DexDescription_Sableye_2[] = _( - "crystallize and rise up to the POKéMON’s\n" + "crystallize and rise up to the POKéMON's\n" "body surface."); #else static const u8 DexDescription_Sableye_1[] = _( @@ -3802,8 +3802,8 @@ static const u8 DexDescription_Sableye_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Mawile_1[] = _( - "Don’t be taken in by this POKéMON’s\n" - "cute face - it’s very dangerous. MAWILE\n" + "Don't be taken in by this POKéMON's\n" + "cute face - it's very dangerous. MAWILE\n" "fools the foe into letting down its"); static const u8 DexDescription_Mawile_2[] = _( "guard, then chomps down with its\n" @@ -3812,7 +3812,7 @@ static const u8 DexDescription_Mawile_2[] = _( #else #if REVISION >= 1 static const u8 DexDescription_Mawile_1[] = _( - "MAWILE’s huge jaws are actually steel\n" + "MAWILE's huge jaws are actually steel\n" "horns that have been transformed.\n" "Its docile-looking face serves to lull"); static const u8 DexDescription_Mawile_2[] = _( @@ -3821,7 +3821,7 @@ static const u8 DexDescription_Mawile_2[] = _( "chomps it with its gaping jaws."); #else static const u8 DexDescription_Mawile_1[] = _( - "MAWHILE’s huge jaws are actually steel\n" + "MAWHILE's huge jaws are actually steel\n" "horns that have been transformed.\n" "Its docile-looking face serves to lull"); static const u8 DexDescription_Mawile_2[] = _( @@ -3893,7 +3893,7 @@ static const u8 DexDescription_Meditite_1[] = _( "just one berry a day."); static const u8 DexDescription_Meditite_2[] = _( "Minimal eating is another aspect of\n" - "this POKéMON’s training."); + "this POKéMON's training."); #else static const u8 DexDescription_Meditite_1[] = _( "MEDITITE undertakes rigorous mental\n" @@ -3931,7 +3931,7 @@ static const u8 DexDescription_Electrike_1[] = _( "eye can follow. The friction from\n" "running is converted into electricity,"); static const u8 DexDescription_Electrike_2[] = _( - "which is then stored in this POKéMON’s\n" + "which is then stored in this POKéMON's\n" "fur."); #else static const u8 DexDescription_Electrike_1[] = _( @@ -4001,7 +4001,7 @@ static const u8 DexDescription_Minun_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Volbeat_1[] = _( - "VOLBEAT’s tail glows like a lightbulb.\n" + "VOLBEAT's tail glows like a lightbulb.\n" "With other VOLBEAT, it uses its tail to\n" "draw geometric shapes in the night sky."); static const u8 DexDescription_Volbeat_2[] = _( @@ -4043,7 +4043,7 @@ static const u8 DexDescription_Roselia_1[] = _( "is said to appear with its flowers in\n" "unusual colors."); static const u8 DexDescription_Roselia_2[] = _( - "The thorns on this POKéMON’s head\n" + "The thorns on this POKéMON's head\n" "contain a vicious poison."); #else static const u8 DexDescription_Roselia_1[] = _( @@ -4057,19 +4057,19 @@ static const u8 DexDescription_Roselia_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Gulpin_1[] = _( - "Most of GULPIN’s body is made up of its\n" + "Most of GULPIN's body is made up of its\n" "stomach - its heart and brain are very\n" "small in comparison."); static const u8 DexDescription_Gulpin_2[] = _( - "This POKéMON’s stomach contains\n" + "This POKéMON's stomach contains\n" "special enzymes that dissolve anything."); #else static const u8 DexDescription_Gulpin_1[] = _( - "Virtually all of GULPIN’s body is its\n" + "Virtually all of GULPIN's body is its\n" "stomach. As a result, it can swallow\n" "something its own size."); static const u8 DexDescription_Gulpin_2[] = _( - "This POKéMON’s stomach contains a\n" + "This POKéMON's stomach contains a\n" "special fluid that digests anything."); #endif @@ -4080,7 +4080,7 @@ static const u8 DexDescription_Swalot_1[] = _( "Its cavernous mouth yawns widely."); static const u8 DexDescription_Swalot_2[] = _( "An automobile tire could easily fit\n" - "inside this POKéMON’s mouth."); + "inside this POKéMON's mouth."); #else static const u8 DexDescription_Swalot_1[] = _( "When SWALOT spots prey, it spurts out\n" @@ -4094,7 +4094,7 @@ static const u8 DexDescription_Swalot_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Carvanha_1[] = _( - "If anything invades CARVANHA’s\n" + "If anything invades CARVANHA's\n" "territory, it will swarm and tear at the\n" "intruder with its pointed fangs."); static const u8 DexDescription_Carvanha_2[] = _( @@ -4102,7 +4102,7 @@ static const u8 DexDescription_Carvanha_2[] = _( "suddenly timid."); #else static const u8 DexDescription_Carvanha_1[] = _( - "CARVANHA’s strongly developed jaws\n" + "CARVANHA's strongly developed jaws\n" "and its sharply pointed fangs pack the\n" "destructive power to rip out boat hulls."); static const u8 DexDescription_Carvanha_2[] = _( @@ -4116,7 +4116,7 @@ static const u8 DexDescription_Sharpedo_1[] = _( "75 mph by jetting seawater out of its\n" "backside."); static const u8 DexDescription_Sharpedo_2[] = _( - "This POKéMON’s drawback is its inability\n" + "This POKéMON's drawback is its inability\n" "to swim long distances."); #else static const u8 DexDescription_Sharpedo_1[] = _( @@ -4140,7 +4140,7 @@ static const u8 DexDescription_Wailmer_2[] = _( "bounces."); #else static const u8 DexDescription_Wailmer_1[] = _( - "WAILMER’s nostrils are located above\n" + "WAILMER's nostrils are located above\n" "its eyes. This playful POKéMON loves\n" "to startle people by forcefully snorting"); static const u8 DexDescription_Wailmer_2[] = _( @@ -4174,22 +4174,22 @@ static const u8 DexDescription_Numel_1[] = _( "degrees F within its body. If it gets\n" "wet, the magma cools and hardens."); static const u8 DexDescription_Numel_2[] = _( - "In that event, the POKéMON’s body\n" + "In that event, the POKéMON's body\n" "grows heavy and its movements become\n" "sluggish."); #else static const u8 DexDescription_Numel_1[] = _( "NUMEL is extremely dull witted - it\n" - "doesn’t notice being hit. However, it\n" - "can’t stand hunger for even a second."); + "doesn't notice being hit. However, it\n" + "can't stand hunger for even a second."); static const u8 DexDescription_Numel_2[] = _( - "This POKéMON’s body is a seething\n" + "This POKéMON's body is a seething\n" "cauldron of boiling magma."); #endif #ifdef SAPPHIRE static const u8 DexDescription_Camerupt_1[] = _( - "The humps on CAMERUPT’s back are\n" + "The humps on CAMERUPT's back are\n" "formed by a transformation of its\n" "bones. They sometimes blast out molten"); static const u8 DexDescription_Camerupt_2[] = _( @@ -4202,7 +4202,7 @@ static const u8 DexDescription_Camerupt_1[] = _( "through its body."); static const u8 DexDescription_Camerupt_2[] = _( "Occasionally, the humps on this\n" - "POKéMON’s back erupt, spewing the\n" + "POKéMON's back erupt, spewing the\n" "superheated magma."); #endif @@ -4229,7 +4229,7 @@ static const u8 DexDescription_Torkoal_2[] = _( static const u8 DexDescription_Spoink_1[] = _( "SPOINK keeps a pearl on top of its head.\n" "The pearl functions to amplify this\n" - "POKéMON’s psychokinetic powers."); + "POKéMON's psychokinetic powers."); static const u8 DexDescription_Spoink_2[] = _( "It is therefore on a constant search\n" "for a bigger pearl."); @@ -4249,7 +4249,7 @@ static const u8 DexDescription_Grumpig_1[] = _( "body to wield its fantastic powers.\n" "When it is doing so, it dances bizarrely."); static const u8 DexDescription_Grumpig_2[] = _( - "This POKéMON’s black pearls are valuable\n" + "This POKéMON's black pearls are valuable\n" "as works of art."); #else static const u8 DexDescription_Grumpig_1[] = _( @@ -4292,7 +4292,7 @@ static const u8 DexDescription_Trapinch_2[] = _( "without access to any water."); #else static const u8 DexDescription_Trapinch_1[] = _( - "TRAPINCH’s nest is a sloped, bowl-like\n" + "TRAPINCH's nest is a sloped, bowl-like\n" "pit dug in sand. This POKéMON patiently\n" "waits for prey to tumble down the pit."); static const u8 DexDescription_Trapinch_2[] = _( @@ -4302,7 +4302,7 @@ static const u8 DexDescription_Trapinch_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Vibrava_1[] = _( - "VIBRAVA’s wings have not yet\n" + "VIBRAVA's wings have not yet\n" "completed the process of growing.\n" "Rather than flying long distances,"); static const u8 DexDescription_Vibrava_2[] = _( @@ -4314,7 +4314,7 @@ static const u8 DexDescription_Vibrava_1[] = _( "ultrasonic waves by vigorously making\n" "its two wings vibrate."); static const u8 DexDescription_Vibrava_2[] = _( - "This POKéMON’s ultrasonic waves are so\n" + "This POKéMON's ultrasonic waves are so\n" "powerful, they can bring on headaches\n" "in people."); #endif @@ -4425,7 +4425,7 @@ static const u8 DexDescription_Zangoose_2[] = _( static const u8 DexDescription_Zangoose_1[] = _( "Memories of battling its arch-rival\n" "SEVIPER are etched into every cell of\n" - "ZANGOOSE’s body."); + "ZANGOOSE's body."); static const u8 DexDescription_Zangoose_2[] = _( "This POKéMON adroitly dodges attacks\n" "with incredible agility."); @@ -4433,7 +4433,7 @@ static const u8 DexDescription_Zangoose_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Seviper_1[] = _( - "SEVIPER’s swordlike tail serves two\n" + "SEVIPER's swordlike tail serves two\n" "purposes - it slashes foes and douses\n" "them with secreted poison."); static const u8 DexDescription_Seviper_2[] = _( @@ -4455,7 +4455,7 @@ static const u8 DexDescription_Lunatone_1[] = _( "time of the full moon. Instead of\n" "walking, it moves by floating in midair."); static const u8 DexDescription_Lunatone_2[] = _( - "The POKéMON’s intimidating red eyes\n" + "The POKéMON's intimidating red eyes\n" "cause all those who see it to become\n" "transfixed with fear."); #else @@ -4470,7 +4470,7 @@ static const u8 DexDescription_Lunatone_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Solrock_1[] = _( - "Sunlight is the source of SOLROCK’s\n" + "Sunlight is the source of SOLROCK's\n" "power. It is said to possess the ability\n" "to read the emotions of others."); static const u8 DexDescription_Solrock_2[] = _( @@ -4488,16 +4488,16 @@ static const u8 DexDescription_Solrock_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Barboach_1[] = _( - "BARBOACH’s body is covered with a\n" + "BARBOACH's body is covered with a\n" "slimy film. If a foe grabs it, this\n" - "POKéMON just slips out of the enemy’s"); + "POKéMON just slips out of the enemy's"); static const u8 DexDescription_Barboach_2[] = _( "grip.\n" "This POKéMON grows weak if the slimy\n" "coating dries up."); #else static const u8 DexDescription_Barboach_1[] = _( - "BARBOACH’s sensitive whiskers serve\n" + "BARBOACH's sensitive whiskers serve\n" "as a superb radar system.\n" "This POKéMON hides in mud, leaving only"); static const u8 DexDescription_Barboach_2[] = _( @@ -4620,7 +4620,7 @@ static const u8 DexDescription_Lileep_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Cradily_1[] = _( - "CRADILY’s body serves as an anchor,\n" + "CRADILY's body serves as an anchor,\n" "preventing it from being washed away in\n" "rough seas."); static const u8 DexDescription_Cradily_2[] = _( @@ -4664,8 +4664,8 @@ static const u8 DexDescription_Armaldo_2[] = _( "more convenient for life on land."); #else static const u8 DexDescription_Armaldo_1[] = _( - "ARMALDO’s tough armor makes all attacks\n" - "bounce off. This POKéMON’s two\n" + "ARMALDO's tough armor makes all attacks\n" + "bounce off. This POKéMON's two\n" "enormous claws can be freely extended"); static const u8 DexDescription_Armaldo_2[] = _( "or contracted. They have the power to\n" @@ -4674,7 +4674,7 @@ static const u8 DexDescription_Armaldo_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Feebas_1[] = _( - "While FEEBAS’s body is in tatters,\n" + "While FEEBAS's body is in tatters,\n" "it has a hardy and tenacious life force\n" "that enables it to live anywhere."); static const u8 DexDescription_Feebas_2[] = _( @@ -4682,7 +4682,7 @@ static const u8 DexDescription_Feebas_2[] = _( "dimwitted, making it an easy catch."); #else static const u8 DexDescription_Feebas_1[] = _( - "FEEBAS’s fins are ragged and\n" + "FEEBAS's fins are ragged and\n" "tattered from the start of its life.\n" "Because of its shoddy appearance, this"); static const u8 DexDescription_Feebas_2[] = _( @@ -4694,7 +4694,7 @@ static const u8 DexDescription_Feebas_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Milotic_1[] = _( "MILOTIC live at the bottom of large\n" - "lakes. When this POKéMON’s body glows a\n" + "lakes. When this POKéMON's body glows a\n" "vivid pink, it releases a pulsing wave of"); static const u8 DexDescription_Milotic_2[] = _( "energy that brings soothing calm to\n" @@ -4715,11 +4715,11 @@ static const u8 DexDescription_Castform_1[] = _( "to transform itself into the guises of\n" "the sun, rain clouds, and snow clouds."); static const u8 DexDescription_Castform_2[] = _( - "This POKéMON’s feelings change with the\n" + "This POKéMON's feelings change with the\n" "weather."); #else static const u8 DexDescription_Castform_1[] = _( - "CASTFORM’s appearance changes with\n" + "CASTFORM's appearance changes with\n" "the weather.\n" "This POKéMON gained the ability to use"); static const u8 DexDescription_Castform_2[] = _( @@ -4743,7 +4743,7 @@ static const u8 DexDescription_Kecleon_1[] = _( "surroundings."); static const u8 DexDescription_Kecleon_2[] = _( "There is one exception - this POKéMON\n" - "can’t change the zigzag pattern on its\n" + "can't change the zigzag pattern on its\n" "belly."); #endif @@ -4763,7 +4763,7 @@ static const u8 DexDescription_Shuppet_1[] = _( static const u8 DexDescription_Shuppet_2[] = _( "vengeance, this POKéMON will appear\n" "in a swarm and line up beneath the eaves\n" - "of that person’s home."); + "of that person's home."); #endif #ifdef SAPPHIRE @@ -4772,7 +4772,7 @@ static const u8 DexDescription_Banette_1[] = _( "of a discarded and forgotten plush doll,\n" "giving it new life as BANETTE."); static const u8 DexDescription_Banette_2[] = _( - "The POKéMON’s energy would escape if it\n" + "The POKéMON's energy would escape if it\n" "were to ever open its mouth."); #else static const u8 DexDescription_Banette_1[] = _( @@ -4811,10 +4811,10 @@ static const u8 DexDescription_Dusclops_1[] = _( static const u8 DexDescription_Dusclops_2[] = _( "in a macabre manner and by bringing its\n" "single eye to bear. The hypnotized foe\n" - "is made to do DUSCLOPS’s bidding."); + "is made to do DUSCLOPS's bidding."); #else static const u8 DexDescription_Dusclops_1[] = _( - "DUSCLOPS’s body is completely hollow -\n" + "DUSCLOPS's body is completely hollow -\n" "there is nothing at all inside.\n" "It is said that its body is like a black"); static const u8 DexDescription_Dusclops_2[] = _( @@ -4834,7 +4834,7 @@ static const u8 DexDescription_Tropius_2[] = _( "wings."); #else static const u8 DexDescription_Tropius_1[] = _( - "The bunches of fruit around TROPIUS’s\n" + "The bunches of fruit around TROPIUS's\n" "neck are very popular with children.\n" "This POKéMON loves fruit, and eats it"); static const u8 DexDescription_Tropius_2[] = _( @@ -4960,7 +4960,7 @@ static const u8 DexDescription_Sealeo_1[] = _( "things on the tip of its nose. While the\n" "POKéMON is rolling something, it checks"); static const u8 DexDescription_Sealeo_2[] = _( - "the object’s aroma and texture to\n" + "the object's aroma and texture to\n" "determine whether it likes the object\n" "or not."); #else @@ -4984,11 +4984,11 @@ static const u8 DexDescription_Walrein_2[] = _( "attacks bounce off harmlessly."); #else static const u8 DexDescription_Walrein_1[] = _( - "WALREIN’s two massively developed\n" + "WALREIN's two massively developed\n" "tusks can totally shatter blocks of\n" "ice weighing ten tons with one blow."); static const u8 DexDescription_Walrein_2[] = _( - "This POKéMON’s thick coat of blubber\n" + "This POKéMON's thick coat of blubber\n" "insulates it from subzero temperatures."); #endif @@ -5002,18 +5002,18 @@ static const u8 DexDescription_Clamperl_2[] = _( "POKéMON is getting close to evolution."); #else static const u8 DexDescription_Clamperl_1[] = _( - "CLAMPERL’s sturdy shell is not only good\n" + "CLAMPERL's sturdy shell is not only good\n" "for protection - it is also used for\n" "clamping and catching prey."); static const u8 DexDescription_Clamperl_2[] = _( - "A fully grown CLAMPERL’s shell will be\n" + "A fully grown CLAMPERL's shell will be\n" "scored with nicks and scratches all\n" "over."); #endif #ifdef SAPPHIRE static const u8 DexDescription_Huntail_1[] = _( - "HUNTAIL’s tail is shaped like a fish.\n" + "HUNTAIL's tail is shaped like a fish.\n" "It uses the tail to attract prey, then\n" "swallows the prey whole with its large,"); static const u8 DexDescription_Huntail_2[] = _( @@ -5022,11 +5022,11 @@ static const u8 DexDescription_Huntail_2[] = _( "slender body like a snake."); #else static const u8 DexDescription_Huntail_1[] = _( - "HUNTAIL’s presence went unnoticed by\n" + "HUNTAIL's presence went unnoticed by\n" "people for a long time because it lives\n" "at extreme depths in the sea."); static const u8 DexDescription_Huntail_2[] = _( - "This POKéMON’s eyes can see clearly\n" + "This POKéMON's eyes can see clearly\n" "even in the murky dark depths of the\n" "ocean."); #endif @@ -5038,7 +5038,7 @@ static const u8 DexDescription_Gorebyss_1[] = _( "it is also cruel. When it spots prey, this"); static const u8 DexDescription_Gorebyss_2[] = _( "POKéMON inserts its thin mouth into the\n" - "prey’s body and drains the prey of its\n" + "prey's body and drains the prey of its\n" "body fluids."); #else static const u8 DexDescription_Gorebyss_1[] = _( @@ -5047,7 +5047,7 @@ static const u8 DexDescription_Gorebyss_1[] = _( "withstand the enormous pressure of"); static const u8 DexDescription_Gorebyss_2[] = _( "water at incredible depths. Because of\n" - "this, this POKéMON’s body is unharmed\n" + "this, this POKéMON's body is unharmed\n" "by ordinary attacks."); #endif @@ -5055,7 +5055,7 @@ static const u8 DexDescription_Gorebyss_2[] = _( static const u8 DexDescription_Relicanth_1[] = _( "RELICANTH is a rare species that was\n" "discovered in deep-sea explorations.\n" - "This POKéMON’s body withstands the"); + "This POKéMON's body withstands the"); static const u8 DexDescription_Relicanth_2[] = _( "enormous water pressure of the ocean\n" "depths. Its body is covered in tough\n" @@ -5073,7 +5073,7 @@ static const u8 DexDescription_Relicanth_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Luvdisc_1[] = _( - "LUVDISC’s heart-shaped body is a\n" + "LUVDISC's heart-shaped body is a\n" "symbol of love and romance.\n" "It is said that any couple meeting this"); static const u8 DexDescription_Luvdisc_2[] = _( @@ -5086,7 +5086,7 @@ static const u8 DexDescription_Luvdisc_1[] = _( "earned its name by swimming after"); static const u8 DexDescription_Luvdisc_2[] = _( "loving couples it spotted in the\n" - "ocean’s waves."); + "ocean's waves."); #endif #ifdef SAPPHIRE @@ -5111,7 +5111,7 @@ static const u8 DexDescription_Bagon_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Shelgon_1[] = _( - "Covering SHELGON’s body are outgrowths\n" + "Covering SHELGON's body are outgrowths\n" "much like bones. The shell is very hard\n" "and bounces off enemy attacks."); static const u8 DexDescription_Shelgon_2[] = _( @@ -5119,11 +5119,11 @@ static const u8 DexDescription_Shelgon_2[] = _( "hides away in a cavern."); #else static const u8 DexDescription_Shelgon_1[] = _( - "Inside SHELGON’s armor-like shell, cells\n" + "Inside SHELGON's armor-like shell, cells\n" "are in the midst of transformation\n" "to create an entirely new body."); static const u8 DexDescription_Shelgon_2[] = _( - "This POKéMON’s shell is extremely heavy,\n" + "This POKéMON's shell is extremely heavy,\n" "making its movements sluggish."); #endif @@ -5143,7 +5143,7 @@ static const u8 DexDescription_Salamence_1[] = _( "wings. It is said that this powerful"); static const u8 DexDescription_Salamence_2[] = _( "desire triggered a sudden mutation in\n" - "this POKéMON’s cells, causing it to\n" + "this POKéMON's cells, causing it to\n" "sprout its magnificent wings."); #endif @@ -5151,7 +5151,7 @@ static const u8 DexDescription_Salamence_2[] = _( static const u8 DexDescription_Beldum_1[] = _( "BELDUM keeps itself floating by\n" "generating a magnetic force that\n" - "repels earth’s natural magnetism."); + "repels earth's natural magnetism."); static const u8 DexDescription_Beldum_2[] = _( "When it sleeps, this POKéMON anchors\n" "itself to a cliff using the hooks on\n" @@ -5159,7 +5159,7 @@ static const u8 DexDescription_Beldum_2[] = _( #else static const u8 DexDescription_Beldum_1[] = _( "Instead of blood, a powerful magnetic\n" - "force courses throughout BELDUM’s\n" + "force courses throughout BELDUM's\n" "body. This POKéMON communicates with"); static const u8 DexDescription_Beldum_2[] = _( "others by sending controlled pulses of\n" @@ -5207,7 +5207,7 @@ static const u8 DexDescription_Metagross_2[] = _( #ifdef SAPPHIRE static const u8 DexDescription_Regirock_1[] = _( - "REGIROCK’s body is composed entirely of\n" + "REGIROCK's body is composed entirely of\n" "rocks. Recently, a study made the\n" "startling discovery that the rocks"); static const u8 DexDescription_Regirock_2[] = _( @@ -5216,7 +5216,7 @@ static const u8 DexDescription_Regirock_2[] = _( #else static const u8 DexDescription_Regirock_1[] = _( "REGIROCK was sealed away by people\n" - "long ago. If this POKéMON’s body is\n" + "long ago. If this POKéMON's body is\n" "damaged in battle, it is said to seek"); static const u8 DexDescription_Regirock_2[] = _( "out suitable rocks on its own to repair\n" @@ -5234,8 +5234,8 @@ static const u8 DexDescription_Regice_2[] = _( "even if it is immersed in magma."); #else static const u8 DexDescription_Regice_1[] = _( - "REGICE’s body was made during an ice\n" - "age. The deep-frozen body can’t be\n" + "REGICE's body was made during an ice\n" + "age. The deep-frozen body can't be\n" "melted, even by fire."); static const u8 DexDescription_Regice_2[] = _( "This POKéMON controls frigid air of\n" @@ -5338,7 +5338,7 @@ static const u8 DexDescription_Groudon_2[] = _( static const u8 DexDescription_Rayquaza_1[] = _( "RAYQUAZA is said to have lived for\n" "hundreds of millions of years in the\n" - "earth’s ozone layer, above the clouds."); + "earth's ozone layer, above the clouds."); static const u8 DexDescription_Rayquaza_2[] = _( "Its existence had been completely\n" "unknown because it lived so high in\n" @@ -5346,7 +5346,7 @@ static const u8 DexDescription_Rayquaza_2[] = _( #else static const u8 DexDescription_Rayquaza_1[] = _( "RAYQUAZA lived for hundreds of millions\n" - "of years in the earth’s ozone layer, \n" + "of years in the earth's ozone layer, \n" "never descending to the ground."); static const u8 DexDescription_Rayquaza_2[] = _( "This POKéMON appears to feed on water\n" @@ -5385,7 +5385,7 @@ static const u8 DexDescription_Deoxys_1[] = _( "sudden mutation upon exposure to a\n" "laser beam and resulted in DEOXYS."); static const u8 DexDescription_Deoxys_2[] = _( - "The crystalline organ on this POKéMON’s\n" + "The crystalline organ on this POKéMON's\n" "chest appears to be its brain."); #endif diff --git a/src/data/text/easy_chat/groups/actions/words.h b/src/data/text/easy_chat/groups/actions/words.h index 231333963..dce635b9f 100644 --- a/src/data/text/easy_chat/groups/actions/words.h +++ b/src/data/text/easy_chat/groups/actions/words.h @@ -47,7 +47,7 @@ u8 gEasyChatGroupWords_Actions[] = _( "USE$" "USES$" "USING$" - "COULDN’T$" + "COULDN'T$" "CAPABLE$" "DISAPPEAR$" "APPEAR$" diff --git a/src/data/text/easy_chat/groups/battle/words.h b/src/data/text/easy_chat/groups/battle/words.h index 115848cf6..7ce24c9cd 100644 --- a/src/data/text/easy_chat/groups/battle/words.h +++ b/src/data/text/easy_chat/groups/battle/words.h @@ -12,7 +12,7 @@ u8 gEasyChatGroupWords_Battle[] = _( "WON$" "IF I WIN$" "WHEN I WIN$" - "CAN’T WIN$" + "CAN'T WIN$" "CAN WIN$" "NO MATCH$" "SPIRIT$" diff --git a/src/data/text/easy_chat/groups/endings/words.h b/src/data/text/easy_chat/groups/endings/words.h index 60a40c5ba..49e6b76f7 100644 --- a/src/data/text/easy_chat/groups/endings/words.h +++ b/src/data/text/easy_chat/groups/endings/words.h @@ -14,26 +14,26 @@ u8 gEasyChatGroupWords_Endings[] = _( "LIKELY TO$" "WOULD$" "IS$" - "ISN’T IT?$" - "LET’S$" + "ISN'T IT?$" + "LET'S$" "OTHER$" "ARE$" "WAS$" "WERE$" "THOSE$" - "ISN’T$" - "WON’T$" - "CAN’T$" + "ISN'T$" + "WON'T$" + "CAN'T$" "CAN$" - "DON’T$" + "DON'T$" "DO$" "DOES$" "WHOM$" "WHICH$" - "WASN’T$" - "WEREN’T$" + "WASN'T$" + "WEREN'T$" "HAVE$" - "HAVEN’T$" + "HAVEN'T$" "A$" "AN$" "NOT$" @@ -62,8 +62,8 @@ u8 gEasyChatGroupWords_Endings[] = _( "TOO$" "LIKE$" "DID$" - "DIDN’T$" - "DOESN’T$" + "DIDN'T$" + "DOESN'T$" "WITHOUT$" "AFTER$" "BEFORE$" diff --git a/src/data/text/easy_chat/groups/greetings/words.h b/src/data/text/easy_chat/groups/greetings/words.h index 89bb986b5..489d3210c 100644 --- a/src/data/text/easy_chat/groups/greetings/words.h +++ b/src/data/text/easy_chat/groups/greetings/words.h @@ -20,7 +20,7 @@ u8 gEasyChatGroupWords_Greetings[] = _( "HELLO$" "GOOD-BYE$" "THANK YOU$" - "I’VE ARRIVED$" + "I'VE ARRIVED$" "PARDON$" "EXCUSE$" "SEE YA$" @@ -29,7 +29,7 @@ u8 gEasyChatGroupWords_Greetings[] = _( "GO AHEAD$" "APPRECIATE$" "HEY?$" - "WHAT’S UP?$" + "WHAT'S UP?$" "HUH?$" "NO$" "HI$" diff --git a/src/data/text/easy_chat/groups/hobbies/words.h b/src/data/text/easy_chat/groups/hobbies/words.h index 729d5bc3b..b8bba6888 100644 --- a/src/data/text/easy_chat/groups/hobbies/words.h +++ b/src/data/text/easy_chat/groups/hobbies/words.h @@ -8,7 +8,7 @@ u8 gEasyChatGroupWords_Hobbies[] = _( "MOVIE$" "SWEETS$" "CHAT$" - "CHILD’S PLAY$" + "CHILD'S PLAY$" "TOYS$" "MUSIC$" "CARDS$" diff --git a/src/data/text/easy_chat/groups/misc/words.h b/src/data/text/easy_chat/groups/misc/words.h index 05dda82ca..deb51471f 100644 --- a/src/data/text/easy_chat/groups/misc/words.h +++ b/src/data/text/easy_chat/groups/misc/words.h @@ -25,7 +25,7 @@ u8 gEasyChatGroupWords_Misc[] = _( "THAT$" "THOSE ARE$" "THOSE WERE$" - "THAT’S IT!$" + "THAT'S IT!$" "AM$" "THAT WAS$" "FRONT$" @@ -70,7 +70,7 @@ u8 gEasyChatGroupWords_Misc[] = _( "DAS$" "SCHON$" "GENUG$" - "DAS IST’S!$" + "DAS IST'S!$" "DAS SIND$" "DAS WAR$" "VORNE$" diff --git a/src/data/text/easy_chat/groups/people/words.h b/src/data/text/easy_chat/groups/people/words.h index 301ce1ed5..d4fa05564 100644 --- a/src/data/text/easy_chat/groups/people/words.h +++ b/src/data/text/easy_chat/groups/people/words.h @@ -8,8 +8,8 @@ u8 gEasyChatGroupWords_People[] = _( "YOURS$" "SON$" "YOUR$" - "YOU’RE$" - "YOU’VE$" + "YOU'RE$" + "YOU'VE$" "MOTHER$" "GRANDFATHER$" "UNCLE$" @@ -32,8 +32,8 @@ u8 gEasyChatGroupWords_People[] = _( "PLACE$" "DAUGHTER$" "HIS$" - "HE’S$" - "AREN’T$" + "HE'S$" + "AREN'T$" "SIBLINGS$" "KID$" "CHILDREN$" @@ -44,14 +44,14 @@ u8 gEasyChatGroupWords_People[] = _( "TO ME$" "MY$" "I AM$" - "I’VE$" + "I'VE$" "WHO$" "SOMEONE$" "WHO WAS$" "TO WHOM$" "WHOSE$" "WHO IS$" - "IT’S$" + "IT'S$" "LADY$" "FRIEND$" "ALLY$" @@ -61,20 +61,20 @@ u8 gEasyChatGroupWords_People[] = _( "THEY WERE$" "TO THEM$" "THEIR$" - "THEY’RE$" - "THEY’VE$" + "THEY'RE$" + "THEY'VE$" "WE$" "BEEN$" "TO US$" "OUR$" - "WE’RE$" + "WE'RE$" "RIVAL$" - "WE’VE$" + "WE'VE$" "WOMAN$" "SHE$" "SHE WAS$" "TO HER$" - "HER’S$" + "HER'S$" "SHE IS$" "SOME$" ); diff --git a/src/data/text/easy_chat/groups/speech/words.h b/src/data/text/easy_chat/groups/speech/words.h index 27cc7bf4d..fdfddb8ee 100644 --- a/src/data/text/easy_chat/groups/speech/words.h +++ b/src/data/text/easy_chat/groups/speech/words.h @@ -31,7 +31,7 @@ u8 gEasyChatGroupWords_Speech[] = _( "VERY$" "A TINY BIT$" "WILD$" - "THAT’S$" + "THAT'S$" "JUST$" "EVEN SO,$" "MUST BE$" diff --git a/src/data/text/easy_chat/groups/trendy_saying/words.h b/src/data/text/easy_chat/groups/trendy_saying/words.h index f114c6626..3a0ebd666 100644 --- a/src/data/text/easy_chat/groups/trendy_saying/words.h +++ b/src/data/text/easy_chat/groups/trendy_saying/words.h @@ -56,7 +56,7 @@ u8 gEasyChatGroupWords_TrendySaying[] = _( "GIMMICK$" "HIP UND$" "BANANENSHAKE$" - "ROCK’N’ROLL$" + "ROCK'N'ROLL$" "DUFTE$" "MODERN$" "RÜBENNASE$" diff --git a/src/data/text/move_descriptions_en.h b/src/data/text/move_descriptions_en.h index 3c3a961d1..e5513d4fe 100644 --- a/src/data/text/move_descriptions_en.h +++ b/src/data/text/move_descriptions_en.h @@ -107,7 +107,7 @@ static const u8 MoveDescription_RollingKick[] = _( "a rapid spin."); static const u8 MoveDescription_SandAttack[] = _( - "Reduces the foe’s accuracy\n" + "Reduces the foe's accuracy\n" "by hurling sand in its face."); static const u8 MoveDescription_Headbutt[] = _( @@ -152,7 +152,7 @@ static const u8 MoveDescription_DoubleEdge[] = _( static const u8 MoveDescription_TailWhip[] = _( "Wags the tail to lower the\n" - "foe’s DEFENSE."); + "foe's DEFENSE."); static const u8 MoveDescription_PoisonSting[] = _( "A toxic attack with barbs,\n" @@ -176,7 +176,7 @@ static const u8 MoveDescription_Bite[] = _( static const u8 MoveDescription_Growl[] = _( "Growls cutely to reduce the\n" - "foe’s ATTACK."); + "foe's ATTACK."); static const u8 MoveDescription_Roar[] = _( "Makes the foe flee to end\n" @@ -196,7 +196,7 @@ static const u8 MoveDescription_SonicBoom[] = _( static const u8 MoveDescription_Disable[] = _( "Psychically disables one of\n" - "the foe’s moves."); + "the foe's moves."); static const u8 MoveDescription_Acid[] = _( "Sprays a hide-melting acid.\n" @@ -272,7 +272,7 @@ static const u8 MoveDescription_Counter[] = _( static const u8 MoveDescription_SeismicToss[] = _( "Inflicts damage identical\n" - "to the user’s level."); + "to the user's level."); static const u8 MoveDescription_Strength[] = _( "Builds enormous power,\n" @@ -391,7 +391,7 @@ static const u8 MoveDescription_QuickAttack[] = _( "that always strikes first."); static const u8 MoveDescription_Rage[] = _( - "Raises the user’s ATTACK\n" + "Raises the user's ATTACK\n" "every time it is hit."); static const u8 MoveDescription_Teleport[] = _( @@ -400,7 +400,7 @@ static const u8 MoveDescription_Teleport[] = _( static const u8 MoveDescription_NightShade[] = _( "Inflicts damage identical\n" - "to the user’s level."); + "to the user's level."); static const u8 MoveDescription_Mimic[] = _( "Copies a move used by the\n" @@ -408,7 +408,7 @@ static const u8 MoveDescription_Mimic[] = _( static const u8 MoveDescription_Screech[] = _( "Emits a screech to sharply\n" - "reduce the foe’s DEFENSE."); + "reduce the foe's DEFENSE."); static const u8 MoveDescription_DoubleTeam[] = _( "Creates illusory copies to\n" @@ -416,18 +416,18 @@ static const u8 MoveDescription_DoubleTeam[] = _( static const u8 MoveDescription_Recover[] = _( "Recovers up to half the\n" - "user’s maximum HP."); + "user's maximum HP."); static const u8 MoveDescription_Harden[] = _( - "Stiffens the body’s \n" + "Stiffens the body's \n" "muscles to raise DEFENSE."); static const u8 MoveDescription_Minimize[] = _( - "Minimizes the user’s size\n" + "Minimizes the user's size\n" "to raise evasiveness."); static const u8 MoveDescription_Smokescreen[] = _( - "Lowers the foe’s accuracy\n" + "Lowers the foe's accuracy\n" "using smoke, ink, etc."); static const u8 MoveDescription_ConfuseRay[] = _( @@ -471,7 +471,7 @@ static const u8 MoveDescription_Metronome[] = _( "POKéMON move at random."); static const u8 MoveDescription_MirrorMove[] = _( - "Counters the foe’s attack\n" + "Counters the foe's attack\n" "with the same move."); static const u8 MoveDescription_SelfDestruct[] = _( @@ -536,7 +536,7 @@ static const u8 MoveDescription_Kinesis[] = _( static const u8 MoveDescription_SoftBoiled[] = _( "Recovers up to half the\n" - "user’s maximum HP."); + "user's maximum HP."); static const u8 MoveDescription_HiJumpKick[] = _( "A jumping knee kick. If it\n" @@ -571,12 +571,12 @@ static const u8 MoveDescription_SkyAttack[] = _( "then strikes the next turn."); static const u8 MoveDescription_Transform[] = _( - "Alters the user’s cells to\n" + "Alters the user's cells to\n" "become a copy of the foe."); static const u8 MoveDescription_Bubble[] = _( "An attack using bubbles.\n" - "May lower the foe’s SPEED."); + "May lower the foe's SPEED."); static const u8 MoveDescription_DizzyPunch[] = _( "A rhythmic punch that may\n" @@ -595,11 +595,11 @@ static const u8 MoveDescription_Psywave[] = _( "wave of varying intensity."); static const u8 MoveDescription_Splash[] = _( - "It’s just a splash...\n" + "It's just a splash...\n" "Has no effect whatsoever."); static const u8 MoveDescription_AcidArmor[] = _( - "Liquifies the user’s body\n" + "Liquifies the user's body\n" "to sharply raise DEFENSE."); static const u8 MoveDescription_Crabhammer[] = _( @@ -635,8 +635,8 @@ static const u8 MoveDescription_Sharpen[] = _( "and raises ATTACK."); static const u8 MoveDescription_Conversion[] = _( - "Changes the user’s type\n" - "into an own move’s type."); + "Changes the user's type\n" + "into an own move's type."); static const u8 MoveDescription_TriAttack[] = _( "Fires three types of beams\n" @@ -644,7 +644,7 @@ static const u8 MoveDescription_TriAttack[] = _( static const u8 MoveDescription_SuperFang[] = _( "Attacks with sharp fangs\n" - "and cuts half the foe’s HP."); + "and cuts half the foe's HP."); static const u8 MoveDescription_Slash[] = _( "Slashes with claws, etc. Has\n" @@ -652,14 +652,14 @@ static const u8 MoveDescription_Slash[] = _( static const u8 MoveDescription_Substitute[] = _( "Creates a decoy using 1/4\n" - "of the user’s maximum HP."); + "of the user's maximum HP."); static const u8 MoveDescription_Struggle[] = _( "Used only if all PP are gone.\n" "Also hurts the user a little."); static const u8 MoveDescription_Sketch[] = _( - "Copies the foe’s last move\n" + "Copies the foe's last move\n" "permanently."); static const u8 MoveDescription_TripleKick[] = _( @@ -668,15 +668,15 @@ static const u8 MoveDescription_TripleKick[] = _( static const u8 MoveDescription_Thief[] = _( "While attacking, it may\n" - "steal the foe’s held item."); + "steal the foe's held item."); static const u8 MoveDescription_SpiderWeb[] = _( "Ensnares the foe to stop it\n" "from fleeing or switching."); static const u8 MoveDescription_MindReader[] = _( - "Senses the foe’s action to\n" - "ensure the next move’s hit."); + "Senses the foe's action to\n" + "ensure the next move's hit."); static const u8 MoveDescription_Nightmare[] = _( "Inflicts 1/4 damage on a\n" @@ -696,11 +696,11 @@ static const u8 MoveDescription_Curse[] = _( static const u8 MoveDescription_Flail[] = _( "Inflicts more damage when\n" - "the user’s HP is down."); + "the user's HP is down."); static const u8 MoveDescription_Conversion2[] = _( "Makes the user resistant\n" - "to the last attack’s type."); + "to the last attack's type."); static const u8 MoveDescription_Aeroblast[] = _( "Launches a vacuumed blast.\n" @@ -712,11 +712,11 @@ static const u8 MoveDescription_CottonSpore[] = _( static const u8 MoveDescription_Reversal[] = _( "Inflicts more damage when\n" - "the user’s HP is down."); + "the user's HP is down."); static const u8 MoveDescription_Spite[] = _( "Spitefully cuts the PP\n" - "of the foe’s last move."); + "of the foe's last move."); static const u8 MoveDescription_PowderSnow[] = _( "Blasts the foe with a snowy\n" @@ -751,7 +751,7 @@ static const u8 MoveDescription_SludgeBomb[] = _( "damage. May also poison."); static const u8 MoveDescription_MudSlap[] = _( - "Hurls mud in the foe’s face\n" + "Hurls mud in the foe's face\n" "to reduce its accuracy."); static const u8 MoveDescription_Octazooka[] = _( @@ -767,7 +767,7 @@ static const u8 MoveDescription_ZapCannon[] = _( "paralysis, but inaccurate."); static const u8 MoveDescription_Foresight[] = _( - "Negates the foe’s efforts\n" + "Negates the foe's efforts\n" "to heighten evasiveness."); static const u8 MoveDescription_DestinyBond[] = _( @@ -780,7 +780,7 @@ static const u8 MoveDescription_PerishSong[] = _( static const u8 MoveDescription_IcyWind[] = _( "A chilling attack that\n" - "lowers the foe’s SPEED."); + "lowers the foe's SPEED."); static const u8 MoveDescription_Detect[] = _( "Evades attack, but may fail\n" @@ -828,7 +828,7 @@ static const u8 MoveDescription_Swagger[] = _( static const u8 MoveDescription_MilkDrink[] = _( "Recovers up to half the\n" - "user’s maximum HP."); + "user's maximum HP."); static const u8 MoveDescription_Spark[] = _( "An electrified tackle that\n" @@ -875,7 +875,7 @@ static const u8 MoveDescription_Safeguard[] = _( "all status problems."); static const u8 MoveDescription_PainSplit[] = _( - "Adds the user and foe’s HP,\n" + "Adds the user and foe's HP,\n" "then shares them equally."); static const u8 MoveDescription_SacredFire[] = _( @@ -924,10 +924,10 @@ static const u8 MoveDescription_IronTail[] = _( static const u8 MoveDescription_MetalClaw[] = _( "A claw attack that may\n" - "raise the user’s ATTACK."); + "raise the user's ATTACK."); static const u8 MoveDescription_VitalThrow[] = _( - "Makes the user’s move last,\n" + "Makes the user's move last,\n" "but it never misses."); static const u8 MoveDescription_MorningSun[] = _( @@ -967,11 +967,11 @@ static const u8 MoveDescription_Crunch[] = _( "May lower SP. DEF."); static const u8 MoveDescription_MirrorCoat[] = _( - "Counters the foe’s special\n" + "Counters the foe's special\n" "attack at double the power."); static const u8 MoveDescription_PsychUp[] = _( - "Copies the foe’s effect(s)\n" + "Copies the foe's effect(s)\n" "and gives to the user."); static const u8 MoveDescription_ExtremeSpeed[] = _( @@ -984,7 +984,7 @@ static const u8 MoveDescription_AncientPower[] = _( static const u8 MoveDescription_ShadowBall[] = _( "Hurls a black blob that may\n" - "lower the foe’s SP. DEF."); + "lower the foe's SP. DEF."); static const u8 MoveDescription_FutureSight[] = _( "Heightens inner power to\n" @@ -1044,7 +1044,7 @@ static const u8 MoveDescription_WillOWisp[] = _( static const u8 MoveDescription_Memento[] = _( "The user faints and lowers\n" - "the foe’s abilities."); + "the foe's abilities."); static const u8 MoveDescription_Facade[] = _( "Boosts ATTACK when burned,\n" @@ -1076,7 +1076,7 @@ static const u8 MoveDescription_Taunt[] = _( static const u8 MoveDescription_HelpingHand[] = _( "Boosts the power of the\n" - "recipient’s moves."); + "recipient's moves."); static const u8 MoveDescription_Trick[] = _( "Tricks the foe into trading\n" @@ -1092,11 +1092,11 @@ static const u8 MoveDescription_Wish[] = _( static const u8 MoveDescription_Assist[] = _( "Attacks randomly with one\n" - "of the partner’s moves."); + "of the partner's moves."); static const u8 MoveDescription_Ingrain[] = _( "Lays roots that restore HP.\n" - "The user can’t switch out."); + "The user can't switch out."); static const u8 MoveDescription_Superpower[] = _( "Boosts strength sharply,\n" @@ -1123,15 +1123,15 @@ static const u8 MoveDescription_Yawn[] = _( "then sleeping next turn."); static const u8 MoveDescription_KnockOff[] = _( - "Knocks down the foe’s held\n" + "Knocks down the foe's held\n" "item to prevent its use."); static const u8 MoveDescription_Endeavor[] = _( - "Gains power if the user’s HP\n" - "is lower than the foe’s HP."); + "Gains power if the user's HP\n" + "is lower than the foe's HP."); static const u8 MoveDescription_Eruption[] = _( - "The higher the user’s HP,\n" + "The higher the user's HP,\n" "the more damage caused."); static const u8 MoveDescription_SkillSwap[] = _( @@ -1167,7 +1167,7 @@ static const u8 MoveDescription_ArmThrust[] = _( "strike the foe 2 to 5 times."); static const u8 MoveDescription_Camouflage[] = _( - "Alters the POKéMON’s type\n" + "Alters the POKéMON's type\n" "depending on the location."); static const u8 MoveDescription_TailGlow[] = _( @@ -1239,7 +1239,7 @@ static const u8 MoveDescription_Astonish[] = _( "the foe into flinching."); static const u8 MoveDescription_WeatherBall[] = _( - "The move’s type and power\n" + "The move's type and power\n" "change with the weather."); static const u8 MoveDescription_Aromatherapy[] = _( @@ -1248,7 +1248,7 @@ static const u8 MoveDescription_Aromatherapy[] = _( static const u8 MoveDescription_FakeTears[] = _( "Feigns crying to sharply\n" - "lower the foe’s SP. DEF."); + "lower the foe's SP. DEF."); static const u8 MoveDescription_AirCutter[] = _( "Hacks with razorlike wind.\n" @@ -1259,7 +1259,7 @@ static const u8 MoveDescription_Overheat[] = _( "but sharply lowers SP. ATK."); static const u8 MoveDescription_OdorSleuth[] = _( - "Negates the foe’s efforts\n" + "Negates the foe's efforts\n" "to heighten evasiveness."); static const u8 MoveDescription_RockTomb[] = _( @@ -1288,7 +1288,7 @@ static const u8 MoveDescription_CosmicPower[] = _( static const u8 MoveDescription_WaterSpout[] = _( "Inflicts more damage if the\n" - "user’s HP is high."); + "user's HP is high."); static const u8 MoveDescription_SignalBeam[] = _( "A strange beam attack that\n" @@ -1331,11 +1331,11 @@ static const u8 MoveDescription_IcicleSpear[] = _( "2 to 5 icicles in a row."); static const u8 MoveDescription_IronDefense[] = _( - "Hardens the body’s surface\n" + "Hardens the body's surface\n" "to sharply raise DEFENSE."); static const u8 MoveDescription_Block[] = _( - "Blocks the foe’s way to\n" + "Blocks the foe's way to\n" "prevent escape."); static const u8 MoveDescription_Howl[] = _( diff --git a/src/data/text/species_names_en.h b/src/data/text/species_names_en.h index 840beb22b..25f2c9aa2 100644 --- a/src/data/text/species_names_en.h +++ b/src/data/text/species_names_en.h @@ -82,7 +82,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_SLOWBRO] = _("SLOWBRO"), [SPECIES_MAGNEMITE] = _("MAGNEMITE"), [SPECIES_MAGNETON] = _("MAGNETON"), - [SPECIES_FARFETCHD] = _("FARFETCH’D"), + [SPECIES_FARFETCHD] = _("FARFETCH'D"), [SPECIES_DODUO] = _("DODUO"), [SPECIES_DODRIO] = _("DODRIO"), [SPECIES_SEEL] = _("SEEL"), diff --git a/src/debug/kagaya_debug_menu.c b/src/debug/kagaya_debug_menu.c index 89a36b2da..982de64a2 100644 --- a/src/debug/kagaya_debug_menu.c +++ b/src/debug/kagaya_debug_menu.c @@ -26,7 +26,7 @@ u8 KagayaDebugMenu_SlotMachine(void); u8 Kagaya_80B0734(void); u8 debug_sub_80B07DC(void); -const u8 Str_83EBB34[] = _("Trainer’s card"); +const u8 Str_83EBB34[] = _("Trainer's card"); const u8 Str_83EBB43[] = _("Card to exchange"); const u8 Str_83EBB54[] = _("Slot machine"); diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c index 1f0cb5f60..01f04b8d9 100644 --- a/src/debug/start_menu_debug.c +++ b/src/debug/start_menu_debug.c @@ -2709,7 +2709,7 @@ u8 DebugMenu_OpenMurakawa(void) const u8 Str_839C61A[] = _("abcde; abcde: ABCDE; ABCDE:\p" "Tableaux des verbes du 2{SUPER_E} groupe.\p" - "La1{SUPER_RE} chose à apprendre c’est de lire.\p" + "La1{SUPER_RE} chose à apprendre c'est de lire.\p" "Tableaux des verbes du 1{SUPER_ER} groupe.\p" "“あいうえおかきくけコさしすせそたちつてとな”\n" "<にぬネのはひふへほマみむめもやゆよらりるれろわャッ>\p" diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c index 6b30fe5fe..68ccc6f9d 100644 --- a/src/debug/taya_debug_window.c +++ b/src/debug/taya_debug_window.c @@ -58,12 +58,12 @@ struct TayaMonDataEwramStruct { #define eTayaMonData (*(struct TayaMonDataEwramStruct *)gSharedMem) const u8 gUnknown_Debug_083C4E54[] = _("Profile"); -const u8 gUnknown_Debug_083C4E5C[] = _("Battle’s start"); +const u8 gUnknown_Debug_083C4E5C[] = _("Battle's start"); const u8 gUnknown_Debug_083C4E6B[] = _("Good saying"); const u8 gUnknown_Debug_083C4E77[] = _("Lose a battle"); const u8 gUnknown_Debug_083C4E85[] = _("MAIL"); const u8 gUnknown_Debug_083C4E8A[] = _("MAIL salutation"); -const u8 gUnknown_Debug_083C4E9A[] = _("BARD’s song"); +const u8 gUnknown_Debug_083C4E9A[] = _("BARD's song"); const u8 gUnknown_Debug_083C4EA6[] = _("Interview"); const u8 gUnknown_Debug_083C4EB0[] = _("InterviewシBTス"); @@ -109,7 +109,7 @@ const struct { const u8 gUnknown_Debug_083C4F94[] = _("しょうしょうおまちください!"); const u8 gUnknown_Debug_083C4FA3[] = _("Weather"); -const u8 gUnknown_Debug_083C4FAB[] = _("LANETTE’S PC"); +const u8 gUnknown_Debug_083C4FAB[] = _("LANETTE'S PC"); const u8 gUnknown_Debug_083C4FB8[] = _("SimpleText"); const u8 gUnknown_Debug_083C4FC3[] = _("Old man"); const u8 gUnknown_Debug_083C4FCB[] = _("Trend"); diff --git a/src/naming_screen.c b/src/naming_screen.c index afc17fab3..1f904be1b 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1939,7 +1939,7 @@ static const u8 sKeyboardCharacters[][4][20] = _(" 0 1 2 3 4 "), _(" 5 6 7 8 9 "), _(" ! ? ♂ ♀ / - "), - _(" … “ ” ‘ ’ "), + _(" … “ ” ‘ ' "), }, }; diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index 943b57238..31bf4612d 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -59,8 +59,8 @@ extern u32 gTransformPersonalities[NUM_BATTLE_SLOTS]; extern u8 gBattleMonForms[NUM_BATTLE_SLOTS]; extern u16 gAnimSpeciesByBanks[]; extern u8 gBattleMonSprites[NUM_BATTLE_SLOTS]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern s16 gBattleAnimArgs[8]; extern u8 gBanksBySide[NUM_BATTLE_SLOTS]; extern u8 gBattlersCount; // gNumBattleMons? @@ -412,10 +412,10 @@ u8 GetAnimBattlerSpriteId(u8 whichBank) if (whichBank == ANIM_BATTLER_ATTACKER) { - if (IsBankSpritePresent(gAnimBankAttacker)) + if (IsBankSpritePresent(gBattleAnimAttacker)) { sprites = gBattleMonSprites; - return sprites[gAnimBankAttacker]; + return sprites[gBattleAnimAttacker]; } else { @@ -424,10 +424,10 @@ u8 GetAnimBattlerSpriteId(u8 whichBank) } else if (whichBank == ANIM_BATTLER_TARGET) { - if (IsBankSpritePresent(gAnimBankTarget)) + if (IsBankSpritePresent(gBattleAnimTarget)) { sprites = gBattleMonSprites; - return sprites[gAnimBankTarget]; + return sprites[gBattleAnimTarget]; } else { @@ -436,15 +436,15 @@ u8 GetAnimBattlerSpriteId(u8 whichBank) } else if (whichBank == ANIM_BATTLER_ATK_PARTNER) { - if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) + if (!IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2)) return 0xff; else - return gBattleMonSprites[gAnimBankAttacker ^ 2]; + return gBattleMonSprites[gBattleAnimAttacker ^ 2]; } else { - if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) - return gBattleMonSprites[gAnimBankTarget ^ 2]; + if (IsAnimBankSpriteVisible(gBattleAnimTarget ^ 2)) + return gBattleMonSprites[gBattleAnimTarget ^ 2]; else return 0xff; } @@ -627,8 +627,8 @@ void unref_sub_8078414(struct Sprite *sprite) { sprite->data[1] = sprite->pos1.x + sprite->pos2.x; sprite->data[3] = sprite->pos1.y + sprite->pos2.y; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sprite->callback = sub_80782F8; } @@ -695,8 +695,8 @@ void unref_sub_8078588(struct Sprite *sprite) { sprite->data[1] = sprite->pos1.x + sprite->pos2.x; sprite->data[3] = sprite->pos1.y + sprite->pos2.y; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->callback = sub_80782F8; } @@ -734,14 +734,14 @@ void sub_8078634(u8 task) void sub_8078650(struct Sprite *sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); } void sub_807867C(struct Sprite *sprite, s16 a2) { - u16 v1 = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - u16 v2 = GetBattlerSpriteCoord(gAnimBankTarget, 0); + u16 v1 = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + u16 v2 = GetBattlerSpriteCoord(gBattleAnimTarget, 0); if (v1 > v2) { @@ -753,7 +753,7 @@ void sub_807867C(struct Sprite *sprite, s16 a2) } else { - if (GetBattlerSide(gAnimBankAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != 0) sprite->pos1.x -= a2; else sprite->pos1.x += a2; @@ -790,8 +790,8 @@ void sub_8078764(struct Sprite *sprite, bool8 a2) { if (!a2) { - sprite->pos1.x = sub_8077EE4(gAnimBankTarget, 0); - sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 1); + sprite->pos1.x = sub_8077EE4(gBattleAnimTarget, 0); + sprite->pos1.y = sub_8077EE4(gBattleAnimTarget, 1); } sub_807867C(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; @@ -801,13 +801,13 @@ void InitAnimSpritePos(struct Sprite *sprite, u8 a2) { if (!a2) { - sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 0); - sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 1); + sprite->pos1.x = sub_8077EE4(gBattleAnimAttacker, 0); + sprite->pos1.y = sub_8077EE4(gBattleAnimAttacker, 1); } else { - sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 2); - sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 3); + sprite->pos1.x = sub_8077EE4(gBattleAnimAttacker, 2); + sprite->pos1.y = sub_8077EE4(gBattleAnimAttacker, 3); } sub_807867C(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; @@ -839,9 +839,9 @@ bool8 IsBankSpritePresent(u8 slot) { if (IsContest()) { - if (gAnimBankAttacker == slot) + if (gBattleAnimAttacker == slot) return TRUE; - if (gAnimBankTarget == slot) + if (gBattleAnimTarget == slot) return TRUE; return FALSE; } @@ -892,7 +892,7 @@ void sub_8078954(struct Struct_sub_8078914 *unk, u8 b) unk->field_4 = (u8 *)(VRAM + 0xf000); unk->field_8 = 0xe; } - else if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1) + else if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1) { unk->field_0 = (u8 *)(VRAM + 0x4000); unk->field_4 = (u8 *)(VRAM + 0xe000); @@ -1279,26 +1279,26 @@ u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) } if (a2) { - shift = gAnimBankAttacker + 16; + shift = gBattleAnimAttacker + 16; var |= 1 << shift; } if (a3) { - shift = gAnimBankTarget + 16; + shift = gBattleAnimTarget + 16; var |= 1 << shift; } if (a4) { - if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) + if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2)) { - shift = (gAnimBankAttacker ^ 2) + 16; + shift = (gBattleAnimAttacker ^ 2) + 16; var |= 1 << shift; } } if (a5) { - if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) + if (IsAnimBankSpriteVisible(gBattleAnimTarget ^ 2)) { - shift = (gAnimBankTarget ^ 2) + 16; + shift = (gBattleAnimTarget ^ 2) + 16; var |= 1 << shift; } } @@ -1414,12 +1414,12 @@ void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite) v2 = 1; InitAnimSpritePos(sprite, v1); - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, v2) + gBattleAnimArgs[3]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, v2) + gBattleAnimArgs[3]; sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } @@ -1427,11 +1427,11 @@ void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite) void sub_80794A8(struct Sprite *sprite) { InitAnimSpritePos(sprite, 1); - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[5]; InitAnimArcTranslation(sprite); sprite->callback = sub_8079518; @@ -1461,14 +1461,14 @@ void sub_8079534(struct Sprite *sprite) if (!gBattleAnimArgs[5]) { InitAnimSpritePos(sprite, r4); - slot = gAnimBankAttacker; + slot = gBattleAnimAttacker; } else { sub_8078764(sprite, r4); - slot = gAnimBankTarget; + slot = gBattleAnimTarget; } - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sub_8078764(sprite, r4); sprite->data[0] = gBattleAnimArgs[4]; @@ -1852,14 +1852,14 @@ void sub_8079CEC(u8 task) void unref_sub_8079D20(u8 priority) { - if (IsAnimBankSpriteVisible(gAnimBankTarget)) - gSprites[gBattleMonSprites[gAnimBankTarget]].oam.priority = priority; - if (IsAnimBankSpriteVisible(gAnimBankAttacker)) - gSprites[gBattleMonSprites[gAnimBankAttacker]].oam.priority = priority; - if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) - gSprites[gBattleMonSprites[gAnimBankTarget ^ 2]].oam.priority = priority; - if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) - gSprites[gBattleMonSprites[gAnimBankAttacker ^ 2]].oam.priority = priority; + if (IsAnimBankSpriteVisible(gBattleAnimTarget)) + gSprites[gBattleMonSprites[gBattleAnimTarget]].oam.priority = priority; + if (IsAnimBankSpriteVisible(gBattleAnimAttacker)) + gSprites[gBattleMonSprites[gBattleAnimAttacker]].oam.priority = priority; + if (IsAnimBankSpriteVisible(gBattleAnimTarget ^ 2)) + gSprites[gBattleMonSprites[gBattleAnimTarget ^ 2]].oam.priority = priority; + if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2)) + gSprites[gBattleMonSprites[gBattleAnimAttacker ^ 2]].oam.priority = priority; } void UpdateBattlerSpritePriorities() @@ -2170,7 +2170,7 @@ u8 sub_807A4A0(int bank, u8 sprite, int species) void sub_807A544(struct Sprite *sprite) { sub_8078650(sprite); - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) { sprite->pos1.x -= gBattleAnimArgs[0]; gBattleAnimArgs[3] = -gBattleAnimArgs[3]; @@ -2191,7 +2191,7 @@ void sub_807A544(struct Sprite *sprite) void sub_807A5C4(struct Sprite *sprite) { - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) { sprite->pos1.x -= gBattleAnimArgs[0]; gBattleAnimArgs[3] *= -1; @@ -2215,7 +2215,7 @@ void sub_807A5C4(struct Sprite *sprite) void sub_807A63C(struct Sprite *sprite) { sub_8078650(sprite); - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) sprite->pos1.x -= gBattleAnimArgs[0]; else sprite->pos1.x += gBattleAnimArgs[0]; @@ -2232,7 +2232,7 @@ void sub_807A69C(u8 taskId) u16 dest; struct Task *task = &gTasks[taskId]; task->data[0] = GetAnimBattlerSpriteId(0); - task->data[1] = (GetBattlerSide(gAnimBankAttacker)) ? -8 : 8; + task->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? -8 : 8; task->data[2] = 0; task->data[3] = 0; gSprites[task->data[0]].pos2.x -= task->data[0]; @@ -2241,7 +2241,7 @@ void sub_807A69C(u8 taskId) dest = (task->data[4] + 0x10) * 0x10; src = (gSprites[task->data[0]].oam.paletteNum + 0x10) * 0x10; - task->data[6] = GetBattlerSubpriority(gAnimBankAttacker); + task->data[6] = GetBattlerSubpriority(gBattleAnimAttacker); if (task->data[6] == 20 || task->data[6] == 40) task->data[6] = 2; else @@ -2312,9 +2312,9 @@ void sub_807A8D4(struct Sprite *sprite) // file_4 void sub_807A908(struct Sprite *sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); - if (!GetBattlerSide(gAnimBankAttacker)) + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + if (!GetBattlerSide(gBattleAnimAttacker)) sprite->data[0] = 5; else sprite->data[0] = -10; @@ -2340,7 +2340,7 @@ void sub_807A9BC(struct Sprite *sprite) sprite->data[0] = gBattleAnimArgs[2]; sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[4]; sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[5]; - if (!GetBattlerSide(gAnimBankTarget)) + if (!GetBattlerSide(gBattleAnimTarget)) { x = (u16)gBattleAnimArgs[4] + 30; sprite->pos1.x += x; diff --git a/src/strings.c b/src/strings.c index e9d9ea87e..7d77d503a 100644 --- a/src/strings.c +++ b/src/strings.c @@ -75,7 +75,7 @@ const u8 gSystemText_IntroWeCall[] = _("This is what we call\na POKéMON."); const u8 gSystemText_NewPara[] = _("\p"); const u8 gDexText_UnknownPoke[] = _(" ????? POKéMON"); -const u8 gDexText_UnknownHeight[] = _("{CLEAR_TO 0x0C}??’??”"); +const u8 gDexText_UnknownHeight[] = _("{CLEAR_TO 0x0C}??'??”"); const u8 gDexText_UnknownWeight[] = _("????.? lbs.$"); // extra terminator? const u8 gDexText_CryOf[] = _("{CLEAR_TO 2}CRY OF$"); // extra terminator? const u8 gDexText_SizeComparedTo[] = _("SIZE COMPARED TO "); @@ -120,7 +120,7 @@ const u8 DexText_Purple[] = _("PURPLE"); const u8 DexText_Gray[] = _("GRAY"); const u8 DexText_White[] = _("WHITE"); const u8 DexText_Pink[] = _("PINK"); -const u8 DexText_HoennDex2[] = _("HOENN region’s POKéDEX"); +const u8 DexText_HoennDex2[] = _("HOENN region's POKéDEX"); const u8 DexText_NationalDex2[] = _("National edition POKéDEX"); const u8 DexText_ListByNumber[] = _("POKéMON are listed according to their\nnumber."); const u8 DexText_ListByABC2[] = _("Spotted and owned POKéMON are listed\nalphabetically."); @@ -129,13 +129,13 @@ const u8 DexText_ListByLightToHeaviest[] = _("Owned POKéMON are listed from the const u8 DexText_ListByTallToSmallest[] = _("Owned POKéMON are listed from the\ntallest to the smallest."); const u8 DexText_ListBySmallToTallest[] = _("Owned POKéMON are listed from the\nsmallest to the tallest."); const u8 DexText_Terminator5[] = _(""); -const u8 DexText_DontSpecify[] = _("DON’T SPECIFY."); +const u8 DexText_DontSpecify[] = _("DON'T SPECIFY."); const u8 DexText_None[] = _("NONE"); const u8 DexText_RightPointingTriangle[] = _("▶"); // right pointing triangle const u8 DexText_Terminator6[] = _(" "); -const u8 gMenuText_WelcomeToHOFAndDexRating[] = _("Welcome to the HALL OF FAME!$Spotted POKéMON: {STR_VAR_1}!\nOwned POKéMON: {STR_VAR_2}!\pPROF. BIRCH’s POKéDEX rating!\pPROF. BIRCH: Let’s see...\p"); -const u8 gMenuText_HOFSaving[] = _("SAVING...\nDON’T TURN OFF THE POWER."); +const u8 gMenuText_WelcomeToHOFAndDexRating[] = _("Welcome to the HALL OF FAME!$Spotted POKéMON: {STR_VAR_1}!\nOwned POKéMON: {STR_VAR_2}!\pPROF. BIRCH's POKéDEX rating!\pPROF. BIRCH: Let's see...\p"); +const u8 gMenuText_HOFSaving[] = _("SAVING...\nDON'T TURN OFF THE POWER."); const u8 gMenuText_HOFCorrupt[] = _("The HALL OF FAME data is corrupt."); const u8 gMenuText_HOFNumber[] = _("HALL OF FAME No. "); const u8 gMenuText_HOFCongratulations[] = _("LEAGUE CHAMPION!\nCONGRATULATIONS!"); @@ -213,24 +213,24 @@ const u8 *const gUnknown_0840E740[7] = const u8 gOtherText_ReturnTo[] = _("Return to"); const u8 gOtherText_WhatWillYouDo2[] = _("What would you\nlike to do?"); -const u8 gOtherText_CantWriteMail[] = _("You can’t write\nMAIL here."); +const u8 gOtherText_CantWriteMail[] = _("You can't write\nMAIL here."); const u8 gOtherText_NoPokemon[] = _("There is no\nPOKéMON.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_SwitchWhichItem[] = _("Switch with which\nitem?"); -const u8 gOtherText_CantBeHeld[] = _("{STR_VAR_1} can’t be held."); -const u8 gOtherText_CantBeHeldHere[] = _("{STR_VAR_1} can’t be held here."); +const u8 gOtherText_CantBeHeld[] = _("{STR_VAR_1} can't be held."); +const u8 gOtherText_CantBeHeldHere[] = _("{STR_VAR_1} can't be held here."); const u8 gOtherText_HowManyToDeposit[] = _("How many do you\nwant to deposit?"); const u8 gOtherText_DepositedItems[] = _("Deposited {STR_VAR_2}\n{STR_VAR_1}(s)."); -const u8 gOtherText_NoRoomForItems[] = _("There’s no room to\nstore items."); -const u8 gOtherText_CantStoreSomeoneItem[] = _("You can’t store\nsomeone else’s item\nin the PC."); -const u8 gOtherText_TooImportant[] = _("That’s much too\nimportant to toss\nout!"); +const u8 gOtherText_NoRoomForItems[] = _("There's no room to\nstore items."); +const u8 gOtherText_CantStoreSomeoneItem[] = _("You can't store\nsomeone else's item\nin the PC."); +const u8 gOtherText_TooImportant[] = _("That's much too\nimportant to toss\nout!"); const u8 gOtherText_HowManyToToss[] = _("Toss out how many?"); const u8 gOtherText_ThrewAwayItem[] = _("Threw away {STR_VAR_2}\n{STR_VAR_1}(s)."); const u8 gOtherText_OkayToThrowAwayPrompt[] = _("Is it okay to\nthrow away {STR_VAR_2}\n{STR_VAR_1}(s)?"); -const u8 gOtherText_DadsAdvice[] = _("DAD’s advice...\n{PLAYER}, there’s a time and place for\leverything!{PAUSE_UNTIL_PRESS}"); -const u8 gOtherText_CantGetOffBike[] = _("You can’t dismount your BIKE here.{PAUSE_UNTIL_PRESS}"); -const u8 gOtherText_ItemfinderResponding[] = _("Oh!\nThe machine’s responding!\pThere’s an item buried around here!{PAUSE_UNTIL_PRESS}"); -const u8 gOtherText_ItemfinderItemUnderfoot[] = _("The machine’s indicating something\nright underfoot!{PAUSE_UNTIL_PRESS}"); -const u8 gOtherText_NoResponse[] = _("... ... ... ... Nope!\nThere’s no response.{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_DadsAdvice[] = _("DAD's advice...\n{PLAYER}, there's a time and place for\leverything!{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_CantGetOffBike[] = _("You can't dismount your BIKE here.{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_ItemfinderResponding[] = _("Oh!\nThe machine's responding!\pThere's an item buried around here!{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_ItemfinderItemUnderfoot[] = _("The machine's indicating something\nright underfoot!{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_NoResponse[] = _("... ... ... ... Nope!\nThere's no response.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_Coins3[] = _("Your COINS:\n{STR_VAR_1}{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_BootedTM[] = _("Booted up a TM."); const u8 gOtherText_BootedHM[] = _("Booted up an HM."); @@ -289,18 +289,18 @@ const u8 gOtherText_QuitShopping[] = _("Quit shopping."); const u8 gOtherText_HowManyYouWant[] = _("{STR_VAR_1}? Certainly.\nHow many would you like?"); const u8 gOtherText_ThatWillBe[] = _("{STR_VAR_1}? And you wanted {STR_VAR_2}?\nThat will be ¥{STR_VAR_3}."); -const u8 gOtherText_ThatWillBe2[] = _("{STR_VAR_1}, is it?\nThat’ll be ¥{STR_VAR_2}. Do you want it?"); -const u8 gOtherText_ThatWillBe3[] = _("You wanted {STR_VAR_1}?\nThat’ll be ¥{STR_VAR_2}. Will that be okay?"); +const u8 gOtherText_ThatWillBe2[] = _("{STR_VAR_1}, is it?\nThat'll be ¥{STR_VAR_2}. Do you want it?"); +const u8 gOtherText_ThatWillBe3[] = _("You wanted {STR_VAR_1}?\nThat'll be ¥{STR_VAR_2}. Will that be okay?"); const u8 gOtherText_HereYouGo[] = _("Here you go!\nThank you very much."); -const u8 gOtherText_HereYouGo2[] = _("Thank you!\nI’ll send it to your home PC."); -const u8 gOtherText_HereYouGo3[] = _("Thanks!\nI’ll send it to your PC at home."); -const u8 gOtherText_NotEnoughMoney[] = _("You don’t have enough money.{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_HereYouGo2[] = _("Thank you!\nI'll send it to your home PC."); +const u8 gOtherText_HereYouGo3[] = _("Thanks!\nI'll send it to your PC at home."); +const u8 gOtherText_NotEnoughMoney[] = _("You don't have enough money.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_NoRoomFor[] = _("You have no more room for items.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_SpaceForIsFull[] = _("The space for {STR_VAR_1} is full.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_AnythingElse[] = _("Is there anything else I can help\nyou with?"); const u8 gOtherText_CanIHelpYou[] = _("Can I help you with anything else?"); -const u8 gOtherText_FreePremierBall[] = _("I’ll throw in a PREMIER BALL, too.{PAUSE_UNTIL_PRESS}"); -const u8 gOtherText_CantBuyThat[] = _("{STR_VAR_2}? Oh, no.\nI can’t buy that.{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_FreePremierBall[] = _("I'll throw in a PREMIER BALL, too.{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_CantBuyThat[] = _("{STR_VAR_2}? Oh, no.\nI can't buy that.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_HowManyToSell[] = _("{STR_VAR_2}?\nHow many would you like to sell?"); const u8 gOtherText_CanPay[] = _("I can pay ¥{STR_VAR_1}.\nWould that be okay?"); const u8 gOtherText_SoldItem[] = _("Turned over the {STR_VAR_2}\nand received ¥{STR_VAR_1}."); @@ -319,56 +319,56 @@ const u8 OtherText_Read2[] = _("READ"); const u8 gOtherText_Hp2[] = _("HP"); const u8 gOtherText_SpAtk2[] = _("SP. ATK"); const u8 gOtherText_SpDef2[] = _("SP. DEF"); -const u8 gOtherText_WontHaveAnyEffect[] = _("It won’t have any effect.{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_WontHaveAnyEffect[] = _("It won't have any effect.{PAUSE_UNTIL_PRESS}"); #if REVISION >= 1 -const u8 gOtherText_CantUseOnPoke[] = _("This can’t be used on\nthat POKéMON.{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_CantUseOnPoke[] = _("This can't be used on\nthat POKéMON.{PAUSE_UNTIL_PRESS}"); #else -const u8 gOtherText_CantUseOnPoke[] = _("This item can’t be used on\nthat POKéMON.{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_CantUseOnPoke[] = _("This item can't be used on\nthat POKéMON.{PAUSE_UNTIL_PRESS}"); #endif -const u8 gOtherText_CantBeSwitched[] = _("{STR_VAR_1} can’t be switched\nout!{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_CantBeSwitched[] = _("{STR_VAR_1} can't be switched\nout!{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_AlreadyBattle[] = _("{STR_VAR_1} is already\nin battle!{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_AlreadySelected[] = _("{STR_VAR_1} has already been\nselected.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_NoEnergyLeft[] = _("{STR_VAR_1} has no energy\nleft to battle!{PAUSE_UNTIL_PRESS}"); -const u8 gOtherText_CantSwitchPokeWithYours[] = _("You can’t switch {STR_VAR_1}’s\nPOKéMON with one of yours!{PAUSE_UNTIL_PRESS}"); -const u8 gOtherText_EGGCantBattle[] = _("An EGG can’t battle!{PAUSE_UNTIL_PRESS}"); -const u8 gOtherText_CantBeUsedBadge[] = _("This can’t be used until a new\nBADGE is obtained."); +const u8 gOtherText_CantSwitchPokeWithYours[] = _("You can't switch {STR_VAR_1}'s\nPOKéMON with one of yours!{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_EGGCantBattle[] = _("An EGG can't battle!{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_CantBeUsedBadge[] = _("This can't be used until a new\nBADGE is obtained."); const u8 gOtherText_NoMoreThreePoke[] = _("No more than three POKéMON\nmay enter."); const u8 gOtherText_SendRemovedMailPrompt[] = _("Send the removed MAIL to\nyour PC?"); const u8 gOtherText_MailWasSent[] = _("The MAIL was sent to your PC.{PAUSE_UNTIL_PRESS}"); -const u8 gOtherText_MailboxIsFull[] = _("Your PC’s MAILBOX is full.{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_MailboxIsFull[] = _("Your PC's MAILBOX is full.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_MailRemovedMessageLost[] = _("If the MAIL is removed, the\nmessage will be lost. Okay?"); const u8 gOtherText_MailMustBeRemoved[] = _("MAIL must be removed before\nholding an item.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_WasGivenToHold[] = _("{STR_VAR_1} was given the\n{STR_VAR_2} to hold.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_AlreadyHolding[] = _("{STR_VAR_1} is already holding\none {STR_VAR_2}.\pWould you like to switch the\ntwo items?"); -const u8 gOtherText_NotHoldingAnything[] = _("{STR_VAR_1} isn’t\nholding anything.{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_NotHoldingAnything[] = _("{STR_VAR_1} isn't\nholding anything.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_ReceivedTheThingFrom[] = _("Received the {STR_VAR_2}\nfrom {STR_VAR_1}.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_MailTaken[] = _("MAIL was taken from the\nPOKéMON.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_TakenAndReplaced[] = _("The {STR_VAR_2} was taken and\nreplaced with the {STR_VAR_1}.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_PokeHoldingItemCantMail[] = _("This POKéMON is holding an item.\nIt cannot hold MAIL.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_MailTransferredMailbox[] = _("MAIL was transferred from\nthe MAILBOX.{PAUSE_UNTIL_PRESS}"); -const u8 gOtherText_BagFullCannotRemoveItem[] = _("The BAG is full. The POKéMON’s\nitem could not be removed.{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_BagFullCannotRemoveItem[] = _("The BAG is full. The POKéMON's\nitem could not be removed.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_LearnedMove[] = _("{STR_VAR_1} learned\n{STR_VAR_2}!"); -const u8 gOtherText_NotCompatible[] = _("{STR_VAR_1} and {STR_VAR_2}\nare not compatible.\p{STR_VAR_2} can’t be learned.{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_NotCompatible[] = _("{STR_VAR_1} and {STR_VAR_2}\nare not compatible.\p{STR_VAR_2} can't be learned.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_WantsToLearn[] = _("{STR_VAR_1} wants to learn the\nmove {STR_VAR_2}.\pHowever, {STR_VAR_1} already\nknows four moves.\pShould a move be deleted and\nreplaced with {STR_VAR_2}?"); const u8 gOtherText_StopTryingTo[] = _("Stop trying to teach\n{STR_VAR_2}?"); const u8 gOtherText_DidNotLearnMove2[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_WhichMoveToForget2[] = _("Which move should be forgotten?{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_ForgetMove123_2[] = _("{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}... {PAUSE 15}... {PAUSE 15}... {PAUSE 15}{PLAY_SE SE_KON}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd...{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_AlreadyKnows[] = _("{STR_VAR_1} already knows\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}"); -const u8 gOtherText_HPRestoredBy[] = _("{STR_VAR_1}’s HP was restored by\n{STR_VAR_2} points.{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_HPRestoredBy[] = _("{STR_VAR_1}'s HP was restored by\n{STR_VAR_2} points.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_CuredPoisoning[] = _("{STR_VAR_1} was cured of its\npoisoning.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_CuredParalysis[] = _("{STR_VAR_1} was cured of\nparalysis.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_WokeUp[] = _("{STR_VAR_1} woke up.{PAUSE_UNTIL_PRESS}"); -const u8 gOtherText_BurnHealed[] = _("{STR_VAR_1}’s burn was healed.{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_BurnHealed[] = _("{STR_VAR_1}'s burn was healed.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_ThawedOut[] = _("{STR_VAR_1} was thawed out.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_PPRestored[] = _("PP was restored.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_RegainedHealth[] = _("{STR_VAR_1} regained health.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_BecameHealthy[] = _("{STR_VAR_1} became healthy.{PAUSE_UNTIL_PRESS}"); -const u8 gOtherText_PPIncreased[] = _("{STR_VAR_1}’s PP increased.{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_PPIncreased[] = _("{STR_VAR_1}'s PP increased.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_ElevatedTo[] = _("{STR_VAR_1} was elevated to\nLv. {STR_VAR_2}."); -const u8 gOtherText_WasRaised[] = _("{STR_VAR_1}’s {STR_VAR_2} was\nraised.{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_WasRaised[] = _("{STR_VAR_1}'s {STR_VAR_2} was\nraised.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_SnapConfusion[] = _("{STR_VAR_1} snapped out of its\nconfusion.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_GotOverLove[] = _("{STR_VAR_1} got over its\ninfatuation.{PAUSE_UNTIL_PRESS}"); const u8 OtherText_ChoosePoke[] = _("Choose a POKéMON."); @@ -377,10 +377,10 @@ const u8 OtherText_TeachWhat[] = _("Teach which POKéMON?"); const u8 OtherText_UseWhat[] = _("Use on which POKéMON?"); const u8 OtherText_GiveWhat[] = _("Give to which POKéMON?"); const u8 OtherText_DoWhat[] = _("Do what with {STR_VAR_1}?"); -const u8 OtherText_NothingToCut[] = _("There’s nothing to CUT."); -const u8 OtherText_CantSurf[] = _("You can’t SURF here."); -const u8 OtherText_AlreadySurfing[] = _("You’re already SURFING."); -const u8 OtherText_CantUseThatHere[] = _("Can’t use that here."); +const u8 OtherText_NothingToCut[] = _("There's nothing to CUT."); +const u8 OtherText_CantSurf[] = _("You can't SURF here."); +const u8 OtherText_AlreadySurfing[] = _("You're already SURFING."); +const u8 OtherText_CantUseThatHere[] = _("Can't use that here."); const u8 OtherText_RestoreWhatMove[] = _("Restore which move?"); const u8 OtherText_BoostPP[] = _("Boost PP of which move?"); const u8 OtherText_DoWhatWithItem[] = _("Do what with an item?"); @@ -388,7 +388,7 @@ const u8 OtherText_NoPokeForBattle[] = _("No POKéMON for battle!"); const u8 OtherText_ChoosePoke2[] = _("Choose a POKéMON."); const u8 OtherText_NotEnoughHP[] = _("Not enough HP..."); const u8 OtherText_ThreePokeNeeded[] = _("Three POKéMON are needed."); -const u8 OtherText_PokeCantBeSame[] = _("POKéMON can’t be the same."); +const u8 OtherText_PokeCantBeSame[] = _("POKéMON can't be the same."); const u8 OtherText_NoIdenticalHoldItems[] = _("No identical hold items."); const u8 OtherText_TeachWhichPoke[] = _("Teach which POKéMON?"); const u8 gOtherText_Attack[] = _("ATTACK"); @@ -420,9 +420,9 @@ const u8 OtherText_Info[] = _("INFO"); const u8 gOtherText_EggLongTime[] = _("It looks like this EGG will\ntake a long time to hatch."); const u8 gOtherText_EggSomeTime[] = _("What will hatch from this?\nIt will take some time."); const u8 gOtherText_EggSoon[] = _("It moves occasionally.\nIt should hatch soon."); -const u8 gOtherText_EggAbout[] = _("It’s making sounds.\nIt’s about to hatch!"); -const u8 gOtherText_CantForgetHMs[] = _("HM moves can’t be\nforgotten now."); -const u8 gOtherText_PlayersBase[] = _("’s BASE"); +const u8 gOtherText_EggAbout[] = _("It's making sounds.\nIt's about to hatch!"); +const u8 gOtherText_CantForgetHMs[] = _("HM moves can't be\nforgotten now."); +const u8 gOtherText_PlayersBase[] = _("'s BASE"); const u8 gOtherText_OkayToDeleteFromRegistry[] = _("Is it okay to delete {STR_VAR_1}\nfrom the REGISTRY?"); const u8 gOtherText_RegisteredDataDeleted[] = _("The registered data was deleted.{PAUSE_UNTIL_PRESS}"); @@ -446,13 +446,13 @@ const u8 SecretBaseText_Cushion[] = _("CUSHION"); const u8 gSecretBaseText_GoldRank[] = _("GOLD"); const u8 gSecretBaseText_SilverRank[] = _("SILVER"); const u8 gSecretBaseText_PlaceItHere[] = _("Place it here?"); -const u8 gSecretBaseText_CantBePlacedHere[] = _("It can’t be placed here."); +const u8 gSecretBaseText_CantBePlacedHere[] = _("It can't be placed here."); const u8 gSecretBaseText_CancelDecorating[] = _("Cancel decorating?"); const u8 gSecretBaseText_InUseAlready[] = _("This is in use already."); const u8 gSecretBaseText_NoMoreDecor[] = _("No more decorations can be placed.\nThe most that can be placed is {STR_VAR_1}."); -const u8 gSecretBaseText_NoMoreDecor2[] = _("No more decorations can be placed.\nThe most that can be placed is {STR_VAR_1}.$This can’t be placed here.\nIt must be on a DESK, etc."); -const u8 gSecretBaseText_DecorCantPlace[] = _("This decoration can’t be placed in\nyour own room."); -const u8 gSecretBaseText_DecorInUse[] = _("This decoration is in use.\nIt can’t be thrown away."); +const u8 gSecretBaseText_NoMoreDecor2[] = _("No more decorations can be placed.\nThe most that can be placed is {STR_VAR_1}.$This can't be placed here.\nIt must be on a DESK, etc."); +const u8 gSecretBaseText_DecorCantPlace[] = _("This decoration can't be placed in\nyour own room."); +const u8 gSecretBaseText_DecorInUse[] = _("This decoration is in use.\nIt can't be thrown away."); const u8 gSecretBaseText_WillBeDiscarded[] = _("This {STR_VAR_1} will be discarded.\nIs that okay?"); const u8 gSecretBaseText_DecorThrownAway[] = _("The decoration item was thrown away."); const u8 gSecretBaseText_StopPuttingAwayDecor[] = _("Stop putting away decorations?"); @@ -483,8 +483,8 @@ const u8 gOtherText_WithdrewThing[] = _("Withdrew {STR_VAR_2}\n{STR_VAR_1}(s).") const u8 OtherText_Read[] = _("READ"); const u8 gOtherText_MoveToBag[] = _("MOVE TO BAG"); const u8 OtherText_Give[] = _("GIVE"); -const u8 gOtherText_NoMailHere[] = _("There’s no MAIL here.{PAUSE_UNTIL_PRESS}"); -const u8 gOtherText_WhatWillYouDoMail[] = _("What would you like to do with\n{STR_VAR_1}’s MAIL?"); +const u8 gOtherText_NoMailHere[] = _("There's no MAIL here.{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_WhatWillYouDoMail[] = _("What would you like to do with\n{STR_VAR_1}'s MAIL?"); const u8 gOtherText_MessageWillBeLost[] = _("The message will be lost.\nIs that okay?"); const u8 gOtherText_BagIsFull[] = _("The BAG is full.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_MailWasReturned[] = _("The MAIL was returned to the BAG\nwith its message erased.{PAUSE_UNTIL_PRESS}"); @@ -497,7 +497,7 @@ const u8 gOtherText_Winona[] = _("WINONA"); const u8 gOtherText_Phoebe[] = _("PHOEBE"); const u8 gOtherText_Glacia[] = _("GLACIA"); const u8 gContestText_ContestWinner[] = _("CONTEST WINNER\n"); -const u8 gOtherText_Unknown1[] = _("’s "); +const u8 gOtherText_Unknown1[] = _("'s "); const u8 OtherText_Cool[] = _("COOL "); const u8 OtherText_Beauty2[] = _("BEAUTY "); const u8 OtherText_Cute[] = _("CUTE "); @@ -509,16 +509,16 @@ const u8 OtherText_GoodLookingPoke[] = _("Hey, there!\nThe good-looking POKéMON const u8 OtherText_Terminator7[] = _(""); const u8 OtherText_MarvelousGreat[] = _("The marvelous, wonderful, and\nvery great "); const u8 OtherText_Terminator8[]= _(""); -const u8 OtherText_CenturyLastVenus[]= _("This century’s last Venus -\nthe beautiful "); +const u8 OtherText_CenturyLastVenus[]= _("This century's last Venus -\nthe beautiful "); const u8 OtherText_Terminator9[]= _(""); const u8 OtherText_Terminator10[]= _(""); -const u8 OtherText_DazzlingSmile[]= _("’s dazzling,\nglittering smile"); -const u8 OtherText_PokeCenterIdol[]= _("POKéMON CENTER’s super idol -\nthe incomparable "); +const u8 OtherText_DazzlingSmile[]= _("'s dazzling,\nglittering smile"); +const u8 OtherText_PokeCenterIdol[]= _("POKéMON CENTER's super idol -\nthe incomparable "); const u8 OtherText_Terminator11[]= _(""); const u8 OtherText_LovelyAndSweet[]= _("The lovely and sweet "); const u8 OtherText_Terminator12[]= _(""); const u8 OtherText_ThePretty[]= _("The pretty "); -const u8 OtherText_WinningPortrait[] = _("’s\nwinning portrait"); +const u8 OtherText_WinningPortrait[] = _("'s\nwinning portrait"); const u8 OtherText_GiveUsWink[] = _("Give us a wink!\nThe cutie POKéMON "); const u8 OtherText_Terminator13[] = _(""); const u8 OtherText_SmartnessMaestro[] = _("The smartness maestro -\nThe wise POKéMON "); @@ -526,7 +526,7 @@ const u8 OtherText_Terminator14[] = _(""); const u8 OtherText_ChosenPokeAmong[] = _("The chosen POKéMON -\nThe one among POKéMON "); const u8 OtherText_Terminator15[] = _(""); const u8 OtherText_TheExcellent[] = _("The excellent "); -const u8 OtherText_ItsMomentOfElegance[] = _("’s\nmoment of elegance"); +const u8 OtherText_ItsMomentOfElegance[] = _("'s\nmoment of elegance"); const u8 OtherText_PowerfullyMuscular[] = _("The powerfully muscular\nspeedster "); const u8 OtherText_Terminator16[] = _(""); const u8 OtherText_StrongErEst[] = _("The strong, stronger, and\nstrongest "); @@ -540,7 +540,7 @@ const u8 OtherText_Lilycove[] = _("LILYCOVE"); const u8 OtherText_Dewford[] = _("DEWFORD"); const u8 OtherText_Enter[] = _("ENTER"); const u8 OtherText_Info3[] = _("INFO"); -const u8 OtherText_WhatsAContest[] = _("What’s a CONTEST?"); +const u8 OtherText_WhatsAContest[] = _("What's a CONTEST?"); const u8 OtherText_TypesOfContest[] = _("Types of CONTESTS"); const u8 OtherText_Ranks[] = _("Ranks"); const u8 OtherText_Judging[] = _("Judging"); @@ -684,9 +684,9 @@ const u8 OtherText_Balls[] = _("BALLS"); const u8 OtherText_TMsHMs[] = _("TMs & HMs"); const u8 OtherText_Berries[] = _("BERRIES"); -const u8 gPCText_SomeonesPC[] = _("SOMEONE’S PC"); -const u8 gPCText_LanettesPC[] = _("LANETTE’S PC"); -const u8 gPCText_PlayersPC[] = _("{PLAYER}’s PC"); +const u8 gPCText_SomeonesPC[] = _("SOMEONE'S PC"); +const u8 gPCText_LanettesPC[] = _("LANETTE'S PC"); +const u8 gPCText_PlayersPC[] = _("{PLAYER}'s PC"); const u8 gPCText_HallOfFame[] = _("HALL OF FAME"); const u8 gPCText_LogOff[] = _("LOG OFF"); @@ -739,11 +739,11 @@ const u8 PCText_ReleasePoke[] = _("Release this POKéMON?"); const u8 PCText_WasReleased[] = _(" was released."); const u8 PCText_ByeBye[] = _("Bye-bye, !"); const u8 PCText_MarkPoke[] = _("Mark your POKéMON."); -const u8 PCText_LastPoke[] = _("That’s your last POKéMON!"); -const u8 PCText_PartyFull[] = _("Your party’s full!"); -const u8 PCText_HoldingPoke[] = _("You’re holding a POKéMON!"); +const u8 PCText_LastPoke[] = _("That's your last POKéMON!"); +const u8 PCText_PartyFull[] = _("Your party's full!"); +const u8 PCText_HoldingPoke[] = _("You're holding a POKéMON!"); const u8 PCText_WhichOneWillTake[] = _("Which one will you take?"); -const u8 PCText_CantReleaseEgg[] = _("You can’t release an EGG."); +const u8 PCText_CantReleaseEgg[] = _("You can't release an EGG."); const u8 PCText_ContinueBox[] = _("Continue BOX operations?"); const u8 PCText_CameBack[] = _(" came back!"); const u8 PCText_Worried[] = _("Was it worried about you?"); @@ -816,7 +816,7 @@ const u8 PCText_ReturnToCondition[] = _("{CLEAR 0}Return to the CONDITION menu." const u8 gOtherText_NumberRegistered[] = _("No. registered"); const u8 gOtherText_NumberBattles[] = _("No. of battles"); const u8 gOtherText_Strategy[] = _("{PALETTE 5}STRATEGY"); -const u8 gOtherText_TrainersPokemon[] = _("{PALETTE 5}TRAINER’S POKéMON"); +const u8 gOtherText_TrainersPokemon[] = _("{PALETTE 5}TRAINER'S POKéMON"); const u8 gOtherText_SelfIntroduction[] = _("{PALETTE 5}SELF-INTRODUCTION"); const u8 gOtherText_Nature2[] = _("NATURE/"); const u8 gOtherText_InParty[] = _("IN PARTY"); @@ -832,9 +832,9 @@ const u8 OtherText_WithFourPhrases[] = _("With four phrases,"); const u8 OtherText_CombineNinePhrasesPage1[] = _("Combine nine phrases and"); const u8 OtherText_CombineNinePhrasesPage2[] = _("make a message."); const u8 OtherText_ImproveBardSongPage1[] = _("Change just one word or phrase"); -const u8 OtherText_ImproveBardSongPage2[] = _("and improve the BARD’s song."); +const u8 OtherText_ImproveBardSongPage2[] = _("and improve the BARD's song."); const u8 OtherText_YourProfile[] = _("Your profile "); -const u8 OtherText_YourFeelingBattle[] = _("Your feeling at the battle’s start"); +const u8 OtherText_YourFeelingBattle[] = _("Your feeling at the battle's start"); const u8 OtherText_SetWinMessage[] = _("What you say if you win a battle"); const u8 OtherText_SetLossMessage[] = _("What you say if you lose a battle"); const u8 OtherText_TheAnswer[] = _("The answer"); @@ -845,7 +845,7 @@ const u8 OtherText_CombineTwoPhrasesPage1[] = _("Combine two phrases and"); const u8 OtherText_CombineTwoPhrasesPage2[] = _("make a trendy saying."); const u8 OtherText_ConfirmTrendyPage1[] = _("The trendy saying"); const u8 OtherText_ConfirmTrendyPage2[] = _("is as shown. Okay?"); -const u8 OtherText_HipsterPage1[] = _("I’ll combine two phrases and"); +const u8 OtherText_HipsterPage1[] = _("I'll combine two phrases and"); const u8 OtherText_HipsterPage2[] = _("teach you a good saying."); const u8 gOtherText_TextDeletedConfirmPage1[] = _("All the text being edited will"); @@ -854,21 +854,21 @@ const u8 gOtherText_QuitEditing[] = _("Quit editing?"); const u8 gOtherText_EditedTextNoSavePage1[] = _("The edited text will not be saved."); const u8 gOtherText_EditedTextNoSavePage2[] = _("Is that okay?"); const u8 gOtherText_EnterAPhraseOrWord[] = _("Please enter a phrase or word."); -const u8 gOtherText_TextNoDelete[] = _("The entire text can’t be deleted."); +const u8 gOtherText_TextNoDelete[] = _("The entire text can't be deleted."); const u8 gOtherText_OnlyOnePhrase[] = _("Only one phrase may be changed."); const u8 gOtherText_OriginalSongRestored[] = _("The original song will be restored."); -const u8 gOtherText_TrendyAlready[] = _("That’s trendy already!"); +const u8 gOtherText_TrendyAlready[] = _("That's trendy already!"); const u8 gOtherText_CombineTwoPhrases[] = _("Combine two words or phrases."); const u8 gOtherText_QuitGivingInfo[] = _("Quit giving information?"); const u8 gOtherText_StopGivingMail[] = _("Stop giving the POKéMON MAIL?"); const u8 gOtherText_Profile[] = _("PROFILE"); -const u8 gOtherText_AtBattleStart[] = _("At the battle’s start."); +const u8 gOtherText_AtBattleStart[] = _("At the battle's start."); const u8 gOtherText_UponWinningBattle[] = _("Upon winning a battle."); const u8 gOtherText_UponLosingBattle[] = _("Upon losing a battle."); // mauville_man? -const u8 gOtherText_TheBardsSong[] = _("The BARD’s Song"); -const u8 gOtherText_WhatsHipHappening[] = _("What’s hip and happening?"); +const u8 gOtherText_TheBardsSong[] = _("The BARD's Song"); +const u8 gOtherText_WhatsHipHappening[] = _("What's hip and happening?"); const u8 gOtherText_Interview[] = _("Interview"); const u8 gOtherText_GoodSaying[] = _("Good saying"); const u8 OtherText_SoPretty[] = _(" so pretty!"); @@ -881,16 +881,16 @@ const u8 OtherText_SoAmusing[] = _(" so amusing!"); const u8 OtherText_SoMagical[] = _(" so magical!"); const u8 gOtherText_Is[] = _(" is"); -const u8 gOtherText_DontYouAgree[] = _("\nDon’t you agree?"); +const u8 gOtherText_DontYouAgree[] = _("\nDon't you agree?"); const u8 OtherText_WantVacationNicePlace[] = _("I so want to go on a vacation.\nWould you happen to know a nice place?"); -const u8 OtherText_BoughtCrayonsIsNice[] = _("I bought crayons with 120 colors!\nDon’t you think that’s nice?"); -const u8 OtherText_IfWeCouldFloat[] = _("Wouldn’t it be nice if we could float\naway on a cloud of bubbles?"); +const u8 OtherText_BoughtCrayonsIsNice[] = _("I bought crayons with 120 colors!\nDon't you think that's nice?"); +const u8 OtherText_IfWeCouldFloat[] = _("Wouldn't it be nice if we could float\naway on a cloud of bubbles?"); const u8 OtherText_SandWashesAwayMakeSad[] = _("When you write on a sandy beach,\nthey wash away. It makes me sad."); -const u8 OtherText_WhatsBottomSeaLike[] = _("What’s the bottom of the sea like?\nJust once I would so love to go!"); +const u8 OtherText_WhatsBottomSeaLike[] = _("What's the bottom of the sea like?\nJust once I would so love to go!"); const u8 OtherText_SeeSettingSun[] = _("When you see the setting sun, does it\nmake you want to go home?"); -const u8 OtherText_LyingInGreenGrass[] = _("Lying back in the green grass...\nOh, it’s so, so nice!"); -const u8 OtherText_SecretBasesWonderful[] = _("SECRET BASES are so wonderful!\nCan’t you feel the excitement?"); +const u8 OtherText_LyingInGreenGrass[] = _("Lying back in the green grass...\nOh, it's so, so nice!"); +const u8 OtherText_SecretBasesWonderful[] = _("SECRET BASES are so wonderful!\nCan't you feel the excitement?"); const u8 OtherText_PokeLeague[] = _("POKéMON LEAGUE"); const u8 OtherText_PokeCenter[] = _("POKéMON CENTER"); @@ -905,7 +905,7 @@ const u8 OtherText_Toughness[] = _("Toughness "); const u8 gOtherText_WasEnhanced[] = _("was enhanced!"); const u8 gOtherText_NothingChanged[] = _("Nothing changed!"); -const u8 gOtherText_WontEat[] = _("It won’t eat anymore..."); +const u8 gOtherText_WontEat[] = _("It won't eat anymore..."); const u8 gSystemText_SaveFailedBackupCheck[] = _("Save failed.\nChecking the backup memory...\nPlease wait.\n{COLOR RED}“Time required: 1 minute”"); const u8 gSystemText_BackupDamagedGameContinue[] = _("The backup memory is damaged or\nthe internal battery has run dry.\nThe game can be played. However,\nprogress cannot be saved."); @@ -925,9 +925,9 @@ const u8 gSystemText_PleaseResetTime[] = _("Please reset the time."); const u8 gSystemText_ClockResetDataSave[] = _("The clock has been reset.\nData will be saved. Please wait."); const u8 gSystemText_SaveCompleted[] = _("Save completed."); 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_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."); +const u8 gSystemText_Saving[] = _("SAVING...\nDON'T TURN OFF THE POWER."); #elif GERMAN @@ -967,7 +967,7 @@ const u8 gSaveFileCorruptMessage[] = _("Der Spielstand ist beschädigt. Der\nvor const u8 gSaveFileDeletedMessage[] = _("Der Spielstand wurde gelöscht."); // system text 3 -const u8 gBoardNotInstalledMessage[] = _("Das ‘1M Sub-circuit Board’\nist nicht installiert."); +const u8 gBoardNotInstalledMessage[] = _("Das ‘1M Sub-circuit Board'\nist nicht installiert."); const u8 gBatteryDryMessage[] = _("Interne Batterie ist verbraucht.\nSpiel kann fortgesetzt werden.\pAber zeitbasierende Spiel-Events\nwerden nicht mehr initiiert."); // main menu text 2 @@ -1073,7 +1073,7 @@ const u8 gOtherText_Level3[] = _("Lv."); const u8 gOtherText_IDNumber[] = _("ID.Nr. /"); const u8 gOtherText_Name[] = _("NAME /"); const u8 gOtherText_IDNumber2[] = _("ID.Nr. /"); -const u8 gOtherText_BirchInTrouble[] = _("{HIGHLIGHT WHITE2}{COLOR DARK_GREY}PROF. BIRK ist in Schwierigkeiten!\nSchnapp’ dir ein POKéMON und hilf ihm!"); +const u8 gOtherText_BirchInTrouble[] = _("{HIGHLIGHT WHITE2}{COLOR DARK_GREY}PROF. BIRK ist in Schwierigkeiten!\nSchnapp' dir ein POKéMON und hilf ihm!"); const u8 gOtherText_DoYouChoosePoke[] = _("{HIGHLIGHT WHITE2}{COLOR DARK_GREY}Wählst du dieses POKéMON?"); const u8 gOtherText_Poke[] = _("POKéMON"); |