kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

enum documentation

Browse Source
This commit is contained in:
Banjo Kazooie
2022-08-14 19:01:15 -05:00
parent 023aafaa92
commit 46ed2ced3c
43 changed files with 402 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BGS/ch/flibbit.c
View File

@@ -24,7 +24,7 @@ Actor *chflibbit_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
/* .data */
ActorInfo D_80390690 = {
0xC1, 0x133, 0x375,
MARKER_C1_FLIBBIT_RED, ACTOR_133_FLIBBIT_RED, ASSET_375_MODEL_FLIBBIT_RED,
0, NULL,
chflibbit_update, NULL, chflibbit_draw,
0, 0, 1.0f, 0

2
src/BGS/ch/leafboat.c
View File

@@ -22,7 +22,7 @@ Actor *func_8038FD10(ActorMarker *this, Gfx** gdl, Mtx** mtx, u32 arg3);
/* .data section */
u8 D_80390DA0[6] = {0, 0, 0, 1, 1, 1};
ActorInfo D_80390DA8 = {0xDA, actor_leafboat, 0x30D,
ActorInfo D_80390DA8 = {0xDA, ACTOR_F1_LEAFBOAT, 0x30D,
0x01, NULL,
func_8038FD9C, func_8038FD9C, func_8038FD10,
0, 0, 0.0f, 0

2
src/BGS/ch/yellowflibbit.c
View File

@@ -22,7 +22,7 @@ void func_8038E034(Actor *this);
/* .data */
ActorInfo D_80390AE0 = {
0xC5, 0x137, 0x385,
MARKER_C5_FLIBBIT_YELLOW, ACTOR_137_FLIBBIT_YELLOW, ASSET_385_MODEL_FLIBBIT_YELLOW,
0, NULL,
func_8038E034, NULL, func_8038DE5C,
0, 0, 1.0f, 0

2
src/BGS/done/ch/bigalligator.c
View File

@@ -9,7 +9,7 @@
void func_8038FCB0(Actor *);
/* .data */
ActorInfo D_80390D70 = {0xDC, actor_bigalligator, 0x397, 0x01, NULL,
ActorInfo D_80390D70 = {0xDC, ACTOR_F6_BIG_ALLIGATOR, 0x397, 0x01, NULL,
func_8038FCB0, func_80326224, func_80325888,
0, 0, 0.0f, 0
};

19
src/BGS/done/ch/pinkegg.c
View File

@@ -12,7 +12,14 @@ void chpinkegg_collision(ActorMarker *this, ActorMarker *other_marker);
void chpinkegg_update(Actor *this);
u32 D_803906C0 = 0x5B;
enum actor_e D_803906C4[5] = {0xED, 0xEE, 0xEF, 0xF0, 0x00};
enum actor_e D_803906C4[5] = {
ACTOR_ED_PINK_EGG_LARGE,
ACTOR_EE_PINK_EGG_MEDIUM,
ACTOR_EF_PINK_EGG_SMALL,
ACTOR_F0_PINK_EGG_SMALLEST,
0x00
};
ActorAnimationInfo D_803906D8[4] = {
{0, 0.0f},
{0, 0.0f},
@@ -20,27 +27,27 @@ ActorAnimationInfo D_803906D8[4] = {
{0x10B, 2.0f}
};
ActorInfo D_803906F8 = {0x6E, 0x5B, 0x380, 0x01, D_803906D8,
ActorInfo D_803906F8 = {MARKER_6E_PINK_EGG_LARGEST, ACTOR_5B_PINK_EGG_LARGEST, ASSET_380_MODEL_PINK_EGG_LARGEST, 0x01, D_803906D8,
chpinkegg_update, func_80326224, chpinkegg_draw,
0, 0x2CC, 6.0f, 0
};
ActorInfo D_8039071C = {0xD6, 0xED, 0x381, 0x01, D_803906D8,
ActorInfo D_8039071C = {MARKER_D6_PINK_EGG_LARGE, ACTOR_ED_PINK_EGG_LARGE, ASSET_381_MODEL_PINK_EGG_LARGE, 0x01, D_803906D8,
chpinkegg_update, func_80326224, chpinkegg_draw,
0, 0x2CC, 5.0f, 0
};
ActorInfo D_80390740 = {0xD7, 0xEE, 0x382, 0x01, D_803906D8,
ActorInfo D_80390740 = {MARKER_D7_PINK_EGG_MEDIUM, ACTOR_EE_PINK_EGG_MEDIUM, ASSET_382_MODEL_PINK_EGG_MEDIUM, 0x01, D_803906D8,
chpinkegg_update, func_80326224, chpinkegg_draw,
0, 0x2CC, 4.0f, 0
};
ActorInfo D_80390764 = {0xD8, 0xEF, 0x383, 0x01, D_803906D8,
ActorInfo D_80390764 = {MARKER_D8_PINK_EGG_SMALL, ACTOR_EF_PINK_EGG_SMALL, ASSET_383_MODEL_PINK_EGG_SMALL, 0x01, D_803906D8,
chpinkegg_update, func_80326224, chpinkegg_draw,
0, 0x2CC, 3.0f, 0
};
ActorInfo D_80390788 = {0xD9, 0xF0, 0x384, 0x01, D_803906D8,
ActorInfo D_80390788 = {MARKER_D9_PINK_EGG_SMALLEST, ACTOR_F0_PINK_EGG_SMALLEST, ASSET_384_MODEL_PINK_EGG_SMALLEST, 0x01, D_803906D8,
chpinkegg_update, func_80326224, chpinkegg_draw,
0, 0x2CC, 2.0f, 0
};

24
src/CC/ch/sawblade.c
View File

@@ -31,84 +31,84 @@ Struct_CC_3130_0 D_80389C30[] = {
};
ActorInfo D_80389C90 = {
0x28, ACTOR_3D_CLANKER_SAWBLADE_PROPELLOR_1, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
MARKER_28_CLANKER_SAWBLADE, ACTOR_3D_CLANKER_SAWBLADE_PROPELLOR_1, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
0, 0, 0.0f, 0
};
ActorInfo D_80389CB4 = {
0x28, ACTOR_3E_CLANKER_SAWBLADE_PROPELLOR_2, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
MARKER_28_CLANKER_SAWBLADE, ACTOR_3E_CLANKER_SAWBLADE_PROPELLOR_2, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
0, 0, 0.0f, 0
};
ActorInfo D_80389CD8 = {
0x28, ACTOR_3F_CLANKER_SAWBLADE_PROPELLOR_3, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
MARKER_28_CLANKER_SAWBLADE, ACTOR_3F_CLANKER_SAWBLADE_PROPELLOR_3, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
0, 0, 0.0f, 0
};
ActorInfo D_80389CFC = {
0x28, ACTOR_40_CLANKER_SAWBLADE_PROPELLOR_4, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
MARKER_28_CLANKER_SAWBLADE, ACTOR_40_CLANKER_SAWBLADE_PROPELLOR_4, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
0, 0, 0.0f, 0
};
ActorInfo D_80389D20 = {
0x28, ACTOR_41_CLANKER_SAWBLADE_PROPELLOR_5, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
MARKER_28_CLANKER_SAWBLADE, ACTOR_41_CLANKER_SAWBLADE_PROPELLOR_5, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
0, 0, 0.0f, 0
};
ActorInfo D_80389D44 = {
0x28, ACTOR_42_CLANKER_SAWBLADE_PROPELLOR_6, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
MARKER_28_CLANKER_SAWBLADE, ACTOR_42_CLANKER_SAWBLADE_PROPELLOR_6, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
0, 0, 0.0f, 0
};
ActorInfo D_80389D68 = {
0x28, ACTOR_290_CLANKER_SAWBLADE_PROPELLOR_7, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
MARKER_28_CLANKER_SAWBLADE, ACTOR_290_CLANKER_SAWBLADE_PROPELLOR_7, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
0, 0, 0.0f, 0
};
ActorInfo D_80389D8C = {
0x28, ACTOR_291_CLANKER_SAWBLADE_PROPELLOR_8, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
MARKER_28_CLANKER_SAWBLADE, ACTOR_291_CLANKER_SAWBLADE_PROPELLOR_8, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
0, 0, 0.0f, 0
};
ActorInfo D_80389DB0 = {
0x28, ACTOR_292_CLANKER_SAWBLADE_PROPELLOR_9, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
MARKER_28_CLANKER_SAWBLADE, ACTOR_292_CLANKER_SAWBLADE_PROPELLOR_9, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
0, 0, 0.0f, 0
};
ActorInfo D_80389DD4 = {
0x28, ACTOR_293_CLANKER_SAWBLADE_PROPELLOR_10, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
MARKER_28_CLANKER_SAWBLADE, ACTOR_293_CLANKER_SAWBLADE_PROPELLOR_10, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
0, 0, 0.0f, 0
};
ActorInfo D_80389DF8 = {
0x28, ACTOR_294_CLANKER_SAWBLADE_PROPELLOR_11, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
MARKER_28_CLANKER_SAWBLADE, ACTOR_294_CLANKER_SAWBLADE_PROPELLOR_11, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
0, 0, 0.0f, 0
};
ActorInfo D_80389E1C = {
0x28, ACTOR_295_CLANKER_SAWBLADE_PROPELLOR_12, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
MARKER_28_CLANKER_SAWBLADE, ACTOR_295_CLANKER_SAWBLADE_PROPELLOR_12, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
0, 0, 0.0f, 0

2
src/CC/code_530.c
View File

@@ -22,7 +22,7 @@ void func_80386B28(Actor* this);
/* .data */
ActorInfo D_80389AD0 = {
0x4A, 0x3C, 0x429, 0, NULL,
MARKER_4A_CC_KEY, ACTOR_3C_CC_KEY, ASSET_429_MODEL_CC_KEY, 0, NULL,
func_80386B28, func_80326224, func_80325888,
0, 0, 0.0f, 0
};

2
src/CCW/code_3310.c
View File

@@ -46,7 +46,7 @@ void func_80389BFC(Actor *this);
/* .data */
extern Struct_CCW_3310_1 D_8038F060[];
extern Struct_CCW_3310_0 D_8038F080[];
extern ActorInfo D_8038F130 = { 0x1B4, 0x2A1, 0x484, 0x0, NULL, func_80389BFC, NULL, func_80389B24, 0, 0, 0.0f, 0};
extern ActorInfo D_8038F130 = { MARKER_1B4_EEYRIE_BABY, ACTOR_2A1_EEYRIE_BABY, ASSET_484_MODEL_EAGLE_BABY, 0x0, NULL, func_80389BFC, NULL, func_80389B24, 0, 0, 0.0f, 0};
/* .bss */
extern f32 D_8038FDE0[3];

2
src/CCW/code_7BF0.c
View File

@@ -9,7 +9,7 @@ void func_8038E0C8(Actor *this);
extern ActorAnimationInfo D_8038F8F0[];
extern ActorInfo D_8038F908 = {
0x1F9, 0x1E9, 0x440,
MARKER_1F9_SNARE_BEAR, ACTOR_1E9_SNARE_BEAR, ASSET_440_MODEL_SNAREBEAR,
0x1, D_8038F8F0,
func_8038E0C8, func_80326224, func_80325888,
0, 0, 0.0f, 0

2
src/CCW/code_8050.c
View File

@@ -42,7 +42,7 @@ Actor *func_8038E56C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
/* .data */
extern ActorAnimationInfo D_8038F930[];
extern ActorInfo D_8038F988 = {
0x1E2, 0x375, 0x52C,
MARKER_1E2_GRUBLIN_HOOD, ACTOR_375_GRUBLIN_HOOD, ASSET_52C_MODEL_GRUBLIN_HOOD,
0x1, D_8038F930,
func_8038E964, func_80326224, func_8038E56C,
2500, 0, 1.0f, 0

2
src/FP/code_5CC0.c
View File

@@ -140,7 +140,7 @@ void func_8038C398(f32 position[3], enum marker_e marker_id){
break;
case MARKER_203_TWINKLY_RED:
sp1C = ASSET_49B_MODLE_TWINKLY_SHARD_RED;
sp1C = ASSET_49B_MODEL_TWINKLY_SHARD_RED;
break;
}
func_8038C260(position, 12, sp1C);

2
src/FP/code_A880.c
View File

@@ -7,7 +7,7 @@ extern s32 func_8024DB50(f32[3], f32);
void func_80390EB0(Actor *this);
/* .data */
extern ActorInfo D_80392840 = { 0x245, 0x353, 0x402,
extern ActorInfo D_80392840 = { MARKER_245_XMAS_TREE_EGG_TOLL, ACTOR_353_XMAS_TREE_EGG_TOLL, ASSET_402_MODEL_EGG_TOLL,
0x0, NULL,
func_80390EB0, func_80326224, func_80325340,
2000, 0, 0.0f, 0

4
src/MMM/code_16B0.c
View File

@@ -13,7 +13,7 @@ Actor *func_80387AA0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
/* .data */
extern ActorInfo D_8038BAD0 = {
MARKER_254_PORTRAIT_CHOMPA, ACTOR_381_PORTRAIT_CHOMPA, ASSET_521_MODEL_PORTRAIT_CHOMPA,
MARKER_254_PORTRAIT_CHOMPA_A, ACTOR_381_PORTRAIT_CHOMPA, ASSET_521_MODEL_PORTRAIT_CHOMPA,
0x0, NULL,
func_80388028, NULL, func_80387AA0,
0, 0, 0.0f, 0
@@ -60,7 +60,7 @@ void func_80387B14(Actor *this, s32 next_state){
}
if(next_state == 4){
this->marker->unk14_20 = MARKER_254_PORTRAIT_CHOMPA;
this->marker->unk14_20 = MARKER_254_PORTRAIT_CHOMPA_A;
func_80335924(this->unk148, 0x23e, 0.0f, 2.5f);
func_80335A8C(this->unk148, 2);
if(this->unk100){

2
src/RBB/code_0.c
View File

@@ -30,7 +30,7 @@ void func_803868F0(Actor* this);
/* .data */
ActorInfo D_80390050 = {
MARKER_182_RBB_EGG_TOLL, ACTOR_172_RBB_EGG_TOLL, ASSET_402_MODEL_RBB_EGG_TOLL,
MARKER_182_RBB_EGG_TOLL, ACTOR_172_RBB_EGG_TOLL, ASSET_402_MODEL_EGG_TOLL,
0x0, NULL,
func_803868F0, NULL, func_80325340,
0, 0, 0.0f, 0

2
src/RBB/code_1FC0.c
View File

@@ -18,7 +18,7 @@ void func_80388620(Actor *this);
/* .data */
ActorInfo D_80390380 = {
0x2E, 0x1C6, 0x419, 0x0, NULL,
MARKER_2E_GRIMLET, ACTOR_1C6_GRIMLET, ASSET_419_MODEL_GRIMLET, 0x0, NULL,
func_80388620, NULL, func_8038846C,
0, 0, 0.0f, 0
};

6
src/RBB/code_2E90.c
View File

@@ -57,19 +57,19 @@ Struct_RBB_2E90_0 D_80390530[] = {
};
ActorInfo D_80390640 = {
0x191, 0x1BB, 0x40F, 0x0, NULL,
ACTOR_191_ENGINE_ROOM_PROPELLOR_1, ACTOR_1BB_ENGINE_ROOM_PROPELLOR_1, ASSET_40F_MODEL_ENGINE_ROOM_PROPELLER_1, 0x0, NULL,
func_8038944C, NULL, func_80325888,
0, 0, 0.0f, 0
};
ActorInfo D_80390664 = {
0x192, 0x1BC, 0x410, 0x0, NULL,
ACTOR_192_ENGINE_ROOM_PROPELLOR_2, ACTOR_1BC_ENGINE_ROOM_PROPELLOR_2, ASSET_410_MODEL_ENGINE_ROOM_PROPELLER_2, 0x0, NULL,
func_8038944C, NULL, func_80325888,
0, 0, 0.0f, 0
};
ActorInfo D_80390688 = {
0x193, 0x1BD, 0x411, 0x0, NULL,
ACTOR_193_ENGINE_ROOM_PROPELLOR_3, ACTOR_1BD_ENGINE_ROOM_PROPELLOR_3, ASSET_411_MODEL_ENGINE_ROOM_PROPELLER_3, 0x0, NULL,
func_8038944C, NULL, func_80325888,
0, 0, 0.0f, 0
};

3
src/RBB/code_36A0.c
View File

@@ -14,7 +14,8 @@ void func_80389C78(Actor *this);
/* .data */
ActorInfo D_803906E0 = {
0x185, 0x175, 0x403, 0x0, NULL,
MARKER_185_MODEL_RUSTY_BUCKET_REAR_PROPELLER, ACTOR_175_MODEL_RUSTY_BUCKET_REAR_PROPELLER, ASSET_403_MODEL_RUSTY_BUCKET_REAR_PROPELLER,
0x0, NULL,
func_80389C78, NULL, func_80325888,
0, 0, 0.0f, 0
};

20
src/RBB/code_5F80.c
View File

@@ -41,32 +41,32 @@ void func_8038D8BC(Actor *this);
/* .data */
Struct_RBB_5F80 D_80390B70[4] = {
{0x281, 1.1f, 1.0f, 0x14, 0x01, 0x5, 0.9f, 0.8f},
{0x282, 0.75f, 1.0f, 0xF, 0x02, 0x4, 1.1f, 0.9f},
{0x283, 0.5f, 2.0f, 0xA, 0x02, 0x3, 1.3f, 1.0f},
{0x284, 0.25f, 2.0f, 0x5, 0x02, 0x2, 1.5f, 1.1f},
{ACTOR_281_BOSS_BOOM_BOX_LARGEST, 1.1f, 1.0f, 0x14, 0x01, 0x5, 0.9f, 0.8f},
{ACTOR_282_BOSS_BOOM_BOX_LARGE, 0.75f, 1.0f, 0xF, 0x02, 0x4, 1.1f, 0.9f},
{ACTOR_283_BOSS_BOOM_BOX_MEDIUM, 0.5f, 2.0f, 0xA, 0x02, 0x3, 1.3f, 1.0f},
{ACTOR_284_BOSS_BOOM_BOX_SMALL, 0.25f, 2.0f, 0x5, 0x02, 0x2, 1.5f, 1.1f},
};
ActorInfo D_80390BD0 = {
0x1A1, 0x281, 0x428, 0x0, NULL,
MARKER_1A1_BOSS_BOOM_BOX_LARGEST, ACTOR_281_BOSS_BOOM_BOX_LARGEST, ASSET_428_MODEL_BOSS_BOOM_BOX, 0x0, NULL,
func_8038D8BC, NULL, func_8038D638,
0, 0, 0.0f, 0
};
ActorInfo D_80390BF4 = {
0x1A2, 0x282, 0x428, 0x0, NULL,
MARKER_1A2_BOSS_BOOM_BOX_LARGE, ACTOR_282_BOSS_BOOM_BOX_LARGE, ASSET_428_MODEL_BOSS_BOOM_BOX, 0x0, NULL,
func_8038D8BC, NULL, func_8038D638,
0, 0, 0.0f, 0
};
ActorInfo D_80390C18 = {
0x1A3, 0x283, 0x428, 0x0, NULL,
MARKER_1A3_BOSS_BOOM_BOX_MEDIUM, ACTOR_283_BOSS_BOOM_BOX_MEDIUM, ASSET_428_MODEL_BOSS_BOOM_BOX, 0x0, NULL,
func_8038D8BC, NULL, func_8038D638,
0, 0, 0.0f, 0
};
ActorInfo D_80390C3C = {
0x1A4, 0x284, 0x428, 0x0, NULL,
MARKER_1A4_BOSS_BOOM_BOX_SMALL, ACTOR_284_BOSS_BOOM_BOX_SMALL, ASSET_428_MODEL_BOSS_BOOM_BOX, 0x0, NULL,
func_8038D8BC, NULL, func_8038D638,
0, 0, 0.0f, 0
};
@@ -357,7 +357,7 @@ void func_8038CC9C(Actor *this, s32 new_state){
if(this->state == 6){
func_80326310(this);
if(local->unk0->unk0 == 0x284){
if(local->unk0->unk0 == ACTOR_284_BOSS_BOOM_BOX_SMALL){
if(++D_80391280 == 8){
func_8025A58C(-1, 0x190);
comusic_8025AB44(COMUSIC_62_RBB_BOOMBOX, 0, 0x190);
@@ -517,7 +517,7 @@ void func_8038D8BC(Actor *this){
}
marker_setCollisionScripts(this->marker, func_8038D590, func_8038D5BC, func_8038D608);
func_803300D8(this->marker, func_8038D8B4);
if(local->unk0->unk0 == 0x281){
if(local->unk0->unk0 == ACTOR_281_BOSS_BOOM_BOX_LARGEST){
func_8038CC9C(this, 1);
D_80391280 = 0;
}

4
src/RBB/code_8520.c
View File

@@ -30,13 +30,13 @@ void func_8038F618(Actor *this);
f32 D_80390D80[2] = {1.8f, 1.0f};
ActorInfo D_80390D88 = {
0x1B7, 0x2A4, 0x48C, 0x0, NULL,
MARKER_1B7_BOOM_BOX, ACTOR_2A4_BOOM_BOX_SLOW, ASSET_48C_MODEL_BOOM_BOX, 0x0, NULL,
func_8038F618, NULL, func_8038F4B0,
0, 0, 0.0f, 0
};
ActorInfo D_80390DAC = {
0x1B7, 0x30D, 0x48C, 0x0, NULL,
MARKER_1B7_BOOM_BOX, ACTOR_30D_BOOM_BOX_FAST, ASSET_48C_MODEL_BOOM_BOX, 0x0, NULL,
func_8038F618, NULL, func_8038F4B0,
0, 0, 0.0f, 0
};

4
src/SM/ch/attacktutorial.c
View File

@@ -15,7 +15,7 @@ void chAttackTutorial_update(Actor *);
/* .data */
ActorInfo D_8038AC20 = { MARKER_12B_ATTACK_TUTORIAL, ACTOR_ATTACK_TUTORIAL, 0,
ActorInfo D_8038AC20 = { MARKER_12B_ATTACK_TUTORIAL, ACTOR_167_ATTACK_TUTORIAL, 0,
1, NULL,
chAttackTutorial_update, func_80326224, func_80325340,
0, 0, 0.0f, 0
@@ -42,7 +42,7 @@ s32 func_803871FC(Actor *this, s32 arg1){
volatile s32 sp1C;
s32 tmp_v0;
sp1C = (arg1 == 1)? ACTOR_TOPPER_A : (tmp_v0 = (arg1 == 2)? ACTOR_BAWL_A : ACTOR_164_COLLYWOBBLE_A);
sp1C = (arg1 == 1)? ACTOR_166_TOPPER_A : (tmp_v0 = (arg1 == 2)? ACTOR_165_BAWL_A : ACTOR_164_COLLYWOBBLE_A);
func_802C3D3C(__chAttackTutorial_spawnEnemy, this->marker, sp1C);
}

12
src/SM/ch/vegetables.c
View File

@@ -32,12 +32,12 @@ ActorAnimationInfo chCarrotAnimations[5] = {
{0x223, 1.0f}
};
ActorInfo D_8038AC78 = { 0x12A, ACTOR_TOPPER_A, MODEL_TOPPER, 1, chCarrotAnimations,
ActorInfo D_8038AC78 = { MARKER_12A_TOPPER_A, ACTOR_166_TOPPER_A, MODEL_TOPPER, 1, chCarrotAnimations,
func_80388080, func_80326224, func_80387DF4,
2000, 0, 1.0f, 0
};
ActorInfo D_8038AC9C = { 0x1E6, ACTOR_TOPPER_B, MODEL_TOPPER, 1, chCarrotAnimations,
ActorInfo D_8038AC9C = { MARKER_1E6_TOPPER_B, ACTOR_TOPPER_B, MODEL_TOPPER, 1, chCarrotAnimations,
func_80388080, func_80326224, func_80387DF4,
2000, 0, 1.0f, 0
};
@@ -50,12 +50,12 @@ ActorAnimationInfo chOnionAnimations[5] = {
{0x226, 1.0f}
};
ActorInfo D_8038ACE8 = { 0x129, ACTOR_BAWL_A, MODEL_BAWL, 1, chOnionAnimations,
ActorInfo D_8038ACE8 = { MARKER_129_BAWL_A, ACTOR_165_BAWL_A, MODEL_BAWL, 1, chOnionAnimations,
func_80388080, func_80326224, func_80387DF4,
0, 0, 1.0f, 0
};
ActorInfo D_8038AD0C = { 0x1E7, ACTOR_BAWL_B, MODEL_BAWL, 1, chOnionAnimations,
ActorInfo D_8038AD0C = { MARKER_1E7_BAWL_B, ACTOR_BAWL_B, MODEL_BAWL, 1, chOnionAnimations,
func_80388080, func_80326224, func_80387DF4,
0, 0, 1.0f, 0
};
@@ -68,12 +68,12 @@ ActorAnimationInfo chCauliflowerAnimations[5] = {
{0x225, 1.0f}
};
ActorInfo D_8038AD58 = { 0x128, ACTOR_164_COLLYWOBBLE_A, MODEL_COLLYWOBBLE, 1, chCauliflowerAnimations,
ActorInfo D_8038AD58 = { MARKER_128_COLLYWOBBLE_A, ACTOR_164_COLLYWOBBLE_A, MODEL_COLLYWOBBLE, 1, chCauliflowerAnimations,
func_80388080, func_80326224, func_80387DF4,
0, 0, 2.0f, 0
};
ActorInfo D_8038AD7C = { 0x1E8, ACTOR_COLLYWOBBLE_B, MODEL_COLLYWOBBLE, 1, chCauliflowerAnimations,
ActorInfo D_8038AD7C = { MARKER_1E8_COLLYWOBBLE_B, ACTOR_COLLYWOBBLE_B, MODEL_COLLYWOBBLE, 1, chCauliflowerAnimations,
func_80388080, func_80326224, func_80387DF4,
0, 0, 2.0f, 0
};

4
src/SM/code_5B0.c
View File

@@ -16,14 +16,14 @@ ActorAnimationInfo D_8038AAF0[] = {
};
ActorInfo D_8038AB00 = {
0x135, 0x16F, 0x42D,
MARKER_135_QUARRIE, ACTOR_16F_QUARRIE, ASSET_42D_MODEL_QUARRIE,
1, NULL,
func_80386EF4, func_80326224, func_80325E78,
2000, 0, 5.0f, 0
};
ActorInfo D_8038AB24 = {
0x29D, 0x3CA, 0x47B,
MARKER_29D_ROCK_TRAPPING_GRUNTY, ACTOR_3CA_ROCK_TRAPPING_GRUNTY, ASSET_47B_MODEL_ROCK,
1, D_8038AAF0,
func_80386A00, func_80326224, func_80325E78,
0, 0, 0.0f, 0

18
src/TTC/ch/lockup.c
View File

@@ -23,21 +23,21 @@ ActorAnimationInfo D_8038C760[] ={
};
ActorInfo D_8038C790 = {
0xA4, 0x151, 0x3D4,
MARKER_A4_LOCKUP_SLOW, ACTOR_151_LOCKUP_SLOW, ASSET_3D4_MODEL_LOCKUP,
1, D_8038C760,
func_80389600, func_80326224, func_803894C0,
2500, 0x366, 0.0f, 0
};
ActorInfo D_8038C7B4 = {
0xF6, 0x152, 0x3D4,
MARKER_F6_LOCKUP_MEDIUM, ACTOR_152_LOCKUP_MEDIUM, ASSET_3D4_MODEL_LOCKUP,
1, D_8038C760,
func_80389600, func_80326224, func_803894C0,
2500, 0x366, 0.0f, 0
};
ActorInfo D_8038C7D8 = {
0xF7, 0x153, 0x3D4,
MARKER_F7_LOCKUP_FAST, ACTOR_153_LOCKUP_FAST, ASSET_3D4_MODEL_LOCKUP,
1, D_8038C760,
func_80389600, func_80326224, func_803894C0,
2500, 0x366, 0.0f, 0
@@ -101,9 +101,9 @@ void func_80389600(Actor *this){
}//L80389758
local->unk0++;
tmp_v1 = (this->modelCacheIndex == 0x151) ? 0x1E :
(this->modelCacheIndex == 0x152) ? 0x14 :
(this->modelCacheIndex == 0x153) ? 0xA :
tmp_v1 = (this->modelCacheIndex == ACTOR_151_LOCKUP_SLOW) ? 0x1E :
(this->modelCacheIndex == ACTOR_152_LOCKUP_MEDIUM) ? 0x14 :
(this->modelCacheIndex == ACTOR_153_LOCKUP_FAST) ? 0xA :
10000;
@@ -128,9 +128,9 @@ void func_80389600(Actor *this){
case 3: //L80389864
local->unk4++;
tmp_v1 = (this->modelCacheIndex == 0x151) ? 0x1E :
(this->modelCacheIndex == 0x152) ? 0x14 :
(this->modelCacheIndex == 0x153) ? 0xA :
tmp_v1 = (this->modelCacheIndex == ACTOR_151_LOCKUP_SLOW) ? 0x1E :
(this->modelCacheIndex == ACTOR_152_LOCKUP_MEDIUM) ? 0x14 :
(this->modelCacheIndex == ACTOR_153_LOCKUP_FAST) ? 0xA :
10000;
if(!(local->unk4 < tmp_v1)){

2
src/core2/ch/clankerwhipcrack.c
View File

@@ -6,7 +6,7 @@ void func_803567EC(Actor *this);
/* .data */
ActorInfo D_80372810 = {
0x1A7, ACTOR_28A_CLANKER_WHIPCRACK, ASSET_432_MODEL_CLANKER_WHIPCRACK,
MARKER_1A7_CLANKER_WHIPCRACK, ACTOR_28A_CLANKER_WHIPCRACK, ASSET_432_MODEL_CLANKER_WHIPCRACK,
0, NULL,
func_803567EC, NULL, func_80325888,
0, 0, 0.0f, 0

10
src/core2/ch/clucker.c
View File

@@ -15,7 +15,7 @@ void func_8035765C(Actor *this);
/* .data */
extern ActorInfo D_80372870 = {
0x1B2, ACTOR_29F_CLUCKER, ASSET_482_MODEL_CLUCKER,
MARKER_1B2_CLUCKER_A, ACTOR_29F_CLUCKER, ASSET_482_MODEL_CLUCKER,
0, NULL,
func_8035765C, NULL, func_803575B8,
0, 0, 0.0f, 0
@@ -52,7 +52,7 @@ void func_80357264(Actor *this, s32 next_state){
f32 sp38;
s32 pad34;
this->marker->unk14_20 = 0x1d0;
this->marker->unk14_20 = MARKER_1D0_CLUCKER_B;
actor_collisionOff(this);
if(next_state == 1 || next_state == 2){
func_80335924(this->unk148, ASSET_184_ANIM_CLUCKER_ATTACK_SHORT, 0.0f, 2.5f);
@@ -78,7 +78,7 @@ void func_80357264(Actor *this, s32 next_state){
local->unk4 = 0.2f;
if(next_state == 4){
this->marker->unk14_20 = 0x1b2;
this->marker->unk14_20 = MARKER_1B2_CLUCKER_A;
actor_collisionOn(this);
local->unk0 = (local->unk0 + 1) % 3;
if(local->unk0 < 2)
@@ -177,7 +177,7 @@ void func_8035765C(Actor *this){
func_8033568C(this->unk148, &sp4C, &sp48);
if(func_8033567C(this->unk148) == 0x185){
if(sp4C < 0.58 && 0.58 <= sp48){
this->marker->unk14_20 = 0x1d0;
this->marker->unk14_20 = MARKER_1D0_CLUCKER_B;
}
if(sp4C < 0.05 && 0.05 <= sp48){
FUNC_8030E624(SFX_2_CLAW_SWIPE, 0.9f, 32000);
@@ -194,7 +194,7 @@ void func_8035765C(Actor *this){
}
else{//L803579F0
if(sp4C < 0.63 && 0.63 <= sp48){
this->marker->unk14_20 = 0x1d0;
this->marker->unk14_20 = MARKER_1D0_CLUCKER_B;
}
if(sp4C < 0.1 && 0.1 <= sp48){
FUNC_8030E624(SFX_2_CLAW_SWIPE, 0.9f, 32000);

2
src/core2/ch/code_5AB30.c
View File

@@ -30,7 +30,7 @@ ActorAnimationInfo D_80368650[] = {
};
ActorInfo D_80368670 = {
0xB1, ACTOR_124_SIR_SLUSH, ASSET_377_MODEL_SIR_SLUSH,
MARKER_B1_SIR_SLUSH, ACTOR_124_SIR_SLUSH, ASSET_377_MODEL_SIR_SLUSH,
1, D_80368650,
func_802E20E8, func_80326224, func_802E1AC0,
0, 0x199, 0.0f, 0

2
src/core2/ch/firefx.c
View File

@@ -8,7 +8,7 @@ void chfirefx_update(Actor *this);
/* .data */
ActorInfo gChFireFxInfo = {
0x256, ACTOR_383_FIRE_FX, ASSET_526_SPRITE_FIRE,
MARKER_256_FIRE_FX, ACTOR_383_FIRE_FX, ASSET_526_SPRITE_FIRE,
0, NULL,
chfirefx_update, func_80326224, func_80325888,
0, 0, 0.0f, 0

2
src/core2/ch/flotsam.c
View File

@@ -23,7 +23,7 @@ Actor* func_8035C71C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
/* .data */
ActorInfo D_80372C80 = {
0xC9, 0x13B, 0x401,
MARKER_C9_FLOTSAM, ACTOR_13B_FLOTSAM, ASSET_401_MODEL_FLOTSAM,
0, NULL,
func_8035C8F4, NULL, func_8035C71C,
0, 0, 1.0f, 0

4
src/core2/ch/ghost.c
View File

@@ -22,14 +22,14 @@ ActorAnimationInfo D_80372BE0[] ={
};
ActorInfo D_80372C18 = { //TEEHEE
0x99, ACTOR_CA_TEEHEE, ASSET_3CB_MODEL_TEEHEE,
MARKER_99_TEEHEE, ACTOR_CA_TEEHEE, ASSET_3CB_MODEL_TEEHEE,
0x1, D_80372BE0,
func_8035B900, func_80326224, func_80325888,
6500, 0, 0.9f, 0
};
ActorInfo D_80372C3C = { //PURPLE_TEEHEE (inside tumblar)
0x296, ACTOR_3C1_PURPLE_TEEHEE, ASSET_564_MODEL_PURPLE_TEEHEE,
MARKER_296_TEEHEE_PURPLE, ACTOR_3C1_PURPLE_TEEHEE, ASSET_564_MODEL_PURPLE_TEEHEE,
0x1, D_80372BE0,
func_8035B900, func_8035BD48, func_80325888,
6500, 0, 0.9f, 0

4
src/core2/ch/icecube.c
View File

@@ -20,14 +20,14 @@ ActorAnimationInfo D_80372B50[] = {
};
ActorInfo D_80372B80 = {
0x250, 0x37D, ASSET_504_MODEL_ICECUBE,
MARKER_250_ICECUBE_A, ACTOR_37D_ICECUBE_A, ASSET_504_MODEL_ICECUBE,
1, D_80372B50,
chicecube_update, func_80326224, chicecube_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80372BA4 = {
0x25F, 0x3A0, ASSET_504_MODEL_ICECUBE,
MARKER_25F_ICECUBE_B, ACTOR_3A0_ICECUBE_B, ASSET_504_MODEL_ICECUBE,
1, D_80372B50,
chicecube_update, func_80326224, chicecube_draw,
0, 0, 0.0f, 0

2
src/core2/ch/whipcrack.c
View File

@@ -6,7 +6,7 @@ void chwhipcrack_update(Actor *this);
/* .data */
ActorInfo D_80373100 = {
0x1c5, ACTOR_30F_WHIPCRACK, ASSET_4FD_MODEL_WHIPCRACK,
MARKER_1C5_WHIPCRACK, ACTOR_30F_WHIPCRACK, ASSET_4FD_MODEL_WHIPCRACK,
0, NULL,
chwhipcrack_update, NULL, func_80325888,
0, 0, 0.0f, 0

6
src/core2/code_440B0.c
View File

@@ -395,6 +395,6 @@ void func_802CBAAC(Actor *this) {
}
/* .data */
ActorInfo D_803670B8 = { 0x13, 0x67, 0x358, 0x1, D_80367010, func_802CBAAC, func_80326224, func_80325888, 1900, 0, 0.8f, 0};
ActorInfo D_803670DC = { 0xDD, 0xF2, 0x566, 0x1, D_80367010, func_802CBAAC, func_80326224, func_80325888, 1900, 0, 0.8f, 0};
ActorInfo D_80367100 = { 0x13, 0xF5, 0x38F, 0x1, D_80367060, func_802CBAAC, func_80326224, func_80325888, 1900, 0, 0.8f, 0};
ActorInfo D_803670B8 = { MARKER_13_SNIPPET, ACTOR_67_SNIPPET, ASSET_358_SNIPPET, 0x1, D_80367010, func_802CBAAC, func_80326224, func_80325888, 1900, 0, 0.8f, 0};
ActorInfo D_803670DC = { MARKER_DD_BLACK_SNIPPET, ACTOR_F2_BLACK_SNIPPET, ASSET_566_MODEL_BLACK_SNIPPET, 0x1, D_80367010, func_802CBAAC, func_80326224, func_80325888, 1900, 0, 0.8f, 0};
ActorInfo D_80367100 = { MARKER_13_SNIPPET, ACTOR_F5_MUTIE_SNIPPET, ASSET_38F_MODEL_MUTIE_SNIPPET, 0x1, D_80367060, func_802CBAAC, func_80326224, func_80325888, 1900, 0, 0.8f, 0};

2
src/core2/code_45310.c
View File

@@ -31,7 +31,7 @@ void func_802CCC5C(Actor *this);
/* .data */
extern ActorInfo D_80367130 = {
0xC2, 0x134, 0x3ED,
MARKER_C2_BUZZBOMB, ACTOR_134_BUZZBOMB, ASSET_3ED_MODEL_BUZZBOMB,
0, NULL,
func_802CCC5C, NULL, func_802CCA7C,
0, 0, 1.0f, 0

126
src/core2/code_B62B0.c
View File

@@ -2,6 +2,8 @@
#include "functions.h"
#include "variables.h"
//Struct5Cs = u16 packed bitwise as (aaaa bbcc cdde eeff)
typedef struct{
u16 unk0;
u16 unk2; //Struct5Cs
@@ -15,91 +17,91 @@ typedef struct{
/* .data */
Struct_core2_B62B0_0 D_80370AC0[0xBB] = {
{0x12A, 0x0000, {0x0904, 0x8504, 0x8504, 0x0000, 0x8504, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x7484}},
{0x129, 0x0000, {0x0504, 0x0984, 0x8504, 0x0000, 0x8504, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x7484}},
{0x128, 0x0000, {0x0000, 0x0000, 0x8404, 0x0984, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x7404}},
{0x135, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0804, 0x0804, 0x0000, 0x0804, 0x0804, 0x0000, 0x0000}},
{0x1E6, 0x0001, {0x0904, 0x0984, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0000, 0x0984, 0x0A04, 0x0000, 0x1020}},
{0x1E7, 0x0001, {0x0904, 0x0984, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0000, 0x0984, 0x0A04, 0x0000, 0x1020}},
{0x1E8, 0x0001, {0x0904, 0x0984, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0000, 0x0984, 0x0A04, 0x0000, 0x1020}},
{0x1EA, 0x0001, {0x0A08, 0x0984, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0984, 0x0A04, 0x0984, 0x2020}},
{0x295, 0x0001, {0x0A0C, 0x8988, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0988, 0x0A04, 0x0000, 0x2020}},
{0x1F1, 0x0001, {0x0A10, 0x898C, 0x8100, 0x8988, 0x8A08, 0x8A08, 0x0A84, 0x098C, 0x0A04, 0x0000, 0x2020}},
{MARKER_12A_TOPPER_A, 0x0000, {0x0904, 0x8504, 0x8504, 0x0000, 0x8504, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x7484}},
{MARKER_129_BAWL_A, 0x0000, {0x0504, 0x0984, 0x8504, 0x0000, 0x8504, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x7484}},
{MARKER_128_COLLYWOBBLE_A, 0x0000, {0x0000, 0x0000, 0x8404, 0x0984, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x7404}},
{MARKER_135_QUARRIE, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0804, 0x0804, 0x0000, 0x0804, 0x0804, 0x0000, 0x0000}},
{MARKER_1E6_TOPPER_B, 0x0001, {0x0904, 0x0984, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0000, 0x0984, 0x0A04, 0x0000, 0x1020}},
{MARKER_1E7_BAWL_B, 0x0001, {0x0904, 0x0984, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0000, 0x0984, 0x0A04, 0x0000, 0x1020}},
{MARKER_1E8_COLLYWOBBLE_B, 0x0001, {0x0904, 0x0984, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0000, 0x0984, 0x0A04, 0x0000, 0x1020}},
{MARKER_1EA_GRUNTLING_RED, 0x0001, {0x0A08, 0x0984, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0984, 0x0A04, 0x0984, 0x2020}},
{MARKER_295_GRUNTLING_BLUE, 0x0001, {0x0A0C, 0x8988, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0988, 0x0A04, 0x0000, 0x2020}},
{MARKER_1F1_GRUNTLING_BLACK, 0x0001, {0x0A10, 0x898C, 0x8100, 0x8988, 0x8A08, 0x8A08, 0x0A84, 0x098C, 0x0A04, 0x0000, 0x2020}},
{0x1E0, 0x0000, {0x7000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x0004, 0x8000, 0x0000, 0x7000}},
{0x005, 0x0001, {0x0904, 0x0984, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0984, 0x0A04, 0x0000, 0x1020}},
{0x004, 0x0001, {0x0A88, 0x0984, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0988, 0x0A04, 0x0000, 0x1020}},
{0x003, 0x0000, {0x0914, 0x990C, 0x2020, 0x8908, 0x8908, 0x8908, 0x0A04, 0x0914, 0x0904, 0x0000, 0x4020}},
{0x29E, 0x0000, {0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0xA000, 0x0004, 0x8000, 0x0000, 0x8000}},
{MARKER_7_CONGA, 0x0000, {0x0000, 0x0000, 0x3020, 0x9000, 0x0000, 0x0000, 0x0000, 0x0804, 0x9000, 0x0000, 0x3020}},
{0x013, 0x0002, {0x0504, 0x7584, 0x8100, 0x7584, 0x7604, 0x0A04, 0x0A84, 0x0504, 0x0A04, 0x0000, 0x1020}},
{MARKER_13_SNIPPET, 0x0002, {0x0504, 0x7584, 0x8100, 0x7584, 0x7604, 0x0A04, 0x0A84, 0x0504, 0x0A04, 0x0000, 0x1020}},
{0x16B, 0x0001, {0x0904, 0x0984, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0904, 0x0A04, 0x0000, 0x1020}},
{0x0DD, 0x0002, {0x060C, 0x7588, 0x8100, 0x7588, 0x7608, 0x8604, 0x0A84, 0x050C, 0x0A04, 0x0000, 0x1020}},
{MARKER_DD_BLACK_SNIPPET, 0x0002, {0x060C, 0x7588, 0x8100, 0x7588, 0x7608, 0x8604, 0x0A84, 0x050C, 0x0A04, 0x0000, 0x1020}},
{0x0DE, 0x0001, {0x0908, 0x0988, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x090C, 0x0A04, 0x0000, 0x1020}},
{0x015, 0x0001, {0x0A88, 0x7988, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0988, 0x0A04, 0x0000, 0x1424}},
{0x065, 0x0804, {0x5040, 0x5040, 0x5040, 0x5040, 0x5040, 0x5040, 0x5040, 0x090E, 0x0804, 0x0000, 0x5844}},
{0x014, 0x0003, {0x3020, 0x3020, 0x3020, 0x9080, 0x9080, 0x9080, 0x0A84, 0x0914, 0x0904, 0x0000, 0x3020}},
{MARKER_A5_NIPPER, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0404, 0x0000, 0x0000, 0x5020}},
{0x16C, 0x0000, {0x0000, 0x0000, 0x0000, 0xB804, 0x0000, 0x0000, 0x0000, 0x0404, 0xB804, 0x0000, 0x5020}},
{0x0A4, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2020}},
{0x00F6, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2020}},
{0x00F7, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2020}},
{MARKER_A4_LOCKUP_SLOW, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2020}},
{MARKER_F6_LOCKUP_MEDIUM, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2020}},
{MARKER_F7_LOCKUP_FAST, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2020}},
{0x0029, 0x0001, {0x0804, 0x0804, 0x2020, 0x0804, 0x0804, 0x0804, 0x0804, 0x0808, 0x0804, 0x0000, 0x3444}},
{0x01CF, 0x0001, {0x0804, 0x0804, 0x1020, 0x0804, 0x0804, 0x0804, 0x0804, 0x0808, 0x0804, 0x0000, 0x1424}},
{0x01A6, 0x0000, {0x3020, 0x3020, 0x3020, 0x3020, 0x3020, 0x3020, 0x3020, 0x0000, 0x0000, 0x3020, 0x3020}},
{0x01A7, 0x0804, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x3020}},
{0x0069, 0x0001, {0x2020, 0x2020, 0x2020, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0988, 0x0A04, 0x0000, 0x2020}},
{0x0173, 0x0001, {0x2020, 0x2020, 0x2020, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0988, 0x0A04, 0x0000, 0x4020}},
{0x00C1, 0x0000, {0x0A09, 0x0985, 0x8100, 0x0985, 0x0A05, 0x0A05, 0x0000, 0x0989, 0x0A05, 0x0986, 0x2020}},
{0x00C5, 0x0000, {0x0A0D, 0x8989, 0x8100, 0x8989, 0x7A09, 0x7A09, 0x0000, 0x098D, 0x0A05, 0x0986, 0x2020}},
{0x00C2, 0x0000, {0x0805, 0x0805, 0x8000, 0x0805, 0x0805, 0x0805, 0x0000, 0x0805, 0x0805, 0x0806, 0x3020}},
{0x00B1, 0x0000, {0x7000, 0x8000, 0x8000, 0x8000, 0x9000, 0x9000, 0x9000, 0x0004, 0x8000, 0x0000, 0x7000}},
{MARKER_1A7_CLANKER_WHIPCRACK, 0x0804, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x3020}},
{MARKER_69_CHUMP_FISH, 0x0001, {0x2020, 0x2020, 0x2020, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0988, 0x0A04, 0x0000, 0x2020}},
{MARKER_173_CHUMP_FISH_2, 0x0001, {0x2020, 0x2020, 0x2020, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0988, 0x0A04, 0x0000, 0x4020}},
{MARKER_C1_FLIBBIT_RED, 0x0000, {0x0A09, 0x0985, 0x8100, 0x0985, 0x0A05, 0x0A05, 0x0000, 0x0989, 0x0A05, 0x0986, 0x2020}},
{MARKER_C5_FLIBBIT_YELLOW, 0x0000, {0x0A0D, 0x8989, 0x8100, 0x8989, 0x7A09, 0x7A09, 0x0000, 0x098D, 0x0A05, 0x0986, 0x2020}},
{MARKER_C2_BUZZBOMB, 0x0000, {0x0805, 0x0805, 0x8000, 0x0805, 0x0805, 0x0805, 0x0000, 0x0805, 0x0805, 0x0806, 0x3020}},
{MARKER_B1_SIR_SLUSH, 0x0000, {0x7000, 0x8000, 0x8000, 0x8000, 0x9000, 0x9000, 0x9000, 0x0004, 0x8000, 0x0000, 0x7000}},
{0x0287, 0x0001, {0x7000, 0x8000, 0x8000, 0x8000, 0x9000, 0x9000, 0x8804, 0x0004, 0x8000, 0x0000, 0x7000}},
{MARKER_205_TWINKLY_MUNCHER, 0x0000, {0x0000, 0x0000, 0x0000, 0x0404, 0x0404, 0x0404, 0x0000, 0x0408, 0x0404, 0x0000, 0x0000}},
{0x0245, 0x0000, {0x3004, 0x3004, 0x3004, 0x3004, 0x3004, 0x2004, 0x3004, 0x0000, 0x0000, 0x3004, 0x3004}},
{0x0250, 0x0000, {0x0A90, 0x8988, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0910, 0x0A04, 0x0984, 0x3104}},
{0x025F, 0x0001, {0x0A88, 0x0984, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0908, 0x0A04, 0x0984, 0x3104}},
{MARKER_245_XMAS_TREE_EGG_TOLL, 0x0000, {0x3004, 0x3004, 0x3004, 0x3004, 0x3004, 0x2004, 0x3004, 0x0000, 0x0000, 0x3004, 0x3004}},
{MARKER_250_ICECUBE_A, 0x0000, {0x0A90, 0x8988, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0910, 0x0A04, 0x0984, 0x3104}},
{MARKER_25F_ICECUBE_B, 0x0001, {0x0A88, 0x0984, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0908, 0x0A04, 0x0984, 0x3104}},
{0x00AD, 0x0001, {0x0A10, 0x998C, 0x0020, 0x9988, 0x8A08, 0x0A04, 0x0A84, 0x0914, 0x0A04, 0x0000, 0x5124}},
{0x0253, 0x0001, {0x0904, 0x0984, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0984, 0x0A04, 0x0000, 0x3020}},
{0x0219, 0x0001, {0x0588, 0x7584, 0x8100, 0x7584, 0x7604, 0x7604, 0x0684, 0x0588, 0x0A04, 0x0000, 0x2020}},
{0x0298, 0x0000, {0x7000, 0x8000, 0x7000, 0x8000, 0x9000, 0x9000, 0xB000, 0x0004, 0x0A04, 0x0000, 0x2020}},
{0x0218, 0x0001, {0x0588, 0x7584, 0x8100, 0x7584, 0x7604, 0x7604, 0x0684, 0x050C, 0x0A04, 0x0000, 0x2020}},
{0x0099, 0x0001, {0x2020, 0x2020, 0x2020, 0x2020, 0x2020, 0x2020, 0x0000, 0x0000, 0x0804, 0x0000, 0x2424}},
{0x0296, 0x0000, {0x2020, 0x2020, 0x2020, 0x2020, 0x2020, 0x2020, 0x0000, 0x0000, 0x0804, 0x0000, 0x2424}},
{0x0096, 0x0001, {0x0A10, 0x890C, 0x8100, 0x8908, 0x8988, 0x8988, 0x0A84, 0x0914, 0x0984, 0x0000, 0x3024}},
{0x0297, 0x0001, {0x0A10, 0x890C, 0x8100, 0x8908, 0x8988, 0x8988, 0x0A84, 0x0914, 0x0984, 0x0000, 0x3024}},
{0x0127, 0x0001, {0x0804, 0x0804, 0x8100, 0x0804, 0x0804, 0x0804, 0x0804, 0x0804, 0x0804, 0x0000, 0x1424}},
{MARKER_254_PORTRAIT_CHOMPA, 0x0001, {0x0804, 0x0804, 0x2020, 0x0804, 0x0804, 0x0804, 0x0804, 0x080C, 0x0804, 0x0000, 0x3444}},
{0x01D1, 0x0001, {0x0804, 0x0804, 0x1020, 0x0804, 0x0804, 0x0804, 0x0804, 0x080C, 0x0804, 0x0000, 0x1424}},
{0x021A, 0x0001, {0x0A08, 0x8988, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0000, 0x0988, 0x0A04, 0x0000, 0x2020}},
{0x00C9, 0x0001, {0x0808, 0x8808, 0x8000, 0x0804, 0x0804, 0x0804, 0x0000, 0x0808, 0x0804, 0x0000, 0x3424}},
{0x01B7, 0x0000, {0x0804, 0x0804, 0x0804, 0x0804, 0x0804, 0x0804, 0x0000, 0x098C, 0x0404, 0x0804, 0x5000}},
{0x002E, 0x0004, {0x3000, 0x3000, 0x3000, 0x3000, 0x3000, 0x3000, 0x0000, 0x0000, 0x8000, 0x3000, 0x3004}},
{0x01A1, 0x0000, {0x8020, 0x8884, 0x8020, 0x8884, 0x9884, 0x9884, 0x0804, 0x0904, 0x0884, 0x0000, 0x4020}},
{0x01A2, 0x0000, {0x8020, 0x8904, 0x8020, 0x8904, 0x9904, 0x9904, 0x0804, 0x0984, 0x0904, 0x0000, 0x4020}},
{0x01A3, 0x0000, {0x9020, 0x9984, 0x9020, 0x9984, 0x9984, 0x9984, 0x0804, 0x0A04, 0x0984, 0x0000, 0x3020}},
{0x01A4, 0x0000, {0x9020, 0x9A04, 0x9020, 0x9A04, 0x9A04, 0x9A04, 0x0804, 0x0A84, 0x0A04, 0x0000, 0x3020}},
{0x0185, 0x5060, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x5060}},
{0x0191, 0x0000, {0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x0000, 0x8000, 0x0000, 0x2000}},
{0x0192, 0x0000, {0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x0000, 0x8000, 0x0000, 0x2000}},
{0x0193, 0x0000, {0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x0000, 0x8000, 0x0000, 0x2000}},
{0x01E2, 0x0001, {0x0A08, 0x8988, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0988, 0x0A04, 0x0000, 0x2020}},
{0x01C5, 0x0001, {0x3020, 0x3020, 0x3020, 0x3020, 0x3020, 0x3020, 0x3020, 0x080C, 0x0804, 0x0000, 0x3020}},
{0x01F9, 0x0000, {0x2040, 0x2040, 0x2040, 0x2040, 0x2040, 0x2040, 0x2040, 0x0000, 0x0000, 0x0000, 0x2040}},
{0x01B2, 0x0001, {0x0804, 0x0804, 0x2020, 0x0804, 0x0804, 0x0804, 0x0804, 0x0810, 0x0804, 0x0000, 0x3444}},
{0x01D0, 0x0001, {0x0804, 0x0804, 0x1020, 0x0804, 0x0804, 0x0804, 0x0804, 0x0810, 0x0804, 0x0000, 0x1424}},
{0x01B4, 0x8000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x8000}},
{MARKER_253_SCARAB_BEETLE, 0x0001, {0x0904, 0x0984, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0984, 0x0A04, 0x0000, 0x3020}},
{MARKER_219_MUMMUM, 0x0001, {0x0588, 0x7584, 0x8100, 0x7584, 0x7604, 0x7604, 0x0684, 0x0588, 0x0A04, 0x0000, 0x2020}},
{MARKER_298_MUMMUM_BALL, 0x0000, {0x7000, 0x8000, 0x7000, 0x8000, 0x9000, 0x9000, 0xB000, 0x0004, 0x0A04, 0x0000, 0x2020}},
{MARKER_218_LIMBO, 0x0001, {0x0588, 0x7584, 0x8100, 0x7584, 0x7604, 0x7604, 0x0684, 0x050C, 0x0A04, 0x0000, 0x2020}},
{MARKER_99_TEEHEE, 0x0001, {0x2020, 0x2020, 0x2020, 0x2020, 0x2020, 0x2020, 0x0000, 0x0000, 0x0804, 0x0000, 0x2424}},
{MARKER_296_TEEHEE_PURPLE, 0x0000, {0x2020, 0x2020, 0x2020, 0x2020, 0x2020, 0x2020, 0x0000, 0x0000, 0x0804, 0x0000, 0x2424}},
{MARKER_96_RIPPER, 0x0001, {0x0A10, 0x890C, 0x8100, 0x8908, 0x8988, 0x8988, 0x0A84, 0x0914, 0x0984, 0x0000, 0x3024}},
{MARKER_297_GIANT_RIPPER, 0x0001, {0x0A10, 0x890C, 0x8100, 0x8908, 0x8988, 0x8988, 0x0A84, 0x0914, 0x0984, 0x0000, 0x3024}},
{MARKER_127_BAT, 0x0001, {0x0804, 0x0804, 0x8100, 0x0804, 0x0804, 0x0804, 0x0804, 0x0804, 0x0804, 0x0000, 0x1424}},
{MARKER_254_PORTRAIT_CHOMPA_A, 0x0001, {0x0804, 0x0804, 0x2020, 0x0804, 0x0804, 0x0804, 0x0804, 0x080C, 0x0804, 0x0000, 0x3444}},
{MARKER_1D1_PORTRAIT_CHOMPA_B, 0x0001, {0x0804, 0x0804, 0x1020, 0x0804, 0x0804, 0x0804, 0x0804, 0x080C, 0x0804, 0x0000, 0x1424}},
{MARKER_21A_SEAMAN_GRUBLIN, 0x0001, {0x0A08, 0x8988, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0000, 0x0988, 0x0A04, 0x0000, 0x2020}},
{MARKER_C9_FLOTSAM, 0x0001, {0x0808, 0x8808, 0x8000, 0x0804, 0x0804, 0x0804, 0x0000, 0x0808, 0x0804, 0x0000, 0x3424}},
{MARKER_1B7_BOOM_BOX, 0x0000, {0x0804, 0x0804, 0x0804, 0x0804, 0x0804, 0x0804, 0x0000, 0x098C, 0x0404, 0x0804, 0x5000}},
{MARKER_2E_GRIMLET, 0x0004, {0x3000, 0x3000, 0x3000, 0x3000, 0x3000, 0x3000, 0x0000, 0x0000, 0x8000, 0x3000, 0x3004}},
{MARKER_1A1_BOSS_BOOM_BOX_LARGEST, 0x0000, {0x8020, 0x8884, 0x8020, 0x8884, 0x9884, 0x9884, 0x0804, 0x0904, 0x0884, 0x0000, 0x4020}},
{MARKER_1A2_BOSS_BOOM_BOX_LARGE, 0x0000, {0x8020, 0x8904, 0x8020, 0x8904, 0x9904, 0x9904, 0x0804, 0x0984, 0x0904, 0x0000, 0x4020}},
{MARKER_1A3_BOSS_BOOM_BOX_MEDIUM, 0x0000, {0x9020, 0x9984, 0x9020, 0x9984, 0x9984, 0x9984, 0x0804, 0x0A04, 0x0984, 0x0000, 0x3020}},
{MARKER_1A4_BOSS_BOOM_BOX_SMALL, 0x0000, {0x9020, 0x9A04, 0x9020, 0x9A04, 0x9A04, 0x9A04, 0x0804, 0x0A84, 0x0A04, 0x0000, 0x3020}},
{MARKER_185_MODEL_RUSTY_BUCKET_REAR_PROPELLER, 0x5060, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x5060}},
{ACTOR_191_ENGINE_ROOM_PROPELLOR_1, 0x0000, {0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x0000, 0x8000, 0x0000, 0x2000}},
{ACTOR_192_ENGINE_ROOM_PROPELLOR_2, 0x0000, {0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x0000, 0x8000, 0x0000, 0x2000}},
{ACTOR_193_ENGINE_ROOM_PROPELLOR_3, 0x0000, {0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x2000, 0x0000, 0x8000, 0x0000, 0x2000}},
{MARKER_1E2_GRUBLIN_HOOD, 0x0001, {0x0A08, 0x8988, 0x8100, 0x0984, 0x0A04, 0x0A04, 0x0A84, 0x0988, 0x0A04, 0x0000, 0x2020}},
{MARKER_1C5_WHIPCRACK, 0x0001, {0x3020, 0x3020, 0x3020, 0x3020, 0x3020, 0x3020, 0x3020, 0x080C, 0x0804, 0x0000, 0x3020}},
{MARKER_1F9_SNARE_BEAR, 0x0000, {0x2040, 0x2040, 0x2040, 0x2040, 0x2040, 0x2040, 0x2040, 0x0000, 0x0000, 0x0000, 0x2040}},
{MARKER_1B2_CLUCKER_A, 0x0001, {0x0804, 0x0804, 0x2020, 0x0804, 0x0804, 0x0804, 0x0804, 0x0810, 0x0804, 0x0000, 0x3444}},
{MARKER_1D0_CLUCKER_B, 0x0001, {0x0804, 0x0804, 0x1020, 0x0804, 0x0804, 0x0804, 0x0804, 0x0810, 0x0804, 0x0000, 0x1424}},
{MARKER_1B4_EEYRIE_BABY, 0x8000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x8000}},
{0x000E, 0x0001, {0x3000, 0x7504, 0x7080, 0x7504, 0x7584, 0x0804, 0x0804, 0x0488, 0x0804, 0x0000, 0x1020}},
{0x01AC, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0804, 0x0804, 0x0000, 0x0000, 0x0000, 0x0000}},
{0x0256, 0x0000, {0x2020, 0x2020, 0x2020, 0x2020, 0x2020, 0x2020, 0x2020, 0x0000, 0x0000, 0x2020, 0x2020}},
{MARKER_256_FIRE_FX, 0x0000, {0x2020, 0x2020, 0x2020, 0x2020, 0x2020, 0x2020, 0x2020, 0x0000, 0x0000, 0x2020, 0x2020}},
{MARKER_C_ORANGE_PROJECTILE, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2424}},
{MARKER_DB_BURIED_TREASURE, 0x0000, {0x7000, 0x7000, 0x7000, 0x0804, 0x0804, 0x0804, 0x0804, 0x0804, 0x0804, 0x0000, 0x7000}},
{0x0028, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0804, 0x0000, 0x2020}},
{0x004A, 0x0404, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0404}},
{0x006E, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0804, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000}},
{0x00D7, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0804, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000}},
{0x00D9, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0804, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000}},
{0x00D6, 0x0000, {0x0000, 0x0000, 0x0000, 0x0804, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000}},
{0x00D8, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0804, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000}},
{MARKER_28_CLANKER_SAWBLADE, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0804, 0x0000, 0x2020}},
{MARKER_4A_CC_KEY, 0x0404, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0404}},
{MARKER_6E_PINK_EGG_LARGEST, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0804, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000}},
{MARKER_D7_PINK_EGG_MEDIUM, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0804, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000}},
{MARKER_D9_PINK_EGG_SMALLEST, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0804, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000}},
{MARKER_D6_PINK_EGG_LARGE, 0x0000, {0x0000, 0x0000, 0x0000, 0x0804, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000}},
{MARKER_D8_PINK_EGG_SMALL, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0804, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000}},
{0x006D, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0804, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000}},
{0x019B, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0404, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000}},
{0x019C, 0x0000, {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0404, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000}},

2
src/core2/code_D0CA0.c
View File

@@ -29,7 +29,7 @@ typedef struct {
/* .data */
extern ActorInfo D_803728A0 = {
0x253, ACTOR_380_SCARAB_BEETLE, ASSET_51B_MODEL_SCARAB_BEETLE,
MARKER_253_SCARAB_BEETLE, ACTOR_380_SCARAB_BEETLE, ASSET_51B_MODEL_SCARAB_BEETLE,
0, NULL,
func_80358684, NULL, func_80358344,
0, 0, 1.0f, 0

10
src/core2/code_D5D10.c
View File

@@ -35,7 +35,7 @@ void chskeleton_update(Actor *this);
/* .data */
extern ActorAnimationInfo D_80372D20[];
extern ActorInfo D_80372D78 = {
0x218, 0x34E, 0x4CC,
MARKER_218_LIMBO, ACTOR_34E_LIMBO, ASSET_4CC_MODEL_LIMBO,
0x1, D_80372D20,
chskeleton_update, func_80326224, func_80325888,
2500, 0, 1.0f, 0
@@ -55,10 +55,10 @@ void func_8035CD80(ActorMarker *marker, s32 arg1) {
Actor *this;
this = marker_getActor(marker);
func_802DAC84(partEmitList_pushNew(2), this, 0x4CE);
func_802DAD08(partEmitList_pushNew(1), this, 0x4CF);
func_802DAD8C(partEmitList_pushNew(2), this, 0x4CD);
func_8035CCA0(partEmitList_pushNew(4), this, 0x4D0);
func_802DAC84(partEmitList_pushNew(2), this, ASSET_4CE_MODEL_LIMBO_LEG);
func_802DAD08(partEmitList_pushNew(1), this, ASSET_4CF_MODEL_LIMBO_HEAD);
func_802DAD8C(partEmitList_pushNew(2), this, ASSET_4CD_MODEL_LIMBO_ARM);
func_8035CCA0(partEmitList_pushNew(4), this, ASSET_4D0_MODEL_LIMBO_BONE);
FUNC_8030E8B4(SFX_119_FISH_DEATH, 1.0f, 32000, this->position, 1250, 2500);
func_802C3F04(func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
marker_despawn(marker);

2
src/core2/code_D5FD0.c
View File

@@ -36,7 +36,7 @@ void func_8035D058(Actor *this);
/* .data */
extern ActorAnimationInfo D_80372DA0[];
extern ActorInfo D_80372DF8 = {
0x21A, 0x350, 0x49D,
MARKER_21A_SEAMAN_GRUBLIN, ACTOR_350_SEAMAN_GRUBLIN, ASSET_49D_MODEL_SEAMAN_GRUBLIN,
0x1, D_80372DA0,
func_8035D058, func_80326224, func_80325888,
2500, 0, 1.0f, 0

18
src/core2/code_D6180.c
View File

@@ -33,7 +33,7 @@ typedef struct {
/* .data */
extern ActorAnimationInfo D_80372E20[];
extern ActorInfo D_80372E78 = {
0x219, 0x34F, 0x4C7,
MARKER_219_MUMMUM, ACTOR_34F_MUMMUM, ASSET_4C7_MODEL_MUMMUM,
0x1, D_80372E20,
func_8035D3D8, func_80326224, func_80325888,
2500, 0, 1.0f, 0
@@ -58,10 +58,10 @@ void func_8035D1F0(ActorMarker *arg0, s32 arg1) {
Actor *this;
this = marker_getActor(arg0);
func_802DAC84(partEmitList_pushNew(2), this, 0x4C9);
func_802DAD08(partEmitList_pushNew(1), this, 0x4CA);
func_802DAD8C(partEmitList_pushNew(2), this, 0x4C8);
func_8035D110(partEmitList_pushNew(1), this, 0x4CB);
func_802DAC84(partEmitList_pushNew(2), this, ASSET_4C9_MODEL_MUMMUM_LEG);
func_802DAD08(partEmitList_pushNew(1), this, ASSET_4CA_MODEL_MUMMUM_HEAD);
func_802DAD8C(partEmitList_pushNew(2), this, ASSET_4C8_MODEL_MUMMUM_ARM);
func_8035D110(partEmitList_pushNew(1), this, ASSET_4CB_MODEL_MUMMUM_BODY);
FUNC_8030E8B4(SFX_119_FISH_DEATH, 0.8f, 32000, this->position, 1250, 2500);
func_802C3F04((GenMethod_4) func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
marker_despawn(arg0);
@@ -108,12 +108,12 @@ void func_8035D3D8(Actor *this) {
}
func_802DB5A0(this);
if (this->state == 9) {
if (this->marker->unk14_20 != 0x298) {
this->marker->unk14_20 = 0x298;
if (this->marker->unk14_20 != MARKER_298_MUMMUM_BALL) {
this->marker->unk14_20 = MARKER_298_MUMMUM_BALL;
}
} else {
if (this->marker->unk14_20 != 0x219) {
this->marker->unk14_20 = 0x219;
if (this->marker->unk14_20 != MARKER_219_MUMMUM) {
this->marker->unk14_20 = MARKER_219_MUMMUM;
}
}
}

6
src/core2/code_D6600.c
View File

@@ -18,7 +18,7 @@ void func_8035DA1C(Actor *this);
/* .data */
extern ActorAnimationInfo D_80372EA0[];
extern ActorInfo D_80372EE0 = {
0x69, 0xA, 0x36B,
MARKER_69_CHUMP_FISH, ACTOR_A_CHUMP_FISH, ASSET_36B_CHUMP_FISH,
0x2, D_80372EA0,
func_8035DA1C, func_80326224, func_80325888,
3000, 0, 0.0f, 0
@@ -128,7 +128,7 @@ void func_8035DA1C(Actor *this) {
marker_setCollisionScripts(this->marker, func_8035D8F0, NULL, func_8035D88C);
}
this->marker->unk14_20 = 0x69; //nice
this->marker->unk14_20 = MARKER_69_CHUMP_FISH;
if (randf() < 0.01) {
LOCAL_D6600(this)->unk0 = 5;
}
@@ -197,7 +197,7 @@ void func_8035DA1C(Actor *this) {
func_8030E6A4(SFX_6D_CROC_BITE, 1.1f, 10000);
}
case 5://L8035DE84
this->marker->unk14_20 = 0x173;
this->marker->unk14_20 = MARKER_173_CHUMP_FISH_2;
func_803297FC(this, &sp40, &sp44);
func_80328C64(this, (s32) sp44);
func_80328CA8(this, (s32) func_8035D590(sp40));

4
src/core2/code_D7D10.c
View File

@@ -15,14 +15,14 @@ typedef struct {
extern ActorAnimationInfo D_80372F80[];
extern ActorInfo D_80372FC0 = {
0x96, 0xC7, 0x3C9,
MARKER_96_RIPPER, ACTOR_C7_RIPPER, ASSET_3C9_MODEL_RIPPER,
0x1, D_80372F80,
func_8035F138, func_80326224, func_8035ECA0,
3500, 0, 1.2f, 0
};
extern ActorInfo D_80372FE4 = {
0x297, 0x3C2, 0x3C9,
MARKER_297_GIANT_RIPPER, ACTOR_3C2_GIANT_RIPPER, ASSET_3C9_MODEL_RIPPER,
0x1, D_80372F80,
func_8035F138, func_80326224, func_8035ECA0,
14000, 0, 3.2f, 0

2
src/core2/code_D89E0.c
View File

@@ -16,7 +16,7 @@ void func_80360828(Actor *this);
/* .data */
extern ActorAnimationInfo D_80373090[];
extern ActorInfo D_803730D8 = {
0x127, 0x163, 0x3CA,
MARKER_127_BAT, ACTOR_163_BAT, ASSET_3CA_MODEL_BAT,
0x1, D_80373090,
func_80360828, func_80326224, func_80325888,
2500, 0, 0.9f, 0

6
src/lair/code_A4A0.c
View File

@@ -40,9 +40,9 @@ ActorAnimationInfo D_803949B0[] ={
{0x26D, 1000000.0f},
{0x26D, 1000000.0f},
};
ActorInfo D_80394A08 = { 0x1EA, 0x367, 0x54A, 0x1, D_803949B0, func_80390AE8, func_80326224, func_80325888, 2500, 0, 1.0f, 0};
ActorInfo D_80394A2C = { 0x295, 0x3BF, 0x561, 0x1, D_803949B0, func_80390AE8, func_80326224, func_80325888, 2500, 0, 1.0f, 0};
ActorInfo D_80394A50 = { 0x1F1, 0x3C0, 0x562, 0x1, D_803949B0, func_80390AE8, func_80326224, func_80325888, 2500, 0, 1.0f, 0};
ActorInfo D_80394A08 = { MARKER_1EA_GRUNTLING_RED, ACTOR_367_GRUNTLING_RED, ASSET_54A_MODEL_GRUNTLING_RED, 0x1, D_803949B0, func_80390AE8, func_80326224, func_80325888, 2500, 0, 1.0f, 0};
ActorInfo D_80394A2C = { MARKER_295_GRUNTLING_BLUE, ACTOR_3BF_GRUNTLING_BLUE, ASSET_561_MODEL_GRUNTLING_BLUE, 0x1, D_803949B0, func_80390AE8, func_80326224, func_80325888, 2500, 0, 1.0f, 0};
ActorInfo D_80394A50 = { MARKER_1F1_GRUNTLING_BLACK, ACTOR_3C0_GRUNTLING_BLACK, ASSET_562_MODEL_GRUNTLING_BLACK, 0x1, D_803949B0, func_80390AE8, func_80326224, func_80325888, 2500, 0, 1.0f, 0};
/* .code */
void func_80390890(ActorMarker *marker, ActorMarker *other_marker) {