diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-03 15:56:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-03 15:56:18 -0500 |
| commit | f2f28382c4ad2b283d485f70b28d14317d58c997 (patch) | |
| tree | 62b8924efe80a34e979ee6103bf68430eee89542 /src/battle/anim | |
| parent | 1120a5dd432365f79b7cdb9b7ad9972a6d2a8432 (diff) | |
| parent | 56ff2850550f1bd642218d2c5b99e3e8a7bd21f3 (diff) | |
Merge pull request #694 from luckytyphlosion/master
Match a few NONMATCHINGs, document some NONMATCHINGs.
Diffstat (limited to 'src/battle/anim')
| -rw-r--r-- | src/battle/anim/shadow_minimize.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/battle/anim/shadow_minimize.c b/src/battle/anim/shadow_minimize.c index be033ae6d..1a04fd58a 100644 --- a/src/battle/anim/shadow_minimize.c +++ b/src/battle/anim/shadow_minimize.c @@ -114,7 +114,9 @@ void sub_80D0614(struct Task* task, u8 taskId) gSprites[r8].oam.affineMode = ST_OAM_AFFINE_DOUBLE; gSprites[r8].affineAnimPaused = TRUE; r6 &= 0x1f; + gSprites[r8].oam.matrixNum = r6; // need to inhibit optimizing out the mov r0, 0x3f / neg r0, r0 + // current code does subs r0, #94 (0x1f - 94 = 0xc1, !0x3f = 0xc1) gSprites[r8].subpriority = task->data[7] - task->data[3]; task->data[3]++; task->data[6]++; |