Update ZAPD (#1569)

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "094e79734"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "094e79734"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

* Add EnumData.xml where some names are now externalized

* Remove legacy typedefs for zapd, no longer needed!

8 files changed, 0 insertions, 90 deletions

diff --git a/include/z64animation_legacy.h b/include/z64animation_legacy.h
index f5f68bfc8..f4c222a5c 100644
--- a/include/z64animation_legacy.h
+++ b/include/z64animation_legacy.h
@@ -21,10 +21,6 @@ typedef struct {
     /* 0x0A */ s16 z;
 } LegacyJointKey; // size = 0x0C
 
-// ZAPD compatibility typedefs
-// TODO: Remove when ZAPD adds support for them
-typedef LegacyJointKey JointKey;
-
 typedef struct {
     /* 0x00 */ s16 frameCount;
     /* 0x02 */ s16 limbCount;
diff --git a/include/z64bgcheck.h b/include/z64bgcheck.h
index 2396b9ccb..9ff85c55e 100644
--- a/include/z64bgcheck.h
+++ b/include/z64bgcheck.h
@@ -72,10 +72,6 @@ typedef struct {
     /* 0x4 */ Vec3s* bgCamFuncData; // s16 data grouped in threes (ex. Vec3s), is usually of type `BgCamFuncData`, but can be a list of points of type `Vec3s` for crawlspaces
 } BgCamInfo; // size = 0x8
 
-// ZAPD compatibility typedefs
-// TODO: Remove when ZAPD adds support for them
-typedef BgCamInfo CamData;
-
 // The structure used for all instances of s16 data from `BgCamInfo` with the exception of crawlspaces.
 // See `Camera_Subj4` for Vec3s data usage in crawlspaces
 typedef struct {
diff --git a/include/z64curve.h b/include/z64curve.h
index 1864f2116..b150302e9 100644
--- a/include/z64curve.h
+++ b/include/z64curve.h
@@ -59,10 +59,4 @@ s32 SkelCurve_Update(struct PlayState* play, SkelCurve* skelCurve);
 void SkelCurve_Draw(Actor* actor, struct PlayState* play, SkelCurve* skelCurve, OverrideCurveLimbDraw overrideLimbDraw,
                     PostCurveLimbDraw postLimbDraw, s32 lod, void* data);
 
-// ZAPD compatibility typedefs
-// TODO: Remove when ZAPD adds support for them
-typedef CurveInterpKnot TransformData;
-typedef CurveAnimationHeader TransformUpdateIndex;
-typedef CurveSkeletonHeader SkelCurveLimbList;
-
 #endif
diff --git a/include/z64cutscene.h b/include/z64cutscene.h
index 004bdb690..ebd261220 100644
--- a/include/z64cutscene.h
+++ b/include/z64cutscene.h
@@ -494,10 +494,6 @@ typedef union {
 #define CS_CAM_CONTINUE 0
 #define CS_CAM_STOP -1
 
-// todo: remove after ZAPD is updated
-#define CS_CMD_CONTINUE CS_CAM_CONTINUE
-#define CS_CMD_STOP CS_CAM_STOP
-
 #define CS_CAM_DATA_NOT_APPLIED 0xFFFF
 
 typedef struct {
diff --git a/include/z64cutscene_commands.h b/include/z64cutscene_commands.h
index f467fc32c..beaecb798 100644
--- a/include/z64cutscene_commands.h
+++ b/include/z64cutscene_commands.h
@@ -271,50 +271,4 @@
     CMD_W(unk1), CMD_W(unk2), CMD_W(unk3), CMD_W(unk4), CMD_W(unk5), CMD_W(unk6), \
     CMD_W(unk7), CMD_W(unk8), CMD_W(unk9), CMD_W(unk10), CMD_W(unk11), CMD_W(unk12)
 
-// TODO: Fix ZAPD and delete these (everything to the end of the file)
-#define CS_CAM_POS_LIST                CS_CAM_EYE_SPLINE
-#define CS_CAM_POS                     CS_CAM_POINT
-#define CS_CAM_FOCUS_POINT_LIST        CS_CAM_AT_SPLINE
-#define CS_CAM_FOCUS_POINT             CS_CAM_POINT
-#define CS_CAM_POS_PLAYER_LIST         CS_CAM_EYE_SPLINE_REL_TO_PLAYER
-#define CS_CAM_POS_PLAYER              CS_CAM_POINT
-#define CS_CAM_FOCUS_POINT_PLAYER_LIST CS_CAM_AT_SPLINE_REL_TO_PLAYER
-#define CS_CAM_FOCUS_POINT_PLAYER      CS_CAM_POINT
-#define CS_NPC_ACTION_LIST             CS_ACTOR_CUE_LIST
-#define CS_NPC_ACTION                  CS_ACTOR_CUE
-#define CS_PLAYER_ACTION_LIST          CS_PLAYER_CUE_LIST
-#define CS_PLAYER_ACTION               CS_PLAYER_CUE
-#define CS_LIGHTING_LIST               CS_LIGHT_SETTING_LIST
-#define CS_CMD_09_LIST                 CS_RUMBLE_CONTROLLER_LIST
-#define CS_CMD_09                      CS_RUMBLE_CONTROLLER
-#define CS_TEXT_DISPLAY_TEXTBOX        CS_TEXT
-#define CS_TEXT_LEARN_SONG             CS_TEXT_OCARINA_ACTION
-#define CS_SCENE_TRANS_FX              CS_TRANSITION
-#define CS_PLAY_BGM_LIST               CS_START_SEQ_LIST
-#define CS_STOP_BGM_LIST               CS_STOP_SEQ_LIST
-#define CS_FADE_BGM_LIST               CS_FADE_OUT_SEQ_LIST
-#define CS_FADE_BGM                    CS_FADE_OUT_SEQ
-#define CS_TERMINATOR                  CS_DESTINATION
-
-// CS_TIME macro:
-// The last argument of the macro was removed, but ZAPD isn't aware
-// Passing 6 arguments to a 5-arguments macro works fine with IDO, so ignore this hack for IDO
-#ifndef __sgi
-// Only spot06_scene uses CS_TIME. Limit the hack to that file, so everything else can use the new macro
-#  ifdef SPOT06_SCENE_H
-#    undef CS_TIME
-#    define CS_TIME(unused0, startFrame, endFrame, hour, min, _unusedZapdCompatibilityArg) \
-        CMD_HH(unused0, startFrame), CMD_HBB(endFrame, hour, min), CMD_W(0)
-#  endif
-#endif
-
-#define CS_PLAY_BGM(seqId, startFrame, endFrame, unused0, unused1, unused2, unused3, unused4, unused5, unused6, unused7) \
-CS_START_SEQ((seqId)-1, startFrame, endFrame, unused0, unused1, unused2, unused3, unused4, unused5, unused6, unused7)
-
-#define CS_STOP_BGM(seqId, frame, unused0, unused1, unused2, unused3, unused4, unused5, unused6, unused7, unused8) \
-CS_STOP_SEQ((seqId)-1, frame, unused0, unused1, unused2, unused3, unused4, unused5, unused6, unused7, unused8)
-
-#define CS_LIGHTING(lightSetting, frame, unused0, unused1, unused2, unused3, unused4, unused5, unused6, unused7, unused8) \
-CS_LIGHT_SETTING((lightSetting)-1, frame, unused0, unused1, unused2, unused3, unused4, unused5, unused6, unused7, unused8)
-
 #endif
diff --git a/include/z64environment.h b/include/z64environment.h
index 0269c443d..922c54425 100644
--- a/include/z64environment.h
+++ b/include/z64environment.h
@@ -166,10 +166,6 @@ typedef struct {
     /* 0x14 */ s16 zFar;
 } EnvLightSettings; // size = 0x16
 
-// ZAPD compatibility typedefs
-// TODO: Remove when ZAPD adds support for them
-typedef EnvLightSettings LightSettings;
-
 typedef struct {
     /* 0x00 */ char unk_00[0x02];
     /* 0x02 */ u16 sceneTimeSpeed; // time speed value from the scene file
diff --git a/include/z64scene.h b/include/z64scene.h
index 106fd62cb..a08d438bd 100644
--- a/include/z64scene.h
+++ b/include/z64scene.h
@@ -38,9 +38,6 @@ typedef struct {
     /* 0x01 */ u8 room;
 } Spawn;
 
-// TODO: ZAPD Compatibility
-typedef Spawn EntranceEntry;
-
 typedef struct {
     /* 0x00 */ u8 count; // number of points in the path
     /* 0x04 */ Vec3s* points; // Segment Address to the array of points
@@ -142,17 +139,6 @@ typedef union {
     RoomShapeCullable cullable;
 } RoomShape; // "Ground Shape"
 
-// ZAPD compatibility typedefs
-// TODO: Remove when ZAPD adds support for them
-typedef RoomShapeDListsEntry PolygonDlist;
-typedef RoomShapeNormal PolygonType0;
-typedef RoomShapeImageSingle MeshHeader1Single;
-typedef RoomShapeImageMultiBgEntry BgImage;
-typedef RoomShapeImageMulti MeshHeader1Multi;
-typedef RoomShapeCullableEntry PolygonDlist2;
-typedef RoomShapeCullable PolygonType2;
-#define SCENE_CMD_MESH SCENE_CMD_ROOM_SHAPE
-
 #define ROOM_DRAW_OPA (1 << 0)
 #define ROOM_DRAW_XLU (1 << 1)
 
@@ -459,7 +445,6 @@ typedef enum {
 #define SCENE_CAM_TYPE_SHOOTING_GALLERY 0x50 // Unreferenced in code, and used only by the main layer of the shooting gallery scene
 
 // navi hints
-// TODO: make ZAPD use this enum for `SCENE_CMD_SPECIAL_FILES`
 typedef enum {
     NAVI_QUEST_HINTS_NONE,
     NAVI_QUEST_HINTS_OVERWORLD,
diff --git a/include/z64skin.h b/include/z64skin.h
index e9d8689d8..a199ed41b 100644
--- a/include/z64skin.h
+++ b/include/z64skin.h
@@ -43,13 +43,6 @@ typedef struct {
     /* 0x08 */ Gfx* dlist;
 } SkinAnimatedLimbData; // size = 0xC
 
-// ZAPD compatibility typedefs
-// TODO: Remove when ZAPD adds support for them
-typedef SkinVertex Struct_800A57C0;
-typedef SkinTransformation Struct_800A598C_2;
-typedef SkinAnimatedLimbData Struct_800A5E28;
-typedef SkinLimbModif Struct_800A598C;
-
 #define SKIN_LIMB_TYPE_ANIMATED 4
 #define SKIN_LIMB_TYPE_NORMAL 11