diff options
| -rw-r--r-- | asm/party_menu.s | 23 | ||||
| -rw-r--r-- | src/party_menu.c | 8 |
2 files changed, 7 insertions, 24 deletions
diff --git a/asm/party_menu.s b/asm/party_menu.s index 7c55732b9..3b9642ee5 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -7448,29 +7448,6 @@ PartyMenuGetPopupMenuFunc: @ 806E81C .section .text_8070968 - thumb_func_start sub_8070D90 -sub_8070D90: @ 8070D90 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r4, _08070DB4 @ =gTasks - ldr r3, _08070DB8 @ =0x0201c000 - ldrb r2, [r3, 0x4] - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r1, r4 - ldr r2, [r3, 0x10] - str r2, [r1] - bl DestroyTask - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08070DB4: .4byte gTasks -_08070DB8: .4byte 0x0201c000 - thumb_func_end sub_8070D90 - thumb_func_start DoEvolutionStoneItemEffect DoEvolutionStoneItemEffect: @ 8070DBC push {r4-r6,lr} diff --git a/src/party_menu.c b/src/party_menu.c index 49c421b54..83c0afbc3 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -84,7 +84,7 @@ extern const u8 *const gUnknown_08376D04[NUM_STATS]; extern const struct UnknownStruct5 gUnknown_08376BB4[][6]; static void sub_806E884(u8 taskId); -void sub_8070D90(u8 taskId); +static void sub_8070D90(u8 taskId); void PartyMenuTryDrawHPBar(u8, struct Pokemon *); /* @@ -1663,3 +1663,9 @@ void TeachMonMoveInPartyMenu(u8 taskId) break; } } + +static void sub_8070D90(u8 taskId) +{ + gTasks[ewram1C000.unk4].func = ewram1C000.unk10; + DestroyTask(taskId); +} |