diff --git a/src/dehacked.c b/src/dehacked.c index a8ca2298..92d3a0ff 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -6513,7 +6513,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_DOOD_BOX5", // D00Dkart - Diddy Kong Racing Bumper - "S_DOOD_BUMPER", + "S_DOOD_BALLOON", // Chaotix Big Ring "S_BIGRING01", @@ -7208,7 +7208,7 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s "MT_DOOD_FLOWER3", "MT_DOOD_FLOWER4", "MT_DOOD_BOX", - "MT_DOOD_BUMPER", + "MT_DOOD_BALLOON", "MT_BIGRING", "MT_SNES_DONUTBUSH1", diff --git a/src/info.c b/src/info.c index cb332521..4209787a 100644 --- a/src/info.c +++ b/src/info.c @@ -2833,7 +2833,7 @@ state_t states[NUMSTATES] = {SPR_DOOD, 9, 2, {NULL}, 0, 0, S_DOOD_BOX5}, // S_DOOD_BOX4 {SPR_DOOD, 10, 2, {NULL}, 0, 0, S_DOOD_BOX1}, // S_DOOD_BOX5 - {SPR_DOOD, 11, -1, {NULL}, 0, 0, S_NULL}, // S_DOOD_BUMPER + {SPR_DOOD, 11, -1, {NULL}, 0, 0, S_NULL}, // S_DOOD_BALLOON {SPR_BRNG, 0, 2, {NULL}, 0, 0, S_BIGRING02}, // S_BIGRING01 {SPR_BRNG, 1, 2, {NULL}, 0, 0, S_BIGRING03}, // S_BIGRING02 @@ -15866,9 +15866,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_DOOD_BUMPER + { // MT_DOOD_BALLOON 2807, // doomednum - S_DOOD_BUMPER, // spawnstate + S_DOOD_BALLOON, // spawnstate 1000, // spawnhealth S_NULL, // seestate sfx_None, // seesound diff --git a/src/info.h b/src/info.h index 22a79c65..3445e222 100644 --- a/src/info.h +++ b/src/info.h @@ -3360,7 +3360,7 @@ typedef enum state S_DOOD_BOX5, // D00Dkart - Diddy Kong Racing Bumper - S_DOOD_BUMPER, + S_DOOD_BALLOON, // Chaotix Big Ring S_BIGRING01, @@ -4072,7 +4072,7 @@ typedef enum mobj_type MT_DOOD_FLOWER3, MT_DOOD_FLOWER4, MT_DOOD_BOX, - MT_DOOD_BUMPER, + MT_DOOD_BALLOON, MT_BIGRING, MT_SNES_DONUTBUSH1,