Merge pull request #153 from adrienntindall/master

Add xMAP exporting to workflow + Battle overlay progress
pret · Jun 12, 2023 · 9b642da · 9b642da
2 parents 790bcdb + 3450a8e
commit 9b642da
Show file tree

Hide file tree

Showing 91 changed files with 3,261 additions and 3,506 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -85,3 +85,19 @@ jobs:
           name: pokeheartgold-failure-${{ github.run_id }}
           path: failure.tar.gz
           retention-days: 1
+
+      - name: Move xMAP
+        if: ${{ github.event_name == 'push' }}
+        run: |
+          cp *.xMAP 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@v7
+        with:
+          branch: xmap
+          cwd: "./xmap"
+          add: "*.XMAP"
+          message: ${{ env.XMAP_COMMIT_MSG }}
+
diff --git a/asm/include/overlay_12_0224E4FC.inc b/asm/include/overlay_12_0224E4FC.inc
@@ -85,7 +85,7 @@
 .public CopyBattleMonToPartyMon
 .public LockBattlerIntoCurrentMove
 .public UnlockBattlerOutOfCurrentMove
-.public ov12_02250CFC
+.public GetBattlerStatusCondition
 .public ov12_02250D4C
 .public BattleContext_Init
 .public ov12_02251038

diff --git a/asm/include/overlay_12_battle_controller.inc b/asm/include/overlay_12_battle_controller.inc
@@ -48,7 +48,7 @@
 .public ov12_0224ED00
 .public ov12_0224EDC0
 .public GetBattlerVar
-.public ov12_02250CFC
+.public GetBattlerStatusCondition
 .public StruggleCheck
 .public CheckAbilityActive
 .public ov12_02256748

diff --git a/asm/overlay_01_sprite_data.s b/asm/overlay_01_sprite_data.s
diff --git a/asm/overlay_106.s b/asm/overlay_106.s
@@ -1804,7 +1804,7 @@ _021E66C2:
 	b _021E66EE
 _021E66C6:
 	bl SpeciesToOverworldModelIndexOffset
-	ldr r1, _021E66F8 ; =MMODEL_TSURE_POKE_BULBASAUR
+	ldr r1, _021E66F8 ; =MMODEL_FOLLOWER_MON_BULBASAUR
 	add r4, r0, r1
 	add r0, r5, #0
 	bl OverworldModelLookupHasFemaleForme
@@ -1827,7 +1827,7 @@ _021E66EE:
 	pop {r3, r4, r5, r6, r7, pc}
 	nop
 _021E66F4: .word NATIONAL_DEX_COUNT
-_021E66F8: .word MMODEL_TSURE_POKE_BULBASAUR
+_021E66F8: .word MMODEL_FOLLOWER_MON_BULBASAUR
 	thumb_func_end ov106_021E66B0
 
 	thumb_func_start ov106_021E66FC