Merge branch 'dppt_hgss_music' of https://github.com/CyanSMP64/pokeem…

…erald into music-expansion
BuffelSaft · Jul 9, 2021 · 594692a · 594692a
2 parents c311112 + 73c886b
commit 594692a
Show file tree

Hide file tree

Showing 972 changed files with 18,666 additions and 2,841 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,11 +11,29 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
+    env:
+      GAME_VERSION: EMERALD
+      GAME_REVISION: 0
+      GAME_LANGUAGE: ENGLISH
+      MODERN: 0
+      COMPARE: 1
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Checkout syms
+        uses: actions/checkout@master
+        with:
+          path: symbols
+          ref: symbols
+
+      - name: Checkout agbcc
+        uses: actions/checkout@master
+        with:
+          path: agbcc
+          repository: pret/agbcc
+
       - name: Install binutils
         run: sudo apt install gcc-arm-none-eabi binutils-arm-none-eabi
         # build-essential, git, and libpng-dev are already installed
@@ -24,10 +42,9 @@ jobs:
 
       - name: Install agbcc
         run: |
-          git clone https://github.com/pret/agbcc.git
-          cd agbcc 
           ./build.sh
           ./install.sh ../
+        working-directory: agbcc
 
       - name: Agbcc
         run: make -j${nproc} 

diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 *.i
 *.elf
 *.gba
+*.gba.bak
 *.sgm
 *.sa1
 *.ss[0-9]

diff --git a/INSTALL.md b/INSTALL.md
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ @@
     *.i
     *.elf
     *.gba
+    *.gba.bak
     *.sgm
     *.sa1
     *.ss[0-9]
@@ Expand Down @@