diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index 50a22bdb..2176ff50 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -67,14 +67,6 @@ libs/c/src/ansi_files.c: .data start:0x020446a8 end:0x0204478c .bss start:0x020517a0 end:0x02051aa0 -libs/c/src/float.c: - complete - .data start:0x0204478c end:0x02044790 - -libs/c/src/locale.c: - complete - .data start:0x02044790 end:0x020449ac - libs/c/src/arith.c: complete .text start:0x020338d4 end:0x020338ec @@ -121,6 +113,14 @@ libs/c/src/wmem.c: complete .text start:0x020341f8 end:0x02034230 +libs/c/src/float.c: + complete + .data start:0x0204478c end:0x02044790 + +libs/c/src/locale.c: + complete + .data start:0x02044790 end:0x020449ac + libs/c/src/wprintf.c: .text start:0x02034230 end:0x0203615c .data start:0x020449ac end:0x02044a2c diff --git a/config/eur/arm9/itcm/symbols.txt b/config/eur/arm9/itcm/symbols.txt index fe758a88..bc746fd2 100644 --- a/config/eur/arm9/itcm/symbols.txt +++ b/config/eur/arm9/itcm/symbols.txt @@ -120,12 +120,12 @@ func_01ffc25c kind:function(arm,size=0x24) addr:0x01ffc25c func_01ffc280 kind:function(arm,size=0x60) addr:0x01ffc280 func_01ffc2e0 kind:function(arm,size=0xb8) addr:0x01ffc2e0 func_01ffc398 kind:function(arm,size=0x1c) addr:0x01ffc398 -func_01ffc3b4 kind:function(arm,size=0x20) addr:0x01ffc3b4 +_ZN10UnkSystem513func_01ffc3b4Ev kind:function(arm,size=0x20) addr:0x01ffc3b4 func_01ffc3d4 kind:function(arm,size=0x88) addr:0x01ffc3d4 func_01ffc45c kind:function(arm,size=0x70) addr:0x01ffc45c func_01ffc4cc kind:function(arm,size=0x54) addr:0x01ffc4cc func_01ffc520 kind:function(arm,size=0x5c) addr:0x01ffc520 -func_01ffc57c kind:function(arm,size=0x24) addr:0x01ffc57c +_ZN10UnkSystem48vfunc_0CEv kind:function(arm,size=0x24) addr:0x01ffc57c func_01ffc5a0 kind:function(arm,size=0x94) addr:0x01ffc5a0 func_01ffc634 kind:function(arm,size=0xa0) addr:0x01ffc634 func_01ffc6d4 kind:function(arm,size=0x70) addr:0x01ffc6d4 @@ -184,7 +184,7 @@ func_01ffe954 kind:function(arm,size=0x80) addr:0x01ffe954 func_01ffe9d4 kind:function(arm,size=0x308) addr:0x01ffe9d4 func_01ffecdc kind:function(arm,size=0xd0) addr:0x01ffecdc func_01ffedac kind:function(arm,size=0x48) addr:0x01ffedac -func_01ffedf4 kind:function(arm,size=0x1c) addr:0x01ffedf4 +_ZN21UnkStruct_027e0cd8_0c13func_01ffedf4EP5Vec2b kind:function(arm,size=0x1c) addr:0x01ffedf4 func_01ffee10 kind:function(arm,size=0x124) addr:0x01ffee10 func_01ffef34 kind:function(arm,size=0x128) addr:0x01ffef34 func_01fff05c kind:function(arm,size=0x58) addr:0x01fff05c diff --git a/config/eur/arm9/overlays/ov000/delinks.txt b/config/eur/arm9/overlays/ov000/delinks.txt index 4f358a10..098dd3b7 100644 --- a/config/eur/arm9/overlays/ov000/delinks.txt +++ b/config/eur/arm9/overlays/ov000/delinks.txt @@ -57,16 +57,20 @@ src/000_Second/Actor/ActorUnkEFIK.cpp: .data start:0x020b342c end:0x020b34b0 .bss start:0x020b5ce4 end:0x020b5d30 -src/000_Second/MapObject/MapObjectUnkSWST.cpp: +src/000_Second/MapObject/MapObjectSwitchStep.cpp: .text start:0x0209dce0 end:0x0209e3f8 + .rodata start:0x020af550 end:0x020af574 .init start:0x020b0950 end:0x020b09ac .ctor start:0x020b191c end:0x020b1920 - .bss start:0x020b6118 end:0x020b6228 + .data start:0x020b3678 end:0x020b3744 + .bss start:0x020b6114 end:0x020b6228 -src/000_Second/MapObject/MapObjectUnkBLCM.cpp: +src/000_Second/MapObject/MapObjectMiniBlocks.cpp: .text start:0x0209e3f8 end:0x0209e768 + .rodata start:0x020af574 end:0x020af580 .init start:0x020b09ac end:0x020b09fc .ctor start:0x020b1920 end:0x020b1924 + .data start:0x020b3744 end:0x020b37ac .bss start:0x020b6228 end:0x020b62a0 src/000_Second/Item/ItemManager.cpp: diff --git a/config/eur/arm9/overlays/ov000/relocs.txt b/config/eur/arm9/overlays/ov000/relocs.txt index c487eb8f..22368167 100644 --- a/config/eur/arm9/overlays/ov000/relocs.txt +++ b/config/eur/arm9/overlays/ov000/relocs.txt @@ -7233,12 +7233,12 @@ from:0x0209dcfc kind:arm_call to:0x02011f3c module:main from:0x0209dd08 kind:arm_call to:0x0209dea0 module:overlay(0) from:0x0209dd20 kind:arm_call to:0x0209c9a8 module:overlay(0) from:0x0209dd30 kind:arm_call to:0x0207c018 module:overlay(0) -from:0x0209dd94 kind:load to:0x020b369c module:overlay(0) -from:0x0209dd98 kind:load to:0x020b36b8 module:overlay(0) -from:0x0209dd9c kind:load to:0x020b3680 module:overlay(0) +from:0x0209dd94 kind:load to:0x020b3694 add:0x8 module:overlay(0) +from:0x0209dd98 kind:load to:0x020b36b0 add:0x8 module:overlay(0) +from:0x0209dd9c kind:load to:0x020b3678 add:0x8 module:overlay(0) from:0x0209ddb4 kind:arm_call_thumb to:0x02057b54 module:overlay(0) from:0x0209ddd0 kind:arm_call to:0x0209dde0 module:overlay(0) -from:0x0209dddc kind:load to:0x020b36e0 module:overlay(0) +from:0x0209dddc kind:load to:0x020b36d8 add:0x8 module:overlay(0) from:0x0209ddf8 kind:arm_call to:0x02057c38 module:overlay(0) from:0x0209de08 kind:arm_call to:0x02057c38 module:overlay(0) from:0x0209de40 kind:arm_call to:0x0200f218 module:main @@ -7249,23 +7249,23 @@ from:0x0209decc kind:arm_call_thumb to:0x0205778c module:overlay(0) from:0x0209df4c kind:arm_call to:0x02058a24 module:overlay(0) from:0x0209df60 kind:arm_call to:0x02058a84 module:overlay(0) from:0x0209df74 kind:arm_call to:0x020577a4 module:overlay(0) -from:0x0209df88 kind:load to:0x020b370c module:overlay(0) +from:0x0209df88 kind:load to:0x020b3704 add:0x8 module:overlay(0) from:0x0209df8c kind:load to:0x020b6130 module:overlay(0) -from:0x0209df90 kind:load to:0x020b6150 module:overlay(0) +from:0x0209df90 kind:load to:0x020b6130 add:0x20 module:overlay(0) from:0x0209df94 kind:load to:0x020af550 module:overlay(0) -from:0x0209df98 kind:load to:0x020b6204 module:overlay(0) +from:0x0209df98 kind:load to:0x020b6130 add:0xd4 module:overlay(0) from:0x0209dfa4 kind:arm_call_thumb to:0x02057bd4 module:overlay(0) from:0x0209dfd8 kind:arm_call to:0x0209e11c module:overlay(0) from:0x0209dfe8 kind:arm_call to:0x0209d2c4 module:overlay(0) from:0x0209dff0 kind:arm_call_thumb to:0x02057bd4 module:overlay(0) from:0x0209dff8 kind:arm_call to:0x0209d0ac module:overlay(0) -from:0x0209e004 kind:load to:0x020b370c module:overlay(0) +from:0x0209e004 kind:load to:0x020b3704 add:0x8 module:overlay(0) from:0x0209e030 kind:arm_call to:0x0209e11c module:overlay(0) from:0x0209e040 kind:arm_call to:0x0209d2c4 module:overlay(0) from:0x0209e048 kind:arm_call_thumb to:0x02057bd4 module:overlay(0) from:0x0209e050 kind:arm_call to:0x0209d0ac module:overlay(0) from:0x0209e058 kind:arm_call to:0x02011ff4 module:main -from:0x0209e064 kind:load to:0x020b370c module:overlay(0) +from:0x0209e064 kind:load to:0x020b3704 add:0x8 module:overlay(0) from:0x0209e0a0 kind:arm_call to:0x0209d29c module:overlay(0) from:0x0209e0c4 kind:arm_call to:0x0209e11c module:overlay(0) from:0x0209e0f8 kind:arm_call to:0x0205fc20 module:overlay(0) @@ -7300,10 +7300,10 @@ from:0x0209e400 kind:load to:0x020b6238 module:overlay(0) from:0x0209e414 kind:arm_call to:0x02011f3c module:main from:0x0209e420 kind:arm_call to:0x0209e474 module:overlay(0) from:0x0209e440 kind:arm_call to:0x0209cb4c module:overlay(0) -from:0x0209e46c kind:load to:0x020b374c module:overlay(0) +from:0x0209e46c kind:load to:0x020b3744 add:0x8 module:overlay(0) from:0x0209e47c kind:arm_call to:0x0209cfe0 module:overlay(0) -from:0x0209e4a8 kind:load to:0x020b3774 module:overlay(0) -from:0x0209e4ac kind:load to:0x020b1968 module:overlay(0) +from:0x0209e4a8 kind:load to:0x020b376c add:0x8 module:overlay(0) +from:0x0209e4ac kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0209e4d0 kind:arm_call to:0x0209ccd8 module:overlay(0) from:0x0209e500 kind:arm_call to:0x01ffedf4 module:itcm from:0x0209e680 kind:arm_call to:0x01ff9638 module:itcm diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 42c7cb04..9b53e6a3 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -66,9 +66,9 @@ _ZN19func_ov000_02057734D0Ev kind:function(arm,size=0x1c) addr:0x02057734 func_ov000_02057750 kind:function(thumb,size=0xc) addr:0x02057750 func_ov000_0205775c kind:function(thumb,size=0x20) addr:0x0205775c func_ov000_0205777c kind:function(thumb,size=0xe) addr:0x0205777c -func_ov000_0205778c kind:function(thumb,size=0x18) addr:0x0205778c -func_ov000_020577a4 kind:function(arm,size=0x54) addr:0x020577a4 -func_ov000_020577f8 kind:function(arm,size=0x38) addr:0x020577f8 +_ZN10UnkSystem5C1EPvi kind:function(thumb,size=0x18) addr:0x0205778c +_ZN10UnkSystem519func_ov000_020577a4Eiii kind:function(arm,size=0x54) addr:0x020577a4 +_ZN10UnkSystem519func_ov000_020577f8Ei kind:function(arm,size=0x38) addr:0x020577f8 func_ov000_02057830 kind:function(arm,size=0x3c) addr:0x02057830 func_ov000_0205786c kind:function(arm,size=0x38) addr:0x0205786c func_ov000_020578a4 kind:function(arm,size=0x20) addr:0x020578a4 @@ -90,15 +90,15 @@ func_ov000_02057af4 kind:function(arm,size=0x14) addr:0x02057af4 _ZN19func_ov000_02057b08D0Ev kind:function(arm,size=0x1c) addr:0x02057b08 _ZN19func_ov000_02057b24D1Ev kind:function(arm,size=0x14) addr:0x02057b24 _ZN19func_ov000_02057b38D0Ev kind:function(arm,size=0x1c) addr:0x02057b38 -func_ov000_02057b54 kind:function(thumb,size=0x1c) addr:0x02057b54 -_ZN22UnkStruct_PlayerGet_8cC1Ei kind:function(thumb,size=0x1c) addr:0x02057b70 -_ZN22UnkStruct_PlayerGet_8cD1Ev kind:function(thumb,size=0x20) addr:0x02057b8c -func_ov000_02057bac kind:function(thumb,size=0x28) addr:0x02057bac -func_ov000_02057bd4 kind:function(thumb,size=0x20) addr:0x02057bd4 -func_ov000_02057bf4 kind:function(arm,size=0x20) addr:0x02057bf4 +_ZN10UnkSystem4C2Ei kind:function(thumb,size=0x1c) addr:0x02057b54 +_ZN10UnkSystem4C1Ei kind:function(thumb,size=0x1c) addr:0x02057b70 +_ZN10UnkSystem4D1Ev kind:function(thumb,size=0x20) addr:0x02057b8c +_ZN10UnkSystem4D0Ev kind:function(thumb,size=0x28) addr:0x02057bac +_ZN10UnkSystem4D2Ev kind:function(thumb,size=0x20) addr:0x02057bd4 +_ZN10UnkSystem48vfunc_08Ei kind:function(arm,size=0x20) addr:0x02057bf4 func_ov000_02057c14 kind:function(arm,size=0x20) addr:0x02057c14 -func_ov000_02057c34 kind:function(arm,size=0x4) addr:0x02057c34 -func_ov000_02057c38 kind:function(arm,size=0x34) addr:0x02057c38 +_ZN10UnkSystem48vfunc_1CEP19UnkSystem4_vfunc_1C kind:function(arm,size=0x4) addr:0x02057c34 +_ZN10UnkSystem419func_ov000_02057c38Eii kind:function(arm,size=0x34) addr:0x02057c38 func_ov000_02057c6c kind:function(arm,size=0x2c) addr:0x02057c6c func_ov000_02057c98 kind:function(arm,size=0x18) addr:0x02057c98 func_ov000_02057cb0 kind:function(arm,size=0x18) addr:0x02057cb0 @@ -107,14 +107,14 @@ func_ov000_02057cf4 kind:function(arm,size=0x2c) addr:0x02057cf4 func_ov000_02057d20 kind:function(thumb,size=0x1c) addr:0x02057d20 func_ov000_02057d3c kind:function(arm,size=0x30) addr:0x02057d3c func_ov000_02057d6c kind:function(arm,size=0x18) addr:0x02057d6c -func_ov000_02057d84 kind:function(arm,size=0x18) addr:0x02057d84 +_ZN10UnkSystem48vfunc_20Ev kind:function(arm,size=0x18) addr:0x02057d84 func_ov000_02057d9c kind:function(arm,size=0x2c) addr:0x02057d9c -func_ov000_02057dc8 kind:function(arm,size=0x7c) addr:0x02057dc8 -func_ov000_02057e44 kind:function(arm,size=0x64) addr:0x02057e44 -func_ov000_02057ea8 kind:function(arm,size=0x1c) addr:0x02057ea8 +_ZN10UnkSystem48vfunc_10Ev kind:function(arm,size=0x7c) addr:0x02057dc8 +_ZN10UnkSystem48vfunc_14Ev kind:function(arm,size=0x64) addr:0x02057e44 +_ZN10UnkSystem48vfunc_18Ev kind:function(arm,size=0x1c) addr:0x02057ea8 func_ov000_02057ec4 kind:function(thumb,size=0x2) addr:0x02057ec4 _ZN19func_ov000_02057ec8D0Ev kind:function(thumb,size=0xc) addr:0x02057ec8 -func_ov000_02057ed4 kind:function(thumb,size=0x2) addr:0x02057ed4 +_ZN10UnkSystem6D1Ev kind:function(thumb,size=0x2) addr:0x02057ed4 func_ov000_02057ed8 kind:function(arm,size=0x8) addr:0x02057ed8 func_ov000_02057ee0 kind:function(arm,size=0x14) addr:0x02057ee0 func_ov000_02057ef4 kind:function(arm,size=0x24) addr:0x02057ef4 @@ -154,9 +154,9 @@ func_ov000_020588f0 kind:function(thumb,size=0x10) addr:0x020588f0 func_ov000_02058900 kind:function(thumb,size=0x12) addr:0x02058900 func_ov000_02058914 kind:function(thumb,size=0xd0) addr:0x02058914 func_ov000_020589e4 kind:function(thumb,size=0x40) addr:0x020589e4 -func_ov000_02058a24 kind:function(arm,size=0x34) addr:0x02058a24 +_ZN28MapObjectProfile_Derived2_2019func_ov000_02058a24Ev kind:function(arm,size=0x34) addr:0x02058a24 func_ov000_02058a58 kind:function(arm,size=0x2c) addr:0x02058a58 -func_ov000_02058a84 kind:function(arm,size=0x2c) addr:0x02058a84 +_ZN28MapObjectProfile_Derived2_2019func_ov000_02058a84EiPKc kind:function(arm,size=0x2c) addr:0x02058a84 func_ov000_02058ab0 kind:function(arm,size=0xe8) addr:0x02058ab0 func_ov000_02058b98 kind:function(thumb,size=0x1c) addr:0x02058b98 func_ov000_02058bb4 kind:function(arm,size=0x34) addr:0x02058bb4 @@ -398,7 +398,7 @@ func_ov000_0205f6c4 kind:function(arm,size=0x20) addr:0x0205f6c4 func_ov000_0205f6e4 kind:function(arm,size=0xf0) addr:0x0205f6e4 func_ov000_0205f7d4 kind:function(arm,size=0x114) addr:0x0205f7d4 func_ov000_0205f8e8 kind:function(arm,size=0x338) addr:0x0205f8e8 -_ZN31UnkStruct_ov019_020d24c8_28_25819func_ov000_0205fc20EiiPvS0_ kind:function(arm,size=0xe8) addr:0x0205fc20 +_ZN34UnkStruct_ov019_020d24c8_28_258_0019func_ov000_0205fc20EiiPvS0_ kind:function(arm,size=0xe8) addr:0x0205fc20 func_ov000_0205fd08 kind:function(arm,size=0x38) addr:0x0205fd08 func_ov000_0205fd40 kind:function(arm,size=0x90) addr:0x0205fd40 func_ov000_0205fdd0 kind:function(arm,size=0x28) addr:0x0205fdd0 @@ -1416,7 +1416,7 @@ func_ov000_0207bffc kind:function(arm,size=0x4) addr:0x0207bffc func_ov000_0207c000 kind:function(arm,size=0x8) addr:0x0207c000 func_ov000_0207c008 kind:function(arm,size=0x8) addr:0x0207c008 func_ov000_0207c010 kind:function(arm,size=0x8) addr:0x0207c010 -func_ov000_0207c018 kind:function(arm,size=0x30) addr:0x0207c018 +_ZN24MapObjectProfile_D4_BaseC2Ev kind:function(arm,size=0x30) addr:0x0207c018 func_ov000_0207c048 kind:function(arm,size=0x30) addr:0x0207c048 func_ov000_0207c078 kind:function(arm,size=0x38) addr:0x0207c078 func_ov000_0207c0b0 kind:function(arm,size=0x54) addr:0x0207c0b0 @@ -2518,12 +2518,12 @@ func_ov000_0209c970 kind:function(arm,size=0x2c) addr:0x0209c970 func_ov000_0209c99c kind:function(arm,size=0x4) addr:0x0209c99c func_ov000_0209c9a0 kind:function(arm,size=0x4) addr:0x0209c9a0 func_ov000_0209c9a4 kind:function(arm,size=0x4) addr:0x0209c9a4 -func_ov000_0209c9a8 kind:function(arm,size=0x30) addr:0x0209c9a8 -func_ov000_0209c9d8 kind:function(arm,size=0x38) addr:0x0209c9d8 -func_ov000_0209ca10 kind:function(arm,size=0x8) addr:0x0209ca10 -func_ov000_0209ca18 kind:function(arm,size=0x40) addr:0x0209ca18 -func_ov000_0209ca58 kind:function(arm,size=0x20) addr:0x0209ca58 -func_ov000_0209ca78 kind:function(arm,size=0x10) addr:0x0209ca78 +_ZN25MapObjectProfile_Derived2C2Ejj kind:function(arm,size=0x30) addr:0x0209c9a8 +_ZN25MapObjectProfile_Derived2D2Ev kind:function(arm,size=0x38) addr:0x0209c9d8 +_ZN25MapObjectProfile_Derived28vfunc_04Ev kind:function(arm,size=0x8) addr:0x0209ca10 +_ZN25MapObjectProfile_Derived28vfunc_08Ev kind:function(arm,size=0x40) addr:0x0209ca18 +_ZN25MapObjectProfile_Derived28vfunc_0CEv kind:function(arm,size=0x20) addr:0x0209ca58 +_ZN25MapObjectProfile_Derived28vfunc_10Ev kind:function(arm,size=0x10) addr:0x0209ca78 func_ov000_0209ca88 kind:function(arm,size=0x30) addr:0x0209ca88 func_ov000_0209cab8 kind:function(arm,size=0x8) addr:0x0209cab8 func_ov000_0209cac0 kind:function(arm,size=0x2c) addr:0x0209cac0 @@ -2531,50 +2531,50 @@ func_ov000_0209caec kind:function(arm,size=0x20) addr:0x0209caec func_ov000_0209cb0c kind:function(arm,size=0x38) addr:0x0209cb0c func_ov000_0209cb44 kind:function(arm,size=0x4) addr:0x0209cb44 func_ov000_0209cb48 kind:function(arm,size=0x4) addr:0x0209cb48 -func_ov000_0209cb4c kind:function(arm,size=0x50) addr:0x0209cb4c -func_ov000_0209cb9c kind:function(arm,size=0x18) addr:0x0209cb9c -func_ov000_0209cbb4 kind:function(arm,size=0x14) addr:0x0209cbb4 -func_ov000_0209cbc8 kind:function(arm,size=0x58) addr:0x0209cbc8 -_ZN19func_ov000_0209cc20D0Ev kind:function(arm,size=0x60) addr:0x0209cc20 -func_ov000_0209cc80 kind:function(arm,size=0x58) addr:0x0209cc80 -func_ov000_0209ccd8 kind:function(arm,size=0x88) addr:0x0209ccd8 -func_ov000_0209cd60 kind:function(arm,size=0x1c) addr:0x0209cd60 -func_ov000_0209cd7c kind:function(arm,size=0x44) addr:0x0209cd7c -func_ov000_0209cdc0 kind:function(arm,size=0x48) addr:0x0209cdc0 +_ZN25MapObjectProfile_Derived1C2Ejii kind:function(arm,size=0x50) addr:0x0209cb4c +_ZN25MapObjectProfile_Derived18vfunc_04Ev kind:function(arm,size=0x18) addr:0x0209cb9c +_ZN25MapObjectProfile_Derived18vfunc_1CEi kind:function(arm,size=0x14) addr:0x0209cbb4 +_ZN25MapObjectProfile_Derived1D1Ev kind:function(arm,size=0x58) addr:0x0209cbc8 +_ZN25MapObjectProfile_Derived1D0Ev kind:function(arm,size=0x60) addr:0x0209cc20 +_ZN25MapObjectProfile_Derived1D2Ev kind:function(arm,size=0x58) addr:0x0209cc80 +_ZN25MapObjectProfile_Derived119func_ov000_0209ccd8Eij kind:function(arm,size=0x88) addr:0x0209ccd8 +_ZN25MapObjectProfile_Derived18vfunc_08Ev kind:function(arm,size=0x1c) addr:0x0209cd60 +_ZN25MapObjectProfile_Derived18vfunc_0CEv kind:function(arm,size=0x44) addr:0x0209cd7c +_ZN25MapObjectProfile_Derived18vfunc_10Ev kind:function(arm,size=0x48) addr:0x0209cdc0 func_ov000_0209ce08 kind:function(arm,size=0x70) addr:0x0209ce08 _ZN19func_ov000_0209ce78D1Ev kind:function(arm,size=0x38) addr:0x0209ce78 _ZN19func_ov000_0209ceb0D0Ev kind:function(arm,size=0x40) addr:0x0209ceb0 func_ov000_0209cef0 kind:function(arm,size=0xbc) addr:0x0209cef0 func_ov000_0209cfac kind:function(arm,size=0x30) addr:0x0209cfac func_ov000_0209cfdc kind:function(arm,size=0x4) addr:0x0209cfdc -func_ov000_0209cfe0 kind:function(arm,size=0xb4) addr:0x0209cfe0 -func_ov000_0209d094 kind:function(arm,size=0x4) addr:0x0209d094 -_ZN19func_ov000_0209d098D0Ev kind:function(arm,size=0x14) addr:0x0209d098 -func_ov000_0209d0ac kind:function(arm,size=0x4) addr:0x0209d0ac -func_ov000_0209d0b0 kind:function(arm,size=0x8) addr:0x0209d0b0 -func_ov000_0209d0b8 kind:function(arm,size=0x4) addr:0x0209d0b8 -func_ov000_0209d0bc kind:function(arm,size=0x58) addr:0x0209d0bc -func_ov000_0209d114 kind:function(arm,size=0x18) addr:0x0209d114 -func_ov000_0209d12c kind:function(arm,size=0x18) addr:0x0209d12c -func_ov000_0209d144 kind:function(arm,size=0x88) addr:0x0209d144 -func_ov000_0209d1cc kind:function(arm,size=0x8) addr:0x0209d1cc -func_ov000_0209d1d4 kind:function(arm,size=0x4) addr:0x0209d1d4 -func_ov000_0209d1d8 kind:function(arm,size=0xc) addr:0x0209d1d8 -func_ov000_0209d1e4 kind:function(arm,size=0x8) addr:0x0209d1e4 -func_ov000_0209d1ec kind:function(arm,size=0x40) addr:0x0209d1ec -func_ov000_0209d22c kind:function(arm,size=0x48) addr:0x0209d22c -func_ov000_0209d274 kind:function(arm,size=0x28) addr:0x0209d274 -func_ov000_0209d29c kind:function(arm,size=0x28) addr:0x0209d29c -func_ov000_0209d2c4 kind:function(arm,size=0x2c) addr:0x0209d2c4 -func_ov000_0209d2f0 kind:function(arm,size=0xc4) addr:0x0209d2f0 -func_ov000_0209d3b4 kind:function(arm,size=0x80) addr:0x0209d3b4 -func_ov000_0209d434 kind:function(arm,size=0xe4) addr:0x0209d434 -func_ov000_0209d518 kind:function(arm,size=0x34) addr:0x0209d518 -func_ov000_0209d54c kind:function(arm,size=0x7c) addr:0x0209d54c -func_ov000_0209d5c8 kind:function(arm,size=0x4c) addr:0x0209d5c8 -func_ov000_0209d614 kind:function(arm,size=0x54) addr:0x0209d614 -func_ov000_0209d668 kind:function(arm,size=0x44) addr:0x0209d668 -func_ov000_0209d6ac kind:function(arm,size=0x54) addr:0x0209d6ac +_ZN9MapObjectC2Ev kind:function(arm,size=0xb4) addr:0x0209cfe0 +_ZN9MapObjectD1Ev kind:function(arm,size=0x4) addr:0x0209d094 +_ZN9MapObjectD0Ev kind:function(arm,size=0x14) addr:0x0209d098 +_ZN9MapObjectD2Ev kind:function(arm,size=0x4) addr:0x0209d0ac +_ZN9MapObject8vfunc_00Ev kind:function(arm,size=0x8) addr:0x0209d0b0 +_ZN9MapObject8vfunc_04Ev kind:function(arm,size=0x4) addr:0x0209d0b8 +_ZN9MapObject19func_ov000_0209d0bcEv kind:function(arm,size=0x58) addr:0x0209d0bc +_ZN9MapObject19func_ov000_0209d114Ev kind:function(arm,size=0x18) addr:0x0209d114 +_ZN9MapObject19func_ov000_0209d12cEv kind:function(arm,size=0x18) addr:0x0209d12c +_ZN9MapObject19func_ov000_0209d144Ev kind:function(arm,size=0x88) addr:0x0209d144 +_ZN9MapObject8vfunc_1CEv kind:function(arm,size=0x8) addr:0x0209d1cc +_ZN9MapObject8vfunc_20Ev kind:function(arm,size=0x4) addr:0x0209d1d4 +_ZN9MapObject8vfunc_24Ev kind:function(arm,size=0xc) addr:0x0209d1d8 +_ZN9MapObject8vfunc_28Ev kind:function(arm,size=0x8) addr:0x0209d1e4 +_ZN9MapObject8vfunc_2CEv kind:function(arm,size=0x40) addr:0x0209d1ec +_ZN9MapObject19func_ov000_0209d22cEv kind:function(arm,size=0x48) addr:0x0209d22c +_ZN9MapObject19func_ov000_0209d274Ev kind:function(arm,size=0x28) addr:0x0209d274 +_ZN9MapObject19func_ov000_0209d29cEi kind:function(arm,size=0x28) addr:0x0209d29c +_ZN9MapObject19func_ov000_0209d2c4Eii kind:function(arm,size=0x2c) addr:0x0209d2c4 +_ZN9MapObject19func_ov000_0209d2f0Ev kind:function(arm,size=0xc4) addr:0x0209d2f0 +_ZN9MapObject19func_ov000_0209d3b4Ev kind:function(arm,size=0x80) addr:0x0209d3b4 +_ZN9MapObject19func_ov000_0209d434Ev kind:function(arm,size=0xe4) addr:0x0209d434 +_ZN9MapObject19func_ov000_0209d518Ev kind:function(arm,size=0x34) addr:0x0209d518 +_ZN9MapObject19func_ov000_0209d54cEv kind:function(arm,size=0x7c) addr:0x0209d54c +_ZN9MapObject19func_ov000_0209d5c8Ev kind:function(arm,size=0x4c) addr:0x0209d5c8 +_ZN9MapObject19func_ov000_0209d614Ev kind:function(arm,size=0x54) addr:0x0209d614 +_ZN9MapObject19func_ov000_0209d668Ev kind:function(arm,size=0x44) addr:0x0209d668 +_ZN9MapObject19func_ov000_0209d6acEv kind:function(arm,size=0x54) addr:0x0209d6ac func_ov000_0209d700 kind:function(arm,size=0x50) addr:0x0209d700 _ZN19func_ov000_0209d750D0Ev kind:function(arm,size=0x1c) addr:0x0209d750 _ZN19func_ov000_0209d76cD2Ev kind:function(arm,size=0x14) addr:0x0209d76c @@ -2597,33 +2597,33 @@ func_ov000_0209dc7c kind:function(arm,size=0x4) addr:0x0209dc7c func_ov000_0209dc80 kind:function(arm,size=0x18) addr:0x0209dc80 _ZN19func_ov000_0209dc98D1Ev kind:function(arm,size=0x20) addr:0x0209dc98 _ZN19func_ov000_0209dcb8D0Ev kind:function(arm,size=0x28) addr:0x0209dcb8 -_ZN23MapObjectProfileUnkSWST10GetProfileEv kind:function(arm,size=0xc) addr:0x0209dce0 -_ZN23MapObjectProfileUnkSWST6CreateEv kind:function(arm,size=0x24) addr:0x0209dcec -_ZN23MapObjectProfileUnkSWSTC1Ev kind:function(arm,size=0x94) addr:0x0209dd10 -_ZN16MapObjectUnkSWST19func_ov000_0209dda4Ev kind:function(arm,size=0x3c) addr:0x0209dda4 -_ZN16MapObjectUnkSWST19func_ov000_0209dde0Ev kind:function(arm,size=0x30) addr:0x0209dde0 -_ZN16MapObjectUnkSWST19func_ov000_0209de10Ev kind:function(arm,size=0x90) addr:0x0209de10 -_ZN16MapObjectUnkSWSTC1Ev kind:function(arm,size=0xfc) addr:0x0209dea0 -_ZN16MapObjectUnkSWST19func_ov000_0209df9cEv kind:function(arm,size=0x14) addr:0x0209df9c -_ZN16MapObjectUnkSWSTD1Ev kind:function(arm,size=0x58) addr:0x0209dfb0 -_ZN16MapObjectUnkSWSTD0Ev kind:function(arm,size=0x60) addr:0x0209e008 -_ZN16MapObjectUnkSWST19func_ov000_0209e068Ev kind:function(arm,size=0xb4) addr:0x0209e068 -_ZN16MapObjectUnkSWST19func_ov000_0209e11cEv kind:function(arm,size=0x164) addr:0x0209e11c -_ZN16MapObjectUnkSWST19func_ov000_0209e280Ev kind:function(arm,size=0x34) addr:0x0209e280 -_ZN16MapObjectUnkSWST19func_ov000_0209e2b4Ev kind:function(arm,size=0xd8) addr:0x0209e2b4 -_ZN16MapObjectUnkSWST19func_ov000_0209e38cEv kind:function(arm,size=0x3c) addr:0x0209e38c -_ZN16MapObjectUnkSWST19func_ov000_0209e3c8Ev kind:function(arm,size=0x1c) addr:0x0209e3c8 -_ZN23MapObjectProfileUnkSWSTD1Ev kind:function(arm,size=0x14) addr:0x0209e3e4 -_ZN23MapObjectProfileUnkBLCM10GetProfileEv kind:function(arm,size=0xc) addr:0x0209e3f8 -_ZN23MapObjectProfileUnkBLCM6CreateEv kind:function(arm,size=0x24) addr:0x0209e404 -_ZN23MapObjectProfileUnkBLCMC1Ev kind:function(arm,size=0x4c) addr:0x0209e428 -_ZN16MapObjectUnkBLCMC1Ev kind:function(arm,size=0x3c) addr:0x0209e474 -_ZN16MapObjectUnkBLCM19func_ov000_0209e4b0Ev kind:function(arm,size=0x1fc) addr:0x0209e4b0 -_ZN16MapObjectUnkBLCM19func_ov000_0209e6acEv kind:function(arm,size=0x60) addr:0x0209e6ac -_ZN16MapObjectUnkBLCMD1Ev kind:function(arm,size=0x20) addr:0x0209e70c -_ZN16MapObjectUnkBLCMD0Ev kind:function(arm,size=0x28) addr:0x0209e72c -_ZN23MapObjectProfileUnkBLCMD1Ev kind:function(arm,size=0x14) addr:0x0209e754 -_ZN19func_ov000_0209e768D0Ev kind:function(arm,size=0x1c) addr:0x0209e768 +_ZN26MapObjectProfileSwitchStep10GetProfileEv kind:function(arm,size=0xc) addr:0x0209dce0 +_ZN26MapObjectProfileSwitchStep6CreateEv kind:function(arm,size=0x24) addr:0x0209dcec +_ZN26MapObjectProfileSwitchStepC1Ev kind:function(arm,size=0x94) addr:0x0209dd10 +_ZN22MapObjectSwitchStep_40C1Ev kind:function(arm,size=0x3c) addr:0x0209dda4 +_ZN22MapObjectSwitchStep_4019func_ov000_0209dde0Ev kind:function(arm,size=0x30) addr:0x0209dde0 +_ZN22MapObjectSwitchStep_408vfunc_1CEP19UnkSystem4_vfunc_1C kind:function(arm,size=0x90) addr:0x0209de10 +_ZN19MapObjectSwitchStepC1Ev kind:function(arm,size=0xfc) addr:0x0209dea0 +_ZN22MapObjectSwitchStep_40D1Ev kind:function(arm,size=0x14) addr:0x0209df9c +_ZN19MapObjectSwitchStepD1Ev kind:function(arm,size=0x58) addr:0x0209dfb0 +_ZN19MapObjectSwitchStepD0Ev kind:function(arm,size=0x60) addr:0x0209e008 +_ZN19MapObjectSwitchStep8vfunc_00Ev kind:function(arm,size=0xb4) addr:0x0209e068 +_ZN19MapObjectSwitchStep19func_ov000_0209e11cEii kind:function(arm,size=0x164) addr:0x0209e11c +_ZN19MapObjectSwitchStep8vfunc_20Ev kind:function(arm,size=0x34) addr:0x0209e280 +_ZN19MapObjectSwitchStep8vfunc_18Ev kind:function(arm,size=0xd8) addr:0x0209e2b4 +_ZN19MapObjectSwitchStep19func_ov000_0209e38cEv kind:function(arm,size=0x3c) addr:0x0209e38c +_ZN22MapObjectSwitchStep_40D0Ev kind:function(arm,size=0x1c) addr:0x0209e3c8 +_ZN26MapObjectProfileSwitchStepD1Ev kind:function(arm,size=0x14) addr:0x0209e3e4 +_ZN26MapObjectProfileMiniBlocks10GetProfileEv kind:function(arm,size=0xc) addr:0x0209e3f8 +_ZN26MapObjectProfileMiniBlocks6CreateEv kind:function(arm,size=0x24) addr:0x0209e404 +_ZN26MapObjectProfileMiniBlocksC1Ev kind:function(arm,size=0x4c) addr:0x0209e428 +_ZN19MapObjectMiniBlocksC1Ev kind:function(arm,size=0x3c) addr:0x0209e474 +_ZN19MapObjectMiniBlocks8vfunc_00Ev kind:function(arm,size=0x1fc) addr:0x0209e4b0 +_ZN19MapObjectMiniBlocks8vfunc_14Ev kind:function(arm,size=0x60) addr:0x0209e6ac +_ZN19MapObjectMiniBlocksD1Ev kind:function(arm,size=0x20) addr:0x0209e70c +_ZN19MapObjectMiniBlocksD0Ev kind:function(arm,size=0x28) addr:0x0209e72c +_ZN26MapObjectProfileMiniBlocksD1Ev kind:function(arm,size=0x14) addr:0x0209e754 +_ZN26MapObjectProfileMiniBlocksD0Ev kind:function(arm,size=0x1c) addr:0x0209e768 func_ov000_0209e784 kind:function(arm,size=0x3cc) addr:0x0209e784 func_ov000_0209eb50 kind:function(arm,size=0x38) addr:0x0209eb50 func_ov000_0209eb88 kind:function(arm,size=0x19c) addr:0x0209eb88 @@ -3024,7 +3024,7 @@ _ZN23ActorUnk_ov000_020a8bb019func_ov000_020a8ae0Ei kind:function(arm,size=0x14) func_ov000_020a8af4 kind:function(arm,size=0x54) addr:0x020a8af4 func_ov000_020a8b48 kind:function(arm,size=0x34) addr:0x020a8b48 func_ov000_020a8b7c kind:function(arm,size=0x34) addr:0x020a8b7c -_ZN23ActorUnk_ov000_020a8bb0C1EP29ActorUnk_ov000_020a8bb0_a4_00i kind:function(arm,size=0x110) addr:0x020a8bb0 +_ZN23ActorUnk_ov000_020a8bb0C1EP10UnkSystem4i kind:function(arm,size=0x110) addr:0x020a8bb0 _ZN23ActorUnk_ov000_020a8bb0D1Ev kind:function(arm,size=0x20) addr:0x020a8cc0 _ZN23ActorUnk_ov000_020a8bb0D0Ev kind:function(arm,size=0x28) addr:0x020a8ce0 _ZN23ActorUnk_ov000_020a8bb0D2Ev kind:function(arm,size=0x20) addr:0x020a8d08 @@ -3265,8 +3265,8 @@ data_ov000_020af0fc kind:data(word[246]) addr:0x020af0fc data_ov000_020af4d4 kind:data(any) addr:0x020af4d4 data_ov000_020af4d8 kind:data(any) addr:0x020af4d8 data_ov000_020af4ec kind:data(any) addr:0x020af4ec -data_ov000_020af550 kind:data(any) addr:0x020af550 -data_ov000_020af560 kind:data(any) addr:0x020af560 +data_ov000_020af550 kind:data(byte[7]) addr:0x020af550 +data_ov000_020af560 kind:data(byte[8]) addr:0x020af560 data_ov000_020af574 kind:data(any) addr:0x020af574 data_ov000_020af580 kind:data(any) addr:0x020af580 data_ov000_020af58c kind:data(any) addr:0x020af58c @@ -3352,8 +3352,8 @@ __sinit_ActorUnkSWTM.cpp kind:function(arm,size=0x50) addr:0x020b0838 __sinit_ActorEventIcon.cpp kind:function(arm,size=0x50) addr:0x020b0888 local __sinit_ActorUnkEFIK.cpp kind:function(arm,size=0x50) addr:0x020b08d8 local __sinit_ov000_020b0928 kind:function(arm,size=0x28) addr:0x020b0928 -__sinit_MapObjectUnkSWST.cpp kind:function(arm,size=0x5c) addr:0x020b0950 -__sinit_MapObjectUnkBLCM.cpp kind:function(arm,size=0x50) addr:0x020b09ac +__sinit_MapObjectSwitchStep.cpp kind:function(arm,size=0x5c) addr:0x020b0950 +__sinit_MapObjectMiniBlocks.cpp kind:function(arm,size=0x50) addr:0x020b09ac __sinit_ov000_020b09fc kind:function(arm,size=0x9e8) addr:0x020b09fc __sinit_ov000_020b13e4 kind:function(arm,size=0x408) addr:0x020b13e4 __sinit_ov000_020b17ec kind:function(arm,size=0x34) addr:0x020b17ec @@ -3387,8 +3387,8 @@ __sinit_ov000_020b18a0 kind:function(arm,size=0x14) addr:0x020b18a0 .p__sinit_ActorEventIcon.cpp kind:data(word) addr:0x020b1910 local .p__sinit_ActorUnkEFIK.cpp kind:data(word) addr:0x020b1914 local .p__sinit_ov000_020b0928 kind:data(word) addr:0x020b1918 -.p__sinit_MapObjectUnkSWST.cpp kind:data(word) addr:0x020b191c -.p__sinit_MapObjectUnkBLCM.cpp kind:data(word) addr:0x020b1920 +.p__sinit_MapObjectSwitchStep.cpp kind:data(word) addr:0x020b191c +.p__sinit_MapObjectMiniBlocks.cpp kind:data(word) addr:0x020b1920 .p__sinit_ov000_020b09fc kind:data(word) addr:0x020b1924 .p__sinit_ov000_020b13e4 kind:data(word) addr:0x020b1928 .p__sinit_ov000_020b17ec kind:data(word) addr:0x020b192c @@ -3396,7 +3396,7 @@ __sinit_ov000_020b18a0 kind:function(arm,size=0x14) addr:0x020b18a0 .p__sinit_ov000_020b183c kind:data(word) addr:0x020b1934 .p__sinit_ov000_020b1878 kind:data(word) addr:0x020b1938 .p__sinit_ov000_020b18a0 kind:data(word) addr:0x020b193c -data_ov000_020b1968 kind:data(any) addr:0x020b1968 +_ZTV10UnkSystem6 kind:data(any) addr:0x020b1960 data_ov000_020b198c kind:data(any) addr:0x020b198c data_ov000_020b19a8 kind:data(any) addr:0x020b19a8 data_ov000_020b19b0 kind:data(any) addr:0x020b19b0 @@ -3698,13 +3698,13 @@ data_ov000_020b3590 kind:data(any) addr:0x020b3590 data_ov000_020b35d0 kind:data(any) addr:0x020b35d0 data_ov000_020b3630 kind:data(any) addr:0x020b3630 data_ov000_020b363c kind:data(any) addr:0x020b363c -data_ov000_020b3680 kind:data(any) addr:0x020b3680 -data_ov000_020b369c kind:data(any) addr:0x020b369c -data_ov000_020b36b8 kind:data(any) addr:0x020b36b8 -data_ov000_020b36e0 kind:data(any) addr:0x020b36e0 -data_ov000_020b370c kind:data(any) addr:0x020b370c -data_ov000_020b374c kind:data(any) addr:0x020b374c -data_ov000_020b3774 kind:data(any) addr:0x020b3774 +_ZTV26MapObjectProfileSwitchStep kind:data(any) addr:0x020b3678 +_ZTV31MapObjectProfileSwitchStep_Base kind:data(any) addr:0x020b3694 +_ZTV19MapObjectProfile_D4 kind:data(any) addr:0x020b36b0 +_ZTV22MapObjectSwitchStep_40 kind:data(any) addr:0x020b36d8 +_ZTV19MapObjectSwitchStep kind:data(any) addr:0x020b3704 +_ZTV26MapObjectProfileMiniBlocks kind:data(any) addr:0x020b3744 +_ZTV19MapObjectMiniBlocks kind:data(any) addr:0x020b376c data_ov000_020b37ac kind:data(any) addr:0x020b37ac data_ov000_020b37b0 kind:data(any) addr:0x020b37b0 data_ov000_020b37b4 kind:data(any) addr:0x020b37b4 @@ -4062,15 +4062,13 @@ _ZN15ProfileInstanceI19ActorProfileUnkEFIKE8sProfileE kind:bss addr:0x020b5cf4 data_ov000_020b5d30 kind:bss addr:0x020b5d30 data_ov000_020b5d34 kind:bss addr:0x020b5d34 data_ov000_020b5d3c kind:bss addr:0x020b5d3c -data_ov000_020b6114 kind:bss addr:0x020b6114 -_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWSTE8sProfileE kind:bss addr:0x020b6118 -@10057 kind:bss addr:0x020b6124 -_ZN15ProfileInstanceI23MapObjectProfileUnkSWSTE8sProfileE kind:bss addr:0x020b6130 -data_ov000_020b6150 kind:bss addr:0x020b6150 -data_ov000_020b6204 kind:bss addr:0x020b6204 -_ZGVN15ProfileInstanceI23MapObjectProfileUnkBLCME8sProfileE kind:bss addr:0x020b6228 +_ZGVN15ProfileInstanceI26MapObjectProfileSwitchStepE8sProfileE kind:bss addr:0x020b6114 +MapObjectSwitchStep_data_020b6118 kind:bss(size=0x8) addr:0x020b6118 +@1056 kind:bss addr:0x020b6124 local +_ZN15ProfileInstanceI26MapObjectProfileSwitchStepE8sProfileE kind:bss addr:0x020b6130 +_ZGVN15ProfileInstanceI26MapObjectProfileMiniBlocksE8sProfileE kind:bss addr:0x020b6228 @10063 kind:bss addr:0x020b622c -_ZN15ProfileInstanceI23MapObjectProfileUnkBLCME8sProfileE kind:bss addr:0x020b6238 +_ZN15ProfileInstanceI26MapObjectProfileMiniBlocksE8sProfileE kind:bss addr:0x020b6238 data_ov000_020b62a0 kind:bss addr:0x020b62a0 data_ov000_020b62a4 kind:bss addr:0x020b62a4 gSaveManager kind:bss addr:0x020b62a8 diff --git a/config/eur/arm9/overlays/ov017/symbols.txt b/config/eur/arm9/overlays/ov017/symbols.txt index eea20076..89e11bc6 100644 --- a/config/eur/arm9/overlays/ov017/symbols.txt +++ b/config/eur/arm9/overlays/ov017/symbols.txt @@ -94,13 +94,13 @@ func_ov017_020c02ac kind:function(arm,size=0x48) addr:0x020c02ac func_ov017_020c02f4 kind:function(arm,size=0x48) addr:0x020c02f4 func_ov017_020c033c kind:function(arm,size=0x1d0) addr:0x020c033c func_ov017_020c050c kind:function(arm,size=0x80) addr:0x020c050c -func_ov017_020c058c kind:function(arm,size=0x4) addr:0x020c058c -func_ov017_020c0590 kind:function(arm,size=0x4) addr:0x020c0590 -func_ov017_020c0594 kind:function(arm,size=0x4) addr:0x020c0594 -func_ov017_020c0598 kind:function(arm,size=0x4) addr:0x020c0598 -func_ov017_020c059c kind:function(arm,size=0x4) addr:0x020c059c -func_ov017_020c05a0 kind:function(arm,size=0x1ac) addr:0x020c05a0 -func_ov017_020c074c kind:function(arm,size=0x28) addr:0x020c074c +_ZN9MapObject8vfunc_08Ev kind:function(arm,size=0x4) addr:0x020c058c +_ZN9MapObject8vfunc_0CEv kind:function(arm,size=0x4) addr:0x020c0590 +_ZN9MapObject8vfunc_10Ev kind:function(arm,size=0x4) addr:0x020c0594 +_ZN9MapObject8vfunc_14Ev kind:function(arm,size=0x4) addr:0x020c0598 +_ZN9MapObject8vfunc_18Ev kind:function(arm,size=0x4) addr:0x020c059c +_ZN19MapObjectSwitchStep8vfunc_08Ev kind:function(arm,size=0x1ac) addr:0x020c05a0 +_ZN19MapObjectSwitchStep8vfunc_14Ev kind:function(arm,size=0x28) addr:0x020c074c func_ov017_020c0774 kind:function(arm,size=0x130) addr:0x020c0774 func_ov017_020c08a4 kind:function(arm,size=0x20) addr:0x020c08a4 func_ov017_020c08c4 kind:function(arm,size=0xac) addr:0x020c08c4 diff --git a/config/eur/arm9/overlays/ov021/relocs.txt b/config/eur/arm9/overlays/ov021/relocs.txt index 76ddffbe..e647237f 100644 --- a/config/eur/arm9/overlays/ov021/relocs.txt +++ b/config/eur/arm9/overlays/ov021/relocs.txt @@ -1474,7 +1474,7 @@ from:0x020f63e8 kind:arm_call to:0x0209d0ac module:overlay(0) from:0x020f63f0 kind:arm_call to:0x02011ff4 module:main from:0x020f6404 kind:arm_call to:0x0209c9d8 module:overlay(0) from:0x020f6490 kind:arm_call to:0x020f877c module:overlay(21) -from:0x020f64a0 kind:load to:0x020b1968 module:overlay(0) +from:0x020f64a0 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x020f64b0 kind:arm_call_thumb to:0x02057ed4 module:overlay(0) from:0x020f64d0 kind:arm_call to:0x020974dc module:overlay(0) from:0x020f64f0 kind:arm_call to:0x020f6600 module:overlay(21) @@ -1504,7 +1504,7 @@ from:0x020f6750 kind:arm_call to:0x020f18d4 module:overlay(21) from:0x020f6764 kind:arm_call to:0x020f18a4 module:overlay(21) from:0x020f6788 kind:arm_call_thumb to:0x01ffa1a0 module:itcm from:0x020f67d4 kind:arm_call_thumb to:0x02057ed4 module:overlay(0) -from:0x020f67e0 kind:load to:0x020b1968 module:overlay(0) +from:0x020f67e0 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x020f67e4 kind:load to:0x027e0ce4 module:dtcm from:0x020f67e8 kind:load to:0x0203e964 module:main from:0x020f6860 kind:arm_call to:0x020fa3a0 module:overlay(21) diff --git a/config/eur/arm9/overlays/ov026/relocs.txt b/config/eur/arm9/overlays/ov026/relocs.txt index 8a7a63b5..53dcaf04 100644 --- a/config/eur/arm9/overlays/ov026/relocs.txt +++ b/config/eur/arm9/overlays/ov026/relocs.txt @@ -5084,7 +5084,7 @@ from:0x021096c4 kind:load to:0x02136b00 module:overlay(26) from:0x021096d4 kind:arm_call to:0x0210baa0 module:overlay(26) from:0x0210975c kind:load to:0x02136b44 module:overlay(26) from:0x02109760 kind:load to:0x0213f820 module:overlay(26) -from:0x02109764 kind:load to:0x020b1968 module:overlay(0) +from:0x02109764 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02109768 kind:load to:0x0213f8f4 module:overlay(26) from:0x02109774 kind:arm_call to:0x0210bb28 module:overlay(26) from:0x021097c8 kind:load to:0x027e0cd8 module:dtcm @@ -5115,10 +5115,10 @@ from:0x02109a38 kind:load to:0x02136b1c module:overlay(26) from:0x02109a3c kind:load to:0x02136b94 module:overlay(26) from:0x02109a58 kind:arm_call to:0x0210baa0 module:overlay(26) from:0x02109a98 kind:load to:0x02136bb0 module:overlay(26) -from:0x02109a9c kind:load to:0x020b1968 module:overlay(0) +from:0x02109a9c kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02109aa8 kind:arm_call to:0x0210baa0 module:overlay(26) from:0x02109ae8 kind:load to:0x02136bb0 module:overlay(26) -from:0x02109aec kind:load to:0x020b1968 module:overlay(0) +from:0x02109aec kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02109af8 kind:arm_call to:0x0210bb28 module:overlay(26) from:0x02109b8c kind:load to:0x027e0cd8 module:dtcm from:0x02109b9c kind:arm_call to:0x0210bd48 module:overlay(26) @@ -5297,13 +5297,13 @@ from:0x0210aeb4 kind:arm_call to:0x0210e168 module:overlay(26) from:0x0210aedc kind:arm_call to:0x0207c018 module:overlay(0) from:0x0210aeec kind:arm_call to:0x0207ec88 module:overlay(0) from:0x0210af0c kind:load to:0x02136ec4 module:overlay(26) -from:0x0210af10 kind:load to:0x020b1968 module:overlay(0) +from:0x0210af10 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0210af14 kind:load to:0x0213693c module:overlay(26) from:0x0210af20 kind:arm_call to:0x0210e168 module:overlay(26) from:0x0210af48 kind:arm_call to:0x0207c018 module:overlay(0) from:0x0210af58 kind:arm_call to:0x0207ec88 module:overlay(0) from:0x0210af6c kind:load to:0x02136ec4 module:overlay(26) -from:0x0210af70 kind:load to:0x020b1968 module:overlay(0) +from:0x0210af70 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0210af74 kind:load to:0x0213693c module:overlay(26) from:0x0210b084 kind:arm_call_thumb to:0x01ffa1a0 module:itcm from:0x0210b0b8 kind:arm_call to:0x0210b208 module:overlay(26) @@ -5599,7 +5599,7 @@ from:0x0210e2f8 kind:load to:0x02137140 module:overlay(26) from:0x0210e310 kind:arm_call to:0x0210baa0 module:overlay(26) from:0x0210e388 kind:load to:0x0213715c module:overlay(26) from:0x0210e38c kind:load to:0x0213febc module:overlay(26) -from:0x0210e390 kind:load to:0x020b1968 module:overlay(0) +from:0x0210e390 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0210e394 kind:load to:0x0213ff90 module:overlay(26) from:0x0210e3a0 kind:arm_call to:0x0210bb28 module:overlay(26) from:0x0210e3e0 kind:load to:0x027e0cd8 module:dtcm @@ -5629,7 +5629,7 @@ from:0x0210e5dc kind:arm_call to:0x0207c000 module:overlay(0) from:0x0210e5ec kind:arm_call to:0x0210baa0 module:overlay(26) from:0x0210e674 kind:load to:0x021371e4 module:overlay(26) from:0x0210e678 kind:load to:0x0213ffc0 module:overlay(26) -from:0x0210e67c kind:load to:0x020b1968 module:overlay(0) +from:0x0210e67c kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0210e680 kind:load to:0x021371c8 module:overlay(26) from:0x0210e684 kind:load to:0x02140094 module:overlay(26) from:0x0210e690 kind:arm_call to:0x0207bffc module:overlay(0) @@ -5812,7 +5812,7 @@ from:0x0210fe9c kind:arm_call to:0x02097bb8 module:overlay(0) from:0x0210fea8 kind:arm_call to:0x0209862c module:overlay(0) from:0x0210feb4 kind:load to:0x0213744c add:0x8 module:overlay(26) from:0x0210feb8 kind:load to:0x02140300 module:overlay(26) -from:0x0210febc kind:load to:0x020b1968 module:overlay(0) +from:0x0210febc kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0210fecc kind:arm_call to:0x0210fed8 module:overlay(26) from:0x0210fee8 kind:arm_call to:0x02110d14 module:overlay(26) from:0x0210ff20 kind:load to:0x02137408 module:overlay(26) diff --git a/config/eur/arm9/overlays/ov027/relocs.txt b/config/eur/arm9/overlays/ov027/relocs.txt index b0153e0a..5aa61952 100644 --- a/config/eur/arm9/overlays/ov027/relocs.txt +++ b/config/eur/arm9/overlays/ov027/relocs.txt @@ -438,7 +438,7 @@ from:0x02144350 kind:arm_call to:0x0207ec88 module:overlay(0) from:0x02144364 kind:load to:0x02148ac4 module:overlay(27) from:0x02144368 kind:load to:0x0214969c module:overlay(27) from:0x0214436c kind:load to:0x02147f0c module:overlay(27) -from:0x02144370 kind:load to:0x020b1968 module:overlay(0) +from:0x02144370 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02144374 kind:load to:0x02148a9c module:overlay(27) from:0x02144384 kind:arm_call to:0x0210bb28 module:overlay(26) from:0x021443a4 kind:arm_call to:0x01fff6d0 module:itcm @@ -499,7 +499,7 @@ from:0x02144914 kind:arm_call to:0x02097bb8 module:overlay(0) from:0x0214492c kind:arm_call to:0x0209862c module:overlay(0) from:0x02144938 kind:load to:0x02148b84 add:0x8 module:overlay(27) from:0x0214493c kind:load to:0x02149784 module:overlay(27) -from:0x02144940 kind:load to:0x020b1968 module:overlay(0) +from:0x02144940 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02144960 kind:arm_call to:0x02098a60 module:overlay(0) from:0x02144994 kind:arm_call to:0x020984d0 module:overlay(0) from:0x021449cc kind:arm_call to:0x021449dc module:overlay(27) diff --git a/config/eur/arm9/overlays/ov028/relocs.txt b/config/eur/arm9/overlays/ov028/relocs.txt index 48bac9b4..91cca346 100644 --- a/config/eur/arm9/overlays/ov028/relocs.txt +++ b/config/eur/arm9/overlays/ov028/relocs.txt @@ -654,7 +654,7 @@ from:0x02146134 kind:load to:0x02147a4c module:overlay(28) from:0x0214614c kind:arm_call to:0x0210baa0 module:overlay(26) from:0x021461c4 kind:load to:0x02147a90 module:overlay(28) from:0x021461c8 kind:load to:0x02148690 module:overlay(28) -from:0x021461cc kind:load to:0x020b1968 module:overlay(0) +from:0x021461cc kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x021461d0 kind:load to:0x02148764 module:overlay(28) from:0x021461dc kind:arm_call to:0x0210bb28 module:overlay(26) from:0x02146254 kind:load to:0x027e0cd8 module:dtcm @@ -724,7 +724,7 @@ from:0x021467d0 kind:load to:0x02147bf4 module:overlay(28) from:0x021467e4 kind:arm_call to:0x0210baa0 module:overlay(26) from:0x0214685c kind:load to:0x02147c10 module:overlay(28) from:0x02146860 kind:load to:0x021488ec module:overlay(28) -from:0x02146864 kind:load to:0x020b1968 module:overlay(0) +from:0x02146864 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02146868 kind:load to:0x021489c0 module:overlay(28) from:0x02146874 kind:arm_call to:0x0210bb28 module:overlay(26) from:0x021468b4 kind:load to:0x027e0cd8 module:dtcm diff --git a/config/eur/arm9/overlays/ov029/relocs.txt b/config/eur/arm9/overlays/ov029/relocs.txt index 60a0a757..4d93d60d 100644 --- a/config/eur/arm9/overlays/ov029/relocs.txt +++ b/config/eur/arm9/overlays/ov029/relocs.txt @@ -679,11 +679,11 @@ from:0x021462c8 kind:load to:0x02151fa4 module:overlay(29) from:0x021462e4 kind:arm_call to:0x0210baa0 module:overlay(26) from:0x02146380 kind:load to:0x02151fc0 module:overlay(29) from:0x02146384 kind:load to:0x02153374 module:overlay(29) -from:0x02146388 kind:load to:0x020b1968 module:overlay(0) +from:0x02146388 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02146394 kind:arm_call to:0x0210baa0 module:overlay(26) from:0x02146430 kind:load to:0x02151fc0 module:overlay(29) from:0x02146434 kind:load to:0x02153374 module:overlay(29) -from:0x02146438 kind:load to:0x020b1968 module:overlay(0) +from:0x02146438 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02146444 kind:arm_call to:0x0210bb28 module:overlay(26) from:0x02146530 kind:arm_call to:0x021466e8 module:overlay(29) from:0x02146540 kind:load to:0x02049be4 module:main diff --git a/config/eur/arm9/overlays/ov031/relocs.txt b/config/eur/arm9/overlays/ov031/relocs.txt index 647dc43b..4f4059e3 100644 --- a/config/eur/arm9/overlays/ov031/relocs.txt +++ b/config/eur/arm9/overlays/ov031/relocs.txt @@ -791,7 +791,7 @@ from:0x020e064c kind:thumb_call_arm to:0x02011f3c module:main from:0x020e0654 kind:thumb_call to:0x02180920 module:overlay(95) from:0x020e065c kind:thumb_call to:0x020e076c module:overlay(31) from:0x020e0664 kind:load to:0x02112bdc module:overlay(31) -from:0x020e0668 kind:load to:0x020b1968 module:overlay(0) +from:0x020e0668 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x020e066c kind:load to:0x02043e50 module:main from:0x020e0684 kind:thumb_call to:0x02179ba8 module:overlay(95) from:0x020e0692 kind:thumb_call_arm to:0x0203d210 module:main @@ -1281,7 +1281,7 @@ from:0x020e4700 kind:arm_call to:0x0203d160 module:main from:0x020e4724 kind:arm_call to:0x020d8df0 module:overlay(31) from:0x020e4740 kind:load to:0x02112f74 add:0x8 module:overlay(31) from:0x020e4744 kind:load to:0x027e0ce0 module:dtcm -from:0x020e4748 kind:load to:0x020b1968 module:overlay(0) +from:0x020e4748 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x020e474c kind:load to:0x02112f04 module:overlay(31) from:0x020e4750 kind:load to:0x02112f3c module:overlay(31) from:0x020e4754 kind:load to:0x020a02d4 module:overlay(0) @@ -1730,7 +1730,7 @@ from:0x020e88e8 kind:arm_call to:0x02098388 module:overlay(0) from:0x020e8954 kind:arm_call to:0x0207ec88 module:overlay(0) from:0x020e8970 kind:load to:0x0211340c add:0x8 module:overlay(31) from:0x020e8974 kind:load to:0x021165e0 module:overlay(31) -from:0x020e8978 kind:load to:0x020b1968 module:overlay(0) +from:0x020e8978 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x020e899c kind:arm_call to:0x020e8a48 module:overlay(31) from:0x020e89a8 kind:load to:0x021166b8 module:overlay(31) from:0x020e8a00 kind:arm_call to:0x0208bacc module:overlay(0) @@ -2751,7 +2751,7 @@ from:0x020f1538 kind:arm_call to:0x020f370c module:overlay(31) from:0x020f1564 kind:arm_call to:0x020d8df0 module:overlay(31) from:0x020f15bc kind:arm_call to:0x020f2794 module:overlay(31) from:0x020f15ec kind:load to:0x02114340 add:0x8 module:overlay(31) -from:0x020f15f0 kind:load to:0x020b1968 module:overlay(0) +from:0x020f15f0 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x020f15f4 kind:load to:0x02110b5c module:overlay(31) from:0x020f15f8 kind:load to:0x02110b08 module:overlay(31) from:0x020f1600 kind:load to:0x02043e50 module:main @@ -3054,7 +3054,7 @@ from:0x020f4104 kind:arm_call to:0x020982a8 module:overlay(0) from:0x020f4130 kind:load to:0x02114438 add:0x8 module:overlay(31) from:0x020f4134 kind:load to:0x027e0ce0 module:dtcm from:0x020f4138 kind:load to:0x02110b70 module:overlay(31) -from:0x020f413c kind:load to:0x020b1968 module:overlay(0) +from:0x020f413c kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x020f4140 kind:load to:0x02114424 module:overlay(31) from:0x020f4154 kind:arm_call to:0x020f4790 module:overlay(31) from:0x020f4170 kind:arm_call to:0x020f5b7c module:overlay(31) @@ -3501,7 +3501,7 @@ from:0x020f85ec kind:arm_call to:0x0203d160 module:main from:0x020f8624 kind:arm_call_thumb to:0x020d6668 module:overlay(24) from:0x020f8654 kind:load to:0x02114b44 add:0x8 module:overlay(31) from:0x020f8658 kind:load to:0x02116d94 module:overlay(31) -from:0x020f865c kind:load to:0x020b1968 module:overlay(0) +from:0x020f865c kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x020f8660 kind:load to:0x02114a40 module:overlay(31) from:0x020f8664 kind:load to:0x02114a5c module:overlay(31) from:0x020f8668 kind:load to:0x027e0130 module:dtcm @@ -3983,7 +3983,7 @@ from:0x020fd180 kind:arm_call to:0x020fbe44 module:overlay(31) from:0x020fd224 kind:load to:0x021150d8 module:overlay(31) from:0x020fd228 kind:load to:0x02115170 module:overlay(31) from:0x020fd22c kind:load to:0x0211728c module:overlay(31) -from:0x020fd230 kind:load to:0x020b1968 module:overlay(0) +from:0x020fd230 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x020fd248 kind:arm_call to:0x020fbf10 module:overlay(31) from:0x020fd270 kind:arm_call to:0x01fff1a4 module:itcm from:0x020fd280 kind:load to:0x027e0ce0 module:dtcm @@ -4168,7 +4168,7 @@ from:0x020fe7c0 kind:arm_call to:0x020fbe44 module:overlay(31) from:0x020fe85c kind:load to:0x021151ac module:overlay(31) from:0x020fe860 kind:load to:0x02115244 module:overlay(31) from:0x020fe864 kind:load to:0x02117370 module:overlay(31) -from:0x020fe868 kind:load to:0x020b1968 module:overlay(0) +from:0x020fe868 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x020fe87c kind:arm_call to:0x020fbf10 module:overlay(31) from:0x020fe890 kind:arm_call to:0x020fc054 module:overlay(31) from:0x020fe8a8 kind:load to:0x020fcb78 module:overlay(31) @@ -4285,14 +4285,14 @@ from:0x020ff5d4 kind:arm_call to:0x0207c018 module:overlay(0) from:0x020ff604 kind:arm_call to:0x0209d2c4 module:overlay(0) from:0x020ff610 kind:load to:0x0211535c module:overlay(31) from:0x020ff614 kind:load to:0x021153f4 module:overlay(31) -from:0x020ff618 kind:load to:0x020b1968 module:overlay(0) +from:0x020ff618 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x020ff61c kind:load to:0x02113f18 module:overlay(31) from:0x020ff628 kind:arm_call to:0x020fbe44 module:overlay(31) from:0x020ff65c kind:arm_call to:0x0207c018 module:overlay(0) from:0x020ff68c kind:arm_call to:0x0209d2c4 module:overlay(0) from:0x020ff698 kind:load to:0x0211535c module:overlay(31) from:0x020ff69c kind:load to:0x021153f4 module:overlay(31) -from:0x020ff6a0 kind:load to:0x020b1968 module:overlay(0) +from:0x020ff6a0 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x020ff6a4 kind:load to:0x02113f18 module:overlay(31) from:0x020ff6b8 kind:load to:0x02110c28 module:overlay(31) from:0x020ff6d8 kind:arm_call to:0x020fbf10 module:overlay(31) @@ -4398,7 +4398,7 @@ from:0x02100548 kind:load to:0x02115504 module:overlay(31) from:0x02100558 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x02100580 kind:arm_call to:0x0207c018 module:overlay(0) from:0x021005ec kind:load to:0x02115520 module:overlay(31) -from:0x021005f0 kind:load to:0x020b1968 module:overlay(0) +from:0x021005f0 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x021005f4 kind:load to:0x02113f18 module:overlay(31) from:0x021005f8 kind:load to:0x02117628 module:overlay(31) from:0x02100628 kind:arm_call to:0x01ffb6e4 module:itcm @@ -4445,7 +4445,7 @@ from:0x02100b84 kind:arm_call to:0x0207c018 module:overlay(0) from:0x02100b94 kind:arm_call to:0x0207c018 module:overlay(0) from:0x02100ba0 kind:arm_call to:0x0207ec88 module:overlay(0) from:0x02100bb0 kind:load to:0x021155e4 module:overlay(31) -from:0x02100bb4 kind:load to:0x020b1968 module:overlay(0) +from:0x02100bb4 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02100bb8 kind:load to:0x02113f18 module:overlay(31) from:0x02100c04 kind:arm_call to:0x01ffedf4 module:itcm from:0x02100c28 kind:arm_call_thumb to:0x01ffa1a0 module:itcm @@ -4998,7 +4998,7 @@ from:0x02105598 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x02105610 kind:arm_call to:0x020d8df0 module:overlay(31) from:0x02105634 kind:load to:0x02115bc4 module:overlay(31) from:0x02105638 kind:load to:0x02118040 module:overlay(31) -from:0x0210563c kind:load to:0x020b1968 module:overlay(0) +from:0x0210563c kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02105640 kind:load to:0x02115b74 module:overlay(31) from:0x02105644 kind:load to:0x02118114 module:overlay(31) from:0x021056b0 kind:arm_call to:0x02080a5c module:overlay(0) @@ -5068,7 +5068,7 @@ from:0x02106138 kind:arm_call to:0x020d8df0 module:overlay(31) from:0x02106140 kind:arm_call to:0x0207c018 module:overlay(0) from:0x02106178 kind:load to:0x02115c9c module:overlay(31) from:0x0210617c kind:load to:0x0211822c module:overlay(31) -from:0x02106180 kind:load to:0x020b1968 module:overlay(0) +from:0x02106180 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02106184 kind:load to:0x020e17f4 module:overlay(31) from:0x02106188 kind:load to:0x020e33ac module:overlay(31) from:0x0210618c kind:load to:0x02113f18 module:overlay(31) @@ -5173,7 +5173,7 @@ from:0x02106f94 kind:load to:0x02115d84 module:overlay(31) from:0x02106fa4 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x02106fd4 kind:arm_call to:0x0207c018 module:overlay(0) from:0x02106fe8 kind:load to:0x02115dac module:overlay(31) -from:0x02106fec kind:load to:0x020b1968 module:overlay(0) +from:0x02106fec kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02106ff0 kind:load to:0x02113f18 module:overlay(31) from:0x0210700c kind:arm_call to:0x01ffb6e4 module:itcm from:0x02107040 kind:arm_call to:0x0209ccd8 module:overlay(0) @@ -5216,7 +5216,7 @@ from:0x021075e4 kind:load to:0x02115dec module:overlay(31) from:0x021075f4 kind:arm_call to:0x0209dc10 module:overlay(0) from:0x021076ac kind:load to:0x02115e08 module:overlay(31) from:0x021076b0 kind:load to:0x021183ec module:overlay(31) -from:0x021076b4 kind:load to:0x020b1968 module:overlay(0) +from:0x021076b4 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02107710 kind:arm_call to:0x02108648 module:overlay(31) from:0x02107724 kind:arm_call to:0x021086a4 module:overlay(31) from:0x02107770 kind:arm_call to:0x01ffedf4 module:itcm @@ -5456,13 +5456,13 @@ from:0x02109ab8 kind:load to:0x02115f10 module:overlay(31) from:0x02109ad0 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x02109b0c kind:arm_call to:0x0205fc20 module:overlay(0) from:0x02109b1c kind:load to:0x02115f2c module:overlay(31) -from:0x02109b20 kind:load to:0x020b1968 module:overlay(0) +from:0x02109b20 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02109b24 kind:load to:0x021187b4 module:overlay(31) from:0x02109b28 kind:load to:0x021186d4 module:overlay(31) from:0x02109b38 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x02109b74 kind:arm_call to:0x0205fc20 module:overlay(0) from:0x02109b84 kind:load to:0x02115f2c module:overlay(31) -from:0x02109b88 kind:load to:0x020b1968 module:overlay(0) +from:0x02109b88 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02109b8c kind:load to:0x021187b4 module:overlay(31) from:0x02109b90 kind:load to:0x021186d4 module:overlay(31) from:0x02109be0 kind:arm_call to:0x0209d668 module:overlay(0) @@ -5502,11 +5502,11 @@ from:0x02109ffc kind:load to:0x02115f7c module:overlay(31) from:0x0210a010 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x0210a028 kind:arm_call_thumb to:0x02057b70 module:overlay(0) from:0x0210a094 kind:load to:0x02115f98 module:overlay(31) -from:0x0210a098 kind:load to:0x020b1968 module:overlay(0) +from:0x0210a098 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0210a0a4 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x0210a0bc kind:arm_call_thumb to:0x02057b70 module:overlay(0) from:0x0210a128 kind:load to:0x02115f98 module:overlay(31) -from:0x0210a12c kind:load to:0x020b1968 module:overlay(0) +from:0x0210a12c kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0210a1a0 kind:arm_call to:0x020974dc module:overlay(0) from:0x0210a1d8 kind:arm_call to:0x01ff9638 module:itcm from:0x0210a1e8 kind:arm_call to:0x01ffb6e4 module:itcm diff --git a/config/eur/arm9/overlays/ov031/symbols.txt b/config/eur/arm9/overlays/ov031/symbols.txt index 1b9a1b06..ae648c8d 100644 --- a/config/eur/arm9/overlays/ov031/symbols.txt +++ b/config/eur/arm9/overlays/ov031/symbols.txt @@ -1553,7 +1553,7 @@ func_ov031_021037b0 kind:function(arm,size=0x14) addr:0x021037b0 func_ov031_021037c4 kind:function(arm,size=0xc) addr:0x021037c4 func_ov031_021037d0 kind:function(arm,size=0x94) addr:0x021037d0 func_ov031_02103864 kind:function(arm,size=0x14) addr:0x02103864 -func_ov031_02103878 kind:function(arm,size=0x1c) addr:0x02103878 +_ZN9MapObject19func_ov031_02103878Ev kind:function(arm,size=0x1c) addr:0x02103878 func_ov031_02103894 kind:function(arm,size=0x3b4) addr:0x02103894 func_ov031_02103c48 kind:function(arm,size=0xe8) addr:0x02103c48 func_ov031_02103d30 kind:function(arm,size=0x108) addr:0x02103d30 diff --git a/config/eur/arm9/overlays/ov032/relocs.txt b/config/eur/arm9/overlays/ov032/relocs.txt index 66c58fa5..dd2d8259 100644 --- a/config/eur/arm9/overlays/ov032/relocs.txt +++ b/config/eur/arm9/overlays/ov032/relocs.txt @@ -790,7 +790,7 @@ from:0x0211fed4 kind:arm_call to:0x01ffa06c module:itcm from:0x0211fee8 kind:load to:0x021226e4 add:0x8 module:overlay(32) from:0x0211feec kind:load to:0x020b5d34 module:overlay(0) from:0x0211fef4 kind:load to:0x02121ee4 module:overlay(32) -from:0x0211fef8 kind:load to:0x020b1968 module:overlay(0) +from:0x0211fef8 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0211ff04 kind:arm_call to:0x0207b6c0 module:overlay(0) from:0x0211ff2c kind:arm_call to:0x02120894 module:overlay(32) from:0x0211ff70 kind:arm_call to:0x01ffa7a0 module:itcm diff --git a/config/eur/arm9/overlays/ov033/relocs.txt b/config/eur/arm9/overlays/ov033/relocs.txt index fe644325..6a441292 100644 --- a/config/eur/arm9/overlays/ov033/relocs.txt +++ b/config/eur/arm9/overlays/ov033/relocs.txt @@ -124,7 +124,7 @@ from:0x0211a0bc kind:arm_call to:0x0205fc20 module:overlay(0) from:0x0211a0cc kind:load to:0x021217b4 module:overlay(33) from:0x0211a0d0 kind:load to:0x021217fc add:0x8 module:overlay(33) from:0x0211a0d4 kind:load to:0x02121ccc module:overlay(33) -from:0x0211a0d8 kind:load to:0x020b1968 module:overlay(0) +from:0x0211a0d8 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0211a0dc kind:load to:0x0204a088 module:main from:0x0211a0e0 kind:load to:0x02121cb4 module:overlay(33) from:0x0211a0f0 kind:arm_call_thumb to:0x02057ed4 module:overlay(0) @@ -310,7 +310,7 @@ from:0x0211b894 kind:arm_call to:0x0200f05c module:main from:0x0211b8f4 kind:load to:0x02121868 module:overlay(33) from:0x0211b8f8 kind:load to:0x02122650 module:overlay(33) from:0x0211b8fc kind:load to:0x02120fdc module:overlay(33) -from:0x0211b900 kind:load to:0x020b1968 module:overlay(0) +from:0x0211b900 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0211b904 kind:load to:0x02122724 module:overlay(33) from:0x0211b960 kind:arm_call to:0x0211bcfc module:overlay(33) from:0x0211b990 kind:arm_call to:0x0211bcfc module:overlay(33) diff --git a/config/eur/arm9/overlays/ov034/relocs.txt b/config/eur/arm9/overlays/ov034/relocs.txt index bc8cfbb5..8cfc7c0b 100644 --- a/config/eur/arm9/overlays/ov034/relocs.txt +++ b/config/eur/arm9/overlays/ov034/relocs.txt @@ -589,7 +589,7 @@ from:0x0211e4b4 kind:arm_call to:0x02028c90 module:main from:0x0211e4c8 kind:arm_call to:0x02028c90 module:main from:0x0211e4dc kind:arm_call to:0x02028c90 module:main from:0x0211e504 kind:load to:0x02122c6c add:0x8 module:overlay(34) -from:0x0211e508 kind:load to:0x020b1968 module:overlay(0) +from:0x0211e508 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0211e50c kind:load to:0x02123200 module:overlay(34) from:0x0211e540 kind:arm_call_thumb to:0x02057ed4 module:overlay(0) from:0x0211e54c kind:arm_call_thumb to:0x02057ed4 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov038/relocs.txt b/config/eur/arm9/overlays/ov038/relocs.txt index f7dbfa99..bd95a21f 100644 --- a/config/eur/arm9/overlays/ov038/relocs.txt +++ b/config/eur/arm9/overlays/ov038/relocs.txt @@ -523,7 +523,7 @@ from:0x0211e4f8 kind:load to:0x02121170 module:overlay(38) from:0x0211e4fc kind:load to:0x02121154 module:overlay(38) from:0x0211e514 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x0211e540 kind:load to:0x02121198 module:overlay(38) -from:0x0211e544 kind:load to:0x020b1968 module:overlay(0) +from:0x0211e544 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0211e588 kind:arm_call to:0x0200f05c module:main from:0x0211e5d0 kind:arm_call to:0x0200f05c module:main from:0x0211e63c kind:arm_call to:0x0200f05c module:main diff --git a/config/eur/arm9/overlays/ov040/relocs.txt b/config/eur/arm9/overlays/ov040/relocs.txt index d717bbe4..8dfd5da5 100644 --- a/config/eur/arm9/overlays/ov040/relocs.txt +++ b/config/eur/arm9/overlays/ov040/relocs.txt @@ -1057,7 +1057,7 @@ from:0x0212d7ac kind:arm_call to:0x0209cb4c module:overlay(0) from:0x0212d7d8 kind:load to:0x0212f330 module:overlay(40) from:0x0212d7e8 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x0212d814 kind:load to:0x0212f358 module:overlay(40) -from:0x0212d818 kind:load to:0x020b1968 module:overlay(0) +from:0x0212d818 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0212d838 kind:arm_call to:0x0209d29c module:overlay(0) from:0x0212d854 kind:arm_call to:0x0209ccd8 module:overlay(0) from:0x0212d8b4 kind:arm_call to:0x0209ccd8 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov043/relocs.txt b/config/eur/arm9/overlays/ov043/relocs.txt index 87d08ae8..77d5670f 100644 --- a/config/eur/arm9/overlays/ov043/relocs.txt +++ b/config/eur/arm9/overlays/ov043/relocs.txt @@ -17,7 +17,7 @@ from:0x02123714 kind:load to:0x0212ce90 add:0x8 module:overlay(43) from:0x02123718 kind:load to:0x0212dbb8 module:overlay(43) from:0x0212371c kind:load to:0x0212ca08 module:overlay(43) from:0x02123720 kind:load to:0x0212ca18 module:overlay(43) -from:0x02123724 kind:load to:0x020b1968 module:overlay(0) +from:0x02123724 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02123728 kind:load to:0x0212ce4c module:overlay(43) from:0x02123730 kind:load to:0x027e07d4 module:dtcm from:0x0212373c kind:arm_call_thumb to:0x0209a248 module:overlay(0) @@ -632,7 +632,7 @@ from:0x02128d54 kind:load to:0x0212de60 module:overlay(43) from:0x02128d58 kind:load to:0x0212d598 module:overlay(43) from:0x02128d5c kind:load to:0x020b1a98 module:overlay(0) from:0x02128d60 kind:load to:0x020b1a48 module:overlay(0) -from:0x02128d64 kind:load to:0x020b1968 module:overlay(0) +from:0x02128d64 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02128d6c kind:load to:0x027e07d4 module:dtcm from:0x02128d70 kind:load to:0x0212d568 module:overlay(43) from:0x02128d74 kind:load to:0x0212dde0 module:overlay(43) diff --git a/config/eur/arm9/overlays/ov044/relocs.txt b/config/eur/arm9/overlays/ov044/relocs.txt index 59c9abb1..ce6f7cc0 100644 --- a/config/eur/arm9/overlays/ov044/relocs.txt +++ b/config/eur/arm9/overlays/ov044/relocs.txt @@ -20,7 +20,7 @@ from:0x02123734 kind:arm_call to:0x020577a4 module:overlay(0) from:0x02123740 kind:arm_call to:0x02057c98 module:overlay(0) from:0x02123754 kind:arm_call to:0x02057f18 module:overlay(0) from:0x02123778 kind:load to:0x0212cdc8 module:overlay(44) -from:0x0212377c kind:load to:0x020b1968 module:overlay(0) +from:0x0212377c kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02123780 kind:load to:0x020a02d4 module:overlay(0) from:0x02123784 kind:load to:0x02123798 module:overlay(44) from:0x02123788 kind:load to:0x027e0ce0 module:dtcm @@ -64,7 +64,7 @@ from:0x02123b1c kind:arm_call to:0x0205cadc module:overlay(0) from:0x02123b2c kind:load to:0x0212cde8 module:overlay(44) from:0x02123b30 kind:load to:0x027e0ce0 module:dtcm from:0x02123b34 kind:load to:0x0212ca5c module:overlay(44) -from:0x02123b38 kind:load to:0x020b1968 module:overlay(0) +from:0x02123b38 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02123b3c kind:load to:0x0212cdd4 module:overlay(44) from:0x02123b54 kind:arm_call to:0x0200eab0 module:main from:0x02123b68 kind:arm_call to:0x0208c724 module:overlay(0) @@ -443,7 +443,7 @@ from:0x02126cf8 kind:arm_call to:0x02058fc4 module:overlay(0) from:0x02126d18 kind:arm_call to:0x01ffc6d4 module:itcm from:0x02126d38 kind:arm_call to:0x020bf5c4 module:overlay(17) from:0x02126d40 kind:arm_call to:0x0212bd3c module:overlay(44) -from:0x02126d4c kind:load to:0x020b1968 module:overlay(0) +from:0x02126d4c kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02126d50 kind:load to:0x0212d6e0 module:overlay(44) from:0x02126d54 kind:load to:0x0212ca88 module:overlay(44) from:0x02126d58 kind:load to:0x0203e964 module:main diff --git a/config/eur/arm9/overlays/ov046/relocs.txt b/config/eur/arm9/overlays/ov046/relocs.txt index e9bd9550..519a1f3f 100644 --- a/config/eur/arm9/overlays/ov046/relocs.txt +++ b/config/eur/arm9/overlays/ov046/relocs.txt @@ -442,7 +442,7 @@ from:0x02127960 kind:arm_call to:0x02128730 module:overlay(46) from:0x021279cc kind:arm_call to:0x01ffa06c module:itcm from:0x021279f0 kind:load to:0x0212a588 add:0x8 module:overlay(46) from:0x021279f4 kind:load to:0x0212a9c8 module:overlay(46) -from:0x021279f8 kind:load to:0x020b1968 module:overlay(0) +from:0x021279f8 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x021279fc kind:load to:0x0212a9cc module:overlay(46) from:0x02127a08 kind:arm_call to:0x0207b6c0 module:overlay(0) from:0x02127a1c kind:arm_call to:0x0207bffc module:overlay(0) @@ -574,7 +574,7 @@ from:0x021289ac kind:arm_call to:0x0212946c module:overlay(46) from:0x021289b8 kind:arm_call to:0x02129538 module:overlay(46) from:0x02128a14 kind:arm_call to:0x01ffa06c module:itcm from:0x02128a38 kind:load to:0x0212a690 add:0x8 module:overlay(46) -from:0x02128a3c kind:load to:0x020b1968 module:overlay(0) +from:0x02128a3c kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02128a40 kind:load to:0x0212aab4 module:overlay(46) from:0x02128a44 kind:load to:0x0212aaa0 module:overlay(46) from:0x02128a50 kind:arm_call to:0x0207b6c0 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov049/relocs.txt b/config/eur/arm9/overlays/ov049/relocs.txt index c4e70845..b11fbc06 100644 --- a/config/eur/arm9/overlays/ov049/relocs.txt +++ b/config/eur/arm9/overlays/ov049/relocs.txt @@ -120,7 +120,7 @@ from:0x02131594 kind:arm_call to:0x02097bb8 module:overlay(0) from:0x021315d0 kind:arm_call to:0x0209862c module:overlay(0) from:0x021315dc kind:load to:0x0213746c add:0x8 module:overlay(49) from:0x021315e0 kind:load to:0x021380f8 module:overlay(49) -from:0x021315e4 kind:load to:0x020b1968 module:overlay(0) +from:0x021315e4 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x021315fc kind:arm_call to:0x021317e4 module:overlay(49) from:0x02131618 kind:arm_call to:0x021316bc module:overlay(49) from:0x02131648 kind:arm_call to:0x020975f8 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov050/relocs.txt b/config/eur/arm9/overlays/ov050/relocs.txt index f44d3639..da548b55 100644 --- a/config/eur/arm9/overlays/ov050/relocs.txt +++ b/config/eur/arm9/overlays/ov050/relocs.txt @@ -599,7 +599,7 @@ from:0x02135450 kind:arm_call to:0x0207ec88 module:overlay(0) from:0x021354a4 kind:arm_call to:0x01ffa06c module:itcm from:0x021354b8 kind:load to:0x02136ee4 add:0x8 module:overlay(50) from:0x021354bc kind:load to:0x02137218 module:overlay(50) -from:0x021354c0 kind:load to:0x020b1968 module:overlay(0) +from:0x021354c0 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x021354c4 kind:load to:0x02136ec4 module:overlay(50) from:0x021354d0 kind:arm_call to:0x0207b6c0 module:overlay(0) from:0x0213550c kind:arm_call_thumb to:0x01ffa1a0 module:itcm diff --git a/config/eur/arm9/overlays/ov057/relocs.txt b/config/eur/arm9/overlays/ov057/relocs.txt index 28f94529..e4db9946 100644 --- a/config/eur/arm9/overlays/ov057/relocs.txt +++ b/config/eur/arm9/overlays/ov057/relocs.txt @@ -12,7 +12,7 @@ from:0x021386c4 kind:arm_call to:0x0207ec88 module:overlay(0) from:0x021386cc kind:arm_call to:0x0207c018 module:overlay(0) from:0x02138714 kind:load to:0x0213be14 add:0x8 module:overlay(57) from:0x02138718 kind:load to:0x0213c2dc module:overlay(57) -from:0x0213871c kind:load to:0x020b1968 module:overlay(0) +from:0x0213871c kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02138720 kind:load to:0x020b2800 module:overlay(0) from:0x02138724 kind:load to:0x02138734 module:overlay(57) from:0x02138728 kind:load to:0x02139d70 module:overlay(57) diff --git a/config/eur/arm9/overlays/ov058/relocs.txt b/config/eur/arm9/overlays/ov058/relocs.txt index afc85800..bea0f574 100644 --- a/config/eur/arm9/overlays/ov058/relocs.txt +++ b/config/eur/arm9/overlays/ov058/relocs.txt @@ -1661,7 +1661,7 @@ from:0x0214e03c kind:load to:0x02155810 module:overlay(58) from:0x0214e048 kind:load to:0x021574bc module:overlay(58) from:0x0214e058 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x0214e094 kind:load to:0x02155860 module:overlay(58) -from:0x0214e098 kind:load to:0x020b1968 module:overlay(0) +from:0x0214e098 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0214e148 kind:arm_call to:0x0209ccd8 module:overlay(0) from:0x0214e180 kind:arm_call to:0x0200f05c module:main from:0x0214e218 kind:arm_call to:0x0214e2e8 module:overlay(58) @@ -1705,12 +1705,12 @@ from:0x0214e5d0 kind:load to:0x021558bc module:overlay(58) from:0x0214e5e4 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x0214e664 kind:load to:0x021558d8 module:overlay(58) from:0x0214e668 kind:load to:0x02157584 module:overlay(58) -from:0x0214e66c kind:load to:0x020b1968 module:overlay(0) +from:0x0214e66c kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0214e670 kind:load to:0x02157658 module:overlay(58) from:0x0214e67c kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x0214e6fc kind:load to:0x021558d8 module:overlay(58) from:0x0214e700 kind:load to:0x02157584 module:overlay(58) -from:0x0214e704 kind:load to:0x020b1968 module:overlay(0) +from:0x0214e704 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0214e708 kind:load to:0x02157658 module:overlay(58) from:0x0214e718 kind:arm_call to:0x0214e7a4 module:overlay(58) from:0x0214e758 kind:arm_call to:0x0214e7a4 module:overlay(58) @@ -1899,7 +1899,7 @@ from:0x0214ffb8 kind:arm_call to:0x0207c018 module:overlay(0) from:0x0214ffc8 kind:arm_call to:0x0207c018 module:overlay(0) from:0x0214ffd4 kind:arm_call to:0x0207ec88 module:overlay(0) from:0x0214ffe0 kind:load to:0x02155bc0 module:overlay(58) -from:0x0214ffe4 kind:load to:0x020b1968 module:overlay(0) +from:0x0214ffe4 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0214ffe8 kind:load to:0x02157a04 module:overlay(58) from:0x0214ffec kind:load to:0x021533f0 module:overlay(58) from:0x0214fff0 kind:load to:0x021559d0 module:overlay(58) diff --git a/config/eur/arm9/overlays/ov059/relocs.txt b/config/eur/arm9/overlays/ov059/relocs.txt index e1bb36f4..1289f266 100644 --- a/config/eur/arm9/overlays/ov059/relocs.txt +++ b/config/eur/arm9/overlays/ov059/relocs.txt @@ -1078,7 +1078,7 @@ from:0x0216168c kind:load to:0x02162e5c module:overlay(59) from:0x02161690 kind:load to:0x021616b8 module:overlay(59) from:0x02161694 kind:load to:0x0216169c module:overlay(59) from:0x02161698 kind:load to:0x02162e6c module:overlay(59) -from:0x021616b4 kind:load to:0x020b1968 module:overlay(0) +from:0x021616b4 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x021616c0 kind:arm_call_thumb to:0x02057ed4 module:overlay(0) from:0x02161734 kind:arm_call to:0x01ffb6e4 module:itcm from:0x02161754 kind:arm_call to:0x01ffb6e4 module:itcm diff --git a/config/eur/arm9/overlays/ov060/relocs.txt b/config/eur/arm9/overlays/ov060/relocs.txt index a95e1988..63f50fb7 100644 --- a/config/eur/arm9/overlays/ov060/relocs.txt +++ b/config/eur/arm9/overlays/ov060/relocs.txt @@ -994,7 +994,7 @@ from:0x02160600 kind:load to:0x02162e24 module:overlay(60) from:0x02160604 kind:load to:0x02162e08 module:overlay(60) from:0x02160618 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x0216065c kind:load to:0x02162e4c module:overlay(60) -from:0x02160660 kind:load to:0x020b1968 module:overlay(0) +from:0x02160660 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02160690 kind:arm_call to:0x01ffedf4 module:itcm from:0x021606ac kind:load to:0x027e0cd8 module:dtcm from:0x021606b0 kind:load to:0x021640e0 module:overlay(60) diff --git a/config/eur/arm9/overlays/ov062/relocs.txt b/config/eur/arm9/overlays/ov062/relocs.txt index ee83b7ed..26ae3465 100644 --- a/config/eur/arm9/overlays/ov062/relocs.txt +++ b/config/eur/arm9/overlays/ov062/relocs.txt @@ -637,7 +637,7 @@ from:0x0215be20 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x0215be48 kind:arm_call to:0x0207ec88 module:overlay(0) from:0x0215be50 kind:arm_call to:0x0207c018 module:overlay(0) from:0x0215be64 kind:load to:0x02160750 module:overlay(62) -from:0x0215be68 kind:load to:0x020b1968 module:overlay(0) +from:0x0215be68 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0215be6c kind:load to:0x0216052c module:overlay(62) from:0x0215be80 kind:arm_call to:0x0209d29c module:overlay(0) from:0x0215bea4 kind:arm_call to:0x0200f05c module:main diff --git a/config/eur/arm9/overlays/ov063/relocs.txt b/config/eur/arm9/overlays/ov063/relocs.txt index 3f977859..3e6828cd 100644 --- a/config/eur/arm9/overlays/ov063/relocs.txt +++ b/config/eur/arm9/overlays/ov063/relocs.txt @@ -999,7 +999,7 @@ from:0x0215f5fc kind:load to:0x02163844 module:overlay(63) from:0x0215f610 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x0215f6c0 kind:load to:0x02163888 module:overlay(63) from:0x0215f6c4 kind:load to:0x02164410 module:overlay(63) -from:0x0215f6c8 kind:load to:0x020b1968 module:overlay(0) +from:0x0215f6c8 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0215f6cc kind:load to:0x021644e4 module:overlay(63) from:0x0215f6f0 kind:arm_call to:0x0215fc40 module:overlay(63) from:0x0215f72c kind:arm_call to:0x01ffb428 module:itcm diff --git a/config/eur/arm9/overlays/ov068/relocs.txt b/config/eur/arm9/overlays/ov068/relocs.txt index 4a79d854..016ddc95 100644 --- a/config/eur/arm9/overlays/ov068/relocs.txt +++ b/config/eur/arm9/overlays/ov068/relocs.txt @@ -1100,7 +1100,7 @@ from:0x02160da0 kind:arm_call to:0x0207c018 module:overlay(0) from:0x02160db0 kind:arm_call to:0x02166364 module:overlay(89) from:0x02160dd8 kind:load to:0x021638bc module:overlay(68) from:0x02160ddc kind:load to:0x021648bc module:overlay(68) -from:0x02160de0 kind:load to:0x020b1968 module:overlay(0) +from:0x02160de0 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02160de4 kind:load to:0x02163664 module:overlay(68) from:0x02160e50 kind:arm_call to:0x01ffcfcc module:itcm from:0x02160e98 kind:arm_call to:0x0209d29c module:overlay(0) diff --git a/config/eur/arm9/overlays/ov070/relocs.txt b/config/eur/arm9/overlays/ov070/relocs.txt index 9f836651..fcc98449 100644 --- a/config/eur/arm9/overlays/ov070/relocs.txt +++ b/config/eur/arm9/overlays/ov070/relocs.txt @@ -130,7 +130,7 @@ from:0x0214020c kind:arm_call to:0x0207c018 module:overlay(0) from:0x0214021c kind:arm_call to:0x021400e8 module:overlay(70) from:0x02140228 kind:load to:0x0214ea14 add:0x8 module:overlay(70) from:0x0214022c kind:load to:0x0214f908 module:overlay(70) -from:0x02140230 kind:load to:0x020b1968 module:overlay(0) +from:0x02140230 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02140234 kind:load to:0x0214e9f4 module:overlay(70) from:0x02140244 kind:arm_call to:0x02098a60 module:overlay(0) from:0x02140284 kind:arm_call to:0x020974dc module:overlay(0) @@ -618,7 +618,7 @@ from:0x0214403c kind:arm_call to:0x0209cb4c module:overlay(0) from:0x02144068 kind:load to:0x0214ee5c module:overlay(70) from:0x02144078 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x021440a4 kind:load to:0x0214ee84 module:overlay(70) -from:0x021440a8 kind:load to:0x020b1968 module:overlay(0) +from:0x021440a8 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x021440cc kind:arm_call to:0x0209ccd8 module:overlay(0) from:0x02144150 kind:arm_call to:0x01ffedf4 module:itcm from:0x02144164 kind:load to:0x0214dd04 module:overlay(70) @@ -874,7 +874,7 @@ from:0x02146354 kind:arm_call to:0x0207c018 module:overlay(0) from:0x02146368 kind:arm_call to:0x02146230 module:overlay(70) from:0x02146390 kind:load to:0x0214f150 module:overlay(70) from:0x02146398 kind:load to:0x02150290 module:overlay(70) -from:0x0214639c kind:load to:0x020b1968 module:overlay(0) +from:0x0214639c kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x021463a0 kind:load to:0x027e0ce0 module:dtcm from:0x021463a4 kind:load to:0x0214dd74 module:overlay(70) from:0x021463a8 kind:load to:0x0214e9f4 module:overlay(70) @@ -1194,7 +1194,7 @@ from:0x02148c54 kind:arm_call to:0x020fbe44 module:overlay(31) from:0x02148ce0 kind:load to:0x0214f3b4 module:overlay(70) from:0x02148ce4 kind:load to:0x0214f44c module:overlay(70) from:0x02148ce8 kind:load to:0x0215068c module:overlay(70) -from:0x02148cec kind:load to:0x020b1968 module:overlay(0) +from:0x02148cec kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02148d00 kind:arm_call to:0x020fbf10 module:overlays(26,31) from:0x02148d18 kind:arm_call to:0x0209d29c module:overlay(0) from:0x02148d38 kind:load to:0x0209d29c module:overlay(0) @@ -1242,7 +1242,7 @@ from:0x02149224 kind:arm_call to:0x0205fc20 module:overlay(0) from:0x02149230 kind:load to:0x0214f480 module:overlay(70) from:0x02149234 kind:load to:0x02141618 module:overlay(70) from:0x02149238 kind:load to:0x02149fa0 module:overlay(70) -from:0x0214923c kind:load to:0x020b1968 module:overlay(0) +from:0x0214923c kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02149240 kind:load to:0x0215077c module:overlay(70) from:0x02149244 kind:load to:0x02150770 module:overlay(70) from:0x021493c0 kind:arm_call to:0x01fff584 module:itcm @@ -1333,13 +1333,13 @@ from:0x0214a080 kind:arm_call to:0x0209c9a8 module:overlay(0) from:0x0214a0b0 kind:load to:0x0214f4c0 module:overlay(70) from:0x0214a0c0 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x0214a0fc kind:arm_call to:0x0207c018 module:overlay(0) -from:0x0214a11c kind:load to:0x020b1968 module:overlay(0) +from:0x0214a11c kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0214a120 kind:load to:0x0214f500 module:overlay(70) from:0x0214a124 kind:load to:0x0214f570 module:overlay(70) from:0x0214a128 kind:load to:0x0214e9f4 module:overlay(70) from:0x0214a134 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x0214a170 kind:arm_call to:0x0207c018 module:overlay(0) -from:0x0214a190 kind:load to:0x020b1968 module:overlay(0) +from:0x0214a190 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0214a194 kind:load to:0x0214f500 module:overlay(70) from:0x0214a198 kind:load to:0x0214f570 module:overlay(70) from:0x0214a19c kind:load to:0x0214e9f4 module:overlay(70) diff --git a/config/eur/arm9/overlays/ov071/relocs.txt b/config/eur/arm9/overlays/ov071/relocs.txt index 38e8aac2..acc08140 100644 --- a/config/eur/arm9/overlays/ov071/relocs.txt +++ b/config/eur/arm9/overlays/ov071/relocs.txt @@ -1759,7 +1759,7 @@ from:0x02160a68 kind:load to:0x02164e44 module:overlay(71) from:0x02160a7c kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x02160af4 kind:load to:0x02164e88 module:overlay(71) from:0x02160af8 kind:load to:0x02165338 module:overlay(71) -from:0x02160afc kind:load to:0x020b1968 module:overlay(0) +from:0x02160afc kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02160b00 kind:load to:0x0216540c module:overlay(71) from:0x02160b50 kind:arm_call to:0x0209d518 module:overlay(0) from:0x02160b68 kind:arm_call_thumb to:0x02057ed4 module:overlay(0) @@ -1919,7 +1919,7 @@ from:0x02162100 kind:arm_call to:0x0209c9a8 module:overlay(0) from:0x02162138 kind:load to:0x02165010 module:overlay(71) from:0x02162148 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x0216219c kind:load to:0x0216502c module:overlay(71) -from:0x021621a0 kind:load to:0x020b1968 module:overlay(0) +from:0x021621a0 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x021622d8 kind:arm_call to:0x01ffedf4 module:itcm from:0x02162348 kind:arm_call to:0x020801b0 module:overlay(0) from:0x0216235c kind:arm_call to:0x020801b0 module:overlay(0) @@ -1991,7 +1991,7 @@ from:0x02163088 kind:arm_call to:0x0207c018 module:overlay(0) from:0x021630c4 kind:arm_call to:0x0205fc20 module:overlay(0) from:0x021630d4 kind:load to:0x021650a8 module:overlay(71) from:0x021630d8 kind:load to:0x0216583c module:overlay(71) -from:0x021630dc kind:load to:0x020b1968 module:overlay(0) +from:0x021630dc kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x021630e0 kind:load to:0x02164e60 module:overlay(71) from:0x021630e4 kind:load to:0x02165830 module:overlay(71) from:0x02163178 kind:arm_call to:0x01ffcfcc module:itcm diff --git a/config/eur/arm9/overlays/ov079/relocs.txt b/config/eur/arm9/overlays/ov079/relocs.txt index 42840ffc..202a5542 100644 --- a/config/eur/arm9/overlays/ov079/relocs.txt +++ b/config/eur/arm9/overlays/ov079/relocs.txt @@ -510,7 +510,7 @@ from:0x02155158 kind:arm_call to:0x02098388 module:overlay(0) from:0x0215518c kind:arm_call to:0x020f7c0c module:overlay(31) from:0x02155198 kind:arm_call to:0x0215585c module:overlay(79) from:0x02155218 kind:load to:0x02157a38 add:0x8 module:overlay(79) -from:0x0215521c kind:load to:0x020b1968 module:overlay(0) +from:0x0215521c kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02155220 kind:load to:0x02157fb4 module:overlay(79) from:0x02155230 kind:arm_call to:0x0207b6c0 module:overlay(0) from:0x021552e0 kind:load to:0x0203e964 module:main @@ -680,7 +680,7 @@ from:0x0215669c kind:load to:0x02157b9c module:overlay(79) from:0x021566b4 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x0215672c kind:load to:0x02157bb8 module:overlay(79) from:0x02156730 kind:load to:0x0215828c module:overlay(79) -from:0x02156734 kind:load to:0x020b1968 module:overlay(0) +from:0x02156734 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02156738 kind:load to:0x02158360 module:overlay(79) from:0x0215674c kind:arm_call to:0x0209d29c module:overlay(0) from:0x02156774 kind:arm_call to:0x02156840 module:overlay(79) diff --git a/config/eur/arm9/overlays/ov083/relocs.txt b/config/eur/arm9/overlays/ov083/relocs.txt index 9c3b809b..9f6f03bd 100644 --- a/config/eur/arm9/overlays/ov083/relocs.txt +++ b/config/eur/arm9/overlays/ov083/relocs.txt @@ -783,7 +783,7 @@ from:0x0215a7b4 kind:load to:0x0215dd80 add:0x8 module:overlay(83) from:0x0215a7b8 kind:load to:0x0215e46c module:overlay(83) from:0x0215a7bc kind:load to:0x0215dd04 module:overlay(83) from:0x0215a7c0 kind:load to:0x0215dcf4 module:overlay(83) -from:0x0215a7c4 kind:load to:0x020b1968 module:overlay(0) +from:0x0215a7c4 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0215a7c8 kind:load to:0x0215e454 module:overlay(83) from:0x0215a7cc kind:load to:0x027e0130 module:dtcm from:0x0215a7d0 kind:load to:0x02041964 module:main diff --git a/config/eur/arm9/overlays/ov084/relocs.txt b/config/eur/arm9/overlays/ov084/relocs.txt index 8a1129bf..866e0e8e 100644 --- a/config/eur/arm9/overlays/ov084/relocs.txt +++ b/config/eur/arm9/overlays/ov084/relocs.txt @@ -1030,7 +1030,7 @@ from:0x0215a4fc kind:arm_call to:0x0203d160 module:main from:0x0215a514 kind:arm_call to:0x0203d160 module:main from:0x0215a54c kind:load to:0x02163184 add:0x8 module:overlay(84) from:0x0215a550 kind:load to:0x02163d20 module:overlay(84) -from:0x0215a554 kind:load to:0x020b1968 module:overlay(0) +from:0x0215a554 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0215a558 kind:load to:0x020b2800 module:overlay(0) from:0x0215a55c kind:load to:0x0215a564 module:overlay(84) from:0x0215a560 kind:load to:0x0215a59c module:overlay(84) diff --git a/config/eur/arm9/overlays/ov085/relocs.txt b/config/eur/arm9/overlays/ov085/relocs.txt index 78724438..9a231d69 100644 --- a/config/eur/arm9/overlays/ov085/relocs.txt +++ b/config/eur/arm9/overlays/ov085/relocs.txt @@ -51,7 +51,7 @@ from:0x021511a4 kind:load to:0x021540a0 add:0x8 module:overlay(85) from:0x021511a8 kind:load to:0x0215425c module:overlay(85) from:0x021511ac kind:load to:0x02153e20 module:overlay(85) from:0x021511b0 kind:load to:0x02153e30 module:overlay(85) -from:0x021511b4 kind:load to:0x020b1968 module:overlay(0) +from:0x021511b4 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x021511b8 kind:load to:0x027e0130 module:dtcm from:0x021511bc kind:load to:0x0215404c module:overlay(85) from:0x021511cc kind:arm_call to:0x0207b6c0 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov086/relocs.txt b/config/eur/arm9/overlays/ov086/relocs.txt index d309eb0d..84534d5e 100644 --- a/config/eur/arm9/overlays/ov086/relocs.txt +++ b/config/eur/arm9/overlays/ov086/relocs.txt @@ -753,7 +753,7 @@ from:0x0215b030 kind:arm_call to:0x02098388 module:overlay(0) from:0x0215b064 kind:arm_call to:0x020f7c0c module:overlay(31) from:0x0215b070 kind:arm_call to:0x0215b6f4 module:overlay(86) from:0x0215b0ec kind:load to:0x0215fd18 add:0x8 module:overlay(86) -from:0x0215b0f0 kind:load to:0x020b1968 module:overlay(0) +from:0x0215b0f0 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0215b0f4 kind:load to:0x02160608 module:overlay(86) from:0x0215b104 kind:arm_call to:0x0207b6c0 module:overlay(0) from:0x0215b190 kind:load to:0x0203e964 module:main diff --git a/config/eur/arm9/overlays/ov090/relocs.txt b/config/eur/arm9/overlays/ov090/relocs.txt index ccaf4c30..bbb1934c 100644 --- a/config/eur/arm9/overlays/ov090/relocs.txt +++ b/config/eur/arm9/overlays/ov090/relocs.txt @@ -1867,7 +1867,7 @@ from:0x02174dc4 kind:load to:0x02176e00 module:overlay(90) from:0x02174dd8 kind:arm_call to:0x0210baa0 module:overlay(26) from:0x02174e50 kind:load to:0x02176e1c module:overlay(90) from:0x02174e54 kind:load to:0x02177b5c module:overlay(90) -from:0x02174e58 kind:load to:0x020b1968 module:overlay(0) +from:0x02174e58 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02174e5c kind:load to:0x02177c30 module:overlay(90) from:0x02174e68 kind:arm_call to:0x0210bb28 module:overlay(26) from:0x02174ea8 kind:load to:0x027e0cd8 module:dtcm @@ -1896,7 +1896,7 @@ from:0x02175060 kind:load to:0x02176e6c module:overlay(90) from:0x02175074 kind:arm_call to:0x0210baa0 module:overlay(26) from:0x021750ec kind:load to:0x02176e88 module:overlay(90) from:0x021750f0 kind:load to:0x02177c60 module:overlay(90) -from:0x021750f4 kind:load to:0x020b1968 module:overlay(0) +from:0x021750f4 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x021750f8 kind:load to:0x02177d34 module:overlay(90) from:0x02175104 kind:arm_call to:0x0210bb28 module:overlay(26) from:0x02175144 kind:load to:0x027e0cd8 module:dtcm diff --git a/config/eur/arm9/overlays/ov091/relocs.txt b/config/eur/arm9/overlays/ov091/relocs.txt index 5e7e56cb..d359483b 100644 --- a/config/eur/arm9/overlays/ov091/relocs.txt +++ b/config/eur/arm9/overlays/ov091/relocs.txt @@ -219,7 +219,7 @@ from:0x02167b70 kind:load to:0x0217716c module:overlay(91) from:0x02167b7c kind:arm_call to:0x0210baa0 module:overlay(26) from:0x02167bf0 kind:load to:0x02177188 module:overlay(91) from:0x02167bf4 kind:load to:0x02178288 module:overlay(91) -from:0x02167bf8 kind:load to:0x020b1968 module:overlay(0) +from:0x02167bf8 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02167c3c kind:arm_call_thumb to:0x01ffa1a0 module:itcm from:0x02167c60 kind:load to:0x0203e964 module:main from:0x02167c70 kind:arm_call_thumb to:0x02057ed4 module:overlay(0) @@ -235,7 +235,7 @@ from:0x02167d00 kind:arm_call to:0x0209c9a8 module:overlay(0) from:0x02167d18 kind:load to:0x021771d8 module:overlay(91) from:0x02167d24 kind:arm_call to:0x0210baa0 module:overlay(26) from:0x02167d50 kind:load to:0x021771f4 module:overlay(91) -from:0x02167d54 kind:load to:0x020b1968 module:overlay(0) +from:0x02167d54 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02167d78 kind:arm_call to:0x0209c6b8 module:overlay(0) from:0x02167e30 kind:load to:0x020b5d34 module:overlay(0) from:0x02167e38 kind:load to:0x021782cc module:overlay(91) @@ -1751,7 +1751,7 @@ from:0x02175e54 kind:arm_call to:0x0209862c module:overlay(0) from:0x02175e5c kind:arm_call to:0x01ffa06c module:itcm from:0x02175e68 kind:load to:0x0217801c add:0x8 module:overlay(91) from:0x02175e6c kind:load to:0x02178ed4 module:overlay(91) -from:0x02175e70 kind:load to:0x020b1968 module:overlay(0) +from:0x02175e70 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02175e74 kind:load to:0x020b27c8 module:overlay(0) from:0x02175eb0 kind:arm_call to:0x021314c0 module:overlay(26) from:0x02175ec8 kind:arm_call to:0x021314c0 module:overlay(26) diff --git a/config/eur/arm9/overlays/ov092/relocs.txt b/config/eur/arm9/overlays/ov092/relocs.txt index 0e508294..c7873943 100644 --- a/config/eur/arm9/overlays/ov092/relocs.txt +++ b/config/eur/arm9/overlays/ov092/relocs.txt @@ -79,7 +79,7 @@ from:0x02166488 kind:load to:0x0217ba68 module:overlay(92) from:0x02166494 kind:arm_call to:0x0210baa0 module:overlay(26) from:0x0216650c kind:load to:0x0217ba84 module:overlay(92) from:0x02166510 kind:load to:0x0217d050 module:overlay(92) -from:0x02166514 kind:load to:0x020b1968 module:overlay(0) +from:0x02166514 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02166524 kind:arm_call to:0x0210bb28 module:overlay(26) from:0x0216653c kind:arm_call to:0x0210bd48 module:overlay(26) from:0x0216655c kind:arm_call to:0x01ffc768 module:itcm diff --git a/config/eur/arm9/overlays/ov094/relocs.txt b/config/eur/arm9/overlays/ov094/relocs.txt index 14a01a20..2446d762 100644 --- a/config/eur/arm9/overlays/ov094/relocs.txt +++ b/config/eur/arm9/overlays/ov094/relocs.txt @@ -1301,7 +1301,7 @@ from:0x02170aa0 kind:arm_call to:0x0209c9a8 module:overlay(0) from:0x02170ad0 kind:load to:0x02177f98 module:overlay(94) from:0x02170ae0 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x02170b0c kind:load to:0x02177fb4 module:overlay(94) -from:0x02170b10 kind:load to:0x020b1968 module:overlay(0) +from:0x02170b10 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02170b40 kind:arm_call to:0x01ffedf4 module:itcm from:0x02170b54 kind:load to:0x027e0cd8 module:dtcm from:0x02170bdc kind:arm_call to:0x01fff498 module:itcm @@ -1327,7 +1327,7 @@ from:0x02170f10 kind:arm_call to:0x02067278 module:overlay(0) from:0x02170f24 kind:load to:0x02177ff8 module:overlay(94) from:0x02170f28 kind:load to:0x02178034 add:0x8 module:overlay(94) from:0x02170f2c kind:load to:0x020b5d34 module:overlay(0) -from:0x02170f34 kind:load to:0x020b1968 module:overlay(0) +from:0x02170f34 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02170f54 kind:arm_call to:0x020732ec module:overlay(0) from:0x02170f74 kind:load to:0x027e09b8 module:dtcm from:0x02170f90 kind:arm_call to:0x02073578 module:overlay(0) @@ -1425,7 +1425,7 @@ from:0x021718c0 kind:load to:0x021781c4 module:overlay(94) from:0x021718d4 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x0217194c kind:load to:0x021781e0 module:overlay(94) from:0x02171950 kind:load to:0x021792f0 module:overlay(94) -from:0x02171954 kind:load to:0x020b1968 module:overlay(0) +from:0x02171954 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02171958 kind:load to:0x021793c4 module:overlay(94) from:0x02171988 kind:arm_call_thumb to:0x02057ed4 module:overlay(0) from:0x02171990 kind:arm_call to:0x0209d0ac module:overlay(0) @@ -1715,7 +1715,7 @@ from:0x02173bc8 kind:arm_call to:0x0207f4d4 module:overlay(0) from:0x02173be8 kind:arm_call to:0x020a0334 module:overlay(0) from:0x02173bf4 kind:load to:0x02178344 module:overlay(94) from:0x02173bf8 kind:load to:0x02179614 module:overlay(94) -from:0x02173bfc kind:load to:0x020b1968 module:overlay(0) +from:0x02173bfc kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02173c00 kind:load to:0x02179520 module:overlay(94) from:0x02173c08 kind:load to:0x021794ec module:overlay(94) from:0x02173c0c kind:load to:0x021794f0 module:overlay(94) @@ -1810,7 +1810,7 @@ from:0x02174974 kind:arm_call to:0x0209c9a8 module:overlay(0) from:0x021749ac kind:load to:0x02178388 module:overlay(94) from:0x021749bc kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x021749fc kind:load to:0x021783a4 module:overlay(94) -from:0x02174a00 kind:load to:0x020b1968 module:overlay(0) +from:0x02174a00 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02174b44 kind:arm_call to:0x01ffedf4 module:itcm from:0x02174bb8 kind:arm_call to:0x020801b0 module:overlay(0) from:0x02174bcc kind:arm_call to:0x020801b0 module:overlay(0) @@ -1887,7 +1887,7 @@ from:0x0217555c kind:load to:0x021781a8 module:overlay(94) from:0x02175560 kind:load to:0x02178100 module:overlay(94) from:0x02175564 kind:load to:0x02178458 module:overlay(94) from:0x0217557c kind:arm_call to:0x0209cfe0 module:overlay(0) -from:0x021755e0 kind:load to:0x020b1968 module:overlay(0) +from:0x021755e0 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x021755e4 kind:load to:0x02178474 module:overlay(94) from:0x021755e8 kind:load to:0x021799dc module:overlay(94) from:0x02175624 kind:arm_call to:0x0200f05c module:main diff --git a/config/eur/arm9/overlays/ov102/relocs.txt b/config/eur/arm9/overlays/ov102/relocs.txt index 57c207a3..27fa9198 100644 --- a/config/eur/arm9/overlays/ov102/relocs.txt +++ b/config/eur/arm9/overlays/ov102/relocs.txt @@ -69,7 +69,7 @@ from:0x02183954 kind:load to:0x027e0cd8 module:dtcm from:0x02183958 kind:load to:0x021848b0 module:overlay(102) from:0x0218395c kind:load to:0x021189d0 module:overlay(31) from:0x02183960 kind:load to:0x021848f0 module:overlay(102) -from:0x02183964 kind:load to:0x020b1968 module:overlay(0) +from:0x02183964 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x021839ac kind:arm_call to:0x021835c4 module:overlay(102) from:0x02183af0 kind:arm_call to:0x0207e240 module:overlay(0) from:0x02183b08 kind:arm_call to:0x0207e254 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov104/relocs.txt b/config/eur/arm9/overlays/ov104/relocs.txt index 911f8b5f..7650e39a 100644 --- a/config/eur/arm9/overlays/ov104/relocs.txt +++ b/config/eur/arm9/overlays/ov104/relocs.txt @@ -55,7 +55,7 @@ from:0x02185070 kind:arm_call_thumb to:0x0208ed30 module:overlay(0) from:0x0218509c kind:arm_call to:0x0205cadc module:overlay(0) from:0x021850ac kind:load to:0x0218517c module:overlay(104) from:0x021850b0 kind:load to:0x027e0ce0 module:dtcm -from:0x021850b4 kind:load to:0x020b1968 module:overlay(0) +from:0x021850b4 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x021850b8 kind:load to:0x02185168 module:overlay(104) from:0x021850dc kind:load to:0x0208c724 module:overlay(0) from:0x021850ec kind:arm_call_thumb to:0x02057ed4 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov106/relocs.txt b/config/eur/arm9/overlays/ov106/relocs.txt index 82fdcdca..fbb069a4 100644 --- a/config/eur/arm9/overlays/ov106/relocs.txt +++ b/config/eur/arm9/overlays/ov106/relocs.txt @@ -91,7 +91,7 @@ from:0x02185550 kind:arm_call to:0x0205cadc module:overlay(0) from:0x0218555c kind:load to:0x02185b9c module:overlay(106) from:0x02185560 kind:load to:0x027e0ce0 module:dtcm from:0x02185564 kind:load to:0x02185aa4 module:overlay(106) -from:0x02185568 kind:load to:0x020b1968 module:overlay(0) +from:0x02185568 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0218556c kind:load to:0x02185b88 module:overlay(106) from:0x02185590 kind:arm_call to:0x0200eab0 module:main from:0x021855a4 kind:arm_call to:0x0208c724 module:overlay(0) @@ -111,7 +111,7 @@ from:0x02185754 kind:arm_call to:0x0200b578 module:main from:0x02185764 kind:arm_call to:0x020a8974 module:overlay(0) from:0x0218577c kind:arm_call_thumb to:0x0208ed30 module:overlay(0) from:0x021857bc kind:load to:0x02185bb0 module:overlay(106) -from:0x021857c0 kind:load to:0x020b1968 module:overlay(0) +from:0x021857c0 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x021857c4 kind:load to:0x027e09b8 module:dtcm from:0x021857c8 kind:load to:0x020a02d4 module:overlay(0) from:0x021857cc kind:load to:0x02184d20 module:overlay(106) diff --git a/config/eur/arm9/overlays/ov107/relocs.txt b/config/eur/arm9/overlays/ov107/relocs.txt index 82177e42..ebc3bbe0 100644 --- a/config/eur/arm9/overlays/ov107/relocs.txt +++ b/config/eur/arm9/overlays/ov107/relocs.txt @@ -41,7 +41,7 @@ from:0x02185220 kind:arm_call to:0x01fff148 module:itcm from:0x0218527c kind:arm_call to:0x0200b578 module:main from:0x02185290 kind:load to:0x02186668 module:overlay(107) from:0x02185294 kind:load to:0x027e0ce0 module:dtcm -from:0x02185298 kind:load to:0x020b1968 module:overlay(0) +from:0x02185298 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x0218529c kind:load to:0x02186628 module:overlay(107) from:0x021852a0 kind:load to:0x02186614 module:overlay(107) from:0x021852a4 kind:load to:0x0218548c module:overlay(107) diff --git a/config/eur/arm9/overlays/ov108/relocs.txt b/config/eur/arm9/overlays/ov108/relocs.txt index c1452d3b..8045ebdb 100644 --- a/config/eur/arm9/overlays/ov108/relocs.txt +++ b/config/eur/arm9/overlays/ov108/relocs.txt @@ -1,5 +1,5 @@ from:0x02184a60 kind:load to:0x02185ee8 module:overlay(108) -from:0x02184a64 kind:load to:0x020b1968 module:overlay(0) +from:0x02184a64 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02184a78 kind:load to:0x0208c6d4 module:overlay(0) from:0x02184a88 kind:arm_call_thumb to:0x02057ed4 module:overlay(0) from:0x02184a90 kind:arm_call_thumb to:0x0208c6d0 module:overlay(0) @@ -23,7 +23,7 @@ from:0x02184bb4 kind:arm_call_thumb to:0x02057b8c module:overlay(0) from:0x02184bbc kind:arm_call_thumb to:0x0208c6d0 module:overlay(0) from:0x02184bc4 kind:arm_call to:0x02011ff4 module:main from:0x02184bf0 kind:load to:0x02185f10 module:overlay(108) -from:0x02184bf4 kind:load to:0x020b1968 module:overlay(0) +from:0x02184bf4 kind:load to:0x020b1960 add:0x8 module:overlay(0) from:0x02184c08 kind:load to:0x0208c6d4 module:overlay(0) from:0x02184c18 kind:arm_call_thumb to:0x02057ed4 module:overlay(0) from:0x02184c20 kind:arm_call_thumb to:0x0208c6d0 module:overlay(0) diff --git a/config/jp/arm9/delinks.txt b/config/jp/arm9/delinks.txt index 76ae5ea3..5840f124 100644 --- a/config/jp/arm9/delinks.txt +++ b/config/jp/arm9/delinks.txt @@ -67,14 +67,6 @@ libs/c/src/ansi_files.c: .data start:0x02045c1c end:0x02045d00 .bss start:0x02052d20 end:0x02053020 -libs/c/src/float.c: - complete - .data start:0x02045d00 end:0x02045d04 - -libs/c/src/locale.c: - complete - .data start:0x02045d04 end:0x02045f20 - libs/c/src/arith.c: complete .text start:0x02034e04 end:0x02034e1c @@ -121,6 +113,14 @@ libs/c/src/wmem.c: complete .text start:0x02035728 end:0x02035760 +libs/c/src/float.c: + complete + .data start:0x02045d00 end:0x02045d04 + +libs/c/src/locale.c: + complete + .data start:0x02045d04 end:0x02045f20 + libs/c/src/wprintf.c: .text start:0x02035760 end:0x0203768c .data start:0x02045f20 end:0x02045fa0 diff --git a/config/jp/arm9/itcm/symbols.txt b/config/jp/arm9/itcm/symbols.txt index fe758a88..bc746fd2 100644 --- a/config/jp/arm9/itcm/symbols.txt +++ b/config/jp/arm9/itcm/symbols.txt @@ -120,12 +120,12 @@ func_01ffc25c kind:function(arm,size=0x24) addr:0x01ffc25c func_01ffc280 kind:function(arm,size=0x60) addr:0x01ffc280 func_01ffc2e0 kind:function(arm,size=0xb8) addr:0x01ffc2e0 func_01ffc398 kind:function(arm,size=0x1c) addr:0x01ffc398 -func_01ffc3b4 kind:function(arm,size=0x20) addr:0x01ffc3b4 +_ZN10UnkSystem513func_01ffc3b4Ev kind:function(arm,size=0x20) addr:0x01ffc3b4 func_01ffc3d4 kind:function(arm,size=0x88) addr:0x01ffc3d4 func_01ffc45c kind:function(arm,size=0x70) addr:0x01ffc45c func_01ffc4cc kind:function(arm,size=0x54) addr:0x01ffc4cc func_01ffc520 kind:function(arm,size=0x5c) addr:0x01ffc520 -func_01ffc57c kind:function(arm,size=0x24) addr:0x01ffc57c +_ZN10UnkSystem48vfunc_0CEv kind:function(arm,size=0x24) addr:0x01ffc57c func_01ffc5a0 kind:function(arm,size=0x94) addr:0x01ffc5a0 func_01ffc634 kind:function(arm,size=0xa0) addr:0x01ffc634 func_01ffc6d4 kind:function(arm,size=0x70) addr:0x01ffc6d4 @@ -184,7 +184,7 @@ func_01ffe954 kind:function(arm,size=0x80) addr:0x01ffe954 func_01ffe9d4 kind:function(arm,size=0x308) addr:0x01ffe9d4 func_01ffecdc kind:function(arm,size=0xd0) addr:0x01ffecdc func_01ffedac kind:function(arm,size=0x48) addr:0x01ffedac -func_01ffedf4 kind:function(arm,size=0x1c) addr:0x01ffedf4 +_ZN21UnkStruct_027e0cd8_0c13func_01ffedf4EP5Vec2b kind:function(arm,size=0x1c) addr:0x01ffedf4 func_01ffee10 kind:function(arm,size=0x124) addr:0x01ffee10 func_01ffef34 kind:function(arm,size=0x128) addr:0x01ffef34 func_01fff05c kind:function(arm,size=0x58) addr:0x01fff05c diff --git a/config/jp/arm9/overlays/ov000/delinks.txt b/config/jp/arm9/overlays/ov000/delinks.txt index c8a0f089..52812839 100644 --- a/config/jp/arm9/overlays/ov000/delinks.txt +++ b/config/jp/arm9/overlays/ov000/delinks.txt @@ -56,16 +56,20 @@ src/000_Second/Actor/ActorUnkEFIK.cpp: .data start:0x020b4c2c end:0x020b4cb0 .bss start:0x020b74f4 end:0x020b7540 -src/000_Second/MapObject/MapObjectUnkSWST.cpp: +src/000_Second/MapObject/MapObjectSwitchStep.cpp: .text start:0x0209f4a4 end:0x0209fbbc + .rodata start:0x020af548 end:0x020af56c .init start:0x020b2160 end:0x020b21bc .ctor start:0x020b312c end:0x020b3130 - .bss start:0x020b7928 end:0x020b7a38 + .data start:0x020b4e78 end:0x020b4f44 + .bss start:0x020b7924 end:0x020b7a38 -src/000_Second/MapObject/MapObjectUnkBLCM.cpp: +src/000_Second/MapObject/MapObjectMiniBlocks.cpp: .text start:0x0209fbbc end:0x0209ff2c + .rodata start:0x020af56c end:0x020af578 .init start:0x020b21bc end:0x020b220c .ctor start:0x020b3130 end:0x020b3134 + .data start:0x020b4f44 end:0x020b4fac .bss start:0x020b7a38 end:0x020b7ab0 src/000_Second/Item/ItemManager.cpp: diff --git a/config/jp/arm9/overlays/ov000/relocs.txt b/config/jp/arm9/overlays/ov000/relocs.txt index 51868d31..3d8a8bb5 100644 --- a/config/jp/arm9/overlays/ov000/relocs.txt +++ b/config/jp/arm9/overlays/ov000/relocs.txt @@ -7234,12 +7234,12 @@ from:0x0209f4c0 kind:arm_call to:0x02011f3c module:main from:0x0209f4cc kind:arm_call to:0x0209f664 module:overlay(0) from:0x0209f4e4 kind:arm_call to:0x0209e16c module:overlay(0) from:0x0209f4f4 kind:arm_call to:0x0207d6d0 module:overlay(0) -from:0x0209f558 kind:load to:0x020b4e9c module:overlay(0) -from:0x0209f55c kind:load to:0x020b4eb8 module:overlay(0) -from:0x0209f560 kind:load to:0x020b4e80 module:overlay(0) +from:0x0209f558 kind:load to:0x020b4e94 add:0x8 module:overlay(0) +from:0x0209f55c kind:load to:0x020b4eb0 add:0x8 module:overlay(0) +from:0x0209f560 kind:load to:0x020b4e78 add:0x8 module:overlay(0) from:0x0209f578 kind:arm_call_thumb to:0x020590d4 module:overlay(0) from:0x0209f594 kind:arm_call to:0x0209f5a4 module:overlay(0) -from:0x0209f5a0 kind:load to:0x020b4ee0 module:overlay(0) +from:0x0209f5a0 kind:load to:0x020b4ed8 add:0x8 module:overlay(0) from:0x0209f5bc kind:arm_call to:0x020591b8 module:overlay(0) from:0x0209f5cc kind:arm_call to:0x020591b8 module:overlay(0) from:0x0209f604 kind:arm_call to:0x0200f218 module:main @@ -7250,23 +7250,23 @@ from:0x0209f690 kind:arm_call_thumb to:0x02058d0c module:overlay(0) from:0x0209f710 kind:arm_call to:0x02059fa4 module:overlay(0) from:0x0209f724 kind:arm_call to:0x0205a004 module:overlay(0) from:0x0209f738 kind:arm_call to:0x02058d24 module:overlay(0) -from:0x0209f74c kind:load to:0x020b4f0c module:overlay(0) +from:0x0209f74c kind:load to:0x020b4f04 add:0x8 module:overlay(0) from:0x0209f750 kind:load to:0x020b7940 module:overlay(0) -from:0x0209f754 kind:load to:0x020b7960 module:overlay(0) +from:0x0209f754 kind:load to:0x020b7940 add:0x20 module:overlay(0) from:0x0209f758 kind:load to:0x020af548 module:overlay(0) -from:0x0209f75c kind:load to:0x020b7a14 module:overlay(0) +from:0x0209f75c kind:load to:0x020b7940 add:0xd4 module:overlay(0) from:0x0209f768 kind:arm_call_thumb to:0x02059154 module:overlay(0) from:0x0209f79c kind:arm_call to:0x0209f8e0 module:overlay(0) from:0x0209f7ac kind:arm_call to:0x0209ea88 module:overlay(0) from:0x0209f7b4 kind:arm_call_thumb to:0x02059154 module:overlay(0) from:0x0209f7bc kind:arm_call to:0x0209e870 module:overlay(0) -from:0x0209f7c8 kind:load to:0x020b4f0c module:overlay(0) +from:0x0209f7c8 kind:load to:0x020b4f04 add:0x8 module:overlay(0) from:0x0209f7f4 kind:arm_call to:0x0209f8e0 module:overlay(0) from:0x0209f804 kind:arm_call to:0x0209ea88 module:overlay(0) from:0x0209f80c kind:arm_call_thumb to:0x02059154 module:overlay(0) from:0x0209f814 kind:arm_call to:0x0209e870 module:overlay(0) from:0x0209f81c kind:arm_call to:0x02011ff4 module:main -from:0x0209f828 kind:load to:0x020b4f0c module:overlay(0) +from:0x0209f828 kind:load to:0x020b4f04 add:0x8 module:overlay(0) from:0x0209f864 kind:arm_call to:0x0209ea60 module:overlay(0) from:0x0209f888 kind:arm_call to:0x0209f8e0 module:overlay(0) from:0x0209f8bc kind:arm_call to:0x020611a8 module:overlay(0) @@ -7301,10 +7301,10 @@ from:0x0209fbc4 kind:load to:0x020b7a48 module:overlay(0) from:0x0209fbd8 kind:arm_call to:0x02011f3c module:main from:0x0209fbe4 kind:arm_call to:0x0209fc38 module:overlay(0) from:0x0209fc04 kind:arm_call to:0x0209e310 module:overlay(0) -from:0x0209fc30 kind:load to:0x020b4f4c module:overlay(0) +from:0x0209fc30 kind:load to:0x020b4f44 add:0x8 module:overlay(0) from:0x0209fc40 kind:arm_call to:0x0209e7a4 module:overlay(0) -from:0x0209fc6c kind:load to:0x020b4f74 module:overlay(0) -from:0x0209fc70 kind:load to:0x020b3168 module:overlay(0) +from:0x0209fc6c kind:load to:0x020b4f6c add:0x8 module:overlay(0) +from:0x0209fc70 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0209fc94 kind:arm_call to:0x0209e49c module:overlay(0) from:0x0209fcc4 kind:arm_call to:0x01ffedf4 module:itcm from:0x0209fe44 kind:arm_call to:0x01ff9638 module:itcm diff --git a/config/jp/arm9/overlays/ov000/symbols.txt b/config/jp/arm9/overlays/ov000/symbols.txt index b137dcfd..6c3fd35f 100644 --- a/config/jp/arm9/overlays/ov000/symbols.txt +++ b/config/jp/arm9/overlays/ov000/symbols.txt @@ -66,9 +66,9 @@ _ZN19func_ov000_02058cb4D0Ev kind:function(arm,size=0x1c) addr:0x02058cb4 func_ov000_02058cd0 kind:function(thumb,size=0xc) addr:0x02058cd0 func_ov000_02058cdc kind:function(thumb,size=0x20) addr:0x02058cdc func_ov000_02058cfc kind:function(thumb,size=0xe) addr:0x02058cfc -func_ov000_02058d0c kind:function(thumb,size=0x18) addr:0x02058d0c -func_ov000_02058d24 kind:function(arm,size=0x54) addr:0x02058d24 -func_ov000_02058d78 kind:function(arm,size=0x38) addr:0x02058d78 +_ZN10UnkSystem5C1EPvi kind:function(thumb,size=0x18) addr:0x02058d0c +_ZN10UnkSystem519func_ov000_020577a4Eiii kind:function(arm,size=0x54) addr:0x02058d24 +_ZN10UnkSystem519func_ov000_020577f8Ei kind:function(arm,size=0x38) addr:0x02058d78 func_ov000_02058db0 kind:function(arm,size=0x3c) addr:0x02058db0 func_ov000_02058dec kind:function(arm,size=0x38) addr:0x02058dec func_ov000_02058e24 kind:function(arm,size=0x20) addr:0x02058e24 @@ -90,15 +90,15 @@ func_ov000_02059074 kind:function(arm,size=0x14) addr:0x02059074 _ZN19func_ov000_02059088D0Ev kind:function(arm,size=0x1c) addr:0x02059088 _ZN19func_ov000_020590a4D1Ev kind:function(arm,size=0x14) addr:0x020590a4 _ZN19func_ov000_020590b8D0Ev kind:function(arm,size=0x1c) addr:0x020590b8 -func_ov000_020590d4 kind:function(thumb,size=0x1c) addr:0x020590d4 -_ZN22UnkStruct_PlayerGet_8cC1Ei kind:function(thumb,size=0x1c) addr:0x020590f0 -_ZN22UnkStruct_PlayerGet_8cD1Ev kind:function(thumb,size=0x20) addr:0x0205910c -func_ov000_0205912c kind:function(thumb,size=0x28) addr:0x0205912c -func_ov000_02059154 kind:function(thumb,size=0x20) addr:0x02059154 -func_ov000_02059174 kind:function(arm,size=0x20) addr:0x02059174 +_ZN10UnkSystem4C2Ei kind:function(thumb,size=0x1c) addr:0x020590d4 +_ZN10UnkSystem4C1Ei kind:function(thumb,size=0x1c) addr:0x020590f0 +_ZN10UnkSystem4D1Ev kind:function(thumb,size=0x20) addr:0x0205910c +_ZN10UnkSystem4D0Ev kind:function(thumb,size=0x28) addr:0x0205912c +_ZN10UnkSystem4D2Ev kind:function(thumb,size=0x20) addr:0x02059154 +_ZN10UnkSystem48vfunc_08Ei kind:function(arm,size=0x20) addr:0x02059174 func_ov000_02059194 kind:function(arm,size=0x20) addr:0x02059194 -func_ov000_020591b4 kind:function(arm,size=0x4) addr:0x020591b4 -func_ov000_020591b8 kind:function(arm,size=0x34) addr:0x020591b8 +_ZN10UnkSystem48vfunc_1CEP19UnkSystem4_vfunc_1C kind:function(arm,size=0x4) addr:0x020591b4 +_ZN10UnkSystem419func_ov000_02057c38Eii kind:function(arm,size=0x34) addr:0x020591b8 func_ov000_020591ec kind:function(arm,size=0x2c) addr:0x020591ec func_ov000_02059218 kind:function(arm,size=0x18) addr:0x02059218 func_ov000_02059230 kind:function(arm,size=0x18) addr:0x02059230 @@ -107,14 +107,14 @@ func_ov000_02059274 kind:function(arm,size=0x2c) addr:0x02059274 func_ov000_020592a0 kind:function(thumb,size=0x1c) addr:0x020592a0 func_ov000_020592bc kind:function(arm,size=0x30) addr:0x020592bc func_ov000_020592ec kind:function(arm,size=0x18) addr:0x020592ec -func_ov000_02059304 kind:function(arm,size=0x18) addr:0x02059304 +_ZN10UnkSystem48vfunc_20Ev kind:function(arm,size=0x18) addr:0x02059304 func_ov000_0205931c kind:function(arm,size=0x2c) addr:0x0205931c -func_ov000_02059348 kind:function(arm,size=0x7c) addr:0x02059348 -func_ov000_020593c4 kind:function(arm,size=0x64) addr:0x020593c4 -func_ov000_02059428 kind:function(arm,size=0x1c) addr:0x02059428 +_ZN10UnkSystem48vfunc_10Ev kind:function(arm,size=0x7c) addr:0x02059348 +_ZN10UnkSystem48vfunc_14Ev kind:function(arm,size=0x64) addr:0x020593c4 +_ZN10UnkSystem48vfunc_18Ev kind:function(arm,size=0x1c) addr:0x02059428 func_ov000_02059444 kind:function(thumb,size=0x2) addr:0x02059444 _ZN19func_ov000_02059448D0Ev kind:function(thumb,size=0xc) addr:0x02059448 -func_ov000_02059454 kind:function(thumb,size=0x2) addr:0x02059454 +_ZN10UnkSystem6D1Ev kind:function(thumb,size=0x2) addr:0x02059454 func_ov000_02059458 kind:function(arm,size=0x8) addr:0x02059458 func_ov000_02059460 kind:function(arm,size=0x14) addr:0x02059460 func_ov000_02059474 kind:function(arm,size=0x24) addr:0x02059474 @@ -154,9 +154,9 @@ func_ov000_02059e70 kind:function(thumb,size=0x10) addr:0x02059e70 func_ov000_02059e80 kind:function(thumb,size=0x12) addr:0x02059e80 func_ov000_02059e94 kind:function(thumb,size=0xd0) addr:0x02059e94 func_ov000_02059f64 kind:function(thumb,size=0x40) addr:0x02059f64 -func_ov000_02059fa4 kind:function(arm,size=0x34) addr:0x02059fa4 +_ZN28MapObjectProfile_Derived2_2019func_ov000_02058a24Ev kind:function(arm,size=0x34) addr:0x02059fa4 func_ov000_02059fd8 kind:function(arm,size=0x2c) addr:0x02059fd8 -func_ov000_0205a004 kind:function(arm,size=0x2c) addr:0x0205a004 +_ZN28MapObjectProfile_Derived2_2019func_ov000_02058a84EiPKc kind:function(arm,size=0x2c) addr:0x0205a004 func_ov000_0205a030 kind:function(arm,size=0xe8) addr:0x0205a030 func_ov000_0205a118 kind:function(thumb,size=0x1c) addr:0x0205a118 func_ov000_0205a134 kind:function(arm,size=0x34) addr:0x0205a134 @@ -398,7 +398,7 @@ func_ov000_02060c4c kind:function(arm,size=0x20) addr:0x02060c4c func_ov000_02060c6c kind:function(arm,size=0xf0) addr:0x02060c6c func_ov000_02060d5c kind:function(arm,size=0x114) addr:0x02060d5c func_ov000_02060e70 kind:function(arm,size=0x338) addr:0x02060e70 -_ZN31UnkStruct_ov019_020d24c8_28_25819func_ov000_0205fc20EiiPvS0_ kind:function(arm,size=0xe8) addr:0x020611a8 +_ZN34UnkStruct_ov019_020d24c8_28_258_0019func_ov000_0205fc20EiiPvS0_ kind:function(arm,size=0xe8) addr:0x020611a8 func_ov000_02061290 kind:function(arm,size=0x38) addr:0x02061290 func_ov000_020612c8 kind:function(arm,size=0x90) addr:0x020612c8 func_ov000_02061358 kind:function(arm,size=0x28) addr:0x02061358 @@ -1414,7 +1414,7 @@ func_ov000_0207d6b4 kind:function(arm,size=0x4) addr:0x0207d6b4 func_ov000_0207d6b8 kind:function(arm,size=0x8) addr:0x0207d6b8 func_ov000_0207d6c0 kind:function(arm,size=0x8) addr:0x0207d6c0 func_ov000_0207d6c8 kind:function(arm,size=0x8) addr:0x0207d6c8 -func_ov000_0207d6d0 kind:function(arm,size=0x30) addr:0x0207d6d0 +_ZN24MapObjectProfile_D4_BaseC2Ev kind:function(arm,size=0x30) addr:0x0207d6d0 func_ov000_0207d700 kind:function(arm,size=0x30) addr:0x0207d700 func_ov000_0207d730 kind:function(arm,size=0x38) addr:0x0207d730 func_ov000_0207d768 kind:function(arm,size=0x54) addr:0x0207d768 @@ -2514,12 +2514,12 @@ func_ov000_0209e134 kind:function(arm,size=0x2c) addr:0x0209e134 func_ov000_0209e160 kind:function(arm,size=0x4) addr:0x0209e160 func_ov000_0209e164 kind:function(arm,size=0x4) addr:0x0209e164 func_ov000_0209e168 kind:function(arm,size=0x4) addr:0x0209e168 -func_ov000_0209e16c kind:function(arm,size=0x30) addr:0x0209e16c -func_ov000_0209e19c kind:function(arm,size=0x38) addr:0x0209e19c -func_ov000_0209e1d4 kind:function(arm,size=0x8) addr:0x0209e1d4 -func_ov000_0209e1dc kind:function(arm,size=0x40) addr:0x0209e1dc -func_ov000_0209e21c kind:function(arm,size=0x20) addr:0x0209e21c -func_ov000_0209e23c kind:function(arm,size=0x10) addr:0x0209e23c +_ZN25MapObjectProfile_Derived2C2Ejj kind:function(arm,size=0x30) addr:0x0209e16c +_ZN25MapObjectProfile_Derived2D2Ev kind:function(arm,size=0x38) addr:0x0209e19c +_ZN25MapObjectProfile_Derived28vfunc_04Ev kind:function(arm,size=0x8) addr:0x0209e1d4 +_ZN25MapObjectProfile_Derived28vfunc_08Ev kind:function(arm,size=0x40) addr:0x0209e1dc +_ZN25MapObjectProfile_Derived28vfunc_0CEv kind:function(arm,size=0x20) addr:0x0209e21c +_ZN25MapObjectProfile_Derived28vfunc_10Ev kind:function(arm,size=0x10) addr:0x0209e23c func_ov000_0209e24c kind:function(arm,size=0x30) addr:0x0209e24c func_ov000_0209e27c kind:function(arm,size=0x8) addr:0x0209e27c func_ov000_0209e284 kind:function(arm,size=0x2c) addr:0x0209e284 @@ -2527,50 +2527,50 @@ func_ov000_0209e2b0 kind:function(arm,size=0x20) addr:0x0209e2b0 func_ov000_0209e2d0 kind:function(arm,size=0x38) addr:0x0209e2d0 func_ov000_0209e308 kind:function(arm,size=0x4) addr:0x0209e308 func_ov000_0209e30c kind:function(arm,size=0x4) addr:0x0209e30c -func_ov000_0209e310 kind:function(arm,size=0x50) addr:0x0209e310 -func_ov000_0209e360 kind:function(arm,size=0x18) addr:0x0209e360 -func_ov000_0209e378 kind:function(arm,size=0x14) addr:0x0209e378 -func_ov000_0209e38c kind:function(arm,size=0x58) addr:0x0209e38c -_ZN19func_ov000_0209e3e4D0Ev kind:function(arm,size=0x60) addr:0x0209e3e4 -func_ov000_0209e444 kind:function(arm,size=0x58) addr:0x0209e444 -func_ov000_0209e49c kind:function(arm,size=0x88) addr:0x0209e49c -func_ov000_0209e524 kind:function(arm,size=0x1c) addr:0x0209e524 -func_ov000_0209e540 kind:function(arm,size=0x44) addr:0x0209e540 -func_ov000_0209e584 kind:function(arm,size=0x48) addr:0x0209e584 +_ZN25MapObjectProfile_Derived1C2Ejii kind:function(arm,size=0x50) addr:0x0209e310 +_ZN25MapObjectProfile_Derived18vfunc_04Ev kind:function(arm,size=0x18) addr:0x0209e360 +_ZN25MapObjectProfile_Derived18vfunc_1CEi kind:function(arm,size=0x14) addr:0x0209e378 +_ZN25MapObjectProfile_Derived1D1Ev kind:function(arm,size=0x58) addr:0x0209e38c +_ZN25MapObjectProfile_Derived1D0Ev kind:function(arm,size=0x60) addr:0x0209e3e4 +_ZN25MapObjectProfile_Derived1D2Ev kind:function(arm,size=0x58) addr:0x0209e444 +_ZN25MapObjectProfile_Derived119func_ov000_0209ccd8Eij kind:function(arm,size=0x88) addr:0x0209e49c +_ZN25MapObjectProfile_Derived18vfunc_08Ev kind:function(arm,size=0x1c) addr:0x0209e524 +_ZN25MapObjectProfile_Derived18vfunc_0CEv kind:function(arm,size=0x44) addr:0x0209e540 +_ZN25MapObjectProfile_Derived18vfunc_10Ev kind:function(arm,size=0x48) addr:0x0209e584 func_ov000_0209e5cc kind:function(arm,size=0x70) addr:0x0209e5cc _ZN19func_ov000_0209e63cD1Ev kind:function(arm,size=0x38) addr:0x0209e63c _ZN19func_ov000_0209e674D0Ev kind:function(arm,size=0x40) addr:0x0209e674 func_ov000_0209e6b4 kind:function(arm,size=0xbc) addr:0x0209e6b4 func_ov000_0209e770 kind:function(arm,size=0x30) addr:0x0209e770 func_ov000_0209e7a0 kind:function(arm,size=0x4) addr:0x0209e7a0 -func_ov000_0209e7a4 kind:function(arm,size=0xb4) addr:0x0209e7a4 -func_ov000_0209e858 kind:function(arm,size=0x4) addr:0x0209e858 -_ZN19func_ov000_0209e85cD0Ev kind:function(arm,size=0x14) addr:0x0209e85c -func_ov000_0209e870 kind:function(arm,size=0x4) addr:0x0209e870 -func_ov000_0209e874 kind:function(arm,size=0x8) addr:0x0209e874 -func_ov000_0209e87c kind:function(arm,size=0x4) addr:0x0209e87c -func_ov000_0209e880 kind:function(arm,size=0x58) addr:0x0209e880 -func_ov000_0209e8d8 kind:function(arm,size=0x18) addr:0x0209e8d8 -func_ov000_0209e8f0 kind:function(arm,size=0x18) addr:0x0209e8f0 -func_ov000_0209e908 kind:function(arm,size=0x88) addr:0x0209e908 -func_ov000_0209e990 kind:function(arm,size=0x8) addr:0x0209e990 -func_ov000_0209e998 kind:function(arm,size=0x4) addr:0x0209e998 -func_ov000_0209e99c kind:function(arm,size=0xc) addr:0x0209e99c -func_ov000_0209e9a8 kind:function(arm,size=0x8) addr:0x0209e9a8 -func_ov000_0209e9b0 kind:function(arm,size=0x40) addr:0x0209e9b0 -func_ov000_0209e9f0 kind:function(arm,size=0x48) addr:0x0209e9f0 -func_ov000_0209ea38 kind:function(arm,size=0x28) addr:0x0209ea38 -func_ov000_0209ea60 kind:function(arm,size=0x28) addr:0x0209ea60 -func_ov000_0209ea88 kind:function(arm,size=0x2c) addr:0x0209ea88 -func_ov000_0209eab4 kind:function(arm,size=0xc4) addr:0x0209eab4 -func_ov000_0209eb78 kind:function(arm,size=0x80) addr:0x0209eb78 -func_ov000_0209ebf8 kind:function(arm,size=0xe4) addr:0x0209ebf8 -func_ov000_0209ecdc kind:function(arm,size=0x34) addr:0x0209ecdc -func_ov000_0209ed10 kind:function(arm,size=0x7c) addr:0x0209ed10 -func_ov000_0209ed8c kind:function(arm,size=0x4c) addr:0x0209ed8c -func_ov000_0209edd8 kind:function(arm,size=0x54) addr:0x0209edd8 -func_ov000_0209ee2c kind:function(arm,size=0x44) addr:0x0209ee2c -func_ov000_0209ee70 kind:function(arm,size=0x54) addr:0x0209ee70 +_ZN9MapObjectC2Ev kind:function(arm,size=0xb4) addr:0x0209e7a4 +_ZN9MapObjectD1Ev kind:function(arm,size=0x4) addr:0x0209e858 +_ZN9MapObjectD0Ev kind:function(arm,size=0x14) addr:0x0209e85c +_ZN9MapObjectD2Ev kind:function(arm,size=0x4) addr:0x0209e870 +_ZN9MapObject8vfunc_00Ev kind:function(arm,size=0x8) addr:0x0209e874 +_ZN9MapObject8vfunc_04Ev kind:function(arm,size=0x4) addr:0x0209e87c +_ZN9MapObject19func_ov000_0209d0bcEv kind:function(arm,size=0x58) addr:0x0209e880 +_ZN9MapObject19func_ov000_0209d114Ev kind:function(arm,size=0x18) addr:0x0209e8d8 +_ZN9MapObject19func_ov000_0209d12cEv kind:function(arm,size=0x18) addr:0x0209e8f0 +_ZN9MapObject19func_ov000_0209d144Ev kind:function(arm,size=0x88) addr:0x0209e908 +_ZN9MapObject8vfunc_1CEv kind:function(arm,size=0x8) addr:0x0209e990 +_ZN9MapObject8vfunc_20Ev kind:function(arm,size=0x4) addr:0x0209e998 +_ZN9MapObject8vfunc_24Ev kind:function(arm,size=0xc) addr:0x0209e99c +_ZN9MapObject8vfunc_28Ev kind:function(arm,size=0x8) addr:0x0209e9a8 +_ZN9MapObject8vfunc_2CEv kind:function(arm,size=0x40) addr:0x0209e9b0 +_ZN9MapObject19func_ov000_0209d22cEv kind:function(arm,size=0x48) addr:0x0209e9f0 +_ZN9MapObject19func_ov000_0209d274Ev kind:function(arm,size=0x28) addr:0x0209ea38 +_ZN9MapObject19func_ov000_0209d29cEi kind:function(arm,size=0x28) addr:0x0209ea60 +_ZN9MapObject19func_ov000_0209d2c4Eii kind:function(arm,size=0x2c) addr:0x0209ea88 +_ZN9MapObject19func_ov000_0209d2f0Ev kind:function(arm,size=0xc4) addr:0x0209eab4 +_ZN9MapObject19func_ov000_0209d3b4Ev kind:function(arm,size=0x80) addr:0x0209eb78 +_ZN9MapObject19func_ov000_0209d434Ev kind:function(arm,size=0xe4) addr:0x0209ebf8 +_ZN9MapObject19func_ov000_0209d518Ev kind:function(arm,size=0x34) addr:0x0209ecdc +_ZN9MapObject19func_ov000_0209d54cEv kind:function(arm,size=0x7c) addr:0x0209ed10 +_ZN9MapObject19func_ov000_0209d5c8Ev kind:function(arm,size=0x4c) addr:0x0209ed8c +_ZN9MapObject19func_ov000_0209d614Ev kind:function(arm,size=0x54) addr:0x0209edd8 +_ZN9MapObject19func_ov000_0209d668Ev kind:function(arm,size=0x44) addr:0x0209ee2c +_ZN9MapObject19func_ov000_0209d6acEv kind:function(arm,size=0x54) addr:0x0209ee70 func_ov000_0209eec4 kind:function(arm,size=0x50) addr:0x0209eec4 _ZN19func_ov000_0209ef14D0Ev kind:function(arm,size=0x1c) addr:0x0209ef14 _ZN19func_ov000_0209ef30D2Ev kind:function(arm,size=0x14) addr:0x0209ef30 @@ -2593,33 +2593,33 @@ func_ov000_0209f440 kind:function(arm,size=0x4) addr:0x0209f440 func_ov000_0209f444 kind:function(arm,size=0x18) addr:0x0209f444 _ZN19func_ov000_0209f45cD1Ev kind:function(arm,size=0x20) addr:0x0209f45c _ZN19func_ov000_0209f47cD0Ev kind:function(arm,size=0x28) addr:0x0209f47c -_ZN23MapObjectProfileUnkSWST10GetProfileEv kind:function(arm,size=0xc) addr:0x0209f4a4 -_ZN23MapObjectProfileUnkSWST6CreateEv kind:function(arm,size=0x24) addr:0x0209f4b0 -_ZN23MapObjectProfileUnkSWSTC1Ev kind:function(arm,size=0x94) addr:0x0209f4d4 -_ZN16MapObjectUnkSWST19func_ov000_0209f568Ev kind:function(arm,size=0x3c) addr:0x0209f568 -_ZN16MapObjectUnkSWST19func_ov000_0209f5a4Ev kind:function(arm,size=0x30) addr:0x0209f5a4 -_ZN16MapObjectUnkSWST19func_ov000_0209f5d4Ev kind:function(arm,size=0x90) addr:0x0209f5d4 -_ZN16MapObjectUnkSWSTC1Ev kind:function(arm,size=0xfc) addr:0x0209f664 -_ZN16MapObjectUnkSWST19func_ov000_0209f760Ev kind:function(arm,size=0x14) addr:0x0209f760 -_ZN16MapObjectUnkSWSTD1Ev kind:function(arm,size=0x58) addr:0x0209f774 -_ZN16MapObjectUnkSWSTD0Ev kind:function(arm,size=0x60) addr:0x0209f7cc -_ZN16MapObjectUnkSWST19func_ov000_0209f82cEv kind:function(arm,size=0xb4) addr:0x0209f82c -_ZN16MapObjectUnkSWST19func_ov000_0209f8e0Ev kind:function(arm,size=0x164) addr:0x0209f8e0 -_ZN16MapObjectUnkSWST19func_ov000_0209fa44Ev kind:function(arm,size=0x34) addr:0x0209fa44 -_ZN16MapObjectUnkSWST19func_ov000_0209fa78Ev kind:function(arm,size=0xd8) addr:0x0209fa78 -_ZN16MapObjectUnkSWST19func_ov000_0209fb50Ev kind:function(arm,size=0x3c) addr:0x0209fb50 -_ZN16MapObjectUnkSWST19func_ov000_0209fb8cEv kind:function(arm,size=0x1c) addr:0x0209fb8c -_ZN23MapObjectProfileUnkSWSTD1Ev kind:function(arm,size=0x14) addr:0x0209fba8 -_ZN23MapObjectProfileUnkBLCM10GetProfileEv kind:function(arm,size=0xc) addr:0x0209fbbc -_ZN23MapObjectProfileUnkBLCM6CreateEv kind:function(arm,size=0x24) addr:0x0209fbc8 -_ZN23MapObjectProfileUnkBLCMC1Ev kind:function(arm,size=0x4c) addr:0x0209fbec -_ZN16MapObjectUnkBLCMC1Ev kind:function(arm,size=0x3c) addr:0x0209fc38 -_ZN16MapObjectUnkBLCM19func_ov000_0209fc74Ev kind:function(arm,size=0x1fc) addr:0x0209fc74 -_ZN16MapObjectUnkBLCM19func_ov000_0209fe70Ev kind:function(arm,size=0x60) addr:0x0209fe70 -_ZN16MapObjectUnkBLCMD1Ev kind:function(arm,size=0x20) addr:0x0209fed0 -_ZN16MapObjectUnkBLCMD0Ev kind:function(arm,size=0x28) addr:0x0209fef0 -_ZN23MapObjectProfileUnkBLCMD1Ev kind:function(arm,size=0x14) addr:0x0209ff18 -_ZN19func_ov000_0209ff2cD0Ev kind:function(arm,size=0x1c) addr:0x0209ff2c +_ZN26MapObjectProfileSwitchStep10GetProfileEv kind:function(arm,size=0xc) addr:0x0209f4a4 +_ZN26MapObjectProfileSwitchStep6CreateEv kind:function(arm,size=0x24) addr:0x0209f4b0 +_ZN26MapObjectProfileSwitchStepC1Ev kind:function(arm,size=0x94) addr:0x0209f4d4 +_ZN22MapObjectSwitchStep_40C1Ev kind:function(arm,size=0x3c) addr:0x0209f568 +_ZN22MapObjectSwitchStep_4019func_ov000_0209dde0Ev kind:function(arm,size=0x30) addr:0x0209f5a4 +_ZN22MapObjectSwitchStep_408vfunc_1CEP19UnkSystem4_vfunc_1C kind:function(arm,size=0x90) addr:0x0209f5d4 +_ZN19MapObjectSwitchStepC1Ev kind:function(arm,size=0xfc) addr:0x0209f664 +_ZN22MapObjectSwitchStep_40D1Ev kind:function(arm,size=0x14) addr:0x0209f760 +_ZN19MapObjectSwitchStepD1Ev kind:function(arm,size=0x58) addr:0x0209f774 +_ZN19MapObjectSwitchStepD0Ev kind:function(arm,size=0x60) addr:0x0209f7cc +_ZN19MapObjectSwitchStep8vfunc_00Ev kind:function(arm,size=0xb4) addr:0x0209f82c +_ZN19MapObjectSwitchStep19func_ov000_0209e11cEii kind:function(arm,size=0x164) addr:0x0209f8e0 +_ZN19MapObjectSwitchStep8vfunc_20Ev kind:function(arm,size=0x34) addr:0x0209fa44 +_ZN19MapObjectSwitchStep8vfunc_18Ev kind:function(arm,size=0xd8) addr:0x0209fa78 +_ZN19MapObjectSwitchStep19func_ov000_0209e38cEv kind:function(arm,size=0x3c) addr:0x0209fb50 +_ZN22MapObjectSwitchStep_40D0Ev kind:function(arm,size=0x1c) addr:0x0209fb8c +_ZN26MapObjectProfileSwitchStepD1Ev kind:function(arm,size=0x14) addr:0x0209fba8 +_ZN26MapObjectProfileMiniBlocks10GetProfileEv kind:function(arm,size=0xc) addr:0x0209fbbc +_ZN26MapObjectProfileMiniBlocks6CreateEv kind:function(arm,size=0x24) addr:0x0209fbc8 +_ZN26MapObjectProfileMiniBlocksC1Ev kind:function(arm,size=0x4c) addr:0x0209fbec +_ZN19MapObjectMiniBlocksC1Ev kind:function(arm,size=0x3c) addr:0x0209fc38 +_ZN19MapObjectMiniBlocks8vfunc_00Ev kind:function(arm,size=0x1fc) addr:0x0209fc74 +_ZN19MapObjectMiniBlocks8vfunc_14Ev kind:function(arm,size=0x60) addr:0x0209fe70 +_ZN19MapObjectMiniBlocksD1Ev kind:function(arm,size=0x20) addr:0x0209fed0 +_ZN19MapObjectMiniBlocksD0Ev kind:function(arm,size=0x28) addr:0x0209fef0 +_ZN26MapObjectProfileMiniBlocksD1Ev kind:function(arm,size=0x14) addr:0x0209ff18 +_ZN26MapObjectProfileMiniBlocksD0Ev kind:function(arm,size=0x1c) addr:0x0209ff2c func_ov000_0209ff48 kind:function(arm,size=0xc) addr:0x0209ff48 func_ov000_0209ff54 kind:function(arm,size=0x8) addr:0x0209ff54 func_ov000_0209ff5c kind:function(arm,size=0x3cc) addr:0x0209ff5c @@ -3023,7 +3023,7 @@ _ZN23ActorUnk_ov000_020a8bb019func_ov000_020a8ae0Ei kind:function(arm,size=0x14) func_ov000_020aa2f4 kind:function(arm,size=0x54) addr:0x020aa2f4 func_ov000_020aa348 kind:function(arm,size=0x34) addr:0x020aa348 func_ov000_020aa37c kind:function(arm,size=0x34) addr:0x020aa37c -_ZN23ActorUnk_ov000_020a8bb0C1EP29ActorUnk_ov000_020a8bb0_a4_00i kind:function(arm,size=0x110) addr:0x020aa3b0 +_ZN23ActorUnk_ov000_020a8bb0C1EP10UnkSystem4i kind:function(arm,size=0x110) addr:0x020aa3b0 _ZN23ActorUnk_ov000_020a8bb0D1Ev kind:function(arm,size=0x20) addr:0x020aa4c0 _ZN23ActorUnk_ov000_020a8bb0D0Ev kind:function(arm,size=0x28) addr:0x020aa4e0 _ZN23ActorUnk_ov000_020a8bb0D2Ev kind:function(arm,size=0x20) addr:0x020aa508 @@ -3260,9 +3260,9 @@ data_ov000_020aed1c kind:data(any) addr:0x020af4c4 data_ov000_020af4cc kind:data(any) addr:0x020af4cc data_ov000_020af4d0 kind:data(any) addr:0x020af4d0 data_ov000_020af4e4 kind:data(any) addr:0x020af4e4 -data_ov000_020af548 kind:data(any) addr:0x020af548 -data_ov000_020af558 kind:data(any) addr:0x020af558 -data_ov000_020af56c kind:data(any) addr:0x020af56c +data_ov000_020af550 kind:data(byte[7]) addr:0x020af548 +data_ov000_020af560 kind:data(byte[8]) addr:0x020af558 +data_ov000_020af574 kind:data(any) addr:0x020af56c data_ov000_020af578 kind:data(word[525]) addr:0x020af578 data_ov000_020afdac kind:data(any) addr:0x020afdac data_ov000_020b030a kind:data(any) addr:0x020b030a @@ -3352,8 +3352,8 @@ __sinit_ActorUnkSWTM.cpp kind:function(arm,size=0x50) addr:0x020b2048 __sinit_ActorEventIcon.cpp kind:function(arm,size=0x50) addr:0x020b2098 local __sinit_ActorUnkEFIK.cpp kind:function(arm,size=0x50) addr:0x020b20e8 local __sinit_ov000_020b2138 kind:function(arm,size=0x28) addr:0x020b2138 -__sinit_MapObjectUnkSWST.cpp kind:function(arm,size=0x5c) addr:0x020b2160 -__sinit_MapObjectUnkBLCM.cpp kind:function(arm,size=0x50) addr:0x020b21bc +__sinit_MapObjectSwitchStep.cpp kind:function(arm,size=0x5c) addr:0x020b2160 +__sinit_MapObjectMiniBlocks.cpp kind:function(arm,size=0x50) addr:0x020b21bc __sinit_ov000_020b220c kind:function(arm,size=0x9e8) addr:0x020b220c __sinit_ov000_020b2bf4 kind:function(arm,size=0x408) addr:0x020b2bf4 __sinit_ov000_020b2ffc kind:function(arm,size=0x34) addr:0x020b2ffc @@ -3387,8 +3387,8 @@ __sinit_ov000_020b30b0 kind:function(arm,size=0x14) addr:0x020b30b0 .p__sinit_ActorEventIcon.cpp kind:data(word) addr:0x020b3120 local .p__sinit_ActorUnkEFIK.cpp kind:data(word) addr:0x020b3124 local .p__sinit_ov000_020b2138 kind:data(word) addr:0x020b3128 -.p__sinit_MapObjectUnkSWST.cpp kind:data(word) addr:0x020b312c -.p__sinit_MapObjectUnkBLCM.cpp kind:data(word) addr:0x020b3130 +.p__sinit_MapObjectSwitchStep.cpp kind:data(word) addr:0x020b312c +.p__sinit_MapObjectMiniBlocks.cpp kind:data(word) addr:0x020b3130 .p__sinit_ov000_020b220c kind:data(word) addr:0x020b3134 .p__sinit_ov000_020b2bf4 kind:data(word) addr:0x020b3138 .p__sinit_ov000_020b2ffc kind:data(word) addr:0x020b313c @@ -3396,7 +3396,7 @@ __sinit_ov000_020b30b0 kind:function(arm,size=0x14) addr:0x020b30b0 .p__sinit_ov000_020b304c kind:data(word) addr:0x020b3144 .p__sinit_ov000_020b3088 kind:data(word) addr:0x020b3148 .p__sinit_ov000_020b30b0 kind:data(word) addr:0x020b314c -data_ov000_020b3168 kind:data(any) addr:0x020b3168 +_ZTV10UnkSystem6 kind:data(any) addr:0x020b3160 data_ov000_020b318c kind:data(any) addr:0x020b318c data_ov000_020b31a8 kind:data(any) addr:0x020b31a8 data_ov000_020b31b0 kind:data(any) addr:0x020b31b0 @@ -3698,13 +3698,13 @@ data_ov000_020b4d90 kind:data(any) addr:0x020b4d90 data_ov000_020b4dd0 kind:data(any) addr:0x020b4dd0 data_ov000_020b4e30 kind:data(any) addr:0x020b4e30 data_ov000_020b4e3c kind:data(any) addr:0x020b4e3c -data_ov000_020b4e80 kind:data(any) addr:0x020b4e80 -data_ov000_020b4e9c kind:data(any) addr:0x020b4e9c -data_ov000_020b4eb8 kind:data(any) addr:0x020b4eb8 -data_ov000_020b4ee0 kind:data(any) addr:0x020b4ee0 -data_ov000_020b4f0c kind:data(any) addr:0x020b4f0c -data_ov000_020b4f4c kind:data(any) addr:0x020b4f4c -data_ov000_020b4f74 kind:data(any) addr:0x020b4f74 +_ZTV26MapObjectProfileSwitchStep kind:data(any) addr:0x020b4e78 +_ZTV31MapObjectProfileSwitchStep_Base kind:data(any) addr:0x020b4e94 +_ZTV19MapObjectProfile_D4 kind:data(any) addr:0x020b4eb0 +_ZTV22MapObjectSwitchStep_40 kind:data(any) addr:0x020b4ed8 +_ZTV19MapObjectSwitchStep kind:data(any) addr:0x020b4f04 +_ZTV26MapObjectProfileMiniBlocks kind:data(any) addr:0x020b4f44 +_ZTV19MapObjectMiniBlocks kind:data(any) addr:0x020b4f6c data_ov000_020b4fac kind:data(any) addr:0x020b4fac data_ov000_020b4fb0 kind:data(any) addr:0x020b4fb0 data_ov000_020b4fb4 kind:data(any) addr:0x020b4fb4 @@ -4062,15 +4062,13 @@ _ZN15ProfileInstanceI19ActorProfileUnkEFIKE8sProfileE kind:bss addr:0x020b7504 data_ov000_020b7540 kind:bss addr:0x020b7540 data_ov000_020b7544 kind:bss addr:0x020b7544 data_ov000_020b754c kind:bss addr:0x020b754c -data_ov000_020b7924 kind:bss addr:0x020b7924 -_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWSTE8sProfileE kind:bss addr:0x020b7928 -@30056 kind:bss addr:0x020b7934 -_ZN15ProfileInstanceI23MapObjectProfileUnkSWSTE8sProfileE kind:bss addr:0x020b7940 -data_ov000_020b7960 kind:bss addr:0x020b7960 -data_ov000_020b7a14 kind:bss addr:0x020b7a14 -_ZGVN15ProfileInstanceI23MapObjectProfileUnkBLCME8sProfileE kind:bss addr:0x020b7a38 +_ZGVN15ProfileInstanceI26MapObjectProfileSwitchStepE8sProfileE kind:bss addr:0x020b7924 +MapObjectSwitchStep_data_020b6118 kind:bss(size=0x8) addr:0x020b7928 +@1056 kind:bss addr:0x020b7934 local +_ZN15ProfileInstanceI26MapObjectProfileSwitchStepE8sProfileE kind:bss addr:0x020b7940 +_ZGVN15ProfileInstanceI26MapObjectProfileMiniBlocksE8sProfileE kind:bss addr:0x020b7a38 @30062 kind:bss addr:0x020b7a3c -_ZN15ProfileInstanceI23MapObjectProfileUnkBLCME8sProfileE kind:bss addr:0x020b7a48 +_ZN15ProfileInstanceI26MapObjectProfileMiniBlocksE8sProfileE kind:bss addr:0x020b7a48 data_ov000_020b7ab0 kind:bss addr:0x020b7ab0 data_ov000_020b7ab4 kind:bss addr:0x020b7ab4 gSaveManager kind:bss addr:0x020b7ab8 diff --git a/config/jp/arm9/overlays/ov017/symbols.txt b/config/jp/arm9/overlays/ov017/symbols.txt index 35e3ee47..eb659c43 100644 --- a/config/jp/arm9/overlays/ov017/symbols.txt +++ b/config/jp/arm9/overlays/ov017/symbols.txt @@ -94,13 +94,13 @@ func_ov017_020c1ad8 kind:function(arm,size=0x48) addr:0x020c1ad8 func_ov017_020c1b20 kind:function(arm,size=0x48) addr:0x020c1b20 func_ov017_020c1b68 kind:function(arm,size=0x1d0) addr:0x020c1b68 func_ov017_020c1d38 kind:function(arm,size=0x80) addr:0x020c1d38 -func_ov017_020c1db8 kind:function(arm,size=0x4) addr:0x020c1db8 -func_ov017_020c1dbc kind:function(arm,size=0x4) addr:0x020c1dbc -func_ov017_020c1dc0 kind:function(arm,size=0x4) addr:0x020c1dc0 -func_ov017_020c1dc4 kind:function(arm,size=0x4) addr:0x020c1dc4 -func_ov017_020c1dc8 kind:function(arm,size=0x4) addr:0x020c1dc8 -func_ov017_020c1dcc kind:function(arm,size=0x1ac) addr:0x020c1dcc -func_ov017_020c1f78 kind:function(arm,size=0x28) addr:0x020c1f78 +_ZN9MapObject8vfunc_08Ev kind:function(arm,size=0x4) addr:0x020c1db8 +_ZN9MapObject8vfunc_0CEv kind:function(arm,size=0x4) addr:0x020c1dbc +_ZN9MapObject8vfunc_10Ev kind:function(arm,size=0x4) addr:0x020c1dc0 +_ZN9MapObject8vfunc_14Ev kind:function(arm,size=0x4) addr:0x020c1dc4 +_ZN9MapObject8vfunc_18Ev kind:function(arm,size=0x4) addr:0x020c1dc8 +_ZN19MapObjectSwitchStep8vfunc_08Ev kind:function(arm,size=0x1ac) addr:0x020c1dcc +_ZN19MapObjectSwitchStep8vfunc_14Ev kind:function(arm,size=0x28) addr:0x020c1f78 func_ov017_020c1fa0 kind:function(arm,size=0x130) addr:0x020c1fa0 func_ov017_020c20d0 kind:function(arm,size=0x20) addr:0x020c20d0 func_ov017_020c20f0 kind:function(arm,size=0xac) addr:0x020c20f0 diff --git a/config/jp/arm9/overlays/ov021/relocs.txt b/config/jp/arm9/overlays/ov021/relocs.txt index 082dac70..06e697cc 100644 --- a/config/jp/arm9/overlays/ov021/relocs.txt +++ b/config/jp/arm9/overlays/ov021/relocs.txt @@ -1474,7 +1474,7 @@ from:0x020f7c68 kind:arm_call to:0x0209e870 module:overlay(0) from:0x020f7c70 kind:arm_call to:0x02011ff4 module:main from:0x020f7c84 kind:arm_call to:0x0209e19c module:overlay(0) from:0x020f7d10 kind:arm_call to:0x020fa114 module:overlay(21) -from:0x020f7d20 kind:load to:0x020b3168 module:overlay(0) +from:0x020f7d20 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x020f7d30 kind:arm_call_thumb to:0x02059454 module:overlay(0) from:0x020f7d50 kind:arm_call to:0x02098c90 module:overlay(0) from:0x020f7d70 kind:arm_call to:0x020f7e80 module:overlay(21) @@ -1504,7 +1504,7 @@ from:0x020f7fd0 kind:arm_call to:0x020f3154 module:overlay(21) from:0x020f7fe4 kind:arm_call to:0x020f3124 module:overlay(21) from:0x020f8008 kind:arm_call_thumb to:0x01ffa1a0 module:itcm from:0x020f8054 kind:arm_call_thumb to:0x02059454 module:overlay(0) -from:0x020f8060 kind:load to:0x020b3168 module:overlay(0) +from:0x020f8060 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x020f8064 kind:load to:0x027e0ce4 module:dtcm from:0x020f8068 kind:load to:0x0203feb0 module:main from:0x020f8120 kind:arm_call to:0x020fbda8 module:overlay(21) diff --git a/config/jp/arm9/overlays/ov026/relocs.txt b/config/jp/arm9/overlays/ov026/relocs.txt index 2403f26a..29cee2c9 100644 --- a/config/jp/arm9/overlays/ov026/relocs.txt +++ b/config/jp/arm9/overlays/ov026/relocs.txt @@ -5146,7 +5146,7 @@ from:0x0210b920 kind:load to:0x02138e80 module:overlay(26) from:0x0210b930 kind:arm_call to:0x0210dcfc module:overlay(26) from:0x0210b9b8 kind:load to:0x02138ec4 module:overlay(26) from:0x0210b9bc kind:load to:0x02141ba0 module:overlay(26) -from:0x0210b9c0 kind:load to:0x020b3168 module:overlay(0) +from:0x0210b9c0 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0210b9c4 kind:load to:0x02141c74 module:overlay(26) from:0x0210b9d0 kind:arm_call to:0x0210dd84 module:overlay(26) from:0x0210ba24 kind:load to:0x027e0cd8 module:dtcm @@ -5177,10 +5177,10 @@ from:0x0210bc94 kind:load to:0x02138e9c module:overlay(26) from:0x0210bc98 kind:load to:0x02138f14 module:overlay(26) from:0x0210bcb4 kind:arm_call to:0x0210dcfc module:overlay(26) from:0x0210bcf4 kind:load to:0x02138f30 module:overlay(26) -from:0x0210bcf8 kind:load to:0x020b3168 module:overlay(0) +from:0x0210bcf8 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0210bd04 kind:arm_call to:0x0210dcfc module:overlay(26) from:0x0210bd44 kind:load to:0x02138f30 module:overlay(26) -from:0x0210bd48 kind:load to:0x020b3168 module:overlay(0) +from:0x0210bd48 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0210bd54 kind:arm_call to:0x0210dd84 module:overlay(26) from:0x0210bde8 kind:load to:0x027e0cd8 module:dtcm from:0x0210bdf8 kind:arm_call to:0x0210dfa4 module:overlay(26) @@ -5359,13 +5359,13 @@ from:0x0210d110 kind:arm_call to:0x021103c4 module:overlay(26) from:0x0210d138 kind:arm_call to:0x0207d6d0 module:overlay(0) from:0x0210d148 kind:arm_call to:0x02080340 module:overlay(0) from:0x0210d168 kind:load to:0x02139244 module:overlay(26) -from:0x0210d16c kind:load to:0x020b3168 module:overlay(0) +from:0x0210d16c kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0210d170 kind:load to:0x02138cbc module:overlay(26) from:0x0210d17c kind:arm_call to:0x021103c4 module:overlay(26) from:0x0210d1a4 kind:arm_call to:0x0207d6d0 module:overlay(0) from:0x0210d1b4 kind:arm_call to:0x02080340 module:overlay(0) from:0x0210d1c8 kind:load to:0x02139244 module:overlay(26) -from:0x0210d1cc kind:load to:0x020b3168 module:overlay(0) +from:0x0210d1cc kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0210d1d0 kind:load to:0x02138cbc module:overlay(26) from:0x0210d2e0 kind:arm_call_thumb to:0x01ffa1a0 module:itcm from:0x0210d314 kind:arm_call to:0x0210d464 module:overlay(26) @@ -5661,7 +5661,7 @@ from:0x02110554 kind:load to:0x021394c0 module:overlay(26) from:0x0211056c kind:arm_call to:0x0210dcfc module:overlay(26) from:0x021105e4 kind:load to:0x021394dc module:overlay(26) from:0x021105e8 kind:load to:0x0214223c module:overlay(26) -from:0x021105ec kind:load to:0x020b3168 module:overlay(0) +from:0x021105ec kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x021105f0 kind:load to:0x02142310 module:overlay(26) from:0x021105fc kind:arm_call to:0x0210dd84 module:overlay(26) from:0x0211063c kind:load to:0x027e0cd8 module:dtcm @@ -5691,7 +5691,7 @@ from:0x02110838 kind:arm_call to:0x0207d6b8 module:overlay(0) from:0x02110848 kind:arm_call to:0x0210dcfc module:overlay(26) from:0x021108d0 kind:load to:0x02139564 module:overlay(26) from:0x021108d4 kind:load to:0x02142340 module:overlay(26) -from:0x021108d8 kind:load to:0x020b3168 module:overlay(0) +from:0x021108d8 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x021108dc kind:load to:0x02139548 module:overlay(26) from:0x021108e0 kind:load to:0x02142414 module:overlay(26) from:0x021108ec kind:arm_call to:0x0207d6b4 module:overlay(0) @@ -5874,7 +5874,7 @@ from:0x021120f8 kind:arm_call to:0x02099360 module:overlay(0) from:0x02112104 kind:arm_call to:0x02099dd4 module:overlay(0) from:0x02112110 kind:load to:0x021397cc add:0x8 module:overlay(26) from:0x02112114 kind:load to:0x02142680 module:overlay(26) -from:0x02112118 kind:load to:0x020b3168 module:overlay(0) +from:0x02112118 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02112128 kind:arm_call to:0x02112134 module:overlay(26) from:0x02112144 kind:arm_call to:0x02112f6c module:overlay(26) from:0x0211217c kind:load to:0x02139788 module:overlay(26) diff --git a/config/jp/arm9/overlays/ov027/relocs.txt b/config/jp/arm9/overlays/ov027/relocs.txt index 94a25b70..f9792ed9 100644 --- a/config/jp/arm9/overlays/ov027/relocs.txt +++ b/config/jp/arm9/overlays/ov027/relocs.txt @@ -440,7 +440,7 @@ from:0x021466e8 kind:arm_call to:0x02080340 module:overlay(0) from:0x021466fc kind:load to:0x0214ae64 module:overlay(27) from:0x02146700 kind:load to:0x0214ba3c module:overlay(27) from:0x02146704 kind:load to:0x0214a2a4 module:overlay(27) -from:0x02146708 kind:load to:0x020b3168 module:overlay(0) +from:0x02146708 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0214670c kind:load to:0x0214ae3c module:overlay(27) from:0x0214671c kind:arm_call to:0x0210dd84 module:overlay(26) from:0x0214673c kind:arm_call to:0x01fff6d0 module:itcm @@ -501,7 +501,7 @@ from:0x02146cac kind:arm_call to:0x02099360 module:overlay(0) from:0x02146cc4 kind:arm_call to:0x02099dd4 module:overlay(0) from:0x02146cd0 kind:load to:0x0214af24 add:0x8 module:overlay(27) from:0x02146cd4 kind:load to:0x0214bb24 module:overlay(27) -from:0x02146cd8 kind:load to:0x020b3168 module:overlay(0) +from:0x02146cd8 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02146cf8 kind:arm_call to:0x0209a208 module:overlay(0) from:0x02146d2c kind:arm_call to:0x02099c78 module:overlay(0) from:0x02146d64 kind:arm_call to:0x02146d74 module:overlay(27) diff --git a/config/jp/arm9/overlays/ov028/relocs.txt b/config/jp/arm9/overlays/ov028/relocs.txt index be72e648..48cb4015 100644 --- a/config/jp/arm9/overlays/ov028/relocs.txt +++ b/config/jp/arm9/overlays/ov028/relocs.txt @@ -654,7 +654,7 @@ from:0x021484b4 kind:load to:0x02149dcc module:overlay(28) from:0x021484cc kind:arm_call to:0x0210dcfc module:overlay(26) from:0x02148544 kind:load to:0x02149e10 module:overlay(28) from:0x02148548 kind:load to:0x0214aa10 module:overlay(28) -from:0x0214854c kind:load to:0x020b3168 module:overlay(0) +from:0x0214854c kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02148550 kind:load to:0x0214aae4 module:overlay(28) from:0x0214855c kind:arm_call to:0x0210dd84 module:overlay(26) from:0x021485d4 kind:load to:0x027e0cd8 module:dtcm @@ -724,7 +724,7 @@ from:0x02148b50 kind:load to:0x02149f74 module:overlay(28) from:0x02148b64 kind:arm_call to:0x0210dcfc module:overlay(26) from:0x02148bdc kind:load to:0x02149f90 module:overlay(28) from:0x02148be0 kind:load to:0x0214ac6c module:overlay(28) -from:0x02148be4 kind:load to:0x020b3168 module:overlay(0) +from:0x02148be4 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02148be8 kind:load to:0x0214ad40 module:overlay(28) from:0x02148bf4 kind:arm_call to:0x0210dd84 module:overlay(26) from:0x02148c34 kind:load to:0x027e0cd8 module:dtcm diff --git a/config/jp/arm9/overlays/ov029/relocs.txt b/config/jp/arm9/overlays/ov029/relocs.txt index b6dd1bc0..679e10e7 100644 --- a/config/jp/arm9/overlays/ov029/relocs.txt +++ b/config/jp/arm9/overlays/ov029/relocs.txt @@ -681,11 +681,11 @@ from:0x02148670 kind:load to:0x02154324 module:overlay(29) from:0x0214868c kind:arm_call to:0x0210dcfc module:overlay(26) from:0x02148728 kind:load to:0x02154340 module:overlay(29) from:0x0214872c kind:load to:0x021556f4 module:overlay(29) -from:0x02148730 kind:load to:0x020b3168 module:overlay(0) +from:0x02148730 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0214873c kind:arm_call to:0x0210dcfc module:overlay(26) from:0x021487d8 kind:load to:0x02154340 module:overlay(29) from:0x021487dc kind:load to:0x021556f4 module:overlay(29) -from:0x021487e0 kind:load to:0x020b3168 module:overlay(0) +from:0x021487e0 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x021487ec kind:arm_call to:0x0210dd84 module:overlay(26) from:0x021488d8 kind:arm_call to:0x02148a90 module:overlay(29) from:0x021488e8 kind:load to:0x0204b164 module:main diff --git a/config/jp/arm9/overlays/ov031/relocs.txt b/config/jp/arm9/overlays/ov031/relocs.txt index 0e05471f..4115ab02 100644 --- a/config/jp/arm9/overlays/ov031/relocs.txt +++ b/config/jp/arm9/overlays/ov031/relocs.txt @@ -792,7 +792,7 @@ from:0x020e201c kind:thumb_call_arm to:0x02011f3c module:main from:0x020e2024 kind:thumb_call to:0x021824dc module:overlay(95) from:0x020e202c kind:thumb_call to:0x020e213c module:overlay(31) from:0x020e2034 kind:load to:0x0211497c module:overlay(31) -from:0x020e2038 kind:load to:0x020b3168 module:overlay(0) +from:0x020e2038 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x020e203c kind:load to:0x020453b0 module:main from:0x020e2054 kind:thumb_call to:0x0217be68 module:overlay(95) from:0x020e2062 kind:thumb_call_arm to:0x0203e740 module:main @@ -1282,7 +1282,7 @@ from:0x020e60ec kind:arm_call to:0x0203e690 module:main from:0x020e6110 kind:arm_call to:0x020da790 module:overlay(31) from:0x020e612c kind:load to:0x02114d14 add:0x8 module:overlay(31) from:0x020e6130 kind:load to:0x027e0ce0 module:dtcm -from:0x020e6134 kind:load to:0x020b3168 module:overlay(0) +from:0x020e6134 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x020e6138 kind:load to:0x02114ca4 module:overlay(31) from:0x020e613c kind:load to:0x02114cdc module:overlay(31) from:0x020e6140 kind:load to:0x020a1aac module:overlay(0) @@ -1731,7 +1731,7 @@ from:0x020ea2d4 kind:arm_call to:0x02099b30 module:overlay(0) from:0x020ea340 kind:arm_call to:0x02080340 module:overlay(0) from:0x020ea35c kind:load to:0x021151ac add:0x8 module:overlay(31) from:0x020ea360 kind:load to:0x02118380 module:overlay(31) -from:0x020ea364 kind:load to:0x020b3168 module:overlay(0) +from:0x020ea364 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x020ea388 kind:arm_call to:0x020ea434 module:overlay(31) from:0x020ea394 kind:load to:0x02118458 module:overlay(31) from:0x020ea3ec kind:arm_call to:0x0208d1a0 module:overlay(0) @@ -2753,7 +2753,7 @@ from:0x020f2f34 kind:arm_call to:0x020f51b0 module:overlay(31) from:0x020f2f60 kind:arm_call to:0x020da790 module:overlay(31) from:0x020f2fb8 kind:arm_call to:0x020f4190 module:overlay(31) from:0x020f2fe8 kind:load to:0x021160e0 add:0x8 module:overlay(31) -from:0x020f2fec kind:load to:0x020b3168 module:overlay(0) +from:0x020f2fec kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x020f2ff0 kind:load to:0x021128cc module:overlay(31) from:0x020f2ff4 kind:load to:0x02112878 module:overlay(31) from:0x020f2ffc kind:load to:0x020453b0 module:main @@ -3059,7 +3059,7 @@ from:0x020f5ba8 kind:arm_call to:0x02099a50 module:overlay(0) from:0x020f5bd4 kind:load to:0x021161d8 add:0x8 module:overlay(31) from:0x020f5bd8 kind:load to:0x027e0ce0 module:dtcm from:0x020f5bdc kind:load to:0x021128e0 module:overlay(31) -from:0x020f5be0 kind:load to:0x020b3168 module:overlay(0) +from:0x020f5be0 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x020f5be4 kind:load to:0x021161c4 module:overlay(31) from:0x020f5bf8 kind:arm_call to:0x020f6234 module:overlay(31) from:0x020f5c14 kind:arm_call to:0x020f761c module:overlay(31) @@ -3266,7 +3266,7 @@ from:0x020f83f8 kind:arm_call to:0x01ffa06c module:itcm from:0x020f8404 kind:arm_call to:0x02099dd4 module:overlay(0) from:0x020f8410 kind:load to:0x02116374 add:0x8 module:overlay(31) from:0x020f8414 kind:load to:0x0211891c module:overlay(31) -from:0x020f8418 kind:load to:0x020b3168 module:overlay(0) +from:0x020f8418 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x020f8480 kind:arm_call_thumb to:0x01ffa1a0 module:itcm from:0x020f84a0 kind:arm_call to:0x020611a8 module:overlay(0) from:0x020f84bc kind:arm_call to:0x020611a8 module:overlay(0) @@ -3500,7 +3500,7 @@ from:0x020fa030 kind:arm_call to:0x0203e690 module:main from:0x020fa068 kind:arm_call_thumb to:0x020d800c module:overlay(24) from:0x020fa098 kind:load to:0x021168b8 add:0x8 module:overlay(31) from:0x020fa09c kind:load to:0x02118b34 module:overlay(31) -from:0x020fa0a0 kind:load to:0x020b3168 module:overlay(0) +from:0x020fa0a0 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x020fa0a4 kind:load to:0x021167b4 module:overlay(31) from:0x020fa0a8 kind:load to:0x021167d0 module:overlay(31) from:0x020fa0ac kind:load to:0x027e0130 module:dtcm @@ -3982,7 +3982,7 @@ from:0x020febc8 kind:arm_call to:0x020fd88c module:overlay(31) from:0x020fec6c kind:load to:0x02116e4c module:overlay(31) from:0x020fec70 kind:load to:0x02116ee4 module:overlay(31) from:0x020fec74 kind:load to:0x0211902c module:overlay(31) -from:0x020fec78 kind:load to:0x020b3168 module:overlay(0) +from:0x020fec78 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x020fec90 kind:arm_call to:0x020fd958 module:overlay(31) from:0x020fecb8 kind:arm_call to:0x01fff1a4 module:itcm from:0x020fecc8 kind:load to:0x027e0ce0 module:dtcm @@ -4170,7 +4170,7 @@ from:0x02100268 kind:arm_call to:0x020fd88c module:overlay(31) from:0x02100304 kind:load to:0x02116f20 module:overlay(31) from:0x02100308 kind:load to:0x02116fb8 module:overlay(31) from:0x0210030c kind:load to:0x02119110 module:overlay(31) -from:0x02100310 kind:load to:0x020b3168 module:overlay(0) +from:0x02100310 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02100324 kind:arm_call to:0x020fd958 module:overlay(31) from:0x02100338 kind:arm_call to:0x020fda9c module:overlay(31) from:0x02100350 kind:load to:0x020fe5c0 module:overlay(31) @@ -4293,14 +4293,14 @@ from:0x0210131c kind:arm_call to:0x0207d6d0 module:overlay(0) from:0x0210134c kind:arm_call to:0x0209ea88 module:overlay(0) from:0x02101358 kind:load to:0x021170d0 module:overlay(31) from:0x0210135c kind:load to:0x02117168 module:overlay(31) -from:0x02101360 kind:load to:0x020b3168 module:overlay(0) +from:0x02101360 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02101364 kind:load to:0x02115cb8 module:overlay(31) from:0x02101370 kind:arm_call to:0x020fd88c module:overlay(31) from:0x021013a4 kind:arm_call to:0x0207d6d0 module:overlay(0) from:0x021013d4 kind:arm_call to:0x0209ea88 module:overlay(0) from:0x021013e0 kind:load to:0x021170d0 module:overlay(31) from:0x021013e4 kind:load to:0x02117168 module:overlay(31) -from:0x021013e8 kind:load to:0x020b3168 module:overlay(0) +from:0x021013e8 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x021013ec kind:load to:0x02115cb8 module:overlay(31) from:0x02101400 kind:load to:0x02112998 module:overlay(31) from:0x02101420 kind:arm_call to:0x020fd958 module:overlay(31) @@ -4406,7 +4406,7 @@ from:0x02102290 kind:load to:0x02117278 module:overlay(31) from:0x021022a0 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x021022c8 kind:arm_call to:0x0207d6d0 module:overlay(0) from:0x02102334 kind:load to:0x02117294 module:overlay(31) -from:0x02102338 kind:load to:0x020b3168 module:overlay(0) +from:0x02102338 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0210233c kind:load to:0x02115cb8 module:overlay(31) from:0x02102340 kind:load to:0x021193c8 module:overlay(31) from:0x02102370 kind:arm_call to:0x01ffb6e4 module:itcm @@ -4453,7 +4453,7 @@ from:0x021028cc kind:arm_call to:0x0207d6d0 module:overlay(0) from:0x021028dc kind:arm_call to:0x0207d6d0 module:overlay(0) from:0x021028e8 kind:arm_call to:0x02080340 module:overlay(0) from:0x021028f8 kind:load to:0x02117358 module:overlay(31) -from:0x021028fc kind:load to:0x020b3168 module:overlay(0) +from:0x021028fc kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02102900 kind:load to:0x02115cb8 module:overlay(31) from:0x0210294c kind:arm_call to:0x01ffedf4 module:itcm from:0x02102970 kind:arm_call_thumb to:0x01ffa1a0 module:itcm @@ -5007,7 +5007,7 @@ from:0x021072f4 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x0210736c kind:arm_call to:0x020da790 module:overlay(31) from:0x02107390 kind:load to:0x02117938 module:overlay(31) from:0x02107394 kind:load to:0x02119de0 module:overlay(31) -from:0x02107398 kind:load to:0x020b3168 module:overlay(0) +from:0x02107398 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0210739c kind:load to:0x021178e8 module:overlay(31) from:0x021073a0 kind:load to:0x02119eb4 module:overlay(31) from:0x0210740c kind:arm_call to:0x02082114 module:overlay(0) @@ -5077,7 +5077,7 @@ from:0x02107e94 kind:arm_call to:0x020da790 module:overlay(31) from:0x02107e9c kind:arm_call to:0x0207d6d0 module:overlay(0) from:0x02107ed4 kind:load to:0x02117a10 module:overlay(31) from:0x02107ed8 kind:load to:0x02119fcc module:overlay(31) -from:0x02107edc kind:load to:0x020b3168 module:overlay(0) +from:0x02107edc kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02107ee0 kind:load to:0x020e31c8 module:overlay(31) from:0x02107ee4 kind:load to:0x020e4d98 module:overlay(31) from:0x02107ee8 kind:load to:0x02115cb8 module:overlay(31) @@ -5182,7 +5182,7 @@ from:0x02108cf0 kind:load to:0x02117af8 module:overlay(31) from:0x02108d00 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x02108d30 kind:arm_call to:0x0207d6d0 module:overlay(0) from:0x02108d44 kind:load to:0x02117b20 module:overlay(31) -from:0x02108d48 kind:load to:0x020b3168 module:overlay(0) +from:0x02108d48 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02108d4c kind:load to:0x02115cb8 module:overlay(31) from:0x02108d68 kind:arm_call to:0x01ffb6e4 module:itcm from:0x02108d9c kind:arm_call to:0x0209e49c module:overlay(0) @@ -5225,7 +5225,7 @@ from:0x02109330 kind:load to:0x02117b60 module:overlay(31) from:0x02109340 kind:arm_call to:0x0209f3d4 module:overlay(0) from:0x021093f8 kind:load to:0x02117b7c module:overlay(31) from:0x021093fc kind:load to:0x0211a18c module:overlay(31) -from:0x02109400 kind:load to:0x020b3168 module:overlay(0) +from:0x02109400 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0210945c kind:arm_call to:0x0210a394 module:overlay(31) from:0x02109470 kind:arm_call to:0x0210a3f0 module:overlay(31) from:0x021094bc kind:arm_call to:0x01ffedf4 module:itcm @@ -5467,13 +5467,13 @@ from:0x0210b820 kind:load to:0x02117cb0 module:overlay(31) from:0x0210b838 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x0210b874 kind:arm_call to:0x020611a8 module:overlay(0) from:0x0210b884 kind:load to:0x02117ccc module:overlay(31) -from:0x0210b888 kind:load to:0x020b3168 module:overlay(0) +from:0x0210b888 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0210b88c kind:load to:0x0211a554 module:overlay(31) from:0x0210b890 kind:load to:0x0211a474 module:overlay(31) from:0x0210b8a0 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x0210b8dc kind:arm_call to:0x020611a8 module:overlay(0) from:0x0210b8ec kind:load to:0x02117ccc module:overlay(31) -from:0x0210b8f0 kind:load to:0x020b3168 module:overlay(0) +from:0x0210b8f0 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0210b8f4 kind:load to:0x0211a554 module:overlay(31) from:0x0210b8f8 kind:load to:0x0211a474 module:overlay(31) from:0x0210b948 kind:arm_call to:0x0209ee2c module:overlay(0) @@ -5513,11 +5513,11 @@ from:0x0210bd64 kind:load to:0x02117d1c module:overlay(31) from:0x0210bd78 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x0210bd90 kind:arm_call_thumb to:0x020590f0 module:overlay(0) from:0x0210bdfc kind:load to:0x02117d38 module:overlay(31) -from:0x0210be00 kind:load to:0x020b3168 module:overlay(0) +from:0x0210be00 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0210be0c kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x0210be24 kind:arm_call_thumb to:0x020590f0 module:overlay(0) from:0x0210be90 kind:load to:0x02117d38 module:overlay(31) -from:0x0210be94 kind:load to:0x020b3168 module:overlay(0) +from:0x0210be94 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0210bf08 kind:arm_call to:0x02098c90 module:overlay(0) from:0x0210bf40 kind:arm_call to:0x01ff9638 module:itcm from:0x0210bf50 kind:arm_call to:0x01ffb6e4 module:itcm diff --git a/config/jp/arm9/overlays/ov032/relocs.txt b/config/jp/arm9/overlays/ov032/relocs.txt index 436c1909..67573858 100644 --- a/config/jp/arm9/overlays/ov032/relocs.txt +++ b/config/jp/arm9/overlays/ov032/relocs.txt @@ -791,7 +791,7 @@ from:0x02121c88 kind:arm_call to:0x01ffa06c module:itcm from:0x02121c9c kind:load to:0x021246c0 add:0x8 module:overlay(32) from:0x02121ca0 kind:load to:0x020b7544 module:overlay(0) from:0x02121ca8 kind:load to:0x02123ebc module:overlay(32) -from:0x02121cac kind:load to:0x020b3168 module:overlay(0) +from:0x02121cac kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02121cb0 kind:load to:0x02124688 module:overlay(32) from:0x02121cbc kind:arm_call to:0x0207cd78 module:overlay(0) from:0x02121cd0 kind:arm_call to:0x0207d6b4 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov033/relocs.txt b/config/jp/arm9/overlays/ov033/relocs.txt index 25be5103..3e4731e1 100644 --- a/config/jp/arm9/overlays/ov033/relocs.txt +++ b/config/jp/arm9/overlays/ov033/relocs.txt @@ -124,7 +124,7 @@ from:0x0211be5c kind:arm_call to:0x020611a8 module:overlay(0) from:0x0211be6c kind:load to:0x02123594 module:overlay(33) from:0x0211be70 kind:load to:0x021235dc add:0x8 module:overlay(33) from:0x0211be74 kind:load to:0x02123aac module:overlay(33) -from:0x0211be78 kind:load to:0x020b3168 module:overlay(0) +from:0x0211be78 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0211be7c kind:load to:0x0204b608 module:main from:0x0211be80 kind:load to:0x02123a94 module:overlay(33) from:0x0211be90 kind:arm_call_thumb to:0x02059454 module:overlay(0) @@ -310,7 +310,7 @@ from:0x0211d634 kind:arm_call to:0x0200f05c module:main from:0x0211d694 kind:load to:0x02123648 module:overlay(33) from:0x0211d698 kind:load to:0x02124430 module:overlay(33) from:0x0211d69c kind:load to:0x02122da8 module:overlay(33) -from:0x0211d6a0 kind:load to:0x020b3168 module:overlay(0) +from:0x0211d6a0 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0211d6a4 kind:load to:0x02124504 module:overlay(33) from:0x0211d700 kind:arm_call to:0x0211da9c module:overlay(33) from:0x0211d730 kind:arm_call to:0x0211da9c module:overlay(33) diff --git a/config/jp/arm9/overlays/ov034/relocs.txt b/config/jp/arm9/overlays/ov034/relocs.txt index 58d08d67..94a4700f 100644 --- a/config/jp/arm9/overlays/ov034/relocs.txt +++ b/config/jp/arm9/overlays/ov034/relocs.txt @@ -589,7 +589,7 @@ from:0x02120270 kind:arm_call to:0x0202a1c0 module:main from:0x02120284 kind:arm_call to:0x0202a1c0 module:main from:0x02120298 kind:arm_call to:0x0202a1c0 module:main from:0x021202c0 kind:load to:0x02124a2c add:0x8 module:overlay(34) -from:0x021202c4 kind:load to:0x020b3168 module:overlay(0) +from:0x021202c4 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x021202c8 kind:load to:0x02124fc0 module:overlay(34) from:0x021202fc kind:arm_call_thumb to:0x02059454 module:overlay(0) from:0x02120308 kind:arm_call_thumb to:0x02059454 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov038/relocs.txt b/config/jp/arm9/overlays/ov038/relocs.txt index c455114f..0389ffb0 100644 --- a/config/jp/arm9/overlays/ov038/relocs.txt +++ b/config/jp/arm9/overlays/ov038/relocs.txt @@ -523,7 +523,7 @@ from:0x02120298 kind:load to:0x02122f10 module:overlay(38) from:0x0212029c kind:load to:0x02122ef4 module:overlay(38) from:0x021202b4 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x021202e0 kind:load to:0x02122f38 module:overlay(38) -from:0x021202e4 kind:load to:0x020b3168 module:overlay(0) +from:0x021202e4 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02120328 kind:arm_call to:0x0200f05c module:main from:0x02120370 kind:arm_call to:0x0200f05c module:main from:0x021203dc kind:arm_call to:0x0200f05c module:main diff --git a/config/jp/arm9/overlays/ov040/relocs.txt b/config/jp/arm9/overlays/ov040/relocs.txt index 5baa53f2..bfed112b 100644 --- a/config/jp/arm9/overlays/ov040/relocs.txt +++ b/config/jp/arm9/overlays/ov040/relocs.txt @@ -1077,7 +1077,7 @@ from:0x0212f1c4 kind:arm_call to:0x0209e310 module:overlay(0) from:0x0212f1f0 kind:load to:0x02130d50 module:overlay(40) from:0x0212f200 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x0212f22c kind:load to:0x02130d78 module:overlay(40) -from:0x0212f230 kind:load to:0x020b3168 module:overlay(0) +from:0x0212f230 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0212f250 kind:arm_call to:0x0209ea60 module:overlay(0) from:0x0212f26c kind:arm_call to:0x0209e49c module:overlay(0) from:0x0212f2cc kind:arm_call to:0x0209e49c module:overlay(0) diff --git a/config/jp/arm9/overlays/ov043/relocs.txt b/config/jp/arm9/overlays/ov043/relocs.txt index b95a3774..9050f40d 100644 --- a/config/jp/arm9/overlays/ov043/relocs.txt +++ b/config/jp/arm9/overlays/ov043/relocs.txt @@ -17,7 +17,7 @@ from:0x021254d4 kind:load to:0x0212ec70 add:0x8 module:overlay(43) from:0x021254d8 kind:load to:0x0212f998 module:overlay(43) from:0x021254dc kind:load to:0x0212e7f8 module:overlay(43) from:0x021254e0 kind:load to:0x0212e808 module:overlay(43) -from:0x021254e4 kind:load to:0x020b3168 module:overlay(0) +from:0x021254e4 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x021254e8 kind:load to:0x0212ec2c module:overlay(43) from:0x021254f0 kind:load to:0x027e07d4 module:dtcm from:0x021254fc kind:arm_call_thumb to:0x0209ba14 module:overlay(0) @@ -632,7 +632,7 @@ from:0x0212ab14 kind:load to:0x0212fc40 module:overlay(43) from:0x0212ab18 kind:load to:0x0212f378 module:overlay(43) from:0x0212ab1c kind:load to:0x020b3298 module:overlay(0) from:0x0212ab20 kind:load to:0x020b3248 module:overlay(0) -from:0x0212ab24 kind:load to:0x020b3168 module:overlay(0) +from:0x0212ab24 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0212ab2c kind:load to:0x027e07d4 module:dtcm from:0x0212ab30 kind:load to:0x0212f348 module:overlay(43) from:0x0212ab34 kind:load to:0x0212fbc0 module:overlay(43) diff --git a/config/jp/arm9/overlays/ov044/relocs.txt b/config/jp/arm9/overlays/ov044/relocs.txt index add1af18..dfda7d5e 100644 --- a/config/jp/arm9/overlays/ov044/relocs.txt +++ b/config/jp/arm9/overlays/ov044/relocs.txt @@ -22,7 +22,7 @@ from:0x0212550c kind:arm_call to:0x02058d24 module:overlay(0) from:0x02125518 kind:arm_call to:0x02059218 module:overlay(0) from:0x0212552c kind:arm_call to:0x02059498 module:overlay(0) from:0x02125550 kind:load to:0x0212ebc8 module:overlay(44) -from:0x02125554 kind:load to:0x020b3168 module:overlay(0) +from:0x02125554 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02125558 kind:load to:0x020a1aac module:overlay(0) from:0x0212555c kind:load to:0x02125570 module:overlay(44) from:0x02125560 kind:load to:0x027e0ce0 module:dtcm @@ -66,7 +66,7 @@ from:0x021258f4 kind:arm_call to:0x0205e064 module:overlay(0) from:0x02125904 kind:load to:0x0212ebe8 module:overlay(44) from:0x02125908 kind:load to:0x027e0ce0 module:dtcm from:0x0212590c kind:load to:0x0212e85c module:overlay(44) -from:0x02125910 kind:load to:0x020b3168 module:overlay(0) +from:0x02125910 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02125914 kind:load to:0x0212ebd4 module:overlay(44) from:0x0212592c kind:arm_call to:0x0200eab0 module:main from:0x02125940 kind:arm_call to:0x0208ddfc module:overlay(0) @@ -445,7 +445,7 @@ from:0x02128ad0 kind:arm_call to:0x0205a544 module:overlay(0) from:0x02128af0 kind:arm_call to:0x01ffc6d4 module:itcm from:0x02128b10 kind:arm_call to:0x020c0df0 module:overlay(17) from:0x02128b18 kind:arm_call to:0x0212db3c module:overlay(44) -from:0x02128b24 kind:load to:0x020b3168 module:overlay(0) +from:0x02128b24 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02128b28 kind:load to:0x0212f4e0 module:overlay(44) from:0x02128b2c kind:load to:0x0212e888 module:overlay(44) from:0x02128b30 kind:load to:0x0203feb0 module:main diff --git a/config/jp/arm9/overlays/ov046/relocs.txt b/config/jp/arm9/overlays/ov046/relocs.txt index 1b2706bd..c8cba406 100644 --- a/config/jp/arm9/overlays/ov046/relocs.txt +++ b/config/jp/arm9/overlays/ov046/relocs.txt @@ -442,7 +442,7 @@ from:0x02129770 kind:arm_call to:0x0212a540 module:overlay(46) from:0x021297dc kind:arm_call to:0x01ffa06c module:itcm from:0x02129800 kind:load to:0x0212c3a8 add:0x8 module:overlay(46) from:0x02129804 kind:load to:0x0212c7e8 module:overlay(46) -from:0x02129808 kind:load to:0x020b3168 module:overlay(0) +from:0x02129808 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0212980c kind:load to:0x0212c7ec module:overlay(46) from:0x02129818 kind:arm_call to:0x0207cd78 module:overlay(0) from:0x0212982c kind:arm_call to:0x0207d6b4 module:overlay(0) @@ -574,7 +574,7 @@ from:0x0212a7bc kind:arm_call to:0x0212b27c module:overlay(46) from:0x0212a7c8 kind:arm_call to:0x0212b348 module:overlay(46) from:0x0212a824 kind:arm_call to:0x01ffa06c module:itcm from:0x0212a848 kind:load to:0x0212c4b0 add:0x8 module:overlay(46) -from:0x0212a84c kind:load to:0x020b3168 module:overlay(0) +from:0x0212a84c kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0212a850 kind:load to:0x0212c8d4 module:overlay(46) from:0x0212a854 kind:load to:0x0212c8c0 module:overlay(46) from:0x0212a860 kind:arm_call to:0x0207cd78 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov049/relocs.txt b/config/jp/arm9/overlays/ov049/relocs.txt index 18475148..84475010 100644 --- a/config/jp/arm9/overlays/ov049/relocs.txt +++ b/config/jp/arm9/overlays/ov049/relocs.txt @@ -120,7 +120,7 @@ from:0x02132fb4 kind:arm_call to:0x02099360 module:overlay(0) from:0x02132ff0 kind:arm_call to:0x02099dd4 module:overlay(0) from:0x02132ffc kind:load to:0x02138eac add:0x8 module:overlay(49) from:0x02133000 kind:load to:0x02139b38 module:overlay(49) -from:0x02133004 kind:load to:0x020b3168 module:overlay(0) +from:0x02133004 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0213301c kind:arm_call to:0x02133204 module:overlay(49) from:0x02133038 kind:arm_call to:0x021330dc module:overlay(49) from:0x02133068 kind:arm_call to:0x02098dac module:overlay(0) diff --git a/config/jp/arm9/overlays/ov050/relocs.txt b/config/jp/arm9/overlays/ov050/relocs.txt index 3b758aa9..87a8b7a1 100644 --- a/config/jp/arm9/overlays/ov050/relocs.txt +++ b/config/jp/arm9/overlays/ov050/relocs.txt @@ -599,7 +599,7 @@ from:0x02136e70 kind:arm_call to:0x02080320 module:overlay(0) from:0x02136ecc kind:arm_call to:0x01ffa06c module:itcm from:0x02136ee0 kind:load to:0x02138b54 add:0x8 module:overlay(50) from:0x02136ee4 kind:load to:0x02138e98 module:overlay(50) -from:0x02136ee8 kind:load to:0x020b3168 module:overlay(0) +from:0x02136ee8 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02136eec kind:load to:0x02138b34 module:overlay(50) from:0x02136ef0 kind:load to:0x02138aac module:overlay(50) from:0x02136efc kind:arm_call to:0x0207cd78 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov057/relocs.txt b/config/jp/arm9/overlays/ov057/relocs.txt index 6308f4e0..5c61a0dd 100644 --- a/config/jp/arm9/overlays/ov057/relocs.txt +++ b/config/jp/arm9/overlays/ov057/relocs.txt @@ -12,7 +12,7 @@ from:0x0213a104 kind:arm_call to:0x02080340 module:overlay(0) from:0x0213a10c kind:arm_call to:0x0207d6d0 module:overlay(0) from:0x0213a154 kind:load to:0x0213d874 add:0x8 module:overlay(57) from:0x0213a158 kind:load to:0x0213dd3c module:overlay(57) -from:0x0213a15c kind:load to:0x020b3168 module:overlay(0) +from:0x0213a15c kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0213a160 kind:load to:0x020b4000 module:overlay(0) from:0x0213a164 kind:load to:0x0213a174 module:overlay(57) from:0x0213a168 kind:load to:0x0213b7b0 module:overlay(57) diff --git a/config/jp/arm9/overlays/ov058/relocs.txt b/config/jp/arm9/overlays/ov058/relocs.txt index d8be7222..dca5e5a1 100644 --- a/config/jp/arm9/overlays/ov058/relocs.txt +++ b/config/jp/arm9/overlays/ov058/relocs.txt @@ -1670,7 +1670,7 @@ from:0x0214fd78 kind:load to:0x02157550 module:overlay(58) from:0x0214fd84 kind:load to:0x021591fc module:overlay(58) from:0x0214fd94 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x0214fdd0 kind:load to:0x021575a0 module:overlay(58) -from:0x0214fdd4 kind:load to:0x020b3168 module:overlay(0) +from:0x0214fdd4 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0214fe84 kind:arm_call to:0x0209e49c module:overlay(0) from:0x0214febc kind:arm_call to:0x0200f05c module:main from:0x0214ff54 kind:arm_call to:0x02150024 module:overlay(58) @@ -1714,12 +1714,12 @@ from:0x0215030c kind:load to:0x021575fc module:overlay(58) from:0x02150320 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x021503a0 kind:load to:0x02157618 module:overlay(58) from:0x021503a4 kind:load to:0x021592c4 module:overlay(58) -from:0x021503a8 kind:load to:0x020b3168 module:overlay(0) +from:0x021503a8 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x021503ac kind:load to:0x02159398 module:overlay(58) from:0x021503b8 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x02150438 kind:load to:0x02157618 module:overlay(58) from:0x0215043c kind:load to:0x021592c4 module:overlay(58) -from:0x02150440 kind:load to:0x020b3168 module:overlay(0) +from:0x02150440 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02150444 kind:load to:0x02159398 module:overlay(58) from:0x02150454 kind:arm_call to:0x021504e0 module:overlay(58) from:0x02150494 kind:arm_call to:0x021504e0 module:overlay(58) @@ -1908,7 +1908,7 @@ from:0x02151cf4 kind:arm_call to:0x0207d6d0 module:overlay(0) from:0x02151d04 kind:arm_call to:0x0207d6d0 module:overlay(0) from:0x02151d10 kind:arm_call to:0x02080340 module:overlay(0) from:0x02151d1c kind:load to:0x02157900 module:overlay(58) -from:0x02151d20 kind:load to:0x020b3168 module:overlay(0) +from:0x02151d20 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02151d24 kind:load to:0x02159744 module:overlay(58) from:0x02151d28 kind:load to:0x02155130 module:overlay(58) from:0x02151d2c kind:load to:0x02157710 module:overlay(58) diff --git a/config/jp/arm9/overlays/ov059/relocs.txt b/config/jp/arm9/overlays/ov059/relocs.txt index df2563d9..0009856f 100644 --- a/config/jp/arm9/overlays/ov059/relocs.txt +++ b/config/jp/arm9/overlays/ov059/relocs.txt @@ -1078,7 +1078,7 @@ from:0x021633f8 kind:load to:0x02164bc8 module:overlay(59) from:0x021633fc kind:load to:0x02163424 module:overlay(59) from:0x02163400 kind:load to:0x02163408 module:overlay(59) from:0x02163404 kind:load to:0x02164bd8 module:overlay(59) -from:0x02163420 kind:load to:0x020b3168 module:overlay(0) +from:0x02163420 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0216342c kind:arm_call_thumb to:0x02059454 module:overlay(0) from:0x021634a0 kind:arm_call to:0x01ffb6e4 module:itcm from:0x021634c0 kind:arm_call to:0x01ffb6e4 module:itcm diff --git a/config/jp/arm9/overlays/ov060/relocs.txt b/config/jp/arm9/overlays/ov060/relocs.txt index 80d87ad8..fe9ac1fd 100644 --- a/config/jp/arm9/overlays/ov060/relocs.txt +++ b/config/jp/arm9/overlays/ov060/relocs.txt @@ -994,7 +994,7 @@ from:0x02162340 kind:load to:0x02164b64 module:overlay(60) from:0x02162344 kind:load to:0x02164b48 module:overlay(60) from:0x02162358 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x0216239c kind:load to:0x02164b8c module:overlay(60) -from:0x021623a0 kind:load to:0x020b3168 module:overlay(0) +from:0x021623a0 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x021623d0 kind:arm_call to:0x01ffedf4 module:itcm from:0x021623ec kind:load to:0x027e0cd8 module:dtcm from:0x021623f0 kind:load to:0x02165e20 module:overlay(60) diff --git a/config/jp/arm9/overlays/ov062/relocs.txt b/config/jp/arm9/overlays/ov062/relocs.txt index b578c6ac..1d5e65ca 100644 --- a/config/jp/arm9/overlays/ov062/relocs.txt +++ b/config/jp/arm9/overlays/ov062/relocs.txt @@ -637,7 +637,7 @@ from:0x0215db60 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x0215db88 kind:arm_call to:0x02080340 module:overlay(0) from:0x0215db90 kind:arm_call to:0x0207d6d0 module:overlay(0) from:0x0215dba4 kind:load to:0x02162490 module:overlay(62) -from:0x0215dba8 kind:load to:0x020b3168 module:overlay(0) +from:0x0215dba8 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0215dbac kind:load to:0x0216226c module:overlay(62) from:0x0215dbc0 kind:arm_call to:0x0209ea60 module:overlay(0) from:0x0215dbe4 kind:arm_call to:0x0200f05c module:main diff --git a/config/jp/arm9/overlays/ov063/relocs.txt b/config/jp/arm9/overlays/ov063/relocs.txt index deeb07b0..9989d57c 100644 --- a/config/jp/arm9/overlays/ov063/relocs.txt +++ b/config/jp/arm9/overlays/ov063/relocs.txt @@ -1006,7 +1006,7 @@ from:0x021613d0 kind:load to:0x02165664 module:overlay(63) from:0x021613e4 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x02161494 kind:load to:0x021656a8 module:overlay(63) from:0x02161498 kind:load to:0x02166230 module:overlay(63) -from:0x0216149c kind:load to:0x020b3168 module:overlay(0) +from:0x0216149c kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x021614a0 kind:load to:0x02166304 module:overlay(63) from:0x021614c4 kind:arm_call to:0x02161a14 module:overlay(63) from:0x02161500 kind:arm_call to:0x01ffb428 module:itcm diff --git a/config/jp/arm9/overlays/ov068/relocs.txt b/config/jp/arm9/overlays/ov068/relocs.txt index 922526eb..a7efcfc3 100644 --- a/config/jp/arm9/overlays/ov068/relocs.txt +++ b/config/jp/arm9/overlays/ov068/relocs.txt @@ -1118,7 +1118,7 @@ from:0x02162e04 kind:arm_call to:0x0207d6d0 module:overlay(0) from:0x02162e14 kind:arm_call to:0x021685c4 module:overlay(89) from:0x02162e3c kind:load to:0x0216591c module:overlay(68) from:0x02162e40 kind:load to:0x0216691c module:overlay(68) -from:0x02162e44 kind:load to:0x020b3168 module:overlay(0) +from:0x02162e44 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02162e48 kind:load to:0x021656c4 module:overlay(68) from:0x02162eb4 kind:arm_call to:0x01ffcfcc module:itcm from:0x02162efc kind:arm_call to:0x0209ea60 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov070/relocs.txt b/config/jp/arm9/overlays/ov070/relocs.txt index cf945450..47f6cd1f 100644 --- a/config/jp/arm9/overlays/ov070/relocs.txt +++ b/config/jp/arm9/overlays/ov070/relocs.txt @@ -130,7 +130,7 @@ from:0x02141f94 kind:arm_call to:0x0207d6d0 module:overlay(0) from:0x02141fa4 kind:arm_call to:0x02141e70 module:overlay(70) from:0x02141fb0 kind:load to:0x02150a34 add:0x8 module:overlay(70) from:0x02141fb4 kind:load to:0x02151928 module:overlay(70) -from:0x02141fb8 kind:load to:0x020b3168 module:overlay(0) +from:0x02141fb8 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02141fbc kind:load to:0x02150a14 module:overlay(70) from:0x02141fcc kind:arm_call to:0x0209a208 module:overlay(0) from:0x0214200c kind:arm_call to:0x02098c90 module:overlay(0) @@ -618,7 +618,7 @@ from:0x02145dc4 kind:arm_call to:0x0209e310 module:overlay(0) from:0x02145df0 kind:load to:0x02150e7c module:overlay(70) from:0x02145e00 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x02145e2c kind:load to:0x02150ea4 module:overlay(70) -from:0x02145e30 kind:load to:0x020b3168 module:overlay(0) +from:0x02145e30 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02145e54 kind:arm_call to:0x0209e49c module:overlay(0) from:0x02145ed8 kind:arm_call to:0x01ffedf4 module:itcm from:0x02145eec kind:load to:0x0214fd3c module:overlay(70) @@ -874,7 +874,7 @@ from:0x021480dc kind:arm_call to:0x0207d6d0 module:overlay(0) from:0x021480f0 kind:arm_call to:0x02147fb8 module:overlay(70) from:0x02148118 kind:load to:0x02151170 module:overlay(70) from:0x02148120 kind:load to:0x021522b0 module:overlay(70) -from:0x02148124 kind:load to:0x020b3168 module:overlay(0) +from:0x02148124 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02148128 kind:load to:0x027e0ce0 module:dtcm from:0x0214812c kind:load to:0x0214fdac module:overlay(70) from:0x02148130 kind:load to:0x02150a14 module:overlay(70) @@ -1194,7 +1194,7 @@ from:0x0214a9dc kind:arm_call to:0x020fd88c module:overlay(31) from:0x0214aa68 kind:load to:0x021513d4 module:overlay(70) from:0x0214aa6c kind:load to:0x0215146c module:overlay(70) from:0x0214aa70 kind:load to:0x021526ac module:overlay(70) -from:0x0214aa74 kind:load to:0x020b3168 module:overlay(0) +from:0x0214aa74 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0214aa88 kind:arm_call to:0x020fd958 module:overlay(31) from:0x0214aaa0 kind:arm_call to:0x0209ea60 module:overlay(0) from:0x0214aac0 kind:load to:0x0209ea60 module:overlay(0) @@ -1242,7 +1242,7 @@ from:0x0214afac kind:arm_call to:0x020611a8 module:overlay(0) from:0x0214afb8 kind:load to:0x021514a0 module:overlay(70) from:0x0214afbc kind:load to:0x021433a0 module:overlay(70) from:0x0214afc0 kind:load to:0x0214bd28 module:overlay(70) -from:0x0214afc4 kind:load to:0x020b3168 module:overlay(0) +from:0x0214afc4 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0214afc8 kind:load to:0x0215279c module:overlay(70) from:0x0214afcc kind:load to:0x02152790 module:overlay(70) from:0x0214b148 kind:arm_call to:0x01fff584 module:itcm @@ -1333,13 +1333,13 @@ from:0x0214be08 kind:arm_call to:0x0209e16c module:overlay(0) from:0x0214be38 kind:load to:0x021514e0 module:overlay(70) from:0x0214be48 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x0214be84 kind:arm_call to:0x0207d6d0 module:overlay(0) -from:0x0214bea4 kind:load to:0x020b3168 module:overlay(0) +from:0x0214bea4 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0214bea8 kind:load to:0x02151520 module:overlay(70) from:0x0214beac kind:load to:0x02151590 module:overlay(70) from:0x0214beb0 kind:load to:0x02150a14 module:overlay(70) from:0x0214bebc kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x0214bef8 kind:arm_call to:0x0207d6d0 module:overlay(0) -from:0x0214bf18 kind:load to:0x020b3168 module:overlay(0) +from:0x0214bf18 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0214bf1c kind:load to:0x02151520 module:overlay(70) from:0x0214bf20 kind:load to:0x02151590 module:overlay(70) from:0x0214bf24 kind:load to:0x02150a14 module:overlay(70) diff --git a/config/jp/arm9/overlays/ov071/relocs.txt b/config/jp/arm9/overlays/ov071/relocs.txt index 49462487..3ab4ee94 100644 --- a/config/jp/arm9/overlays/ov071/relocs.txt +++ b/config/jp/arm9/overlays/ov071/relocs.txt @@ -1773,7 +1773,7 @@ from:0x02162ca8 kind:load to:0x021670a4 module:overlay(71) from:0x02162cbc kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x02162d34 kind:load to:0x021670e8 module:overlay(71) from:0x02162d38 kind:load to:0x02167598 module:overlay(71) -from:0x02162d3c kind:load to:0x020b3168 module:overlay(0) +from:0x02162d3c kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02162d40 kind:load to:0x0216766c module:overlay(71) from:0x02162d90 kind:arm_call to:0x0209ecdc module:overlay(0) from:0x02162da8 kind:arm_call_thumb to:0x02059454 module:overlay(0) @@ -1933,7 +1933,7 @@ from:0x02164340 kind:arm_call to:0x0209e16c module:overlay(0) from:0x02164378 kind:load to:0x02167270 module:overlay(71) from:0x02164388 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x021643dc kind:load to:0x0216728c module:overlay(71) -from:0x021643e0 kind:load to:0x020b3168 module:overlay(0) +from:0x021643e0 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02164518 kind:arm_call to:0x01ffedf4 module:itcm from:0x02164588 kind:arm_call to:0x02081868 module:overlay(0) from:0x0216459c kind:arm_call to:0x02081868 module:overlay(0) @@ -2006,7 +2006,7 @@ from:0x021652e8 kind:arm_call to:0x0207d6d0 module:overlay(0) from:0x02165324 kind:arm_call to:0x020611a8 module:overlay(0) from:0x02165334 kind:load to:0x02167308 module:overlay(71) from:0x02165338 kind:load to:0x02167a9c module:overlay(71) -from:0x0216533c kind:load to:0x020b3168 module:overlay(0) +from:0x0216533c kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02165340 kind:load to:0x021670c0 module:overlay(71) from:0x02165344 kind:load to:0x02167a90 module:overlay(71) from:0x021653d8 kind:arm_call to:0x01ffcfcc module:itcm diff --git a/config/jp/arm9/overlays/ov079/relocs.txt b/config/jp/arm9/overlays/ov079/relocs.txt index c60f1cee..a798e7f7 100644 --- a/config/jp/arm9/overlays/ov079/relocs.txt +++ b/config/jp/arm9/overlays/ov079/relocs.txt @@ -510,7 +510,7 @@ from:0x02157178 kind:arm_call to:0x02099b30 module:overlay(0) from:0x021571ac kind:arm_call to:0x020f9650 module:overlay(31) from:0x021571b8 kind:arm_call to:0x0215787c module:overlay(79) from:0x02157238 kind:load to:0x02159a58 add:0x8 module:overlay(79) -from:0x0215723c kind:load to:0x020b3168 module:overlay(0) +from:0x0215723c kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02157240 kind:load to:0x02159fd4 module:overlay(79) from:0x02157250 kind:arm_call to:0x0207cd78 module:overlay(0) from:0x02157300 kind:load to:0x0203feb0 module:main @@ -680,7 +680,7 @@ from:0x021586bc kind:load to:0x02159bbc module:overlay(79) from:0x021586d4 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x0215874c kind:load to:0x02159bd8 module:overlay(79) from:0x02158750 kind:load to:0x0215a2ac module:overlay(79) -from:0x02158754 kind:load to:0x020b3168 module:overlay(0) +from:0x02158754 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02158758 kind:load to:0x0215a380 module:overlay(79) from:0x0215876c kind:arm_call to:0x0209ea60 module:overlay(0) from:0x02158794 kind:arm_call to:0x02158860 module:overlay(79) diff --git a/config/jp/arm9/overlays/ov083/relocs.txt b/config/jp/arm9/overlays/ov083/relocs.txt index 1eb565e5..e457fefc 100644 --- a/config/jp/arm9/overlays/ov083/relocs.txt +++ b/config/jp/arm9/overlays/ov083/relocs.txt @@ -783,7 +783,7 @@ from:0x0215c70c kind:load to:0x0215fcc0 add:0x8 module:overlay(83) from:0x0215c710 kind:load to:0x021603ac module:overlay(83) from:0x0215c714 kind:load to:0x0215fc44 module:overlay(83) from:0x0215c718 kind:load to:0x0215fc34 module:overlay(83) -from:0x0215c71c kind:load to:0x020b3168 module:overlay(0) +from:0x0215c71c kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0215c720 kind:load to:0x02160394 module:overlay(83) from:0x0215c724 kind:load to:0x027e0130 module:dtcm from:0x0215c728 kind:load to:0x02042eb0 module:main diff --git a/config/jp/arm9/overlays/ov084/relocs.txt b/config/jp/arm9/overlays/ov084/relocs.txt index 4fc3603f..f78384ab 100644 --- a/config/jp/arm9/overlays/ov084/relocs.txt +++ b/config/jp/arm9/overlays/ov084/relocs.txt @@ -1049,7 +1049,7 @@ from:0x0215c6f8 kind:arm_call to:0x0203e690 module:main from:0x0215c710 kind:arm_call to:0x0203e690 module:main from:0x0215c748 kind:load to:0x021653d0 add:0x8 module:overlay(84) from:0x0215c74c kind:load to:0x02165f80 module:overlay(84) -from:0x0215c750 kind:load to:0x020b3168 module:overlay(0) +from:0x0215c750 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0215c754 kind:load to:0x020b4000 module:overlay(0) from:0x0215c758 kind:load to:0x0215c760 module:overlay(84) from:0x0215c75c kind:load to:0x0215c798 module:overlay(84) diff --git a/config/jp/arm9/overlays/ov085/relocs.txt b/config/jp/arm9/overlays/ov085/relocs.txt index 24a21a93..74cd21aa 100644 --- a/config/jp/arm9/overlays/ov085/relocs.txt +++ b/config/jp/arm9/overlays/ov085/relocs.txt @@ -51,7 +51,7 @@ from:0x021531c4 kind:load to:0x02156100 add:0x8 module:overlay(85) from:0x021531c8 kind:load to:0x021562bc module:overlay(85) from:0x021531cc kind:load to:0x02155e6c module:overlay(85) from:0x021531d0 kind:load to:0x02155e7c module:overlay(85) -from:0x021531d4 kind:load to:0x020b3168 module:overlay(0) +from:0x021531d4 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x021531d8 kind:load to:0x027e0130 module:dtcm from:0x021531dc kind:load to:0x021560ac module:overlay(85) from:0x021531ec kind:arm_call to:0x0207cd78 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov086/relocs.txt b/config/jp/arm9/overlays/ov086/relocs.txt index 704c28bc..7e6ce645 100644 --- a/config/jp/arm9/overlays/ov086/relocs.txt +++ b/config/jp/arm9/overlays/ov086/relocs.txt @@ -753,7 +753,7 @@ from:0x0215d090 kind:arm_call to:0x02099b30 module:overlay(0) from:0x0215d0c4 kind:arm_call to:0x020f9650 module:overlay(31) from:0x0215d0d0 kind:arm_call to:0x0215d754 module:overlay(86) from:0x0215d14c kind:load to:0x02161d78 add:0x8 module:overlay(86) -from:0x0215d150 kind:load to:0x020b3168 module:overlay(0) +from:0x0215d150 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0215d154 kind:load to:0x02162668 module:overlay(86) from:0x0215d164 kind:arm_call to:0x0207cd78 module:overlay(0) from:0x0215d1f0 kind:load to:0x0203feb0 module:main diff --git a/config/jp/arm9/overlays/ov090/relocs.txt b/config/jp/arm9/overlays/ov090/relocs.txt index 4719f3bf..cfd66a6b 100644 --- a/config/jp/arm9/overlays/ov090/relocs.txt +++ b/config/jp/arm9/overlays/ov090/relocs.txt @@ -1867,7 +1867,7 @@ from:0x02177028 kind:load to:0x02179060 module:overlay(90) from:0x0217703c kind:arm_call to:0x0210dcfc module:overlay(26) from:0x021770b4 kind:load to:0x0217907c module:overlay(90) from:0x021770b8 kind:load to:0x02179dbc module:overlay(90) -from:0x021770bc kind:load to:0x020b3168 module:overlay(0) +from:0x021770bc kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x021770c0 kind:load to:0x02179e90 module:overlay(90) from:0x021770cc kind:arm_call to:0x0210dd84 module:overlay(26) from:0x0217710c kind:load to:0x027e0cd8 module:dtcm @@ -1896,7 +1896,7 @@ from:0x021772c4 kind:load to:0x021790cc module:overlay(90) from:0x021772d8 kind:arm_call to:0x0210dcfc module:overlay(26) from:0x02177350 kind:load to:0x021790e8 module:overlay(90) from:0x02177354 kind:load to:0x02179ec0 module:overlay(90) -from:0x02177358 kind:load to:0x020b3168 module:overlay(0) +from:0x02177358 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0217735c kind:load to:0x02179f94 module:overlay(90) from:0x02177368 kind:arm_call to:0x0210dd84 module:overlay(26) from:0x021773a8 kind:load to:0x027e0cd8 module:dtcm diff --git a/config/jp/arm9/overlays/ov091/relocs.txt b/config/jp/arm9/overlays/ov091/relocs.txt index 6eebe7d2..115aa3a9 100644 --- a/config/jp/arm9/overlays/ov091/relocs.txt +++ b/config/jp/arm9/overlays/ov091/relocs.txt @@ -219,7 +219,7 @@ from:0x02169dd0 kind:load to:0x0217940c module:overlay(91) from:0x02169ddc kind:arm_call to:0x0210dcfc module:overlay(26) from:0x02169e50 kind:load to:0x02179428 module:overlay(91) from:0x02169e54 kind:load to:0x0217a528 module:overlay(91) -from:0x02169e58 kind:load to:0x020b3168 module:overlay(0) +from:0x02169e58 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02169e9c kind:arm_call_thumb to:0x01ffa1a0 module:itcm from:0x02169ec0 kind:load to:0x0203feb0 module:main from:0x02169ed0 kind:arm_call_thumb to:0x02059454 module:overlay(0) @@ -235,7 +235,7 @@ from:0x02169f60 kind:arm_call to:0x0209e16c module:overlay(0) from:0x02169f78 kind:load to:0x02179478 module:overlay(91) from:0x02169f84 kind:arm_call to:0x0210dcfc module:overlay(26) from:0x02169fb0 kind:load to:0x02179494 module:overlay(91) -from:0x02169fb4 kind:load to:0x020b3168 module:overlay(0) +from:0x02169fb4 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02169fd8 kind:arm_call to:0x0209de84 module:overlay(0) from:0x0216a090 kind:load to:0x020b7544 module:overlay(0) from:0x0216a098 kind:load to:0x0217a56c module:overlay(91) @@ -1750,7 +1750,7 @@ from:0x021780f8 kind:arm_call to:0x02099dd4 module:overlay(0) from:0x02178100 kind:arm_call to:0x01ffa06c module:itcm from:0x0217810c kind:load to:0x0217a2bc add:0x8 module:overlay(91) from:0x02178110 kind:load to:0x0217b174 module:overlay(91) -from:0x02178114 kind:load to:0x020b3168 module:overlay(0) +from:0x02178114 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02178118 kind:load to:0x020b3fc8 module:overlay(0) from:0x02178154 kind:arm_call to:0x021337e4 module:overlay(26) from:0x0217816c kind:arm_call to:0x021337e4 module:overlay(26) diff --git a/config/jp/arm9/overlays/ov092/relocs.txt b/config/jp/arm9/overlays/ov092/relocs.txt index 77d5022c..bd676cc3 100644 --- a/config/jp/arm9/overlays/ov092/relocs.txt +++ b/config/jp/arm9/overlays/ov092/relocs.txt @@ -79,7 +79,7 @@ from:0x021686e8 kind:load to:0x0217de88 module:overlay(92) from:0x021686f4 kind:arm_call to:0x0210dcfc module:overlay(26) from:0x0216876c kind:load to:0x0217dea4 module:overlay(92) from:0x02168770 kind:load to:0x0217f490 module:overlay(92) -from:0x02168774 kind:load to:0x020b3168 module:overlay(0) +from:0x02168774 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02168784 kind:arm_call to:0x0210dd84 module:overlay(26) from:0x0216879c kind:arm_call to:0x0210dfa4 module:overlay(26) from:0x021687bc kind:arm_call to:0x01ffc768 module:itcm diff --git a/config/jp/arm9/overlays/ov094/relocs.txt b/config/jp/arm9/overlays/ov094/relocs.txt index 3890a89e..ffcdda7f 100644 --- a/config/jp/arm9/overlays/ov094/relocs.txt +++ b/config/jp/arm9/overlays/ov094/relocs.txt @@ -1302,7 +1302,7 @@ from:0x02172d18 kind:arm_call to:0x0209e16c module:overlay(0) from:0x02172d48 kind:load to:0x0217a258 module:overlay(94) from:0x02172d58 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x02172d84 kind:load to:0x0217a274 module:overlay(94) -from:0x02172d88 kind:load to:0x020b3168 module:overlay(0) +from:0x02172d88 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02172db8 kind:arm_call to:0x01ffedf4 module:itcm from:0x02172dcc kind:load to:0x027e0cd8 module:dtcm from:0x02172e54 kind:arm_call to:0x01fff498 module:itcm @@ -1328,7 +1328,7 @@ from:0x02173188 kind:arm_call to:0x02068814 module:overlay(0) from:0x0217319c kind:load to:0x0217a2b8 module:overlay(94) from:0x021731a0 kind:load to:0x0217a2f4 add:0x8 module:overlay(94) from:0x021731a4 kind:load to:0x020b7544 module:overlay(0) -from:0x021731ac kind:load to:0x020b3168 module:overlay(0) +from:0x021731ac kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x021731cc kind:arm_call to:0x020749a4 module:overlay(0) from:0x021731ec kind:load to:0x027e09b8 module:dtcm from:0x02173208 kind:arm_call to:0x02074c30 module:overlay(0) @@ -1424,7 +1424,7 @@ from:0x02173b80 kind:load to:0x0217a484 module:overlay(94) from:0x02173b94 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x02173c0c kind:load to:0x0217a4a0 module:overlay(94) from:0x02173c10 kind:load to:0x0217b5b0 module:overlay(94) -from:0x02173c14 kind:load to:0x020b3168 module:overlay(0) +from:0x02173c14 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02173c18 kind:load to:0x0217b684 module:overlay(94) from:0x02173c48 kind:arm_call_thumb to:0x02059454 module:overlay(0) from:0x02173c50 kind:arm_call to:0x0209e870 module:overlay(0) @@ -1714,7 +1714,7 @@ from:0x02175e88 kind:arm_call to:0x02080b8c module:overlay(0) from:0x02175ea8 kind:arm_call to:0x020a1b0c module:overlay(0) from:0x02175eb4 kind:load to:0x0217a604 module:overlay(94) from:0x02175eb8 kind:load to:0x0217b8d4 module:overlay(94) -from:0x02175ebc kind:load to:0x020b3168 module:overlay(0) +from:0x02175ebc kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02175ec0 kind:load to:0x0217b7e0 module:overlay(94) from:0x02175ec8 kind:load to:0x0217b7ac module:overlay(94) from:0x02175ecc kind:load to:0x0217b7b0 module:overlay(94) @@ -1809,7 +1809,7 @@ from:0x02176c34 kind:arm_call to:0x0209e16c module:overlay(0) from:0x02176c6c kind:load to:0x0217a648 module:overlay(94) from:0x02176c7c kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x02176cbc kind:load to:0x0217a664 module:overlay(94) -from:0x02176cc0 kind:load to:0x020b3168 module:overlay(0) +from:0x02176cc0 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02176e04 kind:arm_call to:0x01ffedf4 module:itcm from:0x02176e78 kind:arm_call to:0x02081868 module:overlay(0) from:0x02176e8c kind:arm_call to:0x02081868 module:overlay(0) @@ -1886,7 +1886,7 @@ from:0x0217781c kind:load to:0x0217a468 module:overlay(94) from:0x02177820 kind:load to:0x0217a3c0 module:overlay(94) from:0x02177824 kind:load to:0x0217a718 module:overlay(94) from:0x0217783c kind:arm_call to:0x0209e7a4 module:overlay(0) -from:0x021778a0 kind:load to:0x020b3168 module:overlay(0) +from:0x021778a0 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x021778a4 kind:load to:0x0217a734 module:overlay(94) from:0x021778a8 kind:load to:0x0217bc9c module:overlay(94) from:0x021778e4 kind:arm_call to:0x0200f05c module:main diff --git a/config/jp/arm9/overlays/ov102/relocs.txt b/config/jp/arm9/overlays/ov102/relocs.txt index 0ffda382..896d05dd 100644 --- a/config/jp/arm9/overlays/ov102/relocs.txt +++ b/config/jp/arm9/overlays/ov102/relocs.txt @@ -69,7 +69,7 @@ from:0x021854d4 kind:load to:0x027e0cd8 module:dtcm from:0x021854d8 kind:load to:0x02186430 module:overlay(102) from:0x021854dc kind:load to:0x0211a770 module:overlay(31) from:0x021854e0 kind:load to:0x02186470 module:overlay(102) -from:0x021854e4 kind:load to:0x020b3168 module:overlay(0) +from:0x021854e4 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x0218552c kind:arm_call to:0x02185144 module:overlay(102) from:0x02185670 kind:arm_call to:0x0207f8f8 module:overlay(0) from:0x02185688 kind:arm_call to:0x0207f90c module:overlay(0) diff --git a/config/jp/arm9/overlays/ov104/relocs.txt b/config/jp/arm9/overlays/ov104/relocs.txt index 9f3d9691..2bc63c8e 100644 --- a/config/jp/arm9/overlays/ov104/relocs.txt +++ b/config/jp/arm9/overlays/ov104/relocs.txt @@ -55,7 +55,7 @@ from:0x02186bf0 kind:arm_call_thumb to:0x0209040c module:overlay(0) from:0x02186c1c kind:arm_call to:0x0205e064 module:overlay(0) from:0x02186c2c kind:load to:0x02186cfc module:overlay(104) from:0x02186c30 kind:load to:0x027e0ce0 module:dtcm -from:0x02186c34 kind:load to:0x020b3168 module:overlay(0) +from:0x02186c34 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02186c38 kind:load to:0x02186ce8 module:overlay(104) from:0x02186c5c kind:load to:0x0208ddfc module:overlay(0) from:0x02186c6c kind:arm_call_thumb to:0x02059454 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov106/relocs.txt b/config/jp/arm9/overlays/ov106/relocs.txt index 5690b8d9..8b46e1fe 100644 --- a/config/jp/arm9/overlays/ov106/relocs.txt +++ b/config/jp/arm9/overlays/ov106/relocs.txt @@ -91,7 +91,7 @@ from:0x021870d0 kind:arm_call to:0x0205e064 module:overlay(0) from:0x021870dc kind:load to:0x0218771c module:overlay(106) from:0x021870e0 kind:load to:0x027e0ce0 module:dtcm from:0x021870e4 kind:load to:0x02187624 module:overlay(106) -from:0x021870e8 kind:load to:0x020b3168 module:overlay(0) +from:0x021870e8 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x021870ec kind:load to:0x02187708 module:overlay(106) from:0x02187110 kind:arm_call to:0x0200eab0 module:main from:0x02187124 kind:arm_call to:0x0208ddfc module:overlay(0) @@ -111,7 +111,7 @@ from:0x021872d4 kind:arm_call to:0x0200b578 module:main from:0x021872e4 kind:arm_call to:0x020aa174 module:overlay(0) from:0x021872fc kind:arm_call_thumb to:0x0209040c module:overlay(0) from:0x0218733c kind:load to:0x02187730 module:overlay(106) -from:0x02187340 kind:load to:0x020b3168 module:overlay(0) +from:0x02187340 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02187344 kind:load to:0x027e09b8 module:dtcm from:0x02187348 kind:load to:0x020a1aac module:overlay(0) from:0x0218734c kind:load to:0x021868a0 module:overlay(106) diff --git a/config/jp/arm9/overlays/ov107/relocs.txt b/config/jp/arm9/overlays/ov107/relocs.txt index ce093f2c..1cd96883 100644 --- a/config/jp/arm9/overlays/ov107/relocs.txt +++ b/config/jp/arm9/overlays/ov107/relocs.txt @@ -41,7 +41,7 @@ from:0x02186da0 kind:arm_call to:0x01fff148 module:itcm from:0x02186dfc kind:arm_call to:0x0200b578 module:main from:0x02186e10 kind:load to:0x021881e8 module:overlay(107) from:0x02186e14 kind:load to:0x027e0ce0 module:dtcm -from:0x02186e18 kind:load to:0x020b3168 module:overlay(0) +from:0x02186e18 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02186e1c kind:load to:0x021881a8 module:overlay(107) from:0x02186e20 kind:load to:0x02188194 module:overlay(107) from:0x02186e24 kind:load to:0x0218700c module:overlay(107) diff --git a/config/jp/arm9/overlays/ov108/relocs.txt b/config/jp/arm9/overlays/ov108/relocs.txt index d08513fc..8ba49aa6 100644 --- a/config/jp/arm9/overlays/ov108/relocs.txt +++ b/config/jp/arm9/overlays/ov108/relocs.txt @@ -1,5 +1,5 @@ from:0x021865e0 kind:load to:0x02187a68 module:overlay(108) -from:0x021865e4 kind:load to:0x020b3168 module:overlay(0) +from:0x021865e4 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x021865f8 kind:load to:0x0208ddac module:overlay(0) from:0x02186608 kind:arm_call_thumb to:0x02059454 module:overlay(0) from:0x02186610 kind:arm_call_thumb to:0x0208dda8 module:overlay(0) @@ -23,7 +23,7 @@ from:0x02186734 kind:arm_call_thumb to:0x0205910c module:overlay(0) from:0x0218673c kind:arm_call_thumb to:0x0208dda8 module:overlay(0) from:0x02186744 kind:arm_call to:0x02011ff4 module:main from:0x02186770 kind:load to:0x02187a90 module:overlay(108) -from:0x02186774 kind:load to:0x020b3168 module:overlay(0) +from:0x02186774 kind:load to:0x020b3160 add:0x8 module:overlay(0) from:0x02186788 kind:load to:0x0208ddac module:overlay(0) from:0x02186798 kind:arm_call_thumb to:0x02059454 module:overlay(0) from:0x021867a0 kind:arm_call_thumb to:0x0208dda8 module:overlay(0) diff --git a/config/jp/arm9/symbols.txt b/config/jp/arm9/symbols.txt index 2cfbf5a0..c37328a2 100644 --- a/config/jp/arm9/symbols.txt +++ b/config/jp/arm9/symbols.txt @@ -2284,7 +2284,7 @@ data_0203fe14 kind:data(any) addr:0x0203fe14 data_0203fe58 kind:data(any) addr:0x0203fe58 data_0203fea4 kind:data(any) addr:0x0203fea4 data_0203feaa kind:data(any) addr:0x0203feaa -data_0203feb0 kind:data(any) addr:0x0203feb0 +gSinCosTable kind:data(any) addr:0x0203feb0 data_0203ffb0 kind:data(any) addr:0x0203ffb0 data_02040105 kind:data(any) addr:0x02040105 data_020401b0 kind:data(any) addr:0x020401b0 diff --git a/include/Actor/ActorUnk_ov000_020a8bb0.hpp b/include/Actor/ActorUnk_ov000_020a8bb0.hpp index c2408b0c..d1e02e3c 100644 --- a/include/Actor/ActorUnk_ov000_020a8bb0.hpp +++ b/include/Actor/ActorUnk_ov000_020a8bb0.hpp @@ -1,10 +1,9 @@ #pragma once #include "Actor/Actor.hpp" +#include "Unknown/Common.hpp" #include "types.h" -typedef void (*ActorUnk_ov000_020a8bb0_a4UnkCallback)(void); - class ActorUnk_vfunc_b0 { public: /* 00 */ unk32 mUnk_00; @@ -44,17 +43,9 @@ public: ~ActorUnk_ov000_020a8bb0_94(); }; -class ActorUnk_ov000_020a8bb0_a4_00 { -public: - ActorUnk_ov000_020a8bb0_a4_00(); - ~ActorUnk_ov000_020a8bb0_a4_00(); - void func_ov000_02057c38(unk32 param1, unk32 param2); - void func_ov000_0209a7b8(void *param1, ActorUnk_ov000_020a8bb0_a4UnkCallback param2); -}; - class ActorUnk_ov000_020a8bb0_a4 { public: - /* 00 */ ActorUnk_ov000_020a8bb0_a4_00 *mUnk_00; + /* 00 */ UnkSystem4 *mUnk_00; /* 08 */ unk16 mUnk_04; /* 08 */ unk16 mUnk_06; /* 0a */ unk32 mUnk_08; @@ -144,7 +135,7 @@ public: /* bc */ void func_ov000_020a8ae0(q20 param1); - ActorUnk_ov000_020a8bb0(ActorUnk_ov000_020a8bb0_a4_00 *param1, unk32 param2); + ActorUnk_ov000_020a8bb0(UnkSystem4 *param1, unk32 param2); unk32 func_ov000_020a8db0(); unk32 func_ov000_020a8dd0(); void func_ov000_020a8df0(ActorRef param1, unk32 param2); diff --git a/include/Map/MapObjectTable.inl b/include/Map/MapObjectTable.inl index 5dc721c0..22ed6d9b 100644 --- a/include/Map/MapObjectTable.inl +++ b/include/Map/MapObjectTable.inl @@ -10,7 +10,7 @@ DEFINE_MAP_OBJECT_TYPE('BFSP', BFSP) DEFINE_MAP_OBJECT_TYPE('BLCC', BLCC) DEFINE_MAP_OBJECT_TYPE('BLCE', BLCE) DEFINE_MAP_OBJECT_TYPE('BLCK', BLCK) -DEFINE_MAP_OBJECT_TYPE('BLCM', BLCM) +DEFINE_MAP_OBJECT_TYPE('BLCM', MiniBlocks) DEFINE_MAP_OBJECT_TYPE('BLCT', BLCT) DEFINE_MAP_OBJECT_TYPE('BLHL', BLHL) DEFINE_MAP_OBJECT_TYPE('BLRB', BLRB) @@ -173,7 +173,7 @@ DEFINE_MAP_OBJECT_TYPE('SWFS', SWFS) DEFINE_MAP_OBJECT_TYPE('SWHT', SWHT) DEFINE_MAP_OBJECT_TYPE('SWRA', SWRA) DEFINE_MAP_OBJECT_TYPE('SWRB', SWRB) -DEFINE_MAP_OBJECT_TYPE('SWST', SWST) +DEFINE_MAP_OBJECT_TYPE('SWST', SwitchStep) DEFINE_MAP_OBJECT_TYPE('SWSW', SWSW) DEFINE_MAP_OBJECT_TYPE('SWWN', SWWN) DEFINE_MAP_OBJECT_TYPE('TATZ', TATZ) diff --git a/include/MapObject/MapObject.hpp b/include/MapObject/MapObject.hpp index d0d89f6d..791b61a2 100644 --- a/include/MapObject/MapObject.hpp +++ b/include/MapObject/MapObject.hpp @@ -9,7 +9,7 @@ #include "nitro/math.h" #include "types.h" -typedef u32 MapObjFlags; +typedef u16 MapObjFlags; enum MapObjFlag_ { MapObjFlag_Alive = FLAG(0, 0), MapObjFlag_1 = FLAG(0, 1), @@ -57,28 +57,33 @@ public: /* 1A */ unk8 mUnk_1A; /* 1B */ unk8 mUnk_1B; /* 1C */ MapObjFlags mFlags[1]; - /* 20 */ unk32 mUnk_20; - /* 20 */ unk32 mUnk_24; - /* 20 */ unk32 mUnk_28; - /* 20 */ unk32 mUnk_2C; - /* 20 */ unk32 mUnk_30; - /* 20 */ unk32 mUnk_34; - /* 38 */ unk32 mUnk_38; + /* 1E */ unk16 mUnk_1E; + /* 20 */ u16 mUnk_20; + /* 22 */ u16 mUnk_22; + /* 24 */ unk32 mUnk_24; + /* 28 */ unk32 mUnk_28; + /* 2C */ unk32 mUnk_2C; + /* 30 */ unk32 mUnk_30; + /* 34 */ unk32 mUnk_34; + /* 38 */ unk8 mUnk_38; + /* 38 */ unk8 mUnk_39; + /* 3A */ Vec2b mUnk_3A; /* 3C */ MapObjectProfile *mpProfile; /* 40 */ - /* 00 */ virtual void vfunc_00(); + // data_ov000_020b3590 + /* 00 */ virtual bool vfunc_00(); /* 04 */ virtual bool vfunc_04(); /* 08 */ virtual unk16 vfunc_08(); - /* 0c */ virtual unk8 vfunc_0c(); + /* 0C */ virtual unk8 vfunc_0C(); /* 10 */ virtual void vfunc_10(); /* 14 */ virtual void vfunc_14(); - /* 18 */ virtual bool vfunc_18(); - /* 1c */ virtual void vfunc_1c(); + /* 18 */ virtual void vfunc_18(); + /* 1C */ virtual void vfunc_1C(); /* 20 */ virtual void vfunc_20(); /* 24 */ virtual void vfunc_24(); /* 28 */ virtual void vfunc_28(); - /* 2c */ virtual void vfunc_2c(); + /* 2C */ virtual void vfunc_2C(); /* 30 */ virtual ~MapObject(); /* 38 */ @@ -86,6 +91,23 @@ public: MapObjectId GetMapObjectId(); + void func_ov000_0209d0bc(); + void func_ov000_0209d114(); + void func_ov000_0209d12c(); + void func_ov000_0209d144(); + void func_ov000_0209d22c(); + void func_ov000_0209d274(); + unk32 func_ov000_0209d29c(unk32 param1); + void func_ov000_0209d2c4(unk32 param1, unk32 param2); + void func_ov000_0209d2f0(); + void func_ov000_0209d3b4(); + void func_ov000_0209d434(); + void func_ov000_0209d518(); + void func_ov000_0209d54c(); + void func_ov000_0209d5c8(); + void func_ov000_0209d614(); + void func_ov000_0209d668(); void func_ov000_0209d6ac(Vec3p *param1); + void func_ov031_02103878(); }; diff --git a/include/MapObject/MapObjectMiniBlocks.hpp b/include/MapObject/MapObjectMiniBlocks.hpp new file mode 100644 index 00000000..65a90b11 --- /dev/null +++ b/include/MapObject/MapObjectMiniBlocks.hpp @@ -0,0 +1,36 @@ +#pragma once + +#include "MapObject/MapObject.hpp" +#include "MapObject/MapObjectProfile.hpp" +#include "Unknown/Common.hpp" +#include "global.h" +#include "types.h" + +class MapObjectMiniBlocks : public MapObject { +public: + /* 00 (base) */ + /* 40 */ UnkSystem6 mUnk_40; + /* 44 */ unk32 mUnk_44; + /* 48 */ unk8 mUnk_48; + /* 49 */ unk8 mUnk_49; // pad? + /* 4A */ unk16 mUnk_4A; // pad? + /* 4C */ + + MapObjectMiniBlocks(); + + /* 00 */ virtual bool vfunc_00() override; + /* 14 */ virtual void vfunc_14() override; + /* 30 */ virtual ~MapObjectMiniBlocks() override; +}; + +class MapObjectProfileMiniBlocks : public MapObjectProfile_Derived1 { +public: + /* 00 (base) */ + + MapObjectProfileMiniBlocks(); + + /* 00 */ virtual MapObject *Create(); + /* 1C */ virtual ~MapObjectProfileMiniBlocks() override; + + static MapObjectProfileMiniBlocks *GetProfile(); +}; diff --git a/include/MapObject/MapObjectProfile.hpp b/include/MapObject/MapObjectProfile.hpp index 55e7112f..04c725a2 100644 --- a/include/MapObject/MapObjectProfile.hpp +++ b/include/MapObject/MapObjectProfile.hpp @@ -40,6 +40,7 @@ public: /* 0C */ MapObjectProfile_D4() {} + ~MapObjectProfile_D4() {} /* 00 */ virtual void vfunc_00(void); /* 04 */ virtual void vfunc_04(void); @@ -55,7 +56,7 @@ class MapObjectProfile : public SysObject { public: /* 00 (vtable) */ /* 04 */ unk8 mUnk_04[2]; - /* 06 */ u8 mUnk_06; + /* 06 */ s8 mUnk_06; /* 07 */ unk8 mUnk_07; /* 08 */ unk32 mUnk_08; /* 0C */ unk16 mUnk_0C; @@ -66,10 +67,11 @@ public: /* 18 */ unk32 mUnk_18; /* 1C */ unk8 mUnk_1C; /* 1D */ unk8 mUnk_1D; - /* 1E */ unk16 mUnk_1E; + /* 1E */ u16 mUnk_1E; /* 20 */ MapObjectProfile(MapObjectId mapObjId); // func_ov000_0209c828 + ~MapObjectProfile(); // data_ov000_020b3524 /* 00 */ virtual MapObject *Create() = 0; @@ -80,12 +82,14 @@ public: /* 14 */ }; +class MapObjectProfile_Derived2_20; + class MapObjectProfile_Derived1_20 { public: - /* 00 */ unk32 mUnk_00; + /* 00 */ MapObjectProfile_Derived2_20 *mUnk_00; MapObjectProfile_Derived1_20() { - this->mUnk_00 = 0; + this->mUnk_00 = NULL; } }; @@ -96,15 +100,19 @@ public: /* 60 */ unk32 mUnk_60; /* 64 */ unk16 mUnk_64; /* 66 */ unk16 mUnk_66; - /* 68 */ MapObjectProfile_D4 mUnk_68; - /* 74 */ unk32 mUnk_74; - /* 78 */ unk32 mUnk_78; - /* 7C */ unk32 mUnk_7C; - /* 80 */ unk32 mUnk_80; - /* 84 */ unk32 mUnk_84; - /* 88 */ + /* 68 */ - MapObjectProfile_Derived1(MapObjectId mapObjId); // func_ov000_0209cb4c + MapObjectProfile_Derived1(MapObjectId mapObjId, unk32 param2, unk32 param3); // func_ov000_0209cb4c + + // data_ov000_020b3540 + /* 04 */ virtual void vfunc_04(); + /* 08 */ virtual void vfunc_08(); + /* 0C */ virtual void vfunc_0C(); + /* 10 */ virtual void vfunc_10(); + /* 14 */ virtual ~MapObjectProfile_Derived1(); + /* 1C */ virtual MapObjectProfile_Derived2_20 *vfunc_1C(unk32 param1); + + void func_ov000_0209ccd8(unk32 param1, u32 param2); }; class MapObjectProfile_Derived2_20_Base_18 { @@ -118,8 +126,8 @@ public: class MapObjectProfile_Derived2_20_Base_20 { public: - /* 00 */ unk32 mUnk_00; - /* 04 */ unk32 mUnk_04; + /* 00 */ void *mUnk_00; + /* 04 */ void *mUnk_04; /* 08 */ unk32 mUnk_08; /* 0C */ @@ -127,6 +135,23 @@ public: unk32 param5); // func_020153fc }; +class MapObjectProfile_Derived2_20_Base_50 { +public: + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ u8 mUnk_08; + /* 08 */ u8 mUnk_09; + /* 08 */ u8 mUnk_0A; + /* 08 */ u8 mUnk_0B; + /* 0C */ unk8 mUnk_0C; + /* 0C */ unk8 mUnk_0D; + /* 0C */ u16 mUnk_0E; + /* 10 */ + + MapObjectProfile_Derived2_20_Base_50(); + ~MapObjectProfile_Derived2_20_Base_50(); +}; + class MapObjectProfile_Derived2_20_Base_54 { public: /* 00 */ unk32 mUnk_00; @@ -142,10 +167,10 @@ public: class MapObjectProfile_Derived2_20_Base { public: /* 00 (vtable) */ - /* 04 */ unk32 mUnk_04; - /* 08 */ unk32 mUnk_08; - /* 0C */ unk32 mUnk_0C; - /* 10 */ unk32 mUnk_10; + /* 04 */ const char *mUnk_04; + /* 08 */ void *mUnk_08; + /* 0C */ void *mUnk_0C; + /* 10 */ void *mUnk_10; /* 14 */ unk8 mUnk_14; // bool? /* 15 */ unk8 mUnk_15; // bool? /* 16 */ unk8 mUnk_16; // bool? @@ -154,7 +179,7 @@ public: /* 20 */ MapObjectProfile_Derived2_20_Base_20 mUnk_20; /* 2C */ UnkFileSystem3 mUnk_2C; /* 3C */ UnkFileSystem5 mUnk_3C; - /* 50 */ unk32 mUnk_50; + /* 50 */ MapObjectProfile_Derived2_20_Base_50 *mUnk_50; /* 54 */ MapObjectProfile_Derived2_20_Base_54 mUnk_54[4]; /* 94 */ @@ -184,23 +209,25 @@ public: // data_ov000_020b3568 /* 00 */ virtual ~MapObjectProfile_Derived2_20() override; + + unk32 func_ov000_02058a24(); + unk32 func_ov000_02058a84(unk32 param1, const char *param2); }; class MapObjectProfile_Derived2 : public MapObjectProfile { public: /* 00 (base) */ /* 20 */ MapObjectProfile_Derived2_20 mUnk_20; - /* D4 */ MapObjectProfile_D4 mUnk_D4; - /* E0 */ Vec3p mUnk_E0; - /* EC */ Vec3p mUnk_EC; - /* F8 */ + /* D4 */ MapObjectProfile_Derived2(MapObjectId mapObjId1, MapObjectId mapObjId2); // func_ov000_0209c9a8 + ~MapObjectProfile_Derived2(); // data_ov000_020b3508 /* 04 */ virtual void vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C() override; + /* 10 */ virtual void vfunc_10() override; }; typedef MapObjectProfile *(*GetMapObjectProfile)(); diff --git a/include/MapObject/MapObjectSwitchStep.hpp b/include/MapObject/MapObjectSwitchStep.hpp new file mode 100644 index 00000000..fbe47fb1 --- /dev/null +++ b/include/MapObject/MapObjectSwitchStep.hpp @@ -0,0 +1,79 @@ +#pragma once + +#include "MapObject/MapObject.hpp" +#include "MapObject/MapObjectProfile.hpp" +#include "Unknown/Common.hpp" +#include "global.h" +#include "types.h" + +class MapObjectSwitchStep_40 : public UnkSystem4 { +public: + /* 00 (base) */ + /* 60 */ unk16 mUnk_60; + /* 62 */ bool mUnk_62; + /* 63 */ unk8 mUnk_63; + /* 64 */ + + MapObjectSwitchStep_40(); + + // data_ov000_020b36e0 + /* 00 */ virtual ~MapObjectSwitchStep_40() override {} + /* 1C */ virtual void vfunc_1C(UnkSystem4_vfunc_1C *param1) override; + + void func_ov000_0209dde0(void); +}; + +class MapObjectSwitchStep : public MapObject { +public: + /* 00 (base) */ + /* 40 */ MapObjectSwitchStep_40 mUnk_40; + /* A4 */ UnkSystem5 mUnk_A4; + /* C4 */ unk32 mUnk_C4; + /* C8 */ STRUCT_PAD(0xC8, 0xE4); + /* E4 */ u16 mUnk_E4; + /* E6 */ u16 mUnk_E6; + /* E8 */ unk16 mUnk_E8; + /* EA */ unk8 mUnk_EA; + /* EB */ unk8 mUnk_EB; + /* EC */ + + MapObjectSwitchStep(); + + /* 00 */ virtual bool vfunc_00() override; + /* 08 */ virtual unk16 vfunc_08() override; + /* 14 */ virtual void vfunc_14() override; + /* 18 */ virtual void vfunc_18() override; + /* 20 */ virtual void vfunc_20() override; + /* 30 */ virtual ~MapObjectSwitchStep() override; + + void func_ov000_0209dda4(void); + + void func_ov000_0209e11c(unk32 param1, unk32 param2); + void func_ov000_0209e38c(void); +}; + +class MapObjectProfileSwitchStep_Base : public MapObjectProfile_Derived2 { +public: + /* 00 (base) */ + /* D4 */ MapObjectProfile_D4 mUnk_D4; + + MapObjectProfileSwitchStep_Base(MapObjectId mapObjId) : + MapObjectProfile_Derived2(mapObjId, mapObjId) {} + + // data_ov000_020b369c (vtable) +}; + +class MapObjectProfileSwitchStep : public MapObjectProfileSwitchStep_Base { +public: + /* 00 (base) */ + /* E0 */ Vec3p mUnk_E0; + /* EC */ Vec3p mUnk_EC; + /* F8 */ + + MapObjectProfileSwitchStep(); + ~MapObjectProfileSwitchStep() {} + + /* 00 */ virtual MapObject *Create(); + + static MapObjectProfileSwitchStep *GetProfile(); +}; diff --git a/include/MapObject/MapObjectUnkBLCM.hpp b/include/MapObject/MapObjectUnkBLCM.hpp deleted file mode 100644 index 755e949d..00000000 --- a/include/MapObject/MapObjectUnkBLCM.hpp +++ /dev/null @@ -1,33 +0,0 @@ -//! TODO: This file was generated automatically and might contain errors - -#pragma once - -#include "MapObject/MapObject.hpp" -#include "MapObject/MapObjectProfile.hpp" -#include "global.h" -#include "types.h" - -class MapObjectUnkBLCM : public MapObject { -public: - /* 00 (base) */ - /* 40 */ - - MapObjectUnkBLCM(); - - /* 30 */ virtual ~MapObjectUnkBLCM() override; - - void func_ov000_0209e4b0(void); - void func_ov000_0209e6ac(void); -}; - -class MapObjectProfileUnkBLCM : public MapObjectProfile { -public: - /* 00 (base) */ - - MapObjectProfileUnkBLCM(); - ~MapObjectProfileUnkBLCM(); - - /* 0C */ virtual MapObject *Create(); - - static MapObjectProfileUnkBLCM *GetProfile(); -}; diff --git a/include/MapObject/MapObjectUnkSWST.hpp b/include/MapObject/MapObjectUnkSWST.hpp deleted file mode 100644 index 765c49bf..00000000 --- a/include/MapObject/MapObjectUnkSWST.hpp +++ /dev/null @@ -1,41 +0,0 @@ -//! TODO: This file was generated automatically and might contain errors - -#pragma once - -#include "MapObject/MapObject.hpp" -#include "MapObject/MapObjectProfile.hpp" -#include "global.h" -#include "types.h" - -class MapObjectUnkSWST : public MapObject { -public: - /* 00 (base) */ - /* 40 */ - - MapObjectUnkSWST(); - - /* 30 */ virtual ~MapObjectUnkSWST() override; - - void func_ov000_0209dda4(void); - void func_ov000_0209dde0(void); - void func_ov000_0209de10(void); - void func_ov000_0209df9c(void); - void func_ov000_0209e068(void); - void func_ov000_0209e11c(void); - void func_ov000_0209e280(void); - void func_ov000_0209e2b4(void); - void func_ov000_0209e38c(void); - void func_ov000_0209e3c8(void); -}; - -class MapObjectProfileUnkSWST : public MapObjectProfile { -public: - /* 00 (base) */ - - MapObjectProfileUnkSWST(); - ~MapObjectProfileUnkSWST(); - - /* 0C */ virtual MapObject *Create(); - - static MapObjectProfileUnkSWST *GetProfile(); -}; diff --git a/include/Player/PlayerGet.hpp b/include/Player/PlayerGet.hpp index 6019a36b..0b534ff8 100644 --- a/include/Player/PlayerGet.hpp +++ b/include/Player/PlayerGet.hpp @@ -4,6 +4,7 @@ #include "types.h" #include "versions.h" +#include "Unknown/Common.hpp" #include "Unknown/UnkStruct_027e0ce0.hpp" #include "Unknown/UnkStruct_ov000_0208f820.hpp" #include "nitro/math.h" @@ -50,22 +51,6 @@ public: } }; -class UnkStruct_PlayerGet_8c { -public: - // /* 00 */ unk32 *mUnk_00; - - /* 00 */ virtual ~UnkStruct_PlayerGet_8c(); - /* 08 */ virtual void vfunc_08(unk32 param1); //! TODO: name symbol func_ov000_02057bf4 - /* 0c */ virtual void vfunc_0c(); //! TODO: name symbol func_01ffc57c - /* 10 */ virtual void vfunc_10(); //! TODO: name symbol func_ov000_02057dc8 - /* 14 */ virtual void vfunc_14(); //! TODO: name symbol func_ov000_02057e44 - /* 18 */ virtual void vfunc_18(); //! TODO: name symbol func_ov000_02057ea8 - /* 1c */ virtual void vfunc_1c(); //! TODO: name symbol func_ov000_02057c34 - /* 20 */ virtual void vfunc_20(); //! TODO: name symbol func_ov000_02057d84 - - UnkStruct_PlayerGet_8c(unk32 param1); -}; - class UnkStruct_PlayerGet_ec { public: /* 00 */ unk32 *mUnk_00; @@ -122,30 +107,7 @@ public: /* 070 */ u8 mUnk_72; // probably bools /* 070 */ u8 mUnk_73; // probably bools /* 074 */ UnkStruct_PlayerGet_74 mUnk_74; - /* 08c */ UnkStruct_PlayerGet_8c mUnk_8c; - /* 090 */ unk32 *mUnk_90; - /* 094 */ unk32 mUnk_94; - /* 098 */ unk32 *mUnk_98; - /* 09c */ unk32 mUnk_9c; - /* 0a0 */ unk32 *mUnk_a0; - /* 0a4 */ unk32 mUnk_a4; - /* 0a8 */ unk32 *mUnk_a8; - /* 0ac */ unk32 mUnk_ac; - /* 0b0 */ unk32 *mUnk_b0; - /* 0b4 */ unk32 mUnk_b4; - /* 0b8 */ unk32 mUnk_b8; - /* 0bc */ unk32 mUnk_bc; - /* 0c0 */ unk32 mUnk_c0; - /* 0c4 */ unk32 mUnk_c4; - /* 0c8 */ unk32 mUnk_c8; - /* 0cc */ unk32 mUnk_cc; - /* 0d0 */ unk32 mUnk_d0; - /* 0d4 */ unk32 mUnk_d4; - /* 0d8 */ unk32 mUnk_d8; - /* 0dc */ unk32 mUnk_dc; - /* 0e0 */ unk32 mUnk_e0; - /* 0e4 */ unk32 mUnk_e4; - /* 0e8 */ unk32 mUnk_e8; + /* 08c */ UnkSystem4 mUnk_8c; /* 0ec */ UnkStruct_PlayerGet_ec mUnk_ec[4]; /* 0fc */ void *mUnk_fc; /* 100 */ diff --git a/include/Unknown/Common.hpp b/include/Unknown/Common.hpp index 1e008d89..db9d2729 100644 --- a/include/Unknown/Common.hpp +++ b/include/Unknown/Common.hpp @@ -867,3 +867,105 @@ struct UnkStruct_StackTitleScreen { void func_ov000_02059270(unk32 param1, char *param2, unk32 param3); void func_ov000_02059288(unk32 param1, char *param2, unk32 param3); }; + +typedef void (*UnkSystem4_UnkCallback)(void); + +class UnkSystem4_vfunc_1C_B4 { +public: + /* 00 */ unk32 mUnk_00; + /* 00 */ STRUCT_PAD(0x04, 0x4C); + /* 4C */ unk32 mUnk_4C; + /* 50 */ unk32 mUnk_50; + /* 54 */ unk32 mUnk_54; +}; + +class UnkSystem4_vfunc_1C { +public: + /* 00 */ u8 *mUnk_00; + /* 04 */ unk32 *mUnk_04; + /* 08 */ STRUCT_PAD(0x08, 0xB4); + /* B4 */ UnkSystem4_vfunc_1C_B4 *mUnk_B4; + /* 00 */ unk32 *mUnk_B8; +}; + +class UnkSystem4 { +public: + /* 00 (vtable) */ + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 *mUnk_08; + /* 0C */ unk32 mUnk_0C; + /* 10 */ unk32 *mUnk_10; + /* 14 */ unk32 mUnk_14; + /* 18 */ unk32 *mUnk_18; + /* 1C */ unk32 mUnk_1C; + /* 20 */ unk32 *mUnk_20; + /* 24 */ unk32 mUnk_24; + /* 28 */ unk32 *mUnk_28; + /* 2C */ unk32 mUnk_2C; + /* 30 */ unk32 mUnk_30; + /* 34 */ unk32 mUnk_34; + /* 38 */ unk32 mUnk_38; + /* 3C */ unk32 mUnk_3C; + /* 40 */ unk32 mUnk_40; + /* 44 */ unk32 mUnk_44; + /* 48 */ unk32 mUnk_48; + /* 4C */ unk32 mUnk_4C; + /* 50 */ unk32 mUnk_50; + /* 54 */ unk32 mUnk_54; + /* 58 */ unk32 mUnk_58; + /* 5C */ unk32 mUnk_5C; + /* 60 */ + + UnkSystem4(unk32 param1); // func_ov000_02057b54 + + // data_ov000_020b1a6c + /* 00 */ virtual ~UnkSystem4(); + /* 08 */ virtual void vfunc_08(unk32 param1); + /* 0C */ virtual void vfunc_0C(); + /* 10 */ virtual void vfunc_10(); + /* 14 */ virtual void vfunc_14(); + /* 18 */ virtual void vfunc_18(); + /* 1C */ virtual void vfunc_1C(UnkSystem4_vfunc_1C *param1); + /* 20 */ virtual void vfunc_20(); + + void func_ov000_02057c38(unk32 param1, unk32 param2); + void func_ov000_0209a7b8(void *param1, UnkSystem4_UnkCallback param2); +}; + +class UnkSystem5 { +public: + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + /* 0C */ unk32 mUnk_0C; + /* 10 */ unk32 mUnk_10; + /* 14 */ unk32 mUnk_14; + /* 18 */ unk32 mUnk_18; + /* 1C */ unk32 mUnk_1C; + /* 20 */ + + UnkSystem5(void *param1, unk32 param2); // func_ov000_0205778c + + void func_01ffc3b4(); + + void func_ov000_020577a4(unk32 param1, unk32 param2, unk32 param3); + void func_ov000_020577f8(unk32 param1); +}; + +// related to UnkSystem5? +class UnkSystem6 { +public: + /* 00 (vtable) */ + /* 04 */ + + UnkSystem6() {} + + // data_ov000_020b1968 + /* 00 */ virtual ~UnkSystem6(); + /* 08 */ virtual void vfunc_08(unk32 param1); + /* 0C */ virtual void vfunc_0C(); + /* 10 */ virtual void vfunc_10(); + /* 14 */ virtual void vfunc_14(Mat3p *param1, Vec3p *param2); + /* 18 */ virtual void vfunc_18(); + /* 1C */ +}; diff --git a/include/Unknown/UnkStruct_027e0998.hpp b/include/Unknown/UnkStruct_027e0998.hpp new file mode 100644 index 00000000..b0286a96 --- /dev/null +++ b/include/Unknown/UnkStruct_027e0998.hpp @@ -0,0 +1,18 @@ +#pragma once + +#include "global.h" +#include "nitro/math.h" +#include "types.h" + +class UnkStruct_027e0998 { +public: + /* 00 */ unk32 mUnk_00; + + UnkStruct_027e0998(); + ~UnkStruct_027e0998(); + + /* 00 */ virtual bool vfunc_00(Vec3p *pPos, void *param2, void *param3); + /* 04 */ +}; + +extern UnkStruct_027e0998 *data_027e0998; diff --git a/include/Unknown/UnkStruct_027e0cd8.hpp b/include/Unknown/UnkStruct_027e0cd8.hpp index 096ffed5..9d23e06d 100644 --- a/include/Unknown/UnkStruct_027e0cd8.hpp +++ b/include/Unknown/UnkStruct_027e0cd8.hpp @@ -80,6 +80,7 @@ public: /* 28 */ virtual q20 vfunc_28(Vec3p *param1, unk32 param2, unk32 param3); /* 2c */ virtual void vfunc_2c(); + q20 func_01ffedf4(Vec2b *pPos); unk32 func_ov000_02080180(void *param1); bool func_ov000_02080658(unk32 param1, UnkStruct_SceneChange1 *param2); void func_ov000_020808f4(void *param1, void *param2, unk32 param3); diff --git a/include/profile.hpp b/include/profile.hpp index 8bf4d60c..35ff9215 100644 --- a/include/profile.hpp +++ b/include/profile.hpp @@ -1,5 +1,10 @@ #pragma once +#define GET_PROFILE(T) (&ProfileInstance::sProfile) +#define GET_PROFILE_20(T) (&ProfileInstance::sProfile.mUnk_20) +#define GET_PROFILE_20_50(T) (ProfileInstance::sProfile.mUnk_20.mUnk_50) +#define GET_PROFILE_D4(T) (&ProfileInstance::sProfile.mUnk_D4) + #define DECL_PROFILE(T) \ T ProfileInstance::sProfile; \ T *T::GetProfile() { \ diff --git a/src/000_Second/Actor/ActorUnk_ov000_020a8bb0.cpp b/src/000_Second/Actor/ActorUnk_ov000_020a8bb0.cpp index a5a4b4ad..7a88bcf3 100644 --- a/src/000_Second/Actor/ActorUnk_ov000_020a8bb0.cpp +++ b/src/000_Second/Actor/ActorUnk_ov000_020a8bb0.cpp @@ -14,7 +14,7 @@ ARM void ActorUnk_ov000_020a8bb0::func_ov000_020a8ae0(q20 param1) { this->mVel.y = posY; } -ARM ActorUnk_ov000_020a8bb0::ActorUnk_ov000_020a8bb0(ActorUnk_ov000_020a8bb0_a4_00 *param1, unk32 param2) { +ARM ActorUnk_ov000_020a8bb0::ActorUnk_ov000_020a8bb0(UnkSystem4 *param1, unk32 param2) { unk32 uVar2; this->mUnk_0b0 = 0; diff --git a/src/000_Second/MapObject/MapObjectMiniBlocks.cpp b/src/000_Second/MapObject/MapObjectMiniBlocks.cpp new file mode 100644 index 00000000..02ce2328 --- /dev/null +++ b/src/000_Second/MapObject/MapObjectMiniBlocks.cpp @@ -0,0 +1,139 @@ +#include "MapObject/MapObjectMiniBlocks.hpp" +#include "System/SysNew.hpp" +#include "Unknown/UnkStruct_027e0cd8.hpp" + +extern "C" void func_01ff9638(void *, s16); + +enum { + MiniBlocksVariant_BLCM, + MiniBlocksVariant_BKCT, + MiniBlocksVariant_BLKF, + MiniBlocksVariant_Max, +}; + +static const u32 data_ov000_020af574[] = { + 'BLCM', + 'BKCT', + 'BLKF', +}; + +ARM DECL_PROFILE(MapObjectProfileMiniBlocks); + +ARM MapObject *MapObjectProfileMiniBlocks::Create() { + return new(HeapIndex_ITCM) MapObjectMiniBlocks(); +} + +ARM MapObjectProfileMiniBlocks::MapObjectProfileMiniBlocks() : + MapObjectProfile_Derived1(MapObjectId_MiniBlocks, -1, 0) { + this->mUnk_06 = -1; + this->mUnk_1E &= ~0x01; +} + +// https://decomp.me/scratch/euvAz +ARM MapObjectMiniBlocks::MapObjectMiniBlocks() : + mUnk_40() { + this->mUnk_44 = 0; + this->mUnk_48 = 1; +} + +ARM bool MapObjectMiniBlocks::vfunc_00(void) { + GET_PROFILE(MapObjectProfileMiniBlocks)->func_ov000_0209ccd8(this->mUnk_22, data_ov000_020af574[this->mUnk_22]); + UnkStruct_027e0cd8_0c *pUnkStruct_027e0cd8_0c = data_027e0cd8->mUnk_0c; + u8 uVar6; + + if (this->mUnk_22 != MiniBlocksVariant_BLKF) { + Vec2b vec(this->mUnk_3A.x, this->mUnk_3A.y); + this->mPos.y = pUnkStruct_027e0cd8_0c->func_01ffedf4(&vec); + } + + Vec3p vec(FLOAT_TO_Q20(0.0f), FLOAT_TO_Q20(0.0f), FLOAT_TO_Q20(0.0f)); + uVar6 = 0; + + switch (this->mUnk_20) { + case 4: + case 5: + case 6: + case 7: + uVar6 = 1; + break; + case 8: + case 9: + case 10: + case 11: + uVar6 = 2; + break; + default: + if (this->mUnk_22 == MiniBlocksVariant_BLKF) { + vec.x = FLOAT_TO_Q20(0.0f); + vec.y = FLOAT_TO_Q20(0.0f); + vec.z = -FLOAT_TO_Q20(0.375f); + } else { + vec.x = FLOAT_TO_Q20(0.0f); + vec.y = FLOAT_TO_Q20(0.0f); + vec.z = -FLOAT_TO_Q20(0.25f); + } + break; + } + + MapObjectProfile_Derived2_20_Base_50 *ptr = GET_PROFILE(MapObjectProfileMiniBlocks)->vfunc_1C(this->mUnk_22)->mUnk_50; + void *var_r1; + if (ptr != NULL) { + u16 *temp_r1 = (u16 *) ((u8 *) ptr + 8); + u32 *var_r0; + + if (temp_r1 != NULL && uVar6 < ptr->mUnk_09) { + u32 unk_0E = ptr->mUnk_0E; + u16 temp = *((u16 *) ((u8 *) temp_r1 + unk_0E)); + var_r0 = (u32 *) ((u8 *) temp_r1 + unk_0E + 4 + temp * uVar6); + } else { + var_r0 = NULL; + } + + if (var_r0 != NULL) { + var_r1 = (void *) ((u8 *) ptr + *var_r0); + goto next; + } + } + + var_r1 = NULL; + +next: + this->mUnk_40.vfunc_08((unk32) var_r1); + + unk32 var_r0_2; + unk32 var_r0; + switch (this->mUnk_20) { + case 1: + case 6: + case 8: + this->mUnk_14 = -0x8000; + break; + case 2: + case 7: + case 9: + this->mUnk_14 = 0x4000; + break; + case 3: + case 5: + case 11: + this->mUnk_14 = -0x4000; + break; + default: + this->mUnk_14 = 0; + break; + } + + func_01ff9638(&vec, -this->mUnk_14); + Vec3p_Add(&this->mPos, &vec, &this->mPos); + return true; +} + +ARM void MapObjectMiniBlocks::vfunc_14(void) { + Mat3p m; + u16 unk_14 = this->mUnk_14; + Mat3p_InitYRotation(&m, SIN(unk_14), COS(unk_14)); + this->mUnk_40.vfunc_14(&m, &this->mPos); +} + +ARM MapObjectMiniBlocks::~MapObjectMiniBlocks() {} +ARM MapObjectProfileMiniBlocks::~MapObjectProfileMiniBlocks() {} diff --git a/src/000_Second/MapObject/MapObjectSwitchStep.cpp b/src/000_Second/MapObject/MapObjectSwitchStep.cpp new file mode 100644 index 00000000..1514f40d --- /dev/null +++ b/src/000_Second/MapObject/MapObjectSwitchStep.cpp @@ -0,0 +1,252 @@ +#include "MapObject/MapObjectSwitchStep.hpp" +#include "System/SysNew.hpp" +#include "Unknown/UnkMemFuncs.h" +#include "Unknown/UnkStruct_0204af1c.hpp" +#include "Unknown/UnkStruct_027e0998.hpp" +#include "Unknown/UnkStruct_027e09a4.hpp" +#include "Unknown/UnkStruct_027e09a8.hpp" +#include "Unknown/UnkStruct_ov000_020b5214.hpp" + +extern "C" unk32 func_0200f218(unk32, const char *); + +static const char data_ov000_020af550[] = "switch"; +static const char data_ov000_020af560[] = "switchB"; + +UnkStruct_ov019_020d24c8_28_258_00 MapObjectSwitchStep_data_020b6118(0, 0); + +ARM DECL_PROFILE(MapObjectProfileSwitchStep); + +ARM MapObject *MapObjectProfileSwitchStep::Create() { + return new(HeapIndex_ITCM) MapObjectSwitchStep(); +} + +ARM MapObjectProfileSwitchStep::MapObjectProfileSwitchStep() : + MapObjectProfileSwitchStep_Base(MapObjectId_SwitchStep) { + this->mUnk_D4.mUnk_08 = 0x2DC04009; + + this->mUnk_E0.x = -FLOAT_TO_Q20(0.5f); + this->mUnk_E0.y = FLOAT_TO_Q20(0.0f); + this->mUnk_E0.z = -FLOAT_TO_Q20(0.5f); + + this->mUnk_EC.x = FLOAT_TO_Q20(0.5f); + this->mUnk_EC.y = FLOAT_TO_Q20(0.5f); + this->mUnk_EC.z = FLOAT_TO_Q20(0.5f); + + this->mUnk_06 = 1; + this->mUnk_0C = 0xC00; + this->mUnk_20.mUnk_15 = 1; +} + +ARM MapObjectSwitchStep_40::MapObjectSwitchStep_40(void) : + UnkSystem4(0) { + this->mUnk_60 = 0; + this->mUnk_62 = true; + this->func_ov000_0209dde0(); +} + +ARM void MapObjectSwitchStep_40::func_ov000_0209dde0(void) { + if (!this->mUnk_62) { + this->func_ov000_02057c38(2, 2); + return; + } + + this->func_ov000_02057c38(6, 2); +} + +ARM void MapObjectSwitchStep_40::vfunc_1C(UnkSystem4_vfunc_1C *param1) { + unk32 iVar1 = param1->mUnk_04[1]; + if (iVar1 != 0) { + iVar1 += 0x40; + } else { + iVar1 = 0; + } + + unk32 uVar2; + if (iVar1 == 0) { + uVar2 = -1; + } else { + uVar2 = func_0200f218(iVar1, data_ov000_020af560); + } + + if (param1->mUnk_00[1] == uVar2) { + if (this->mUnk_62) { + param1->mUnk_B4->mUnk_00 &= ~0x04; + param1->mUnk_B4->mUnk_50 = this->mUnk_60; + param1->mUnk_B4->mUnk_4C = 0; + param1->mUnk_B4->mUnk_54 = 0; + } else { + param1->mUnk_B8[0] = 0; + } + } +} + +ARM MapObjectSwitchStep::MapObjectSwitchStep() : + mUnk_A4(&mUnk_C4, 0) { + this->mUnk_E4 = 0; + this->mUnk_E6 = 0; + this->mUnk_E8 = 0; + this->mUnk_EA = 0; + this->mUnk_EB = 0; + + MapObjectProfile_Derived2_20_Base_50 *ptr = GET_PROFILE_20_50(MapObjectProfileSwitchStep); + void *var_r1; + if (ptr != NULL) { + u8 *temp_r1 = (u8 *) ptr + 8; + u32 *var_r0; + u8 zero = 0; + + if (temp_r1 != NULL && ptr->mUnk_09 > zero) { + var_r0 = (u32 *) (temp_r1 + ptr->mUnk_0E + 4); + } else { + var_r0 = NULL; + } + + if (var_r0 != NULL) { + var_r1 = (void *) ((u8 *) ptr + *var_r0); + goto end; + } + } + + var_r1 = NULL; + +end: + this->mUnk_40.vfunc_08((unk32) var_r1); + this->mUnk_A4.mUnk_00 = this->mUnk_40.mUnk_04; + + MapObjectProfile_Derived2_20 *temp_r6 = GET_PROFILE_20(MapObjectProfileSwitchStep); + unk32 temp_r5 = temp_r6->func_ov000_02058a24(); + this->mUnk_A4.func_ov000_020577a4(temp_r6->func_ov000_02058a84(3, data_ov000_020af550), temp_r5, 1); + + this->mUnk_10 = GET_PROFILE_D4(MapObjectProfileSwitchStep); +} + +ARM MapObjectSwitchStep::~MapObjectSwitchStep() { + if (this->mUnk_20 == 2) { + this->func_ov000_0209e11c(0, 1); + this->func_ov000_0209d2c4(0, 0); + } +} + +ARM bool MapObjectSwitchStep::vfunc_00(void) { + SET_FLAG(this->mFlags, MapObjFlag_9); + this->mUnk_18 = 1; + + SET_FLAG(this->mFlags, MapObjFlag_10); + this->mUnk_19 = 1; + + if (this->func_ov000_0209d29c(0)) { + this->func_ov000_0209e11c(2, 1); + } else { + this->func_ov000_0209e11c(0, 1); + } + + if (data_027e09a4->mSceneIndex >= SceneIndex_battle01 && data_027e09a4->mSceneIndex < SceneIndex_Max) { + MapObjectSwitchStep_data_020b6118.func_ov000_0205fc20(0x78, 0x0C, NULL, NULL); + SET_FLAG(this->mFlags, MapObjFlag_5); + } + + return true; +} + +ARM void MapObjectSwitchStep::func_ov000_0209e11c(unk32 param1, unk32 param2) { + this->mUnk_16 = param1; + this->mUnk_E6 = -1; + this->mUnk_E4 = 0; + this->mUnk_A4.func_01ffc3b4(); + + switch (this->mUnk_16) { + case 0: + if (param2 == 0) { + this->func_ov000_0209d2c4(0, 0); + data_027e09a8->func_ov000_02071b30(0x123, &this->mPos, 0); + } + + this->mUnk_40.mUnk_62 = 1; + this->mUnk_40.mUnk_60 = 0; + this->mUnk_A4.func_ov000_020577f8(0); + break; + case 1: + this->mUnk_E8 = 0; + data_027e09a8->func_ov000_02071b30(0x121, &this->mPos, 0); + this->mUnk_A4.func_ov000_020577f8(0); + this->func_ov000_0209e11c(2, 0); + break; + case 2: + this->mUnk_40.mUnk_60 = -0x19A; + this->func_ov000_0209d2c4(0, 1); + this->mUnk_40.mUnk_62 = 0; + + if (param2 == 0) { + data_027e09a8->func_ov000_02071b30(0x122, &this->mPos, 0); + } else { + this->mUnk_EA = 1; + } + + if (this->mUnk_20 == 2) { + this->mUnk_E6 = this->mUnk_22; + this->mUnk_E4 = 0; + } + + this->mUnk_A4.func_ov000_020577f8(0x1000); + break; + case 3: + this->func_ov000_0209d2c4(0, 0); + break; + default: + break; + } +} + +ARM void MapObjectSwitchStep::vfunc_20(void) { + switch (this->mUnk_16) { + case 1: + case 2: + case 3: + break; + default: + this->func_ov000_0209e11c(1, 0); + break; + } + + this->mUnk_EA = 1; +} + +struct stack_struct { + /* 00 */ unk16 mUnk_00; + /* 02 */ unk16 mUnk_02; + /* 04 */ unk8 mUnk_04; + /* 05 */ unk8 mUnk_05; + /* 06 */ u16 mUnk_06; + /* 08 */ +}; + +ARM void MapObjectSwitchStep::vfunc_18(void) { + if (!GET_FLAG(this->mFlags, MapObjFlag_5)) { + return; + } + + if (data_027e09a4->mSceneIndex >= SceneIndex_battle01 && data_027e09a4->mSceneIndex < SceneIndex_Max) { + unk32 sp10; + stack_struct sp8; + unk32 sp4; + + //! TODO: fake match? + sp4 = *(u32 *) &this->mUnk_38; + + if (data_027e0998->vfunc_00(&this->mPos, &sp10, &sp4)) { + sp8.mUnk_06 = 0x00; + MI_CpuFill32(0, &sp8, sizeof(sp8)); + sp8.mUnk_05 = -1; + sp8.mUnk_06 |= 0x01; + data_0204af1c.func_0201aa44(&MapObjectSwitchStep_data_020b6118, &sp10, 2, &sp8); + } + } +} + +ARM void MapObjectSwitchStep::func_ov000_0209e38c(void) { + if (this->mUnk_E6 - this->mUnk_E4 < 0x3C) { + data_ov000_020b5214.func_ov000_0206e7e8(0x92); + } else { + data_ov000_020b5214.func_ov000_0206e7e8(0x91); + } +} diff --git a/src/000_Second/MapObject/MapObjectUnkBLCM.cpp b/src/000_Second/MapObject/MapObjectUnkBLCM.cpp deleted file mode 100644 index f452c07a..00000000 --- a/src/000_Second/MapObject/MapObjectUnkBLCM.cpp +++ /dev/null @@ -1,21 +0,0 @@ -//! TODO: This file was generated automatically and might contain errors - -#include "MapObject/MapObjectUnkBLCM.hpp" -#include "System/SysNew.hpp" - -ARM DECL_PROFILE(MapObjectProfileUnkBLCM); - -ARM MapObject *MapObjectProfileUnkBLCM::Create() { - return new(HeapIndex_2) MapObjectUnkBLCM(); -} - -ARM MapObjectProfileUnkBLCM::MapObjectProfileUnkBLCM() : - MapObjectProfile(MapObjectId_BLCM) {} - -ARM MapObjectUnkBLCM::MapObjectUnkBLCM() {} - -ARM void MapObjectUnkBLCM::func_ov000_0209e4b0(void) {} -ARM void MapObjectUnkBLCM::func_ov000_0209e6ac(void) {} - -ARM MapObjectUnkBLCM::~MapObjectUnkBLCM() {} -ARM MapObjectProfileUnkBLCM::~MapObjectProfileUnkBLCM() {} diff --git a/src/000_Second/MapObject/MapObjectUnkSWST.cpp b/src/000_Second/MapObject/MapObjectUnkSWST.cpp deleted file mode 100644 index ad479b38..00000000 --- a/src/000_Second/MapObject/MapObjectUnkSWST.cpp +++ /dev/null @@ -1,29 +0,0 @@ -//! TODO: This file was generated automatically and might contain errors - -#include "MapObject/MapObjectUnkSWST.hpp" -#include "System/SysNew.hpp" - -ARM DECL_PROFILE(MapObjectProfileUnkSWST); - -ARM MapObject *MapObjectProfileUnkSWST::Create() { - return new(HeapIndex_2) MapObjectUnkSWST(); -} - -ARM MapObjectProfileUnkSWST::MapObjectProfileUnkSWST() : - MapObjectProfile(MapObjectId_SWST) {} - -ARM MapObjectUnkSWST::MapObjectUnkSWST() {} - -ARM void MapObjectUnkSWST::func_ov000_0209dda4(void) {} -ARM void MapObjectUnkSWST::func_ov000_0209dde0(void) {} -ARM void MapObjectUnkSWST::func_ov000_0209de10(void) {} -ARM void MapObjectUnkSWST::func_ov000_0209df9c(void) {} -ARM void MapObjectUnkSWST::func_ov000_0209e068(void) {} -ARM void MapObjectUnkSWST::func_ov000_0209e11c(void) {} -ARM void MapObjectUnkSWST::func_ov000_0209e280(void) {} -ARM void MapObjectUnkSWST::func_ov000_0209e2b4(void) {} -ARM void MapObjectUnkSWST::func_ov000_0209e38c(void) {} -ARM void MapObjectUnkSWST::func_ov000_0209e3c8(void) {} - -ARM MapObjectUnkSWST::~MapObjectUnkSWST() {} -ARM MapObjectProfileUnkSWST::~MapObjectProfileUnkSWST() {} diff --git a/src/110_PlayerGet/PlayerGet.cpp b/src/110_PlayerGet/PlayerGet.cpp index 6fe0010e..4f02343b 100644 --- a/src/110_PlayerGet/PlayerGet.cpp +++ b/src/110_PlayerGet/PlayerGet.cpp @@ -27,7 +27,7 @@ UnkStruct_02186240 data_ov110_02186240; extern "C" void func_ov000_0205ca74(unk32); extern "C" void func_01ffb6e4(unk32, const void *, void *); -extern "C" void func_01ffc5a0(UnkStruct_PlayerGet_8c *, unk32, u16, void *, unk32); +extern "C" void func_01ffc5a0(UnkSystem4 *, unk32, u16, void *, unk32); extern "C" void func_ov000_0208f820(); extern "C" unk32 func_ov024_020d5354(unk32 *, u16 *); extern "C" void func_ov000_02058fc4(unk32 *, UnkStruct_PlayerGet_74 *, Vec3p *); @@ -776,7 +776,7 @@ ARM void PlayerGet::vfunc_18(unk32 param1, unk32 param2, unk32 param3) { case 0x3A: break; case 0x3B: - if (param3 != 0 && this->mUnk_54.mItemId != ItemId_Nothing && this->mUnk_90 != 0) { + if (param3 != 0 && this->mUnk_54.mItemId != ItemId_Nothing && this->mUnk_8c.mUnk_04 != 0) { Vec3p_Add(this->mUnk_34, (Vec3p *) &data_ov110_021861ec.mUnk_00, &auStack_18); func_ov000_02058fc4(data_027e0958, &this->mUnk_74, &auStack_18); } diff --git a/src/112_PlayerSceneChange/PlayerSceneChange.cpp b/src/112_PlayerSceneChange/PlayerSceneChange.cpp index e1b3f13e..5fb3d93f 100644 --- a/src/112_PlayerSceneChange/PlayerSceneChange.cpp +++ b/src/112_PlayerSceneChange/PlayerSceneChange.cpp @@ -69,7 +69,7 @@ extern q4 data_02041964[]; extern q4 data_0203f964[]; extern q4 data_0203feb0[]; extern "C" void func_01ffb714(Vec3p *, Vec3p *, void *); -extern "C" void func_01ff9638(void *, unk32); +extern "C" void func_01ff9638(void *, s16); extern "C" q20 func_01ffb800(void *); extern "C" void func_01ff9770(void *); extern "C" void func_ov000_02072fd0(void *); diff --git a/src/Main/UnkFileSystem.cpp b/src/Main/UnkFileSystem.cpp index 3518c569..beb67919 100644 --- a/src/Main/UnkFileSystem.cpp +++ b/src/Main/UnkFileSystem.cpp @@ -91,6 +91,7 @@ THUMB void *UnkFileSystem3::vfunc_08(unk32 param1) { return this->mpFile; } +// https://decomp.me/scratch/Y2SB8 THUMB UnkFileSystem2::UnkFileSystem2(void *param1, unk32 param2) : UnkFileSystem1(param1) { this->mUnk_14 = param2; diff --git a/tools/configure.py b/tools/configure.py index cf60d163..7b48493d 100755 --- a/tools/configure.py +++ b/tools/configure.py @@ -155,8 +155,8 @@ config.libs = [ Object("000_Second/Actor/ActorEventIcon.cpp"), Object("000_Second/Actor/ActorUnkSWOB.cpp"), Object("000_Second/Actor/ActorUnkSWTM.cpp"), - Object("000_Second/MapObject/MapObjectUnkBLCM.cpp"), - Object("000_Second/MapObject/MapObjectUnkSWST.cpp"), + Object("000_Second/MapObject/MapObjectSwitchStep.cpp"), + Object("000_Second/MapObject/MapObjectMiniBlocks.cpp"), ] ), GameLib(