From e19b9c9d467aa51c1ca550d2d9af4e3e9e5fd11e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 8 Nov 2019 03:07:19 -0500 Subject: Resolve Littleroot merge conflict --- data/maps/EverGrandeCity_HallOfFame/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps') diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 638e18eb5..53b6626a1 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -42,7 +42,7 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD delay 40 setvar VAR_TEMP_1, 1 - call EverGrandeCity_HallOfFame_EventScript_2717C1 + call EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags checkplayergender compare VAR_RESULT, MALE goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298E9 -- cgit v1.2.3