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

Merge branch 'mr-origin-91'

Browse Source
This commit is contained in:
banjo.decomp
2024-10-08 02:13:18 -05:00
parent 3cd3b3e5da ee5d7e2fd8
commit 6fb4f2b3f1
25 changed files with 289 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/FP/ch/xmastree.c
View File

@@ -18,7 +18,7 @@ ActorInfo chXmasTree = {
Actor *chXmasTree_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *this = marker_getActor(marker);
func_8033A45C(5, this->unk38_31);
func_8033A45C(6, fileProgressFlag_get(0x13) && !func_8033A0F0(5));
func_8033A45C(6, fileProgressFlag_get(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME) && !func_8033A0F0(5));
return actor_draw(marker, gfx, mtx, vtx);
}
@@ -100,7 +100,7 @@ void chXmasTree_update(Actor *this){
}
__spawnQueue_add_0(__chXmasTree_spawnSwitch);
__spawnQueue_add_1((GenFunction_1)__chXmasTree_spawnStar, reinterpret_cast(s32, this->marker));
if(fileProgressFlag_get(0x13)){
if(fileProgressFlag_get(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME)){
__chXmasTree_80386F84(this);
mapSpecificFlags_set(2, FALSE);
}
@@ -116,7 +116,7 @@ void chXmasTree_update(Actor *this){
switch(this->state){
case 1: // L80387268
__chXmasTree_80386EF4(this, 0);
if(fileProgressFlag_get(0x13)){
if(fileProgressFlag_get(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME)){
__chXmasTree_80386F84(this);
}
break;