summaryrefslogtreecommitdiff
path: root/src/battle
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle')
-rw-r--r--src/battle/anim/fire.c2
-rw-r--r--src/battle/anim/flying.c2
-rw-r--r--src/battle/anim/poison.c2
-rw-r--r--src/battle/anim/sfx.c2
-rw-r--r--src/battle/anim/tendrils.c2
-rw-r--r--src/battle/anim/wisp_fire.c2
-rw-r--r--src/battle/battle_anim.c44
7 files changed, 28 insertions, 28 deletions
diff --git a/src/battle/anim/fire.c b/src/battle/anim/fire.c
index 59923ea1a..09e83813b 100644
--- a/src/battle/anim/fire.c
+++ b/src/battle/anim/fire.c
@@ -305,4 +305,4 @@ static void sub_80D50E8(struct Sprite *sprite)
{
move_anim_8074EE0(sprite);
}
-} \ No newline at end of file
+}
diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c
index 9722e884a..f9f328283 100644
--- a/src/battle/anim/flying.c
+++ b/src/battle/anim/flying.c
@@ -2673,4 +2673,4 @@ void unref_sub_80DB6E4(u8 taskId)
}
DestroyAnimVisualTask(taskId);
-} \ No newline at end of file
+}
diff --git a/src/battle/anim/poison.c b/src/battle/anim/poison.c
index b6af984ef..9ec5bffa6 100644
--- a/src/battle/anim/poison.c
+++ b/src/battle/anim/poison.c
@@ -323,4 +323,4 @@ static void AnimBubbleEffectStep(struct Sprite *sprite)
if (sprite->affineAnimEnded)
DestroyAnimSprite(sprite);
-} \ No newline at end of file
+}
diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c
index e1127508b..9bc88e258 100644
--- a/src/battle/anim/sfx.c
+++ b/src/battle/anim/sfx.c
@@ -277,4 +277,4 @@ static void sub_812B404(u8 taskId)
{
DestroyAnimVisualTask(taskId);
}
-} \ No newline at end of file
+}
diff --git a/src/battle/anim/tendrils.c b/src/battle/anim/tendrils.c
index 8999cf18d..8d7959c21 100644
--- a/src/battle/anim/tendrils.c
+++ b/src/battle/anim/tendrils.c
@@ -119,4 +119,4 @@ static void sub_80CB2D4(struct Sprite* sprite)
DestroyAnimSprite(sprite);
}
}
-} \ No newline at end of file
+}
diff --git a/src/battle/anim/wisp_fire.c b/src/battle/anim/wisp_fire.c
index 6914afdd4..714f59d71 100644
--- a/src/battle/anim/wisp_fire.c
+++ b/src/battle/anim/wisp_fire.c
@@ -229,4 +229,4 @@ void sub_80D60B4(u8 taskId)
gSprites[spriteId].pos2.y = 0;
DestroyAnimVisualTask(taskId);
}
-} \ No newline at end of file
+}
diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c
index 48852e627..287d80ab1 100644
--- a/src/battle/battle_anim.c
+++ b/src/battle/battle_anim.c
@@ -1824,12 +1824,12 @@ static void ScriptCmd_monbg(void)
sBattleAnimScriptPtr++;
animBank = T1_READ_8(sBattleAnimScriptPtr);
- if (animBank == ANIM_BANK_ATTACKER)
- animBank = ANIM_BANK_ATK_PARTNER;
- else if (animBank == ANIM_BANK_TARGET)
- animBank = ANIM_BANK_DEF_PARTNER;
+ if (animBank == ANIM_BATTLER_ATTACKER)
+ animBank = ANIM_BATTLER_ATK_PARTNER;
+ else if (animBank == ANIM_BATTLER_TARGET)
+ animBank = ANIM_BATTLER_DEF_PARTNER;
- if (animBank == ANIM_BANK_ATTACKER || animBank == ANIM_BANK_ATK_PARTNER)
+ if (animBank == ANIM_BATTLER_ATTACKER || animBank == ANIM_BATTLER_ATK_PARTNER)
bank = gBattleAnimAttacker;
else
bank = gBattleAnimTarget;
@@ -1866,7 +1866,7 @@ static void ScriptCmd_monbg(void)
}
bank ^= 2;
- if (animBank >= ANIM_BANK_ATK_PARTNER && IsAnimBankSpriteVisible(bank))
+ if (animBank >= ANIM_BATTLER_ATK_PARTNER && IsAnimBankSpriteVisible(bank))
{
identity = GetBattlerPosition(bank);
identity += 0xFF;
@@ -2095,12 +2095,12 @@ static void ScriptCmd_clearmonbg(void)
sBattleAnimScriptPtr++;
animBankId = T1_READ_8(sBattleAnimScriptPtr);
- if (animBankId == ANIM_BANK_ATTACKER)
- animBankId = ANIM_BANK_ATK_PARTNER;
- else if (animBankId == ANIM_BANK_TARGET)
- animBankId = ANIM_BANK_DEF_PARTNER;
+ if (animBankId == ANIM_BATTLER_ATTACKER)
+ animBankId = ANIM_BATTLER_ATK_PARTNER;
+ else if (animBankId == ANIM_BATTLER_TARGET)
+ animBankId = ANIM_BATTLER_DEF_PARTNER;
- if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER)
+ if (animBankId == ANIM_BATTLER_ATTACKER || animBankId == ANIM_BATTLER_ATK_PARTNER)
bank = gBattleAnimAttacker;
else
bank = gBattleAnimTarget;
@@ -2158,12 +2158,12 @@ static void ScriptCmd_monbg_22(void)
sBattleAnimScriptPtr++;
animBankId = T1_READ_8(sBattleAnimScriptPtr);
- if (animBankId == ANIM_BANK_ATTACKER)
- animBankId = ANIM_BANK_ATK_PARTNER;
- else if (animBankId == ANIM_BANK_TARGET)
- animBankId = ANIM_BANK_DEF_PARTNER;
+ if (animBankId == ANIM_BATTLER_ATTACKER)
+ animBankId = ANIM_BATTLER_ATK_PARTNER;
+ else if (animBankId == ANIM_BATTLER_TARGET)
+ animBankId = ANIM_BATTLER_DEF_PARTNER;
- if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER)
+ if (animBankId == ANIM_BATTLER_ATTACKER || animBankId == ANIM_BATTLER_ATK_PARTNER)
bank = gBattleAnimAttacker;
else
bank = gBattleAnimTarget;
@@ -2181,7 +2181,7 @@ static void ScriptCmd_monbg_22(void)
}
bank ^= 2;
- if (animBankId > ANIM_BANK_TARGET && IsAnimBankSpriteVisible(bank))
+ if (animBankId > ANIM_BATTLER_TARGET && IsAnimBankSpriteVisible(bank))
{
identity = GetBattlerPosition(bank);
identity += 0xFF;
@@ -2204,12 +2204,12 @@ static void ScriptCmd_clearmonbg_23(void)
sBattleAnimScriptPtr++;
animBankId = T1_READ_8(sBattleAnimScriptPtr);
- if (animBankId == ANIM_BANK_ATTACKER)
- animBankId = ANIM_BANK_ATK_PARTNER;
- else if (animBankId == ANIM_BANK_TARGET)
- animBankId = ANIM_BANK_DEF_PARTNER;
+ if (animBankId == ANIM_BATTLER_ATTACKER)
+ animBankId = ANIM_BATTLER_ATK_PARTNER;
+ else if (animBankId == ANIM_BATTLER_TARGET)
+ animBankId = ANIM_BATTLER_DEF_PARTNER;
- if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER)
+ if (animBankId == ANIM_BATTLER_ATTACKER || animBankId == ANIM_BATTLER_ATK_PARTNER)
bank = gBattleAnimAttacker;
else
bank = gBattleAnimTarget;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 11:28:55 +0000