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/AncientTomb.inc | |
| parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'data/scripts/maps/AncientTomb.inc')
| -rw-r--r-- | data/scripts/maps/AncientTomb.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 85a1d708d..3cd0b9eff 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -11,13 +11,13 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3 AncientTomb_EventScript_238FCD:: @ 8238FCD specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, AncientTomb_EventScript_27374E removeobject VAR_LAST_TALKED return AncientTomb_MapScript1_238FE1: @ 8238FE1 - setflag FLAG_0x8B9 + setflag FLAG_LANDMARK_ANCIENT_TOMB checkflag FLAG_0x1BD call_if 0, AncientTomb_EventScript_238FEE end @@ -72,15 +72,15 @@ AncientTomb_EventScript_23905A:: @ 823905A waitmoncry setwildbattle SPECIES_REGISTEEL, 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 AncientTomb_EventScript_2390A1 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq AncientTomb_EventScript_2390AA - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq AncientTomb_EventScript_2390AA setflag FLAG_0x1BD release |