Revert "cleanup"

This reverts commit 6ba58f92472574ba173d4707c39a06556a4d83ab.
Revert "rewrite of sprite zero hit logic"

This reverts commit 3d22d91fe733196e25538a7a40bbc2dfa4217137.