diff options
| -rw-r--r-- | asm/ghost.s | 15 | ||||
| -rw-r--r-- | src/ghost.c | 6 |
2 files changed, 6 insertions, 15 deletions
diff --git a/asm/ghost.s b/asm/ghost.s index 201f97af5..046a2fb53 100644 --- a/asm/ghost.s +++ b/asm/ghost.s @@ -7,21 +7,6 @@ @ ghost - thumb_func_start sub_80DE0FC -sub_80DE0FC: @ 80DE0FC - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl sub_8078764 - ldr r0, _080DE110 @ =sub_80DE114 - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080DE110: .4byte sub_80DE114 - thumb_func_end sub_80DE0FC - thumb_func_start sub_80DE114 sub_80DE114: @ 80DE114 push {r4-r6,lr} diff --git a/src/ghost.c b/src/ghost.c index d44df6818..fdb2e52fa 100644 --- a/src/ghost.c +++ b/src/ghost.c @@ -16,6 +16,7 @@ void sub_80DDD78(struct Sprite *); void sub_80DDE7C(u8 taskId); void sub_80DDED0(u8 taskId); void sub_80DDFE8(struct Sprite *); +void sub_80DE114(struct Sprite *); void sub_80DDB6C(struct Sprite *sprite) { InitAnimSpritePos(sprite, 1); @@ -243,4 +244,9 @@ void sub_80DDFE8(struct Sprite *sprite) { case 3: move_anim_8074EE0(sprite); } +} + +void sub_80DE0FC(struct Sprite *sprite) { + sub_8078764(sprite, 1); + sprite->callback = &sub_80DE114; }
\ No newline at end of file |