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

@@ -3,8 +3,7 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts::
.byte 0
CinnabarIsland_PokemonLab_Entrance_OnTransition::
compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
call_if_eq CinnabarIsland_PokemonLab_Entrance_EventScript_ReadyFossil
call_if_eq VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1, CinnabarIsland_PokemonLab_Entrance_EventScript_ReadyFossil
end
CinnabarIsland_PokemonLab_Entrance_EventScript_ReadyFossil::