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

Pre-1.8.4 pret merge (2024/05/26) #4631

Merged
merged 12 commits into from
May 27, 2024
Merged

Pre-1.8.4 pret merge (2024/05/26) #4631

merged 12 commits into from
May 27, 2024
+105 −100

Conversation

AsparagusEduardo
Copy link
Collaborator

Description

SHA1 before merge: 5f884868e8463ad1495c189d112175d18f3e6c61
SHA1 after merge: ec4a777e98093a17d2da0585a98735b23ec23b90

The two main changes come from the following PRs:

  • Fix Pokeblock script missing a releaseall pret/pokeemerald#1996 (via BUGFIX)
  • Make AdjustFriendship more readable pret/pokeemerald#1995
    • This had a merge conflict with the expansion based on our trainer data encapsulation. I would assume that changing 
              if (!(gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_LEADER
            || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_ELITE_FOUR
            || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_CHAMPION))
            return;
      to 
              if (!(opponentTrainerClass == TRAINER_CLASS_LEADER
            || opponentTrainerClass == TRAINER_CLASS_ELITE_FOUR
            || opponentTrainerClass == TRAINER_CLASS_CHAMPION))
            return;
      would've kept the cheksum, but I guess not.

Discord contact info

AsparagusEduardo

NTx86 and others added 12 commits April 13, 2024 10:14
@NTx86
Fix poison projectile array being incorrectly combined into three sep…
c64453e 
…erate arrays
@NTx86
Fix hoenn pokedex palette being split in two
2b78a85
@GriffinRichards
Merge pull request pret#1989 from NTx86/fix-poison-anim-array
8c4b1a3 
Fix poison projectile array being incorrectly combined into three separate arrays
@GriffinRichards
Merge pull request pret#1990 from NTx86/fix-hoenn-pokedex-pal
9cfe9b1 
Fix hoenn pokedex palette being split in two
@Kurausukun
Use Only One Loop in RandomlyGivePartyPokerus (pret#1991)
5dbd90b
@Jaizu
Make AdjustFriendship more readable
411d7e6
@Jaizu
Fix Pokeblock script missing a releaseall
ef03daf
@GriffinRichards
Merge pull request pret#1996 from Jaizu/fix_pokeblocks
999731f 
Fix Pokeblock script missing a releaseall
@GriffinRichards
Merge pull request pret#1995 from Jaizu/adjust_friendship
aa4fa92 
Make AdjustFriendship more readable
@Sneed69
Add POKE_ICON_BASE_PAL_TAG to a header
b592c6e
@GriffinRichards
Merge pull request pret#1998 from Sneed69/define-POKE_ICON_BASE_PAL_TAG
18f84b7 
Move POKE_ICON_BASE_PAL_TAG to a header
@AsparagusEduardo
Merge remote-tracking branch '_pret_origin/master' into _RHH/pr/maste…
9e72271 
…r/pret_20240526

# Conflicts:
#	src/battle_anim_poison.c
#	src/pokemon.c
#	src/pokemon_icon.c
@Bassoonian Bassoonian merged commit 70ef93e into rh-hideout:master May 27, 2024
1 check passed
Bassoonian added a commit that referenced this pull request May 27, 2024
@Bassoonian
Revert "Pre-1.8.4 pret merge (2024/05/26) (#4631)"
5237f06 
This reverts commit 70ef93e.
@SBird1337 SBird1337 mentioned this pull request May 27, 2024
Merged
@AsparagusEduardo AsparagusEduardo deleted the _RHH/pr/master/pret_20240526 branch May 31, 2024 16:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Bassoonian Bassoonian Bassoonian approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@AsparagusEduardo @Bassoonian @NTx86 @GriffinRichards @Kurausukun @Jaizu @Sneed69