mirror of
https://github.com/n64decomp/sm64
synced 2026-05-10 08:07:52 +00:00
22 lines
857 B
Plaintext
22 lines
857 B
Plaintext
diff a/include/object_constants.h b/include/object_constants.h (rejected hunks)
|
|
@@ -118,6 +118,10 @@
|
|
#define ACTIVE_PARTICLE_BREATH (1 << 17) // 0x00020000
|
|
#define ACTIVE_PARTICLE_V_STAR (1 << 18) // 0x00040000
|
|
#define ACTIVE_PARTICLE_TRIANGLE (1 << 19) // 0x00080000
|
|
+#define ACTIVE_PARTICLE_SONIC_TRAIL (1 << 20) // 0x00120000
|
|
+#define ACTIVE_PARTICLE_SONIC_TRAIL_ROLLING (1 << 21) // 0x00120000
|
|
+#define PARTICLE_SUPER_TRAIL /* 0x00120000 */ (1 << 22)
|
|
+#define PARTICLE_SUPER_TRAIL_ROLLING /* 0x00160000 */ (1 << 23)
|
|
|
|
/* oAction */
|
|
#define OBJ_ACT_LAVA_DEATH 100
|
|
@@ -680,7 +684,7 @@
|
|
#define UKIKI_ANIM_STATE_EYE_CLOSED 1
|
|
#define UKIKI_ANIM_STATE_CAP_ON 2
|
|
|
|
- /* oUkikiHasCap */
|
|
+ /* oUkikiHasHat */
|
|
#define UKIKI_CAP_ON 1
|
|
|
|
/* Ukiki Cage Star */
|