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

Some var renaming

Browse Source
This commit is contained in:
MaikelChan
2023-08-09 16:08:13 +02:00
parent 1c8579c6b5
commit bf45573eec
14 changed files with 164 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ ActorInfo D_803920E8 = { 0x204, 0x336, 0x442,
/* .code */
Actor *FP_func_8038CED0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *this = marker_getActor(marker);
if( func_8038BFA0() || fileProgressFlag_get(FILEPROG_13) ){
if( func_8038BFA0() || fileProgressFlag_get(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME) ){
if(0.0f == this->velocity[1])
return this;
}
@@ -240,7 +240,7 @@ void func_8038D51C(ActorMarker *marker){
Actor *this = marker_getActor(marker);
item_set(ITEM_6_HOURGLASS, FALSE);
fileProgressFlag_set(FILEPROG_13, TRUE);
fileProgressFlag_set(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME, TRUE);
FUNC_8030E624(SFX_416, 0.8f, 32000);
func_8028F8F8(7, 0);
this->unk1C[1] = 1.0f;
@@ -281,7 +281,7 @@ void func_8038D6C8(Actor *this){
sp24 = time_getDelta();
mapSpecificFlags_set(0xd, (this->state != 1 && this->state != 2) ? TRUE : FALSE);
if(func_8038BFA0() || fileProgressFlag_get(FILEPROG_13)){
if(func_8038BFA0() || fileProgressFlag_get(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME)){
this->marker->propPtr->unk8_3 = FALSE;
actor_collisionOff(this);
func_8028F8F8(7, FALSE);

2
src/FP/ch/twinklymuncher.c
View File

@@ -124,7 +124,7 @@ void func_8038E094(Actor *this){
if(this->unk100){
sp38 = marker_getActor(this->unk100);
if(sp38->unk1C[1] == 1.0f){
if(this->unkF4_8 == 1 && !fileProgressFlag_get(FILEPROG_13)){
if(this->unkF4_8 == 1 && !fileProgressFlag_get(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME)){
if(this->state != 6 && this->state != 7 && 0.0f == this->velocity[0]){
timed_setStaticCameraToNode(0.5f, 0xd);
func_80311480(ASSET_C15_TEXT_TWINKLIE_MINIGAME_LOST, 0x2b, this->position, this->marker, func_8038E040, NULL);

2
src/FP/ch/xmastreeswitch.c
View File

@@ -88,7 +88,7 @@ void func_8038E940(Actor *this){
switch(this->state){
case 1: //L8038EA98
if(fileProgressFlag_get(FILEPROG_13) && !mapSpecificFlags_get(2))
if(fileProgressFlag_get(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME) && !mapSpecificFlags_get(2))
func_8038E774(this);
break;
case 2: //L8038EAC8