TriForce → TriAttack

3 files changed, 18 insertions, 18 deletions

diff --git a/src/battle_anim.c b/src/battle_anim.c
index 0b31a8f2e..5cba4a6e4 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -1355,7 +1355,7 @@ const struct CompressedSpriteSheet gBattleAnimPicTable[] =
     {gBattleAnimSpriteGfx_Spotlight, 0x0800, ANIM_TAG_SPOTLIGHT},
     {gBattleAnimSpriteGfx_LetterZ, 0x0200, ANIM_TAG_LETTER_Z},
     {gBattleAnimSpriteGfx_RapidSpin, 0x0300, ANIM_TAG_RAPID_SPIN},
-    {gBattleAnimSpriteGfx_TriForceTriangle, 0x0800, ANIM_TAG_TRI_FORCE_TRIANGLE},
+    {gBattleAnimSpriteGfx_TriAttackTriangle, 0x0800, ANIM_TAG_TRI_ATTACK_TRIANGLE},
     {gBattleAnimSpriteGfx_WispOrb, 0x0380, ANIM_TAG_WISP_ORB},
     {gBattleAnimSpriteGfx_WispFire, 0x0800, ANIM_TAG_WISP_FIRE},
     {gBattleAnimSpriteGfx_GoldStars, 0x00c0, ANIM_TAG_GOLD_STARS},
@@ -1648,7 +1648,7 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] =
     {gBattleAnimSpritePal_Pokeball, ANIM_TAG_SPOTLIGHT},
     {gBattleAnimSpritePal_LetterZ, ANIM_TAG_LETTER_Z},
     {gBattleAnimSpritePal_RapidSpin, ANIM_TAG_RAPID_SPIN},
-    {gBattleAnimSpritePal_TriForceTriangle, ANIM_TAG_TRI_FORCE_TRIANGLE},
+    {gBattleAnimSpritePal_TriAttackTriangle, ANIM_TAG_TRI_ATTACK_TRIANGLE},
     {gBattleAnimSpritePal_WispOrb, ANIM_TAG_WISP_ORB},
     {gBattleAnimSpritePal_WispOrb, ANIM_TAG_WISP_FIRE},
     {gBattleAnimSpritePal_GoldStars, ANIM_TAG_GOLD_STARS},
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index 02df544e0..b55a4c3ed 100755
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -38,7 +38,7 @@ void AnimSpotlight(struct Sprite *);
 void AnimClappingHand(struct Sprite *);
 void AnimClappingHand2(struct Sprite *);
 void AnimRapidSpin(struct Sprite *);
-void AnimTriForceTriangle(struct Sprite *);
+void AnimTriAttackTriangle(struct Sprite *);
 void AnimBatonPassPokeball(struct Sprite *);
 void AnimWishStar(struct Sprite *);
 void AnimMiniTwinklingStar(struct Sprite *);
@@ -440,18 +440,18 @@ const union AffineAnimCmd gUnknown_085CE2A0[] =
     AFFINEANIMCMD_END,
 };
 
-const union AnimCmd gTriForceTriangleAnimCmds[] =
+const union AnimCmd gTriAttackTriangleAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gTriForceTriangleAnimTable[] =
+const union AnimCmd *const gTriAttackTriangleAnimTable[] =
 {
-    gTriForceTriangleAnimCmds,
+    gTriAttackTriangleAnimCmds,
 };
 
-const union AffineAnimCmd gTriForceTriangleAffineAnimCmds[] =
+const union AffineAnimCmd gTriAttackTriangleAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0, 0, 5, 40),
     AFFINEANIMCMD_FRAME(0, 0, 10, 10),
@@ -460,20 +460,20 @@ const union AffineAnimCmd gTriForceTriangleAffineAnimCmds[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd *const gTriForceTriangleAffineAnimTable[] =
+const union AffineAnimCmd *const gTriAttackTriangleAffineAnimTable[] =
 {
-    gTriForceTriangleAffineAnimCmds,
+    gTriAttackTriangleAffineAnimCmds,
 };
 
-const struct SpriteTemplate gTriForceTriangleSpriteTemplate =
+const struct SpriteTemplate gTriAttackTriangleSpriteTemplate =
 {
-    .tileTag = ANIM_TAG_TRI_FORCE_TRIANGLE,
-    .paletteTag = ANIM_TAG_TRI_FORCE_TRIANGLE,
+    .tileTag = ANIM_TAG_TRI_ATTACK_TRIANGLE,
+    .paletteTag = ANIM_TAG_TRI_ATTACK_TRIANGLE,
     .oam = &gOamData_AffineDouble_ObjNormal_64x64,
-    .anims = gTriForceTriangleAnimTable,
+    .anims = gTriAttackTriangleAnimTable,
     .images = NULL,
-    .affineAnims = gTriForceTriangleAffineAnimTable,
-    .callback = AnimTriForceTriangle,
+    .affineAnims = gTriAttackTriangleAffineAnimTable,
+    .callback = AnimTriAttackTriangle,
 };
 
 const union AnimCmd gEclipsingOrbAnimCmds[] =
@@ -2013,7 +2013,7 @@ static void TormentAttacker_Callback(struct Sprite *sprite)
     }
 }
 
-void AnimTriForceTriangle(struct Sprite *sprite)
+void AnimTriAttackTriangle(struct Sprite *sprite)
 {
     if (sprite->data[0] == 0)
         InitSpritePosToAnimAttacker(sprite, FALSE);
diff --git a/src/graphics.c b/src/graphics.c
index 5f27cdea4..22478a7b6 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -777,8 +777,8 @@ const u32 gBattleAnimSpriteGfx_Roots[] = INCBIN_U32("graphics/battle_anims/sprit
 const u32 gBattleAnimSpritePal_ItemBag[] = INCBIN_U32("graphics/battle_anims/sprites/item_bag.gbapal.lz");
 const u32 gBattleAnimSpriteGfx_ItemBag[] = INCBIN_U32("graphics/battle_anims/sprites/item_bag.4bpp.lz");
 
-const u32 gBattleAnimSpritePal_TriForceTriangle[] = INCBIN_U32("graphics/battle_anims/sprites/tri_force_triangle.gbapal.lz");
-const u32 gBattleAnimSpriteGfx_TriForceTriangle[] = INCBIN_U32("graphics/battle_anims/sprites/tri_force_triangle.4bpp.lz");
+const u32 gBattleAnimSpritePal_TriAttackTriangle[] = INCBIN_U32("graphics/battle_anims/sprites/tri_attack_triangle.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_TriAttackTriangle[] = INCBIN_U32("graphics/battle_anims/sprites/tri_attack_triangle.4bpp.lz");
 
 const u32 gBattleAnimSpritePal_LetterZ[] = INCBIN_U32("graphics/battle_anims/sprites/letter_z.gbapal.lz");
 const u32 gBattleAnimSpriteGfx_LetterZ[] = INCBIN_U32("graphics/battle_anims/sprites/letter_z.4bpp.lz");