diff --git a/src/dehacked.c b/src/dehacked.c
index f3095205..1d56f613 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -3823,6 +3823,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
 	"S_KART_SPIN6",
 	"S_KART_SPIN7",
 	"S_KART_SPIN8",
+	"S_KART_PAIN",
 	"S_KART_SQUISH",
 	/*
 	"S_PLAY_STND",
@@ -6159,6 +6160,230 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
 	"S_SRB1_GENREX1",
 	"S_SRB1_GENREX2",
 
+	// Gray Springs
+	"S_GRAYSPRING",
+	"S_GRAYSPRING2",
+	"S_GRAYSPRING3",
+	"S_GRAYSPRING4",
+	"S_GRAYSPRING5",
+
+	// Invis-spring - this is used just for the sproing sound.
+	"S_INVISSPRING",
+
+	// Blue Diagonal Spring
+	"S_BDIAG1",
+	"S_BDIAG2",
+	"S_BDIAG3",
+	"S_BDIAG4",
+	"S_BDIAG5",
+	"S_BDIAG6",
+	"S_BDIAG7",
+	"S_BDIAG8",
+
+	//{ Random Item Box
+	"S_RANDOMITEM1",
+	"S_RANDOMITEM2",
+	"S_RANDOMITEM3",
+	"S_RANDOMITEM4",
+	"S_RANDOMITEM5",
+	"S_RANDOMITEM6",
+	"S_RANDOMITEM7",
+	"S_RANDOMITEM8",
+	"S_RANDOMITEM9",
+	"S_RANDOMITEM10",
+	"S_RANDOMITEM11",
+	"S_RANDOMITEM12",
+	"S_RANDOMITEM13",
+	"S_RANDOMITEM14",
+	"S_RANDOMITEM15",
+	"S_RANDOMITEM16",
+	"S_RANDOMITEM17",
+	"S_RANDOMITEM18",
+	"S_RANDOMITEM19",
+	"S_RANDOMITEM20",
+	"S_RANDOMITEM21",
+	"S_RANDOMITEM22",
+	"S_RANDOMITEM23",
+	"S_RANDOMITEM24",
+	"S_DEADRANDOMITEM",
+
+	// Random Item Pop
+	"S_RANDOMITEMPOP1",
+	"S_RANDOMITEMPOP2",
+	"S_RANDOMITEMPOP3",
+	"S_RANDOMITEMPOP4",
+	//}
+
+	// Drift Sparks
+	"S_DRIFTSPARK1",
+	"S_DRIFTSPARK2",
+	"S_DRIFTSPARK3",
+	"S_DRIFTSPARK4",
+	"S_DRIFTSPARK5",
+	"S_DRIFTSPARK6",
+
+	// Drift Smoke
+	"S_DRIFTSMOKE1",
+	"S_DRIFTSMOKE2",
+	"S_DRIFTSMOKE3",
+	"S_DRIFTSMOKE4",
+	"S_DRIFTSMOKE5",
+
+	// Magnet Burst
+
+	// Mushroom Fire Trail
+	"S_KARTFIRE1",
+	"S_KARTFIRE2",
+	"S_KARTFIRE3",
+	"S_KARTFIRE4",
+	"S_KARTFIRE5",
+	"S_KARTFIRE6",
+	"S_KARTFIRE7",
+	"S_KARTFIRE8",
+
+	//{ Fake Item
+	"S_FAKEITEM1",
+	"S_FAKEITEM2",
+	"S_FAKEITEM3",
+	"S_FAKEITEM4",
+	"S_FAKEITEM5",
+	"S_FAKEITEM6",
+	"S_FAKEITEM7",
+	"S_FAKEITEM8",
+	"S_FAKEITEM9",
+	"S_FAKEITEM10",
+	"S_FAKEITEM11",
+	"S_FAKEITEM12",
+	"S_FAKEITEM13",
+	"S_FAKEITEM14",
+	"S_FAKEITEM15",
+	"S_FAKEITEM16",
+	"S_FAKEITEM17",
+	"S_FAKEITEM18",
+	"S_FAKEITEM19",
+	"S_FAKEITEM20",
+	"S_FAKEITEM21",
+	"S_FAKEITEM22",
+	"S_FAKEITEM23",
+	"S_FAKEITEM24",
+	"S_DEADFAKEITEM",
+	//}
+
+	// Banana
+	"S_BANANAITEM",
+	"S_DEADBANANA",
+
+	//{ Green Shell
+	"S_TRIPLEGREENSHIELD1",
+	"S_TRIPLEGREENSHIELD2",
+	"S_TRIPLEGREENSHIELD3",
+	"S_TRIPLEGREENSHIELD4",
+	"S_TRIPLEGREENSHIELD5",
+	"S_TRIPLEGREENSHIELD6",
+	"S_TRIPLEGREENSHIELD7",
+	"S_TRIPLEGREENSHIELD8",
+	"S_GREENSHIELD1",
+	"S_GREENSHIELD2",
+	"S_GREENSHIELD3",
+	"S_GREENSHIELD4",
+	"S_GREENSHIELD5",
+	"S_GREENSHIELD6",
+	"S_GREENSHIELD7",
+	"S_GREENSHIELD8",
+	"S_GREENITEM1",
+	"S_GREENITEM2",
+	"S_GREENITEM3",
+	"S_GREENITEM4",
+	"S_GREENITEM5",
+	"S_GREENITEM6",
+	"S_GREENITEM7",
+	"S_GREENITEM8",
+	"S_GREENTRAIL1",
+	"S_GREENTRAIL2",
+	"S_GREENTRAIL3",
+	"S_GREENTRAIL4",
+	"S_GREENTRAIL5",
+	"S_GREENTRAIL6",
+	"S_GREENTRAIL7",
+	"S_GREENTRAIL8",
+	"S_GREENTRAIL9",
+	"S_DEADGREEN",
+	//}
+	//{ Red Shell
+	"S_TRIPLEREDSHIELD1",
+	"S_TRIPLEREDSHIELD2",
+	"S_TRIPLEREDSHIELD3",
+	"S_TRIPLEREDSHIELD4",
+	"S_TRIPLEREDSHIELD5",
+	"S_TRIPLEREDSHIELD6",
+	"S_TRIPLEREDSHIELD7",
+	"S_TRIPLEREDSHIELD8",
+	"S_REDSHIELD1",
+	"S_REDSHIELD2",
+	"S_REDSHIELD3",
+	"S_REDSHIELD4",
+	"S_REDSHIELD5",
+	"S_REDSHIELD6",
+	"S_REDSHIELD7",
+	"S_REDSHIELD8",
+	"S_REDITEM1",
+	"S_REDITEM2",
+	"S_REDITEM3",
+	"S_REDITEM4",
+	"S_REDITEM5",
+	"S_REDITEM6",
+	"S_REDITEM7",
+	"S_REDITEM8",
+	"S_REDITEMCHASE",
+	"S_REDITEMTRAIL",
+	"S_REDTRAIL1",
+	"S_REDTRAIL2",
+	"S_REDTRAIL3",
+	"S_REDTRAIL4",
+	"S_REDTRAIL5",
+	"S_REDTRAIL6",
+	"S_REDTRAIL7",
+	"S_REDTRAIL8",
+	"S_REDTRAIL9",
+	"S_DEADRED",
+	//}
+
+	// Bob-omb
+	"S_BOMBSHIELD",
+	"S_BOMBITEM",
+	"S_BOMBAIR",
+	"S_BOMBEXPLODE",
+
+	// Blue Shell - Blue Lightning for now...
+	"S_BLUELIGHTNING1",
+	"S_BLUELIGHTNING2",
+	"S_BLUELIGHTNING3",
+	"S_BLUELIGHTNING4",
+	"S_BLUEEXPLODE",
+
+	// Lightning
+	"S_LIGHTNING1",
+	"S_LIGHTNING2",
+	"S_LIGHTNING3",
+	"S_LIGHTNING4",
+
+	// The legend
+	"S_SINK",
+	"S_SINKTRAIL1",
+	"S_SINKTRAIL2",
+	"S_SINKTRAIL3",
+
+	// Pokey
+	"S_POKEY1",
+	"S_POKEY2",
+	"S_POKEY3",
+	"S_POKEY4",
+	"S_POKEY5",
+	"S_POKEY6",
+	"S_POKEY7",
+	"S_POKEY8",
+	"S_POKEYIDLE",
+
 #ifdef SEENAMES
 	"S_NAMECHECK",
 #endif
@@ -6668,6 +6893,59 @@ static const char *const MOBJTYPE_LIST[] = {  // array length left dynamic for s
 	"MT_SRB1_METALSONIC",
 	"MT_SRB1_GOLDBOT",
 	"MT_SRB1_GENREX",
+
+	// SRB2kart
+	"MT_GRAYSPRING",
+	"MT_INVISSPRING",
+	"MT_BLUEDIAG",
+	"MT_RANDOMITEM",
+	"MT_FLINGRANDOMITEM",
+	"MT_RANDOMITEMPOP",
+
+	"MT_MUSHROOMTRAIL",
+	"MT_DRIFT",
+	"MT_DRIFTSMOKE",
+
+	"MT_FAKESHIELD",
+	"MT_FAKEITEM",
+
+	"MT_TRIPLEBANANASHIELD1", // Banana Stuff
+	"MT_TRIPLEBANANASHIELD2",
+	"MT_TRIPLEBANANASHIELD3",
+	"MT_BANANASHIELD",
+	"MT_BANANAITEM",
+
+	"MT_TRIPLEGREENSHIELD1", // Green shell stuff
+	"MT_TRIPLEGREENSHIELD2",
+	"MT_TRIPLEGREENSHIELD3",
+	"MT_GREENSHIELD",
+	"MT_GREENITEM",
+	"MT_GREENTRAIL",
+
+	"MT_TRIPLEREDSHIELD1", // Red shell stuff
+	"MT_TRIPLEREDSHIELD2",
+	"MT_TRIPLEREDSHIELD3",
+	"MT_REDSHIELD",
+	"MT_REDITEM",
+	"MT_REDITEMDUD",
+	"MT_REDTRAIL",
+
+	"MT_BOMBSHIELD", // Bob-omb stuff
+	"MT_BOMBITEM",
+	"MT_BOMBEXPLOSION",
+	"MT_BOMBEXPLOSIONSOUND",
+
+	"MT_BLUELIGHTNING", // Lightning stuff
+	"MT_BLUEEXPLOSION",
+	"MT_LIGHTNING",
+
+	"MT_SINK", // Kitchen Sink Stuff
+	"MT_SINKTRAIL",
+
+	"MT_POKEY", // Huh, thought this was a default asset for some reason, guess not.
+	"MT_ENEMYFLIP",
+	"MT_WAYPOINT",
+
 #ifdef SEENAMES
 	"MT_NAMECHECK",
 #endif