Merge branch 'mr-origin-91'

This commit is contained in:
banjo.decomp
2024-10-08 02:13:18 -05:00
25 changed files with 289 additions and 199 deletions

View File

@@ -255,7 +255,7 @@ void func_80388FC0(Actor *this){
ActorLocal_Tiptup *local;
local = (ActorLocal_Tiptup *)&this->local;
fileProgressFlag_setN(0, local->unkA, 2);
fileProgressFlag_setN(FILEPROG_0_TIPTUP_MINIGAME_PROGRESS, local->unkA, 2);
vector_free(local->unk4);
}
@@ -291,7 +291,7 @@ void chTiptup_update(Actor *this){
unqPtr->unk4 = vector_new(sizeof(Struct_BGS_2270_0s), 8);
unqPtr->unk8 = 0;
unqPtr->unk9 = 0;
unqPtr->unkA = fileProgressFlag_getN(0,2);
unqPtr->unkA = fileProgressFlag_getN(FILEPROG_0_TIPTUP_MINIGAME_PROGRESS, 2);
unqPtr->unkB = 0;
unqPtr->unkC = 0.0f;
if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){