Merge pull request #708 from garakmon/createsprite

Change createsprite macro

12 files changed, 36 insertions, 36 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;
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 780a37b2e..31bf4612d 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(gBattleAnimAttacker))
         {
@@ -422,7 +422,7 @@ u8 GetAnimBattlerSpriteId(u8 whichBank)
             return 0xff;
         }
     }
-    else if (whichBank == ANIM_BANK_TARGET)
+    else if (whichBank == ANIM_BATTLER_TARGET)
     {
         if (IsBankSpritePresent(gBattleAnimTarget))
         {
@@ -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(gBattleAnimAttacker ^ 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
+}