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

Merge branch 'mr-origin-70'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-13 20:37:54 -05:00
parent 50e1368ae1 062344a1fb
commit 351f4e9fea
192 changed files with 430 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BGS/ch/code_2270.c
View File

@@ -280,8 +280,8 @@ void func_80389080(Actor *this){
unqPtr = (ActorLocal_BGS_2270 *)&this->local;
sp3C = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->actorFreeFunc = func_80388FC0;
marker_setCollisionScripts(this->marker, func_80388E44, NULL, NULL);

4
src/BGS/ch/croctus.c
View File

@@ -109,12 +109,12 @@ void func_80387E68(ActorMarker *caller, enum asset_e text_id, s32 arg2){
void func_80387FD4(Actor *this){
int j;
if(!this->unk16C_4){
if(!this->volatile_initialized){
if(jiggyscore_isCollected(JIGGY_22_CROCTUS)){
marker_despawn(this->marker);
return;
}
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
if(bgs_D_803907B8[this->unkF4_8 - 1] == 0){
bgs_D_803907B8[this->unkF4_8 - 1] = this->marker;
for(j = this->unkF4_8; j < 6; j++){

4
src/BGS/ch/flibbit.c
View File

@@ -323,8 +323,8 @@ void chflibbit_update(Actor *this){
f32 sp58;
f32 sp4C[3];
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, BGS_func_80386E30, func_80386E70, func_80386EB0);
local->unk1C[0] = randf2(-2.0f, -1.0f);
local->unk1C[1] = randf2(-2.0f, -1.0f);

4
src/BGS/ch/frogminigame.c
View File

@@ -132,8 +132,8 @@ void chfrogminigame_update(Actor *this){
ActorLocal_BGS_6730 *local;
local = &this->bgs_6730;
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
local->unk0 = 0;
local->unk4 = 0;
local->unk8 = 0;

4
src/BGS/ch/mrvile.c
View File

@@ -337,8 +337,8 @@ void chvile_update(Actor *this) {
f32 random_position[3];
local = (ActorLocal_MrVile *)&this->local;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->marker->actorFreeFunc = chvile_free;
local->unk0 = 0;
local->unk4 = assetcache_get(0x3F6);

4
src/BGS/ch/tanktup.c
View File

@@ -114,9 +114,9 @@ void func_8038F6A4(Actor *this)
this->is_first_encounter = FALSE;
this->initialized = TRUE;
}
if (!this->unk16C_4)
if (!this->volatile_initialized)
{
this->unk16C_4 = 1;
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = 1;
actor_collisionOff(this);
this->scale = 1.0f;

4
src/BGS/ch/yellowflibbit.c
View File

@@ -348,8 +348,8 @@ void BGS_func_8038E034(Actor *this) {
f32 sp48[3];
sp9C = time_getDelta();
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, &func_8038DD9C, &func_8038DDDC, &func_8038DE1C);
local->unk2 = 0U;
local->unk20[0] = randf2(-2.0f, -1.0f);

4
src/BGS/ch/yumblie.c
View File

@@ -148,8 +148,8 @@ void chyumblie_update(Actor *this){
s0 = (ActorLocal_Yumblie *)&this->local;
sp4C = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
s0->unk0 = 0.0f;
s0->unk4 = 0;
s0->game_marker = NULL;

4
src/BGS/code_3030.c
View File

@@ -71,8 +71,8 @@ void func_80389668(Actor *this) {
Actor *tiptup;
local = (ActorLocal_BGS_3030 *)&this->local;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
marker_setCollisionScripts(this->marker, NULL, func_803895D0, NULL);
local->unk0 = 1;

4
src/BGS/code_3420.c
View File

@@ -624,8 +624,8 @@ void chvilegame_update(Actor *this) {
sp50 = time_getDelta();
local = (ActorLocal_BGS_3420 *)&this->local;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->marker->actorFreeFunc = &chvilegame_free;
local->game_pieces = vector_new(sizeof(struct vilegame_piece), 0x20);
local->grumblie_model_bin = assetcache_get(0x3F7);