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

Add xMAP exporting to workflow + Battle overlay progress #153

Merged
merged 7 commits into from
Jun 12, 2023
Merged

Add xMAP exporting to workflow + Battle overlay progress #153

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0ac0931
Move battle c files to their own folder
adrienntindall Jun 11, 2023
27a4481
Blanket replace TSURE_POKE -> FOLLOWER_MON
adrienntindall Jun 11, 2023
3637c61
Added automatic exporting of xMAP files into workflow
adrienntindall Jun 12, 2023
a2f50e4
Merge branch 'master' into master
adrienntindall Jun 12, 2023
30736da
Replace TSURE_POKE in json files
adrienntindall Jun 12, 2023
6f57073
Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold
adrienntindall Jun 12, 2023
3450a8e
Newline on build.yml
adrienntindall Jun 12, 2023
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
15 changes: 15 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,18 @@ 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 }}
adrienntindall marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion asm/include/overlay_12_0224E4FC.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
.public CopyBattleMonToPartyMon
.public LockBattlerIntoCurrentMove
.public UnlockBattlerOutOfCurrentMove
.public ov12_02250CFC
.public GetBattlerStatusCondition
.public ov12_02250D4C
.public BattleContext_Init
.public ov12_02251038
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_12_battle_controller.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
.public ov12_0224ED00
.public ov12_0224EDC0
.public GetBattlerVar
.public ov12_02250CFC
.public GetBattlerStatusCondition
.public StruggleCheck
.public CheckAbilityActive
.public ov12_02256748
Expand Down
1,256 changes: 628 additions & 628 deletions asm/overlay_01_sprite_data.s
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions asm/overlay_106.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading