Merge branch 'master' into 'master'
BGS documentation part 2 See merge request banjo.decomp/banjo-kazooie!107
This commit is contained in:
@@ -1888,7 +1888,7 @@ enum actor_e
|
||||
ACTOR_EE_PINK_EGG_MEDIUM,
|
||||
ACTOR_EF_PINK_EGG_SMALL,
|
||||
ACTOR_F0_PINK_EGG_SMALLEST,
|
||||
ACTOR_F1_LEAFBOAT,
|
||||
ACTOR_F1_LEAF_BOAT,
|
||||
ACTOR_F2_BLACK_SNIPPET,
|
||||
|
||||
ACTOR_F4_BURIED_TREASURE = 0xF4,
|
||||
@@ -2652,7 +2652,7 @@ enum asset_e
|
||||
ASSET_4B_ANIM_BSBFLIP_ENTER = 0x4B,
|
||||
ASSET_4C_ANIM_BSBFLIP_HOLD,
|
||||
ASSET_4D_ANIM_BSOW,
|
||||
ASSET_4E_ANIM_MUDHUT_SMASH,
|
||||
ASSET_4E_ANIM_MUD_HUT_SMASH,
|
||||
ASSET_4F_ANIM_BSTWIRL,
|
||||
/* [0x50] empty */
|
||||
ASSET_51_ANIM_CONGA_IDLE = 0x51,
|
||||
@@ -3059,7 +3059,7 @@ enum asset_e
|
||||
ASSET_30A_MODEL_CLANKER_JIGGY_TOOTH_EXTERIOR,
|
||||
// Unused
|
||||
// Unused
|
||||
ASSET_30D_MODEL_LEAFBOAT = 0x30D,
|
||||
ASSET_30D_MODEL_LEAF_BOAT = 0x30D,
|
||||
// 30e (Wood Pipe?)
|
||||
// Unused
|
||||
// Unused
|
||||
@@ -5061,7 +5061,7 @@ enum marker_e{
|
||||
MARKER_D7_PINK_EGG_MEDIUM,
|
||||
MARKER_D8_PINK_EGG_SMALL,
|
||||
MARKER_D9_PINK_EGG_SMALLEST,
|
||||
MARKER_DA_LEAFBOAT,
|
||||
MARKER_DA_LEAF_BOAT,
|
||||
MARKER_DB_BURIED_TREASURE,
|
||||
MARKER_DC_BIG_ALLIGATOR,
|
||||
MARKER_DD_BLACK_SNIPPET,
|
||||
|
Reference in New Issue
Block a user