dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve Littleroot merge conflict

Browse Source
This commit is contained in:
GriffinR
2019-11-08 03:07:19 -05:00
parent bef24a45f0
commit e19b9c9d46
7 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/EverGrandeCity_HallOfFame/scripts.inc
View File

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