dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Use YES/NO constants

Browse Source
This commit is contained in:
GriffinR
2019-11-02 11:50:07 -04:00
committed by huderlem
parent e4fe21786e
commit a90b828bb8
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/FallarborTown_CozmosHouse/scripts.inc
View File

@@ -15,7 +15,7 @@ FallarborTown_CozmosHouse_EventScript_ProfCozmo:: @ 8200F13
FallarborTown_CozmosHouse_EventScript_PlayerHasMeteorite:: @ 8200F38 FallarborTown_CozmosHouse_EventScript_PlayerHasMeteorite:: @ 8200F38
call_if_unset FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_NoticeMeteorite call_if_unset FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_NoticeMeteorite
call_if_set FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_AskForMeteorite 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 goto_if_eq FallarborTown_CozmosHouse_EventScript_DeclineGiveMeteorite
msgbox FallarborTown_CozmosHouse_Text_PleaseUseThisTM, MSGBOX_DEFAULT msgbox FallarborTown_CozmosHouse_Text_PleaseUseThisTM, MSGBOX_DEFAULT
giveitem_std ITEM_TM27 giveitem_std ITEM_TM27

12
data/maps/MauvilleCity_BikeShop/scripts.inc
View File

@@ -8,17 +8,17 @@ MauvilleCity_BikeShop_EventScript_Rydel:: @ 820EBBC
goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_SkipGreeting goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_SkipGreeting
msgbox MauvilleCity_BikeShop_Text_RydelGreeting, MSGBOX_DEFAULT msgbox MauvilleCity_BikeShop_Text_RydelGreeting, MSGBOX_DEFAULT
msgbox MauvilleCity_BikeShop_Text_DidYouComeFromFarAway, MSGBOX_YESNO msgbox MauvilleCity_BikeShop_Text_DidYouComeFromFarAway, MSGBOX_YESNO
compare VAR_RESULT, 1 compare VAR_RESULT, YES
goto_if_eq MauvilleCity_BikeShop_EventScript_YesFar goto_if_eq MauvilleCity_BikeShop_EventScript_YesFar
compare VAR_RESULT, 0 compare VAR_RESULT, NO
goto_if_eq MauvilleCity_BikeShop_EventScript_NotFar goto_if_eq MauvilleCity_BikeShop_EventScript_NotFar
end end
MauvilleCity_BikeShop_EventScript_SkipGreeting:: @ 820EBF7 MauvilleCity_BikeShop_EventScript_SkipGreeting:: @ 820EBF7
msgbox MauvilleCity_BikeShop_Text_DidYouComeFromFarAway, MSGBOX_YESNO msgbox MauvilleCity_BikeShop_Text_DidYouComeFromFarAway, MSGBOX_YESNO
compare VAR_RESULT, 1 compare VAR_RESULT, YES
goto_if_eq MauvilleCity_BikeShop_EventScript_YesFar goto_if_eq MauvilleCity_BikeShop_EventScript_YesFar
compare VAR_RESULT, 0 compare VAR_RESULT, NO
goto_if_eq MauvilleCity_BikeShop_EventScript_NotFar goto_if_eq MauvilleCity_BikeShop_EventScript_NotFar
end end
@@ -62,9 +62,9 @@ MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes:: @ 820EC87
MauvilleCity_BikeShop_EventScript_AskSwitchBikes:: @ 820EC94 MauvilleCity_BikeShop_EventScript_AskSwitchBikes:: @ 820EC94
msgbox MauvilleCity_BikeShop_Text_WantToSwitchBikes, MSGBOX_YESNO msgbox MauvilleCity_BikeShop_Text_WantToSwitchBikes, MSGBOX_YESNO
compare VAR_RESULT, 1 compare VAR_RESULT, YES
goto_if_eq MauvilleCity_BikeShop_EventScript_SwitchBikes goto_if_eq MauvilleCity_BikeShop_EventScript_SwitchBikes
compare VAR_RESULT, 0 compare VAR_RESULT, NO
goto_if_eq MauvilleCity_BikeShop_EventScript_KeepBike goto_if_eq MauvilleCity_BikeShop_EventScript_KeepBike
end end

6
data/maps/Route104_MrBrineysHouse/scripts.inc
View File

@@ -33,7 +33,7 @@ Route104_MrBrineysHouse_EventScript_SailingIntro:: @ 8229D8A
setflag FLAG_MR_BRINEY_SAILING_INTRO setflag FLAG_MR_BRINEY_SAILING_INTRO
msgbox Route104_MrBrineysHouse_Text_WaitUpPeeko, MSGBOX_DEFAULT msgbox Route104_MrBrineysHouse_Text_WaitUpPeeko, MSGBOX_DEFAULT
msgbox Route104_MrBrineysHouse_Text_ItsYouLetsSailToDewford, MSGBOX_YESNO msgbox Route104_MrBrineysHouse_Text_ItsYouLetsSailToDewford, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, NO
goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing
goto Route104_MrBrineysHouse_EventScript_SailToDewford goto Route104_MrBrineysHouse_EventScript_SailToDewford
end end
@@ -50,14 +50,14 @@ Route104_MrBrineysHouse_EventScript_WhereAreWeBound:: @ 8229DAE
Route104_MrBrineysHouse_EventScript_SailBothDeliveries:: @ 8229DE1 Route104_MrBrineysHouse_EventScript_SailBothDeliveries:: @ 8229DE1
msgbox Route104_MrBrineysHouse_Text_NeedToMakeDeliveriesSailToDewford, MSGBOX_YESNO msgbox Route104_MrBrineysHouse_Text_NeedToMakeDeliveriesSailToDewford, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, NO
goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing
goto Route104_MrBrineysHouse_EventScript_SailToDewford goto Route104_MrBrineysHouse_EventScript_SailToDewford
end end
Route104_MrBrineysHouse_EventScript_SailDeliverPackage:: @ 8229DFA Route104_MrBrineysHouse_EventScript_SailDeliverPackage:: @ 8229DFA
msgbox Route104_MrBrineysHouse_Text_NeedToDeliverPackageSailToDewford, MSGBOX_YESNO msgbox Route104_MrBrineysHouse_Text_NeedToDeliverPackageSailToDewford, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, NO
goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing
goto Route104_MrBrineysHouse_EventScript_SailToDewford goto Route104_MrBrineysHouse_EventScript_SailToDewford
end end

4
data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
View File

@@ -246,7 +246,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard:: @ 8270EC0
bufferitemname 0, VAR_0x8008 bufferitemname 0, VAR_0x8008
bufferitemname 1, VAR_0x8009 bufferitemname 1, VAR_0x8009
msgbox Route124_DivingTreasureHuntersHouse_Text_YoullTradeShardForStone, MSGBOX_YESNO msgbox Route124_DivingTreasureHuntersHouse_Text_YoullTradeShardForStone, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, NO
goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
checkitemspace VAR_0x8009, 1 checkitemspace VAR_0x8009, 1
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
@@ -265,7 +265,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_TradeShard:: @ 8270F01
compare VAR_TEMP_1, 0 compare VAR_TEMP_1, 0
goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_EndTrade goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_EndTrade
msgbox Route124_DivingTreasureHuntersHouse_Text_TradeSomethingElse, MSGBOX_YESNO msgbox Route124_DivingTreasureHuntersHouse_Text_TradeSomethingElse, MSGBOX_YESNO
compare VAR_RESULT, 1 compare VAR_RESULT, YES
goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_ShowTradeOptions goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_ShowTradeOptions
goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
end end