diff options
| -rw-r--r-- | asm/ghost.s | 17 | ||||
| -rw-r--r-- | src/ghost.c | 8 |
2 files changed, 8 insertions, 17 deletions
diff --git a/asm/ghost.s b/asm/ghost.s index 699a3c13e..3aa77a273 100644 --- a/asm/ghost.s +++ b/asm/ghost.s @@ -7,23 +7,6 @@ @ ghost - thumb_func_start sub_80DDD58 -sub_80DDD58: @ 80DDD58 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl sub_8078764 - ldr r1, _080DDD74 @ =sub_80DDD78 - str r1, [r4, 0x1C] - adds r0, r4, 0 - bl _call_via_r1 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080DDD74: .4byte sub_80DDD78 - thumb_func_end sub_80DDD58 - thumb_func_start sub_80DDD78 sub_80DDD78: @ 80DDD78 push {r4,lr} diff --git a/src/ghost.c b/src/ghost.c index 6c7e36190..c14a60fdf 100644 --- a/src/ghost.c +++ b/src/ghost.c @@ -10,6 +10,7 @@ extern u8 gUnknown_0202F7D2; void sub_80DDBD8(struct Sprite *); void sub_80DDC4C(struct Sprite *); void sub_80DDCC8(struct Sprite *); +void sub_80DDD78(struct Sprite *); void sub_80DDB6C(struct Sprite *sprite) { InitAnimSpritePos(sprite, 1); @@ -107,4 +108,11 @@ void sub_80DDCC8(struct Sprite *sprite) } if(sprite->data[6] == 0) sprite->data[6] = 0x100; +} + +void sub_80DDD58(struct Sprite *sprite) +{ + sub_8078764(sprite, 1); + sprite->callback = sub_80DDD78; + sub_80DDD78(sprite); }
\ No newline at end of file |