13 files changed, 34 insertions, 31 deletions
diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt
index b04de059..17120ecf 100644
--- a/config/eur/arm9/delinks.txt
+++ b/config/eur/arm9/delinks.txt
@@ -65,4 +65,6 @@ src/Main/Game/Game.cpp:
     .text       start:0x0202c6c8 end:0x0202d0cc
 
 src/Main/Game/GameMode.cpp:
+    complete
     .text       start:0x0202c0a8 end:0x0202c0cc
+    .data       start:0x0205762c end:0x02057650
diff --git a/config/eur/arm9/overlays/ov000/relocs.txt b/config/eur/arm9/overlays/ov000/relocs.txt
index 211e8b34..190c2319 100644
--- a/config/eur/arm9/overlays/ov000/relocs.txt
+++ b/config/eur/arm9/overlays/ov000/relocs.txt
@@ -425,7 +425,7 @@ from:0x02079d02 kind:thumb_call_arm to:0x02007938 module:main
 from:0x02079d16 kind:thumb_call to:0x02079bdc module:overlay(0)
 from:0x02079d20 kind:load to:0x020691a0 module:main
 from:0x02079d3c kind:thumb_call_arm to:0x0201823c module:main
-from:0x02079d44 kind:load to:0x02057634 module:main
+from:0x02079d44 kind:load to:0x0205762c add:8 module:main
 from:0x02079d48 kind:load to:0x020e2020 module:overlay(0)
 from:0x02079d4c kind:load to:0x027e0d40 module:dtcm
 from:0x02079d50 kind:load to:0x027e0934 module:dtcm
diff --git a/config/eur/arm9/overlays/ov002/symbols.txt b/config/eur/arm9/overlays/ov002/symbols.txt
index 59355af3..b8b31716 100644
--- a/config/eur/arm9/overlays/ov002/symbols.txt
+++ b/config/eur/arm9/overlays/ov002/symbols.txt
@@ -164,9 +164,9 @@ func_ov002_020f41f8 kind:function(arm,size=0x14) addr:0x020f41f8
 func_ov002_020f420c kind:function(arm,size=0xb90) addr:0x020f420c
 func_ov002_020f4d9c kind:function(arm,size=0x324) addr:0x020f4d9c
 func_ov002_020f50c0 kind:function(arm,size=0x2d0) addr:0x020f50c0
-func_ov002_020f5390 kind:function(arm,size=0x174) addr:0x020f5390
-func_ov002_020f5504 kind:function(arm,size=0x1c4) addr:0x020f5504
-func_ov002_020f56c8 kind:function(arm,size=0x19c) addr:0x020f56c8
+_ZN18UnkStruct_0211a9ac19func_ov002_020f5390EPt kind:function(arm,size=0x174) addr:0x020f5390
+_ZN18UnkStruct_0211a9ac19func_ov002_020f5504EPt kind:function(arm,size=0x1c4) addr:0x020f5504
+_ZN18UnkStruct_0211a9ac19func_ov002_020f56c8EPt kind:function(arm,size=0x19c) addr:0x020f56c8
 func_ov002_020f5864 kind:function(arm,size=0x50) addr:0x020f5864
 func_ov002_020f58b4 kind:function(arm,size=0x248) addr:0x020f58b4
 func_ov002_020f5afc kind:function(arm,size=0x2c8) addr:0x020f5afc
diff --git a/config/eur/arm9/overlays/ov003/symbols.txt b/config/eur/arm9/overlays/ov003/symbols.txt
index c41b9d74..8c395677 100644
--- a/config/eur/arm9/overlays/ov003/symbols.txt
+++ b/config/eur/arm9/overlays/ov003/symbols.txt
@@ -75,7 +75,7 @@ func_ov003_020f2944 kind:function(thumb,size=0x32) addr:0x020f2944
 func_ov003_020f2978 kind:function(thumb,size=0xa0) addr:0x020f2978
 func_ov003_020f2a18 kind:function(arm,size=0x14) addr:0x020f2a18
 func_ov003_020f2a2c kind:function(thumb,size=0xa0) addr:0x020f2a2c
