Revert unneeded sprite changes from 3051 #3205
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # graphics/pokemon/abra/back.png # graphics/pokemon/alakazam/back.png # graphics/pokemon/arbok/back.png # graphics/pokemon/arcanine/back.png # graphics/pokemon/beedrill/back.png # graphics/pokemon/bellsprout/back.png # graphics/pokemon/bulbasaur/anim_front.png # graphics/pokemon/bulbasaur/back.png # graphics/pokemon/butterfree/back.png # graphics/pokemon/caterpie/back.png # graphics/pokemon/charizard/back.png # graphics/pokemon/charmander/anim_front.png # graphics/pokemon/charmander/back.png # graphics/pokemon/charmeleon/anim_front.png # graphics/pokemon/charmeleon/back.png # graphics/pokemon/clefairy/back.png # graphics/pokemon/diglett/back.png # graphics/pokemon/dugtrio/back.png # graphics/pokemon/ekans/back.png # graphics/pokemon/gloom/back.png # graphics/pokemon/golbat/back.png # graphics/pokemon/golduck/back.png # graphics/pokemon/golem/back.png # graphics/pokemon/graveler/back.png # graphics/pokemon/ivysaur/anim_front.png # graphics/pokemon/ivysaur/back.png # graphics/pokemon/kadabra/back.png # graphics/pokemon/kakuna/back.png # graphics/pokemon/machoke/back.png # graphics/pokemon/machop/back.png # graphics/pokemon/mankey/back.png # graphics/pokemon/metapod/anim_front.png # graphics/pokemon/metapod/back.png # graphics/pokemon/nidoking/back.png # graphics/pokemon/nidoran_f/back.png # graphics/pokemon/nidoran_m/back.png # graphics/pokemon/nidorina/back.png # graphics/pokemon/parasect/anim_front.png # graphics/pokemon/parasect/back.png # graphics/pokemon/persian/anim_front.png # graphics/pokemon/pidgeot/back.png # graphics/pokemon/pikachu/back.png # graphics/pokemon/poliwag/back.png # graphics/pokemon/poliwhirl/back.png # graphics/pokemon/poliwrath/back.png # graphics/pokemon/ponyta/back.png # graphics/pokemon/primeape/back.png # graphics/pokemon/psyduck/back.png # graphics/pokemon/raichu/back.png # graphics/pokemon/rapidash/back.png # graphics/pokemon/raticate/back.png # graphics/pokemon/rattata/back.png # graphics/pokemon/sandshrew/back.png # graphics/pokemon/sandslash/back.png # graphics/pokemon/slowbro/back.png # graphics/pokemon/slowpoke/anim_front.png # graphics/pokemon/slowpoke/back.png # graphics/pokemon/spearow/back.png # graphics/pokemon/tentacool/back.png # graphics/pokemon/tentacruel/back.png # graphics/pokemon/venomoth/back.png # graphics/pokemon/venonat/back.png # graphics/pokemon/venusaur/anim_front.png # graphics/pokemon/venusaur/back.png # graphics/pokemon/victreebel/back.png # graphics/pokemon/vileplume/back.png # graphics/pokemon/vulpix/back.png # graphics/pokemon/wartortle/back.png # graphics/pokemon/weedle/back.png # graphics/pokemon/weepinbell/back.png # graphics/pokemon/wigglytuff/back.png # graphics/pokemon/zubat/back.png
This was referenced Aug 25, 2023
Merged
fdeblasio
pushed a commit
to fdeblasio/pokeemerald-expansion
that referenced
this pull request
Sep 27, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
#3051 caused issues regarding icons, so I decided to take the chance to reverse unneeded changes to the files to both those issues and to reduce the amount of edited files once the next minor version is release.
Images
Issue(s) that this PR fixes
Fixes #3103 , Fixes #3093
Discord contact info
AsparagusEduardo