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

Add Berserk Gene Item #2893

Merged
merged 28 commits into from
Apr 25, 2023
Merged

Conversation

u8-Salem
Copy link

@u8-Salem u8-Salem commented Apr 7, 2023

Adds Item Berserk Gene
Reference: https://bulbapedia.bulbagarden.net/wiki/Berserk_Gene

a

Credits

KryptonLion for the Berserk Gene sprite and palette

Discord contact info

Salem#3258

u8-Salem and others added 8 commits March 31, 2023 17:43
//todo:
activate effect on battle start
credits to KryptonLion for the sprite work
technically one short of the original duration but unless you want to sacrifice another bit for it its close enough to indefinit
src/battle_util.c Outdated Show resolved Hide resolved
src/battle_util.c Outdated Show resolved Hide resolved
src/battle_util.c Outdated Show resolved Hide resolved
src/battle_util.c Outdated Show resolved Hide resolved
include/battle_scripts.h Outdated Show resolved Hide resolved
include/constants/hold_effects.h Show resolved Hide resolved
include/constants/items.h Outdated Show resolved Hide resolved
remove always true if statement
remove trailing whitespace
move defines up
move bs script declaration up
fix using wrong bs call in ITEMEFFECT_NORMAL and ITEMEFFECT_MOVE_END
@u8-Salem
Copy link
Author

Almost ready for another review. want to investigate a possible edge case first.

if a pokemon with own tempo uses baton pass, it would pass it the inf. conf. bit to the next mon. if that mon became confused then, it would be confused infinitely.
So we need to make sure this bit is never set for a pokemon with own tempo.
Since misty terrain prevents the confusion also, this applies aswell.
@u8-Salem
Copy link
Author

ready for another review I think

src/data/text/item_descriptions.h Outdated Show resolved Hide resolved
src/battle_util.c Outdated Show resolved Hide resolved
src/pokemon.c Outdated Show resolved Hide resolved
u8-Salem and others added 6 commits April 12, 2023 02:07
more descriptive weee :)

Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
for own tempo cases and lum berry
RemoveConfusionStatus now unsets STATUS2_CONFUSION and STATUS4_INFINITE_CONFUSION
@u8-Salem
Copy link
Author

u8-Salem commented Apr 18, 2023

I think its good for another review
still need my worries with open requested change addressed pls

remove debugprint that I forgot
uncomment ndebug and fix a horrible mistake
@u8-Salem u8-Salem force-pushed the berserkGene branch 2 times, most recently from 05f85a0 to ce502d7 Compare April 19, 2023 17:07
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.

Almost there :)

test/hold_effect_berserk_gene.c Outdated Show resolved Hide resolved
test/hold_effect_berserk_gene.c Outdated Show resolved Hide resolved
test/hold_effect_berserk_gene.c Outdated Show resolved Hide resolved
test/hold_effect_berserk_gene.c Outdated Show resolved Hide resolved
u8-Salem and others added 2 commits April 25, 2023 14:52
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
@AsparagusEduardo AsparagusEduardo merged commit 78c4d07 into rh-hideout:upcoming Apr 25, 2023
@u8-Salem u8-Salem deleted the berserkGene branch May 8, 2023 07:33
@AsparagusEduardo AsparagusEduardo mentioned this pull request May 31, 2023
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