documentations
- spawnableActorList_add: decode flags - add some prototypes in functions.h - ActorMarker: docu unk8 (drawFunc) and unk14_20 (id)
This commit is contained in:
@@ -270,7 +270,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
|
||||
if(func_8033D410(playerMarker, marker))
|
||||
return;
|
||||
|
||||
switch(marker->unk14_20){
|
||||
switch(marker->id){
|
||||
case 0x125: //L8028BE88
|
||||
case 0x126: //L8028BE88
|
||||
obj_collision_type = 1;
|
||||
|
@@ -314,11 +314,11 @@ void func_802C6240(Actor *this){
|
||||
break;
|
||||
}//L802C6D1C
|
||||
if(this->state == 0xe){
|
||||
if(this->marker->unk14_20 != 0x29e)
|
||||
this->marker->unk14_20 = 0x29e;
|
||||
if(this->marker->id != 0x29e)
|
||||
this->marker->id = 0x29e;
|
||||
}else{//L802C6D60
|
||||
if(this->marker->unk14_20 != 3)
|
||||
this->marker->unk14_20 = 3;
|
||||
if(this->marker->id != 3)
|
||||
this->marker->id = 3;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -52,7 +52,7 @@ void func_80357264(Actor *this, s32 next_state){
|
||||
f32 sp38;
|
||||
s32 pad34;
|
||||
|
||||
this->marker->unk14_20 = MARKER_1D0_CLUCKER_B;
|
||||
this->marker->id = MARKER_1D0_CLUCKER_B;
|
||||
actor_collisionOff(this);
|
||||
if(next_state == 1 || next_state == 2){
|
||||
skeletalAnim_set(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 = MARKER_1B2_CLUCKER_A;
|
||||
this->marker->id = 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){
|
||||
skeletalAnim_getProgressRange(this->unk148, &sp4C, &sp48);
|
||||
if(skeletalAnim_getAnimId(this->unk148) == 0x185){
|
||||
if(sp4C < 0.58 && 0.58 <= sp48){
|
||||
this->marker->unk14_20 = MARKER_1D0_CLUCKER_B;
|
||||
this->marker->id = 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 = MARKER_1D0_CLUCKER_B;
|
||||
this->marker->id = MARKER_1D0_CLUCKER_B;
|
||||
}
|
||||
if(sp4C < 0.1 && 0.1 <= sp48){
|
||||
FUNC_8030E624(SFX_2_CLAW_SWIPE, 0.9f, 32000);
|
||||
|
@@ -22,7 +22,7 @@ ActorInfo D_80372840 = {
|
||||
void func_803569F0(Actor *this, s32 next_state){
|
||||
ActorLocal_Core2_CFA60 *local = (ActorLocal_Core2_CFA60 *)&this->local;
|
||||
|
||||
this->marker->unk14_20 = 0x1cf;
|
||||
this->marker->id = 0x1cf;
|
||||
actor_collisionOff(this);
|
||||
if(next_state == 1 || next_state == 2){
|
||||
skeletalAnim_set(this->unk148, ASSET_15A_ANIM_GRILL_CHOMPA_ATTACK, 0, 2.5f);
|
||||
@@ -42,7 +42,7 @@ void func_803569F0(Actor *this, s32 next_state){
|
||||
local->unk0 = 0.2f;
|
||||
}
|
||||
if(next_state == 4){
|
||||
this->marker->unk14_20 = 0x29;
|
||||
this->marker->id = 0x29;
|
||||
actor_collisionOn(this);
|
||||
skeletalAnim_set(this->unk148, ASSET_15A_ANIM_GRILL_CHOMPA_ATTACK, 0, randf2(2.3f, 2.7f));
|
||||
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
|
||||
@@ -123,7 +123,7 @@ void func_80356CCC(Actor *this){
|
||||
if(this->state == 4){
|
||||
skeletalAnim_getProgressRange(this->unk148, &sp4C, &sp48);
|
||||
if(sp4C < 0.59 && 0.59 <= sp48){
|
||||
this->marker->unk14_20 = 0x1cf;
|
||||
this->marker->id = 0x1cf;
|
||||
}
|
||||
if(sp4C < 0.5 && 0.5 <= sp48){
|
||||
func_8030E760(SFX_2_CLAW_SWIPE, 0.9f, 32000);
|
||||
|
@@ -53,7 +53,7 @@ void chCollectible_setState(Actor *arg0, s32 next_state){
|
||||
void func_802D8C98(Actor *this, s32 arg1) {
|
||||
s32 phi_v0;
|
||||
|
||||
switch (this->marker->unk14_20)
|
||||
switch (this->marker->id)
|
||||
{
|
||||
case MARKER_60_BLUE_EGG_COLLECTIBLE:
|
||||
phi_v0 = TRUE;
|
||||
@@ -143,7 +143,7 @@ void chCollectible_update(Actor *this) {
|
||||
u32 temp_v0;
|
||||
|
||||
if (!this->initialized) {
|
||||
if (this->marker->unk14_20 != 0x60) {
|
||||
if (this->marker->id != 0x60) {
|
||||
func_8032AA58(this, 0.56f);
|
||||
}
|
||||
this->unk10_12 = -1;
|
||||
|
@@ -81,13 +81,13 @@ void __chCrab_ow(ActorMarker *marker, ActorMarker *other) {
|
||||
this->unk60 = 3.0f;
|
||||
subaddie_set_state(this, 6);
|
||||
actor_playAnimationOnce(this);
|
||||
if (marker->unk14_20 == MARKER_13_SNIPPET) {
|
||||
if (marker->id == MARKER_13_SNIPPET) {
|
||||
FUNC_8030E8B4(SFX_6E_VILE_EGH, 2.0f, 26000, this->position, 950, 1900);
|
||||
marker->unk14_20 = MARKER_16B_SNIPPET_UPSIDEDOWN;
|
||||
marker->id = MARKER_16B_SNIPPET_UPSIDEDOWN;
|
||||
}
|
||||
if (marker->unk14_20 == MARKER_DD_BLACK_SNIPPET) {
|
||||
if (marker->id == MARKER_DD_BLACK_SNIPPET) {
|
||||
FUNC_8030E8B4(SFX_6E_VILE_EGH, 2.0f, 26000, this->position, 950, 1900);
|
||||
marker->unk14_20 = MARKER_DE_BLACK_SNIPPET_UPSIDEDOWN;
|
||||
marker->id = MARKER_DE_BLACK_SNIPPET_UPSIDEDOWN;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -357,11 +357,11 @@ void chCrab_update(Actor *this) {
|
||||
if (this->unk60 == 0.0f) {
|
||||
subaddie_set_state(this, 7);
|
||||
actor_playAnimationOnce(this);
|
||||
if (this->marker->unk14_20 == 0x16B) {
|
||||
this->marker->unk14_20 = MARKER_13_SNIPPET;
|
||||
if (this->marker->id == 0x16B) {
|
||||
this->marker->id = MARKER_13_SNIPPET;
|
||||
}
|
||||
if (this->marker->unk14_20 == 0xDE) {
|
||||
this->marker->unk14_20 = MARKER_DD_BLACK_SNIPPET;
|
||||
if (this->marker->id == 0xDE) {
|
||||
this->marker->id = MARKER_DD_BLACK_SNIPPET;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@@ -114,7 +114,7 @@ f32 D_8037DD34;
|
||||
|
||||
/* .code */
|
||||
Actor *func_802C4360(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
s32 sp1C = marker->unk14_20 - 0xe4;
|
||||
s32 sp1C = marker->id - 0xe4;
|
||||
func_8033A45C(3, sp1C);
|
||||
func_8033A45C(1, 1);
|
||||
func_8033A45C(4, 1);
|
||||
@@ -284,7 +284,7 @@ void func_802C4BB4(ActorMarker *marker){
|
||||
s32 sp20;
|
||||
Actor *other;
|
||||
f32 sp18;
|
||||
sp20 = marker->unk14_20 - 0xe4;
|
||||
sp20 = marker->id - 0xe4;
|
||||
this = marker_getActor(marker);
|
||||
sp18 = this->scale;
|
||||
other = func_8032813C(sp20 + 0x198, this->position, (s32)this->yaw);
|
||||
@@ -308,7 +308,7 @@ void func_802C4C14(Actor *this){
|
||||
s32 tmp_a2_2;
|
||||
f32 sp34[3];
|
||||
|
||||
sp84 = this->marker->unk14_20 - 0xe4;
|
||||
sp84 = this->marker->id - 0xe4;
|
||||
sp80 = (sp84 == D_80365E00);
|
||||
sp50 = time_getDelta();
|
||||
if(chGameSelectBottomZoombox == NULL)
|
||||
|
@@ -46,11 +46,11 @@ void __chJinjo_802CDBA8(ActorMarker *this, ActorMarker *other){
|
||||
|
||||
if(actorPtr->state < 5){
|
||||
if(!fileProgressFlag_get(FILEPROG_E_JINJO_TEXT)){
|
||||
func_80311480(__chJinjo_getMeetDialogId(actorPtr->marker->unk14_20), 4, 0, 0, 0, 0);
|
||||
func_80311480(__chJinjo_getMeetDialogId(actorPtr->marker->id), 4, 0, 0, 0, 0);
|
||||
fileProgressFlag_set(FILEPROG_E_JINJO_TEXT, 1);
|
||||
}
|
||||
subaddie_set_state_with_direction(actorPtr, 6, 0.0f , -1);
|
||||
if(item_adjustByDiffWithHud(ITEM_12_JINJOS, 1 << (this->unk14_20 + 6) ) == 0x1f)
|
||||
if(item_adjustByDiffWithHud(ITEM_12_JINJOS, 1 << (this->id + 6) ) == 0x1f)
|
||||
localPtr->unk4 = 1;
|
||||
actor_loopAnimation(actorPtr);
|
||||
this->collidable = 0;
|
||||
|
@@ -123,7 +123,7 @@ Actor *func_802D94B4(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
void func_802D9530(Actor *this){
|
||||
Actor *other = subaddie_getLinkedActor(this);
|
||||
if(this->unk100 && other){
|
||||
if(this->unk100->unk14_20 == 0xB8)
|
||||
if(this->unk100->id == 0xB8)
|
||||
subaddie_set_state_with_direction(other, 3, 0.0001f, 1);
|
||||
}
|
||||
subaddie_set_state_with_direction(this, 4, 0.0001f, 1);
|
||||
@@ -248,7 +248,7 @@ int chmole_learnAbility(Actor *this){
|
||||
|
||||
void func_802D9ADC(Actor *this){
|
||||
Actor *other = subaddie_getLinkedActor(this);
|
||||
if(this->unk100 && other && this->unk100->unk14_20 == 0xB8){
|
||||
if(this->unk100 && other && this->unk100->id == 0xB8){
|
||||
subaddie_set_state_with_direction(other, 2, 0.0001f, 1);
|
||||
}
|
||||
this->marker->propPtr->unk8_3 = 1;
|
||||
@@ -339,7 +339,7 @@ void chmole_update(Actor *this){
|
||||
this->unk100 = (other) ? other->marker : NULL;
|
||||
if(this->unk100){
|
||||
other = subaddie_getLinkedActor(this);
|
||||
if(other && this->unk100->unk14_20 == 0xB8){
|
||||
if(other && this->unk100->id == 0xB8){
|
||||
subaddie_set_state(other, 1);
|
||||
}
|
||||
}
|
||||
|
@@ -172,10 +172,10 @@ int __chSnowman_isPlayerInAttackRange(Actor *this, s32 min_distance, s32 max_dis
|
||||
|
||||
int __chSnowman_func_802E1F70(ActorMarker *marker, s32 arg1){
|
||||
if(marker->unk40_31 == 0xB){
|
||||
marker->unk14_20 = 0x287;
|
||||
marker->id = 0x287;
|
||||
}
|
||||
else{
|
||||
marker->unk14_20 = MARKER_B1_SIR_SLUSH;
|
||||
marker->id = MARKER_B1_SIR_SLUSH;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
@@ -33,7 +33,7 @@ void func_802C5A60(Actor *this){
|
||||
// Spawns a sparkle sprite when touching turbo trainers or wading boots
|
||||
ActorLocal_Core2_3EAD0 *local = (ActorLocal_Core2_3EAD0*)&this->local;
|
||||
if(!this->initialized){
|
||||
switch(this->marker->unk14_20){
|
||||
switch(this->marker->id){
|
||||
case 0x58:
|
||||
func_8032AA58(this, 0.35f);
|
||||
break;
|
||||
|
@@ -100,7 +100,7 @@ void chHoneycomb_update(Actor *this){
|
||||
if(!this->initialized){
|
||||
this->unk60 = (randf() < 0.5) ? 200.0 : -200.0;
|
||||
this->initialized = TRUE;
|
||||
if( this->marker->unk14_20 == MARKER_53_EMPTY_HONEYCOMB){
|
||||
if( this->marker->id == MARKER_53_EMPTY_HONEYCOMB){
|
||||
if(local->uid == 0)
|
||||
local->uid = (!this->unk44_2)? D_8037DDC0 : func_802C9C40(this);
|
||||
if( honeycombscore_get(local->uid)
|
||||
@@ -115,7 +115,7 @@ void chHoneycomb_update(Actor *this){
|
||||
|
||||
if(!this->unk16C_4){
|
||||
this->unk16C_4 = TRUE;
|
||||
if( this->marker->unk14_20 == MARKER_55_HONEYCOMB
|
||||
if( this->marker->id == MARKER_55_HONEYCOMB
|
||||
&& !this->unk44_2
|
||||
){
|
||||
marker_setFreeMethod(this->marker, __chHoneycomb_free);
|
||||
|
@@ -138,7 +138,7 @@ void func_802D2FB0(Actor *this, s32 arg1, s32 arg2, s32 arg3, f32 arg4, s32 arg5
|
||||
}
|
||||
|
||||
void func_802D3138(ActorMarker *marker, ActorMarker *other_marker){
|
||||
if(marker->unk14_20 == 0x224 || marker->unk14_20 == 0x225){
|
||||
if(marker->id == 0x224 || marker->id == 0x225){
|
||||
func_8025A70C(COMUSIC_2B_DING_B);
|
||||
}
|
||||
}
|
||||
@@ -153,7 +153,7 @@ void func_802D31AC(ActorMarker *arg0, ActorMarker * arg1) {
|
||||
|
||||
sp2C = marker_getActor(arg0);
|
||||
arg0->collidable = FALSE;
|
||||
switch (arg0->unk14_20) {
|
||||
switch (arg0->id) {
|
||||
case 0x9F:
|
||||
case 0xA0:
|
||||
case 0xFF:
|
||||
@@ -215,16 +215,16 @@ void func_802D31AC(ActorMarker *arg0, ActorMarker * arg1) {
|
||||
case 0xEA:
|
||||
case 0x108:
|
||||
case 0x263:
|
||||
if ((arg0->unk14_20 == 0x9D) || (arg0->unk14_20 == 0xE7)) {
|
||||
if ((arg0->id == 0x9D) || (arg0->id == 0xE7)) {
|
||||
levelSpecificFlags_set(0x2E, 1);
|
||||
}
|
||||
if (arg0->unk14_20 == 0x263) {
|
||||
if (arg0->id == 0x263) {
|
||||
levelSpecificFlags_set(0x38, 1);
|
||||
}
|
||||
func_802D2FB0(sp2C, 5, -0x28, 0xC8, 0.85f, 0xDC, 0x3C, 0x64);
|
||||
func_8030E540(SFX_D_EGGSHELL_BREAKING);
|
||||
func_8030E540(SFX_11_WOOD_BREAKING_1);
|
||||
switch (arg0->unk14_20) {
|
||||
switch (arg0->id) {
|
||||
case 0x9E:
|
||||
func_802EE278(sp2C, 0xD, 9, 0x82, 0.34f, 1.0f);
|
||||
break;
|
||||
@@ -304,7 +304,7 @@ void func_802D31AC(ActorMarker *arg0, ActorMarker * arg1) {
|
||||
case 0x239:
|
||||
func_8030E540(SFX_13A_GLASS_BREAKING_7);
|
||||
func_802EE278(sp2C, 4, 0x2D, 0x82, 1.0f, 1.0f);
|
||||
if (arg0->unk14_20 == 0x1F3) {
|
||||
if (arg0->id == 0x1F3) {
|
||||
func_802EE278(sp2C, 4, 0x2D, 0x104, 1.0f, 1.0f);
|
||||
}
|
||||
marker_despawn(arg0);
|
||||
|
@@ -105,7 +105,7 @@ void __chLevelCollectible_collide(ActorMarker *marker, ActorMarker *other_marker
|
||||
sp18[0] = this->position[0];
|
||||
sp18[1] = this->position[1];
|
||||
sp18[2] = this->position[2];
|
||||
switch (marker->unk14_20) {
|
||||
switch (marker->id) {
|
||||
case MARKER_36_ORANGE_COLLECTIBLE:
|
||||
if (mapSpecificFlags_get(1))
|
||||
return;
|
||||
@@ -160,7 +160,7 @@ void func_802D7DE8(ActorMarker *marker, f32 arg1[3]) {
|
||||
f32 var_f14;
|
||||
f32 var_f18;
|
||||
|
||||
sp4C = marker->unk14_20;
|
||||
sp4C = marker->id;
|
||||
this = marker_getActor(marker);
|
||||
ml_vec3f_to_vec3w(sp50, arg1);
|
||||
if (sp4C == MARKER_37_GOLD_BULLION) {
|
||||
@@ -204,7 +204,7 @@ void __chLevelCollectible_returnObj(Actor *this) {
|
||||
f32 sp20;
|
||||
|
||||
local = (s32*)&this->local;
|
||||
if( (this->marker->unk14_20 != MARKER_36_ORANGE_COLLECTIBLE)
|
||||
if( (this->marker->id != MARKER_36_ORANGE_COLLECTIBLE)
|
||||
|| (this->unk78_13 == 0)
|
||||
) {
|
||||
this->position[0] += this->velocity[0];
|
||||
@@ -224,13 +224,13 @@ void __chLevelCollectible_returnObj(Actor *this) {
|
||||
}
|
||||
}
|
||||
this->position[1] = sp20;
|
||||
if (this->marker->unk14_20 != MARKER_36_ORANGE_COLLECTIBLE) {
|
||||
if (this->marker->id != MARKER_36_ORANGE_COLLECTIBLE) {
|
||||
FUNC_8030E8B4(SFX_21_EGG_BOUNCE_1, 0.76f, 25000, this->position, 1000, 2000);
|
||||
} else {
|
||||
FUNC_8030E8B4(SFX_B3_ORANGE_TALKING, 1.0f, 25000, this->position, 1000, 2000);
|
||||
}
|
||||
if (this->state == 4) {
|
||||
switch (this->marker->unk14_20) {
|
||||
switch (this->marker->id) {
|
||||
case MARKER_37_GOLD_BULLION:
|
||||
break;
|
||||
case MARKER_36_ORANGE_COLLECTIBLE:
|
||||
@@ -254,7 +254,7 @@ void __chLevelCollectible_returnObj(Actor *this) {
|
||||
this->unk138_22 = this->unk138_21 = 0;
|
||||
subaddie_set_state(this, 2);
|
||||
}
|
||||
switch (this->marker->unk14_20) {
|
||||
switch (this->marker->id) {
|
||||
case MARKER_1FD_BLUE_PRESENT_COLLECTIBLE:
|
||||
__chLevelCollectible_presentReturnEmitSparkles(this->position, ASSET_711_SPRITE_SPARKLE_DARK_BLUE);
|
||||
break;
|
||||
@@ -316,9 +316,9 @@ void chLevelCollectible_update(Actor *this){
|
||||
|
||||
if(!this->unk16C_4){
|
||||
this->unk16C_4 = TRUE;
|
||||
if( this->marker->unk14_20 == MARKER_1FD_BLUE_PRESENT_COLLECTIBLE
|
||||
|| this->marker->unk14_20 == MARKER_1FE_GREEN_PRESENT_COLLECTIBLE
|
||||
|| this->marker->unk14_20 == MARKER_1FF_RED_PRESENT_COLLECTIBLE
|
||||
if( this->marker->id == MARKER_1FD_BLUE_PRESENT_COLLECTIBLE
|
||||
|| this->marker->id == MARKER_1FE_GREEN_PRESENT_COLLECTIBLE
|
||||
|| this->marker->id == MARKER_1FF_RED_PRESENT_COLLECTIBLE
|
||||
){
|
||||
if(jiggyscore_isCollected(JIGGY_2E_FP_PRESENTS)){
|
||||
marker_despawn(this->marker);
|
||||
@@ -355,9 +355,9 @@ void chLevelCollectible_update(Actor *this){
|
||||
break;
|
||||
}
|
||||
|
||||
marker_id = this->marker->unk14_20;
|
||||
marker_id = this->marker->id;
|
||||
|
||||
switch(this->marker->unk14_20){
|
||||
switch(this->marker->id){
|
||||
|
||||
case MARKER_37_GOLD_BULLION: //L802D86CC
|
||||
func_802D83EC(this);
|
||||
|
@@ -294,7 +294,7 @@ enum marker_e bacarry_get_markerId(void){
|
||||
|
||||
marker = bacarry_get_marker();
|
||||
if(marker){
|
||||
return marker->unk14_20;
|
||||
return marker->id;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
@@ -2000,7 +2000,7 @@ void func_80307CA0(ActorMarker *marker) {
|
||||
s32 temp_v0_3;
|
||||
s32 var_s0;
|
||||
|
||||
temp_s4 = D_8036A9E4[marker->unk14_20];
|
||||
temp_s4 = D_8036A9E4[marker->id];
|
||||
if ((temp_s4 != 0xFF) && (bitfield_isBitSet(D_8036A9E0, temp_s4) == 1)) {
|
||||
func_8032E010(marker->propPtr, sp58);
|
||||
cubePtrList = func_80307948(sp58);
|
||||
|
@@ -369,7 +369,7 @@ void func_80325FE8(Actor *this) {
|
||||
u8 temp_v0;
|
||||
|
||||
marker = this->marker;
|
||||
marker->unk14_20 = 0;
|
||||
marker->id = 0;
|
||||
if (this->animctrl != NULL) {
|
||||
animctrl_free(this->animctrl);
|
||||
}
|
||||
@@ -631,7 +631,7 @@ Actor *actorArray_findActorFromMarkerId(enum marker_e marker_id) {
|
||||
|
||||
actor_begin = suBaddieActorArray->data;
|
||||
for(i_actor = actor_begin; i_actor - actor_begin < suBaddieActorArray->cnt; i_actor++) {
|
||||
if ((marker_id == i_actor->marker->unk14_20) && !i_actor->despawn_flag) {
|
||||
if ((marker_id == i_actor->marker->id) && !i_actor->despawn_flag) {
|
||||
return i_actor;
|
||||
}
|
||||
}
|
||||
@@ -809,7 +809,7 @@ Actor *actor_new(s32 position[3], s32 yaw, ActorInfo* actorInfo, u32 flags){
|
||||
suLastBaddie->unk124_6 = 1;
|
||||
suLastBaddie->modelCacheIndex = actorInfo->actorId;
|
||||
suLastBaddie->unk44_2 = func_80326C18();
|
||||
suLastBaddie->marker = func_8032F9DC(position, actorInfo->draw_func, (func_8033B64C(actorInfo->modelId) == 1) ? 0 : 1, actorInfo->markerId, (flags & 0x400) ? 1 : 0);
|
||||
suLastBaddie->marker = marker_init(position, actorInfo->draw_func, (asset_getFlag(actorInfo->modelId) == 1) ? 0 : 1, actorInfo->markerId, (flags & 0x400) ? 1 : 0);
|
||||
suLastBaddie->marker->unk3E_0 = 1;
|
||||
suLastBaddie->unk138_28 = 1;
|
||||
suLastBaddie->unk10_3 = -1;
|
||||
@@ -1373,7 +1373,7 @@ f32 func_80328DCC(Actor *this, f32 angle, f32 angle_ideal, s32 arg3) {
|
||||
var_f2 += 360.0f;
|
||||
}
|
||||
|
||||
if ((this->marker->unk14_20 != 0x12) && (this->marker->unk2C_2 == 1) && ((var_f2 >= 50.0f) || (var_f2 < -50.0f))) {
|
||||
if ((this->marker->id != 0x12) && (this->marker->unk2C_2 == 1) && ((var_f2 >= 50.0f) || (var_f2 < -50.0f))) {
|
||||
return angle_ideal;
|
||||
}
|
||||
var_f2 = var_f2 / func_80328DAC(this);
|
||||
@@ -1742,7 +1742,7 @@ void *actors_appendToSavestate(void * begin, u32 end){
|
||||
s0->unk100 = NULL;
|
||||
s0->unk158[0] = NULL;
|
||||
s0->unk158[1] = NULL;
|
||||
s0->unk138_19 = s1->marker->unk14_20;
|
||||
s0->unk138_19 = s1->marker->id;
|
||||
s0->unk108 = s1->marker->unkC;
|
||||
s0->unk10C = s1->marker->unk10;
|
||||
s0->unk134 = s1->marker->unk1C;
|
||||
@@ -2132,7 +2132,7 @@ void actorArray_defrag(void) {
|
||||
i_actor->marker->unk50 = func_803406D4(i_actor->marker->unk50);
|
||||
}
|
||||
|
||||
if (i_actor->marker->unk14_20 == MARKER_217_BEE_SWARM) {
|
||||
if (i_actor->marker->id == MARKER_217_BEE_SWARM) {
|
||||
func_802CEB60(i_actor);
|
||||
}
|
||||
}
|
||||
@@ -2155,7 +2155,7 @@ ActorMarker *func_8032B16C(enum jiggy_e jiggy_id) {
|
||||
if (suBaddieActorArray != NULL) {
|
||||
temp_s3 = &suBaddieActorArray->data[0];
|
||||
for(var_s0 = temp_s3; (var_s0 - temp_s3) < suBaddieActorArray->cnt; var_s0++){
|
||||
if ((var_s0->marker->unk14_20 == MARKER_52_JIGGY) && (chjiggy_getJiggyId(&(var_s0->marker)) == jiggy_id)) {
|
||||
if ((var_s0->marker->id == MARKER_52_JIGGY) && (chjiggy_getJiggyId(&(var_s0->marker)) == jiggy_id)) {
|
||||
return var_s0->marker;
|
||||
}
|
||||
}
|
||||
@@ -2199,7 +2199,7 @@ void func_8032B3A0(Actor *this, ActorMarker *arg1) {
|
||||
sp54[2] = this->position[2];
|
||||
func_802EE6CC(sp54, 0, D_8036E5B0, !this->unk16C_0, 0.75f, 0.0f, 125, 250, 0);
|
||||
func_802F3CF8(sp54, !this->unk16C_0,
|
||||
(arg1->unk14_20 == 1) ? 1
|
||||
(arg1->id == 1) ? 1
|
||||
: (player_getTransformation() == TRANSFORM_5_CROC) ? 2
|
||||
: 0
|
||||
);
|
||||
@@ -2215,7 +2215,7 @@ void func_8032B4DC(Actor *this, ActorMarker *arg1, s32 arg2) {
|
||||
func_8034A174(this->marker->unk44, arg2, &sp3C);
|
||||
func_802EE6CC(sp3C, NULL, D_8036E5C0, !this->unk16C_0, 0.75f, 0.0f, 125, 250, 0);
|
||||
func_802F3CF8(sp3C, !this->unk16C_0,
|
||||
(arg1->unk14_20 == 1) ? 1
|
||||
(arg1->id == 1) ? 1
|
||||
: (player_getTransformation() == TRANSFORM_5_CROC) ? 2
|
||||
: 0
|
||||
);
|
||||
@@ -2244,7 +2244,7 @@ void func_8032B5C0(ActorMarker *arg0, ActorMarker *arg1, struct5Cs *arg2) {
|
||||
sp64 = func_8033D574(arg2);
|
||||
if (((func_80297C6C() != 3) && func_8028F1E0()) || (func_8033D594(arg2) == 0)) {
|
||||
if (sp64 == 0) {
|
||||
if ((sp68 != 0) || (arg1->unk14_20 == 0)) {
|
||||
if ((sp68 != 0) || (arg1->id == 0)) {
|
||||
if (sp68 <= 0) {
|
||||
sp68 = 1;
|
||||
}
|
||||
@@ -2265,7 +2265,7 @@ void func_8032B5C0(ActorMarker *arg0, ActorMarker *arg1, struct5Cs *arg2) {
|
||||
if (this->unk138_25) {
|
||||
func_802C9334(sp6C + 0x21, this);
|
||||
} else {
|
||||
if ((this->marker->unk14_20 < 0x1A1) || (this->marker->unk14_20 >= 0x1A5)) {
|
||||
if ((this->marker->id < 0x1A1) || (this->marker->id >= 0x1A5)) {
|
||||
func_802C9334(sp6C + 0x18, this);
|
||||
}
|
||||
}
|
||||
|
@@ -329,7 +329,7 @@ bool func_8032C850(Actor *actor, f32 arg1[3], s32 arg2, s32 arg3, bool nonactor)
|
||||
func_80320ED8(actor->marker, temp_f0 / 2, 2);
|
||||
actor->marker->collidable = stored_collidability;
|
||||
for(var_v1 = func_8032F528(); var_v1 != NULL; var_v1 = func_8032F528()) {
|
||||
if (nonactor || (var_v1->markerFlag && (var_v1->actorProp.marker->unk14_20 == actor->marker->unk14_20))) {
|
||||
if (nonactor || (var_v1->markerFlag && (var_v1->actorProp.marker->id == actor->marker->id))) {
|
||||
D_803833D0 = var_v1;
|
||||
actor->position[0] = (f32) arg1[0];
|
||||
actor->position[1] = (f32) arg1[1];
|
||||
|
@@ -267,7 +267,7 @@ void __marker_draw(ActorMarker *this, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
f32 draw_dist_f;
|
||||
f32 percentage;
|
||||
if(!this->unk3E_0){
|
||||
this->unk8(this, gfx, mtx, vtx);
|
||||
this->drawFunc(this, gfx, mtx, vtx);
|
||||
return;
|
||||
}
|
||||
actor = marker_getActor(this);
|
||||
@@ -288,7 +288,7 @@ void __marker_draw(ActorMarker *this, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
percentage = 1.0f;
|
||||
}
|
||||
func_8033A280(percentage);
|
||||
this->unk8(this, gfx, mtx, vtx);
|
||||
this->drawFunc(this, gfx, mtx, vtx);
|
||||
}//L8032D300
|
||||
func_8033A244(30000.0f);
|
||||
func_8033A280(1.0f);
|
||||
@@ -1135,12 +1135,12 @@ void func_8032F7EC(f32 position[3], ActorMarker *marker, f32 rotation[3]) {
|
||||
func_8032F64C(position, marker);
|
||||
}
|
||||
|
||||
ActorMarker * func_8032F9DC(s32 *pos, MarkerDrawFunc arg1, int arg2, int arg3, int arg4){
|
||||
ActorMarker * marker_init(s32 *pos, MarkerDrawFunc draw_func, int arg2, int marker_id, int arg4){
|
||||
ActorMarker * marker = func_80332A60();
|
||||
marker->propPtr = NULL;
|
||||
marker->cubePtr = NULL;
|
||||
marker->unk8 = arg1;
|
||||
marker->unk14_20 = arg3;
|
||||
marker->drawFunc = draw_func;
|
||||
marker->id = marker_id;
|
||||
marker->unk40_23 = arg4;
|
||||
func_8032F3D4(pos, marker, arg2);
|
||||
marker->actrArrayIdx = 0;
|
||||
@@ -1187,7 +1187,7 @@ ActorMarker * func_8032FB80(f32 *pos, MarkerDrawFunc arg1, int arg2, enum asset_
|
||||
sp24[0] = pos[0];
|
||||
sp24[1] = pos[1];
|
||||
sp24[2] = pos[2];
|
||||
func_8032F9DC(sp24, arg1, arg2, model_id, arg4);
|
||||
marker_init(sp24, arg1, arg2, model_id, arg4);
|
||||
}
|
||||
|
||||
ActorMarker * func_8032FBE4(f32 *pos, MarkerDrawFunc arg1, int arg2, enum asset_e model_id){
|
||||
@@ -1207,7 +1207,7 @@ void func_8032FDDC(f32 rotation[3], ActorMarker *marker) {
|
||||
}
|
||||
|
||||
int func_8032FFB4(ActorMarker *this, s32 arg1){
|
||||
this->unk14_20 = arg1;
|
||||
this->id = arg1;
|
||||
}
|
||||
|
||||
//marker_setActorArrayIndex
|
||||
|
@@ -310,7 +310,7 @@ void func_8033B61C(void){
|
||||
func_8033B1BC();
|
||||
}
|
||||
|
||||
s32 func_8033B64C(s32 arg0){
|
||||
s32 asset_getFlag(enum asset_e arg0){
|
||||
return assetSectionRomMetaList[arg0].unk6;
|
||||
}
|
||||
|
||||
|
@@ -229,9 +229,9 @@ s16 D_80383F10[0x2A9];
|
||||
/* .code */
|
||||
s32 func_8033D240(ActorMarker *arg0, ActorMarker *arg1){
|
||||
if(arg0){
|
||||
if(!arg0->unk14_20 && player_getActiveHitbox(arg1) == HITBOX_6_WONDERWING)
|
||||
if(!arg0->id && player_getActiveHitbox(arg1) == HITBOX_6_WONDERWING)
|
||||
return -1;
|
||||
return arg0->unk14_20;
|
||||
return arg0->id;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
@@ -240,7 +240,7 @@ s32 func_8033D2A8(ActorMarker *arg0, ActorMarker *arg1){
|
||||
if(!arg0)
|
||||
return HITBOX_6_WONDERWING;
|
||||
|
||||
if(!arg0->unk14_20)
|
||||
if(!arg0->id)
|
||||
return player_getActiveHitbox(arg1);
|
||||
return HITBOX_0_NONE;
|
||||
}
|
||||
@@ -273,7 +273,7 @@ bool func_8033D410(ActorMarker *arg0, ActorMarker *arg1) {
|
||||
s16 temp_t0;
|
||||
s32 temp_s0;
|
||||
|
||||
sp38 = D_80383F10[arg1->unk14_20];
|
||||
sp38 = D_80383F10[arg1->id];
|
||||
if (sp38 == -1) {
|
||||
return FALSE;
|
||||
}
|
||||
|
@@ -857,7 +857,7 @@ s32 func_803422D4(Actor *arg0, Union_glspline *arg1, SplineList *arg2){
|
||||
if (sp68 != 0) {
|
||||
if (sp50 != (-9999.0f)) {
|
||||
arg0->yaw = sp50;
|
||||
if (arg0->marker->unk14_20 == 0x12) {
|
||||
if (arg0->marker->id == 0x12) {
|
||||
arg0->yaw = (f32) func_80342244((s32) arg0->yaw);
|
||||
}
|
||||
arg0->yaw_ideal = arg0->yaw;
|
||||
@@ -1012,7 +1012,7 @@ s32 func_803422D4(Actor *arg0, Union_glspline *arg1, SplineList *arg2){
|
||||
arg0->unk38_21 = sp48->unkC.bit31;
|
||||
arg0->unk78_31 = arg1->t1.unk4.bit15;
|
||||
arg0->unk78_22 = sp48->unk4.bit15;
|
||||
if (arg0->marker->unk14_20 == 0x12)
|
||||
if (arg0->marker->id == 0x12)
|
||||
{
|
||||
arg0->unk38_13 = func_80342244(arg0->unk38_13);
|
||||
arg0->unk38_21 = func_80342244(arg0->unk38_21);
|
||||
@@ -1028,7 +1028,7 @@ s32 func_803422D4(Actor *arg0, Union_glspline *arg1, SplineList *arg2){
|
||||
if (!arg0->unk10_4){
|
||||
if (arg0->unk10_8){
|
||||
arg0->yaw_ideal = (f32) arg1->t1.unkC.bit31;
|
||||
if (arg0->marker->unk14_20 == 0x12){
|
||||
if (arg0->marker->id == 0x12){
|
||||
arg0->yaw_ideal = (f32) func_80342244((s32) arg0->yaw_ideal);
|
||||
}
|
||||
}
|
||||
@@ -1043,7 +1043,7 @@ s32 func_803422D4(Actor *arg0, Union_glspline *arg1, SplineList *arg2){
|
||||
void func_803430B4(Actor *arg0) {
|
||||
f32 d_yaw;
|
||||
|
||||
if ((arg0->marker->unk14_20 == 0x12) && (arg0->unk138_30 == 1)) {
|
||||
if ((arg0->marker->id == 0x12) && (arg0->unk138_30 == 1)) {
|
||||
d_yaw = arg0->yaw_ideal - arg0->yaw;
|
||||
while (d_yaw >= 360.0f) { d_yaw -= 360.0f; }
|
||||
while (d_yaw < 0.0f) { d_yaw += 360.0f; }
|
||||
@@ -1091,7 +1091,7 @@ void func_803431D0(Actor *arg0, s32 arg1, s32 arg2, s32 arg3) {
|
||||
if (arg0->unk10_4) {
|
||||
player_getPosition(sp4C);
|
||||
func_802BC434(sp40, sp4C, arg0->position);
|
||||
if (arg0->marker->unk14_20 != 0x12) {
|
||||
if (arg0->marker->id != 0x12) {
|
||||
sp40[1] += 180.0f;
|
||||
while (sp40[1] >= 360.0f) {
|
||||
sp40[1] -= 360.0f;
|
||||
@@ -1196,7 +1196,7 @@ s32 func_803438E0(Actor *actor, s32 arg1, s32 arg2, s32 arg3) {
|
||||
}
|
||||
sp4C = func_803421A4(actor->unk44_14, actor->unk48);
|
||||
if ((actor->unk54 == 0.0f) && (actor->unk138_3 == 0)) {
|
||||
if (actor->marker->unk14_20 == 0xB0) {
|
||||
if (actor->marker->id == 0xB0) {
|
||||
actor->unk48 = func_803240E0(D_80371E70[actor->unk44_14], actor->unk48, sp40, &sp44);
|
||||
} else {
|
||||
actor->unk48 = func_80323FDC(D_80371E70[actor->unk44_14], actor->unk48, sp40, &sp44);
|
||||
|
@@ -68,7 +68,7 @@ s32 func_803531C8(u8 projectile_indx, s32 arg1){
|
||||
prop = func_80320EB0(marker, 30.0f, 1);
|
||||
if(prop != NULL && prop->unk8_0){
|
||||
other_marker = prop->marker;
|
||||
sp34 =other_marker->unk14_20;
|
||||
sp34 =other_marker->id;
|
||||
if(!func_8033D410(marker, other_marker)){
|
||||
switch(sp34){
|
||||
case MARKER_FC_CROCTUS: //L803532C4
|
||||
|
@@ -116,12 +116,12 @@ void func_8035D3D8(Actor *this) {
|
||||
}
|
||||
func_802DB5A0(this);
|
||||
if (this->state == 9) {
|
||||
if (this->marker->unk14_20 != MARKER_298_MUMMUM_BALL) {
|
||||
this->marker->unk14_20 = MARKER_298_MUMMUM_BALL;
|
||||
if (this->marker->id != MARKER_298_MUMMUM_BALL) {
|
||||
this->marker->id = MARKER_298_MUMMUM_BALL;
|
||||
}
|
||||
} else {
|
||||
if (this->marker->unk14_20 != MARKER_219_MUMMUM) {
|
||||
this->marker->unk14_20 = MARKER_219_MUMMUM;
|
||||
if (this->marker->id != MARKER_219_MUMMUM) {
|
||||
this->marker->id = MARKER_219_MUMMUM;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -138,7 +138,7 @@ void func_8035DA1C(Actor *this) {
|
||||
marker_setCollisionScripts(this->marker, func_8035D8F0, NULL, func_8035D88C);
|
||||
}
|
||||
|
||||
this->marker->unk14_20 = MARKER_69_CHUMP_FISH;
|
||||
this->marker->id = MARKER_69_CHUMP_FISH;
|
||||
if (randf() < 0.01) {
|
||||
LOCAL_D6600(this)->unk0 = 5;
|
||||
}
|
||||
@@ -207,7 +207,7 @@ void func_8035DA1C(Actor *this) {
|
||||
func_8030E6A4(SFX_6D_CROC_BITE, 1.1f, 10000);
|
||||
}
|
||||
case 5://L8035DE84
|
||||
this->marker->unk14_20 = MARKER_173_CHUMP_FISH_2;
|
||||
this->marker->id = MARKER_173_CHUMP_FISH_2;
|
||||
func_803297FC(this, &sp40, &sp44);
|
||||
subaddie_set_ideal_yaw(this, (s32) sp44);
|
||||
func_80328CA8(this, (s32) func_8035D590(sp40));
|
||||
|
@@ -2,8 +2,8 @@
|
||||
#include "functions.h"
|
||||
#include "variables.h"
|
||||
#include "actor.h"
|
||||
|
||||
#include "prop.h"
|
||||
#include "functions.h"
|
||||
|
||||
#include "ch/snacker.h"
|
||||
|
||||
@@ -210,145 +210,145 @@ void spawnQueue_reset(void){
|
||||
func_803062D0();
|
||||
func_80325F8C();
|
||||
spawnableActorList_new();
|
||||
spawnableActorList_add(&D_80367160, actor_new, 0x0000000); //cutscene Trigger?
|
||||
spawnableActorList_add(&D_803675F0, actor_new, 0x0000040);
|
||||
spawnableActorList_add(&D_80366090, actor_new, 0x2010103);
|
||||
spawnableActorList_add(&D_803660B4, actor_new, 0x0000103);
|
||||
spawnableActorList_add(&D_803674E0, actor_new, 0x0000182);
|
||||
spawnableActorList_add(&chBeehive, actor_new, 0x2000108);
|
||||
spawnableActorList_add(&D_80367310, actor_new, 0x0020001);
|
||||
spawnableActorList_add(&D_80367390, actor_new, 0x0080084);
|
||||
spawnableActorList_add(&chJinjoYellow, actor_new, 0x0000140);
|
||||
spawnableActorList_add(&chJinjoOrange, actor_new, 0x0000140);
|
||||
spawnableActorList_add(&chJinjoBlue, actor_new, 0x0000140);
|
||||
spawnableActorList_add(&chJinjoPink, actor_new, 0x0000140);
|
||||
spawnableActorList_add(&chJinjoGreen, actor_new, 0x0000140);
|
||||
spawnableActorList_add(&D_803662A8, actor_new, 0x02000C0);
|
||||
spawnableActorList_add(&chJigsawDance, actor_new, 0x0000004);
|
||||
spawnableActorList_add(&D_80367C60, actor_new, 0x0000004);
|
||||
spawnableActorList_add(&D_80367A20, actor_new, 0x0000000);
|
||||
spawnableActorList_add(&D_80366C80, actor_new, 0x0200040); //chhoneycarrier
|
||||
spawnableActorList_add(&D_80366CA4, actor_new, 0x0200040); //chhoney
|
||||
spawnableActorList_add(&D_80366C50, actor_new, 0x0200000); //music_note
|
||||
spawnableActorList_add(&D_80367D00, actor_new, 0x0200000); //egg
|
||||
spawnableActorList_add(&D_80366340, func_802C8A54, 0x0000004);
|
||||
spawnableActorList_add(&D_80366364, func_802C8AA8, 0x0000004);
|
||||
spawnableActorList_add(&D_80366388, func_802C8AF8, 0x0000004);
|
||||
spawnableActorList_add(&D_803663AC, func_802C8B4C, 0x0000004);
|
||||
spawnableActorList_add(&D_803663D0, func_802C8BA8, 0x0000004);
|
||||
spawnableActorList_add(&D_803663F4, func_802C8C04, 0x0000004);
|
||||
spawnableActorList_add(&D_80367AB0, func_802D7558, 0x0000004);
|
||||
spawnableActorList_add(&D_80367AD4, func_802D75B4, 0x0000004);
|
||||
spawnableActorList_add(&D_80367AF8, func_802D7610, 0x0000004);
|
||||
spawnableActorList_add(&chTrainers, actor_new, 0x0000000);
|
||||
spawnableActorList_add(&D_80365F60, actor_new, 0x0000004);
|
||||
spawnableActorList_add(&D_80365F84, actor_new, 0x0000004); //turbotrainers
|
||||
spawnableActorList_add(&D_80367184, actor_new, 0x0000000);
|
||||
spawnableActorList_add(&chExtraLife, actor_new, 0x0200000); //extralife
|
||||
spawnableActorList_add(&D_80365FB0, actor_new, 0x0000004); //shrapnel
|
||||
spawnableActorList_add(&chBadShad, actor_new, 0x0000004); //chbadshad
|
||||
spawnableActorList_add(&D_803685A0, actor_new, 0x0000040); //mumbotoken
|
||||
spawnableActorList_add(&D_80367F30, actor_new, 0x0000400);
|
||||
spawnableActorList_add(&chBubble, actor_new, 0x0000004);
|
||||
spawnableActorList_add(&chGloop, actor_new, 0x000008A); //gloop
|
||||
spawnableActorList_add(&chShockJump, actor_new, 0x0000000); //chshockjump
|
||||
spawnableActorList_add(&chFlightPad, actor_new, 0x0000000); //flight_pad
|
||||
spawnableActorList_add(&D_80367D24, actor_new, 0x0200000); //redfeather
|
||||
spawnableActorList_add(&D_80367D48, actor_new, 0x0200000); //goldfeather
|
||||
spawnableActorList_add(&D_80367C90, actor_new, 0x0000004); //spent_redfeather
|
||||
spawnableActorList_add(&D_80367CB4, actor_new, 0x0000004); //spent_goldfeather
|
||||
spawnableActorList_add(&gChMole, actor_new, 0x0000180); //bottles
|
||||
spawnableActorList_add(&D_80367E20, actor_new, 0x44); //chmolehill
|
||||
spawnableActorList_add(&D_80373DC0, actor_new, 0x80000);
|
||||
spawnableActorList_add(&D_80367E70, actor_new, 0x0);
|
||||
spawnableActorList_add(&gChSnacker, actor_new, 0x10004); //snacker
|
||||
spawnableActorList_add(&D_80366EF0, actor_new, 0x20004); //large_shadow
|
||||
spawnableActorList_add(&D_80367B20, actor_new, 0x80); //chclimbbase
|
||||
spawnableActorList_add(&D_80367BA4, actor_new, 0x40); //gold_bullion
|
||||
spawnableActorList_add(&D_80367B80, actor_new, 0x2); //orange
|
||||
spawnableActorList_add(&D_80372970, actor_new, 0x80); //leaf_particle
|
||||
spawnableActorList_add(&D_80372994, actor_new, 0x80);
|
||||
spawnableActorList_add(&D_803729B8, actor_new, 0x80); //rain
|
||||
spawnableActorList_add(&D_803729DC, actor_new, 0x80);
|
||||
spawnableActorList_add(&D_80372A00, actor_new, 0x80); //snow
|
||||
spawnableActorList_add(&D_80372A24, actor_new, 0x80);
|
||||
spawnableActorList_add(&D_80372A48, actor_new, 0x81);
|
||||
spawnableActorList_add(&D_80372A6C, actor_new, 0x81);
|
||||
spawnableActorList_add(&chMinigame, actor_new, 0x80); //boombox
|
||||
spawnableActorList_add(&D_803677A8, actor_new, 0x8600); //ice_key
|
||||
spawnableActorList_add(&D_80367814, actor_new, 0x8600); //SnS_egg
|
||||
spawnableActorList_add(&gChFireFxInfo, actor_new, 0x0); //fire
|
||||
spawnableActorList_add(&D_80367838, actor_new, 0x8600); //level_entry_disk
|
||||
spawnableActorList_add(&D_80367760, actor_new, 0x1000);
|
||||
spawnableActorList_add(&D_80367784, actor_new, 0x1000);
|
||||
spawnableActorList_add(&D_80365E58, actor_new, 0x20480); //banjo.without_right_hand
|
||||
spawnableActorList_add(&D_80365EAC, actor_new, 0x20480); //banjo.playing_gameboy
|
||||
spawnableActorList_add(&D_80365F00, actor_new, 0x20480); //banjo.cooking
|
||||
spawnableActorList_add(&D_803677CC, actor_new, 0x8680);//mumbo_transform_pad
|
||||
spawnableActorList_add(&D_803677F0, actor_new, 0x8680);
|
||||
spawnableActorList_add(&D_803731B0, actor_new, 0x0);
|
||||
spawnableActorList_add(&chSnowball, actor_new, 0x100044);//snowball
|
||||
spawnableActorList_add(&chSnowmanHat, actor_new, 0x4);//sir_slush_hat
|
||||
spawnableActorList_add(&gChDripsInfo, actor_new, 0x400);//water_drops
|
||||
spawnableActorList_add(&D_80372BA4, actor_new, 0x2020141);//ice_cube
|
||||
spawnableActorList_add(&D_8036804C, actor_new, 0x508604);//GAME_OVER
|
||||
spawnableActorList_add(&D_8036807C, actor_new, 0x508604);//THE_END
|
||||
spawnableActorList_add(&D_803680AC, actor_new, 0x508604);//player_KAZOOIE
|
||||
spawnableActorList_add(&chOverlayCopyrightDescription, actor_new, 0x508604);//copyright_info
|
||||
spawnableActorList_add(&D_80368124, actor_new, 0x508604);//PRESS_START
|
||||
spawnableActorList_add(&chBottlesBonusDescription, chBottlesBonus_new, 0x509604);//jiggy_picture
|
||||
spawnableActorList_add(&D_8036833C, actor_new, 0x508604);
|
||||
spawnableActorList_add(&D_8036838C, actor_new, 0x509604);
|
||||
spawnableActorList_add(&D_80368418, actor_new, 0x508644);//banjos_hand_BB
|
||||
spawnableActorList_add(&D_80368174, actor_new, 0x508604);//NO_CONTROLLER);
|
||||
spawnableActorList_add(&D_80367530, actor_new, 0x0);//mumbo_token_sign.5
|
||||
spawnableActorList_add(&D_80367554, actor_new, 0x0);//mumbo_toke_sign.10
|
||||
spawnableActorList_add(&D_80367578, actor_new, 0x0);//mumbo_toke_sign.15
|
||||
spawnableActorList_add(&D_8036759C, actor_new, 0x0);//mumbo_toke_sign.20
|
||||
spawnableActorList_add(&D_803675C0, actor_new, 0x0);//mumbo_toke_sign.25
|
||||
spawnableActorList_add(&D_8036785C, actor_new, 0x0);//witch_switch.mm;
|
||||
spawnableActorList_add(&D_80367880, actor_new, 0x0);//witch_switch.mmm
|
||||
spawnableActorList_add(&D_803678A4, actor_new, 0x0);//witch_switch.ttc
|
||||
spawnableActorList_add(&D_803678C8, actor_new, 0x0);//witch_switch.rbb
|
||||
spawnableActorList_add(&D_803678EC, actor_new, 0x0);//witch_switch.ccw
|
||||
spawnableActorList_add(&D_80367910, actor_new, 0x0);//witch_switch.fp
|
||||
spawnableActorList_add(&D_80367934, actor_new, 0x0);//witch_switch.cc
|
||||
spawnableActorList_add(&D_80367958, actor_new, 0x0);//witch_switch.bgs
|
||||
spawnableActorList_add(&D_8036797C, actor_new, 0x400);//witch_switch.gv
|
||||
spawnableActorList_add(&D_80368450, actor_new, 0x20000);//fire_sparkle
|
||||
spawnableActorList_add(&D_803684BC, actor_new, 0x180);//roysten
|
||||
spawnableActorList_add(&D_803684E0, actor_new, 0x0);//cuckoo_clock
|
||||
spawnableActorList_add(&D_80368504, actor_new, 0x0);
|
||||
spawnableActorList_add(&D_80368528, actor_new, 0x0);
|
||||
spawnableActorList_add(&D_8036854C, actor_new, 0x0);
|
||||
spawnableActorList_add(&D_80368570, actor_new, 0x0);
|
||||
spawnableActorList_add(&D_80368474, actor_new, 0xC8);
|
||||
spawnableActorList_add(&D_80368498, actor_new, 0x0);
|
||||
spawnableActorList_add(&D_803732E0, actor_new, 0x0);
|
||||
spawnableActorList_add(&D_80372810, actor_new, 0x8008A8);
|
||||
spawnableActorList_add(&D_80373100, actor_new, 0x28008A8);
|
||||
spawnableActorList_add(&D_80373134, actor_new, 0x880);
|
||||
spawnableActorList_add(&D_80373158, actor_new, 0x880);
|
||||
spawnableActorList_add(&D_80372EE0, actor_new, 0x2000141);
|
||||
spawnableActorList_addIfMapVisited(&chTermite, actor_new, 0x2010101, MAP_2_MM_MUMBOS_MOUNTAIN); //ticker
|
||||
spawnableActorList_addIfMapVisited(&D_80372C80, actor_new, 0x2010981, MAP_31_RBB_RUSTY_BUCKET_BAY); //floatsam
|
||||
spawnableActorList_addIfMapVisited(&D_80372C18, actor_new, 0x211A9, MAP_1B_MMM_MAD_MONSTER_MANSION); //teehee
|
||||
spawnableActorList_addIfMapVisited(&D_80372FC0, actor_new, 0x2010001, MAP_1B_MMM_MAD_MONSTER_MANSION);
|
||||
spawnableActorList_addIfMapVisited(&D_80372FE4, actor_new, 0x2010401, MAP_1B_MMM_MAD_MONSTER_MANSION);
|
||||
spawnableActorList_addIfMapVisited(&D_803730D8, actor_new, 0x2200021, MAP_1B_MMM_MAD_MONSTER_MANSION); //nibbly
|
||||
spawnableActorList_addIfMapVisited(&D_80367130, actor_new, 0x20009a9, MAP_D_BGS_BUBBLEGLOOP_SWAMP); //buzzbomb
|
||||
spawnableActorList_addIfMapVisited(&D_80372B80, actor_new, 0x2020141, MAP_27_FP_FREEZEEZY_PEAK);
|
||||
spawnableActorList_addIfMapVisited(&chShrapnelDescription, actor_new, 0x2000101, MAP_7_TTC_TREASURE_TROVE_COVE); //scrapnel
|
||||
spawnableActorList_addIfMapVisited(&D_80372D78, actor_new, 0x3010121, MAP_1B_MMM_MAD_MONSTER_MANSION); //limbo
|
||||
spawnableActorList_addIfMapVisited(&D_80372DF8, actor_new, 0x2010121, MAP_31_RBB_RUSTY_BUCKET_BAY); //grublin_hood
|
||||
spawnableActorList_addIfMapVisited(&D_80372E78, actor_new, 0x3010129, MAP_12_GV_GOBIS_VALLEY); //mummum
|
||||
spawnableActorList_addIfMapVisited(&D_80372840, actor_new, 0x2800960, MAP_B_CC_CLANKERS_CAVERN); //grillchompa
|
||||
spawnableActorList_addIfMapVisited(&D_803670B8, actor_new, 0x3000121, MAP_7_TTC_TREASURE_TROVE_COVE); //snippet
|
||||
spawnableActorList_addIfMapVisited(&D_803670DC, actor_new, 0x30000a0, MAP_7_TTC_TREASURE_TROVE_COVE); //black_snippet
|
||||
spawnableActorList_addIfMapVisited(&D_80367100, actor_new, 0x3001021, MAP_7_TTC_TREASURE_TROVE_COVE); //mutie_snippet
|
||||
spawnableActorList_addIfMapVisited(&D_80372870, actor_new, 0x2800820, MAP_40_CCW_HUB); //clucker
|
||||
spawnableActorList_addIfMapVisited(&D_803728A0, actor_new, 0x2000981, MAP_12_GV_GOBIS_VALLEY); //scarab
|
||||
spawnableActorList_addIfMapVisited(&chSnowman, actor_new, 0x2000460, MAP_27_FP_FREEZEEZY_PEAK); //sirslush
|
||||
spawnableActorList_add(&D_80367160, actor_new, ACTOR_FLAG_NONE); //cutscene Trigger?
|
||||
spawnableActorList_add(&D_803675F0, actor_new, ACTOR_FLAG_UNKNOWN_6);
|
||||
spawnableActorList_add(&D_80366090, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_1 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_25);
|
||||
spawnableActorList_add(&D_803660B4, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_1 | ACTOR_FLAG_UNKNOWN_8);
|
||||
spawnableActorList_add(&D_803674E0, actor_new, ACTOR_FLAG_UNKNOWN_1 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8);
|
||||
spawnableActorList_add(&chBeehive, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_25);
|
||||
spawnableActorList_add(&D_80367310, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_17);
|
||||
spawnableActorList_add(&D_80367390, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_19);
|
||||
spawnableActorList_add(&chJinjoYellow, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8);
|
||||
spawnableActorList_add(&chJinjoOrange, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8);
|
||||
spawnableActorList_add(&chJinjoBlue, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8);
|
||||
spawnableActorList_add(&chJinjoPink, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8);
|
||||
spawnableActorList_add(&chJinjoGreen, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8);
|
||||
spawnableActorList_add(&D_803662A8, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_21);
|
||||
spawnableActorList_add(&chJigsawDance, actor_new, ACTOR_FLAG_UNKNOWN_2);
|
||||
spawnableActorList_add(&D_80367C60, actor_new, ACTOR_FLAG_UNKNOWN_2);
|
||||
spawnableActorList_add(&D_80367A20, actor_new, ACTOR_FLAG_NONE);
|
||||
spawnableActorList_add(&D_80366C80, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_21); //chhoneycarrier
|
||||
spawnableActorList_add(&D_80366CA4, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_21); //chhoney
|
||||
spawnableActorList_add(&D_80366C50, actor_new, ACTOR_FLAG_UNKNOWN_21); //music_note
|
||||
spawnableActorList_add(&D_80367D00, actor_new, ACTOR_FLAG_UNKNOWN_21); //egg
|
||||
spawnableActorList_add(&D_80366340, func_802C8A54, ACTOR_FLAG_UNKNOWN_2);
|
||||
spawnableActorList_add(&D_80366364, func_802C8AA8, ACTOR_FLAG_UNKNOWN_2);
|
||||
spawnableActorList_add(&D_80366388, func_802C8AF8, ACTOR_FLAG_UNKNOWN_2);
|
||||
spawnableActorList_add(&D_803663AC, func_802C8B4C, ACTOR_FLAG_UNKNOWN_2);
|
||||
spawnableActorList_add(&D_803663D0, func_802C8BA8, ACTOR_FLAG_UNKNOWN_2);
|
||||
spawnableActorList_add(&D_803663F4, func_802C8C04, ACTOR_FLAG_UNKNOWN_2);
|
||||
spawnableActorList_add(&D_80367AB0, func_802D7558, ACTOR_FLAG_UNKNOWN_2);
|
||||
spawnableActorList_add(&D_80367AD4, func_802D75B4, ACTOR_FLAG_UNKNOWN_2);
|
||||
spawnableActorList_add(&D_80367AF8, func_802D7610, ACTOR_FLAG_UNKNOWN_2);
|
||||
spawnableActorList_add(&chTrainers, actor_new, ACTOR_FLAG_NONE);
|
||||
spawnableActorList_add(&D_80365F60, actor_new, ACTOR_FLAG_UNKNOWN_2);
|
||||
spawnableActorList_add(&D_80365F84, actor_new, ACTOR_FLAG_UNKNOWN_2); //turbotrainers
|
||||
spawnableActorList_add(&D_80367184, actor_new, ACTOR_FLAG_NONE);
|
||||
spawnableActorList_add(&chExtraLife, actor_new, ACTOR_FLAG_UNKNOWN_21); //extralife
|
||||
spawnableActorList_add(&D_80365FB0, actor_new, ACTOR_FLAG_UNKNOWN_2); //shrapnel
|
||||
spawnableActorList_add(&chBadShad, actor_new, ACTOR_FLAG_UNKNOWN_2); //chbadshad
|
||||
spawnableActorList_add(&D_803685A0, actor_new, ACTOR_FLAG_UNKNOWN_6); //mumbotoken
|
||||
spawnableActorList_add(&D_80367F30, actor_new, ACTOR_FLAG_UNKNOWN_10);
|
||||
spawnableActorList_add(&chBubble, actor_new, ACTOR_FLAG_UNKNOWN_2);
|
||||
spawnableActorList_add(&chGloop, actor_new, ACTOR_FLAG_UNKNOWN_1 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7); //gloop
|
||||
spawnableActorList_add(&chShockJump, actor_new, ACTOR_FLAG_NONE); //chshockjump
|
||||
spawnableActorList_add(&chFlightPad, actor_new, ACTOR_FLAG_NONE); //flight_pad
|
||||
spawnableActorList_add(&D_80367D24, actor_new, ACTOR_FLAG_UNKNOWN_21); //redfeather
|
||||
spawnableActorList_add(&D_80367D48, actor_new, ACTOR_FLAG_UNKNOWN_21); //goldfeather
|
||||
spawnableActorList_add(&D_80367C90, actor_new, ACTOR_FLAG_UNKNOWN_2); //spent_redfeather
|
||||
spawnableActorList_add(&D_80367CB4, actor_new, ACTOR_FLAG_UNKNOWN_2); //spent_goldfeather
|
||||
spawnableActorList_add(&gChMole, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8); //bottles
|
||||
spawnableActorList_add(&D_80367E20, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_6); //chmolehill
|
||||
spawnableActorList_add(&D_80373DC0, actor_new, ACTOR_FLAG_UNKNOWN_19);
|
||||
spawnableActorList_add(&D_80367E70, actor_new, ACTOR_FLAG_NONE);
|
||||
spawnableActorList_add(&gChSnacker, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_16); //snacker
|
||||
spawnableActorList_add(&D_80366EF0, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_17); //large_shadow
|
||||
spawnableActorList_add(&D_80367B20, actor_new, ACTOR_FLAG_UNKNOWN_7); //chclimbbase
|
||||
spawnableActorList_add(&D_80367BA4, actor_new, ACTOR_FLAG_UNKNOWN_6); //gold_bullion
|
||||
spawnableActorList_add(&D_80367B80, actor_new, ACTOR_FLAG_UNKNOWN_1); //orange
|
||||
spawnableActorList_add(&D_80372970, actor_new, ACTOR_FLAG_UNKNOWN_7); //leaf_particle
|
||||
spawnableActorList_add(&D_80372994, actor_new, ACTOR_FLAG_UNKNOWN_7);
|
||||
spawnableActorList_add(&D_803729B8, actor_new, ACTOR_FLAG_UNKNOWN_7); //rain
|
||||
spawnableActorList_add(&D_803729DC, actor_new, ACTOR_FLAG_UNKNOWN_7);
|
||||
spawnableActorList_add(&D_80372A00, actor_new, ACTOR_FLAG_UNKNOWN_7); //snow
|
||||
spawnableActorList_add(&D_80372A24, actor_new, ACTOR_FLAG_UNKNOWN_7);
|
||||
spawnableActorList_add(&D_80372A48, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_7);
|
||||
spawnableActorList_add(&D_80372A6C, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_7);
|
||||
spawnableActorList_add(&chMinigame, actor_new, ACTOR_FLAG_UNKNOWN_7); //boombox
|
||||
spawnableActorList_add(&D_803677A8, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); //ice_key
|
||||
spawnableActorList_add(&D_80367814, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); //SnS_egg
|
||||
spawnableActorList_add(&gChFireFxInfo, actor_new, ACTOR_FLAG_NONE); //fire
|
||||
spawnableActorList_add(&D_80367838, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); //level_entry_disk
|
||||
spawnableActorList_add(&D_80367760, actor_new, ACTOR_FLAG_UNKNOWN_12);
|
||||
spawnableActorList_add(&D_80367784, actor_new, ACTOR_FLAG_UNKNOWN_12);
|
||||
spawnableActorList_add(&D_80365E58, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_17); //banjo.without_right_hand
|
||||
spawnableActorList_add(&D_80365EAC, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_17); //banjo.playing_gameboy
|
||||
spawnableActorList_add(&D_80365F00, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_17); //banjo.cooking
|
||||
spawnableActorList_add(&D_803677CC, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15);//mumbo_transform_pad
|
||||
spawnableActorList_add(&D_803677F0, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15);
|
||||
spawnableActorList_add(&D_803731B0, actor_new, ACTOR_FLAG_NONE);
|
||||
spawnableActorList_add(&chSnowball, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_20);//snowball
|
||||
spawnableActorList_add(&chSnowmanHat, actor_new, ACTOR_FLAG_UNKNOWN_2);//sir_slush_hat
|
||||
spawnableActorList_add(&gChDripsInfo, actor_new, ACTOR_FLAG_UNKNOWN_10);//water_drops
|
||||
spawnableActorList_add(&D_80372BA4, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_17 | ACTOR_FLAG_UNKNOWN_25);//ice_cube
|
||||
spawnableActorList_add(&D_8036804C, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15 | ACTOR_FLAG_UNKNOWN_20 | ACTOR_FLAG_UNKNOWN_22);//GAME_OVER
|
||||
spawnableActorList_add(&D_8036807C, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15 | ACTOR_FLAG_UNKNOWN_20 | ACTOR_FLAG_UNKNOWN_22);//THE_END
|
||||
spawnableActorList_add(&D_803680AC, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15 | ACTOR_FLAG_UNKNOWN_20 | ACTOR_FLAG_UNKNOWN_22);//player_KAZOOIE
|
||||
spawnableActorList_add(&chOverlayCopyrightDescription, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15 | ACTOR_FLAG_UNKNOWN_20 | ACTOR_FLAG_UNKNOWN_22);//copyright_info
|
||||
spawnableActorList_add(&D_80368124, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15 | ACTOR_FLAG_UNKNOWN_20 | ACTOR_FLAG_UNKNOWN_22);//PRESS_START
|
||||
spawnableActorList_add(&chBottlesBonusDescription, chBottlesBonus_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_12 | ACTOR_FLAG_UNKNOWN_15 | ACTOR_FLAG_UNKNOWN_20 | ACTOR_FLAG_UNKNOWN_22);//jiggy_picture
|
||||
spawnableActorList_add(&D_8036833C, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15 | ACTOR_FLAG_UNKNOWN_20 | ACTOR_FLAG_UNKNOWN_22);
|
||||
spawnableActorList_add(&D_8036838C, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_12 | ACTOR_FLAG_UNKNOWN_15 | ACTOR_FLAG_UNKNOWN_20 | ACTOR_FLAG_UNKNOWN_22);
|
||||
spawnableActorList_add(&D_80368418, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15 | ACTOR_FLAG_UNKNOWN_20 | ACTOR_FLAG_UNKNOWN_22);//banjos_hand_BB
|
||||
spawnableActorList_add(&D_80368174, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15 | ACTOR_FLAG_UNKNOWN_20 | ACTOR_FLAG_UNKNOWN_22);//NO_CONTROLLER);
|
||||
spawnableActorList_add(&D_80367530, actor_new, ACTOR_FLAG_NONE);//mumbo_token_sign.5
|
||||
spawnableActorList_add(&D_80367554, actor_new, ACTOR_FLAG_NONE);//mumbo_toke_sign.10
|
||||
spawnableActorList_add(&D_80367578, actor_new, ACTOR_FLAG_NONE);//mumbo_toke_sign.15
|
||||
spawnableActorList_add(&D_8036759C, actor_new, ACTOR_FLAG_NONE);//mumbo_toke_sign.20
|
||||
spawnableActorList_add(&D_803675C0, actor_new, ACTOR_FLAG_NONE);//mumbo_toke_sign.25
|
||||
spawnableActorList_add(&D_8036785C, actor_new, ACTOR_FLAG_NONE);//witch_switch.mm;
|
||||
spawnableActorList_add(&D_80367880, actor_new, ACTOR_FLAG_NONE);//witch_switch.mmm
|
||||
spawnableActorList_add(&D_803678A4, actor_new, ACTOR_FLAG_NONE);//witch_switch.ttc
|
||||
spawnableActorList_add(&D_803678C8, actor_new, ACTOR_FLAG_NONE);//witch_switch.rbb
|
||||
spawnableActorList_add(&D_803678EC, actor_new, ACTOR_FLAG_NONE);//witch_switch.ccw
|
||||
spawnableActorList_add(&D_80367910, actor_new, ACTOR_FLAG_NONE);//witch_switch.fp
|
||||
spawnableActorList_add(&D_80367934, actor_new, ACTOR_FLAG_NONE);//witch_switch.cc
|
||||
spawnableActorList_add(&D_80367958, actor_new, ACTOR_FLAG_NONE);//witch_switch.bgs
|
||||
spawnableActorList_add(&D_8036797C, actor_new, ACTOR_FLAG_UNKNOWN_10);//witch_switch.gv
|
||||
spawnableActorList_add(&D_80368450, actor_new, ACTOR_FLAG_UNKNOWN_17);//fire_sparkle
|
||||
spawnableActorList_add(&D_803684BC, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8);//roysten
|
||||
spawnableActorList_add(&D_803684E0, actor_new, ACTOR_FLAG_NONE);//cuckoo_clock
|
||||
spawnableActorList_add(&D_80368504, actor_new, ACTOR_FLAG_NONE);
|
||||
spawnableActorList_add(&D_80368528, actor_new, ACTOR_FLAG_NONE);
|
||||
spawnableActorList_add(&D_8036854C, actor_new, ACTOR_FLAG_NONE);
|
||||
spawnableActorList_add(&D_80368570, actor_new, ACTOR_FLAG_NONE);
|
||||
spawnableActorList_add(&D_80368474, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_7);
|
||||
spawnableActorList_add(&D_80368498, actor_new, ACTOR_FLAG_NONE);
|
||||
spawnableActorList_add(&D_803732E0, actor_new, ACTOR_FLAG_NONE);
|
||||
spawnableActorList_add(&D_80372810, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_23);
|
||||
spawnableActorList_add(&D_80373100, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_23 | ACTOR_FLAG_UNKNOWN_25);
|
||||
spawnableActorList_add(&D_80373134, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11);
|
||||
spawnableActorList_add(&D_80373158, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11);
|
||||
spawnableActorList_add(&D_80372EE0, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_25);
|
||||
spawnableActorList_addIfMapVisited(&chTermite, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_25, MAP_2_MM_MUMBOS_MOUNTAIN); //ticker
|
||||
spawnableActorList_addIfMapVisited(&D_80372C80, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_25, MAP_31_RBB_RUSTY_BUCKET_BAY); //floatsam
|
||||
spawnableActorList_addIfMapVisited(&D_80372C18, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_12 | ACTOR_FLAG_UNKNOWN_17, MAP_1B_MMM_MAD_MONSTER_MANSION); //teehee
|
||||
spawnableActorList_addIfMapVisited(&D_80372FC0, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_25, MAP_1B_MMM_MAD_MONSTER_MANSION);
|
||||
spawnableActorList_addIfMapVisited(&D_80372FE4, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_25, MAP_1B_MMM_MAD_MONSTER_MANSION);
|
||||
spawnableActorList_addIfMapVisited(&D_803730D8, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_21 |ACTOR_FLAG_UNKNOWN_25, MAP_1B_MMM_MAD_MONSTER_MANSION); //nibbly
|
||||
spawnableActorList_addIfMapVisited(&D_80367130, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_25, MAP_D_BGS_BUBBLEGLOOP_SWAMP); //buzzbomb
|
||||
spawnableActorList_addIfMapVisited(&D_80372B80, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_17 | ACTOR_FLAG_UNKNOWN_25, MAP_27_FP_FREEZEEZY_PEAK);
|
||||
spawnableActorList_addIfMapVisited(&chShrapnelDescription, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_25, MAP_7_TTC_TREASURE_TROVE_COVE); //scrapnel
|
||||
spawnableActorList_addIfMapVisited(&D_80372D78, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_24 | ACTOR_FLAG_UNKNOWN_25, MAP_1B_MMM_MAD_MONSTER_MANSION); //limbo
|
||||
spawnableActorList_addIfMapVisited(&D_80372DF8, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_25, MAP_31_RBB_RUSTY_BUCKET_BAY); //grublin_hood
|
||||
spawnableActorList_addIfMapVisited(&D_80372E78, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_24 | ACTOR_FLAG_UNKNOWN_25, MAP_12_GV_GOBIS_VALLEY); //mummum
|
||||
spawnableActorList_addIfMapVisited(&D_80372840, actor_new, ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_23 |ACTOR_FLAG_UNKNOWN_25, MAP_B_CC_CLANKERS_CAVERN); //grillchompa
|
||||
spawnableActorList_addIfMapVisited(&D_803670B8, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_24 | ACTOR_FLAG_UNKNOWN_25, MAP_7_TTC_TREASURE_TROVE_COVE); //snippet
|
||||
spawnableActorList_addIfMapVisited(&D_803670DC, actor_new, ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_24 | ACTOR_FLAG_UNKNOWN_25, MAP_7_TTC_TREASURE_TROVE_COVE); //black_snippet
|
||||
spawnableActorList_addIfMapVisited(&D_80367100, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_12 | ACTOR_FLAG_UNKNOWN_24 | ACTOR_FLAG_UNKNOWN_25, MAP_7_TTC_TREASURE_TROVE_COVE); //mutie_snippet
|
||||
spawnableActorList_addIfMapVisited(&D_80372870, actor_new, ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_23 |ACTOR_FLAG_UNKNOWN_25, MAP_40_CCW_HUB); //clucker
|
||||
spawnableActorList_addIfMapVisited(&D_803728A0, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_25, MAP_12_GV_GOBIS_VALLEY); //scarab
|
||||
spawnableActorList_addIfMapVisited(&chSnowman, actor_new, ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_25, MAP_27_FP_FREEZEEZY_PEAK); //sirslush
|
||||
switch(loaded_asm_file){
|
||||
default:
|
||||
break;
|
||||
@@ -387,9 +387,9 @@ void spawnQueue_reset(void){
|
||||
break;
|
||||
case OVERLAY_9_SNOW:
|
||||
FP_func_80391324();
|
||||
spawnableActorList_add(&D_80367BC8, actor_new, 0x8);
|
||||
spawnableActorList_add(&D_80367BEC, actor_new, 0x8);
|
||||
spawnableActorList_add(&D_80367C10, actor_new, 0x8);
|
||||
spawnableActorList_add(&D_80367BC8, actor_new, ACTOR_FLAG_UNKNOWN_3);
|
||||
spawnableActorList_add(&D_80367BEC, actor_new, ACTOR_FLAG_UNKNOWN_3);
|
||||
spawnableActorList_add(&D_80367C10, actor_new, ACTOR_FLAG_UNKNOWN_3);
|
||||
break;
|
||||
case OVERLAY_A_TREE:
|
||||
CCW_func_8038DB6C();
|
||||
|
Reference in New Issue
Block a user