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.

Sign up for GitHub

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

Jump to bottom

Gen 1-5 Palette Conversion Redemption #2318

Merged
merged 20 commits into from
Jan 4, 2023
Merged

Gen 1-5 Palette Conversion Redemption #2318

merged 20 commits into from
Jan 4, 2023

Conversation

AsparagusEduardo
Copy link
Collaborator

@AsparagusEduardo AsparagusEduardo commented Sep 14, 2022 •
edited
Loading

Description

A re-introduction of #1960.
In addition to the original changes, a new config called P_HIPPO_GENDER_DIFF_ICONS will allow users to switch between using custom icons for hippopotas and hippodown and the vanilla behavior, in which it always uses the male icon.

The following palettes were not changed, and therefore need to be made into their own issue:

To be handled separetly

  • castform
  • spinda
  • Unown's shiny palette

All Shiny Palettes missing replacement except:

  • arcanine
  • bulbasaur
  • charizard
  • combee
  • combeef
  • fearow
  • furret
  • gastrodon
  • gastrodon\east_sea
  • hoothoot
  • houndour
  • ivysaur
  • landorus
  • noctowl
  • pidgeot
  • pidgeotto
  • sandshrew
  • sandslash
  • sawsbuck\winter
  • shuckle
  • sigilyph
  • victreebel
  • wartortle
  • weepinbell

Discord contact info

AsparagusEduardo#6051

Blackforest92 and others added 11 commits November 29, 2021 23:18
@Blackforest92
Palette conversion GEN1
7ae424e
@Blackforest92
Remove GEN1 junk files
8668e5c
@Blackforest92
Palette conversion GEN2
5a197aa
@Blackforest92
Palette conversion GEN3
98e5b1f
@Blackforest92
Palette Conversion GEN4
2ad3c3f
@Blackforest92
Palette conversion GEN5
5547723
@Blackforest92
Reverse both Hippopotas and Hippowdon icons to use male only
a7c9e6e
@Blackforest92
Fixes several front.png sprites
ef94c05
@Blackforest92
fix .8bpp palette + revert hippo icons
76b9459
@AsparagusEduardo
Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH…
0caf79f 
…/pr/palleteConversion2

# Conflicts:
#	graphics/pokemon/cherrim/anim_front.png
#	graphics/pokemon/scyther/anim_front.png
#	graphics/pokemon/scyther/front.png
#	graphics/pokemon/shinx/anim_front.png
#	src/data/pokemon_graphics/back_pic_table.h
#	src/data/pokemon_graphics/front_pic_table.h
#	src/data/pokemon_graphics/palette_table.h
#	src/data/pokemon_graphics/shiny_palette_table.h
#	src/pokemon_icon.c
@AsparagusEduardo
Config to turn off Hippopotas' and Hippowdon's female icons
ee628de
@Blackforest92
Copy link

I am pretty sure the personal preference shouldn't be that many, i think it is even below 50.
Abomasnow, Abra, etc. the entire gen 5 pokemon are obviously done.
What i am remembering right now is : Blastoise, Pidgey and its evo, Nidoqueen, Horsea and its evo, Azumarill,
You can just click the commit to check whats changed between the colors for example this Gen4 commit where you can see Abomasnow, Ambipom, Arceus etc are clearly edited.

Keep note :
(1) We had fix with Scyther sprite before,
(2) Azurill's emote is edited to be neutral, sorry about this.

@AsparagusEduardo AsparagusEduardo changed the base branch from master to dev September 14, 2022 14:34
@AsparagusEduardo AsparagusEduardo added the category: pokemon Pertains to Pokémon data and functionality label Sep 16, 2022
@AsparagusEduardo AsparagusEduardo changed the base branch from dev to dev_1.x September 16, 2022 17:29
@AsparagusEduardo AsparagusEduardo changed the base branch from dev to breaking September 27, 2022 13:43
@AsparagusEduardo
Copy link
Collaborator Author

Changed target to breaking, as this can be considered a breaking change.

@AsparagusEduardo
Copy link
Collaborator Author

AsparagusEduardo commented Sep 27, 2022 •
edited
Loading

Updated list of missing palette changes.

@AsparagusEduardo AsparagusEduardo changed the base branch from breaking to dev September 30, 2022 15:22
@AsparagusEduardo
Copy link
Collaborator Author

if it can be added without breaking saves, it's not a breaking change
@ExpoSeed

Adjusted target to dev

Jaizu and others added 4 commits September 30, 2022 17:53
@Jaizu @AsparagusEduardo
Finish plenty of sprites.
6278f71 
This also includes some fixes to Swanna, Spiky Eared Pichu and some broken details across other species that I already forgot.
@Jaizu @AsparagusEduardo
finish normal palette swapping
40e4cb8
@Jaizu @AsparagusEduardo
Spiky Eared Pichu second frame
34c0a5b
@AsparagusEduardo
Removed comment MAP_GROUP_COUNT
0370cb3
@AsparagusEduardo
Copy link
Collaborator Author

Added most of the remaining pals by @Jaizu.

@AsparagusEduardo
Copy link
Collaborator Author

Ready for review.

@AsparagusEduardo
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/featur…
44754f8 
…e/palleteConversion2

# Conflicts:
#	include/constants/pokemon_config.h
#	src/data/pokemon_graphics/back_pic_table.h
#	src/data/pokemon_graphics/palette_table.h
#	src/data/pokemon_graphics/shiny_palette_table.h
#	src/pokemon_icon.c
@AsparagusEduardo
Copy link
Collaborator Author

Solved conflicts

@AsparagusEduardo
Copy link
Collaborator Author

Conflict solved.

@ghoulslash
Copy link
Collaborator

Solve conflicts

@AsparagusEduardo
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/featur…
55be15f 
…e/palleteConversion2

# Conflicts:
#	include/config/pokemon.h
@AsparagusEduardo AsparagusEduardo merged commit 11c3e9c into rh-hideout:upcoming Jan 4, 2023
@AsparagusEduardo AsparagusEduardo deleted the RHH/pr/palleteConversion2 branch January 6, 2023 00:44
@AsparagusEduardo AsparagusEduardo mentioned this pull request Feb 19, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ghoulslash ghoulslash ghoulslash approved these changes

Assignees
No one assigned
Labels
category: pokemon Pertains to Pokémon data and functionality
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@AsparagusEduardo @Blackforest92 @ghoulslash @Jaizu