diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
| commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
| tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /data/scripts/maps/DesertRuins.inc | |
| parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'data/scripts/maps/DesertRuins.inc')
| -rw-r--r-- | data/scripts/maps/DesertRuins.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index bb2f6d23d..9137902f2 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -11,7 +11,7 @@ DesertRuins_MapScript1_22D96B: @ 822D96B DesertRuins_EventScript_22D975:: @ 822D975 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, DesertRuins_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -31,7 +31,7 @@ DesertRuins_EventScript_22D993:: @ 822D993 return DesertRuins_MapScript1_22D9CA: @ 822D9CA - setflag FLAG_0x8B6 + setflag FLAG_LANDMARK_DESERT_RUINS checkflag FLAG_0x1BB call_if 0, DesertRuins_EventScript_22D9D7 end @@ -72,15 +72,15 @@ DesertRuins_EventScript_22DA02:: @ 822DA02 waitmoncry setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0A74 + special StartRegiBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq DesertRuins_EventScript_22DA49 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq DesertRuins_EventScript_22DA52 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq DesertRuins_EventScript_22DA52 setflag FLAG_0x1BB release |