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

documentations

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CCW/code_2B00.c
View File

@@ -40,7 +40,7 @@ ActorInfo D_8038EE4C = { 0x12C, 0x168, 0x4F8, 0x5, D_8038ED20, func_80388FD4, fu
/* .code */
s32 func_80388EF0(Actor *this){
switch(this->marker->unk14_20){
switch(this->marker->id){
case 0x133: //L80388F28
case 0x132: //L80388F28
return 0;

16
src/CCW/code_5BF0.c
View File

@@ -45,22 +45,22 @@ void CCW_func_8038C16C(Actor *this, s32 next_state) {
}
if (next_state == 2) {
if (this->marker->unk14_20 == 0x1CA) {
if (this->marker->id == 0x1CA) {
skeletalAnim_set(this->unk148, 0x22E, 0.2f, 3.53f);
skeletalAnim_setCallback_1(this->unk148, 0.1f, func_8038C0E8, this->marker);
}
if (this->marker->unk14_20 == 0x1C7) {
if (this->marker->id == 0x1C7) {
skeletalAnim_set(this->unk148, 0x230, 0.2f, 4.0f);
}
if (this->marker->unk14_20 == 0x1CB) {
if (this->marker->id == 0x1CB) {
skeletalAnim_set(this->unk148, 0x1A2, 0.2f, 4.0f);
skeletalAnim_setCallback_1(this->unk148, 0.3f, func_8038BFE0, this->marker);
skeletalAnim_setCallback_1(this->unk148, 0.65f, func_8038C064, this->marker);
}
if (this->marker->unk14_20 == 0x1C8) {
if (this->marker->id == 0x1C8) {
skeletalAnim_set(this->unk148, 0x231, 0.2f, 4.0f);
}
if ((this->marker->unk14_20 == 0x1C7) || (this->marker->unk14_20 == 0x1CB) || (this->marker->unk14_20 == 0x1C8)) {
if ((this->marker->id == 0x1C7) || (this->marker->id == 0x1CB) || (this->marker->id == 0x1C8)) {
other = actorArray_findActorFromActorId(0x313);
if (other != 0) {
this->position[0] = other->position[0];
@@ -100,7 +100,7 @@ void func_8038C41C(Actor *this) {
if (this->state == 0) {
if( map_get() == MAP_60_CCW_AUTUMN_NABNUTS_HOUSE
&& !jiggyscore_isSpawned(JIGGY_4A_CCW_NABNUT)
&& (this->marker->unk14_20 == 0x1C6 || this->marker->unk14_20 == 0x1CA)
&& (this->marker->id == 0x1C6 || this->marker->id == 0x1CA)
){
CCW_func_8038C16C(this, 1);
} else {
@@ -108,11 +108,11 @@ void func_8038C41C(Actor *this) {
}
}
if ((this->marker->unk14_20 == 0x1CA) && (this->state != 1)) {
if ((this->marker->id == 0x1CA) && (this->state != 1)) {
func_8028E668(this->position, 300.0f, -50.0f, 120.0f);
}
if ((this->marker->unk14_20 == 0x1CB) && (this->state == 2)) {
if ((this->marker->id == 0x1CB) && (this->state == 2)) {
player_getPosition(sp2C);
if (!this->unk138_24 && (ml_distance_vec3f(this->position, sp2C) < 400.0f)) {
this->unk138_24 = TRUE;

104
src/CCW/code_76C0.c
View File

@@ -1,8 +1,8 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "prop.h"
#include "actor.h"
extern void func_802D3D54(Actor *);
extern void func_802D3D74(Actor *);
@@ -101,55 +101,55 @@ void CCW_func_8038DB0C(Actor *this){
void CCW_func_8038DB6C(void)
{
spawnableActorList_add(&D_8038EB50, actor_new, 0X80);
spawnableActorList_add(&D_8038EB74, actor_new, 0X80);
spawnableActorList_add(&D_8038EBA0, actor_new, 0X180);
spawnableActorList_add(&D_8038EBD0, actor_new, 0X200080C);
spawnableActorList_add(&D_8038EC14, actor_new, 0X888);
spawnableActorList_add(&D_8038EC70, actor_new, 0X94C88);
spawnableActorList_add(&D_8038ECA0, actor_new, 0X84C88);
spawnableActorList_add(&D_8038ECE8, actor_new, 0X809A8);
spawnableActorList_add(&D_8038EE70, actor_new, 0XC80);
spawnableActorList_add(&D_8038F130, actor_new, 0X84C2A);
spawnableActorList_add(&chCaterpillar, actor_new, 0X881);
spawnableActorList_add(&D_8038F190, actor_new, 0X80D80);
spawnableActorList_add(&D_8038F230, actor_new, 0XD80);
spawnableActorList_add(&D_8038F6F0, actor_new, 0X804);
spawnableActorList_add(&D_8038ED50, actor_new, 0X400);
spawnableActorList_add(&D_8038ED98, actor_new, 0X400);
spawnableActorList_add(&D_8038EDE0, actor_new, 0X400);
spawnableActorList_add(&D_8038EE28, actor_new, 0X400);
spawnableActorList_add(&D_8038ED74, actor_new, 0);
spawnableActorList_add(&D_8038EDBC, actor_new, 0);
spawnableActorList_add(&D_8038EE04, actor_new, 0);
spawnableActorList_add(&D_8038EE4C, actor_new, 0);
spawnableActorList_add(&D_8038F270, actor_new, 0X989);
spawnableActorList_add(&D_8038F300, actor_new, 0X989);
spawnableActorList_add(&D_8038F35C, actor_new, 0X909);
spawnableActorList_add(&D_8038F380, actor_new, 0X80);
spawnableActorList_add(&D_8038F3A4, actor_new, 0X888);
spawnableActorList_add(&D_8038F3C8, actor_new, 0X888);
spawnableActorList_add(&D_8038F3EC, actor_new, 0X80);
spawnableActorList_add(&D_8038F410, actor_new, 0X988);
spawnableActorList_add(&D_8038F434, actor_new, 0X888);
spawnableActorList_add(&D_8038F460, actor_new, 0X880);
spawnableActorList_add(&D_8038F4A8, actor_new, 0X98A);
spawnableActorList_add(&D_8038F4D0, actor_new, 0X988);
spawnableActorList_add(&D_8038F614, actor_new, 0X988);
spawnableActorList_add(&D_8038F640, actor_new, 0X80);
spawnableActorList_add(&D_8038F908, actor_new, 8);
spawnableActorList_add(&D_8038F8C0, actor_new, 8);
spawnableActorList_add(&D_8038F720, actor_new, 0);
spawnableActorList_add(&D_8038F744, actor_new, 0);
spawnableActorList_add(&D_8038F768, actor_new, 0);
spawnableActorList_add(&D_8038F78C, actor_new, 0);
spawnableActorList_add(&chGrublinHood, actor_new, 0X2010121);
spawnableActorList_add(&gChVacationTextTrigger, actor_new, 0);
spawnableActorList_add(&D_8038F7D4, actor_new, 0X400);
spawnableActorList_add(&D_8038F7B0, actor_new, 0X400);
spawnableActorList_add(&D_8038F888, actor_new, 0X80);
spawnableActorList_add(&D_8038F7F8, actor_new, 0X400);
spawnableActorList_add(&D_8038F81C, actor_new, 0X400);
spawnableActorList_add(&D_8038F840, actor_new, 0X400);
spawnableActorList_add(&D_8038F864, actor_new, 0X400);
spawnableActorList_add(&D_8038EB50, actor_new, ACTOR_FLAG_UNKNOWN_7);
spawnableActorList_add(&D_8038EB74, actor_new, ACTOR_FLAG_UNKNOWN_7);
spawnableActorList_add(&D_8038EBA0, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8);
spawnableActorList_add(&D_8038EBD0, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_25);
spawnableActorList_add(&D_8038EC14, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11);
spawnableActorList_add(&D_8038EC70, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_14 | ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_19);
spawnableActorList_add(&D_8038ECA0, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_14 | ACTOR_FLAG_UNKNOWN_19);
spawnableActorList_add(&D_8038ECE8, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_19);
spawnableActorList_add(&D_8038EE70, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_11);
spawnableActorList_add(&D_8038F130, actor_new, ACTOR_FLAG_UNKNOWN_1 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_14 | ACTOR_FLAG_UNKNOWN_19);
spawnableActorList_add(&chCaterpillar, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11);
spawnableActorList_add(&D_8038F190, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_19);
spawnableActorList_add(&D_8038F230, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_11);
spawnableActorList_add(&D_8038F6F0, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_11);
spawnableActorList_add(&D_8038ED50, actor_new, ACTOR_FLAG_UNKNOWN_10);
spawnableActorList_add(&D_8038ED98, actor_new, ACTOR_FLAG_UNKNOWN_10);
spawnableActorList_add(&D_8038EDE0, actor_new, ACTOR_FLAG_UNKNOWN_10);
spawnableActorList_add(&D_8038EE28, actor_new, ACTOR_FLAG_UNKNOWN_10);
spawnableActorList_add(&D_8038ED74, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add(&D_8038EDBC, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add(&D_8038EE04, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add(&D_8038EE4C, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add(&D_8038F270, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_11);
spawnableActorList_add(&D_8038F300, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_11);
spawnableActorList_add(&D_8038F35C, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_11);
spawnableActorList_add(&D_8038F380, actor_new, ACTOR_FLAG_UNKNOWN_7);
spawnableActorList_add(&D_8038F3A4, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11);
spawnableActorList_add(&D_8038F3C8, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11);
spawnableActorList_add(&D_8038F3EC, actor_new, ACTOR_FLAG_UNKNOWN_7);
spawnableActorList_add(&D_8038F410, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_11);
spawnableActorList_add(&D_8038F434, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11);
spawnableActorList_add(&D_8038F460, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11);
spawnableActorList_add(&D_8038F4A8, actor_new, ACTOR_FLAG_UNKNOWN_1 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_11);
spawnableActorList_add(&D_8038F4D0, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_11);
spawnableActorList_add(&D_8038F614, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_11);
spawnableActorList_add(&D_8038F640, actor_new, ACTOR_FLAG_UNKNOWN_7);
spawnableActorList_add(&D_8038F908, actor_new, ACTOR_FLAG_UNKNOWN_3);
spawnableActorList_add(&D_8038F8C0, actor_new, ACTOR_FLAG_UNKNOWN_3);
spawnableActorList_add(&D_8038F720, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add(&D_8038F744, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add(&D_8038F768, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add(&D_8038F78C, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add(&chGrublinHood, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_25);
spawnableActorList_add(&gChVacationTextTrigger, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add(&D_8038F7D4, actor_new, ACTOR_FLAG_UNKNOWN_10);
spawnableActorList_add(&D_8038F7B0, actor_new, ACTOR_FLAG_UNKNOWN_10);
spawnableActorList_add(&D_8038F888, actor_new, ACTOR_FLAG_UNKNOWN_7);
spawnableActorList_add(&D_8038F7F8, actor_new, ACTOR_FLAG_UNKNOWN_10);
spawnableActorList_add(&D_8038F81C, actor_new, ACTOR_FLAG_UNKNOWN_10);
spawnableActorList_add(&D_8038F840, actor_new, ACTOR_FLAG_UNKNOWN_10);
spawnableActorList_add(&D_8038F864, actor_new, ACTOR_FLAG_UNKNOWN_10);
}