diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-25 20:00:04 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-11-25 20:00:04 -0500 |
| commit | f559fa3fe26910056e84315370cb13ec8501af18 (patch) | |
| tree | 498c7ed00243cf03420451fdde3e04ac36add55c /include/graphics.h | |
| parent | 4c52cf9ed15f01f949fbf2139444f674694e446d (diff) | |
| parent | 6efa51f8ad7b62a3a12c81f1d0bf299be31718b0 (diff) | |
Merge master into ObjEvent rename
Diffstat (limited to 'include/graphics.h')
| -rw-r--r-- | include/graphics.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/graphics.h b/include/graphics.h index 831b202f8..146803cfa 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4363,7 +4363,7 @@ extern const u32 gBattleAnimSpriteGfx_Pokeball[]; extern const u32 gBattleAnimSpriteGfx_Spotlight[]; extern const u32 gBattleAnimSpriteGfx_LetterZ[]; extern const u32 gBattleAnimSpriteGfx_RapidSpin[]; -extern const u32 gBattleAnimSpriteGfx_TriForceTriangle[]; +extern const u32 gBattleAnimSpriteGfx_TriAttackTriangle[]; extern const u32 gBattleAnimSpriteGfx_WispOrb[]; extern const u32 gBattleAnimSpriteGfx_WispFire[]; extern const u32 gBattleAnimSpriteGfx_GoldStars[]; @@ -4646,7 +4646,7 @@ extern const u32 gBattleAnimSpritePal_JaggedMusicNote[]; extern const u32 gBattleAnimSpritePal_Pokeball[]; extern const u32 gBattleAnimSpritePal_LetterZ[]; extern const u32 gBattleAnimSpritePal_RapidSpin[]; -extern const u32 gBattleAnimSpritePal_TriForceTriangle[]; +extern const u32 gBattleAnimSpritePal_TriAttackTriangle[]; extern const u32 gBattleAnimSpritePal_WispOrb[]; extern const u32 gBattleAnimSpritePal_GoldStars[]; extern const u32 gBattleAnimSpritePal_EclipsingOrb[]; |