-func_ov003_020f2acc kind:function(thumb,size=0xb8) addr:0x020f2acc
+_ZN18UnkStruct_020f297819func_ov003_020f2accEv kind:function(thumb,size=0xb8) addr:0x020f2acc
 func_ov003_020f2b84 kind:function(thumb,size=0x46) addr:0x020f2b84
 func_ov003_020f2bcc kind:function(thumb,size=0x50) addr:0x020f2bcc
 func_ov003_020f2c1c kind:function(arm,size=0x1c) addr:0x020f2c1c
@@ -171,8 +171,8 @@ func_ov003_020f4510 kind:function(thumb,size=0x24) addr:0x020f4510
 func_ov003_020f4534 kind:function(thumb,size=0x24) addr:0x020f4534
 func_ov003_020f4558 kind:function(thumb,size=0xa8) addr:0x020f4558
 func_ov003_020f4600 kind:function(thumb,size=0x78) addr:0x020f4600
-func_ov003_020f4678 kind:function(thumb,size=0x80) addr:0x020f4678
-func_ov003_020f46f8 kind:function(thumb,size=0x1e) addr:0x020f46f8
+_ZN17UnkClass_027e105419func_ov003_020f4678Ei kind:function(thumb,size=0x80) addr:0x020f4678
+_ZN17UnkClass_027e105418func_ov003_02f46f8Ev kind:function(thumb,size=0x1e) addr:0x020f46f8
 func_ov003_020f4718 kind:function(thumb,size=0x48) addr:0x020f4718
 func_ov003_020f4760 kind:function(thumb,size=0x18) addr:0x020f4760
 func_ov003_020f4778 kind:function(thumb,size=0x6c) addr:0x020f4778
@@ -184,7 +184,7 @@ func_ov003_020f48dc kind:function(thumb,size=0x2e) addr:0x020f48dc
 func_ov003_020f490c kind:function(thumb,size=0x34) addr:0x020f490c
 func_ov003_020f4940 kind:function(thumb,size=0x20) addr:0x020f4940
 func_ov003_020f4960 kind:function(arm,size=0xfc) addr:0x020f4960
-func_ov003_020f4a5c kind:function(arm,size=0xbc) addr:0x020f4a5c
+_ZN17UnkClass_027e105419func_ov003_020f4a5cEv kind:function(arm,size=0xbc) addr:0x020f4a5c
 func_ov003_020f4b18 kind:function(thumb,size=0x64) addr:0x020f4b18
 func_ov003_020f4b7c kind:function(arm,size=0x44) addr:0x020f4b7c
 func_ov003_020f4bc0 kind:function(thumb,size=0x48) addr:0x020f4bc0
@@ -355,23 +355,23 @@ func_ov003_020fab64 kind:function(thumb,size=0x240) addr:0x020fab64
 func_ov003_020fada4 kind:function(thumb,size=0x2e) addr:0x020fada4
 func_ov003_020fadd4 kind:function(thumb,size=0x20) addr:0x020fadd4
 func_ov003_020fadf4 kind:function(thumb,size=0x40) addr:0x020fadf4
-func_ov003_020fae34 kind:function(thumb,size=0x30) addr:0x020fae34
-func_ov003_020fae64 kind:function(thumb,size=0x22) addr:0x020fae64
+_ZN18UnkStruct_020fadf4D1Ev kind:function(thumb,size=0x30) addr:0x020fae34
+_ZN18UnkStruct_020fadf419func_ov003_020fae64Ev kind:function(thumb,size=0x22) addr:0x020fae64
 func_ov003_020fae88 kind:function(thumb,size=0x18) addr:0x020fae88
 func_ov003_020faea0 kind:function(thumb,size=0x44) addr:0x020faea0
 func_ov003_020faee4 kind:function(thumb,size=0x48) addr:0x020faee4
 func_ov003_020faf2c kind:function(thumb,size=0x48) addr:0x020faf2c
 func_ov003_020faf74 kind:function(thumb,size=0x1c) addr:0x020faf74
