dionmoustos/Pokemon-Firered
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into clone-union

Browse Source
This commit is contained in:
GriffinR authored and GitHub committed 2022-08-17 15:41:50 -04:00
2 parents 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 files changed
+12564 -12748
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/maps/PokemonLeague_LancesRoom/scripts.inc
+3 -4
View File
@@ -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
@@ -159,10 +158,10 @@ PokemonLeague_LancesRoom_EventScript_LanceMoveOutOfWayRight::
PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayLeft::
walk_left
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayRight::
walk_right
walk_in_place_fastest_left
walk_in_place_faster_left
step_end