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

Palms are sweaty, arms are heavy, mom's spaghetti (pret merge 2023/03/19) #2841

Merged
merged 16 commits into from
Mar 20, 2023
Merged

Palms are sweaty, arms are heavy, mom's spaghetti (pret merge 2023/03/19) #2841

merged 16 commits into from
Mar 20, 2023

Commits on Feb 12, 2023

  1. Reformatted gNatureStatTable

    @AsparagusEduardo
    AsparagusEduardo committed Feb 12, 2023
    Configuration menu
    Copy the full SHA
    d699d55 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2023

  1. Remove duplicate metatile label sections

    @GriffinRichards
    GriffinRichards committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    0df56b8 View commit details
    Browse the repository at this point in the history

  2. Standardize RS mossdeep gym metatile labels

    @GriffinRichards
    GriffinRichards committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    b656565 View commit details
    Browse the repository at this point in the history

  3. Sort metatile labels alphabetically

    @GriffinRichards
    GriffinRichards committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    d3d680c View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. Document the 2 different sText_GotchaPkmnCaught

    @AsparagusEduardo
    AsparagusEduardo committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    f5aa3b8 View commit details
    Browse the repository at this point in the history

  2. Document music usage to make it easier to search for a specific track

    @AsparagusEduardo
    AsparagusEduardo committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    d330ca0 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2023

  1. Merge pull request pret#1859 from AsparagusEduardo/pret/doc/natures 

    Reformatted gNatureStatTable
    @GriffinRichards
    GriffinRichards authored Mar 5, 2023
    Configuration menu
    Copy the full SHA
    4d99d2c View commit details
    Browse the repository at this point in the history

  2. Merge pull request pret#1860 from GriffinRichards/metatile-labels 

    Format metatile_labels
    @GriffinRichards
    GriffinRichards authored Mar 5, 2023
    Configuration menu
    Copy the full SHA
    ce68758 View commit details
    Browse the repository at this point in the history

  3. Review changes

    @AsparagusEduardo
    AsparagusEduardo committed Mar 5, 2023
    Configuration menu
    Copy the full SHA
    a6bd35c View commit details
    Browse the repository at this point in the history

  4. Merge pull request pret#1864 from AsparagusEduardo/pret/doc/songsComm… 

    …ents

Document music usage to make it easier to search for a specific track
    @GriffinRichards
    GriffinRichards authored Mar 5, 2023
    Configuration menu
    Copy the full SHA
    bb078e0 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2023

  1. Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments

    @AsparagusEduardo
    AsparagusEduardo committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    0a9ab96 View commit details
    Browse the repository at this point in the history

  2. Changed definitions of string conversion IDE macros to allow their us… 

    …e in compound literals without IDE errors
    @AsparagusEduardo
    AsparagusEduardo committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    2cb54c4 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2023

  1. Merge pull request pret#1872 from AsparagusEduardo/pret/pr2/friendship 

    Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments
    @GriffinRichards
    GriffinRichards authored Mar 15, 2023
    Configuration menu
    Copy the full SHA
    02a3783 View commit details
    Browse the repository at this point in the history

  2. Merge pull request pret#1873 from AsparagusEduardo/pret/pr2/stringCon… 

    …versionIDE

Changed IDE macros to allow their use in compound literals without IDE errors
    @GriffinRichards
    GriffinRichards authored Mar 15, 2023
    Configuration menu
    Copy the full SHA
    00e211a View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2023

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

    …0319

# Conflicts:
#	data/battle_scripts_2.s
#	include/constants/battle_string_ids.h
#	include/constants/songs.h
#	src/battle_message.c
#	src/data/pokemon/species_info.h
    @AsparagusEduardo
    AsparagusEduardo committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    51b716c View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. Undo Timburr and Stunfisk friendships, as they don't change

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