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

Merge #81

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Merge #81

wants to merge 13 commits into from
+6,891 −7,153

Commits on Mar 24, 2024

  1. Clean up map filenames (#1175) 

    Co-authored-by: Ethan <[email protected]>
    @bates64 @ethteck
    bates64 and ethteck committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    c43d15e View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Fix hardcoding of moveID in battle/sushie.c (#1183)

    @Rainchus
    Rainchus committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    dcba4f1 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. Add missing pause_tabs enums, fix BlueNinjaKoopa -> BlackNinjaKoopa (… 

    …#1184)
    @Rainchus
    Rainchus committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    d35bdf4 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. revert texture renaming (#1185) 

    Co-authored-by: HailSanta <[email protected]>
    @z64a
    z64a and HailSanta committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    f2ef071 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2024

  1. Use crunch64 for compression (#1189)

    @ethteck
    ethteck committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    5f1f696 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Merge

    @bates64
    bates64 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    0f335c4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into dx-sync

    @bates64
    bates64 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    9f6b5fc View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2024

  1. ci: install crunch64-cli

    @bates64
    bates64 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    9cdacd2 View commit details
    Browse the repository at this point in the history

  2. use updated window ID names 

    pmret/papermario#1193
    @bates64
    bates64 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    9fb5a3a View commit details
    Browse the repository at this point in the history

  3. fix usage of EVT_SETUP_CAMERA_NO_LEAD

    @bates64
    bates64 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    ac41cfb View commit details
    Browse the repository at this point in the history

  4. re-add kzn smoke include from upstream

    @bates64
    bates64 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    0321c8a View commit details
    Browse the repository at this point in the history

  5. fix conflict in kzn_04

    @bates64
    bates64 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    ed1ccac View commit details
    Browse the repository at this point in the history

  6. fix old evt macro/fn usage

    @bates64
    bates64 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    ba0668d View commit details
    Browse the repository at this point in the history