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

Convert move flags and bans into GCC bitfields #2952

Merged
merged 62 commits into from
Jul 3, 2023
Merged

Convert move flags and bans into GCC bitfields #2952

merged 62 commits into from
Jul 3, 2023
+1,906 −2,107

Conversation

AsparagusEduardo
Copy link
Collaborator

@AsparagusEduardo AsparagusEduardo commented Apr 25, 2023 •
edited
Loading

Description

This PR converts all move flags and banned moves into GCC bitfields.

Based on @SBird1337's suggestion

This PR also:

  • Adds bitfields for Me First and Gravity.
  • Updates Pollen Puff's flag with Gen 9's flag change.
  • Removes unused BattleScript_EffectStomp and EFFECT_FLINCH_MINIMIZE_HIT.
  • Removes unused BattleScript_FlinchEffect
  • Removes reduntant EFFECT_TWISTER which was a copy of EFFECT_FLINCH_HIT.
  • Inverted Protect and Mirror Move flags and logic, since there were more moves that were affected by these moves than not.
  • Made a separate config for move flag changes: B_UPDATED_MOVE_FLAGS.
  • Fixes missing uses of MOVE_UNAVAILABLE in battle_ai_util.c
  • Fixes Wandering Spirit skipping contact checks.
  • Fixes Stench/King's Rock interaction
    • Removed sMovesNotAffectedByStench in favor of checking for moves with Flinch chance
  • Adds IS_MOVE_RECOIL to help recoil move checks.
  • Adds functions to account for the flags field being removed alongside TestMoveFlags and TestMoveFlagsInMoveset
    • HasSoundMove
    • HasHighCritRatioMove
    • HasMagicCoatAffectedMove
    • HasSnatchAffectedMove
    • They all use a CHECK_MOVE_FLAG macro
  • Adds sParentalBondBannedEffects to streamline adding new moves.
  • Assist uses Copycat's flag + the 2 additional move effects banned by it.
  • Added EFFECT_GEOMANCY to IsTwoTurnsMove.

Discord contact info

AsparagusEduardo#6051

@AsparagusEduardo
Slicing moves to new bitfield
2c44f5f
@AsparagusEduardo
Wind moves to new bitfield
670c263
@AsparagusEduardo
Two-strike moves to new bitfield
106817d
@AsparagusEduardo
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/featur…
ec90c6e 
…e/extendMoveFlags
@AsparagusEduardo
Forgot to add flagTwoStrikes to battle_moves.h
d2991b1
@AsparagusEduardo
Removed "flag" from field names
cc09e10
@AsparagusEduardo
FLAG_HIT_IN_SUBSTITUTE and FLAG_THAW_USER
dc58f70
@AsparagusEduardo
Airborne moves
a19b0e7
@AsparagusEduardo
FLAG_POWDER, FLAG_TARGET_ABILITY_IGNORED and FLAG_DANCE
cf13bad
@AsparagusEduardo
FLAG_BALLISTIC and FLAG_PROTECTION_MOVE
97010ac
@AsparagusEduardo
Fixed missing uses of MOVE_UNAVAILABLE in battle_ai_util.c
f47fc1b
@AsparagusEduardo
FLAG_SOUND
9567596
@AsparagusEduardo
FLAG_DMG_UNDERGROUND and FLAG_DMG_UNDERWATER
94d907b
@AsparagusEduardo
FLAG_DMG_MINIMIZE
171faaf
@AsparagusEduardo
Cleanup
fddbae2
@AsparagusEduardo
FLAG_STAT_STAGES_IGNORED
0098442
@AsparagusEduardo
Updated Pollen Puff's ballistic flag
5ac05f2
@AsparagusEduardo
FLAG_STRONG_JAW_BOOST and FLAG_MEGA_LAUNCHER_BOOST
d26c91d
@AsparagusEduardo
Merge branch 'upcoming' into RHH/pr/feature/extendMoveFlags
f693d6d
@AsparagusEduardo
thaw
d55a05c
@AsparagusEduardo
Merge branch 'RHH/upcoming' into RHH/pr/feature/extendMoveFlags
d202882
@AsparagusEduardo
FLAG_THREE_STRIKES
6610b22
@AsparagusEduardo
FLAG_IRON_FIST_BOOST
ece340d
@AsparagusEduardo
FLAG_RECKLESS_BOOST
66bc4b9
@AsparagusEduardo
FLAG_HIGH_CRIT
33d0bf8
@AsparagusEduardo
Removed empty flags
e0e9904
@AsparagusEduardo
Moves that fail when called by Me First + added missing Shell Trap
bd22748
@AsparagusEduardo
Moves that fail when Gravity is active
7dddd9b
@AsparagusEduardo
Better names for banned fields
ca50846
@AsparagusEduardo
Moves that fail when called by Instruct
9f28f56
@AsparagusEduardo AsparagusEduardo changed the title [WIP] Convert move flags and bans into GCC bitfields Convert move flags and bans into GCC bitfields May 31, 2023
@AsparagusEduardo AsparagusEduardo marked this pull request as ready for review June 1, 2023 12:29
@AsparagusEduardo
Copy link
Collaborator Author

Ready for review, updated description with all changes.

@AsparagusEduardo
Copy link
Collaborator Author

Updated description again because I forgor more stuff I did.

@cfmnephrite cfmnephrite mentioned this pull request Jun 19, 2023
Closed
@AsparagusEduardo
Merge branch 'RHH/upcoming' into RHH/pr/feature/extendMoveFlags
35fb2b7 
# Conflicts:
#	include/constants/battle_move_effects.h
#	src/data/battle_moves.h
@AsparagusEduardo
Fixed Triple Arrows test
cd1193b
@AsparagusEduardo
Copy link
Collaborator Author

Conflicts solved.

@DizzyEggg
Copy link
Collaborator

New conflicts 👀

@AsparagusEduardo
Merge branch 'RHH/upcoming' into RHH/pr/feature/extendMoveFlags
28b5717 
# Conflicts:
#	src/battle_ai_util.c
#	test/ability_damp.c
#	test/move_effect_beak_blast.c
@AsparagusEduardo
Copy link
Collaborator Author

Conflicts solved 👀

@DizzyEggg DizzyEggg merged commit 1fa9a05 into rh-hideout:upcoming Jul 3, 2023
@AsparagusEduardo AsparagusEduardo deleted the RHH/pr/feature/extendMoveFlags branch July 3, 2023 18:46
@AsparagusEduardo AsparagusEduardo mentioned this pull request Sep 27, 2023
Merged
@AsparagusEduardo AsparagusEduardo mentioned this pull request Oct 14, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DizzyEggg DizzyEggg DizzyEggg 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.
2 participants
@AsparagusEduardo @DizzyEggg