diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 55ee7923..50c175cf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -103,3 +103,7 @@ In order, the parts are: - Other methods, grouped by overlay with a comment indicating which one. Using `private` may sometime be required to enable some inlining, so feel free to when use it you feel like you should. + +## Report Summary + +To generate a report highlighting the changes, first run `ninja baseline_{version}` (where `{version}` is one of the supported versions) from the upstream/main branch, then checkout your branch and run `ninja changes_{version}`. diff --git a/config/eur/arm9/itcm/symbols.txt b/config/eur/arm9/itcm/symbols.txt index 4628684c..b5374378 100644 --- a/config/eur/arm9/itcm/symbols.txt +++ b/config/eur/arm9/itcm/symbols.txt @@ -157,7 +157,7 @@ _ZN18UnkStruct_027e09a46IsLandEv kind:function(arm,size=0x28) addr:0x01ffd3b0 _ZN18UnkStruct_027e09a47IsTrainEv kind:function(arm,size=0x28) addr:0x01ffd3d8 _ZNK18UnkStruct_027e09a421GetCurrentCourseEntryEv kind:function(arm,size=0x20) addr:0x01ffd400 _ZN18UnkStruct_027e09b813func_01ffd420Ev kind:function(arm,size=0x1c) addr:0x01ffd420 -func_01ffd43c kind:function(arm,size=0x60) addr:0x01ffd43c +_ZN21UnkStruct_027e09bc_0C13func_01ffd43cEP5Vec2sii kind:function(arm,size=0x60) addr:0x01ffd43c func_01ffd49c kind:function(arm,size=0x1a4) addr:0x01ffd49c _ZN21UnkStruct_027e09bc_0C13func_01ffd640EP7VecFx32 kind:function(arm,size=0x128) addr:0x01ffd640 func_01ffd768 kind:function(arm,size=0x138) addr:0x01ffd768 @@ -199,7 +199,7 @@ func_01fff280 kind:function(arm,size=0x28) addr:0x01fff280 func_01fff2a8 kind:function(arm,size=0x24) addr:0x01fff2a8 func_01fff2cc kind:function(arm,size=0x30) addr:0x01fff2cc _ZN12ActorManager13func_01fff2fcEPFvP5ActortEi kind:function(arm,size=0x54) addr:0x01fff2fc -_ZN12ActorManager13func_01fff350EPvPP5Actor kind:function(arm,size=0x64) addr:0x01fff350 +_ZN12ActorManager13func_01fff350EP29UnkStruct_ov000_020b3000_BasePP5Actor kind:function(arm,size=0x64) addr:0x01fff350 _ZN12ActorManager13func_01fff3b4E8ActorRef kind:function(arm,size=0x8c) addr:0x01fff3b4 func_01fff440 kind:function(arm,size=0x18) addr:0x01fff440 _ZN5Actor10GetActorIdEv kind:function(arm,size=0xc) addr:0x01fff458 diff --git a/config/eur/arm9/overlays/ov000/relocs.txt b/config/eur/arm9/overlays/ov000/relocs.txt index 11b71b14..6bb51275 100644 --- a/config/eur/arm9/overlays/ov000/relocs.txt +++ b/config/eur/arm9/overlays/ov000/relocs.txt @@ -3438,7 +3438,7 @@ from:0x02075688 kind:load to:0x027e0d3c module:dtcm from:0x0207568c kind:load to:0x027e0ce0 module:dtcm from:0x02075690 kind:load to:0x020b23cc module:overlay(0) from:0x02075694 kind:load to:0x027e0ce4 module:dtcm -from:0x02075698 kind:load to:0x020b3000 module:overlay(0) +from:0x02075698 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x020756a8 kind:arm_call to:0x020752b4 module:overlay(0) from:0x020756c4 kind:arm_call to:0x02075404 module:overlay(0) from:0x020756e0 kind:arm_call to:0x01fff3b4 module:itcm @@ -3842,7 +3842,7 @@ from:0x020798d4 kind:load to:0x027e0cdc module:dtcm from:0x020798d8 kind:load to:0x020b25b0 module:overlay(0) from:0x020798dc kind:load to:0x027e09a4 module:dtcm from:0x020798e0 kind:load to:0x027e0ce4 module:dtcm -from:0x020798e8 kind:load to:0x020b3000 module:overlay(0) +from:0x020798e8 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02079924 kind:load to:0x020b25b0 module:overlay(0) from:0x02079974 kind:arm_call to:0x02082a08 module:overlay(0) from:0x020799cc kind:arm_call to:0x01ffb714 module:itcm @@ -3978,7 +3978,7 @@ from:0x0207b3cc kind:arm_call to:0x020778e0 module:overlay(0) from:0x0207b400 kind:load to:0x027e0ce0 module:dtcm from:0x0207b404 kind:load to:0x027e09a4 module:dtcm from:0x0207b40c kind:load to:0x027e0ce4 module:dtcm -from:0x0207b414 kind:load to:0x020b3000 module:overlay(0) +from:0x0207b414 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0207b424 kind:load to:0x027e09bc module:dtcm from:0x0207b430 kind:arm_call to:0x02079308 module:overlay(0) from:0x0207b444 kind:arm_call to:0x02079308 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index d50d9dca..1875f1cd 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -456,7 +456,7 @@ _ZN23TitleScreenManager_Base8vfunc_44Ev kind:function(arm,size=0x4) addr:0x02061 func_ov000_02061040 kind:function(arm,size=0x44) addr:0x02061040 func_ov000_02061084 kind:function(arm,size=0x14) addr:0x02061084 _ZN18UnkStruct_0204a08819func_ov000_02061098Ev kind:function(arm,size=0x144) addr:0x02061098 -_ZN18UnkStruct_0204a08819func_ov000_020611dcEPvi kind:function(arm,size=0x20) addr:0x020611dc +_ZN18UnkStruct_0204a08819func_ov000_020611dcEP29FileSelectManager_UnkDrawBasei kind:function(arm,size=0x20) addr:0x020611dc _ZN18UnkStruct_0204a08819func_ov000_020611fcEi kind:function(arm,size=0x28) addr:0x020611fc _ZN18UnkStruct_0204a08819func_ov000_02061224Ev kind:function(arm,size=0xc) addr:0x02061224 _ZN18UnkStruct_0204a08819func_ov000_02061230Ev kind:function(arm,size=0xc) addr:0x02061230 @@ -469,14 +469,14 @@ _ZN29FileSelectManager_UnkDrawBaseC1Ev kind:function(arm,size=0x24) addr:0x02061 _ZN29FileSelectManager_UnkDrawBaseD1Ev kind:function(arm,size=0x18) addr:0x02061690 _ZN29FileSelectManager_UnkDrawBaseD0Ev kind:function(arm,size=0x20) addr:0x020616a8 _ZN29FileSelectManager_UnkDrawBaseD2Ev kind:function(arm,size=0x18) addr:0x020616c8 -_ZN29FileSelectManager_UnkDrawBase8vfunc_08Ei kind:function(arm,size=0x4) addr:0x020616e0 -_ZN29FileSelectManager_UnkDrawBase8vfunc_0CEi kind:function(arm,size=0x4) addr:0x020616e4 -_ZN29FileSelectManager_UnkDrawBase8vfunc_10Eii kind:function(arm,size=0x4) addr:0x020616e8 -_ZN29FileSelectManager_UnkDrawBase8vfunc_14Ei kind:function(arm,size=0x4) addr:0x020616ec -_ZN29FileSelectManager_UnkDrawBase8vfunc_18Ei kind:function(arm,size=0x4) addr:0x020616f0 -_ZN29FileSelectManager_UnkDrawBase8vfunc_1CEi kind:function(arm,size=0x4) addr:0x020616f4 -_ZN29FileSelectManager_UnkDrawBase8vfunc_20Eii kind:function(arm,size=0x4) addr:0x020616f8 -_ZN29FileSelectManager_UnkDrawBase8vfunc_24Ev kind:function(arm,size=0x4) addr:0x020616fc +_ZN29FileSelectManager_UnkDrawBase9vfunc2_08Ei kind:function(arm,size=0x4) addr:0x020616e0 +_ZN29FileSelectManager_UnkDrawBase9vfunc2_0CEi kind:function(arm,size=0x4) addr:0x020616e4 +_ZN29FileSelectManager_UnkDrawBase8vfunc_54Eii kind:function(arm,size=0x4) addr:0x020616e8 +_ZN29FileSelectManager_UnkDrawBase9vfunc2_14Ei kind:function(arm,size=0x4) addr:0x020616ec +_ZN29FileSelectManager_UnkDrawBase9vfunc2_18Ei kind:function(arm,size=0x4) addr:0x020616f0 +_ZN29FileSelectManager_UnkDrawBase8vfunc_5CEi kind:function(arm,size=0x4) addr:0x020616f4 +_ZN29FileSelectManager_UnkDrawBase8vfunc_58Eii kind:function(arm,size=0x4) addr:0x020616f8 +_ZN29FileSelectManager_UnkDrawBase8vfunc_60Ev kind:function(arm,size=0x4) addr:0x020616fc _ZN23UnkStruct_027e0998_BaseC2Ev kind:function(thumb,size=0x24) addr:0x02061700 _ZN23UnkStruct_027e0998_BaseC1Ev kind:function(thumb,size=0x24) addr:0x02061724 func_ov000_02061748 kind:function(thumb,size=0x16) addr:0x02061748 @@ -862,7 +862,7 @@ func_ov000_0206bb30 kind:function(arm,size=0xcc) addr:0x0206bb30 _ZN24UnkStruct_ov000_020b51b819func_ov000_0206bbfcEi kind:function(arm,size=0x18) addr:0x0206bbfc func_ov000_0206bc14 kind:function(arm,size=0xe4) addr:0x0206bc14 func_ov000_0206bcf8 kind:function(arm,size=0xdc) addr:0x0206bcf8 -func_ov000_0206bdd4 kind:function(arm,size=0x10) addr:0x0206bdd4 +_ZN24UnkStruct_ov000_020b51b819func_ov000_0206bdd4EP15PlayerLinkActor kind:function(arm,size=0x10) addr:0x0206bdd4 func_ov000_0206bde4 kind:function(arm,size=0xe8) addr:0x0206bde4 func_ov000_0206becc kind:function(arm,size=0x60) addr:0x0206becc func_ov000_0206bf2c kind:function(arm,size=0x10) addr:0x0206bf2c @@ -936,8 +936,8 @@ func_ov000_0206e9f8 kind:function(arm,size=0x60) addr:0x0206e9f8 func_ov000_0206ea58 kind:function(arm,size=0x100) addr:0x0206ea58 func_ov000_0206eb58 kind:function(arm,size=0xd0) addr:0x0206eb58 func_ov000_0206ec28 kind:function(arm,size=0xf4) addr:0x0206ec28 -func_ov000_0206ed1c kind:function(arm,size=0xbc) addr:0x0206ed1c -func_ov000_0206edd8 kind:function(arm,size=0x160) addr:0x0206edd8 +_ZN24UnkStruct_ov000_020b521419func_ov000_0206ed1cEP15PlayerLinkActor kind:function(arm,size=0xbc) addr:0x0206ed1c +_ZN24UnkStruct_ov000_020b521419func_ov000_0206edd8EP15PlayerLinkActor kind:function(arm,size=0x160) addr:0x0206edd8 func_ov000_0206ef38 kind:function(arm,size=0xb0) addr:0x0206ef38 func_ov000_0206efe8 kind:function(arm,size=0x26c) addr:0x0206efe8 func_ov000_0206f254 kind:function(arm,size=0x8c) addr:0x0206f254 @@ -2671,7 +2671,7 @@ func_ov000_0209fe84 kind:function(arm,size=0x1c) addr:0x0209fe84 func_ov000_0209fea0 kind:function(arm,size=0xc) addr:0x0209fea0 _ZN18UnkStruct_027e0cec19func_ov000_0209feacEiP7VecFx32iii kind:function(arm,size=0x78) addr:0x0209feac _ZN18UnkStruct_027e0cec19func_ov000_0209ff24EiP7VecFx32P7VecFx16i kind:function(arm,size=0x28) addr:0x0209ff24 -func_ov000_0209ff4c kind:function(arm,size=0x40) addr:0x0209ff4c +_ZN18UnkStruct_027e0cec19func_ov000_0209ff4cEiP7VecFx3214UnkAngleStructi kind:function(arm,size=0x40) addr:0x0209ff4c _ZN18UnkStruct_027e0cec19func_ov000_0209ff8cEP22UnkStruct_PlayerGet_eciP7VecFx32i kind:function(arm,size=0x74) addr:0x0209ff8c func_ov000_020a0000 kind:function(arm,size=0xa0) addr:0x020a0000 func_ov000_020a00a0 kind:function(arm,size=0x34) addr:0x020a00a0 @@ -3650,7 +3650,7 @@ _ZTV19data_ov000_020b2fb4 kind:data(any) addr:0x020b2fb4 data_ov000_020b2fdc kind:data(any) addr:0x020b2fdc data_ov000_020b2fe8 kind:data(any) addr:0x020b2fe8 data_ov000_020b2ff4 kind:data(any) addr:0x020b2ff4 -data_ov000_020b3000 kind:data(any) addr:0x020b3000 +_ZTV24UnkStruct_ov000_020b3000 kind:data(any) addr:0x020b2ff8 data_ov000_020b300c kind:data(any) addr:0x020b300c data_ov000_020b3018 kind:data(any) addr:0x020b3018 data_ov000_020b303c kind:data(any) addr:0x020b303c diff --git a/config/eur/arm9/overlays/ov001/relocs.txt b/config/eur/arm9/overlays/ov001/relocs.txt index 40f622cc..511f4cc1 100644 --- a/config/eur/arm9/overlays/ov001/relocs.txt +++ b/config/eur/arm9/overlays/ov001/relocs.txt @@ -1141,7 +1141,7 @@ from:0x020bba68 kind:load to:0x02043e50 module:main from:0x020bba82 kind:thumb_call_arm to:0x01fff350 module:itcm from:0x020bba9c kind:thumb_call_arm to:0x020984f0 module:overlay(0) from:0x020bbaa6 kind:thumb_call_arm to:0x01fff350 module:itcm -from:0x020bbab8 kind:load to:0x020b3000 module:overlay(0) +from:0x020bbab8 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x020bbac0 kind:load to:0x027e0ce4 module:dtcm from:0x020bbae4 kind:thumb_call_arm to:0x02011f3c module:main from:0x020bbaee kind:thumb_call to:0x02057750 module:overlay(0) @@ -1508,7 +1508,7 @@ from:0x020bd48c kind:thumb_call_arm to:0x020921e4 module:overlay(0) from:0x020bd494 kind:load to:0x027e09a4 module:dtcm from:0x020bd498 kind:load to:0x020d8660 module:overlay(24) from:0x020bd49c kind:load to:0x020aa88c add:0x4 module:overlay(0) -from:0x020bd4a0 kind:load to:0x020b3000 module:overlay(0) +from:0x020bd4a0 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x020bd4a4 kind:load to:0x027e0ce4 module:dtcm from:0x020bd4ac kind:load to:0x027e09b8 module:dtcm from:0x020bd4c4 kind:thumb_call_arm to:0x02011f3c module:main diff --git a/config/eur/arm9/overlays/ov017/symbols.txt b/config/eur/arm9/overlays/ov017/symbols.txt index 2bbcc9f1..d236cc26 100644 --- a/config/eur/arm9/overlays/ov017/symbols.txt +++ b/config/eur/arm9/overlays/ov017/symbols.txt @@ -15,8 +15,8 @@ func_ov017_020bc5fc kind:function(arm,size=0x44) addr:0x020bc5fc func_ov017_020bc640 kind:function(arm,size=0x31c) addr:0x020bc640 func_ov017_020bc95c kind:function(arm,size=0xe4) addr:0x020bc95c func_ov017_020bca40 kind:function(arm,size=0x3a8) addr:0x020bca40 -func_ov017_020bcde8 kind:function(arm,size=0x4b8) addr:0x020bcde8 -func_ov017_020bd2a0 kind:function(arm,size=0x48) addr:0x020bd2a0 +_ZN21UnkStruct_027e0ce0_4019func_ov017_020bcde8EiP11ItemManager kind:function(arm,size=0x4b8) addr:0x020bcde8 +_ZN11ItemManager19func_ov017_020bd2a0Eii kind:function(arm,size=0x48) addr:0x020bd2a0 func_ov017_020bd2e8 kind:function(arm,size=0x18) addr:0x020bd2e8 func_ov017_020bd300 kind:function(arm,size=0x178) addr:0x020bd300 func_ov017_020bd478 kind:function(arm,size=0x28) addr:0x020bd478 @@ -29,15 +29,15 @@ _ZN18UnkStruct_027e0ce019func_ov017_020bd69cEv kind:function(arm,size=0x1c) addr func_ov017_020bd6b8 kind:function(arm,size=0x28) addr:0x020bd6b8 func_ov017_020bd6e0 kind:function(arm,size=0x78) addr:0x020bd6e0 func_ov017_020bd758 kind:function(arm,size=0x30) addr:0x020bd758 -func_ov017_020bd788 kind:function(arm,size=0x56c) addr:0x020bd788 -func_ov017_020bdcf4 kind:function(arm,size=0x90) addr:0x020bdcf4 -func_ov017_020bdd84 kind:function(arm,size=0x1c4) addr:0x020bdd84 -func_ov017_020bdf48 kind:function(arm,size=0x150) addr:0x020bdf48 +_ZN15PlayerLinkActor19func_ov017_020bd788Ei kind:function(arm,size=0x56c) addr:0x020bd788 +_ZN15PlayerLinkActor19func_ov017_020bdcf4Ev kind:function(arm,size=0x90) addr:0x020bdcf4 +_ZN15PlayerLinkActor19func_ov017_020bdd84Eii kind:function(arm,size=0x1c4) addr:0x020bdd84 +_ZN15PlayerLinkActor19func_ov017_020bdf48Eiiii kind:function(arm,size=0x150) addr:0x020bdf48 func_ov017_020be098 kind:function(arm,size=0x10) addr:0x020be098 func_ov017_020be0a8 kind:function(arm,size=0x38) addr:0x020be0a8 func_ov017_020be0e0 kind:function(arm,size=0x20c) addr:0x020be0e0 func_ov017_020be2ec kind:function(arm,size=0x148) addr:0x020be2ec -func_ov017_020be434 kind:function(arm,size=0x18) addr:0x020be434 +_ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov017_020be434Ev kind:function(arm,size=0x18) addr:0x020be434 func_ov017_020be44c kind:function(arm,size=0x45c) addr:0x020be44c func_ov017_020be8a8 kind:function(arm,size=0x124) addr:0x020be8a8 _ZN12CargoManager8DoUpdateEv kind:function(arm,size=0x18) addr:0x020be9cc diff --git a/config/eur/arm9/overlays/ov019/symbols.txt b/config/eur/arm9/overlays/ov019/symbols.txt index 88b1eb10..94267157 100644 --- a/config/eur/arm9/overlays/ov019/symbols.txt +++ b/config/eur/arm9/overlays/ov019/symbols.txt @@ -215,24 +215,24 @@ _ZN19FileSelectSubScreenD1Ev kind:function(arm,size=0xec) addr:0x020cfb28 _ZN21FileSelectManager_160C1EP23GameModeManagerBase_104P14FileSelectMain kind:function(arm,size=0x54) addr:0x020cfc14 _ZN21FileSelectManager_160D1Ev kind:function(arm,size=0x14) addr:0x020cfc68 _ZN21FileSelectManager_160D0Ev kind:function(arm,size=0x1c) addr:0x020cfc7c -_ZN21FileSelectManager_1608vfunc_08Ei kind:function(arm,size=0x50) addr:0x020cfc98 -_ZN21FileSelectManager_1608vfunc_0CEi kind:function(arm,size=0x64) addr:0x020cfce8 -_ZN21FileSelectManager_1608vfunc_14Ei kind:function(arm,size=0x4) addr:0x020cfd4c -_ZN21FileSelectManager_1608vfunc_10Eii kind:function(arm,size=0x8c) addr:0x020cfd50 -_ZN21FileSelectManager_1608vfunc_18Ei kind:function(arm,size=0x10) addr:0x020cfddc -_ZN21FileSelectManager_1608vfunc_1CEi kind:function(arm,size=0x64) addr:0x020cfdec -_ZN21FileSelectManager_1608vfunc_20Eii kind:function(arm,size=0xac) addr:0x020cfe50 -_ZN21FileSelectManager_1608vfunc_24Ev kind:function(arm,size=0x34) addr:0x020cfefc +_ZN21FileSelectManager_1609vfunc2_08Ei kind:function(arm,size=0x50) addr:0x020cfc98 +_ZN21FileSelectManager_1609vfunc2_0CEi kind:function(arm,size=0x64) addr:0x020cfce8 +_ZN21FileSelectManager_1609vfunc2_14Ei kind:function(arm,size=0x4) addr:0x020cfd4c +_ZN21FileSelectManager_1608vfunc_54Eii kind:function(arm,size=0x8c) addr:0x020cfd50 +_ZN21FileSelectManager_1609vfunc2_18Ei kind:function(arm,size=0x10) addr:0x020cfddc +_ZN21FileSelectManager_1608vfunc_5CEi kind:function(arm,size=0x64) addr:0x020cfdec +_ZN21FileSelectManager_1608vfunc_58Eii kind:function(arm,size=0xac) addr:0x020cfe50 +_ZN21FileSelectManager_1608vfunc_60Ev kind:function(arm,size=0x34) addr:0x020cfefc _ZN21FileSelectManager_164C1EP23GameModeManagerBase_104P14FileSelectMain kind:function(arm,size=0x4c) addr:0x020cff30 _ZN21FileSelectManager_164D1Ev kind:function(arm,size=0x3c) addr:0x020cff7c _ZN21FileSelectManager_164D0Ev kind:function(arm,size=0x44) addr:0x020cffb8 -_ZN21FileSelectManager_1648vfunc_08Ei kind:function(arm,size=0x50) addr:0x020cfffc -_ZN21FileSelectManager_1648vfunc_0CEi kind:function(arm,size=0x90) addr:0x020d004c -_ZN21FileSelectManager_1648vfunc_14Ei kind:function(arm,size=0x4) addr:0x020d00dc -_ZN21FileSelectManager_1648vfunc_10Eii kind:function(arm,size=0xa8) addr:0x020d00e0 -_ZN21FileSelectManager_1648vfunc_18Ei kind:function(arm,size=0x38) addr:0x020d0188 -_ZN21FileSelectManager_1648vfunc_1CEi kind:function(arm,size=0xa4) addr:0x020d01c0 -_ZN21FileSelectManager_1648vfunc_20Eii kind:function(arm,size=0x90) addr:0x020d0264 +_ZN21FileSelectManager_1649vfunc2_08Ei kind:function(arm,size=0x50) addr:0x020cfffc +_ZN21FileSelectManager_1649vfunc2_0CEi kind:function(arm,size=0x90) addr:0x020d004c +_ZN21FileSelectManager_1649vfunc2_14Ei kind:function(arm,size=0x4) addr:0x020d00dc +_ZN21FileSelectManager_1648vfunc_54Eii kind:function(arm,size=0xa8) addr:0x020d00e0 +_ZN21FileSelectManager_1649vfunc2_18Ei kind:function(arm,size=0x38) addr:0x020d0188 +_ZN21FileSelectManager_1648vfunc_5CEi kind:function(arm,size=0xa4) addr:0x020d01c0 +_ZN21FileSelectManager_1648vfunc_58Eii kind:function(arm,size=0x90) addr:0x020d0264 _ZN21FileSelectManager_16419func_ov019_020d02f4Ev kind:function(arm,size=0x28) addr:0x020d02f4 _ZN25UnkSystem1_ov019_Derived2C1Ev kind:function(arm,size=0x40) addr:0x020d031c _ZN25UnkSystem1_ov019_Derived28vfunc_08Ei kind:function(arm,size=0x48) addr:0x020d035c diff --git a/config/eur/arm9/overlays/ov024/relocs.txt b/config/eur/arm9/overlays/ov024/relocs.txt index 33bb7b8d..f22568c0 100644 --- a/config/eur/arm9/overlays/ov024/relocs.txt +++ b/config/eur/arm9/overlays/ov024/relocs.txt @@ -72,7 +72,7 @@ from:0x020c4c4c kind:arm_call to:0x020730ac module:overlay(0) from:0x020c4ca0 kind:arm_call to:0x02073470 module:overlay(0) from:0x020c4cb8 kind:load to:0x020d8698 module:overlay(24) from:0x020c4cbc kind:load to:0x027e0ce4 module:dtcm -from:0x020c4cc0 kind:load to:0x020b3000 module:overlay(0) +from:0x020c4cc0 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x020c4cc4 kind:load to:0x027e09b8 module:dtcm from:0x020c4d14 kind:arm_call to:0x01ffd3d8 module:itcm from:0x020c4d38 kind:arm_call to:0x02019538 module:main @@ -2515,7 +2515,7 @@ from:0x020d72a0 kind:load to:0x027e0cd8 module:dtcm from:0x020d72a4 kind:load to:0x027e09a4 module:dtcm from:0x020d72a8 kind:load to:0x027e0ce0 module:dtcm from:0x020d72ac kind:load to:0x027e0ce4 module:dtcm -from:0x020d72b4 kind:load to:0x020b3000 module:overlay(0) +from:0x020d72b4 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x020d72c8 kind:arm_call to:0x0209fb18 module:overlay(0) from:0x020d72d0 kind:arm_call to:0x02098488 module:overlay(0) from:0x020d72e8 kind:arm_call to:0x0209fb18 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov024/symbols.txt b/config/eur/arm9/overlays/ov024/symbols.txt index 8feeb0f6..57d90e4e 100644 --- a/config/eur/arm9/overlays/ov024/symbols.txt +++ b/config/eur/arm9/overlays/ov024/symbols.txt @@ -143,16 +143,16 @@ _ZN24AdventureModeManager_160C1EP23GameModeManagerBase_104P24AdventureModeManage _ZN27AdventureModeManager_160_4CD1Ev kind:function(arm,size=0x14) addr:0x020c7a00 _ZN24AdventureModeManager_160D1Ev kind:function(arm,size=0x30) addr:0x020c7a14 _ZN24AdventureModeManager_160D0Ev kind:function(arm,size=0x38) addr:0x020c7a44 -_ZN24AdventureModeManager_1608vfunc_08Ei kind:function(arm,size=0x9c) addr:0x020c7a7c -_ZN24AdventureModeManager_1608vfunc_0CEi kind:function(arm,size=0x1a0) addr:0x020c7b18 -_ZN24AdventureModeManager_1608vfunc_10Eii kind:function(arm,size=0x24) addr:0x020c7cb8 -_ZN24AdventureModeManager_1608vfunc_14Ei kind:function(arm,size=0x20) addr:0x020c7cdc +_ZN24AdventureModeManager_1609vfunc2_08Ei kind:function(arm,size=0x9c) addr:0x020c7a7c +_ZN24AdventureModeManager_1609vfunc2_0CEi kind:function(arm,size=0x1a0) addr:0x020c7b18 +_ZN24AdventureModeManager_1608vfunc_54Eii kind:function(arm,size=0x24) addr:0x020c7cb8 +_ZN24AdventureModeManager_1609vfunc2_14Ei kind:function(arm,size=0x20) addr:0x020c7cdc _ZN24AdventureModeManager_16019func_ov024_020c7cfcEv kind:function(arm,size=0x50) addr:0x020c7cfc _ZN24AdventureModeManager_16019func_ov024_020c7d4cEi kind:function(arm,size=0xf0) addr:0x020c7d4c -_ZN24AdventureModeManager_1608vfunc_18Ei kind:function(arm,size=0x118) addr:0x020c7e3c -_ZN24AdventureModeManager_1608vfunc_1CEi kind:function(arm,size=0x36c) addr:0x020c7f54 -_ZN24AdventureModeManager_1608vfunc_20Eii kind:function(arm,size=0xf8) addr:0x020c82c0 -_ZN24AdventureModeManager_1608vfunc_24Ev kind:function(arm,size=0x4) addr:0x020c83b8 +_ZN24AdventureModeManager_1609vfunc2_18Ei kind:function(arm,size=0x118) addr:0x020c7e3c +_ZN24AdventureModeManager_1608vfunc_5CEi kind:function(arm,size=0x36c) addr:0x020c7f54 +_ZN24AdventureModeManager_1608vfunc_58Eii kind:function(arm,size=0xf8) addr:0x020c82c0 +_ZN24AdventureModeManager_1608vfunc_60Ev kind:function(arm,size=0x4) addr:0x020c83b8 _ZN24AdventureModeManager_16019func_ov024_020c83bcEv kind:function(arm,size=0x6c) addr:0x020c83bc _ZN24AdventureModeManager_16019func_ov024_020c8428Ev kind:function(arm,size=0x2c) addr:0x020c8428 _ZN24AdventureModeManager_16019func_ov024_020c8454Ev kind:function(arm,size=0x30) addr:0x020c8454 @@ -165,11 +165,11 @@ _ZN24AdventureModeManager_170C1EP23GameModeManagerBase_104 kind:function(arm,siz _ZN27AdventureModeManager_170_14D1Ev kind:function(arm,size=0x14) addr:0x020c8630 _ZN24AdventureModeManager_170D1Ev kind:function(arm,size=0x20) addr:0x020c8644 _ZN24AdventureModeManager_170D0Ev kind:function(arm,size=0x28) addr:0x020c8664 -_ZN24AdventureModeManager_1708vfunc_08Ei kind:function(arm,size=0x38) addr:0x020c868c -_ZN24AdventureModeManager_1708vfunc_0CEi kind:function(arm,size=0x74) addr:0x020c86c4 -_ZN24AdventureModeManager_1708vfunc_10Eii kind:function(arm,size=0xd4) addr:0x020c8738 -_ZN24AdventureModeManager_1708vfunc_18Ei kind:function(arm,size=0xc) addr:0x020c880c -_ZN24AdventureModeManager_1708vfunc_24Ev kind:function(arm,size=0x2c) addr:0x020c8818 +_ZN24AdventureModeManager_1709vfunc2_08Ei kind:function(arm,size=0x38) addr:0x020c868c +_ZN24AdventureModeManager_1709vfunc2_0CEi kind:function(arm,size=0x74) addr:0x020c86c4 +_ZN24AdventureModeManager_1708vfunc_54Eii kind:function(arm,size=0xd4) addr:0x020c8738 +_ZN24AdventureModeManager_1709vfunc2_18Ei kind:function(arm,size=0xc) addr:0x020c880c +_ZN24AdventureModeManager_1708vfunc_60Ev kind:function(arm,size=0x2c) addr:0x020c8818 _ZN27AdventureModeManager_170_14D0Ev kind:function(arm,size=0x1c) addr:0x020c8844 _ZN32AdventureModeManager_174_Base_108vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020c8860 _ZN32AdventureModeManager_174_Base_108vfunc_10Ev kind:function(thumb,size=0x10) addr:0x020c8870 @@ -181,25 +181,25 @@ _ZN32AdventureModeManager_174_Base_10D0Ev kind:function(arm,size=0x1c) addr:0x02 _ZN29AdventureModeManager_174_BaseD1Ev kind:function(arm,size=0x20) addr:0x020c8d1c _ZN29AdventureModeManager_174_BaseD0Ev kind:function(arm,size=0x28) addr:0x020c8d3c _ZN24AdventureModeManager_174C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x2c) addr:0x020c8d64 -_ZN24AdventureModeManager_1748vfunc_08Ei kind:function(thumb,size=0x58) addr:0x020c8d90 -_ZN24AdventureModeManager_1748vfunc_0CEi kind:function(thumb,size=0x48) addr:0x020c8de8 -_ZN24AdventureModeManager_1748vfunc_10Eii kind:function(thumb,size=0xac) addr:0x020c8e30 -_ZN24AdventureModeManager_1748vfunc_18Ei kind:function(thumb,size=0x6c) addr:0x020c8edc -_ZN24AdventureModeManager_1748vfunc_1CEi kind:function(thumb,size=0x40) addr:0x020c8f48 -_ZN24AdventureModeManager_1748vfunc_20Eii kind:function(thumb,size=0xc0) addr:0x020c8f88 -_ZN24AdventureModeManager_1748vfunc_24Ev kind:function(thumb,size=0x2) addr:0x020c9048 +_ZN24AdventureModeManager_1749vfunc2_08Ei kind:function(thumb,size=0x58) addr:0x020c8d90 +_ZN24AdventureModeManager_1749vfunc2_0CEi kind:function(thumb,size=0x48) addr:0x020c8de8 +_ZN24AdventureModeManager_1748vfunc_54Eii kind:function(thumb,size=0xac) addr:0x020c8e30 +_ZN24AdventureModeManager_1749vfunc2_18Ei kind:function(thumb,size=0x6c) addr:0x020c8edc +_ZN24AdventureModeManager_1748vfunc_5CEi kind:function(thumb,size=0x40) addr:0x020c8f48 +_ZN24AdventureModeManager_1748vfunc_58Eii kind:function(thumb,size=0xc0) addr:0x020c8f88 +_ZN24AdventureModeManager_1748vfunc_60Ev kind:function(thumb,size=0x2) addr:0x020c9048 _ZN24AdventureModeManager_174D1Ev kind:function(arm,size=0x20) addr:0x020c904c _ZN24AdventureModeManager_174D0Ev kind:function(arm,size=0x28) addr:0x020c906c _ZN29AdventureModeManager_178_BaseC2EP23GameModeManagerBase_104 kind:function(thumb,size=0x14) addr:0x020c9094 -_ZN29AdventureModeManager_178_Base8vfunc_08Ei kind:function(thumb,size=0x2c) addr:0x020c90a8 -_ZN29AdventureModeManager_178_Base8vfunc_0CEi kind:function(thumb,size=0x1c) addr:0x020c90d4 -_ZN29AdventureModeManager_178_Base8vfunc_18Ei kind:function(thumb,size=0x2c) addr:0x020c90f0 -_ZN29AdventureModeManager_178_Base8vfunc_1CEi kind:function(thumb,size=0x1c) addr:0x020c911c +_ZN29AdventureModeManager_178_Base9vfunc2_08Ei kind:function(thumb,size=0x2c) addr:0x020c90a8 +_ZN29AdventureModeManager_178_Base9vfunc2_0CEi kind:function(thumb,size=0x1c) addr:0x020c90d4 +_ZN29AdventureModeManager_178_Base9vfunc2_18Ei kind:function(thumb,size=0x2c) addr:0x020c90f0 +_ZN29AdventureModeManager_178_Base8vfunc_5CEi kind:function(thumb,size=0x1c) addr:0x020c911c _ZN29AdventureModeManager_178_BaseD1Ev kind:function(arm,size=0x20) addr:0x020c9138 _ZN29AdventureModeManager_178_BaseD0Ev kind:function(arm,size=0x28) addr:0x020c9158 _ZN24AdventureModeManager_178C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x2c) addr:0x020c9180 -_ZN24AdventureModeManager_1788vfunc_10Eii kind:function(thumb,size=0x24) addr:0x020c91ac -_ZN24AdventureModeManager_1788vfunc_20Eii kind:function(thumb,size=0x24) addr:0x020c91d0 +_ZN24AdventureModeManager_1788vfunc_54Eii kind:function(thumb,size=0x24) addr:0x020c91ac +_ZN24AdventureModeManager_1788vfunc_58Eii kind:function(thumb,size=0x24) addr:0x020c91d0 _ZN24AdventureModeManager_178D1Ev kind:function(arm,size=0x20) addr:0x020c91f4 _ZN24AdventureModeManager_178D0Ev kind:function(arm,size=0x28) addr:0x020c9214 _ZN27AdventureModeManager_180_188vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020c923c @@ -207,29 +207,29 @@ _ZN24AdventureModeManager_180C1EP23GameModeManagerBase_104 kind:function(thumb,s _ZN27AdventureModeManager_180_18D1Ev kind:function(thumb,size=0xc) addr:0x020c929c _ZN24AdventureModeManager_180D1Ev kind:function(thumb,size=0x14) addr:0x020c92a8 _ZN24AdventureModeManager_180D0Ev kind:function(thumb,size=0x1a) addr:0x020c92bc -_ZN24AdventureModeManager_1808vfunc_08Ei kind:function(thumb,size=0x64) addr:0x020c92d8 -_ZN24AdventureModeManager_1808vfunc_0CEi kind:function(thumb,size=0x90) addr:0x020c933c -_ZN24AdventureModeManager_1808vfunc_10Eii kind:function(thumb,size=0x64) addr:0x020c93cc +_ZN24AdventureModeManager_1809vfunc2_08Ei kind:function(thumb,size=0x64) addr:0x020c92d8 +_ZN24AdventureModeManager_1809vfunc2_0CEi kind:function(thumb,size=0x90) addr:0x020c933c +_ZN24AdventureModeManager_1808vfunc_54Eii kind:function(thumb,size=0x64) addr:0x020c93cc _ZN24AdventureModeManager_18019func_ov024_020c9430Eii kind:function(thumb,size=0x24) addr:0x020c9430 -_ZN24AdventureModeManager_1808vfunc_18Ei kind:function(thumb,size=0x30) addr:0x020c9454 -_ZN24AdventureModeManager_1808vfunc_1CEi kind:function(thumb,size=0x78) addr:0x020c9484 -_ZN24AdventureModeManager_1808vfunc_20Eii kind:function(thumb,size=0x7c) addr:0x020c94fc -_ZN24AdventureModeManager_1808vfunc_24Ev kind:function(thumb,size=0x2) addr:0x020c9578 +_ZN24AdventureModeManager_1809vfunc2_18Ei kind:function(thumb,size=0x30) addr:0x020c9454 +_ZN24AdventureModeManager_1808vfunc_5CEi kind:function(thumb,size=0x78) addr:0x020c9484 +_ZN24AdventureModeManager_1808vfunc_58Eii kind:function(thumb,size=0x7c) addr:0x020c94fc +_ZN24AdventureModeManager_1808vfunc_60Ev kind:function(thumb,size=0x2) addr:0x020c9578 _ZN24AdventureModeManager_18019func_ov024_020c957cEv kind:function(thumb,size=0x48) addr:0x020c957c _ZN24AdventureModeManager_18019func_ov024_020c95c4Ev kind:function(thumb,size=0x48) addr:0x020c95c4 _ZN27AdventureModeManager_180_18D0Ev kind:function(arm,size=0x1c) addr:0x020c960c _ZN24AdventureModeManager_184C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x30) addr:0x020c9628 _ZN24AdventureModeManager_184D1Ev kind:function(thumb,size=0xc) addr:0x020c9658 _ZN24AdventureModeManager_184D0Ev kind:function(thumb,size=0x12) addr:0x020c9664 -_ZN24AdventureModeManager_1848vfunc_08Ei kind:function(thumb,size=0x20) addr:0x020c9678 -_ZN24AdventureModeManager_1848vfunc_0CEi kind:function(thumb,size=0xf8) addr:0x020c9698 -_ZN24AdventureModeManager_1848vfunc_10Eii kind:function(thumb,size=0x8) addr:0x020c9790 -_ZN24AdventureModeManager_1848vfunc_14Ei kind:function(thumb,size=0x2) addr:0x020c9798 +_ZN24AdventureModeManager_1849vfunc2_08Ei kind:function(thumb,size=0x20) addr:0x020c9678 +_ZN24AdventureModeManager_1849vfunc2_0CEi kind:function(thumb,size=0xf8) addr:0x020c9698 +_ZN24AdventureModeManager_1848vfunc_54Eii kind:function(thumb,size=0x8) addr:0x020c9790 +_ZN24AdventureModeManager_1849vfunc2_14Ei kind:function(thumb,size=0x2) addr:0x020c9798 _ZN24AdventureModeManager_18419func_ov024_020c979cEi kind:function(thumb,size=0x94) addr:0x020c979c -_ZN24AdventureModeManager_1848vfunc_18Ei kind:function(thumb,size=0x7c) addr:0x020c9830 -_ZN24AdventureModeManager_1848vfunc_1CEi kind:function(thumb,size=0x60) addr:0x020c98ac -_ZN24AdventureModeManager_1848vfunc_20Eii kind:function(thumb,size=0x5c) addr:0x020c990c -_ZN24AdventureModeManager_1848vfunc_24Ev kind:function(thumb,size=0x8) addr:0x020c9968 +_ZN24AdventureModeManager_1849vfunc2_18Ei kind:function(thumb,size=0x7c) addr:0x020c9830 +_ZN24AdventureModeManager_1848vfunc_5CEi kind:function(thumb,size=0x60) addr:0x020c98ac +_ZN24AdventureModeManager_1848vfunc_58Eii kind:function(thumb,size=0x5c) addr:0x020c990c +_ZN24AdventureModeManager_1848vfunc_60Ev kind:function(thumb,size=0x8) addr:0x020c9968 _ZN27AdventureModeManager_18C_14C1Ev kind:function(thumb,size=0x14) addr:0x020c9970 _ZN27AdventureModeManager_18C_148vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020c9984 _ZN27AdventureModeManager_18C_148vfunc_10Ev kind:function(thumb,size=0x10) addr:0x020c9994 @@ -237,15 +237,15 @@ _ZN24AdventureModeManager_18CC1EP23GameModeManagerBase_104 kind:function(thumb,s _ZN27AdventureModeManager_18C_14D1Ev kind:function(thumb,size=0xc) addr:0x020c9a0c _ZN24AdventureModeManager_18CD1Ev kind:function(thumb,size=0x14) addr:0x020c9a18 _ZN24AdventureModeManager_18CD0Ev kind:function(thumb,size=0x1a) addr:0x020c9a2c -_ZN24AdventureModeManager_18C8vfunc_08Ei kind:function(thumb,size=0x32) addr:0x020c9a48 -_ZN24AdventureModeManager_18C8vfunc_0CEi kind:function(thumb,size=0xf0) addr:0x020c9a7c -_ZN24AdventureModeManager_18C8vfunc_10Eii kind:function(thumb,size=0x100) addr:0x020c9b6c +_ZN24AdventureModeManager_18C9vfunc2_08Ei kind:function(thumb,size=0x32) addr:0x020c9a48 +_ZN24AdventureModeManager_18C9vfunc2_0CEi kind:function(thumb,size=0xf0) addr:0x020c9a7c +_ZN24AdventureModeManager_18C8vfunc_54Eii kind:function(thumb,size=0x100) addr:0x020c9b6c _ZN24AdventureModeManager_18C19func_ov024_020c9c6cEv kind:function(thumb,size=0xb4) addr:0x020c9c6c -_ZN24AdventureModeManager_18C8vfunc_14Ei kind:function(thumb,size=0x10) addr:0x020c9d20 -_ZN24AdventureModeManager_18C8vfunc_18Ei kind:function(thumb,size=0xac) addr:0x020c9d30 -_ZN24AdventureModeManager_18C8vfunc_1CEi kind:function(thumb,size=0x88) addr:0x020c9ddc -_ZN24AdventureModeManager_18C8vfunc_20Eii kind:function(thumb,size=0x1c4) addr:0x020c9e64 -_ZN24AdventureModeManager_18C8vfunc_24Ev kind:function(thumb,size=0xa) addr:0x020ca028 +_ZN24AdventureModeManager_18C9vfunc2_14Ei kind:function(thumb,size=0x10) addr:0x020c9d20 +_ZN24AdventureModeManager_18C9vfunc2_18Ei kind:function(thumb,size=0xac) addr:0x020c9d30 +_ZN24AdventureModeManager_18C8vfunc_5CEi kind:function(thumb,size=0x88) addr:0x020c9ddc +_ZN24AdventureModeManager_18C8vfunc_58Eii kind:function(thumb,size=0x1c4) addr:0x020c9e64 +_ZN24AdventureModeManager_18C8vfunc_60Ev kind:function(thumb,size=0xa) addr:0x020ca028 _ZN24AdventureModeManager_18C19func_ov024_020ca034Ev kind:function(thumb,size=0x34) addr:0x020ca034 _ZN24AdventureModeManager_18C19func_ov024_020ca068Ei kind:function(thumb,size=0xc) addr:0x020ca068 _ZN24AdventureModeManager_18C19func_ov024_020ca074Ev kind:function(thumb,size=0x6) addr:0x020ca074 @@ -255,12 +255,12 @@ _ZN27AdventureModeManager_190_388vfunc_0CEv kind:function(thumb,size=0xc) addr:0 _ZN24AdventureModeManager_190C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x54) addr:0x020ca0b4 _ZN27AdventureModeManager_190_14D1Ev kind:function(thumb,size=0xc) addr:0x020ca108 _ZN27AdventureModeManager_190_38D1Ev kind:function(thumb,size=0xc) addr:0x020ca114 -_ZN24AdventureModeManager_1908vfunc_08Ei kind:function(thumb,size=0xc) addr:0x020ca120 -_ZN24AdventureModeManager_1908vfunc_0CEi kind:function(thumb,size=0x20) addr:0x020ca12c -_ZN24AdventureModeManager_1908vfunc_10Eii kind:function(thumb,size=0x3c) addr:0x020ca14c -_ZN24AdventureModeManager_1908vfunc_18Ei kind:function(thumb,size=0xc) addr:0x020ca188 -_ZN24AdventureModeManager_1908vfunc_1CEi kind:function(thumb,size=0x20) addr:0x020ca194 -_ZN24AdventureModeManager_1908vfunc_20Eii kind:function(thumb,size=0x68) addr:0x020ca1b4 +_ZN24AdventureModeManager_1909vfunc2_08Ei kind:function(thumb,size=0xc) addr:0x020ca120 +_ZN24AdventureModeManager_1909vfunc2_0CEi kind:function(thumb,size=0x20) addr:0x020ca12c +_ZN24AdventureModeManager_1908vfunc_54Eii kind:function(thumb,size=0x3c) addr:0x020ca14c +_ZN24AdventureModeManager_1909vfunc2_18Ei kind:function(thumb,size=0xc) addr:0x020ca188 +_ZN24AdventureModeManager_1908vfunc_5CEi kind:function(thumb,size=0x20) addr:0x020ca194 +_ZN24AdventureModeManager_1908vfunc_58Eii kind:function(thumb,size=0x68) addr:0x020ca1b4 _ZN24AdventureModeManager_19019func_ov024_020ca21cEv kind:function(thumb,size=0x30) addr:0x020ca21c _ZN24AdventureModeManager_19019func_ov024_020ca24cEi kind:function(thumb,size=0x34) addr:0x020ca24c _ZN24AdventureModeManager_19019func_ov024_020ca280Ev kind:function(thumb,size=0x10) addr:0x020ca280 diff --git a/config/eur/arm9/overlays/ov031/delinks.txt b/config/eur/arm9/overlays/ov031/delinks.txt index 15a0b7fd..e14532b4 100644 --- a/config/eur/arm9/overlays/ov031/delinks.txt +++ b/config/eur/arm9/overlays/ov031/delinks.txt @@ -187,7 +187,7 @@ src/031_Land/Actor/ActorItemDrop.cpp: .bss start:0x02116e6c end:0x02116f9c src/031_Land/Actor/ActorUnkMLCK.cpp: - .text start:0x020fab5c end:0x020fb2ac + .text start:0x020fab5c end:0x020fb30c .init start:0x02111988 end:0x021119fc .ctor start:0x02112800 end:0x02112804 .data start:0x02114d28 end:0x02114e1c diff --git a/config/eur/arm9/overlays/ov031/relocs.txt b/config/eur/arm9/overlays/ov031/relocs.txt index b94a9ad9..59fdece6 100644 --- a/config/eur/arm9/overlays/ov031/relocs.txt +++ b/config/eur/arm9/overlays/ov031/relocs.txt @@ -103,7 +103,7 @@ from:0x020d9310 kind:load to:0x0204a110 module:main from:0x020d9344 kind:arm_call to:0x01fff350 module:itcm from:0x020d9350 kind:arm_call to:0x020fb1e8 module:overlay(31) from:0x020d935c kind:load to:0x027e0ce4 module:dtcm -from:0x020d9364 kind:load to:0x02112ad4 module:overlay(31) +from:0x020d9364 kind:load to:0x02112acc add:0x8 module:overlay(31) from:0x020d9380 kind:arm_call to:0x01fff458 module:itcm from:0x020d93b0 kind:load to:0x027e0ce4 module:dtcm from:0x020d93b4 kind:load to:0x020d9368 module:overlay(31) @@ -3776,11 +3776,11 @@ from:0x020fabbc kind:arm_call to:0x02098388 module:overlay(0) from:0x020fabc4 kind:arm_call to:0x02061648 module:overlay(0) from:0x020fac58 kind:load to:0x02114d34 add:0x8 module:overlay(31) from:0x020fac5c kind:load to:0x02114d70 add:0x8 module:overlay(31) -from:0x020fac60 kind:load to:0x02114dec add:0x8 module:overlay(31) +from:0x020fac60 kind:load to:0x02114d70 add:0x84 module:overlay(31) from:0x020fac9c kind:arm_call to:0x01fff350 module:itcm from:0x020facd0 kind:arm_call to:0x020611dc module:overlay(0) from:0x020fad28 kind:load to:0x027e0ce4 module:dtcm -from:0x020fad2c kind:load to:0x02112ad4 module:overlay(31) +from:0x020fad2c kind:load to:0x02112acc add:0x8 module:overlay(31) from:0x020fad34 kind:load to:0x0204a088 module:main from:0x020fad38 kind:load to:0x020d86b0 module:overlay(24) from:0x020fad6c kind:arm_call to:0x0206f980 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov031/symbols.txt b/config/eur/arm9/overlays/ov031/symbols.txt index f3cdfd65..0eebc7ba 100644 --- a/config/eur/arm9/overlays/ov031/symbols.txt +++ b/config/eur/arm9/overlays/ov031/symbols.txt @@ -149,17 +149,17 @@ func_ov031_020db374 kind:function(arm,size=0x74) addr:0x020db374 func_ov031_020db3e8 kind:function(arm,size=0x18) addr:0x020db3e8 func_ov031_020db400 kind:function(arm,size=0x98) addr:0x020db400 func_ov031_020db498 kind:function(arm,size=0x58) addr:0x020db498 -func_ov031_020db4f0 kind:function(arm,size=0x38) addr:0x020db4f0 -func_ov031_020db528 kind:function(arm,size=0x8c) addr:0x020db528 +_ZN27UnkStruct_ItemManager_20_0419func_ov031_020db4f0Eii kind:function(arm,size=0x38) addr:0x020db4f0 +_ZN27UnkStruct_ItemManager_20_0419func_ov031_020db528Ei kind:function(arm,size=0x8c) addr:0x020db528 _ZN27UnkStruct_ItemManager_20_0819func_ov031_020db5b4Ev kind:function(arm,size=0x20) addr:0x020db5b4 func_ov031_020db5d4 kind:function(arm,size=0x14) addr:0x020db5d4 func_ov031_020db5e8 kind:function(arm,size=0x2c) addr:0x020db5e8 func_ov031_020db614 kind:function(arm,size=0x90) addr:0x020db614 func_ov031_020db6a4 kind:function(arm,size=0x60) addr:0x020db6a4 -func_ov031_020db704 kind:function(arm,size=0xbc) addr:0x020db704 +_ZN27UnkStruct_ItemManager_20_0819func_ov031_020db704Eii kind:function(arm,size=0xbc) addr:0x020db704 _ZN27UnkStruct_ItemManager_20_14C1Ev kind:function(thumb,size=0x16) addr:0x020db7c0 _ZN27UnkStruct_ItemManager_20_1419func_ov031_020db7d8Ev kind:function(thumb,size=0x1a) addr:0x020db7d8 -func_ov031_020db7f4 kind:function(arm,size=0x50) addr:0x020db7f4 +_ZN27UnkStruct_ItemManager_20_1419func_ov031_020db7f4Ev kind:function(arm,size=0x50) addr:0x020db7f4 func_ov031_020db844 kind:function(arm,size=0x30) addr:0x020db844 _ZN24UnkStruct_ItemManager_2019func_ov031_020db874Ej kind:function(arm,size=0x58) addr:0x020db874 _ZN24UnkStruct_ItemManager_2019func_ov031_020db8ccEv kind:function(arm,size=0x2c) addr:0x020db8cc @@ -167,15 +167,15 @@ _ZN24UnkStruct_ItemManager_2019func_ov031_020db8f8Ev kind:function(arm,size=0x44 _ZN27UnkStruct_ItemManager_20_0CC1Ev kind:function(thumb,size=0x12) addr:0x020db93c _ZN27UnkStruct_ItemManager_20_0CD1Ev kind:function(thumb,size=0x2) addr:0x020db950 _ZN27UnkStruct_ItemManager_20_0C19func_ov031_020db954Ev kind:function(arm,size=0x4) addr:0x020db954 -func_ov031_020db958 kind:function(arm,size=0xe4) addr:0x020db958 -func_ov031_020dba3c kind:function(arm,size=0x4) addr:0x020dba3c +_ZN27UnkStruct_ItemManager_20_0C19func_ov031_020db958Eii kind:function(arm,size=0xe4) addr:0x020db958 +_ZN27UnkStruct_ItemManager_20_0C19func_ov031_020dba3cEi kind:function(arm,size=0x4) addr:0x020dba3c _ZN27UnkStruct_ItemManager_20_0019func_ov031_020dba40Ev kind:function(arm,size=0x34) addr:0x020dba40 func_ov031_020dba74 kind:function(arm,size=0x18) addr:0x020dba74 func_ov031_020dba8c kind:function(arm,size=0xac) addr:0x020dba8c func_ov031_020dbb38 kind:function(arm,size=0x1c) addr:0x020dbb38 func_ov031_020dbb54 kind:function(arm,size=0xc4) addr:0x020dbb54 func_ov031_020dbc18 kind:function(arm,size=0x68) addr:0x020dbc18 -func_ov031_020dbc80 kind:function(arm,size=0xa4) addr:0x020dbc80 +_ZN27UnkStruct_ItemManager_20_0019func_ov031_020dbc80Eii kind:function(arm,size=0xa4) addr:0x020dbc80 func_ov031_020dbd24 kind:function(arm,size=0x74) addr:0x020dbd24 func_ov031_020dbd98 kind:function(arm,size=0xc4) addr:0x020dbd98 func_ov031_020dbe5c kind:function(arm,size=0x2c) addr:0x020dbe5c @@ -612,7 +612,7 @@ _ZN19ActorProfileUnkZSRSC1Ev kind:function(thumb,size=0x1c) addr:0x020ea038 _ZN19ActorProfileUnkZLSL10GetProfileEv kind:function(thumb,size=0x8) addr:0x020ea054 _ZN19ActorProfileUnkZLSL6CreateEv kind:function(thumb,size=0x1c) addr:0x020ea05c _ZN19ActorProfileUnkZLSLC1Ev kind:function(thumb,size=0x3c) addr:0x020ea078 -_ZN24UnkStruct_ov031_0211361c19func_ov031_020ea0b4EP5Actor kind:function(thumb,size=0x30) addr:0x020ea0b4 +_ZN24UnkStruct_ov031_0211361c8vfunc_00EP5Actor kind:function(thumb,size=0x30) addr:0x020ea0b4 _ZN26ModelRender_ov031_02113670C2EP10G3d_Model_ kind:function(thumb,size=0x14) addr:0x020ea0e4 _ZN26ModelRender_ov031_021136708vfunc_0CEv kind:function(thumb,size=0x8) addr:0x020ea0f8 func_ov031_020ea100 kind:function(thumb,size=0x40) addr:0x020ea100 @@ -1208,8 +1208,8 @@ _ZN12ActorUnkMLCKC1Ev kind:function(arm,size=0xb0) addr:0x020fabb4 _ZN12ActorUnkMLCK8vfunc_18Ei kind:function(arm,size=0xd8) addr:0x020fac64 _ZN12ActorUnkMLCK8vfunc_64Ei kind:function(arm,size=0x4c) addr:0x020fad3c _ZN12ActorUnkMLCK8vfunc_54Eii kind:function(arm,size=0x20) addr:0x020fad88 -_ZN12ActorUnkMLCK8vfunc_58Ev kind:function(arm,size=0xc) addr:0x020fada8 -_ZN12ActorUnkMLCK8vfunc_5CEv kind:function(arm,size=0x54) addr:0x020fadb4 +_ZN12ActorUnkMLCK8vfunc_58Eii kind:function(arm,size=0xc) addr:0x020fada8 +_ZN12ActorUnkMLCK8vfunc_5CEi kind:function(arm,size=0x54) addr:0x020fadb4 _ZN12ActorUnkMLCK8vfunc_60Ev kind:function(arm,size=0x18) addr:0x020fae08 _ZN12ActorUnkMLCK8vfunc_68Ev kind:function(arm,size=0x90) addr:0x020fae20 _ZN12ActorUnkMLCK19func_ov031_020faeb0Ev kind:function(arm,size=0x4) addr:0x020faeb0 @@ -1218,20 +1218,20 @@ _ZN12ActorUnkMLCK8vfunc_70Ev kind:function(arm,size=0x20) addr:0x020faf04 _ZN12ActorUnkMLCK19func_ov031_020faf24Ev kind:function(arm,size=0x1e0) addr:0x020faf24 _ZN12ActorUnkMLCK19func_ov031_020fb104Ev kind:function(arm,size=0x18) addr:0x020fb104 _ZN12ActorUnkMLCK19func_ov031_020fb11cEv kind:function(arm,size=0x68) addr:0x020fb11c -_ZN18ActorUnkMLCK_B4_0019func_ov031_020fb184Ev kind:function(arm,size=0x2c) addr:0x020fb184 +_ZN15ActorUnkMLCK_C419func_ov031_020fb184Ev kind:function(arm,size=0x2c) addr:0x020fb184 _ZN15ActorUnkMLCK_D89vfunc2_00Ev kind:function(arm,size=0x1c) addr:0x020fb1b0 _ZN15ActorUnkMLCK_D89vfunc2_04Ev kind:function(arm,size=0x1c) addr:0x020fb1cc -_ZN12ActorUnkMLCK19func_ov031_020fb1e8EP18ActorUnkMLCK_B4_00 kind:function(arm,size=0x1c) addr:0x020fb1e8 +_ZN12ActorUnkMLCK19func_ov031_020fb1e8EP15ActorUnkMLCK_A0 kind:function(arm,size=0x1c) addr:0x020fb1e8 _ZN12ActorUnkMLCK19func_ov031_020fb204Ei kind:function(arm,size=0x4c) addr:0x020fb204 _ZN12ActorUnkMLCKD0Ev kind:function(arm,size=0x28) addr:0x020fb250 _ZN12ActorUnkMLCKD1Ev kind:function(arm,size=0x20) addr:0x020fb278 _ZN19ActorProfileUnkMLCKD1Ev kind:function(arm,size=0x14) addr:0x020fb298 -func_ov031_020fb2ac kind:function(arm,size=0x10) addr:0x020fb2ac -func_ov031_020fb2bc kind:function(arm,size=0x10) addr:0x020fb2bc -func_ov031_020fb2cc kind:function(arm,size=0x10) addr:0x020fb2cc -func_ov031_020fb2dc kind:function(arm,size=0x10) addr:0x020fb2dc -func_ov031_020fb2ec kind:function(arm,size=0x10) addr:0x020fb2ec -func_ov031_020fb2fc kind:function(arm,size=0x10) addr:0x020fb2fc +_ZThn148_N12ActorUnkMLCKD0Ev kind:function(arm,size=0x10) addr:0x020fb2ac +_ZThn148_N12ActorUnkMLCK8vfunc_60Ev kind:function(arm,size=0x10) addr:0x020fb2bc +_ZThn148_N12ActorUnkMLCK8vfunc_58Eii kind:function(arm,size=0x10) addr:0x020fb2cc +_ZThn148_N12ActorUnkMLCK8vfunc_5CEi kind:function(arm,size=0x10) addr:0x020fb2dc +_ZThn148_N12ActorUnkMLCK8vfunc_54Eii kind:function(arm,size=0x10) addr:0x020fb2ec +_ZThn148_N12ActorUnkMLCKD1Ev kind:function(arm,size=0x10) addr:0x020fb2fc _ZN19ActorProfileUnkCLLT10GetProfileEv kind:function(arm,size=0xc) addr:0x020fb30c _ZN19ActorProfileUnkCLLT6CreateEv kind:function(arm,size=0x24) addr:0x020fb318 _ZN19ActorProfileUnkCLLTC1Ev kind:function(arm,size=0x28) addr:0x020fb33c @@ -1793,7 +1793,7 @@ _ZN23MapObjectProfileUnkSAND6CreateEv kind:function(arm,size=0x24) addr:0x0210ab _ZN23MapObjectProfileUnkSANDC1Ev kind:function(arm,size=0x198) addr:0x0210ab3c _ZN16MapObjectUnkSAND19func_ov031_0210acd4Ev kind:function(arm,size=0x90) addr:0x0210acd4 _ZN16MapObjectUnkSAND19func_ov031_0210ad64Ev kind:function(arm,size=0x9c) addr:0x0210ad64 -_ZN16MapObjectUnkSAND19func_ov031_0210ae00Ev kind:function(arm,size=0x90) addr:0x0210ae00 +_ZN16MapObjectUnkSAND19func_ov031_0210ae00E8Vec2bCppPv kind:function(arm,size=0x90) addr:0x0210ae00 _ZN16MapObjectUnkSAND19func_ov031_0210ae90Ev kind:function(arm,size=0xc0) addr:0x0210ae90 _ZN16MapObjectUnkSAND19func_ov031_0210af50Ev kind:function(arm,size=0xc8) addr:0x0210af50 _ZN16MapObjectUnkSAND19func_ov031_0210b018Ev kind:function(arm,size=0x10) addr:0x0210b018 @@ -1801,13 +1801,13 @@ _ZN16MapObjectUnkSAND19func_ov031_0210b028Ev kind:function(arm,size=0x84) addr:0 _ZN16MapObjectUnkSAND19func_ov031_0210b0acEv kind:function(arm,size=0x38) addr:0x0210b0ac _ZN16MapObjectUnkSAND19func_ov031_0210b0e4Ev kind:function(arm,size=0x60) addr:0x0210b0e4 _ZN16MapObjectUnkSAND19func_ov031_0210b144Ev kind:function(arm,size=0x38) addr:0x0210b144 -_ZN16MapObjectUnkSAND19func_ov031_0210b17cEv kind:function(arm,size=0x70) addr:0x0210b17c +_ZN16MapObjectUnkSAND19func_ov031_0210b17cEP19MapObjectUnkSAND_40i kind:function(arm,size=0x70) addr:0x0210b17c _ZN16MapObjectUnkSAND19func_ov031_0210b1ecEv kind:function(arm,size=0xe0) addr:0x0210b1ec _ZN16MapObjectUnkSAND19func_ov031_0210b2ccEv kind:function(arm,size=0x30) addr:0x0210b2cc -_ZN16MapObjectUnkSANDD1Ev kind:function(arm,size=0x14) addr:0x0210b2fc -_ZN16MapObjectUnkSANDD0Ev kind:function(arm,size=0x1c) addr:0x0210b310 -_ZN16MapObjectUnkSAND19func_ov031_0210b32cEv kind:function(arm,size=0x20) addr:0x0210b32c -_ZN16MapObjectUnkSAND19func_ov031_0210b34cEv kind:function(arm,size=0x28) addr:0x0210b34c +_ZN16MapObjectUnkSAND19func_ov031_0210b2fcEv kind:function(arm,size=0x14) addr:0x0210b2fc +_ZN16MapObjectUnkSAND19func_ov031_0210b310Ev kind:function(arm,size=0x1c) addr:0x0210b310 +_ZN16MapObjectUnkSANDD1Ev kind:function(arm,size=0x20) addr:0x0210b32c +_ZN16MapObjectUnkSANDD0Ev kind:function(arm,size=0x28) addr:0x0210b34c _ZN23MapObjectProfileUnkSANDD1Ev kind:function(arm,size=0x14) addr:0x0210b374 _ZN23MapObjectProfileUnkSPTB10GetProfileEv kind:function(arm,size=0xc) addr:0x0210b388 _ZN23MapObjectProfileUnkSPTB6CreateEv kind:function(arm,size=0x24) addr:0x0210b394 @@ -2095,7 +2095,7 @@ __sinit_ActorUnkNORE.cpp kind:function(arm,size=0x50) addr:0x02111760 local __sinit_ActorUnkFLEN.cpp kind:function(arm,size=0x50) addr:0x021117b0 __sinit_ActorRollingStone.cpp kind:function(arm,size=0x50) addr:0x02111800 __sinit_ActorItemDrop.cpp kind:function(arm,size=0x138) addr:0x02111850 local -__sinit_ActorUnkMLCK.cpp kind:function(arm,size=0x74) addr:0x02111988 +__sinit_ActorUnkMLCK.cpp kind:function(arm,size=0x74) addr:0x02111988 local __sinit_ActorUnkCLLT.cpp kind:function(arm,size=0x50) addr:0x021119fc __sinit_ActorUnkEFSB.cpp kind:function(arm,size=0x50) addr:0x02111a4c local __sinit_ActorUnkNFSP.cpp kind:function(arm,size=0x50) addr:0x02111a9c local @@ -2159,7 +2159,7 @@ __sinit_MapObjectUnkSWFS.cpp kind:function(arm,size=0x70) addr:0x02112724 .p__sinit_ActorUnkFLEN.cpp kind:data(word) addr:0x021127f4 .p__sinit_ActorRollingStone.cpp kind:data(word) addr:0x021127f8 .p__sinit_ActorItemDrop.cpp kind:data(word) addr:0x021127fc local -.p__sinit_ActorUnkMLCK.cpp kind:data(word) addr:0x02112800 +.p__sinit_ActorUnkMLCK.cpp kind:data(word) addr:0x02112800 local .p__sinit_ActorUnkCLLT.cpp kind:data(word) addr:0x02112804 .p__sinit_ActorUnkEFSB.cpp kind:data(word) addr:0x02112808 local .p__sinit_ActorUnkNFSP.cpp kind:data(word) addr:0x0211280c local @@ -2229,7 +2229,7 @@ data_ov031_02112a50 kind:data(any) addr:0x02112a50 data_ov031_02112a64 kind:data(any) addr:0x02112a64 _ZTV16MapObject_10_Pot kind:data(any) addr:0x02112a70 data_ov031_02112aa0 kind:data(any) addr:0x02112aa0 -data_ov031_02112ad4 kind:data(any) addr:0x02112ad4 +_ZTV24UnkStruct_ov031_02112ad4 kind:data(any) addr:0x02112acc data_ov031_02112ae0 kind:data(any) addr:0x02112ae0 data_ov031_02112afc kind:data(any) addr:0x02112afc data_ov031_02112b18 kind:data(any) addr:0x02112b18 @@ -2399,11 +2399,10 @@ _ZTV24ActorProfileTreasureDrop kind:data(any) addr:0x02114c5c _ZTV25ActorProfileRedPotionDrop kind:data(any) addr:0x02114c80 _ZTV20ActorProfileBombDrop kind:data(any) addr:0x02114ca4 _ZTV13ActorItemDrop kind:data(any) addr:0x02114cc8 -data_ov031_02114d28 kind:data(any) addr:0x02114d28 +data_ov031_02114d28 kind:data(any) addr:0x02114d28 local _ZTV15ActorUnkMLCK_D8 kind:data(any) addr:0x02114d34 _ZTV19ActorProfileUnkMLCK kind:data(any) addr:0x02114d4c _ZTV12ActorUnkMLCK kind:data(any) addr:0x02114d70 -_ZTV15ActorUnkMLCK_94 kind:data(any) addr:0x02114dec _ZTV19ActorProfileUnkCLLT kind:data(any) addr:0x02114e1c _ZTV12ActorUnkCLLT kind:data(any) addr:0x02114e40 _ZTV19ActorProfileUnkEFSB kind:data(any) addr:0x02114eac @@ -2608,7 +2607,7 @@ _ZN15ProfileInstanceI24ActorProfileTreasureDropE8sProfileE kind:bss addr:0x02116 _ZN15ProfileInstanceI21ActorProfileArrowDropE8sProfileE kind:bss addr:0x02116f24 _ZN15ProfileInstanceI20ActorProfileBombDropE8sProfileE kind:bss addr:0x02116f60 _ZGVN15ProfileInstanceI19ActorProfileUnkMLCKE8sProfileE kind:bss addr:0x02116f9c -@10920 kind:bss addr:0x02116fa0 +@10920 kind:bss addr:0x02116fa0 local _ZN15ProfileInstanceI19ActorProfileUnkMLCKE8sProfileE kind:bss addr:0x02116fac _ZGVN15ProfileInstanceI19ActorProfileUnkCLLTE8sProfileE kind:bss addr:0x02116fe8 @10926 kind:bss addr:0x02116fec diff --git a/config/eur/arm9/overlays/ov033/relocs.txt b/config/eur/arm9/overlays/ov033/relocs.txt index 2b180a0f..2d358142 100644 --- a/config/eur/arm9/overlays/ov033/relocs.txt +++ b/config/eur/arm9/overlays/ov033/relocs.txt @@ -347,7 +347,7 @@ from:0x0211bd84 kind:arm_call to:0x0211bcf4 module:overlay(33) from:0x0211bda8 kind:load to:0x027e0ce0 module:dtcm from:0x0211bdd4 kind:arm_call to:0x01fff350 module:itcm from:0x0211be14 kind:load to:0x027e0ce4 module:dtcm -from:0x0211be1c kind:load to:0x020b3000 module:overlay(0) +from:0x0211be1c kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0211be2c kind:arm_call_thumb to:0x02057ed4 module:overlay(0) from:0x0211be34 kind:arm_call_thumb to:0x02057ed4 module:overlay(0) from:0x0211be3c kind:arm_call to:0x0209d0ac module:overlay(0) diff --git a/config/eur/arm9/overlays/ov034/relocs.txt b/config/eur/arm9/overlays/ov034/relocs.txt index 8cfc7c0b..8801ecd6 100644 --- a/config/eur/arm9/overlays/ov034/relocs.txt +++ b/config/eur/arm9/overlays/ov034/relocs.txt @@ -234,7 +234,7 @@ from:0x0211ae88 kind:load to:0x027e09a4 module:dtcm from:0x0211aeb8 kind:arm_call to:0x01fff350 module:itcm from:0x0211aed4 kind:arm_call to:0x0211ccec module:overlay(34) from:0x0211af14 kind:load to:0x027e0ce4 module:dtcm -from:0x0211af1c kind:load to:0x020b3000 module:overlay(0) +from:0x0211af1c kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0211af9c kind:arm_call to:0x0207e0c8 module:overlay(0) from:0x0211afbc kind:arm_call to:0x0207e0c8 module:overlay(0) from:0x0211afc8 kind:arm_call to:0x0211c8e4 module:overlay(34) diff --git a/config/eur/arm9/overlays/ov037/relocs.txt b/config/eur/arm9/overlays/ov037/relocs.txt index 3a361b80..1d8366f5 100644 --- a/config/eur/arm9/overlays/ov037/relocs.txt +++ b/config/eur/arm9/overlays/ov037/relocs.txt @@ -155,7 +155,7 @@ from:0x0211a4a4 kind:arm_call to:0x01fff350 module:itcm from:0x0211a4c8 kind:arm_call to:0x0211e6d8 module:overlay(37) from:0x0211a4dc kind:arm_call to:0x01fff350 module:itcm from:0x0211a4f4 kind:load to:0x027e0ce4 module:dtcm -from:0x0211a4f8 kind:load to:0x020b3000 module:overlay(0) +from:0x0211a4f8 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0211a5ac kind:load to:0x02049be4 module:main from:0x0211a5d0 kind:arm_call to:0x01fff148 module:itcm from:0x0211a610 kind:arm_call to:0x01ffbbe0 module:itcm @@ -450,7 +450,7 @@ from:0x0211e438 kind:arm_call to:0x0211e348 module:overlay(37) from:0x0211e444 kind:arm_call to:0x0211e348 module:overlay(37) from:0x0211e450 kind:arm_call to:0x0211e47c module:overlay(37) from:0x0211e45c kind:load to:0x027e0ce4 module:dtcm -from:0x0211e460 kind:load to:0x020b3000 module:overlay(0) +from:0x0211e460 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0211e5a0 kind:arm_call to:0x020986b4 module:overlay(0) from:0x0211e5c4 kind:arm_call to:0x01fff148 module:itcm from:0x0211e5d0 kind:arm_call to:0x01ff9a5c module:itcm @@ -630,7 +630,7 @@ from:0x0212057c kind:arm_call to:0x0212048c module:overlay(37) from:0x02120588 kind:arm_call to:0x0212048c module:overlay(37) from:0x02120594 kind:arm_call to:0x021205c0 module:overlay(37) from:0x021205a0 kind:load to:0x027e0ce4 module:dtcm -from:0x021205a4 kind:load to:0x020b3000 module:overlay(0) +from:0x021205a4 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0212066c kind:arm_call to:0x020986b4 module:overlay(0) from:0x02120690 kind:arm_call to:0x01fff148 module:itcm from:0x0212069c kind:arm_call to:0x01ff9a5c module:itcm @@ -663,7 +663,7 @@ from:0x021209f4 kind:arm_call to:0x0209767c module:overlay(0) from:0x02120a0c kind:load to:0x02122768 add:0x8 module:overlay(37) from:0x02120a38 kind:arm_call to:0x01fff350 module:itcm from:0x02120a58 kind:load to:0x027e0ce4 module:dtcm -from:0x02120a60 kind:load to:0x020b3000 module:overlay(0) +from:0x02120a60 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02120a68 kind:arm_call to:0x02120a10 module:overlay(37) from:0x02120a98 kind:arm_call to:0x02098388 module:overlay(0) from:0x02120ac0 kind:arm_call to:0x0201bb38 module:main @@ -678,7 +678,7 @@ from:0x02120bbc kind:arm_call to:0x02016fbc module:main from:0x02120c00 kind:arm_call to:0x01fff350 module:itcm from:0x02120c24 kind:arm_call to:0x01fff350 module:itcm from:0x02120c3c kind:load to:0x027e0ce4 module:dtcm -from:0x02120c40 kind:load to:0x020b3000 module:overlay(0) +from:0x02120c40 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02120c68 kind:arm_call to:0x02120c48 module:overlay(37) from:0x02120d14 kind:arm_call to:0x02120408 module:overlay(37) from:0x02120d20 kind:arm_call to:0x02016958 module:main diff --git a/config/eur/arm9/overlays/ov040/relocs.txt b/config/eur/arm9/overlays/ov040/relocs.txt index 8dfd5da5..8866fa16 100644 --- a/config/eur/arm9/overlays/ov040/relocs.txt +++ b/config/eur/arm9/overlays/ov040/relocs.txt @@ -264,7 +264,7 @@ from:0x02125538 kind:arm_call to:0x02126938 module:overlay(40) from:0x0212557c kind:arm_call to:0x0208bbc4 module:overlay(0) from:0x02125588 kind:load to:0x027e09b8 module:dtcm from:0x0212558c kind:load to:0x027e0d34 module:dtcm -from:0x02125590 kind:load to:0x020b3000 module:overlay(0) +from:0x02125590 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02125598 kind:load to:0x027e0ce4 module:dtcm from:0x021255a4 kind:load to:0x027e09a8 module:dtcm from:0x021255a8 kind:load to:0x027e09bc module:dtcm @@ -341,7 +341,7 @@ from:0x021262f0 kind:arm_call to:0x01ffb6e4 module:itcm from:0x02126300 kind:arm_call to:0x02150c2c module:overlay(72) from:0x02126314 kind:arm_call to:0x02150c2c module:overlay(72) from:0x02126334 kind:load to:0x027e09a4 module:dtcm -from:0x02126338 kind:load to:0x020b3000 module:overlay(0) +from:0x02126338 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02126340 kind:load to:0x027e0ce4 module:dtcm from:0x0212638c kind:arm_call to:0x01ff9638 module:itcm from:0x021263b4 kind:arm_call to:0x01ffb6e4 module:itcm @@ -353,7 +353,7 @@ from:0x0212650c kind:arm_call to:0x02080658 module:overlay(0) from:0x02126528 kind:arm_call to:0x02070a9c module:overlay(0) from:0x02126534 kind:arm_call to:0x0202851c module:main from:0x02126540 kind:load to:0x027e09a4 module:dtcm -from:0x02126548 kind:load to:0x020b3000 module:overlay(0) +from:0x02126548 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0212654c kind:load to:0x027e0ce4 module:dtcm from:0x02126550 kind:load to:0x027e0cd8 module:dtcm from:0x02126588 kind:arm_call to:0x01fff350 module:itcm @@ -361,16 +361,16 @@ from:0x021265fc kind:arm_call to:0x01ff9638 module:itcm from:0x0212661c kind:arm_call to:0x01ffb6e4 module:itcm from:0x02126688 kind:arm_call to:0x0211a404 module:overlay(39) from:0x02126694 kind:load to:0x027e0ce4 module:dtcm -from:0x02126698 kind:load to:0x020b3000 module:overlay(0) +from:0x02126698 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x021266a0 kind:load to:0x027e09b8 module:dtcm from:0x021266dc kind:arm_call to:0x01fff350 module:itcm from:0x021266f8 kind:arm_call to:0x0211a460 module:overlay(39) from:0x02126704 kind:load to:0x027e0ce4 module:dtcm -from:0x0212670c kind:load to:0x020b3000 module:overlay(0) +from:0x0212670c kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02126740 kind:arm_call to:0x01fff350 module:itcm from:0x021267cc kind:arm_call to:0x0211a3ac module:overlays(38,39) from:0x021267d8 kind:load to:0x027e0ce4 module:dtcm -from:0x021267dc kind:load to:0x020b3000 module:overlay(0) +from:0x021267dc kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02126800 kind:arm_call to:0x020732ec module:overlay(0) from:0x0212681c kind:arm_call to:0x02014478 module:main from:0x02126840 kind:arm_call to:0x02126450 module:overlay(40) @@ -382,13 +382,13 @@ from:0x0212689c kind:load to:0x02049b2a module:main from:0x021268d0 kind:arm_call to:0x01fff350 module:itcm from:0x02126920 kind:arm_call to:0x01ffb714 module:itcm from:0x0212692c kind:load to:0x027e0ce4 module:dtcm -from:0x02126930 kind:load to:0x020b3000 module:overlay(0) +from:0x02126930 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0212696c kind:arm_call to:0x01fff350 module:itcm from:0x021269b0 kind:arm_call to:0x01fff350 module:itcm from:0x02126a14 kind:arm_call to:0x01ff9638 module:itcm from:0x02126a24 kind:arm_call to:0x01ffb6e4 module:itcm from:0x02126a64 kind:load to:0x027e0ce4 module:dtcm -from:0x02126a68 kind:load to:0x020b3000 module:overlay(0) +from:0x02126a68 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02126a8c kind:arm_call to:0x020732ec module:overlay(0) from:0x02126aa8 kind:arm_call to:0x02014478 module:main from:0x02126ad0 kind:arm_call to:0x0201bb84 module:main diff --git a/config/eur/arm9/overlays/ov041/relocs.txt b/config/eur/arm9/overlays/ov041/relocs.txt index 80a38b83..f258fbe6 100644 --- a/config/eur/arm9/overlays/ov041/relocs.txt +++ b/config/eur/arm9/overlays/ov041/relocs.txt @@ -28,7 +28,7 @@ from:0x02123764 kind:arm_call_thumb to:0x0209a248 module:overlay(0) from:0x0212377c kind:arm_call to:0x02124db8 module:overlay(41) from:0x021237a0 kind:arm_call to:0x01fff350 module:itcm from:0x021237d8 kind:load to:0x027e0ce4 module:dtcm -from:0x021237e0 kind:load to:0x020b3000 module:overlay(0) +from:0x021237e0 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x021237f0 kind:arm_call to:0x02124e44 module:overlay(41) from:0x02123828 kind:load to:0x0212d9c4 module:overlay(41) from:0x021238a8 kind:arm_call to:0x020bf894 module:overlay(17) @@ -125,7 +125,7 @@ from:0x02124244 kind:load to:0x0212dc04 add:0x8 module:overlay(41) from:0x0212425c kind:arm_call to:0x02124db8 module:overlay(41) from:0x02124280 kind:arm_call to:0x01fff350 module:itcm from:0x021242b8 kind:load to:0x027e0ce4 module:dtcm -from:0x021242c0 kind:load to:0x020b3000 module:overlay(0) +from:0x021242c0 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x021242d0 kind:arm_call to:0x02124e44 module:overlay(41) from:0x02124308 kind:load to:0x0212dc7c module:overlay(41) from:0x02124388 kind:arm_call to:0x020bf894 module:overlay(17) @@ -482,7 +482,7 @@ from:0x02127dcc kind:arm_call to:0x01fff350 module:itcm from:0x02127df4 kind:arm_call to:0x020975f8 module:overlay(0) from:0x02127e14 kind:arm_call to:0x020973f4 module:overlay(0) from:0x02127e20 kind:load to:0x027e0ce4 module:dtcm -from:0x02127e24 kind:load to:0x020b3000 module:overlay(0) +from:0x02127e24 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02127e2c kind:load to:0x020b539c module:overlay(0) from:0x02127e44 kind:arm_call to:0x02016fbc module:main from:0x02127e50 kind:arm_call to:0x0213f8dc module:overlay(70) @@ -1000,7 +1000,7 @@ from:0x0212bff8 kind:arm_call to:0x01fff350 module:itcm from:0x0212c038 kind:arm_call to:0x01fff350 module:itcm from:0x0212c070 kind:load to:0x027e09b8 module:dtcm from:0x0212c074 kind:load to:0x027e0ce4 module:dtcm -from:0x0212c07c kind:load to:0x020b3000 module:overlay(0) +from:0x0212c07c kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0212c0b4 kind:arm_call to:0x0209d434 module:overlay(0) from:0x0212c0f0 kind:arm_call to:0x0209d434 module:overlay(0) from:0x0212c104 kind:load to:0x0212e470 module:overlay(41) diff --git a/config/eur/arm9/overlays/ov045/relocs.txt b/config/eur/arm9/overlays/ov045/relocs.txt index a301ee13..a9111bf7 100644 --- a/config/eur/arm9/overlays/ov045/relocs.txt +++ b/config/eur/arm9/overlays/ov045/relocs.txt @@ -106,7 +106,7 @@ from:0x02123f88 kind:arm_call to:0x0212360c module:overlay(45) from:0x02123fb8 kind:arm_call to:0x0207e0c8 module:overlay(0) from:0x02123fd0 kind:arm_call to:0x0207e184 module:overlay(0) from:0x02123fe0 kind:load to:0x027e0ce4 module:dtcm -from:0x02123fe8 kind:load to:0x020b3000 module:overlay(0) +from:0x02123fe8 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02123fec kind:load to:0x027e09c0 module:dtcm from:0x02124008 kind:arm_call to:0x02078698 module:overlay(0) from:0x02124034 kind:arm_call to:0x02017e8c module:main diff --git a/config/eur/arm9/overlays/ov047/symbols.txt b/config/eur/arm9/overlays/ov047/symbols.txt index dd28d715..1f144ecf 100644 --- a/config/eur/arm9/overlays/ov047/symbols.txt +++ b/config/eur/arm9/overlays/ov047/symbols.txt @@ -1,7 +1,7 @@ _ZN29UnkStruct_027e0cd8_0C_Base_98C1Ev kind:function(arm,size=0x64) addr:0x021304a0 _ZN29UnkStruct_027e0cd8_0C_Base_98D1Ev kind:function(arm,size=0x28) addr:0x02130504 func_ov047_0213052c kind:function(arm,size=0x30) addr:0x0213052c -func_ov047_0213055c kind:function(arm,size=0x200) addr:0x0213055c +_ZN29UnkStruct_027e0cd8_0C_Base_9819func_ov047_0213055cEv kind:function(arm,size=0x200) addr:0x0213055c func_ov047_0213075c kind:function(arm,size=0x39c) addr:0x0213075c func_ov047_02130af8 kind:function(arm,size=0x3d8) addr:0x02130af8 func_ov047_02130ed0 kind:function(arm,size=0x280) addr:0x02130ed0 diff --git a/config/eur/arm9/overlays/ov049/relocs.txt b/config/eur/arm9/overlays/ov049/relocs.txt index c96a5fb4..ff365cbf 100644 --- a/config/eur/arm9/overlays/ov049/relocs.txt +++ b/config/eur/arm9/overlays/ov049/relocs.txt @@ -462,13 +462,13 @@ from:0x021342b0 kind:arm_call to:0x02132714 module:overlay(49) from:0x021342c4 kind:arm_call to:0x01fff350 module:itcm from:0x021342e0 kind:load to:0x020d86b0 module:overlay(24) from:0x021342e4 kind:load to:0x027e0ce4 module:dtcm -from:0x021342ec kind:load to:0x020b3000 module:overlay(0) +from:0x021342ec kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02134340 kind:arm_call to:0x01fff350 module:itcm from:0x0213436c kind:arm_call to:0x02098654 module:overlay(0) from:0x02134398 kind:arm_call to:0x01fff350 module:itcm from:0x021343b8 kind:load to:0x020d86b0 module:overlay(24) from:0x021343bc kind:load to:0x027e0ce4 module:dtcm -from:0x021343c4 kind:load to:0x020b3000 module:overlay(0) +from:0x021343c4 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x021343e0 kind:load to:0x027e0d40 module:dtcm from:0x021343f4 kind:load to:0x027e0d40 module:dtcm from:0x02134400 kind:arm_call to:0x021343e4 module:overlay(49) diff --git a/config/eur/arm9/overlays/ov051/relocs.txt b/config/eur/arm9/overlays/ov051/relocs.txt index 1e085c43..ef694871 100644 --- a/config/eur/arm9/overlays/ov051/relocs.txt +++ b/config/eur/arm9/overlays/ov051/relocs.txt @@ -470,7 +470,7 @@ from:0x021356a4 kind:arm_call to:0x01fff458 module:itcm from:0x021356b4 kind:arm_call to:0x021355d8 module:overlay(51) from:0x021356c4 kind:arm_call to:0x01fff350 module:itcm from:0x021356e0 kind:load to:0x027e0ce4 module:dtcm -from:0x021356e4 kind:load to:0x020b3000 module:overlay(0) +from:0x021356e4 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02135794 kind:arm_call to:0x01fff148 module:itcm from:0x021357a0 kind:arm_call to:0x01ff9a5c module:itcm from:0x021357bc kind:load to:0x0203e964 module:main diff --git a/config/eur/arm9/overlays/ov057/relocs.txt b/config/eur/arm9/overlays/ov057/relocs.txt index 1b757724..e25e2ee2 100644 --- a/config/eur/arm9/overlays/ov057/relocs.txt +++ b/config/eur/arm9/overlays/ov057/relocs.txt @@ -348,7 +348,7 @@ from:0x0213b654 kind:arm_call to:0x0213b53c module:overlay(57) from:0x0213b65c kind:arm_call to:0x0213b5cc module:overlay(57) from:0x0213b66c kind:arm_call to:0x01fff350 module:itcm from:0x0213b68c kind:load to:0x027e0ce4 module:dtcm -from:0x0213b690 kind:load to:0x020b3000 module:overlay(0) +from:0x0213b690 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0213b6a4 kind:load to:0x020578a4 module:overlay(0) from:0x0213b6b8 kind:arm_call_thumb to:0x02099afc module:overlay(0) from:0x0213b6c0 kind:arm_call to:0x02011ff4 module:main diff --git a/config/eur/arm9/overlays/ov058/relocs.txt b/config/eur/arm9/overlays/ov058/relocs.txt index 4e45e0dd..79119375 100644 --- a/config/eur/arm9/overlays/ov058/relocs.txt +++ b/config/eur/arm9/overlays/ov058/relocs.txt @@ -1554,7 +1554,7 @@ from:0x0214d614 kind:arm_call to:0x0214cab8 module:overlay(58) from:0x0214d624 kind:arm_call to:0x0214cc80 module:overlay(58) from:0x0214d654 kind:arm_call to:0x01fff350 module:itcm from:0x0214d674 kind:load to:0x020d86b0 module:overlay(24) -from:0x0214d678 kind:load to:0x020b3000 module:overlay(0) +from:0x0214d678 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0214d680 kind:load to:0x027e0ce4 module:dtcm from:0x0214d690 kind:load to:0x027e0d4c module:dtcm from:0x0214d6a4 kind:load to:0x027e0d4c module:dtcm diff --git a/config/eur/arm9/overlays/ov059/relocs.txt b/config/eur/arm9/overlays/ov059/relocs.txt index 8e087721..183ed9f8 100644 --- a/config/eur/arm9/overlays/ov059/relocs.txt +++ b/config/eur/arm9/overlays/ov059/relocs.txt @@ -27,7 +27,7 @@ from:0x021581cc kind:arm_call to:0x01fff350 module:itcm from:0x021581e4 kind:arm_call to:0x021589b4 module:overlay(59) from:0x021581f0 kind:arm_call to:0x02157ff8 module:overlay(59) from:0x021581fc kind:load to:0x027e0ce4 module:dtcm -from:0x02158200 kind:load to:0x020b3000 module:overlay(0) +from:0x02158200 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02158220 kind:arm_call to:0x01fff3b4 module:itcm from:0x02158240 kind:arm_call to:0x02081d7c module:overlay(0) from:0x02158248 kind:load to:0x027e0ce4 module:dtcm @@ -45,7 +45,7 @@ from:0x02158430 kind:arm_call to:0x01fff350 module:itcm from:0x02158440 kind:arm_call to:0x01fff350 module:itcm from:0x0215846c kind:arm_call to:0x01fff350 module:itcm from:0x02158494 kind:load to:0x027e0ce4 module:dtcm -from:0x0215849c kind:load to:0x020b3000 module:overlay(0) +from:0x0215849c kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02158550 kind:arm_call to:0x021586a8 module:overlay(59) from:0x02158558 kind:arm_call to:0x02158564 module:overlay(59) from:0x021585dc kind:arm_call to:0x021586a8 module:overlay(59) @@ -313,7 +313,7 @@ from:0x0215ab50 kind:arm_call to:0x02160ba4 module:overlay(59) from:0x0215ab5c kind:load to:0x027e0ce4 module:dtcm from:0x0215ab60 kind:load to:0x027e0d5c module:dtcm from:0x0215ab68 kind:load to:0x027e09b8 module:dtcm -from:0x0215ab70 kind:load to:0x020b3000 module:overlay(0) +from:0x0215ab70 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0215abd4 kind:load to:0x02163758 module:overlay(59) from:0x0215abf0 kind:arm_call to:0x01fff3b4 module:itcm from:0x0215ac10 kind:arm_call to:0x02015080 module:main @@ -448,7 +448,7 @@ from:0x0215be04 kind:arm_call to:0x01fff350 module:itcm from:0x0215be2c kind:arm_call to:0x01fff350 module:itcm from:0x0215be64 kind:arm_call to:0x01fff350 module:itcm from:0x0215be84 kind:load to:0x027e0ce4 module:dtcm -from:0x0215be8c kind:load to:0x020b3000 module:overlay(0) +from:0x0215be8c kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0215beb4 kind:arm_call to:0x020169d4 module:main from:0x0215bf6c kind:arm_call to:0x0207e458 module:overlay(0) from:0x0215bf90 kind:arm_call to:0x02071b30 module:overlay(0) @@ -786,7 +786,7 @@ from:0x0215eefc kind:arm_call to:0x020984d0 module:overlay(0) from:0x0215ef0c kind:arm_call to:0x01fff350 module:itcm from:0x0215ef28 kind:load to:0x020b51b8 module:overlay(0) from:0x0215ef34 kind:load to:0x027e09b8 module:dtcm -from:0x0215ef3c kind:load to:0x020b3000 module:overlay(0) +from:0x0215ef3c kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0215ef40 kind:load to:0x027e0ce4 module:dtcm from:0x0215efb8 kind:arm_call to:0x020732ec module:overlay(0) from:0x0215f014 kind:arm_call to:0x0208bbc4 module:overlay(0) @@ -902,7 +902,7 @@ from:0x02160304 kind:arm_call to:0x01fff350 module:itcm from:0x0216032c kind:arm_call to:0x01fff350 module:itcm from:0x02160358 kind:arm_call to:0x01fff350 module:itcm from:0x02160378 kind:load to:0x027e0ce4 module:dtcm -from:0x02160380 kind:load to:0x020b3000 module:overlay(0) +from:0x02160380 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0216038c kind:arm_call_thumb to:0x02057bd4 module:overlay(0) from:0x02160394 kind:arm_call to:0x02011ff4 module:main from:0x021603ac kind:arm_call to:0x0207b6c0 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov060/relocs.txt b/config/eur/arm9/overlays/ov060/relocs.txt index 4aec90e3..206298df 100644 --- a/config/eur/arm9/overlays/ov060/relocs.txt +++ b/config/eur/arm9/overlays/ov060/relocs.txt @@ -585,7 +585,7 @@ from:0x0215db84 kind:arm_call to:0x02078314 module:overlay(0) from:0x0215dba8 kind:arm_call to:0x01fff350 module:itcm from:0x0215dbf4 kind:load to:0x027e09bc module:dtcm from:0x0215dbf8 kind:load to:0x027e0ce4 module:dtcm -from:0x0215dc00 kind:load to:0x020b3000 module:overlay(0) +from:0x0215dc00 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0215dc10 kind:arm_call to:0x020f759c module:overlay(31) from:0x0215dc44 kind:arm_call to:0x02099ff8 module:overlay(0) from:0x0215dc50 kind:arm_call to:0x0205a7e0 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov063/relocs.txt b/config/eur/arm9/overlays/ov063/relocs.txt index 9a577d72..d2aeeb58 100644 --- a/config/eur/arm9/overlays/ov063/relocs.txt +++ b/config/eur/arm9/overlays/ov063/relocs.txt @@ -789,7 +789,7 @@ from:0x0215e0ec kind:arm_call to:0x0215e0f4 module:overlay(63) from:0x0215e148 kind:arm_call to:0x01fff350 module:itcm from:0x0215e17c kind:load to:0x02162650 module:overlay(63) from:0x0215e180 kind:load to:0x027e0ce4 module:dtcm -from:0x0215e184 kind:load to:0x020b3000 module:overlay(0) +from:0x0215e184 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0215e1a0 kind:arm_call to:0x02018c2c module:main from:0x0215e1b4 kind:arm_call to:0x020c555c module:overlay(24) from:0x0215e1bc kind:arm_call to:0x020c53e8 module:overlay(24) @@ -922,7 +922,7 @@ from:0x0215ed8c kind:load to:0x020b7ad5 module:overlay(12) from:0x0215edf0 kind:arm_call to:0x01fff350 module:itcm from:0x0215ee08 kind:arm_call to:0x021456d8 module:overlay(58) from:0x0215ee28 kind:load to:0x027e0ce4 module:dtcm -from:0x0215ee2c kind:load to:0x020b3000 module:overlay(0) +from:0x0215ee2c kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0215ee30 kind:load to:0x0216263c module:overlay(63) from:0x0215ee3c kind:load to:0x0215ee40 module:overlay(63) from:0x0215ee74 kind:arm_call_thumb to:0x020b81bc module:overlay(12) diff --git a/config/eur/arm9/overlays/ov066/relocs.txt b/config/eur/arm9/overlays/ov066/relocs.txt index 2eddb4e3..5e6f6375 100644 --- a/config/eur/arm9/overlays/ov066/relocs.txt +++ b/config/eur/arm9/overlays/ov066/relocs.txt @@ -482,7 +482,7 @@ from:0x0215b3c8 kind:arm_call to:0x02067a60 module:overlay(0) from:0x0215b3e4 kind:arm_call to:0x02067a60 module:overlay(0) from:0x0215b400 kind:arm_call to:0x02067a60 module:overlay(0) from:0x0215b41c kind:load to:0x027e0ce4 module:dtcm -from:0x0215b420 kind:load to:0x020b3000 module:overlay(0) +from:0x0215b420 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0215b428 kind:load to:0x020b504c module:overlay(0) from:0x0215b42c kind:load to:0x0215d7d8 module:overlay(66) from:0x0215b430 kind:load to:0x02049be0 module:main @@ -516,12 +516,12 @@ from:0x0215b8f0 kind:arm_call to:0x01fff350 module:itcm from:0x0215b910 kind:arm_call to:0x01fff3b4 module:itcm from:0x0215b920 kind:arm_call to:0x0215c80c module:overlay(66) from:0x0215b92c kind:load to:0x027e0ce4 module:dtcm -from:0x0215b934 kind:load to:0x020b3000 module:overlay(0) +from:0x0215b934 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0215b964 kind:arm_call to:0x01fff350 module:itcm from:0x0215b984 kind:arm_call to:0x01fff3b4 module:itcm from:0x0215b994 kind:arm_call to:0x0215c868 module:overlay(66) from:0x0215b9a0 kind:load to:0x027e0ce4 module:dtcm -from:0x0215b9a8 kind:load to:0x020b3000 module:overlay(0) +from:0x0215b9a8 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0215b9b8 kind:arm_call to:0x02016694 module:main from:0x0215b9c0 kind:arm_call to:0x02158e74 module:overlay(66) from:0x0215b9c8 kind:arm_call to:0x02158e74 module:overlay(66) diff --git a/config/eur/arm9/overlays/ov068/relocs.txt b/config/eur/arm9/overlays/ov068/relocs.txt index 4fcb0111..f99cbe1f 100644 --- a/config/eur/arm9/overlays/ov068/relocs.txt +++ b/config/eur/arm9/overlays/ov068/relocs.txt @@ -54,7 +54,7 @@ from:0x021584d8 kind:arm_call to:0x01fff350 module:itcm from:0x02158500 kind:arm_call to:0x0215d500 module:overlay(68) from:0x0215850c kind:arm_call to:0x0215dccc module:overlay(68) from:0x02158518 kind:load to:0x027e0ce4 module:dtcm -from:0x02158520 kind:load to:0x020b3000 module:overlay(0) +from:0x02158520 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02158524 kind:load to:0x027e0d6c module:dtcm from:0x02158528 kind:load to:0x02163ff4 module:overlay(68) from:0x02158550 kind:arm_call to:0x01fff3b4 module:itcm @@ -626,7 +626,7 @@ from:0x0215d61c kind:load to:0x027e09b8 module:dtcm from:0x0215d650 kind:arm_call to:0x01fff350 module:itcm from:0x0215d674 kind:arm_call to:0x0209862c module:overlay(0) from:0x0215d680 kind:load to:0x027e0ce4 module:dtcm -from:0x0215d684 kind:load to:0x020b3000 module:overlay(0) +from:0x0215d684 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0215d6b8 kind:arm_call to:0x020d44fc module:overlay(24) from:0x0215d6e4 kind:load to:0x027e0cfc module:dtcm from:0x0215d70c kind:load to:0x01ffc6d4 module:itcm diff --git a/config/eur/arm9/overlays/ov070/symbols.txt b/config/eur/arm9/overlays/ov070/symbols.txt index 8d99d775..061e3b78 100644 --- a/config/eur/arm9/overlays/ov070/symbols.txt +++ b/config/eur/arm9/overlays/ov070/symbols.txt @@ -503,7 +503,7 @@ _ZN23MapObjectProfileUnkPTFLC1Ev kind:function(arm,size=0xa8) addr:0x0214b90c _ZN16MapObjectUnkPTFLC1Ev kind:function(arm,size=0x80) addr:0x0214b9b4 _ZN16MapObjectUnkPTFL19func_ov070_0214ba34Ev kind:function(arm,size=0x144) addr:0x0214ba34 _ZN16MapObjectUnkPTFL19func_ov070_0214bb78Ev kind:function(arm,size=0x58) addr:0x0214bb78 -_ZN16MapObjectUnkPTFL19func_ov070_0214bbd0Ev kind:function(arm,size=0x178) addr:0x0214bbd0 +_ZN16MapObjectUnkPTFL19func_ov070_0214bbd0Esb kind:function(arm,size=0x178) addr:0x0214bbd0 _ZN16MapObjectUnkPTFL19func_ov070_0214bd48Ev kind:function(arm,size=0x48) addr:0x0214bd48 _ZN16MapObjectUnkPTFL19func_ov070_0214bd90Ev kind:function(arm,size=0x1c8) addr:0x0214bd90 _ZN16MapObjectUnkPTFL19func_ov070_0214bf58Ev kind:function(arm,size=0x4) addr:0x0214bf58 diff --git a/config/eur/arm9/overlays/ov071/relocs.txt b/config/eur/arm9/overlays/ov071/relocs.txt index 6859b761..2f25b7dd 100644 --- a/config/eur/arm9/overlays/ov071/relocs.txt +++ b/config/eur/arm9/overlays/ov071/relocs.txt @@ -1540,7 +1540,7 @@ from:0x0215f174 kind:arm_call to:0x01fff350 module:itcm from:0x0215f1b4 kind:arm_call to:0x0212914c module:overlay(42) from:0x0215f1c4 kind:arm_call to:0x01fff350 module:itcm from:0x0215f1e0 kind:load to:0x027e0ce4 module:dtcm -from:0x0215f1e8 kind:load to:0x020b3000 module:overlay(0) +from:0x0215f1e8 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0215f1f8 kind:load to:0x027e0d70 module:dtcm from:0x0215f20c kind:load to:0x027e0d70 module:dtcm from:0x0215f218 kind:load to:0x02165168 module:overlay(71) diff --git a/config/eur/arm9/overlays/ov072/relocs.txt b/config/eur/arm9/overlays/ov072/relocs.txt index e3e47b44..8230c26e 100644 --- a/config/eur/arm9/overlays/ov072/relocs.txt +++ b/config/eur/arm9/overlays/ov072/relocs.txt @@ -106,7 +106,7 @@ from:0x02151638 kind:load to:0x02049be4 module:main from:0x0215163c kind:load to:0x027e09a8 module:dtcm from:0x02151648 kind:load to:0x020b504c module:overlay(0) from:0x0215164c kind:load to:0x027e0ce4 module:dtcm -from:0x02151654 kind:load to:0x020b3000 module:overlay(0) +from:0x02151654 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02151658 kind:load to:0x0215253c module:overlay(72) from:0x0215168c kind:arm_call to:0x020732dc module:overlay(0) from:0x021516c8 kind:arm_call to:0x02078698 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov073/relocs.txt b/config/eur/arm9/overlays/ov073/relocs.txt index 41247d3b..d56663f9 100644 --- a/config/eur/arm9/overlays/ov073/relocs.txt +++ b/config/eur/arm9/overlays/ov073/relocs.txt @@ -1822,7 +1822,7 @@ from:0x02163860 kind:load to:0x020aaee4 module:overlay(0) from:0x02163864 kind:load to:0x020aaeec module:overlay(0) from:0x02163868 kind:load to:0x020aaee8 module:overlay(0) from:0x0216386c kind:load to:0x027e0ce4 module:dtcm -from:0x02163870 kind:load to:0x020b3000 module:overlay(0) +from:0x02163870 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02163878 kind:load to:0x020aaebc module:overlay(0) from:0x0216387c kind:load to:0x020aaec0 module:overlay(0) from:0x02163880 kind:load to:0x020aaec4 module:overlay(0) @@ -1843,7 +1843,7 @@ from:0x02163a40 kind:load to:0x020aaed8 module:overlay(0) from:0x02163a44 kind:load to:0x020aaed4 module:overlay(0) from:0x02163a48 kind:load to:0x027e0ce0 module:dtcm from:0x02163a4c kind:load to:0x027e0ce4 module:dtcm -from:0x02163a54 kind:load to:0x020b3000 module:overlay(0) +from:0x02163a54 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02163a58 kind:load to:0x020aaeb8 module:overlay(0) from:0x02163a5c kind:load to:0x020aaee4 module:overlay(0) from:0x02163a60 kind:load to:0x020aaeec module:overlay(0) @@ -1864,7 +1864,7 @@ from:0x02163c0c kind:arm_call to:0x01ffb6e4 module:itcm from:0x02163c18 kind:load to:0x020aaed8 module:overlay(0) from:0x02163c1c kind:load to:0x020aaed4 module:overlay(0) from:0x02163c20 kind:load to:0x027e0ce0 module:dtcm -from:0x02163c24 kind:load to:0x020b3000 module:overlay(0) +from:0x02163c24 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02163c2c kind:load to:0x027e0ce4 module:dtcm from:0x02163c30 kind:load to:0x020aaebc module:overlay(0) from:0x02163c34 kind:load to:0x020aaec0 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov074/relocs.txt b/config/eur/arm9/overlays/ov074/relocs.txt index 62a07933..365b98cf 100644 --- a/config/eur/arm9/overlays/ov074/relocs.txt +++ b/config/eur/arm9/overlays/ov074/relocs.txt @@ -1842,7 +1842,7 @@ from:0x02161b68 kind:arm_call to:0x01ffb428 module:itcm from:0x02161b84 kind:arm_call to:0x01ffb428 module:itcm from:0x02161bc0 kind:arm_call to:0x01fff350 module:itcm from:0x02161bdc kind:load to:0x027e0ce4 module:dtcm -from:0x02161be0 kind:load to:0x020b3000 module:overlay(0) +from:0x02161be0 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02161c0c kind:arm_call to:0x02078834 module:overlay(0) from:0x02161c14 kind:load to:0x027e09bc module:dtcm from:0x02161c20 kind:arm_call to:0x0209790c module:overlay(0) diff --git a/config/eur/arm9/overlays/ov075/relocs.txt b/config/eur/arm9/overlays/ov075/relocs.txt index 10efa079..a391dbfe 100644 --- a/config/eur/arm9/overlays/ov075/relocs.txt +++ b/config/eur/arm9/overlays/ov075/relocs.txt @@ -377,11 +377,11 @@ from:0x02154224 kind:arm_call to:0x020979b4 module:overlay(0) from:0x02154260 kind:load to:0x02162aa0 add:0x8 module:overlay(75) from:0x02154294 kind:arm_call to:0x01fff350 module:itcm from:0x021542b4 kind:load to:0x027e0ce4 module:dtcm -from:0x021542bc kind:load to:0x020b3000 module:overlay(0) +from:0x021542bc kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x021542ec kind:arm_call to:0x01fff350 module:itcm from:0x02154324 kind:arm_call to:0x01fff350 module:itcm from:0x02154344 kind:load to:0x027e0ce4 module:dtcm -from:0x0215434c kind:load to:0x020b3000 module:overlay(0) +from:0x0215434c kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02154360 kind:arm_call to:0x020974dc module:overlay(0) from:0x02154374 kind:load to:0x020b539c module:overlay(0) from:0x0215438c kind:arm_call to:0x02098b28 module:overlay(0) @@ -1791,7 +1791,7 @@ from:0x02161044 kind:arm_call to:0x01ff93c0 module:itcm from:0x02161058 kind:arm_call to:0x01ffb974 module:itcm from:0x0216106c kind:arm_call to:0x01ffb974 module:itcm from:0x021610d0 kind:arm_call to:0x02015820 module:main -from:0x021610dc kind:load to:0x020b3000 module:overlay(0) +from:0x021610dc kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x021610e4 kind:load to:0x027e0ce4 module:dtcm from:0x021610e8 kind:load to:0x027e0ce0 module:dtcm from:0x02161120 kind:arm_call to:0x01fff350 module:itcm @@ -1801,7 +1801,7 @@ from:0x0216118c kind:arm_call to:0x01ff93c0 module:itcm from:0x021611a0 kind:arm_call to:0x01ffb974 module:itcm from:0x021611b4 kind:arm_call to:0x01ffb974 module:itcm from:0x021611f4 kind:load to:0x027e0ce4 module:dtcm -from:0x021611f8 kind:load to:0x020b3000 module:overlay(0) +from:0x021611f8 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02161200 kind:load to:0x027e0ce0 module:dtcm from:0x0216124c kind:arm_call to:0x01ffb428 module:itcm from:0x0216125c kind:load to:0x020aaea8 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov078/relocs.txt b/config/eur/arm9/overlays/ov078/relocs.txt index d92e215e..069350b0 100644 --- a/config/eur/arm9/overlays/ov078/relocs.txt +++ b/config/eur/arm9/overlays/ov078/relocs.txt @@ -856,7 +856,7 @@ from:0x0215c0bc kind:load to:0x0203e964 module:main from:0x0215c0f0 kind:arm_call to:0x01fff350 module:itcm from:0x0215c120 kind:arm_call to:0x01fff350 module:itcm from:0x0215c144 kind:load to:0x027e0ce4 module:dtcm -from:0x0215c14c kind:load to:0x020b3000 module:overlay(0) +from:0x0215c14c kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0215c18c kind:arm_call_thumb to:0x01ffa184 module:itcm from:0x0215c1b8 kind:arm_call_thumb to:0x01ffa1a0 module:itcm from:0x0215c1cc kind:arm_call to:0x01ffa60c module:itcm @@ -1027,7 +1027,7 @@ from:0x0215d368 kind:load to:0x027e0ce0 module:dtcm from:0x0215d36c kind:load to:0x027e0cd8 module:dtcm from:0x0215d370 kind:load to:0x027e09b8 module:dtcm from:0x0215d374 kind:load to:0x027e0ce4 module:dtcm -from:0x0215d37c kind:load to:0x020b3000 module:overlay(0) +from:0x0215d37c kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0215d380 kind:load to:0x020aae94 module:overlay(0) from:0x0215d3a0 kind:load to:0x020aaef4 module:overlay(0) from:0x0215d3a4 kind:load to:0x020aaef0 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov080/relocs.txt b/config/eur/arm9/overlays/ov080/relocs.txt index 6123ce74..6d3b88c2 100644 --- a/config/eur/arm9/overlays/ov080/relocs.txt +++ b/config/eur/arm9/overlays/ov080/relocs.txt @@ -1063,7 +1063,7 @@ from:0x0215bfd8 kind:arm_call to:0x01fff350 module:itcm from:0x0215c004 kind:arm_call to:0x0215d0dc module:overlay(80) from:0x0215c014 kind:arm_call to:0x01fff350 module:itcm from:0x0215c030 kind:load to:0x027e0ce4 module:dtcm -from:0x0215c038 kind:load to:0x020b3000 module:overlay(0) +from:0x0215c038 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0215c05c kind:arm_call to:0x020d961c module:overlay(31) from:0x0215c068 kind:arm_call to:0x01fff3b4 module:itcm from:0x0215c074 kind:arm_call to:0x020984d0 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov081/relocs.txt b/config/eur/arm9/overlays/ov081/relocs.txt index 386a6f47..caaf9618 100644 --- a/config/eur/arm9/overlays/ov081/relocs.txt +++ b/config/eur/arm9/overlays/ov081/relocs.txt @@ -90,7 +90,7 @@ from:0x0215190c kind:arm_call to:0x01fff498 module:itcm from:0x02151918 kind:arm_call to:0x02152600 module:overlay(81) from:0x02151924 kind:arm_call to:0x02151128 module:overlay(81) from:0x02151930 kind:load to:0x027e0ce4 module:dtcm -from:0x02151938 kind:load to:0x020b3000 module:overlay(0) +from:0x02151938 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0215193c kind:load to:0x027e0ce0 module:dtcm from:0x02151940 kind:load to:0x027e0ce8 module:dtcm from:0x0215197c kind:arm_call to:0x02150e6c module:overlay(81) diff --git a/config/eur/arm9/overlays/ov083/relocs.txt b/config/eur/arm9/overlays/ov083/relocs.txt index 82a20bf0..a1cd05ef 100644 --- a/config/eur/arm9/overlays/ov083/relocs.txt +++ b/config/eur/arm9/overlays/ov083/relocs.txt @@ -226,11 +226,11 @@ from:0x02154c04 kind:load to:0x0203e964 module:main from:0x02154c30 kind:arm_call to:0x01fff350 module:itcm from:0x02154c4c kind:arm_call to:0x0215bec4 module:overlay(83) from:0x02154c58 kind:load to:0x027e0ce4 module:dtcm -from:0x02154c60 kind:load to:0x020b3000 module:overlay(0) +from:0x02154c60 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02154c8c kind:arm_call to:0x01fff350 module:itcm from:0x02154ca8 kind:arm_call to:0x0215bdec module:overlay(83) from:0x02154cb4 kind:load to:0x027e0ce4 module:dtcm -from:0x02154cbc kind:load to:0x020b3000 module:overlay(0) +from:0x02154cbc kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02154ce8 kind:arm_call to:0x01ffaf74 module:itcm from:0x02154d14 kind:arm_call to:0x0209feac module:overlay(0) from:0x02154d30 kind:arm_call to:0x0209feac module:overlay(0) @@ -312,7 +312,7 @@ from:0x02155ab8 kind:load to:0x0215d8d8 module:overlay(83) from:0x02155abc kind:load to:0x027e09b8 module:dtcm from:0x02155ac0 kind:load to:0x020b51b8 module:overlay(0) from:0x02155ac4 kind:load to:0x027e0d34 module:dtcm -from:0x02155acc kind:load to:0x020b3000 module:overlay(0) +from:0x02155acc kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02155ad0 kind:load to:0x027e0ce4 module:dtcm from:0x02155ad4 kind:load to:0x027e09ac module:dtcm from:0x02155b44 kind:arm_call to:0x020a7f44 module:overlay(0) @@ -390,7 +390,7 @@ from:0x02156600 kind:arm_call to:0x020726f0 module:overlay(0) from:0x02156614 kind:load to:0x027e09b8 module:dtcm from:0x02156618 kind:load to:0x020b51b8 module:overlay(0) from:0x0215661c kind:load to:0x027e0d34 module:dtcm -from:0x02156624 kind:load to:0x020b3000 module:overlay(0) +from:0x02156624 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02156628 kind:load to:0x027e0ce4 module:dtcm from:0x0215662c kind:load to:0x027e09ac module:dtcm from:0x0215669c kind:arm_call to:0x020a7f44 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov084/relocs.txt b/config/eur/arm9/overlays/ov084/relocs.txt index 866e0e8e..0a80e3da 100644 --- a/config/eur/arm9/overlays/ov084/relocs.txt +++ b/config/eur/arm9/overlays/ov084/relocs.txt @@ -248,7 +248,7 @@ from:0x021533e4 kind:load to:0x02162ab0 module:overlay(84) from:0x021533e8 kind:load to:0x027e09c0 module:dtcm from:0x02153418 kind:arm_call to:0x01fff350 module:itcm from:0x0215343c kind:load to:0x027e0ce4 module:dtcm -from:0x02153444 kind:load to:0x020b3000 module:overlay(0) +from:0x02153444 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02153478 kind:arm_call to:0x01ffb428 module:itcm from:0x02153498 kind:arm_call to:0x020d99fc module:overlay(31) from:0x021534bc kind:arm_call to:0x02078230 module:overlay(0) @@ -336,7 +336,7 @@ from:0x02154190 kind:arm_call to:0x02160f84 module:overlay(84) from:0x021541c8 kind:arm_call to:0x020973f4 module:overlay(0) from:0x021541d8 kind:load to:0x027e0cd8 module:dtcm from:0x021541dc kind:load to:0x027e0ce4 module:dtcm -from:0x021541e0 kind:load to:0x020b3000 module:overlay(0) +from:0x021541e0 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x021541e8 kind:load to:0x02049be4 module:main from:0x021541ec kind:load to:0x020b539c module:overlay(0) from:0x02154218 kind:arm_call to:0x02154000 module:overlay(84) @@ -567,7 +567,7 @@ from:0x021566a0 kind:arm_call to:0x02159718 module:overlay(84) from:0x021566c0 kind:arm_call to:0x02096d00 module:overlay(0) from:0x02156754 kind:arm_call to:0x02155904 module:overlay(84) from:0x02156780 kind:load to:0x027e0ce4 module:dtcm -from:0x02156784 kind:load to:0x020b3000 module:overlay(0) +from:0x02156784 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0215678c kind:load to:0x02049be4 module:main from:0x021567a8 kind:arm_call to:0x021556b8 module:overlay(84) from:0x021567e8 kind:arm_call to:0x02096d00 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov087/relocs.txt b/config/eur/arm9/overlays/ov087/relocs.txt index 45edd79f..2ef3d8ee 100644 --- a/config/eur/arm9/overlays/ov087/relocs.txt +++ b/config/eur/arm9/overlays/ov087/relocs.txt @@ -474,7 +474,7 @@ from:0x02158e44 kind:arm_call to:0x020975f8 module:overlay(0) from:0x02158e8c kind:arm_call to:0x020973f4 module:overlay(0) from:0x02158ea0 kind:arm_call to:0x02150eb0 module:overlay(85) from:0x02158eac kind:load to:0x027e0ce4 module:dtcm -from:0x02158eb4 kind:load to:0x020b3000 module:overlay(0) +from:0x02158eb4 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02158eb8 kind:load to:0x027e09bc module:dtcm from:0x02158ebc kind:load to:0x020b539c module:overlay(0) from:0x02158ee4 kind:arm_call to:0x020975f8 module:overlay(0) @@ -485,7 +485,7 @@ from:0x02158f60 kind:load to:0x02078b28 module:overlay(0) from:0x02158f98 kind:arm_call to:0x01fff350 module:itcm from:0x02158fe0 kind:arm_call to:0x01fff350 module:itcm from:0x02159000 kind:load to:0x027e0ce4 module:dtcm -from:0x02159008 kind:load to:0x020b3000 module:overlay(0) +from:0x02159008 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x021591d0 kind:load to:0x02049be4 module:main from:0x02159274 kind:arm_call to:0x01ffb6e4 module:itcm from:0x021592bc kind:arm_call to:0x01ffb6e4 module:itcm @@ -617,7 +617,7 @@ from:0x0215ae44 kind:arm_call to:0x02152d48 module:overlay(85) from:0x0215ae54 kind:arm_call to:0x01fff350 module:itcm from:0x0215ae70 kind:load to:0x027e09a8 module:dtcm from:0x0215ae78 kind:load to:0x027e0ce4 module:dtcm -from:0x0215ae80 kind:load to:0x020b3000 module:overlay(0) +from:0x0215ae80 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0215aebc kind:arm_call to:0x02015080 module:main from:0x0215aedc kind:arm_call to:0x02071b30 module:overlay(0) from:0x0215af10 kind:arm_call to:0x02015080 module:main @@ -1035,7 +1035,7 @@ from:0x0215e50c kind:load to:0x02161f2c module:overlay(87) from:0x0215e510 kind:load to:0x0216267c module:overlay(87) from:0x0215e514 kind:load to:0x027e0cd8 module:dtcm from:0x0215e518 kind:load to:0x027e0ce4 module:dtcm -from:0x0215e520 kind:load to:0x020b3000 module:overlay(0) +from:0x0215e520 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0215e524 kind:load to:0x027e0ce8 module:dtcm from:0x0215e52c kind:load to:0x020b34c4 module:overlay(0) from:0x0215e594 kind:arm_call to:0x020732ec module:overlay(0) diff --git a/config/eur/arm9/overlays/ov088/relocs.txt b/config/eur/arm9/overlays/ov088/relocs.txt index 5383e18b..7de75603 100644 --- a/config/eur/arm9/overlays/ov088/relocs.txt +++ b/config/eur/arm9/overlays/ov088/relocs.txt @@ -203,7 +203,7 @@ from:0x02166ed8 kind:load to:0x027e0994 module:dtcm from:0x02166edc kind:load to:0x02177218 module:overlay(88) from:0x02166ee0 kind:load to:0x027e09a8 module:dtcm from:0x02166ee4 kind:load to:0x027e0ce4 module:dtcm -from:0x02166eec kind:load to:0x020b3000 module:overlay(0) +from:0x02166eec kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02166ef0 kind:load to:0x027e0ce8 module:dtcm from:0x02166ef8 kind:load to:0x020b34c4 module:overlay(0) from:0x02166efc kind:load to:0x027e0ce0 module:dtcm @@ -233,7 +233,7 @@ from:0x02167328 kind:load to:0x027e0ce4 module:dtcm from:0x02167334 kind:load to:0x020b539c module:overlay(0) from:0x02167338 kind:load to:0x02174228 module:overlay(88) from:0x02167344 kind:load to:0x027e09ac module:dtcm -from:0x02167354 kind:load to:0x020b3000 module:overlay(0) +from:0x02167354 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02167380 kind:arm_call to:0x01fff3b4 module:itcm from:0x021673ac kind:load to:0x027e0ce4 module:dtcm from:0x021673c8 kind:arm_call to:0x01fff3b4 module:itcm diff --git a/config/eur/arm9/overlays/ov092/relocs.txt b/config/eur/arm9/overlays/ov092/relocs.txt index da768516..bf3b2745 100644 --- a/config/eur/arm9/overlays/ov092/relocs.txt +++ b/config/eur/arm9/overlays/ov092/relocs.txt @@ -518,7 +518,7 @@ from:0x021697ac kind:arm_call to:0x01fff350 module:itcm from:0x02169804 kind:arm_call to:0x01fff498 module:itcm from:0x02169840 kind:load to:0x027e09a4 module:dtcm from:0x02169844 kind:load to:0x027e0ce4 module:dtcm -from:0x0216984c kind:load to:0x020b3000 module:overlay(0) +from:0x0216984c kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02169854 kind:load to:0x027e0ce8 module:dtcm from:0x02169990 kind:arm_call to:0x0216cf04 module:overlay(92) from:0x02169a1c kind:load to:0x0217d800 module:overlay(92) diff --git a/config/eur/arm9/overlays/ov092/symbols.txt b/config/eur/arm9/overlays/ov092/symbols.txt index 45f05046..f8f4059b 100644 --- a/config/eur/arm9/overlays/ov092/symbols.txt +++ b/config/eur/arm9/overlays/ov092/symbols.txt @@ -160,7 +160,7 @@ func_ov092_021688c8 kind:function(arm,size=0x2c) addr:0x021688c8 func_ov092_021688f4 kind:function(arm,size=0x2c) addr:0x021688f4 func_ov092_02168920 kind:function(arm,size=0xb4) addr:0x02168920 func_ov092_021689d4 kind:function(arm,size=0x14) addr:0x021689d4 -func_ov092_021689e8 kind:function(arm,size=0xac) addr:0x021689e8 +_ZN25UnkStruct_027e0ce0_40_14C19func_ov092_021689e8EiP21UnkStruct_027e0ce0_40P15PlayerLinkActorP25UnkStruct_027e0ce0_40_328 kind:function(arm,size=0xac) addr:0x021689e8 func_ov092_02168a94 kind:function(arm,size=0x28) addr:0x02168a94 func_ov092_02168abc kind:function(arm,size=0x118) addr:0x02168abc func_ov092_02168bd4 kind:function(arm,size=0x2c) addr:0x02168bd4 diff --git a/config/eur/arm9/overlays/ov093/relocs.txt b/config/eur/arm9/overlays/ov093/relocs.txt index f1eea31c..da6d3b37 100644 --- a/config/eur/arm9/overlays/ov093/relocs.txt +++ b/config/eur/arm9/overlays/ov093/relocs.txt @@ -1158,7 +1158,7 @@ from:0x02171960 kind:arm_call to:0x02171004 module:overlay(93) from:0x02171968 kind:load to:0x02177d3c module:overlay(93) from:0x02171a14 kind:arm_call to:0x01fff350 module:itcm from:0x02171a50 kind:load to:0x027e0ce4 module:dtcm -from:0x02171a58 kind:load to:0x020b3000 module:overlay(0) +from:0x02171a58 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02171a94 kind:load to:0x02177d3c module:overlay(93) from:0x02171ae4 kind:arm_call to:0x02171004 module:overlay(93) from:0x02171b14 kind:arm_call to:0x0216f358 module:overlay(93) diff --git a/config/eur/arm9/overlays/ov093/symbols.txt b/config/eur/arm9/overlays/ov093/symbols.txt index 25193492..1a5ea578 100644 --- a/config/eur/arm9/overlays/ov093/symbols.txt +++ b/config/eur/arm9/overlays/ov093/symbols.txt @@ -85,7 +85,7 @@ _ZN19func_ov093_02168004D0Ev kind:function(arm,size=0x1c) addr:0x02168004 func_ov093_02168020 kind:function(arm,size=0xdc) addr:0x02168020 func_ov093_021680fc kind:function(arm,size=0xa8) addr:0x021680fc func_ov093_021681a4 kind:function(arm,size=0x7c) addr:0x021681a4 -func_ov093_02168220 kind:function(arm,size=0x38) addr:0x02168220 +_ZN21UnkStruct_027e0ce0_4019func_ov093_02168220Ev kind:function(arm,size=0x38) addr:0x02168220 func_ov093_02168258 kind:function(arm,size=0xb4) addr:0x02168258 func_ov093_0216830c kind:function(arm,size=0xfc) addr:0x0216830c func_ov093_02168408 kind:function(thumb,size=0x7c) addr:0x02168408 @@ -98,7 +98,7 @@ _ZN25UnkStruct_027e0ce0_40_14CD1Ev kind:function(thumb,size=0x2) addr:0x0216884c _ZN25UnkStruct_027e0ce0_40_14C19func_ov093_02168850Ev kind:function(thumb,size=0x14) addr:0x02168850 func_ov093_02168864 kind:function(arm,size=0x184) addr:0x02168864 func_ov093_021689e8 kind:function(arm,size=0x43c) addr:0x021689e8 -func_ov093_02168e24 kind:function(arm,size=0x6c) addr:0x02168e24 +_ZN25UnkStruct_027e0ce0_40_14C19func_ov093_02168e24Ei kind:function(arm,size=0x6c) addr:0x02168e24 func_ov093_02168e90 kind:function(thumb,size=0xa) addr:0x02168e90 func_ov093_02168e9c kind:function(arm,size=0x24) addr:0x02168e9c func_ov093_02168ec0 kind:function(arm,size=0x9c) addr:0x02168ec0 @@ -162,7 +162,7 @@ _ZN19func_ov093_0216ccbcD0Ev kind:function(arm,size=0x1c) addr:0x0216ccbc func_ov093_0216ccd8 kind:function(thumb,size=0x14) addr:0x0216ccd8 func_ov093_0216ccec kind:function(arm,size=0x94) addr:0x0216ccec func_ov093_0216cd80 kind:function(arm,size=0xa4) addr:0x0216cd80 -func_ov093_0216ce24 kind:function(arm,size=0x3c) addr:0x0216ce24 +_ZN15PlayerLinkActor19func_ov093_0216ce24EPi kind:function(arm,size=0x3c) addr:0x0216ce24 _ZN25UnkStruct_027e0ce0_40_328C1EPvP21UnkStruct_027e0ce0_40P25UnkStruct_027e0ce0_40_150Pj kind:function(thumb,size=0x1bc) addr:0x0216ce60 _ZN25UnkStruct_027e0ce0_40_328D1Ev kind:function(thumb,size=0xb6) addr:0x0216d01c _ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d0d4Ev kind:function(thumb,size=0x8c) addr:0x0216d0d4 @@ -173,13 +173,13 @@ func_ov093_0216d3fc kind:function(arm,size=0x30) addr:0x0216d3fc func_ov093_0216d42c kind:function(arm,size=0x14) addr:0x0216d42c func_ov093_0216d440 kind:function(arm,size=0xb4) addr:0x0216d440 func_ov093_0216d4f4 kind:function(arm,size=0xc4) addr:0x0216d4f4 -func_ov093_0216d5b8 kind:function(arm,size=0x830) addr:0x0216d5b8 +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d5b8Ei kind:function(arm,size=0x830) addr:0x0216d5b8 func_ov093_0216dde8 kind:function(arm,size=0x48) addr:0x0216dde8 -func_ov093_0216de30 kind:function(arm,size=0x98) addr:0x0216de30 -func_ov093_0216dec8 kind:function(arm,size=0x260) addr:0x0216dec8 +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216de30Eii kind:function(arm,size=0x98) addr:0x0216de30 +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216dec8Ei kind:function(arm,size=0x260) addr:0x0216dec8 func_ov093_0216e128 kind:function(arm,size=0x68) addr:0x0216e128 func_ov093_0216e190 kind:function(arm,size=0x14) addr:0x0216e190 -func_ov093_0216e1a4 kind:function(arm,size=0xfc) addr:0x0216e1a4 +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216e1a4Ei kind:function(arm,size=0xfc) addr:0x0216e1a4 func_ov093_0216e2a0 kind:function(arm,size=0x18) addr:0x0216e2a0 func_ov093_0216e2b8 kind:function(arm,size=0x20) addr:0x0216e2b8 func_ov093_0216e2d8 kind:function(arm,size=0x20) addr:0x0216e2d8 @@ -218,7 +218,7 @@ func_ov093_0216f66c kind:function(thumb,size=0x10) addr:0x0216f66c func_ov093_0216f67c kind:function(thumb,size=0x10) addr:0x0216f67c func_ov093_0216f68c kind:function(thumb,size=0x7c) addr:0x0216f68c func_ov093_0216f708 kind:function(thumb,size=0x12) addr:0x0216f708 -func_ov093_0216f71c kind:function(thumb,size=0x50) addr:0x0216f71c +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216f71cEPi kind:function(thumb,size=0x50) addr:0x0216f71c func_ov093_0216f76c kind:function(thumb,size=0xc) addr:0x0216f76c func_ov093_0216f778 kind:function(arm,size=0x78) addr:0x0216f778 func_ov093_0216f7f0 kind:function(arm,size=0x7c) addr:0x0216f7f0 diff --git a/config/eur/arm9/overlays/ov094/relocs.txt b/config/eur/arm9/overlays/ov094/relocs.txt index ab51ca88..595ead6b 100644 --- a/config/eur/arm9/overlays/ov094/relocs.txt +++ b/config/eur/arm9/overlays/ov094/relocs.txt @@ -752,7 +752,7 @@ from:0x0216be1c kind:load to:0x02049be4 module:main from:0x0216be20 kind:load to:0x020b539c module:overlay(0) from:0x0216be28 kind:load to:0x02178aa0 module:overlay(94) from:0x0216be2c kind:load to:0x027e0ce4 module:dtcm -from:0x0216be30 kind:load to:0x020b3000 module:overlay(0) +from:0x0216be30 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0216be34 kind:load to:0x0203e964 module:main from:0x0216bf14 kind:arm_call to:0x02058fc4 module:overlay(0) from:0x0216bf3c kind:arm_call to:0x01ffc634 module:itcm @@ -1080,7 +1080,7 @@ from:0x0216ef04 kind:load to:0x020b539c module:overlay(0) from:0x0216ef38 kind:arm_call to:0x01fff350 module:itcm from:0x0216ef58 kind:arm_call to:0x0216f250 module:overlay(94) from:0x0216ef64 kind:load to:0x027e0ce4 module:dtcm -from:0x0216ef6c kind:load to:0x020b3000 module:overlay(0) +from:0x0216ef6c kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0216ef7c kind:arm_call to:0x02098388 module:overlay(0) from:0x0216efd4 kind:arm_call_thumb to:0x02057b70 module:overlay(0) from:0x0216f010 kind:arm_call to:0x0203d160 module:main diff --git a/config/eur/arm9/overlays/ov095/relocs.txt b/config/eur/arm9/overlays/ov095/relocs.txt index 61955733..3b1e5d22 100644 --- a/config/eur/arm9/overlays/ov095/relocs.txt +++ b/config/eur/arm9/overlays/ov095/relocs.txt @@ -96,7 +96,7 @@ from:0x0217a544 kind:thumb_call to:0x0217a5c4 module:overlay(95) from:0x0217a54c kind:thumb_call_arm to:0x021540ac module:overlay(71) from:0x0217a556 kind:thumb_call to:0x020bba6c module:overlay(1) from:0x0217a57a kind:thumb_call to:0x0217a3cc module:overlay(95) -from:0x0217a584 kind:load to:0x020b3000 module:overlay(0) +from:0x0217a584 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0217a58c kind:load to:0x027e0ce4 module:dtcm from:0x0217a590 kind:load to:0x027e0ce0 module:dtcm from:0x0217a5c0 kind:load to:0x027e09b8 module:dtcm @@ -514,7 +514,7 @@ from:0x0217d888 kind:arm_call to:0x021244ec module:overlay(45) from:0x0217d898 kind:arm_call to:0x0208cf20 module:overlay(0) from:0x0217d8a4 kind:load to:0x027e09a8 module:dtcm from:0x0217d8ac kind:load to:0x027e0ce4 module:dtcm -from:0x0217d8bc kind:load to:0x020b3000 module:overlay(0) +from:0x0217d8bc kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0217d8c0 kind:load to:0x02177d0c module:overlays(89,90,91,93,94) from:0x0217d904 kind:arm_call to:0x01fff3b4 module:itcm from:0x0217d910 kind:arm_call to:0x01fff458 module:itcm diff --git a/config/eur/arm9/overlays/ov096/relocs.txt b/config/eur/arm9/overlays/ov096/relocs.txt index f5e6a789..0e788047 100644 --- a/config/eur/arm9/overlays/ov096/relocs.txt +++ b/config/eur/arm9/overlays/ov096/relocs.txt @@ -1,7 +1,7 @@ from:0x02179b4c kind:arm_call to:0x01fff350 module:itcm from:0x02179b68 kind:arm_call to:0x0217ad08 module:overlay(96) from:0x02179bb0 kind:load to:0x027e0ce4 module:dtcm -from:0x02179bb8 kind:load to:0x020b3000 module:overlay(0) +from:0x02179bb8 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02179bd4 kind:load to:0x027e0cd8 module:dtcm from:0x02179bd8 kind:load to:0x02081e30 module:overlay(0) from:0x02179bf2 kind:thumb_call_arm to:0x02081d7c module:overlay(0) @@ -20,7 +20,7 @@ from:0x02179d24 kind:thumb_call_arm to:0x0206c9a8 module:overlay(0) from:0x02179d36 kind:thumb_call_arm to:0x02070560 module:overlay(0) from:0x02179d4e kind:thumb_call_arm to:0x0206d180 module:overlay(0) from:0x02179d58 kind:load to:0x027e09a4 module:dtcm -from:0x02179d5c kind:load to:0x020b3000 module:overlay(0) +from:0x02179d5c kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02179d64 kind:load to:0x027e0ce4 module:dtcm from:0x02179d68 kind:load to:0x020b51b8 module:overlay(0) from:0x02179dc8 kind:arm_call_thumb to:0x02179c08 module:overlay(96) diff --git a/config/eur/arm9/overlays/ov101/relocs.txt b/config/eur/arm9/overlays/ov101/relocs.txt index f8160c1d..88f248e7 100644 --- a/config/eur/arm9/overlays/ov101/relocs.txt +++ b/config/eur/arm9/overlays/ov101/relocs.txt @@ -79,7 +79,7 @@ from:0x021831b4 kind:thumb_call to:0x020bcbd0 module:overlay(1) from:0x0218325e kind:thumb_call to:0x0216d1cc module:overlay(93) from:0x02183272 kind:thumb_call to:0x020bbf7c module:overlay(1) from:0x021832ac kind:thumb_call_arm to:0x01fff350 module:itcm -from:0x021832cc kind:load to:0x020b3000 module:overlay(0) +from:0x021832cc kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x021832d0 kind:load to:0x027e0ce4 module:dtcm from:0x021832dc kind:thumb_call to:0x020b6d58 module:overlay(1) from:0x021832f2 kind:thumb_call_arm to:0x02011ff4 module:main diff --git a/config/eur/arm9/overlays/ov101/symbols.txt b/config/eur/arm9/overlays/ov101/symbols.txt index 54d14fb5..c9cb35bd 100644 --- a/config/eur/arm9/overlays/ov101/symbols.txt +++ b/config/eur/arm9/overlays/ov101/symbols.txt @@ -14,7 +14,7 @@ _ZN21UnkStruct_027e0ce0_40D1Ev kind:function(thumb,size=0x54) addr:0x02182f60 _ZN21UnkStruct_027e0ce0_4019func_ov101_02182fb4Eb kind:function(thumb,size=0x50) addr:0x02182fb4 _ZN21UnkStruct_027e0ce0_4019func_ov101_02183004Ev kind:function(thumb,size=0x1e) addr:0x02183004 _ZN21UnkStruct_027e0ce0_4019func_ov101_02183024EPK24UnkStruct_ov001_020c40f4S2_iiP11ItemManagerP21UnkStruct_027e0ce0_30bb kind:function(thumb,size=0x260) addr:0x02183024 -_ZN21PlayerLinkActor_A0_1CC1Ei kind:function(thumb,size=0xc) addr:0x02183284 +_ZN21PlayerLinkActor_A0_1CC1EP21UnkStruct_027e0ce0_40 kind:function(thumb,size=0xc) addr:0x02183284 _ZN21PlayerLinkActor_A0_1C19func_ov101_02183290Ev kind:function(thumb,size=0x48) addr:0x02183290 _ZN30UnkStruct_027e09a4_54_Derived1C2EPi kind:function(thumb,size=0x50) addr:0x021832d8 _ZN30UnkStruct_027e09a4_54_Derived18vfunc_0CEv kind:function(thumb,size=0x134) addr:0x02183328 diff --git a/config/eur/arm9/overlays/ov102/delinks.txt b/config/eur/arm9/overlays/ov102/delinks.txt index 53ff4c88..e19f4369 100644 --- a/config/eur/arm9/overlays/ov102/delinks.txt +++ b/config/eur/arm9/overlays/ov102/delinks.txt @@ -4,3 +4,26 @@ .ctor start:0x02184974 end:0x02184978 kind:rodata align:4 .data start:0x02184980 end:0x02184a40 kind:data align:32 .bss start:0x02184a40 end:0x02184a40 kind:bss align:32 + +src/102_CourseExecLand/UnkStruct_027e0ce0_40_102.cpp: + .text start:0x02182c20 end:0x021835c4 + +src/102_CourseExecLand/MapObjectUnkSAND_102.cpp: + complete + .text start:0x021835c4 end:0x02183c14 + .rodata start:0x021848b0 end:0x02184950 + +src/102_CourseExecLand/MapObjectUnkPTFL_102.cpp: + .text start:0x02183c14 end:0x021845c8 + .data start:0x02184980 end:0x02184a10 + +src/102_CourseExecLand/UnkStruct_027e0cd8_0C_102.cpp: + complete + .text start:0x021845c8 end:0x02184644 + +src/102_CourseExecLand/ActorUnkMLCK_102.cpp: + complete + .text start:0x02184644 end:0x021848b0 + .init start:0x02184950 end:0x02184974 + .ctor start:0x02184974 end:0x02184978 + .data start:0x02184a10 end:0x02184a40 diff --git a/config/eur/arm9/overlays/ov102/relocs.txt b/config/eur/arm9/overlays/ov102/relocs.txt index 27fa9198..223d23c3 100644 --- a/config/eur/arm9/overlays/ov102/relocs.txt +++ b/config/eur/arm9/overlays/ov102/relocs.txt @@ -156,7 +156,7 @@ from:0x02184784 kind:arm_call to:0x020732fc module:overlay(0) from:0x021847b4 kind:load to:0x020d86b0 module:overlay(24) from:0x021847b8 kind:load to:0x027e0cf0 module:dtcm from:0x021847bc kind:load to:0x027e0ce4 module:dtcm -from:0x021847c0 kind:load to:0x02184a24 module:overlay(102) +from:0x021847c0 kind:load to:0x02184a1c add:0x8 module:overlay(102) from:0x021847c8 kind:load to:0x020b51b8 module:overlay(0) from:0x021847cc kind:load to:0x020b51c8 module:overlay(0) from:0x021847d0 kind:load to:0x027e09b8 module:dtcm diff --git a/config/eur/arm9/overlays/ov102/symbols.txt b/config/eur/arm9/overlays/ov102/symbols.txt index e026bbb9..7534097e 100644 --- a/config/eur/arm9/overlays/ov102/symbols.txt +++ b/config/eur/arm9/overlays/ov102/symbols.txt @@ -1,39 +1,39 @@ -func_ov102_02182c20 kind:function(arm,size=0x64) addr:0x02182c20 -func_ov102_02182c84 kind:function(arm,size=0x1d0) addr:0x02182c84 -func_ov102_02182e54 kind:function(arm,size=0x154) addr:0x02182e54 -func_ov102_02182fa8 kind:function(arm,size=0x54) addr:0x02182fa8 -func_ov102_02182ffc kind:function(arm,size=0x40) addr:0x02182ffc -func_ov102_0218303c kind:function(arm,size=0x144) addr:0x0218303c -func_ov102_02183180 kind:function(arm,size=0x34) addr:0x02183180 -func_ov102_021831b4 kind:function(arm,size=0x3c) addr:0x021831b4 -func_ov102_021831f0 kind:function(arm,size=0x4c) addr:0x021831f0 -func_ov102_0218323c kind:function(arm,size=0x1d8) addr:0x0218323c -func_ov102_02183414 kind:function(arm,size=0x1b0) addr:0x02183414 -func_ov102_021835c4 kind:function(arm,size=0x1e4) addr:0x021835c4 -func_ov102_021837a8 kind:function(arm,size=0x1c0) addr:0x021837a8 -func_ov102_02183968 kind:function(arm,size=0x1c0) addr:0x02183968 -func_ov102_02183b28 kind:function(arm,size=0x48) addr:0x02183b28 -func_ov102_02183b70 kind:function(arm,size=0xa4) addr:0x02183b70 -func_ov102_02183c14 kind:function(arm,size=0x58) addr:0x02183c14 -func_ov102_02183c6c kind:function(arm,size=0x28) addr:0x02183c6c -func_ov102_02183c94 kind:function(arm,size=0x110) addr:0x02183c94 -func_ov102_02183da4 kind:function(arm,size=0x44) addr:0x02183da4 -func_ov102_02183de8 kind:function(arm,size=0x180) addr:0x02183de8 -func_ov102_02183f68 kind:function(arm,size=0x14) addr:0x02183f68 -func_ov102_02183f7c kind:function(arm,size=0x220) addr:0x02183f7c -func_ov102_0218419c kind:function(arm,size=0x218) addr:0x0218419c -func_ov102_021843b4 kind:function(arm,size=0x214) addr:0x021843b4 -func_ov102_021845c8 kind:function(arm,size=0x60) addr:0x021845c8 -func_ov102_02184628 kind:function(arm,size=0x1c) addr:0x02184628 -_ZN20Actor_ov102_021849508vfunc_20Ev kind:function(arm,size=0x190) addr:0x02184644 -_ZN20Actor_ov102_021849508vfunc_24Ev kind:function(arm,size=0x14) addr:0x021847d4 -func_ov102_021847e8 kind:function(arm,size=0x78) addr:0x021847e8 -func_ov102_02184860 kind:function(arm,size=0x50) addr:0x02184860 -data_ov102_021848b0 kind:data(any) addr:0x021848b0 -data_ov102_021848f0 kind:data(any) addr:0x021848f0 -__sinit_ov102_02184950 kind:function(arm,size=0x24) addr:0x02184950 -.p__sinit_ov102_02184950 kind:data(word) addr:0x02184974 -data_ov102_02184980 kind:data(any) addr:0x02184980 -data_ov102_021849a8 kind:data(any) addr:0x021849a8 -data_ov102_02184a10 kind:data(any) addr:0x02184a10 -data_ov102_02184a24 kind:data(any) addr:0x02184a24 +_ZN18PlayerActorBase_7419func_ov102_02182c20EiP7Mat4x3p kind:function(arm,size=0x64) addr:0x02182c20 +_ZN18PlayerActorBase_7419func_ov102_02182c84Ebi14UnkAngleStructP7Mat4x3pS2_ kind:function(arm,size=0x1d0) addr:0x02182c84 +_ZN25UnkStruct_027e0ce0_40_10819func_ov102_02182e54Eiii kind:function(arm,size=0x154) addr:0x02182e54 +_ZN24UnkStruct_ItemManager_2019func_ov102_02182fa8Eii kind:function(arm,size=0x54) addr:0x02182fa8 +_ZN24UnkStruct_ItemManager_2019func_ov102_02182ffcEi kind:function(arm,size=0x40) addr:0x02182ffc +_ZN21UnkStruct_027e0ce0_4019func_ov102_0218303cEiP11ItemManager kind:function(arm,size=0x144) addr:0x0218303c +_ZN21UnkStruct_027e0ce0_4019func_ov102_02183180Eib kind:function(arm,size=0x34) addr:0x02183180 +_ZN21UnkStruct_027e0ce0_4019func_ov102_021831b4Ei kind:function(arm,size=0x3c) addr:0x021831b4 +_ZN21UnkStruct_027e0ce0_4019func_ov102_021831f0Ei kind:function(arm,size=0x4c) addr:0x021831f0 +_ZN29UnkStruct_027e0ce0_40_Base_7419func_ov102_0218323cEP29UnkStruct_027e0ce0_40_Base_14i kind:function(arm,size=0x1d8) addr:0x0218323c +_Z19func_ov102_02183414PsP21PlayerLinkActor_A0_1CbP7VecFx3214UnkAngleStructi kind:function(arm,size=0x1b0) addr:0x02183414 +_ZN19MapObjectUnkSAND_4019func_ov102_021835c4EP7VecFx32 kind:function(arm,size=0x1e4) addr:0x021835c4 +_ZN19MapObjectUnkSAND_4019func_ov102_021837a8E8Vec2bCppP7VecFx32 kind:function(arm,size=0x1c0) addr:0x021837a8 +_ZN16MapObjectUnkSAND8vfunc_08Ev kind:function(arm,size=0x1c0) addr:0x02183968 +_ZN16MapObjectUnkSAND8vfunc_0CEv kind:function(arm,size=0x48) addr:0x02183b28 +_ZN16MapObjectUnkSAND8vfunc_14Ev kind:function(arm,size=0xa4) addr:0x02183b70 +_Z19func_ov102_02183c14i kind:function(arm,size=0x58) addr:0x02183c14 +_Z19func_ov102_02183c6ci kind:function(arm,size=0x28) addr:0x02183c6c +_Z19func_ov102_02183c94iiiiitttti kind:function(arm,size=0x110) addr:0x02183c94 +_Z19func_ov102_02183da4iiiiitttti kind:function(arm,size=0x44) addr:0x02183da4 +_ZN16MapObjectUnkPTFL8vfunc_08Ev kind:function(arm,size=0x180) addr:0x02183de8 +_ZN16MapObjectUnkPTFL8vfunc_0CEv kind:function(arm,size=0x14) addr:0x02183f68 +_ZN16MapObjectUnkPTFL8vfunc_14Ev kind:function(arm,size=0x220) addr:0x02183f7c +_ZN16MapObjectUnkPTFL19func_ov102_0218419cEv kind:function(arm,size=0x218) addr:0x0218419c +_ZN16MapObjectUnkPTFL19func_ov102_021843b4Ev kind:function(arm,size=0x214) addr:0x021843b4 +_ZN21UnkStruct_027e0cd8_0C8vfunc_0CEv kind:function(arm,size=0x60) addr:0x021845c8 +_ZN21UnkStruct_027e0cd8_0C19func_ov102_02184628Ev kind:function(arm,size=0x1c) addr:0x02184628 +_ZN12ActorUnkMLCK8vfunc_20Ev kind:function(arm,size=0x190) addr:0x02184644 +_ZN12ActorUnkMLCK8vfunc_24Ev kind:function(arm,size=0x14) addr:0x021847d4 +_ZN15ActorUnkMLCK_C419func_ov102_021847e8Eii kind:function(arm,size=0x78) addr:0x021847e8 +_ZN24UnkStruct_ov102_02184a248vfunc_00EP5Actor kind:function(arm,size=0x50) addr:0x02184860 +data_ov102_021848b0 kind:data(any) addr:0x021848b0 local +data_ov102_021848f0 kind:data(any) addr:0x021848f0 local +__sinit_ActorUnkMLCK_102.cpp kind:function(arm,size=0x24) addr:0x02184950 local +.p__sinit_ActorUnkMLCK_102.cpp kind:data(word) addr:0x02184974 local +data_ov102_02184980 kind:data(any) addr:0x02184980 local +data_ov102_021849a8 kind:data(any) addr:0x021849a8 local +data_ov102_02184a10 kind:data(any) addr:0x02184a10 local +_ZTV24UnkStruct_ov102_02184a24 kind:data(byte[12]) addr:0x02184a1c diff --git a/config/eur/arm9/overlays/ov105/relocs.txt b/config/eur/arm9/overlays/ov105/relocs.txt index 114a0dcd..10f463d9 100644 --- a/config/eur/arm9/overlays/ov105/relocs.txt +++ b/config/eur/arm9/overlays/ov105/relocs.txt @@ -280,7 +280,7 @@ from:0x02186b74 kind:arm_call to:0x02185388 module:overlay(105) from:0x02186be0 kind:arm_call to:0x02082adc module:overlay(0) from:0x02186c40 kind:load to:0x027e09bc module:dtcm from:0x02186c44 kind:load to:0x027e0ce4 module:dtcm -from:0x02186c4c kind:load to:0x020b3000 module:overlay(0) +from:0x02186c4c kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02186c50 kind:load to:0x0218a1b0 module:overlay(105) from:0x02186c54 kind:load to:0x0218a1ac module:overlay(105) from:0x02186c58 kind:load to:0x027e09b8 module:dtcm @@ -430,7 +430,7 @@ from:0x02188328 kind:arm_call to:0x021878fc module:overlay(105) from:0x02188348 kind:arm_call to:0x01fff350 module:itcm from:0x02188384 kind:load to:0x027e0ce4 module:dtcm from:0x02188388 kind:load to:0x027e09bc module:dtcm -from:0x02188390 kind:load to:0x020b3000 module:overlay(0) +from:0x02188390 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02188394 kind:load to:0x0218a2d8 module:overlay(105) from:0x02188398 kind:load to:0x0218a1bc module:overlay(105) from:0x021883a0 kind:load to:0x0203e964 module:main @@ -455,7 +455,7 @@ from:0x02188628 kind:load to:0x0218a1a8 module:overlay(105) from:0x0218862c kind:load to:0x0218a1a4 module:overlay(105) from:0x02188630 kind:load to:0x0218a1a0 module:overlay(105) from:0x02188634 kind:load to:0x027e0ce4 module:dtcm -from:0x0218863c kind:load to:0x020b3000 module:overlay(0) +from:0x0218863c kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02188640 kind:load to:0x0218a140 module:overlay(105) from:0x02188644 kind:load to:0x0218a194 module:overlay(105) from:0x02188648 kind:load to:0x0218a198 module:overlay(105) @@ -601,7 +601,7 @@ from:0x02189d9c kind:arm_call to:0x020f5b94 module:overlay(31) from:0x02189da4 kind:arm_call to:0x020f4320 module:overlay(31) from:0x02189db4 kind:load to:0x021108f8 module:overlay(31) from:0x02189dc0 kind:load to:0x027e0ce4 module:dtcm -from:0x02189dc8 kind:load to:0x020b3000 module:overlay(0) +from:0x02189dc8 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02189dcc kind:load to:0x0211093c module:overlay(31) from:0x02189dd8 kind:load to:0x0203e964 module:main from:0x02189de0 kind:load to:0x027e0ce0 module:dtcm diff --git a/config/eur/arm9/overlays/ov107/relocs.txt b/config/eur/arm9/overlays/ov107/relocs.txt index ebc3bbe0..8e81f985 100644 --- a/config/eur/arm9/overlays/ov107/relocs.txt +++ b/config/eur/arm9/overlays/ov107/relocs.txt @@ -166,7 +166,7 @@ from:0x02185fec kind:arm_call to:0x020907c4 module:overlay(0) from:0x02185ff4 kind:load to:0x027e0cdc module:dtcm from:0x02186020 kind:arm_call to:0x01fff350 module:itcm from:0x02186040 kind:load to:0x027e0ce4 module:dtcm -from:0x02186048 kind:load to:0x020b3000 module:overlay(0) +from:0x02186048 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x02186068 kind:load to:0x0210b17c module:overlay(31) from:0x02186074 kind:arm_call to:0x0209cfe0 module:overlay(0) from:0x0218608c kind:arm_call to:0x0218604c module:overlay(107) diff --git a/config/eur/arm9/overlays/ov112/relocs.txt b/config/eur/arm9/overlays/ov112/relocs.txt index 68d3ec5f..e1670fb8 100644 --- a/config/eur/arm9/overlays/ov112/relocs.txt +++ b/config/eur/arm9/overlays/ov112/relocs.txt @@ -45,7 +45,7 @@ from:0x02185730 kind:load to:0x0203f964 module:main from:0x02185734 kind:load to:0x027e0ce8 module:dtcm from:0x02185744 kind:load to:0x027e0ce4 module:dtcm from:0x02185760 kind:load to:0x027e09a4 module:dtcm -from:0x02185768 kind:load to:0x020b3000 module:overlay(0) +from:0x02185768 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x0218576c kind:load to:0x027e09b8 module:dtcm from:0x021857c4 kind:arm_call to:0x0208fdd4 module:overlay(0) from:0x021857d8 kind:arm_call to:0x020921e4 module:overlay(0) diff --git a/config/eur/arm9/relocs.txt b/config/eur/arm9/relocs.txt index 3fb61abd..cd7af2c4 100644 --- a/config/eur/arm9/relocs.txt +++ b/config/eur/arm9/relocs.txt @@ -2093,7 +2093,7 @@ from:0x02017020 kind:arm_call to:0x01fff350 module:itcm from:0x02017054 kind:arm_call to:0x01ffb9cc module:itcm from:0x0201707c kind:arm_call to:0x01fff350 module:itcm from:0x020170a4 kind:load to:0x027e0ce4 module:dtcm -from:0x020170a8 kind:load to:0x020b3000 module:overlay(0) +from:0x020170a8 kind:load to:0x020b2ff8 add:0x8 module:overlay(0) from:0x020170cc kind:arm_call to:0x01fff520 module:itcm from:0x020170f0 kind:arm_call to:0x01ffb9cc module:itcm from:0x0201711c kind:arm_call to:0x01ffb9cc module:itcm diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 66b12dfb..0ecc1c75 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -145,7 +145,7 @@ func_02002e78 kind:function(arm,size=0x20) addr:0x02002e78 func_02002e98 kind:function(arm,size=0x20) addr:0x02002e98 func_02002eb8 kind:function(arm,size=0x20) addr:0x02002eb8 NNS_Snd_func_0206617c kind:function(arm,size=0x2c) addr:0x02002ed8 -func_02002f04 kind:function(arm,size=0x28) addr:0x02002f04 +_ZN24UnkStruct_ov000_020b51c013func_02002f04Ev kind:function(arm,size=0x28) addr:0x02002f04 func_02002f2c kind:function(arm,size=0x28) addr:0x02002f2c func_02002f54 kind:function(arm,size=0x48) addr:0x02002f54 func_02002f9c kind:function(arm,size=0x28) addr:0x02002f9c diff --git a/config/eur1/arm9/itcm/symbols.txt b/config/eur1/arm9/itcm/symbols.txt index b7b72329..2fd37aa2 100644 --- a/config/eur1/arm9/itcm/symbols.txt +++ b/config/eur1/arm9/itcm/symbols.txt @@ -128,7 +128,7 @@ func_01ffc520 kind:function(arm,size=0x5c) addr:0x01ffc520 _ZN11ModelRender8vfunc_0CEv kind:function(arm,size=0x24) addr:0x01ffc57c func_01ffc5a0 kind:function(arm,size=0x94) addr:0x01ffc5a0 _ZN15ModelRenderBase13func_01ffc634EP7VecFx3214UnkAngleStructS1_ kind:function(arm,size=0xa0) addr:0x01ffc634 -_ZN19UnkSystem6_Derived213func_01ffc6d4E14UnkAngleStructP7VecFx32 kind:function(arm,size=0x70) addr:0x01ffc6d4 +_ZN15ModelRenderBase13func_01ffc6d4E14UnkAngleStructP7VecFx32 kind:function(arm,size=0x70) addr:0x01ffc6d4 func_01ffc744 kind:function(arm,size=0x24) addr:0x01ffc744 _ZN24UnkStruct_ov000_020b4ec413func_01ffc768Ei kind:function(arm,size=0x3c) addr:0x01ffc768 _ZN20ModelRender_Derived18vfunc_1CEP19UnkSystem4_vfunc_1C kind:function(arm,size=0xb4) addr:0x01ffc7a4 @@ -157,7 +157,7 @@ _ZN18UnkStruct_027e09a46IsLandEv kind:function(arm,size=0x28) addr:0x01ffd3b0 _ZN18UnkStruct_027e09a47IsTrainEv kind:function(arm,size=0x28) addr:0x01ffd3d8 _ZNK18UnkStruct_027e09a421GetCurrentCourseEntryEv kind:function(arm,size=0x20) addr:0x01ffd400 _ZN18UnkStruct_027e09b813func_01ffd420Ev kind:function(arm,size=0x1c) addr:0x01ffd420 -func_01ffd43c kind:function(arm,size=0x60) addr:0x01ffd43c +_ZN21UnkStruct_027e09bc_0C13func_01ffd43cEP5Vec2sii kind:function(arm,size=0x60) addr:0x01ffd43c func_01ffd49c kind:function(arm,size=0x1a4) addr:0x01ffd49c _ZN21UnkStruct_027e09bc_0C13func_01ffd640EP7VecFx32 kind:function(arm,size=0x128) addr:0x01ffd640 func_01ffd768 kind:function(arm,size=0x138) addr:0x01ffd768 @@ -199,7 +199,7 @@ func_01fff280 kind:function(arm,size=0x28) addr:0x01fff280 func_01fff2a8 kind:function(arm,size=0x24) addr:0x01fff2a8 func_01fff2cc kind:function(arm,size=0x30) addr:0x01fff2cc func_01fff2fc kind:function(arm,size=0x54) addr:0x01fff2fc -_ZN12ActorManager13func_01fff350EPvPP5Actor kind:function(arm,size=0x64) addr:0x01fff350 +_ZN12ActorManager13func_01fff350EP29UnkStruct_ov000_020b3000_BasePP5Actor kind:function(arm,size=0x64) addr:0x01fff350 _ZN12ActorManager13func_01fff3b4E8ActorRef kind:function(arm,size=0x8c) addr:0x01fff3b4 func_01fff440 kind:function(arm,size=0x18) addr:0x01fff440 _ZN5Actor10GetActorIdEv kind:function(arm,size=0xc) addr:0x01fff458 diff --git a/config/eur1/arm9/overlays/ov000/relocs.txt b/config/eur1/arm9/overlays/ov000/relocs.txt index 5b27f6ba..aca67e69 100644 --- a/config/eur1/arm9/overlays/ov000/relocs.txt +++ b/config/eur1/arm9/overlays/ov000/relocs.txt @@ -3438,7 +3438,7 @@ from:0x020756bc kind:load to:0x027e0d3c module:dtcm from:0x020756c0 kind:load to:0x027e0ce0 module:dtcm from:0x020756c4 kind:load to:0x020b240c module:overlay(0) from:0x020756c8 kind:load to:0x027e0ce4 module:dtcm -from:0x020756cc kind:load to:0x020b3040 module:overlay(0) +from:0x020756cc kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x020756dc kind:arm_call to:0x020752e8 module:overlay(0) from:0x020756f8 kind:arm_call to:0x02075438 module:overlay(0) from:0x02075714 kind:arm_call to:0x01fff3b4 module:itcm @@ -3842,7 +3842,7 @@ from:0x02079908 kind:load to:0x027e0cdc module:dtcm from:0x0207990c kind:load to:0x020b25f0 module:overlay(0) from:0x02079910 kind:load to:0x027e09a4 module:dtcm from:0x02079914 kind:load to:0x027e0ce4 module:dtcm -from:0x0207991c kind:load to:0x020b3040 module:overlay(0) +from:0x0207991c kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02079958 kind:load to:0x020b25f0 module:overlay(0) from:0x020799a8 kind:arm_call to:0x02082a3c module:overlay(0) from:0x02079a00 kind:arm_call to:0x01ffb714 module:itcm @@ -3978,7 +3978,7 @@ from:0x0207b400 kind:arm_call to:0x02077914 module:overlay(0) from:0x0207b434 kind:load to:0x027e0ce0 module:dtcm from:0x0207b438 kind:load to:0x027e09a4 module:dtcm from:0x0207b440 kind:load to:0x027e0ce4 module:dtcm -from:0x0207b448 kind:load to:0x020b3040 module:overlay(0) +from:0x0207b448 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0207b458 kind:load to:0x027e09bc module:dtcm from:0x0207b464 kind:arm_call to:0x0207933c module:overlay(0) from:0x0207b478 kind:arm_call to:0x0207933c module:overlay(0) diff --git a/config/eur1/arm9/overlays/ov000/symbols.txt b/config/eur1/arm9/overlays/ov000/symbols.txt index ee0017ba..20d818f2 100644 --- a/config/eur1/arm9/overlays/ov000/symbols.txt +++ b/config/eur1/arm9/overlays/ov000/symbols.txt @@ -456,7 +456,7 @@ _ZN23TitleScreenManager_Base8vfunc_44Ev kind:function(arm,size=0x4) addr:0x02061 func_ov000_02061040 kind:function(arm,size=0x44) addr:0x02061040 func_ov000_02061084 kind:function(arm,size=0x14) addr:0x02061084 _ZN18UnkStruct_0204a08819func_ov000_02061098Ev kind:function(arm,size=0x144) addr:0x02061098 -_ZN18UnkStruct_0204a08819func_ov000_020611dcEPvi kind:function(arm,size=0x20) addr:0x020611dc +_ZN18UnkStruct_0204a08819func_ov000_020611dcEP29FileSelectManager_UnkDrawBasei kind:function(arm,size=0x20) addr:0x020611dc _ZN18UnkStruct_0204a08819func_ov000_020611fcEi kind:function(arm,size=0x28) addr:0x020611fc _ZN18UnkStruct_0204a08819func_ov000_02061224Ev kind:function(arm,size=0xc) addr:0x02061224 _ZN18UnkStruct_0204a08819func_ov000_02061230Ev kind:function(arm,size=0xc) addr:0x02061230 @@ -469,14 +469,14 @@ _ZN29FileSelectManager_UnkDrawBaseC1Ev kind:function(arm,size=0x24) addr:0x02061 _ZN29FileSelectManager_UnkDrawBaseD1Ev kind:function(arm,size=0x18) addr:0x02061690 _ZN29FileSelectManager_UnkDrawBaseD0Ev kind:function(arm,size=0x20) addr:0x020616a8 _ZN29FileSelectManager_UnkDrawBaseD2Ev kind:function(arm,size=0x18) addr:0x020616c8 -_ZN29FileSelectManager_UnkDrawBase8vfunc_08Ei kind:function(arm,size=0x4) addr:0x020616e0 -_ZN29FileSelectManager_UnkDrawBase8vfunc_0CEi kind:function(arm,size=0x4) addr:0x020616e4 -_ZN29FileSelectManager_UnkDrawBase8vfunc_10Eii kind:function(arm,size=0x4) addr:0x020616e8 -_ZN29FileSelectManager_UnkDrawBase8vfunc_14Ei kind:function(arm,size=0x4) addr:0x020616ec -_ZN29FileSelectManager_UnkDrawBase8vfunc_18Ei kind:function(arm,size=0x4) addr:0x020616f0 -_ZN29FileSelectManager_UnkDrawBase8vfunc_1CEi kind:function(arm,size=0x4) addr:0x020616f4 -_ZN29FileSelectManager_UnkDrawBase8vfunc_20Eii kind:function(arm,size=0x4) addr:0x020616f8 -_ZN29FileSelectManager_UnkDrawBase8vfunc_24Ev kind:function(arm,size=0x4) addr:0x020616fc +_ZN29FileSelectManager_UnkDrawBase9vfunc2_08Ei kind:function(arm,size=0x4) addr:0x020616e0 +_ZN29FileSelectManager_UnkDrawBase9vfunc2_0CEi kind:function(arm,size=0x4) addr:0x020616e4 +_ZN29FileSelectManager_UnkDrawBase8vfunc_54Eii kind:function(arm,size=0x4) addr:0x020616e8 +_ZN29FileSelectManager_UnkDrawBase9vfunc2_14Ei kind:function(arm,size=0x4) addr:0x020616ec +_ZN29FileSelectManager_UnkDrawBase9vfunc2_18Ei kind:function(arm,size=0x4) addr:0x020616f0 +_ZN29FileSelectManager_UnkDrawBase8vfunc_5CEi kind:function(arm,size=0x4) addr:0x020616f4 +_ZN29FileSelectManager_UnkDrawBase8vfunc_58Eii kind:function(arm,size=0x4) addr:0x020616f8 +_ZN29FileSelectManager_UnkDrawBase8vfunc_60Ev kind:function(arm,size=0x4) addr:0x020616fc _ZN23UnkStruct_027e0998_BaseC2Ev kind:function(thumb,size=0x24) addr:0x02061700 _ZN23UnkStruct_027e0998_BaseC1Ev kind:function(thumb,size=0x24) addr:0x02061724 func_ov000_02061748 kind:function(thumb,size=0x16) addr:0x02061748 @@ -862,7 +862,7 @@ func_ov000_0206bb30 kind:function(arm,size=0xcc) addr:0x0206bb30 _ZN24UnkStruct_ov000_020b51b819func_ov000_0206bbfcEi kind:function(arm,size=0x18) addr:0x0206bbfc func_ov000_0206bc14 kind:function(arm,size=0xe4) addr:0x0206bc14 func_ov000_0206bcf8 kind:function(arm,size=0xdc) addr:0x0206bcf8 -func_ov000_0206bdd4 kind:function(arm,size=0x10) addr:0x0206bdd4 +_ZN24UnkStruct_ov000_020b51b819func_ov000_0206bdd4EP15PlayerLinkActor kind:function(arm,size=0x10) addr:0x0206bdd4 func_ov000_0206bde4 kind:function(arm,size=0xe8) addr:0x0206bde4 func_ov000_0206becc kind:function(arm,size=0x60) addr:0x0206becc func_ov000_0206bf2c kind:function(arm,size=0x10) addr:0x0206bf2c @@ -936,8 +936,8 @@ func_ov000_0206e9f8 kind:function(arm,size=0x60) addr:0x0206e9f8 func_ov000_0206ea58 kind:function(arm,size=0x100) addr:0x0206ea58 func_ov000_0206eb58 kind:function(arm,size=0xd0) addr:0x0206eb58 func_ov000_0206ec28 kind:function(arm,size=0xf4) addr:0x0206ec28 -func_ov000_0206ed1c kind:function(arm,size=0xbc) addr:0x0206ed1c -func_ov000_0206edd8 kind:function(arm,size=0x160) addr:0x0206edd8 +_ZN24UnkStruct_ov000_020b521419func_ov000_0206ed1cEP15PlayerLinkActor kind:function(arm,size=0xbc) addr:0x0206ed1c +_ZN24UnkStruct_ov000_020b521419func_ov000_0206edd8EP15PlayerLinkActor kind:function(arm,size=0x160) addr:0x0206edd8 func_ov000_0206ef38 kind:function(arm,size=0xb0) addr:0x0206ef38 func_ov000_0206efe8 kind:function(arm,size=0x26c) addr:0x0206efe8 func_ov000_0206f254 kind:function(arm,size=0x8c) addr:0x0206f254 @@ -2671,7 +2671,7 @@ func_ov000_0209fe84 kind:function(arm,size=0x1c) addr:0x0209fed8 func_ov000_0209fea0 kind:function(arm,size=0xc) addr:0x0209fef4 _ZN18UnkStruct_027e0cec19func_ov000_0209feacEiP7VecFx32iii kind:function(arm,size=0x78) addr:0x0209ff00 _ZN18UnkStruct_027e0cec19func_ov000_0209ff24EiP7VecFx32P7VecFx16i kind:function(arm,size=0x28) addr:0x0209ff78 -func_ov000_0209ff4c kind:function(arm,size=0x40) addr:0x0209ffa0 +_ZN18UnkStruct_027e0cec19func_ov000_0209ff4cEiP7VecFx3214UnkAngleStructi kind:function(arm,size=0x40) addr:0x0209ffa0 _ZN18UnkStruct_027e0cec19func_ov000_0209ff8cEP22UnkStruct_PlayerGet_eciP7VecFx32i kind:function(arm,size=0x74) addr:0x0209ffe0 func_ov000_020a0000 kind:function(arm,size=0xa0) addr:0x020a0054 func_ov000_020a00a0 kind:function(arm,size=0x34) addr:0x020a00f4 @@ -3655,7 +3655,7 @@ data_ov000_020b2ffc kind:data(any) addr:0x020b2ffc data_ov000_020b301c kind:data(any) addr:0x020b301c data_ov000_020b2fe8 kind:data(any) addr:0x020b3028 data_ov000_020b3034 kind:data(any) addr:0x020b3034 -data_ov000_020b3000 kind:data(any) addr:0x020b3040 +_ZTV24UnkStruct_ov000_020b3000 kind:data(any) addr:0x020b3038 data_ov000_020b304c kind:data(any) addr:0x020b304c data_ov000_020b3058 kind:data(any) addr:0x020b3058 data_ov000_020b303c kind:data(any) addr:0x020b307c @@ -4026,7 +4026,7 @@ data_ov000_020b51ec kind:bss addr:0x020b51ec data_ov000_020b51b8 kind:bss addr:0x020b51f8 data_ov000_020b5200 kind:bss addr:0x020b5200 data_ov000_020b5204 kind:bss addr:0x020b5204 -data_ov000_020b5208 kind:bss addr:0x020b5208 +data_ov000_020b51c8 kind:bss addr:0x020b5208 data_ov000_020b5250 kind:bss addr:0x020b5250 data_ov000_020b5214_eur kind:bss addr:0x020b5254 data_ov000_020b52f0 kind:bss addr:0x020b52f0 diff --git a/config/eur1/arm9/overlays/ov001/relocs.txt b/config/eur1/arm9/overlays/ov001/relocs.txt index 1257c8c7..c8080d7f 100644 --- a/config/eur1/arm9/overlays/ov001/relocs.txt +++ b/config/eur1/arm9/overlays/ov001/relocs.txt @@ -1141,7 +1141,7 @@ from:0x020bbaa8 kind:load to:0x02043e50 module:main from:0x020bbac2 kind:thumb_call_arm to:0x01fff350 module:itcm from:0x020bbadc kind:thumb_call_arm to:0x02098544 module:overlay(0) from:0x020bbae6 kind:thumb_call_arm to:0x01fff350 module:itcm -from:0x020bbaf8 kind:load to:0x020b3040 module:overlay(0) +from:0x020bbaf8 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x020bbb00 kind:load to:0x027e0ce4 module:dtcm from:0x020bbb24 kind:thumb_call_arm to:0x02011f3c module:main from:0x020bbb2e kind:thumb_call to:0x02057750 module:overlay(0) @@ -1508,7 +1508,7 @@ from:0x020bd4cc kind:thumb_call_arm to:0x02092238 module:overlay(0) from:0x020bd4d4 kind:load to:0x027e09a4 module:dtcm from:0x020bd4d8 kind:load to:0x020d8780 module:overlay(24) from:0x020bd4dc kind:load to:0x020aa8e4 module:overlay(0) -from:0x020bd4e0 kind:load to:0x020b3040 module:overlay(0) +from:0x020bd4e0 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x020bd4e4 kind:load to:0x027e0ce4 module:dtcm from:0x020bd4ec kind:load to:0x027e09b8 module:dtcm from:0x020bd504 kind:thumb_call_arm to:0x02011f3c module:main diff --git a/config/eur1/arm9/overlays/ov017/symbols.txt b/config/eur1/arm9/overlays/ov017/symbols.txt index 11245bb7..5f1c0884 100644 --- a/config/eur1/arm9/overlays/ov017/symbols.txt +++ b/config/eur1/arm9/overlays/ov017/symbols.txt @@ -15,8 +15,8 @@ func_ov017_020bc5fc kind:function(arm,size=0x44) addr:0x020bc63c func_ov017_020bc640 kind:function(arm,size=0x31c) addr:0x020bc680 func_ov017_020bc95c kind:function(arm,size=0xe4) addr:0x020bc99c func_ov017_020bca40 kind:function(arm,size=0x3a8) addr:0x020bca80 -func_ov017_020bcde8 kind:function(arm,size=0x4b8) addr:0x020bce28 -func_ov017_020bd2a0 kind:function(arm,size=0x48) addr:0x020bd2e0 +_ZN21UnkStruct_027e0ce0_4019func_ov017_020bcde8EiP11ItemManager kind:function(arm,size=0x4b8) addr:0x020bce28 +_ZN11ItemManager19func_ov017_020bd2a0Eii kind:function(arm,size=0x48) addr:0x020bd2e0 func_ov017_020bd2e8 kind:function(arm,size=0x18) addr:0x020bd328 func_ov017_020bd300 kind:function(arm,size=0x178) addr:0x020bd340 func_ov017_020bd478 kind:function(arm,size=0x28) addr:0x020bd4b8 @@ -29,15 +29,15 @@ _ZN18UnkStruct_027e0ce019func_ov017_020bd69cEv kind:function(arm,size=0x1c) addr func_ov017_020bd6b8 kind:function(arm,size=0x28) addr:0x020bd6f8 func_ov017_020bd6e0 kind:function(arm,size=0x78) addr:0x020bd720 func_ov017_020bd758 kind:function(arm,size=0x30) addr:0x020bd798 -func_ov017_020bd788 kind:function(arm,size=0x56c) addr:0x020bd7c8 -func_ov017_020bdcf4 kind:function(arm,size=0x90) addr:0x020bdd34 -func_ov017_020bdd84 kind:function(arm,size=0x1c4) addr:0x020bddc4 -func_ov017_020bdf48 kind:function(arm,size=0x150) addr:0x020bdf88 +_ZN15PlayerLinkActor19func_ov017_020bd788Ei kind:function(arm,size=0x56c) addr:0x020bd7c8 +_ZN15PlayerLinkActor19func_ov017_020bdcf4Ev kind:function(arm,size=0x90) addr:0x020bdd34 +_ZN15PlayerLinkActor19func_ov017_020bdd84Eii kind:function(arm,size=0x1c4) addr:0x020bddc4 +_ZN15PlayerLinkActor19func_ov017_020bdf48Eiiii kind:function(arm,size=0x150) addr:0x020bdf88 func_ov017_020be098 kind:function(arm,size=0x10) addr:0x020be0d8 func_ov017_020be0a8 kind:function(arm,size=0x38) addr:0x020be0e8 func_ov017_020be0e0 kind:function(arm,size=0x20c) addr:0x020be120 func_ov017_020be2ec kind:function(arm,size=0x148) addr:0x020be32c -func_ov017_020be434 kind:function(arm,size=0x18) addr:0x020be474 +_ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov017_020be434Ev kind:function(arm,size=0x18) addr:0x020be474 func_ov017_020be44c kind:function(arm,size=0x45c) addr:0x020be48c func_ov017_020be8a8 kind:function(arm,size=0x124) addr:0x020be8e8 _ZN12CargoManager8DoUpdateEv kind:function(arm,size=0x18) addr:0x020bea0c diff --git a/config/eur1/arm9/overlays/ov019/symbols.txt b/config/eur1/arm9/overlays/ov019/symbols.txt index 207194e3..8de0448e 100644 --- a/config/eur1/arm9/overlays/ov019/symbols.txt +++ b/config/eur1/arm9/overlays/ov019/symbols.txt @@ -215,24 +215,24 @@ _ZN19FileSelectSubScreenD1Ev kind:function(arm,size=0xec) addr:0x020cfb68 _ZN21FileSelectManager_160C1EP23GameModeManagerBase_104P14FileSelectMain kind:function(arm,size=0x54) addr:0x020cfc54 _ZN21FileSelectManager_160D1Ev kind:function(arm,size=0x14) addr:0x020cfca8 _ZN21FileSelectManager_160D0Ev kind:function(arm,size=0x1c) addr:0x020cfcbc -_ZN21FileSelectManager_1608vfunc_08Ei kind:function(arm,size=0x50) addr:0x020cfcd8 -_ZN21FileSelectManager_1608vfunc_0CEi kind:function(arm,size=0x64) addr:0x020cfd28 -_ZN21FileSelectManager_1608vfunc_14Ei kind:function(arm,size=0x4) addr:0x020cfd8c -_ZN21FileSelectManager_1608vfunc_10Eii kind:function(arm,size=0x8c) addr:0x020cfd90 -_ZN21FileSelectManager_1608vfunc_18Ei kind:function(arm,size=0x10) addr:0x020cfe1c -_ZN21FileSelectManager_1608vfunc_1CEi kind:function(arm,size=0x64) addr:0x020cfe2c -_ZN21FileSelectManager_1608vfunc_20Eii kind:function(arm,size=0xac) addr:0x020cfe90 -_ZN21FileSelectManager_1608vfunc_24Ev kind:function(arm,size=0x34) addr:0x020cff3c +_ZN21FileSelectManager_1609vfunc2_08Ei kind:function(arm,size=0x50) addr:0x020cfcd8 +_ZN21FileSelectManager_1609vfunc2_0CEi kind:function(arm,size=0x64) addr:0x020cfd28 +_ZN21FileSelectManager_1609vfunc2_14Ei kind:function(arm,size=0x4) addr:0x020cfd8c +_ZN21FileSelectManager_1608vfunc_54Eii kind:function(arm,size=0x8c) addr:0x020cfd90 +_ZN21FileSelectManager_1609vfunc2_18Ei kind:function(arm,size=0x10) addr:0x020cfe1c +_ZN21FileSelectManager_1608vfunc_5CEi kind:function(arm,size=0x64) addr:0x020cfe2c +_ZN21FileSelectManager_1608vfunc_58Eii kind:function(arm,size=0xac) addr:0x020cfe90 +_ZN21FileSelectManager_1608vfunc_60Ev kind:function(arm,size=0x34) addr:0x020cff3c _ZN21FileSelectManager_164C1EP23GameModeManagerBase_104P14FileSelectMain kind:function(arm,size=0x4c) addr:0x020cff70 _ZN21FileSelectManager_164D1Ev kind:function(arm,size=0x3c) addr:0x020cffbc _ZN21FileSelectManager_164D0Ev kind:function(arm,size=0x44) addr:0x020cfff8 -_ZN21FileSelectManager_1648vfunc_08Ei kind:function(arm,size=0x50) addr:0x020d003c -_ZN21FileSelectManager_1648vfunc_0CEi kind:function(arm,size=0x90) addr:0x020d008c -_ZN21FileSelectManager_1648vfunc_14Ei kind:function(arm,size=0x4) addr:0x020d011c -_ZN21FileSelectManager_1648vfunc_10Eii kind:function(arm,size=0xa8) addr:0x020d0120 -_ZN21FileSelectManager_1648vfunc_18Ei kind:function(arm,size=0x38) addr:0x020d01c8 -_ZN21FileSelectManager_1648vfunc_1CEi kind:function(arm,size=0xa4) addr:0x020d0200 -_ZN21FileSelectManager_1648vfunc_20Eii kind:function(arm,size=0x90) addr:0x020d02a4 +_ZN21FileSelectManager_1649vfunc2_08Ei kind:function(arm,size=0x50) addr:0x020d003c +_ZN21FileSelectManager_1649vfunc2_0CEi kind:function(arm,size=0x90) addr:0x020d008c +_ZN21FileSelectManager_1649vfunc2_14Ei kind:function(arm,size=0x4) addr:0x020d011c +_ZN21FileSelectManager_1648vfunc_54Eii kind:function(arm,size=0xa8) addr:0x020d0120 +_ZN21FileSelectManager_1649vfunc2_18Ei kind:function(arm,size=0x38) addr:0x020d01c8 +_ZN21FileSelectManager_1648vfunc_5CEi kind:function(arm,size=0xa4) addr:0x020d0200 +_ZN21FileSelectManager_1648vfunc_58Eii kind:function(arm,size=0x90) addr:0x020d02a4 _ZN21FileSelectManager_16419func_ov019_020d02f4Ev kind:function(arm,size=0x28) addr:0x020d0334 _ZN25UnkSystem1_ov019_Derived2C1Ev kind:function(arm,size=0x40) addr:0x020d035c _ZN25UnkSystem1_ov019_Derived28vfunc_08Ei kind:function(arm,size=0x48) addr:0x020d039c diff --git a/config/eur1/arm9/overlays/ov024/relocs.txt b/config/eur1/arm9/overlays/ov024/relocs.txt index 0e70c0b9..272a7c98 100644 --- a/config/eur1/arm9/overlays/ov024/relocs.txt +++ b/config/eur1/arm9/overlays/ov024/relocs.txt @@ -72,7 +72,7 @@ from:0x020c4cac kind:arm_call to:0x020730e0 module:overlay(0) from:0x020c4d00 kind:arm_call to:0x020734a4 module:overlay(0) from:0x020c4d18 kind:load to:0x020d87b8 module:overlay(24) from:0x020c4d1c kind:load to:0x027e0ce4 module:dtcm -from:0x020c4d20 kind:load to:0x020b3040 module:overlay(0) +from:0x020c4d20 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x020c4d24 kind:load to:0x027e09b8 module:dtcm from:0x020c4d74 kind:arm_call to:0x01ffd3d8 module:itcm from:0x020c4d98 kind:arm_call to:0x02019538 module:main @@ -2516,7 +2516,7 @@ from:0x020d73c0 kind:load to:0x027e0cd8 module:dtcm from:0x020d73c4 kind:load to:0x027e09a4 module:dtcm from:0x020d73c8 kind:load to:0x027e0ce0 module:dtcm from:0x020d73cc kind:load to:0x027e0ce4 module:dtcm -from:0x020d73d4 kind:load to:0x020b3040 module:overlay(0) +from:0x020d73d4 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x020d73e8 kind:arm_call to:0x0209fb6c module:overlay(0) from:0x020d73f0 kind:arm_call to:0x020984dc module:overlay(0) from:0x020d7408 kind:arm_call to:0x0209fb6c module:overlay(0) diff --git a/config/eur1/arm9/overlays/ov024/symbols.txt b/config/eur1/arm9/overlays/ov024/symbols.txt index 8c9004e1..30c4dd87 100644 --- a/config/eur1/arm9/overlays/ov024/symbols.txt +++ b/config/eur1/arm9/overlays/ov024/symbols.txt @@ -143,16 +143,16 @@ _ZN24AdventureModeManager_160C1EP23GameModeManagerBase_104P24AdventureModeManage _ZN27AdventureModeManager_160_4CD1Ev kind:function(arm,size=0x14) addr:0x020c7a3c _ZN24AdventureModeManager_160D1Ev kind:function(arm,size=0x30) addr:0x020c7a50 _ZN24AdventureModeManager_160D0Ev kind:function(arm,size=0x38) addr:0x020c7a80 -_ZN24AdventureModeManager_1608vfunc_08Ei kind:function(arm,size=0x9c) addr:0x020c7ab8 -_ZN24AdventureModeManager_1608vfunc_0CEi kind:function(arm,size=0x1a0) addr:0x020c7b54 -_ZN24AdventureModeManager_1608vfunc_10Eii kind:function(arm,size=0x24) addr:0x020c7cf4 -_ZN24AdventureModeManager_1608vfunc_14Ei kind:function(arm,size=0x20) addr:0x020c7d18 +_ZN24AdventureModeManager_1609vfunc2_08Ei kind:function(arm,size=0x9c) addr:0x020c7ab8 +_ZN24AdventureModeManager_1609vfunc2_0CEi kind:function(arm,size=0x1a0) addr:0x020c7b54 +_ZN24AdventureModeManager_1608vfunc_54Eii kind:function(arm,size=0x24) addr:0x020c7cf4 +_ZN24AdventureModeManager_1609vfunc2_14Ei kind:function(arm,size=0x20) addr:0x020c7d18 _ZN24AdventureModeManager_16019func_ov024_020c7cfcEv kind:function(arm,size=0x50) addr:0x020c7d38 _ZN24AdventureModeManager_16019func_ov024_020c7d4cEi kind:function(arm,size=0xf0) addr:0x020c7d88 -_ZN24AdventureModeManager_1608vfunc_18Ei kind:function(arm,size=0x118) addr:0x020c7e78 -_ZN24AdventureModeManager_1608vfunc_1CEi kind:function(arm,size=0x36c) addr:0x020c7f90 -_ZN24AdventureModeManager_1608vfunc_20Eii kind:function(arm,size=0xf8) addr:0x020c82fc -_ZN24AdventureModeManager_1608vfunc_24Ev kind:function(arm,size=0x4) addr:0x020c83f4 +_ZN24AdventureModeManager_1609vfunc2_18Ei kind:function(arm,size=0x118) addr:0x020c7e78 +_ZN24AdventureModeManager_1608vfunc_5CEi kind:function(arm,size=0x36c) addr:0x020c7f90 +_ZN24AdventureModeManager_1608vfunc_58Eii kind:function(arm,size=0xf8) addr:0x020c82fc +_ZN24AdventureModeManager_1608vfunc_60Ev kind:function(arm,size=0x4) addr:0x020c83f4 _ZN24AdventureModeManager_16019func_ov024_020c83bcEv kind:function(arm,size=0x6c) addr:0x020c83f8 _ZN24AdventureModeManager_16019func_ov024_020c8428Ev kind:function(arm,size=0x2c) addr:0x020c8464 _ZN24AdventureModeManager_16019func_ov024_020c8454Ev kind:function(arm,size=0x30) addr:0x020c8490 @@ -165,11 +165,11 @@ _ZN24AdventureModeManager_170C1EP23GameModeManagerBase_104 kind:function(arm,siz _ZN27AdventureModeManager_170_14D1Ev kind:function(arm,size=0x14) addr:0x020c866c _ZN24AdventureModeManager_170D1Ev kind:function(arm,size=0x20) addr:0x020c8680 _ZN24AdventureModeManager_170D0Ev kind:function(arm,size=0x28) addr:0x020c86a0 -_ZN24AdventureModeManager_1708vfunc_08Ei kind:function(arm,size=0x38) addr:0x020c86c8 -_ZN24AdventureModeManager_1708vfunc_0CEi kind:function(arm,size=0x74) addr:0x020c8700 -_ZN24AdventureModeManager_1708vfunc_10Eii kind:function(arm,size=0xd4) addr:0x020c8774 -_ZN24AdventureModeManager_1708vfunc_18Ei kind:function(arm,size=0xc) addr:0x020c8848 -_ZN24AdventureModeManager_1708vfunc_24Ev kind:function(arm,size=0x2c) addr:0x020c8854 +_ZN24AdventureModeManager_1709vfunc2_08Ei kind:function(arm,size=0x38) addr:0x020c86c8 +_ZN24AdventureModeManager_1709vfunc2_0CEi kind:function(arm,size=0x74) addr:0x020c8700 +_ZN24AdventureModeManager_1708vfunc_54Eii kind:function(arm,size=0xd4) addr:0x020c8774 +_ZN24AdventureModeManager_1709vfunc2_18Ei kind:function(arm,size=0xc) addr:0x020c8848 +_ZN24AdventureModeManager_1708vfunc_60Ev kind:function(arm,size=0x2c) addr:0x020c8854 _ZN27AdventureModeManager_170_14D0Ev kind:function(arm,size=0x1c) addr:0x020c8880 _ZN32AdventureModeManager_174_Base_108vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020c889c _ZN32AdventureModeManager_174_Base_108vfunc_10Ev kind:function(thumb,size=0x10) addr:0x020c88ac @@ -181,25 +181,25 @@ _ZN32AdventureModeManager_174_Base_10D0Ev kind:function(arm,size=0x1c) addr:0x02 _ZN29AdventureModeManager_174_BaseD1Ev kind:function(arm,size=0x20) addr:0x020c8d58 _ZN29AdventureModeManager_174_BaseD0Ev kind:function(arm,size=0x28) addr:0x020c8d78 _ZN24AdventureModeManager_174C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x2c) addr:0x020c8da0 -_ZN24AdventureModeManager_1748vfunc_08Ei kind:function(thumb,size=0x58) addr:0x020c8dcc -_ZN24AdventureModeManager_1748vfunc_0CEi kind:function(thumb,size=0x48) addr:0x020c8e24 -_ZN24AdventureModeManager_1748vfunc_10Eii kind:function(thumb,size=0xac) addr:0x020c8e6c -_ZN24AdventureModeManager_1748vfunc_18Ei kind:function(thumb,size=0x6c) addr:0x020c8f18 -_ZN24AdventureModeManager_1748vfunc_1CEi kind:function(thumb,size=0x40) addr:0x020c8f84 -_ZN24AdventureModeManager_1748vfunc_20Eii kind:function(thumb,size=0xc0) addr:0x020c8fc4 -_ZN24AdventureModeManager_1748vfunc_24Ev kind:function(thumb,size=0x2) addr:0x020c9084 +_ZN24AdventureModeManager_1749vfunc2_08Ei kind:function(thumb,size=0x58) addr:0x020c8dcc +_ZN24AdventureModeManager_1749vfunc2_0CEi kind:function(thumb,size=0x48) addr:0x020c8e24 +_ZN24AdventureModeManager_1748vfunc_54Eii kind:function(thumb,size=0xac) addr:0x020c8e6c +_ZN24AdventureModeManager_1749vfunc2_18Ei kind:function(thumb,size=0x6c) addr:0x020c8f18 +_ZN24AdventureModeManager_1748vfunc_5CEi kind:function(thumb,size=0x40) addr:0x020c8f84 +_ZN24AdventureModeManager_1748vfunc_58Eii kind:function(thumb,size=0xc0) addr:0x020c8fc4 +_ZN24AdventureModeManager_1748vfunc_60Ev kind:function(thumb,size=0x2) addr:0x020c9084 _ZN24AdventureModeManager_174D1Ev kind:function(arm,size=0x20) addr:0x020c9088 _ZN24AdventureModeManager_174D0Ev kind:function(arm,size=0x28) addr:0x020c90a8 _ZN29AdventureModeManager_178_BaseC2EP23GameModeManagerBase_104 kind:function(thumb,size=0x14) addr:0x020c90d0 -_ZN29AdventureModeManager_178_Base8vfunc_08Ei kind:function(thumb,size=0x2c) addr:0x020c90e4 -_ZN29AdventureModeManager_178_Base8vfunc_0CEi kind:function(thumb,size=0x1c) addr:0x020c9110 -_ZN29AdventureModeManager_178_Base8vfunc_18Ei kind:function(thumb,size=0x2c) addr:0x020c912c -_ZN29AdventureModeManager_178_Base8vfunc_1CEi kind:function(thumb,size=0x1c) addr:0x020c9158 +_ZN29AdventureModeManager_178_Base9vfunc2_08Ei kind:function(thumb,size=0x2c) addr:0x020c90e4 +_ZN29AdventureModeManager_178_Base9vfunc2_0CEi kind:function(thumb,size=0x1c) addr:0x020c9110 +_ZN29AdventureModeManager_178_Base9vfunc2_18Ei kind:function(thumb,size=0x2c) addr:0x020c912c +_ZN29AdventureModeManager_178_Base8vfunc_5CEi kind:function(thumb,size=0x1c) addr:0x020c9158 _ZN29AdventureModeManager_178_BaseD1Ev kind:function(arm,size=0x20) addr:0x020c9174 _ZN29AdventureModeManager_178_BaseD0Ev kind:function(arm,size=0x28) addr:0x020c9194 _ZN24AdventureModeManager_178C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x2c) addr:0x020c91bc -_ZN24AdventureModeManager_1788vfunc_10Eii kind:function(thumb,size=0x24) addr:0x020c91e8 -_ZN24AdventureModeManager_1788vfunc_20Eii kind:function(thumb,size=0x24) addr:0x020c920c +_ZN24AdventureModeManager_1788vfunc_54Eii kind:function(thumb,size=0x24) addr:0x020c91e8 +_ZN24AdventureModeManager_1788vfunc_58Eii kind:function(thumb,size=0x24) addr:0x020c920c _ZN24AdventureModeManager_178D1Ev kind:function(arm,size=0x20) addr:0x020c9230 _ZN24AdventureModeManager_178D0Ev kind:function(arm,size=0x28) addr:0x020c9250 _ZN27AdventureModeManager_180_188vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020c9278 @@ -207,29 +207,29 @@ _ZN24AdventureModeManager_180C1EP23GameModeManagerBase_104 kind:function(thumb,s _ZN27AdventureModeManager_180_18D1Ev kind:function(thumb,size=0xc) addr:0x020c92d8 _ZN24AdventureModeManager_180D1Ev kind:function(thumb,size=0x14) addr:0x020c92e4 _ZN24AdventureModeManager_180D0Ev kind:function(thumb,size=0x1a) addr:0x020c92f8 -_ZN24AdventureModeManager_1808vfunc_08Ei kind:function(thumb,size=0x64) addr:0x020c9314 -_ZN24AdventureModeManager_1808vfunc_0CEi kind:function(thumb,size=0x90) addr:0x020c9378 -_ZN24AdventureModeManager_1808vfunc_10Eii kind:function(thumb,size=0x64) addr:0x020c9408 +_ZN24AdventureModeManager_1809vfunc2_08Ei kind:function(thumb,size=0x64) addr:0x020c9314 +_ZN24AdventureModeManager_1809vfunc2_0CEi kind:function(thumb,size=0x90) addr:0x020c9378 +_ZN24AdventureModeManager_1808vfunc_54Eii kind:function(thumb,size=0x64) addr:0x020c9408 _ZN24AdventureModeManager_18019func_ov024_020c9430Eii kind:function(thumb,size=0x24) addr:0x020c946c -_ZN24AdventureModeManager_1808vfunc_18Ei kind:function(thumb,size=0x30) addr:0x020c9490 -_ZN24AdventureModeManager_1808vfunc_1CEi kind:function(thumb,size=0x78) addr:0x020c94c0 -_ZN24AdventureModeManager_1808vfunc_20Eii kind:function(thumb,size=0x7c) addr:0x020c9538 -_ZN24AdventureModeManager_1808vfunc_24Ev kind:function(thumb,size=0x2) addr:0x020c95b4 +_ZN24AdventureModeManager_1809vfunc2_18Ei kind:function(thumb,size=0x30) addr:0x020c9490 +_ZN24AdventureModeManager_1808vfunc_5CEi kind:function(thumb,size=0x78) addr:0x020c94c0 +_ZN24AdventureModeManager_1808vfunc_58Eii kind:function(thumb,size=0x7c) addr:0x020c9538 +_ZN24AdventureModeManager_1808vfunc_60Ev kind:function(thumb,size=0x2) addr:0x020c95b4 _ZN24AdventureModeManager_18019func_ov024_020c957cEv kind:function(thumb,size=0x48) addr:0x020c95b8 _ZN24AdventureModeManager_18019func_ov024_020c95c4Ev kind:function(thumb,size=0x48) addr:0x020c9600 _ZN27AdventureModeManager_180_18D0Ev kind:function(arm,size=0x1c) addr:0x020c9648 _ZN24AdventureModeManager_184C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x30) addr:0x020c9664 _ZN24AdventureModeManager_184D1Ev kind:function(thumb,size=0xc) addr:0x020c9694 _ZN24AdventureModeManager_184D0Ev kind:function(thumb,size=0x12) addr:0x020c96a0 -_ZN24AdventureModeManager_1848vfunc_08Ei kind:function(thumb,size=0x20) addr:0x020c96b4 -_ZN24AdventureModeManager_1848vfunc_0CEi kind:function(thumb,size=0xf8) addr:0x020c96d4 -_ZN24AdventureModeManager_1848vfunc_10Eii kind:function(thumb,size=0x8) addr:0x020c97cc -_ZN24AdventureModeManager_1848vfunc_14Ei kind:function(thumb,size=0x2) addr:0x020c97d4 +_ZN24AdventureModeManager_1849vfunc2_08Ei kind:function(thumb,size=0x20) addr:0x020c96b4 +_ZN24AdventureModeManager_1849vfunc2_0CEi kind:function(thumb,size=0xf8) addr:0x020c96d4 +_ZN24AdventureModeManager_1848vfunc_54Eii kind:function(thumb,size=0x8) addr:0x020c97cc +_ZN24AdventureModeManager_1849vfunc2_14Ei kind:function(thumb,size=0x2) addr:0x020c97d4 _ZN24AdventureModeManager_18419func_ov024_020c979cEi kind:function(thumb,size=0x94) addr:0x020c97d8 -_ZN24AdventureModeManager_1848vfunc_18Ei kind:function(thumb,size=0x7c) addr:0x020c986c -_ZN24AdventureModeManager_1848vfunc_1CEi kind:function(thumb,size=0x60) addr:0x020c98e8 -_ZN24AdventureModeManager_1848vfunc_20Eii kind:function(thumb,size=0x5c) addr:0x020c9948 -_ZN24AdventureModeManager_1848vfunc_24Ev kind:function(thumb,size=0x8) addr:0x020c99a4 +_ZN24AdventureModeManager_1849vfunc2_18Ei kind:function(thumb,size=0x7c) addr:0x020c986c +_ZN24AdventureModeManager_1848vfunc_5CEi kind:function(thumb,size=0x60) addr:0x020c98e8 +_ZN24AdventureModeManager_1848vfunc_58Eii kind:function(thumb,size=0x5c) addr:0x020c9948 +_ZN24AdventureModeManager_1848vfunc_60Ev kind:function(thumb,size=0x8) addr:0x020c99a4 _ZN27AdventureModeManager_18C_14C1Ev kind:function(thumb,size=0x14) addr:0x020c99ac _ZN27AdventureModeManager_18C_148vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020c99c0 _ZN27AdventureModeManager_18C_148vfunc_10Ev kind:function(thumb,size=0x10) addr:0x020c99d0 @@ -237,15 +237,15 @@ _ZN24AdventureModeManager_18CC1EP23GameModeManagerBase_104 kind:function(thumb,s _ZN27AdventureModeManager_18C_14D1Ev kind:function(thumb,size=0xc) addr:0x020c9a48 _ZN24AdventureModeManager_18CD1Ev kind:function(thumb,size=0x14) addr:0x020c9a54 _ZN24AdventureModeManager_18CD0Ev kind:function(thumb,size=0x1a) addr:0x020c9a68 -_ZN24AdventureModeManager_18C8vfunc_08Ei kind:function(thumb,size=0x32) addr:0x020c9a84 -_ZN24AdventureModeManager_18C8vfunc_0CEi kind:function(thumb,size=0xf0) addr:0x020c9ab8 -_ZN24AdventureModeManager_18C8vfunc_10Eii kind:function(thumb,size=0x100) addr:0x020c9ba8 +_ZN24AdventureModeManager_18C9vfunc2_08Ei kind:function(thumb,size=0x32) addr:0x020c9a84 +_ZN24AdventureModeManager_18C9vfunc2_0CEi kind:function(thumb,size=0xf0) addr:0x020c9ab8 +_ZN24AdventureModeManager_18C8vfunc_54Eii kind:function(thumb,size=0x100) addr:0x020c9ba8 _ZN24AdventureModeManager_18C19func_ov024_020c9c6cEv kind:function(thumb,size=0xb4) addr:0x020c9ca8 -_ZN24AdventureModeManager_18C8vfunc_14Ei kind:function(thumb,size=0x10) addr:0x020c9d5c -_ZN24AdventureModeManager_18C8vfunc_18Ei kind:function(thumb,size=0xac) addr:0x020c9d6c -_ZN24AdventureModeManager_18C8vfunc_1CEi kind:function(thumb,size=0x88) addr:0x020c9e18 -_ZN24AdventureModeManager_18C8vfunc_20Eii kind:function(thumb,size=0x1c4) addr:0x020c9ea0 -_ZN24AdventureModeManager_18C8vfunc_24Ev kind:function(thumb,size=0xa) addr:0x020ca064 +_ZN24AdventureModeManager_18C9vfunc2_14Ei kind:function(thumb,size=0x10) addr:0x020c9d5c +_ZN24AdventureModeManager_18C9vfunc2_18Ei kind:function(thumb,size=0xac) addr:0x020c9d6c +_ZN24AdventureModeManager_18C8vfunc_5CEi kind:function(thumb,size=0x88) addr:0x020c9e18 +_ZN24AdventureModeManager_18C8vfunc_58Eii kind:function(thumb,size=0x1c4) addr:0x020c9ea0 +_ZN24AdventureModeManager_18C8vfunc_60Ev kind:function(thumb,size=0xa) addr:0x020ca064 _ZN24AdventureModeManager_18C19func_ov024_020ca034Ev kind:function(thumb,size=0x34) addr:0x020ca070 _ZN24AdventureModeManager_18C19func_ov024_020ca068Ei kind:function(thumb,size=0xc) addr:0x020ca0a4 _ZN24AdventureModeManager_18C19func_ov024_020ca074Ev kind:function(thumb,size=0x6) addr:0x020ca0b0 @@ -255,12 +255,12 @@ _ZN27AdventureModeManager_190_388vfunc_0CEv kind:function(thumb,size=0xc) addr:0 _ZN24AdventureModeManager_190C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x54) addr:0x020ca0f0 _ZN27AdventureModeManager_190_14D1Ev kind:function(thumb,size=0xc) addr:0x020ca144 _ZN27AdventureModeManager_190_38D1Ev kind:function(thumb,size=0xc) addr:0x020ca150 -_ZN24AdventureModeManager_1908vfunc_08Ei kind:function(thumb,size=0xc) addr:0x020ca15c -_ZN24AdventureModeManager_1908vfunc_0CEi kind:function(thumb,size=0x20) addr:0x020ca168 -_ZN24AdventureModeManager_1908vfunc_10Eii kind:function(thumb,size=0x3c) addr:0x020ca188 -_ZN24AdventureModeManager_1908vfunc_18Ei kind:function(thumb,size=0xc) addr:0x020ca1c4 -_ZN24AdventureModeManager_1908vfunc_1CEi kind:function(thumb,size=0x20) addr:0x020ca1d0 -_ZN24AdventureModeManager_1908vfunc_20Eii kind:function(thumb,size=0x68) addr:0x020ca1f0 +_ZN24AdventureModeManager_1909vfunc2_08Ei kind:function(thumb,size=0xc) addr:0x020ca15c +_ZN24AdventureModeManager_1909vfunc2_0CEi kind:function(thumb,size=0x20) addr:0x020ca168 +_ZN24AdventureModeManager_1908vfunc_54Eii kind:function(thumb,size=0x3c) addr:0x020ca188 +_ZN24AdventureModeManager_1909vfunc2_18Ei kind:function(thumb,size=0xc) addr:0x020ca1c4 +_ZN24AdventureModeManager_1908vfunc_5CEi kind:function(thumb,size=0x20) addr:0x020ca1d0 +_ZN24AdventureModeManager_1908vfunc_58Eii kind:function(thumb,size=0x68) addr:0x020ca1f0 _ZN24AdventureModeManager_19019func_ov024_020ca21cEv kind:function(thumb,size=0x30) addr:0x020ca258 _ZN24AdventureModeManager_19019func_ov024_020ca24cEi kind:function(thumb,size=0x34) addr:0x020ca288 _ZN24AdventureModeManager_19019func_ov024_020ca280Ev kind:function(thumb,size=0x10) addr:0x020ca2bc diff --git a/config/eur1/arm9/overlays/ov031/delinks.txt b/config/eur1/arm9/overlays/ov031/delinks.txt index 40c4220c..ea2fed98 100644 --- a/config/eur1/arm9/overlays/ov031/delinks.txt +++ b/config/eur1/arm9/overlays/ov031/delinks.txt @@ -187,7 +187,7 @@ src/031_Land/Actor/ActorItemDrop.cpp: .bss start:0x02116fac end:0x021170dc src/031_Land/Actor/ActorUnkMLCK.cpp: - .text start:0x020fac8c end:0x020fb3dc + .text start:0x020fac8c end:0x020fb43c .init start:0x02111ab8 end:0x02111b2c .ctor start:0x02112930 end:0x02112934 .data start:0x02114e68 end:0x02114f5c diff --git a/config/eur1/arm9/overlays/ov031/relocs.txt b/config/eur1/arm9/overlays/ov031/relocs.txt index d1a80c77..72231be7 100644 --- a/config/eur1/arm9/overlays/ov031/relocs.txt +++ b/config/eur1/arm9/overlays/ov031/relocs.txt @@ -103,7 +103,7 @@ from:0x020d9430 kind:load to:0x0204a110 module:main from:0x020d9464 kind:arm_call to:0x01fff350 module:itcm from:0x020d9470 kind:arm_call to:0x020fb318 module:overlay(31) from:0x020d947c kind:load to:0x027e0ce4 module:dtcm -from:0x020d9484 kind:load to:0x02112c14 module:overlay(31) +from:0x020d9484 kind:load to:0x02112c0c add:0x8 module:overlay(31) from:0x020d94a0 kind:arm_call to:0x01fff458 module:itcm from:0x020d94d0 kind:load to:0x027e0ce4 module:dtcm from:0x020d94d4 kind:load to:0x020d9488 module:overlay(31) @@ -3775,13 +3775,13 @@ from:0x020facc8 kind:arm_call to:0x020976d0 module:overlay(0) from:0x020face0 kind:load to:0x02114e8c add:0x8 module:overlay(31) from:0x020facec kind:arm_call to:0x020983dc module:overlay(0) from:0x020facf4 kind:arm_call to:0x02061648 module:overlay(0) -from:0x020fad88 kind:load to:0x02114e7c module:overlay(31) -from:0x020fad8c kind:load to:0x02114eb8 module:overlay(31) -from:0x020fad90 kind:load to:0x02114f2c add:0x8 module:overlay(31) +from:0x020fad88 kind:load to:0x02114e74 add:0x8 module:overlay(31) +from:0x020fad8c kind:load to:0x02114eb0 add:0x8 module:overlay(31) +from:0x020fad90 kind:load to:0x02114eb0 add:0x84 module:overlay(31) from:0x020fadcc kind:arm_call to:0x01fff350 module:itcm from:0x020fae00 kind:arm_call to:0x020611dc module:overlay(0) from:0x020fae58 kind:load to:0x027e0ce4 module:dtcm -from:0x020fae5c kind:load to:0x02112c14 module:overlay(31) +from:0x020fae5c kind:load to:0x02112c0c add:0x8 module:overlay(31) from:0x020fae64 kind:load to:0x0204a088 module:main from:0x020fae68 kind:load to:0x020d87d0 module:overlay(24) from:0x020fae9c kind:arm_call to:0x0206f980 module:overlay(0) diff --git a/config/eur1/arm9/overlays/ov031/symbols.txt b/config/eur1/arm9/overlays/ov031/symbols.txt index b99a9408..ef8ce1e7 100644 --- a/config/eur1/arm9/overlays/ov031/symbols.txt +++ b/config/eur1/arm9/overlays/ov031/symbols.txt @@ -149,17 +149,17 @@ func_ov031_020db374 kind:function(arm,size=0x74) addr:0x020db494 func_ov031_020db3e8 kind:function(arm,size=0x18) addr:0x020db508 func_ov031_020db400 kind:function(arm,size=0x98) addr:0x020db520 func_ov031_020db498 kind:function(arm,size=0x58) addr:0x020db5b8 -func_ov031_020db4f0 kind:function(arm,size=0x38) addr:0x020db610 -func_ov031_020db528 kind:function(arm,size=0x8c) addr:0x020db648 +_ZN27UnkStruct_ItemManager_20_0419func_ov031_020db4f0Eii kind:function(arm,size=0x38) addr:0x020db610 +_ZN27UnkStruct_ItemManager_20_0419func_ov031_020db528Ei kind:function(arm,size=0x8c) addr:0x020db648 _ZN27UnkStruct_ItemManager_20_0819func_ov031_020db5b4Ev kind:function(arm,size=0x20) addr:0x020db6d4 func_ov031_020db5d4 kind:function(arm,size=0x14) addr:0x020db6f4 func_ov031_020db5e8 kind:function(arm,size=0x2c) addr:0x020db708 func_ov031_020db614 kind:function(arm,size=0x90) addr:0x020db734 func_ov031_020db6a4 kind:function(arm,size=0x60) addr:0x020db7c4 -func_ov031_020db704 kind:function(arm,size=0xbc) addr:0x020db824 +_ZN27UnkStruct_ItemManager_20_0819func_ov031_020db704Eii kind:function(arm,size=0xbc) addr:0x020db824 _ZN27UnkStruct_ItemManager_20_14C1Ev kind:function(thumb,size=0x16) addr:0x020db8e0 _ZN27UnkStruct_ItemManager_20_1419func_ov031_020db7d8Ev kind:function(thumb,size=0x1a) addr:0x020db8f8 -func_ov031_020db7f4 kind:function(arm,size=0x50) addr:0x020db914 +_ZN27UnkStruct_ItemManager_20_1419func_ov031_020db7f4Ev kind:function(arm,size=0x50) addr:0x020db914 func_ov031_020db844 kind:function(arm,size=0x30) addr:0x020db964 _ZN24UnkStruct_ItemManager_2019func_ov031_020db874Ej kind:function(arm,size=0x58) addr:0x020db994 _ZN24UnkStruct_ItemManager_2019func_ov031_020db8ccEv kind:function(arm,size=0x2c) addr:0x020db9ec @@ -167,15 +167,15 @@ _ZN24UnkStruct_ItemManager_2019func_ov031_020db8f8Ev kind:function(arm,size=0x44 _ZN27UnkStruct_ItemManager_20_0CC1Ev kind:function(thumb,size=0x12) addr:0x020dba5c _ZN27UnkStruct_ItemManager_20_0CD1Ev kind:function(thumb,size=0x2) addr:0x020dba70 _ZN27UnkStruct_ItemManager_20_0C19func_ov031_020db954Ev kind:function(arm,size=0x4) addr:0x020dba74 -func_ov031_020db958 kind:function(arm,size=0xe4) addr:0x020dba78 -func_ov031_020dba3c kind:function(arm,size=0x4) addr:0x020dbb5c +_ZN27UnkStruct_ItemManager_20_0C19func_ov031_020db958Eii kind:function(arm,size=0xe4) addr:0x020dba78 +_ZN27UnkStruct_ItemManager_20_0C19func_ov031_020dba3cEi kind:function(arm,size=0x4) addr:0x020dbb5c _ZN27UnkStruct_ItemManager_20_0019func_ov031_020dba40Ev kind:function(arm,size=0x34) addr:0x020dbb60 func_ov031_020dba74 kind:function(arm,size=0x18) addr:0x020dbb94 func_ov031_020dba8c kind:function(arm,size=0xac) addr:0x020dbbac func_ov031_020dbb38 kind:function(arm,size=0x1c) addr:0x020dbc58 func_ov031_020dbb54 kind:function(arm,size=0xc4) addr:0x020dbc74 func_ov031_020dbc18 kind:function(arm,size=0x68) addr:0x020dbd38 -func_ov031_020dbc80 kind:function(arm,size=0xa4) addr:0x020dbda0 +_ZN27UnkStruct_ItemManager_20_0019func_ov031_020dbc80Eii kind:function(arm,size=0xa4) addr:0x020dbda0 func_ov031_020dbd24 kind:function(arm,size=0x74) addr:0x020dbe44 func_ov031_020dbd98 kind:function(arm,size=0xc4) addr:0x020dbeb8 func_ov031_020dbe5c kind:function(arm,size=0x2c) addr:0x020dbf7c @@ -612,7 +612,7 @@ _ZN19ActorProfileUnkZSRSC1Ev kind:function(thumb,size=0x1c) addr:0x020ea158 _ZN19ActorProfileUnkZLSL10GetProfileEv kind:function(thumb,size=0x8) addr:0x020ea174 _ZN19ActorProfileUnkZLSL6CreateEv kind:function(thumb,size=0x1c) addr:0x020ea17c _ZN19ActorProfileUnkZLSLC1Ev kind:function(thumb,size=0x3c) addr:0x020ea198 -_ZN24UnkStruct_ov031_0211361c19func_ov031_020ea0b4EP5Actor kind:function(thumb,size=0x30) addr:0x020ea1d4 +_ZN24UnkStruct_ov031_0211361c8vfunc_00EP5Actor kind:function(thumb,size=0x30) addr:0x020ea1d4 _ZN26ModelRender_ov031_02113670C2EP10G3d_Model_ kind:function(thumb,size=0x14) addr:0x020ea204 _ZN26ModelRender_ov031_021136708vfunc_0CEv kind:function(thumb,size=0x8) addr:0x020ea218 func_ov031_020ea100 kind:function(thumb,size=0x40) addr:0x020ea220 @@ -1208,8 +1208,8 @@ _ZN12ActorUnkMLCKC1Ev kind:function(arm,size=0xb0) addr:0x020face4 _ZN12ActorUnkMLCK8vfunc_18Ei kind:function(arm,size=0xd8) addr:0x020fad94 _ZN12ActorUnkMLCK8vfunc_64Ei kind:function(arm,size=0x4c) addr:0x020fae6c _ZN12ActorUnkMLCK8vfunc_54Eii kind:function(arm,size=0x20) addr:0x020faeb8 -_ZN12ActorUnkMLCK8vfunc_58Ev kind:function(arm,size=0xc) addr:0x020faed8 -_ZN12ActorUnkMLCK8vfunc_5CEv kind:function(arm,size=0x54) addr:0x020faee4 +_ZN12ActorUnkMLCK8vfunc_58Eii kind:function(arm,size=0xc) addr:0x020faed8 +_ZN12ActorUnkMLCK8vfunc_5CEi kind:function(arm,size=0x54) addr:0x020faee4 _ZN12ActorUnkMLCK8vfunc_60Ev kind:function(arm,size=0x18) addr:0x020faf38 _ZN12ActorUnkMLCK8vfunc_68Ev kind:function(arm,size=0x90) addr:0x020faf50 _ZN12ActorUnkMLCK19func_ov031_020faeb0Ev kind:function(arm,size=0x4) addr:0x020fafe0 @@ -1218,20 +1218,20 @@ _ZN12ActorUnkMLCK8vfunc_70Ev kind:function(arm,size=0x20) addr:0x020fb034 _ZN12ActorUnkMLCK19func_ov031_020faf24Ev kind:function(arm,size=0x1e0) addr:0x020fb054 _ZN12ActorUnkMLCK19func_ov031_020fb104Ev kind:function(arm,size=0x18) addr:0x020fb234 _ZN12ActorUnkMLCK19func_ov031_020fb11cEv kind:function(arm,size=0x68) addr:0x020fb24c -_ZN18ActorUnkMLCK_B4_0019func_ov031_020fb184Ev kind:function(arm,size=0x2c) addr:0x020fb2b4 +_ZN15ActorUnkMLCK_C419func_ov031_020fb184Ev kind:function(arm,size=0x2c) addr:0x020fb2b4 _ZN15ActorUnkMLCK_D89vfunc2_00Ev kind:function(arm,size=0x1c) addr:0x020fb2e0 _ZN15ActorUnkMLCK_D89vfunc2_04Ev kind:function(arm,size=0x1c) addr:0x020fb2fc -_ZN12ActorUnkMLCK19func_ov031_020fb1e8EP18ActorUnkMLCK_B4_00 kind:function(arm,size=0x1c) addr:0x020fb318 +_ZN12ActorUnkMLCK19func_ov031_020fb1e8EP15ActorUnkMLCK_A0 kind:function(arm,size=0x1c) addr:0x020fb318 _ZN12ActorUnkMLCK19func_ov031_020fb204Ei kind:function(arm,size=0x4c) addr:0x020fb334 _ZN12ActorUnkMLCKD0Ev kind:function(arm,size=0x28) addr:0x020fb380 _ZN12ActorUnkMLCKD1Ev kind:function(arm,size=0x20) addr:0x020fb3a8 _ZN19ActorProfileUnkMLCKD1Ev kind:function(arm,size=0x14) addr:0x020fb3c8 -func_ov031_020fb2ac kind:function(arm,size=0x10) addr:0x020fb3dc -func_ov031_020fb2bc kind:function(arm,size=0x10) addr:0x020fb3ec -func_ov031_020fb2cc kind:function(arm,size=0x10) addr:0x020fb3fc -func_ov031_020fb2dc kind:function(arm,size=0x10) addr:0x020fb40c -func_ov031_020fb2ec kind:function(arm,size=0x10) addr:0x020fb41c -func_ov031_020fb2fc kind:function(arm,size=0x10) addr:0x020fb42c +_ZThn148_N12ActorUnkMLCKD0Ev kind:function(arm,size=0x10) addr:0x020fb3dc +_ZThn148_N12ActorUnkMLCK8vfunc_60Ev kind:function(arm,size=0x10) addr:0x020fb3ec +_ZThn148_N12ActorUnkMLCK8vfunc_58Eii kind:function(arm,size=0x10) addr:0x020fb3fc +_ZThn148_N12ActorUnkMLCK8vfunc_5CEi kind:function(arm,size=0x10) addr:0x020fb40c +_ZThn148_N12ActorUnkMLCK8vfunc_54Eii kind:function(arm,size=0x10) addr:0x020fb41c +_ZThn148_N12ActorUnkMLCKD1Ev kind:function(arm,size=0x10) addr:0x020fb42c _ZN19ActorProfileUnkCLLT10GetProfileEv kind:function(arm,size=0xc) addr:0x020fb43c _ZN19ActorProfileUnkCLLT6CreateEv kind:function(arm,size=0x24) addr:0x020fb448 _ZN19ActorProfileUnkCLLTC1Ev kind:function(arm,size=0x28) addr:0x020fb46c @@ -1793,7 +1793,7 @@ _ZN23MapObjectProfileUnkSAND6CreateEv kind:function(arm,size=0x24) addr:0x0210ac _ZN23MapObjectProfileUnkSANDC1Ev kind:function(arm,size=0x198) addr:0x0210ac6c _ZN16MapObjectUnkSAND19func_ov031_0210acd4Ev kind:function(arm,size=0x90) addr:0x0210ae04 _ZN16MapObjectUnkSAND19func_ov031_0210ad64Ev kind:function(arm,size=0x9c) addr:0x0210ae94 -_ZN16MapObjectUnkSAND19func_ov031_0210ae00Ev kind:function(arm,size=0x90) addr:0x0210af30 +_ZN16MapObjectUnkSAND19func_ov031_0210ae00E8Vec2bCppPv kind:function(arm,size=0x90) addr:0x0210af30 _ZN16MapObjectUnkSAND19func_ov031_0210ae90Ev kind:function(arm,size=0xc0) addr:0x0210afc0 _ZN16MapObjectUnkSAND19func_ov031_0210af50Ev kind:function(arm,size=0xc8) addr:0x0210b080 _ZN16MapObjectUnkSAND19func_ov031_0210b018Ev kind:function(arm,size=0x10) addr:0x0210b148 @@ -1801,13 +1801,13 @@ _ZN16MapObjectUnkSAND19func_ov031_0210b028Ev kind:function(arm,size=0x84) addr:0 _ZN16MapObjectUnkSAND19func_ov031_0210b0acEv kind:function(arm,size=0x38) addr:0x0210b1dc _ZN16MapObjectUnkSAND19func_ov031_0210b0e4Ev kind:function(arm,size=0x60) addr:0x0210b214 _ZN16MapObjectUnkSAND19func_ov031_0210b144Ev kind:function(arm,size=0x38) addr:0x0210b274 -_ZN16MapObjectUnkSAND19func_ov031_0210b17cEv kind:function(arm,size=0x70) addr:0x0210b2ac +_ZN16MapObjectUnkSAND19func_ov031_0210b17cEP19MapObjectUnkSAND_40i kind:function(arm,size=0x70) addr:0x0210b2ac _ZN16MapObjectUnkSAND19func_ov031_0210b1ecEv kind:function(arm,size=0xe0) addr:0x0210b31c _ZN16MapObjectUnkSAND19func_ov031_0210b2ccEv kind:function(arm,size=0x30) addr:0x0210b3fc -_ZN16MapObjectUnkSANDD1Ev kind:function(arm,size=0x14) addr:0x0210b42c -_ZN16MapObjectUnkSANDD0Ev kind:function(arm,size=0x1c) addr:0x0210b440 -_ZN16MapObjectUnkSAND19func_ov031_0210b32cEv kind:function(arm,size=0x20) addr:0x0210b45c -_ZN16MapObjectUnkSAND19func_ov031_0210b34cEv kind:function(arm,size=0x28) addr:0x0210b47c +_ZN16MapObjectUnkSAND19func_ov031_0210b2fcEv kind:function(arm,size=0x14) addr:0x0210b42c +_ZN16MapObjectUnkSAND19func_ov031_0210b310Ev kind:function(arm,size=0x1c) addr:0x0210b440 +_ZN16MapObjectUnkSANDD1Ev kind:function(arm,size=0x20) addr:0x0210b45c +_ZN16MapObjectUnkSANDD0Ev kind:function(arm,size=0x28) addr:0x0210b47c _ZN23MapObjectProfileUnkSANDD1Ev kind:function(arm,size=0x14) addr:0x0210b4a4 _ZN23MapObjectProfileUnkSPTB10GetProfileEv kind:function(arm,size=0xc) addr:0x0210b4b8 _ZN23MapObjectProfileUnkSPTB6CreateEv kind:function(arm,size=0x24) addr:0x0210b4c4 @@ -2026,7 +2026,7 @@ data_ov031_02110cd4 kind:data(any) addr:0x02110cd4 data_ov031_02110ce0 kind:data(any) addr:0x02110ce0 data_ov031_02110cec kind:data(any) addr:0x02110cec data_ov031_02110bc8 kind:data(any) addr:0x02110cf8 local -data_ov031_02110d1c kind:data(any) addr:0x02110d1c +data_ov031_02110bec kind:data(any) addr:0x02110d1c data_ov031_02110d30 kind:data(any) addr:0x02110d30 data_ov031_02110d4c kind:data(any) addr:0x02110d4c data_ov031_02110d58 kind:data(any) addr:0x02110d58 @@ -2231,13 +2231,13 @@ data_ov031_02112b90 kind:data(any) addr:0x02112b90 data_ov031_02112ba4 kind:data(any) addr:0x02112ba4 data_ov031_02112bb8 kind:data(any) addr:0x02112bb8 data_ov031_02112be0 kind:data(any) addr:0x02112be0 -data_ov031_02112c14 kind:data(any) addr:0x02112c14 +_ZTV24UnkStruct_ov031_02112ad4 kind:data(any) addr:0x02112c0c data_ov031_02112c20 kind:data(any) addr:0x02112c20 data_ov031_02112c3c kind:data(any) addr:0x02112c3c data_ov031_02112c58 kind:data(any) addr:0x02112c58 data_ov031_02112c64 kind:data(any) addr:0x02112c64 data_ov031_02112c80 kind:data(any) addr:0x02112c80 -data_ov031_02112c94 kind:data(any) addr:0x02112c94 +data_ov031_02112b54 kind:data(any) addr:0x02112c94 _ZTV25UnkStruct_027e0ce0_40_108 kind:data(any) addr:0x02112c98 ambiguous data_ov031_02112cac kind:data(any) addr:0x02112cac data_ov031_02112cb8 kind:data(any) addr:0x02112cb8 @@ -2401,11 +2401,10 @@ _ZTV24ActorProfileTreasureDrop kind:data(any) addr:0x02114d9c _ZTV25ActorProfileRedPotionDrop kind:data(any) addr:0x02114dc0 _ZTV20ActorProfileBombDrop kind:data(any) addr:0x02114de4 _ZTV13ActorItemDrop kind:data(any) addr:0x02114e08 -data_ov031_02114e68 kind:data(any) addr:0x02114e68 -data_ov031_02114e7c kind:data(any) addr:0x02114e7c +data_ov031_02114d28 kind:data(any) addr:0x02114e68 local +_ZTV15ActorUnkMLCK_D8 kind:data(any) addr:0x02114e74 _ZTV19ActorProfileUnkMLCK kind:data(any) addr:0x02114e8c -data_ov031_02114eb8 kind:data(any) addr:0x02114eb8 -_ZTV15ActorUnkMLCK_94 kind:data(any) addr:0x02114f2c +_ZTV12ActorUnkMLCK kind:data(any) addr:0x02114eb0 _ZTV19ActorProfileUnkCLLT kind:data(any) addr:0x02114f5c data_ov031_02114f88 kind:data(any) addr:0x02114f88 _ZTV19ActorProfileUnkEFSB kind:data(any) addr:0x02114fec @@ -2500,7 +2499,7 @@ data_ov031_0211606c kind:data(any) addr:0x0211606c data_ov031_021160a8 kind:data(any) addr:0x021160a8 data_ov031_021160bc kind:data(any) addr:0x021160bc data_ov031_021160d8 kind:data(any) addr:0x021160d8 -data_ov031_02116120 kind:data(any) addr:0x02116120 +data_ov031_02115fe0 kind:data(any) addr:0x02116120 data_ov031_0211612c kind:data(any) addr:0x0211612c ambiguous data_ov031_02116140 kind:data(any) addr:0x02116140 data_ov031_0211615c kind:data(any) addr:0x0211615c ambiguous @@ -2736,10 +2735,10 @@ data_ov031_02118a28 kind:bss addr:0x02118a28 data_ov031_02118a34 kind:bss addr:0x02118a34 data_ov031_02118900 kind:bss addr:0x02118a40 data_ov031_02118a58 kind:bss addr:0x02118a58 -data_ov031_02118b10 kind:bss addr:0x02118b10 -data_ov031_02118be4 kind:bss addr:0x02118be4 ambiguous -data_ov031_02118c08 kind:bss addr:0x02118c08 -data_ov031_02118c2c kind:bss addr:0x02118c2c +data_ov031_021189d0 kind:bss addr:0x02118b10 +data_ov031_02118aa4 kind:bss addr:0x02118be4 +data_ov031_02118ac8 kind:bss addr:0x02118c08 +data_ov031_02118aec kind:bss addr:0x02118c2c data_ov031_02118c50 kind:bss addr:0x02118c50 data_ov031_02118dd0 kind:bss addr:0x02118dd0 data_ov031_02118dd8 kind:bss addr:0x02118dd8 diff --git a/config/eur1/arm9/overlays/ov032/relocs.txt b/config/eur1/arm9/overlays/ov032/relocs.txt index 91424524..6daea6f4 100644 --- a/config/eur1/arm9/overlays/ov032/relocs.txt +++ b/config/eur1/arm9/overlays/ov032/relocs.txt @@ -257,7 +257,7 @@ from:0x0211b814 kind:load to:0x02122ad0 module:overlay(32) from:0x0211b828 kind:arm_call to:0x02011f3c module:main from:0x0211b834 kind:arm_call to:0x0211b888 module:overlay(32) from:0x0211b84c kind:arm_call to:0x02097a08 module:overlay(0) -from:0x0211b884 kind:load to:0x021225f4 module:overlay(32) add:0x8 +from:0x0211b884 kind:load to:0x021225f4 add:0x8 module:overlay(32) from:0x0211b894 kind:arm_call to:0x02098b7c module:overlay(0) from:0x0211b8f8 kind:arm_call_thumb to:0x02057a24 module:overlay(0) from:0x0211b924 kind:arm_call_thumb to:0x0209a1dc module:overlay(0) @@ -270,7 +270,7 @@ from:0x0211b9e8 kind:arm_call to:0x0205fc20 module:overlay(0) from:0x0211ba00 kind:arm_call to:0x0205fc20 module:overlay(0) from:0x0211ba0c kind:arm_call to:0x02098680 module:overlay(0) from:0x0211ba28 kind:arm_call to:0x0211bf44 module:overlay(32) -from:0x0211ba48 kind:load to:0x02122618 module:overlay(32) add:0x8 +from:0x0211ba48 kind:load to:0x02122618 add:0x8 module:overlay(32) from:0x0211ba4c kind:load to:0x02122ad0 module:overlay(32) from:0x0211ba50 kind:load to:0x021223e4 module:overlay(32) from:0x0211ba54 kind:load to:0x02122ac4 module:overlay(32) diff --git a/config/eur1/arm9/overlays/ov033/relocs.txt b/config/eur1/arm9/overlays/ov033/relocs.txt index 4a7351df..e5acac14 100644 --- a/config/eur1/arm9/overlays/ov033/relocs.txt +++ b/config/eur1/arm9/overlays/ov033/relocs.txt @@ -347,7 +347,7 @@ from:0x0211bec4 kind:arm_call to:0x0211be34 module:overlay(33) from:0x0211bee8 kind:load to:0x027e0ce0 module:dtcm from:0x0211bf14 kind:arm_call to:0x01fff350 module:itcm from:0x0211bf54 kind:load to:0x027e0ce4 module:dtcm -from:0x0211bf5c kind:load to:0x020b3040 module:overlay(0) +from:0x0211bf5c kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0211bf6c kind:arm_call_thumb to:0x02057ed4 module:overlay(0) from:0x0211bf74 kind:arm_call_thumb to:0x02057ed4 module:overlay(0) from:0x0211bf7c kind:arm_call to:0x0209d100 module:overlay(0) diff --git a/config/eur1/arm9/overlays/ov034/relocs.txt b/config/eur1/arm9/overlays/ov034/relocs.txt index 06707601..bc439c65 100644 --- a/config/eur1/arm9/overlays/ov034/relocs.txt +++ b/config/eur1/arm9/overlays/ov034/relocs.txt @@ -234,7 +234,7 @@ from:0x0211afc8 kind:load to:0x027e09a4 module:dtcm from:0x0211aff8 kind:arm_call to:0x01fff350 module:itcm from:0x0211b014 kind:arm_call to:0x0211ce2c module:overlay(34) from:0x0211b054 kind:load to:0x027e0ce4 module:dtcm -from:0x0211b05c kind:load to:0x020b3040 module:overlay(0) +from:0x0211b05c kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0211b0dc kind:arm_call to:0x0207e0fc module:overlay(0) from:0x0211b0fc kind:arm_call to:0x0207e0fc module:overlay(0) from:0x0211b108 kind:arm_call to:0x0211ca24 module:overlay(34) diff --git a/config/eur1/arm9/overlays/ov037/relocs.txt b/config/eur1/arm9/overlays/ov037/relocs.txt index d7453b32..ed653b92 100644 --- a/config/eur1/arm9/overlays/ov037/relocs.txt +++ b/config/eur1/arm9/overlays/ov037/relocs.txt @@ -155,7 +155,7 @@ from:0x0211a5ec kind:arm_call to:0x01fff350 module:itcm from:0x0211a610 kind:arm_call to:0x0211e824 module:overlay(37) from:0x0211a624 kind:arm_call to:0x01fff350 module:itcm from:0x0211a63c kind:load to:0x027e0ce4 module:dtcm -from:0x0211a640 kind:load to:0x020b3040 module:overlay(0) +from:0x0211a640 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0211a6f4 kind:load to:0x02049be4 module:main from:0x0211a718 kind:arm_call to:0x01fff148 module:itcm from:0x0211a758 kind:arm_call to:0x01ffbbe0 module:itcm @@ -450,7 +450,7 @@ from:0x0211e584 kind:arm_call to:0x0211e494 module:overlay(37) from:0x0211e590 kind:arm_call to:0x0211e494 module:overlay(37) from:0x0211e59c kind:arm_call to:0x0211e5c8 module:overlay(37) from:0x0211e5a8 kind:load to:0x027e0ce4 module:dtcm -from:0x0211e5ac kind:load to:0x020b3040 module:overlay(0) +from:0x0211e5ac kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0211e6ec kind:arm_call to:0x02098708 module:overlay(0) from:0x0211e710 kind:arm_call to:0x01fff148 module:itcm from:0x0211e71c kind:arm_call to:0x01ff9a5c module:itcm @@ -630,7 +630,7 @@ from:0x021206c8 kind:arm_call to:0x021205d8 module:overlay(37) from:0x021206d4 kind:arm_call to:0x021205d8 module:overlay(37) from:0x021206e0 kind:arm_call to:0x0212070c module:overlay(37) from:0x021206ec kind:load to:0x027e0ce4 module:dtcm -from:0x021206f0 kind:load to:0x020b3040 module:overlay(0) +from:0x021206f0 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x021207b8 kind:arm_call to:0x02098708 module:overlay(0) from:0x021207dc kind:arm_call to:0x01fff148 module:itcm from:0x021207e8 kind:arm_call to:0x01ff9a5c module:itcm @@ -663,7 +663,7 @@ from:0x02120b40 kind:arm_call to:0x020976d0 module:overlay(0) from:0x02120b58 kind:load to:0x021228d0 module:overlay(37) from:0x02120b84 kind:arm_call to:0x01fff350 module:itcm from:0x02120ba4 kind:load to:0x027e0ce4 module:dtcm -from:0x02120bac kind:load to:0x020b3040 module:overlay(0) +from:0x02120bac kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02120bb4 kind:arm_call to:0x02120b5c module:overlay(37) from:0x02120be4 kind:arm_call to:0x020983dc module:overlay(0) from:0x02120c0c kind:arm_call to:0x0201bb38 module:main @@ -678,7 +678,7 @@ from:0x02120d08 kind:arm_call to:0x02016fbc module:main from:0x02120d4c kind:arm_call to:0x01fff350 module:itcm from:0x02120d70 kind:arm_call to:0x01fff350 module:itcm from:0x02120d88 kind:load to:0x027e0ce4 module:dtcm -from:0x02120d8c kind:load to:0x020b3040 module:overlay(0) +from:0x02120d8c kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02120db4 kind:arm_call to:0x02120d94 module:overlay(37) from:0x02120e60 kind:arm_call to:0x02120554 module:overlay(37) from:0x02120e6c kind:arm_call to:0x02016958 module:main diff --git a/config/eur1/arm9/overlays/ov040/relocs.txt b/config/eur1/arm9/overlays/ov040/relocs.txt index a0593c8e..1c751012 100644 --- a/config/eur1/arm9/overlays/ov040/relocs.txt +++ b/config/eur1/arm9/overlays/ov040/relocs.txt @@ -264,7 +264,7 @@ from:0x02125678 kind:arm_call to:0x02126a78 module:overlay(40) from:0x021256bc kind:arm_call to:0x0208bc10 module:overlay(0) from:0x021256c8 kind:load to:0x027e09b8 module:dtcm from:0x021256cc kind:load to:0x027e0d34 module:dtcm -from:0x021256d0 kind:load to:0x020b3040 module:overlay(0) +from:0x021256d0 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x021256d8 kind:load to:0x027e0ce4 module:dtcm from:0x021256e4 kind:load to:0x027e09a8 module:dtcm from:0x021256e8 kind:load to:0x027e09bc module:dtcm @@ -341,7 +341,7 @@ from:0x02126430 kind:arm_call to:0x01ffb6e4 module:itcm from:0x02126440 kind:arm_call to:0x02150dac module:overlay(72) from:0x02126454 kind:arm_call to:0x02150dac module:overlay(72) from:0x02126474 kind:load to:0x027e09a4 module:dtcm -from:0x02126478 kind:load to:0x020b3040 module:overlay(0) +from:0x02126478 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02126480 kind:load to:0x027e0ce4 module:dtcm from:0x021264cc kind:arm_call to:0x01ff9638 module:itcm from:0x021264f4 kind:arm_call to:0x01ffb6e4 module:itcm @@ -353,7 +353,7 @@ from:0x0212664c kind:arm_call to:0x0208068c module:overlay(0) from:0x02126668 kind:arm_call to:0x02070ad0 module:overlay(0) from:0x02126674 kind:arm_call to:0x0202851c module:main from:0x02126680 kind:load to:0x027e09a4 module:dtcm -from:0x02126688 kind:load to:0x020b3040 module:overlay(0) +from:0x02126688 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0212668c kind:load to:0x027e0ce4 module:dtcm from:0x02126690 kind:load to:0x027e0cd8 module:dtcm from:0x021266c8 kind:arm_call to:0x01fff350 module:itcm @@ -361,16 +361,16 @@ from:0x0212673c kind:arm_call to:0x01ff9638 module:itcm from:0x0212675c kind:arm_call to:0x01ffb6e4 module:itcm from:0x021267c8 kind:arm_call to:0x0211a544 module:overlay(39) from:0x021267d4 kind:load to:0x027e0ce4 module:dtcm -from:0x021267d8 kind:load to:0x020b3040 module:overlay(0) +from:0x021267d8 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x021267e0 kind:load to:0x027e09b8 module:dtcm from:0x0212681c kind:arm_call to:0x01fff350 module:itcm from:0x02126838 kind:arm_call to:0x0211a5a0 module:overlay(39) from:0x02126844 kind:load to:0x027e0ce4 module:dtcm -from:0x0212684c kind:load to:0x020b3040 module:overlay(0) +from:0x0212684c kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02126880 kind:arm_call to:0x01fff350 module:itcm from:0x0212690c kind:arm_call to:0x0211a4ec module:overlays(38,39) from:0x02126918 kind:load to:0x027e0ce4 module:dtcm -from:0x0212691c kind:load to:0x020b3040 module:overlay(0) +from:0x0212691c kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02126940 kind:arm_call to:0x02073320 module:overlay(0) from:0x0212695c kind:arm_call to:0x02014478 module:main from:0x02126980 kind:arm_call to:0x02126590 module:overlay(40) @@ -382,13 +382,13 @@ from:0x021269dc kind:load to:0x02049b2a module:main from:0x02126a10 kind:arm_call to:0x01fff350 module:itcm from:0x02126a60 kind:arm_call to:0x01ffb714 module:itcm from:0x02126a6c kind:load to:0x027e0ce4 module:dtcm -from:0x02126a70 kind:load to:0x020b3040 module:overlay(0) +from:0x02126a70 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02126aac kind:arm_call to:0x01fff350 module:itcm from:0x02126af0 kind:arm_call to:0x01fff350 module:itcm from:0x02126b54 kind:arm_call to:0x01ff9638 module:itcm from:0x02126b64 kind:arm_call to:0x01ffb6e4 module:itcm from:0x02126ba4 kind:load to:0x027e0ce4 module:dtcm -from:0x02126ba8 kind:load to:0x020b3040 module:overlay(0) +from:0x02126ba8 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02126bcc kind:arm_call to:0x02073320 module:overlay(0) from:0x02126be8 kind:arm_call to:0x02014478 module:main from:0x02126c10 kind:arm_call to:0x0201bb84 module:main diff --git a/config/eur1/arm9/overlays/ov041/relocs.txt b/config/eur1/arm9/overlays/ov041/relocs.txt index b77f972d..f0961c94 100644 --- a/config/eur1/arm9/overlays/ov041/relocs.txt +++ b/config/eur1/arm9/overlays/ov041/relocs.txt @@ -28,7 +28,7 @@ from:0x021238a4 kind:arm_call_thumb to:0x0209a29c module:overlay(0) from:0x021238bc kind:arm_call to:0x02124ef8 module:overlay(41) from:0x021238e0 kind:arm_call to:0x01fff350 module:itcm from:0x02123918 kind:load to:0x027e0ce4 module:dtcm -from:0x02123920 kind:load to:0x020b3040 module:overlay(0) +from:0x02123920 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02123930 kind:arm_call to:0x02124f84 module:overlay(41) from:0x02123968 kind:load to:0x0212dbc4 module:overlay(41) from:0x021239e8 kind:arm_call to:0x020bf8d4 module:overlay(17) @@ -125,7 +125,7 @@ from:0x02124384 kind:load to:0x0212de0c module:overlay(41) from:0x0212439c kind:arm_call to:0x02124ef8 module:overlay(41) from:0x021243c0 kind:arm_call to:0x01fff350 module:itcm from:0x021243f8 kind:load to:0x027e0ce4 module:dtcm -from:0x02124400 kind:load to:0x020b3040 module:overlay(0) +from:0x02124400 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02124410 kind:arm_call to:0x02124f84 module:overlay(41) from:0x02124448 kind:load to:0x0212de7c module:overlay(41) from:0x021244c8 kind:arm_call to:0x020bf8d4 module:overlay(17) @@ -482,7 +482,7 @@ from:0x02127f0c kind:arm_call to:0x01fff350 module:itcm from:0x02127f34 kind:arm_call to:0x0209764c module:overlay(0) from:0x02127f54 kind:arm_call to:0x02097448 module:overlay(0) from:0x02127f60 kind:load to:0x027e0ce4 module:dtcm -from:0x02127f64 kind:load to:0x020b3040 module:overlay(0) +from:0x02127f64 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02127f6c kind:load to:0x020b53e4 module:overlay(0) from:0x02127f84 kind:arm_call to:0x02016fbc module:main from:0x02127f90 kind:arm_call to:0x0213f9fc module:overlay(70) @@ -1005,7 +1005,7 @@ from:0x0212c1e8 kind:arm_call to:0x01fff350 module:itcm from:0x0212c228 kind:arm_call to:0x01fff350 module:itcm from:0x0212c260 kind:load to:0x027e09b8 module:dtcm from:0x0212c264 kind:load to:0x027e0ce4 module:dtcm -from:0x0212c26c kind:load to:0x020b3040 module:overlay(0) +from:0x0212c26c kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0212c2a4 kind:arm_call to:0x0209d488 module:overlay(0) from:0x0212c2e0 kind:arm_call to:0x0209d488 module:overlay(0) from:0x0212c2f4 kind:load to:0x0212e690 module:overlay(41) diff --git a/config/eur1/arm9/overlays/ov045/relocs.txt b/config/eur1/arm9/overlays/ov045/relocs.txt index c7d3e6f3..a4866d04 100644 --- a/config/eur1/arm9/overlays/ov045/relocs.txt +++ b/config/eur1/arm9/overlays/ov045/relocs.txt @@ -106,7 +106,7 @@ from:0x021240c8 kind:arm_call to:0x0212374c module:overlay(45) from:0x021240f8 kind:arm_call to:0x0207e0fc module:overlay(0) from:0x02124110 kind:arm_call to:0x0207e1b8 module:overlay(0) from:0x02124120 kind:load to:0x027e0ce4 module:dtcm -from:0x02124128 kind:load to:0x020b3040 module:overlay(0) +from:0x02124128 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0212412c kind:load to:0x027e09c0 module:dtcm from:0x02124148 kind:arm_call to:0x020786cc module:overlay(0) from:0x02124174 kind:arm_call to:0x02017e8c module:main diff --git a/config/eur1/arm9/overlays/ov047/symbols.txt b/config/eur1/arm9/overlays/ov047/symbols.txt index 49e37b9f..2b7e16e1 100644 --- a/config/eur1/arm9/overlays/ov047/symbols.txt +++ b/config/eur1/arm9/overlays/ov047/symbols.txt @@ -1,7 +1,7 @@ _ZN29UnkStruct_027e0cd8_0C_Base_98C1Ev kind:function(arm,size=0x64) addr:0x021305e0 _ZN29UnkStruct_027e0cd8_0C_Base_98D1Ev kind:function(arm,size=0x28) addr:0x02130644 func_ov047_0213052c kind:function(arm,size=0x30) addr:0x0213066c -func_ov047_0213055c kind:function(arm,size=0x200) addr:0x0213069c +_ZN29UnkStruct_027e0cd8_0C_Base_9819func_ov047_0213055cEv kind:function(arm,size=0x200) addr:0x0213069c func_ov047_0213075c kind:function(arm,size=0x39c) addr:0x0213089c func_ov047_02130af8 kind:function(arm,size=0x3d8) addr:0x02130c38 func_ov047_02130ed0 kind:function(arm,size=0x280) addr:0x02131010 diff --git a/config/eur1/arm9/overlays/ov049/relocs.txt b/config/eur1/arm9/overlays/ov049/relocs.txt index 193eb104..2806f02d 100644 --- a/config/eur1/arm9/overlays/ov049/relocs.txt +++ b/config/eur1/arm9/overlays/ov049/relocs.txt @@ -462,13 +462,13 @@ from:0x021343f0 kind:arm_call to:0x02132854 module:overlay(49) from:0x02134404 kind:arm_call to:0x01fff350 module:itcm from:0x02134420 kind:load to:0x020d87d0 module:overlay(24) from:0x02134424 kind:load to:0x027e0ce4 module:dtcm -from:0x0213442c kind:load to:0x020b3040 module:overlay(0) +from:0x0213442c kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02134480 kind:arm_call to:0x01fff350 module:itcm from:0x021344ac kind:arm_call to:0x020986a8 module:overlay(0) from:0x021344d8 kind:arm_call to:0x01fff350 module:itcm from:0x021344f8 kind:load to:0x020d87d0 module:overlay(24) from:0x021344fc kind:load to:0x027e0ce4 module:dtcm -from:0x02134504 kind:load to:0x020b3040 module:overlay(0) +from:0x02134504 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02134520 kind:load to:0x027e0d40 module:dtcm from:0x02134534 kind:load to:0x027e0d40 module:dtcm from:0x02134540 kind:arm_call to:0x02134524 module:overlay(49) diff --git a/config/eur1/arm9/overlays/ov051/relocs.txt b/config/eur1/arm9/overlays/ov051/relocs.txt index 45de9d7f..4a714129 100644 --- a/config/eur1/arm9/overlays/ov051/relocs.txt +++ b/config/eur1/arm9/overlays/ov051/relocs.txt @@ -470,7 +470,7 @@ from:0x021357e4 kind:arm_call to:0x01fff458 module:itcm from:0x021357f4 kind:arm_call to:0x02135718 module:overlay(51) from:0x02135804 kind:arm_call to:0x01fff350 module:itcm from:0x02135820 kind:load to:0x027e0ce4 module:dtcm -from:0x02135824 kind:load to:0x020b3040 module:overlay(0) +from:0x02135824 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x021358d4 kind:arm_call to:0x01fff148 module:itcm from:0x021358e0 kind:arm_call to:0x01ff9a5c module:itcm from:0x021358fc kind:load to:0x0203e964 module:main diff --git a/config/eur1/arm9/overlays/ov057/relocs.txt b/config/eur1/arm9/overlays/ov057/relocs.txt index f9bf4ba9..7593ab62 100644 --- a/config/eur1/arm9/overlays/ov057/relocs.txt +++ b/config/eur1/arm9/overlays/ov057/relocs.txt @@ -351,7 +351,7 @@ from:0x0213b794 kind:arm_call to:0x0213b67c module:overlay(57) from:0x0213b79c kind:arm_call to:0x0213b70c module:overlay(57) from:0x0213b7ac kind:arm_call to:0x01fff350 module:itcm from:0x0213b7cc kind:load to:0x027e0ce4 module:dtcm -from:0x0213b7d0 kind:load to:0x020b3040 module:overlay(0) +from:0x0213b7d0 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0213b7e4 kind:load to:0x020578a4 module:overlay(0) from:0x0213b7f8 kind:arm_call_thumb to:0x02099b50 module:overlay(0) from:0x0213b800 kind:arm_call to:0x02011ff4 module:main diff --git a/config/eur1/arm9/overlays/ov058/relocs.txt b/config/eur1/arm9/overlays/ov058/relocs.txt index 3f9aa384..3ea01f39 100644 --- a/config/eur1/arm9/overlays/ov058/relocs.txt +++ b/config/eur1/arm9/overlays/ov058/relocs.txt @@ -1554,7 +1554,7 @@ from:0x0214d734 kind:arm_call to:0x0214cbd8 module:overlay(58) from:0x0214d744 kind:arm_call to:0x0214cda0 module:overlay(58) from:0x0214d774 kind:arm_call to:0x01fff350 module:itcm from:0x0214d794 kind:load to:0x020d87d0 module:overlay(24) -from:0x0214d798 kind:load to:0x020b3040 module:overlay(0) +from:0x0214d798 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0214d7a0 kind:load to:0x027e0ce4 module:dtcm from:0x0214d7b0 kind:load to:0x027e0d4c module:dtcm from:0x0214d7c4 kind:load to:0x027e0d4c module:dtcm diff --git a/config/eur1/arm9/overlays/ov059/relocs.txt b/config/eur1/arm9/overlays/ov059/relocs.txt index 01523d8c..2fa67f58 100644 --- a/config/eur1/arm9/overlays/ov059/relocs.txt +++ b/config/eur1/arm9/overlays/ov059/relocs.txt @@ -27,7 +27,7 @@ from:0x021582ec kind:arm_call to:0x01fff350 module:itcm from:0x02158304 kind:arm_call to:0x02158ad4 module:overlay(59) from:0x02158310 kind:arm_call to:0x02158118 module:overlay(59) from:0x0215831c kind:load to:0x027e0ce4 module:dtcm -from:0x02158320 kind:load to:0x020b3040 module:overlay(0) +from:0x02158320 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02158340 kind:arm_call to:0x01fff3b4 module:itcm from:0x02158360 kind:arm_call to:0x02081db0 module:overlay(0) from:0x02158368 kind:load to:0x027e0ce4 module:dtcm @@ -45,7 +45,7 @@ from:0x02158550 kind:arm_call to:0x01fff350 module:itcm from:0x02158560 kind:arm_call to:0x01fff350 module:itcm from:0x0215858c kind:arm_call to:0x01fff350 module:itcm from:0x021585b4 kind:load to:0x027e0ce4 module:dtcm -from:0x021585bc kind:load to:0x020b3040 module:overlay(0) +from:0x021585bc kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02158670 kind:arm_call to:0x021587c8 module:overlay(59) from:0x02158678 kind:arm_call to:0x02158684 module:overlay(59) from:0x021586fc kind:arm_call to:0x021587c8 module:overlay(59) @@ -313,7 +313,7 @@ from:0x0215ac70 kind:arm_call to:0x02160cc4 module:overlay(59) from:0x0215ac7c kind:load to:0x027e0ce4 module:dtcm from:0x0215ac80 kind:load to:0x027e0d5c module:dtcm from:0x0215ac88 kind:load to:0x027e09b8 module:dtcm -from:0x0215ac90 kind:load to:0x020b3040 module:overlay(0) +from:0x0215ac90 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0215acf4 kind:load to:0x02163878 module:overlay(59) from:0x0215ad10 kind:arm_call to:0x01fff3b4 module:itcm from:0x0215ad30 kind:arm_call to:0x02015080 module:main @@ -448,7 +448,7 @@ from:0x0215bf24 kind:arm_call to:0x01fff350 module:itcm from:0x0215bf4c kind:arm_call to:0x01fff350 module:itcm from:0x0215bf84 kind:arm_call to:0x01fff350 module:itcm from:0x0215bfa4 kind:load to:0x027e0ce4 module:dtcm -from:0x0215bfac kind:load to:0x020b3040 module:overlay(0) +from:0x0215bfac kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0215bfd4 kind:arm_call to:0x020169d4 module:main from:0x0215c08c kind:arm_call to:0x0207e48c module:overlay(0) from:0x0215c0b0 kind:arm_call to:0x02071b64 module:overlay(0) @@ -786,7 +786,7 @@ from:0x0215f01c kind:arm_call to:0x02098524 module:overlay(0) from:0x0215f02c kind:arm_call to:0x01fff350 module:itcm from:0x0215f048 kind:load to:0x020b51f8 module:overlay(0) from:0x0215f054 kind:load to:0x027e09b8 module:dtcm -from:0x0215f05c kind:load to:0x020b3040 module:overlay(0) +from:0x0215f05c kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0215f060 kind:load to:0x027e0ce4 module:dtcm from:0x0215f0d8 kind:arm_call to:0x02073320 module:overlay(0) from:0x0215f134 kind:arm_call to:0x0208bc10 module:overlay(0) @@ -902,7 +902,7 @@ from:0x02160424 kind:arm_call to:0x01fff350 module:itcm from:0x0216044c kind:arm_call to:0x01fff350 module:itcm from:0x02160478 kind:arm_call to:0x01fff350 module:itcm from:0x02160498 kind:load to:0x027e0ce4 module:dtcm -from:0x021604a0 kind:load to:0x020b3040 module:overlay(0) +from:0x021604a0 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x021604ac kind:arm_call_thumb to:0x02057bd4 module:overlay(0) from:0x021604b4 kind:arm_call to:0x02011ff4 module:main from:0x021604cc kind:arm_call to:0x0207b6f4 module:overlay(0) diff --git a/config/eur1/arm9/overlays/ov060/relocs.txt b/config/eur1/arm9/overlays/ov060/relocs.txt index 4fe160af..e3e02b85 100644 --- a/config/eur1/arm9/overlays/ov060/relocs.txt +++ b/config/eur1/arm9/overlays/ov060/relocs.txt @@ -585,7 +585,7 @@ from:0x0215dca4 kind:arm_call to:0x02078348 module:overlay(0) from:0x0215dcc8 kind:arm_call to:0x01fff350 module:itcm from:0x0215dd14 kind:load to:0x027e09bc module:dtcm from:0x0215dd18 kind:load to:0x027e0ce4 module:dtcm -from:0x0215dd20 kind:load to:0x020b3040 module:overlay(0) +from:0x0215dd20 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0215dd30 kind:arm_call to:0x020f76cc module:overlay(31) from:0x0215dd64 kind:arm_call to:0x0209a04c module:overlay(0) from:0x0215dd70 kind:arm_call to:0x0205a7e0 module:overlay(0) diff --git a/config/eur1/arm9/overlays/ov063/relocs.txt b/config/eur1/arm9/overlays/ov063/relocs.txt index 74a064d4..f0c02df3 100644 --- a/config/eur1/arm9/overlays/ov063/relocs.txt +++ b/config/eur1/arm9/overlays/ov063/relocs.txt @@ -789,7 +789,7 @@ from:0x0215e20c kind:arm_call to:0x0215e214 module:overlay(63) from:0x0215e268 kind:arm_call to:0x01fff350 module:itcm from:0x0215e29c kind:load to:0x021627b4 module:overlay(63) from:0x0215e2a0 kind:load to:0x027e0ce4 module:dtcm -from:0x0215e2a4 kind:load to:0x020b3040 module:overlay(0) +from:0x0215e2a4 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0215e2c0 kind:arm_call to:0x02018c2c module:main from:0x0215e2d4 kind:arm_call to:0x020c55bc module:overlay(24) from:0x0215e2dc kind:arm_call to:0x020c5448 module:overlay(24) @@ -922,7 +922,7 @@ from:0x0215eeac kind:load to:0x020b7b15 module:overlays(8,9,12,13,15) from:0x0215ef10 kind:arm_call to:0x01fff350 module:itcm from:0x0215ef28 kind:arm_call to:0x021457f8 module:overlay(58) from:0x0215ef48 kind:load to:0x027e0ce4 module:dtcm -from:0x0215ef4c kind:load to:0x020b3040 module:overlay(0) +from:0x0215ef4c kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0215ef50 kind:load to:0x021627a0 module:overlay(63) from:0x0215ef5c kind:load to:0x0215ef60 module:overlay(63) from:0x0215ef94 kind:arm_call_thumb to:0x020b81fc module:overlay(12) diff --git a/config/eur1/arm9/overlays/ov066/relocs.txt b/config/eur1/arm9/overlays/ov066/relocs.txt index 7ff8d9a6..03efd661 100644 --- a/config/eur1/arm9/overlays/ov066/relocs.txt +++ b/config/eur1/arm9/overlays/ov066/relocs.txt @@ -482,7 +482,7 @@ from:0x0215b4e8 kind:arm_call to:0x02067a60 module:overlay(0) from:0x0215b504 kind:arm_call to:0x02067a60 module:overlay(0) from:0x0215b520 kind:arm_call to:0x02067a60 module:overlay(0) from:0x0215b53c kind:load to:0x027e0ce4 module:dtcm -from:0x0215b540 kind:load to:0x020b3040 module:overlay(0) +from:0x0215b540 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0215b548 kind:load to:0x020b508c module:overlay(0) from:0x0215b54c kind:load to:0x0215d8f8 module:overlay(66) from:0x0215b550 kind:load to:0x02049be0 module:main @@ -516,12 +516,12 @@ from:0x0215ba10 kind:arm_call to:0x01fff350 module:itcm from:0x0215ba30 kind:arm_call to:0x01fff3b4 module:itcm from:0x0215ba40 kind:arm_call to:0x0215c92c module:overlay(66) from:0x0215ba4c kind:load to:0x027e0ce4 module:dtcm -from:0x0215ba54 kind:load to:0x020b3040 module:overlay(0) +from:0x0215ba54 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0215ba84 kind:arm_call to:0x01fff350 module:itcm from:0x0215baa4 kind:arm_call to:0x01fff3b4 module:itcm from:0x0215bab4 kind:arm_call to:0x0215c988 module:overlay(66) from:0x0215bac0 kind:load to:0x027e0ce4 module:dtcm -from:0x0215bac8 kind:load to:0x020b3040 module:overlay(0) +from:0x0215bac8 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0215bad8 kind:arm_call to:0x02016694 module:main from:0x0215bae0 kind:arm_call to:0x02158f94 module:overlay(66) from:0x0215bae8 kind:arm_call to:0x02158f94 module:overlay(66) diff --git a/config/eur1/arm9/overlays/ov068/relocs.txt b/config/eur1/arm9/overlays/ov068/relocs.txt index f1a85457..3b368338 100644 --- a/config/eur1/arm9/overlays/ov068/relocs.txt +++ b/config/eur1/arm9/overlays/ov068/relocs.txt @@ -54,7 +54,7 @@ from:0x021585f8 kind:arm_call to:0x01fff350 module:itcm from:0x02158620 kind:arm_call to:0x0215d73c module:overlay(68) from:0x0215862c kind:arm_call to:0x0215df08 module:overlay(68) from:0x02158638 kind:load to:0x027e0ce4 module:dtcm -from:0x02158640 kind:load to:0x020b3040 module:overlay(0) +from:0x02158640 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02158644 kind:load to:0x027e0d6c module:dtcm from:0x02158648 kind:load to:0x02164294 module:overlay(68) from:0x02158670 kind:arm_call to:0x01fff3b4 module:itcm @@ -635,7 +635,7 @@ from:0x0215d858 kind:load to:0x027e09b8 module:dtcm from:0x0215d88c kind:arm_call to:0x01fff350 module:itcm from:0x0215d8b0 kind:arm_call to:0x02098680 module:overlay(0) from:0x0215d8bc kind:load to:0x027e0ce4 module:dtcm -from:0x0215d8c0 kind:load to:0x020b3040 module:overlay(0) +from:0x0215d8c0 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0215d8f4 kind:arm_call to:0x020d461c module:overlay(24) from:0x0215d920 kind:load to:0x027e0cfc module:dtcm from:0x0215d948 kind:load to:0x01ffc6d4 module:itcm diff --git a/config/eur1/arm9/overlays/ov070/symbols.txt b/config/eur1/arm9/overlays/ov070/symbols.txt index efcbb08d..672b19bb 100644 --- a/config/eur1/arm9/overlays/ov070/symbols.txt +++ b/config/eur1/arm9/overlays/ov070/symbols.txt @@ -503,7 +503,7 @@ _ZN23MapObjectProfileUnkPTFLC1Ev kind:function(arm,size=0xa8) addr:0x0214ba2c _ZN16MapObjectUnkPTFLC1Ev kind:function(arm,size=0x80) addr:0x0214bad4 _ZN16MapObjectUnkPTFL19func_ov070_0214ba34Ev kind:function(arm,size=0x144) addr:0x0214bb54 _ZN16MapObjectUnkPTFL19func_ov070_0214bb78Ev kind:function(arm,size=0x58) addr:0x0214bc98 -_ZN16MapObjectUnkPTFL19func_ov070_0214bbd0Ev kind:function(arm,size=0x178) addr:0x0214bcf0 +_ZN16MapObjectUnkPTFL19func_ov070_0214bbd0Esb kind:function(arm,size=0x178) addr:0x0214bcf0 _ZN16MapObjectUnkPTFL19func_ov070_0214bd48Ev kind:function(arm,size=0x48) addr:0x0214be68 _ZN16MapObjectUnkPTFL19func_ov070_0214bd90Ev kind:function(arm,size=0x1c8) addr:0x0214beb0 _ZN16MapObjectUnkPTFL19func_ov070_0214bf58Ev kind:function(arm,size=0x4) addr:0x0214c078 diff --git a/config/eur1/arm9/overlays/ov071/relocs.txt b/config/eur1/arm9/overlays/ov071/relocs.txt index 21bf011c..ced30686 100644 --- a/config/eur1/arm9/overlays/ov071/relocs.txt +++ b/config/eur1/arm9/overlays/ov071/relocs.txt @@ -1540,7 +1540,7 @@ from:0x0215f2f4 kind:arm_call to:0x01fff350 module:itcm from:0x0215f334 kind:arm_call to:0x0212928c module:overlay(42) from:0x0215f344 kind:arm_call to:0x01fff350 module:itcm from:0x0215f360 kind:load to:0x027e0ce4 module:dtcm -from:0x0215f368 kind:load to:0x020b3040 module:overlay(0) +from:0x0215f368 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0215f378 kind:load to:0x027e0d70 module:dtcm from:0x0215f38c kind:load to:0x027e0d70 module:dtcm from:0x0215f398 kind:load to:0x021652e8 module:overlay(71) diff --git a/config/eur1/arm9/overlays/ov072/relocs.txt b/config/eur1/arm9/overlays/ov072/relocs.txt index 3911b0a7..c9df5988 100644 --- a/config/eur1/arm9/overlays/ov072/relocs.txt +++ b/config/eur1/arm9/overlays/ov072/relocs.txt @@ -106,7 +106,7 @@ from:0x021517b8 kind:load to:0x02049be4 module:main from:0x021517bc kind:load to:0x027e09a8 module:dtcm from:0x021517c8 kind:load to:0x020b508c module:overlay(0) from:0x021517cc kind:load to:0x027e0ce4 module:dtcm -from:0x021517d4 kind:load to:0x020b3040 module:overlay(0) +from:0x021517d4 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x021517d8 kind:load to:0x021526bc module:overlay(72) from:0x0215180c kind:arm_call to:0x02073310 module:overlay(0) from:0x02151848 kind:arm_call to:0x020786cc module:overlay(0) diff --git a/config/eur1/arm9/overlays/ov073/relocs.txt b/config/eur1/arm9/overlays/ov073/relocs.txt index 1fdecc0a..1c07d373 100644 --- a/config/eur1/arm9/overlays/ov073/relocs.txt +++ b/config/eur1/arm9/overlays/ov073/relocs.txt @@ -1823,7 +1823,7 @@ from:0x02163a40 kind:load to:0x020aaf38 module:overlay(0) from:0x02163a44 kind:load to:0x020aaf40 module:overlay(0) from:0x02163a48 kind:load to:0x020aaf3c module:overlay(0) from:0x02163a4c kind:load to:0x027e0ce4 module:dtcm -from:0x02163a50 kind:load to:0x020b3040 module:overlay(0) +from:0x02163a50 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02163a58 kind:load to:0x020aaf10 module:overlay(0) from:0x02163a5c kind:load to:0x020aaf14 module:overlay(0) from:0x02163a60 kind:load to:0x020aaf18 module:overlay(0) @@ -1844,7 +1844,7 @@ from:0x02163c20 kind:load to:0x020aaf2c module:overlay(0) from:0x02163c24 kind:load to:0x020aaf28 module:overlay(0) from:0x02163c28 kind:load to:0x027e0ce0 module:dtcm from:0x02163c2c kind:load to:0x027e0ce4 module:dtcm -from:0x02163c34 kind:load to:0x020b3040 module:overlay(0) +from:0x02163c34 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02163c38 kind:load to:0x020aaf0c module:overlay(0) from:0x02163c3c kind:load to:0x020aaf38 module:overlay(0) from:0x02163c40 kind:load to:0x020aaf40 module:overlay(0) @@ -1865,7 +1865,7 @@ from:0x02163dec kind:arm_call to:0x01ffb6e4 module:itcm from:0x02163df8 kind:load to:0x020aaf2c module:overlay(0) from:0x02163dfc kind:load to:0x020aaf28 module:overlay(0) from:0x02163e00 kind:load to:0x027e0ce0 module:dtcm -from:0x02163e04 kind:load to:0x020b3040 module:overlay(0) +from:0x02163e04 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02163e0c kind:load to:0x027e0ce4 module:dtcm from:0x02163e10 kind:load to:0x020aaf10 module:overlay(0) from:0x02163e14 kind:load to:0x020aaf14 module:overlay(0) diff --git a/config/eur1/arm9/overlays/ov074/relocs.txt b/config/eur1/arm9/overlays/ov074/relocs.txt index b90522e2..6910904c 100644 --- a/config/eur1/arm9/overlays/ov074/relocs.txt +++ b/config/eur1/arm9/overlays/ov074/relocs.txt @@ -1842,7 +1842,7 @@ from:0x02161ce8 kind:arm_call to:0x01ffb428 module:itcm from:0x02161d04 kind:arm_call to:0x01ffb428 module:itcm from:0x02161d40 kind:arm_call to:0x01fff350 module:itcm from:0x02161d5c kind:load to:0x027e0ce4 module:dtcm -from:0x02161d60 kind:load to:0x020b3040 module:overlay(0) +from:0x02161d60 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02161d8c kind:arm_call to:0x02078868 module:overlay(0) from:0x02161d94 kind:load to:0x027e09bc module:dtcm from:0x02161da0 kind:arm_call to:0x02097960 module:overlay(0) diff --git a/config/eur1/arm9/overlays/ov075/relocs.txt b/config/eur1/arm9/overlays/ov075/relocs.txt index aa10a694..c8051bb3 100644 --- a/config/eur1/arm9/overlays/ov075/relocs.txt +++ b/config/eur1/arm9/overlays/ov075/relocs.txt @@ -381,11 +381,11 @@ from:0x02154364 kind:arm_call to:0x02097a08 module:overlay(0) from:0x021543a0 kind:load to:0x02162be8 module:overlay(75) from:0x021543d4 kind:arm_call to:0x01fff350 module:itcm from:0x021543f4 kind:load to:0x027e0ce4 module:dtcm -from:0x021543fc kind:load to:0x020b3040 module:overlay(0) +from:0x021543fc kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0215442c kind:arm_call to:0x01fff350 module:itcm from:0x02154464 kind:arm_call to:0x01fff350 module:itcm from:0x02154484 kind:load to:0x027e0ce4 module:dtcm -from:0x0215448c kind:load to:0x020b3040 module:overlay(0) +from:0x0215448c kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x021544a0 kind:arm_call to:0x02097530 module:overlay(0) from:0x021544b4 kind:load to:0x020b53e4 module:overlay(0) from:0x021544cc kind:arm_call to:0x02098b7c module:overlay(0) @@ -1795,7 +1795,7 @@ from:0x02161184 kind:arm_call to:0x01ff93c0 module:itcm from:0x02161198 kind:arm_call to:0x01ffb974 module:itcm from:0x021611ac kind:arm_call to:0x01ffb974 module:itcm from:0x02161210 kind:arm_call to:0x02015820 module:main -from:0x0216121c kind:load to:0x020b3040 module:overlay(0) +from:0x0216121c kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02161224 kind:load to:0x027e0ce4 module:dtcm from:0x02161228 kind:load to:0x027e0ce0 module:dtcm from:0x02161260 kind:arm_call to:0x01fff350 module:itcm @@ -1805,7 +1805,7 @@ from:0x021612cc kind:arm_call to:0x01ff93c0 module:itcm from:0x021612e0 kind:arm_call to:0x01ffb974 module:itcm from:0x021612f4 kind:arm_call to:0x01ffb974 module:itcm from:0x02161334 kind:load to:0x027e0ce4 module:dtcm -from:0x02161338 kind:load to:0x020b3040 module:overlay(0) +from:0x02161338 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02161340 kind:load to:0x027e0ce0 module:dtcm from:0x0216138c kind:arm_call to:0x01ffb428 module:itcm from:0x0216139c kind:load to:0x020aaefc module:overlay(0) diff --git a/config/eur1/arm9/overlays/ov078/relocs.txt b/config/eur1/arm9/overlays/ov078/relocs.txt index 4425096a..0dd3f2bd 100644 --- a/config/eur1/arm9/overlays/ov078/relocs.txt +++ b/config/eur1/arm9/overlays/ov078/relocs.txt @@ -856,7 +856,7 @@ from:0x0215c23c kind:load to:0x0203e964 module:main from:0x0215c270 kind:arm_call to:0x01fff350 module:itcm from:0x0215c2a0 kind:arm_call to:0x01fff350 module:itcm from:0x0215c2c4 kind:load to:0x027e0ce4 module:dtcm -from:0x0215c2cc kind:load to:0x020b3040 module:overlay(0) +from:0x0215c2cc kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0215c30c kind:arm_call_thumb to:0x01ffa184 module:itcm from:0x0215c338 kind:arm_call_thumb to:0x01ffa1a0 module:itcm from:0x0215c34c kind:arm_call to:0x01ffa60c module:itcm @@ -1027,7 +1027,7 @@ from:0x0215d4e8 kind:load to:0x027e0ce0 module:dtcm from:0x0215d4ec kind:load to:0x027e0cd8 module:dtcm from:0x0215d4f0 kind:load to:0x027e09b8 module:dtcm from:0x0215d4f4 kind:load to:0x027e0ce4 module:dtcm -from:0x0215d4fc kind:load to:0x020b3040 module:overlay(0) +from:0x0215d4fc kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0215d500 kind:load to:0x020aaee8 module:overlay(0) from:0x0215d520 kind:load to:0x020aaf48 module:overlay(0) from:0x0215d524 kind:load to:0x020aaf44 module:overlay(0) diff --git a/config/eur1/arm9/overlays/ov080/relocs.txt b/config/eur1/arm9/overlays/ov080/relocs.txt index ee073649..9e1ca251 100644 --- a/config/eur1/arm9/overlays/ov080/relocs.txt +++ b/config/eur1/arm9/overlays/ov080/relocs.txt @@ -1064,7 +1064,7 @@ from:0x0215c260 kind:arm_call to:0x01fff350 module:itcm from:0x0215c28c kind:arm_call to:0x0215d35c module:overlay(80) from:0x0215c29c kind:arm_call to:0x01fff350 module:itcm from:0x0215c2b8 kind:load to:0x027e0ce4 module:dtcm -from:0x0215c2c0 kind:load to:0x020b3040 module:overlay(0) +from:0x0215c2c0 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0215c2e4 kind:arm_call to:0x020d973c module:overlay(31) from:0x0215c2f0 kind:arm_call to:0x01fff3b4 module:itcm from:0x0215c2fc kind:arm_call to:0x02098524 module:overlay(0) diff --git a/config/eur1/arm9/overlays/ov081/relocs.txt b/config/eur1/arm9/overlays/ov081/relocs.txt index 5cd91798..7d335605 100644 --- a/config/eur1/arm9/overlays/ov081/relocs.txt +++ b/config/eur1/arm9/overlays/ov081/relocs.txt @@ -90,7 +90,7 @@ from:0x02151a8c kind:arm_call to:0x01fff498 module:itcm from:0x02151a98 kind:arm_call to:0x02152780 module:overlay(81) from:0x02151aa4 kind:arm_call to:0x021512a8 module:overlay(81) from:0x02151ab0 kind:load to:0x027e0ce4 module:dtcm -from:0x02151ab8 kind:load to:0x020b3040 module:overlay(0) +from:0x02151ab8 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02151abc kind:load to:0x027e0ce0 module:dtcm from:0x02151ac0 kind:load to:0x027e0ce8 module:dtcm from:0x02151afc kind:arm_call to:0x02150fec module:overlay(81) diff --git a/config/eur1/arm9/overlays/ov083/relocs.txt b/config/eur1/arm9/overlays/ov083/relocs.txt index 265ae3b3..efdfec29 100644 --- a/config/eur1/arm9/overlays/ov083/relocs.txt +++ b/config/eur1/arm9/overlays/ov083/relocs.txt @@ -226,11 +226,11 @@ from:0x02154d84 kind:load to:0x0203e964 module:main from:0x02154db0 kind:arm_call to:0x01fff350 module:itcm from:0x02154dcc kind:arm_call to:0x0215c044 module:overlay(83) from:0x02154dd8 kind:load to:0x027e0ce4 module:dtcm -from:0x02154de0 kind:load to:0x020b3040 module:overlay(0) +from:0x02154de0 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02154e0c kind:arm_call to:0x01fff350 module:itcm from:0x02154e28 kind:arm_call to:0x0215bf6c module:overlay(83) from:0x02154e34 kind:load to:0x027e0ce4 module:dtcm -from:0x02154e3c kind:load to:0x020b3040 module:overlay(0) +from:0x02154e3c kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02154e68 kind:arm_call to:0x01ffaf74 module:itcm from:0x02154e94 kind:arm_call to:0x0209ff00 module:overlay(0) from:0x02154eb0 kind:arm_call to:0x0209ff00 module:overlay(0) @@ -312,7 +312,7 @@ from:0x02155c38 kind:load to:0x0215da58 module:overlay(83) from:0x02155c3c kind:load to:0x027e09b8 module:dtcm from:0x02155c40 kind:load to:0x020b51f8 module:overlay(0) from:0x02155c44 kind:load to:0x027e0d34 module:dtcm -from:0x02155c4c kind:load to:0x020b3040 module:overlay(0) +from:0x02155c4c kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02155c50 kind:load to:0x027e0ce4 module:dtcm from:0x02155c54 kind:load to:0x027e09ac module:dtcm from:0x02155cc4 kind:arm_call to:0x020a7f98 module:overlay(0) @@ -390,7 +390,7 @@ from:0x02156780 kind:arm_call to:0x02072724 module:overlay(0) from:0x02156794 kind:load to:0x027e09b8 module:dtcm from:0x02156798 kind:load to:0x020b51f8 module:overlay(0) from:0x0215679c kind:load to:0x027e0d34 module:dtcm -from:0x021567a4 kind:load to:0x020b3040 module:overlay(0) +from:0x021567a4 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x021567a8 kind:load to:0x027e0ce4 module:dtcm from:0x021567ac kind:load to:0x027e09ac module:dtcm from:0x0215681c kind:arm_call to:0x020a7f98 module:overlay(0) diff --git a/config/eur1/arm9/overlays/ov084/relocs.txt b/config/eur1/arm9/overlays/ov084/relocs.txt index 16c9fe69..8a6db5ca 100644 --- a/config/eur1/arm9/overlays/ov084/relocs.txt +++ b/config/eur1/arm9/overlays/ov084/relocs.txt @@ -248,7 +248,7 @@ from:0x02153564 kind:load to:0x02162c30 module:overlay(84) from:0x02153568 kind:load to:0x027e09c0 module:dtcm from:0x02153598 kind:arm_call to:0x01fff350 module:itcm from:0x021535bc kind:load to:0x027e0ce4 module:dtcm -from:0x021535c4 kind:load to:0x020b3040 module:overlay(0) +from:0x021535c4 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x021535f8 kind:arm_call to:0x01ffb428 module:itcm from:0x02153618 kind:arm_call to:0x020d9b1c module:overlay(31) from:0x0215363c kind:arm_call to:0x02078264 module:overlay(0) @@ -336,7 +336,7 @@ from:0x02154310 kind:arm_call to:0x02161104 module:overlay(84) from:0x02154348 kind:arm_call to:0x02097448 module:overlay(0) from:0x02154358 kind:load to:0x027e0cd8 module:dtcm from:0x0215435c kind:load to:0x027e0ce4 module:dtcm -from:0x02154360 kind:load to:0x020b3040 module:overlay(0) +from:0x02154360 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02154368 kind:load to:0x02049be4 module:main from:0x0215436c kind:load to:0x020b53e4 module:overlay(0) from:0x02154398 kind:arm_call to:0x02154180 module:overlay(84) @@ -567,7 +567,7 @@ from:0x02156820 kind:arm_call to:0x02159898 module:overlay(84) from:0x02156840 kind:arm_call to:0x02096d54 module:overlay(0) from:0x021568d4 kind:arm_call to:0x02155a84 module:overlay(84) from:0x02156900 kind:load to:0x027e0ce4 module:dtcm -from:0x02156904 kind:load to:0x020b3040 module:overlay(0) +from:0x02156904 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0215690c kind:load to:0x02049be4 module:main from:0x02156928 kind:arm_call to:0x02155838 module:overlay(84) from:0x02156968 kind:arm_call to:0x02096d54 module:overlay(0) diff --git a/config/eur1/arm9/overlays/ov087/relocs.txt b/config/eur1/arm9/overlays/ov087/relocs.txt index ff7e82b0..f2796d24 100644 --- a/config/eur1/arm9/overlays/ov087/relocs.txt +++ b/config/eur1/arm9/overlays/ov087/relocs.txt @@ -474,7 +474,7 @@ from:0x02158fc4 kind:arm_call to:0x0209764c module:overlay(0) from:0x0215900c kind:arm_call to:0x02097448 module:overlay(0) from:0x02159020 kind:arm_call to:0x02151030 module:overlay(85) from:0x0215902c kind:load to:0x027e0ce4 module:dtcm -from:0x02159034 kind:load to:0x020b3040 module:overlay(0) +from:0x02159034 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02159038 kind:load to:0x027e09bc module:dtcm from:0x0215903c kind:load to:0x020b53e4 module:overlay(0) from:0x02159064 kind:arm_call to:0x0209764c module:overlay(0) @@ -485,7 +485,7 @@ from:0x021590e0 kind:load to:0x02078b5c module:overlay(0) from:0x02159118 kind:arm_call to:0x01fff350 module:itcm from:0x02159160 kind:arm_call to:0x01fff350 module:itcm from:0x02159180 kind:load to:0x027e0ce4 module:dtcm -from:0x02159188 kind:load to:0x020b3040 module:overlay(0) +from:0x02159188 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02159350 kind:load to:0x02049be4 module:main from:0x021593f4 kind:arm_call to:0x01ffb6e4 module:itcm from:0x0215943c kind:arm_call to:0x01ffb6e4 module:itcm @@ -617,7 +617,7 @@ from:0x0215afc4 kind:arm_call to:0x02152ec8 module:overlay(85) from:0x0215afd4 kind:arm_call to:0x01fff350 module:itcm from:0x0215aff0 kind:load to:0x027e09a8 module:dtcm from:0x0215aff8 kind:load to:0x027e0ce4 module:dtcm -from:0x0215b000 kind:load to:0x020b3040 module:overlay(0) +from:0x0215b000 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0215b03c kind:arm_call to:0x02015080 module:main from:0x0215b05c kind:arm_call to:0x02071b64 module:overlay(0) from:0x0215b090 kind:arm_call to:0x02015080 module:main @@ -1035,7 +1035,7 @@ from:0x0215e68c kind:load to:0x021620ac module:overlay(87) from:0x0215e690 kind:load to:0x021627fc module:overlay(87) from:0x0215e694 kind:load to:0x027e0cd8 module:dtcm from:0x0215e698 kind:load to:0x027e0ce4 module:dtcm -from:0x0215e6a0 kind:load to:0x020b3040 module:overlay(0) +from:0x0215e6a0 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0215e6a4 kind:load to:0x027e0ce8 module:dtcm from:0x0215e6ac kind:load to:0x020b3504 module:overlay(0) from:0x0215e714 kind:arm_call to:0x02073320 module:overlay(0) diff --git a/config/eur1/arm9/overlays/ov088/relocs.txt b/config/eur1/arm9/overlays/ov088/relocs.txt index 58132c44..2357d008 100644 --- a/config/eur1/arm9/overlays/ov088/relocs.txt +++ b/config/eur1/arm9/overlays/ov088/relocs.txt @@ -203,7 +203,7 @@ from:0x02167058 kind:load to:0x027e0994 module:dtcm from:0x0216705c kind:load to:0x02177398 module:overlay(88) from:0x02167060 kind:load to:0x027e09a8 module:dtcm from:0x02167064 kind:load to:0x027e0ce4 module:dtcm -from:0x0216706c kind:load to:0x020b3040 module:overlay(0) +from:0x0216706c kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02167070 kind:load to:0x027e0ce8 module:dtcm from:0x02167078 kind:load to:0x020b3504 module:overlay(0) from:0x0216707c kind:load to:0x027e0ce0 module:dtcm @@ -233,7 +233,7 @@ from:0x021674a8 kind:load to:0x027e0ce4 module:dtcm from:0x021674b4 kind:load to:0x020b53e4 module:overlay(0) from:0x021674b8 kind:load to:0x021743a8 module:overlay(88) from:0x021674c4 kind:load to:0x027e09ac module:dtcm -from:0x021674d4 kind:load to:0x020b3040 module:overlay(0) +from:0x021674d4 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02167500 kind:arm_call to:0x01fff3b4 module:itcm from:0x0216752c kind:load to:0x027e0ce4 module:dtcm from:0x02167548 kind:arm_call to:0x01fff3b4 module:itcm diff --git a/config/eur1/arm9/overlays/ov092/relocs.txt b/config/eur1/arm9/overlays/ov092/relocs.txt index 4b015d86..a71b0fbe 100644 --- a/config/eur1/arm9/overlays/ov092/relocs.txt +++ b/config/eur1/arm9/overlays/ov092/relocs.txt @@ -518,7 +518,7 @@ from:0x0216992c kind:arm_call to:0x01fff350 module:itcm from:0x02169984 kind:arm_call to:0x01fff498 module:itcm from:0x021699c0 kind:load to:0x027e09a4 module:dtcm from:0x021699c4 kind:load to:0x027e0ce4 module:dtcm -from:0x021699cc kind:load to:0x020b3040 module:overlay(0) +from:0x021699cc kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x021699d4 kind:load to:0x027e0ce8 module:dtcm from:0x02169b10 kind:arm_call to:0x0216d084 module:overlay(92) from:0x02169b9c kind:load to:0x0217d980 module:overlay(92) diff --git a/config/eur1/arm9/overlays/ov092/symbols.txt b/config/eur1/arm9/overlays/ov092/symbols.txt index 744b54cc..b2324b2e 100644 --- a/config/eur1/arm9/overlays/ov092/symbols.txt +++ b/config/eur1/arm9/overlays/ov092/symbols.txt @@ -160,7 +160,7 @@ func_ov092_021688c8 kind:function(arm,size=0x2c) addr:0x02168a48 func_ov092_021688f4 kind:function(arm,size=0x2c) addr:0x02168a74 func_ov092_02168920 kind:function(arm,size=0xb4) addr:0x02168aa0 func_ov092_021689d4 kind:function(arm,size=0x14) addr:0x02168b54 -func_ov092_021689e8 kind:function(arm,size=0xac) addr:0x02168b68 +_ZN25UnkStruct_027e0ce0_40_14C19func_ov092_021689e8EiP21UnkStruct_027e0ce0_40P15PlayerLinkActorP25UnkStruct_027e0ce0_40_328 kind:function(arm,size=0xac) addr:0x02168b68 func_ov092_02168a94 kind:function(arm,size=0x28) addr:0x02168c14 func_ov092_02168abc kind:function(arm,size=0x118) addr:0x02168c3c func_ov092_02168bd4 kind:function(arm,size=0x2c) addr:0x02168d54 diff --git a/config/eur1/arm9/overlays/ov093/relocs.txt b/config/eur1/arm9/overlays/ov093/relocs.txt index 08999780..b4a83772 100644 --- a/config/eur1/arm9/overlays/ov093/relocs.txt +++ b/config/eur1/arm9/overlays/ov093/relocs.txt @@ -1158,7 +1158,7 @@ from:0x02171ae0 kind:arm_call to:0x02171184 module:overlay(93) from:0x02171ae8 kind:load to:0x02177ebc module:overlay(93) from:0x02171b94 kind:arm_call to:0x01fff350 module:itcm from:0x02171bd0 kind:load to:0x027e0ce4 module:dtcm -from:0x02171bd8 kind:load to:0x020b3040 module:overlay(0) +from:0x02171bd8 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02171c14 kind:load to:0x02177ebc module:overlay(93) from:0x02171c64 kind:arm_call to:0x02171184 module:overlay(93) from:0x02171c94 kind:arm_call to:0x0216f4d8 module:overlay(93) diff --git a/config/eur1/arm9/overlays/ov093/symbols.txt b/config/eur1/arm9/overlays/ov093/symbols.txt index 6fd2daf4..13bfd9fd 100644 --- a/config/eur1/arm9/overlays/ov093/symbols.txt +++ b/config/eur1/arm9/overlays/ov093/symbols.txt @@ -85,7 +85,7 @@ _ZN19func_ov093_02168004D0Ev kind:function(arm,size=0x1c) addr:0x02168184 func_ov093_02168020 kind:function(arm,size=0xdc) addr:0x021681a0 func_ov093_021680fc kind:function(arm,size=0xa8) addr:0x0216827c func_ov093_021681a4 kind:function(arm,size=0x7c) addr:0x02168324 -func_ov093_02168220 kind:function(arm,size=0x38) addr:0x021683a0 +_ZN21UnkStruct_027e0ce0_4019func_ov093_02168220Ev kind:function(arm,size=0x38) addr:0x021683a0 func_ov093_02168258 kind:function(arm,size=0xb4) addr:0x021683d8 func_ov093_0216830c kind:function(arm,size=0xfc) addr:0x0216848c func_ov093_02168408 kind:function(thumb,size=0x7c) addr:0x02168588 @@ -98,7 +98,7 @@ _ZN25UnkStruct_027e0ce0_40_14CD1Ev kind:function(thumb,size=0x2) addr:0x021689cc _ZN25UnkStruct_027e0ce0_40_14C19func_ov093_02168850Ev kind:function(thumb,size=0x14) addr:0x021689d0 func_ov093_02168864 kind:function(arm,size=0x184) addr:0x021689e4 func_ov093_021689e8 kind:function(arm,size=0x43c) addr:0x02168b68 -func_ov093_02168e24 kind:function(arm,size=0x6c) addr:0x02168fa4 +_ZN25UnkStruct_027e0ce0_40_14C19func_ov093_02168e24Ei kind:function(arm,size=0x6c) addr:0x02168fa4 func_ov093_02168e90 kind:function(thumb,size=0xa) addr:0x02169010 func_ov093_02168e9c kind:function(arm,size=0x24) addr:0x0216901c func_ov093_02168ec0 kind:function(arm,size=0x9c) addr:0x02169040 @@ -162,7 +162,7 @@ _ZN19func_ov093_0216ccbcD0Ev kind:function(arm,size=0x1c) addr:0x0216ce3c func_ov093_0216ccd8 kind:function(thumb,size=0x14) addr:0x0216ce58 func_ov093_0216ccec kind:function(arm,size=0x94) addr:0x0216ce6c func_ov093_0216cd80 kind:function(arm,size=0xa4) addr:0x0216cf00 -func_ov093_0216ce24 kind:function(arm,size=0x3c) addr:0x0216cfa4 +_ZN15PlayerLinkActor19func_ov093_0216ce24EPi kind:function(arm,size=0x3c) addr:0x0216cfa4 _ZN25UnkStruct_027e0ce0_40_328C1EPvP21UnkStruct_027e0ce0_40P25UnkStruct_027e0ce0_40_150Pj kind:function(thumb,size=0x1bc) addr:0x0216cfe0 _ZN25UnkStruct_027e0ce0_40_328D1Ev kind:function(thumb,size=0xb6) addr:0x0216d19c _ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d0d4Ev kind:function(thumb,size=0x8c) addr:0x0216d254 @@ -173,13 +173,13 @@ func_ov093_0216d3fc kind:function(arm,size=0x30) addr:0x0216d57c func_ov093_0216d42c kind:function(arm,size=0x14) addr:0x0216d5ac func_ov093_0216d440 kind:function(arm,size=0xb4) addr:0x0216d5c0 func_ov093_0216d4f4 kind:function(arm,size=0xc4) addr:0x0216d674 -func_ov093_0216d5b8 kind:function(arm,size=0x830) addr:0x0216d738 +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d5b8Ei kind:function(arm,size=0x830) addr:0x0216d738 func_ov093_0216dde8 kind:function(arm,size=0x48) addr:0x0216df68 -func_ov093_0216de30 kind:function(arm,size=0x98) addr:0x0216dfb0 -func_ov093_0216dec8 kind:function(arm,size=0x260) addr:0x0216e048 +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216de30Eii kind:function(arm,size=0x98) addr:0x0216dfb0 +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216dec8Ei kind:function(arm,size=0x260) addr:0x0216e048 func_ov093_0216e128 kind:function(arm,size=0x68) addr:0x0216e2a8 func_ov093_0216e190 kind:function(arm,size=0x14) addr:0x0216e310 -func_ov093_0216e1a4 kind:function(arm,size=0xfc) addr:0x0216e324 +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216e1a4Ei kind:function(arm,size=0xfc) addr:0x0216e324 func_ov093_0216e2a0 kind:function(arm,size=0x18) addr:0x0216e420 func_ov093_0216e2b8 kind:function(arm,size=0x20) addr:0x0216e438 func_ov093_0216e2d8 kind:function(arm,size=0x20) addr:0x0216e458 @@ -218,7 +218,7 @@ func_ov093_0216f66c kind:function(thumb,size=0x10) addr:0x0216f7ec func_ov093_0216f67c kind:function(thumb,size=0x10) addr:0x0216f7fc func_ov093_0216f68c kind:function(thumb,size=0x7c) addr:0x0216f80c func_ov093_0216f708 kind:function(thumb,size=0x12) addr:0x0216f888 -func_ov093_0216f71c kind:function(thumb,size=0x50) addr:0x0216f89c +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216f71cEPi kind:function(thumb,size=0x50) addr:0x0216f89c func_ov093_0216f76c kind:function(thumb,size=0xc) addr:0x0216f8ec func_ov093_0216f778 kind:function(arm,size=0x78) addr:0x0216f8f8 func_ov093_0216f7f0 kind:function(arm,size=0x7c) addr:0x0216f970 diff --git a/config/eur1/arm9/overlays/ov094/relocs.txt b/config/eur1/arm9/overlays/ov094/relocs.txt index fb9b0f5f..da0866bb 100644 --- a/config/eur1/arm9/overlays/ov094/relocs.txt +++ b/config/eur1/arm9/overlays/ov094/relocs.txt @@ -752,7 +752,7 @@ from:0x0216bf9c kind:load to:0x02049be4 module:main from:0x0216bfa0 kind:load to:0x020b53e4 module:overlay(0) from:0x0216bfa8 kind:load to:0x02178c80 module:overlay(94) from:0x0216bfac kind:load to:0x027e0ce4 module:dtcm -from:0x0216bfb0 kind:load to:0x020b3040 module:overlay(0) +from:0x0216bfb0 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0216bfb4 kind:load to:0x0203e964 module:main from:0x0216c094 kind:arm_call to:0x02058fc4 module:overlay(0) from:0x0216c0bc kind:arm_call to:0x01ffc634 module:itcm @@ -1080,7 +1080,7 @@ from:0x0216f084 kind:load to:0x020b53e4 module:overlay(0) from:0x0216f0b8 kind:arm_call to:0x01fff350 module:itcm from:0x0216f0d8 kind:arm_call to:0x0216f3d0 module:overlay(94) from:0x0216f0e4 kind:load to:0x027e0ce4 module:dtcm -from:0x0216f0ec kind:load to:0x020b3040 module:overlay(0) +from:0x0216f0ec kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0216f0fc kind:arm_call to:0x020983dc module:overlay(0) from:0x0216f154 kind:arm_call_thumb to:0x02057b70 module:overlay(0) from:0x0216f190 kind:arm_call to:0x0203d160 module:main diff --git a/config/eur1/arm9/overlays/ov095/relocs.txt b/config/eur1/arm9/overlays/ov095/relocs.txt index c4a3f67a..59a89fd2 100644 --- a/config/eur1/arm9/overlays/ov095/relocs.txt +++ b/config/eur1/arm9/overlays/ov095/relocs.txt @@ -96,7 +96,7 @@ from:0x0217a734 kind:thumb_call to:0x0217a7b4 module:overlay(95) from:0x0217a73c kind:thumb_call_arm to:0x0215422c module:overlays(71,75) from:0x0217a746 kind:thumb_call to:0x020bbaac module:overlay(1) from:0x0217a76a kind:thumb_call to:0x0217a5bc module:overlay(95) -from:0x0217a774 kind:load to:0x020b3040 module:overlay(0) +from:0x0217a774 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0217a77c kind:load to:0x027e0ce4 module:dtcm from:0x0217a780 kind:load to:0x027e0ce0 module:dtcm from:0x0217a7b0 kind:load to:0x027e09b8 module:dtcm @@ -514,7 +514,7 @@ from:0x0217da78 kind:arm_call to:0x0212462c module:overlay(45) from:0x0217da88 kind:arm_call to:0x0208cf70 module:overlay(0) from:0x0217da94 kind:load to:0x027e09a8 module:dtcm from:0x0217da9c kind:load to:0x027e0ce4 module:dtcm -from:0x0217daac kind:load to:0x020b3040 module:overlay(0) +from:0x0217daac kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0217dab0 kind:load to:0x02177e8c module:overlays(89,90,91,93,94) from:0x0217daf4 kind:arm_call to:0x01fff3b4 module:itcm from:0x0217db00 kind:arm_call to:0x01fff458 module:itcm diff --git a/config/eur1/arm9/overlays/ov096/relocs.txt b/config/eur1/arm9/overlays/ov096/relocs.txt index 364ac2d0..a2516273 100644 --- a/config/eur1/arm9/overlays/ov096/relocs.txt +++ b/config/eur1/arm9/overlays/ov096/relocs.txt @@ -1,7 +1,7 @@ from:0x02179d2c kind:arm_call to:0x01fff350 module:itcm from:0x02179d48 kind:arm_call to:0x0217aee8 module:overlay(96) from:0x02179d90 kind:load to:0x027e0ce4 module:dtcm -from:0x02179d98 kind:load to:0x020b3040 module:overlay(0) +from:0x02179d98 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02179db4 kind:load to:0x027e0cd8 module:dtcm from:0x02179db8 kind:load to:0x02081e64 module:overlay(0) from:0x02179dd2 kind:thumb_call_arm to:0x02081db0 module:overlay(0) @@ -20,7 +20,7 @@ from:0x02179f04 kind:thumb_call_arm to:0x0206c9a8 module:overlay(0) from:0x02179f16 kind:thumb_call_arm to:0x02070594 module:overlay(0) from:0x02179f2e kind:thumb_call_arm to:0x0206d180 module:overlay(0) from:0x02179f38 kind:load to:0x027e09a4 module:dtcm -from:0x02179f3c kind:load to:0x020b3040 module:overlay(0) +from:0x02179f3c kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02179f44 kind:load to:0x027e0ce4 module:dtcm from:0x02179f48 kind:load to:0x020b51f8 module:overlay(0) from:0x02179fa8 kind:arm_call_thumb to:0x02179de8 module:overlay(96) diff --git a/config/eur1/arm9/overlays/ov101/relocs.txt b/config/eur1/arm9/overlays/ov101/relocs.txt index f69168c9..82bbd1be 100644 --- a/config/eur1/arm9/overlays/ov101/relocs.txt +++ b/config/eur1/arm9/overlays/ov101/relocs.txt @@ -79,7 +79,7 @@ from:0x021833b4 kind:thumb_call to:0x020bcc10 module:overlay(1) from:0x0218345e kind:thumb_call to:0x0216d34c module:overlay(93) from:0x02183472 kind:thumb_call to:0x020bbfbc module:overlay(1) from:0x021834ac kind:thumb_call_arm to:0x01fff350 module:itcm -from:0x021834cc kind:load to:0x020b3040 module:overlay(0) +from:0x021834cc kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x021834d0 kind:load to:0x027e0ce4 module:dtcm from:0x021834dc kind:thumb_call to:0x020b6d98 module:overlay(1) from:0x021834f2 kind:thumb_call_arm to:0x02011ff4 module:main diff --git a/config/eur1/arm9/overlays/ov101/symbols.txt b/config/eur1/arm9/overlays/ov101/symbols.txt index b3dd0e96..d00cc123 100644 --- a/config/eur1/arm9/overlays/ov101/symbols.txt +++ b/config/eur1/arm9/overlays/ov101/symbols.txt @@ -14,7 +14,7 @@ _ZN21UnkStruct_027e0ce0_40D1Ev kind:function(thumb,size=0x54) addr:0x02183160 _ZN21UnkStruct_027e0ce0_4019func_ov101_02182fb4Eb kind:function(thumb,size=0x50) addr:0x021831b4 _ZN21UnkStruct_027e0ce0_4019func_ov101_02183004Ev kind:function(thumb,size=0x1e) addr:0x02183204 _ZN21UnkStruct_027e0ce0_4019func_ov101_02183024EPK24UnkStruct_ov001_020c40f4S2_iiP11ItemManagerP21UnkStruct_027e0ce0_30bb kind:function(thumb,size=0x260) addr:0x02183224 -_ZN21PlayerLinkActor_A0_1CC1Ei kind:function(thumb,size=0xc) addr:0x02183484 +_ZN21PlayerLinkActor_A0_1CC1EP21UnkStruct_027e0ce0_40 kind:function(thumb,size=0xc) addr:0x02183484 _ZN21PlayerLinkActor_A0_1C19func_ov101_02183290Ev kind:function(thumb,size=0x48) addr:0x02183490 _ZN30UnkStruct_027e09a4_54_Derived1C2EPi kind:function(thumb,size=0x50) addr:0x021834d8 _ZN30UnkStruct_027e09a4_54_Derived18vfunc_0CEv kind:function(thumb,size=0x134) addr:0x02183528 diff --git a/config/eur1/arm9/overlays/ov102/delinks.txt b/config/eur1/arm9/overlays/ov102/delinks.txt index ac95e48e..78e7c84e 100644 --- a/config/eur1/arm9/overlays/ov102/delinks.txt +++ b/config/eur1/arm9/overlays/ov102/delinks.txt @@ -4,3 +4,26 @@ .ctor start:0x02184b74 end:0x02184b78 kind:rodata align:4 .data start:0x02184b80 end:0x02184c40 kind:data align:32 .bss start:0x02184c40 end:0x02184c40 kind:bss align:32 + +src/102_CourseExecLand/UnkStruct_027e0ce0_40_102.cpp: + .text start:0x02182e20 end:0x021837c4 + +src/102_CourseExecLand/MapObjectUnkSAND_102.cpp: + complete + .text start:0x021837c4 end:0x02183e14 + .rodata start:0x02184ab0 end:0x02184b50 + +src/102_CourseExecLand/MapObjectUnkPTFL_102.cpp: + .text start:0x02183e14 end:0x021847c8 + .data start:0x02184b80 end:0x02184c10 + +src/102_CourseExecLand/UnkStruct_027e0cd8_0C_102.cpp: + complete + .text start:0x021847c8 end:0x02184844 + +src/102_CourseExecLand/ActorUnkMLCK_102.cpp: + complete + .text start:0x02184844 end:0x02184ab0 + .init start:0x02184b50 end:0x02184b74 + .ctor start:0x02184b74 end:0x02184b78 + .data start:0x02184c10 end:0x02184c40 diff --git a/config/eur1/arm9/overlays/ov102/relocs.txt b/config/eur1/arm9/overlays/ov102/relocs.txt index f76e9c7f..e0950538 100644 --- a/config/eur1/arm9/overlays/ov102/relocs.txt +++ b/config/eur1/arm9/overlays/ov102/relocs.txt @@ -61,7 +61,7 @@ from:0x02183994 kind:load to:0x027e0cec module:dtcm from:0x0218399c kind:load to:0x027e09a8 module:dtcm from:0x02183a4c kind:arm_call to:0x01ffedf4 module:itcm from:0x02183a6c kind:arm_call to:0x01ffedf4 module:itcm -from:0x02183a8c kind:arm_call to:0x0210af30 module:overlays(26,31) +from:0x02183a8c kind:arm_call to:0x0210af30 module:overlay(31) from:0x02183ae8 kind:arm_call to:0x0200f05c module:main from:0x02183b38 kind:arm_call to:0x01ffc6d4 module:itcm from:0x02183b40 kind:arm_call_thumb to:0x02057ed4 module:overlay(0) @@ -73,7 +73,7 @@ from:0x02183b64 kind:load to:0x020b19a0 add:0x8 module:overlay(0) from:0x02183bac kind:arm_call to:0x021837c4 module:overlay(102) from:0x02183cf0 kind:arm_call to:0x0207e274 module:overlay(0) from:0x02183d08 kind:arm_call to:0x0207e288 module:overlay(0) -from:0x02183d18 kind:load to:0x02118be4 module:overlays(26,31) +from:0x02183d18 kind:load to:0x02118be4 module:overlay(31) from:0x02183d1c kind:load to:0x02118c08 module:overlay(31) from:0x02183d20 kind:load to:0x02118c2c module:overlay(31) from:0x02183d24 kind:load to:0x027e09c0 module:dtcm @@ -156,7 +156,7 @@ from:0x02184984 kind:arm_call to:0x02073330 module:overlay(0) from:0x021849b4 kind:load to:0x020d87d0 module:overlay(24) from:0x021849b8 kind:load to:0x027e0cf0 module:dtcm from:0x021849bc kind:load to:0x027e0ce4 module:dtcm -from:0x021849c0 kind:load to:0x02184c24 module:overlay(102) +from:0x021849c0 kind:load to:0x02184c1c add:0x8 module:overlay(102) from:0x021849c8 kind:load to:0x020b51f8 module:overlay(0) from:0x021849cc kind:load to:0x020b5208 module:overlay(0) from:0x021849d0 kind:load to:0x027e09b8 module:dtcm diff --git a/config/eur1/arm9/overlays/ov102/symbols.txt b/config/eur1/arm9/overlays/ov102/symbols.txt index 4957469b..504082b8 100644 --- a/config/eur1/arm9/overlays/ov102/symbols.txt +++ b/config/eur1/arm9/overlays/ov102/symbols.txt @@ -1,39 +1,39 @@ -func_ov102_02182c20 kind:function(arm,size=0x64) addr:0x02182e20 -func_ov102_02182c84 kind:function(arm,size=0x1d0) addr:0x02182e84 -func_ov102_02182e54 kind:function(arm,size=0x154) addr:0x02183054 -func_ov102_02182fa8 kind:function(arm,size=0x54) addr:0x021831a8 -func_ov102_02182ffc kind:function(arm,size=0x40) addr:0x021831fc -func_ov102_0218303c kind:function(arm,size=0x144) addr:0x0218323c -func_ov102_02183180 kind:function(arm,size=0x34) addr:0x02183380 -func_ov102_021831b4 kind:function(arm,size=0x3c) addr:0x021833b4 -func_ov102_021831f0 kind:function(arm,size=0x4c) addr:0x021833f0 -func_ov102_0218323c kind:function(arm,size=0x1d8) addr:0x0218343c -func_ov102_02183414 kind:function(arm,size=0x1b0) addr:0x02183614 -func_ov102_021835c4 kind:function(arm,size=0x1e4) addr:0x021837c4 -func_ov102_021837a8 kind:function(arm,size=0x1c0) addr:0x021839a8 -func_ov102_02183968 kind:function(arm,size=0x1c0) addr:0x02183b68 -func_ov102_02183b28 kind:function(arm,size=0x48) addr:0x02183d28 -func_ov102_02183b70 kind:function(arm,size=0xa4) addr:0x02183d70 -func_ov102_02183c14 kind:function(arm,size=0x58) addr:0x02183e14 -func_ov102_02183c6c kind:function(arm,size=0x28) addr:0x02183e6c -func_ov102_02183c94 kind:function(arm,size=0x110) addr:0x02183e94 -func_ov102_02183da4 kind:function(arm,size=0x44) addr:0x02183fa4 -func_ov102_02183de8 kind:function(arm,size=0x180) addr:0x02183fe8 -func_ov102_02183f68 kind:function(arm,size=0x14) addr:0x02184168 -func_ov102_02183f7c kind:function(arm,size=0x220) addr:0x0218417c -func_ov102_0218419c kind:function(arm,size=0x218) addr:0x0218439c -func_ov102_021843b4 kind:function(arm,size=0x214) addr:0x021845b4 -func_ov102_021845c8 kind:function(arm,size=0x60) addr:0x021847c8 -func_ov102_02184628 kind:function(arm,size=0x1c) addr:0x02184828 -_ZN20Actor_ov102_021849508vfunc_20Ev kind:function(arm,size=0x190) addr:0x02184844 -_ZN20Actor_ov102_021849508vfunc_24Ev kind:function(arm,size=0x14) addr:0x021849d4 -func_ov102_021847e8 kind:function(arm,size=0x78) addr:0x021849e8 -func_ov102_02184860 kind:function(arm,size=0x50) addr:0x02184a60 -data_ov102_02184ab0 kind:data(any) addr:0x02184ab0 -data_ov102_02184af0 kind:data(any) addr:0x02184af0 -__sinit_ov102_02184b50 kind:function(arm,size=0x24) addr:0x02184b50 -.p__sinit_ov102_02184b50 kind:data(word) addr:0x02184b74 -data_ov102_02184b80 kind:data(any) addr:0x02184b80 -data_ov102_02184ba8 kind:data(any) addr:0x02184ba8 -data_ov102_02184c10 kind:data(any) addr:0x02184c10 -data_ov102_02184c24 kind:data(any) addr:0x02184c24 +_ZN18PlayerActorBase_7419func_ov102_02182c20EiP7Mat4x3p kind:function(arm,size=0x64) addr:0x02182e20 +_ZN18PlayerActorBase_7419func_ov102_02182c84Ebi14UnkAngleStructP7Mat4x3pS2_ kind:function(arm,size=0x1d0) addr:0x02182e84 +_ZN25UnkStruct_027e0ce0_40_10819func_ov102_02182e54Eiii kind:function(arm,size=0x154) addr:0x02183054 +_ZN24UnkStruct_ItemManager_2019func_ov102_02182fa8Eii kind:function(arm,size=0x54) addr:0x021831a8 +_ZN24UnkStruct_ItemManager_2019func_ov102_02182ffcEi kind:function(arm,size=0x40) addr:0x021831fc +_ZN21UnkStruct_027e0ce0_4019func_ov102_0218303cEiP11ItemManager kind:function(arm,size=0x144) addr:0x0218323c +_ZN21UnkStruct_027e0ce0_4019func_ov102_02183180Eib kind:function(arm,size=0x34) addr:0x02183380 +_ZN21UnkStruct_027e0ce0_4019func_ov102_021831b4Ei kind:function(arm,size=0x3c) addr:0x021833b4 +_ZN21UnkStruct_027e0ce0_4019func_ov102_021831f0Ei kind:function(arm,size=0x4c) addr:0x021833f0 +_ZN29UnkStruct_027e0ce0_40_Base_7419func_ov102_0218323cEP29UnkStruct_027e0ce0_40_Base_14i kind:function(arm,size=0x1d8) addr:0x0218343c +_Z19func_ov102_02183414PsP21PlayerLinkActor_A0_1CbP7VecFx3214UnkAngleStructi kind:function(arm,size=0x1b0) addr:0x02183614 +_ZN19MapObjectUnkSAND_4019func_ov102_021835c4EP7VecFx32 kind:function(arm,size=0x1e4) addr:0x021837c4 +_ZN19MapObjectUnkSAND_4019func_ov102_021837a8E8Vec2bCppP7VecFx32 kind:function(arm,size=0x1c0) addr:0x021839a8 +_ZN16MapObjectUnkSAND8vfunc_08Ev kind:function(arm,size=0x1c0) addr:0x02183b68 +_ZN16MapObjectUnkSAND8vfunc_0CEv kind:function(arm,size=0x48) addr:0x02183d28 +_ZN16MapObjectUnkSAND8vfunc_14Ev kind:function(arm,size=0xa4) addr:0x02183d70 +_Z19func_ov102_02183c14i kind:function(arm,size=0x58) addr:0x02183e14 +_Z19func_ov102_02183c6ci kind:function(arm,size=0x28) addr:0x02183e6c +_Z19func_ov102_02183c94iiiiitttti kind:function(arm,size=0x110) addr:0x02183e94 +_Z19func_ov102_02183da4iiiiitttti kind:function(arm,size=0x44) addr:0x02183fa4 +_ZN16MapObjectUnkPTFL8vfunc_08Ev kind:function(arm,size=0x180) addr:0x02183fe8 +_ZN16MapObjectUnkPTFL8vfunc_0CEv kind:function(arm,size=0x14) addr:0x02184168 +_ZN16MapObjectUnkPTFL8vfunc_14Ev kind:function(arm,size=0x220) addr:0x0218417c +_ZN16MapObjectUnkPTFL19func_ov102_0218419cEv kind:function(arm,size=0x218) addr:0x0218439c +_ZN16MapObjectUnkPTFL19func_ov102_021843b4Ev kind:function(arm,size=0x214) addr:0x021845b4 +_ZN21UnkStruct_027e0cd8_0C8vfunc_0CEv kind:function(arm,size=0x60) addr:0x021847c8 +_ZN21UnkStruct_027e0cd8_0C19func_ov102_02184628Ev kind:function(arm,size=0x1c) addr:0x02184828 +_ZN12ActorUnkMLCK8vfunc_20Ev kind:function(arm,size=0x190) addr:0x02184844 +_ZN12ActorUnkMLCK8vfunc_24Ev kind:function(arm,size=0x14) addr:0x021849d4 +_ZN15ActorUnkMLCK_C419func_ov102_021847e8Eii kind:function(arm,size=0x78) addr:0x021849e8 +_ZN24UnkStruct_ov102_02184a248vfunc_00EP5Actor kind:function(arm,size=0x50) addr:0x02184a60 +data_ov102_021848b0 kind:data(any) addr:0x02184ab0 local +data_ov102_021848f0 kind:data(any) addr:0x02184af0 local +__sinit_ActorUnkMLCK_102.cpp kind:function(arm,size=0x24) addr:0x02184b50 local +.p__sinit_ActorUnkMLCK_102.cpp kind:data(word) addr:0x02184b74 local +data_ov102_02184980 kind:data(any) addr:0x02184b80 local +data_ov102_021849a8 kind:data(any) addr:0x02184ba8 local +data_ov102_02184a10 kind:data(any) addr:0x02184c10 local +_ZTV24UnkStruct_ov102_02184a24 kind:data(byte[12]) addr:0x02184c1c diff --git a/config/eur1/arm9/overlays/ov105/relocs.txt b/config/eur1/arm9/overlays/ov105/relocs.txt index 785c73e0..b5adb0dc 100644 --- a/config/eur1/arm9/overlays/ov105/relocs.txt +++ b/config/eur1/arm9/overlays/ov105/relocs.txt @@ -280,7 +280,7 @@ from:0x02186d74 kind:arm_call to:0x02185588 module:overlay(105) from:0x02186de0 kind:arm_call to:0x02082b10 module:overlay(0) from:0x02186e40 kind:load to:0x027e09bc module:dtcm from:0x02186e44 kind:load to:0x027e0ce4 module:dtcm -from:0x02186e4c kind:load to:0x020b3040 module:overlay(0) +from:0x02186e4c kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02186e50 kind:load to:0x0218a3b0 module:overlay(105) from:0x02186e54 kind:load to:0x0218a3ac module:overlay(105) from:0x02186e58 kind:load to:0x027e09b8 module:dtcm @@ -430,7 +430,7 @@ from:0x02188528 kind:arm_call to:0x02187afc module:overlay(105) from:0x02188548 kind:arm_call to:0x01fff350 module:itcm from:0x02188584 kind:load to:0x027e0ce4 module:dtcm from:0x02188588 kind:load to:0x027e09bc module:dtcm -from:0x02188590 kind:load to:0x020b3040 module:overlay(0) +from:0x02188590 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02188594 kind:load to:0x0218a4d8 module:overlay(105) from:0x02188598 kind:load to:0x0218a3bc module:overlay(105) from:0x021885a0 kind:load to:0x0203e964 module:main @@ -455,7 +455,7 @@ from:0x02188828 kind:load to:0x0218a3a8 module:overlay(105) from:0x0218882c kind:load to:0x0218a3a4 module:overlay(105) from:0x02188830 kind:load to:0x0218a3a0 module:overlay(105) from:0x02188834 kind:load to:0x027e0ce4 module:dtcm -from:0x0218883c kind:load to:0x020b3040 module:overlay(0) +from:0x0218883c kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02188840 kind:load to:0x0218a340 module:overlay(105) from:0x02188844 kind:load to:0x0218a394 module:overlay(105) from:0x02188848 kind:load to:0x0218a398 module:overlay(105) @@ -601,7 +601,7 @@ from:0x02189f9c kind:arm_call to:0x020f5cc4 module:overlay(31) from:0x02189fa4 kind:arm_call to:0x020f4450 module:overlay(31) from:0x02189fb4 kind:load to:0x02110a28 module:overlay(31) from:0x02189fc0 kind:load to:0x027e0ce4 module:dtcm -from:0x02189fc8 kind:load to:0x020b3040 module:overlay(0) +from:0x02189fc8 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02189fcc kind:load to:0x02110a6c module:overlay(31) from:0x02189fd8 kind:load to:0x0203e964 module:main from:0x02189fe0 kind:load to:0x027e0ce0 module:dtcm diff --git a/config/eur1/arm9/overlays/ov107/relocs.txt b/config/eur1/arm9/overlays/ov107/relocs.txt index 621ae7a0..8ca03ac9 100644 --- a/config/eur1/arm9/overlays/ov107/relocs.txt +++ b/config/eur1/arm9/overlays/ov107/relocs.txt @@ -166,7 +166,7 @@ from:0x021861ec kind:arm_call to:0x02090818 module:overlay(0) from:0x021861f4 kind:load to:0x027e0cdc module:dtcm from:0x02186220 kind:arm_call to:0x01fff350 module:itcm from:0x02186240 kind:load to:0x027e0ce4 module:dtcm -from:0x02186248 kind:load to:0x020b3040 module:overlay(0) +from:0x02186248 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x02186268 kind:load to:0x0210b2ac module:overlay(31) from:0x02186274 kind:arm_call to:0x0209d034 module:overlay(0) from:0x0218628c kind:arm_call to:0x0218624c module:overlay(107) diff --git a/config/eur1/arm9/overlays/ov112/relocs.txt b/config/eur1/arm9/overlays/ov112/relocs.txt index 1a98c1fa..17f5453f 100644 --- a/config/eur1/arm9/overlays/ov112/relocs.txt +++ b/config/eur1/arm9/overlays/ov112/relocs.txt @@ -45,7 +45,7 @@ from:0x02185930 kind:load to:0x0203f964 module:main from:0x02185934 kind:load to:0x027e0ce8 module:dtcm from:0x02185944 kind:load to:0x027e0ce4 module:dtcm from:0x02185960 kind:load to:0x027e09a4 module:dtcm -from:0x02185968 kind:load to:0x020b3040 module:overlay(0) +from:0x02185968 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x0218596c kind:load to:0x027e09b8 module:dtcm from:0x021859c4 kind:arm_call to:0x0208fe28 module:overlay(0) from:0x021859d8 kind:arm_call to:0x02092238 module:overlay(0) diff --git a/config/eur1/arm9/relocs.txt b/config/eur1/arm9/relocs.txt index 3c90ad34..a875d514 100644 --- a/config/eur1/arm9/relocs.txt +++ b/config/eur1/arm9/relocs.txt @@ -2093,7 +2093,7 @@ from:0x02017020 kind:arm_call to:0x01fff350 module:itcm from:0x02017054 kind:arm_call to:0x01ffb9cc module:itcm from:0x0201707c kind:arm_call to:0x01fff350 module:itcm from:0x020170a4 kind:load to:0x027e0ce4 module:dtcm -from:0x020170a8 kind:load to:0x020b3040 module:overlay(0) +from:0x020170a8 kind:load to:0x020b3038 add:0x8 module:overlay(0) from:0x020170cc kind:arm_call to:0x01fff520 module:itcm from:0x020170f0 kind:arm_call to:0x01ffb9cc module:itcm from:0x0201711c kind:arm_call to:0x01ffb9cc module:itcm diff --git a/config/eur1/arm9/symbols.txt b/config/eur1/arm9/symbols.txt index c3f330a3..b31f3a3f 100644 --- a/config/eur1/arm9/symbols.txt +++ b/config/eur1/arm9/symbols.txt @@ -145,7 +145,7 @@ func_02002e78 kind:function(arm,size=0x20) addr:0x02002e78 func_02002e98 kind:function(arm,size=0x20) addr:0x02002e98 func_02002eb8 kind:function(arm,size=0x20) addr:0x02002eb8 NNS_Snd_func_0206617c kind:function(arm,size=0x2c) addr:0x02002ed8 -func_02002f04 kind:function(arm,size=0x28) addr:0x02002f04 +_ZN24UnkStruct_ov000_020b51c013func_02002f04Ev kind:function(arm,size=0x28) addr:0x02002f04 func_02002f2c kind:function(arm,size=0x28) addr:0x02002f2c func_02002f54 kind:function(arm,size=0x48) addr:0x02002f54 func_02002f9c kind:function(arm,size=0x28) addr:0x02002f9c diff --git a/config/jp/arm9/itcm/symbols.txt b/config/jp/arm9/itcm/symbols.txt index 4628684c..b5374378 100644 --- a/config/jp/arm9/itcm/symbols.txt +++ b/config/jp/arm9/itcm/symbols.txt @@ -157,7 +157,7 @@ _ZN18UnkStruct_027e09a46IsLandEv kind:function(arm,size=0x28) addr:0x01ffd3b0 _ZN18UnkStruct_027e09a47IsTrainEv kind:function(arm,size=0x28) addr:0x01ffd3d8 _ZNK18UnkStruct_027e09a421GetCurrentCourseEntryEv kind:function(arm,size=0x20) addr:0x01ffd400 _ZN18UnkStruct_027e09b813func_01ffd420Ev kind:function(arm,size=0x1c) addr:0x01ffd420 -func_01ffd43c kind:function(arm,size=0x60) addr:0x01ffd43c +_ZN21UnkStruct_027e09bc_0C13func_01ffd43cEP5Vec2sii kind:function(arm,size=0x60) addr:0x01ffd43c func_01ffd49c kind:function(arm,size=0x1a4) addr:0x01ffd49c _ZN21UnkStruct_027e09bc_0C13func_01ffd640EP7VecFx32 kind:function(arm,size=0x128) addr:0x01ffd640 func_01ffd768 kind:function(arm,size=0x138) addr:0x01ffd768 @@ -199,7 +199,7 @@ func_01fff280 kind:function(arm,size=0x28) addr:0x01fff280 func_01fff2a8 kind:function(arm,size=0x24) addr:0x01fff2a8 func_01fff2cc kind:function(arm,size=0x30) addr:0x01fff2cc _ZN12ActorManager13func_01fff2fcEPFvP5ActortEi kind:function(arm,size=0x54) addr:0x01fff2fc -_ZN12ActorManager13func_01fff350EPvPP5Actor kind:function(arm,size=0x64) addr:0x01fff350 +_ZN12ActorManager13func_01fff350EP29UnkStruct_ov000_020b3000_BasePP5Actor kind:function(arm,size=0x64) addr:0x01fff350 _ZN12ActorManager13func_01fff3b4E8ActorRef kind:function(arm,size=0x8c) addr:0x01fff3b4 func_01fff440 kind:function(arm,size=0x18) addr:0x01fff440 _ZN5Actor10GetActorIdEv kind:function(arm,size=0xc) addr:0x01fff458 diff --git a/config/jp/arm9/overlays/ov000/relocs.txt b/config/jp/arm9/overlays/ov000/relocs.txt index 4e7cb92e..aff3922a 100644 --- a/config/jp/arm9/overlays/ov000/relocs.txt +++ b/config/jp/arm9/overlays/ov000/relocs.txt @@ -3438,7 +3438,7 @@ from:0x02076d40 kind:load to:0x027e0d3c module:dtcm from:0x02076d44 kind:load to:0x027e0ce0 module:dtcm from:0x02076d48 kind:load to:0x020b3bcc module:overlay(0) from:0x02076d4c kind:load to:0x027e0ce4 module:dtcm -from:0x02076d50 kind:load to:0x020b4800 module:overlay(0) +from:0x02076d50 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02076d60 kind:arm_call to:0x0207696c module:overlay(0) from:0x02076d7c kind:arm_call to:0x02076abc module:overlay(0) from:0x02076d98 kind:arm_call to:0x01fff3b4 module:itcm @@ -3842,7 +3842,7 @@ from:0x0207af8c kind:load to:0x027e0cdc module:dtcm from:0x0207af90 kind:load to:0x020b3db0 module:overlay(0) from:0x0207af94 kind:load to:0x027e09a4 module:dtcm from:0x0207af98 kind:load to:0x027e0ce4 module:dtcm -from:0x0207afa0 kind:load to:0x020b4800 module:overlay(0) +from:0x0207afa0 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0207afdc kind:load to:0x020b3db0 module:overlay(0) from:0x0207b02c kind:arm_call to:0x020840c4 module:overlay(0) from:0x0207b084 kind:arm_call to:0x01ffb714 module:itcm @@ -3978,7 +3978,7 @@ from:0x0207ca84 kind:arm_call to:0x02078f98 module:overlay(0) from:0x0207cab8 kind:load to:0x027e0ce0 module:dtcm from:0x0207cabc kind:load to:0x027e09a4 module:dtcm from:0x0207cac4 kind:load to:0x027e0ce4 module:dtcm -from:0x0207cacc kind:load to:0x020b4800 module:overlay(0) +from:0x0207cacc kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0207cadc kind:load to:0x027e09bc module:dtcm from:0x0207cae8 kind:arm_call to:0x0207a9c0 module:overlay(0) from:0x0207cafc kind:arm_call to:0x0207a9c0 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov000/symbols.txt b/config/jp/arm9/overlays/ov000/symbols.txt index a3356dad..632ebd7e 100644 --- a/config/jp/arm9/overlays/ov000/symbols.txt +++ b/config/jp/arm9/overlays/ov000/symbols.txt @@ -456,7 +456,7 @@ _ZN23TitleScreenManager_Base8vfunc_44Ev kind:function(arm,size=0x4) addr:0x02062 func_ov000_020625c8 kind:function(arm,size=0x44) addr:0x020625c8 func_ov000_0206260c kind:function(arm,size=0x14) addr:0x0206260c _ZN18UnkStruct_0204a08819func_ov000_02061098Ev kind:function(arm,size=0x144) addr:0x02062620 -_ZN18UnkStruct_0204a08819func_ov000_020611dcEPvi kind:function(arm,size=0x20) addr:0x02062764 +_ZN18UnkStruct_0204a08819func_ov000_020611dcEP29FileSelectManager_UnkDrawBasei kind:function(arm,size=0x20) addr:0x02062764 _ZN18UnkStruct_0204a08819func_ov000_020611fcEi kind:function(arm,size=0x28) addr:0x02062784 _ZN18UnkStruct_0204a08819func_ov000_02061224Ev kind:function(arm,size=0xc) addr:0x020627ac _ZN18UnkStruct_0204a08819func_ov000_02061230Ev kind:function(arm,size=0xc) addr:0x020627b8 @@ -469,14 +469,14 @@ _ZN29FileSelectManager_UnkDrawBaseC1Ev kind:function(arm,size=0x24) addr:0x02062 _ZN29FileSelectManager_UnkDrawBaseD1Ev kind:function(arm,size=0x18) addr:0x02062c18 _ZN29FileSelectManager_UnkDrawBaseD0Ev kind:function(arm,size=0x20) addr:0x02062c30 _ZN29FileSelectManager_UnkDrawBaseD2Ev kind:function(arm,size=0x18) addr:0x02062c50 -_ZN29FileSelectManager_UnkDrawBase8vfunc_08Ei kind:function(arm,size=0x4) addr:0x02062c68 -_ZN29FileSelectManager_UnkDrawBase8vfunc_0CEi kind:function(arm,size=0x4) addr:0x02062c6c -_ZN29FileSelectManager_UnkDrawBase8vfunc_10Eii kind:function(arm,size=0x4) addr:0x02062c70 -_ZN29FileSelectManager_UnkDrawBase8vfunc_14Ei kind:function(arm,size=0x4) addr:0x02062c74 -_ZN29FileSelectManager_UnkDrawBase8vfunc_18Ei kind:function(arm,size=0x4) addr:0x02062c78 -_ZN29FileSelectManager_UnkDrawBase8vfunc_1CEi kind:function(arm,size=0x4) addr:0x02062c7c -_ZN29FileSelectManager_UnkDrawBase8vfunc_20Eii kind:function(arm,size=0x4) addr:0x02062c80 -_ZN29FileSelectManager_UnkDrawBase8vfunc_24Ev kind:function(arm,size=0x4) addr:0x02062c84 +_ZN29FileSelectManager_UnkDrawBase9vfunc2_08Ei kind:function(arm,size=0x4) addr:0x02062c68 +_ZN29FileSelectManager_UnkDrawBase9vfunc2_0CEi kind:function(arm,size=0x4) addr:0x02062c6c +_ZN29FileSelectManager_UnkDrawBase8vfunc_54Eii kind:function(arm,size=0x4) addr:0x02062c70 +_ZN29FileSelectManager_UnkDrawBase9vfunc2_14Ei kind:function(arm,size=0x4) addr:0x02062c74 +_ZN29FileSelectManager_UnkDrawBase9vfunc2_18Ei kind:function(arm,size=0x4) addr:0x02062c78 +_ZN29FileSelectManager_UnkDrawBase8vfunc_5CEi kind:function(arm,size=0x4) addr:0x02062c7c +_ZN29FileSelectManager_UnkDrawBase8vfunc_58Eii kind:function(arm,size=0x4) addr:0x02062c80 +_ZN29FileSelectManager_UnkDrawBase8vfunc_60Ev kind:function(arm,size=0x4) addr:0x02062c84 _ZN23UnkStruct_027e0998_BaseC2Ev kind:function(thumb,size=0x24) addr:0x02062c88 _ZN23UnkStruct_027e0998_BaseC1Ev kind:function(thumb,size=0x24) addr:0x02062cac func_ov000_02062cd0 kind:function(thumb,size=0x16) addr:0x02062cd0 @@ -863,7 +863,7 @@ func_ov000_0206d0d4 kind:function(arm,size=0xcc) addr:0x0206d0d4 _ZN24UnkStruct_ov000_020b51b819func_ov000_0206bbfcEi kind:function(arm,size=0x18) addr:0x0206d1a0 func_ov000_0206d1b8 kind:function(arm,size=0xe4) addr:0x0206d1b8 func_ov000_0206d29c kind:function(arm,size=0xdc) addr:0x0206d29c -func_ov000_0206d378 kind:function(arm,size=0x10) addr:0x0206d378 +_ZN24UnkStruct_ov000_020b51b819func_ov000_0206bdd4EP15PlayerLinkActor kind:function(arm,size=0x10) addr:0x0206d378 func_ov000_0206d388 kind:function(arm,size=0xe8) addr:0x0206d388 func_ov000_0206d470 kind:function(arm,size=0x60) addr:0x0206d470 func_ov000_0206d4d0 kind:function(arm,size=0x10) addr:0x0206d4d0 @@ -937,8 +937,8 @@ func_ov000_0207002c kind:function(arm,size=0x60) addr:0x0207002c func_ov000_0207008c kind:function(arm,size=0x144) addr:0x0207008c func_ov000_020701d0 kind:function(arm,size=0xd0) addr:0x020701d0 func_ov000_020702a0 kind:function(arm,size=0xf4) addr:0x020702a0 -func_ov000_02070394 kind:function(arm,size=0xbc) addr:0x02070394 -func_ov000_02070450 kind:function(arm,size=0x160) addr:0x02070450 +_ZN24UnkStruct_ov000_020b521419func_ov000_0206ed1cEP15PlayerLinkActor kind:function(arm,size=0xbc) addr:0x02070394 +_ZN24UnkStruct_ov000_020b521419func_ov000_0206edd8EP15PlayerLinkActor kind:function(arm,size=0x160) addr:0x02070450 func_ov000_020705b0 kind:function(arm,size=0xb0) addr:0x020705b0 func_ov000_02070660 kind:function(arm,size=0x26c) addr:0x02070660 func_ov000_020708cc kind:function(arm,size=0x8c) addr:0x020708cc @@ -2672,7 +2672,7 @@ func_ov000_020a165c kind:function(arm,size=0x1c) addr:0x020a165c func_ov000_020a1678 kind:function(arm,size=0xc) addr:0x020a1678 _ZN18UnkStruct_027e0cec19func_ov000_0209feacEiP7VecFx32iii kind:function(arm,size=0x78) addr:0x020a1684 _ZN18UnkStruct_027e0cec19func_ov000_0209ff24EiP7VecFx32P7VecFx16i kind:function(arm,size=0x28) addr:0x020a16fc -func_ov000_020a1724 kind:function(arm,size=0x40) addr:0x020a1724 +_ZN18UnkStruct_027e0cec19func_ov000_0209ff4cEiP7VecFx3214UnkAngleStructi kind:function(arm,size=0x40) addr:0x020a1724 _ZN18UnkStruct_027e0cec19func_ov000_0209ff8cEP22UnkStruct_PlayerGet_eciP7VecFx32i kind:function(arm,size=0x74) addr:0x020a1764 func_ov000_020a17d8 kind:function(arm,size=0xa0) addr:0x020a17d8 func_ov000_020a1878 kind:function(arm,size=0x34) addr:0x020a1878 @@ -3653,7 +3653,7 @@ _ZTV19data_ov000_020b47b4 kind:data(any) addr:0x020b47b4 data_ov000_020b47dc kind:data(any) addr:0x020b47dc data_ov000_020b47e8 kind:data(any) addr:0x020b47e8 data_ov000_020b47f4 kind:data(any) addr:0x020b47f4 -data_ov000_020b3000 kind:data(any) addr:0x020b4800 +_ZTV24UnkStruct_ov000_020b3000 kind:data(any) addr:0x020b47f8 data_ov000_020b480c kind:data(any) addr:0x020b480c data_ov000_020b4818 kind:data(any) addr:0x020b4818 data_ov000_020b483c kind:data(any) addr:0x020b483c @@ -4024,7 +4024,7 @@ data_ov000_020b69ac kind:bss addr:0x020b69ac data_ov000_020b51b8 kind:bss addr:0x020b69b8 data_ov000_020b69c0 kind:bss addr:0x020b69c0 data_ov000_020b69c4 kind:bss addr:0x020b69c4 -data_ov000_020b69c8 kind:bss addr:0x020b69c8 +data_ov000_020b51c8 kind:bss addr:0x020b69c8 data_ov000_020b6a10 kind:bss addr:0x020b6a10 data_ov000_020b5214_eur kind:bss addr:0x020b6a14 data_ov000_020b6ab0 kind:bss addr:0x020b6ab0 diff --git a/config/jp/arm9/overlays/ov001/relocs.txt b/config/jp/arm9/overlays/ov001/relocs.txt index aea148c1..92bf5f09 100644 --- a/config/jp/arm9/overlays/ov001/relocs.txt +++ b/config/jp/arm9/overlays/ov001/relocs.txt @@ -1142,7 +1142,7 @@ from:0x020bd2b0 kind:load to:0x020453b0 module:main from:0x020bd2ca kind:thumb_call_arm to:0x01fff350 module:itcm from:0x020bd2e4 kind:thumb_call_arm to:0x02099c98 module:overlay(0) from:0x020bd2ee kind:thumb_call_arm to:0x01fff350 module:itcm -from:0x020bd300 kind:load to:0x020b4800 module:overlay(0) +from:0x020bd300 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x020bd308 kind:load to:0x027e0ce4 module:dtcm from:0x020bd32c kind:thumb_call_arm to:0x02011f3c module:main from:0x020bd336 kind:thumb_call to:0x02058cd0 module:overlay(0) @@ -1509,7 +1509,7 @@ from:0x020becd4 kind:thumb_call_arm to:0x020938c0 module:overlay(0) from:0x020becdc kind:load to:0x027e09a4 module:dtcm from:0x020bece0 kind:load to:0x020da000 module:overlay(24) from:0x020bece4 kind:load to:0x020ac08c add:0x4 module:overlay(0) -from:0x020bece8 kind:load to:0x020b4800 module:overlay(0) +from:0x020bece8 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x020becec kind:load to:0x027e0ce4 module:dtcm from:0x020becf4 kind:load to:0x027e09b8 module:dtcm from:0x020bed0c kind:thumb_call_arm to:0x02011f3c module:main diff --git a/config/jp/arm9/overlays/ov017/symbols.txt b/config/jp/arm9/overlays/ov017/symbols.txt index b48cfc61..0a9c18a3 100644 --- a/config/jp/arm9/overlays/ov017/symbols.txt +++ b/config/jp/arm9/overlays/ov017/symbols.txt @@ -15,8 +15,8 @@ func_ov017_020bde1c kind:function(arm,size=0x44) addr:0x020bde1c func_ov017_020bde60 kind:function(arm,size=0x31c) addr:0x020bde60 func_ov017_020be17c kind:function(arm,size=0xe4) addr:0x020be17c func_ov017_020be260 kind:function(arm,size=0x3a8) addr:0x020be260 -func_ov017_020be608 kind:function(arm,size=0x4b8) addr:0x020be608 -func_ov017_020beac0 kind:function(arm,size=0x48) addr:0x020beac0 +_ZN21UnkStruct_027e0ce0_4019func_ov017_020bcde8EiP11ItemManager kind:function(arm,size=0x4b8) addr:0x020be608 +_ZN11ItemManager19func_ov017_020bd2a0Eii kind:function(arm,size=0x48) addr:0x020beac0 func_ov017_020beb08 kind:function(arm,size=0x18) addr:0x020beb08 func_ov017_020beb20 kind:function(arm,size=0x178) addr:0x020beb20 func_ov017_020bec98 kind:function(arm,size=0x28) addr:0x020bec98 @@ -29,15 +29,15 @@ _ZN18UnkStruct_027e0ce019func_ov017_020bd69cEv kind:function(arm,size=0x1c) addr func_ov017_020beed8 kind:function(arm,size=0x28) addr:0x020beed8 func_ov017_020bef00 kind:function(arm,size=0x78) addr:0x020bef00 func_ov017_020bef78 kind:function(arm,size=0x30) addr:0x020bef78 -func_ov017_020befa8 kind:function(arm,size=0x578) addr:0x020befa8 -func_ov017_020bf520 kind:function(arm,size=0x90) addr:0x020bf520 -func_ov017_020bf5b0 kind:function(arm,size=0x1c4) addr:0x020bf5b0 -func_ov017_020bf774 kind:function(arm,size=0x150) addr:0x020bf774 +_ZN15PlayerLinkActor19func_ov017_020bd788Ei kind:function(arm,size=0x578) addr:0x020befa8 +_ZN15PlayerLinkActor19func_ov017_020bdcf4Ev kind:function(arm,size=0x90) addr:0x020bf520 +_ZN15PlayerLinkActor19func_ov017_020bdd84Eii kind:function(arm,size=0x1c4) addr:0x020bf5b0 +_ZN15PlayerLinkActor19func_ov017_020bdf48Eiiii kind:function(arm,size=0x150) addr:0x020bf774 func_ov017_020bf8c4 kind:function(arm,size=0x10) addr:0x020bf8c4 func_ov017_020bf8d4 kind:function(arm,size=0x38) addr:0x020bf8d4 func_ov017_020bf90c kind:function(arm,size=0x20c) addr:0x020bf90c func_ov017_020bfb18 kind:function(arm,size=0x148) addr:0x020bfb18 -func_ov017_020bfc60 kind:function(arm,size=0x18) addr:0x020bfc60 +_ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov017_020be434Ev kind:function(arm,size=0x18) addr:0x020bfc60 func_ov017_020bfc78 kind:function(arm,size=0x45c) addr:0x020bfc78 func_ov017_020c00d4 kind:function(arm,size=0x124) addr:0x020c00d4 _ZN12CargoManager8DoUpdateEv kind:function(arm,size=0x18) addr:0x020c01f8 diff --git a/config/jp/arm9/overlays/ov019/symbols.txt b/config/jp/arm9/overlays/ov019/symbols.txt index 71caba27..8dff8d10 100644 --- a/config/jp/arm9/overlays/ov019/symbols.txt +++ b/config/jp/arm9/overlays/ov019/symbols.txt @@ -215,24 +215,24 @@ _ZN19FileSelectSubScreenD1Ev kind:function(arm,size=0xec) addr:0x020d1348 _ZN21FileSelectManager_160C1EP23GameModeManagerBase_104P14FileSelectMain kind:function(arm,size=0x54) addr:0x020d1434 _ZN21FileSelectManager_160D1Ev kind:function(arm,size=0x14) addr:0x020d1488 _ZN21FileSelectManager_160D0Ev kind:function(arm,size=0x1c) addr:0x020d149c -_ZN21FileSelectManager_1608vfunc_08Ei kind:function(arm,size=0x50) addr:0x020d14b8 -_ZN21FileSelectManager_1608vfunc_0CEi kind:function(arm,size=0x64) addr:0x020d1508 -_ZN21FileSelectManager_1608vfunc_14Ei kind:function(arm,size=0x4) addr:0x020d156c -_ZN21FileSelectManager_1608vfunc_10Eii kind:function(arm,size=0x8c) addr:0x020d1570 -_ZN21FileSelectManager_1608vfunc_18Ei kind:function(arm,size=0x10) addr:0x020d15fc -_ZN21FileSelectManager_1608vfunc_1CEi kind:function(arm,size=0x64) addr:0x020d160c -_ZN21FileSelectManager_1608vfunc_20Eii kind:function(arm,size=0xac) addr:0x020d1670 -_ZN21FileSelectManager_1608vfunc_24Ev kind:function(arm,size=0x34) addr:0x020d171c +_ZN21FileSelectManager_1609vfunc2_08Ei kind:function(arm,size=0x50) addr:0x020d14b8 +_ZN21FileSelectManager_1609vfunc2_0CEi kind:function(arm,size=0x64) addr:0x020d1508 +_ZN21FileSelectManager_1609vfunc2_14Ei kind:function(arm,size=0x4) addr:0x020d156c +_ZN21FileSelectManager_1608vfunc_54Eii kind:function(arm,size=0x8c) addr:0x020d1570 +_ZN21FileSelectManager_1609vfunc2_18Ei kind:function(arm,size=0x10) addr:0x020d15fc +_ZN21FileSelectManager_1608vfunc_5CEi kind:function(arm,size=0x64) addr:0x020d160c +_ZN21FileSelectManager_1608vfunc_58Eii kind:function(arm,size=0xac) addr:0x020d1670 +_ZN21FileSelectManager_1608vfunc_60Ev kind:function(arm,size=0x34) addr:0x020d171c _ZN21FileSelectManager_164C1EP23GameModeManagerBase_104P14FileSelectMain kind:function(arm,size=0x4c) addr:0x020d1750 _ZN21FileSelectManager_164D1Ev kind:function(arm,size=0x3c) addr:0x020d179c _ZN21FileSelectManager_164D0Ev kind:function(arm,size=0x44) addr:0x020d17d8 -_ZN21FileSelectManager_1648vfunc_08Ei kind:function(arm,size=0x50) addr:0x020d181c -_ZN21FileSelectManager_1648vfunc_0CEi kind:function(arm,size=0x90) addr:0x020d186c -_ZN21FileSelectManager_1648vfunc_14Ei kind:function(arm,size=0x4) addr:0x020d18fc -_ZN21FileSelectManager_1648vfunc_10Eii kind:function(arm,size=0xa8) addr:0x020d1900 -_ZN21FileSelectManager_1648vfunc_18Ei kind:function(arm,size=0x38) addr:0x020d19a8 -_ZN21FileSelectManager_1648vfunc_1CEi kind:function(arm,size=0xa4) addr:0x020d19e0 -_ZN21FileSelectManager_1648vfunc_20Eii kind:function(arm,size=0x90) addr:0x020d1a84 +_ZN21FileSelectManager_1649vfunc2_08Ei kind:function(arm,size=0x50) addr:0x020d181c +_ZN21FileSelectManager_1649vfunc2_0CEi kind:function(arm,size=0x90) addr:0x020d186c +_ZN21FileSelectManager_1649vfunc2_14Ei kind:function(arm,size=0x4) addr:0x020d18fc +_ZN21FileSelectManager_1648vfunc_54Eii kind:function(arm,size=0xa8) addr:0x020d1900 +_ZN21FileSelectManager_1649vfunc2_18Ei kind:function(arm,size=0x38) addr:0x020d19a8 +_ZN21FileSelectManager_1648vfunc_5CEi kind:function(arm,size=0xa4) addr:0x020d19e0 +_ZN21FileSelectManager_1648vfunc_58Eii kind:function(arm,size=0x90) addr:0x020d1a84 _ZN21FileSelectManager_16419func_ov019_020d02f4Ev kind:function(arm,size=0x28) addr:0x020d1b14 _ZN25UnkSystem1_ov019_Derived2C1Ev kind:function(arm,size=0x40) addr:0x020d1b3c _ZN25UnkSystem1_ov019_Derived28vfunc_08Ei kind:function(arm,size=0x48) addr:0x020d1b7c diff --git a/config/jp/arm9/overlays/ov024/relocs.txt b/config/jp/arm9/overlays/ov024/relocs.txt index 7097a43b..0dc53324 100644 --- a/config/jp/arm9/overlays/ov024/relocs.txt +++ b/config/jp/arm9/overlays/ov024/relocs.txt @@ -72,7 +72,7 @@ from:0x020c648c kind:arm_call to:0x02074764 module:overlay(0) from:0x020c64e0 kind:arm_call to:0x02074b28 module:overlay(0) from:0x020c64f8 kind:load to:0x020da038 module:overlay(24) from:0x020c64fc kind:load to:0x027e0ce4 module:dtcm -from:0x020c6500 kind:load to:0x020b4800 module:overlay(0) +from:0x020c6500 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x020c6504 kind:load to:0x027e09b8 module:dtcm from:0x020c6554 kind:arm_call to:0x01ffd3d8 module:itcm from:0x020c6578 kind:arm_call to:0x020194d0 module:main @@ -2522,7 +2522,7 @@ from:0x020d8c44 kind:load to:0x027e0cd8 module:dtcm from:0x020d8c48 kind:load to:0x027e09a4 module:dtcm from:0x020d8c4c kind:load to:0x027e0ce0 module:dtcm from:0x020d8c50 kind:load to:0x027e0ce4 module:dtcm -from:0x020d8c58 kind:load to:0x020b4800 module:overlay(0) +from:0x020d8c58 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x020d8c6c kind:arm_call to:0x020a12f0 module:overlay(0) from:0x020d8c74 kind:arm_call to:0x02099c30 module:overlay(0) from:0x020d8c8c kind:arm_call to:0x020a12f0 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov024/symbols.txt b/config/jp/arm9/overlays/ov024/symbols.txt index ec2236ad..9acf2559 100644 --- a/config/jp/arm9/overlays/ov024/symbols.txt +++ b/config/jp/arm9/overlays/ov024/symbols.txt @@ -143,16 +143,16 @@ _ZN24AdventureModeManager_160C1EP23GameModeManagerBase_104P24AdventureModeManage _ZN27AdventureModeManager_160_4CD1Ev kind:function(arm,size=0x14) addr:0x020c9250 _ZN24AdventureModeManager_160D1Ev kind:function(arm,size=0x30) addr:0x020c9264 _ZN24AdventureModeManager_160D0Ev kind:function(arm,size=0x38) addr:0x020c9294 -_ZN24AdventureModeManager_1608vfunc_08Ei kind:function(arm,size=0x9c) addr:0x020c92cc -_ZN24AdventureModeManager_1608vfunc_0CEi kind:function(arm,size=0x1a0) addr:0x020c9368 -_ZN24AdventureModeManager_1608vfunc_10Eii kind:function(arm,size=0x24) addr:0x020c9508 -_ZN24AdventureModeManager_1608vfunc_14Ei kind:function(arm,size=0x20) addr:0x020c952c +_ZN24AdventureModeManager_1609vfunc2_08Ei kind:function(arm,size=0x9c) addr:0x020c92cc +_ZN24AdventureModeManager_1609vfunc2_0CEi kind:function(arm,size=0x1a0) addr:0x020c9368 +_ZN24AdventureModeManager_1608vfunc_54Eii kind:function(arm,size=0x24) addr:0x020c9508 +_ZN24AdventureModeManager_1609vfunc2_14Ei kind:function(arm,size=0x20) addr:0x020c952c _ZN24AdventureModeManager_16019func_ov024_020c7cfcEv kind:function(arm,size=0x50) addr:0x020c954c _ZN24AdventureModeManager_16019func_ov024_020c7d4cEi kind:function(arm,size=0xf0) addr:0x020c959c -_ZN24AdventureModeManager_1608vfunc_18Ei kind:function(arm,size=0x118) addr:0x020c968c -_ZN24AdventureModeManager_1608vfunc_1CEi kind:function(arm,size=0x36c) addr:0x020c97a4 -_ZN24AdventureModeManager_1608vfunc_20Eii kind:function(arm,size=0xf8) addr:0x020c9b10 -_ZN24AdventureModeManager_1608vfunc_24Ev kind:function(arm,size=0x4) addr:0x020c9c08 +_ZN24AdventureModeManager_1609vfunc2_18Ei kind:function(arm,size=0x118) addr:0x020c968c +_ZN24AdventureModeManager_1608vfunc_5CEi kind:function(arm,size=0x36c) addr:0x020c97a4 +_ZN24AdventureModeManager_1608vfunc_58Eii kind:function(arm,size=0xf8) addr:0x020c9b10 +_ZN24AdventureModeManager_1608vfunc_60Ev kind:function(arm,size=0x4) addr:0x020c9c08 _ZN24AdventureModeManager_16019func_ov024_020c83bcEv kind:function(arm,size=0x6c) addr:0x020c9c0c _ZN24AdventureModeManager_16019func_ov024_020c8428Ev kind:function(arm,size=0x2c) addr:0x020c9c78 _ZN24AdventureModeManager_16019func_ov024_020c8454Ev kind:function(arm,size=0x30) addr:0x020c9ca4 @@ -165,11 +165,11 @@ _ZN24AdventureModeManager_170C1EP23GameModeManagerBase_104 kind:function(arm,siz _ZN27AdventureModeManager_170_14D1Ev kind:function(arm,size=0x14) addr:0x020c9e80 _ZN24AdventureModeManager_170D1Ev kind:function(arm,size=0x20) addr:0x020c9e94 _ZN24AdventureModeManager_170D0Ev kind:function(arm,size=0x28) addr:0x020c9eb4 -_ZN24AdventureModeManager_1708vfunc_08Ei kind:function(arm,size=0x38) addr:0x020c9edc -_ZN24AdventureModeManager_1708vfunc_0CEi kind:function(arm,size=0x74) addr:0x020c9f14 -_ZN24AdventureModeManager_1708vfunc_10Eii kind:function(arm,size=0xd4) addr:0x020c9f88 -_ZN24AdventureModeManager_1708vfunc_18Ei kind:function(arm,size=0xc) addr:0x020ca05c -_ZN24AdventureModeManager_1708vfunc_24Ev kind:function(arm,size=0x2c) addr:0x020ca068 +_ZN24AdventureModeManager_1709vfunc2_08Ei kind:function(arm,size=0x38) addr:0x020c9edc +_ZN24AdventureModeManager_1709vfunc2_0CEi kind:function(arm,size=0x74) addr:0x020c9f14 +_ZN24AdventureModeManager_1708vfunc_54Eii kind:function(arm,size=0xd4) addr:0x020c9f88 +_ZN24AdventureModeManager_1709vfunc2_18Ei kind:function(arm,size=0xc) addr:0x020ca05c +_ZN24AdventureModeManager_1708vfunc_60Ev kind:function(arm,size=0x2c) addr:0x020ca068 _ZN27AdventureModeManager_170_14D0Ev kind:function(arm,size=0x1c) addr:0x020ca094 _ZN32AdventureModeManager_174_Base_108vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020ca0b0 _ZN32AdventureModeManager_174_Base_108vfunc_10Ev kind:function(thumb,size=0x10) addr:0x020ca0c0 @@ -181,25 +181,25 @@ _ZN32AdventureModeManager_174_Base_10D0Ev kind:function(arm,size=0x1c) addr:0x02 _ZN29AdventureModeManager_174_BaseD1Ev kind:function(arm,size=0x20) addr:0x020ca56c _ZN29AdventureModeManager_174_BaseD0Ev kind:function(arm,size=0x28) addr:0x020ca58c _ZN24AdventureModeManager_174C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x2c) addr:0x020ca5b4 -_ZN24AdventureModeManager_1748vfunc_08Ei kind:function(thumb,size=0x58) addr:0x020ca5e0 -_ZN24AdventureModeManager_1748vfunc_0CEi kind:function(thumb,size=0x48) addr:0x020ca638 -_ZN24AdventureModeManager_1748vfunc_10Eii kind:function(thumb,size=0xac) addr:0x020ca680 -_ZN24AdventureModeManager_1748vfunc_18Ei kind:function(thumb,size=0x6c) addr:0x020ca72c -_ZN24AdventureModeManager_1748vfunc_1CEi kind:function(thumb,size=0x40) addr:0x020ca798 -_ZN24AdventureModeManager_1748vfunc_20Eii kind:function(thumb,size=0xc0) addr:0x020ca7d8 -_ZN24AdventureModeManager_1748vfunc_24Ev kind:function(thumb,size=0x2) addr:0x020ca898 +_ZN24AdventureModeManager_1749vfunc2_08Ei kind:function(thumb,size=0x58) addr:0x020ca5e0 +_ZN24AdventureModeManager_1749vfunc2_0CEi kind:function(thumb,size=0x48) addr:0x020ca638 +_ZN24AdventureModeManager_1748vfunc_54Eii kind:function(thumb,size=0xac) addr:0x020ca680 +_ZN24AdventureModeManager_1749vfunc2_18Ei kind:function(thumb,size=0x6c) addr:0x020ca72c +_ZN24AdventureModeManager_1748vfunc_5CEi kind:function(thumb,size=0x40) addr:0x020ca798 +_ZN24AdventureModeManager_1748vfunc_58Eii kind:function(thumb,size=0xc0) addr:0x020ca7d8 +_ZN24AdventureModeManager_1748vfunc_60Ev kind:function(thumb,size=0x2) addr:0x020ca898 _ZN24AdventureModeManager_174D1Ev kind:function(arm,size=0x20) addr:0x020ca89c _ZN24AdventureModeManager_174D0Ev kind:function(arm,size=0x28) addr:0x020ca8bc _ZN29AdventureModeManager_178_BaseC2EP23GameModeManagerBase_104 kind:function(thumb,size=0x14) addr:0x020ca8e4 -_ZN29AdventureModeManager_178_Base8vfunc_08Ei kind:function(thumb,size=0x2c) addr:0x020ca8f8 -_ZN29AdventureModeManager_178_Base8vfunc_0CEi kind:function(thumb,size=0x1c) addr:0x020ca924 -_ZN29AdventureModeManager_178_Base8vfunc_18Ei kind:function(thumb,size=0x2c) addr:0x020ca940 -_ZN29AdventureModeManager_178_Base8vfunc_1CEi kind:function(thumb,size=0x1c) addr:0x020ca96c +_ZN29AdventureModeManager_178_Base9vfunc2_08Ei kind:function(thumb,size=0x2c) addr:0x020ca8f8 +_ZN29AdventureModeManager_178_Base9vfunc2_0CEi kind:function(thumb,size=0x1c) addr:0x020ca924 +_ZN29AdventureModeManager_178_Base9vfunc2_18Ei kind:function(thumb,size=0x2c) addr:0x020ca940 +_ZN29AdventureModeManager_178_Base8vfunc_5CEi kind:function(thumb,size=0x1c) addr:0x020ca96c _ZN29AdventureModeManager_178_BaseD1Ev kind:function(arm,size=0x20) addr:0x020ca988 _ZN29AdventureModeManager_178_BaseD0Ev kind:function(arm,size=0x28) addr:0x020ca9a8 _ZN24AdventureModeManager_178C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x2c) addr:0x020ca9d0 -_ZN24AdventureModeManager_1788vfunc_10Eii kind:function(thumb,size=0x24) addr:0x020ca9fc -_ZN24AdventureModeManager_1788vfunc_20Eii kind:function(thumb,size=0x24) addr:0x020caa20 +_ZN24AdventureModeManager_1788vfunc_54Eii kind:function(thumb,size=0x24) addr:0x020ca9fc +_ZN24AdventureModeManager_1788vfunc_58Eii kind:function(thumb,size=0x24) addr:0x020caa20 _ZN24AdventureModeManager_178D1Ev kind:function(arm,size=0x20) addr:0x020caa44 _ZN24AdventureModeManager_178D0Ev kind:function(arm,size=0x28) addr:0x020caa64 _ZN27AdventureModeManager_180_188vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020caa8c @@ -207,29 +207,29 @@ _ZN24AdventureModeManager_180C1EP23GameModeManagerBase_104 kind:function(thumb,s _ZN27AdventureModeManager_180_18D1Ev kind:function(thumb,size=0xc) addr:0x020caaec _ZN24AdventureModeManager_180D1Ev kind:function(thumb,size=0x14) addr:0x020caaf8 _ZN24AdventureModeManager_180D0Ev kind:function(thumb,size=0x1a) addr:0x020cab0c -_ZN24AdventureModeManager_1808vfunc_08Ei kind:function(thumb,size=0x64) addr:0x020cab28 -_ZN24AdventureModeManager_1808vfunc_0CEi kind:function(thumb,size=0x90) addr:0x020cab8c -_ZN24AdventureModeManager_1808vfunc_10Eii kind:function(thumb,size=0x64) addr:0x020cac1c +_ZN24AdventureModeManager_1809vfunc2_08Ei kind:function(thumb,size=0x64) addr:0x020cab28 +_ZN24AdventureModeManager_1809vfunc2_0CEi kind:function(thumb,size=0x90) addr:0x020cab8c +_ZN24AdventureModeManager_1808vfunc_54Eii kind:function(thumb,size=0x64) addr:0x020cac1c _ZN24AdventureModeManager_18019func_ov024_020c9430Eii kind:function(thumb,size=0x24) addr:0x020cac80 -_ZN24AdventureModeManager_1808vfunc_18Ei kind:function(thumb,size=0x30) addr:0x020caca4 -_ZN24AdventureModeManager_1808vfunc_1CEi kind:function(thumb,size=0x78) addr:0x020cacd4 -_ZN24AdventureModeManager_1808vfunc_20Eii kind:function(thumb,size=0x7c) addr:0x020cad4c -_ZN24AdventureModeManager_1808vfunc_24Ev kind:function(thumb,size=0x2) addr:0x020cadc8 +_ZN24AdventureModeManager_1809vfunc2_18Ei kind:function(thumb,size=0x30) addr:0x020caca4 +_ZN24AdventureModeManager_1808vfunc_5CEi kind:function(thumb,size=0x78) addr:0x020cacd4 +_ZN24AdventureModeManager_1808vfunc_58Eii kind:function(thumb,size=0x7c) addr:0x020cad4c +_ZN24AdventureModeManager_1808vfunc_60Ev kind:function(thumb,size=0x2) addr:0x020cadc8 _ZN24AdventureModeManager_18019func_ov024_020c957cEv kind:function(thumb,size=0x48) addr:0x020cadcc _ZN24AdventureModeManager_18019func_ov024_020c95c4Ev kind:function(thumb,size=0x48) addr:0x020cae14 _ZN27AdventureModeManager_180_18D0Ev kind:function(arm,size=0x1c) addr:0x020cae5c _ZN24AdventureModeManager_184C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x30) addr:0x020cae78 _ZN24AdventureModeManager_184D1Ev kind:function(thumb,size=0xc) addr:0x020caea8 _ZN24AdventureModeManager_184D0Ev kind:function(thumb,size=0x12) addr:0x020caeb4 -_ZN24AdventureModeManager_1848vfunc_08Ei kind:function(thumb,size=0x20) addr:0x020caec8 -_ZN24AdventureModeManager_1848vfunc_0CEi kind:function(thumb,size=0xf8) addr:0x020caee8 -_ZN24AdventureModeManager_1848vfunc_10Eii kind:function(thumb,size=0x8) addr:0x020cafe0 -_ZN24AdventureModeManager_1848vfunc_14Ei kind:function(thumb,size=0x2) addr:0x020cafe8 +_ZN24AdventureModeManager_1849vfunc2_08Ei kind:function(thumb,size=0x20) addr:0x020caec8 +_ZN24AdventureModeManager_1849vfunc2_0CEi kind:function(thumb,size=0xf8) addr:0x020caee8 +_ZN24AdventureModeManager_1848vfunc_54Eii kind:function(thumb,size=0x8) addr:0x020cafe0 +_ZN24AdventureModeManager_1849vfunc2_14Ei kind:function(thumb,size=0x2) addr:0x020cafe8 _ZN24AdventureModeManager_18419func_ov024_020c979cEi kind:function(thumb,size=0x94) addr:0x020cafec -_ZN24AdventureModeManager_1848vfunc_18Ei kind:function(thumb,size=0x7c) addr:0x020cb080 -_ZN24AdventureModeManager_1848vfunc_1CEi kind:function(thumb,size=0x60) addr:0x020cb0fc -_ZN24AdventureModeManager_1848vfunc_20Eii kind:function(thumb,size=0x5c) addr:0x020cb15c -_ZN24AdventureModeManager_1848vfunc_24Ev kind:function(thumb,size=0x8) addr:0x020cb1b8 +_ZN24AdventureModeManager_1849vfunc2_18Ei kind:function(thumb,size=0x7c) addr:0x020cb080 +_ZN24AdventureModeManager_1848vfunc_5CEi kind:function(thumb,size=0x60) addr:0x020cb0fc +_ZN24AdventureModeManager_1848vfunc_58Eii kind:function(thumb,size=0x5c) addr:0x020cb15c +_ZN24AdventureModeManager_1848vfunc_60Ev kind:function(thumb,size=0x8) addr:0x020cb1b8 _ZN27AdventureModeManager_18C_14C1Ev kind:function(thumb,size=0x14) addr:0x020cb1c0 _ZN27AdventureModeManager_18C_148vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020cb1d4 _ZN27AdventureModeManager_18C_148vfunc_10Ev kind:function(thumb,size=0x10) addr:0x020cb1e4 @@ -237,15 +237,15 @@ _ZN24AdventureModeManager_18CC1EP23GameModeManagerBase_104 kind:function(thumb,s _ZN27AdventureModeManager_18C_14D1Ev kind:function(thumb,size=0xc) addr:0x020cb25c _ZN24AdventureModeManager_18CD1Ev kind:function(thumb,size=0x14) addr:0x020cb268 _ZN24AdventureModeManager_18CD0Ev kind:function(thumb,size=0x1a) addr:0x020cb27c -_ZN24AdventureModeManager_18C8vfunc_08Ei kind:function(thumb,size=0x32) addr:0x020cb298 -_ZN24AdventureModeManager_18C8vfunc_0CEi kind:function(thumb,size=0xf0) addr:0x020cb2cc -_ZN24AdventureModeManager_18C8vfunc_10Eii kind:function(thumb,size=0x100) addr:0x020cb3bc +_ZN24AdventureModeManager_18C9vfunc2_08Ei kind:function(thumb,size=0x32) addr:0x020cb298 +_ZN24AdventureModeManager_18C9vfunc2_0CEi kind:function(thumb,size=0xf0) addr:0x020cb2cc +_ZN24AdventureModeManager_18C8vfunc_54Eii kind:function(thumb,size=0x100) addr:0x020cb3bc _ZN24AdventureModeManager_18C19func_ov024_020c9c6cEv kind:function(thumb,size=0xb4) addr:0x020cb4bc -_ZN24AdventureModeManager_18C8vfunc_14Ei kind:function(thumb,size=0x10) addr:0x020cb570 -_ZN24AdventureModeManager_18C8vfunc_18Ei kind:function(thumb,size=0xac) addr:0x020cb580 -_ZN24AdventureModeManager_18C8vfunc_1CEi kind:function(thumb,size=0x88) addr:0x020cb62c -_ZN24AdventureModeManager_18C8vfunc_20Eii kind:function(thumb,size=0x1c4) addr:0x020cb6b4 -_ZN24AdventureModeManager_18C8vfunc_24Ev kind:function(thumb,size=0xa) addr:0x020cb878 +_ZN24AdventureModeManager_18C9vfunc2_14Ei kind:function(thumb,size=0x10) addr:0x020cb570 +_ZN24AdventureModeManager_18C9vfunc2_18Ei kind:function(thumb,size=0xac) addr:0x020cb580 +_ZN24AdventureModeManager_18C8vfunc_5CEi kind:function(thumb,size=0x88) addr:0x020cb62c +_ZN24AdventureModeManager_18C8vfunc_58Eii kind:function(thumb,size=0x1c4) addr:0x020cb6b4 +_ZN24AdventureModeManager_18C8vfunc_60Ev kind:function(thumb,size=0xa) addr:0x020cb878 _ZN24AdventureModeManager_18C19func_ov024_020ca034Ev kind:function(thumb,size=0x34) addr:0x020cb884 _ZN24AdventureModeManager_18C19func_ov024_020ca068Ei kind:function(thumb,size=0xc) addr:0x020cb8b8 _ZN24AdventureModeManager_18C19func_ov024_020ca074Ev kind:function(thumb,size=0x6) addr:0x020cb8c4 @@ -255,12 +255,12 @@ _ZN27AdventureModeManager_190_388vfunc_0CEv kind:function(thumb,size=0xc) addr:0 _ZN24AdventureModeManager_190C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x54) addr:0x020cb904 _ZN27AdventureModeManager_190_14D1Ev kind:function(thumb,size=0xc) addr:0x020cb958 _ZN27AdventureModeManager_190_38D1Ev kind:function(thumb,size=0xc) addr:0x020cb964 -_ZN24AdventureModeManager_1908vfunc_08Ei kind:function(thumb,size=0xc) addr:0x020cb970 -_ZN24AdventureModeManager_1908vfunc_0CEi kind:function(thumb,size=0x20) addr:0x020cb97c -_ZN24AdventureModeManager_1908vfunc_10Eii kind:function(thumb,size=0x3c) addr:0x020cb99c -_ZN24AdventureModeManager_1908vfunc_18Ei kind:function(thumb,size=0xc) addr:0x020cb9d8 -_ZN24AdventureModeManager_1908vfunc_1CEi kind:function(thumb,size=0x20) addr:0x020cb9e4 -_ZN24AdventureModeManager_1908vfunc_20Eii kind:function(thumb,size=0x68) addr:0x020cba04 +_ZN24AdventureModeManager_1909vfunc2_08Ei kind:function(thumb,size=0xc) addr:0x020cb970 +_ZN24AdventureModeManager_1909vfunc2_0CEi kind:function(thumb,size=0x20) addr:0x020cb97c +_ZN24AdventureModeManager_1908vfunc_54Eii kind:function(thumb,size=0x3c) addr:0x020cb99c +_ZN24AdventureModeManager_1909vfunc2_18Ei kind:function(thumb,size=0xc) addr:0x020cb9d8 +_ZN24AdventureModeManager_1908vfunc_5CEi kind:function(thumb,size=0x20) addr:0x020cb9e4 +_ZN24AdventureModeManager_1908vfunc_58Eii kind:function(thumb,size=0x68) addr:0x020cba04 _ZN24AdventureModeManager_19019func_ov024_020ca21cEv kind:function(thumb,size=0x30) addr:0x020cba6c _ZN24AdventureModeManager_19019func_ov024_020ca24cEi kind:function(thumb,size=0x34) addr:0x020cba9c _ZN24AdventureModeManager_19019func_ov024_020ca280Ev kind:function(thumb,size=0x10) addr:0x020cbad0 diff --git a/config/jp/arm9/overlays/ov031/delinks.txt b/config/jp/arm9/overlays/ov031/delinks.txt index 673cf9cb..9f206644 100644 --- a/config/jp/arm9/overlays/ov031/delinks.txt +++ b/config/jp/arm9/overlays/ov031/delinks.txt @@ -186,15 +186,17 @@ src/031_Land/Actor/ActorItemDrop.cpp: .bss start:0x02118c0c end:0x02118d3c src/031_Land/Actor/ActorUnkMLCK.cpp: - .text start:0x020fc5b4 end:0x020fcd04 + .text start:0x020fc5b4 end:0x020fcd64 .init start:0x02113714 end:0x02113788 .ctor start:0x0211458c end:0x02114590 + .data start:0x02116a9c end:0x02116b90 .bss start:0x02118d3c end:0x02118d88 src/031_Land/Actor/ActorUnkCLLT.cpp: .text start:0x020fcd64 end:0x020fcf04 .init start:0x02113788 end:0x021137d8 .ctor start:0x02114590 end:0x02114594 + .data start:0x02116b90 end:0x02116c20 .bss start:0x02118d88 end:0x02118dd4 src/031_Land/Actor/ActorUnkEFSB.cpp: diff --git a/config/jp/arm9/overlays/ov031/relocs.txt b/config/jp/arm9/overlays/ov031/relocs.txt index 8502b9d6..f8d58b70 100644 --- a/config/jp/arm9/overlays/ov031/relocs.txt +++ b/config/jp/arm9/overlays/ov031/relocs.txt @@ -103,7 +103,7 @@ from:0x020dacb0 kind:load to:0x0204b690 module:main from:0x020dace4 kind:arm_call to:0x01fff350 module:itcm from:0x020dacf0 kind:arm_call to:0x020fcc40 module:overlay(31) from:0x020dacfc kind:load to:0x027e0ce4 module:dtcm -from:0x020dad04 kind:load to:0x02114874 module:overlay(31) +from:0x020dad04 kind:load to:0x0211486c add:0x8 module:overlay(31) from:0x020dad20 kind:arm_call to:0x01fff458 module:itcm from:0x020dad50 kind:load to:0x027e0ce4 module:dtcm from:0x020dad54 kind:load to:0x020dad08 module:overlay(31) @@ -3773,13 +3773,13 @@ from:0x020fc5f0 kind:arm_call to:0x02098e24 module:overlay(0) from:0x020fc608 kind:load to:0x02116ac0 add:0x8 module:overlay(31) from:0x020fc614 kind:arm_call to:0x02099b30 module:overlay(0) from:0x020fc61c kind:arm_call to:0x02062bd0 module:overlay(0) -from:0x020fc6b0 kind:load to:0x02116ab0 module:overlay(31) +from:0x020fc6b0 kind:load to:0x02116aa8 add:0x8 module:overlay(31) from:0x020fc6b4 kind:load to:0x02116ae4 add:0x8 module:overlay(31) -from:0x020fc6b8 kind:load to:0x02116b60 add:0x8 module:overlay(31) +from:0x020fc6b8 kind:load to:0x02116ae4 add:0x84 module:overlay(31) from:0x020fc6f4 kind:arm_call to:0x01fff350 module:itcm from:0x020fc728 kind:arm_call to:0x02062764 module:overlay(0) from:0x020fc780 kind:load to:0x027e0ce4 module:dtcm -from:0x020fc784 kind:load to:0x02114874 module:overlay(31) +from:0x020fc784 kind:load to:0x0211486c add:0x8 module:overlay(31) from:0x020fc78c kind:load to:0x0204b608 module:main from:0x020fc790 kind:load to:0x020da050 module:overlay(24) from:0x020fc7c4 kind:arm_call to:0x02070ff8 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov031/symbols.txt b/config/jp/arm9/overlays/ov031/symbols.txt index e2c72a8e..8f6c9251 100644 --- a/config/jp/arm9/overlays/ov031/symbols.txt +++ b/config/jp/arm9/overlays/ov031/symbols.txt @@ -73,9 +73,9 @@ func_ov031_020db25c kind:function(arm,size=0x1c) addr:0x020db25c func_ov031_020db278 kind:function(arm,size=0x1c) addr:0x020db278 func_ov031_020db294 kind:function(arm,size=0x2c) addr:0x020db294 func_ov031_020db2c0 kind:function(arm,size=0x2c) addr:0x020db2c0 -func_ov031_020db2ec kind:function(arm,size=0x10) addr:0x020db2ec +_ZN18UnkStruct_027e0d3419func_ov031_020d994cEv kind:function(arm,size=0x10) addr:0x020db2ec func_ov031_020db2fc kind:function(arm,size=0x10) addr:0x020db2fc -func_ov031_020db30c kind:function(arm,size=0x10) addr:0x020db30c +_ZN18UnkStruct_027e0d3419func_ov031_020d996cEv kind:function(arm,size=0x10) addr:0x020db30c func_ov031_020db31c kind:function(arm,size=0x30) addr:0x020db31c func_ov031_020db34c kind:function(arm,size=0x10) addr:0x020db34c func_ov031_020db35c kind:function(arm,size=0x10) addr:0x020db35c @@ -149,17 +149,17 @@ func_ov031_020dcd14 kind:function(arm,size=0x74) addr:0x020dcd14 func_ov031_020dcd88 kind:function(arm,size=0x18) addr:0x020dcd88 func_ov031_020dcda0 kind:function(arm,size=0x98) addr:0x020dcda0 func_ov031_020dce38 kind:function(arm,size=0x58) addr:0x020dce38 -func_ov031_020dce90 kind:function(arm,size=0x38) addr:0x020dce90 -func_ov031_020dcec8 kind:function(arm,size=0x8c) addr:0x020dcec8 +_ZN27UnkStruct_ItemManager_20_0419func_ov031_020db4f0Eii kind:function(arm,size=0x38) addr:0x020dce90 +_ZN27UnkStruct_ItemManager_20_0419func_ov031_020db528Ei kind:function(arm,size=0x8c) addr:0x020dcec8 _ZN27UnkStruct_ItemManager_20_0819func_ov031_020db5b4Ev kind:function(arm,size=0x20) addr:0x020dcf54 func_ov031_020dcf74 kind:function(arm,size=0x14) addr:0x020dcf74 func_ov031_020dcf88 kind:function(arm,size=0x2c) addr:0x020dcf88 func_ov031_020dcfb4 kind:function(arm,size=0x90) addr:0x020dcfb4 func_ov031_020dd044 kind:function(arm,size=0x60) addr:0x020dd044 -func_ov031_020dd0a4 kind:function(arm,size=0xbc) addr:0x020dd0a4 +_ZN27UnkStruct_ItemManager_20_0819func_ov031_020db704Eii kind:function(arm,size=0xbc) addr:0x020dd0a4 _ZN27UnkStruct_ItemManager_20_14C1Ev kind:function(thumb,size=0x16) addr:0x020dd160 _ZN27UnkStruct_ItemManager_20_1419func_ov031_020db7d8Ev kind:function(thumb,size=0x1a) addr:0x020dd178 -func_ov031_020dd194 kind:function(arm,size=0x50) addr:0x020dd194 +_ZN27UnkStruct_ItemManager_20_1419func_ov031_020db7f4Ev kind:function(arm,size=0x50) addr:0x020dd194 func_ov031_020dd1e4 kind:function(arm,size=0x30) addr:0x020dd1e4 _ZN24UnkStruct_ItemManager_2019func_ov031_020db874Ej kind:function(arm,size=0x58) addr:0x020dd214 _ZN24UnkStruct_ItemManager_2019func_ov031_020db8ccEv kind:function(arm,size=0x2c) addr:0x020dd26c @@ -167,15 +167,15 @@ _ZN24UnkStruct_ItemManager_2019func_ov031_020db8f8Ev kind:function(arm,size=0x44 _ZN27UnkStruct_ItemManager_20_0CC1Ev kind:function(thumb,size=0x12) addr:0x020dd2dc _ZN27UnkStruct_ItemManager_20_0CD1Ev kind:function(thumb,size=0x2) addr:0x020dd2f0 _ZN27UnkStruct_ItemManager_20_0C19func_ov031_020db954Ev kind:function(arm,size=0x4) addr:0x020dd2f4 -func_ov031_020dd2f8 kind:function(arm,size=0xe4) addr:0x020dd2f8 -func_ov031_020dd3dc kind:function(arm,size=0x4) addr:0x020dd3dc +_ZN27UnkStruct_ItemManager_20_0C19func_ov031_020db958Eii kind:function(arm,size=0xe4) addr:0x020dd2f8 +_ZN27UnkStruct_ItemManager_20_0C19func_ov031_020dba3cEi kind:function(arm,size=0x4) addr:0x020dd3dc _ZN27UnkStruct_ItemManager_20_0019func_ov031_020dba40Ev kind:function(arm,size=0x34) addr:0x020dd3e0 func_ov031_020dd414 kind:function(arm,size=0x18) addr:0x020dd414 func_ov031_020dd42c kind:function(arm,size=0xac) addr:0x020dd42c func_ov031_020dd4d8 kind:function(arm,size=0x1c) addr:0x020dd4d8 func_ov031_020dd4f4 kind:function(arm,size=0xc4) addr:0x020dd4f4 func_ov031_020dd5b8 kind:function(arm,size=0x68) addr:0x020dd5b8 -func_ov031_020dd620 kind:function(arm,size=0xa4) addr:0x020dd620 +_ZN27UnkStruct_ItemManager_20_0019func_ov031_020dbc80Eii kind:function(arm,size=0xa4) addr:0x020dd620 func_ov031_020dd6c4 kind:function(arm,size=0x74) addr:0x020dd6c4 func_ov031_020dd738 kind:function(arm,size=0xc4) addr:0x020dd738 func_ov031_020dd7fc kind:function(arm,size=0x2c) addr:0x020dd7fc @@ -612,7 +612,7 @@ _ZN19ActorProfileUnkZSRSC1Ev kind:function(thumb,size=0x1c) addr:0x020eba24 _ZN19ActorProfileUnkZLSL10GetProfileEv kind:function(thumb,size=0x8) addr:0x020eba40 _ZN19ActorProfileUnkZLSL6CreateEv kind:function(thumb,size=0x1c) addr:0x020eba48 _ZN19ActorProfileUnkZLSLC1Ev kind:function(thumb,size=0x3c) addr:0x020eba64 -_ZN24UnkStruct_ov031_0211361c19func_ov031_020ea0b4EP5Actor kind:function(thumb,size=0x30) addr:0x020ebaa0 +_ZN24UnkStruct_ov031_0211361c8vfunc_00EP5Actor kind:function(thumb,size=0x30) addr:0x020ebaa0 func_ov031_020ebad0 kind:function(thumb,size=0x14) addr:0x020ebad0 _ZN26ModelRender_ov031_021136708vfunc_0CEv kind:function(thumb,size=0x8) addr:0x020ebae4 func_ov031_020ea100 kind:function(thumb,size=0x40) addr:0x020ebaec @@ -1207,8 +1207,8 @@ _ZN12ActorUnkMLCKC1Ev kind:function(arm,size=0xb0) addr:0x020fc60c _ZN12ActorUnkMLCK8vfunc_18Ei kind:function(arm,size=0xd8) addr:0x020fc6bc _ZN12ActorUnkMLCK8vfunc_64Ei kind:function(arm,size=0x4c) addr:0x020fc794 _ZN12ActorUnkMLCK8vfunc_54Eii kind:function(arm,size=0x20) addr:0x020fc7e0 -_ZN12ActorUnkMLCK8vfunc_58Ev kind:function(arm,size=0xc) addr:0x020fc800 -_ZN12ActorUnkMLCK8vfunc_5CEv kind:function(arm,size=0x54) addr:0x020fc80c +_ZN12ActorUnkMLCK8vfunc_58Eii kind:function(arm,size=0xc) addr:0x020fc800 +_ZN12ActorUnkMLCK8vfunc_5CEi kind:function(arm,size=0x54) addr:0x020fc80c _ZN12ActorUnkMLCK8vfunc_60Ev kind:function(arm,size=0x18) addr:0x020fc860 _ZN12ActorUnkMLCK8vfunc_68Ev kind:function(arm,size=0x90) addr:0x020fc878 _ZN12ActorUnkMLCK19func_ov031_020faeb0Ev kind:function(arm,size=0x4) addr:0x020fc908 @@ -1217,20 +1217,20 @@ _ZN12ActorUnkMLCK8vfunc_70Ev kind:function(arm,size=0x20) addr:0x020fc95c _ZN12ActorUnkMLCK19func_ov031_020faf24Ev kind:function(arm,size=0x1e0) addr:0x020fc97c _ZN12ActorUnkMLCK19func_ov031_020fb104Ev kind:function(arm,size=0x18) addr:0x020fcb5c _ZN12ActorUnkMLCK19func_ov031_020fb11cEv kind:function(arm,size=0x68) addr:0x020fcb74 -_ZN18ActorUnkMLCK_B4_0019func_ov031_020fb184Ev kind:function(arm,size=0x2c) addr:0x020fcbdc +_ZN15ActorUnkMLCK_C419func_ov031_020fb184Ev kind:function(arm,size=0x2c) addr:0x020fcbdc _ZN15ActorUnkMLCK_D89vfunc2_00Ev kind:function(arm,size=0x1c) addr:0x020fcc08 _ZN15ActorUnkMLCK_D89vfunc2_04Ev kind:function(arm,size=0x1c) addr:0x020fcc24 -_ZN12ActorUnkMLCK19func_ov031_020fb1e8EP18ActorUnkMLCK_B4_00 kind:function(arm,size=0x1c) addr:0x020fcc40 +_ZN12ActorUnkMLCK19func_ov031_020fb1e8EP15ActorUnkMLCK_A0 kind:function(arm,size=0x1c) addr:0x020fcc40 _ZN12ActorUnkMLCK19func_ov031_020fb204Ei kind:function(arm,size=0x4c) addr:0x020fcc5c _ZN12ActorUnkMLCKD0Ev kind:function(arm,size=0x28) addr:0x020fcca8 _ZN12ActorUnkMLCKD1Ev kind:function(arm,size=0x20) addr:0x020fccd0 _ZN19ActorProfileUnkMLCKD1Ev kind:function(arm,size=0x14) addr:0x020fccf0 -func_ov031_020fcd04 kind:function(arm,size=0x10) addr:0x020fcd04 -func_ov031_020fcd14 kind:function(arm,size=0x10) addr:0x020fcd14 -func_ov031_020fcd24 kind:function(arm,size=0x10) addr:0x020fcd24 -func_ov031_020fcd34 kind:function(arm,size=0x10) addr:0x020fcd34 -func_ov031_020fcd44 kind:function(arm,size=0x10) addr:0x020fcd44 -func_ov031_020fcd54 kind:function(arm,size=0x10) addr:0x020fcd54 +_ZThn148_N12ActorUnkMLCKD0Ev kind:function(arm,size=0x10) addr:0x020fcd04 +_ZThn148_N12ActorUnkMLCK8vfunc_60Ev kind:function(arm,size=0x10) addr:0x020fcd14 +_ZThn148_N12ActorUnkMLCK8vfunc_58Eii kind:function(arm,size=0x10) addr:0x020fcd24 +_ZThn148_N12ActorUnkMLCK8vfunc_5CEi kind:function(arm,size=0x10) addr:0x020fcd34 +_ZThn148_N12ActorUnkMLCK8vfunc_54Eii kind:function(arm,size=0x10) addr:0x020fcd44 +_ZThn148_N12ActorUnkMLCKD1Ev kind:function(arm,size=0x10) addr:0x020fcd54 _ZN19ActorProfileUnkCLLT10GetProfileEv kind:function(arm,size=0xc) addr:0x020fcd64 _ZN19ActorProfileUnkCLLT6CreateEv kind:function(arm,size=0x24) addr:0x020fcd70 _ZN19ActorProfileUnkCLLTC1Ev kind:function(arm,size=0x28) addr:0x020fcd94 @@ -1793,7 +1793,7 @@ _ZN23MapObjectProfileUnkSAND6CreateEv kind:function(arm,size=0x24) addr:0x0210c8 _ZN23MapObjectProfileUnkSANDC1Ev kind:function(arm,size=0x198) addr:0x0210c8a4 _ZN16MapObjectUnkSAND19func_ov031_0210acd4Ev kind:function(arm,size=0x90) addr:0x0210ca3c _ZN16MapObjectUnkSAND19func_ov031_0210ad64Ev kind:function(arm,size=0x9c) addr:0x0210cacc -_ZN16MapObjectUnkSAND19func_ov031_0210ae00Ev kind:function(arm,size=0x90) addr:0x0210cb68 +_ZN16MapObjectUnkSAND19func_ov031_0210ae00E8Vec2bCppPv kind:function(arm,size=0x90) addr:0x0210cb68 _ZN16MapObjectUnkSAND19func_ov031_0210ae90Ev kind:function(arm,size=0xc0) addr:0x0210cbf8 _ZN16MapObjectUnkSAND19func_ov031_0210af50Ev kind:function(arm,size=0xc8) addr:0x0210ccb8 _ZN16MapObjectUnkSAND19func_ov031_0210b018Ev kind:function(arm,size=0x10) addr:0x0210cd80 @@ -1801,13 +1801,13 @@ _ZN16MapObjectUnkSAND19func_ov031_0210b028Ev kind:function(arm,size=0x84) addr:0 _ZN16MapObjectUnkSAND19func_ov031_0210b0acEv kind:function(arm,size=0x38) addr:0x0210ce14 _ZN16MapObjectUnkSAND19func_ov031_0210b0e4Ev kind:function(arm,size=0x60) addr:0x0210ce4c _ZN16MapObjectUnkSAND19func_ov031_0210b144Ev kind:function(arm,size=0x38) addr:0x0210ceac -_ZN16MapObjectUnkSAND19func_ov031_0210b17cEv kind:function(arm,size=0x70) addr:0x0210cee4 +_ZN16MapObjectUnkSAND19func_ov031_0210b17cEP19MapObjectUnkSAND_40i kind:function(arm,size=0x70) addr:0x0210cee4 _ZN16MapObjectUnkSAND19func_ov031_0210b1ecEv kind:function(arm,size=0xe0) addr:0x0210cf54 _ZN16MapObjectUnkSAND19func_ov031_0210b2ccEv kind:function(arm,size=0x30) addr:0x0210d034 -_ZN16MapObjectUnkSANDD1Ev kind:function(arm,size=0x14) addr:0x0210d064 -_ZN16MapObjectUnkSANDD0Ev kind:function(arm,size=0x1c) addr:0x0210d078 -_ZN16MapObjectUnkSAND19func_ov031_0210b32cEv kind:function(arm,size=0x20) addr:0x0210d094 -_ZN16MapObjectUnkSAND19func_ov031_0210b34cEv kind:function(arm,size=0x28) addr:0x0210d0b4 +_ZN16MapObjectUnkSAND19func_ov031_0210b2fcEv kind:function(arm,size=0x14) addr:0x0210d064 +_ZN16MapObjectUnkSAND19func_ov031_0210b310Ev kind:function(arm,size=0x1c) addr:0x0210d078 +_ZN16MapObjectUnkSANDD1Ev kind:function(arm,size=0x20) addr:0x0210d094 +_ZN16MapObjectUnkSANDD0Ev kind:function(arm,size=0x28) addr:0x0210d0b4 _ZN23MapObjectProfileUnkSANDD1Ev kind:function(arm,size=0x14) addr:0x0210d0dc _ZN23MapObjectProfileUnkSPTB10GetProfileEv kind:function(arm,size=0xc) addr:0x0210d0f0 _ZN23MapObjectProfileUnkSPTB6CreateEv kind:function(arm,size=0x24) addr:0x0210d0fc @@ -2026,7 +2026,7 @@ data_ov031_02112914 kind:data(any) addr:0x02112914 data_ov031_02112920 kind:data(any) addr:0x02112920 data_ov031_0211292c kind:data(any) addr:0x0211292c data_ov031_02110bc8 kind:data(any) addr:0x02112938 local -data_ov031_0211295c kind:data(any) addr:0x0211295c +data_ov031_02110bec kind:data(any) addr:0x0211295c data_ov031_02112970 kind:data(any) addr:0x02112970 data_ov031_02110c1c kind:data(any) addr:0x0211298c local data_ov031_02110c28 kind:data(any) addr:0x02112998 local @@ -2092,7 +2092,7 @@ __sinit_ActorUnkNORE.cpp kind:function(arm,size=0x50) addr:0x021134ec local __sinit_ActorUnkFLEN.cpp kind:function(arm,size=0x50) addr:0x0211353c __sinit_ActorRollingStone.cpp kind:function(arm,size=0x50) addr:0x0211358c __sinit_ActorItemDrop.cpp kind:function(arm,size=0x138) addr:0x021135dc local -__sinit_ActorUnkMLCK.cpp kind:function(arm,size=0x74) addr:0x02113714 +__sinit_ActorUnkMLCK.cpp kind:function(arm,size=0x74) addr:0x02113714 local __sinit_ActorUnkCLLT.cpp kind:function(arm,size=0x50) addr:0x02113788 __sinit_ActorUnkEFSB.cpp kind:function(arm,size=0x50) addr:0x021137d8 local __sinit_ActorUnkNFSP.cpp kind:function(arm,size=0x50) addr:0x02113828 local @@ -2156,7 +2156,7 @@ __sinit_MapObjectUnkSWFS.cpp kind:function(arm,size=0x70) addr:0x021144b0 .p__sinit_ActorUnkFLEN.cpp kind:data(word) addr:0x02114580 .p__sinit_ActorRollingStone.cpp kind:data(word) addr:0x02114584 .p__sinit_ActorItemDrop.cpp kind:data(word) addr:0x02114588 local -.p__sinit_ActorUnkMLCK.cpp kind:data(word) addr:0x0211458c +.p__sinit_ActorUnkMLCK.cpp kind:data(word) addr:0x0211458c local .p__sinit_ActorUnkCLLT.cpp kind:data(word) addr:0x02114590 .p__sinit_ActorUnkEFSB.cpp kind:data(word) addr:0x02114594 local .p__sinit_ActorUnkNFSP.cpp kind:data(word) addr:0x02114598 local @@ -2226,7 +2226,7 @@ data_ov031_021147f0 kind:data(any) addr:0x021147f0 data_ov031_02114804 kind:data(any) addr:0x02114804 _ZTV16MapObject_10_Pot kind:data(any) addr:0x02114810 data_ov031_02114840 kind:data(any) addr:0x02114840 -data_ov031_02114874 kind:data(any) addr:0x02114874 +_ZTV24UnkStruct_ov031_02112ad4 kind:data(any) addr:0x0211486c data_ov031_02114880 kind:data(any) addr:0x02114880 data_ov031_0211489c kind:data(any) addr:0x0211489c data_ov031_021148b8 kind:data(any) addr:0x021148b8 @@ -2393,11 +2393,10 @@ _ZTV24ActorProfileTreasureDrop kind:data(any) addr:0x021169d0 _ZTV25ActorProfileRedPotionDrop kind:data(any) addr:0x021169f4 _ZTV20ActorProfileBombDrop kind:data(any) addr:0x02116a18 _ZTV13ActorItemDrop kind:data(any) addr:0x02116a3c -data_ov031_02116a9c kind:data(any) addr:0x02116a9c -data_ov031_02116ab0 kind:data(any) addr:0x02116ab0 -_ZTV19data_ov031_02116ac0 kind:data(any) addr:0x02116ac0 -_ZTV19data_ov031_02116ae4 kind:data(any) addr:0x02116ae4 -_ZTV19data_ov031_02116b60 kind:data(any) addr:0x02116b60 +data_ov031_02114d28 kind:data(any) addr:0x02116a9c local +_ZTV15ActorUnkMLCK_D8 kind:data(any) addr:0x02116aa8 +_ZTV19ActorProfileUnkMLCK kind:data(any) addr:0x02116ac0 +_ZTV12ActorUnkMLCK kind:data(any) addr:0x02116ae4 _ZTV19data_ov031_02116b90 kind:data(any) addr:0x02116b90 _ZTV19data_ov031_02116bb4 kind:data(any) addr:0x02116bb4 _ZTV19ActorProfileUnkEFSB kind:data(any) addr:0x02116c20 @@ -2487,7 +2486,7 @@ data_ov031_02117ccc kind:data(any) addr:0x02117ccc data_ov031_02117d08 kind:data(any) addr:0x02117d08 data_ov031_02117d1c kind:data(any) addr:0x02117d1c data_ov031_02117d38 kind:data(any) addr:0x02117d38 -data_ov031_02117d80 kind:data(any) addr:0x02117d80 +data_ov031_02115fe0 kind:data(any) addr:0x02117d80 data_ov031_02117d8c kind:data(any) addr:0x02117d8c ambiguous data_ov031_02117da0 kind:data(any) addr:0x02117da0 data_ov031_02117dbc kind:data(any) addr:0x02117dbc ambiguous @@ -2603,7 +2602,7 @@ _ZN15ProfileInstanceI24ActorProfileTreasureDropE8sProfileE kind:bss addr:0x02118 _ZN15ProfileInstanceI21ActorProfileArrowDropE8sProfileE kind:bss addr:0x02118cc4 _ZN15ProfileInstanceI20ActorProfileBombDropE8sProfileE kind:bss addr:0x02118d00 _ZGVN15ProfileInstanceI19ActorProfileUnkMLCKE8sProfileE kind:bss addr:0x02118d3c -@30920 kind:bss addr:0x02118d40 +@30920 kind:bss addr:0x02118d40 local _ZN15ProfileInstanceI19ActorProfileUnkMLCKE8sProfileE kind:bss addr:0x02118d4c _ZGVN15ProfileInstanceI19ActorProfileUnkCLLTE8sProfileE kind:bss addr:0x02118d88 @30926 kind:bss addr:0x02118d8c @@ -2720,9 +2719,9 @@ data_ov031_0211a694 kind:bss addr:0x0211a694 data_ov031_02118900 kind:bss addr:0x0211a6a0 data_ov031_02118918 kind:bss addr:0x0211a6b8 data_ov031_021189d0 kind:bss addr:0x0211a770 -data_ov031_0211a844 kind:bss addr:0x0211a844 -data_ov031_0211a868 kind:bss addr:0x0211a868 -data_ov031_0211a88c kind:bss addr:0x0211a88c +data_ov031_02118aa4 kind:bss addr:0x0211a844 +data_ov031_02118ac8 kind:bss addr:0x0211a868 +data_ov031_02118aec kind:bss addr:0x0211a88c data_ov031_0211a8b0 kind:bss addr:0x0211a8b0 _ZGVN15ProfileInstanceI23MapObjectProfileUnkSPTBE8sProfileE kind:bss addr:0x0211aa30 @31101 kind:bss addr:0x0211aa38 diff --git a/config/jp/arm9/overlays/ov033/relocs.txt b/config/jp/arm9/overlays/ov033/relocs.txt index 611124d3..cc8c7d61 100644 --- a/config/jp/arm9/overlays/ov033/relocs.txt +++ b/config/jp/arm9/overlays/ov033/relocs.txt @@ -347,7 +347,7 @@ from:0x0211db24 kind:arm_call to:0x0211da94 module:overlay(33) from:0x0211db48 kind:load to:0x027e0ce0 module:dtcm from:0x0211db74 kind:arm_call to:0x01fff350 module:itcm from:0x0211dbb4 kind:load to:0x027e0ce4 module:dtcm -from:0x0211dbbc kind:load to:0x020b4800 module:overlay(0) +from:0x0211dbbc kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0211dbcc kind:arm_call_thumb to:0x02059454 module:overlay(0) from:0x0211dbd4 kind:arm_call_thumb to:0x02059454 module:overlay(0) from:0x0211dbdc kind:arm_call to:0x0209e870 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov034/relocs.txt b/config/jp/arm9/overlays/ov034/relocs.txt index 94a4700f..5d2b58c2 100644 --- a/config/jp/arm9/overlays/ov034/relocs.txt +++ b/config/jp/arm9/overlays/ov034/relocs.txt @@ -234,7 +234,7 @@ from:0x0211cc44 kind:load to:0x027e09a4 module:dtcm from:0x0211cc74 kind:arm_call to:0x01fff350 module:itcm from:0x0211cc90 kind:arm_call to:0x0211eaa8 module:overlay(34) from:0x0211ccd0 kind:load to:0x027e0ce4 module:dtcm -from:0x0211ccd8 kind:load to:0x020b4800 module:overlay(0) +from:0x0211ccd8 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0211cd58 kind:arm_call to:0x0207f780 module:overlay(0) from:0x0211cd78 kind:arm_call to:0x0207f780 module:overlay(0) from:0x0211cd84 kind:arm_call to:0x0211e6a0 module:overlay(34) diff --git a/config/jp/arm9/overlays/ov037/relocs.txt b/config/jp/arm9/overlays/ov037/relocs.txt index ffeb4329..c29d418b 100644 --- a/config/jp/arm9/overlays/ov037/relocs.txt +++ b/config/jp/arm9/overlays/ov037/relocs.txt @@ -155,7 +155,7 @@ from:0x0211c24c kind:arm_call to:0x01fff350 module:itcm from:0x0211c270 kind:arm_call to:0x02120484 module:overlay(37) from:0x0211c284 kind:arm_call to:0x01fff350 module:itcm from:0x0211c29c kind:load to:0x027e0ce4 module:dtcm -from:0x0211c2a0 kind:load to:0x020b4800 module:overlay(0) +from:0x0211c2a0 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0211c354 kind:load to:0x0204b164 module:main from:0x0211c378 kind:arm_call to:0x01fff148 module:itcm from:0x0211c3b8 kind:arm_call to:0x01ffbbe0 module:itcm @@ -450,7 +450,7 @@ from:0x021201e4 kind:arm_call to:0x021200f4 module:overlay(37) from:0x021201f0 kind:arm_call to:0x021200f4 module:overlay(37) from:0x021201fc kind:arm_call to:0x02120228 module:overlay(37) from:0x02120208 kind:load to:0x027e0ce4 module:dtcm -from:0x0212020c kind:load to:0x020b4800 module:overlay(0) +from:0x0212020c kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0212034c kind:arm_call to:0x02099e5c module:overlay(0) from:0x02120370 kind:arm_call to:0x01fff148 module:itcm from:0x0212037c kind:arm_call to:0x01ff9a5c module:itcm @@ -630,7 +630,7 @@ from:0x02122328 kind:arm_call to:0x02122238 module:overlay(37) from:0x02122334 kind:arm_call to:0x02122238 module:overlay(37) from:0x02122340 kind:arm_call to:0x0212236c module:overlay(37) from:0x0212234c kind:load to:0x027e0ce4 module:dtcm -from:0x02122350 kind:load to:0x020b4800 module:overlay(0) +from:0x02122350 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02122418 kind:arm_call to:0x02099e5c module:overlay(0) from:0x0212243c kind:arm_call to:0x01fff148 module:itcm from:0x02122448 kind:arm_call to:0x01ff9a5c module:itcm @@ -663,7 +663,7 @@ from:0x021227a0 kind:arm_call to:0x02098e24 module:overlay(0) from:0x021227b8 kind:load to:0x02124528 add:0x8 module:overlay(37) from:0x021227e4 kind:arm_call to:0x01fff350 module:itcm from:0x02122804 kind:load to:0x027e0ce4 module:dtcm -from:0x0212280c kind:load to:0x020b4800 module:overlay(0) +from:0x0212280c kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02122814 kind:arm_call to:0x021227bc module:overlay(37) from:0x02122844 kind:arm_call to:0x02099b30 module:overlay(0) from:0x0212286c kind:arm_call to:0x0201b928 module:main @@ -678,7 +678,7 @@ from:0x02122968 kind:arm_call to:0x02016f54 module:main from:0x021229ac kind:arm_call to:0x01fff350 module:itcm from:0x021229d0 kind:arm_call to:0x01fff350 module:itcm from:0x021229e8 kind:load to:0x027e0ce4 module:dtcm -from:0x021229ec kind:load to:0x020b4800 module:overlay(0) +from:0x021229ec kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02122a14 kind:arm_call to:0x021229f4 module:overlay(37) from:0x02122ac0 kind:arm_call to:0x021221b4 module:overlay(37) from:0x02122acc kind:arm_call to:0x020168f0 module:main diff --git a/config/jp/arm9/overlays/ov040/relocs.txt b/config/jp/arm9/overlays/ov040/relocs.txt index bfed112b..cf693925 100644 --- a/config/jp/arm9/overlays/ov040/relocs.txt +++ b/config/jp/arm9/overlays/ov040/relocs.txt @@ -274,7 +274,7 @@ from:0x021271dc kind:arm_call to:0x021285dc module:overlay(40) from:0x02127220 kind:arm_call to:0x0208d298 module:overlay(0) from:0x0212722c kind:load to:0x027e09b8 module:dtcm from:0x02127230 kind:load to:0x027e0d34 module:dtcm -from:0x02127234 kind:load to:0x020b4800 module:overlay(0) +from:0x02127234 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0212723c kind:load to:0x027e0ce4 module:dtcm from:0x02127248 kind:load to:0x027e09a8 module:dtcm from:0x0212724c kind:load to:0x027e09bc module:dtcm @@ -351,7 +351,7 @@ from:0x02127f94 kind:arm_call to:0x01ffb6e4 module:itcm from:0x02127fa4 kind:arm_call to:0x02152c4c module:overlay(72) from:0x02127fb8 kind:arm_call to:0x02152c4c module:overlay(72) from:0x02127fd8 kind:load to:0x027e09a4 module:dtcm -from:0x02127fdc kind:load to:0x020b4800 module:overlay(0) +from:0x02127fdc kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02127fe4 kind:load to:0x027e0ce4 module:dtcm from:0x02128030 kind:arm_call to:0x01ff9638 module:itcm from:0x02128058 kind:arm_call to:0x01ffb6e4 module:itcm @@ -363,7 +363,7 @@ from:0x021281b0 kind:arm_call to:0x02081d10 module:overlay(0) from:0x021281cc kind:arm_call to:0x02072154 module:overlay(0) from:0x021281d8 kind:arm_call to:0x02029a4c module:main from:0x021281e4 kind:load to:0x027e09a4 module:dtcm -from:0x021281ec kind:load to:0x020b4800 module:overlay(0) +from:0x021281ec kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x021281f0 kind:load to:0x027e0ce4 module:dtcm from:0x021281f4 kind:load to:0x027e0cd8 module:dtcm from:0x0212822c kind:arm_call to:0x01fff350 module:itcm @@ -371,16 +371,16 @@ from:0x021282a0 kind:arm_call to:0x01ff9638 module:itcm from:0x021282c0 kind:arm_call to:0x01ffb6e4 module:itcm from:0x0212832c kind:arm_call to:0x0211c1a4 module:overlay(39) from:0x02128338 kind:load to:0x027e0ce4 module:dtcm -from:0x0212833c kind:load to:0x020b4800 module:overlay(0) +from:0x0212833c kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02128344 kind:load to:0x027e09b8 module:dtcm from:0x02128380 kind:arm_call to:0x01fff350 module:itcm from:0x0212839c kind:arm_call to:0x0211c200 module:overlay(39) from:0x021283a8 kind:load to:0x027e0ce4 module:dtcm -from:0x021283b0 kind:load to:0x020b4800 module:overlay(0) +from:0x021283b0 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x021283e4 kind:arm_call to:0x01fff350 module:itcm from:0x02128470 kind:arm_call to:0x0211c14c module:overlays(38,39) from:0x0212847c kind:load to:0x027e0ce4 module:dtcm -from:0x02128480 kind:load to:0x020b4800 module:overlay(0) +from:0x02128480 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x021284a4 kind:arm_call to:0x020749a4 module:overlay(0) from:0x021284c0 kind:arm_call to:0x0201447c module:main from:0x021284e4 kind:arm_call to:0x021280f4 module:overlay(40) @@ -392,13 +392,13 @@ from:0x02128540 kind:load to:0x0204b0aa module:main from:0x02128574 kind:arm_call to:0x01fff350 module:itcm from:0x021285c4 kind:arm_call to:0x01ffb714 module:itcm from:0x021285d0 kind:load to:0x027e0ce4 module:dtcm -from:0x021285d4 kind:load to:0x020b4800 module:overlay(0) +from:0x021285d4 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02128610 kind:arm_call to:0x01fff350 module:itcm from:0x02128654 kind:arm_call to:0x01fff350 module:itcm from:0x021286b8 kind:arm_call to:0x01ff9638 module:itcm from:0x021286c8 kind:arm_call to:0x01ffb6e4 module:itcm from:0x02128708 kind:load to:0x027e0ce4 module:dtcm -from:0x0212870c kind:load to:0x020b4800 module:overlay(0) +from:0x0212870c kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02128730 kind:arm_call to:0x020749a4 module:overlay(0) from:0x0212874c kind:arm_call to:0x0201447c module:main from:0x02128774 kind:arm_call to:0x0201b974 module:main diff --git a/config/jp/arm9/overlays/ov041/relocs.txt b/config/jp/arm9/overlays/ov041/relocs.txt index 3116cc84..09b20412 100644 --- a/config/jp/arm9/overlays/ov041/relocs.txt +++ b/config/jp/arm9/overlays/ov041/relocs.txt @@ -28,7 +28,7 @@ from:0x02125524 kind:arm_call_thumb to:0x0209ba14 module:overlay(0) from:0x0212553c kind:arm_call to:0x02126b78 module:overlay(41) from:0x02125560 kind:arm_call to:0x01fff350 module:itcm from:0x02125598 kind:load to:0x027e0ce4 module:dtcm -from:0x021255a0 kind:load to:0x020b4800 module:overlay(0) +from:0x021255a0 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x021255b0 kind:arm_call to:0x02126c04 module:overlay(41) from:0x021255e8 kind:load to:0x0212f884 module:overlay(41) from:0x02125668 kind:arm_call to:0x020c10c0 module:overlay(17) @@ -125,7 +125,7 @@ from:0x02126004 kind:load to:0x0212fac4 add:0x8 module:overlay(41) from:0x0212601c kind:arm_call to:0x02126b78 module:overlay(41) from:0x02126040 kind:arm_call to:0x01fff350 module:itcm from:0x02126078 kind:load to:0x027e0ce4 module:dtcm -from:0x02126080 kind:load to:0x020b4800 module:overlay(0) +from:0x02126080 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02126090 kind:arm_call to:0x02126c04 module:overlay(41) from:0x021260c8 kind:load to:0x0212fb3c module:overlay(41) from:0x02126148 kind:arm_call to:0x020c10c0 module:overlay(17) @@ -482,7 +482,7 @@ from:0x02129b8c kind:arm_call to:0x01fff350 module:itcm from:0x02129bb4 kind:arm_call to:0x02098dac module:overlay(0) from:0x02129bd4 kind:arm_call to:0x02098ba8 module:overlay(0) from:0x02129be0 kind:load to:0x027e0ce4 module:dtcm -from:0x02129be4 kind:load to:0x020b4800 module:overlay(0) +from:0x02129be4 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02129bec kind:load to:0x020b6ba4 module:overlay(0) from:0x02129c04 kind:arm_call to:0x02016f54 module:main from:0x02129c10 kind:arm_call to:0x02141664 module:overlay(70) @@ -1008,7 +1008,7 @@ from:0x0212dea8 kind:arm_call to:0x01fff350 module:itcm from:0x0212dee8 kind:arm_call to:0x01fff350 module:itcm from:0x0212df20 kind:load to:0x027e09b8 module:dtcm from:0x0212df24 kind:load to:0x027e0ce4 module:dtcm -from:0x0212df2c kind:load to:0x020b4800 module:overlay(0) +from:0x0212df2c kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0212df64 kind:arm_call to:0x0209ebf8 module:overlay(0) from:0x0212dfa0 kind:arm_call to:0x0209ebf8 module:overlay(0) from:0x0212dfb4 kind:load to:0x02130350 module:overlay(41) diff --git a/config/jp/arm9/overlays/ov045/relocs.txt b/config/jp/arm9/overlays/ov045/relocs.txt index d5db6e75..9b4a00ef 100644 --- a/config/jp/arm9/overlays/ov045/relocs.txt +++ b/config/jp/arm9/overlays/ov045/relocs.txt @@ -106,7 +106,7 @@ from:0x02125d48 kind:arm_call to:0x021253cc module:overlay(45) from:0x02125d78 kind:arm_call to:0x0207f780 module:overlay(0) from:0x02125d90 kind:arm_call to:0x0207f83c module:overlay(0) from:0x02125da0 kind:load to:0x027e0ce4 module:dtcm -from:0x02125da8 kind:load to:0x020b4800 module:overlay(0) +from:0x02125da8 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02125dac kind:load to:0x027e09c0 module:dtcm from:0x02125dc8 kind:arm_call to:0x02079d50 module:overlay(0) from:0x02125df4 kind:arm_call to:0x02017e24 module:main diff --git a/config/jp/arm9/overlays/ov047/symbols.txt b/config/jp/arm9/overlays/ov047/symbols.txt index ea2bb1ad..2b9388e0 100644 --- a/config/jp/arm9/overlays/ov047/symbols.txt +++ b/config/jp/arm9/overlays/ov047/symbols.txt @@ -1,7 +1,7 @@ _ZN29UnkStruct_027e0cd8_0C_Base_98C1Ev kind:function(arm,size=0x64) addr:0x02131ec0 _ZN29UnkStruct_027e0cd8_0C_Base_98D1Ev kind:function(arm,size=0x28) addr:0x02131f24 func_ov047_02131f4c kind:function(arm,size=0x30) addr:0x02131f4c -func_ov047_02131f7c kind:function(arm,size=0x200) addr:0x02131f7c +_ZN29UnkStruct_027e0cd8_0C_Base_9819func_ov047_0213055cEv kind:function(arm,size=0x200) addr:0x02131f7c func_ov047_0213217c kind:function(arm,size=0x39c) addr:0x0213217c func_ov047_02132518 kind:function(arm,size=0x3d8) addr:0x02132518 func_ov047_021328f0 kind:function(arm,size=0x280) addr:0x021328f0 diff --git a/config/jp/arm9/overlays/ov049/relocs.txt b/config/jp/arm9/overlays/ov049/relocs.txt index 9fbb4e09..efda2369 100644 --- a/config/jp/arm9/overlays/ov049/relocs.txt +++ b/config/jp/arm9/overlays/ov049/relocs.txt @@ -466,13 +466,13 @@ from:0x02135d00 kind:arm_call to:0x02134134 module:overlay(49) from:0x02135d14 kind:arm_call to:0x01fff350 module:itcm from:0x02135d30 kind:load to:0x020da050 module:overlay(24) from:0x02135d34 kind:load to:0x027e0ce4 module:dtcm -from:0x02135d3c kind:load to:0x020b4800 module:overlay(0) +from:0x02135d3c kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02135d90 kind:arm_call to:0x01fff350 module:itcm from:0x02135dbc kind:arm_call to:0x02099dfc module:overlay(0) from:0x02135de8 kind:arm_call to:0x01fff350 module:itcm from:0x02135e08 kind:load to:0x020da050 module:overlay(24) from:0x02135e0c kind:load to:0x027e0ce4 module:dtcm -from:0x02135e14 kind:load to:0x020b4800 module:overlay(0) +from:0x02135e14 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02135e30 kind:load to:0x027e0d40 module:dtcm from:0x02135e44 kind:load to:0x027e0d40 module:dtcm from:0x02135e50 kind:arm_call to:0x02135e34 module:overlay(49) diff --git a/config/jp/arm9/overlays/ov051/relocs.txt b/config/jp/arm9/overlays/ov051/relocs.txt index d7669a5a..18b06859 100644 --- a/config/jp/arm9/overlays/ov051/relocs.txt +++ b/config/jp/arm9/overlays/ov051/relocs.txt @@ -470,7 +470,7 @@ from:0x021370c4 kind:arm_call to:0x01fff458 module:itcm from:0x021370d4 kind:arm_call to:0x02136ff8 module:overlay(51) from:0x021370e4 kind:arm_call to:0x01fff350 module:itcm from:0x02137100 kind:load to:0x027e0ce4 module:dtcm -from:0x02137104 kind:load to:0x020b4800 module:overlay(0) +from:0x02137104 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x021371b4 kind:arm_call to:0x01fff148 module:itcm from:0x021371c0 kind:arm_call to:0x01ff9a5c module:itcm from:0x021371dc kind:load to:0x0203feb0 module:main diff --git a/config/jp/arm9/overlays/ov057/relocs.txt b/config/jp/arm9/overlays/ov057/relocs.txt index 5c61a0dd..a65f3bdf 100644 --- a/config/jp/arm9/overlays/ov057/relocs.txt +++ b/config/jp/arm9/overlays/ov057/relocs.txt @@ -351,7 +351,7 @@ from:0x0213d0b4 kind:arm_call to:0x0213cf9c module:overlay(57) from:0x0213d0bc kind:arm_call to:0x0213d02c module:overlay(57) from:0x0213d0cc kind:arm_call to:0x01fff350 module:itcm from:0x0213d0ec kind:load to:0x027e0ce4 module:dtcm -from:0x0213d0f0 kind:load to:0x020b4800 module:overlay(0) +from:0x0213d0f0 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0213d104 kind:load to:0x02058e24 module:overlay(0) from:0x0213d118 kind:arm_call_thumb to:0x0209b2c8 module:overlay(0) from:0x0213d120 kind:arm_call to:0x02011ff4 module:main diff --git a/config/jp/arm9/overlays/ov058/relocs.txt b/config/jp/arm9/overlays/ov058/relocs.txt index 7665d010..77937a83 100644 --- a/config/jp/arm9/overlays/ov058/relocs.txt +++ b/config/jp/arm9/overlays/ov058/relocs.txt @@ -1556,7 +1556,7 @@ from:0x0214f258 kind:arm_call to:0x0214e6fc module:overlay(58) from:0x0214f268 kind:arm_call to:0x0214e8c4 module:overlay(58) from:0x0214f298 kind:arm_call to:0x01fff350 module:itcm from:0x0214f2b8 kind:load to:0x020da050 module:overlay(24) -from:0x0214f2bc kind:load to:0x020b4800 module:overlay(0) +from:0x0214f2bc kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0214f2c4 kind:load to:0x027e0ce4 module:dtcm from:0x0214f2d4 kind:load to:0x027e0d4c module:dtcm from:0x0214f2e8 kind:load to:0x027e0d4c module:dtcm diff --git a/config/jp/arm9/overlays/ov059/relocs.txt b/config/jp/arm9/overlays/ov059/relocs.txt index 4f46956d..f830a58b 100644 --- a/config/jp/arm9/overlays/ov059/relocs.txt +++ b/config/jp/arm9/overlays/ov059/relocs.txt @@ -27,7 +27,7 @@ from:0x02159f0c kind:arm_call to:0x01fff350 module:itcm from:0x02159f24 kind:arm_call to:0x0215a6f4 module:overlay(59) from:0x02159f30 kind:arm_call to:0x02159d38 module:overlay(59) from:0x02159f3c kind:load to:0x027e0ce4 module:dtcm -from:0x02159f40 kind:load to:0x020b4800 module:overlay(0) +from:0x02159f40 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02159f60 kind:arm_call to:0x01fff3b4 module:itcm from:0x02159f80 kind:arm_call to:0x02083434 module:overlay(0) from:0x02159f88 kind:load to:0x027e0ce4 module:dtcm @@ -45,7 +45,7 @@ from:0x0215a170 kind:arm_call to:0x01fff350 module:itcm from:0x0215a180 kind:arm_call to:0x01fff350 module:itcm from:0x0215a1ac kind:arm_call to:0x01fff350 module:itcm from:0x0215a1d4 kind:load to:0x027e0ce4 module:dtcm -from:0x0215a1dc kind:load to:0x020b4800 module:overlay(0) +from:0x0215a1dc kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0215a290 kind:arm_call to:0x0215a3e8 module:overlay(59) from:0x0215a298 kind:arm_call to:0x0215a2a4 module:overlay(59) from:0x0215a31c kind:arm_call to:0x0215a3e8 module:overlay(59) @@ -313,7 +313,7 @@ from:0x0215c890 kind:arm_call to:0x02162910 module:overlay(59) from:0x0215c89c kind:load to:0x027e0ce4 module:dtcm from:0x0215c8a0 kind:load to:0x027e0d5c module:dtcm from:0x0215c8a8 kind:load to:0x027e09b8 module:dtcm -from:0x0215c8b0 kind:load to:0x020b4800 module:overlay(0) +from:0x0215c8b0 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0215c914 kind:load to:0x021654b8 module:overlay(59) from:0x0215c930 kind:arm_call to:0x01fff3b4 module:itcm from:0x0215c950 kind:arm_call to:0x02015018 module:main @@ -448,7 +448,7 @@ from:0x0215db44 kind:arm_call to:0x01fff350 module:itcm from:0x0215db6c kind:arm_call to:0x01fff350 module:itcm from:0x0215dba4 kind:arm_call to:0x01fff350 module:itcm from:0x0215dbc4 kind:load to:0x027e0ce4 module:dtcm -from:0x0215dbcc kind:load to:0x020b4800 module:overlay(0) +from:0x0215dbcc kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0215dbf4 kind:arm_call to:0x0201696c module:main from:0x0215dcac kind:arm_call to:0x0207fb10 module:overlay(0) from:0x0215dcd0 kind:arm_call to:0x020731e8 module:overlay(0) @@ -786,7 +786,7 @@ from:0x02160c68 kind:arm_call to:0x02099c78 module:overlay(0) from:0x02160c78 kind:arm_call to:0x01fff350 module:itcm from:0x02160c94 kind:load to:0x020b69b8 module:overlay(0) from:0x02160ca0 kind:load to:0x027e09b8 module:dtcm -from:0x02160ca8 kind:load to:0x020b4800 module:overlay(0) +from:0x02160ca8 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02160cac kind:load to:0x027e0ce4 module:dtcm from:0x02160d24 kind:arm_call to:0x020749a4 module:overlay(0) from:0x02160d80 kind:arm_call to:0x0208d298 module:overlay(0) @@ -902,7 +902,7 @@ from:0x02162070 kind:arm_call to:0x01fff350 module:itcm from:0x02162098 kind:arm_call to:0x01fff350 module:itcm from:0x021620c4 kind:arm_call to:0x01fff350 module:itcm from:0x021620e4 kind:load to:0x027e0ce4 module:dtcm -from:0x021620ec kind:load to:0x020b4800 module:overlay(0) +from:0x021620ec kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x021620f8 kind:arm_call_thumb to:0x02059154 module:overlay(0) from:0x02162100 kind:arm_call to:0x02011ff4 module:main from:0x02162118 kind:arm_call to:0x0207cd78 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov060/relocs.txt b/config/jp/arm9/overlays/ov060/relocs.txt index cca3ca26..7c1b73a2 100644 --- a/config/jp/arm9/overlays/ov060/relocs.txt +++ b/config/jp/arm9/overlays/ov060/relocs.txt @@ -585,7 +585,7 @@ from:0x0215f8c4 kind:arm_call to:0x020799cc module:overlay(0) from:0x0215f8e8 kind:arm_call to:0x01fff350 module:itcm from:0x0215f934 kind:load to:0x027e09bc module:dtcm from:0x0215f938 kind:load to:0x027e0ce4 module:dtcm -from:0x0215f940 kind:load to:0x020b4800 module:overlay(0) +from:0x0215f940 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0215f950 kind:arm_call to:0x020f8fcc module:overlay(31) from:0x0215f984 kind:arm_call to:0x0209b7c4 module:overlay(0) from:0x0215f990 kind:arm_call to:0x0205bd68 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov063/relocs.txt b/config/jp/arm9/overlays/ov063/relocs.txt index abcaa683..c4abdab5 100644 --- a/config/jp/arm9/overlays/ov063/relocs.txt +++ b/config/jp/arm9/overlays/ov063/relocs.txt @@ -793,7 +793,7 @@ from:0x0215fe94 kind:arm_call to:0x0215fe9c module:overlay(63) from:0x0215fef0 kind:arm_call to:0x01fff350 module:itcm from:0x0215ff24 kind:load to:0x02164468 module:overlay(63) from:0x0215ff28 kind:load to:0x027e0ce4 module:dtcm -from:0x0215ff2c kind:load to:0x020b4800 module:overlay(0) +from:0x0215ff2c kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0215ff48 kind:arm_call to:0x02018bc4 module:main from:0x0215ff5c kind:arm_call to:0x020c6dd0 module:overlay(24) from:0x0215ff64 kind:arm_call to:0x020c6c5c module:overlay(24) @@ -926,7 +926,7 @@ from:0x02160b34 kind:load to:0x020b92ed module:overlays(8,9,12,13,15) from:0x02160b98 kind:arm_call to:0x01fff350 module:itcm from:0x02160bb0 kind:arm_call to:0x021472b8 module:overlay(58) from:0x02160bd0 kind:load to:0x027e0ce4 module:dtcm -from:0x02160bd4 kind:load to:0x020b4800 module:overlay(0) +from:0x02160bd4 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02160bd8 kind:load to:0x02164454 module:overlay(63) from:0x02160be4 kind:load to:0x02160be8 module:overlay(63) from:0x02160c1c kind:arm_call_thumb to:0x020b99e4 module:overlay(12) diff --git a/config/jp/arm9/overlays/ov066/relocs.txt b/config/jp/arm9/overlays/ov066/relocs.txt index 8e9ad951..c0e8aee9 100644 --- a/config/jp/arm9/overlays/ov066/relocs.txt +++ b/config/jp/arm9/overlays/ov066/relocs.txt @@ -482,7 +482,7 @@ from:0x0215d108 kind:arm_call to:0x02068ffc module:overlay(0) from:0x0215d124 kind:arm_call to:0x02068ffc module:overlay(0) from:0x0215d140 kind:arm_call to:0x02068ffc module:overlay(0) from:0x0215d15c kind:load to:0x027e0ce4 module:dtcm -from:0x0215d160 kind:load to:0x020b4800 module:overlay(0) +from:0x0215d160 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0215d168 kind:load to:0x020b684c module:overlay(0) from:0x0215d16c kind:load to:0x0215f518 module:overlay(66) from:0x0215d170 kind:load to:0x0204b15c module:main @@ -516,12 +516,12 @@ from:0x0215d630 kind:arm_call to:0x01fff350 module:itcm from:0x0215d650 kind:arm_call to:0x01fff3b4 module:itcm from:0x0215d660 kind:arm_call to:0x0215e54c module:overlay(66) from:0x0215d66c kind:load to:0x027e0ce4 module:dtcm -from:0x0215d674 kind:load to:0x020b4800 module:overlay(0) +from:0x0215d674 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0215d6a4 kind:arm_call to:0x01fff350 module:itcm from:0x0215d6c4 kind:arm_call to:0x01fff3b4 module:itcm from:0x0215d6d4 kind:arm_call to:0x0215e5a8 module:overlay(66) from:0x0215d6e0 kind:load to:0x027e0ce4 module:dtcm -from:0x0215d6e8 kind:load to:0x020b4800 module:overlay(0) +from:0x0215d6e8 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0215d6f8 kind:arm_call to:0x0201662c module:main from:0x0215d700 kind:arm_call to:0x0215abb4 module:overlay(66) from:0x0215d708 kind:arm_call to:0x0215abb4 module:overlay(66) diff --git a/config/jp/arm9/overlays/ov068/relocs.txt b/config/jp/arm9/overlays/ov068/relocs.txt index 7e58450d..000e432a 100644 --- a/config/jp/arm9/overlays/ov068/relocs.txt +++ b/config/jp/arm9/overlays/ov068/relocs.txt @@ -54,7 +54,7 @@ from:0x0215a218 kind:arm_call to:0x01fff350 module:itcm from:0x0215a240 kind:arm_call to:0x0215f4fc module:overlay(68) from:0x0215a24c kind:arm_call to:0x0215fcc8 module:overlay(68) from:0x0215a258 kind:load to:0x027e0ce4 module:dtcm -from:0x0215a260 kind:load to:0x020b4800 module:overlay(0) +from:0x0215a260 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0215a264 kind:load to:0x027e0d6c module:dtcm from:0x0215a268 kind:load to:0x02166054 module:overlay(68) from:0x0215a290 kind:arm_call to:0x01fff3b4 module:itcm @@ -640,7 +640,7 @@ from:0x0215f618 kind:load to:0x027e09b8 module:dtcm from:0x0215f64c kind:arm_call to:0x01fff350 module:itcm from:0x0215f670 kind:arm_call to:0x02099dd4 module:overlay(0) from:0x0215f67c kind:load to:0x027e0ce4 module:dtcm -from:0x0215f680 kind:load to:0x020b4800 module:overlay(0) +from:0x0215f680 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0215f6b4 kind:arm_call to:0x020d5e50 module:overlay(24) from:0x0215f6e0 kind:load to:0x027e0cfc module:dtcm from:0x0215f708 kind:load to:0x01ffc6d4 module:itcm diff --git a/config/jp/arm9/overlays/ov070/symbols.txt b/config/jp/arm9/overlays/ov070/symbols.txt index dc4b16d5..7d95488e 100644 --- a/config/jp/arm9/overlays/ov070/symbols.txt +++ b/config/jp/arm9/overlays/ov070/symbols.txt @@ -503,7 +503,7 @@ _ZN23MapObjectProfileUnkPTFLC1Ev kind:function(arm,size=0xa8) addr:0x0214d7b4 _ZN16MapObjectUnkPTFLC1Ev kind:function(arm,size=0x80) addr:0x0214d85c _ZN16MapObjectUnkPTFL19func_ov070_0214ba34Ev kind:function(arm,size=0x144) addr:0x0214d8dc _ZN16MapObjectUnkPTFL19func_ov070_0214bb78Ev kind:function(arm,size=0x58) addr:0x0214da20 -_ZN16MapObjectUnkPTFL19func_ov070_0214bbd0Ev kind:function(arm,size=0x178) addr:0x0214da78 +_ZN16MapObjectUnkPTFL19func_ov070_0214bbd0Esb kind:function(arm,size=0x178) addr:0x0214da78 _ZN16MapObjectUnkPTFL19func_ov070_0214bd48Ev kind:function(arm,size=0x48) addr:0x0214dbf0 _ZN16MapObjectUnkPTFL19func_ov070_0214bd90Ev kind:function(arm,size=0x1c8) addr:0x0214dc38 _ZN16MapObjectUnkPTFL19func_ov070_0214bf58Ev kind:function(arm,size=0x4) addr:0x0214de00 diff --git a/config/jp/arm9/overlays/ov071/relocs.txt b/config/jp/arm9/overlays/ov071/relocs.txt index f31dec6e..f69beaa7 100644 --- a/config/jp/arm9/overlays/ov071/relocs.txt +++ b/config/jp/arm9/overlays/ov071/relocs.txt @@ -1554,7 +1554,7 @@ from:0x021613b4 kind:arm_call to:0x01fff350 module:itcm from:0x021613f4 kind:arm_call to:0x0212b154 module:overlays(26,42) from:0x02161404 kind:arm_call to:0x01fff350 module:itcm from:0x02161420 kind:load to:0x027e0ce4 module:dtcm -from:0x02161428 kind:load to:0x020b4800 module:overlay(0) +from:0x02161428 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02161438 kind:load to:0x027e0d70 module:dtcm from:0x0216144c kind:load to:0x027e0d70 module:dtcm from:0x02161458 kind:load to:0x021673c8 module:overlay(71) diff --git a/config/jp/arm9/overlays/ov072/relocs.txt b/config/jp/arm9/overlays/ov072/relocs.txt index f097bb73..789f1a81 100644 --- a/config/jp/arm9/overlays/ov072/relocs.txt +++ b/config/jp/arm9/overlays/ov072/relocs.txt @@ -106,7 +106,7 @@ from:0x02153658 kind:load to:0x0204b164 module:main from:0x0215365c kind:load to:0x027e09a8 module:dtcm from:0x02153668 kind:load to:0x020b684c module:overlay(0) from:0x0215366c kind:load to:0x027e0ce4 module:dtcm -from:0x02153674 kind:load to:0x020b4800 module:overlay(0) +from:0x02153674 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02153678 kind:load to:0x0215455c module:overlay(72) from:0x021536ac kind:arm_call to:0x02074994 module:overlay(0) from:0x021536e8 kind:arm_call to:0x02079d50 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov073/relocs.txt b/config/jp/arm9/overlays/ov073/relocs.txt index a82e72dd..e1587a1c 100644 --- a/config/jp/arm9/overlays/ov073/relocs.txt +++ b/config/jp/arm9/overlays/ov073/relocs.txt @@ -1822,7 +1822,7 @@ from:0x02165880 kind:load to:0x020ac6e4 module:overlay(0) from:0x02165884 kind:load to:0x020ac6ec module:overlay(0) from:0x02165888 kind:load to:0x020ac6e8 module:overlay(0) from:0x0216588c kind:load to:0x027e0ce4 module:dtcm -from:0x02165890 kind:load to:0x020b4800 module:overlay(0) +from:0x02165890 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02165898 kind:load to:0x020ac6bc module:overlay(0) from:0x0216589c kind:load to:0x020ac6c0 module:overlay(0) from:0x021658a0 kind:load to:0x020ac6c4 module:overlay(0) @@ -1843,7 +1843,7 @@ from:0x02165a60 kind:load to:0x020ac6d8 module:overlay(0) from:0x02165a64 kind:load to:0x020ac6d4 module:overlay(0) from:0x02165a68 kind:load to:0x027e0ce0 module:dtcm from:0x02165a6c kind:load to:0x027e0ce4 module:dtcm -from:0x02165a74 kind:load to:0x020b4800 module:overlay(0) +from:0x02165a74 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02165a78 kind:load to:0x020ac6b8 module:overlay(0) from:0x02165a7c kind:load to:0x020ac6e4 module:overlay(0) from:0x02165a80 kind:load to:0x020ac6ec module:overlay(0) @@ -1864,7 +1864,7 @@ from:0x02165c2c kind:arm_call to:0x01ffb6e4 module:itcm from:0x02165c38 kind:load to:0x020ac6d8 module:overlay(0) from:0x02165c3c kind:load to:0x020ac6d4 module:overlay(0) from:0x02165c40 kind:load to:0x027e0ce0 module:dtcm -from:0x02165c44 kind:load to:0x020b4800 module:overlay(0) +from:0x02165c44 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02165c4c kind:load to:0x027e0ce4 module:dtcm from:0x02165c50 kind:load to:0x020ac6bc module:overlay(0) from:0x02165c54 kind:load to:0x020ac6c0 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov074/relocs.txt b/config/jp/arm9/overlays/ov074/relocs.txt index f99c8638..5ebe4b7f 100644 --- a/config/jp/arm9/overlays/ov074/relocs.txt +++ b/config/jp/arm9/overlays/ov074/relocs.txt @@ -1280,7 +1280,7 @@ from:0x0215eb88 kind:arm_call to:0x02099824 module:overlay(0) from:0x0215eba0 kind:arm_call to:0x020731e8 module:overlay(0) from:0x0215ebbc kind:arm_call to:0x01fff350 module:itcm from:0x0215ebdc kind:load to:0x027e0ce4 module:dtcm -from:0x0215ebe4 kind:load to:0x020b4800 module:overlay(0) +from:0x0215ebe4 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0215ebe8 kind:load to:0x027e09a8 module:dtcm from:0x0215ebf4 kind:arm_call_thumb to:0x02059154 module:overlay(0) from:0x0215ebfc kind:arm_call to:0x02011ff4 module:main @@ -1858,7 +1858,7 @@ from:0x02163dd4 kind:arm_call to:0x01ffb428 module:itcm from:0x02163df0 kind:arm_call to:0x01ffb428 module:itcm from:0x02163e2c kind:arm_call to:0x01fff350 module:itcm from:0x02163e48 kind:load to:0x027e0ce4 module:dtcm -from:0x02163e4c kind:load to:0x020b4800 module:overlay(0) +from:0x02163e4c kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02163e78 kind:arm_call to:0x02079eec module:overlay(0) from:0x02163e80 kind:load to:0x027e09bc module:dtcm from:0x02163e8c kind:arm_call to:0x020990b4 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov075/relocs.txt b/config/jp/arm9/overlays/ov075/relocs.txt index c22f773b..1e3d6922 100644 --- a/config/jp/arm9/overlays/ov075/relocs.txt +++ b/config/jp/arm9/overlays/ov075/relocs.txt @@ -381,11 +381,11 @@ from:0x02156208 kind:arm_call to:0x0209915c module:overlay(0) from:0x02156244 kind:load to:0x02164aa0 add:0x8 module:overlay(75) from:0x02156278 kind:arm_call to:0x01fff350 module:itcm from:0x02156298 kind:load to:0x027e0ce4 module:dtcm -from:0x021562a0 kind:load to:0x020b4800 module:overlay(0) +from:0x021562a0 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x021562d0 kind:arm_call to:0x01fff350 module:itcm from:0x02156308 kind:arm_call to:0x01fff350 module:itcm from:0x02156328 kind:load to:0x027e0ce4 module:dtcm -from:0x02156330 kind:load to:0x020b4800 module:overlay(0) +from:0x02156330 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02156344 kind:arm_call to:0x02098c90 module:overlay(0) from:0x02156358 kind:load to:0x020b6ba4 module:overlay(0) from:0x02156370 kind:arm_call to:0x0209a2d0 module:overlay(0) @@ -1795,7 +1795,7 @@ from:0x02163028 kind:arm_call to:0x01ff93c0 module:itcm from:0x0216303c kind:arm_call to:0x01ffb974 module:itcm from:0x02163050 kind:arm_call to:0x01ffb974 module:itcm from:0x021630b4 kind:arm_call to:0x020157b8 module:main -from:0x021630c0 kind:load to:0x020b4800 module:overlay(0) +from:0x021630c0 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x021630c8 kind:load to:0x027e0ce4 module:dtcm from:0x021630cc kind:load to:0x027e0ce0 module:dtcm from:0x02163104 kind:arm_call to:0x01fff350 module:itcm @@ -1805,7 +1805,7 @@ from:0x02163170 kind:arm_call to:0x01ff93c0 module:itcm from:0x02163184 kind:arm_call to:0x01ffb974 module:itcm from:0x02163198 kind:arm_call to:0x01ffb974 module:itcm from:0x021631d8 kind:load to:0x027e0ce4 module:dtcm -from:0x021631dc kind:load to:0x020b4800 module:overlay(0) +from:0x021631dc kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x021631e4 kind:load to:0x027e0ce0 module:dtcm from:0x02163230 kind:arm_call to:0x01ffb428 module:itcm from:0x02163240 kind:load to:0x020ac6a8 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov078/relocs.txt b/config/jp/arm9/overlays/ov078/relocs.txt index 06c49e89..aa611a51 100644 --- a/config/jp/arm9/overlays/ov078/relocs.txt +++ b/config/jp/arm9/overlays/ov078/relocs.txt @@ -856,7 +856,7 @@ from:0x0215e0dc kind:load to:0x0203feb0 module:main from:0x0215e110 kind:arm_call to:0x01fff350 module:itcm from:0x0215e140 kind:arm_call to:0x01fff350 module:itcm from:0x0215e164 kind:load to:0x027e0ce4 module:dtcm -from:0x0215e16c kind:load to:0x020b4800 module:overlay(0) +from:0x0215e16c kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0215e1ac kind:arm_call_thumb to:0x01ffa184 module:itcm from:0x0215e1d8 kind:arm_call_thumb to:0x01ffa1a0 module:itcm from:0x0215e1ec kind:arm_call to:0x01ffa60c module:itcm @@ -1027,7 +1027,7 @@ from:0x0215f388 kind:load to:0x027e0ce0 module:dtcm from:0x0215f38c kind:load to:0x027e0cd8 module:dtcm from:0x0215f390 kind:load to:0x027e09b8 module:dtcm from:0x0215f394 kind:load to:0x027e0ce4 module:dtcm -from:0x0215f39c kind:load to:0x020b4800 module:overlay(0) +from:0x0215f39c kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0215f3a0 kind:load to:0x020ac694 module:overlay(0) from:0x0215f3c0 kind:load to:0x020ac6f4 module:overlay(0) from:0x0215f3c4 kind:load to:0x020ac6f0 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov080/relocs.txt b/config/jp/arm9/overlays/ov080/relocs.txt index 305d5107..3606cbd0 100644 --- a/config/jp/arm9/overlays/ov080/relocs.txt +++ b/config/jp/arm9/overlays/ov080/relocs.txt @@ -920,7 +920,7 @@ from:0x0215c2d0 kind:arm_call to:0x0215c380 module:overlay(80) from:0x0215c38c kind:arm_call to:0x0215c434 module:overlay(80) from:0x0215c40c kind:arm_call to:0x01fff350 module:itcm from:0x0215c428 kind:load to:0x027e0ce4 module:dtcm -from:0x0215c430 kind:load to:0x020b4800 module:overlay(0) +from:0x0215c430 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0215c534 kind:arm_call to:0x01fff3b4 module:itcm from:0x0215c584 kind:load to:0x027e0ce4 module:dtcm from:0x0215c5dc kind:arm_call to:0x0215c518 module:overlay(80) @@ -1071,7 +1071,7 @@ from:0x0215e1ac kind:arm_call to:0x01fff350 module:itcm from:0x0215e1d8 kind:arm_call to:0x0215f2a8 module:overlay(80) from:0x0215e1e8 kind:arm_call to:0x01fff350 module:itcm from:0x0215e204 kind:load to:0x027e0ce4 module:dtcm -from:0x0215e20c kind:load to:0x020b4800 module:overlay(0) +from:0x0215e20c kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0215e230 kind:arm_call to:0x020dafbc module:overlay(31) from:0x0215e23c kind:arm_call to:0x01fff3b4 module:itcm from:0x0215e248 kind:arm_call to:0x02099c78 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov081/relocs.txt b/config/jp/arm9/overlays/ov081/relocs.txt index 5574948f..2fe5d8bc 100644 --- a/config/jp/arm9/overlays/ov081/relocs.txt +++ b/config/jp/arm9/overlays/ov081/relocs.txt @@ -90,7 +90,7 @@ from:0x0215392c kind:arm_call to:0x01fff498 module:itcm from:0x02153938 kind:arm_call to:0x02154530 module:overlay(81) from:0x02153944 kind:arm_call to:0x02153148 module:overlay(81) from:0x02153950 kind:load to:0x027e0ce4 module:dtcm -from:0x02153958 kind:load to:0x020b4800 module:overlay(0) +from:0x02153958 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0215395c kind:load to:0x027e0ce0 module:dtcm from:0x02153960 kind:load to:0x027e0ce8 module:dtcm from:0x0215399c kind:arm_call to:0x02152e8c module:overlay(81) diff --git a/config/jp/arm9/overlays/ov083/relocs.txt b/config/jp/arm9/overlays/ov083/relocs.txt index e3fbdaec..493e5897 100644 --- a/config/jp/arm9/overlays/ov083/relocs.txt +++ b/config/jp/arm9/overlays/ov083/relocs.txt @@ -226,11 +226,11 @@ from:0x02156b44 kind:load to:0x0203feb0 module:main from:0x02156b70 kind:arm_call to:0x01fff350 module:itcm from:0x02156b8c kind:arm_call to:0x0215de1c module:overlay(83) from:0x02156b98 kind:load to:0x027e0ce4 module:dtcm -from:0x02156ba0 kind:load to:0x020b4800 module:overlay(0) +from:0x02156ba0 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02156bcc kind:arm_call to:0x01fff350 module:itcm from:0x02156be8 kind:arm_call to:0x0215dd44 module:overlay(83) from:0x02156bf4 kind:load to:0x027e0ce4 module:dtcm -from:0x02156bfc kind:load to:0x020b4800 module:overlay(0) +from:0x02156bfc kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02156c28 kind:arm_call to:0x01ffaf74 module:itcm from:0x02156c54 kind:arm_call to:0x020a1684 module:overlay(0) from:0x02156c70 kind:arm_call to:0x020a1684 module:overlay(0) @@ -312,7 +312,7 @@ from:0x021579f8 kind:load to:0x0215f818 module:overlay(83) from:0x021579fc kind:load to:0x027e09b8 module:dtcm from:0x02157a00 kind:load to:0x020b69b8 module:overlay(0) from:0x02157a04 kind:load to:0x027e0d34 module:dtcm -from:0x02157a0c kind:load to:0x020b4800 module:overlay(0) +from:0x02157a0c kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02157a10 kind:load to:0x027e0ce4 module:dtcm from:0x02157a14 kind:load to:0x027e09ac module:dtcm from:0x02157a84 kind:arm_call to:0x020a9744 module:overlay(0) @@ -390,7 +390,7 @@ from:0x02158540 kind:arm_call to:0x02073da8 module:overlay(0) from:0x02158554 kind:load to:0x027e09b8 module:dtcm from:0x02158558 kind:load to:0x020b69b8 module:overlay(0) from:0x0215855c kind:load to:0x027e0d34 module:dtcm -from:0x02158564 kind:load to:0x020b4800 module:overlay(0) +from:0x02158564 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02158568 kind:load to:0x027e0ce4 module:dtcm from:0x0215856c kind:load to:0x027e09ac module:dtcm from:0x021585dc kind:arm_call to:0x020a9744 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov084/relocs.txt b/config/jp/arm9/overlays/ov084/relocs.txt index 9bd224c7..397e91b7 100644 --- a/config/jp/arm9/overlays/ov084/relocs.txt +++ b/config/jp/arm9/overlays/ov084/relocs.txt @@ -256,7 +256,7 @@ from:0x0215550c kind:load to:0x02164cd0 module:overlay(84) from:0x02155510 kind:load to:0x027e09c0 module:dtcm from:0x02155540 kind:arm_call to:0x01fff350 module:itcm from:0x02155564 kind:load to:0x027e0ce4 module:dtcm -from:0x0215556c kind:load to:0x020b4800 module:overlay(0) +from:0x0215556c kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x021555a0 kind:arm_call to:0x01ffb428 module:itcm from:0x021555c0 kind:arm_call to:0x020db39c module:overlay(31) from:0x021555e4 kind:arm_call to:0x020798e8 module:overlay(0) @@ -344,7 +344,7 @@ from:0x021562a8 kind:arm_call to:0x02163180 module:overlay(84) from:0x021562e0 kind:arm_call to:0x02098ba8 module:overlay(0) from:0x021562f0 kind:load to:0x027e0cd8 module:dtcm from:0x021562f4 kind:load to:0x027e0ce4 module:dtcm -from:0x021562f8 kind:load to:0x020b4800 module:overlay(0) +from:0x021562f8 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02156300 kind:load to:0x0204b164 module:main from:0x02156304 kind:load to:0x020b6ba4 module:overlay(0) from:0x02156330 kind:arm_call to:0x02156118 module:overlay(84) @@ -575,7 +575,7 @@ from:0x021587bc kind:arm_call to:0x0215b850 module:overlay(84) from:0x021587dc kind:arm_call to:0x020984b4 module:overlay(0) from:0x02158870 kind:arm_call to:0x02157a24 module:overlay(84) from:0x0215889c kind:load to:0x027e0ce4 module:dtcm -from:0x021588a0 kind:load to:0x020b4800 module:overlay(0) +from:0x021588a0 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x021588a8 kind:load to:0x0204b164 module:main from:0x021588c4 kind:arm_call to:0x021577d8 module:overlay(84) from:0x02158904 kind:arm_call to:0x020984b4 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov087/relocs.txt b/config/jp/arm9/overlays/ov087/relocs.txt index fa5b07d7..4ef7a2dc 100644 --- a/config/jp/arm9/overlays/ov087/relocs.txt +++ b/config/jp/arm9/overlays/ov087/relocs.txt @@ -476,7 +476,7 @@ from:0x0215aebc kind:arm_call to:0x02098dac module:overlay(0) from:0x0215af04 kind:arm_call to:0x02098ba8 module:overlay(0) from:0x0215af18 kind:arm_call to:0x02152ed0 module:overlay(85) from:0x0215af24 kind:load to:0x027e0ce4 module:dtcm -from:0x0215af2c kind:load to:0x020b4800 module:overlay(0) +from:0x0215af2c kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0215af30 kind:load to:0x027e09bc module:dtcm from:0x0215af34 kind:load to:0x020b6ba4 module:overlay(0) from:0x0215af5c kind:arm_call to:0x02098dac module:overlay(0) @@ -487,7 +487,7 @@ from:0x0215afd8 kind:load to:0x0207a1e0 module:overlay(0) from:0x0215b010 kind:arm_call to:0x01fff350 module:itcm from:0x0215b058 kind:arm_call to:0x01fff350 module:itcm from:0x0215b078 kind:load to:0x027e0ce4 module:dtcm -from:0x0215b080 kind:load to:0x020b4800 module:overlay(0) +from:0x0215b080 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0215b248 kind:load to:0x0204b164 module:main from:0x0215b2ec kind:arm_call to:0x01ffb6e4 module:itcm from:0x0215b334 kind:arm_call to:0x01ffb6e4 module:itcm @@ -617,7 +617,7 @@ from:0x0215ce84 kind:arm_call to:0x01fff350 module:itcm from:0x0215cea0 kind:arm_call to:0x02154d94 module:overlay(85) from:0x0215ceb0 kind:arm_call to:0x01fff350 module:itcm from:0x0215cecc kind:load to:0x027e0ce4 module:dtcm -from:0x0215ced4 kind:load to:0x020b4800 module:overlay(0) +from:0x0215ced4 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0215cf10 kind:arm_call to:0x02015018 module:main from:0x0215cf30 kind:arm_call to:0x020731e8 module:overlay(0) from:0x0215cf64 kind:arm_call to:0x02015018 module:main @@ -1035,7 +1035,7 @@ from:0x0216056c kind:load to:0x02163f8c module:overlay(87) from:0x02160570 kind:load to:0x021646dc module:overlay(87) from:0x02160574 kind:load to:0x027e0cd8 module:dtcm from:0x02160578 kind:load to:0x027e0ce4 module:dtcm -from:0x02160580 kind:load to:0x020b4800 module:overlay(0) +from:0x02160580 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02160584 kind:load to:0x027e0ce8 module:dtcm from:0x0216058c kind:load to:0x020b4cc4 module:overlay(0) from:0x021605f4 kind:arm_call to:0x020749a4 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov088/relocs.txt b/config/jp/arm9/overlays/ov088/relocs.txt index c51e0338..f5813894 100644 --- a/config/jp/arm9/overlays/ov088/relocs.txt +++ b/config/jp/arm9/overlays/ov088/relocs.txt @@ -203,7 +203,7 @@ from:0x02169138 kind:load to:0x027e0994 module:dtcm from:0x0216913c kind:load to:0x02179478 module:overlay(88) from:0x02169140 kind:load to:0x027e09a8 module:dtcm from:0x02169144 kind:load to:0x027e0ce4 module:dtcm -from:0x0216914c kind:load to:0x020b4800 module:overlay(0) +from:0x0216914c kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02169150 kind:load to:0x027e0ce8 module:dtcm from:0x02169158 kind:load to:0x020b4cc4 module:overlay(0) from:0x0216915c kind:load to:0x027e0ce0 module:dtcm @@ -233,7 +233,7 @@ from:0x02169588 kind:load to:0x027e0ce4 module:dtcm from:0x02169594 kind:load to:0x020b6ba4 module:overlay(0) from:0x02169598 kind:load to:0x02176498 module:overlay(88) from:0x021695a4 kind:load to:0x027e09ac module:dtcm -from:0x021695b4 kind:load to:0x020b4800 module:overlay(0) +from:0x021695b4 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x021695e0 kind:arm_call to:0x01fff3b4 module:itcm from:0x0216960c kind:load to:0x027e0ce4 module:dtcm from:0x02169628 kind:arm_call to:0x01fff3b4 module:itcm diff --git a/config/jp/arm9/overlays/ov092/relocs.txt b/config/jp/arm9/overlays/ov092/relocs.txt index 7beda046..f386a8dc 100644 --- a/config/jp/arm9/overlays/ov092/relocs.txt +++ b/config/jp/arm9/overlays/ov092/relocs.txt @@ -518,7 +518,7 @@ from:0x0216ba0c kind:arm_call to:0x01fff350 module:itcm from:0x0216ba64 kind:arm_call to:0x01fff498 module:itcm from:0x0216baa0 kind:load to:0x027e09a4 module:dtcm from:0x0216baa4 kind:load to:0x027e0ce4 module:dtcm -from:0x0216baac kind:load to:0x020b4800 module:overlay(0) +from:0x0216baac kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0216bab4 kind:load to:0x027e0ce8 module:dtcm from:0x0216bb8c kind:arm_call to:0x02069620 module:overlay(0) from:0x0216bc04 kind:arm_call to:0x0216f244 module:overlay(92) diff --git a/config/jp/arm9/overlays/ov092/symbols.txt b/config/jp/arm9/overlays/ov092/symbols.txt index f43c7839..ae2eb805 100644 --- a/config/jp/arm9/overlays/ov092/symbols.txt +++ b/config/jp/arm9/overlays/ov092/symbols.txt @@ -160,7 +160,7 @@ func_ov092_0216ab28 kind:function(arm,size=0x2c) addr:0x0216ab28 func_ov092_0216ab54 kind:function(arm,size=0x2c) addr:0x0216ab54 func_ov092_0216ab80 kind:function(arm,size=0xb4) addr:0x0216ab80 func_ov092_0216ac34 kind:function(arm,size=0x14) addr:0x0216ac34 -func_ov092_0216ac48 kind:function(arm,size=0xac) addr:0x0216ac48 +_ZN25UnkStruct_027e0ce0_40_14C19func_ov092_021689e8EiP21UnkStruct_027e0ce0_40P15PlayerLinkActorP25UnkStruct_027e0ce0_40_328 kind:function(arm,size=0xac) addr:0x0216ac48 func_ov092_0216acf4 kind:function(arm,size=0x28) addr:0x0216acf4 func_ov092_0216ad1c kind:function(arm,size=0x118) addr:0x0216ad1c func_ov092_0216ae34 kind:function(arm,size=0x2c) addr:0x0216ae34 diff --git a/config/jp/arm9/overlays/ov093/relocs.txt b/config/jp/arm9/overlays/ov093/relocs.txt index 6ca2dc53..bb288520 100644 --- a/config/jp/arm9/overlays/ov093/relocs.txt +++ b/config/jp/arm9/overlays/ov093/relocs.txt @@ -1159,7 +1159,7 @@ from:0x02173be0 kind:arm_call to:0x02173284 module:overlay(93) from:0x02173be8 kind:load to:0x0217a770 module:overlay(93) from:0x02173c94 kind:arm_call to:0x01fff350 module:itcm from:0x02173cd0 kind:load to:0x027e0ce4 module:dtcm -from:0x02173cd8 kind:load to:0x020b4800 module:overlay(0) +from:0x02173cd8 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02173d14 kind:load to:0x0217a770 module:overlay(93) from:0x02173d64 kind:arm_call to:0x02173284 module:overlay(93) from:0x02173d94 kind:arm_call to:0x021715d8 module:overlay(93) diff --git a/config/jp/arm9/overlays/ov093/symbols.txt b/config/jp/arm9/overlays/ov093/symbols.txt index 1e404193..04cb1dc7 100644 --- a/config/jp/arm9/overlays/ov093/symbols.txt +++ b/config/jp/arm9/overlays/ov093/symbols.txt @@ -86,7 +86,7 @@ func_ov093_0216a280 kind:function(arm,size=0xdc) addr:0x0216a280 func_ov093_0216a35c kind:function(arm,size=0xa8) addr:0x0216a35c func_ov093_0216a404 kind:function(arm,size=0x7c) addr:0x0216a404 func_ov093_0216a480 kind:function(arm,size=0x2c) addr:0x0216a480 -func_ov093_0216a4ac kind:function(arm,size=0x38) addr:0x0216a4ac +_ZN21UnkStruct_027e0ce0_4019func_ov093_02168220Ev kind:function(arm,size=0x38) addr:0x0216a4ac func_ov093_0216a4e4 kind:function(arm,size=0xb4) addr:0x0216a4e4 func_ov093_0216a598 kind:function(arm,size=0xfc) addr:0x0216a598 func_ov093_0216a694 kind:function(thumb,size=0x7c) addr:0x0216a694 @@ -99,7 +99,7 @@ _ZN25UnkStruct_027e0ce0_40_14CD1Ev kind:function(thumb,size=0x2) addr:0x0216aad8 _ZN25UnkStruct_027e0ce0_40_14C19func_ov093_02168850Ev kind:function(thumb,size=0x14) addr:0x0216aadc func_ov093_0216aaf0 kind:function(arm,size=0x184) addr:0x0216aaf0 func_ov093_0216ac74 kind:function(arm,size=0x43c) addr:0x0216ac74 -func_ov093_0216b0b0 kind:function(arm,size=0x6c) addr:0x0216b0b0 +_ZN25UnkStruct_027e0ce0_40_14C19func_ov093_02168e24Ei kind:function(arm,size=0x6c) addr:0x0216b0b0 func_ov093_0216b11c kind:function(thumb,size=0xa) addr:0x0216b11c func_ov093_0216b128 kind:function(arm,size=0x24) addr:0x0216b128 func_ov093_0216b14c kind:function(arm,size=0x9c) addr:0x0216b14c @@ -163,7 +163,7 @@ _ZN19func_ov093_0216ef48D0Ev kind:function(arm,size=0x1c) addr:0x0216ef48 func_ov093_0216ef64 kind:function(thumb,size=0x14) addr:0x0216ef64 func_ov093_0216ef78 kind:function(arm,size=0x94) addr:0x0216ef78 func_ov093_0216f00c kind:function(arm,size=0xa4) addr:0x0216f00c -func_ov093_0216f0b0 kind:function(arm,size=0x3c) addr:0x0216f0b0 +_ZN15PlayerLinkActor19func_ov093_0216ce24EPi kind:function(arm,size=0x3c) addr:0x0216f0b0 _ZN25UnkStruct_027e0ce0_40_328C1EPvP21UnkStruct_027e0ce0_40P25UnkStruct_027e0ce0_40_150Pj kind:function(thumb,size=0x1bc) addr:0x0216f0ec _ZN25UnkStruct_027e0ce0_40_328D1Ev kind:function(thumb,size=0xb6) addr:0x0216f2a8 _ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d0d4Ev kind:function(thumb,size=0x8c) addr:0x0216f360 @@ -174,13 +174,13 @@ func_ov093_0216f688 kind:function(arm,size=0x30) addr:0x0216f688 func_ov093_0216f6b8 kind:function(arm,size=0x14) addr:0x0216f6b8 func_ov093_0216f6cc kind:function(arm,size=0xb4) addr:0x0216f6cc func_ov093_0216f780 kind:function(arm,size=0xc4) addr:0x0216f780 -func_ov093_0216f844 kind:function(arm,size=0x830) addr:0x0216f844 +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d5b8Ei kind:function(arm,size=0x830) addr:0x0216f844 func_ov093_02170074 kind:function(arm,size=0x48) addr:0x02170074 -func_ov093_021700bc kind:function(arm,size=0x98) addr:0x021700bc -func_ov093_02170154 kind:function(arm,size=0x260) addr:0x02170154 +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216de30Eii kind:function(arm,size=0x98) addr:0x021700bc +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216dec8Ei kind:function(arm,size=0x260) addr:0x02170154 func_ov093_021703b4 kind:function(arm,size=0x68) addr:0x021703b4 func_ov093_0217041c kind:function(arm,size=0x14) addr:0x0217041c -func_ov093_02170430 kind:function(arm,size=0xfc) addr:0x02170430 +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216e1a4Ei kind:function(arm,size=0xfc) addr:0x02170430 func_ov093_0217052c kind:function(arm,size=0x18) addr:0x0217052c func_ov093_02170544 kind:function(arm,size=0x20) addr:0x02170544 func_ov093_02170564 kind:function(arm,size=0x20) addr:0x02170564 @@ -219,7 +219,7 @@ func_ov093_021718ec kind:function(thumb,size=0x10) addr:0x021718ec func_ov093_021718fc kind:function(thumb,size=0x10) addr:0x021718fc func_ov093_0217190c kind:function(thumb,size=0x7c) addr:0x0217190c func_ov093_02171988 kind:function(thumb,size=0x12) addr:0x02171988 -func_ov093_0217199c kind:function(thumb,size=0x50) addr:0x0217199c +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216f71cEPi kind:function(thumb,size=0x50) addr:0x0217199c func_ov093_021719ec kind:function(thumb,size=0xc) addr:0x021719ec func_ov093_021719f8 kind:function(arm,size=0x78) addr:0x021719f8 func_ov093_02171a70 kind:function(arm,size=0x7c) addr:0x02171a70 diff --git a/config/jp/arm9/overlays/ov094/relocs.txt b/config/jp/arm9/overlays/ov094/relocs.txt index 7cffafe5..8016983a 100644 --- a/config/jp/arm9/overlays/ov094/relocs.txt +++ b/config/jp/arm9/overlays/ov094/relocs.txt @@ -753,7 +753,7 @@ from:0x0216e094 kind:load to:0x0204b164 module:main from:0x0216e098 kind:load to:0x020b6ba4 module:overlay(0) from:0x0216e0a0 kind:load to:0x0217ad60 module:overlay(94) from:0x0216e0a4 kind:load to:0x027e0ce4 module:dtcm -from:0x0216e0a8 kind:load to:0x020b4800 module:overlay(0) +from:0x0216e0a8 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0216e0ac kind:load to:0x0203feb0 module:main from:0x0216e18c kind:arm_call to:0x0205a544 module:overlay(0) from:0x0216e1b4 kind:arm_call to:0x01ffc634 module:itcm @@ -1081,7 +1081,7 @@ from:0x0217117c kind:load to:0x020b6ba4 module:overlay(0) from:0x021711b0 kind:arm_call to:0x01fff350 module:itcm from:0x021711d0 kind:arm_call to:0x021714c8 module:overlay(94) from:0x021711dc kind:load to:0x027e0ce4 module:dtcm -from:0x021711e4 kind:load to:0x020b4800 module:overlay(0) +from:0x021711e4 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x021711f4 kind:arm_call to:0x02099b30 module:overlay(0) from:0x0217124c kind:arm_call_thumb to:0x020590f0 module:overlay(0) from:0x02171288 kind:arm_call to:0x0203e690 module:main diff --git a/config/jp/arm9/overlays/ov095/relocs.txt b/config/jp/arm9/overlays/ov095/relocs.txt index 2e940bd1..8c1f3dfe 100644 --- a/config/jp/arm9/overlays/ov095/relocs.txt +++ b/config/jp/arm9/overlays/ov095/relocs.txt @@ -96,7 +96,7 @@ from:0x0217c814 kind:thumb_call to:0x0217c894 module:overlay(95) from:0x0217c81c kind:thumb_call_arm to:0x02156188 module:overlay(71) from:0x0217c826 kind:thumb_call to:0x020bd2b4 module:overlay(1) from:0x0217c84a kind:thumb_call to:0x0217c69c module:overlay(95) -from:0x0217c854 kind:load to:0x020b4800 module:overlay(0) +from:0x0217c854 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0217c85c kind:load to:0x027e0ce4 module:dtcm from:0x0217c860 kind:load to:0x027e0ce0 module:dtcm from:0x0217c890 kind:load to:0x027e09b8 module:dtcm @@ -462,7 +462,7 @@ from:0x0217f3f0 kind:arm_call to:0x021262ac module:overlay(45) from:0x0217f400 kind:arm_call to:0x0208e5f8 module:overlay(0) from:0x0217f40c kind:load to:0x027e09a8 module:dtcm from:0x0217f414 kind:load to:0x027e0ce4 module:dtcm -from:0x0217f424 kind:load to:0x020b4800 module:overlay(0) +from:0x0217f424 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0217f428 kind:load to:0x0217a740 module:overlays(89,91,93,94) from:0x0217f46c kind:arm_call to:0x01fff3b4 module:itcm from:0x0217f478 kind:arm_call to:0x01fff458 module:itcm diff --git a/config/jp/arm9/overlays/ov096/relocs.txt b/config/jp/arm9/overlays/ov096/relocs.txt index 2d90385e..8cf025dc 100644 --- a/config/jp/arm9/overlays/ov096/relocs.txt +++ b/config/jp/arm9/overlays/ov096/relocs.txt @@ -1,7 +1,7 @@ from:0x0217be0c kind:arm_call to:0x01fff350 module:itcm from:0x0217be28 kind:arm_call to:0x0217cfd0 module:overlay(96) from:0x0217be70 kind:load to:0x027e0ce4 module:dtcm -from:0x0217be78 kind:load to:0x020b4800 module:overlay(0) +from:0x0217be78 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0217be94 kind:load to:0x027e0cd8 module:dtcm from:0x0217be98 kind:load to:0x020834e8 module:overlay(0) from:0x0217beb2 kind:thumb_call_arm to:0x02083434 module:overlay(0) @@ -20,7 +20,7 @@ from:0x0217bfe4 kind:thumb_call_arm to:0x0206df5c module:overlay(0) from:0x0217bff6 kind:thumb_call_arm to:0x02071c18 module:overlay(0) from:0x0217c00e kind:thumb_call_arm to:0x0206e734 module:overlay(0) from:0x0217c018 kind:load to:0x027e09a4 module:dtcm -from:0x0217c01c kind:load to:0x020b4800 module:overlay(0) +from:0x0217c01c kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0217c024 kind:load to:0x027e0ce4 module:dtcm from:0x0217c028 kind:load to:0x020b69b8 module:overlay(0) from:0x0217c088 kind:arm_call_thumb to:0x0217bec8 module:overlay(96) diff --git a/config/jp/arm9/overlays/ov101/relocs.txt b/config/jp/arm9/overlays/ov101/relocs.txt index 402894a5..ddff7ceb 100644 --- a/config/jp/arm9/overlays/ov101/relocs.txt +++ b/config/jp/arm9/overlays/ov101/relocs.txt @@ -79,7 +79,7 @@ from:0x02184d34 kind:thumb_call to:0x020be418 module:overlay(1) from:0x02184dde kind:thumb_call to:0x0216f458 module:overlay(93) from:0x02184df2 kind:thumb_call to:0x020bd7c4 module:overlay(1) from:0x02184e2c kind:thumb_call_arm to:0x01fff350 module:itcm -from:0x02184e4c kind:load to:0x020b4800 module:overlay(0) +from:0x02184e4c kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02184e50 kind:load to:0x027e0ce4 module:dtcm from:0x02184e5c kind:thumb_call to:0x020b8578 module:overlay(1) from:0x02184e72 kind:thumb_call_arm to:0x02011ff4 module:main diff --git a/config/jp/arm9/overlays/ov101/symbols.txt b/config/jp/arm9/overlays/ov101/symbols.txt index f4bf7e47..ea452c57 100644 --- a/config/jp/arm9/overlays/ov101/symbols.txt +++ b/config/jp/arm9/overlays/ov101/symbols.txt @@ -14,7 +14,7 @@ _ZN21UnkStruct_027e0ce0_40D1Ev kind:function(thumb,size=0x54) addr:0x02184ae0 _ZN21UnkStruct_027e0ce0_4019func_ov101_02182fb4Eb kind:function(thumb,size=0x50) addr:0x02184b34 _ZN21UnkStruct_027e0ce0_4019func_ov101_02183004Ev kind:function(thumb,size=0x1e) addr:0x02184b84 _ZN21UnkStruct_027e0ce0_4019func_ov101_02183024EPK24UnkStruct_ov001_020c40f4S2_iiP11ItemManagerP21UnkStruct_027e0ce0_30bb kind:function(thumb,size=0x260) addr:0x02184ba4 -_ZN21PlayerLinkActor_A0_1CC1Ei kind:function(thumb,size=0xc) addr:0x02184e04 +_ZN21PlayerLinkActor_A0_1CC1EP21UnkStruct_027e0ce0_40 kind:function(thumb,size=0xc) addr:0x02184e04 _ZN21PlayerLinkActor_A0_1C19func_ov101_02183290Ev kind:function(thumb,size=0x48) addr:0x02184e10 _ZN30UnkStruct_027e09a4_54_Derived1C2EPi kind:function(thumb,size=0x50) addr:0x02184e58 _ZN30UnkStruct_027e09a4_54_Derived18vfunc_0CEv kind:function(thumb,size=0x134) addr:0x02184ea8 diff --git a/config/jp/arm9/overlays/ov102/delinks.txt b/config/jp/arm9/overlays/ov102/delinks.txt index 523c62e0..e43d495d 100644 --- a/config/jp/arm9/overlays/ov102/delinks.txt +++ b/config/jp/arm9/overlays/ov102/delinks.txt @@ -4,3 +4,26 @@ .ctor start:0x021864f4 end:0x021864f8 kind:rodata align:4 .data start:0x02186500 end:0x021865c0 kind:data align:32 .bss start:0x021865c0 end:0x021865c0 kind:bss align:32 + +src/102_CourseExecLand/UnkStruct_027e0ce0_40_102.cpp: + .text start:0x021847a0 end:0x02185144 + +src/102_CourseExecLand/MapObjectUnkSAND_102.cpp: + complete + .text start:0x02185144 end:0x02185794 + .rodata start:0x02186430 end:0x021864d0 + +src/102_CourseExecLand/MapObjectUnkPTFL_102.cpp: + .text start:0x02185794 end:0x02186148 + .data start:0x02186500 end:0x02186590 + +src/102_CourseExecLand/UnkStruct_027e0cd8_0C_102.cpp: + complete + .text start:0x02186148 end:0x021861c4 + +src/102_CourseExecLand/ActorUnkMLCK_102.cpp: + complete + .text start:0x021861c4 end:0x02186430 + .init start:0x021864d0 end:0x021864f4 + .ctor start:0x021864f4 end:0x021864f8 + .data start:0x02186590 end:0x021865c0 diff --git a/config/jp/arm9/overlays/ov102/relocs.txt b/config/jp/arm9/overlays/ov102/relocs.txt index 896d05dd..196fb9c4 100644 --- a/config/jp/arm9/overlays/ov102/relocs.txt +++ b/config/jp/arm9/overlays/ov102/relocs.txt @@ -156,7 +156,7 @@ from:0x02186304 kind:arm_call to:0x020749b4 module:overlay(0) from:0x02186334 kind:load to:0x020da050 module:overlay(24) from:0x02186338 kind:load to:0x027e0cf0 module:dtcm from:0x0218633c kind:load to:0x027e0ce4 module:dtcm -from:0x02186340 kind:load to:0x021865a4 module:overlay(102) +from:0x02186340 kind:load to:0x0218659c add:0x8 module:overlay(102) from:0x02186348 kind:load to:0x020b69b8 module:overlay(0) from:0x0218634c kind:load to:0x020b69c8 module:overlay(0) from:0x02186350 kind:load to:0x027e09b8 module:dtcm diff --git a/config/jp/arm9/overlays/ov102/symbols.txt b/config/jp/arm9/overlays/ov102/symbols.txt index 1789c462..9da229c3 100644 --- a/config/jp/arm9/overlays/ov102/symbols.txt +++ b/config/jp/arm9/overlays/ov102/symbols.txt @@ -1,39 +1,39 @@ -func_ov102_021847a0 kind:function(arm,size=0x64) addr:0x021847a0 -func_ov102_02184804 kind:function(arm,size=0x1d0) addr:0x02184804 -func_ov102_021849d4 kind:function(arm,size=0x154) addr:0x021849d4 -func_ov102_02184b28 kind:function(arm,size=0x54) addr:0x02184b28 -func_ov102_02184b7c kind:function(arm,size=0x40) addr:0x02184b7c -func_ov102_02184bbc kind:function(arm,size=0x144) addr:0x02184bbc -func_ov102_02184d00 kind:function(arm,size=0x34) addr:0x02184d00 -func_ov102_02184d34 kind:function(arm,size=0x3c) addr:0x02184d34 -func_ov102_02184d70 kind:function(arm,size=0x4c) addr:0x02184d70 -func_ov102_02184dbc kind:function(arm,size=0x1d8) addr:0x02184dbc -func_ov102_02184f94 kind:function(arm,size=0x1b0) addr:0x02184f94 -func_ov102_02185144 kind:function(arm,size=0x1e4) addr:0x02185144 -func_ov102_02185328 kind:function(arm,size=0x1c0) addr:0x02185328 -func_ov102_021854e8 kind:function(arm,size=0x1c0) addr:0x021854e8 -func_ov102_021856a8 kind:function(arm,size=0x48) addr:0x021856a8 -func_ov102_021856f0 kind:function(arm,size=0xa4) addr:0x021856f0 -func_ov102_02185794 kind:function(arm,size=0x58) addr:0x02185794 -func_ov102_021857ec kind:function(arm,size=0x28) addr:0x021857ec -func_ov102_02185814 kind:function(arm,size=0x110) addr:0x02185814 -func_ov102_02185924 kind:function(arm,size=0x44) addr:0x02185924 -func_ov102_02185968 kind:function(arm,size=0x180) addr:0x02185968 -func_ov102_02185ae8 kind:function(arm,size=0x14) addr:0x02185ae8 -func_ov102_02185afc kind:function(arm,size=0x220) addr:0x02185afc -func_ov102_02185d1c kind:function(arm,size=0x218) addr:0x02185d1c -func_ov102_02185f34 kind:function(arm,size=0x214) addr:0x02185f34 -func_ov102_02186148 kind:function(arm,size=0x60) addr:0x02186148 -func_ov102_021861a8 kind:function(arm,size=0x1c) addr:0x021861a8 -func_ov102_021861c4 kind:function(arm,size=0x190) addr:0x021861c4 -func_ov102_02186354 kind:function(arm,size=0x14) addr:0x02186354 -func_ov102_02186368 kind:function(arm,size=0x78) addr:0x02186368 -func_ov102_021863e0 kind:function(arm,size=0x50) addr:0x021863e0 -data_ov102_02186430 kind:data(any) addr:0x02186430 -data_ov102_02186470 kind:data(any) addr:0x02186470 -__sinit_ov102_021864d0 kind:function(arm,size=0x24) addr:0x021864d0 -.p__sinit_ov102_021864d0 kind:data(word) addr:0x021864f4 -data_ov102_02186500 kind:data(any) addr:0x02186500 -data_ov102_02186528 kind:data(any) addr:0x02186528 -data_ov102_02186590 kind:data(any) addr:0x02186590 -data_ov102_021865a4 kind:data(any) addr:0x021865a4 +_ZN18PlayerActorBase_7419func_ov102_02182c20EiP7Mat4x3p kind:function(arm,size=0x64) addr:0x021847a0 +_ZN18PlayerActorBase_7419func_ov102_02182c84Ebi14UnkAngleStructP7Mat4x3pS2_ kind:function(arm,size=0x1d0) addr:0x02184804 +_ZN25UnkStruct_027e0ce0_40_10819func_ov102_02182e54Eiii kind:function(arm,size=0x154) addr:0x021849d4 +_ZN24UnkStruct_ItemManager_2019func_ov102_02182fa8Eii kind:function(arm,size=0x54) addr:0x02184b28 +_ZN24UnkStruct_ItemManager_2019func_ov102_02182ffcEi kind:function(arm,size=0x40) addr:0x02184b7c +_ZN21UnkStruct_027e0ce0_4019func_ov102_0218303cEiP11ItemManager kind:function(arm,size=0x144) addr:0x02184bbc +_ZN21UnkStruct_027e0ce0_4019func_ov102_02183180Eib kind:function(arm,size=0x34) addr:0x02184d00 +_ZN21UnkStruct_027e0ce0_4019func_ov102_021831b4Ei kind:function(arm,size=0x3c) addr:0x02184d34 +_ZN21UnkStruct_027e0ce0_4019func_ov102_021831f0Ei kind:function(arm,size=0x4c) addr:0x02184d70 +_ZN29UnkStruct_027e0ce0_40_Base_7419func_ov102_0218323cEP29UnkStruct_027e0ce0_40_Base_14i kind:function(arm,size=0x1d8) addr:0x02184dbc +_Z19func_ov102_02183414PsP21PlayerLinkActor_A0_1CbP7VecFx3214UnkAngleStructi kind:function(arm,size=0x1b0) addr:0x02184f94 +_ZN19MapObjectUnkSAND_4019func_ov102_021835c4EP7VecFx32 kind:function(arm,size=0x1e4) addr:0x02185144 +_ZN19MapObjectUnkSAND_4019func_ov102_021837a8E8Vec2bCppP7VecFx32 kind:function(arm,size=0x1c0) addr:0x02185328 +_ZN16MapObjectUnkSAND8vfunc_08Ev kind:function(arm,size=0x1c0) addr:0x021854e8 +_ZN16MapObjectUnkSAND8vfunc_0CEv kind:function(arm,size=0x48) addr:0x021856a8 +_ZN16MapObjectUnkSAND8vfunc_14Ev kind:function(arm,size=0xa4) addr:0x021856f0 +_Z19func_ov102_02183c14i kind:function(arm,size=0x58) addr:0x02185794 +_Z19func_ov102_02183c6ci kind:function(arm,size=0x28) addr:0x021857ec +_Z19func_ov102_02183c94iiiiitttti kind:function(arm,size=0x110) addr:0x02185814 +_Z19func_ov102_02183da4iiiiitttti kind:function(arm,size=0x44) addr:0x02185924 +_ZN16MapObjectUnkPTFL8vfunc_08Ev kind:function(arm,size=0x180) addr:0x02185968 +_ZN16MapObjectUnkPTFL8vfunc_0CEv kind:function(arm,size=0x14) addr:0x02185ae8 +_ZN16MapObjectUnkPTFL8vfunc_14Ev kind:function(arm,size=0x220) addr:0x02185afc +_ZN16MapObjectUnkPTFL19func_ov102_0218419cEv kind:function(arm,size=0x218) addr:0x02185d1c +_ZN16MapObjectUnkPTFL19func_ov102_021843b4Ev kind:function(arm,size=0x214) addr:0x02185f34 +_ZN21UnkStruct_027e0cd8_0C8vfunc_0CEv kind:function(arm,size=0x60) addr:0x02186148 +_ZN21UnkStruct_027e0cd8_0C19func_ov102_02184628Ev kind:function(arm,size=0x1c) addr:0x021861a8 +_ZN12ActorUnkMLCK8vfunc_20Ev kind:function(arm,size=0x190) addr:0x021861c4 +_ZN12ActorUnkMLCK8vfunc_24Ev kind:function(arm,size=0x14) addr:0x02186354 +_ZN15ActorUnkMLCK_C419func_ov102_021847e8Eii kind:function(arm,size=0x78) addr:0x02186368 +_ZN24UnkStruct_ov102_02184a248vfunc_00EP5Actor kind:function(arm,size=0x50) addr:0x021863e0 +data_ov102_021848b0 kind:data(any) addr:0x02186430 local +data_ov102_021848f0 kind:data(any) addr:0x02186470 local +__sinit_ActorUnkMLCK_102.cpp kind:function(arm,size=0x24) addr:0x021864d0 local +.p__sinit_ActorUnkMLCK_102.cpp kind:data(word) addr:0x021864f4 local +data_ov102_02184980 kind:data(any) addr:0x02186500 local +data_ov102_021849a8 kind:data(any) addr:0x02186528 local +data_ov102_02184a10 kind:data(any) addr:0x02186590 local +_ZTV24UnkStruct_ov102_02184a24 kind:data(byte[12]) addr:0x0218659c diff --git a/config/jp/arm9/overlays/ov105/relocs.txt b/config/jp/arm9/overlays/ov105/relocs.txt index 506314be..65ba3adc 100644 --- a/config/jp/arm9/overlays/ov105/relocs.txt +++ b/config/jp/arm9/overlays/ov105/relocs.txt @@ -280,7 +280,7 @@ from:0x021886f4 kind:arm_call to:0x02186f08 module:overlay(105) from:0x02188760 kind:arm_call to:0x02084198 module:overlay(0) from:0x021887c0 kind:load to:0x027e09bc module:dtcm from:0x021887c4 kind:load to:0x027e0ce4 module:dtcm -from:0x021887cc kind:load to:0x020b4800 module:overlay(0) +from:0x021887cc kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x021887d0 kind:load to:0x0218bd30 module:overlay(105) from:0x021887d4 kind:load to:0x0218bd2c module:overlay(105) from:0x021887d8 kind:load to:0x027e09b8 module:dtcm @@ -430,7 +430,7 @@ from:0x02189ea8 kind:arm_call to:0x0218947c module:overlay(105) from:0x02189ec8 kind:arm_call to:0x01fff350 module:itcm from:0x02189f04 kind:load to:0x027e0ce4 module:dtcm from:0x02189f08 kind:load to:0x027e09bc module:dtcm -from:0x02189f10 kind:load to:0x020b4800 module:overlay(0) +from:0x02189f10 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02189f14 kind:load to:0x0218be58 module:overlay(105) from:0x02189f18 kind:load to:0x0218bd3c module:overlay(105) from:0x02189f20 kind:load to:0x0203feb0 module:main @@ -455,7 +455,7 @@ from:0x0218a1a8 kind:load to:0x0218bd28 module:overlay(105) from:0x0218a1ac kind:load to:0x0218bd24 module:overlay(105) from:0x0218a1b0 kind:load to:0x0218bd20 module:overlay(105) from:0x0218a1b4 kind:load to:0x027e0ce4 module:dtcm -from:0x0218a1bc kind:load to:0x020b4800 module:overlay(0) +from:0x0218a1bc kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0218a1c0 kind:load to:0x0218bcc0 module:overlay(105) from:0x0218a1c4 kind:load to:0x0218bd14 module:overlay(105) from:0x0218a1c8 kind:load to:0x0218bd18 module:overlay(105) @@ -601,7 +601,7 @@ from:0x0218b91c kind:arm_call to:0x020f7634 module:overlay(31) from:0x0218b924 kind:arm_call to:0x020f5dc4 module:overlays(26,31) from:0x0218b934 kind:load to:0x02112668 module:overlay(31) from:0x0218b940 kind:load to:0x027e0ce4 module:dtcm -from:0x0218b948 kind:load to:0x020b4800 module:overlay(0) +from:0x0218b948 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x0218b94c kind:load to:0x021126ac module:overlay(31) from:0x0218b958 kind:load to:0x0203feb0 module:main from:0x0218b960 kind:load to:0x027e0ce0 module:dtcm diff --git a/config/jp/arm9/overlays/ov107/relocs.txt b/config/jp/arm9/overlays/ov107/relocs.txt index 1cd96883..a4abb58e 100644 --- a/config/jp/arm9/overlays/ov107/relocs.txt +++ b/config/jp/arm9/overlays/ov107/relocs.txt @@ -166,7 +166,7 @@ from:0x02187b6c kind:arm_call to:0x02091ea0 module:overlay(0) from:0x02187b74 kind:load to:0x027e0cdc module:dtcm from:0x02187ba0 kind:arm_call to:0x01fff350 module:itcm from:0x02187bc0 kind:load to:0x027e0ce4 module:dtcm -from:0x02187bc8 kind:load to:0x020b4800 module:overlay(0) +from:0x02187bc8 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02187be8 kind:load to:0x0210cee4 module:overlay(31) from:0x02187bf4 kind:arm_call to:0x0209e7a4 module:overlay(0) from:0x02187c0c kind:arm_call to:0x02187bcc module:overlay(107) diff --git a/config/jp/arm9/overlays/ov112/relocs.txt b/config/jp/arm9/overlays/ov112/relocs.txt index 10b53fc1..5f0b46a3 100644 --- a/config/jp/arm9/overlays/ov112/relocs.txt +++ b/config/jp/arm9/overlays/ov112/relocs.txt @@ -45,7 +45,7 @@ from:0x021872b0 kind:load to:0x02040eb0 module:main from:0x021872b4 kind:load to:0x027e0ce8 module:dtcm from:0x021872c4 kind:load to:0x027e0ce4 module:dtcm from:0x021872e0 kind:load to:0x027e09a4 module:dtcm -from:0x021872e8 kind:load to:0x020b4800 module:overlay(0) +from:0x021872e8 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x021872ec kind:load to:0x027e09b8 module:dtcm from:0x02187344 kind:arm_call to:0x020914b0 module:overlay(0) from:0x02187358 kind:arm_call to:0x020938c0 module:overlay(0) diff --git a/config/jp/arm9/relocs.txt b/config/jp/arm9/relocs.txt index 60b550e6..e8c56e37 100644 --- a/config/jp/arm9/relocs.txt +++ b/config/jp/arm9/relocs.txt @@ -2093,7 +2093,7 @@ from:0x02016fb8 kind:arm_call to:0x01fff350 module:itcm from:0x02016fec kind:arm_call to:0x01ffb9cc module:itcm from:0x02017014 kind:arm_call to:0x01fff350 module:itcm from:0x0201703c kind:load to:0x027e0ce4 module:dtcm -from:0x02017040 kind:load to:0x020b4800 module:overlay(0) +from:0x02017040 kind:load to:0x020b47f8 add:0x8 module:overlay(0) from:0x02017064 kind:arm_call to:0x01fff520 module:itcm from:0x02017088 kind:arm_call to:0x01ffb9cc module:itcm from:0x020170b4 kind:arm_call to:0x01ffb9cc module:itcm diff --git a/config/jp/arm9/symbols.txt b/config/jp/arm9/symbols.txt index 7f9ee868..f5e161cb 100644 --- a/config/jp/arm9/symbols.txt +++ b/config/jp/arm9/symbols.txt @@ -145,7 +145,7 @@ func_02002e78 kind:function(arm,size=0x20) addr:0x02002e78 func_02002e98 kind:function(arm,size=0x20) addr:0x02002e98 func_02002eb8 kind:function(arm,size=0x20) addr:0x02002eb8 NNS_Snd_func_0206617c kind:function(arm,size=0x2c) addr:0x02002ed8 -func_02002f04 kind:function(arm,size=0x28) addr:0x02002f04 +_ZN24UnkStruct_ov000_020b51c013func_02002f04Ev kind:function(arm,size=0x28) addr:0x02002f04 func_02002f2c kind:function(arm,size=0x28) addr:0x02002f2c func_02002f54 kind:function(arm,size=0x48) addr:0x02002f54 func_02002f9c kind:function(arm,size=0x28) addr:0x02002f9c diff --git a/config/usa/arm9/itcm/symbols.txt b/config/usa/arm9/itcm/symbols.txt index b7b72329..2fd37aa2 100644 --- a/config/usa/arm9/itcm/symbols.txt +++ b/config/usa/arm9/itcm/symbols.txt @@ -128,7 +128,7 @@ func_01ffc520 kind:function(arm,size=0x5c) addr:0x01ffc520 _ZN11ModelRender8vfunc_0CEv kind:function(arm,size=0x24) addr:0x01ffc57c func_01ffc5a0 kind:function(arm,size=0x94) addr:0x01ffc5a0 _ZN15ModelRenderBase13func_01ffc634EP7VecFx3214UnkAngleStructS1_ kind:function(arm,size=0xa0) addr:0x01ffc634 -_ZN19UnkSystem6_Derived213func_01ffc6d4E14UnkAngleStructP7VecFx32 kind:function(arm,size=0x70) addr:0x01ffc6d4 +_ZN15ModelRenderBase13func_01ffc6d4E14UnkAngleStructP7VecFx32 kind:function(arm,size=0x70) addr:0x01ffc6d4 func_01ffc744 kind:function(arm,size=0x24) addr:0x01ffc744 _ZN24UnkStruct_ov000_020b4ec413func_01ffc768Ei kind:function(arm,size=0x3c) addr:0x01ffc768 _ZN20ModelRender_Derived18vfunc_1CEP19UnkSystem4_vfunc_1C kind:function(arm,size=0xb4) addr:0x01ffc7a4 @@ -157,7 +157,7 @@ _ZN18UnkStruct_027e09a46IsLandEv kind:function(arm,size=0x28) addr:0x01ffd3b0 _ZN18UnkStruct_027e09a47IsTrainEv kind:function(arm,size=0x28) addr:0x01ffd3d8 _ZNK18UnkStruct_027e09a421GetCurrentCourseEntryEv kind:function(arm,size=0x20) addr:0x01ffd400 _ZN18UnkStruct_027e09b813func_01ffd420Ev kind:function(arm,size=0x1c) addr:0x01ffd420 -func_01ffd43c kind:function(arm,size=0x60) addr:0x01ffd43c +_ZN21UnkStruct_027e09bc_0C13func_01ffd43cEP5Vec2sii kind:function(arm,size=0x60) addr:0x01ffd43c func_01ffd49c kind:function(arm,size=0x1a4) addr:0x01ffd49c _ZN21UnkStruct_027e09bc_0C13func_01ffd640EP7VecFx32 kind:function(arm,size=0x128) addr:0x01ffd640 func_01ffd768 kind:function(arm,size=0x138) addr:0x01ffd768 @@ -199,7 +199,7 @@ func_01fff280 kind:function(arm,size=0x28) addr:0x01fff280 func_01fff2a8 kind:function(arm,size=0x24) addr:0x01fff2a8 func_01fff2cc kind:function(arm,size=0x30) addr:0x01fff2cc func_01fff2fc kind:function(arm,size=0x54) addr:0x01fff2fc -_ZN12ActorManager13func_01fff350EPvPP5Actor kind:function(arm,size=0x64) addr:0x01fff350 +_ZN12ActorManager13func_01fff350EP29UnkStruct_ov000_020b3000_BasePP5Actor kind:function(arm,size=0x64) addr:0x01fff350 _ZN12ActorManager13func_01fff3b4E8ActorRef kind:function(arm,size=0x8c) addr:0x01fff3b4 func_01fff440 kind:function(arm,size=0x18) addr:0x01fff440 _ZN5Actor10GetActorIdEv kind:function(arm,size=0xc) addr:0x01fff458 diff --git a/config/usa/arm9/overlays/ov000/relocs.txt b/config/usa/arm9/overlays/ov000/relocs.txt index 33c609da..f322eb1f 100644 --- a/config/usa/arm9/overlays/ov000/relocs.txt +++ b/config/usa/arm9/overlays/ov000/relocs.txt @@ -3438,7 +3438,7 @@ from:0x02075668 kind:load to:0x027e0d3c module:dtcm from:0x0207566c kind:load to:0x027e0ce0 module:dtcm from:0x02075670 kind:load to:0x020b23ac module:overlay(0) from:0x02075674 kind:load to:0x027e0ce4 module:dtcm -from:0x02075678 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02075678 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02075688 kind:arm_call to:0x02075294 module:overlay(0) from:0x020756a4 kind:arm_call to:0x020753e4 module:overlay(0) from:0x020756c0 kind:arm_call to:0x01fff3b4 module:itcm @@ -3842,7 +3842,7 @@ from:0x020798b4 kind:load to:0x027e0cdc module:dtcm from:0x020798b8 kind:load to:0x020b2590 module:overlay(0) from:0x020798bc kind:load to:0x027e09a4 module:dtcm from:0x020798c0 kind:load to:0x027e0ce4 module:dtcm -from:0x020798c8 kind:load to:0x020b2fe0 module:overlay(0) +from:0x020798c8 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02079904 kind:load to:0x020b2590 module:overlay(0) from:0x02079954 kind:arm_call to:0x020829e8 module:overlay(0) from:0x020799ac kind:arm_call to:0x01ffb714 module:itcm @@ -3978,7 +3978,7 @@ from:0x0207b3ac kind:arm_call to:0x020778c0 module:overlay(0) from:0x0207b3e0 kind:load to:0x027e0ce0 module:dtcm from:0x0207b3e4 kind:load to:0x027e09a4 module:dtcm from:0x0207b3ec kind:load to:0x027e0ce4 module:dtcm -from:0x0207b3f4 kind:load to:0x020b2fe0 module:overlay(0) +from:0x0207b3f4 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0207b404 kind:load to:0x027e09bc module:dtcm from:0x0207b410 kind:arm_call to:0x020792e8 module:overlay(0) from:0x0207b424 kind:arm_call to:0x020792e8 module:overlay(0) diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 0f59e950..93fe6675 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -456,7 +456,7 @@ _ZN23TitleScreenManager_Base8vfunc_44Ev kind:function(arm,size=0x4) addr:0x02061 func_ov000_02061040 kind:function(arm,size=0x44) addr:0x02061020 func_ov000_02061084 kind:function(arm,size=0x14) addr:0x02061064 _ZN18UnkStruct_0204a08819func_ov000_02061098Ev kind:function(arm,size=0x144) addr:0x02061078 -_ZN18UnkStruct_0204a08819func_ov000_020611dcEPvi kind:function(arm,size=0x20) addr:0x020611bc +_ZN18UnkStruct_0204a08819func_ov000_020611dcEP29FileSelectManager_UnkDrawBasei kind:function(arm,size=0x20) addr:0x020611bc _ZN18UnkStruct_0204a08819func_ov000_020611fcEi kind:function(arm,size=0x28) addr:0x020611dc _ZN18UnkStruct_0204a08819func_ov000_02061224Ev kind:function(arm,size=0xc) addr:0x02061204 _ZN18UnkStruct_0204a08819func_ov000_02061230Ev kind:function(arm,size=0xc) addr:0x02061210 @@ -469,14 +469,14 @@ _ZN29FileSelectManager_UnkDrawBaseC1Ev kind:function(arm,size=0x24) addr:0x02061 _ZN29FileSelectManager_UnkDrawBaseD1Ev kind:function(arm,size=0x18) addr:0x02061670 _ZN29FileSelectManager_UnkDrawBaseD0Ev kind:function(arm,size=0x20) addr:0x02061688 _ZN29FileSelectManager_UnkDrawBaseD2Ev kind:function(arm,size=0x18) addr:0x020616a8 -_ZN29FileSelectManager_UnkDrawBase8vfunc_08Ei kind:function(arm,size=0x4) addr:0x020616c0 -_ZN29FileSelectManager_UnkDrawBase8vfunc_0CEi kind:function(arm,size=0x4) addr:0x020616c4 -_ZN29FileSelectManager_UnkDrawBase8vfunc_10Eii kind:function(arm,size=0x4) addr:0x020616c8 -_ZN29FileSelectManager_UnkDrawBase8vfunc_14Ei kind:function(arm,size=0x4) addr:0x020616cc -_ZN29FileSelectManager_UnkDrawBase8vfunc_18Ei kind:function(arm,size=0x4) addr:0x020616d0 -_ZN29FileSelectManager_UnkDrawBase8vfunc_1CEi kind:function(arm,size=0x4) addr:0x020616d4 -_ZN29FileSelectManager_UnkDrawBase8vfunc_20Eii kind:function(arm,size=0x4) addr:0x020616d8 -_ZN29FileSelectManager_UnkDrawBase8vfunc_24Ev kind:function(arm,size=0x4) addr:0x020616dc +_ZN29FileSelectManager_UnkDrawBase9vfunc2_08Ei kind:function(arm,size=0x4) addr:0x020616c0 +_ZN29FileSelectManager_UnkDrawBase9vfunc2_0CEi kind:function(arm,size=0x4) addr:0x020616c4 +_ZN29FileSelectManager_UnkDrawBase8vfunc_54Eii kind:function(arm,size=0x4) addr:0x020616c8 +_ZN29FileSelectManager_UnkDrawBase9vfunc2_14Ei kind:function(arm,size=0x4) addr:0x020616cc +_ZN29FileSelectManager_UnkDrawBase9vfunc2_18Ei kind:function(arm,size=0x4) addr:0x020616d0 +_ZN29FileSelectManager_UnkDrawBase8vfunc_5CEi kind:function(arm,size=0x4) addr:0x020616d4 +_ZN29FileSelectManager_UnkDrawBase8vfunc_58Eii kind:function(arm,size=0x4) addr:0x020616d8 +_ZN29FileSelectManager_UnkDrawBase8vfunc_60Ev kind:function(arm,size=0x4) addr:0x020616dc _ZN23UnkStruct_027e0998_BaseC2Ev kind:function(thumb,size=0x24) addr:0x020616e0 _ZN23UnkStruct_027e0998_BaseC1Ev kind:function(thumb,size=0x24) addr:0x02061704 func_ov000_02061748 kind:function(thumb,size=0x16) addr:0x02061728 @@ -862,7 +862,7 @@ func_ov000_0206bb30 kind:function(arm,size=0xcc) addr:0x0206bb10 _ZN24UnkStruct_ov000_020b51b819func_ov000_0206bbfcEi kind:function(arm,size=0x18) addr:0x0206bbdc func_ov000_0206bc14 kind:function(arm,size=0xe4) addr:0x0206bbf4 func_ov000_0206bcf8 kind:function(arm,size=0xdc) addr:0x0206bcd8 -func_ov000_0206bdd4 kind:function(arm,size=0x10) addr:0x0206bdb4 +_ZN24UnkStruct_ov000_020b51b819func_ov000_0206bdd4EP15PlayerLinkActor kind:function(arm,size=0x10) addr:0x0206bdb4 func_ov000_0206bde4 kind:function(arm,size=0xe8) addr:0x0206bdc4 func_ov000_0206becc kind:function(arm,size=0x60) addr:0x0206beac func_ov000_0206bf2c kind:function(arm,size=0x10) addr:0x0206bf0c @@ -936,8 +936,8 @@ func_ov000_0206e9f8 kind:function(arm,size=0x60) addr:0x0206e9d8 func_ov000_0206ea58 kind:function(arm,size=0x100) addr:0x0206ea38 func_ov000_0206eb58 kind:function(arm,size=0xd0) addr:0x0206eb38 func_ov000_0206ec28 kind:function(arm,size=0xf4) addr:0x0206ec08 -func_ov000_0206ed1c kind:function(arm,size=0xbc) addr:0x0206ecfc -func_ov000_0206edd8 kind:function(arm,size=0x160) addr:0x0206edb8 +_ZN24UnkStruct_ov000_020b521419func_ov000_0206ed1cEP15PlayerLinkActor kind:function(arm,size=0xbc) addr:0x0206ecfc +_ZN24UnkStruct_ov000_020b521419func_ov000_0206edd8EP15PlayerLinkActor kind:function(arm,size=0x160) addr:0x0206edb8 func_ov000_0206ef38 kind:function(arm,size=0xb0) addr:0x0206ef18 func_ov000_0206efe8 kind:function(arm,size=0x26c) addr:0x0206efc8 func_ov000_0206f254 kind:function(arm,size=0x8c) addr:0x0206f234 @@ -2671,7 +2671,7 @@ func_ov000_0209fe84 kind:function(arm,size=0x1c) addr:0x0209fe64 func_ov000_0209fea0 kind:function(arm,size=0xc) addr:0x0209fe80 _ZN18UnkStruct_027e0cec19func_ov000_0209feacEiP7VecFx32iii kind:function(arm,size=0x78) addr:0x0209fe8c _ZN18UnkStruct_027e0cec19func_ov000_0209ff24EiP7VecFx32P7VecFx16i kind:function(arm,size=0x28) addr:0x0209ff04 -func_ov000_0209ff4c kind:function(arm,size=0x40) addr:0x0209ff2c +_ZN18UnkStruct_027e0cec19func_ov000_0209ff4cEiP7VecFx3214UnkAngleStructi kind:function(arm,size=0x40) addr:0x0209ff2c _ZN18UnkStruct_027e0cec19func_ov000_0209ff8cEP22UnkStruct_PlayerGet_eciP7VecFx32i kind:function(arm,size=0x74) addr:0x0209ff6c func_ov000_020a0000 kind:function(arm,size=0xa0) addr:0x0209ffe0 func_ov000_020a00a0 kind:function(arm,size=0x34) addr:0x020a0080 @@ -3655,7 +3655,7 @@ data_ov000_020b2f9c kind:data(any) addr:0x020b2f9c data_ov000_020b2fbc kind:data(any) addr:0x020b2fbc data_ov000_020b2fe8 kind:data(any) addr:0x020b2fc8 data_ov000_020b2fd4 kind:data(any) addr:0x020b2fd4 -data_ov000_020b3000 kind:data(any) addr:0x020b2fe0 +_ZTV24UnkStruct_ov000_020b3000 kind:data(any) addr:0x020b2fd8 data_ov000_020b2fec kind:data(any) addr:0x020b2fec data_ov000_020b2ff8 kind:data(any) addr:0x020b2ff8 data_ov000_020b303c kind:data(any) addr:0x020b301c @@ -4026,7 +4026,7 @@ data_ov000_020b518c kind:bss addr:0x020b518c data_ov000_020b51b8 kind:bss addr:0x020b5198 data_ov000_020b51a0 kind:bss addr:0x020b51a0 data_ov000_020b51a4 kind:bss addr:0x020b51a4 -data_ov000_020b51a8 kind:bss addr:0x020b51a8 +data_ov000_020b51c8 kind:bss addr:0x020b51a8 data_ov000_020b51f0 kind:bss addr:0x020b51f0 data_ov000_020b5214_eur kind:bss addr:0x020b51f4 data_ov000_020b5290 kind:bss addr:0x020b5290 diff --git a/config/usa/arm9/overlays/ov001/relocs.txt b/config/usa/arm9/overlays/ov001/relocs.txt index 859fc250..a0da7fc3 100644 --- a/config/usa/arm9/overlays/ov001/relocs.txt +++ b/config/usa/arm9/overlays/ov001/relocs.txt @@ -1141,7 +1141,7 @@ from:0x020bba48 kind:load to:0x02043e30 module:main from:0x020bba62 kind:thumb_call_arm to:0x01fff350 module:itcm from:0x020bba7c kind:thumb_call_arm to:0x020984d0 module:overlay(0) from:0x020bba86 kind:thumb_call_arm to:0x01fff350 module:itcm -from:0x020bba98 kind:load to:0x020b2fe0 module:overlay(0) +from:0x020bba98 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x020bbaa0 kind:load to:0x027e0ce4 module:dtcm from:0x020bbac4 kind:thumb_call_arm to:0x02011f3c module:main from:0x020bbace kind:thumb_call to:0x02057730 module:overlay(0) @@ -1508,7 +1508,7 @@ from:0x020bd46c kind:thumb_call_arm to:0x020921c4 module:overlay(0) from:0x020bd474 kind:load to:0x027e09a4 module:dtcm from:0x020bd478 kind:load to:0x020d8640 module:overlay(24) from:0x020bd47c kind:load to:0x020aa870 module:overlay(0) -from:0x020bd480 kind:load to:0x020b2fe0 module:overlay(0) +from:0x020bd480 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x020bd484 kind:load to:0x027e0ce4 module:dtcm from:0x020bd48c kind:load to:0x027e09b8 module:dtcm from:0x020bd4a4 kind:thumb_call_arm to:0x02011f3c module:main diff --git a/config/usa/arm9/overlays/ov017/symbols.txt b/config/usa/arm9/overlays/ov017/symbols.txt index 21d2901c..4d8e4f15 100644 --- a/config/usa/arm9/overlays/ov017/symbols.txt +++ b/config/usa/arm9/overlays/ov017/symbols.txt @@ -15,8 +15,8 @@ func_ov017_020bc5fc kind:function(arm,size=0x44) addr:0x020bc5dc func_ov017_020bc640 kind:function(arm,size=0x31c) addr:0x020bc620 func_ov017_020bc95c kind:function(arm,size=0xe4) addr:0x020bc93c func_ov017_020bca40 kind:function(arm,size=0x3a8) addr:0x020bca20 -func_ov017_020bcde8 kind:function(arm,size=0x4b8) addr:0x020bcdc8 -func_ov017_020bd2a0 kind:function(arm,size=0x48) addr:0x020bd280 +_ZN21UnkStruct_027e0ce0_4019func_ov017_020bcde8EiP11ItemManager kind:function(arm,size=0x4b8) addr:0x020bcdc8 +_ZN11ItemManager19func_ov017_020bd2a0Eii kind:function(arm,size=0x48) addr:0x020bd280 func_ov017_020bd2e8 kind:function(arm,size=0x18) addr:0x020bd2c8 func_ov017_020bd300 kind:function(arm,size=0x178) addr:0x020bd2e0 func_ov017_020bd478 kind:function(arm,size=0x28) addr:0x020bd458 @@ -29,15 +29,15 @@ _ZN18UnkStruct_027e0ce019func_ov017_020bd69cEv kind:function(arm,size=0x1c) addr func_ov017_020bd6b8 kind:function(arm,size=0x28) addr:0x020bd698 func_ov017_020bd6e0 kind:function(arm,size=0x78) addr:0x020bd6c0 func_ov017_020bd758 kind:function(arm,size=0x30) addr:0x020bd738 -func_ov017_020bd788 kind:function(arm,size=0x56c) addr:0x020bd768 -func_ov017_020bdcf4 kind:function(arm,size=0x90) addr:0x020bdcd4 -func_ov017_020bdd84 kind:function(arm,size=0x1c4) addr:0x020bdd64 -func_ov017_020bdf48 kind:function(arm,size=0x150) addr:0x020bdf28 +_ZN15PlayerLinkActor19func_ov017_020bd788Ei kind:function(arm,size=0x56c) addr:0x020bd768 +_ZN15PlayerLinkActor19func_ov017_020bdcf4Ev kind:function(arm,size=0x90) addr:0x020bdcd4 +_ZN15PlayerLinkActor19func_ov017_020bdd84Eii kind:function(arm,size=0x1c4) addr:0x020bdd64 +_ZN15PlayerLinkActor19func_ov017_020bdf48Eiiii kind:function(arm,size=0x150) addr:0x020bdf28 func_ov017_020be098 kind:function(arm,size=0x10) addr:0x020be078 func_ov017_020be0a8 kind:function(arm,size=0x38) addr:0x020be088 func_ov017_020be0e0 kind:function(arm,size=0x20c) addr:0x020be0c0 func_ov017_020be2ec kind:function(arm,size=0x148) addr:0x020be2cc -func_ov017_020be434 kind:function(arm,size=0x18) addr:0x020be414 +_ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov017_020be434Ev kind:function(arm,size=0x18) addr:0x020be414 func_ov017_020be44c kind:function(arm,size=0x45c) addr:0x020be42c func_ov017_020be8a8 kind:function(arm,size=0x124) addr:0x020be888 _ZN12CargoManager8DoUpdateEv kind:function(arm,size=0x18) addr:0x020be9ac diff --git a/config/usa/arm9/overlays/ov019/symbols.txt b/config/usa/arm9/overlays/ov019/symbols.txt index 9406b93e..4adbdb18 100644 --- a/config/usa/arm9/overlays/ov019/symbols.txt +++ b/config/usa/arm9/overlays/ov019/symbols.txt @@ -215,24 +215,24 @@ _ZN19FileSelectSubScreenD1Ev kind:function(arm,size=0xec) addr:0x020cfb08 _ZN21FileSelectManager_160C1EP23GameModeManagerBase_104P14FileSelectMain kind:function(arm,size=0x54) addr:0x020cfbf4 _ZN21FileSelectManager_160D1Ev kind:function(arm,size=0x14) addr:0x020cfc48 _ZN21FileSelectManager_160D0Ev kind:function(arm,size=0x1c) addr:0x020cfc5c -_ZN21FileSelectManager_1608vfunc_08Ei kind:function(arm,size=0x50) addr:0x020cfc78 -_ZN21FileSelectManager_1608vfunc_0CEi kind:function(arm,size=0x64) addr:0x020cfcc8 -_ZN21FileSelectManager_1608vfunc_14Ei kind:function(arm,size=0x4) addr:0x020cfd2c -_ZN21FileSelectManager_1608vfunc_10Eii kind:function(arm,size=0x8c) addr:0x020cfd30 -_ZN21FileSelectManager_1608vfunc_18Ei kind:function(arm,size=0x10) addr:0x020cfdbc -_ZN21FileSelectManager_1608vfunc_1CEi kind:function(arm,size=0x64) addr:0x020cfdcc -_ZN21FileSelectManager_1608vfunc_20Eii kind:function(arm,size=0xac) addr:0x020cfe30 -_ZN21FileSelectManager_1608vfunc_24Ev kind:function(arm,size=0x34) addr:0x020cfedc +_ZN21FileSelectManager_1609vfunc2_08Ei kind:function(arm,size=0x50) addr:0x020cfc78 +_ZN21FileSelectManager_1609vfunc2_0CEi kind:function(arm,size=0x64) addr:0x020cfcc8 +_ZN21FileSelectManager_1609vfunc2_14Ei kind:function(arm,size=0x4) addr:0x020cfd2c +_ZN21FileSelectManager_1608vfunc_54Eii kind:function(arm,size=0x8c) addr:0x020cfd30 +_ZN21FileSelectManager_1609vfunc2_18Ei kind:function(arm,size=0x10) addr:0x020cfdbc +_ZN21FileSelectManager_1608vfunc_5CEi kind:function(arm,size=0x64) addr:0x020cfdcc +_ZN21FileSelectManager_1608vfunc_58Eii kind:function(arm,size=0xac) addr:0x020cfe30 +_ZN21FileSelectManager_1608vfunc_60Ev kind:function(arm,size=0x34) addr:0x020cfedc _ZN21FileSelectManager_164C1EP23GameModeManagerBase_104P14FileSelectMain kind:function(arm,size=0x4c) addr:0x020cff10 _ZN21FileSelectManager_164D1Ev kind:function(arm,size=0x3c) addr:0x020cff5c _ZN21FileSelectManager_164D0Ev kind:function(arm,size=0x44) addr:0x020cff98 -_ZN21FileSelectManager_1648vfunc_08Ei kind:function(arm,size=0x50) addr:0x020cffdc -_ZN21FileSelectManager_1648vfunc_0CEi kind:function(arm,size=0x90) addr:0x020d002c -_ZN21FileSelectManager_1648vfunc_14Ei kind:function(arm,size=0x4) addr:0x020d00bc -_ZN21FileSelectManager_1648vfunc_10Eii kind:function(arm,size=0xa8) addr:0x020d00c0 -_ZN21FileSelectManager_1648vfunc_18Ei kind:function(arm,size=0x38) addr:0x020d0168 -_ZN21FileSelectManager_1648vfunc_1CEi kind:function(arm,size=0xa4) addr:0x020d01a0 -_ZN21FileSelectManager_1648vfunc_20Eii kind:function(arm,size=0x90) addr:0x020d0244 +_ZN21FileSelectManager_1649vfunc2_08Ei kind:function(arm,size=0x50) addr:0x020cffdc +_ZN21FileSelectManager_1649vfunc2_0CEi kind:function(arm,size=0x90) addr:0x020d002c +_ZN21FileSelectManager_1649vfunc2_14Ei kind:function(arm,size=0x4) addr:0x020d00bc +_ZN21FileSelectManager_1648vfunc_54Eii kind:function(arm,size=0xa8) addr:0x020d00c0 +_ZN21FileSelectManager_1649vfunc2_18Ei kind:function(arm,size=0x38) addr:0x020d0168 +_ZN21FileSelectManager_1648vfunc_5CEi kind:function(arm,size=0xa4) addr:0x020d01a0 +_ZN21FileSelectManager_1648vfunc_58Eii kind:function(arm,size=0x90) addr:0x020d0244 _ZN21FileSelectManager_16419func_ov019_020d02f4Ev kind:function(arm,size=0x28) addr:0x020d02d4 _ZN25UnkSystem1_ov019_Derived2C1Ev kind:function(arm,size=0x40) addr:0x020d02fc _ZN25UnkSystem1_ov019_Derived28vfunc_08Ei kind:function(arm,size=0x48) addr:0x020d033c diff --git a/config/usa/arm9/overlays/ov024/relocs.txt b/config/usa/arm9/overlays/ov024/relocs.txt index 979939b8..f2cfb41f 100644 --- a/config/usa/arm9/overlays/ov024/relocs.txt +++ b/config/usa/arm9/overlays/ov024/relocs.txt @@ -72,7 +72,7 @@ from:0x020c4c2c kind:arm_call to:0x0207308c module:overlay(0) from:0x020c4c80 kind:arm_call to:0x02073450 module:overlay(0) from:0x020c4c98 kind:load to:0x020d8678 module:overlay(24) from:0x020c4c9c kind:load to:0x027e0ce4 module:dtcm -from:0x020c4ca0 kind:load to:0x020b2fe0 module:overlay(0) +from:0x020c4ca0 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x020c4ca4 kind:load to:0x027e09b8 module:dtcm from:0x020c4cf4 kind:arm_call to:0x01ffd3d8 module:itcm from:0x020c4d18 kind:arm_call to:0x02019510 module:main @@ -2515,7 +2515,7 @@ from:0x020d7280 kind:load to:0x027e0cd8 module:dtcm from:0x020d7284 kind:load to:0x027e09a4 module:dtcm from:0x020d7288 kind:load to:0x027e0ce0 module:dtcm from:0x020d728c kind:load to:0x027e0ce4 module:dtcm -from:0x020d7294 kind:load to:0x020b2fe0 module:overlay(0) +from:0x020d7294 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x020d72a8 kind:arm_call to:0x0209faf8 module:overlay(0) from:0x020d72b0 kind:arm_call to:0x02098468 module:overlay(0) from:0x020d72c8 kind:arm_call to:0x0209faf8 module:overlay(0) diff --git a/config/usa/arm9/overlays/ov024/symbols.txt b/config/usa/arm9/overlays/ov024/symbols.txt index 932f8051..c560482c 100644 --- a/config/usa/arm9/overlays/ov024/symbols.txt +++ b/config/usa/arm9/overlays/ov024/symbols.txt @@ -143,16 +143,16 @@ _ZN24AdventureModeManager_160C1EP23GameModeManagerBase_104P24AdventureModeManage _ZN27AdventureModeManager_160_4CD1Ev kind:function(arm,size=0x14) addr:0x020c79e0 _ZN24AdventureModeManager_160D1Ev kind:function(arm,size=0x30) addr:0x020c79f4 _ZN24AdventureModeManager_160D0Ev kind:function(arm,size=0x38) addr:0x020c7a24 -_ZN24AdventureModeManager_1608vfunc_08Ei kind:function(arm,size=0x9c) addr:0x020c7a5c -_ZN24AdventureModeManager_1608vfunc_0CEi kind:function(arm,size=0x1a0) addr:0x020c7af8 -_ZN24AdventureModeManager_1608vfunc_10Eii kind:function(arm,size=0x24) addr:0x020c7c98 -_ZN24AdventureModeManager_1608vfunc_14Ei kind:function(arm,size=0x20) addr:0x020c7cbc +_ZN24AdventureModeManager_1609vfunc2_08Ei kind:function(arm,size=0x9c) addr:0x020c7a5c +_ZN24AdventureModeManager_1609vfunc2_0CEi kind:function(arm,size=0x1a0) addr:0x020c7af8 +_ZN24AdventureModeManager_1608vfunc_54Eii kind:function(arm,size=0x24) addr:0x020c7c98 +_ZN24AdventureModeManager_1609vfunc2_14Ei kind:function(arm,size=0x20) addr:0x020c7cbc _ZN24AdventureModeManager_16019func_ov024_020c7cfcEv kind:function(arm,size=0x50) addr:0x020c7cdc _ZN24AdventureModeManager_16019func_ov024_020c7d4cEi kind:function(arm,size=0xf0) addr:0x020c7d2c -_ZN24AdventureModeManager_1608vfunc_18Ei kind:function(arm,size=0x118) addr:0x020c7e1c -_ZN24AdventureModeManager_1608vfunc_1CEi kind:function(arm,size=0x36c) addr:0x020c7f34 -_ZN24AdventureModeManager_1608vfunc_20Eii kind:function(arm,size=0xf8) addr:0x020c82a0 -_ZN24AdventureModeManager_1608vfunc_24Ev kind:function(arm,size=0x4) addr:0x020c8398 +_ZN24AdventureModeManager_1609vfunc2_18Ei kind:function(arm,size=0x118) addr:0x020c7e1c +_ZN24AdventureModeManager_1608vfunc_5CEi kind:function(arm,size=0x36c) addr:0x020c7f34 +_ZN24AdventureModeManager_1608vfunc_58Eii kind:function(arm,size=0xf8) addr:0x020c82a0 +_ZN24AdventureModeManager_1608vfunc_60Ev kind:function(arm,size=0x4) addr:0x020c8398 _ZN24AdventureModeManager_16019func_ov024_020c83bcEv kind:function(arm,size=0x6c) addr:0x020c839c _ZN24AdventureModeManager_16019func_ov024_020c8428Ev kind:function(arm,size=0x2c) addr:0x020c8408 _ZN24AdventureModeManager_16019func_ov024_020c8454Ev kind:function(arm,size=0x30) addr:0x020c8434 @@ -165,11 +165,11 @@ _ZN24AdventureModeManager_170C1EP23GameModeManagerBase_104 kind:function(arm,siz _ZN27AdventureModeManager_170_14D1Ev kind:function(arm,size=0x14) addr:0x020c8610 _ZN24AdventureModeManager_170D1Ev kind:function(arm,size=0x20) addr:0x020c8624 _ZN24AdventureModeManager_170D0Ev kind:function(arm,size=0x28) addr:0x020c8644 -_ZN24AdventureModeManager_1708vfunc_08Ei kind:function(arm,size=0x38) addr:0x020c866c -_ZN24AdventureModeManager_1708vfunc_0CEi kind:function(arm,size=0x74) addr:0x020c86a4 -_ZN24AdventureModeManager_1708vfunc_10Eii kind:function(arm,size=0xd4) addr:0x020c8718 -_ZN24AdventureModeManager_1708vfunc_18Ei kind:function(arm,size=0xc) addr:0x020c87ec -_ZN24AdventureModeManager_1708vfunc_24Ev kind:function(arm,size=0x2c) addr:0x020c87f8 +_ZN24AdventureModeManager_1709vfunc2_08Ei kind:function(arm,size=0x38) addr:0x020c866c +_ZN24AdventureModeManager_1709vfunc2_0CEi kind:function(arm,size=0x74) addr:0x020c86a4 +_ZN24AdventureModeManager_1708vfunc_54Eii kind:function(arm,size=0xd4) addr:0x020c8718 +_ZN24AdventureModeManager_1709vfunc2_18Ei kind:function(arm,size=0xc) addr:0x020c87ec +_ZN24AdventureModeManager_1708vfunc_60Ev kind:function(arm,size=0x2c) addr:0x020c87f8 _ZN27AdventureModeManager_170_14D0Ev kind:function(arm,size=0x1c) addr:0x020c8824 _ZN32AdventureModeManager_174_Base_108vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020c8840 _ZN32AdventureModeManager_174_Base_108vfunc_10Ev kind:function(thumb,size=0x10) addr:0x020c8850 @@ -181,25 +181,25 @@ _ZN32AdventureModeManager_174_Base_10D0Ev kind:function(arm,size=0x1c) addr:0x02 _ZN29AdventureModeManager_174_BaseD1Ev kind:function(arm,size=0x20) addr:0x020c8cfc _ZN29AdventureModeManager_174_BaseD0Ev kind:function(arm,size=0x28) addr:0x020c8d1c _ZN24AdventureModeManager_174C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x2c) addr:0x020c8d44 -_ZN24AdventureModeManager_1748vfunc_08Ei kind:function(thumb,size=0x58) addr:0x020c8d70 -_ZN24AdventureModeManager_1748vfunc_0CEi kind:function(thumb,size=0x48) addr:0x020c8dc8 -_ZN24AdventureModeManager_1748vfunc_10Eii kind:function(thumb,size=0xac) addr:0x020c8e10 -_ZN24AdventureModeManager_1748vfunc_18Ei kind:function(thumb,size=0x6c) addr:0x020c8ebc -_ZN24AdventureModeManager_1748vfunc_1CEi kind:function(thumb,size=0x40) addr:0x020c8f28 -_ZN24AdventureModeManager_1748vfunc_20Eii kind:function(thumb,size=0xc0) addr:0x020c8f68 -_ZN24AdventureModeManager_1748vfunc_24Ev kind:function(thumb,size=0x2) addr:0x020c9028 +_ZN24AdventureModeManager_1749vfunc2_08Ei kind:function(thumb,size=0x58) addr:0x020c8d70 +_ZN24AdventureModeManager_1749vfunc2_0CEi kind:function(thumb,size=0x48) addr:0x020c8dc8 +_ZN24AdventureModeManager_1748vfunc_54Eii kind:function(thumb,size=0xac) addr:0x020c8e10 +_ZN24AdventureModeManager_1749vfunc2_18Ei kind:function(thumb,size=0x6c) addr:0x020c8ebc +_ZN24AdventureModeManager_1748vfunc_5CEi kind:function(thumb,size=0x40) addr:0x020c8f28 +_ZN24AdventureModeManager_1748vfunc_58Eii kind:function(thumb,size=0xc0) addr:0x020c8f68 +_ZN24AdventureModeManager_1748vfunc_60Ev kind:function(thumb,size=0x2) addr:0x020c9028 _ZN24AdventureModeManager_174D1Ev kind:function(arm,size=0x20) addr:0x020c902c _ZN24AdventureModeManager_174D0Ev kind:function(arm,size=0x28) addr:0x020c904c _ZN29AdventureModeManager_178_BaseC2EP23GameModeManagerBase_104 kind:function(thumb,size=0x14) addr:0x020c9074 -_ZN29AdventureModeManager_178_Base8vfunc_08Ei kind:function(thumb,size=0x2c) addr:0x020c9088 -_ZN29AdventureModeManager_178_Base8vfunc_0CEi kind:function(thumb,size=0x1c) addr:0x020c90b4 -_ZN29AdventureModeManager_178_Base8vfunc_18Ei kind:function(thumb,size=0x2c) addr:0x020c90d0 -_ZN29AdventureModeManager_178_Base8vfunc_1CEi kind:function(thumb,size=0x1c) addr:0x020c90fc +_ZN29AdventureModeManager_178_Base9vfunc2_08Ei kind:function(thumb,size=0x2c) addr:0x020c9088 +_ZN29AdventureModeManager_178_Base9vfunc2_0CEi kind:function(thumb,size=0x1c) addr:0x020c90b4 +_ZN29AdventureModeManager_178_Base9vfunc2_18Ei kind:function(thumb,size=0x2c) addr:0x020c90d0 +_ZN29AdventureModeManager_178_Base8vfunc_5CEi kind:function(thumb,size=0x1c) addr:0x020c90fc _ZN29AdventureModeManager_178_BaseD1Ev kind:function(arm,size=0x20) addr:0x020c9118 _ZN29AdventureModeManager_178_BaseD0Ev kind:function(arm,size=0x28) addr:0x020c9138 _ZN24AdventureModeManager_178C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x2c) addr:0x020c9160 -_ZN24AdventureModeManager_1788vfunc_10Eii kind:function(thumb,size=0x24) addr:0x020c918c -_ZN24AdventureModeManager_1788vfunc_20Eii kind:function(thumb,size=0x24) addr:0x020c91b0 +_ZN24AdventureModeManager_1788vfunc_54Eii kind:function(thumb,size=0x24) addr:0x020c918c +_ZN24AdventureModeManager_1788vfunc_58Eii kind:function(thumb,size=0x24) addr:0x020c91b0 _ZN24AdventureModeManager_178D1Ev kind:function(arm,size=0x20) addr:0x020c91d4 _ZN24AdventureModeManager_178D0Ev kind:function(arm,size=0x28) addr:0x020c91f4 _ZN27AdventureModeManager_180_188vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020c921c @@ -207,29 +207,29 @@ _ZN24AdventureModeManager_180C1EP23GameModeManagerBase_104 kind:function(thumb,s _ZN27AdventureModeManager_180_18D1Ev kind:function(thumb,size=0xc) addr:0x020c927c _ZN24AdventureModeManager_180D1Ev kind:function(thumb,size=0x14) addr:0x020c9288 _ZN24AdventureModeManager_180D0Ev kind:function(thumb,size=0x1a) addr:0x020c929c -_ZN24AdventureModeManager_1808vfunc_08Ei kind:function(thumb,size=0x64) addr:0x020c92b8 -_ZN24AdventureModeManager_1808vfunc_0CEi kind:function(thumb,size=0x90) addr:0x020c931c -_ZN24AdventureModeManager_1808vfunc_10Eii kind:function(thumb,size=0x64) addr:0x020c93ac +_ZN24AdventureModeManager_1809vfunc2_08Ei kind:function(thumb,size=0x64) addr:0x020c92b8 +_ZN24AdventureModeManager_1809vfunc2_0CEi kind:function(thumb,size=0x90) addr:0x020c931c +_ZN24AdventureModeManager_1808vfunc_54Eii kind:function(thumb,size=0x64) addr:0x020c93ac _ZN24AdventureModeManager_18019func_ov024_020c9430Eii kind:function(thumb,size=0x24) addr:0x020c9410 -_ZN24AdventureModeManager_1808vfunc_18Ei kind:function(thumb,size=0x30) addr:0x020c9434 -_ZN24AdventureModeManager_1808vfunc_1CEi kind:function(thumb,size=0x78) addr:0x020c9464 -_ZN24AdventureModeManager_1808vfunc_20Eii kind:function(thumb,size=0x7c) addr:0x020c94dc -_ZN24AdventureModeManager_1808vfunc_24Ev kind:function(thumb,size=0x2) addr:0x020c9558 +_ZN24AdventureModeManager_1809vfunc2_18Ei kind:function(thumb,size=0x30) addr:0x020c9434 +_ZN24AdventureModeManager_1808vfunc_5CEi kind:function(thumb,size=0x78) addr:0x020c9464 +_ZN24AdventureModeManager_1808vfunc_58Eii kind:function(thumb,size=0x7c) addr:0x020c94dc +_ZN24AdventureModeManager_1808vfunc_60Ev kind:function(thumb,size=0x2) addr:0x020c9558 _ZN24AdventureModeManager_18019func_ov024_020c957cEv kind:function(thumb,size=0x48) addr:0x020c955c _ZN24AdventureModeManager_18019func_ov024_020c95c4Ev kind:function(thumb,size=0x48) addr:0x020c95a4 _ZN27AdventureModeManager_180_18D0Ev kind:function(arm,size=0x1c) addr:0x020c95ec _ZN24AdventureModeManager_184C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x30) addr:0x020c9608 _ZN24AdventureModeManager_184D1Ev kind:function(thumb,size=0xc) addr:0x020c9638 _ZN24AdventureModeManager_184D0Ev kind:function(thumb,size=0x12) addr:0x020c9644 -_ZN24AdventureModeManager_1848vfunc_08Ei kind:function(thumb,size=0x20) addr:0x020c9658 -_ZN24AdventureModeManager_1848vfunc_0CEi kind:function(thumb,size=0xf8) addr:0x020c9678 -_ZN24AdventureModeManager_1848vfunc_10Eii kind:function(thumb,size=0x8) addr:0x020c9770 -_ZN24AdventureModeManager_1848vfunc_14Ei kind:function(thumb,size=0x2) addr:0x020c9778 +_ZN24AdventureModeManager_1849vfunc2_08Ei kind:function(thumb,size=0x20) addr:0x020c9658 +_ZN24AdventureModeManager_1849vfunc2_0CEi kind:function(thumb,size=0xf8) addr:0x020c9678 +_ZN24AdventureModeManager_1848vfunc_54Eii kind:function(thumb,size=0x8) addr:0x020c9770 +_ZN24AdventureModeManager_1849vfunc2_14Ei kind:function(thumb,size=0x2) addr:0x020c9778 _ZN24AdventureModeManager_18419func_ov024_020c979cEi kind:function(thumb,size=0x94) addr:0x020c977c -_ZN24AdventureModeManager_1848vfunc_18Ei kind:function(thumb,size=0x7c) addr:0x020c9810 -_ZN24AdventureModeManager_1848vfunc_1CEi kind:function(thumb,size=0x60) addr:0x020c988c -_ZN24AdventureModeManager_1848vfunc_20Eii kind:function(thumb,size=0x5c) addr:0x020c98ec -_ZN24AdventureModeManager_1848vfunc_24Ev kind:function(thumb,size=0x8) addr:0x020c9948 +_ZN24AdventureModeManager_1849vfunc2_18Ei kind:function(thumb,size=0x7c) addr:0x020c9810 +_ZN24AdventureModeManager_1848vfunc_5CEi kind:function(thumb,size=0x60) addr:0x020c988c +_ZN24AdventureModeManager_1848vfunc_58Eii kind:function(thumb,size=0x5c) addr:0x020c98ec +_ZN24AdventureModeManager_1848vfunc_60Ev kind:function(thumb,size=0x8) addr:0x020c9948 _ZN27AdventureModeManager_18C_14C1Ev kind:function(thumb,size=0x14) addr:0x020c9950 _ZN27AdventureModeManager_18C_148vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020c9964 _ZN27AdventureModeManager_18C_148vfunc_10Ev kind:function(thumb,size=0x10) addr:0x020c9974 @@ -237,15 +237,15 @@ _ZN24AdventureModeManager_18CC1EP23GameModeManagerBase_104 kind:function(thumb,s _ZN27AdventureModeManager_18C_14D1Ev kind:function(thumb,size=0xc) addr:0x020c99ec _ZN24AdventureModeManager_18CD1Ev kind:function(thumb,size=0x14) addr:0x020c99f8 _ZN24AdventureModeManager_18CD0Ev kind:function(thumb,size=0x1a) addr:0x020c9a0c -_ZN24AdventureModeManager_18C8vfunc_08Ei kind:function(thumb,size=0x32) addr:0x020c9a28 -_ZN24AdventureModeManager_18C8vfunc_0CEi kind:function(thumb,size=0xf0) addr:0x020c9a5c -_ZN24AdventureModeManager_18C8vfunc_10Eii kind:function(thumb,size=0x100) addr:0x020c9b4c +_ZN24AdventureModeManager_18C9vfunc2_08Ei kind:function(thumb,size=0x32) addr:0x020c9a28 +_ZN24AdventureModeManager_18C9vfunc2_0CEi kind:function(thumb,size=0xf0) addr:0x020c9a5c +_ZN24AdventureModeManager_18C8vfunc_54Eii kind:function(thumb,size=0x100) addr:0x020c9b4c _ZN24AdventureModeManager_18C19func_ov024_020c9c6cEv kind:function(thumb,size=0xb4) addr:0x020c9c4c -_ZN24AdventureModeManager_18C8vfunc_14Ei kind:function(thumb,size=0x10) addr:0x020c9d00 -_ZN24AdventureModeManager_18C8vfunc_18Ei kind:function(thumb,size=0xac) addr:0x020c9d10 -_ZN24AdventureModeManager_18C8vfunc_1CEi kind:function(thumb,size=0x88) addr:0x020c9dbc -_ZN24AdventureModeManager_18C8vfunc_20Eii kind:function(thumb,size=0x1c4) addr:0x020c9e44 -_ZN24AdventureModeManager_18C8vfunc_24Ev kind:function(thumb,size=0xa) addr:0x020ca008 +_ZN24AdventureModeManager_18C9vfunc2_14Ei kind:function(thumb,size=0x10) addr:0x020c9d00 +_ZN24AdventureModeManager_18C9vfunc2_18Ei kind:function(thumb,size=0xac) addr:0x020c9d10 +_ZN24AdventureModeManager_18C8vfunc_5CEi kind:function(thumb,size=0x88) addr:0x020c9dbc +_ZN24AdventureModeManager_18C8vfunc_58Eii kind:function(thumb,size=0x1c4) addr:0x020c9e44 +_ZN24AdventureModeManager_18C8vfunc_60Ev kind:function(thumb,size=0xa) addr:0x020ca008 _ZN24AdventureModeManager_18C19func_ov024_020ca034Ev kind:function(thumb,size=0x34) addr:0x020ca014 _ZN24AdventureModeManager_18C19func_ov024_020ca068Ei kind:function(thumb,size=0xc) addr:0x020ca048 _ZN24AdventureModeManager_18C19func_ov024_020ca074Ev kind:function(thumb,size=0x6) addr:0x020ca054 @@ -255,12 +255,12 @@ _ZN27AdventureModeManager_190_388vfunc_0CEv kind:function(thumb,size=0xc) addr:0 _ZN24AdventureModeManager_190C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x54) addr:0x020ca094 _ZN27AdventureModeManager_190_14D1Ev kind:function(thumb,size=0xc) addr:0x020ca0e8 _ZN27AdventureModeManager_190_38D1Ev kind:function(thumb,size=0xc) addr:0x020ca0f4 -_ZN24AdventureModeManager_1908vfunc_08Ei kind:function(thumb,size=0xc) addr:0x020ca100 -_ZN24AdventureModeManager_1908vfunc_0CEi kind:function(thumb,size=0x20) addr:0x020ca10c -_ZN24AdventureModeManager_1908vfunc_10Eii kind:function(thumb,size=0x3c) addr:0x020ca12c -_ZN24AdventureModeManager_1908vfunc_18Ei kind:function(thumb,size=0xc) addr:0x020ca168 -_ZN24AdventureModeManager_1908vfunc_1CEi kind:function(thumb,size=0x20) addr:0x020ca174 -_ZN24AdventureModeManager_1908vfunc_20Eii kind:function(thumb,size=0x68) addr:0x020ca194 +_ZN24AdventureModeManager_1909vfunc2_08Ei kind:function(thumb,size=0xc) addr:0x020ca100 +_ZN24AdventureModeManager_1909vfunc2_0CEi kind:function(thumb,size=0x20) addr:0x020ca10c +_ZN24AdventureModeManager_1908vfunc_54Eii kind:function(thumb,size=0x3c) addr:0x020ca12c +_ZN24AdventureModeManager_1909vfunc2_18Ei kind:function(thumb,size=0xc) addr:0x020ca168 +_ZN24AdventureModeManager_1908vfunc_5CEi kind:function(thumb,size=0x20) addr:0x020ca174 +_ZN24AdventureModeManager_1908vfunc_58Eii kind:function(thumb,size=0x68) addr:0x020ca194 _ZN24AdventureModeManager_19019func_ov024_020ca21cEv kind:function(thumb,size=0x30) addr:0x020ca1fc _ZN24AdventureModeManager_19019func_ov024_020ca24cEi kind:function(thumb,size=0x34) addr:0x020ca22c _ZN24AdventureModeManager_19019func_ov024_020ca280Ev kind:function(thumb,size=0x10) addr:0x020ca260 diff --git a/config/usa/arm9/overlays/ov031/delinks.txt b/config/usa/arm9/overlays/ov031/delinks.txt index 08481039..11032939 100644 --- a/config/usa/arm9/overlays/ov031/delinks.txt +++ b/config/usa/arm9/overlays/ov031/delinks.txt @@ -187,7 +187,7 @@ src/031_Land/Actor/ActorItemDrop.cpp: .bss start:0x02116e4c end:0x02116f7c src/031_Land/Actor/ActorUnkMLCK.cpp: - .text start:0x020fab3c end:0x020fb28c + .text start:0x020fab3c end:0x020fb2ec .init start:0x02111968 end:0x021119dc .ctor start:0x021127e0 end:0x021127e4 .data start:0x02114d08 end:0x02114dfc diff --git a/config/usa/arm9/overlays/ov031/relocs.txt b/config/usa/arm9/overlays/ov031/relocs.txt index 82387213..cbabafd6 100644 --- a/config/usa/arm9/overlays/ov031/relocs.txt +++ b/config/usa/arm9/overlays/ov031/relocs.txt @@ -3776,7 +3776,7 @@ from:0x020fab9c kind:arm_call to:0x02098368 module:overlay(0) from:0x020faba4 kind:arm_call to:0x02061628 module:overlay(0) from:0x020fac38 kind:load to:0x02114d14 add:0x8 module:overlay(31) from:0x020fac3c kind:load to:0x02114d50 add:0x8 module:overlay(31) -from:0x020fac40 kind:load to:0x02114dcc add:0x8 module:overlay(31) +from:0x020fac40 kind:load to:0x02114d50 add:0x84 module:overlay(31) from:0x020fac7c kind:arm_call to:0x01fff350 module:itcm from:0x020facb0 kind:arm_call to:0x020611bc module:overlay(0) from:0x020fad08 kind:load to:0x027e0ce4 module:dtcm @@ -3793,7 +3793,7 @@ from:0x020fade0 kind:load to:0x02110bcc module:overlay(31) from:0x020fade4 kind:load to:0x020b5198 module:overlay(0) from:0x020fae3c kind:arm_call to:0x0206d254 module:overlay(0) from:0x020fae48 kind:arm_call to:0x020c6ce4 module:overlay(24) -from:0x020fae58 kind:arm_call to:0x020c6cf0 module:overlays(24,19) +from:0x020fae58 kind:arm_call to:0x020c6cf0 module:overlay(24) from:0x020fae84 kind:load to:0x0204a068 module:main from:0x020fae88 kind:load to:0x020b5198 module:overlay(0) from:0x020fae8c kind:load to:0x027e0994 module:dtcm @@ -3801,7 +3801,7 @@ from:0x020faeb0 kind:arm_call to:0x02098a68 module:overlay(0) from:0x020faefc kind:arm_call to:0x02098a68 module:overlay(0) from:0x020faf34 kind:arm_call to:0x020fb1e4 module:overlay(31) from:0x020faf4c kind:arm_call to:0x020611dc module:overlay(0) -from:0x020faf58 kind:arm_call to:0x020c6cf0 module:overlays(19,24) +from:0x020faf58 kind:arm_call to:0x020c6cf0 module:overlay(24) from:0x020faf64 kind:arm_call to:0x02072fb0 module:overlay(0) from:0x020faf84 kind:arm_call to:0x01fff148 module:itcm from:0x020fafb0 kind:arm_call to:0x02073368 module:overlay(0) diff --git a/config/usa/arm9/overlays/ov031/symbols.txt b/config/usa/arm9/overlays/ov031/symbols.txt index d7f2d430..01f1ed2c 100644 --- a/config/usa/arm9/overlays/ov031/symbols.txt +++ b/config/usa/arm9/overlays/ov031/symbols.txt @@ -149,17 +149,17 @@ func_ov031_020db374 kind:function(arm,size=0x74) addr:0x020db354 func_ov031_020db3e8 kind:function(arm,size=0x18) addr:0x020db3c8 func_ov031_020db400 kind:function(arm,size=0x98) addr:0x020db3e0 func_ov031_020db498 kind:function(arm,size=0x58) addr:0x020db478 -func_ov031_020db4f0 kind:function(arm,size=0x38) addr:0x020db4d0 -func_ov031_020db528 kind:function(arm,size=0x8c) addr:0x020db508 +_ZN27UnkStruct_ItemManager_20_0419func_ov031_020db4f0Eii kind:function(arm,size=0x38) addr:0x020db4d0 +_ZN27UnkStruct_ItemManager_20_0419func_ov031_020db528Ei kind:function(arm,size=0x8c) addr:0x020db508 _ZN27UnkStruct_ItemManager_20_0819func_ov031_020db5b4Ev kind:function(arm,size=0x20) addr:0x020db594 func_ov031_020db5d4 kind:function(arm,size=0x14) addr:0x020db5b4 func_ov031_020db5e8 kind:function(arm,size=0x2c) addr:0x020db5c8 func_ov031_020db614 kind:function(arm,size=0x90) addr:0x020db5f4 func_ov031_020db6a4 kind:function(arm,size=0x60) addr:0x020db684 -func_ov031_020db704 kind:function(arm,size=0xbc) addr:0x020db6e4 +_ZN27UnkStruct_ItemManager_20_0819func_ov031_020db704Eii kind:function(arm,size=0xbc) addr:0x020db6e4 _ZN27UnkStruct_ItemManager_20_14C1Ev kind:function(thumb,size=0x16) addr:0x020db7a0 _ZN27UnkStruct_ItemManager_20_1419func_ov031_020db7d8Ev kind:function(thumb,size=0x1a) addr:0x020db7b8 -func_ov031_020db7f4 kind:function(arm,size=0x50) addr:0x020db7d4 +_ZN27UnkStruct_ItemManager_20_1419func_ov031_020db7f4Ev kind:function(arm,size=0x50) addr:0x020db7d4 func_ov031_020db844 kind:function(arm,size=0x30) addr:0x020db824 _ZN24UnkStruct_ItemManager_2019func_ov031_020db874Ej kind:function(arm,size=0x58) addr:0x020db854 _ZN24UnkStruct_ItemManager_2019func_ov031_020db8ccEv kind:function(arm,size=0x2c) addr:0x020db8ac @@ -167,15 +167,15 @@ _ZN24UnkStruct_ItemManager_2019func_ov031_020db8f8Ev kind:function(arm,size=0x44 _ZN27UnkStruct_ItemManager_20_0CC1Ev kind:function(thumb,size=0x12) addr:0x020db91c _ZN27UnkStruct_ItemManager_20_0CD1Ev kind:function(thumb,size=0x2) addr:0x020db930 _ZN27UnkStruct_ItemManager_20_0C19func_ov031_020db954Ev kind:function(arm,size=0x4) addr:0x020db934 -func_ov031_020db958 kind:function(arm,size=0xe4) addr:0x020db938 -func_ov031_020dba3c kind:function(arm,size=0x4) addr:0x020dba1c +_ZN27UnkStruct_ItemManager_20_0C19func_ov031_020db958Eii kind:function(arm,size=0xe4) addr:0x020db938 +_ZN27UnkStruct_ItemManager_20_0C19func_ov031_020dba3cEi kind:function(arm,size=0x4) addr:0x020dba1c _ZN27UnkStruct_ItemManager_20_0019func_ov031_020dba40Ev kind:function(arm,size=0x34) addr:0x020dba20 func_ov031_020dba74 kind:function(arm,size=0x18) addr:0x020dba54 func_ov031_020dba8c kind:function(arm,size=0xac) addr:0x020dba6c func_ov031_020dbb38 kind:function(arm,size=0x1c) addr:0x020dbb18 func_ov031_020dbb54 kind:function(arm,size=0xc4) addr:0x020dbb34 func_ov031_020dbc18 kind:function(arm,size=0x68) addr:0x020dbbf8 -func_ov031_020dbc80 kind:function(arm,size=0xa4) addr:0x020dbc60 +_ZN27UnkStruct_ItemManager_20_0019func_ov031_020dbc80Eii kind:function(arm,size=0xa4) addr:0x020dbc60 func_ov031_020dbd24 kind:function(arm,size=0x74) addr:0x020dbd04 func_ov031_020dbd98 kind:function(arm,size=0xc4) addr:0x020dbd78 func_ov031_020dbe5c kind:function(arm,size=0x2c) addr:0x020dbe3c @@ -612,7 +612,7 @@ _ZN19ActorProfileUnkZSRSC1Ev kind:function(thumb,size=0x1c) addr:0x020ea018 _ZN19ActorProfileUnkZLSL10GetProfileEv kind:function(thumb,size=0x8) addr:0x020ea034 _ZN19ActorProfileUnkZLSL6CreateEv kind:function(thumb,size=0x1c) addr:0x020ea03c _ZN19ActorProfileUnkZLSLC1Ev kind:function(thumb,size=0x3c) addr:0x020ea058 -_ZN24UnkStruct_ov031_0211361c19func_ov031_020ea0b4EP5Actor kind:function(thumb,size=0x30) addr:0x020ea094 +_ZN24UnkStruct_ov031_0211361c8vfunc_00EP5Actor kind:function(thumb,size=0x30) addr:0x020ea094 _ZN26ModelRender_ov031_02113670C2EP10G3d_Model_ kind:function(thumb,size=0x14) addr:0x020ea0c4 _ZN26ModelRender_ov031_021136708vfunc_0CEv kind:function(thumb,size=0x8) addr:0x020ea0d8 func_ov031_020ea100 kind:function(thumb,size=0x40) addr:0x020ea0e0 @@ -1208,8 +1208,8 @@ _ZN12ActorUnkMLCKC1Ev kind:function(arm,size=0xb0) addr:0x020fab94 _ZN12ActorUnkMLCK8vfunc_18Ei kind:function(arm,size=0xd8) addr:0x020fac44 _ZN12ActorUnkMLCK8vfunc_64Ei kind:function(arm,size=0x4c) addr:0x020fad1c _ZN12ActorUnkMLCK8vfunc_54Eii kind:function(arm,size=0x20) addr:0x020fad68 -_ZN12ActorUnkMLCK8vfunc_58Ev kind:function(arm,size=0xc) addr:0x020fad88 -_ZN12ActorUnkMLCK8vfunc_5CEv kind:function(arm,size=0x54) addr:0x020fad94 +_ZN12ActorUnkMLCK8vfunc_58Eii kind:function(arm,size=0xc) addr:0x020fad88 +_ZN12ActorUnkMLCK8vfunc_5CEi kind:function(arm,size=0x54) addr:0x020fad94 _ZN12ActorUnkMLCK8vfunc_60Ev kind:function(arm,size=0x18) addr:0x020fade8 _ZN12ActorUnkMLCK8vfunc_68Ev kind:function(arm,size=0x90) addr:0x020fae00 _ZN12ActorUnkMLCK19func_ov031_020faeb0Ev kind:function(arm,size=0x4) addr:0x020fae90 @@ -1218,20 +1218,20 @@ _ZN12ActorUnkMLCK8vfunc_70Ev kind:function(arm,size=0x20) addr:0x020faee4 _ZN12ActorUnkMLCK19func_ov031_020faf24Ev kind:function(arm,size=0x1e0) addr:0x020faf04 _ZN12ActorUnkMLCK19func_ov031_020fb104Ev kind:function(arm,size=0x18) addr:0x020fb0e4 _ZN12ActorUnkMLCK19func_ov031_020fb11cEv kind:function(arm,size=0x68) addr:0x020fb0fc -_ZN18ActorUnkMLCK_B4_0019func_ov031_020fb184Ev kind:function(arm,size=0x2c) addr:0x020fb164 +_ZN15ActorUnkMLCK_C419func_ov031_020fb184Ev kind:function(arm,size=0x2c) addr:0x020fb164 _ZN15ActorUnkMLCK_D89vfunc2_00Ev kind:function(arm,size=0x1c) addr:0x020fb190 _ZN15ActorUnkMLCK_D89vfunc2_04Ev kind:function(arm,size=0x1c) addr:0x020fb1ac -_ZN12ActorUnkMLCK19func_ov031_020fb1e8EP18ActorUnkMLCK_B4_00 kind:function(arm,size=0x1c) addr:0x020fb1c8 +_ZN12ActorUnkMLCK19func_ov031_020fb1e8EP15ActorUnkMLCK_A0 kind:function(arm,size=0x1c) addr:0x020fb1c8 _ZN12ActorUnkMLCK19func_ov031_020fb204Ei kind:function(arm,size=0x4c) addr:0x020fb1e4 _ZN12ActorUnkMLCKD0Ev kind:function(arm,size=0x28) addr:0x020fb230 _ZN12ActorUnkMLCKD1Ev kind:function(arm,size=0x20) addr:0x020fb258 _ZN19ActorProfileUnkMLCKD1Ev kind:function(arm,size=0x14) addr:0x020fb278 -func_ov031_020fb2ac kind:function(arm,size=0x10) addr:0x020fb28c -func_ov031_020fb2bc kind:function(arm,size=0x10) addr:0x020fb29c -func_ov031_020fb2cc kind:function(arm,size=0x10) addr:0x020fb2ac -func_ov031_020fb2dc kind:function(arm,size=0x10) addr:0x020fb2bc -func_ov031_020fb2ec kind:function(arm,size=0x10) addr:0x020fb2cc -func_ov031_020fb2fc kind:function(arm,size=0x10) addr:0x020fb2dc +_ZThn148_N12ActorUnkMLCKD0Ev kind:function(arm,size=0x10) addr:0x020fb28c +_ZThn148_N12ActorUnkMLCK8vfunc_60Ev kind:function(arm,size=0x10) addr:0x020fb29c +_ZThn148_N12ActorUnkMLCK8vfunc_58Eii kind:function(arm,size=0x10) addr:0x020fb2ac +_ZThn148_N12ActorUnkMLCK8vfunc_5CEi kind:function(arm,size=0x10) addr:0x020fb2bc +_ZThn148_N12ActorUnkMLCK8vfunc_54Eii kind:function(arm,size=0x10) addr:0x020fb2cc +_ZThn148_N12ActorUnkMLCKD1Ev kind:function(arm,size=0x10) addr:0x020fb2dc _ZN19ActorProfileUnkCLLT10GetProfileEv kind:function(arm,size=0xc) addr:0x020fb2ec _ZN19ActorProfileUnkCLLT6CreateEv kind:function(arm,size=0x24) addr:0x020fb2f8 _ZN19ActorProfileUnkCLLTC1Ev kind:function(arm,size=0x28) addr:0x020fb31c @@ -1793,7 +1793,7 @@ _ZN23MapObjectProfileUnkSAND6CreateEv kind:function(arm,size=0x24) addr:0x0210aa _ZN23MapObjectProfileUnkSANDC1Ev kind:function(arm,size=0x198) addr:0x0210ab1c _ZN16MapObjectUnkSAND19func_ov031_0210acd4Ev kind:function(arm,size=0x90) addr:0x0210acb4 _ZN16MapObjectUnkSAND19func_ov031_0210ad64Ev kind:function(arm,size=0x9c) addr:0x0210ad44 -_ZN16MapObjectUnkSAND19func_ov031_0210ae00Ev kind:function(arm,size=0x90) addr:0x0210ade0 +_ZN16MapObjectUnkSAND19func_ov031_0210ae00E8Vec2bCppPv kind:function(arm,size=0x90) addr:0x0210ade0 _ZN16MapObjectUnkSAND19func_ov031_0210ae90Ev kind:function(arm,size=0xc0) addr:0x0210ae70 _ZN16MapObjectUnkSAND19func_ov031_0210af50Ev kind:function(arm,size=0xc8) addr:0x0210af30 _ZN16MapObjectUnkSAND19func_ov031_0210b018Ev kind:function(arm,size=0x10) addr:0x0210aff8 @@ -1801,13 +1801,13 @@ _ZN16MapObjectUnkSAND19func_ov031_0210b028Ev kind:function(arm,size=0x84) addr:0 _ZN16MapObjectUnkSAND19func_ov031_0210b0acEv kind:function(arm,size=0x38) addr:0x0210b08c _ZN16MapObjectUnkSAND19func_ov031_0210b0e4Ev kind:function(arm,size=0x60) addr:0x0210b0c4 _ZN16MapObjectUnkSAND19func_ov031_0210b144Ev kind:function(arm,size=0x38) addr:0x0210b124 -_ZN16MapObjectUnkSAND19func_ov031_0210b17cEv kind:function(arm,size=0x70) addr:0x0210b15c +_ZN16MapObjectUnkSAND19func_ov031_0210b17cEP19MapObjectUnkSAND_40i kind:function(arm,size=0x70) addr:0x0210b15c _ZN16MapObjectUnkSAND19func_ov031_0210b1ecEv kind:function(arm,size=0xe0) addr:0x0210b1cc _ZN16MapObjectUnkSAND19func_ov031_0210b2ccEv kind:function(arm,size=0x30) addr:0x0210b2ac -_ZN16MapObjectUnkSANDD1Ev kind:function(arm,size=0x14) addr:0x0210b2dc -_ZN16MapObjectUnkSANDD0Ev kind:function(arm,size=0x1c) addr:0x0210b2f0 -_ZN16MapObjectUnkSAND19func_ov031_0210b32cEv kind:function(arm,size=0x20) addr:0x0210b30c -_ZN16MapObjectUnkSAND19func_ov031_0210b34cEv kind:function(arm,size=0x28) addr:0x0210b32c +_ZN16MapObjectUnkSAND19func_ov031_0210b2fcEv kind:function(arm,size=0x14) addr:0x0210b2dc +_ZN16MapObjectUnkSAND19func_ov031_0210b310Ev kind:function(arm,size=0x1c) addr:0x0210b2f0 +_ZN16MapObjectUnkSANDD1Ev kind:function(arm,size=0x20) addr:0x0210b30c +_ZN16MapObjectUnkSANDD0Ev kind:function(arm,size=0x28) addr:0x0210b32c _ZN23MapObjectProfileUnkSANDD1Ev kind:function(arm,size=0x14) addr:0x0210b354 _ZN23MapObjectProfileUnkSPTB10GetProfileEv kind:function(arm,size=0xc) addr:0x0210b368 _ZN23MapObjectProfileUnkSPTB6CreateEv kind:function(arm,size=0x24) addr:0x0210b374 @@ -2026,7 +2026,7 @@ data_ov031_02110b84 kind:data(any) addr:0x02110b84 data_ov031_02110b90 kind:data(any) addr:0x02110b90 data_ov031_02110b9c kind:data(any) addr:0x02110b9c data_ov031_02110bc8 kind:data(any) addr:0x02110ba8 local -data_ov031_02110bcc kind:data(any) addr:0x02110bcc +data_ov031_02110bec kind:data(any) addr:0x02110bcc data_ov031_02110be0 kind:data(any) addr:0x02110be0 data_ov031_02110bfc kind:data(any) addr:0x02110bfc data_ov031_02110c08 kind:data(any) addr:0x02110c08 @@ -2229,7 +2229,7 @@ data_ov031_02112a30 kind:data(any) addr:0x02112a30 data_ov031_02112a44 kind:data(any) addr:0x02112a44 _ZTV16MapObject_10_Pot kind:data(any) addr:0x02112a50 data_ov031_02112a80 kind:data(any) addr:0x02112a80 -_ZTV19data_ov031_02112ab4 kind:data(any) addr:0x02112aac +_ZTV24UnkStruct_ov031_02112ad4 kind:data(any) addr:0x02112aac data_ov031_02112ac0 kind:data(any) addr:0x02112ac0 data_ov031_02112adc kind:data(any) addr:0x02112adc data_ov031_02112af8 kind:data(any) addr:0x02112af8 @@ -2399,11 +2399,10 @@ _ZTV24ActorProfileTreasureDrop kind:data(any) addr:0x02114c3c _ZTV25ActorProfileRedPotionDrop kind:data(any) addr:0x02114c60 _ZTV20ActorProfileBombDrop kind:data(any) addr:0x02114c84 _ZTV13ActorItemDrop kind:data(any) addr:0x02114ca8 -data_ov031_02114d08 kind:data(any) addr:0x02114d08 +data_ov031_02114d28 kind:data(any) addr:0x02114d08 local _ZTV15ActorUnkMLCK_D8 kind:data(any) addr:0x02114d14 _ZTV19ActorProfileUnkMLCK kind:data(any) addr:0x02114d2c _ZTV12ActorUnkMLCK kind:data(any) addr:0x02114d50 -_ZTV15ActorUnkMLCK_94 kind:data(any) addr:0x02114dcc _ZTV19ActorProfileUnkCLLT kind:data(any) addr:0x02114dfc _ZTV12ActorUnkCLLT kind:data(any) addr:0x02114e20 _ZTV19ActorProfileUnkEFSB kind:data(any) addr:0x02114e8c @@ -2498,7 +2497,7 @@ data_ov031_02115f0c kind:data(any) addr:0x02115f0c data_ov031_02115f48 kind:data(any) addr:0x02115f48 _ZTV19data_ov031_02115f5c kind:data(any) addr:0x02115f54 data_ov031_02115f78 kind:data(any) addr:0x02115f78 -data_ov031_02115fc0 kind:data(any) addr:0x02115fc0 +data_ov031_02115fe0 kind:data(any) addr:0x02115fc0 data_ov031_02115fcc kind:data(any) addr:0x02115fcc ambiguous _ZTV19data_ov031_02115fe0 kind:data(any) addr:0x02115fd8 data_ov031_02115ffc kind:data(any) addr:0x02115ffc ambiguous @@ -2614,9 +2613,9 @@ _ZN15ProfileInstanceI25ActorProfileRedPotionDropE8sProfileE kind:bss addr:0x0211 _ZN15ProfileInstanceI24ActorProfileTreasureDropE8sProfileE kind:bss addr:0x02116ec8 _ZN15ProfileInstanceI21ActorProfileArrowDropE8sProfileE kind:bss addr:0x02116f04 _ZN15ProfileInstanceI20ActorProfileBombDropE8sProfileE kind:bss addr:0x02116f40 -data_ov031_02116f7c kind:bss addr:0x02116f7c -data_ov031_02116f80 kind:bss addr:0x02116f80 -data_ov031_02116f8c kind:bss addr:0x02116f8c +_ZGVN15ProfileInstanceI19ActorProfileUnkMLCKE8sProfileE kind:bss addr:0x02116f7c +@4770 kind:bss addr:0x02116f80 local +_ZN15ProfileInstanceI19ActorProfileUnkMLCKE8sProfileE kind:bss addr:0x02116f8c data_ov031_02116fc8 kind:bss addr:0x02116fc8 data_ov031_02116fcc kind:bss addr:0x02116fcc data_ov031_02116fd8 kind:bss addr:0x02116fd8 @@ -2735,10 +2734,10 @@ data_ov031_021188c8 kind:bss addr:0x021188c8 data_ov031_021188d4 kind:bss addr:0x021188d4 data_ov031_02118900 kind:bss addr:0x021188e0 data_ov031_021188f8 kind:bss addr:0x021188f8 -data_ov031_021189b0 kind:bss addr:0x021189b0 -data_ov031_02118a84 kind:bss addr:0x02118a84 -data_ov031_02118aa8 kind:bss addr:0x02118aa8 -data_ov031_02118acc kind:bss addr:0x02118acc +data_ov031_021189d0 kind:bss addr:0x021189b0 +data_ov031_02118aa4 kind:bss addr:0x02118a84 +data_ov031_02118ac8 kind:bss addr:0x02118aa8 +data_ov031_02118aec kind:bss addr:0x02118acc data_ov031_02118af0 kind:bss addr:0x02118af0 data_ov031_02118c70 kind:bss addr:0x02118c70 data_ov031_02118c78 kind:bss addr:0x02118c78 diff --git a/config/usa/arm9/overlays/ov032/delinks.txt b/config/usa/arm9/overlays/ov032/delinks.txt index 50ef07f8..de82297d 100644 --- a/config/usa/arm9/overlays/ov032/delinks.txt +++ b/config/usa/arm9/overlays/ov032/delinks.txt @@ -16,7 +16,7 @@ src/032_MapA1/Actor/ActorFleeingSpinut.cpp: .text start:0x0211b6ac end:0x0211db20 .init start:0x02121f80 end:0x02122000 .ctor start:0x02122110 end:0x02122114 - .data start:0x02122388 end:0x021224B8 + .data start:0x02122388 end:0x021224b8 .bss start:0x021228e8 end:0x02122954 src/032_MapA1/Actor/ActorUnkKETH.cpp: diff --git a/config/usa/arm9/overlays/ov032/relocs.txt b/config/usa/arm9/overlays/ov032/relocs.txt index a78bcb19..11ae4f5b 100644 --- a/config/usa/arm9/overlays/ov032/relocs.txt +++ b/config/usa/arm9/overlays/ov032/relocs.txt @@ -257,7 +257,7 @@ from:0x0211b6b4 kind:load to:0x02122910 module:overlay(32) from:0x0211b6c8 kind:arm_call to:0x02011f3c module:main from:0x0211b6d4 kind:arm_call to:0x0211b728 module:overlay(32) from:0x0211b6ec kind:arm_call to:0x02097994 module:overlay(0) -from:0x0211b724 kind:load to:0x02122434 module:overlay(32) add:0x8 +from:0x0211b724 kind:load to:0x02122434 add:0x8 module:overlay(32) from:0x0211b734 kind:arm_call to:0x02098b08 module:overlay(0) from:0x0211b798 kind:arm_call_thumb to:0x02057a04 module:overlay(0) from:0x0211b7c4 kind:arm_call_thumb to:0x0209a168 module:overlay(0) @@ -270,7 +270,7 @@ from:0x0211b888 kind:arm_call to:0x0205fc00 module:overlay(0) from:0x0211b8a0 kind:arm_call to:0x0205fc00 module:overlay(0) from:0x0211b8ac kind:arm_call to:0x0209860c module:overlay(0) from:0x0211b8c8 kind:arm_call to:0x0211bde4 module:overlay(32) -from:0x0211b8e8 kind:load to:0x02122458 module:overlay(32) add:0x8 +from:0x0211b8e8 kind:load to:0x02122458 add:0x8 module:overlay(32) from:0x0211b8ec kind:load to:0x02122910 module:overlay(32) from:0x0211b8f0 kind:load to:0x02122224 module:overlay(32) from:0x0211b8f4 kind:load to:0x02122904 module:overlay(32) diff --git a/config/usa/arm9/overlays/ov033/relocs.txt b/config/usa/arm9/overlays/ov033/relocs.txt index b5c9141b..353c5870 100644 --- a/config/usa/arm9/overlays/ov033/relocs.txt +++ b/config/usa/arm9/overlays/ov033/relocs.txt @@ -347,7 +347,7 @@ from:0x0211bd64 kind:arm_call to:0x0211bcd4 module:overlay(33) from:0x0211bd88 kind:load to:0x027e0ce0 module:dtcm from:0x0211bdb4 kind:arm_call to:0x01fff350 module:itcm from:0x0211bdf4 kind:load to:0x027e0ce4 module:dtcm -from:0x0211bdfc kind:load to:0x020b2fe0 module:overlay(0) +from:0x0211bdfc kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0211be0c kind:arm_call_thumb to:0x02057eb4 module:overlay(0) from:0x0211be14 kind:arm_call_thumb to:0x02057eb4 module:overlay(0) from:0x0211be1c kind:arm_call to:0x0209d08c module:overlay(0) diff --git a/config/usa/arm9/overlays/ov034/relocs.txt b/config/usa/arm9/overlays/ov034/relocs.txt index 2a57c702..a7ae0302 100644 --- a/config/usa/arm9/overlays/ov034/relocs.txt +++ b/config/usa/arm9/overlays/ov034/relocs.txt @@ -234,7 +234,7 @@ from:0x0211ae68 kind:load to:0x027e09a4 module:dtcm from:0x0211ae98 kind:arm_call to:0x01fff350 module:itcm from:0x0211aeb4 kind:arm_call to:0x0211cccc module:overlay(34) from:0x0211aef4 kind:load to:0x027e0ce4 module:dtcm -from:0x0211aefc kind:load to:0x020b2fe0 module:overlay(0) +from:0x0211aefc kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0211af7c kind:arm_call to:0x0207e0a8 module:overlay(0) from:0x0211af9c kind:arm_call to:0x0207e0a8 module:overlay(0) from:0x0211afa8 kind:arm_call to:0x0211c8c4 module:overlay(34) diff --git a/config/usa/arm9/overlays/ov037/relocs.txt b/config/usa/arm9/overlays/ov037/relocs.txt index 9b83c030..1fe30a76 100644 --- a/config/usa/arm9/overlays/ov037/relocs.txt +++ b/config/usa/arm9/overlays/ov037/relocs.txt @@ -155,7 +155,7 @@ from:0x0211a484 kind:arm_call to:0x01fff350 module:itcm from:0x0211a4a8 kind:arm_call to:0x0211e6b8 module:overlay(37) from:0x0211a4bc kind:arm_call to:0x01fff350 module:itcm from:0x0211a4d4 kind:load to:0x027e0ce4 module:dtcm -from:0x0211a4d8 kind:load to:0x020b2fe0 module:overlay(0) +from:0x0211a4d8 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0211a58c kind:load to:0x02049bc4 module:main from:0x0211a5b0 kind:arm_call to:0x01fff148 module:itcm from:0x0211a5f0 kind:arm_call to:0x01ffbbe0 module:itcm @@ -450,7 +450,7 @@ from:0x0211e418 kind:arm_call to:0x0211e328 module:overlay(37) from:0x0211e424 kind:arm_call to:0x0211e328 module:overlay(37) from:0x0211e430 kind:arm_call to:0x0211e45c module:overlay(37) from:0x0211e43c kind:load to:0x027e0ce4 module:dtcm -from:0x0211e440 kind:load to:0x020b2fe0 module:overlay(0) +from:0x0211e440 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0211e580 kind:arm_call to:0x02098694 module:overlay(0) from:0x0211e5a4 kind:arm_call to:0x01fff148 module:itcm from:0x0211e5b0 kind:arm_call to:0x01ff9a5c module:itcm @@ -630,7 +630,7 @@ from:0x0212055c kind:arm_call to:0x0212046c module:overlay(37) from:0x02120568 kind:arm_call to:0x0212046c module:overlay(37) from:0x02120574 kind:arm_call to:0x021205a0 module:overlay(37) from:0x02120580 kind:load to:0x027e0ce4 module:dtcm -from:0x02120584 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02120584 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0212064c kind:arm_call to:0x02098694 module:overlay(0) from:0x02120670 kind:arm_call to:0x01fff148 module:itcm from:0x0212067c kind:arm_call to:0x01ff9a5c module:itcm @@ -663,7 +663,7 @@ from:0x021209d4 kind:arm_call to:0x0209765c module:overlay(0) from:0x021209ec kind:load to:0x02122750 module:overlay(37) from:0x02120a18 kind:arm_call to:0x01fff350 module:itcm from:0x02120a38 kind:load to:0x027e0ce4 module:dtcm -from:0x02120a40 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02120a40 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02120a48 kind:arm_call to:0x021209f0 module:overlay(37) from:0x02120a78 kind:arm_call to:0x02098368 module:overlay(0) from:0x02120aa0 kind:arm_call to:0x0201bb10 module:main @@ -678,7 +678,7 @@ from:0x02120b9c kind:arm_call to:0x02016f94 module:main from:0x02120be0 kind:arm_call to:0x01fff350 module:itcm from:0x02120c04 kind:arm_call to:0x01fff350 module:itcm from:0x02120c1c kind:load to:0x027e0ce4 module:dtcm -from:0x02120c20 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02120c20 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02120c48 kind:arm_call to:0x02120c28 module:overlay(37) from:0x02120cf4 kind:arm_call to:0x021203e8 module:overlay(37) from:0x02120d00 kind:arm_call to:0x02016930 module:main diff --git a/config/usa/arm9/overlays/ov040/relocs.txt b/config/usa/arm9/overlays/ov040/relocs.txt index 722764bf..503cd792 100644 --- a/config/usa/arm9/overlays/ov040/relocs.txt +++ b/config/usa/arm9/overlays/ov040/relocs.txt @@ -264,7 +264,7 @@ from:0x02125518 kind:arm_call to:0x02126918 module:overlay(40) from:0x0212555c kind:arm_call to:0x0208bba4 module:overlay(0) from:0x02125568 kind:load to:0x027e09b8 module:dtcm from:0x0212556c kind:load to:0x027e0d34 module:dtcm -from:0x02125570 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02125570 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02125578 kind:load to:0x027e0ce4 module:dtcm from:0x02125584 kind:load to:0x027e09a8 module:dtcm from:0x02125588 kind:load to:0x027e09bc module:dtcm @@ -341,7 +341,7 @@ from:0x021262d0 kind:arm_call to:0x01ffb6e4 module:itcm from:0x021262e0 kind:arm_call to:0x02150c0c module:overlay(72) from:0x021262f4 kind:arm_call to:0x02150c0c module:overlay(72) from:0x02126314 kind:load to:0x027e09a4 module:dtcm -from:0x02126318 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02126318 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02126320 kind:load to:0x027e0ce4 module:dtcm from:0x0212636c kind:arm_call to:0x01ff9638 module:itcm from:0x02126394 kind:arm_call to:0x01ffb6e4 module:itcm @@ -353,7 +353,7 @@ from:0x021264ec kind:arm_call to:0x02080638 module:overlay(0) from:0x02126508 kind:arm_call to:0x02070a7c module:overlay(0) from:0x02126514 kind:arm_call to:0x020284f4 module:main from:0x02126520 kind:load to:0x027e09a4 module:dtcm -from:0x02126528 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02126528 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0212652c kind:load to:0x027e0ce4 module:dtcm from:0x02126530 kind:load to:0x027e0cd8 module:dtcm from:0x02126568 kind:arm_call to:0x01fff350 module:itcm @@ -361,16 +361,16 @@ from:0x021265dc kind:arm_call to:0x01ff9638 module:itcm from:0x021265fc kind:arm_call to:0x01ffb6e4 module:itcm from:0x02126668 kind:arm_call to:0x0211a3e4 module:overlay(39) from:0x02126674 kind:load to:0x027e0ce4 module:dtcm -from:0x02126678 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02126678 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02126680 kind:load to:0x027e09b8 module:dtcm from:0x021266bc kind:arm_call to:0x01fff350 module:itcm from:0x021266d8 kind:arm_call to:0x0211a440 module:overlay(39) from:0x021266e4 kind:load to:0x027e0ce4 module:dtcm -from:0x021266ec kind:load to:0x020b2fe0 module:overlay(0) +from:0x021266ec kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02126720 kind:arm_call to:0x01fff350 module:itcm from:0x021267ac kind:arm_call to:0x0211a38c module:overlays(38,39) from:0x021267b8 kind:load to:0x027e0ce4 module:dtcm -from:0x021267bc kind:load to:0x020b2fe0 module:overlay(0) +from:0x021267bc kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x021267e0 kind:arm_call to:0x020732cc module:overlay(0) from:0x021267fc kind:arm_call to:0x02014478 module:main from:0x02126820 kind:arm_call to:0x02126430 module:overlay(40) @@ -382,13 +382,13 @@ from:0x0212687c kind:load to:0x02049b0a module:main from:0x021268b0 kind:arm_call to:0x01fff350 module:itcm from:0x02126900 kind:arm_call to:0x01ffb714 module:itcm from:0x0212690c kind:load to:0x027e0ce4 module:dtcm -from:0x02126910 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02126910 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0212694c kind:arm_call to:0x01fff350 module:itcm from:0x02126990 kind:arm_call to:0x01fff350 module:itcm from:0x021269f4 kind:arm_call to:0x01ff9638 module:itcm from:0x02126a04 kind:arm_call to:0x01ffb6e4 module:itcm from:0x02126a44 kind:load to:0x027e0ce4 module:dtcm -from:0x02126a48 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02126a48 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02126a6c kind:arm_call to:0x020732cc module:overlay(0) from:0x02126a88 kind:arm_call to:0x02014478 module:main from:0x02126ab0 kind:arm_call to:0x0201bb5c module:main diff --git a/config/usa/arm9/overlays/ov041/relocs.txt b/config/usa/arm9/overlays/ov041/relocs.txt index 0cc4b1f6..82adc502 100644 --- a/config/usa/arm9/overlays/ov041/relocs.txt +++ b/config/usa/arm9/overlays/ov041/relocs.txt @@ -28,7 +28,7 @@ from:0x02123744 kind:arm_call_thumb to:0x0209a228 module:overlay(0) from:0x0212375c kind:arm_call to:0x02124d98 module:overlay(41) from:0x02123780 kind:arm_call to:0x01fff350 module:itcm from:0x021237b8 kind:load to:0x027e0ce4 module:dtcm -from:0x021237c0 kind:load to:0x020b2fe0 module:overlay(0) +from:0x021237c0 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x021237d0 kind:arm_call to:0x02124e24 module:overlay(41) from:0x02123808 kind:load to:0x0212d9a4 module:overlay(41) from:0x02123888 kind:arm_call to:0x020bf874 module:overlay(17) @@ -125,7 +125,7 @@ from:0x02124224 kind:load to:0x0212dbec module:overlay(41) from:0x0212423c kind:arm_call to:0x02124d98 module:overlay(41) from:0x02124260 kind:arm_call to:0x01fff350 module:itcm from:0x02124298 kind:load to:0x027e0ce4 module:dtcm -from:0x021242a0 kind:load to:0x020b2fe0 module:overlay(0) +from:0x021242a0 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x021242b0 kind:arm_call to:0x02124e24 module:overlay(41) from:0x021242e8 kind:load to:0x0212dc5c module:overlay(41) from:0x02124368 kind:arm_call to:0x020bf874 module:overlay(17) @@ -482,7 +482,7 @@ from:0x02127dac kind:arm_call to:0x01fff350 module:itcm from:0x02127dd4 kind:arm_call to:0x020975d8 module:overlay(0) from:0x02127df4 kind:arm_call to:0x020973d4 module:overlay(0) from:0x02127e00 kind:load to:0x027e0ce4 module:dtcm -from:0x02127e04 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02127e04 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02127e0c kind:load to:0x020b537c module:overlay(0) from:0x02127e24 kind:arm_call to:0x02016f94 module:main from:0x02127e30 kind:arm_call to:0x0213f8bc module:overlay(70) @@ -1000,7 +1000,7 @@ from:0x0212bfd8 kind:arm_call to:0x01fff350 module:itcm from:0x0212c018 kind:arm_call to:0x01fff350 module:itcm from:0x0212c050 kind:load to:0x027e09b8 module:dtcm from:0x0212c054 kind:load to:0x027e0ce4 module:dtcm -from:0x0212c05c kind:load to:0x020b2fe0 module:overlay(0) +from:0x0212c05c kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0212c094 kind:arm_call to:0x0209d414 module:overlay(0) from:0x0212c0d0 kind:arm_call to:0x0209d414 module:overlay(0) from:0x0212c0e4 kind:load to:0x0212e450 module:overlay(41) diff --git a/config/usa/arm9/overlays/ov045/relocs.txt b/config/usa/arm9/overlays/ov045/relocs.txt index cfccf08d..0f788591 100644 --- a/config/usa/arm9/overlays/ov045/relocs.txt +++ b/config/usa/arm9/overlays/ov045/relocs.txt @@ -106,7 +106,7 @@ from:0x02123f68 kind:arm_call to:0x021235ec module:overlay(45) from:0x02123f98 kind:arm_call to:0x0207e0a8 module:overlay(0) from:0x02123fb0 kind:arm_call to:0x0207e164 module:overlay(0) from:0x02123fc0 kind:load to:0x027e0ce4 module:dtcm -from:0x02123fc8 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02123fc8 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02123fcc kind:load to:0x027e09c0 module:dtcm from:0x02123fe8 kind:arm_call to:0x02078678 module:overlay(0) from:0x02124014 kind:arm_call to:0x02017e64 module:main diff --git a/config/usa/arm9/overlays/ov047/symbols.txt b/config/usa/arm9/overlays/ov047/symbols.txt index 560a044b..9ac0f5ec 100644 --- a/config/usa/arm9/overlays/ov047/symbols.txt +++ b/config/usa/arm9/overlays/ov047/symbols.txt @@ -1,7 +1,7 @@ _ZN29UnkStruct_027e0cd8_0C_Base_98C1Ev kind:function(arm,size=0x64) addr:0x02130480 _ZN29UnkStruct_027e0cd8_0C_Base_98D1Ev kind:function(arm,size=0x28) addr:0x021304e4 func_ov047_0213052c kind:function(arm,size=0x30) addr:0x0213050c -func_ov047_0213055c kind:function(arm,size=0x200) addr:0x0213053c +_ZN29UnkStruct_027e0cd8_0C_Base_9819func_ov047_0213055cEv kind:function(arm,size=0x200) addr:0x0213053c func_ov047_0213075c kind:function(arm,size=0x39c) addr:0x0213073c func_ov047_02130af8 kind:function(arm,size=0x3d8) addr:0x02130ad8 func_ov047_02130ed0 kind:function(arm,size=0x280) addr:0x02130eb0 diff --git a/config/usa/arm9/overlays/ov049/relocs.txt b/config/usa/arm9/overlays/ov049/relocs.txt index e58aadb3..6f8ace2a 100644 --- a/config/usa/arm9/overlays/ov049/relocs.txt +++ b/config/usa/arm9/overlays/ov049/relocs.txt @@ -462,13 +462,13 @@ from:0x02134290 kind:arm_call to:0x021326f4 module:overlay(49) from:0x021342a4 kind:arm_call to:0x01fff350 module:itcm from:0x021342c0 kind:load to:0x020d8690 module:overlay(24) from:0x021342c4 kind:load to:0x027e0ce4 module:dtcm -from:0x021342cc kind:load to:0x020b2fe0 module:overlay(0) +from:0x021342cc kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02134320 kind:arm_call to:0x01fff350 module:itcm from:0x0213434c kind:arm_call to:0x02098634 module:overlay(0) from:0x02134378 kind:arm_call to:0x01fff350 module:itcm from:0x02134398 kind:load to:0x020d8690 module:overlay(24) from:0x0213439c kind:load to:0x027e0ce4 module:dtcm -from:0x021343a4 kind:load to:0x020b2fe0 module:overlay(0) +from:0x021343a4 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x021343c0 kind:load to:0x027e0d40 module:dtcm from:0x021343d4 kind:load to:0x027e0d40 module:dtcm from:0x021343e0 kind:arm_call to:0x021343c4 module:overlay(49) diff --git a/config/usa/arm9/overlays/ov051/relocs.txt b/config/usa/arm9/overlays/ov051/relocs.txt index cd5185f9..ca08947d 100644 --- a/config/usa/arm9/overlays/ov051/relocs.txt +++ b/config/usa/arm9/overlays/ov051/relocs.txt @@ -470,7 +470,7 @@ from:0x02135684 kind:arm_call to:0x01fff458 module:itcm from:0x02135694 kind:arm_call to:0x021355b8 module:overlay(51) from:0x021356a4 kind:arm_call to:0x01fff350 module:itcm from:0x021356c0 kind:load to:0x027e0ce4 module:dtcm -from:0x021356c4 kind:load to:0x020b2fe0 module:overlay(0) +from:0x021356c4 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02135774 kind:arm_call to:0x01fff148 module:itcm from:0x02135780 kind:arm_call to:0x01ff9a5c module:itcm from:0x0213579c kind:load to:0x0203e93c module:main diff --git a/config/usa/arm9/overlays/ov057/relocs.txt b/config/usa/arm9/overlays/ov057/relocs.txt index 0c11421e..a080416f 100644 --- a/config/usa/arm9/overlays/ov057/relocs.txt +++ b/config/usa/arm9/overlays/ov057/relocs.txt @@ -348,7 +348,7 @@ from:0x0213b634 kind:arm_call to:0x0213b51c module:overlay(57) from:0x0213b63c kind:arm_call to:0x0213b5ac module:overlay(57) from:0x0213b64c kind:arm_call to:0x01fff350 module:itcm from:0x0213b66c kind:load to:0x027e0ce4 module:dtcm -from:0x0213b670 kind:load to:0x020b2fe0 module:overlay(0) +from:0x0213b670 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0213b684 kind:load to:0x02057884 module:overlay(0) from:0x0213b698 kind:arm_call_thumb to:0x02099adc module:overlay(0) from:0x0213b6a0 kind:arm_call to:0x02011ff4 module:main diff --git a/config/usa/arm9/overlays/ov058/relocs.txt b/config/usa/arm9/overlays/ov058/relocs.txt index be1801aa..cf4fe7c5 100644 --- a/config/usa/arm9/overlays/ov058/relocs.txt +++ b/config/usa/arm9/overlays/ov058/relocs.txt @@ -1554,7 +1554,7 @@ from:0x0214d5f4 kind:arm_call to:0x0214ca98 module:overlay(58) from:0x0214d604 kind:arm_call to:0x0214cc60 module:overlay(58) from:0x0214d634 kind:arm_call to:0x01fff350 module:itcm from:0x0214d654 kind:load to:0x020d8690 module:overlay(24) -from:0x0214d658 kind:load to:0x020b2fe0 module:overlay(0) +from:0x0214d658 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0214d660 kind:load to:0x027e0ce4 module:dtcm from:0x0214d670 kind:load to:0x027e0d4c module:dtcm from:0x0214d684 kind:load to:0x027e0d4c module:dtcm diff --git a/config/usa/arm9/overlays/ov059/relocs.txt b/config/usa/arm9/overlays/ov059/relocs.txt index 263dff94..34020f91 100644 --- a/config/usa/arm9/overlays/ov059/relocs.txt +++ b/config/usa/arm9/overlays/ov059/relocs.txt @@ -27,7 +27,7 @@ from:0x021581ac kind:arm_call to:0x01fff350 module:itcm from:0x021581c4 kind:arm_call to:0x02158994 module:overlay(59) from:0x021581d0 kind:arm_call to:0x02157fd8 module:overlay(59) from:0x021581dc kind:load to:0x027e0ce4 module:dtcm -from:0x021581e0 kind:load to:0x020b2fe0 module:overlay(0) +from:0x021581e0 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02158200 kind:arm_call to:0x01fff3b4 module:itcm from:0x02158220 kind:arm_call to:0x02081d5c module:overlay(0) from:0x02158228 kind:load to:0x027e0ce4 module:dtcm @@ -45,7 +45,7 @@ from:0x02158410 kind:arm_call to:0x01fff350 module:itcm from:0x02158420 kind:arm_call to:0x01fff350 module:itcm from:0x0215844c kind:arm_call to:0x01fff350 module:itcm from:0x02158474 kind:load to:0x027e0ce4 module:dtcm -from:0x0215847c kind:load to:0x020b2fe0 module:overlay(0) +from:0x0215847c kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02158530 kind:arm_call to:0x02158688 module:overlay(59) from:0x02158538 kind:arm_call to:0x02158544 module:overlay(59) from:0x021585bc kind:arm_call to:0x02158688 module:overlay(59) @@ -313,7 +313,7 @@ from:0x0215ab30 kind:arm_call to:0x02160b84 module:overlay(59) from:0x0215ab3c kind:load to:0x027e0ce4 module:dtcm from:0x0215ab40 kind:load to:0x027e0d5c module:dtcm from:0x0215ab48 kind:load to:0x027e09b8 module:dtcm -from:0x0215ab50 kind:load to:0x020b2fe0 module:overlay(0) +from:0x0215ab50 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0215abb4 kind:load to:0x02163738 module:overlay(59) from:0x0215abd0 kind:arm_call to:0x01fff3b4 module:itcm from:0x0215abf0 kind:arm_call to:0x02015058 module:main @@ -448,7 +448,7 @@ from:0x0215bde4 kind:arm_call to:0x01fff350 module:itcm from:0x0215be0c kind:arm_call to:0x01fff350 module:itcm from:0x0215be44 kind:arm_call to:0x01fff350 module:itcm from:0x0215be64 kind:load to:0x027e0ce4 module:dtcm -from:0x0215be6c kind:load to:0x020b2fe0 module:overlay(0) +from:0x0215be6c kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0215be94 kind:arm_call to:0x020169ac module:main from:0x0215bf4c kind:arm_call to:0x0207e438 module:overlay(0) from:0x0215bf70 kind:arm_call to:0x02071b10 module:overlay(0) @@ -786,7 +786,7 @@ from:0x0215eedc kind:arm_call to:0x020984b0 module:overlay(0) from:0x0215eeec kind:arm_call to:0x01fff350 module:itcm from:0x0215ef08 kind:load to:0x020b5198 module:overlay(0) from:0x0215ef14 kind:load to:0x027e09b8 module:dtcm -from:0x0215ef1c kind:load to:0x020b2fe0 module:overlay(0) +from:0x0215ef1c kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0215ef20 kind:load to:0x027e0ce4 module:dtcm from:0x0215ef98 kind:arm_call to:0x020732cc module:overlay(0) from:0x0215eff4 kind:arm_call to:0x0208bba4 module:overlay(0) @@ -902,7 +902,7 @@ from:0x021602e4 kind:arm_call to:0x01fff350 module:itcm from:0x0216030c kind:arm_call to:0x01fff350 module:itcm from:0x02160338 kind:arm_call to:0x01fff350 module:itcm from:0x02160358 kind:load to:0x027e0ce4 module:dtcm -from:0x02160360 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02160360 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0216036c kind:arm_call_thumb to:0x02057bb4 module:overlay(0) from:0x02160374 kind:arm_call to:0x02011ff4 module:main from:0x0216038c kind:arm_call to:0x0207b6a0 module:overlay(0) diff --git a/config/usa/arm9/overlays/ov060/relocs.txt b/config/usa/arm9/overlays/ov060/relocs.txt index ae496a6c..364cc5fa 100644 --- a/config/usa/arm9/overlays/ov060/relocs.txt +++ b/config/usa/arm9/overlays/ov060/relocs.txt @@ -585,7 +585,7 @@ from:0x0215db64 kind:arm_call to:0x020782f4 module:overlay(0) from:0x0215db88 kind:arm_call to:0x01fff350 module:itcm from:0x0215dbd4 kind:load to:0x027e09bc module:dtcm from:0x0215dbd8 kind:load to:0x027e0ce4 module:dtcm -from:0x0215dbe0 kind:load to:0x020b2fe0 module:overlay(0) +from:0x0215dbe0 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0215dbf0 kind:arm_call to:0x020f757c module:overlay(31) from:0x0215dc24 kind:arm_call to:0x02099fd8 module:overlay(0) from:0x0215dc30 kind:arm_call to:0x0205a7c0 module:overlay(0) diff --git a/config/usa/arm9/overlays/ov063/relocs.txt b/config/usa/arm9/overlays/ov063/relocs.txt index 22b1b398..bbc9ea1c 100644 --- a/config/usa/arm9/overlays/ov063/relocs.txt +++ b/config/usa/arm9/overlays/ov063/relocs.txt @@ -789,7 +789,7 @@ from:0x0215e0cc kind:arm_call to:0x0215e0d4 module:overlay(63) from:0x0215e128 kind:arm_call to:0x01fff350 module:itcm from:0x0215e15c kind:load to:0x02162630 module:overlay(63) from:0x0215e160 kind:load to:0x027e0ce4 module:dtcm -from:0x0215e164 kind:load to:0x020b2fe0 module:overlay(0) +from:0x0215e164 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0215e180 kind:arm_call to:0x02018c04 module:main from:0x0215e194 kind:arm_call to:0x020c553c module:overlay(24) from:0x0215e19c kind:arm_call to:0x020c53c8 module:overlay(24) @@ -922,7 +922,7 @@ from:0x0215ed6c kind:load to:0x020b7ab5 module:overlays(8,9,12,13,15) from:0x0215edd0 kind:arm_call to:0x01fff350 module:itcm from:0x0215ede8 kind:arm_call to:0x021456b8 module:overlay(58) from:0x0215ee08 kind:load to:0x027e0ce4 module:dtcm -from:0x0215ee0c kind:load to:0x020b2fe0 module:overlay(0) +from:0x0215ee0c kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0215ee10 kind:load to:0x0216261c module:overlay(63) from:0x0215ee1c kind:load to:0x0215ee20 module:overlay(63) from:0x0215ee54 kind:arm_call_thumb to:0x020b819c module:overlay(12) diff --git a/config/usa/arm9/overlays/ov066/relocs.txt b/config/usa/arm9/overlays/ov066/relocs.txt index 7d60550d..1ddd7561 100644 --- a/config/usa/arm9/overlays/ov066/relocs.txt +++ b/config/usa/arm9/overlays/ov066/relocs.txt @@ -482,7 +482,7 @@ from:0x0215b3a8 kind:arm_call to:0x02067a40 module:overlay(0) from:0x0215b3c4 kind:arm_call to:0x02067a40 module:overlay(0) from:0x0215b3e0 kind:arm_call to:0x02067a40 module:overlay(0) from:0x0215b3fc kind:load to:0x027e0ce4 module:dtcm -from:0x0215b400 kind:load to:0x020b2fe0 module:overlay(0) +from:0x0215b400 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0215b408 kind:load to:0x020b502c module:overlay(0) from:0x0215b40c kind:load to:0x0215d7b8 module:overlay(66) from:0x0215b410 kind:load to:0x02049bbc module:main @@ -516,12 +516,12 @@ from:0x0215b8d0 kind:arm_call to:0x01fff350 module:itcm from:0x0215b8f0 kind:arm_call to:0x01fff3b4 module:itcm from:0x0215b900 kind:arm_call to:0x0215c7ec module:overlay(66) from:0x0215b90c kind:load to:0x027e0ce4 module:dtcm -from:0x0215b914 kind:load to:0x020b2fe0 module:overlay(0) +from:0x0215b914 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0215b944 kind:arm_call to:0x01fff350 module:itcm from:0x0215b964 kind:arm_call to:0x01fff3b4 module:itcm from:0x0215b974 kind:arm_call to:0x0215c848 module:overlay(66) from:0x0215b980 kind:load to:0x027e0ce4 module:dtcm -from:0x0215b988 kind:load to:0x020b2fe0 module:overlay(0) +from:0x0215b988 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0215b998 kind:arm_call to:0x0201666c module:main from:0x0215b9a0 kind:arm_call to:0x02158e54 module:overlay(66) from:0x0215b9a8 kind:arm_call to:0x02158e54 module:overlay(66) diff --git a/config/usa/arm9/overlays/ov068/relocs.txt b/config/usa/arm9/overlays/ov068/relocs.txt index 163b6c95..dc1d8f2e 100644 --- a/config/usa/arm9/overlays/ov068/relocs.txt +++ b/config/usa/arm9/overlays/ov068/relocs.txt @@ -54,7 +54,7 @@ from:0x021584b8 kind:arm_call to:0x01fff350 module:itcm from:0x021584e0 kind:arm_call to:0x0215d4e0 module:overlay(68) from:0x021584ec kind:arm_call to:0x0215dcac module:overlay(68) from:0x021584f8 kind:load to:0x027e0ce4 module:dtcm -from:0x02158500 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02158500 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02158504 kind:load to:0x027e0d6c module:dtcm from:0x02158508 kind:load to:0x02163fd4 module:overlay(68) from:0x02158530 kind:arm_call to:0x01fff3b4 module:itcm @@ -626,7 +626,7 @@ from:0x0215d5fc kind:load to:0x027e09b8 module:dtcm from:0x0215d630 kind:arm_call to:0x01fff350 module:itcm from:0x0215d654 kind:arm_call to:0x0209860c module:overlay(0) from:0x0215d660 kind:load to:0x027e0ce4 module:dtcm -from:0x0215d664 kind:load to:0x020b2fe0 module:overlay(0) +from:0x0215d664 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0215d698 kind:arm_call to:0x020d44dc module:overlay(24) from:0x0215d6c4 kind:load to:0x027e0cfc module:dtcm from:0x0215d6ec kind:load to:0x01ffc6d4 module:itcm diff --git a/config/usa/arm9/overlays/ov070/symbols.txt b/config/usa/arm9/overlays/ov070/symbols.txt index 2de71f0b..d19cd33b 100644 --- a/config/usa/arm9/overlays/ov070/symbols.txt +++ b/config/usa/arm9/overlays/ov070/symbols.txt @@ -503,7 +503,7 @@ _ZN23MapObjectProfileUnkPTFLC1Ev kind:function(arm,size=0xa8) addr:0x0214b8ec _ZN16MapObjectUnkPTFLC1Ev kind:function(arm,size=0x80) addr:0x0214b994 _ZN16MapObjectUnkPTFL19func_ov070_0214ba34Ev kind:function(arm,size=0x144) addr:0x0214ba14 _ZN16MapObjectUnkPTFL19func_ov070_0214bb78Ev kind:function(arm,size=0x58) addr:0x0214bb58 -_ZN16MapObjectUnkPTFL19func_ov070_0214bbd0Ev kind:function(arm,size=0x178) addr:0x0214bbb0 +_ZN16MapObjectUnkPTFL19func_ov070_0214bbd0Esb kind:function(arm,size=0x178) addr:0x0214bbb0 _ZN16MapObjectUnkPTFL19func_ov070_0214bd48Ev kind:function(arm,size=0x48) addr:0x0214bd28 _ZN16MapObjectUnkPTFL19func_ov070_0214bd90Ev kind:function(arm,size=0x1c8) addr:0x0214bd70 _ZN16MapObjectUnkPTFL19func_ov070_0214bf58Ev kind:function(arm,size=0x4) addr:0x0214bf38 diff --git a/config/usa/arm9/overlays/ov071/relocs.txt b/config/usa/arm9/overlays/ov071/relocs.txt index acd14bbd..81079fce 100644 --- a/config/usa/arm9/overlays/ov071/relocs.txt +++ b/config/usa/arm9/overlays/ov071/relocs.txt @@ -1540,7 +1540,7 @@ from:0x0215f154 kind:arm_call to:0x01fff350 module:itcm from:0x0215f194 kind:arm_call to:0x0212912c module:overlay(42) from:0x0215f1a4 kind:arm_call to:0x01fff350 module:itcm from:0x0215f1c0 kind:load to:0x027e0ce4 module:dtcm -from:0x0215f1c8 kind:load to:0x020b2fe0 module:overlay(0) +from:0x0215f1c8 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0215f1d8 kind:load to:0x027e0d70 module:dtcm from:0x0215f1ec kind:load to:0x027e0d70 module:dtcm from:0x0215f1f8 kind:load to:0x02165148 module:overlay(71) diff --git a/config/usa/arm9/overlays/ov072/relocs.txt b/config/usa/arm9/overlays/ov072/relocs.txt index f6d41848..ddf236c1 100644 --- a/config/usa/arm9/overlays/ov072/relocs.txt +++ b/config/usa/arm9/overlays/ov072/relocs.txt @@ -106,7 +106,7 @@ from:0x02151618 kind:load to:0x02049bc4 module:main from:0x0215161c kind:load to:0x027e09a8 module:dtcm from:0x02151628 kind:load to:0x020b502c module:overlay(0) from:0x0215162c kind:load to:0x027e0ce4 module:dtcm -from:0x02151634 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02151634 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02151638 kind:load to:0x0215251c module:overlay(72) from:0x0215166c kind:arm_call to:0x020732bc module:overlay(0) from:0x021516a8 kind:arm_call to:0x02078678 module:overlay(0) diff --git a/config/usa/arm9/overlays/ov073/relocs.txt b/config/usa/arm9/overlays/ov073/relocs.txt index 508e8fbc..c0ee1738 100644 --- a/config/usa/arm9/overlays/ov073/relocs.txt +++ b/config/usa/arm9/overlays/ov073/relocs.txt @@ -1822,7 +1822,7 @@ from:0x02163840 kind:load to:0x020aaec4 module:overlay(0) from:0x02163844 kind:load to:0x020aaecc module:overlay(0) from:0x02163848 kind:load to:0x020aaec8 module:overlay(0) from:0x0216384c kind:load to:0x027e0ce4 module:dtcm -from:0x02163850 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02163850 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02163858 kind:load to:0x020aae9c module:overlay(0) from:0x0216385c kind:load to:0x020aaea0 module:overlay(0) from:0x02163860 kind:load to:0x020aaea4 module:overlay(0) @@ -1843,7 +1843,7 @@ from:0x02163a20 kind:load to:0x020aaeb8 module:overlay(0) from:0x02163a24 kind:load to:0x020aaeb4 module:overlay(0) from:0x02163a28 kind:load to:0x027e0ce0 module:dtcm from:0x02163a2c kind:load to:0x027e0ce4 module:dtcm -from:0x02163a34 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02163a34 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02163a38 kind:load to:0x020aae98 module:overlay(0) from:0x02163a3c kind:load to:0x020aaec4 module:overlay(0) from:0x02163a40 kind:load to:0x020aaecc module:overlay(0) @@ -1864,7 +1864,7 @@ from:0x02163bec kind:arm_call to:0x01ffb6e4 module:itcm from:0x02163bf8 kind:load to:0x020aaeb8 module:overlay(0) from:0x02163bfc kind:load to:0x020aaeb4 module:overlay(0) from:0x02163c00 kind:load to:0x027e0ce0 module:dtcm -from:0x02163c04 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02163c04 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02163c0c kind:load to:0x027e0ce4 module:dtcm from:0x02163c10 kind:load to:0x020aae9c module:overlay(0) from:0x02163c14 kind:load to:0x020aaea0 module:overlay(0) diff --git a/config/usa/arm9/overlays/ov074/relocs.txt b/config/usa/arm9/overlays/ov074/relocs.txt index 113c2a43..f60f7510 100644 --- a/config/usa/arm9/overlays/ov074/relocs.txt +++ b/config/usa/arm9/overlays/ov074/relocs.txt @@ -1842,7 +1842,7 @@ from:0x02161b48 kind:arm_call to:0x01ffb428 module:itcm from:0x02161b64 kind:arm_call to:0x01ffb428 module:itcm from:0x02161ba0 kind:arm_call to:0x01fff350 module:itcm from:0x02161bbc kind:load to:0x027e0ce4 module:dtcm -from:0x02161bc0 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02161bc0 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02161bec kind:arm_call to:0x02078814 module:overlay(0) from:0x02161bf4 kind:load to:0x027e09bc module:dtcm from:0x02161c00 kind:arm_call to:0x020978ec module:overlay(0) diff --git a/config/usa/arm9/overlays/ov075/relocs.txt b/config/usa/arm9/overlays/ov075/relocs.txt index 6cc26606..c1d8a6f2 100644 --- a/config/usa/arm9/overlays/ov075/relocs.txt +++ b/config/usa/arm9/overlays/ov075/relocs.txt @@ -377,11 +377,11 @@ from:0x02154204 kind:arm_call to:0x02097994 module:overlay(0) from:0x02154240 kind:load to:0x02162a88 module:overlay(75) from:0x02154274 kind:arm_call to:0x01fff350 module:itcm from:0x02154294 kind:load to:0x027e0ce4 module:dtcm -from:0x0215429c kind:load to:0x020b2fe0 module:overlay(0) +from:0x0215429c kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x021542cc kind:arm_call to:0x01fff350 module:itcm from:0x02154304 kind:arm_call to:0x01fff350 module:itcm from:0x02154324 kind:load to:0x027e0ce4 module:dtcm -from:0x0215432c kind:load to:0x020b2fe0 module:overlay(0) +from:0x0215432c kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02154340 kind:arm_call to:0x020974bc module:overlay(0) from:0x02154354 kind:load to:0x020b537c module:overlay(0) from:0x0215436c kind:arm_call to:0x02098b08 module:overlay(0) @@ -1791,7 +1791,7 @@ from:0x02161024 kind:arm_call to:0x01ff93c0 module:itcm from:0x02161038 kind:arm_call to:0x01ffb974 module:itcm from:0x0216104c kind:arm_call to:0x01ffb974 module:itcm from:0x021610b0 kind:arm_call to:0x020157f8 module:main -from:0x021610bc kind:load to:0x020b2fe0 module:overlay(0) +from:0x021610bc kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x021610c4 kind:load to:0x027e0ce4 module:dtcm from:0x021610c8 kind:load to:0x027e0ce0 module:dtcm from:0x02161100 kind:arm_call to:0x01fff350 module:itcm @@ -1801,7 +1801,7 @@ from:0x0216116c kind:arm_call to:0x01ff93c0 module:itcm from:0x02161180 kind:arm_call to:0x01ffb974 module:itcm from:0x02161194 kind:arm_call to:0x01ffb974 module:itcm from:0x021611d4 kind:load to:0x027e0ce4 module:dtcm -from:0x021611d8 kind:load to:0x020b2fe0 module:overlay(0) +from:0x021611d8 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x021611e0 kind:load to:0x027e0ce0 module:dtcm from:0x0216122c kind:arm_call to:0x01ffb428 module:itcm from:0x0216123c kind:load to:0x020aae88 module:overlay(0) diff --git a/config/usa/arm9/overlays/ov078/relocs.txt b/config/usa/arm9/overlays/ov078/relocs.txt index 2cdfe47f..f9892468 100644 --- a/config/usa/arm9/overlays/ov078/relocs.txt +++ b/config/usa/arm9/overlays/ov078/relocs.txt @@ -856,7 +856,7 @@ from:0x0215c09c kind:load to:0x0203e93c module:main from:0x0215c0d0 kind:arm_call to:0x01fff350 module:itcm from:0x0215c100 kind:arm_call to:0x01fff350 module:itcm from:0x0215c124 kind:load to:0x027e0ce4 module:dtcm -from:0x0215c12c kind:load to:0x020b2fe0 module:overlay(0) +from:0x0215c12c kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0215c16c kind:arm_call_thumb to:0x01ffa184 module:itcm from:0x0215c198 kind:arm_call_thumb to:0x01ffa1a0 module:itcm from:0x0215c1ac kind:arm_call to:0x01ffa60c module:itcm @@ -1027,7 +1027,7 @@ from:0x0215d348 kind:load to:0x027e0ce0 module:dtcm from:0x0215d34c kind:load to:0x027e0cd8 module:dtcm from:0x0215d350 kind:load to:0x027e09b8 module:dtcm from:0x0215d354 kind:load to:0x027e0ce4 module:dtcm -from:0x0215d35c kind:load to:0x020b2fe0 module:overlay(0) +from:0x0215d35c kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0215d360 kind:load to:0x020aae74 module:overlay(0) from:0x0215d380 kind:load to:0x020aaed4 module:overlay(0) from:0x0215d384 kind:load to:0x020aaed0 module:overlay(0) diff --git a/config/usa/arm9/overlays/ov080/relocs.txt b/config/usa/arm9/overlays/ov080/relocs.txt index 5da75c46..e4c377f9 100644 --- a/config/usa/arm9/overlays/ov080/relocs.txt +++ b/config/usa/arm9/overlays/ov080/relocs.txt @@ -1063,7 +1063,7 @@ from:0x0215bfb8 kind:arm_call to:0x01fff350 module:itcm from:0x0215bfe4 kind:arm_call to:0x0215d0bc module:overlay(80) from:0x0215bff4 kind:arm_call to:0x01fff350 module:itcm from:0x0215c010 kind:load to:0x027e0ce4 module:dtcm -from:0x0215c018 kind:load to:0x020b2fe0 module:overlay(0) +from:0x0215c018 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0215c03c kind:arm_call to:0x020d95fc module:overlay(31) from:0x0215c048 kind:arm_call to:0x01fff3b4 module:itcm from:0x0215c054 kind:arm_call to:0x020984b0 module:overlay(0) diff --git a/config/usa/arm9/overlays/ov081/relocs.txt b/config/usa/arm9/overlays/ov081/relocs.txt index f8c8c07d..bd1029c3 100644 --- a/config/usa/arm9/overlays/ov081/relocs.txt +++ b/config/usa/arm9/overlays/ov081/relocs.txt @@ -90,7 +90,7 @@ from:0x021518ec kind:arm_call to:0x01fff498 module:itcm from:0x021518f8 kind:arm_call to:0x021525e0 module:overlay(81) from:0x02151904 kind:arm_call to:0x02151108 module:overlay(81) from:0x02151910 kind:load to:0x027e0ce4 module:dtcm -from:0x02151918 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02151918 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0215191c kind:load to:0x027e0ce0 module:dtcm from:0x02151920 kind:load to:0x027e0ce8 module:dtcm from:0x0215195c kind:arm_call to:0x02150e4c module:overlay(81) diff --git a/config/usa/arm9/overlays/ov083/relocs.txt b/config/usa/arm9/overlays/ov083/relocs.txt index ef5a6fbd..a880729e 100644 --- a/config/usa/arm9/overlays/ov083/relocs.txt +++ b/config/usa/arm9/overlays/ov083/relocs.txt @@ -226,11 +226,11 @@ from:0x02154be4 kind:load to:0x0203e93c module:main from:0x02154c10 kind:arm_call to:0x01fff350 module:itcm from:0x02154c2c kind:arm_call to:0x0215bea4 module:overlay(83) from:0x02154c38 kind:load to:0x027e0ce4 module:dtcm -from:0x02154c40 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02154c40 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02154c6c kind:arm_call to:0x01fff350 module:itcm from:0x02154c88 kind:arm_call to:0x0215bdcc module:overlay(83) from:0x02154c94 kind:load to:0x027e0ce4 module:dtcm -from:0x02154c9c kind:load to:0x020b2fe0 module:overlay(0) +from:0x02154c9c kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02154cc8 kind:arm_call to:0x01ffaf74 module:itcm from:0x02154cf4 kind:arm_call to:0x0209fe8c module:overlay(0) from:0x02154d10 kind:arm_call to:0x0209fe8c module:overlay(0) @@ -312,7 +312,7 @@ from:0x02155a98 kind:load to:0x0215d8b8 module:overlay(83) from:0x02155a9c kind:load to:0x027e09b8 module:dtcm from:0x02155aa0 kind:load to:0x020b5198 module:overlay(0) from:0x02155aa4 kind:load to:0x027e0d34 module:dtcm -from:0x02155aac kind:load to:0x020b2fe0 module:overlay(0) +from:0x02155aac kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02155ab0 kind:load to:0x027e0ce4 module:dtcm from:0x02155ab4 kind:load to:0x027e09ac module:dtcm from:0x02155b24 kind:arm_call to:0x020a7f24 module:overlay(0) @@ -390,7 +390,7 @@ from:0x021565e0 kind:arm_call to:0x020726d0 module:overlay(0) from:0x021565f4 kind:load to:0x027e09b8 module:dtcm from:0x021565f8 kind:load to:0x020b5198 module:overlay(0) from:0x021565fc kind:load to:0x027e0d34 module:dtcm -from:0x02156604 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02156604 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02156608 kind:load to:0x027e0ce4 module:dtcm from:0x0215660c kind:load to:0x027e09ac module:dtcm from:0x0215667c kind:arm_call to:0x020a7f24 module:overlay(0) diff --git a/config/usa/arm9/overlays/ov084/relocs.txt b/config/usa/arm9/overlays/ov084/relocs.txt index 22c4a9cf..14f98c2c 100644 --- a/config/usa/arm9/overlays/ov084/relocs.txt +++ b/config/usa/arm9/overlays/ov084/relocs.txt @@ -248,7 +248,7 @@ from:0x021533c4 kind:load to:0x02162a90 module:overlay(84) from:0x021533c8 kind:load to:0x027e09c0 module:dtcm from:0x021533f8 kind:arm_call to:0x01fff350 module:itcm from:0x0215341c kind:load to:0x027e0ce4 module:dtcm -from:0x02153424 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02153424 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02153458 kind:arm_call to:0x01ffb428 module:itcm from:0x02153478 kind:arm_call to:0x020d99dc module:overlay(31) from:0x0215349c kind:arm_call to:0x02078210 module:overlay(0) @@ -336,7 +336,7 @@ from:0x02154170 kind:arm_call to:0x02160f64 module:overlay(84) from:0x021541a8 kind:arm_call to:0x020973d4 module:overlay(0) from:0x021541b8 kind:load to:0x027e0cd8 module:dtcm from:0x021541bc kind:load to:0x027e0ce4 module:dtcm -from:0x021541c0 kind:load to:0x020b2fe0 module:overlay(0) +from:0x021541c0 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x021541c8 kind:load to:0x02049bc4 module:main from:0x021541cc kind:load to:0x020b537c module:overlay(0) from:0x021541f8 kind:arm_call to:0x02153fe0 module:overlay(84) @@ -567,7 +567,7 @@ from:0x02156680 kind:arm_call to:0x021596f8 module:overlay(84) from:0x021566a0 kind:arm_call to:0x02096ce0 module:overlay(0) from:0x02156734 kind:arm_call to:0x021558e4 module:overlay(84) from:0x02156760 kind:load to:0x027e0ce4 module:dtcm -from:0x02156764 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02156764 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0215676c kind:load to:0x02049bc4 module:main from:0x02156788 kind:arm_call to:0x02155698 module:overlay(84) from:0x021567c8 kind:arm_call to:0x02096ce0 module:overlay(0) diff --git a/config/usa/arm9/overlays/ov087/relocs.txt b/config/usa/arm9/overlays/ov087/relocs.txt index af3cd07c..59f51306 100644 --- a/config/usa/arm9/overlays/ov087/relocs.txt +++ b/config/usa/arm9/overlays/ov087/relocs.txt @@ -474,7 +474,7 @@ from:0x02158e24 kind:arm_call to:0x020975d8 module:overlay(0) from:0x02158e6c kind:arm_call to:0x020973d4 module:overlay(0) from:0x02158e80 kind:arm_call to:0x02150e90 module:overlay(85) from:0x02158e8c kind:load to:0x027e0ce4 module:dtcm -from:0x02158e94 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02158e94 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02158e98 kind:load to:0x027e09bc module:dtcm from:0x02158e9c kind:load to:0x020b537c module:overlay(0) from:0x02158ec4 kind:arm_call to:0x020975d8 module:overlay(0) @@ -485,7 +485,7 @@ from:0x02158f40 kind:load to:0x02078b08 module:overlay(0) from:0x02158f78 kind:arm_call to:0x01fff350 module:itcm from:0x02158fc0 kind:arm_call to:0x01fff350 module:itcm from:0x02158fe0 kind:load to:0x027e0ce4 module:dtcm -from:0x02158fe8 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02158fe8 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x021591b0 kind:load to:0x02049bc4 module:main from:0x02159254 kind:arm_call to:0x01ffb6e4 module:itcm from:0x0215929c kind:arm_call to:0x01ffb6e4 module:itcm @@ -617,7 +617,7 @@ from:0x0215ae24 kind:arm_call to:0x02152d28 module:overlay(85) from:0x0215ae34 kind:arm_call to:0x01fff350 module:itcm from:0x0215ae50 kind:load to:0x027e09a8 module:dtcm from:0x0215ae58 kind:load to:0x027e0ce4 module:dtcm -from:0x0215ae60 kind:load to:0x020b2fe0 module:overlay(0) +from:0x0215ae60 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0215ae9c kind:arm_call to:0x02015058 module:main from:0x0215aebc kind:arm_call to:0x02071b10 module:overlay(0) from:0x0215aef0 kind:arm_call to:0x02015058 module:main @@ -1035,7 +1035,7 @@ from:0x0215e4ec kind:load to:0x02161f0c module:overlay(87) from:0x0215e4f0 kind:load to:0x0216265c module:overlay(87) from:0x0215e4f4 kind:load to:0x027e0cd8 module:dtcm from:0x0215e4f8 kind:load to:0x027e0ce4 module:dtcm -from:0x0215e500 kind:load to:0x020b2fe0 module:overlay(0) +from:0x0215e500 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0215e504 kind:load to:0x027e0ce8 module:dtcm from:0x0215e50c kind:load to:0x020b34a4 module:overlay(0) from:0x0215e574 kind:arm_call to:0x020732cc module:overlay(0) diff --git a/config/usa/arm9/overlays/ov088/relocs.txt b/config/usa/arm9/overlays/ov088/relocs.txt index d65ac85d..9a9b23b5 100644 --- a/config/usa/arm9/overlays/ov088/relocs.txt +++ b/config/usa/arm9/overlays/ov088/relocs.txt @@ -203,7 +203,7 @@ from:0x02166eb8 kind:load to:0x027e0994 module:dtcm from:0x02166ebc kind:load to:0x021771f8 module:overlay(88) from:0x02166ec0 kind:load to:0x027e09a8 module:dtcm from:0x02166ec4 kind:load to:0x027e0ce4 module:dtcm -from:0x02166ecc kind:load to:0x020b2fe0 module:overlay(0) +from:0x02166ecc kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02166ed0 kind:load to:0x027e0ce8 module:dtcm from:0x02166ed8 kind:load to:0x020b34a4 module:overlay(0) from:0x02166edc kind:load to:0x027e0ce0 module:dtcm @@ -233,7 +233,7 @@ from:0x02167308 kind:load to:0x027e0ce4 module:dtcm from:0x02167314 kind:load to:0x020b537c module:overlay(0) from:0x02167318 kind:load to:0x02174208 module:overlay(88) from:0x02167324 kind:load to:0x027e09ac module:dtcm -from:0x02167334 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02167334 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02167360 kind:arm_call to:0x01fff3b4 module:itcm from:0x0216738c kind:load to:0x027e0ce4 module:dtcm from:0x021673a8 kind:arm_call to:0x01fff3b4 module:itcm diff --git a/config/usa/arm9/overlays/ov092/relocs.txt b/config/usa/arm9/overlays/ov092/relocs.txt index 8a36414f..dcd1b654 100644 --- a/config/usa/arm9/overlays/ov092/relocs.txt +++ b/config/usa/arm9/overlays/ov092/relocs.txt @@ -518,7 +518,7 @@ from:0x0216978c kind:arm_call to:0x01fff350 module:itcm from:0x021697e4 kind:arm_call to:0x01fff498 module:itcm from:0x02169820 kind:load to:0x027e09a4 module:dtcm from:0x02169824 kind:load to:0x027e0ce4 module:dtcm -from:0x0216982c kind:load to:0x020b2fe0 module:overlay(0) +from:0x0216982c kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02169834 kind:load to:0x027e0ce8 module:dtcm from:0x02169970 kind:arm_call to:0x0216cee4 module:overlay(92) from:0x021699fc kind:load to:0x0217d7e0 module:overlay(92) diff --git a/config/usa/arm9/overlays/ov092/symbols.txt b/config/usa/arm9/overlays/ov092/symbols.txt index e1d7291f..324985e7 100644 --- a/config/usa/arm9/overlays/ov092/symbols.txt +++ b/config/usa/arm9/overlays/ov092/symbols.txt @@ -160,7 +160,7 @@ func_ov092_021688c8 kind:function(arm,size=0x2c) addr:0x021688a8 func_ov092_021688f4 kind:function(arm,size=0x2c) addr:0x021688d4 func_ov092_02168920 kind:function(arm,size=0xb4) addr:0x02168900 func_ov092_021689d4 kind:function(arm,size=0x14) addr:0x021689b4 -func_ov092_021689e8 kind:function(arm,size=0xac) addr:0x021689c8 +_ZN25UnkStruct_027e0ce0_40_14C19func_ov092_021689e8EiP21UnkStruct_027e0ce0_40P15PlayerLinkActorP25UnkStruct_027e0ce0_40_328 kind:function(arm,size=0xac) addr:0x021689c8 func_ov092_02168a94 kind:function(arm,size=0x28) addr:0x02168a74 func_ov092_02168abc kind:function(arm,size=0x118) addr:0x02168a9c func_ov092_02168bd4 kind:function(arm,size=0x2c) addr:0x02168bb4 diff --git a/config/usa/arm9/overlays/ov093/relocs.txt b/config/usa/arm9/overlays/ov093/relocs.txt index f599bf78..db23aca5 100644 --- a/config/usa/arm9/overlays/ov093/relocs.txt +++ b/config/usa/arm9/overlays/ov093/relocs.txt @@ -1158,7 +1158,7 @@ from:0x02171940 kind:arm_call to:0x02170fe4 module:overlay(93) from:0x02171948 kind:load to:0x02177d1c module:overlay(93) from:0x021719f4 kind:arm_call to:0x01fff350 module:itcm from:0x02171a30 kind:load to:0x027e0ce4 module:dtcm -from:0x02171a38 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02171a38 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02171a74 kind:load to:0x02177d1c module:overlay(93) from:0x02171ac4 kind:arm_call to:0x02170fe4 module:overlay(93) from:0x02171af4 kind:arm_call to:0x0216f338 module:overlay(93) diff --git a/config/usa/arm9/overlays/ov093/symbols.txt b/config/usa/arm9/overlays/ov093/symbols.txt index 20ea8f5b..3e6e8e6d 100644 --- a/config/usa/arm9/overlays/ov093/symbols.txt +++ b/config/usa/arm9/overlays/ov093/symbols.txt @@ -85,7 +85,7 @@ _ZN19func_ov093_02168004D0Ev kind:function(arm,size=0x1c) addr:0x02167fe4 func_ov093_02168020 kind:function(arm,size=0xdc) addr:0x02168000 func_ov093_021680fc kind:function(arm,size=0xa8) addr:0x021680dc func_ov093_021681a4 kind:function(arm,size=0x7c) addr:0x02168184 -func_ov093_02168220 kind:function(arm,size=0x38) addr:0x02168200 +_ZN21UnkStruct_027e0ce0_4019func_ov093_02168220Ev kind:function(arm,size=0x38) addr:0x02168200 func_ov093_02168258 kind:function(arm,size=0xb4) addr:0x02168238 func_ov093_0216830c kind:function(arm,size=0xfc) addr:0x021682ec func_ov093_02168408 kind:function(thumb,size=0x7c) addr:0x021683e8 @@ -98,7 +98,7 @@ _ZN25UnkStruct_027e0ce0_40_14CD1Ev kind:function(thumb,size=0x2) addr:0x0216882c _ZN25UnkStruct_027e0ce0_40_14C19func_ov093_02168850Ev kind:function(thumb,size=0x14) addr:0x02168830 func_ov093_02168864 kind:function(arm,size=0x184) addr:0x02168844 func_ov093_021689e8 kind:function(arm,size=0x43c) addr:0x021689c8 -func_ov093_02168e24 kind:function(arm,size=0x6c) addr:0x02168e04 +_ZN25UnkStruct_027e0ce0_40_14C19func_ov093_02168e24Ei kind:function(arm,size=0x6c) addr:0x02168e04 func_ov093_02168e90 kind:function(thumb,size=0xa) addr:0x02168e70 func_ov093_02168e9c kind:function(arm,size=0x24) addr:0x02168e7c func_ov093_02168ec0 kind:function(arm,size=0x9c) addr:0x02168ea0 @@ -162,7 +162,7 @@ _ZN19func_ov093_0216ccbcD0Ev kind:function(arm,size=0x1c) addr:0x0216cc9c func_ov093_0216ccd8 kind:function(thumb,size=0x14) addr:0x0216ccb8 func_ov093_0216ccec kind:function(arm,size=0x94) addr:0x0216cccc func_ov093_0216cd80 kind:function(arm,size=0xa4) addr:0x0216cd60 -func_ov093_0216ce24 kind:function(arm,size=0x3c) addr:0x0216ce04 +_ZN15PlayerLinkActor19func_ov093_0216ce24EPi kind:function(arm,size=0x3c) addr:0x0216ce04 _ZN25UnkStruct_027e0ce0_40_328C1EPvP21UnkStruct_027e0ce0_40P25UnkStruct_027e0ce0_40_150Pj kind:function(thumb,size=0x1bc) addr:0x0216ce40 _ZN25UnkStruct_027e0ce0_40_328D1Ev kind:function(thumb,size=0xb6) addr:0x0216cffc _ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d0d4Ev kind:function(thumb,size=0x8c) addr:0x0216d0b4 @@ -173,13 +173,13 @@ func_ov093_0216d3fc kind:function(arm,size=0x30) addr:0x0216d3dc func_ov093_0216d42c kind:function(arm,size=0x14) addr:0x0216d40c func_ov093_0216d440 kind:function(arm,size=0xb4) addr:0x0216d420 func_ov093_0216d4f4 kind:function(arm,size=0xc4) addr:0x0216d4d4 -func_ov093_0216d5b8 kind:function(arm,size=0x830) addr:0x0216d598 +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d5b8Ei kind:function(arm,size=0x830) addr:0x0216d598 func_ov093_0216dde8 kind:function(arm,size=0x48) addr:0x0216ddc8 -func_ov093_0216de30 kind:function(arm,size=0x98) addr:0x0216de10 -func_ov093_0216dec8 kind:function(arm,size=0x260) addr:0x0216dea8 +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216de30Eii kind:function(arm,size=0x98) addr:0x0216de10 +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216dec8Ei kind:function(arm,size=0x260) addr:0x0216dea8 func_ov093_0216e128 kind:function(arm,size=0x68) addr:0x0216e108 func_ov093_0216e190 kind:function(arm,size=0x14) addr:0x0216e170 -func_ov093_0216e1a4 kind:function(arm,size=0xfc) addr:0x0216e184 +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216e1a4Ei kind:function(arm,size=0xfc) addr:0x0216e184 func_ov093_0216e2a0 kind:function(arm,size=0x18) addr:0x0216e280 func_ov093_0216e2b8 kind:function(arm,size=0x20) addr:0x0216e298 func_ov093_0216e2d8 kind:function(arm,size=0x20) addr:0x0216e2b8 @@ -218,7 +218,7 @@ func_ov093_0216f66c kind:function(thumb,size=0x10) addr:0x0216f64c func_ov093_0216f67c kind:function(thumb,size=0x10) addr:0x0216f65c func_ov093_0216f68c kind:function(thumb,size=0x7c) addr:0x0216f66c func_ov093_0216f708 kind:function(thumb,size=0x12) addr:0x0216f6e8 -func_ov093_0216f71c kind:function(thumb,size=0x50) addr:0x0216f6fc +_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216f71cEPi kind:function(thumb,size=0x50) addr:0x0216f6fc func_ov093_0216f76c kind:function(thumb,size=0xc) addr:0x0216f74c func_ov093_0216f778 kind:function(arm,size=0x78) addr:0x0216f758 func_ov093_0216f7f0 kind:function(arm,size=0x7c) addr:0x0216f7d0 diff --git a/config/usa/arm9/overlays/ov094/relocs.txt b/config/usa/arm9/overlays/ov094/relocs.txt index 878dd1d9..78c3ce1b 100644 --- a/config/usa/arm9/overlays/ov094/relocs.txt +++ b/config/usa/arm9/overlays/ov094/relocs.txt @@ -752,7 +752,7 @@ from:0x0216bdfc kind:load to:0x02049bc4 module:main from:0x0216be00 kind:load to:0x020b537c module:overlay(0) from:0x0216be08 kind:load to:0x02178a80 module:overlay(94) from:0x0216be0c kind:load to:0x027e0ce4 module:dtcm -from:0x0216be10 kind:load to:0x020b2fe0 module:overlay(0) +from:0x0216be10 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0216be14 kind:load to:0x0203e93c module:main from:0x0216bef4 kind:arm_call to:0x02058fa4 module:overlay(0) from:0x0216bf1c kind:arm_call to:0x01ffc634 module:itcm @@ -1080,7 +1080,7 @@ from:0x0216eee4 kind:load to:0x020b537c module:overlay(0) from:0x0216ef18 kind:arm_call to:0x01fff350 module:itcm from:0x0216ef38 kind:arm_call to:0x0216f230 module:overlay(94) from:0x0216ef44 kind:load to:0x027e0ce4 module:dtcm -from:0x0216ef4c kind:load to:0x020b2fe0 module:overlay(0) +from:0x0216ef4c kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0216ef5c kind:arm_call to:0x02098368 module:overlay(0) from:0x0216efb4 kind:arm_call_thumb to:0x02057b50 module:overlay(0) from:0x0216eff0 kind:arm_call to:0x0203d138 module:main diff --git a/config/usa/arm9/overlays/ov095/relocs.txt b/config/usa/arm9/overlays/ov095/relocs.txt index ee31749c..3ce16ac3 100644 --- a/config/usa/arm9/overlays/ov095/relocs.txt +++ b/config/usa/arm9/overlays/ov095/relocs.txt @@ -96,7 +96,7 @@ from:0x0217a524 kind:thumb_call to:0x0217a5a4 module:overlay(95) from:0x0217a52c kind:thumb_call_arm to:0x0215408c module:overlay(71) from:0x0217a536 kind:thumb_call to:0x020bba4c module:overlay(1) from:0x0217a55a kind:thumb_call to:0x0217a3ac module:overlay(95) -from:0x0217a564 kind:load to:0x020b2fe0 module:overlay(0) +from:0x0217a564 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0217a56c kind:load to:0x027e0ce4 module:dtcm from:0x0217a570 kind:load to:0x027e0ce0 module:dtcm from:0x0217a5a0 kind:load to:0x027e09b8 module:dtcm @@ -514,7 +514,7 @@ from:0x0217d868 kind:arm_call to:0x021244cc module:overlay(45) from:0x0217d878 kind:arm_call to:0x0208cf00 module:overlay(0) from:0x0217d884 kind:load to:0x027e09a8 module:dtcm from:0x0217d88c kind:load to:0x027e0ce4 module:dtcm -from:0x0217d89c kind:load to:0x020b2fe0 module:overlay(0) +from:0x0217d89c kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0217d8a0 kind:load to:0x02177cec module:overlays(89,90,91,93,94) from:0x0217d8e4 kind:arm_call to:0x01fff3b4 module:itcm from:0x0217d8f0 kind:arm_call to:0x01fff458 module:itcm diff --git a/config/usa/arm9/overlays/ov096/relocs.txt b/config/usa/arm9/overlays/ov096/relocs.txt index 231df08f..5046fca5 100644 --- a/config/usa/arm9/overlays/ov096/relocs.txt +++ b/config/usa/arm9/overlays/ov096/relocs.txt @@ -1,7 +1,7 @@ from:0x02179b2c kind:arm_call to:0x01fff350 module:itcm from:0x02179b48 kind:arm_call to:0x0217ace8 module:overlay(96) from:0x02179b90 kind:load to:0x027e0ce4 module:dtcm -from:0x02179b98 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02179b98 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02179bb4 kind:load to:0x027e0cd8 module:dtcm from:0x02179bb8 kind:load to:0x02081e10 module:overlay(0) from:0x02179bd2 kind:thumb_call_arm to:0x02081d5c module:overlay(0) @@ -20,7 +20,7 @@ from:0x02179d04 kind:thumb_call_arm to:0x0206c988 module:overlay(0) from:0x02179d16 kind:thumb_call_arm to:0x02070540 module:overlay(0) from:0x02179d2e kind:thumb_call_arm to:0x0206d160 module:overlay(0) from:0x02179d38 kind:load to:0x027e09a4 module:dtcm -from:0x02179d3c kind:load to:0x020b2fe0 module:overlay(0) +from:0x02179d3c kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02179d44 kind:load to:0x027e0ce4 module:dtcm from:0x02179d48 kind:load to:0x020b5198 module:overlay(0) from:0x02179da8 kind:arm_call_thumb to:0x02179be8 module:overlay(96) diff --git a/config/usa/arm9/overlays/ov101/relocs.txt b/config/usa/arm9/overlays/ov101/relocs.txt index 7060b86e..82d37d22 100644 --- a/config/usa/arm9/overlays/ov101/relocs.txt +++ b/config/usa/arm9/overlays/ov101/relocs.txt @@ -79,7 +79,7 @@ from:0x02183194 kind:thumb_call to:0x020bcbb0 module:overlay(1) from:0x0218323e kind:thumb_call to:0x0216d1ac module:overlay(93) from:0x02183252 kind:thumb_call to:0x020bbf5c module:overlay(1) from:0x0218328c kind:thumb_call_arm to:0x01fff350 module:itcm -from:0x021832ac kind:load to:0x020b2fe0 module:overlay(0) +from:0x021832ac kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x021832b0 kind:load to:0x027e0ce4 module:dtcm from:0x021832bc kind:thumb_call to:0x020b6d38 module:overlay(1) from:0x021832d2 kind:thumb_call_arm to:0x02011ff4 module:main diff --git a/config/usa/arm9/overlays/ov101/symbols.txt b/config/usa/arm9/overlays/ov101/symbols.txt index f39411f1..6a063d2b 100644 --- a/config/usa/arm9/overlays/ov101/symbols.txt +++ b/config/usa/arm9/overlays/ov101/symbols.txt @@ -14,7 +14,7 @@ _ZN21UnkStruct_027e0ce0_40D1Ev kind:function(thumb,size=0x54) addr:0x02182f40 _ZN21UnkStruct_027e0ce0_4019func_ov101_02182fb4Eb kind:function(thumb,size=0x50) addr:0x02182f94 _ZN21UnkStruct_027e0ce0_4019func_ov101_02183004Ev kind:function(thumb,size=0x1e) addr:0x02182fe4 _ZN21UnkStruct_027e0ce0_4019func_ov101_02183024EPK24UnkStruct_ov001_020c40f4S2_iiP11ItemManagerP21UnkStruct_027e0ce0_30bb kind:function(thumb,size=0x260) addr:0x02183004 -_ZN21PlayerLinkActor_A0_1CC1Ei kind:function(thumb,size=0xc) addr:0x02183264 +_ZN21PlayerLinkActor_A0_1CC1EP21UnkStruct_027e0ce0_40 kind:function(thumb,size=0xc) addr:0x02183264 _ZN21PlayerLinkActor_A0_1C19func_ov101_02183290Ev kind:function(thumb,size=0x48) addr:0x02183270 _ZN30UnkStruct_027e09a4_54_Derived1C2EPi kind:function(thumb,size=0x50) addr:0x021832b8 _ZN30UnkStruct_027e09a4_54_Derived18vfunc_0CEv kind:function(thumb,size=0x134) addr:0x02183308 diff --git a/config/usa/arm9/overlays/ov102/delinks.txt b/config/usa/arm9/overlays/ov102/delinks.txt index f5606e1e..ad4aa77d 100644 --- a/config/usa/arm9/overlays/ov102/delinks.txt +++ b/config/usa/arm9/overlays/ov102/delinks.txt @@ -4,3 +4,26 @@ .ctor start:0x02184954 end:0x02184958 kind:rodata align:4 .data start:0x02184960 end:0x02184a20 kind:data align:32 .bss start:0x02184a20 end:0x02184a20 kind:bss align:32 + +src/102_CourseExecLand/UnkStruct_027e0ce0_40_102.cpp: + .text start:0x02182c00 end:0x021835a4 + +src/102_CourseExecLand/MapObjectUnkSAND_102.cpp: + complete + .text start:0x021835a4 end:0x02183bf4 + .rodata start:0x02184890 end:0x02184930 + +src/102_CourseExecLand/MapObjectUnkPTFL_102.cpp: + .text start:0x02183bf4 end:0x021845a8 + .data start:0x02184960 end:0x021849f0 + +src/102_CourseExecLand/UnkStruct_027e0cd8_0C_102.cpp: + complete + .text start:0x021845a8 end:0x02184624 + +src/102_CourseExecLand/ActorUnkMLCK_102.cpp: + complete + .text start:0x02184624 end:0x02184890 + .init start:0x02184930 end:0x02184954 + .ctor start:0x02184954 end:0x02184958 + .data start:0x021849f0 end:0x02184a20 diff --git a/config/usa/arm9/overlays/ov102/relocs.txt b/config/usa/arm9/overlays/ov102/relocs.txt index 605baa94..b422b3d5 100644 --- a/config/usa/arm9/overlays/ov102/relocs.txt +++ b/config/usa/arm9/overlays/ov102/relocs.txt @@ -156,7 +156,7 @@ from:0x02184764 kind:arm_call to:0x020732dc module:overlay(0) from:0x02184794 kind:load to:0x020d8690 module:overlay(24) from:0x02184798 kind:load to:0x027e0cf0 module:dtcm from:0x0218479c kind:load to:0x027e0ce4 module:dtcm -from:0x021847a0 kind:load to:0x02184a04 module:overlay(102) +from:0x021847a0 kind:load to:0x021849fc add:0x8 module:overlay(102) from:0x021847a8 kind:load to:0x020b5198 module:overlay(0) from:0x021847ac kind:load to:0x020b51a8 module:overlay(0) from:0x021847b0 kind:load to:0x027e09b8 module:dtcm diff --git a/config/usa/arm9/overlays/ov102/symbols.txt b/config/usa/arm9/overlays/ov102/symbols.txt index 45187d58..76cb9d44 100644 --- a/config/usa/arm9/overlays/ov102/symbols.txt +++ b/config/usa/arm9/overlays/ov102/symbols.txt @@ -1,39 +1,39 @@ -func_ov102_02182c20 kind:function(arm,size=0x64) addr:0x02182c00 -func_ov102_02182c84 kind:function(arm,size=0x1d0) addr:0x02182c64 -func_ov102_02182e54 kind:function(arm,size=0x154) addr:0x02182e34 -func_ov102_02182fa8 kind:function(arm,size=0x54) addr:0x02182f88 -func_ov102_02182ffc kind:function(arm,size=0x40) addr:0x02182fdc -func_ov102_0218303c kind:function(arm,size=0x144) addr:0x0218301c -func_ov102_02183180 kind:function(arm,size=0x34) addr:0x02183160 -func_ov102_021831b4 kind:function(arm,size=0x3c) addr:0x02183194 -func_ov102_021831f0 kind:function(arm,size=0x4c) addr:0x021831d0 -func_ov102_0218323c kind:function(arm,size=0x1d8) addr:0x0218321c -func_ov102_02183414 kind:function(arm,size=0x1b0) addr:0x021833f4 -func_ov102_021835c4 kind:function(arm,size=0x1e4) addr:0x021835a4 -func_ov102_021837a8 kind:function(arm,size=0x1c0) addr:0x02183788 -func_ov102_02183968 kind:function(arm,size=0x1c0) addr:0x02183948 -func_ov102_02183b28 kind:function(arm,size=0x48) addr:0x02183b08 -func_ov102_02183b70 kind:function(arm,size=0xa4) addr:0x02183b50 -func_ov102_02183c14 kind:function(arm,size=0x58) addr:0x02183bf4 -func_ov102_02183c6c kind:function(arm,size=0x28) addr:0x02183c4c -func_ov102_02183c94 kind:function(arm,size=0x110) addr:0x02183c74 -func_ov102_02183da4 kind:function(arm,size=0x44) addr:0x02183d84 -func_ov102_02183de8 kind:function(arm,size=0x180) addr:0x02183dc8 -func_ov102_02183f68 kind:function(arm,size=0x14) addr:0x02183f48 -func_ov102_02183f7c kind:function(arm,size=0x220) addr:0x02183f5c -func_ov102_0218419c kind:function(arm,size=0x218) addr:0x0218417c -func_ov102_021843b4 kind:function(arm,size=0x214) addr:0x02184394 -func_ov102_021845c8 kind:function(arm,size=0x60) addr:0x021845a8 -func_ov102_02184628 kind:function(arm,size=0x1c) addr:0x02184608 -_ZN20Actor_ov102_021849508vfunc_20Ev kind:function(arm,size=0x190) addr:0x02184624 -_ZN20Actor_ov102_021849508vfunc_24Ev kind:function(arm,size=0x14) addr:0x021847b4 -func_ov102_021847e8 kind:function(arm,size=0x78) addr:0x021847c8 -func_ov102_02184860 kind:function(arm,size=0x50) addr:0x02184840 -data_ov102_02184890 kind:data(any) addr:0x02184890 -data_ov102_021848d0 kind:data(any) addr:0x021848d0 -__sinit_ov102_02184930 kind:function(arm,size=0x24) addr:0x02184930 -.p__sinit_ov102_02184930 kind:data(word) addr:0x02184954 -data_ov102_02184960 kind:data(any) addr:0x02184960 -data_ov102_02184988 kind:data(any) addr:0x02184988 -data_ov102_021849f0 kind:data(any) addr:0x021849f0 -data_ov102_02184a04 kind:data(any) addr:0x02184a04 +_ZN18PlayerActorBase_7419func_ov102_02182c20EiP7Mat4x3p kind:function(arm,size=0x64) addr:0x02182c00 +_ZN18PlayerActorBase_7419func_ov102_02182c84Ebi14UnkAngleStructP7Mat4x3pS2_ kind:function(arm,size=0x1d0) addr:0x02182c64 +_ZN25UnkStruct_027e0ce0_40_10819func_ov102_02182e54Eiii kind:function(arm,size=0x154) addr:0x02182e34 +_ZN24UnkStruct_ItemManager_2019func_ov102_02182fa8Eii kind:function(arm,size=0x54) addr:0x02182f88 +_ZN24UnkStruct_ItemManager_2019func_ov102_02182ffcEi kind:function(arm,size=0x40) addr:0x02182fdc +_ZN21UnkStruct_027e0ce0_4019func_ov102_0218303cEiP11ItemManager kind:function(arm,size=0x144) addr:0x0218301c +_ZN21UnkStruct_027e0ce0_4019func_ov102_02183180Eib kind:function(arm,size=0x34) addr:0x02183160 +_ZN21UnkStruct_027e0ce0_4019func_ov102_021831b4Ei kind:function(arm,size=0x3c) addr:0x02183194 +_ZN21UnkStruct_027e0ce0_4019func_ov102_021831f0Ei kind:function(arm,size=0x4c) addr:0x021831d0 +_ZN29UnkStruct_027e0ce0_40_Base_7419func_ov102_0218323cEP29UnkStruct_027e0ce0_40_Base_14i kind:function(arm,size=0x1d8) addr:0x0218321c +_Z19func_ov102_02183414PsP21PlayerLinkActor_A0_1CbP7VecFx3214UnkAngleStructi kind:function(arm,size=0x1b0) addr:0x021833f4 +_ZN19MapObjectUnkSAND_4019func_ov102_021835c4EP7VecFx32 kind:function(arm,size=0x1e4) addr:0x021835a4 +_ZN19MapObjectUnkSAND_4019func_ov102_021837a8E8Vec2bCppP7VecFx32 kind:function(arm,size=0x1c0) addr:0x02183788 +_ZN16MapObjectUnkSAND8vfunc_08Ev kind:function(arm,size=0x1c0) addr:0x02183948 +_ZN16MapObjectUnkSAND8vfunc_0CEv kind:function(arm,size=0x48) addr:0x02183b08 +_ZN16MapObjectUnkSAND8vfunc_14Ev kind:function(arm,size=0xa4) addr:0x02183b50 +_Z19func_ov102_02183c14i kind:function(arm,size=0x58) addr:0x02183bf4 +_Z19func_ov102_02183c6ci kind:function(arm,size=0x28) addr:0x02183c4c +_Z19func_ov102_02183c94iiiiitttti kind:function(arm,size=0x110) addr:0x02183c74 +_Z19func_ov102_02183da4iiiiitttti kind:function(arm,size=0x44) addr:0x02183d84 +_ZN16MapObjectUnkPTFL8vfunc_08Ev kind:function(arm,size=0x180) addr:0x02183dc8 +_ZN16MapObjectUnkPTFL8vfunc_0CEv kind:function(arm,size=0x14) addr:0x02183f48 +_ZN16MapObjectUnkPTFL8vfunc_14Ev kind:function(arm,size=0x220) addr:0x02183f5c +_ZN16MapObjectUnkPTFL19func_ov102_0218419cEv kind:function(arm,size=0x218) addr:0x0218417c +_ZN16MapObjectUnkPTFL19func_ov102_021843b4Ev kind:function(arm,size=0x214) addr:0x02184394 +_ZN21UnkStruct_027e0cd8_0C8vfunc_0CEv kind:function(arm,size=0x60) addr:0x021845a8 +_ZN21UnkStruct_027e0cd8_0C19func_ov102_02184628Ev kind:function(arm,size=0x1c) addr:0x02184608 +_ZN12ActorUnkMLCK8vfunc_20Ev kind:function(arm,size=0x190) addr:0x02184624 +_ZN12ActorUnkMLCK8vfunc_24Ev kind:function(arm,size=0x14) addr:0x021847b4 +_ZN15ActorUnkMLCK_C419func_ov102_021847e8Eii kind:function(arm,size=0x78) addr:0x021847c8 +_ZN24UnkStruct_ov102_02184a248vfunc_00EP5Actor kind:function(arm,size=0x50) addr:0x02184840 +data_ov102_021848b0 kind:data(any) addr:0x02184890 local +data_ov102_021848f0 kind:data(any) addr:0x021848d0 local +__sinit_ActorUnkMLCK_102.cpp kind:function(arm,size=0x24) addr:0x02184930 local +.p__sinit_ActorUnkMLCK_102.cpp kind:data(word) addr:0x02184954 local +data_ov102_02184980 kind:data(any) addr:0x02184960 local +data_ov102_021849a8 kind:data(any) addr:0x02184988 local +data_ov102_02184a10 kind:data(any) addr:0x021849f0 local +_ZTV24UnkStruct_ov102_02184a24 kind:data(byte[12]) addr:0x021849fc diff --git a/config/usa/arm9/overlays/ov105/relocs.txt b/config/usa/arm9/overlays/ov105/relocs.txt index b60e20e2..dda4c430 100644 --- a/config/usa/arm9/overlays/ov105/relocs.txt +++ b/config/usa/arm9/overlays/ov105/relocs.txt @@ -280,7 +280,7 @@ from:0x02186b54 kind:arm_call to:0x02185368 module:overlay(105) from:0x02186bc0 kind:arm_call to:0x02082abc module:overlay(0) from:0x02186c20 kind:load to:0x027e09bc module:dtcm from:0x02186c24 kind:load to:0x027e0ce4 module:dtcm -from:0x02186c2c kind:load to:0x020b2fe0 module:overlay(0) +from:0x02186c2c kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02186c30 kind:load to:0x0218a190 module:overlay(105) from:0x02186c34 kind:load to:0x0218a18c module:overlay(105) from:0x02186c38 kind:load to:0x027e09b8 module:dtcm @@ -430,7 +430,7 @@ from:0x02188308 kind:arm_call to:0x021878dc module:overlay(105) from:0x02188328 kind:arm_call to:0x01fff350 module:itcm from:0x02188364 kind:load to:0x027e0ce4 module:dtcm from:0x02188368 kind:load to:0x027e09bc module:dtcm -from:0x02188370 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02188370 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02188374 kind:load to:0x0218a2b8 module:overlay(105) from:0x02188378 kind:load to:0x0218a19c module:overlay(105) from:0x02188380 kind:load to:0x0203e93c module:main @@ -455,7 +455,7 @@ from:0x02188608 kind:load to:0x0218a188 module:overlay(105) from:0x0218860c kind:load to:0x0218a184 module:overlay(105) from:0x02188610 kind:load to:0x0218a180 module:overlay(105) from:0x02188614 kind:load to:0x027e0ce4 module:dtcm -from:0x0218861c kind:load to:0x020b2fe0 module:overlay(0) +from:0x0218861c kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02188620 kind:load to:0x0218a120 module:overlay(105) from:0x02188624 kind:load to:0x0218a174 module:overlay(105) from:0x02188628 kind:load to:0x0218a178 module:overlay(105) @@ -601,7 +601,7 @@ from:0x02189d7c kind:arm_call to:0x020f5b74 module:overlay(31) from:0x02189d84 kind:arm_call to:0x020f4300 module:overlay(31) from:0x02189d94 kind:load to:0x021108d8 module:overlay(31) from:0x02189da0 kind:load to:0x027e0ce4 module:dtcm -from:0x02189da8 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02189da8 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02189dac kind:load to:0x0211091c module:overlay(31) from:0x02189db8 kind:load to:0x0203e93c module:main from:0x02189dc0 kind:load to:0x027e0ce0 module:dtcm diff --git a/config/usa/arm9/overlays/ov107/relocs.txt b/config/usa/arm9/overlays/ov107/relocs.txt index a8ffd58c..e6ac5534 100644 --- a/config/usa/arm9/overlays/ov107/relocs.txt +++ b/config/usa/arm9/overlays/ov107/relocs.txt @@ -166,7 +166,7 @@ from:0x02185fcc kind:arm_call to:0x020907a4 module:overlay(0) from:0x02185fd4 kind:load to:0x027e0cdc module:dtcm from:0x02186000 kind:arm_call to:0x01fff350 module:itcm from:0x02186020 kind:load to:0x027e0ce4 module:dtcm -from:0x02186028 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02186028 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x02186048 kind:load to:0x0210b15c module:overlay(31) from:0x02186054 kind:arm_call to:0x0209cfc0 module:overlay(0) from:0x0218606c kind:arm_call to:0x0218602c module:overlay(107) diff --git a/config/usa/arm9/overlays/ov112/relocs.txt b/config/usa/arm9/overlays/ov112/relocs.txt index 1b9c5255..98094af4 100644 --- a/config/usa/arm9/overlays/ov112/relocs.txt +++ b/config/usa/arm9/overlays/ov112/relocs.txt @@ -45,7 +45,7 @@ from:0x02185710 kind:load to:0x0203f93c module:main from:0x02185714 kind:load to:0x027e0ce8 module:dtcm from:0x02185724 kind:load to:0x027e0ce4 module:dtcm from:0x02185740 kind:load to:0x027e09a4 module:dtcm -from:0x02185748 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02185748 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x0218574c kind:load to:0x027e09b8 module:dtcm from:0x021857a4 kind:arm_call to:0x0208fdb4 module:overlay(0) from:0x021857b8 kind:arm_call to:0x020921c4 module:overlay(0) diff --git a/config/usa/arm9/relocs.txt b/config/usa/arm9/relocs.txt index bbfeb1b4..ecb2756a 100644 --- a/config/usa/arm9/relocs.txt +++ b/config/usa/arm9/relocs.txt @@ -2093,7 +2093,7 @@ from:0x02016ff8 kind:arm_call to:0x01fff350 module:itcm from:0x0201702c kind:arm_call to:0x01ffb9cc module:itcm from:0x02017054 kind:arm_call to:0x01fff350 module:itcm from:0x0201707c kind:load to:0x027e0ce4 module:dtcm -from:0x02017080 kind:load to:0x020b2fe0 module:overlay(0) +from:0x02017080 kind:load to:0x020b2fd8 add:0x8 module:overlay(0) from:0x020170a4 kind:arm_call to:0x01fff520 module:itcm from:0x020170c8 kind:arm_call to:0x01ffb9cc module:itcm from:0x020170f4 kind:arm_call to:0x01ffb9cc module:itcm diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 28cc4fe7..1a7252b0 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -145,7 +145,7 @@ func_02002e78 kind:function(arm,size=0x20) addr:0x02002e78 func_02002e98 kind:function(arm,size=0x20) addr:0x02002e98 func_02002eb8 kind:function(arm,size=0x20) addr:0x02002eb8 NNS_Snd_func_0206617c kind:function(arm,size=0x2c) addr:0x02002ed8 -func_02002f04 kind:function(arm,size=0x28) addr:0x02002f04 +_ZN24UnkStruct_ov000_020b51c013func_02002f04Ev kind:function(arm,size=0x28) addr:0x02002f04 func_02002f2c kind:function(arm,size=0x28) addr:0x02002f2c func_02002f54 kind:function(arm,size=0x48) addr:0x02002f54 func_02002f9c kind:function(arm,size=0x28) addr:0x02002f9c diff --git a/docs/images/double_inheritance_vtable.png b/docs/images/double_inheritance_vtable.png new file mode 100644 index 00000000..c6fd6ee5 Binary files /dev/null and b/docs/images/double_inheritance_vtable.png differ diff --git a/docs/images/double_inheritance_vthunk.png b/docs/images/double_inheritance_vthunk.png new file mode 100644 index 00000000..711ec240 Binary files /dev/null and b/docs/images/double_inheritance_vthunk.png differ diff --git a/docs/tips.md b/docs/tips.md index 58b41444..985b3255 100644 --- a/docs/tips.md +++ b/docs/tips.md @@ -3,6 +3,8 @@ Here we gather useful tips that may help to get started with and solve common problems in case of doubt. \ Some miscellaneous information are also reported here, for example about the build rules or the github workflow. +- [Classes](#classes) + - [Double Inheritance](#double-inheritance) - [Maths](#maths) - [General](#general) - [Fx32](#fx32) @@ -17,6 +19,20 @@ Some miscellaneous information are also reported here, for example about the bui - [Github](#github) - [CI/CD](#cicd) +# Classes + +Helpful tips about C++ classes. + +## Double Inheritance + +Classes (mostly actors and map objects) may inherit from two parents, you can figure that out by looking at the vtables, they'll contain virtual thunk functions that will call another vfunc with a negative offset, those are compiler-generated and usually linked at the end of the unit. + +![vthunk example](images/double_inheritance_vthunk.png) + +When a class inherits from several parents all vtables will end up in the same vtable (they'll also include the empty words at the beginning). In order to have the "vthunks" generated, the target vfunc need to be present in both parent classes, with the same prototype, for instance: `bool vfunc_54(int, int, int)` in parent class A and parent class B, with class C inheriting from A and B. + +![vtable example](images/double_inheritance_vtable.png) + # Maths Most of the following information is about types and macros defined in `libs/nitro/include/nitro/math.h`. \ @@ -136,4 +152,4 @@ You may run that command locally before pushing to your branch to see if CI/CD s The rules run for each versions are detailed [in another section](#github-cicds-rules). The style checks performed can be replicated by running `pre-commit run`. \ -Note that this command only checks **current changes**. Changes from previous commits may not be checked by this command. To ensure that it runs on the entire project, you can add `-a` (or `--all-files`) at the end of the command. \ No newline at end of file +Note that this command only checks **current changes**. Changes from previous commits may not be checked by this command. To ensure that it runs on the entire project, you can add `-a` (or `--all-files`) at the end of the command. diff --git a/include/Actor/ActorItemBoomerang.hpp b/include/Actor/ActorItemBoomerang.hpp index 6ed14b30..266d271d 100644 --- a/include/Actor/ActorItemBoomerang.hpp +++ b/include/Actor/ActorItemBoomerang.hpp @@ -65,8 +65,6 @@ class ActorItemBoomerang : public Actor { public: /* 000 (base) */ /* 094 */ UnkSystem6_Derived2 mUnk_94; - /* 09C */ bool mUnk_9C; - /* 09D */ STRUCT_PAD(0x9D, 0xA0); /* 0A0 */ ActorItemBoomerang_A0 mUnk_A0; /* 0CC */ ActorItemBoomerang_CC mUnk_CC; /* 10C */ VecFx32 mUnk_10C; diff --git a/include/Actor/ActorManager.hpp b/include/Actor/ActorManager.hpp index 65fa98b6..28615a9a 100644 --- a/include/Actor/ActorManager.hpp +++ b/include/Actor/ActorManager.hpp @@ -4,6 +4,7 @@ #include "Actor/Actor_Derived1.hpp" #include "System/SysNew.hpp" #include "Unknown/Common.hpp" +#include "Unknown/UnkStruct_ov000_020b3000.hpp" #include "files.h" #include "types.h" @@ -40,7 +41,7 @@ public: // itcm void func_01fff2fc(void (*callback)(Actor *, u16), unk32 param2); - Actor **func_01fff350(void *param1, Actor **ppActorTable); + Actor **func_01fff350(UnkStruct_ov000_020b3000_Base *param1, Actor **ppActorTable); Actor *func_01fff3b4(ActorRef ref); // overlay 0 diff --git a/include/Actor/ActorRollingStone.hpp b/include/Actor/ActorRollingStone.hpp index 7d2ef25c..779a6c1c 100644 --- a/include/Actor/ActorRollingStone.hpp +++ b/include/Actor/ActorRollingStone.hpp @@ -57,8 +57,6 @@ class ActorRollingStone : public Actor { public: /* 000 (base) */ /* 094 */ UnkSystem6_Derived2 mUnk_94; - /* 09C */ unk8 mUnk_9C; - /* 09D */ STRUCT_PAD(0x9D, 0xA0); /* 0A0 */ Actor_Derived1_94 mUnk_A0; /* 0AC */ ActorShotArrow_140 mUnk_AC; /* 0D4 */ ActorRollingStone_D4 mUnk_D4; diff --git a/include/Actor/ActorShotArrow.hpp b/include/Actor/ActorShotArrow.hpp index d952a778..fd6a6f6f 100644 --- a/include/Actor/ActorShotArrow.hpp +++ b/include/Actor/ActorShotArrow.hpp @@ -99,8 +99,6 @@ class ActorShotArrow : public Actor { public: /* 000 (base) */ /* 094 */ UnkSystem6_Derived2 mUnk_94; - /* 09C */ bool mUnk_9C; - /* 09C */ STRUCT_PAD(0x9D, 0xA0); /* 0A0 */ ModelRender mUnk_A0; /* 100 */ UnkSystem5_Derived1 mUnk_100; /* 120 */ unk32 mUnk_120; diff --git a/include/Actor/ActorUnkIWTS.hpp b/include/Actor/ActorUnkIWTS.hpp index faeedac8..0ca6e7b4 100644 --- a/include/Actor/ActorUnkIWTS.hpp +++ b/include/Actor/ActorUnkIWTS.hpp @@ -20,7 +20,8 @@ public: class ActorUnkIWTS : public Actor { public: /* 00 (base) */ - /* 94 */ + /* 94 */ STRUCT_PAD(0x94, 0x22F8); + /* 22F8 */ VecFx32 mUnk_22F8; ActorUnkIWTS(); diff --git a/include/Actor/ActorUnkMLCK.hpp b/include/Actor/ActorUnkMLCK.hpp index 2821667f..5d0ae8e2 100644 --- a/include/Actor/ActorUnkMLCK.hpp +++ b/include/Actor/ActorUnkMLCK.hpp @@ -9,18 +9,6 @@ class ActorUnkMLCK; -class ActorUnkMLCK_94 : FileSelectManager_UnkDrawBase { -public: - /* 00 (base) */ - /* 0C */ - - // /* 00 */ virtual ~ActorUnkMLCK_94() override; // func_ov031_020fb2fc & func_ov031_020fb2ac - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; // func_ov031_020fb2ec - /* 1C */ virtual void vfunc_1C(unk32 param1) override; // func_ov031_020fb2dc - /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; // func_ov031_020fb2cc - /* 24 */ virtual void vfunc_24() override; // func_ov031_020fb2bc -}; - class ActorUnkMLCK_D8 : public ActorUnkTLKT_9C_Base { public: /* 00 (vtable) */ @@ -37,67 +25,62 @@ public: /* 04 */ virtual void vfunc2_04() override; // func_ov031_020fb1cc }; -class ActorUnkMLCK_B4_00 { +class ActorUnkMLCK_A0 { public: /* 00 (vtable) */ - /* 04 */ unk32 mUnk_04; - /* 08 */ unk32 mUnk_08; - /* 0C */ u16 mUnk_0C; - /* 0E */ u16 mUnk_0E; - /* 10 */ u16 mUnk_10; - /* 12 */ u16 mUnk_12; - /* 14 */ /* 00 */ virtual void vfunc_00(); /* 04 */ virtual bool vfunc_04(); /* 08 */ virtual void vfunc_08(); +}; +struct ActorUnkMLCK_C4_00 { + /* 00 */ unk16 unk_00; + /* 02 */ s16 unk_02; + /* 04 */ unk32 unk_04; + /* 08 */ unk32 unk_08; + /* 0C */ unk32 unk_0C; + /* 10 */ unk32 unk_10; + /* 14 */ unk16 unk_14[]; +}; + +class ActorUnkMLCK_C4 { +public: + /* 00 */ ActorUnkMLCK_C4_00 *mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + /* 0C */ unk16 mUnk_0C; + /* 0E */ u16 mUnk_0E; + /* 10 */ unk16 mUnk_10; + /* 12 */ u16 mUnk_12; + /* 14 */ + + ActorUnkMLCK_C4() : + mUnk_00(NULL), + mUnk_04(0), + mUnk_08(-1), + mUnk_0C(0), + mUnk_0E(0), + mUnk_10(0), + mUnk_12(0) {} + + // overlay 31 void func_ov031_020fb184(); + + // overlay 102 + bool func_ov102_021847e8(unk32 param1, unk32 param2); }; -class ActorUnkMLCK_B4 { -public: - /* 00 */ ActorUnkMLCK_B4_00 *mUnk_00; - /* 04 */ -}; - -class Actor_ov102_02184950 : public Actor { +class ActorUnkMLCK : public Actor, public FileSelectManager_UnkDrawBase { public: /* 00 (base) */ - /* 94 */ - - /* 20 */ virtual void vfunc_20() override; // func_ov102_02184644 - /* 24 */ virtual void vfunc_24() override; // func_ov102_021847d4 - - /* 54 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; - /* 58 */ virtual void vfunc_58() override; - /* 5C */ virtual void vfunc_5C() override; - /* 60 */ virtual void vfunc_60() override; - /* 64 */ virtual void vfunc_64(unk32 param1) override; - /* 68 */ virtual void vfunc_68() override; - /* 6C */ virtual void vfunc_6C() override; - /* 70 */ virtual void vfunc_70() override; -}; - -// multiple inheritance ? -// ActorUnkMLCK_D8 ? -class ActorUnkMLCK : public Actor_ov102_02184950 { -public: - /* 00 (base) */ - /* 94 */ ActorUnkMLCK_94 mUnk_94; - /* A0 */ ActorUnkMLCK_B4 mUnk_A0[0x5]; - /* B4 */ ActorUnkMLCK_B4 *mUnk_B4; + /* A0 */ ActorUnkMLCK_A0 *mUnk_A0[5]; + /* B4 */ ActorUnkMLCK_A0 **mUnk_B4; /* B8 */ unk32 mUnk_B8; /* BC */ unk32 mUnk_BC; /* C0 */ u16 mUnk_C0; - /* C2 */ u16 mUnk_C2; - /* C4 */ ActorUnkMLCK_B4_00 *mUnk_C4; - /* C8 */ unk32 mUnk_C8; - /* CC */ unk32 mUnk_CC; - /* D0 */ unk16 mUnk_D0; - /* D0 */ unk16 mUnk_D2; - /* D0 */ unk16 mUnk_D4; - /* D0 */ unk16 mUnk_D6; + /* C2 */ vu16 mUnk_C2; + /* C4 */ ActorUnkMLCK_C4 mUnk_C4; /* D8 */ ActorUnkMLCK_D8 mUnk_D8; /* E4 */ ActorUnkMLCK_D8 mUnk_E4; /* F0 */ bool mUnk_F0; @@ -108,21 +91,31 @@ public: ActorUnkMLCK(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; // func_ov031_020fac64 - /* 54 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; // func_ov031_020fad88 - /* 58 */ virtual void vfunc_58() override; // func_ov031_020fada8 - /* 5C */ virtual void vfunc_5C() override; // func_ov031_020fadb4 - /* 60 */ virtual void vfunc_60() override; // func_ov031_020fae08 - /* 64 */ virtual void vfunc_64(unk32 param1) override; // func_ov031_020fad3c - /* 68 */ virtual void vfunc_68() override; // func_ov031_020fae20 - /* 6C */ virtual void vfunc_6C() override; // func_ov031_020faeb4 - /* 70 */ virtual void vfunc_70() override; // func_ov031_020faf04 + /// (Actor) + // overlay 31 + /* 18 */ virtual bool vfunc_18(unk32 param1) override; + + // overlay 102 + /* 20 */ virtual void vfunc_20() override; + /* 24 */ virtual void vfunc_24() override; + + /// (FileSelectManager_UnkDrawBase) + // overlay 31 + /* 54 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; + /* 58 */ virtual void vfunc_58(unk32 param1, unk32 param2) override; + /* 5C */ virtual void vfunc_5C(unk32 param1) override; + /* 60 */ virtual void vfunc_60() override; + + /* 64 */ virtual void vfunc_64(unk32 param1) override; + /* 68 */ virtual void vfunc_68() override; + /* 6C */ virtual void vfunc_6C() override; + /* 70 */ virtual void vfunc_70() override; void func_ov031_020faeb0(); void func_ov031_020faf24(); void func_ov031_020fb104(); void func_ov031_020fb11c(); - void func_ov031_020fb1e8(ActorUnkMLCK_B4_00 *param1); + void func_ov031_020fb1e8(ActorUnkMLCK_A0 *param1); bool func_ov031_020fb204(unk32 param1); }; diff --git a/include/Actor/ActorUnkROCK.hpp b/include/Actor/ActorUnkROCK.hpp index 478b5acd..3575b3be 100644 --- a/include/Actor/ActorUnkROCK.hpp +++ b/include/Actor/ActorUnkROCK.hpp @@ -21,7 +21,6 @@ class ActorUnkROCK : public Actor { public: /* 00 (base) */ /* 94 */ UnkSystem6_Derived2 mUnk_94; - /* 9C */ bool mUnk_9C; /* A0 */ ActorUnkSCCN_B8 mUnk_A0; /* B0 */ diff --git a/include/Actor/ActorUnkTGTZ.hpp b/include/Actor/ActorUnkTGTZ.hpp index 93eca195..a69f443f 100644 --- a/include/Actor/ActorUnkTGTZ.hpp +++ b/include/Actor/ActorUnkTGTZ.hpp @@ -20,7 +20,6 @@ public: /* 000 (base) */ #if IS_JP /* 094 */ UnkSystem6_Derived2 mUnk_094; - /* 09C */ bool mUnk_09C; #else /* 094 */ ActorUnkTGTZ_ModelRender mUnk_094; /* 100 */ unk32 mUnk_100; diff --git a/include/Actor/ActorUnkZLSL_ZSRS.hpp b/include/Actor/ActorUnkZLSL_ZSRS.hpp index 5fbb3ebb..45d26063 100644 --- a/include/Actor/ActorUnkZLSL_ZSRS.hpp +++ b/include/Actor/ActorUnkZLSL_ZSRS.hpp @@ -10,12 +10,6 @@ // --- Actor ZLSL --- -class UnkStruct_ov031_0211361c { -public: - // data_ov031_0211361c - virtual bool func_ov031_020ea0b4(Actor *param1); -}; - // NPC Renderer ? class ModelRender_ov000_020b4d64 : public ModelRender { public: diff --git a/include/Actor/Actor_Derived1.hpp b/include/Actor/Actor_Derived1.hpp index 506f4608..d777267d 100644 --- a/include/Actor/Actor_Derived1.hpp +++ b/include/Actor/Actor_Derived1.hpp @@ -8,7 +8,7 @@ class ActorUnk_vfunc_B0 { public: - /* 00 */ unk32 mUnk_00; + /* 00 */ bool mUnk_00; /* 04 */ MapObject_UnkStruct1 *mUnk_04; /* 08 */ u16 mUnk_08; /* 0C */ unk32 mUnk_0C; diff --git a/include/FileSelect/FileSelectUnkDraw.hpp b/include/FileSelect/FileSelectUnkDraw.hpp index 6948565d..2578d3ea 100644 --- a/include/FileSelect/FileSelectUnkDraw.hpp +++ b/include/FileSelect/FileSelectUnkDraw.hpp @@ -15,14 +15,14 @@ public: // data_ov000_020b1dd8 vtable /* 00 */ virtual ~FileSelectManager_UnkDrawBase(); - /* 08 */ virtual void vfunc_08(unk32 param1); - /* 0C */ virtual void vfunc_0C(unk32 param1); - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2); - /* 14 */ virtual void vfunc_14(unk32 param1); - /* 18 */ virtual void vfunc_18(unk32 param1); - /* 1C */ virtual void vfunc_1C(unk32 param1); - /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2); - /* 24 */ virtual void vfunc_24(); + /* 08 */ virtual void vfunc2_08(unk32 param1); + /* 0C */ virtual void vfunc2_0C(unk32 param1); + /* 10 */ virtual void vfunc_54(unk32 param1, unk32 param2); + /* 14 */ virtual void vfunc2_14(unk32 param1); + /* 18 */ virtual void vfunc2_18(unk32 param1); + /* 1C */ virtual void vfunc_5C(unk32 param1); + /* 20 */ virtual void vfunc_58(unk32 param1, unk32 param2); + /* 24 */ virtual void vfunc_60(); /* 28 */ }; @@ -40,14 +40,14 @@ public: // data_ov019_020d23e0 vtable /* 00 */ virtual ~FileSelectManager_160() override; - /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; - /* 14 */ virtual void vfunc_14(unk32 param1) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(unk32 param1) override; - /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; - /* 24 */ virtual void vfunc_24() override; + /* 08 */ virtual void vfunc2_08(unk32 param1) override; + /* 0C */ virtual void vfunc2_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; + /* 14 */ virtual void vfunc2_14(unk32 param1) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 1C */ virtual void vfunc_5C(unk32 param1) override; + /* 20 */ virtual void vfunc_58(unk32 param1, unk32 param2) override; + /* 24 */ virtual void vfunc_60() override; /* 28 */ }; @@ -64,13 +64,13 @@ public: // data_ov019_020d2410 vtable /* 04 */ virtual ~FileSelectManager_164() override; - /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; - /* 14 */ virtual void vfunc_14(unk32 param1) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(unk32 param1) override; - /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; + /* 08 */ virtual void vfunc2_08(unk32 param1) override; + /* 0C */ virtual void vfunc2_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; + /* 14 */ virtual void vfunc2_14(unk32 param1) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 1C */ virtual void vfunc_5C(unk32 param1) override; + /* 20 */ virtual void vfunc_58(unk32 param1, unk32 param2) override; static void func_ov019_020d02f4(); }; diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index 12ecfb01..0b3ddbd4 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -66,6 +66,7 @@ public: // overlay 31 void func_ov031_020d9bd0(); void func_ov031_020dba40(); + void func_ov031_020dbc80(unk32 param1, unk32 param2); }; class UnkStruct_ItemManager_20_04_08_310 { @@ -121,6 +122,8 @@ public: // overlay 31 void func_ov031_020d9598(); void func_ov031_020db338(); + void func_ov031_020db4f0(unk32 param1, unk32 param2); + void func_ov031_020db528(unk32 param1); }; class UnkStruct_ItemManager_20_08 { @@ -145,6 +148,7 @@ public: // overlay 31 void func_ov031_020d9658(); void func_ov031_020db5b4(); + void func_ov031_020db704(unk32 param1, unk32 param2); }; class UnkStruct_ItemManager_20_0C { @@ -163,6 +167,8 @@ public: // overlay 31 void func_ov031_020db954(); + void func_ov031_020db958(unk32 param1, unk32 param2); + void func_ov031_020dba3c(unk32 param1); }; struct UnkStruct_ItemManager_20_10_00 { @@ -199,6 +205,7 @@ public: // overlay 31 void func_ov031_020db7d8(); + void func_ov031_020db7f4(); // overlay 53 unk32 func_ov053_0213caf0(); @@ -224,6 +231,10 @@ public: // overlay 101 void func_ov101_02182d5c(); + + // overlay 102 + void func_ov102_02182fa8(unk32 param1, unk32 param2); + void func_ov102_02182ffc(unk32 param1); }; struct InvImportData { @@ -396,6 +407,9 @@ public: void func_ov001_020bc29c(); void func_ov001_020bc2b8(); + // overlay 17 + void func_ov017_020bd2a0(unk32 param1, unk32 param2); + // overlay 110 static u32 GetBmgIDFromItem(ItemId itemId); static AdventureFlag GetAdvFlagFromItem(ItemId itemId); diff --git a/include/MainGame/AdventureMode.hpp b/include/MainGame/AdventureMode.hpp index 604d51d1..ebdd92f6 100644 --- a/include/MainGame/AdventureMode.hpp +++ b/include/MainGame/AdventureMode.hpp @@ -191,14 +191,14 @@ public: // data_ov024_020d7cc0 /* 00 */ virtual ~AdventureModeManager_160() override; - /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; - /* 14 */ virtual void vfunc_14(unk32 param1) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(unk32 param1) override; - /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; - /* 24 */ virtual void vfunc_24() override; + /* 08 */ virtual void vfunc2_08(unk32 param1) override; + /* 0C */ virtual void vfunc2_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; + /* 14 */ virtual void vfunc2_14(unk32 param1) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 1C */ virtual void vfunc_5C(unk32 param1) override; + /* 20 */ virtual void vfunc_58(unk32 param1, unk32 param2) override; + /* 24 */ virtual void vfunc_60() override; void func_ov024_020c7cfc(); void func_ov024_020c7d4c(unk32 param1); @@ -220,11 +220,11 @@ public: // data_ov026_0213528c /* 00 */ virtual ~AdventureModeManager_164() override; - /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 14 */ virtual void vfunc_14(unk32 param1) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(unk32 param1) override; + /* 08 */ virtual void vfunc2_08(unk32 param1) override; + /* 0C */ virtual void vfunc2_0C(unk32 param1) override; + /* 14 */ virtual void vfunc2_14(unk32 param1) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 1C */ virtual void vfunc_5C(unk32 param1) override; }; class AdventureModeManager_168 : public FileSelectManager_UnkDrawBase { @@ -239,11 +239,11 @@ public: // data_ov031_02116254 /* 00 */ virtual ~AdventureModeManager_168() override; - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; - /* 14 */ virtual void vfunc_14(unk32 param1) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(unk32 param1) override; - /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; + /* 10 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; + /* 14 */ virtual void vfunc2_14(unk32 param1) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 1C */ virtual void vfunc_5C(unk32 param1) override; + /* 20 */ virtual void vfunc_58(unk32 param1, unk32 param2) override; void func_ov031_0210df60(unk32 param1); void func_ov031_0210df70(unk32 param1); @@ -262,12 +262,12 @@ public: // data_ov026_021352bc /* 00 */ virtual ~AdventureModeManager_16C() override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; - /* 14 */ virtual void vfunc_14(unk32 param1) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(unk32 param1) override; - /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; + /* 0C */ virtual void vfunc2_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; + /* 14 */ virtual void vfunc2_14(unk32 param1) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 1C */ virtual void vfunc_5C(unk32 param1) override; + /* 20 */ virtual void vfunc_58(unk32 param1, unk32 param2) override; void func_ov026_020d8dd4(unk32 param1); unk32 func_ov026_020d8e30(); @@ -296,11 +296,11 @@ public: // data_ov024_020d7d0c /* 00 */ virtual ~AdventureModeManager_170() override; - /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 24 */ virtual void vfunc_24() override; + /* 08 */ virtual void vfunc2_08(unk32 param1) override; + /* 0C */ virtual void vfunc2_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 24 */ virtual void vfunc_60() override; }; class AdventureModeManager_174_Base_10 : public UnkStruct_0204a060_Base { @@ -346,10 +346,10 @@ public: AdventureModeManager_178_Base(GameModeManagerBase_104 *param1); // data_ov024_020d7db8 - /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(unk32 param1) override; + /* 08 */ virtual void vfunc2_08(unk32 param1) override; + /* 0C */ virtual void vfunc2_0C(unk32 param1) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 1C */ virtual void vfunc_5C(unk32 param1) override; }; class AdventureModeManager_174 : public AdventureModeManager_174_Base { @@ -363,13 +363,13 @@ public: // data_ov024_020d7d88 /* 00 */ virtual ~AdventureModeManager_174() override; - /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(unk32 param1) override; - /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; - /* 24 */ virtual void vfunc_24() override; + /* 08 */ virtual void vfunc2_08(unk32 param1) override; + /* 0C */ virtual void vfunc2_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 1C */ virtual void vfunc_5C(unk32 param1) override; + /* 20 */ virtual void vfunc_58(unk32 param1, unk32 param2) override; + /* 24 */ virtual void vfunc_60() override; }; class AdventureModeManager_178 : public AdventureModeManager_178_Base { @@ -381,8 +381,8 @@ public: AdventureModeManager_178(GameModeManagerBase_104 *param1); // overlay 24 // data_ov024_020d7de8 - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; - /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; + /* 10 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; + /* 20 */ virtual void vfunc_58(unk32 param1, unk32 param2) override; }; class AdventureModeManager_17C : public AdventureModeManager_178_Base { @@ -395,12 +395,12 @@ public: // data_ov062_02160790 /* 00 */ virtual ~AdventureModeManager_17C() override; - /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(unk32 param1) override; - /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; + /* 08 */ virtual void vfunc2_08(unk32 param1) override; + /* 0C */ virtual void vfunc2_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 1C */ virtual void vfunc_5C(unk32 param1) override; + /* 20 */ virtual void vfunc_58(unk32 param1, unk32 param2) override; }; class AdventureModeManager_180_18 : public UnkStruct_0204a060_Base { @@ -431,13 +431,13 @@ public: // data_ov024_020d7e34 /* 00 */ virtual ~AdventureModeManager_180() override; - /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(unk32 param1) override; - /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; - /* 24 */ virtual void vfunc_24() override; + /* 08 */ virtual void vfunc2_08(unk32 param1) override; + /* 0C */ virtual void vfunc2_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 1C */ virtual void vfunc_5C(unk32 param1) override; + /* 20 */ virtual void vfunc_58(unk32 param1, unk32 param2) override; + /* 24 */ virtual void vfunc_60() override; void func_ov024_020c9430(unk32 param1, unk32 param2); void func_ov024_020c957c(); @@ -491,14 +491,14 @@ public: // data_ov024_020d7e64 /* 00 */ virtual ~AdventureModeManager_184(); - /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; - /* 14 */ virtual void vfunc_14(unk32 param1) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(unk32 param1) override; - /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; - /* 24 */ virtual void vfunc_24() override; + /* 08 */ virtual void vfunc2_08(unk32 param1) override; + /* 0C */ virtual void vfunc2_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; + /* 14 */ virtual void vfunc2_14(unk32 param1) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 1C */ virtual void vfunc_5C(unk32 param1) override; + /* 20 */ virtual void vfunc_58(unk32 param1, unk32 param2) override; + /* 24 */ virtual void vfunc_60() override; void func_ov024_020c979c(unk32 param1); }; @@ -512,13 +512,13 @@ public: // data_ov031_021162a0 /* 00 */ virtual ~AdventureModeManager_188() override; - /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; - /* 14 */ virtual void vfunc_14(unk32 param1) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(unk32 param1) override; - /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; + /* 08 */ virtual void vfunc2_08(unk32 param1) override; + /* 0C */ virtual void vfunc2_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; + /* 14 */ virtual void vfunc2_14(unk32 param1) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 1C */ virtual void vfunc_5C(unk32 param1) override; + /* 20 */ virtual void vfunc_58(unk32 param1, unk32 param2) override; }; class AdventureModeManager_18C_14 : public UnkStruct_0204a060_Base { @@ -567,14 +567,14 @@ public: // data_ov024_020d7eb0 /* 00 */ virtual ~AdventureModeManager_18C() override; - /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; - /* 14 */ virtual void vfunc_14(unk32 param1) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(unk32 param1) override; - /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; - /* 24 */ virtual void vfunc_24() override; + /* 08 */ virtual void vfunc2_08(unk32 param1) override; + /* 0C */ virtual void vfunc2_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; + /* 14 */ virtual void vfunc2_14(unk32 param1) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 1C */ virtual void vfunc_5C(unk32 param1) override; + /* 20 */ virtual void vfunc_58(unk32 param1, unk32 param2) override; + /* 24 */ virtual void vfunc_60() override; void func_ov024_020c9c6c(); void func_ov024_020ca034(); @@ -624,12 +624,12 @@ public: AdventureModeManager_190(GameModeManagerBase_104 *param1); // overlay 24 // data_ov024_020d7f18 - /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(unk32 param1) override; - /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; + /* 08 */ virtual void vfunc2_08(unk32 param1) override; + /* 0C */ virtual void vfunc2_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 1C */ virtual void vfunc_5C(unk32 param1) override; + /* 20 */ virtual void vfunc_58(unk32 param1, unk32 param2) override; void func_ov024_020ca21c(); bool func_ov024_020ca24c(unk32 param1); @@ -654,13 +654,13 @@ public: // data_ov031_021162ec /* 00 */ virtual ~AdventureModeManager_194() override; - /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(unk32 param1) override; - /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; - /* 24 */ virtual void vfunc_24() override; + /* 08 */ virtual void vfunc2_08(unk32 param1) override; + /* 0C */ virtual void vfunc2_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 1C */ virtual void vfunc_5C(unk32 param1) override; + /* 20 */ virtual void vfunc_58(unk32 param1, unk32 param2) override; + /* 24 */ virtual void vfunc_60() override; }; class AdventureModeManager_198 : public FileSelectManager_UnkDrawBase { @@ -672,13 +672,13 @@ public: // data_ov058_02155e08 /* 00 */ virtual ~AdventureModeManager_198() override; - /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; - /* 14 */ virtual void vfunc_14(unk32 param1) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(unk32 param1) override; - /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; + /* 08 */ virtual void vfunc2_08(unk32 param1) override; + /* 0C */ virtual void vfunc2_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; + /* 14 */ virtual void vfunc2_14(unk32 param1) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 1C */ virtual void vfunc_5C(unk32 param1) override; + /* 20 */ virtual void vfunc_58(unk32 param1, unk32 param2) override; }; class AdventureModeManager_19C : public FileSelectManager_UnkDrawBase { @@ -691,12 +691,12 @@ public: // data_ov026_021352ec /* 00 */ virtual ~AdventureModeManager_19C() override; - /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 14 */ virtual void vfunc_14(unk32 param1) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(unk32 param1) override; - /* 24 */ virtual void vfunc_24() override; + /* 08 */ virtual void vfunc2_08(unk32 param1) override; + /* 0C */ virtual void vfunc2_0C(unk32 param1) override; + /* 14 */ virtual void vfunc2_14(unk32 param1) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 1C */ virtual void vfunc_5C(unk32 param1) override; + /* 24 */ virtual void vfunc_60() override; }; class AdventureModeManager_1A0 : public AdventureModeManager_174_Base { @@ -709,12 +709,12 @@ public: // data_ov062_021607c0 /* 00 */ virtual ~AdventureModeManager_1A0() override; - /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(unk32 param1) override; - /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; + /* 08 */ virtual void vfunc2_08(unk32 param1) override; + /* 0C */ virtual void vfunc2_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 1C */ virtual void vfunc_5C(unk32 param1) override; + /* 20 */ virtual void vfunc_58(unk32 param1, unk32 param2) override; }; class AdventureModeManager_1A4 : public AdventureModeManager_174_Base { @@ -727,12 +727,12 @@ public: // data_ov062_021607f0 /* 00 */ virtual ~AdventureModeManager_1A4() override; - /* 08 */ virtual void vfunc_08(unk32 param1) override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 1C */ virtual void vfunc_1C(unk32 param1) override; - /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; + /* 08 */ virtual void vfunc2_08(unk32 param1) override; + /* 0C */ virtual void vfunc2_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 1C */ virtual void vfunc_5C(unk32 param1) override; + /* 20 */ virtual void vfunc_58(unk32 param1, unk32 param2) override; }; class AdventureModeManager_1A8 : public FileSelectManager_UnkDrawBase { @@ -744,10 +744,10 @@ public: // data_ov088_02176068 /* 00 */ virtual ~AdventureModeManager_1A8() override; - /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 08 */ virtual void vfunc2_08(unk32 param1) override; /* 14 */ virtual void vfunc_14(unk32 param1) override; - /* 18 */ virtual void vfunc_18(unk32 param1) override; - /* 24 */ virtual void vfunc_24() override; + /* 18 */ virtual void vfunc2_18(unk32 param1) override; + /* 24 */ virtual void vfunc_60() override; }; // AdventureMode? diff --git a/include/MainGame/MiscAdvManager.hpp b/include/MainGame/MiscAdvManager.hpp index 035e296f..7a6657aa 100644 --- a/include/MainGame/MiscAdvManager.hpp +++ b/include/MainGame/MiscAdvManager.hpp @@ -81,7 +81,7 @@ public: /* 83 */ unk8 mUnk_83; // pad? /* 84 */ unk32 mLettersRead; // bitfield /* 88 */ unk32 mStampsFlag; // bitfield, related to the checkmarks from the stampbook - /* 8C */ unk16 mSongs; // bitfield + /* 8C */ u16 mSongs; // bitfield /* 8E */ unk16 mUnk_8E; // pad? /* 90 */ diff --git a/include/MapObject/MapObject.hpp b/include/MapObject/MapObject.hpp index 8c83e5ee..686ee1f5 100644 --- a/include/MapObject/MapObject.hpp +++ b/include/MapObject/MapObject.hpp @@ -173,6 +173,10 @@ public: return isVertical; } + void Kill(void) { + UNSET_FLAG(this->mFlags, MapObjFlag_Alive); + } + MapObject(); MapObjectId GetMapObjectId(); diff --git a/include/MapObject/MapObjectDoorClick.hpp b/include/MapObject/MapObjectDoorClick.hpp index 769daeed..02e58e54 100644 --- a/include/MapObject/MapObjectDoorClick.hpp +++ b/include/MapObject/MapObjectDoorClick.hpp @@ -34,10 +34,6 @@ class MapObjectDoorClick : public MapObjectDoorBase { public: /* 00 (base) */ /* 94 */ UnkSystem6_Derived2 mUnk_94; - /* 9C */ unk8 mUnk_9C; // bool? - /* 9D */ unk8 mUnk_9D; // pad? - /* 9E */ unk8 mUnk_9E; // pad? - /* 9F */ unk8 mUnk_9F; // pad? /* A0 */ UnkStruct_PlayerGet_ec mUnk_A0; /* A0 */ unk32 mUnk_A4; /* A8 */ MapObject_10 mUnk_A8; diff --git a/include/MapObject/MapObjectDoorDangerSpawn.hpp b/include/MapObject/MapObjectDoorDangerSpawn.hpp index a36acaa9..18b1753e 100644 --- a/include/MapObject/MapObjectDoorDangerSpawn.hpp +++ b/include/MapObject/MapObjectDoorDangerSpawn.hpp @@ -44,10 +44,6 @@ class MapObjectDoorDangerSpawn : public MapObjectDoorBase { public: /* 00 (base) */ /* 94 */ UnkSystem6_Derived2 mUnk_94; - /* 9C */ unk8 mUnk_9C; - /* 9D */ unk8 mUnk_9D; - /* 9E */ unk8 mUnk_9E; - /* 9F */ unk8 mUnk_9F; /* A0 */ unk8 mUnk_A0; /* A1 */ bool mUnk_A1; /* A2 */ bool mUnk_A2; diff --git a/include/MapObject/MapObjectDoorKey.hpp b/include/MapObject/MapObjectDoorKey.hpp index 177f909a..c6805c43 100644 --- a/include/MapObject/MapObjectDoorKey.hpp +++ b/include/MapObject/MapObjectDoorKey.hpp @@ -23,10 +23,6 @@ class MapObjectDoorKey : public MapObjectDoorBase { public: /* 00 (base) */ /* 94 */ UnkSystem6_Derived2 mUnk_94; - /* 9C */ unk8 mUnk_9C; - /* 9D */ unk8 mUnk_9D; // pad? - /* 9E */ unk8 mUnk_9E; // pad? - /* 9F */ unk8 mUnk_9F; // pad? /* A0 */ UnkStruct_PlayerGet_ec mUnk_A0; /* A4 */ bool mUnk_A4; /* A5 */ unk8 mUnk_A5; // pad? diff --git a/include/MapObject/MapObjectMiniBlocks.hpp b/include/MapObject/MapObjectMiniBlocks.hpp index ff402d08..51343cd5 100644 --- a/include/MapObject/MapObjectMiniBlocks.hpp +++ b/include/MapObject/MapObjectMiniBlocks.hpp @@ -10,9 +10,6 @@ class MapObjectMiniBlocks : public MapObject { public: /* 00 (base) */ /* 40 */ UnkSystem6_Derived2 mUnk_40; - /* 48 */ unk8 mUnk_48; - /* 49 */ unk8 mUnk_49; // pad? - /* 4A */ unk16 mUnk_4A; // pad? /* 4C */ MapObjectMiniBlocks(); diff --git a/include/MapObject/MapObjectUnkPTFL.hpp b/include/MapObject/MapObjectUnkPTFL.hpp index cd97693e..07f6b186 100644 --- a/include/MapObject/MapObjectUnkPTFL.hpp +++ b/include/MapObject/MapObjectUnkPTFL.hpp @@ -5,26 +5,53 @@ #include "MapObject/MapObject.hpp" #include "MapObject/MapObjectProfile.hpp" #include "global.h" -#include "types.h" + +typedef MapObjState MapObjectUnkPTFLState; +enum MapObjectUnkPTFLState_ { + /* 0 */ MapObjectUnkPTFLState_0 = 0, + /* 1 */ MapObjectUnkPTFLState_1 = 1, + /* 2 */ MapObjectUnkPTFLState_2 = 2, + /* 3 */ MapObjectUnkPTFLState_3 = 3, + /* 4 */ MapObjectUnkPTFLState_4 = 4, +}; class MapObjectUnkPTFL : public MapObject { public: /* 00 (base) */ - /* 40 */ + /* 40 */ unk32 mUnk_40; + /* 44 */ u16 mUnk_44; + /* 46 */ unk16 mUnk_46; + /* 48 */ unk32 mUnk_48; + /* 4C */ unk32 mUnk_4C; + /* 50 */ unk32 mUnk_50; + /* 54 */ fx16 mUnk_54; + /* 56 */ volatile u16 mUnk_56; + /* 58 */ volatile u16 mUnk_58; + /* 5A */ u8 mUnk_5A; + /* 5B */ bool mUnk_5B; + /* 5C */ bool mUnk_5C; MapObjectUnkPTFL(); + /* 08 */ virtual void vfunc_08(); + /* 0C */ virtual void vfunc_0C(); + /* 0C */ virtual void vfunc_14(); /* 30 */ virtual ~MapObjectUnkPTFL() override; + // overlay 70 void func_ov070_0214ba34(void); void func_ov070_0214bb78(void); - void func_ov070_0214bbd0(void); + void func_ov070_0214bbd0(MapObjectUnkPTFLState state, bool param2); void func_ov070_0214bd48(void); void func_ov070_0214bd90(void); void func_ov070_0214bf58(void); - void func_ov070_0214bf5c(void); - void func_ov070_0214bf6c(void); + bool func_ov070_0214bf5c(void); + bool func_ov070_0214bf6c(void); void func_ov070_0214bfbc(void); + + // overlay 102 + void func_ov102_0218419c(); + void func_ov102_021843b4(); }; class MapObjectProfileUnkPTFL : public MapObjectProfile { diff --git a/include/MapObject/MapObjectUnkSAND.hpp b/include/MapObject/MapObjectUnkSAND.hpp index 8fcc759a..a809680a 100644 --- a/include/MapObject/MapObjectUnkSAND.hpp +++ b/include/MapObject/MapObjectUnkSAND.hpp @@ -2,23 +2,47 @@ #pragma once +#include "Actor/ActorUnkSCCN.hpp" #include "MapObject/MapObject.hpp" #include "MapObject/MapObjectProfile.hpp" #include "global.h" +#include "math.hpp" #include "types.h" +enum MapObjectUnkSANDState_ { + /* 0 */ MapObjectUnkSANDState_0 = 0, + /* 0 */ MapObjectUnkSANDState_1 = 1, +}; + +class MapObjectUnkSAND_40 { +public: + /* 00 */ u8 mUnk_00; + /* 01 */ u8 mUnk_01; + /* 02 */ unk16 mUnk_02; + /* 04 */ unk16 mUnk_04; + /* 06 */ + + void func_ov102_021835c4(VecFx32 *param1); + void func_ov102_021837a8(Vec2bCpp param1, VecFx32 *param2); +}; + class MapObjectUnkSAND : public MapObject { public: /* 00 (base) */ - /* 40 */ + /* 40 */ MapObjectUnkSAND_40 mUnk_40[2]; + /* 4C */ unk32 mUnk_4C; + /* 50 */ ActorUnkSCCN_B8 mUnk_50; + /* 60 */ VecFx32 mUnk_60; MapObjectUnkSAND(); + /* 08 */ virtual void vfunc_08(); + /* 0C */ virtual void vfunc_0C(); + /* 0C */ virtual void vfunc_14(); /* 30 */ virtual ~MapObjectUnkSAND() override; void func_ov031_0210acd4(void); void func_ov031_0210ad64(void); - void func_ov031_0210ae00(void); void func_ov031_0210ae90(void); void func_ov031_0210af50(void); void func_ov031_0210b018(void); @@ -26,11 +50,13 @@ public: void func_ov031_0210b0ac(void); void func_ov031_0210b0e4(void); void func_ov031_0210b144(void); - void func_ov031_0210b17c(void); void func_ov031_0210b1ec(void); void func_ov031_0210b2cc(void); void func_ov031_0210b32c(void); void func_ov031_0210b34c(void); + + static unk32 func_ov031_0210ae00(Vec2bCpp param1, void *param2); + static void func_ov031_0210b17c(MapObjectUnkSAND_40 *param1, unk32 param2); }; class MapObjectProfileUnkSAND : public MapObjectProfile_Derived6 { diff --git a/include/MapObject/MapObjectUnkSKDI.hpp b/include/MapObject/MapObjectUnkSKDI.hpp index 52d5cc5a..88935f9f 100644 --- a/include/MapObject/MapObjectUnkSKDI.hpp +++ b/include/MapObject/MapObjectUnkSKDI.hpp @@ -19,8 +19,6 @@ class MapObjectUnkSKDI : public MapObject { public: /* 000 (base) */ /* 040 */ UnkSystem6_Derived2 mUnk_040; - /* 048 */ unk8 mUnk_048; - /* 049 */ STRUCT_PAD(0x049, 0x04C); /* 04C */ ActorBomb_unk mUnk_04C[0x4]; /* 07C */ unk32 mUnk_07C; /* 080 */ unk32 mUnk_080; diff --git a/include/MapObject/MapObjectUnkSTAT.hpp b/include/MapObject/MapObjectUnkSTAT.hpp index 443b2f86..5f72fe3b 100644 --- a/include/MapObject/MapObjectUnkSTAT.hpp +++ b/include/MapObject/MapObjectUnkSTAT.hpp @@ -10,8 +10,6 @@ class MapObjectUnkSTAT : public MapObject { public: /* 00 (base) */ /* 40 */ UnkSystem6_Derived2 mUnk_40; - /* 48 */ unk8 mUnk_48; - /* 49 */ STRUCT_PAD(0x49, 0x4C); /* 4C */ unk32 mUnk_4C; /* 50 */ unk32 mUnk_50; /* 54 */ unk32 mUnk_54; diff --git a/include/Player/PlayerActorBase.hpp b/include/Player/PlayerActorBase.hpp index ee657f5d..a2198640 100644 --- a/include/Player/PlayerActorBase.hpp +++ b/include/Player/PlayerActorBase.hpp @@ -5,6 +5,7 @@ #include "Unknown/Common.hpp" #include "math.hpp" +#include "nitro/fx.h" #include "types.h" #include @@ -367,7 +368,9 @@ public: class PlayerActorBase_74 { private: - /* 00 */ STRUCT_PAD(0x00, 0x34); + /* 00 */ unk32 mUnk_00; + /* 04 */ VecFx32 mUnk_04[2]; + /* 1C */ VecFx32 mUnk_1C[2]; /* 34 */ public: @@ -375,7 +378,14 @@ public: this->func_ov001_020db190(); } + inline bool UnknownInline1(u32 index, VecFx32 *pVec); + + // overlay 1 void func_ov001_020db190(); + + // overlay 102 + void func_ov102_02182c20(unk32 param1, Mat4x3p *param2); + void func_ov102_02182c84(bool param1, unk32 param2, UnkAngleStruct param3, Mat4x3p *param4, Mat4x3p *param5); }; struct PlayerActorBase_78_04 { diff --git a/include/Player/PlayerLink.hpp b/include/Player/PlayerLink.hpp index 8cd60123..509e70e0 100644 --- a/include/Player/PlayerLink.hpp +++ b/include/Player/PlayerLink.hpp @@ -46,14 +46,14 @@ public: class PlayerLinkActor_A0_1C { public: - /* 00 */ unk32 mUnk_00; + /* 00 */ UnkStruct_027e0ce0_40 *mUnk_00; /* 04 */ unk16 mUnk_04; /* 06 */ bool mUnk_06; /* 07 */ STRUCT_PAD(0x07, 0x0C); /* 0C */ ActorRef mUnk_0C; /* 10 */ - PlayerLinkActor_A0_1C(unk32 param1); + PlayerLinkActor_A0_1C(UnkStruct_027e0ce0_40 *param1); // overlay 101 void func_ov101_02183290(); @@ -281,13 +281,22 @@ public: void func_ov001_020bcba8(); void func_ov001_020bcbd0(VecFx32 *pVec); + // overlay 17 + void func_ov017_020bd788(unk32 param1); + void func_ov017_020bdcf4(); + void func_ov017_020bdd84(unk32 param1, unk32 param2); + void func_ov017_020bdf48(unk32 param1, unk32 param2, unk32 param3, unk32 param4); + // overlay 21 void func_ov021_020ebda0(); - void func_ov021_020ebda0(int); + void func_ov021_020ebda0(unk32 param1); // overlay 31 void func_ov031_020d96a4(PlayerLinkActor_A0 *param1, UnkStruct_027e0ce0_40 *param2); void func_ov031_020d96a4(int, PlayerLinkActor_A0 *param1, UnkStruct_027e0ce0_40 *param2); void func_ov031_020dccf0(); - void func_ov031_020dccf0(int); + void func_ov031_020dccf0(unk32 param1); + + // overlay 93 + void func_ov093_0216ce24(unk32 *param1); }; diff --git a/include/Render/ModelRender.hpp b/include/Render/ModelRender.hpp index 2a8d21e2..bb4eb711 100644 --- a/include/Render/ModelRender.hpp +++ b/include/Render/ModelRender.hpp @@ -112,7 +112,8 @@ public: class UnkSystem6_Derived2 : public UnkSystem6_Derived1 { public: /* 00 (base) */ - /* 08 */ + /* 08 */ bool mUnk_08; + /* 0C */ UnkSystem6_Derived2() : UnkSystem6_Derived1(NULL) {} @@ -120,6 +121,14 @@ public: UnkSystem6_Derived2(G3d_Model *pModel) : UnkSystem6_Derived1(pModel) {} + UnkSystem6_Derived2(G3d_Model *pModel, bool param2) : + UnkSystem6_Derived1(pModel), + mUnk_08(param2) {} + + UnkSystem6_Derived2(bool param2) : + UnkSystem6_Derived1(NULL), + mUnk_08(param2) {} + // data_ov000_020b1968 /* 00 */ virtual ~UnkSystem6_Derived2() {} /* 0C */ virtual void vfunc_0C() override; diff --git a/include/Unknown/UnkStruct_0204a088.hpp b/include/Unknown/UnkStruct_0204a088.hpp index 29b33046..0646ed33 100644 --- a/include/Unknown/UnkStruct_0204a088.hpp +++ b/include/Unknown/UnkStruct_0204a088.hpp @@ -4,6 +4,9 @@ #include "System/SysNew.hpp" #include "types.h" +class Actor; +class FileSelectManager_UnkDrawBase; + // members 00 04 and 08 are used in data_ov000_020b1d74 to figure out which overlay to load next in slot 1 class UnkStruct_0204a088 : public AutoInstance { public: @@ -25,7 +28,7 @@ public: // overlay 0 void func_ov000_02061098(void); - void func_ov000_020611dc(void *param1, unk32 param2); + void func_ov000_020611dc(FileSelectManager_UnkDrawBase *param1, unk32 param2); bool func_ov000_020611fc(unk32 param2); // sets new index bool func_ov000_02061224(void); void func_ov000_02061230(void); diff --git a/include/Unknown/UnkStruct_027e0208.hpp b/include/Unknown/UnkStruct_027e0208.hpp index 636eb6af..41716acd 100644 --- a/include/Unknown/UnkStruct_027e0208.hpp +++ b/include/Unknown/UnkStruct_027e0208.hpp @@ -6,7 +6,9 @@ class UnkStruct_027e0208 { public: /* 000 */ unk32 mUnk_000; - /* 004 */ STRUCT_PAD(0x04, 0xE0); + /* 004 */ STRUCT_PAD(0x04, 0x94); + /* 094 */ unk32 mUnk_094; + /* 098 */ STRUCT_PAD(0x98, 0xE0); /* 0E0 */ unk32 mUnk_0E0; /* 0E4 */ unk32 mUnk_0E4; /* 0E8 */ unk32 mUnk_0E8; diff --git a/include/Unknown/UnkStruct_027e09b8.hpp b/include/Unknown/UnkStruct_027e09b8.hpp index 22be7694..a2fa72cf 100644 --- a/include/Unknown/UnkStruct_027e09b8.hpp +++ b/include/Unknown/UnkStruct_027e09b8.hpp @@ -162,7 +162,7 @@ public: ~UnkStruct_027e09b8(); // itcm - unk32 func_01ffd420(); + bool func_01ffd420(); // overlay 0 unk32 func_ov000_020732ec(unk32 param1); diff --git a/include/Unknown/UnkStruct_027e09bc.hpp b/include/Unknown/UnkStruct_027e09bc.hpp index f5654fff..d407c031 100644 --- a/include/Unknown/UnkStruct_027e09bc.hpp +++ b/include/Unknown/UnkStruct_027e09bc.hpp @@ -3,6 +3,7 @@ #include "Unknown/Common.hpp" #include "Unknown/UnkStruct_0204a060.hpp" #include "global.h" +#include "math.hpp" #include "types.h" class UnkStruct_027e09bc_0C { @@ -25,6 +26,7 @@ public: /* 10 */ // itcm + bool func_01ffd43c(Vec2s *param1, unk32 param2, unk32 param3); bool func_01ffd640(VecFx32 *param1); // overlay 0 @@ -51,10 +53,7 @@ public: class UnkStruct_027e09bc : public AutoInstance { public: /* 00 (vtable) */ - /* 04 */ UnkStruct_027e09bc_0C *mUnk_04; - /* 08 */ unk32 mUnk_08; - /* 0C */ UnkStruct_027e09bc_0C *mUnk_0C; - /* 10 */ UnkStruct_027e09bc_0C *mUnk_10; + /* 04 */ UnkStruct_027e09bc_0C *mUnk_04[4]; /* 14 */ UnkStruct_027e09bc_0C *mUnk_14[4]; /* 24 */ UnkStruct_027e09bc_24 mUnk_24; /* 48 */ UnkSystem9 mUnk_48; diff --git a/include/Unknown/UnkStruct_027e0cd8.hpp b/include/Unknown/UnkStruct_027e0cd8.hpp index 95a1d3f5..63e8b509 100644 --- a/include/Unknown/UnkStruct_027e0cd8.hpp +++ b/include/Unknown/UnkStruct_027e0cd8.hpp @@ -113,6 +113,9 @@ public: UnkStruct_027e0cd8_0C_Base_98(); ~UnkStruct_027e0cd8_0C_Base_98(); + + // overlay 47 + void func_ov047_0213055c(); }; class UnkStruct_027e0cd8_0C_Base_148_00_Base { @@ -332,12 +335,17 @@ public: // data_ov031_02112a0c /* 00 */ virtual ~UnkStruct_027e0cd8_0C() override; /* 08 */ virtual void vfunc_08(); + /* 0C */ virtual void vfunc_0C(); + /* 1C */ virtual void vfunc_1C(const EntranceInfo *param1, bool param2, bool param3); /* 38 */ virtual void vfunc_38(); // overlay 31 void func_ov031_020d8738(); void func_ov031_020d88c0(); void func_ov031_020d8ae4(); + + // overlay 102 + void func_ov102_02184628(); }; class UnkStruct_027e0cd8_0C_Derived2 : public UnkStruct_027e0cd8_0C_Base { diff --git a/include/Unknown/UnkStruct_027e0ce0.hpp b/include/Unknown/UnkStruct_027e0ce0.hpp index b83cae09..8cf87b62 100644 --- a/include/Unknown/UnkStruct_027e0ce0.hpp +++ b/include/Unknown/UnkStruct_027e0ce0.hpp @@ -457,7 +457,11 @@ public: class UnkStruct_027e0ce0_40_Base_14 { public: /* 00 */ TouchControl mTouchControl; - /* 22 */ STRUCT_PAD(0x22, 0x60); + /* 22 */ STRUCT_PAD(0x22, 0x40); + /* 40 */ unk16 mUnk_40; + /* 42 */ unk16 mUnk_42; + /* 44 */ unk16 mUnk_44; + /* 48 */ STRUCT_PAD(0x48, 0x60); /* 60 */ UnkStruct_027e0ce0_40_Base_14() : @@ -472,21 +476,37 @@ public: class UnkStruct_027e0ce0_40_Base_74 { public: - /* 00 */ STRUCT_PAD(0x00, 0x5C); + /* 00 */ unk16 mUnk_00[14]; + /* 1C */ Vec2s mUnk_1C[14]; + /* 54 */ unk32 mUnk_54; + /* 58 */ unk32 mUnk_58; /* 5C */ UnkStruct_027e0ce0_40_Base_74() { this->func_ov031_020e0c34(); } + // overlay 31 void func_ov031_020e0c34(); + + // overlay 102 + void func_ov102_0218323c(UnkStruct_027e0ce0_40_Base_14 *param1, unk32 param2); }; class UnkStruct_027e0ce0_40_Base_78 { public: - /* 00 */ unk32 mUnk_00; + /* 00 */ unk16 mUnk_00; // ActorRef? + /* 02 */ unk16 mUnk_02; /* 04 */ + const u32 GetData() const { + return *(u32 *) this; + } + + const bool HasValue() const { + return this->GetData() != 0; + } + UnkStruct_027e0ce0_40_Base_78(); ~UnkStruct_027e0ce0_40_Base_78(); }; @@ -513,6 +533,9 @@ public: // overlay 0 void func_ov000_020968e0(); + + // overlay 17 + void func_ov017_020be434(); }; class UnkStruct_027e0ce0_40_Base_94_50_Base { @@ -618,6 +641,10 @@ public: /* 107 */ unk8 mUnk_107; /* 108 */ + const BOOL Unk78HasValue() const { + return this->mUnk_078 != NULL && this->mUnk_078->HasValue(); + } + UnkStruct_027e0ce0_40_Base(unk32 param1, void *param2, ItemManager *pItemMgr); ~UnkStruct_027e0ce0_40_Base(); @@ -638,19 +665,34 @@ public: /* 00 */ virtual void vfunc_00() = 0; }; +class UnkStruct_027e0ce0_40_108_10 { +public: + /* 00 */ Vec2s mUnk_00; + /* 04 */ u8 mUnk_04; + /* 05 */ u8 mUnk_05; + /* 06 */ +}; + class UnkStruct_027e0ce0_40_108 : public UnkStruct_027e0ce0_40_108_Base { public: /* 00 (base) */ - /* 10 */ unk32 mUnk_10; - /* 14 */ STRUCT_PAD(0x14, 0x40); - /* 40 */ void *mUnk_40; + /* 10 */ UnkStruct_027e0ce0_40_108_10 mUnk_10; + /* 18 */ STRUCT_PAD(0x16, 0x40); + /* 40 */ UnkStruct_027e0ce0_40_108_10 *mUnk_40; /* 44 */ UnkStruct_027e0ce0_40_108() : mUnk_40(&this->mUnk_10) {} + const bool UnknownInline1() const { + return (uintptr_t) (this->mUnk_40 - &this->mUnk_10) >= 8; + } + // data_ov031_02112b60 /* 00 */ virtual void vfunc_00() override; + + // overlay 102 + void func_ov102_02182e54(unk32 param1, unk32 param2, unk32 param3); }; class UnkStruct_027e0ce0_40_14C { @@ -661,8 +703,13 @@ public: UnkStruct_027e0ce0_40_14C(); ~UnkStruct_027e0ce0_40_14C(); + // overlay 17 + void func_ov093_02168e24(unk32 param1); + // overlay 93 void func_ov093_02168850(); + bool func_ov092_021689e8(unk32 param1, UnkStruct_027e0ce0_40 *param2, PlayerLinkActor *param3, + UnkStruct_027e0ce0_40_328 *param4); }; class UnkStruct_027e0ce0_40_150 { @@ -682,7 +729,14 @@ class UnkStruct_027e0ce0_40_328 { public: /* 000 */ STRUCT_PAD(0x00, 0x98); /* 098 */ PlayerActorBase *mpPlayer; - /* 09C */ STRUCT_PAD(0x9C, 0x154); + /* 09C */ STRUCT_PAD(0x9C, 0xCC); + /* 0CC */ bool mUnk_0CC; + /* 0CD */ STRUCT_PAD(0xCD, 0xD0); + /* 0D0 */ unk32 mUnk_0D0; + /* 0D4 */ unk32 mUnk_0D4; + /* 0D8 */ unk32 mUnk_0D8; + /* 0DC */ unk32 mUnk_0DC; + /* 0E0 */ STRUCT_PAD(0xE0, 0x154); /* 154 */ UnkStruct_027e0ce0_40_328(void *param1, UnkStruct_027e0ce0_40 *param2, UnkStruct_027e0ce0_40_150 *param3, @@ -693,6 +747,11 @@ public: void func_ov093_0216d0d4(); void func_ov093_0216d160(); void func_ov093_0216d1cc(unk32 param1, const UnkStruct_ov001_020c40f4 *param2, bool param3, bool param4); + void func_ov093_0216d5b8(unk32 param1); + void func_ov093_0216f71c(unk32 *param1); + void func_ov093_0216de30(unk32 param1, unk32 param2); + void func_ov093_0216dec8(unk32 param1); + void func_ov093_0216e1a4(unk32 param1); }; // land player stuff @@ -719,11 +778,23 @@ public: // overlay 0 void func_ov000_02088060(bool param1); + // overlay 17 + unk32 func_ov017_020bcde8(unk32 param1, ItemManager *pItemMgr); + + // overlay 93 + void func_ov093_02168220(); + // overlay 101 bool func_ov101_02182fb4(bool param1); void func_ov101_02183004(); void func_ov101_02183024(const UnkStruct_ov001_020c40f4 *param1, const UnkStruct_ov001_020c40f4 *param2, unk32 param3, unk32 param4, ItemManager *pItemMgr, UnkStruct_027e0ce0_30 *param6, bool param7, bool param8); + + // overlay 102 + void func_ov102_0218303c(unk32 param1, ItemManager *pItemMgr); + void func_ov102_02183180(unk32 param1, bool param2); + void func_ov102_021831b4(unk32 param1); + void func_ov102_021831f0(unk32 param1); }; union UnkStruct_027e0478 { @@ -799,6 +870,7 @@ public: static void Destroy(); // overlay 17 + void func_ov017_020bd5dc(unk32 param1); void func_ov017_020bd69c(); }; diff --git a/include/Unknown/UnkStruct_027e0cec.hpp b/include/Unknown/UnkStruct_027e0cec.hpp index fa134bae..c0998112 100644 --- a/include/Unknown/UnkStruct_027e0cec.hpp +++ b/include/Unknown/UnkStruct_027e0cec.hpp @@ -3,6 +3,7 @@ #include "LinkList.hpp" #include "Unknown/UnkFileSystem.hpp" #include "math.hpp" +#include "nitro/fx.h" #include "types.h" class UnkStruct_027e0cec_00_00 : public LinkList { @@ -81,6 +82,7 @@ public: void func_ov000_020a0110(UnkSystem7 *param1); void func_ov000_020a0140(UnkSystem7 *param1, VecFx32 *param2); void func_ov000_020a0220(void *param1, void *param2); + void func_ov000_0209ff4c(unk32 param1, VecFx32 *param2, UnkAngleStruct param3, unk32 param4); // overlay 1 const char *func_ov001_020bef98(); diff --git a/include/Unknown/UnkStruct_027e0cf0.hpp b/include/Unknown/UnkStruct_027e0cf0.hpp new file mode 100644 index 00000000..a66e71e0 --- /dev/null +++ b/include/Unknown/UnkStruct_027e0cf0.hpp @@ -0,0 +1,20 @@ +#pragma once + +#include "global.h" +#include "types.h" + +class UnkStruct_027e0cf0 { +public: + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk16 mUnk_08; + /* 0A */ unk8 mUnk_0A; + /* 0B */ u8 mUnk_0B; + /* 0C */ unk32 mUnk_0C; + /* 10 */ unk32 mUnk_10; + + UnkStruct_027e0cf0(); + ~UnkStruct_027e0cf0(); +}; + +extern UnkStruct_027e0cf0 *data_027e0cf0; diff --git a/include/Unknown/UnkStruct_ov000_020b3000.hpp b/include/Unknown/UnkStruct_ov000_020b3000.hpp new file mode 100644 index 00000000..50fa8e9c --- /dev/null +++ b/include/Unknown/UnkStruct_ov000_020b3000.hpp @@ -0,0 +1,49 @@ +#pragma once + +#include "Actor/Actor.hpp" +#include "Actor/ActorId.hpp" + +class UnkStruct_ov000_020b3000_Base { + /* 00 */ virtual bool vfunc_00(Actor *pActor); +}; + +class UnkStruct_ov000_020b3000 : public UnkStruct_ov000_020b3000_Base { +public: + /* 00 (vtable) */ + /* 04 */ ActorId mActorId; + /* 08 */ + + UnkStruct_ov000_020b3000(ActorId actorId) : + mActorId(actorId) {} + + /* 00 */ virtual bool vfunc_00(Actor *pActor) override; +}; + +class UnkStruct_ov031_02112ad4 : public UnkStruct_ov000_020b3000 { +public: + /* 00 (base) */ + /* 08 */ u32 mUnk_08; + /* 0C */ + + UnkStruct_ov031_02112ad4(ActorId actorId, u32 param2) : + UnkStruct_ov000_020b3000(actorId), + mUnk_08(param2) {} + + /* 00 */ virtual bool vfunc_00(Actor *pActor) override; +}; + +class UnkStruct_ov031_0211361c : public UnkStruct_ov000_020b3000_Base { +public: + /* 00 */ virtual bool vfunc_00(Actor *pActor) override; +}; + +class UnkStruct_ov102_02184a24 : public UnkStruct_ov000_020b3000 { +public: + /* 00 (base) */ + /* 08 */ + + UnkStruct_ov102_02184a24(ActorId actorId) : + UnkStruct_ov000_020b3000(actorId) {} + + /* 00 */ virtual bool vfunc_00(Actor *pActor) override; +}; diff --git a/include/Unknown/UnkStruct_ov000_020b51b8.hpp b/include/Unknown/UnkStruct_ov000_020b51b8.hpp index 7f30e2ad..ff448bdd 100644 --- a/include/Unknown/UnkStruct_ov000_020b51b8.hpp +++ b/include/Unknown/UnkStruct_ov000_020b51b8.hpp @@ -1,5 +1,6 @@ #pragma once +#include "Player/PlayerLink.hpp" #include "System/SysNew.hpp" #include "Unknown/UnkStruct_ov000_020b5214.hpp" #include "types.h" @@ -59,6 +60,10 @@ public: /* 54 */ unk16 mUnk_54; /* 56 */ unk16 mUnk_56; + const BOOL IsUnk08_2() const { + return this->mUnk_08[2] != NULL; + } + UnkStruct_ov000_020b51b8(); ~UnkStruct_ov000_020b51b8(); @@ -70,6 +75,7 @@ public: void func_ov000_0206d0ec(unk32 param1, unk32 param2, unk32 param3, unk32 param4); void func_ov000_0206d134(unk32 param1); void func_ov000_0206d274(unk32 param1); // play seq? + void func_ov000_0206bdd4(PlayerLinkActor *pPlayer); // overlay 1 void func_ov000_0206bbfc(unk32 param1); diff --git a/include/Unknown/UnkStruct_ov000_020b51c0.hpp b/include/Unknown/UnkStruct_ov000_020b51c0.hpp index e45349ba..54cbeb81 100644 --- a/include/Unknown/UnkStruct_ov000_020b51c0.hpp +++ b/include/Unknown/UnkStruct_ov000_020b51c0.hpp @@ -8,3 +8,4 @@ public: }; extern UnkStruct_ov000_020b51c0 data_ov000_020b51c0; +extern UnkStruct_ov000_020b51c0 data_ov000_020b51c8; //! TODO: real? diff --git a/include/Unknown/UnkStruct_ov000_020b5214.hpp b/include/Unknown/UnkStruct_ov000_020b5214.hpp index bd6e396c..db2f9b7c 100644 --- a/include/Unknown/UnkStruct_ov000_020b5214.hpp +++ b/include/Unknown/UnkStruct_ov000_020b5214.hpp @@ -1,5 +1,6 @@ #pragma once +#include "Player/PlayerLink.hpp" #include "global.h" #include "types.h" @@ -45,6 +46,7 @@ public: UnkStruct_ov000_020b5214(); + // overlay 0 void func_ov000_0206d43c(); void func_ov000_0206d6b4(unk32 param1, unk32 param2); void func_ov000_0206d83c(unk32 param1); @@ -53,6 +55,8 @@ public: void func_ov000_0206db44(unk32 param1); // play sfx? void func_ov000_0206dc4c(unk32 param1); void func_ov000_0206e7e8(unk32 param1); + void func_ov000_0206ed1c(PlayerLinkActor *pPlayer); + void func_ov000_0206edd8(PlayerLinkActor *pPlayer); }; extern UnkStruct_ov000_020b5214 data_ov000_020b5214_eur; diff --git a/include/Unknown/UnkStruct_ov000_020b52e8.hpp b/include/Unknown/UnkStruct_ov000_020b52e8.hpp index 60653023..a1c4726b 100644 --- a/include/Unknown/UnkStruct_ov000_020b52e8.hpp +++ b/include/Unknown/UnkStruct_ov000_020b52e8.hpp @@ -18,7 +18,7 @@ public: ~UnkStruct_ov000_020b52e8(); // overlay 0 - ActorUnkMLCK_B4_00 *func_ov000_0206f980(unk32 param1); + ActorUnkMLCK_C4_00 *func_ov000_0206f980(unk32 param1); void func_ov000_0206f994(); }; diff --git a/include/math.hpp b/include/math.hpp index 264cee7f..4fddba35 100644 --- a/include/math.hpp +++ b/include/math.hpp @@ -211,10 +211,11 @@ static inline void Vec2us_Copy(const Vec2us *a, Vec2us *dst) { union Vec2bCpp { struct { /* 0 */ u8 x; - /* 2 */ u8 y; - /* 4 */ + /* 1 */ u8 y; + /* 2 */ }; u8 coords[2]; + u16 data[1]; void operator=(const Vec2bCpp &from) { this->x = from.x; @@ -369,5 +370,8 @@ union Vec2sb { }; struct UnkAngleStruct { - u16 angle; + union { + u16 angle; + s16 angle_signed; + }; }; diff --git a/libs/nitro/include/nitro/math.h b/libs/nitro/include/nitro/math.h index e2f21905..6eceaa88 100644 --- a/libs/nitro/include/nitro/math.h +++ b/libs/nitro/include/nitro/math.h @@ -44,6 +44,7 @@ extern "C" { #endif #define ABS(x) ((x) < 0 ? -(x) : (x)) +#define ABS2(x) ((x) >= 0 ? (x) : -(x)) #define CLAMP(x, min, max) ((x) > (max) ? (max) : (x) < (min) ? (min) : (x)) #define CLAMP2(x, min, max) ((x) > (max) ? (max) : (x) >= (min) ? (x) : (min)) diff --git a/libs/nns/include/nns/g3d/sbc.h b/libs/nns/include/nns/g3d/sbc.h index 6f242424..da4cff3e 100644 --- a/libs/nns/include/nns/g3d/sbc.h +++ b/libs/nns/include/nns/g3d/sbc.h @@ -2,6 +2,10 @@ #include "g3d.h" +#ifdef __cplusplus +extern "C" { +#endif + extern void PushGeometryCommand(u32 command, void *data, s32 length); typedef enum { @@ -109,3 +113,7 @@ static inline void G3d_Scale_inline(fx32 x, fx32 y, fx32 z) { vec.z = z; PushGeometryCommand(0x1B, (u32 *) &vec, 3); } + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/src/000_Second/Actor/Actor_Derived1.cpp b/src/000_Second/Actor/Actor_Derived1.cpp index ed18c8e0..cbe36ab0 100644 --- a/src/000_Second/Actor/Actor_Derived1.cpp +++ b/src/000_Second/Actor/Actor_Derived1.cpp @@ -111,7 +111,7 @@ void Actor_Derived1::func_ov000_020a8e9c(VecFx32 *param1) { } void Actor_Derived1::vfunc_B0() { - if (data_027e09b8->func_01ffd420() == 0) { + if (!data_027e09b8->func_01ffd420()) { ActorUnk_vfunc_B0 auStack_60; auStack_60.mpActor = this; auStack_60.mUnk_0C = this->mUnk_5C.mUnk_20; @@ -144,7 +144,7 @@ void Actor_Derived1::vfunc_94() { } void Actor_Derived1::vfunc_60() { - if (data_027e09b8->func_01ffd420() == 0) { + if (!data_027e09b8->func_01ffd420()) { if (this->vfunc_64()) { this->vfunc_B0(); this->func_ov000_020a9200(); diff --git a/src/000_Second/MapObject/MapObjectMiniBlocks.cpp b/src/000_Second/MapObject/MapObjectMiniBlocks.cpp index aa16e9ec..33b84b5a 100644 --- a/src/000_Second/MapObject/MapObjectMiniBlocks.cpp +++ b/src/000_Second/MapObject/MapObjectMiniBlocks.cpp @@ -30,7 +30,7 @@ MapObjectProfileMiniBlocks::MapObjectProfileMiniBlocks() : } MapObjectMiniBlocks::MapObjectMiniBlocks() { - this->mUnk_48 = 1; + this->mUnk_40.mUnk_08 = 1; } bool MapObjectMiniBlocks::vfunc_00(void) { diff --git a/src/001_SceneInit/Item/Inventory_001.cpp b/src/001_SceneInit/Item/Inventory_001.cpp index fb21f34f..eda15e48 100644 --- a/src/001_SceneInit/Item/Inventory_001.cpp +++ b/src/001_SceneInit/Item/Inventory_001.cpp @@ -4,11 +4,10 @@ #include "System/OverlayManager.hpp" #include "Unknown/UnkStruct_027e09a0.hpp" #include "Unknown/UnkStruct_027e09a4.hpp" +#include "Unknown/UnkStruct_ov000_020b3000.hpp" #include -extern unk32 data_ov000_020b3000; - Inventory::Inventory() { this->mEquippedItem = ItemFlag_None; this->mForcedItem = ItemFlag_None; @@ -125,14 +124,9 @@ void Inventory::func_ov001_020bba54() { } void Inventory::func_ov001_020bba6c() { - struct { - void *ptr; - unk32 actorId; - } uStack_18; - uStack_18.ptr = &data_ov000_020b3000; - uStack_18.actorId = ActorId_TearLight; - + UnkStruct_ov000_020b3000 uStack_18(ActorId_TearLight); Actor **ppActor = gpActorManager->func_01fff350(&uStack_18, gpActorManager->mActorTable); + while (ppActor != gpActorManager->mUnk_08) { UNSET_FLAG((*ppActor)->mFlags, ActorFlag_Alive); (*ppActor)->func_ov000_020984f0(); diff --git a/src/001_SceneInit/UnkStruct_027e09bc_001.cpp b/src/001_SceneInit/UnkStruct_027e09bc_001.cpp index 7e2625c6..48568a67 100644 --- a/src/001_SceneInit/UnkStruct_027e09bc_001.cpp +++ b/src/001_SceneInit/UnkStruct_027e09bc_001.cpp @@ -8,18 +8,18 @@ UnkStruct_027e09bc *UnkStruct_027e09bc::Create() { } UnkStruct_027e09bc::UnkStruct_027e09bc() { - this->mUnk_04 = NULL; - this->mUnk_08 = 0; - this->mUnk_0C = NULL; - this->mUnk_10 = NULL; + this->mUnk_04[0] = NULL; + this->mUnk_04[1] = NULL; + this->mUnk_04[2] = NULL; + this->mUnk_04[3] = NULL; this->mUnk_14[0] = NULL; this->mUnk_14[1] = NULL; this->mUnk_14[2] = NULL; this->mUnk_14[3] = NULL; if (data_027e09a4->IsSceneModeAdventure()) { - this->mUnk_0C = new(HeapIndex_1) UnkStruct_027e09bc_0C(0); - this->mUnk_10 = new(HeapIndex_1) UnkStruct_027e09bc_0C(1); + this->mUnk_04[2] = new(HeapIndex_1) UnkStruct_027e09bc_0C(0); + this->mUnk_04[3] = new(HeapIndex_1) UnkStruct_027e09bc_0C(1); this->func_ov000_020771b8(0x00); this->func_ov000_020771b8(0x01); } else if (data_027e09a4->IsSceneModeBattle()) { @@ -27,20 +27,20 @@ UnkStruct_027e09bc::UnkStruct_027e09bc() { this->mUnk_14[1] = new(HeapIndex_1) UnkStruct_027e09bc_0C(1); this->mUnk_14[2] = new(HeapIndex_1) UnkStruct_027e09bc_0C(2); this->mUnk_14[3] = new(HeapIndex_1) UnkStruct_027e09bc_0C(3); - this->mUnk_04 = this->mUnk_14[data_ov020_020e8544->vfunc_20()]; + this->mUnk_04[0] = this->mUnk_14[data_ov020_020e8544->vfunc_20()]; } } UnkStruct_027e09bc::~UnkStruct_027e09bc() { - delete this->mUnk_0C; - delete this->mUnk_10; + delete this->mUnk_04[2]; + delete this->mUnk_04[3]; delete this->mUnk_14[0]; delete this->mUnk_14[1]; delete this->mUnk_14[2]; delete this->mUnk_14[3]; - this->mUnk_0C = NULL; - this->mUnk_10 = NULL; + this->mUnk_04[2] = NULL; + this->mUnk_04[3] = NULL; this->mUnk_14[0] = NULL; this->mUnk_14[1] = NULL; this->mUnk_14[2] = NULL; @@ -51,17 +51,17 @@ void UnkStruct_027e09bc::func_ov001_020bab5c() { switch ((s32) data_027e09a4->CurrentSceneIndex()) { case SceneIndex_b_sand: case SceneIndex_tekiya09: - data_027e09bc->mUnk_10->mUnk_264 = 0x7B; + data_027e09bc->mUnk_04[3]->mUnk_264 = 0x7B; break; case SceneIndex_b_last2: - data_027e09bc->mUnk_10->mUnk_264 = 0x00; + data_027e09bc->mUnk_04[3]->mUnk_264 = 0x00; break; case SceneIndex_b_last22: - data_027e09bc->mUnk_10->mUnk_264 = 0x00; + data_027e09bc->mUnk_04[3]->mUnk_264 = 0x00; break; default: if (data_027e09a4->IsSceneModeAdventure()) { - data_027e09bc->mUnk_10->func_ov000_02078cec(); + data_027e09bc->mUnk_04[3]->func_ov000_02078cec(); } break; } @@ -69,22 +69,22 @@ void UnkStruct_027e09bc::func_ov001_020bab5c() { void UnkStruct_027e09bc::func_ov001_020babc8() { if (data_027e09a4->IsSceneModeAdventure()) { - this->mUnk_0C->func_ov000_02078ba4(); - this->mUnk_10->func_ov000_02078ba4(); + this->mUnk_04[2]->func_ov000_02078ba4(); + this->mUnk_04[3]->func_ov000_02078ba4(); } } void UnkStruct_027e09bc::func_ov001_020babe8() { if (data_027e09a4->IsSceneModeAdventure()) { - this->mUnk_0C->mUnk_280 = 0; - this->mUnk_10->mUnk_280 = 0; + this->mUnk_04[2]->mUnk_280 = 0; + this->mUnk_04[3]->mUnk_280 = 0; } } void UnkStruct_027e09bc::func_ov001_020bac08() { if (data_027e09a4->IsSceneModeAdventure()) { - this->mUnk_0C->mUnk_280 = 0; - this->mUnk_10->mUnk_280 = 0; + this->mUnk_04[2]->mUnk_280 = 0; + this->mUnk_04[3]->mUnk_280 = 0; } } diff --git a/src/001_SceneInit/UnkStruct_027e0ce0_1C_001.cpp b/src/001_SceneInit/UnkStruct_027e0ce0_1C_001.cpp index e5e9291b..c0c70d7f 100644 --- a/src/001_SceneInit/UnkStruct_027e0ce0_1C_001.cpp +++ b/src/001_SceneInit/UnkStruct_027e0ce0_1C_001.cpp @@ -3,6 +3,7 @@ #include "Unknown/Common.hpp" #include "Unknown/UnkStruct_027e09b8.hpp" #include "Unknown/UnkStruct_027e0ce0.hpp" +#include "Unknown/UnkStruct_ov000_020b3000.hpp" #include "Unknown/UnkStruct_ov024_020d8660.hpp" #include @@ -11,8 +12,6 @@ extern "C" bool func_ov000_0208e874(const u8 *, int, int, int); extern "C" const char *func_ov000_0208e830(int); -extern unk32 data_ov000_020b3000; - UnkStruct_027e0ce0_1C::UnkStruct_027e0ce0_1C() { this->mUnk_D4 = NULL; this->mUnk_D8 = NULL; @@ -353,13 +352,7 @@ void PlayerLinkActor_A0::func_ov001_020bd388(bool param1, bool param2) { if (data_ov000_020aa88c[temp_r0].mUnk_04) { if (temp_r0 == 0x33) { - struct { - void *ptr; - unk32 actorId; - } local_18; - local_18.ptr = &data_ov000_020b3000; - local_18.actorId = ActorId_Beedle; - + UnkStruct_ov000_020b3000 local_18(ActorId_Beedle); Actor **pBeedle = gpActorManager->func_01fff350(&local_18, gpActorManager->mActorTable); if (0) { diff --git a/src/001_SceneInit/UnkStruct_027e0ce0_40_Base_001.cpp b/src/001_SceneInit/UnkStruct_027e0ce0_40_Base_001.cpp index e6679db7..0277e0fd 100644 --- a/src/001_SceneInit/UnkStruct_027e0ce0_40_Base_001.cpp +++ b/src/001_SceneInit/UnkStruct_027e0ce0_40_Base_001.cpp @@ -35,7 +35,7 @@ void UnkStruct_027e0ce0_40_Base::func_ov001_020bc0e0(bool param1) { } if (this->mUnk_078 != NULL) { - this->mUnk_078->mUnk_00 = 0; + *(u32 *) &this->mUnk_078->mUnk_00 = 0; } this->mUnk_094.mUnk_5C = 0; diff --git a/src/019_MainSelect/FileSelectManager_160.cpp b/src/019_MainSelect/FileSelectManager_160.cpp index 6a4e38dd..cfcbe67a 100644 --- a/src/019_MainSelect/FileSelectManager_160.cpp +++ b/src/019_MainSelect/FileSelectManager_160.cpp @@ -16,7 +16,7 @@ FileSelectManager_160::FileSelectManager_160(GameModeManagerBase_104 *param1, Fi FileSelectManager_160::~FileSelectManager_160() {} -void FileSelectManager_160::vfunc_08(unk32 param1) { +void FileSelectManager_160::vfunc2_08(unk32 param1) { if (param1 == 0) { this->mUnk_0C = 0; this->mUnk_10->func_ov019_020cb6e8(); @@ -24,7 +24,7 @@ void FileSelectManager_160::vfunc_08(unk32 param1) { } } -void FileSelectManager_160::vfunc_0C(unk32 param1) { +void FileSelectManager_160::vfunc2_0C(unk32 param1) { if (param1 == 0) { switch (this->mUnk_0C) { case 0: @@ -42,9 +42,9 @@ void FileSelectManager_160::vfunc_0C(unk32 param1) { } } -void FileSelectManager_160::vfunc_14(unk32 param1) {} +void FileSelectManager_160::vfunc2_14(unk32 param1) {} -void FileSelectManager_160::vfunc_10(unk32 param1, unk32 param2) { +void FileSelectManager_160::vfunc_54(unk32 param1, unk32 param2) { data_0204999c.func_02013014(); data_0204999c.mUnk_60 = 0xD6D8; data_0204a088->func_ov000_02061248(); @@ -56,13 +56,13 @@ void FileSelectManager_160::vfunc_10(unk32 param1, unk32 param2) { data_0204999c.func_02013070(); } -void FileSelectManager_160::vfunc_18(unk32 param1) { +void FileSelectManager_160::vfunc2_18(unk32 param1) { if (param1 == 0) { this->mUnk_0C = 1; } } -void FileSelectManager_160::vfunc_1C(unk32 param1) { +void FileSelectManager_160::vfunc_5C(unk32 param1) { if (param1 == 0) { switch (this->mUnk_0C) { case 0: @@ -80,7 +80,7 @@ void FileSelectManager_160::vfunc_1C(unk32 param1) { } } -void FileSelectManager_160::vfunc_20(unk32 param1, unk32 param2) { +void FileSelectManager_160::vfunc_58(unk32 param1, unk32 param2) { data_0204999c.func_02013014(); data_0204999c.mUnk_60 = 0xD6D8; this->mUnk_14 = NULL; @@ -99,6 +99,6 @@ void FileSelectManager_160::vfunc_20(unk32 param1, unk32 param2) { data_0204999c.func_02013070(); } -void FileSelectManager_160::vfunc_24() { +void FileSelectManager_160::vfunc_60() { data_0204a110.func_0201967c(0, 0, 1, 0, 3); } diff --git a/src/019_MainSelect/FileSelectManager_164.cpp b/src/019_MainSelect/FileSelectManager_164.cpp index e705e1d0..50067c90 100644 --- a/src/019_MainSelect/FileSelectManager_164.cpp +++ b/src/019_MainSelect/FileSelectManager_164.cpp @@ -17,7 +17,7 @@ FileSelectManager_164::~FileSelectManager_164() { } } -void FileSelectManager_164::vfunc_08(unk32 param1) { +void FileSelectManager_164::vfunc2_08(unk32 param1) { if (param1 == 0) { this->mUnk_0C = 0; this->mUnk_10->func_ov019_020cb6e8(); @@ -25,7 +25,7 @@ void FileSelectManager_164::vfunc_08(unk32 param1) { } } -void FileSelectManager_164::vfunc_0C(unk32 param1) { +void FileSelectManager_164::vfunc2_0C(unk32 param1) { if (param1 == 0) { switch (this->mUnk_0C) { case 0: @@ -43,9 +43,9 @@ void FileSelectManager_164::vfunc_0C(unk32 param1) { } } -void FileSelectManager_164::vfunc_14(unk32 param1) {} +void FileSelectManager_164::vfunc2_14(unk32 param1) {} -void FileSelectManager_164::vfunc_10(unk32 param1, unk32 param2) { +void FileSelectManager_164::vfunc_54(unk32 param1, unk32 param2) { data_0204999c.func_02013014(); data_0204999c.mUnk_60 = 0xD6D8; data_ov000_020b50c0.func_ov000_0206a758(); @@ -61,7 +61,7 @@ void FileSelectManager_164::vfunc_10(unk32 param1, unk32 param2) { data_0204999c.func_02013070(); } -void FileSelectManager_164::vfunc_18(unk32 param1) { +void FileSelectManager_164::vfunc2_18(unk32 param1) { if (param1 == 0) { this->mUnk_0C = 1; gpFSOptionsManager->func_ov019_020cc85c(2); @@ -69,7 +69,7 @@ void FileSelectManager_164::vfunc_18(unk32 param1) { } } -void FileSelectManager_164::vfunc_1C(unk32 param1) { +void FileSelectManager_164::vfunc_5C(unk32 param1) { if (param1 == 0) { switch (this->mUnk_0C) { case 1: @@ -89,7 +89,7 @@ void FileSelectManager_164::vfunc_1C(unk32 param1) { } } -void FileSelectManager_164::vfunc_20(unk32 param1, unk32 param2) { +void FileSelectManager_164::vfunc_58(unk32 param1, unk32 param2) { data_0204999c.func_02013014(); data_0204999c.mUnk_60 = 0xD6D8; FileSelectManager_164::func_ov019_020d02f4(); diff --git a/src/024_MainGame/Actor/ActorUnkOBPC.cpp b/src/024_MainGame/Actor/ActorUnkOBPC.cpp index de07190f..e236e4cf 100644 --- a/src/024_MainGame/Actor/ActorUnkOBPC.cpp +++ b/src/024_MainGame/Actor/ActorUnkOBPC.cpp @@ -4,10 +4,9 @@ #include "Unknown/UnkStruct_027e09a4.hpp" #include "Unknown/UnkStruct_027e0cd8.hpp" #include "Unknown/UnkStruct_027e0ce0.hpp" +#include "Unknown/UnkStruct_ov000_020b3000.hpp" #include "Unknown/UnkStruct_ov000_020b504c.hpp" -extern unk32 data_ov000_020b3000; - DECL_PROFILE(ActorProfileUnkOBPC); Actor *ActorProfileUnkOBPC::Create() { @@ -131,15 +130,8 @@ bool ActorUnkOBPC::func_ov024_020d7154(void) { } break; case 2: { - struct { - void *ptr; - unk32 actorId; - } sp8; - - sp8.ptr = &data_ov000_020b3000; - sp8.actorId = ActorId_KEYB; - pActorMgr = gpActorManager; - + pActorMgr = gpActorManager; + UnkStruct_ov000_020b3000 sp8(ActorId_KEYB); Actor **ppActor = pActorMgr->func_01fff350(&sp8, pActorMgr->mActorTable); if (ppActor == pActorMgr->mUnk_08) { @@ -150,15 +142,8 @@ bool ActorUnkOBPC::func_ov024_020d7154(void) { break; } default: { - struct { - void *ptr; - unk32 actorId; - } sp0; - - sp0.ptr = &data_ov000_020b3000; - sp0.actorId = ActorId_KEYT; - pActorMgr = gpActorManager; - + pActorMgr = gpActorManager; + UnkStruct_ov000_020b3000 sp0(ActorId_KEYT); Actor **ppActor = pActorMgr->func_01fff350(&sp0, pActorMgr->mActorTable); if (ppActor == pActorMgr->mUnk_08) { diff --git a/src/024_MainGame/Actor/UnkStruct_ov024_020d8660_024.cpp b/src/024_MainGame/Actor/UnkStruct_ov024_020d8660_024.cpp index 3a1380d2..0a6c28c8 100644 --- a/src/024_MainGame/Actor/UnkStruct_ov024_020d8660_024.cpp +++ b/src/024_MainGame/Actor/UnkStruct_ov024_020d8660_024.cpp @@ -4,14 +4,13 @@ #include "Unknown/UnkStruct_0204a110.hpp" #include "Unknown/UnkStruct_027e09a4.hpp" #include "Unknown/UnkStruct_027e09b8.hpp" +#include "Unknown/UnkStruct_ov000_020b3000.hpp" #include "Unknown/UnkStruct_ov000_020b51b8.hpp" #include "Unknown/UnkStruct_ov024_020d8660.hpp" #include "versions.h" #include -extern unk32 data_ov000_020b3000; - UnkStruct_ov024_020d8660 *data_ov024_020d8660 = NULL; void UnkStruct_ov024_020d8660::func_ov024_020c4a8c(UnkActorSystem1 *param1) { @@ -36,7 +35,7 @@ UnkStruct_ov024_020d8660::UnkStruct_ov024_020d8660() { void UnkStruct_ov024_020d8660::func_ov024_020c4b4c(unk32 param1) { if (this->mUnk_00 != NULL) { - if (data_027e09b8->func_01ffd420() == 0) { + if (!data_027e09b8->func_01ffd420()) { this->mUnk_00->vfunc_10(param1); } else { this->mUnk_00->vfunc_14(param1); @@ -55,13 +54,7 @@ void UnkStruct_ov024_020d8660::func_ov024_020c4ba0() { } if (this->mActorId != 0) { - struct { - void *ptr; - unk32 actorId; - } uStack_68; - uStack_68.actorId = this->mActorId; - uStack_68.ptr = &data_ov000_020b3000; - + UnkStruct_ov000_020b3000 uStack_68(this->mActorId); Actor **ppActor = gpActorManager->func_01fff350(&uStack_68, gpActorManager->mActorTable); Actor *pActor = NULL; diff --git a/src/024_MainGame/Game/AdventureModeManager_024.cpp b/src/024_MainGame/Game/AdventureModeManager_024.cpp index e2af0bd3..a70668c7 100644 --- a/src/024_MainGame/Game/AdventureModeManager_024.cpp +++ b/src/024_MainGame/Game/AdventureModeManager_024.cpp @@ -276,7 +276,7 @@ void AdventureModeManager::vfunc_24() { data_027e0998->func_ov000_02061764(); if (data_ov000_020b4f70 != NULL && data_027e09b8 != NULL) { - if (data_027e09b8->func_01ffd420() == 0) { + if (!data_027e09b8->func_01ffd420()) { data_ov000_020b4f70->func_ov000_02066370(); } } @@ -364,12 +364,13 @@ void AdventureModeManager::vfunc_24() { if (CHECK_BUTTON_COMBO(this->mButtons.press, PAD_BUTTON_SELECT)) { if (this->func_ov024_020c60f4()) { switch (data_0204a088->mUnk_00) { - case 1: + case 1: { stack_ov000_02073578 stack; stack.unk_08 = 0x05; data_027e09b8->func_ov000_02073578(&stack, 1); data_ov000_020b5214.func_ov000_0206db44(0x37); break; + } case 6: data_0204a088->func_ov000_020611fc(5); data_ov000_020b5214.func_ov000_0206db44(0x37); @@ -457,7 +458,7 @@ bool AdventureModeManager::func_ov024_020c5dac() { } bool AdventureModeManager::func_ov024_020c5ecc() { - if (data_ov026_02138d10->func_ov026_020e13f4() != 0 && data_027e09b8->func_01ffd420() == 0 && + if (data_ov026_02138d10->func_ov026_020e13f4() != 0 && !data_027e09b8->func_01ffd420() && func_ov024_020d5304(data_027e09a4->mUnk_00.sceneIndex) && (data_ov024_020d8660 == NULL || data_ov024_020d8660->mUnk_00 == NULL) && this->func_ov024_020c6a20() != 0 && data_ov026_0213f590.func_ov026_020f7cc0() == 0) { diff --git a/src/024_MainGame/Game/AdventureModeManager_160_024.cpp b/src/024_MainGame/Game/AdventureModeManager_160_024.cpp index 3cad8c4e..dce6d05f 100644 --- a/src/024_MainGame/Game/AdventureModeManager_160_024.cpp +++ b/src/024_MainGame/Game/AdventureModeManager_160_024.cpp @@ -35,7 +35,7 @@ AdventureModeManager_160::AdventureModeManager_160(GameModeManagerBase_104 *para AdventureModeManager_160::~AdventureModeManager_160() {} -void AdventureModeManager_160::vfunc_08(unk32 param1) { +void AdventureModeManager_160::vfunc2_08(unk32 param1) { switch (param1) { case 1: case 6: @@ -60,7 +60,7 @@ void AdventureModeManager_160::vfunc_08(unk32 param1) { } } -void AdventureModeManager_160::vfunc_0C(unk32 param1) { +void AdventureModeManager_160::vfunc2_0C(unk32 param1) { switch (param1) { case 1: case 5: @@ -128,13 +128,13 @@ void AdventureModeManager_160::vfunc_0C(unk32 param1) { } } -void AdventureModeManager_160::vfunc_10(unk32 param1, unk32 param2) { +void AdventureModeManager_160::vfunc_54(unk32 param1, unk32 param2) { if ((param1 == 5 || param1 == 8) && param2 == 2) { this->func_ov024_020c7d4c(param1); } } -void AdventureModeManager_160::vfunc_14(unk32 param1) { +void AdventureModeManager_160::vfunc2_14(unk32 param1) { if (param1 == 10) { this->mUnk_14->mUnk_1C = 1; this->mUnk_70.mUnk_25 = true; @@ -170,7 +170,7 @@ void AdventureModeManager_160::func_ov024_020c7d4c(unk32 param1) { G2S_SetBG2Priority(1); } -void AdventureModeManager_160::vfunc_18(unk32 param1) { +void AdventureModeManager_160::vfunc2_18(unk32 param1) { this->mUnk_14 = NULL; switch (param1) { @@ -206,7 +206,7 @@ void AdventureModeManager_160::vfunc_18(unk32 param1) { data_ov000_020b504c.func_ov000_02067e60(0, 1); } -void AdventureModeManager_160::vfunc_1C(unk32 param1) { +void AdventureModeManager_160::vfunc_5C(unk32 param1) { switch (param1) { case 1: case 7: @@ -324,7 +324,7 @@ void AdventureModeManager_160::vfunc_1C(unk32 param1) { } } -void AdventureModeManager_160::vfunc_20(unk32 param1, unk32 param2) { +void AdventureModeManager_160::vfunc_58(unk32 param1, unk32 param2) { if (param1 != 1) { return; } @@ -361,7 +361,7 @@ void AdventureModeManager_160::vfunc_20(unk32 param1, unk32 param2) { } } -void AdventureModeManager_160::vfunc_24() {} +void AdventureModeManager_160::vfunc_60() {} void AdventureModeManager_160::func_ov024_020c83bc() { data_0204a110.mUnk_DC0.func_0201dd58(6, 3); diff --git a/src/024_MainGame/Game/AdventureModeManager_170_024.cpp b/src/024_MainGame/Game/AdventureModeManager_170_024.cpp index c8587964..3ed65db2 100644 --- a/src/024_MainGame/Game/AdventureModeManager_170_024.cpp +++ b/src/024_MainGame/Game/AdventureModeManager_170_024.cpp @@ -24,14 +24,14 @@ AdventureModeManager_170::AdventureModeManager_170(GameModeManagerBase_104 *para AdventureModeManager_170::~AdventureModeManager_170() {} -void AdventureModeManager_170::vfunc_08(unk32 param1) { +void AdventureModeManager_170::vfunc2_08(unk32 param1) { if (param1 == 1) { this->mUnk_14.func_0201bb84(0x3C, 2, 0x3C); data_0204e5f8.func_0201b9a8(&this->mUnk_14); } } -void AdventureModeManager_170::vfunc_0C(unk32 param1) { +void AdventureModeManager_170::vfunc2_0C(unk32 param1) { if (param1 != 1) { return; } @@ -50,7 +50,7 @@ void AdventureModeManager_170::vfunc_0C(unk32 param1) { } } -void AdventureModeManager_170::vfunc_10(unk32 param1, unk32 param2) { +void AdventureModeManager_170::vfunc_54(unk32 param1, unk32 param2) { if (data_0204a110.mUnk_008 == 1) { data_0204a110.mUnk_DFE = true; } @@ -72,11 +72,11 @@ void AdventureModeManager_170::vfunc_10(unk32 param1, unk32 param2) { data_ov000_020b5214.func_ov000_0206d83c(0x0A); } -void AdventureModeManager_170::vfunc_18(unk32 param1) { +void AdventureModeManager_170::vfunc2_18(unk32 param1) { this->mUnk_0C = 0; } -void AdventureModeManager_170::vfunc_24() { +void AdventureModeManager_170::vfunc_60() { data_0204e5f8.mUnk_38 = true; data_0204a088->mUnk_120 = -1; } diff --git a/src/024_MainGame/Game/AdventureModeManager_174_024.cpp b/src/024_MainGame/Game/AdventureModeManager_174_024.cpp index 73c7c715..4c0a1d7b 100644 --- a/src/024_MainGame/Game/AdventureModeManager_174_024.cpp +++ b/src/024_MainGame/Game/AdventureModeManager_174_024.cpp @@ -15,7 +15,7 @@ AdventureModeManager_174::AdventureModeManager_174(GameModeManagerBase_104 *para data_0204a088->func_ov000_020611dc(this, 5); } -void AdventureModeManager_174::vfunc_08(unk32 param1) { +void AdventureModeManager_174::vfunc2_08(unk32 param1) { switch (param1) { case 1: case 6: @@ -40,7 +40,7 @@ void AdventureModeManager_174::vfunc_08(unk32 param1) { } } -void AdventureModeManager_174::vfunc_0C(unk32 param1) { +void AdventureModeManager_174::vfunc2_0C(unk32 param1) { switch (param1) { case 1: case 6: @@ -65,7 +65,7 @@ void AdventureModeManager_174::vfunc_0C(unk32 param1) { } } -void AdventureModeManager_174::vfunc_10(unk32 param1, unk32 param2) { +void AdventureModeManager_174::vfunc_54(unk32 param1, unk32 param2) { if (param2 != 1) { return; } @@ -104,7 +104,7 @@ void AdventureModeManager_174::vfunc_10(unk32 param1, unk32 param2) { } } -void AdventureModeManager_174::vfunc_18(unk32 param1) { +void AdventureModeManager_174::vfunc2_18(unk32 param1) { switch (param1) { case 1: this->mUnk_10.func_0201bb84(0x14, 2, 0x14); @@ -124,7 +124,7 @@ void AdventureModeManager_174::vfunc_18(unk32 param1) { } } -void AdventureModeManager_174::vfunc_1C(unk32 param1) { +void AdventureModeManager_174::vfunc_5C(unk32 param1) { switch (param1) { case 1: case 2: @@ -140,7 +140,7 @@ void AdventureModeManager_174::vfunc_1C(unk32 param1) { } } -void AdventureModeManager_174::vfunc_20(unk32 param1, unk32 param2) { +void AdventureModeManager_174::vfunc_58(unk32 param1, unk32 param2) { if (param2 != 1) { return; } @@ -174,7 +174,7 @@ void AdventureModeManager_174::vfunc_20(unk32 param1, unk32 param2) { } } -void AdventureModeManager_174::vfunc_24() {} +void AdventureModeManager_174::vfunc_60() {} THUMB_END diff --git a/src/024_MainGame/Game/AdventureModeManager_178_024.cpp b/src/024_MainGame/Game/AdventureModeManager_178_024.cpp index 904e60ff..431f3d90 100644 --- a/src/024_MainGame/Game/AdventureModeManager_178_024.cpp +++ b/src/024_MainGame/Game/AdventureModeManager_178_024.cpp @@ -12,14 +12,14 @@ AdventureModeManager_178::AdventureModeManager_178(GameModeManagerBase_104 *para data_0204a088->func_ov000_020611dc(this, 0x0D); } -void AdventureModeManager_178::vfunc_10(unk32 param1, unk32 param2) { +void AdventureModeManager_178::vfunc_54(unk32 param1, unk32 param2) { if (param2 == 1) { data_0204a088->func_ov000_02061248(); this->mUnk_B8 = func_ov004_020b697c(&this->mUnk_0C, 0); } } -void AdventureModeManager_178::vfunc_20(unk32 param1, unk32 param2) { +void AdventureModeManager_178::vfunc_58(unk32 param1, unk32 param2) { if (param2 == 1) { this->mUnk_B8 = 0; data_0204a088->func_ov000_02061248(); diff --git a/src/024_MainGame/Game/AdventureModeManager_178_Base_024.cpp b/src/024_MainGame/Game/AdventureModeManager_178_Base_024.cpp index 0747dc12..6797af78 100644 --- a/src/024_MainGame/Game/AdventureModeManager_178_Base_024.cpp +++ b/src/024_MainGame/Game/AdventureModeManager_178_Base_024.cpp @@ -7,27 +7,27 @@ THUMB_BEGIN AdventureModeManager_178_Base::AdventureModeManager_178_Base(GameModeManagerBase_104 *param1) : AdventureModeManager_174_Base(param1) {} -void AdventureModeManager_178_Base::vfunc_08(unk32 param1) { +void AdventureModeManager_178_Base::vfunc2_08(unk32 param1) { if (param1 == 1 || param1 == 5) { this->mUnk_10.func_0201bb84(0x14, 2, 0x14); data_0204e5f8.func_0201b9a8(&this->mUnk_10); } } -void AdventureModeManager_178_Base::vfunc_0C(unk32 param1) { +void AdventureModeManager_178_Base::vfunc2_0C(unk32 param1) { if (this->mUnk_10.mUnk_0D == this->mUnk_10.mUnk_10) { data_0204a088->func_ov000_02061230(); } } -void AdventureModeManager_178_Base::vfunc_18(unk32 param1) { +void AdventureModeManager_178_Base::vfunc2_18(unk32 param1) { if (param1 == 1 || param1 == 5) { this->mUnk_10.func_0201bb84(0x14, 2, 0x14); data_0204e5f8.func_0201b9a8(&this->mUnk_10); } } -void AdventureModeManager_178_Base::vfunc_1C(unk32 param1) { +void AdventureModeManager_178_Base::vfunc_5C(unk32 param1) { if (this->mUnk_10.mUnk_0D == this->mUnk_10.mUnk_10) { data_0204a088->func_ov000_02061230(); } diff --git a/src/024_MainGame/Game/AdventureModeManager_180_024.cpp b/src/024_MainGame/Game/AdventureModeManager_180_024.cpp index d79f2654..a186ee4a 100644 --- a/src/024_MainGame/Game/AdventureModeManager_180_024.cpp +++ b/src/024_MainGame/Game/AdventureModeManager_180_024.cpp @@ -27,7 +27,7 @@ AdventureModeManager_180::AdventureModeManager_180(GameModeManagerBase_104 *para AdventureModeManager_180::~AdventureModeManager_180() {} -void AdventureModeManager_180::vfunc_08(unk32 param1) { +void AdventureModeManager_180::vfunc2_08(unk32 param1) { this->mUnk_0C = 1; switch (param1) { @@ -48,7 +48,7 @@ void AdventureModeManager_180::vfunc_08(unk32 param1) { } } -void AdventureModeManager_180::vfunc_0C(unk32 param1) { +void AdventureModeManager_180::vfunc2_0C(unk32 param1) { switch (param1) { case 5: if (this->mUnk_18.mUnk_0D == this->mUnk_18.mUnk_10) { @@ -85,7 +85,7 @@ void AdventureModeManager_180::vfunc_0C(unk32 param1) { } #pragma opt_dead_assignments off -void AdventureModeManager_180::vfunc_10(unk32 param1, unk32 param2) { +void AdventureModeManager_180::vfunc_54(unk32 param1, unk32 param2) { if (param2 != 1) { return; } @@ -121,7 +121,7 @@ void AdventureModeManager_180::func_ov024_020c9430(unk32 param1, unk32 param2) { this->mUnk_10 = func_ov014_020b6520(&this->mUnk_14, param1, param2); } -void AdventureModeManager_180::vfunc_18(unk32 param1) { +void AdventureModeManager_180::vfunc2_18(unk32 param1) { switch (param1) { case 5: this->mUnk_18.func_0201bb84(0x10, 2, 0x10); @@ -135,7 +135,7 @@ void AdventureModeManager_180::vfunc_18(unk32 param1) { } } -void AdventureModeManager_180::vfunc_1C(unk32 param1) { +void AdventureModeManager_180::vfunc_5C(unk32 param1) { switch (param1) { case 5: if (this->mUnk_18.mUnk_0D == this->mUnk_18.mUnk_10) { @@ -165,7 +165,7 @@ void AdventureModeManager_180::vfunc_1C(unk32 param1) { } } -void AdventureModeManager_180::vfunc_20(unk32 param1, unk32 param2) { +void AdventureModeManager_180::vfunc_58(unk32 param1, unk32 param2) { if (param2 != 1) { return; } @@ -200,7 +200,7 @@ void AdventureModeManager_180::vfunc_20(unk32 param1, unk32 param2) { } } -void AdventureModeManager_180::vfunc_24() {} +void AdventureModeManager_180::vfunc_60() {} void AdventureModeManager_180::func_ov024_020c957c() { data_0204a110.mUnk_DA8.func_0201ced8(); diff --git a/src/024_MainGame/Game/AdventureModeManager_184_024.cpp b/src/024_MainGame/Game/AdventureModeManager_184_024.cpp index 9c773faa..9522d6d0 100644 --- a/src/024_MainGame/Game/AdventureModeManager_184_024.cpp +++ b/src/024_MainGame/Game/AdventureModeManager_184_024.cpp @@ -25,13 +25,13 @@ AdventureModeManager_184::AdventureModeManager_184(GameModeManagerBase_104 *para AdventureModeManager_184::~AdventureModeManager_184() {} -void AdventureModeManager_184::vfunc_08(unk32 param1) { +void AdventureModeManager_184::vfunc2_08(unk32 param1) { if (!data_027e09a4->IsTrain()) { this->func_ov024_020c979c(param1); } } -void AdventureModeManager_184::vfunc_0C(unk32 param1) { +void AdventureModeManager_184::vfunc2_0C(unk32 param1) { if (this->mUnk_10 == NULL && this->mUnk_18 && data_0204a110.func_02019548()) { this->mUnk_18 = false; @@ -64,11 +64,11 @@ void AdventureModeManager_184::vfunc_0C(unk32 param1) { } } -void AdventureModeManager_184::vfunc_10(unk32 param1, unk32 param2) { +void AdventureModeManager_184::vfunc_54(unk32 param1, unk32 param2) { this->func_ov024_020c979c(param1); } -void AdventureModeManager_184::vfunc_14(unk32 param1) {} +void AdventureModeManager_184::vfunc2_14(unk32 param1) {} void AdventureModeManager_184::func_ov024_020c979c(unk32 param1) { this->mUnk_18 = true; @@ -94,7 +94,7 @@ void AdventureModeManager_184::func_ov024_020c979c(unk32 param1) { } } -void AdventureModeManager_184::vfunc_18(unk32 param1) { +void AdventureModeManager_184::vfunc2_18(unk32 param1) { switch (param1) { case 1: this->mUnk_10->func_ov010_020b7054(); @@ -119,7 +119,7 @@ void AdventureModeManager_184::vfunc_18(unk32 param1) { } } -void AdventureModeManager_184::vfunc_1C(unk32 param1) { +void AdventureModeManager_184::vfunc_5C(unk32 param1) { switch (param1) { case 1: if (this->mUnk_10 != NULL && this->mUnk_10->vfunc_20()) { @@ -139,7 +139,7 @@ void AdventureModeManager_184::vfunc_1C(unk32 param1) { } } -void AdventureModeManager_184::vfunc_20(unk32 param1, unk32 param2) { +void AdventureModeManager_184::vfunc_58(unk32 param1, unk32 param2) { switch (param1) { case 1: this->mUnk_10 = NULL; @@ -158,7 +158,7 @@ void AdventureModeManager_184::vfunc_20(unk32 param1, unk32 param2) { } } -void AdventureModeManager_184::vfunc_24() { +void AdventureModeManager_184::vfunc_60() { this->mUnk_10 = NULL; this->mUnk_14 = NULL; } diff --git a/src/024_MainGame/Game/AdventureModeManager_18C_024.cpp b/src/024_MainGame/Game/AdventureModeManager_18C_024.cpp index 2e6b751b..12568929 100644 --- a/src/024_MainGame/Game/AdventureModeManager_18C_024.cpp +++ b/src/024_MainGame/Game/AdventureModeManager_18C_024.cpp @@ -44,7 +44,7 @@ AdventureModeManager_18C::AdventureModeManager_18C(GameModeManagerBase_104 *para AdventureModeManager_18C::~AdventureModeManager_18C() {} -void AdventureModeManager_18C::vfunc_08(unk32 param1) { +void AdventureModeManager_18C::vfunc2_08(unk32 param1) { switch (param1) { case 1: this->func_ov024_020ca034(); @@ -62,7 +62,7 @@ void AdventureModeManager_18C::vfunc_08(unk32 param1) { } } -void AdventureModeManager_18C::vfunc_0C(unk32 param1) { +void AdventureModeManager_18C::vfunc2_0C(unk32 param1) { switch (param1) { case 6: switch (this->mUnk_54) { @@ -112,7 +112,7 @@ void AdventureModeManager_18C::vfunc_0C(unk32 param1) { } } -void AdventureModeManager_18C::vfunc_10(unk32 param1, unk32 param2) { +void AdventureModeManager_18C::vfunc_54(unk32 param1, unk32 param2) { if (param2 != 1) { return; } @@ -205,12 +205,12 @@ void AdventureModeManager_18C::func_ov024_020c9c6c() { G2S_SetBG3Priority(2); } -void AdventureModeManager_18C::vfunc_14(unk32 param1) { +void AdventureModeManager_18C::vfunc2_14(unk32 param1) { this->mUnk_10->func_ov011_020b88ac(); this->mUnk_54 = 3; } -void AdventureModeManager_18C::vfunc_18(unk32 param1) { +void AdventureModeManager_18C::vfunc2_18(unk32 param1) { switch (param1) { case 1: data_ov000_020b5214.func_ov000_0206db44(0x44); @@ -243,7 +243,7 @@ void AdventureModeManager_18C::vfunc_18(unk32 param1) { } } -void AdventureModeManager_18C::vfunc_1C(unk32 param1) { +void AdventureModeManager_18C::vfunc_5C(unk32 param1) { switch (param1) { case 1: switch (this->mUnk_54) { @@ -282,7 +282,7 @@ void AdventureModeManager_18C::vfunc_1C(unk32 param1) { } } -void AdventureModeManager_18C::vfunc_20(unk32 param1, unk32 param2) { +void AdventureModeManager_18C::vfunc_58(unk32 param1, unk32 param2) { if (param2 != 1) { return; } @@ -346,7 +346,7 @@ void AdventureModeManager_18C::vfunc_20(unk32 param1, unk32 param2) { case 4: case 5: case 6: - case 7: + case 7: { this->mUnk_44 = data_0204a110.mUnk_DC0.mUnk_08->func_0201ec30(); Vec2s auStack_14; @@ -362,6 +362,7 @@ void AdventureModeManager_18C::vfunc_20(unk32 param1, unk32 param2) { GetAdventureModeManager()->func_ov024_020c53e8(); GetAdventureModeManager()->func_ov024_020c6770(temp_r6, temp_r7, 0, 4); break; + } default: GetAdventureModeManager()->func_ov024_020c555c(3); GetAdventureModeManager()->func_ov024_020c53e8(); @@ -381,7 +382,7 @@ void AdventureModeManager_18C::vfunc_20(unk32 param1, unk32 param2) { func_02019b3c(); } -void AdventureModeManager_18C::vfunc_24() { +void AdventureModeManager_18C::vfunc_60() { this->mUnk_10 = NULL; this->mUnk_3A = false; } diff --git a/src/024_MainGame/Game/AdventureModeManager_190_024.cpp b/src/024_MainGame/Game/AdventureModeManager_190_024.cpp index ad8b2cf0..5d05ccf4 100644 --- a/src/024_MainGame/Game/AdventureModeManager_190_024.cpp +++ b/src/024_MainGame/Game/AdventureModeManager_190_024.cpp @@ -25,19 +25,19 @@ AdventureModeManager_190::AdventureModeManager_190(GameModeManagerBase_104 *para data_0204a088->func_ov000_020611dc(this, 0x15); } -void AdventureModeManager_190::vfunc_08(unk32 param1) { +void AdventureModeManager_190::vfunc2_08(unk32 param1) { if (param1 == 1) { this->func_ov024_020ca21c(); } } -void AdventureModeManager_190::vfunc_0C(unk32 param1) { +void AdventureModeManager_190::vfunc2_0C(unk32 param1) { if (param1 == 1 && this->mUnk_14.mUnk_0D == this->mUnk_14.mUnk_10) { data_0204a088->func_ov000_02061230(); } } -void AdventureModeManager_190::vfunc_10(unk32 param1, unk32 param2) { +void AdventureModeManager_190::vfunc_54(unk32 param1, unk32 param2) { if (param1 == 1) { data_0204a088->func_ov000_02061248(); this->mUnk_10 = func_ov011_020b8e54(&this->mUnk_0C, this->mUnk_60); @@ -45,19 +45,19 @@ void AdventureModeManager_190::vfunc_10(unk32 param1, unk32 param2) { } } -void AdventureModeManager_190::vfunc_18(unk32 param1) { +void AdventureModeManager_190::vfunc2_18(unk32 param1) { if (param1 == 1) { this->func_ov024_020ca21c(); } } -void AdventureModeManager_190::vfunc_1C(unk32 param1) { +void AdventureModeManager_190::vfunc_5C(unk32 param1) { if (param1 == 1 && this->mUnk_14.mUnk_0D == this->mUnk_14.mUnk_10) { data_0204a088->func_ov000_02061230(); } } -void AdventureModeManager_190::vfunc_20(unk32 param1, unk32 param2) { +void AdventureModeManager_190::vfunc_58(unk32 param1, unk32 param2) { if (param1 == 1) { this->mUnk_10 = NULL; data_0204a088->func_ov000_02061248(); diff --git a/src/024_MainGame/Train/UnkTrainSystem1_024.cpp b/src/024_MainGame/Train/UnkTrainSystem1_024.cpp index ab153cee..e40ecb67 100644 --- a/src/024_MainGame/Train/UnkTrainSystem1_024.cpp +++ b/src/024_MainGame/Train/UnkTrainSystem1_024.cpp @@ -120,9 +120,9 @@ void UnkTrainSystem1::func_ov024_020d562c(const VecFx32 *param1, fx32 param2) { sp44.z = new_var5; #if IS_JP - UnkStruct_027e09bc_0C *temp_r8_2 = data_027e09bc->mUnk_04; + UnkStruct_027e09bc_0C *temp_r8_2 = data_027e09bc->mUnk_04[0]; #else - UnkStruct_027e09bc_0C *temp_r8_2 = data_027e09bc->mUnk_0C; + UnkStruct_027e09bc_0C *temp_r8_2 = data_027e09bc->mUnk_04[2]; #endif temp_r1_3.x = temp_r8_2->mUnk_034.x; diff --git a/src/024_MainGame/Train/UnkTrainSystem2_024.cpp b/src/024_MainGame/Train/UnkTrainSystem2_024.cpp index de2e779c..fef5d556 100644 --- a/src/024_MainGame/Train/UnkTrainSystem2_024.cpp +++ b/src/024_MainGame/Train/UnkTrainSystem2_024.cpp @@ -57,7 +57,7 @@ void UnkTrainSystem2::func_ov024_020d5990() { } } - if (data_027e09b8->func_01ffd420() == 0) { + if (!data_027e09b8->func_01ffd420()) { if (gpCargoManager->mUnk_18 <= 0) { this->mUnk_64 = 0; this->mUnk_66 = 0; diff --git a/src/031_Land/Actor/ActorBlast.cpp b/src/031_Land/Actor/ActorBlast.cpp index 19d0a5e0..157f79c6 100644 --- a/src/031_Land/Actor/ActorBlast.cpp +++ b/src/031_Land/Actor/ActorBlast.cpp @@ -59,7 +59,7 @@ bool ActorBlast::vfunc_18(unk32 param1) { this->mUnk_F0 = FLOAT_TO_FX32(1.0f); } - data_027e09bc->mUnk_0C->func_ov000_0207a1e0(0x6); + data_027e09bc->mUnk_04[2]->func_ov000_0207a1e0(0x6); if (this->mUnk_5C.mParams[0] != 0x0) { data_027e0cec->func_ov000_0209feac(0x812, &this->mPos, 0x2, 0x0, 0x0); diff --git a/src/031_Land/Actor/ActorItemBoomerang.cpp b/src/031_Land/Actor/ActorItemBoomerang.cpp index 82b888f8..847af3a5 100644 --- a/src/031_Land/Actor/ActorItemBoomerang.cpp +++ b/src/031_Land/Actor/ActorItemBoomerang.cpp @@ -30,8 +30,7 @@ ActorProfileItemBoomerang::ActorProfileItemBoomerang() : // non-matching ActorItemBoomerang::ActorItemBoomerang() : - mUnk_94(data_027e0ce0->mUnk_1C->func_ov000_0208ed30(0x0, 0x1, ItemManager::func_ov000_020a8974(0x1)->mUnk_10)), - mUnk_9C(true), + mUnk_94(data_027e0ce0->mUnk_1C->func_ov000_0208ed30(0x0, 0x1, ItemManager::func_ov000_020a8974(0x1)->mUnk_10), true), mUnk_11C(this), mUnk_12C(), mUnk_138(0x0), diff --git a/src/031_Land/Actor/ActorRollingStone.cpp b/src/031_Land/Actor/ActorRollingStone.cpp index 6ec83d9a..abf868a9 100644 --- a/src/031_Land/Actor/ActorRollingStone.cpp +++ b/src/031_Land/Actor/ActorRollingStone.cpp @@ -93,8 +93,7 @@ void ActorRollingStone_D4::vfunc_10(Actor *param1) { // non-matching ActorRollingStone::ActorRollingStone() : - mUnk_94(G3d_GetModelPtr(GET_PROFILE(ActorProfileRollingStone)->mUnk_3C.mUnk_50)), - mUnk_9C(0x1), + mUnk_94(G3d_GetModelPtr(GET_PROFILE(ActorProfileRollingStone)->mUnk_3C.mUnk_50), true), mUnk_AC(this), mUnk_D4(this), mUnk_10C(data_027e0130), diff --git a/src/031_Land/Actor/ActorRupee.cpp b/src/031_Land/Actor/ActorRupee.cpp index a26f9470..468240af 100644 --- a/src/031_Land/Actor/ActorRupee.cpp +++ b/src/031_Land/Actor/ActorRupee.cpp @@ -393,7 +393,7 @@ void ActorRupee::func_ov031_020e94d4() { void ActorRupee::func_ov031_020e951c() { ItemId itemId; - if (data_027e09b8->func_01ffd420() != 0) { + if (data_027e09b8->func_01ffd420()) { return; } diff --git a/src/031_Land/Actor/ActorShotArrow.cpp b/src/031_Land/Actor/ActorShotArrow.cpp index fec1f686..1bbbbd0e 100644 --- a/src/031_Land/Actor/ActorShotArrow.cpp +++ b/src/031_Land/Actor/ActorShotArrow.cpp @@ -122,7 +122,7 @@ ActorProfileShotArrow::ActorProfileShotArrow() : } ActorShotArrow::ActorShotArrow() : - mUnk_9C(true), + mUnk_94(true), mUnk_A0(GetModelFromProfile3(func_ov031_020f1404(), data_ov031_02110b5c)), mUnk_100(&this->mUnk_120, GetModelFromProfile3(func_ov031_020f1404(), data_ov031_02110b5c), func_ov031_020f1404()->func_ov000_02058a84(0, data_ov031_02110b08)), @@ -560,7 +560,7 @@ void ActorShotArrow::vfunc_2C(unk32 param1) { VecFx32_Copy(&this->mPos, &stack.mUnk_E4); stack.mUnk_F0 = 0x2000; - if (!data_027e09bc->mUnk_04->func_01ffd640(&stack.mUnk_E4)) { + if (!data_027e09bc->mUnk_04[0]->func_01ffd640(&stack.mUnk_E4)) { return; } diff --git a/src/031_Land/Actor/ActorUnkMLCK.cpp b/src/031_Land/Actor/ActorUnkMLCK.cpp index 3da0a5bf..3bd6a115 100644 --- a/src/031_Land/Actor/ActorUnkMLCK.cpp +++ b/src/031_Land/Actor/ActorUnkMLCK.cpp @@ -7,11 +7,25 @@ #include "Unknown/UnkStruct_027e09b8.hpp" #include "Unknown/UnkStruct_027e0ce0.hpp" #include "Unknown/UnkStruct_027e0d34.hpp" +#include "Unknown/UnkStruct_ov000_020b3000.hpp" #include "Unknown/UnkStruct_ov000_020b51b8.hpp" #include "Unknown/UnkStruct_ov000_020b52e8.hpp" +#include "nitro/math.h" extern "C" unk32 data_ov031_02110bec[]; -extern "C" unk32 data_ov031_02112ad4; + +struct UnkStruct_ov031_02114d28 { + /* 00 */ u32 mUnk_00; + /* 04 */ u32 mUnk_04; + /* 08 */ u32 mUnk_08; + + UnkStruct_ov031_02114d28() { + this->mUnk_00 = 0x10002; + this->mUnk_08 = 0x10006; + this->mUnk_04 = 0x10009; + } +}; +static const UnkStruct_ov031_02114d28 data_ov031_02114d28; DECL_PROFILE(ActorProfileUnkMLCK); @@ -22,19 +36,11 @@ Actor *ActorProfileUnkMLCK::Create() { ActorProfileUnkMLCK::ActorProfileUnkMLCK() : ActorProfile(ActorId_MLCK) {} -// non-matching ActorUnkMLCK::ActorUnkMLCK() : mUnk_B4(mUnk_A0), mUnk_BC(0x4), mUnk_C0(0x0), mUnk_C2(0x0), - mUnk_C4(NULL), - mUnk_C8(0x0), - mUnk_CC(-1), - mUnk_D0(0x0), - mUnk_D2(0x0), - mUnk_D4(0x0), - mUnk_D6(0x0), mUnk_D8(this), mUnk_E4(this), mUnk_F0(false), @@ -46,28 +52,20 @@ ActorUnkMLCK::ActorUnkMLCK() : bool ActorUnkMLCK::vfunc_18(unk32 param1) { this->mUnk_B8 = this->mUnk_5C.mParams[0]; - struct { - void *ptr; - unk32 actorId; - unk32 param; - } local_9c; - local_9c.actorId = ActorId_MLCK; - local_9c.param = this->mUnk_5C.mParams[0]; - local_9c.ptr = &data_ov031_02112ad4; + UnkStruct_ov031_02112ad4 local_9c(ActorId_MLCK, this->mUnk_5C.mParams[0]); Actor **lppActor = gpActorManager->func_01fff350(&local_9c, gpActorManager->mActorTable); if (gpActorManager->mUnk_08 != lppActor) { return false; } - void *param = this; - if (param != NULL) { - param = &this->mUnk_94; - } - data_0204a088->func_ov000_020611dc(param, 0x9); + + data_0204a088->func_ov000_020611dc(this, 0x09); + bool var1 = true; if (!((u16) gpMiscAdvManager->mSongs & (1 << this->mUnk_B8))) { var1 = false; } + bool var2; if (var1 == false) { var2 = false; @@ -86,33 +84,30 @@ void ActorUnkMLCK::vfunc_64(unk32 param1) { this->mUnk_BC = param1; this->mUnk_C2 = 0xFFFF; this->mUnk_C0 = 0x0; - if (param1 != 0x1) { - return; - } - this->mUnk_F1 = false; - this->mUnk_C4 = data_ov000_020b52e8.func_ov000_0206f980(this->mUnk_B8); - this->mUnk_C4->func_ov031_020fb184(); + if (param1 == 0x1) { + this->mUnk_F1 = false; + this->mUnk_C4.mUnk_00 = data_ov000_020b52e8.func_ov000_0206f980(this->mUnk_B8); + this->mUnk_C4.func_ov031_020fb184(); + } } void ActorUnkMLCK::vfunc_54(unk32 param1, unk32 param2) { - if (param2 == 0) { - return; + if (param2 != 0) { + this->vfunc_64(0x1); } - this->vfunc_64(0x1); } -void ActorUnkMLCK::vfunc_58() { +void ActorUnkMLCK::vfunc_58(unk32 param1, unk32 param2) { this->mUnk_F0 = true; } -void ActorUnkMLCK::vfunc_5C() { - if (!this->mUnk_F1 || !this->mUnk_F0) { - return; +void ActorUnkMLCK::vfunc_5C(unk32 param1) { + if (this->mUnk_F1 && this->mUnk_F0) { + data_027e0d34->func_ov031_020d994c(); + data_ov000_020b51b8.func_ov000_0206d274(data_ov031_02110bec[this->mUnk_B8]); + this->mUnk_F0 = false; } - data_027e0d34->func_ov031_020d994c(); - data_ov000_020b51b8.func_ov000_0206d274(data_ov031_02110bec[this->mUnk_B8]); - this->mUnk_F0 = false; } void ActorUnkMLCK::vfunc_60() { @@ -123,14 +118,15 @@ void ActorUnkMLCK::vfunc_68() { if (data_0204a088->mUnk_04 != -1 || data_0204a088->mUnk_08 != -1) { return; } + if (this->mUnk_F2) { data_ov000_020b51b8.func_ov000_0206d274(0x83); GetAdventureModeManager()->func_ov024_020c6d04()->mUnk_C4 = 0x1; GetAdventureModeManager()->func_ov024_020c6d10(); this->vfunc_64(0x2); - return; + } else { + this->vfunc_6C(); } - this->vfunc_6C(); } void ActorUnkMLCK::func_ov031_020faeb0() {} @@ -139,72 +135,67 @@ void ActorUnkMLCK::vfunc_6C() { if (this->mUnk_5C.mUnk_1A[0] != 0x0) { this->func_ov000_02098a88(0x0, 0x1); } - for (ActorUnkMLCK_B4 *ptr = this->mUnk_A0; ptr != this->mUnk_B4; ++ptr) { - ptr->mUnk_00->vfunc_00(); + + for (ActorUnkMLCK_A0 **ptr = this->mUnk_A0; ptr != this->mUnk_B4; ptr++) { + (*ptr)->vfunc_00(); } } void ActorUnkMLCK::vfunc_70() { - if (this->mUnk_5C.mUnk_1A[0] == 0x0) { - return; + if (this->mUnk_5C.mUnk_1A[0] != 0x0) { + this->func_ov000_02098a88(0x0, 0x0); } - this->func_ov000_02098a88(0x0, 0x0); } -// non-matching void ActorUnkMLCK::func_ov031_020faf24() { - UnkStackStruct1 stack; if (this->mUnk_C0 != 0xF) { return; } - if (!this->mUnk_F2) { + + if (this->mUnk_F2 == 0) { return; } - bool var1 = this->func_ov031_020fb204(this->mUnk_B8); - bool var9 = true; - bool var = data_0204a088->func_ov000_020611fc(0x1); + bool temp_r7 = this->func_ov031_020fb204(this->mUnk_B8); + data_0204a088->func_ov000_020611fc(1); GetAdventureModeManager()->func_ov024_020c6d10(); - func_ov000_02072fd0(&stack); + UnkStackStruct1 sp0; + func_ov000_02072fd0(&sp0); + sp0.mUnk_00 = 1; + sp0.mUnk_3A = 0; + sp0.mUnk_3B = 0; - stack.mUnk_00 = 0x1; - stack.mUnk_3A = 0x0; - stack.mUnk_3B = 0x0; + VecFx32_Copy(data_027e0ce0->func_01fff148(0), &sp0.mUnk_0C); - VecFx32_Copy(data_027e0ce0->func_01fff148(0x0), &stack.mUnk_0C); + this->mUnk_F4 = data_027e09b8->func_ov000_02073388(&sp0, 0); + this->mUnk_D8.mUnk_04b = true; + this->mUnk_D8.mUnk_05 = temp_r7; - this->mUnk_F4 = data_027e09b8->func_ov000_02073388(&stack, 0x0); + u16 temp_r8 = this->mUnk_B8 + 0x28; + ActorUnk_vfunc_B0 sp8C; + sp8C.mUnk_00 = true; + sp8C.mUnk_0C = temp_r8 | 0x10000; + sp8C.mUnk_14 = 0; + sp8C.mUnk_32 = 0; - this->mUnk_D8.mUnk_04 = true; - this->mUnk_D8.mUnk_05 = var1; - ActorUnk_vfunc_B0 actor = ActorUnk_vfunc_B0(); - actor.mUnk_0C = (u16) (this->mUnk_B8 + 0x28) | 0x10000; - actor.mUnk_00 = 0x1; - actor.mUnk_14 = 0x0; - actor.mUnk_32 = 0x0; + VecFx32_Copy(data_027e0ce0->func_01fff148(0), &sp8C.mUnk_34); + sp8C.mUnk_04 = &this->mUnk_D8; - VecFx32_Copy(data_027e0ce0->func_01fff148(0x0), &actor.mUnk_34); - actor.mUnk_04 = &this->mUnk_D8; + data_027e09b8->func_ov000_02073470(&sp8C, 0); - data_027e09b8->func_ov000_02073470(&actor, 0x0); + if (temp_r7 == 0) { + this->mUnk_E4.mUnk_04b = 0; + this->mUnk_E4.mUnk_05 = temp_r7 == 0; - if (!var) { - if (var) { - var9 = false; - } - this->mUnk_E4.mUnk_04 = false; - this->mUnk_E4.mUnk_05 = var9; - ActorUnk_vfunc_B0 actor2 = ActorUnk_vfunc_B0(); - actor2.mUnk_00 = 0x1; - actor2.mUnk_0C = (u16) (this->mUnk_B8 + 0x88) | 0x10000; - actor2.mUnk_14 = 0x0; - actor2.mUnk_32 = 0x0; - - VecFx32_Copy(data_027e0ce0->func_01fff148(0x0), &actor2.mUnk_34); - actor2.mUnk_04 = &this->mUnk_E4; - - data_027e09b8->func_ov000_02073470(&actor2, 0x0); + ActorUnk_vfunc_B0 sp40; + sp40.mUnk_00 = true; + sp40.mUnk_0C = (u16) (this->mUnk_B8 + 0x88) | 0x10000; + sp40.mUnk_14 = 0; + sp40.mUnk_32 = 0; + VecFx32_Copy(data_027e0ce0->func_01fff148(0), &sp40.mUnk_34); + sp40.mUnk_04 = &this->mUnk_E4; + data_027e09b8->func_ov000_02073470(&sp40, 0); } this->mUnk_F0 = false; @@ -219,46 +210,47 @@ void ActorUnkMLCK::func_ov031_020fb11c() { this->vfunc_6C(); data_027e0d34->func_ov031_020d996c(); this->vfunc_64(0x0); - for (ActorUnkMLCK_B4 *ptr = this->mUnk_A0; ptr != this->mUnk_B4; ++ptr) { - ptr->mUnk_00->vfunc_08(); + + for (ActorUnkMLCK_A0 **ptr = this->mUnk_A0; ptr != this->mUnk_B4; ptr++) { + (*ptr)->vfunc_08(); } } -void ActorUnkMLCK_B4_00::func_ov031_020fb184() { - this->mUnk_04 = 0x0; +void ActorUnkMLCK_C4::func_ov031_020fb184() { + this->mUnk_04 = 0; this->mUnk_08 = -1; - this->mUnk_0E = 0xFFFF; - this->mUnk_0C = 0x0; - this->mUnk_12 = 0xFFFF; - this->mUnk_10 = 0x0; + this->mUnk_0E = -1; + this->mUnk_0C = 0; + this->mUnk_12 = -1; + this->mUnk_10 = 0; } void ActorUnkMLCK_D8::vfunc2_00() { - if (!this->mUnk_04b) { - return; + if (this->mUnk_04b) { + this->mUnk_08->func_ov031_020fb104(); } - this->mUnk_08->func_ov031_020fb104(); } void ActorUnkMLCK_D8::vfunc2_04() { - if (!this->mUnk_05) { - return; + if (this->mUnk_05) { + this->mUnk_08->func_ov031_020fb11c(); } - this->mUnk_08->func_ov031_020fb11c(); } -void ActorUnkMLCK::func_ov031_020fb1e8(ActorUnkMLCK_B4_00 *param1) { +void ActorUnkMLCK::func_ov031_020fb1e8(ActorUnkMLCK_A0 *param1) { if (this->mUnk_B4 != NULL) { - this->mUnk_B4->mUnk_00 = param1; + *this->mUnk_B4 = param1; } - ++this->mUnk_B4; + + this->mUnk_B4++; } bool ActorUnkMLCK::func_ov031_020fb204(unk32 param1) { - for (ActorUnkMLCK_B4 *ptr = this->mUnk_A0; ptr != this->mUnk_B4; ++ptr) { - if (ptr->mUnk_00->vfunc_04()) { + for (ActorUnkMLCK_A0 **ptr = this->mUnk_A0; ptr != this->mUnk_B4; ptr++) { + if ((*ptr)->vfunc_04()) { return true; } } + return false; } diff --git a/src/031_Land/Actor/ActorUnkRMTG.cpp b/src/031_Land/Actor/ActorUnkRMTG.cpp index 9dbc8b94..6b990336 100644 --- a/src/031_Land/Actor/ActorUnkRMTG.cpp +++ b/src/031_Land/Actor/ActorUnkRMTG.cpp @@ -40,7 +40,7 @@ bool ActorUnkRMTG::vfunc_18(unk32 param1) { } void ActorUnkRMTG::vfunc_1C() { - UnkStruct_027e09bc_0C *data = data_027e09bc->mUnk_0C; + UnkStruct_027e09bc_0C *data = data_027e09bc->mUnk_04[2]; data->func_ov000_0207834c(&this->mPos, func_ov000_02077590(0x7), 0x0); } diff --git a/src/031_Land/Actor/ActorUnkROCK.cpp b/src/031_Land/Actor/ActorUnkROCK.cpp index 1836214f..2756e2ab 100644 --- a/src/031_Land/Actor/ActorUnkROCK.cpp +++ b/src/031_Land/Actor/ActorUnkROCK.cpp @@ -26,8 +26,7 @@ ActorProfileUnkROCK::ActorProfileUnkROCK() : } ActorUnkROCK::ActorUnkROCK() : - mUnk_94(G3d_GetModelPtr(GET_PROFILE(ActorProfileUnkROCK)->mUnk_3C.mUnk_50)), - mUnk_9C(true) { + mUnk_94(G3d_GetModelPtr(GET_PROFILE(ActorProfileUnkROCK)->mUnk_3C.mUnk_50), true) { this->mUnk_44 = 0x1F; this->mUnk_4A[1] = 0x02; } diff --git a/src/031_Land/Actor/ActorUnkTGTZ.cpp b/src/031_Land/Actor/ActorUnkTGTZ.cpp index 88a9a737..a20b1ef5 100644 --- a/src/031_Land/Actor/ActorUnkTGTZ.cpp +++ b/src/031_Land/Actor/ActorUnkTGTZ.cpp @@ -50,8 +50,7 @@ ActorProfileUnkTGTZ::ActorProfileUnkTGTZ() : // non-matching ActorUnkTGTZ::ActorUnkTGTZ() : #if IS_JP - mUnk_094(NULL), - mUnk_09C(true), + mUnk_094(NULL, true), #else mUnk_094(G3d_GetModelPtr(GET_PROFILE(ActorProfileUnkTGTZ)->mUnk_3C.mUnk_50), 0xC, &this->mUnk_100), #endif diff --git a/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp b/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp index 7cf47094..66bb03cd 100644 --- a/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp +++ b/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp @@ -14,6 +14,7 @@ #include "Unknown/UnkStruct_027e0cd8.hpp" #include "Unknown/UnkStruct_027e0cec.hpp" #include "Unknown/UnkStruct_027e0d8c.hpp" +#include "Unknown/UnkStruct_ov000_020b3000.hpp" #include "Unknown/UnkStruct_ov000_020b51b8.hpp" #include "Unknown/UnkStruct_ov024_020d8660.hpp" @@ -156,11 +157,12 @@ ActorUnkZLSL::ActorUnkZLSL() : void func_ov031_020ea100() {} -bool UnkStruct_ov031_0211361c::func_ov031_020ea0b4(Actor *param1) { - if (param1 != NULL && param1->GetActorId() == ActorId_RAT0 && param1->mState == ActorUnkRAT0State_0 && - param1->mUnk_5C.mParams[1] == 0x1) { +bool UnkStruct_ov031_0211361c::vfunc_00(Actor *pActor) { + if (pActor != NULL && pActor->GetActorId() == ActorId_RAT0 && pActor->mState == ActorUnkRAT0State_0 && + pActor->mUnk_5C.mParams[1] == 0x1) { return true; } + return false; } THUMB_END @@ -990,7 +992,7 @@ unk32 ActorUnkZLSL::func_ov031_020ec54c() { } void ActorUnkZLSL::vfunc_B0() { - if (data_027e09b8->func_01ffd420() != 0x0) { + if (data_027e09b8->func_01ffd420()) { return; } ActorUnk_vfunc_B0 stack = ActorUnk_vfunc_B0(); @@ -1277,7 +1279,7 @@ void ActorUnkZLSL::func_ov031_020ed4e4(unk32 param1, unk32 param2) { if (data_027e09b8->func_ov000_020732ec(this->mUnk_28C8) == 0x0) { return; } - data_027e09bc->mUnk_0C->func_ov000_02078834(&this->mUnk_28F4, &this->mUnk_28E8, param2, param1); + data_027e09bc->mUnk_04[2]->func_ov000_02078834(&this->mUnk_28F4, &this->mUnk_28E8, param2, param1); } // non-matching @@ -1414,7 +1416,6 @@ unk32 ActorUnkZLSL::vfunc_80(unk32 param1, unk32 param2) { bool ActorUnkZLSL::func_ov031_020ee724() { UnkStruct_ov031_0211361c stack; - Actor **actor = gpActorManager->func_01fff350(&stack, gpActorManager->mActorTable); return *actor != NULL; } diff --git a/src/031_Land/MapObject/MapObjectDoorClick.cpp b/src/031_Land/MapObject/MapObjectDoorClick.cpp index d916f78f..25549195 100644 --- a/src/031_Land/MapObject/MapObjectDoorClick.cpp +++ b/src/031_Land/MapObject/MapObjectDoorClick.cpp @@ -35,7 +35,7 @@ MapObjectProfileDoorClick::MapObjectProfileDoorClick() : } MapObjectDoorClick::MapObjectDoorClick() : - mUnk_9C(1), + mUnk_94(true), mUnk_A0(0) { this->mUnk_8F = true; SET_FLAG(this->mFlags, MapObjFlag_9); diff --git a/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp b/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp index ba43a613..9f02125a 100644 --- a/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp +++ b/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp @@ -36,8 +36,7 @@ MapObjectProfileDoorDangerSpawn::MapObjectProfileDoorDangerSpawn() : } MapObjectDoorDangerSpawn::MapObjectDoorDangerSpawn() : - mUnk_94(GetModelFromProfile()), - mUnk_9C(1), + mUnk_94(GetModelFromProfile(), true), mUnk_A0(0), mUnk_A1(false), mUnk_A2(false), @@ -124,7 +123,7 @@ void MapObjectDoorDangerSpawn::vfunc_04(void) { ptr->func_ov000_020803ec(this->mUnk_20.mParams[0]); this->vfunc_5C(MapObjDoorDangerSpawnState_0, 0); - UnkStruct_027e09bc_0C *uVar5 = data_027e09bc->mUnk_0C; + UnkStruct_027e09bc_0C *uVar5 = data_027e09bc->mUnk_04[2]; MapObjectDoorDangerSpawn::func_ov031_020fe5fc(&auStack_20, this); uVar5->func_ov000_0207834c(&auStack_20, (unk32) func_ov000_02077590(0), 0); @@ -141,7 +140,7 @@ void MapObjectDoorDangerSpawn::vfunc2_08(void) { this->MapObjectDoorBase::vfunc2_08(); if (this->mUnk_A2) { - data_027e09bc->mUnk_0C->func_ov000_02078230(0); + data_027e09bc->mUnk_04[2]->func_ov000_02078230(0); } data_ov000_020b51b8.func_ov000_0206c96c(data_ov031_02110c00[this->mUnk_20.mParams[3]]); @@ -178,7 +177,7 @@ void MapObjectDoorDangerSpawn::vfunc_08(void) { sp3C = *temp_r0_3; ((unk16 *) sp3C.data)[3] = this->mAngle; - UnkStruct_027e09bc_0C *temp_r5 = data_027e09bc->mUnk_0C; + UnkStruct_027e09bc_0C *temp_r5 = data_027e09bc->mUnk_04[2]; this->func_ov031_020fe5fc(&sp10, this); temp_r5->func_ov000_02078764(&sp10, &sp3C, 0); @@ -192,7 +191,7 @@ void MapObjectDoorDangerSpawn::vfunc_08(void) { sp1C = *temp_r0_3; - UnkStruct_027e09bc_0C *temp_r7_2 = data_027e09bc->mUnk_0C; + UnkStruct_027e09bc_0C *temp_r7_2 = data_027e09bc->mUnk_04[2]; this->func_ov031_020fe5fc(&sp4, this); temp_r7_2->func_ov000_02078764(&sp4, &sp1C, 0); } diff --git a/src/031_Land/MapObject/MapObjectDoorKey.cpp b/src/031_Land/MapObject/MapObjectDoorKey.cpp index 9604bec9..13f38d70 100644 --- a/src/031_Land/MapObject/MapObjectDoorKey.cpp +++ b/src/031_Land/MapObject/MapObjectDoorKey.cpp @@ -24,8 +24,7 @@ MapObjectProfileDoorKey::MapObjectProfileDoorKey() : } MapObjectDoorKey::MapObjectDoorKey() : - mUnk_94(GetModelFromProfile()), - mUnk_9C(1), + mUnk_94(GetModelFromProfile(), true), mUnk_A0(0), mUnk_A4(false) { this->mUnk_8F = true; diff --git a/src/031_Land/MapObject/MapObjectUnkSAND.cpp b/src/031_Land/MapObject/MapObjectUnkSAND.cpp index fb1fb493..37f87ce7 100644 --- a/src/031_Land/MapObject/MapObjectUnkSAND.cpp +++ b/src/031_Land/MapObject/MapObjectUnkSAND.cpp @@ -14,7 +14,7 @@ MapObjectProfileUnkSAND::MapObjectProfileUnkSAND() : void MapObjectUnkSAND::func_ov031_0210acd4(void) {} void MapObjectUnkSAND::func_ov031_0210ad64(void) {} -void MapObjectUnkSAND::func_ov031_0210ae00(void) {} +unk32 MapObjectUnkSAND::func_ov031_0210ae00(Vec2bCpp param1, void *param2) {} void MapObjectUnkSAND::func_ov031_0210ae90(void) {} void MapObjectUnkSAND::func_ov031_0210af50(void) {} void MapObjectUnkSAND::func_ov031_0210b018(void) {} @@ -22,7 +22,7 @@ void MapObjectUnkSAND::func_ov031_0210b028(void) {} void MapObjectUnkSAND::func_ov031_0210b0ac(void) {} void MapObjectUnkSAND::func_ov031_0210b0e4(void) {} void MapObjectUnkSAND::func_ov031_0210b144(void) {} -void MapObjectUnkSAND::func_ov031_0210b17c(void) {} +void MapObjectUnkSAND::func_ov031_0210b17c(MapObjectUnkSAND_40 *param1, unk32 param2) {} void MapObjectUnkSAND::func_ov031_0210b1ec(void) {} void MapObjectUnkSAND::func_ov031_0210b2cc(void) {} void MapObjectUnkSAND::func_ov031_0210b32c(void) {} diff --git a/src/031_Land/MapObject/MapObjectUnkSKDI.cpp b/src/031_Land/MapObject/MapObjectUnkSKDI.cpp index 13053d07..3c6434e4 100644 --- a/src/031_Land/MapObject/MapObjectUnkSKDI.cpp +++ b/src/031_Land/MapObject/MapObjectUnkSKDI.cpp @@ -21,8 +21,7 @@ MapObjectProfileUnkSKDI::MapObjectProfileUnkSKDI() : } MapObjectUnkSKDI::MapObjectUnkSKDI() : - mUnk_040(GetModelFromProfile()), - mUnk_048(0x1), + mUnk_040(GetModelFromProfile(), true), mUnk_07C(0x0), mUnk_080(-0x1), mUnk_084(0x0), @@ -198,7 +197,7 @@ void MapObjectUnkSKDI::func_ov031_0210643c(unk32 param1) { this->mUnk_0FA = 0x0; this->mUnk_0F8 = 0x0; } - if (data_027e09b8->func_01ffd420() != 0) { + if (data_027e09b8->func_01ffd420()) { return; } if (this->mUnk_0F8 < this->mUnk_0FA) { diff --git a/src/063_Shrine/MapObject/MapObjectUnkSTAT.cpp b/src/063_Shrine/MapObject/MapObjectUnkSTAT.cpp index 3857b5d7..4a9740aa 100644 --- a/src/063_Shrine/MapObject/MapObjectUnkSTAT.cpp +++ b/src/063_Shrine/MapObject/MapObjectUnkSTAT.cpp @@ -54,8 +54,7 @@ MapObjectProfileUnkSTAT::MapObjectProfileUnkSTAT() : } MapObjectUnkSTAT::MapObjectUnkSTAT() : - mUnk_40(G3d_GetModelPtr(GET_PROFILE(MapObjectProfileUnkSTAT)->mUnk_20.mUnk_50)), - mUnk_48(1), + mUnk_40(G3d_GetModelPtr(GET_PROFILE(MapObjectProfileUnkSTAT)->mUnk_20.mUnk_50), true), mUnk_4C(4), mUnk_50(-1), mUnk_54(0x8000), diff --git a/src/070_Dungeon/MapObject/MapObjectUnkPTFL.cpp b/src/070_Dungeon/MapObject/MapObjectUnkPTFL.cpp index 54b4a5d3..1b55be7d 100644 --- a/src/070_Dungeon/MapObject/MapObjectUnkPTFL.cpp +++ b/src/070_Dungeon/MapObject/MapObjectUnkPTFL.cpp @@ -16,12 +16,12 @@ MapObjectUnkPTFL::MapObjectUnkPTFL() {} void MapObjectUnkPTFL::func_ov070_0214ba34(void) {} void MapObjectUnkPTFL::func_ov070_0214bb78(void) {} -void MapObjectUnkPTFL::func_ov070_0214bbd0(void) {} +void MapObjectUnkPTFL::func_ov070_0214bbd0(MapObjectUnkPTFLState state, bool param2) {} void MapObjectUnkPTFL::func_ov070_0214bd48(void) {} void MapObjectUnkPTFL::func_ov070_0214bd90(void) {} void MapObjectUnkPTFL::func_ov070_0214bf58(void) {} -void MapObjectUnkPTFL::func_ov070_0214bf5c(void) {} -void MapObjectUnkPTFL::func_ov070_0214bf6c(void) {} +bool MapObjectUnkPTFL::func_ov070_0214bf5c(void) {} +bool MapObjectUnkPTFL::func_ov070_0214bf6c(void) {} void MapObjectUnkPTFL::func_ov070_0214bfbc(void) {} MapObjectUnkPTFL::~MapObjectUnkPTFL() {} diff --git a/src/101_SceneInitLand/Player/PlayerLinkActor_A0_1C_101.cpp b/src/101_SceneInitLand/Player/PlayerLinkActor_A0_1C_101.cpp index eb2f88cc..dd61ef64 100644 --- a/src/101_SceneInitLand/Player/PlayerLinkActor_A0_1C_101.cpp +++ b/src/101_SceneInitLand/Player/PlayerLinkActor_A0_1C_101.cpp @@ -1,9 +1,8 @@ #include "Actor/ActorManager.hpp" #include "Player/PlayerLink.hpp" +#include "Unknown/UnkStruct_ov000_020b3000.hpp" -extern unk32 data_ov000_020b3000; - -PlayerLinkActor_A0_1C::PlayerLinkActor_A0_1C(unk32 param1) { +PlayerLinkActor_A0_1C::PlayerLinkActor_A0_1C(UnkStruct_027e0ce0_40 *param1) { this->mUnk_00 = param1; this->mUnk_04 = 0x00; this->mUnk_06 = false; @@ -14,13 +13,7 @@ void PlayerLinkActor_A0_1C::func_ov101_02183290() { this->mUnk_06 = false; this->mUnk_0C.Reset(); - struct { - void *ptr; - unk32 actorId; - } local_14; - local_14.ptr = &data_ov000_020b3000; - local_14.actorId = ActorId_IWTS; - + UnkStruct_ov000_020b3000 local_14(ActorId_IWTS); Actor **ppActor = gpActorManager->func_01fff350(&local_14, gpActorManager->mActorTable); // why is this a loop diff --git a/src/102_CourseExecLand/ActorUnkMLCK_102.cpp b/src/102_CourseExecLand/ActorUnkMLCK_102.cpp new file mode 100644 index 00000000..bd4ce8d0 --- /dev/null +++ b/src/102_CourseExecLand/ActorUnkMLCK_102.cpp @@ -0,0 +1,97 @@ +#include "Actor/ActorId.hpp" +#include "Actor/ActorManager.hpp" +#include "Actor/ActorUnkMLCK.hpp" +#include "MainGame/MiscAdvManager.hpp" +#include "Unknown/UnkStruct_027e09b8.hpp" +#include "Unknown/UnkStruct_027e0cf0.hpp" +#include "Unknown/UnkStruct_ov000_020b3000.hpp" +#include "Unknown/UnkStruct_ov000_020b51b8.hpp" +#include "Unknown/UnkStruct_ov000_020b51c0.hpp" +#include "nitro/types.h" +#include "types.h" + +#include + +struct UnkStruct_ov102_02184a10 { + /* 00 */ u32 mUnk_00; + /* 04 */ u32 mUnk_04; + /* 08 */ u32 mUnk_08; + + UnkStruct_ov102_02184a10() { + this->mUnk_08 = 0x10002; + this->mUnk_04 = 0x10006; + this->mUnk_00 = 0x10009; + } +}; +static const UnkStruct_ov102_02184a10 data_ov102_02184a10; + +void ActorUnkMLCK::vfunc_20() { + this->vfunc_70(); + + this->mUnk_F2 = gpMiscAdvManager->mSongs & (1 << this->mUnk_B8) ? 1 : 0; + + if (!this->mUnk_F3) { + return; + } + + switch (this->mUnk_BC) { + case 1: + if (data_027e0cf0 != NULL && this->mUnk_C4.func_ov102_021847e8(data_027e0cf0->mUnk_0B, data_027e0cf0->mUnk_10)) { + UnkStruct_ov102_02184a24 sp0(ActorId_MLCK); + + if (gpActorManager->mUnk_08 == gpActorManager->func_01fff350(&sp0, gpActorManager->mActorTable)) { + this->vfunc_68(); + this->mUnk_C4.func_ov031_020fb184(); + } + } + break; + case 2: + this->func_ov031_020faf24(); + break; + } + + if (data_ov000_020b51b8.IsUnk08_2()) { + data_ov000_020b51c8.func_02002f04(); + } + + if (this->mUnk_F4 != -1) { + if (!data_ov000_020b51b8.IsUnk08_2() && data_027e09b8->func_ov000_020732fc(this->mUnk_F4) != 0) { + this->mUnk_F4 = -1; + } + } + + if (this->mUnk_C0 < this->mUnk_C2) { + (*(volatile u16 *) &this->mUnk_C0)++; + } +} + +void ActorUnkMLCK::vfunc_24() { + this->vfunc_20(); +} + +bool ActorUnkMLCK_C4::func_ov102_021847e8(unk32 param1, unk32 param2) { + if (param1 != 0) { + if (this->mUnk_04 > 0 && param2 == this->mUnk_00->unk_14[this->mUnk_04 - 1]) { + return false; + } + + if (param2 == this->mUnk_00->unk_14[this->mUnk_04]) { + this->mUnk_04++; + } else { + this->func_ov031_020fb184(); + } + } else if (this->mUnk_04 == this->mUnk_00->unk_02) { + return true; + } + + return false; +} + +bool UnkStruct_ov102_02184a24::vfunc_00(Actor *pActor) { + if (pActor != NULL && pActor->GetActorId() == this->mActorId) { + BOOL var_r1 = ((ActorUnkMLCK *) pActor)->mUnk_BC == 0 || ((ActorUnkMLCK *) pActor)->mUnk_BC == 1; + return !var_r1; + } + + return false; +} diff --git a/src/102_CourseExecLand/MapObjectUnkPTFL_102.cpp b/src/102_CourseExecLand/MapObjectUnkPTFL_102.cpp new file mode 100644 index 00000000..22ac32c7 --- /dev/null +++ b/src/102_CourseExecLand/MapObjectUnkPTFL_102.cpp @@ -0,0 +1,321 @@ +#include "MapObject/MapObjectUnkPTFL.hpp" +#include "Unknown/UnkStruct_027e0208.hpp" +#include "Unknown/UnkStruct_027e0cd8.hpp" +#include "nns/g3d/sbc.h" + +extern "C" void func_01ff9318(void *, unk32, unk32); +extern "C" fx32 func_01ffb464(fx32); + +static unk32 data_ov102_02184980[] = { + 0x1FF00000, 0x0007FC00, 0x000001FF, 0x20000000, 0x00080000, 0x00000200, 0x16A5A800, 0x00000000, 0x00000000, 0x00000000, +}; + +static u16 data_ov102_021849a8[] = { + 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0xF800, 0x0800, 0xF800, 0x0800, 0x0800, 0xF800, 0xF800, 0xF800, + 0x0800, 0x0800, 0xF800, 0x0800, 0xF800, 0xF800, 0xF800, 0x0800, 0xF800, 0xF800, 0xF800, 0x1000, 0x1000, + 0x0800, 0x1000, 0x1000, 0xF800, 0x1000, 0x0000, 0x0800, 0x1000, 0x0000, 0xF800, 0x0000, 0x1000, 0x0800, + 0x0000, 0x1000, 0xF800, 0x0000, 0x0000, 0x0800, 0x0000, 0x0000, 0xF800, 0x0000, 0x0800, 0x0000, 0x0000, +}; + +void func_ov102_02183c14(s32 param1) { + u32 sp0[2]; + + sp0[0] = data_ov102_021849a8[param1 * 3] | (data_ov102_021849a8[param1 * 3 + 1] << 0x10); + sp0[1] = data_ov102_021849a8[param1 * 3 + 2]; + + PushGeometryCommand(0x23, sp0, 2); +} + +void func_ov102_02183c6c(s32 param0) { + u32 sp0 = data_ov102_02184980[param0]; + PushGeometryCommand(0x21, &sp0, 1); +} + +void func_ov102_02183c94(s32 param0, s32 param1, s32 param2, s32 param3, s32 param4, u16 param5, u16 param6, u16 param7, + u16 param8, s32 param9) { + u32 spC; + u32 sp8; + u32 sp4; + u32 sp0; + + func_ov102_02183c6c(param4); + + s16 x2 = param8 * 16; + s16 y2 = (param7 + param9) * 16; + + spC = ((u16) x2 << 16) | (u16) y2; + PushGeometryCommand(0x22, &spC, 1); + func_ov102_02183c14(param0); + + s16 x1 = param6 * 16; + + sp8 = ((u16) x1 << 16) | (u16) y2; + PushGeometryCommand(0x22, &sp8, 1); + func_ov102_02183c14(param1); + + s16 y1 = (param5 + param9) * 16; + + sp4 = ((u16) x1 << 16) | (u16) y1; + PushGeometryCommand(0x22, &sp4, 1); + func_ov102_02183c14(param2); + + sp0 = ((u16) x2 << 16) | (u16) y1; + PushGeometryCommand(0x22, &sp0, 1); + func_ov102_02183c14(param3); +} + +void func_ov102_02183da4(s32 param0, s32 param1, s32 param2, s32 param3, s32 param4, u16 param5, u16 param6, u16 param7, + u16 param8, s32 param9) { + func_ov102_02183c94(param0, param1, param2, param3, param4, param5, param6, param7, param8, param9); +} + +void MapObjectUnkPTFL::vfunc_08() { + switch (this->mState) { + case MapObjectUnkPTFLState_0: + this->mUnk_48--; + + if (this->mUnk_48 > 0) { + func_01ff9318(&this->mUnk_54, 0, func_01ffb464(this->mUnk_48 << 0xC)); + } + + if (this->mUnk_48 <= 0) { + this->func_ov070_0214bbd0(MapObjectUnkPTFLState_1, false); + } + break; + case MapObjectUnkPTFLState_1: + switch (this->mUnk_20.mParams[0]) { + case 0: + if (!this->func_ov070_0214bf6c()) { + this->func_ov070_0214bbd0(MapObjectUnkPTFLState_2, false); + } + break; + case 1: + if (this->func_ov070_0214bf5c()) { + this->func_ov070_0214bbd0(MapObjectUnkPTFLState_2, false); + } + break; + default: + break; + } + break; + case MapObjectUnkPTFLState_2: + func_01ff9318(&this->mUnk_54, 0x3C72, 0x333); + + if (this->mUnk_54 == 0x3C72) { + if (this->mUnk_5B == 1) { + this->func_ov070_0214bbd0(MapObjectUnkPTFLState_4, false); + } else { + this->func_ov070_0214bbd0(MapObjectUnkPTFLState_3, false); + } + } + break; + case MapObjectUnkPTFLState_3: + switch (this->mUnk_20.mParams[0]) { + case 0: + if (this->func_ov070_0214bf6c()) { + this->func_ov070_0214bbd0(MapObjectUnkPTFLState_0, false); + } + break; + case 1: + if (!this->func_ov070_0214bf5c()) { + this->func_ov070_0214bbd0(MapObjectUnkPTFLState_0, false); + } + break; + case 2: + if (this->mUnk_56 >= this->mUnk_58) { + this->func_ov070_0214bbd0(MapObjectUnkPTFLState_0, false); + } + break; + default: + break; + } + break; + case MapObjectUnkPTFLState_4: + default: + break; + } + + if (this->mUnk_56 < this->mUnk_58) { + this->mUnk_56++; + } +} + +void MapObjectUnkPTFL::vfunc_0C() { + this->vfunc_08(); +} + +void MapObjectUnkPTFL::vfunc_14() { + Mat4p sp44; + VecFx32 sp38; + VecFx32 sp2C; + VecFx32 sp20; + u32 sp1C; + u32 sp18; + u32 sp14; + u32 sp10; + u32 spC; + u32 sp8; + u32 sp4; + u32 sp0; + s32 temp_r4; + s32 var_r5; + s32 var_r7; + + PushGeometryCommand(0x11, NULL, 0); + + sp1C = data_027e0208.mUnk_094; + PushGeometryCommand(0x30, &sp1C, 1); + + sp18 = 0; + PushGeometryCommand(0x31, &sp18, 1); + + sp14 = 0x1F8081; + PushGeometryCommand(0x29, &sp14, 1); + + sp10 = 3; + PushGeometryCommand(0x10, &sp10, 1); + + PushGeometryCommand(0x15, NULL, 0); + + sp2C.x = this->mUnk_5A << 0xB; + sp2C.y = INT_TO_FX32(this->mUnk_5A); + sp2C.z = 0x1000; + PushGeometryCommand(0x1B, &sp2C, 3); + + Mat4p_InitIdentity(&sp44); + sp44.zColumn.z = 0x10000; + sp44.wColumn.w = 0x10000; + PushGeometryCommand(0x18, &sp44, 0x10); + spC = 2; + PushGeometryCommand(0x10, &spC, 1); + temp_r4 = this->mUnk_40; + + var_r7 = (this->mUnk_5C ? 3 : 0); + + sp8 = 0 | 0x40030000 | ((u16) temp_r4 & ~0xE0000000) | (((u32) (temp_r4 & 0x1C000000) >> 0x1A) << 0x1A) | + (((u32) (temp_r4 & 0x03800000) >> 0x17) << 0x17) | (((u32) (temp_r4 & 0x20000000) >> 0x1D) << 0x1D) | + (((u32) (temp_r4 & 0x00700000) >> 0x14) << 0x14) | (var_r7 << 0x12); + + PushGeometryCommand(0x2A, &sp8, 1); + + sp4 = (u32) ((u32) (this->mUnk_44 << 0x11) >> 0xD) >> (4 - (((u32) (this->mUnk_40 & 0x1C000000) >> 0x1A) == 2 ? 1 : 0)); + PushGeometryCommand(0x2B, &sp4, 1); + + sp38 = this->mPos; + sp20.x = sp38.x; + sp20.y = sp38.y; + sp20.z = sp38.z; + PushGeometryCommand(0x1C, &sp20, 3); + + this->func_ov102_0218419c(); + this->func_ov102_021843b4(); + + sp0 = 1; + PushGeometryCommand(0x12, &sp0, 1); +} + +void MapObjectUnkPTFL::func_ov102_0218419c() { + VecFx32 sp68; + VecFx32 sp5C; + VecFx32 sp50; + VecFx32 sp44; + Mat3p sp20; + u32 sp1C; + u32 sp18; + s32 temp_r0_3; + s32 temp_r1_3; + s32 temp_r7; + + PushGeometryCommand(0x11, NULL, 0); + + if (this->mState == 1) { + sp68.x = (this->mUnk_5A << 0xB) + 0x52; + sp68.y = FLOAT_TO_FX32(0.0f); + sp68.z = FLOAT_TO_FX32(0.0f); + PushGeometryCommand(0x1C, &sp68, 3); + + temp_r0_3 = INT_TO_FX32(this->mUnk_5A); + sp5C.x = MUL_FX32(temp_r0_3, FLOAT_TO_FX32(0.54f)); + sp5C.y = FLOAT_TO_FX32(1.0f); + sp5C.z = MUL_FX32(temp_r0_3, FLOAT_TO_FX32(1.04f)); + PushGeometryCommand(0x1B, &sp5C, 3); + } else { + sp50.x = this->mUnk_5A << 0xB; + sp50.y = FLOAT_TO_FX32(0.0f); + sp50.z = FLOAT_TO_FX32(0.0f); + PushGeometryCommand(0x1C, &sp50, 3); + + temp_r7 = INT_TO_FX32(this->mUnk_5A); + sp44.x = MUL_FX32(temp_r7, FLOAT_TO_FX32(0.5f)); + sp44.y = FLOAT_TO_FX32(1.0f); + sp44.z = MUL_FX32(temp_r7, FLOAT_TO_FX32(1.0f)); + PushGeometryCommand(0x1B, &sp44, 3); + } + + temp_r1_3 = (u16) (this->mUnk_54 - 0x8000); + Mat3p_InitZRotation(&sp20, SIN(temp_r1_3), COS(temp_r1_3)); + + PushGeometryCommand(0x1A, &sp20, 9); + + sp1C = 1; + PushGeometryCommand(0x40, &sp1C, 1); + + func_ov102_02183da4(0xB, 0xA, 0xE, 0xF, 4, 0, 0, 0x20, 0x20, 0x20); + + PushGeometryCommand(0x41, NULL, 0); + + sp18 = 1; + PushGeometryCommand(0x12, &sp18, 1); +} + +void MapObjectUnkPTFL::func_ov102_021843b4() { + VecFx32 sp68; + VecFx32 sp5C; + VecFx32 sp50; + VecFx32 sp44; + Mat3p sp20; + u32 sp1C; + u32 sp18; + s32 temp_r0_3; + s32 temp_r7; + + PushGeometryCommand(0x11, NULL, 0); + + if (this->mState == 1) { + sp68.x = (-this->mUnk_5A << 0xB) - 0x52; + sp68.y = FLOAT_TO_FX32(0.0f); + sp68.z = FLOAT_TO_FX32(0.0f); + PushGeometryCommand(0x1C, &sp68, 3); + + temp_r0_3 = INT_TO_FX32(this->mUnk_5A); + sp5C.x = MUL_FX32(temp_r0_3, FLOAT_TO_FX32(0.54f)); + sp5C.y = FLOAT_TO_FX32(1.0f); + sp5C.z = MUL_FX32(temp_r0_3, FLOAT_TO_FX32(1.04f)); + PushGeometryCommand(0x1B, &sp5C, 3); + } else { + sp50.x = -this->mUnk_5A << 0xB; + sp50.y = FLOAT_TO_FX32(0.0f); + sp50.z = FLOAT_TO_FX32(0.0f); + PushGeometryCommand(0x1C, &sp50, 3); + + temp_r7 = INT_TO_FX32(this->mUnk_5A); + sp44.x = MUL_FX32(temp_r7, FLOAT_TO_FX32(0.5f)); + sp44.y = FLOAT_TO_FX32(1.0f); + sp44.z = MUL_FX32(temp_r7, FLOAT_TO_FX32(1.0f)); + PushGeometryCommand(0x1B, &sp44, 3); + } + + Mat3p_InitZRotation(&sp20, -SIN(this->mUnk_54), COS(this->mUnk_54)); + + PushGeometryCommand(0x1A, &sp20, 9); + + sp1C = 1; + PushGeometryCommand(0x40, &sp1C, 1); + + func_ov102_02183da4(0xF, 0xE, 0xA, 0xB, 1, 0, 0, 0x20, 0x20, 0); + + PushGeometryCommand(0x41, NULL, 0); + + sp18 = 1; + PushGeometryCommand(0x12, &sp18, 1); +} diff --git a/src/102_CourseExecLand/MapObjectUnkSAND_102.cpp b/src/102_CourseExecLand/MapObjectUnkSAND_102.cpp new file mode 100644 index 00000000..8a259847 --- /dev/null +++ b/src/102_CourseExecLand/MapObjectUnkSAND_102.cpp @@ -0,0 +1,232 @@ +#include "MapObject/MapObjectUnkSAND.hpp" +#include "Render/ModelRender.hpp" +#include "Unknown/UnkStruct_027e09a8.hpp" +#include "Unknown/UnkStruct_027e09b8.hpp" +#include "Unknown/UnkStruct_027e09c0.hpp" +#include "Unknown/UnkStruct_027e0cd8.hpp" +#include "Unknown/UnkStruct_027e0cec.hpp" + +extern "C" void func_01ff91b8(unk16 *, fx32, fx32); +extern unk32 data_ov031_02115fe0; +extern MapObject_10 data_ov031_02118ac8[]; +extern MapObject_10 data_ov031_02118aec; +extern MapObject_10 data_ov031_02118aa4; + +struct UnkStruct_ov031_021189d0 { + /* 00 */ STRUCT_PAD(0x00, 0x70); + /* 70 */ BMDSectionModel *unk_70; +}; +extern UnkStruct_ov031_021189d0 data_ov031_021189d0; + +struct UnkStruct_ov102_021848b0 { + /* 00 */ u16 unk_00; // index for data_ov102_021848f0 + /* 02 */ s16 unk_02; + /* 04 */ +}; + +static const UnkStruct_ov102_021848b0 data_ov102_021848b0[] = { + {5, 0x0000}, {4, 0x0000}, {4, 0x4000}, {3, 0x0000}, {4, 0x8000}, {2, 0x4000}, {3, 0x4000}, {1, 0x4000}, + {4, 0xC000}, {3, 0xC000}, {2, 0x0000}, {1, 0x0000}, {3, 0x8000}, {1, 0xC000}, {1, 0x8000}, {0, 0x0000}, +}; + +static const char data_ov102_021848f0[][16] = { + "s0", "s1", "s2", "s3", "s4", "s5", +}; + +void MapObjectUnkSAND_40::func_ov102_021835c4(VecFx32 *param1) { + switch (this->mUnk_00) { + case 1: + case 2: + case 3: + case 4: + if (this->mUnk_04 <= 0) { + MapObjectUnkSAND::func_ov031_0210b17c(this, 5); + return; + } + + func_01ff91b8(&this->mUnk_02, 0x1333, 0x2000 / (this->mUnk_04 + 1)); + this->mUnk_04--; + break; + case 5: + if (this->mUnk_04 <= 0) { + MapObjectUnkSAND::func_ov031_0210b17c(this, 6); + return; + } + + this->mUnk_04--; + break; + case 6: + if (this->mUnk_04 <= 0) { + MapObjectUnkSAND::func_ov031_0210b17c(this, 0); + return; + } + + func_01ff91b8(&this->mUnk_02, 0, 0x2000 / (this->mUnk_04 + 1)); + this->mUnk_04--; + break; + default: + break; + } + + if (this->mUnk_01 != this->mUnk_00) { + switch (this->mUnk_00) { + case 1: + case 2: + case 3: + case 4: + if (this->mUnk_01 != 5) { + data_027e0cec->func_ov000_0209feac(0x8B5, param1, 4, 0, 0); + data_027e09a8->func_ov000_02071b30(0x183, param1, 0); + } + break; + case 6: + data_027e0cec->func_ov000_0209feac(0x8B6, param1, 4, 0, 0); + data_027e0cec->func_ov000_0209feac(0x8B7, param1, 4, 0, 0); + data_027e09a8->func_ov000_02071b30(0x184, param1, 0); + default: + break; + } + + this->mUnk_01 = this->mUnk_00; + } +} + +void MapObjectUnkSAND_40::func_ov102_021837a8(Vec2bCpp param1, VecFx32 *param2) { + Vec2bCpp spC[4]; + s32 sp8; + UnkAngleStruct sp6; + s32 var_r3; + u16 var_r6; + fx32 temp_r7; + s32 var_r8; + UnkStruct_027e0cd8_0C_Base *temp_r9; + + var_r6 = 0; + + spC[0].x = 0; + spC[0].y = 0; + + spC[1].x = 0; + spC[1].y = 0; + + spC[2].x = 0; + spC[2].y = 0; + + spC[3].x = 0; + spC[3].y = 0; + + for (var_r3 = 0; var_r3 < ARRAY_LEN(spC); var_r3++) { +#if __MWERKS__ + spC[var_r3].data = param1.data; +#else + spC[var_r3].x = param1.x; + spC[var_r3].y = param1.y; +#endif + } + + spC[0].y++; + spC[1].x++; + spC[2].y--; + spC[3].x--; + + temp_r9 = data_027e0cd8->mUnk_0C; + temp_r7 = temp_r9->func_01ffedf4(¶m1); + + for (var_r8 = 0; var_r8 < ARRAY_LEN(spC); var_r8++) { + if (temp_r7 == temp_r9->func_01ffedf4(&spC[var_r8])) { + if (MapObjectUnkSAND::func_ov031_0210ae00(spC[var_r8], &sp8) != 0 && sp8 == this->mUnk_02) { + var_r6 |= 1 << var_r8; + } + } + } + + const UnkStruct_ov102_021848b0 *ptr = &data_ov102_021848b0[var_r6]; + UnkSystem6_Derived2 sp14( + G3d_GetUnkPtr(data_ov031_021189d0.unk_70, data_ov102_021848f0[data_ov102_021848b0[var_r6].unk_00]), true); + sp6.angle_signed = ptr->unk_02; + sp14.func_01ffc6d4(sp6, param2); +} + +void MapObjectUnkSAND::vfunc_08() { + VecFx32 sp0; + MapObjState temp_r0_3; + s32 var_r6; + s32 var_r8; + s32 var_r9; + + sp0 = this->mPos; + sp0.y = this->mUnk_4C; + + var_r8 = 1; + var_r9 = 1; + + for (var_r6 = 0; var_r6 < ARRAY_LEN(this->mUnk_40); var_r6++) { + this->mUnk_40[var_r6].func_ov102_021835c4(&sp0); + sp0.x += 0x1000; + + var_r8 = (var_r8 & (this->mUnk_40[var_r6].mUnk_00 != 0 ? 1 : 0)) ? 1 : 0; + var_r9 = (var_r9 & (this->mUnk_40[var_r6].mUnk_00 == 0 ? 1 : 0)) ? 1 : 0; + } + + if (var_r9 != 0) { + this->Kill(); + return; + } + + temp_r0_3 = this->mState; + this->mUnk_10 = NULL; + this->mState = MapObjectUnkSANDState_0; + + if (var_r8 != 0) { + this->mPos.y = this->mUnk_4C + this->mUnk_40[0].mUnk_02; + + if (this->mUnk_40[0].mUnk_02 == this->mUnk_40[1].mUnk_02) { + this->mUnk_10 = &data_ov031_02118aa4; + } else { + this->mUnk_10 = &data_ov031_02118ac8[0]; + + this->mUnk_60.x = this->mPos.x; + this->mUnk_60.z = this->mPos.z; + this->mUnk_60.y = this->mUnk_4C + this->mUnk_40[1].mUnk_02; + + this->mUnk_50.mUnk_0C = &data_ov031_02118aec; + this->mState = MapObjectUnkSANDState_1; + } + } else { + for (s32 var_r1_2 = 0; var_r1_2 < ARRAY_LEN(this->mUnk_40); var_r1_2++) { + if (this->mUnk_40[var_r1_2].mUnk_00 != 0) { + this->mPos.y = this->mUnk_4C + this->mUnk_40[var_r1_2].mUnk_02; + this->mUnk_10 = &data_ov031_02118ac8[var_r1_2]; + } + } + } + + if (temp_r0_3 != this->mState) { + if (this->mState == MapObjectUnkSANDState_1) { + data_027e09c0->func_ov000_0207e240(&this->mUnk_50); + } else { + data_027e09c0->func_ov000_0207e254(&this->mUnk_50); + } + } +} + +void MapObjectUnkSAND::vfunc_0C() { + if (data_ov031_02115fe0 >= 0 && data_027e09b8->func_ov000_020732ec(data_ov031_02115fe0) != 0) { + this->vfunc_08(); + } +} + +void MapObjectUnkSAND::vfunc_14() { + VecFx32 sp4 = this->mPos; + Vec2bCpp sp0 = this->mUnk_3A; + + for (int var_r7 = 0; var_r7 < ARRAY_LEN(this->mUnk_40); var_r7++) { + if (this->mUnk_40[var_r7].mUnk_00 != 0) { + sp4.y = this->mUnk_4C + this->mUnk_40[var_r7].mUnk_02; + this->mUnk_40[var_r7].func_ov102_021837a8(sp0, &sp4); + } + + sp0.x++; + sp4.x += 0x1000; + } +} diff --git a/src/102_CourseExecLand/UnkStruct_027e0cd8_0C_102.cpp b/src/102_CourseExecLand/UnkStruct_027e0cd8_0C_102.cpp new file mode 100644 index 00000000..6c211971 --- /dev/null +++ b/src/102_CourseExecLand/UnkStruct_027e0cd8_0C_102.cpp @@ -0,0 +1,21 @@ +#include "Render/ModelRender.hpp" +#include "Unknown/UnkStruct_027e09c0.hpp" +#include "Unknown/UnkStruct_027e0cd8.hpp" + +void UnkStruct_027e0cd8_0C::vfunc_0C() { + this->UnkStruct_027e0cd8_0C_Base::vfunc_0C(); + + for (int var_r7 = 0; var_r7 < this->mUnk_1D4; var_r7++) { + for (int var_r8 = 0; var_r8 < ARRAY_LEN(this->mUnk_170[0]); var_r8++) { + if (this->mUnk_170[var_r7][var_r8] != NULL) { + this->mUnk_170[var_r7][var_r8]->mUnk_00.func_01ffc3b4(); + } + } + } +} + +void UnkStruct_027e0cd8_0C::func_ov102_02184628() { + if (this->mUnk_110 == 7) { + this->mUnk_098->func_ov047_0213055c(); + } +} diff --git a/src/102_CourseExecLand/UnkStruct_027e0ce0_40_102.cpp b/src/102_CourseExecLand/UnkStruct_027e0ce0_40_102.cpp new file mode 100644 index 00000000..44b291f9 --- /dev/null +++ b/src/102_CourseExecLand/UnkStruct_027e0ce0_40_102.cpp @@ -0,0 +1,423 @@ +#include "Actor/ActorManager.hpp" +#include "Actor/ActorUnkIWTS.hpp" +#include "Player/PlayerActorBase.hpp" +#include "Unknown/UnkStruct_027e0954.hpp" +#include "Unknown/UnkStruct_027e09b8.hpp" +#include "Unknown/UnkStruct_027e09bc.hpp" +#include "Unknown/UnkStruct_027e09c0.hpp" +#include "Unknown/UnkStruct_027e0cd8.hpp" +#include "Unknown/UnkStruct_027e0cec.hpp" +#include "Unknown/UnkStruct_ov000_020b51b8.hpp" +#include "Unknown/UnkStruct_ov000_020b5214.hpp" + +extern "C" void func_01ffaf74(VecFx32 *, Mat4x3p *, VecFx32 *); +extern "C" unk32 func_01ffb6a8(unk32, unk32); +extern "C" void func_ov095_0217aa88(void *, unk16 *, unk32, UnkAngleStruct); +extern "C" void func_ov095_0217aaa8(void *, unk16 *, unk32); +extern "C" void func_ov031_020dcea4(void *, UnkStruct_027e0ce0_40_Base_78 *, UnkAngleStruct); +extern "C" void func_ov000_0205d65c(void *, VecFx32 *, VecFx32 *, UnkAngleStruct); +extern Vec2s data_ov031_02112b54; + +void PlayerActorBase_74::func_ov102_02182c20(unk32 param1, Mat4x3p *param2) { + this->mUnk_04[param1].x = this->mUnk_1C[param1].x; + this->mUnk_04[param1].y = this->mUnk_1C[param1].y; + this->mUnk_04[param1].z = this->mUnk_1C[param1].z; + + VecFx32 sp0; + VecFx32_Init(FLOAT_TO_FX32(0.15f), FLOAT_TO_FX32(0.05f), FLOAT_TO_FX32(0.0f), &sp0); + func_01ffaf74(&sp0, param2, &this->mUnk_1C[param1]); +} + +bool PlayerActorBase_74::UnknownInline1(u32 index, VecFx32 *pVec) { + s32 temp_r0_3; + s32 temp_r2_4; + s32 temp_r3_3; + + if (this->mUnk_1C[index].y <= this->mUnk_04[index].y) { + return false; + } + + temp_r0_3 = data_027e0cd8->mUnk_0C->vfunc_28(&this->mUnk_1C[index], 1, 0) + 0xF6; + + if (temp_r0_3 >= this->mUnk_1C[index].y + 0x800) { + return false; + } + + if (this->mUnk_04[index].y <= temp_r0_3 + 0xF6) { + pVec->x = this->mUnk_04[index].x; + pVec->y = this->mUnk_04[index].y; + pVec->z = this->mUnk_04[index].z; + + pVec->y = temp_r0_3; + + if (this->mUnk_1C[index].y > temp_r0_3 + 0xF6) { + return true; + } + + temp_r3_3 = this->mUnk_1C[index].x - this->mUnk_04[index].x; + temp_r2_4 = this->mUnk_1C[index].z - this->mUnk_04[index].z; + + if (ABS2(temp_r3_3) >= 0x7FFF || ABS2(temp_r2_4) >= 0x7FFF) { + return false; + } + + if (ROUND_FX32(temp_r3_3 * temp_r3_3) + ROUND_FX32(temp_r2_4 * temp_r2_4) > 0x45) { + return true; + } + } + + return false; +} + +void PlayerActorBase_74::func_ov102_02182c84(bool param1, unk32 param2, UnkAngleStruct param3, Mat4x3p *param4, + Mat4x3p *param5) { + func_ov102_02182c20(0, param4); + func_ov102_02182c20(1, param5); + + if (this->mUnk_00 != 0) { + this->mUnk_00--; + return; + } + + if (param1) { + for (u32 var_r7 = 0; var_r7 < ARRAY_LEN(this->mUnk_04); var_r7++) { + VecFx32 sp4; + if (this->UnknownInline1(var_r7, &sp4)) { + sp4.y += param2; + data_027e0cec->func_ov000_0209ff4c(0x85F, &sp4, param3, 1); + } + } + } +} + +void UnkStruct_027e0ce0_40_108::func_ov102_02182e54(unk32 param1, unk32 param2, unk32 param3) { + Vec2s sp6; + + if (!data_027e09bc->mUnk_04[param1]->func_01ffd43c(&sp6, param2, 1)) { + return; + } + + if (sp6.x < -24 || sp6.x >= 280) { + return; + } + + if (sp6.y < -24 || sp6.y >= 216) { + return; + } + + sp6.x -= data_ov031_02112b54.x / 2; + sp6.y -= data_ov031_02112b54.y / 2; + + if (this->mUnk_40 == &this->mUnk_10) { + data_027e0954->mUnk_00[1].mUnk_04.Prepend(this); + } + + if (this->UnknownInline1()) { + return; + } + + UnkStruct_027e0ce0_40_108_10 sp0; + UnkStruct_027e0ce0_40_108_10 *ptr = &sp0; + ptr->mUnk_00 = sp6; + ptr->mUnk_04 = param3; + + UnkStruct_027e0ce0_40_108_10 *temp_r3 = this->mUnk_40; + if (temp_r3 != NULL) { + temp_r3->mUnk_00 = ptr->mUnk_00; + temp_r3->mUnk_04 = ptr->mUnk_04; + } + + this->mUnk_40++; +} + +void UnkStruct_ItemManager_20::func_ov102_02182fa8(unk32 param1, unk32 param2) { + this->mUnk_00->func_ov031_020dbc80(param1, param2); + this->mUnk_04->func_ov031_020db4f0(param1, param2); + this->mUnk_08->func_ov031_020db704(param1, param2); + this->mUnk_0C->func_ov031_020db958(param1, param2); + this->mUnk_14.func_ov031_020db7f4(); +} + +void UnkStruct_ItemManager_20::func_ov102_02182ffc(unk32 param1) { + if (!data_027e09b8->func_01ffd420()) { + this->mUnk_04->func_ov031_020db528(param1); + } + + this->mUnk_0C->func_ov031_020dba3c(param1); +} + +void UnkStruct_027e0ce0_40::func_ov102_0218303c(unk32 param1, ItemManager *pItemMgr) { + s32 temp_r2; + bool var_r1; + UnkStruct_027e0ce0_40_150 *temp_r1; + + temp_r2 = this->func_ov017_020bcde8(param1, pItemMgr); + + if (pItemMgr != NULL) { + pItemMgr->func_ov017_020bd2a0(param1, temp_r2); + } + + temp_r1 = this->mUnk_150; + if (temp_r1 != NULL) { + temp_r1->mUnk_00 = false; + temp_r1->mUnk_01 = false; + } + + this->mPlayer.func_ov017_020bd788(param1); + + if (this->mUnk_328 != NULL) { + this->mUnk_328->func_ov093_0216d5b8(param1); + + UnkStruct_027e0ce0_40_328 *ptr = this->mUnk_328; + if (ptr->mUnk_0CC) { + this->func_ov093_02168220(); + this->mPlayer.func_ov093_0216ce24(&ptr->mUnk_0D0); + this->mUnk_328->func_ov093_0216f71c(&ptr->mUnk_0DC); + ptr->mUnk_0CC = false; + } + } + + var_r1 = false; + if (this->mUnk_14C != 0) { + var_r1 = this->mUnk_14C->func_ov092_021689e8(param1, this, &this->mPlayer, this->mUnk_328); + } + + if (var_r1) { + SET_FLAG2(this->mUnk_104, UnkFlags3_7); + } else { + UNSET_FLAG2(this->mUnk_104, UnkFlags3_7); + } + + if (this->mIsSceneTowerInsideStairs) { + data_ov000_020b51b8.func_ov000_0206bdd4(&this->mPlayer); + data_ov000_020b5214.func_ov000_0206ed1c(&this->mPlayer); + } + + if (this->mIsSceneTowerOutsideStairs) { + data_ov000_020b5214.func_ov000_0206edd8(&this->mPlayer); + } +} + +void UnkStruct_027e0ce0_40::func_ov102_02183180(unk32 param1, bool param2) { + this->mPlayer.func_ov017_020bdcf4(); + + if (this->mUnk_328 != NULL) { + this->mUnk_328->func_ov093_0216de30(param1, param2); + } +} + +void UnkStruct_027e0ce0_40::func_ov102_021831b4(unk32 param1) { + this->mUnk_07C.func_ov017_020be434(); + this->mPlayer.func_ov017_020bdd84(param1, 0); + + if (this->mUnk_328 != NULL) { + this->mUnk_328->func_ov093_0216dec8(param1); + } +} + +void UnkStruct_027e0ce0_40::func_ov102_021831f0(unk32 param1) { + this->mPlayer.func_ov017_020bdf48(param1, 1, 0, 0); + + if (this->mUnk_328 != NULL) { + this->mUnk_328->func_ov093_0216e1a4(param1); + } + + if (this->mUnk_14C != NULL) { + this->mUnk_14C->func_ov093_02168e24(param1); + } +} + +// https://decomp.me/scratch/d1Vky +void UnkStruct_027e0ce0_40_Base_74::func_ov102_0218323c(UnkStruct_027e0ce0_40_Base_14 *param1, s32 param2) { + s16 temp_r11; + s16 var_r3; + s32 temp_r10; + s32 var_r0_2; + s32 var_r1_3; + s32 var_r2; + s32 var_r2_2; + s32 var_r3_2; + s32 var_ip; + s32 var_lr; + s32 var_r5; + s32 var_r6; + s32 var_r7; + s32 temp_r8_2; + s16 temp_r8; + u32 var_r9; + Vec2s *ptr; + s16 y; + s16 x; + + if (param2 == 0 || param1->mUnk_40 <= 0 || this->mUnk_58 != -1) { + this->mUnk_00[this->mUnk_54] = 0x00; + + ptr = &this->mUnk_1C[this->mUnk_54]; + ptr->x = 0x80; + y = 0x60; + } else { + var_r3 = param1->mUnk_44 - param1->mUnk_42; + this->mUnk_00[this->mUnk_54] = CLAMP(var_r3, -0x2AAB, 0x2AAB); + + x = param1->mTouchControl.mTouchPosLast.x; + ptr = &this->mUnk_1C[this->mUnk_54]; + this->mUnk_1C[this->mUnk_54].x = x; + y = param1->mTouchControl.mTouchPosLast.y; + } + + ptr->y = y; + + this->mUnk_54 = func_01ffb6a8(this->mUnk_54 + 1, 0xE); + + var_r2 = 0; + for (u32 i = 0; i < ARRAY_LEN(this->mUnk_00); i++) { + var_r2 += this->mUnk_00[i]; + } + + if (var_r2 < -0xD555) { + var_r7 = 0x05; + } else if (var_r2 > 0xD555) { + var_r7 = 0x06; + } else { + var_r7 = -0xD555 >> 0x10; + goto do_set; + } + + var_r6 = 0x80; + var_r5 = 0x80; + var_lr = 0x60; + var_ip = 0x60; + var_r3_2 = 0xE0; + var_r2_2 = 0xE0; + var_r1_3 = 0x20; + var_r0_2 = 0x20; + + for (var_r9 = 0; var_r9 < ARRAY_LEN(this->mUnk_1C); var_r9++) { + temp_r8 = this->mUnk_1C[var_r9].x; + + if (temp_r8 < var_r6) { + var_r6 = temp_r8; + } else if (temp_r8 > var_r5) { + var_r5 = temp_r8; + } + + temp_r11 = this->mUnk_1C[var_r9].y; + if (temp_r11 < var_lr) { + var_lr = temp_r11; + } else if (temp_r11 > var_ip) { + var_ip = temp_r11; + } + + temp_r10 = temp_r8 + temp_r11; + temp_r8_2 = temp_r8 - temp_r11; + + if (temp_r10 < var_r3_2) { + var_r3_2 = temp_r10; + } else if (temp_r10 > var_r2_2) { + var_r2_2 = temp_r10; + } + + if (temp_r8_2 < var_r1_3) { + var_r1_3 = temp_r8_2; + } else if (temp_r8_2 > var_r0_2) { + var_r0_2 = temp_r8_2; + } + } + + if (var_r5 - var_r6 < 0x32 || var_ip - var_lr < 0x32 || var_r2_2 - var_r3_2 < 0x46 || var_r0_2 - var_r1_3 < 0x46) { + var_r7 = -1; + } + +do_set: + this->mUnk_58 = var_r7; +} + +static inline bool UnknownInline2(PlayerLinkActor_A0_1C *param2, VecFx32 *param4, UnkAngleStruct *param5) { + if (param2->mUnk_0C != 0) { + Actor *temp_r0_2 = gpActorManager->func_01fff3b4(param2->mUnk_0C); + + if (temp_r0_2 != NULL && temp_r0_2->GetActorId() == ActorId_IWTS) { + s16 sp0; + func_ov000_0205d65c(&sp0, param4, &((ActorUnkIWTS *) temp_r0_2)->mUnk_22F8, *param5); + param5->angle = sp0; + return true; + } + } + + return false; +} + +// https://decomp.me/scratch/jzXAd +void func_ov102_02183414(s16 *param1, PlayerLinkActor_A0_1C *param2, bool param3, VecFx32 *param4, UnkAngleStruct param5, + s32 param6) { + s16 sp6; + s16 sp4; + s16 sp2; + s16 var_r0_2; + s32 var_r1_3; + s32 var_r2; + s32 var_r3; + UnkStruct_027e0ce0_40_Base_78 *temp_r4; + u16 temp_r6; + u16 var_r0; + u16 *temp_r1; + u16 *temp_r1_2; + u16 *temp_r2; + bool var_r5; + + STACK_PAD(0x10); + + var_r5 = false; + + if (param3) { + if (param2->mUnk_00->Unk78HasValue()) { + if (!UnknownInline2(param2, param4, ¶m5)) { + temp_r4 = param2->mUnk_00->mUnk_078; + var_r5 = true; + var_r1_3 = 0; + + if (temp_r4 != NULL) { + temp_r6 = temp_r4->mUnk_00; + var_r2 = 0; + + var_r3 = 1; + if (temp_r6 != 0x100 && temp_r6 != 0x101) { + var_r3 = 0; + } + + if (var_r3 != 0) { + if (temp_r6 == 0x101) { + var_r0 = 0; + } else { + var_r0 = temp_r4->mUnk_02; + } + + if (var_r0 == 1) { + var_r2 = 1; + } + } + + if (var_r2 != 0) { + var_r1_3 = 1; + } + } + + if (var_r1_3 != 0) { + if (!param2->mUnk_06) { + func_ov095_0217aa88(&sp6, ¶m2->mUnk_04, param6, param5); + param5.angle = sp6; + } else { + func_ov095_0217aaa8(&sp4, ¶m2->mUnk_04, param6); + param5.angle = sp4; + } + } else { + func_ov031_020dcea4(&sp2, *(UnkStruct_027e0ce0_40_Base_78 **) ¶m2->mUnk_00->mUnk_078, param5); + param5.angle = sp2 + 0x4000; + } + } + } + } + + param2->mUnk_06 = var_r5; + *param1 = param5.angle_signed; +} diff --git a/src/110_PlayerGet/PlayerGet.cpp b/src/110_PlayerGet/PlayerGet.cpp index e86f8974..f92fe490 100644 --- a/src/110_PlayerGet/PlayerGet.cpp +++ b/src/110_PlayerGet/PlayerGet.cpp @@ -619,7 +619,7 @@ void PlayerGet::vfunc_0C(UnkStruct_PlayerGet_vfunc_0C_param1 *param1) { } } - UnkStruct_027e09bc_0C *uVar11 = data_027e09bc->mUnk_0C; + UnkStruct_027e09bc_0C *uVar11 = data_027e09bc->mUnk_04[2]; uVar11->func_ov000_0207834c(this->mUnk_34, func_ov000_02077590(4), 0); UnkStruct_PlayerGet_48 *pUnk_48 = this->mUnk_48; @@ -930,7 +930,7 @@ void PlayerGet::vfunc_10(unk32 param1, unk32 param2) { } if (!temp_r6) { - data_027e09bc->mUnk_0C->func_ov000_02078230(0); + data_027e09bc->mUnk_04[2]->func_ov000_02078230(0); } if (data_027e09b8->func_ov000_020732fc(this->mUnk_54.mUnk_08) != 0) { diff --git a/src/112_PlayerSceneChange/PlayerSceneChange.cpp b/src/112_PlayerSceneChange/PlayerSceneChange.cpp index 68d2cc46..319e97e4 100644 --- a/src/112_PlayerSceneChange/PlayerSceneChange.cpp +++ b/src/112_PlayerSceneChange/PlayerSceneChange.cpp @@ -6,6 +6,7 @@ #include "Unknown/UnkStruct_027e09b8.hpp" #include "Unknown/UnkStruct_027e0cd8.hpp" #include "Unknown/UnkStruct_027e0cdc.hpp" +#include "Unknown/UnkStruct_ov000_020b3000.hpp" #include "math.hpp" @@ -71,7 +72,6 @@ extern fx16 data_0203feb0[]; extern "C" void func_01ffb714(VecFx32 *, VecFx32 *, VecFx32 *); extern "C" void func_01ff9638(VecFx32 *, s16); extern "C" void func_01ff9770(VecFx32 *); -extern unk32 data_ov000_020b3000; extern "C" bool func_ov000_02080998(VecFx32 *); extern "C" void func_01ff930c(UnkStruct_ov000_0208f820_40 *, unk16, unk32); @@ -323,12 +323,7 @@ void PlayerSceneChange::vfunc_0C(UnkStruct_PlayerGet_vfunc_0C_param1 *param1) { } if ((this->mUnk_24->mUnk_104 & 0x10) || this->mUnk_28->pItemManager->GetTearsAmount() == MAX_TEARS_OF_LIGHT) { - struct { - unk32 actorId; - void *ptr; - } local_9c; - local_9c.ptr = &data_ov000_020b3000; - local_9c.actorId = ActorId_RPMT; + UnkStruct_ov000_020b3000 local_9c(ActorId_RPMT); Actor **ppAVar12 = gpActorManager->func_01fff350(&local_9c, gpActorManager->mActorTable); if (ppAVar12 == gpActorManager->mUnk_08) { diff --git a/tools/changes_fmt.py b/tools/changes_fmt.py new file mode 100755 index 00000000..153f40f6 --- /dev/null +++ b/tools/changes_fmt.py @@ -0,0 +1,162 @@ +#!/usr/bin/env python3 + +from argparse import ArgumentParser +import os +import json +from pathlib import Path +from typing import Optional, Tuple + +script_dir = os.path.dirname(os.path.realpath(__file__)) +root_dir = os.path.abspath(os.path.join(script_dir, "..")) + + +UNIT_KEYS_TO_DIFF = [ + "fuzzy_match_percent", + "matched_code_percent", + "matched_data_percent", + "complete_code_percent", + "complete_data_percent", +] + +FUNCTION_KEYS_TO_DIFF = [ + "fuzzy_match_percent", +] + +Change = Tuple[str, str, float, float] + + +def format_float(value: float) -> str: + if value < 100.0 and value > 99.99: + value = 99.99 + return "%6.2f" % value + + +def get_changes(changes_file: str) -> Tuple[list[Change], list[Change]]: + changes_file = os.path.relpath(changes_file, root_dir) + with open(changes_file, "r") as f: + changes_json = json.load(f) + + regressions = [] + progressions = [] + + def diff_key(object_name: Optional[str], object: dict, key: str): + from_value = object.get("from", {}).get(key, 0.0) + to_value = object.get("to", {}).get(key, 0.0) + key = key.removesuffix("_percent") + change = (object_name, key, from_value, to_value) + if from_value > to_value: + regressions.append(change) + elif to_value > from_value: + progressions.append(change) + + for key in UNIT_KEYS_TO_DIFF: + diff_key(None, changes_json, key) + + for unit in changes_json.get("units", []): + unit_name = unit["name"] + for key in UNIT_KEYS_TO_DIFF: + diff_key(unit_name, unit, key) + # Ignore sections + for func in unit.get("functions", []): + func_name = func["name"] + for key in FUNCTION_KEYS_TO_DIFF: + diff_key(func_name, func, key) + + return regressions, progressions + + +def generate_changes_plaintext(changes: list[Change]) -> str: + if len(changes) == 0: + return "" + + table_total_width = 136 + percents_max_len = 7 + 4 + 7 + key_max_len = max(len(key) for _, key, _, _ in changes) + name_max_len = max(len(name or "Total") for name, _, _, _ in changes) + max_width_for_name_col = table_total_width - 3 - key_max_len - 3 - percents_max_len + name_max_len = min(max_width_for_name_col, name_max_len) + + out_lines = [] + for name, key, from_value, to_value in changes: + if name is None: + name = "Total" + if len(name) > name_max_len: + name = name[: name_max_len - len("[...]")] + "[...]" + out_lines.append( + f"{name:>{name_max_len}} | {key:<{key_max_len}} | {format_float(from_value)}% -> {format_float(to_value)}%" + ) + + return "\n".join(out_lines) + + +def generate_changes_markdown(changes: list[Change], description: str) -> str: + if len(changes) == 0: + return "" + + out_lines = [] + name_max_len = 100 + + out_lines.append("
") + out_lines.append( + f"Detected {len(changes)} {description} compared to the base:" + ) + out_lines.append("") # Must include a blank line before a table + out_lines.append("| Name | Type | Before | After |") + out_lines.append("| ---- | ---- | ------ | ----- |") + + for name, key, from_value, to_value in changes: + if name is None: + name = "Total" + else: + if len(name) > name_max_len: + name = name[: name_max_len - len("...")] + "..." + name = f"`{name}`" # Surround with backticks + key = key.replace("_", " ").capitalize() + out_lines.append( + f"| {name} | {key} | {format_float(from_value)}% | {format_float(to_value)}% |" + ) + + out_lines.append("
") + + return "\n".join(out_lines) + + +def main(): + parser = ArgumentParser(description="Format objdiff-cli report changes.") + parser.add_argument( + "report_changes_file", + type=Path, + help="""path to the JSON file containing the changes, generated by objdiff-cli.""", + ) + parser.add_argument( + "-o", + "--output", + type=Path, + help="""Output file (prints to console if unspecified)""", + ) + parser.add_argument( + "--all", + action="store_true", + help="""Includes progressions as well.""", + ) + args = parser.parse_args() + + regressions, progressions = get_changes(args.report_changes_file) + + if args.output: + markdown_output = generate_changes_markdown(regressions, "regressions") + if args.all: + markdown_output += generate_changes_markdown(progressions, "progressions") + with open(args.output, "w", encoding="utf-8") as f: + f.write(markdown_output) + else: + if args.all: + changes = progressions + regressions + else: + changes = regressions + text_output = generate_changes_plaintext(changes) + print(text_output) + + +if __name__ == "__main__": + main() diff --git a/tools/configure.py b/tools/configure.py index 5709a9b6..fd4eedcc 100755 --- a/tools/configure.py +++ b/tools/configure.py @@ -1491,6 +1491,16 @@ config.libs = [ ], extra_cflags=["-thumb"], ), + GameLib( + "Overlay 102", + [ + Object("102_CourseExecLand/UnkStruct_027e0ce0_40_102.cpp"), + Object("102_CourseExecLand/MapObjectUnkSAND_102.cpp"), + Object("102_CourseExecLand/MapObjectUnkPTFL_102.cpp"), + Object("102_CourseExecLand/UnkStruct_027e0cd8_0C_102.cpp"), + Object("102_CourseExecLand/ActorUnkMLCK_102.cpp", extra_cflags=["-ipa off"]), # fixes data order + ] + ), GameLib( "Overlay 105", [ diff --git a/tools/project.py b/tools/project.py index 445cf7ab..a907b320 100644 --- a/tools/project.py +++ b/tools/project.py @@ -609,7 +609,7 @@ def add_mwcc_builds(cfg: ProjectConfig, version: str, objects: Dict[str, Object] def add_mwcc_build(cfg: ProjectConfig, version: str, n: ninja_syntax.Writer, source_file: Path, object: Object, mwcc_implicit: list[str]): src_obj_path = cfg.get_game_build(version) / source_file - cc_flags: list[str] = object.options["cflags"] or [] + object.options["extra_cflags"] or [] + cc_flags: list[str] = (object.options["cflags"] or []) + object.options["extra_cflags"] if "-lang=c++" not in cc_flags and is_cpp(source_file): cc_flags.append("-lang=c++") elif "-lang=c" not in cc_flags and is_c(source_file): @@ -813,6 +813,79 @@ def add_apply_build(cfg: ProjectConfig, version: str, n: ninja_syntax.Writer): n.newline() +def add_report_changes(cfg: ProjectConfig, version: str, n: ninja_syntax.Writer): + objdiffjson_path = cfg.get_game_build(version) / "objdiff.json" + report_baseline_path: Path = cfg.get_game_build(version) / "baseline.json" + report_changes_path: Path = cfg.get_game_build(version) / "report_changes.json" + regressions_md: Path = cfg.get_game_build(version) / "regressions.md" + changes_fmt: Path = cfg.tools_path / "changes_fmt.py" + + n.comment(f"[{version}]: Create a baseline progress report for later match regression testing") + + delink_files = cfg.delink_files(version) + all_sources = [str(cfg.objdiff_path)] + delink_files + cfg.source_object_files(version) + n.build( + inputs=[str(objdiffjson_path)], + implicit=all_sources, + rule="objdiff_report", + outputs=str(report_baseline_path), + variables={ + "dir": str(cfg.get_game_build(version)), + "filename": "baseline.json" + } + ) + n.build( + outputs=f"baseline_{version}", + rule="phony", + inputs=str(report_baseline_path), + ) + + n.comment(f"[{version}]: Check for any match regressions against the baseline") + n.comment(f"[{version}]: Will fail if no baseline has been created") + + n.rule( + name=f"report_changes_{version}", + command=f"{cfg.objdiff_path} report changes --format json-pretty {report_baseline_path} $in -o $out", + description="CHANGES", + ) + n.build( + outputs=str(report_changes_path), + rule=f"report_changes_{version}", + inputs=str(cfg.get_game_build(version) / "report.json"), + implicit=[str(cfg.objdiff_path)], + ) + n.rule( + name=f"changes_fmt_{version}", + command=f"$python {changes_fmt} $args $in", + description="CHANGESFMT", + ) + n.build( + outputs=f"changes_{version}", + rule=f"changes_fmt_{version}", + inputs=str(report_changes_path), + implicit=[str(changes_fmt)] + all_sources, + ) + n.build( + outputs=f"changes_all_{version}", + rule=f"changes_fmt_{version}", + inputs=str(report_changes_path), + implicit=[str(changes_fmt)] + all_sources, + variables={"args": "--all"}, + ) + n.rule( + name=f"changes_md_{version}", + command=f"$python {changes_fmt} $in -o $out", + description="CHANGESFMT $out", + ) + n.build( + outputs=str(regressions_md), + rule=f"changes_md_{version}", + inputs=str(report_changes_path), + implicit=[str(changes_fmt)] + all_sources, + ) + n.newline() + + def create_objdiff_fixup_config(cfg: ProjectConfig, objects: Dict[str, Object]): out_json = {} @@ -1269,6 +1342,8 @@ def process_project(cfg: ProjectConfig, args: Any): n.newline() cmds_map["format"].append(f"format_{version}") + add_report_changes(cfg, version, n) + defaults.extend([f"check_{version}", f"sha1_{version}"]) n.build(