dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into battle

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-10-25 09:22:50 +08:00
parent 6ca932e5e9 7579fc65c1
commit 2f87855072
136 changed files with 3963 additions and 6605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_control_avatar.s
+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