diff --git a/src/d_main.cpp b/src/d_main.cpp index 3ada228ff..d92c496a8 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -81,7 +81,7 @@ #include // Put hashes here to get them out of header hell. -#define ASSET_HASH_MAIN_PK3 "f76e374630a96b59009ebdbc9e2a0364" +#define ASSET_HASH_MAIN_PK3 "d5bb52bbee2bd86ea9c66a6445f9af4a" #define ASSET_HASH_SRB2_SRB "c1b9577687f8a795104aef4600720ea7" #define ASSET_HASH_GFX_KART "06f86ee16136eb8a7043b15001797034" #define ASSET_HASH_TEXTURES_KART "abb53d56aba47c3a8cb0f764da1c8b80" diff --git a/src/info/mobjs.h b/src/info/mobjs.h index 5a4646cfa..8d48fbf21 100644 --- a/src/info/mobjs.h +++ b/src/info/mobjs.h @@ -767,6 +767,24 @@ _(REDBRICKDEBRIS) // for CEZ3 _(BLUEBRICKDEBRIS) // for CEZ3 _(YELLOWBRICKDEBRIS) // for CEZ3 +// SRB1 Badniks +_(SRB1_CRAWLA) +_(SRB1_BAT) +_(SRB1_ROBOFISH) +_(SRB1_VOLCANOGUY) +_(SRB1_HOPPY) +_(SRB1_HOPPYWATER) +_(SRB1_HOPPYSKYLAB) +_(SRB1_MMZFLYING) +_(SRB1_UFO) +_(SRB1_GRAYBOT) +_(SRB1_ROBOTOPOLIS) +_(SRB1_RBZBUZZ) +_(SRB1_RBZSPIKES) +_(SRB1_METALSONIC) +_(SRB1_GOLDBOT) +_(SRB1_GENREX) + // SRB2kart _(RANDOMITEM) _(RANDOMITEMPOP) diff --git a/src/info/sprites.h b/src/info/sprites.h index 718540c9c..28ec65000 100644 --- a/src/info/sprites.h +++ b/src/info/sprites.h @@ -492,6 +492,23 @@ _(BRIY) _(GWLG) _(GWLR) +// SRB1 Badniks +_(SRBA) +_(SRBB) +_(SRBC) +_(SRBD) +_(SRBE) +_(SRBF) +_(SRBG) +_(SRBH) +_(SRBI) +_(SRBJ) +_(SRBK) +_(SRBL) +_(SRBM) +_(SRBN) +_(SRBO) + // SRB2Kart _(RNDM) // Random Item Box _(RPOP) // Random Item Box Pop diff --git a/src/info/states.h b/src/info/states.h index ef8581667..5b30c3705 100644 --- a/src/info/states.h +++ b/src/info/states.h @@ -3119,6 +3119,71 @@ _(REDBRICKDEBRIS) // for CEZ3 _(BLUEBRICKDEBRIS) // for CEZ3 _(YELLOWBRICKDEBRIS) // for CEZ3 +// SRB1 Badniks +_(SRB1_CRAWLA1) +_(SRB1_CRAWLA2) +_(SRB1_CRAWLA3) +_(SRB1_CRAWLA4) + +_(SRB1_BAT1) +_(SRB1_BAT2) +_(SRB1_BAT3) +_(SRB1_BAT4) + +_(SRB1_ROBOFISH1) +_(SRB1_ROBOFISH2) +_(SRB1_ROBOFISH3) + +_(SRB1_VOLCANOGUY1) +_(SRB1_VOLCANOGUY2) + +_(SRB1_HOPPY1) +_(SRB1_HOPPY2) + +_(SRB1_HOPPYWATER1) +_(SRB1_HOPPYWATER2) + +_(SRB1_HOPPYSKYLAB1) + +_(SRB1_MMZFLYING1) +_(SRB1_MMZFLYING2) +_(SRB1_MMZFLYING3) +_(SRB1_MMZFLYING4) +_(SRB1_MMZFLYING5) + +_(SRB1_UFO1) +_(SRB1_UFO2) + +_(SRB1_GRAYBOT1) +_(SRB1_GRAYBOT2) +_(SRB1_GRAYBOT3) +_(SRB1_GRAYBOT4) +_(SRB1_GRAYBOT5) +_(SRB1_GRAYBOT6) + +_(SRB1_ROBOTOPOLIS1) +_(SRB1_ROBOTOPOLIS2) + +_(SRB1_RBZBUZZ1) +_(SRB1_RBZBUZZ2) + +_(SRB1_RBZSPIKES1) +_(SRB1_RBZSPIKES2) + +_(SRB1_METALSONIC1) +_(SRB1_METALSONIC2) +_(SRB1_METALSONIC3) + +_(SRB1_GOLDBOT1) +_(SRB1_GOLDBOT2) +_(SRB1_GOLDBOT3) +_(SRB1_GOLDBOT4) +_(SRB1_GOLDBOT5) +_(SRB1_GOLDBOT6) + +_(SRB1_GENREX1) +_(SRB1_GENREX2) + // Random Item Box _(RANDOMITEM1) _(RANDOMITEM2)