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/NavelRock_Bottom.inc | |
| parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'data/scripts/maps/NavelRock_Bottom.inc')
| -rw-r--r-- | data/scripts/maps/NavelRock_Bottom.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/scripts/maps/NavelRock_Bottom.inc b/data/scripts/maps/NavelRock_Bottom.inc index 055697d23..dc99ec7f7 100644 --- a/data/scripts/maps/NavelRock_Bottom.inc +++ b/data/scripts/maps/NavelRock_Bottom.inc @@ -27,7 +27,7 @@ NavelRock_Bottom_MapScript1_269284: @ 8269284 NavelRock_Bottom_EventScript_26928E:: @ 826928E specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, NavelRock_Bottom_EventScript_27374E removeobject 1 return @@ -61,15 +61,15 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2 setvar VAR_0x8006, 0 special DoScriptedWildBattle setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle 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 NavelRock_Bottom_EventScript_269336 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq NavelRock_Bottom_EventScript_269344 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq NavelRock_Bottom_EventScript_269344 setflag FLAG_0x091 release |