Merge branch 'master' into main-menu-state-machine

This commit is contained in:
Phlosioneer
2019-03-02 17:35:44 -05:00
188 changed files with 4322 additions and 3958 deletions
+1 -1
View File
@@ -6500,7 +6500,7 @@ _081D4F6C:
bne _081D4F88
movs r0, 0x49
bl PlaySE
bl sub_800A620
bl CheckShouldAdvanceLinkState
movs r0, 0
strh r0, [r5]
b _081D4FE6