From 664885663ef95292a31f457ba6688ca55c5accb4 Mon Sep 17 00:00:00 2001 From: Bl00D4NGEL Date: Sun, 29 Sep 2024 02:31:54 +0200 Subject: [PATCH] document: Treasure from TTC --- src/TTC/ch/treasure.c | 22 +++++++++++----------- src/TTC/code_26D0.c | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/TTC/ch/treasure.c b/src/TTC/ch/treasure.c index 7c51dd5b..79727e68 100644 --- a/src/TTC/ch/treasure.c +++ b/src/TTC/ch/treasure.c @@ -2,25 +2,25 @@ #include "functions.h" #include "variables.h" -void chtreasure_update(Actor *this); +void chTreasure_updateFunc(Actor *this); /* .data */ -ActorAnimationInfo gChTreasureAnim[]={ +ActorAnimationInfo gChTreasureAnimations[4] = { {0, 0.0f}, {ASSET_153_ANIM_BURIED_TREASURE_APPEAR, 2.0f}, {ASSET_166_ANIM_BURIED_TREASURE_BOUNCE, 0.33f}, {0, 0.0} }; -ActorInfo gChTreasureInfo = { +ActorInfo gChTreasure = { MARKER_DB_BURIED_TREASURE, ACTOR_F4_BURIED_TREASURE, ASSET_42C_MODEL_BURIED_TREASURE, - 1, gChTreasureAnim, - chtreasure_update, func_80326224, actor_draw, + 1, gChTreasureAnimations, + chTreasure_updateFunc, func_80326224, actor_draw, 0, 0, 1.7f, 0 }; /* .code */ -void __chtreasure_die(ActorMarker *marker, ActorMarker *otherMarker){ +void chTreasure_die(ActorMarker *marker, ActorMarker *otherMarker){ Actor *this = marker_getActor(marker); __spawnQueue_add_4((GenFunction_4) spawnQueue_actor_f32, 0x4C, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2])); func_802EE278(this, 3, 0xf, 0x3C, 0.2f, 1.2f); @@ -29,7 +29,7 @@ void __chtreasure_die(ActorMarker *marker, ActorMarker *otherMarker){ marker_despawn(marker); } -void __chtreasure_updatePosition(Actor *this){ +void chTreasure_updateFuncPosition(Actor *this){ this->position[0] = this->unk1C[0];\ this->position[1] = this->unk1C[1];\ this->position[2] = this->unk1C[2]; @@ -42,7 +42,7 @@ void __chtreasure_updatePosition(Actor *this){ this->yaw = this->lifetime_value*180.0/M_PI; } -void chtreasure_update(Actor *this){ +void chTreasure_updateFunc(Actor *this){ f32 sp3C[3]; s16 sp34[3]; @@ -61,9 +61,9 @@ void chtreasure_update(Actor *this){ this->unk1C[2] = this->position[2]; actor_playAnimationOnce(this); - marker_setCollisionScripts(this->marker, NULL, NULL, __chtreasure_die); - }//L8038C214 - __chtreasure_updatePosition(this); + marker_setCollisionScripts(this->marker, NULL, NULL, chTreasure_die); + } + chTreasure_updateFuncPosition(this); func_8034A174(this->marker->unk44, 5, sp3C); sp34[0] = (s16)sp3C[0]; sp34[1] = (s16)sp3C[1]; diff --git a/src/TTC/code_26D0.c b/src/TTC/code_26D0.c index 93e87b70..f6812396 100644 --- a/src/TTC/code_26D0.c +++ b/src/TTC/code_26D0.c @@ -23,7 +23,7 @@ extern ActorInfo gChLockupFast; extern ActorInfo gChTreasurehuntRedArrow; extern ActorInfo gChTreasurehuntRedQuestionMark; extern ActorInfo gChTreasurehuntRedX; -extern ActorInfo gChTreasureInfo; +extern ActorInfo gChTreasure; void TTC_func_80388C78(Actor *this); void func_80388CB8(Actor *this); @@ -102,7 +102,7 @@ void TTC_func_80388AC0(void) spawnableActorList_add(&gChTreasurehuntRedArrow, actor_new, ACTOR_FLAG_UNKNOWN_10); spawnableActorList_add(&gChTreasurehuntRedQuestionMark, actor_new, ACTOR_FLAG_UNKNOWN_10); spawnableActorList_add(&gChTreasurehuntRedX, actor_new, ACTOR_FLAG_UNKNOWN_10); - spawnableActorList_add(&gChTreasureInfo, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_25); + spawnableActorList_add(&gChTreasure, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_25); spawnableActorList_add(&D_8038C628, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); spawnableActorList_add(&D_8038C64C, actor_new, ACTOR_FLAG_UNKNOWN_10); spawnableActorList_add(&D_8038C670, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_17);