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

Port pokefirered's Vs. Seeker to pokeemerald #3256

Merged
merged 46 commits into from
Nov 26, 2023
Merged

Port pokefirered's Vs. Seeker to pokeemerald #3256

merged 46 commits into from
Nov 26, 2023

Commits on Aug 30, 2023

  1. First version of Vs. Seeker

    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    0042857 View commit details
    Browse the repository at this point in the history

  2. Update movement.inc 

    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files/98f7e9978d8cd16083ea1bc7857f4f0235a9f1af#r1306721924
    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    b6eb9e7 View commit details
    Browse the repository at this point in the history

  3. Update field_effect_scripts.s 

    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722004
    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    2ae5e9f View commit details
    Browse the repository at this point in the history

  4. Update field_effect_scripts.s 

    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722024
    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    945ce76 View commit details
    Browse the repository at this point in the history

  5. Update item_use.h 

    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722401
    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    93c2970 View commit details
    Browse the repository at this point in the history

  6. Update movement_action_func_tables.h 

    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722828
    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    fa4ccb4 View commit details
    Browse the repository at this point in the history

  7. Update event_object_movement.c 

    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722887
    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    a0876d5 View commit details
    Browse the repository at this point in the history

  8. Update overworld.c 

    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306723396
    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    542de59 View commit details
    Browse the repository at this point in the history

  9. Update vs_seeker.h 

    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306724158
    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    f81df90 View commit details
    Browse the repository at this point in the history

  10. Update vs_seeker.c 

    Addressed some cleanup comments from SBird
    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    766e046 View commit details
    Browse the repository at this point in the history

  11. Update UpdateRandomTrainerRematches 

    Fixed typo in ClearAllTrainerRematchStates
Fixed types in GetRematchableTrainerLocalId
    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    121085b View commit details
    Browse the repository at this point in the history

  12. Updated UseVsSeekerEffect_2

    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    bd37bb8 View commit details
    Browse the repository at this point in the history

  13. Updated UseVsSeekerEffect_3

    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    6f2bc1e View commit details
    Browse the repository at this point in the history

  14. Updated UseVsSeekerEffect_4

    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    fe85a1d View commit details
    Browse the repository at this point in the history

  15. Fixed bug that allowed Vs Seeker to be used indoors in correct places 

    Moved VsSeeker function declarations into header
    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    6c1b2f2 View commit details
    Browse the repository at this point in the history

  16. Refactored FieldUseFunc_VsSeeker

    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    1c33bfc View commit details
    Browse the repository at this point in the history

  17. Added curly braces to else case in FieldUseFunc_VsSeeker

    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    8d678d7 View commit details
    Browse the repository at this point in the history

  18. renamed data[x] in Task_ResetObjectsRematchWantedState

    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    559dc8d View commit details
    Browse the repository at this point in the history

  19. Refactored Task_ResetObjectsRematchWantedState

    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    2f6c34f View commit details
    Browse the repository at this point in the history

  20. Refactored VsSeekerResetObjectMovementAfterChargeComplete

    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    6bab4f6 View commit details
    Browse the repository at this point in the history

  21. Refactored ResetMovementOfRematchableTrainers

    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    6a1df45 View commit details
    Browse the repository at this point in the history

  22. Refactored GatherNearbyTrainerInfo

    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    101a265 View commit details
    Browse the repository at this point in the history

  23. Refactored Task_VsSeeker_3

    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    863231a View commit details
    Browse the repository at this point in the history

  24. CanUseVsSeeker

    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    aeafd2b View commit details
    Browse the repository at this point in the history

  25. Refactored GetVsSeekerResponseInArea

    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    47fd390 View commit details
    Browse the repository at this point in the history

  26. GetCurVsSeekerResponse refactored

    @pkmnsnfrn
    pkmnsnfrn committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    e71a95e View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. Cleaned up GetTrainerFlagFromScript

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

  2. Gave sensible names to Task_VsSeeker

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

  3. Fixed two bugs where player would not have the right gfx state after … 

    …using VsSeeker on a Bike or Underwater
    @pkmnsnfrn
    pkmnsnfrn committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    c35c968 View commit details
    Browse the repository at this point in the history

  4. Renamed UseVsSeeker Functions

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

  5. Added I_VS_SEEKER_CHARGING to make Vs. Seeker broken until flag is as… 

    …signed

Removed extra VsSeeker animation code
    @pkmnsnfrn
    pkmnsnfrn committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    4453a78 View commit details
    Browse the repository at this point in the history

  6. Addressed PR feedback

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

  7. Fixed issue with building non-modern

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

  8. Refactored GetRunningBehaviorFromGraphicsId and renamed to GetRespons… 

    …eMovementTypeFromTrainerGraphicsId
    @pkmnsnfrn
    pkmnsnfrn committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    7b15ad4 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. Merge branch 'upcoming' into vs_seeker

    @pkmnsnfrn
    pkmnsnfrn authored Sep 1, 2023
    Configuration menu
    Copy the full SHA
    c9077db View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2023

  1. Addresses Lunos's PR feedback: https://github.com/rh-hideout/pokeemer… 

    …ald-expansion/pull/3256\#pullrequestreview-1623547850

Removed the check to see if a map was not indoors to improve readability
Made IsValidLocationForVsSeeker into a static function
    @pkmnsnfrn
    pkmnsnfrn committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    35f4a92 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-… 

    …expansion into vs_seeker
    @pkmnsnfrn
    pkmnsnfrn committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    433770c View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. Merge branch 'upcoming' into vs_seeker

    @pkmnsnfrn
    pkmnsnfrn committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    753a0c3 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. Added changes in response to Jasper's feedback 

    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1725276522
    @pkmnsnfrn
    pkmnsnfrn committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    e4fe0e1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upcoming' into vs_seeker

    @pkmnsnfrn
    pkmnsnfrn authored Nov 13, 2023
    Configuration menu
    Copy the full SHA
    26ac0e7 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. Updated with Edu's discord feedback https://discord.com/channels/4192… 

    …13663107416084/1135040810082123907/1176872015085453392
    @pkmnsnfrn
    pkmnsnfrn committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    cdb9b9e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-… 

    …expansion into vs_seeker
    @pkmnsnfrn
    pkmnsnfrn committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    b5dc744 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

  1. Removed ifdef tags around the repo unless needed 

    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files/b5dc744cedc8e14c88d461afbbdc693c4f54e950
    @pkmnsnfrn
    pkmnsnfrn committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    bce579b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upcoming' into vs_seeker

    @pkmnsnfrn
    pkmnsnfrn authored Nov 24, 2023
    Configuration menu
    Copy the full SHA
    63dda47 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2023

  1. Merge branch 'upcoming' into vs_seeker

    @pkmnsnfrn
    pkmnsnfrn authored Nov 26, 2023
    Configuration menu
    Copy the full SHA
    34f1e9c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upcoming' into vs_seeker

    @pkmnsnfrn
    pkmnsnfrn authored Nov 26, 2023
    Configuration menu
    Copy the full SHA
    ffe9236 View commit details
    Browse the repository at this point in the history