Merge remote-tracking branch 'upstream/master'

This commit is contained in:
paul committed 2018-10-17 21:10:51 +02:00
commit e396bcdb72
42 files changed
+982 -1495

No files matched your search

+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