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.

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

Mic Test Overlay #320

Merged
merged 21 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .githooks/pre-commit

This file was deleted.

61 changes: 61 additions & 0 deletions .github/workflows/build-rom/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: 'Build ROM'
adrienntindall marked this conversation as resolved.
Show resolved Hide resolved

description: 'Builds the ROM image'

runs:
using: "composite"
steps:
- name: Update and Install Software
shell: bash
run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
sudo apt update
sudo ACCEPT_EULA=Y apt -y --fix-missing --allow-downgrades upgrade
sudo apt -y --allow-downgrades install g++-10-multilib linux-libc-dev binutils-arm-none-eabi p7zip-full pkg-config libpugixml-dev ppa-purge
sudo ppa-purge -y ppa:ubuntu-toolchain-r/test || true
sudo dpkg --add-architecture i386
sudo mkdir -pm755 /etc/apt/keyrings
sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
sudo add-apt-repository ppa:cybermax-dexter/sdl2-backport
sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/$(lsb_release -cs)/winehq-$(lsb_release -cs).sources
sudo apt update
sudo apt -y --allow-downgrades install --install-recommends winehq-stable

- name: Setup Repo
shell: bash
run: |
mkdir -p ~/download
cd ~/download
wget https://github.com/pret/pokeheartgold/raw/workflows/assets/mwccarm.zip
wget https://github.com/pret/pokeheartgold/raw/workflows/assets/NitroSDK-3_2-060901.7z
unzip mwccarm.zip
mv mwccarm $GITHUB_WORKSPACE/tools
7z x NitroSDK-3_2-060901.7z
mv NitroSDK-3_2-060901/tools/bin $GITHUB_WORKSPACE/tools
mv NitroSDK-3_2-060901/include/nitro/specfiles/ARM7-TS.lcf.template $GITHUB_WORKSPACE/sub/
mv NitroSDK-3_2-060901/include/nitro/specfiles/ARM9-TS.lcf.template $GITHUB_WORKSPACE/
mv NitroSDK-3_2-060901/include/nitro/specfiles/mwldarm.response.template $GITHUB_WORKSPACE/
working-directory: ~

- name: Set Swap Space
uses: pierotofy/set-swap-space@master
with:
swap-size-gb: 19

- name: Build ROM
shell: bash
run: make -j${nproc}

- name: Archive build artifacts
if: ${{ always() && env.NONMATCHING == 0 }}
shell: bash
run: |
find . -maxdepth 2 -type d \( -name build -or -name files \) -exec tar -czhf ${GAME_VERSION}_build.tar.gz {} +

- name: Upload build artifacts
if: ${{ always() && env.NONMATCHING == 0 }}
uses: actions/upload-artifact@v4
with:
name: ${{ env.GAME_VERSION }}-build
path: ${{ env.GAME_VERSION }}_build.tar.gz
retention-days: 1
68 changes: 27 additions & 41 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ env:
CALCROM_DISCORD_WEBHOOK_AVATAR_URL: "https://i.imgur.com/38BQHdd.png"
CALCROM_DISCORD_WEBHOOK_USERNAME: OK
CALCROM_WEBHOOK_URL: ${{ secrets.WEBHOOKURL }}
COMPARE: 1

jobs:
build:
build-heartgold:
runs-on: ubuntu-22.04

steps:
Expand All @@ -34,83 +33,70 @@ jobs:
sudo apt update
sudo apt -y --allow-downgrades install --install-recommends winehq-stable

steps:
- name: Checkout Repo
uses: actions/checkout@v4

- name: Setup Repo
run: |
mkdir -p ~/download
cd ~/download
wget https://github.com/pret/pokeheartgold/raw/workflows/assets/mwccarm.zip
wget https://github.com/pret/pokeheartgold/raw/workflows/assets/NitroSDK-3_2-060901.7z
unzip mwccarm.zip
mv mwccarm $GITHUB_WORKSPACE/tools
7z x NitroSDK-3_2-060901.7z
mv NitroSDK-3_2-060901/tools/bin $GITHUB_WORKSPACE/tools
mv NitroSDK-3_2-060901/include/nitro/specfiles/ARM7-TS.lcf.template $GITHUB_WORKSPACE/sub/
mv NitroSDK-3_2-060901/include/nitro/specfiles/ARM9-TS.lcf.template $GITHUB_WORKSPACE/
mv NitroSDK-3_2-060901/include/nitro/specfiles/mwldarm.response.template $GITHUB_WORKSPACE/
working-directory: ~

- name: Set Swap Space
uses: pierotofy/set-swap-space@master
with:
swap-size-gb: 19
- name: Build ROM
adrienntindall marked this conversation as resolved.
Show resolved Hide resolved
env:
GAME_VERSION: SOULSILVER
GAME_LANGUAGE: ENGLISH
GAME_REVISION: 0
NONMATCHING: 0
COMPARE: 1
BUILD_OUT: build/soulsilver.us/
uses: ./.github/workflows/build-rom

build-nonmatching-heartgold:
runs-on: ubuntu-22.04

steps:
- name: Checkout Repo
uses: actions/checkout@v4

- name: Build HeartGold
- name: Build ROM
env:
GAME_VERSION: HEARTGOLD
GAME_LANGUAGE: ENGLISH
GAME_REVISION: 0
run: make -j4

- name: Build SoulSilver
build-nonmatching-soulsilver:
runs-on: ubuntu-22.04

steps:
- name: Checkout Repo
uses: actions/checkout@v4

- name: Build ROM
env:
GAME_VERSION: SOULSILVER
GAME_LANGUAGE: ENGLISH
GAME_REVISION: 0
run: make -j4

- name: Webhook
if: ${{ github.event_name == 'push' }}
run: |
sudo chmod 755 $GITHUB_WORKSPACE/.github/calcrom/webhook.sh
$GITHUB_WORKSPACE/.github/calcrom/webhook.sh pokeheartgold "$CALCROM_WEBHOOK_URL"
continue-on-error: true

- name: Post error archive
if: failure()
continue-on-error: true
run: find . -maxdepth 2 -type d \( -name build -or -name files \) -exec tar -czvhf failure.tar.gz {} +

- name: Post error upload
if: failure()
uses: actions/upload-artifact@v4
with:
name: pokeheartgold-failure-${{ github.run_id }}
path: failure.tar.gz
retention-days: 1

- name: Checkout xMAP
if: ${{ github.event_name == 'push' }}
uses: actions/checkout@v4
with:
path: 'xmap'
ref: 'xmap'

- name: Move xMAP
if: ${{ github.event_name == 'push' }}
run: |
mkdir -p xmap
cp build/heartgold.us/*.xMAP xmap/heartgoldus.xMAP
cp build/soulsilver.us/*.xMAP xmap/soulsilverus.xMAP
echo "XMAP_COMMIT_MSG=$( git log --format=%s ${GITHUB_SHA} )" >> $GITHUB_ENV

- name: Update xMAP
if: ${{ github.event_name == 'push' }}
uses: EndBug/add-and-commit@v9
with:
cwd: "./xmap"
add: "*.xMAP"
message: ${{ env.XMAP_COMMIT_MSG }}

96 changes: 0 additions & 96 deletions asm/include/overlay_62.inc

This file was deleted.

Loading