From f1dea250de3766c705da7b67445a8329920473d7 Mon Sep 17 00:00:00 2001 From: mariob92 <21146795-mariob92@users.noreply.gitlab.com> Date: Sat, 7 Sep 2024 21:51:24 +0200 Subject: [PATCH] documentations - spawnableActorList_add: decode flags - add some prototypes in functions.h - ActorMarker: docu unk8 (drawFunc) and unk14_20 (id) --- include/actor.h | 1 + include/functions.h | 4 + include/prop.h | 8 +- src/BGS/code_3030.c | 2 +- src/CCW/code_2B00.c | 2 +- src/CCW/code_5BF0.c | 16 +- src/CCW/code_76C0.c | 104 ++++++------- src/FP/ch/bearcub.c | 4 +- src/FP/ch/twinkly.c | 4 +- src/FP/ch/twinklymuncher.c | 10 +- src/FP/code_ABD0.c | 106 ++++++------- src/GV/code_3D90.c | 2 +- src/GV/code_43B0.c | 2 +- src/GV/code_7FF0.c | 84 +++++------ src/MMM/code_16B0.c | 6 +- src/MMM/code_2040.c | 59 ++++---- src/RBB/ch/bossboombox.c | 4 +- src/RBB/code_640.c | 106 ++++++------- src/RBB/code_9840.c | 2 +- src/SM/ch/vegetables.c | 2 +- src/SM/code_2990.c | 4 +- src/SM/code_3FC0.c | 2 +- src/SM/code_F0.c | 33 +++-- src/TTC/ch/clam.c | 2 +- src/TTC/ch/nipper.c | 6 +- src/TTC/code_26D0.c | 39 ++--- src/core2/ba/marker.c | 2 +- src/core2/ch/bigbutt.c | 8 +- src/core2/ch/clucker.c | 8 +- src/core2/ch/code_CFA60.c | 6 +- src/core2/ch/collectible.c | 4 +- src/core2/ch/crab.c | 16 +- src/core2/ch/gameSelect.c | 6 +- src/core2/ch/jinjo.c | 4 +- src/core2/ch/mole.c | 6 +- src/core2/ch/snowman.c | 4 +- src/core2/code_3EAD0.c | 2 +- src/core2/code_42CB0.c | 4 +- src/core2/code_4C020.c | 12 +- src/core2/code_509D0.c | 22 +-- src/core2/code_7060.c | 2 +- src/core2/code_7AF80.c | 2 +- src/core2/code_9E370.c | 22 +-- src/core2/code_A4D00.c | 2 +- src/core2/code_A5BC0.c | 14 +- src/core2/code_B3A80.c | 2 +- src/core2/code_B62B0.c | 8 +- src/core2/code_B9770.c | 12 +- src/core2/code_CC1E0.c | 2 +- src/core2/code_D6180.c | 8 +- src/core2/code_D6600.c | 4 +- src/core2/spawnqueue.c | 286 ++++++++++++++++++------------------ src/cutscenes/code_60F0.c | 157 ++++++++++---------- src/fight/chbossjinjo.c | 4 +- src/fight/chfinalboss.c | 22 +-- src/fight/chspellbarrier.c | 2 +- src/fight/chspellfireball.c | 16 +- src/fight/code_0.c | 31 ++-- src/lair/code_0.c | 142 +++++++++--------- src/lair/code_9C40.c | 8 +- src/lair/code_A170.c | 2 +- 61 files changed, 738 insertions(+), 728 deletions(-) diff --git a/include/actor.h b/include/actor.h index b805b435..0e5892bb 100644 --- a/include/actor.h +++ b/include/actor.h @@ -29,5 +29,6 @@ #define ACTOR_FLAG_UNKNOWN_24 (1 << 24) // 0x1000000 #define ACTOR_FLAG_UNKNOWN_25 (1 << 25) // 0x2000000 #define ACTOR_FLAG_UNKNOWN_26 (1 << 26) // 0x4000000 +#define ACTOR_FLAG_UNKNOWN_27 (1 << 27) // 0x4000000 #endif // ACTOR_H diff --git a/include/functions.h b/include/functions.h index 9ca143e0..983cf825 100644 --- a/include/functions.h +++ b/include/functions.h @@ -555,5 +555,9 @@ extern void subaddie_set_state_forward(Actor *, s32); extern BKModelBin *marker_loadModelBin(ActorMarker *this); extern Struct70s *func_8034C2C4(ActorMarker *marker, s32 arg1); extern void func_80326310(Actor *this); +extern ActorMarker *marker_init(s32 *pos, MarkerDrawFunc draw_func, int arg2, int marker_id, int arg4); +extern s32 asset_getFlag(enum asset_e arg0); +extern void spawnableActorList_add(ActorInfo *arg0, Actor *(*arg1)(s32[3], s32, ActorInfo *, u32), u32 arg2); +extern void spawnableActorList_addIfMapVisited(ActorInfo *arg0, Actor *(*arg1)(s32[3], s32, ActorInfo *, u32), u32 arg2, enum map_e arg3); #endif diff --git a/include/prop.h b/include/prop.h index 2542bcc1..b6cee62b 100644 --- a/include/prop.h +++ b/include/prop.h @@ -75,13 +75,13 @@ typedef void (*ActorFreeFunc)(struct actor_s *); typedef struct actorMarker_s{ ActorProp* propPtr; struct cude_s* cubePtr; - MarkerDrawFunc unk8; + MarkerDrawFunc drawFunc; MarkerCollisionFunc unkC; //ow_func MarkerCollisionFunc unk10; u32 yaw:9; u32 unk14_22:1; u32 unk14_21:1; - u32 unk14_20:10; //contains jingo_id for chjinjo + u32 id:10; // marker_id u32 unk14_10:11; //used in ch/jiggy Struct6Cs *unk18; MarkerCollisionFunc unk1C; //die_func @@ -220,7 +220,7 @@ typedef struct actor_s{ f32 unkEC; //animCtrl??? f32 stored_animctrl_duration; //animCtrlDuration u32 unkF4_31:1; - u32 unkF4_30:1; + u32 unkF4_30:1; // has something to do with vertices u32 unkF4_29:1; u32 unkF4_28:1; //saved marker->propPtr->unk8_3 u32 unkF4_27:1; //saved marker->propPtr->unk8_2 @@ -265,7 +265,7 @@ typedef struct actor_s{ u32 unk138_22:1; u32 unk138_21:1; u32 unk138_20:1; - u32 unk138_19:10; //saved maker->unk14_20 + u32 unk138_19:10; //saved maker->id u32 unk138_9:1; u32 unk138_8:1; u32 unk138_7:4; diff --git a/src/BGS/code_3030.c b/src/BGS/code_3030.c index d5e81f23..9fb1de67 100644 --- a/src/BGS/code_3030.c +++ b/src/BGS/code_3030.c @@ -61,7 +61,7 @@ void func_803895D0(ActorMarker *marker, ActorMarker *other_marker){ } Actor *BGS_func_80389610(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) { - func_8033A45C(4, marker->unk14_20 - 0x19A); + func_8033A45C(4, marker->id - 0x19A); return actor_draw(marker, gfx, mtx, vtx); } diff --git a/src/CCW/code_2B00.c b/src/CCW/code_2B00.c index 8cf3cf75..8221dc28 100644 --- a/src/CCW/code_2B00.c +++ b/src/CCW/code_2B00.c @@ -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; diff --git a/src/CCW/code_5BF0.c b/src/CCW/code_5BF0.c index f68f0eb6..95c58509 100644 --- a/src/CCW/code_5BF0.c +++ b/src/CCW/code_5BF0.c @@ -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; diff --git a/src/CCW/code_76C0.c b/src/CCW/code_76C0.c index 729340de..0196ba88 100644 --- a/src/CCW/code_76C0.c +++ b/src/CCW/code_76C0.c @@ -1,8 +1,8 @@ #include #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); } diff --git a/src/FP/ch/bearcub.c b/src/FP/ch/bearcub.c index 2ced0299..3df5de82 100644 --- a/src/FP/ch/bearcub.c +++ b/src/FP/ch/bearcub.c @@ -88,7 +88,7 @@ void func_8038A384(Actor *this){ if(!this->unk16C_4){ this->unk16C_4 = TRUE; this->marker->propPtr->unk8_3 = FALSE; - switch(this->marker->unk14_20){ + switch(this->marker->id){ case MARKER_1FA_POLAR_BEAR_CUB_BLUE://L8038A404 this->unk1C[0] = 1.0f; this->unk1C[1] = 1.2f; @@ -139,7 +139,7 @@ void func_8038A384(Actor *this){ }//L8038A648 - switch(this->marker->unk14_20){ + switch(this->marker->id){ case MARKER_1FA_POLAR_BEAR_CUB_BLUE: sp3C = 0; break; diff --git a/src/FP/ch/twinkly.c b/src/FP/ch/twinkly.c index b9d7f9ba..c55022ba 100644 --- a/src/FP/ch/twinkly.c +++ b/src/FP/ch/twinkly.c @@ -252,7 +252,7 @@ void func_8038C9A0(Actor *this){ Actor *other; //sp34 void * sp30; - if(this->marker->unk14_20 == 0x200){ + if(this->marker->id == 0x200){ sp30 = func_8034C2C4(this->marker, 0x190); } other = marker_getActor(this->unk100); @@ -278,7 +278,7 @@ void func_8038C9A0(Actor *this){ }//L8038CA9C if(1.0f == other->unk1C[1]){ - func_8038C398(this->position, this->marker->unk14_20); + func_8038C398(this->position, this->marker->id); FUNC_8030E8B4(SFX_7B_ICE_BREAKING_1, 1.0f, 32000, this->position, 0x6d6, 0xdac);\ marker_despawn(this->marker); return; diff --git a/src/FP/ch/twinklymuncher.c b/src/FP/ch/twinklymuncher.c index a65bef17..40acd2c6 100644 --- a/src/FP/ch/twinklymuncher.c +++ b/src/FP/ch/twinklymuncher.c @@ -78,7 +78,7 @@ Actor *func_8038DF34(Actor *this){ if(prop && prop->unk8_0){ other = marker_getActor(prop->marker); - marker_id = other->marker->unk14_20; + marker_id = other->marker->id; if( marker_id == MARKER_200_TWINKLY_BLUE || marker_id == MARKER_201_TWINKLY_GREEN || marker_id == MARKER_202_TWINKLY_ORANGE @@ -168,7 +168,7 @@ void func_8038E094(Actor *this){ sp38 = func_8038DF34(this); if(sp38){ func_8038DE40(this); - this->unk38_31 = sp38->marker->unk14_20; + this->unk38_31 = sp38->marker->id; break; } @@ -187,16 +187,16 @@ void func_8038E094(Actor *this){ sp38 = func_8038DF34(this); if(sp38){ func_8038DE40(this); - this->unk38_31 = sp38->marker->unk14_20; + this->unk38_31 = sp38->marker->id; } break; case 4: //L8038E4F0 this->marker->propPtr->unk8_3 = TRUE; sp38 = func_8038DF34(this); - if(sp38 && sp38->marker->unk14_20 == this->unk38_31){ + if(sp38 && sp38->marker->id == this->unk38_31){ if(actor_animationIsAt(this, 0.23)){ - func_8038C398(sp38->position, sp38->marker->unk14_20); + func_8038C398(sp38->position, sp38->marker->id); FUNC_8030E8B4(SFX_110_TWINKLY_DEATH, 1.0f, 32000, this->position, 1250, 2500); FUNC_8030E8B4(SFX_27_JINJO_HI, 1.6f, 32000, this->position, 1250, 2500); func_80324D54(0.35f, SFX_110_TWINKLY_DEATH, 1.0f, 32000, this->position, 1250.0f, 2500.0f); diff --git a/src/FP/code_ABD0.c b/src/FP/code_ABD0.c index fd5c16ef..1892bd39 100644 --- a/src/FP/code_ABD0.c +++ b/src/FP/code_ABD0.c @@ -1,9 +1,9 @@ #include #include "functions.h" #include "variables.h" - #include "prop.h" #include "SnS.h" +#include "actor.h" extern ActorInfo D_80367FE0; @@ -91,7 +91,7 @@ void func_80391040(Actor *this){ if(randf() < 0.5){ a1 = 8; - switch(this->marker->unk14_20){ + switch(this->marker->id){ case 0x247://L80391128 sp2C = 0x710; break; @@ -126,7 +126,7 @@ void func_80391180(Actor *this){ } this->unk58_0 = func_8038DD14() ? 0 : 1; - if(this->marker->unk14_20 == 0x21F){ + if(this->marker->id == 0x21F){ this->marker->unk40_22 = subaddie_playerIsWithinSphere(this, 2000) ? 1 : 0; } } @@ -135,10 +135,10 @@ void FP_func_80391254(Actor *this){ func_802D3D74(this); if(!this->unk16C_4){ this->unk16C_4 = TRUE; - if(this->marker->unk14_20 == 0x221 || this->marker->unk14_20 == 0x223){ + if(this->marker->id == 0x221 || this->marker->id == 0x223){ this->pitch = 3.0f; } - if(this->marker->unk14_20 == 0x222){ + if(this->marker->id == 0x222){ this->pitch = 2.0f; } } @@ -154,54 +154,54 @@ void func_803912EC(Actor *this){ void FP_func_80391324(void) { - spawnableActorList_add(&FP_D_80391AB0, actor_new, 0X600); - spawnableActorList_add(&D_80391BB0, actor_new, 0X2A); - spawnableActorList_add(&D_80391C18, actor_new, 0X180084); - spawnableActorList_add(&D_80391C58, actor_new, 0X180084); - spawnableActorList_add(&D_80391CE8, actor_new, 0X2002E); - spawnableActorList_add(&D_80391E08, actor_new, 0X100); - spawnableActorList_add(&FP_D_80391E2C, actor_new, 0X100); - spawnableActorList_add(&D_80391E50, actor_new, 0X100); - spawnableActorList_add(&D_80391F88, actor_new, 0X2100C); - spawnableActorList_add(&D_80391FAC, actor_new, 0X2100C); - spawnableActorList_add(&D_80391FD0, actor_new, 0X2100C); - spawnableActorList_add(&D_80391FF4, actor_new, 0X2100C); - spawnableActorList_add(&D_803920E8, actor_new, 0X408); - spawnableActorList_add(&D_803923D0, actor_new, 0X100006C); - spawnableActorList_add(&chXmasTree, actor_new, 0X20400); - spawnableActorList_add(&D_80392420, actor_new, 4); - spawnableActorList_add(&D_80392470, actor_new, 0X444); - spawnableActorList_add(&D_803924B0, actor_new, 8); - spawnableActorList_add(&D_803924D4, actor_new, 8); - spawnableActorList_add(&D_803924F8, actor_new, 8); - spawnableActorList_add(&chScarfSled, actor_new, 0); - spawnableActorList_add(&chRaceSled, actor_new, 0X20); - spawnableActorList_add(&D_80392588, actor_new, 0X80108); - spawnableActorList_add(&D_80392628, actor_new, 0X44); - spawnableActorList_add(&D_80392690, actor_new, 0XA8); - spawnableActorList_add(&D_803926C0, actor_new, 0X8000400); - spawnableActorList_add(&D_80392700, actor_new, 0X108); - spawnableActorList_add(&FP_D_80392840, actor_new, 0); - spawnableActorList_add(&D_80392730, actor_new, 0X20000); - spawnableActorList_add(&D_80367FE0, actor_new, 0); - spawnableActorList_add(&FP_D_803928E0, actor_new, 0X40); - spawnableActorList_add(&D_80392904, actor_new, 0X40); - spawnableActorList_add(&D_80392928, actor_new, 0X40); - spawnableActorList_add(&D_8039294C, actor_new, 0X40); - spawnableActorList_add(&D_80392B20, actor_new, 0X400); - spawnableActorList_add(&D_80392B44, actor_new, 0X400); - spawnableActorList_add(&D_80392970, actor_new, 0X400); - spawnableActorList_add(&D_80392994, actor_new, 0X400); - spawnableActorList_add(&D_803929B8, actor_new, 0X404); - spawnableActorList_add(&D_803929DC, actor_new, 0X404); - spawnableActorList_add(&D_80392A00, actor_new, 0X404); - spawnableActorList_add(&D_80392A24, actor_new, 0X20004); - spawnableActorList_add(&D_80392A48, actor_new, 4); - spawnableActorList_add(&D_80392A6C, actor_new, 0X20004); - spawnableActorList_add(&D_80392A90, actor_new, 0X20004); - spawnableActorList_add(&D_80392AB4, actor_new, 0X400); - spawnableActorList_add(&D_80392AD8, actor_new, 0X400); - spawnableActorList_add(&D_80392AFC, actor_new, 0X400); + spawnableActorList_add(&FP_D_80391AB0, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_80391BB0, actor_new, ACTOR_FLAG_UNKNOWN_1 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5); + spawnableActorList_add(&D_80391C18, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_19 | ACTOR_FLAG_UNKNOWN_20); + spawnableActorList_add(&D_80391C58, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_19 | ACTOR_FLAG_UNKNOWN_20); + spawnableActorList_add(&D_80391CE8, actor_new, ACTOR_FLAG_UNKNOWN_1 | ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_17); + spawnableActorList_add(&D_80391E08, actor_new, ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&FP_D_80391E2C, actor_new, ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_80391E50, actor_new, ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_80391F88, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_12 | ACTOR_FLAG_UNKNOWN_17); + spawnableActorList_add(&D_80391FAC, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_12 | ACTOR_FLAG_UNKNOWN_17); + spawnableActorList_add(&D_80391FD0, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_12 | ACTOR_FLAG_UNKNOWN_17); + spawnableActorList_add(&D_80391FF4, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_12 | ACTOR_FLAG_UNKNOWN_17); + spawnableActorList_add(&D_803920E8, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_803923D0, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_24); + spawnableActorList_add(&chXmasTree, actor_new, ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_17); + spawnableActorList_add(&D_80392420, actor_new, ACTOR_FLAG_UNKNOWN_2); + spawnableActorList_add(&D_80392470, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_803924B0, actor_new, ACTOR_FLAG_UNKNOWN_3); + spawnableActorList_add(&D_803924D4, actor_new, ACTOR_FLAG_UNKNOWN_3); + spawnableActorList_add(&D_803924F8, actor_new, ACTOR_FLAG_UNKNOWN_3); + spawnableActorList_add(&chScarfSled, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&chRaceSled, actor_new, ACTOR_FLAG_UNKNOWN_5); + spawnableActorList_add(&D_80392588, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_19); + spawnableActorList_add(&D_80392628, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_6); + spawnableActorList_add(&D_80392690, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_803926C0, actor_new, ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_27); + spawnableActorList_add(&D_80392700, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&FP_D_80392840, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_80392730, actor_new, ACTOR_FLAG_UNKNOWN_17); + spawnableActorList_add(&D_80367FE0, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&FP_D_803928E0, actor_new, ACTOR_FLAG_UNKNOWN_6); + spawnableActorList_add(&D_80392904, actor_new, ACTOR_FLAG_UNKNOWN_6); + spawnableActorList_add(&D_80392928, actor_new, ACTOR_FLAG_UNKNOWN_6); + spawnableActorList_add(&D_8039294C, actor_new, ACTOR_FLAG_UNKNOWN_6); + spawnableActorList_add(&D_80392B20, actor_new, ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_80392B44, actor_new, ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_80392970, actor_new, ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_80392994, actor_new, ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_803929B8, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_803929DC, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_80392A00, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_80392A24, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_17); + spawnableActorList_add(&D_80392A48, actor_new, ACTOR_FLAG_UNKNOWN_2); + spawnableActorList_add(&D_80392A6C, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_17); + spawnableActorList_add(&D_80392A90, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_17); + spawnableActorList_add(&D_80392AB4, actor_new, ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_80392AD8, actor_new, ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_80392AFC, actor_new, ACTOR_FLAG_UNKNOWN_10); } diff --git a/src/GV/code_3D90.c b/src/GV/code_3D90.c index a77a2e4b..8028262d 100644 --- a/src/GV/code_3D90.c +++ b/src/GV/code_3D90.c @@ -141,7 +141,7 @@ void func_8038A31C(Actor *this){ }//L8038A6A4 this->unk124_11 = 0x3; this->pitch = 0.0f; - if(this->unk100 && sp24 && this->unk100->unk14_20 == MARKER_AF_MAGIC_CARPET_SHADOW){ + if(this->unk100 && sp24 && this->unk100->id == MARKER_AF_MAGIC_CARPET_SHADOW){ sp24->position_x = this->position_x; sp24->position_y = func_80309724(this->position) + 60.0f; sp24->position_z = this->position_z; diff --git a/src/GV/code_43B0.c b/src/GV/code_43B0.c index 41b810ef..efcaa2bc 100644 --- a/src/GV/code_43B0.c +++ b/src/GV/code_43B0.c @@ -101,7 +101,7 @@ void GV_func_8038A9C0(Actor *this){ } this->unk1C[2] = this->unk1C[1]; this->unk1C[1] = this->unk48; - if(this->unk100 != NULL && sp24 != NULL && this->unk100->unk14_20 == MARKER_AF_MAGIC_CARPET_SHADOW){ + if(this->unk100 != NULL && sp24 != NULL && this->unk100->id == MARKER_AF_MAGIC_CARPET_SHADOW){ sp24->unk1C[0] = func_8038A860(sp24, this); } } diff --git a/src/GV/code_7FF0.c b/src/GV/code_7FF0.c index 66ff3221..b16b8311 100644 --- a/src/GV/code_7FF0.c +++ b/src/GV/code_7FF0.c @@ -1,8 +1,8 @@ #include #include "functions.h" #include "variables.h" - #include "SnS.h" +#include "actor.h" extern void func_80244BB0(s32, s32, s32, f32); extern void func_802D3D54(Actor *this); @@ -467,47 +467,47 @@ void func_8038F130(UNK_TYPE(s32) arg0, ActorMarker *arg1){ void GV_func_8038F154(void) { - spawnableActorList_add(&chToots, actor_new, 0X180); - spawnableActorList_add(&chAncientOne, actor_new, 0X58A); - spawnableActorList_add(&Gobi1, actor_new, 0X9A8); - spawnableActorList_add(&chGobiRope, actor_new, 0X880); - spawnableActorList_add(&chGobiRock, actor_new, 0X80); - spawnableActorList_add(&chGobi2, actor_new, 0XDA8); - spawnableActorList_add(&chGobi3, actor_new, 0X9A8); - spawnableActorList_add(&chTrunker, actor_new, 0XD80); - spawnableActorList_add(&GV_D_80390DD0, actor_new, 0X4004); - spawnableActorList_add(&chSarcophagus, actor_new, 0X448); - spawnableActorList_add(&chSNSSarcophagus, actor_new, 0X48); - spawnableActorList_add(&D_80390ED0, actor_new, 0X180); - spawnableActorList_add(&D_80390F00, actor_new, 0X80); - spawnableActorList_add(&D_80390FD0, actor_new, 0X4048); - spawnableActorList_add(&D_80391010, actor_new, 0X4048); - spawnableActorList_add(&D_80391098, actor_new, 0X10069); - spawnableActorList_add(&D_80391158, actor_new, 0X48); - spawnableActorList_add(&D_803911C0, actor_new, 8); - spawnableActorList_add(&D_803911F4, actor_new, 0X80988); - spawnableActorList_add(&D_80391218, actor_new, 0X80988); - spawnableActorList_add(&D_8039123C, actor_new, 0X80988); - spawnableActorList_add(&D_80391260, actor_new, 0X80); - spawnableActorList_add(&D_80391318, actor_new, 0X78A); - spawnableActorList_add(&D_80391358, actor_new, 0X518); - spawnableActorList_add(&D_803912B8, actor_new, 0X500); - spawnableActorList_add(&GV_D_80391390, actor_new, 0X500); - spawnableActorList_add(&D_803913B4, actor_new, 0X500); - spawnableActorList_add(&D_80390F40, actor_new, 0); - spawnableActorList_add(&D_80391494, actor_new, 0X408); - spawnableActorList_add(&chMazeCtrl, actor_new, 0); - spawnableActorList_add(&chBuriedPyramid, actor_new, 0X400); - spawnableActorList_add(&D_803914B8, actor_new, 0X400); - spawnableActorList_add(&D_803914DC, actor_new, 0X400); - spawnableActorList_add(&GV_D_80391500, actor_new, 0X400); - spawnableActorList_add(&GV_D_80391524, actor_new, 0X400); - spawnableActorList_add(&D_8039156C, actor_new, 0X400); - spawnableActorList_add(&D_80391428, actor_new, 8); - spawnableActorList_add(&D_8039144C, actor_new, 8); - spawnableActorList_add(&D_80391470, actor_new, 8); - spawnableActorList_add(&D_80391548, actor_new, 0X400); - spawnableActorList_add(&D_80391590, actor_new, 0X400); + spawnableActorList_add(&chToots, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&chAncientOne, actor_new, ACTOR_FLAG_UNKNOWN_1 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&Gobi1, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_11); + spawnableActorList_add(&chGobiRope, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11); + spawnableActorList_add(&chGobiRock, actor_new, ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&chGobi2, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_11); + spawnableActorList_add(&chGobi3, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_11); + spawnableActorList_add(&chTrunker, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_11); + spawnableActorList_add(&GV_D_80390DD0, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_14); + spawnableActorList_add(&chSarcophagus, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&chSNSSarcophagus, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6); + spawnableActorList_add(&D_80390ED0, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_80390F00, actor_new, ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_80390FD0, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_14); + spawnableActorList_add(&D_80391010, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_14); + spawnableActorList_add(&D_80391098, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_16); + spawnableActorList_add(&D_80391158, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6); + spawnableActorList_add(&D_803911C0, actor_new, ACTOR_FLAG_UNKNOWN_3); + spawnableActorList_add(&D_803911F4, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_19); + spawnableActorList_add(&D_80391218, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_19); + spawnableActorList_add(&D_8039123C, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_19); + spawnableActorList_add(&D_80391260, actor_new, ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_80391318, actor_new, ACTOR_FLAG_UNKNOWN_1 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_80391358, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_4 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_803912B8, actor_new, ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&GV_D_80391390, actor_new, ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_803913B4, actor_new, ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_80390F40, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_80391494, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&chMazeCtrl, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&chBuriedPyramid, actor_new, ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_803914B8, actor_new, ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_803914DC, actor_new, ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&GV_D_80391500, actor_new, ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&GV_D_80391524, actor_new, ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_8039156C, actor_new, ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_80391428, actor_new, ACTOR_FLAG_UNKNOWN_3); + spawnableActorList_add(&D_8039144C, actor_new, ACTOR_FLAG_UNKNOWN_3); + spawnableActorList_add(&D_80391470, actor_new, ACTOR_FLAG_UNKNOWN_3); + spawnableActorList_add(&D_80391548, actor_new, ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_80391590, actor_new, ACTOR_FLAG_UNKNOWN_10); } s32 func_8038F4C0(Actor *arg0, s32 arg1){ diff --git a/src/MMM/code_16B0.c b/src/MMM/code_16B0.c index f30523e1..a84f0467 100644 --- a/src/MMM/code_16B0.c +++ b/src/MMM/code_16B0.c @@ -31,7 +31,7 @@ Actor *func_80387AA0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) { void func_80387B14(Actor *this, s32 next_state){ ActorLocal_PortraitChompa *local = (ActorLocal_PortraitChompa *) &this->local; f32 tmp = 2.5f; - this->marker->unk14_20 = 0x1d1; + this->marker->id = 0x1d1; if(next_state == 1 || next_state == 2){ skeletalAnim_set(this->unk148, 0x23e, 0.0f, 2.5f); @@ -54,7 +54,7 @@ void func_80387B14(Actor *this, s32 next_state){ } if(next_state == 4){ - this->marker->unk14_20 = MARKER_254_PORTRAIT_CHOMPA_A; + this->marker->id = MARKER_254_PORTRAIT_CHOMPA_A; skeletalAnim_set(this->unk148, 0x23e, 0.0f, 2.5f); skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE); if(this->unk100){ @@ -222,7 +222,7 @@ void func_80388028(Actor *this){ if(this->state == 4){ skeletalAnim_getProgressRange(this->unk148, &sp44, &sp40); if(sp44 < 0.56 && 0.56 <= sp40){ - this->marker->unk14_20 = 0x1d1; + this->marker->id = 0x1d1; } if(sp44 < 0.5 && 0.5 <= sp40){ diff --git a/src/MMM/code_2040.c b/src/MMM/code_2040.c index 6592f514..9059a6f8 100644 --- a/src/MMM/code_2040.c +++ b/src/MMM/code_2040.c @@ -2,6 +2,7 @@ #include "functions.h" #include "variables.h" #include "SnS.h" +#include "actor.h" extern ActorInfo D_8038BC28; extern ActorInfo D_8038BCDC; @@ -207,7 +208,7 @@ bool func_80388670(ActorMarker * this_marker, ActorMarker * other_marker){ f32 sp20[3]; player_getPosition(sp20); - switch(this->marker->unk14_20){ + switch(this->marker->id){ case 0x9f: //L803886D0 return (-335.0f < sp20[0] && sp20[0] < -200.0f) && (-2730.0f < sp20[2] && sp20[2] < -2400.0f); @@ -228,7 +229,7 @@ void func_803888B8(Actor *this){ this->unk60 = 0.0f; switch(this->state){ case 4: - switch(this->marker->unk14_20){ + switch(this->marker->id){ case 0x9F: this->roll = MMM_func_80388430(this, 0, -1, this->roll); break; @@ -391,31 +392,31 @@ void func_803890B8(Actor *this) { } void MMM_func_803890E0(void){ - spawnableActorList_add(&D_8038BC28, actor_new, 0); - spawnableActorList_add(&D_8038BCDC, actor_new, 0); - spawnableActorList_add(&D_8038BC4C, actor_new, 0); - spawnableActorList_add(&D_8038BDB4, actor_new, 0x40); - spawnableActorList_add(&D_8038BDD8, actor_new, 0x40); - spawnableActorList_add(&D_8038BDFC, actor_new, 0x440); - spawnableActorList_add(&D_8038BC94, actor_new, 0); - spawnableActorList_add(&D_8038BC70, actor_new, 0); - spawnableActorList_add(&D_8038BD00, actor_new, 0); - spawnableActorList_add(&D_8038BD24, actor_new, 0x8600); - spawnableActorList_add(&D_8038BD48, actor_new, 0x8600); - spawnableActorList_add(&D_8038BD6C, actor_new, 0x8600); - spawnableActorList_add(&D_8038BCB8, actor_new, 0x8600); - spawnableActorList_add(&D_8038BD90, actor_new, 8); - spawnableActorList_add(&chNapper, actor_new, 0x18A0); - spawnableActorList_add(&D_8038BA68, actor_new, 0x100); - spawnableActorList_add(&chMotzhand, actor_new, 0x20880); - spawnableActorList_add(&D_80367E70, actor_new, 0); - spawnableActorList_add(&chLoggo, actor_new, 0x108); - spawnableActorList_add(&D_8038BAD0, actor_new, 0x2800960); - spawnableActorList_add(&D_8038BE48, actor_new, 0x800040); - spawnableActorList_add(&D_8038BE6C, actor_new, 0x800040); - spawnableActorList_add(&D_8038BE90, actor_new, 0x800040); - spawnableActorList_add(&D_8038BEB4, actor_new, 0x800040); - spawnableActorList_add(&D_8038BED8, actor_new, 0x800040); - spawnableActorList_add(&D_8038BEFC, actor_new, 0x800040); - spawnableActorList_add(&D_80372C3C, actor_new, 0xA11A9); + spawnableActorList_add(&D_8038BC28, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038BCDC, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038BC4C, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038BDB4, actor_new, ACTOR_FLAG_UNKNOWN_6); + spawnableActorList_add(&D_8038BDD8, actor_new, ACTOR_FLAG_UNKNOWN_6); + spawnableActorList_add(&D_8038BDFC, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_8038BC94, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038BC70, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038BD00, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038BD24, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8038BD48, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8038BD6C, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8038BCB8, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8038BD90, actor_new, ACTOR_FLAG_UNKNOWN_3); + spawnableActorList_add(&chNapper, actor_new, ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_12); + spawnableActorList_add(&D_8038BA68, actor_new, ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&chMotzhand, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_17); + spawnableActorList_add(&D_80367E70, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&chLoggo, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_8038BAD0, 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); + spawnableActorList_add(&D_8038BE48, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_23); + spawnableActorList_add(&D_8038BE6C, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_23); + spawnableActorList_add(&D_8038BE90, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_23); + spawnableActorList_add(&D_8038BEB4, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_23); + spawnableActorList_add(&D_8038BED8, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_23); + spawnableActorList_add(&D_8038BEFC, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_23); + spawnableActorList_add(&D_80372C3C, 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 | ACTOR_FLAG_UNKNOWN_19); } diff --git a/src/RBB/ch/bossboombox.c b/src/RBB/ch/bossboombox.c index e9de3192..2b8ce103 100644 --- a/src/RBB/ch/bossboombox.c +++ b/src/RBB/ch/bossboombox.c @@ -445,7 +445,7 @@ void func_8038D5BC(ActorMarker *marker, s32 arg1){ } void func_8038D608(ActorMarker *marker, ActorMarker *other){ - func_8038D7E8(marker, other->unk14_20 == 1); + func_8038D7E8(marker, other->id == 1); } Actor *func_8038D638(ActorMarker *marker, Gfx **gdl, Mtx ** mptr, s32 arg3){ @@ -504,7 +504,7 @@ void func_8038D8BC(Actor *this){ if(!this->unk16C_4){ this->unk16C_4 = 1; - local->unk0 = &D_80390B70[this->marker->unk14_20 - 0x1A1]; + local->unk0 = &D_80390B70[this->marker->id - 0x1A1]; local->unk4 = 0; local->unk20 = 0; diff --git a/src/RBB/code_640.c b/src/RBB/code_640.c index 34ad2721..55c85fab 100644 --- a/src/RBB/code_640.c +++ b/src/RBB/code_640.c @@ -1,8 +1,8 @@ #include #include "functions.h" #include "variables.h" - #include "prop.h" +#include "actor.h" extern ActorInfo D_80390D20; extern ActorInfo D_80390050; @@ -169,56 +169,56 @@ void func_80386BF8(Actor *arg0){ } void RBB_func_80386C48(void){ - spawnableActorList_add(&D_80390D20, actor_new, 0x4880); - spawnableActorList_add(&D_80390050, actor_new, 0); - spawnableActorList_add(&D_80390200, actor_new, 0x80); - spawnableActorList_add(&D_80390270, actor_new, 0x80); - spawnableActorList_add(&D_80390D50, actor_new, 0x8004480); - spawnableActorList_add(&D_803906E0, actor_new, 0x80); - spawnableActorList_add(&D_80390738, actor_new, 0x80); - spawnableActorList_add(&D_803907D0, actor_new, 0x6488); - spawnableActorList_add(&D_803907F4, actor_new, 0x6488); - spawnableActorList_add(&D_80390818, actor_new, 0x6488); - spawnableActorList_add(&D_8039083C, actor_new, 0x6488); - spawnableActorList_add(&D_803904C0, actor_new, 0x6408); - spawnableActorList_add(&D_803904E4, actor_new, 0x6408); - spawnableActorList_add(&D_80390508, actor_new, 0x6408); - spawnableActorList_add(&D_803903B0, actor_new, 0x6408); - spawnableActorList_add(&D_803903D4, actor_new, 0x6408); - spawnableActorList_add(&D_803903F8, actor_new, 0x6408); - spawnableActorList_add(&D_80390640, actor_new, 0x400); - spawnableActorList_add(&D_80390664, actor_new, 0x400); - spawnableActorList_add(&D_80390688, actor_new, 0x400); - spawnableActorList_add(&D_803906B0, actor_new, 0); - spawnableActorList_add(&D_803908C0, actor_new, 0x80); - spawnableActorList_add(&D_803908E4, actor_new, 0x80); - spawnableActorList_add(&D_80390908, actor_new, 0x80); - spawnableActorList_add(&D_803909B0, actor_new, 0x880); - spawnableActorList_add(&D_803909D4, actor_new, 0x880); - spawnableActorList_add(&RBB_D_803909F8, actor_new, 0x880); - spawnableActorList_add(&D_80390A50, actor_new, 0x80); - spawnableActorList_add(&D_80390380, actor_new, 0x9aa); - spawnableActorList_add(&D_80390A80, actor_new, 0x80); //anchorswitch - spawnableActorList_add(&RBB_D_80390AB0, actor_new, 0x8C8); //dolphin - spawnableActorList_add(&RBB_D_80390AE0, actor_new, 0xC80); //anchor - spawnableActorList_add(&RBB_D_80390B10, actor_new, 0x80); - spawnableActorList_add(&D_80390B40, actor_new, 0x880); //rarewareflag - spawnableActorList_add(&RBB_D_80390BD0, actor_new, 0xc2c); - spawnableActorList_add(&D_80390BF4, actor_new, 0xc2c); - spawnableActorList_add(&D_80390C18, actor_new, 0xc2c); - spawnableActorList_add(&RBB_D_80390C3C, actor_new, 0xc2c); - spawnableActorList_add(&RBB_D_80390CF0, actor_new, 0x80); - spawnableActorList_add(&D_80390D88, actor_new, 0x2000889); - spawnableActorList_add(&D_80390DAC, actor_new, 0x2000889); - spawnableActorList_add(&RBB_D_80390E00, actor_new, 0x80); - spawnableActorList_add(&D_80390E34, actor_new, 0x80); - spawnableActorList_add(&D_80390E58, actor_new, 0x80); - spawnableActorList_add(&D_803900E0, actor_new, 0); - spawnableActorList_add(&D_80390104, actor_new, 0x8600); //captcabinwooddoor - spawnableActorList_add(&D_80390128, actor_new, 0); - spawnableActorList_add(&D_8039014C, actor_new, 0); - spawnableActorList_add(&D_803901B8, actor_new, 0x8600); - spawnableActorList_add(&D_803901DC, actor_new, 0x8600); - spawnableActorList_add(&D_80390170, actor_new, 0x8600); //skylight - spawnableActorList_add(&D_80390194, actor_new, 0x8); //honeycombswitch + spawnableActorList_add(&D_80390D20, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_14); + spawnableActorList_add(&D_80390050, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_80390200, actor_new, ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_80390270, actor_new, ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_80390D50, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_14 | ACTOR_FLAG_UNKNOWN_27); + spawnableActorList_add(&D_803906E0, actor_new, ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_80390738, actor_new, ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_803907D0, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_14); + spawnableActorList_add(&D_803907F4, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_14); + spawnableActorList_add(&D_80390818, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_14); + spawnableActorList_add(&D_8039083C, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_14); + spawnableActorList_add(&D_803904C0, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_14); + spawnableActorList_add(&D_803904E4, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_14); + spawnableActorList_add(&D_80390508, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_14); + spawnableActorList_add(&D_803903B0, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_14); + spawnableActorList_add(&D_803903D4, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_14); + spawnableActorList_add(&D_803903F8, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_14); + spawnableActorList_add(&D_80390640, actor_new, ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_80390664, actor_new, ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_80390688, actor_new, ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_803906B0, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_803908C0, actor_new, ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_803908E4, actor_new, ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_80390908, actor_new, ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_803909B0, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11); + spawnableActorList_add(&D_803909D4, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11); + spawnableActorList_add(&RBB_D_803909F8, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11); + spawnableActorList_add(&D_80390A50, actor_new, ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_80390380, actor_new, ACTOR_FLAG_UNKNOWN_1 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_11); + spawnableActorList_add(&D_80390A80, actor_new, ACTOR_FLAG_UNKNOWN_7); //anchorswitch + spawnableActorList_add(&RBB_D_80390AB0, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11); //dolphin + spawnableActorList_add(&RBB_D_80390AE0, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_11); //anchor + spawnableActorList_add(&RBB_D_80390B10, actor_new, ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_80390B40, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11); //rarewareflag + spawnableActorList_add(&RBB_D_80390BD0, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_11); + spawnableActorList_add(&D_80390BF4, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_11); + spawnableActorList_add(&D_80390C18, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_11); + spawnableActorList_add(&RBB_D_80390C3C, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_11); + spawnableActorList_add(&RBB_D_80390CF0, actor_new, ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_80390D88, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_25); + spawnableActorList_add(&D_80390DAC, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_25); + spawnableActorList_add(&RBB_D_80390E00, actor_new, ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_80390E34, actor_new, ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_80390E58, actor_new, ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_803900E0, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_80390104, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); //captcabinwooddoor + spawnableActorList_add(&D_80390128, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8039014C, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_803901B8, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_803901DC, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80390170, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); //skylight + spawnableActorList_add(&D_80390194, actor_new, ACTOR_FLAG_UNKNOWN_3); //honeycombswitch } diff --git a/src/RBB/code_9840.c b/src/RBB/code_9840.c index e1cdbeee..c1950d0d 100644 --- a/src/RBB/code_9840.c +++ b/src/RBB/code_9840.c @@ -38,7 +38,7 @@ void func_8038FC48(Actor *this){ if(!this->unk16C_4){ this->unk16C_4 = 1; actor_collisionOff(this); - local->unk4 = RBB_D_80390E30 + (this->marker->unk14_20 - 0x1d2); + local->unk4 = RBB_D_80390E30 + (this->marker->id - 0x1d2); local->unk8 = NULL; local->unk0 = func_802F9AA8(0x400); diff --git a/src/SM/ch/vegetables.c b/src/SM/ch/vegetables.c index 0e58d6c6..538949e3 100644 --- a/src/SM/ch/vegetables.c +++ b/src/SM/ch/vegetables.c @@ -287,7 +287,7 @@ void func_80388080(Actor *this){ if(!this->initialized){ - switch(this->marker->unk14_20){ + switch(this->marker->id){ default: local->unkC = 3; //cauliflower break; diff --git a/src/SM/code_2990.c b/src/SM/code_2990.c index 3187a64d..ec1642ee 100644 --- a/src/SM/code_2990.c +++ b/src/SM/code_2990.c @@ -142,7 +142,7 @@ void func_80388FA0(Actor *this, s32 arg1){ case 4: other = subaddie_getLinkedActor(this); myOther = this->unk100; - if(myOther && other && myOther->unk14_20 == 0xB8) + if(myOther && other && myOther->id == 0xB8) subaddie_set_state_with_direction(other, 3, 0.0001f, 1); actor_playAnimationOnce(this); this->unk44_31 = func_8030D90C(); @@ -166,7 +166,7 @@ void func_80388FA0(Actor *this, s32 arg1){ case 2: other = subaddie_getLinkedActor(this); myOther = this->unk100; - if(myOther && other && myOther->unk14_20 == 0xB8) + if(myOther && other && myOther->id == 0xB8) subaddie_set_state_with_direction(other, 2, 0.0001f, 1); animctrl_setSmoothTransition(this->animctrl, 1); actor_playAnimationOnce(this); diff --git a/src/SM/code_3FC0.c b/src/SM/code_3FC0.c index ac0a0659..92dbfbfe 100644 --- a/src/SM/code_3FC0.c +++ b/src/SM/code_3FC0.c @@ -50,7 +50,7 @@ ActorInfo D_8038B080 ={ /* .code */ void func_8038A3B0(Actor *this){ - s32 sp24 = this->marker->unk14_20 - 0xe1; + s32 sp24 = this->marker->id - 0xe1; if(this->marker->unk14_21) func_8034A174(this->marker->unk44, 0x1f, D_80365E04[sp24]); diff --git a/src/SM/code_F0.c b/src/SM/code_F0.c index 10be99bb..5d918fbb 100644 --- a/src/SM/code_F0.c +++ b/src/SM/code_F0.c @@ -2,6 +2,7 @@ #include "functions.h" #include "variables.h" #include "prop.h" +#include "actor.h" int ability_hasLearned(s32); @@ -139,20 +140,20 @@ bool SM_CRCs_are_valid(void){ void SM_func_80386810(void) { - spawnableActorList_add(&D_8038AB00, actor_new, 0X2000180); - spawnableActorList_add(&D_8038ABF0, actor_new, 0X80); - spawnableActorList_add(&D_8038AC20, actor_new, 0); - spawnableActorList_add(&D_8038AC78, actor_new, 0X2000121); - spawnableActorList_add(&D_8038ACE8, actor_new, 0X2000121); - spawnableActorList_add(&D_8038AD58, actor_new, 0X2200121); - spawnableActorList_add(&D_8038AC9C, actor_new, 0X2000121); - spawnableActorList_add(&D_8038AD0C, actor_new, 0X2000121); - spawnableActorList_add(&D_8038AD7C, actor_new, 0X2200121); - spawnableActorList_add(&chSmMole, actor_new, 0X100); - spawnableActorList_add(&D_8038B0B0, actor_new, 0); - spawnableActorList_add(&D_8038B0E0, actor_new, 0); - spawnableActorList_add(&D_8038B008, actor_new, 0X6C8); - spawnableActorList_add(&D_8038B044, actor_new, 0X6C8); - spawnableActorList_add(&D_8038B080, actor_new, 0X6C8); - spawnableActorList_add(&D_8038AB24, actor_new, 0X400); + spawnableActorList_add(&D_8038AB00, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_25); + spawnableActorList_add(&D_8038ABF0, actor_new, ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_8038AC20, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038AC78, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_25); + spawnableActorList_add(&D_8038ACE8, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_25); + spawnableActorList_add(&D_8038AD58, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_21 | ACTOR_FLAG_UNKNOWN_25); + spawnableActorList_add(&D_8038AC9C, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_25); + spawnableActorList_add(&D_8038AD0C, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_25); + spawnableActorList_add(&D_8038AD7C, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_21 | ACTOR_FLAG_UNKNOWN_25); + spawnableActorList_add(&chSmMole, actor_new, ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_8038B0B0, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038B0E0, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038B008, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_8038B044, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_8038B080, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_8038AB24, actor_new, ACTOR_FLAG_UNKNOWN_10); } diff --git a/src/TTC/ch/clam.c b/src/TTC/ch/clam.c index cf094b94..db1b4d0c 100644 --- a/src/TTC/ch/clam.c +++ b/src/TTC/ch/clam.c @@ -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){ diff --git a/src/TTC/ch/nipper.c b/src/TTC/ch/nipper.c index c6247272..bdb6e020 100644 --- a/src/TTC/ch/nipper.c +++ b/src/TTC/ch/nipper.c @@ -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 diff --git a/src/TTC/code_26D0.c b/src/TTC/code_26D0.c index d06b3381..ddf3bcd5 100644 --- a/src/TTC/code_26D0.c +++ b/src/TTC/code_26D0.c @@ -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){ diff --git a/src/core2/ba/marker.c b/src/core2/ba/marker.c index ca3e0209..f255b6ef 100644 --- a/src/core2/ba/marker.c +++ b/src/core2/ba/marker.c @@ -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; diff --git a/src/core2/ch/bigbutt.c b/src/core2/ch/bigbutt.c index 2b85cc2b..99b54be6 100644 --- a/src/core2/ch/bigbutt.c +++ b/src/core2/ch/bigbutt.c @@ -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; } } diff --git a/src/core2/ch/clucker.c b/src/core2/ch/clucker.c index 2eccf9ed..6cebd886 100644 --- a/src/core2/ch/clucker.c +++ b/src/core2/ch/clucker.c @@ -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); diff --git a/src/core2/ch/code_CFA60.c b/src/core2/ch/code_CFA60.c index 1e076be4..19a48d39 100644 --- a/src/core2/ch/code_CFA60.c +++ b/src/core2/ch/code_CFA60.c @@ -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); diff --git a/src/core2/ch/collectible.c b/src/core2/ch/collectible.c index c1ed1c85..7bf7e85e 100644 --- a/src/core2/ch/collectible.c +++ b/src/core2/ch/collectible.c @@ -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; diff --git a/src/core2/ch/crab.c b/src/core2/ch/crab.c index 755ec886..00080408 100644 --- a/src/core2/ch/crab.c +++ b/src/core2/ch/crab.c @@ -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; diff --git a/src/core2/ch/gameSelect.c b/src/core2/ch/gameSelect.c index b306dfbd..ff84663d 100644 --- a/src/core2/ch/gameSelect.c +++ b/src/core2/ch/gameSelect.c @@ -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) diff --git a/src/core2/ch/jinjo.c b/src/core2/ch/jinjo.c index 3c89d878..095c1100 100644 --- a/src/core2/ch/jinjo.c +++ b/src/core2/ch/jinjo.c @@ -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; diff --git a/src/core2/ch/mole.c b/src/core2/ch/mole.c index 6cd45194..1446d240 100644 --- a/src/core2/ch/mole.c +++ b/src/core2/ch/mole.c @@ -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); } } diff --git a/src/core2/ch/snowman.c b/src/core2/ch/snowman.c index 16dfcb9d..f178012e 100644 --- a/src/core2/ch/snowman.c +++ b/src/core2/ch/snowman.c @@ -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; } diff --git a/src/core2/code_3EAD0.c b/src/core2/code_3EAD0.c index a58db43b..99061426 100644 --- a/src/core2/code_3EAD0.c +++ b/src/core2/code_3EAD0.c @@ -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; diff --git a/src/core2/code_42CB0.c b/src/core2/code_42CB0.c index 9e8dd37d..25c3c1b5 100644 --- a/src/core2/code_42CB0.c +++ b/src/core2/code_42CB0.c @@ -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); diff --git a/src/core2/code_4C020.c b/src/core2/code_4C020.c index 6b6662ce..2f8528c1 100644 --- a/src/core2/code_4C020.c +++ b/src/core2/code_4C020.c @@ -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); diff --git a/src/core2/code_509D0.c b/src/core2/code_509D0.c index cd2d1900..b560f71e 100644 --- a/src/core2/code_509D0.c +++ b/src/core2/code_509D0.c @@ -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); diff --git a/src/core2/code_7060.c b/src/core2/code_7060.c index 66361b57..198c1f5e 100644 --- a/src/core2/code_7060.c +++ b/src/core2/code_7060.c @@ -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; } diff --git a/src/core2/code_7AF80.c b/src/core2/code_7AF80.c index e7f32862..630be8fd 100644 --- a/src/core2/code_7AF80.c +++ b/src/core2/code_7AF80.c @@ -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); diff --git a/src/core2/code_9E370.c b/src/core2/code_9E370.c index ef040a76..f7107a03 100644 --- a/src/core2/code_9E370.c +++ b/src/core2/code_9E370.c @@ -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); } } diff --git a/src/core2/code_A4D00.c b/src/core2/code_A4D00.c index 04e0b931..8d1fad2f 100644 --- a/src/core2/code_A4D00.c +++ b/src/core2/code_A4D00.c @@ -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]; diff --git a/src/core2/code_A5BC0.c b/src/core2/code_A5BC0.c index c519cff0..1dc3bcb8 100644 --- a/src/core2/code_A5BC0.c +++ b/src/core2/code_A5BC0.c @@ -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 diff --git a/src/core2/code_B3A80.c b/src/core2/code_B3A80.c index 59065812..26ddc169 100644 --- a/src/core2/code_B3A80.c +++ b/src/core2/code_B3A80.c @@ -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; } diff --git a/src/core2/code_B62B0.c b/src/core2/code_B62B0.c index 93946008..ac307fc7 100644 --- a/src/core2/code_B62B0.c +++ b/src/core2/code_B62B0.c @@ -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; } diff --git a/src/core2/code_B9770.c b/src/core2/code_B9770.c index f0f0efde..f59f3b73 100644 --- a/src/core2/code_B9770.c +++ b/src/core2/code_B9770.c @@ -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); diff --git a/src/core2/code_CC1E0.c b/src/core2/code_CC1E0.c index ae89d5ed..5efeb409 100644 --- a/src/core2/code_CC1E0.c +++ b/src/core2/code_CC1E0.c @@ -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 diff --git a/src/core2/code_D6180.c b/src/core2/code_D6180.c index 1affdf06..d2e0b036 100644 --- a/src/core2/code_D6180.c +++ b/src/core2/code_D6180.c @@ -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; } } } diff --git a/src/core2/code_D6600.c b/src/core2/code_D6600.c index 92ea4c55..77be8500 100644 --- a/src/core2/code_D6600.c +++ b/src/core2/code_D6600.c @@ -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)); diff --git a/src/core2/spawnqueue.c b/src/core2/spawnqueue.c index 4f1bb87b..83e49bdb 100644 --- a/src/core2/spawnqueue.c +++ b/src/core2/spawnqueue.c @@ -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(); diff --git a/src/cutscenes/code_60F0.c b/src/cutscenes/code_60F0.c index 0d6255b9..dca112f6 100644 --- a/src/cutscenes/code_60F0.c +++ b/src/cutscenes/code_60F0.c @@ -1,6 +1,7 @@ #include #include "functions.h" #include "variables.h" +#include "actor.h" extern void func_802E07E0(Actor *); extern Actor* func_802E0738(ActorMarker *, Gfx **, Mtx**, Vtx **); @@ -606,82 +607,82 @@ ActorInfo D_8038E6D4 = void cutscene_func_8038C4E0(void){ - spawnableActorList_add(&D_8038DC90, actor_new, 0X40); - spawnableActorList_add(&D_8038DCFC, actor_new, 0X140); - spawnableActorList_add(&D_8038DCD8, actor_new, 0X2000); - spawnableActorList_add(&D_8038DCB4, actor_new, 0X2000); - spawnableActorList_add(&D_8038DD20, actor_new, 0X100); - spawnableActorList_add(&D_8038DD44, actor_new, 8); - spawnableActorList_add(&D_8038DD68, actor_new, 0X48); - spawnableActorList_add(&D_8038DD8C, actor_new, 0); - spawnableActorList_add(&D_8038DDB0, actor_new, 0); - spawnableActorList_add(&D_8038DDD4, actor_new, 0); - spawnableActorList_add(&D_8038DDF8, actor_new, 0); - spawnableActorList_add(&D_8038DE1C, actor_new, 0); - spawnableActorList_add(&D_8038DE40, actor_new, 0); - spawnableActorList_add(&D_8038DE64, actor_new, 0); - spawnableActorList_add(&D_8038DE88, actor_new, 0); - spawnableActorList_add(&D_8038DEAC, actor_new, 0); - spawnableActorList_add(&D_8038DED0, actor_new, 0X8648); - spawnableActorList_add(&D_8038DEF4, actor_new, 0); - spawnableActorList_add(&D_8038DF18, actor_new, 0); - spawnableActorList_add(&D_8038DF3C, actor_new, 0); - spawnableActorList_add(&D_8038DF60, actor_new, 0X2008); - spawnableActorList_add(&D_8038DF84, actor_new, 0); - spawnableActorList_add(&D_8038DFA8, actor_new, 0X148); - spawnableActorList_add(&D_8038DFCC, actor_new, 0); - spawnableActorList_add(&D_8038DFF0, actor_new, 0X8748); - spawnableActorList_add(&D_8038E014, actor_new, 0X140); - spawnableActorList_add(&D_8038E038, actor_new, 8); - spawnableActorList_add(&D_8038E05C, actor_new, 8); - spawnableActorList_add(&D_8038E080, actor_new, 8); - spawnableActorList_add(&D_8038E0A4, actor_new, 0X8608); - spawnableActorList_add(&D_8038E0C8, actor_new, 0); - spawnableActorList_add(&D_8038E0EC, actor_new, 0X8748); - spawnableActorList_add(&D_8038E110, actor_new, 0X3008); - spawnableActorList_add(&D_8038E134, actor_new, 0X140); - spawnableActorList_add(&D_8038E158, actor_new, 0X40); - spawnableActorList_add(&D_8038E17C, actor_new, 0X1000); - spawnableActorList_add(&D_8038E1A0, actor_new, 0X140); - spawnableActorList_add(&D_8038E1C4, actor_new, 8); - spawnableActorList_add(&D_8038E1E8, actor_new, 0X8608); - spawnableActorList_add(&D_8038E20C, actor_new, 0X8608); - spawnableActorList_add(&D_8038E230, actor_new, 0X40); - spawnableActorList_add(&D_8038E254, actor_new, 8); - spawnableActorList_add(&D_8038E278, actor_new, 0); - spawnableActorList_add(&D_8038E29C, actor_new, 0X100); - spawnableActorList_add(&D_8038E2C0, actor_new, 0); - spawnableActorList_add(&D_8038E2E4, actor_new, 0); - spawnableActorList_add(&D_8038E308, actor_new, 0X8608); - spawnableActorList_add(&D_8038E32C, actor_new, 0); - spawnableActorList_add(&D_8038E350, actor_new, 0X8608); - spawnableActorList_add(&D_8038E374, actor_new, 0X100); - spawnableActorList_add(&D_8038E398, actor_new, 0X1048); - spawnableActorList_add(&D_8038E3BC, actor_new, 0X100); - spawnableActorList_add(&D_8038E3E0, actor_new, 0X140); - spawnableActorList_add(&D_8038E404, actor_new, 0X40); - spawnableActorList_add(&D_8038E428, actor_new, 0X1000); - spawnableActorList_add(&D_8038E44C, actor_new, 0X40); - spawnableActorList_add(&D_8038E470, actor_new, 0X9608); - spawnableActorList_add(&D_8038E494, actor_new, 0X100); - spawnableActorList_add(&D_8038E4B8, actor_new, 0X40); - spawnableActorList_add(&D_8038E4DC, actor_new, 0X40); - spawnableActorList_add(&D_8038E500, actor_new, 0); - spawnableActorList_add(&D_8038E524, actor_new, 0X100); - spawnableActorList_add(&D_8038E548, actor_new, 0X9600); - spawnableActorList_add(&D_8038E56C, actor_new, 0); - spawnableActorList_add(&D_8038E590, actor_new, 0X8748); - spawnableActorList_add(&D_8038E5B4, actor_new, 0X8608); - spawnableActorList_add(&D_8038E5D8, actor_new, 0); - spawnableActorList_add(&D_8038E5FC, actor_new, 0); - spawnableActorList_add(&D_8038E620, actor_new, 0); - spawnableActorList_add(&D_8038E644, actor_new, 0); - spawnableActorList_add(&D_8038E668, actor_new, 0); - spawnableActorList_add(&D_8038E68C, actor_new, 0); - spawnableActorList_add(&D_8038E6B0, actor_new, 0); - spawnableActorList_add(&D_8038E6D4, actor_new, 0); - spawnableActorList_add(&D_80366CD0, actor_new, 0); - spawnableActorList_add(&D_8038E718, actor_new, 2); - spawnableActorList_add(&D_8038E7A0, actor_new, 0X8648); - spawnableActorList_add(&D_8038E8A8, actor_new, 2); + spawnableActorList_add(&D_8038DC90, actor_new, ACTOR_FLAG_UNKNOWN_6); + spawnableActorList_add(&D_8038DCFC, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_8038DCD8, actor_new, ACTOR_FLAG_UNKNOWN_13); + spawnableActorList_add(&D_8038DCB4, actor_new, ACTOR_FLAG_UNKNOWN_13); + spawnableActorList_add(&D_8038DD20, actor_new, ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_8038DD44, actor_new, ACTOR_FLAG_UNKNOWN_3); + spawnableActorList_add(&D_8038DD68, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6); + spawnableActorList_add(&D_8038DD8C, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038DDB0, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038DDD4, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038DDF8, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038DE1C, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038DE40, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038DE64, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038DE88, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038DEAC, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038DED0, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8038DEF4, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038DF18, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038DF3C, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038DF60, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_13); + spawnableActorList_add(&D_8038DF84, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038DFA8, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_8038DFCC, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038DFF0, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8038E014, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_8038E038, actor_new, ACTOR_FLAG_UNKNOWN_3); + spawnableActorList_add(&D_8038E05C, actor_new, ACTOR_FLAG_UNKNOWN_3); + spawnableActorList_add(&D_8038E080, actor_new, ACTOR_FLAG_UNKNOWN_3); + spawnableActorList_add(&D_8038E0A4, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8038E0C8, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038E0EC, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8038E110, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_12 | ACTOR_FLAG_UNKNOWN_13); + spawnableActorList_add(&D_8038E134, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_8038E158, actor_new, ACTOR_FLAG_UNKNOWN_6); + spawnableActorList_add(&D_8038E17C, actor_new, ACTOR_FLAG_UNKNOWN_12); + spawnableActorList_add(&D_8038E1A0, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_8038E1C4, actor_new, ACTOR_FLAG_UNKNOWN_3); + spawnableActorList_add(&D_8038E1E8, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8038E20C, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8038E230, actor_new, ACTOR_FLAG_UNKNOWN_6); + spawnableActorList_add(&D_8038E254, actor_new, ACTOR_FLAG_UNKNOWN_3); + spawnableActorList_add(&D_8038E278, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038E29C, actor_new, ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_8038E2C0, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038E2E4, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038E308, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8038E32C, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038E350, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8038E374, actor_new, ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_8038E398, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_12); + spawnableActorList_add(&D_8038E3BC, actor_new, ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_8038E3E0, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_8038E404, actor_new, ACTOR_FLAG_UNKNOWN_6); + spawnableActorList_add(&D_8038E428, actor_new, ACTOR_FLAG_UNKNOWN_12); + spawnableActorList_add(&D_8038E44C, actor_new, ACTOR_FLAG_UNKNOWN_6); + spawnableActorList_add(&D_8038E470, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_12 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8038E494, actor_new, ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_8038E4B8, actor_new, ACTOR_FLAG_UNKNOWN_6); + spawnableActorList_add(&D_8038E4DC, actor_new, ACTOR_FLAG_UNKNOWN_6); + spawnableActorList_add(&D_8038E500, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038E524, actor_new, ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_8038E548, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_12 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8038E56C, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038E590, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8038E5B4, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8038E5D8, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038E5FC, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038E620, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038E644, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038E668, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038E68C, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038E6B0, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038E6D4, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_80366CD0, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_8038E718, actor_new, ACTOR_FLAG_UNKNOWN_1); + spawnableActorList_add(&D_8038E7A0, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8038E8A8, actor_new, ACTOR_FLAG_UNKNOWN_1); } diff --git a/src/fight/chbossjinjo.c b/src/fight/chbossjinjo.c index 57f4dfab..9ee82135 100644 --- a/src/fight/chbossjinjo.c +++ b/src/fight/chbossjinjo.c @@ -133,7 +133,7 @@ void chbossjinjo_spawnParticles(Actor *this, enum asset_e arg1, enum asset_e arg void chbossjinjo_spawnAttackParticles(Actor *this){ s32 sparkle_sprite_id; s32 smoke_sprite_id; - switch(this->marker->unk14_20){ + switch(this->marker->id){ default: sparkle_sprite_id = ASSET_718_SPRITE_SPARKLE_WHITE_2; smoke_sprite_id = ASSET_6C2_SPRITE_SMOKE_WHITE; @@ -374,7 +374,7 @@ void chBossJinjo_func_8038D014(Actor *this){ func_8030E6A4(0x3ee, randf2(1.0f, 1.15f), 32000); timed_playSfx(0.1f, 0x416, 0.6f, 32000); marker_despawn(this->marker); - switch (this->marker->unk14_20) + switch (this->marker->id) { case MARKER_27B_BOSS_JINJO_ORANGE: temp_a1 = 0x557; diff --git a/src/fight/chfinalboss.c b/src/fight/chfinalboss.c index d707abfe..12152f0e 100644 --- a/src/fight/chfinalboss.c +++ b/src/fight/chfinalboss.c @@ -1586,7 +1586,7 @@ ActorMarker *chfinalboss_findCollidingJinjo(Actor *this, f32 arg1) { while(prop !=NULL){ if (prop->markerFlag){ jinjo = marker_getActor(prop->actorProp.marker); - jinjo_marker_id = jinjo->marker->unk14_20; + jinjo_marker_id = jinjo->marker->id; if( (jinjo_marker_id == MARKER_27B_BOSS_JINJO_ORANGE) || (jinjo_marker_id == MARKER_27C_BOSS_JINJO_GREEN) @@ -1637,7 +1637,7 @@ void chfinalboss_phase4_update(ActorMarker *marker) { chfinalboss_phase4_setState(this, 0x20); } else{ - temp_t6 = marker_getActor(sp6C)->marker->unk14_20; + temp_t6 = marker_getActor(sp6C)->marker->id; if ((temp_t6 == MARKER_27B_BOSS_JINJO_ORANGE) || (temp_t6 == MARKER_27E_BOSS_JINJO_YELLOW)) { local->mirror_phase5 = FALSE; } else { @@ -1851,7 +1851,7 @@ void chfinalboss_phase5_update(ActorMarker *marker) { sp38 = 0x14; sp34 = animctrl_getAnimTimer(this->animctrl); jinjonator_marker = chfinalboss_findCollidingJinjo(this, func_8033229C(this->marker) / 3.0f); - if ((jinjonator_marker != NULL) && (jinjonator_marker->unk14_20 == MARKER_285_JINJONATOR)) { + if ((jinjonator_marker != NULL) && (jinjonator_marker->id == MARKER_285_JINJONATOR)) { if (chjinjonator_8039125C(jinjonator_marker)) { __chFinalBossJinjonatorHits++; if (local->mirror_phase5) { @@ -2054,29 +2054,29 @@ bool func_8038B834(ActorMarker *marker, ActorMarker * arg1) { switch (local->phase) { case 1: if ((this->state == 6) || (this->state == 7)) { - marker->unk14_20 = 0x260; + marker->id = 0x260; } else { - marker->unk14_20 = 0x25E; + marker->id = 0x25E; } break; case 2: if (local->unkA == 0) { - marker->unk14_20 = 0x260; + marker->id = 0x260; } else { - marker->unk14_20 = 0x281; + marker->id = 0x281; } break; case 3: - marker->unk14_20 = 0x282; + marker->id = 0x282; break; case 4: - marker->unk14_20 = 0x283; + marker->id = 0x283; break; case 5: - marker->unk14_20 = 0x283; + marker->id = 0x283; break; default: - marker->unk14_20 = 0x25E; + marker->id = 0x25E; break; } return TRUE; diff --git a/src/fight/chspellbarrier.c b/src/fight/chspellbarrier.c index 99009fed..8777a948 100644 --- a/src/fight/chspellbarrier.c +++ b/src/fight/chspellbarrier.c @@ -88,7 +88,7 @@ void chspellbarrier_update(Actor *this){ }//L8038E97C jinjo_marker = chfinalboss_findCollidingJinjo(this, 600.0f); if(jinjo_marker){ - if(jinjo_marker->unk14_20 == MARKER_285_JINJONATOR){ + if(jinjo_marker->id == MARKER_285_JINJONATOR){ marker_despawn(this->marker); chfinalboss_spellBarrierInactive(); return; diff --git a/src/fight/chspellfireball.c b/src/fight/chspellfireball.c index 1dac6dca..2a78770f 100644 --- a/src/fight/chspellfireball.c +++ b/src/fight/chspellfireball.c @@ -184,7 +184,7 @@ void func_8038F084(ActorMarker *marker){ timedFunc_set_0(0.3f, func_8038F050); actor->unk58_0 = 0; actor->scale *= 1.6; - if(actor->marker->unk14_20 != MARKER_280_GRUNTY_SPELL_GREEN_ATTACK){ + if(actor->marker->id != MARKER_280_GRUNTY_SPELL_GREEN_ATTACK){ chSpellFireball_emitSparkles(actor->position, 4, ASSET_713_SPRITE_SPARKLE_YELLOW, D_80391C0C, D_80391C24, D_80391C3C, D_80391C54, D_80391C64, D_80391C74 @@ -220,9 +220,9 @@ void func_8038F084(ActorMarker *marker){ } void func_8038F3B4(ActorMarker *marker, ActorMarker *other){ - if( other->unk14_20 == 0x276 - || other->unk14_20 == 0x27A - || other->unk14_20 == 0x27F + if( other->id == 0x276 + || other->id == 0x27A + || other->id == 0x27F ) return; func_8038F084(marker); @@ -283,7 +283,7 @@ void func_8038F620(Actor *this){ actor_collisionOn(this); this->unk60 = 8.0f; this->scale = 0.1f; - if( this->marker->unk14_20 == MARKER_280_GRUNTY_SPELL_GREEN_ATTACK){ + if( this->marker->id == MARKER_280_GRUNTY_SPELL_GREEN_ATTACK){ actor_collisionOff(this); marker_setFreeMethod(this->marker, func_8038F5F8); func_80324CFC(0.0f, COMUSIC_43_ENTER_LEVEL_GLITTER, 32000); @@ -303,7 +303,7 @@ void func_8038F620(Actor *this){ ); } }//L8038F79C - if(D_803928E5 && this->marker->unk14_20 == MARKER_280_GRUNTY_SPELL_GREEN_ATTACK){ + if(D_803928E5 && this->marker->id == MARKER_280_GRUNTY_SPELL_GREEN_ATTACK){ ncStaticCamera_rotateToTarget(this->position); }//L8038F7D4 @@ -312,7 +312,7 @@ void func_8038F620(Actor *this){ D_80392914 = sp40*1.4; this->scale = (this->scale + D_80392914 < 1.0) ? this->scale + D_80392914 : 1.0f; - switch(this->marker->unk14_20){ + switch(this->marker->id){ case MARKER_25C_GRUNTY_SPELL_FIREBALL://L8038F8AC chSpellFireball_emitExplosion(this->position, ASSET_4A0_SPRITE_EXPLOSION, 1, D_80391CEC, D_80391D34, @@ -359,7 +359,7 @@ void func_8038F620(Actor *this){ } } // L8038FABC - if( this->marker->unk14_20 != MARKER_280_GRUNTY_SPELL_GREEN_ATTACK + if( this->marker->id != MARKER_280_GRUNTY_SPELL_GREEN_ATTACK && func_8028F25C() ){ func_8038F084(this->marker); diff --git a/src/fight/code_0.c b/src/fight/code_0.c index bd57eed5..03421b13 100644 --- a/src/fight/code_0.c +++ b/src/fight/code_0.c @@ -3,24 +3,25 @@ #include "variables.h" #include "prop.h" #include "fight.h" +#include "actor.h" u8 pad_fight_80392740[0x10]; void fight_func_803863F0(void) { - spawnableActorList_add(&chSpellFireball, actor_new, 0X108444); - spawnableActorList_add(&chGreenBlast, actor_new, 0X108444); - spawnableActorList_add(&chFinalBoss, actor_new, 0X300468); - spawnableActorList_add(&chBossJinjoOrange, actor_new, 0X8464); - spawnableActorList_add(&chBossJinjoGreen, actor_new, 0X8464); - spawnableActorList_add(&chBossJinjoPink, actor_new, 0X8464); - spawnableActorList_add(&chBossJinjoYellow, actor_new, 0X8464); - spawnableActorList_add(&chStoneJinjo, actor_new, 0X20004); - spawnableActorList_add(&chBossJinjoBase, actor_new, 0X800100C); - spawnableActorList_add(&chJinjonatorBase, actor_new, 0X8009404); - spawnableActorList_add(&chSpellGreen, actor_new, 0X108444); - spawnableActorList_add(&chSpellBarrier, actor_new, 0X101404); - spawnableActorList_add(&chFightFlightPad, actor_new, 0X100404); - spawnableActorList_add(&chJinjonator, actor_new, 0X9464); - spawnableActorList_add(&chBossShadow, actor_new, 0X100404); + spawnableActorList_add(&chSpellFireball, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15 | ACTOR_FLAG_UNKNOWN_20); + spawnableActorList_add(&chGreenBlast, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15 | ACTOR_FLAG_UNKNOWN_20); + spawnableActorList_add(&chFinalBoss, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_20 | ACTOR_FLAG_UNKNOWN_21); + spawnableActorList_add(&chBossJinjoOrange, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&chBossJinjoGreen, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&chBossJinjoPink, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&chBossJinjoYellow, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&chStoneJinjo, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_17); + spawnableActorList_add(&chBossJinjoBase, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_12 | ACTOR_FLAG_UNKNOWN_27); + spawnableActorList_add(&chJinjonatorBase, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_12 | ACTOR_FLAG_UNKNOWN_15 | ACTOR_FLAG_UNKNOWN_27); + spawnableActorList_add(&chSpellGreen, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15 | ACTOR_FLAG_UNKNOWN_20); + spawnableActorList_add(&chSpellBarrier, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_12 | ACTOR_FLAG_UNKNOWN_20); + spawnableActorList_add(&chFightFlightPad, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_20); + spawnableActorList_add(&chJinjonator, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_12 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&chBossShadow, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_20); } diff --git a/src/lair/code_0.c b/src/lair/code_0.c index bdfb5ddd..91a2ad31 100644 --- a/src/lair/code_0.c +++ b/src/lair/code_0.c @@ -1,8 +1,8 @@ #include #include "functions.h" #include "variables.h" - #include "prop.h" +#include "actor.h" extern void func_8028F918(s32); extern void func_802D2FB0(Actor *, s32, s32, s32, f32, s32, s32, s32); @@ -1843,74 +1843,74 @@ void func_8038A0A4(Actor *this) void lair_func_8038A0C4(void) { - spawnableActorList_add(&D_80392F40, actor_new, 0x18628); - spawnableActorList_add(&D_80392F64, actor_new, 0x18608); - spawnableActorList_add(&D_803932E8, actor_new, 0x8600); - spawnableActorList_add(&D_80393408, actor_new, 0x96C0); - spawnableActorList_add(&D_80392F88, actor_new, 0x8600); - spawnableActorList_add(&D_80392FAC, actor_new, 0x8600); - spawnableActorList_add(&D_80392FD0, actor_new, 0x8600); - spawnableActorList_add(&D_80393018, actor_new, 0x8600); - spawnableActorList_add(&D_8039303C, actor_new, 0x8600); - spawnableActorList_add(&D_80393060, actor_new, 0x8604); - spawnableActorList_add(&D_803931EC, actor_new, 0x8600); - spawnableActorList_add(&D_80393210, actor_new, 0x8600); - spawnableActorList_add(&D_80392EF8, actor_new, 0x8600); - spawnableActorList_add(&D_8039339C, actor_new, 0x8600); - spawnableActorList_add(&D_803933C0, actor_new, 0x8600); - spawnableActorList_add(&D_80392DB4, actor_new, 0x8608); - spawnableActorList_add(&D_80392DD8, actor_new, 0x8608); - spawnableActorList_add(&D_80392DFC, actor_new, 0x8608); - spawnableActorList_add(&D_80392E20, actor_new, 0x8608); - spawnableActorList_add(&D_80392E44, actor_new, 0x8608); - spawnableActorList_add(&D_80392E68, actor_new, 0x8608); - spawnableActorList_add(&D_80392E8C, actor_new, 0x8608); - spawnableActorList_add(&D_803930F0, actor_new, 0x8600); - spawnableActorList_add(&D_80393234, actor_new, 0x8600); - spawnableActorList_add(&D_80393258, actor_new, 0x8600); - spawnableActorList_add(&D_80392FF4, actor_new, 0x8600); - spawnableActorList_add(&D_8039327C, actor_new, 0x8600); - spawnableActorList_add(&D_803932A0, actor_new, 0x8600); - spawnableActorList_add(&D_803932C4, actor_new, 0x8600); - spawnableActorList_add(&D_8039315C, actor_new, 0x8600); - spawnableActorList_add(&D_80393180, actor_new, 0x8600); - spawnableActorList_add(&D_803931A4, actor_new, 0x8600); - spawnableActorList_add(&D_8039330C, actor_new, 0x8600); - spawnableActorList_add(&D_80393330, actor_new, 0x8600); - spawnableActorList_add(&D_80393114, actor_new, 0); - spawnableActorList_add(&D_80393138, actor_new, 0x8600); - spawnableActorList_add(&D_803930CC, actor_new, 0x8600); - spawnableActorList_add(&D_803931C8, actor_new, 0x28600); - spawnableActorList_add(&D_80393560, actor_new, 0x97AA); - spawnableActorList_add(&D_80393584, actor_new, 0x87AA); - spawnableActorList_add(&D_803933E4, actor_new, 0x8608); - spawnableActorList_add(&D_80393378, actor_new, 0x8640); - spawnableActorList_add(&D_803947B0, actor_new, 0xA1480); - spawnableActorList_add(&D_803947D4, actor_new, 0xA1480); - spawnableActorList_add(&chBrentilda, actor_new, 0x140); - spawnableActorList_add(&D_80394A80, actor_new, 0); - spawnableActorList_add(&D_80394AB0, actor_new, 0x44); - spawnableActorList_add(&D_80392EB0, actor_new, 0x8608); - spawnableActorList_add(&D_80393084, actor_new, 0x8680); - spawnableActorList_add(&D_80392ED4, actor_new, 0x8608); - spawnableActorList_add(&D_803930A8, actor_new, 0xC680); - spawnableActorList_add(&D_80394870, actor_new, 0x1A0); - spawnableActorList_add(&D_80394894, actor_new, 0x1A0); - spawnableActorList_add(&D_803948B8, actor_new, 0x1A0); - spawnableActorList_add(&D_80394910, actor_new, 0x10C0); - spawnableActorList_add(&D_80394934, actor_new, 200); - spawnableActorList_add(&D_80394958, actor_new, 200); - spawnableActorList_add(&D_80392F1C, actor_new, 0x8608); - spawnableActorList_add(&D_80394A08, actor_new, 0x2010129); - spawnableActorList_add(&D_80394A2C, actor_new, 0x2010129); - spawnableActorList_add(&D_80394A50, actor_new, 0x2010129); - spawnableActorList_add(&D_80394980, actor_new, 0x80); - spawnableActorList_add(&D_80394C28, actor_new, 0x400); - spawnableActorList_add(&D_80394C4C, actor_new, 0x400); - spawnableActorList_add(&D_80394C70, actor_new, 0x400); - spawnableActorList_add(&D_80394D20, actor_new, 0); - spawnableActorList_add(&D_80394CF0, actor_new, 0x80508); - spawnableActorList_add(&D_80394C94, actor_new, 0x500); - spawnableActorList_add(&D_80393354, actor_new, 0x8602); - spawnableActorList_add(&lair_D_80392D90, actor_new, 0x20000); + spawnableActorList_add(&D_80392F40, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15 | ACTOR_FLAG_UNKNOWN_16); + spawnableActorList_add(&D_80392F64, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15 | ACTOR_FLAG_UNKNOWN_16); + spawnableActorList_add(&D_803932E8, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80393408, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_12 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80392F88, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80392FAC, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80392FD0, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80393018, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8039303C, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80393060, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_803931EC, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80393210, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80392EF8, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8039339C, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_803933C0, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80392DB4, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80392DD8, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80392DFC, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80392E20, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80392E44, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80392E68, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80392E8C, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_803930F0, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80393234, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80393258, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80392FF4, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8039327C, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_803932A0, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_803932C4, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8039315C, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80393180, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_803931A4, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_8039330C, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80393330, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80393114, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_80393138, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_803930CC, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_803931C8, actor_new, ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15 | ACTOR_FLAG_UNKNOWN_17); + spawnableActorList_add(&D_80393560, actor_new, ACTOR_FLAG_UNKNOWN_1 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_12 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80393584, actor_new, ACTOR_FLAG_UNKNOWN_1 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_803933E4, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80393378, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_803947B0, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_12 | ACTOR_FLAG_UNKNOWN_17 | ACTOR_FLAG_UNKNOWN_19); + spawnableActorList_add(&D_803947D4, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_12 | ACTOR_FLAG_UNKNOWN_17 | ACTOR_FLAG_UNKNOWN_19); + spawnableActorList_add(&chBrentilda, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_80394A80, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_80394AB0, actor_new, ACTOR_FLAG_UNKNOWN_2 | ACTOR_FLAG_UNKNOWN_6); + spawnableActorList_add(&D_80392EB0, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80393084, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80392ED4, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_803930A8, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_14 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80394870, actor_new, ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_80394894, actor_new, ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_803948B8, actor_new, ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&D_80394910, actor_new, ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_12); + spawnableActorList_add(&D_80394934, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_80394958, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_80392F1C, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&D_80394A08, 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_25); + spawnableActorList_add(&D_80394A2C, 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_25); + spawnableActorList_add(&D_80394A50, 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_25); + spawnableActorList_add(&D_80394980, actor_new, ACTOR_FLAG_UNKNOWN_7); + spawnableActorList_add(&D_80394C28, actor_new, ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_80394C4C, actor_new, ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_80394C70, actor_new, ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_80394D20, actor_new, ACTOR_FLAG_NONE); + spawnableActorList_add(&D_80394CF0, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_19); + spawnableActorList_add(&D_80394C94, actor_new, ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_10); + spawnableActorList_add(&D_80393354, actor_new, ACTOR_FLAG_UNKNOWN_1 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_15); + spawnableActorList_add(&lair_D_80392D90, actor_new, ACTOR_FLAG_UNKNOWN_17); } diff --git a/src/lair/code_9C40.c b/src/lair/code_9C40.c index d5a9d9bc..1bc77511 100644 --- a/src/lair/code_9C40.c +++ b/src/lair/code_9C40.c @@ -42,7 +42,7 @@ void lair_func_803900DC(ActorMarker *marker, enum asset_e text_id, s32 arg2){ void func_803900EC(ActorMarker *marker, enum asset_e text_id, s32 arg2){ s32 sp1C; - sp1C = marker->unk14_20 - 0x16D; + sp1C = marker->id - 0x16D; func_8028F918(0); if (!fileProgressFlag_get(sp1C + 0xAD)) { fileProgressFlag_set(sp1C + 0xAD, 1); @@ -52,7 +52,7 @@ void func_803900EC(ActorMarker *marker, enum asset_e text_id, s32 arg2){ s32 func_80390158(ActorMarker *marker, enum asset_e text_id, s32 arg2){ s32 phi_v1; - phi_v1 = marker->unk14_20 - 0x16D; + phi_v1 = marker->id - 0x16D; return phi_v1; } @@ -61,7 +61,7 @@ void func_80390174(ActorMarker *marker, s32 arg1) { s32 sp28; this = marker_getActor(marker); - sp28 = this->marker->unk14_20 - 0x16D; + sp28 = this->marker->id - 0x16D; func_8028F94C(2, this->position); if (fileProgressFlag_get(sp28 + 0xAD)) { func_80311480(sp28 + 0xF83, 0xE, this->position, this->marker, func_803900EC, lair_func_803900DC); @@ -88,7 +88,7 @@ void func_803902B8(Actor *this) { s32 sp54; s32 sp3C[6]; - sp54 = this->marker->unk14_20 - 0x16D; + sp54 = this->marker->id - 0x16D; if (!this->initialized) { marker_setFreeMethod(this->marker, func_80390298); this->unk138_24 = func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE); diff --git a/src/lair/code_A170.c b/src/lair/code_A170.c index 783cb3e8..1beb16a4 100644 --- a/src/lair/code_A170.c +++ b/src/lair/code_A170.c @@ -32,7 +32,7 @@ Actor *func_80390560(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){ } void func_803905CC(ActorMarker *marker, ActorMarker *other_marker){ - switch (marker->unk14_20) { + switch (marker->id) { case 0x170: item_setMaxCount(ITEM_D_EGGS); fxSparkle_giantBlueEgg(&marker->propPtr->x);