Merge branch 'master' into event-flags

This commit is contained in:
garak
2018-10-17 12:30:45 -04:00
committed by GitHub
56 changed files with 1280 additions and 2679 deletions

File diff suppressed because it is too large Load Diff

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