From a380e29dbd612e928013f0d907ad5b3bd861593c Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 25 Jun 2023 13:21:56 +0100 Subject: [PATCH] rename two trade funcs --- asm/include/unk_0206793C.inc | 2 +- asm/unk_0206793C.s | 16 ++++++++-------- include/unk_0206793C.h | 2 +- src/scrcmd_c.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/asm/include/unk_0206793C.inc b/asm/include/unk_0206793C.inc index 1fb54f7bf..099afdb9b 100644 --- a/asm/include/unk_0206793C.inc +++ b/asm/include/unk_0206793C.inc @@ -10,7 +10,7 @@ .public sub_020552A4 .public PalleteFadeUntilFinished .public sub_0205532C -.public CallFieldTask_TradeAnim +.public CallTask_NPCTrade .public AllocMonZeroed .public memset .public NPCTrade_ReceiveMonToSlot diff --git a/asm/unk_0206793C.s b/asm/unk_0206793C.s index cc3c75793..5bbf7be8d 100644 --- a/asm/unk_0206793C.s +++ b/asm/unk_0206793C.s @@ -31,8 +31,8 @@ sub_0206793C: ; 0x0206793C _02067958: .word _020FE79C thumb_func_end sub_0206793C - thumb_func_start Task_FieldTradeAnim -Task_FieldTradeAnim: ; 0x0206795C + thumb_func_start Task_NPCTrade +Task_NPCTrade: ; 0x0206795C push {r4, r5, r6, lr} sub sp, #8 add r5, r0, #0 @@ -126,10 +126,10 @@ _02067A16: mov r0, #0 add sp, #8 pop {r4, r5, r6, pc} - thumb_func_end Task_FieldTradeAnim + thumb_func_end Task_NPCTrade - thumb_func_start CallFieldTask_TradeAnim -CallFieldTask_TradeAnim: ; 0x02067A1C + thumb_func_start CallTask_NPCTrade +CallTask_NPCTrade: ; 0x02067A1C push {r3, r4, r5, r6, r7, lr} add r7, r0, #0 add r5, r1, #0 @@ -152,14 +152,14 @@ CallFieldTask_TradeAnim: ; 0x02067A1C ldr r0, [sp] bl AllocMonZeroed str r0, [r4, #0x28] - ldr r1, _02067A5C ; =Task_FieldTradeAnim + ldr r1, _02067A5C ; =Task_NPCTrade add r0, r7, #0 add r2, r4, #0 bl TaskManager_Call pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 -_02067A5C: .word Task_FieldTradeAnim - thumb_func_end CallFieldTask_TradeAnim +_02067A5C: .word Task_NPCTrade + thumb_func_end CallTask_NPCTrade .rodata diff --git a/include/unk_0206793C.h b/include/unk_0206793C.h index 5f32eff98..3c45b83e3 100644 --- a/include/unk_0206793C.h +++ b/include/unk_0206793C.h @@ -14,6 +14,6 @@ void sub_02067BA4(FieldSystem *fsys); void sub_02067BC0(FieldSystem *fsys); void sub_02067BE8(FieldSystem *fsys); BOOL sub_02068CCC(UnkStruct_0206793C *unk); -void CallFieldTask_TradeAnim(TaskManager *taskManager, NPCTradeAppData *tradeWork, u16 arg, HeapID heapId); +void CallTask_NPCTrade(TaskManager *taskManager, NPCTradeAppData *tradeWork, u16 arg, HeapID heapId); #endif //POKEHEARTGOLD_UNK_0206793C_H diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 1c50fc503..5b7aa1a79 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -3465,7 +3465,7 @@ BOOL ScrCmd_GetNpcTradeUnusedFlag(ScriptContext *ctx) { BOOL ScrCmd_NPCTradeExec(ScriptContext *ctx) { NPCTradeAppData **p_tradeWork = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MISC_DATA_PTR); u16 arg = ScriptGetVar(ctx); - CallFieldTask_TradeAnim(ctx->taskman, *p_tradeWork, arg, HEAP_ID_FIELD); + CallTask_NPCTrade(ctx->taskman, *p_tradeWork, arg, HEAP_ID_FIELD); return TRUE; }