-func_ov003_020faf90 kind:function(thumb,size=0x80) addr:0x020faf90
-func_ov003_020fb010 kind:function(thumb,size=0x44) addr:0x020fb010
+_ZN18UnkStruct_0211ac0c19func_ov003_020faf90Ev kind:function(thumb,size=0x80) addr:0x020faf90
+_ZN18UnkStruct_0211ac0c19func_ov003_020fb010Ev kind:function(thumb,size=0x44) addr:0x020fb010
 func_ov003_020fb054 kind:function(thumb,size=0x30) addr:0x020fb054
 func_ov003_020fb084 kind:function(thumb,size=0x24) addr:0x020fb084
 func_ov003_020fb0a8 kind:function(thumb,size=0x8) addr:0x020fb0a8
 func_ov003_020fb0b0 kind:function(thumb,size=0x68) addr:0x020fb0b0
 func_ov003_020fb118 kind:function(thumb,size=0x2e) addr:0x020fb118
 func_ov003_020fb148 kind:function(arm,size=0x110) addr:0x020fb148
-func_ov003_020fb258 kind:function(thumb,size=0x14) addr:0x020fb258
-func_ov003_020fb26c kind:function(thumb,size=0x26) addr:0x020fb26c
+_ZN18UnkStruct_0211ac0c19func_ov003_020fb258EPt kind:function(thumb,size=0x14) addr:0x020fb258
+_ZN18UnkStruct_0211ac0c19func_ov003_020fb26cEv kind:function(thumb,size=0x26) addr:0x020fb26c
 func_ov003_020fb294 kind:function(thumb,size=0x38) addr:0x020fb294
 func_ov003_020fb2cc kind:function(thumb,size=0x1a) addr:0x020fb2cc
 func_ov003_020fb2e8 kind:function(thumb,size=0x88) addr:0x020fb2e8
diff --git a/config/eur/arm9/overlays/ov005/symbols.txt b/config/eur/arm9/overlays/ov005/symbols.txt
index c4456c3a..ce09a288 100644
--- a/config/eur/arm9/overlays/ov005/symbols.txt
+++ b/config/eur/arm9/overlays/ov005/symbols.txt
@@ -1,5 +1,5 @@
 func_ov005_02100ae0 kind:function(arm,size=0x9c) addr:0x02100ae0
-func_ov005_02100b7c kind:function(arm,size=0x74) addr:0x02100b7c
+_ZN18UnkStruct_027e0d3819func_ov005_02100b7cEi kind:function(arm,size=0x74) addr:0x02100b7c
 func_ov005_02100bf0 kind:function(arm,size=0xc0) addr:0x02100bf0
 func_ov005_02100cb0 kind:function(arm,size=0x110) addr:0x02100cb0
 func_ov005_02100dc0 kind:function(arm,size=0x4c) addr:0x02100dc0
diff --git a/config/eur/arm9/overlays/ov007/relocs.txt b/config/eur/arm9/overlays/ov007/relocs.txt
index b6b2b778..2229b4b1 100644
--- a/config/eur/arm9/overlays/ov007/relocs.txt
+++ b/config/eur/arm9/overlays/ov007/relocs.txt
@@ -39,7 +39,7 @@ from:0x02100ef8 kind:arm_call to:0x02007ad8 module:main
 from:0x02100f10 kind:arm_call to:0x02007ad8 module:main
 from:0x02100f38 kind:arm_call_thumb to:0x0200b944 module:main
 from:0x02100f44 kind:arm_call_thumb to:0x0200b954 module:main
-from:0x02100f54 kind:load to:0x02057634 module:main
+from:0x02100f54 kind:load to:0x0205762c add:8 module:main
 from:0x02100f58 kind:load to:0x021029c8 module:overlay(7)
 from:0x02100f5c kind:load to:0x021029fc module:overlay(7)
 from:0x02100f60 kind:load to:0x021029ec module:overlay(7)
