From 579ffdecca55d7a87625323774be7cee39317f95 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sun, 30 Nov 2025 10:13:13 -0600 Subject: [PATCH] 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);