From 3acb32acb826ddb693c346da517a9a1b203b3582 Mon Sep 17 00:00:00 2001 From: Blackforest92 Date: Fri, 9 Sep 2022 00:25:43 +0700 Subject: [PATCH] Tyding graphics - Acupressure --- data/battle_anim_scripts.s | 6 +- .../battle_anims/sprites/accupressure.png | Bin 358 -> 0 bytes graphics/battle_anims/sprites/acupressure.png | Bin 0 -> 310 bytes .../sprites/acupressure_finger.png | Bin 298 -> 0 bytes include/constants/battle_anim.h | 125 +++++++++--------- include/constants/map_groups.h | 2 + include/graphics.h | 6 +- src/battle_anim_effects_1.c | 6 +- src/battle_anim_rock.c | 2 +- src/data/battle_anim.h | 6 +- src/graphics.c | 7 +- 11 files changed, 77 insertions(+), 83 deletions(-) delete mode 100644 graphics/battle_anims/sprites/accupressure.png create mode 100644 graphics/battle_anims/sprites/acupressure.png delete mode 100644 graphics/battle_anims/sprites/acupressure_finger.png diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 6a46a2d55..f83d437a5 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1185,9 +1185,9 @@ Move_TAILWIND: end Move_ACUPRESSURE: - loadspritegfx ANIM_TAG_ACCUPRESSURE + loadspritegfx ANIM_TAG_ACUPRESSURE loadspritegfx ANIM_TAG_SPARK_2 - createsprite gAccupressureSpriteTemplate, ANIM_ATTACKER, 40, 0, -40, 40 + createsprite gAcupressureSpriteTemplate, ANIM_ATTACKER, 40, 0, -40, 40 waitforvisualfinish call ElectricityEffect end @@ -4337,7 +4337,7 @@ Move_LUNAR_DANCE: Move_CRUSH_GRIP: loadspritegfx ANIM_TAG_EXPLOSION - loadspritegfx ANIM_TAG_ACCUPRESSURE + loadspritegfx ANIM_TAG_ACUPRESSURE loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE setalpha 15, 0 createsprite gCrushGripHandTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 25, 0x101 diff --git a/graphics/battle_anims/sprites/accupressure.png b/graphics/battle_anims/sprites/accupressure.png deleted file mode 100644 index 0da836ff3fec4d52d5a2d30f4ae9cffb83aac295..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LKS0D`p5gri<0SP-+95}Gy z#Elydz~IG)4t8*0pd71sZz_izopr07S5TX#fBK diff --git a/graphics/battle_anims/sprites/acupressure.png b/graphics/battle_anims/sprites/acupressure.png new file mode 100644 index 0000000000000000000000000000000000000000..5d8ae62bc9ca1592ea13573666e6b9eccd5b3efc GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvg8-ip*NOux1Ox;kJR%YT5_YUO zaA3oU8#f++!HW+cJ^)prf!W#bgn>c_JzX3_G$yuA^cHF|5ODDOE pQ2T!%k^7adzzVa5`kV{9p7WJ!31o~*OvfAw|crbhE&X%I>DRoumX?E&7Ulm&io7=%mzW%0=sv( z**os5D^%$84F8%p@7Uplj!6HeWJXI%Shm$RvT(O3n*>^DZq)>O8t(PQvA^ z)N1Fn?E%-@TXWg}#ujaySe<9h+Ho=btuwPc!_}1BE!GdNIxmtmZz(q%Q~loCIEZJaCiU! diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 28bcb283d..db2efd8d0 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -308,7 +308,7 @@ #define ANIM_TAG_MEGA_PARTICLES (ANIM_SPRITES_START + 297) #define ANIM_TAG_TRUMP_CARD (ANIM_SPRITES_START + 298) #define ANIM_TAG_TRUMP_CARD_PARTICLES (ANIM_SPRITES_START + 299) -#define ANIM_TAG_ACCUPRESSURE (ANIM_SPRITES_START + 300) +#define ANIM_TAG_ACUPRESSURE (ANIM_SPRITES_START + 300) #define ANIM_TAG_WRING_OUT (ANIM_SPRITES_START + 301) #define ANIM_TAG_COLORED_ORBS (ANIM_SPRITES_START + 302) #define ANIM_TAG_WORRY_SEED (ANIM_SPRITES_START + 303) @@ -334,68 +334,67 @@ #define ANIM_TAG_BRINE (ANIM_SPRITES_START + 322) #define ANIM_TAG_GEAR (ANIM_SPRITES_START + 323) #define ANIM_TAG_ASSURANCE_HAND (ANIM_SPRITES_START + 324) -#define ANIM_TAG_ACUPRESSURE_FINGER (ANIM_SPRITES_START + 325) -#define ANIM_TAG_WISHIWASHI_FISH (ANIM_SPRITES_START + 326) -#define ANIM_TAG_ZYGARDE_HEXES (ANIM_SPRITES_START + 327) -#define ANIM_TAG_AURA_SPHERE (ANIM_SPRITES_START + 328) -#define ANIM_TAG_OMEGA_STONE (ANIM_SPRITES_START + 329) -#define ANIM_TAG_ALPHA_STONE (ANIM_SPRITES_START + 330) -#define ANIM_TAG_BERRY_NORMAL (ANIM_SPRITES_START + 331) -#define ANIM_TAG_BERRY_EATEN (ANIM_SPRITES_START + 332) -#define ANIM_TAG_DRAGON_ASCENT (ANIM_SPRITES_START + 333) -#define ANIM_TAG_PINK_DIAMOND (ANIM_SPRITES_START + 334) -#define ANIM_TAG_STEAM_ERUPTION (ANIM_SPRITES_START + 335) -#define ANIM_TAG_CONFIDE (ANIM_SPRITES_START + 336) -#define ANIM_TAG_VERTICAL_HEX (ANIM_SPRITES_START + 337) -#define ANIM_TAG_UNAVAILABLE_1 (ANIM_SPRITES_START + 338) //0x2862.. supposedly used elsewhere? -#define ANIM_TAG_UNAVAILABLE_2 (ANIM_SPRITES_START + 339) -#define ANIM_TAG_POWER_TRICK (ANIM_SPRITES_START + 340) -#define ANIM_TAG_CHAIN_LINK (ANIM_SPRITES_START + 341) -#define ANIM_TAG_ANCHOR (ANIM_SPRITES_START + 342) -#define ANIM_TAG_HORSESHOE_SIDE_FIST (ANIM_SPRITES_START + 343) -#define ANIM_TAG_DRAGON_ASCENT_FOE (ANIM_SPRITES_START + 344) -#define ANIM_TAG_CRAFTY_SHIELD (ANIM_SPRITES_START + 345) -#define ANIM_TAG_BLACEPHALON_HEAD (ANIM_SPRITES_START + 346) -#define ANIM_TAG_FAIRY_LOCK_CHAINS (ANIM_SPRITES_START + 347) -#define ANIM_TAG_IONS (ANIM_SPRITES_START + 348) -#define ANIM_TAG_CHOP (ANIM_SPRITES_START + 349) -#define ANIM_TAG_HEART_STAMP (ANIM_SPRITES_START + 350) -#define ANIM_TAG_HORN_LEECH (ANIM_SPRITES_START + 351) -#define ANIM_TAG_STEAMROLLER (ANIM_SPRITES_START + 352) -#define ANIM_TAG_HOOPA_HAND (ANIM_SPRITES_START + 353) -#define ANIM_TAG_HOOPA_RING (ANIM_SPRITES_START + 354) -#define ANIM_TAG_METAL_BITS (ANIM_SPRITES_START + 355) -#define ANIM_TAG_SMALL_ROCK (ANIM_SPRITES_START + 356) -#define ANIM_TAG_SPIRIT_ARROW (ANIM_SPRITES_START + 357) -#define ANIM_TAG_ULTRA_BURST_SYMBOL (ANIM_SPRITES_START + 358) -#define ANIM_TAG_Z_MOVE_SYMBOL (ANIM_SPRITES_START + 359) -#define ANIM_TAG_REALLY_BIG_ROCK (ANIM_SPRITES_START + 360) -#define ANIM_TAG_COCOON (ANIM_SPRITES_START + 361) -#define ANIM_TAG_CORKSCREW (ANIM_SPRITES_START + 362) -#define ANIM_TAG_HAVOC_SPEAR (ANIM_SPRITES_START + 363) -#define ANIM_TAG_PURPLE_DRAKE (ANIM_SPRITES_START + 364) -#define ANIM_TAG_MUD_BOMB (ANIM_SPRITES_START + 365) -#define ANIM_TAG_BRANCH (ANIM_SPRITES_START + 366) -#define ANIM_TAG_APPLE (ANIM_SPRITES_START + 367) -#define ANIM_TAG_OBSTRUCT_CROSS (ANIM_SPRITES_START + 368) -#define ANIM_TAG_POISON_COLUMN (ANIM_SPRITES_START + 369) -#define ANIM_TAG_GARBAGE_COLUMN (ANIM_SPRITES_START + 370) -#define ANIM_TAG_LARGE_SPIKE (ANIM_SPRITES_START + 371) -#define ANIM_TAG_DRAGON_PULSE_RING (ANIM_SPRITES_START + 372) -#define ANIM_TAG_STONE_PILLAR (ANIM_SPRITES_START + 373) -#define ANIM_TAG_MUSHROOM (ANIM_SPRITES_START + 374) -#define ANIM_TAG_GOLDEN_APPLE (ANIM_SPRITES_START + 375) -#define ANIM_TAG_ICE_ROCK (ANIM_SPRITES_START + 376) -#define ANIM_TAG_TORNADO (ANIM_SPRITES_START + 377) -#define ANIM_TAG_STRAIGHT_BEAM (ANIM_SPRITES_START + 378) -#define ANIM_TAG_DREEPY (ANIM_SPRITES_START + 379) -#define ANIM_TAG_ICE_ROCK_SINGLE (ANIM_SPRITES_START + 380) -#define ANIM_TAG_STONE_PILLAR_MULTI (ANIM_SPRITES_START + 381) -#define ANIM_TAG_ALPHA_SYMBOL (ANIM_SPRITES_START + 382) -#define ANIM_TAG_OMEGA_SYMBOL (ANIM_SPRITES_START + 383) -#define ANIM_TAG_PRIMAL_PARTICLES (ANIM_SPRITES_START + 384) -#define ANIM_TAG_STEEL_BEAM (ANIM_SPRITES_START + 385) -#define ANIM_TAG_POLTERGEIST (ANIM_SPRITES_START + 386) +#define ANIM_TAG_WISHIWASHI_FISH (ANIM_SPRITES_START + 325) +#define ANIM_TAG_ZYGARDE_HEXES (ANIM_SPRITES_START + 326) +#define ANIM_TAG_AURA_SPHERE (ANIM_SPRITES_START + 327) +#define ANIM_TAG_OMEGA_STONE (ANIM_SPRITES_START + 328) +#define ANIM_TAG_ALPHA_STONE (ANIM_SPRITES_START + 329) +#define ANIM_TAG_BERRY_NORMAL (ANIM_SPRITES_START + 330) +#define ANIM_TAG_BERRY_EATEN (ANIM_SPRITES_START + 331) +#define ANIM_TAG_DRAGON_ASCENT (ANIM_SPRITES_START + 332) +#define ANIM_TAG_PINK_DIAMOND (ANIM_SPRITES_START + 333) +#define ANIM_TAG_STEAM_ERUPTION (ANIM_SPRITES_START + 334) +#define ANIM_TAG_CONFIDE (ANIM_SPRITES_START + 335) +#define ANIM_TAG_VERTICAL_HEX (ANIM_SPRITES_START + 336) +#define ANIM_TAG_UNAVAILABLE_1 (ANIM_SPRITES_START + 337) //0x2862.. supposedly used elsewhere? +#define ANIM_TAG_UNAVAILABLE_2 (ANIM_SPRITES_START + 338) +#define ANIM_TAG_POWER_TRICK (ANIM_SPRITES_START + 339) +#define ANIM_TAG_CHAIN_LINK (ANIM_SPRITES_START + 340) +#define ANIM_TAG_ANCHOR (ANIM_SPRITES_START + 341) +#define ANIM_TAG_HORSESHOE_SIDE_FIST (ANIM_SPRITES_START + 342) +#define ANIM_TAG_DRAGON_ASCENT_FOE (ANIM_SPRITES_START + 343) +#define ANIM_TAG_CRAFTY_SHIELD (ANIM_SPRITES_START + 344) +#define ANIM_TAG_BLACEPHALON_HEAD (ANIM_SPRITES_START + 345) +#define ANIM_TAG_FAIRY_LOCK_CHAINS (ANIM_SPRITES_START + 346) +#define ANIM_TAG_IONS (ANIM_SPRITES_START + 347) +#define ANIM_TAG_CHOP (ANIM_SPRITES_START + 348) +#define ANIM_TAG_HEART_STAMP (ANIM_SPRITES_START + 349) +#define ANIM_TAG_HORN_LEECH (ANIM_SPRITES_START + 350) +#define ANIM_TAG_STEAMROLLER (ANIM_SPRITES_START + 351) +#define ANIM_TAG_HOOPA_HAND (ANIM_SPRITES_START + 352) +#define ANIM_TAG_HOOPA_RING (ANIM_SPRITES_START + 353) +#define ANIM_TAG_METAL_BITS (ANIM_SPRITES_START + 354) +#define ANIM_TAG_SMALL_ROCK (ANIM_SPRITES_START + 355) +#define ANIM_TAG_SPIRIT_ARROW (ANIM_SPRITES_START + 356) +#define ANIM_TAG_ULTRA_BURST_SYMBOL (ANIM_SPRITES_START + 357) +#define ANIM_TAG_Z_MOVE_SYMBOL (ANIM_SPRITES_START + 358) +#define ANIM_TAG_REALLY_BIG_ROCK (ANIM_SPRITES_START + 359) +#define ANIM_TAG_COCOON (ANIM_SPRITES_START + 360) +#define ANIM_TAG_CORKSCREW (ANIM_SPRITES_START + 361) +#define ANIM_TAG_HAVOC_SPEAR (ANIM_SPRITES_START + 362) +#define ANIM_TAG_PURPLE_DRAKE (ANIM_SPRITES_START + 363) +#define ANIM_TAG_MUD_BOMB (ANIM_SPRITES_START + 364) +#define ANIM_TAG_BRANCH (ANIM_SPRITES_START + 365) +#define ANIM_TAG_APPLE (ANIM_SPRITES_START + 366) +#define ANIM_TAG_OBSTRUCT_CROSS (ANIM_SPRITES_START + 367) +#define ANIM_TAG_POISON_COLUMN (ANIM_SPRITES_START + 368) +#define ANIM_TAG_GARBAGE_COLUMN (ANIM_SPRITES_START + 369) +#define ANIM_TAG_LARGE_SPIKE (ANIM_SPRITES_START + 370) +#define ANIM_TAG_DRAGON_PULSE_RING (ANIM_SPRITES_START + 371) +#define ANIM_TAG_STONE_PILLAR (ANIM_SPRITES_START + 372) +#define ANIM_TAG_MUSHROOM (ANIM_SPRITES_START + 373) +#define ANIM_TAG_GOLDEN_APPLE (ANIM_SPRITES_START + 374) +#define ANIM_TAG_ICE_ROCK (ANIM_SPRITES_START + 375) +#define ANIM_TAG_TORNADO (ANIM_SPRITES_START + 376) +#define ANIM_TAG_STRAIGHT_BEAM (ANIM_SPRITES_START + 377) +#define ANIM_TAG_DREEPY (ANIM_SPRITES_START + 378) +#define ANIM_TAG_ICE_ROCK_SINGLE (ANIM_SPRITES_START + 379) +#define ANIM_TAG_STONE_PILLAR_MULTI (ANIM_SPRITES_START + 380) +#define ANIM_TAG_ALPHA_SYMBOL (ANIM_SPRITES_START + 381) +#define ANIM_TAG_OMEGA_SYMBOL (ANIM_SPRITES_START + 382) +#define ANIM_TAG_PRIMAL_PARTICLES (ANIM_SPRITES_START + 383) +#define ANIM_TAG_STEEL_BEAM (ANIM_SPRITES_START + 384) +#define ANIM_TAG_POLTERGEIST (ANIM_SPRITES_START + 385) // battlers #define ANIM_ATTACKER 0 diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index eaf40a525..2e6c78194 100755 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -593,4 +593,6 @@ #define MAP_GROUPS_COUNT 34 +// static const u8 MAP_GROUP_COUNT[] = {57, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 17, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 108, 61, 89, 2, 1, 13, 1, 1, 3, 1, 0}; + #endif // GUARD_CONSTANTS_MAP_GROUPS_H diff --git a/include/graphics.h b/include/graphics.h index 80532ad93..197cb4bb4 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -9304,7 +9304,7 @@ extern const u32 gBattleAnimSpriteGfx_Bird[]; extern const u32 gBattleAnimSpriteGfx_CrossImpact[]; extern const u32 gBattleAnimSpriteGfx_TrumpCard[]; extern const u32 gBattleAnimSpriteGfx_TrumpCardParticles[]; -extern const u32 gBattleAnimSpriteGfx_Accupressure[]; +extern const u32 gBattleAnimSpriteGfx_Acupressure[]; extern const u32 gBattleAnimSpriteGfx_WringOut[]; extern const u32 gBattleAnimSpriteGfx_ColoredOrbs[]; extern const u32 gBattleAnimSpriteGfx_WorrySeed[]; @@ -9606,7 +9606,7 @@ extern const u32 gBattleAnimSpritePal_WhipHit[]; extern const u32 gBattleAnimSpritePal_BlueRing2[]; extern const u32 gBattleAnimSpritePal_TrumpCard[]; extern const u32 gBattleAnimSpritePal_TrumpCardParticles[]; -extern const u32 gBattleAnimSpritePal_Accupressure[]; +extern const u32 gBattleAnimSpritePal_Acupressure[]; extern const u32 gBattleAnimSpritePal_WringOut[]; extern const u32 gBattleAnimSpritePal_ColoredOrbs[]; extern const u32 gBattleAnimSpritePal_WorrySeed[]; @@ -9645,8 +9645,6 @@ extern const u32 gBattleAnimSpriteGfx_QuickGuard[]; extern const u32 gBattleAnimSpritePal_QuickGuard[]; // New Battle Anim Particles -extern const u32 gBattleAnimSpriteGfx_AcupressureFinger[]; -extern const u32 gBattleAnimSpritePal_AcupressureFinger[]; extern const u32 gBattleAnimSpriteGfx_AlphaStone[]; extern const u32 gBattleAnimSpritePal_AlphaStone[]; extern const u32 gBattleAnimSpriteGfx_AlphaSymbol[]; diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index ff9495d0e..048b37c66 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -354,10 +354,10 @@ const struct SpriteTemplate gSmallCloudTemplate = .callback = AnimMoveSmallCloud }; -const struct SpriteTemplate gAccupressureSpriteTemplate = +const struct SpriteTemplate gAcupressureSpriteTemplate = { - .tileTag = ANIM_TAG_ACCUPRESSURE, - .paletteTag = ANIM_TAG_ACCUPRESSURE, + .tileTag = ANIM_TAG_ACUPRESSURE, + .paletteTag = ANIM_TAG_ACUPRESSURE, .oam = &gOamData_AffineDouble_ObjNormal_32x32, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle_anim_rock.c b/src/battle_anim_rock.c index e1a90b194..b1ccc9a58 100644 --- a/src/battle_anim_rock.c +++ b/src/battle_anim_rock.c @@ -331,7 +331,7 @@ static const union AffineAnimCmd* const sSpriteAffineAnimTable_CrushGripHand[] = const struct SpriteTemplate gCrushGripHandTemplate = { .tileTag = ANIM_TAG_PURPLE_HAND_OUTLINE, - .paletteTag = ANIM_TAG_ACCUPRESSURE, + .paletteTag = ANIM_TAG_ACUPRESSURE, .oam = &gOamData_AffineNormal_ObjNormal_32x32, .anims = sAnims_BasicRock, .images = NULL, diff --git a/src/data/battle_anim.h b/src/data/battle_anim.h index b8fb8c037..6a67e0cd6 100644 --- a/src/data/battle_anim.h +++ b/src/data/battle_anim.h @@ -1365,7 +1365,7 @@ const struct CompressedSpriteSheet gBattleAnimPicTable[] = {gBattleAnimSpriteGfx_MegaParticles, 0x0180, ANIM_TAG_MEGA_PARTICLES}, {gBattleAnimSpriteGfx_TrumpCard, 0x0180, ANIM_TAG_TRUMP_CARD}, {gBattleAnimSpriteGfx_TrumpCardParticles, 0x0060, ANIM_TAG_TRUMP_CARD_PARTICLES}, - {gBattleAnimSpriteGfx_Accupressure, 0x0200, ANIM_TAG_ACCUPRESSURE}, + {gBattleAnimSpriteGfx_Acupressure, 0x0200, ANIM_TAG_ACUPRESSURE}, {gBattleAnimSpriteGfx_WringOut, 0x0200, ANIM_TAG_WRING_OUT}, {gBattleAnimSpriteGfx_ColoredOrbs, 0x0300, ANIM_TAG_COLORED_ORBS}, {gBattleAnimSpriteGfx_WorrySeed, 0x0080, ANIM_TAG_WORRY_SEED}, @@ -1390,7 +1390,6 @@ const struct CompressedSpriteSheet gBattleAnimPicTable[] = {gBattleAnimSpriteGfx_Brine, 0xc00, ANIM_TAG_BRINE}, {gBattleAnimSpriteGfx_Gear, 0x200, ANIM_TAG_GEAR}, {gBattleAnimSpriteGfx_AssuranceHand, 0x200, ANIM_TAG_ASSURANCE_HAND}, - {gBattleAnimSpriteGfx_AcupressureFinger, 0x200, ANIM_TAG_ACUPRESSURE_FINGER}, {gBattleAnimSpriteGfx_Fishies, 0x480, ANIM_TAG_WISHIWASHI_FISH}, {gBattleAnimSpriteGfx_ZygardeHexes, 0x480, ANIM_TAG_ZYGARDE_HEXES}, {gBattleAnimSpriteGfx_AuraSphere, 0x200, ANIM_TAG_AURA_SPHERE}, @@ -1817,7 +1816,7 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] = {gBattleAnimSpritePal_MegaParticles, ANIM_TAG_MEGA_PARTICLES}, {gBattleAnimSpritePal_TrumpCard, ANIM_TAG_TRUMP_CARD}, {gBattleAnimSpritePal_TrumpCardParticles, ANIM_TAG_TRUMP_CARD_PARTICLES}, - {gBattleAnimSpritePal_Accupressure, ANIM_TAG_ACCUPRESSURE}, + {gBattleAnimSpritePal_Acupressure, ANIM_TAG_ACUPRESSURE}, {gBattleAnimSpritePal_WringOut, ANIM_TAG_WRING_OUT}, {gBattleAnimSpritePal_ColoredOrbs, ANIM_TAG_COLORED_ORBS}, {gBattleAnimSpritePal_WorrySeed, ANIM_TAG_WORRY_SEED}, @@ -1842,7 +1841,6 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] = {gBattleAnimSpritePal_Brine, ANIM_TAG_BRINE}, {gBattleAnimSpritePal_Gear, ANIM_TAG_GEAR}, {gBattleAnimSpritePal_AssuranceHand, ANIM_TAG_ASSURANCE_HAND}, - {gBattleAnimSpritePal_AcupressureFinger, ANIM_TAG_ACUPRESSURE_FINGER}, {gBattleAnimSpritePal_Fishies, ANIM_TAG_WISHIWASHI_FISH}, {gBattleAnimSpritePal_ZygardeHexes, ANIM_TAG_ZYGARDE_HEXES}, {gBattleAnimSpritePal_AuraSphere, ANIM_TAG_AURA_SPHERE}, diff --git a/src/graphics.c b/src/graphics.c index a59d91952..6a12dda1c 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -57,9 +57,6 @@ const u32 gBattleAnimSpritePal_Punishment[] = INCBIN_U32("graphics/battle_anims/ const u32 gBattleAnimSpriteGfx_QuickGuard[] = INCBIN_U32("graphics/battle_anims/sprites/quick_guard.4bpp.lz"); const u32 gBattleAnimSpritePal_QuickGuard[] = INCBIN_U32("graphics/battle_anims/sprites/quick_guard.gbapal.lz"); -const u32 gBattleAnimSpritePal_AcupressureFinger[] = INCBIN_U32("graphics/battle_anims/sprites/acupressure_finger.gbapal.lz"); -const u32 gBattleAnimSpriteGfx_AcupressureFinger[] = INCBIN_U32("graphics/battle_anims/sprites/acupressure_finger.4bpp.lz"); - const u32 gBattleAnimSpriteGfx_AlphaStone[] = INCBIN_U32("graphics/battle_anims/sprites/alpha_stone.4bpp.lz"); const u32 gBattleAnimSpritePal_AlphaStone[] = INCBIN_U32("graphics/battle_anims/sprites/alpha_stone.gbapal.lz"); @@ -375,8 +372,8 @@ const u32 gBattleAnimSpritePal_TrumpCard[] = INCBIN_U32("graphics/battle_anims/s const u32 gBattleAnimSpriteGfx_TrumpCardParticles[] = INCBIN_U32("graphics/battle_anims/sprites/trump_card_particles.4bpp.lz"); const u32 gBattleAnimSpritePal_TrumpCardParticles[] = INCBIN_U32("graphics/battle_anims/sprites/trump_card_particles.gbapal.lz"); -const u32 gBattleAnimSpriteGfx_Accupressure[] = INCBIN_U32("graphics/battle_anims/sprites/accupressure.4bpp.lz"); -const u32 gBattleAnimSpritePal_Accupressure[] = INCBIN_U32("graphics/battle_anims/sprites/accupressure.gbapal.lz"); +const u32 gBattleAnimSpriteGfx_Acupressure[] = INCBIN_U32("graphics/battle_anims/sprites/acupressure.4bpp.lz"); +const u32 gBattleAnimSpritePal_Acupressure[] = INCBIN_U32("graphics/battle_anims/sprites/acupressure.gbapal.lz"); const u32 gBattleAnimSpriteGfx_WringOut[] = INCBIN_U32("graphics/battle_anims/sprites/wring_out.4bpp.lz"); const u32 gBattleAnimSpritePal_WringOut[] = INCBIN_U32("graphics/battle_anims/sprites/wring_out.gbapal.lz");