Merge branch 'master' into link

This commit is contained in:
scnorton
2018-01-18 12:53:31 -05:00
3620 changed files with 632656 additions and 52484 deletions

View File

@@ -356,7 +356,7 @@ sub_809FA9C: @ 809FA9C
bl is_c1_link_related_active
cmp r0, 0
bne _0809FAB2
bl player_bitmagic
bl FreezeMapObjects
bl sub_808B864
bl sub_808BCF4
_0809FAB2: