Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rename two trade funcs #174

Merged
merged 1 commit into from
Jun 25, 2023
Merged

rename two trade funcs #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion asm/include/unk_0206793C.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions asm/unk_0206793C.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion include/unk_0206793C.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/scrcmd_c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down