Resolve Littleroot merge conflict

This commit is contained in:
GriffinR committed 2019-11-08 03:07:19 -05:00
1 parent bef24a45f0
commit e19b9c9d46
7 files changed
+60 -61

No files matched your search

@@ -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