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

merge mail with master, fix conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-12-17 20:22:56 +01:00
parent 930fea6fad 6d73bb4b57
commit 46fa2557d7
217 changed files with 22013 additions and 26319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
asm/player_pc.s
View File

@@ -1378,7 +1378,7 @@ sub_816B9D8: @ 816B9D8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_8198C58
bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r0, 24
movs r1, 0x1