Merge branch 'master' into quest_log

This commit is contained in:
PikalaxALT
2018-10-17 10:53:16 -07:00
20 changed files with 354 additions and 873 deletions
+1 -1
View File
@@ -4877,7 +4877,7 @@ _08120FAC: .4byte sub_8120FB0
sub_8120FB0: @ 8120FB0
push {lr}
bl FreeRestoreBattleData
bl sub_804C230
bl LoadPlayerParty
bl sub_815AC20
ldr r0, _08120FC8 @ =sub_815ABFC
bl SetMainCallback2