Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu

This commit is contained in:
golem galvanize
2018-10-17 20:03:31 -04:00
514 changed files with 12131 additions and 24602 deletions
+1 -1
View File
@@ -7846,7 +7846,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