diff --git a/asm/include/main_02014D18.inc b/asm/include/main_02014D18.inc index 733c2f78..d8d7b42a 100644 --- a/asm/include/main_02014D18.inc +++ b/asm/include/main_02014D18.inc @@ -333,7 +333,7 @@ .public GetNameString .public GetNbFloors .public GetNbFloorsPlusOne -.public GetPerformanceFlagWithChecks +.public GetResolvedPerformanceProgressFlag .public GetStringFromFileVeneer .public GetTeamMember .public GetTypeStringId diff --git a/asm/include/main_0203C774.inc b/asm/include/main_0203C774.inc index 1284f74c..f8c6bfe2 100644 --- a/asm/include/main_0203C774.inc +++ b/asm/include/main_0203C774.inc @@ -248,7 +248,7 @@ .public GetNextIqSkill .public GetPartner .public GetPartnerMemberIdx -.public GetPerformanceFlagWithChecks +.public GetResolvedPerformanceProgressFlag .public GetPpIncrease .public GetPressedButtons .public GetRank diff --git a/asm/include/main_0204DE7C.inc b/asm/include/main_0204DE7C.inc index a63c3261..805def3d 100644 --- a/asm/include/main_0204DE7C.inc +++ b/asm/include/main_0204DE7C.inc @@ -55,7 +55,7 @@ .public GetNameString .public GetNbItemsInBag .public GetPartyMembers -.public GetPerformanceFlagWithChecks +.public GetResolvedPerformanceProgressFlag .public GetRankUpEntry .public GetSosMailCount .public GetStringFromFileVeneer @@ -88,7 +88,7 @@ .public sub_02048CB8 .public sub_0204ABB8 .public sub_0204ACDC -.public sub_0204CB2C +.public SetResolvedPerformanceProgressFlag .public sub_0204CEE0 .public sub_0204DB08 .public sub_020515C4 diff --git a/asm/include/main_02058D04.inc b/asm/include/main_02058D04.inc index 77639576..ace7307e 100644 --- a/asm/include/main_02058D04.inc +++ b/asm/include/main_02058D04.inc @@ -1,7 +1,7 @@ #pragma once .public CanLearnIqSkill .public GetIqGroup -.public GetPerformanceFlagWithChecks +.public GetResolvedPerformanceProgressFlag .public IQ_GROUP_SKILLS .public IQ_SKILL_RESTRICTIONS .public IqSkillFlagTest diff --git a/asm/include/main_02058F24.inc b/asm/include/main_02058F24.inc index 4f8f578a..c461db26 100644 --- a/asm/include/main_02058F24.inc +++ b/asm/include/main_02058F24.inc @@ -233,7 +233,7 @@ .public GetPartner .public GetPartnerMemberIdx .public GetPartyMembers -.public GetPerformanceFlagWithChecks +.public GetResolvedPerformanceProgressFlag .public GetRank .public GetScenarioBalance .public GetSecondFormIfValid diff --git a/asm/include/overlay_01.inc b/asm/include/overlay_01.inc index cbec764c..05ef3cf3 100644 --- a/asm/include/overlay_01.inc +++ b/asm/include/overlay_01.inc @@ -64,7 +64,7 @@ .public GetNbPokemonJoined .public GetNbRecycled .public GetNbSkyGiftsSent -.public GetPerformanceFlagWithChecks +.public GetResolvedPerformanceProgressFlag .public GetPressedButtons .public GetReleasedStylus .public GetSimpleMenuResult__0202AEA4 diff --git a/asm/include/overlay_11.inc b/asm/include/overlay_11.inc index 20ce06cf..0a947c79 100644 --- a/asm/include/overlay_11.inc +++ b/asm/include/overlay_11.inc @@ -69,7 +69,7 @@ .public GetNameRaw .public GetPartner .public GetPartyMembers -.public GetPerformanceFlagWithChecks +.public GetResolvedPerformanceProgressFlag .public GetPressedButtons .public GetRank .public GetReleasedStylus @@ -640,7 +640,7 @@ .public sub_0204AE80 .public sub_0204AEE0 .public sub_0204B3D0 -.public sub_0204CB2C +.public SetResolvedPerformanceProgressFlag .public sub_0204CDE8 .public sub_0204CE48 .public sub_0204D018 diff --git a/asm/include/overlay_11_022EE5E4.inc b/asm/include/overlay_11_022EE5E4.inc index 09840f98..4c209761 100644 --- a/asm/include/overlay_11_022EE5E4.inc +++ b/asm/include/overlay_11_022EE5E4.inc @@ -97,7 +97,7 @@ .public GetNameWithGender .public GetNbItemsInBag .public GetPartner -.public GetPerformanceFlagWithChecks +.public GetResolvedPerformanceProgressFlag .public GetPressedButtons .public GetRank .public GetRankupPoints diff --git a/asm/include/overlay_17_0238A754.inc b/asm/include/overlay_17_0238A754.inc index 24632b38..df130a5a 100644 --- a/asm/include/overlay_17_0238A754.inc +++ b/asm/include/overlay_17_0238A754.inc @@ -21,7 +21,7 @@ .public GetGameMode .public GetMainCharacter1MemberIdx .public GetPartnerMemberIdx -.public GetPerformanceFlagWithChecks +.public GetResolvedPerformanceProgressFlag .public GetPressedButtons .public GetSimpleMenuResult__0202B870 .public GetTeamMember diff --git a/asm/include/overlay_19.inc b/asm/include/overlay_19.inc index ac8291df..ae4abfe3 100644 --- a/asm/include/overlay_19.inc +++ b/asm/include/overlay_19.inc @@ -29,7 +29,7 @@ .public GetItemAtIdx .public GetLearnableIqSkills .public GetMaxReachedFloor -.public GetPerformanceFlagWithChecks +.public GetResolvedPerformanceProgressFlag .public GetPressedButtons .public GetScenarioBalance .public GetSecondFormIfValid diff --git a/asm/include/overlay_29_0231CBEC.inc b/asm/include/overlay_29_0231CBEC.inc index 127830a5..30577492 100644 --- a/asm/include/overlay_29_0231CBEC.inc +++ b/asm/include/overlay_29_0231CBEC.inc @@ -27,7 +27,7 @@ .public GetItemMoveId16 .public GetMoveBasePower .public GetMoveMaxGinsengBoost -.public GetPerformanceFlagWithChecks +.public GetResolvedPerformanceProgressFlag .public GetWeatherColorTable .public GINSENG_CHANCE_3 .public GUMMI_BELLY_RESTORE_TABLE diff --git a/asm/include/overlay_29_02341E6C.inc b/asm/include/overlay_29_02341E6C.inc index 2178320a..2bc3a543 100644 --- a/asm/include/overlay_29_02341E6C.inc +++ b/asm/include/overlay_29_02341E6C.inc @@ -20,7 +20,7 @@ .public GetOutlawLeaderLevel .public GetOutlawLevel .public GetOutlawMinionLevel -.public GetPerformanceFlagWithChecks +.public GetResolvedPerformanceProgressFlag .public GetSpecialTargetItem .public GetTileSafe .public HandleSir0Translation diff --git a/asm/include/overlay_29_0234CA84.inc b/asm/include/overlay_29_0234CA84.inc index f607ee72..15f26eb5 100644 --- a/asm/include/overlay_29_0234CA84.inc +++ b/asm/include/overlay_29_0234CA84.inc @@ -8,7 +8,7 @@ .public GetItemCategoryVeneer .public GetLeader .public GetMessageLogPreprocessorArgs -.public GetPerformanceFlagWithChecks +.public GetResolvedPerformanceProgressFlag .public GetPlayerGender .public GetRandomExplorerMazeMonster .public IsFullFloorFixedRoom diff --git a/asm/include/overlay_29_0234EC38.inc b/asm/include/overlay_29_0234EC38.inc index f1fa9ac9..c487b19b 100644 --- a/asm/include/overlay_29_0234EC38.inc +++ b/asm/include/overlay_29_0234EC38.inc @@ -22,7 +22,7 @@ .public GetDungeonMode .public GetKeyboardStatus .public GetKeyboardStringResult -.public GetPerformanceFlagWithChecks +.public GetResolvedPerformanceProgressFlag .public GetSimpleMenuResult__0202AEA4 .public GetWindowIdSelectedItemOnPage .public InitMenu diff --git a/asm/main_02014D18.s b/asm/main_02014D18.s index a629a64e..75c2a7f6 100644 --- a/asm/main_02014D18.s +++ b/asm/main_02014D18.s @@ -20454,7 +20454,7 @@ _02024CAC: cmp r0, r1 bne _02024CC8 mov r0, #1 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _02024CE8 _02024CC8: diff --git a/asm/main_0203C774.s b/asm/main_0203C774.s index 0d0415b6..794522dd 100644 --- a/asm/main_0203C774.s +++ b/asm/main_0203C774.s @@ -1162,7 +1162,7 @@ _0203D68C: cmp r0, #0 bne _0203D6B4 mov r0, #0x1e - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 bne _0203D73C _0203D6B4: @@ -1183,7 +1183,7 @@ _0203D6E4: cmp r0, #0 beq _0203D73C mov r0, #0x1d - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _0203D718 ldr r0, _0203E4B0 ; =_020AFE74 @@ -1209,7 +1209,7 @@ _0203D73C: tst r0, #0x10 bne _0203D7C0 mov r0, #0x1f - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 bne _0203D7C0 mov r5, #0 @@ -6813,7 +6813,7 @@ GetCheckIqMenuSkillString: ; 0x0204213C cmp r5, #0x18 bne _02042174 mov r0, #3 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag b _0204217C _02042174: mov r1, r5 diff --git a/asm/main_0204CA94.s b/asm/main_0204CA94.s deleted file mode 100644 index bbb172e7..00000000 --- a/asm/main_0204CA94.s +++ /dev/null @@ -1,84 +0,0 @@ - .include "asm/macros.inc" - .include "main_0204CA94.inc" - - .text - - arm_func_start GetPerformanceFlagWithChecks -GetPerformanceFlagWithChecks: ; 0x0204CA94 - stmdb sp!, {r4, lr} - mov r4, r0 - cmp r4, #7 - addls pc, pc, r4, lsl #2 - b _0204CB10 -_0204CAA8: ; jump table - b _0204CAC8 ; case 0 - b _0204CB00 ; case 1 - b _0204CB00 ; case 2 - b _0204CAEC ; case 3 - b _0204CAEC ; case 4 - b _0204CAEC ; case 5 - b _0204CAEC ; case 6 - b _0204CAEC ; case 7 -_0204CAC8: - mov r0, #0 - mov r2, r0 - mov r1, #3 - bl LoadScriptVariableValueAtIndex - cmp r0, #0x35 - moveq r0, #1 - movne r0, #0 - and r0, r0, #0xff - ldmia sp!, {r4, pc} -_0204CAEC: - bl GetGameMode - cmp r0, #3 - bne _0204CB10 - mov r0, #0 - ldmia sp!, {r4, pc} -_0204CB00: - bl GetGameMode - cmp r0, #3 - moveq r0, #1 - ldmeqia sp!, {r4, pc} -_0204CB10: - mov r0, r4, lsl #0x10 - mov r2, r0, lsr #0x10 - mov r0, #0 - mov r1, #0x4e - bl LoadScriptVariableValueAtIndex - and r0, r0, #0xff - ldmia sp!, {r4, pc} - arm_func_end GetPerformanceFlagWithChecks - - arm_func_start sub_0204CB2C -sub_0204CB2C: ; 0x0204CB2C - stmdb sp!, {r3, r4, r5, lr} - mov r5, r0 - mov r4, r1 - cmp r5, #7 - addls pc, pc, r5, lsl #2 - b _0204CB70 -_0204CB44: ; jump table - b _0204CB70 ; case 0 - b _0204CB64 ; case 1 - b _0204CB64 ; case 2 - b _0204CB64 ; case 3 - b _0204CB64 ; case 4 - b _0204CB64 ; case 5 - b _0204CB64 ; case 6 - b _0204CB64 ; case 7 -_0204CB64: - bl GetGameMode - cmp r0, #3 - ldmeqia sp!, {r3, r4, r5, pc} -_0204CB70: - cmp r4, #0 - movne r3, #1 - mov r0, r5, lsl #0x10 - mov r2, r0, lsr #0x10 - moveq r3, #0 - mov r0, #0 - mov r1, #0x4e - bl SaveScriptVariableValueAtIndex - ldmia sp!, {r3, r4, r5, pc} - arm_func_end sub_0204CB2C diff --git a/asm/main_0204DE7C.s b/asm/main_0204DE7C.s index fb541958..78f7b815 100644 --- a/asm/main_0204DE7C.s +++ b/asm/main_0204DE7C.s @@ -637,7 +637,7 @@ _0204E63C: sub_0204E644: ; 0x0204E644 stmdb sp!, {r3, lr} mov r0, #4 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _0204E69C bl sub_02048BFC @@ -931,17 +931,17 @@ sub_0204E974: ; 0x0204E974 strb r2, [r1, #4] mov r0, #7 strb r2, [r1, #0x11] - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag ldr r1, _0204EA4C ; =PENDING_DUNGEON_ID mov r2, #0 strb r0, [r1, #5] mov r0, #6 strb r2, [r1, #6] - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag ldr r1, _0204EA4C ; =PENDING_DUNGEON_ID strb r0, [r1, #8] mov r0, #1 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag ldr r1, _0204EA4C ; =PENDING_DUNGEON_ID mov r2, #0 strb r0, [r1, #9] @@ -996,16 +996,16 @@ InitDungeonInit: ; 0x0204EA5C strneb r0, [r7, #8] bne _0204EAF0 mov r0, #7 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag strb r0, [r7, #5] mov r0, #5 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag strb r0, [r7, #6] mov r0, #6 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag strb r0, [r7, #8] mov r0, #1 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag _0204EAF0: strb r0, [r7, #9] mov r3, #0 @@ -1246,7 +1246,7 @@ _0204EE10: b _0204EF34 _0204EE24: mov r0, #0x19 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 bne _0204EF34 ldr r2, _0204EFB8 ; =_020A2A00 @@ -2182,7 +2182,7 @@ GetGroundNameId: ; 0x0204F958 cmp r4, #6 bne _0204F980 mov r0, #0x1b - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 bne _0204F99C ldr r0, _0204F9B0 ; =0x000042B9 @@ -2191,7 +2191,7 @@ _0204F980: cmp r4, #0x15 bne _0204F99C mov r0, #0x1c - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 #ifdef JAPAN moveq r0, #0x1c4 @@ -3075,7 +3075,7 @@ _0205036C: beq _02050380 mov r0, #0x15 mov r1, #1 - bl sub_0204CB2C + bl SetResolvedPerformanceProgressFlag _02050380: ldr r3, _020503C8 ; =ADVENTURE_LOG_PTR mov r0, r4, asr #4 @@ -3697,7 +3697,7 @@ GetMainTeamNameWithCheck: ; 0x02050B10 sub sp, sp, #0x40 mov r4, r0 mov r0, #1 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 ldrne r0, _02050B70 ; =TEAM_NAME ldrneb r0, [r0] @@ -3777,7 +3777,7 @@ GetRankupPoints: ; 0x02050BB8 bl GetRank mov r4, r0 mov r0, #0x16 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _02050BE4 cmp r4, #0xc @@ -3817,7 +3817,7 @@ sub_02050C10: ; 0x02050C10 add r2, r2, r0 mov r0, #0x16 str r2, [r1, SUB_02050C10_OFFSET] - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _02050C4C ldr r0, _02050C6C ; =TEAM_NAME @@ -3864,7 +3864,7 @@ _02050CA4: blo _02050C84 _02050CAC: mov r0, #0x16 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 bne _02050CC4 cmp r5, #8 @@ -3916,7 +3916,7 @@ sub_02050CF8: ; 0x02050CF8 mov r2, #0x20 bl CopyBitsTo mov r0, #1 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag ldr r1, _02050D78 ; =TEAM_NAME tst r0, #0xff #ifdef JAPAN diff --git a/asm/main_02058D04.s b/asm/main_02058D04.s index 1b9e7d95..33c314b2 100644 --- a/asm/main_02058D04.s +++ b/asm/main_02058D04.s @@ -25,7 +25,7 @@ _02058D28: cmp r7, #0x18 bne _02058D58 mov r0, #3 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag b _02058D64 _02058D58: mov r0, r8 diff --git a/asm/main_02058F24.s b/asm/main_02058F24.s index ff4c688d..5aa0783b 100644 --- a/asm/main_02058F24.s +++ b/asm/main_02058F24.s @@ -871,11 +871,11 @@ _02059B04: .word CopyBitsTo arm_func_start sub_02059B08 sub_02059B08: ; 0x02059B08 - ldr ip, _02059B14 ; =GetPerformanceFlagWithChecks + ldr ip, _02059B14 ; =GetResolvedPerformanceProgressFlag mov r0, #0xa bx ip .align 2, 0 -_02059B14: .word GetPerformanceFlagWithChecks +_02059B14: .word GetResolvedPerformanceProgressFlag arm_func_end sub_02059B08 arm_func_start GetEvolutionPossibilities @@ -1401,7 +1401,7 @@ GetMonsterEvoStatus: ; 0x0205A210 beq _0205A26C _0205A254: mov r0, #0xa - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 movne r0, #1 moveq r0, #0 @@ -2363,7 +2363,7 @@ _0205AE84: strb r1, [sb, #0x42] ldrb r1, [r4, #7] strb r1, [sb, #0x43] - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 moveq r0, #3 beq _0205AFDC @@ -6456,7 +6456,7 @@ GenerateDailyMissions: ; 0x0205E5D0 bl RandRangeSafe mov r8, r0 mov r0, #3 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} mov r2, #0 @@ -8513,7 +8513,7 @@ _02060034: cmp r0, #0xc bne _02060070 mov r0, #9 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 bne _02060060 ldr r0, _02060080 ; =_020A1958 @@ -11201,7 +11201,7 @@ _020622E8: cmp r0, #0 beq _02062324 mov r0, fp - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _0206233C _02062324: @@ -11244,7 +11244,7 @@ _02062380: cmp r0, #0 beq _020623BC mov r0, fp - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _020623D4 _020623BC: @@ -11287,7 +11287,7 @@ _02062418: cmp r0, #0 beq _02062454 mov r0, fp - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _0206246C _02062454: @@ -11330,7 +11330,7 @@ _020624B0: cmp r0, #0 beq _020624EC mov r0, fp - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _02062504 _020624EC: @@ -11428,7 +11428,7 @@ _02062618: cmp r0, #2 bne _02062638 mov r0, #6 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 moveq r0, #0 beq _02062754 @@ -11448,7 +11448,7 @@ _02062660: cmp r0, #2 bne _02062750 mov r0, #9 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 bne _02062750 mov r0, #0 @@ -11815,7 +11815,7 @@ IsMonsterMissionAllowedStory: ; 0x02062AE4 stmdb sp!, {r4, lr} mov r4, r0 mov r0, #9 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 bne _02062B58 mov r2, #0 @@ -11903,7 +11903,7 @@ _02062BEC: cmp r0, #1 bhi _02062C1C mov r0, #9 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} @@ -18227,7 +18227,7 @@ sub_02067C8C: ; 0x02067C8C cmp r0, #0 beq _02067D7C mov r0, #0x16 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 bne _02067D7C _02067D3C: @@ -18475,7 +18475,7 @@ _02068054: cmp r0, #0 beq _020680D0 mov r0, #0x16 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 bne _020680D0 _02068090: @@ -18557,7 +18557,7 @@ _02068158: cmp r0, #0 beq _020681B4 mov r0, #0x16 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _020681BC _020681B4: diff --git a/asm/overlay_01.s b/asm/overlay_01.s index 874fe489..dbc05ec0 100644 --- a/asm/overlay_01.s +++ b/asm/overlay_01.s @@ -7826,7 +7826,7 @@ ov01_0232F830: ; 0x0232F830 add r3, sp, #0x54 bl DrawTextInWindow mov r0, #0x16 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _0232F8F0 ldr r2, _0232F90C ; =0x00000226 @@ -9817,7 +9817,7 @@ _02331304: bl AddMainMenuOption _0233131C: mov r0, #4 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _02331338 mov r0, #0xf @@ -9825,7 +9825,7 @@ _0233131C: bl AddMainMenuOption _02331338: mov r0, #3 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _02331354 mov r0, #0x12 @@ -9833,7 +9833,7 @@ _02331338: bl AddMainMenuOption _02331354: mov r0, #4 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _02331370 mov r0, #0x11 @@ -9841,7 +9841,7 @@ _02331354: bl AddMainMenuOption _02331370: mov r0, #8 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _0233138C mov r0, #0x13 @@ -9849,7 +9849,7 @@ _02331370: bl AddMainMenuOption _0233138C: mov r0, #0x1a - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _023313A8 mov r0, #0x14 @@ -9857,7 +9857,7 @@ _0233138C: bl AddSubMenuOption _023313A8: mov r0, #1 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag mov r1, r0 mov r0, #8 bl AddSubMenuOption @@ -12375,7 +12375,7 @@ _02333534: mvn r4, #1 _02333580: ldr r0, [r6, r7, lsl #2] - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _023335B4 mov r0, r7 diff --git a/asm/overlay_11.s b/asm/overlay_11.s index 04b599af..3e06f85f 100644 --- a/asm/overlay_11.s +++ b/asm/overlay_11.s @@ -3266,7 +3266,7 @@ _022DEEDC: ; 0x022DEEDC mov r1, r0 mov r0, r4 and r1, r1, #0xff - bl sub_0204CB2C + bl SetResolvedPerformanceProgressFlag b _022E2474 _022DEF04: ; 0x022DEF04 mov r1, #0x27 @@ -3534,7 +3534,7 @@ _022DF2D0: bl ScriptParamToInt mov r5, r0 mov r0, r7 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r5, r0 ldreqh r0, [r6, #4] ldreq r1, [r4, #0x14] @@ -6511,7 +6511,7 @@ _022E1CF8: moveq r0, #0x298 beq _022E1D5C mov r0, #0 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 ldrne r0, _022E2294 ; =0x00000299 bne _022E1D5C @@ -14681,7 +14681,7 @@ _022E8A3C: streqh r0, [sp, #2] beq _022E8CD4 mov r0, #0 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 ldrne r0, _022E9218 ; =0x0000029F strneh r0, [sp, #2] @@ -14727,7 +14727,7 @@ _022E8AE4: cmpne r4, #3 beq _022E8B94 mov r0, #0 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 ldrne r0, _022E9228 ; =0x000002A5 strneh r0, [sp, #2] @@ -14758,7 +14758,7 @@ _022E8B94: bl SetDungeonConquest _022E8BC4: mov r0, #0 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _022E8CD4 ldr r0, _022E91E8 ; =ov11_02324FA0 diff --git a/asm/overlay_11_022EE5E4.s b/asm/overlay_11_022EE5E4.s index ec94919a..5c38a0ac 100644 --- a/asm/overlay_11_022EE5E4.s +++ b/asm/overlay_11_022EE5E4.s @@ -20495,7 +20495,7 @@ _022FEFFC: add r3, sp, #0x54 bl DrawTextInWindow mov r0, #0x16 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _022FF0AC add r1, sp, #4 diff --git a/asm/overlay_17_0238A754.s b/asm/overlay_17_0238A754.s index 07932979..635f51e8 100644 --- a/asm/overlay_17_0238A754.s +++ b/asm/overlay_17_0238A754.s @@ -361,7 +361,7 @@ _0238AC1C: moveq r5, #1 _0238AC28: mov r0, #0x14 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _0238AC84 bl GetGameMode diff --git a/asm/overlay_19.s b/asm/overlay_19.s index 263c3388..9d2cecab 100644 --- a/asm/overlay_19.s +++ b/asm/overlay_19.s @@ -1193,7 +1193,7 @@ _0238B178: cmp r0, #0 bne _0238B204 mov r0, #0x1e - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _0238B204 bl GetRecruitableMonsterAll diff --git a/asm/overlay_29_0231CBEC.s b/asm/overlay_29_0231CBEC.s index e04eecd4..db105c60 100644 --- a/asm/overlay_29_0231CBEC.s +++ b/asm/overlay_29_0231CBEC.s @@ -1118,7 +1118,7 @@ ApplyGracideaEffect: ; 0x0231D9C0 stmdb sp!, {r3, r4, r5, lr} mov r0, #0x1a mov r5, r1 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _0231DA50 mov r0, r5 diff --git a/asm/overlay_29_02341E6C.s b/asm/overlay_29_02341E6C.s index 27bc31a9..82481bc5 100644 --- a/asm/overlay_29_02341E6C.s +++ b/asm/overlay_29_02341E6C.s @@ -1625,7 +1625,7 @@ _023433B8: cmpne r0, #3 beq _02343678 mov r0, #0x17 - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 bne _02343678 ldr r1, [sl, #4] diff --git a/asm/overlay_29_0234CA84.s b/asm/overlay_29_0234CA84.s index 547c3e68..853019c7 100644 --- a/asm/overlay_29_0234CA84.s +++ b/asm/overlay_29_0234CA84.s @@ -535,7 +535,7 @@ _0234D148: cmp r0, #0xe2 bne _0234D170 mov r0, #0x1a - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 beq _0234D170 ldrsh r0, [r5, #2] diff --git a/asm/overlay_29_0234EC38.s b/asm/overlay_29_0234EC38.s index 6a53b5c2..7e7bb985 100644 --- a/asm/overlay_29_0234EC38.s +++ b/asm/overlay_29_0234EC38.s @@ -923,7 +923,7 @@ _0234F7F8: cmp r3, #8 blt _0234F7F8 mov r0, #0x1d - bl GetPerformanceFlagWithChecks + bl GetResolvedPerformanceProgressFlag cmp r0, #0 ldreq r4, _0234F9CC ; =ov29_0235343C beq _0234F840 diff --git a/include/dungeon_recruitment_3.h b/include/dungeon_recruitment_3.h deleted file mode 100644 index 0c7dc865..00000000 --- a/include/dungeon_recruitment_3.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef PMDSKY_DUNGEON_RECRUITMENT_3_H -#define PMDSKY_DUNGEON_RECRUITMENT_3_H - -#include "util.h" - -bool8 HasPlayedOldGame(); - -#endif //PMDSKY_DUNGEON_RECRUITMENT_3_H diff --git a/include/has_played_old_game.h b/include/has_played_old_game.h new file mode 100644 index 00000000..cdc51261 --- /dev/null +++ b/include/has_played_old_game.h @@ -0,0 +1,8 @@ +#ifndef PMDSKY_HAS_PLAYED_OLD_GAME_H +#define PMDSKY_HAS_PLAYED_OLD_GAME_H + +#include "util.h" + +bool8 HasPlayedOldGame(); + +#endif //PMDSKY_HAS_PLAYED_OLD_GAME_H diff --git a/include/performance_progress.h b/include/performance_progress.h new file mode 100644 index 00000000..2450eebc --- /dev/null +++ b/include/performance_progress.h @@ -0,0 +1,9 @@ +#ifndef PMDSKY_PERFORMANCE_PROGRESS_H +#define PMDSKY_PERFORMANCE_PROGRESS_H + +#include "util.h" + +bool8 GetResolvedPerformanceProgressFlag(u32 idx); +void SetResolvedPerformanceProgressFlag(u32 idx, s32 value); + +#endif //PMDSKY_PERFORMANCE_PROGRESS_H diff --git a/main.lsf b/main.lsf index 14bd2fb2..90302075 100644 --- a/main.lsf +++ b/main.lsf @@ -88,8 +88,8 @@ Static main Object asm/main_rodata_020A18BC.o Object src/story_progress.o Object src/special_episode.o - Object src/dungeon_recruitment_3.o - Object asm/main_0204CA94.o + Object src/has_played_old_game.o + Object src/performance_progress.o Object src/main_0204CB94.o Object asm/main_0204CBE8.o Object src/main_0204DA2C.o diff --git a/src/dungeon_pokemon_attributes_1.c b/src/dungeon_pokemon_attributes_1.c index 57069ed2..8120a7a6 100644 --- a/src/dungeon_pokemon_attributes_1.c +++ b/src/dungeon_pokemon_attributes_1.c @@ -8,11 +8,11 @@ #include "main_02058E68.h" #include "overlay_29_022FF898.h" #include "overlay_29_023000E4.h" +#include "performance_progress.h" #include "pokemon.h" extern void DisableIqSkill(u32 *iq_skills_flags, enum iq_skill_id iq_id); extern void EnableIqSkill(u32 *iq_skills_flags, enum iq_skill_id iq_id); -extern bool8 GetPerformanceFlagWithChecks(s32 flag_id); bool8 CanSeeInvisibleMonsters(struct entity *entity) { @@ -104,7 +104,7 @@ void UpdateIqSkills(struct monster *monster) EnableIqSkill(monster->iq_skill_flags.flags, iq_skill); } - if (GetPerformanceFlagWithChecks(PERFORMANCE_PROGRESS_FLAG_RANDOM_MISSION)) + if (GetResolvedPerformanceProgressFlag(PERFORMANCE_PROGRESS_FLAG_RANDOM_MISSION)) { EnableIqSkill(monster->iq_skill_menu_flags.flags, IQ_ESCAPIST); EnableIqSkill(monster->iq_skill_flags.flags, IQ_ESCAPIST); diff --git a/src/dungeon_recruitment.c b/src/dungeon_recruitment.c index 70649bcd..49bba6e8 100644 --- a/src/dungeon_recruitment.c +++ b/src/dungeon_recruitment.c @@ -5,7 +5,7 @@ #include "dungeon_pokemon_attributes_1.h" #include "dungeon_recruitment.h" #include "dungeon_recruitment_2.h" -#include "dungeon_recruitment_3.h" +#include "has_played_old_game.h" #include "dg_random.h" #include "dungeon_visibility.h" #include "enums.h" diff --git a/src/dungeon_recruitment_3.c b/src/has_played_old_game.c similarity index 85% rename from src/dungeon_recruitment_3.c rename to src/has_played_old_game.c index 11d56961..28546d32 100644 --- a/src/dungeon_recruitment_3.c +++ b/src/has_played_old_game.c @@ -1,4 +1,4 @@ -#include "dungeon_recruitment_3.h" +#include "has_played_old_game.h" #include "enums.h" #include "script_variable.h" #include "util.h" diff --git a/src/main_0200EDC0.c b/src/main_0200EDC0.c index 386e82b0..6d9a614b 100644 --- a/src/main_0200EDC0.c +++ b/src/main_0200EDC0.c @@ -2,19 +2,18 @@ #include "item.h" #include "main_0204CB94.h" #include "main_020517D4.h" +#include "performance_progress.h" #include "script_variable.h" #include "special_episode.h" extern struct bag_items *BAG_ITEMS_PTR_MIRROR; -extern bool8 GetPerformanceFlagWithChecks(s32 flag_id); - s32 GetCurrentBagCapacity() { s32 special_episode_type = GetExecuteSpecialEpisodeType(); if (special_episode_type == EPISODE_NONE) { - if (GetPerformanceFlagWithChecks(2) == 0) + if (GetResolvedPerformanceProgressFlag(2) == 0) return 1; return GetBagCapacity(GetScenarioBalance()); diff --git a/src/performance_progress.c b/src/performance_progress.c new file mode 100644 index 00000000..31cfac86 --- /dev/null +++ b/src/performance_progress.c @@ -0,0 +1,57 @@ +#include "enums.h" +#include "performance_progress.h" +#include "script_variable.h" + +extern enum game_mode GetGameMode(); + +bool8 GetResolvedPerformanceProgressFlag(u32 idx) { + switch (idx) { + case 0: + if (LoadScriptVariableValueAtIndex(0, VAR_SCENARIO_MAIN, 0) == 0x35) { + return TRUE; + } else { + return FALSE; + } + case 3: + case 4: + case 5: + case 6: + case 7: + if (GetGameMode() == GAME_MODE_SPECIAL_EPISODE) { + return FALSE; + } + break; + case 1: + case 2: + if (GetGameMode() == GAME_MODE_SPECIAL_EPISODE) { + return TRUE; + } + break; + } + return LoadScriptVariableValueAtIndex(0, VAR_PERFORMANCE_PROGRESS_LIST, idx); +} + +void SetResolvedPerformanceProgressFlag(u32 idx, s32 value) { + switch (idx) { + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + if (GetGameMode() == GAME_MODE_SPECIAL_EPISODE) { + return; + } + default: + case 0: + s32 new_val; + if (value != 0) { + new_val = 1; + } else { + new_val = 0; + } + SaveScriptVariableValueAtIndex(0, VAR_PERFORMANCE_PROGRESS_LIST, idx, new_val); + return; + } +}