diff --git a/config/eur/arm9/overlays/ov008/relocs.txt b/config/eur/arm9/overlays/ov008/relocs.txt
index 88c4739a..8c613f22 100644
--- a/config/eur/arm9/overlays/ov008/relocs.txt
+++ b/config/eur/arm9/overlays/ov008/relocs.txt
@@ -10,7 +10,7 @@ from:0x02112cf0 kind:arm_call_thumb to:0x02031e1c module:main
 from:0x02112d18 kind:arm_call_thumb to:0x02027ab4 module:main
 from:0x02112d44 kind:arm_call_thumb to:0x02027ab4 module:main
 from:0x02112d4c kind:arm_call_thumb to:0x02016fcc module:main
-from:0x02112d5c kind:load to:0x02057634 module:main
+from:0x02112d5c kind:load to:0x0205762c add:8 module:main
 from:0x02112d60 kind:load to:0x02113b44 module:overlay(8)
 from:0x02112d64 kind:load to:0x02113b00 module:overlay(8)
 from:0x02112d68 kind:load to:0x02113b04 module:overlay(8)
diff --git a/config/eur/arm9/overlays/ov009/delinks.txt b/config/eur/arm9/overlays/ov009/delinks.txt
index fd22621b..9f10b084 100644
--- a/config/eur/arm9/overlays/ov009/delinks.txt
+++ b/config/eur/arm9/overlays/ov009/delinks.txt
@@ -7,3 +7,4 @@
 
 src/09_Adventure/Game/GameModeAdventure.cpp:
     .text       start:0x02112c20 end:0x021132cc
+    .data       start:0x0211e680 end:0x0211e6ec
diff --git a/config/eur/arm9/overlays/ov009/symbols.txt b/config/eur/arm9/overlays/ov009/symbols.txt
index 778e9232..f33840eb 100644
--- a/config/eur/arm9/overlays/ov009/symbols.txt
+++ b/config/eur/arm9/overlays/ov009/symbols.txt
@@ -1,8 +1,8 @@
 _ZN17GameModeAdventure6CreateEi kind:function(thumb,size=0x20) addr:0x02112c20
 _ZN17GameModeAdventureC1Ei kind:function(thumb,size=0x128) addr:0x02112c40
-_Z19func_ov009_02112d68v kind:function(arm,size=0x4) addr:0x02112d68
+_ZN21UnkStruct_020f2978_00D1Ev kind:function(arm,size=0x4) addr:0x02112d68
 _ZN17GameModeAdventureD0Ev kind:function(thumb,size=0x88) addr:0x02112d6c
-_ZN17GameModeAdventureD2Ev kind:function(thumb,size=0x84) addr:0x02112df4
+_ZN17GameModeAdventureD1Ev kind:function(thumb,size=0x84) addr:0x02112df4
 _ZN17GameModeAdventure8vfunc_08Ei kind:function(arm,size=0x17c) addr:0x02112e78
 _ZN17GameModeAdventure8vfunc_0cEPt kind:function(arm,size=0xc8) addr:0x02112ff4
 _ZN17GameModeAdventure8vfunc_10EPt kind:function(arm,size=0xe0) addr:0x021130bc
@@ -22,9 +22,9 @@ func_ov009_0211364c kind:function(thumb,size=0x2) addr:0x0211364c
 func_ov009_02113650 kind:function(arm,size=0x1c) addr:0x02113650
 func_ov009_0211366c kind:function(arm,size=0x2c) addr:0x0211366c
 func_ov009_02113698 kind:function(arm,size=0x2c) addr:0x02113698
-func_ov009_021136c4 kind:function(arm,size=0x24) addr:0x021136c4
-func_ov009_021136e8 kind:function(arm,size=0x24) addr:0x021136e8
-func_ov009_0211370c kind:function(arm,size=0x20) addr:0x0211370c
+_ZN23UnkStruct_020fadf4_Base19func_ov009_021136c4Ev kind:function(arm,size=0x24) addr:0x021136c4
+_ZN18UnkStruct_0211ac0c19func_ov009_021136e8Ev kind:function(arm,size=0x24) addr:0x021136e8
+_ZN23UnkStruct_020fadf4_Base19func_ov009_0211370cEv kind:function(arm,size=0x20) addr:0x0211370c
 func_ov009_0211372c kind:function(arm,size=0x11c) addr:0x0211372c
 func_ov009_02113848 kind:function(thumb,size=0x20) addr:0x02113848
 func_ov009_02113868 kind:function(thumb,size=0x94) addr:0x02113868
