Decompile more of `AdventureFlags.cpp` (#118)

* fix flags getters and associated relocs

* explicit ARM and improve existing matches

* match CopyTo

* document a bit the flag system and progress on unmatched functions

* remaining bottom functions

* func_ov00_02097810 params and name fix

* fix build issues

* move flag base definition to its own file

* document item flags

---------

Co-authored-by: Yanis002 <Yanis002@users.noreply.github.com>
Co-authored-by: Aetias <aetias@outlook.com>

4 files changed, 84 insertions, 84 deletions

diff --git a/config/eur/arm9/overlays/ov000/relocs.txt b/config/eur/arm9/overlays/ov000/relocs.txt
index d93b2567..ed1624b9 100644
--- a/config/eur/arm9/overlays/ov000/relocs.txt
+++ b/config/eur/arm9/overlays/ov000/relocs.txt
@@ -3113,33 +3113,33 @@ from:0x02097c00 kind:arm_call to:0x020990a4 module:overlay(0)
 from:0x02097c14 kind:load to:0x0209907c module:overlay(0)
 from:0x02097c24 kind:arm_call to:0x02097cf8 module:overlay(0)
 from:0x02097c30 kind:arm_call to:0x02097760 module:overlay(0)
-from:0x02097c4c kind:load to:0x020e3155 module:overlay(0)
-from:0x02097c64 kind:load to:0x020e3154 module:overlay(0)
-from:0x02097c7c kind:load to:0x020e3156 module:overlay(0)
-from:0x02097c94 kind:load to:0x020e314e module:overlay(0)
-from:0x02097cac kind:load to:0x020e314c module:overlay(0)
-from:0x02097cc4 kind:load to:0x020e3144 module:overlay(0)
-from:0x02097cdc kind:load to:0x020e3140 module:overlay(0)
-from:0x02097cf4 kind:load to:0x020e3150 module:overlay(0)
-from:0x02097d0c kind:load to:0x020e313c module:overlay(0)
+from:0x02097c4c kind:load to:0x020e310c add:0x49 module:overlay(0)
+from:0x02097c64 kind:load to:0x020e310c add:0x48 module:overlay(0)
+from:0x02097c7c kind:load to:0x020e310c add:0x4a module:overlay(0)
+from:0x02097c94 kind:load to:0x020e310c add:0x42 module:overlay(0)
+from:0x02097cac kind:load to:0x020e310c add:0x40 module:overlay(0)
+from:0x02097cc4 kind:load to:0x020e310c add:0x38 module:overlay(0)
+from:0x02097cdc kind:load to:0x020e310c add:0x34 module:overlay(0)
+from:0x02097cf4 kind:load to:0x020e310c add:0x44 module:overlay(0)
+from:0x02097d0c kind:load to:0x020e310c add:0x30 module:overlay(0)
 from:0x02097d90 kind:load to:0x020e310c module:overlay(0)
-from:0x02097d94 kind:load to:0x020e3110 module:overlay(0)
-from:0x02097d98 kind:load to:0x020e3114 module:overlay(0)
-from:0x02097d9c kind:load to:0x020e3118 module:overlay(0)
-from:0x02097da0 kind:load to:0x020e311c module:overlay(0)
-from:0x02097da4 kind:load to:0x020e311e module:overlay(0)
-from:0x02097da8 kind:load to:0x020e311f module:overlay(0)
-from:0x02097dac kind:load to:0x020e3120 module:overlay(0)
-from:0x02097db0 kind:load to:0x020e3121 module:overlay(0)
-from:0x02097e34 kind:load to:0x020e3124 module:overlay(0)
-from:0x02097e38 kind:load to:0x020e3128 module:overlay(0)
-from:0x02097e3c kind:load to:0x020e312c module:overlay(0)
-from:0x02097e40 kind:load to:0x020e3130 module:overlay(0)
-from:0x02097e44 kind:load to:0x020e3134 module:overlay(0)
-from:0x02097e48 kind:load to:0x020e3136 module:overlay(0)
-from:0x02097e4c kind:load to:0x020e3137 module:overlay(0)
-from:0x02097e50 kind:load to:0x020e3138 module:overlay(0)
-from:0x02097e54 kind:load to:0x020e3139 module:overlay(0)
+from:0x02097d94 kind:load to:0x020e310c add:0x04 module:overlay(0)
+from:0x02097d98 kind:load to:0x020e310c add:0x08 module:overlay(0)
+from:0x02097d9c kind:load to:0x020e310c add:0x0c module:overlay(0)
+from:0x02097da0 kind:load to:0x020e310c add:0x10 module:overlay(0)
+from:0x02097da4 kind:load to:0x020e310c add:0x12 module:overlay(0)
+from:0x02097da8 kind:load to:0x020e310c add:0x13 module:overlay(0)
+from:0x02097dac kind:load to:0x020e310c add:0x14 module:overlay(0)
+from:0x02097db0 kind:load to:0x020e310c add:0x15 module:overlay(0)
+from:0x02097e34 kind:load to:0x020e310c add:0x18 module:overlay(0)
+from:0x02097e38 kind:load to:0x020e310c add:0x1c module:overlay(0)
+from:0x02097e3c kind:load to:0x020e310c add:0x20 module:overlay(0)
+from:0x02097e40 kind:load to:0x020e310c add:0x24 module:overlay(0)
+from:0x02097e44 kind:load to:0x020e310c add:0x28 module:overlay(0)
+from:0x02097e48 kind:load to:0x020e310c add:0x2a module:overlay(0)
+from:0x02097e4c kind:load to:0x020e310c add:0x2b module:overlay(0)
+from:0x02097e50 kind:load to:0x020e310c add:0x2c module:overlay(0)
+from:0x02097e54 kind:load to:0x020e310c add:0x2d module:overlay(0)
 from:0x02097e68 kind:load to:0x020e310c module:overlay(0)
 from:0x02097e78 kind:load to:0x02098114 module:overlay(0)
 from:0x02097e84 kind:arm_call to:0x02097e6c module:overlay(0)
diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt
index 63cd6cb6..b7b90036 100644
--- a/config/eur/arm9/overlays/ov000/symbols.txt
+++ b/config/eur/arm9/overlays/ov000/symbols.txt
@@ -201,8 +201,8 @@ func_ov000_0207b1fc kind:function(thumb,size=0x7c) addr:0x0207b1fc
 func_ov000_0207b278 kind:function(thumb,size=0x10) addr:0x0207b278
 _ZN15Struct_027e0db019func_ov000_0207b288Ei kind:function(thumb,size=0x3c) addr:0x0207b288
 func_ov000_0207b2c4 kind:function(thumb,size=0x2c) addr:0x0207b2c4
-func_ov000_0207b2f0 kind:function(thumb,size=0x44) addr:0x0207b2f0
-func_ov000_0207b334 kind:function(thumb,size=0x44) addr:0x0207b334
+_ZN15Struct_027e0db019func_ov000_0207b2f0Eib kind:function(thumb,size=0x44) addr:0x0207b2f0
+_ZN15Struct_027e0db019func_ov000_0207b334Ei kind:function(thumb,size=0x44) addr:0x0207b334
 _ZN15Struct_027e0db019func_ov000_0207b378Ei kind:function(arm,size=0xc4) addr:0x0207b378
 _ZN15Struct_027e0db019func_ov000_0207b43cEv kind:function(arm,size=0xf4) addr:0x0207b43c
 func_ov000_0207b530 kind:function(thumb,size=0x2c) addr:0x0207b530
@@ -1275,7 +1275,7 @@ _ZN7MapData8GetFlag3Ej kind:function(arm,size=0x20) addr:0x0209759c
 _ZN7MapData8SetFlag4Ejb kind:function(arm,size=0x4c) addr:0x020975bc
 _ZN7MapData8GetFlag4Ej kind:function(arm,size=0x20) addr:0x02097608
 _ZN14AdventureFlags6ExistsEv kind:function(arm,size=0x1c) addr:0x02097628
-_ZN14AdventureFlags6CopyToEPi kind:function(arm,size=0x30) addr:0x02097644
+_ZN14AdventureFlags6CopyToEP9FlagsData kind:function(arm,size=0x30) addr:0x02097644
 _ZN14AdventureFlags18func_ov00_02097674Ev kind:function(arm,size=0x10) addr:0x02097674
 _ZN14AdventureFlags18func_ov00_02097684Ev kind:function(arm,size=0x10) addr:0x02097684
 _ZN14AdventureFlags4LoadEv kind:function(arm,size=0x34) addr:0x02097694
@@ -1285,14 +1285,14 @@ _ZN14AdventureFlags18func_ov00_02097738Ev kind:function(arm,size=0x18) addr:0x02
 _ZN14AdventureFlags18func_ov00_02097750Ev kind:function(arm,size=0x10) addr:0x02097750
 _ZN14AdventureFlags3GetEj kind:function(arm,size=0x3c) addr:0x02097760
 _ZN14AdventureFlags3SetEjb kind:function(arm,size=0x74) addr:0x0209779c
-_ZN14AdventureFlags18func_Ov00_02097810Ei kind:function(arm,size=0x158) addr:0x02097810
+_ZN14AdventureFlags18func_ov00_02097810Ei kind:function(arm,size=0x158) addr:0x02097810
 _ZN14AdventureFlags18func_ov00_02097968Ei kind:function(arm,size=0xdc) addr:0x02097968
 _ZN14AdventureFlags18func_ov00_02097a44Eii kind:function(arm,size=0x158) addr:0x02097a44
 _ZN14AdventureFlags18func_ov00_02097b9cEi kind:function(arm,size=0x10) addr:0x02097b9c
 _ZN14AdventureFlags18func_ov00_02097bacEv kind:function(arm,size=0x10) addr:0x02097bac
 _ZN14AdventureFlags18func_ov00_02097bbcEv kind:function(arm,size=0x10) addr:0x02097bbc
-_ZN14AdventureFlags18func_ov00_02097bccEv kind:function(arm,size=0x10) addr:0x02097bcc
-_ZN14AdventureFlags18func_ov00_02097bccEi kind:function(arm,size=0x2c) addr:0x02097bdc
+_ZN14AdventureFlags18func_ov00_02097bccEi kind:function(arm,size=0x10) addr:0x02097bcc
+_ZN14AdventureFlags18func_ov00_02097bccEP10astruct_23 kind:function(arm,size=0x2c) addr:0x02097bdc
 _ZN14AdventureFlags18func_ov00_02097c08Ev kind:function(arm,size=0x10) addr:0x02097c08
 _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi kind:function(arm,size=0x20) addr:0x02097c18
 _ZN14AdventureFlags15Get_FlagsUnk_49Ei kind:function(arm,size=0x18) addr:0x02097c38
@@ -1323,9 +1323,9 @@ _ZN14AdventureFlags18func_ov00_020980acEv kind:function(arm,size=0x10) addr:0x02
 _ZN14AdventureFlags18func_ov00_020980bcEi kind:function(arm,size=0x14) addr:0x020980bc
 _ZN8FlagsUnkD1Ev kind:function(arm,size=0x24) addr:0x020980d0
 _ZN9FlagsUnk2D1Ev kind:function(arm,size=0x4) addr:0x020980f4
-_Z19func_ov000_020980f8P15CutsceneHandler kind:function(arm,size=0x4) addr:0x020980f8
-_Z19func_ov000_020980fcP15CutsceneHandler kind:function(arm,size=0x18) addr:0x020980fc
-_Z19func_ov000_02098114P15CutsceneHandler kind:function(arm,size=0x3c) addr:0x02098114
+_ZN15CutsceneHandler19func_ov000_020980f8Ev kind:function(arm,size=0x4) addr:0x020980f8
+_ZN15CutsceneHandler19func_ov000_020980fcEiiPPv kind:function(arm,size=0x18) addr:0x020980fc
+_ZN15CutsceneHandler19func_ov000_02098114Ev kind:function(arm,size=0x3c) addr:0x02098114
 _ZN15CutsceneHandler12SkipCutsceneEi kind:function(arm,size=0x68) addr:0x02098150
 _ZN15CutsceneHandler19func_ov000_020981b8EPi kind:function(arm,size=0x408) addr:0x020981b8
 _ZN15CutsceneHandler19func_ov000_020985c0Ev kind:function(arm,size=0x4) addr:0x020985c0
@@ -1346,17 +1346,17 @@ func_ov000_02098b60 kind:function(arm,size=0x18) addr:0x02098b60
 func_ov000_02098b78 kind:function(arm,size=0x18) addr:0x02098b78
 func_ov000_02098b90 kind:function(arm,size=0x70) addr:0x02098b90
 func_ov000_02098c00 kind:function(arm,size=0x48) addr:0x02098c00
-func_ov000_02098c48 kind:function(arm,size=0x20) addr:0x02098c48
-func_ov000_02098c68 kind:function(arm,size=0xb8) addr:0x02098c68
-func_ov000_02098d20 kind:function(arm,size=0x14) addr:0x02098d20
+_ZN17AdventureFlags_4419func_ov000_02098c48Ei kind:function(arm,size=0x20) addr:0x02098c48
+_ZN17AdventureFlags_4419func_ov000_02098c68Ev kind:function(arm,size=0xb8) addr:0x02098c68
+_ZN17AdventureFlags_4419func_ov000_02098d20Ev kind:function(arm,size=0x14) addr:0x02098d20
 func_ov000_02098d34 kind:function(arm,size=0x1d0) addr:0x02098d34
 func_ov000_02098f04 kind:function(arm,size=0xa0) addr:0x02098f04
-func_ov000_02098fa4 kind:function(arm,size=0x80) addr:0x02098fa4
-func_ov000_02099024 kind:function(arm,size=0x48) addr:0x02099024
+_ZN17AdventureFlags_4419func_ov000_02098fa4Ei kind:function(arm,size=0x80) addr:0x02098fa4
+_ZN17AdventureFlags_4419func_ov000_02099024Ev kind:function(arm,size=0x48) addr:0x02099024
 func_ov000_0209906c kind:function(arm,size=0x4) addr:0x0209906c
 func_ov000_02099070 kind:function(arm,size=0xc) addr:0x02099070
-func_ov000_0209907c kind:function(arm,size=0x28) addr:0x0209907c
-func_ov000_020990a4 kind:function(arm,size=0x148) addr:0x020990a4
+_ZN17AdventureFlags_4419func_ov000_0209907cEv kind:function(arm,size=0x28) addr:0x0209907c
+_ZN17AdventureFlags_4419func_ov000_020990a4EP10astruct_23 kind:function(arm,size=0x148) addr:0x020990a4
 func_ov000_020991ec kind:function(arm,size=0x2ec) addr:0x020991ec
 func_ov000_020994d8 kind:function(arm,size=0x14) addr:0x020994d8
 func_ov000_020994ec kind:function(arm,size=0x48) addr:0x020994ec
diff --git a/config/usa/arm9/overlays/ov000/relocs.txt b/config/usa/arm9/overlays/ov000/relocs.txt
index be06569d..bd652198 100644
--- a/config/usa/arm9/overlays/ov000/relocs.txt
+++ b/config/usa/arm9/overlays/ov000/relocs.txt
@@ -3113,33 +3113,33 @@ from:0x02097ba0 kind:arm_call to:0x02099044 module:overlay(0)
 from:0x02097bb4 kind:load to:0x0209901c module:overlay(0)
 from:0x02097bc4 kind:arm_call to:0x02097c98 module:overlay(0)
 from:0x02097bd0 kind:arm_call to:0x02097700 module:overlay(0)
-from:0x02097bec kind:load to:0x020e30f5 module:overlay(0)
-from:0x02097c04 kind:load to:0x020e30f4 module:overlay(0)
-from:0x02097c1c kind:load to:0x020e30f6 module:overlay(0)
-from:0x02097c34 kind:load to:0x020e30ee module:overlay(0)
-from:0x02097c4c kind:load to:0x020e30ec module:overlay(0)
-from:0x02097c64 kind:load to:0x020e30e4 module:overlay(0)
-from:0x02097c7c kind:load to:0x020e30e0 module:overlay(0)
-from:0x02097c94 kind:load to:0x020e30f0 module:overlay(0)
-from:0x02097cac kind:load to:0x020e30dc module:overlay(0)
+from:0x02097bec kind:load to:0x020e30ac add:0x49 module:overlay(0)
+from:0x02097c04 kind:load to:0x020e30ac add:0x48 module:overlay(0)
+from:0x02097c1c kind:load to:0x020e30ac add:0x4a module:overlay(0)
+from:0x02097c34 kind:load to:0x020e30ac add:0x42 module:overlay(0)
+from:0x02097c4c kind:load to:0x020e30ac add:0x40 module:overlay(0)
+from:0x02097c64 kind:load to:0x020e30ac add:0x38 module:overlay(0)
+from:0x02097c7c kind:load to:0x020e30ac add:0x34 module:overlay(0)
+from:0x02097c94 kind:load to:0x020e30ac add:0x44 module:overlay(0)
+from:0x02097cac kind:load to:0x020e30ac add:0x30 module:overlay(0)
 from:0x02097d30 kind:load to:0x020e30ac module:overlay(0)
-from:0x02097d34 kind:load to:0x020e30b0 module:overlay(0)
-from:0x02097d38 kind:load to:0x020e30b4 module:overlay(0)
-from:0x02097d3c kind:load to:0x020e30b8 module:overlay(0)
-from:0x02097d40 kind:load to:0x020e30bc module:overlay(0)
-from:0x02097d44 kind:load to:0x020e30be module:overlay(0)
-from:0x02097d48 kind:load to:0x020e30bf module:overlay(0)
-from:0x02097d4c kind:load to:0x020e30c0 module:overlay(0)
-from:0x02097d50 kind:load to:0x020e30c1 module:overlay(0)
-from:0x02097dd4 kind:load to:0x020e30c4 module:overlay(0)
-from:0x02097dd8 kind:load to:0x020e30c8 module:overlay(0)
-from:0x02097ddc kind:load to:0x020e30cc module:overlay(0)
-from:0x02097de0 kind:load to:0x020e30d0 module:overlay(0)
-from:0x02097de4 kind:load to:0x020e30d4 module:overlay(0)
-from:0x02097de8 kind:load to:0x020e30d6 module:overlay(0)
-from:0x02097dec kind:load to:0x020e30d7 module:overlay(0)
-from:0x02097df0 kind:load to:0x020e30d8 module:overlay(0)
-from:0x02097df4 kind:load to:0x020e30d9 module:overlay(0)
+from:0x02097d34 kind:load to:0x020e30ac add:0x04 module:overlay(0)
+from:0x02097d38 kind:load to:0x020e30ac add:0x08 module:overlay(0)
+from:0x02097d3c kind:load to:0x020e30ac add:0x0c module:overlay(0)
+from:0x02097d40 kind:load to:0x020e30ac add:0x10 module:overlay(0)
+from:0x02097d44 kind:load to:0x020e30ac add:0x12 module:overlay(0)
+from:0x02097d48 kind:load to:0x020e30ac add:0x13 module:overlay(0)
+from:0x02097d4c kind:load to:0x020e30ac add:0x14 module:overlay(0)
+from:0x02097d50 kind:load to:0x020e30ac add:0x15 module:overlay(0)
+from:0x02097dd4 kind:load to:0x020e30ac add:0x18 module:overlay(0)
+from:0x02097dd8 kind:load to:0x020e30ac add:0x1c module:overlay(0)
+from:0x02097ddc kind:load to:0x020e30ac add:0x20 module:overlay(0)
+from:0x02097de0 kind:load to:0x020e30ac add:0x24 module:overlay(0)
+from:0x02097de4 kind:load to:0x020e30ac add:0x28 module:overlay(0)
+from:0x02097de8 kind:load to:0x020e30ac add:0x2a module:overlay(0)
+from:0x02097dec kind:load to:0x020e30ac add:0x2b module:overlay(0)
+from:0x02097df0 kind:load to:0x020e30ac add:0x2c module:overlay(0)
+from:0x02097df4 kind:load to:0x020e30ac add:0x2d module:overlay(0)
 from:0x02097e08 kind:load to:0x020e30ac module:overlay(0)
 from:0x02097e18 kind:load to:0x020980b4 module:overlay(0)
 from:0x02097e24 kind:arm_call to:0x02097e0c module:overlay(0)
diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt
index a2744d4d..028bbf20 100644
--- a/config/usa/arm9/overlays/ov000/symbols.txt
+++ b/config/usa/arm9/overlays/ov000/symbols.txt
@@ -201,8 +201,8 @@ func_ov000_0207b1fc kind:function(thumb,size=0x7c) addr:0x0207b19c
 func_ov000_0207b278 kind:function(thumb,size=0x10) addr:0x0207b218
 _ZN15Struct_027e0db019func_ov000_0207b288Ei kind:function(thumb,size=0x3c) addr:0x0207b228
 func_ov000_0207b2c4 kind:function(thumb,size=0x2c) addr:0x0207b264
-func_ov000_0207b2f0 kind:function(thumb,size=0x44) addr:0x0207b290
-func_ov000_0207b334 kind:function(thumb,size=0x44) addr:0x0207b2d4
+_ZN15Struct_027e0db019func_ov000_0207b2f0Eib kind:function(thumb,size=0x44) addr:0x0207b290
+_ZN15Struct_027e0db019func_ov000_0207b334Ei kind:function(thumb,size=0x44) addr:0x0207b2d4
 _ZN15Struct_027e0db019func_ov000_0207b378Ei kind:function(arm,size=0xc4) addr:0x0207b318
 _ZN15Struct_027e0db019func_ov000_0207b43cEv kind:function(arm,size=0xf4) addr:0x0207b3dc
 func_ov000_0207b530 kind:function(thumb,size=0x2c) addr:0x0207b4d0
@@ -1275,7 +1275,7 @@ _ZN7MapData8GetFlag3Ej kind:function(arm,size=0x20) addr:0x0209753c
 _ZN7MapData8SetFlag4Ejb kind:function(arm,size=0x4c) addr:0x0209755c
 _ZN7MapData8GetFlag4Ej kind:function(arm,size=0x20) addr:0x020975a8
 _ZN14AdventureFlags6ExistsEv kind:function(arm,size=0x1c) addr:0x020975c8
-_ZN14AdventureFlags6CopyToEPi kind:function(arm,size=0x30) addr:0x020975e4
+_ZN14AdventureFlags6CopyToEP9FlagsData kind:function(arm,size=0x30) addr:0x020975e4
 _ZN14AdventureFlags18func_ov00_02097674Ev kind:function(arm,size=0x10) addr:0x02097614
 _ZN14AdventureFlags18func_ov00_02097684Ev kind:function(arm,size=0x10) addr:0x02097624
 _ZN14AdventureFlags4LoadEv kind:function(arm,size=0x34) addr:0x02097634
@@ -1285,14 +1285,14 @@ _ZN14AdventureFlags18func_ov00_02097738Ev kind:function(arm,size=0x18) addr:0x02
 _ZN14AdventureFlags18func_ov00_02097750Ev kind:function(arm,size=0x10) addr:0x020976f0
 _ZN14AdventureFlags3GetEj kind:function(arm,size=0x3c) addr:0x02097700
 _ZN14AdventureFlags3SetEjb kind:function(arm,size=0x74) addr:0x0209773c
-_ZN14AdventureFlags18func_Ov00_02097810Ei kind:function(arm,size=0x158) addr:0x020977b0
+_ZN14AdventureFlags18func_ov00_02097810Ei kind:function(arm,size=0x158) addr:0x020977b0
 _ZN14AdventureFlags18func_ov00_02097968Ei kind:function(arm,size=0xdc) addr:0x02097908
 _ZN14AdventureFlags18func_ov00_02097a44Eii kind:function(arm,size=0x158) addr:0x020979e4
 _ZN14AdventureFlags18func_ov00_02097b9cEi kind:function(arm,size=0x10) addr:0x02097b3c
 _ZN14AdventureFlags18func_ov00_02097bacEv kind:function(arm,size=0x10) addr:0x02097b4c
 _ZN14AdventureFlags18func_ov00_02097bbcEv kind:function(arm,size=0x10) addr:0x02097b5c
-_ZN14AdventureFlags18func_ov00_02097bccEv kind:function(arm,size=0x10) addr:0x02097b6c
-_ZN14AdventureFlags18func_ov00_02097bccEi kind:function(arm,size=0x2c) addr:0x02097b7c
+_ZN14AdventureFlags18func_ov00_02097bccEi kind:function(arm,size=0x10) addr:0x02097b6c
+_ZN14AdventureFlags18func_ov00_02097bccEP10astruct_23 kind:function(arm,size=0x2c) addr:0x02097b7c
 _ZN14AdventureFlags18func_ov00_02097c08Ev kind:function(arm,size=0x10) addr:0x02097ba8
 _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi kind:function(arm,size=0x20) addr:0x02097bb8
 _ZN14AdventureFlags15Get_FlagsUnk_49Ei kind:function(arm,size=0x18) addr:0x02097bd8
@@ -1323,9 +1323,9 @@ _ZN14AdventureFlags18func_ov00_020980acEv kind:function(arm,size=0x10) addr:0x02
 _ZN14AdventureFlags18func_ov00_020980bcEi kind:function(arm,size=0x14) addr:0x0209805c
 _ZN8FlagsUnkD1Ev kind:function(arm,size=0x24) addr:0x02098070
 _ZN9FlagsUnk2D1Ev kind:function(arm,size=0x4) addr:0x02098094
-_Z19func_ov000_020980f8P15CutsceneHandler kind:function(arm,size=0x4) addr:0x02098098
-_Z19func_ov000_020980fcP15CutsceneHandler kind:function(arm,size=0x18) addr:0x0209809c
-_Z19func_ov000_02098114P15CutsceneHandler kind:function(arm,size=0x3c) addr:0x020980b4
+_ZN15CutsceneHandler19func_ov000_020980f8Ev kind:function(arm,size=0x4) addr:0x02098098
+_ZN15CutsceneHandler19func_ov000_020980fcEiiPPv kind:function(arm,size=0x18) addr:0x0209809c
+_ZN15CutsceneHandler19func_ov000_02098114Ev kind:function(arm,size=0x3c) addr:0x020980b4
 _ZN15CutsceneHandler12SkipCutsceneEi kind:function(arm,size=0x68) addr:0x020980f0
 _ZN15CutsceneHandler19func_ov000_020981b8EPi kind:function(arm,size=0x408) addr:0x02098158
 _ZN15CutsceneHandler19func_ov000_020985c0Ev kind:function(arm,size=0x4) addr:0x02098560
@@ -1346,17 +1346,17 @@ func_ov000_02098b60 kind:function(arm,size=0x18) addr:0x02098b00
 func_ov000_02098b78 kind:function(arm,size=0x18) addr:0x02098b18
 func_ov000_02098b90 kind:function(arm,size=0x70) addr:0x02098b30
 func_ov000_02098c00 kind:function(arm,size=0x48) addr:0x02098ba0
-func_ov000_02098c48 kind:function(arm,size=0x20) addr:0x02098be8
-func_ov000_02098c68 kind:function(arm,size=0xb8) addr:0x02098c08
-func_ov000_02098d20 kind:function(arm,size=0x14) addr:0x02098cc0
+_ZN17AdventureFlags_4419func_ov000_02098c48Ei kind:function(arm,size=0x20) addr:0x02098be8
+_ZN17AdventureFlags_4419func_ov000_02098c68Ev kind:function(arm,size=0xb8) addr:0x02098c08
+_ZN17AdventureFlags_4419func_ov000_02098d20Ev kind:function(arm,size=0x14) addr:0x02098cc0
 func_ov000_02098d34 kind:function(arm,size=0x1d0) addr:0x02098cd4
 func_ov000_02098f04 kind:function(arm,size=0xa0) addr:0x02098ea4
-func_ov000_02098fa4 kind:function(arm,size=0x80) addr:0x02098f44
-func_ov000_02099024 kind:function(arm,size=0x48) addr:0x02098fc4
+_ZN17AdventureFlags_4419func_ov000_02098fa4Ei kind:function(arm,size=0x80) addr:0x02098f44
+_ZN17AdventureFlags_4419func_ov000_02099024Ev kind:function(arm,size=0x48) addr:0x02098fc4
 func_ov000_0209906c kind:function(arm,size=0x4) addr:0x0209900c
 func_ov000_02099070 kind:function(arm,size=0xc) addr:0x02099010
-func_ov000_0209907c kind:function(arm,size=0x28) addr:0x0209901c
-func_ov000_020990a4 kind:function(arm,size=0x148) addr:0x02099044
+_ZN17AdventureFlags_4419func_ov000_0209907cEv kind:function(arm,size=0x28) addr:0x0209901c
+_ZN17AdventureFlags_4419func_ov000_020990a4EP10astruct_23 kind:function(arm,size=0x148) addr:0x02099044
 func_ov000_020991ec kind:function(arm,size=0x2ec) addr:0x0209918c
 func_ov000_020994d8 kind:function(arm,size=0x14) addr:0x02099478
 func_ov000_020994ec kind:function(arm,size=0x48) addr:0x0209948c