dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

move mon data fix conflicts

Browse Source
This commit is contained in:
DizzyEggg
2018-02-07 20:17:55 +01:00
parent 541fef5368 802b505d7b
commit 4b7d778a5c
302 changed files with 14099 additions and 23834 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_frontier_2.s
+1 -1
View File
@@ -21034,7 +21034,7 @@ sub_81A5718: @ 81A5718
b _081A57D8
.pool
_081A576C:
ldr r0, =gBattleMoveFlags
ldr r0, =gMoveResultFlags
ldrb r1, [r0]
movs r0, 0x29
ands r0, r1