Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tidying Graphics/Battle_Anims #2289

Merged
merged 2 commits into from
Sep 6, 2022

Conversation

Blackforest92
Copy link

Description

This PR tidies graphics/battle_anims by moving out graphics used from the new folder and discard what's not used.

======= NOTES =======
graphics/battle_anims/backgrounds/new/psychic.pal renamed to graphics/battle_anims/backgrounds/psychic_new
may require an ifdef, detail here.
I personally against the idea of adding an ifdef for a simple palette swap, if we are ifdef ing this.
Psychic background should at least be updated with Gen4 graphic

graphics/battle_anims/sprites/new/green_star is not new at all, at first glance it is just a copy of vanilla green_star
#if B_NEW_MORNING_SUN_STAR_PARTICLE should be erased if so.
Renamed into green_star_new for now, detail here.

graphics/battle_anims/sprites/new/impact renamed to graphics/battle_anims/sprites/impact_new

graphics/battle_anims/sprites/new/horn renamed to graphics/battle_anims/sprites/horn_hit_new
gBattleAnimSpriteGfx_NewHornHit is not used anywhere and can be safely erased.
gBattleAnimSpritePal_NewHornHit however, is just a minor modified vanilla gBattleAnimSpriteGfx_HornHit
Making B_NEW_HORN_ATTACK_PARTICLE = TRUE useless since there will be no palette swap at all.
It doesn't stop there, gBattleAnimSpritePal_NewHornHit is actually just impact_new.pal
We truly live in a society.
An ifdef for B_NEW_HORN_ATTACK_PARTICLE is required in this code to make it actually do something when B_NEW_HORN_ATTACK_PARTICLE is set to TRUE

graphics/battle_anims/sprites/new/rocks renamed to graphics/battle_anims/sprites/rocks_new

graphics/battle_anims/sprites/new/spikes renamed to graphics/battle_anims/sprites/spikes_new
practically just a palette swap of vanilla spikes, so gBattleAnimSpriteGfx_NewSpikes is not really needed.

graphics/battle_anims/sprites/new/substitute_front renamed to graphics/battle_anims/sprites/substitute_new
graphics/battle_anims/sprites/new/substitute_back renamed to graphics/battle_anims/sprites/substitute_back_new

graphics/battle_anims/sprites/new/sword renamed to graphics/battle_anims/sprites/sword_new

graphics/battle_anims/sprites/new/teeth renamed to graphics/battle_anims/sprites/teeth_new

graphics/battle_anims/sprites/new/thrash renamed to graphics/battle_anims/sprites/new/hands_and_feet_new
ifdef is B_NEW_HANDS_FEET_PARTICLE.

======= DISCARDED FILES =======
backgrounds/new/tectonic_rage.bin
sprites/new/ detailed in here.

Copy link
Collaborator

@AsparagusEduardo AsparagusEduardo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you check the checksum for the deleted files vs the ones that were kept?
If not, let's first move the files and then worry about duplicated ones.

@AsparagusEduardo AsparagusEduardo merged commit f79e9f0 into rh-hideout:master Sep 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants