From 4b5ad9de049a63b101b2bf5f2f2cb92beb26e5fb Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 22 Dec 2017 12:36:12 -0600 Subject: Name and use temp var constants --- data/scripts/maps/Route101.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/maps/Route101.inc') diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 1810a6495..f03d7cc62 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -12,7 +12,7 @@ Route101_MapScript2_14E935:: @ 814E935 .2byte 0 Route101_EventScript_14E93F:: @ 814E93F - setflag 0x4000 + setflag FLAG_SPECIAL_FLAG_0 setvar 0x4060, 1 end @@ -235,7 +235,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F setflag FLAG_HIDE_BIRCH_STARTERS_BAG setvar 0x4084, 2 setvar 0x4060, 3 - clearflag 0x4000 + clearflag FLAG_SPECIAL_FLAG_0 warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate release -- cgit v1.2.3 From 51247c3eb9dc1f8ecf4298ada62ed7c2f768b50e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 23 Dec 2017 10:41:27 -0600 Subject: Name and use general purpose vars --- data/scripts/maps/Route101.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data/scripts/maps/Route101.inc') diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index f03d7cc62..6749f2136 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -8,12 +8,12 @@ Route101_MapScript1_14E92F:: @ 814E92F end Route101_MapScript2_14E935:: @ 814E935 - map_script_2 0x4060, 0, Route101_EventScript_14E93F + map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_14E93F .2byte 0 Route101_EventScript_14E93F:: @ 814E93F setflag FLAG_SPECIAL_FLAG_0 - setvar 0x4060, 1 + setvar VAR_ROUTE101_STATE, 1 end Route101_EventScript_14E948:: @ 814E948 @@ -37,7 +37,7 @@ Route101_EventScript_14E948:: @ 814E948 waitmovement 0 msgbox Route101_Text_16D119, 4 closemessage - setvar 0x4060, 2 + setvar VAR_ROUTE101_STATE, 2 releaseall end @@ -233,8 +233,8 @@ Route101_EventScript_14EA7F:: @ 814EA7F setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA clearflag FLAG_HIDE_BIRCH_IN_LAB setflag FLAG_HIDE_BIRCH_STARTERS_BAG - setvar 0x4084, 2 - setvar 0x4060, 3 + setvar VAR_BIRCH_LAB_STATE, 2 + setvar VAR_ROUTE101_STATE, 3 clearflag FLAG_SPECIAL_FLAG_0 warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate -- cgit v1.2.3