From afeb17ed26ed4a832405bddc937a8a9667633ab2 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Wed, 26 Nov 2025 22:19:58 -0600 Subject: [PATCH 1/4] Update some return types to bool --- include/script_variable.h | 4 ++-- src/script_variable.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/script_variable.h b/include/script_variable.h index 2a833e9d..00168be8 100644 --- a/include/script_variable.h +++ b/include/script_variable.h @@ -45,8 +45,8 @@ s32 CalcScriptVariablesVeneer(s32 param_1, s32 param_2, enum script_calc_operati void UpdateScriptVarWithParam(union script_var_value sv_local[], const enum script_var_id script_var_id, s32 param, enum script_calc_operation operation); void UpdateScriptVarWithVar(union script_var_value sv_local[], enum script_var_id sv_id_1, enum script_var_id sv_id_2, enum script_calc_operation operation); bool8 CompareScriptVariablesVeneer(s32 param_1, s32 param_2, enum compare_operation operation); -s32 CompareScriptVarWithParam(union script_var_value sv_local[], enum script_var_id sv_id, s32 param, enum compare_operation op); -s32 LoadAndCompareScriptVars(union script_var_value sv_local[], enum script_var_id sv_id_1, enum script_var_id sv_id_2, enum compare_operation op); +bool8 CompareScriptVarWithParam(union script_var_value sv_local[], enum script_var_id sv_id, s32 param, enum compare_operation op); +bool8 LoadAndCompareScriptVars(union script_var_value sv_local[], enum script_var_id sv_id_1, enum script_var_id sv_id_2, enum compare_operation op); void EventFlagResume(); void EventFlagBackup(); bool8 DumpScriptVariableValues(u8* dest); diff --git a/src/script_variable.c b/src/script_variable.c index c26841a5..4a2bffeb 100644 --- a/src/script_variable.c +++ b/src/script_variable.c @@ -472,13 +472,13 @@ bool8 CompareScriptVariablesVeneer(s32 param_1, s32 param_2, enum compare_operat return CompareScriptVariables(param_1, param_2, op); } -s32 CompareScriptVarWithParam(union script_var_value sv_local[], enum script_var_id sv_id, s32 param, enum compare_operation op) +bool8 CompareScriptVarWithParam(union script_var_value sv_local[], enum script_var_id sv_id, s32 param, enum compare_operation op) { s32 value = LoadScriptVariableValue(sv_local, sv_id); return CompareScriptVariables(value, param, op); } -s32 LoadAndCompareScriptVars(union script_var_value sv_local[], enum script_var_id sv_id_1, enum script_var_id sv_id_2, enum compare_operation op) +bool8 LoadAndCompareScriptVars(union script_var_value sv_local[], enum script_var_id sv_id_1, enum script_var_id sv_id_2, enum compare_operation op) { s32 value_1 = LoadScriptVariableValue(sv_local, sv_id_1); s32 value_2 = LoadScriptVariableValue(sv_local, sv_id_2); From addcaa0c960bc64f363bb13fc5b680d995fda36a Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sat, 29 Nov 2025 13:21:29 -0600 Subject: [PATCH 2/4] Rename some script engine symbols from pmdsky-debug --- asm/include/main_0204B018.inc | 2 +- asm/include/main_02051098.inc | 6 ++-- asm/include/main_020512C8.inc | 2 +- asm/include/main_02058F24.inc | 10 +++--- asm/include/overlay_01.inc | 12 +++---- asm/include/overlay_11.inc | 31 ++++++++-------- asm/include/overlay_26.inc | 2 +- asm/include/overlay_29_022E9488.inc | 2 +- asm/include/overlay_29_022FBE58.inc | 8 ++--- asm/include/overlay_29_023055B0.inc | 2 +- asm/include/overlay_29_0230AD04.inc | 2 +- asm/include/overlay_29_0230BBAC.inc | 2 +- asm/include/overlay_29_02313CE4.inc | 16 ++++----- asm/include/overlay_29_02314810.inc | 10 +++--- asm/include/overlay_29_02325644.inc | 2 +- asm/main_0204B018.s | 2 +- asm/main_02058F24.s | 6 ++-- asm/main_rodata_0209CECC.s | 4 +-- asm/overlay_01.s | 2 +- asm/overlay_11.s | 22 ++++++------ include/script_variable.h | 8 ++--- include/story_progress.h | 12 +++---- src/script_variable.c | 55 ++++++++++++++--------------- src/story_progress.c | 52 +++++++++++++-------------- 24 files changed, 137 insertions(+), 135 deletions(-) diff --git a/asm/include/main_0204B018.inc b/asm/include/main_0204B018.inc index 89887f84..c71c40d1 100644 --- a/asm/include/main_0204B018.inc +++ b/asm/include/main_0204B018.inc @@ -4,7 +4,7 @@ .public Debug_Print0 .public GAME_MODE .public InitDungeonListScriptVars -.public InitProgress +.public InitScenarioScriptVars .public InitWorldMapScriptVars .public SaveScriptVariableValue .public SaveScriptVariableValueAtIndex diff --git a/asm/include/main_02051098.inc b/asm/include/main_02051098.inc index 0f056522..fc838b62 100644 --- a/asm/include/main_02051098.inc +++ b/asm/include/main_02051098.inc @@ -1,7 +1,7 @@ #pragma once -.public CopyBitsFrom -.public CopyBitsTo -.public DUNGEON_RESTRICTIONS .public _020AFF7C .public _020AFF80 .public _020AFF88 +.public CopyBitsFrom +.public CopyBitsTo +.public DUNGEON_RESTRICTIONS diff --git a/asm/include/main_020512C8.inc b/asm/include/main_020512C8.inc index ac3c8096..c5965814 100644 --- a/asm/include/main_020512C8.inc +++ b/asm/include/main_020512C8.inc @@ -1,4 +1,4 @@ #pragma once -.public DUNGEON_RESTRICTIONS .public _020A0C68 .public _020A0C69 +.public DUNGEON_RESTRICTIONS diff --git a/asm/include/main_02058F24.inc b/asm/include/main_02058F24.inc index 4fa4620e..65b55228 100644 --- a/asm/include/main_02058F24.inc +++ b/asm/include/main_02058F24.inc @@ -201,6 +201,7 @@ .public GetBaseFormBurmyWormadamShellosGastrodonCherrim .public GetBodySize .public GetCategoryString +.public GetDebugSpecialEpisodeNumber .public GetDungeonMode .public GetEvoParameters .public GetExclusiveItem @@ -266,8 +267,10 @@ .public IsMonsterValid .public IsMovesetValid .public IsMovesetValidInTimeDarkness +.public IsSpecialEpisodeBeaten .public IsSpecialEpisodeOpen .public IsStorableItem +.public IsStoryBeforePoint .public IsThrownItem .public IsValidTargetItem .public ITEM_DELIVERY_TABLE @@ -360,7 +363,8 @@ .public SetCollectionMenuField0x1B2 .public SetPokemonJoined .public SetQuestionMarks -.public UpdateProgress +.public SetScenarioScriptVar +.public SetSpecialEpisodeOpen .public SetSpecialEpisodeType .public SetSpriteIdForAnimationControl .public ShowPortraitInPortraitBox @@ -479,10 +483,6 @@ .public sub_0204AB18 .public sub_0204AF98 .public sub_0204B018 -.public IsStoryBeforePoint -.public GetDebugSpecialEpisodeNumber -.public SetSpecialEpisodeOpen -.public IsSpecialEpisodeBeaten .public sub_0204D018 .public sub_0204E210 .public sub_0204E6FC diff --git a/asm/include/overlay_01.inc b/asm/include/overlay_01.inc index 395d7df4..8c3ddeb6 100644 --- a/asm/include/overlay_01.inc +++ b/asm/include/overlay_01.inc @@ -40,6 +40,7 @@ .public GetAdvancedMenuResult .public GetAdventureLogCompleted .public GetAdventureLogDungeonFloor +.public GetDebugSpecialEpisodeNumber .public GetHeldButtons .public GetHero .public GetKeyboardStatus @@ -91,7 +92,10 @@ .public IsMovesetValid .public IsParentMenuActive .public IsSimpleMenuActive +.public IsSpecialEpisodeBeaten .public IsSpecialEpisodeOpen +.public IsSpecialEpisodeOpenMismatch +.public IsSpecialEpOpenOld .public IsTextBoxActive .public LoadScriptVariableValueAtIndex .public LoadWanTableEntry @@ -242,9 +246,10 @@ .public ResumeParentMenu .public SetAdvancedTextBoxState5 .public SetAnimationForAnimationControl +.public SetDebugSpecialEpisodeNumber .public SetIrqFlag .public SetMainTeamName -.public UpdateProgress +.public SetScenarioScriptVar .public SetSpriteIdForAnimationControl .public ShowKeyboard .public ShowStringIdInDialogueBox @@ -332,11 +337,6 @@ .public sub_0204a1cc .public sub_0204A1CC .public sub_0204AE60 -.public GetDebugSpecialEpisodeNumber -.public SetDebugSpecialEpisodeNumber -.public IsSpecialEpisodeOpenMismatch -.public IsSpecialEpOpenOld -.public IsSpecialEpisodeBeaten .public sub_0204DF54 .public sub_0204DFB0 .public sub_0204E02C diff --git a/asm/include/overlay_11.inc b/asm/include/overlay_11.inc index 57d53883..56857659 100644 --- a/asm/include/overlay_11.inc +++ b/asm/include/overlay_11.inc @@ -9,10 +9,15 @@ .public AddMissionToJobList .public AllocAndInitPartnerFollowDataAndLiveActorList .public C_ROUTINES +.public CalcAndUpdateScriptVarWithOtherScriptVar +.public CalcAndUpdateScriptVarWithOtherValue +.public CalcScriptVariablesVeneer .public CheckMissionRestrictions .public ClampComponentAbs .public CloseDialogueBox .public ClosePortraitBox +.public CompareScriptVariablesVeneer +.public CompareScriptVarWithParam .public ComputeSpecialCounters .public CountItemTypeInBag .public CountItemTypeInStorage @@ -95,13 +100,21 @@ .public IsDialogueBoxActive .public IsMonsterOnTeam .public IsStorageFull +.public IsStoryAfterPoint +.public IsStoryAtOrAfterPoint +.public IsStoryAtPoint +.public IsStoryBeforeOrAtPoint +.public IsStoryBeforePoint .public ItemAtTableIdx .public KeyWaitInit +.public LoadAndCompareScriptVarAndValue +.public LoadAndCompareScriptVars .public LoadFileFromRom .public LoadOverlay .public LoadScriptVariableValue .public LoadScriptVariableValueAtIndex .public LoadScriptVariableValueSum +.public LoadScriptVarValuePair .public LOCK_NOTIFY_ARRAY .public MemAlloc .public MemArenaAlloc @@ -490,7 +503,8 @@ .public SetPortraitEmotion .public SetPortraitLayout .public SetPortraitOffset -.public UpdateProgress +.public SetScenarioScriptVar +.public SetSpecialEpisodeBeaten .public SetTeamSetupHeroAndPartnerOnly .public SetTeamSetupHeroOnly .public SetupAndShowKeyboard @@ -626,19 +640,6 @@ .public sub_0204AE80 .public sub_0204AEE0 .public sub_0204B3D0 -.public CalcScriptVariablesVeneer -.public UpdateScriptVarWithParam -.public UpdateScriptVarWithVar -.public CompareScriptVariablesVeneer -.public CompareScriptVarWithParam -.public LoadAndCompareScriptVars -.public LoadScriptVarValuePair -.public IsStoryBeforePoint -.public IsStoryBeforeOrAtPoint -.public IsStoryAtPoint -.public IsStoryAtOrAfterPoint -.public IsStoryAtOrAfterPointStrict -.public SetSpecialEpisodeBeaten .public sub_0204CB2C .public sub_0204CDE8 .public sub_0204CE48 @@ -712,6 +713,8 @@ .public UnlockMainRoutine .public UnlockObjectRoutines .public UnlockPerformerRoutines +.public UpdateScriptVarWithParam +.public UpdateScriptVarWithVar .public UpdateTeamStats .public WorldMapSetCamera .public WorldMapSetMode diff --git a/asm/include/overlay_26.inc b/asm/include/overlay_26.inc index 25f78dc2..7eb8878b 100644 --- a/asm/include/overlay_26.inc +++ b/asm/include/overlay_26.inc @@ -20,6 +20,7 @@ .public IsMoneyAllowed .public IsMonsterOnTeam .public LoadScriptVariableValue +.public LoadScriptVarValuePair .public MemAlloc .public MemFree .public ov10_022BD56C @@ -42,7 +43,6 @@ .public sub_02046740 .public sub_0204677C .public sub_0204AFD0 -.public LoadScriptVarValuePair .public sub_0204E770 .public sub_0204E780 .public sub_0204F0A0 diff --git a/asm/include/overlay_29_022E9488.inc b/asm/include/overlay_29_022E9488.inc index d0a71e4b..f11c2d9e 100644 --- a/asm/include/overlay_29_022E9488.inc +++ b/asm/include/overlay_29_022E9488.inc @@ -1,6 +1,6 @@ #pragma once -.public DUNGEON_PTR .public _020AFC4C +.public DUNGEON_PTR .public ov29_0237C888 .public ov29_0237C88A .public ov29_0237C88E diff --git a/asm/include/overlay_29_022FBE58.inc b/asm/include/overlay_29_022FBE58.inc index bcdecba4..fa6b0bee 100644 --- a/asm/include/overlay_29_022FBE58.inc +++ b/asm/include/overlay_29_022FBE58.inc @@ -1,4 +1,5 @@ #pragma once +.public _s32_div_f .public CopySpawnEntriesMaster .public DUNGEON_PTR .public DungeonRngSetPrimary @@ -18,20 +19,19 @@ .public GetOutlawSpawnData .public GetTile .public GroundToDungeonMoveset -.public IQ_SKILLS .public InitMoveCheckId .public InitTeamMember +.public IQ_SKILLS .public IsCurrentMissionType .public IsDestinationFloorWithFixedRoom .public IsDestinationFloorWithMonster .public IsInvalidSpawnTile .public JoinedAtRangeCheck2Veneer .public LoadWazaP2 -.public SetMonsterLevelAndId -.public UnloadCurrentWazaP -.public _s32_div_f .public ov29_022FB83C .public ov29_022FCD04 .public ov29_023021F0 .public ov29_02351E28 +.public SetMonsterLevelAndId .public sub_0200F9B4 +.public UnloadCurrentWazaP diff --git a/asm/include/overlay_29_023055B0.inc b/asm/include/overlay_29_023055B0.inc index 3a910ca4..634a9e3a 100644 --- a/asm/include/overlay_29_023055B0.inc +++ b/asm/include/overlay_29_023055B0.inc @@ -27,6 +27,7 @@ .public IsMonsterDrowsy .public IsMonsterMuzzled .public IsMonsterVisuallyImpaired +.public IsTeamMemberOnFirstTurnInFixedRoom .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget .public MonsterHasAttackInterferingStatus @@ -41,7 +42,6 @@ .public ov29_022E3A58 .public ov29_022E543C .public ov29_022EA370 -.public IsTeamMemberOnFirstTurnInFixedRoom .public ov29_02337D68 .public ov29_02353318 .public SubstitutePlaceholderStringTags diff --git a/asm/include/overlay_29_0230AD04.inc b/asm/include/overlay_29_0230AD04.inc index 190bdd97..356bf0ef 100644 --- a/asm/include/overlay_29_0230AD04.inc +++ b/asm/include/overlay_29_0230AD04.inc @@ -11,8 +11,8 @@ .public ExclusiveItemEffectIsActive__0230A9B8 .public FixedPoint32To64 .public FixedPoint64IsZero -.public GetFlashFireStatus .public GetApparentWeather +.public GetFlashFireStatus .public GetTypeMatchup .public GhostImmunityIsActive .public IntToFixedPoint64 diff --git a/asm/include/overlay_29_0230BBAC.inc b/asm/include/overlay_29_0230BBAC.inc index 8b19023c..7e532464 100644 --- a/asm/include/overlay_29_0230BBAC.inc +++ b/asm/include/overlay_29_0230BBAC.inc @@ -39,12 +39,12 @@ .public FixedPoint64CmpLt .public FixedPoint64ToInt .public FixedRoomIsSubstituteRoom -.public GetFlashFireStatus .public GendersEqualNotGenderless .public GendersNotEqualNotGenderless .public GenerateStandardItem .public GetApparentWeather .public GetEquivItemIndex +.public GetFlashFireStatus .public GetItemAtIdx .public GetMonsterGenderVeneer .public GetMoveCategory diff --git a/asm/include/overlay_29_02313CE4.inc b/asm/include/overlay_29_02313CE4.inc index 4906391f..ce641c82 100644 --- a/asm/include/overlay_29_02313CE4.inc +++ b/asm/include/overlay_29_02313CE4.inc @@ -4,6 +4,7 @@ .public CalcSpeedStageWrapper .public CalcStatusDuration .public CopyStringFromId +.public CRINGE_TURN_RANGE .public DefenderAbilityIsActive__02311B94 .public DIRECTIONS_XY .public EntityIsValid__023118B4 @@ -17,17 +18,16 @@ .public ItemIsActive__02311BF8 .public LogMessageByIdWithPopupCheckUserTarget .public MultiplyByFixedPoint -.public CRINGE_TURN_RANGE -.public PARALYSIS_TURN_RANGE -.public PlayParalysisEffect .public ov29_022E4338 -.public PlayOffensiveStatMultiplierUpEffect -.public PlayOffensiveStatMultiplierDownEffect -.public PlayDefensiveStatMultiplierUpEffect +.public PARALYSIS_TURN_RANGE .public PlayDefensiveStatMultiplierDownEffect -.public PlayHitChanceUpEffect -.public PlayHitChanceDownEffect +.public PlayDefensiveStatMultiplierUpEffect .public PlayExclamationPointEffect__022E5D4C +.public PlayHitChanceDownEffect +.public PlayHitChanceUpEffect +.public PlayOffensiveStatMultiplierDownEffect +.public PlayOffensiveStatMultiplierUpEffect +.public PlayParalysisEffect .public PrepareItemForPrinting__02345728 .public SafeguardIsActive .public SetMessageLogPreprocessorArgsString diff --git a/asm/include/overlay_29_02314810.inc b/asm/include/overlay_29_02314810.inc index 5766c126..2eb4b0c1 100644 --- a/asm/include/overlay_29_02314810.inc +++ b/asm/include/overlay_29_02314810.inc @@ -1,31 +1,31 @@ #pragma once .public AbilityIsActiveVeneer +.public BoostSpeed .public CalcSpeedStage .public CalcSpeedStageWrapper .public CalcStatusDuration .public DungeonRandInt .public DungeonRandOutcome__022EAB20 .public EntityIsValid__023118B4 -.public BoostSpeed .public EntityIsValid__02315118 .public ExclusiveItemEffectIsActive__023147EC .public GetExclusiveItemWithEffectFromBag .public IsProtectedFromNegativeStatus .public ItemIsActive__0231513C -.public LowerSpeed .public LogMessageByIdWithPopupCheckUserTarget +.public LowerSpeed .public ov10_022C4618 -.public SPEED_LOWER_TURN_RANGE .public ov10_022C4890 .public ov29_022E41CC -.public PlaySpeedUpEffect -.public PlaySpeedDownEffect .public ov29_022E543C .public ov29_022E60E4 .public ov29_02353318 +.public PlaySpeedDownEffect +.public PlaySpeedUpEffect .public PrepareItemForPrinting__02345728 .public SafeguardIsActive .public SetPreprocessorArgsIdVal .public SPEED_BOOST_TURN_RANGE +.public SPEED_LOWER_TURN_RANGE .public SubstitutePlaceholderStringTags .public UpdateStatusIconFlags diff --git a/asm/include/overlay_29_02325644.inc b/asm/include/overlay_29_02325644.inc index 669df375..fb5005c2 100644 --- a/asm/include/overlay_29_02325644.inc +++ b/asm/include/overlay_29_02325644.inc @@ -35,12 +35,12 @@ .public FACADE_DAMAGE_MULTIPLIER .public FLAME_WHEEL_BURN_CHANCE .public FLAMETHROWER_BURN_CHANCE -.public GetFlashFireStatus .public FOCUS_PUNCH_DAMAGE_MULTIPLIER .public FormatMoveStringMore .public GetApparentWeather .public GetDamageSourceWrapper .public GetEffectAnimation +.public GetFlashFireStatus .public GetMessageLogPreprocessorArgs .public GetMoveAnimation .public GetMoveCategory diff --git a/asm/main_0204B018.s b/asm/main_0204B018.s index d55b908b..fa97908a 100644 --- a/asm/main_0204B018.s +++ b/asm/main_0204B018.s @@ -219,7 +219,7 @@ _0204B118: mov r0, #0 mov r1, #0x4d bl ZinitScriptVariable - bl InitProgress + bl InitScenarioScriptVars bl InitWorldMapScriptVars bl InitDungeonListScriptVars ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} diff --git a/asm/main_02058F24.s b/asm/main_02058F24.s index e2478617..d26dcff0 100644 --- a/asm/main_02058F24.s +++ b/asm/main_02058F24.s @@ -16155,7 +16155,7 @@ _020661B0: mov r0, #2 mov r1, #0x36 mov r2, #0 - bl UpdateProgress + bl SetScenarioScriptVar mov r0, #2 bl LoadOverlay mov r0, #0 @@ -16225,7 +16225,7 @@ _020662BC: mov r0, #2 mov r1, #0x33 mov r2, #0 - bl UpdateProgress + bl SetScenarioScriptVar mov r0, #2 bl LoadOverlay mov r0, #1 @@ -16256,7 +16256,7 @@ _02066330: mov r0, #2 mov r1, #0x34 mov r2, #0 - bl UpdateProgress + bl SetScenarioScriptVar mov r0, #2 bl LoadOverlay mov r0, #1 diff --git a/asm/main_rodata_0209CECC.s b/asm/main_rodata_0209CECC.s index e1f309f0..4ab4f3bc 100644 --- a/asm/main_rodata_0209CECC.s +++ b/asm/main_rodata_0209CECC.s @@ -27,8 +27,8 @@ EVENT_FLAG_EXPANSION_ERROR: .byte 0x65, 0x76, 0x65, 0x6E, 0x74, 0x20, 0x66, 0x6C, 0x61, 0x67, 0x20, 0x65 .byte 0x78, 0x70, 0x61, 0x6E, 0x73, 0x69, 0x6F, 0x6E, 0x20, 0x65, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x25 .byte 0x64, 0x00, 0x00, 0x00 - .global EVENT_FLAG_RULE_ERROR -EVENT_FLAG_RULE_ERROR: + .global EVENT_FLAG_COMPARE_SCRIPT_VARIABLES_ERROR +EVENT_FLAG_COMPARE_SCRIPT_VARIABLES_ERROR: .byte 0x65, 0x76, 0x65, 0x6E, 0x74, 0x20, 0x66, 0x6C, 0x61, 0x67, 0x20, 0x72 .byte 0x75, 0x6C, 0x65, 0x20, 0x65, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x25, 0x64, 0x00, 0x00, 0x00, 0x00 .global EVENT_FLAG_GAME_MODE_DEBUG_MSG diff --git a/asm/overlay_01.s b/asm/overlay_01.s index 401701cb..e0be9dec 100644 --- a/asm/overlay_01.s +++ b/asm/overlay_01.s @@ -13063,7 +13063,7 @@ _02333DA4: mov r0, #3 mov r1, #0x1c mov r2, #0 - bl UpdateProgress + bl SetScenarioScriptVar mov r0, #2 mov r1, #6 mov r2, #1 diff --git a/asm/overlay_11.s b/asm/overlay_11.s index 263414d7..e3714a07 100644 --- a/asm/overlay_11.s +++ b/asm/overlay_11.s @@ -3196,7 +3196,7 @@ _022DEDC4: ; 0x022DEDC4 mov r3, r5 mov r2, r0 add r0, r4, #0x6c - bl UpdateScriptVarWithParam + bl CalcAndUpdateScriptVarWithOtherValue b _022E2474 _022DEE00: ; 0x022DEE00 ldrh r0, [r6] @@ -3214,7 +3214,7 @@ _022DEE00: ; 0x022DEE00 add r0, r4, #0x6c mov r2, r2, lsl #0x10 mov r2, r2, asr #0x10 - bl UpdateScriptVarWithVar + bl CalcAndUpdateScriptVarWithOtherScriptVar b _022E2474 _022DEE44: ; 0x022DEE44 ldrh r0, [r6] @@ -3246,7 +3246,7 @@ _022DEE84: ; 0x022DEE84 mov r2, r0 mov r1, r4 mov r0, r3, asr #0x10 - bl UpdateProgress + bl SetScenarioScriptVar b _022E2474 _022DEEBC: ; 0x022DEEBC ldrh r0, [r6] @@ -3255,7 +3255,7 @@ _022DEEBC: ; 0x022DEEBC mov r1, #0 mov r2, r1 mov r0, r0, asr #0x10 - bl UpdateProgress + bl SetScenarioScriptVar b _022E2474 _022DEEDC: ; 0x022DEEDC ldrh r0, [r6] @@ -3335,7 +3335,7 @@ _022DEFD0: add r0, r4, #0x6c mov r1, r1, asr #0x10 mov r3, #2 - bl CompareScriptVarWithParam + bl LoadAndCompareScriptVarAndValue cmp r0, #0 ldrneh r0, [r6, #4] ldrne r1, [r4, #0x14] @@ -3356,7 +3356,7 @@ _022DF014: mov r1, r1, asr #0x10 mov r3, r5 add r0, r4, #0x6c - bl CompareScriptVarWithParam + bl LoadAndCompareScriptVarAndValue cmp r0, #0 ldrneh r0, [r6, #6] ldrne r1, [r4, #0x14] @@ -3519,7 +3519,7 @@ _022DF284: mov r2, r0 mov r0, r1, asr #0x10 mov r1, r5 - bl IsStoryAtOrAfterPointStrict + bl IsStoryAfterPoint cmp r0, #0 ldrneh r0, [r6, #6] ldrne r1, [r4, #0x14] @@ -11863,7 +11863,7 @@ _022E657C: ldr r1, [sp, #0x40] ldr r2, [sp, #0x3c] mov r0, #2 - bl UpdateProgress + bl SetScenarioScriptVar ldrsh r0, [sp, #0x36] ldrsh r1, [sp, #0x38] bl sub_02065B80 @@ -11891,7 +11891,7 @@ _022E6644: mov r1, #0 mov r2, r1 mov r0, #2 - bl UpdateProgress + bl SetScenarioScriptVar mov r0, #0 b _022E68BC _022E6678: @@ -12418,7 +12418,7 @@ _022E6D70: ldr r1, [sp, #0x14] add r2, r0, #1 mov r0, #2 - bl UpdateProgress + bl SetScenarioScriptVar mov r0, #1 b _022E6E58 _022E6DB0: @@ -14712,7 +14712,7 @@ _022E8AE4: mov r1, #0x2a mov r2, #1 mov r3, #2 - bl UpdateScriptVarWithParam + bl CalcAndUpdateScriptVarWithOtherValue bl sub_0204F034 mov r4, r0 bl sub_0204F050 diff --git a/include/script_variable.h b/include/script_variable.h index 00168be8..79477ffa 100644 --- a/include/script_variable.h +++ b/include/script_variable.h @@ -42,16 +42,16 @@ bool8 ScriptVariablesEqual(union script_var_value sv_val_ptr_local[], enum scrip s32 CalcScriptVariables(s32 param_1, s32 param_2, enum script_calc_operation operation); bool8 CompareScriptVariables(s32 param_1, s32 param_2, enum compare_operation operation); s32 CalcScriptVariablesVeneer(s32 param_1, s32 param_2, enum script_calc_operation operation); -void UpdateScriptVarWithParam(union script_var_value sv_local[], const enum script_var_id script_var_id, s32 param, enum script_calc_operation operation); -void UpdateScriptVarWithVar(union script_var_value sv_local[], enum script_var_id sv_id_1, enum script_var_id sv_id_2, enum script_calc_operation operation); +void CalcAndUpdateScriptVarWithOtherValue(union script_var_value sv_local[], const enum script_var_id script_var_id, s32 param, enum script_calc_operation operation); +void CalcAndUpdateScriptVarWithOtherScriptVar(union script_var_value sv_local[], enum script_var_id sv_id_1, enum script_var_id sv_id_2, enum script_calc_operation operation); bool8 CompareScriptVariablesVeneer(s32 param_1, s32 param_2, enum compare_operation operation); -bool8 CompareScriptVarWithParam(union script_var_value sv_local[], enum script_var_id sv_id, s32 param, enum compare_operation op); +bool8 LoadAndCompareScriptVarAndValue(union script_var_value sv_local[], enum script_var_id sv_id, s32 param, enum compare_operation op); bool8 LoadAndCompareScriptVars(union script_var_value sv_local[], enum script_var_id sv_id_1, enum script_var_id sv_id_2, enum compare_operation op); void EventFlagResume(); void EventFlagBackup(); bool8 DumpScriptVariableValues(u8* dest); bool8 RestoreScriptVariableValues(u8* src); -void InitProgress(); +void InitScenarioScriptVars(); void LoadScriptVarValuePair(enum script_var_id script_var_id, s32* val_1, s32* val_2); #endif //PMDSKY_SCRIPTING_H diff --git a/include/story_progress.h b/include/story_progress.h index a1b9fe6e..9c5d5deb 100644 --- a/include/story_progress.h +++ b/include/story_progress.h @@ -1,11 +1,11 @@ #ifndef PMDSKY_STORY_PROGRESS_H #define PMDSKY_STORY_PROGRESS_H -void UpdateProgress(enum script_var_id script_var_id, s32 chapter, s32 sub_section); -bool8 IsStoryBeforePoint(enum script_var_id script_var_id, s32 chapter, s32 sub_section); -bool8 IsStoryBeforeOrAtPoint(enum script_var_id script_var_id, s32 chapter, s32 sub_section); -s32 IsStoryAtPoint(enum script_var_id script_var_id, s32 chapter, s32 sub_section); -s32 IsStoryAtOrAfterPoint(enum script_var_id script_var_id, s32 chapter, s32 sub_section); -s32 IsStoryAtOrAfterPointStrict(enum script_var_id script_var_id, s32 chapter, s32 sub_section); +void SetScenarioScriptVar(enum script_var_id script_var_id, s32 chapter, s32 subsection); +bool8 IsStoryBeforePoint(enum script_var_id script_var_id, s32 chapter, s32 subsection); +bool8 IsStoryBeforeOrAtPoint(enum script_var_id script_var_id, s32 chapter, s32 subsection); +bool8 IsStoryAtPoint(enum script_var_id script_var_id, s32 chapter, s32 subsection); +bool8 IsStoryAtOrAfterPoint(enum script_var_id script_var_id, s32 chapter, s32 subsection); +bool8 IsStoryAfterPoint(enum script_var_id script_var_id, s32 chapter, s32 subsection); #endif //PMDSKY_STORY_PROGRESS_H diff --git a/src/script_variable.c b/src/script_variable.c index 4a2bffeb..bddf934b 100644 --- a/src/script_variable.c +++ b/src/script_variable.c @@ -14,15 +14,15 @@ extern struct script_var_def SCRIPT_VARS_LOCALS[]; // Global script variable values extern u8 SCRIPT_VARS_VALUES[]; extern u8 EVENT_FLAG_EXPANSION_ERROR; -extern u8 EVENT_FLAG_RULE_ERROR; +extern u8 EVENT_FLAG_COMPARE_SCRIPT_VARIABLES_ERROR; extern const u8 EVENT_FLAG_GAME_MODE_DEBUG_MSG; extern const u8 EVENT_FLAG_BACKUP_DEBUG_MSG; const u8 EVENT_FLAG_FILE_NAME[] = "event_flag.c"; -const struct prog_pos_info EVENT_FLAG_PROG_POS_INFO_LINE_1011 = { +const struct prog_pos_info EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES = { (u8*) EVENT_FLAG_FILE_NAME, 1001 }; -const struct prog_pos_info EVENT_FLAG_PROG_POS_INFO_LINE_1044 = { +const struct prog_pos_info EVENT_FLAG_PROG_POS_INFO_COMPARE_SCRIPT_VARIABLES = { (u8*) EVENT_FLAG_FILE_NAME, 1044 }; @@ -32,7 +32,6 @@ extern s32 GetMoneyCarried(); extern s32 GetMoneyStored(); extern s32 GetLanguageType(); extern enum game_mode GetGameMode(); -extern s32 GetDebugSpecialEpisodeNumber(); extern s32 GetSpecialEpisodeType(); extern s32 GetNotifyNote(); extern s32 AddMoneyCarried(s32 arg0); @@ -47,7 +46,7 @@ extern void ZinitScriptVariable(u32 param_1, u32 param_2); void LoadScriptVariableRaw(struct script_var_raw* sv_raw, union script_var_value sv_val_local[], const enum script_var_id sv_id) { - + if (sv_id < (s16) LOCAL_SCRIPT_VAR_OFFSET) { // global script var sv_raw->def = &SCRIPT_VARS[sv_id]; @@ -407,7 +406,7 @@ s32 CalcScriptVariables(s32 param_1, s32 param_2, enum script_calc_operation ope case CALC_RANDOM: return RandInt(param_2); default: - struct prog_pos_info ppi = EVENT_FLAG_PROG_POS_INFO_LINE_1011; + struct prog_pos_info ppi = EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES; Debug_FatalError(&ppi, &EVENT_FLAG_EXPANSION_ERROR, operation); } } @@ -442,8 +441,8 @@ bool8 CompareScriptVariables(s32 param_1, s32 param_2, enum compare_operation op return 0; } default: - struct prog_pos_info ppi = EVENT_FLAG_PROG_POS_INFO_LINE_1044; - Debug_FatalError(&ppi, &EVENT_FLAG_RULE_ERROR, operation); + struct prog_pos_info ppi = EVENT_FLAG_PROG_POS_INFO_COMPARE_SCRIPT_VARIABLES; + Debug_FatalError(&ppi, &EVENT_FLAG_COMPARE_SCRIPT_VARIABLES_ERROR, operation); } } @@ -452,14 +451,14 @@ s32 CalcScriptVariablesVeneer(s32 param_1, s32 param_2, enum script_calc_operati return CalcScriptVariables(param_1, param_2, operation); } -void UpdateScriptVarWithParam(union script_var_value sv_local[], const enum script_var_id script_var_id, s32 param, enum script_calc_operation operation) +void CalcAndUpdateScriptVarWithOtherValue(union script_var_value sv_local[], const enum script_var_id script_var_id, s32 param, enum script_calc_operation operation) { s32 value = LoadScriptVariableValue(sv_local, script_var_id); s32 result = CalcScriptVariables(value, param, operation); SaveScriptVariableValue(sv_local, script_var_id, result); } -void UpdateScriptVarWithVar(union script_var_value sv_local[], enum script_var_id sv_id_1, enum script_var_id sv_id_2, enum script_calc_operation op) +void CalcAndUpdateScriptVarWithOtherScriptVar(union script_var_value sv_local[], enum script_var_id sv_id_1, enum script_var_id sv_id_2, enum script_calc_operation op) { s32 value_1 = LoadScriptVariableValue(sv_local, sv_id_1); s32 value_2 = LoadScriptVariableValue(sv_local, sv_id_2); @@ -472,7 +471,7 @@ bool8 CompareScriptVariablesVeneer(s32 param_1, s32 param_2, enum compare_operat return CompareScriptVariables(param_1, param_2, op); } -bool8 CompareScriptVarWithParam(union script_var_value sv_local[], enum script_var_id sv_id, s32 param, enum compare_operation op) +bool8 LoadAndCompareScriptVarAndValue(union script_var_value sv_local[], enum script_var_id sv_id, s32 param, enum compare_operation op) { s32 value = LoadScriptVariableValue(sv_local, sv_id); return CompareScriptVariables(value, param, op); @@ -506,7 +505,7 @@ void EventFlagResume() SaveScriptVariableValue(0, VAR_GROUND_MAP, LoadScriptVariableValueAtIndexInline(VAR_GROUND_MAP_BACKUP, idx)); SaveScriptVariableValue(0, VAR_GROUND_PLACE, LoadScriptVariableValueAtIndexInline(VAR_GROUND_PLACE_BACKUP, idx)); SaveScriptVariableValue(0, VAR_DUNGEON_ENTER, LoadScriptVariableValueAtIndexInline(VAR_DUNGEON_ENTER_BACKUP, idx)); - SaveScriptVariableValue(0, VAR_DUNGEON_ENTER_MODE, LoadScriptVariableValueAtIndexInline(VAR_DUNGEON_ENTER_MODE_BACKUP, idx)); + SaveScriptVariableValue(0, VAR_DUNGEON_ENTER_MODE, LoadScriptVariableValueAtIndexInline(VAR_DUNGEON_ENTER_MODE_BACKUP, idx)); SaveScriptVariableValue(0, VAR_DUNGEON_ENTER_INDEX, LoadScriptVariableValueAtIndexInline(VAR_DUNGEON_ENTER_INDEX_BACKUP, idx)); SaveScriptVariableValue(0, VAR_DUNGEON_ENTER_FREQUENCY, LoadScriptVariableValueAtIndexInline(VAR_DUNGEON_ENTER_FREQUENCY_BACKUP, idx)); SaveScriptVariableValue(0, VAR_DUNGEON_RESULT, LoadScriptVariableValueAtIndexInline(VAR_DUNGEON_RESULT_BACKUP, idx)); @@ -535,7 +534,7 @@ void EventFlagBackup() } idx = game_mode - 2; Debug_Print0(&EVENT_FLAG_BACKUP_DEBUG_MSG, idx); - + SaveScriptVariableValueAtIndexInline(VAR_GROUND_ENTER_BACKUP, idx, LoadScriptVariableValue(0, VAR_GROUND_ENTER)); SaveScriptVariableValueAtIndexInline(VAR_GROUND_ENTER_LINK_BACKUP, idx, LoadScriptVariableValue(0, VAR_GROUND_ENTER_LINK)); SaveScriptVariableValueAtIndexInline(VAR_GROUND_GETOUT_BACKUP, idx, LoadScriptVariableValue(0, VAR_GROUND_GETOUT)); @@ -572,8 +571,8 @@ bool8 RestoreScriptVariableValues(u8* src) LoadScriptVariableRaw(&sv_raw, 0, VAR_VERSION); MemcpySimple(&SCRIPT_VARS_VALUES[0], src, 0x400); - - // If these values are not equal, then the save file + + // If these values are not equal, then the save file // will be treated as corrupted, which thus gets deleted. if (sv_raw.def->default_val == sv_raw.value->u32) { ret_val = TRUE; @@ -584,19 +583,19 @@ bool8 RestoreScriptVariableValues(u8* src) return ret_val; } -void InitProgress() -{ - UpdateProgress(VAR_SCENARIO_SELECT, 0, 0); - UpdateProgress(VAR_SCENARIO_MAIN, 0, 0); - UpdateProgress(VAR_SCENARIO_SIDE, 0, 0); - UpdateProgress(VAR_SCENARIO_SUB1, 0, 0); - UpdateProgress(VAR_SCENARIO_SUB2, 0, 0); - UpdateProgress(VAR_SCENARIO_SUB3, 0, 0); - UpdateProgress(VAR_SCENARIO_SUB4, 0, 0); - UpdateProgress(VAR_SCENARIO_SUB5, 0, 0); - UpdateProgress(VAR_SCENARIO_SUB6, 0, 0); - UpdateProgress(VAR_SCENARIO_SUB7, 0, 0); - UpdateProgress(VAR_SCENARIO_SUB8, 0, 0); +void InitScenarioScriptVars() +{ + SetScenarioScriptVar(VAR_SCENARIO_SELECT, 0, 0); + SetScenarioScriptVar(VAR_SCENARIO_MAIN, 0, 0); + SetScenarioScriptVar(VAR_SCENARIO_SIDE, 0, 0); + SetScenarioScriptVar(VAR_SCENARIO_SUB1, 0, 0); + SetScenarioScriptVar(VAR_SCENARIO_SUB2, 0, 0); + SetScenarioScriptVar(VAR_SCENARIO_SUB3, 0, 0); + SetScenarioScriptVar(VAR_SCENARIO_SUB4, 0, 0); + SetScenarioScriptVar(VAR_SCENARIO_SUB5, 0, 0); + SetScenarioScriptVar(VAR_SCENARIO_SUB6, 0, 0); + SetScenarioScriptVar(VAR_SCENARIO_SUB7, 0, 0); + SetScenarioScriptVar(VAR_SCENARIO_SUB8, 0, 0); ZinitScriptVariable(0, VAR_SCENARIO_MAIN_BIT_FLAG); ZinitScriptVariable(0, VAR_SCENARIO_MAIN_BIT_FLAG_BACKUP); s32 idx = 0; diff --git a/src/story_progress.c b/src/story_progress.c index 904b5c3c..2f4041c8 100644 --- a/src/story_progress.c +++ b/src/story_progress.c @@ -6,29 +6,29 @@ extern const u8 SCENARIO_CALC_DEBUG_MSG; -void UpdateProgress(enum script_var_id script_var_id, s32 chapter, s32 sub_section) +void SetScenarioScriptVar(enum script_var_id script_var_id, s32 chapter, s32 subsection) { s32 old_progress = LoadScriptVariableValueAtIndex(0, script_var_id, 0); s32 old_sub_prog = LoadScriptVariableValueAtIndex(0, script_var_id, 1); - Debug_Print(9, &SCENARIO_CALC_DEBUG_MSG, script_var_id, old_progress, old_sub_prog, - chapter, sub_section); + Debug_Print(9, &SCENARIO_CALC_DEBUG_MSG, script_var_id, old_progress, old_sub_prog, + chapter, subsection); // VAR_SCENARIO_MAIN stores maingame story progression if (script_var_id == VAR_SCENARIO_MAIN) { - if ((chapter!= old_progress) || (sub_section != old_sub_prog)) { + if ((chapter!= old_progress) || (subsection != old_sub_prog)) { // Reset Job Requests cleared in a single day when the maingame story progresses. SaveScriptVariableValue(0, VAR_REQUEST_CLEAR_COUNT, 0); } } - + SaveScriptVariableValueAtIndex(0, script_var_id, 0, chapter); - SaveScriptVariableValueAtIndex(0, script_var_id, 1, sub_section); + SaveScriptVariableValueAtIndex(0, script_var_id, 1, subsection); } -bool8 IsStoryBeforePoint(enum script_var_id script_var_id, s32 chapter, s32 sub_section) +bool8 IsStoryBeforePoint(enum script_var_id script_var_id, s32 chapter, s32 subsection) { s32 cur_chapter = LoadScriptVariableValueAtIndex(0, script_var_id, 0); - s32 cur_sub_sec = LoadScriptVariableValueAtIndex(0, script_var_id, 1); + s32 cur_subsec = LoadScriptVariableValueAtIndex(0, script_var_id, 1); if (cur_chapter == 0x35) { return FALSE; @@ -36,16 +36,16 @@ bool8 IsStoryBeforePoint(enum script_var_id script_var_id, s32 chapter, s32 sub_ if (cur_chapter < chapter) { return TRUE; } - if ((cur_chapter == chapter) && (sub_section >= 0) && (cur_sub_sec < sub_section)) { + if ((cur_chapter == chapter) && (subsection >= 0) && (cur_subsec < subsection)) { return TRUE; } return FALSE; } -bool8 IsStoryBeforeOrAtPoint(enum script_var_id script_var_id, s32 chapter, s32 sub_section) +bool8 IsStoryBeforeOrAtPoint(enum script_var_id script_var_id, s32 chapter, s32 subsection) { s32 cur_chapter = LoadScriptVariableValueAtIndex(0, script_var_id, 0); - s32 cur_sub_sec = LoadScriptVariableValueAtIndex(0, script_var_id, 1); + s32 cur_subsec = LoadScriptVariableValueAtIndex(0, script_var_id, 1); if (cur_chapter == 0x35) { return FALSE; @@ -56,8 +56,8 @@ bool8 IsStoryBeforeOrAtPoint(enum script_var_id script_var_id, s32 chapter, s32 } if (cur_chapter == chapter) { - if (sub_section >= 0) { - if (cur_sub_sec <= sub_section) { + if (subsection >= 0) { + if (cur_subsec <= subsection) { return TRUE; } } else { @@ -67,16 +67,16 @@ bool8 IsStoryBeforeOrAtPoint(enum script_var_id script_var_id, s32 chapter, s32 return FALSE; } -s32 IsStoryAtPoint(enum script_var_id script_var_id, s32 chapter, s32 sub_section) +bool8 IsStoryAtPoint(enum script_var_id script_var_id, s32 chapter, s32 subsection) { s32 cur_chapter = LoadScriptVariableValueAtIndex(0, script_var_id, 0); - s32 cur_sub_sec = LoadScriptVariableValueAtIndex(0, script_var_id, 1); - + s32 cur_subsec = LoadScriptVariableValueAtIndex(0, script_var_id, 1); + if (cur_chapter == chapter) { - if (sub_section < 0) { + if (subsection < 0) { return TRUE; } - if (cur_sub_sec == sub_section) { + if (cur_subsec == subsection) { return TRUE; } } @@ -84,13 +84,13 @@ s32 IsStoryAtPoint(enum script_var_id script_var_id, s32 chapter, s32 sub_sectio return FALSE; } -s32 IsStoryAtOrAfterPoint(enum script_var_id script_var_id, s32 chapter, s32 sub_section) +bool8 IsStoryAtOrAfterPoint(enum script_var_id script_var_id, s32 chapter, s32 subsection) { - s32 cur_sub_sec; + s32 cur_subsec; s32 cur_chapter; cur_chapter = LoadScriptVariableValueAtIndex(0, script_var_id, 0); - cur_sub_sec = LoadScriptVariableValueAtIndex(0, script_var_id, 1); + cur_subsec = LoadScriptVariableValueAtIndex(0, script_var_id, 1); if (cur_chapter == 0x35) { return FALSE; @@ -99,8 +99,8 @@ s32 IsStoryAtOrAfterPoint(enum script_var_id script_var_id, s32 chapter, s32 sub return TRUE; } if (cur_chapter == chapter) { - if (sub_section >= 0) { - if (cur_sub_sec >= sub_section) { + if (subsection >= 0) { + if (cur_subsec >= subsection) { return TRUE; } @@ -111,10 +111,10 @@ s32 IsStoryAtOrAfterPoint(enum script_var_id script_var_id, s32 chapter, s32 sub return FALSE; } -s32 IsStoryAtOrAfterPointStrict(enum script_var_id script_var_id, s32 chapter, s32 sub_section) +bool8 IsStoryAfterPoint(enum script_var_id script_var_id, s32 chapter, s32 subsection) { s32 cur_chapter = LoadScriptVariableValueAtIndex(0, script_var_id, 0); - s32 cur_sub_sec = LoadScriptVariableValueAtIndex(0, script_var_id, 1); + s32 cur_subsec = LoadScriptVariableValueAtIndex(0, script_var_id, 1); if (cur_chapter == 0x35) { return FALSE; @@ -122,7 +122,7 @@ s32 IsStoryAtOrAfterPointStrict(enum script_var_id script_var_id, s32 chapter, s if (cur_chapter > chapter) { return TRUE; } - if ((cur_chapter == chapter) && (sub_section >= 0) && (cur_sub_sec > sub_section)) { + if ((cur_chapter == chapter) && (subsection >= 0) && (cur_subsec > subsection)) { return TRUE; } return FALSE; From 57ed202204deb03e0de3318ea6343927fbda996c Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sat, 29 Nov 2025 22:50:18 -0600 Subject: [PATCH 3/4] Rename some special episode symbols for consistency --- asm/include/main_0203C774.inc | 2 +- asm/include/overlay_01.inc | 2 +- asm/main_0203C774.s | 2 +- asm/overlay_01.s | 2 +- include/special_episode.h | 4 ++-- src/special_episode.c | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/asm/include/main_0203C774.inc b/asm/include/main_0203C774.inc index 7bc47541..1284f74c 100644 --- a/asm/include/main_0203C774.inc +++ b/asm/include/main_0203C774.inc @@ -463,7 +463,7 @@ .public sub_02039218 .public sub_0203931C .public sub_0204B028 -.public SetSpecialEpOpenOld +.public SetSpecialEpisodeOpenOld .public sub_0204CDB8 .public sub_0204E154 .public sub_0204E19C diff --git a/asm/include/overlay_01.inc b/asm/include/overlay_01.inc index 8c3ddeb6..45fa886a 100644 --- a/asm/include/overlay_01.inc +++ b/asm/include/overlay_01.inc @@ -95,7 +95,7 @@ .public IsSpecialEpisodeBeaten .public IsSpecialEpisodeOpen .public IsSpecialEpisodeOpenMismatch -.public IsSpecialEpOpenOld +.public IsSpecialEpisodeOpenOld .public IsTextBoxActive .public LoadScriptVariableValueAtIndex .public LoadWanTableEntry diff --git a/asm/main_0203C774.s b/asm/main_0203C774.s index 398eeaf7..0d0415b6 100644 --- a/asm/main_0203C774.s +++ b/asm/main_0203C774.s @@ -14613,7 +14613,7 @@ InitSpecialEpisodeHero: ; 0x020484E8 bl sub_0204CDB8 mov r0, r4 mov r1, #1 - bl SetSpecialEpOpenOld + bl SetSpecialEpisodeOpenOld cmp r4, #4 addls pc, pc, r4, lsl #2 b _02048578 diff --git a/asm/overlay_01.s b/asm/overlay_01.s index e0be9dec..34547ce8 100644 --- a/asm/overlay_01.s +++ b/asm/overlay_01.s @@ -11178,7 +11178,7 @@ ov01_02332580: ; 0x02332580 ldrne r8, _02332638 ; =ov01_0233B6A4 bne _023325D8 mov r0, r7 - bl IsSpecialEpOpenOld + bl IsSpecialEpisodeOpenOld cmp r0, #0 ldreq r8, _0233263C ; =ov01_0233B6B0 _023325D8: diff --git a/include/special_episode.h b/include/special_episode.h index e7fb5639..2efb0889 100644 --- a/include/special_episode.h +++ b/include/special_episode.h @@ -10,8 +10,8 @@ s32 GetExecuteSpecialEpisodeType(); bool8 IsSpecialEpisodeOpen(u32 idx); void SetSpecialEpisodeOpen(u32 idx, u32 episode_open); bool8 IsSpecialEpisodeOpenMismatch(); -bool8 IsSpecialEpOpenOld(u32 idx); -void SetSpecialEpOpenOld(u32 idx, u32 val); +bool8 IsSpecialEpisodeOpenOld(u32 idx); +void SetSpecialEpisodeOpenOld(u32 idx, u32 val); bool8 IsSpecialEpisodeBeaten(u32 idx); void SetSpecialEpisodeBeaten(u32 idx, u32 special_ep_beaten); diff --git a/src/special_episode.c b/src/special_episode.c index 746bd637..a8a02d73 100644 --- a/src/special_episode.c +++ b/src/special_episode.c @@ -61,7 +61,7 @@ bool8 IsSpecialEpisodeOpenMismatch() return ret; } -bool8 IsSpecialEpOpenOld(u32 idx) +bool8 IsSpecialEpisodeOpenOld(u32 idx) { s32 val = LoadScriptVariableValueAtIndex(0, VAR_SPECIAL_EPISODE_OPEN_OLD, idx); if(val == 0) { @@ -71,7 +71,7 @@ bool8 IsSpecialEpOpenOld(u32 idx) } } -void SetSpecialEpOpenOld(u32 idx, u32 episode_open) +void SetSpecialEpisodeOpenOld(u32 idx, u32 episode_open) { s32 new_val; if(episode_open == 0) { From 579ffdecca55d7a87625323774be7cee39317f95 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sun, 30 Nov 2025 10:13:13 -0600 Subject: [PATCH 4/4] Renamed scenario progress symbols --- asm/include/main_0204B018.inc | 2 +- asm/include/main_02058F24.inc | 2 +- asm/include/overlay_01.inc | 2 +- asm/include/overlay_11.inc | 2 +- asm/main_0204B018.s | 2 +- asm/main_02058F24.s | 6 +++--- asm/overlay_01.s | 2 +- asm/overlay_11.s | 10 +++++----- include/script_variable.h | 2 +- include/story_progress.h | 2 +- src/script_variable.c | 24 ++++++++++++------------ src/story_progress.c | 2 +- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/asm/include/main_0204B018.inc b/asm/include/main_0204B018.inc index c71c40d1..08af7c11 100644 --- a/asm/include/main_0204B018.inc +++ b/asm/include/main_0204B018.inc @@ -4,7 +4,7 @@ .public Debug_Print0 .public GAME_MODE .public InitDungeonListScriptVars -.public InitScenarioScriptVars +.public InitScenarioProgressScriptVars .public InitWorldMapScriptVars .public SaveScriptVariableValue .public SaveScriptVariableValueAtIndex diff --git a/asm/include/main_02058F24.inc b/asm/include/main_02058F24.inc index 65b55228..4f8f578a 100644 --- a/asm/include/main_02058F24.inc +++ b/asm/include/main_02058F24.inc @@ -363,7 +363,7 @@ .public SetCollectionMenuField0x1B2 .public SetPokemonJoined .public SetQuestionMarks -.public SetScenarioScriptVar +.public SetScenarioProgressScriptVar .public SetSpecialEpisodeOpen .public SetSpecialEpisodeType .public SetSpriteIdForAnimationControl diff --git a/asm/include/overlay_01.inc b/asm/include/overlay_01.inc index 45fa886a..cbec764c 100644 --- a/asm/include/overlay_01.inc +++ b/asm/include/overlay_01.inc @@ -249,7 +249,7 @@ .public SetDebugSpecialEpisodeNumber .public SetIrqFlag .public SetMainTeamName -.public SetScenarioScriptVar +.public SetScenarioProgressScriptVar .public SetSpriteIdForAnimationControl .public ShowKeyboard .public ShowStringIdInDialogueBox diff --git a/asm/include/overlay_11.inc b/asm/include/overlay_11.inc index 56857659..20ce06cf 100644 --- a/asm/include/overlay_11.inc +++ b/asm/include/overlay_11.inc @@ -503,7 +503,7 @@ .public SetPortraitEmotion .public SetPortraitLayout .public SetPortraitOffset -.public SetScenarioScriptVar +.public SetScenarioProgressScriptVar .public SetSpecialEpisodeBeaten .public SetTeamSetupHeroAndPartnerOnly .public SetTeamSetupHeroOnly diff --git a/asm/main_0204B018.s b/asm/main_0204B018.s index fa97908a..41f657ad 100644 --- a/asm/main_0204B018.s +++ b/asm/main_0204B018.s @@ -219,7 +219,7 @@ _0204B118: mov r0, #0 mov r1, #0x4d bl ZinitScriptVariable - bl InitScenarioScriptVars + bl InitScenarioProgressScriptVars bl InitWorldMapScriptVars bl InitDungeonListScriptVars ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} diff --git a/asm/main_02058F24.s b/asm/main_02058F24.s index d26dcff0..ff4c688d 100644 --- a/asm/main_02058F24.s +++ b/asm/main_02058F24.s @@ -16155,7 +16155,7 @@ _020661B0: mov r0, #2 mov r1, #0x36 mov r2, #0 - bl SetScenarioScriptVar + bl SetScenarioProgressScriptVar mov r0, #2 bl LoadOverlay mov r0, #0 @@ -16225,7 +16225,7 @@ _020662BC: mov r0, #2 mov r1, #0x33 mov r2, #0 - bl SetScenarioScriptVar + bl SetScenarioProgressScriptVar mov r0, #2 bl LoadOverlay mov r0, #1 @@ -16256,7 +16256,7 @@ _02066330: mov r0, #2 mov r1, #0x34 mov r2, #0 - bl SetScenarioScriptVar + bl SetScenarioProgressScriptVar mov r0, #2 bl LoadOverlay mov r0, #1 diff --git a/asm/overlay_01.s b/asm/overlay_01.s index 34547ce8..874fe489 100644 --- a/asm/overlay_01.s +++ b/asm/overlay_01.s @@ -13063,7 +13063,7 @@ _02333DA4: mov r0, #3 mov r1, #0x1c mov r2, #0 - bl SetScenarioScriptVar + bl SetScenarioProgressScriptVar mov r0, #2 mov r1, #6 mov r2, #1 diff --git a/asm/overlay_11.s b/asm/overlay_11.s index e3714a07..04b599af 100644 --- a/asm/overlay_11.s +++ b/asm/overlay_11.s @@ -3246,7 +3246,7 @@ _022DEE84: ; 0x022DEE84 mov r2, r0 mov r1, r4 mov r0, r3, asr #0x10 - bl SetScenarioScriptVar + bl SetScenarioProgressScriptVar b _022E2474 _022DEEBC: ; 0x022DEEBC ldrh r0, [r6] @@ -3255,7 +3255,7 @@ _022DEEBC: ; 0x022DEEBC mov r1, #0 mov r2, r1 mov r0, r0, asr #0x10 - bl SetScenarioScriptVar + bl SetScenarioProgressScriptVar b _022E2474 _022DEEDC: ; 0x022DEEDC ldrh r0, [r6] @@ -11863,7 +11863,7 @@ _022E657C: ldr r1, [sp, #0x40] ldr r2, [sp, #0x3c] mov r0, #2 - bl SetScenarioScriptVar + bl SetScenarioProgressScriptVar ldrsh r0, [sp, #0x36] ldrsh r1, [sp, #0x38] bl sub_02065B80 @@ -11891,7 +11891,7 @@ _022E6644: mov r1, #0 mov r2, r1 mov r0, #2 - bl SetScenarioScriptVar + bl SetScenarioProgressScriptVar mov r0, #0 b _022E68BC _022E6678: @@ -12418,7 +12418,7 @@ _022E6D70: ldr r1, [sp, #0x14] add r2, r0, #1 mov r0, #2 - bl SetScenarioScriptVar + bl SetScenarioProgressScriptVar mov r0, #1 b _022E6E58 _022E6DB0: diff --git a/include/script_variable.h b/include/script_variable.h index 79477ffa..394f316f 100644 --- a/include/script_variable.h +++ b/include/script_variable.h @@ -51,7 +51,7 @@ void EventFlagResume(); void EventFlagBackup(); bool8 DumpScriptVariableValues(u8* dest); bool8 RestoreScriptVariableValues(u8* src); -void InitScenarioScriptVars(); +void InitScenarioProgressScriptVars(); void LoadScriptVarValuePair(enum script_var_id script_var_id, s32* val_1, s32* val_2); #endif //PMDSKY_SCRIPTING_H diff --git a/include/story_progress.h b/include/story_progress.h index 9c5d5deb..d5ade0b6 100644 --- a/include/story_progress.h +++ b/include/story_progress.h @@ -1,7 +1,7 @@ #ifndef PMDSKY_STORY_PROGRESS_H #define PMDSKY_STORY_PROGRESS_H -void SetScenarioScriptVar(enum script_var_id script_var_id, s32 chapter, s32 subsection); +void SetScenarioProgressScriptVar(enum script_var_id script_var_id, s32 chapter, s32 subsection); bool8 IsStoryBeforePoint(enum script_var_id script_var_id, s32 chapter, s32 subsection); bool8 IsStoryBeforeOrAtPoint(enum script_var_id script_var_id, s32 chapter, s32 subsection); bool8 IsStoryAtPoint(enum script_var_id script_var_id, s32 chapter, s32 subsection); diff --git a/src/script_variable.c b/src/script_variable.c index bddf934b..7687589e 100644 --- a/src/script_variable.c +++ b/src/script_variable.c @@ -583,19 +583,19 @@ bool8 RestoreScriptVariableValues(u8* src) return ret_val; } -void InitScenarioScriptVars() +void InitScenarioProgressScriptVars() { - SetScenarioScriptVar(VAR_SCENARIO_SELECT, 0, 0); - SetScenarioScriptVar(VAR_SCENARIO_MAIN, 0, 0); - SetScenarioScriptVar(VAR_SCENARIO_SIDE, 0, 0); - SetScenarioScriptVar(VAR_SCENARIO_SUB1, 0, 0); - SetScenarioScriptVar(VAR_SCENARIO_SUB2, 0, 0); - SetScenarioScriptVar(VAR_SCENARIO_SUB3, 0, 0); - SetScenarioScriptVar(VAR_SCENARIO_SUB4, 0, 0); - SetScenarioScriptVar(VAR_SCENARIO_SUB5, 0, 0); - SetScenarioScriptVar(VAR_SCENARIO_SUB6, 0, 0); - SetScenarioScriptVar(VAR_SCENARIO_SUB7, 0, 0); - SetScenarioScriptVar(VAR_SCENARIO_SUB8, 0, 0); + SetScenarioProgressScriptVar(VAR_SCENARIO_SELECT, 0, 0); + SetScenarioProgressScriptVar(VAR_SCENARIO_MAIN, 0, 0); + SetScenarioProgressScriptVar(VAR_SCENARIO_SIDE, 0, 0); + SetScenarioProgressScriptVar(VAR_SCENARIO_SUB1, 0, 0); + SetScenarioProgressScriptVar(VAR_SCENARIO_SUB2, 0, 0); + SetScenarioProgressScriptVar(VAR_SCENARIO_SUB3, 0, 0); + SetScenarioProgressScriptVar(VAR_SCENARIO_SUB4, 0, 0); + SetScenarioProgressScriptVar(VAR_SCENARIO_SUB5, 0, 0); + SetScenarioProgressScriptVar(VAR_SCENARIO_SUB6, 0, 0); + SetScenarioProgressScriptVar(VAR_SCENARIO_SUB7, 0, 0); + SetScenarioProgressScriptVar(VAR_SCENARIO_SUB8, 0, 0); ZinitScriptVariable(0, VAR_SCENARIO_MAIN_BIT_FLAG); ZinitScriptVariable(0, VAR_SCENARIO_MAIN_BIT_FLAG_BACKUP); s32 idx = 0; diff --git a/src/story_progress.c b/src/story_progress.c index 2f4041c8..22891bca 100644 --- a/src/story_progress.c +++ b/src/story_progress.c @@ -6,7 +6,7 @@ extern const u8 SCENARIO_CALC_DEBUG_MSG; -void SetScenarioScriptVar(enum script_var_id script_var_id, s32 chapter, s32 subsection) +void SetScenarioProgressScriptVar(enum script_var_id script_var_id, s32 chapter, s32 subsection) { s32 old_progress = LoadScriptVariableValueAtIndex(0, script_var_id, 0); s32 old_sub_prog = LoadScriptVariableValueAtIndex(0, script_var_id, 1);