diff --git a/info.c b/info.c index b3d0fdc68..a3b9f2c14 100644 --- a/info.c +++ b/info.c @@ -6,15 +6,15 @@ const char * const sprnames[NUMSPRITES] = { "MISF","SAWG","PLSG","PLSF","BFGG","BFGF","BLUD","PUFF","BAL1","BAL2", "BAL7","PLSS","PLSE","MISL","BFS1","BFE1","BFE2","TFOG","IFOG","PLAY", "POSS","SPOS","FATB","FBXP","SKEL","MANF","FATT","CPOS","SARG","HEAD", -"BOSS","SKUL","SPID","BSPI","APLS","APBX","CYBR","BBRN","ARM1","ARM2", -"BAR1","BEXP","FCAN","BON1","BON2","BKEY","RKEY","YKEY","BSKU","RSKU", -"YSKU","STIM","MEDI","SOUL","PINV","PSTR","PINS","SUIT","PMAP","PVIS", -"CLIP","AMMO","ROCK","BROK","CELL","CELP","SHEL","SBOX","BPAK","BFUG", -"MGUN","CSAW","LAUN","PLAS","SHOT","SGN2","COLU","SMT2","GOR1","POL2", -"POL5","POL4","POL3","POL1","POL6","GOR2","GOR3","GOR4","GOR5","SMIT", -"COL1","COL2","COL4","CAND","CBRA","COL6","TRE1","TRE2","ELEC","CEYE", -"FSKU","COL5","TBLU","TGRN","TRED","SMBT","SMGT","SMRT","HDB1","HDB2", -"HDB3","HDB4","HDB5","HDB6","POB1","POB2","BRS1","TLMP","TLP2" +"BOSS","BOS2","SKUL","SPID","BSPI","APLS","APBX","CYBR","BBRN","ARM1", +"ARM2","BAR1","BEXP","FCAN","BON1","BON2","BKEY","RKEY","YKEY","BSKU", +"RSKU","YSKU","STIM","MEDI","SOUL","PINV","PSTR","PINS","SUIT","PMAP", +"PVIS","CLIP","AMMO","ROCK","BROK","CELL","CELP","SHEL","SBOX","BPAK", +"BFUG","MGUN","CSAW","LAUN","PLAS","SHOT","SGN2","COLU","SMT2","GOR1", +"POL2","POL5","POL4","POL3","POL1","POL6","GOR2","GOR3","GOR4","GOR5", +"SMIT","COL1","COL2","COL4","CAND","CBRA","COL6","TRE1","TRE2","ELEC", +"CEYE","FSKU","COL5","TBLU","TGRN","TRED","SMBT","SMGT","SMRT","HDB1", +"HDB2","HDB3","HDB4","HDB5","HDB6","POB1","POB2","BRS1","TLMP","TLP2" }; void A_Light0 (); @@ -514,28 +514,28 @@ STATE(SPR_BOSS,11,4,A_Fall,S_BOSS_DIE5), /* S_BOSS_DIE4 */ STATE(SPR_BOSS,12,4,NULL,S_BOSS_DIE6), /* S_BOSS_DIE5 */ STATE(SPR_BOSS,13,4,NULL,S_BOSS_DIE7), /* S_BOSS_DIE6 */ STATE(SPR_BOSS,14,-1,A_BossDeath,S_NULL), /* S_BOSS_DIE7 */ -STATE(SPR_BOSS,0,5,A_Look,S_BOS2_STND2), // S_BOS2_STND -STATE(SPR_BOSS,1,5,A_Look,S_BOS2_STND), // S_BOS2_STND2 -STATE(SPR_BOSS,0,1,A_Chase,S_BOS2_RUN2), // S_BOS2_RUN1 -STATE(SPR_BOSS,0,2,A_Chase,S_BOS2_RUN3), // S_BOS2_RUN2 -STATE(SPR_BOSS,1,1,A_Chase,S_BOS2_RUN4), // S_BOS2_RUN3 -STATE(SPR_BOSS,1,2,A_Chase,S_BOS2_RUN5), // S_BOS2_RUN4 -STATE(SPR_BOSS,2,1,A_Chase,S_BOS2_RUN6), // S_BOS2_RUN5 -STATE(SPR_BOSS,2,2,A_Chase,S_BOS2_RUN7), // S_BOS2_RUN6 -STATE(SPR_BOSS,3,1,A_Chase,S_BOS2_RUN8), // S_BOS2_RUN7 -STATE(SPR_BOSS,3,2,A_Chase,S_BOS2_RUN1), // S_BOS2_RUN8 -STATE(SPR_BOSS,4,4,A_FaceTarget,S_BOS2_ATK2), // S_BOS2_ATK1 -STATE(SPR_BOSS,5,4,A_FaceTarget,S_BOS2_ATK3), // S_BOS2_ATK2 -STATE(SPR_BOSS,6,4,A_BruisAttack,S_BOS2_RUN1), // S_BOS2_ATK3 -STATE(SPR_BOSS,7,1,NULL,S_BOS2_PAIN2), // S_BOS2_PAIN -STATE(SPR_BOSS,7,1,A_Pain,S_BOS2_RUN1), // S_BOS2_PAIN2 -STATE(SPR_BOSS,8,4,NULL,S_BOS2_DIE2), // S_BOS2_DIE1 -STATE(SPR_BOSS,9,4,A_Scream,S_BOS2_DIE3), // S_BOS2_DIE2 -STATE(SPR_BOSS,10,4,NULL,S_BOS2_DIE4), // S_BOS2_DIE3 -STATE(SPR_BOSS,11,4,A_Fall,S_BOS2_DIE5), // S_BOS2_DIE4 -STATE(SPR_BOSS,12,4,NULL,S_BOS2_DIE6), // S_BOS2_DIE5 -STATE(SPR_BOSS,13,4,NULL,S_BOS2_DIE7), // S_BOS2_DIE6 -STATE(SPR_BOSS,14,-1,NULL,S_NULL), // S_BOS2_DIE7 +STATE(SPR_BOS2,0,5,A_Look,S_BOS2_STND2), // S_BOS2_STND +STATE(SPR_BOS2,1,5,A_Look,S_BOS2_STND), // S_BOS2_STND2 +STATE(SPR_BOS2,0,1,A_Chase,S_BOS2_RUN2), // S_BOS2_RUN1 +STATE(SPR_BOS2,0,2,A_Chase,S_BOS2_RUN3), // S_BOS2_RUN2 +STATE(SPR_BOS2,1,1,A_Chase,S_BOS2_RUN4), // S_BOS2_RUN3 +STATE(SPR_BOS2,1,2,A_Chase,S_BOS2_RUN5), // S_BOS2_RUN4 +STATE(SPR_BOS2,2,1,A_Chase,S_BOS2_RUN6), // S_BOS2_RUN5 +STATE(SPR_BOS2,2,2,A_Chase,S_BOS2_RUN7), // S_BOS2_RUN6 +STATE(SPR_BOS2,3,1,A_Chase,S_BOS2_RUN8), // S_BOS2_RUN7 +STATE(SPR_BOS2,3,2,A_Chase,S_BOS2_RUN1), // S_BOS2_RUN8 +STATE(SPR_BOS2,4,4,A_FaceTarget,S_BOS2_ATK2), // S_BOS2_ATK1 +STATE(SPR_BOS2,5,4,A_FaceTarget,S_BOS2_ATK3), // S_BOS2_ATK2 +STATE(SPR_BOS2,6,4,A_BruisAttack,S_BOS2_RUN1), // S_BOS2_ATK3 +STATE(SPR_BOS2,7,1,NULL,S_BOS2_PAIN2), // S_BOS2_PAIN +STATE(SPR_BOS2,7,1,A_Pain,S_BOS2_RUN1), // S_BOS2_PAIN2 +STATE(SPR_BOS2,8,4,NULL,S_BOS2_DIE2), // S_BOS2_DIE1 +STATE(SPR_BOS2,9,4,A_Scream,S_BOS2_DIE3), // S_BOS2_DIE2 +STATE(SPR_BOS2,10,4,NULL,S_BOS2_DIE4), // S_BOS2_DIE3 +STATE(SPR_BOS2,11,4,A_Fall,S_BOS2_DIE5), // S_BOS2_DIE4 +STATE(SPR_BOS2,12,4,NULL,S_BOS2_DIE6), // S_BOS2_DIE5 +STATE(SPR_BOS2,13,4,NULL,S_BOS2_DIE7), // S_BOS2_DIE6 +STATE(SPR_BOS2,14,-1,NULL,S_NULL), // S_BOS2_DIE7 STATE(SPR_SKUL,32768,5,A_Look,S_SKULL_STND2), /* S_SKULL_STND */ STATE(SPR_SKUL,32769,5,A_Look,S_SKULL_STND), /* S_SKULL_STND2 */ STATE(SPR_SKUL,32768,3,A_Chase,S_SKULL_RUN2), /* S_SKULL_RUN1 */ diff --git a/info.h b/info.h index f22291a9a..893e84fd2 100644 --- a/info.h +++ b/info.h @@ -42,6 +42,7 @@ SPR_CPOS, SPR_SARG, SPR_HEAD, SPR_BOSS, +SPR_BOS2, SPR_SKUL, SPR_SPID, SPR_BSPI,