@@ -345,12 +345,12 @@ func_ov009_0211a880 kind:function(arm,size=0x2c) addr:0x0211a880
 func_ov009_0211a8ac kind:function(arm,size=0xdc) addr:0x0211a8ac
 func_ov009_0211a988 kind:function(arm,size=0x24) addr:0x0211a988
 func_ov009_0211a9ac kind:function(thumb,size=0x88) addr:0x0211a9ac
-func_ov009_0211aa34 kind:function(thumb,size=0x60) addr:0x0211aa34
+_ZN18UnkStruct_0211a9acD1Ev kind:function(thumb,size=0x60) addr:0x0211aa34
 func_ov009_0211aa94 kind:function(arm,size=0xf8) addr:0x0211aa94
 func_ov009_0211ab8c kind:function(arm,size=0x3c) addr:0x0211ab8c
 func_ov009_0211abc8 kind:function(arm,size=0x44) addr:0x0211abc8
 func_ov009_0211ac0c kind:function(thumb,size=0x20) addr:0x0211ac0c
-func_ov009_0211ac2c kind:function(thumb,size=0x2a) addr:0x0211ac2c
+_ZN18UnkStruct_0211ac0c19func_ov009_0211ac2cEv kind:function(thumb,size=0x2a) addr:0x0211ac2c
 func_ov009_0211ac58 kind:function(thumb,size=0x90) addr:0x0211ac58
 func_ov009_0211ace8 kind:function(thumb,size=0x10) addr:0x0211ace8
 func_ov009_0211acf8 kind:function(thumb,size=0xa0) addr:0x0211acf8
@@ -608,7 +608,7 @@ data_ov009_0211e690 kind:data(any) addr:0x0211e690
 data_ov009_0211e694 kind:data(any) addr:0x0211e694
 data_ov009_0211e698 kind:data(any) addr:0x0211e698
 data_ov009_0211e69c kind:data(any) addr:0x0211e69c
-data_ov009_0211e6c8 kind:data(any) addr:0x0211e6c8
+_ZTV17GameModeAdventure kind:data(any) addr:0x0211e6c8
 data_ov009_0211e6ec kind:data(any) addr:0x0211e6ec
 data_ov009_0211e6f0 kind:data(any) addr:0x0211e6f0
 data_ov009_0211e6f4 kind:data(any) addr:0x0211e6f4
diff --git a/config/eur/arm9/overlays/ov010/relocs.txt b/config/eur/arm9/overlays/ov010/relocs.txt
index 611c23b6..f2b7f8a8 100644
--- a/config/eur/arm9/overlays/ov010/relocs.txt
+++ b/config/eur/arm9/overlays/ov010/relocs.txt
@@ -16,7 +16,7 @@ from:0x02112cfc kind:thumb_call_arm to:0x02032a74 module:main
 from:0x02112d00 kind:thumb_call_arm to:0x020329b0 module:main
 from:0x02112d10 kind:thumb_call_arm to:0x02032a74 module:main
 from:0x02112d16 kind:thumb_call_arm to:0x020d8718 module:overlay(0)
-from:0x02112d20 kind:load to:0x02057634 module:main
+from:0x02112d20 kind:load to:0x0205762c add:8 module:main
 from:0x02112d24 kind:load to:0x0211ea68 module:overlay(10)
 from:0x02112d28 kind:load to:0x027e0618 module:dtcm
 from:0x02112d2c kind:load to:0x027e0ce0 module:dtcm
