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

Add support for legendary fusion #3274

Merged
merged 34 commits into from
Nov 23, 2023
Merged

Add support for legendary fusion #3274

merged 34 commits into from
Nov 23, 2023

Commits on Feb 1, 2023

  1. Legendary Mon Fusion Evolution Compatibility Added 

    Kyurem, Calyrex, and Necrozma Fusions have been implemented, however, the animation for the the process is incomplete, the party menu screen needs to be updated while the screen is whited out and it has proved beyond me right now. Smh
    @TeamAquasHideout
    TeamAquasHideout committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    eaa4a91 View commit details
    Browse the repository at this point in the history

  2. Added Fusion Move Prompts 

    Handles cases for learning the fusion moves from the other fused mon and deleting the move when you unfuse (plus learning confusion (well a set choice in the data struct) if there are no moves left after deleting one)
    @TeamAquasHideout
    TeamAquasHideout committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    e523845 View commit details
    Browse the repository at this point in the history

  3. Fix Bug With Fusion Mon Move Learning 

    If the main fusion came after the fused mon in the party order it would try to teach the move to the next member in the party
    @TeamAquasHideout
    TeamAquasHideout committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    f3232b5 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2023

  1. Apply suggestions from code review 

    Co-authored-by: LOuroboros <[email protected]>
    @AsparagusEduardo @LOuroboros
    AsparagusEduardo and LOuroboros authored Mar 27, 2023
    Configuration menu
    Copy the full SHA
    a344137 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. Merge branch 'pr/2621' into fusion

    @kittenchilly
    kittenchilly committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    76342d7 View commit details
    Browse the repository at this point in the history

  2. Fix build

    @kittenchilly
    kittenchilly committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    91682f4 View commit details
    Browse the repository at this point in the history

  3. Fix fusion items being used up

    @kittenchilly
    kittenchilly committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    f64114c View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/upcoming' into fusion

    @kittenchilly
    kittenchilly committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    7ad56f0 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2023

  1. Merge branch 'upcoming' into fusion

    @kittenchilly
    kittenchilly committed Sep 2, 2023
    Configuration menu
    Copy the full SHA
    8faff8a View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2023

  1. Fixed animations

    @kittenchilly
    kittenchilly committed Sep 3, 2023
    Configuration menu
    Copy the full SHA
    2e78420 View commit details
    Browse the repository at this point in the history

  2. RefreshPartyMenu

    @kittenchilly
    kittenchilly committed Sep 3, 2023
    Configuration menu
    Copy the full SHA
    f39fe5f View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. Merge remote-tracking branch 'upstream/upcoming' into fusion

    @kittenchilly
    kittenchilly committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    aa5e883 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upcoming' into fusion

    @kittenchilly
    kittenchilly committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    1403a07 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. Merge branch 'upcoming' into fusion

    @kittenchilly
    kittenchilly committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    0da5662 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. Apply suggestions from code review 

    Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
    @kittenchilly @AsparagusEduardo
    kittenchilly and AsparagusEduardo authored Sep 8, 2023
    Configuration menu
    Copy the full SHA
    3f0eaa0 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/upcoming' into fusion

    @kittenchilly
    kittenchilly committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    4027b48 View commit details
    Browse the repository at this point in the history

  3. Apply suggestions

    @kittenchilly
    kittenchilly committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    c297ce6 View commit details
    Browse the repository at this point in the history

  4. Update form_change_tables.h

    @kittenchilly
    kittenchilly committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    2c95c0f View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2023

  1. Merge branch 'upcoming' into fusion

    @kittenchilly
    kittenchilly committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    7bf6574 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. Merge remote-tracking branch 'upstream/upcoming' into fusion

    @kittenchilly
    kittenchilly committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    0276af3 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. Fix animation and simplify fusion tables

    @kittenchilly
    kittenchilly committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    1483f17 View commit details
    Browse the repository at this point in the history

  2. Fix party full message

    @kittenchilly
    kittenchilly committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    d148bd8 View commit details
    Browse the repository at this point in the history

  3. Remove trailing whitespaces

    @kittenchilly
    kittenchilly committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    0c4f363 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. Merge remote-tracking branch 'upstream/upcoming' into fusion

    @kittenchilly
    kittenchilly committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    36f74e8 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2023

  1. Merge remote-tracking branch 'upstream/upcoming' into fusion

    @kittenchilly
    kittenchilly committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    144b6bd View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. Merge remote-tracking branch 'upstream/upcoming' into fusion

    @kittenchilly
    kittenchilly committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    2ef3457 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. Update party_menu.c

    @kittenchilly
    kittenchilly committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    2a94ecb View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

  1. Merge branch 'upcoming' into fusion

    @kittenchilly
    kittenchilly committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    9aa95a4 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2023

  1. Merge branch 'upcoming' into fusion

    @kittenchilly
    kittenchilly committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    59b375c View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. Merge branch 'upcoming' into fusion

    @kittenchilly
    kittenchilly committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    a0ce9e3 View commit details
    Browse the repository at this point in the history

  2. Update party_menu.c

    @kittenchilly
    kittenchilly committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    99c7d23 View commit details
    Browse the repository at this point in the history

  3. Make IsFusionMon better

    @kittenchilly
    kittenchilly committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    05dbc8f View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2023

  1. Apply suggestions from code review 

    Co-authored-by: Bassoonian <[email protected]>
    @kittenchilly @Bassoonian
    kittenchilly and Bassoonian authored Nov 23, 2023
    Configuration menu
    Copy the full SHA
    4b8c1cc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upcoming' into fusion

    @kittenchilly
    kittenchilly committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    37051ea View commit details
    Browse the repository at this point in the history