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/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/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 diff --git a/config/usa/arm9/delinks.txt b/config/usa/arm9/delinks.txt index bd0aa688..d20da38e 100644 --- a/config/usa/arm9/delinks.txt +++ b/config/usa/arm9/delinks.txt @@ -65,4 +65,6 @@ src/Main/Game/Game.cpp: .text start:0x0202c6b0 end:0x0202d0b4 src/Main/Game/GameMode.cpp: + complete .text start:0x0202c090 end:0x0202c0b4 + .data start:0x020575cc end:0x020575f0 diff --git a/config/usa/arm9/overlays/ov000/relocs.txt b/config/usa/arm9/overlays/ov000/relocs.txt index 9e9a093e..8d0854cd 100644 --- a/config/usa/arm9/overlays/ov000/relocs.txt +++ b/config/usa/arm9/overlays/ov000/relocs.txt @@ -425,7 +425,7 @@ from:0x02079ca2 kind:thumb_call_arm to:0x02007938 module:main from:0x02079cb6 kind:thumb_call to:0x02079b7c module:overlay(0) from:0x02079cc0 kind:load to:0x02069140 module:main from:0x02079cdc kind:thumb_call_arm to:0x0201823c module:main -from:0x02079ce4 kind:load to:0x020575d4 module:main +from:0x02079ce4 kind:load to:0x020575cc add:8 module:main from:0x02079ce8 kind:load to:0x020e1fc0 module:overlay(0) from:0x02079cec kind:load to:0x027e0d40 module:dtcm from:0x02079cf0 kind:load to:0x027e0934 module:dtcm diff --git a/config/usa/arm9/overlays/ov007/relocs.txt b/config/usa/arm9/overlays/ov007/relocs.txt index a7ae5e24..c20f541d 100644 --- a/config/usa/arm9/overlays/ov007/relocs.txt +++ b/config/usa/arm9/overlays/ov007/relocs.txt @@ -39,7 +39,7 @@ from:0x02100e78 kind:arm_call to:0x02007ad8 module:main from:0x02100e90 kind:arm_call to:0x02007ad8 module:main from:0x02100eb8 kind:arm_call_thumb to:0x0200b944 module:main from:0x02100ec4 kind:arm_call_thumb to:0x0200b954 module:main -from:0x02100ed4 kind:load to:0x020575d4 module:main +from:0x02100ed4 kind:load to:0x020575cc add:8 module:main from:0x02100ed8 kind:load to:0x02102948 module:overlay(7) from:0x02100edc kind:load to:0x0210297c module:overlay(7) from:0x02100ee0 kind:load to:0x0210296c module:overlay(7) diff --git a/config/usa/arm9/overlays/ov008/relocs.txt b/config/usa/arm9/overlays/ov008/relocs.txt index 3c533c3f..8ef5c2f8 100644 --- a/config/usa/arm9/overlays/ov008/relocs.txt +++ b/config/usa/arm9/overlays/ov008/relocs.txt @@ -10,7 +10,7 @@ from:0x02112c70 kind:arm_call_thumb to:0x02031e18 module:main from:0x02112c98 kind:arm_call_thumb to:0x02027ab4 module:main from:0x02112cc4 kind:arm_call_thumb to:0x02027ab4 module:main from:0x02112ccc kind:arm_call_thumb to:0x02016fcc module:main -from:0x02112cdc kind:load to:0x020575d4 module:main +from:0x02112cdc kind:load to:0x020575cc add:8 module:main from:0x02112ce0 kind:load to:0x02113ac4 module:overlay(8) from:0x02112ce4 kind:load to:0x02113a80 module:overlay(8) from:0x02112ce8 kind:load to:0x02113a84 module:overlay(8) diff --git a/config/usa/arm9/overlays/ov010/relocs.txt b/config/usa/arm9/overlays/ov010/relocs.txt index fdb5ccdb..d9c167d5 100644 --- a/config/usa/arm9/overlays/ov010/relocs.txt +++ b/config/usa/arm9/overlays/ov010/relocs.txt @@ -16,7 +16,7 @@ from:0x02112c7c kind:thumb_call_arm to:0x02032a70 module:main from:0x02112c80 kind:thumb_call_arm to:0x020329ac module:main from:0x02112c90 kind:thumb_call_arm to:0x02032a70 module:main from:0x02112c96 kind:thumb_call_arm to:0x020d86b8 module:overlay(0) -from:0x02112ca0 kind:load to:0x020575d4 module:main +from:0x02112ca0 kind:load to:0x020575cc add:8 module:main from:0x02112ca4 kind:load to:0x0211e9e8 module:overlay(10) from:0x02112ca8 kind:load to:0x027e0618 module:dtcm from:0x02112cac kind:load to:0x027e0ce0 module:dtcm diff --git a/config/usa/arm9/overlays/ov011/relocs.txt b/config/usa/arm9/overlays/ov011/relocs.txt index 06712bfe..ddcb485d 100644 --- a/config/usa/arm9/overlays/ov011/relocs.txt +++ b/config/usa/arm9/overlays/ov011/relocs.txt @@ -6309,7 +6309,7 @@ from:0x0212b91c kind:thumb_call to:0x0211bfc8 module:overlay(11) from:0x0212b920 kind:thumb_call_arm to:0x0200c20c module:main from:0x0212b92c kind:thumb_call_arm to:0x0200ee38 module:main from:0x0212b932 kind:thumb_call_arm to:0x0200ef98 module:main -from:0x0212b93c kind:load to:0x020575d4 module:main +from:0x0212b93c kind:load to:0x020575cc add:8 module:main from:0x0212b940 kind:load to:0x02130768 module:overlay(11) from:0x0212b944 kind:load to:0x027e0ce0 module:dtcm from:0x0212b94c kind:load to:0x027e05f4 module:dtcm diff --git a/config/usa/arm9/overlays/ov013/relocs.txt b/config/usa/arm9/overlays/ov013/relocs.txt index 5be88d46..30ff1738 100644 --- a/config/usa/arm9/overlays/ov013/relocs.txt +++ b/config/usa/arm9/overlays/ov013/relocs.txt @@ -272,7 +272,7 @@ from:0x0211528c kind:arm_call to:0x020f7fcc module:overlay(1) from:0x021152ac kind:arm_call to:0x020f7ed4 module:overlay(1) from:0x021152c0 kind:arm_call to:0x020f4fc4 module:overlay(1) from:0x021152d8 kind:arm_call to:0x02115780 module:overlay(13) -from:0x021152f0 kind:load to:0x020575d4 module:main +from:0x021152f0 kind:load to:0x020575cc add:8 module:main from:0x021152f4 kind:load to:0x02116140 module:overlay(13) from:0x021152f8 kind:load to:0x02115338 module:overlay(13) from:0x021152fc kind:load to:0x02115358 module:overlay(13) diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 851aaca6..b8b242ee 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1353,8 +1353,8 @@ func_0202bc10 kind:function(arm,size=0x28) addr:0x0202bbf8 func_0202bc38 kind:function(arm,size=0x320) addr:0x0202bc20 func_0202bf58 kind:function(arm,size=0x68) addr:0x0202bf40 func_0202bfc0 kind:function(arm,size=0xe8) addr:0x0202bfa8 -_ZN8GameModeD0Ev kind:function(thumb,size=0x2) addr:0x0202c090 -_ZN8GameModeD2Ev kind:function(thumb,size=0xc) addr:0x0202c094 +_ZN8GameModeD1Ev kind:function(thumb,size=0x2) addr:0x0202c090 +_ZN8GameModeD0Ev kind:function(thumb,size=0xc) addr:0x0202c094 _ZN8GameMode13func_0202c0b8Ev kind:function(thumb,size=0x2) addr:0x0202c0a0 _ZN8GameMode8vfunc_0cEPt kind:function(thumb,size=0x2) addr:0x0202c0a4 _ZN8GameMode8vfunc_10EPt kind:function(thumb,size=0x2) addr:0x0202c0a8 @@ -2645,7 +2645,7 @@ data_02057610 kind:data(any) addr:0x020575b0 data_02057618 kind:data(any) addr:0x020575b8 data_02057620 kind:data(any) addr:0x020575c0 data_02057628 kind:data(any) addr:0x020575c8 -data_02057634 kind:data(any) addr:0x020575d4 +_ZTV8GameMode kind:data(any) addr:0x020575cc data_02057650 kind:data(any) addr:0x020575f0 data_0205765c kind:data(any) addr:0x020575fc gBuildDate kind:data(any) addr:0x02057604 diff --git a/src/Main/Game/GameMode.cpp b/src/Main/Game/GameMode.cpp index fa86d5bc..fd68c708 100644 --- a/src/Main/Game/GameMode.cpp +++ b/src/Main/Game/GameMode.cpp @@ -1,8 +1,8 @@ #include "Game/GameMode.hpp" -GameMode::~GameMode() {} -void GameMode::func_0202c0b8() {} -void GameMode::vfunc_0c(u16 *param1) {} -void GameMode::vfunc_10(u16 *param1) {} -void GameMode::vfunc_14(u16 *param1) {} -void GameMode::vfunc_18() {} +THUMB GameMode::~GameMode() {} +THUMB void GameMode::func_0202c0b8() {} +THUMB void GameMode::vfunc_0c(u16 *param1) {} +THUMB void GameMode::vfunc_10(u16 *param1) {} +THUMB void GameMode::vfunc_14(u16 *param1) {} +THUMB void GameMode::vfunc_18() {}