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

Flat Merge Friday (Weekly merge) #2286

Merged
merged 29 commits into from
Sep 6, 2022
Merged

Flat Merge Friday (Weekly merge) #2286

merged 29 commits into from
Sep 6, 2022

Commits on Aug 18, 2022

  1. Misc cleanup

    @AsparagusEduardo
    AsparagusEduardo committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    59f89bd View commit details
    Browse the repository at this point in the history

  2. Sync src/battle_controllers.c with pokefirered

    @AsparagusEduardo
    AsparagusEduardo committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    3bc2cf9 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2022

  1. Incorporate commented bug fixes in contest AI scripts

    @GriffinRichards
    GriffinRichards committed Aug 19, 2022
    Configuration menu
    Copy the full SHA
    11b4958 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2022

  1. Merge branch 'pretmaster' into pret_clean2

    @AsparagusEduardo
    AsparagusEduardo committed Aug 20, 2022
    Configuration menu
    Copy the full SHA
    76d2d92 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2022

  1. Standardize judgement vs judgment spelling

    @GriffinRichards
    GriffinRichards committed Aug 21, 2022
    Configuration menu
    Copy the full SHA
    261b0ff View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2022

  1. Merge pull request pret#1747 from GriffinRichards/contest-ai-bug 

    Incorporate commented bug fixes in contest AI scripts
    @GriffinRichards
    GriffinRichards authored Aug 27, 2022
    Configuration menu
    Copy the full SHA
    8aead3b View commit details
    Browse the repository at this point in the history

  2. Missing uses of MAX_SPRITES

    @AsparagusEduardo
    AsparagusEduardo committed Aug 27, 2022
    Configuration menu
    Copy the full SHA
    481210b View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'pret/master' into pret_clean2

    @AsparagusEduardo
    AsparagusEduardo committed Aug 27, 2022
    Configuration menu
    Copy the full SHA
    0a34d47 View commit details
    Browse the repository at this point in the history

  4. Corrected uses of GetBattlerSide

    @AsparagusEduardo
    AsparagusEduardo committed Aug 27, 2022
    Configuration menu
    Copy the full SHA
    6c457f4 View commit details
    Browse the repository at this point in the history

  5. Usage of BATTLE_PARTNER

    @AsparagusEduardo
    AsparagusEduardo committed Aug 27, 2022
    Configuration menu
    Copy the full SHA
    15d611b View commit details
    Browse the repository at this point in the history

  6. Usage of BATTLE_OPPOSITE

    @AsparagusEduardo
    AsparagusEduardo committed Aug 27, 2022
    Configuration menu
    Copy the full SHA
    1f0a952 View commit details
    Browse the repository at this point in the history

  7. SpriteTemplate formatting

    @AsparagusEduardo
    AsparagusEduardo committed Aug 27, 2022
    Configuration menu
    Copy the full SHA
    866d916 View commit details
    Browse the repository at this point in the history

  8. IS_BATTLER_OF_TYPE

    @AsparagusEduardo
    AsparagusEduardo committed Aug 27, 2022
    Configuration menu
    Copy the full SHA
    99fbad9 View commit details
    Browse the repository at this point in the history

  9. Removed unnecessary parenthesis

    @AsparagusEduardo
    AsparagusEduardo committed Aug 27, 2022
    Configuration menu
    Copy the full SHA
    1c8d3a4 View commit details
    Browse the repository at this point in the history

  10. Merge pull request pret#1757 from AsparagusEduardo/pret_clean2 

    Cleanup based on previous PRs
    @GriffinRichards
    GriffinRichards authored Aug 27, 2022
    Configuration menu
    Copy the full SHA
    0a2ac61 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2022

  1. Automatized the contents of some sideof in src/item.c

    @LOuroboros
    LOuroboros committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    e02b33e View commit details
    Browse the repository at this point in the history

  2. Picked the correct pointers for correctness' sake

    @LOuroboros
    LOuroboros committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    ea345f9 View commit details
    Browse the repository at this point in the history

  3. Merge pull request pret#1759 from LOuroboros/pyramidSchemes 

    Automatized the contents of some sideof in src/item.c
    @GriffinRichards
    GriffinRichards authored Sep 1, 2022
    Configuration menu
    Copy the full SHA
    b66de1f View commit details
    Browse the repository at this point in the history

  4. Updated a couple more sizeofs

    @LOuroboros
    LOuroboros committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    5d346fd View commit details
    Browse the repository at this point in the history

  5. Merge pull request pret#1760 from LOuroboros/bermuda 

    Updated a couple of sizeofs in src/battle_pyramid_bag.c
    @GriffinRichards
    GriffinRichards authored Sep 1, 2022
    Configuration menu
    Copy the full SHA
    d211adb View commit details
    Browse the repository at this point in the history

  6. Merge pull request pret#1748 from GriffinRichards/fix-judgement 

    Standardize judgement vs judgment spelling
    @GriffinRichards
    GriffinRichards authored Sep 1, 2022
    Configuration menu
    Copy the full SHA
    a28fbbc View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2022

  1. Renamed TM flags to keep consistency with the rest of the repo

    @AsparagusEduardo
    AsparagusEduardo committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    c7fc2e1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request pret#1761 from AsparagusEduardo/pret/tmFlagNames 

    Renamed TM flags to keep consistency with the rest of the repo
    @GriffinRichards
    GriffinRichards authored Sep 2, 2022
    Configuration menu
    Copy the full SHA
    ff53a55 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2022

  1. Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_2022… 

    …0902

# Conflicts:
#	include/battle.h
#	include/battle_controllers.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
    @AsparagusEduardo
    AsparagusEduardo committed Sep 3, 2022
    Configuration menu
    Copy the full SHA
    5403cd0 View commit details
    Browse the repository at this point in the history

  2. Applied remaining instances of BATTLE_OPPOSITE and BATTLE_PARTNER

    @AsparagusEduardo
    AsparagusEduardo committed Sep 3, 2022
    Configuration menu
    Copy the full SHA
    03498d7 View commit details
    Browse the repository at this point in the history

  3. Using GET_BATTLER_SIDE and GET_BATTLER_SIDE2

    @AsparagusEduardo
    AsparagusEduardo committed Sep 3, 2022
    Configuration menu
    Copy the full SHA
    790bdd6 View commit details
    Browse the repository at this point in the history

  4. Removed pointless macro

    @AsparagusEduardo
    AsparagusEduardo committed Sep 3, 2022
    Configuration menu
    Copy the full SHA
    41bf6bd View commit details
    Browse the repository at this point in the history

  5. Merge pull request pret#1764 from AsparagusEduardo/pret/battlerMacros 

    Further uses of GET_BATTLER_SIDE macros'
    @GriffinRichards
    GriffinRichards authored Sep 3, 2022
    Configuration menu
    Copy the full SHA
    797aa08 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2022

  1. Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_2022… 

    …0902

# Conflicts:
#	src/battle_util.c
    @AsparagusEduardo
    AsparagusEduardo committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    dbd56ef View commit details
    Browse the repository at this point in the history