core2/gc/zoombox.c data section defined

include/enums.h

@@ -1035,14 +1035,13 @@ enum sfx_e
     SFX_F7_BLUBBER_TALKING_3,
     SFX_F8_BLUBBER_TALKING_4,
     SFX_F9_GRUNTLING_NOISE_1,
-    SFX_GRUNTLING_NOISE_2,
+    SFX_FA_GRUNTLING_NOISE_2,
-    SFX_GRUNTLING_NOISE_3,
+    SFX_FB_GRUNTLING_NOISE_3,
-    SFX_RUBEE_TALKING_1,
+    SFX_FC_RUBEE_TALKING_1,
-    SFX_RUBEE_TALKING_2,
+    SFX_FD_RUBEE_TALKING_2,
-    SFX_RUBEE_TALKING_3,
+    SFX_FE_TANKTUP_TALKING_1,
-    SFX_TANKTUP_TALKING_1,
+    SFX_FF_TANKTUP_TALKING_2,
-    SFX_TANKTUP_TALKING_2,
+    SFX_100_TANKTUP_TALKING_3,
-    SFX_100_TANKTUP_TALKING_3 = 0x0100,
     SFX_101_LOGGO_TALKING,
     SFX_102_ZUBBA_TALKING,
     SFX_103_FLOTSAM_DEATH,
@@ -1271,8 +1270,8 @@ enum sfx_e
     SFX_3ED,
     SFX_3EE,
     SFX_3EF,
-
+    SFX_3F0_FLIBBIT_TALKING,
-    SFX_3F1_UNKNOWN = 0x3f1, //bsstand
+    SFX_3F1_UNKNOWN, //bsstand
     SFX_3F2_UNKNOWN, //gold_chest_ttc
 
     SFX_3F5_UNKNOWN = 0x3F5, //RBB/code_5F80
@@ -1280,16 +1279,26 @@ enum sfx_e
     SFX_3F7_UNKNOWN, //gv/histup
     SFX_3F8_UNKNOWN, //gv/histup
     SFX_3F9_UNKNOWN, //chmole
+    SFX_3FA_HONEYCOMB_TALKING,
+    SFX_3FB_UNKNOWN, //conga
 
-    SFX_3FB_UNKNOWN = 0x3fb, //conga
+    SFX_406_GOLD_BULLION_TALKING = 0x406,
+    SFX_407_MUMBO_TALKING_1,
+    SFX_408_MUMBO_TALKING_2,
+    SFX_409_MUMBO_TALKING_3,
+    SFX_40A_MUMBO_TALKING_4,
+    SFX_40B_MUMBO_TALKING_5,
+    SFX_40C_MUSIC_NOTE_TALKING,
 
     SFX_40E_UNKNOWN = 0x40e,
+    SFX_40F_TICKER_TALKING,
 
-    SFX_413_UNKNOWN = 0x413, //water ripple?
+    SFX_412_FREEZING_WATER_TALKING = 0x412,
-
+    SFX_413_WATER_RIPPLE,
-    SFX_415_UNKNOWN = 0x415, //xmas tree
+    SFX_414_XMAS_GIFT_TALKING,
+    SFX_415_UNKNOWN, //xmas tree
     SFX_416,
-    SFX_417_UNKNOWN = 0x417, //lair/func_8038EB94, double health
+    SFX_417_UNKNOWN, //lair/func_8038EB94, double health
 
     SFX_419_UNKNOWN = 0x419,
     SFX_41A_UNKNOWN = 0x41a
@@ -2513,6 +2522,95 @@ enum asset_e
     ASSET_7E7_SPRITE_CROC_BANJO, 
 
     ASSET_7EE_JOKER_CARD = 0x7ee,
