From 04cc923d6c17edae778f14cb431991867a05cf65 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 15 Nov 2021 12:04:54 -0500 Subject: Handle optional arguments for warp commands, add WARP_ID_NONE --- data/maps/Route101/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route101') diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index a41bc2fcb..02071aad1 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -245,7 +245,7 @@ Route101_EventScript_BirchsBag:: call_if_eq Route101_EventScript_HideMayInBedroom compare VAR_RESULT, FEMALE call_if_eq Route101_EventScript_HideBrendanInBedroom - warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 + warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 6, 5 waitstate release end -- cgit v1.2.3 From e66ea0cb996c70093fe3f250cafb7f1f87e84d4d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 18 Nov 2021 23:06:30 -0500 Subject: Reformat compare + goto_if/call_if to single statements --- data/maps/Route101/scripts.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'data/maps/Route101') diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 02071aad1..dd0ef5dce 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -241,10 +241,8 @@ Route101_EventScript_BirchsBag:: setvar VAR_ROUTE101_STATE, 3 clearflag FLAG_HIDE_MAP_NAME_POPUP checkplayergender - compare VAR_RESULT, MALE - call_if_eq Route101_EventScript_HideMayInBedroom - compare VAR_RESULT, FEMALE - call_if_eq Route101_EventScript_HideBrendanInBedroom + call_if_eq VAR_RESULT, MALE, Route101_EventScript_HideMayInBedroom + call_if_eq VAR_RESULT, FEMALE, Route101_EventScript_HideBrendanInBedroom warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 6, 5 waitstate release -- cgit v1.2.3