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

They said we'd break, they said we'd loose. But here we are, what else is new? (pret merge 2023-10-02) #3372

Merged
merged 13 commits into from
Oct 2, 2023
Merged

They said we'd break, they said we'd loose. But here we are, what else is new? (pret merge 2023-10-02) #3372

merged 13 commits into from
Oct 2, 2023

Commits on Sep 17, 2023

  1. Slight RTC documentation + Evolution times constants

    @AsparagusEduardo
    AsparagusEduardo committed Sep 17, 2023
    Configuration menu
    Copy the full SHA
    fb6f45b View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. Solved a bunch of -Wall errors on modern

    @AsparagusEduardo
    AsparagusEduardo committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    af210da View commit details
    Browse the repository at this point in the history

  2. Renamed time amounts

    @AsparagusEduardo
    AsparagusEduardo committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    927e4b6 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. Review changes.

    @AsparagusEduardo
    AsparagusEduardo committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    a56eb4f View commit details
    Browse the repository at this point in the history

  2. Null dereferencing fix

    @AsparagusEduardo
    AsparagusEduardo committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    03a1e77 View commit details
    Browse the repository at this point in the history

  3. Fixed dumb mistake

    @AsparagusEduardo
    AsparagusEduardo committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    aff709a View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. Merge pull request pret#1925 from AsparagusEduardo/pret/pr2/dayNightC… 

    …onst

Slight RTC documentation + Evolution times constants
    @GriffinRichards
    GriffinRichards authored Sep 26, 2023
    Configuration menu
    Copy the full SHA
    3eb1fa6 View commit details
    Browse the repository at this point in the history

  2. Add friendship evo threshold constant

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

Commits on Sep 30, 2023

  1. Review comment

    @AsparagusEduardo
    AsparagusEduardo committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    b724cfc View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2023

  1. Merge pull request pret#1928 from kittenchilly/friendship 

    Add friendship evo threshold constant
    @GriffinRichards
    GriffinRichards authored Oct 1, 2023
    Configuration menu
    Copy the full SHA
    3ff27bd View commit details
    Browse the repository at this point in the history

  2. Merge pull request pret#1926 from AsparagusEduardo/pret/pr2/EggWall 

    Solved a bunch of -Wall errors on modern
    @GriffinRichards
    GriffinRichards authored Oct 1, 2023
    Configuration menu
    Copy the full SHA
    654b638 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. Merge branch 'pret_master' into RHH/pr/upcoming/pret_Merge20231002 

    # Conflicts:
#	src/battle_ai_script_commands.c
#	src/battle_controller_player.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_safari.c
#	src/battle_controller_wally.c
#	src/battle_controllers.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/mystery_gift_menu.c
#	src/pokemon.c
    @AsparagusEduardo
    AsparagusEduardo committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    a6940c9 View commit details
    Browse the repository at this point in the history

  2. Incorporated upstream fixes

    @AsparagusEduardo
    AsparagusEduardo committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    4febd2c View commit details
    Browse the repository at this point in the history