summaryrefslogtreecommitdiff
path: root/data/scripts/maps/Route123_BerryMastersHouse.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/Route123_BerryMastersHouse.inc')
-rw-r--r--data/scripts/maps/Route123_BerryMastersHouse.inc34
1 files changed, 17 insertions, 17 deletions
diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc
index eb5f9a10c..9e865ad6a 100644
--- a/data/scripts/maps/Route123_BerryMastersHouse.inc
+++ b/data/scripts/maps/Route123_BerryMastersHouse.inc
@@ -3,7 +3,7 @@ Route123_BerryMastersHouse_MapScripts:: @ 826F83B
.byte 0
Route123_BerryMastersHouse_MapScript1_26F841: @ 826F841
- setflag FLAG_0x8C3
+ setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE
end
Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845
@@ -17,7 +17,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845
addvar VAR_RESULT, 20
addvar VAR_RESULT, 133
giveitem_std VAR_RESULT
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
setflag FLAG_0x92D
msgbox Route123_BerryMastersHouse_Text_2A7428, 4
@@ -25,7 +25,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845
addvar VAR_RESULT, 20
addvar VAR_RESULT, 133
giveitem_std VAR_RESULT
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
msgbox Route123_BerryMastersHouse_Text_2A7445, 4
release
@@ -47,9 +47,9 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0
call Route123_BerryMastersHouse_EventScript_271E7C
lock
faceplayer
- compare_var_to_value VAR_RESULT, 1
+ compare VAR_RESULT, 1
goto_eq Route123_BerryMastersHouse_EventScript_26F909
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_26F8F7
end
@@ -60,17 +60,17 @@ Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7
end
Route123_BerryMastersHouse_EventScript_26F909:: @ 826F909
- compare_var_to_value VAR_0x8004, 0
+ compare VAR_0x8004, 0
goto_eq Route123_BerryMastersHouse_EventScript_26F94C
- compare_var_to_value VAR_0x8004, 1
+ compare VAR_0x8004, 1
goto_eq Route123_BerryMastersHouse_EventScript_26F97A
- compare_var_to_value VAR_0x8004, 2
+ compare VAR_0x8004, 2
goto_eq Route123_BerryMastersHouse_EventScript_26F9AB
- compare_var_to_value VAR_0x8004, 3
+ compare VAR_0x8004, 3
goto_eq Route123_BerryMastersHouse_EventScript_26F9DC
- compare_var_to_value VAR_0x8004, 4
+ compare VAR_0x8004, 4
goto_eq Route123_BerryMastersHouse_EventScript_26FA0D
- compare_var_to_value VAR_0x8004, 5
+ compare VAR_0x8004, 5
goto_eq Route123_BerryMastersHouse_EventScript_26FA3E
end
@@ -79,7 +79,7 @@ Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C
random 10
addvar VAR_RESULT, 133
giveitem_std VAR_RESULT
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
goto Route123_BerryMastersHouse_EventScript_26FA79
release
@@ -90,7 +90,7 @@ Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A
goto_eq Route123_BerryMastersHouse_EventScript_26F94C
msgbox Route123_BerryMastersHouse_Text_2A7583, 4
giveitem_std ITEM_SPELON_BERRY
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
setflag FLAG_0x0F8
goto Route123_BerryMastersHouse_EventScript_26FA79
@@ -101,7 +101,7 @@ Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB
goto_eq Route123_BerryMastersHouse_EventScript_26F94C
msgbox Route123_BerryMastersHouse_Text_2A7583, 4
giveitem_std ITEM_PAMTRE_BERRY
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
setflag FLAG_0x0F9
goto Route123_BerryMastersHouse_EventScript_26FA79
@@ -112,7 +112,7 @@ Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC
goto_eq Route123_BerryMastersHouse_EventScript_26F94C
msgbox Route123_BerryMastersHouse_Text_2A7583, 4
giveitem_std ITEM_WATMEL_BERRY
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
setflag FLAG_0x0FA
goto Route123_BerryMastersHouse_EventScript_26FA79
@@ -123,7 +123,7 @@ Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D
goto_eq Route123_BerryMastersHouse_EventScript_26F94C
msgbox Route123_BerryMastersHouse_Text_2A7583, 4
giveitem_std ITEM_DURIN_BERRY
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
setflag FLAG_0x0FB
goto Route123_BerryMastersHouse_EventScript_26FA79
@@ -134,7 +134,7 @@ Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E
goto_eq Route123_BerryMastersHouse_EventScript_26F94C
msgbox Route123_BerryMastersHouse_Text_2A7583, 4
giveitem_std ITEM_BELUE_BERRY
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq Route123_BerryMastersHouse_EventScript_272054
setflag FLAG_0x0FC
goto Route123_BerryMastersHouse_EventScript_26FA79