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

Rename rocket sys flag

Browse Source
This commit is contained in:
PikalaxALT 2022-03-25 11:02:33 -04:00
parent 3c9e420399
commit 950c456c92
17 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
asm/field_move.s
View File

@ -338,7 +338,7 @@ _02068054:
ldr r0, [r4, #4]
ldr r0, [r0, #0xc]
bl SavArray_Flags_get
bl CheckFlag969
bl ScriptState_CheckRocketCostumeFlag
cmp r0, #1
bne _02068068
mov r0, #PARTY_MENU_RESPONSE_NOT_NOW
@ -453,7 +453,7 @@ _02068136:
ldr r0, [r4, #4]
ldr r0, [r0, #0xc]
bl SavArray_Flags_get
bl CheckFlag969
bl ScriptState_CheckRocketCostumeFlag
cmp r0, #1
bne _0206814A
mov r0, #PARTY_MENU_RESPONSE_NOT_NOW
@ -840,7 +840,7 @@ _02068416:
ldr r0, [r4, #4]
ldr r0, [r0, #0xc]
bl SavArray_Flags_get
bl CheckFlag969
bl ScriptState_CheckRocketCostumeFlag
cmp r0, #1
bne _0206842A
mov r0, #PARTY_MENU_RESPONSE_NOT_NOW
@ -1034,7 +1034,7 @@ _02068588:
ldr r0, [r4, #4]
ldr r0, [r0, #0xc]
bl SavArray_Flags_get
bl CheckFlag969
bl ScriptState_CheckRocketCostumeFlag
cmp r0, #1
bne _0206859C
mov r0, #PARTY_MENU_RESPONSE_NOT_NOW
@ -1174,7 +1174,7 @@ _020686A2:
ldr r0, [r4, #4]
ldr r0, [r0, #0xc]
bl SavArray_Flags_get
bl CheckFlag969
bl ScriptState_CheckRocketCostumeFlag
cmp r0, #1
bne _020686B6
mov r0, #PARTY_MENU_RESPONSE_NOT_NOW

4
asm/macros/script.inc
View File

@ -3489,12 +3489,12 @@
.short \arg0
.endm
.macro scrcmd_619 arg0
.macro rocket_costume_flag_check arg0
.short 619
.short \arg0
.endm
.macro scrcmd_620 arg0
.macro rocket_costume_flag_action arg0
.short 620
.byte \arg0
.endm

4
asm/scrcmd.s
View File

@ -653,8 +653,8 @@ gScriptCmdTable:
.word ScrCmd_616 ; 616
.word ScrCmd_617 ; 617
.word ScrCmd_PhotoAlbumIsFull ; 618
.word ScrCmd_619 ; 619
.word ScrCmd_620 ; 620
.word ScrCmd_RocketCostumeFlagCheck ; 619
.word ScrCmd_RocketCostumeFlagAction ; 620
.word ScrCmd_621 ; 621
.word ScrCmd_622 ; 622
.word ScrCmd_AnimApricornTree ; 623

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

@ -353,7 +353,7 @@ _04BD:
wait 50, VAR_SPECIAL_RESULT
set_avatar_bits PLAYER_TRANSITION_WALKING
update_avatar_state
scrcmd_620 0
rocket_costume_flag_action 0
wait_movement
compare VAR_TEMP_x4001, 5
goto_if_ne _04E9

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

@ -684,7 +684,7 @@ _0A71:
wait_fade
set_avatar_bits PLAYER_TRANSITION_ROCKET
update_avatar_state
scrcmd_620 1
rocket_costume_flag_action 1
play_se SEQ_SE_DP_CARD2
wait 24, VAR_SPECIAL_RESULT
play_se SEQ_SE_DP_CARD2
@ -1029,7 +1029,7 @@ _0F05:
wait_fade
set_avatar_bits PLAYER_TRANSITION_ROCKET
update_avatar_state
scrcmd_620 1
rocket_costume_flag_action 1
scrcmd_602 0
scrcmd_603
scrcmd_604 55
@ -1057,7 +1057,7 @@ _0F79:
lockall
set_avatar_bits PLAYER_TRANSITION_WALKING
update_avatar_state
scrcmd_620 0
rocket_costume_flag_action 0
scrcmd_602 0
scrcmd_603
scrcmd_604 55

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

@ -78,7 +78,7 @@ scr_seq_T25R1005_003:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
goto_if_set FLAG_UNK_969, _017D
goto_if_set FLAG_SYS_ROCKET_COSTUME, _017D
goto_if_set FLAG_UNK_08D, _0172
npc_msg msg_0596_T25R1005_00009
touchscreen_menu_hide

10
global.inc
View File

@ -349,7 +349,7 @@
.public CheckFlag960
.public CheckFlag965
.public CheckFlag966
.public CheckFlag969
.public ScriptState_CheckRocketCostumeFlag
.public CheckFlag96A
.public CheckFlag982
.public ScriptState_MomsSavingsFlagCheck
@ -374,7 +374,7 @@
.public ClearDailyFlags
.public ClearFlag965
.public ClearFlag966
.public ClearFlag969
.public ScriptState_ClearRocketCostumeFlag
.public ClearFlag972
.public ClearFlag975
.public ClearFlag99A
@ -3040,8 +3040,8 @@
.public ScrCmd_GetNpcTradeUnusedFlag
.public ScrCmd_616
.public ScrCmd_617
.public ScrCmd_619
.public ScrCmd_620
.public ScrCmd_RocketCostumeFlagCheck
.public ScrCmd_RocketCostumeFlagAction
.public ScrCmd_621
.public ScrCmd_622
.public ScrCmd_627
@ -3667,7 +3667,7 @@
.public SetFlag960
.public SetFlag965
.public SetFlag966
.public SetFlag969
.public ScriptState_SetRocketCostumeFlag
.public SetFlag970
.public SetFlag975
.public SetFlag99A

2
include/bag_view.h
View File

@ -11,7 +11,7 @@ enum ItemUseError {
ITEMUSEERROR_OKAY = 0, // no error
ITEMUSEERROR_NODISMOUNT = 1, // can't get off bike
ITEMUSEERROR_NOFOLLOWER = 2, // have a companion
ITEMUSEERROR_NOTNOW = 3, // unknown
ITEMUSEERROR_NOTNOW = 3, // you're a member of team rocket
ITEMUSEERROR_OAKSWORDS = -1u,
};

2
include/constants/flags.h
View File

@ -1721,7 +1721,7 @@
#define FLAG_UNK_966 0x966
#define FLAG_SYS_SAFARI 0x967
#define FLAG_UNK_968 0x968
#define FLAG_UNK_969 0x969
#define FLAG_SYS_ROCKET_COSTUME 0x969
#define FLAG_UNK_96A 0x96A
#define FLAG_UNK_96B 0x96B
#define FLAG_UNK_96C 0x96C

2
include/field_use_item.h
View File

@ -16,7 +16,7 @@ struct ItemCheckUseData {
u32 mapId;
int playerState;
u16 haveFollower:1;
u16 flag969set:1;
u16 haveRocketCostume:1;
u16 facingTile;
u16 standingTile;
FIELD_PLAYER_AVATAR *playerAvatar;

4
include/scrcmd.h
View File

@ -655,8 +655,8 @@ BOOL ScrCmd_CameronPhoto(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_616(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_617(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_PhotoAlbumIsFull(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_619(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_620(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_RocketCostumeFlagCheck(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_RocketCostumeFlagAction(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_621(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_622(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_AnimApricornTree(SCRIPTCONTEXT* ctx);

6
include/sys_flags.h
View File

@ -18,9 +18,9 @@ void SetFlag99C(SCRIPT_STATE* state);
void SetFlag965(SCRIPT_STATE* state);
void ClearFlag965(SCRIPT_STATE* state);
BOOL CheckFlag965(SCRIPT_STATE* state);
void SetFlag969(SCRIPT_STATE* state);
void ClearFlag969(SCRIPT_STATE* state);
BOOL CheckFlag969(SCRIPT_STATE* state);
void ScriptState_SetRocketCostumeFlag(SCRIPT_STATE* state);
void ScriptState_ClearRocketCostumeFlag(SCRIPT_STATE* state);
BOOL ScriptState_CheckRocketCostumeFlag(SCRIPT_STATE* state);
BOOL EventFlagCheck_RematchGroup(SCRIPT_STATE* state, u16 flag_id);
void ScriptState_SetAlphPuzzleFlag(SCRIPT_STATE* state, u8 flag);
BOOL ScriptState_CheckAlphPuzzleFlag(SCRIPT_STATE* state, u8 flag);

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

@ -619,8 +619,8 @@ extern BOOL ScrCmd_CameronPhoto(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_616(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_617(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_PhotoAlbumIsFull(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_619(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_620(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_RocketCostumeFlagCheck(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_RocketCostumeFlagAction(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_621(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_622(SCRIPTCONTEXT *ctx);
extern BOOL ScrCmd_AnimApricornTree(SCRIPTCONTEXT *ctx);
@ -1474,8 +1474,8 @@ const ScrCmdFunc gScriptCmdTable[] = {
ScrCmd_616,
ScrCmd_617,
ScrCmd_PhotoAlbumIsFull,
ScrCmd_619,
ScrCmd_620,
ScrCmd_RocketCostumeFlagCheck,
ScrCmd_RocketCostumeFlagAction,
ScrCmd_621,
ScrCmd_622,
ScrCmd_AnimApricornTree,

8
src/field_use_item.c
View File

@ -138,7 +138,7 @@ void ItemCheckUseData_Init(FieldSystem *fsys, struct ItemCheckUseData *dat) {
dat->fsys = fsys;
dat->mapId = fsys->location->mapId;
dat->haveFollower = ScriptState_CheckHaveFollower(SavArray_Flags_get(fsys->savedata));
dat->flag969set = CheckFlag969(SavArray_Flags_get(fsys->savedata));
dat->haveRocketCostume = ScriptState_CheckRocketCostumeFlag(SavArray_Flags_get(fsys->savedata));
dat->playerState = PlayerAvatar_GetState(fsys->playerAvatar);
x = GetPlayerXCoord(fsys->playerAvatar);
@ -315,7 +315,7 @@ static u32 ItemCheckUseFunc_Bicycle(const struct ItemCheckUseData *data) {
if (data->haveFollower == TRUE) {
return ITEMUSEERROR_NOFOLLOWER;
}
if (data->flag969set == TRUE) {
if (data->haveRocketCostume == TRUE) {
return ITEMUSEERROR_NOTNOW;
}
if (sub_0205CABC(data->playerAvatar) == TRUE) {
@ -458,7 +458,7 @@ static u32 ItemCheckUseFunc_FishingRod(const struct ItemCheckUseData *data) {
if (data->haveFollower == TRUE) {
return ITEMUSEERROR_NOFOLLOWER;
}
if (data->flag969set == TRUE) {
if (data->haveRocketCostume == TRUE) {
return ITEMUSEERROR_NOTNOW;
}
if (sub_0205B778(data->facingTile) == TRUE) {
@ -568,7 +568,7 @@ static u32 ItemCheckUseFunc_EscapeRope(const struct ItemCheckUseData *data) {
if (data->haveFollower == TRUE) {
return ITEMUSEERROR_NOFOLLOWER;
}
if (data->flag969set == TRUE) {
if (data->haveRocketCostume == TRUE) {
return ITEMUSEERROR_NOTNOW;
}
if (CheckUseEscapeRopeInAlphChamber(data->fsys)) {

10
src/scrcmd_17.c
View File

@ -84,20 +84,20 @@ BOOL ScrCmd_ClearEscortMode(SCRIPTCONTEXT *ctx) {
return FALSE;
}
BOOL ScrCmd_619(SCRIPTCONTEXT *ctx) {
BOOL ScrCmd_RocketCostumeFlagCheck(SCRIPTCONTEXT *ctx) {
u16 *ret = ScriptGetVarPointer(ctx);
*ret = CheckFlag969(SavArray_Flags_get(ctx->fsys->savedata));
*ret = ScriptState_CheckRocketCostumeFlag(SavArray_Flags_get(ctx->fsys->savedata));
return FALSE;
}
BOOL ScrCmd_620(SCRIPTCONTEXT *ctx) {
BOOL ScrCmd_RocketCostumeFlagAction(SCRIPTCONTEXT *ctx) {
u8 mode = ScriptReadByte(ctx);
if (mode) {
SetFlag969(SavArray_Flags_get(ctx->fsys->savedata));
ScriptState_SetRocketCostumeFlag(SavArray_Flags_get(ctx->fsys->savedata));
} else {
ClearFlag969(SavArray_Flags_get(ctx->fsys->savedata));
ScriptState_ClearRocketCostumeFlag(SavArray_Flags_get(ctx->fsys->savedata));
}
return FALSE;
}

12
src/sys_flags.c
View File

@ -98,16 +98,16 @@ BOOL CheckFlag965(SCRIPT_STATE* state) {
return CheckScriptFlag(state, FLAG_UNK_965);
}
void SetFlag969(SCRIPT_STATE* state) {
SetScriptFlag(state, FLAG_UNK_969);
void ScriptState_SetRocketCostumeFlag(SCRIPT_STATE* state) {
SetScriptFlag(state, FLAG_SYS_ROCKET_COSTUME);
}
void ClearFlag969(SCRIPT_STATE* state) {
ClearScriptFlag(state, FLAG_UNK_969);
void ScriptState_ClearRocketCostumeFlag(SCRIPT_STATE* state) {
ClearScriptFlag(state, FLAG_SYS_ROCKET_COSTUME);
}
BOOL CheckFlag969(SCRIPT_STATE* state) {
return CheckScriptFlag(state, FLAG_UNK_969);
BOOL ScriptState_CheckRocketCostumeFlag(SCRIPT_STATE* state) {
return CheckScriptFlag(state, FLAG_SYS_ROCKET_COSTUME);
}
BOOL EventFlagCheck_RematchGroup(SCRIPT_STATE* state, u16 flag_id) {

4
tools/py_scripts/scrcmd.json
View File

@ -3889,13 +3889,13 @@
]
},
{
"name": "scrcmd_619",
"name": "rocket_costume_flag_check",
"args": [
2
]
},
{
"name": "scrcmd_620",
"name": "rocket_costume_flag_action",
"args": [
1
]