diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-28 03:00:15 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-28 03:00:15 -0600 |
commit | 1496ea3a24f188cad26ac40f5bfcc3e571f3311a (patch) | |
tree | a0b00c058bd7234b9140b4636b08016278f1b049 /asm/trainer_card.s | |
parent | 2d04eb22abd3f60902ee1f9bc87bd510518709e3 (diff) | |
parent | 87958f2f87b9f7f6e5548d9cb2ac53c3339b78d5 (diff) |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'asm/trainer_card.s')
-rw-r--r-- | asm/trainer_card.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/trainer_card.s b/asm/trainer_card.s index 49ff1748d..3c1b46dcc 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -5766,7 +5766,7 @@ sub_80C58D4: @ 80C58D4 beq _080C5914 cmp r0, 0x2 beq _080C591C - bl sub_8085784 + bl Overworld_PlaySpecialMapMusic b _080C5924 .pool _080C5914: |