diff --git a/config/eur/arm9/overlays/ov011/relocs.txt b/config/eur/arm9/overlays/ov011/relocs.txt
index f23619b8..47be35a5 100644
--- a/config/eur/arm9/overlays/ov011/relocs.txt
+++ b/config/eur/arm9/overlays/ov011/relocs.txt
@@ -6309,7 +6309,7 @@ from:0x0212b99c kind:thumb_call to:0x0211c048 module:overlay(11)
 from:0x0212b9a0 kind:thumb_call_arm to:0x0200c20c module:main
 from:0x0212b9ac kind:thumb_call_arm to:0x0200ee38 module:main
 from:0x0212b9b2 kind:thumb_call_arm to:0x0200ef98 module:main
-from:0x0212b9bc kind:load to:0x02057634 module:main
+from:0x0212b9bc kind:load to:0x0205762c add:8 module:main
 from:0x0212b9c0 kind:load to:0x021307e8 module:overlay(11)
 from:0x0212b9c4 kind:load to:0x027e0ce0 module:dtcm
 from:0x0212b9cc kind:load to:0x027e05f4 module:dtcm
diff --git a/config/eur/arm9/overlays/ov013/relocs.txt b/config/eur/arm9/overlays/ov013/relocs.txt
index 2a23fd31..98ed21ca 100644
--- a/config/eur/arm9/overlays/ov013/relocs.txt
+++ b/config/eur/arm9/overlays/ov013/relocs.txt
@@ -272,7 +272,7 @@ from:0x0211530c kind:arm_call to:0x020f802c module:overlay(1)
 from:0x0211532c kind:arm_call to:0x020f7f34 module:overlay(1)
 from:0x02115340 kind:arm_call to:0x020f5024 module:overlay(1)
 from:0x02115358 kind:arm_call to:0x02115800 module:overlay(13)
-from:0x02115370 kind:load to:0x02057634 module:main
+from:0x02115370 kind:load to:0x0205762c add:8 module:main
 from:0x02115374 kind:load to:0x021161c0 module:overlay(13)
 from:0x02115378 kind:load to:0x021153b8 module:overlay(13)
 from:0x0211537c kind:load to:0x021153d8 module:overlay(13)
diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt
index f7fba1bf..ef196184 100644
--- a/config/eur/arm9/symbols.txt
+++ b/config/eur/arm9/symbols.txt
@@ -1353,8 +1353,8 @@ func_0202bc10 kind:function(arm,size=0x28) addr:0x0202bc10
 func_0202bc38 kind:function(arm,size=0x320) addr:0x0202bc38
 func_0202bf58 kind:function(arm,size=0x68) addr:0x0202bf58
 func_0202bfc0 kind:function(arm,size=0xe8) addr:0x0202bfc0
-_ZN8GameModeD0Ev kind:function(thumb,size=0x2) addr:0x0202c0a8
-_ZN8GameModeD2Ev kind:function(thumb,size=0xc) addr:0x0202c0ac
+_ZN8GameModeD1Ev kind:function(thumb,size=0x2) addr:0x0202c0a8
+_ZN8GameModeD0Ev kind:function(thumb,size=0xc) addr:0x0202c0ac
 _ZN8GameMode13func_0202c0b8Ev kind:function(thumb,size=0x2) addr:0x0202c0b8
 _ZN8GameMode8vfunc_0cEPt kind:function(thumb,size=0x2) addr:0x0202c0bc
 _ZN8GameMode8vfunc_10EPt kind:function(thumb,size=0x2) addr:0x0202c0c0
@@ -2646,7 +2646,7 @@ data_02057610 kind:data(any) addr:0x02057610
 data_02057618 kind:data(any) addr:0x02057618
 data_02057620 kind:data(any) addr:0x02057620
 data_02057628 kind:data(any) addr:0x02057628
-data_02057634 kind:data(any) addr:0x02057634
+_ZTV8GameMode kind:data(any) addr:0x0205762c
 data_02057650 kind:data(any) addr:0x02057650
 data_0205765c kind:data(any) addr:0x0205765c
 data_02057664 kind:data(any) addr:0x02057664