Merge branch 'master' into battle

This commit is contained in:
jiangzhengwenjz committed 2019-10-25 09:22:50 +08:00
commit 2f87855072
136 files changed
+3963 -6605

No files matched your search

+3 -3
View File
@@ -366,9 +366,9 @@ sub_806CAC8: @ 806CAC8
bl IncrementGameStat
bl MENewsJisanStepCounter
bl IncrementRenewableHiddenItemStepCounter
bl sub_80CC918
bl sub_80CB054
bl sub_80CCFBC
bl RunMassageCooldownStepCounter
bl IncrementResortGorgeousStepCounter
bl BirthIslandDeoxysStepCounter
mov r0, sp
adds r1, r4, 0
adds r2, r6, 0