From c30c394082888ff5efbe7d76ecdfc29f5abc5fac Mon Sep 17 00:00:00 2001 From: Evan Date: Sun, 24 May 2020 08:40:37 -0600 Subject: [PATCH] remove commented out particles --- include/graphics.h | 25 ------------------------- src/graphics.c | 41 ----------------------------------------- 2 files changed, 66 deletions(-) diff --git a/include/graphics.h b/include/graphics.h index 89f496a595..68701934cc 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4779,8 +4779,6 @@ extern const u32 gBattleAnimSpritePal_AuraSphere[]; extern const u32 gBattleAnimSpritePal_AvalancheRocks[]; extern const u32 gBattleAnimSpriteGfx_NewPokeball[]; extern const u32 gBattleAnimSpritePal_NewPokeball[]; -//extern const u32 gBattleAnimSpriteGfx_Bee[]; -//extern const u32 gBattleAnimSpritePal_Bee[]; extern const u32 gBattleAnimSpriteGfx_BerryEaten[]; extern const u32 gBattleAnimSpritePal_BerryEaten[]; extern const u32 gBattleAnimSpriteGfx_BerryNormal[]; @@ -4815,13 +4813,9 @@ extern const u32 gBattleAnimSpriteGfx_Drill[]; extern const u32 gBattleAnimSpritePal_Drill[]; extern const u32 gBattleAnimSpriteGfx_NewEmbers[]; extern const u32 gBattleAnimSpritePal_NewEmbers[]; -//extern const u32 gBattleAnimSpriteGfx_EnergyBall[]; -//extern const u32 gBattleAnimSpritePal_EnergyBall[]; extern const u32 gBattleAnimSpriteGfx_FairyLockChains[]; extern const u32 gBattleAnimSpriteGfx_Fishies[]; extern const u32 gBattleAnimSpritePal_Fishies[]; -//extern const u32 gBattleAnimSpriteGfx_FlashCannonBall[]; -//extern const u32 gBattleAnimSpritePal_FlashCannonBall[]; extern const u32 gBattleAnimSpriteGfx_NewFly[]; extern const u32 gBattleAnimSpritePal_NewFly[]; extern const u32 gBattleAnimSpritePal_FusionFlare[]; @@ -4863,12 +4857,6 @@ extern const u32 gBattleAnimSpriteGfx_LightningRain[]; extern const u32 gBattleAnimSpritePal_LightningRain[]; extern const u32 gBattleAnimSpriteGfx_NewEye[]; extern const u32 gBattleAnimSpritePal_NewEye[]; -//extern const u32 gBattleAnimSpriteGfx_MegaRainbow[]; -//extern const u32 gBattleAnimSpritePal_MegaRainbow[]; -//extern const u32 gBattleAnimSpriteGfx_MegaSymbol[]; -//extern const u32 gBattleAnimSpritePal_MegaSymbol[]; -//extern const u32 gBattleAnimSpriteGfx_MegaStone[]; -//extern const u32 gBattleAnimSpritePal_MegaStone[]; extern const u32 gBattleAnimSpriteGfx_MetalBits[]; extern const u32 gBattleAnimSpriteGfx_MudBomb[]; extern const u32 gBattleAnimSpritePal_MudBomb[]; @@ -4886,14 +4874,8 @@ extern const u32 gBattleAnimSpriteGfx_PinkDiamond[]; extern const u32 gBattleAnimSpritePal_PinkDiamond[]; extern const u32 gBattleAnimSpriteGfx_PoisonColumn[]; extern const u32 gBattleAnimSpritePal_PoisonColumn[]; -//extern const u32 gBattleAnimSpriteGfx_PoisonJab[]; -//extern const u32 gBattleAnimSpritePal_PoisonJab[]; -//extern const u32 gBattleAnimSpriteGfx_PowerGem[]; -//extern const u32 gBattleAnimSpritePal_PowerGem[]; extern const u32 gBattleAnimSpriteGfx_PowerTrick[]; extern const u32 gBattleAnimSpritePal_PowerTrick[]; -//extern const u32 gBattleAnimSpriteGfx_Punishment[]; -//extern const u32 gBattleAnimSpritePal_Punishment[]; extern const u32 gBattleAnimSpriteGfx_PurpleDrake[]; extern const u32 gBattleAnimSpritePal_PurpleDrake[]; extern const u32 gBattleAnimSpriteGfx_QuickGuard[]; @@ -4911,13 +4893,10 @@ extern const u32 gBattleAnimSpriteGfx_NewSpikes[]; extern const u32 gBattleAnimSpritePal_NewSpikes[]; extern const u32 gBattleAnimSpriteGfx_SpiritShackleArrow[]; extern const u32 gBattleAnimSpritePal_SpiritShackleArrow[]; -//extern const u32 gBattleAnimSpriteGfx_StealthRock[]; -//extern const u32 gBattleAnimSpritePal_StealthRock[]; extern const u32 gBattleAnimSpriteGfx_SteamEruption[]; extern const u32 gBattleAnimSpritePal_SteamEruption[]; extern const u32 gBattleAnimSpriteGfx_Steamroller[]; extern const u32 gBattleAnimSpritePal_Steamroller[]; -//extern const u32 gBattleAnimSpriteGfx_StoneEdge[]; extern const u32 gBattleAnimSpriteGfx_StonePillar[]; extern const u32 gBattleAnimSpritePal_StonePillar[]; extern const u32 gBattleAnimSpriteGfx_StraightBeam[]; @@ -4934,10 +4913,6 @@ extern const u32 gBattleAnimSpriteGfx_NewHandsAndFeet[]; extern const u32 gBattleAnimSpritePal_NewHandsAndFeet[]; extern const u32 gBattleAnimSpriteGfx_Tornado[]; extern const u32 gBattleAnimSpritePal_Tornado[]; -//extern const u32 gBattleAnimSpriteGfx_WaterGun[]; -//extern const u32 gBattleAnimSpritePal_WaterGun[]; -//extern const u32 gBattleAnimSpriteGfx_Wood[]; -//extern const u32 gBattleAnimSpritePal_Wood[]; extern const u32 gBattleAnimSpriteGfx_ZMoveSymbol[]; extern const u32 gBattleAnimSpritePal_ZMoveSymbol[]; diff --git a/src/graphics.c b/src/graphics.c index f1eb1b8c6e..2fe076cdcd 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -77,9 +77,6 @@ const u32 gBattleAnimSpritePal_AvalancheRocks[] = INCBIN_U32("graphics/battle_an const u32 gBattleAnimSpriteGfx_NewPokeball[] = INCBIN_U32("graphics/battle_anims/sprites/new/baton_pass_ball.4bpp.lz"); const u32 gBattleAnimSpritePal_NewPokeball[] = INCBIN_U32("graphics/battle_anims/sprites/new/baton_pass_ball.gbapal.lz"); -//const u32 gBattleAnimSpriteGfx_Bee[] = INCBIN_U32("graphics/battle_anims/sprites/new/bee.4bpp.lz"); -//const u32 gBattleAnimSpritePal_Bee[] = INCBIN_U32("graphics/battle_anims/sprites/new/bee.gbapal.lz"); - const u32 gBattleAnimSpriteGfx_BerryEaten[] = INCBIN_U32("graphics/battle_anims/sprites/new/berry_eaten.4bpp.lz"); const u32 gBattleAnimSpritePal_BerryEaten[] = INCBIN_U32("graphics/battle_anims/sprites/new/berry_eaten.gbapal.lz"); @@ -132,17 +129,11 @@ const u32 gBattleAnimSpritePal_Drill[] = INCBIN_U32("graphics/battle_anims/sprit const u32 gBattleAnimSpriteGfx_NewEmbers[] = INCBIN_U32("graphics/battle_anims/sprites/new/embers.4bpp.lz"); const u32 gBattleAnimSpritePal_NewEmbers[] = INCBIN_U32("graphics/battle_anims/sprites/new/embers.gbapal.lz"); -//const u32 gBattleAnimSpriteGfx_EnergyBall[] = INCBIN_U32("graphics/battle_anims/sprites/new/energy_ball.4bpp.lz"); -//const u32 gBattleAnimSpritePal_EnergyBall[] = INCBIN_U32("graphics/battle_anims/sprites/new/energy_ball.gbapal.lz"); - const u32 gBattleAnimSpriteGfx_FairyLockChains[] = INCBIN_U32("graphics/battle_anims/sprites/new/fairy_lock_chains.4bpp.lz"); const u32 gBattleAnimSpriteGfx_Fishies[] = INCBIN_U32("graphics/battle_anims/sprites/new/fishies.4bpp.lz"); const u32 gBattleAnimSpritePal_Fishies[] = INCBIN_U32("graphics/battle_anims/sprites/new/fishies.gbapal.lz"); -//const u32 gBattleAnimSpriteGfx_FlashCannonBall[] = INCBIN_U32("graphics/battle_anims/sprites/new/flash_cannon_ball.4bpp.lz"); -//const u32 gBattleAnimSpritePal_FlashCannonBall[] = INCBIN_U32("graphics/battle_anims/sprites/new/flash_cannon_ball.gbapal.lz"); - const u32 gBattleAnimSpriteGfx_NewFly[] = INCBIN_U32("graphics/battle_anims/sprites/new/fly.4bpp.lz"); const u32 gBattleAnimSpritePal_NewFly[] = INCBIN_U32("graphics/battle_anims/sprites/new/fly.gbapal.lz"); @@ -206,15 +197,6 @@ const u32 gBattleAnimSpritePal_LightningRain[] = INCBIN_U32("graphics/battle_ani const u32 gBattleAnimSpriteGfx_NewEye[] = INCBIN_U32("graphics/battle_anims/sprites/new/mean_look.4bpp.lz"); const u32 gBattleAnimSpritePal_NewEye[] = INCBIN_U32("graphics/battle_anims/sprites/new/mean_look.gbapal.lz"); -//const u32 gBattleAnimSpriteGfx_MegaRainbow[] = INCBIN_U32("graphics/battle_anims/sprites/new/mega_evolution_rainbow.4bpp.lz"); -//const u32 gBattleAnimSpritePal_MegaRainbow[] = INCBIN_U32("graphics/battle_anims/sprites/new/mega_evolution_rainbow.gbapal.lz"); - -//const u32 gBattleAnimSpriteGfx_MegaSymbol[] = INCBIN_U32("graphics/battle_anims/sprites/new/mega_evolution_symbol.4bpp.lz"); -//const u32 gBattleAnimSpritePal_MegaSymbol[] = INCBIN_U32("graphics/battle_anims/sprites/new/mega_evolution_symbol.gbapal.lz"); - -//const u32 gBattleAnimSpriteGfx_MegaStone[] = INCBIN_U32("graphics/battle_anims/sprites/new/mega_stone.4bpp.lz"); -//const u32 gBattleAnimSpritePal_MegaStone[] = INCBIN_U32("graphics/battle_anims/sprites/new/mega_stone.gbapal.lz"); - const u32 gBattleAnimSpriteGfx_MetalBits[] = INCBIN_U32("graphics/battle_anims/sprites/new/metal_bits.4bpp.lz"); const u32 gBattleAnimSpriteGfx_MudBomb[] = INCBIN_U32("graphics/battle_anims/sprites/new/mud_bomb.4bpp.lz"); @@ -242,24 +224,12 @@ const u32 gBattleAnimSpritePal_PinkDiamond[] = INCBIN_U32("graphics/battle_anims const u32 gBattleAnimSpriteGfx_PoisonColumn[] = INCBIN_U32("graphics/battle_anims/sprites/new/poison_column.4bpp.lz"); const u32 gBattleAnimSpritePal_PoisonColumn[] = INCBIN_U32("graphics/battle_anims/sprites/new/poison_column.gbapal.lz"); -//const u32 gBattleAnimSpriteGfx_PoisonJab[] = INCBIN_U32("graphics/battle_anims/sprites/new/poison_jab.4bpp.lz"); -//const u32 gBattleAnimSpritePal_PoisonJab[] = INCBIN_U32("graphics/battle_anims/sprites/new/poison_jab.gbapal.lz"); - -//const u32 gBattleAnimSpriteGfx_PowerGem[] = INCBIN_U32("graphics/battle_anims/sprites/new/power_gem.4bpp.lz"); -//const u32 gBattleAnimSpritePal_PowerGem[] = INCBIN_U32("graphics/battle_anims/sprites/new/power_gem.gbapal.lz"); - const u32 gBattleAnimSpriteGfx_PowerTrick[] = INCBIN_U32("graphics/battle_anims/sprites/new/power_trick.4bpp.lz"); const u32 gBattleAnimSpritePal_PowerTrick[] = INCBIN_U32("graphics/battle_anims/sprites/new/power_trick.gbapal.lz"); -//const u32 gBattleAnimSpriteGfx_Punishment[] = INCBIN_U32("graphics/battle_anims/sprites/new/punishment.4bpp.lz"); -//const u32 gBattleAnimSpritePal_Punishment[] = INCBIN_U32("graphics/battle_anims/sprites/new/punishment.gbapal.lz"); - const u32 gBattleAnimSpriteGfx_PurpleDrake[] = INCBIN_U32("graphics/battle_anims/sprites/new/purple_drake.4bpp.lz"); const u32 gBattleAnimSpritePal_PurpleDrake[] = INCBIN_U32("graphics/battle_anims/sprites/new/purple_drake.gbapal.lz"); -//const u32 gBattleAnimSpriteGfx_QuickGuard[] = INCBIN_U32("graphics/battle_anims/sprites/new/quick_guard.4bpp.lz"); -//const u32 gBattleAnimSpritePal_QuickGuard[] = INCBIN_U32("graphics/battle_anims/sprites/new/quick_guard.gbapal.lz"); - const u32 gBattleAnimSpriteGfx_RazorShell[] = INCBIN_U32("graphics/battle_anims/sprites/new/razor_shell.4bpp.lz"); const u32 gBattleAnimSpritePal_RazorShell[] = INCBIN_U32("graphics/battle_anims/sprites/new/razor_shell.gbapal.lz"); @@ -281,17 +251,12 @@ const u32 gBattleAnimSpritePal_NewSpikes[] = INCBIN_U32("graphics/battle_anims/s const u32 gBattleAnimSpriteGfx_SpiritShackleArrow[] = INCBIN_U32("graphics/battle_anims/sprites/new/spirit_shackle_arrow.4bpp.lz"); const u32 gBattleAnimSpritePal_SpiritShackleArrow[] = INCBIN_U32("graphics/battle_anims/sprites/new/spirit_shackle_arrow.gbapal.lz"); -//const u32 gBattleAnimSpriteGfx_StealthRock[] = INCBIN_U32("graphics/battle_anims/sprites/new/stealth_rock.4bpp.lz"); -//const u32 gBattleAnimSpritePal_StealthRock[] = INCBIN_U32("graphics/battle_anims/sprites/new/stealth_rock.gbapal.lz"); - const u32 gBattleAnimSpriteGfx_SteamEruption[] = INCBIN_U32("graphics/battle_anims/sprites/new/steam_eruption.4bpp.lz"); const u32 gBattleAnimSpritePal_SteamEruption[] = INCBIN_U32("graphics/battle_anims/sprites/new/steam_eruption.gbapal.lz"); const u32 gBattleAnimSpriteGfx_Steamroller[] = INCBIN_U32("graphics/battle_anims/sprites/new/steamroller.4bpp.lz"); const u32 gBattleAnimSpritePal_Steamroller[] = INCBIN_U32("graphics/battle_anims/sprites/new/steamroller.gbapal.lz"); -//const u32 gBattleAnimSpriteGfx_StoneEdge[] = INCBIN_U32("graphics/battle_anims/sprites/new/stone_edge.4bpp.lz"); - const u32 gBattleAnimSpriteGfx_StonePillar[] = INCBIN_U32("graphics/battle_anims/sprites/new/stone_pillar.4bpp.lz"); const u32 gBattleAnimSpritePal_StonePillar[] = INCBIN_U32("graphics/battle_anims/sprites/new/stone_pillar.gbapal.lz"); @@ -316,12 +281,6 @@ const u32 gBattleAnimSpritePal_NewHandsAndFeet[] = INCBIN_U32("graphics/battle_a const u32 gBattleAnimSpriteGfx_Tornado[] = INCBIN_U32("graphics/battle_anims/sprites/new/tornado.4bpp.lz"); const u32 gBattleAnimSpritePal_Tornado[] = INCBIN_U32("graphics/battle_anims/sprites/new/tornado.gbapal.lz"); -//const u32 gBattleAnimSpriteGfx_WaterGun[] = INCBIN_U32("graphics/battle_anims/sprites/new/water_gun.4bpp.lz"); -//const u32 gBattleAnimSpritePal_WaterGun[] = INCBIN_U32("graphics/battle_anims/sprites/new/water_gun.gbapal.lz"); - -//const u32 gBattleAnimSpriteGfx_Wood[] = INCBIN_U32("graphics/battle_anims/sprites/new/wood.4bpp.lz"); -//const u32 gBattleAnimSpritePal_Wood[] = INCBIN_U32("graphics/battle_anims/sprites/new/wood.gbapal.lz"); - const u32 gBattleAnimSpriteGfx_ZMoveSymbol[] = INCBIN_U32("graphics/battle_anims/sprites/new/z_move_symbol.4bpp.lz"); const u32 gBattleAnimSpritePal_ZMoveSymbol[] = INCBIN_U32("graphics/battle_anims/sprites/new/z_move_symbol.gbapal.lz");