Conflicts:
	ZAPD/Declaration.h
	ZAPD/Globals.cpp
	ZAPD/Globals.h
	ZAPD/Main.cpp
	ZAPD/OtherStructs/SkinLimbStructs.cpp
	ZAPD/OtherStructs/SkinLimbStructs.h
	ZAPD/ZAnimation.cpp
	ZAPD/ZCollision.cpp
	ZAPD/ZCollision.h
	ZAPD/ZDisplayList.cpp
	ZAPD/ZFile.cpp
	ZAPD/ZLimb.cpp
	ZAPD/ZLimb.h
	ZAPD/ZPath.cpp
	ZAPD/ZResource.h
	ZAPD/ZRoom/Commands/SetCsCamera.cpp
	ZAPD/ZRoom/Commands/SetCutsceneEntryList.cpp
	ZAPD/ZRoom/Commands/SetCutscenes.cpp
	ZAPD/ZRoom/Commands/SetCutscenes.h
	ZAPD/ZRoom/Commands/SetEntranceList.cpp
	ZAPD/ZRoom/Commands/SetLightingSettings.cpp
	ZAPD/ZRoom/Commands/SetMesh.cpp
	ZAPD/ZRoom/Commands/SetMinimapList.cpp
	ZAPD/ZTexture.cpp
	ZAPDUtils/Makefile
	ZAPDUtils/Utils/BitConverter.h
	ZAPDUtils/Utils/Directory.h
	ZAPDUtils/Utils/File.h
	ZAPDUtils/Utils/Path.h
	ZAPDUtils/Utils/StringHelper.h
	ZAPDUtils/ZAPDUtils.vcxproj

* JointKey -> LegacyJointKey

* CamData -> BgCamInfo

* TransformData -> CurveInterpKnot

* TransformUpdateIndex -> CurveAnimationHeader

* SkelCurveLimbList -> CurveSkeletonHeader

* LightSettings -> EnvLightSettings

* EntranceEntry -> Spawn

* PolygonDlist -> RoomShapeDListsEntry

* PolygonType0 -> RoomShapeNormal,
MeshHeader1Single -> RoomShapeImageSingle

* BgImage -> RoomShapeImageMultiBgEntry

* MeshHeader1Multi -> RoomShapeImageMulti
PolygonDlist2 -> RoomShapeCullableEntry

* PolygonType2 -> RoomShapeCullable

* SCENE_CMD_MESH -> SCENE_CMD_ROOM_SHAPE

* implement enum parsing + use NaviQuestHintFileId

* Struct_800A57C0 -> SkinVertex

* Struct_800A598C_2 -> SkinTransformation

* Struct_800A5E28 -> SkinAnimatedLimbData

* Struct_800A598C -> SkinLimbModif

* fix MM issues

* LinkAnimationHeader -> PlayerAnimationHeader (MM)

* CsCameraEntry -> ActorCsCamInfo (MM)

* remaining scene commands (MM)

* format

* removed useless comment

* name skinlimb members

* format

* fixed indentation

* Detects the right amount of entries but doesn't extract points.

* It works but its bad.

* Fixed something?

* Cleanups

* segptr_t

* Final fixes.

* Fixes.