diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_anim_812C144.s | 8 | ||||
| -rw-r--r-- | asm/current.s | 4 | ||||
| -rw-r--r-- | asm/ghost.s | 4 | ||||
| -rw-r--r-- | asm/ground.s | 4 | ||||
| -rw-r--r-- | asm/normal.s | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s index 7d01bf5e2..d748a78f1 100644 --- a/asm/battle_anim_812C144.s +++ b/asm/battle_anim_812C144.s @@ -128,7 +128,7 @@ sub_812C220: @ 812C220 adds r4, r0, 0 movs r0, 0x5A strh r0, [r4, 0x2E] - ldr r0, _0812C258 @ =sub_80782D8 + ldr r0, _0812C258 @ =WaitAnimForDuration str r0, [r4, 0x1C] movs r0, 0x7 strh r0, [r4, 0x30] @@ -151,7 +151,7 @@ sub_812C220: @ 812C220 pop {r0} bx r0 .align 2, 0 -_0812C258: .4byte sub_80782D8 +_0812C258: .4byte WaitAnimForDuration _0812C25C: .4byte sub_812C268 _0812C260: .4byte REG_BLDCNT _0812C264: .4byte REG_BLDALPHA @@ -857,7 +857,7 @@ sub_812C798: @ 812C798 movs r0, 0x1E strh r0, [r4, 0x2E] strh r1, [r4, 0x30] - ldr r0, _0812C7C0 @ =sub_80782D8 + ldr r0, _0812C7C0 @ =WaitAnimForDuration str r0, [r4, 0x1C] ldr r1, _0812C7C4 @ =sub_812C7C8 adds r0, r4, 0 @@ -867,7 +867,7 @@ _0812C7BA: pop {r0} bx r0 .align 2, 0 -_0812C7C0: .4byte sub_80782D8 +_0812C7C0: .4byte WaitAnimForDuration _0812C7C4: .4byte sub_812C7C8 thumb_func_end sub_812C798 diff --git a/asm/current.s b/asm/current.s index 69927ea23..fa3fec58a 100644 --- a/asm/current.s +++ b/asm/current.s @@ -442,7 +442,7 @@ _080D67F6: ldr r0, _080D6810 @ =gBattleAnimArgs ldrh r0, [r0, 0x4] strh r0, [r4, 0x2E] - ldr r0, _080D6814 @ =sub_80782D8 + ldr r0, _080D6814 @ =WaitAnimForDuration str r0, [r4, 0x1C] ldr r1, _080D6818 @ =DestroyAnimSprite adds r0, r4, 0 @@ -452,7 +452,7 @@ _080D67F6: bx r0 .align 2, 0 _080D6810: .4byte gBattleAnimArgs -_080D6814: .4byte sub_80782D8 +_080D6814: .4byte WaitAnimForDuration _080D6818: .4byte DestroyAnimSprite thumb_func_end sub_80D679C diff --git a/asm/ghost.s b/asm/ghost.s index df20a7b20..b5620910b 100644 --- a/asm/ghost.s +++ b/asm/ghost.s @@ -2627,7 +2627,7 @@ _080DEFAA: bne _080DF00C movs r0, 0x1E strh r0, [r3, 0x2E] - ldr r0, _080DF004 @ =sub_80782D8 + ldr r0, _080DF004 @ =WaitAnimForDuration str r0, [r3, 0x1C] ldr r1, _080DF008 @ =sub_80DF018 adds r0, r3, 0 @@ -2636,7 +2636,7 @@ _080DEFAA: .align 2, 0 _080DEFFC: .4byte 0x000003ff _080DF000: .4byte 0xfffffc00 -_080DF004: .4byte sub_80782D8 +_080DF004: .4byte WaitAnimForDuration _080DF008: .4byte sub_80DF018 _080DF00C: movs r0, 0x28 diff --git a/asm/ground.s b/asm/ground.s index c489f4b04..ac3f909b5 100644 --- a/asm/ground.s +++ b/asm/ground.s @@ -1188,7 +1188,7 @@ _080E17EA: bl StoreSpriteCallbackInData ldrh r0, [r4, 0x4] strh r0, [r6, 0x2E] - ldr r0, _080E1860 @ =sub_80782D8 + ldr r0, _080E1860 @ =WaitAnimForDuration str r0, [r6, 0x1C] pop {r4-r6} pop {r0} @@ -1200,7 +1200,7 @@ _080E1850: .4byte gBattleAnimArgs _080E1854: .4byte 0x000003ff _080E1858: .4byte 0xfffffc00 _080E185C: .4byte DestroyAnimSprite -_080E1860: .4byte sub_80782D8 +_080E1860: .4byte WaitAnimForDuration thumb_func_end sub_80E17CC thumb_func_start sub_80E1864 diff --git a/asm/normal.s b/asm/normal.s index c92b4563c..732c049ab 100644 --- a/asm/normal.s +++ b/asm/normal.s @@ -1709,7 +1709,7 @@ _080E299C: ldr r1, _080E29B8 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData - ldr r0, _080E29BC @ =sub_80782D8 + ldr r0, _080E29BC @ =WaitAnimForDuration str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -1717,7 +1717,7 @@ _080E299C: .align 2, 0 _080E29B4: .4byte gBattleAnimArgs _080E29B8: .4byte DestroyAnimSprite -_080E29BC: .4byte sub_80782D8 +_080E29BC: .4byte WaitAnimForDuration thumb_func_end sub_80E2978 thumb_func_start sub_80E29C0 |