Merge branch 'master' into fix-eventobj

This commit is contained in:
GriffinR
2020-01-19 20:21:53 -05:00
30 changed files with 3398 additions and 7590 deletions

View File

@@ -1,9 +1,6 @@
#ifndef GUARD_EVENT_OBJECT_MOVEMENT_H
#define GUARD_EVENT_OBJECT_MOVEMENT_H
#define NUM_OBJECT_GRAPHICS_INFO 239
#define SPRITE_VAR 240
enum SpinnerRunnerFollowPatterns
{
RUNFOLLOW_ANY,