Leahnaya/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2026-05-31 20:43:00 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #174 from red031000/master

Browse Source 
rename two trade funcs
This commit is contained in:
Adrienn Tindall 2023-06-25 14:14:42 -05:00 committed by GitHub
commit 0b434ad412
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/include/unk_0206793C.inc
View File

@ -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

16
asm/unk_0206793C.s
View File

@ -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

2
include/unk_0206793C.h
View File

@ -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
src/scrcmd_c.c
View File

@ -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;
}