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

Commits on Mar 31, 2023

  1. added berserk gene item

    //todo:
    activate effect on battle start
    u8-Salem committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    fc18adb View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2023

  1. fixed item not activating on battle start

    thanks lunos <3
    u8-Salem committed Apr 2, 2023
    Configuration menu
    Copy the full SHA
    cfcc405 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2023

  1. added graphics

    credits to KryptonLion for the sprite work
    u8-Salem committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    ec47958 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    32d5ccb View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2023

  1. support 255 turns of confusion

    technically one short of the original duration but unless you want to sacrifice another bit for it its close enough to indefinit
    u8-Salem committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    3363b5b View commit details
    Browse the repository at this point in the history
  2. Revert "support 255 turns of confusion"

    This reverts commit 3363b5b.
    u8-Salem committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    eea21a4 View commit details
    Browse the repository at this point in the history
  3. Revert "extend some u32 status2 to u64"

    This reverts commit 32d5ccb.
    u8-Salem committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    583d8e6 View commit details
    Browse the repository at this point in the history
  4. Add Infinite confusion bit

    u8-Salem committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    7a5706d View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2023

  1. requested changes + fix to BS call

    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 committed Apr 10, 2023
    Configuration menu
    Copy the full SHA
    1050d6d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3a0bfd4 View commit details
    Browse the repository at this point in the history
  3. prevent inf. conf. being set when conf. is prevented.

    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 committed Apr 10, 2023
    Configuration menu
    Copy the full SHA
    ecd15d1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0b7d86e View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. update item description

    more descriptive weee :)
    
    Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
    u8-Salem and AsparagusEduardo committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    9393899 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2023

  1. additional inf. confusion heal instances

    for own tempo cases and lum berry
    u8-Salem committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    31568d5 View commit details
    Browse the repository at this point in the history
  2. extract removing confusion status

    RemoveConfusionStatus now unsets STATUS2_CONFUSION and STATUS4_INFINITE_CONFUSION
    u8-Salem committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    0a8abaa View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2023

  1. Configuration menu
    Copy the full SHA
    13425c4 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2023

  1. Configuration menu
    Copy the full SHA
    c8fb26e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    72816d8 View commit details
    Browse the repository at this point in the history
  3. cleanup

    remove debugprint that I forgot
    uncomment ndebug and fix a horrible mistake
    u8-Salem committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    bbc3c4d View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. Tests for Berserk Gene

    u8-Salem committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    3a5df79 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2023

  1. fix a test

    u8-Salem committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    6d5dec5 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2023

  1. Configuration menu
    Copy the full SHA
    3689135 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    78878dc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    79517c3 View commit details
    Browse the repository at this point in the history
  4. extract infinite confusion conditions

    own function since there is not enough overlap with canBeConfused
    u8-Salem committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    7d441b3 View commit details
    Browse the repository at this point in the history
  5. safeguard test

    u8-Salem committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    b883bf3 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2023

  1. Update test/hold_effect_berserk_gene.c

    Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
    u8-Salem and AsparagusEduardo committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    85842d6 View commit details
    Browse the repository at this point in the history
  2. Apply suggestions from code review

    Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
    u8-Salem and AsparagusEduardo committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    03652ba View commit details
    Browse the repository at this point in the history