diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-11-25 17:05:15 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-25 17:05:15 -0600 |
| commit | c2d3606f39d733fdecaebeaf8b3cbe00c7486361 (patch) | |
| tree | d6992adc9f00e0b56195f1c67f41da376b6282c1 /asm/fire.s | |
| parent | 19e235867a9af6159e375154135b6c09bf3d9ba9 (diff) | |
| parent | 5947e0d229cde5e00224b3c8aff91e27f0d06dfc (diff) | |
Merge pull request #398 from huderlem/rock
Decompile rock
Diffstat (limited to 'asm/fire.s')
| -rw-r--r-- | asm/fire.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/fire.s b/asm/fire.s index e7ca3072b..6efd9f45e 100644 --- a/asm/fire.s +++ b/asm/fire.s @@ -347,7 +347,7 @@ sub_810916C: @ 810916C strh r1, [r0, 0x32] movs r1, 0x50 strh r1, [r0, 0x36] - ldr r1, =sub_80A6EEC + ldr r1, =StartAnimLinearTranslation str r1, [r0, 0x1C] ldr r1, =DestroyAnimSprite bl StoreSpriteCallbackInData6 @@ -421,7 +421,7 @@ sub_810921C: @ 810921C push {r4,lr} adds r4, r0, 0 movs r1, 0x1 - bl sub_80A69CC + bl InitAnimSpritePos ldr r0, =gBattleAnimArgs ldrh r0, [r0, 0x4] movs r1, 0 @@ -613,7 +613,7 @@ sub_81093A4: @ 81093A4 push {r4,lr} adds r4, r0, 0 movs r1, 0x1 - bl sub_80A69CC + bl InitAnimSpritePos ldr r1, =gBattleAnimArgs ldrh r0, [r1, 0x4] strh r0, [r4, 0x30] @@ -1564,7 +1564,7 @@ _08109B12: _08109B18: adds r0, r5, 0 movs r1, 0 - bl sub_80A69CC + bl InitAnimSpritePos ldr r4, =gBattleAnimArgs ldrb r1, [r4, 0x4] adds r0, r5, 0 |