Merge branch 'master' into clone-union

This commit is contained in:
GriffinR authored and GitHub committed 2022-08-17 15:41:50 -04:00
commit ab56ac41a1
322 files changed
+12564 -12748

No files matched your search

@@ -13,8 +13,7 @@ PokemonLeague_LoreleisRoom_OnResume::
PokemonLeague_LoreleisRoom_OnLoad::
call_if_set FLAG_DEFEATED_LORELEI, PokemonLeague_LoreleisRoom_EventScript_SetDoorOpen
compare VAR_MAP_SCENE_POKEMON_LEAGUE, 1
call_if_eq PokemonLeague_LoreleisRoom_EventScript_CloseEntry
call_if_eq VAR_MAP_SCENE_POKEMON_LEAGUE, 1, PokemonLeague_LoreleisRoom_EventScript_CloseEntry
end
PokemonLeague_LoreleisRoom_EventScript_CloseEntry::