diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-28 22:14:47 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-28 22:14:47 -0500 |
| commit | 9d2ee97519aa8ee3c5e5c0d11f49f5a77e4f870e (patch) | |
| tree | 763431b9969206b11c5c42c7154c19ad5d21f421 /data/scripts/maps/Route120.inc | |
| parent | 857b166086756ccc92e58981493513a7f00920ff (diff) | |
| parent | 86a36767dba19e84297047addf1d1d776e2efdec (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'data/scripts/maps/Route120.inc')
| -rw-r--r-- | data/scripts/maps/Route120.inc | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index cd84f95af..9e5ff95be 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -10,17 +10,17 @@ Route120_MapScript1_15161E:: @ 815161E end Route120_EventScript_151628:: @ 8151628 - compare 0x8004, 0 + compare VAR_SPECIAL_4, 0 call_if 1, Route120_EventScript_15166B - compare 0x8004, 1 + compare VAR_SPECIAL_4, 1 call_if 1, Route120_EventScript_151672 - compare 0x8004, 2 + compare VAR_SPECIAL_4, 2 call_if 1, Route120_EventScript_151676 - compare 0x8004, 3 + compare VAR_SPECIAL_4, 3 call_if 1, Route120_EventScript_15167A - compare 0x8004, 4 + compare VAR_SPECIAL_4, 4 call_if 1, Route120_EventScript_15167E - compare 0x8004, 5 + compare VAR_SPECIAL_4, 5 call_if 1, Route120_EventScript_151682 return @@ -80,12 +80,12 @@ Route120_MapScript1_1516DF:: @ 81516DF end Route120_EventScript_1516EA:: @ 81516EA - getplayerxy 0x4000, 0x4001 - compare 0x4001, 14 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 14 goto_if 3, Route120_EventScript_151715 - compare 0x4001, 60 + compare VAR_TEMP_1, 60 goto_if 3, Route120_EventScript_151719 - compare 0x4001, 61 + compare VAR_TEMP_1, 61 goto_if 4, Route120_EventScript_151711 return @@ -98,9 +98,9 @@ Route120_EventScript_151715:: @ 8151715 return Route120_EventScript_151719:: @ 8151719 - compare 0x4000, 7 + compare VAR_TEMP_0, 7 goto_if 3, Route120_EventScript_151735 - compare 0x4000, 19 + compare VAR_TEMP_0, 19 goto_if 3, Route120_EventScript_151715 goto Route120_EventScript_151735 end @@ -135,32 +135,32 @@ Route120_EventScript_151739:: @ 8151739 end Route120_EventScript_1517DC:: @ 81517DC - setvar 0x8004, ITEM_FIGY_BERRY + setvar VAR_SPECIAL_4, ITEM_FIGY_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517E7:: @ 81517E7 - setvar 0x8004, ITEM_WIKI_BERRY + setvar VAR_SPECIAL_4, ITEM_WIKI_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517F2:: @ 81517F2 - setvar 0x8004, ITEM_MAGO_BERRY + setvar VAR_SPECIAL_4, ITEM_MAGO_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517FD:: @ 81517FD - setvar 0x8004, ITEM_AGUAV_BERRY + setvar VAR_SPECIAL_4, ITEM_AGUAV_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151808:: @ 8151808 - setvar 0x8004, ITEM_IAPAPA_BERRY + setvar VAR_SPECIAL_4, ITEM_IAPAPA_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151813:: @ 8151813 - giveitem_std 0x8004 + giveitem_std VAR_SPECIAL_4 compare RESULT, 0 goto_if_eq Route120_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 @@ -226,7 +226,7 @@ Route120_EventScript_15189D:: @ 815189D delay 40 waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - setvar 0x8004, 0 + setvar VAR_SPECIAL_4, 0 setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE |