core2/code_83D70.c done

include/bsint.h

@@ -7,6 +7,65 @@
 
 typedef void (*bsStateMethod)(void);  
 
+enum bs_interrupt_e {
+    BS_INTR_0_NONE,
+    BS_INTR_1,
+    BS_INTR_2,
+    BS_INTR_3,
+    BS_INTR_4,
+    BS_INTR_5,
+    BS_INTR_6,
+    BS_INTR_7, //something with carried objects
+    BS_INTR_8, //something with carried objects
+    BS_INTR_9, //bsbfly??
+    BS_INTR_A, //wishy_washy?
+    BS_INTR_B,
+    BS_INTR_C_CLIMB, //bsclimb?
+    BS_INTR_D_SURF,
+    BS_INTR_E,
+    BS_INTR_F, //gv matching game, mr. vile (lose?)
+    BS_INTR_10,
+    BS_INTR_11_DROWN,
+    BS_INTR_12, //something with carried objects
+    BS_INTR_13, //ff death square?
+    BS_INTR_14, //gv matching game?, forces jump state
+    BS_INTR_15,
+    BS_INTR_16_THROW_CARRIED_OBJ, //carry_object_throw_volume
+    BS_INTR_17, //eat yumblie?
+    BS_INTR_18_CROC_ATE_WRONG, //ate wrong yumblie type?
+    BS_INTR_19,
+    BS_INTR_1A, //turbo_talon_trainers?
+    BS_INTR_1B, //wading_boots
+    BS_INTR_1C,
+    BS_INTR_1D,
+    BS_INTR_1E,
+    BS_INTR_1F,
+    BS_INTR_20,
+    BS_INTR_21,
+    BS_INTR_22,
+    BS_INTR_23,
+    BS_INTR_24,
+    BS_INTR_25,
+    BS_INTR_26, //bsjig_jiggy
+    BS_INTR_27_BANJO_SLED,
+    BS_INTR_28, //bs_sled
+    BS_INTR_27_WALRUS_SLED, //bs_walrus_sled???
+    BS_INTR_2A, //boggy race text?
+    BS_INTR_2B, //boggy race?
+    BS_INTR_2C,
+    BS_INTR_2D,
+    BS_INTR_2E,
+    BS_INTR_2F_LOGGO, //loggo flush?
+    BS_INTR_30,
+    BS_INTR_31, //takes damage
+    BS_INTR_32,
+    BS_INTR_33,
+    BS_INTR_34,
+    BS_INTR_35, //notedoor?
+    BS_INTR_36_DINGPOT, //dingpot
+    BS_INTR_37
+};
+
 typedef struct bs_state_s{
     bsStateMethod init_func;
     bsStateMethod update_func;
@@ -21,11 +80,11 @@ typedef struct bs_map_s{
 
 void bsList_clearAll(void);
 void bsList_setInitMethod(enum bs_e i, bsStateMethod func);
-void bsList_setUpdateMethod(s32 i, bsStateMethod func);
-void bsList_setEndMethod(s32 i, bsStateMethod func);
-void bsList_setInterruptMethod(s32 i, bsStateMethod func);
-bsStateMethod bsList_getInitMethod(s32 i);
-bsStateMethod bsList_getUpdateMethod(s32 i);
-bsStateMethod bsList_getEndMethod(s32 i);
-bsStateMethod bsList_getInterruptMethod(s32 i);
+void bsList_setUpdateMethod(enum bs_e i, bsStateMethod func);
+void bsList_setEndMethod(enum bs_e i, bsStateMethod func);
+void bsList_setInterruptMethod(enum bs_e i, bsStateMethod func);
+bsStateMethod bsList_getInitMethod(enum bs_e i);
+bsStateMethod bsList_getUpdateMethod(enum bs_e i);
+bsStateMethod bsList_getEndMethod(enum bs_e i);
+bsStateMethod bsList_getInterruptMethod(enum bs_e i);
 #endif

include/enums.h

@@ -1865,11 +1865,11 @@ enum bs_e
     BS_3A_CARRY_IDLE,
     BS_CARRY_WALK = 0x3B,
     BS_3C,
-    BS_3D_FALL_TUMBLING = 0x3D,
-    BS_3E_ANT_OW = 0x3E,
+    BS_3D_FALL_TUMBLING,
+    BS_3E_ANT_OW,
     BS_3F,
-    //BS_PUMPKIN_unk40,
-    BS_41_DIE = 0x41,
+    BS_40_PUMPKIN_FLUSH,
+    BS_41_DIE,
     BS_42_DINGPOT,
     BS_43_ANT_DIE,
     BS_44_JIG_JIGGY,
@@ -1935,7 +1935,7 @@ enum bs_e
     BS_7D_WALRUS_SLED,
     BS_7E_WALRUS_SLED,
     BS_7F_DIVE_OW = 0x7F,
-    //BS_7D_WALRUS_SLED_LOSE = 0x80,
+    BS_80_WALRUS_SLED_LOSE,
     BS_81_WALRUS_SLED_LOCKED = 0x81,
     BS_82_WALRUS_SLED_LOSE_IN_AIR,
 
@@ -3898,10 +3898,18 @@ enum misc_flag_e{
     MISC_FLAG_1_ON_FLIGHT_PAD = 0x1,
     MISC_FLAG_2_ON_SPRING_PAD,
 
+    MISC_FLAG_5_HAS_PECKED = 0x5,
+
     MISC_FLAG_E_TOUCHING_WADING_BOOTS = 0xE,
 
     MISC_FLAG_10_TOUCHING_TURBO_TRAINERS = 0x10,
 
+    //0x12 has used flap
+    MISC_FLAG_12_HAS_FLAPPED = 0x12,
+    //0x13 in difficult terrain (mud)
+    MISC_FLAG_14_LOSE_BOGGY_RACE = 0x14,
+    //0x15 touching loadzone?
+
     MISC_FLAG_1B_TRANSFORMING = 0x1B
 };
 

include/functions.h

@@ -17,6 +17,8 @@
 #include "ml/mtx.h"
 #include "bs_funcs.h"
 
+#include "bsint.h"
+
 extern f32 fabsf(f32);
 #pragma intrinsic (fabsf)
 
@@ -132,9 +134,9 @@ s32 bs_getPrevState(void);
 s32 bs_getState(void);
 s32 bs_getNextState(void);
 void bs_updateState(void);
-s32 bs_checkInterrupt(s32 arg0);
+s32 bs_checkInterrupt(enum bs_interrupt_e arg0);
 void func_8029A86C(s32 arg0);
-s32 bs_getInterruptType(void);
+enum bs_interrupt_e bs_getInterruptType(void);
 
 /* vla - variable length array*/
 void    vector_clear(VLA *this);