Merge branch 'master' into event-flags

This commit is contained in:
garak authored and GitHub committed 2018-10-17 12:30:45 -04:00
commit 7d88b9647f
56 files changed
+1280 -2679

No files matched your search

File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -10499,7 +10499,7 @@ sub_81B5958: @ 81B5958
thumb_func_start sub_81B5974
sub_81B5974: @ 81B5974
push {lr}
bl sub_809D1E8
bl TrySetDiveWarp
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24