Merge branch 'master' into quest_log

This commit is contained in:
PikalaxALT
2018-11-02 14:16:03 -04:00
61 changed files with 629 additions and 1257 deletions
+1 -1
View File
@@ -613,7 +613,7 @@ sub_80A1460: @ 80A1460
lsls r0, 24
lsrs r5, r0, 24
ldr r4, _080A14B4 @ =gStringVar1
bl sub_80D0554
bl GetCoins
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16