summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-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
-rw-r--r--src/diploma.c2
-rw-r--r--src/party_menu.c2
-rw-r--r--src/reset_rtc_screen.c2
-rw-r--r--src/rom_8077ABC.c8
-rw-r--r--src/unused_81258BC.c2
12 files changed, 36 insertions, 36 deletions
diff --git a/src/battle/anim/fire.c b/src/battle/anim/fire.c
index c5d75d9a5..6262b382d 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 3e3e7dc6b..4ad4375e6 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 6559e1b2e..004b1f478 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 e41251964..f75572101 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 de50fc419..c8a9fefb4 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 afcfaa832..01047ebf4 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 376de416a..92794f674 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 = gAnimBankAttacker;
else
bank = gAnimBankTarget;
@@ -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 = gAnimBankAttacker;
else
bank = gAnimBankTarget;
@@ -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 = gAnimBankAttacker;
else
bank = gAnimBankTarget;
@@ -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 = gAnimBankAttacker;
else
bank = gAnimBankTarget;
diff --git a/src/diploma.c b/src/diploma.c
index 5a1e1254b..c92491cc6 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -136,4 +136,4 @@ static void DisplayDiplomaText(void)
StringCopy(gStringVar1, gOtherText_HoennDex);
}
Menu_PrintText(gOtherText_DiplomaCertificationGameFreak, 6, 2);
-} \ No newline at end of file
+}
diff --git a/src/party_menu.c b/src/party_menu.c
index 2cb6a3960..2095db331 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -5272,4 +5272,4 @@ void unref_sub_8070F90(void)
FlagSet(FLAG_SYS_POKEMON_GET);
FlagSet(FLAG_SYS_POKENAV_GET);
}
-#endif \ No newline at end of file
+#endif
diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c
index 52ec0a919..7bccddde5 100644
--- a/src/reset_rtc_screen.c
+++ b/src/reset_rtc_screen.c
@@ -689,4 +689,4 @@ void debug_sub_806F9E4(u8 taskId)
break;
}
}
-#endif \ No newline at end of file
+#endif
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index 20ca6c592..943b57238 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -410,7 +410,7 @@ u8 GetAnimBattlerSpriteId(u8 whichBank)
{
u8 *sprites;
- if (whichBank == ANIM_BANK_ATTACKER)
+ if (whichBank == ANIM_BATTLER_ATTACKER)
{
if (IsBankSpritePresent(gAnimBankAttacker))
{
@@ -422,7 +422,7 @@ u8 GetAnimBattlerSpriteId(u8 whichBank)
return 0xff;
}
}
- else if (whichBank == ANIM_BANK_TARGET)
+ else if (whichBank == ANIM_BATTLER_TARGET)
{
if (IsBankSpritePresent(gAnimBankTarget))
{
@@ -434,7 +434,7 @@ u8 GetAnimBattlerSpriteId(u8 whichBank)
return 0xff;
}
}
- else if (whichBank == ANIM_BANK_ATK_PARTNER)
+ else if (whichBank == ANIM_BATTLER_ATK_PARTNER)
{
if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
return 0xff;
@@ -1883,7 +1883,7 @@ u8 GetBattlerSubpriority(u8 bank)
if (IsContest())
{
- if (bank == ANIM_BANK_ATK_PARTNER)
+ if (bank == ANIM_BATTLER_ATK_PARTNER)
return 30;
else
return 40;
diff --git a/src/unused_81258BC.c b/src/unused_81258BC.c
index c25884053..1379eb995 100644
--- a/src/unused_81258BC.c
+++ b/src/unused_81258BC.c
@@ -33,4 +33,4 @@ void sub_812AF10(void)
{
Menu_DrawStdWindowFrame(2, 14, 27, 19);
Menu_PrintText(gStringVar4, 3, 15);
-} \ No newline at end of file
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 18:29:35 +0000