@@ -1403,7 +1403,7 @@ TEST_CLASS(TriggerConditionViewModel_Tests)
14031403 L" 2: 0x00000302 & 0x000001ff -> 0x00000102\r\n "
14041404 L" 3: 0x00000102 * 0x00000002 -> 0x00000204\r\n "
14051405 L" 4: 0x00000204 + 0x00000004 -> 0x00000208" ),
1406- pCondition5->GetTooltip (TriggerConditionViewModel::TargetTypeProperty));
1406+ pCondition5->GetTooltip (TriggerConditionViewModel::TargetTypeProperty));
14071407 Assert::AreEqual (std::wstring (L" " ), pCondition5->GetTooltip (TriggerConditionViewModel::TargetValueProperty));
14081408
14091409 // $0010 = 0x0000 + 0x04 + 0x0208 = 0x020c
@@ -1565,6 +1565,34 @@ TEST_CLASS(TriggerConditionViewModel_Tests)
15651565 Assert::AreEqual (std::wstring (L" 6" ), pCondition10->GetTooltip (TriggerConditionViewModel::TargetValueProperty));
15661566 }
15671567
1568+ TEST_METHOD (TestTooltipRecallInvalid)
1569+ {
1570+ IndirectAddressTriggerViewModelHarness vmTrigger;
1571+ vmTrigger.mockGameContext .InitializeCodeNotes ();
1572+ vmTrigger.Parse (" A:{recall}_0xH0000=1" );
1573+ vmTrigger.mockConfiguration .SetFeatureEnabled (ra::services::Feature::PreferDecimal, true );
1574+
1575+ const auto * pCondition1 = vmTrigger.Conditions ().GetItemAt (0 );
1576+ Expects (pCondition1 != nullptr );
1577+
1578+ // there is no Remember condition to point to
1579+ Assert::AreEqual (std::wstring (L" 0x00000000 (recall)\r\n [invalid recall]" ), pCondition1->GetTooltip (TriggerConditionViewModel::SourceTypeProperty));
1580+ }
1581+
1582+ TEST_METHOD (TestTooltipRecallInvalidInPauseIf)
1583+ {
1584+ IndirectAddressTriggerViewModelHarness vmTrigger;
1585+ vmTrigger.mockGameContext .InitializeCodeNotes ();
1586+ vmTrigger.Parse (" K:0xH0001*2_1=1_N:{recall}!=0_P:0xH0000=1" );
1587+ vmTrigger.mockConfiguration .SetFeatureEnabled (ra::services::Feature::PreferDecimal, true );
1588+
1589+ const auto * pCondition3 = vmTrigger.Conditions ().GetItemAt (2 );
1590+ Expects (pCondition3 != nullptr );
1591+
1592+ // there is a Remember condition to point to, but it won't be processed until after this condition
1593+ Assert::AreEqual (std::wstring (L" 0x00000000 (recall)\r\n [invalid recall]" ), pCondition3->GetTooltip (TriggerConditionViewModel::SourceTypeProperty));
1594+ }
1595+
15681596 TEST_METHOD (TestIsModifying)
15691597 {
15701598 TriggerConditionViewModelHarness condition;
0 commit comments