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

@@ -8,8 +8,7 @@ IndigoPlateau_PokemonCenter_1F_MapScripts::
IndigoPlateau_PokemonCenter_1F_OnTransition::
setrespawn SPAWN_INDIGO_PLATEAU
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare VAR_RESULT, TRUE
call_if_eq IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor
call_if_eq VAR_RESULT, TRUE, IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor
end
IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor::
@@ -21,8 +20,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard::
lock
faceplayer
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare VAR_RESULT, TRUE
goto_if_eq IndigoPlateau_PokemonCenter_1F_EventScript_CheckSeviiIslandComplete
goto_if_eq VAR_RESULT, TRUE, IndigoPlateau_PokemonCenter_1F_EventScript_CheckSeviiIslandComplete
msgbox IndigoPlateau_PokemonCenter_1F_Text_FaceEliteFourGoodLuck
release
end