From a1ea3b5e394bc115ba9b86348c161094a00dcca7 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 26 Dec 2018 12:20:15 -0600 Subject: Use map_header_flags macro (#483) --- data/maps/Route101/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route101') diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index 64836245f..5a98f7e22 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -10,6 +10,6 @@ Route101: @ 8482678 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL -- cgit v1.2.3 From 6d556f8cf77a21b20cdad75de69eaf61a59cf54e Mon Sep 17 00:00:00 2001 From: Melody Date: Mon, 24 Dec 2018 21:22:56 -0500 Subject: improve checkplayergender calls clean up constant definitions make tweaks from review --- data/maps/Route101/scripts.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route101') diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index deea27e74..e7f5f0af6 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -238,9 +238,9 @@ Route101_EventScript_1EBE16:: @ 81EBE16 setvar VAR_0x4060, 3 clearflag FLAG_SPECIAL_FLAG_0x4000 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq Route101_EventScript_1EBE85 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq Route101_EventScript_1EBE89 warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate -- cgit v1.2.3