diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-03-26 20:38:14 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-03-26 20:38:14 -0400 |
commit | 5c6c7a82f69ed383bc4d931ffb90b2b5d3a59701 (patch) | |
tree | c9fd1c685c5c95c5e1bc868b2572a8cbc25115b1 /src/battle/anim/scan.c | |
parent | 0e372d2fb6785ba47011b6ee0ad1b68ea05ae198 (diff) | |
parent | 583724758e97fafc8e6796f13d2c46660d6f4388 (diff) |
Merge branch 'master' into tomomichi_debug_menu
Diffstat (limited to 'src/battle/anim/scan.c')
-rw-r--r-- | src/battle/anim/scan.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c index e6b85dd5f..403894cc8 100644 --- a/src/battle/anim/scan.c +++ b/src/battle/anim/scan.c @@ -26,7 +26,7 @@ void sub_80CD3E0(struct Sprite* sprite) sprite->pos1.x -= 32; sprite->pos1.y -= 32; sprite->data[0] = 20; - sprite->callback = sub_80782D8; + sprite->callback = WaitAnimForDuration; StoreSpriteCallbackInData(sprite, sub_80CD408); } @@ -36,7 +36,7 @@ void sub_80CD408(struct Sprite* sprite) { case 0: sprite->data[0] = 1; - sprite->callback = sub_80782D8; + sprite->callback = WaitAnimForDuration; StoreSpriteCallbackInData(sprite, sub_80CD408); break; case 1: @@ -62,7 +62,7 @@ void sub_80CD4B8(struct Sprite* sprite) if ((sprite->data[5] >> 8) == 4) { sprite->data[0] = 10; - sprite->callback = sub_80782D8; + sprite->callback = WaitAnimForDuration; StoreSpriteCallbackInData(sprite, sub_80CD4EC); } else @@ -80,7 +80,7 @@ void sub_80CD4EC(struct Sprite* sprite) sprite->data[0] = 3; sprite->data[1] = 0; sprite->data[2] = 0; - sprite->callback = sub_80782D8; + sprite->callback = WaitAnimForDuration; StoreSpriteCallbackInData(sprite, sub_80CD5A8); } else |