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

Some scrcmd names

Browse Source
This commit is contained in:
PikalaxALT 2022-01-08 17:30:57 -05:00
parent 747e2b00b4
commit eab8da5f82
10 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/macros/script.inc
View File

@ -2741,7 +2741,7 @@
.short \arg1
.endm
.macro scrcmd_483 arg0, arg1
.macro get_ev_total arg0, arg1
.short 483
.short \arg0
.short \arg1

18
asm/scrcmd.s
View File

@ -532,7 +532,7 @@ gScriptCmdTable:
.word ScrCmd_MonHasRibbon ; 480
.word ScrCmd_GiveRibbon ; 481
.word ScrCmd_BufferRibbonName ; 482
.word ScrCmd_483 ; 483
.word ScrCmd_GetEVTotal ; 483
.word ScrCmd_GetWeekday ; 484
.word ScrCmd_485 ; 485
.word ScrCmd_Dummy ; 486
@ -5484,7 +5484,7 @@ ScrCmd_452: ; 0x02042B1C
str r0, [r6]
ldr r0, [r5]
add r1, r4, #0
bl sub_020457D4
bl Script_SetMonSeenFlagBySpecies
mov r0, #0
add sp, #0x14
pop {r4, r5, r6, r7, pc}
@ -10788,8 +10788,8 @@ _020454A0:
pop {r4, r5, r6, pc}
thumb_func_end ScrCmd_NatDexFlagAction
thumb_func_start ScrCmd_483
ScrCmd_483: ; 0x020454A4
thumb_func_start ScrCmd_GetEVTotal
ScrCmd_GetEVTotal: ; 0x020454A4
push {r4, r5, r6, r7, lr}
sub sp, #0xc
add r5, r0, #0
@ -10856,7 +10856,7 @@ ScrCmd_483: ; 0x020454A4
add sp, #0xc
pop {r4, r5, r6, r7, pc}
.balign 4, 0
thumb_func_end ScrCmd_483
thumb_func_end ScrCmd_GetEVTotal
thumb_func_start ScrCmd_GetWeekday
ScrCmd_GetWeekday: ; 0x02045540
@ -11184,8 +11184,8 @@ ScrCmd_502: ; 0x020457B8
.balign 4, 0
thumb_func_end ScrCmd_502
thumb_func_start sub_020457D4
sub_020457D4: ; 0x020457D4
thumb_func_start Script_SetMonSeenFlagBySpecies
Script_SetMonSeenFlagBySpecies: ; 0x020457D4
push {r4, r5, r6, lr}
sub sp, #0x10
ldr r0, [r0, #0xc]
@ -11214,7 +11214,7 @@ sub_020457D4: ; 0x020457D4
add sp, #0x10
pop {r4, r5, r6, pc}
.balign 4, 0
thumb_func_end sub_020457D4
thumb_func_end Script_SetMonSeenFlagBySpecies
thumb_func_start ScrCmd_687
ScrCmd_687: ; 0x02045818
@ -11229,7 +11229,7 @@ ScrCmd_687: ; 0x02045818
add r4, #0x80
add r1, r0, #0
ldr r0, [r4]
bl sub_020457D4
bl Script_SetMonSeenFlagBySpecies
mov r0, #0
pop {r4, pc}
.balign 4, 0

20
files/fielddata/eventdata/zone_event/093_D22R0101.json
View File

@ -229,7 +229,7 @@
"mvt": 0,
"type": 0,
"flag": "FLAG_NOTHING",
"scr": 10409,
"scr": "std_bug_contest_don_after",
"dirn": 0,
"eye": 0,
"unk10": 0,
@ -247,7 +247,7 @@
"mvt": 0,
"type": 0,
"flag": "FLAG_NOTHING",
"scr": 10411,
"scr": "std_bug_contest_ed_after",
"dirn": 0,
"eye": 0,
"unk10": 0,
@ -265,7 +265,7 @@
"mvt": 0,
"type": 0,
"flag": "FLAG_NOTHING",
"scr": 10413,
"scr": "std_bug_contest_abby_after",
"dirn": 0,
"eye": 0,
"unk10": 0,
@ -283,7 +283,7 @@
"mvt": 0,
"type": 0,
"flag": "FLAG_NOTHING",
"scr": 10415,
"scr": "std_bug_contest_william_after",
"dirn": 0,
"eye": 0,
"unk10": 0,
@ -301,7 +301,7 @@
"mvt": 0,
"type": 0,
"flag": "FLAG_NOTHING",
"scr": 10417,
"scr": "std_bug_contest_benny_after",
"dirn": 0,
"eye": 0,
"unk10": 0,
@ -319,7 +319,7 @@
"mvt": 0,
"type": 0,
"flag": "FLAG_NOTHING",
"scr": 10419,
"scr": "std_bug_contest_barry_after",
"dirn": 0,
"eye": 0,
"unk10": 0,
@ -337,7 +337,7 @@
"mvt": 0,
"type": 0,
"flag": "FLAG_NOTHING",
"scr": 10421,
"scr": "std_bug_contest_cindy_after",
"dirn": 0,
"eye": 0,
"unk10": 0,
@ -355,7 +355,7 @@
"mvt": 0,
"type": 0,
"flag": "FLAG_NOTHING",
"scr": 10423,
"scr": "std_bug_contest_josh_after",
"dirn": 0,
"eye": 0,
"unk10": 0,
@ -373,7 +373,7 @@
"mvt": 0,
"type": 0,
"flag": "FLAG_NOTHING",
"scr": 10425,
"scr": "std_bug_contest_samuel_after",
"dirn": 0,
"eye": 0,
"unk10": 0,
@ -391,7 +391,7 @@
"mvt": 0,
"type": 0,
"flag": "FLAG_NOTHING",
"scr": 10427,
"scr": "std_bug_contest_kipp_after",
"dirn": 0,
"eye": 0,
"unk10": 0,

20
files/fielddata/eventdata/zone_event/440_D22R0102.json
View File

@ -85,7 +85,7 @@
"mvt": 3,
"type": 0,
"flag": "FLAG_HIDE_BUG_CONTESTANT_BUG_CATCHER_DON",
"scr": 10408,
"scr": "std_bug_contest_don_during",
"dirn": 2,
"eye": 0,
"unk10": 0,
@ -103,7 +103,7 @@
"mvt": 3,
"type": 0,
"flag": "FLAG_HIDE_BUG_CONTESTANT_BUG_CATCHER_ED",
"scr": 10410,
"scr": "std_bug_contest_ed_during",
"dirn": 1,
"eye": 0,
"unk10": 0,
@ -121,7 +121,7 @@
"mvt": 14,
"type": 0,
"flag": "FLAG_HIDE_BUG_CONTESTANT_ACE_TRAINER_ABBY",
"scr": 10412,
"scr": "std_bug_contest_abby_during",
"dirn": 0,
"eye": 0,
"unk10": 0,
@ -139,7 +139,7 @@
"mvt": 3,
"type": 0,
"flag": "FLAG_HIDE_BUG_CONTESTANT_POKEFAN_WILLIAM",
"scr": 10414,
"scr": "std_bug_contest_william_during",
"dirn": 2,
"eye": 0,
"unk10": 0,
@ -157,7 +157,7 @@
"mvt": 3,
"type": 0,
"flag": "FLAG_HIDE_BUG_CONTESTANT_BUG_CATCHER_BENNY",
"scr": 10416,
"scr": "std_bug_contest_benny_during",
"dirn": 0,
"eye": 0,
"unk10": 0,
@ -175,7 +175,7 @@
"mvt": 2,
"type": 0,
"flag": "FLAG_HIDE_BUG_CONTESTANT_CAMPER_BARRY",
"scr": 10418,
"scr": "std_bug_contest_barry_during",
"dirn": 3,
"eye": 0,
"unk10": 0,
@ -193,7 +193,7 @@
"mvt": 2,
"type": 0,
"flag": "FLAG_HIDE_BUG_CONTESTANT_PICNICKER_CINDY",
"scr": 10420,
"scr": "std_bug_contest_cindy_during",
"dirn": 0,
"eye": 0,
"unk10": 0,
@ -211,7 +211,7 @@
"mvt": 3,
"type": 0,
"flag": "FLAG_HIDE_BUG_CONTESTANT_BUG_CATCHER_JOSH",
"scr": 10422,
"scr": "std_bug_contest_josh_during",
"dirn": 0,
"eye": 0,
"unk10": 0,
@ -229,7 +229,7 @@
"mvt": 3,
"type": 0,
"flag": "FLAG_HIDE_BUG_CONTESTANT_YOUNGSTER_SAMUEL",
"scr": 10424,
"scr": "std_bug_contest_samuel_during",
"dirn": 3,
"eye": 0,
"unk10": 0,
@ -247,7 +247,7 @@
"mvt": 3,
"type": 0,
"flag": "FLAG_HIDE_BUG_CONTESTANT_SCHOOL_KID_KIPP",
"scr": 10426,
"scr": "std_bug_contest_kipp_during",
"dirn": 1,
"eye": 0,
"unk10": 0,

6
files/fielddata/script/scr_seq/scr_seq_0740_T01R0301.s
View File

@ -467,7 +467,7 @@ _0663:
apply_movement obj_T01R0301_ookido, _09BC
_066B:
wait_movement
scrcmd_452 1, 0
scrcmd_452 SPECIES_BULBASAUR, 0
play_cry SPECIES_BULBASAUR, 0
npc_msg msg_0451_T01R0301_00045
wait_cry
@ -504,7 +504,7 @@ _0711:
apply_movement obj_T01R0301_ookido, _09BC
_0719:
wait_movement
scrcmd_452 7, 0
scrcmd_452 SPECIES_SQUIRTLE, 0
play_cry SPECIES_SQUIRTLE, 0
npc_msg msg_0451_T01R0301_00044
wait_cry
@ -541,7 +541,7 @@ _07BF:
apply_movement obj_T01R0301_ookido, _09BC
_07C7:
wait_movement
scrcmd_452 4, 0
scrcmd_452 SPECIES_CHARMANDER, 0
play_cry SPECIES_CHARMANDER, 0
npc_msg msg_0451_T01R0301_00043
wait_cry

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

@ -65,7 +65,7 @@ scr_seq_T06_013:
get_game_version VAR_TEMP_x4004
comparevartovalue VAR_TEMP_x4004, 8
gotoif eq, _0109
scrcmd_452 380, 1
scrcmd_452 SPECIES_LATIAS, 1
npc_msg msg_0483_T06_00017
closemsg
create_roamer 2
@ -81,7 +81,7 @@ scr_seq_T06_013:
goto _013F
.byte 0x02, 0x00
_0109:
scrcmd_452 381, 0
scrcmd_452 SPECIES_LATIOS, 0
npc_msg msg_0483_T06_00018
closemsg
create_roamer 3

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

@ -84,7 +84,7 @@ scr_seq_T30R0301_001:
gotoif eq, _0199
buffer_mon_species_name 0, VAR_SPECIAL_x8000
npc_msg msg_0634_T30R0301_00005
scrcmd_483 32780, 32768
get_ev_total 32780, 32768
comparevartovalue VAR_SPECIAL_x800C, 510
gotoif lt, _0136
npc_msg msg_0634_T30R0301_00006

2
global.inc
View File

@ -2164,7 +2164,7 @@
.public ScrCmd_MonHasRibbon
.public ScrCmd_GiveRibbon
.public ScrCmd_BufferRibbonName
.public ScrCmd_483
.public ScrCmd_GetEVTotal
.public ScrCmd_GetWeekday
.public ScrCmd_485
.public ScrCmd_PokeCenAnim

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

@ -483,7 +483,7 @@ extern BOOL ScrCmd_479(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_MonHasRibbon(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_GiveRibbon(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_BufferRibbonName(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_483(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_GetEVTotal(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_GetWeekday(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_485(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_Dummy(SCRIPTCONTEXT *ctx);
@ -1338,7 +1338,7 @@ const ScrCmdFunc gScriptCmdTable[] = {
ScrCmd_MonHasRibbon,
ScrCmd_GiveRibbon,
ScrCmd_BufferRibbonName,
ScrCmd_483,
ScrCmd_GetEVTotal,
ScrCmd_GetWeekday,
ScrCmd_485,
ScrCmd_Dummy,

4
tools/py_scripts/scrcmd.json
View File

@ -2807,7 +2807,7 @@
{
"name": "scrcmd_452",
"args": [
2,
"species",
2
]
},
@ -3018,7 +3018,7 @@
]
},
{
"name": "scrcmd_483",
"name": "get_ev_total",
"args": [
2,
2