Game-Decompilation/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2025-04-01 16:01:52 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Name some more trade-related funcs

Browse Source
This commit is contained in:
PikalaxALT 2022-02-09 20:31:06 -05:00
parent b1849dc134
commit 55da45ebc1
13 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/macros/script.inc
View File

@ -3949,7 +3949,7 @@
.short \arg0
.endm
.macro scrcmd_698 arg0, arg1, arg2
.macro follower_poke_is_event_trigger arg0, arg1, arg2
.short 698
.byte \arg0
.short \arg1

22
asm/scrcmd.s
View File

@ -748,7 +748,7 @@ gScriptCmdTable:
.word ScrCmd_695 ; 695
.word ScrCmd_696 ; 696
.word ScrCmd_697 ; 697
.word ScrCmd_698 ; 698
.word ScrCmd_FollowerPokeIsEventTrigger ; 698
.word ScrCmd_699 ; 699
.word ScrCmd_700 ; 700
.word ScrCmd_701 ; 701
@ -10640,7 +10640,7 @@ ScrCmd_NPCTradeExec: ; 0x02045340
ldr r0, [r5, #0x74]
ldr r1, [r4]
mov r3, #0xb
bl sub_02067A1C
bl Field_CreateTask_TradeAnim
mov r0, #1
pop {r3, r4, r5, pc}
.balign 4, 0
@ -13517,8 +13517,8 @@ _02046A18:
pop {r3, r4, r5, r6, r7, pc}
thumb_func_end ScrCmd_696
thumb_func_start ScrCmd_698
ScrCmd_698: ; 0x02046A1C
thumb_func_start ScrCmd_FollowerPokeIsEventTrigger
ScrCmd_FollowerPokeIsEventTrigger: ; 0x02046A1C
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
ldr r2, [r5, #8]
@ -13614,10 +13614,10 @@ _02046ADC: ; jump table
.short _02046AFE - _02046ADC - 2 ; case 2
.short _02046B0A - _02046ADC - 2 ; case 3
_02046AE4:
cmp r0, #0xac
cmp r0, #SPECIES_PICHU
beq _02046AEE
sub r0, #0x19
cmp r0, #1
sub r0, #SPECIES_PIKACHU
cmp r0, #SPECIES_RAICHU - SPECIES_PIKACHU
bhi _02046B12
_02046AEE:
add r0, r7, #0
@ -13628,14 +13628,14 @@ _02046AEE:
strh r0, [r6]
b _02046B12
_02046AFE:
ldr r1, _02046B18 ; =0x000001ED
ldr r1, _02046B18 ; =SPECIES_ARCEUS
cmp r0, r1
bne _02046B12
mov r0, #1
strh r0, [r6]
b _02046B12
_02046B0A:
cmp r0, #0xfb
cmp r0, #SPECIES_CELEBI
bne _02046B12
mov r0, #1
strh r0, [r6]
@ -13643,8 +13643,8 @@ _02046B12:
mov r0, #0
pop {r3, r4, r5, r6, r7, pc}
nop
_02046B18: .word 0x000001ED
thumb_func_end ScrCmd_698
_02046B18: .word SPECIES_ARCEUS
thumb_func_end ScrCmd_FollowerPokeIsEventTrigger
thumb_func_start ScrCmd_596
ScrCmd_596: ; 0x02046B1C

16
asm/unk_0206793C.s
View File

@ -30,8 +30,8 @@ sub_0206793C: ; 0x0206793C
_02067958: .word _020FE79C
thumb_func_end sub_0206793C
thumb_func_start sub_0206795C
sub_0206795C: ; 0x0206795C
thumb_func_start Task_FieldTradeAnim
Task_FieldTradeAnim: ; 0x0206795C
push {r4, r5, r6, lr}
sub sp, #8
add r5, r0, #0
@ -125,10 +125,10 @@ _02067A16:
mov r0, #0
add sp, #8
pop {r4, r5, r6, pc}
thumb_func_end sub_0206795C
thumb_func_end Task_FieldTradeAnim
thumb_func_start sub_02067A1C
sub_02067A1C: ; 0x02067A1C
thumb_func_start Field_CreateTask_TradeAnim
Field_CreateTask_TradeAnim: ; 0x02067A1C
push {r3, r4, r5, r6, r7, lr}
add r7, r0, #0
add r5, r1, #0
@ -151,14 +151,14 @@ sub_02067A1C: ; 0x02067A1C
ldr r0, [sp]
bl AllocMonZeroed
str r0, [r4, #0x28]
ldr r1, _02067A5C ; =sub_0206795C
ldr r1, _02067A5C ; =Task_FieldTradeAnim
add r0, r7, #0
add r2, r4, #0
bl QueueTask
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
_02067A5C: .word sub_0206795C
thumb_func_end sub_02067A1C
_02067A5C: .word Task_FieldTradeAnim
thumb_func_end Field_CreateTask_TradeAnim
thumb_func_start sub_02067A60
sub_02067A60: ; 0x02067A60

4
files/fielddata/script/scr_seq/scr_seq_0037_D24R0101.s
View File

@ -187,13 +187,13 @@ scr_seq_D24R0101_007:
scrcmd_609
lockall
get_lead_mon_index VAR_TEMP_x4005
scrcmd_698 2, VAR_TEMP_x4005, VAR_TEMP_x4006
follower_poke_is_event_trigger 2, VAR_TEMP_x4005, VAR_TEMP_x4006
compare VAR_TEMP_x4006, 0
goto_if_eq _02DA
goto _02EE
_02DA:
scrcmd_698 1, VAR_TEMP_x4005, VAR_TEMP_x4007
follower_poke_is_event_trigger 1, VAR_TEMP_x4005, VAR_TEMP_x4007
compare VAR_TEMP_x4007, 0
goto_if_eq _0530
_02EE:

4
files/fielddata/script/scr_seq/scr_seq_0042_D24R0205.s
View File

@ -31,7 +31,7 @@ _003D:
goto _009D
_0061:
scrcmd_698 1, VAR_TEMP_x4005, VAR_TEMP_x4007
follower_poke_is_event_trigger 1, VAR_TEMP_x4005, VAR_TEMP_x4007
compare VAR_TEMP_x4007, 1
call_if_eq _009F
nop_var_490 VAR_TEMP_x4005
@ -39,7 +39,7 @@ _0061:
end
_007F:
scrcmd_698 2, VAR_TEMP_x4005, VAR_TEMP_x4006
follower_poke_is_event_trigger 2, VAR_TEMP_x4005, VAR_TEMP_x4006
compare VAR_TEMP_x4006, 1
call_if_eq _009F
nop_var_490 VAR_TEMP_x4005

4
files/fielddata/script/scr_seq/scr_seq_0053_D24R0216.s
View File

@ -29,7 +29,7 @@ _0035:
goto _0095
_0059:
scrcmd_698 1, VAR_TEMP_x4005, VAR_TEMP_x4007
follower_poke_is_event_trigger 1, VAR_TEMP_x4005, VAR_TEMP_x4007
compare VAR_TEMP_x4007, 1
call_if_eq _0097
nop_var_490 VAR_TEMP_x4005
@ -37,7 +37,7 @@ _0059:
end
_0077:
scrcmd_698 2, VAR_TEMP_x4005, VAR_TEMP_x4006
follower_poke_is_event_trigger 2, VAR_TEMP_x4005, VAR_TEMP_x4006
compare VAR_TEMP_x4006, 1
call_if_eq _0097
nop_var_490 VAR_TEMP_x4005

4
files/fielddata/script/scr_seq/scr_seq_0055_D24R0218.s
View File

@ -29,7 +29,7 @@ _0035:
goto _0095
_0059:
scrcmd_698 1, VAR_TEMP_x4005, VAR_TEMP_x4007
follower_poke_is_event_trigger 1, VAR_TEMP_x4005, VAR_TEMP_x4007
compare VAR_TEMP_x4007, 1
call_if_eq _0097
nop_var_490 VAR_TEMP_x4005
@ -37,7 +37,7 @@ _0059:
end
_0077:
scrcmd_698 2, VAR_TEMP_x4005, VAR_TEMP_x4006
follower_poke_is_event_trigger 2, VAR_TEMP_x4005, VAR_TEMP_x4006
compare VAR_TEMP_x4006, 1
call_if_eq _0097
nop_var_490 VAR_TEMP_x4005

4
files/fielddata/script/scr_seq/scr_seq_0092_D36R0101.s
View File

@ -1616,7 +1616,7 @@ scr_seq_D36R0101_012:
compare VAR_UNK_412B, 1
goto_if_eq _1803
get_lead_mon_index VAR_TEMP_x4000
scrcmd_698 0, VAR_TEMP_x4000, VAR_TEMP_x4001
follower_poke_is_event_trigger 0, VAR_TEMP_x4000, VAR_TEMP_x4001
compare VAR_TEMP_x4001, 0
goto_if_ne _17B7
goto _17C1
@ -1630,7 +1630,7 @@ _17C1:
goto_if_ge _1803
goto_if_unset FLAG_UNK_0C6, _1803
get_lead_mon_index VAR_TEMP_x4006
scrcmd_698 3, VAR_TEMP_x4006, VAR_TEMP_x4007
follower_poke_is_event_trigger 3, VAR_TEMP_x4006, VAR_TEMP_x4007
compare VAR_TEMP_x4007, 0
goto_if_ne _17FD
goto _1803

14
files/fielddata/script/scr_seq/scr_seq_0131_D51R0201.s
View File

@ -76,10 +76,10 @@ scr_seq_D51R0201_001:
compare VAR_SCENE_SINJOH_MYSTRI_ROOM, 8
goto_if_eq _0165
get_lead_mon_index VAR_TEMP_x4005
scrcmd_698 2, VAR_TEMP_x4005, VAR_TEMP_x4006
follower_poke_is_event_trigger 2, VAR_TEMP_x4005, VAR_TEMP_x4006
compare VAR_TEMP_x4006, 1
goto_if_eq _011A
scrcmd_698 1, VAR_TEMP_x4005, VAR_TEMP_x4007
follower_poke_is_event_trigger 1, VAR_TEMP_x4005, VAR_TEMP_x4007
compare VAR_TEMP_x4007, 1
goto_if_eq _011A
npc_msg msg_0146_D51R0201_00024
@ -412,10 +412,10 @@ _056D:
get_lead_mon_index VAR_TEMP_x4000
compare VAR_UNK_4102, 1
goto_if_ne _05B2
scrcmd_698 1, VAR_TEMP_x4000, VAR_SPECIAL_RESULT
follower_poke_is_event_trigger 1, VAR_TEMP_x4000, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0605
scrcmd_698 2, VAR_TEMP_x4000, VAR_SPECIAL_RESULT
follower_poke_is_event_trigger 2, VAR_TEMP_x4000, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _060D
goto _0615
@ -424,10 +424,10 @@ _056D:
_05B2:
compare VAR_UNK_4102, 2
goto_if_ne _05F3
scrcmd_698 2, VAR_TEMP_x4000, VAR_SPECIAL_RESULT
follower_poke_is_event_trigger 2, VAR_TEMP_x4000, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0605
scrcmd_698 1, VAR_TEMP_x4000, VAR_SPECIAL_RESULT
follower_poke_is_event_trigger 1, VAR_TEMP_x4000, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _060D
goto _0615
@ -711,7 +711,7 @@ _0A4D:
compare VAR_SCENE_SINJOH_MYSTRI_ROOM, 14
goto_if_eq _0AAA
get_lead_mon_index VAR_TEMP_x4005
scrcmd_698 2, VAR_TEMP_x4005, VAR_TEMP_x4006
follower_poke_is_event_trigger 2, VAR_TEMP_x4005, VAR_TEMP_x4006
compare VAR_TEMP_x4006, 1
goto_if_ne _0AA0
setvar VAR_UNK_4102, 1

4
global.inc
View File

@ -2378,7 +2378,7 @@
.public ScrCmd_695
.public ScrCmd_696
.public ScrCmd_697
.public ScrCmd_698
.public ScrCmd_FollowerPokeIsEventTrigger
.public ScrCmd_699
.public ScrCmd_700
.public ScrCmd_701
@ -29187,7 +29187,7 @@
.public GetRoamMapByLocationIdx
.public Save_CreateRoamerByID
.public SpeciesToRoamerIdx
.public sub_02067A1C
.public Field_CreateTask_TradeAnim
.public sub_02067A60
.public sub_02067A78
.public sub_02067A80

2
include/scrcmd.h
View File

@ -725,7 +725,7 @@ BOOL ScrCmd_694(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_695(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_696(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_697(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_698(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_FollowerPokeIsEventTrigger(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_699(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_700(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_701(SCRIPTCONTEXT* ctx);

4
src/data/fieldmap/script_cmd_table.h
View File

@ -698,7 +698,7 @@ extern BOOL ScrCmd_694(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_695(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_696(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_697(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_698(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_FollowerPokeIsEventTrigger(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_699(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_700(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_701(SCRIPTCONTEXT *ctx);
@ -1553,7 +1553,7 @@ const ScrCmdFunc gScriptCmdTable[] = {
ScrCmd_695,
ScrCmd_696,
ScrCmd_697,
ScrCmd_698,
ScrCmd_FollowerPokeIsEventTrigger,
ScrCmd_699,
ScrCmd_700,
ScrCmd_701,

2
tools/py_scripts/scrcmd.json
View File

@ -4414,7 +4414,7 @@
]
},
{
"name": "scrcmd_698",
"name": "follower_poke_is_event_trigger",
"args": [
1,
"var",