diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-05-09 15:08:19 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-09 15:08:19 -0700 |
commit | 7defc27b994069715e5749245700d20dd740e4f0 (patch) | |
tree | 32011d5fcf74dfb47aab7ea8ecbb87731200bbf3 /asm/record_mixing.s | |
parent | e01253ebe1b527cd2df555e43427c8e54ed32196 (diff) | |
parent | 4470f77b3d3cc7bcd646f8ef6511680da1887214 (diff) |
Merge pull request #245 from PikalaxALT/mauville_old_man
Mauville old man
Diffstat (limited to 'asm/record_mixing.s')
-rw-r--r-- | asm/record_mixing.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/record_mixing.s b/asm/record_mixing.s index 2dab009a5..acfcf48ed 100644 --- a/asm/record_mixing.s +++ b/asm/record_mixing.s @@ -1438,7 +1438,7 @@ _080E791A: add r1, r9 movs r2, 0x40 bl memcpy - bl sub_8120670 + bl ResetMauvilleOldManFlag add sp, 0x10 pop {r3,r4} mov r8, r3 |