Egg Colosseum (CEZ3 remaster)

See merge request STJr/SRB2Internal!248

Sea Egg

See merge request STJr/SRB2Internal!244

Fixed mixed-code-and-declaration, shadowed variables, etc ...and the compiler doesn't like P_AddEachTimeThinker being inline anymore for some reason, oh well

# Conflicts:
#	src/p_mobj.c
#	src/sounds.c
#	src/sounds.h

PITY IN PINK and everything associated (formerly toast_fixes)

See merge request STJr/SRB2Internal!232

Metal Sonic Boss fixes (again)

See merge request STJr/SRB2Internal!245

Accidentially broke rain in the rainfixes branch (oh, the irony!)

See merge request STJr/SRB2Internal!249

Remove character flags

Closes #27

See merge request STJr/SRB2Internal!246

Sound options menu fixes

Closes #160

See merge request STJr/SRB2Internal!250

Hardcode CEZ brick debris

See merge request STJr/SRB2Internal!247

If you wanted the game to reset the item selected to the top option like before though, I left a line commented out that would do that for you. Unlike the old item = 0 way, it would automatically be corrected for headers and other spaces (thus kind of future-proofing this code)

Merge branch 'toast_cleanup' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup

# Conflicts:
#	src/p_mobj.c

# Conflicts:
#	src/p_enemy.c
#	src/p_mobj.c

Realised I accidentially broke rain in the rainfixes branch (oh, the irony!), realised it needed a few additional P_RecalcPrecipInSector calls to properly work with the new arena, and increased its speed.

If you must, I can cherrypick this into another branch - but it's required for this one, at least.

Just wait for the MR, it won't be far behind.

Also add a case for MT_BRICKDEBRIS to P_MobjThinker

Realised I accidentially broke rain in the rainfixes branch (oh, the irony!), realised it needed a few additional P_RecalcPrecipInSector calls to properly work with the new arena, and increased its speed.

If you must, I can cherrypick this into another branch - but it's required for this one, at least.

Pre-pinch behaviour complete - heavily reliant on a new map, which I won't be sharing until everything is ready.

Just making this commit now so I can merge in master...

This reverts commit c04b560e.

This reverts merge request !239

Metal Sonic Boss fixes

See merge request STJr/SRB2Internal!239

Separate thinkers into different lists

See merge request STJr/SRB2Internal!219

# Conflicts:
#	src/f_finale.c
#	src/p_enemy.c

# Conflicts:
#	src/f_finale.c
#	src/p_enemy.c

# Conflicts:
#	src/p_mobj.c

correctly use P_UnsetThingPosition, P_SetThingPosition + P_DelSeclist around MF_NOBLOCKMAP addition in the TNT explosion code