diff --git a/include/enums.h b/include/enums.h index 2144f103..8a66a71c 100644 --- a/include/enums.h +++ b/include/enums.h @@ -1761,6 +1761,8 @@ enum actor_e ACTOR_245_GV_SNS_SWITCH = 0x245, + ACTOR_247_LAIR_SWITCH_FLIGHT_PAD = 0x247, + ACTOR_256_GV_WITCH_SWITCH = 0x256, ACTOR_257_BGS_WITCH_SWITCH = 0x257, @@ -1793,6 +1795,7 @@ enum actor_e ACTOR_29B_ZUBBA = 0x29B, + ACTOR_29E_CCW_GOBI = 0x29E, ACTOR_29F_CLUCKER = 0x29F, ACTOR_2A1_EEYRIE_BABY = 0x2A1, @@ -3742,6 +3745,8 @@ enum marker_e{ MARKER_3B_SCARF_SLED = 0x3B, MARKER_3C_RACE_SLED, + MARKER_45_FLIGHT_PAD = 0x45, + MARKER_48_NAPPER = 0x48, MARKER_49_MOTZHAND, MARKER_4A_CC_KEY, @@ -3818,7 +3823,8 @@ enum marker_e{ MARKER_C8_MR_VILE, MARKER_C9_FLOTSAM, - MARKER_D5_BGS_MUD_HUT = 0xD5, + MARKER_D4_SPRING_PAD = 0xD4, + MARKER_D5_BGS_MUD_HUT, MARKER_D6_PINK_EGG_LARGE, MARKER_D7_PINK_EGG_MEDIUM, MARKER_D8_PINK_EGG_SMALL, @@ -3909,7 +3915,8 @@ enum marker_e{ MARKER_1AE_ZUBBA = 0x1AE, - MARKER_1B2_CLUCKER_A = 0x1B2, + MARKER_1B1_CCW_GOBI = 0x1B1, + MARKER_1B2_CLUCKER_A, MARKER_1B4_EEYRIE_BABY = 0x1B4, MARKER_1B5_CATERPILLAR, @@ -3930,7 +3937,7 @@ enum marker_e{ MARKER_1E2_GRUBLIN_HOOD = 0x1E2, - MARKER_1E5_GOLD_FEATHER = 0x1E5, + MARKER_1E5_GOLD_FEATHER_COLLECTABLE = 0x1E5, MARKER_1E6_TOPPER_B, MARKER_1E7_BAWL_B, MARKER_1E8_COLLYWOBBLE_B, @@ -3976,6 +3983,7 @@ enum marker_e{ MARKER_23C_GV_SNS_SWITCH = 0x23C, MARKER_23F_LAIR_FLIGHT_PAD_SWITCH = 0x23F, + MARKER_240_LAIR_SWITCH_FLIGHT_PAD = 0x240, MARKER_245_XMAS_TREE_EGG_TOLL = 0x245, @@ -3996,6 +4004,8 @@ enum marker_e{ MARKER_25E_GRUNTILDA_FINAL_BOSS = 0x25E, MARKER_25F_ICECUBE_B = 0x25F, + MARKER_261_FIGHT_FLIGHT_PAD = 0x261, + MARKER_276_STONE_JINJO = 0x276, MARKER_27A_JINJO_STATUE_BASE = 0x27A, diff --git a/src/CCW/code_2270.c b/src/CCW/code_2270.c index 332846a1..e9da61c7 100644 --- a/src/CCW/code_2270.c +++ b/src/CCW/code_2270.c @@ -11,13 +11,13 @@ typedef struct{ typedef struct{ Struct_CCW_2270_0 *unk0; - void *unk4; - void *unk8; -}ActorLocal_CCW_2270; + Struct80s *unk4; + BKModelBin *spit_model; +}ActorLocal_chGobiCCW; void CCW_func_8038868C(Actor *this, s32 next_state); -Actor *func_803889AC(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); -void func_80388AA0(Actor *this); +Actor *chGobiCCW_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); +void chGobiCCW_update(Actor *this); /* .data */ Struct_CCW_2270_0 D_8038ECD0[] = { @@ -27,9 +27,9 @@ Struct_CCW_2270_0 D_8038ECD0[] = { }; ActorInfo D_8038ECE8 = { - 0x1B1, 0x29E, ASSET_3E0_MODEL_GOBI, + MARKER_1B1_CCW_GOBI, ACTOR_29E_CCW_GOBI, ASSET_3E0_MODEL_GOBI, 0x0, NULL, - func_80388AA0, func_80388AA0, func_803889AC, + chGobiCCW_update, chGobiCCW_update, chGobiCCW_draw, 0, 0, 1.0f, 0 }; @@ -39,9 +39,9 @@ void CCW_func_80388660(ActorMarker* marker, s32 arg1) { } void CCW_func_8038868C(Actor *this, s32 next_state) { - ActorLocal_CCW_2270 *local; + ActorLocal_chGobiCCW *local; - local = (ActorLocal_CCW_2270*)&this->local; + local = (ActorLocal_chGobiCCW*)&this->local; if (next_state == 1) { func_80335924(this->unk148, ASSET_F4_ANIM_GOBI_IDLE, 0.5f, 12.0f); @@ -99,13 +99,13 @@ void func_8038894C(ActorMarker* marker, ActorMarker *other_marker) { } } -Actor *func_803889AC(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){ +Actor *chGobiCCW_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){ Actor *this; - ActorLocal_CCW_2270 *local; + ActorLocal_chGobiCCW *local; f32 sp2C[3]; this = marker_getActor(marker); - local = (ActorLocal_CCW_2270*)&this->local; + local = (ActorLocal_chGobiCCW*)&this->local; if (this->state == 2) { sp2C[0] = this->pitch; @@ -114,32 +114,32 @@ Actor *func_803889AC(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){ func_8033A238(func_803356A0(local->unk4, local)); modelRender_setDepthMode(MODEL_RENDER_DEPTH_COMPARE); - modelRender_draw(gfx, mtx, this->position, sp2C, 1.0f, NULL, local->unk8); + modelRender_draw(gfx, mtx, this->position, sp2C, 1.0f, NULL, local->spit_model); } return func_80325888(marker, gfx, mtx, vtx); } -void func_80388A70(Actor *this){ - ActorLocal_CCW_2270 *local = (ActorLocal_CCW_2270*)&this->local; +void chGobiCCW_free(Actor *this){ + ActorLocal_chGobiCCW *local = (ActorLocal_chGobiCCW*)&this->local; func_80335874(local->unk4); - assetcache_release(local->unk8); + assetcache_release(local->spit_model); } -void func_80388AA0(Actor *this) { - ActorLocal_CCW_2270 *local; +void chGobiCCW_update(Actor *this) { + ActorLocal_chGobiCCW *local; f32 sp48[3]; f32 sp44; f32 sp40; - local = (ActorLocal_CCW_2270*)&this->local; + local = (ActorLocal_chGobiCCW*)&this->local; if (!this->unk16C_4) { this->unk16C_4 = TRUE; this->marker->propPtr->unk8_3 = TRUE; - this->marker->unk30 = func_80388A70; + this->marker->unk30 = chGobiCCW_free; this->unk138_24 = FALSE; local->unk4 = func_803358B4(); - local->unk8 = assetcache_get(0x3F3); + local->spit_model = assetcache_get(ASSET_3F3_MODEL_GOBI_SPIT); marker_setCollisionScripts(this->marker, 0, func_8038894C, 0); if(!jiggyscore_isSpawned(JIGGY_4D_CCW_FLOWER)) { func_80320004(0xE5, 0); diff --git a/src/TTC/code_0.c b/src/TTC/code_0.c index 076bc5b4..e62acdba 100644 --- a/src/TTC/code_0.c +++ b/src/TTC/code_0.c @@ -282,7 +282,7 @@ void func_80386FDC(Actor *this){ sp44 = sp4C->marker->unk14_20; } - if(sp44 == 0x60 || sp44 == 0xb5){ + if(sp44 == MARKER_60_BLUE_EGG_COLLECTABLE || sp44 == 0xb5){ if(this->position_y <= sp48 + 15.0f && sp48 - 15.0f <= this->position_y){ this->position_y = sp48; this->unk38_31 = sp44; diff --git a/src/core2/ch/collectable.c b/src/core2/ch/collectable.c index b265023d..59cbf8e9 100644 --- a/src/core2/ch/collectable.c +++ b/src/core2/ch/collectable.c @@ -26,7 +26,7 @@ extern ActorInfo D_80367D24 = { }; extern ActorInfo D_80367D48 = { - MARKER_1E5_GOLD_FEATHER, ACTOR_370_GOLD_FEATHER, ASSET_6D1_SPRITE_GOLDFEATHTER, + MARKER_1E5_GOLD_FEATHER_COLLECTABLE, ACTOR_370_GOLD_FEATHER, ASSET_6D1_SPRITE_GOLDFEATHTER, 0, NULL, chCollectable_update, func_80326224, chCollectable_draw, 0, 0, 0.5f, 0 @@ -63,7 +63,7 @@ void func_802D8C98(Actor *this, s32 arg1) { phi_v0 = (arg1 == 1) || (arg1 == 2) || (arg1 == 3); break; - case MARKER_1E5_GOLD_FEATHER: + case MARKER_1E5_GOLD_FEATHER_COLLECTABLE: phi_v0 = TRUE; break; diff --git a/src/core2/code_42CB0.c b/src/core2/code_42CB0.c index e30ab527..05ccfe73 100644 --- a/src/core2/code_42CB0.c +++ b/src/core2/code_42CB0.c @@ -9,18 +9,18 @@ typedef struct{ s32 unk4; }ActorLocal_EmptyHoneycomb; -void func_802C9E70(Actor *this); +void chHoneycomb_update(Actor *this); /* .data */ ActorInfo D_80366C80 = { MARKER_53_EMPTY_HONEYCOMB, ACTOR_47_EMPTY_HONEYCOMB, ASSET_361_MODEL_EMPTY_HONEYCOMB, 0, NULL, - func_802C9E70, func_80326224, func_80325888, + chHoneycomb_update, func_80326224, func_80325888, 0, 0, 0.8f, 0 }; ActorInfo D_80366CA4 = { MARKER_55_HONEYCOMB, ACTOR_50_HONEYCOMB, ASSET_363_MODEL_HONEYCOMB, 0, NULL, - func_802C9E70, func_80326224, func_80325888, + chHoneycomb_update, func_80326224, func_80325888, 0, 0, 0.8f, 0 }; @@ -92,7 +92,7 @@ void func_802C9D80(void){ marker_despawn(s5); } -void func_802C9E70(Actor *this){ +void chHoneycomb_update(Actor *this){ ActorLocal_EmptyHoneycomb *local = (ActorLocal_EmptyHoneycomb *)&this->local; ActorMarker **tmp_v0; int i; diff --git a/src/core2/code_43A40.c b/src/core2/code_43A40.c index 202f80dd..f5102989 100644 --- a/src/core2/code_43A40.c +++ b/src/core2/code_43A40.c @@ -15,14 +15,14 @@ extern ActorInfo D_80366F20 = { }; extern ActorInfo D_80366F44 = { - 0x045, ACTOR_E4_FLIGHT_PAD, ASSET_48A_MODEL_FLIGHT_PAD, + MARKER_45_FLIGHT_PAD, ACTOR_E4_FLIGHT_PAD, ASSET_48A_MODEL_FLIGHT_PAD, 0, NULL, func_802CAA44, func_80326224, func_80325888, 0, 0, 0.0f, 0 }; extern ActorInfo D_80366F68 = { - 0x261, ACTOR_39F_FIGHT_FLIGHT_PAD, ASSET_48A_MODEL_FLIGHT_PAD, + MARKER_261_FIGHT_FLIGHT_PAD, ACTOR_39F_FIGHT_FLIGHT_PAD, ASSET_48A_MODEL_FLIGHT_PAD, 0, NULL, func_802CAB70, func_80326224, func_80325888, 0, 0, 0.0f, 0 diff --git a/src/core2/code_47C0.c b/src/core2/code_47C0.c index 14ff6f69..9a1d8dac 100644 --- a/src/core2/code_47C0.c +++ b/src/core2/code_47C0.c @@ -293,7 +293,7 @@ void func_8028BCA0(Prop *prop){ } break; - case 0xB5: //L8028BEF4 + case MARKER_B5_RED_FEATHER_COLLECTABLE: //L8028BEF4 if(func_8028BC20(marker) != HITBOX_0_NONE) return; if(chcollectable_collectRedFeather(prop)){ @@ -301,7 +301,7 @@ void func_8028BCA0(Prop *prop){ } break; - case 0x1E5: //L8028BF24 + case MARKER_1E5_GOLD_FEATHER_COLLECTABLE: //L8028BF24 if(func_8028BC20(marker)) return; @@ -331,17 +331,17 @@ void func_8028BCA0(Prop *prop){ } break; - case 0xF5: //L8028BFB0 + case MARKER_F5_BGS_ELEVATED_WALKWAY_SWITCH: //L8028BFB0 if(plyr_hitbox_type == HITBOX_1_BEAK_BUSTER) func_8028BAB0(JIGGY_20_BGS_ELEVATED_WALKWAY, 1, 3, 7); break; - case 0xFD: //L8028BFD4 + case MARKER_FD_BGS_MAZE_SWITCH: //L8028BFD4 if(plyr_hitbox_type == HITBOX_1_BEAK_BUSTER) func_8028BAB0(JIGGY_25_BGS_MAZE, 0xa, 0xc, 8); break; - case 0xEC: //L8028BFF8 + case MARKER_EC_GV_SUN_SWITCH: //L8028BFF8 if(plyr_hitbox_type == HITBOX_1_BEAK_BUSTER){ mapSpecificFlags_set(3, 1); func_8030E6D4(SFX_90_SWITCH_PRESS); @@ -677,7 +677,7 @@ void func_8028BCA0(Prop *prop){ marker_despawn(marker); break; - case 0x60: //L8028CCF0 + case MARKER_60_BLUE_EGG_COLLECTABLE: //L8028CCF0 if(func_8028BC20(marker)) return; if(chcollectable_collectEgg(prop)){ @@ -685,7 +685,7 @@ void func_8028BCA0(Prop *prop){ } break; - case 0x6B: //L8028CD20 + case MARKER_6B_GLOOPBUBBLE: //L8028CD20 if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){ func_803463D4(ITEM_17_AIR, func_80301DBC(2)); } @@ -710,7 +710,7 @@ void func_8028BCA0(Prop *prop){ - case 0xD4: //L8028CDEC + case MARKER_D4_SPRING_PAD: //L8028CDEC case 0x242: //L8028CDEC if(ability_isUnlocked(ABILITY_D_SHOCK_JUMP)){ miscflag_set(MISC_FLAG_2_ON_SPRING_PAD); @@ -721,9 +721,9 @@ void func_8028BCA0(Prop *prop){ } break; - case 0x45: //L8028CE3C - case 0x240: //L8028CE3C - case 0x261: //L8028CE3C + case MARKER_45_FLIGHT_PAD: //L8028CE3C + case MARKER_240_LAIR_SWITCH_FLIGHT_PAD: //L8028CE3C + case MARKER_261_FIGHT_FLIGHT_PAD: //L8028CE3C if(ability_isUnlocked(ABILITY_9_FLY)){ miscflag_set(MISC_FLAG_1_ON_FLIGHT_PAD); } @@ -789,7 +789,7 @@ void func_8028BCA0(Prop *prop){ } break; - case 0x1B1: //L8028D024 + case MARKER_1B1_CCW_GOBI: //L8028D024 if(plyr_hitbox_type == HITBOX_1_BEAK_BUSTER) obj_collision_type = 1; break; diff --git a/src/lair/code_0.c b/src/lair/code_0.c index 6d398acd..0011442b 100644 --- a/src/lair/code_0.c +++ b/src/lair/code_0.c @@ -136,7 +136,7 @@ ActorInfo D_80392FF4 = { 0x10D, 0x211, 0x4A3, 0x1, NULL, func_80388524, func_803 ActorInfo D_80393018 = { 0x22C, 0x23A, 0x4D9, 0x1, NULL, func_803882B0, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; ActorInfo D_8039303C = { 0x164, 0x259, 0x507, 0x1, NULL, func_803880BC, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; ActorInfo D_80393060 = { 0x165, 0x25A, 0x508, 0x1, NULL, func_8038824C, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; -ActorInfo D_80393084 = { 0x240, 0x247, 0x48A, 0x1, NULL, func_80386D78, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; +ActorInfo D_80393084 = { MARKER_240_LAIR_SWITCH_FLIGHT_PAD, 0x247, 0x48A, 0x1, NULL, func_80386D78, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; ActorInfo D_803930A8 = { 0x242, 0x249, 0x2DD, 0x1, NULL, func_803867A8, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; ActorInfo D_803930CC = { 0x11F, 0x225, 0x4B3, 0x1, NULL, func_8038A064, func_80326224, func_80325E78, 0, 0, 0.0f, 0}; ActorInfo D_803930F0 = { 0x10A, 0x20E, 0x4A2, 0x1, NULL, func_80388524, func_80326224, func_80325E78, 0, 0, 0.0f, 0};