+    ASSET_7EF_SPRITE_BANJO,
+    ASSET_7F0_SPRITE_BOTTLES,
+    ASSET_7F1_SPRITE_BLUBBER,
+    ASSET_7F2_SPRITE_CONGA,
+    ASSET_7F3_SPRITE_TEEHEE,
+    ASSET_7F4_SPRITE_KAZOOIE,
+    ASSET_7F5_SPRITE_CHIMPY,
+    ASSET_7F6_SPRITE_FLIBBIT,
+    ASSET_7F7_SPRITE_GOBI,
+    ASSET_7F8_SPRITE_TANKTUP,
+    ASSET_7F9_SPRITE_TIPTUP,
+    ASSET_7FA_SPRITE_WARP_CAULDRON,
+    ASSET_7FB_SPRITE_RUBEE,
+    ASSET_7FC_SPRITE_MUMBO,
+    ASSET_7FD_SPRITE_NIPPER,
+    ASSET_7FE_SPRITE_CLANKER,
+    ASSET_7FF_SPRITE_GRABBA,
+    ASSET_800_SPRITE_SNIPPET,
+    ASSET_801_SPRITE_TRUNKER,
+    ASSET_802_SPRITE_JINJO_YELLOW,
+    ASSET_803_SPRITE_JINJO_GREEN,
+    ASSET_804_SPRITE_JINJO_BLUE,
+    ASSET_805_SPRITE_JINJO_PINK,
+    ASSET_806_SPRITE_JINJO_ORANGE,
+
+    ASSET_808_SPRITE_LIVE_MUMBO_TOKEN = 0x808,
+    ASSET_809_SPRITE_CATERPILLAR,
+
+    ASSET_80C_SPRITE_LIVE_WADING_BOOTS = 0x80c, 
+    ASSET_80D_SPRITE_LIVE_JIGGY,
+    ASSET_80E_SPRITE_LIVE_EXTRA_LIFE,
+    ASSET_80F_SPRITE_LIVE_GOLD_BULLION,
+    ASSET_810_SPRITE_LIVE_HONEYCOMB,
+
+    ASSET_812_SPRITE_LIVE_EMPTY_HONEYCOMB = 0x812,
+    ASSET_813_SPRITE_PIRANHA,
+    ASSET_814_SPRITE_SNACKER,
+    ASSET_815_SPRITE_TOOTY,
+    ASSET_816_SPRITE_GRUNTILDA,
+    ASSET_817_SPRITE_ANCIENT_ONE,
+    ASSET_818_SPRITE_TWINKLY_CHOMPER,
+
+    ASSET_81B_SPRITE_LIVE_MUSIC_NOTE = 0x81B,
+
+    ASSET_81D_SPRITE_LIVE_EXTRA_HEALTH_MAX = 0x81D,
+    ASSET_81E_SPRITE_LIVE_BLUE_EGG,
+    ASSET_81F_SPRITE_LIVE_GOLD_FEATHER,
+    ASSET_820_SPRITE_LIVE_RED_FEATHER,
+    ASSET_821_SPRITE_TWINKLY,
+    ASSET_822_SPRITE_XMAS_GIFT_BLUE,
+    ASSET_823_SPRITE_XMAS_GIFT_GREEN,
+    ASSET_824_SPRITE_XMAS_GIFT_RED,
+    ASSET_825_SPRITE_LIVE_ORANGE,
+    ASSET_826_SPRITE_TUMBLAR,
+    ASSET_827_SPRITE_LIVE_CLOCK,
+    ASSET_828_SPRITE_JUJU,
+
+    ASSET_82A_SPRITE_LEAKY = 0x82A,
+    ASSET_82B_SPRITE_KLUNGO,
+    ASSET_82C_SPRITE_MUMMUM,
+    ASSET_82D_SPRITE_ZUBBA,
+    ASSET_82E_SPRITE_BRENTILDA,
+    ASSET_82F_SPRITE_TIPTUP_CHOIR_MEMBER,
+    ASSET_830_SPRITE_JINXY,
+    ASSET_831_SPRITE_NABNUT,
+    ASSET_832_SPRITE_LITTLE_LOCKUP,
+    ASSET_833_SPRITE_DINGPOT,
+    ASSET_834_SPRITE_TERMITE,
+    ASSET_835_SPRITE_WOZZA,
+    ASSET_836_SPRITE_GLOOP,
+    ASSET_837_SPRITE_GNAWTY,
+    ASSET_838_SPRITE_SNORKEL,
+    ASSET_839_SPRITE_YUMYUM,
+    ASSET_83A_SPRITE_CROCTUS,
+    ASSET_83B_SPRITE_MOTZHAND,
+    ASSET_83C_SPRITE_BOGGY,
+    ASSET_83D_SPRITE_LOGGO,
+    ASSET_83E_SPRITE_EEYRIE_ADULT,
+    ASSET_83F_SPRITE_EEYRIE_YOUNG,
+    ASSET_840_SPRITE_WORM,
+    ASSET_841_SPRITE_SEXY_GRUNTY,
+    ASSET_842_SPRITE_CHEATO,
+    ASSET_843_SPRITE_POLAR_BEAR_CUBS,
+    ASSET_844_SPRITE_UGLY_TOOTY,
+    ASSET_845_SPRITE_BLACK_SNIPPET,
+    ASSET_846_SPRITE_SAND_EEL,
+    ASSET_847_SPRITE_BOSS_BOOM_BOX,
+    ASSET_848_SPRITE_FREEZING_WATER,
+    ASSET_849_SPRITE_LOCKUP,
 
     ASSET_88C_MODEL_MOTZHAND = 0x88c,
 

