diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-06 12:28:12 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-06 12:28:12 -0600 |
| commit | 680d3fd7b980578024226eccffe2e01072826227 (patch) | |
| tree | 45bd58a6df683e25685a2a6bd9ff2d4c5116dcf5 /data/scripts/maps/DesertRuins.inc | |
| parent | b3551bc2f328c286c6ecc45ea288665d46b44260 (diff) | |
| parent | 7bf330e9f2b048a9b3d7882c80c9aa413c55484a (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'data/scripts/maps/DesertRuins.inc')
| -rw-r--r-- | data/scripts/maps/DesertRuins.inc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 7aa56a82d..2627a8261 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -5,8 +5,7 @@ DesertRuins_MapScripts:: @ 815CAF3 .byte 0 DesertRuins_MapScript1_15CB03:: @ 815CB03 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, DesertRuins_EventScript_15CB0D + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, DesertRuins_EventScript_15CB0D end DesertRuins_EventScript_15CB0D:: @ 815CB0D @@ -14,8 +13,7 @@ DesertRuins_EventScript_15CB0D:: @ 815CB0D return DesertRuins_MapScript1_15CB11:: @ 815CB11 - checkflag FLAG_SYS_BRAILLE_STRENGTH - call_if 0, DesertRuins_EventScript_15CB1B + call_if_unset FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_15CB1B end DesertRuins_EventScript_15CB1B:: @ 815CB1B @@ -33,8 +31,7 @@ DesertRuins_MapScript1_15CB52:: @ 815CB52 DesertRuins_EventScript_15CB56:: @ 815CB56 lockall - checkflag FLAG_SYS_BRAILLE_STRENGTH - goto_if_eq DesertRuins_EventScript_15CB6D + goto_if_set FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_15CB6D braillemessage DesertRuins_Braille_1C54C8 waitbuttonpress erasebox 0, 0, 29, 19 |