diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-23 15:48:11 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-23 15:48:11 -0400 |
commit | 0352a72d2ef5f820d6e8c4ad1806f5a8128b6d2f (patch) | |
tree | 1cda7283e7e7ac4678a14843a30d2519a37d3b34 /asm/party_menu.s | |
parent | e3993e2b34282933f149b85a4cfe7f45e051b504 (diff) | |
parent | e4acfdf20b7d56b83cee6f4e49b257a2ecb92a95 (diff) |
Merge branch 'master' of github.com:pret/pokefirered
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 215dfbe8e..ace2e3554 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -18182,7 +18182,7 @@ sub_8127AC0: @ 8127AC0 bne _08127B08 _08127AE6: ldr r4, _08127AFC @ =gStringVar1 - bl sub_80444C4 + bl GetTrainerPartnerName adds r1, r0, 0 adds r0, r4, 0 bl StringCopy |