diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-02 11:50:07 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-11-02 16:32:58 -0500 |
| commit | a90b828bb8838f4500a4d91899bce2bc946e847b (patch) | |
| tree | d385d905d65e4cf3303144f7472cb1e798352cfe | |
| parent | e4fe21786e79be877dc2c183204c7f8c0a9a158e (diff) | |
Use YES/NO constants
| -rw-r--r-- | data/maps/FallarborTown_CozmosHouse/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/MauvilleCity_BikeShop/scripts.inc | 12 | ||||
| -rw-r--r-- | data/maps/Route104_MrBrineysHouse/scripts.inc | 6 | ||||
| -rw-r--r-- | data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/FallarborTown_CozmosHouse/scripts.inc b/data/maps/FallarborTown_CozmosHouse/scripts.inc index 310cc7200..224147bc5 100644 --- a/data/maps/FallarborTown_CozmosHouse/scripts.inc +++ b/data/maps/FallarborTown_CozmosHouse/scripts.inc @@ -15,7 +15,7 @@ FallarborTown_CozmosHouse_EventScript_ProfCozmo:: @ 8200F13 FallarborTown_CozmosHouse_EventScript_PlayerHasMeteorite:: @ 8200F38 call_if_unset FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_NoticeMeteorite call_if_set FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_AskForMeteorite - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq FallarborTown_CozmosHouse_EventScript_DeclineGiveMeteorite msgbox FallarborTown_CozmosHouse_Text_PleaseUseThisTM, MSGBOX_DEFAULT giveitem_std ITEM_TM27 diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc index f1444e20d..4b0372eac 100644 --- a/data/maps/MauvilleCity_BikeShop/scripts.inc +++ b/data/maps/MauvilleCity_BikeShop/scripts.inc @@ -8,17 +8,17 @@ MauvilleCity_BikeShop_EventScript_Rydel:: @ 820EBBC goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_SkipGreeting msgbox MauvilleCity_BikeShop_Text_RydelGreeting, MSGBOX_DEFAULT msgbox MauvilleCity_BikeShop_Text_DidYouComeFromFarAway, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq MauvilleCity_BikeShop_EventScript_YesFar - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MauvilleCity_BikeShop_EventScript_NotFar end MauvilleCity_BikeShop_EventScript_SkipGreeting:: @ 820EBF7 msgbox MauvilleCity_BikeShop_Text_DidYouComeFromFarAway, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq MauvilleCity_BikeShop_EventScript_YesFar - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MauvilleCity_BikeShop_EventScript_NotFar end @@ -62,9 +62,9 @@ MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes:: @ 820EC87 MauvilleCity_BikeShop_EventScript_AskSwitchBikes:: @ 820EC94 msgbox MauvilleCity_BikeShop_Text_WantToSwitchBikes, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq MauvilleCity_BikeShop_EventScript_SwitchBikes - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MauvilleCity_BikeShop_EventScript_KeepBike end diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index 50cc3dd7e..1c61d3be3 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -33,7 +33,7 @@ Route104_MrBrineysHouse_EventScript_SailingIntro:: @ 8229D8A setflag FLAG_MR_BRINEY_SAILING_INTRO msgbox Route104_MrBrineysHouse_Text_WaitUpPeeko, MSGBOX_DEFAULT msgbox Route104_MrBrineysHouse_Text_ItsYouLetsSailToDewford, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing goto Route104_MrBrineysHouse_EventScript_SailToDewford end @@ -50,14 +50,14 @@ Route104_MrBrineysHouse_EventScript_WhereAreWeBound:: @ 8229DAE Route104_MrBrineysHouse_EventScript_SailBothDeliveries:: @ 8229DE1 msgbox Route104_MrBrineysHouse_Text_NeedToMakeDeliveriesSailToDewford, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing goto Route104_MrBrineysHouse_EventScript_SailToDewford end Route104_MrBrineysHouse_EventScript_SailDeliverPackage:: @ 8229DFA msgbox Route104_MrBrineysHouse_Text_NeedToDeliverPackageSailToDewford, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing goto Route104_MrBrineysHouse_EventScript_SailToDewford end diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc index c605c7df8..b2c00c1cc 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -246,7 +246,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard:: @ 8270EC0 bufferitemname 0, VAR_0x8008 bufferitemname 1, VAR_0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_YoullTradeShardForStone, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade checkitemspace VAR_0x8009, 1 compare VAR_RESULT, TRUE @@ -265,7 +265,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_TradeShard:: @ 8270F01 compare VAR_TEMP_1, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_EndTrade msgbox Route124_DivingTreasureHuntersHouse_Text_TradeSomethingElse, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_ShowTradeOptions goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade end |