From a3621217e0862cc7d8ac122bb5fc41c1c894a2c1 Mon Sep 17 00:00:00 2001 From: mike8699 Date: Wed, 8 Jan 2025 21:59:47 -0500 Subject: [PATCH] Decomp `AdventureFlags::Get_FlagsUnk_49` --- include/Save/AdventureFlags.hpp | 2 +- src/00_Core/Save/AdventureFlags.cpp | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/Save/AdventureFlags.hpp b/include/Save/AdventureFlags.hpp index 2a353075..5869a50b 100644 --- a/include/Save/AdventureFlags.hpp +++ b/include/Save/AdventureFlags.hpp @@ -99,7 +99,7 @@ class AdventureFlags : public SysObject { bool func_ov00_02097bcc(s32 param2); s32 func_ov00_02097c08(); bool Get_FlagsUnk_30_Flag(int index); - unk8 Get_FlagsUnk_49(int index); + u8 Get_FlagsUnk_49(s32 index); unk8 Get_FlagsUnk_48(int index); unk8 Get_FlagsUnk_4a(int index); unk16 Get_FlagsUnk_42(int index); diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp index 28e26d75..b13bb233 100644 --- a/src/00_Core/Save/AdventureFlags.cpp +++ b/src/00_Core/Save/AdventureFlags.cpp @@ -2,6 +2,7 @@ extern void func_ov000_020980f8(CutsceneHandler *cutsceneHandler); extern unk32 func_ov000_020980fc(CutsceneHandler *cutsceneHandler); +extern u8 data_ov000_020e3155[]; bool AdventureFlags::Exists() { return gAdventureFlags != NULL; @@ -40,7 +41,10 @@ bool AdventureFlags::Get_FlagsUnk_30_Flag(int index) { return this->Get(unk30); } -unk8 AdventureFlags::Get_FlagsUnk_49(int index) {} +u8 AdventureFlags::Get_FlagsUnk_49(s32 index) { + return data_ov000_020e3155[index * 0x4C]; +} + unk8 AdventureFlags::Get_FlagsUnk_48(int index) {} unk8 AdventureFlags::Get_FlagsUnk_4a(int index) {} unk16 AdventureFlags::Get_FlagsUnk_42(int index) {}