diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-04 19:15:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-04 19:15:40 -0700 |
| commit | 83ea8d0cd9f8141181d09718c79b8916df945752 (patch) | |
| tree | 7487b983c8205a97832831b6b6b06cf60534f65a /asm/mauville_old_man.s | |
| parent | cdb5e9e3143b2f1086d8bd4f02a76186c164d02a (diff) | |
| parent | 58200616d55798002046e67a656f5295834455ec (diff) | |
Merge pull request #243 from PikalaxALT/trader
Port trader from Ruby
Diffstat (limited to 'asm/mauville_old_man.s')
| -rw-r--r-- | asm/mauville_old_man.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/mauville_old_man.s b/asm/mauville_old_man.s index af4764d76..924e35b89 100644 --- a/asm/mauville_old_man.s +++ b/asm/mauville_old_man.s @@ -90,7 +90,7 @@ sub_8120128: @ 8120128 thumb_func_start sub_8120154 sub_8120154: @ 8120154 push {lr} - bl sub_81339F8 + bl TraderSetup pop {r0} bx r0 thumb_func_end sub_8120154 |