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

[RTM] Finish removing address comments, split out mart_constants.asm, and other tweaks #530

Merged
merged 14 commits into from
Jun 25, 2018
Merged

[RTM] Finish removing address comments, split out mart_constants.asm, and other tweaks #530

merged 14 commits into from
Jun 25, 2018

Commits on Jun 24, 2018

  1. Use direct tile IDs, not charmap entries, since they don't correspond… 

    … correctly (e.g. "┌" is not the top-right corner)
    @Rangi42
    Rangi42 committed Jun 24, 2018
    Configuration menu
    Copy the full SHA
    5c7d04a View commit details
    Browse the repository at this point in the history

  2. Separate Mart constants from item data constants

    @Rangi42
    Rangi42 committed Jun 24, 2018
    Configuration menu
    Copy the full SHA
    e36a505 View commit details
    Browse the repository at this point in the history

  3. Add STANDARDMART_* jumptable index constants

    @Rangi42
    Rangi42 committed Jun 24, 2018
    Configuration menu
    Copy the full SHA
    f6ef095 View commit details
    Browse the repository at this point in the history

  4. wCurMartEnd - wCurMart = 16

    @Rangi42
    Rangi42 committed Jun 24, 2018
    Configuration menu
    Copy the full SHA
    a4bf94e View commit details
    Browse the repository at this point in the history

  5. wMartItemBCDEnd is unused

    @Rangi42
    Rangi42 committed Jun 24, 2018
    Configuration menu
    Copy the full SHA
    ff4cfff View commit details
    Browse the repository at this point in the history

  6. Unreferenced_53d84 → Unreferenced_MonPicBanks from pokegold-spaceworld

    @Rangi42
    Rangi42 committed Jun 24, 2018
    Configuration menu
    Copy the full SHA
    5cbff21 View commit details
    Browse the repository at this point in the history

  7. FISHGROUP_DATA_LENGTH

    @Rangi42
    Rangi42 committed Jun 24, 2018
    Configuration menu
    Copy the full SHA
    5a58f90 View commit details
    Browse the repository at this point in the history

  8. WATER_WILDDATA_LENGTH

    @Rangi42
    Rangi42 committed Jun 24, 2018
    Configuration menu
    Copy the full SHA
    d84aabf View commit details
    Browse the repository at this point in the history

  9. NUM_WATERMON

    @Rangi42
    Rangi42 committed Jun 24, 2018
    Configuration menu
    Copy the full SHA
    ee48c7a View commit details
    Browse the repository at this point in the history

  10. NUM_GRASSMON * 2

    @Rangi42
    Rangi42 committed Jun 24, 2018
    Configuration menu
    Copy the full SHA
    1a888f2 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2018

  1. Merge branch 'master' of https://github.com/pret/pokecrystal 

    # Conflicts:
#	engine/items/mart.asm
    @Rangi42
    Rangi42 committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    e2fb7ac View commit details
    Browse the repository at this point in the history

  2. Remove address comment

    @Rangi42
    Rangi42 committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    c703261 View commit details
    Browse the repository at this point in the history

  3. Remove more address comments

    @Rangi42
    Rangi42 committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    9afaed9 View commit details
    Browse the repository at this point in the history

  4. Remove address comments in docs

    @Rangi42
    Rangi42 committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    6e44095 View commit details
    Browse the repository at this point in the history