Merge branch 'main' into decomp/MapManager

3 files changed, 242 insertions, 104 deletions

diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp
index 05e88182..aef0ec94 100644
--- a/src/00_Core/Item/ItemManager.cpp
+++ b/src/00_Core/Item/ItemManager.cpp
@@ -1,6 +1,8 @@
 #include "Item/ItemManager.hpp"

 #include "DTCM/UnkStruct_027e0d38.hpp"

 #include "DTCM/UnkStruct_027e0f78.hpp"

+#include "DTCM/UnkStruct_027e103c.hpp"

+#include "Item/ItemModelLoader.hpp"

 #include "Map/MapManager.hpp"

 #include "Player/PlayerLinkBase.hpp"

 #include "Player/PlayerManager.hpp"

@@ -158,17 +160,15 @@ ARM ItemModel *ItemManager::GetItemModel(ItemModelId id) {
     return mItemModels[id];

 }

 

-extern unk32 gItemModelLoader;

-extern "C" void *func_ov00_020bb3a8(unk32 param1, u32 index);

-extern "C" void func_ov00_020c0bdc(void *param1, unk32 param2);

+extern "C" void func_ov000_020c0bdc(unk32 param1, unk32 param2);

 ARM void ItemManager::func_ov00_020ad538(unk32 param1) const {

-    void *unk1 = func_ov00_020bb3a8(gItemModelLoader, 6);

-    func_ov00_020c0bdc(unk1, param1);

+    unk32 unk1 = gItemModelLoader->func_ov000_020bb3a8(6);

+    func_ov000_020c0bdc(unk1, param1);

 }

 

 ARM void ItemManager::func_ov00_020ad560(unk32 param1) const {

-    void *unk1 = func_ov00_020bb3a8(gItemModelLoader, 7);

-    func_ov00_020c0bdc(unk1, param1);

+    unk32 unk1 = gItemModelLoader->func_ov000_020bb3a8(7);

+    func_ov000_020c0bdc(unk1, param1);

 }

 

 ARM ItemModel *ItemManager::GetDungeonItemModel(u32 index) {

@@ -176,8 +176,8 @@ ARM ItemModel *ItemManager::GetDungeonItemModel(u32 index) {
 }

 

 ARM void ItemManager::func_ov00_020ad594(unk32 param1) const {

-    void *unk1 = func_ov00_020bb3a8(gItemModelLoader, 11);

-    func_ov00_020c0bdc(unk1, param1);

+    unk32 unk1 = gItemModelLoader->func_ov000_020bb3a8(11);

+    func_ov000_020c0bdc(unk1, param1);

 }

 

 ARM void ItemManager::Sword_vfunc_38(unk32 param1) {

@@ -237,19 +237,17 @@ ARM void ItemManager::GiveAmmo(ItemFlag equipId, u16 amount) {
     (*mAmmo)[equipId] = this->GetMaxAmmo(equipId);

 }

 

-extern "C" unk32 func_ov00_02078b40(UnkStruct_027e0d38 *param1);

 extern void *data_027e10a4;

-extern "C" bool func_ov15_02136670(void *param1);

-extern unk8 data_ov29_0217a4ac[];

+extern "C" bool func_ov015_02136670(void *param1);

+extern u8 data_ov022_0217a4ac[];

 extern "C" bool _ZN14PlayerLinkBase18func_ov00_020bbd80Ei(unk32 param1, unk32 param2);

 extern "C" bool _ZNK11ItemManager7HasItemEi();

 extern "C" void _ZN11ItemManager12GetEquipItemEi();

 ARM bool ItemManager::func_ov00_020ad790(unk32 param1) {

-    unk32 unk1 = func_ov00_02078b40(data_027e0d38);

-    if (unk1 == 2) return func_ov15_02136670(data_027e10a4);

+    unk32 unk1 = data_027e0d38->func_ov000_02078b40();

+    if (unk1 == 2) return func_ov015_02136670(data_027e10a4);

     if (data_027e0d38->mUnk_14 == 1) return false;

-    // NONMATCH: OverlayId_29 should be in constant pool

-    if (gOverlayManager.mLoadedOverlays[OverlayIndex_6] == OverlayId_29 && data_ov29_0217a4ac[0x54] != 0) {

+    if (gOverlayManager.mLoadedOverlays[OverlayIndex_6] == OverlayId_29 && data_ov022_0217a4ac[0x54] != 0) {

         return false;

     }

 

@@ -320,7 +318,7 @@ THUMB void ItemManager::SetUnk_09e(u32 index, u16 value) {
 }

 

 const u16 sQuiverSizes[]  = {20, 20, 30, 50};

-const u16 sBombBagSizes[] = {10, 20, 30};

+const u16 sBombBagSizes[] = {10, 20, 30, 0};

 

 THUMB u16 ItemManager::GetMaxAmmo(ItemFlag equipId) const {

     switch (equipId) {

@@ -379,8 +377,8 @@ THUMB void ItemManager::RemoveItem(ItemFlag item) {
 

 extern ItemModel **data_027e1058;

 extern ItemModel **data_027e105c;

-extern "C" ItemModel *func_ov00_02079ffc(void *, const char *modelName, const char *textureName, unk32 param4, unk8 param5,

-                                         unk8 param6, bool param7);

+extern "C" ItemModel *LoadNsbTexturedModel(void *, const char *modelName, const char *textureName, unk32 param4, unk8 param5,

+                                           unk8 param6, bool param7);

 extern "C" ItemModel *LoadTreasureItemFanfare(ItemModel **, s32 treasureType, bool, bool);

 static char *sDefaultItemModel   = "key";

 static char *sItemModelNames[70] = {

@@ -391,47 +389,47 @@ static char *sItemModelNames[70] = {
     [ItemId_WoodenShield]      = "shA",

     [ItemId_Unk_5]             = NULL,

     [ItemId_Unk_6]             = "force_y",

-    [ItemId_BombBag]           = "bomb\0\0\0",

+    [ItemId_BombBag]           = "bomb",

     [ItemId_Bow]               = "bow",

     [ItemId_BigGreenRupee]     = "rupee_g",

-    [ItemId_HeartContainer]    = "heart_utu\0\0",

+    [ItemId_HeartContainer]    = "heart_utu",

     [ItemId_Unk_11]            = NULL,

-    [ItemId_Boomerang]         = "boomerang\0\0",

+    [ItemId_Boomerang]         = "boomerang",

     [ItemId_Scoop]             = "scp",

-    [ItemId_BombchuBag]        = "bomchu\0",

+    [ItemId_BombchuBag]        = "bomchu",

     [ItemId_BossKey]           = "bosskey",

     [ItemId_Unk_16]            = "rev_bin",

     [ItemId_Unk_17]            = NULL,

     [ItemId_PhantomHourglass]  = NULL,

-    [ItemId_SWSeaChart]        = "mapSea\0",

-    [ItemId_NWSeaChart]        = "mapSea\0",

-    [ItemId_SESeaChart]        = "mapSea\0",

-    [ItemId_NESeaChart]        = "mapSea\0",

+    [ItemId_SWSeaChart]        = "mapSea",

+    [ItemId_NWSeaChart]        = "mapSea",

+    [ItemId_SESeaChart]        = "mapSea",

+    [ItemId_NESeaChart]        = "mapSea",

     [ItemId_Unk_23]            = NULL,

     [ItemId_BlueRupee]         = "rupee_b",

     [ItemId_RedRupee]          = "rupee_r",

     [ItemId_BigRedRupee]       = "rupee_r",

-    [ItemId_GoldRupee]         = "rupee_go\0\0\0",

+    [ItemId_GoldRupee]         = "rupee_go",

     [ItemId_Unk_28]            = "force_y",

     [ItemId_Unk_29]            = "force_r",

     [ItemId_Unk_30]            = "force_b",

     [ItemId_Hammer]            = "ham",

-    [ItemId_Rope]              = "rope\0\0\0",

-    [ItemId_SquareCrystal]     = "cstl_c\0",

-    [ItemId_RoundCrystal]      = "cstl_s\0",

-    [ItemId_TriangleCrystal]   = "cstl_t\0",

-    [ItemId_FishingRod]        = "fp\0",

+    [ItemId_Rope]              = "rope",

+    [ItemId_SquareCrystal]     = "cstl_c",

+    [ItemId_RoundCrystal]      = "cstl_s",

+    [ItemId_TriangleCrystal]   = "cstl_t",

+    [ItemId_FishingRod]        = "fp",

     [ItemId_Cannon]            = NULL,

-    [ItemId_SunKey]            = "key_su\0",

+    [ItemId_SunKey]            = "key_su",

     [ItemId_Unk_39]            = NULL,

-    [ItemId_Quiver]            = "arrowpod\0\0\0",

-    [ItemId_BigBombBag]        = "bmbagM\0",

-    [ItemId_BigBombchuBag]     = "bcbagM\0",

+    [ItemId_Quiver]            = "arrowpod",

+    [ItemId_BigBombBag]        = "bmbagM",

+    [ItemId_BigBombchuBag]     = "bcbagM",

     [ItemId_Unk_43]            = NULL,

-    [ItemId_KingsKey]          = "key_ki\0",

-    [ItemId_PowerGem]          = "minaP\0\0",

-    [ItemId_WisdomGem]         = "minaC\0\0",

-    [ItemId_CourageGem]        = "minaY\0\0",

+    [ItemId_KingsKey]          = "key_ki",

+    [ItemId_PowerGem]          = "minaP",

+    [ItemId_WisdomGem]         = "minaC",

+    [ItemId_CourageGem]        = "minaY",

     [ItemId_PinkCoral]         = NULL,

     [ItemId_WhitePearlLoop]    = NULL,

     [ItemId_DarkPearlLoop]     = NULL,

@@ -440,44 +438,40 @@ static char *sItemModelNames[70] = {
     [ItemId_RutoCrown]         = NULL,

     [ItemId_HelmarocPlume]     = NULL,

     [ItemId_RegalRing]         = NULL,

-    [ItemId_GhostKey]          = "key_gh\0",

-    [ItemId_FreebieCard]       = "tic_tada\0\0\0",

-    [ItemId_ComplimentCard]    = "tic_ohome\0\0",

-    [ItemId_ComplimentaryCard] = "tic_rare\0\0\0",

-    [ItemId_RegalNecklace]     = "neckl\0\0",

-    [ItemId_SalvageArm]        = "slvarm\0",

+    [ItemId_GhostKey]          = "key_gh",

+    [ItemId_FreebieCard]       = "tic_tada",

+    [ItemId_ComplimentCard]    = "tic_ohome",

+    [ItemId_ComplimentaryCard] = "tic_rare",

+    [ItemId_RegalNecklace]     = "neckl",

+    [ItemId_SalvageArm]        = "slvarm",

     [ItemId_HerosNewClothes]   = NULL,

-    [ItemId_Kaleidoscope]      = "telescope\0\0",

-    [ItemId_GuardNotebook]     = "notebook\0\0\0",

-    [ItemId_JolenesLetter]     = "letter\0",

-    [ItemId_PrizePostcard]     = "card\0\0\0",

-    [ItemId_WoodHeart]         = "marron\0",

+    [ItemId_Kaleidoscope]      = "telescope",

+    [ItemId_GuardNotebook]     = "notebook",

+    [ItemId_JolenesLetter]     = "letter",

+    [ItemId_PrizePostcard]     = "card",

+    [ItemId_WoodHeart]         = "marron",

     [ItemId_PhantomSwordBlade] = "swBedge",

     [ItemId_PhantomSword]      = NULL,

 };

 static char *sItemModelNames2[8] = {

-    [ItemId_SwordsmanScroll - ItemId_SwordsmanScroll] = "makimono\0\0\0",

-    [ItemId_Crimsonine - ItemId_SwordsmanScroll]      = "hagaH\0\0",

-    [ItemId_Azurine - ItemId_SwordsmanScroll]         = "hagaK\0\0",

-    [ItemId_Aquanine - ItemId_SwordsmanScroll]        = "hagaS\0\0",

+    [ItemId_SwordsmanScroll - ItemId_SwordsmanScroll] = "makimono",

+    [ItemId_Crimsonine - ItemId_SwordsmanScroll]      = "hagaH",

+    [ItemId_Azurine - ItemId_SwordsmanScroll]         = "hagaK",

+    [ItemId_Aquanine - ItemId_SwordsmanScroll]        = "hagaS",

     [ItemId_RedPotion - ItemId_SwordsmanScroll]       = "rev_bin",

-    [ItemId_PurplePotion - ItemId_SwordsmanScroll]    = "rev_binP\0\0\0",

-    [ItemId_YellowPotion - ItemId_SwordsmanScroll]    = "rev_binY\0\0\0",

-    [ItemId_SandOfHours - ItemId_SwordsmanScroll]     = "sand_m\0",

+    [ItemId_PurplePotion - ItemId_SwordsmanScroll]    = "rev_binP",

+    [ItemId_YellowPotion - ItemId_SwordsmanScroll]    = "rev_binY",

+    [ItemId_SandOfHours - ItemId_SwordsmanScroll]     = "sand_m",

 };

 static char *sItemModelNames3[9] = {

-    [ItemId_CycloneSlate - ItemId_CycloneSlate] = "compass",

-    [ItemId_Unk_128 - ItemId_CycloneSlate]      = "lure\0\0\0",

-    [ItemId_Rupoor10 - ItemId_CycloneSlate]     = "rupee_bb\0\0\0",

-    [ItemId_Rupoor50 - ItemId_CycloneSlate]     = "rupee_bb\0\0\0",

-    [ItemId_Unk_131 - ItemId_CycloneSlate]      = NULL,

-    [ItemId_Unk_132 - ItemId_CycloneSlate]      = NULL,

-    [ItemId_Unk_133 - ItemId_CycloneSlate]      = NULL,

-    [ItemId_Unk_134 - ItemId_CycloneSlate]      = NULL,

-    [ItemId_Unk_135 - ItemId_CycloneSlate]      = NULL,

+    [ItemId_CycloneSlate - ItemId_CycloneSlate] = "compass", [ItemId_Unk_128 - ItemId_CycloneSlate] = "lure",

+    [ItemId_Rupoor10 - ItemId_CycloneSlate] = "rupee_bb",    [ItemId_Rupoor50 - ItemId_CycloneSlate] = "rupee_bb",

+    [ItemId_Unk_131 - ItemId_CycloneSlate] = NULL,           [ItemId_Unk_132 - ItemId_CycloneSlate] = NULL,

+    [ItemId_Unk_133 - ItemId_CycloneSlate] = NULL,           [ItemId_Unk_134 - ItemId_CycloneSlate] = NULL,

+    [ItemId_Unk_135 - ItemId_CycloneSlate] = NULL,

 };

 char *sSpecialItemModelNames[7] = {

-    "mapTakara\0\0", "arrowpodL\0\0", "bmbagL\0", "bcbagL\0", "Player/get/gd_\0", ".nsbmd\0", ".nsbtx\0",

+    "mapTakara", "arrowpodL", "bmbagL", "bcbagL", "Player/get/gd_", ".nsbmd", ".nsbtx",

 };

 THUMB void ItemManager::LoadFanfareItem(ItemId id) {

     mFanfareItem = id;

@@ -521,7 +515,7 @@ THUMB void ItemManager::LoadFanfareItem(ItemId id) {
         strcat(textureName, sSpecialItemModelNames[4]);

         strcat(textureName, itemName);

         strcat(textureName, sSpecialItemModelNames[6]);

-        model = func_ov00_02079ffc(mFanfareItemModel, modelName, textureName, 0, 0, 0, true);

+        model = LoadNsbTexturedModel(mFanfareItemModel, modelName, textureName, 0, 0, 0, true);

     }

     mUnk_114->vfunc_0c(model);

 }

@@ -841,9 +835,6 @@ ARM s32 ItemManager::GetMaxRupees() const {
     return 9999;

 }

 

-extern void *data_027e103c;

-extern "C" s32 func_ov00_020cf374(void *param1, bool param2);

-extern "C" void func_ov05_02104004(void *param1);

 ARM void ItemManager::GiveRupees(s32 amount, bool param2) {

     s32 newRupees = mNumRupees + amount;

     if (newRupees > this->GetMaxRupees()) {

@@ -852,11 +843,11 @@ ARM void ItemManager::GiveRupees(s32 amount, bool param2) {
         newRupees = 0;

     }

 

-    s32 currRupees = func_ov00_020cf374(data_027e103c, true);

+    s32 currRupees = data_027e103c->func_ov000_020cf374(true);

     if (param2) {

         currRupees = mNumRupees;

         if (currRupees != newRupees) {

-            func_ov05_02104004(data_027e103c);

+            data_027e103c->WalletFull();

         }

     }

     mNumRupees = newRupees;

@@ -994,7 +985,7 @@ THUMB void ItemManager::LoadDungeonItemModels() {
     }

 }

 

-extern unk32 data_ov00_020eec68;

+extern unk32 data_ov000_020eec68;

 extern "C" void PlaySoundEffect(void *param1, SfxId sfx);

 THUMB void ItemManager::PlayItemFanfareSfx(ItemId item) {

     if (gItemManager->mMuteNextFanfare == true) {

@@ -1043,7 +1034,7 @@ THUMB void ItemManager::PlayItemFanfareSfx(ItemId item) {
 

         gItemManager->mFanfareSfx = SfxId_None;

     }

-    PlaySoundEffect(&data_ov00_020eec68, sfx);

+    PlaySoundEffect(&data_ov000_020eec68, sfx);

 }

 

 THUMB bool ItemManager::HasShipPartPriceShown(ShipPart part, ShipType type) const {

diff --git a/src/00_Core/Player/LinkStateMove.cpp b/src/00_Core/Player/LinkStateMove.cpp
index 918a92fe..889b3743 100644
--- a/src/00_Core/Player/LinkStateMove.cpp
+++ b/src/00_Core/Player/LinkStateMove.cpp
@@ -1,10 +1,71 @@
 #include "Player/LinkStateMove.hpp"
 
-void LinkStateMove::vfunc_00() {}
-LinkStateId LinkStateMove::GetId() {}
-void LinkStateMove::CreateDebugHierarchy() {}
-void LinkStateMove::OnStateEnter() {}
-void LinkStateMove::OnStateLeave(s32 param1) {}
-bool LinkStateMove::vfunc_24(s32 param1) {}
-bool LinkStateMove::func_ov00_020a8f2c() {}
-bool LinkStateMove::func_ov00_020a8f4c() {}
+unk32 data_ov000_020e56f0 = 0x800;
+
+THUMB void LinkStateMove::vfunc_00() {}
+
+ARM LinkStateId LinkStateMove::GetId() {
+    return LinkStateId_Move;
+}
+
+THUMB void LinkStateMove::CreateDebugHierarchy() {
+    unk32 id = 'LMOV';
+    // Breath volume decay rate "息吹きボリューム低下率"
+    const char *description = "\x91\xa7\x90\x81\x82\xab\x83{\x83\x8a\x83\x85\x81[\x83\x80\x92\xe1\x89\xba\x97\xa6";
+
+    DebugHierarchy *debugHierarchy = this->GetDebugHierarchy0();
+    debugHierarchy->vfunc_3c(id, &data_ov000_020e56f0);
+
+    debugHierarchy->GetChildNode(1, description, id, &data_ov000_020e56f0, 8, 0, 0x1000, 0);
+}
+
+extern u32 data_ov000_020eec9c;
+extern "C" void func_ov000_020d77e4(void *param1, s32 param2);
+
+ARM void LinkStateMove::OnStateEnter() {
+    this->mUnk_0c = 0;
+    this->mUnk_10 = 0;
+    this->mUnk_12 = 0;
+    if (this->mUnk_14 == 0) {
+        return;
+    }
+
+    EquipItem *sword = this->GetEquipItem(ItemFlag_OshusSword);
+    sword->UpdateInUse(1);
+    EquipItem *shield = this->GetEquipItem(ItemFlag_WoodenShield);
+    shield->UpdateInUse(1);
+
+    PlayerBase::GetEquipSword()->func_ov000_020c06b0(-1);
+    func_ov000_020d77e4(&data_ov000_020eec9c, 0xD);
+}
+
+ARM void LinkStateMove::OnStateLeave(s32 param1) {
+    LinkStateBase::OnStateLeave(param1);
+    this->mUnk_14 = 0;
+    this->mUnk_15 = 0;
+    this->mUnk_16 = 0;
+}
+
+ARM bool LinkStateMove::vfunc_24(s32 param1) {
+    if (this->GetHealth() > 0) {
+        return LinkStateBase::vfunc_24(param1);
+    }
+    switch (param1) {
+        case 2: return true;
+        default: return false;
+    }
+}
+
+ARM bool LinkStateMove::func_ov00_020a8f2c() {
+    static unk32 data_ov000_020e56f4 = 0x100;
+    return this->mUnk_0c > data_ov000_020e56f4;
+}
+
+ARM bool LinkStateMove::func_ov00_020a8f4c() {
+    if (this->mUnk_15) {
+        return false;
+    }
+    this->mUnk_15 = true;
+    this->mUnk_16 = false;
+    return true;
+}
diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp
index 7ba5f7c6..012e9efa 100644
--- a/src/00_Core/Save/AdventureFlags.cpp
+++ b/src/00_Core/Save/AdventureFlags.cpp
@@ -1,9 +1,34 @@
 #include "Save/AdventureFlags.hpp"
+#include "Cutscene/CutsceneHandler.hpp"
+
+extern void func_ov000_020980f8(CutsceneHandler *cutsceneHandler);
+extern unk32 func_ov000_020980fc(CutsceneHandler *cutsceneHandler);
+extern bool func_ov000_02098114(CutsceneHandler *cutsceneHandler);
+extern u8 data_ov000_020e310c[];
+extern u8 data_ov000_020e313c[];
+extern u8 data_ov000_020e3140[];
+extern u8 data_ov000_020e3144[];
+extern u8 data_ov000_020e314c[];
+extern u8 data_ov000_020e314e[];
+extern u8 data_ov000_020e3150[];
+extern u8 data_ov000_020e3154[];
+extern u8 data_ov000_020e3155[];
+extern u8 data_ov000_020e3156[];
+
+bool AdventureFlags::Exists() {
+    return gAdventureFlags != NULL;
+}
 
-bool AdventureFlags::Exists() {}
 void AdventureFlags::CopyTo(unk32 *flags) {}
-void AdventureFlags::func_ov00_02097674() {}
-s32 AdventureFlags::func_ov00_02097684() {}
+
+void AdventureFlags::func_ov00_02097674() {
+    func_ov000_020980f8(this->mCutsceneHandler);
+}
+
+s32 AdventureFlags::func_ov00_02097684() {
+    return func_ov000_020980fc(this->mCutsceneHandler);
+}
+
 void AdventureFlags::Load() {}
 void AdventureFlags::func_ov00_020976c8() {}
 void AdventureFlags::func_ov00_02097700() {}
@@ -20,22 +45,83 @@ bool AdventureFlags::func_ov00_02097bbc() {}
 bool AdventureFlags::func_ov00_02097bcc() {}
 bool AdventureFlags::func_ov00_02097bcc(s32 param2) {}
 s32 AdventureFlags::func_ov00_02097c08() {}
-bool AdventureFlags::Get_FlagsUnk_30_Flag(int index) {}
-unk8 AdventureFlags::Get_FlagsUnk_49(int index) {}
-unk8 AdventureFlags::Get_FlagsUnk_48(int index) {}
-unk8 AdventureFlags::Get_FlagsUnk_4a(int index) {}
-unk16 AdventureFlags::Get_FlagsUnk_42(int index) {}
-unk16 AdventureFlags::Get_FlagsUnk_40(int index) {}
-unk32 AdventureFlags::Get_FlagsUnk_38(int index) {}
-unk32 AdventureFlags::Get_FlagsUnk_34(int index) {}
-unk32 AdventureFlags::Get_FlagsUnk_44(int index) {}
-unk32 AdventureFlags::Get_FlagsUnk_30(int index) {}
-bool AdventureFlags::Get_FlagsUnk_00(int index, FlagsUnk2 *result) {}
-bool AdventureFlags::Get_FlagsUnk_18(int index, FlagsUnk2 *result) {}
-FlagsUnk *AdventureFlags::Get_FlagsUnk(int index) {}
-bool AdventureFlags::func_ov00_02097e6c() {}
-bool AdventureFlags::func_ov00_02097e7c() {}
-bool AdventureFlags::func_ov00_02097ea4() {}
+
+bool AdventureFlags::Get_FlagsUnk_30_Flag(s32 index) {
+    unk32 unk30 = this->Get_FlagsUnk_30(index);
+
+    return this->Get(unk30);
+}
+
+u8 AdventureFlags::Get_FlagsUnk_49(s32 index) {
+    return data_ov000_020e3155[index * 0x4C];
+}
+
+u8 AdventureFlags::Get_FlagsUnk_48(s32 index) {
+    return data_ov000_020e3154[index * 0x4C];
+}
+
+u8 AdventureFlags::Get_FlagsUnk_4a(s32 index) {
+    return data_ov000_020e3156[index * 0x4C];
+}
+
+u16 AdventureFlags::Get_FlagsUnk_42(s32 index) {
+    return *(u16 *) (data_ov000_020e314e + index * 0x4C);
+}
+
+u16 AdventureFlags::Get_FlagsUnk_40(s32 index) {
+    return *(unk16 *) (data_ov000_020e314c + index * 0x4C);
+}
+
+unk32 AdventureFlags::Get_FlagsUnk_38(s32 index) {
+    return *(unk32 *) (data_ov000_020e3144 + index * 0x4C);
+}
+
+unk32 AdventureFlags::Get_FlagsUnk_34(s32 index) {
+    return *(unk32 *) (data_ov000_020e3140 + index * 0x4C);
+}
+
+unk32 AdventureFlags::Get_FlagsUnk_44(s32 index) {
+    return *(unk32 *) (data_ov000_020e3150 + index * 0x4C);
+}
+
+unk32 AdventureFlags::Get_FlagsUnk_30(s32 index) {
+    return *(unk32 *) (data_ov000_020e313c + index * 0x4C);
+}
+
+bool AdventureFlags::Get_FlagsUnk_00(s32 index, FlagsUnk2 *result) {}
+bool AdventureFlags::Get_FlagsUnk_18(s32 index, FlagsUnk2 *result) {}
+
+FlagsUnk *AdventureFlags::Get_FlagsUnk(s32 index) {
+    return (FlagsUnk *) (data_ov000_020e310c + index * 0x4C);
+}
+
+bool AdventureFlags::func_ov00_02097e6c() {
+    return func_ov000_02098114(this->mCutsceneHandler);
+}
+
+bool AdventureFlags::func_ov00_02097e7c() {
+    bool bVar1;
+
+    bVar1 = this->func_ov00_02097e6c();
+    if (bVar1) {
+        bVar1 = this->mCutsceneHandler->SkipCutscene(0);
+        return bVar1;
+    }
+
+    return false;
+}
+
+bool AdventureFlags::func_ov00_02097ea4() {
+    bool bVar1;
+
+    bVar1 = this->func_ov00_02097e6c();
+    if (bVar1) {
+        bVar1 = this->mCutsceneHandler->SkipCutscene(1);
+        return bVar1;
+    }
+
+    return false;
+}
 unk32 AdventureFlags::func_ov00_02097ecc() {}
 void *AdventureFlags::func_ov00_02097f8c() {}
 void *AdventureFlags::func_ov00_02097fac() {}