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

Rename ScrCmd_PlayerHasSpecies

Browse Source
This commit is contained in:
PikalaxALT 2022-01-11 18:10:01 -05:00
parent 9e1ae52104
commit 924e516bac
11 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/macros/script.inc
View File

@ -2195,7 +2195,7 @@
.short \arg0 .short \arg0
.endm .endm
.macro scrcmd_389 arg0, arg1 .macro player_has_species arg0, arg1
.short 389 .short 389
.short \arg0 .short \arg0
.short \arg1 .short \arg1

2
asm/scrcmd.s
View File

@ -438,7 +438,7 @@ gScriptCmdTable:
.word ScrCmd_GetPlayerFacing ; 386 .word ScrCmd_GetPlayerFacing ; 386
.word ScrCmd_387 ; 387 .word ScrCmd_387 ; 387
.word ScrCmd_388 ; 388 .word ScrCmd_388 ; 388
.word ScrCmd_389 ; 389 .word ScrCmd_PlayerHasSpecies ; 389
.word ScrCmd_SizeRecordCompare ; 390 .word ScrCmd_SizeRecordCompare ; 390
.word ScrCmd_SizeRecordUpdate ; 391 .word ScrCmd_SizeRecordUpdate ; 391
.word ScrCmd_BufferMonSize ; 392 .word ScrCmd_BufferMonSize ; 392

6
asm/scrcmd_15.s
View File

@ -1770,8 +1770,8 @@ _0204DF24:
pop {r3, r4, r5, pc} pop {r3, r4, r5, pc}
thumb_func_end ScrCmd_428 thumb_func_end ScrCmd_428
thumb_func_start ScrCmd_389 thumb_func_start ScrCmd_PlayerHasSpecies
ScrCmd_389: ; 0x0204DF54 ScrCmd_PlayerHasSpecies: ; 0x0204DF54
push {r3, r4, r5, r6, r7, lr} push {r3, r4, r5, r6, r7, lr}
sub sp, #8 sub sp, #8
add r4, r0, #0 add r4, r0, #0
@ -1837,7 +1837,7 @@ _0204DFDA:
pop {r3, r4, r5, r6, r7, pc} pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0 .balign 4, 0
_0204DFE0: .word 0x00000000 _0204DFE0: .word 0x00000000
thumb_func_end ScrCmd_389 thumb_func_end ScrCmd_PlayerHasSpecies
thumb_func_start ScrCmd_632 thumb_func_start ScrCmd_632
ScrCmd_632: ; 0x0204DFE4 ScrCmd_632: ; 0x0204DFE4

2
files/fielddata/script/scr_seq/scr_seq_0045_D24R0208.s
View File

@ -145,7 +145,7 @@ scr_seq_D24R0208_001:
scrcmd_609 scrcmd_609
lockall lockall
scrcmd_714 3 scrcmd_714 3
scrcmd_389 32780, 250 player_has_species VAR_SPECIAL_x800C, SPECIES_HO_OH
compare VAR_SPECIAL_x800C, 1 compare VAR_SPECIAL_x800C, 1
goto_if_ne _0264 goto_if_ne _0264
goto _0268 goto _0268

2
files/fielddata/script/scr_seq/scr_seq_0132_D51R0301.s
View File

@ -20,7 +20,7 @@ scr_seq_D51R0301_000:
closemsg closemsg
setflag FLAG_UNK_09E setflag FLAG_UNK_09E
_002E: _002E:
scrcmd_389 32780, 493 player_has_species VAR_SPECIAL_x800C, SPECIES_ARCEUS
compare VAR_SPECIAL_x800C, 1 compare VAR_SPECIAL_x800C, 1
goto_if_eq _004C goto_if_eq _004C
npc_msg msg_0147_D51R0301_00002 npc_msg msg_0147_D51R0301_00002

2
files/fielddata/script/scr_seq/scr_seq_0837_T11R0701.s
View File

@ -18,7 +18,7 @@ scr_seq_T11R0701_002:
setvar VAR_TEMP_x4009, 0 setvar VAR_TEMP_x4009, 0
compare VAR_UNK_4130, 3 compare VAR_UNK_4130, 3
goto_if_eq _0046 goto_if_eq _0046
scrcmd_389 16384, 479 player_has_species VAR_TEMP_x4000, SPECIES_ROTOM
compare VAR_TEMP_x4000, 1 compare VAR_TEMP_x4000, 1
goto_if_eq _00AB goto_if_eq _00AB
_0046: _0046:

2
files/fielddata/script/scr_seq/scr_seq_0838_T11R0702.s
View File

@ -85,7 +85,7 @@ scr_seq_T11R0702_005:
goto _0107 goto _0107
.byte 0x02, 0x00 .byte 0x02, 0x00
_0107: _0107:
scrcmd_389 32780, 479 player_has_species VAR_SPECIAL_x800C, SPECIES_ROTOM
compare VAR_SPECIAL_x800C, 0 compare VAR_SPECIAL_x800C, 0
goto_if_eq _07D8 goto_if_eq _07D8
compare VAR_SPECIAL_x8004, 1 compare VAR_SPECIAL_x8004, 1

2
files/fielddata/script/scr_seq/scr_seq_0940_T29R0201.s
View File

@ -29,7 +29,7 @@ _002F:
_003A: _003A:
script_overlay_cmd 0, 0 script_overlay_cmd 0, 0
scrcmd_389 32780, 129 player_has_species VAR_SPECIAL_x800C, SPECIES_MAGIKARP
compare VAR_SPECIAL_x800C, 0 compare VAR_SPECIAL_x800C, 0
goto_if_ne _005A goto_if_ne _005A
npc_msg msg_0628_T29R0201_00002 npc_msg msg_0628_T29R0201_00002

2
global.inc
View File

@ -2072,7 +2072,7 @@
.public ScrCmd_GetPlayerFacing .public ScrCmd_GetPlayerFacing
.public ScrCmd_387 .public ScrCmd_387
.public ScrCmd_388 .public ScrCmd_388
.public ScrCmd_389 .public ScrCmd_PlayerHasSpecies
.public ScrCmd_SizeRecordCompare .public ScrCmd_SizeRecordCompare
.public ScrCmd_SizeRecordUpdate .public ScrCmd_SizeRecordUpdate
.public ScrCmd_BufferMonSize .public ScrCmd_BufferMonSize

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

@ -389,7 +389,7 @@ extern BOOL ScrCmd_385(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_GetPlayerFacing(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_GetPlayerFacing(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_387(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_387(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_388(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_388(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_389(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_PlayerHasSpecies(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_SizeRecordCompare(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_SizeRecordCompare(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_SizeRecordUpdate(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_SizeRecordUpdate(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_BufferMonSize(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_BufferMonSize(SCRIPTCONTEXT *ctx);
@ -1244,7 +1244,7 @@ const ScrCmdFunc gScriptCmdTable[] = {
ScrCmd_GetPlayerFacing, ScrCmd_GetPlayerFacing,
ScrCmd_387, ScrCmd_387,
ScrCmd_388, ScrCmd_388,
ScrCmd_389, ScrCmd_PlayerHasSpecies,
ScrCmd_SizeRecordCompare, ScrCmd_SizeRecordCompare,
ScrCmd_SizeRecordUpdate, ScrCmd_SizeRecordUpdate,
ScrCmd_BufferMonSize, ScrCmd_BufferMonSize,

6
tools/py_scripts/scrcmd.json
View File

@ -2371,10 +2371,10 @@
] ]
}, },
{ {
"name": "scrcmd_389", "name": "player_has_species",
"args": [ "args": [
2, "var",
2 "species"
] ]
}, },
{ {