include/gc/gczoombox.h

@@ -14,7 +14,7 @@ typedef struct {
     u8 unk90[0x20];
     u8 unkB0[0x40];
     BKModelBin *unkF0;
-    AnimCtrl *unkF4;
+    AnimCtrl *anim_ctrl;
     BKSprite *unkF8;
     BKSpriteDisplayData *unkFC;
     BKSprite *unk100;
@@ -32,8 +32,8 @@ typedef struct {
     u8  unk138; //current_string
     u8  unk139;
     u8  unk13A;
-    u8  unk13B;     //sfx_count
+    u8  sfx_count;
-    u8 *unk13C[8]; //string_ptrs
+    char *raw_str[8]; //string_ptrs
     u8 unk15C;
     u8 unk15D;
     u8 unk15E;
@@ -62,10 +62,10 @@ typedef struct {
     u8 unk185;
     s8 unk186;
     u8 unk187;
-    u8 unk188; //sprite frame count
+    u8 frame_count; //sprite frame count
     u8 unk189;
     u8 unk18A;
-    u8 unk18B;      //next_sfx
+    u8 prev_sfx;      //next_sfx
     f32 unk18C;
     f32 unk190;
     f32 unk194;

include/structs.h

@@ -307,19 +307,6 @@ typedef struct struct_16_s{
     s32 unkC;
 }struct16s;
 
-typedef struct struct_18_s{
-    s16 uid; /* enum sfx_e */
-    s16 unk2;
-    f32 unk4;
-}struct18s;
-
-typedef struct struct_17_s{
-    s16 uid;
-    s8 unk2;
-    s8 unk3;
-    struct18s soundInfo[5];
-}struct17s;
-
 typedef struct struct_1A_s{
     u8  pad0[0x8];
     u8  *str;

src/core2/ch/drips.c

@@ -52,7 +52,7 @@ void __chdrips_particleCallback(struct31s *pCtrl, f32 position[3]){
     if(func_8024549C(position, 4.0f)){
         position[1] += 2.0f;
         func_80359A40(position, &D_80372AF0, 1);
-        func_8030E878(SFX_413_UNKNOWN, randf2(1.0f, 1.4f), 20000, position, 0.0f, 3500.0f);
+        func_8030E878(SFX_413_WATER_RIPPLE, randf2(1.0f, 1.4f), 20000, position, 0.0f, 3500.0f);
     }
 }
 

src/core2/code_54D50.c

@@ -49,7 +49,7 @@ void func_802DBCE0(ParticleEmitter *pCtrl, f32 arg1[3]){
         func_802EFEC0(other, 1.0f, 1.4f);
         func_802EFA5C(other, 0.0f, 0.5f);
         particleEmitter_emitN(other, 1);
-        func_8030E878(SFX_413_UNKNOWN, randf2(1.0f, 1.4f), 0x4e20, arg1, 0.0f, 3500.0f);
+        func_8030E878(SFX_413_WATER_RIPPLE, randf2(1.0f, 1.4f), 0x4e20, arg1, 0.0f, 3500.0f);
     }
     else{//L802DBDF4
         particleEmitter_setSprite(other, ASSET_700_SPRITE_DUST);

subyaml/core2.us.v10.yaml

@@ -523,6 +523,8 @@ segments:
   - [0xE3980, bin, data_E3980]
   - [0xE3C50, .data, code_82000]
   - [0xE4870, bin, data_E4870]
+  - [0xE5730, .data, gc/zoombox]
+  - [0xE69B0, bin, data_E69B0]
   - [0xE7330, .data, code_9B990]
   - [0xE7490, .data, code_9D640]
   - [0xE75D0, bin, data_E75D0]