diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-08 03:07:19 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-11-08 03:07:19 -0500 |
| commit | e19b9c9d467aa51c1ca550d2d9af4e3e9e5fd11e (patch) | |
| tree | 52fa8c6866b4a4fa745ef74b11490b1efe29dd17 /data/maps | |
| parent | bef24a45f0249ba867a5a11f34e04c35c64cd9fa (diff) | |
Resolve Littleroot merge conflict
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/EverGrandeCity_HallOfFame/scripts.inc | 2 |
1 files changed, 1 insertions, 1 deletions
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 |