dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into battle

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-10-25 09:22:50 +08:00
parent 6ca932e5e9 7579fc65c1
commit 2f87855072
136 changed files with 3963 additions and 6605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/cable_club.s
+2 -2
View File
@@ -1625,7 +1625,7 @@ _08081404:
.align 2, 0
_0808140C: .4byte gBattleTypeFlags
_08081410:
bl sub_80A03D8
bl ReducePlayerPartyToThree
ldr r1, _08081440 @ =gBattleTypeFlags
movs r0, 0x4B
_08081418:
@@ -1848,7 +1848,7 @@ _080815D4:
.align 2, 0
_080815DC: .4byte gBattleTypeFlags
_080815E0:
bl sub_80A03D8
bl ReducePlayerPartyToThree
ldr r1, _08081610 @ =gBattleTypeFlags
movs r0, 0x4B
_080815E8: