Merge branch 'master' into movement-action

This commit is contained in:
cbt6
2022-08-15 12:54:47 +08:00
committed by GitHub
286 changed files with 8970 additions and 9432 deletions
@@ -13,8 +13,7 @@ PokemonLeague_LancesRoom_OnResume::
end
PokemonLeague_LancesRoom_OnLoad::
compare VAR_MAP_SCENE_POKEMON_LEAGUE, 4
call_if_eq PokemonLeague_LancesRoom_EventScript_CloseEntry
call_if_eq VAR_MAP_SCENE_POKEMON_LEAGUE, 4, PokemonLeague_LancesRoom_EventScript_CloseEntry
call_if_set FLAG_DEFEATED_LANCE, PokemonLeague_LancesRoom_EventScript_SetDoorOpen
end