Blue coin switch allows retries for remaining coins

include/object_constants.h

@@ -116,55 +116,100 @@
 #define ACTIVE_PARTICLE_V_STAR                      (1 << 18) // 0x00040000
 #define ACTIVE_PARTICLE_TRIANGLE                    (1 << 19) // 0x00080000
 
-/* oAction */
-#define OBJ_ACT_LAVA_DEATH 100
-#define OBJ_ACT_DEATH_PLANE_DEATH 101
+/* oBehParams2ndByte */
+#define OBJ_BP_NONE                                         0x0
 
-#define OBJ_ACT_HORIZONTAL_KNOCKBACK 100
-#define OBJ_ACT_VERTICAL_KNOCKBACK 101
-#define OBJ_ACT_SQUISHED 102
+/* oAction */
+#define OBJ_ACT_PROJECTILE_HIT_MARIO                       -0x1
+
+/* oAction */
+#define OBJ_ACT_LAVA_DEATH                                  100
+#define OBJ_ACT_DEATH_PLANE_DEATH                           101
+
+#define OBJ_ACT_HORIZONTAL_KNOCKBACK                        100
+#define OBJ_ACT_VERTICAL_KNOCKBACK                          101
+#define OBJ_ACT_SQUISHED                                    102
+
+/* oAnimState */
+#define OBJ_ANIM_STATE_INIT_ANIM                           -0x1
+#define OBJ_ANIM_STATE_DEFAULT                              0x0
+    /* cur_obj_update_blinking */
+#define OBJ_BLINKING_ANIM_STATE_EYES_OPEN                   0x0
+#define OBJ_BLINKING_ANIM_STATE_EYES_CLOSED                 0x1
+
+/* Animations */
+#define OBJ_ANIM_NONE                                      -0x1
 
 /* gTTCSpeedSetting */
-#define TTC_SPEED_SLOW    0
-#define TTC_SPEED_FAST    1
-#define TTC_SPEED_RANDOM  2
-#define TTC_SPEED_STOPPED 3
+#define TTC_SPEED_SLOW                                      0x0
+#define TTC_SPEED_FAST                                      0x1
+#define TTC_SPEED_RANDOM                                    0x2
+#define TTC_SPEED_STOPPED                                   0x3
 
-/* Bob-omb */
-    /* oBehParams2ndByte */
-    #define BOBOMB_BP_STYPE_GENERIC 0
-    #define BOBOMB_BP_STYPE_STATIONARY 1
-    /* oAction */
-    #define BOBOMB_ACT_PATROL 0
-    #define BOBOMB_ACT_LAUNCHED 1
-    #define BOBOMB_ACT_CHASE_MARIO 2
-    #define BOBOMB_ACT_EXPLODE 3
-    #define BOBOMB_ACT_LAVA_DEATH 100
-    #define BOBOMB_ACT_DEATH_PLANE_DEATH 101
+/* geo_update_layer_transparency */
+#define TRANSPARENCY_ANIM_STATE_OPAQUE                      0x0
+#define TRANSPARENCY_ANIM_STATE_TRANSPARENT                 0x1
+
+/* Orange Number */
+    /* oBehParams2ndByte, oAnimState */
+    #define ORANGE_NUMBER_0                                 0x0
+    #define ORANGE_NUMBER_1                                 0x1
+    #define ORANGE_NUMBER_2                                 0x2
+    #define ORANGE_NUMBER_3                                 0x3
+    #define ORANGE_NUMBER_4                                 0x4
+    #define ORANGE_NUMBER_5                                 0x5
+    #define ORANGE_NUMBER_6                                 0x6
+    #define ORANGE_NUMBER_7                                 0x7
+    #define ORANGE_NUMBER_8                                 0x8
+    #define ORANGE_NUMBER_9                                 0x9
+    #define ORANGE_NUMBER_A                                 0xA
+    #define ORANGE_NUMBER_B                                 0xB
+    #define ORANGE_NUMBER_C                                 0xC
+    #define ORANGE_NUMBER_D                                 0xD
+    #define ORANGE_NUMBER_E                                 0xE
+    #define ORANGE_NUMBER_F                                 0xF
+
+/* Coin Type */
+    /* coinType */
+    #define COIN_TYPE_NONE                                  0x0
+    #define COIN_TYPE_YELLOW                                0x1
+    #define COIN_TYPE_BLUE                                  0x2
 
 /* Hidden Blue Coin */
     /* oAction */
-    #define HIDDEN_BLUE_COIN_ACT_INACTIVE 0
-    #define HIDDEN_BLUE_COIN_ACT_WAITING 1
-    #define HIDDEN_BLUE_COIN_ACT_ACTIVE 2
+    #define HIDDEN_BLUE_COIN_ACT_INACTIVE                   0x0
+    #define HIDDEN_BLUE_COIN_ACT_WAITING                    0x1
+    #define HIDDEN_BLUE_COIN_ACT_ACTIVE                     0x2
 
 /* Blue Coin Switch */
     /* oAction */
-    #define BLUE_COIN_SWITCH_ACT_IDLE 0
-    #define BLUE_COIN_SWITCH_ACT_RECEDING 1
-    #define BLUE_COIN_SWITCH_ACT_TICKING 2
+    #define BLUE_COIN_SWITCH_ACT_IDLE                       0x0
+    #define BLUE_COIN_SWITCH_ACT_RECEDING                   0x1
+    #define BLUE_COIN_SWITCH_ACT_TICKING                    0x2
+    #define BLUE_COIN_SWITCH_ACT_EXTENDING                  0x3
 
 /* Moving Blue Coin */
     /* oAction */
-    #define MOV_BCOIN_ACT_STILL 0
-    #define MOV_BCOIN_ACT_MOVING 1
+    #define MOV_BCOIN_ACT_STILL                             0x0
+    #define MOV_BCOIN_ACT_MOVING                            0x1
+    #define MOV_BCOIN_ACT_SLOWING_DOWN                      0x2
+    #define MOV_BCOIN_ACT_STOPPED                           0x3
+    #define MOV_BCOIN_ACT_FLICKERING                        0x4
+
+/* Bob-omb */
+    /* oBehParams2ndByte */
+    #define BOBOMB_BP_STYPE_GENERIC    0x0
+    #define BOBOMB_BP_STYPE_STATIONARY 0x1
+    /* oAction */
+    #define BOBOMB_ACT_PATROL      0x0
+    #define BOBOMB_ACT_LAUNCHED    0x1
+    #define BOBOMB_ACT_CHASE_MARIO 0x2
+    #define BOBOMB_ACT_EXPLODE     0x3
 
 /* Moving Yellow Coin */
     /* oAction */
     #define MOV_YCOIN_ACT_IDLE 0
     #define MOV_YCOIN_ACT_BLINKING 1
-    #define MOV_YCOIN_ACT_LAVA_DEATH 100
-    #define MOV_YCOIN_ACT_DEATH_PLANE_DEATH 101
 
 /* Bob-omb Buddy */
     /* oBehParams2ndByte */
@@ -376,8 +421,6 @@
     #define BULLY_ACT_BACK_UP 3
     #define BULLY_ACT_INACTIVE 4
     #define BULLY_ACT_ACTIVATE_AND_FALL 5
-    #define BULLY_ACT_LAVA_DEATH 100
-    #define BULLY_ACT_DEATH_PLANE_DEATH 101
     /* oBullySubtype */
     #define BULLY_STYPE_GENERIC 0
     #define BULLY_STYPE_MINION 1