Merge branch 'master' into clone-union

This commit is contained in:
GriffinR
2022-08-17 15:41:50 -04:00
committed by GitHub
322 changed files with 12564 additions and 12748 deletions
@@ -12,8 +12,7 @@ PokemonLeague_AgathasRoom_OnResume::
PokemonLeague_AgathasRoom_OnLoad::
call_if_set FLAG_DEFEATED_AGATHA, PokemonLeague_AgathasRoom_EventScript_SetDoorOpen
compare VAR_MAP_SCENE_POKEMON_LEAGUE, 3
call_if_eq PokemonLeague_AgathasRoom_EventScript_CloseEntry
call_if_eq VAR_MAP_SCENE_POKEMON_LEAGUE, 3, PokemonLeague_AgathasRoom_EventScript_CloseEntry
end
PokemonLeague_AgathasRoom_EventScript_CloseEntry::