diff options
author | golem galvanize <golemgalvanize@github.com> | 2018-10-17 20:03:31 -0400 |
---|---|---|
committer | golem galvanize <golemgalvanize@github.com> | 2018-10-17 20:03:31 -0400 |
commit | 2c6d634acdf7bd22fb7e5c4933ff2e13712d2ec3 (patch) | |
tree | 9d51a6c1c07da6946022fe5867e34300bd71493d /asm/party_menu.s | |
parent | 65a0c48eec7d2184478841d232d1fb3c3350fa37 (diff) | |
parent | f67bbbdaaa905833f1c2a315624128aafef9a4cb (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'asm/party_menu.s')
-rw-r--r-- | asm/party_menu.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/party_menu.s b/asm/party_menu.s index f5ed314ce..e5540e171 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -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 |