documentations

- spawnableActorList_add: decode flags
- add some prototypes in functions.h
- ActorMarker: docu unk8 (drawFunc) and unk14_20 (id)
This commit is contained in:
mariob92
2024-09-07 21:51:24 +02:00
parent c8598c2677
commit f1dea250de
61 changed files with 738 additions and 728 deletions

View File

@@ -279,7 +279,7 @@ void chClam_update(Actor *this){
if(this->state != 3){
sp48 = func_80309724(this->position);
if(sp4C != NULL){
sp44 = sp4C->marker->unk14_20;
sp44 = sp4C->marker->id;
}
if(sp44 == MARKER_60_BLUE_EGG_COLLECTIBLE || sp44 == MARKER_B5_RED_FEATHER_COLLECTIBLE){

View File

@@ -153,10 +153,10 @@ void func_80388178(ActorMarker *this_marker, ActorMarker *other_marker) {
bool func_803882E4(ActorMarker * this_marker, ActorMarker * other_marker){
if(this_marker->unk40_31 == 1){
this_marker->unk14_20 = 0x16C;
this_marker->id = 0x16C;
}
else{
this_marker->unk14_20 = MARKER_A5_NIPPER;
this_marker->id = MARKER_A5_NIPPER;
}
return TRUE;
}
@@ -164,7 +164,7 @@ bool func_803882E4(ActorMarker * this_marker, ActorMarker * other_marker){
void func_80388344(ActorMarker * this_marker, ActorMarker *other_marker){
Actor *this;
if(other_marker->unk14_20 == 1){
if(other_marker->id == 1){
this = marker_getActor(this_marker);
if( !mapSpecificFlags_get(7)
&& this->unk138_24

View File

@@ -3,6 +3,7 @@
#include "variables.h"
#include "prop.h"
#include "SnS.h"
#include "actor.h"
extern ActorInfo chClam;
extern ActorInfo TTC_D_8038C510;
@@ -90,25 +91,25 @@ ActorInfo D_8038C6DC = {
/* .code */
void TTC_func_80388AC0(void)
{
spawnableActorList_add(&D_8038C5E0, actor_new, 0);
spawnableActorList_add(&D_8038C604, actor_new, 0);
spawnableActorList_add(&D_8038C580, actor_new, 0X4100168);
spawnableActorList_add(&TTC_D_8038C510, actor_new, 0X4000101);
spawnableActorList_add(&D_8038C718, actor_new, 0X188);
spawnableActorList_add(&D_8038C790, actor_new, 0X148);
spawnableActorList_add(&D_8038C7B4, actor_new, 0X148);
spawnableActorList_add(&D_8038C7D8, actor_new, 0X148);
spawnableActorList_add(&D_8038C8B0, actor_new, 0X400);
spawnableActorList_add(&D_8038C8D4, actor_new, 0X400);
spawnableActorList_add(&D_8038C8F8, actor_new, 0X400);
spawnableActorList_add(&gChTreasureInfo, actor_new, 0X2000048);
spawnableActorList_add(&D_8038C628, actor_new, 0X8680);
spawnableActorList_add(&D_8038C64C, actor_new, 0X400);
spawnableActorList_add(&D_8038C670, actor_new, 0X20404);
spawnableActorList_add(&D_8038C694, actor_new, 0X400);
spawnableActorList_add(&D_8038C6B8, actor_new, 0X400);
spawnableActorList_add(&D_8038C6DC, actor_new, 0X400);
spawnableActorList_add(&chClam, actor_new, 0X2000041);
spawnableActorList_add(&D_8038C5E0, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add(&D_8038C604, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add(&D_8038C580, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_20 | ACTOR_FLAG_UNKNOWN_26);
spawnableActorList_add(&TTC_D_8038C510, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_26);
spawnableActorList_add(&D_8038C718, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8);
spawnableActorList_add(&D_8038C790, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8);
spawnableActorList_add(&D_8038C7B4, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8);
spawnableActorList_add(&D_8038C7D8, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8);
spawnableActorList_add(&D_8038C8B0, actor_new, ACTOR_FLAG_UNKNOWN_10);
spawnableActorList_add(&D_8038C8D4, actor_new, ACTOR_FLAG_UNKNOWN_10);
spawnableActorList_add(&D_8038C8F8, 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(&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);
spawnableActorList_add(&D_8038C694, actor_new, ACTOR_FLAG_UNKNOWN_10);
spawnableActorList_add(&D_8038C6B8, actor_new, ACTOR_FLAG_UNKNOWN_10);
spawnableActorList_add(&D_8038C6DC, actor_new, ACTOR_FLAG_UNKNOWN_10);
spawnableActorList_add(&chClam, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_25);
}
void TTC_func_80388C78(Actor *this){