diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-11 12:02:58 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-11 14:12:31 -0500 |
| commit | f2e7b1507e564ba3b6b027a17aeeec2f89fba8c8 (patch) | |
| tree | 3095eac19802846050824f93c8f81035f57f3f2f /data/maps/BattleFrontier_ScottsHouse | |
| parent | 8b1595ebc36a623240fa8dd509864f5400eed1f9 (diff) | |
Port some macro/script fixes from pokefirered
Diffstat (limited to 'data/maps/BattleFrontier_ScottsHouse')
| -rw-r--r-- | data/maps/BattleFrontier_ScottsHouse/scripts.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index 0f3663f1a..e4b0c28e9 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -32,7 +32,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckSilverSymbols:: @ 8263704 goto_if_unset FLAG_SYS_PIKE_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield goto_if_unset FLAG_SYS_PYRAMID_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield msgbox BattleFrontier_ScottsHouse_Text_YouveCollectedAllSilverSymbols, MSGBOX_DEFAULT - giveitem_std ITEM_LANSAT_BERRY + giveitem ITEM_LANSAT_BERRY compare VAR_RESULT, FALSE goto_if_eq BattleFrontier_ScottsHouse_EventScript_BerryPocketFull setflag FLAG_COLLECTED_ALL_SILVER_SYMBOLS @@ -49,7 +49,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckGoldSymbols:: @ 826376A goto_if_unset FLAG_SYS_PIKE_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield goto_if_unset FLAG_SYS_PYRAMID_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield msgbox BattleFrontier_ScottsHouse_Text_YouveCollectedAllGoldSymbols, MSGBOX_DEFAULT - giveitem_std ITEM_STARF_BERRY + giveitem ITEM_STARF_BERRY compare VAR_RESULT, FALSE goto_if_eq BattleFrontier_ScottsHouse_EventScript_BerryPocketFull setflag FLAG_COLLECTED_ALL_GOLD_SYMBOLS @@ -102,7 +102,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckGiveSilverShield:: @ 826381B BattleFrontier_ScottsHouse_EventScript_GiveSilverShield:: @ 826387A msgbox BattleFrontier_ScottsHouse_Text_Beat50TrainersInARow, MSGBOX_DEFAULT - givedecoration_std DECOR_SILVER_SHIELD + givedecoration DECOR_SILVER_SHIELD compare VAR_RESULT, FALSE goto_if_eq BattleFrontier_ScottsHouse_EventScript_NoRoomForShield setflag FLAG_RECEIVED_SILVER_SHIELD @@ -135,7 +135,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckGiveGoldShield:: @ 82638B4 BattleFrontier_ScottsHouse_EventScript_GiveGoldShield:: @ 8263913 msgbox BattleFrontier_ScottsHouse_Text_Beat100TrainersInARow, MSGBOX_DEFAULT - givedecoration_std DECOR_GOLD_SHIELD + givedecoration DECOR_GOLD_SHIELD compare VAR_RESULT, FALSE goto_if_eq BattleFrontier_ScottsHouse_EventScript_NoRoomForShield setflag FLAG_RECEIVED_GOLD_SHIELD |