diff --git a/config/eur/arm9/itcm/symbols.txt b/config/eur/arm9/itcm/symbols.txt index b5374378..2ec269eb 100644 --- a/config/eur/arm9/itcm/symbols.txt +++ b/config/eur/arm9/itcm/symbols.txt @@ -43,8 +43,8 @@ func_01ff9b1c kind:function(arm,size=0x14) addr:0x01ff9b1c func_01ff9b30 kind:function(arm,size=0x10) addr:0x01ff9b30 func_01ff9b40 kind:function(arm,size=0x10) addr:0x01ff9b40 _ZN18UnkStruct_0204a11013func_01ff9b50Ev kind:function(arm,size=0x14) addr:0x01ff9b50 -func_01ff9b64 kind:function(arm,size=0x14) addr:0x01ff9b64 -func_01ff9b78 kind:function(arm,size=0x18) addr:0x01ff9b78 +_ZN18UnkStruct_0204a11013func_01ff9b64Ev kind:function(arm,size=0x14) addr:0x01ff9b64 +_ZN18UnkStruct_0204a11013func_01ff9b78Ev kind:function(arm,size=0x18) addr:0x01ff9b78 func_01ff9b90 kind:function(arm,size=0x324) addr:0x01ff9b90 func_01ff9eb4 kind:function(arm,size=0x8) addr:0x01ff9eb4 func_01ff9ebc kind:function(arm,size=0x8) addr:0x01ff9ebc @@ -157,10 +157,10 @@ _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 -_ZN21UnkStruct_027e09bc_0C13func_01ffd43cEP5Vec2sii kind:function(arm,size=0x60) addr:0x01ffd43c +_ZN21UnkStruct_027e09bc_0C13func_01ffd43cEP5Vec2sP7VecFx32i 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 +_ZN21UnkStruct_027e09bc_0C13func_01ffd768EPvP5Vec2sc kind:function(arm,size=0x138) addr:0x01ffd768 func_01ffd8a0 kind:function(arm,size=0x190) addr:0x01ffd8a0 func_01ffda30 kind:function(arm,size=0x2ec) addr:0x01ffda30 func_01ffdd1c kind:function(arm,size=0x14c) addr:0x01ffdd1c @@ -198,7 +198,7 @@ func_01fff254 kind:function(arm,size=0x2c) addr:0x01fff254 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_01fff2fcEPFvP5ActorP14Actor_vfunc_30EPv kind:function(arm,size=0x54) addr:0x01fff2fc _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 @@ -209,8 +209,8 @@ _ZN16MapObjectManager13func_01fff4ccEPFvPvS0_ES0_ kind:function(arm,size=0x54) a _ZN16MapObjectManager13func_01fff520EP24UnkStruct_ov000_020b34c4PP9MapObject kind:function(arm,size=0x64) addr:0x01fff520 _ZN9MapObject14GetMapObjectIdEv kind:function(arm,size=0xc) addr:0x01fff584 _ZN9MapObject13func_01fff590Ei kind:function(arm,size=0x40) addr:0x01fff590 -_ZN5Actor13func_01fff5d0Eii kind:function(arm,size=0x3c) addr:0x01fff5d0 -_ZN18UnkStruct_027e09b413func_01fff60cEP7VecFx32iihii kind:function(arm,size=0x8c) addr:0x01fff60c +_ZN5Actor13func_01fff5d0EP14Actor_vfunc_30i kind:function(arm,size=0x3c) addr:0x01fff5d0 +_ZN18UnkStruct_027e09b413func_01fff60cEP7VecFx32iiiii kind:function(arm,size=0x8c) addr:0x01fff60c func_01fff698 kind:function(arm,size=0x38) addr:0x01fff698 func_01fff6d0 kind:function(arm,size=0x74) addr:0x01fff6d0 func_01fff744 kind:function(arm,size=0x20) addr:0x01fff744 diff --git a/config/eur/arm9/overlays/ov000/relocs.txt b/config/eur/arm9/overlays/ov000/relocs.txt index 6bb51275..b4e838c7 100644 --- a/config/eur/arm9/overlays/ov000/relocs.txt +++ b/config/eur/arm9/overlays/ov000/relocs.txt @@ -5622,7 +5622,7 @@ from:0x0208ead8 kind:load to:0x027e0ce0 module:dtcm from:0x0208eaf4 kind:thumb_call to:0x0208ed64 module:overlay(0) from:0x0208eb0a kind:thumb_call to:0x0208e9f4 module:overlay(0) from:0x0208eb20 kind:thumb_call to:0x0208ed30 module:overlay(0) -from:0x0208eb28 kind:thumb_call_arm to:0x020ea868 module:overlays(21,31) +from:0x0208eb28 kind:thumb_call_arm to:0x020ea868 module:overlay(21) from:0x0208eb34 kind:thumb_call to:0x0208ed30 module:overlay(0) from:0x0208eb3c kind:load to:0x027e0ce0 module:dtcm from:0x0208eb40 kind:load to:0x020ab4dc module:overlay(0) diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index e1298428..f7d76cf9 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -123,7 +123,7 @@ _ZN15ModelRenderBase19func_ov000_02057f40EPKv kind:function(arm,size=0x34) addr: func_ov000_02057f74 kind:function(arm,size=0x24) addr:0x02057f74 func_ov000_02057f98 kind:function(arm,size=0x28) addr:0x02057f98 func_ov000_02057fc0 kind:function(arm,size=0x28) addr:0x02057fc0 -func_ov000_02057fe8 kind:function(arm,size=0x50) addr:0x02057fe8 +_ZN20ModelRender_Derived419func_ov000_02057fe8E14UnkAngleStructS0_P7VecFx32 kind:function(arm,size=0x50) addr:0x02057fe8 func_ov000_02058038 kind:function(arm,size=0x28) addr:0x02058038 func_ov000_02058060 kind:function(arm,size=0x20) addr:0x02058060 func_ov000_02058080 kind:function(arm,size=0x20) addr:0x02058080 @@ -323,7 +323,7 @@ func_ov000_0205c4a8 kind:function(arm,size=0xdc) addr:0x0205c4a8 func_ov000_0205c584 kind:function(thumb,size=0x1a) addr:0x0205c584 func_ov000_0205c5a0 kind:function(arm,size=0x18) addr:0x0205c5a0 func_ov000_0205c5b8 kind:function(arm,size=0x18) addr:0x0205c5b8 -func_ov000_0205c5d0 kind:function(arm,size=0xd4) addr:0x0205c5d0 +_ZN18PlayerActorBase_7819func_ov000_0205c5d0EiP15PlayerActorBase kind:function(arm,size=0xd4) addr:0x0205c5d0 func_ov000_0205c6a4 kind:function(arm,size=0x2c) addr:0x0205c6a4 func_ov000_0205c6d0 kind:function(arm,size=0x34) addr:0x0205c6d0 func_ov000_0205c704 kind:function(arm,size=0x48) addr:0x0205c704 @@ -486,7 +486,7 @@ _ZN23UnkStruct_027e0998_Base19func_ov000_02061768Ev kind:function(arm,size=0x4) func_ov000_0206176c kind:function(thumb,size=0xbc) addr:0x0206176c func_ov000_02061828 kind:function(thumb,size=0x28) addr:0x02061828 _ZN23UnkStruct_027e0998_Base19func_ov000_02061850Ei kind:function(arm,size=0x18) addr:0x02061850 -_ZN23UnkStruct_027e0998_Base8vfunc_00EP7VecFx32P5Vec2sPt kind:function(arm,size=0x1e0) addr:0x02061868 +_ZN23UnkStruct_027e0998_Base8vfunc_00EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x1e0) addr:0x02061868 _ZN23UnkStruct_027e0998_Base19func_ov000_02061a48EP7VecFx32P5Vec2sS3_ kind:function(arm,size=0x28) addr:0x02061a48 _ZN23UnkStruct_027e0998_Base19func_ov000_02061a70Ev kind:function(arm,size=0xc) addr:0x02061a70 func_ov000_02061a7c kind:function(arm,size=0x10) addr:0x02061a7c @@ -1075,10 +1075,10 @@ func_ov000_02071f88 kind:function(arm,size=0x10) addr:0x02071f88 _ZN21UnkStruct_027e09ac_1419func_ov000_02071f98Ev kind:function(arm,size=0x13c) addr:0x02071f98 func_ov000_020720d4 kind:function(arm,size=0x270) addr:0x020720d4 func_ov000_02072344 kind:function(arm,size=0xb0) addr:0x02072344 -func_ov000_020723f4 kind:function(arm,size=0x78) addr:0x020723f4 +_ZN18UnkStruct_027e09ac19func_ov000_020723f4Ev kind:function(arm,size=0x78) addr:0x020723f4 func_ov000_0207246c kind:function(arm,size=0x204) addr:0x0207246c func_ov000_02072670 kind:function(arm,size=0x14) addr:0x02072670 -func_ov000_02072684 kind:function(arm,size=0x18) addr:0x02072684 +_ZN18UnkStruct_027e09ac19func_ov000_02072684EPv kind:function(arm,size=0x18) addr:0x02072684 func_ov000_0207269c kind:function(arm,size=0x54) addr:0x0207269c _ZN18UnkStruct_027e09ac19func_ov000_020726f0Etii kind:function(arm,size=0x2d4) addr:0x020726f0 _ZN18UnkStruct_027e09ac19func_ov000_020729c4EP21UnkStruct_027e09ac_14ttss kind:function(arm,size=0x88) addr:0x020729c4 @@ -1128,7 +1128,7 @@ _ZN18UnkStruct_027e09b819func_ov000_020732dcEi kind:function(arm,size=0x10) addr _ZN18UnkStruct_027e09b819func_ov000_020732ecEi kind:function(arm,size=0x10) addr:0x020732ec _ZN18UnkStruct_027e09b819func_ov000_020732fcEi kind:function(arm,size=0x10) addr:0x020732fc _ZN18UnkStruct_027e09b819func_ov000_0207330cEv kind:function(arm,size=0x20) addr:0x0207330c -func_ov000_0207332c kind:function(arm,size=0x5c) addr:0x0207332c +_ZN18UnkStruct_027e09b819func_ov000_0207332cEv kind:function(arm,size=0x5c) addr:0x0207332c _ZN18UnkStruct_027e09b819func_ov000_02073388EPvi kind:function(arm,size=0xe8) addr:0x02073388 _ZN18UnkStruct_027e09b819func_ov000_02073470EPvi kind:function(arm,size=0x108) addr:0x02073470 _ZN18UnkStruct_027e09b819func_ov000_02073578EPvi kind:function(arm,size=0x98) addr:0x02073578 @@ -1212,11 +1212,11 @@ func_ov000_020762c4 kind:function(arm,size=0x20) addr:0x020762c4 func_ov000_020762e4 kind:function(arm,size=0x1dc) addr:0x020762e4 func_ov000_020764c0 kind:function(arm,size=0x1d4) addr:0x020764c0 func_ov000_02076694 kind:function(arm,size=0x120) addr:0x02076694 -func_ov000_020767b4 kind:function(arm,size=0x34c) addr:0x020767b4 +_ZN21UnkStruct_027e09bc_0C19func_ov000_020767b4EP7VecFx32P5Vec2siiS1_ kind:function(arm,size=0x34c) addr:0x020767b4 func_ov000_02076b00 kind:function(arm,size=0x254) addr:0x02076b00 func_ov000_02076d54 kind:function(arm,size=0x1fc) addr:0x02076d54 func_ov000_02076f50 kind:function(arm,size=0x58) addr:0x02076f50 -func_ov000_02076fa8 kind:function(arm,size=0xa0) addr:0x02076fa8 +_ZN21UnkStruct_027e09bc_0C19func_ov000_02076fa8EPvS0_ii kind:function(arm,size=0xa0) addr:0x02076fa8 func_ov000_02077048 kind:function(arm,size=0x114) addr:0x02077048 _ZN21UnkStruct_027e09bc_24C1Ev kind:function(arm,size=0x2c) addr:0x0207715c func_ov000_02077188 kind:function(arm,size=0x14) addr:0x02077188 @@ -1225,7 +1225,7 @@ _ZN18UnkStruct_027e09bc19func_ov000_020771b8Ei kind:function(arm,size=0x10) addr _ZN18UnkStruct_027e09bc19func_ov000_020771c8Ev kind:function(arm,size=0x188) addr:0x020771c8 func_ov000_02077350 kind:function(arm,size=0xf4) addr:0x02077350 func_ov000_02077444 kind:function(arm,size=0x24) addr:0x02077444 -func_ov000_02077468 kind:function(arm,size=0x18) addr:0x02077468 +_ZN18UnkStruct_027e09bc19func_ov000_02077468Eii kind:function(arm,size=0x18) addr:0x02077468 func_ov000_02077480 kind:function(arm,size=0x10) addr:0x02077480 _ZN19func_ov000_02077490D1Ev kind:function(arm,size=0x14) addr:0x02077490 _ZN19func_ov000_020774a4D0Ev kind:function(arm,size=0x1c) addr:0x020774a4 @@ -1253,7 +1253,7 @@ func_ov000_020781d4 kind:function(arm,size=0x14) addr:0x020781d4 func_ov000_020781e8 kind:function(arm,size=0x48) addr:0x020781e8 _ZN21UnkStruct_027e09bc_0C19func_ov000_02078230Ei kind:function(arm,size=0xe4) addr:0x02078230 func_ov000_02078314 kind:function(arm,size=0x38) addr:0x02078314 -_ZN21UnkStruct_027e09bc_0C19func_ov000_0207834cEP7VecFx32ii kind:function(arm,size=0x40) addr:0x0207834c +_ZN21UnkStruct_027e09bc_0C19func_ov000_0207834cEP7VecFx32P29UnkStackStruct_ov000_02077590i kind:function(arm,size=0x40) addr:0x0207834c func_ov000_0207838c kind:function(arm,size=0x70) addr:0x0207838c func_ov000_020783fc kind:function(arm,size=0x88) addr:0x020783fc func_ov000_02078484 kind:function(arm,size=0x40) addr:0x02078484 @@ -1264,7 +1264,7 @@ func_ov000_02078594 kind:function(arm,size=0x40) addr:0x02078594 func_ov000_020785d4 kind:function(arm,size=0xac) addr:0x020785d4 func_ov000_02078680 kind:function(arm,size=0xc) addr:0x02078680 func_ov000_0207868c kind:function(arm,size=0xc) addr:0x0207868c -func_ov000_02078698 kind:function(arm,size=0xc) addr:0x02078698 +_ZN21UnkStruct_027e09bc_0C19func_ov000_02078698Ev kind:function(arm,size=0xc) addr:0x02078698 func_ov000_020786a4 kind:function(arm,size=0x38) addr:0x020786a4 func_ov000_020786dc kind:function(arm,size=0x2c) addr:0x020786dc func_ov000_02078708 kind:function(arm,size=0x24) addr:0x02078708 @@ -1625,13 +1625,13 @@ _ZN21UnkStruct_027e0cd8_0419func_ov000_020819a4EPK29UnkStruct_func_ov000_020702a func_ov000_02081b24 kind:function(arm,size=0x44) addr:0x02081b24 func_ov000_02081b68 kind:function(arm,size=0xc) addr:0x02081b68 func_ov000_02081b74 kind:function(arm,size=0x10) addr:0x02081b74 -func_ov000_02081b84 kind:function(arm,size=0x18) addr:0x02081b84 -func_ov000_02081b9c kind:function(arm,size=0x58) addr:0x02081b9c -func_ov000_02081bf4 kind:function(arm,size=0x34) addr:0x02081bf4 +_ZN18UnkStruct_027e0cd819func_ov000_02081b84Ev kind:function(arm,size=0x18) addr:0x02081b84 +_ZN18UnkStruct_027e0cd819func_ov000_02081b9cEi kind:function(arm,size=0x58) addr:0x02081b9c +_ZN18UnkStruct_027e0cd819func_ov000_02081bf4Ev kind:function(arm,size=0x34) addr:0x02081bf4 _ZN18UnkStruct_027e0cd819func_ov000_02081c28Ev kind:function(arm,size=0x78) addr:0x02081c28 _ZN18UnkStruct_027e0cd819func_ov000_02081ca0Ev kind:function(arm,size=0xa8) addr:0x02081ca0 func_ov000_02081d48 kind:function(arm,size=0x10) addr:0x02081d48 -func_ov000_02081d58 kind:function(arm,size=0x4) addr:0x02081d58 +_ZN18UnkStruct_027e0cd819func_ov000_02081d58Ev kind:function(arm,size=0x4) addr:0x02081d58 _ZN18UnkStruct_027e0cd819func_ov000_02081d5cEv kind:function(arm,size=0x20) addr:0x02081d5c _ZN18UnkStruct_027e0cd819func_ov000_02081d7cEiib kind:function(arm,size=0xb4) addr:0x02081d7c _ZN18UnkStruct_027e0cd819func_ov000_02081e30Eii kind:function(arm,size=0x8c) addr:0x02081e30 @@ -1686,10 +1686,10 @@ func_ov000_02082c58 kind:function(arm,size=0x188) addr:0x02082c58 func_ov000_02082de0 kind:function(arm,size=0xc) addr:0x02082de0 func_ov000_02082dec kind:function(arm,size=0xc) addr:0x02082dec func_ov000_02082df8 kind:function(thumb,size=0x5a) addr:0x02082df8 -func_ov000_02082e54 kind:function(arm,size=0x24) addr:0x02082e54 +_ZN18PlayerActorBase_7019func_ov000_02082e54Ev kind:function(arm,size=0x24) addr:0x02082e54 _ZN18PlayerActorBase_7019func_ov000_02082e78Eiiii kind:function(arm,size=0x22c) addr:0x02082e78 -func_ov000_020830a4 kind:function(arm,size=0x30) addr:0x020830a4 -_ZN18PlayerActorBase_7019func_ov000_020830d4E14UnkAngleStructjhi kind:function(arm,size=0x334) addr:0x020830d4 +_ZN18PlayerActorBase_7019func_ov000_020830a4Eiiiii kind:function(arm,size=0x30) addr:0x020830a4 +_ZN18PlayerActorBase_7019func_ov000_020830d4E14UnkAngleStructjhP21PlayerLinkActor_A0_28 kind:function(arm,size=0x334) addr:0x020830d4 _ZN21PlayerActorBase_70_6CC1EiPvP10G3d_Model_ kind:function(thumb,size=0x44) addr:0x02083408 _ZN21PlayerActorBase_70_6CD1Ev kind:function(thumb,size=0x2) addr:0x0208344c func_ov000_02083450 kind:function(arm,size=0xc) addr:0x02083450 @@ -1732,15 +1732,15 @@ func_ov000_0208475c kind:function(arm,size=0x194) addr:0x0208475c func_ov000_020848f0 kind:function(arm,size=0x54) addr:0x020848f0 func_ov000_02084944 kind:function(arm,size=0x68) addr:0x02084944 func_ov000_020849ac kind:function(arm,size=0x24) addr:0x020849ac -func_ov000_020849d0 kind:function(arm,size=0xf8) addr:0x020849d0 -func_ov000_02084ac8 kind:function(arm,size=0x174) addr:0x02084ac8 -func_ov000_02084c3c kind:function(arm,size=0x21c) addr:0x02084c3c -func_ov000_02084e58 kind:function(arm,size=0x408) addr:0x02084e58 +_ZN18PlayerLinkActor_9C19func_ov000_020849d0EP7VecFx32S1_ kind:function(arm,size=0xf8) addr:0x020849d0 +_ZN18PlayerLinkActor_9C19func_ov000_02084ac8EiP7VecFx32S1_S1_ kind:function(arm,size=0x174) addr:0x02084ac8 +_ZN18PlayerLinkActor_9C19func_ov000_02084c3cEiiP7VecFx32S1_ kind:function(arm,size=0x21c) addr:0x02084c3c +_ZN18PlayerLinkActor_9C19func_ov000_02084e58EihP7VecFx32S1_S1_S1_i kind:function(arm,size=0x408) addr:0x02084e58 func_ov000_02085260 kind:function(arm,size=0x14) addr:0x02085260 -func_ov000_02085274 kind:function(arm,size=0x304) addr:0x02085274 -func_ov000_02085578 kind:function(arm,size=0x1a0) addr:0x02085578 -func_ov000_02085718 kind:function(arm,size=0x128) addr:0x02085718 -func_ov000_02085840 kind:function(arm,size=0x184) addr:0x02085840 +_ZN18PlayerLinkActor_9C19func_ov000_02085274EiiiP7VecFx32S1_S1_ kind:function(arm,size=0x304) addr:0x02085274 +_ZN18PlayerLinkActor_9C19func_ov000_02085578EiiiiP7VecFx32 kind:function(arm,size=0x1a0) addr:0x02085578 +_ZN18PlayerLinkActor_9C19func_ov000_02085718EP7VecFx32 kind:function(arm,size=0x128) addr:0x02085718 +_ZN18PlayerLinkActor_9C19func_ov000_02085840EP7VecFx32S1_S1_ kind:function(arm,size=0x184) addr:0x02085840 func_ov000_020859c4 kind:function(arm,size=0x34) addr:0x020859c4 func_ov000_020859f8 kind:function(arm,size=0x30) addr:0x020859f8 func_ov000_02085a28 kind:function(arm,size=0x20) addr:0x02085a28 @@ -1763,8 +1763,8 @@ func_ov000_02086404 kind:function(arm,size=0xf4) addr:0x02086404 func_ov000_020864f8 kind:function(arm,size=0x114) addr:0x020864f8 _ZN18PlayerLinkActor_9CC1EP21UnkStruct_027e0ce0_40ji kind:function(thumb,size=0xf8) addr:0x0208660c func_ov000_02086704 kind:function(thumb,size=0x54) addr:0x02086704 -func_ov000_02086758 kind:function(arm,size=0x9c) addr:0x02086758 -func_ov000_020867f4 kind:function(arm,size=0x3c) addr:0x020867f4 +_ZN18PlayerLinkActor_9C19func_ov000_02086758Ev kind:function(arm,size=0x9c) addr:0x02086758 +_ZN18PlayerLinkActor_9C19func_ov000_020867f4Ev kind:function(arm,size=0x3c) addr:0x020867f4 func_ov000_02086830 kind:function(arm,size=0x74) addr:0x02086830 func_ov000_020868a4 kind:function(arm,size=0x58) addr:0x020868a4 func_ov000_020868fc kind:function(arm,size=0x104) addr:0x020868fc @@ -1853,7 +1853,7 @@ func_ov000_02089910 kind:function(arm,size=0x2c) addr:0x02089910 func_ov000_0208993c kind:function(arm,size=0x4c) addr:0x0208993c _ZN18PlayerLinkActor_A4C1EP15PlayerActorBaseP18PlayerLinkActor_A0 kind:function(thumb,size=0xa) addr:0x02089988 _ZN18PlayerLinkActor_A4D1Ev kind:function(thumb,size=0x2) addr:0x02089994 -func_ov000_02089998 kind:function(arm,size=0x184) addr:0x02089998 +_ZN18PlayerLinkActor_A419func_ov000_02089998Eb kind:function(arm,size=0x184) addr:0x02089998 func_ov000_02089b1c kind:function(arm,size=0x3c) addr:0x02089b1c func_ov000_02089b58 kind:function(arm,size=0x64) addr:0x02089b58 func_ov000_02089bbc kind:function(arm,size=0x64) addr:0x02089bbc @@ -1863,7 +1863,7 @@ _ZN18PlayerActorBase_5C19func_ov000_02089dc4Ev kind:function(arm,size=0x28) addr func_ov000_02089dec kind:function(arm,size=0x68) addr:0x02089dec func_ov000_02089e54 kind:function(arm,size=0x88) addr:0x02089e54 func_ov000_02089edc kind:function(arm,size=0x30) addr:0x02089edc -func_ov000_02089f0c kind:function(arm,size=0x40) addr:0x02089f0c +_ZN18PlayerActorBase_5C19func_ov000_02089f0cEb kind:function(arm,size=0x40) addr:0x02089f0c func_ov000_02089f4c kind:function(arm,size=0x28) addr:0x02089f4c func_ov000_02089f74 kind:function(arm,size=0x24) addr:0x02089f74 func_ov000_02089f98 kind:function(arm,size=0x18) addr:0x02089f98 @@ -1930,10 +1930,10 @@ func_ov000_0208bbb4 kind:function(arm,size=0x10) addr:0x0208bbb4 func_ov000_0208bbc4 kind:function(arm,size=0x10) addr:0x0208bbc4 func_ov000_0208bbd4 kind:function(arm,size=0x2c) addr:0x0208bbd4 func_ov000_0208bc00 kind:function(arm,size=0x1c) addr:0x0208bc00 -_ZN18UnkStruct_027e0ce019func_ov000_0208bc1cEiiiiii kind:function(arm,size=0x40) addr:0x0208bc1c +_ZN18UnkStruct_027e0ce019func_ov000_0208bc1cEiiiiPvi kind:function(arm,size=0x40) addr:0x0208bc1c func_ov000_0208bc5c kind:function(arm,size=0x40) addr:0x0208bc5c _ZN18UnkStruct_027e0ce019func_ov000_0208bc9cEii kind:function(arm,size=0x84) addr:0x0208bc9c -func_ov000_0208bd20 kind:function(arm,size=0x10) addr:0x0208bd20 +_ZN18UnkStruct_027e0ce019func_ov000_0208bd20Ebii kind:function(arm,size=0x10) addr:0x0208bd20 _ZN18UnkStruct_027e0ce019func_ov000_0208bd30Ebiii kind:function(arm,size=0x18) addr:0x0208bd30 func_ov000_0208bd48 kind:function(arm,size=0x34) addr:0x0208bd48 func_ov000_0208bd7c kind:function(arm,size=0x10) addr:0x0208bd7c @@ -1943,7 +1943,7 @@ func_ov000_0208bdb4 kind:function(arm,size=0x20) addr:0x0208bdb4 func_ov000_0208bdd4 kind:function(arm,size=0x10) addr:0x0208bdd4 func_ov000_0208bde4 kind:function(arm,size=0x18) addr:0x0208bde4 func_ov000_0208bdfc kind:function(arm,size=0x10) addr:0x0208bdfc -func_ov000_0208be0c kind:function(arm,size=0x3c) addr:0x0208be0c +_ZN18UnkStruct_027e0ce019func_ov000_0208be0cE8ActorRef kind:function(arm,size=0x3c) addr:0x0208be0c func_ov000_0208be48 kind:function(arm,size=0x28) addr:0x0208be48 func_ov000_0208be70 kind:function(arm,size=0x2c) addr:0x0208be70 func_ov000_0208be9c kind:function(arm,size=0x2c) addr:0x0208be9c @@ -1974,7 +1974,7 @@ func_ov000_0208c6d4 kind:function(arm,size=0x50) addr:0x0208c6d4 func_ov000_0208c724 kind:function(arm,size=0x68) addr:0x0208c724 _ZN21PlayerActorBase_70_1CC1EP18PlayerActorBase_70 kind:function(thumb,size=0x24) addr:0x0208c78c func_ov000_0208c7b0 kind:function(arm,size=0x40) addr:0x0208c7b0 -func_ov000_0208c7f0 kind:function(arm,size=0x1c) addr:0x0208c7f0 +_ZN21PlayerActorBase_70_1C19func_ov000_0208c7f0Ev kind:function(arm,size=0x1c) addr:0x0208c7f0 func_ov000_0208c80c kind:function(arm,size=0x68) addr:0x0208c80c _ZN21PlayerActorBase_70_E4C1Ev kind:function(thumb,size=0x18) addr:0x0208c874 func_ov000_0208c88c kind:function(arm,size=0x6c) addr:0x0208c88c @@ -1986,10 +1986,10 @@ func_ov000_0208ca08 kind:function(arm,size=0xc0) addr:0x0208ca08 func_ov000_0208cac8 kind:function(arm,size=0x40) addr:0x0208cac8 func_ov000_0208cb08 kind:function(arm,size=0xc4) addr:0x0208cb08 func_ov000_0208cbcc kind:function(arm,size=0x24) addr:0x0208cbcc -func_ov000_0208cbf0 kind:function(arm,size=0x30) addr:0x0208cbf0 -func_ov000_0208cc20 kind:function(arm,size=0x38) addr:0x0208cc20 +_ZN15PlayerActorBase19func_ov000_0208cbf0Ev kind:function(arm,size=0x30) addr:0x0208cbf0 +_ZN15PlayerActorBase19func_ov000_0208cc20EP7VecFx32 kind:function(arm,size=0x38) addr:0x0208cc20 func_ov000_0208cc58 kind:function(arm,size=0x38) addr:0x0208cc58 -func_ov000_0208cc90 kind:function(arm,size=0x4c) addr:0x0208cc90 +_ZN15PlayerActorBase19func_ov000_0208cc90Ev kind:function(arm,size=0x4c) addr:0x0208cc90 func_ov000_0208ccdc kind:function(arm,size=0x4c) addr:0x0208ccdc func_ov000_0208cd28 kind:function(arm,size=0x78) addr:0x0208cd28 func_ov000_0208cda0 kind:function(arm,size=0x68) addr:0x0208cda0 @@ -2001,19 +2001,19 @@ func_ov000_0208d12c kind:function(arm,size=0x50) addr:0x0208d12c func_ov000_0208d17c kind:function(arm,size=0x60) addr:0x0208d17c func_ov000_0208d1dc kind:function(arm,size=0x58) addr:0x0208d1dc func_ov000_0208d234 kind:function(arm,size=0x174) addr:0x0208d234 -func_ov000_0208d3a8 kind:function(arm,size=0x28) addr:0x0208d3a8 -func_ov000_0208d3d0 kind:function(arm,size=0x2c) addr:0x0208d3d0 +_ZN15PlayerActorBase19func_ov000_0208d3a8Ev kind:function(arm,size=0x28) addr:0x0208d3a8 +_ZN15PlayerActorBase19func_ov000_0208d3d0EP5Vec2siPv kind:function(arm,size=0x2c) addr:0x0208d3d0 _ZN15PlayerActorBase19func_ov000_0208d3fcEv kind:function(thumb,size=0x90) addr:0x0208d3fc func_ov000_0208d48c kind:function(arm,size=0x114) addr:0x0208d48c func_ov000_0208d5a0 kind:function(arm,size=0x6c) addr:0x0208d5a0 -func_ov000_0208d60c kind:function(arm,size=0x148) addr:0x0208d60c -func_ov000_0208d754 kind:function(arm,size=0x9c) addr:0x0208d754 +_ZN15PlayerActorBase19func_ov000_0208d60cEv kind:function(arm,size=0x148) addr:0x0208d60c +_ZN15PlayerActorBase19func_ov000_0208d754Ev kind:function(arm,size=0x9c) addr:0x0208d754 _ZN15PlayerActorBase19func_ov000_0208d7f0Eb kind:function(arm,size=0x100) addr:0x0208d7f0 func_ov000_0208d8f0 kind:function(arm,size=0x38) addr:0x0208d8f0 func_ov000_0208d928 kind:function(arm,size=0x18) addr:0x0208d928 func_ov000_0208d940 kind:function(arm,size=0x194) addr:0x0208d940 func_ov000_0208dad4 kind:function(arm,size=0x34) addr:0x0208dad4 -func_ov000_0208db08 kind:function(arm,size=0xd8) addr:0x0208db08 +_ZN15PlayerActorBase19func_ov000_0208db08Ev kind:function(arm,size=0xd8) addr:0x0208db08 func_ov000_0208dbe0 kind:function(arm,size=0xc) addr:0x0208dbe0 func_ov000_0208dbec kind:function(arm,size=0x18) addr:0x0208dbec func_ov000_0208dc04 kind:function(arm,size=0x1c) addr:0x0208dc04 @@ -2024,7 +2024,7 @@ func_ov000_0208dc58 kind:function(arm,size=0x10) addr:0x0208dc58 func_ov000_0208dc68 kind:function(arm,size=0x10) addr:0x0208dc68 func_ov000_0208dc78 kind:function(arm,size=0x10) addr:0x0208dc78 func_ov000_0208dc88 kind:function(arm,size=0x10) addr:0x0208dc88 -func_ov000_0208dc98 kind:function(arm,size=0x58) addr:0x0208dc98 +_ZN15PlayerActorBase19func_ov000_0208dc98Ev kind:function(arm,size=0x58) addr:0x0208dc98 func_ov000_0208dcf0 kind:function(arm,size=0x60) addr:0x0208dcf0 func_ov000_0208dd50 kind:function(arm,size=0x10) addr:0x0208dd50 func_ov000_0208dd60 kind:function(arm,size=0x10) addr:0x0208dd60 @@ -2124,10 +2124,10 @@ func_ov000_020920b0 kind:function(arm,size=0x34) addr:0x020920b0 func_ov000_020920e4 kind:function(arm,size=0xc4) addr:0x020920e4 func_ov000_020921a8 kind:function(arm,size=0x3c) addr:0x020921a8 _ZN18PlayerLinkActor_A019func_ov000_020921e4Ei kind:function(arm,size=0x464) addr:0x020921e4 -func_ov000_02092648 kind:function(arm,size=0x7f0) addr:0x02092648 -func_ov000_02092e38 kind:function(arm,size=0x70) addr:0x02092e38 -func_ov000_02092ea8 kind:function(arm,size=0x24) addr:0x02092ea8 -func_ov000_02092ecc kind:function(arm,size=0x19c) addr:0x02092ecc +_ZN18PlayerLinkActor_A019func_ov000_02092648Ei kind:function(arm,size=0x7f0) addr:0x02092648 +_ZN18PlayerLinkActor_A019func_ov000_02092e38Ev kind:function(arm,size=0x70) addr:0x02092e38 +_ZN18PlayerLinkActor_A019func_ov000_02092ea8Eii kind:function(arm,size=0x24) addr:0x02092ea8 +_ZN18PlayerLinkActor_A019func_ov000_02092eccEPvb kind:function(arm,size=0x19c) addr:0x02092ecc func_ov000_02093068 kind:function(arm,size=0x28) addr:0x02093068 func_ov000_02093090 kind:function(arm,size=0x28) addr:0x02093090 func_ov000_020930b8 kind:function(arm,size=0x3c) addr:0x020930b8 @@ -2137,10 +2137,10 @@ func_ov000_02093250 kind:function(arm,size=0xf0) addr:0x02093250 func_ov000_02093340 kind:function(arm,size=0xf8) addr:0x02093340 func_ov000_02093438 kind:function(arm,size=0x124) addr:0x02093438 func_ov000_0209355c kind:function(arm,size=0xb0) addr:0x0209355c -func_ov000_0209360c kind:function(arm,size=0x44) addr:0x0209360c -func_ov000_02093650 kind:function(arm,size=0x4c) addr:0x02093650 +_ZN18PlayerLinkActor_A019func_ov000_0209360cEv kind:function(arm,size=0x44) addr:0x0209360c +_ZN18PlayerLinkActor_A019func_ov000_02093650Ev kind:function(arm,size=0x4c) addr:0x02093650 func_ov000_0209369c kind:function(arm,size=0x28) addr:0x0209369c -func_ov000_020936c4 kind:function(arm,size=0x28) addr:0x020936c4 +_ZN18PlayerLinkActor_A019func_ov000_020936c4Ev kind:function(arm,size=0x28) addr:0x020936c4 _ZN18PlayerLinkActor_A019func_ov000_020936ecEv kind:function(arm,size=0x2c) addr:0x020936ec _ZN18PlayerLinkActor_A019func_ov000_02093718Ev kind:function(arm,size=0x38) addr:0x02093718 func_ov000_02093750 kind:function(arm,size=0x3c) addr:0x02093750 @@ -2167,7 +2167,7 @@ func_ov000_02093da0 kind:function(arm,size=0x1b8) addr:0x02093da0 func_ov000_02093f58 kind:function(arm,size=0x1c) addr:0x02093f58 func_ov000_02093f74 kind:function(arm,size=0x5c) addr:0x02093f74 func_ov000_02093fd0 kind:function(arm,size=0x18) addr:0x02093fd0 -func_ov000_02093fe8 kind:function(arm,size=0x2c) addr:0x02093fe8 +_ZN18PlayerLinkActor_A019func_ov000_02093fe8Ev kind:function(arm,size=0x2c) addr:0x02093fe8 func_ov000_02094014 kind:function(arm,size=0x20) addr:0x02094014 func_ov000_02094034 kind:function(arm,size=0x20) addr:0x02094034 func_ov000_02094054 kind:function(arm,size=0x30) addr:0x02094054 @@ -2220,13 +2220,13 @@ func_ov000_020961ec kind:function(arm,size=0x170) addr:0x020961ec func_ov000_0209635c kind:function(arm,size=0x514) addr:0x0209635c _ZN19func_ov000_02096870D1Ev kind:function(arm,size=0x20) addr:0x02096870 _ZN19func_ov000_02096890D0Ev kind:function(arm,size=0x28) addr:0x02096890 -func_ov000_020968b8 kind:function(arm,size=0x28) addr:0x020968b8 +_ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov000_020968b8Ev kind:function(arm,size=0x28) addr:0x020968b8 _ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov000_020968e0Ev kind:function(arm,size=0x1c) addr:0x020968e0 -func_ov000_020968fc kind:function(arm,size=0xb8) addr:0x020968fc +_ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov000_020968fcEv kind:function(arm,size=0xb8) addr:0x020968fc func_ov000_020969b4 kind:function(arm,size=0xe8) addr:0x020969b4 _ZN29UnkStruct_027e0ce0_40_Base_1419func_ov000_02096a9cEv kind:function(arm,size=0x58) addr:0x02096a9c -func_ov000_02096af4 kind:function(arm,size=0x28) addr:0x02096af4 -func_ov000_02096b1c kind:function(arm,size=0x78) addr:0x02096b1c +_ZN29UnkStruct_027e0ce0_40_Base_1419func_ov000_02096af4Ev kind:function(arm,size=0x28) addr:0x02096af4 +_ZN29UnkStruct_027e0ce0_40_Base_1419func_ov000_02096b1cEi kind:function(arm,size=0x78) addr:0x02096b1c _ZN9PassengerC1Ev kind:function(arm,size=0x14) addr:0x02096b94 _ZN9Passenger5ResetEv kind:function(arm,size=0x24) addr:0x02096ba8 func_ov000_02096bcc kind:function(arm,size=0x48) addr:0x02096bcc @@ -2320,8 +2320,8 @@ _ZN5Actor8vfunc_18Ei kind:function(arm,size=0x8) addr:0x020984a8 _ZN5Actor8vfunc_1CEv kind:function(arm,size=0x4) addr:0x020984b0 _ZN5Actor8vfunc_20Ev kind:function(arm,size=0x4) addr:0x020984b4 _ZN5Actor8vfunc_24Ev kind:function(arm,size=0x4) addr:0x020984b8 -_ZN5Actor8vfunc_28Ev kind:function(arm,size=0x4) addr:0x020984bc -_ZN5Actor8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020984c0 +_ZN5Actor8vfunc_28EP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020984bc +_ZN5Actor8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020984c0 _ZN5Actor8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020984c4 _ZN5Actor8vfunc_34Ev kind:function(arm,size=0x8) addr:0x020984c8 _ZN5Actor19func_ov000_020984d0Ev kind:function(arm,size=0x20) addr:0x020984d0 @@ -2344,7 +2344,7 @@ _ZN5Actor19func_ov000_02098838Ev kind:function(arm,size=0x28) addr:0x02098838 _ZN5Actor19func_ov000_0209a008Eis kind:function(arm,size=0xb0) addr:0x02098860 _ZN5Actor19func_ov000_02098910EP24UnkStruct_ov031_Items_00i kind:function(arm,size=0xd0) addr:0x02098910 _ZN5Actor19func_ov000_020989e0Ev kind:function(arm,size=0x38) addr:0x020989e0 -func_ov000_02098a18 kind:function(arm,size=0x48) addr:0x02098a18 +_ZN5Actor19func_ov000_02098a18EP8Cylinder kind:function(arm,size=0x48) addr:0x02098a18 _ZN5Actor19func_ov000_02098a60Ei kind:function(arm,size=0x28) addr:0x02098a60 _ZN5Actor19func_ov000_02098a88Eii kind:function(arm,size=0x2c) addr:0x02098a88 _ZN5Actor19func_ov000_02098ab4EhiiP7VecFx32 kind:function(arm,size=0x74) addr:0x02098ab4 @@ -2372,7 +2372,7 @@ _ZN14Actor_Derived2D1Ev kind:function(arm,size=0x14) addr:0x020997f0 _ZN14Actor_Derived2D0Ev kind:function(arm,size=0x1c) addr:0x02099804 _ZN26UnkStruct_ActorUnkCANS_224C1Ev kind:function(arm,size=0x50) addr:0x02099820 func_ov000_02099870 kind:function(arm,size=0x80) addr:0x02099870 -func_ov000_020998f0 kind:function(arm,size=0x11c) addr:0x020998f0 +_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_020998f0E8ActorRefP7VecFx32 kind:function(arm,size=0x11c) addr:0x020998f0 _ZN26UnkStruct_ActorUnkCANS_22419func_ov000_02099a0cEv kind:function(arm,size=0x10) addr:0x02099a0c func_ov000_02099a1c kind:function(arm,size=0xc) addr:0x02099a1c _ZN24UnkStruct_ov000_020b31a8C2EP10UnkSystem5P11ModelRenderP19UnkActorFileSystem2 kind:function(thumb,size=0x54) addr:0x02099a28 @@ -2556,9 +2556,9 @@ _ZN9MapObject8vfunc_04Ev kind:function(arm,size=0x4) addr:0x0209d0b8 _ZN9MapObject19func_ov000_0209d0bcEP8Vec2bCppPS_ kind:function(arm,size=0x58) addr:0x0209d0bc _ZN9MapObject19func_ov000_0209d114Ev kind:function(arm,size=0x18) addr:0x0209d114 _ZN9MapObject19func_ov000_0209d12cEv kind:function(arm,size=0x18) addr:0x0209d12c -_ZN9MapObject19func_ov000_0209d144EP5Vec2sii kind:function(arm,size=0x88) addr:0x0209d144 +_ZN9MapObject19func_ov000_0209d144EP5Vec2siP21UnkStruct_027e09bc_0C kind:function(arm,size=0x88) addr:0x0209d144 _ZN9MapObject8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x8) addr:0x0209d1cc -_ZN9MapObject8vfunc_20Ev kind:function(arm,size=0x4) addr:0x0209d1d4 +_ZN9MapObject8vfunc_20Ei kind:function(arm,size=0x4) addr:0x0209d1d4 _ZN9MapObject8vfunc_24EPS_7VecFx32 kind:function(arm,size=0xc) addr:0x0209d1d8 _ZN9MapObject8vfunc_28Eiii kind:function(arm,size=0x8) addr:0x0209d1e4 _ZN9MapObject8vfunc_2CEP7VecFx32 kind:function(arm,size=0x40) addr:0x0209d1ec @@ -2608,9 +2608,9 @@ _ZN22MapObjectSwitchStep_40D1Ev kind:function(arm,size=0x14) addr:0x0209df9c _ZN19MapObjectSwitchStepD1Ev kind:function(arm,size=0x58) addr:0x0209dfb0 _ZN19MapObjectSwitchStepD0Ev kind:function(arm,size=0x60) addr:0x0209e008 _ZN19MapObjectSwitchStep8vfunc_00Ev kind:function(arm,size=0xb4) addr:0x0209e068 -_ZN19MapObjectSwitchStep19func_ov000_0209e11cEii kind:function(arm,size=0x164) addr:0x0209e11c -_ZN19MapObjectSwitchStep8vfunc_20Ev kind:function(arm,size=0x34) addr:0x0209e280 -_ZN19MapObjectSwitchStep8vfunc_18EPcc kind:function(arm,size=0xd8) addr:0x0209e2b4 +_ZN19MapObjectSwitchStep19func_ov000_0209e11cEsi kind:function(arm,size=0x164) addr:0x0209e11c +_ZN19MapObjectSwitchStep8vfunc_20Ei kind:function(arm,size=0x34) addr:0x0209e280 +_ZN19MapObjectSwitchStep8vfunc_18EPc kind:function(arm,size=0xd8) addr:0x0209e2b4 _ZN19MapObjectSwitchStep19func_ov000_0209e38cEv kind:function(arm,size=0x3c) addr:0x0209e38c _ZN22MapObjectSwitchStep_40D0Ev kind:function(arm,size=0x1c) addr:0x0209e3c8 _ZN26MapObjectProfileSwitchStepD1Ev kind:function(arm,size=0x14) addr:0x0209e3e4 @@ -2619,7 +2619,7 @@ _ZN26MapObjectProfileMiniBlocks6CreateEv kind:function(arm,size=0x24) addr:0x020 _ZN26MapObjectProfileMiniBlocksC1Ev kind:function(arm,size=0x4c) addr:0x0209e428 _ZN19MapObjectMiniBlocksC1Ev kind:function(arm,size=0x3c) addr:0x0209e474 _ZN19MapObjectMiniBlocks8vfunc_00Ev kind:function(arm,size=0x1fc) addr:0x0209e4b0 -_ZN19MapObjectMiniBlocks8vfunc_14Ev kind:function(arm,size=0x60) addr:0x0209e6ac +_ZN19MapObjectMiniBlocks8vfunc_14Ei kind:function(arm,size=0x60) addr:0x0209e6ac _ZN19MapObjectMiniBlocksD1Ev kind:function(arm,size=0x20) addr:0x0209e70c _ZN19MapObjectMiniBlocksD0Ev kind:function(arm,size=0x28) addr:0x0209e72c _ZN26MapObjectProfileMiniBlocksD1Ev kind:function(arm,size=0x14) addr:0x0209e754 @@ -3015,7 +3015,7 @@ _ZN11ItemManager19func_ov000_020a89bcEv kind:function(thumb,size=0x18) addr:0x02 _ZN11ItemManager19func_ov000_020a89d4Ev kind:function(arm,size=0x38) addr:0x020a89d4 _ZN11ItemManager19func_ov000_020a8a0cEv kind:function(arm,size=0x50) addr:0x020a8a0c _ZN11ItemManager19func_ov000_020a8a5cEv kind:function(arm,size=0x18) addr:0x020a8a5c -_ZN11ItemManager19func_ov000_020a8a74Ev kind:function(arm,size=0x1c) addr:0x020a8a74 +_ZN11ItemManager19func_ov000_020a8a74EP24UnkStruct_027e0ce0_30_00 kind:function(arm,size=0x1c) addr:0x020a8a74 _ZN11ItemManager19func_ov000_020a8a90Ev kind:function(arm,size=0x14) addr:0x020a8a90 _ZN11ItemManager19func_ov000_020a8aa4Ev kind:function(arm,size=0x14) addr:0x020a8aa4 _ZN11ItemManager19func_ov000_020a8ab8Ev kind:function(arm,size=0x14) addr:0x020a8ab8 @@ -3067,7 +3067,7 @@ _ZN14Actor_Derived18vfunc_A8Ev kind:function(arm,size=0x8) addr:0x020a97fc _ZN14Actor_Derived119func_ov000_020a9804Ev kind:function(arm,size=0xec) addr:0x020a9804 _ZN14Actor_Derived18vfunc_20Ev kind:function(arm,size=0x4) addr:0x020a98f0 _ZN14Actor_Derived18vfunc_24Ev kind:function(arm,size=0x68) addr:0x020a98f4 -_ZN14Actor_Derived18vfunc_2CEi kind:function(arm,size=0x48) addr:0x020a995c +_ZN14Actor_Derived18vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x48) addr:0x020a995c _ZN14Actor_Derived18vfunc_B8Ev kind:function(arm,size=0x34) addr:0x020a99a4 _ZN14Actor_Derived18vfunc_14Ev kind:function(arm,size=0x48) addr:0x020a99d8 _ZN19func_ov000_020a9a20D1Ev kind:function(arm,size=0x14) addr:0x020a9a20 diff --git a/config/eur/arm9/overlays/ov001/relocs.txt b/config/eur/arm9/overlays/ov001/relocs.txt index 511f4cc1..bf9988b2 100644 --- a/config/eur/arm9/overlays/ov001/relocs.txt +++ b/config/eur/arm9/overlays/ov001/relocs.txt @@ -1917,7 +1917,7 @@ from:0x020bf01a kind:thumb_call_arm to:0x02016694 module:main from:0x020bf020 kind:thumb_call_arm to:0x020bf08c module:overlay(1) from:0x020bf038 kind:thumb_call to:0x020a0460 module:overlay(0) from:0x020bf054 kind:arm_call to:0x0201667c module:main -from:0x020bf078 kind:load to:0x020c2fe4 add:0xf54 module:overlay(1) +from:0x020bf078 kind:load to:0x020c3f30 add:0x8 module:overlay(17) from:0x020bf088 kind:load to:0x027e0cec module:dtcm from:0x020bf09c kind:load to:0x027e0cec module:dtcm from:0x020bf0ac kind:load to:0x0204999c module:main diff --git a/config/eur/arm9/overlays/ov001/symbols.txt b/config/eur/arm9/overlays/ov001/symbols.txt index a1eeeba0..873c8de2 100644 --- a/config/eur/arm9/overlays/ov001/symbols.txt +++ b/config/eur/arm9/overlays/ov001/symbols.txt @@ -200,14 +200,14 @@ _Z19func_ov001_020bbac4iP10G3d_Model_ib kind:function(thumb,size=0x5c) addr:0x02 _ZN18PlayerActorBase_70C1Eii kind:function(thumb,size=0x260) addr:0x020bbb20 _ZN18PlayerActorBase_70D1Ev kind:function(thumb,size=0x96) addr:0x020bbd80 _ZN18PlayerActorBase_7019func_ov001_020bbe18Ei14UnkAngleStructjh kind:function(thumb,size=0x4c) addr:0x020bbe18 -_ZN24UnkStruct_027e0ce0_30_00C1EP21UnkStruct_027e0ce0_38P21UnkStruct_027e0ce0_3CiPii kind:function(thumb,size=0x7c) addr:0x020bbe64 +_ZN24UnkStruct_027e0ce0_30_00C1EP21UnkStruct_027e0ce0_38P21UnkStruct_027e0ce0_3CP21UnkStruct_027e0ce0_40P15PlayerLinkActorP15PlayerActorBase kind:function(thumb,size=0x7c) addr:0x020bbe64 _ZN24UnkStruct_027e0ce0_30_00D1Ev kind:function(thumb,size=0x2) addr:0x020bbee0 _ZN21UnkStruct_027e0ce0_30C1Ev kind:function(thumb,size=0x18) addr:0x020bbee4 _ZN21UnkStruct_027e0ce0_30D1Ev kind:function(thumb,size=0x2) addr:0x020bbefc _ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf00Eii kind:function(thumb,size=0x24) addr:0x020bbf00 _ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf24EP21UnkStruct_027e0ce0_38 kind:function(thumb,size=0x2a) addr:0x020bbf24 _ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf50EP21UnkStruct_027e0ce0_3C kind:function(thumb,size=0x2a) addr:0x020bbf50 -_ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf7cEiPii kind:function(thumb,size=0x50) addr:0x020bbf7c +_ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf7cEP21UnkStruct_027e0ce0_40P15PlayerLinkActorP15PlayerActorBase kind:function(thumb,size=0x50) addr:0x020bbf7c _ZN21UnkStruct_027e0ce0_3019func_ov001_020bbfccEv kind:function(thumb,size=0x5a) addr:0x020bbfcc _ZN26UnkStruct_027e0ce0_40_BaseC2EiPvP11ItemManager kind:function(thumb,size=0x88) addr:0x020bc028 _ZN26UnkStruct_027e0ce0_40_BaseD2Ev kind:function(thumb,size=0x30) addr:0x020bc0b0 @@ -241,7 +241,7 @@ _ZN15PlayerActorBase19func_ov001_020bc96cEv kind:function(thumb,size=0x2e) addr: _ZN15PlayerLinkActorC1EiP11ItemManagerP21UnkStruct_027e0ce0_40P25UnkStruct_027e0ce0_40_150 kind:function(thumb,size=0x138) addr:0x020bc99c _ZN19PlayerLinkActor_1B0D1Ev kind:function(thumb,size=0xc) addr:0x020bcad4 _ZN15PlayerLinkActorD1Ev kind:function(thumb,size=0x80) addr:0x020bcae0 -_ZN15PlayerLinkActor19func_ov001_020bcb60EP25UnkStruct_027e0ce0_40_328 kind:function(thumb,size=0x10) addr:0x020bcb60 +_ZN15PlayerLinkActor19func_ov001_020bcb60EP15PlayerActorBase kind:function(thumb,size=0x10) addr:0x020bcb60 _ZN15PlayerLinkActor19func_ov001_020bcb70Ev kind:function(thumb,size=0x36) addr:0x020bcb70 _ZN15PlayerLinkActor19func_ov001_020bcba8Ev kind:function(thumb,size=0x26) addr:0x020bcba8 _ZN15PlayerLinkActor19func_ov001_020bcbd0EP7VecFx32 kind:function(thumb,size=0x98) addr:0x020bcbd0 diff --git a/config/eur/arm9/overlays/ov005/symbols.txt b/config/eur/arm9/overlays/ov005/symbols.txt index 9b10e2d6..ebb0544e 100644 --- a/config/eur/arm9/overlays/ov005/symbols.txt +++ b/config/eur/arm9/overlays/ov005/symbols.txt @@ -1,7 +1,7 @@ func_ov005_020b6520 kind:function(arm,size=0x28) addr:0x020b6520 func_ov005_020b6548 kind:function(arm,size=0x28) addr:0x020b6548 -func_ov005_020b6570 kind:function(arm,size=0x134) addr:0x020b6570 -func_ov005_020b66a4 kind:function(arm,size=0x1a4) addr:0x020b66a4 +_ZN16MapObjectManager19func_ov005_020b6570Ei kind:function(arm,size=0x134) addr:0x020b6570 +_ZN12ActorManager19func_ov005_020b66a4Ei kind:function(arm,size=0x1a4) addr:0x020b66a4 _ZN12ActorUnkSWOB8vfunc_20Ev kind:function(arm,size=0xf4) addr:0x020b6848 func_ov005_020b693c kind:function(arm,size=0x224) addr:0x020b693c func_ov005_020b6b60 kind:function(arm,size=0x4c) addr:0x020b6b60 diff --git a/config/eur/arm9/overlays/ov017/delinks.txt b/config/eur/arm9/overlays/ov017/delinks.txt index a411361c..9f383ea4 100644 --- a/config/eur/arm9/overlays/ov017/delinks.txt +++ b/config/eur/arm9/overlays/ov017/delinks.txt @@ -5,7 +5,105 @@ .data start:0x020c3f00 end:0x020c3f60 kind:data align:32 .bss start:0x020c3f60 end:0x020c4840 kind:bss align:32 +src/017_CourseExec/UnkStruct_027e09a4_017.cpp: + complete + .text start:0x020bb660 end:0x020bba20 + +src/017_CourseExec/UnkStruct_ov017_020c3f70.cpp: + complete + .text start:0x020bba20 end:0x020bbaa8 + .data start:0x020c3f00 end:0x020c3f14 + +src/017_CourseExec/Player/PlayerActorBase_70_017.cpp: + .text start:0x020bbaa8 end:0x020bbf7c + +src/017_CourseExec/UnkStruct_027e0ce0_30_017.cpp: + .text start:0x020bbf7c end:0x020bc640 + +src/017_CourseExec/UnkStruct_027e0ce0_40_017.cpp: + complete + .text start:0x020bc640 end:0x020bd2a0 + +src/017_CourseExec/ItemManager_017.cpp: + complete + .text start:0x020bd2a0 end:0x020bd300 + +src/017_CourseExec/UnkStruct_027e0ce0_40_Base_94_017.cpp: + .text start:0x020bd300 end:0x020bd4a0 + +src/017_CourseExec/UnkStruct_027e0ce0_017.cpp: + complete + .text start:0x020bd4a0 end:0x020bd6b8 + +src/017_CourseExec/Player/PlayerLinkActor_017.cpp: + complete + .text start:0x020bd6b8 end:0x020be0a8 + +src/017_CourseExec/Player/PlayerLinkActor_A0_20_017.cpp: + complete + .text start:0x020be0a8 end:0x020be2ec + +src/017_CourseExec/code_020be2ec_017.cpp: + complete + .text start:0x020be2ec end:0x020be9cc + src/017_CourseExec/CargoManager_017.cpp: complete .text start:0x020be9cc end:0x020becd8 .rodata start:0x020c3dc0 end:0x020c3dec + +src/017_CourseExec/Actor/ActorManager_017.cpp: + complete + .text start:0x020becd8 end:0x020beeec + +src/017_CourseExec/Actor/Actor_017.cpp: + complete + .text start:0x020beeec end:0x020bff4c + +src/017_CourseExec/Actor/ActorEventIcon_017.cpp: + complete + .text start:0x020bff4c end:0x020c007c + +src/017_CourseExec/MapObject/MapObjectManager_017.cpp: + .text start:0x020c007c end:0x020c058c + +src/017_CourseExec/MapObject/MapObject_017.cpp: + complete + .text start:0x020c058c end:0x020c05a0 + +src/017_CourseExec/MapObject/MapObjectSwitchStep_017.cpp: + complete + .text start:0x020c05a0 end:0x020c0774 + +src/017_CourseExec/UnkStruct_027e09b4_017.cpp: + .text start:0x020c0774 end:0x020c0b24 + +src/017_CourseExec/code_020c0b24_017.cpp: + .text start:0x020c0b24 end:0x020c1860 + +src/017_CourseExec/Game/AdventureModeManager_15C_20_00_017.cpp: + .text start:0x020c1860 end:0x020c1e54 + +src/017_CourseExec/UnkStruct_027e0cec_017.cpp: + .text start:0x020c1e54 end:0x020c201c + +src/017_CourseExec/code_020c201c_017.cpp: + .text start:0x020c201c end:0x020c297c + +src/017_CourseExec/UnkStruct_027e0cec_18_017.cpp: + .text start:0x020c297c end:0x020c2b68 + +src/017_CourseExec/Save/SaveManager_017.cpp: + .text start:0x020c2b68 end:0x020c30b0 + +src/017_CourseExec/UnkStruct_027e09c0_017.cpp: + .text start:0x020c30b0 end:0x020c30e4 + +src/017_CourseExec/Unknown/UnkStruct_ov024_020d86a0_017.cpp: + .text start:0x020c30e4 end:0x020c3414 + +src/017_CourseExec/Train/UnkStruct_027e0cf8_017.cpp: + .text start:0x020c3414 end:0x020c39f0 + +src/017_CourseExec/Game/AdventureModeManager_15C_017.cpp: + .text start:0x020c39f0 end:0x020c3dc0 diff --git a/config/eur/arm9/overlays/ov017/relocs.txt b/config/eur/arm9/overlays/ov017/relocs.txt index b14f9da0..585b7ac8 100644 --- a/config/eur/arm9/overlays/ov017/relocs.txt +++ b/config/eur/arm9/overlays/ov017/relocs.txt @@ -60,11 +60,11 @@ from:0x020bba18 kind:load to:0x02043e50 module:main from:0x020bba1c kind:load to:0x020b8310 module:overlay(16) from:0x020bba30 kind:arm_call to:0x020bba94 module:overlay(17) from:0x020bba38 kind:arm_call to:0x02013d94 module:main -from:0x020bba44 kind:load to:0x020c3f08 module:overlay(17) +from:0x020bba44 kind:load to:0x020c3f00 module:overlay(17) add:0x8 from:0x020bba58 kind:arm_call to:0x020bba94 module:overlay(17) from:0x020bba60 kind:arm_call to:0x02013d94 module:main from:0x020bba68 kind:arm_call to:0x02011ff4 module:main -from:0x020bba74 kind:load to:0x020c3f08 module:overlay(17) +from:0x020bba74 kind:load to:0x020c3f00 module:overlay(17) add:0x8 from:0x020bba8c kind:load to:0x02049b80 module:main from:0x020bba90 kind:load to:0x02013fec module:main from:0x020bbaa4 kind:load to:0x02049b80 module:main @@ -866,7 +866,7 @@ from:0x020c3e64 kind:arm_call to:0x0203ce74 module:main from:0x020c3e78 kind:load to:0x020c3f60 module:overlay(17) from:0x020c3e7c kind:load to:0x020c3f70 module:overlay(17) from:0x020c3e80 kind:load to:0x020c403c module:overlay(17) -from:0x020c3e84 kind:load to:0x020c3f08 module:overlay(17) +from:0x020c3e84 kind:load to:0x020c3f00 module:overlay(17) add:0x8 from:0x020c3e88 kind:load to:0x020bba20 module:overlay(17) from:0x020c3e8c kind:load to:0x020c3f64 module:overlay(17) from:0x020c3ec4 kind:load to:0x020c3f14 module:overlay(17) diff --git a/config/eur/arm9/overlays/ov017/symbols.txt b/config/eur/arm9/overlays/ov017/symbols.txt index 30a6b24d..f7847225 100644 --- a/config/eur/arm9/overlays/ov017/symbols.txt +++ b/config/eur/arm9/overlays/ov017/symbols.txt @@ -1,45 +1,45 @@ -func_ov017_020bb660 kind:function(arm,size=0x198) addr:0x020bb660 -func_ov017_020bb7f8 kind:function(arm,size=0x13c) addr:0x020bb7f8 -func_ov017_020bb934 kind:function(arm,size=0x60) addr:0x020bb934 -_ZN18UnkStruct_027e09a419func_ov017_020bb994EPv kind:function(arm,size=0x8c) addr:0x020bb994 -_ZN19func_ov017_020bba20D1Ev kind:function(arm,size=0x28) addr:0x020bba20 -_ZN19func_ov017_020bba48D0Ev kind:function(arm,size=0x30) addr:0x020bba48 +_ZN18UnkStruct_027e09a419func_ov017_020bb660Ei kind:function(arm,size=0x198) addr:0x020bb660 +_ZN18UnkStruct_027e09a419func_ov017_020bb7f8EPv kind:function(arm,size=0x13c) addr:0x020bb7f8 +_ZN18UnkStruct_027e09a419func_ov017_020bb934EPv kind:function(arm,size=0x60) addr:0x020bb934 +_ZN18UnkStruct_027e09a419func_ov017_020bb994EPc kind:function(arm,size=0x8c) addr:0x020bb994 +_ZN24UnkStruct_ov017_020c3f70D1Ev kind:function(arm,size=0x28) addr:0x020bba20 +_ZN24UnkStruct_ov017_020c3f70D0Ev kind:function(arm,size=0x30) addr:0x020bba48 _ZN24UnkStruct_ov017_020c3f7019func_ov017_020bba78Ev kind:function(arm,size=0x1c) addr:0x020bba78 _ZN24UnkStruct_ov017_020c3f7019func_ov017_020bba94Ev kind:function(arm,size=0x14) addr:0x020bba94 -func_ov017_020bbaa8 kind:function(arm,size=0x230) addr:0x020bbaa8 -func_ov017_020bbcd8 kind:function(arm,size=0x21c) addr:0x020bbcd8 -func_ov017_020bbef4 kind:function(arm,size=0x78) addr:0x020bbef4 -func_ov017_020bbf6c kind:function(arm,size=0x10) addr:0x020bbf6c -func_ov017_020bbf7c kind:function(arm,size=0x680) addr:0x020bbf7c -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 -_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 -func_ov017_020bd4a0 kind:function(arm,size=0xc8) addr:0x020bd4a0 -func_ov017_020bd568 kind:function(arm,size=0x5c) addr:0x020bd568 -func_ov017_020bd5c4 kind:function(arm,size=0x18) addr:0x020bd5c4 -func_ov017_020bd5dc kind:function(arm,size=0x68) addr:0x020bd5dc -func_ov017_020bd644 kind:function(arm,size=0x58) addr:0x020bd644 +_ZN18PlayerActorBase_7019func_ov017_020bbaa8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x230) addr:0x020bbaa8 +_ZN18PlayerActorBase_7019func_ov017_020bbcd8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x21c) addr:0x020bbcd8 +_ZN18PlayerActorBase_7019func_ov017_020bbef4EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x78) addr:0x020bbef4 +_ZN18PlayerActorBase_7019func_ov017_020bbf6cEv kind:function(arm,size=0x10) addr:0x020bbf6c +_ZN24UnkStruct_027e0ce0_30_0019func_ov017_020bbf7cEP11ItemManager kind:function(arm,size=0x680) addr:0x020bbf7c +_ZN21UnkStruct_027e0ce0_3019func_ov017_020bc5fcEP11ItemManager kind:function(arm,size=0x44) addr:0x020bc5fc +_ZN18PlayerLinkActor_9C19func_ov017_020bc640EjbbhhP7VecFx32S1_S1_ kind:function(arm,size=0x31c) addr:0x020bc640 +_ZN21UnkStruct_027e0ce0_4019func_ov017_020bc95cEb kind:function(arm,size=0xe4) addr:0x020bc95c +_ZN21UnkStruct_027e0ce0_4019func_ov017_020bca40Ebi kind:function(arm,size=0x3a8) addr:0x020bca40 +_ZN21UnkStruct_027e0ce0_4019func_ov017_020bcde8Eb kind:function(arm,size=0x4b8) addr:0x020bcde8 +_ZN11ItemManager19func_ov017_020bd2a0Ebb kind:function(arm,size=0x48) addr:0x020bd2a0 +_ZN11ItemManager19func_ov017_020bd2e8EPv kind:function(arm,size=0x18) addr:0x020bd2e8 +_ZN29UnkStruct_027e0ce0_40_Base_9419func_ov017_020bd300EP29UnkStruct_027e0ce0_40_Base_14ib kind:function(arm,size=0x178) addr:0x020bd300 +_ZN29UnkStruct_027e0ce0_40_Base_9419func_ov017_020bd478Ev kind:function(arm,size=0x28) addr:0x020bd478 +_ZN18UnkStruct_027e0ce019func_ov017_020bd4a0Eib kind:function(arm,size=0xc8) addr:0x020bd4a0 +_ZN18UnkStruct_027e0ce019func_ov017_020bd568Ei kind:function(arm,size=0x5c) addr:0x020bd568 +_ZN18UnkStruct_027e0ce019func_ov017_020bd5c4EPv kind:function(arm,size=0x18) addr:0x020bd5c4 +_ZN18UnkStruct_027e0ce019func_ov017_020bd5dcEPv kind:function(arm,size=0x68) addr:0x020bd5dc +_ZN18UnkStruct_027e0ce019func_ov017_020bd644EPv kind:function(arm,size=0x58) addr:0x020bd644 _ZN18UnkStruct_027e0ce019func_ov017_020bd69cEv kind:function(arm,size=0x1c) addr:0x020bd69c -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 -_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 +_ZN15PlayerLinkActor19func_ov017_020bd6b8Ev kind:function(arm,size=0x28) addr:0x020bd6b8 +_ZN15PlayerLinkActor19func_ov017_020bd6e0Eb kind:function(arm,size=0x78) addr:0x020bd6e0 +_ZN15PlayerLinkActor19func_ov017_020bd758Ev kind:function(arm,size=0x30) addr:0x020bd758 +_ZN15PlayerLinkActor19func_ov017_020bd788Eb kind:function(arm,size=0x56c) addr:0x020bd788 +_ZN15PlayerLinkActor19func_ov017_020bdcf4Eii kind:function(arm,size=0x90) addr:0x020bdcf4 +_ZN15PlayerLinkActor19func_ov017_020bdd84EPvi kind:function(arm,size=0x1c4) addr:0x020bdd84 +_ZN15PlayerLinkActor19func_ov017_020bdf48EPciPvP34UnkStruct_ov019_020d24c8_28_258_00 kind:function(arm,size=0x150) addr:0x020bdf48 +_ZN15PlayerLinkActor19func_ov017_020be098Ev kind:function(arm,size=0x10) addr:0x020be098 +_ZN21PlayerLinkActor_A0_3819func_ov017_020be0a8Ei kind:function(arm,size=0x38) addr:0x020be0a8 +_ZN21PlayerLinkActor_A0_3819func_ov017_020be0e0EiP7VecFx32bb kind:function(arm,size=0x20c) addr:0x020be0e0 +_ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov017_020be2ecEP29UnkStruct_027e0ce0_40_Base_14b15UnkParamStruct1 kind:function(arm,size=0x148) addr:0x020be2ec _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 +_ZN29UnkStruct_027e0ce0_40_Base_1419func_ov017_020be44cEib kind:function(arm,size=0x45c) addr:0x020be44c +_ZN21UnkStruct_027e0cf8_0819func_ov017_020be8a8Ev kind:function(arm,size=0x124) addr:0x020be8a8 _ZN12CargoManager8DoUpdateEv kind:function(arm,size=0x18) addr:0x020be9cc _ZN12CargoManager15IsNotUsingTimerEi kind:function(arm,size=0x30) addr:0x020be9e4 _ZN12CargoManager6UpdateEv kind:function(arm,size=0x140) addr:0x020bea14 @@ -49,62 +49,62 @@ _ZN12CargoManager19func_ov017_020bebdcEv kind:function(arm,size=0x44) addr:0x020 _ZN12CargoManager19func_ov017_020bec20Ev kind:function(arm,size=0x4c) addr:0x020bec20 _ZN12CargoManager12RemoveAmountEi kind:function(arm,size=0x30) addr:0x020bec6c _ZN12CargoManager19func_ov017_020bec9cEv kind:function(arm,size=0x3c) addr:0x020bec9c -func_ov017_020becd8 kind:function(arm,size=0x148) addr:0x020becd8 -func_ov017_020bee20 kind:function(arm,size=0x44) addr:0x020bee20 -func_ov017_020bee64 kind:function(arm,size=0x20) addr:0x020bee64 -func_ov017_020bee84 kind:function(arm,size=0x20) addr:0x020bee84 -func_ov017_020beea4 kind:function(arm,size=0x28) addr:0x020beea4 -func_ov017_020beecc kind:function(arm,size=0x20) addr:0x020beecc +_ZN12ActorManager19func_ov017_020becd8Ei kind:function(arm,size=0x148) addr:0x020becd8 +_ZN12ActorManager19func_ov017_020bee20EP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x44) addr:0x020bee20 +_ZN12ActorManager19func_ov017_020bee64EP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020bee64 +_ZN12ActorManager19func_ov017_020bee84EP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020bee84 +_ZN12ActorManager19func_ov017_020beea4EP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x28) addr:0x020beea4 +_ZN12ActorManager19func_ov017_020beeccEP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020beecc _ZN5Actor19func_ov017_020beeecEi kind:function(arm,size=0x60) addr:0x020beeec -_ZN14Actor_Derived219func_ov017_020bef4cEi kind:function(arm,size=0x3c) addr:0x020bef4c -_ZN5Actor19func_ov017_020bef88EP14Actor_vfunc_30Pvi kind:function(arm,size=0x9c) addr:0x020bef88 -func_ov017_020bf024 kind:function(arm,size=0x2c) addr:0x020bf024 -func_ov017_020bf050 kind:function(arm,size=0x128) addr:0x020bf050 -_ZN14Actor_Derived219func_ov017_020bf178EP8Actor_9Ci kind:function(arm,size=0x10c) addr:0x020bf178 -func_ov017_020bf284 kind:function(arm,size=0x54) addr:0x020bf284 -func_ov017_020bf2d8 kind:function(arm,size=0x108) addr:0x020bf2d8 +_ZN5Actor19func_ov017_020bef4cEi kind:function(arm,size=0x3c) addr:0x020bef4c +_ZN5Actor19func_ov017_020bef88EP14Actor_vfunc_30P34UnkStruct_ov019_020d24c8_28_258_00i kind:function(arm,size=0x9c) addr:0x020bef88 +_ZN5Actor19func_ov017_020bf024EP14Actor_vfunc_30 kind:function(arm,size=0x2c) addr:0x020bf024 +_ZN5Actor19func_ov017_020bf050EP8Actor_9Ci kind:function(arm,size=0x128) addr:0x020bf050 +_ZN5Actor19func_ov017_020bf178EP8Actor_9Ci kind:function(arm,size=0x10c) addr:0x020bf178 +_ZN5Actor19func_ov017_020bf284EP7VecFx32S0_ kind:function(arm,size=0x54) addr:0x020bf284 +_ZN5Actor19func_ov017_020bf2d8EP8Actor_9Ci kind:function(arm,size=0x108) addr:0x020bf2d8 _ZN5Actor19func_ov017_020bf3e0Eii kind:function(arm,size=0xd0) addr:0x020bf3e0 -func_ov017_020bf4b0 kind:function(arm,size=0xc4) addr:0x020bf4b0 -func_ov017_020bf574 kind:function(arm,size=0x50) addr:0x020bf574 -_ZN5Actor19func_ov017_020bf5c4EP7VecFx32iiii kind:function(arm,size=0x70) addr:0x020bf5c4 +_ZN5Actor19func_ov017_020bf4b0Ei kind:function(arm,size=0xc4) addr:0x020bf4b0 +_ZN5Actor19func_ov017_020bf574Eii kind:function(arm,size=0x50) addr:0x020bf574 +_ZN5Actor19func_ov017_020bf5c4EP7VecFx32iiis kind:function(arm,size=0x70) addr:0x020bf5c4 _ZN5Actor19func_ov017_020bf634EPK7VecFx32ti kind:function(arm,size=0x54) addr:0x020bf634 _ZN5Actor19func_ov017_020bf688Ev kind:function(arm,size=0x88) addr:0x020bf688 -func_ov017_020bf710 kind:function(arm,size=0x98) addr:0x020bf710 -func_ov017_020bf7a8 kind:function(arm,size=0xec) addr:0x020bf7a8 -_ZN14Actor_Derived219func_ov017_020bf894EP26UnkStruct_ActorUnkCANS_224 kind:function(arm,size=0x60) addr:0x020bf894 +_ZN5Actor19func_ov017_020bf710EP26UnkStruct_ActorUnkCANS_224PK7VecFx32t kind:function(arm,size=0x98) addr:0x020bf710 +_ZN5Actor19func_ov017_020bf7a8Ev kind:function(arm,size=0xec) addr:0x020bf7a8 +_ZN5Actor19func_ov017_020bf894EP26UnkStruct_ActorUnkCANS_224 kind:function(arm,size=0x60) addr:0x020bf894 _ZN5Actor8vfunc_40Ev kind:function(arm,size=0x44) addr:0x020bf8f4 _ZN5Actor8vfunc_44Ev kind:function(arm,size=0x64) addr:0x020bf938 -func_ov017_020bf99c kind:function(arm,size=0x2c) addr:0x020bf99c +_ZN5Actor19func_ov017_020bf99cEv kind:function(arm,size=0x2c) addr:0x020bf99c _ZN5Actor19func_ov017_020bf9c8EPS_ kind:function(arm,size=0x88) addr:0x020bf9c8 _ZN5Actor19func_ov017_020bfa50EP7VecFx32i kind:function(arm,size=0x84) addr:0x020bfa50 -func_ov017_020bfad4 kind:function(arm,size=0x44) addr:0x020bfad4 +_ZN5Actor19func_ov017_020bfad4Ev kind:function(arm,size=0x44) addr:0x020bfad4 _ZN5Actor19func_ov017_020bfb18EP8Actor_9C kind:function(arm,size=0x238) addr:0x020bfb18 -_ZN5Actor8vfunc_14Ev kind:function(arm,size=0x4c) addr:0x020bfd50 -func_ov017_020bfd9c kind:function(arm,size=0x130) addr:0x020bfd9c -_ZN5Actor8vfunc_48Ev kind:function(arm,size=0x80) addr:0x020bfecc +_ZN5Actor8vfunc_14EP8Cylinder kind:function(arm,size=0x4c) addr:0x020bfd50 +_ZN5Actor19func_ov017_020bfd9cEP5Vec2siP21UnkStruct_027e09bc_0CP4AABB kind:function(arm,size=0x130) addr:0x020bfd9c +_ZN5Actor8vfunc_48Ei kind:function(arm,size=0x80) addr:0x020bfecc _ZN14ActorEventIcon8vfunc_24Ev kind:function(arm,size=0xc) addr:0x020bff4c _ZN14ActorEventIcon8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0xd4) addr:0x020bff58 -func_ov017_020c002c kind:function(arm,size=0x50) addr:0x020c002c -func_ov017_020c007c kind:function(arm,size=0x60) addr:0x020c007c -func_ov017_020c00dc kind:function(arm,size=0xec) addr:0x020c00dc -func_ov017_020c01c8 kind:function(arm,size=0x4) addr:0x020c01c8 -func_ov017_020c01cc kind:function(arm,size=0x70) addr:0x020c01cc -func_ov017_020c023c kind:function(arm,size=0x70) addr:0x020c023c -func_ov017_020c02ac kind:function(arm,size=0x48) addr:0x020c02ac -func_ov017_020c02f4 kind:function(arm,size=0x48) addr:0x020c02f4 -func_ov017_020c033c kind:function(arm,size=0x1d0) addr:0x020c033c -func_ov017_020c050c kind:function(arm,size=0x80) addr:0x020c050c +_ZN14ActorEventIcon19func_ov017_020c002cEv kind:function(arm,size=0x50) addr:0x020c002c +_ZN16MapObjectManager19func_ov017_020c007cEi kind:function(arm,size=0x60) addr:0x020c007c +_ZN16MapObjectManager19func_ov017_020c00dcEi kind:function(arm,size=0xec) addr:0x020c00dc +_ZN16MapObjectManager19func_ov017_020c01c8EPv kind:function(arm,size=0x4) addr:0x020c01c8 +_ZN16MapObjectManager19func_ov017_020c01ccEi kind:function(arm,size=0x70) addr:0x020c01cc +_ZN16MapObjectManager19func_ov017_020c023cEPc kind:function(arm,size=0x70) addr:0x020c023c +_ZN16MapObjectManager19func_ov017_020c02acEi8Vec2bCpp kind:function(arm,size=0x48) addr:0x020c02ac +_ZN16MapObjectManager19func_ov017_020c02f4EiP7VecFx32 kind:function(arm,size=0x48) addr:0x020c02f4 +_ZN16MapObjectManager19func_ov017_020c033cEPiPS_PK5Vec2sii kind:function(arm,size=0x1d0) addr:0x020c033c +_ZN16MapObjectManager19func_ov017_020c050cEiiii kind:function(arm,size=0x80) addr:0x020c050c _ZN9MapObject8vfunc_08Ev kind:function(arm,size=0x4) addr:0x020c058c _ZN9MapObject8vfunc_0CEv kind:function(arm,size=0x4) addr:0x020c0590 _ZN9MapObject8vfunc_10Ev kind:function(arm,size=0x4) addr:0x020c0594 -_ZN9MapObject8vfunc_14Ev kind:function(arm,size=0x4) addr:0x020c0598 -_ZN9MapObject8vfunc_18EPcc kind:function(arm,size=0x4) addr:0x020c059c +_ZN9MapObject8vfunc_14Ei kind:function(arm,size=0x4) addr:0x020c0598 +_ZN9MapObject8vfunc_18EPc kind:function(arm,size=0x4) addr:0x020c059c _ZN19MapObjectSwitchStep8vfunc_08Ev kind:function(arm,size=0x1ac) addr:0x020c05a0 -_ZN19MapObjectSwitchStep8vfunc_14Ev kind:function(arm,size=0x28) addr:0x020c074c +_ZN19MapObjectSwitchStep8vfunc_14Ei kind:function(arm,size=0x28) addr:0x020c074c func_ov017_020c0774 kind:function(arm,size=0x130) addr:0x020c0774 func_ov017_020c08a4 kind:function(arm,size=0x20) addr:0x020c08a4 _ZN18UnkStruct_027e09b419func_ov017_020c08c4EP7VecFx32iiiii kind:function(arm,size=0xac) addr:0x020c08c4 -func_ov017_020c0970 kind:function(arm,size=0xc0) addr:0x020c0970 +_ZN18UnkStruct_027e09b419func_ov017_020c0970EP7VecFx32iiiiii kind:function(arm,size=0xc0) addr:0x020c0970 func_ov017_020c0a30 kind:function(arm,size=0x3c) addr:0x020c0a30 func_ov017_020c0a6c kind:function(arm,size=0xb8) addr:0x020c0a6c func_ov017_020c0b24 kind:function(arm,size=0x12c) addr:0x020c0b24 @@ -175,7 +175,7 @@ __sinit_ov017_020c3ec8 kind:function(arm,size=0x18) addr:0x020c3ec8 .p__sinit_ov017_020c3e24 kind:data(word) addr:0x020c3ee0 .p__sinit_ov017_020c3e90 kind:data(word) addr:0x020c3ee4 .p__sinit_ov017_020c3ec8 kind:data(word) addr:0x020c3ee8 -data_ov017_020c3f08 kind:data(any) addr:0x020c3f08 +_ZTV24UnkStruct_ov017_020c3f70 kind:data(any) addr:0x020c3f00 data_ov017_020c3f14 kind:data(any) addr:0x020c3f14 _ZTV21UnkStruct_027e0cec_00 kind:data(any) addr:0x020c3f30 data_ov017_020c3f3c kind:data(any) addr:0x020c3f3c diff --git a/config/eur/arm9/overlays/ov021/symbols.txt b/config/eur/arm9/overlays/ov021/symbols.txt index ed720a36..3e9c310b 100644 --- a/config/eur/arm9/overlays/ov021/symbols.txt +++ b/config/eur/arm9/overlays/ov021/symbols.txt @@ -55,12 +55,12 @@ _ZN21UnkStruct_027e0ce0_24D1Ev kind:function(thumb,size=0x2) addr:0x020eaa04 _ZN21UnkStruct_027e0ce0_2419func_ov021_020eaa08EP21UnkStruct_027e0ce0_20 kind:function(thumb,size=0xbc) addr:0x020eaa08 _ZN21UnkStruct_027e0ce0_2419func_ov021_020eaac4Ev kind:function(thumb,size=0x50) addr:0x020eaac4 _ZN21UnkStruct_027e0ce0_2419func_ov021_020eab14EiPK24UnkStruct_ov001_020c40f4P21UnkStruct_027e0ce0_30 kind:function(thumb,size=0x56) addr:0x020eab14 -func_ov021_020eab6c kind:function(arm,size=0x2c0) addr:0x020eab6c -func_ov021_020eae2c kind:function(arm,size=0x58) addr:0x020eae2c -func_ov021_020eae84 kind:function(arm,size=0x6c) addr:0x020eae84 -func_ov021_020eaef0 kind:function(arm,size=0xa8) addr:0x020eaef0 +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eab6cEb kind:function(arm,size=0x2c0) addr:0x020eab6c +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eae2cEi kind:function(arm,size=0x58) addr:0x020eae2c +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eae84Ev kind:function(arm,size=0x6c) addr:0x020eae84 +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eaef0Eib kind:function(arm,size=0xa8) addr:0x020eaef0 func_ov021_020eaf98 kind:function(arm,size=0x78) addr:0x020eaf98 -func_ov021_020eb010 kind:function(arm,size=0x358) addr:0x020eb010 +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eb010Ev kind:function(arm,size=0x358) addr:0x020eb010 func_ov021_020eb368 kind:function(arm,size=0x30) addr:0x020eb368 func_ov021_020eb398 kind:function(arm,size=0x48) addr:0x020eb398 func_ov021_020eb3e0 kind:function(arm,size=0x48) addr:0x020eb3e0 @@ -76,14 +76,14 @@ func_ov021_020eb648 kind:function(arm,size=0x78) addr:0x020eb648 func_ov021_020eb6c0 kind:function(arm,size=0x7c) addr:0x020eb6c0 func_ov021_020eb73c kind:function(arm,size=0xe8) addr:0x020eb73c func_ov021_020eb824 kind:function(arm,size=0x4c) addr:0x020eb824 -func_ov021_020eb870 kind:function(arm,size=0x90) addr:0x020eb870 +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eb870EiiiPv kind:function(arm,size=0x90) addr:0x020eb870 func_ov021_020eb900 kind:function(arm,size=0x148) addr:0x020eb900 func_ov021_020eba48 kind:function(thumb,size=0x60) addr:0x020eba48 func_ov021_020ebaa8 kind:function(arm,size=0x90) addr:0x020ebaa8 func_ov021_020ebb38 kind:function(arm,size=0x104) addr:0x020ebb38 _ZN24UnkStruct_027e0ce0_30_08C1Ei kind:function(thumb,size=0x28) addr:0x020ebc3c _ZN24UnkStruct_027e0ce0_30_08D1Ev kind:function(thumb,size=0x2) addr:0x020ebc64 -func_ov021_020ebc68 kind:function(arm,size=0x4c) addr:0x020ebc68 +_ZN24UnkStruct_027e0ce0_30_0819func_ov021_020ebc68Ev kind:function(arm,size=0x4c) addr:0x020ebc68 func_ov021_020ebcb4 kind:function(arm,size=0xec) addr:0x020ebcb4 _ZN15PlayerLinkActor19func_ov021_020ebda0Ev kind:function(arm,size=0x50) addr:0x020ebda0 func_ov021_020ebdf0 kind:function(arm,size=0x58) addr:0x020ebdf0 @@ -422,7 +422,7 @@ func_ov021_020f6614 kind:function(arm,size=0xb0) addr:0x020f6614 func_ov021_020f66c4 kind:function(arm,size=0x12c) addr:0x020f66c4 func_ov021_020f67f0 kind:function(arm,size=0x70c) addr:0x020f67f0 func_ov021_020f6efc kind:function(arm,size=0x5c) addr:0x020f6efc -func_ov021_020f6f58 kind:function(arm,size=0x1e4) addr:0x020f6f58 +_ZN18UnkStruct_027e0cf419func_ov021_020f6f58EiiPvii kind:function(arm,size=0x1e4) addr:0x020f6f58 func_ov021_020f713c kind:function(arm,size=0xdc) addr:0x020f713c func_ov021_020f7218 kind:function(arm,size=0x530) addr:0x020f7218 func_ov021_020f7748 kind:function(arm,size=0x24) addr:0x020f7748 diff --git a/config/eur/arm9/overlays/ov024/symbols.txt b/config/eur/arm9/overlays/ov024/symbols.txt index 57d90e4e..c940b6a6 100644 --- a/config/eur/arm9/overlays/ov024/symbols.txt +++ b/config/eur/arm9/overlays/ov024/symbols.txt @@ -109,10 +109,10 @@ _ZN18UnkStruct_027e09987DestroyEv kind:function(arm,size=0x2c) addr:0x020c6f08 _ZN18UnkStruct_027e0998D1Ev kind:function(arm,size=0x14) addr:0x020c6f34 _ZN18UnkStruct_027e0998C1Ev kind:function(arm,size=0x20) addr:0x020c6f48 _ZN18UnkStruct_027e09986CreateEv kind:function(arm,size=0x24) addr:0x020c6f68 -_ZN18UnkStruct_027e09988vfunc_00EP7VecFx32P5Vec2sPt kind:function(arm,size=0x1e0) addr:0x020c6f8c +_ZN18UnkStruct_027e09988vfunc_00EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x1e0) addr:0x020c6f8c _ZN18UnkStruct_027e099819func_ov024_020c716cEv kind:function(arm,size=0xa8) addr:0x020c716c -_ZN18UnkStruct_027e099819func_ov024_020c7214EP7VecFx32P5Vec2sPt kind:function(arm,size=0x68) addr:0x020c7214 -_ZN18UnkStruct_027e099819func_ov024_020c727cEP5Vec2sPt kind:function(arm,size=0x84) addr:0x020c727c +_ZN18UnkStruct_027e099819func_ov024_020c7214EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x68) addr:0x020c7214 +_ZN18UnkStruct_027e099819func_ov024_020c727cEP5Vec2sP8ActorRef kind:function(arm,size=0x84) addr:0x020c727c _ZN18UnkStruct_027e099819func_ov024_020c7300Ei kind:function(arm,size=0x54) addr:0x020c7300 _ZN18UnkStruct_027e099819func_ov024_020c7354Ev kind:function(arm,size=0x3c) addr:0x020c7354 _ZN18UnkStruct_027e0cf86CreateEv kind:function(arm,size=0x24) addr:0x020c7390 diff --git a/config/eur/arm9/overlays/ov026/symbols.txt b/config/eur/arm9/overlays/ov026/symbols.txt index 76eeec1f..6a89ee33 100644 --- a/config/eur/arm9/overlays/ov026/symbols.txt +++ b/config/eur/arm9/overlays/ov026/symbols.txt @@ -47,7 +47,7 @@ func_ov026_020d9778 kind:function(arm,size=0x10) addr:0x020d9778 func_ov026_020d9788 kind:function(arm,size=0x148) addr:0x020d9788 func_ov026_020d98d0 kind:function(arm,size=0xe8) addr:0x020d98d0 func_ov026_020d99b8 kind:function(arm,size=0x25c) addr:0x020d99b8 -func_ov026_020d9c14 kind:function(arm,size=0x460) addr:0x020d9c14 +_ZN18UnkStruct_027e0d3819func_ov026_020d9c14E8ActorRefP7VecFx32S2_ kind:function(arm,size=0x460) addr:0x020d9c14 func_ov026_020da074 kind:function(arm,size=0x114) addr:0x020da074 func_ov026_020da188 kind:function(arm,size=0x114) addr:0x020da188 func_ov026_020da29c kind:function(arm,size=0x164) addr:0x020da29c @@ -102,13 +102,13 @@ _ZN21UnkStruct_027e0ce0_3819func_ov026_020dc8f0Ev kind:function(arm,size=0x28) a _ZN21UnkStruct_027e0ce0_3819func_ov026_020dc918Ev kind:function(arm,size=0x98) addr:0x020dc918 _ZN21UnkStruct_027e0ce0_3819func_ov026_020dc9b0Ev kind:function(arm,size=0x64) addr:0x020dc9b0 _ZN24UnkStruct_ov026_02138d1019func_ov026_020dca14Ev kind:function(arm,size=0x1788) addr:0x020dca14 -func_ov026_020de19c kind:function(arm,size=0x38) addr:0x020de19c +_ZN21UnkStruct_027e0ce0_3819func_ov026_020de19cEib kind:function(arm,size=0x38) addr:0x020de19c func_ov026_020de1d4 kind:function(arm,size=0x30) addr:0x020de1d4 func_ov026_020de204 kind:function(arm,size=0x158) addr:0x020de204 func_ov026_020de35c kind:function(arm,size=0x100) addr:0x020de35c -func_ov026_020de45c kind:function(arm,size=0x10) addr:0x020de45c -func_ov026_020de46c kind:function(arm,size=0x30) addr:0x020de46c -func_ov026_020de49c kind:function(arm,size=0x46c) addr:0x020de49c +_ZN21UnkStruct_027e0ce0_3819func_ov026_020de45cEPv kind:function(arm,size=0x10) addr:0x020de45c +_ZN21UnkStruct_027e0ce0_3819func_ov026_020de46cEv kind:function(arm,size=0x30) addr:0x020de46c +_ZN21UnkStruct_027e0ce0_3819func_ov026_020de49cEv kind:function(arm,size=0x46c) addr:0x020de49c _ZN21UnkStruct_027e0ce0_3819func_ov026_020de908EP24UnkStruct_027e0ce0_30_00 kind:function(arm,size=0xb4) addr:0x020de908 _ZN21UnkStruct_027e0ce0_3819func_ov026_020dc9bcEPK24UnkStruct_ov001_020c40f4 kind:function(arm,size=0x1c) addr:0x020de9bc func_ov026_020de9d8 kind:function(arm,size=0x84) addr:0x020de9d8 diff --git a/config/eur/arm9/overlays/ov031/symbols.txt b/config/eur/arm9/overlays/ov031/symbols.txt index 93670636..7b5b660e 100644 --- a/config/eur/arm9/overlays/ov031/symbols.txt +++ b/config/eur/arm9/overlays/ov031/symbols.txt @@ -85,7 +85,7 @@ func_ov031_020d99ec kind:function(arm,size=0x10) addr:0x020d99ec func_ov031_020d99fc kind:function(arm,size=0x20) addr:0x020d99fc func_ov031_020d9a1c kind:function(arm,size=0x18) addr:0x020d9a1c func_ov031_020d9a34 kind:function(arm,size=0x18) addr:0x020d9a34 -func_ov031_020d9a4c kind:function(arm,size=0x10) addr:0x020d9a4c +_ZN18UnkStruct_027e0d3419func_ov031_020d9a4cEi kind:function(arm,size=0x10) addr:0x020d9a4c func_ov031_020d9a5c kind:function(arm,size=0x1c) addr:0x020d9a5c func_ov031_020d9a78 kind:function(arm,size=0x20) addr:0x020d9a78 func_ov031_020d9a98 kind:function(arm,size=0x10) addr:0x020d9a98 @@ -138,7 +138,7 @@ func_ov031_020dafe8 kind:function(arm,size=0x40) addr:0x020dafe8 func_ov031_020db028 kind:function(arm,size=0xd4) addr:0x020db028 _ZN19PlayerLinkActor_13419func_ov031_020db0fcEv kind:function(arm,size=0x24) addr:0x020db0fc func_ov031_020db120 kind:function(arm,size=0x40) addr:0x020db120 -func_ov031_020db160 kind:function(arm,size=0x30) addr:0x020db160 +_ZN19PlayerLinkActor_13419func_ov031_020db160Eb kind:function(arm,size=0x30) addr:0x020db160 _ZN18PlayerActorBase_7419func_ov001_020db190Ev kind:function(arm,size=0x24) addr:0x020db190 func_ov031_020db1b4 kind:function(arm,size=0xfc) addr:0x020db1b4 _ZN27UnkStruct_ItemManager_20_1019func_ov031_020db2b0Ev kind:function(arm,size=0x2c) addr:0x020db2b0 @@ -149,33 +149,33 @@ 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 -_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_0419func_ov031_020db4f0Ebb kind:function(arm,size=0x38) addr:0x020db4f0 +_ZN27UnkStruct_ItemManager_20_0419func_ov031_020db528EPv 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 -_ZN27UnkStruct_ItemManager_20_0819func_ov031_020db704Eii kind:function(arm,size=0xbc) addr:0x020db704 +_ZN27UnkStruct_ItemManager_20_0819func_ov031_020db704Ebb 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 _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_020db844Ej 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 -_ZN24UnkStruct_ItemManager_2019func_ov031_020db8f8Ev kind:function(arm,size=0x44) addr:0x020db8f8 +_ZN24UnkStruct_ItemManager_2019func_ov031_020db8f8EP24UnkStruct_027e0ce0_30_00 kind:function(arm,size=0x44) addr:0x020db8f8 _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 -_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_0C19func_ov031_020db958Ebb kind:function(arm,size=0xe4) addr:0x020db958 +_ZN27UnkStruct_ItemManager_20_0C19func_ov031_020dba3cEPv 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 -_ZN27UnkStruct_ItemManager_20_0019func_ov031_020dbc80Eii kind:function(arm,size=0xa4) addr:0x020dbc80 +_ZN27UnkStruct_ItemManager_20_0019func_ov031_020dbc80Ebb 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 @@ -211,11 +211,11 @@ func_ov031_020dc8a0 kind:function(arm,size=0x6c) addr:0x020dc8a0 func_ov031_020dc90c kind:function(arm,size=0x114) addr:0x020dc90c _ZN32UnkStruct_027e0ce0_40_Base_7C_04C1Ev kind:function(thumb,size=0xc) addr:0x020dca20 _ZN32UnkStruct_027e0ce0_40_Base_7C_04D1Ev kind:function(thumb,size=0xe) addr:0x020dca2c -func_ov031_020dca3c kind:function(arm,size=0x10) addr:0x020dca3c +_ZN32UnkStruct_027e0ce0_40_Base_7C_0419func_ov031_020dca3cEv kind:function(arm,size=0x10) addr:0x020dca3c func_ov031_020dca4c kind:function(thumb,size=0x84) addr:0x020dca4c func_ov031_020dcad0 kind:function(arm,size=0x3c) addr:0x020dcad0 func_ov031_020dcb0c kind:function(arm,size=0x54) addr:0x020dcb0c -func_ov031_020dcb60 kind:function(arm,size=0xbc) addr:0x020dcb60 +_ZN32UnkStruct_027e0ce0_40_Base_7C_0419func_ov031_020dcb60E15UnkParamStruct1 kind:function(arm,size=0xbc) addr:0x020dcb60 func_ov031_020dcc1c kind:function(arm,size=0xa0) addr:0x020dcc1c func_ov031_020dccbc kind:function(thumb,size=0x32) addr:0x020dccbc _ZN15PlayerLinkActor19func_ov031_020dccf0Ev kind:function(thumb,size=0x30) addr:0x020dccf0 @@ -226,7 +226,7 @@ _ZN29UnkStruct_027e0ce0_40_Base_78C1Ev kind:function(thumb,size=0x6) addr:0x020d _ZN29UnkStruct_027e0ce0_40_Base_78D1Ev kind:function(thumb,size=0x2) addr:0x020dcd98 func_ov031_020dcd9c kind:function(arm,size=0x108) addr:0x020dcd9c func_ov031_020dcea4 kind:function(arm,size=0x110) addr:0x020dcea4 -func_ov031_020dcfb4 kind:function(arm,size=0x12c) addr:0x020dcfb4 +_ZN29UnkStruct_027e0ce0_40_Base_7819func_ov031_020dcfb4EPv kind:function(arm,size=0x12c) addr:0x020dcfb4 func_ov031_020dd0e0 kind:function(arm,size=0x44) addr:0x020dd0e0 func_ov031_020dd124 kind:function(arm,size=0x80) addr:0x020dd124 func_ov031_020dd1a4 kind:function(arm,size=0xd0) addr:0x020dd1a4 @@ -342,7 +342,7 @@ _ZN9ActorBomb19func_ov031_020e20fcEv kind:function(arm,size=0x4) addr:0x020e20fc _ZN9ActorBomb19func_ov031_020e2100Ev kind:function(arm,size=0x34) addr:0x020e2100 _ZN9ActorBomb19func_ov031_020e2134Ev kind:function(arm,size=0xec) addr:0x020e2134 _ZN24ActorBomb_ov031_020e2134D1Ev kind:function(arm,size=0x14) addr:0x020e2220 -_ZN9ActorBomb8vfunc_2CEi kind:function(arm,size=0x158) addr:0x020e2234 +_ZN9ActorBomb8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x158) addr:0x020e2234 _ZN9ActorBomb19func_ov031_020e238cEv kind:function(arm,size=0xe0) addr:0x020e238c _ZN9ActorBomb4GrabE15ActorGrabParams kind:function(arm,size=0x40) addr:0x020e246c _ZN9ActorBomb4DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0x110) addr:0x020e24ac @@ -436,7 +436,7 @@ _ZN18ActorItemBoomerang8vfunc_20Ev kind:function(arm,size=0x614) addr:0x020e4a20 _ZN18ActorItemBoomerang19func_ov031_020e5034Ei kind:function(arm,size=0x1ec) addr:0x020e5034 _ZN18ActorItemBoomerang19func_ov031_020e5220Ev kind:function(arm,size=0x80) addr:0x020e5220 _ZN18ActorItemBoomerang19func_ov031_020e52a0Ev kind:function(arm,size=0xb4) addr:0x020e52a0 -_ZN18ActorItemBoomerang8vfunc_2CEi kind:function(arm,size=0x74) addr:0x020e5354 +_ZN18ActorItemBoomerang8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x74) addr:0x020e5354 _ZN21ActorItemBoomerang_A08vfunc_10EP5Actor kind:function(arm,size=0x1c) addr:0x020e53c8 _ZN21ActorItemBoomerang_CC8vfunc_10EP5Actor kind:function(arm,size=0x1c) addr:0x020e53e4 _ZN21ActorItemBoomerang_CC8vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x4c) addr:0x020e5400 @@ -462,7 +462,7 @@ _ZN16ActorItemTornado8SetStateEs kind:function(arm,size=0x118) addr:0x020e5c00 _ZN16ActorItemTornado19func_ov031_020e5d18Ei kind:function(arm,size=0x430) addr:0x020e5d18 _ZN16ActorItemTornado8vfunc_20Ev kind:function(arm,size=0x10) addr:0x020e6148 _ZN16ActorItemTornado8vfunc_24Ev kind:function(arm,size=0x44) addr:0x020e6158 -_ZN16ActorItemTornado8vfunc_2CEi kind:function(arm,size=0x124) addr:0x020e619c +_ZN16ActorItemTornado8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x124) addr:0x020e619c _ZN16ActorItemTornado19func_ov031_020e62c0Ev kind:function(arm,size=0x54) addr:0x020e62c0 _ZN16ActorItemTornado19func_ov031_020e6314Et kind:function(arm,size=0x2c) addr:0x020e6314 _ZN16ActorItemTornado19func_ov031_020e6340EP7VecFx32ss kind:function(arm,size=0x58) addr:0x020e6340 @@ -499,7 +499,7 @@ _ZN12ActorUnkSWBM19func_ov031_020e6e84Es kind:function(arm,size=0x74) addr:0x020 _ZN12ActorUnkSWBM8vfunc_20Ev kind:function(arm,size=0x268) addr:0x020e6ef8 _ZN12ActorUnkSWBM8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x020e7160 _ZN12ActorUnkSWBM19func_ov031_020e718cEP7VecFx32P5Mat3pists kind:function(arm,size=0x108) addr:0x020e718c -_ZN12ActorUnkSWBM8vfunc_2CEi kind:function(arm,size=0x40) addr:0x020e7294 +_ZN12ActorUnkSWBM8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x40) addr:0x020e7294 _ZN15ActorUnkSWBM_94D0Ev kind:function(arm,size=0x1c) addr:0x020e72d4 _ZN15ActorUnkSWBM_98D0Ev kind:function(arm,size=0x1c) addr:0x020e72f0 _ZN12ActorUnkSWBMD1Ev kind:function(arm,size=0x28) addr:0x020e730c @@ -550,7 +550,7 @@ _ZN12ActorUnkROCK8vfunc_18Ei kind:function(arm,size=0x30) addr:0x020e897c _ZN12ActorUnkROCK8vfunc_20Ev kind:function(arm,size=0x9c) addr:0x020e89ac _ZN12ActorUnkROCK19func_ov031_020e8a48Es kind:function(arm,size=0x84) addr:0x020e8a48 _ZN12ActorUnkROCK19func_ov031_020e8accEv kind:function(arm,size=0x30) addr:0x020e8acc -_ZN12ActorUnkROCK8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x020e8afc +_ZN12ActorUnkROCK8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0x020e8afc _ZN12ActorUnkROCK4GrabE15ActorGrabParams kind:function(arm,size=0x68) addr:0x020e8ba0 _ZN12ActorUnkROCK4DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0x44) addr:0x020e8c08 _ZN12ActorUnkROCKD1Ev kind:function(arm,size=0x28) addr:0x020e8c4c @@ -594,7 +594,7 @@ _ZN10ActorRupee8SetStateEs kind:function(arm,size=0x54) addr:0x020e9904 _ZN10ActorRupee8vfunc_20Ev kind:function(arm,size=0x230) addr:0x020e9958 _ZN10ActorRupee19func_ov031_020e9b88Ev kind:function(arm,size=0x60) addr:0x020e9b88 _ZN10ActorRupee19func_ov031_020e9be8Ev kind:function(arm,size=0x44) addr:0x020e9be8 -_ZN10ActorRupee8vfunc_2CEi kind:function(arm,size=0x128) addr:0x020e9c2c +_ZN10ActorRupee8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x128) addr:0x020e9c2c _ZN10ActorRupee19func_ov031_020e9d54Ev kind:function(arm,size=0x40) addr:0x020e9d54 _ZN10ActorRupee19func_ov031_020e9d94Ev kind:function(arm,size=0xc8) addr:0x020e9d94 _ZN10ActorRupee19func_ov031_020e9e5cEv kind:function(arm,size=0x94) addr:0x020e9e5c @@ -665,7 +665,7 @@ _ZN12ActorUnkZLSL19func_ov031_020ec0d4Ev kind:function(arm,size=0x58) addr:0x020 _ZN12ActorUnkZLSL19func_ov031_020ec12cEv kind:function(arm,size=0x38) addr:0x020ec12c _ZN12ActorUnkZLSL19func_ov031_020ec164Ev kind:function(arm,size=0xc) addr:0x020ec164 _ZN12ActorUnkZLSL19func_ov031_020ec170Ev kind:function(arm,size=0x64) addr:0x020ec170 -_ZN12ActorUnkZLSL8vfunc_2CEi kind:function(arm,size=0xfc) addr:0x020ec1d4 +_ZN12ActorUnkZLSL8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xfc) addr:0x020ec1d4 _ZN12ActorUnkZLSL8vfunc_7CEi kind:function(arm,size=0x100) addr:0x020ec2d0 _ZN12ActorUnkZLSL19func_ov031_020ec3d0Ev kind:function(arm,size=0xcc) addr:0x020ec3d0 _ZN12ActorUnkZLSL19func_ov031_020ec49cEv kind:function(arm,size=0xb0) addr:0x020ec49c @@ -752,7 +752,7 @@ _ZN10ActorHeart19func_ov031_020ef458Ev kind:function(arm,size=0x50) addr:0x020ef _ZN10ActorHeart19func_ov031_020ef4a8Ev kind:function(arm,size=0x80) addr:0x020ef4a8 _ZN10ActorHeart19func_ov031_020ef528Ev kind:function(arm,size=0x48) addr:0x020ef528 _ZN10ActorHeart19func_ov031_020ef570Ev kind:function(arm,size=0x78) addr:0x020ef570 -_ZN10ActorHeart8vfunc_2CEi kind:function(arm,size=0xb0) addr:0x020ef5e8 +_ZN10ActorHeart8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020ef5e8 _ZN10ActorHeart19func_ov031_020ef698Ev kind:function(arm,size=0x60) addr:0x020ef698 _ZN13ActorHeart_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020ef6f8 _ZN13ActorHeart_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020ef730 @@ -768,7 +768,7 @@ _ZN19ActorProfileUnkRMTGC1Ev kind:function(arm,size=0x28) addr:0x020ef84c _ZN12ActorUnkRMTGC1Ev kind:function(arm,size=0x2c) addr:0x020ef874 _ZN12ActorUnkRMTG8vfunc_18Ei kind:function(arm,size=0xb8) addr:0x020ef8a0 _ZN12ActorUnkRMTG8vfunc_1CEv kind:function(arm,size=0x38) addr:0x020ef958 -_ZN12ActorUnkRMTG8vfunc_2CEi kind:function(arm,size=0x20) addr:0x020ef990 +_ZN12ActorUnkRMTG8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020ef990 _ZN12ActorUnkRMTGD1Ev kind:function(arm,size=0x20) addr:0x020ef9b0 _ZN12ActorUnkRMTGD0Ev kind:function(arm,size=0x28) addr:0x020ef9d0 _ZN19ActorProfileUnkRMTGD1Ev kind:function(arm,size=0x14) addr:0x020ef9f8 @@ -830,7 +830,7 @@ _ZN26ModelRender_ov000_020b198cD1Ev kind:function(arm,size=0x14) addr:0x020f0cf0 _ZN8ActorPot8vfunc_18Ei kind:function(arm,size=0x28) addr:0x020f0d04 _ZN8ActorPot8vfunc_5CEs kind:function(arm,size=0x54) addr:0x020f0d2c _ZN8ActorPot8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020f0d80 -_ZN8ActorPot8vfunc_2CEi kind:function(arm,size=0x30) addr:0x020f0db8 +_ZN8ActorPot8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x020f0db8 _ZN8ActorPot19func_ov031_020f0de8Ev kind:function(arm,size=0xc) addr:0x020f0de8 _ZN8ActorPot19func_ov031_020f0df4Ev kind:function(arm,size=0xc) addr:0x020f0df4 _ZN8ActorPot19func_ov031_020f0e00Ev kind:function(arm,size=0xc) addr:0x020f0e00 @@ -854,7 +854,7 @@ _ZN26ModelRender_ov031_0211578cD1Ev kind:function(arm,size=0x14) addr:0x020f10c0 _ZN15ActorItemFlower8vfunc_18Ei kind:function(arm,size=0x28) addr:0x020f10d4 _ZN15ActorItemFlower8vfunc_5CEs kind:function(arm,size=0x44) addr:0x020f10fc _ZN15ActorItemFlower8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020f1140 -_ZN15ActorItemFlower8vfunc_2CEi kind:function(arm,size=0x30) addr:0x020f1178 +_ZN15ActorItemFlower8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x020f1178 _ZN15ActorItemFlower19func_ov031_020f11a8Ev kind:function(arm,size=0xc) addr:0x020f11a8 _ZN15ActorItemFlower19func_ov031_020f11b4Ev kind:function(arm,size=0xc) addr:0x020f11b4 _ZN15ActorItemFlower19func_ov031_020f11c0Ev kind:function(arm,size=0xc) addr:0x020f11c0 @@ -903,7 +903,7 @@ _ZN14ActorShotArrow19func_ov031_020f2270Ev kind:function(arm,size=0x10) addr:0x0 _ZN14ActorShotArrow19func_ov031_020f2280Ev kind:function(arm,size=0x1c) addr:0x020f2280 _ZN14ActorShotArrow19func_ov031_020f229cEv kind:function(arm,size=0x38) addr:0x020f229c _ZN14ActorShotArrow19func_ov031_020f22d4EP5Mat3pP7VecFx32 kind:function(arm,size=0x3c) addr:0x020f22d4 -_ZN14ActorShotArrow8vfunc_2CEi kind:function(arm,size=0x344) addr:0x020f2310 +_ZN14ActorShotArrow8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x344) addr:0x020f2310 _ZN14ActorShotArrow19func_ov031_020f2654EP5Mat3p kind:function(arm,size=0x140) addr:0x020f2654 _ZN14ActorShotArrow19func_ov031_020f2794Es kind:function(arm,size=0x118) addr:0x020f2794 _ZN14ActorShotArrow19func_ov031_020f28acEv kind:function(arm,size=0x2e0) addr:0x020f28ac @@ -997,7 +997,7 @@ _ZN19ActorProfileUnkNTTZC1Ev kind:function(arm,size=0x28) addr:0x020f6138 _ZN12ActorUnkNTTZC1Ev kind:function(arm,size=0x30) addr:0x020f6160 _ZN12ActorUnkNTTZ8vfunc_18Ei kind:function(arm,size=0x8) addr:0x020f6190 _ZN12ActorUnkNTTZ8vfunc_20Ev kind:function(arm,size=0x4) addr:0x020f6198 -_ZN12ActorUnkNTTZ8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020f619c +_ZN12ActorUnkNTTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020f619c _ZN12ActorUnkNTTZ19func_ov031_020f61a0Ev kind:function(arm,size=0x50) addr:0x020f61a0 _ZN12ActorUnkNTTZ19func_ov031_020f61f0Ev kind:function(arm,size=0x50) addr:0x020f61f0 _ZN12ActorUnkNTTZD1Ev kind:function(arm,size=0x14) addr:0x020f6240 @@ -1029,7 +1029,7 @@ _ZN12ActorUnkTGTZ19func_ov031_020f6e5cE8ActorRef kind:function(arm,size=0x4c) ad _ZN12ActorUnkTGTZ19func_ov031_020f6ea8EP8ActorReftPK7VecFx32st kind:function(arm,size=0x78) addr:0x020f6ea8 _ZN12ActorUnkTGTZ19func_ov031_020f6f20Ei kind:function(arm,size=0x250) addr:0x020f6f20 _ZN12ActorUnkTGTZ8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x138) addr:0x020f7170 -_ZN12ActorUnkTGTZ8vfunc_2CEi kind:function(arm,size=0xb0) addr:0x020f72a8 +_ZN12ActorUnkTGTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020f72a8 _ZN12ActorUnkTGTZ19func_ov031_020f7358Ev kind:function(arm,size=0x8c) addr:0x020f7358 _ZN12ActorUnkTGTZ19func_ov031_020f73e4Ev kind:function(arm,size=0xc) addr:0x020f73e4 _ZN12ActorUnkTGTZ19func_ov031_020f73f0Ev kind:function(arm,size=0xc) addr:0x020f73f0 @@ -1042,7 +1042,7 @@ func_ov031_020f7494 kind:function(arm,size=0x40) addr:0x020f7494 func_ov031_020f74d4 kind:function(arm,size=0x38) addr:0x020f74d4 _ZN24UnkStruct_ov031_02114870C2Ev kind:function(arm,size=0x2c) addr:0x020f750c _ZN24UnkStruct_ov031_021148708vfunc_18Ei kind:function(arm,size=0x3c) addr:0x020f7538 -_ZN24UnkStruct_ov031_021148708vfunc_2CEi kind:function(arm,size=0x20) addr:0x020f7574 +_ZN24UnkStruct_ov031_021148708vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020f7574 _ZN24UnkStruct_ov031_021148708vfunc_54Ev kind:function(arm,size=0x8) addr:0x020f7594 func_ov031_020f759c kind:function(arm,size=0x50) addr:0x020f759c func_ov031_020f75ec kind:function(arm,size=0x8) addr:0x020f75ec @@ -1072,7 +1072,7 @@ _ZN19ActorProfileUnkSWCHC1Ev kind:function(arm,size=0x28) addr:0x020f7ab4 _ZN12ActorUnkSWCHC1Ev kind:function(arm,size=0x30) addr:0x020f7adc _ZN12ActorUnkSWCH8vfunc_18Ei kind:function(arm,size=0x14) addr:0x020f7b0c _ZN12ActorUnkSWCH8vfunc_20Ev kind:function(arm,size=0x68) addr:0x020f7b20 -_ZN12ActorUnkSWCH8vfunc_2CEi kind:function(arm,size=0x10) addr:0x020f7b88 +_ZN12ActorUnkSWCH8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x10) addr:0x020f7b88 _ZN12ActorUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f7b98 _ZN12ActorUnkSWCHD0Ev kind:function(arm,size=0x1c) addr:0x020f7bac _ZN19ActorProfileUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f7bc8 @@ -1120,7 +1120,7 @@ _ZN17ActorRollingStone8vfunc_18Ei kind:function(arm,size=0xf0) addr:0x020f869c _ZN17ActorRollingStone8vfunc_20Ev kind:function(arm,size=0x98) addr:0x020f878c _ZN17ActorRollingStone8SetStateEs kind:function(arm,size=0x5c) addr:0x020f8824 _ZN17ActorRollingStone19func_ov031_020f8880Ev kind:function(arm,size=0xc8) addr:0x020f8880 -_ZN17ActorRollingStone8vfunc_2CEi kind:function(arm,size=0xac) addr:0x020f8948 +_ZN17ActorRollingStone8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xac) addr:0x020f8948 _ZN17ActorRollingStone19func_ov031_020f89f4Ev kind:function(arm,size=0x10) addr:0x020f89f4 _ZN17ActorRollingStone19func_ov031_020f8a04Ev kind:function(arm,size=0x28) addr:0x020f8a04 _ZN17ActorRollingStone19func_ov031_020f8a2cEv kind:function(arm,size=0xc) addr:0x020f8a2c @@ -1188,7 +1188,7 @@ _ZN13ActorItemDrop19func_ov031_020fa668Ev kind:function(arm,size=0x10) addr:0x02 _ZN13ActorItemDrop19func_ov031_020fa678Ev kind:function(arm,size=0x50) addr:0x020fa678 _ZN13ActorItemDrop19func_ov031_020fa6c8Ev kind:function(arm,size=0x64) addr:0x020fa6c8 _ZN13ActorItemDrop19func_ov031_020fa72cEv kind:function(arm,size=0x110) addr:0x020fa72c -_ZN13ActorItemDrop8vfunc_2CEi kind:function(arm,size=0xc4) addr:0x020fa83c +_ZN13ActorItemDrop8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc4) addr:0x020fa83c _ZN13ActorItemDrop19func_ov031_020fa900Ev kind:function(arm,size=0xf8) addr:0x020fa900 _ZN16ActorItemDrop_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020fa9f8 _ZN16ActorItemDrop_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020faa30 @@ -1250,7 +1250,7 @@ _ZN12ActorUnkEFSB8vfunc_18Ei kind:function(arm,size=0xb8) addr:0x020fb614 _ZN12ActorUnkEFSB8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020fb6cc _ZN12ActorUnkEFSB8vfunc_24Ev kind:function(arm,size=0x14) addr:0x020fb704 _ZN12ActorUnkEFSB8vfunc_54Ei kind:function(arm,size=0x8) addr:0x020fb718 -_ZN12ActorUnkEFSB8vfunc_2CEi kind:function(arm,size=0x70) addr:0x020fb720 +_ZN12ActorUnkEFSB8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x70) addr:0x020fb720 _ZN12ActorUnkEFSBD1Ev kind:function(arm,size=0x30) addr:0x020fb790 _ZN12ActorUnkEFSBD0Ev kind:function(arm,size=0x38) addr:0x020fb7c0 _ZN19ActorProfileUnkEFSBD1Ev kind:function(arm,size=0x14) addr:0x020fb7f8 @@ -1265,7 +1265,7 @@ _ZN12ActorUnkNFSP19func_ov031_020fb994Ev kind:function(arm,size=0x20) addr:0x020 _ZN12ActorUnkNFSP19func_ov031_020fb9b4Ev kind:function(arm,size=0xac) addr:0x020fb9b4 _ZN12ActorUnkNFSP19func_ov031_020fba60Ev kind:function(arm,size=0x8c) addr:0x020fba60 _ZN12ActorUnkNFSP8vfunc_54Ei kind:function(arm,size=0x9c) addr:0x020fbaec -_ZN12ActorUnkNFSP8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020fbb88 +_ZN12ActorUnkNFSP8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020fbb88 _ZN12ActorUnkNFSP19func_ov031_020fbb8cEv kind:function(arm,size=0x14) addr:0x020fbb8c _ZN12ActorUnkNFSP19func_ov031_020fbba0E8ActorRef kind:function(arm,size=0x40) addr:0x020fbba0 _ZN12ActorUnkNFSP19func_ov031_020fbbe0Ev kind:function(arm,size=0x24) addr:0x020fbbe0 @@ -1289,7 +1289,7 @@ _ZN17MapObjectDoorBase8vfunc_48Ev kind:function(arm,size=0x4) addr:0x020fcb50 _ZN17MapObjectDoorBase8vfunc_64Ev kind:function(arm,size=0xc) addr:0x020fcb54 _ZN17MapObjectDoorBase8vfunc_68Ev kind:function(arm,size=0x10) addr:0x020fcb60 _ZN17MapObjectDoorBase8vfunc_6CEv kind:function(arm,size=0x8) addr:0x020fcb70 -_ZN17MapObjectDoorBase19func_ov031_020fcb78EPcc kind:function(arm,size=0x180) addr:0x020fcb78 +_ZN17MapObjectDoorBase19func_ov031_020fcb78EPc kind:function(arm,size=0x180) addr:0x020fcb78 _ZN17MapObjectDoorBase8vfunc_74Ev kind:function(arm,size=0x4) addr:0x020fccf8 _ZN17MapObjectDoorBase8vfunc_78Ev kind:function(arm,size=0x4) addr:0x020fccfc _ZN17MapObjectDoorBase8vfunc_7CEv kind:function(arm,size=0x10) addr:0x020fcd00 @@ -1327,8 +1327,8 @@ _ZN24MapObjectDoorDangerSpawn8vfunc_64Ev kind:function(arm,size=0xbc) addr:0x020 _ZN24MapObjectDoorDangerSpawn8vfunc_68Ev kind:function(arm,size=0xac) addr:0x020fdcc4 _ZN24MapObjectDoorDangerSpawn8vfunc_6CEv kind:function(arm,size=0x158) addr:0x020fdd70 _ZN24MapObjectDoorDangerSpawn19func_ov031_020fdec8Ev kind:function(arm,size=0xf8) addr:0x020fdec8 -_ZN24MapObjectDoorDangerSpawn8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020fdfc0 -_ZN24MapObjectDoorDangerSpawn8vfunc_14Ev kind:function(arm,size=0x80) addr:0x020fdfcc +_ZN24MapObjectDoorDangerSpawn8vfunc_18EPc kind:function(arm,size=0xc) addr:0x020fdfc0 +_ZN24MapObjectDoorDangerSpawn8vfunc_14Ei kind:function(arm,size=0x80) addr:0x020fdfcc _ZN24MapObjectDoorDangerSpawn9vfunc2_10Ev kind:function(arm,size=0x84) addr:0x020fe04c _ZN24MapObjectDoorDangerSpawn8vfunc_74Ev kind:function(arm,size=0x15c) addr:0x020fe0d0 _ZN24MapObjectDoorDangerSpawn8vfunc_7CEv kind:function(arm,size=0x24) addr:0x020fe22c @@ -1351,8 +1351,8 @@ _ZN23MapObjectProfileDoorKeyC1Ev kind:function(arm,size=0x54) addr:0x020fe764 _ZN16MapObjectDoorKeyC1Ev kind:function(arm,size=0xb4) addr:0x020fe7b8 _ZN16MapObjectDoorKey8vfunc_00Ev kind:function(arm,size=0x1c) addr:0x020fe86c _ZN16MapObjectDoorKey8vfunc_08Ev kind:function(arm,size=0x18) addr:0x020fe888 -_ZN16MapObjectDoorKey8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020fe8a0 -_ZN16MapObjectDoorKey8vfunc_14Ev kind:function(arm,size=0x14c) addr:0x020fe8ac +_ZN16MapObjectDoorKey8vfunc_18EPc kind:function(arm,size=0xc) addr:0x020fe8a0 +_ZN16MapObjectDoorKey8vfunc_14Ei kind:function(arm,size=0x14c) addr:0x020fe8ac _ZN16MapObjectDoorKey8vfunc_5CEsi kind:function(arm,size=0x90) addr:0x020fe9f8 _ZN16MapObjectDoorKey19func_ov031_020fea88Ev kind:function(arm,size=0x34) addr:0x020fea88 _ZN16MapObjectDoorKey8vfunc_28Eiii kind:function(arm,size=0x90) addr:0x020feabc @@ -1378,8 +1378,8 @@ _ZN19MapObjectDoorSwitch8vfunc_00Ev kind:function(arm,size=0xd0) addr:0x020fefac _ZN19MapObjectDoorSwitch8vfunc_08Ev kind:function(arm,size=0x84) addr:0x020ff07c _ZN19MapObjectDoorSwitch8vfunc_64Ev kind:function(arm,size=0x10) addr:0x020ff100 _ZN19MapObjectDoorSwitch8vfunc_6CEv kind:function(arm,size=0x20) addr:0x020ff110 -_ZN19MapObjectDoorSwitch8vfunc_14Ev kind:function(arm,size=0x80) addr:0x020ff130 -_ZN19MapObjectDoorSwitch8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020ff1b0 +_ZN19MapObjectDoorSwitch8vfunc_14Ei kind:function(arm,size=0x80) addr:0x020ff130 +_ZN19MapObjectDoorSwitch8vfunc_18EPc kind:function(arm,size=0xc) addr:0x020ff1b0 _ZN19MapObjectDoorSwitch8vfunc_74Ev kind:function(arm,size=0xcc) addr:0x020ff1bc _ZN19MapObjectDoorSwitch8GetModelEv kind:function(arm,size=0x50) addr:0x020ff288 _ZN19MapObjectDoorSwitch8vfunc_50Ev kind:function(arm,size=0x40) addr:0x020ff2d8 @@ -1400,8 +1400,8 @@ _ZN18MapObjectDoorClickC1Ev kind:function(arm,size=0x88) addr:0x020ff620 _ZN18MapObjectDoorClick9vfunc2_1CEi kind:function(arm,size=0x14) addr:0x020ff6a8 _ZN18MapObjectDoorClick8vfunc_00Ev kind:function(arm,size=0x100) addr:0x020ff6bc _ZN18MapObjectDoorClick8vfunc_08Ev kind:function(arm,size=0x3d0) addr:0x020ff7bc -_ZN18MapObjectDoorClick8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020ffb8c -_ZN18MapObjectDoorClick8vfunc_14Ev kind:function(arm,size=0x14c) addr:0x020ffb98 +_ZN18MapObjectDoorClick8vfunc_18EPc kind:function(arm,size=0xc) addr:0x020ffb8c +_ZN18MapObjectDoorClick8vfunc_14Ei kind:function(arm,size=0x14c) addr:0x020ffb98 _ZN18MapObjectDoorClick8vfunc_5CEsi kind:function(arm,size=0xf8) addr:0x020ffce4 _ZN18MapObjectDoorClick9vfunc2_14Ev kind:function(arm,size=0x8) addr:0x020ffddc _ZN18MapObjectDoorClick19func_ov031_020ffde4Ev kind:function(arm,size=0x38) addr:0x020ffde4 @@ -1476,7 +1476,7 @@ _ZN14MapObjectGrassC2Ev kind:function(arm,size=0x48) addr:0x021010e0 _ZN14MapObjectGrassC1Ev kind:function(arm,size=0x48) addr:0x02101128 _ZN14MapObjectGrass8vfunc_00Ev kind:function(arm,size=0x31c) addr:0x02101170 _ZN14MapObjectGrass8vfunc_08Ev kind:function(arm,size=0x78) addr:0x0210148c -_ZN14MapObjectGrass8vfunc_14Ev kind:function(arm,size=0x74) addr:0x02101504 +_ZN14MapObjectGrass8vfunc_14Ei kind:function(arm,size=0x74) addr:0x02101504 _ZN14MapObjectGrass8vfunc_38Esi kind:function(arm,size=0x13c) addr:0x02101578 _ZN14MapObjectGrass19func_ov031_021016b4Ev kind:function(arm,size=0x88) addr:0x021016b4 _ZN14MapObjectGrass8vfunc_3CEP7VecFx32 kind:function(arm,size=0x3c) addr:0x0210173c @@ -1501,7 +1501,7 @@ _ZN16MapObjectUnkSWHT8vfunc_00Ev kind:function(arm,size=0xf0) addr:0x02101ce8 _ZN16MapObjectUnkSWHT19func_ov031_02101dd8Ev kind:function(arm,size=0x44) addr:0x02101dd8 _ZN16MapObjectUnkSWHT8vfunc_08Ev kind:function(arm,size=0x16c) addr:0x02101e1c _ZN16MapObjectUnkSWHT8vfunc_0CEv kind:function(arm,size=0xc) addr:0x02101f88 -_ZN16MapObjectUnkSWHT8vfunc_14Ev kind:function(arm,size=0x20) addr:0x02101f94 +_ZN16MapObjectUnkSWHT8vfunc_14Ei kind:function(arm,size=0x20) addr:0x02101f94 _ZN16MapObjectUnkSWHT8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x138) addr:0x02101fb4 _ZN16MapObjectUnkSWHT19func_ov031_021020ecEv kind:function(arm,size=0xd4) addr:0x021020ec _ZN16MapObjectUnkSWHT19func_ov031_021021c0Esi kind:function(arm,size=0x1f0) addr:0x021021c0 @@ -1517,7 +1517,7 @@ _ZN19MapObjectBombFlower8vfunc_58Ev kind:function(arm,size=0x10) addr:0x02102718 _ZN19MapObjectBombFlower19func_ov031_02102728Ei kind:function(arm,size=0x7c) addr:0x02102728 _ZN19MapObjectBombFlower8vfunc_08Ev kind:function(arm,size=0xf0) addr:0x021027a4 _ZN19MapObjectBombFlower8SetStateEsi kind:function(arm,size=0x15c) addr:0x02102894 -_ZN19MapObjectBombFlower8vfunc_14Ev kind:function(arm,size=0x50) addr:0x021029f0 +_ZN19MapObjectBombFlower8vfunc_14Ei kind:function(arm,size=0x50) addr:0x021029f0 _ZN19MapObjectBombFlower8vfunc_38Ev kind:function(arm,size=0x98) addr:0x02102a40 _ZN19MapObjectBombFlower8vfunc_28Eiii kind:function(arm,size=0x1c) addr:0x02102ad8 _ZN19MapObjectBombFlower8vfunc_50EP8ActorRefP17MapObjectPot_Base kind:function(arm,size=0x70) addr:0x02102af4 @@ -1555,8 +1555,8 @@ _ZN18MapObjectChestBase19func_ov031_021037d0Ev kind:function(arm,size=0x94) addr _ZN18MapObjectChestBase19func_ov031_02103864Ev kind:function(arm,size=0x14) addr:0x02103864 _ZN18MapObjectChestBase19func_ov031_02103878Ev kind:function(arm,size=0x1c) addr:0x02103878 _ZN18MapObjectChestBase8vfunc_38Eii kind:function(arm,size=0x3b4) addr:0x02103894 -_ZN18MapObjectChestBase8vfunc_18EPcc kind:function(arm,size=0xe8) addr:0x02103c48 -_ZN18MapObjectChestBase8vfunc_14Ev kind:function(arm,size=0x108) addr:0x02103d30 +_ZN18MapObjectChestBase8vfunc_18EPc kind:function(arm,size=0xe8) addr:0x02103c48 +_ZN18MapObjectChestBase8vfunc_14Ei kind:function(arm,size=0x108) addr:0x02103d30 _ZN18MapObjectChestBase8vfunc_3CEv kind:function(arm,size=0x100) addr:0x02103e38 _ZN18MapObjectChestBase8vfunc_40Ev kind:function(arm,size=0x8) addr:0x02103f38 _ZN18MapObjectChestBase8vfunc_44Ev kind:function(arm,size=0x8) addr:0x02103f40 @@ -1628,7 +1628,7 @@ _ZN12MapObjectPotC1Ev kind:function(arm,size=0x9c) addr:0x02104fec _ZN12MapObjectPot8vfunc_04Ev kind:function(arm,size=0x2c) addr:0x02105088 _ZN12MapObjectPot8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x120) addr:0x021050b4 _ZN12MapObjectPot8vfunc_48Ev kind:function(arm,size=0xf8) addr:0x021051d4 -_ZN12MapObjectPot8vfunc_14Ev kind:function(arm,size=0x44) addr:0x021052cc +_ZN12MapObjectPot8vfunc_14Ei kind:function(arm,size=0x44) addr:0x021052cc _ZN12MapObjectPot8vfunc_54Ev kind:function(arm,size=0x38) addr:0x02105310 _ZN12MapObjectPot8vfunc_24EP9MapObject7VecFx32 kind:function(arm,size=0x6c) addr:0x02105348 _ZN12MapObjectPot8vfunc_3CEv kind:function(arm,size=0x48) addr:0x021053b4 @@ -1674,7 +1674,7 @@ _ZN16MapObjectUnkSKDI19func_ov031_0210643cEi kind:function(arm,size=0x23c) addr: _ZN16MapObjectUnkSKDI19func_ov031_02106678Esi kind:function(arm,size=0x3f8) addr:0x02106678 _ZN16MapObjectUnkSKDI19func_ov031_02106a70Ev kind:function(arm,size=0x14) addr:0x02106a70 _ZN16MapObjectUnkSKDI8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x1f4) addr:0x02106a84 -_ZN16MapObjectUnkSKDI8vfunc_14Ev kind:function(arm,size=0x20) addr:0x02106c78 +_ZN16MapObjectUnkSKDI8vfunc_14Ei kind:function(arm,size=0x20) addr:0x02106c78 _ZN16MapObjectUnkSKDI8vfunc_38Ev kind:function(arm,size=0x8) addr:0x02106c98 _ZN16MapObjectUnkSKDI8vfunc_3CEv kind:function(arm,size=0x8) addr:0x02106ca0 _ZN16MapObjectUnkSKDI8vfunc_40Ev kind:function(arm,size=0x8) addr:0x02106ca8 diff --git a/config/eur/arm9/overlays/ov032/symbols.txt b/config/eur/arm9/overlays/ov032/symbols.txt index 6611171b..f2148f6a 100644 --- a/config/eur/arm9/overlays/ov032/symbols.txt +++ b/config/eur/arm9/overlays/ov032/symbols.txt @@ -11,7 +11,7 @@ _ZN11ActorSpinut8vfunc_1CEv kind:function(arm,size=0x84) addr:0x02119458 _ZN11ActorSpinut19func_ov032_021194dcEs kind:function(arm,size=0x60) addr:0x021194dc _ZN11ActorSpinut8SetStateEs kind:function(arm,size=0x48) addr:0x0211953c _ZN11ActorSpinut8vfunc_20Ev kind:function(arm,size=0x358) addr:0x02119584 -_ZN11ActorSpinut8vfunc_2CEi kind:function(arm,size=0xb4) addr:0x021198dc +_ZN11ActorSpinut8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb4) addr:0x021198dc _ZN11ActorSpinut19func_ov032_02119990Ev kind:function(arm,size=0x7c) addr:0x02119990 _ZN11ActorSpinut19func_ov032_02119a0cEv kind:function(arm,size=0x1dc) addr:0x02119a0c _ZN11ActorSpinut19func_ov032_02119be8Ev kind:function(arm,size=0x98) addr:0x02119be8 @@ -43,7 +43,7 @@ _ZN11ActorSpinut19func_ov032_0211b17cEv kind:function(arm,size=0x14) addr:0x0211 _ZN11ActorSpinut19func_ov032_0211b190Eii kind:function(arm,size=0x50) addr:0x0211b190 _ZN11ActorSpinut19func_ov032_0211b1e0Ev kind:function(arm,size=0xb8) addr:0x0211b1e0 _ZN11ActorSpinut19func_ov032_0211b298Ev kind:function(arm,size=0xe4) addr:0x0211b298 -_ZN11ActorSpinut19func_ov032_0211b37cEPS_t kind:function(arm,size=0x34) addr:0x0211b37c +_ZN11ActorSpinut19func_ov032_0211b37cEP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x34) addr:0x0211b37c _ZN11ActorSpinut19func_ov032_0211b3b0Ev kind:function(arm,size=0x58) addr:0x0211b3b0 _ZN11ActorSpinut8vfunc_54Ei kind:function(arm,size=0x168) addr:0x0211b408 _ZN15ActorSpinut_268C1Ev kind:function(arm,size=0x30) addr:0x0211b570 @@ -68,7 +68,7 @@ _ZN18ActorFleeingSpinut8vfunc_18Ei kind:function(arm,size=0x1c) addr:0x0211b988 _ZN18ActorFleeingSpinut8SetStateEs kind:function(arm,size=0x68) addr:0x0211b9a4 _ZN18ActorFleeingSpinut8vfunc_20Ev kind:function(arm,size=0x268) addr:0x0211ba0c _ZN18ActorFleeingSpinut8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x104) addr:0x0211bc74 -_ZN18ActorFleeingSpinut8vfunc_2CEi kind:function(arm,size=0x8c) addr:0x0211bd78 +_ZN18ActorFleeingSpinut8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x8c) addr:0x0211bd78 _ZN18ActorFleeingSpinut19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211be04 _ZN18ActorFleeingSpinut19func_ov032_0211be30Ev kind:function(arm,size=0x78) addr:0x0211be30 _ZN18ActorFleeingSpinut19func_ov032_0211bea8Ev kind:function(arm,size=0xdc) addr:0x0211bea8 @@ -133,7 +133,7 @@ _ZN10ActorKeese19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x0211e _ZN10ActorKeese8SetStateEs kind:function(arm,size=0x48) addr:0x0211e420 _ZN10ActorKeese19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x0211e468 _ZN10ActorKeese8vfunc_20Ev kind:function(arm,size=0x1b8) addr:0x0211e778 -_ZN10ActorKeese8vfunc_2CEi kind:function(arm,size=0xbc) addr:0x0211e930 +_ZN10ActorKeese8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xbc) addr:0x0211e930 _ZN10ActorKeese19func_ov032_0211e9ecEv kind:function(arm,size=0x174) addr:0x0211e9ec _ZN10ActorKeese19func_ov032_0211eb60Ev kind:function(arm,size=0x188) addr:0x0211eb60 _ZN10ActorKeese19func_ov032_0211ece8Ev kind:function(arm,size=0x174) addr:0x0211ece8 @@ -210,7 +210,7 @@ _ZN16MapObjectUnkSWSW8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x278) _ZN16MapObjectUnkSWSW8vfunc_38Ev kind:function(arm,size=0x48) addr:0x02121b48 _ZN16MapObjectUnkSWSW19func_ov032_02121b90Ev kind:function(arm,size=0x88) addr:0x02121b90 _ZN16MapObjectUnkSWSW8vfunc_3CEi kind:function(arm,size=0x158) addr:0x02121c18 -_ZN16MapObjectUnkSWSW8vfunc_14Ev kind:function(arm,size=0x58) addr:0x02121d70 +_ZN16MapObjectUnkSWSW8vfunc_14Ei kind:function(arm,size=0x58) addr:0x02121d70 _ZN16MapObjectUnkSWSW19func_ov032_02121dc8EP7VecFx32 kind:function(arm,size=0x90) addr:0x02121dc8 _ZN19MapObjectUnkSWSW_40D0Ev kind:function(arm,size=0x1c) addr:0x02121e58 _ZN16MapObjectUnkSWSWD1Ev kind:function(arm,size=0x20) addr:0x02121e74 diff --git a/config/eur/arm9/overlays/ov063/symbols.txt b/config/eur/arm9/overlays/ov063/symbols.txt index d89f7f89..b2d6a9e1 100644 --- a/config/eur/arm9/overlays/ov063/symbols.txt +++ b/config/eur/arm9/overlays/ov063/symbols.txt @@ -14,7 +14,7 @@ _ZN12ActorUnkCANS19func_ov063_02158448Ei kind:function(arm,size=0x48) addr:0x021 _ZN12ActorUnkCANS19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x02158490 _ZN12ActorUnkCANS8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x021584c4 _ZN12ActorUnkCANS8vfunc_20Ev kind:function(arm,size=0x53c) addr:0x021584f0 -_ZN12ActorUnkCANS8vfunc_2CEi kind:function(arm,size=0xe0) addr:0x02158a2c +_ZN12ActorUnkCANS8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xe0) addr:0x02158a2c _ZN12ActorUnkCANS19func_ov063_02158b0cEv kind:function(arm,size=0x28) addr:0x02158b0c _ZN12ActorUnkCANS19func_ov063_02158b34Ev kind:function(arm,size=0x64) addr:0x02158b34 _ZN12ActorUnkCANS19func_ov063_02158b98Ev kind:function(arm,size=0x1a8) addr:0x02158b98 @@ -92,7 +92,7 @@ _ZN12ActorUnkCASE19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x021 _ZN12ActorUnkCASE19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215b2c4 _ZN12ActorUnkCASE8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215b2c8 _ZN12ActorUnkCASE8vfunc_20Ev kind:function(arm,size=0x338) addr:0x0215b2ec -_ZN12ActorUnkCASE8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x0215b624 +_ZN12ActorUnkCASE8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0x0215b624 _ZN12ActorUnkCASE19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215b6c8 _ZN12ActorUnkCASE19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215b724 _ZN12ActorUnkCASE8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215b7cc @@ -110,7 +110,7 @@ _ZN15ActorUnkRMSBase8vfunc_18Ei kind:function(arm,size=0x54) addr:0x0215bb34 _ZN15ActorUnkRMSBase8vfunc_1CEv kind:function(arm,size=0x4) addr:0x0215bb88 _ZN15ActorUnkRMSBase8vfunc_20Ev kind:function(arm,size=0x4) addr:0x0215bb8c _ZN15ActorUnkRMSBase8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215bb90 -_ZN15ActorUnkRMSBase8vfunc_2CEi kind:function(arm,size=0x30) addr:0x0215bba4 +_ZN15ActorUnkRMSBase8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x0215bba4 _ZN15ActorUnkRMSBaseD1Ev kind:function(arm,size=0x28) addr:0x0215bbd4 _ZN15ActorUnkRMSBaseD0Ev kind:function(arm,size=0x30) addr:0x0215bbfc _ZN19ActorProfileUnkRMSV10GetProfileEv kind:function(arm,size=0xc) addr:0x0215bc2c @@ -255,7 +255,7 @@ _ZN24UnkStruct_ov063_02163784D1Ev kind:function(arm,size=0x14) addr:0x0215f3d4 _ZN12ActorUnkRBLS8vfunc_18Ei kind:function(arm,size=0x8c) addr:0x0215f3e8 _ZN12ActorUnkRBLS8vfunc_20Ev kind:function(arm,size=0x14) addr:0x0215f474 _ZN12ActorUnkRBLS8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215f488 -_ZN12ActorUnkRBLS8vfunc_2CEi kind:function(arm,size=0x20) addr:0x0215f49c +_ZN12ActorUnkRBLS8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x0215f49c _ZN24UnkStruct_ov063_02163784D0Ev kind:function(arm,size=0x1c) addr:0x0215f4bc _ZN12ActorUnkRBLSD1Ev kind:function(arm,size=0x28) addr:0x0215f4d8 _ZN12ActorUnkRBLSD0Ev kind:function(arm,size=0x30) addr:0x0215f500 @@ -269,7 +269,7 @@ _ZN16MapObjectUnkSTAT8vfunc_08Ev kind:function(arm,size=0x88) addr:0x0215f710 _ZN16MapObjectUnkSTAT8vfunc_0CEv kind:function(arm,size=0x14) addr:0x0215f798 _ZN16MapObjectUnkSTAT19func_ov063_0215f7acEv kind:function(arm,size=0x494) addr:0x0215f7ac _ZN16MapObjectUnkSTAT19func_ov063_0215fc40Ei kind:function(arm,size=0x48) addr:0x0215fc40 -_ZN16MapObjectUnkSTAT8vfunc_14Ev kind:function(arm,size=0x58) addr:0x0215fc88 +_ZN16MapObjectUnkSTAT8vfunc_14Ei kind:function(arm,size=0x58) addr:0x0215fc88 _ZN16MapObjectUnkSTAT19func_ov063_0215fce0Ev kind:function(arm,size=0x58) addr:0x0215fce0 _ZN16MapObjectUnkSTATD1Ev kind:function(arm,size=0x20) addr:0x0215fd38 _ZN16MapObjectUnkSTATD0Ev kind:function(arm,size=0x28) addr:0x0215fd58 @@ -313,7 +313,7 @@ _ZN16MapObjectUnkLTRW8vfunc_08Ev kind:function(arm,size=0x1c) addr:0x02160cc8 _ZN16MapObjectUnkLTRW8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x34) addr:0x02160ce4 _ZN16MapObjectUnkLTRW19func_ov063_02160d18Ei kind:function(arm,size=0x1c) addr:0x02160d18 _ZN16MapObjectUnkLTRW8vfunc_28Eiii kind:function(arm,size=0xc4) addr:0x02160d34 -_ZN16MapObjectUnkLTRW8vfunc_14Ev kind:function(arm,size=0x20) addr:0x02160df8 +_ZN16MapObjectUnkLTRW8vfunc_14Ei kind:function(arm,size=0x20) addr:0x02160df8 _ZN24UnkStruct_ov063_021639e49vfunc2_04Ev kind:function(arm,size=0x24) addr:0x02160e18 _ZN16MapObjectUnkLTRWD1Ev kind:function(arm,size=0x20) addr:0x02160e3c _ZN16MapObjectUnkLTRWD0Ev kind:function(arm,size=0x28) addr:0x02160e5c @@ -328,7 +328,7 @@ _ZN16MapObjectUnkMTJR8vfunc_0CEv kind:function(arm,size=0x14) addr:0x021611ac _ZN16MapObjectUnkMTJR8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x94) addr:0x021611c0 _ZN16MapObjectUnkMTJR19func_ov063_02161254Ei kind:function(arm,size=0x34) addr:0x02161254 _ZN16MapObjectUnkMTJR19func_ov063_02161288Ev kind:function(arm,size=0xf8) addr:0x02161288 -_ZN16MapObjectUnkMTJR8vfunc_14Ev kind:function(arm,size=0x44) addr:0x02161380 +_ZN16MapObjectUnkMTJR8vfunc_14Ei kind:function(arm,size=0x44) addr:0x02161380 _ZN16MapObjectUnkMTJRD1Ev kind:function(arm,size=0x28) addr:0x021613c4 _ZN16MapObjectUnkMTJRD0Ev kind:function(arm,size=0x30) addr:0x021613ec _ZN23MapObjectProfileUnkMTJRD1Ev kind:function(arm,size=0x14) addr:0x0216141c diff --git a/config/eur/arm9/overlays/ov071/delinks.txt b/config/eur/arm9/overlays/ov071/delinks.txt index 55864e1c..f493a0af 100644 --- a/config/eur/arm9/overlays/ov071/delinks.txt +++ b/config/eur/arm9/overlays/ov071/delinks.txt @@ -10,7 +10,7 @@ src/071_Tower/Actor/ActorTearLight.cpp: .init start:0x02163dd0 end:0x02163e44 .ctor start:0x021640bc end:0x021640c0 .data start:0x02164be0 end:0x02164d10 - .bss start:0x02165150 end:0x02165240 + .bss start:0x0216514c end:0x02165240 src/071_Tower/Actor/ActorUnkKMSO.cpp: .text start:0x02160118 end:0x0216097c diff --git a/config/eur/arm9/overlays/ov071/symbols.txt b/config/eur/arm9/overlays/ov071/symbols.txt index 5a30816e..6a8e992a 100644 --- a/config/eur/arm9/overlays/ov071/symbols.txt +++ b/config/eur/arm9/overlays/ov071/symbols.txt @@ -269,7 +269,7 @@ _ZN18UnkStruct_027e0d7019func_ov071_0215e9acEv kind:function(arm,size=0x68) addr func_ov071_0215ea14 kind:function(arm,size=0x7c) addr:0x0215ea14 _ZN18UnkStruct_027e0d70D1Ev kind:function(arm,size=0x38) addr:0x0215ea90 _ZN18UnkStruct_027e0d7019func_ov071_0215eac8Ev kind:function(arm,size=0x50) addr:0x0215eac8 -func_ov071_0215eb18 kind:function(arm,size=0xc) addr:0x0215eb18 +_ZN18UnkStruct_027e0d7019func_ov071_0215eb18Ev kind:function(arm,size=0xc) addr:0x0215eb18 func_ov071_0215eb24 kind:function(arm,size=0x27c) addr:0x0215eb24 func_ov071_0215eda0 kind:function(arm,size=0x50) addr:0x0215eda0 func_ov071_0215edf0 kind:function(arm,size=0x50) addr:0x0215edf0 @@ -299,7 +299,7 @@ _ZN14ActorTearLight8vfunc_18Ei kind:function(arm,size=0xac) addr:0x0215f530 _ZN14ActorTearLight8vfunc_1CEv kind:function(arm,size=0x2c) addr:0x0215f5dc _ZN14ActorTearLight8vfunc_20Ev kind:function(arm,size=0x4c) addr:0x0215f608 _ZN14ActorTearLight8vfunc_24Ev kind:function(arm,size=0xc0) addr:0x0215f654 -_ZN14ActorTearLight8vfunc_2CEi kind:function(arm,size=0xc8) addr:0x0215f714 +_ZN14ActorTearLight8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc8) addr:0x0215f714 _ZN14ActorTearLight8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x18) addr:0x0215f7dc _ZN14ActorTearLight19func_ov071_0215f7f4Es kind:function(arm,size=0x18) addr:0x0215f7f4 _ZN14ActorTearLight19func_ov071_0215f80cEv kind:function(arm,size=0x18) addr:0x0215f80c @@ -571,8 +571,8 @@ data_ov071_0216511c kind:bss addr:0x0216511c data_ov071_02165128 kind:bss addr:0x02165128 data_ov071_02165134 kind:bss addr:0x02165134 data_ov071_02165140 kind:bss addr:0x02165140 -data_ov071_0216514c kind:bss addr:0x0216514c -_ZGVN15ProfileInstanceI21ActorProfileTearLightE8sProfileE kind:bss addr:0x02165150 +_ZGVN15ProfileInstanceI21ActorProfileTearLightE8sProfileE kind:bss addr:0x0216514c +data_ov071_02165150 kind:bss addr:0x02165150 @13264 kind:bss addr:0x0216515c _ZN15ProfileInstanceI21ActorProfileTearLightE8sProfileE kind:bss addr:0x02165168 _ZGVN15ProfileInstanceI19ActorProfileUnkKMSOE8sProfileE kind:bss addr:0x02165240 diff --git a/config/eur/arm9/overlays/ov088/symbols.txt b/config/eur/arm9/overlays/ov088/symbols.txt index 5207a6f0..2636bb05 100644 --- a/config/eur/arm9/overlays/ov088/symbols.txt +++ b/config/eur/arm9/overlays/ov088/symbols.txt @@ -325,9 +325,9 @@ func_ov088_0216f874 kind:function(arm,size=0x2c) addr:0x0216f874 _ZN21UnkStruct_027e0ce0_3CC1Ev kind:function(thumb,size=0x298) addr:0x0216f8a0 _ZN21UnkStruct_027e0ce0_3CD1Ev kind:function(thumb,size=0x8c) addr:0x0216fb38 _ZN21UnkStruct_027e0ce0_3C19func_ov088_0216fbc4EiPK24UnkStruct_ov001_020c40f4 kind:function(thumb,size=0x2c) addr:0x0216fbc4 -func_ov088_0216fbf0 kind:function(arm,size=0xb0) addr:0x0216fbf0 -func_ov088_0216fca0 kind:function(arm,size=0x270) addr:0x0216fca0 -func_ov088_0216ff10 kind:function(arm,size=0x4) addr:0x0216ff10 +_ZN21UnkStruct_027e0ce0_3C19func_ov088_0216fbf0Ei kind:function(arm,size=0xb0) addr:0x0216fbf0 +_ZN21UnkStruct_027e0ce0_3C19func_ov088_0216fca0Ev kind:function(arm,size=0x270) addr:0x0216fca0 +_ZN21UnkStruct_027e0ce0_3C19func_ov088_0216ff10Ev kind:function(arm,size=0x4) addr:0x0216ff10 func_ov088_0216ff14 kind:function(arm,size=0x10) addr:0x0216ff14 func_ov088_0216ff24 kind:function(arm,size=0xa8) addr:0x0216ff24 func_ov088_0216ffcc kind:function(arm,size=0x4) addr:0x0216ffcc diff --git a/config/eur/arm9/overlays/ov092/symbols.txt b/config/eur/arm9/overlays/ov092/symbols.txt index f8f4059b..259c1596 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 -_ZN25UnkStruct_027e0ce0_40_14C19func_ov092_021689e8EiP21UnkStruct_027e0ce0_40P15PlayerLinkActorP25UnkStruct_027e0ce0_40_328 kind:function(arm,size=0xac) addr:0x021689e8 +_ZN25UnkStruct_027e0ce0_40_14C19func_ov092_021689e8EbP21UnkStruct_027e0ce0_40P15PlayerLinkActorP15PlayerActorBase 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/symbols.txt b/config/eur/arm9/overlays/ov093/symbols.txt index 1a5ea578..e4f4a21c 100644 --- a/config/eur/arm9/overlays/ov093/symbols.txt +++ b/config/eur/arm9/overlays/ov093/symbols.txt @@ -82,11 +82,11 @@ func_ov093_02167dfc kind:function(arm,size=0x44) addr:0x02167dfc func_ov093_02167e40 kind:function(arm,size=0x15c) addr:0x02167e40 func_ov093_02167f9c kind:function(arm,size=0x68) addr:0x02167f9c _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 +_ZN21UnkStruct_027e0ce0_4019func_ov093_02168020Ei kind:function(arm,size=0xdc) addr:0x02168020 +_ZN21UnkStruct_027e0ce0_4019func_ov093_021680fcEi kind:function(arm,size=0xa8) addr:0x021680fc func_ov093_021681a4 kind:function(arm,size=0x7c) addr:0x021681a4 _ZN21UnkStruct_027e0ce0_4019func_ov093_02168220Ev kind:function(arm,size=0x38) addr:0x02168220 -func_ov093_02168258 kind:function(arm,size=0xb4) addr:0x02168258 +_ZN21UnkStruct_027e0ce0_4019func_ov093_02168258Ev 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 func_ov093_02168484 kind:function(arm,size=0xd0) addr:0x02168484 @@ -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 -_ZN25UnkStruct_027e0ce0_40_14C19func_ov093_02168e24Ei kind:function(arm,size=0x6c) addr:0x02168e24 +_ZN25UnkStruct_027e0ce0_40_14C19func_ov093_02168e24EPv 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 @@ -156,30 +156,30 @@ _ZN20ModelRender_Derived5C1EiP10G3d_Model_P18G3d_BoneMtxStruct_ kind:function(th func_ov093_0216c8fc kind:function(thumb,size=0x44) addr:0x0216c8fc func_ov093_0216c940 kind:function(thumb,size=0x50) addr:0x0216c940 func_ov093_0216c990 kind:function(arm,size=0xa8) addr:0x0216c990 -func_ov093_0216ca38 kind:function(arm,size=0x270) addr:0x0216ca38 +_ZN20ModelRender_Derived419func_ov093_0216ca38Ebbbb kind:function(arm,size=0x270) addr:0x0216ca38 _ZN19func_ov093_0216cca8D1Ev kind:function(arm,size=0x14) addr:0x0216cca8 _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 _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 -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d160Ev kind:function(thumb,size=0x6c) addr:0x0216d160 -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d1ccEiPK24UnkStruct_ov001_020c40f4bb kind:function(thumb,size=0x1cc) addr:0x0216d1cc +_ZN16PlayerZeldaActorC1EPvP21UnkStruct_027e0ce0_40P25UnkStruct_027e0ce0_40_150Pj kind:function(thumb,size=0x1bc) addr:0x0216ce60 +_ZN16PlayerZeldaActorD1Ev kind:function(thumb,size=0xb6) addr:0x0216d01c +_ZN15PlayerActorBase19func_ov093_0216d0d4Ev kind:function(thumb,size=0x8c) addr:0x0216d0d4 +_ZN15PlayerActorBase19func_ov093_0216d160Ev kind:function(thumb,size=0x6c) addr:0x0216d160 +_ZN15PlayerActorBase19func_ov093_0216d1ccEiPK24UnkStruct_ov001_020c40f4bb kind:function(thumb,size=0x1cc) addr:0x0216d1cc func_ov093_0216d398 kind:function(arm,size=0x64) addr:0x0216d398 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 -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d5b8Ei kind:function(arm,size=0x830) addr:0x0216d5b8 +_ZN15PlayerActorBase19func_ov093_0216d5b8Eb kind:function(arm,size=0x830) addr:0x0216d5b8 func_ov093_0216dde8 kind:function(arm,size=0x48) addr:0x0216dde8 -_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 +_ZN15PlayerActorBase19func_ov093_0216de30Eii kind:function(arm,size=0x98) addr:0x0216de30 +_ZN15PlayerActorBase19func_ov093_0216dec8EPv 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 -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216e1a4Ei kind:function(arm,size=0xfc) addr:0x0216e1a4 +_ZN15PlayerActorBase19func_ov093_0216e1a4EPv 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 -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216f71cEPi kind:function(thumb,size=0x50) addr:0x0216f71c +_ZN15PlayerActorBase19func_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/ov102/symbols.txt b/config/eur/arm9/overlays/ov102/symbols.txt index 7534097e..72196237 100644 --- a/config/eur/arm9/overlays/ov102/symbols.txt +++ b/config/eur/arm9/overlays/ov102/symbols.txt @@ -1,26 +1,26 @@ _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 +_ZN25UnkStruct_027e0ce0_40_10819func_ov102_02182e54EiP7VecFx32i kind:function(arm,size=0x154) addr:0x02182e54 +_ZN24UnkStruct_ItemManager_2019func_ov102_02182fa8Ebb kind:function(arm,size=0x54) addr:0x02182fa8 +_ZN24UnkStruct_ItemManager_2019func_ov102_02182ffcEPv kind:function(arm,size=0x40) addr:0x02182ffc +_ZN21UnkStruct_027e0ce0_4019func_ov102_0218303cEbP11ItemManager 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 +_ZN21UnkStruct_027e0ce0_4019func_ov102_021831b4EPv kind:function(arm,size=0x3c) addr:0x021831b4 +_ZN21UnkStruct_027e0ce0_4019func_ov102_021831f0EPv 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 +_ZN16MapObjectUnkSAND8vfunc_14Ei 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 +_ZN16MapObjectUnkPTFL8vfunc_14Ei 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 diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 1f8d87c9..94387af9 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -657,7 +657,7 @@ _ZN4Game20TrySetCreateCallbackEPFP12GameModeBasevE kind:function(arm,size=0x18) func_0201373c kind:function(arm,size=0x18) addr:0x0201373c func_02013754 kind:function(arm,size=0x14) addr:0x02013754 _ZN18UnkStruct_02049b1813func_02013768Ev kind:function(arm,size=0x60) addr:0x02013768 -func_020137c8 kind:function(arm,size=0x1c) addr:0x020137c8 +_ZN18UnkStruct_02049b1813func_020137c8Ei kind:function(arm,size=0x1c) addr:0x020137c8 func_020137e4 kind:function(arm,size=0x5c) addr:0x020137e4 _ZN18UnkStruct_02049b1813func_02013840Eti kind:function(arm,size=0xb4) addr:0x02013840 _ZN18UnkStruct_02049b1813func_020138f4Ei kind:function(arm,size=0x140) addr:0x020138f4 @@ -669,21 +669,21 @@ _ZN5Input13func_02013b24Ei kind:function(arm,size=0x64) addr:0x02013b24 func_02013b88 kind:function(arm,size=0x10) addr:0x02013b88 func_02013b98 kind:function(arm,size=0x24) addr:0x02013b98 _ZN5Input13func_02013bbcEv kind:function(arm,size=0x4c) addr:0x02013bbc -_ZN5Input13func_02013c08Et kind:function(arm,size=0x1c) addr:0x02013c08 +_ZN5Input13func_02013c08Ej kind:function(arm,size=0x1c) addr:0x02013c08 func_02013c24 kind:function(arm,size=0x58) addr:0x02013c24 func_02013c7c kind:function(arm,size=0x58) addr:0x02013c7c -func_02013cd4 kind:function(arm,size=0x5c) addr:0x02013cd4 -_ZN13func_02013d30D0Ev kind:function(arm,size=0x64) addr:0x02013d30 -func_02013d94 kind:function(arm,size=0x5c) addr:0x02013d94 +_ZN29UnkStruct_ov017_020c3f70_BaseD1Ev kind:function(arm,size=0x5c) addr:0x02013cd4 +_ZN29UnkStruct_ov017_020c3f70_BaseD0Ev kind:function(arm,size=0x64) addr:0x02013d30 +_ZN29UnkStruct_ov017_020c3f70_BaseD2Ev kind:function(arm,size=0x5c) addr:0x02013d94 func_02013df0 kind:function(arm,size=0x28) addr:0x02013df0 _ZN21UnkStruct_02049a2c_1C13func_02013e18EPvi kind:function(arm,size=0x1c) addr:0x02013e18 -func_02013e34 kind:function(arm,size=0x10) addr:0x02013e34 +_ZN24UnkStruct_ov017_020c3f708vfunc_08Ev kind:function(arm,size=0x10) addr:0x02013e34 func_02013e44 kind:function(arm,size=0x3c) addr:0x02013e44 func_02013e80 kind:function(arm,size=0x4c) addr:0x02013e80 _ZN18UnkStruct_02049b8013func_02013eccEiPFvtEi kind:function(arm,size=0x1c) addr:0x02013ecc _ZN18UnkStruct_02049b8013func_02013ee8Eii kind:function(arm,size=0x98) addr:0x02013ee8 _ZN18UnkStruct_02049b8013func_02013f80Ei kind:function(arm,size=0x6c) addr:0x02013f80 -func_02013fec kind:function(arm,size=0xc) addr:0x02013fec +_ZN18UnkStruct_02049b8013func_02013fecEiPv kind:function(arm,size=0xc) addr:0x02013fec func_02013ff8 kind:function(arm,size=0x12c) addr:0x02013ff8 _ZN12TouchControl11UpdateStateEP10TouchStatePK6TPData kind:function(arm,size=0xb8) addr:0x02014124 _ZN12TouchControl4InitEv kind:function(thumb,size=0x3c) addr:0x020141dc @@ -698,7 +698,7 @@ func_020144a0 kind:function(thumb,size=0x10) addr:0x020144a0 func_020144b0 kind:function(thumb,size=0x1c) addr:0x020144b0 _ZN21UnkStruct_02011e10_2C13func_020144ccEiii kind:function(thumb,size=0x6c) addr:0x020144cc _ZN21UnkStruct_02011e10_2C13func_02014538Ev kind:function(thumb,size=0x34) addr:0x02014538 -func_0201456c kind:function(arm,size=0x44) addr:0x0201456c +_ZN18UnkStruct_020499e013func_0201456cEi kind:function(arm,size=0x44) addr:0x0201456c func_020145b0 kind:function(arm,size=0x80) addr:0x020145b0 func_02014630 kind:function(arm,size=0x58) addr:0x02014630 func_02014688 kind:function(arm,size=0x7c) addr:0x02014688 @@ -968,7 +968,7 @@ _ZN18UnkStruct_0204a11013func_02018d78Ei kind:function(arm,size=0x174) addr:0x02 func_02018eec kind:function(arm,size=0xac) addr:0x02018eec func_02018f98 kind:function(arm,size=0x368) addr:0x02018f98 _ZN18UnkStruct_0204a11013func_02019300Ei kind:function(arm,size=0x40) addr:0x02019300 -func_02019340 kind:function(arm,size=0x10) addr:0x02019340 +_ZN18UnkStruct_0204a11013func_02019340Ei kind:function(arm,size=0x10) addr:0x02019340 _ZN18UnkStruct_0204a11013func_02019350Ev kind:function(arm,size=0xb8) addr:0x02019350 _ZN18UnkStruct_0204a11013func_02019408Ev kind:function(arm,size=0x4c) addr:0x02019408 _ZN18UnkStruct_0204a11013func_02019454Ev kind:function(arm,size=0x88) addr:0x02019454 diff --git a/config/eur1/arm9/itcm/symbols.txt b/config/eur1/arm9/itcm/symbols.txt index 2fd37aa2..2ec269eb 100644 --- a/config/eur1/arm9/itcm/symbols.txt +++ b/config/eur1/arm9/itcm/symbols.txt @@ -43,8 +43,8 @@ func_01ff9b1c kind:function(arm,size=0x14) addr:0x01ff9b1c func_01ff9b30 kind:function(arm,size=0x10) addr:0x01ff9b30 func_01ff9b40 kind:function(arm,size=0x10) addr:0x01ff9b40 _ZN18UnkStruct_0204a11013func_01ff9b50Ev kind:function(arm,size=0x14) addr:0x01ff9b50 -func_01ff9b64 kind:function(arm,size=0x14) addr:0x01ff9b64 -func_01ff9b78 kind:function(arm,size=0x18) addr:0x01ff9b78 +_ZN18UnkStruct_0204a11013func_01ff9b64Ev kind:function(arm,size=0x14) addr:0x01ff9b64 +_ZN18UnkStruct_0204a11013func_01ff9b78Ev kind:function(arm,size=0x18) addr:0x01ff9b78 func_01ff9b90 kind:function(arm,size=0x324) addr:0x01ff9b90 func_01ff9eb4 kind:function(arm,size=0x8) addr:0x01ff9eb4 func_01ff9ebc kind:function(arm,size=0x8) addr:0x01ff9ebc @@ -157,10 +157,10 @@ _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 -_ZN21UnkStruct_027e09bc_0C13func_01ffd43cEP5Vec2sii kind:function(arm,size=0x60) addr:0x01ffd43c +_ZN21UnkStruct_027e09bc_0C13func_01ffd43cEP5Vec2sP7VecFx32i 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 +_ZN21UnkStruct_027e09bc_0C13func_01ffd768EPvP5Vec2sc kind:function(arm,size=0x138) addr:0x01ffd768 func_01ffd8a0 kind:function(arm,size=0x190) addr:0x01ffd8a0 func_01ffda30 kind:function(arm,size=0x2ec) addr:0x01ffda30 func_01ffdd1c kind:function(arm,size=0x14c) addr:0x01ffdd1c @@ -198,7 +198,7 @@ func_01fff254 kind:function(arm,size=0x2c) addr:0x01fff254 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_01fff2fcEPFvP5ActorP14Actor_vfunc_30EPv kind:function(arm,size=0x54) addr:0x01fff2fc _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 @@ -209,8 +209,8 @@ _ZN16MapObjectManager13func_01fff4ccEPFvPvS0_ES0_ kind:function(arm,size=0x54) a _ZN16MapObjectManager13func_01fff520EP24UnkStruct_ov000_020b34c4PP9MapObject kind:function(arm,size=0x64) addr:0x01fff520 _ZN9MapObject14GetMapObjectIdEv kind:function(arm,size=0xc) addr:0x01fff584 _ZN9MapObject13func_01fff590Ei kind:function(arm,size=0x40) addr:0x01fff590 -_ZN5Actor13func_01fff5d0Eii kind:function(arm,size=0x3c) addr:0x01fff5d0 -_ZN18UnkStruct_027e09b413func_01fff60cEP7VecFx32iihii kind:function(arm,size=0x8c) addr:0x01fff60c +_ZN5Actor13func_01fff5d0EP14Actor_vfunc_30i kind:function(arm,size=0x3c) addr:0x01fff5d0 +_ZN18UnkStruct_027e09b413func_01fff60cEP7VecFx32iiiii kind:function(arm,size=0x8c) addr:0x01fff60c func_01fff698 kind:function(arm,size=0x38) addr:0x01fff698 func_01fff6d0 kind:function(arm,size=0x74) addr:0x01fff6d0 func_01fff744 kind:function(arm,size=0x20) addr:0x01fff744 diff --git a/config/eur1/arm9/overlays/ov000/symbols.txt b/config/eur1/arm9/overlays/ov000/symbols.txt index 2e770fbd..7af463b0 100644 --- a/config/eur1/arm9/overlays/ov000/symbols.txt +++ b/config/eur1/arm9/overlays/ov000/symbols.txt @@ -123,7 +123,7 @@ _ZN15ModelRenderBase19func_ov000_02057f40EPKv kind:function(arm,size=0x34) addr: func_ov000_02057f74 kind:function(arm,size=0x24) addr:0x02057f74 func_ov000_02057f98 kind:function(arm,size=0x28) addr:0x02057f98 func_ov000_02057fc0 kind:function(arm,size=0x28) addr:0x02057fc0 -func_ov000_02057fe8 kind:function(arm,size=0x50) addr:0x02057fe8 +_ZN20ModelRender_Derived419func_ov000_02057fe8E14UnkAngleStructS0_P7VecFx32 kind:function(arm,size=0x50) addr:0x02057fe8 func_ov000_02058038 kind:function(arm,size=0x28) addr:0x02058038 func_ov000_02058060 kind:function(arm,size=0x20) addr:0x02058060 func_ov000_02058080 kind:function(arm,size=0x20) addr:0x02058080 @@ -323,7 +323,7 @@ func_ov000_0205c4a8 kind:function(arm,size=0xdc) addr:0x0205c4a8 func_ov000_0205c584 kind:function(thumb,size=0x1a) addr:0x0205c584 func_ov000_0205c5a0 kind:function(arm,size=0x18) addr:0x0205c5a0 func_ov000_0205c5b8 kind:function(arm,size=0x18) addr:0x0205c5b8 -func_ov000_0205c5d0 kind:function(arm,size=0xd4) addr:0x0205c5d0 +_ZN18PlayerActorBase_7819func_ov000_0205c5d0EiP15PlayerActorBase kind:function(arm,size=0xd4) addr:0x0205c5d0 func_ov000_0205c6a4 kind:function(arm,size=0x2c) addr:0x0205c6a4 func_ov000_0205c6d0 kind:function(arm,size=0x34) addr:0x0205c6d0 func_ov000_0205c704 kind:function(arm,size=0x48) addr:0x0205c704 @@ -486,7 +486,7 @@ _ZN23UnkStruct_027e0998_Base19func_ov000_02061768Ev kind:function(arm,size=0x4) func_ov000_0206176c kind:function(thumb,size=0xbc) addr:0x0206176c func_ov000_02061828 kind:function(thumb,size=0x28) addr:0x02061828 _ZN23UnkStruct_027e0998_Base19func_ov000_02061850Ei kind:function(arm,size=0x18) addr:0x02061850 -_ZN23UnkStruct_027e0998_Base8vfunc_00EP7VecFx32P5Vec2sPt kind:function(arm,size=0x1e0) addr:0x02061868 +_ZN23UnkStruct_027e0998_Base8vfunc_00EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x1e0) addr:0x02061868 _ZN23UnkStruct_027e0998_Base19func_ov000_02061a48EP7VecFx32P5Vec2sS3_ kind:function(arm,size=0x28) addr:0x02061a48 _ZN23UnkStruct_027e0998_Base19func_ov000_02061a70Ev kind:function(arm,size=0xc) addr:0x02061a70 func_ov000_02061a7c kind:function(arm,size=0x10) addr:0x02061a7c @@ -1075,10 +1075,10 @@ func_ov000_02071f88 kind:function(arm,size=0x10) addr:0x02071fbc _ZN21UnkStruct_027e09ac_1419func_ov000_02071f98Ev kind:function(arm,size=0x13c) addr:0x02071fcc func_ov000_020720d4 kind:function(arm,size=0x270) addr:0x02072108 func_ov000_02072344 kind:function(arm,size=0xb0) addr:0x02072378 -func_ov000_020723f4 kind:function(arm,size=0x78) addr:0x02072428 +_ZN18UnkStruct_027e09ac19func_ov000_020723f4Ev kind:function(arm,size=0x78) addr:0x02072428 func_ov000_0207246c kind:function(arm,size=0x204) addr:0x020724a0 func_ov000_02072670 kind:function(arm,size=0x14) addr:0x020726a4 -func_ov000_02072684 kind:function(arm,size=0x18) addr:0x020726b8 +_ZN18UnkStruct_027e09ac19func_ov000_02072684EPv kind:function(arm,size=0x18) addr:0x020726b8 func_ov000_0207269c kind:function(arm,size=0x54) addr:0x020726d0 _ZN18UnkStruct_027e09ac19func_ov000_020726f0Etii kind:function(arm,size=0x2d4) addr:0x02072724 _ZN18UnkStruct_027e09ac19func_ov000_020729c4EP21UnkStruct_027e09ac_14ttss kind:function(arm,size=0x88) addr:0x020729f8 @@ -1128,7 +1128,7 @@ _ZN18UnkStruct_027e09b819func_ov000_020732dcEi kind:function(arm,size=0x10) addr _ZN18UnkStruct_027e09b819func_ov000_020732ecEi kind:function(arm,size=0x10) addr:0x02073320 _ZN18UnkStruct_027e09b819func_ov000_020732fcEi kind:function(arm,size=0x10) addr:0x02073330 _ZN18UnkStruct_027e09b819func_ov000_0207330cEv kind:function(arm,size=0x20) addr:0x02073340 -func_ov000_0207332c kind:function(arm,size=0x5c) addr:0x02073360 +_ZN18UnkStruct_027e09b819func_ov000_0207332cEv kind:function(arm,size=0x5c) addr:0x02073360 _ZN18UnkStruct_027e09b819func_ov000_02073388EPvi kind:function(arm,size=0xe8) addr:0x020733bc _ZN18UnkStruct_027e09b819func_ov000_02073470EPvi kind:function(arm,size=0x108) addr:0x020734a4 _ZN18UnkStruct_027e09b819func_ov000_02073578EPvi kind:function(arm,size=0x98) addr:0x020735ac @@ -1212,11 +1212,11 @@ func_ov000_020762c4 kind:function(arm,size=0x20) addr:0x020762f8 func_ov000_020762e4 kind:function(arm,size=0x1dc) addr:0x02076318 func_ov000_020764c0 kind:function(arm,size=0x1d4) addr:0x020764f4 func_ov000_02076694 kind:function(arm,size=0x120) addr:0x020766c8 -func_ov000_020767b4 kind:function(arm,size=0x34c) addr:0x020767e8 +_ZN21UnkStruct_027e09bc_0C19func_ov000_020767b4EP7VecFx32P5Vec2siiS1_ kind:function(arm,size=0x34c) addr:0x020767e8 func_ov000_02076b00 kind:function(arm,size=0x254) addr:0x02076b34 func_ov000_02076d54 kind:function(arm,size=0x1fc) addr:0x02076d88 func_ov000_02076f50 kind:function(arm,size=0x58) addr:0x02076f84 -func_ov000_02076fa8 kind:function(arm,size=0xa0) addr:0x02076fdc +_ZN21UnkStruct_027e09bc_0C19func_ov000_02076fa8EPvS0_ii kind:function(arm,size=0xa0) addr:0x02076fdc func_ov000_02077048 kind:function(arm,size=0x114) addr:0x0207707c _ZN21UnkStruct_027e09bc_24C1Ev kind:function(arm,size=0x2c) addr:0x02077190 func_ov000_02077188 kind:function(arm,size=0x14) addr:0x020771bc @@ -1225,7 +1225,7 @@ _ZN18UnkStruct_027e09bc19func_ov000_020771b8Ei kind:function(arm,size=0x10) addr _ZN18UnkStruct_027e09bc19func_ov000_020771c8Ev kind:function(arm,size=0x188) addr:0x020771fc func_ov000_02077350 kind:function(arm,size=0xf4) addr:0x02077384 func_ov000_02077444 kind:function(arm,size=0x24) addr:0x02077478 -func_ov000_02077468 kind:function(arm,size=0x18) addr:0x0207749c +_ZN18UnkStruct_027e09bc19func_ov000_02077468Eii kind:function(arm,size=0x18) addr:0x0207749c func_ov000_02077480 kind:function(arm,size=0x10) addr:0x020774b4 _ZN19func_ov000_02077490D1Ev kind:function(arm,size=0x14) addr:0x020774c4 _ZN19func_ov000_020774a4D0Ev kind:function(arm,size=0x1c) addr:0x020774d8 @@ -1253,7 +1253,7 @@ func_ov000_020781d4 kind:function(arm,size=0x14) addr:0x02078208 func_ov000_020781e8 kind:function(arm,size=0x48) addr:0x0207821c _ZN21UnkStruct_027e09bc_0C19func_ov000_02078230Ei kind:function(arm,size=0xe4) addr:0x02078264 func_ov000_02078314 kind:function(arm,size=0x38) addr:0x02078348 -_ZN21UnkStruct_027e09bc_0C19func_ov000_0207834cEP7VecFx32ii kind:function(arm,size=0x40) addr:0x02078380 +_ZN21UnkStruct_027e09bc_0C19func_ov000_0207834cEP7VecFx32P29UnkStackStruct_ov000_02077590i kind:function(arm,size=0x40) addr:0x02078380 func_ov000_0207838c kind:function(arm,size=0x70) addr:0x020783c0 func_ov000_020783fc kind:function(arm,size=0x88) addr:0x02078430 func_ov000_02078484 kind:function(arm,size=0x40) addr:0x020784b8 @@ -1264,7 +1264,7 @@ func_ov000_02078594 kind:function(arm,size=0x40) addr:0x020785c8 func_ov000_020785d4 kind:function(arm,size=0xac) addr:0x02078608 func_ov000_02078680 kind:function(arm,size=0xc) addr:0x020786b4 func_ov000_0207868c kind:function(arm,size=0xc) addr:0x020786c0 -func_ov000_02078698 kind:function(arm,size=0xc) addr:0x020786cc +_ZN21UnkStruct_027e09bc_0C19func_ov000_02078698Ev kind:function(arm,size=0xc) addr:0x020786cc func_ov000_020786a4 kind:function(arm,size=0x38) addr:0x020786d8 func_ov000_020786dc kind:function(arm,size=0x2c) addr:0x02078710 func_ov000_02078708 kind:function(arm,size=0x24) addr:0x0207873c @@ -1625,13 +1625,13 @@ _ZN21UnkStruct_027e0cd8_0419func_ov000_020819a4EPK29UnkStruct_func_ov000_020702a func_ov000_02081b24 kind:function(arm,size=0x44) addr:0x02081b58 func_ov000_02081b68 kind:function(arm,size=0xc) addr:0x02081b9c func_ov000_02081b74 kind:function(arm,size=0x10) addr:0x02081ba8 -func_ov000_02081b84 kind:function(arm,size=0x18) addr:0x02081bb8 -func_ov000_02081b9c kind:function(arm,size=0x58) addr:0x02081bd0 -func_ov000_02081bf4 kind:function(arm,size=0x34) addr:0x02081c28 +_ZN18UnkStruct_027e0cd819func_ov000_02081b84Ev kind:function(arm,size=0x18) addr:0x02081bb8 +_ZN18UnkStruct_027e0cd819func_ov000_02081b9cEi kind:function(arm,size=0x58) addr:0x02081bd0 +_ZN18UnkStruct_027e0cd819func_ov000_02081bf4Ev kind:function(arm,size=0x34) addr:0x02081c28 _ZN18UnkStruct_027e0cd819func_ov000_02081c28Ev kind:function(arm,size=0x78) addr:0x02081c5c _ZN18UnkStruct_027e0cd819func_ov000_02081ca0Ev kind:function(arm,size=0xa8) addr:0x02081cd4 func_ov000_02081d48 kind:function(arm,size=0x10) addr:0x02081d7c -func_ov000_02081d58 kind:function(arm,size=0x4) addr:0x02081d8c +_ZN18UnkStruct_027e0cd819func_ov000_02081d58Ev kind:function(arm,size=0x4) addr:0x02081d8c _ZN18UnkStruct_027e0cd819func_ov000_02081d5cEv kind:function(arm,size=0x20) addr:0x02081d90 _ZN18UnkStruct_027e0cd819func_ov000_02081d7cEiib kind:function(arm,size=0xb4) addr:0x02081db0 _ZN18UnkStruct_027e0cd819func_ov000_02081e30Eii kind:function(arm,size=0x8c) addr:0x02081e64 @@ -1686,10 +1686,10 @@ func_ov000_02082c58 kind:function(arm,size=0x188) addr:0x02082c8c func_ov000_02082de0 kind:function(arm,size=0xc) addr:0x02082e14 func_ov000_02082dec kind:function(arm,size=0xc) addr:0x02082e20 func_ov000_02082df8 kind:function(thumb,size=0x5a) addr:0x02082e2c -func_ov000_02082e54 kind:function(arm,size=0x24) addr:0x02082e88 +_ZN18PlayerActorBase_7019func_ov000_02082e54Ev kind:function(arm,size=0x24) addr:0x02082e88 _ZN18PlayerActorBase_7019func_ov000_02082e78Eiiii kind:function(arm,size=0x22c) addr:0x02082eac -func_ov000_020830a4 kind:function(arm,size=0x30) addr:0x020830d8 -_ZN18PlayerActorBase_7019func_ov000_020830d4E14UnkAngleStructjhi kind:function(arm,size=0x334) addr:0x02083108 +_ZN18PlayerActorBase_7019func_ov000_020830a4Eiiiii kind:function(arm,size=0x30) addr:0x020830d8 +_ZN18PlayerActorBase_7019func_ov000_020830d4E14UnkAngleStructjhP21PlayerLinkActor_A0_28 kind:function(arm,size=0x334) addr:0x02083108 _ZN21PlayerActorBase_70_6CC1EiPvP10G3d_Model_ kind:function(thumb,size=0x44) addr:0x0208343c _ZN21PlayerActorBase_70_6CD1Ev kind:function(thumb,size=0x2) addr:0x02083480 func_ov000_02083450 kind:function(arm,size=0xc) addr:0x02083484 @@ -1732,15 +1732,15 @@ func_ov000_0208475c kind:function(arm,size=0x194) addr:0x020847a4 func_ov000_020848f0 kind:function(arm,size=0x54) addr:0x02084938 func_ov000_02084944 kind:function(arm,size=0x68) addr:0x0208498c func_ov000_020849ac kind:function(arm,size=0x24) addr:0x020849f4 -func_ov000_020849d0 kind:function(arm,size=0xf8) addr:0x02084a18 -func_ov000_02084ac8 kind:function(arm,size=0x174) addr:0x02084b10 -func_ov000_02084c3c kind:function(arm,size=0x21c) addr:0x02084c84 -func_ov000_02084e58 kind:function(arm,size=0x40c) addr:0x02084ea0 +_ZN18PlayerLinkActor_9C19func_ov000_020849d0EP7VecFx32S1_ kind:function(arm,size=0xf8) addr:0x02084a18 +_ZN18PlayerLinkActor_9C19func_ov000_02084ac8EiP7VecFx32S1_S1_ kind:function(arm,size=0x174) addr:0x02084b10 +_ZN18PlayerLinkActor_9C19func_ov000_02084c3cEiiP7VecFx32S1_ kind:function(arm,size=0x21c) addr:0x02084c84 +_ZN18PlayerLinkActor_9C19func_ov000_02084e58EihP7VecFx32S1_S1_S1_i kind:function(arm,size=0x40c) addr:0x02084ea0 func_ov000_02085260 kind:function(arm,size=0x14) addr:0x020852ac -func_ov000_02085274 kind:function(arm,size=0x304) addr:0x020852c0 -func_ov000_02085578 kind:function(arm,size=0x1a0) addr:0x020855c4 -func_ov000_02085718 kind:function(arm,size=0x128) addr:0x02085764 -func_ov000_02085840 kind:function(arm,size=0x184) addr:0x0208588c +_ZN18PlayerLinkActor_9C19func_ov000_02085274EiiiP7VecFx32S1_S1_ kind:function(arm,size=0x304) addr:0x020852c0 +_ZN18PlayerLinkActor_9C19func_ov000_02085578EiiiiP7VecFx32 kind:function(arm,size=0x1a0) addr:0x020855c4 +_ZN18PlayerLinkActor_9C19func_ov000_02085718EP7VecFx32 kind:function(arm,size=0x128) addr:0x02085764 +_ZN18PlayerLinkActor_9C19func_ov000_02085840EP7VecFx32S1_S1_ kind:function(arm,size=0x184) addr:0x0208588c func_ov000_020859c4 kind:function(arm,size=0x34) addr:0x02085a10 func_ov000_020859f8 kind:function(arm,size=0x30) addr:0x02085a44 func_ov000_02085a28 kind:function(arm,size=0x20) addr:0x02085a74 @@ -1763,8 +1763,8 @@ func_ov000_02086404 kind:function(arm,size=0xf4) addr:0x02086450 func_ov000_020864f8 kind:function(arm,size=0x114) addr:0x02086544 _ZN18PlayerLinkActor_9CC1EP21UnkStruct_027e0ce0_40ji kind:function(thumb,size=0xf8) addr:0x02086658 func_ov000_02086704 kind:function(thumb,size=0x54) addr:0x02086750 -func_ov000_02086758 kind:function(arm,size=0x9c) addr:0x020867a4 -func_ov000_020867f4 kind:function(arm,size=0x3c) addr:0x02086840 +_ZN18PlayerLinkActor_9C19func_ov000_02086758Ev kind:function(arm,size=0x9c) addr:0x020867a4 +_ZN18PlayerLinkActor_9C19func_ov000_020867f4Ev kind:function(arm,size=0x3c) addr:0x02086840 func_ov000_02086830 kind:function(arm,size=0x74) addr:0x0208687c func_ov000_020868a4 kind:function(arm,size=0x58) addr:0x020868f0 func_ov000_020868fc kind:function(arm,size=0x104) addr:0x02086948 @@ -1853,7 +1853,7 @@ func_ov000_02089910 kind:function(arm,size=0x2c) addr:0x0208995c func_ov000_0208993c kind:function(arm,size=0x4c) addr:0x02089988 _ZN18PlayerLinkActor_A4C1EP15PlayerActorBaseP18PlayerLinkActor_A0 kind:function(thumb,size=0xa) addr:0x020899d4 _ZN18PlayerLinkActor_A4D1Ev kind:function(thumb,size=0x2) addr:0x020899e0 -func_ov000_02089998 kind:function(arm,size=0x184) addr:0x020899e4 +_ZN18PlayerLinkActor_A419func_ov000_02089998Eb kind:function(arm,size=0x184) addr:0x020899e4 func_ov000_02089b1c kind:function(arm,size=0x3c) addr:0x02089b68 func_ov000_02089b58 kind:function(arm,size=0x64) addr:0x02089ba4 func_ov000_02089bbc kind:function(arm,size=0x64) addr:0x02089c08 @@ -1863,7 +1863,7 @@ _ZN18PlayerActorBase_5C19func_ov000_02089dc4Ev kind:function(arm,size=0x28) addr func_ov000_02089dec kind:function(arm,size=0x68) addr:0x02089e38 func_ov000_02089e54 kind:function(arm,size=0x88) addr:0x02089ea0 func_ov000_02089edc kind:function(arm,size=0x30) addr:0x02089f28 -func_ov000_02089f0c kind:function(arm,size=0x40) addr:0x02089f58 +_ZN18PlayerActorBase_5C19func_ov000_02089f0cEb kind:function(arm,size=0x40) addr:0x02089f58 func_ov000_02089f4c kind:function(arm,size=0x28) addr:0x02089f98 func_ov000_02089f74 kind:function(arm,size=0x24) addr:0x02089fc0 func_ov000_02089f98 kind:function(arm,size=0x18) addr:0x02089fe4 @@ -1930,10 +1930,10 @@ func_ov000_0208bbb4 kind:function(arm,size=0x10) addr:0x0208bc00 func_ov000_0208bbc4 kind:function(arm,size=0x10) addr:0x0208bc10 func_ov000_0208bbd4 kind:function(arm,size=0x2c) addr:0x0208bc20 func_ov000_0208bc00 kind:function(arm,size=0x1c) addr:0x0208bc4c -_ZN18UnkStruct_027e0ce019func_ov000_0208bc1cEiiiiii kind:function(arm,size=0x40) addr:0x0208bc68 +_ZN18UnkStruct_027e0ce019func_ov000_0208bc1cEiiiiPvi kind:function(arm,size=0x40) addr:0x0208bc68 func_ov000_0208bc5c kind:function(arm,size=0x40) addr:0x0208bca8 _ZN18UnkStruct_027e0ce019func_ov000_0208bc9cEii kind:function(arm,size=0x88) addr:0x0208bce8 -func_ov000_0208bd20 kind:function(arm,size=0x10) addr:0x0208bd70 +_ZN18UnkStruct_027e0ce019func_ov000_0208bd20Ebii kind:function(arm,size=0x10) addr:0x0208bd70 _ZN18UnkStruct_027e0ce019func_ov000_0208bd30Ebiii kind:function(arm,size=0x18) addr:0x0208bd80 func_ov000_0208bd48 kind:function(arm,size=0x34) addr:0x0208bd98 func_ov000_0208bd7c kind:function(arm,size=0x10) addr:0x0208bdcc @@ -1943,7 +1943,7 @@ func_ov000_0208bdb4 kind:function(arm,size=0x20) addr:0x0208be04 func_ov000_0208bdd4 kind:function(arm,size=0x10) addr:0x0208be24 func_ov000_0208bde4 kind:function(arm,size=0x18) addr:0x0208be34 func_ov000_0208bdfc kind:function(arm,size=0x10) addr:0x0208be4c -func_ov000_0208be0c kind:function(arm,size=0x3c) addr:0x0208be5c +_ZN18UnkStruct_027e0ce019func_ov000_0208be0cE8ActorRef kind:function(arm,size=0x3c) addr:0x0208be5c func_ov000_0208be48 kind:function(arm,size=0x28) addr:0x0208be98 func_ov000_0208be70 kind:function(arm,size=0x2c) addr:0x0208bec0 func_ov000_0208be9c kind:function(arm,size=0x2c) addr:0x0208beec @@ -1974,7 +1974,7 @@ func_ov000_0208c6d4 kind:function(arm,size=0x50) addr:0x0208c724 func_ov000_0208c724 kind:function(arm,size=0x68) addr:0x0208c774 _ZN21PlayerActorBase_70_1CC1EP18PlayerActorBase_70 kind:function(thumb,size=0x24) addr:0x0208c7dc func_ov000_0208c7b0 kind:function(arm,size=0x40) addr:0x0208c800 -func_ov000_0208c7f0 kind:function(arm,size=0x1c) addr:0x0208c840 +_ZN21PlayerActorBase_70_1C19func_ov000_0208c7f0Ev kind:function(arm,size=0x1c) addr:0x0208c840 func_ov000_0208c80c kind:function(arm,size=0x68) addr:0x0208c85c _ZN21PlayerActorBase_70_E4C1Ev kind:function(thumb,size=0x18) addr:0x0208c8c4 func_ov000_0208c88c kind:function(arm,size=0x6c) addr:0x0208c8dc @@ -1986,10 +1986,10 @@ func_ov000_0208ca08 kind:function(arm,size=0xc0) addr:0x0208ca58 func_ov000_0208cac8 kind:function(arm,size=0x40) addr:0x0208cb18 func_ov000_0208cb08 kind:function(arm,size=0xc4) addr:0x0208cb58 func_ov000_0208cbcc kind:function(arm,size=0x24) addr:0x0208cc1c -func_ov000_0208cbf0 kind:function(arm,size=0x30) addr:0x0208cc40 -func_ov000_0208cc20 kind:function(arm,size=0x38) addr:0x0208cc70 +_ZN15PlayerActorBase19func_ov000_0208cbf0Ev kind:function(arm,size=0x30) addr:0x0208cc40 +_ZN15PlayerActorBase19func_ov000_0208cc20EP7VecFx32 kind:function(arm,size=0x38) addr:0x0208cc70 func_ov000_0208cc58 kind:function(arm,size=0x38) addr:0x0208cca8 -func_ov000_0208cc90 kind:function(arm,size=0x4c) addr:0x0208cce0 +_ZN15PlayerActorBase19func_ov000_0208cc90Ev kind:function(arm,size=0x4c) addr:0x0208cce0 func_ov000_0208ccdc kind:function(arm,size=0x4c) addr:0x0208cd2c func_ov000_0208cd28 kind:function(arm,size=0x78) addr:0x0208cd78 func_ov000_0208cda0 kind:function(arm,size=0x68) addr:0x0208cdf0 @@ -2001,19 +2001,19 @@ func_ov000_0208d12c kind:function(arm,size=0x50) addr:0x0208d180 func_ov000_0208d17c kind:function(arm,size=0x60) addr:0x0208d1d0 func_ov000_0208d1dc kind:function(arm,size=0x58) addr:0x0208d230 func_ov000_0208d234 kind:function(arm,size=0x174) addr:0x0208d288 -func_ov000_0208d3a8 kind:function(arm,size=0x28) addr:0x0208d3fc -func_ov000_0208d3d0 kind:function(arm,size=0x2c) addr:0x0208d424 +_ZN15PlayerActorBase19func_ov000_0208d3a8Ev kind:function(arm,size=0x28) addr:0x0208d3fc +_ZN15PlayerActorBase19func_ov000_0208d3d0EP5Vec2siPv kind:function(arm,size=0x2c) addr:0x0208d424 _ZN15PlayerActorBase19func_ov000_0208d3fcEv kind:function(thumb,size=0x90) addr:0x0208d450 func_ov000_0208d48c kind:function(arm,size=0x114) addr:0x0208d4e0 func_ov000_0208d5a0 kind:function(arm,size=0x6c) addr:0x0208d5f4 -func_ov000_0208d60c kind:function(arm,size=0x148) addr:0x0208d660 -func_ov000_0208d754 kind:function(arm,size=0x9c) addr:0x0208d7a8 +_ZN15PlayerActorBase19func_ov000_0208d60cEv kind:function(arm,size=0x148) addr:0x0208d660 +_ZN15PlayerActorBase19func_ov000_0208d754Ev kind:function(arm,size=0x9c) addr:0x0208d7a8 _ZN15PlayerActorBase19func_ov000_0208d7f0Eb kind:function(arm,size=0x100) addr:0x0208d844 func_ov000_0208d8f0 kind:function(arm,size=0x38) addr:0x0208d944 func_ov000_0208d928 kind:function(arm,size=0x18) addr:0x0208d97c func_ov000_0208d940 kind:function(arm,size=0x194) addr:0x0208d994 func_ov000_0208dad4 kind:function(arm,size=0x34) addr:0x0208db28 -func_ov000_0208db08 kind:function(arm,size=0xd8) addr:0x0208db5c +_ZN15PlayerActorBase19func_ov000_0208db08Ev kind:function(arm,size=0xd8) addr:0x0208db5c func_ov000_0208dbe0 kind:function(arm,size=0xc) addr:0x0208dc34 func_ov000_0208dbec kind:function(arm,size=0x18) addr:0x0208dc40 func_ov000_0208dc04 kind:function(arm,size=0x1c) addr:0x0208dc58 @@ -2024,7 +2024,7 @@ func_ov000_0208dc58 kind:function(arm,size=0x10) addr:0x0208dcac func_ov000_0208dc68 kind:function(arm,size=0x10) addr:0x0208dcbc func_ov000_0208dc78 kind:function(arm,size=0x10) addr:0x0208dccc func_ov000_0208dc88 kind:function(arm,size=0x10) addr:0x0208dcdc -func_ov000_0208dc98 kind:function(arm,size=0x58) addr:0x0208dcec +_ZN15PlayerActorBase19func_ov000_0208dc98Ev kind:function(arm,size=0x58) addr:0x0208dcec func_ov000_0208dcf0 kind:function(arm,size=0x60) addr:0x0208dd44 func_ov000_0208dd50 kind:function(arm,size=0x10) addr:0x0208dda4 func_ov000_0208dd60 kind:function(arm,size=0x10) addr:0x0208ddb4 @@ -2124,10 +2124,10 @@ func_ov000_020920b0 kind:function(arm,size=0x34) addr:0x02092104 func_ov000_020920e4 kind:function(arm,size=0xc4) addr:0x02092138 func_ov000_020921a8 kind:function(arm,size=0x3c) addr:0x020921fc _ZN18PlayerLinkActor_A019func_ov000_020921e4Ei kind:function(arm,size=0x464) addr:0x02092238 -func_ov000_02092648 kind:function(arm,size=0x7f0) addr:0x0209269c -func_ov000_02092e38 kind:function(arm,size=0x70) addr:0x02092e8c -func_ov000_02092ea8 kind:function(arm,size=0x24) addr:0x02092efc -func_ov000_02092ecc kind:function(arm,size=0x19c) addr:0x02092f20 +_ZN18PlayerLinkActor_A019func_ov000_02092648Ei kind:function(arm,size=0x7f0) addr:0x0209269c +_ZN18PlayerLinkActor_A019func_ov000_02092e38Ev kind:function(arm,size=0x70) addr:0x02092e8c +_ZN18PlayerLinkActor_A019func_ov000_02092ea8Eii kind:function(arm,size=0x24) addr:0x02092efc +_ZN18PlayerLinkActor_A019func_ov000_02092eccEPvb kind:function(arm,size=0x19c) addr:0x02092f20 func_ov000_02093068 kind:function(arm,size=0x28) addr:0x020930bc func_ov000_02093090 kind:function(arm,size=0x28) addr:0x020930e4 func_ov000_020930b8 kind:function(arm,size=0x3c) addr:0x0209310c @@ -2137,10 +2137,10 @@ func_ov000_02093250 kind:function(arm,size=0xf0) addr:0x020932a4 func_ov000_02093340 kind:function(arm,size=0xf8) addr:0x02093394 func_ov000_02093438 kind:function(arm,size=0x124) addr:0x0209348c func_ov000_0209355c kind:function(arm,size=0xb0) addr:0x020935b0 -func_ov000_0209360c kind:function(arm,size=0x44) addr:0x02093660 -func_ov000_02093650 kind:function(arm,size=0x4c) addr:0x020936a4 +_ZN18PlayerLinkActor_A019func_ov000_0209360cEv kind:function(arm,size=0x44) addr:0x02093660 +_ZN18PlayerLinkActor_A019func_ov000_02093650Ev kind:function(arm,size=0x4c) addr:0x020936a4 func_ov000_0209369c kind:function(arm,size=0x28) addr:0x020936f0 -func_ov000_020936c4 kind:function(arm,size=0x28) addr:0x02093718 +_ZN18PlayerLinkActor_A019func_ov000_020936c4Ev kind:function(arm,size=0x28) addr:0x02093718 _ZN18PlayerLinkActor_A019func_ov000_020936ecEv kind:function(arm,size=0x2c) addr:0x02093740 _ZN18PlayerLinkActor_A019func_ov000_02093718Ev kind:function(arm,size=0x38) addr:0x0209376c func_ov000_02093750 kind:function(arm,size=0x3c) addr:0x020937a4 @@ -2167,7 +2167,7 @@ func_ov000_02093da0 kind:function(arm,size=0x1b8) addr:0x02093df4 func_ov000_02093f58 kind:function(arm,size=0x1c) addr:0x02093fac func_ov000_02093f74 kind:function(arm,size=0x5c) addr:0x02093fc8 func_ov000_02093fd0 kind:function(arm,size=0x18) addr:0x02094024 -func_ov000_02093fe8 kind:function(arm,size=0x2c) addr:0x0209403c +_ZN18PlayerLinkActor_A019func_ov000_02093fe8Ev kind:function(arm,size=0x2c) addr:0x0209403c func_ov000_02094014 kind:function(arm,size=0x20) addr:0x02094068 func_ov000_02094034 kind:function(arm,size=0x20) addr:0x02094088 func_ov000_02094054 kind:function(arm,size=0x30) addr:0x020940a8 @@ -2220,13 +2220,13 @@ func_ov000_020961ec kind:function(arm,size=0x170) addr:0x02096240 func_ov000_0209635c kind:function(arm,size=0x514) addr:0x020963b0 _ZN19func_ov000_02096870D1Ev kind:function(arm,size=0x20) addr:0x020968c4 _ZN19func_ov000_02096890D0Ev kind:function(arm,size=0x28) addr:0x020968e4 -func_ov000_020968b8 kind:function(arm,size=0x28) addr:0x0209690c +_ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov000_020968b8Ev kind:function(arm,size=0x28) addr:0x0209690c _ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov000_020968e0Ev kind:function(arm,size=0x1c) addr:0x02096934 -func_ov000_020968fc kind:function(arm,size=0xb8) addr:0x02096950 +_ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov000_020968fcEv kind:function(arm,size=0xb8) addr:0x02096950 func_ov000_020969b4 kind:function(arm,size=0xe8) addr:0x02096a08 _ZN29UnkStruct_027e0ce0_40_Base_1419func_ov000_02096a9cEv kind:function(arm,size=0x58) addr:0x02096af0 -func_ov000_02096af4 kind:function(arm,size=0x28) addr:0x02096b48 -func_ov000_02096b1c kind:function(arm,size=0x78) addr:0x02096b70 +_ZN29UnkStruct_027e0ce0_40_Base_1419func_ov000_02096af4Ev kind:function(arm,size=0x28) addr:0x02096b48 +_ZN29UnkStruct_027e0ce0_40_Base_1419func_ov000_02096b1cEi kind:function(arm,size=0x78) addr:0x02096b70 _ZN9PassengerC1Ev kind:function(arm,size=0x14) addr:0x02096be8 _ZN9Passenger5ResetEv kind:function(arm,size=0x24) addr:0x02096bfc func_ov000_02096bcc kind:function(arm,size=0x48) addr:0x02096c20 @@ -2320,8 +2320,8 @@ _ZN5Actor8vfunc_18Ei kind:function(arm,size=0x8) addr:0x020984fc _ZN5Actor8vfunc_1CEv kind:function(arm,size=0x4) addr:0x02098504 _ZN5Actor8vfunc_20Ev kind:function(arm,size=0x4) addr:0x02098508 _ZN5Actor8vfunc_24Ev kind:function(arm,size=0x4) addr:0x0209850c -_ZN5Actor8vfunc_28Ev kind:function(arm,size=0x4) addr:0x02098510 -_ZN5Actor8vfunc_2CEi kind:function(arm,size=0x4) addr:0x02098514 +_ZN5Actor8vfunc_28EP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x02098510 +_ZN5Actor8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x02098514 _ZN5Actor8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x02098518 _ZN5Actor8vfunc_34Ev kind:function(arm,size=0x8) addr:0x0209851c _ZN5Actor19func_ov000_020984d0Ev kind:function(arm,size=0x20) addr:0x02098524 @@ -2344,7 +2344,7 @@ _ZN5Actor19func_ov000_02098838Ev kind:function(arm,size=0x28) addr:0x0209888c _ZN5Actor19func_ov000_0209a008Eis kind:function(arm,size=0xb0) addr:0x020988b4 _ZN5Actor19func_ov000_02098910EP24UnkStruct_ov031_Items_00i kind:function(arm,size=0xd0) addr:0x02098964 _ZN5Actor19func_ov000_020989e0Ev kind:function(arm,size=0x38) addr:0x02098a34 -func_ov000_02098a18 kind:function(arm,size=0x48) addr:0x02098a6c +_ZN5Actor19func_ov000_02098a18EP8Cylinder kind:function(arm,size=0x48) addr:0x02098a6c _ZN5Actor19func_ov000_02098a60Ei kind:function(arm,size=0x28) addr:0x02098ab4 _ZN5Actor19func_ov000_02098a88Eii kind:function(arm,size=0x2c) addr:0x02098adc _ZN5Actor19func_ov000_02098ab4EhiiP7VecFx32 kind:function(arm,size=0x74) addr:0x02098b08 @@ -2355,7 +2355,7 @@ func_ov000_02098d7c kind:function(arm,size=0x1b8) addr:0x02098dd0 _ZN14Actor_Derived219func_ov000_02098f34EP7VecFx32 kind:function(arm,size=0xd0) addr:0x02098f88 _ZN14Actor_Derived28vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0xc) addr:0x02099058 func_ov000_02099010 kind:function(arm,size=0xb0) addr:0x02099064 -func_ov000_020990c0 kind:function(arm,size=0x21c) addr:0x02099114 +_ZN14Actor_Derived219func_ov000_020990c0EP8Actor_9Cii kind:function(arm,size=0x21c) addr:0x02099114 _ZN14Actor_Derived219func_ov000_020992dcEv kind:function(arm,size=0x90) addr:0x02099330 func_ov000_0209936c kind:function(arm,size=0x64) addr:0x020993c0 func_ov000_020993d0 kind:function(arm,size=0x80) addr:0x02099424 @@ -2372,7 +2372,7 @@ _ZN14Actor_Derived2D1Ev kind:function(arm,size=0x14) addr:0x02099844 _ZN14Actor_Derived2D0Ev kind:function(arm,size=0x1c) addr:0x02099858 _ZN26UnkStruct_ActorUnkCANS_224C1Ev kind:function(arm,size=0x50) addr:0x02099874 func_ov000_02099870 kind:function(arm,size=0x80) addr:0x020998c4 -func_ov000_020998f0 kind:function(arm,size=0x11c) addr:0x02099944 +_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_020998f0E8ActorRefP7VecFx32 kind:function(arm,size=0x11c) addr:0x02099944 _ZN26UnkStruct_ActorUnkCANS_22419func_ov000_02099a0cEv kind:function(arm,size=0x10) addr:0x02099a60 func_ov000_02099a1c kind:function(arm,size=0xc) addr:0x02099a70 _ZN24UnkStruct_ov000_020b31a8C2EP10UnkSystem5P11ModelRenderP19UnkActorFileSystem2 kind:function(thumb,size=0x54) addr:0x02099a7c @@ -2556,9 +2556,9 @@ _ZN9MapObject8vfunc_04Ev kind:function(arm,size=0x4) addr:0x0209d10c _ZN9MapObject19func_ov000_0209d0bcEP8Vec2bCppPS_ kind:function(arm,size=0x58) addr:0x0209d110 _ZN9MapObject19func_ov000_0209d114Ev kind:function(arm,size=0x18) addr:0x0209d168 _ZN9MapObject19func_ov000_0209d12cEv kind:function(arm,size=0x18) addr:0x0209d180 -_ZN9MapObject19func_ov000_0209d144EP5Vec2sii kind:function(arm,size=0x88) addr:0x0209d198 +_ZN9MapObject19func_ov000_0209d144EP5Vec2siP21UnkStruct_027e09bc_0C kind:function(arm,size=0x88) addr:0x0209d198 _ZN9MapObject8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x8) addr:0x0209d220 -_ZN9MapObject8vfunc_20Ev kind:function(arm,size=0x4) addr:0x0209d228 +_ZN9MapObject8vfunc_20Ei kind:function(arm,size=0x4) addr:0x0209d228 _ZN9MapObject8vfunc_24EPS_7VecFx32 kind:function(arm,size=0xc) addr:0x0209d22c _ZN9MapObject8vfunc_28Eiii kind:function(arm,size=0x8) addr:0x0209d238 _ZN9MapObject8vfunc_2CEP7VecFx32 kind:function(arm,size=0x40) addr:0x0209d240 @@ -2608,9 +2608,9 @@ _ZN22MapObjectSwitchStep_40D1Ev kind:function(arm,size=0x14) addr:0x0209dff0 _ZN19MapObjectSwitchStepD1Ev kind:function(arm,size=0x58) addr:0x0209e004 _ZN19MapObjectSwitchStepD0Ev kind:function(arm,size=0x60) addr:0x0209e05c _ZN19MapObjectSwitchStep8vfunc_00Ev kind:function(arm,size=0xb4) addr:0x0209e0bc -_ZN19MapObjectSwitchStep19func_ov000_0209e11cEii kind:function(arm,size=0x164) addr:0x0209e170 -_ZN19MapObjectSwitchStep8vfunc_20Ev kind:function(arm,size=0x34) addr:0x0209e2d4 -_ZN19MapObjectSwitchStep8vfunc_18EPcc kind:function(arm,size=0xd8) addr:0x0209e308 +_ZN19MapObjectSwitchStep19func_ov000_0209e11cEsi kind:function(arm,size=0x164) addr:0x0209e170 +_ZN19MapObjectSwitchStep8vfunc_20Ei kind:function(arm,size=0x34) addr:0x0209e2d4 +_ZN19MapObjectSwitchStep8vfunc_18EPc kind:function(arm,size=0xd8) addr:0x0209e308 _ZN19MapObjectSwitchStep19func_ov000_0209e38cEv kind:function(arm,size=0x3c) addr:0x0209e3e0 _ZN22MapObjectSwitchStep_40D0Ev kind:function(arm,size=0x1c) addr:0x0209e41c _ZN26MapObjectProfileSwitchStepD1Ev kind:function(arm,size=0x14) addr:0x0209e438 @@ -2619,7 +2619,7 @@ _ZN26MapObjectProfileMiniBlocks6CreateEv kind:function(arm,size=0x24) addr:0x020 _ZN26MapObjectProfileMiniBlocksC1Ev kind:function(arm,size=0x4c) addr:0x0209e47c _ZN19MapObjectMiniBlocksC1Ev kind:function(arm,size=0x3c) addr:0x0209e4c8 _ZN19MapObjectMiniBlocks8vfunc_00Ev kind:function(arm,size=0x1fc) addr:0x0209e504 -_ZN19MapObjectMiniBlocks8vfunc_14Ev kind:function(arm,size=0x60) addr:0x0209e700 +_ZN19MapObjectMiniBlocks8vfunc_14Ei kind:function(arm,size=0x60) addr:0x0209e700 _ZN19MapObjectMiniBlocksD1Ev kind:function(arm,size=0x20) addr:0x0209e760 _ZN19MapObjectMiniBlocksD0Ev kind:function(arm,size=0x28) addr:0x0209e780 _ZN26MapObjectProfileMiniBlocksD1Ev kind:function(arm,size=0x14) addr:0x0209e7a8 @@ -3015,7 +3015,7 @@ _ZN11ItemManager19func_ov000_020a89bcEv kind:function(thumb,size=0x18) addr:0x02 _ZN11ItemManager19func_ov000_020a89d4Ev kind:function(arm,size=0x38) addr:0x020a8a28 _ZN11ItemManager19func_ov000_020a8a0cEv kind:function(arm,size=0x50) addr:0x020a8a60 _ZN11ItemManager19func_ov000_020a8a5cEv kind:function(arm,size=0x18) addr:0x020a8ab0 -_ZN11ItemManager19func_ov000_020a8a74Ev kind:function(arm,size=0x1c) addr:0x020a8ac8 +_ZN11ItemManager19func_ov000_020a8a74EP24UnkStruct_027e0ce0_30_00 kind:function(arm,size=0x1c) addr:0x020a8ac8 _ZN11ItemManager19func_ov000_020a8a90Ev kind:function(arm,size=0x14) addr:0x020a8ae4 _ZN11ItemManager19func_ov000_020a8aa4Ev kind:function(arm,size=0x14) addr:0x020a8af8 _ZN11ItemManager19func_ov000_020a8ab8Ev kind:function(arm,size=0x14) addr:0x020a8b0c @@ -3067,7 +3067,7 @@ _ZN14Actor_Derived18vfunc_A8Ev kind:function(arm,size=0x8) addr:0x020a9850 _ZN14Actor_Derived119func_ov000_020a9804Ev kind:function(arm,size=0xec) addr:0x020a9858 _ZN14Actor_Derived18vfunc_20Ev kind:function(arm,size=0x4) addr:0x020a9944 _ZN14Actor_Derived18vfunc_24Ev kind:function(arm,size=0x68) addr:0x020a9948 -_ZN14Actor_Derived18vfunc_2CEi kind:function(arm,size=0x48) addr:0x020a99b0 +_ZN14Actor_Derived18vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x48) addr:0x020a99b0 _ZN14Actor_Derived18vfunc_B8Ev kind:function(arm,size=0x34) addr:0x020a99f8 _ZN14Actor_Derived18vfunc_14Ev kind:function(arm,size=0x48) addr:0x020a9a2c _ZN19func_ov000_020a9a20D1Ev kind:function(arm,size=0x14) addr:0x020a9a74 diff --git a/config/eur1/arm9/overlays/ov001/symbols.txt b/config/eur1/arm9/overlays/ov001/symbols.txt index eee1bba8..ef633e2a 100644 --- a/config/eur1/arm9/overlays/ov001/symbols.txt +++ b/config/eur1/arm9/overlays/ov001/symbols.txt @@ -200,14 +200,14 @@ _Z19func_ov001_020bbac4iP10G3d_Model_ib kind:function(thumb,size=0x5c) addr:0x02 _ZN18PlayerActorBase_70C1Eii kind:function(thumb,size=0x260) addr:0x020bbb60 _ZN18PlayerActorBase_70D1Ev kind:function(thumb,size=0x96) addr:0x020bbdc0 _ZN18PlayerActorBase_7019func_ov001_020bbe18Ei14UnkAngleStructjh kind:function(thumb,size=0x4c) addr:0x020bbe58 -_ZN24UnkStruct_027e0ce0_30_00C1EP21UnkStruct_027e0ce0_38P21UnkStruct_027e0ce0_3CiPii kind:function(thumb,size=0x7c) addr:0x020bbea4 +_ZN24UnkStruct_027e0ce0_30_00C1EP21UnkStruct_027e0ce0_38P21UnkStruct_027e0ce0_3CP21UnkStruct_027e0ce0_40P15PlayerLinkActorP15PlayerActorBase kind:function(thumb,size=0x7c) addr:0x020bbea4 _ZN24UnkStruct_027e0ce0_30_00D1Ev kind:function(thumb,size=0x2) addr:0x020bbf20 _ZN21UnkStruct_027e0ce0_30C1Ev kind:function(thumb,size=0x18) addr:0x020bbf24 _ZN21UnkStruct_027e0ce0_30D1Ev kind:function(thumb,size=0x2) addr:0x020bbf3c _ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf00Eii kind:function(thumb,size=0x24) addr:0x020bbf40 _ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf24EP21UnkStruct_027e0ce0_38 kind:function(thumb,size=0x2a) addr:0x020bbf64 _ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf50EP21UnkStruct_027e0ce0_3C kind:function(thumb,size=0x2a) addr:0x020bbf90 -_ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf7cEiPii kind:function(thumb,size=0x50) addr:0x020bbfbc +_ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf7cEP21UnkStruct_027e0ce0_40P15PlayerLinkActorP15PlayerActorBase kind:function(thumb,size=0x50) addr:0x020bbfbc _ZN21UnkStruct_027e0ce0_3019func_ov001_020bbfccEv kind:function(thumb,size=0x5a) addr:0x020bc00c _ZN26UnkStruct_027e0ce0_40_BaseC2EiPvP11ItemManager kind:function(thumb,size=0x88) addr:0x020bc068 _ZN26UnkStruct_027e0ce0_40_BaseD2Ev kind:function(thumb,size=0x30) addr:0x020bc0f0 @@ -241,7 +241,7 @@ _ZN15PlayerActorBase19func_ov001_020bc96cEv kind:function(thumb,size=0x2e) addr: _ZN15PlayerLinkActorC1EiP11ItemManagerP21UnkStruct_027e0ce0_40P25UnkStruct_027e0ce0_40_150 kind:function(thumb,size=0x138) addr:0x020bc9dc _ZN19PlayerLinkActor_1B0D1Ev kind:function(thumb,size=0xc) addr:0x020bcb14 _ZN15PlayerLinkActorD1Ev kind:function(thumb,size=0x80) addr:0x020bcb20 -_ZN15PlayerLinkActor19func_ov001_020bcb60EP25UnkStruct_027e0ce0_40_328 kind:function(thumb,size=0x10) addr:0x020bcba0 +_ZN15PlayerLinkActor19func_ov001_020bcb60EP15PlayerActorBase kind:function(thumb,size=0x10) addr:0x020bcba0 _ZN15PlayerLinkActor19func_ov001_020bcb70Ev kind:function(thumb,size=0x36) addr:0x020bcbb0 _ZN15PlayerLinkActor19func_ov001_020bcba8Ev kind:function(thumb,size=0x26) addr:0x020bcbe8 _ZN15PlayerLinkActor19func_ov001_020bcbd0EP7VecFx32 kind:function(thumb,size=0x98) addr:0x020bcc10 diff --git a/config/eur1/arm9/overlays/ov005/symbols.txt b/config/eur1/arm9/overlays/ov005/symbols.txt index 2a2d00fe..ac2bec19 100644 --- a/config/eur1/arm9/overlays/ov005/symbols.txt +++ b/config/eur1/arm9/overlays/ov005/symbols.txt @@ -1,7 +1,7 @@ func_ov005_020b6520 kind:function(arm,size=0x28) addr:0x020b6560 func_ov005_020b6548 kind:function(arm,size=0x28) addr:0x020b6588 -func_ov005_020b6570 kind:function(arm,size=0x134) addr:0x020b65b0 -func_ov005_020b66a4 kind:function(arm,size=0x1a4) addr:0x020b66e4 +_ZN16MapObjectManager19func_ov005_020b6570Ei kind:function(arm,size=0x134) addr:0x020b65b0 +_ZN12ActorManager19func_ov005_020b66a4Ei kind:function(arm,size=0x1a4) addr:0x020b66e4 _ZN12ActorUnkSWOB8vfunc_20Ev kind:function(arm,size=0xf4) addr:0x020b6888 func_ov005_020b693c kind:function(arm,size=0x224) addr:0x020b697c func_ov005_020b6b60 kind:function(arm,size=0x4c) addr:0x020b6ba0 diff --git a/config/eur1/arm9/overlays/ov017/relocs.txt b/config/eur1/arm9/overlays/ov017/relocs.txt index 06e4c80f..c151c8db 100644 --- a/config/eur1/arm9/overlays/ov017/relocs.txt +++ b/config/eur1/arm9/overlays/ov017/relocs.txt @@ -60,11 +60,11 @@ from:0x020bba58 kind:load to:0x02043e50 module:main from:0x020bba5c kind:load to:0x020b8350 module:overlays(3,8,9,13,16) from:0x020bba70 kind:arm_call to:0x020bbad4 module:overlay(17) from:0x020bba78 kind:arm_call to:0x02013d94 module:main -from:0x020bba84 kind:load to:0x020c3f48 module:overlay(17) +from:0x020bba84 kind:load to:0x020c3f40 module:overlay(17) add:0x8 from:0x020bba98 kind:arm_call to:0x020bbad4 module:overlay(17) from:0x020bbaa0 kind:arm_call to:0x02013d94 module:main from:0x020bbaa8 kind:arm_call to:0x02011ff4 module:main -from:0x020bbab4 kind:load to:0x020c3f48 module:overlay(17) +from:0x020bbab4 kind:load to:0x020c3f40 module:overlay(17) add:0x8 from:0x020bbacc kind:load to:0x02049b80 module:main from:0x020bbad0 kind:load to:0x02013fec module:main from:0x020bbae4 kind:load to:0x02049b80 module:main @@ -867,7 +867,7 @@ from:0x020c3ea4 kind:arm_call to:0x0203ce74 module:main from:0x020c3eb8 kind:load to:0x020c3fa0 module:overlay(17) from:0x020c3ebc kind:load to:0x020c3fb0 module:overlay(17) from:0x020c3ec0 kind:load to:0x020c407c module:overlay(17) -from:0x020c3ec4 kind:load to:0x020c3f48 module:overlay(17) +from:0x020c3ec4 kind:load to:0x020c3f40 module:overlay(17) add:0x8 from:0x020c3ec8 kind:load to:0x020bba60 module:overlay(17) from:0x020c3ecc kind:load to:0x020c3fa4 module:overlay(17) from:0x020c3f04 kind:load to:0x020c3f54 module:overlay(17) diff --git a/config/eur1/arm9/overlays/ov017/symbols.txt b/config/eur1/arm9/overlays/ov017/symbols.txt index 3c7018bc..02ab178c 100644 --- a/config/eur1/arm9/overlays/ov017/symbols.txt +++ b/config/eur1/arm9/overlays/ov017/symbols.txt @@ -1,45 +1,45 @@ -func_ov017_020bb660 kind:function(arm,size=0x198) addr:0x020bb6a0 -func_ov017_020bb7f8 kind:function(arm,size=0x13c) addr:0x020bb838 -func_ov017_020bb934 kind:function(arm,size=0x60) addr:0x020bb974 -_ZN18UnkStruct_027e09a419func_ov017_020bb994EPv kind:function(arm,size=0x8c) addr:0x020bb9d4 -_ZN19func_ov017_020bba20D1Ev kind:function(arm,size=0x28) addr:0x020bba60 -_ZN19func_ov017_020bba48D0Ev kind:function(arm,size=0x30) addr:0x020bba88 +_ZN18UnkStruct_027e09a419func_ov017_020bb660Ei kind:function(arm,size=0x198) addr:0x020bb6a0 +_ZN18UnkStruct_027e09a419func_ov017_020bb7f8EPv kind:function(arm,size=0x13c) addr:0x020bb838 +_ZN18UnkStruct_027e09a419func_ov017_020bb934EPv kind:function(arm,size=0x60) addr:0x020bb974 +_ZN18UnkStruct_027e09a419func_ov017_020bb994EPc kind:function(arm,size=0x8c) addr:0x020bb9d4 +_ZN24UnkStruct_ov017_020c3f70D1Ev kind:function(arm,size=0x28) addr:0x020bba60 +_ZN24UnkStruct_ov017_020c3f70D0Ev kind:function(arm,size=0x30) addr:0x020bba88 _ZN24UnkStruct_ov017_020c3f7019func_ov017_020bba78Ev kind:function(arm,size=0x1c) addr:0x020bbab8 _ZN24UnkStruct_ov017_020c3f7019func_ov017_020bba94Ev kind:function(arm,size=0x14) addr:0x020bbad4 -func_ov017_020bbaa8 kind:function(arm,size=0x230) addr:0x020bbae8 -func_ov017_020bbcd8 kind:function(arm,size=0x21c) addr:0x020bbd18 -func_ov017_020bbef4 kind:function(arm,size=0x78) addr:0x020bbf34 -func_ov017_020bbf6c kind:function(arm,size=0x10) addr:0x020bbfac -func_ov017_020bbf7c kind:function(arm,size=0x680) addr:0x020bbfbc -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 -_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 -func_ov017_020bd4a0 kind:function(arm,size=0xc8) addr:0x020bd4e0 -func_ov017_020bd568 kind:function(arm,size=0x5c) addr:0x020bd5a8 -func_ov017_020bd5c4 kind:function(arm,size=0x18) addr:0x020bd604 -func_ov017_020bd5dc kind:function(arm,size=0x68) addr:0x020bd61c -func_ov017_020bd644 kind:function(arm,size=0x58) addr:0x020bd684 +_ZN18PlayerActorBase_7019func_ov017_020bbaa8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x230) addr:0x020bbae8 +_ZN18PlayerActorBase_7019func_ov017_020bbcd8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x21c) addr:0x020bbd18 +_ZN18PlayerActorBase_7019func_ov017_020bbef4EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x78) addr:0x020bbf34 +_ZN18PlayerActorBase_7019func_ov017_020bbf6cEv kind:function(arm,size=0x10) addr:0x020bbfac +_ZN24UnkStruct_027e0ce0_30_0019func_ov017_020bbf7cEP11ItemManager kind:function(arm,size=0x680) addr:0x020bbfbc +_ZN21UnkStruct_027e0ce0_3019func_ov017_020bc5fcEP11ItemManager kind:function(arm,size=0x44) addr:0x020bc63c +_ZN18PlayerLinkActor_9C19func_ov017_020bc640EjbbhhP7VecFx32S1_S1_ kind:function(arm,size=0x31c) addr:0x020bc680 +_ZN21UnkStruct_027e0ce0_4019func_ov017_020bc95cEb kind:function(arm,size=0xe4) addr:0x020bc99c +_ZN21UnkStruct_027e0ce0_4019func_ov017_020bca40Ebi kind:function(arm,size=0x3a8) addr:0x020bca80 +_ZN21UnkStruct_027e0ce0_4019func_ov017_020bcde8Eb kind:function(arm,size=0x4b8) addr:0x020bce28 +_ZN11ItemManager19func_ov017_020bd2a0Ebb kind:function(arm,size=0x48) addr:0x020bd2e0 +_ZN11ItemManager19func_ov017_020bd2e8EPv kind:function(arm,size=0x18) addr:0x020bd328 +_ZN29UnkStruct_027e0ce0_40_Base_9419func_ov017_020bd300EP29UnkStruct_027e0ce0_40_Base_14ib kind:function(arm,size=0x178) addr:0x020bd340 +_ZN29UnkStruct_027e0ce0_40_Base_9419func_ov017_020bd478Ev kind:function(arm,size=0x28) addr:0x020bd4b8 +_ZN18UnkStruct_027e0ce019func_ov017_020bd4a0Eib kind:function(arm,size=0xc8) addr:0x020bd4e0 +_ZN18UnkStruct_027e0ce019func_ov017_020bd568Ei kind:function(arm,size=0x5c) addr:0x020bd5a8 +_ZN18UnkStruct_027e0ce019func_ov017_020bd5c4EPv kind:function(arm,size=0x18) addr:0x020bd604 +_ZN18UnkStruct_027e0ce019func_ov017_020bd5dcEPv kind:function(arm,size=0x68) addr:0x020bd61c +_ZN18UnkStruct_027e0ce019func_ov017_020bd644EPv kind:function(arm,size=0x58) addr:0x020bd684 _ZN18UnkStruct_027e0ce019func_ov017_020bd69cEv kind:function(arm,size=0x1c) addr:0x020bd6dc -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 -_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 +_ZN15PlayerLinkActor19func_ov017_020bd6b8Ev kind:function(arm,size=0x28) addr:0x020bd6f8 +_ZN15PlayerLinkActor19func_ov017_020bd6e0Eb kind:function(arm,size=0x78) addr:0x020bd720 +_ZN15PlayerLinkActor19func_ov017_020bd758Ev kind:function(arm,size=0x30) addr:0x020bd798 +_ZN15PlayerLinkActor19func_ov017_020bd788Eb kind:function(arm,size=0x56c) addr:0x020bd7c8 +_ZN15PlayerLinkActor19func_ov017_020bdcf4Eii kind:function(arm,size=0x90) addr:0x020bdd34 +_ZN15PlayerLinkActor19func_ov017_020bdd84EPvi kind:function(arm,size=0x1c4) addr:0x020bddc4 +_ZN15PlayerLinkActor19func_ov017_020bdf48EPciPvP34UnkStruct_ov019_020d24c8_28_258_00 kind:function(arm,size=0x150) addr:0x020bdf88 +_ZN15PlayerLinkActor19func_ov017_020be098Ev kind:function(arm,size=0x10) addr:0x020be0d8 +_ZN21PlayerLinkActor_A0_3819func_ov017_020be0a8Ei kind:function(arm,size=0x38) addr:0x020be0e8 +_ZN21PlayerLinkActor_A0_3819func_ov017_020be0e0EiP7VecFx32bb kind:function(arm,size=0x20c) addr:0x020be120 +_ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov017_020be2ecEP29UnkStruct_027e0ce0_40_Base_14b15UnkParamStruct1 kind:function(arm,size=0x148) addr:0x020be32c _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 +_ZN29UnkStruct_027e0ce0_40_Base_1419func_ov017_020be44cEib kind:function(arm,size=0x45c) addr:0x020be48c +_ZN21UnkStruct_027e0cf8_0819func_ov017_020be8a8Ev kind:function(arm,size=0x124) addr:0x020be8e8 _ZN12CargoManager8DoUpdateEv kind:function(arm,size=0x18) addr:0x020bea0c _ZN12CargoManager15IsNotUsingTimerEi kind:function(arm,size=0x30) addr:0x020bea24 _ZN12CargoManager6UpdateEv kind:function(arm,size=0x140) addr:0x020bea54 @@ -49,62 +49,62 @@ _ZN12CargoManager19func_ov017_020bebdcEv kind:function(arm,size=0x44) addr:0x020 _ZN12CargoManager19func_ov017_020bec20Ev kind:function(arm,size=0x4c) addr:0x020bec60 _ZN12CargoManager12RemoveAmountEi kind:function(arm,size=0x30) addr:0x020becac _ZN12CargoManager19func_ov017_020bec9cEv kind:function(arm,size=0x3c) addr:0x020becdc -func_ov017_020becd8 kind:function(arm,size=0x148) addr:0x020bed18 -func_ov017_020bee20 kind:function(arm,size=0x44) addr:0x020bee60 -func_ov017_020bee64 kind:function(arm,size=0x20) addr:0x020beea4 -func_ov017_020bee84 kind:function(arm,size=0x20) addr:0x020beec4 -func_ov017_020beea4 kind:function(arm,size=0x28) addr:0x020beee4 -func_ov017_020beecc kind:function(arm,size=0x20) addr:0x020bef0c +_ZN12ActorManager19func_ov017_020becd8Ei kind:function(arm,size=0x148) addr:0x020bed18 +_ZN12ActorManager19func_ov017_020bee20EP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x44) addr:0x020bee60 +_ZN12ActorManager19func_ov017_020bee64EP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020beea4 +_ZN12ActorManager19func_ov017_020bee84EP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020beec4 +_ZN12ActorManager19func_ov017_020beea4EP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x28) addr:0x020beee4 +_ZN12ActorManager19func_ov017_020beeccEP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020bef0c _ZN5Actor19func_ov017_020beeecEi kind:function(arm,size=0x60) addr:0x020bef2c -_ZN14Actor_Derived219func_ov017_020bef4cEi kind:function(arm,size=0x3c) addr:0x020bef8c -_ZN5Actor19func_ov017_020bef88EP14Actor_vfunc_30Pvi kind:function(arm,size=0x9c) addr:0x020befc8 -func_ov017_020bf024 kind:function(arm,size=0x2c) addr:0x020bf064 -func_ov017_020bf050 kind:function(arm,size=0x128) addr:0x020bf090 -func_ov017_020bf178 kind:function(arm,size=0x10c) addr:0x020bf1b8 -func_ov017_020bf284 kind:function(arm,size=0x54) addr:0x020bf2c4 -func_ov017_020bf2d8 kind:function(arm,size=0x108) addr:0x020bf318 +_ZN5Actor19func_ov017_020bef4cEi kind:function(arm,size=0x3c) addr:0x020bef8c +_ZN5Actor19func_ov017_020bef88EP14Actor_vfunc_30P34UnkStruct_ov019_020d24c8_28_258_00i kind:function(arm,size=0x9c) addr:0x020befc8 +_ZN5Actor19func_ov017_020bf024EP14Actor_vfunc_30 kind:function(arm,size=0x2c) addr:0x020bf064 +_ZN5Actor19func_ov017_020bf050EP8Actor_9Ci kind:function(arm,size=0x128) addr:0x020bf090 +_ZN5Actor19func_ov017_020bf178EP8Actor_9Ci kind:function(arm,size=0x10c) addr:0x020bf1b8 +_ZN5Actor19func_ov017_020bf284EP7VecFx32S0_ kind:function(arm,size=0x54) addr:0x020bf2c4 +_ZN5Actor19func_ov017_020bf2d8EP8Actor_9Ci kind:function(arm,size=0x108) addr:0x020bf318 _ZN5Actor19func_ov017_020bf3e0Eii kind:function(arm,size=0xd0) addr:0x020bf420 -func_ov017_020bf4b0 kind:function(arm,size=0xc4) addr:0x020bf4f0 -func_ov017_020bf574 kind:function(arm,size=0x50) addr:0x020bf5b4 -_ZN5Actor19func_ov017_020bf5c4EP7VecFx32iiii kind:function(arm,size=0x70) addr:0x020bf604 +_ZN5Actor19func_ov017_020bf4b0Ei kind:function(arm,size=0xc4) addr:0x020bf4f0 +_ZN5Actor19func_ov017_020bf574Eii kind:function(arm,size=0x50) addr:0x020bf5b4 +_ZN5Actor19func_ov017_020bf5c4EP7VecFx32iiis kind:function(arm,size=0x70) addr:0x020bf604 _ZN5Actor19func_ov017_020bf634EPK7VecFx32ti kind:function(arm,size=0x54) addr:0x020bf674 _ZN5Actor19func_ov017_020bf688Ev kind:function(arm,size=0x88) addr:0x020bf6c8 -func_ov017_020bf710 kind:function(arm,size=0x98) addr:0x020bf750 -func_ov017_020bf7a8 kind:function(arm,size=0xec) addr:0x020bf7e8 -_ZN14Actor_Derived219func_ov017_020bf894EP26UnkStruct_ActorUnkCANS_224 kind:function(arm,size=0x60) addr:0x020bf8d4 +_ZN5Actor19func_ov017_020bf710EP26UnkStruct_ActorUnkCANS_224PK7VecFx32t kind:function(arm,size=0x98) addr:0x020bf750 +_ZN5Actor19func_ov017_020bf7a8Ev kind:function(arm,size=0xec) addr:0x020bf7e8 +_ZN5Actor19func_ov017_020bf894EP26UnkStruct_ActorUnkCANS_224 kind:function(arm,size=0x60) addr:0x020bf8d4 _ZN5Actor8vfunc_40Ev kind:function(arm,size=0x44) addr:0x020bf934 _ZN5Actor8vfunc_44Ev kind:function(arm,size=0x64) addr:0x020bf978 -func_ov017_020bf99c kind:function(arm,size=0x2c) addr:0x020bf9dc +_ZN5Actor19func_ov017_020bf99cEv kind:function(arm,size=0x2c) addr:0x020bf9dc _ZN5Actor19func_ov017_020bf9c8EPS_ kind:function(arm,size=0x88) addr:0x020bfa08 _ZN5Actor19func_ov017_020bfa50EP7VecFx32i kind:function(arm,size=0x84) addr:0x020bfa90 -func_ov017_020bfad4 kind:function(arm,size=0x44) addr:0x020bfb14 +_ZN5Actor19func_ov017_020bfad4Ev kind:function(arm,size=0x44) addr:0x020bfb14 _ZN5Actor19func_ov017_020bfb18EP8Actor_9C kind:function(arm,size=0x238) addr:0x020bfb58 -_ZN5Actor8vfunc_14Ev kind:function(arm,size=0x4c) addr:0x020bfd90 -func_ov017_020bfd9c kind:function(arm,size=0x130) addr:0x020bfddc -_ZN5Actor8vfunc_48Ev kind:function(arm,size=0x80) addr:0x020bff0c +_ZN5Actor8vfunc_14EP8Cylinder kind:function(arm,size=0x4c) addr:0x020bfd90 +_ZN5Actor19func_ov017_020bfd9cEP5Vec2siP21UnkStruct_027e09bc_0CP4AABB kind:function(arm,size=0x130) addr:0x020bfddc +_ZN5Actor8vfunc_48Ei kind:function(arm,size=0x80) addr:0x020bff0c _ZN14ActorEventIcon8vfunc_24Ev kind:function(arm,size=0xc) addr:0x020bff8c _ZN14ActorEventIcon8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0xd4) addr:0x020bff98 -func_ov017_020c002c kind:function(arm,size=0x50) addr:0x020c006c -func_ov017_020c007c kind:function(arm,size=0x60) addr:0x020c00bc -func_ov017_020c00dc kind:function(arm,size=0xec) addr:0x020c011c -func_ov017_020c01c8 kind:function(arm,size=0x4) addr:0x020c0208 -func_ov017_020c01cc kind:function(arm,size=0x70) addr:0x020c020c -func_ov017_020c023c kind:function(arm,size=0x70) addr:0x020c027c -func_ov017_020c02ac kind:function(arm,size=0x48) addr:0x020c02ec -func_ov017_020c02f4 kind:function(arm,size=0x48) addr:0x020c0334 -func_ov017_020c033c kind:function(arm,size=0x1d0) addr:0x020c037c -func_ov017_020c050c kind:function(arm,size=0x80) addr:0x020c054c +_ZN14ActorEventIcon19func_ov017_020c002cEv kind:function(arm,size=0x50) addr:0x020c006c +_ZN16MapObjectManager19func_ov017_020c007cEi kind:function(arm,size=0x60) addr:0x020c00bc +_ZN16MapObjectManager19func_ov017_020c00dcEi kind:function(arm,size=0xec) addr:0x020c011c +_ZN16MapObjectManager19func_ov017_020c01c8EPv kind:function(arm,size=0x4) addr:0x020c0208 +_ZN16MapObjectManager19func_ov017_020c01ccEi kind:function(arm,size=0x70) addr:0x020c020c +_ZN16MapObjectManager19func_ov017_020c023cEPc kind:function(arm,size=0x70) addr:0x020c027c +_ZN16MapObjectManager19func_ov017_020c02acEi8Vec2bCpp kind:function(arm,size=0x48) addr:0x020c02ec +_ZN16MapObjectManager19func_ov017_020c02f4EiP7VecFx32 kind:function(arm,size=0x48) addr:0x020c0334 +_ZN16MapObjectManager19func_ov017_020c033cEPiPS_PK5Vec2sii kind:function(arm,size=0x1d0) addr:0x020c037c +_ZN16MapObjectManager19func_ov017_020c050cEiiii kind:function(arm,size=0x80) addr:0x020c054c _ZN9MapObject8vfunc_08Ev kind:function(arm,size=0x4) addr:0x020c05cc _ZN9MapObject8vfunc_0CEv kind:function(arm,size=0x4) addr:0x020c05d0 _ZN9MapObject8vfunc_10Ev kind:function(arm,size=0x4) addr:0x020c05d4 -_ZN9MapObject8vfunc_14Ev kind:function(arm,size=0x4) addr:0x020c05d8 -_ZN9MapObject8vfunc_18EPcc kind:function(arm,size=0x4) addr:0x020c05dc +_ZN9MapObject8vfunc_14Ei kind:function(arm,size=0x4) addr:0x020c05d8 +_ZN9MapObject8vfunc_18EPc kind:function(arm,size=0x4) addr:0x020c05dc _ZN19MapObjectSwitchStep8vfunc_08Ev kind:function(arm,size=0x1ac) addr:0x020c05e0 -_ZN19MapObjectSwitchStep8vfunc_14Ev kind:function(arm,size=0x28) addr:0x020c078c +_ZN19MapObjectSwitchStep8vfunc_14Ei kind:function(arm,size=0x28) addr:0x020c078c func_ov017_020c0774 kind:function(arm,size=0x130) addr:0x020c07b4 func_ov017_020c08a4 kind:function(arm,size=0x20) addr:0x020c08e4 _ZN18UnkStruct_027e09b419func_ov017_020c08c4EP7VecFx32iiiii kind:function(arm,size=0xac) addr:0x020c0904 -func_ov017_020c0970 kind:function(arm,size=0xc0) addr:0x020c09b0 +_ZN18UnkStruct_027e09b419func_ov017_020c0970EP7VecFx32iiiiii kind:function(arm,size=0xc0) addr:0x020c09b0 func_ov017_020c0a30 kind:function(arm,size=0x3c) addr:0x020c0a70 func_ov017_020c0a6c kind:function(arm,size=0xb8) addr:0x020c0aac func_ov017_020c0b24 kind:function(arm,size=0x12c) addr:0x020c0b64 @@ -175,7 +175,7 @@ __sinit_ov017_020c3f08 kind:function(arm,size=0x18) addr:0x020c3f08 .p__sinit_ov017_020c3e64 kind:data(word) addr:0x020c3f20 .p__sinit_ov017_020c3ed0 kind:data(word) addr:0x020c3f24 .p__sinit_ov017_020c3f08 kind:data(word) addr:0x020c3f28 -data_ov017_020c3f48 kind:data(any) addr:0x020c3f48 +_ZTV24UnkStruct_ov017_020c3f70 kind:data(any) addr:0x020c3f40 data_ov017_020c3f54 kind:data(any) addr:0x020c3f54 _ZTV21UnkStruct_027e0cec_00 kind:data(any) addr:0x020c3f70 data_ov017_020c3f7c kind:data(any) addr:0x020c3f7c diff --git a/config/eur1/arm9/overlays/ov021/symbols.txt b/config/eur1/arm9/overlays/ov021/symbols.txt index 9ad10e53..958da1b9 100644 --- a/config/eur1/arm9/overlays/ov021/symbols.txt +++ b/config/eur1/arm9/overlays/ov021/symbols.txt @@ -55,12 +55,12 @@ _ZN21UnkStruct_027e0ce0_24D1Ev kind:function(thumb,size=0x2) addr:0x020eaa44 _ZN21UnkStruct_027e0ce0_2419func_ov021_020eaa08EP21UnkStruct_027e0ce0_20 kind:function(thumb,size=0xbc) addr:0x020eaa48 _ZN21UnkStruct_027e0ce0_2419func_ov021_020eaac4Ev kind:function(thumb,size=0x50) addr:0x020eab04 _ZN21UnkStruct_027e0ce0_2419func_ov021_020eab14EiPK24UnkStruct_ov001_020c40f4P21UnkStruct_027e0ce0_30 kind:function(thumb,size=0x56) addr:0x020eab54 -func_ov021_020eab6c kind:function(arm,size=0x2c0) addr:0x020eabac -func_ov021_020eae2c kind:function(arm,size=0x58) addr:0x020eae6c -func_ov021_020eae84 kind:function(arm,size=0x6c) addr:0x020eaec4 -func_ov021_020eaef0 kind:function(arm,size=0xa8) addr:0x020eaf30 +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eab6cEb kind:function(arm,size=0x2c0) addr:0x020eabac +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eae2cEi kind:function(arm,size=0x58) addr:0x020eae6c +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eae84Ev kind:function(arm,size=0x6c) addr:0x020eaec4 +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eaef0Eib kind:function(arm,size=0xa8) addr:0x020eaf30 func_ov021_020eaf98 kind:function(arm,size=0x78) addr:0x020eafd8 -func_ov021_020eb010 kind:function(arm,size=0x358) addr:0x020eb050 +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eb010Ev kind:function(arm,size=0x358) addr:0x020eb050 func_ov021_020eb368 kind:function(arm,size=0x30) addr:0x020eb3a8 func_ov021_020eb398 kind:function(arm,size=0x48) addr:0x020eb3d8 func_ov021_020eb3e0 kind:function(arm,size=0x48) addr:0x020eb420 @@ -76,14 +76,14 @@ func_ov021_020eb648 kind:function(arm,size=0x78) addr:0x020eb688 func_ov021_020eb6c0 kind:function(arm,size=0x7c) addr:0x020eb700 func_ov021_020eb73c kind:function(arm,size=0xe8) addr:0x020eb77c func_ov021_020eb824 kind:function(arm,size=0x4c) addr:0x020eb864 -func_ov021_020eb870 kind:function(arm,size=0x90) addr:0x020eb8b0 +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eb870EiiiPv kind:function(arm,size=0x90) addr:0x020eb8b0 func_ov021_020eb900 kind:function(arm,size=0x148) addr:0x020eb940 func_ov021_020eba48 kind:function(thumb,size=0x60) addr:0x020eba88 func_ov021_020ebaa8 kind:function(arm,size=0x90) addr:0x020ebae8 func_ov021_020ebb38 kind:function(arm,size=0x104) addr:0x020ebb78 _ZN24UnkStruct_027e0ce0_30_08C1Ei kind:function(thumb,size=0x28) addr:0x020ebc7c _ZN24UnkStruct_027e0ce0_30_08D1Ev kind:function(thumb,size=0x2) addr:0x020ebca4 -func_ov021_020ebc68 kind:function(arm,size=0x4c) addr:0x020ebca8 +_ZN24UnkStruct_027e0ce0_30_0819func_ov021_020ebc68Ev kind:function(arm,size=0x4c) addr:0x020ebca8 func_ov021_020ebcb4 kind:function(arm,size=0xec) addr:0x020ebcf4 _ZN15PlayerLinkActor19func_ov021_020ebda0Ev kind:function(arm,size=0x50) addr:0x020ebde0 func_ov021_020ebdf0 kind:function(arm,size=0x58) addr:0x020ebe30 @@ -422,7 +422,7 @@ func_ov021_020f6614 kind:function(arm,size=0xb0) addr:0x020f6654 func_ov021_020f66c4 kind:function(arm,size=0x12c) addr:0x020f6704 func_ov021_020f67f0 kind:function(arm,size=0x70c) addr:0x020f6830 func_ov021_020f6efc kind:function(arm,size=0x5c) addr:0x020f6f3c -func_ov021_020f6f58 kind:function(arm,size=0x1e4) addr:0x020f6f98 +_ZN18UnkStruct_027e0cf419func_ov021_020f6f58EiiPvii kind:function(arm,size=0x1e4) addr:0x020f6f98 func_ov021_020f713c kind:function(arm,size=0xdc) addr:0x020f717c func_ov021_020f7218 kind:function(arm,size=0x530) addr:0x020f7258 func_ov021_020f7748 kind:function(arm,size=0x24) addr:0x020f7788 diff --git a/config/eur1/arm9/overlays/ov024/symbols.txt b/config/eur1/arm9/overlays/ov024/symbols.txt index 30c4dd87..0271ac67 100644 --- a/config/eur1/arm9/overlays/ov024/symbols.txt +++ b/config/eur1/arm9/overlays/ov024/symbols.txt @@ -109,10 +109,10 @@ _ZN18UnkStruct_027e09987DestroyEv kind:function(arm,size=0x2c) addr:0x020c6f44 _ZN18UnkStruct_027e0998D1Ev kind:function(arm,size=0x14) addr:0x020c6f70 _ZN18UnkStruct_027e0998C1Ev kind:function(arm,size=0x20) addr:0x020c6f84 _ZN18UnkStruct_027e09986CreateEv kind:function(arm,size=0x24) addr:0x020c6fa4 -_ZN18UnkStruct_027e09988vfunc_00EP7VecFx32P5Vec2sPt kind:function(arm,size=0x1e0) addr:0x020c6fc8 +_ZN18UnkStruct_027e09988vfunc_00EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x1e0) addr:0x020c6fc8 _ZN18UnkStruct_027e099819func_ov024_020c716cEv kind:function(arm,size=0xa8) addr:0x020c71a8 -_ZN18UnkStruct_027e099819func_ov024_020c7214EP7VecFx32P5Vec2sPt kind:function(arm,size=0x68) addr:0x020c7250 -_ZN18UnkStruct_027e099819func_ov024_020c727cEP5Vec2sPt kind:function(arm,size=0x84) addr:0x020c72b8 +_ZN18UnkStruct_027e099819func_ov024_020c7214EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x68) addr:0x020c7250 +_ZN18UnkStruct_027e099819func_ov024_020c727cEP5Vec2sP8ActorRef kind:function(arm,size=0x84) addr:0x020c72b8 _ZN18UnkStruct_027e099819func_ov024_020c7300Ei kind:function(arm,size=0x54) addr:0x020c733c _ZN18UnkStruct_027e099819func_ov024_020c7354Ev kind:function(arm,size=0x3c) addr:0x020c7390 _ZN18UnkStruct_027e0cf86CreateEv kind:function(arm,size=0x24) addr:0x020c73cc diff --git a/config/eur1/arm9/overlays/ov026/symbols.txt b/config/eur1/arm9/overlays/ov026/symbols.txt index 96add9b1..c35e020f 100644 --- a/config/eur1/arm9/overlays/ov026/symbols.txt +++ b/config/eur1/arm9/overlays/ov026/symbols.txt @@ -47,7 +47,7 @@ func_ov026_020d9778 kind:function(arm,size=0x10) addr:0x020d9898 func_ov026_020d9788 kind:function(arm,size=0x148) addr:0x020d98a8 func_ov026_020d98d0 kind:function(arm,size=0xe8) addr:0x020d99f0 func_ov026_020d99b8 kind:function(arm,size=0x25c) addr:0x020d9ad8 -func_ov026_020d9c14 kind:function(arm,size=0x460) addr:0x020d9d34 +_ZN18UnkStruct_027e0d3819func_ov026_020d9c14E8ActorRefP7VecFx32S2_ kind:function(arm,size=0x460) addr:0x020d9d34 func_ov026_020da074 kind:function(arm,size=0x114) addr:0x020da194 func_ov026_020da188 kind:function(arm,size=0x114) addr:0x020da2a8 func_ov026_020da29c kind:function(arm,size=0x164) addr:0x020da3bc @@ -102,13 +102,13 @@ _ZN21UnkStruct_027e0ce0_3819func_ov026_020dc8f0Ev kind:function(arm,size=0x28) a _ZN21UnkStruct_027e0ce0_3819func_ov026_020dc918Ev kind:function(arm,size=0x98) addr:0x020dca38 _ZN21UnkStruct_027e0ce0_3819func_ov026_020dc9b0Ev kind:function(arm,size=0x64) addr:0x020dcad0 _ZN24UnkStruct_ov026_02138d1019func_ov026_020dca14Ev kind:function(arm,size=0x1788) addr:0x020dcb34 -func_ov026_020de19c kind:function(arm,size=0x38) addr:0x020de2bc +_ZN21UnkStruct_027e0ce0_3819func_ov026_020de19cEib kind:function(arm,size=0x38) addr:0x020de2bc func_ov026_020de1d4 kind:function(arm,size=0x30) addr:0x020de2f4 func_ov026_020de204 kind:function(arm,size=0x158) addr:0x020de324 func_ov026_020de35c kind:function(arm,size=0x100) addr:0x020de47c -func_ov026_020de45c kind:function(arm,size=0x10) addr:0x020de57c -func_ov026_020de46c kind:function(arm,size=0x30) addr:0x020de58c -func_ov026_020de49c kind:function(arm,size=0x46c) addr:0x020de5bc +_ZN21UnkStruct_027e0ce0_3819func_ov026_020de45cEPv kind:function(arm,size=0x10) addr:0x020de57c +_ZN21UnkStruct_027e0ce0_3819func_ov026_020de46cEv kind:function(arm,size=0x30) addr:0x020de58c +_ZN21UnkStruct_027e0ce0_3819func_ov026_020de49cEv kind:function(arm,size=0x46c) addr:0x020de5bc _ZN21UnkStruct_027e0ce0_3819func_ov026_020de908EP24UnkStruct_027e0ce0_30_00 kind:function(arm,size=0xb4) addr:0x020dea28 _ZN21UnkStruct_027e0ce0_3819func_ov026_020dc9bcEPK24UnkStruct_ov001_020c40f4 kind:function(arm,size=0x1c) addr:0x020deadc func_ov026_020de9d8 kind:function(arm,size=0x84) addr:0x020deaf8 diff --git a/config/eur1/arm9/overlays/ov031/symbols.txt b/config/eur1/arm9/overlays/ov031/symbols.txt index 8e0a93f7..3b0e09b0 100644 --- a/config/eur1/arm9/overlays/ov031/symbols.txt +++ b/config/eur1/arm9/overlays/ov031/symbols.txt @@ -85,7 +85,7 @@ func_ov031_020d99ec kind:function(arm,size=0x10) addr:0x020d9b0c func_ov031_020d99fc kind:function(arm,size=0x20) addr:0x020d9b1c func_ov031_020d9a1c kind:function(arm,size=0x18) addr:0x020d9b3c func_ov031_020d9a34 kind:function(arm,size=0x18) addr:0x020d9b54 -func_ov031_020d9a4c kind:function(arm,size=0x10) addr:0x020d9b6c +_ZN18UnkStruct_027e0d3419func_ov031_020d9a4cEi kind:function(arm,size=0x10) addr:0x020d9b6c func_ov031_020d9a5c kind:function(arm,size=0x1c) addr:0x020d9b7c func_ov031_020d9a78 kind:function(arm,size=0x20) addr:0x020d9b98 func_ov031_020d9a98 kind:function(arm,size=0x10) addr:0x020d9bb8 @@ -138,7 +138,7 @@ func_ov031_020dafe8 kind:function(arm,size=0x40) addr:0x020db108 func_ov031_020db028 kind:function(arm,size=0xd4) addr:0x020db148 _ZN19PlayerLinkActor_13419func_ov031_020db0fcEv kind:function(arm,size=0x24) addr:0x020db21c func_ov031_020db120 kind:function(arm,size=0x40) addr:0x020db240 -func_ov031_020db160 kind:function(arm,size=0x30) addr:0x020db280 +_ZN19PlayerLinkActor_13419func_ov031_020db160Eb kind:function(arm,size=0x30) addr:0x020db280 _ZN18PlayerActorBase_7419func_ov001_020db190Ev kind:function(arm,size=0x24) addr:0x020db2b0 func_ov031_020db1b4 kind:function(arm,size=0xfc) addr:0x020db2d4 _ZN27UnkStruct_ItemManager_20_1019func_ov031_020db2b0Ev kind:function(arm,size=0x2c) addr:0x020db3d0 @@ -149,33 +149,33 @@ 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 -_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_0419func_ov031_020db4f0Ebb kind:function(arm,size=0x38) addr:0x020db610 +_ZN27UnkStruct_ItemManager_20_0419func_ov031_020db528EPv 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 -_ZN27UnkStruct_ItemManager_20_0819func_ov031_020db704Eii kind:function(arm,size=0xbc) addr:0x020db824 +_ZN27UnkStruct_ItemManager_20_0819func_ov031_020db704Ebb 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 _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_020db844Ej 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 -_ZN24UnkStruct_ItemManager_2019func_ov031_020db8f8Ev kind:function(arm,size=0x44) addr:0x020dba18 +_ZN24UnkStruct_ItemManager_2019func_ov031_020db8f8EP24UnkStruct_027e0ce0_30_00 kind:function(arm,size=0x44) addr:0x020dba18 _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 -_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_0C19func_ov031_020db958Ebb kind:function(arm,size=0xe4) addr:0x020dba78 +_ZN27UnkStruct_ItemManager_20_0C19func_ov031_020dba3cEPv 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 -_ZN27UnkStruct_ItemManager_20_0019func_ov031_020dbc80Eii kind:function(arm,size=0xa4) addr:0x020dbda0 +_ZN27UnkStruct_ItemManager_20_0019func_ov031_020dbc80Ebb 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 @@ -211,11 +211,11 @@ func_ov031_020dc8a0 kind:function(arm,size=0x6c) addr:0x020dc9c0 func_ov031_020dc90c kind:function(arm,size=0x114) addr:0x020dca2c _ZN32UnkStruct_027e0ce0_40_Base_7C_04C1Ev kind:function(thumb,size=0xc) addr:0x020dcb40 _ZN32UnkStruct_027e0ce0_40_Base_7C_04D1Ev kind:function(thumb,size=0xe) addr:0x020dcb4c -func_ov031_020dca3c kind:function(arm,size=0x10) addr:0x020dcb5c +_ZN32UnkStruct_027e0ce0_40_Base_7C_0419func_ov031_020dca3cEv kind:function(arm,size=0x10) addr:0x020dcb5c func_ov031_020dca4c kind:function(thumb,size=0x84) addr:0x020dcb6c func_ov031_020dcad0 kind:function(arm,size=0x3c) addr:0x020dcbf0 func_ov031_020dcb0c kind:function(arm,size=0x54) addr:0x020dcc2c -func_ov031_020dcb60 kind:function(arm,size=0xbc) addr:0x020dcc80 +_ZN32UnkStruct_027e0ce0_40_Base_7C_0419func_ov031_020dcb60E15UnkParamStruct1 kind:function(arm,size=0xbc) addr:0x020dcc80 func_ov031_020dcc1c kind:function(arm,size=0xa0) addr:0x020dcd3c func_ov031_020dccbc kind:function(thumb,size=0x32) addr:0x020dcddc _ZN15PlayerLinkActor19func_ov031_020dccf0Ev kind:function(thumb,size=0x30) addr:0x020dce10 @@ -226,7 +226,7 @@ _ZN29UnkStruct_027e0ce0_40_Base_78C1Ev kind:function(thumb,size=0x6) addr:0x020d _ZN29UnkStruct_027e0ce0_40_Base_78D1Ev kind:function(thumb,size=0x2) addr:0x020dceb8 func_ov031_020dcd9c kind:function(arm,size=0x108) addr:0x020dcebc func_ov031_020dcea4 kind:function(arm,size=0x110) addr:0x020dcfc4 -func_ov031_020dcfb4 kind:function(arm,size=0x12c) addr:0x020dd0d4 +_ZN29UnkStruct_027e0ce0_40_Base_7819func_ov031_020dcfb4EPv kind:function(arm,size=0x12c) addr:0x020dd0d4 func_ov031_020dd0e0 kind:function(arm,size=0x44) addr:0x020dd200 func_ov031_020dd124 kind:function(arm,size=0x80) addr:0x020dd244 func_ov031_020dd1a4 kind:function(arm,size=0xd0) addr:0x020dd2c4 @@ -342,7 +342,7 @@ _ZN9ActorBomb19func_ov031_020e20fcEv kind:function(arm,size=0x4) addr:0x020e221c _ZN9ActorBomb19func_ov031_020e2100Ev kind:function(arm,size=0x34) addr:0x020e2220 _ZN9ActorBomb19func_ov031_020e2134Ev kind:function(arm,size=0xec) addr:0x020e2254 _ZN24ActorBomb_ov031_020e2134D1Ev kind:function(arm,size=0x14) addr:0x020e2340 -_ZN9ActorBomb8vfunc_2CEi kind:function(arm,size=0x158) addr:0x020e2354 +_ZN9ActorBomb8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x158) addr:0x020e2354 _ZN9ActorBomb19func_ov031_020e238cEv kind:function(arm,size=0xe0) addr:0x020e24ac _ZN9ActorBomb4GrabE15ActorGrabParams kind:function(arm,size=0x40) addr:0x020e258c _ZN9ActorBomb4DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0x110) addr:0x020e25cc @@ -436,7 +436,7 @@ _ZN18ActorItemBoomerang8vfunc_20Ev kind:function(arm,size=0x614) addr:0x020e4b40 _ZN18ActorItemBoomerang19func_ov031_020e5034Ei kind:function(arm,size=0x1ec) addr:0x020e5154 _ZN18ActorItemBoomerang19func_ov031_020e5220Ev kind:function(arm,size=0x80) addr:0x020e5340 _ZN18ActorItemBoomerang19func_ov031_020e52a0Ev kind:function(arm,size=0xb4) addr:0x020e53c0 -_ZN18ActorItemBoomerang8vfunc_2CEi kind:function(arm,size=0x74) addr:0x020e5474 +_ZN18ActorItemBoomerang8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x74) addr:0x020e5474 _ZN21ActorItemBoomerang_A08vfunc_10EP5Actor kind:function(arm,size=0x1c) addr:0x020e54e8 _ZN21ActorItemBoomerang_CC8vfunc_10EP5Actor kind:function(arm,size=0x1c) addr:0x020e5504 _ZN21ActorItemBoomerang_CC8vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x4c) addr:0x020e5520 @@ -462,7 +462,7 @@ _ZN16ActorItemTornado8SetStateEs kind:function(arm,size=0x118) addr:0x020e5d20 _ZN16ActorItemTornado19func_ov031_020e5d18Ei kind:function(arm,size=0x430) addr:0x020e5e38 _ZN16ActorItemTornado8vfunc_20Ev kind:function(arm,size=0x10) addr:0x020e6268 _ZN16ActorItemTornado8vfunc_24Ev kind:function(arm,size=0x44) addr:0x020e6278 -_ZN16ActorItemTornado8vfunc_2CEi kind:function(arm,size=0x124) addr:0x020e62bc +_ZN16ActorItemTornado8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x124) addr:0x020e62bc _ZN16ActorItemTornado19func_ov031_020e62c0Ev kind:function(arm,size=0x54) addr:0x020e63e0 _ZN16ActorItemTornado19func_ov031_020e6314Et kind:function(arm,size=0x2c) addr:0x020e6434 _ZN16ActorItemTornado19func_ov031_020e6340EP7VecFx32ss kind:function(arm,size=0x58) addr:0x020e6460 @@ -499,7 +499,7 @@ _ZN12ActorUnkSWBM19func_ov031_020e6e84Es kind:function(arm,size=0x74) addr:0x020 _ZN12ActorUnkSWBM8vfunc_20Ev kind:function(arm,size=0x268) addr:0x020e7018 _ZN12ActorUnkSWBM8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x020e7280 _ZN12ActorUnkSWBM19func_ov031_020e718cEP7VecFx32P5Mat3pists kind:function(arm,size=0x108) addr:0x020e72ac -_ZN12ActorUnkSWBM8vfunc_2CEi kind:function(arm,size=0x40) addr:0x020e73b4 +_ZN12ActorUnkSWBM8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x40) addr:0x020e73b4 _ZN15ActorUnkSWBM_94D0Ev kind:function(arm,size=0x1c) addr:0x020e73f4 _ZN15ActorUnkSWBM_98D0Ev kind:function(arm,size=0x1c) addr:0x020e7410 _ZN12ActorUnkSWBMD1Ev kind:function(arm,size=0x28) addr:0x020e742c @@ -550,7 +550,7 @@ _ZN12ActorUnkROCK8vfunc_18Ei kind:function(arm,size=0x30) addr:0x020e8a9c _ZN12ActorUnkROCK8vfunc_20Ev kind:function(arm,size=0x9c) addr:0x020e8acc _ZN12ActorUnkROCK19func_ov031_020e8a48Es kind:function(arm,size=0x84) addr:0x020e8b68 _ZN12ActorUnkROCK19func_ov031_020e8accEv kind:function(arm,size=0x30) addr:0x020e8bec -_ZN12ActorUnkROCK8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x020e8c1c +_ZN12ActorUnkROCK8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0x020e8c1c _ZN12ActorUnkROCK4GrabE15ActorGrabParams kind:function(arm,size=0x68) addr:0x020e8cc0 _ZN12ActorUnkROCK4DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0x44) addr:0x020e8d28 _ZN12ActorUnkROCKD1Ev kind:function(arm,size=0x28) addr:0x020e8d6c @@ -594,7 +594,7 @@ _ZN10ActorRupee8SetStateEs kind:function(arm,size=0x54) addr:0x020e9a24 _ZN10ActorRupee8vfunc_20Ev kind:function(arm,size=0x230) addr:0x020e9a78 _ZN10ActorRupee19func_ov031_020e9b88Ev kind:function(arm,size=0x60) addr:0x020e9ca8 _ZN10ActorRupee19func_ov031_020e9be8Ev kind:function(arm,size=0x44) addr:0x020e9d08 -_ZN10ActorRupee8vfunc_2CEi kind:function(arm,size=0x128) addr:0x020e9d4c +_ZN10ActorRupee8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x128) addr:0x020e9d4c _ZN10ActorRupee19func_ov031_020e9d54Ev kind:function(arm,size=0x40) addr:0x020e9e74 _ZN10ActorRupee19func_ov031_020e9d94Ev kind:function(arm,size=0xc8) addr:0x020e9eb4 _ZN10ActorRupee19func_ov031_020e9e5cEv kind:function(arm,size=0x94) addr:0x020e9f7c @@ -665,7 +665,7 @@ _ZN12ActorUnkZLSL19func_ov031_020ec0d4Ev kind:function(arm,size=0x58) addr:0x020 _ZN12ActorUnkZLSL19func_ov031_020ec12cEv kind:function(arm,size=0x38) addr:0x020ec24c _ZN12ActorUnkZLSL19func_ov031_020ec164Ev kind:function(arm,size=0xc) addr:0x020ec284 _ZN12ActorUnkZLSL19func_ov031_020ec170Ev kind:function(arm,size=0x64) addr:0x020ec290 -_ZN12ActorUnkZLSL8vfunc_2CEi kind:function(arm,size=0xfc) addr:0x020ec2f4 +_ZN12ActorUnkZLSL8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xfc) addr:0x020ec2f4 _ZN12ActorUnkZLSL8vfunc_7CEi kind:function(arm,size=0x100) addr:0x020ec3f0 _ZN12ActorUnkZLSL19func_ov031_020ec3d0Ev kind:function(arm,size=0xcc) addr:0x020ec4f0 _ZN12ActorUnkZLSL19func_ov031_020ec49cEv kind:function(arm,size=0xb0) addr:0x020ec5bc @@ -752,7 +752,7 @@ _ZN10ActorHeart19func_ov031_020ef458Ev kind:function(arm,size=0x50) addr:0x020ef _ZN10ActorHeart19func_ov031_020ef4a8Ev kind:function(arm,size=0x80) addr:0x020ef5c8 _ZN10ActorHeart19func_ov031_020ef528Ev kind:function(arm,size=0x58) addr:0x020ef648 _ZN10ActorHeart19func_ov031_020ef570Ev kind:function(arm,size=0x78) addr:0x020ef6a0 -_ZN10ActorHeart8vfunc_2CEi kind:function(arm,size=0xb0) addr:0x020ef718 +_ZN10ActorHeart8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020ef718 _ZN10ActorHeart19func_ov031_020ef698Ev kind:function(arm,size=0x60) addr:0x020ef7c8 _ZN13ActorHeart_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020ef828 _ZN13ActorHeart_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020ef860 @@ -768,7 +768,7 @@ _ZN19ActorProfileUnkRMTGC1Ev kind:function(arm,size=0x28) addr:0x020ef97c _ZN12ActorUnkRMTGC1Ev kind:function(arm,size=0x2c) addr:0x020ef9a4 _ZN12ActorUnkRMTG8vfunc_18Ei kind:function(arm,size=0xb8) addr:0x020ef9d0 _ZN12ActorUnkRMTG8vfunc_1CEv kind:function(arm,size=0x38) addr:0x020efa88 -_ZN12ActorUnkRMTG8vfunc_2CEi kind:function(arm,size=0x20) addr:0x020efac0 +_ZN12ActorUnkRMTG8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020efac0 _ZN12ActorUnkRMTGD1Ev kind:function(arm,size=0x20) addr:0x020efae0 _ZN12ActorUnkRMTGD0Ev kind:function(arm,size=0x28) addr:0x020efb00 _ZN19ActorProfileUnkRMTGD1Ev kind:function(arm,size=0x14) addr:0x020efb28 @@ -830,7 +830,7 @@ _ZN26ModelRender_ov000_020b198cD1Ev kind:function(arm,size=0x14) addr:0x020f0e20 _ZN8ActorPot8vfunc_18Ei kind:function(arm,size=0x28) addr:0x020f0e34 _ZN8ActorPot8vfunc_5CEs kind:function(arm,size=0x54) addr:0x020f0e5c _ZN8ActorPot8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020f0eb0 -_ZN8ActorPot8vfunc_2CEi kind:function(arm,size=0x30) addr:0x020f0ee8 +_ZN8ActorPot8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x020f0ee8 _ZN8ActorPot19func_ov031_020f0de8Ev kind:function(arm,size=0xc) addr:0x020f0f18 _ZN8ActorPot19func_ov031_020f0df4Ev kind:function(arm,size=0xc) addr:0x020f0f24 _ZN8ActorPot19func_ov031_020f0e00Ev kind:function(arm,size=0xc) addr:0x020f0f30 @@ -854,7 +854,7 @@ _ZN26ModelRender_ov031_0211578cD1Ev kind:function(arm,size=0x14) addr:0x020f11f0 _ZN15ActorItemFlower8vfunc_18Ei kind:function(arm,size=0x28) addr:0x020f1204 _ZN15ActorItemFlower8vfunc_5CEs kind:function(arm,size=0x44) addr:0x020f122c _ZN15ActorItemFlower8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020f1270 -_ZN15ActorItemFlower8vfunc_2CEi kind:function(arm,size=0x30) addr:0x020f12a8 +_ZN15ActorItemFlower8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x020f12a8 _ZN15ActorItemFlower19func_ov031_020f11a8Ev kind:function(arm,size=0xc) addr:0x020f12d8 _ZN15ActorItemFlower19func_ov031_020f11b4Ev kind:function(arm,size=0xc) addr:0x020f12e4 _ZN15ActorItemFlower19func_ov031_020f11c0Ev kind:function(arm,size=0xc) addr:0x020f12f0 @@ -903,7 +903,7 @@ _ZN14ActorShotArrow19func_ov031_020f2270Ev kind:function(arm,size=0x10) addr:0x0 _ZN14ActorShotArrow19func_ov031_020f2280Ev kind:function(arm,size=0x1c) addr:0x020f23b0 _ZN14ActorShotArrow19func_ov031_020f229cEv kind:function(arm,size=0x38) addr:0x020f23cc _ZN14ActorShotArrow19func_ov031_020f22d4EP5Mat3pP7VecFx32 kind:function(arm,size=0x3c) addr:0x020f2404 -_ZN14ActorShotArrow8vfunc_2CEi kind:function(arm,size=0x344) addr:0x020f2440 +_ZN14ActorShotArrow8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x344) addr:0x020f2440 _ZN14ActorShotArrow19func_ov031_020f2654EP5Mat3p kind:function(arm,size=0x140) addr:0x020f2784 _ZN14ActorShotArrow19func_ov031_020f2794Es kind:function(arm,size=0x118) addr:0x020f28c4 _ZN14ActorShotArrow19func_ov031_020f28acEv kind:function(arm,size=0x2e0) addr:0x020f29dc @@ -997,7 +997,7 @@ _ZN19ActorProfileUnkNTTZC1Ev kind:function(arm,size=0x28) addr:0x020f6268 _ZN12ActorUnkNTTZC1Ev kind:function(arm,size=0x30) addr:0x020f6290 _ZN12ActorUnkNTTZ8vfunc_18Ei kind:function(arm,size=0x8) addr:0x020f62c0 _ZN12ActorUnkNTTZ8vfunc_20Ev kind:function(arm,size=0x4) addr:0x020f62c8 -_ZN12ActorUnkNTTZ8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020f62cc +_ZN12ActorUnkNTTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020f62cc _ZN12ActorUnkNTTZ19func_ov031_020f61a0Ev kind:function(arm,size=0x50) addr:0x020f62d0 _ZN12ActorUnkNTTZ19func_ov031_020f61f0Ev kind:function(arm,size=0x50) addr:0x020f6320 _ZN12ActorUnkNTTZD1Ev kind:function(arm,size=0x14) addr:0x020f6370 @@ -1029,7 +1029,7 @@ _ZN12ActorUnkTGTZ19func_ov031_020f6e5cE8ActorRef kind:function(arm,size=0x4c) ad _ZN12ActorUnkTGTZ19func_ov031_020f6ea8EP8ActorReftPK7VecFx32st kind:function(arm,size=0x78) addr:0x020f6fd8 _ZN12ActorUnkTGTZ19func_ov031_020f6f20Ei kind:function(arm,size=0x250) addr:0x020f7050 _ZN12ActorUnkTGTZ8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x138) addr:0x020f72a0 -_ZN12ActorUnkTGTZ8vfunc_2CEi kind:function(arm,size=0xb0) addr:0x020f73d8 +_ZN12ActorUnkTGTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020f73d8 _ZN12ActorUnkTGTZ19func_ov031_020f7358Ev kind:function(arm,size=0x8c) addr:0x020f7488 _ZN12ActorUnkTGTZ19func_ov031_020f73e4Ev kind:function(arm,size=0xc) addr:0x020f7514 _ZN12ActorUnkTGTZ19func_ov031_020f73f0Ev kind:function(arm,size=0xc) addr:0x020f7520 @@ -1042,7 +1042,7 @@ func_ov031_020f7494 kind:function(arm,size=0x40) addr:0x020f75c4 func_ov031_020f74d4 kind:function(arm,size=0x38) addr:0x020f7604 _ZN24UnkStruct_ov031_02114870C2Ev kind:function(arm,size=0x2c) addr:0x020f763c _ZN24UnkStruct_ov031_021148708vfunc_18Ei kind:function(arm,size=0x3c) addr:0x020f7668 -_ZN24UnkStruct_ov031_021148708vfunc_2CEi kind:function(arm,size=0x20) addr:0x020f76a4 +_ZN24UnkStruct_ov031_021148708vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020f76a4 _ZN24UnkStruct_ov031_021148708vfunc_54Ev kind:function(arm,size=0x8) addr:0x020f76c4 func_ov031_020f759c kind:function(arm,size=0x50) addr:0x020f76cc func_ov031_020f75ec kind:function(arm,size=0x8) addr:0x020f771c @@ -1072,7 +1072,7 @@ _ZN19ActorProfileUnkSWCHC1Ev kind:function(arm,size=0x28) addr:0x020f7be4 _ZN12ActorUnkSWCHC1Ev kind:function(arm,size=0x30) addr:0x020f7c0c _ZN12ActorUnkSWCH8vfunc_18Ei kind:function(arm,size=0x14) addr:0x020f7c3c _ZN12ActorUnkSWCH8vfunc_20Ev kind:function(arm,size=0x68) addr:0x020f7c50 -_ZN12ActorUnkSWCH8vfunc_2CEi kind:function(arm,size=0x10) addr:0x020f7cb8 +_ZN12ActorUnkSWCH8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x10) addr:0x020f7cb8 _ZN12ActorUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f7cc8 _ZN12ActorUnkSWCHD0Ev kind:function(arm,size=0x1c) addr:0x020f7cdc _ZN19ActorProfileUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f7cf8 @@ -1120,7 +1120,7 @@ _ZN17ActorRollingStone8vfunc_18Ei kind:function(arm,size=0xf0) addr:0x020f87cc _ZN17ActorRollingStone8vfunc_20Ev kind:function(arm,size=0x98) addr:0x020f88bc _ZN17ActorRollingStone8SetStateEs kind:function(arm,size=0x5c) addr:0x020f8954 _ZN17ActorRollingStone19func_ov031_020f8880Ev kind:function(arm,size=0xc8) addr:0x020f89b0 -_ZN17ActorRollingStone8vfunc_2CEi kind:function(arm,size=0xac) addr:0x020f8a78 +_ZN17ActorRollingStone8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xac) addr:0x020f8a78 _ZN17ActorRollingStone19func_ov031_020f89f4Ev kind:function(arm,size=0x10) addr:0x020f8b24 _ZN17ActorRollingStone19func_ov031_020f8a04Ev kind:function(arm,size=0x28) addr:0x020f8b34 _ZN17ActorRollingStone19func_ov031_020f8a2cEv kind:function(arm,size=0xc) addr:0x020f8b5c @@ -1188,7 +1188,7 @@ _ZN13ActorItemDrop19func_ov031_020fa668Ev kind:function(arm,size=0x10) addr:0x02 _ZN13ActorItemDrop19func_ov031_020fa678Ev kind:function(arm,size=0x50) addr:0x020fa7a8 _ZN13ActorItemDrop19func_ov031_020fa6c8Ev kind:function(arm,size=0x64) addr:0x020fa7f8 _ZN13ActorItemDrop19func_ov031_020fa72cEv kind:function(arm,size=0x110) addr:0x020fa85c -_ZN13ActorItemDrop8vfunc_2CEi kind:function(arm,size=0xc4) addr:0x020fa96c +_ZN13ActorItemDrop8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc4) addr:0x020fa96c _ZN13ActorItemDrop19func_ov031_020fa900Ev kind:function(arm,size=0xf8) addr:0x020faa30 _ZN16ActorItemDrop_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020fab28 _ZN16ActorItemDrop_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020fab60 @@ -1250,7 +1250,7 @@ _ZN12ActorUnkEFSB8vfunc_18Ei kind:function(arm,size=0xb8) addr:0x020fb744 _ZN12ActorUnkEFSB8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020fb7fc _ZN12ActorUnkEFSB8vfunc_24Ev kind:function(arm,size=0x14) addr:0x020fb834 _ZN12ActorUnkEFSB8vfunc_54Ei kind:function(arm,size=0x8) addr:0x020fb848 -_ZN12ActorUnkEFSB8vfunc_2CEi kind:function(arm,size=0x70) addr:0x020fb850 +_ZN12ActorUnkEFSB8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x70) addr:0x020fb850 _ZN12ActorUnkEFSBD1Ev kind:function(arm,size=0x30) addr:0x020fb8c0 _ZN12ActorUnkEFSBD0Ev kind:function(arm,size=0x38) addr:0x020fb8f0 _ZN19ActorProfileUnkEFSBD1Ev kind:function(arm,size=0x14) addr:0x020fb928 @@ -1265,7 +1265,7 @@ _ZN12ActorUnkNFSP19func_ov031_020fb994Ev kind:function(arm,size=0x20) addr:0x020 _ZN12ActorUnkNFSP19func_ov031_020fb9b4Ev kind:function(arm,size=0xac) addr:0x020fbae4 _ZN12ActorUnkNFSP19func_ov031_020fba60Ev kind:function(arm,size=0x8c) addr:0x020fbb90 _ZN12ActorUnkNFSP8vfunc_54Ei kind:function(arm,size=0x9c) addr:0x020fbc1c -_ZN12ActorUnkNFSP8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020fbcb8 +_ZN12ActorUnkNFSP8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020fbcb8 _ZN12ActorUnkNFSP19func_ov031_020fbb8cEv kind:function(arm,size=0x14) addr:0x020fbcbc _ZN12ActorUnkNFSP19func_ov031_020fbba0E8ActorRef kind:function(arm,size=0x40) addr:0x020fbcd0 _ZN12ActorUnkNFSP19func_ov031_020fbbe0Ev kind:function(arm,size=0x24) addr:0x020fbd10 @@ -1289,7 +1289,7 @@ _ZN17MapObjectDoorBase8vfunc_48Ev kind:function(arm,size=0x4) addr:0x020fcc80 _ZN17MapObjectDoorBase8vfunc_64Ev kind:function(arm,size=0xc) addr:0x020fcc84 _ZN17MapObjectDoorBase8vfunc_68Ev kind:function(arm,size=0x10) addr:0x020fcc90 _ZN17MapObjectDoorBase8vfunc_6CEv kind:function(arm,size=0x8) addr:0x020fcca0 -_ZN17MapObjectDoorBase19func_ov031_020fcb78EPcc kind:function(arm,size=0x180) addr:0x020fcca8 +_ZN17MapObjectDoorBase19func_ov031_020fcb78EPc kind:function(arm,size=0x180) addr:0x020fcca8 _ZN17MapObjectDoorBase8vfunc_74Ev kind:function(arm,size=0x4) addr:0x020fce28 _ZN17MapObjectDoorBase8vfunc_78Ev kind:function(arm,size=0x4) addr:0x020fce2c _ZN17MapObjectDoorBase8vfunc_7CEv kind:function(arm,size=0x10) addr:0x020fce30 @@ -1327,8 +1327,8 @@ _ZN24MapObjectDoorDangerSpawn8vfunc_64Ev kind:function(arm,size=0xbc) addr:0x020 _ZN24MapObjectDoorDangerSpawn8vfunc_68Ev kind:function(arm,size=0xac) addr:0x020fddf4 _ZN24MapObjectDoorDangerSpawn8vfunc_6CEv kind:function(arm,size=0x158) addr:0x020fdea0 _ZN24MapObjectDoorDangerSpawn19func_ov031_020fdec8Ev kind:function(arm,size=0xf8) addr:0x020fdff8 -_ZN24MapObjectDoorDangerSpawn8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020fe0f0 -_ZN24MapObjectDoorDangerSpawn8vfunc_14Ev kind:function(arm,size=0x80) addr:0x020fe0fc +_ZN24MapObjectDoorDangerSpawn8vfunc_18EPc kind:function(arm,size=0xc) addr:0x020fe0f0 +_ZN24MapObjectDoorDangerSpawn8vfunc_14Ei kind:function(arm,size=0x80) addr:0x020fe0fc _ZN24MapObjectDoorDangerSpawn9vfunc2_10Ev kind:function(arm,size=0x84) addr:0x020fe17c _ZN24MapObjectDoorDangerSpawn8vfunc_74Ev kind:function(arm,size=0x15c) addr:0x020fe200 _ZN24MapObjectDoorDangerSpawn8vfunc_7CEv kind:function(arm,size=0x24) addr:0x020fe35c @@ -1351,8 +1351,8 @@ _ZN23MapObjectProfileDoorKeyC1Ev kind:function(arm,size=0x54) addr:0x020fe894 _ZN16MapObjectDoorKeyC1Ev kind:function(arm,size=0xb4) addr:0x020fe8e8 _ZN16MapObjectDoorKey8vfunc_00Ev kind:function(arm,size=0x1c) addr:0x020fe99c _ZN16MapObjectDoorKey8vfunc_08Ev kind:function(arm,size=0x18) addr:0x020fe9b8 -_ZN16MapObjectDoorKey8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020fe9d0 -_ZN16MapObjectDoorKey8vfunc_14Ev kind:function(arm,size=0x14c) addr:0x020fe9dc +_ZN16MapObjectDoorKey8vfunc_18EPc kind:function(arm,size=0xc) addr:0x020fe9d0 +_ZN16MapObjectDoorKey8vfunc_14Ei kind:function(arm,size=0x14c) addr:0x020fe9dc _ZN16MapObjectDoorKey8vfunc_5CEsi kind:function(arm,size=0x90) addr:0x020feb28 _ZN16MapObjectDoorKey19func_ov031_020fea88Ev kind:function(arm,size=0x34) addr:0x020febb8 _ZN16MapObjectDoorKey8vfunc_28Eiii kind:function(arm,size=0x90) addr:0x020febec @@ -1378,8 +1378,8 @@ _ZN19MapObjectDoorSwitch8vfunc_00Ev kind:function(arm,size=0xd0) addr:0x020ff0dc _ZN19MapObjectDoorSwitch8vfunc_08Ev kind:function(arm,size=0x84) addr:0x020ff1ac _ZN19MapObjectDoorSwitch8vfunc_64Ev kind:function(arm,size=0x10) addr:0x020ff230 _ZN19MapObjectDoorSwitch8vfunc_6CEv kind:function(arm,size=0x20) addr:0x020ff240 -_ZN19MapObjectDoorSwitch8vfunc_14Ev kind:function(arm,size=0x80) addr:0x020ff260 -_ZN19MapObjectDoorSwitch8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020ff2e0 +_ZN19MapObjectDoorSwitch8vfunc_14Ei kind:function(arm,size=0x80) addr:0x020ff260 +_ZN19MapObjectDoorSwitch8vfunc_18EPc kind:function(arm,size=0xc) addr:0x020ff2e0 _ZN19MapObjectDoorSwitch8vfunc_74Ev kind:function(arm,size=0xcc) addr:0x020ff2ec _ZN19MapObjectDoorSwitch8GetModelEv kind:function(arm,size=0x50) addr:0x020ff3b8 _ZN19MapObjectDoorSwitch8vfunc_50Ev kind:function(arm,size=0x40) addr:0x020ff408 @@ -1400,8 +1400,8 @@ _ZN18MapObjectDoorClickC1Ev kind:function(arm,size=0x88) addr:0x020ff750 _ZN18MapObjectDoorClick9vfunc2_1CEi kind:function(arm,size=0x14) addr:0x020ff7d8 _ZN18MapObjectDoorClick8vfunc_00Ev kind:function(arm,size=0x100) addr:0x020ff7ec _ZN18MapObjectDoorClick8vfunc_08Ev kind:function(arm,size=0x3d0) addr:0x020ff8ec -_ZN18MapObjectDoorClick8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020ffcbc -_ZN18MapObjectDoorClick8vfunc_14Ev kind:function(arm,size=0x14c) addr:0x020ffcc8 +_ZN18MapObjectDoorClick8vfunc_18EPc kind:function(arm,size=0xc) addr:0x020ffcbc +_ZN18MapObjectDoorClick8vfunc_14Ei kind:function(arm,size=0x14c) addr:0x020ffcc8 _ZN18MapObjectDoorClick8vfunc_5CEsi kind:function(arm,size=0xf8) addr:0x020ffe14 _ZN18MapObjectDoorClick9vfunc2_14Ev kind:function(arm,size=0x8) addr:0x020fff0c _ZN18MapObjectDoorClick19func_ov031_020ffde4Ev kind:function(arm,size=0x38) addr:0x020fff14 @@ -1476,7 +1476,7 @@ _ZN14MapObjectGrassC2Ev kind:function(arm,size=0x48) addr:0x02101210 _ZN14MapObjectGrassC1Ev kind:function(arm,size=0x48) addr:0x02101258 _ZN14MapObjectGrass8vfunc_00Ev kind:function(arm,size=0x31c) addr:0x021012a0 _ZN14MapObjectGrass8vfunc_08Ev kind:function(arm,size=0x78) addr:0x021015bc -_ZN14MapObjectGrass8vfunc_14Ev kind:function(arm,size=0x74) addr:0x02101634 +_ZN14MapObjectGrass8vfunc_14Ei kind:function(arm,size=0x74) addr:0x02101634 _ZN14MapObjectGrass8vfunc_38Esi kind:function(arm,size=0x13c) addr:0x021016a8 _ZN14MapObjectGrass19func_ov031_021016b4Ev kind:function(arm,size=0x88) addr:0x021017e4 _ZN14MapObjectGrass8vfunc_3CEP7VecFx32 kind:function(arm,size=0x3c) addr:0x0210186c @@ -1501,7 +1501,7 @@ _ZN16MapObjectUnkSWHT8vfunc_00Ev kind:function(arm,size=0xf0) addr:0x02101e18 _ZN16MapObjectUnkSWHT19func_ov031_02101dd8Ev kind:function(arm,size=0x44) addr:0x02101f08 _ZN16MapObjectUnkSWHT8vfunc_08Ev kind:function(arm,size=0x16c) addr:0x02101f4c _ZN16MapObjectUnkSWHT8vfunc_0CEv kind:function(arm,size=0xc) addr:0x021020b8 -_ZN16MapObjectUnkSWHT8vfunc_14Ev kind:function(arm,size=0x20) addr:0x021020c4 +_ZN16MapObjectUnkSWHT8vfunc_14Ei kind:function(arm,size=0x20) addr:0x021020c4 _ZN16MapObjectUnkSWHT8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x138) addr:0x021020e4 _ZN16MapObjectUnkSWHT19func_ov031_021020ecEv kind:function(arm,size=0xd4) addr:0x0210221c _ZN16MapObjectUnkSWHT19func_ov031_021021c0Esi kind:function(arm,size=0x1f0) addr:0x021022f0 @@ -1517,7 +1517,7 @@ _ZN19MapObjectBombFlower8vfunc_58Ev kind:function(arm,size=0x10) addr:0x02102848 _ZN19MapObjectBombFlower19func_ov031_02102728Ei kind:function(arm,size=0x7c) addr:0x02102858 _ZN19MapObjectBombFlower8vfunc_08Ev kind:function(arm,size=0xf0) addr:0x021028d4 _ZN19MapObjectBombFlower8SetStateEsi kind:function(arm,size=0x15c) addr:0x021029c4 -_ZN19MapObjectBombFlower8vfunc_14Ev kind:function(arm,size=0x50) addr:0x02102b20 +_ZN19MapObjectBombFlower8vfunc_14Ei kind:function(arm,size=0x50) addr:0x02102b20 _ZN19MapObjectBombFlower8vfunc_38Ev kind:function(arm,size=0x98) addr:0x02102b70 _ZN19MapObjectBombFlower8vfunc_28Eiii kind:function(arm,size=0x1c) addr:0x02102c08 _ZN19MapObjectBombFlower8vfunc_50EP8ActorRefP17MapObjectPot_Base kind:function(arm,size=0x70) addr:0x02102c24 @@ -1555,8 +1555,8 @@ _ZN18MapObjectChestBase19func_ov031_021037d0Ev kind:function(arm,size=0x94) addr _ZN18MapObjectChestBase19func_ov031_02103864Ev kind:function(arm,size=0x14) addr:0x02103994 _ZN18MapObjectChestBase19func_ov031_02103878Ev kind:function(arm,size=0x1c) addr:0x021039a8 _ZN18MapObjectChestBase8vfunc_38Eii kind:function(arm,size=0x3b4) addr:0x021039c4 -_ZN18MapObjectChestBase8vfunc_18EPcc kind:function(arm,size=0xe8) addr:0x02103d78 -_ZN18MapObjectChestBase8vfunc_14Ev kind:function(arm,size=0x108) addr:0x02103e60 +_ZN18MapObjectChestBase8vfunc_18EPc kind:function(arm,size=0xe8) addr:0x02103d78 +_ZN18MapObjectChestBase8vfunc_14Ei kind:function(arm,size=0x108) addr:0x02103e60 _ZN18MapObjectChestBase8vfunc_3CEv kind:function(arm,size=0x100) addr:0x02103f68 _ZN18MapObjectChestBase8vfunc_40Ev kind:function(arm,size=0x8) addr:0x02104068 _ZN18MapObjectChestBase8vfunc_44Ev kind:function(arm,size=0x8) addr:0x02104070 @@ -1628,7 +1628,7 @@ _ZN12MapObjectPotC1Ev kind:function(arm,size=0x9c) addr:0x0210511c _ZN12MapObjectPot8vfunc_04Ev kind:function(arm,size=0x2c) addr:0x021051b8 _ZN12MapObjectPot8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x120) addr:0x021051e4 _ZN12MapObjectPot8vfunc_48Ev kind:function(arm,size=0xf8) addr:0x02105304 -_ZN12MapObjectPot8vfunc_14Ev kind:function(arm,size=0x44) addr:0x021053fc +_ZN12MapObjectPot8vfunc_14Ei kind:function(arm,size=0x44) addr:0x021053fc _ZN12MapObjectPot8vfunc_54Ev kind:function(arm,size=0x38) addr:0x02105440 _ZN12MapObjectPot8vfunc_24EP9MapObject7VecFx32 kind:function(arm,size=0x6c) addr:0x02105478 _ZN12MapObjectPot8vfunc_3CEv kind:function(arm,size=0x48) addr:0x021054e4 @@ -1674,7 +1674,7 @@ _ZN16MapObjectUnkSKDI19func_ov031_0210643cEi kind:function(arm,size=0x23c) addr: _ZN16MapObjectUnkSKDI19func_ov031_02106678Esi kind:function(arm,size=0x3f8) addr:0x021067a8 _ZN16MapObjectUnkSKDI19func_ov031_02106a70Ev kind:function(arm,size=0x14) addr:0x02106ba0 _ZN16MapObjectUnkSKDI8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x1f4) addr:0x02106bb4 -_ZN16MapObjectUnkSKDI8vfunc_14Ev kind:function(arm,size=0x20) addr:0x02106da8 +_ZN16MapObjectUnkSKDI8vfunc_14Ei kind:function(arm,size=0x20) addr:0x02106da8 _ZN16MapObjectUnkSKDI8vfunc_38Ev kind:function(arm,size=0x8) addr:0x02106dc8 _ZN16MapObjectUnkSKDI8vfunc_3CEv kind:function(arm,size=0x8) addr:0x02106dd0 _ZN16MapObjectUnkSKDI8vfunc_40Ev kind:function(arm,size=0x8) addr:0x02106dd8 diff --git a/config/eur1/arm9/overlays/ov032/symbols.txt b/config/eur1/arm9/overlays/ov032/symbols.txt index d8ebf5aa..9781c9e3 100644 --- a/config/eur1/arm9/overlays/ov032/symbols.txt +++ b/config/eur1/arm9/overlays/ov032/symbols.txt @@ -11,7 +11,7 @@ _ZN11ActorSpinut8vfunc_1CEv kind:function(arm,size=0x84) addr:0x02119598 _ZN11ActorSpinut19func_ov032_021194dcEs kind:function(arm,size=0x60) addr:0x0211961c _ZN11ActorSpinut8SetStateEs kind:function(arm,size=0x48) addr:0x0211967c _ZN11ActorSpinut8vfunc_20Ev kind:function(arm,size=0x358) addr:0x021196c4 -_ZN11ActorSpinut8vfunc_2CEi kind:function(arm,size=0xb4) addr:0x02119a1c +_ZN11ActorSpinut8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb4) addr:0x02119a1c _ZN11ActorSpinut19func_ov032_02119990Ev kind:function(arm,size=0x7c) addr:0x02119ad0 _ZN11ActorSpinut19func_ov032_02119a0cEv kind:function(arm,size=0x1dc) addr:0x02119b4c _ZN11ActorSpinut19func_ov032_02119be8Ev kind:function(arm,size=0x98) addr:0x02119d28 @@ -43,7 +43,7 @@ _ZN11ActorSpinut19func_ov032_0211b17cEv kind:function(arm,size=0x14) addr:0x0211 _ZN11ActorSpinut19func_ov032_0211b190Eii kind:function(arm,size=0x50) addr:0x0211b2d0 _ZN11ActorSpinut19func_ov032_0211b1e0Ev kind:function(arm,size=0xb8) addr:0x0211b320 _ZN11ActorSpinut19func_ov032_0211b298Ev kind:function(arm,size=0xe4) addr:0x0211b3d8 -_ZN11ActorSpinut19func_ov032_0211b37cEPS_t kind:function(arm,size=0x34) addr:0x0211b4bc +_ZN11ActorSpinut19func_ov032_0211b37cEP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x34) addr:0x0211b4bc _ZN11ActorSpinut19func_ov032_0211b3b0Ev kind:function(arm,size=0x58) addr:0x0211b4f0 _ZN11ActorSpinut8vfunc_54Ei kind:function(arm,size=0x168) addr:0x0211b548 _ZN15ActorSpinut_268C1Ev kind:function(arm,size=0x30) addr:0x0211b6b0 @@ -68,7 +68,7 @@ _ZN18ActorFleeingSpinut8vfunc_18Ei kind:function(arm,size=0x1c) addr:0x0211bac8 _ZN18ActorFleeingSpinut8SetStateEs kind:function(arm,size=0x68) addr:0x0211bae4 _ZN18ActorFleeingSpinut8vfunc_20Ev kind:function(arm,size=0x268) addr:0x0211bb4c _ZN18ActorFleeingSpinut8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x104) addr:0x0211bdb4 -_ZN18ActorFleeingSpinut8vfunc_2CEi kind:function(arm,size=0x8c) addr:0x0211beb8 +_ZN18ActorFleeingSpinut8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x8c) addr:0x0211beb8 _ZN18ActorFleeingSpinut19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211bf44 _ZN18ActorFleeingSpinut19func_ov032_0211be30Ev kind:function(arm,size=0x78) addr:0x0211bf70 _ZN18ActorFleeingSpinut19func_ov032_0211bea8Ev kind:function(arm,size=0xdc) addr:0x0211bfe8 @@ -133,7 +133,7 @@ _ZN10ActorKeese19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x0211e _ZN10ActorKeese8SetStateEs kind:function(arm,size=0x48) addr:0x0211e560 _ZN10ActorKeese19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x0211e5a8 _ZN10ActorKeese8vfunc_20Ev kind:function(arm,size=0x1b8) addr:0x0211e8b8 -_ZN10ActorKeese8vfunc_2CEi kind:function(arm,size=0xbc) addr:0x0211ea70 +_ZN10ActorKeese8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xbc) addr:0x0211ea70 _ZN10ActorKeese19func_ov032_0211e9ecEv kind:function(arm,size=0x174) addr:0x0211eb2c _ZN10ActorKeese19func_ov032_0211eb60Ev kind:function(arm,size=0x188) addr:0x0211eca0 _ZN10ActorKeese19func_ov032_0211ece8Ev kind:function(arm,size=0x174) addr:0x0211ee28 @@ -210,7 +210,7 @@ _ZN16MapObjectUnkSWSW8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x278) _ZN16MapObjectUnkSWSW8vfunc_38Ev kind:function(arm,size=0x48) addr:0x02121d04 _ZN16MapObjectUnkSWSW19func_ov032_02121b90Ev kind:function(arm,size=0x88) addr:0x02121d4c _ZN16MapObjectUnkSWSW8vfunc_3CEi kind:function(arm,size=0x158) addr:0x02121dd4 -_ZN16MapObjectUnkSWSW8vfunc_14Ev kind:function(arm,size=0x58) addr:0x02121f2c +_ZN16MapObjectUnkSWSW8vfunc_14Ei kind:function(arm,size=0x58) addr:0x02121f2c _ZN16MapObjectUnkSWSW19func_ov032_02121dc8EP7VecFx32 kind:function(arm,size=0x90) addr:0x02121f84 _ZN19MapObjectUnkSWSW_40D0Ev kind:function(arm,size=0x1c) addr:0x02122014 _ZN16MapObjectUnkSWSWD1Ev kind:function(arm,size=0x20) addr:0x02122030 diff --git a/config/eur1/arm9/overlays/ov063/symbols.txt b/config/eur1/arm9/overlays/ov063/symbols.txt index 1b172933..3d807a5e 100644 --- a/config/eur1/arm9/overlays/ov063/symbols.txt +++ b/config/eur1/arm9/overlays/ov063/symbols.txt @@ -14,7 +14,7 @@ _ZN12ActorUnkCANS19func_ov063_02158448Ei kind:function(arm,size=0x48) addr:0x021 _ZN12ActorUnkCANS19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x021585b0 _ZN12ActorUnkCANS8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x021585e4 _ZN12ActorUnkCANS8vfunc_20Ev kind:function(arm,size=0x53c) addr:0x02158610 -_ZN12ActorUnkCANS8vfunc_2CEi kind:function(arm,size=0xe0) addr:0x02158b4c +_ZN12ActorUnkCANS8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xe0) addr:0x02158b4c _ZN12ActorUnkCANS19func_ov063_02158b0cEv kind:function(arm,size=0x28) addr:0x02158c2c _ZN12ActorUnkCANS19func_ov063_02158b34Ev kind:function(arm,size=0x64) addr:0x02158c54 _ZN12ActorUnkCANS19func_ov063_02158b98Ev kind:function(arm,size=0x1a8) addr:0x02158cb8 @@ -92,7 +92,7 @@ _ZN12ActorUnkCASE19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x021 _ZN12ActorUnkCASE19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215b3e4 _ZN12ActorUnkCASE8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215b3e8 _ZN12ActorUnkCASE8vfunc_20Ev kind:function(arm,size=0x338) addr:0x0215b40c -_ZN12ActorUnkCASE8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x0215b744 +_ZN12ActorUnkCASE8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0x0215b744 _ZN12ActorUnkCASE19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215b7e8 _ZN12ActorUnkCASE19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215b844 _ZN12ActorUnkCASE8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215b8ec @@ -110,7 +110,7 @@ _ZN15ActorUnkRMSBase8vfunc_18Ei kind:function(arm,size=0x54) addr:0x0215bc54 _ZN15ActorUnkRMSBase8vfunc_1CEv kind:function(arm,size=0x4) addr:0x0215bca8 _ZN15ActorUnkRMSBase8vfunc_20Ev kind:function(arm,size=0x4) addr:0x0215bcac _ZN15ActorUnkRMSBase8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215bcb0 -_ZN15ActorUnkRMSBase8vfunc_2CEi kind:function(arm,size=0x30) addr:0x0215bcc4 +_ZN15ActorUnkRMSBase8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x0215bcc4 _ZN15ActorUnkRMSBaseD1Ev kind:function(arm,size=0x28) addr:0x0215bcf4 _ZN15ActorUnkRMSBaseD0Ev kind:function(arm,size=0x30) addr:0x0215bd1c _ZN19ActorProfileUnkRMSV10GetProfileEv kind:function(arm,size=0xc) addr:0x0215bd4c @@ -255,7 +255,7 @@ _ZN24UnkStruct_ov063_02163784D1Ev kind:function(arm,size=0x14) addr:0x0215f4f4 _ZN12ActorUnkRBLS8vfunc_18Ei kind:function(arm,size=0x8c) addr:0x0215f508 _ZN12ActorUnkRBLS8vfunc_20Ev kind:function(arm,size=0x14) addr:0x0215f594 _ZN12ActorUnkRBLS8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215f5a8 -_ZN12ActorUnkRBLS8vfunc_2CEi kind:function(arm,size=0x20) addr:0x0215f5bc +_ZN12ActorUnkRBLS8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x0215f5bc _ZN24UnkStruct_ov063_02163784D0Ev kind:function(arm,size=0x1c) addr:0x0215f5dc _ZN12ActorUnkRBLSD1Ev kind:function(arm,size=0x28) addr:0x0215f5f8 _ZN12ActorUnkRBLSD0Ev kind:function(arm,size=0x30) addr:0x0215f620 @@ -269,7 +269,7 @@ _ZN16MapObjectUnkSTAT8vfunc_08Ev kind:function(arm,size=0x88) addr:0x0215f830 _ZN16MapObjectUnkSTAT8vfunc_0CEv kind:function(arm,size=0x14) addr:0x0215f8b8 _ZN16MapObjectUnkSTAT19func_ov063_0215f7acEv kind:function(arm,size=0x494) addr:0x0215f8cc _ZN16MapObjectUnkSTAT19func_ov063_0215fc40Ei kind:function(arm,size=0x48) addr:0x0215fd60 -_ZN16MapObjectUnkSTAT8vfunc_14Ev kind:function(arm,size=0x58) addr:0x0215fda8 +_ZN16MapObjectUnkSTAT8vfunc_14Ei kind:function(arm,size=0x58) addr:0x0215fda8 _ZN16MapObjectUnkSTAT19func_ov063_0215fce0Ev kind:function(arm,size=0x58) addr:0x0215fe00 _ZN16MapObjectUnkSTATD1Ev kind:function(arm,size=0x20) addr:0x0215fe58 _ZN16MapObjectUnkSTATD0Ev kind:function(arm,size=0x28) addr:0x0215fe78 @@ -314,7 +314,7 @@ _ZN16MapObjectUnkLTRW8vfunc_08Ev kind:function(arm,size=0x1c) addr:0x02160e2c _ZN16MapObjectUnkLTRW8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x34) addr:0x02160e48 _ZN16MapObjectUnkLTRW19func_ov063_02160d18Ei kind:function(arm,size=0x1c) addr:0x02160e7c _ZN16MapObjectUnkLTRW8vfunc_28Eiii kind:function(arm,size=0xc4) addr:0x02160e98 -_ZN16MapObjectUnkLTRW8vfunc_14Ev kind:function(arm,size=0x20) addr:0x02160f5c +_ZN16MapObjectUnkLTRW8vfunc_14Ei kind:function(arm,size=0x20) addr:0x02160f5c _ZN24UnkStruct_ov063_021639e49vfunc2_04Ev kind:function(arm,size=0x24) addr:0x02160f7c _ZN16MapObjectUnkLTRWD1Ev kind:function(arm,size=0x20) addr:0x02160fa0 _ZN16MapObjectUnkLTRWD0Ev kind:function(arm,size=0x28) addr:0x02160fc0 diff --git a/config/eur1/arm9/overlays/ov071/symbols.txt b/config/eur1/arm9/overlays/ov071/symbols.txt index 4ac0c319..a0fd099d 100644 --- a/config/eur1/arm9/overlays/ov071/symbols.txt +++ b/config/eur1/arm9/overlays/ov071/symbols.txt @@ -269,7 +269,7 @@ _ZN18UnkStruct_027e0d7019func_ov071_0215e9acEv kind:function(arm,size=0x68) addr func_ov071_0215ea14 kind:function(arm,size=0x7c) addr:0x0215eb94 _ZN18UnkStruct_027e0d70D1Ev kind:function(arm,size=0x38) addr:0x0215ec10 _ZN18UnkStruct_027e0d7019func_ov071_0215eac8Ev kind:function(arm,size=0x50) addr:0x0215ec48 -func_ov071_0215eb18 kind:function(arm,size=0xc) addr:0x0215ec98 +_ZN18UnkStruct_027e0d7019func_ov071_0215eb18Ev kind:function(arm,size=0xc) addr:0x0215ec98 func_ov071_0215eb24 kind:function(arm,size=0x27c) addr:0x0215eca4 func_ov071_0215eda0 kind:function(arm,size=0x50) addr:0x0215ef20 func_ov071_0215edf0 kind:function(arm,size=0x50) addr:0x0215ef70 @@ -299,7 +299,7 @@ _ZN14ActorTearLight8vfunc_18Ei kind:function(arm,size=0xac) addr:0x0215f6b0 _ZN14ActorTearLight8vfunc_1CEv kind:function(arm,size=0x2c) addr:0x0215f75c _ZN14ActorTearLight8vfunc_20Ev kind:function(arm,size=0x4c) addr:0x0215f788 _ZN14ActorTearLight8vfunc_24Ev kind:function(arm,size=0xc0) addr:0x0215f7d4 -_ZN14ActorTearLight8vfunc_2CEi kind:function(arm,size=0xc8) addr:0x0215f894 +_ZN14ActorTearLight8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc8) addr:0x0215f894 _ZN14ActorTearLight8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x18) addr:0x0215f95c _ZN14ActorTearLight19func_ov071_0215f7f4Es kind:function(arm,size=0x18) addr:0x0215f974 _ZN14ActorTearLight19func_ov071_0215f80cEv kind:function(arm,size=0x18) addr:0x0215f98c diff --git a/config/eur1/arm9/overlays/ov088/symbols.txt b/config/eur1/arm9/overlays/ov088/symbols.txt index 8330311e..0903d249 100644 --- a/config/eur1/arm9/overlays/ov088/symbols.txt +++ b/config/eur1/arm9/overlays/ov088/symbols.txt @@ -325,9 +325,9 @@ func_ov088_0216f874 kind:function(arm,size=0x2c) addr:0x0216f9f4 _ZN21UnkStruct_027e0ce0_3CC1Ev kind:function(thumb,size=0x298) addr:0x0216fa20 _ZN21UnkStruct_027e0ce0_3CD1Ev kind:function(thumb,size=0x8c) addr:0x0216fcb8 _ZN21UnkStruct_027e0ce0_3C19func_ov088_0216fbc4EiPK24UnkStruct_ov001_020c40f4 kind:function(thumb,size=0x2c) addr:0x0216fd44 -func_ov088_0216fbf0 kind:function(arm,size=0xb0) addr:0x0216fd70 -func_ov088_0216fca0 kind:function(arm,size=0x270) addr:0x0216fe20 -func_ov088_0216ff10 kind:function(arm,size=0x4) addr:0x02170090 +_ZN21UnkStruct_027e0ce0_3C19func_ov088_0216fbf0Ei kind:function(arm,size=0xb0) addr:0x0216fd70 +_ZN21UnkStruct_027e0ce0_3C19func_ov088_0216fca0Ev kind:function(arm,size=0x270) addr:0x0216fe20 +_ZN21UnkStruct_027e0ce0_3C19func_ov088_0216ff10Ev kind:function(arm,size=0x4) addr:0x02170090 func_ov088_0216ff14 kind:function(arm,size=0x10) addr:0x02170094 func_ov088_0216ff24 kind:function(arm,size=0xa8) addr:0x021700a4 func_ov088_0216ffcc kind:function(arm,size=0x4) addr:0x0217014c diff --git a/config/eur1/arm9/overlays/ov092/symbols.txt b/config/eur1/arm9/overlays/ov092/symbols.txt index b2324b2e..f5fb7c31 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 -_ZN25UnkStruct_027e0ce0_40_14C19func_ov092_021689e8EiP21UnkStruct_027e0ce0_40P15PlayerLinkActorP25UnkStruct_027e0ce0_40_328 kind:function(arm,size=0xac) addr:0x02168b68 +_ZN25UnkStruct_027e0ce0_40_14C19func_ov092_021689e8EbP21UnkStruct_027e0ce0_40P15PlayerLinkActorP15PlayerActorBase 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/symbols.txt b/config/eur1/arm9/overlays/ov093/symbols.txt index 13bfd9fd..65040742 100644 --- a/config/eur1/arm9/overlays/ov093/symbols.txt +++ b/config/eur1/arm9/overlays/ov093/symbols.txt @@ -82,11 +82,11 @@ func_ov093_02167dfc kind:function(arm,size=0x44) addr:0x02167f7c func_ov093_02167e40 kind:function(arm,size=0x15c) addr:0x02167fc0 func_ov093_02167f9c kind:function(arm,size=0x68) addr:0x0216811c _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 +_ZN21UnkStruct_027e0ce0_4019func_ov093_02168020Ei kind:function(arm,size=0xdc) addr:0x021681a0 +_ZN21UnkStruct_027e0ce0_4019func_ov093_021680fcEi kind:function(arm,size=0xa8) addr:0x0216827c func_ov093_021681a4 kind:function(arm,size=0x7c) addr:0x02168324 _ZN21UnkStruct_027e0ce0_4019func_ov093_02168220Ev kind:function(arm,size=0x38) addr:0x021683a0 -func_ov093_02168258 kind:function(arm,size=0xb4) addr:0x021683d8 +_ZN21UnkStruct_027e0ce0_4019func_ov093_02168258Ev 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 func_ov093_02168484 kind:function(arm,size=0xd0) addr:0x02168604 @@ -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 -_ZN25UnkStruct_027e0ce0_40_14C19func_ov093_02168e24Ei kind:function(arm,size=0x6c) addr:0x02168fa4 +_ZN25UnkStruct_027e0ce0_40_14C19func_ov093_02168e24EPv 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 @@ -156,30 +156,30 @@ _ZN20ModelRender_Derived5C1EiP10G3d_Model_P18G3d_BoneMtxStruct_ kind:function(th func_ov093_0216c8fc kind:function(thumb,size=0x44) addr:0x0216ca7c func_ov093_0216c940 kind:function(thumb,size=0x50) addr:0x0216cac0 func_ov093_0216c990 kind:function(arm,size=0xa8) addr:0x0216cb10 -func_ov093_0216ca38 kind:function(arm,size=0x270) addr:0x0216cbb8 +_ZN20ModelRender_Derived419func_ov093_0216ca38Ebbbb kind:function(arm,size=0x270) addr:0x0216cbb8 _ZN19func_ov093_0216cca8D1Ev kind:function(arm,size=0x14) addr:0x0216ce28 _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 _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 -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d160Ev kind:function(thumb,size=0x6c) addr:0x0216d2e0 -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d1ccEiPK24UnkStruct_ov001_020c40f4bb kind:function(thumb,size=0x1cc) addr:0x0216d34c +_ZN16PlayerZeldaActorC1EPvP21UnkStruct_027e0ce0_40P25UnkStruct_027e0ce0_40_150Pj kind:function(thumb,size=0x1bc) addr:0x0216cfe0 +_ZN16PlayerZeldaActorD1Ev kind:function(thumb,size=0xb6) addr:0x0216d19c +_ZN15PlayerActorBase19func_ov093_0216d0d4Ev kind:function(thumb,size=0x8c) addr:0x0216d254 +_ZN15PlayerActorBase19func_ov093_0216d160Ev kind:function(thumb,size=0x6c) addr:0x0216d2e0 +_ZN15PlayerActorBase19func_ov093_0216d1ccEiPK24UnkStruct_ov001_020c40f4bb kind:function(thumb,size=0x1cc) addr:0x0216d34c func_ov093_0216d398 kind:function(arm,size=0x64) addr:0x0216d518 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 -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d5b8Ei kind:function(arm,size=0x830) addr:0x0216d738 +_ZN15PlayerActorBase19func_ov093_0216d5b8Eb kind:function(arm,size=0x830) addr:0x0216d738 func_ov093_0216dde8 kind:function(arm,size=0x48) addr:0x0216df68 -_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 +_ZN15PlayerActorBase19func_ov093_0216de30Eii kind:function(arm,size=0x98) addr:0x0216dfb0 +_ZN15PlayerActorBase19func_ov093_0216dec8EPv 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 -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216e1a4Ei kind:function(arm,size=0xfc) addr:0x0216e324 +_ZN15PlayerActorBase19func_ov093_0216e1a4EPv 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 -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216f71cEPi kind:function(thumb,size=0x50) addr:0x0216f89c +_ZN15PlayerActorBase19func_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/ov102/symbols.txt b/config/eur1/arm9/overlays/ov102/symbols.txt index 504082b8..c6fa443f 100644 --- a/config/eur1/arm9/overlays/ov102/symbols.txt +++ b/config/eur1/arm9/overlays/ov102/symbols.txt @@ -1,26 +1,26 @@ _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 +_ZN25UnkStruct_027e0ce0_40_10819func_ov102_02182e54EiP7VecFx32i kind:function(arm,size=0x154) addr:0x02183054 +_ZN24UnkStruct_ItemManager_2019func_ov102_02182fa8Ebb kind:function(arm,size=0x54) addr:0x021831a8 +_ZN24UnkStruct_ItemManager_2019func_ov102_02182ffcEPv kind:function(arm,size=0x40) addr:0x021831fc +_ZN21UnkStruct_027e0ce0_4019func_ov102_0218303cEbP11ItemManager 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 +_ZN21UnkStruct_027e0ce0_4019func_ov102_021831b4EPv kind:function(arm,size=0x3c) addr:0x021833b4 +_ZN21UnkStruct_027e0ce0_4019func_ov102_021831f0EPv 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 +_ZN16MapObjectUnkSAND8vfunc_14Ei 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 +_ZN16MapObjectUnkPTFL8vfunc_14Ei 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 diff --git a/config/eur1/arm9/symbols.txt b/config/eur1/arm9/symbols.txt index 59923b60..22f8263d 100644 --- a/config/eur1/arm9/symbols.txt +++ b/config/eur1/arm9/symbols.txt @@ -657,7 +657,7 @@ _ZN4Game20TrySetCreateCallbackEPFP12GameModeBasevE kind:function(arm,size=0x18) func_0201373c kind:function(arm,size=0x18) addr:0x0201373c func_02013754 kind:function(arm,size=0x14) addr:0x02013754 _ZN18UnkStruct_02049b1813func_02013768Ev kind:function(arm,size=0x60) addr:0x02013768 -func_020137c8 kind:function(arm,size=0x1c) addr:0x020137c8 +_ZN18UnkStruct_02049b1813func_020137c8Ei kind:function(arm,size=0x1c) addr:0x020137c8 func_020137e4 kind:function(arm,size=0x5c) addr:0x020137e4 _ZN18UnkStruct_02049b1813func_02013840Eti kind:function(arm,size=0xb4) addr:0x02013840 _ZN18UnkStruct_02049b1813func_020138f4Ei kind:function(arm,size=0x140) addr:0x020138f4 @@ -669,21 +669,21 @@ _ZN5Input13func_02013b24Ei kind:function(arm,size=0x64) addr:0x02013b24 func_02013b88 kind:function(arm,size=0x10) addr:0x02013b88 func_02013b98 kind:function(arm,size=0x24) addr:0x02013b98 _ZN5Input13func_02013bbcEv kind:function(arm,size=0x4c) addr:0x02013bbc -_ZN5Input13func_02013c08Et kind:function(arm,size=0x1c) addr:0x02013c08 +_ZN5Input13func_02013c08Ej kind:function(arm,size=0x1c) addr:0x02013c08 func_02013c24 kind:function(arm,size=0x58) addr:0x02013c24 func_02013c7c kind:function(arm,size=0x58) addr:0x02013c7c -func_02013cd4 kind:function(arm,size=0x5c) addr:0x02013cd4 -_ZN13func_02013d30D0Ev kind:function(arm,size=0x64) addr:0x02013d30 -func_02013d94 kind:function(arm,size=0x5c) addr:0x02013d94 +_ZN29UnkStruct_ov017_020c3f70_BaseD1Ev kind:function(arm,size=0x5c) addr:0x02013cd4 +_ZN29UnkStruct_ov017_020c3f70_BaseD0Ev kind:function(arm,size=0x64) addr:0x02013d30 +_ZN29UnkStruct_ov017_020c3f70_BaseD2Ev kind:function(arm,size=0x5c) addr:0x02013d94 func_02013df0 kind:function(arm,size=0x28) addr:0x02013df0 _ZN21UnkStruct_02049a2c_1C13func_02013e18EPvi kind:function(arm,size=0x1c) addr:0x02013e18 -func_02013e34 kind:function(arm,size=0x10) addr:0x02013e34 +_ZN24UnkStruct_ov017_020c3f708vfunc_08Ev kind:function(arm,size=0x10) addr:0x02013e34 func_02013e44 kind:function(arm,size=0x3c) addr:0x02013e44 func_02013e80 kind:function(arm,size=0x4c) addr:0x02013e80 _ZN18UnkStruct_02049b8013func_02013eccEiPFvtEi kind:function(arm,size=0x1c) addr:0x02013ecc _ZN18UnkStruct_02049b8013func_02013ee8Eii kind:function(arm,size=0x98) addr:0x02013ee8 _ZN18UnkStruct_02049b8013func_02013f80Ei kind:function(arm,size=0x6c) addr:0x02013f80 -func_02013fec kind:function(arm,size=0xc) addr:0x02013fec +_ZN18UnkStruct_02049b8013func_02013fecEiPv kind:function(arm,size=0xc) addr:0x02013fec func_02013ff8 kind:function(arm,size=0x12c) addr:0x02013ff8 _ZN12TouchControl11UpdateStateEP10TouchStatePK6TPData kind:function(arm,size=0xb8) addr:0x02014124 _ZN12TouchControl4InitEv kind:function(thumb,size=0x3c) addr:0x020141dc @@ -698,7 +698,7 @@ func_020144a0 kind:function(thumb,size=0x10) addr:0x020144a0 func_020144b0 kind:function(thumb,size=0x1c) addr:0x020144b0 _ZN21UnkStruct_02011e10_2C13func_020144ccEiii kind:function(thumb,size=0x6c) addr:0x020144cc _ZN21UnkStruct_02011e10_2C13func_02014538Ev kind:function(thumb,size=0x34) addr:0x02014538 -func_0201456c kind:function(arm,size=0x44) addr:0x0201456c +_ZN18UnkStruct_020499e013func_0201456cEi kind:function(arm,size=0x44) addr:0x0201456c func_020145b0 kind:function(arm,size=0x80) addr:0x020145b0 func_02014630 kind:function(arm,size=0x58) addr:0x02014630 func_02014688 kind:function(arm,size=0x7c) addr:0x02014688 @@ -968,7 +968,7 @@ _ZN18UnkStruct_0204a11013func_02018d78Ei kind:function(arm,size=0x174) addr:0x02 func_02018eec kind:function(arm,size=0xac) addr:0x02018eec func_02018f98 kind:function(arm,size=0x368) addr:0x02018f98 _ZN18UnkStruct_0204a11013func_02019300Ei kind:function(arm,size=0x40) addr:0x02019300 -func_02019340 kind:function(arm,size=0x10) addr:0x02019340 +_ZN18UnkStruct_0204a11013func_02019340Ei kind:function(arm,size=0x10) addr:0x02019340 _ZN18UnkStruct_0204a11013func_02019350Ev kind:function(arm,size=0xb8) addr:0x02019350 _ZN18UnkStruct_0204a11013func_02019408Ev kind:function(arm,size=0x4c) addr:0x02019408 _ZN18UnkStruct_0204a11013func_02019454Ev kind:function(arm,size=0x88) addr:0x02019454 diff --git a/config/jp/arm9/itcm/symbols.txt b/config/jp/arm9/itcm/symbols.txt index b5374378..2ec269eb 100644 --- a/config/jp/arm9/itcm/symbols.txt +++ b/config/jp/arm9/itcm/symbols.txt @@ -43,8 +43,8 @@ func_01ff9b1c kind:function(arm,size=0x14) addr:0x01ff9b1c func_01ff9b30 kind:function(arm,size=0x10) addr:0x01ff9b30 func_01ff9b40 kind:function(arm,size=0x10) addr:0x01ff9b40 _ZN18UnkStruct_0204a11013func_01ff9b50Ev kind:function(arm,size=0x14) addr:0x01ff9b50 -func_01ff9b64 kind:function(arm,size=0x14) addr:0x01ff9b64 -func_01ff9b78 kind:function(arm,size=0x18) addr:0x01ff9b78 +_ZN18UnkStruct_0204a11013func_01ff9b64Ev kind:function(arm,size=0x14) addr:0x01ff9b64 +_ZN18UnkStruct_0204a11013func_01ff9b78Ev kind:function(arm,size=0x18) addr:0x01ff9b78 func_01ff9b90 kind:function(arm,size=0x324) addr:0x01ff9b90 func_01ff9eb4 kind:function(arm,size=0x8) addr:0x01ff9eb4 func_01ff9ebc kind:function(arm,size=0x8) addr:0x01ff9ebc @@ -157,10 +157,10 @@ _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 -_ZN21UnkStruct_027e09bc_0C13func_01ffd43cEP5Vec2sii kind:function(arm,size=0x60) addr:0x01ffd43c +_ZN21UnkStruct_027e09bc_0C13func_01ffd43cEP5Vec2sP7VecFx32i 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 +_ZN21UnkStruct_027e09bc_0C13func_01ffd768EPvP5Vec2sc kind:function(arm,size=0x138) addr:0x01ffd768 func_01ffd8a0 kind:function(arm,size=0x190) addr:0x01ffd8a0 func_01ffda30 kind:function(arm,size=0x2ec) addr:0x01ffda30 func_01ffdd1c kind:function(arm,size=0x14c) addr:0x01ffdd1c @@ -198,7 +198,7 @@ func_01fff254 kind:function(arm,size=0x2c) addr:0x01fff254 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_01fff2fcEPFvP5ActorP14Actor_vfunc_30EPv kind:function(arm,size=0x54) addr:0x01fff2fc _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 @@ -209,8 +209,8 @@ _ZN16MapObjectManager13func_01fff4ccEPFvPvS0_ES0_ kind:function(arm,size=0x54) a _ZN16MapObjectManager13func_01fff520EP24UnkStruct_ov000_020b34c4PP9MapObject kind:function(arm,size=0x64) addr:0x01fff520 _ZN9MapObject14GetMapObjectIdEv kind:function(arm,size=0xc) addr:0x01fff584 _ZN9MapObject13func_01fff590Ei kind:function(arm,size=0x40) addr:0x01fff590 -_ZN5Actor13func_01fff5d0Eii kind:function(arm,size=0x3c) addr:0x01fff5d0 -_ZN18UnkStruct_027e09b413func_01fff60cEP7VecFx32iihii kind:function(arm,size=0x8c) addr:0x01fff60c +_ZN5Actor13func_01fff5d0EP14Actor_vfunc_30i kind:function(arm,size=0x3c) addr:0x01fff5d0 +_ZN18UnkStruct_027e09b413func_01fff60cEP7VecFx32iiiii kind:function(arm,size=0x8c) addr:0x01fff60c func_01fff698 kind:function(arm,size=0x38) addr:0x01fff698 func_01fff6d0 kind:function(arm,size=0x74) addr:0x01fff6d0 func_01fff744 kind:function(arm,size=0x20) addr:0x01fff744 diff --git a/config/jp/arm9/overlays/ov000/symbols.txt b/config/jp/arm9/overlays/ov000/symbols.txt index 304ee47e..6f054faf 100644 --- a/config/jp/arm9/overlays/ov000/symbols.txt +++ b/config/jp/arm9/overlays/ov000/symbols.txt @@ -123,7 +123,7 @@ _ZN15ModelRenderBase19func_ov000_02057f40EPKv kind:function(arm,size=0x34) addr: func_ov000_020594f4 kind:function(arm,size=0x24) addr:0x020594f4 func_ov000_02059518 kind:function(arm,size=0x28) addr:0x02059518 func_ov000_02059540 kind:function(arm,size=0x28) addr:0x02059540 -func_ov000_02059568 kind:function(arm,size=0x50) addr:0x02059568 +_ZN20ModelRender_Derived419func_ov000_02057fe8E14UnkAngleStructS0_P7VecFx32 kind:function(arm,size=0x50) addr:0x02059568 func_ov000_020595b8 kind:function(arm,size=0x28) addr:0x020595b8 func_ov000_020595e0 kind:function(arm,size=0x20) addr:0x020595e0 func_ov000_02059600 kind:function(arm,size=0x20) addr:0x02059600 @@ -323,7 +323,7 @@ func_ov000_0205da30 kind:function(arm,size=0xdc) addr:0x0205da30 func_ov000_0205c584 kind:function(thumb,size=0x1a) addr:0x0205db0c func_ov000_0205db28 kind:function(arm,size=0x18) addr:0x0205db28 func_ov000_0205db40 kind:function(arm,size=0x18) addr:0x0205db40 -func_ov000_0205db58 kind:function(arm,size=0xd4) addr:0x0205db58 +_ZN18PlayerActorBase_7819func_ov000_0205c5d0EiP15PlayerActorBase kind:function(arm,size=0xd4) addr:0x0205db58 func_ov000_0205dc2c kind:function(arm,size=0x2c) addr:0x0205dc2c func_ov000_0205dc58 kind:function(arm,size=0x34) addr:0x0205dc58 func_ov000_0205dc8c kind:function(arm,size=0x48) addr:0x0205dc8c @@ -486,7 +486,7 @@ _ZN23UnkStruct_027e0998_Base19func_ov000_02061768Ev kind:function(arm,size=0x4) func_ov000_02062cf4 kind:function(thumb,size=0xbc) addr:0x02062cf4 func_ov000_02062db0 kind:function(thumb,size=0x28) addr:0x02062db0 _ZN23UnkStruct_027e0998_Base19func_ov000_02061850Ei kind:function(arm,size=0x18) addr:0x02062dd8 -_ZN23UnkStruct_027e0998_Base8vfunc_00EP7VecFx32P5Vec2sPt kind:function(arm,size=0x1e0) addr:0x02062df0 +_ZN23UnkStruct_027e0998_Base8vfunc_00EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x1e0) addr:0x02062df0 _ZN23UnkStruct_027e0998_Base19func_ov000_02061a48EP7VecFx32P5Vec2sS3_ kind:function(arm,size=0x28) addr:0x02062fd0 _ZN23UnkStruct_027e0998_Base19func_ov000_02061a70Ev kind:function(arm,size=0xc) addr:0x02062ff8 func_ov000_02063004 kind:function(arm,size=0x10) addr:0x02063004 @@ -1076,10 +1076,10 @@ func_ov000_02073640 kind:function(arm,size=0x10) addr:0x02073640 _ZN21UnkStruct_027e09ac_1419func_ov000_02071f98Ev kind:function(arm,size=0x13c) addr:0x02073650 func_ov000_0207378c kind:function(arm,size=0x270) addr:0x0207378c func_ov000_02072344 kind:function(arm,size=0xb0) addr:0x020739fc -func_ov000_02073aac kind:function(arm,size=0x78) addr:0x02073aac +_ZN18UnkStruct_027e09ac19func_ov000_020723f4Ev kind:function(arm,size=0x78) addr:0x02073aac func_ov000_02073b24 kind:function(arm,size=0x204) addr:0x02073b24 func_ov000_02073d28 kind:function(arm,size=0x14) addr:0x02073d28 -func_ov000_02073d3c kind:function(arm,size=0x18) addr:0x02073d3c +_ZN18UnkStruct_027e09ac19func_ov000_02072684EPv kind:function(arm,size=0x18) addr:0x02073d3c func_ov000_02073d54 kind:function(arm,size=0x54) addr:0x02073d54 _ZN18UnkStruct_027e09ac19func_ov000_020726f0Etii kind:function(arm,size=0x2d4) addr:0x02073da8 _ZN18UnkStruct_027e09ac19func_ov000_020729c4EP21UnkStruct_027e09ac_14ttss kind:function(arm,size=0x88) addr:0x0207407c @@ -1129,7 +1129,7 @@ _ZN18UnkStruct_027e09b819func_ov000_020732dcEi kind:function(arm,size=0x10) addr _ZN18UnkStruct_027e09b819func_ov000_020732ecEi kind:function(arm,size=0x10) addr:0x020749a4 _ZN18UnkStruct_027e09b819func_ov000_020732fcEi kind:function(arm,size=0x10) addr:0x020749b4 _ZN18UnkStruct_027e09b819func_ov000_0207330cEv kind:function(arm,size=0x20) addr:0x020749c4 -func_ov000_020749e4 kind:function(arm,size=0x5c) addr:0x020749e4 +_ZN18UnkStruct_027e09b819func_ov000_0207332cEv kind:function(arm,size=0x5c) addr:0x020749e4 _ZN18UnkStruct_027e09b819func_ov000_02073388EPvi kind:function(arm,size=0xe8) addr:0x02074a40 _ZN18UnkStruct_027e09b819func_ov000_02073470EPvi kind:function(arm,size=0x108) addr:0x02074b28 _ZN18UnkStruct_027e09b819func_ov000_02073578EPvi kind:function(arm,size=0x98) addr:0x02074c30 @@ -1213,11 +1213,11 @@ func_ov000_0207797c kind:function(arm,size=0x20) addr:0x0207797c func_ov000_0207799c kind:function(arm,size=0x1dc) addr:0x0207799c func_ov000_02077b78 kind:function(arm,size=0x1d4) addr:0x02077b78 func_ov000_02077d4c kind:function(arm,size=0x120) addr:0x02077d4c -func_ov000_02077e6c kind:function(arm,size=0x34c) addr:0x02077e6c +_ZN21UnkStruct_027e09bc_0C19func_ov000_020767b4EP7VecFx32P5Vec2siiS1_ kind:function(arm,size=0x34c) addr:0x02077e6c func_ov000_020781b8 kind:function(arm,size=0x254) addr:0x020781b8 func_ov000_0207840c kind:function(arm,size=0x1fc) addr:0x0207840c func_ov000_02078608 kind:function(arm,size=0x58) addr:0x02078608 -func_ov000_02078660 kind:function(arm,size=0xa0) addr:0x02078660 +_ZN21UnkStruct_027e09bc_0C19func_ov000_02076fa8EPvS0_ii kind:function(arm,size=0xa0) addr:0x02078660 func_ov000_02078700 kind:function(arm,size=0x114) addr:0x02078700 _ZN21UnkStruct_027e09bc_24C1Ev kind:function(arm,size=0x2c) addr:0x02078814 func_ov000_02078840 kind:function(arm,size=0x14) addr:0x02078840 @@ -1226,7 +1226,7 @@ _ZN18UnkStruct_027e09bc19func_ov000_020771b8Ei kind:function(arm,size=0x10) addr _ZN18UnkStruct_027e09bc19func_ov000_020771c8Ev kind:function(arm,size=0x188) addr:0x02078880 func_ov000_02078a08 kind:function(arm,size=0xf4) addr:0x02078a08 func_ov000_02078afc kind:function(arm,size=0x24) addr:0x02078afc -func_ov000_02078b20 kind:function(arm,size=0x18) addr:0x02078b20 +_ZN18UnkStruct_027e09bc19func_ov000_02077468Eii kind:function(arm,size=0x18) addr:0x02078b20 func_ov000_02078b38 kind:function(arm,size=0x10) addr:0x02078b38 _ZN19func_ov000_02078b48D1Ev kind:function(arm,size=0x14) addr:0x02078b48 _ZN19func_ov000_02078b5cD0Ev kind:function(arm,size=0x1c) addr:0x02078b5c @@ -1254,7 +1254,7 @@ func_ov000_0207988c kind:function(arm,size=0x14) addr:0x0207988c func_ov000_020798a0 kind:function(arm,size=0x48) addr:0x020798a0 _ZN21UnkStruct_027e09bc_0C19func_ov000_02078230Ei kind:function(arm,size=0xe4) addr:0x020798e8 func_ov000_020799cc kind:function(arm,size=0x38) addr:0x020799cc -_ZN21UnkStruct_027e09bc_0C19func_ov000_0207834cEP7VecFx32ii kind:function(arm,size=0x40) addr:0x02079a04 +_ZN21UnkStruct_027e09bc_0C19func_ov000_0207834cEP7VecFx32P29UnkStackStruct_ov000_02077590i kind:function(arm,size=0x40) addr:0x02079a04 func_ov000_02079a44 kind:function(arm,size=0x70) addr:0x02079a44 func_ov000_02079ab4 kind:function(arm,size=0x88) addr:0x02079ab4 func_ov000_02079b3c kind:function(arm,size=0x40) addr:0x02079b3c @@ -1265,7 +1265,7 @@ func_ov000_02079c4c kind:function(arm,size=0x40) addr:0x02079c4c func_ov000_02079c8c kind:function(arm,size=0xac) addr:0x02079c8c func_ov000_02079d38 kind:function(arm,size=0xc) addr:0x02079d38 func_ov000_02079d44 kind:function(arm,size=0xc) addr:0x02079d44 -func_ov000_02079d50 kind:function(arm,size=0xc) addr:0x02079d50 +_ZN21UnkStruct_027e09bc_0C19func_ov000_02078698Ev kind:function(arm,size=0xc) addr:0x02079d50 func_ov000_02079d5c kind:function(arm,size=0x38) addr:0x02079d5c func_ov000_02079d94 kind:function(arm,size=0x2c) addr:0x02079d94 func_ov000_02079dc0 kind:function(arm,size=0x24) addr:0x02079dc0 @@ -1626,13 +1626,13 @@ _ZN21UnkStruct_027e0cd8_0419func_ov000_020819a4EPK29UnkStruct_func_ov000_020702a func_ov000_020831dc kind:function(arm,size=0x44) addr:0x020831dc func_ov000_02083220 kind:function(arm,size=0xc) addr:0x02083220 func_ov000_0208322c kind:function(arm,size=0x10) addr:0x0208322c -func_ov000_0208323c kind:function(arm,size=0x18) addr:0x0208323c -func_ov000_02083254 kind:function(arm,size=0x58) addr:0x02083254 -func_ov000_020832ac kind:function(arm,size=0x34) addr:0x020832ac +_ZN18UnkStruct_027e0cd819func_ov000_02081b84Ev kind:function(arm,size=0x18) addr:0x0208323c +_ZN18UnkStruct_027e0cd819func_ov000_02081b9cEi kind:function(arm,size=0x58) addr:0x02083254 +_ZN18UnkStruct_027e0cd819func_ov000_02081bf4Ev kind:function(arm,size=0x34) addr:0x020832ac _ZN18UnkStruct_027e0cd819func_ov000_02081c28Ev kind:function(arm,size=0x78) addr:0x020832e0 _ZN18UnkStruct_027e0cd819func_ov000_02081ca0Ev kind:function(arm,size=0xa8) addr:0x02083358 func_ov000_02083400 kind:function(arm,size=0x10) addr:0x02083400 -func_ov000_02083410 kind:function(arm,size=0x4) addr:0x02083410 +_ZN18UnkStruct_027e0cd819func_ov000_02081d58Ev kind:function(arm,size=0x4) addr:0x02083410 _ZN18UnkStruct_027e0cd819func_ov000_02081d5cEv kind:function(arm,size=0x20) addr:0x02083414 _ZN18UnkStruct_027e0cd819func_ov000_02081d7cEiib kind:function(arm,size=0xb4) addr:0x02083434 _ZN18UnkStruct_027e0cd819func_ov000_02081e30Eii kind:function(arm,size=0x8c) addr:0x020834e8 @@ -1687,10 +1687,10 @@ func_ov000_02084314 kind:function(arm,size=0x188) addr:0x02084314 func_ov000_0208449c kind:function(arm,size=0xc) addr:0x0208449c func_ov000_020844a8 kind:function(arm,size=0xc) addr:0x020844a8 func_ov000_020844b4 kind:function(thumb,size=0x5a) addr:0x020844b4 -func_ov000_02084510 kind:function(arm,size=0x24) addr:0x02084510 +_ZN18PlayerActorBase_7019func_ov000_02082e54Ev kind:function(arm,size=0x24) addr:0x02084510 _ZN18PlayerActorBase_7019func_ov000_02082e78Eiiii kind:function(arm,size=0x22c) addr:0x02084534 -func_ov000_02084760 kind:function(arm,size=0x30) addr:0x02084760 -_ZN18PlayerActorBase_7019func_ov000_020830d4E14UnkAngleStructjhi kind:function(arm,size=0x334) addr:0x02084790 +_ZN18PlayerActorBase_7019func_ov000_020830a4Eiiiii kind:function(arm,size=0x30) addr:0x02084760 +_ZN18PlayerActorBase_7019func_ov000_020830d4E14UnkAngleStructjhP21PlayerLinkActor_A0_28 kind:function(arm,size=0x334) addr:0x02084790 _ZN21PlayerActorBase_70_6CC1EiPvP10G3d_Model_ kind:function(thumb,size=0x44) addr:0x02084ac4 _ZN21PlayerActorBase_70_6CD1Ev kind:function(thumb,size=0x2) addr:0x02084b08 func_ov000_02084b0c kind:function(arm,size=0xc) addr:0x02084b0c @@ -1733,15 +1733,15 @@ func_ov000_02085e2c kind:function(arm,size=0x194) addr:0x02085e2c func_ov000_02085fc0 kind:function(arm,size=0x54) addr:0x02085fc0 func_ov000_02086014 kind:function(arm,size=0x68) addr:0x02086014 func_ov000_0208607c kind:function(arm,size=0x24) addr:0x0208607c -func_ov000_020860a0 kind:function(arm,size=0xf8) addr:0x020860a0 -func_ov000_02086198 kind:function(arm,size=0x174) addr:0x02086198 -func_ov000_0208630c kind:function(arm,size=0x21c) addr:0x0208630c -func_ov000_02086528 kind:function(arm,size=0x40c) addr:0x02086528 +_ZN18PlayerLinkActor_9C19func_ov000_020849d0EP7VecFx32S1_ kind:function(arm,size=0xf8) addr:0x020860a0 +_ZN18PlayerLinkActor_9C19func_ov000_02084ac8EiP7VecFx32S1_S1_ kind:function(arm,size=0x174) addr:0x02086198 +_ZN18PlayerLinkActor_9C19func_ov000_02084c3cEiiP7VecFx32S1_ kind:function(arm,size=0x21c) addr:0x0208630c +_ZN18PlayerLinkActor_9C19func_ov000_02084e58EihP7VecFx32S1_S1_S1_i kind:function(arm,size=0x40c) addr:0x02086528 func_ov000_02086934 kind:function(arm,size=0x14) addr:0x02086934 -func_ov000_02086948 kind:function(arm,size=0x304) addr:0x02086948 -func_ov000_02086c4c kind:function(arm,size=0x1a0) addr:0x02086c4c -func_ov000_02086dec kind:function(arm,size=0x128) addr:0x02086dec -func_ov000_02086f14 kind:function(arm,size=0x184) addr:0x02086f14 +_ZN18PlayerLinkActor_9C19func_ov000_02085274EiiiP7VecFx32S1_S1_ kind:function(arm,size=0x304) addr:0x02086948 +_ZN18PlayerLinkActor_9C19func_ov000_02085578EiiiiP7VecFx32 kind:function(arm,size=0x1a0) addr:0x02086c4c +_ZN18PlayerLinkActor_9C19func_ov000_02085718EP7VecFx32 kind:function(arm,size=0x128) addr:0x02086dec +_ZN18PlayerLinkActor_9C19func_ov000_02085840EP7VecFx32S1_S1_ kind:function(arm,size=0x184) addr:0x02086f14 func_ov000_02087098 kind:function(arm,size=0x34) addr:0x02087098 func_ov000_020870cc kind:function(arm,size=0x30) addr:0x020870cc func_ov000_020870fc kind:function(arm,size=0x20) addr:0x020870fc @@ -1764,8 +1764,8 @@ func_ov000_02087ad8 kind:function(arm,size=0xf4) addr:0x02087ad8 func_ov000_02087bcc kind:function(arm,size=0x114) addr:0x02087bcc _ZN18PlayerLinkActor_9CC1EP21UnkStruct_027e0ce0_40ji kind:function(thumb,size=0xf8) addr:0x02087ce0 func_ov000_02087dd8 kind:function(thumb,size=0x54) addr:0x02087dd8 -func_ov000_02087e2c kind:function(arm,size=0x9c) addr:0x02087e2c -func_ov000_02087ec8 kind:function(arm,size=0x3c) addr:0x02087ec8 +_ZN18PlayerLinkActor_9C19func_ov000_02086758Ev kind:function(arm,size=0x9c) addr:0x02087e2c +_ZN18PlayerLinkActor_9C19func_ov000_020867f4Ev kind:function(arm,size=0x3c) addr:0x02087ec8 func_ov000_02087f04 kind:function(arm,size=0x74) addr:0x02087f04 func_ov000_02087f78 kind:function(arm,size=0x58) addr:0x02087f78 func_ov000_02087fd0 kind:function(arm,size=0x104) addr:0x02087fd0 @@ -1854,7 +1854,7 @@ func_ov000_0208afe4 kind:function(arm,size=0x2c) addr:0x0208afe4 func_ov000_0208b010 kind:function(arm,size=0x4c) addr:0x0208b010 _ZN18PlayerLinkActor_A4C1EP15PlayerActorBaseP18PlayerLinkActor_A0 kind:function(thumb,size=0xa) addr:0x0208b05c _ZN18PlayerLinkActor_A4D1Ev kind:function(thumb,size=0x2) addr:0x0208b068 -func_ov000_0208b06c kind:function(arm,size=0x184) addr:0x0208b06c +_ZN18PlayerLinkActor_A419func_ov000_02089998Eb kind:function(arm,size=0x184) addr:0x0208b06c func_ov000_0208b1f0 kind:function(arm,size=0x3c) addr:0x0208b1f0 func_ov000_0208b22c kind:function(arm,size=0x64) addr:0x0208b22c func_ov000_0208b290 kind:function(arm,size=0x64) addr:0x0208b290 @@ -1864,7 +1864,7 @@ _ZN18PlayerActorBase_5C19func_ov000_02089dc4Ev kind:function(arm,size=0x28) addr func_ov000_0208b4c0 kind:function(arm,size=0x68) addr:0x0208b4c0 func_ov000_0208b528 kind:function(arm,size=0x88) addr:0x0208b528 func_ov000_0208b5b0 kind:function(arm,size=0x30) addr:0x0208b5b0 -func_ov000_0208b5e0 kind:function(arm,size=0x40) addr:0x0208b5e0 +_ZN18PlayerActorBase_5C19func_ov000_02089f0cEb kind:function(arm,size=0x40) addr:0x0208b5e0 func_ov000_0208b620 kind:function(arm,size=0x28) addr:0x0208b620 func_ov000_0208b648 kind:function(arm,size=0x24) addr:0x0208b648 func_ov000_0208b66c kind:function(arm,size=0x18) addr:0x0208b66c @@ -1931,10 +1931,10 @@ func_ov000_0208d288 kind:function(arm,size=0x10) addr:0x0208d288 func_ov000_0208d298 kind:function(arm,size=0x10) addr:0x0208d298 func_ov000_0208d2a8 kind:function(arm,size=0x2c) addr:0x0208d2a8 func_ov000_0208d2d4 kind:function(arm,size=0x1c) addr:0x0208d2d4 -_ZN18UnkStruct_027e0ce019func_ov000_0208bc1cEiiiiii kind:function(arm,size=0x40) addr:0x0208d2f0 +_ZN18UnkStruct_027e0ce019func_ov000_0208bc1cEiiiiPvi kind:function(arm,size=0x40) addr:0x0208d2f0 func_ov000_0208d330 kind:function(arm,size=0x40) addr:0x0208d330 -func_ov000_0208d370 kind:function(arm,size=0x88) addr:0x0208d370 -func_ov000_0208bd20 kind:function(arm,size=0x10) addr:0x0208d3f8 +_ZN18UnkStruct_027e0ce019func_ov000_0208bc9cEii kind:function(arm,size=0x88) addr:0x0208d370 +_ZN18UnkStruct_027e0ce019func_ov000_0208bd20Ebii kind:function(arm,size=0x10) addr:0x0208d3f8 _ZN18UnkStruct_027e0ce019func_ov000_0208bd30Ebiii kind:function(arm,size=0x18) addr:0x0208d408 func_ov000_0208d420 kind:function(arm,size=0x34) addr:0x0208d420 func_ov000_0208d454 kind:function(arm,size=0x10) addr:0x0208d454 @@ -1944,7 +1944,7 @@ func_ov000_0208d48c kind:function(arm,size=0x20) addr:0x0208d48c func_ov000_0208d4ac kind:function(arm,size=0x10) addr:0x0208d4ac func_ov000_0208d4bc kind:function(arm,size=0x18) addr:0x0208d4bc func_ov000_0208d4d4 kind:function(arm,size=0x10) addr:0x0208d4d4 -func_ov000_0208d4e4 kind:function(arm,size=0x3c) addr:0x0208d4e4 +_ZN18UnkStruct_027e0ce019func_ov000_0208be0cE8ActorRef kind:function(arm,size=0x3c) addr:0x0208d4e4 func_ov000_0208d520 kind:function(arm,size=0x28) addr:0x0208d520 func_ov000_0208d548 kind:function(arm,size=0x2c) addr:0x0208d548 func_ov000_0208d574 kind:function(arm,size=0x2c) addr:0x0208d574 @@ -1975,7 +1975,7 @@ func_ov000_0208ddac kind:function(arm,size=0x50) addr:0x0208ddac func_ov000_0208ddfc kind:function(arm,size=0x68) addr:0x0208ddfc _ZN21PlayerActorBase_70_1CC1EP18PlayerActorBase_70 kind:function(thumb,size=0x24) addr:0x0208de64 func_ov000_0208de88 kind:function(arm,size=0x40) addr:0x0208de88 -func_ov000_0208dec8 kind:function(arm,size=0x1c) addr:0x0208dec8 +_ZN21PlayerActorBase_70_1C19func_ov000_0208c7f0Ev kind:function(arm,size=0x1c) addr:0x0208dec8 func_ov000_0208dee4 kind:function(arm,size=0x68) addr:0x0208dee4 _ZN21PlayerActorBase_70_E4C1Ev kind:function(thumb,size=0x18) addr:0x0208df4c func_ov000_0208df64 kind:function(arm,size=0x6c) addr:0x0208df64 @@ -1987,10 +1987,10 @@ func_ov000_0208e0e0 kind:function(arm,size=0xc0) addr:0x0208e0e0 func_ov000_0208e1a0 kind:function(arm,size=0x40) addr:0x0208e1a0 func_ov000_0208e1e0 kind:function(arm,size=0xc4) addr:0x0208e1e0 func_ov000_0208e2a4 kind:function(arm,size=0x24) addr:0x0208e2a4 -func_ov000_0208e2c8 kind:function(arm,size=0x30) addr:0x0208e2c8 -func_ov000_0208e2f8 kind:function(arm,size=0x38) addr:0x0208e2f8 +_ZN15PlayerActorBase19func_ov000_0208cbf0Ev kind:function(arm,size=0x30) addr:0x0208e2c8 +_ZN15PlayerActorBase19func_ov000_0208cc20EP7VecFx32 kind:function(arm,size=0x38) addr:0x0208e2f8 func_ov000_0208e330 kind:function(arm,size=0x38) addr:0x0208e330 -func_ov000_0208e368 kind:function(arm,size=0x4c) addr:0x0208e368 +_ZN15PlayerActorBase19func_ov000_0208cc90Ev kind:function(arm,size=0x4c) addr:0x0208e368 func_ov000_0208e3b4 kind:function(arm,size=0x4c) addr:0x0208e3b4 func_ov000_0208e400 kind:function(arm,size=0x78) addr:0x0208e400 func_ov000_0208e478 kind:function(arm,size=0x68) addr:0x0208e478 @@ -2002,19 +2002,19 @@ func_ov000_0208e808 kind:function(arm,size=0x50) addr:0x0208e808 func_ov000_0208e858 kind:function(arm,size=0x60) addr:0x0208e858 func_ov000_0208e8b8 kind:function(arm,size=0x58) addr:0x0208e8b8 func_ov000_0208e910 kind:function(arm,size=0x174) addr:0x0208e910 -func_ov000_0208ea84 kind:function(arm,size=0x28) addr:0x0208ea84 -func_ov000_0208eaac kind:function(arm,size=0x2c) addr:0x0208eaac +_ZN15PlayerActorBase19func_ov000_0208d3a8Ev kind:function(arm,size=0x28) addr:0x0208ea84 +_ZN15PlayerActorBase19func_ov000_0208d3d0EP5Vec2siPv kind:function(arm,size=0x2c) addr:0x0208eaac _ZN15PlayerActorBase19func_ov000_0208d3fcEv kind:function(thumb,size=0x90) addr:0x0208ead8 func_ov000_0208eb68 kind:function(arm,size=0x114) addr:0x0208eb68 func_ov000_0208ec7c kind:function(arm,size=0x6c) addr:0x0208ec7c -func_ov000_0208ece8 kind:function(arm,size=0x148) addr:0x0208ece8 -func_ov000_0208ee30 kind:function(arm,size=0x9c) addr:0x0208ee30 +_ZN15PlayerActorBase19func_ov000_0208d60cEv kind:function(arm,size=0x148) addr:0x0208ece8 +_ZN15PlayerActorBase19func_ov000_0208d754Ev kind:function(arm,size=0x9c) addr:0x0208ee30 _ZN15PlayerActorBase19func_ov000_0208d7f0Eb kind:function(arm,size=0x100) addr:0x0208eecc func_ov000_0208efcc kind:function(arm,size=0x38) addr:0x0208efcc func_ov000_0208f004 kind:function(arm,size=0x18) addr:0x0208f004 func_ov000_0208f01c kind:function(arm,size=0x194) addr:0x0208f01c func_ov000_0208f1b0 kind:function(arm,size=0x34) addr:0x0208f1b0 -func_ov000_0208f1e4 kind:function(arm,size=0xd8) addr:0x0208f1e4 +_ZN15PlayerActorBase19func_ov000_0208db08Ev kind:function(arm,size=0xd8) addr:0x0208f1e4 func_ov000_0208f2bc kind:function(arm,size=0xc) addr:0x0208f2bc func_ov000_0208f2c8 kind:function(arm,size=0x18) addr:0x0208f2c8 func_ov000_0208f2e0 kind:function(arm,size=0x1c) addr:0x0208f2e0 @@ -2025,7 +2025,7 @@ func_ov000_0208f334 kind:function(arm,size=0x10) addr:0x0208f334 func_ov000_0208f344 kind:function(arm,size=0x10) addr:0x0208f344 func_ov000_0208f354 kind:function(arm,size=0x10) addr:0x0208f354 func_ov000_0208f364 kind:function(arm,size=0x10) addr:0x0208f364 -func_ov000_0208f374 kind:function(arm,size=0x58) addr:0x0208f374 +_ZN15PlayerActorBase19func_ov000_0208dc98Ev kind:function(arm,size=0x58) addr:0x0208f374 func_ov000_0208f3cc kind:function(arm,size=0x60) addr:0x0208f3cc func_ov000_0208f42c kind:function(arm,size=0x10) addr:0x0208f42c func_ov000_0208dd60 kind:function(arm,size=0x10) addr:0x0208f43c @@ -2125,10 +2125,10 @@ func_ov000_0209378c kind:function(arm,size=0x34) addr:0x0209378c func_ov000_020937c0 kind:function(arm,size=0xc4) addr:0x020937c0 func_ov000_02093884 kind:function(arm,size=0x3c) addr:0x02093884 _ZN18PlayerLinkActor_A019func_ov000_020921e4Ei kind:function(arm,size=0x464) addr:0x020938c0 -func_ov000_02093d24 kind:function(arm,size=0x7f0) addr:0x02093d24 -func_ov000_02094514 kind:function(arm,size=0x70) addr:0x02094514 -func_ov000_02094584 kind:function(arm,size=0x24) addr:0x02094584 -func_ov000_020945a8 kind:function(arm,size=0x19c) addr:0x020945a8 +_ZN18PlayerLinkActor_A019func_ov000_02092648Ei kind:function(arm,size=0x7f0) addr:0x02093d24 +_ZN18PlayerLinkActor_A019func_ov000_02092e38Ev kind:function(arm,size=0x70) addr:0x02094514 +_ZN18PlayerLinkActor_A019func_ov000_02092ea8Eii kind:function(arm,size=0x24) addr:0x02094584 +_ZN18PlayerLinkActor_A019func_ov000_02092eccEPvb kind:function(arm,size=0x19c) addr:0x020945a8 func_ov000_02094744 kind:function(arm,size=0x28) addr:0x02094744 func_ov000_0209476c kind:function(arm,size=0x28) addr:0x0209476c func_ov000_02094794 kind:function(arm,size=0x3c) addr:0x02094794 @@ -2138,10 +2138,10 @@ func_ov000_0209492c kind:function(arm,size=0xf0) addr:0x0209492c func_ov000_02094a1c kind:function(arm,size=0xf8) addr:0x02094a1c func_ov000_02094b14 kind:function(arm,size=0x124) addr:0x02094b14 func_ov000_02094c38 kind:function(arm,size=0xb0) addr:0x02094c38 -func_ov000_02094ce8 kind:function(arm,size=0x44) addr:0x02094ce8 -func_ov000_02094d2c kind:function(arm,size=0x4c) addr:0x02094d2c +_ZN18PlayerLinkActor_A019func_ov000_0209360cEv kind:function(arm,size=0x44) addr:0x02094ce8 +_ZN18PlayerLinkActor_A019func_ov000_02093650Ev kind:function(arm,size=0x4c) addr:0x02094d2c func_ov000_02094d78 kind:function(arm,size=0x28) addr:0x02094d78 -func_ov000_02094da0 kind:function(arm,size=0x28) addr:0x02094da0 +_ZN18PlayerLinkActor_A019func_ov000_020936c4Ev kind:function(arm,size=0x28) addr:0x02094da0 _ZN18PlayerLinkActor_A019func_ov000_020936ecEv kind:function(arm,size=0x2c) addr:0x02094dc8 _ZN18PlayerLinkActor_A019func_ov000_02093718Ev kind:function(arm,size=0x38) addr:0x02094df4 func_ov000_02094e2c kind:function(arm,size=0x3c) addr:0x02094e2c @@ -2168,7 +2168,7 @@ func_ov000_02095554 kind:function(arm,size=0x1b8) addr:0x02095554 func_ov000_0209570c kind:function(arm,size=0x1c) addr:0x0209570c func_ov000_02095728 kind:function(arm,size=0x5c) addr:0x02095728 func_ov000_02095784 kind:function(arm,size=0x18) addr:0x02095784 -func_ov000_0209579c kind:function(arm,size=0x2c) addr:0x0209579c +_ZN18PlayerLinkActor_A019func_ov000_02093fe8Ev kind:function(arm,size=0x2c) addr:0x0209579c func_ov000_020957c8 kind:function(arm,size=0x20) addr:0x020957c8 func_ov000_020957e8 kind:function(arm,size=0x20) addr:0x020957e8 func_ov000_02095808 kind:function(arm,size=0x30) addr:0x02095808 @@ -2221,13 +2221,13 @@ func_ov000_020979a0 kind:function(arm,size=0x170) addr:0x020979a0 func_ov000_02097b10 kind:function(arm,size=0x514) addr:0x02097b10 _ZN19func_ov000_02098024D1Ev kind:function(arm,size=0x20) addr:0x02098024 _ZN19func_ov000_02098044D0Ev kind:function(arm,size=0x28) addr:0x02098044 -func_ov000_0209806c kind:function(arm,size=0x28) addr:0x0209806c +_ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov000_020968b8Ev kind:function(arm,size=0x28) addr:0x0209806c _ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov000_020968e0Ev kind:function(arm,size=0x1c) addr:0x02098094 -func_ov000_020980b0 kind:function(arm,size=0xb8) addr:0x020980b0 +_ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov000_020968fcEv kind:function(arm,size=0xb8) addr:0x020980b0 func_ov000_02098168 kind:function(arm,size=0xe8) addr:0x02098168 _ZN29UnkStruct_027e0ce0_40_Base_1419func_ov000_02096a9cEv kind:function(arm,size=0x58) addr:0x02098250 -func_ov000_020982a8 kind:function(arm,size=0x28) addr:0x020982a8 -func_ov000_020982d0 kind:function(arm,size=0x78) addr:0x020982d0 +_ZN29UnkStruct_027e0ce0_40_Base_1419func_ov000_02096af4Ev kind:function(arm,size=0x28) addr:0x020982a8 +_ZN29UnkStruct_027e0ce0_40_Base_1419func_ov000_02096b1cEi kind:function(arm,size=0x78) addr:0x020982d0 _ZN9PassengerC1Ev kind:function(arm,size=0x14) addr:0x02098348 _ZN9Passenger5ResetEv kind:function(arm,size=0x24) addr:0x0209835c func_ov000_02098380 kind:function(arm,size=0x48) addr:0x02098380 @@ -2320,8 +2320,8 @@ _ZN5Actor8vfunc_18Ei kind:function(arm,size=0x8) addr:0x02099c50 _ZN5Actor8vfunc_1CEv kind:function(arm,size=0x4) addr:0x02099c58 _ZN5Actor8vfunc_20Ev kind:function(arm,size=0x4) addr:0x02099c5c _ZN5Actor8vfunc_24Ev kind:function(arm,size=0x4) addr:0x02099c60 -_ZN5Actor8vfunc_28Ev kind:function(arm,size=0x4) addr:0x02099c64 -_ZN5Actor8vfunc_2CEi kind:function(arm,size=0x4) addr:0x02099c68 +_ZN5Actor8vfunc_28EP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x02099c64 +_ZN5Actor8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x02099c68 _ZN5Actor8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x02099c6c _ZN5Actor8vfunc_34Ev kind:function(arm,size=0x8) addr:0x02099c70 _ZN5Actor19func_ov000_020984d0Ev kind:function(arm,size=0x20) addr:0x02099c78 @@ -2344,37 +2344,37 @@ _ZN5Actor19func_ov000_02098838Ev kind:function(arm,size=0x28) addr:0x02099fe0 _ZN5Actor19func_ov000_0209a008Eis kind:function(arm,size=0xb0) addr:0x0209a008 _ZN5Actor19func_ov000_02098910EP24UnkStruct_ov031_Items_00i kind:function(arm,size=0xd0) addr:0x0209a0b8 _ZN5Actor19func_ov000_020989e0Ev kind:function(arm,size=0x38) addr:0x0209a188 -func_ov000_0209a1c0 kind:function(arm,size=0x48) addr:0x0209a1c0 +_ZN5Actor19func_ov000_02098a18EP8Cylinder kind:function(arm,size=0x48) addr:0x0209a1c0 _ZN5Actor19func_ov000_02098a60Ei kind:function(arm,size=0x28) addr:0x0209a208 _ZN5Actor19func_ov000_02098a88Eii kind:function(arm,size=0x2c) addr:0x0209a230 _ZN5Actor19func_ov000_02098ab4EhiiP7VecFx32 kind:function(arm,size=0x74) addr:0x0209a25c _ZN14Actor_Derived2C2Ev kind:function(arm,size=0x64) addr:0x0209a2d0 _ZN5Actor19func_ov000_02098b8cEiP24UnkStruct_ov031_Items_00 kind:function(arm,size=0x1a8) addr:0x0209a334 -func_ov000_0209a4dc kind:function(arm,size=0x6c) addr:0x0209a4dc +func_ov000_02098d10 kind:function(arm,size=0x6c) addr:0x0209a4dc func_ov000_02098d7c kind:function(arm,size=0x1b8) addr:0x0209a548 _ZN14Actor_Derived219func_ov000_02098f34EP7VecFx32 kind:function(arm,size=0xd0) addr:0x0209a700 _ZN14Actor_Derived28vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0xc) addr:0x0209a7d0 -func_ov000_0209a7dc kind:function(arm,size=0xb0) addr:0x0209a7dc +func_ov000_02099010 kind:function(arm,size=0xb0) addr:0x0209a7dc _ZN14Actor_Derived219func_ov000_020990c0EP8Actor_9Cii kind:function(arm,size=0x21c) addr:0x0209a88c _ZN14Actor_Derived219func_ov000_020992dcEv kind:function(arm,size=0x90) addr:0x0209aaa8 -func_ov000_0209ab38 kind:function(arm,size=0x64) addr:0x0209ab38 -func_ov000_0209ab9c kind:function(arm,size=0x80) addr:0x0209ab9c +func_ov000_0209936c kind:function(arm,size=0x64) addr:0x0209ab38 +func_ov000_020993d0 kind:function(arm,size=0x80) addr:0x0209ab9c _ZN14Actor_Derived219func_ov000_02099450EPvP7VecFx32it kind:function(arm,size=0x50) addr:0x0209ac1c _ZN14Actor_Derived219func_ov000_020994a0Ev kind:function(arm,size=0x74) addr:0x0209ac6c -func_ov000_0209ace0 kind:function(arm,size=0x74) addr:0x0209ace0 +func_ov000_02099514 kind:function(arm,size=0x74) addr:0x0209ace0 _ZN14Actor_Derived28vfunc_54Ei kind:function(arm,size=0x1b0) addr:0x0209ad54 -func_ov000_0209af04 kind:function(arm,size=0x2c) addr:0x0209af04 -func_ov000_0209af30 kind:function(arm,size=0x20) addr:0x0209af30 -func_ov000_0209af50 kind:function(arm,size=0x20) addr:0x0209af50 -func_ov000_0209af70 kind:function(arm,size=0x20) addr:0x0209af70 +func_ov000_02099738 kind:function(arm,size=0x2c) addr:0x0209af04 +func_ov000_02099764 kind:function(arm,size=0x20) addr:0x0209af30 +func_ov000_02099784 kind:function(arm,size=0x20) addr:0x0209af50 +func_ov000_020997a4 kind:function(arm,size=0x20) addr:0x0209af70 _ZN14Actor_Derived219func_ov000_020997c4Ei kind:function(arm,size=0x2c) addr:0x0209af90 -_ZN19func_ov000_0209afbcD1Ev kind:function(arm,size=0x14) addr:0x0209afbc -_ZN19func_ov000_0209afd0D0Ev kind:function(arm,size=0x1c) addr:0x0209afd0 +_ZN14Actor_Derived2D1Ev kind:function(arm,size=0x14) addr:0x0209afbc +_ZN14Actor_Derived2D0Ev kind:function(arm,size=0x1c) addr:0x0209afd0 _ZN26UnkStruct_ActorUnkCANS_224C1Ev kind:function(arm,size=0x50) addr:0x0209afec -func_ov000_0209b03c kind:function(arm,size=0x80) addr:0x0209b03c -func_ov000_0209b0bc kind:function(arm,size=0x11c) addr:0x0209b0bc +func_ov000_02099870 kind:function(arm,size=0x80) addr:0x0209b03c +_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_020998f0E8ActorRefP7VecFx32 kind:function(arm,size=0x11c) addr:0x0209b0bc _ZN26UnkStruct_ActorUnkCANS_22419func_ov000_02099a0cEv kind:function(arm,size=0x10) addr:0x0209b1d8 -func_ov000_0209b1e8 kind:function(arm,size=0xc) addr:0x0209b1e8 +func_ov000_02099a1c kind:function(arm,size=0xc) addr:0x0209b1e8 _ZN24UnkStruct_ov000_020b31a8C2EP10UnkSystem5P11ModelRenderP19UnkActorFileSystem2 kind:function(thumb,size=0x54) addr:0x0209b1f4 func_ov000_0209b248 kind:function(thumb,size=0x48) addr:0x0209b248 func_ov000_0209b290 kind:function(thumb,size=0x28) addr:0x0209b290 @@ -2555,9 +2555,9 @@ _ZN9MapObject8vfunc_04Ev kind:function(arm,size=0x4) addr:0x0209e87c _ZN9MapObject19func_ov000_0209d0bcEP8Vec2bCppPS_ kind:function(arm,size=0x58) addr:0x0209e880 _ZN9MapObject19func_ov000_0209d114Ev kind:function(arm,size=0x18) addr:0x0209e8d8 _ZN9MapObject19func_ov000_0209d12cEv kind:function(arm,size=0x18) addr:0x0209e8f0 -_ZN9MapObject19func_ov000_0209d144EP5Vec2sii kind:function(arm,size=0x88) addr:0x0209e908 +_ZN9MapObject19func_ov000_0209d144EP5Vec2siP21UnkStruct_027e09bc_0C kind:function(arm,size=0x88) addr:0x0209e908 _ZN9MapObject8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x8) addr:0x0209e990 -_ZN9MapObject8vfunc_20Ev kind:function(arm,size=0x4) addr:0x0209e998 +_ZN9MapObject8vfunc_20Ei kind:function(arm,size=0x4) addr:0x0209e998 _ZN9MapObject8vfunc_24EPS_7VecFx32 kind:function(arm,size=0xc) addr:0x0209e99c _ZN9MapObject8vfunc_28Eiii kind:function(arm,size=0x8) addr:0x0209e9a8 _ZN9MapObject8vfunc_2CEP7VecFx32 kind:function(arm,size=0x40) addr:0x0209e9b0 @@ -2607,9 +2607,9 @@ _ZN22MapObjectSwitchStep_40D1Ev kind:function(arm,size=0x14) addr:0x0209f760 _ZN19MapObjectSwitchStepD1Ev kind:function(arm,size=0x58) addr:0x0209f774 _ZN19MapObjectSwitchStepD0Ev kind:function(arm,size=0x60) addr:0x0209f7cc _ZN19MapObjectSwitchStep8vfunc_00Ev kind:function(arm,size=0xb4) addr:0x0209f82c -_ZN19MapObjectSwitchStep19func_ov000_0209e11cEii kind:function(arm,size=0x164) addr:0x0209f8e0 -_ZN19MapObjectSwitchStep8vfunc_20Ev kind:function(arm,size=0x34) addr:0x0209fa44 -_ZN19MapObjectSwitchStep8vfunc_18EPcc kind:function(arm,size=0xd8) addr:0x0209fa78 +_ZN19MapObjectSwitchStep19func_ov000_0209e11cEsi kind:function(arm,size=0x164) addr:0x0209f8e0 +_ZN19MapObjectSwitchStep8vfunc_20Ei kind:function(arm,size=0x34) addr:0x0209fa44 +_ZN19MapObjectSwitchStep8vfunc_18EPc kind:function(arm,size=0xd8) addr:0x0209fa78 _ZN19MapObjectSwitchStep19func_ov000_0209e38cEv kind:function(arm,size=0x3c) addr:0x0209fb50 _ZN22MapObjectSwitchStep_40D0Ev kind:function(arm,size=0x1c) addr:0x0209fb8c _ZN26MapObjectProfileSwitchStepD1Ev kind:function(arm,size=0x14) addr:0x0209fba8 @@ -2618,7 +2618,7 @@ _ZN26MapObjectProfileMiniBlocks6CreateEv kind:function(arm,size=0x24) addr:0x020 _ZN26MapObjectProfileMiniBlocksC1Ev kind:function(arm,size=0x4c) addr:0x0209fbec _ZN19MapObjectMiniBlocksC1Ev kind:function(arm,size=0x3c) addr:0x0209fc38 _ZN19MapObjectMiniBlocks8vfunc_00Ev kind:function(arm,size=0x1fc) addr:0x0209fc74 -_ZN19MapObjectMiniBlocks8vfunc_14Ev kind:function(arm,size=0x60) addr:0x0209fe70 +_ZN19MapObjectMiniBlocks8vfunc_14Ei kind:function(arm,size=0x60) addr:0x0209fe70 _ZN19MapObjectMiniBlocksD1Ev kind:function(arm,size=0x20) addr:0x0209fed0 _ZN19MapObjectMiniBlocksD0Ev kind:function(arm,size=0x28) addr:0x0209fef0 _ZN26MapObjectProfileMiniBlocksD1Ev kind:function(arm,size=0x14) addr:0x0209ff18 @@ -3017,7 +3017,7 @@ _ZN11ItemManager19func_ov000_020a89bcEv kind:function(thumb,size=0x18) addr:0x02 _ZN11ItemManager19func_ov000_020a89d4Ev kind:function(arm,size=0x38) addr:0x020aa1d4 _ZN11ItemManager19func_ov000_020a8a0cEv kind:function(arm,size=0x50) addr:0x020aa20c _ZN11ItemManager19func_ov000_020a8a5cEv kind:function(arm,size=0x18) addr:0x020aa25c -_ZN11ItemManager19func_ov000_020a8a74Ev kind:function(arm,size=0x1c) addr:0x020aa274 +_ZN11ItemManager19func_ov000_020a8a74EP24UnkStruct_027e0ce0_30_00 kind:function(arm,size=0x1c) addr:0x020aa274 _ZN11ItemManager19func_ov000_020a8a90Ev kind:function(arm,size=0x14) addr:0x020aa290 _ZN11ItemManager19func_ov000_020a8aa4Ev kind:function(arm,size=0x14) addr:0x020aa2a4 _ZN11ItemManager19func_ov000_020a8ab8Ev kind:function(arm,size=0x14) addr:0x020aa2b8 @@ -3069,7 +3069,7 @@ _ZN14Actor_Derived18vfunc_A8Ev kind:function(arm,size=0x8) addr:0x020aaffc _ZN14Actor_Derived119func_ov000_020a9804Ev kind:function(arm,size=0xec) addr:0x020ab004 _ZN14Actor_Derived18vfunc_20Ev kind:function(arm,size=0x4) addr:0x020ab0f0 _ZN14Actor_Derived18vfunc_24Ev kind:function(arm,size=0x68) addr:0x020ab0f4 -_ZN14Actor_Derived18vfunc_2CEi kind:function(arm,size=0x48) addr:0x020ab15c +_ZN14Actor_Derived18vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x48) addr:0x020ab15c _ZN14Actor_Derived18vfunc_B8Ev kind:function(arm,size=0x34) addr:0x020ab1a4 _ZN14Actor_Derived18vfunc_14Ev kind:function(arm,size=0x48) addr:0x020ab1d8 _ZN19func_ov000_020ab220D1Ev kind:function(arm,size=0x14) addr:0x020ab220 diff --git a/config/jp/arm9/overlays/ov001/symbols.txt b/config/jp/arm9/overlays/ov001/symbols.txt index e43e2921..ed68bd04 100644 --- a/config/jp/arm9/overlays/ov001/symbols.txt +++ b/config/jp/arm9/overlays/ov001/symbols.txt @@ -200,14 +200,14 @@ _Z19func_ov001_020bbac4iP10G3d_Model_ib kind:function(thumb,size=0x5c) addr:0x02 _ZN18PlayerActorBase_70C1Eii kind:function(thumb,size=0x260) addr:0x020bd368 _ZN18PlayerActorBase_70D1Ev kind:function(thumb,size=0x96) addr:0x020bd5c8 _ZN18PlayerActorBase_7019func_ov001_020bbe18Ei14UnkAngleStructjh kind:function(thumb,size=0x4c) addr:0x020bd660 -_ZN24UnkStruct_027e0ce0_30_00C1EP21UnkStruct_027e0ce0_38P21UnkStruct_027e0ce0_3CiPii kind:function(thumb,size=0x7c) addr:0x020bd6ac +_ZN24UnkStruct_027e0ce0_30_00C1EP21UnkStruct_027e0ce0_38P21UnkStruct_027e0ce0_3CP21UnkStruct_027e0ce0_40P15PlayerLinkActorP15PlayerActorBase kind:function(thumb,size=0x7c) addr:0x020bd6ac _ZN24UnkStruct_027e0ce0_30_00D1Ev kind:function(thumb,size=0x2) addr:0x020bd728 _ZN21UnkStruct_027e0ce0_30C1Ev kind:function(thumb,size=0x18) addr:0x020bd72c _ZN21UnkStruct_027e0ce0_30D1Ev kind:function(thumb,size=0x2) addr:0x020bd744 _ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf00Eii kind:function(thumb,size=0x24) addr:0x020bd748 _ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf24EP21UnkStruct_027e0ce0_38 kind:function(thumb,size=0x2a) addr:0x020bd76c _ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf50EP21UnkStruct_027e0ce0_3C kind:function(thumb,size=0x2a) addr:0x020bd798 -_ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf7cEiPii kind:function(thumb,size=0x50) addr:0x020bd7c4 +_ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf7cEP21UnkStruct_027e0ce0_40P15PlayerLinkActorP15PlayerActorBase kind:function(thumb,size=0x50) addr:0x020bd7c4 _ZN21UnkStruct_027e0ce0_3019func_ov001_020bbfccEv kind:function(thumb,size=0x5a) addr:0x020bd814 _ZN26UnkStruct_027e0ce0_40_BaseC2EiPvP11ItemManager kind:function(thumb,size=0x88) addr:0x020bd870 _ZN26UnkStruct_027e0ce0_40_BaseD2Ev kind:function(thumb,size=0x30) addr:0x020bd8f8 @@ -241,7 +241,7 @@ _ZN15PlayerActorBase19func_ov001_020bc96cEv kind:function(thumb,size=0x2e) addr: _ZN15PlayerLinkActorC1EiP11ItemManagerP21UnkStruct_027e0ce0_40P25UnkStruct_027e0ce0_40_150 kind:function(thumb,size=0x138) addr:0x020be1e4 _ZN19PlayerLinkActor_1B0D1Ev kind:function(thumb,size=0xc) addr:0x020be31c _ZN15PlayerLinkActorD1Ev kind:function(thumb,size=0x80) addr:0x020be328 -_ZN15PlayerLinkActor19func_ov001_020bcb60EP25UnkStruct_027e0ce0_40_328 kind:function(thumb,size=0x10) addr:0x020be3a8 +_ZN15PlayerLinkActor19func_ov001_020bcb60EP15PlayerActorBase kind:function(thumb,size=0x10) addr:0x020be3a8 _ZN15PlayerLinkActor19func_ov001_020bcb70Ev kind:function(thumb,size=0x36) addr:0x020be3b8 _ZN15PlayerLinkActor19func_ov001_020bcba8Ev kind:function(thumb,size=0x26) addr:0x020be3f0 _ZN15PlayerLinkActor19func_ov001_020bcbd0EP7VecFx32 kind:function(thumb,size=0x98) addr:0x020be418 diff --git a/config/jp/arm9/overlays/ov005/symbols.txt b/config/jp/arm9/overlays/ov005/symbols.txt index 26fee968..dea373c2 100644 --- a/config/jp/arm9/overlays/ov005/symbols.txt +++ b/config/jp/arm9/overlays/ov005/symbols.txt @@ -1,7 +1,7 @@ func_ov005_020b7d40 kind:function(arm,size=0x28) addr:0x020b7d40 func_ov005_020b7d68 kind:function(arm,size=0x28) addr:0x020b7d68 -func_ov005_020b7d90 kind:function(arm,size=0x134) addr:0x020b7d90 -func_ov005_020b7ec4 kind:function(arm,size=0x1a4) addr:0x020b7ec4 +_ZN16MapObjectManager19func_ov005_020b6570Ei kind:function(arm,size=0x134) addr:0x020b7d90 +_ZN12ActorManager19func_ov005_020b66a4Ei kind:function(arm,size=0x1a4) addr:0x020b7ec4 _ZN12ActorUnkSWOB8vfunc_20Ev kind:function(arm,size=0xf4) addr:0x020b8068 func_ov005_020b815c kind:function(arm,size=0x224) addr:0x020b815c func_ov005_020b8380 kind:function(arm,size=0x4c) addr:0x020b8380 diff --git a/config/jp/arm9/overlays/ov017/relocs.txt b/config/jp/arm9/overlays/ov017/relocs.txt index 18c50ecf..79ceffaa 100644 --- a/config/jp/arm9/overlays/ov017/relocs.txt +++ b/config/jp/arm9/overlays/ov017/relocs.txt @@ -60,11 +60,11 @@ from:0x020bd238 kind:load to:0x020453b0 module:main from:0x020bd23c kind:load to:0x020b9b30 module:overlays(3,8,9,13,16) from:0x020bd250 kind:arm_call to:0x020bd2b4 module:overlay(17) from:0x020bd258 kind:arm_call to:0x02013d98 module:main -from:0x020bd264 kind:load to:0x020c5728 module:overlay(17) +from:0x020bd264 kind:load to:0x020c5720 module:overlay(17) add:0x8 from:0x020bd278 kind:arm_call to:0x020bd2b4 module:overlay(17) from:0x020bd280 kind:arm_call to:0x02013d98 module:main from:0x020bd288 kind:arm_call to:0x02011ff4 module:main -from:0x020bd294 kind:load to:0x020c5728 module:overlay(17) +from:0x020bd294 kind:load to:0x020c5720 module:overlay(17) add:0x8 from:0x020bd2ac kind:load to:0x0204b100 module:main from:0x020bd2b0 kind:load to:0x02013ff0 module:main from:0x020bd2c4 kind:load to:0x0204b100 module:main @@ -867,7 +867,7 @@ from:0x020c5690 kind:arm_call to:0x0203e3a4 module:main from:0x020c56a4 kind:load to:0x020c5780 module:overlay(17) from:0x020c56a8 kind:load to:0x020c5790 module:overlay(17) from:0x020c56ac kind:load to:0x020c585c module:overlay(17) -from:0x020c56b0 kind:load to:0x020c5728 module:overlay(17) +from:0x020c56b0 kind:load to:0x020c5720 module:overlay(17) add:0x8 from:0x020c56b4 kind:load to:0x020bd240 module:overlay(17) from:0x020c56b8 kind:load to:0x020c5784 module:overlay(17) from:0x020c56f0 kind:load to:0x020c5734 module:overlay(17) diff --git a/config/jp/arm9/overlays/ov017/symbols.txt b/config/jp/arm9/overlays/ov017/symbols.txt index f9c274d8..d9732174 100644 --- a/config/jp/arm9/overlays/ov017/symbols.txt +++ b/config/jp/arm9/overlays/ov017/symbols.txt @@ -1,45 +1,45 @@ -func_ov017_020bce80 kind:function(arm,size=0x198) addr:0x020bce80 -func_ov017_020bd018 kind:function(arm,size=0x13c) addr:0x020bd018 -func_ov017_020bd154 kind:function(arm,size=0x60) addr:0x020bd154 -_ZN18UnkStruct_027e09a419func_ov017_020bb994EPv kind:function(arm,size=0x8c) addr:0x020bd1b4 -_ZN19func_ov017_020bd240D1Ev kind:function(arm,size=0x28) addr:0x020bd240 -_ZN19func_ov017_020bd268D0Ev kind:function(arm,size=0x30) addr:0x020bd268 +_ZN18UnkStruct_027e09a419func_ov017_020bb660Ei kind:function(arm,size=0x198) addr:0x020bce80 +_ZN18UnkStruct_027e09a419func_ov017_020bb7f8EPv kind:function(arm,size=0x13c) addr:0x020bd018 +_ZN18UnkStruct_027e09a419func_ov017_020bb934EPv kind:function(arm,size=0x60) addr:0x020bd154 +_ZN18UnkStruct_027e09a419func_ov017_020bb994EPc kind:function(arm,size=0x8c) addr:0x020bd1b4 +_ZN24UnkStruct_ov017_020c3f70D1Ev kind:function(arm,size=0x28) addr:0x020bd240 +_ZN24UnkStruct_ov017_020c3f70D0Ev kind:function(arm,size=0x30) addr:0x020bd268 _ZN24UnkStruct_ov017_020c3f7019func_ov017_020bba78Ev kind:function(arm,size=0x1c) addr:0x020bd298 _ZN24UnkStruct_ov017_020c3f7019func_ov017_020bba94Ev kind:function(arm,size=0x14) addr:0x020bd2b4 -func_ov017_020bd2c8 kind:function(arm,size=0x230) addr:0x020bd2c8 -func_ov017_020bd4f8 kind:function(arm,size=0x21c) addr:0x020bd4f8 -func_ov017_020bd714 kind:function(arm,size=0x78) addr:0x020bd714 -func_ov017_020bd78c kind:function(arm,size=0x10) addr:0x020bd78c -func_ov017_020bd79c kind:function(arm,size=0x680) addr:0x020bd79c -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 -_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 -func_ov017_020becc0 kind:function(arm,size=0xc8) addr:0x020becc0 -func_ov017_020bed88 kind:function(arm,size=0x5c) addr:0x020bed88 -func_ov017_020bede4 kind:function(arm,size=0x18) addr:0x020bede4 -func_ov017_020bedfc kind:function(arm,size=0x68) addr:0x020bedfc -func_ov017_020bee64 kind:function(arm,size=0x58) addr:0x020bee64 +_ZN18PlayerActorBase_7019func_ov017_020bbaa8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x230) addr:0x020bd2c8 +_ZN18PlayerActorBase_7019func_ov017_020bbcd8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x21c) addr:0x020bd4f8 +_ZN18PlayerActorBase_7019func_ov017_020bbef4EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x78) addr:0x020bd714 +_ZN18PlayerActorBase_7019func_ov017_020bbf6cEv kind:function(arm,size=0x10) addr:0x020bd78c +_ZN24UnkStruct_027e0ce0_30_0019func_ov017_020bbf7cEP11ItemManager kind:function(arm,size=0x680) addr:0x020bd79c +_ZN21UnkStruct_027e0ce0_3019func_ov017_020bc5fcEP11ItemManager kind:function(arm,size=0x44) addr:0x020bde1c +_ZN18PlayerLinkActor_9C19func_ov017_020bc640EjbbhhP7VecFx32S1_S1_ kind:function(arm,size=0x31c) addr:0x020bde60 +_ZN21UnkStruct_027e0ce0_4019func_ov017_020bc95cEb kind:function(arm,size=0xe4) addr:0x020be17c +_ZN21UnkStruct_027e0ce0_4019func_ov017_020bca40Ebi kind:function(arm,size=0x3a8) addr:0x020be260 +_ZN21UnkStruct_027e0ce0_4019func_ov017_020bcde8Eb kind:function(arm,size=0x4b8) addr:0x020be608 +_ZN11ItemManager19func_ov017_020bd2a0Ebb kind:function(arm,size=0x48) addr:0x020beac0 +_ZN11ItemManager19func_ov017_020bd2e8EPv kind:function(arm,size=0x18) addr:0x020beb08 +_ZN29UnkStruct_027e0ce0_40_Base_9419func_ov017_020bd300EP29UnkStruct_027e0ce0_40_Base_14ib kind:function(arm,size=0x178) addr:0x020beb20 +_ZN29UnkStruct_027e0ce0_40_Base_9419func_ov017_020bd478Ev kind:function(arm,size=0x28) addr:0x020bec98 +_ZN18UnkStruct_027e0ce019func_ov017_020bd4a0Eib kind:function(arm,size=0xc8) addr:0x020becc0 +_ZN18UnkStruct_027e0ce019func_ov017_020bd568Ei kind:function(arm,size=0x5c) addr:0x020bed88 +_ZN18UnkStruct_027e0ce019func_ov017_020bd5c4EPv kind:function(arm,size=0x18) addr:0x020bede4 +_ZN18UnkStruct_027e0ce019func_ov017_020bd5dcEPv kind:function(arm,size=0x68) addr:0x020bedfc +_ZN18UnkStruct_027e0ce019func_ov017_020bd644EPv kind:function(arm,size=0x58) addr:0x020bee64 _ZN18UnkStruct_027e0ce019func_ov017_020bd69cEv kind:function(arm,size=0x1c) addr:0x020beebc -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 -_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 +_ZN15PlayerLinkActor19func_ov017_020bd6b8Ev kind:function(arm,size=0x28) addr:0x020beed8 +_ZN15PlayerLinkActor19func_ov017_020bd6e0Eb kind:function(arm,size=0x78) addr:0x020bef00 +_ZN15PlayerLinkActor19func_ov017_020bd758Ev kind:function(arm,size=0x30) addr:0x020bef78 +_ZN15PlayerLinkActor19func_ov017_020bd788Eb kind:function(arm,size=0x578) addr:0x020befa8 +_ZN15PlayerLinkActor19func_ov017_020bdcf4Eii kind:function(arm,size=0x90) addr:0x020bf520 +_ZN15PlayerLinkActor19func_ov017_020bdd84EPvi kind:function(arm,size=0x1c4) addr:0x020bf5b0 +_ZN15PlayerLinkActor19func_ov017_020bdf48EPciPvP34UnkStruct_ov019_020d24c8_28_258_00 kind:function(arm,size=0x150) addr:0x020bf774 +_ZN15PlayerLinkActor19func_ov017_020be098Ev kind:function(arm,size=0x10) addr:0x020bf8c4 +_ZN21PlayerLinkActor_A0_3819func_ov017_020be0a8Ei kind:function(arm,size=0x38) addr:0x020bf8d4 +_ZN21PlayerLinkActor_A0_3819func_ov017_020be0e0EiP7VecFx32bb kind:function(arm,size=0x20c) addr:0x020bf90c +_ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov017_020be2ecEP29UnkStruct_027e0ce0_40_Base_14b15UnkParamStruct1 kind:function(arm,size=0x148) addr:0x020bfb18 _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 +_ZN29UnkStruct_027e0ce0_40_Base_1419func_ov017_020be44cEib kind:function(arm,size=0x45c) addr:0x020bfc78 +_ZN21UnkStruct_027e0cf8_0819func_ov017_020be8a8Ev kind:function(arm,size=0x124) addr:0x020c00d4 _ZN12CargoManager8DoUpdateEv kind:function(arm,size=0x18) addr:0x020c01f8 _ZN12CargoManager15IsNotUsingTimerEi kind:function(arm,size=0x30) addr:0x020c0210 _ZN12CargoManager6UpdateEv kind:function(arm,size=0x140) addr:0x020c0240 @@ -49,124 +49,124 @@ _ZN12CargoManager19func_ov017_020bebdcEv kind:function(arm,size=0x44) addr:0x020 _ZN12CargoManager19func_ov017_020bec20Ev kind:function(arm,size=0x4c) addr:0x020c044c _ZN12CargoManager12RemoveAmountEi kind:function(arm,size=0x30) addr:0x020c0498 _ZN12CargoManager19func_ov017_020bec9cEv kind:function(arm,size=0x3c) addr:0x020c04c8 -func_ov017_020c0504 kind:function(arm,size=0x148) addr:0x020c0504 -func_ov017_020c064c kind:function(arm,size=0x44) addr:0x020c064c -func_ov017_020c0690 kind:function(arm,size=0x20) addr:0x020c0690 -func_ov017_020c06b0 kind:function(arm,size=0x20) addr:0x020c06b0 -func_ov017_020c06d0 kind:function(arm,size=0x28) addr:0x020c06d0 -func_ov017_020c06f8 kind:function(arm,size=0x20) addr:0x020c06f8 +_ZN12ActorManager19func_ov017_020becd8Ei kind:function(arm,size=0x148) addr:0x020c0504 +_ZN12ActorManager19func_ov017_020bee20EP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x44) addr:0x020c064c +_ZN12ActorManager19func_ov017_020bee64EP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020c0690 +_ZN12ActorManager19func_ov017_020bee84EP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020c06b0 +_ZN12ActorManager19func_ov017_020beea4EP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x28) addr:0x020c06d0 +_ZN12ActorManager19func_ov017_020beeccEP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020c06f8 _ZN5Actor19func_ov017_020beeecEi kind:function(arm,size=0x60) addr:0x020c0718 -_ZN14Actor_Derived219func_ov017_020bef4cEi kind:function(arm,size=0x3c) addr:0x020c0778 -func_ov017_020c07b4 kind:function(arm,size=0x9c) addr:0x020c07b4 -func_ov017_020c0850 kind:function(arm,size=0x2c) addr:0x020c0850 -func_ov017_020bf050 kind:function(arm,size=0x128) addr:0x020c087c -_ZN14Actor_Derived219func_ov017_020bf178EP8Actor_9Ci kind:function(arm,size=0x10c) addr:0x020c09a4 -func_ov017_020c0ab0 kind:function(arm,size=0x54) addr:0x020c0ab0 -func_ov017_020c0b04 kind:function(arm,size=0x108) addr:0x020c0b04 +_ZN5Actor19func_ov017_020bef4cEi kind:function(arm,size=0x3c) addr:0x020c0778 +_ZN5Actor19func_ov017_020bef88EP14Actor_vfunc_30P34UnkStruct_ov019_020d24c8_28_258_00i kind:function(arm,size=0x9c) addr:0x020c07b4 +_ZN5Actor19func_ov017_020bf024EP14Actor_vfunc_30 kind:function(arm,size=0x2c) addr:0x020c0850 +_ZN5Actor19func_ov017_020bf050EP8Actor_9Ci kind:function(arm,size=0x128) addr:0x020c087c +_ZN5Actor19func_ov017_020bf178EP8Actor_9Ci kind:function(arm,size=0x10c) addr:0x020c09a4 +_ZN5Actor19func_ov017_020bf284EP7VecFx32S0_ kind:function(arm,size=0x54) addr:0x020c0ab0 +_ZN5Actor19func_ov017_020bf2d8EP8Actor_9Ci kind:function(arm,size=0x108) addr:0x020c0b04 _ZN5Actor19func_ov017_020bf3e0Eii kind:function(arm,size=0xd0) addr:0x020c0c0c -func_ov017_020c0cdc kind:function(arm,size=0xc4) addr:0x020c0cdc -func_ov017_020c0da0 kind:function(arm,size=0x50) addr:0x020c0da0 -_ZN5Actor19func_ov017_020bf5c4EP7VecFx32iiii kind:function(arm,size=0x70) addr:0x020c0df0 +_ZN5Actor19func_ov017_020bf4b0Ei kind:function(arm,size=0xc4) addr:0x020c0cdc +_ZN5Actor19func_ov017_020bf574Eii kind:function(arm,size=0x50) addr:0x020c0da0 +_ZN5Actor19func_ov017_020bf5c4EP7VecFx32iiis kind:function(arm,size=0x70) addr:0x020c0df0 _ZN5Actor19func_ov017_020bf634EPK7VecFx32ti kind:function(arm,size=0x54) addr:0x020c0e60 _ZN5Actor19func_ov017_020bf688Ev kind:function(arm,size=0x88) addr:0x020c0eb4 -func_ov017_020c0f3c kind:function(arm,size=0x98) addr:0x020c0f3c -func_ov017_020c0fd4 kind:function(arm,size=0xec) addr:0x020c0fd4 -_ZN14Actor_Derived219func_ov017_020bf894EP26UnkStruct_ActorUnkCANS_224 kind:function(arm,size=0x60) addr:0x020c10c0 +_ZN5Actor19func_ov017_020bf710EP26UnkStruct_ActorUnkCANS_224PK7VecFx32t kind:function(arm,size=0x98) addr:0x020c0f3c +_ZN5Actor19func_ov017_020bf7a8Ev kind:function(arm,size=0xec) addr:0x020c0fd4 +_ZN5Actor19func_ov017_020bf894EP26UnkStruct_ActorUnkCANS_224 kind:function(arm,size=0x60) addr:0x020c10c0 _ZN5Actor8vfunc_40Ev kind:function(arm,size=0x44) addr:0x020c1120 _ZN5Actor8vfunc_44Ev kind:function(arm,size=0x64) addr:0x020c1164 -func_ov017_020bf99c kind:function(arm,size=0x2c) addr:0x020c11c8 +_ZN5Actor19func_ov017_020bf99cEv kind:function(arm,size=0x2c) addr:0x020c11c8 _ZN5Actor19func_ov017_020bf9c8EPS_ kind:function(arm,size=0x88) addr:0x020c11f4 -func_ov017_020c127c kind:function(arm,size=0x84) addr:0x020c127c -func_ov017_020c1300 kind:function(arm,size=0x44) addr:0x020c1300 +_ZN5Actor19func_ov017_020bfa50EP7VecFx32i kind:function(arm,size=0x84) addr:0x020c127c +_ZN5Actor19func_ov017_020bfad4Ev kind:function(arm,size=0x44) addr:0x020c1300 _ZN5Actor19func_ov017_020bfb18EP8Actor_9C kind:function(arm,size=0x238) addr:0x020c1344 -_ZN5Actor8vfunc_14Ev kind:function(arm,size=0x4c) addr:0x020c157c -func_ov017_020c15c8 kind:function(arm,size=0x130) addr:0x020c15c8 -_ZN5Actor8vfunc_48Ev kind:function(arm,size=0x80) addr:0x020c16f8 +_ZN5Actor8vfunc_14EP8Cylinder kind:function(arm,size=0x4c) addr:0x020c157c +_ZN5Actor19func_ov017_020bfd9cEP5Vec2siP21UnkStruct_027e09bc_0CP4AABB kind:function(arm,size=0x130) addr:0x020c15c8 +_ZN5Actor8vfunc_48Ei kind:function(arm,size=0x80) addr:0x020c16f8 _ZN14ActorEventIcon8vfunc_24Ev kind:function(arm,size=0xc) addr:0x020c1778 _ZN14ActorEventIcon8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0xd4) addr:0x020c1784 -func_ov017_020c1858 kind:function(arm,size=0x50) addr:0x020c1858 -func_ov017_020c18a8 kind:function(arm,size=0x60) addr:0x020c18a8 -func_ov017_020c1908 kind:function(arm,size=0xec) addr:0x020c1908 -func_ov017_020c19f4 kind:function(arm,size=0x4) addr:0x020c19f4 -func_ov017_020c19f8 kind:function(arm,size=0x70) addr:0x020c19f8 -func_ov017_020c1a68 kind:function(arm,size=0x70) addr:0x020c1a68 -func_ov017_020c1ad8 kind:function(arm,size=0x48) addr:0x020c1ad8 -func_ov017_020c1b20 kind:function(arm,size=0x48) addr:0x020c1b20 -func_ov017_020c1b68 kind:function(arm,size=0x1d0) addr:0x020c1b68 -func_ov017_020c1d38 kind:function(arm,size=0x80) addr:0x020c1d38 +_ZN14ActorEventIcon19func_ov017_020c002cEv kind:function(arm,size=0x50) addr:0x020c1858 +_ZN16MapObjectManager19func_ov017_020c007cEi kind:function(arm,size=0x60) addr:0x020c18a8 +_ZN16MapObjectManager19func_ov017_020c00dcEi kind:function(arm,size=0xec) addr:0x020c1908 +_ZN16MapObjectManager19func_ov017_020c01c8EPv kind:function(arm,size=0x4) addr:0x020c19f4 +_ZN16MapObjectManager19func_ov017_020c01ccEi kind:function(arm,size=0x70) addr:0x020c19f8 +_ZN16MapObjectManager19func_ov017_020c023cEPc kind:function(arm,size=0x70) addr:0x020c1a68 +_ZN16MapObjectManager19func_ov017_020c02acEi8Vec2bCpp kind:function(arm,size=0x48) addr:0x020c1ad8 +_ZN16MapObjectManager19func_ov017_020c02f4EiP7VecFx32 kind:function(arm,size=0x48) addr:0x020c1b20 +_ZN16MapObjectManager19func_ov017_020c033cEPiPS_PK5Vec2sii kind:function(arm,size=0x1d0) addr:0x020c1b68 +_ZN16MapObjectManager19func_ov017_020c050cEiiii kind:function(arm,size=0x80) addr:0x020c1d38 _ZN9MapObject8vfunc_08Ev kind:function(arm,size=0x4) addr:0x020c1db8 _ZN9MapObject8vfunc_0CEv kind:function(arm,size=0x4) addr:0x020c1dbc _ZN9MapObject8vfunc_10Ev kind:function(arm,size=0x4) addr:0x020c1dc0 -_ZN9MapObject8vfunc_14Ev kind:function(arm,size=0x4) addr:0x020c1dc4 -_ZN9MapObject8vfunc_18EPcc kind:function(arm,size=0x4) addr:0x020c1dc8 +_ZN9MapObject8vfunc_14Ei kind:function(arm,size=0x4) addr:0x020c1dc4 +_ZN9MapObject8vfunc_18EPc kind:function(arm,size=0x4) addr:0x020c1dc8 _ZN19MapObjectSwitchStep8vfunc_08Ev kind:function(arm,size=0x1ac) addr:0x020c1dcc -_ZN19MapObjectSwitchStep8vfunc_14Ev kind:function(arm,size=0x28) addr:0x020c1f78 -func_ov017_020c1fa0 kind:function(arm,size=0x130) addr:0x020c1fa0 -func_ov017_020c20d0 kind:function(arm,size=0x20) addr:0x020c20d0 +_ZN19MapObjectSwitchStep8vfunc_14Ei kind:function(arm,size=0x28) addr:0x020c1f78 +func_ov017_020c0774 kind:function(arm,size=0x130) addr:0x020c1fa0 +func_ov017_020c08a4 kind:function(arm,size=0x20) addr:0x020c20d0 _ZN18UnkStruct_027e09b419func_ov017_020c08c4EP7VecFx32iiiii kind:function(arm,size=0xac) addr:0x020c20f0 -func_ov017_020c219c kind:function(arm,size=0xc0) addr:0x020c219c -func_ov017_020c225c kind:function(arm,size=0x3c) addr:0x020c225c -func_ov017_020c2298 kind:function(arm,size=0xb8) addr:0x020c2298 -func_ov017_020c2350 kind:function(arm,size=0x12c) addr:0x020c2350 -func_ov017_020c247c kind:function(arm,size=0x19c) addr:0x020c247c -func_ov017_020c2618 kind:function(arm,size=0xf0) addr:0x020c2618 -func_ov017_020c2708 kind:function(arm,size=0x228) addr:0x020c2708 -func_ov017_020c2930 kind:function(arm,size=0x78) addr:0x020c2930 -func_ov017_020c29a8 kind:function(arm,size=0x180) addr:0x020c29a8 -func_ov017_020c2b28 kind:function(arm,size=0xb8) addr:0x020c2b28 -func_ov017_020c2be0 kind:function(arm,size=0x4ac) addr:0x020c2be0 +_ZN18UnkStruct_027e09b419func_ov017_020c0970EP7VecFx32iiiiii kind:function(arm,size=0xc0) addr:0x020c219c +func_ov017_020c0a30 kind:function(arm,size=0x3c) addr:0x020c225c +func_ov017_020c0a6c kind:function(arm,size=0xb8) addr:0x020c2298 +func_ov017_020c0b24 kind:function(arm,size=0x12c) addr:0x020c2350 +func_ov017_020c0c50 kind:function(arm,size=0x19c) addr:0x020c247c +func_ov017_020c0dec kind:function(arm,size=0xf0) addr:0x020c2618 +func_ov017_020c0edc kind:function(arm,size=0x228) addr:0x020c2708 +func_ov017_020c1104 kind:function(arm,size=0x78) addr:0x020c2930 +func_ov017_020c117c kind:function(arm,size=0x180) addr:0x020c29a8 +func_ov017_020c12fc kind:function(arm,size=0xb8) addr:0x020c2b28 +func_ov017_020c13b4 kind:function(arm,size=0x4ac) addr:0x020c2be0 _ZN30AdventureModeManager_15C_20_008vfunc_10EPc kind:function(arm,size=0x64) addr:0x020c308c -func_ov017_020c30f0 kind:function(arm,size=0x20) addr:0x020c30f0 -func_ov017_020c3110 kind:function(arm,size=0xbc) addr:0x020c3110 +func_ov017_020c18c4 kind:function(arm,size=0x20) addr:0x020c30f0 +func_ov017_020c18e4 kind:function(arm,size=0xbc) addr:0x020c3110 _ZN30AdventureModeManager_15C_20_0019func_ov017_020c19a0Ev kind:function(arm,size=0x2c) addr:0x020c31cc -func_ov017_020c31f8 kind:function(arm,size=0x20) addr:0x020c31f8 -func_ov017_020c3218 kind:function(arm,size=0x20) addr:0x020c3218 -func_ov017_020c3238 kind:function(arm,size=0x274) addr:0x020c3238 +func_ov017_020c19cc kind:function(arm,size=0x20) addr:0x020c31f8 +func_ov017_020c19ec kind:function(arm,size=0x20) addr:0x020c3218 +func_ov017_020c1a0c kind:function(arm,size=0x274) addr:0x020c3238 _ZN30AdventureModeManager_15C_20_0019func_ov017_020c1c80Ei kind:function(arm,size=0x1d4) addr:0x020c34ac -func_ov017_020c3680 kind:function(arm,size=0x48) addr:0x020c3680 -func_ov017_020c36c8 kind:function(arm,size=0x124) addr:0x020c36c8 -func_ov017_020c37ec kind:function(arm,size=0x5c) addr:0x020c37ec -func_ov017_020c3848 kind:function(arm,size=0x1c) addr:0x020c3848 -func_ov017_020c3864 kind:function(arm,size=0x164) addr:0x020c3864 -func_ov017_020c39c8 kind:function(arm,size=0x174) addr:0x020c39c8 -func_ov017_020c3b3c kind:function(arm,size=0x94) addr:0x020c3b3c -func_ov017_020c3bd0 kind:function(arm,size=0x94) addr:0x020c3bd0 +func_ov017_020c1e54 kind:function(arm,size=0x48) addr:0x020c3680 +func_ov017_020c1e9c kind:function(arm,size=0x124) addr:0x020c36c8 +func_ov017_020c1fc0 kind:function(arm,size=0x5c) addr:0x020c37ec +func_ov017_020c201c kind:function(arm,size=0x1c) addr:0x020c3848 +func_ov017_020c2038 kind:function(arm,size=0x164) addr:0x020c3864 +func_ov017_020c219c kind:function(arm,size=0x174) addr:0x020c39c8 +func_ov017_020c2310 kind:function(arm,size=0x94) addr:0x020c3b3c +func_ov017_020c23a4 kind:function(arm,size=0x94) addr:0x020c3bd0 func_ov017_020c2438 kind:function(arm,size=0x2c0) addr:0x020c3c64 func_ov017_020c26f8 kind:function(arm,size=0x1bc) addr:0x020c3f24 -func_ov017_020c40e0 kind:function(arm,size=0xc8) addr:0x020c40e0 -func_ov017_020c41a8 kind:function(arm,size=0x15c) addr:0x020c41a8 -func_ov017_020c4304 kind:function(arm,size=0x90) addr:0x020c4304 -func_ov017_020c4394 kind:function(arm,size=0xa0) addr:0x020c4394 -func_ov017_020c4434 kind:function(arm,size=0x380) addr:0x020c4434 -func_ov017_020c47b4 kind:function(arm,size=0x3c) addr:0x020c47b4 -func_ov017_020c47f0 kind:function(arm,size=0x7c) addr:0x020c47f0 +func_ov017_020c28b4 kind:function(arm,size=0xc8) addr:0x020c40e0 +func_ov017_020c297c kind:function(arm,size=0x15c) addr:0x020c41a8 +func_ov017_020c2ad8 kind:function(arm,size=0x90) addr:0x020c4304 +func_ov017_020c2b68 kind:function(arm,size=0xa0) addr:0x020c4394 +func_ov017_020c2c08 kind:function(arm,size=0x380) addr:0x020c4434 +func_ov017_020c2f88 kind:function(arm,size=0x3c) addr:0x020c47b4 +func_ov017_020c2fc4 kind:function(arm,size=0x7c) addr:0x020c47f0 _ZN11SaveManager19func_ov017_020c3040EPvi kind:function(arm,size=0x70) addr:0x020c486c -func_ov017_020c48dc kind:function(arm,size=0x34) addr:0x020c48dc -func_ov017_020c4910 kind:function(arm,size=0x34) addr:0x020c4910 -func_ov017_020c4944 kind:function(arm,size=0x24) addr:0x020c4944 -func_ov017_020c4968 kind:function(arm,size=0x44) addr:0x020c4968 +func_ov017_020c30b0 kind:function(arm,size=0x34) addr:0x020c48dc +func_ov017_020c30e4 kind:function(arm,size=0x34) addr:0x020c4910 +func_ov017_020c3118 kind:function(arm,size=0x24) addr:0x020c4944 +func_ov017_020c313c kind:function(arm,size=0x44) addr:0x020c4968 _ZN24UnkStruct_ov024_020d86a019func_ov017_020c3180Ev kind:function(arm,size=0x4c) addr:0x020c49ac _ZN24UnkStruct_ov024_020d86a019func_ov017_020c31ccEv kind:function(arm,size=0x1a8) addr:0x020c49f8 -func_ov017_020c4ba0 kind:function(arm,size=0xa0) addr:0x020c4ba0 -func_ov017_020c4c40 kind:function(arm,size=0x160) addr:0x020c4c40 -func_ov017_020c4da0 kind:function(arm,size=0x74) addr:0x020c4da0 -func_ov017_020c4e14 kind:function(arm,size=0x5c) addr:0x020c4e14 -func_ov017_020c4e70 kind:function(arm,size=0x24) addr:0x020c4e70 -func_ov017_020c4e94 kind:function(arm,size=0xe0) addr:0x020c4e94 -func_ov017_020c4f74 kind:function(arm,size=0x44) addr:0x020c4f74 -func_ov017_020c4fb8 kind:function(arm,size=0x180) addr:0x020c4fb8 +func_ov017_020c3374 kind:function(arm,size=0xa0) addr:0x020c4ba0 +func_ov017_020c3414 kind:function(arm,size=0x160) addr:0x020c4c40 +func_ov017_020c3574 kind:function(arm,size=0x74) addr:0x020c4da0 +func_ov017_020c35e8 kind:function(arm,size=0x5c) addr:0x020c4e14 +func_ov017_020c3644 kind:function(arm,size=0x24) addr:0x020c4e70 +func_ov017_020c3668 kind:function(arm,size=0xe0) addr:0x020c4e94 +func_ov017_020c3748 kind:function(arm,size=0x44) addr:0x020c4f74 +func_ov017_020c378c kind:function(arm,size=0x180) addr:0x020c4fb8 _ZN18UnkStruct_027e0cf819func_ov017_020c390cEv kind:function(arm,size=0x70) addr:0x020c5138 _ZN18UnkStruct_027e0cf819func_ov017_020c397cEv kind:function(arm,size=0x58) addr:0x020c51a8 _ZN18UnkStruct_027e0cf819func_ov017_020c39d4Ev kind:function(arm,size=0x1c) addr:0x020c5200 -func_ov017_020c521c kind:function(arm,size=0x8) addr:0x020c521c -func_ov017_020c5224 kind:function(arm,size=0x8) addr:0x020c5224 +func_ov017_020c39f0 kind:function(arm,size=0x8) addr:0x020c521c +func_ov017_020c39f8 kind:function(arm,size=0x8) addr:0x020c5224 _ZN24AdventureModeManager_15C19func_ov017_020c3a00EP5InputP12TouchControl kind:function(arm,size=0x38) addr:0x020c522c -func_ov017_020c5264 kind:function(arm,size=0x120) addr:0x020c5264 -func_ov017_020c5384 kind:function(arm,size=0x68) addr:0x020c5384 +func_ov017_020c3a38 kind:function(arm,size=0x120) addr:0x020c5264 +func_ov017_020c3b58 kind:function(arm,size=0x68) addr:0x020c5384 _ZN24AdventureModeManager_15C19func_ov017_020c3bc0Ev kind:function(arm,size=0xa4) addr:0x020c53ec _ZN24AdventureModeManager_15C19func_ov017_020c3c64Ev kind:function(arm,size=0x40) addr:0x020c5490 -func_ov017_020c54d0 kind:function(arm,size=0xf4) addr:0x020c54d0 -func_ov017_020c55c4 kind:function(arm,size=0x28) addr:0x020c55c4 +func_ov017_020c3ca4 kind:function(arm,size=0xf4) addr:0x020c54d0 +func_ov017_020c3d98 kind:function(arm,size=0x28) addr:0x020c55c4 sCargoInfos kind:data(byte[42]) addr:0x020c55ec local data_ov017_020c5618 kind:data(any) addr:0x020c5618 __sinit_ov017_020c5650 kind:function(arm,size=0x6c) addr:0x020c5650 @@ -175,7 +175,7 @@ __sinit_ov017_020c56f4 kind:function(arm,size=0x18) addr:0x020c56f4 .p__sinit_ov017_020c5650 kind:data(word) addr:0x020c570c .p__sinit_ov017_020c56bc kind:data(word) addr:0x020c5710 .p__sinit_ov017_020c56f4 kind:data(word) addr:0x020c5714 -data_ov017_020c5728 kind:data(any) addr:0x020c5728 +_ZTV24UnkStruct_ov017_020c3f70 kind:data(any) addr:0x020c5720 data_ov017_020c5734 kind:data(any) addr:0x020c5734 _ZTV21UnkStruct_027e0cec_00 kind:data(any) addr:0x020c5750 data_ov017_020c575c kind:data(any) addr:0x020c575c diff --git a/config/jp/arm9/overlays/ov021/symbols.txt b/config/jp/arm9/overlays/ov021/symbols.txt index f49f535f..784628ad 100644 --- a/config/jp/arm9/overlays/ov021/symbols.txt +++ b/config/jp/arm9/overlays/ov021/symbols.txt @@ -55,12 +55,12 @@ _ZN21UnkStruct_027e0ce0_24D1Ev kind:function(thumb,size=0x2) addr:0x020ec284 _ZN21UnkStruct_027e0ce0_2419func_ov021_020eaa08EP21UnkStruct_027e0ce0_20 kind:function(thumb,size=0xbc) addr:0x020ec288 _ZN21UnkStruct_027e0ce0_2419func_ov021_020eaac4Ev kind:function(thumb,size=0x50) addr:0x020ec344 _ZN21UnkStruct_027e0ce0_2419func_ov021_020eab14EiPK24UnkStruct_ov001_020c40f4P21UnkStruct_027e0ce0_30 kind:function(thumb,size=0x56) addr:0x020ec394 -func_ov021_020ec3ec kind:function(arm,size=0x2c0) addr:0x020ec3ec -func_ov021_020ec6ac kind:function(arm,size=0x58) addr:0x020ec6ac -func_ov021_020ec704 kind:function(arm,size=0x6c) addr:0x020ec704 -func_ov021_020ec770 kind:function(arm,size=0xa8) addr:0x020ec770 +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eab6cEb kind:function(arm,size=0x2c0) addr:0x020ec3ec +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eae2cEi kind:function(arm,size=0x58) addr:0x020ec6ac +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eae84Ev kind:function(arm,size=0x6c) addr:0x020ec704 +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eaef0Eib kind:function(arm,size=0xa8) addr:0x020ec770 func_ov021_020ec818 kind:function(arm,size=0x78) addr:0x020ec818 -func_ov021_020ec890 kind:function(arm,size=0x358) addr:0x020ec890 +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eb010Ev kind:function(arm,size=0x358) addr:0x020ec890 func_ov021_020ecbe8 kind:function(arm,size=0x30) addr:0x020ecbe8 func_ov021_020ecc18 kind:function(arm,size=0x48) addr:0x020ecc18 func_ov021_020ecc60 kind:function(arm,size=0x48) addr:0x020ecc60 @@ -76,14 +76,14 @@ func_ov021_020ecec8 kind:function(arm,size=0x78) addr:0x020ecec8 func_ov021_020ecf40 kind:function(arm,size=0x7c) addr:0x020ecf40 func_ov021_020ecfbc kind:function(arm,size=0xe8) addr:0x020ecfbc func_ov021_020ed0a4 kind:function(arm,size=0x4c) addr:0x020ed0a4 -func_ov021_020ed0f0 kind:function(arm,size=0x90) addr:0x020ed0f0 +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eb870EiiiPv kind:function(arm,size=0x90) addr:0x020ed0f0 func_ov021_020ed180 kind:function(arm,size=0x148) addr:0x020ed180 func_ov021_020ed2c8 kind:function(thumb,size=0x60) addr:0x020ed2c8 func_ov021_020ed328 kind:function(arm,size=0x90) addr:0x020ed328 func_ov021_020ed3b8 kind:function(arm,size=0x104) addr:0x020ed3b8 _ZN24UnkStruct_027e0ce0_30_08C1Ei kind:function(thumb,size=0x28) addr:0x020ed4bc _ZN24UnkStruct_027e0ce0_30_08D1Ev kind:function(thumb,size=0x2) addr:0x020ed4e4 -func_ov021_020ed4e8 kind:function(arm,size=0x4c) addr:0x020ed4e8 +_ZN24UnkStruct_027e0ce0_30_0819func_ov021_020ebc68Ev kind:function(arm,size=0x4c) addr:0x020ed4e8 func_ov021_020ed534 kind:function(arm,size=0xec) addr:0x020ed534 _ZN15PlayerLinkActor19func_ov021_020ebda0Ev kind:function(arm,size=0x50) addr:0x020ed620 func_ov021_020ed670 kind:function(arm,size=0x58) addr:0x020ed670 diff --git a/config/jp/arm9/overlays/ov024/symbols.txt b/config/jp/arm9/overlays/ov024/symbols.txt index 9acf2559..88670f1b 100644 --- a/config/jp/arm9/overlays/ov024/symbols.txt +++ b/config/jp/arm9/overlays/ov024/symbols.txt @@ -109,10 +109,10 @@ _ZN18UnkStruct_027e09987DestroyEv kind:function(arm,size=0x2c) addr:0x020c8758 _ZN18UnkStruct_027e0998D1Ev kind:function(arm,size=0x14) addr:0x020c8784 _ZN18UnkStruct_027e0998C1Ev kind:function(arm,size=0x20) addr:0x020c8798 _ZN18UnkStruct_027e09986CreateEv kind:function(arm,size=0x24) addr:0x020c87b8 -_ZN18UnkStruct_027e09988vfunc_00EP7VecFx32P5Vec2sPt kind:function(arm,size=0x1e0) addr:0x020c87dc +_ZN18UnkStruct_027e09988vfunc_00EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x1e0) addr:0x020c87dc _ZN18UnkStruct_027e099819func_ov024_020c716cEv kind:function(arm,size=0xa8) addr:0x020c89bc -_ZN18UnkStruct_027e099819func_ov024_020c7214EP7VecFx32P5Vec2sPt kind:function(arm,size=0x68) addr:0x020c8a64 -_ZN18UnkStruct_027e099819func_ov024_020c727cEP5Vec2sPt kind:function(arm,size=0x84) addr:0x020c8acc +_ZN18UnkStruct_027e099819func_ov024_020c7214EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x68) addr:0x020c8a64 +_ZN18UnkStruct_027e099819func_ov024_020c727cEP5Vec2sP8ActorRef kind:function(arm,size=0x84) addr:0x020c8acc _ZN18UnkStruct_027e099819func_ov024_020c7300Ei kind:function(arm,size=0x54) addr:0x020c8b50 _ZN18UnkStruct_027e099819func_ov024_020c7354Ev kind:function(arm,size=0x3c) addr:0x020c8ba4 _ZN18UnkStruct_027e0cf86CreateEv kind:function(arm,size=0x24) addr:0x020c8be0 diff --git a/config/jp/arm9/overlays/ov026/symbols.txt b/config/jp/arm9/overlays/ov026/symbols.txt index 7727e30f..05e4d471 100644 --- a/config/jp/arm9/overlays/ov026/symbols.txt +++ b/config/jp/arm9/overlays/ov026/symbols.txt @@ -47,7 +47,7 @@ func_ov026_020db118 kind:function(arm,size=0x10) addr:0x020db118 func_ov026_020db128 kind:function(arm,size=0x148) addr:0x020db128 func_ov026_020db270 kind:function(arm,size=0xe8) addr:0x020db270 func_ov026_020db358 kind:function(arm,size=0x25c) addr:0x020db358 -func_ov026_020db5b4 kind:function(arm,size=0x460) addr:0x020db5b4 +_ZN18UnkStruct_027e0d3819func_ov026_020d9c14E8ActorRefP7VecFx32S2_ kind:function(arm,size=0x460) addr:0x020db5b4 func_ov026_020dba14 kind:function(arm,size=0x114) addr:0x020dba14 func_ov026_020dbb28 kind:function(arm,size=0x114) addr:0x020dbb28 func_ov026_020dbc3c kind:function(arm,size=0x164) addr:0x020dbc3c @@ -102,13 +102,13 @@ _ZN21UnkStruct_027e0ce0_3819func_ov026_020dc8f0Ev kind:function(arm,size=0x28) a _ZN21UnkStruct_027e0ce0_3819func_ov026_020dc918Ev kind:function(arm,size=0x98) addr:0x020de308 _ZN21UnkStruct_027e0ce0_3819func_ov026_020dc9b0Ev kind:function(arm,size=0x64) addr:0x020de3a0 _ZN24UnkStruct_ov026_02138d1019func_ov026_020dca14Ev kind:function(arm,size=0x1788) addr:0x020de404 -func_ov026_020dfb8c kind:function(arm,size=0x38) addr:0x020dfb8c +_ZN21UnkStruct_027e0ce0_3819func_ov026_020de19cEib kind:function(arm,size=0x38) addr:0x020dfb8c func_ov026_020dfbc4 kind:function(arm,size=0x30) addr:0x020dfbc4 func_ov026_020dfbf4 kind:function(arm,size=0x158) addr:0x020dfbf4 func_ov026_020dfd4c kind:function(arm,size=0xf0) addr:0x020dfd4c -func_ov026_020dfe3c kind:function(arm,size=0x10) addr:0x020dfe3c -func_ov026_020dfe4c kind:function(arm,size=0x30) addr:0x020dfe4c -func_ov026_020dfe7c kind:function(arm,size=0x578) addr:0x020dfe7c +_ZN21UnkStruct_027e0ce0_3819func_ov026_020de45cEPv kind:function(arm,size=0x10) addr:0x020dfe3c +_ZN21UnkStruct_027e0ce0_3819func_ov026_020de46cEv kind:function(arm,size=0x30) addr:0x020dfe4c +_ZN21UnkStruct_027e0ce0_3819func_ov026_020de49cEv kind:function(arm,size=0x578) addr:0x020dfe7c _ZN21UnkStruct_027e0ce0_3819func_ov026_020de908EP24UnkStruct_027e0ce0_30_00 kind:function(arm,size=0xb4) addr:0x020e03f4 _ZN21UnkStruct_027e0ce0_3819func_ov026_020dc9bcEPK24UnkStruct_ov001_020c40f4 kind:function(arm,size=0x1c) addr:0x020e04a8 func_ov026_020e04c4 kind:function(arm,size=0x84) addr:0x020e04c4 diff --git a/config/jp/arm9/overlays/ov031/symbols.txt b/config/jp/arm9/overlays/ov031/symbols.txt index 424fd5ff..5af54964 100644 --- a/config/jp/arm9/overlays/ov031/symbols.txt +++ b/config/jp/arm9/overlays/ov031/symbols.txt @@ -85,7 +85,7 @@ func_ov031_020db38c kind:function(arm,size=0x10) addr:0x020db38c func_ov031_020db39c kind:function(arm,size=0x20) addr:0x020db39c func_ov031_020db3bc kind:function(arm,size=0x18) addr:0x020db3bc func_ov031_020db3d4 kind:function(arm,size=0x18) addr:0x020db3d4 -func_ov031_020db3ec kind:function(arm,size=0x10) addr:0x020db3ec +_ZN18UnkStruct_027e0d3419func_ov031_020d9a4cEi kind:function(arm,size=0x10) addr:0x020db3ec func_ov031_020db3fc kind:function(arm,size=0x1c) addr:0x020db3fc func_ov031_020db418 kind:function(arm,size=0x20) addr:0x020db418 func_ov031_020db438 kind:function(arm,size=0x10) addr:0x020db438 @@ -138,7 +138,7 @@ func_ov031_020dc988 kind:function(arm,size=0x40) addr:0x020dc988 func_ov031_020dc9c8 kind:function(arm,size=0xd4) addr:0x020dc9c8 _ZN19PlayerLinkActor_13419func_ov031_020db0fcEv kind:function(arm,size=0x24) addr:0x020dca9c func_ov031_020dcac0 kind:function(arm,size=0x40) addr:0x020dcac0 -func_ov031_020dcb00 kind:function(arm,size=0x30) addr:0x020dcb00 +_ZN19PlayerLinkActor_13419func_ov031_020db160Eb kind:function(arm,size=0x30) addr:0x020dcb00 _ZN18PlayerActorBase_7419func_ov001_020db190Ev kind:function(arm,size=0x24) addr:0x020dcb30 func_ov031_020dcb54 kind:function(arm,size=0xfc) addr:0x020dcb54 _ZN27UnkStruct_ItemManager_20_1019func_ov031_020db2b0Ev kind:function(arm,size=0x2c) addr:0x020dcc50 @@ -149,33 +149,33 @@ 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 -_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_0419func_ov031_020db4f0Ebb kind:function(arm,size=0x38) addr:0x020dce90 +_ZN27UnkStruct_ItemManager_20_0419func_ov031_020db528EPv 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 -_ZN27UnkStruct_ItemManager_20_0819func_ov031_020db704Eii kind:function(arm,size=0xbc) addr:0x020dd0a4 +_ZN27UnkStruct_ItemManager_20_0819func_ov031_020db704Ebb 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 _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_020db844Ej 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 -_ZN24UnkStruct_ItemManager_2019func_ov031_020db8f8Ev kind:function(arm,size=0x44) addr:0x020dd298 +_ZN24UnkStruct_ItemManager_2019func_ov031_020db8f8EP24UnkStruct_027e0ce0_30_00 kind:function(arm,size=0x44) addr:0x020dd298 _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 -_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_0C19func_ov031_020db958Ebb kind:function(arm,size=0xe4) addr:0x020dd2f8 +_ZN27UnkStruct_ItemManager_20_0C19func_ov031_020dba3cEPv 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 -_ZN27UnkStruct_ItemManager_20_0019func_ov031_020dbc80Eii kind:function(arm,size=0xa4) addr:0x020dd620 +_ZN27UnkStruct_ItemManager_20_0019func_ov031_020dbc80Ebb 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 @@ -211,11 +211,11 @@ func_ov031_020de240 kind:function(arm,size=0x6c) addr:0x020de240 func_ov031_020de2ac kind:function(arm,size=0x114) addr:0x020de2ac _ZN32UnkStruct_027e0ce0_40_Base_7C_04C1Ev kind:function(thumb,size=0xc) addr:0x020de3c0 _ZN32UnkStruct_027e0ce0_40_Base_7C_04D1Ev kind:function(thumb,size=0xe) addr:0x020de3cc -func_ov031_020de3dc kind:function(arm,size=0x10) addr:0x020de3dc +_ZN32UnkStruct_027e0ce0_40_Base_7C_0419func_ov031_020dca3cEv kind:function(arm,size=0x10) addr:0x020de3dc func_ov031_020de3ec kind:function(thumb,size=0x84) addr:0x020de3ec func_ov031_020de470 kind:function(arm,size=0x3c) addr:0x020de470 func_ov031_020de4ac kind:function(arm,size=0x54) addr:0x020de4ac -func_ov031_020de500 kind:function(arm,size=0xbc) addr:0x020de500 +_ZN32UnkStruct_027e0ce0_40_Base_7C_0419func_ov031_020dcb60E15UnkParamStruct1 kind:function(arm,size=0xbc) addr:0x020de500 func_ov031_020de5bc kind:function(arm,size=0xa0) addr:0x020de5bc func_ov031_020de65c kind:function(thumb,size=0x32) addr:0x020de65c _ZN15PlayerLinkActor19func_ov031_020dccf0Ev kind:function(thumb,size=0x30) addr:0x020de690 @@ -226,7 +226,7 @@ _ZN29UnkStruct_027e0ce0_40_Base_78C1Ev kind:function(thumb,size=0x6) addr:0x020d _ZN29UnkStruct_027e0ce0_40_Base_78D1Ev kind:function(thumb,size=0x2) addr:0x020de738 func_ov031_020de73c kind:function(arm,size=0x108) addr:0x020de73c func_ov031_020de844 kind:function(arm,size=0x110) addr:0x020de844 -func_ov031_020de954 kind:function(arm,size=0x12c) addr:0x020de954 +_ZN29UnkStruct_027e0ce0_40_Base_7819func_ov031_020dcfb4EPv kind:function(arm,size=0x12c) addr:0x020de954 func_ov031_020dea80 kind:function(arm,size=0x44) addr:0x020dea80 func_ov031_020deac4 kind:function(arm,size=0x80) addr:0x020deac4 func_ov031_020deb44 kind:function(arm,size=0xd0) addr:0x020deb44 @@ -342,7 +342,7 @@ _ZN9ActorBomb19func_ov031_020e20fcEv kind:function(arm,size=0x4) addr:0x020e3ae8 _ZN9ActorBomb19func_ov031_020e2100Ev kind:function(arm,size=0x34) addr:0x020e3aec _ZN9ActorBomb19func_ov031_020e2134Ev kind:function(arm,size=0xec) addr:0x020e3b20 _ZN24ActorBomb_ov031_020e2134D1Ev kind:function(arm,size=0x14) addr:0x020e3c0c -_ZN9ActorBomb8vfunc_2CEi kind:function(arm,size=0x158) addr:0x020e3c20 +_ZN9ActorBomb8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x158) addr:0x020e3c20 _ZN9ActorBomb19func_ov031_020e238cEv kind:function(arm,size=0xe0) addr:0x020e3d78 _ZN9ActorBomb4GrabE15ActorGrabParams kind:function(arm,size=0x40) addr:0x020e3e58 _ZN9ActorBomb4DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0x110) addr:0x020e3e98 @@ -436,7 +436,7 @@ _ZN18ActorItemBoomerang8vfunc_20Ev kind:function(arm,size=0x614) addr:0x020e640c _ZN18ActorItemBoomerang19func_ov031_020e5034Ei kind:function(arm,size=0x1ec) addr:0x020e6a20 _ZN18ActorItemBoomerang19func_ov031_020e5220Ev kind:function(arm,size=0x80) addr:0x020e6c0c _ZN18ActorItemBoomerang19func_ov031_020e52a0Ev kind:function(arm,size=0xb4) addr:0x020e6c8c -_ZN18ActorItemBoomerang8vfunc_2CEi kind:function(arm,size=0x74) addr:0x020e6d40 +_ZN18ActorItemBoomerang8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x74) addr:0x020e6d40 _ZN21ActorItemBoomerang_A08vfunc_10EP5Actor kind:function(arm,size=0x1c) addr:0x020e6db4 _ZN21ActorItemBoomerang_CC8vfunc_10EP5Actor kind:function(arm,size=0x1c) addr:0x020e6dd0 _ZN21ActorItemBoomerang_CC8vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x4c) addr:0x020e6dec @@ -462,7 +462,7 @@ _ZN16ActorItemTornado8SetStateEs kind:function(arm,size=0x118) addr:0x020e75ec _ZN16ActorItemTornado19func_ov031_020e5d18Ei kind:function(arm,size=0x430) addr:0x020e7704 _ZN16ActorItemTornado8vfunc_20Ev kind:function(arm,size=0x10) addr:0x020e7b34 _ZN16ActorItemTornado8vfunc_24Ev kind:function(arm,size=0x44) addr:0x020e7b44 -_ZN16ActorItemTornado8vfunc_2CEi kind:function(arm,size=0x124) addr:0x020e7b88 +_ZN16ActorItemTornado8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x124) addr:0x020e7b88 _ZN16ActorItemTornado19func_ov031_020e62c0Ev kind:function(arm,size=0x54) addr:0x020e7cac _ZN16ActorItemTornado19func_ov031_020e6314Et kind:function(arm,size=0x2c) addr:0x020e7d00 _ZN16ActorItemTornado19func_ov031_020e6340EP7VecFx32ss kind:function(arm,size=0x58) addr:0x020e7d2c @@ -499,7 +499,7 @@ _ZN12ActorUnkSWBM19func_ov031_020e6e84Es kind:function(arm,size=0x74) addr:0x020 _ZN12ActorUnkSWBM8vfunc_20Ev kind:function(arm,size=0x268) addr:0x020e88e4 _ZN12ActorUnkSWBM8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x020e8b4c _ZN12ActorUnkSWBM19func_ov031_020e718cEP7VecFx32P5Mat3pists kind:function(arm,size=0x108) addr:0x020e8b78 -_ZN12ActorUnkSWBM8vfunc_2CEi kind:function(arm,size=0x40) addr:0x020e8c80 +_ZN12ActorUnkSWBM8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x40) addr:0x020e8c80 _ZN15ActorUnkSWBM_94D0Ev kind:function(arm,size=0x1c) addr:0x020e8cc0 _ZN15ActorUnkSWBM_98D0Ev kind:function(arm,size=0x1c) addr:0x020e8cdc _ZN12ActorUnkSWBMD1Ev kind:function(arm,size=0x28) addr:0x020e8cf8 @@ -550,7 +550,7 @@ _ZN12ActorUnkROCK8vfunc_18Ei kind:function(arm,size=0x30) addr:0x020ea368 _ZN12ActorUnkROCK8vfunc_20Ev kind:function(arm,size=0x9c) addr:0x020ea398 _ZN12ActorUnkROCK19func_ov031_020e8a48Es kind:function(arm,size=0x84) addr:0x020ea434 _ZN12ActorUnkROCK19func_ov031_020e8accEv kind:function(arm,size=0x30) addr:0x020ea4b8 -_ZN12ActorUnkROCK8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x020ea4e8 +_ZN12ActorUnkROCK8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0x020ea4e8 _ZN12ActorUnkROCK4GrabE15ActorGrabParams kind:function(arm,size=0x68) addr:0x020ea58c _ZN12ActorUnkROCK4DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0x44) addr:0x020ea5f4 _ZN12ActorUnkROCKD1Ev kind:function(arm,size=0x28) addr:0x020ea638 @@ -594,7 +594,7 @@ _ZN10ActorRupee8SetStateEs kind:function(arm,size=0x54) addr:0x020eb2f0 _ZN10ActorRupee8vfunc_20Ev kind:function(arm,size=0x230) addr:0x020eb344 _ZN10ActorRupee19func_ov031_020e9b88Ev kind:function(arm,size=0x60) addr:0x020eb574 _ZN10ActorRupee19func_ov031_020e9be8Ev kind:function(arm,size=0x44) addr:0x020eb5d4 -_ZN10ActorRupee8vfunc_2CEi kind:function(arm,size=0x128) addr:0x020eb618 +_ZN10ActorRupee8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x128) addr:0x020eb618 _ZN10ActorRupee19func_ov031_020e9d54Ev kind:function(arm,size=0x40) addr:0x020eb740 _ZN10ActorRupee19func_ov031_020e9d94Ev kind:function(arm,size=0xc8) addr:0x020eb780 _ZN10ActorRupee19func_ov031_020e9e5cEv kind:function(arm,size=0x94) addr:0x020eb848 @@ -665,7 +665,7 @@ _ZN12ActorUnkZLSL19func_ov031_020ec0d4Ev kind:function(arm,size=0x58) addr:0x020 _ZN12ActorUnkZLSL19func_ov031_020ec12cEv kind:function(arm,size=0x38) addr:0x020edb18 _ZN12ActorUnkZLSL19func_ov031_020ec164Ev kind:function(arm,size=0xc) addr:0x020edb50 _ZN12ActorUnkZLSL19func_ov031_020ec170Ev kind:function(arm,size=0x64) addr:0x020edb5c -_ZN12ActorUnkZLSL8vfunc_2CEi kind:function(arm,size=0xfc) addr:0x020edbc0 +_ZN12ActorUnkZLSL8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xfc) addr:0x020edbc0 _ZN12ActorUnkZLSL8vfunc_7CEi kind:function(arm,size=0x100) addr:0x020edcbc _ZN12ActorUnkZLSL19func_ov031_020ec3d0Ev kind:function(arm,size=0xcc) addr:0x020eddbc _ZN12ActorUnkZLSL19func_ov031_020ec49cEv kind:function(arm,size=0xb0) addr:0x020ede88 @@ -752,7 +752,7 @@ _ZN10ActorHeart19func_ov031_020ef458Ev kind:function(arm,size=0x50) addr:0x020f0 _ZN10ActorHeart19func_ov031_020ef4a8Ev kind:function(arm,size=0x80) addr:0x020f0e94 _ZN10ActorHeart19func_ov031_020ef528Ev kind:function(arm,size=0x58) addr:0x020f0f14 _ZN10ActorHeart19func_ov031_020ef570Ev kind:function(arm,size=0x78) addr:0x020f0f6c -_ZN10ActorHeart8vfunc_2CEi kind:function(arm,size=0xb0) addr:0x020f0fe4 +_ZN10ActorHeart8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020f0fe4 _ZN10ActorHeart19func_ov031_020ef698Ev kind:function(arm,size=0x60) addr:0x020f1094 _ZN13ActorHeart_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020f10f4 _ZN13ActorHeart_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020f112c @@ -768,7 +768,7 @@ _ZN19ActorProfileUnkRMTGC1Ev kind:function(arm,size=0x28) addr:0x020f1248 _ZN12ActorUnkRMTGC1Ev kind:function(arm,size=0x2c) addr:0x020f1270 _ZN12ActorUnkRMTG8vfunc_18Ei kind:function(arm,size=0xb8) addr:0x020f129c _ZN12ActorUnkRMTG8vfunc_1CEv kind:function(arm,size=0x38) addr:0x020f1354 -_ZN12ActorUnkRMTG8vfunc_2CEi kind:function(arm,size=0x20) addr:0x020f138c +_ZN12ActorUnkRMTG8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020f138c _ZN12ActorUnkRMTGD1Ev kind:function(arm,size=0x20) addr:0x020f13ac _ZN12ActorUnkRMTGD0Ev kind:function(arm,size=0x28) addr:0x020f13cc _ZN19ActorProfileUnkRMTGD1Ev kind:function(arm,size=0x14) addr:0x020f13f4 @@ -830,7 +830,7 @@ _ZN26ModelRender_ov000_020b198cD1Ev kind:function(arm,size=0x14) addr:0x020f26ec _ZN8ActorPot8vfunc_18Ei kind:function(arm,size=0x28) addr:0x020f2700 _ZN8ActorPot8vfunc_5CEs kind:function(arm,size=0x54) addr:0x020f2728 _ZN8ActorPot8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020f277c -_ZN8ActorPot8vfunc_2CEi kind:function(arm,size=0x30) addr:0x020f27b4 +_ZN8ActorPot8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x020f27b4 _ZN8ActorPot19func_ov031_020f0de8Ev kind:function(arm,size=0xc) addr:0x020f27e4 _ZN8ActorPot19func_ov031_020f0df4Ev kind:function(arm,size=0xc) addr:0x020f27f0 _ZN8ActorPot19func_ov031_020f0e00Ev kind:function(arm,size=0xc) addr:0x020f27fc @@ -854,7 +854,7 @@ _ZN26ModelRender_ov031_0211578cD1Ev kind:function(arm,size=0x14) addr:0x020f2abc _ZN15ActorItemFlower8vfunc_18Ei kind:function(arm,size=0x28) addr:0x020f2ad0 _ZN15ActorItemFlower8vfunc_5CEs kind:function(arm,size=0x44) addr:0x020f2af8 _ZN15ActorItemFlower8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020f2b3c -_ZN15ActorItemFlower8vfunc_2CEi kind:function(arm,size=0x30) addr:0x020f2b74 +_ZN15ActorItemFlower8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x020f2b74 _ZN15ActorItemFlower19func_ov031_020f11a8Ev kind:function(arm,size=0xc) addr:0x020f2ba4 _ZN15ActorItemFlower19func_ov031_020f11b4Ev kind:function(arm,size=0xc) addr:0x020f2bb0 _ZN15ActorItemFlower19func_ov031_020f11c0Ev kind:function(arm,size=0xc) addr:0x020f2bbc @@ -903,7 +903,7 @@ _ZN14ActorShotArrow19func_ov031_020f2270Ev kind:function(arm,size=0x10) addr:0x0 _ZN14ActorShotArrow19func_ov031_020f2280Ev kind:function(arm,size=0x1c) addr:0x020f3c7c _ZN14ActorShotArrow19func_ov031_020f229cEv kind:function(arm,size=0x38) addr:0x020f3c98 _ZN14ActorShotArrow19func_ov031_020f22d4EP5Mat3pP7VecFx32 kind:function(arm,size=0x3c) addr:0x020f3cd0 -_ZN14ActorShotArrow8vfunc_2CEi kind:function(arm,size=0x344) addr:0x020f3d0c +_ZN14ActorShotArrow8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x344) addr:0x020f3d0c _ZN14ActorShotArrow19func_ov031_020f2654EP5Mat3p kind:function(arm,size=0x140) addr:0x020f4050 _ZN14ActorShotArrow19func_ov031_020f2794Es kind:function(arm,size=0x118) addr:0x020f4190 _ZN14ActorShotArrow19func_ov031_020f28acEv kind:function(arm,size=0x2e0) addr:0x020f42a8 @@ -997,7 +997,7 @@ _ZN19ActorProfileUnkNTTZC1Ev kind:function(arm,size=0x28) addr:0x020f7bd8 _ZN12ActorUnkNTTZC1Ev kind:function(arm,size=0x30) addr:0x020f7c00 _ZN12ActorUnkNTTZ8vfunc_18Ei kind:function(arm,size=0x8) addr:0x020f7c30 _ZN12ActorUnkNTTZ8vfunc_20Ev kind:function(arm,size=0x4) addr:0x020f7c38 -_ZN12ActorUnkNTTZ8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020f7c3c +_ZN12ActorUnkNTTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020f7c3c _ZN12ActorUnkNTTZ19func_ov031_020f61a0Ev kind:function(arm,size=0x50) addr:0x020f7c40 _ZN12ActorUnkNTTZ19func_ov031_020f61f0Ev kind:function(arm,size=0x50) addr:0x020f7c90 _ZN12ActorUnkNTTZD1Ev kind:function(arm,size=0x14) addr:0x020f7ce0 @@ -1028,7 +1028,7 @@ _ZN12ActorUnkTGTZ19func_ov031_020f6e5cE8ActorRef kind:function(arm,size=0x4c) ad _ZN12ActorUnkTGTZ19func_ov031_020f6ea8EP8ActorReftPK7VecFx32st kind:function(arm,size=0x78) addr:0x020f8918 _ZN12ActorUnkTGTZ19func_ov031_020f6f20Ei kind:function(arm,size=0x22c) addr:0x020f8990 _ZN12ActorUnkTGTZ8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x138) addr:0x020f8bbc -_ZN12ActorUnkTGTZ8vfunc_2CEi kind:function(arm,size=0xb0) addr:0x020f8cf4 +_ZN12ActorUnkTGTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020f8cf4 _ZN12ActorUnkTGTZ19func_ov031_020f7358Ev kind:function(arm,size=0x8c) addr:0x020f8da4 _ZN12ActorUnkTGTZ19func_ov031_020f73e4Ev kind:function(arm,size=0xc) addr:0x020f8e30 _ZN12ActorUnkTGTZ19func_ov031_020f73f0Ev kind:function(arm,size=0xc) addr:0x020f8e3c @@ -1040,7 +1040,7 @@ func_ov031_020f8ec4 kind:function(arm,size=0x40) addr:0x020f8ec4 func_ov031_020f8f04 kind:function(arm,size=0x38) addr:0x020f8f04 _ZN24UnkStruct_ov031_02114870C2Ev kind:function(arm,size=0x2c) addr:0x020f8f3c _ZN24UnkStruct_ov031_021148708vfunc_18Ei kind:function(arm,size=0x3c) addr:0x020f8f68 -_ZN24UnkStruct_ov031_021148708vfunc_2CEi kind:function(arm,size=0x20) addr:0x020f8fa4 +_ZN24UnkStruct_ov031_021148708vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020f8fa4 _ZN24UnkStruct_ov031_021148708vfunc_54Ev kind:function(arm,size=0x8) addr:0x020f8fc4 func_ov031_020f8fcc kind:function(arm,size=0x50) addr:0x020f8fcc func_ov031_020f901c kind:function(arm,size=0x8) addr:0x020f901c @@ -1071,7 +1071,7 @@ _ZN19ActorProfileUnkSWCHC1Ev kind:function(arm,size=0x28) addr:0x020f94f8 _ZN12ActorUnkSWCHC1Ev kind:function(arm,size=0x30) addr:0x020f9520 _ZN12ActorUnkSWCH8vfunc_18Ei kind:function(arm,size=0x14) addr:0x020f9550 _ZN12ActorUnkSWCH8vfunc_20Ev kind:function(arm,size=0x68) addr:0x020f9564 -_ZN12ActorUnkSWCH8vfunc_2CEi kind:function(arm,size=0x10) addr:0x020f95cc +_ZN12ActorUnkSWCH8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x10) addr:0x020f95cc _ZN12ActorUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f95dc _ZN12ActorUnkSWCHD0Ev kind:function(arm,size=0x1c) addr:0x020f95f0 _ZN19ActorProfileUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f960c @@ -1119,7 +1119,7 @@ _ZN17ActorRollingStone8vfunc_18Ei kind:function(arm,size=0xf0) addr:0x020fa0e0 _ZN17ActorRollingStone8vfunc_20Ev kind:function(arm,size=0x98) addr:0x020fa1d0 _ZN17ActorRollingStone8SetStateEs kind:function(arm,size=0x5c) addr:0x020fa268 _ZN17ActorRollingStone19func_ov031_020f8880Ev kind:function(arm,size=0xc8) addr:0x020fa2c4 -_ZN17ActorRollingStone8vfunc_2CEi kind:function(arm,size=0xac) addr:0x020fa38c +_ZN17ActorRollingStone8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xac) addr:0x020fa38c _ZN17ActorRollingStone19func_ov031_020f89f4Ev kind:function(arm,size=0x10) addr:0x020fa438 _ZN17ActorRollingStone19func_ov031_020f8a04Ev kind:function(arm,size=0x28) addr:0x020fa448 _ZN17ActorRollingStone19func_ov031_020f8a2cEv kind:function(arm,size=0xc) addr:0x020fa470 @@ -1187,7 +1187,7 @@ _ZN13ActorItemDrop19func_ov031_020fa668Ev kind:function(arm,size=0x10) addr:0x02 _ZN13ActorItemDrop19func_ov031_020fa678Ev kind:function(arm,size=0x50) addr:0x020fc0d0 _ZN13ActorItemDrop19func_ov031_020fa6c8Ev kind:function(arm,size=0x64) addr:0x020fc120 _ZN13ActorItemDrop19func_ov031_020fa72cEv kind:function(arm,size=0x110) addr:0x020fc184 -_ZN13ActorItemDrop8vfunc_2CEi kind:function(arm,size=0xc4) addr:0x020fc294 +_ZN13ActorItemDrop8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc4) addr:0x020fc294 _ZN13ActorItemDrop19func_ov031_020fa900Ev kind:function(arm,size=0xf8) addr:0x020fc358 _ZN16ActorItemDrop_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020fc450 _ZN16ActorItemDrop_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020fc488 @@ -1249,7 +1249,7 @@ _ZN12ActorUnkEFSB8vfunc_18Ei kind:function(arm,size=0xb8) addr:0x020fd06c _ZN12ActorUnkEFSB8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020fd124 _ZN12ActorUnkEFSB8vfunc_24Ev kind:function(arm,size=0x14) addr:0x020fd15c _ZN12ActorUnkEFSB8vfunc_54Ei kind:function(arm,size=0x8) addr:0x020fd170 -_ZN12ActorUnkEFSB8vfunc_2CEi kind:function(arm,size=0x70) addr:0x020fd178 +_ZN12ActorUnkEFSB8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x70) addr:0x020fd178 _ZN12ActorUnkEFSBD1Ev kind:function(arm,size=0x30) addr:0x020fd1e8 _ZN12ActorUnkEFSBD0Ev kind:function(arm,size=0x38) addr:0x020fd218 _ZN19ActorProfileUnkEFSBD1Ev kind:function(arm,size=0x14) addr:0x020fd250 @@ -1264,7 +1264,7 @@ _ZN12ActorUnkNFSP19func_ov031_020fb994Ev kind:function(arm,size=0x20) addr:0x020 _ZN12ActorUnkNFSP19func_ov031_020fb9b4Ev kind:function(arm,size=0xa4) addr:0x020fd40c _ZN12ActorUnkNFSP19func_ov031_020fba60Ev kind:function(arm,size=0x84) addr:0x020fd4b0 _ZN12ActorUnkNFSP8vfunc_54Ei kind:function(arm,size=0x9c) addr:0x020fd534 -_ZN12ActorUnkNFSP8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020fd5d0 +_ZN12ActorUnkNFSP8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020fd5d0 _ZN12ActorUnkNFSP19func_ov031_020fbb8cEv kind:function(arm,size=0x14) addr:0x020fd5d4 _ZN12ActorUnkNFSP19func_ov031_020fbba0E8ActorRef kind:function(arm,size=0x40) addr:0x020fd5e8 _ZN12ActorUnkNFSP19func_ov031_020fbbe0Ev kind:function(arm,size=0x24) addr:0x020fd628 @@ -1288,7 +1288,7 @@ _ZN17MapObjectDoorBase8vfunc_48Ev kind:function(arm,size=0x4) addr:0x020fe598 _ZN17MapObjectDoorBase8vfunc_64Ev kind:function(arm,size=0xc) addr:0x020fe59c _ZN17MapObjectDoorBase8vfunc_68Ev kind:function(arm,size=0x10) addr:0x020fe5a8 _ZN17MapObjectDoorBase8vfunc_6CEv kind:function(arm,size=0x8) addr:0x020fe5b8 -_ZN17MapObjectDoorBase19func_ov031_020fcb78EPcc kind:function(arm,size=0x180) addr:0x020fe5c0 +_ZN17MapObjectDoorBase19func_ov031_020fcb78EPc kind:function(arm,size=0x180) addr:0x020fe5c0 _ZN17MapObjectDoorBase8vfunc_74Ev kind:function(arm,size=0x4) addr:0x020fe740 _ZN17MapObjectDoorBase8vfunc_78Ev kind:function(arm,size=0x4) addr:0x020fe744 _ZN17MapObjectDoorBase8vfunc_7CEv kind:function(arm,size=0x10) addr:0x020fe748 @@ -1326,8 +1326,8 @@ _ZN24MapObjectDoorDangerSpawn8vfunc_64Ev kind:function(arm,size=0xbc) addr:0x020 _ZN24MapObjectDoorDangerSpawn8vfunc_68Ev kind:function(arm,size=0xac) addr:0x020ff76c _ZN24MapObjectDoorDangerSpawn8vfunc_6CEv kind:function(arm,size=0x158) addr:0x020ff818 _ZN24MapObjectDoorDangerSpawn19func_ov031_020fdec8Ev kind:function(arm,size=0xf8) addr:0x020ff970 -_ZN24MapObjectDoorDangerSpawn8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020ffa68 -_ZN24MapObjectDoorDangerSpawn8vfunc_14Ev kind:function(arm,size=0x80) addr:0x020ffa74 +_ZN24MapObjectDoorDangerSpawn8vfunc_18EPc kind:function(arm,size=0xc) addr:0x020ffa68 +_ZN24MapObjectDoorDangerSpawn8vfunc_14Ei kind:function(arm,size=0x80) addr:0x020ffa74 _ZN24MapObjectDoorDangerSpawn9vfunc2_10Ev kind:function(arm,size=0x84) addr:0x020ffaf4 _ZN24MapObjectDoorDangerSpawn8vfunc_74Ev kind:function(arm,size=0x15c) addr:0x020ffb78 _ZN24MapObjectDoorDangerSpawn8vfunc_7CEv kind:function(arm,size=0x24) addr:0x020ffcd4 @@ -1350,8 +1350,8 @@ _ZN23MapObjectProfileDoorKeyC1Ev kind:function(arm,size=0x54) addr:0x0210020c _ZN16MapObjectDoorKeyC1Ev kind:function(arm,size=0xb4) addr:0x02100260 _ZN16MapObjectDoorKey8vfunc_00Ev kind:function(arm,size=0x1c) addr:0x02100314 _ZN16MapObjectDoorKey8vfunc_08Ev kind:function(arm,size=0x18) addr:0x02100330 -_ZN16MapObjectDoorKey8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x02100348 -_ZN16MapObjectDoorKey8vfunc_14Ev kind:function(arm,size=0x14c) addr:0x02100354 +_ZN16MapObjectDoorKey8vfunc_18EPc kind:function(arm,size=0xc) addr:0x02100348 +_ZN16MapObjectDoorKey8vfunc_14Ei kind:function(arm,size=0x14c) addr:0x02100354 _ZN16MapObjectDoorKey8vfunc_5CEsi kind:function(arm,size=0x90) addr:0x021004a0 _ZN16MapObjectDoorKey19func_ov031_020fea88Ev kind:function(arm,size=0x34) addr:0x02100530 _ZN16MapObjectDoorKey8vfunc_28Eiii kind:function(arm,size=0x90) addr:0x02100564 @@ -1377,8 +1377,8 @@ _ZN19MapObjectDoorSwitch8vfunc_00Ev kind:function(arm,size=0x128) addr:0x02100a7 _ZN19MapObjectDoorSwitch8vfunc_08Ev kind:function(arm,size=0x84) addr:0x02100ba4 _ZN19MapObjectDoorSwitch8vfunc_64Ev kind:function(arm,size=0x10) addr:0x02100c28 _ZN19MapObjectDoorSwitch8vfunc_6CEv kind:function(arm,size=0x20) addr:0x02100c38 -_ZN19MapObjectDoorSwitch8vfunc_14Ev kind:function(arm,size=0x80) addr:0x02100c58 -_ZN19MapObjectDoorSwitch8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x02100cd8 +_ZN19MapObjectDoorSwitch8vfunc_14Ei kind:function(arm,size=0x80) addr:0x02100c58 +_ZN19MapObjectDoorSwitch8vfunc_18EPc kind:function(arm,size=0xc) addr:0x02100cd8 _ZN19MapObjectDoorSwitch8vfunc_74Ev kind:function(arm,size=0xcc) addr:0x02100ce4 _ZN19MapObjectDoorSwitch8GetModelEv kind:function(arm,size=0x50) addr:0x02100db0 _ZN19MapObjectDoorSwitch8vfunc_50Ev kind:function(arm,size=0xec) addr:0x02100e00 @@ -1399,8 +1399,8 @@ _ZN18MapObjectDoorClickC1Ev kind:function(arm,size=0x88) addr:0x02101368 _ZN18MapObjectDoorClick9vfunc2_1CEi kind:function(arm,size=0x14) addr:0x021013f0 _ZN18MapObjectDoorClick8vfunc_00Ev kind:function(arm,size=0x100) addr:0x02101404 _ZN18MapObjectDoorClick8vfunc_08Ev kind:function(arm,size=0x3d0) addr:0x02101504 -_ZN18MapObjectDoorClick8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x021018d4 -_ZN18MapObjectDoorClick8vfunc_14Ev kind:function(arm,size=0x14c) addr:0x021018e0 +_ZN18MapObjectDoorClick8vfunc_18EPc kind:function(arm,size=0xc) addr:0x021018d4 +_ZN18MapObjectDoorClick8vfunc_14Ei kind:function(arm,size=0x14c) addr:0x021018e0 _ZN18MapObjectDoorClick8vfunc_5CEsi kind:function(arm,size=0xf8) addr:0x02101a2c _ZN18MapObjectDoorClick9vfunc2_14Ev kind:function(arm,size=0x8) addr:0x02101b24 _ZN18MapObjectDoorClick19func_ov031_020ffde4Ev kind:function(arm,size=0x38) addr:0x02101b2c @@ -1475,7 +1475,7 @@ _ZN14MapObjectGrassC2Ev kind:function(arm,size=0x48) addr:0x02102e28 _ZN14MapObjectGrassC1Ev kind:function(arm,size=0x48) addr:0x02102e70 _ZN14MapObjectGrass8vfunc_00Ev kind:function(arm,size=0x31c) addr:0x02102eb8 _ZN14MapObjectGrass8vfunc_08Ev kind:function(arm,size=0x78) addr:0x021031d4 -_ZN14MapObjectGrass8vfunc_14Ev kind:function(arm,size=0x74) addr:0x0210324c +_ZN14MapObjectGrass8vfunc_14Ei kind:function(arm,size=0x74) addr:0x0210324c _ZN14MapObjectGrass8vfunc_38Esi kind:function(arm,size=0x13c) addr:0x021032c0 _ZN14MapObjectGrass19func_ov031_021016b4Ev kind:function(arm,size=0x88) addr:0x021033fc _ZN14MapObjectGrass8vfunc_3CEP7VecFx32 kind:function(arm,size=0x3c) addr:0x02103484 @@ -1500,7 +1500,7 @@ _ZN16MapObjectUnkSWHT8vfunc_00Ev kind:function(arm,size=0xf0) addr:0x02103a30 _ZN16MapObjectUnkSWHT19func_ov031_02101dd8Ev kind:function(arm,size=0x44) addr:0x02103b20 _ZN16MapObjectUnkSWHT8vfunc_08Ev kind:function(arm,size=0x16c) addr:0x02103b64 _ZN16MapObjectUnkSWHT8vfunc_0CEv kind:function(arm,size=0xc) addr:0x02103cd0 -_ZN16MapObjectUnkSWHT8vfunc_14Ev kind:function(arm,size=0x20) addr:0x02103cdc +_ZN16MapObjectUnkSWHT8vfunc_14Ei kind:function(arm,size=0x20) addr:0x02103cdc _ZN16MapObjectUnkSWHT8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x138) addr:0x02103cfc _ZN16MapObjectUnkSWHT19func_ov031_021020ecEv kind:function(arm,size=0xd4) addr:0x02103e34 _ZN16MapObjectUnkSWHT19func_ov031_021021c0Esi kind:function(arm,size=0x204) addr:0x02103f08 @@ -1516,7 +1516,7 @@ _ZN19MapObjectBombFlower8vfunc_58Ev kind:function(arm,size=0x10) addr:0x02104474 _ZN19MapObjectBombFlower19func_ov031_02102728Ei kind:function(arm,size=0x7c) addr:0x02104484 _ZN19MapObjectBombFlower8vfunc_08Ev kind:function(arm,size=0xf0) addr:0x02104500 _ZN19MapObjectBombFlower8SetStateEsi kind:function(arm,size=0x15c) addr:0x021045f0 -_ZN19MapObjectBombFlower8vfunc_14Ev kind:function(arm,size=0x50) addr:0x0210474c +_ZN19MapObjectBombFlower8vfunc_14Ei kind:function(arm,size=0x50) addr:0x0210474c _ZN19MapObjectBombFlower8vfunc_38Ev kind:function(arm,size=0x98) addr:0x0210479c _ZN19MapObjectBombFlower8vfunc_28Eiii kind:function(arm,size=0x1c) addr:0x02104834 _ZN19MapObjectBombFlower8vfunc_50EP8ActorRefP17MapObjectPot_Base kind:function(arm,size=0x70) addr:0x02104850 @@ -1554,8 +1554,8 @@ _ZN18MapObjectChestBase19func_ov031_021037d0Ev kind:function(arm,size=0x94) addr _ZN18MapObjectChestBase19func_ov031_02103864Ev kind:function(arm,size=0x14) addr:0x021055c0 _ZN18MapObjectChestBase19func_ov031_02103878Ev kind:function(arm,size=0x1c) addr:0x021055d4 _ZN18MapObjectChestBase8vfunc_38Eii kind:function(arm,size=0x3b4) addr:0x021055f0 -_ZN18MapObjectChestBase8vfunc_18EPcc kind:function(arm,size=0xe8) addr:0x021059a4 -_ZN18MapObjectChestBase8vfunc_14Ev kind:function(arm,size=0x108) addr:0x02105a8c +_ZN18MapObjectChestBase8vfunc_18EPc kind:function(arm,size=0xe8) addr:0x021059a4 +_ZN18MapObjectChestBase8vfunc_14Ei kind:function(arm,size=0x108) addr:0x02105a8c _ZN18MapObjectChestBase8vfunc_3CEv kind:function(arm,size=0x100) addr:0x02105b94 _ZN18MapObjectChestBase8vfunc_40Ev kind:function(arm,size=0x8) addr:0x02105c94 _ZN18MapObjectChestBase8vfunc_44Ev kind:function(arm,size=0x8) addr:0x02105c9c @@ -1627,7 +1627,7 @@ _ZN12MapObjectPotC1Ev kind:function(arm,size=0x9c) addr:0x02106d48 _ZN12MapObjectPot8vfunc_04Ev kind:function(arm,size=0x2c) addr:0x02106de4 _ZN12MapObjectPot8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x120) addr:0x02106e10 _ZN12MapObjectPot8vfunc_48Ev kind:function(arm,size=0xf8) addr:0x02106f30 -_ZN12MapObjectPot8vfunc_14Ev kind:function(arm,size=0x44) addr:0x02107028 +_ZN12MapObjectPot8vfunc_14Ei kind:function(arm,size=0x44) addr:0x02107028 _ZN12MapObjectPot8vfunc_54Ev kind:function(arm,size=0x38) addr:0x0210706c _ZN12MapObjectPot8vfunc_24EP9MapObject7VecFx32 kind:function(arm,size=0x6c) addr:0x021070a4 _ZN12MapObjectPot8vfunc_3CEv kind:function(arm,size=0x48) addr:0x02107110 @@ -1673,7 +1673,7 @@ _ZN16MapObjectUnkSKDI19func_ov031_0210643cEi kind:function(arm,size=0x23c) addr: _ZN16MapObjectUnkSKDI19func_ov031_02106678Esi kind:function(arm,size=0x3f8) addr:0x021083d4 _ZN16MapObjectUnkSKDI19func_ov031_02106a70Ev kind:function(arm,size=0x14) addr:0x021087cc _ZN16MapObjectUnkSKDI8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x1f4) addr:0x021087e0 -_ZN16MapObjectUnkSKDI8vfunc_14Ev kind:function(arm,size=0x20) addr:0x021089d4 +_ZN16MapObjectUnkSKDI8vfunc_14Ei kind:function(arm,size=0x20) addr:0x021089d4 _ZN16MapObjectUnkSKDI8vfunc_38Ev kind:function(arm,size=0x8) addr:0x021089f4 _ZN16MapObjectUnkSKDI8vfunc_3CEv kind:function(arm,size=0x8) addr:0x021089fc _ZN16MapObjectUnkSKDI8vfunc_40Ev kind:function(arm,size=0x8) addr:0x02108a04 diff --git a/config/jp/arm9/overlays/ov032/symbols.txt b/config/jp/arm9/overlays/ov032/symbols.txt index 8e412f09..c1d4d731 100644 --- a/config/jp/arm9/overlays/ov032/symbols.txt +++ b/config/jp/arm9/overlays/ov032/symbols.txt @@ -11,7 +11,7 @@ _ZN11ActorSpinut8vfunc_1CEv kind:function(arm,size=0x84) addr:0x0211b1f8 _ZN11ActorSpinut19func_ov032_021194dcEs kind:function(arm,size=0x60) addr:0x0211b27c _ZN11ActorSpinut8SetStateEs kind:function(arm,size=0x48) addr:0x0211b2dc _ZN11ActorSpinut8vfunc_20Ev kind:function(arm,size=0x358) addr:0x0211b324 -_ZN11ActorSpinut8vfunc_2CEi kind:function(arm,size=0xb4) addr:0x0211b67c +_ZN11ActorSpinut8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb4) addr:0x0211b67c _ZN11ActorSpinut19func_ov032_02119990Ev kind:function(arm,size=0x7c) addr:0x0211b730 _ZN11ActorSpinut19func_ov032_02119a0cEv kind:function(arm,size=0x1dc) addr:0x0211b7ac _ZN11ActorSpinut19func_ov032_02119be8Ev kind:function(arm,size=0x98) addr:0x0211b988 @@ -43,7 +43,7 @@ _ZN11ActorSpinut19func_ov032_0211b17cEv kind:function(arm,size=0x14) addr:0x0211 _ZN11ActorSpinut19func_ov032_0211b190Eii kind:function(arm,size=0x50) addr:0x0211cf30 _ZN11ActorSpinut19func_ov032_0211b1e0Ev kind:function(arm,size=0xb8) addr:0x0211cf80 _ZN11ActorSpinut19func_ov032_0211b298Ev kind:function(arm,size=0xe4) addr:0x0211d038 -_ZN11ActorSpinut19func_ov032_0211b37cEPS_t kind:function(arm,size=0x34) addr:0x0211d11c +_ZN11ActorSpinut19func_ov032_0211b37cEP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x34) addr:0x0211d11c _ZN11ActorSpinut19func_ov032_0211b3b0Ev kind:function(arm,size=0x58) addr:0x0211d150 _ZN11ActorSpinut8vfunc_54Ei kind:function(arm,size=0x168) addr:0x0211d1a8 _ZN15ActorSpinut_268C1Ev kind:function(arm,size=0x30) addr:0x0211d310 @@ -68,7 +68,7 @@ _ZN18ActorFleeingSpinut8vfunc_18Ei kind:function(arm,size=0x1c) addr:0x0211d728 _ZN18ActorFleeingSpinut8SetStateEs kind:function(arm,size=0x68) addr:0x0211d744 _ZN18ActorFleeingSpinut8vfunc_20Ev kind:function(arm,size=0x268) addr:0x0211d7ac _ZN18ActorFleeingSpinut8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x104) addr:0x0211da14 -_ZN18ActorFleeingSpinut8vfunc_2CEi kind:function(arm,size=0x8c) addr:0x0211db18 +_ZN18ActorFleeingSpinut8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x8c) addr:0x0211db18 _ZN18ActorFleeingSpinut19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211dba4 _ZN18ActorFleeingSpinut19func_ov032_0211be30Ev kind:function(arm,size=0x78) addr:0x0211dbd0 _ZN18ActorFleeingSpinut19func_ov032_0211bea8Ev kind:function(arm,size=0xdc) addr:0x0211dc48 @@ -133,7 +133,7 @@ _ZN10ActorKeese19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x02120 _ZN10ActorKeese8SetStateEs kind:function(arm,size=0x48) addr:0x021201c0 _ZN10ActorKeese19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x02120208 _ZN10ActorKeese8vfunc_20Ev kind:function(arm,size=0x1b8) addr:0x02120518 -_ZN10ActorKeese8vfunc_2CEi kind:function(arm,size=0xbc) addr:0x021206d0 +_ZN10ActorKeese8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xbc) addr:0x021206d0 _ZN10ActorKeese19func_ov032_0211e9ecEv kind:function(arm,size=0x174) addr:0x0212078c _ZN10ActorKeese19func_ov032_0211eb60Ev kind:function(arm,size=0x188) addr:0x02120900 _ZN10ActorKeese19func_ov032_0211ece8Ev kind:function(arm,size=0x174) addr:0x02120a88 @@ -214,7 +214,7 @@ _ZN16MapObjectUnkSWSW8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x278) _ZN16MapObjectUnkSWSW8vfunc_38Ev kind:function(arm,size=0x48) addr:0x02123b20 _ZN16MapObjectUnkSWSW19func_ov032_02121b90Ev kind:function(arm,size=0x88) addr:0x02123b68 _ZN16MapObjectUnkSWSW8vfunc_3CEi kind:function(arm,size=0x158) addr:0x02123bf0 -_ZN16MapObjectUnkSWSW8vfunc_14Ev kind:function(arm,size=0x58) addr:0x02123d48 +_ZN16MapObjectUnkSWSW8vfunc_14Ei kind:function(arm,size=0x58) addr:0x02123d48 _ZN16MapObjectUnkSWSW19func_ov032_02121dc8EP7VecFx32 kind:function(arm,size=0x90) addr:0x02123da0 _ZN19MapObjectUnkSWSW_40D0Ev kind:function(arm,size=0x1c) addr:0x02123e30 _ZN16MapObjectUnkSWSWD1Ev kind:function(arm,size=0x20) addr:0x02123e4c diff --git a/config/jp/arm9/overlays/ov063/symbols.txt b/config/jp/arm9/overlays/ov063/symbols.txt index c9743beb..0e886611 100644 --- a/config/jp/arm9/overlays/ov063/symbols.txt +++ b/config/jp/arm9/overlays/ov063/symbols.txt @@ -14,7 +14,7 @@ _ZN12ActorUnkCANS19func_ov063_02158448Ei kind:function(arm,size=0x48) addr:0x021 _ZN12ActorUnkCANS19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x0215a1d0 _ZN12ActorUnkCANS8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x0215a204 _ZN12ActorUnkCANS8vfunc_20Ev kind:function(arm,size=0x53c) addr:0x0215a230 -_ZN12ActorUnkCANS8vfunc_2CEi kind:function(arm,size=0xe0) addr:0x0215a76c +_ZN12ActorUnkCANS8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xe0) addr:0x0215a76c _ZN12ActorUnkCANS19func_ov063_02158b0cEv kind:function(arm,size=0x28) addr:0x0215a84c _ZN12ActorUnkCANS19func_ov063_02158b34Ev kind:function(arm,size=0x64) addr:0x0215a874 _ZN12ActorUnkCANS19func_ov063_02158b98Ev kind:function(arm,size=0x1a8) addr:0x0215a8d8 @@ -92,7 +92,7 @@ _ZN12ActorUnkCASE19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x021 _ZN12ActorUnkCASE19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215d060 _ZN12ActorUnkCASE8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215d064 _ZN12ActorUnkCASE8vfunc_20Ev kind:function(arm,size=0x338) addr:0x0215d088 -_ZN12ActorUnkCASE8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x0215d3c0 +_ZN12ActorUnkCASE8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0x0215d3c0 _ZN12ActorUnkCASE19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215d464 _ZN12ActorUnkCASE19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215d4c0 _ZN12ActorUnkCASE8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215d568 @@ -110,7 +110,7 @@ _ZN15ActorUnkRMSBase8vfunc_18Ei kind:function(arm,size=0x54) addr:0x0215d8c8 _ZN15ActorUnkRMSBase8vfunc_1CEv kind:function(arm,size=0x4) addr:0x0215d91c _ZN15ActorUnkRMSBase8vfunc_20Ev kind:function(arm,size=0x4) addr:0x0215d920 _ZN15ActorUnkRMSBase8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215d924 -_ZN15ActorUnkRMSBase8vfunc_2CEi kind:function(arm,size=0x30) addr:0x0215d938 +_ZN15ActorUnkRMSBase8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x0215d938 _ZN15ActorUnkRMSBaseD1Ev kind:function(arm,size=0x28) addr:0x0215d968 _ZN15ActorUnkRMSBaseD0Ev kind:function(arm,size=0x30) addr:0x0215d990 _ZN19ActorProfileUnkRMSV10GetProfileEv kind:function(arm,size=0xc) addr:0x0215d9c0 @@ -256,7 +256,7 @@ _ZN24UnkStruct_ov063_02163784D1Ev kind:function(arm,size=0x14) addr:0x021611a8 _ZN12ActorUnkRBLS8vfunc_18Ei kind:function(arm,size=0x8c) addr:0x021611bc _ZN12ActorUnkRBLS8vfunc_20Ev kind:function(arm,size=0x14) addr:0x02161248 _ZN12ActorUnkRBLS8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0216125c -_ZN12ActorUnkRBLS8vfunc_2CEi kind:function(arm,size=0x20) addr:0x02161270 +_ZN12ActorUnkRBLS8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x02161270 _ZN24UnkStruct_ov063_02163784D0Ev kind:function(arm,size=0x1c) addr:0x02161290 _ZN12ActorUnkRBLSD1Ev kind:function(arm,size=0x28) addr:0x021612ac _ZN12ActorUnkRBLSD0Ev kind:function(arm,size=0x30) addr:0x021612d4 @@ -270,7 +270,7 @@ _ZN16MapObjectUnkSTAT8vfunc_08Ev kind:function(arm,size=0x88) addr:0x021614e4 _ZN16MapObjectUnkSTAT8vfunc_0CEv kind:function(arm,size=0x14) addr:0x0216156c _ZN16MapObjectUnkSTAT19func_ov063_0215f7acEv kind:function(arm,size=0x494) addr:0x02161580 _ZN16MapObjectUnkSTAT19func_ov063_0215fc40Ei kind:function(arm,size=0x48) addr:0x02161a14 -_ZN16MapObjectUnkSTAT8vfunc_14Ev kind:function(arm,size=0x58) addr:0x02161a5c +_ZN16MapObjectUnkSTAT8vfunc_14Ei kind:function(arm,size=0x58) addr:0x02161a5c _ZN16MapObjectUnkSTAT19func_ov063_0215fce0Ev kind:function(arm,size=0x58) addr:0x02161ab4 _ZN16MapObjectUnkSTATD1Ev kind:function(arm,size=0x20) addr:0x02161b0c _ZN16MapObjectUnkSTATD0Ev kind:function(arm,size=0x28) addr:0x02161b2c @@ -315,7 +315,7 @@ _ZN16MapObjectUnkLTRW8vfunc_08Ev kind:function(arm,size=0x1c) addr:0x02162ae0 _ZN16MapObjectUnkLTRW8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x34) addr:0x02162afc _ZN16MapObjectUnkLTRW19func_ov063_02160d18Ei kind:function(arm,size=0x1c) addr:0x02162b30 _ZN16MapObjectUnkLTRW8vfunc_28Eiii kind:function(arm,size=0xc4) addr:0x02162b4c -_ZN16MapObjectUnkLTRW8vfunc_14Ev kind:function(arm,size=0x20) addr:0x02162c10 +_ZN16MapObjectUnkLTRW8vfunc_14Ei kind:function(arm,size=0x20) addr:0x02162c10 _ZN24UnkStruct_ov063_021639e49vfunc2_04Ev kind:function(arm,size=0x24) addr:0x02162c30 _ZN16MapObjectUnkLTRWD1Ev kind:function(arm,size=0x20) addr:0x02162c54 _ZN16MapObjectUnkLTRWD0Ev kind:function(arm,size=0x28) addr:0x02162c74 @@ -330,7 +330,7 @@ _ZN16MapObjectUnkMTJR8vfunc_0CEv kind:function(arm,size=0x14) addr:0x02162fc4 _ZN16MapObjectUnkMTJR8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x94) addr:0x02162fd8 _ZN16MapObjectUnkMTJR19func_ov063_02161254Ei kind:function(arm,size=0x34) addr:0x0216306c _ZN16MapObjectUnkMTJR19func_ov063_02161288Ev kind:function(arm,size=0xf8) addr:0x021630a0 -_ZN16MapObjectUnkMTJR8vfunc_14Ev kind:function(arm,size=0x44) addr:0x02163198 +_ZN16MapObjectUnkMTJR8vfunc_14Ei kind:function(arm,size=0x44) addr:0x02163198 _ZN16MapObjectUnkMTJRD1Ev kind:function(arm,size=0x28) addr:0x021631dc _ZN16MapObjectUnkMTJRD0Ev kind:function(arm,size=0x30) addr:0x02163204 _ZN23MapObjectProfileUnkMTJRD1Ev kind:function(arm,size=0x14) addr:0x02163234 diff --git a/config/jp/arm9/overlays/ov071/symbols.txt b/config/jp/arm9/overlays/ov071/symbols.txt index 2ec697d8..5411ab15 100644 --- a/config/jp/arm9/overlays/ov071/symbols.txt +++ b/config/jp/arm9/overlays/ov071/symbols.txt @@ -270,7 +270,7 @@ _ZN18UnkStruct_027e0d7019func_ov071_0215e9acEv kind:function(arm,size=0x68) addr func_ov071_02160c00 kind:function(arm,size=0x7c) addr:0x02160c00 _ZN18UnkStruct_027e0d70D1Ev kind:function(arm,size=0x38) addr:0x02160c7c _ZN18UnkStruct_027e0d7019func_ov071_0215eac8Ev kind:function(arm,size=0x50) addr:0x02160cb4 -func_ov071_02160d04 kind:function(arm,size=0xc) addr:0x02160d04 +_ZN18UnkStruct_027e0d7019func_ov071_0215eb18Ev kind:function(arm,size=0xc) addr:0x02160d04 func_ov071_02160d10 kind:function(arm,size=0x27c) addr:0x02160d10 func_ov071_02160f8c kind:function(arm,size=0x50) addr:0x02160f8c func_ov071_02160fdc kind:function(arm,size=0x50) addr:0x02160fdc @@ -300,7 +300,7 @@ _ZN14ActorTearLight8vfunc_18Ei kind:function(arm,size=0xac) addr:0x02161770 _ZN14ActorTearLight8vfunc_1CEv kind:function(arm,size=0x2c) addr:0x0216181c _ZN14ActorTearLight8vfunc_20Ev kind:function(arm,size=0x4c) addr:0x02161848 _ZN14ActorTearLight8vfunc_24Ev kind:function(arm,size=0xc0) addr:0x02161894 -_ZN14ActorTearLight8vfunc_2CEi kind:function(arm,size=0xc8) addr:0x02161954 +_ZN14ActorTearLight8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc8) addr:0x02161954 _ZN14ActorTearLight8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x18) addr:0x02161a1c _ZN14ActorTearLight19func_ov071_0215f7f4Es kind:function(arm,size=0x18) addr:0x02161a34 _ZN14ActorTearLight19func_ov071_0215f80cEv kind:function(arm,size=0x18) addr:0x02161a4c diff --git a/config/jp/arm9/overlays/ov088/symbols.txt b/config/jp/arm9/overlays/ov088/symbols.txt index 67bfd5ca..5c2c0691 100644 --- a/config/jp/arm9/overlays/ov088/symbols.txt +++ b/config/jp/arm9/overlays/ov088/symbols.txt @@ -325,9 +325,9 @@ func_ov088_02171ad4 kind:function(arm,size=0x2c) addr:0x02171ad4 _ZN21UnkStruct_027e0ce0_3CC1Ev kind:function(thumb,size=0x298) addr:0x02171b00 _ZN21UnkStruct_027e0ce0_3CD1Ev kind:function(thumb,size=0x8c) addr:0x02171d98 _ZN21UnkStruct_027e0ce0_3C19func_ov088_0216fbc4EiPK24UnkStruct_ov001_020c40f4 kind:function(thumb,size=0x2c) addr:0x02171e24 -func_ov088_02171e50 kind:function(arm,size=0xb0) addr:0x02171e50 -func_ov088_02171f00 kind:function(arm,size=0x270) addr:0x02171f00 -func_ov088_02172170 kind:function(arm,size=0x4) addr:0x02172170 +_ZN21UnkStruct_027e0ce0_3C19func_ov088_0216fbf0Ei kind:function(arm,size=0xb0) addr:0x02171e50 +_ZN21UnkStruct_027e0ce0_3C19func_ov088_0216fca0Ev kind:function(arm,size=0x270) addr:0x02171f00 +_ZN21UnkStruct_027e0ce0_3C19func_ov088_0216ff10Ev kind:function(arm,size=0x4) addr:0x02172170 func_ov088_02172174 kind:function(arm,size=0x10) addr:0x02172174 func_ov088_02172184 kind:function(arm,size=0xa8) addr:0x02172184 func_ov088_0217222c kind:function(arm,size=0x4) addr:0x0217222c diff --git a/config/jp/arm9/overlays/ov092/symbols.txt b/config/jp/arm9/overlays/ov092/symbols.txt index ae2eb805..2b71e5a1 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 -_ZN25UnkStruct_027e0ce0_40_14C19func_ov092_021689e8EiP21UnkStruct_027e0ce0_40P15PlayerLinkActorP25UnkStruct_027e0ce0_40_328 kind:function(arm,size=0xac) addr:0x0216ac48 +_ZN25UnkStruct_027e0ce0_40_14C19func_ov092_021689e8EbP21UnkStruct_027e0ce0_40P15PlayerLinkActorP15PlayerActorBase 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/symbols.txt b/config/jp/arm9/overlays/ov093/symbols.txt index 04cb1dc7..4ca6af3b 100644 --- a/config/jp/arm9/overlays/ov093/symbols.txt +++ b/config/jp/arm9/overlays/ov093/symbols.txt @@ -82,13 +82,13 @@ func_ov093_0216a05c kind:function(arm,size=0x44) addr:0x0216a05c func_ov093_0216a0a0 kind:function(arm,size=0x15c) addr:0x0216a0a0 func_ov093_0216a1fc kind:function(arm,size=0x68) addr:0x0216a1fc _ZN19func_ov093_0216a264D0Ev kind:function(arm,size=0x1c) addr:0x0216a264 -func_ov093_0216a280 kind:function(arm,size=0xdc) addr:0x0216a280 -func_ov093_0216a35c kind:function(arm,size=0xa8) addr:0x0216a35c +_ZN21UnkStruct_027e0ce0_4019func_ov093_02168020Ei kind:function(arm,size=0xdc) addr:0x0216a280 +_ZN21UnkStruct_027e0ce0_4019func_ov093_021680fcEi 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 _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 +_ZN21UnkStruct_027e0ce0_4019func_ov093_02168258Ev kind:function(arm,size=0xfc) addr:0x0216a598 func_ov093_0216a694 kind:function(thumb,size=0x7c) addr:0x0216a694 func_ov093_0216a710 kind:function(arm,size=0xd0) addr:0x0216a710 func_ov093_0216a7e0 kind:function(arm,size=0x24) addr:0x0216a7e0 @@ -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 -_ZN25UnkStruct_027e0ce0_40_14C19func_ov093_02168e24Ei kind:function(arm,size=0x6c) addr:0x0216b0b0 +_ZN25UnkStruct_027e0ce0_40_14C19func_ov093_02168e24EPv 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 @@ -157,30 +157,30 @@ _ZN20ModelRender_Derived5C1EiP10G3d_Model_P18G3d_BoneMtxStruct_ kind:function(th func_ov093_0216eb88 kind:function(thumb,size=0x44) addr:0x0216eb88 func_ov093_0216ebcc kind:function(thumb,size=0x50) addr:0x0216ebcc func_ov093_0216ec1c kind:function(arm,size=0xa8) addr:0x0216ec1c -func_ov093_0216ecc4 kind:function(arm,size=0x270) addr:0x0216ecc4 +_ZN20ModelRender_Derived419func_ov093_0216ca38Ebbbb kind:function(arm,size=0x270) addr:0x0216ecc4 _ZN19func_ov093_0216ef34D1Ev kind:function(arm,size=0x14) addr:0x0216ef34 _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 _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 -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d160Ev kind:function(thumb,size=0x6c) addr:0x0216f3ec -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d1ccEiPK24UnkStruct_ov001_020c40f4bb kind:function(thumb,size=0x1cc) addr:0x0216f458 +_ZN16PlayerZeldaActorC1EPvP21UnkStruct_027e0ce0_40P25UnkStruct_027e0ce0_40_150Pj kind:function(thumb,size=0x1bc) addr:0x0216f0ec +_ZN16PlayerZeldaActorD1Ev kind:function(thumb,size=0xb6) addr:0x0216f2a8 +_ZN15PlayerActorBase19func_ov093_0216d0d4Ev kind:function(thumb,size=0x8c) addr:0x0216f360 +_ZN15PlayerActorBase19func_ov093_0216d160Ev kind:function(thumb,size=0x6c) addr:0x0216f3ec +_ZN15PlayerActorBase19func_ov093_0216d1ccEiPK24UnkStruct_ov001_020c40f4bb kind:function(thumb,size=0x1cc) addr:0x0216f458 func_ov093_0216f624 kind:function(arm,size=0x64) addr:0x0216f624 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 -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d5b8Ei kind:function(arm,size=0x830) addr:0x0216f844 +_ZN15PlayerActorBase19func_ov093_0216d5b8Eb kind:function(arm,size=0x830) addr:0x0216f844 func_ov093_02170074 kind:function(arm,size=0x48) addr:0x02170074 -_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 +_ZN15PlayerActorBase19func_ov093_0216de30Eii kind:function(arm,size=0x98) addr:0x021700bc +_ZN15PlayerActorBase19func_ov093_0216dec8EPv 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 -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216e1a4Ei kind:function(arm,size=0xfc) addr:0x02170430 +_ZN15PlayerActorBase19func_ov093_0216e1a4EPv 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 -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216f71cEPi kind:function(thumb,size=0x50) addr:0x0217199c +_ZN15PlayerActorBase19func_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/ov102/symbols.txt b/config/jp/arm9/overlays/ov102/symbols.txt index 9da229c3..35e95325 100644 --- a/config/jp/arm9/overlays/ov102/symbols.txt +++ b/config/jp/arm9/overlays/ov102/symbols.txt @@ -1,26 +1,26 @@ _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 +_ZN25UnkStruct_027e0ce0_40_10819func_ov102_02182e54EiP7VecFx32i kind:function(arm,size=0x154) addr:0x021849d4 +_ZN24UnkStruct_ItemManager_2019func_ov102_02182fa8Ebb kind:function(arm,size=0x54) addr:0x02184b28 +_ZN24UnkStruct_ItemManager_2019func_ov102_02182ffcEPv kind:function(arm,size=0x40) addr:0x02184b7c +_ZN21UnkStruct_027e0ce0_4019func_ov102_0218303cEbP11ItemManager 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 +_ZN21UnkStruct_027e0ce0_4019func_ov102_021831b4EPv kind:function(arm,size=0x3c) addr:0x02184d34 +_ZN21UnkStruct_027e0ce0_4019func_ov102_021831f0EPv 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 +_ZN16MapObjectUnkSAND8vfunc_14Ei 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 +_ZN16MapObjectUnkPTFL8vfunc_14Ei 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 diff --git a/config/jp/arm9/symbols.txt b/config/jp/arm9/symbols.txt index 50e52824..12ca8618 100644 --- a/config/jp/arm9/symbols.txt +++ b/config/jp/arm9/symbols.txt @@ -657,7 +657,7 @@ _ZN4Game20TrySetCreateCallbackEPFP12GameModeBasevE kind:function(arm,size=0x18) func_02013740 kind:function(arm,size=0x18) addr:0x02013740 func_02013758 kind:function(arm,size=0x14) addr:0x02013758 _ZN18UnkStruct_02049b1813func_02013768Ev kind:function(arm,size=0x60) addr:0x0201376c -func_020137cc kind:function(arm,size=0x1c) addr:0x020137cc +_ZN18UnkStruct_02049b1813func_020137c8Ei kind:function(arm,size=0x1c) addr:0x020137cc func_020137e8 kind:function(arm,size=0x5c) addr:0x020137e8 _ZN18UnkStruct_02049b1813func_02013840Eti kind:function(arm,size=0xb4) addr:0x02013844 _ZN18UnkStruct_02049b1813func_020138f4Ei kind:function(arm,size=0x140) addr:0x020138f8 @@ -669,21 +669,21 @@ _ZN5Input13func_02013b24Ei kind:function(arm,size=0x64) addr:0x02013b28 func_02013b8c kind:function(arm,size=0x10) addr:0x02013b8c func_02013b9c kind:function(arm,size=0x24) addr:0x02013b9c _ZN5Input13func_02013bbcEv kind:function(arm,size=0x4c) addr:0x02013bc0 -_ZN5Input13func_02013c08Et kind:function(arm,size=0x1c) addr:0x02013c0c +_ZN5Input13func_02013c08Ej kind:function(arm,size=0x1c) addr:0x02013c0c func_02013c28 kind:function(arm,size=0x58) addr:0x02013c28 func_02013c80 kind:function(arm,size=0x58) addr:0x02013c80 -func_02013cd8 kind:function(arm,size=0x5c) addr:0x02013cd8 -_ZN13func_02013d34D0Ev kind:function(arm,size=0x64) addr:0x02013d34 -func_02013d98 kind:function(arm,size=0x5c) addr:0x02013d98 +_ZN29UnkStruct_ov017_020c3f70_BaseD1Ev kind:function(arm,size=0x5c) addr:0x02013cd8 +_ZN29UnkStruct_ov017_020c3f70_BaseD0Ev kind:function(arm,size=0x64) addr:0x02013d34 +_ZN29UnkStruct_ov017_020c3f70_BaseD2Ev kind:function(arm,size=0x5c) addr:0x02013d98 func_02013df4 kind:function(arm,size=0x28) addr:0x02013df4 _ZN21UnkStruct_02049a2c_1C13func_02013e18EPvi kind:function(arm,size=0x1c) addr:0x02013e1c -func_02013e38 kind:function(arm,size=0x10) addr:0x02013e38 +_ZN24UnkStruct_ov017_020c3f708vfunc_08Ev kind:function(arm,size=0x10) addr:0x02013e38 func_02013e48 kind:function(arm,size=0x3c) addr:0x02013e48 func_02013e84 kind:function(arm,size=0x4c) addr:0x02013e84 _ZN18UnkStruct_02049b8013func_02013eccEiPFvtEi kind:function(arm,size=0x1c) addr:0x02013ed0 _ZN18UnkStruct_02049b8013func_02013ee8Eii kind:function(arm,size=0x98) addr:0x02013eec _ZN18UnkStruct_02049b8013func_02013f80Ei kind:function(arm,size=0x6c) addr:0x02013f84 -func_02013ff0 kind:function(arm,size=0xc) addr:0x02013ff0 +_ZN18UnkStruct_02049b8013func_02013fecEiPv kind:function(arm,size=0xc) addr:0x02013ff0 func_02013ffc kind:function(arm,size=0x12c) addr:0x02013ffc _ZN12TouchControl11UpdateStateEP10TouchStatePK6TPData kind:function(arm,size=0xb8) addr:0x02014128 _ZN12TouchControl4InitEv kind:function(thumb,size=0x3c) addr:0x020141e0 @@ -698,7 +698,7 @@ func_020144a4 kind:function(thumb,size=0x10) addr:0x020144a4 func_020144b4 kind:function(thumb,size=0x1c) addr:0x020144b4 _ZN21UnkStruct_02011e10_2C13func_020144ccEiii kind:function(thumb,size=0x6c) addr:0x020144d0 _ZN21UnkStruct_02011e10_2C13func_02014538Ev kind:function(thumb,size=0x34) addr:0x0201453c -func_02014570 kind:function(arm,size=0x44) addr:0x02014570 +_ZN18UnkStruct_020499e013func_0201456cEi kind:function(arm,size=0x44) addr:0x02014570 func_020145b0 kind:function(arm,size=0x80) addr:0x020145b4 func_02014630 kind:function(arm,size=0x58) addr:0x02014634 func_0201468c kind:function(arm,size=0x7c) addr:0x0201468c @@ -968,7 +968,7 @@ _ZN18UnkStruct_0204a11013func_02018d78Ei kind:function(arm,size=0x174) addr:0x02 func_02018e84 kind:function(arm,size=0xac) addr:0x02018e84 func_02018f30 kind:function(arm,size=0x368) addr:0x02018f30 _ZN18UnkStruct_0204a11013func_02019300Ei kind:function(arm,size=0x40) addr:0x02019298 -func_020192d8 kind:function(arm,size=0x10) addr:0x020192d8 +_ZN18UnkStruct_0204a11013func_02019340Ei kind:function(arm,size=0x10) addr:0x020192d8 _ZN18UnkStruct_0204a11013func_02019350Ev kind:function(arm,size=0xb8) addr:0x020192e8 _ZN18UnkStruct_0204a11013func_02019408Ev kind:function(arm,size=0x4c) addr:0x020193a0 _ZN18UnkStruct_0204a11013func_02019454Ev kind:function(arm,size=0x88) addr:0x020193ec diff --git a/config/usa/arm9/itcm/symbols.txt b/config/usa/arm9/itcm/symbols.txt index 2fd37aa2..2ec269eb 100644 --- a/config/usa/arm9/itcm/symbols.txt +++ b/config/usa/arm9/itcm/symbols.txt @@ -43,8 +43,8 @@ func_01ff9b1c kind:function(arm,size=0x14) addr:0x01ff9b1c func_01ff9b30 kind:function(arm,size=0x10) addr:0x01ff9b30 func_01ff9b40 kind:function(arm,size=0x10) addr:0x01ff9b40 _ZN18UnkStruct_0204a11013func_01ff9b50Ev kind:function(arm,size=0x14) addr:0x01ff9b50 -func_01ff9b64 kind:function(arm,size=0x14) addr:0x01ff9b64 -func_01ff9b78 kind:function(arm,size=0x18) addr:0x01ff9b78 +_ZN18UnkStruct_0204a11013func_01ff9b64Ev kind:function(arm,size=0x14) addr:0x01ff9b64 +_ZN18UnkStruct_0204a11013func_01ff9b78Ev kind:function(arm,size=0x18) addr:0x01ff9b78 func_01ff9b90 kind:function(arm,size=0x324) addr:0x01ff9b90 func_01ff9eb4 kind:function(arm,size=0x8) addr:0x01ff9eb4 func_01ff9ebc kind:function(arm,size=0x8) addr:0x01ff9ebc @@ -157,10 +157,10 @@ _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 -_ZN21UnkStruct_027e09bc_0C13func_01ffd43cEP5Vec2sii kind:function(arm,size=0x60) addr:0x01ffd43c +_ZN21UnkStruct_027e09bc_0C13func_01ffd43cEP5Vec2sP7VecFx32i 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 +_ZN21UnkStruct_027e09bc_0C13func_01ffd768EPvP5Vec2sc kind:function(arm,size=0x138) addr:0x01ffd768 func_01ffd8a0 kind:function(arm,size=0x190) addr:0x01ffd8a0 func_01ffda30 kind:function(arm,size=0x2ec) addr:0x01ffda30 func_01ffdd1c kind:function(arm,size=0x14c) addr:0x01ffdd1c @@ -198,7 +198,7 @@ func_01fff254 kind:function(arm,size=0x2c) addr:0x01fff254 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_01fff2fcEPFvP5ActorP14Actor_vfunc_30EPv kind:function(arm,size=0x54) addr:0x01fff2fc _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 @@ -209,8 +209,8 @@ _ZN16MapObjectManager13func_01fff4ccEPFvPvS0_ES0_ kind:function(arm,size=0x54) a _ZN16MapObjectManager13func_01fff520EP24UnkStruct_ov000_020b34c4PP9MapObject kind:function(arm,size=0x64) addr:0x01fff520 _ZN9MapObject14GetMapObjectIdEv kind:function(arm,size=0xc) addr:0x01fff584 _ZN9MapObject13func_01fff590Ei kind:function(arm,size=0x40) addr:0x01fff590 -_ZN5Actor13func_01fff5d0Eii kind:function(arm,size=0x3c) addr:0x01fff5d0 -_ZN18UnkStruct_027e09b413func_01fff60cEP7VecFx32iihii kind:function(arm,size=0x8c) addr:0x01fff60c +_ZN5Actor13func_01fff5d0EP14Actor_vfunc_30i kind:function(arm,size=0x3c) addr:0x01fff5d0 +_ZN18UnkStruct_027e09b413func_01fff60cEP7VecFx32iiiii kind:function(arm,size=0x8c) addr:0x01fff60c func_01fff698 kind:function(arm,size=0x38) addr:0x01fff698 func_01fff6d0 kind:function(arm,size=0x74) addr:0x01fff6d0 func_01fff744 kind:function(arm,size=0x20) addr:0x01fff744 diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 86718f20..67e34514 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -123,7 +123,7 @@ _ZN15ModelRenderBase19func_ov000_02057f40EPKv kind:function(arm,size=0x34) addr: func_ov000_02057f74 kind:function(arm,size=0x24) addr:0x02057f54 func_ov000_02057f98 kind:function(arm,size=0x28) addr:0x02057f78 func_ov000_02057fc0 kind:function(arm,size=0x28) addr:0x02057fa0 -func_ov000_02057fe8 kind:function(arm,size=0x50) addr:0x02057fc8 +_ZN20ModelRender_Derived419func_ov000_02057fe8E14UnkAngleStructS0_P7VecFx32 kind:function(arm,size=0x50) addr:0x02057fc8 func_ov000_02058038 kind:function(arm,size=0x28) addr:0x02058018 func_ov000_02058060 kind:function(arm,size=0x20) addr:0x02058040 func_ov000_02058080 kind:function(arm,size=0x20) addr:0x02058060 @@ -323,7 +323,7 @@ func_ov000_0205c4a8 kind:function(arm,size=0xdc) addr:0x0205c488 func_ov000_0205c584 kind:function(thumb,size=0x1a) addr:0x0205c564 func_ov000_0205c5a0 kind:function(arm,size=0x18) addr:0x0205c580 func_ov000_0205c5b8 kind:function(arm,size=0x18) addr:0x0205c598 -func_ov000_0205c5d0 kind:function(arm,size=0xd4) addr:0x0205c5b0 +_ZN18PlayerActorBase_7819func_ov000_0205c5d0EiP15PlayerActorBase kind:function(arm,size=0xd4) addr:0x0205c5b0 func_ov000_0205c6a4 kind:function(arm,size=0x2c) addr:0x0205c684 func_ov000_0205c6d0 kind:function(arm,size=0x34) addr:0x0205c6b0 func_ov000_0205c704 kind:function(arm,size=0x48) addr:0x0205c6e4 @@ -486,7 +486,7 @@ _ZN23UnkStruct_027e0998_Base19func_ov000_02061768Ev kind:function(arm,size=0x4) func_ov000_0206176c kind:function(thumb,size=0xbc) addr:0x0206174c func_ov000_02061828 kind:function(thumb,size=0x28) addr:0x02061808 _ZN23UnkStruct_027e0998_Base19func_ov000_02061850Ei kind:function(arm,size=0x18) addr:0x02061830 -_ZN23UnkStruct_027e0998_Base8vfunc_00EP7VecFx32P5Vec2sPt kind:function(arm,size=0x1e0) addr:0x02061848 +_ZN23UnkStruct_027e0998_Base8vfunc_00EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x1e0) addr:0x02061848 _ZN23UnkStruct_027e0998_Base19func_ov000_02061a48EP7VecFx32P5Vec2sS3_ kind:function(arm,size=0x28) addr:0x02061a28 _ZN23UnkStruct_027e0998_Base19func_ov000_02061a70Ev kind:function(arm,size=0xc) addr:0x02061a50 func_ov000_02061a7c kind:function(arm,size=0x10) addr:0x02061a5c @@ -1075,10 +1075,10 @@ func_ov000_02071f88 kind:function(arm,size=0x10) addr:0x02071f68 _ZN21UnkStruct_027e09ac_1419func_ov000_02071f98Ev kind:function(arm,size=0x13c) addr:0x02071f78 func_ov000_020720d4 kind:function(arm,size=0x270) addr:0x020720b4 func_ov000_02072344 kind:function(arm,size=0xb0) addr:0x02072324 -func_ov000_020723f4 kind:function(arm,size=0x78) addr:0x020723d4 +_ZN18UnkStruct_027e09ac19func_ov000_020723f4Ev kind:function(arm,size=0x78) addr:0x020723d4 func_ov000_0207246c kind:function(arm,size=0x204) addr:0x0207244c func_ov000_02072670 kind:function(arm,size=0x14) addr:0x02072650 -func_ov000_02072684 kind:function(arm,size=0x18) addr:0x02072664 +_ZN18UnkStruct_027e09ac19func_ov000_02072684EPv kind:function(arm,size=0x18) addr:0x02072664 func_ov000_0207269c kind:function(arm,size=0x54) addr:0x0207267c _ZN18UnkStruct_027e09ac19func_ov000_020726f0Etii kind:function(arm,size=0x2d4) addr:0x020726d0 _ZN18UnkStruct_027e09ac19func_ov000_020729c4EP21UnkStruct_027e09ac_14ttss kind:function(arm,size=0x88) addr:0x020729a4 @@ -1128,7 +1128,7 @@ _ZN18UnkStruct_027e09b819func_ov000_020732dcEi kind:function(arm,size=0x10) addr _ZN18UnkStruct_027e09b819func_ov000_020732ecEi kind:function(arm,size=0x10) addr:0x020732cc _ZN18UnkStruct_027e09b819func_ov000_020732fcEi kind:function(arm,size=0x10) addr:0x020732dc _ZN18UnkStruct_027e09b819func_ov000_0207330cEv kind:function(arm,size=0x20) addr:0x020732ec -func_ov000_0207332c kind:function(arm,size=0x5c) addr:0x0207330c +_ZN18UnkStruct_027e09b819func_ov000_0207332cEv kind:function(arm,size=0x5c) addr:0x0207330c _ZN18UnkStruct_027e09b819func_ov000_02073388EPvi kind:function(arm,size=0xe8) addr:0x02073368 _ZN18UnkStruct_027e09b819func_ov000_02073470EPvi kind:function(arm,size=0x108) addr:0x02073450 _ZN18UnkStruct_027e09b819func_ov000_02073578EPvi kind:function(arm,size=0x98) addr:0x02073558 @@ -1212,11 +1212,11 @@ func_ov000_020762c4 kind:function(arm,size=0x20) addr:0x020762a4 func_ov000_020762e4 kind:function(arm,size=0x1dc) addr:0x020762c4 func_ov000_020764c0 kind:function(arm,size=0x1d4) addr:0x020764a0 func_ov000_02076694 kind:function(arm,size=0x120) addr:0x02076674 -func_ov000_020767b4 kind:function(arm,size=0x34c) addr:0x02076794 +_ZN21UnkStruct_027e09bc_0C19func_ov000_020767b4EP7VecFx32P5Vec2siiS1_ kind:function(arm,size=0x34c) addr:0x02076794 func_ov000_02076b00 kind:function(arm,size=0x254) addr:0x02076ae0 func_ov000_02076d54 kind:function(arm,size=0x1fc) addr:0x02076d34 func_ov000_02076f50 kind:function(arm,size=0x58) addr:0x02076f30 -func_ov000_02076fa8 kind:function(arm,size=0xa0) addr:0x02076f88 +_ZN21UnkStruct_027e09bc_0C19func_ov000_02076fa8EPvS0_ii kind:function(arm,size=0xa0) addr:0x02076f88 func_ov000_02077048 kind:function(arm,size=0x114) addr:0x02077028 _ZN21UnkStruct_027e09bc_24C1Ev kind:function(arm,size=0x2c) addr:0x0207713c func_ov000_02077188 kind:function(arm,size=0x14) addr:0x02077168 @@ -1225,7 +1225,7 @@ _ZN18UnkStruct_027e09bc19func_ov000_020771b8Ei kind:function(arm,size=0x10) addr _ZN18UnkStruct_027e09bc19func_ov000_020771c8Ev kind:function(arm,size=0x188) addr:0x020771a8 func_ov000_02077350 kind:function(arm,size=0xf4) addr:0x02077330 func_ov000_02077444 kind:function(arm,size=0x24) addr:0x02077424 -func_ov000_02077468 kind:function(arm,size=0x18) addr:0x02077448 +_ZN18UnkStruct_027e09bc19func_ov000_02077468Eii kind:function(arm,size=0x18) addr:0x02077448 func_ov000_02077480 kind:function(arm,size=0x10) addr:0x02077460 _ZN19func_ov000_02077490D1Ev kind:function(arm,size=0x14) addr:0x02077470 _ZN19func_ov000_020774a4D0Ev kind:function(arm,size=0x1c) addr:0x02077484 @@ -1253,7 +1253,7 @@ func_ov000_020781d4 kind:function(arm,size=0x14) addr:0x020781b4 func_ov000_020781e8 kind:function(arm,size=0x48) addr:0x020781c8 _ZN21UnkStruct_027e09bc_0C19func_ov000_02078230Ei kind:function(arm,size=0xe4) addr:0x02078210 func_ov000_02078314 kind:function(arm,size=0x38) addr:0x020782f4 -_ZN21UnkStruct_027e09bc_0C19func_ov000_0207834cEP7VecFx32ii kind:function(arm,size=0x40) addr:0x0207832c +_ZN21UnkStruct_027e09bc_0C19func_ov000_0207834cEP7VecFx32P29UnkStackStruct_ov000_02077590i kind:function(arm,size=0x40) addr:0x0207832c func_ov000_0207838c kind:function(arm,size=0x70) addr:0x0207836c func_ov000_020783fc kind:function(arm,size=0x88) addr:0x020783dc func_ov000_02078484 kind:function(arm,size=0x40) addr:0x02078464 @@ -1264,7 +1264,7 @@ func_ov000_02078594 kind:function(arm,size=0x40) addr:0x02078574 func_ov000_020785d4 kind:function(arm,size=0xac) addr:0x020785b4 func_ov000_02078680 kind:function(arm,size=0xc) addr:0x02078660 func_ov000_0207868c kind:function(arm,size=0xc) addr:0x0207866c -func_ov000_02078698 kind:function(arm,size=0xc) addr:0x02078678 +_ZN21UnkStruct_027e09bc_0C19func_ov000_02078698Ev kind:function(arm,size=0xc) addr:0x02078678 func_ov000_020786a4 kind:function(arm,size=0x38) addr:0x02078684 func_ov000_020786dc kind:function(arm,size=0x2c) addr:0x020786bc func_ov000_02078708 kind:function(arm,size=0x24) addr:0x020786e8 @@ -1625,13 +1625,13 @@ _ZN21UnkStruct_027e0cd8_0419func_ov000_020819a4EPK29UnkStruct_func_ov000_020702a func_ov000_02081b24 kind:function(arm,size=0x44) addr:0x02081b04 func_ov000_02081b68 kind:function(arm,size=0xc) addr:0x02081b48 func_ov000_02081b74 kind:function(arm,size=0x10) addr:0x02081b54 -func_ov000_02081b84 kind:function(arm,size=0x18) addr:0x02081b64 -func_ov000_02081b9c kind:function(arm,size=0x58) addr:0x02081b7c -func_ov000_02081bf4 kind:function(arm,size=0x34) addr:0x02081bd4 +_ZN18UnkStruct_027e0cd819func_ov000_02081b84Ev kind:function(arm,size=0x18) addr:0x02081b64 +_ZN18UnkStruct_027e0cd819func_ov000_02081b9cEi kind:function(arm,size=0x58) addr:0x02081b7c +_ZN18UnkStruct_027e0cd819func_ov000_02081bf4Ev kind:function(arm,size=0x34) addr:0x02081bd4 _ZN18UnkStruct_027e0cd819func_ov000_02081c28Ev kind:function(arm,size=0x78) addr:0x02081c08 _ZN18UnkStruct_027e0cd819func_ov000_02081ca0Ev kind:function(arm,size=0xa8) addr:0x02081c80 func_ov000_02081d48 kind:function(arm,size=0x10) addr:0x02081d28 -func_ov000_02081d58 kind:function(arm,size=0x4) addr:0x02081d38 +_ZN18UnkStruct_027e0cd819func_ov000_02081d58Ev kind:function(arm,size=0x4) addr:0x02081d38 _ZN18UnkStruct_027e0cd819func_ov000_02081d5cEv kind:function(arm,size=0x20) addr:0x02081d3c _ZN18UnkStruct_027e0cd819func_ov000_02081d7cEiib kind:function(arm,size=0xb4) addr:0x02081d5c _ZN18UnkStruct_027e0cd819func_ov000_02081e30Eii kind:function(arm,size=0x8c) addr:0x02081e10 @@ -1686,10 +1686,10 @@ func_ov000_02082c58 kind:function(arm,size=0x188) addr:0x02082c38 func_ov000_02082de0 kind:function(arm,size=0xc) addr:0x02082dc0 func_ov000_02082dec kind:function(arm,size=0xc) addr:0x02082dcc func_ov000_02082df8 kind:function(thumb,size=0x5a) addr:0x02082dd8 -func_ov000_02082e54 kind:function(arm,size=0x24) addr:0x02082e34 +_ZN18PlayerActorBase_7019func_ov000_02082e54Ev kind:function(arm,size=0x24) addr:0x02082e34 _ZN18PlayerActorBase_7019func_ov000_02082e78Eiiii kind:function(arm,size=0x22c) addr:0x02082e58 -func_ov000_020830a4 kind:function(arm,size=0x30) addr:0x02083084 -_ZN18PlayerActorBase_7019func_ov000_020830d4E14UnkAngleStructjhi kind:function(arm,size=0x334) addr:0x020830b4 +_ZN18PlayerActorBase_7019func_ov000_020830a4Eiiiii kind:function(arm,size=0x30) addr:0x02083084 +_ZN18PlayerActorBase_7019func_ov000_020830d4E14UnkAngleStructjhP21PlayerLinkActor_A0_28 kind:function(arm,size=0x334) addr:0x020830b4 _ZN21PlayerActorBase_70_6CC1EiPvP10G3d_Model_ kind:function(thumb,size=0x44) addr:0x020833e8 _ZN21PlayerActorBase_70_6CD1Ev kind:function(thumb,size=0x2) addr:0x0208342c func_ov000_02083450 kind:function(arm,size=0xc) addr:0x02083430 @@ -1732,15 +1732,15 @@ func_ov000_0208475c kind:function(arm,size=0x194) addr:0x0208473c func_ov000_020848f0 kind:function(arm,size=0x54) addr:0x020848d0 func_ov000_02084944 kind:function(arm,size=0x68) addr:0x02084924 func_ov000_020849ac kind:function(arm,size=0x24) addr:0x0208498c -func_ov000_020849d0 kind:function(arm,size=0xf8) addr:0x020849b0 -func_ov000_02084ac8 kind:function(arm,size=0x174) addr:0x02084aa8 -func_ov000_02084c3c kind:function(arm,size=0x21c) addr:0x02084c1c -func_ov000_02084e58 kind:function(arm,size=0x408) addr:0x02084e38 +_ZN18PlayerLinkActor_9C19func_ov000_020849d0EP7VecFx32S1_ kind:function(arm,size=0xf8) addr:0x020849b0 +_ZN18PlayerLinkActor_9C19func_ov000_02084ac8EiP7VecFx32S1_S1_ kind:function(arm,size=0x174) addr:0x02084aa8 +_ZN18PlayerLinkActor_9C19func_ov000_02084c3cEiiP7VecFx32S1_ kind:function(arm,size=0x21c) addr:0x02084c1c +_ZN18PlayerLinkActor_9C19func_ov000_02084e58EihP7VecFx32S1_S1_S1_i kind:function(arm,size=0x408) addr:0x02084e38 func_ov000_02085260 kind:function(arm,size=0x14) addr:0x02085240 -func_ov000_02085274 kind:function(arm,size=0x304) addr:0x02085254 -func_ov000_02085578 kind:function(arm,size=0x1a0) addr:0x02085558 -func_ov000_02085718 kind:function(arm,size=0x128) addr:0x020856f8 -func_ov000_02085840 kind:function(arm,size=0x184) addr:0x02085820 +_ZN18PlayerLinkActor_9C19func_ov000_02085274EiiiP7VecFx32S1_S1_ kind:function(arm,size=0x304) addr:0x02085254 +_ZN18PlayerLinkActor_9C19func_ov000_02085578EiiiiP7VecFx32 kind:function(arm,size=0x1a0) addr:0x02085558 +_ZN18PlayerLinkActor_9C19func_ov000_02085718EP7VecFx32 kind:function(arm,size=0x128) addr:0x020856f8 +_ZN18PlayerLinkActor_9C19func_ov000_02085840EP7VecFx32S1_S1_ kind:function(arm,size=0x184) addr:0x02085820 func_ov000_020859c4 kind:function(arm,size=0x34) addr:0x020859a4 func_ov000_020859f8 kind:function(arm,size=0x30) addr:0x020859d8 func_ov000_02085a28 kind:function(arm,size=0x20) addr:0x02085a08 @@ -1763,8 +1763,8 @@ func_ov000_02086404 kind:function(arm,size=0xf4) addr:0x020863e4 func_ov000_020864f8 kind:function(arm,size=0x114) addr:0x020864d8 _ZN18PlayerLinkActor_9CC1EP21UnkStruct_027e0ce0_40ji kind:function(thumb,size=0xf8) addr:0x020865ec func_ov000_02086704 kind:function(thumb,size=0x54) addr:0x020866e4 -func_ov000_02086758 kind:function(arm,size=0x9c) addr:0x02086738 -func_ov000_020867f4 kind:function(arm,size=0x3c) addr:0x020867d4 +_ZN18PlayerLinkActor_9C19func_ov000_02086758Ev kind:function(arm,size=0x9c) addr:0x02086738 +_ZN18PlayerLinkActor_9C19func_ov000_020867f4Ev kind:function(arm,size=0x3c) addr:0x020867d4 func_ov000_02086830 kind:function(arm,size=0x74) addr:0x02086810 func_ov000_020868a4 kind:function(arm,size=0x58) addr:0x02086884 func_ov000_020868fc kind:function(arm,size=0x104) addr:0x020868dc @@ -1853,7 +1853,7 @@ func_ov000_02089910 kind:function(arm,size=0x2c) addr:0x020898f0 func_ov000_0208993c kind:function(arm,size=0x4c) addr:0x0208991c _ZN18PlayerLinkActor_A4C1EP15PlayerActorBaseP18PlayerLinkActor_A0 kind:function(thumb,size=0xa) addr:0x02089968 _ZN18PlayerLinkActor_A4D1Ev kind:function(thumb,size=0x2) addr:0x02089974 -func_ov000_02089998 kind:function(arm,size=0x184) addr:0x02089978 +_ZN18PlayerLinkActor_A419func_ov000_02089998Eb kind:function(arm,size=0x184) addr:0x02089978 func_ov000_02089b1c kind:function(arm,size=0x3c) addr:0x02089afc func_ov000_02089b58 kind:function(arm,size=0x64) addr:0x02089b38 func_ov000_02089bbc kind:function(arm,size=0x64) addr:0x02089b9c @@ -1863,7 +1863,7 @@ _ZN18PlayerActorBase_5C19func_ov000_02089dc4Ev kind:function(arm,size=0x28) addr func_ov000_02089dec kind:function(arm,size=0x68) addr:0x02089dcc func_ov000_02089e54 kind:function(arm,size=0x88) addr:0x02089e34 func_ov000_02089edc kind:function(arm,size=0x30) addr:0x02089ebc -func_ov000_02089f0c kind:function(arm,size=0x40) addr:0x02089eec +_ZN18PlayerActorBase_5C19func_ov000_02089f0cEb kind:function(arm,size=0x40) addr:0x02089eec func_ov000_02089f4c kind:function(arm,size=0x28) addr:0x02089f2c func_ov000_02089f74 kind:function(arm,size=0x24) addr:0x02089f54 func_ov000_02089f98 kind:function(arm,size=0x18) addr:0x02089f78 @@ -1930,10 +1930,10 @@ func_ov000_0208bbb4 kind:function(arm,size=0x10) addr:0x0208bb94 func_ov000_0208bbc4 kind:function(arm,size=0x10) addr:0x0208bba4 func_ov000_0208bbd4 kind:function(arm,size=0x2c) addr:0x0208bbb4 func_ov000_0208bc00 kind:function(arm,size=0x1c) addr:0x0208bbe0 -_ZN18UnkStruct_027e0ce019func_ov000_0208bc1cEiiiiii kind:function(arm,size=0x40) addr:0x0208bbfc +_ZN18UnkStruct_027e0ce019func_ov000_0208bc1cEiiiiPvi kind:function(arm,size=0x40) addr:0x0208bbfc func_ov000_0208bc5c kind:function(arm,size=0x40) addr:0x0208bc3c _ZN18UnkStruct_027e0ce019func_ov000_0208bc9cEii kind:function(arm,size=0x84) addr:0x0208bc7c -func_ov000_0208bd20 kind:function(arm,size=0x10) addr:0x0208bd00 +_ZN18UnkStruct_027e0ce019func_ov000_0208bd20Ebii kind:function(arm,size=0x10) addr:0x0208bd00 _ZN18UnkStruct_027e0ce019func_ov000_0208bd30Ebiii kind:function(arm,size=0x18) addr:0x0208bd10 func_ov000_0208bd48 kind:function(arm,size=0x34) addr:0x0208bd28 func_ov000_0208bd7c kind:function(arm,size=0x10) addr:0x0208bd5c @@ -1943,7 +1943,7 @@ func_ov000_0208bdb4 kind:function(arm,size=0x20) addr:0x0208bd94 func_ov000_0208bdd4 kind:function(arm,size=0x10) addr:0x0208bdb4 func_ov000_0208bde4 kind:function(arm,size=0x18) addr:0x0208bdc4 func_ov000_0208bdfc kind:function(arm,size=0x10) addr:0x0208bddc -func_ov000_0208be0c kind:function(arm,size=0x3c) addr:0x0208bdec +_ZN18UnkStruct_027e0ce019func_ov000_0208be0cE8ActorRef kind:function(arm,size=0x3c) addr:0x0208bdec func_ov000_0208be48 kind:function(arm,size=0x28) addr:0x0208be28 func_ov000_0208be70 kind:function(arm,size=0x2c) addr:0x0208be50 func_ov000_0208be9c kind:function(arm,size=0x2c) addr:0x0208be7c @@ -1974,7 +1974,7 @@ func_ov000_0208c6d4 kind:function(arm,size=0x50) addr:0x0208c6b4 func_ov000_0208c724 kind:function(arm,size=0x68) addr:0x0208c704 _ZN21PlayerActorBase_70_1CC1EP18PlayerActorBase_70 kind:function(thumb,size=0x24) addr:0x0208c76c func_ov000_0208c7b0 kind:function(arm,size=0x40) addr:0x0208c790 -func_ov000_0208c7f0 kind:function(arm,size=0x1c) addr:0x0208c7d0 +_ZN21PlayerActorBase_70_1C19func_ov000_0208c7f0Ev kind:function(arm,size=0x1c) addr:0x0208c7d0 func_ov000_0208c80c kind:function(arm,size=0x68) addr:0x0208c7ec _ZN21PlayerActorBase_70_E4C1Ev kind:function(thumb,size=0x18) addr:0x0208c854 func_ov000_0208c88c kind:function(arm,size=0x6c) addr:0x0208c86c @@ -1986,10 +1986,10 @@ func_ov000_0208ca08 kind:function(arm,size=0xc0) addr:0x0208c9e8 func_ov000_0208cac8 kind:function(arm,size=0x40) addr:0x0208caa8 func_ov000_0208cb08 kind:function(arm,size=0xc4) addr:0x0208cae8 func_ov000_0208cbcc kind:function(arm,size=0x24) addr:0x0208cbac -func_ov000_0208cbf0 kind:function(arm,size=0x30) addr:0x0208cbd0 -func_ov000_0208cc20 kind:function(arm,size=0x38) addr:0x0208cc00 +_ZN15PlayerActorBase19func_ov000_0208cbf0Ev kind:function(arm,size=0x30) addr:0x0208cbd0 +_ZN15PlayerActorBase19func_ov000_0208cc20EP7VecFx32 kind:function(arm,size=0x38) addr:0x0208cc00 func_ov000_0208cc58 kind:function(arm,size=0x38) addr:0x0208cc38 -func_ov000_0208cc90 kind:function(arm,size=0x4c) addr:0x0208cc70 +_ZN15PlayerActorBase19func_ov000_0208cc90Ev kind:function(arm,size=0x4c) addr:0x0208cc70 func_ov000_0208ccdc kind:function(arm,size=0x4c) addr:0x0208ccbc func_ov000_0208cd28 kind:function(arm,size=0x78) addr:0x0208cd08 func_ov000_0208cda0 kind:function(arm,size=0x68) addr:0x0208cd80 @@ -2001,19 +2001,19 @@ func_ov000_0208d12c kind:function(arm,size=0x50) addr:0x0208d10c func_ov000_0208d17c kind:function(arm,size=0x60) addr:0x0208d15c func_ov000_0208d1dc kind:function(arm,size=0x58) addr:0x0208d1bc func_ov000_0208d234 kind:function(arm,size=0x174) addr:0x0208d214 -func_ov000_0208d3a8 kind:function(arm,size=0x28) addr:0x0208d388 -func_ov000_0208d3d0 kind:function(arm,size=0x2c) addr:0x0208d3b0 +_ZN15PlayerActorBase19func_ov000_0208d3a8Ev kind:function(arm,size=0x28) addr:0x0208d388 +_ZN15PlayerActorBase19func_ov000_0208d3d0EP5Vec2siPv kind:function(arm,size=0x2c) addr:0x0208d3b0 _ZN15PlayerActorBase19func_ov000_0208d3fcEv kind:function(thumb,size=0x90) addr:0x0208d3dc func_ov000_0208d48c kind:function(arm,size=0x114) addr:0x0208d46c func_ov000_0208d5a0 kind:function(arm,size=0x6c) addr:0x0208d580 -func_ov000_0208d60c kind:function(arm,size=0x148) addr:0x0208d5ec -func_ov000_0208d754 kind:function(arm,size=0x9c) addr:0x0208d734 +_ZN15PlayerActorBase19func_ov000_0208d60cEv kind:function(arm,size=0x148) addr:0x0208d5ec +_ZN15PlayerActorBase19func_ov000_0208d754Ev kind:function(arm,size=0x9c) addr:0x0208d734 _ZN15PlayerActorBase19func_ov000_0208d7f0Eb kind:function(arm,size=0x100) addr:0x0208d7d0 func_ov000_0208d8f0 kind:function(arm,size=0x38) addr:0x0208d8d0 func_ov000_0208d928 kind:function(arm,size=0x18) addr:0x0208d908 func_ov000_0208d940 kind:function(arm,size=0x194) addr:0x0208d920 func_ov000_0208dad4 kind:function(arm,size=0x34) addr:0x0208dab4 -func_ov000_0208db08 kind:function(arm,size=0xd8) addr:0x0208dae8 +_ZN15PlayerActorBase19func_ov000_0208db08Ev kind:function(arm,size=0xd8) addr:0x0208dae8 func_ov000_0208dbe0 kind:function(arm,size=0xc) addr:0x0208dbc0 func_ov000_0208dbec kind:function(arm,size=0x18) addr:0x0208dbcc func_ov000_0208dc04 kind:function(arm,size=0x1c) addr:0x0208dbe4 @@ -2024,7 +2024,7 @@ func_ov000_0208dc58 kind:function(arm,size=0x10) addr:0x0208dc38 func_ov000_0208dc68 kind:function(arm,size=0x10) addr:0x0208dc48 func_ov000_0208dc78 kind:function(arm,size=0x10) addr:0x0208dc58 func_ov000_0208dc88 kind:function(arm,size=0x10) addr:0x0208dc68 -func_ov000_0208dc98 kind:function(arm,size=0x58) addr:0x0208dc78 +_ZN15PlayerActorBase19func_ov000_0208dc98Ev kind:function(arm,size=0x58) addr:0x0208dc78 func_ov000_0208dcf0 kind:function(arm,size=0x60) addr:0x0208dcd0 func_ov000_0208dd50 kind:function(arm,size=0x10) addr:0x0208dd30 func_ov000_0208dd60 kind:function(arm,size=0x10) addr:0x0208dd40 @@ -2124,10 +2124,10 @@ func_ov000_020920b0 kind:function(arm,size=0x34) addr:0x02092090 func_ov000_020920e4 kind:function(arm,size=0xc4) addr:0x020920c4 func_ov000_020921a8 kind:function(arm,size=0x3c) addr:0x02092188 _ZN18PlayerLinkActor_A019func_ov000_020921e4Ei kind:function(arm,size=0x464) addr:0x020921c4 -func_ov000_02092648 kind:function(arm,size=0x7f0) addr:0x02092628 -func_ov000_02092e38 kind:function(arm,size=0x70) addr:0x02092e18 -func_ov000_02092ea8 kind:function(arm,size=0x24) addr:0x02092e88 -func_ov000_02092ecc kind:function(arm,size=0x19c) addr:0x02092eac +_ZN18PlayerLinkActor_A019func_ov000_02092648Ei kind:function(arm,size=0x7f0) addr:0x02092628 +_ZN18PlayerLinkActor_A019func_ov000_02092e38Ev kind:function(arm,size=0x70) addr:0x02092e18 +_ZN18PlayerLinkActor_A019func_ov000_02092ea8Eii kind:function(arm,size=0x24) addr:0x02092e88 +_ZN18PlayerLinkActor_A019func_ov000_02092eccEPvb kind:function(arm,size=0x19c) addr:0x02092eac func_ov000_02093068 kind:function(arm,size=0x28) addr:0x02093048 func_ov000_02093090 kind:function(arm,size=0x28) addr:0x02093070 func_ov000_020930b8 kind:function(arm,size=0x3c) addr:0x02093098 @@ -2137,10 +2137,10 @@ func_ov000_02093250 kind:function(arm,size=0xf0) addr:0x02093230 func_ov000_02093340 kind:function(arm,size=0xf8) addr:0x02093320 func_ov000_02093438 kind:function(arm,size=0x124) addr:0x02093418 func_ov000_0209355c kind:function(arm,size=0xb0) addr:0x0209353c -func_ov000_0209360c kind:function(arm,size=0x44) addr:0x020935ec -func_ov000_02093650 kind:function(arm,size=0x4c) addr:0x02093630 +_ZN18PlayerLinkActor_A019func_ov000_0209360cEv kind:function(arm,size=0x44) addr:0x020935ec +_ZN18PlayerLinkActor_A019func_ov000_02093650Ev kind:function(arm,size=0x4c) addr:0x02093630 func_ov000_0209369c kind:function(arm,size=0x28) addr:0x0209367c -func_ov000_020936c4 kind:function(arm,size=0x28) addr:0x020936a4 +_ZN18PlayerLinkActor_A019func_ov000_020936c4Ev kind:function(arm,size=0x28) addr:0x020936a4 _ZN18PlayerLinkActor_A019func_ov000_020936ecEv kind:function(arm,size=0x2c) addr:0x020936cc _ZN18PlayerLinkActor_A019func_ov000_02093718Ev kind:function(arm,size=0x38) addr:0x020936f8 func_ov000_02093750 kind:function(arm,size=0x3c) addr:0x02093730 @@ -2167,7 +2167,7 @@ func_ov000_02093da0 kind:function(arm,size=0x1b8) addr:0x02093d80 func_ov000_02093f58 kind:function(arm,size=0x1c) addr:0x02093f38 func_ov000_02093f74 kind:function(arm,size=0x5c) addr:0x02093f54 func_ov000_02093fd0 kind:function(arm,size=0x18) addr:0x02093fb0 -func_ov000_02093fe8 kind:function(arm,size=0x2c) addr:0x02093fc8 +_ZN18PlayerLinkActor_A019func_ov000_02093fe8Ev kind:function(arm,size=0x2c) addr:0x02093fc8 func_ov000_02094014 kind:function(arm,size=0x20) addr:0x02093ff4 func_ov000_02094034 kind:function(arm,size=0x20) addr:0x02094014 func_ov000_02094054 kind:function(arm,size=0x30) addr:0x02094034 @@ -2220,13 +2220,13 @@ func_ov000_020961ec kind:function(arm,size=0x170) addr:0x020961cc func_ov000_0209635c kind:function(arm,size=0x514) addr:0x0209633c _ZN19func_ov000_02096870D1Ev kind:function(arm,size=0x20) addr:0x02096850 _ZN19func_ov000_02096890D0Ev kind:function(arm,size=0x28) addr:0x02096870 -func_ov000_020968b8 kind:function(arm,size=0x28) addr:0x02096898 +_ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov000_020968b8Ev kind:function(arm,size=0x28) addr:0x02096898 _ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov000_020968e0Ev kind:function(arm,size=0x1c) addr:0x020968c0 -func_ov000_020968fc kind:function(arm,size=0xb8) addr:0x020968dc +_ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov000_020968fcEv kind:function(arm,size=0xb8) addr:0x020968dc func_ov000_020969b4 kind:function(arm,size=0xe8) addr:0x02096994 _ZN29UnkStruct_027e0ce0_40_Base_1419func_ov000_02096a9cEv kind:function(arm,size=0x58) addr:0x02096a7c -func_ov000_02096af4 kind:function(arm,size=0x28) addr:0x02096ad4 -func_ov000_02096b1c kind:function(arm,size=0x78) addr:0x02096afc +_ZN29UnkStruct_027e0ce0_40_Base_1419func_ov000_02096af4Ev kind:function(arm,size=0x28) addr:0x02096ad4 +_ZN29UnkStruct_027e0ce0_40_Base_1419func_ov000_02096b1cEi kind:function(arm,size=0x78) addr:0x02096afc _ZN9PassengerC1Ev kind:function(arm,size=0x14) addr:0x02096b74 _ZN9Passenger5ResetEv kind:function(arm,size=0x24) addr:0x02096b88 func_ov000_02096bcc kind:function(arm,size=0x48) addr:0x02096bac @@ -2320,8 +2320,8 @@ _ZN5Actor8vfunc_18Ei kind:function(arm,size=0x8) addr:0x02098488 _ZN5Actor8vfunc_1CEv kind:function(arm,size=0x4) addr:0x02098490 _ZN5Actor8vfunc_20Ev kind:function(arm,size=0x4) addr:0x02098494 _ZN5Actor8vfunc_24Ev kind:function(arm,size=0x4) addr:0x02098498 -_ZN5Actor8vfunc_28Ev kind:function(arm,size=0x4) addr:0x0209849c -_ZN5Actor8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020984a0 +_ZN5Actor8vfunc_28EP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x0209849c +_ZN5Actor8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020984a0 _ZN5Actor8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020984a4 _ZN5Actor8vfunc_34Ev kind:function(arm,size=0x8) addr:0x020984a8 _ZN5Actor19func_ov000_020984d0Ev kind:function(arm,size=0x20) addr:0x020984b0 @@ -2344,7 +2344,7 @@ _ZN5Actor19func_ov000_02098838Ev kind:function(arm,size=0x28) addr:0x02098818 _ZN5Actor19func_ov000_0209a008Eis kind:function(arm,size=0xb0) addr:0x02098840 _ZN5Actor19func_ov000_02098910EP24UnkStruct_ov031_Items_00i kind:function(arm,size=0xd0) addr:0x020988f0 _ZN5Actor19func_ov000_020989e0Ev kind:function(arm,size=0x38) addr:0x020989c0 -func_ov000_02098a18 kind:function(arm,size=0x48) addr:0x020989f8 +_ZN5Actor19func_ov000_02098a18EP8Cylinder kind:function(arm,size=0x48) addr:0x020989f8 _ZN5Actor19func_ov000_02098a60Ei kind:function(arm,size=0x28) addr:0x02098a40 _ZN5Actor19func_ov000_02098a88Eii kind:function(arm,size=0x2c) addr:0x02098a68 _ZN5Actor19func_ov000_02098ab4EhiiP7VecFx32 kind:function(arm,size=0x74) addr:0x02098a94 @@ -2355,7 +2355,7 @@ func_ov000_02098d7c kind:function(arm,size=0x1b8) addr:0x02098d5c _ZN14Actor_Derived219func_ov000_02098f34EP7VecFx32 kind:function(arm,size=0xd0) addr:0x02098f14 _ZN14Actor_Derived28vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0xc) addr:0x02098fe4 func_ov000_02099010 kind:function(arm,size=0xb0) addr:0x02098ff0 -func_ov000_020990c0 kind:function(arm,size=0x21c) addr:0x020990a0 +_ZN14Actor_Derived219func_ov000_020990c0EP8Actor_9Cii kind:function(arm,size=0x21c) addr:0x020990a0 _ZN14Actor_Derived219func_ov000_020992dcEv kind:function(arm,size=0x90) addr:0x020992bc func_ov000_0209936c kind:function(arm,size=0x64) addr:0x0209934c func_ov000_020993d0 kind:function(arm,size=0x80) addr:0x020993b0 @@ -2372,7 +2372,7 @@ _ZN14Actor_Derived2D1Ev kind:function(arm,size=0x14) addr:0x020997d0 _ZN14Actor_Derived2D0Ev kind:function(arm,size=0x1c) addr:0x020997e4 _ZN26UnkStruct_ActorUnkCANS_224C1Ev kind:function(arm,size=0x50) addr:0x02099800 func_ov000_02099870 kind:function(arm,size=0x80) addr:0x02099850 -func_ov000_020998f0 kind:function(arm,size=0x11c) addr:0x020998d0 +_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_020998f0E8ActorRefP7VecFx32 kind:function(arm,size=0x11c) addr:0x020998d0 _ZN26UnkStruct_ActorUnkCANS_22419func_ov000_02099a0cEv kind:function(arm,size=0x10) addr:0x020999ec func_ov000_02099a1c kind:function(arm,size=0xc) addr:0x020999fc _ZN24UnkStruct_ov000_020b31a8C2EP10UnkSystem5P11ModelRenderP19UnkActorFileSystem2 kind:function(thumb,size=0x54) addr:0x02099a08 @@ -2556,9 +2556,9 @@ _ZN9MapObject8vfunc_04Ev kind:function(arm,size=0x4) addr:0x0209d098 _ZN9MapObject19func_ov000_0209d0bcEP8Vec2bCppPS_ kind:function(arm,size=0x58) addr:0x0209d09c _ZN9MapObject19func_ov000_0209d114Ev kind:function(arm,size=0x18) addr:0x0209d0f4 _ZN9MapObject19func_ov000_0209d12cEv kind:function(arm,size=0x18) addr:0x0209d10c -_ZN9MapObject19func_ov000_0209d144EP5Vec2sii kind:function(arm,size=0x88) addr:0x0209d124 +_ZN9MapObject19func_ov000_0209d144EP5Vec2siP21UnkStruct_027e09bc_0C kind:function(arm,size=0x88) addr:0x0209d124 _ZN9MapObject8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x8) addr:0x0209d1ac -_ZN9MapObject8vfunc_20Ev kind:function(arm,size=0x4) addr:0x0209d1b4 +_ZN9MapObject8vfunc_20Ei kind:function(arm,size=0x4) addr:0x0209d1b4 _ZN9MapObject8vfunc_24EPS_7VecFx32 kind:function(arm,size=0xc) addr:0x0209d1b8 _ZN9MapObject8vfunc_28Eiii kind:function(arm,size=0x8) addr:0x0209d1c4 _ZN9MapObject8vfunc_2CEP7VecFx32 kind:function(arm,size=0x40) addr:0x0209d1cc @@ -2608,9 +2608,9 @@ _ZN22MapObjectSwitchStep_40D1Ev kind:function(arm,size=0x14) addr:0x0209df7c _ZN19MapObjectSwitchStepD1Ev kind:function(arm,size=0x58) addr:0x0209df90 _ZN19MapObjectSwitchStepD0Ev kind:function(arm,size=0x60) addr:0x0209dfe8 _ZN19MapObjectSwitchStep8vfunc_00Ev kind:function(arm,size=0xb4) addr:0x0209e048 -_ZN19MapObjectSwitchStep19func_ov000_0209e11cEii kind:function(arm,size=0x164) addr:0x0209e0fc -_ZN19MapObjectSwitchStep8vfunc_20Ev kind:function(arm,size=0x34) addr:0x0209e260 -_ZN19MapObjectSwitchStep8vfunc_18EPcc kind:function(arm,size=0xd8) addr:0x0209e294 +_ZN19MapObjectSwitchStep19func_ov000_0209e11cEsi kind:function(arm,size=0x164) addr:0x0209e0fc +_ZN19MapObjectSwitchStep8vfunc_20Ei kind:function(arm,size=0x34) addr:0x0209e260 +_ZN19MapObjectSwitchStep8vfunc_18EPc kind:function(arm,size=0xd8) addr:0x0209e294 _ZN19MapObjectSwitchStep19func_ov000_0209e38cEv kind:function(arm,size=0x3c) addr:0x0209e36c _ZN22MapObjectSwitchStep_40D0Ev kind:function(arm,size=0x1c) addr:0x0209e3a8 _ZN26MapObjectProfileSwitchStepD1Ev kind:function(arm,size=0x14) addr:0x0209e3c4 @@ -2619,7 +2619,7 @@ _ZN26MapObjectProfileMiniBlocks6CreateEv kind:function(arm,size=0x24) addr:0x020 _ZN26MapObjectProfileMiniBlocksC1Ev kind:function(arm,size=0x4c) addr:0x0209e408 _ZN19MapObjectMiniBlocksC1Ev kind:function(arm,size=0x3c) addr:0x0209e454 _ZN19MapObjectMiniBlocks8vfunc_00Ev kind:function(arm,size=0x1fc) addr:0x0209e490 -_ZN19MapObjectMiniBlocks8vfunc_14Ev kind:function(arm,size=0x60) addr:0x0209e68c +_ZN19MapObjectMiniBlocks8vfunc_14Ei kind:function(arm,size=0x60) addr:0x0209e68c _ZN19MapObjectMiniBlocksD1Ev kind:function(arm,size=0x20) addr:0x0209e6ec _ZN19MapObjectMiniBlocksD0Ev kind:function(arm,size=0x28) addr:0x0209e70c _ZN26MapObjectProfileMiniBlocksD1Ev kind:function(arm,size=0x14) addr:0x0209e734 @@ -3015,7 +3015,7 @@ _ZN11ItemManager19func_ov000_020a89bcEv kind:function(thumb,size=0x18) addr:0x02 _ZN11ItemManager19func_ov000_020a89d4Ev kind:function(arm,size=0x38) addr:0x020a89b4 _ZN11ItemManager19func_ov000_020a8a0cEv kind:function(arm,size=0x50) addr:0x020a89ec _ZN11ItemManager19func_ov000_020a8a5cEv kind:function(arm,size=0x18) addr:0x020a8a3c -_ZN11ItemManager19func_ov000_020a8a74Ev kind:function(arm,size=0x1c) addr:0x020a8a54 +_ZN11ItemManager19func_ov000_020a8a74EP24UnkStruct_027e0ce0_30_00 kind:function(arm,size=0x1c) addr:0x020a8a54 _ZN11ItemManager19func_ov000_020a8a90Ev kind:function(arm,size=0x14) addr:0x020a8a70 _ZN11ItemManager19func_ov000_020a8aa4Ev kind:function(arm,size=0x14) addr:0x020a8a84 _ZN11ItemManager19func_ov000_020a8ab8Ev kind:function(arm,size=0x14) addr:0x020a8a98 @@ -3067,7 +3067,7 @@ _ZN14Actor_Derived18vfunc_A8Ev kind:function(arm,size=0x8) addr:0x020a97dc _ZN14Actor_Derived119func_ov000_020a9804Ev kind:function(arm,size=0xec) addr:0x020a97e4 _ZN14Actor_Derived18vfunc_20Ev kind:function(arm,size=0x4) addr:0x020a98d0 _ZN14Actor_Derived18vfunc_24Ev kind:function(arm,size=0x68) addr:0x020a98d4 -_ZN14Actor_Derived18vfunc_2CEi kind:function(arm,size=0x48) addr:0x020a993c +_ZN14Actor_Derived18vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x48) addr:0x020a993c _ZN14Actor_Derived18vfunc_B8Ev kind:function(arm,size=0x34) addr:0x020a9984 _ZN14Actor_Derived18vfunc_14Ev kind:function(arm,size=0x48) addr:0x020a99b8 _ZN19func_ov000_020a9a20D1Ev kind:function(arm,size=0x14) addr:0x020a9a00 diff --git a/config/usa/arm9/overlays/ov001/symbols.txt b/config/usa/arm9/overlays/ov001/symbols.txt index 8ed4fd54..f813e981 100644 --- a/config/usa/arm9/overlays/ov001/symbols.txt +++ b/config/usa/arm9/overlays/ov001/symbols.txt @@ -200,14 +200,14 @@ _Z19func_ov001_020bbac4iP10G3d_Model_ib kind:function(thumb,size=0x5c) addr:0x02 _ZN18PlayerActorBase_70C1Eii kind:function(thumb,size=0x260) addr:0x020bbb00 _ZN18PlayerActorBase_70D1Ev kind:function(thumb,size=0x96) addr:0x020bbd60 _ZN18PlayerActorBase_7019func_ov001_020bbe18Ei14UnkAngleStructjh kind:function(thumb,size=0x4c) addr:0x020bbdf8 -_ZN24UnkStruct_027e0ce0_30_00C1EP21UnkStruct_027e0ce0_38P21UnkStruct_027e0ce0_3CiPii kind:function(thumb,size=0x7c) addr:0x020bbe44 +_ZN24UnkStruct_027e0ce0_30_00C1EP21UnkStruct_027e0ce0_38P21UnkStruct_027e0ce0_3CP21UnkStruct_027e0ce0_40P15PlayerLinkActorP15PlayerActorBase kind:function(thumb,size=0x7c) addr:0x020bbe44 _ZN24UnkStruct_027e0ce0_30_00D1Ev kind:function(thumb,size=0x2) addr:0x020bbec0 _ZN21UnkStruct_027e0ce0_30C1Ev kind:function(thumb,size=0x18) addr:0x020bbec4 _ZN21UnkStruct_027e0ce0_30D1Ev kind:function(thumb,size=0x2) addr:0x020bbedc _ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf00Eii kind:function(thumb,size=0x24) addr:0x020bbee0 _ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf24EP21UnkStruct_027e0ce0_38 kind:function(thumb,size=0x2a) addr:0x020bbf04 _ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf50EP21UnkStruct_027e0ce0_3C kind:function(thumb,size=0x2a) addr:0x020bbf30 -_ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf7cEiPii kind:function(thumb,size=0x50) addr:0x020bbf5c +_ZN21UnkStruct_027e0ce0_3019func_ov001_020bbf7cEP21UnkStruct_027e0ce0_40P15PlayerLinkActorP15PlayerActorBase kind:function(thumb,size=0x50) addr:0x020bbf5c _ZN21UnkStruct_027e0ce0_3019func_ov001_020bbfccEv kind:function(thumb,size=0x5a) addr:0x020bbfac _ZN26UnkStruct_027e0ce0_40_BaseC2EiPvP11ItemManager kind:function(thumb,size=0x88) addr:0x020bc008 _ZN26UnkStruct_027e0ce0_40_BaseD2Ev kind:function(thumb,size=0x30) addr:0x020bc090 @@ -241,7 +241,7 @@ _ZN15PlayerActorBase19func_ov001_020bc96cEv kind:function(thumb,size=0x2e) addr: _ZN15PlayerLinkActorC1EiP11ItemManagerP21UnkStruct_027e0ce0_40P25UnkStruct_027e0ce0_40_150 kind:function(thumb,size=0x138) addr:0x020bc97c _ZN19PlayerLinkActor_1B0D1Ev kind:function(thumb,size=0xc) addr:0x020bcab4 _ZN15PlayerLinkActorD1Ev kind:function(thumb,size=0x80) addr:0x020bcac0 -_ZN15PlayerLinkActor19func_ov001_020bcb60EP25UnkStruct_027e0ce0_40_328 kind:function(thumb,size=0x10) addr:0x020bcb40 +_ZN15PlayerLinkActor19func_ov001_020bcb60EP15PlayerActorBase kind:function(thumb,size=0x10) addr:0x020bcb40 _ZN15PlayerLinkActor19func_ov001_020bcb70Ev kind:function(thumb,size=0x36) addr:0x020bcb50 _ZN15PlayerLinkActor19func_ov001_020bcba8Ev kind:function(thumb,size=0x26) addr:0x020bcb88 _ZN15PlayerLinkActor19func_ov001_020bcbd0EP7VecFx32 kind:function(thumb,size=0x98) addr:0x020bcbb0 diff --git a/config/usa/arm9/overlays/ov005/symbols.txt b/config/usa/arm9/overlays/ov005/symbols.txt index 6827728f..a75290b7 100644 --- a/config/usa/arm9/overlays/ov005/symbols.txt +++ b/config/usa/arm9/overlays/ov005/symbols.txt @@ -1,7 +1,7 @@ func_ov005_020b6520 kind:function(arm,size=0x28) addr:0x020b6500 func_ov005_020b6548 kind:function(arm,size=0x28) addr:0x020b6528 -func_ov005_020b6570 kind:function(arm,size=0x134) addr:0x020b6550 -func_ov005_020b66a4 kind:function(arm,size=0x1a4) addr:0x020b6684 +_ZN16MapObjectManager19func_ov005_020b6570Ei kind:function(arm,size=0x134) addr:0x020b6550 +_ZN12ActorManager19func_ov005_020b66a4Ei kind:function(arm,size=0x1a4) addr:0x020b6684 _ZN12ActorUnkSWOB8vfunc_20Ev kind:function(arm,size=0xf4) addr:0x020b6828 func_ov005_020b693c kind:function(arm,size=0x224) addr:0x020b691c func_ov005_020b6b60 kind:function(arm,size=0x4c) addr:0x020b6b40 diff --git a/config/usa/arm9/overlays/ov017/relocs.txt b/config/usa/arm9/overlays/ov017/relocs.txt index 64e62c1d..fdb8b186 100644 --- a/config/usa/arm9/overlays/ov017/relocs.txt +++ b/config/usa/arm9/overlays/ov017/relocs.txt @@ -60,11 +60,11 @@ from:0x020bb9f8 kind:load to:0x02043e30 module:main from:0x020bb9fc kind:load to:0x020b82f0 module:overlays(3,8,9,13,16) from:0x020bba10 kind:arm_call to:0x020bba74 module:overlay(17) from:0x020bba18 kind:arm_call to:0x02013d94 module:main -from:0x020bba24 kind:load to:0x020c3ee8 module:overlay(17) +from:0x020bba24 kind:load to:0x020c3ee0 module:overlay(17) add:0x8 from:0x020bba38 kind:arm_call to:0x020bba74 module:overlay(17) from:0x020bba40 kind:arm_call to:0x02013d94 module:main from:0x020bba48 kind:arm_call to:0x02011ff4 module:main -from:0x020bba54 kind:load to:0x020c3ee8 module:overlay(17) +from:0x020bba54 kind:load to:0x020c3ee0 module:overlay(17) add:0x8 from:0x020bba6c kind:load to:0x02049b60 module:main from:0x020bba70 kind:load to:0x02013fec module:main from:0x020bba84 kind:load to:0x02049b60 module:main @@ -867,7 +867,7 @@ from:0x020c3e44 kind:arm_call to:0x0203ce4c module:main from:0x020c3e58 kind:load to:0x020c3f40 module:overlay(17) from:0x020c3e5c kind:load to:0x020c3f50 module:overlay(17) from:0x020c3e60 kind:load to:0x020c401c module:overlay(17) -from:0x020c3e64 kind:load to:0x020c3ee8 module:overlay(17) +from:0x020c3e64 kind:load to:0x020c3ee0 module:overlay(17) add:0x8 from:0x020c3e68 kind:load to:0x020bba00 module:overlay(17) from:0x020c3e6c kind:load to:0x020c3f44 module:overlay(17) from:0x020c3ea4 kind:load to:0x020c3ef4 module:overlay(17) diff --git a/config/usa/arm9/overlays/ov017/symbols.txt b/config/usa/arm9/overlays/ov017/symbols.txt index 000a02db..f87a4cad 100644 --- a/config/usa/arm9/overlays/ov017/symbols.txt +++ b/config/usa/arm9/overlays/ov017/symbols.txt @@ -1,45 +1,45 @@ -func_ov017_020bb660 kind:function(arm,size=0x198) addr:0x020bb640 -func_ov017_020bb7f8 kind:function(arm,size=0x13c) addr:0x020bb7d8 -func_ov017_020bb934 kind:function(arm,size=0x60) addr:0x020bb914 -_ZN18UnkStruct_027e09a419func_ov017_020bb994EPv kind:function(arm,size=0x8c) addr:0x020bb974 -_ZN19func_ov017_020bba20D1Ev kind:function(arm,size=0x28) addr:0x020bba00 -_ZN19func_ov017_020bba48D0Ev kind:function(arm,size=0x30) addr:0x020bba28 +_ZN18UnkStruct_027e09a419func_ov017_020bb660Ei kind:function(arm,size=0x198) addr:0x020bb640 +_ZN18UnkStruct_027e09a419func_ov017_020bb7f8EPv kind:function(arm,size=0x13c) addr:0x020bb7d8 +_ZN18UnkStruct_027e09a419func_ov017_020bb934EPv kind:function(arm,size=0x60) addr:0x020bb914 +_ZN18UnkStruct_027e09a419func_ov017_020bb994EPc kind:function(arm,size=0x8c) addr:0x020bb974 +_ZN24UnkStruct_ov017_020c3f70D1Ev kind:function(arm,size=0x28) addr:0x020bba00 +_ZN24UnkStruct_ov017_020c3f70D0Ev kind:function(arm,size=0x30) addr:0x020bba28 _ZN24UnkStruct_ov017_020c3f7019func_ov017_020bba78Ev kind:function(arm,size=0x1c) addr:0x020bba58 _ZN24UnkStruct_ov017_020c3f7019func_ov017_020bba94Ev kind:function(arm,size=0x14) addr:0x020bba74 -func_ov017_020bbaa8 kind:function(arm,size=0x230) addr:0x020bba88 -func_ov017_020bbcd8 kind:function(arm,size=0x21c) addr:0x020bbcb8 -func_ov017_020bbef4 kind:function(arm,size=0x78) addr:0x020bbed4 -func_ov017_020bbf6c kind:function(arm,size=0x10) addr:0x020bbf4c -func_ov017_020bbf7c kind:function(arm,size=0x680) addr:0x020bbf5c -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 -_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 -func_ov017_020bd4a0 kind:function(arm,size=0xc8) addr:0x020bd480 -func_ov017_020bd568 kind:function(arm,size=0x5c) addr:0x020bd548 -func_ov017_020bd5c4 kind:function(arm,size=0x18) addr:0x020bd5a4 -func_ov017_020bd5dc kind:function(arm,size=0x68) addr:0x020bd5bc -func_ov017_020bd644 kind:function(arm,size=0x58) addr:0x020bd624 +_ZN18PlayerActorBase_7019func_ov017_020bbaa8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x230) addr:0x020bba88 +_ZN18PlayerActorBase_7019func_ov017_020bbcd8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x21c) addr:0x020bbcb8 +_ZN18PlayerActorBase_7019func_ov017_020bbef4EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x78) addr:0x020bbed4 +_ZN18PlayerActorBase_7019func_ov017_020bbf6cEv kind:function(arm,size=0x10) addr:0x020bbf4c +_ZN24UnkStruct_027e0ce0_30_0019func_ov017_020bbf7cEP11ItemManager kind:function(arm,size=0x680) addr:0x020bbf5c +_ZN21UnkStruct_027e0ce0_3019func_ov017_020bc5fcEP11ItemManager kind:function(arm,size=0x44) addr:0x020bc5dc +_ZN18PlayerLinkActor_9C19func_ov017_020bc640EjbbhhP7VecFx32S1_S1_ kind:function(arm,size=0x31c) addr:0x020bc620 +_ZN21UnkStruct_027e0ce0_4019func_ov017_020bc95cEb kind:function(arm,size=0xe4) addr:0x020bc93c +_ZN21UnkStruct_027e0ce0_4019func_ov017_020bca40Ebi kind:function(arm,size=0x3a8) addr:0x020bca20 +_ZN21UnkStruct_027e0ce0_4019func_ov017_020bcde8Eb kind:function(arm,size=0x4b8) addr:0x020bcdc8 +_ZN11ItemManager19func_ov017_020bd2a0Ebb kind:function(arm,size=0x48) addr:0x020bd280 +_ZN11ItemManager19func_ov017_020bd2e8EPv kind:function(arm,size=0x18) addr:0x020bd2c8 +_ZN29UnkStruct_027e0ce0_40_Base_9419func_ov017_020bd300EP29UnkStruct_027e0ce0_40_Base_14ib kind:function(arm,size=0x178) addr:0x020bd2e0 +_ZN29UnkStruct_027e0ce0_40_Base_9419func_ov017_020bd478Ev kind:function(arm,size=0x28) addr:0x020bd458 +_ZN18UnkStruct_027e0ce019func_ov017_020bd4a0Eib kind:function(arm,size=0xc8) addr:0x020bd480 +_ZN18UnkStruct_027e0ce019func_ov017_020bd568Ei kind:function(arm,size=0x5c) addr:0x020bd548 +_ZN18UnkStruct_027e0ce019func_ov017_020bd5c4EPv kind:function(arm,size=0x18) addr:0x020bd5a4 +_ZN18UnkStruct_027e0ce019func_ov017_020bd5dcEPv kind:function(arm,size=0x68) addr:0x020bd5bc +_ZN18UnkStruct_027e0ce019func_ov017_020bd644EPv kind:function(arm,size=0x58) addr:0x020bd624 _ZN18UnkStruct_027e0ce019func_ov017_020bd69cEv kind:function(arm,size=0x1c) addr:0x020bd67c -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 -_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 +_ZN15PlayerLinkActor19func_ov017_020bd6b8Ev kind:function(arm,size=0x28) addr:0x020bd698 +_ZN15PlayerLinkActor19func_ov017_020bd6e0Eb kind:function(arm,size=0x78) addr:0x020bd6c0 +_ZN15PlayerLinkActor19func_ov017_020bd758Ev kind:function(arm,size=0x30) addr:0x020bd738 +_ZN15PlayerLinkActor19func_ov017_020bd788Eb kind:function(arm,size=0x56c) addr:0x020bd768 +_ZN15PlayerLinkActor19func_ov017_020bdcf4Eii kind:function(arm,size=0x90) addr:0x020bdcd4 +_ZN15PlayerLinkActor19func_ov017_020bdd84EPvi kind:function(arm,size=0x1c4) addr:0x020bdd64 +_ZN15PlayerLinkActor19func_ov017_020bdf48EPciPvP34UnkStruct_ov019_020d24c8_28_258_00 kind:function(arm,size=0x150) addr:0x020bdf28 +_ZN15PlayerLinkActor19func_ov017_020be098Ev kind:function(arm,size=0x10) addr:0x020be078 +_ZN21PlayerLinkActor_A0_3819func_ov017_020be0a8Ei kind:function(arm,size=0x38) addr:0x020be088 +_ZN21PlayerLinkActor_A0_3819func_ov017_020be0e0EiP7VecFx32bb kind:function(arm,size=0x20c) addr:0x020be0c0 +_ZN29UnkStruct_027e0ce0_40_Base_7C19func_ov017_020be2ecEP29UnkStruct_027e0ce0_40_Base_14b15UnkParamStruct1 kind:function(arm,size=0x148) addr:0x020be2cc _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 +_ZN29UnkStruct_027e0ce0_40_Base_1419func_ov017_020be44cEib kind:function(arm,size=0x45c) addr:0x020be42c +_ZN21UnkStruct_027e0cf8_0819func_ov017_020be8a8Ev kind:function(arm,size=0x124) addr:0x020be888 _ZN12CargoManager8DoUpdateEv kind:function(arm,size=0x18) addr:0x020be9ac _ZN12CargoManager15IsNotUsingTimerEi kind:function(arm,size=0x30) addr:0x020be9c4 _ZN12CargoManager6UpdateEv kind:function(arm,size=0x140) addr:0x020be9f4 @@ -49,62 +49,62 @@ _ZN12CargoManager19func_ov017_020bebdcEv kind:function(arm,size=0x44) addr:0x020 _ZN12CargoManager19func_ov017_020bec20Ev kind:function(arm,size=0x4c) addr:0x020bec00 _ZN12CargoManager12RemoveAmountEi kind:function(arm,size=0x30) addr:0x020bec4c _ZN12CargoManager19func_ov017_020bec9cEv kind:function(arm,size=0x3c) addr:0x020bec7c -func_ov017_020becd8 kind:function(arm,size=0x148) addr:0x020becb8 -func_ov017_020bee20 kind:function(arm,size=0x44) addr:0x020bee00 -func_ov017_020bee64 kind:function(arm,size=0x20) addr:0x020bee44 -func_ov017_020bee84 kind:function(arm,size=0x20) addr:0x020bee64 -func_ov017_020beea4 kind:function(arm,size=0x28) addr:0x020bee84 -func_ov017_020beecc kind:function(arm,size=0x20) addr:0x020beeac +_ZN12ActorManager19func_ov017_020becd8Ei kind:function(arm,size=0x148) addr:0x020becb8 +_ZN12ActorManager19func_ov017_020bee20EP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x44) addr:0x020bee00 +_ZN12ActorManager19func_ov017_020bee64EP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020bee44 +_ZN12ActorManager19func_ov017_020bee84EP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020bee64 +_ZN12ActorManager19func_ov017_020beea4EP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x28) addr:0x020bee84 +_ZN12ActorManager19func_ov017_020beeccEP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020beeac _ZN5Actor19func_ov017_020beeecEi kind:function(arm,size=0x60) addr:0x020beecc -_ZN14Actor_Derived219func_ov017_020bef4cEi kind:function(arm,size=0x3c) addr:0x020bef2c -_ZN5Actor19func_ov017_020bef88EP14Actor_vfunc_30Pvi kind:function(arm,size=0x9c) addr:0x020bef68 -func_ov017_020bf024 kind:function(arm,size=0x2c) addr:0x020bf004 -func_ov017_020bf050 kind:function(arm,size=0x128) addr:0x020bf030 -_ZN14Actor_Derived219func_ov017_020bf178EP8Actor_9Ci kind:function(arm,size=0x10c) addr:0x020bf158 -func_ov017_020bf284 kind:function(arm,size=0x54) addr:0x020bf264 -func_ov017_020bf2d8 kind:function(arm,size=0x108) addr:0x020bf2b8 +_ZN5Actor19func_ov017_020bef4cEi kind:function(arm,size=0x3c) addr:0x020bef2c +_ZN5Actor19func_ov017_020bef88EP14Actor_vfunc_30P34UnkStruct_ov019_020d24c8_28_258_00i kind:function(arm,size=0x9c) addr:0x020bef68 +_ZN5Actor19func_ov017_020bf024EP14Actor_vfunc_30 kind:function(arm,size=0x2c) addr:0x020bf004 +_ZN5Actor19func_ov017_020bf050EP8Actor_9Ci kind:function(arm,size=0x128) addr:0x020bf030 +_ZN5Actor19func_ov017_020bf178EP8Actor_9Ci kind:function(arm,size=0x10c) addr:0x020bf158 +_ZN5Actor19func_ov017_020bf284EP7VecFx32S0_ kind:function(arm,size=0x54) addr:0x020bf264 +_ZN5Actor19func_ov017_020bf2d8EP8Actor_9Ci kind:function(arm,size=0x108) addr:0x020bf2b8 _ZN5Actor19func_ov017_020bf3e0Eii kind:function(arm,size=0xd0) addr:0x020bf3c0 -func_ov017_020bf4b0 kind:function(arm,size=0xc4) addr:0x020bf490 -func_ov017_020bf574 kind:function(arm,size=0x50) addr:0x020bf554 -_ZN5Actor19func_ov017_020bf5c4EP7VecFx32iiii kind:function(arm,size=0x70) addr:0x020bf5a4 +_ZN5Actor19func_ov017_020bf4b0Ei kind:function(arm,size=0xc4) addr:0x020bf490 +_ZN5Actor19func_ov017_020bf574Eii kind:function(arm,size=0x50) addr:0x020bf554 +_ZN5Actor19func_ov017_020bf5c4EP7VecFx32iiis kind:function(arm,size=0x70) addr:0x020bf5a4 _ZN5Actor19func_ov017_020bf634EPK7VecFx32ti kind:function(arm,size=0x54) addr:0x020bf614 _ZN5Actor19func_ov017_020bf688Ev kind:function(arm,size=0x88) addr:0x020bf668 -func_ov017_020bf710 kind:function(arm,size=0x98) addr:0x020bf6f0 -func_ov017_020bf7a8 kind:function(arm,size=0xec) addr:0x020bf788 -_ZN14Actor_Derived219func_ov017_020bf894EP26UnkStruct_ActorUnkCANS_224 kind:function(arm,size=0x60) addr:0x020bf874 +_ZN5Actor19func_ov017_020bf710EP26UnkStruct_ActorUnkCANS_224PK7VecFx32t kind:function(arm,size=0x98) addr:0x020bf6f0 +_ZN5Actor19func_ov017_020bf7a8Ev kind:function(arm,size=0xec) addr:0x020bf788 +_ZN5Actor19func_ov017_020bf894EP26UnkStruct_ActorUnkCANS_224 kind:function(arm,size=0x60) addr:0x020bf874 _ZN5Actor8vfunc_40Ev kind:function(arm,size=0x44) addr:0x020bf8d4 _ZN5Actor8vfunc_44Ev kind:function(arm,size=0x64) addr:0x020bf918 -func_ov017_020bf99c kind:function(arm,size=0x2c) addr:0x020bf97c +_ZN5Actor19func_ov017_020bf99cEv kind:function(arm,size=0x2c) addr:0x020bf97c _ZN5Actor19func_ov017_020bf9c8EPS_ kind:function(arm,size=0x88) addr:0x020bf9a8 _ZN5Actor19func_ov017_020bfa50EP7VecFx32i kind:function(arm,size=0x84) addr:0x020bfa30 -func_ov017_020bfad4 kind:function(arm,size=0x44) addr:0x020bfab4 +_ZN5Actor19func_ov017_020bfad4Ev kind:function(arm,size=0x44) addr:0x020bfab4 _ZN5Actor19func_ov017_020bfb18EP8Actor_9C kind:function(arm,size=0x238) addr:0x020bfaf8 -_ZN5Actor8vfunc_14Ev kind:function(arm,size=0x4c) addr:0x020bfd30 -func_ov017_020bfd9c kind:function(arm,size=0x130) addr:0x020bfd7c -_ZN5Actor8vfunc_48Ev kind:function(arm,size=0x80) addr:0x020bfeac +_ZN5Actor8vfunc_14EP8Cylinder kind:function(arm,size=0x4c) addr:0x020bfd30 +_ZN5Actor19func_ov017_020bfd9cEP5Vec2siP21UnkStruct_027e09bc_0CP4AABB kind:function(arm,size=0x130) addr:0x020bfd7c +_ZN5Actor8vfunc_48Ei kind:function(arm,size=0x80) addr:0x020bfeac _ZN14ActorEventIcon8vfunc_24Ev kind:function(arm,size=0xc) addr:0x020bff2c _ZN14ActorEventIcon8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0xd4) addr:0x020bff38 -func_ov017_020c002c kind:function(arm,size=0x50) addr:0x020c000c -func_ov017_020c007c kind:function(arm,size=0x60) addr:0x020c005c -func_ov017_020c00dc kind:function(arm,size=0xec) addr:0x020c00bc -func_ov017_020c01c8 kind:function(arm,size=0x4) addr:0x020c01a8 -func_ov017_020c01cc kind:function(arm,size=0x70) addr:0x020c01ac -func_ov017_020c023c kind:function(arm,size=0x70) addr:0x020c021c -func_ov017_020c02ac kind:function(arm,size=0x48) addr:0x020c028c -func_ov017_020c02f4 kind:function(arm,size=0x48) addr:0x020c02d4 -func_ov017_020c033c kind:function(arm,size=0x1d0) addr:0x020c031c -func_ov017_020c050c kind:function(arm,size=0x80) addr:0x020c04ec +_ZN14ActorEventIcon19func_ov017_020c002cEv kind:function(arm,size=0x50) addr:0x020c000c +_ZN16MapObjectManager19func_ov017_020c007cEi kind:function(arm,size=0x60) addr:0x020c005c +_ZN16MapObjectManager19func_ov017_020c00dcEi kind:function(arm,size=0xec) addr:0x020c00bc +_ZN16MapObjectManager19func_ov017_020c01c8EPv kind:function(arm,size=0x4) addr:0x020c01a8 +_ZN16MapObjectManager19func_ov017_020c01ccEi kind:function(arm,size=0x70) addr:0x020c01ac +_ZN16MapObjectManager19func_ov017_020c023cEPc kind:function(arm,size=0x70) addr:0x020c021c +_ZN16MapObjectManager19func_ov017_020c02acEi8Vec2bCpp kind:function(arm,size=0x48) addr:0x020c028c +_ZN16MapObjectManager19func_ov017_020c02f4EiP7VecFx32 kind:function(arm,size=0x48) addr:0x020c02d4 +_ZN16MapObjectManager19func_ov017_020c033cEPiPS_PK5Vec2sii kind:function(arm,size=0x1d0) addr:0x020c031c +_ZN16MapObjectManager19func_ov017_020c050cEiiii kind:function(arm,size=0x80) addr:0x020c04ec _ZN9MapObject8vfunc_08Ev kind:function(arm,size=0x4) addr:0x020c056c _ZN9MapObject8vfunc_0CEv kind:function(arm,size=0x4) addr:0x020c0570 _ZN9MapObject8vfunc_10Ev kind:function(arm,size=0x4) addr:0x020c0574 -_ZN9MapObject8vfunc_14Ev kind:function(arm,size=0x4) addr:0x020c0578 -_ZN9MapObject8vfunc_18EPcc kind:function(arm,size=0x4) addr:0x020c057c +_ZN9MapObject8vfunc_14Ei kind:function(arm,size=0x4) addr:0x020c0578 +_ZN9MapObject8vfunc_18EPc kind:function(arm,size=0x4) addr:0x020c057c _ZN19MapObjectSwitchStep8vfunc_08Ev kind:function(arm,size=0x1ac) addr:0x020c0580 -_ZN19MapObjectSwitchStep8vfunc_14Ev kind:function(arm,size=0x28) addr:0x020c072c +_ZN19MapObjectSwitchStep8vfunc_14Ei kind:function(arm,size=0x28) addr:0x020c072c func_ov017_020c0774 kind:function(arm,size=0x130) addr:0x020c0754 func_ov017_020c08a4 kind:function(arm,size=0x20) addr:0x020c0884 _ZN18UnkStruct_027e09b419func_ov017_020c08c4EP7VecFx32iiiii kind:function(arm,size=0xac) addr:0x020c08a4 -func_ov017_020c0970 kind:function(arm,size=0xc0) addr:0x020c0950 +_ZN18UnkStruct_027e09b419func_ov017_020c0970EP7VecFx32iiiiii kind:function(arm,size=0xc0) addr:0x020c0950 func_ov017_020c0a30 kind:function(arm,size=0x3c) addr:0x020c0a10 func_ov017_020c0a6c kind:function(arm,size=0xb8) addr:0x020c0a4c func_ov017_020c0b24 kind:function(arm,size=0x12c) addr:0x020c0b04 @@ -175,7 +175,7 @@ __sinit_ov017_020c3ea8 kind:function(arm,size=0x18) addr:0x020c3ea8 .p__sinit_ov017_020c3e04 kind:data(word) addr:0x020c3ec0 .p__sinit_ov017_020c3e70 kind:data(word) addr:0x020c3ec4 .p__sinit_ov017_020c3ea8 kind:data(word) addr:0x020c3ec8 -data_ov017_020c3ee8 kind:data(any) addr:0x020c3ee8 +_ZTV24UnkStruct_ov017_020c3f70 kind:data(any) addr:0x020c3ee0 data_ov017_020c3ef4 kind:data(any) addr:0x020c3ef4 _ZTV21UnkStruct_027e0cec_00 kind:data(any) addr:0x020c3f10 data_ov017_020c3f1c kind:data(any) addr:0x020c3f1c diff --git a/config/usa/arm9/overlays/ov021/symbols.txt b/config/usa/arm9/overlays/ov021/symbols.txt index 10a399cd..6b1662d9 100644 --- a/config/usa/arm9/overlays/ov021/symbols.txt +++ b/config/usa/arm9/overlays/ov021/symbols.txt @@ -55,12 +55,12 @@ _ZN21UnkStruct_027e0ce0_24D1Ev kind:function(thumb,size=0x2) addr:0x020ea9e4 _ZN21UnkStruct_027e0ce0_2419func_ov021_020eaa08EP21UnkStruct_027e0ce0_20 kind:function(thumb,size=0xbc) addr:0x020ea9e8 _ZN21UnkStruct_027e0ce0_2419func_ov021_020eaac4Ev kind:function(thumb,size=0x50) addr:0x020eaaa4 _ZN21UnkStruct_027e0ce0_2419func_ov021_020eab14EiPK24UnkStruct_ov001_020c40f4P21UnkStruct_027e0ce0_30 kind:function(thumb,size=0x56) addr:0x020eaaf4 -func_ov021_020eab6c kind:function(arm,size=0x2c0) addr:0x020eab4c -func_ov021_020eae2c kind:function(arm,size=0x58) addr:0x020eae0c -func_ov021_020eae84 kind:function(arm,size=0x6c) addr:0x020eae64 -func_ov021_020eaef0 kind:function(arm,size=0xa8) addr:0x020eaed0 +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eab6cEb kind:function(arm,size=0x2c0) addr:0x020eab4c +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eae2cEi kind:function(arm,size=0x58) addr:0x020eae0c +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eae84Ev kind:function(arm,size=0x6c) addr:0x020eae64 +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eaef0Eib kind:function(arm,size=0xa8) addr:0x020eaed0 func_ov021_020eaf98 kind:function(arm,size=0x78) addr:0x020eaf78 -func_ov021_020eb010 kind:function(arm,size=0x358) addr:0x020eaff0 +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eb010Ev kind:function(arm,size=0x358) addr:0x020eaff0 func_ov021_020eb368 kind:function(arm,size=0x30) addr:0x020eb348 func_ov021_020eb398 kind:function(arm,size=0x48) addr:0x020eb378 func_ov021_020eb3e0 kind:function(arm,size=0x48) addr:0x020eb3c0 @@ -76,14 +76,14 @@ func_ov021_020eb648 kind:function(arm,size=0x78) addr:0x020eb628 func_ov021_020eb6c0 kind:function(arm,size=0x7c) addr:0x020eb6a0 func_ov021_020eb73c kind:function(arm,size=0xe8) addr:0x020eb71c func_ov021_020eb824 kind:function(arm,size=0x4c) addr:0x020eb804 -func_ov021_020eb870 kind:function(arm,size=0x90) addr:0x020eb850 +_ZN21UnkStruct_027e0ce0_2419func_ov021_020eb870EiiiPv kind:function(arm,size=0x90) addr:0x020eb850 func_ov021_020eb900 kind:function(arm,size=0x148) addr:0x020eb8e0 func_ov021_020eba48 kind:function(thumb,size=0x60) addr:0x020eba28 func_ov021_020ebaa8 kind:function(arm,size=0x90) addr:0x020eba88 func_ov021_020ebb38 kind:function(arm,size=0x104) addr:0x020ebb18 _ZN24UnkStruct_027e0ce0_30_08C1Ei kind:function(thumb,size=0x28) addr:0x020ebc1c _ZN24UnkStruct_027e0ce0_30_08D1Ev kind:function(thumb,size=0x2) addr:0x020ebc44 -func_ov021_020ebc68 kind:function(arm,size=0x4c) addr:0x020ebc48 +_ZN24UnkStruct_027e0ce0_30_0819func_ov021_020ebc68Ev kind:function(arm,size=0x4c) addr:0x020ebc48 func_ov021_020ebcb4 kind:function(arm,size=0xec) addr:0x020ebc94 _ZN15PlayerLinkActor19func_ov021_020ebda0Ev kind:function(arm,size=0x50) addr:0x020ebd80 func_ov021_020ebdf0 kind:function(arm,size=0x58) addr:0x020ebdd0 @@ -422,7 +422,7 @@ func_ov021_020f6614 kind:function(arm,size=0xb0) addr:0x020f65f4 func_ov021_020f66c4 kind:function(arm,size=0x12c) addr:0x020f66a4 func_ov021_020f67f0 kind:function(arm,size=0x70c) addr:0x020f67d0 func_ov021_020f6efc kind:function(arm,size=0x5c) addr:0x020f6edc -func_ov021_020f6f58 kind:function(arm,size=0x1e4) addr:0x020f6f38 +_ZN18UnkStruct_027e0cf419func_ov021_020f6f58EiiPvii kind:function(arm,size=0x1e4) addr:0x020f6f38 func_ov021_020f713c kind:function(arm,size=0xdc) addr:0x020f711c func_ov021_020f7218 kind:function(arm,size=0x530) addr:0x020f71f8 func_ov021_020f7748 kind:function(arm,size=0x24) addr:0x020f7728 diff --git a/config/usa/arm9/overlays/ov024/symbols.txt b/config/usa/arm9/overlays/ov024/symbols.txt index c560482c..b7db8380 100644 --- a/config/usa/arm9/overlays/ov024/symbols.txt +++ b/config/usa/arm9/overlays/ov024/symbols.txt @@ -109,10 +109,10 @@ _ZN18UnkStruct_027e09987DestroyEv kind:function(arm,size=0x2c) addr:0x020c6ee8 _ZN18UnkStruct_027e0998D1Ev kind:function(arm,size=0x14) addr:0x020c6f14 _ZN18UnkStruct_027e0998C1Ev kind:function(arm,size=0x20) addr:0x020c6f28 _ZN18UnkStruct_027e09986CreateEv kind:function(arm,size=0x24) addr:0x020c6f48 -_ZN18UnkStruct_027e09988vfunc_00EP7VecFx32P5Vec2sPt kind:function(arm,size=0x1e0) addr:0x020c6f6c +_ZN18UnkStruct_027e09988vfunc_00EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x1e0) addr:0x020c6f6c _ZN18UnkStruct_027e099819func_ov024_020c716cEv kind:function(arm,size=0xa8) addr:0x020c714c -_ZN18UnkStruct_027e099819func_ov024_020c7214EP7VecFx32P5Vec2sPt kind:function(arm,size=0x68) addr:0x020c71f4 -_ZN18UnkStruct_027e099819func_ov024_020c727cEP5Vec2sPt kind:function(arm,size=0x84) addr:0x020c725c +_ZN18UnkStruct_027e099819func_ov024_020c7214EP7VecFx32P5Vec2sP8ActorRef kind:function(arm,size=0x68) addr:0x020c71f4 +_ZN18UnkStruct_027e099819func_ov024_020c727cEP5Vec2sP8ActorRef kind:function(arm,size=0x84) addr:0x020c725c _ZN18UnkStruct_027e099819func_ov024_020c7300Ei kind:function(arm,size=0x54) addr:0x020c72e0 _ZN18UnkStruct_027e099819func_ov024_020c7354Ev kind:function(arm,size=0x3c) addr:0x020c7334 _ZN18UnkStruct_027e0cf86CreateEv kind:function(arm,size=0x24) addr:0x020c7370 diff --git a/config/usa/arm9/overlays/ov026/symbols.txt b/config/usa/arm9/overlays/ov026/symbols.txt index 1bef379b..235c049e 100644 --- a/config/usa/arm9/overlays/ov026/symbols.txt +++ b/config/usa/arm9/overlays/ov026/symbols.txt @@ -47,7 +47,7 @@ func_ov026_020d9778 kind:function(arm,size=0x10) addr:0x020d9758 func_ov026_020d9788 kind:function(arm,size=0x148) addr:0x020d9768 func_ov026_020d98d0 kind:function(arm,size=0xe8) addr:0x020d98b0 func_ov026_020d99b8 kind:function(arm,size=0x25c) addr:0x020d9998 -func_ov026_020d9c14 kind:function(arm,size=0x460) addr:0x020d9bf4 +_ZN18UnkStruct_027e0d3819func_ov026_020d9c14E8ActorRefP7VecFx32S2_ kind:function(arm,size=0x460) addr:0x020d9bf4 func_ov026_020da074 kind:function(arm,size=0x114) addr:0x020da054 func_ov026_020da188 kind:function(arm,size=0x114) addr:0x020da168 func_ov026_020da29c kind:function(arm,size=0x164) addr:0x020da27c @@ -102,13 +102,13 @@ _ZN21UnkStruct_027e0ce0_3819func_ov026_020dc8f0Ev kind:function(arm,size=0x28) a _ZN21UnkStruct_027e0ce0_3819func_ov026_020dc918Ev kind:function(arm,size=0x98) addr:0x020dc8f8 _ZN21UnkStruct_027e0ce0_3819func_ov026_020dc9b0Ev kind:function(arm,size=0x64) addr:0x020dc990 _ZN24UnkStruct_ov026_02138d1019func_ov026_020dca14Ev kind:function(arm,size=0x1788) addr:0x020dc9f4 -func_ov026_020de19c kind:function(arm,size=0x38) addr:0x020de17c +_ZN21UnkStruct_027e0ce0_3819func_ov026_020de19cEib kind:function(arm,size=0x38) addr:0x020de17c func_ov026_020de1d4 kind:function(arm,size=0x30) addr:0x020de1b4 func_ov026_020de204 kind:function(arm,size=0x158) addr:0x020de1e4 func_ov026_020de35c kind:function(arm,size=0x100) addr:0x020de33c -func_ov026_020de45c kind:function(arm,size=0x10) addr:0x020de43c -func_ov026_020de46c kind:function(arm,size=0x30) addr:0x020de44c -func_ov026_020de49c kind:function(arm,size=0x46c) addr:0x020de47c +_ZN21UnkStruct_027e0ce0_3819func_ov026_020de45cEPv kind:function(arm,size=0x10) addr:0x020de43c +_ZN21UnkStruct_027e0ce0_3819func_ov026_020de46cEv kind:function(arm,size=0x30) addr:0x020de44c +_ZN21UnkStruct_027e0ce0_3819func_ov026_020de49cEv kind:function(arm,size=0x46c) addr:0x020de47c _ZN21UnkStruct_027e0ce0_3819func_ov026_020de908EP24UnkStruct_027e0ce0_30_00 kind:function(arm,size=0xb4) addr:0x020de8e8 _ZN21UnkStruct_027e0ce0_3819func_ov026_020dc9bcEPK24UnkStruct_ov001_020c40f4 kind:function(arm,size=0x1c) addr:0x020de99c func_ov026_020de9d8 kind:function(arm,size=0x84) addr:0x020de9b8 diff --git a/config/usa/arm9/overlays/ov031/symbols.txt b/config/usa/arm9/overlays/ov031/symbols.txt index e3572fcd..d6c129d0 100644 --- a/config/usa/arm9/overlays/ov031/symbols.txt +++ b/config/usa/arm9/overlays/ov031/symbols.txt @@ -85,7 +85,7 @@ func_ov031_020d99ec kind:function(arm,size=0x10) addr:0x020d99cc func_ov031_020d99fc kind:function(arm,size=0x20) addr:0x020d99dc func_ov031_020d9a1c kind:function(arm,size=0x18) addr:0x020d99fc func_ov031_020d9a34 kind:function(arm,size=0x18) addr:0x020d9a14 -func_ov031_020d9a4c kind:function(arm,size=0x10) addr:0x020d9a2c +_ZN18UnkStruct_027e0d3419func_ov031_020d9a4cEi kind:function(arm,size=0x10) addr:0x020d9a2c func_ov031_020d9a5c kind:function(arm,size=0x1c) addr:0x020d9a3c func_ov031_020d9a78 kind:function(arm,size=0x20) addr:0x020d9a58 func_ov031_020d9a98 kind:function(arm,size=0x10) addr:0x020d9a78 @@ -138,7 +138,7 @@ func_ov031_020dafe8 kind:function(arm,size=0x40) addr:0x020dafc8 func_ov031_020db028 kind:function(arm,size=0xd4) addr:0x020db008 _ZN19PlayerLinkActor_13419func_ov031_020db0fcEv kind:function(arm,size=0x24) addr:0x020db0dc func_ov031_020db120 kind:function(arm,size=0x40) addr:0x020db100 -func_ov031_020db160 kind:function(arm,size=0x30) addr:0x020db140 +_ZN19PlayerLinkActor_13419func_ov031_020db160Eb kind:function(arm,size=0x30) addr:0x020db140 _ZN18PlayerActorBase_7419func_ov001_020db190Ev kind:function(arm,size=0x24) addr:0x020db170 func_ov031_020db1b4 kind:function(arm,size=0xfc) addr:0x020db194 _ZN27UnkStruct_ItemManager_20_1019func_ov031_020db2b0Ev kind:function(arm,size=0x2c) addr:0x020db290 @@ -149,33 +149,33 @@ 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 -_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_0419func_ov031_020db4f0Ebb kind:function(arm,size=0x38) addr:0x020db4d0 +_ZN27UnkStruct_ItemManager_20_0419func_ov031_020db528EPv 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 -_ZN27UnkStruct_ItemManager_20_0819func_ov031_020db704Eii kind:function(arm,size=0xbc) addr:0x020db6e4 +_ZN27UnkStruct_ItemManager_20_0819func_ov031_020db704Ebb 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 _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_020db844Ej 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 -_ZN24UnkStruct_ItemManager_2019func_ov031_020db8f8Ev kind:function(arm,size=0x44) addr:0x020db8d8 +_ZN24UnkStruct_ItemManager_2019func_ov031_020db8f8EP24UnkStruct_027e0ce0_30_00 kind:function(arm,size=0x44) addr:0x020db8d8 _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 -_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_0C19func_ov031_020db958Ebb kind:function(arm,size=0xe4) addr:0x020db938 +_ZN27UnkStruct_ItemManager_20_0C19func_ov031_020dba3cEPv 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 -_ZN27UnkStruct_ItemManager_20_0019func_ov031_020dbc80Eii kind:function(arm,size=0xa4) addr:0x020dbc60 +_ZN27UnkStruct_ItemManager_20_0019func_ov031_020dbc80Ebb 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 @@ -211,11 +211,11 @@ func_ov031_020dc8a0 kind:function(arm,size=0x6c) addr:0x020dc880 func_ov031_020dc90c kind:function(arm,size=0x114) addr:0x020dc8ec _ZN32UnkStruct_027e0ce0_40_Base_7C_04C1Ev kind:function(thumb,size=0xc) addr:0x020dca00 _ZN32UnkStruct_027e0ce0_40_Base_7C_04D1Ev kind:function(thumb,size=0xe) addr:0x020dca0c -func_ov031_020dca3c kind:function(arm,size=0x10) addr:0x020dca1c +_ZN32UnkStruct_027e0ce0_40_Base_7C_0419func_ov031_020dca3cEv kind:function(arm,size=0x10) addr:0x020dca1c func_ov031_020dca4c kind:function(thumb,size=0x84) addr:0x020dca2c func_ov031_020dcad0 kind:function(arm,size=0x3c) addr:0x020dcab0 func_ov031_020dcb0c kind:function(arm,size=0x54) addr:0x020dcaec -func_ov031_020dcb60 kind:function(arm,size=0xbc) addr:0x020dcb40 +_ZN32UnkStruct_027e0ce0_40_Base_7C_0419func_ov031_020dcb60E15UnkParamStruct1 kind:function(arm,size=0xbc) addr:0x020dcb40 func_ov031_020dcc1c kind:function(arm,size=0xa0) addr:0x020dcbfc func_ov031_020dccbc kind:function(thumb,size=0x32) addr:0x020dcc9c _ZN15PlayerLinkActor19func_ov031_020dccf0Ev kind:function(thumb,size=0x30) addr:0x020dccd0 @@ -226,7 +226,7 @@ _ZN29UnkStruct_027e0ce0_40_Base_78C1Ev kind:function(thumb,size=0x6) addr:0x020d _ZN29UnkStruct_027e0ce0_40_Base_78D1Ev kind:function(thumb,size=0x2) addr:0x020dcd78 func_ov031_020dcd9c kind:function(arm,size=0x108) addr:0x020dcd7c func_ov031_020dcea4 kind:function(arm,size=0x110) addr:0x020dce84 -func_ov031_020dcfb4 kind:function(arm,size=0x12c) addr:0x020dcf94 +_ZN29UnkStruct_027e0ce0_40_Base_7819func_ov031_020dcfb4EPv kind:function(arm,size=0x12c) addr:0x020dcf94 func_ov031_020dd0e0 kind:function(arm,size=0x44) addr:0x020dd0c0 func_ov031_020dd124 kind:function(arm,size=0x80) addr:0x020dd104 func_ov031_020dd1a4 kind:function(arm,size=0xd0) addr:0x020dd184 @@ -342,7 +342,7 @@ _ZN9ActorBomb19func_ov031_020e20fcEv kind:function(arm,size=0x4) addr:0x020e20dc _ZN9ActorBomb19func_ov031_020e2100Ev kind:function(arm,size=0x34) addr:0x020e20e0 _ZN9ActorBomb19func_ov031_020e2134Ev kind:function(arm,size=0xec) addr:0x020e2114 _ZN24ActorBomb_ov031_020e2134D1Ev kind:function(arm,size=0x14) addr:0x020e2200 -_ZN9ActorBomb8vfunc_2CEi kind:function(arm,size=0x158) addr:0x020e2214 +_ZN9ActorBomb8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x158) addr:0x020e2214 _ZN9ActorBomb19func_ov031_020e238cEv kind:function(arm,size=0xe0) addr:0x020e236c _ZN9ActorBomb4GrabE15ActorGrabParams kind:function(arm,size=0x40) addr:0x020e244c _ZN9ActorBomb4DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0x110) addr:0x020e248c @@ -436,7 +436,7 @@ _ZN18ActorItemBoomerang8vfunc_20Ev kind:function(arm,size=0x614) addr:0x020e4a00 _ZN18ActorItemBoomerang19func_ov031_020e5034Ei kind:function(arm,size=0x1ec) addr:0x020e5014 _ZN18ActorItemBoomerang19func_ov031_020e5220Ev kind:function(arm,size=0x80) addr:0x020e5200 _ZN18ActorItemBoomerang19func_ov031_020e52a0Ev kind:function(arm,size=0xb4) addr:0x020e5280 -_ZN18ActorItemBoomerang8vfunc_2CEi kind:function(arm,size=0x74) addr:0x020e5334 +_ZN18ActorItemBoomerang8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x74) addr:0x020e5334 _ZN21ActorItemBoomerang_A08vfunc_10EP5Actor kind:function(arm,size=0x1c) addr:0x020e53a8 _ZN21ActorItemBoomerang_CC8vfunc_10EP5Actor kind:function(arm,size=0x1c) addr:0x020e53c4 _ZN21ActorItemBoomerang_CC8vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x4c) addr:0x020e53e0 @@ -462,7 +462,7 @@ _ZN16ActorItemTornado8SetStateEs kind:function(arm,size=0x118) addr:0x020e5be0 _ZN16ActorItemTornado19func_ov031_020e5d18Ei kind:function(arm,size=0x430) addr:0x020e5cf8 _ZN16ActorItemTornado8vfunc_20Ev kind:function(arm,size=0x10) addr:0x020e6128 _ZN16ActorItemTornado8vfunc_24Ev kind:function(arm,size=0x44) addr:0x020e6138 -_ZN16ActorItemTornado8vfunc_2CEi kind:function(arm,size=0x124) addr:0x020e617c +_ZN16ActorItemTornado8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x124) addr:0x020e617c _ZN16ActorItemTornado19func_ov031_020e62c0Ev kind:function(arm,size=0x54) addr:0x020e62a0 _ZN16ActorItemTornado19func_ov031_020e6314Et kind:function(arm,size=0x2c) addr:0x020e62f4 _ZN16ActorItemTornado19func_ov031_020e6340EP7VecFx32ss kind:function(arm,size=0x58) addr:0x020e6320 @@ -499,7 +499,7 @@ _ZN12ActorUnkSWBM19func_ov031_020e6e84Es kind:function(arm,size=0x74) addr:0x020 _ZN12ActorUnkSWBM8vfunc_20Ev kind:function(arm,size=0x268) addr:0x020e6ed8 _ZN12ActorUnkSWBM8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x020e7140 _ZN12ActorUnkSWBM19func_ov031_020e718cEP7VecFx32P5Mat3pists kind:function(arm,size=0x108) addr:0x020e716c -_ZN12ActorUnkSWBM8vfunc_2CEi kind:function(arm,size=0x40) addr:0x020e7274 +_ZN12ActorUnkSWBM8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x40) addr:0x020e7274 _ZN15ActorUnkSWBM_94D0Ev kind:function(arm,size=0x1c) addr:0x020e72b4 _ZN15ActorUnkSWBM_98D0Ev kind:function(arm,size=0x1c) addr:0x020e72d0 _ZN12ActorUnkSWBMD1Ev kind:function(arm,size=0x28) addr:0x020e72ec @@ -550,7 +550,7 @@ _ZN12ActorUnkROCK8vfunc_18Ei kind:function(arm,size=0x30) addr:0x020e895c _ZN12ActorUnkROCK8vfunc_20Ev kind:function(arm,size=0x9c) addr:0x020e898c _ZN12ActorUnkROCK19func_ov031_020e8a48Es kind:function(arm,size=0x84) addr:0x020e8a28 _ZN12ActorUnkROCK19func_ov031_020e8accEv kind:function(arm,size=0x30) addr:0x020e8aac -_ZN12ActorUnkROCK8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x020e8adc +_ZN12ActorUnkROCK8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0x020e8adc _ZN12ActorUnkROCK4GrabE15ActorGrabParams kind:function(arm,size=0x68) addr:0x020e8b80 _ZN12ActorUnkROCK4DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0x44) addr:0x020e8be8 _ZN12ActorUnkROCKD1Ev kind:function(arm,size=0x28) addr:0x020e8c2c @@ -594,7 +594,7 @@ _ZN10ActorRupee8SetStateEs kind:function(arm,size=0x54) addr:0x020e98e4 _ZN10ActorRupee8vfunc_20Ev kind:function(arm,size=0x230) addr:0x020e9938 _ZN10ActorRupee19func_ov031_020e9b88Ev kind:function(arm,size=0x60) addr:0x020e9b68 _ZN10ActorRupee19func_ov031_020e9be8Ev kind:function(arm,size=0x44) addr:0x020e9bc8 -_ZN10ActorRupee8vfunc_2CEi kind:function(arm,size=0x128) addr:0x020e9c0c +_ZN10ActorRupee8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x128) addr:0x020e9c0c _ZN10ActorRupee19func_ov031_020e9d54Ev kind:function(arm,size=0x40) addr:0x020e9d34 _ZN10ActorRupee19func_ov031_020e9d94Ev kind:function(arm,size=0xc8) addr:0x020e9d74 _ZN10ActorRupee19func_ov031_020e9e5cEv kind:function(arm,size=0x94) addr:0x020e9e3c @@ -665,7 +665,7 @@ _ZN12ActorUnkZLSL19func_ov031_020ec0d4Ev kind:function(arm,size=0x58) addr:0x020 _ZN12ActorUnkZLSL19func_ov031_020ec12cEv kind:function(arm,size=0x38) addr:0x020ec10c _ZN12ActorUnkZLSL19func_ov031_020ec164Ev kind:function(arm,size=0xc) addr:0x020ec144 _ZN12ActorUnkZLSL19func_ov031_020ec170Ev kind:function(arm,size=0x64) addr:0x020ec150 -_ZN12ActorUnkZLSL8vfunc_2CEi kind:function(arm,size=0xfc) addr:0x020ec1b4 +_ZN12ActorUnkZLSL8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xfc) addr:0x020ec1b4 _ZN12ActorUnkZLSL8vfunc_7CEi kind:function(arm,size=0x100) addr:0x020ec2b0 _ZN12ActorUnkZLSL19func_ov031_020ec3d0Ev kind:function(arm,size=0xcc) addr:0x020ec3b0 _ZN12ActorUnkZLSL19func_ov031_020ec49cEv kind:function(arm,size=0xb0) addr:0x020ec47c @@ -752,7 +752,7 @@ _ZN10ActorHeart19func_ov031_020ef458Ev kind:function(arm,size=0x50) addr:0x020ef _ZN10ActorHeart19func_ov031_020ef4a8Ev kind:function(arm,size=0x80) addr:0x020ef488 _ZN10ActorHeart19func_ov031_020ef528Ev kind:function(arm,size=0x48) addr:0x020ef508 _ZN10ActorHeart19func_ov031_020ef570Ev kind:function(arm,size=0x78) addr:0x020ef550 -_ZN10ActorHeart8vfunc_2CEi kind:function(arm,size=0xb0) addr:0x020ef5c8 +_ZN10ActorHeart8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020ef5c8 _ZN10ActorHeart19func_ov031_020ef698Ev kind:function(arm,size=0x60) addr:0x020ef678 _ZN13ActorHeart_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020ef6d8 _ZN13ActorHeart_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020ef710 @@ -768,7 +768,7 @@ _ZN19ActorProfileUnkRMTGC1Ev kind:function(arm,size=0x28) addr:0x020ef82c _ZN12ActorUnkRMTGC1Ev kind:function(arm,size=0x2c) addr:0x020ef854 _ZN12ActorUnkRMTG8vfunc_18Ei kind:function(arm,size=0xb8) addr:0x020ef880 _ZN12ActorUnkRMTG8vfunc_1CEv kind:function(arm,size=0x38) addr:0x020ef938 -_ZN12ActorUnkRMTG8vfunc_2CEi kind:function(arm,size=0x20) addr:0x020ef970 +_ZN12ActorUnkRMTG8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020ef970 _ZN12ActorUnkRMTGD1Ev kind:function(arm,size=0x20) addr:0x020ef990 _ZN12ActorUnkRMTGD0Ev kind:function(arm,size=0x28) addr:0x020ef9b0 _ZN19ActorProfileUnkRMTGD1Ev kind:function(arm,size=0x14) addr:0x020ef9d8 @@ -830,7 +830,7 @@ _ZN26ModelRender_ov000_020b198cD1Ev kind:function(arm,size=0x14) addr:0x020f0cd0 _ZN8ActorPot8vfunc_18Ei kind:function(arm,size=0x28) addr:0x020f0ce4 _ZN8ActorPot8vfunc_5CEs kind:function(arm,size=0x54) addr:0x020f0d0c _ZN8ActorPot8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020f0d60 -_ZN8ActorPot8vfunc_2CEi kind:function(arm,size=0x30) addr:0x020f0d98 +_ZN8ActorPot8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x020f0d98 _ZN8ActorPot19func_ov031_020f0de8Ev kind:function(arm,size=0xc) addr:0x020f0dc8 _ZN8ActorPot19func_ov031_020f0df4Ev kind:function(arm,size=0xc) addr:0x020f0dd4 _ZN8ActorPot19func_ov031_020f0e00Ev kind:function(arm,size=0xc) addr:0x020f0de0 @@ -854,7 +854,7 @@ _ZN26ModelRender_ov031_0211578cD1Ev kind:function(arm,size=0x14) addr:0x020f10a0 _ZN15ActorItemFlower8vfunc_18Ei kind:function(arm,size=0x28) addr:0x020f10b4 _ZN15ActorItemFlower8vfunc_5CEs kind:function(arm,size=0x44) addr:0x020f10dc _ZN15ActorItemFlower8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020f1120 -_ZN15ActorItemFlower8vfunc_2CEi kind:function(arm,size=0x30) addr:0x020f1158 +_ZN15ActorItemFlower8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x020f1158 _ZN15ActorItemFlower19func_ov031_020f11a8Ev kind:function(arm,size=0xc) addr:0x020f1188 _ZN15ActorItemFlower19func_ov031_020f11b4Ev kind:function(arm,size=0xc) addr:0x020f1194 _ZN15ActorItemFlower19func_ov031_020f11c0Ev kind:function(arm,size=0xc) addr:0x020f11a0 @@ -903,7 +903,7 @@ _ZN14ActorShotArrow19func_ov031_020f2270Ev kind:function(arm,size=0x10) addr:0x0 _ZN14ActorShotArrow19func_ov031_020f2280Ev kind:function(arm,size=0x1c) addr:0x020f2260 _ZN14ActorShotArrow19func_ov031_020f229cEv kind:function(arm,size=0x38) addr:0x020f227c _ZN14ActorShotArrow19func_ov031_020f22d4EP5Mat3pP7VecFx32 kind:function(arm,size=0x3c) addr:0x020f22b4 -_ZN14ActorShotArrow8vfunc_2CEi kind:function(arm,size=0x344) addr:0x020f22f0 +_ZN14ActorShotArrow8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x344) addr:0x020f22f0 _ZN14ActorShotArrow19func_ov031_020f2654EP5Mat3p kind:function(arm,size=0x140) addr:0x020f2634 _ZN14ActorShotArrow19func_ov031_020f2794Es kind:function(arm,size=0x118) addr:0x020f2774 _ZN14ActorShotArrow19func_ov031_020f28acEv kind:function(arm,size=0x2e0) addr:0x020f288c @@ -997,7 +997,7 @@ _ZN19ActorProfileUnkNTTZC1Ev kind:function(arm,size=0x28) addr:0x020f6118 _ZN12ActorUnkNTTZC1Ev kind:function(arm,size=0x30) addr:0x020f6140 _ZN12ActorUnkNTTZ8vfunc_18Ei kind:function(arm,size=0x8) addr:0x020f6170 _ZN12ActorUnkNTTZ8vfunc_20Ev kind:function(arm,size=0x4) addr:0x020f6178 -_ZN12ActorUnkNTTZ8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020f617c +_ZN12ActorUnkNTTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020f617c _ZN12ActorUnkNTTZ19func_ov031_020f61a0Ev kind:function(arm,size=0x50) addr:0x020f6180 _ZN12ActorUnkNTTZ19func_ov031_020f61f0Ev kind:function(arm,size=0x50) addr:0x020f61d0 _ZN12ActorUnkNTTZD1Ev kind:function(arm,size=0x14) addr:0x020f6220 @@ -1029,7 +1029,7 @@ _ZN12ActorUnkTGTZ19func_ov031_020f6e5cE8ActorRef kind:function(arm,size=0x4c) ad _ZN12ActorUnkTGTZ19func_ov031_020f6ea8EP8ActorReftPK7VecFx32st kind:function(arm,size=0x78) addr:0x020f6e88 _ZN12ActorUnkTGTZ19func_ov031_020f6f20Ei kind:function(arm,size=0x250) addr:0x020f6f00 _ZN12ActorUnkTGTZ8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x138) addr:0x020f7150 -_ZN12ActorUnkTGTZ8vfunc_2CEi kind:function(arm,size=0xb0) addr:0x020f7288 +_ZN12ActorUnkTGTZ8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb0) addr:0x020f7288 _ZN12ActorUnkTGTZ19func_ov031_020f7358Ev kind:function(arm,size=0x8c) addr:0x020f7338 _ZN12ActorUnkTGTZ19func_ov031_020f73e4Ev kind:function(arm,size=0xc) addr:0x020f73c4 _ZN12ActorUnkTGTZ19func_ov031_020f73f0Ev kind:function(arm,size=0xc) addr:0x020f73d0 @@ -1042,7 +1042,7 @@ func_ov031_020f7494 kind:function(arm,size=0x40) addr:0x020f7474 func_ov031_020f74d4 kind:function(arm,size=0x38) addr:0x020f74b4 _ZN24UnkStruct_ov031_02114870C2Ev kind:function(arm,size=0x2c) addr:0x020f74ec _ZN24UnkStruct_ov031_021148708vfunc_18Ei kind:function(arm,size=0x3c) addr:0x020f7518 -_ZN24UnkStruct_ov031_021148708vfunc_2CEi kind:function(arm,size=0x20) addr:0x020f7554 +_ZN24UnkStruct_ov031_021148708vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x020f7554 _ZN24UnkStruct_ov031_021148708vfunc_54Ev kind:function(arm,size=0x8) addr:0x020f7574 func_ov031_020f759c kind:function(arm,size=0x50) addr:0x020f757c func_ov031_020f75ec kind:function(arm,size=0x8) addr:0x020f75cc @@ -1072,7 +1072,7 @@ _ZN19ActorProfileUnkSWCHC1Ev kind:function(arm,size=0x28) addr:0x020f7a94 _ZN12ActorUnkSWCHC1Ev kind:function(arm,size=0x30) addr:0x020f7abc _ZN12ActorUnkSWCH8vfunc_18Ei kind:function(arm,size=0x14) addr:0x020f7aec _ZN12ActorUnkSWCH8vfunc_20Ev kind:function(arm,size=0x68) addr:0x020f7b00 -_ZN12ActorUnkSWCH8vfunc_2CEi kind:function(arm,size=0x10) addr:0x020f7b68 +_ZN12ActorUnkSWCH8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x10) addr:0x020f7b68 _ZN12ActorUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f7b78 _ZN12ActorUnkSWCHD0Ev kind:function(arm,size=0x1c) addr:0x020f7b8c _ZN19ActorProfileUnkSWCHD1Ev kind:function(arm,size=0x14) addr:0x020f7ba8 @@ -1120,7 +1120,7 @@ _ZN17ActorRollingStone8vfunc_18Ei kind:function(arm,size=0xf0) addr:0x020f867c _ZN17ActorRollingStone8vfunc_20Ev kind:function(arm,size=0x98) addr:0x020f876c _ZN17ActorRollingStone8SetStateEs kind:function(arm,size=0x5c) addr:0x020f8804 _ZN17ActorRollingStone19func_ov031_020f8880Ev kind:function(arm,size=0xc8) addr:0x020f8860 -_ZN17ActorRollingStone8vfunc_2CEi kind:function(arm,size=0xac) addr:0x020f8928 +_ZN17ActorRollingStone8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xac) addr:0x020f8928 _ZN17ActorRollingStone19func_ov031_020f89f4Ev kind:function(arm,size=0x10) addr:0x020f89d4 _ZN17ActorRollingStone19func_ov031_020f8a04Ev kind:function(arm,size=0x28) addr:0x020f89e4 _ZN17ActorRollingStone19func_ov031_020f8a2cEv kind:function(arm,size=0xc) addr:0x020f8a0c @@ -1188,7 +1188,7 @@ _ZN13ActorItemDrop19func_ov031_020fa668Ev kind:function(arm,size=0x10) addr:0x02 _ZN13ActorItemDrop19func_ov031_020fa678Ev kind:function(arm,size=0x50) addr:0x020fa658 _ZN13ActorItemDrop19func_ov031_020fa6c8Ev kind:function(arm,size=0x64) addr:0x020fa6a8 _ZN13ActorItemDrop19func_ov031_020fa72cEv kind:function(arm,size=0x110) addr:0x020fa70c -_ZN13ActorItemDrop8vfunc_2CEi kind:function(arm,size=0xc4) addr:0x020fa81c +_ZN13ActorItemDrop8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc4) addr:0x020fa81c _ZN13ActorItemDrop19func_ov031_020fa900Ev kind:function(arm,size=0xf8) addr:0x020fa8e0 _ZN16ActorItemDrop_C4C1EP5Actor kind:function(arm,size=0x38) addr:0x020fa9d8 _ZN16ActorItemDrop_C48vfunc_00E8ActorRefi kind:function(arm,size=0x44) addr:0x020faa10 @@ -1250,7 +1250,7 @@ _ZN12ActorUnkEFSB8vfunc_18Ei kind:function(arm,size=0xb8) addr:0x020fb5f4 _ZN12ActorUnkEFSB8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020fb6ac _ZN12ActorUnkEFSB8vfunc_24Ev kind:function(arm,size=0x14) addr:0x020fb6e4 _ZN12ActorUnkEFSB8vfunc_54Ei kind:function(arm,size=0x8) addr:0x020fb6f8 -_ZN12ActorUnkEFSB8vfunc_2CEi kind:function(arm,size=0x70) addr:0x020fb700 +_ZN12ActorUnkEFSB8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x70) addr:0x020fb700 _ZN12ActorUnkEFSBD1Ev kind:function(arm,size=0x30) addr:0x020fb770 _ZN12ActorUnkEFSBD0Ev kind:function(arm,size=0x38) addr:0x020fb7a0 _ZN19ActorProfileUnkEFSBD1Ev kind:function(arm,size=0x14) addr:0x020fb7d8 @@ -1265,7 +1265,7 @@ _ZN12ActorUnkNFSP19func_ov031_020fb994Ev kind:function(arm,size=0x20) addr:0x020 _ZN12ActorUnkNFSP19func_ov031_020fb9b4Ev kind:function(arm,size=0xac) addr:0x020fb994 _ZN12ActorUnkNFSP19func_ov031_020fba60Ev kind:function(arm,size=0x8c) addr:0x020fba40 _ZN12ActorUnkNFSP8vfunc_54Ei kind:function(arm,size=0x9c) addr:0x020fbacc -_ZN12ActorUnkNFSP8vfunc_2CEi kind:function(arm,size=0x4) addr:0x020fbb68 +_ZN12ActorUnkNFSP8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x4) addr:0x020fbb68 _ZN12ActorUnkNFSP19func_ov031_020fbb8cEv kind:function(arm,size=0x14) addr:0x020fbb6c _ZN12ActorUnkNFSP19func_ov031_020fbba0E8ActorRef kind:function(arm,size=0x40) addr:0x020fbb80 _ZN12ActorUnkNFSP19func_ov031_020fbbe0Ev kind:function(arm,size=0x24) addr:0x020fbbc0 @@ -1289,7 +1289,7 @@ _ZN17MapObjectDoorBase8vfunc_48Ev kind:function(arm,size=0x4) addr:0x020fcb30 _ZN17MapObjectDoorBase8vfunc_64Ev kind:function(arm,size=0xc) addr:0x020fcb34 _ZN17MapObjectDoorBase8vfunc_68Ev kind:function(arm,size=0x10) addr:0x020fcb40 _ZN17MapObjectDoorBase8vfunc_6CEv kind:function(arm,size=0x8) addr:0x020fcb50 -_ZN17MapObjectDoorBase19func_ov031_020fcb78EPcc kind:function(arm,size=0x180) addr:0x020fcb58 +_ZN17MapObjectDoorBase19func_ov031_020fcb78EPc kind:function(arm,size=0x180) addr:0x020fcb58 _ZN17MapObjectDoorBase8vfunc_74Ev kind:function(arm,size=0x4) addr:0x020fccd8 _ZN17MapObjectDoorBase8vfunc_78Ev kind:function(arm,size=0x4) addr:0x020fccdc _ZN17MapObjectDoorBase8vfunc_7CEv kind:function(arm,size=0x10) addr:0x020fcce0 @@ -1327,8 +1327,8 @@ _ZN24MapObjectDoorDangerSpawn8vfunc_64Ev kind:function(arm,size=0xbc) addr:0x020 _ZN24MapObjectDoorDangerSpawn8vfunc_68Ev kind:function(arm,size=0xac) addr:0x020fdca4 _ZN24MapObjectDoorDangerSpawn8vfunc_6CEv kind:function(arm,size=0x158) addr:0x020fdd50 _ZN24MapObjectDoorDangerSpawn19func_ov031_020fdec8Ev kind:function(arm,size=0xf8) addr:0x020fdea8 -_ZN24MapObjectDoorDangerSpawn8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020fdfa0 -_ZN24MapObjectDoorDangerSpawn8vfunc_14Ev kind:function(arm,size=0x80) addr:0x020fdfac +_ZN24MapObjectDoorDangerSpawn8vfunc_18EPc kind:function(arm,size=0xc) addr:0x020fdfa0 +_ZN24MapObjectDoorDangerSpawn8vfunc_14Ei kind:function(arm,size=0x80) addr:0x020fdfac _ZN24MapObjectDoorDangerSpawn9vfunc2_10Ev kind:function(arm,size=0x84) addr:0x020fe02c _ZN24MapObjectDoorDangerSpawn8vfunc_74Ev kind:function(arm,size=0x15c) addr:0x020fe0b0 _ZN24MapObjectDoorDangerSpawn8vfunc_7CEv kind:function(arm,size=0x24) addr:0x020fe20c @@ -1351,8 +1351,8 @@ _ZN23MapObjectProfileDoorKeyC1Ev kind:function(arm,size=0x54) addr:0x020fe744 _ZN16MapObjectDoorKeyC1Ev kind:function(arm,size=0xb4) addr:0x020fe798 _ZN16MapObjectDoorKey8vfunc_00Ev kind:function(arm,size=0x1c) addr:0x020fe84c _ZN16MapObjectDoorKey8vfunc_08Ev kind:function(arm,size=0x18) addr:0x020fe868 -_ZN16MapObjectDoorKey8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020fe880 -_ZN16MapObjectDoorKey8vfunc_14Ev kind:function(arm,size=0x14c) addr:0x020fe88c +_ZN16MapObjectDoorKey8vfunc_18EPc kind:function(arm,size=0xc) addr:0x020fe880 +_ZN16MapObjectDoorKey8vfunc_14Ei kind:function(arm,size=0x14c) addr:0x020fe88c _ZN16MapObjectDoorKey8vfunc_5CEsi kind:function(arm,size=0x90) addr:0x020fe9d8 _ZN16MapObjectDoorKey19func_ov031_020fea88Ev kind:function(arm,size=0x34) addr:0x020fea68 _ZN16MapObjectDoorKey8vfunc_28Eiii kind:function(arm,size=0x90) addr:0x020fea9c @@ -1378,8 +1378,8 @@ _ZN19MapObjectDoorSwitch8vfunc_00Ev kind:function(arm,size=0xd0) addr:0x020fef8c _ZN19MapObjectDoorSwitch8vfunc_08Ev kind:function(arm,size=0x84) addr:0x020ff05c _ZN19MapObjectDoorSwitch8vfunc_64Ev kind:function(arm,size=0x10) addr:0x020ff0e0 _ZN19MapObjectDoorSwitch8vfunc_6CEv kind:function(arm,size=0x20) addr:0x020ff0f0 -_ZN19MapObjectDoorSwitch8vfunc_14Ev kind:function(arm,size=0x80) addr:0x020ff110 -_ZN19MapObjectDoorSwitch8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020ff190 +_ZN19MapObjectDoorSwitch8vfunc_14Ei kind:function(arm,size=0x80) addr:0x020ff110 +_ZN19MapObjectDoorSwitch8vfunc_18EPc kind:function(arm,size=0xc) addr:0x020ff190 _ZN19MapObjectDoorSwitch8vfunc_74Ev kind:function(arm,size=0xcc) addr:0x020ff19c _ZN19MapObjectDoorSwitch8GetModelEv kind:function(arm,size=0x50) addr:0x020ff268 _ZN19MapObjectDoorSwitch8vfunc_50Ev kind:function(arm,size=0x40) addr:0x020ff2b8 @@ -1400,8 +1400,8 @@ _ZN18MapObjectDoorClickC1Ev kind:function(arm,size=0x88) addr:0x020ff600 _ZN18MapObjectDoorClick9vfunc2_1CEi kind:function(arm,size=0x14) addr:0x020ff688 _ZN18MapObjectDoorClick8vfunc_00Ev kind:function(arm,size=0x100) addr:0x020ff69c _ZN18MapObjectDoorClick8vfunc_08Ev kind:function(arm,size=0x3d0) addr:0x020ff79c -_ZN18MapObjectDoorClick8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020ffb6c -_ZN18MapObjectDoorClick8vfunc_14Ev kind:function(arm,size=0x14c) addr:0x020ffb78 +_ZN18MapObjectDoorClick8vfunc_18EPc kind:function(arm,size=0xc) addr:0x020ffb6c +_ZN18MapObjectDoorClick8vfunc_14Ei kind:function(arm,size=0x14c) addr:0x020ffb78 _ZN18MapObjectDoorClick8vfunc_5CEsi kind:function(arm,size=0xf8) addr:0x020ffcc4 _ZN18MapObjectDoorClick9vfunc2_14Ev kind:function(arm,size=0x8) addr:0x020ffdbc _ZN18MapObjectDoorClick19func_ov031_020ffde4Ev kind:function(arm,size=0x38) addr:0x020ffdc4 @@ -1476,7 +1476,7 @@ _ZN14MapObjectGrassC2Ev kind:function(arm,size=0x48) addr:0x021010c0 _ZN14MapObjectGrassC1Ev kind:function(arm,size=0x48) addr:0x02101108 _ZN14MapObjectGrass8vfunc_00Ev kind:function(arm,size=0x31c) addr:0x02101150 _ZN14MapObjectGrass8vfunc_08Ev kind:function(arm,size=0x78) addr:0x0210146c -_ZN14MapObjectGrass8vfunc_14Ev kind:function(arm,size=0x74) addr:0x021014e4 +_ZN14MapObjectGrass8vfunc_14Ei kind:function(arm,size=0x74) addr:0x021014e4 _ZN14MapObjectGrass8vfunc_38Esi kind:function(arm,size=0x13c) addr:0x02101558 _ZN14MapObjectGrass19func_ov031_021016b4Ev kind:function(arm,size=0x88) addr:0x02101694 _ZN14MapObjectGrass8vfunc_3CEP7VecFx32 kind:function(arm,size=0x3c) addr:0x0210171c @@ -1501,7 +1501,7 @@ _ZN16MapObjectUnkSWHT8vfunc_00Ev kind:function(arm,size=0xf0) addr:0x02101cc8 _ZN16MapObjectUnkSWHT19func_ov031_02101dd8Ev kind:function(arm,size=0x44) addr:0x02101db8 _ZN16MapObjectUnkSWHT8vfunc_08Ev kind:function(arm,size=0x16c) addr:0x02101dfc _ZN16MapObjectUnkSWHT8vfunc_0CEv kind:function(arm,size=0xc) addr:0x02101f68 -_ZN16MapObjectUnkSWHT8vfunc_14Ev kind:function(arm,size=0x20) addr:0x02101f74 +_ZN16MapObjectUnkSWHT8vfunc_14Ei kind:function(arm,size=0x20) addr:0x02101f74 _ZN16MapObjectUnkSWHT8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x138) addr:0x02101f94 _ZN16MapObjectUnkSWHT19func_ov031_021020ecEv kind:function(arm,size=0xd4) addr:0x021020cc _ZN16MapObjectUnkSWHT19func_ov031_021021c0Esi kind:function(arm,size=0x1f0) addr:0x021021a0 @@ -1517,7 +1517,7 @@ _ZN19MapObjectBombFlower8vfunc_58Ev kind:function(arm,size=0x10) addr:0x021026f8 _ZN19MapObjectBombFlower19func_ov031_02102728Ei kind:function(arm,size=0x7c) addr:0x02102708 _ZN19MapObjectBombFlower8vfunc_08Ev kind:function(arm,size=0xf0) addr:0x02102784 _ZN19MapObjectBombFlower8SetStateEsi kind:function(arm,size=0x15c) addr:0x02102874 -_ZN19MapObjectBombFlower8vfunc_14Ev kind:function(arm,size=0x50) addr:0x021029d0 +_ZN19MapObjectBombFlower8vfunc_14Ei kind:function(arm,size=0x50) addr:0x021029d0 _ZN19MapObjectBombFlower8vfunc_38Ev kind:function(arm,size=0x98) addr:0x02102a20 _ZN19MapObjectBombFlower8vfunc_28Eiii kind:function(arm,size=0x1c) addr:0x02102ab8 _ZN19MapObjectBombFlower8vfunc_50EP8ActorRefP17MapObjectPot_Base kind:function(arm,size=0x70) addr:0x02102ad4 @@ -1555,8 +1555,8 @@ _ZN18MapObjectChestBase19func_ov031_021037d0Ev kind:function(arm,size=0x94) addr _ZN18MapObjectChestBase19func_ov031_02103864Ev kind:function(arm,size=0x14) addr:0x02103844 _ZN18MapObjectChestBase19func_ov031_02103878Ev kind:function(arm,size=0x1c) addr:0x02103858 _ZN18MapObjectChestBase8vfunc_38Eii kind:function(arm,size=0x3b4) addr:0x02103874 -_ZN18MapObjectChestBase8vfunc_18EPcc kind:function(arm,size=0xe8) addr:0x02103c28 -_ZN18MapObjectChestBase8vfunc_14Ev kind:function(arm,size=0x108) addr:0x02103d10 +_ZN18MapObjectChestBase8vfunc_18EPc kind:function(arm,size=0xe8) addr:0x02103c28 +_ZN18MapObjectChestBase8vfunc_14Ei kind:function(arm,size=0x108) addr:0x02103d10 _ZN18MapObjectChestBase8vfunc_3CEv kind:function(arm,size=0x100) addr:0x02103e18 _ZN18MapObjectChestBase8vfunc_40Ev kind:function(arm,size=0x8) addr:0x02103f18 _ZN18MapObjectChestBase8vfunc_44Ev kind:function(arm,size=0x8) addr:0x02103f20 @@ -1628,7 +1628,7 @@ _ZN12MapObjectPotC1Ev kind:function(arm,size=0x9c) addr:0x02104fcc _ZN12MapObjectPot8vfunc_04Ev kind:function(arm,size=0x2c) addr:0x02105068 _ZN12MapObjectPot8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x120) addr:0x02105094 _ZN12MapObjectPot8vfunc_48Ev kind:function(arm,size=0xf8) addr:0x021051b4 -_ZN12MapObjectPot8vfunc_14Ev kind:function(arm,size=0x44) addr:0x021052ac +_ZN12MapObjectPot8vfunc_14Ei kind:function(arm,size=0x44) addr:0x021052ac _ZN12MapObjectPot8vfunc_54Ev kind:function(arm,size=0x38) addr:0x021052f0 _ZN12MapObjectPot8vfunc_24EP9MapObject7VecFx32 kind:function(arm,size=0x6c) addr:0x02105328 _ZN12MapObjectPot8vfunc_3CEv kind:function(arm,size=0x48) addr:0x02105394 @@ -1674,7 +1674,7 @@ _ZN16MapObjectUnkSKDI19func_ov031_0210643cEi kind:function(arm,size=0x23c) addr: _ZN16MapObjectUnkSKDI19func_ov031_02106678Esi kind:function(arm,size=0x3f8) addr:0x02106658 _ZN16MapObjectUnkSKDI19func_ov031_02106a70Ev kind:function(arm,size=0x14) addr:0x02106a50 _ZN16MapObjectUnkSKDI8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x1f4) addr:0x02106a64 -_ZN16MapObjectUnkSKDI8vfunc_14Ev kind:function(arm,size=0x20) addr:0x02106c58 +_ZN16MapObjectUnkSKDI8vfunc_14Ei kind:function(arm,size=0x20) addr:0x02106c58 _ZN16MapObjectUnkSKDI8vfunc_38Ev kind:function(arm,size=0x8) addr:0x02106c78 _ZN16MapObjectUnkSKDI8vfunc_3CEv kind:function(arm,size=0x8) addr:0x02106c80 _ZN16MapObjectUnkSKDI8vfunc_40Ev kind:function(arm,size=0x8) addr:0x02106c88 diff --git a/config/usa/arm9/overlays/ov032/symbols.txt b/config/usa/arm9/overlays/ov032/symbols.txt index 1986f6a7..ac6ec51e 100644 --- a/config/usa/arm9/overlays/ov032/symbols.txt +++ b/config/usa/arm9/overlays/ov032/symbols.txt @@ -11,7 +11,7 @@ _ZN11ActorSpinut8vfunc_1CEv kind:function(arm,size=0x84) addr:0x02119438 _ZN11ActorSpinut19func_ov032_021194dcEs kind:function(arm,size=0x60) addr:0x021194bc _ZN11ActorSpinut8SetStateEs kind:function(arm,size=0x48) addr:0x0211951c _ZN11ActorSpinut8vfunc_20Ev kind:function(arm,size=0x358) addr:0x02119564 -_ZN11ActorSpinut8vfunc_2CEi kind:function(arm,size=0xb4) addr:0x021198bc +_ZN11ActorSpinut8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xb4) addr:0x021198bc _ZN11ActorSpinut19func_ov032_02119990Ev kind:function(arm,size=0x7c) addr:0x02119970 _ZN11ActorSpinut19func_ov032_02119a0cEv kind:function(arm,size=0x1dc) addr:0x021199ec _ZN11ActorSpinut19func_ov032_02119be8Ev kind:function(arm,size=0x98) addr:0x02119bc8 @@ -43,7 +43,7 @@ _ZN11ActorSpinut19func_ov032_0211b17cEv kind:function(arm,size=0x14) addr:0x0211 _ZN11ActorSpinut19func_ov032_0211b190Eii kind:function(arm,size=0x50) addr:0x0211b170 _ZN11ActorSpinut19func_ov032_0211b1e0Ev kind:function(arm,size=0xb8) addr:0x0211b1c0 _ZN11ActorSpinut19func_ov032_0211b298Ev kind:function(arm,size=0xe4) addr:0x0211b278 -_ZN11ActorSpinut19func_ov032_0211b37cEPS_t kind:function(arm,size=0x34) addr:0x0211b35c +_ZN11ActorSpinut19func_ov032_0211b37cEP5ActorP14Actor_vfunc_30 kind:function(arm,size=0x34) addr:0x0211b35c _ZN11ActorSpinut19func_ov032_0211b3b0Ev kind:function(arm,size=0x58) addr:0x0211b390 _ZN11ActorSpinut8vfunc_54Ei kind:function(arm,size=0x168) addr:0x0211b3e8 _ZN15ActorSpinut_268C1Ev kind:function(arm,size=0x30) addr:0x0211b550 @@ -68,7 +68,7 @@ _ZN18ActorFleeingSpinut8vfunc_18Ei kind:function(arm,size=0x1c) addr:0x0211b968 _ZN18ActorFleeingSpinut8SetStateEs kind:function(arm,size=0x68) addr:0x0211b984 _ZN18ActorFleeingSpinut8vfunc_20Ev kind:function(arm,size=0x268) addr:0x0211b9ec _ZN18ActorFleeingSpinut8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x104) addr:0x0211bc54 -_ZN18ActorFleeingSpinut8vfunc_2CEi kind:function(arm,size=0x8c) addr:0x0211bd58 +_ZN18ActorFleeingSpinut8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x8c) addr:0x0211bd58 _ZN18ActorFleeingSpinut19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211bde4 _ZN18ActorFleeingSpinut19func_ov032_0211be30Ev kind:function(arm,size=0x78) addr:0x0211be10 _ZN18ActorFleeingSpinut19func_ov032_0211bea8Ev kind:function(arm,size=0xdc) addr:0x0211be88 @@ -133,7 +133,7 @@ _ZN10ActorKeese19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x0211e _ZN10ActorKeese8SetStateEs kind:function(arm,size=0x48) addr:0x0211e400 _ZN10ActorKeese19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x0211e448 _ZN10ActorKeese8vfunc_20Ev kind:function(arm,size=0x1b8) addr:0x0211e758 -_ZN10ActorKeese8vfunc_2CEi kind:function(arm,size=0xbc) addr:0x0211e910 +_ZN10ActorKeese8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xbc) addr:0x0211e910 _ZN10ActorKeese19func_ov032_0211e9ecEv kind:function(arm,size=0x174) addr:0x0211e9cc _ZN10ActorKeese19func_ov032_0211eb60Ev kind:function(arm,size=0x188) addr:0x0211eb40 _ZN10ActorKeese19func_ov032_0211ece8Ev kind:function(arm,size=0x174) addr:0x0211ecc8 @@ -210,7 +210,7 @@ _ZN16MapObjectUnkSWSW8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x278) _ZN16MapObjectUnkSWSW8vfunc_38Ev kind:function(arm,size=0x48) addr:0x02121b28 _ZN16MapObjectUnkSWSW19func_ov032_02121b90Ev kind:function(arm,size=0x88) addr:0x02121b70 _ZN16MapObjectUnkSWSW8vfunc_3CEi kind:function(arm,size=0x158) addr:0x02121bf8 -_ZN16MapObjectUnkSWSW8vfunc_14Ev kind:function(arm,size=0x58) addr:0x02121d50 +_ZN16MapObjectUnkSWSW8vfunc_14Ei kind:function(arm,size=0x58) addr:0x02121d50 _ZN16MapObjectUnkSWSW19func_ov032_02121dc8EP7VecFx32 kind:function(arm,size=0x90) addr:0x02121da8 _ZN19MapObjectUnkSWSW_40D0Ev kind:function(arm,size=0x1c) addr:0x02121e38 _ZN16MapObjectUnkSWSWD1Ev kind:function(arm,size=0x20) addr:0x02121e54 diff --git a/config/usa/arm9/overlays/ov063/symbols.txt b/config/usa/arm9/overlays/ov063/symbols.txt index 34390325..e6c58c1a 100644 --- a/config/usa/arm9/overlays/ov063/symbols.txt +++ b/config/usa/arm9/overlays/ov063/symbols.txt @@ -14,7 +14,7 @@ _ZN12ActorUnkCANS19func_ov063_02158448Ei kind:function(arm,size=0x48) addr:0x021 _ZN12ActorUnkCANS19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x02158470 _ZN12ActorUnkCANS8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x021584a4 _ZN12ActorUnkCANS8vfunc_20Ev kind:function(arm,size=0x53c) addr:0x021584d0 -_ZN12ActorUnkCANS8vfunc_2CEi kind:function(arm,size=0xe0) addr:0x02158a0c +_ZN12ActorUnkCANS8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xe0) addr:0x02158a0c _ZN12ActorUnkCANS19func_ov063_02158b0cEv kind:function(arm,size=0x28) addr:0x02158aec _ZN12ActorUnkCANS19func_ov063_02158b34Ev kind:function(arm,size=0x64) addr:0x02158b14 _ZN12ActorUnkCANS19func_ov063_02158b98Ev kind:function(arm,size=0x1a8) addr:0x02158b78 @@ -92,7 +92,7 @@ _ZN12ActorUnkCASE19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x021 _ZN12ActorUnkCASE19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215b2a4 _ZN12ActorUnkCASE8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215b2a8 _ZN12ActorUnkCASE8vfunc_20Ev kind:function(arm,size=0x338) addr:0x0215b2cc -_ZN12ActorUnkCASE8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x0215b604 +_ZN12ActorUnkCASE8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xa4) addr:0x0215b604 _ZN12ActorUnkCASE19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215b6a8 _ZN12ActorUnkCASE19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215b704 _ZN12ActorUnkCASE8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215b7ac @@ -110,7 +110,7 @@ _ZN15ActorUnkRMSBase8vfunc_18Ei kind:function(arm,size=0x54) addr:0x0215bb14 _ZN15ActorUnkRMSBase8vfunc_1CEv kind:function(arm,size=0x4) addr:0x0215bb68 _ZN15ActorUnkRMSBase8vfunc_20Ev kind:function(arm,size=0x4) addr:0x0215bb6c _ZN15ActorUnkRMSBase8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215bb70 -_ZN15ActorUnkRMSBase8vfunc_2CEi kind:function(arm,size=0x30) addr:0x0215bb84 +_ZN15ActorUnkRMSBase8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x30) addr:0x0215bb84 _ZN15ActorUnkRMSBaseD1Ev kind:function(arm,size=0x28) addr:0x0215bbb4 _ZN15ActorUnkRMSBaseD0Ev kind:function(arm,size=0x30) addr:0x0215bbdc _ZN19ActorProfileUnkRMSV10GetProfileEv kind:function(arm,size=0xc) addr:0x0215bc0c @@ -255,7 +255,7 @@ _ZN24UnkStruct_ov063_02163784D1Ev kind:function(arm,size=0x14) addr:0x0215f3b4 _ZN12ActorUnkRBLS8vfunc_18Ei kind:function(arm,size=0x8c) addr:0x0215f3c8 _ZN12ActorUnkRBLS8vfunc_20Ev kind:function(arm,size=0x14) addr:0x0215f454 _ZN12ActorUnkRBLS8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0215f468 -_ZN12ActorUnkRBLS8vfunc_2CEi kind:function(arm,size=0x20) addr:0x0215f47c +_ZN12ActorUnkRBLS8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0x20) addr:0x0215f47c _ZN24UnkStruct_ov063_02163784D0Ev kind:function(arm,size=0x1c) addr:0x0215f49c _ZN12ActorUnkRBLSD1Ev kind:function(arm,size=0x28) addr:0x0215f4b8 _ZN12ActorUnkRBLSD0Ev kind:function(arm,size=0x30) addr:0x0215f4e0 @@ -269,7 +269,7 @@ _ZN16MapObjectUnkSTAT8vfunc_08Ev kind:function(arm,size=0x88) addr:0x0215f6f0 _ZN16MapObjectUnkSTAT8vfunc_0CEv kind:function(arm,size=0x14) addr:0x0215f778 _ZN16MapObjectUnkSTAT19func_ov063_0215f7acEv kind:function(arm,size=0x494) addr:0x0215f78c _ZN16MapObjectUnkSTAT19func_ov063_0215fc40Ei kind:function(arm,size=0x48) addr:0x0215fc20 -_ZN16MapObjectUnkSTAT8vfunc_14Ev kind:function(arm,size=0x58) addr:0x0215fc68 +_ZN16MapObjectUnkSTAT8vfunc_14Ei kind:function(arm,size=0x58) addr:0x0215fc68 _ZN16MapObjectUnkSTAT19func_ov063_0215fce0Ev kind:function(arm,size=0x58) addr:0x0215fcc0 _ZN16MapObjectUnkSTATD1Ev kind:function(arm,size=0x20) addr:0x0215fd18 _ZN16MapObjectUnkSTATD0Ev kind:function(arm,size=0x28) addr:0x0215fd38 diff --git a/config/usa/arm9/overlays/ov071/symbols.txt b/config/usa/arm9/overlays/ov071/symbols.txt index dfdc4a7e..bf91099d 100644 --- a/config/usa/arm9/overlays/ov071/symbols.txt +++ b/config/usa/arm9/overlays/ov071/symbols.txt @@ -269,7 +269,7 @@ _ZN18UnkStruct_027e0d7019func_ov071_0215e9acEv kind:function(arm,size=0x68) addr func_ov071_0215ea14 kind:function(arm,size=0x7c) addr:0x0215e9f4 _ZN18UnkStruct_027e0d70D1Ev kind:function(arm,size=0x38) addr:0x0215ea70 _ZN18UnkStruct_027e0d7019func_ov071_0215eac8Ev kind:function(arm,size=0x50) addr:0x0215eaa8 -func_ov071_0215eb18 kind:function(arm,size=0xc) addr:0x0215eaf8 +_ZN18UnkStruct_027e0d7019func_ov071_0215eb18Ev kind:function(arm,size=0xc) addr:0x0215eaf8 func_ov071_0215eb24 kind:function(arm,size=0x27c) addr:0x0215eb04 func_ov071_0215eda0 kind:function(arm,size=0x50) addr:0x0215ed80 func_ov071_0215edf0 kind:function(arm,size=0x50) addr:0x0215edd0 @@ -299,7 +299,7 @@ _ZN14ActorTearLight8vfunc_18Ei kind:function(arm,size=0xac) addr:0x0215f510 _ZN14ActorTearLight8vfunc_1CEv kind:function(arm,size=0x2c) addr:0x0215f5bc _ZN14ActorTearLight8vfunc_20Ev kind:function(arm,size=0x4c) addr:0x0215f5e8 _ZN14ActorTearLight8vfunc_24Ev kind:function(arm,size=0xc0) addr:0x0215f634 -_ZN14ActorTearLight8vfunc_2CEi kind:function(arm,size=0xc8) addr:0x0215f6f4 +_ZN14ActorTearLight8vfunc_2CEP14Actor_vfunc_30 kind:function(arm,size=0xc8) addr:0x0215f6f4 _ZN14ActorTearLight8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x18) addr:0x0215f7bc _ZN14ActorTearLight19func_ov071_0215f7f4Es kind:function(arm,size=0x18) addr:0x0215f7d4 _ZN14ActorTearLight19func_ov071_0215f80cEv kind:function(arm,size=0x18) addr:0x0215f7ec diff --git a/config/usa/arm9/overlays/ov088/symbols.txt b/config/usa/arm9/overlays/ov088/symbols.txt index 3bd322b5..5ff69a50 100644 --- a/config/usa/arm9/overlays/ov088/symbols.txt +++ b/config/usa/arm9/overlays/ov088/symbols.txt @@ -325,9 +325,9 @@ func_ov088_0216f874 kind:function(arm,size=0x2c) addr:0x0216f854 _ZN21UnkStruct_027e0ce0_3CC1Ev kind:function(thumb,size=0x298) addr:0x0216f880 _ZN21UnkStruct_027e0ce0_3CD1Ev kind:function(thumb,size=0x8c) addr:0x0216fb18 _ZN21UnkStruct_027e0ce0_3C19func_ov088_0216fbc4EiPK24UnkStruct_ov001_020c40f4 kind:function(thumb,size=0x2c) addr:0x0216fba4 -func_ov088_0216fbf0 kind:function(arm,size=0xb0) addr:0x0216fbd0 -func_ov088_0216fca0 kind:function(arm,size=0x270) addr:0x0216fc80 -func_ov088_0216ff10 kind:function(arm,size=0x4) addr:0x0216fef0 +_ZN21UnkStruct_027e0ce0_3C19func_ov088_0216fbf0Ei kind:function(arm,size=0xb0) addr:0x0216fbd0 +_ZN21UnkStruct_027e0ce0_3C19func_ov088_0216fca0Ev kind:function(arm,size=0x270) addr:0x0216fc80 +_ZN21UnkStruct_027e0ce0_3C19func_ov088_0216ff10Ev kind:function(arm,size=0x4) addr:0x0216fef0 func_ov088_0216ff14 kind:function(arm,size=0x10) addr:0x0216fef4 func_ov088_0216ff24 kind:function(arm,size=0xa8) addr:0x0216ff04 func_ov088_0216ffcc kind:function(arm,size=0x4) addr:0x0216ffac diff --git a/config/usa/arm9/overlays/ov092/symbols.txt b/config/usa/arm9/overlays/ov092/symbols.txt index 324985e7..23a2fdde 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 -_ZN25UnkStruct_027e0ce0_40_14C19func_ov092_021689e8EiP21UnkStruct_027e0ce0_40P15PlayerLinkActorP25UnkStruct_027e0ce0_40_328 kind:function(arm,size=0xac) addr:0x021689c8 +_ZN25UnkStruct_027e0ce0_40_14C19func_ov092_021689e8EbP21UnkStruct_027e0ce0_40P15PlayerLinkActorP15PlayerActorBase 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/symbols.txt b/config/usa/arm9/overlays/ov093/symbols.txt index 3e6e8e6d..168c2a38 100644 --- a/config/usa/arm9/overlays/ov093/symbols.txt +++ b/config/usa/arm9/overlays/ov093/symbols.txt @@ -82,11 +82,11 @@ func_ov093_02167dfc kind:function(arm,size=0x44) addr:0x02167ddc func_ov093_02167e40 kind:function(arm,size=0x15c) addr:0x02167e20 func_ov093_02167f9c kind:function(arm,size=0x68) addr:0x02167f7c _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 +_ZN21UnkStruct_027e0ce0_4019func_ov093_02168020Ei kind:function(arm,size=0xdc) addr:0x02168000 +_ZN21UnkStruct_027e0ce0_4019func_ov093_021680fcEi kind:function(arm,size=0xa8) addr:0x021680dc func_ov093_021681a4 kind:function(arm,size=0x7c) addr:0x02168184 _ZN21UnkStruct_027e0ce0_4019func_ov093_02168220Ev kind:function(arm,size=0x38) addr:0x02168200 -func_ov093_02168258 kind:function(arm,size=0xb4) addr:0x02168238 +_ZN21UnkStruct_027e0ce0_4019func_ov093_02168258Ev 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 func_ov093_02168484 kind:function(arm,size=0xd0) addr:0x02168464 @@ -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 -_ZN25UnkStruct_027e0ce0_40_14C19func_ov093_02168e24Ei kind:function(arm,size=0x6c) addr:0x02168e04 +_ZN25UnkStruct_027e0ce0_40_14C19func_ov093_02168e24EPv 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 @@ -156,30 +156,30 @@ _ZN20ModelRender_Derived5C1EiP10G3d_Model_P18G3d_BoneMtxStruct_ kind:function(th func_ov093_0216c8fc kind:function(thumb,size=0x44) addr:0x0216c8dc func_ov093_0216c940 kind:function(thumb,size=0x50) addr:0x0216c920 func_ov093_0216c990 kind:function(arm,size=0xa8) addr:0x0216c970 -func_ov093_0216ca38 kind:function(arm,size=0x270) addr:0x0216ca18 +_ZN20ModelRender_Derived419func_ov093_0216ca38Ebbbb kind:function(arm,size=0x270) addr:0x0216ca18 _ZN19func_ov093_0216cca8D1Ev kind:function(arm,size=0x14) addr:0x0216cc88 _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 _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 -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d160Ev kind:function(thumb,size=0x6c) addr:0x0216d140 -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d1ccEiPK24UnkStruct_ov001_020c40f4bb kind:function(thumb,size=0x1cc) addr:0x0216d1ac +_ZN16PlayerZeldaActorC1EPvP21UnkStruct_027e0ce0_40P25UnkStruct_027e0ce0_40_150Pj kind:function(thumb,size=0x1bc) addr:0x0216ce40 +_ZN16PlayerZeldaActorD1Ev kind:function(thumb,size=0xb6) addr:0x0216cffc +_ZN15PlayerActorBase19func_ov093_0216d0d4Ev kind:function(thumb,size=0x8c) addr:0x0216d0b4 +_ZN15PlayerActorBase19func_ov093_0216d160Ev kind:function(thumb,size=0x6c) addr:0x0216d140 +_ZN15PlayerActorBase19func_ov093_0216d1ccEiPK24UnkStruct_ov001_020c40f4bb kind:function(thumb,size=0x1cc) addr:0x0216d1ac func_ov093_0216d398 kind:function(arm,size=0x64) addr:0x0216d378 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 -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216d5b8Ei kind:function(arm,size=0x830) addr:0x0216d598 +_ZN15PlayerActorBase19func_ov093_0216d5b8Eb kind:function(arm,size=0x830) addr:0x0216d598 func_ov093_0216dde8 kind:function(arm,size=0x48) addr:0x0216ddc8 -_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 +_ZN15PlayerActorBase19func_ov093_0216de30Eii kind:function(arm,size=0x98) addr:0x0216de10 +_ZN15PlayerActorBase19func_ov093_0216dec8EPv 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 -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216e1a4Ei kind:function(arm,size=0xfc) addr:0x0216e184 +_ZN15PlayerActorBase19func_ov093_0216e1a4EPv 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 -_ZN25UnkStruct_027e0ce0_40_32819func_ov093_0216f71cEPi kind:function(thumb,size=0x50) addr:0x0216f6fc +_ZN15PlayerActorBase19func_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/ov102/symbols.txt b/config/usa/arm9/overlays/ov102/symbols.txt index 76cb9d44..dfd9fe85 100644 --- a/config/usa/arm9/overlays/ov102/symbols.txt +++ b/config/usa/arm9/overlays/ov102/symbols.txt @@ -1,26 +1,26 @@ _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 +_ZN25UnkStruct_027e0ce0_40_10819func_ov102_02182e54EiP7VecFx32i kind:function(arm,size=0x154) addr:0x02182e34 +_ZN24UnkStruct_ItemManager_2019func_ov102_02182fa8Ebb kind:function(arm,size=0x54) addr:0x02182f88 +_ZN24UnkStruct_ItemManager_2019func_ov102_02182ffcEPv kind:function(arm,size=0x40) addr:0x02182fdc +_ZN21UnkStruct_027e0ce0_4019func_ov102_0218303cEbP11ItemManager 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 +_ZN21UnkStruct_027e0ce0_4019func_ov102_021831b4EPv kind:function(arm,size=0x3c) addr:0x02183194 +_ZN21UnkStruct_027e0ce0_4019func_ov102_021831f0EPv 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 +_ZN16MapObjectUnkSAND8vfunc_14Ei 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 +_ZN16MapObjectUnkPTFL8vfunc_14Ei 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 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index ae97f5cf..4b5826f1 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -657,7 +657,7 @@ _ZN4Game20TrySetCreateCallbackEPFP12GameModeBasevE kind:function(arm,size=0x18) func_0201373c kind:function(arm,size=0x18) addr:0x0201373c func_02013754 kind:function(arm,size=0x14) addr:0x02013754 _ZN18UnkStruct_02049b1813func_02013768Ev kind:function(arm,size=0x60) addr:0x02013768 -func_020137c8 kind:function(arm,size=0x1c) addr:0x020137c8 +_ZN18UnkStruct_02049b1813func_020137c8Ei kind:function(arm,size=0x1c) addr:0x020137c8 func_020137e4 kind:function(arm,size=0x5c) addr:0x020137e4 _ZN18UnkStruct_02049b1813func_02013840Eti kind:function(arm,size=0xb4) addr:0x02013840 _ZN18UnkStruct_02049b1813func_020138f4Ei kind:function(arm,size=0x140) addr:0x020138f4 @@ -669,21 +669,21 @@ _ZN5Input13func_02013b24Ei kind:function(arm,size=0x64) addr:0x02013b24 func_02013b88 kind:function(arm,size=0x10) addr:0x02013b88 func_02013b98 kind:function(arm,size=0x24) addr:0x02013b98 _ZN5Input13func_02013bbcEv kind:function(arm,size=0x4c) addr:0x02013bbc -_ZN5Input13func_02013c08Et kind:function(arm,size=0x1c) addr:0x02013c08 +_ZN5Input13func_02013c08Ej kind:function(arm,size=0x1c) addr:0x02013c08 func_02013c24 kind:function(arm,size=0x58) addr:0x02013c24 func_02013c7c kind:function(arm,size=0x58) addr:0x02013c7c -func_02013cd4 kind:function(arm,size=0x5c) addr:0x02013cd4 -_ZN13func_02013d30D0Ev kind:function(arm,size=0x64) addr:0x02013d30 -func_02013d94 kind:function(arm,size=0x5c) addr:0x02013d94 +_ZN29UnkStruct_ov017_020c3f70_BaseD1Ev kind:function(arm,size=0x5c) addr:0x02013cd4 +_ZN29UnkStruct_ov017_020c3f70_BaseD0Ev kind:function(arm,size=0x64) addr:0x02013d30 +_ZN29UnkStruct_ov017_020c3f70_BaseD2Ev kind:function(arm,size=0x5c) addr:0x02013d94 func_02013df0 kind:function(arm,size=0x28) addr:0x02013df0 _ZN21UnkStruct_02049a2c_1C13func_02013e18EPvi kind:function(arm,size=0x1c) addr:0x02013e18 -func_02013e34 kind:function(arm,size=0x10) addr:0x02013e34 +_ZN24UnkStruct_ov017_020c3f708vfunc_08Ev kind:function(arm,size=0x10) addr:0x02013e34 func_02013e44 kind:function(arm,size=0x3c) addr:0x02013e44 func_02013e80 kind:function(arm,size=0x4c) addr:0x02013e80 _ZN18UnkStruct_02049b8013func_02013eccEiPFvtEi kind:function(arm,size=0x1c) addr:0x02013ecc _ZN18UnkStruct_02049b8013func_02013ee8Eii kind:function(arm,size=0x98) addr:0x02013ee8 _ZN18UnkStruct_02049b8013func_02013f80Ei kind:function(arm,size=0x6c) addr:0x02013f80 -func_02013fec kind:function(arm,size=0xc) addr:0x02013fec +_ZN18UnkStruct_02049b8013func_02013fecEiPv kind:function(arm,size=0xc) addr:0x02013fec func_02013ff8 kind:function(arm,size=0x12c) addr:0x02013ff8 _ZN12TouchControl11UpdateStateEP10TouchStatePK6TPData kind:function(arm,size=0xb8) addr:0x02014124 _ZN12TouchControl4InitEv kind:function(thumb,size=0x3c) addr:0x020141dc @@ -698,7 +698,7 @@ func_020144a0 kind:function(thumb,size=0x10) addr:0x020144a0 func_020144b0 kind:function(thumb,size=0x1c) addr:0x020144b0 _ZN21UnkStruct_02011e10_2C13func_020144ccEiii kind:function(thumb,size=0x6c) addr:0x020144cc _ZN21UnkStruct_02011e10_2C13func_02014538Ev kind:function(thumb,size=0x34) addr:0x02014538 -func_0201456c kind:function(arm,size=0x44) addr:0x0201456c +_ZN18UnkStruct_020499e013func_0201456cEi kind:function(arm,size=0x44) addr:0x0201456c func_020145b0 kind:function(arm,size=0x80) addr:0x020145b0 func_02014630 kind:function(arm,size=0x58) addr:0x02014630 func_02014688 kind:function(arm,size=0x7c) addr:0x02014688 @@ -968,7 +968,7 @@ _ZN18UnkStruct_0204a11013func_02018d78Ei kind:function(arm,size=0x174) addr:0x02 func_02018eec kind:function(arm,size=0xac) addr:0x02018ec4 func_02018f98 kind:function(arm,size=0x368) addr:0x02018f70 _ZN18UnkStruct_0204a11013func_02019300Ei kind:function(arm,size=0x40) addr:0x020192d8 -func_02019340 kind:function(arm,size=0x10) addr:0x02019318 +_ZN18UnkStruct_0204a11013func_02019340Ei kind:function(arm,size=0x10) addr:0x02019318 _ZN18UnkStruct_0204a11013func_02019350Ev kind:function(arm,size=0xb8) addr:0x02019328 _ZN18UnkStruct_0204a11013func_02019408Ev kind:function(arm,size=0x4c) addr:0x020193e0 _ZN18UnkStruct_0204a11013func_02019454Ev kind:function(arm,size=0x88) addr:0x0201942c diff --git a/include/Actor/Actor.hpp b/include/Actor/Actor.hpp index 8c3abba0..53547e89 100644 --- a/include/Actor/Actor.hpp +++ b/include/Actor/Actor.hpp @@ -3,6 +3,7 @@ #include "Actor/ActorId.hpp" #include "Actor/ActorProfile.hpp" #include "Actor/ActorRef.hpp" +#include "Physics/AABB.hpp" #include "Physics/Cylinder.hpp" #include "System/SysNew.hpp" #include "Unknown/UnkStruct_ov031_Items.hpp" @@ -13,6 +14,9 @@ #include "types.h" #include "versions.h" +class UnkStruct_027e09bc; +class UnkStruct_027e09bc_0C; + class ActorParams { public: /* 00 */ VecFx32 mInitialPos; @@ -72,7 +76,7 @@ enum ActorFlag_ { ActorFlag_12 = FLAG(0, 12), ActorFlag_13 = FLAG(0, 13), ActorFlag_14 = FLAG(0, 14), - ActorFlag_15 = FLAG(0, 15), + ActorFlag_15 = FLAG(0, 15), // stunned? ActorFlag_16 = FLAG(0, 16), ActorFlag_17 = FLAG(0, 17), ActorFlag_18 = FLAG(0, 18), @@ -91,6 +95,11 @@ enum ActorFlag_ { ActorFlag_31 = FLAG(0, 31), }; +// normal: 0x603B - 0110 0000 0011 1011 - Alive | Visible | Active | Flag_4 | Flag_13 | Flag_14 | Flag 5 +// out of stun: 0xE03B - 1110 0000 0011 1011 - Alive | Visible | Active | Flag_4 | Flag_13 | Flag_14 | Flag 5 | Flag_15 +// caught in tornado: 0xE01B - 1110 0000 0001 1011 - Alive | Visible | Active | Flag_4 | Flag_13 | Flag_14 | Flag_15 +// stunned: 0xA01B - 1010 0000 0001 1011 - Alive | Visible | Active | Flag_4 | Flag_13 | Flag_15 + class Actor_9C { public: /* 00 (vtable) */ @@ -120,8 +129,52 @@ public: class Actor_vfunc_30 { public: - /* 00 */ s8 mUnk_00; - /* 01 */ s8 mUnk_01; + union UnkStruct { + struct { + s8 unk_00; + s8 unk_01; + }; + u16 data; + }; + +public: + /* 00 */ UnkStruct mUnk_00; + /* 02 */ UnkStruct mUnk_02; +}; + +// ActorStateStunned? seems to related to that +class UnkStruct_ActorUnkCANS_224 { +public: + /* 00 (base) */ UnkStruct_PlayerGet_ec mUnk_00[0x2]; + /* 08 */ volatile u16 mUnk_08; + /* 0A */ u16 mUnk_0A; + /* 0C */ u16 mUnk_0C; + /* 0E */ u16 mUnk_0E; + /* 10 */ + + UnkStruct_ActorUnkCANS_224(); // func_ov000_02099820 + + ~UnkStruct_ActorUnkCANS_224() { + this->Destroy(); + } + + void Destroy() { + for (UnkStruct_PlayerGet_ec *ptr = this->mUnk_00; ptr != &this->mUnk_00[ARRAY_LEN(this->mUnk_00)]; ++ptr) { + ptr->func_ov000_020a0334(); + } + + this->mUnk_0A = 0; + this->mUnk_08 = 0; + } + + void UpdateTimer() { + if (this->mUnk_08 < this->mUnk_0A) { + this->mUnk_08++; + } + } + + void func_ov000_020998f0(ActorRef ref, VecFx32 *pPos); + void func_ov000_02099a0c(); }; typedef s16 ActorState; @@ -150,9 +203,9 @@ public: /* 4A */ u8 mUnk_4A[2]; /* 4C */ ActorState mState; /* 4E */ fx16 mYOffset; - /* 50 */ volatile u16 mUnk_50; // timer some actors are using - /* 52 */ u16 mUnk_52; // maximum value for above timer - /* 54 */ unk32 mUnk_54; + /* 50 */ volatile u16 mTimer; // generic timer, used for stunned time, drop expiration, ... + /* 52 */ u16 mTimerMax; // maximum value for the above timer + /* 54 */ UnkStruct_ActorUnkCANS_224 *mUnk_54; /* 58 */ ActorFlags mFlags[1]; /* 5C */ ActorParams mUnk_5C; /* 8C */ ActorRef mRef; @@ -164,24 +217,24 @@ public: /* 08 */ virtual unk16 vfunc_08(); /* 0C */ virtual unk8 vfunc_0C(); /* 10 */ virtual void vfunc_10(Cylinder *param1); - /* 14 */ virtual void vfunc_14(); + /* 14 */ virtual bool vfunc_14(Cylinder *param1); /* 18 */ virtual bool vfunc_18(unk32 param1); // Init? /* 1C */ virtual void vfunc_1C(); // Setup /* 20 */ virtual void vfunc_20(); // Update? /* 24 */ virtual void vfunc_24(); - /* 28 */ virtual void vfunc_28(); - /* 2C */ virtual void vfunc_2C(unk32 param1); + /* 28 */ virtual void vfunc_28(Actor_vfunc_30 *param1); + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1); /* 30 */ virtual void vfunc_30(Actor_vfunc_30 *param1); /* 34 */ virtual unk32 vfunc_34(); /* 38 */ virtual bool Grab(ActorGrabParams grabParams); /* 3C */ virtual bool Drop(ActorGrabParams grabParams, const VecFx32 *pVel); /* 40 */ virtual void vfunc_40(); /* 44 */ virtual void vfunc_44(); - /* 48 */ virtual void vfunc_48(); + /* 48 */ virtual bool vfunc_48(unk32 param1); /* 4C */ virtual ~Actor(); /* 54 */ - bool func_01fff5d0(unk32 param1, unk32 param2); + bool func_01fff5d0(Actor_vfunc_30 *param1, unk32 param2); void ResetFlags() { *(u32 *) this->mFlags = 0; @@ -191,17 +244,48 @@ public: UNSET_FLAG(this->mFlags, ActorFlag_Alive); } - bool IsAlive() { - return GET_FLAG(this->mFlags, ActorFlag_Alive); - } + // clang-format off + /* x & 0x00000001 */ const bool IsAlive() { return GET_FLAG(this->mFlags, ActorFlag_Alive); } + /* x & 0x00000002 */ const bool IsVisible() { return GET_FLAG(this->mFlags, ActorFlag_Visible); } + /* x & 0x00000004 */ const bool IsFlag2() { return GET_FLAG(this->mFlags, ActorFlag_2); } + /* x & 0x00000008 */ const bool IsActive() { return GET_FLAG(this->mFlags, ActorFlag_Active); } + /* x & 0x00000010 */ const bool IsFlag4() { return GET_FLAG(this->mFlags, ActorFlag_4); } + /* x & 0x00000020 */ const bool IsFlag5() { return GET_FLAG(this->mFlags, ActorFlag_5); } + /* x & 0x00000040 */ const bool IsFlag6() { return GET_FLAG(this->mFlags, ActorFlag_6); } + /* x & 0x00000080 */ const bool IsFlag7() { return GET_FLAG(this->mFlags, ActorFlag_7); } + /* x & 0x00000100 */ const bool IsGrabbed() { return GET_FLAG(this->mFlags, ActorFlag_Grabbed); } + /* x & 0x00000200 */ const bool IsFlag9() { return GET_FLAG(this->mFlags, ActorFlag_9); } + /* x & 0x00000400 */ const bool IsInteracting() { return GET_FLAG(this->mFlags, ActorFlag_Interacting); } + /* x & 0x00000800 */ const bool IsFlag11() { return GET_FLAG(this->mFlags, ActorFlag_11); } + /* x & 0x00001000 */ const bool IsFlag12() { return GET_FLAG(this->mFlags, ActorFlag_12); } + /* x & 0x00002000 */ const bool IsFlag13() { return GET_FLAG(this->mFlags, ActorFlag_13); } + /* x & 0x00004000 */ const bool IsFlag14() { return GET_FLAG(this->mFlags, ActorFlag_14); } + /* x & 0x00008000 */ const bool IsFlag15() { return GET_FLAG(this->mFlags, ActorFlag_15); } + /* x & 0x00010000 */ const bool IsFlag16() { return GET_FLAG(this->mFlags, ActorFlag_16); } + /* x & 0x00020000 */ const bool IsFlag17() { return GET_FLAG(this->mFlags, ActorFlag_17); } + /* x & 0x00040000 */ const bool IsFlag18() { return GET_FLAG(this->mFlags, ActorFlag_18); } + /* x & 0x00080000 */ const bool IsFlag19() { return GET_FLAG(this->mFlags, ActorFlag_19); } + /* x & 0x00100000 */ const bool IsFlag20() { return GET_FLAG(this->mFlags, ActorFlag_20); } + /* x & 0x00200000 */ const bool IsFlag21() { return GET_FLAG(this->mFlags, ActorFlag_21); } + /* x & 0x00400000 */ const bool IsFlag22() { return GET_FLAG(this->mFlags, ActorFlag_22); } + /* x & 0x00800000 */ const bool IsFlag23() { return GET_FLAG(this->mFlags, ActorFlag_23); } + /* x & 0x01000000 */ const bool IsFlag24() { return GET_FLAG(this->mFlags, ActorFlag_24); } + /* x & 0x02000000 */ const bool IsFlag25() { return GET_FLAG(this->mFlags, ActorFlag_25); } + /* x & 0x04000000 */ const bool IsFlag26() { return GET_FLAG(this->mFlags, ActorFlag_26); } + /* x & 0x08000000 */ const bool IsFlag27() { return GET_FLAG(this->mFlags, ActorFlag_27); } + /* x & 0x10000000 */ const bool IsFlag28() { return GET_FLAG(this->mFlags, ActorFlag_28); } + /* x & 0x20000000 */ const bool IsFlag29() { return GET_FLAG(this->mFlags, ActorFlag_29); } + /* x & 0x40000000 */ const bool IsFlag30() { return GET_FLAG(this->mFlags, ActorFlag_30); } + /* x & 0x80000000 */ const bool IsFlag31() { return GET_FLAG(this->mFlags, ActorFlag_31); } + // clang-format on Actor(); ActorId GetActorId(); bool IsTimerOut() { - if (this->mUnk_50 < this->mUnk_52) { - this->mUnk_50++; + if (this->mTimer < this->mTimerMax) { + this->mTimer++; return false; } @@ -237,6 +321,7 @@ public: void func_ov000_0209862c(unk32 param1); bool func_ov000_020986fc(unk32 param1); void func_ov000_020989e0(); + void func_ov000_02098a18(Cylinder *param1); bool func_ov000_02098a60(unk32 param1); void func_ov000_02098a88(unk32 param1, unk32 param2); void func_ov000_0209a008(unk32 param1, fx16 param2); @@ -247,14 +332,29 @@ public: // overlay 17 bool func_ov017_020beeec(unk32 param1); - void func_ov017_020bef88(Actor_vfunc_30 *param1, void *param2, unk32 param3); + bool func_ov017_020bef4c(unk32 param1); + void func_ov017_020bef88(Actor_vfunc_30 *param1, UnkStruct_ov019_020d24c8_28_258_00 *param2, unk32 param3); + void func_ov017_020bf024(Actor_vfunc_30 *param1); + void func_ov017_020bf050(Actor_9C *param1, unk32 param2); + void func_ov017_020bf178(Actor_9C *param1, unk32 param2); + void func_ov017_020bf284(VecFx32 *param1, VecFx32 param2); + void func_ov017_020bf2d8(Actor_9C *param1, unk32 param2); void func_ov017_020bf3e0(unk32 param1, fx32 param2); - void func_ov017_020bf5c4(VecFx32 *param1, unk32 param2, unk32 param3, unk32 param4, unk32 param5); + void func_ov017_020bf4b0(unk32 param1); + void func_ov017_020bf574(unk32 param1, unk32 param2); + void func_ov017_020bf5c4(VecFx32 *param1, unk32 param2, unk32 param3, unk32 param4, s16 param5); void func_ov017_020bf634(const VecFx32 *param1, u16 param2, unk32 param3); void func_ov017_020bf688(); + void func_ov017_020bf710(UnkStruct_ActorUnkCANS_224 *param1, const VecFx32 *param2, u16 param3); + void func_ov017_020bf7a8(); + void func_ov017_020bf894(UnkStruct_ActorUnkCANS_224 *param1); + void func_ov017_020bf99c(); void func_ov017_020bf9c8(Actor *param1); void func_ov017_020bfa50(VecFx32 *param1, unk32 param2); + void func_ov017_020bfad4(); void func_ov017_020bfb18(Actor_9C *param1); + bool func_ov017_020bfd9c(Vec2s *param1, unk32 param2, UnkStruct_027e09bc_0C *param3, + AABB *param4); //! TODO: param4's type not confirmed but probably correct // overlay 71 (might be temporary) void func_ov071_021540ac(unk32 param1); @@ -308,7 +408,6 @@ public: /* 10 */ }; -class UnkStruct_ActorUnkCANS_224; class Actor_Derived2 : public Actor { public: /* 00 (base) */ @@ -326,16 +425,12 @@ public: /* 4C */ WEAK virtual ~Actor_Derived2() {} /* 54 */ virtual void vfunc_54(unk32 param1); - void func_ov000_020990c0(Actor_9C *param2, unk32 param3, unk32 param4); + void func_ov000_020990c0(Actor_9C *param1, unk32 param2, unk32 param3); void func_ov000_020992dc(); - unk32 func_ov000_02099450(void *param2, VecFx32 *param3, unk32 param4, u16 param5); + unk32 func_ov000_02099450(UnkStruct_ActorUnkCANS_224 *param1, VecFx32 *param2, unk32 param3, u16 param4); void func_ov000_020994a0(); void func_ov000_020997c4(unk32 param1); void func_ov000_02098f34(VecFx32 *); - - unk32 func_ov017_020bef4c(unk32 param1); - void func_ov017_020bf178(Actor_9C *param2, unk32 param3); - void func_ov017_020bf894(UnkStruct_ActorUnkCANS_224 *param1); }; extern UnkStruct_ov000_020b539c data_ov000_020b539c_eur; diff --git a/include/Actor/ActorBomb.hpp b/include/Actor/ActorBomb.hpp index bfc69853..06e7b02c 100644 --- a/include/Actor/ActorBomb.hpp +++ b/include/Actor/ActorBomb.hpp @@ -106,7 +106,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20() override; /* 24 */ virtual void vfunc_24() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 38 */ virtual bool Grab(ActorGrabParams grabParams) override; /* 3C */ virtual bool Drop(ActorGrabParams grabParams, const VecFx32 *pVel) override; diff --git a/include/Actor/ActorEventIcon.hpp b/include/Actor/ActorEventIcon.hpp index 187e9076..740f490e 100644 --- a/include/Actor/ActorEventIcon.hpp +++ b/include/Actor/ActorEventIcon.hpp @@ -10,7 +10,7 @@ class ActorEventIcon : public Actor { public: /* 000 (base) */ /* 094 */ CellAnimObject mUnk_094; // event icon - /* 10C */ unk16 mUnk_10C; + /* 10C */ u16 mUnk_10C; /* 110 */ unk16 mUnk_10E; // pad? ActorEventIcon(); @@ -21,7 +21,11 @@ public: /* 30 */ virtual void vfunc_30(Actor_vfunc_30 *param1) override; /* 4C */ virtual ~ActorEventIcon() override; + // overlay 0 void func_ov000_0209c014(void); + + // overlay 17 + void func_ov017_020c002c(); }; class ActorProfileEventIcon : public ActorProfile { diff --git a/include/Actor/ActorFleeingSpinut.hpp b/include/Actor/ActorFleeingSpinut.hpp index e6e86f38..32b8331d 100644 --- a/include/Actor/ActorFleeingSpinut.hpp +++ b/include/Actor/ActorFleeingSpinut.hpp @@ -77,7 +77,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 30 */ virtual void vfunc_30(Actor_vfunc_30 *param1) override; /* 4C */ virtual ~ActorFleeingSpinut() override; diff --git a/include/Actor/ActorHeart.hpp b/include/Actor/ActorHeart.hpp index 3e98153a..633a80cc 100644 --- a/include/Actor/ActorHeart.hpp +++ b/include/Actor/ActorHeart.hpp @@ -46,7 +46,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 4C */ virtual ~ActorHeart() override {}; void func_ov031_020f0750(); diff --git a/include/Actor/ActorItemBoomerang.hpp b/include/Actor/ActorItemBoomerang.hpp index 4f534ea7..11b9cf64 100644 --- a/include/Actor/ActorItemBoomerang.hpp +++ b/include/Actor/ActorItemBoomerang.hpp @@ -84,7 +84,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 4C */ virtual ~ActorItemBoomerang() override; void SetState(ActorState state); diff --git a/include/Actor/ActorItemDrop.hpp b/include/Actor/ActorItemDrop.hpp index 335ffb6f..2bad32ab 100644 --- a/include/Actor/ActorItemDrop.hpp +++ b/include/Actor/ActorItemDrop.hpp @@ -73,7 +73,7 @@ public: ActorItemDrop(); /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 20 */ virtual void vfunc_20() override; /* 24 */ virtual void vfunc_24() override; diff --git a/include/Actor/ActorItemFlower.hpp b/include/Actor/ActorItemFlower.hpp index 79dc9d02..820441af 100644 --- a/include/Actor/ActorItemFlower.hpp +++ b/include/Actor/ActorItemFlower.hpp @@ -42,7 +42,7 @@ public: /* 18 */ bool vfunc_18(unk32 param1); /* 20 */ virtual void vfunc_20() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 5C */ virtual void vfunc_5C(ActorState state) override; void func_ov031_020f11a8(); diff --git a/include/Actor/ActorItemTornado.hpp b/include/Actor/ActorItemTornado.hpp index b3e7bd27..f78e5d80 100644 --- a/include/Actor/ActorItemTornado.hpp +++ b/include/Actor/ActorItemTornado.hpp @@ -53,7 +53,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20() override; /* 24 */ virtual void vfunc_24() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; void SetState(ActorState state); void func_ov031_020e5d18(unk32 param1); diff --git a/include/Actor/ActorKeese.hpp b/include/Actor/ActorKeese.hpp index d66bca8c..1e3240f9 100644 --- a/include/Actor/ActorKeese.hpp +++ b/include/Actor/ActorKeese.hpp @@ -119,7 +119,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; void func_ov032_0211e0c0(); void func_ov032_0211e0d4(s16 param1, unk32 param2); diff --git a/include/Actor/ActorManager.hpp b/include/Actor/ActorManager.hpp index 28615a9a..5e741481 100644 --- a/include/Actor/ActorManager.hpp +++ b/include/Actor/ActorManager.hpp @@ -11,6 +11,9 @@ class EntranceInfo; class ActorManager : public AutoInstance { +public: + typedef void (*UnkCallback1)(Actor *, Actor_vfunc_30 *); + public: /* 00 */ Actor **mActorTable; /* 04 */ Actor **mActorTableEnd; @@ -18,9 +21,9 @@ public: /* 0C */ unk16 mActorCount; /* 0E */ unk16 mNextActorId; /* 10 */ unk8 mUnk_10; - /* 10 */ unk8 mUnk_11; - /* 10 */ unk8 mUnk_12; - /* 10 */ unk8 mUnk_13; + /* 11 */ unk8 mUnk_11; + /* 12 */ unk8 mUnk_12; + /* 13 */ unk8 mUnk_13; /* 14 */ UnkStruct_ov019_020d24c8_28_258_00 mUnk_14; /* 1C */ unk32 mUnk_1C; /* 20 */ unk8 mUnk_20; @@ -40,7 +43,7 @@ public: ~ActorManager(); // itcm - void func_01fff2fc(void (*callback)(Actor *, u16), unk32 param2); + void func_01fff2fc(UnkCallback1 callback, void *param2); Actor **func_01fff350(UnkStruct_ov000_020b3000_Base *param1, Actor **ppActorTable); Actor *func_01fff3b4(ActorRef ref); @@ -65,6 +68,18 @@ public: static bool func_ov001_020bb728(ActorId actorId); static void func_ov001_020bb824(); static void func_ov001_020bb844(); + + // overlay 5 + void func_ov005_020b66a4(unk32 param1); + + // overlay 17 + void func_ov017_020becd8(unk32 param1); + + static void func_ov017_020bee20(Actor *pActor, Actor_vfunc_30 *param2); + static void func_ov017_020bee64(Actor *pActor, Actor_vfunc_30 *param2); + static void func_ov017_020bee84(Actor *pActor, Actor_vfunc_30 *param2); + static void func_ov017_020beea4(Actor *pActor, Actor_vfunc_30 *param2); + static void func_ov017_020beecc(Actor *pActor, Actor_vfunc_30 *param2); }; extern ActorManager *gpActorManager; diff --git a/include/Actor/ActorPot.hpp b/include/Actor/ActorPot.hpp index b7afd0b0..2902c313 100644 --- a/include/Actor/ActorPot.hpp +++ b/include/Actor/ActorPot.hpp @@ -88,7 +88,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 5C */ virtual void vfunc_5C(ActorState state) override; void func_ov031_020f0cf0(); diff --git a/include/Actor/ActorProfile.hpp b/include/Actor/ActorProfile.hpp index b367785e..2a248283 100644 --- a/include/Actor/ActorProfile.hpp +++ b/include/Actor/ActorProfile.hpp @@ -15,7 +15,7 @@ public: /* 04 */ Cylinder mUnk_04; /* 14 */ unk8 mUnk_14; /* 15 */ bool mUnk_15; - /* 16 */ unk8 mUnk_16; + /* 16 */ unk8 mUnk_16[1]; //! TODO: at least one element /* 17 */ unk8 mUnk_17; /* 18 */ unk8 mUnk_18; /* 19 */ unk8 mUnk_19; diff --git a/include/Actor/ActorRef.hpp b/include/Actor/ActorRef.hpp index c2f9d1d0..9256e276 100644 --- a/include/Actor/ActorRef.hpp +++ b/include/Actor/ActorRef.hpp @@ -70,6 +70,49 @@ struct ActorRef { const u32 Get32() const { return this->data; } + + const u16 GetTypeIndex1() { + if (this->type_index == REF_TYPE_INDEX(ActorRefType_0, 0x101)) { + return 0x00; + } + + return this->unk_id; + } + + const bool HasTypeIndexValue(u16 value) { + return this->type_index == value; + } + + const bool UnkCheck1() { + bool ret = true; + + if (this->type_index != REF_TYPE_INDEX(ActorRefType_0, 0x100) && + this->type_index != REF_TYPE_INDEX(ActorRefType_0, 0x101)) { + ret = false; + } + + return ret; + } + + const bool UnkCheck2() { + bool ret = false; + + if (this->UnkCheck1() && this->GetTypeIndex1() == 0x01) { + ret = true; + } + + return ret; + } + + const bool UnkCheck3(u16 value) { + BOOL ret = false; + + if (this->HasTypeIndexValue(value) && (this->unk_id == 1 || this->unk_id == 3)) { + ret = true; + } + + return ret; + } }; // for arrays diff --git a/include/Actor/ActorRollingStone.hpp b/include/Actor/ActorRollingStone.hpp index 779a6c1c..16631fc4 100644 --- a/include/Actor/ActorRollingStone.hpp +++ b/include/Actor/ActorRollingStone.hpp @@ -81,9 +81,9 @@ public: ActorRollingStone(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; // func_ov031_020f869c - /* 20 */ virtual void vfunc_20() override; // func_ov031_020f878c - /* 2C */ virtual void vfunc_2C(unk32 param1) override; // func_ov031_020f8948 + /* 18 */ virtual bool vfunc_18(unk32 param1) override; // func_ov031_020f869c + /* 20 */ virtual void vfunc_20() override; // func_ov031_020f878c + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; // func_ov031_020f8948 /* 54 */ bool IsInternalTimerOut1() { diff --git a/include/Actor/ActorRupee.hpp b/include/Actor/ActorRupee.hpp index 22c9b7aa..e7af5015 100644 --- a/include/Actor/ActorRupee.hpp +++ b/include/Actor/ActorRupee.hpp @@ -71,7 +71,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 4C */ virtual ~ActorRupee() override; void func_ov031_020e8fec(); diff --git a/include/Actor/ActorShotArrow.hpp b/include/Actor/ActorShotArrow.hpp index af9d7e69..2ae1ec76 100644 --- a/include/Actor/ActorShotArrow.hpp +++ b/include/Actor/ActorShotArrow.hpp @@ -130,7 +130,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20() override; /* 24 */ virtual void vfunc_24() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 4C */ virtual ~ActorShotArrow() override; void func_ov031_020f1868(); diff --git a/include/Actor/ActorSpinut.hpp b/include/Actor/ActorSpinut.hpp index c583b272..f0190d65 100644 --- a/include/Actor/ActorSpinut.hpp +++ b/include/Actor/ActorSpinut.hpp @@ -130,7 +130,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 1C */ virtual void vfunc_1C() override; /* 20 */ virtual void vfunc_20() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 4C */ virtual ~ActorSpinut() override; /* 54 */ virtual void vfunc_54(unk32 param1) override; @@ -167,7 +167,7 @@ public: void func_ov032_0211b190(s32 param1, s32 param2); void func_ov032_0211b1e0(); void func_ov032_0211b298(); - static void func_ov032_0211b37c(ActorSpinut *, u16 param1); + static void func_ov032_0211b37c(Actor *thisx, Actor_vfunc_30 *param1); void func_ov032_0211b3b0(); }; diff --git a/include/Actor/ActorTearLight.hpp b/include/Actor/ActorTearLight.hpp index 304b3ebc..205e631a 100644 --- a/include/Actor/ActorTearLight.hpp +++ b/include/Actor/ActorTearLight.hpp @@ -112,7 +112,7 @@ public: /* 1C */ virtual void vfunc_1C() override; /* 20 */ virtual void vfunc_20() override; /* 24 */ virtual void vfunc_24() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 30 */ virtual void vfunc_30(Actor_vfunc_30 *param1) override; void func_ov071_0215f7f4(ActorState state); diff --git a/include/Actor/ActorUnkCANS.hpp b/include/Actor/ActorUnkCANS.hpp index b9ca41f6..a2774f8f 100644 --- a/include/Actor/ActorUnkCANS.hpp +++ b/include/Actor/ActorUnkCANS.hpp @@ -90,27 +90,6 @@ public: /* 04 */ virtual unk32 vfunc_04(ActorRef param1, unk32 param2, unk32 param3, unk32 *param4) override; }; -class UnkStruct_ActorUnkCANS_224 { -public: - /* 00 (base) */ UnkStruct_PlayerGet_ec mUnk_00[0x2]; - /* 08 */ u16 mUnk_08; - /* 0A */ u16 mUnk_0A; - /* 0C */ STRUCT_PAD(0x0C, 0x10); - /* 10 */ - - UnkStruct_ActorUnkCANS_224(); // func_ov000_02099820 - - ~UnkStruct_ActorUnkCANS_224() { - for (UnkStruct_PlayerGet_ec *ptr = this->mUnk_00; ptr != this->mUnk_00 + ARRAY_LEN(this->mUnk_00); ++ptr) { - ptr->func_ov000_020a0334(); - } - this->mUnk_0A = 0x0; - this->mUnk_08 = 0x0; - } - - void func_ov000_02099a0c(); -}; - class ActorUnkCANS : public Actor_Derived2 { public: /* 000 (base) */ @@ -146,7 +125,7 @@ public: /* 1C */ virtual void vfunc_1C(void) override; /* 20 */ virtual void vfunc_20(void) override; /* 24 */ virtual void vfunc_24(void) override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; void func_ov063_02158424(void); void func_ov063_02158448(unk32 param1); diff --git a/include/Actor/ActorUnkCASE.hpp b/include/Actor/ActorUnkCASE.hpp index f437ebb7..65dae732 100644 --- a/include/Actor/ActorUnkCASE.hpp +++ b/include/Actor/ActorUnkCASE.hpp @@ -89,7 +89,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20() override; /* 24 */ virtual void vfunc_24() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; void func_ov063_0215ab70(void); void func_ov063_0215aba4(void); diff --git a/include/Actor/ActorUnkEFSB.hpp b/include/Actor/ActorUnkEFSB.hpp index ae3586cd..e6c5d91a 100644 --- a/include/Actor/ActorUnkEFSB.hpp +++ b/include/Actor/ActorUnkEFSB.hpp @@ -21,7 +21,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20() override; /* 24 */ virtual void vfunc_24() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 54 */ virtual void vfunc_54(unk32 param1); }; diff --git a/include/Actor/ActorUnkNFSP.hpp b/include/Actor/ActorUnkNFSP.hpp index 48b98961..e4d2efef 100644 --- a/include/Actor/ActorUnkNFSP.hpp +++ b/include/Actor/ActorUnkNFSP.hpp @@ -36,7 +36,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 54 */ virtual void vfunc_54(unk32 param1); void func_ov031_020fb988(); diff --git a/include/Actor/ActorUnkNTTZ.hpp b/include/Actor/ActorUnkNTTZ.hpp index c82cab02..36555a1f 100644 --- a/include/Actor/ActorUnkNTTZ.hpp +++ b/include/Actor/ActorUnkNTTZ.hpp @@ -15,7 +15,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; void func_ov031_020f61a0(); void func_ov031_020f61f0(); diff --git a/include/Actor/ActorUnkRBLS.hpp b/include/Actor/ActorUnkRBLS.hpp index 0494a748..096247e7 100644 --- a/include/Actor/ActorUnkRBLS.hpp +++ b/include/Actor/ActorUnkRBLS.hpp @@ -29,7 +29,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20(void) override; /* 24 */ virtual void vfunc_24(void) override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; void func_ov063_0215f3d4(void); void func_ov063_0215f500(void); diff --git a/include/Actor/ActorUnkRMSBase.hpp b/include/Actor/ActorUnkRMSBase.hpp index c6e5e656..74609f07 100644 --- a/include/Actor/ActorUnkRMSBase.hpp +++ b/include/Actor/ActorUnkRMSBase.hpp @@ -20,6 +20,6 @@ public: /* 1C */ virtual void vfunc_1C() override; /* 20 */ virtual void vfunc_20() override; /* 24 */ virtual void vfunc_24() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 58 */ virtual G3d_Model *vfunc_58() = 0; }; diff --git a/include/Actor/ActorUnkRMTG.hpp b/include/Actor/ActorUnkRMTG.hpp index 4d5c801c..44f47f5a 100644 --- a/include/Actor/ActorUnkRMTG.hpp +++ b/include/Actor/ActorUnkRMTG.hpp @@ -15,7 +15,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 1C */ virtual void vfunc_1C() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; }; class ActorProfileUnkRMTG : public ActorProfile_Derived1 { diff --git a/include/Actor/ActorUnkROCK.hpp b/include/Actor/ActorUnkROCK.hpp index 3575b3be..0d824125 100644 --- a/include/Actor/ActorUnkROCK.hpp +++ b/include/Actor/ActorUnkROCK.hpp @@ -28,7 +28,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 38 */ virtual bool Grab(ActorGrabParams param1) override; /* 38 */ virtual bool Drop(ActorGrabParams param1, const VecFx32 *param2) override; diff --git a/include/Actor/ActorUnkSWBM.hpp b/include/Actor/ActorUnkSWBM.hpp index ccb6acaf..87871f84 100644 --- a/include/Actor/ActorUnkSWBM.hpp +++ b/include/Actor/ActorUnkSWBM.hpp @@ -69,7 +69,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20() override; /* 24 */ virtual void vfunc_24() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; void func_ov031_020e6d48(); void func_ov031_020e6d80(unk32 param1); diff --git a/include/Actor/ActorUnkSWCH.hpp b/include/Actor/ActorUnkSWCH.hpp index 4b9a95ea..be352561 100644 --- a/include/Actor/ActorUnkSWCH.hpp +++ b/include/Actor/ActorUnkSWCH.hpp @@ -16,7 +16,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; }; class ActorProfileUnkSWCH : public ActorProfile { diff --git a/include/Actor/ActorUnkTGTZ.hpp b/include/Actor/ActorUnkTGTZ.hpp index a69f443f..e8498379 100644 --- a/include/Actor/ActorUnkTGTZ.hpp +++ b/include/Actor/ActorUnkTGTZ.hpp @@ -47,7 +47,7 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20() override; /* 24 */ virtual void vfunc_24() override; - /* 30 */ virtual void vfunc_2C(unk32 param1) override; + /* 30 */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 34 */ virtual void vfunc_30(Actor_vfunc_30 *param1) override; bool IsInternalTimerOut() { diff --git a/include/Actor/ActorUnkZLSL_ZSRS.hpp b/include/Actor/ActorUnkZLSL_ZSRS.hpp index 45d26063..b3555dde 100644 --- a/include/Actor/ActorUnkZLSL_ZSRS.hpp +++ b/include/Actor/ActorUnkZLSL_ZSRS.hpp @@ -281,7 +281,7 @@ public: /* 00 */ virtual void GetOffsetPos(VecFx32 *pPos) const override; /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 4C */ virtual ~ActorUnkZLSL() override; /* 58 */ virtual void vfunc_58(ActorState state) override; /* 68 */ virtual void vfunc_68() override; diff --git a/include/Actor/Actor_Derived1.hpp b/include/Actor/Actor_Derived1.hpp index d777267d..11648d47 100644 --- a/include/Actor/Actor_Derived1.hpp +++ b/include/Actor/Actor_Derived1.hpp @@ -1,6 +1,7 @@ #pragma once #include "Actor.hpp" +#include "Physics/Cylinder.hpp" #include "Render/ModelRender.hpp" #include "Unknown/Common.hpp" #include "Unknown/UnkStruct_027e0960.hpp" @@ -154,12 +155,12 @@ public: /* 118 */ unk32 mUnk_118; /* 11C */ unk32 mUnk_11C; - /* 14 */ virtual void vfunc_14() override; + /* 14 */ virtual bool vfunc_14(Cylinder *param1) override; /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 1C */ virtual void vfunc_1C() override; /* 20 */ virtual void vfunc_20() override; /* 24 */ virtual void vfunc_24() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 4C */ virtual ~Actor_Derived1(); /* 54 */ virtual void vfunc_54(unk32 param1); /* 58 */ virtual void vfunc_58(ActorState param1) = 0; diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index 0b3ddbd4..a516e016 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -8,6 +8,9 @@ #include "global.h" #include "types.h" +class UnkStruct_027e0ce0_30_00; +class Inventory; + #define IS_ITEM_RESTRICTED(restrictions, itemFlag) (((restrictions) & (1 << (itemFlag))) != 0) struct UnkStruct_ov000_020afc48 { @@ -66,7 +69,7 @@ public: // overlay 31 void func_ov031_020d9bd0(); void func_ov031_020dba40(); - void func_ov031_020dbc80(unk32 param1, unk32 param2); + void func_ov031_020dbc80(bool param1, bool param2); }; class UnkStruct_ItemManager_20_04_08_310 { @@ -122,8 +125,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); + void func_ov031_020db4f0(bool param1, bool param2); + void func_ov031_020db528(void *param1); }; class UnkStruct_ItemManager_20_08 { @@ -148,7 +151,7 @@ public: // overlay 31 void func_ov031_020d9658(); void func_ov031_020db5b4(); - void func_ov031_020db704(unk32 param1, unk32 param2); + void func_ov031_020db704(bool param1, bool param2); }; class UnkStruct_ItemManager_20_0C { @@ -167,8 +170,8 @@ public: // overlay 31 void func_ov031_020db954(); - void func_ov031_020db958(unk32 param1, unk32 param2); - void func_ov031_020dba3c(unk32 param1); + void func_ov031_020db958(bool param1, bool param2); + void func_ov031_020dba3c(void *param1); }; struct UnkStruct_ItemManager_20_10_00 { @@ -227,14 +230,15 @@ public: // overlay 31 bool func_ov031_020db874(ItemFlag itemFlag); void func_ov031_020db8cc(); - bool func_ov031_020db8f8(); + bool func_ov031_020db8f8(UnkStruct_027e0ce0_30_00 *param1); + void func_ov031_020db844(ItemFlag item); // overlay 101 void func_ov101_02182d5c(); // overlay 102 - void func_ov102_02182fa8(unk32 param1, unk32 param2); - void func_ov102_02182ffc(unk32 param1); + void func_ov102_02182fa8(bool param1, bool param2); + void func_ov102_02182ffc(void *param1); }; struct InvImportData { @@ -392,7 +396,7 @@ public: bool func_ov000_020a89d4(); bool func_ov000_020a8a0c(); void func_ov000_020a8a5c(); - bool func_ov000_020a8a74(); + bool func_ov000_020a8a74(UnkStruct_027e0ce0_30_00 *param1); UnkStruct_ItemManager_20_00 *func_ov000_020a8a90(); UnkStruct_ItemManager_20_04 *func_ov000_020a8aa4(); UnkStruct_ItemManager_20_0C *func_ov000_020a8ab8(); @@ -408,7 +412,8 @@ public: void func_ov001_020bc2b8(); // overlay 17 - void func_ov017_020bd2a0(unk32 param1, unk32 param2); + void func_ov017_020bd2a0(bool param1, bool param2); + void func_ov017_020bd2e8(void *param1); // overlay 110 static u32 GetBmgIDFromItem(ItemId itemId); diff --git a/include/MapObject/MapObject.hpp b/include/MapObject/MapObject.hpp index 686ee1f5..50eac98c 100644 --- a/include/MapObject/MapObject.hpp +++ b/include/MapObject/MapObject.hpp @@ -12,6 +12,7 @@ #include "types.h" class MapObjectProfile; +class UnkStruct_027e09bc_0C; typedef u16 MapObjFlags; enum MapObjFlag_ { @@ -148,10 +149,10 @@ public: /* 08 */ virtual void vfunc_08(); /* 0C */ virtual void vfunc_0C(); /* 10 */ virtual void vfunc_10(); - /* 14 */ virtual void vfunc_14(); - /* 18 */ virtual void vfunc_18(s8 *param1, s8 param2); + /* 14 */ virtual void vfunc_14(unk32 param1); + /* 18 */ virtual void vfunc_18(s8 *param1); /* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3); - /* 20 */ virtual void vfunc_20(); + /* 20 */ virtual void vfunc_20(unk32 param1); /* 24 */ virtual void vfunc_24(MapObject *param1, VecFx32 param2); /* 28 */ virtual unk32 vfunc_28(unk32 param1, unk32 param2, unk32 param3); /* 2C */ virtual bool vfunc_2C(VecFx32 *param1); @@ -177,14 +178,51 @@ public: UNSET_FLAG(this->mFlags, MapObjFlag_Alive); } + // clang-format off + /* x & 0x00000001 */ const bool IsAlive() { return GET_FLAG(this->mFlags, MapObjFlag_Alive); } + /* x & 0x00000002 */ const bool IsFlag1() { return GET_FLAG(this->mFlags, MapObjFlag_1); } + /* x & 0x00000004 */ const bool IsFlag2() { return GET_FLAG(this->mFlags, MapObjFlag_2); } + /* x & 0x00000008 */ const bool IsFlag3() { return GET_FLAG(this->mFlags, MapObjFlag_3); } + /* x & 0x00000010 */ const bool IsFlag4() { return GET_FLAG(this->mFlags, MapObjFlag_4); } + /* x & 0x00000020 */ const bool IsFlag5() { return GET_FLAG(this->mFlags, MapObjFlag_5); } + /* x & 0x00000040 */ const bool IsFlag6() { return GET_FLAG(this->mFlags, MapObjFlag_6); } + /* x & 0x00000080 */ const bool IsFlag7() { return GET_FLAG(this->mFlags, MapObjFlag_7); } + /* x & 0x00000100 */ const bool IsFlag8() { return GET_FLAG(this->mFlags, MapObjFlag_8); } + /* x & 0x00000200 */ const bool IsFlag9() { return GET_FLAG(this->mFlags, MapObjFlag_9); } + /* x & 0x00000400 */ const bool IsFlag10() { return GET_FLAG(this->mFlags, MapObjFlag_10); } + /* x & 0x00000800 */ const bool IsFlag11() { return GET_FLAG(this->mFlags, MapObjFlag_11); } + /* x & 0x00001000 */ const bool IsFlag12() { return GET_FLAG(this->mFlags, MapObjFlag_12); } + /* x & 0x00002000 */ const bool IsFlag13() { return GET_FLAG(this->mFlags, MapObjFlag_13); } + /* x & 0x00004000 */ const bool IsFlag14() { return GET_FLAG(this->mFlags, MapObjFlag_14); } + /* x & 0x00008000 */ const bool IsFlag15() { return GET_FLAG(this->mFlags, MapObjFlag_15); } + /* x & 0x00010000 */ const bool IsFlag16() { return GET_FLAG(this->mFlags, MapObjFlag_16); } + /* x & 0x00020000 */ const bool IsFlag17() { return GET_FLAG(this->mFlags, MapObjFlag_17); } + /* x & 0x00040000 */ const bool IsFlag18() { return GET_FLAG(this->mFlags, MapObjFlag_18); } + /* x & 0x00080000 */ const bool IsFlag19() { return GET_FLAG(this->mFlags, MapObjFlag_19); } + /* x & 0x00100000 */ const bool IsFlag20() { return GET_FLAG(this->mFlags, MapObjFlag_20); } + /* x & 0x00200000 */ const bool IsFlag21() { return GET_FLAG(this->mFlags, MapObjFlag_21); } + /* x & 0x00400000 */ const bool IsFlag22() { return GET_FLAG(this->mFlags, MapObjFlag_22); } + /* x & 0x00800000 */ const bool IsFlag23() { return GET_FLAG(this->mFlags, MapObjFlag_23); } + /* x & 0x01000000 */ const bool IsFlag24() { return GET_FLAG(this->mFlags, MapObjFlag_24); } + /* x & 0x02000000 */ const bool IsFlag25() { return GET_FLAG(this->mFlags, MapObjFlag_25); } + /* x & 0x04000000 */ const bool IsFlag26() { return GET_FLAG(this->mFlags, MapObjFlag_26); } + /* x & 0x08000000 */ const bool IsFlag27() { return GET_FLAG(this->mFlags, MapObjFlag_27); } + /* x & 0x10000000 */ const bool IsFlag28() { return GET_FLAG(this->mFlags, MapObjFlag_28); } + /* x & 0x20000000 */ const bool IsFlag29() { return GET_FLAG(this->mFlags, MapObjFlag_29); } + /* x & 0x40000000 */ const bool IsFlag30() { return GET_FLAG(this->mFlags, MapObjFlag_30); } + /* x & 0x80000000 */ const bool IsFlag31() { return GET_FLAG(this->mFlags, MapObjFlag_31); } + // clang-format on + MapObject(); + // itcm MapObjectId GetMapObjectId(); unk32 func_01fff590(unk32 param2); + // overlay 0 bool func_ov000_0209d114(); bool func_ov000_0209d12c(); - bool func_ov000_0209d144(Vec2s *param1, unk32 param2, unk32 param3); + bool func_ov000_0209d144(Vec2s *param1, unk32 param2, UnkStruct_027e09bc_0C *param3); void func_ov000_0209d274(unk32 param1); bool func_ov000_0209d29c(unk32 param1); void func_ov000_0209d2c4(unk32 param1, bool param2); diff --git a/include/MapObject/MapObjectBombFlower.hpp b/include/MapObject/MapObjectBombFlower.hpp index b46ade38..c29d0bae 100644 --- a/include/MapObject/MapObjectBombFlower.hpp +++ b/include/MapObject/MapObjectBombFlower.hpp @@ -35,7 +35,7 @@ public: MapObjectBombFlower(); /* 08 */ virtual void vfunc_08() override; - /* 14 */ virtual void vfunc_14() override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; /* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) override; /* 28 */ virtual unk32 vfunc_28(unk32 param1, unk32 param2, unk32 param3) override; /* 38 */ virtual void vfunc_38() override; diff --git a/include/MapObject/MapObjectChestBase.hpp b/include/MapObject/MapObjectChestBase.hpp index 9132ac2c..a5a16348 100644 --- a/include/MapObject/MapObjectChestBase.hpp +++ b/include/MapObject/MapObjectChestBase.hpp @@ -62,8 +62,8 @@ public: /* 04 */ virtual void vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C() override; - /* 14 */ virtual void vfunc_14() override; - /* 18 */ virtual void vfunc_18(s8 *param1, s8 param2) override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; + /* 18 */ virtual void vfunc_18(s8 *param1) override; /* 28 */ virtual ItemId vfunc_28(unk32 param1, unk32 param2, unk32 param3) override; /* 30 */ virtual ~MapObjectChestBase() override; /* 38 */ virtual void vfunc_38(unk32 param1, unk32 param2); diff --git a/include/MapObject/MapObjectDoorBase.hpp b/include/MapObject/MapObjectDoorBase.hpp index 992a93eb..7be2f32b 100644 --- a/include/MapObject/MapObjectDoorBase.hpp +++ b/include/MapObject/MapObjectDoorBase.hpp @@ -88,7 +88,7 @@ public: /* 90 */ void func_ov031_020fbf10(bool param1, bool param2); - void func_ov031_020fcb78(s8 *param1, s8 param2); + void func_ov031_020fcb78(s8 *param1); void func_ov031_020fcd40(); void func_ov031_020fcf0c(unk32 param1); bool func_ov031_020fcf30(); diff --git a/include/MapObject/MapObjectDoorClick.hpp b/include/MapObject/MapObjectDoorClick.hpp index 02e58e54..69d06683 100644 --- a/include/MapObject/MapObjectDoorClick.hpp +++ b/include/MapObject/MapObjectDoorClick.hpp @@ -43,8 +43,8 @@ public: /* 00 */ virtual bool vfunc_00() override; /* 08 */ virtual void vfunc_08() override; - /* 14 */ virtual void vfunc_14() override; - /* 18 */ virtual void vfunc_18(s8 *param1, s8 param2) override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; + /* 18 */ virtual void vfunc_18(s8 *param1) override; /* 28 */ virtual unk32 vfunc_28(unk32 param1, unk32 param2, unk32 param3) override; /* 30 */ virtual ~MapObjectDoorClick() override {} /* 40 */ virtual void vfunc_40() override; diff --git a/include/MapObject/MapObjectDoorDangerSpawn.hpp b/include/MapObject/MapObjectDoorDangerSpawn.hpp index 18b1753e..c4760fa7 100644 --- a/include/MapObject/MapObjectDoorDangerSpawn.hpp +++ b/include/MapObject/MapObjectDoorDangerSpawn.hpp @@ -60,8 +60,8 @@ public: /* 04 */ virtual void vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C() override; - /* 14 */ virtual void vfunc_14() override; - /* 18 */ virtual void vfunc_18(s8 *param1, s8 param2) override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; + /* 18 */ virtual void vfunc_18(s8 *param1) override; /* 30 */ virtual ~MapObjectDoorDangerSpawn() override; // (MapObject_UnkStruct1_Derived1) diff --git a/include/MapObject/MapObjectDoorKey.hpp b/include/MapObject/MapObjectDoorKey.hpp index c6805c43..68c63b8b 100644 --- a/include/MapObject/MapObjectDoorKey.hpp +++ b/include/MapObject/MapObjectDoorKey.hpp @@ -34,8 +34,8 @@ public: /* 00 */ virtual bool vfunc_00() override; /* 08 */ virtual void vfunc_08() override; - /* 14 */ virtual void vfunc_14() override; - /* 18 */ virtual void vfunc_18(s8 *param1, s8 param2) override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; + /* 18 */ virtual void vfunc_18(s8 *param1) override; /* 28 */ virtual unk32 vfunc_28(unk32 param1, unk32 param2, unk32 param3) override; /* 30 */ virtual ~MapObjectDoorKey() override; /* 40 */ virtual void vfunc_40() override; diff --git a/include/MapObject/MapObjectDoorSwitch.hpp b/include/MapObject/MapObjectDoorSwitch.hpp index fb2c3c09..c1ddefa4 100644 --- a/include/MapObject/MapObjectDoorSwitch.hpp +++ b/include/MapObject/MapObjectDoorSwitch.hpp @@ -42,8 +42,8 @@ public: // data_ov031_0211527c (MapObject) /* 00 */ virtual bool vfunc_00() override; /* 08 */ virtual void vfunc_08() override; - /* 14 */ virtual void vfunc_14() override; - /* 18 */ virtual void vfunc_18(s8 *param1, s8 param2) override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; + /* 18 */ virtual void vfunc_18(s8 *param1) override; /* 30 */ virtual ~MapObjectDoorSwitch() override; /* 40 */ virtual void vfunc_40() override; /* 44 */ virtual void vfunc_44() override; diff --git a/include/MapObject/MapObjectGrass.hpp b/include/MapObject/MapObjectGrass.hpp index c67d2add..e9e80062 100644 --- a/include/MapObject/MapObjectGrass.hpp +++ b/include/MapObject/MapObjectGrass.hpp @@ -39,7 +39,7 @@ public: /* 00 */ virtual bool vfunc_00() override; /* 08 */ virtual void vfunc_08() override; - /* 14 */ virtual void vfunc_14() override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; /* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) override; /* 38 */ virtual bool vfunc_38(MapObjState state, unk32 param2); /* 3C */ virtual void vfunc_3C(VecFx32 *param1); diff --git a/include/MapObject/MapObjectManager.hpp b/include/MapObject/MapObjectManager.hpp index ee75ca73..b67f923a 100644 --- a/include/MapObject/MapObjectManager.hpp +++ b/include/MapObject/MapObjectManager.hpp @@ -66,6 +66,21 @@ public: static MapObjectManager *Create(); static void Destroy(); + + // overlay 5 + void func_ov005_020b6570(unk32 param1); + + // overlay 17 + bool func_ov017_020c007c(unk32 param1); + void func_ov017_020c00dc(unk32 param1); + void func_ov017_020c01c8(void *param1); + void func_ov017_020c01cc(unk32 param1); + void func_ov017_020c023c(s8 *param1); + void func_ov017_020c02ac(volatile unk32 param1, Vec2bCpp param2); + void func_ov017_020c02f4(volatile unk32 param1, VecFx32 *param2); + unk32 func_ov017_020c050c(unk32 param1, unk32 param2, unk32 param3, unk32 param4); + + static void func_ov017_020c033c(unk32 *param1, MapObjectManager *thisx, const Vec2s *param2, unk32 param3, unk32 param4); }; extern MapObjectManager *gpMapObjManager; diff --git a/include/MapObject/MapObjectMiniBlocks.hpp b/include/MapObject/MapObjectMiniBlocks.hpp index 51343cd5..93d31b08 100644 --- a/include/MapObject/MapObjectMiniBlocks.hpp +++ b/include/MapObject/MapObjectMiniBlocks.hpp @@ -15,7 +15,7 @@ public: MapObjectMiniBlocks(); /* 00 */ virtual bool vfunc_00() override; - /* 14 */ virtual void vfunc_14() override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; /* 30 */ virtual ~MapObjectMiniBlocks() override; }; diff --git a/include/MapObject/MapObjectPot.hpp b/include/MapObject/MapObjectPot.hpp index eef98488..01c26eb0 100644 --- a/include/MapObject/MapObjectPot.hpp +++ b/include/MapObject/MapObjectPot.hpp @@ -14,7 +14,7 @@ public: MapObjectPot(); /* 04 */ virtual void vfunc_04() override; // func_ov031_02105088 - /* 14 */ virtual void vfunc_14() override; // func_ov031_021052cc + /* 14 */ virtual void vfunc_14(unk32 param1) override; // func_ov031_021052cc /* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3); // func_ov031_021050b4 /* 24 */ virtual void vfunc_24(MapObject *param1, VecFx32 param2) override; // func_ov031_02105348 /* 3C */ virtual bool vfunc_3C() override; // func_ov031_021053b4 diff --git a/include/MapObject/MapObjectSwitchStep.hpp b/include/MapObject/MapObjectSwitchStep.hpp index a3051c30..15c82754 100644 --- a/include/MapObject/MapObjectSwitchStep.hpp +++ b/include/MapObject/MapObjectSwitchStep.hpp @@ -39,10 +39,10 @@ public: /* A4 */ UnkSystem5 mUnk_A4; /* C4 */ unk32 mUnk_C4; /* C8 */ STRUCT_PAD(0xC8, 0xE4); - /* E4 */ u16 mUnk_E4; + /* E4 */ volatile u16 mUnk_E4; /* E6 */ u16 mUnk_E6; /* E8 */ unk16 mUnk_E8; - /* EA */ unk8 mUnk_EA; + /* EA */ u8 mUnk_EA; // bool? /* EB */ unk8 mUnk_EB; /* EC */ @@ -50,9 +50,9 @@ public: /* 00 */ virtual bool vfunc_00() override; /* 08 */ virtual void vfunc_08() override; - /* 14 */ virtual void vfunc_14() override; - /* 18 */ virtual void vfunc_18(s8 *param1, s8 param2) override; - /* 20 */ virtual void vfunc_20() override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; + /* 18 */ virtual void vfunc_18(s8 *param1) override; + /* 20 */ virtual void vfunc_20(unk32 param1) override; /* 30 */ virtual ~MapObjectSwitchStep() override; void func_ov000_0209dda4(void); diff --git a/include/MapObject/MapObjectUnkLTRW.hpp b/include/MapObject/MapObjectUnkLTRW.hpp index dcaf57ad..7fad4c0c 100644 --- a/include/MapObject/MapObjectUnkLTRW.hpp +++ b/include/MapObject/MapObjectUnkLTRW.hpp @@ -32,7 +32,7 @@ public: /* 00 */ virtual bool vfunc_00() override; /* 08 */ virtual void vfunc_08() override; - /* 14 */ virtual void vfunc_14() override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; /* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) override; /* 28 */ virtual unk32 vfunc_28(unk32 param1, unk32 param2, unk32 param3) override; diff --git a/include/MapObject/MapObjectUnkMTJR.hpp b/include/MapObject/MapObjectUnkMTJR.hpp index 5132a492..7c6b3ce6 100644 --- a/include/MapObject/MapObjectUnkMTJR.hpp +++ b/include/MapObject/MapObjectUnkMTJR.hpp @@ -23,7 +23,7 @@ public: /* 00 */ virtual bool vfunc_00() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C() override; - /* 14 */ virtual void vfunc_14() override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; /* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) override; void func_ov063_02161254(unk32 param1); diff --git a/include/MapObject/MapObjectUnkPTFL.hpp b/include/MapObject/MapObjectUnkPTFL.hpp index 07f6b186..a730046f 100644 --- a/include/MapObject/MapObjectUnkPTFL.hpp +++ b/include/MapObject/MapObjectUnkPTFL.hpp @@ -35,7 +35,7 @@ public: /* 08 */ virtual void vfunc_08(); /* 0C */ virtual void vfunc_0C(); - /* 0C */ virtual void vfunc_14(); + /* 0C */ virtual void vfunc_14(unk32 param1); /* 30 */ virtual ~MapObjectUnkPTFL() override; // overlay 70 diff --git a/include/MapObject/MapObjectUnkSAND.hpp b/include/MapObject/MapObjectUnkSAND.hpp index a809680a..ebbb51ba 100644 --- a/include/MapObject/MapObjectUnkSAND.hpp +++ b/include/MapObject/MapObjectUnkSAND.hpp @@ -38,7 +38,7 @@ public: /* 08 */ virtual void vfunc_08(); /* 0C */ virtual void vfunc_0C(); - /* 0C */ virtual void vfunc_14(); + /* 0C */ virtual void vfunc_14(unk32 param1); /* 30 */ virtual ~MapObjectUnkSAND() override; void func_ov031_0210acd4(void); diff --git a/include/MapObject/MapObjectUnkSKDI.hpp b/include/MapObject/MapObjectUnkSKDI.hpp index 88935f9f..6fecde42 100644 --- a/include/MapObject/MapObjectUnkSKDI.hpp +++ b/include/MapObject/MapObjectUnkSKDI.hpp @@ -44,7 +44,7 @@ public: /* 04 */ virtual void vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C() override; - /* 14 */ virtual void vfunc_14() override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; /* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) override; /* 38 */ virtual unk32 vfunc_38(); /* 3C */ virtual unk32 vfunc_3C(); diff --git a/include/MapObject/MapObjectUnkSTAT.hpp b/include/MapObject/MapObjectUnkSTAT.hpp index 1dd4ce84..76a0da6b 100644 --- a/include/MapObject/MapObjectUnkSTAT.hpp +++ b/include/MapObject/MapObjectUnkSTAT.hpp @@ -26,7 +26,7 @@ public: /* 00 */ virtual bool vfunc_00() override; // Init /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C() override; - /* 14 */ virtual void vfunc_14() override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; /* 30 */ virtual ~MapObjectUnkSTAT() override; void func_ov063_0215f6d0(void); diff --git a/include/MapObject/MapObjectUnkSWHT.hpp b/include/MapObject/MapObjectUnkSWHT.hpp index c36dbe50..3b0e0009 100644 --- a/include/MapObject/MapObjectUnkSWHT.hpp +++ b/include/MapObject/MapObjectUnkSWHT.hpp @@ -34,7 +34,7 @@ public: /* 00 */ virtual bool vfunc_00() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C() override; - /* 14 */ virtual void vfunc_14() override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; /* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) override; /* 30 */ virtual ~MapObjectUnkSWHT() override; diff --git a/include/MapObject/MapObjectUnkSWSW.hpp b/include/MapObject/MapObjectUnkSWSW.hpp index 476d5d30..f9b75a6d 100644 --- a/include/MapObject/MapObjectUnkSWSW.hpp +++ b/include/MapObject/MapObjectUnkSWSW.hpp @@ -58,7 +58,7 @@ public: /* 00 */ virtual bool vfunc_00() override; /* 08 */ virtual void vfunc_08() override; - /* 14 */ virtual void vfunc_14() override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; /* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) override; /* 38 */ virtual void vfunc_38(); /* 3C */ virtual void vfunc_3C(unk32 param1); diff --git a/include/Physics/AABB.hpp b/include/Physics/AABB.hpp index a9cd9f23..c9b8d96e 100644 --- a/include/Physics/AABB.hpp +++ b/include/Physics/AABB.hpp @@ -6,6 +6,7 @@ #include struct AABB { - VecFx32 min; - VecFx32 max; + /* 00 */ VecFx32 min; + /* 0C */ VecFx32 max; + /* 18 */ }; diff --git a/include/Player/PlayerActorBase.hpp b/include/Player/PlayerActorBase.hpp index a2198640..75684a81 100644 --- a/include/Player/PlayerActorBase.hpp +++ b/include/Player/PlayerActorBase.hpp @@ -3,6 +3,7 @@ #include "Actor/ActorRef.hpp" #include "Render/ModelRender.hpp" #include "Unknown/Common.hpp" +#include "global.h" #include "math.hpp" #include "nitro/fx.h" @@ -11,7 +12,10 @@ #include class Actor_C4; -class UnkStruct_027e0ce0_40_328; +class UnkStruct_027e0ce0_30_00; +class UnkStruct_ov001_020c40f4; +class PlayerActorBase; +class PlayerLinkActor_A0_28; class ItemManager; struct ActorGrabParams; @@ -62,7 +66,10 @@ struct UnkStruct_ov000_020ab4dc { /* 66 */ unk16 mUnk_70; /* 66 */ unk16 mUnk_72; /* 74 */ s16 mUnk_74; - /* 78 */ STRUCT_PAD(0x76, 0x86); + /* 78 */ STRUCT_PAD(0x76, 0x83); + /* 83 */ u8 mUnk_83; + /* 83 */ u8 mUnk_84; + /* 83 */ u8 mUnk_85; /* 86 */ u8 mUnk_86[7]; /* 8D */ STRUCT_PAD(0x8D, 0x98); /* 98 */ unk32 mUnk_98; @@ -70,6 +77,10 @@ struct UnkStruct_ov000_020ab4dc { }; extern const UnkStruct_ov000_020ab4dc data_ov000_020ab4dc[PlayerCharacter_Max]; +inline const UnkStruct_ov000_020ab4dc *Get_ov000_020ab4dc(PlayerCharacter index) { + return &data_ov000_020ab4dc[index]; +} + extern "C" G3d_Model *func_ov000_0208eadc(PlayerCharacter, unk32, bool); extern "C" G3d_Model *func_ov000_0208eb44(PlayerCharacter, unk32, bool); @@ -123,17 +134,26 @@ public: class ModelRender_Derived4 : public ModelRender_Derived3 { public: /* 00 (base) */ - /* 60 */ STRUCT_PAD(0x60, 0x78); + /* 60 */ unk32 mUnk_60; + /* 64 */ unk32 mUnk_64; + /* 68 */ VecFx32 mUnk_68; + /* 74 */ unk32 mUnk_74; /* 78 */ unk32 mUnk_78; /* 7C */ unk32 mUnk_7C[9]; /* A0 */ unk32 mUnk_A0[7]; - /* BC */ unk32 mUnk_BC; + /* BC */ Mat4x3p *mUnk_BC; /* C0 */ ModelRender_Derived4(PlayerCharacter character, unk32 param2, G3d_Model *pModel, G3d_BoneMtxStruct *pCacheJntAnm); // data_ov000_020b2b70 /* 1C */ virtual void vfunc_1C(UnkSystem4_vfunc_1C *param1) override; + + // overlay 0 + void func_ov000_02057fe8(UnkAngleStruct param1, UnkAngleStruct param2, VecFx32 *param3); + + // overlay 93 + void func_ov093_0216ca38(bool param1, bool param2, bool param3, bool param4); }; class ModelRender_Derived5 : public ModelRender_Derived3 { @@ -150,10 +170,9 @@ public: }; class PlayerActorBase_38 { -private: +public: /* 00 */ UnkStruct_PlayerGet_64 mUnk_00; -public: PlayerActorBase_38(void *param1) : mUnk_00(param1) { this->mUnk_00.mUnk_08 = 0; @@ -175,6 +194,7 @@ public: /* 14 */ void func_ov000_02089dc4(); + void func_ov000_02089f0c(bool param1); }; class PlayerActorBase_70_0C { @@ -193,6 +213,14 @@ public: ModelRender_Derived3* GetUnk0C() const { return this->mUnk_0C; } // clang-format on + ModelRender_Derived4 *GetUnk08OrUnk0C(bool cond) const { + if (cond) { + return (ModelRender_Derived4 *) this->GetUnk0C(); + } + + return (ModelRender_Derived4 *) this->GetUnk08(); + } + PlayerActorBase_70_0C(PlayerCharacter character, unk32 param2) : mpModel1(func_ov000_0208eadc(character, param2, true)), mpModel2(func_ov000_0208eb44(character, param2, true)) { @@ -237,6 +265,10 @@ public: // data_ov000_020b2b9c /* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3) override; + + // overlay 0 + void func_ov000_0208c7f0(); + void func_ov000_0208c7b0(VecFx32 *param1, UnkAngleStruct param2); }; class PlayerActorBase_70_30 { @@ -289,11 +321,11 @@ public: }; class PlayerActorBase_70_E4 { -private: - /* 00 */ STRUCT_PAD(0x00, 0x30); +public: + /* 00 */ VecFx32 mUnk_00; + /* 0C */ VecFx32 mUnk_0C[PlayerCharacter_Max]; /* 30 */ -public: PlayerActorBase_70_E4(); }; @@ -314,7 +346,7 @@ struct UnkStruct_func_ov000_020830d4 { }; class PlayerActorBase_70 { -private: +public: /* 000 */ BOOL mIsNotLink; /* 004 */ PlayerCharacter mCharacter; /* 008 */ unk32 mUnk_008; @@ -332,12 +364,10 @@ private: /* 0DC */ PlayerActorBase_70_DC *mUnk_0DC; /* 0E0 */ PlayerActorBase_70_E0 mUnk_0E0; /* 0E4 */ PlayerActorBase_70_E4 mUnk_0E4; - /* 114 */ Mat4x3p *mUnk_114; - /* 118 */ unk32 mUnk_118; - /* 11C */ unk32 mUnk_11C; - /* 120 */ unk32 mUnk_120; - /* 124 */ unk16 mUnk_124; - /* 126 */ bool mUnk_126; + /* 114 */ Mat4x3p *mUnk_114; // allocated array, size = PlayerCharacter_Max + /* 118 */ Vec3p mUnk_118; + /* 124 */ UnkAngleStruct mUnk_124; + /* 126 */ s8 mUnk_126; /* 127 */ bool mUnk_127; /* 128 */ bool mUnk_128; /* 129 */ bool mUnk_129; @@ -349,21 +379,29 @@ private: /* 12F */ bool mUnk_12F; /* 130 */ bool mUnk_130; /* 131 */ bool mUnk_131; - /* 132 */ unk16 mUnk_132; + /* 132 */ s16 mUnk_132; /* 134 */ PlayerActorBase_70_134 mUnk_134; /* 15C */ unk32 mUnk_15C; /* 160 */ -public: PlayerActorBase_70(PlayerCharacter character, unk32 param2); ~PlayerActorBase_70(); // overlay 0 + void func_ov000_02082e54(); void func_ov000_02082e78(unk32 param1, unk32 param2, unk32 param3, unk32 param4); - void func_ov000_020830d4(UnkAngleStruct param1, u32 param2, u8 param3, unk32 param4); + void func_ov000_020830d4(UnkAngleStruct param1, u32 param2, u8 param3, PlayerLinkActor_A0_28 *param4); + void func_ov000_020830a4(unk32 param1, PlayerCharacter character, unk32 param3, unk32 param4); + void func_ov000_020830a4(unk32 param1, PlayerCharacter character, unk32 param3, unk32 param4, unk32); // overlay 1 void func_ov001_020bbe18(unk32 param1, UnkAngleStruct param2, u32 param3, u8 param4); + + // overlay 17 + void func_ov017_020bbaa8(VecFx32 *param1, UnkAngleStruct param2); + void func_ov017_020bbcd8(VecFx32 *param1, UnkAngleStruct param2); + void func_ov017_020bbef4(VecFx32 *param1, UnkAngleStruct param2); + void func_ov017_020bbf6c(); }; class PlayerActorBase_74 { @@ -395,12 +433,14 @@ struct PlayerActorBase_78_04 { }; class PlayerActorBase_78 { -private: - /* 00 */ STRUCT_PAD(0x00, 0x0C); +public: + /* 00 */ unk32 mUnk_00; + /* 00 */ unk32 mUnk_04; + /* 00 */ u8 mUnk_08[2]; // bool? /* 0C */ -public: void func_ov000_0205c584(volatile unk32 param1, volatile unk32 param2); + void func_ov000_0205c5d0(unk32 param1, PlayerActorBase *pPlayer); }; class PlayerLinkActor_9C_34 { @@ -408,6 +448,7 @@ private: /* 00 */ unk32 mUnk_00; /* 04 */ VecFx32 mUnk_04; /* 10 */ VecFx32 mUnk_10; + /* 1C */ public: void func_ov000_0208efd0(VecFx32 *pVec); @@ -416,17 +457,61 @@ public: class PlayerLinkActor_9C { public: /* 000 (vtable) */ - /* 004 */ STRUCT_PAD(0x04, 0x34); - /* 034 */ PlayerLinkActor_9C_34 mUnk_34; - /* 004 */ STRUCT_PAD(0x50, 0xF4); - /* 0F4 */ UnkStruct_027e0ce0_40_328 *mUnk_0F4; - /* 0F8 */ STRUCT_PAD(0xF8, 0x154); + /* 004 */ STRUCT_PAD(0x04, 0x08); + /* 008 */ ActorRef mUnk_008; //! TODO: confirm type + /* 00C */ STRUCT_PAD(0x0C, 0x34); + /* 034 */ PlayerLinkActor_9C_34 mUnk_034; + /* 004 */ STRUCT_PAD(0x50, 0x5A); + /* 05A */ UnkAngleStruct mUnk_5A; + /* 05C */ STRUCT_PAD(0x5C, 0x6C); + /* 06C */ VecFx32 mUnk_06C; + /* 078 */ STRUCT_PAD(0x78, 0x90); + /* 090 */ s16 mUnk_090; + /* 090 */ unk16 mUnk_092; + /* 094 */ unk32 mUnk_094; + /* 098 */ unk16 mUnk_098; + /* 094 */ STRUCT_PAD(0x9A, 0xDC); + /* 0DC */ u16 mUnk_0DC; + /* 0DE */ unk16 mUnk_0DE; + /* 0E0 */ unk32 mUnk_0E0; + /* 0E4 */ unk32 mUnk_0E4; + /* 0E8 */ unk32 mUnk_0E8; + /* 0EC */ unk32 mUnk_0EC; + /* 0F0 */ unk32 mUnk_0F0; + /* 0F4 */ PlayerActorBase *pZelda; + /* 0F8 */ unk32 mUnk_0F8; + /* 0FC */ bool mUnk_0FC; + /* 100 */ unk32 mUnk_100; + /* 104 */ VecFx32 mUnk_104; + /* 110 */ STRUCT_PAD(0x110, 0x138); + /* 138 */ s16 mUnk_138; + /* 13A */ u16 mUnk_13A; + /* 13C */ unk16 mUnk_13C; + /* 13E */ STRUCT_PAD(0x13E, 0x154); /* 154 */ PlayerLinkActor_9C(UnkStruct_027e0ce0_40 *param1, u32 rawGrabParams, PlayerCharacter character); // data_ov000_020b2a8c /* 00 */ virtual ~PlayerLinkActor_9C(); + + // overlay 0 + unk32 func_ov000_02084944(); + unk32 func_ov000_020849d0(VecFx32 *pAccel, VecFx32 *pVel); + unk32 func_ov000_02084ac8(unk32 param1, VecFx32 *pPos, VecFx32 *pAccel, VecFx32 *pVel); + void func_ov000_02084c3c(unk32 param1, unk32 param2, VecFx32 *param3, VecFx32 *param4); + unk32 func_ov000_02084e58(unk32 param1, u8 param2, VecFx32 *param3, VecFx32 *pPos, VecFx32 *pAccel, VecFx32 *pVel, + unk32 param7); + void func_ov000_02085274(unk32 param1, unk32 param2, unk32 param3, VecFx32 *param4, VecFx32 *param5, VecFx32 *param6); + void func_ov000_02085578(unk32 param1, unk32 param2, unk32 param3, unk32 param4, VecFx32 *param5); + void func_ov000_02085718(VecFx32 *param1); + void func_ov000_02085840(VecFx32 *param1, VecFx32 *param2, VecFx32 *param3); + void func_ov000_02086758(); + void func_ov000_020867f4(); + + // overlay 17 + bool func_ov017_020bc640(u32 param1, bool param2, bool param3, u8 param4, u8 param5, VecFx32 *pAccel, VecFx32 *pPos, + VecFx32 *pVel); }; class PlayerActorBase { @@ -464,9 +549,31 @@ public: // overlay 0 void func_ov000_0208c8f8(VecFx32 *pVec); void func_ov000_0208c914(); + void func_ov000_0208cbf0(); + void func_ov000_0208cc20(VecFx32 *param1); + bool func_ov000_0208cc90(); + unk32 func_ov000_0208d3a8(); + void func_ov000_0208d3d0(Vec2s *param1, unk32 param2, void *param3); void func_ov000_0208d3fc(); + void func_ov000_0208d60c(); + bool func_ov000_0208d754(); void func_ov000_0208d7f0(bool param1); + bool func_ov000_0208db08(); + unk32 func_ov000_0208dc98(); + unk32 func_ov000_0208dd60(UnkStruct_027e0ce0_30_00 *param1); // overlay 1 void func_ov001_020bc96c(); // ResetState? or just Reset? idk + + // overlay 93 + //! TODO: move to PlayerZeldaActor? + unk32 func_ov093_0216e8e4(UnkStruct_027e0ce0_30_00 *param1); + 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(bool param1); + void func_ov093_0216f71c(unk32 *param1); + void func_ov093_0216de30(unk32 param1, unk32 param2); + void func_ov093_0216dec8(void *param1); + void func_ov093_0216e1a4(void *param1); }; diff --git a/include/Player/PlayerLink.hpp b/include/Player/PlayerLink.hpp index 509e70e0..2d685bbb 100644 --- a/include/Player/PlayerLink.hpp +++ b/include/Player/PlayerLink.hpp @@ -3,7 +3,7 @@ #include "Player/PlayerActorBase.hpp" class UnkStruct_027e0ce0_40; -class UnkStruct_027e0ce0_40_328; +class PlayerActorBase; class UnkStruct_027e0ce0_40_150; class PlayerLinkActor_A0_38; class ItemManager; @@ -134,8 +134,7 @@ public: class PlayerLinkActor_A0_38 { public: - /* 00 */ unk16 mUnk_00; - /* 02 */ unk16 mUnk_02; + /* 00 */ Vec2s mUnk_00; /* 04 */ PlayerLinkActor_A0_38_04 mUnk_04; /* 18 */ PlayerLinkActor_A0_38_18 mUnk_18; /* 2C */ Vec2s mUnk_2C; @@ -146,9 +145,28 @@ public: /* 37 */ bool mUnk_37; /* 38 */ + const bool UnknownCheck1(u16 flag, s16 pos, s16 min, s16 max) { + if (this->mUnk_34 & flag) { + if (pos > min) { + return true; + } + } else { + if (pos < max) { + return true; + } + } + + return false; + } + PlayerLinkActor_A0_38(); ~PlayerLinkActor_A0_38(); + // overlay 17 + void func_ov017_020be0a8(unk32 param1); + void func_ov017_020be0e0(s32 param1, VecFx32 *param2, bool param3, bool param4); + + // overlay 24 void func_ov024_020d19d8(); }; @@ -191,13 +209,21 @@ public: ~PlayerLinkActor_A0(); // overlay 0 + void func_ov000_02091ea0(); bool func_ov000_02091f08(unk32 param1); void func_ov000_020921e4(unk32 param1); - void func_ov000_02091ea0(); + void func_ov000_02092e38(); + bool func_ov000_0209360c(); + void func_ov000_02092648(unk32 param1); + void func_ov000_02092ea8(unk32 param1, unk32 param2); + void func_ov000_02092ecc(void *param1, bool param2); + u8 func_ov000_02093650(); + bool func_ov000_020936c4(); void func_ov000_020936ec(); u32 func_ov000_02093718(); u8 func_ov000_0209378c(); // bool? void func_ov000_02093a04(); + void func_ov000_02093fe8(); // overlay 1 void func_ov001_020bd2e0(); @@ -217,6 +243,8 @@ public: PlayerLinkActor_A4(PlayerActorBase *pPlayer, PlayerLinkActor_A0 *param2); ~PlayerLinkActor_A4(); + + void func_ov000_02089998(bool param1); }; class PlayerLinkActor_134 { @@ -236,6 +264,7 @@ public: // overlay 31 void func_ov031_020db0fc(); + void func_ov031_020db160(bool param1); }; class PlayerLinkActor_1B0 : public UnkSystem7 { @@ -253,7 +282,7 @@ class PlayerLinkActor : public PlayerActorBase { public: /* 000 (base) */ /* 094 */ UnkStruct_027e0ce0_40_150 *mUnk_094; - /* 098 */ UnkStruct_027e0ce0_40_328 *mUnk_098; + /* 098 */ PlayerActorBase *mpZelda; /* 09C */ PlayerLinkActor_9C *mUnk_09C; /* 0A0 */ PlayerLinkActor_A0 *mUnk_0A0; /* 0A4 */ PlayerLinkActor_A4 mUnk_0A4; @@ -261,8 +290,8 @@ public: /* 0B4 */ bool mUnk_0B4; /* 0B5 */ bool mUnk_0B5; /* 0B6 */ bool mUnk_0B6; - /* 0B7 */ bool mUnk_0B7; - /* 0B8 */ bool mUnk_0B8; + /* 0B7 */ u8 mUnk_0B7; + /* 0B8 */ u8 mUnk_0B8; /* 0B9 */ bool mUnk_0B9; /* 0BA */ bool mUnk_0BA; /* 0BB */ bool mUnk_0BB; @@ -276,16 +305,20 @@ public: ~PlayerLinkActor(); // overlay 1 - void func_ov001_020bcb60(UnkStruct_027e0ce0_40_328 *param1); + void func_ov001_020bcb60(PlayerActorBase *pZelda); void func_ov001_020bcb70(); 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); + bool func_ov017_020bd6b8(); + unk32 func_ov017_020bd6e0(bool param1); + void func_ov017_020bd758(); + void func_ov017_020bd788(bool param1); + void func_ov017_020bdcf4(unk32 param1, unk32 param2); + void func_ov017_020bdd84(void *param1, unk32 param2); + void func_ov017_020bdf48(s8 *param1, unk32 param2, void *param3, UnkStruct_ov019_020d24c8_28_258_00 *param4); + void func_ov017_020be098(); // overlay 21 void func_ov021_020ebda0(); diff --git a/include/Player/PlayerPhantom.hpp b/include/Player/PlayerPhantom.hpp index 8d2fd7a5..74a30364 100644 --- a/include/Player/PlayerPhantom.hpp +++ b/include/Player/PlayerPhantom.hpp @@ -4,11 +4,14 @@ class UnkStruct_027e0ce0_40; +//! TODO: should this be merged with PlayerZeldaActor? both are the exact same size class PlayerPhantomActor : public PlayerActorBase { public: /* 000 (base) */ /* 094 */ unk32 mUnk_94; /* 098 */ unk32 mUnk_98; + /* 09C */ STRUCT_PAD(0x9C, 0x154); + /* 154 */ PlayerPhantomActor(unk32 param1, unk32 param2, UnkStruct_027e0ce0_40 *param3, bool *param4); }; diff --git a/include/Player/PlayerZelda.hpp b/include/Player/PlayerZelda.hpp index b1ef3af7..d9f0708d 100644 --- a/include/Player/PlayerZelda.hpp +++ b/include/Player/PlayerZelda.hpp @@ -1,14 +1,26 @@ #pragma once +#include "Item/Item.hpp" #include "Player/PlayerActorBase.hpp" -class UnkStruct_027e0ce0_40 : +class UnkStruct_027e0ce0_40; +class UnkStruct_027e0ce0_40_150; - class PlayerZeldaActor : public PlayerActorBase { +class PlayerZeldaActor : public PlayerActorBase { public: /* 000 (base) */ /* 094 */ unk32 mUnk_94; - /* 098 */ unk32 mUnk_98; + /* 098 */ PlayerActorBase *mpPlayer; + /* 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 */ - PlayerZeldaActor(unk32 param1, unk32 param2, UnkStruct_027e0ce0_40 *param3, bool *param4); + PlayerZeldaActor(void *param1, UnkStruct_027e0ce0_40 *param2, UnkStruct_027e0ce0_40_150 *param3, ItemFlag *pEquippedItem); + ~PlayerZeldaActor(); }; diff --git a/include/System/OverlayManager.hpp b/include/System/OverlayManager.hpp index 542e6e1f..e3507134 100644 --- a/include/System/OverlayManager.hpp +++ b/include/System/OverlayManager.hpp @@ -388,6 +388,8 @@ public: /* 48 */ // clang-format off + const bool IsRabbitCapture() const { return this->mLoadedOverlays[OverlaySlot_1] == OverlayIndex_RabbitCapture; } + const bool IsField() const { return this->mLoadedOverlays[OverlaySlot_7] == OverlayIndex_Field; } const bool IsTower() const { return this->mLoadedOverlays[OverlaySlot_8] == OverlayIndex_Tower; } diff --git a/include/Unknown/Common.hpp b/include/Unknown/Common.hpp index 5b103624..991c4637 100644 --- a/include/Unknown/Common.hpp +++ b/include/Unknown/Common.hpp @@ -979,9 +979,7 @@ struct UnkSystem7_UnkStruct_00 { /* 00 */ STRUCT_PAD(0x00, 0x20); /* 20 */ UnkSystem7_UnkStruct_00_20 *mUnk_20; /* 24 */ unk32 mUnk_24; - /* 28 */ unk32 mUnk_28; - /* 2C */ unk32 mUnk_2C; - /* 30 */ unk32 mUnk_30; + /* 28 */ VecFx32 mUnk_28; /* 34 */ STRUCT_PAD(0x34, 0xA0); /* A0 */ unk32 mUnk_A0; /* A4 */ unk16 mUnk_A4; @@ -1325,3 +1323,28 @@ struct UnkStruct_ov000_020aa88c { /* 08 */ }; extern UnkStruct_ov000_020aa88c data_ov000_020aa88c[]; + +union UnkStackStruct_ov000_02077590 { + struct { + /* 00 */ s16 mUnk_00; + /* 02 */ s16 mUnk_02; + /* 04 */ s16 mUnk_04; + /* 06 */ s16 mUnk_06; + /* 08 */ unk32 mUnk_08; + /* 0C */ VecFx32 mUnk_0C; + /* 18 */ u16 mUnk_18; + /* 1A */ u16 mUnk_1A; + /* 1C */ u16 mUnk_1C; + /* 1E */ u16 mUnk_1E; + /* 20 */ + }; + u32 data[8]; +}; +extern "C" UnkStackStruct_ov000_02077590 *func_ov000_02077590(unk32); + +struct UnkStackStruct_ov000_02084344 { + /* 00 */ s16 mUnk_00; + /* 02 */ s16 mUnk_02; + /* 04 */ unk32 mUnk_04; +}; +extern "C" UnkStackStruct_ov000_02084344 *func_ov000_02084344(unk32); diff --git a/include/Unknown/UnkStruct_020499e0.hpp b/include/Unknown/UnkStruct_020499e0.hpp new file mode 100644 index 00000000..536906a7 --- /dev/null +++ b/include/Unknown/UnkStruct_020499e0.hpp @@ -0,0 +1,16 @@ +#pragma once + +#include "global.h" +#include "types.h" + +class UnkStruct_020499e0 { +public: + /* 00 */ unk32 mUnk_00; + + UnkStruct_020499e0(); + ~UnkStruct_020499e0(); + + bool func_0201456c(unk32 param1); +}; + +extern UnkStruct_020499e0 data_020499e0; diff --git a/include/Unknown/UnkStruct_02049b18.hpp b/include/Unknown/UnkStruct_02049b18.hpp index c8acca0d..4b0718ef 100644 --- a/include/Unknown/UnkStruct_02049b18.hpp +++ b/include/Unknown/UnkStruct_02049b18.hpp @@ -17,14 +17,16 @@ class UnkStruct_02049b18 { public: /* 00 */ Input mButtons; /* 06 */ UnkStruct_02049b18_06 mUnk_06; - /* 28 */ unk16 mUnk_28; - /* 2A */ STRUCT_PAD(0x2A, 0x58); + /* 28 */ u16 mUnk_28; + /* 2A */ u16 mUnk_2A; + /* 2C */ STRUCT_PAD(0x2C, 0x58); /* 58 */ unk16 mUnk_58; /* 5A */ unk16 mUnk_5A; UnkStruct_02049b18(); ~UnkStruct_02049b18(); void func_02013768(); + TouchState *func_020137c8(unk32 param1); void func_02013840(u16 param1, unk32 param2); void func_020138f4(unk32 param1); }; diff --git a/include/Unknown/UnkStruct_02049b80.hpp b/include/Unknown/UnkStruct_02049b80.hpp index 6c3f6bbd..ed391b89 100644 --- a/include/Unknown/UnkStruct_02049b80.hpp +++ b/include/Unknown/UnkStruct_02049b80.hpp @@ -16,6 +16,7 @@ public: void func_02013ecc(unk32 param1, UnkCallback param2, unk32 param3); void func_02013ee8(unk32 param1, unk32 param2); void func_02013f80(unk32 param1); + void func_02013fec(unk32 param1, void *param2); }; extern UnkStruct_02049b80 data_02049b80; diff --git a/include/Unknown/UnkStruct_0204a088.hpp b/include/Unknown/UnkStruct_0204a088.hpp index 0646ed33..ca0be40b 100644 --- a/include/Unknown/UnkStruct_0204a088.hpp +++ b/include/Unknown/UnkStruct_0204a088.hpp @@ -24,6 +24,24 @@ public: /* 128 */ unk16 mUnk_128; /* 12C */ + const BOOL IsUnknownCheck1(unk32 value1, unk32 value2) const { + bool ret = false; + + if (!(this->mUnk_04 != value1 || this->mUnk_08 != value2)) { + ret = true; + } + + return ret; + } + + const bool IsUnknownCheck2(unk32 value1, unk32 value2) const { + return this->mUnk_04 == value1 && this->mUnk_08 == value2; + } + + const bool IsUnknownCheck3(unk32 value1, unk32 value2) const { + return *(volatile u32 *) &this->mUnk_04 != value1 || this->mUnk_08 != value2; + } + UnkStruct_0204a088(); // overlay 0 diff --git a/include/Unknown/UnkStruct_0204a110.hpp b/include/Unknown/UnkStruct_0204a110.hpp index 1b0b25a9..f854ae41 100644 --- a/include/Unknown/UnkStruct_0204a110.hpp +++ b/include/Unknown/UnkStruct_0204a110.hpp @@ -247,7 +247,7 @@ public: /* DDC */ UnkStruct_0204a110_Sub8 mUnk_DDC; /* DEC */ GameModeManagerBase *mpManager; /* DF0 */ u16 mUnk_DF0; - /* DF2 */ unk8 mUnk_DF2; + /* DF2 */ s8 mUnk_DF2; /* DF3 */ unk8 mUnk_DF3; /* DF4 */ unk32 mUnk_DF4; /* DF8 */ unk32 mUnk_DF8; @@ -286,6 +286,7 @@ public: void func_0201967c(unk32 param2, unk32 param3, unk32 param4, unk32 param5, unk32 param6); void func_02019538(unk32 param1, unk32 param2); unk32 func_02019300(unk32 param1); + bool func_02019340(unk32 param1); void func_02019350(); void func_020194dc(); void func_02019408(); @@ -294,6 +295,8 @@ public: void func_02019528(); bool func_02019548(); UnkStruct_func_02019590 *func_02019590(unk16 param1, unk32 param2); + unk32 func_01ff9b64(); + unk32 func_01ff9b78(); // overlay 1 void func_ov001_020bd514(unk32 param1, GameModeMgrCreateCallback createCallback, bool param3, bool param4); diff --git a/include/Unknown/UnkStruct_027e0998.hpp b/include/Unknown/UnkStruct_027e0998.hpp index f0e1ecce..990971c5 100644 --- a/include/Unknown/UnkStruct_027e0998.hpp +++ b/include/Unknown/UnkStruct_027e0998.hpp @@ -1,5 +1,6 @@ #pragma once +#include "Actor/ActorRef.hpp" #include "global.h" #include "math.hpp" #include "types.h" @@ -16,7 +17,7 @@ public: UnkStruct_027e0998_Base(); // data_ov000_020b1e08 - /* 00 */ virtual bool vfunc_00(VecFx32 *pPos, Vec2s *param2, u16 *param3); + /* 00 */ virtual bool vfunc_00(VecFx32 *pPos, Vec2s *param2, ActorRef *param3); /* 04 */ void func_ov000_02061760(); @@ -37,12 +38,12 @@ public: ~UnkStruct_027e0998(); // ClearInstance // data_ov024_020d7c98 - /* 00 */ virtual bool vfunc_00(VecFx32 *pPos, Vec2s *param2, u16 *param3) override; + /* 00 */ virtual bool vfunc_00(VecFx32 *pPos, Vec2s *param2, ActorRef *param3) override; /* 04 */ bool func_ov024_020c716c(); - bool func_ov024_020c7214(VecFx32 *pPos, Vec2s *param2, u16 *param3); - bool func_ov024_020c727c(Vec2s *param1, u16 *param2); + bool func_ov024_020c7214(VecFx32 *pPos, Vec2s *param2, ActorRef *param3); + bool func_ov024_020c727c(Vec2s *param1, ActorRef *param2); bool func_ov024_020c7300(unk32 param1); bool func_ov024_020c7354(); diff --git a/include/Unknown/UnkStruct_027e09a4.hpp b/include/Unknown/UnkStruct_027e09a4.hpp index dcdad8b9..0566a344 100644 --- a/include/Unknown/UnkStruct_027e09a4.hpp +++ b/include/Unknown/UnkStruct_027e09a4.hpp @@ -264,7 +264,7 @@ public: /* 40 */ UnkStruct_027e09a4_2C mUnk_40; /* 54 */ UnkStruct_027e09a4_54_Base *mUnk_54; /* 58 */ UnkStruct_WarpUnk1 *mpWarpUnk1; - /* 5C */ unk16 mUnk_5C; + /* 5C */ u16 mUnk_5C; /* 5E */ unk16 mUnk_5E; /* 60 */ SceneMode mSceneMode; /* 64 */ unk32 mUnk_64; @@ -367,9 +367,10 @@ public: static UnkStruct_027e09a4 *Create(unk32 param1); // overlay 17 - void func_ov017_020bb994(void *param1); - void func_ov017_020bb994(unk32 param1); - void func_ov017_020bb994(void *, void *); + void func_ov017_020bb660(unk32 param1); + void func_ov017_020bb7f8(void *param1); + void func_ov017_020bb934(void *param1); + void func_ov017_020bb994(s8 *param1); static void func_ov025_020c4a60(); static void Destroy(); diff --git a/include/Unknown/UnkStruct_027e09ac.hpp b/include/Unknown/UnkStruct_027e09ac.hpp index 15596ee7..b68e596f 100644 --- a/include/Unknown/UnkStruct_027e09ac.hpp +++ b/include/Unknown/UnkStruct_027e09ac.hpp @@ -78,6 +78,8 @@ public: ~UnkStruct_027e09ac(); // overlay 0 + void func_ov000_020723f4(); + void func_ov000_02072684(void *param1); void func_ov000_020726f0(u16 param1, unk32 param2, unk32 param3); void func_ov000_020729c4(UnkStruct_027e09ac_14 *param1, u16 param2, u16 param3, s16 param4, s16 param5); void func_ov000_02072b08(unk32 param1, unk32 param2); diff --git a/include/Unknown/UnkStruct_027e09b4.hpp b/include/Unknown/UnkStruct_027e09b4.hpp index 518d87f0..ab4cf3ff 100644 --- a/include/Unknown/UnkStruct_027e09b4.hpp +++ b/include/Unknown/UnkStruct_027e09b4.hpp @@ -17,7 +17,7 @@ public: UnkStruct_027e09b4(); // main - void func_01fff60c(VecFx32 *param1, unk32 param2, unk32 param3, u8 param4, unk32 param5, unk32 param6); + void func_01fff60c(VecFx32 *param1, unk32 param2, unk32 param3, s32 param4, unk32 param5, unk32 param6); // overlay 1 void func_ov001_020bea84(); @@ -27,6 +27,8 @@ public: // overlay 17 void func_ov017_020c08c4(VecFx32 *param1, unk32 param2, unk32 param3, s32 param4, s32 param5, s32 param6); + void func_ov017_020c0970(VecFx32 *param1, unk32 param2, unk32 param3, unk32 param4, unk32 param5, unk32 param6, + fx32 param7); }; extern UnkStruct_027e09b4 *data_027e09b4; diff --git a/include/Unknown/UnkStruct_027e09bc.hpp b/include/Unknown/UnkStruct_027e09bc.hpp index d407c031..9a0da076 100644 --- a/include/Unknown/UnkStruct_027e09bc.hpp +++ b/include/Unknown/UnkStruct_027e09bc.hpp @@ -4,16 +4,44 @@ #include "Unknown/UnkStruct_0204a060.hpp" #include "global.h" #include "math.hpp" +#include "nitro/fx.h" #include "types.h" +class UnkStruct_027e0ce0_30_00; + +class UnkStruct_027e09bc_0C_230 { +public: + /* 00 (base) */ + /* 04 */ + + /* 00 */ virtual void vfunc_00(); + /* 04 */ virtual void vfunc_04(); + /* 08 */ virtual unk32 vfunc_08(); +}; + +struct UnkStruct_027e09bc_0C_268 { + /* 00 */ u32 unk_00; + /* 04 */ u16 unk_04; + /* 06 */ bool unk_06; + /* 07 */ u8 unk_07; + /* 08 */ VecFx32 unk_08; + /* 14 */ +}; + class UnkStruct_027e09bc_0C { public: /* 000 (vtable) */ /* 004 */ STRUCT_PAD(0x04, 0x34); /* 034 */ VecFx32 mUnk_034; - /* 040 */ STRUCT_PAD(0x40, 0x264); + /* 040 */ VecFx32 mUnk_040; + /* 04C */ STRUCT_PAD(0x4C, 0xCA); + /* 0CA */ unk16 mUnk_0CA; + /* 0CC */ STRUCT_PAD(0xCC, 0x230); + /* 230 */ UnkStruct_027e09bc_0C_230 *mUnk_230; + /* 234 */ STRUCT_PAD(0x234, 0x264); /* 264 */ unk32 mUnk_264; - /* 268 */ STRUCT_PAD(0x268, 0x280); + /* 268 */ UnkStruct_027e09bc_0C_268 mUnk_268; + /* 27C */ unk32 mUnk_27C; /* 280 */ unk32 mUnk_280; /* 284 */ @@ -26,17 +54,24 @@ public: /* 10 */ // itcm - bool func_01ffd43c(Vec2s *param1, unk32 param2, unk32 param3); + bool func_01ffd43c(Vec2s *param1, VecFx32 *param2, unk32 param3); bool func_01ffd640(VecFx32 *param1); + bool func_01ffd768(void *param1, Vec2s *param2, unk8 param3); // overlay 0 + void func_ov000_020767b4(VecFx32 *param1, Vec2s *touchPos, fx32 param3, unk32 param4, VecFx32 *param5); void func_ov000_02078230(unk32 param1); - bool func_ov000_0207834c(VecFx32 *param1, unk32 param2, unk32 param3); + bool func_ov000_0207834c(VecFx32 *param1, UnkStackStruct_ov000_02077590 *param2, unk32 param3); + unk16 func_ov000_0207868c(); + unk16 func_ov000_02078698(); + void func_ov000_02078534(VecFx32 *param1, unk32 param2); bool func_ov000_02078764(VecFx32 *param1, void *param2, unk32 param3); void func_ov000_02078834(VecFx32 *param1, VecFx32 *param2, unk32 param3, unk32 param4); + void func_ov000_02078aa4(UnkStruct_027e0ce0_30_00 *param1, unk32 param2, unk32 param3, unk32 param4); void func_ov000_02078ba4(); void func_ov000_02078cec(); void func_ov000_0207a1e0(unk32 param1); + unk32 func_ov000_02076fa8(void *param1, void *param2, unk32 param3, fx32 param4); }; class UnkStruct_027e09bc_24 : public UnkStruct_0204a060_Base { @@ -61,12 +96,13 @@ public: UnkStruct_027e09bc(); ~UnkStruct_027e09bc(); - /* 00 */ virtual void vfunc_00(); + /* 00 */ virtual void vfunc_00(unk32 param1); /* 04 */ virtual void vfunc_04(); // overlay 0 void func_ov000_020771b8(unk32 param1); void func_ov000_020771c8(); + UnkStruct_027e09bc_0C *func_ov000_02077468(unk32 param1, unk32 param2); // overlay 1 void func_ov001_020bab5c(); diff --git a/include/Unknown/UnkStruct_027e0cd8.hpp b/include/Unknown/UnkStruct_027e0cd8.hpp index 7f9e2580..613f453a 100644 --- a/include/Unknown/UnkStruct_027e0cd8.hpp +++ b/include/Unknown/UnkStruct_027e0cd8.hpp @@ -446,8 +446,12 @@ public: bool func_ov000_02081f3c(unk16 param1, unk32 param2); u32 func_ov000_02081d5c(); // returns current room index? bool func_ov000_02082124(); + void func_ov000_02081b84(); + void func_ov000_02081b9c(unk32 param1); + void func_ov000_02081bf4(); bool func_ov000_02081c28(); void func_ov000_02081ca0(); + void func_ov000_02081d58(); bool func_ov000_02081edc(u16 param1); // overlay 1 diff --git a/include/Unknown/UnkStruct_027e0ce0.hpp b/include/Unknown/UnkStruct_027e0ce0.hpp index 96cccc01..f99c22f8 100644 --- a/include/Unknown/UnkStruct_027e0ce0.hpp +++ b/include/Unknown/UnkStruct_027e0ce0.hpp @@ -1,12 +1,16 @@ #pragma once +#include "Unknown/UnkStruct_0204a110.hpp" +#include "flags.h" #include "global.h" +#include "nitro/fx.h" #include "types.h" #include "Actor/ActorRef.hpp" #include "Item/ItemManager.hpp" #include "LinkList.hpp" #include "Player/PlayerLink.hpp" +#include "Player/PlayerZelda.hpp" #include "Player/TouchControl.hpp" #include "Save/SaveManager.hpp" #include "input.hpp" @@ -17,6 +21,7 @@ class UnkStruct_027e0ce0; class UnkStruct_027e0ce0_30; class UnkStruct_027e0ce0_38; class UnkStruct_027e0ce0_3C; +class UnkStruct_027e0ce0_40; class UnkStruct_ov001_020c40f4; class UnkStruct_027e0ce0_0C : public LinkList { @@ -111,7 +116,9 @@ public: class UnkStruct_027e0ce0_24 { public: - /* 00 */ STRUCT_PAD(0x00, 0x88); + /* 00 */ STRUCT_PAD(0x00, 0x70); + /* 70 */ u16 mUnk_70[1]; //! TODO: confirm array size + /* 72 */ STRUCT_PAD(0x72, 0x88); /* 88 */ UnkStruct_027e0ce0_24(); @@ -121,6 +128,12 @@ public: void func_ov021_020eaa08(UnkStruct_027e0ce0_20 *param1); void func_ov021_020eaac4(); void func_ov021_020eab14(unk32 param1, const UnkStruct_ov001_020c40f4 *param2, UnkStruct_027e0ce0_30 *param3); + void func_ov021_020eab6c(bool param1); + void func_ov021_020eae2c(unk32 param1); + void func_ov021_020eae84(); + unk32 func_ov021_020eaef0(unk32 param1, bool param2); + void func_ov021_020eb010(); + unk32 func_ov021_020eb870(unk32 param1, unk32 param2, unk32 param3, void *param4); }; class UnkStruct_027e0ce0_30_00 { @@ -129,20 +142,26 @@ private: /* 0C */ VecFx32 mUnk_0C; /* 18 */ unk32 mUnk_18; /* 1C */ unk32 mUnk_1C; - /* 20 */ unk32 mUnk_20; + /* 20 */ u32 mUnk_20; /* 24 */ unk32 mUnk_24; /* 28 */ bool mUnk_28; /* 2C */ UnkStruct_027e0ce0_38 *mUnk_2C; /* 30 */ UnkStruct_027e0ce0_3C *mUnk_30; - /* 34 */ unk32 mUnk_34; - /* 38 */ unk32 *mUnk_38; - /* 38 */ unk32 mUnk_3C; + /* 34 */ UnkStruct_027e0ce0_40 *mUnk_34; + /* 38 */ PlayerLinkActor *mpPlayer; + /* 3C */ PlayerActorBase *mpZelda; // either phantom zelda or human zelda /* 40 */ public: - UnkStruct_027e0ce0_30_00(UnkStruct_027e0ce0_38 *param1, UnkStruct_027e0ce0_3C *param2, unk32 param3, unk32 *param4, - unk32 param5); + UnkStruct_027e0ce0_30_00(UnkStruct_027e0ce0_38 *param1, UnkStruct_027e0ce0_3C *param2, UnkStruct_027e0ce0_40 *param3, + PlayerLinkActor *param4, PlayerActorBase *param5); ~UnkStruct_027e0ce0_30_00(); + + // overlay 0 + void func_ov000_020a8af4(unk32 param1); + + // overlay 17 + void func_ov017_020bbf7c(ItemManager *pItemMgr); }; class UnkStruct_027e0ce0_30_04 { @@ -163,6 +182,9 @@ private: public: UnkStruct_027e0ce0_30_08(unk32 param1); ~UnkStruct_027e0ce0_30_08(); + + // overlay 21 + void func_ov021_020ebc68(); }; class UnkStruct_027e0ce0_30 { @@ -180,9 +202,12 @@ public: void func_ov001_020bbf00(int index, unk32 param2); void func_ov001_020bbf24(UnkStruct_027e0ce0_38 *param1); void func_ov001_020bbf50(UnkStruct_027e0ce0_3C *param1); - void func_ov001_020bbf7c(unk32 param1, unk32 *param2, unk32 param3); + void func_ov001_020bbf7c(UnkStruct_027e0ce0_40 *param1, PlayerLinkActor *param2, PlayerActorBase *param3); void func_ov001_020bbfcc(); void func_ov001_020bbff4(UnkStruct_027e0ce0_38 *param1); + + // overlay 17 + void func_ov017_020bc5fc(ItemManager *pItemMgr); }; class UnkStruct_027e0ce0_34_20 { @@ -267,6 +292,9 @@ public: // overlay 88 void func_ov088_0216fbc4(unk32 param1, const UnkStruct_ov001_020c40f4 *param2); + void func_ov088_0216fca0(); + void func_ov088_0216ff10(); + void func_ov088_0216fbf0(unk32 param1); }; class UnkStruct_ov031_020f3310_00 { @@ -448,20 +476,33 @@ public: // overlay 26 void func_ov026_020dc8f0(); - void func_ov026_020de908(UnkStruct_027e0ce0_30_00 *param1); void func_ov026_020dc918(); void func_ov026_020dc9b0(); void func_ov026_020dc9bc(const UnkStruct_ov001_020c40f4 *param1); + void func_ov026_020de19c(unk32 param1, bool param2); + void func_ov026_020de45c(void *param1); + void func_ov026_020de46c(); + void func_ov026_020de49c(); + void func_ov026_020de908(UnkStruct_027e0ce0_30_00 *param1); }; class UnkStruct_027e0ce0_40_Base_14 { public: /* 00 */ TouchControl mTouchControl; - /* 22 */ STRUCT_PAD(0x22, 0x40); - /* 40 */ unk16 mUnk_40; + /* 22 */ STRUCT_PAD(0x22, 0x24); + /* 24 */ VecFx32 mUnk_24; + /* 30 */ VecFx32 mUnk_30; + /* 3C */ unk32 mUnk_3C; + /* 40 */ s16 mUnk_40; /* 42 */ unk16 mUnk_42; /* 44 */ unk16 mUnk_44; - /* 48 */ STRUCT_PAD(0x48, 0x60); + /* 46 */ unk16 mUnk_46; + /* 48 */ Vec2s mUnk_48; + /* 4C */ Vec2s mUnk_4C; + /* 50 */ unk32 mUnk_50; + /* 54 */ unk32 mUnk_54; + /* 58 */ unk32 mUnk_58; + /* 5C */ unk16 mUnk_5C; /* 60 */ UnkStruct_027e0ce0_40_Base_14() : @@ -471,7 +512,13 @@ public: ptr->func_ov000_02096a9c(); } + // overlay 0 void func_ov000_02096a9c(); + void func_ov000_02096af4(); + unk32 func_ov000_02096b1c(BOOL param1); + + // overlay 17 + void func_ov017_020be44c(unk32 param1, bool param2); }; class UnkStruct_027e0ce0_40_Base_74 { @@ -490,34 +537,46 @@ public: void func_ov031_020e0c34(); // overlay 102 - void func_ov102_0218323c(UnkStruct_027e0ce0_40_Base_14 *param1, unk32 param2); + void func_ov102_0218323c(UnkStruct_027e0ce0_40_Base_14 *param1, BOOL param2); }; class UnkStruct_027e0ce0_40_Base_78 { public: - /* 00 */ unk16 mUnk_00; // ActorRef? - /* 02 */ unk16 mUnk_02; + /* 00 */ ActorRef mRef; /* 04 */ - const u32 GetData() const { - return *(u32 *) this; + const bool HasValue() const { + u32 var_r2 = 0; + return *(u32 *) &this->mRef != *(u32 *) &var_r2; } - const bool HasValue() const { - return this->GetData() != 0; + const bool UnkCheck1() { + return this->mRef.UnkCheck2(); } UnkStruct_027e0ce0_40_Base_78(); ~UnkStruct_027e0ce0_40_Base_78(); + + // overlay 31 + u8 func_ov031_020dcfb4(void *param1); +}; + +struct UnkParamStruct1 { + u32 unk_00; }; class UnkStruct_027e0ce0_40_Base_7C_04 { public: - /* 00 */ STRUCT_PAD(0x00, 0xB4); + /* 00 */ unk32 mUnk_00; + /* 04 */ STRUCT_PAD(0x04, 0xB4); /* B4 */ UnkStruct_027e0ce0_40_Base_7C_04(); ~UnkStruct_027e0ce0_40_Base_7C_04(); + + // overlay 31 + void func_ov031_020dca3c(); + void func_ov031_020dcb60(UnkParamStruct1 param1); }; class UnkStruct_027e0ce0_40_Base_7C { @@ -532,9 +591,12 @@ public: ~UnkStruct_027e0ce0_40_Base_7C(); // overlay 0 + void func_ov000_020968b8(); void func_ov000_020968e0(); + bool func_ov000_020968fc(); // overlay 17 + void func_ov017_020be2ec(UnkStruct_027e0ce0_40_Base_14 *param1, bool param2, UnkParamStruct1 param3); void func_ov017_020be434(); }; @@ -569,12 +631,13 @@ class UnkStruct_027e0ce0_40_Base_94_Base : public UnkStruct_027e0ce0_40_Base_94_ public: /* 00 (base) */ /* 14 */ ActorRef mUnk_14; - /* 18 */ unk32 mUnk_18; + /* 18 */ ActorRef mUnk_18; /* 1C */ ActorRef mUnk_1C; - /* 20 */ unk32 mUnk_20; - /* 24 */ STRUCT_PAD(0x24, 0x48); + /* 20 */ Vec2s mTouchPosLast; + /* 24 */ unk32 mUnk_24; + /* 28 */ STRUCT_PAD(0x28, 0x48); /* 48 */ ActorRef mUnk_48; - /* 4C */ unk32 mUnk_4C; + /* 4C */ u16 mUnk_4C; /* 50 */ UnkStruct_027e0ce0_40_Base_94_Base(unk32 param1); @@ -587,15 +650,14 @@ public: /* 54 */ UnkStruct_027e0ce0_40_Base_94 *mUnk_54; /* 58 */ UnkStruct_027e0ce0_40_Base_94_50 *mUnk_58; /* 5C */ unk32 mUnk_5C; // seems to be the walking speed of link?? - /* 60 */ unk16 mUnk_60; - /* 62 */ unk16 mUnk_62; - /* 64 */ unk8 mUnk_64; - /* 65 */ unk8 mUnk_65; - /* 66 */ unk8 mUnk_66; - /* 67 */ unk8 mUnk_67; - /* 68 */ unk8 mUnk_68; - /* 69 */ unk8 mUnk_69; - /* 6A */ unk8 mUnk_6A; + /* 60 */ Vec2s mUnk_60; + /* 64 */ u8 mUnk_64; + /* 65 */ u8 mUnk_65; + /* 66 */ u8 mUnk_66; + /* 67 */ u8 mUnk_67; + /* 68 */ u8 mUnk_68; + /* 69 */ u8 mUnk_69; + /* 6A */ u8 mUnk_6A; /* 6C */ unk32 mUnk_6C; /* 70 */ @@ -604,6 +666,10 @@ public: // overlay 0 void func_ov000_0208aee4(); + + // overlay 17 + void func_ov017_020bd478(); + void func_ov017_020bd300(UnkStruct_027e0ce0_40_Base_14 *param1, unk32 param2, bool param3); }; typedef u16 UnkFlags3; @@ -641,10 +707,38 @@ public: /* 107 */ unk8 mUnk_107; /* 108 */ + ItemManager *GetItemMgr() const { + return this->mpItemManager; + } + + UnkStruct_027e0ce0_40_Base_78 *GetUnk78() const { + return this->mUnk_078; + } + + const bool IsUnk78() { + return this->mUnk_078 != NULL; + } + const BOOL Unk78HasValue() const { return this->mUnk_078 != NULL && this->mUnk_078->HasValue(); } + const bool CheckUnk104(UnkFlags3 flag) const { + return GET_FLAG2(this->mUnk_104, flag); + } + + const bool UnkCheck1() { + bool ret = false; + + if (this->IsUnk78() && this->mUnk_078->UnkCheck1()) { + ret = true; + } + + return ret; + } + + inline const bool UnknownInline1(bool param1, unk32 param2); + UnkStruct_027e0ce0_40_Base(unk32 param1, void *param2, ItemManager *pItemMgr); ~UnkStruct_027e0ce0_40_Base(); @@ -692,7 +786,7 @@ public: /* 00 */ virtual void vfunc_00() override; // overlay 102 - void func_ov102_02182e54(unk32 param1, unk32 param2, unk32 param3); + void func_ov102_02182e54(unk32 param1, VecFx32 *param2, unk32 param3); }; class UnkStruct_027e0ce0_40_14C { @@ -704,12 +798,11 @@ public: ~UnkStruct_027e0ce0_40_14C(); // overlay 17 - void func_ov093_02168e24(unk32 param1); + void func_ov093_02168e24(void *param1); // overlay 93 void func_ov093_02168850(); - bool func_ov092_021689e8(unk32 param1, UnkStruct_027e0ce0_40 *param2, PlayerLinkActor *param3, - UnkStruct_027e0ce0_40_328 *param4); + bool func_ov092_021689e8(bool param1, UnkStruct_027e0ce0_40 *param2, PlayerLinkActor *pPlayer, PlayerActorBase *pZelda); }; class UnkStruct_027e0ce0_40_150 { @@ -725,35 +818,6 @@ public: bool func_ov096_02179c54(bool param1, bool param2); }; -class UnkStruct_027e0ce0_40_328 { -public: - /* 000 */ STRUCT_PAD(0x00, 0x98); - /* 098 */ PlayerActorBase *mpPlayer; - /* 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, - ItemFlag *pEquippedItem); - ~UnkStruct_027e0ce0_40_328(); - - // overlay 93 - 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 class UnkStruct_027e0ce0_40 : public UnkStruct_027e0ce0_40_Base { public: @@ -762,9 +826,9 @@ public: /* 14C */ UnkStruct_027e0ce0_40_14C *mUnk_14C; /* 150 */ UnkStruct_027e0ce0_40_150 *mUnk_150; /* 154 */ PlayerLinkActor mPlayer; - /* 328 */ UnkStruct_027e0ce0_40_328 *mUnk_328; - /* 32C */ PlayerLinkActor *mpPlayer; // set to mPlayer - /* 330 */ UnkStruct_027e0ce0_40_328 *mUnk_330; // set to mUnk_328 + /* 328 */ PlayerZeldaActor *mpZelda; + /* 32C */ PlayerLinkActor *mpPlayer; // set to mPlayer + /* 330 */ PlayerZeldaActor *mUnk_330; // set to mpZelda /* 334 */ ItemFlag mEquippedItem; /* 338 */ bool mIsSceneTowerInsideStairs; /* 339 */ bool mIsSceneTowerOutsideStairs; @@ -779,10 +843,15 @@ public: void func_ov000_02088060(bool param1); // overlay 17 - unk32 func_ov017_020bcde8(unk32 param1, ItemManager *pItemMgr); + bool func_ov017_020bc95c(bool param1); + void func_ov017_020bca40(bool param1, unk32 param2); + bool func_ov017_020bcde8(bool param1); // overlay 93 + void func_ov093_02168020(unk32 param1); + void func_ov093_021680fc(unk32 param1); void func_ov093_02168220(); + void func_ov093_02168258(); // overlay 101 bool func_ov101_02182fb4(bool param1); @@ -791,10 +860,10 @@ public: 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_0218303c(bool param1, ItemManager *pItemMgr); void func_ov102_02183180(unk32 param1, bool param2); - void func_ov102_021831b4(unk32 param1); - void func_ov102_021831f0(unk32 param1); + void func_ov102_021831b4(void *param1); + void func_ov102_021831f0(void *param1); }; union UnkStruct_027e0478 { @@ -848,10 +917,15 @@ public: void func_ov000_0208ba94(unk32 param1, VecFx32 *param2); void func_ov000_0208bacc(unk32 param1, VecFx32 *param2); void func_ov000_0208bbd4(unk32 param1, VecFx32 *param2, u16 param3); - bool func_ov000_0208bc1c(unk32 param1, unk32 param2, unk32 param3, unk32 param4, unk32 param5, unk32 param6); + bool func_ov000_0208bc1c(unk32 param1, unk32 param2, void *param3, unk32 param4, void *param5, unk32 param6); + bool func_ov000_0208bc1c(unk32 param1, unk32 param2, unk32 param3, unk32 param4, void *param5, unk32 param6); + bool func_ov000_0208bc1c(unk32 param1, unk32 param2, unk32 param4, void *param5, unk32 param6); void func_ov000_0208bc9c(unk32 param1, unk32 param2); + void func_ov000_0208bd20(bool param1, unk32 param2, unk32 param3); void func_ov000_0208bd30(bool param1, unk32 param2, unk32 param3, unk32 param4); + bool func_ov000_0208be0c(ActorRef param1); bool func_ov000_0208be70(VecFx32 param1); + bool func_ov000_0208bf34(unk32 param1); static UnkStruct_027e0ce0_34 *func_ov000_0205c904(); @@ -870,7 +944,11 @@ public: static void Destroy(); // overlay 17 - void func_ov017_020bd5dc(unk32 param1); + void func_ov017_020bd4a0(unk32 param1, bool param2); + void func_ov017_020bd568(unk32 param1); + void func_ov017_020bd5c4(void *param1); + void func_ov017_020bd5dc(void *param1); + void func_ov017_020bd644(void *param1); void func_ov017_020bd69c(); }; diff --git a/include/Unknown/UnkStruct_027e0cf4.hpp b/include/Unknown/UnkStruct_027e0cf4.hpp index 4afcf27c..9e2ce570 100644 --- a/include/Unknown/UnkStruct_027e0cf4.hpp +++ b/include/Unknown/UnkStruct_027e0cf4.hpp @@ -6,6 +6,9 @@ class UnkStruct_027e0cf4 { public: ~UnkStruct_027e0cf4(); + + // overlay 21 + void func_ov021_020f6f58(unk32 param1, unk32 param2, void *param3, unk32 param4, unk32 param5); void func_ov021_020f8cdc(); void func_ov021_020f8d20(); }; diff --git a/include/Unknown/UnkStruct_027e0cf8.hpp b/include/Unknown/UnkStruct_027e0cf8.hpp index d4ecba0f..b7344fa9 100644 --- a/include/Unknown/UnkStruct_027e0cf8.hpp +++ b/include/Unknown/UnkStruct_027e0cf8.hpp @@ -101,7 +101,7 @@ public: class UnkStruct_027e0cf8_08 { public: /* 000 */ UnkStruct_027e0cf8_08_00 *mUnk_000; - /* 004 */ unk32 mUnk_004; + /* 004 */ unk32 mUnk_004; // volatile? /* 008 */ unk32 mUnk_008; /* 00C */ unk32 mUnk_00C; /* 010 */ UnkArrayDataType1 mUnk_010; @@ -114,6 +114,10 @@ public: UnkStruct_027e0cf8_08(); ~UnkStruct_027e0cf8_08(); + // overlay 17 + void func_ov017_020be8a8(); + + // overlay 24 void func_ov024_020d32b4(unk8 *param1); void func_ov024_020d32d8(); void func_ov024_020d32e8(Vec2s *param1); diff --git a/include/Unknown/UnkStruct_027e0d34.hpp b/include/Unknown/UnkStruct_027e0d34.hpp index 5106fb2e..1132f165 100644 --- a/include/Unknown/UnkStruct_027e0d34.hpp +++ b/include/Unknown/UnkStruct_027e0d34.hpp @@ -25,11 +25,13 @@ public: bool func_ov031_020d9758(); bool func_ov031_020d97e4(); bool func_ov031_020d97f4(); + bool TryItemGive(ItemId itemId); void func_ov031_020d9844(); void func_ov031_020d9854(VecFx32 *param1, fx32 param2); void func_ov031_020d994c(); void func_ov031_020d996c(); - bool TryItemGive(ItemId itemId); + unk32 func_ov031_020d9a4c(unk32 param1); + bool func_ov031_020d9ab8(); }; extern UnkStruct_027e0d34 *data_027e0d34; diff --git a/include/Unknown/UnkStruct_027e0d38.hpp b/include/Unknown/UnkStruct_027e0d38.hpp index 46825219..1317dd0c 100644 --- a/include/Unknown/UnkStruct_027e0d38.hpp +++ b/include/Unknown/UnkStruct_027e0d38.hpp @@ -1,6 +1,8 @@ #pragma once +#include "Actor/ActorRef.hpp" #include "global.h" +#include "nitro/fx.h" #include "types.h" class UnkStruct_027e0d38 : public AutoInstance { @@ -9,6 +11,9 @@ public: UnkStruct_027e0d38(); + // overlay 26 + unk32 func_ov026_020d9c14(ActorRef ref, VecFx32 *pPos, VecFx32 *pVel); + // overlay 31 bool func_ov031_020d9bec(); bool func_ov031_020d9c04(unk32 param1, unk32 param2, unk32 param3); diff --git a/include/Unknown/UnkStruct_027e0d70.hpp b/include/Unknown/UnkStruct_027e0d70.hpp index 646a5261..3ad23974 100644 --- a/include/Unknown/UnkStruct_027e0d70.hpp +++ b/include/Unknown/UnkStruct_027e0d70.hpp @@ -9,6 +9,7 @@ public: void func_ov071_0215e8f8(); void func_ov071_0215e9ac(); void func_ov071_0215eac8(); + void func_ov071_0215eb18(); }; extern UnkStruct_027e0d70 *data_027e0d70; diff --git a/include/Unknown/UnkStruct_ov000_0208f820.hpp b/include/Unknown/UnkStruct_ov000_0208f820.hpp index 0c619dc6..93c1e8fc 100644 --- a/include/Unknown/UnkStruct_ov000_0208f820.hpp +++ b/include/Unknown/UnkStruct_ov000_0208f820.hpp @@ -9,6 +9,7 @@ #include "math.hpp" class PlayerLinkActor_A0; +class UnkStruct_027e0ce0_40; class UnkStruct_ov000_0208f820_14 { public: @@ -102,24 +103,6 @@ public: /* 1C */ ItemId mUnk_1C; }; -class UnkStruct_ov000_0208f820_24 { -public: - /* 00 */ unk8 mUnk_00[0x24]; - /* 24 */ unk8 mUnk_24; - /* 25 */ unk8 mUnk_25; - /* 26 */ STRUCT_PAD(0x26, 0x78); - /* 78 */ void **mUnk_78; - /* 7C */ STRUCT_PAD(0x7C, 0x94); - /* 94 */ unk32 mUnk_94; - /* 98 */ unk32 mUnk_98; - /* 9C */ unk32 mUnk_9C; - /* A0 */ STRUCT_PAD(0xA0, 0xFE); - /* FE */ unk8 mUnk_FE; - /* FF */ unk8 mUnk_FF; - /* 100 */ unk32 mUnk_100; - /* 104 */ u16 mUnk_104; -}; - class UnkStruct_ov000_0208f820_04 { public: /* 00 */ ActorRef mUnk_00; @@ -154,7 +137,7 @@ public: /* 1B */ unk8 mUnk_1B; /* 1C */ unk32 mUnk_1C; /* 20 */ unk32 mUnk_20; - /* 24 */ UnkStruct_ov000_0208f820_24 *mUnk_24; + /* 24 */ UnkStruct_027e0ce0_40 *mUnk_24; /* 28 */ UnkStruct_ov000_0208f820_28 *mUnk_28; /* 2C */ UnkStruct_ov000_0208f820_2c *mUnk_2C; /* 30 */ PlayerLinkActor_A0 *mUnk_30; diff --git a/include/Unknown/UnkStruct_ov016_020b8310.hpp b/include/Unknown/UnkStruct_ov016_020b8310.hpp new file mode 100644 index 00000000..f6fac470 --- /dev/null +++ b/include/Unknown/UnkStruct_ov016_020b8310.hpp @@ -0,0 +1,20 @@ +#pragma once + +#include "global.h" +#include "types.h" + +class UnkStruct_ov016_020b8310 { +public: + /* 00 */ unk32 mUnk_00; + + UnkStruct_ov016_020b8310(); + ~UnkStruct_ov016_020b8310(); + + /* 00 */ virtual void vfunc_00(); + /* 04 */ virtual void vfunc_04(); + /* 08 */ virtual void vfunc_08(); + /* 0C */ virtual void vfunc_0C(void *param1); + /* 10 */ virtual void vfunc_10(void *param1); +}; + +extern UnkStruct_ov016_020b8310 data_ov016_020b8310; diff --git a/include/Unknown/UnkStruct_ov017_020c3f70.hpp b/include/Unknown/UnkStruct_ov017_020c3f70.hpp index fd577996..77c71a8d 100644 --- a/include/Unknown/UnkStruct_ov017_020c3f70.hpp +++ b/include/Unknown/UnkStruct_ov017_020c3f70.hpp @@ -1,17 +1,32 @@ #pragma once #include "global.h" +#include "nitro/os/thread.h" #include "types.h" -class UnkStruct_ov017_020c3f70 { +class UnkStruct_ov017_020c3f70_Base { public: - /* 00 */ unk32 mUnk_00; + /* 00 (vtable) */ + /* 04 */ OSThread mThread; + /* C4 */ unk32 mUnk_C4; + /* C8 */ unk32 mUnk_C8; + /* CC */ - UnkStruct_ov017_020c3f70(); + UnkStruct_ov017_020c3f70_Base(); // func_02013c24 + + // data_0204375c + /* 00 */ virtual ~UnkStruct_ov017_020c3f70_Base(); // func_02013cd4 & func_02013d30 + /* 08 */ virtual void vfunc_08(); +}; + +class UnkStruct_ov017_020c3f70 : public UnkStruct_ov017_020c3f70_Base { +public: + /* 00 (base) */ + /* CC */ // data_ov017_020c3f08 /* 00 */ virtual ~UnkStruct_ov017_020c3f70(); - /* 08 */ virtual void vfunc_08(); //! TODO: probably inherited? + /* 08 */ virtual void vfunc_08() override; void func_ov017_020bba78(); void func_ov017_020bba94(); diff --git a/include/Unknown/UnkStruct_ov031_02114664.hpp b/include/Unknown/UnkStruct_ov031_02114664.hpp index 5035d5be..02e826a5 100644 --- a/include/Unknown/UnkStruct_ov031_02114664.hpp +++ b/include/Unknown/UnkStruct_ov031_02114664.hpp @@ -10,5 +10,5 @@ public: /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 1C */ virtual void vfunc_1C() override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; }; diff --git a/include/Unknown/UnkStruct_ov031_02114870.hpp b/include/Unknown/UnkStruct_ov031_02114870.hpp index 2827c08c..8a26c771 100644 --- a/include/Unknown/UnkStruct_ov031_02114870.hpp +++ b/include/Unknown/UnkStruct_ov031_02114870.hpp @@ -11,6 +11,6 @@ public: UnkStruct_ov031_02114870(); /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 2C */ virtual void vfunc_2C(Actor_vfunc_30 *param1) override; /* 54 */ virtual G3d_Model *vfunc_54(); }; diff --git a/include/input.hpp b/include/input.hpp index afc4ba9c..fba0fed4 100644 --- a/include/input.hpp +++ b/include/input.hpp @@ -4,7 +4,7 @@ #include -#define CHECK_BUTTON_COMBO(value, btn) ((value) & (btn)) +#define CHECK_BUTTON_COMBO(value, btn) (((value) & (btn)) != 0) struct Input { /* 00 */ u16 cur; @@ -16,8 +16,12 @@ struct Input { this->Init(); } + BOOL CheckCurButtonCombo(u16 combo) { + return CHECK_BUTTON_COMBO(this->cur, combo); + } + void Init(); - unk32 func_02013c08(u16 param1); + unk32 func_02013c08(u32 param1); unk32 func_02013b24(unk32 param1); unk32 func_02013bbc(); }; diff --git a/include/math.hpp b/include/math.hpp index 4fddba35..84c056f0 100644 --- a/include/math.hpp +++ b/include/math.hpp @@ -369,9 +369,47 @@ union Vec2sb { } }; +union Vec3s { + struct { + /* 0 */ s16 x; + /* 2 */ s16 y; + /* 4 */ s16 z; + /* 6 */ + }; + s16 coords[3]; + + void operator=(const Vec3s &from) { + this->x = from.x; + this->y = from.y; + this->z = from.z; + } + + Vec3s() {} + + Vec3s(Vec3s *from) { +#if __MWERKS__ + this->coords = from->coords; +#else + this->x = from->x; + this->y = from->y; + this->z = from->z; +#endif + } + + Vec3s(s16 X, s16 Y, s16 Z) { + x = X; + y = Y; + y = Z; + } +}; + struct UnkAngleStruct { union { u16 angle; s16 angle_signed; }; + + UnkAngleStruct() {} + UnkAngleStruct(s16 angle) : + angle_signed(angle) {} }; diff --git a/libs/nitro/include/nitro/math.h b/libs/nitro/include/nitro/math.h index 6eceaa88..4c0e5228 100644 --- a/libs/nitro/include/nitro/math.h +++ b/libs/nitro/include/nitro/math.h @@ -47,6 +47,25 @@ extern "C" { #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)) +#define POW_2(x) (x * x) + +static inline const s32 ClampValue(s32 value, const s32 min, const s32 max) { + if (value > max) { + value = max; + } else if (value < min) { + value = min; + } + + return value; +} + +static inline void ClampValue16(s16 *value, const s32 min, const s32 max) { + if (*value > max) { + *value = max; + } else if (*value < min) { + *value = min; + } +} #define INT_TO_FX32(n) ((s32) ((n) << FX32_SHIFT)) #define FLOAT_TO_FX32(n) ((s32) (((n) * 8192 + 1) / 2)) @@ -183,6 +202,15 @@ static inline void VecFx32_CopyXZ(VecFx32 *vec, VecFx32 *out) { out->z = z; } +static inline void VecFx32_SubXZ(VecFx32 *vec1, VecFx32 *vec2, VecFx32 *out) { + + fx32 x = vec1->x - vec2->x; + fx32 z = vec1->z - vec2->z; + out->z = z; + out->x = x; + out->y = 0; +} + static inline void VecFx16_Copy2VecFx32(const VecFx16 *vec, VecFx32 *out) { out->x = vec->x; out->y = vec->y; @@ -201,10 +229,20 @@ static inline void VecFx32_Init(fx32 x, fx32 y, fx32 z, VecFx32 *dst) { dst->z = z; } +static inline void VecFx32_Reset(VecFx32 *dst) { + dst->x = 0; + dst->y = 0; + dst->z = 0; +} + static inline BOOL VecFx32_IsEqual(const VecFx32 *a, const VecFx32 *b) { return a->x == b->x && a->y == b->y && a->z == b->z; } +static inline bool VecFx32_IsCleared(const VecFx32 *a) { + return a->x == 0 && a->y == 0 && a->z == 0; +} + void Mat2p_InitIdentity(Mat2p *m); void Mat2p_InitRotation(Mat2p *m, fx32 sin, fx32 cos); void Mat2p_Multiply(Mat2p *a, Mat2p *b, Mat2p *out); diff --git a/libs/nns/include/nns/anim.h b/libs/nns/include/nns/anim.h index b7b47016..60df84c8 100644 --- a/libs/nns/include/nns/anim.h +++ b/libs/nns/include/nns/anim.h @@ -1,5 +1,6 @@ #pragma once +#include "global.h" #include #include @@ -42,9 +43,14 @@ typedef struct UnkAnimStruct1 { /* 12 */ unk16 unk_12; } UnkAnimStruct1; // size = 0x14 +typedef struct UnkAnimStruct2 { + /* 00 */ STRUCT_PAD(0x00, 0x0A); + /* 0A */ unk16 unk_0A; +} UnkAnimStruct2; + typedef struct CellAnim { /* 00 */ AnimController animCtrl; - /* 30 */ void *unk_30; // pointer to somewhere inside "CEBK" + /* 30 */ UnkAnimStruct2 *unk_30; // pointer to somewhere inside "CEBK" /* 34 */ void *unk_34; /* 38 */ unk32 unk_38; /* 3C */ UnkAnimStruct1 unk_3C; diff --git a/src/000_Second/Actor/Actor.cpp b/src/000_Second/Actor/Actor.cpp index 405bee6f..d4c4ff84 100644 --- a/src/000_Second/Actor/Actor.cpp +++ b/src/000_Second/Actor/Actor.cpp @@ -4,18 +4,18 @@ #include Actor::Actor() { - this->mVel.x = 0; - this->mVel.y = 0; - this->mVel.z = 0; - this->mUnk_2C = 0xCD; - this->mUnk_38 = 0; - this->mUnk_3C = NULL; - this->mUnk_40 = 0; - this->mUnk_48 = 4; - this->mState = ActorState_None; - this->mUnk_50 = 0; - this->mUnk_52 = 0; - this->mUnk_54 = 0; + this->mVel.x = 0; + this->mVel.y = 0; + this->mVel.z = 0; + this->mUnk_2C = 0xCD; + this->mUnk_38 = 0; + this->mUnk_3C = NULL; + this->mUnk_40 = 0; + this->mUnk_48 = 4; + this->mState = ActorState_None; + this->mTimer = 0; + this->mTimerMax = 0; + this->mUnk_54 = 0; this->ResetFlags(); this->mUnk_5C.mUnk_28 = 0; this->mUnk_5C.func_ov000_020975f8(); @@ -56,9 +56,9 @@ void Actor::vfunc_20() {} void Actor::vfunc_24() {} -void Actor::vfunc_28() {} +void Actor::vfunc_28(Actor_vfunc_30 *param1) {} -void Actor::vfunc_2C(unk32 param1) {} +void Actor::vfunc_2C(Actor_vfunc_30 *param1) {} void Actor::vfunc_30(Actor_vfunc_30 *param1) {} diff --git a/src/000_Second/Actor/ActorUnkSWOB.cpp b/src/000_Second/Actor/ActorUnkSWOB.cpp index c3f0a091..e176e6a4 100644 --- a/src/000_Second/Actor/ActorUnkSWOB.cpp +++ b/src/000_Second/Actor/ActorUnkSWOB.cpp @@ -54,8 +54,8 @@ void ActorUnkSWOB::SetState(ActorState state) { break; case ActorUnkSWOBState_2: this->func_ov000_0209aa30(); - this->mUnk_52 = -1; - this->mUnk_50 = 0; + this->mTimerMax = -1; + this->mTimer = 0; break; default: break; diff --git a/src/000_Second/Actor/ActorUnkSWTM.cpp b/src/000_Second/Actor/ActorUnkSWTM.cpp index c1d301de..921134d7 100644 --- a/src/000_Second/Actor/ActorUnkSWTM.cpp +++ b/src/000_Second/Actor/ActorUnkSWTM.cpp @@ -77,11 +77,9 @@ void ActorUnkSWTM::vfunc_20(void) { case ActorUnkSWTMState_2: break; case ActorUnkSWTMState_3: - if (this->mUnk_50 < this->mUnk_52) { - this->mUnk_50++; - } + this->IsTimerOut(); - if ((s32) this->mUnk_50 >= 15) { + if ((s32) this->mTimer >= 15) { this->func_ov000_0209b184(); this->SetState(ActorUnkSWTMState_0); } @@ -114,8 +112,8 @@ void ActorUnkSWTM::SetState(ActorState state) { break; case ActorUnkSWTMState_3: this->func_ov000_0209b160(); - this->mUnk_50 = 0; - this->mUnk_52 = -1; + this->mTimer = 0; + this->mTimerMax = -1; break; default: break; diff --git a/src/000_Second/Actor/Actor_Derived1.cpp b/src/000_Second/Actor/Actor_Derived1.cpp index cbe36ab0..448d2129 100644 --- a/src/000_Second/Actor/Actor_Derived1.cpp +++ b/src/000_Second/Actor/Actor_Derived1.cpp @@ -239,7 +239,7 @@ void Actor_Derived1::vfunc_24() { } // non-matching -void Actor_Derived1::vfunc_2C(unk32 param1) { +void Actor_Derived1::vfunc_2C(Actor_vfunc_30 *param1) { if (this->func_01fff5d0(param1, 0) == 0) { return; } @@ -252,7 +252,7 @@ void Actor_Derived1::vfunc_B8() { this->func_ov017_020bf5c4(&this->mPos, 0x666, 0x666, 0x1F, 0); } -void Actor_Derived1::vfunc_14() {} +bool Actor_Derived1::vfunc_14(Cylinder *param1) {} void Actor_Derived1::func_ov000_020a9a20() {} void Actor_Derived1::func_ov000_020a9a34() {} void Actor_Derived1::func_ov000_020a9a50() {} diff --git a/src/000_Second/Item/ItemManager.cpp b/src/000_Second/Item/ItemManager.cpp index 35871007..e4530a24 100644 --- a/src/000_Second/Item/ItemManager.cpp +++ b/src/000_Second/Item/ItemManager.cpp @@ -245,12 +245,12 @@ void ItemManager::func_ov000_020a8a5c() { this->mUnk_20->func_ov031_020db8cc(); } -bool ItemManager::func_ov000_020a8a74() { +bool ItemManager::func_ov000_020a8a74(UnkStruct_027e0ce0_30_00 *param1) { if (this->mUnk_20 == NULL) { return false; } - return this->mUnk_20->func_ov031_020db8f8(); + return this->mUnk_20->func_ov031_020db8f8(param1); } UnkStruct_ItemManager_20_00 *ItemManager::func_ov000_020a8a90() { diff --git a/src/000_Second/MapObject/MapObject.cpp b/src/000_Second/MapObject/MapObject.cpp index 630f0412..dd974212 100644 --- a/src/000_Second/MapObject/MapObject.cpp +++ b/src/000_Second/MapObject/MapObject.cpp @@ -5,6 +5,7 @@ #include "Unknown/UnkStruct_0204af1c.hpp" #include "Unknown/UnkStruct_027e0998.hpp" #include "Unknown/UnkStruct_027e09b4.hpp" +#include "Unknown/UnkStruct_027e09bc.hpp" #include "Unknown/UnkStruct_027e0cd8.hpp" #include "Unknown/UnkStruct_027e0ce0.hpp" #include "Unknown/UnkStruct_ov000_020b5d34.hpp" @@ -14,7 +15,6 @@ extern "C" void func_01ffb714(VecFx32 *, VecFx32 *, void *); extern "C" void func_01ffb9cc(VecFx32 *, VecFx32 *); extern "C" u16 func_01ffbbe0(fx32 x, fx32 z); extern "C" unk32 func_01ffecdc(unk32 param1, Cylinder *param2); -extern "C" bool func_01ffd768(unk32, void *, void *, unk8); extern "C" void func_01fff6d0(void *, VecFx32 *param1, s32 *param2, s32 *param3); MapObject::MapObject() { @@ -81,7 +81,7 @@ bool MapObject::func_ov000_0209d12c() { return result[1]; } -bool MapObject::func_ov000_0209d144(Vec2s *param1, unk32 param2, unk32 param3) { +bool MapObject::func_ov000_0209d144(Vec2s *param1, unk32 param2, UnkStruct_027e09bc_0C *param3) { if (this->mUnk_10 != NULL) { u32 stack[5]; @@ -97,7 +97,7 @@ bool MapObject::func_ov000_0209d144(Vec2s *param1, unk32 param2, unk32 param3) { stack2.x = param1->x; stack2.y = param1->y; - return func_01ffd768(param3, &stack, &stack2, value); + return param3->func_01ffd768(&stack, &stack2, value); } return false; @@ -107,7 +107,7 @@ bool MapObject::vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) { return true; } -void MapObject::vfunc_20() {} +void MapObject::vfunc_20(unk32 param1) {} void MapObject::vfunc_24(MapObject *param1, VecFx32 param2) { *(u32 *) this = 0; // ???? @@ -213,7 +213,7 @@ void MapObject::func_ov000_0209d434(s8 *param1, UnkStruct_ov019_020d24c8_28_258_ return; } - if (data_027e0998->vfunc_00(&this->mPos, &sp10, (u16 *) &this->mUnk_38)) { + if (data_027e0998->vfunc_00(&this->mPos, &sp10, (ActorRef *) &this->mUnk_38)) { spC.mUnk_06 = 0x00; MI_CpuFill32(0, &spC, sizeof(spC)); spC.mUnk_05 = -1; diff --git a/src/000_Second/MapObject/MapObjectMiniBlocks.cpp b/src/000_Second/MapObject/MapObjectMiniBlocks.cpp index 33b84b5a..dd0cdef2 100644 --- a/src/000_Second/MapObject/MapObjectMiniBlocks.cpp +++ b/src/000_Second/MapObject/MapObjectMiniBlocks.cpp @@ -107,7 +107,7 @@ bool MapObjectMiniBlocks::vfunc_00(void) { return true; } -void MapObjectMiniBlocks::vfunc_14(void) { +void MapObjectMiniBlocks::vfunc_14(unk32 param1) { Mat3p m; u16 unk_14 = this->mAngle; Mat3p_InitYRotation(&m, SIN(unk_14), COS(unk_14)); diff --git a/src/000_Second/MapObject/MapObjectSwitchStep.cpp b/src/000_Second/MapObject/MapObjectSwitchStep.cpp index d991a3bd..348b57fc 100644 --- a/src/000_Second/MapObject/MapObjectSwitchStep.cpp +++ b/src/000_Second/MapObject/MapObjectSwitchStep.cpp @@ -175,7 +175,7 @@ void MapObjectSwitchStep::func_ov000_0209e11c(MapObjState state, unk32 param2) { } } -void MapObjectSwitchStep::vfunc_20(void) { +void MapObjectSwitchStep::vfunc_20(unk32 param1) { switch (this->mState) { case MapObjSwitchStepState_1: case MapObjSwitchStepState_2: @@ -198,7 +198,7 @@ struct stack_struct { /* 08 */ }; -void MapObjectSwitchStep::vfunc_18(s8 *param1, s8 param2) { +void MapObjectSwitchStep::vfunc_18(s8 *param1) { if (!GET_FLAG(this->mFlags, MapObjFlag_5)) { return; } @@ -206,12 +206,12 @@ void MapObjectSwitchStep::vfunc_18(s8 *param1, s8 param2) { if (data_027e09a4->mUnk_00.sceneIndex >= SceneIndex_battle01 && data_027e09a4->mUnk_00.sceneIndex < SceneIndex_Max) { Vec2s sp10; stack_struct sp8; - u32 sp4; + ActorRef sp4; //! TODO: fake match? - sp4 = *(u32 *) &this->mUnk_38; + sp4 = *(ActorRef *) &this->mUnk_38; - if (data_027e0998->vfunc_00(&this->mPos, &sp10, (u16 *) &sp4)) { + if (data_027e0998->vfunc_00(&this->mPos, &sp10, &sp4)) { sp8.mUnk_06 = 0x00; MI_CpuFill32(0, &sp8, sizeof(sp8)); sp8.mUnk_05 = -1; diff --git a/src/001_SceneInit/Player/PlayerActorBase_70_001.cpp b/src/001_SceneInit/Player/PlayerActorBase_70_001.cpp index 154e5480..059baeff 100644 --- a/src/001_SceneInit/Player/PlayerActorBase_70_001.cpp +++ b/src/001_SceneInit/Player/PlayerActorBase_70_001.cpp @@ -1,4 +1,3 @@ -#include "Actor/Actor.hpp" #include "Player/PlayerActorBase.hpp" #include "System/SysNew.hpp" #include "Unknown/UnkStruct_027e09a4.hpp" @@ -35,11 +34,9 @@ PlayerActorBase_70::PlayerActorBase_70(PlayerCharacter character, unk32 param2) : NULL), mUnk_0E0(this->mUnk_00C.GetUnk08(), character), mUnk_114(param2 == -1 && character == PlayerCharacter_Link ? new(HeapIndex_1) Mat4x3p[PlayerCharacter_Max] : NULL), - mUnk_118(false), - mUnk_11C(false), - mUnk_120(false), + mUnk_118(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f)), mUnk_124(false), - mUnk_126(false), + mUnk_126(0), mUnk_127(false), mUnk_128(false), mUnk_129(true), diff --git a/src/001_SceneInit/Player/PlayerLinkActor_001.cpp b/src/001_SceneInit/Player/PlayerLinkActor_001.cpp index b8cb7c16..0520a6cc 100644 --- a/src/001_SceneInit/Player/PlayerLinkActor_001.cpp +++ b/src/001_SceneInit/Player/PlayerLinkActor_001.cpp @@ -10,7 +10,7 @@ PlayerLinkActor::PlayerLinkActor(unk32 param1, ItemManager *pItemMgr, UnkStruct_ UnkStruct_027e0ce0_40_150 *param4) : PlayerActorBase(PlayerCharacter_Link, param1, pItemMgr, param3), mUnk_094(param4), - mUnk_098(0), + mpZelda(NULL), mUnk_09C(new(HeapIndex_1) PlayerLinkActor_9C(param3, *(u32 *) &this->mUnk_50, this->mCharacter)), mUnk_0A0(new(HeapIndex_1) PlayerLinkActor_A0(pItemMgr, param3, this, this->mUnk_09C)), mUnk_0A4(this, this->mUnk_0A0), @@ -18,8 +18,8 @@ PlayerLinkActor::PlayerLinkActor(unk32 param1, ItemManager *pItemMgr, UnkStruct_ mUnk_0B4(false), mUnk_0B5(false), mUnk_0B6(false), - mUnk_0B7(false), - mUnk_0B8(false), + mUnk_0B7(0), + mUnk_0B8(0), mUnk_0B9(false), mUnk_0BA(false), mUnk_0BB(false), @@ -47,16 +47,16 @@ PlayerLinkActor::~PlayerLinkActor() { delete this->mUnk_09C; } -void PlayerLinkActor::func_ov001_020bcb60(UnkStruct_027e0ce0_40_328 *param1) { - this->mUnk_098 = param1; - this->mUnk_09C->mUnk_0F4 = param1; +void PlayerLinkActor::func_ov001_020bcb60(PlayerActorBase *pZelda) { + this->mpZelda = pZelda; + this->mUnk_09C->pZelda = pZelda; } void PlayerLinkActor::func_ov001_020bcb70() { this->func_ov001_020bc96c(); this->mUnk_0B4 = false; this->mUnk_0B5 = false; - this->mUnk_0B8 = false; + this->mUnk_0B8 = 0; this->mUnk_0A0->func_ov001_020bd2e0(); this->mUnk_0A4.mUnk_08 = false; this->func_ov000_0208d7f0(false); @@ -74,7 +74,7 @@ void PlayerLinkActor::func_ov001_020bcba8() { void PlayerLinkActor::func_ov001_020bcbd0(VecFx32 *pVec) { this->func_ov000_0208c8f8(pVec); - this->mUnk_90->mUnk_34.func_ov000_0208efd0(pVec); + this->mUnk_90->mUnk_034.func_ov000_0208efd0(pVec); PlayerActorBase_70 *unk_70 = this->mUnk_70; unk_70->func_ov001_020bbe18(0, this->mAngleStruct, this->mUnk_0A0->func_ov000_02093718(), diff --git a/src/001_SceneInit/SceneInitializers_001.cpp b/src/001_SceneInit/SceneInitializers_001.cpp index ff821ba3..ec116eee 100644 --- a/src/001_SceneInit/SceneInitializers_001.cpp +++ b/src/001_SceneInit/SceneInitializers_001.cpp @@ -30,7 +30,6 @@ #include #include -extern "C" void func_ov001_020bed34(); extern "C" void func_01fff17c(unk16 *, UnkStruct_027e0ce0 *, unk32); extern "C" u16 func_ov026_02106564(void *); @@ -420,7 +419,7 @@ UnkStruct_027e09a4_54_Base::~UnkStruct_027e09a4_54_Base() { data_027e09c0->func_ov001_020be3c4(); data_0204a110.func_ov001_020bd638(); data_ov000_020b50c0.func_ov001_020bde04(&this->mUnk_1C); - func_ov001_020bed34(); + UnkStruct_027e0cec::func_ov001_020bed34(); } void UnkStruct_027e09a4_54_Base::vfunc_0C() { diff --git a/src/001_SceneInit/UnkStruct_027e0ce0_30_001.cpp b/src/001_SceneInit/UnkStruct_027e0ce0_30_001.cpp index edb2ff04..87ba7625 100644 --- a/src/001_SceneInit/UnkStruct_027e0ce0_30_001.cpp +++ b/src/001_SceneInit/UnkStruct_027e0ce0_30_001.cpp @@ -7,8 +7,9 @@ extern "C" void func_ov000_0208dd60(void *, UnkStruct_027e0ce0_30_00 *); extern fx32 data_ov000_020afd14; -UnkStruct_027e0ce0_30_00::UnkStruct_027e0ce0_30_00(UnkStruct_027e0ce0_38 *param1, UnkStruct_027e0ce0_3C *param2, unk32 param3, - unk32 *param4, unk32 param5) { +UnkStruct_027e0ce0_30_00::UnkStruct_027e0ce0_30_00(UnkStruct_027e0ce0_38 *param1, UnkStruct_027e0ce0_3C *param2, + UnkStruct_027e0ce0_40 *param3, PlayerLinkActor *param4, + PlayerActorBase *param5) { this->mUnk_00.x = 0; this->mUnk_00.y = 0; this->mUnk_00.z = 0; @@ -17,16 +18,16 @@ UnkStruct_027e0ce0_30_00::UnkStruct_027e0ce0_30_00(UnkStruct_027e0ce0_38 *param1 this->mUnk_0C.y = 0; this->mUnk_0C.z = 0; - this->mUnk_18 = 0; - this->mUnk_1C = 0; - this->mUnk_20 = 0; - this->mUnk_24 = 0; - this->mUnk_28 = false; - this->mUnk_2C = param1; - this->mUnk_30 = param2; - this->mUnk_34 = param3; - this->mUnk_38 = param4; - this->mUnk_3C = param5; + this->mUnk_18 = 0; + this->mUnk_1C = 0; + this->mUnk_20 = 0; + this->mUnk_24 = 0; + this->mUnk_28 = false; + this->mUnk_2C = param1; + this->mUnk_30 = param2; + this->mUnk_34 = param3; + this->mpPlayer = param4; + this->mpZelda = param5; if (param1 != NULL) { param1->func_ov026_020de908(this); @@ -69,7 +70,8 @@ void UnkStruct_027e0ce0_30::func_ov001_020bbf50(UnkStruct_027e0ce0_3C *param1) { this->mUnk_00 = new(HeapIndex_1) UnkStruct_027e0ce0_30_00(NULL, param1, 0x00, NULL, 0x00); } -void UnkStruct_027e0ce0_30::func_ov001_020bbf7c(unk32 param1, unk32 *param2, unk32 param3) { +void UnkStruct_027e0ce0_30::func_ov001_020bbf7c(UnkStruct_027e0ce0_40 *param1, PlayerLinkActor *param2, + PlayerActorBase *param3) { this->mUnk_00 = new(HeapIndex_1) UnkStruct_027e0ce0_30_00(NULL, NULL, param1, param2, param3); if (gOverlayManager.IsPlayerSub()) { diff --git a/src/001_SceneInit/UnkStruct_027e0ce0_40_Base_001.cpp b/src/001_SceneInit/UnkStruct_027e0ce0_40_Base_001.cpp index 0277e0fd..27e00485 100644 --- a/src/001_SceneInit/UnkStruct_027e0ce0_40_Base_001.cpp +++ b/src/001_SceneInit/UnkStruct_027e0ce0_40_Base_001.cpp @@ -1,4 +1,5 @@ #include "Unknown/UnkStruct_027e0ce0.hpp" +#include "global.h" UnkStruct_027e0ce0_40_Base::UnkStruct_027e0ce0_40_Base(unk32 param1, void *param2, ItemManager *pItemMgr) : mUnk_000(param1), @@ -35,20 +36,20 @@ void UnkStruct_027e0ce0_40_Base::func_ov001_020bc0e0(bool param1) { } if (this->mUnk_078 != NULL) { - *(u32 *) &this->mUnk_078->mUnk_00 = 0; + this->mUnk_078->mRef.Reset(); } - this->mUnk_094.mUnk_5C = 0; - this->mUnk_094.mUnk_60 = 0x80; - this->mUnk_094.mUnk_62 = 0x60; - this->mUnk_094.mUnk_64 = 0; - this->mUnk_094.mUnk_65 = 0; - this->mUnk_094.mUnk_66 = 0; - this->mUnk_094.mUnk_67 = 0; - this->mUnk_094.mUnk_68 = 0; - this->mUnk_094.mUnk_69 = 0; - this->mUnk_094.mUnk_6A = 0; - this->mUnk_094.mUnk_6C = 0; + this->mUnk_094.mUnk_5C = 0; + this->mUnk_094.mUnk_60.x = SUBSCREEN_WIDTH / 2; + this->mUnk_094.mUnk_60.y = SUBSCREEN_HEIGHT / 2; + this->mUnk_094.mUnk_64 = 0; + this->mUnk_094.mUnk_65 = 0; + this->mUnk_094.mUnk_66 = 0; + this->mUnk_094.mUnk_67 = 0; + this->mUnk_094.mUnk_68 = 0; + this->mUnk_094.mUnk_69 = 0; + this->mUnk_094.mUnk_6A = 0; + this->mUnk_094.mUnk_6C = 0; if (param1) { UNSET_FLAG2(this->mUnk_104, UnkFlags3_0); diff --git a/src/017_CourseExec/Actor/ActorEventIcon_017.cpp b/src/017_CourseExec/Actor/ActorEventIcon_017.cpp new file mode 100644 index 00000000..91ec9481 --- /dev/null +++ b/src/017_CourseExec/Actor/ActorEventIcon_017.cpp @@ -0,0 +1,46 @@ +#include "Actor/ActorEventIcon.hpp" +#include "Unknown/UnkStruct_0204af1c.hpp" +#include "Unknown/UnkStruct_027e0998.hpp" +#include "Unknown/UnkStruct_027e0cd8.hpp" + +void ActorEventIcon::vfunc_24() { + this->func_ov017_020c002c(); +} + +void ActorEventIcon::vfunc_30(Actor_vfunc_30 *param1) { + Vec2s sp4; + bool var_r1; + + if (data_027e0cd8->func_ov000_02082124() != 0) { + return; + } + + if (this->mUnk_094.mUnk_60 & 0x01) { + var_r1 = true; + } else { + var_r1 = false; + } + + if (param1->mUnk_00.unk_00 != var_r1 && param1->mUnk_00.unk_01 != var_r1) { + return; + } + + if (data_027e0998->vfunc_00(&this->mPos, &sp4, &this->mRef) == 0) { + return; + } + + sp4.y += (s16) this->mUnk_5C.mParams[1] - this->mUnk_094.mCellAnim.unk_30->unk_0A; + data_0204af1c.func_0201aad0(&this->mUnk_094, &sp4, 1, 0); +} + +void ActorEventIcon::func_ov017_020c002c() { + if (this->mUnk_094.mUnk_68 == 1) { + if (this->mUnk_094.func_ov000_02060af8() != 0) { + this->Kill(); + } + } else if (this->mUnk_10C >= 600) { + this->func_ov000_020984d0(); + } + + this->mUnk_094.func_ov000_020609c4(); +} diff --git a/src/017_CourseExec/Actor/ActorManager_017.cpp b/src/017_CourseExec/Actor/ActorManager_017.cpp new file mode 100644 index 00000000..49807ea1 --- /dev/null +++ b/src/017_CourseExec/Actor/ActorManager_017.cpp @@ -0,0 +1,91 @@ +#include "Actor/ActorManager.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "Unknown/UnkStruct_027e09a4.hpp" +#include "Unknown/UnkStruct_027e0d70.hpp" + +void ActorManager::func_ov017_020becd8(unk32 param1) { + bool var_r0; + + switch ((s32) data_027e09a4->CurrentSceneIndex()) { + case SceneIndex_test_iwa: + case SceneIndex_d_main: + case SceneIndex_f_kakushi4: + case SceneIndex_test_mri: + case SceneIndex_test_morita: + case SceneIndex_test_sako: + case SceneIndex_test_hosaka: + var_r0 = true; + break; + default: + var_r0 = false; + break; + } + + if (var_r0 != 0) { + data_027e0d70->func_ov071_0215eb18(); + } + + Vec2us sp0; + sp0.x = data_0204a110.func_02019300(param1); + sp0.y = data_0204a110.func_02019340(param1); + + this->func_01fff2fc(ActorManager::func_ov017_020bee20, &sp0); + + if (sp0.y != 0) { + int i = 0; + Actor **ppActor = this->mActorTable; + + while (ppActor < this->mUnk_08) { + if (*ppActor != NULL && !(*ppActor)->IsAlive()) { + this->func_ov000_02096e44(i); + } + + i++; + ppActor++; + } + } +} + +void ActorManager::func_ov017_020bee20(Actor *pActor, Actor_vfunc_30 *param2) { + if (param2->mUnk_00.data == 0 || !pActor->IsFlag2()) { + if (param2->mUnk_02.data == 0) { + return; + } + + if (!pActor->IsActive()) { + return; + } + } + + pActor->vfunc_24(); +} + +void ActorManager::func_ov017_020bee64(Actor *pActor, Actor_vfunc_30 *param2) { + if (pActor->IsVisible()) { + pActor->vfunc_28(param2); + } +} + +void ActorManager::func_ov017_020bee84(Actor *pActor, Actor_vfunc_30 *param2) { + if (pActor->IsVisible()) { + pActor->vfunc_2C(param2); + } +} + +void ActorManager::func_ov017_020beea4(Actor *pActor, Actor_vfunc_30 *param2) { + if (!pActor->IsVisible()) { + return; + } + + if (!pActor->IsFlag11()) { + return; + } + + pActor->vfunc_2C(param2); +} + +void ActorManager::func_ov017_020beecc(Actor *pActor, Actor_vfunc_30 *param2) { + if (pActor->IsVisible()) { + pActor->vfunc_30(param2); + } +} diff --git a/src/017_CourseExec/Actor/Actor_017.cpp b/src/017_CourseExec/Actor/Actor_017.cpp new file mode 100644 index 00000000..3d7ab691 --- /dev/null +++ b/src/017_CourseExec/Actor/Actor_017.cpp @@ -0,0 +1,615 @@ +#include "Actor/Actor.hpp" +#include "Actor/ActorHeart.hpp" +#include "Actor/ActorItemBoomerang.hpp" +#include "Actor/ActorItemDrop.hpp" +#include "Actor/ActorManager.hpp" +#include "Actor/ActorRef.hpp" +#include "Actor/ActorRupee.hpp" +#include "Actor/ActorUnkKEYN.hpp" +#include "Actor/ActorUnkSWBM.hpp" +#include "Physics/Cylinder.hpp" +#include "Unknown/UnkStruct_0204af1c.hpp" +#include "Unknown/UnkStruct_027e0998.hpp" +#include "Unknown/UnkStruct_027e09a4.hpp" +#include "Unknown/UnkStruct_027e09a8.hpp" +#include "Unknown/UnkStruct_027e09b4.hpp" +#include "Unknown/UnkStruct_027e09bc.hpp" +#include "Unknown/UnkStruct_027e0ce0.hpp" +#include "Unknown/UnkStruct_027e0d38.hpp" +#include "math.hpp" +#include "nitro/fx.h" +#include "nitro/math.h" + +extern "C" bool func_01ffecdc(unk32 param1, Cylinder *param2); +extern "C" u16 func_01ffbbe0(fx32 x, fx32 z); +extern "C" void func_01ff93c0(VecFx32 *, fx32); +extern "C" void func_01ff9770(VecFx32 *, unk32); +extern "C" void func_01ffb714(VecFx32 *, VecFx32 *, void *); +extern "C" void func_01ff97c8(VecFx32 *, int); +extern "C" void func_01ffce1c(Cylinder *, Cylinder *); +extern "C" unk32 func_01ff9258(fx32, fx32); + +extern "C" void func_ov000_0209807c(void *); +extern "C" void func_ov000_020980e0(void *); +extern "C" void func_ov000_02098244(VecFx32 *); +extern "C" void func_ov000_02097f38(VecFx32 *); +extern "C" void func_ov000_02097fcc(VecFx32 *); +extern "C" void func_ov000_02097ea0(VecFx32 *); +extern "C" void func_ov000_02097e04(VecFx32 *); +extern "C" void func_ov000_02097d4c(VecFx32 *); +extern "C" void func_ov000_02099870(UnkStruct_ActorUnkCANS_224 *, VecFx32 *, u16); +extern "C" void func_ov000_020a1330(u16, ActorRef, VecFx32, UnkAngleStruct, unk32, unk32); +extern "C" void func_ov031_020f439c(void *, Vec3s *, unk32); + +extern unk32 data_ov000_020aed08; +extern unk32 data_ov000_020aed04; +extern unk32 data_ov000_020aecfc; +extern u16 data_ov000_020aed00; +extern const unk16 data_ov000_020aecec; +extern VecFx32 data_027e07d4; + +struct UnkStruct_ov000_020aa888 { + /* 00 */ u16 unk_00; + /* 00 */ u16 unk_02; +}; +extern UnkStruct_ov000_020aa888 data_ov000_020aa888; + +bool Actor::func_ov017_020beeec(unk32 param1) { + Cylinder sp0; + + this->func_ov000_02098a18(&sp0); + sp0.size += param1; + + return func_01ffecdc(0, &sp0) || func_01ffecdc(1, &sp0); +} + +bool Actor::func_ov017_020bef4c(unk32 param1) { + if (data_027e0ce0->func_ov000_0208be0c(this->mRef)) { + return 1; + } + + return this->func_ov017_020beeec(param1); +} + +void Actor::func_ov017_020bef88(Actor_vfunc_30 *param1, UnkStruct_ov019_020d24c8_28_258_00 *param2, unk32 param3) { + Vec2s sp4; + bool var_r2 = param2->mUnk_04 & 1; + + if (param1->mUnk_00.unk_00 != var_r2 && param1->mUnk_00.unk_01 != var_r2) { + return; + } + + if (data_027e0998->vfunc_00(&this->mPos, &sp4, &this->mRef)) { + data_0204af1c.func_0201aa44(param2, &sp4, param3, 0); + } +} + +void Actor::func_ov017_020bf024(Actor_vfunc_30 *param1) { + if (this->IsFlag7()) { + this->func_ov017_020bef88(param1, &gpActorManager->mUnk_14, 1); + } +} + +void Actor::func_ov017_020bf050(Actor_9C *param1, unk32 param2) { + Cylinder sp0; + s16 temp_r2; + s32 var_r1; + + this->vfunc_10(&sp0); + + fx32 size = -sp0.size; + + temp_r2 = func_01ffbbe0(param1->mUnk_10.x, param1->mUnk_10.z); + + fx16 sin = SIN((u16) (s16) temp_r2); + fx16 cos = COS((u16) (s16) temp_r2); + + sp0.pos.x += MUL_FX32(sin, size); + sp0.pos.z += MUL_FX32(cos, size); + + func_ov000_0209807c(&sp0); + + if (this->mUnk_48 > 0) { + if (param1->mUnk_1C == 0x0D) { + var_r1 = 0x8D76; + } else { + var_r1 = 0xE4; + } + } else { + var_r1 = 0xE5; + } + + if (var_r1 != 0) { + data_027e09a8->func_ov000_02071b30(var_r1, &sp0.pos, 0); + } + + if (this->mUnk_48 <= 0) { + this->func_ov017_020bf2d8(param1, param2); + } +} + +void Actor::func_ov017_020bf178(Actor_9C *param1, unk32 param2) { + Cylinder sp0; + s32 temp_r2; + s32 var_r1; + + this->vfunc_10(&sp0); + + fx32 size = -sp0.size; + + temp_r2 = func_01ffbbe0(param1->mUnk_10.x, param1->mUnk_10.z); + + fx16 sin = SIN((u16) (s16) temp_r2); + fx16 cos = COS((u16) (s16) temp_r2); + + sp0.pos.x += MUL_FX32(sin, size); + sp0.pos.z += MUL_FX32(cos, size); + + func_ov000_020980e0(&this->mPos); + + var_r1 = this->mUnk_48 > 0 ? 0xE4 : 0xE5; + + if (var_r1 != 0) { + data_027e09a8->func_ov000_02071b30(var_r1, &sp0.pos, 0); + } + + if (this->mUnk_48 <= 0) { + this->func_ov017_020bf2d8(param1, param2); + } +} + +void Actor::func_ov017_020bf284(VecFx32 *param1, VecFx32 param2) { + VecFx32 sp0; + + sp0 = param2; + + VecFx32_Add(&sp0, param1, &sp0); + func_01ff93c0(&sp0, FLOAT_TO_FX32(0.5f)); + func_ov000_02098244(&sp0); +} + +void Actor::func_ov017_020bf2d8(Actor_9C *param1, unk32 param2) { + u16 var_r0_2; + u16 var_r0_3; + u16 temp_r0; + u16 temp_r1; + u16 temp_r1_2; + s32 var_r3; + bool var_lr; + s32 var_ip_2; + + var_r3 = 1; + var_lr = false; + + if (param1->mUnk_0C.UnkCheck1() && param1->mUnk_0C.GetTypeIndex1() == 0x01) { + var_lr = true; + } + + if (!var_lr) { + var_ip_2 = 0; + + if (param1->mUnk_0C.type_index == 0x102) { + temp_r0 = param1->mUnk_0C.unk_id; + + if (temp_r0 != 1 && temp_r0 != 3) { + + } else { + var_ip_2 = 1; + } + } + + if (var_ip_2 == 0) { + var_r3 = 0; + } + } + + if (var_r3 != 0) { + return; + } + + switch (param2) { + case 1: + if (!data_027e09a4->IsSceneModeAdventure()) { + return; + } + + temp_r1 = data_027e09a4->mUnk_5C; + var_r0_2 = data_ov000_020aa888.unk_00; + + if (var_r0_2 <= temp_r1) { + var_r0_2 = temp_r1; + } + + data_027e09a4->mUnk_5C = var_r0_2; + break; + case 2: + if (!data_027e09a4->IsSceneModeAdventure()) { + return; + } + + temp_r1_2 = data_027e09a4->mUnk_5C; + var_r0_3 = data_ov000_020aa888.unk_02; + + if (var_r0_3 <= temp_r1_2) { + var_r0_3 = temp_r1_2; + } + + data_027e09a4->mUnk_5C = var_r0_3; + break; + case 0: + default: + break; + } +} + +void Actor::func_ov017_020bf3e0(unk32 param1, fx32 param2) { + VecFx32 sp0; + + sp0 = this->mPos; + sp0.y += param2; + + if (data_027e09a4->IsTrain()) { + switch (param1) { + case 0: + case 1: + case 2: + func_ov000_02097f38(&sp0); + break; + case 3: + func_ov000_02097fcc(&sp0); + break; + default: + break; + } + + return; + } + + switch (param1) { + case 0: + func_ov000_02097ea0(&sp0); + break; + case 1: + func_ov000_02097e04(&sp0); + break; + case 2: + func_ov000_02097d4c(&sp0); + break; + default: + break; + } +} + +void Actor::func_ov017_020bf4b0(unk32 param1) { + if (param1 >= 0 && param1 < 8) { + ActorRef ref; + ActorRupee::func_ov031_020e8d2c(&ref, &this->mPos, param1, 2, this->mRef); + return; + } + + switch (param1) { + case 8: { + ActorRef ref; + ActorHeart::func_ov031_020eed64(&ref, &this->mPos, 1, this->mRef); + break; + } + case 13: { + ActorRef ref; + ActorUnkKEYN::func_ov070_0214143c(&ref, &this->mPos, this->mRef, -1, 0, 0); + break; + } + case 14: { + ActorRef ref; + ActorItemDrop::func_ov031_020f9f8c(&ref, &this->mPos, TreasureManager::func_ov000_020a9d78(-1), this->mRef); + break; + } + default: + break; + } +} + +void Actor::func_ov017_020bf574(unk32 param1, unk32 param2) { + func_ov000_020a1330(param1, this->mRef, this->mPos, this->mAngleStruct, 8, param2); +} + +void Actor::func_ov017_020bf5c4(VecFx32 *param1, unk32 param2, unk32 param3, unk32 param4, s16 param5) { + if (this->mUnk_46 & 0x01) { + data_027e09b4->func_01fff60c(param1, param2, param3, param4, param5, 0); + } else { + data_027e09b4->func_ov017_020c08c4(param1, param2, param3, param4, param5, 1); + } +} + +void Actor::func_ov017_020bf634(const VecFx32 *param1, u16 param2, unk32 param3) { + UNSET_FLAG(this->mFlags, ActorFlag_5); + + this->mTimerMax = param2; + this->mTimer = 0; + + this->mVel.x = param1->x; + this->mVel.z = param1->z; + this->mVel.y = 0; + + func_01ff9770(&this->mVel, param3); + + SET_FLAG(this->mFlags, ActorFlag_15); + this->mUnk_3C = NULL; +} + +void Actor::func_ov017_020bf688() { + SET_FLAG(this->mFlags, ActorFlag_15); + func_01ff93c0(&this->mVel, 0xC7B); + + if (this->mUnk_46 & 0x0C) { + this->mVel.x /= 2; + this->mVel.z /= 2; + } + + this->mUnk_3C = NULL; + + if (this->IsTimerOut()) { + SET_FLAG(this->mFlags, ActorFlag_5); + } +} + +void Actor::func_ov017_020bf710(UnkStruct_ActorUnkCANS_224 *param1, const VecFx32 *param2, u16 param3) { + UNSET_FLAG(this->mFlags, ActorFlag_5); + + this->mUnk_54 = param1; + func_ov000_02099870(param1, &this->mPos, param3); + + this->mTimerMax = param1->mUnk_0A - param1->mUnk_08; + this->mTimer = 0; + + this->mVel.x = param2->x; + this->mVel.z = param2->z; + this->mVel.y = 0; + + if (!VecFx32_IsCleared(&this->mVel)) { + func_01ff9770(&this->mVel, data_ov000_020aecfc); + } + + SET_FLAG(this->mFlags, ActorFlag_15); + this->mUnk_3C = NULL; +} + +void Actor::func_ov017_020bf7a8() { + SET_FLAG(this->mFlags, ActorFlag_15); + this->func_ov000_02098838(); + + UnkStruct_ActorUnkCANS_224 *temp_r4 = this->mUnk_54; + temp_r4->UpdateTimer(); + + func_01ff93c0(&this->mVel, 0xC7B); + + if (this->mUnk_46 & 0x0C) { + this->mVel.x /= 2; + this->mVel.z /= 2; + } + + if (this->mTimer < temp_r4->mUnk_0E) { + this->mUnk_3C = NULL; + } + + if (this->IsTimerOut()) { + temp_r4->Destroy(); + SET_FLAG(this->mFlags, ActorFlag_5); + } +} + +void Actor::func_ov017_020bf894(UnkStruct_ActorUnkCANS_224 *param1) { + if (this->mUnk_48 <= 0) { + param1->Destroy(); + return; + } + + param1->func_ov000_020998f0(this->mRef, &this->mPos); +} + +void Actor::vfunc_40() { + UNSET_FLAG(this->mFlags, ActorFlag_5); + this->mUnk_54 = NULL; + VecFx32_Copy(&data_027e07d4, &this->mVel); + SET_FLAG(this->mFlags, ActorFlag_15); + this->mUnk_3C = NULL; +} + +void Actor::vfunc_44() { + SET_FLAG(this->mFlags, ActorFlag_15); + + if (data_027e0d38->func_ov026_020d9c14(this->mRef, &this->mPos, &this->mVel) == 0) { + SET_FLAG(this->mFlags, ActorFlag_5); + } + + this->mAngle += data_ov000_020aecec; + this->mUnk_3C = NULL; +} + +void Actor::func_ov017_020bf99c() { + UNSET_FLAG(this->mFlags, ActorFlag_5); + VecFx32_Reset(&this->mVel); + this->mTimerMax = 1; + this->mTimer = 0; +} + +void Actor::func_ov017_020bf9c8(Actor *param1) { + if (param1 != 0) { + func_01ffb714(¶m1->mPos, &this->mPos, &this->mVel); + func_01ff97c8(&this->mVel, 0x1000); + return; + } + + u16 timerMax = this->mTimerMax; + u16 timer = this->mTimer; + + if (timer >= timerMax) { + SET_FLAG(this->mFlags, ActorFlag_5); + return; + } + + if (timer < timerMax) { + this->mTimer++; + } + + func_01ffb714(data_027e0ce0->func_01fff148(0), &this->mPos, &this->mVel); + func_01ff97c8(&this->mVel, 0x1000); +} + +void Actor::func_ov017_020bfa50(VecFx32 *param1, unk32 param2) { + UNSET_FLAG(this->mFlags, ActorFlag_5); + + this->mTimerMax = param2; + this->mTimer = 0; + + VecFx32 sp0; + func_01ffb714(param1, &this->mPos, &sp0); + + fx32 z = sp0.z / param2; + fx32 y = sp0.y / param2 + (this->mUnk_2C * param2) / 2; + fx32 x = sp0.x / param2; + + this->mVel.x = x; + this->mVel.y = y; + this->mVel.z = z; +} + +void Actor::func_ov017_020bfad4() { + this->mVel.y -= this->mUnk_2C; + + if (this->IsTimerOut()) { + SET_FLAG(this->mFlags, ActorFlag_5); + } +} + +void Actor::func_ov017_020bfb18(Actor_9C *param1) { + switch (param1->mUnk_1C) { + case 8: + if (param1->mUnk_0C.HasTypeIndexValue(0x102)) { + data_027e0ce0->func_ov000_0208bd20(param1->mUnk_0C.UnkCheck3(0x102), 0x8C98, 0); + } + + break; + case 4: + data_027e0d38->func_ov031_020d9c44(data_ov000_020aed00); + break; + case 12: { + Actor *pActor = gpActorManager->func_01fff3b4(param1->mUnk_0C); + + if (pActor != NULL) { + ((ActorItemBoomerang *) pActor)->func_ov031_020e49b0(0x8D70); + } + + break; + } + case 13: { + Cylinder sp14; + + this->vfunc_10(&sp14); + + VecFx32 sp8; + sp8 = param1->mUnk_10; + VecFx32_TryNormalize(&sp8); + sp8.x = -sp8.x; + sp8.y = -sp8.y; + sp8.z = -sp8.z; + + fx32 size = sp14.size; + + s16 temp_r2 = func_01ffbbe0(sp8.x, sp8.z); + + fx16 sin = SIN((u16) (s16) temp_r2); + fx16 cos = COS((u16) (s16) temp_r2); + + sp14.pos.x += MUL_FX32(sin, size); + sp14.pos.z += MUL_FX32(cos, size); + + Vec3s sp0; + sp0.x = sp8.x; + sp0.y = sp8.y; + sp0.z = sp8.z; + + func_ov031_020f439c(&sp14, &sp0, 0x8D78); + break; + } + case 7: { + Actor *pActor = gpActorManager->func_01fff3b4(param1->mUnk_0C); + + if (pActor != NULL) { + ((ActorUnkSWBM *) pActor)->func_ov031_020e6d48(); + } + + break; + } + default: + break; + } +} + +bool Actor::vfunc_14(Cylinder *param1) { + Cylinder sp0; + + if (this->mUnk_34 == 0) { + return false; + } + + this->vfunc_10(&sp0); + func_01ffce1c(param1, &sp0); + return true; +} + +bool Actor::func_ov017_020bfd9c(Vec2s *param1, unk32 param2, UnkStruct_027e09bc_0C *param3, AABB *param4) { + struct { + Cylinder unk_00; + fx32 unk_10; + } sp4; + + sp4.unk_00.size = 0; + sp4.unk_00.pos.x = 0; + sp4.unk_00.pos.y = 0; + sp4.unk_00.pos.z = 0; + + if (this->vfunc_14(&sp4.unk_00)) { + if (param4 != NULL) { + bool var_r9 = false; + + //! TODO: fake match? + bool var_r3 = param4->max.x >= *(fx32 *) ¶m4->min.x && param4->max.y >= param4->min.y; + + if (var_r3 != 0 && param4->max.z >= param4->min.z) { + var_r9 = true; + } + + if (var_r9) { + if (sp4.unk_00.pos.x < param4->min.x - sp4.unk_00.size || param4->max.x + sp4.unk_00.size < sp4.unk_00.pos.x || + sp4.unk_00.pos.y < param4->min.y - sp4.unk_10 || param4->max.y < sp4.unk_00.pos.y || + sp4.unk_00.pos.z < param4->min.z - sp4.unk_00.size || param4->max.z + sp4.unk_00.size < sp4.unk_00.pos.z) { + return false; + } + } + } + + unk8 value = this->mpProfile->mUnk_16[param2]; + Vec2s sp0; + sp0.x = param1->x; + sp0.y = param1->y; + return param3->func_01ffd768(&sp4, &sp0, value); + } + + return false; +} + +bool Actor::vfunc_48(unk32 param1) { + VecFx32 *temp_r0; + VecFx32 sp0; + + temp_r0 = this->func_ov000_0209853c(param1); + sp0 = *temp_r0; + + func_01ffb714(&sp0, &this->mPos, &sp0); + + if (ABS(sp0.y) < data_ov000_020aed08 && func_01ff9258(sp0.x, sp0.z) < data_ov000_020aed04) { + return true; + } + + return false; +} diff --git a/src/017_CourseExec/Game/AdventureModeManager_15C_017.cpp b/src/017_CourseExec/Game/AdventureModeManager_15C_017.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/017_CourseExec/Game/AdventureModeManager_15C_20_00_017.cpp b/src/017_CourseExec/Game/AdventureModeManager_15C_20_00_017.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/017_CourseExec/ItemManager_017.cpp b/src/017_CourseExec/ItemManager_017.cpp new file mode 100644 index 00000000..0e6a7c29 --- /dev/null +++ b/src/017_CourseExec/ItemManager_017.cpp @@ -0,0 +1,19 @@ +#include "Item/ItemManager.hpp" + +void ItemManager::func_ov017_020bd2a0(bool param1, bool param2) { + bool itemEquipSuccessful = this->mInventory.TryEquipForcedItem(); + + if (this->mUnk_20 != NULL) { + if (itemEquipSuccessful) { + this->mUnk_20->func_ov031_020db844(this->mInventory.GetCurrentItem()); + } + + this->mUnk_20->func_ov102_02182fa8(param1, param2); + } +} + +void ItemManager::func_ov017_020bd2e8(void *param1) { + if (this->mUnk_20 != NULL) { + this->mUnk_20->func_ov102_02182ffc(param1); + } +} diff --git a/src/017_CourseExec/MapObject/MapObjectManager_017.cpp b/src/017_CourseExec/MapObject/MapObjectManager_017.cpp new file mode 100644 index 00000000..34fa6d1c --- /dev/null +++ b/src/017_CourseExec/MapObject/MapObjectManager_017.cpp @@ -0,0 +1,189 @@ +#include "MapObject/MapObject.hpp" +#include "MapObject/MapObjectManager.hpp" +#include "Physics/AABB.hpp" +#include "Unknown/UnkStruct_020499e0.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "Unknown/UnkStruct_027e09bc.hpp" +#include "Unknown/UnkStruct_027e0cd8.hpp" +#include "flags.h" +#include "math.hpp" +#include "nitro/fx.h" + +extern "C" void func_01ffedac(Vec2bCpp *, VecFx32 *); + +extern "C" unk32 func_ov000_02077480(); +extern "C" unk32 func_ov000_02080098(void *, void *, int, int, int, int); + +extern AABB data_027e0c90; + +bool MapObjectManager::func_ov017_020c007c(unk32 param1) { + bool var_r4; + MapObject **temp_r4 = this->mMapObjTableEnd; + MapObject **var_ip = this->mMapObjTable; + + while (var_ip != temp_r4 && *var_ip != NULL ? true : false) { + var_ip++; + } + + var_r4 = false; + + if (!(var_ip == temp_r4 || !data_020499e0.func_0201456c(param1))) { + var_r4 = true; + } + + return var_r4; +} + +void MapObjectManager::func_ov017_020c00dc(unk32 param1) { + s32 temp_r6 = data_0204a110.func_02019300(param1); + s32 temp_r5 = data_0204a110.func_02019340(param1); + + MapObject **var_r7 = this->mMapObjTable; + while (var_r7 != this->mUnk_08) { + if (*var_r7 != NULL) { + if ((*var_r7)->IsAlive() && ((temp_r6 != 0 && (*var_r7)->IsFlag2()) || (temp_r5 != 0 && (*var_r7)->IsFlag3()))) { + (*var_r7)->vfunc_0C(); + } + } + + var_r7++; + } + + if (temp_r5 == 0) { + return; + } + + s32 var_r5 = 0; + MapObject **var_r6 = this->mMapObjTable; + + //! TODO: fake match + while (var_r6 < *(MapObject ***) &this->mUnk_08) { + if (*var_r6 != NULL && !(*var_r6)->IsAlive()) { + this->func_ov000_0209c444(var_r5); + } + + var_r6++; + var_r5++; + } +} + +void MapObjectManager::func_ov017_020c01c8(void *param1) {} + +void MapObjectManager::func_ov017_020c01cc(unk32 param1) { + MapObject **var_r6 = this->mMapObjTable; + + while (var_r6 != this->mUnk_08) { + MapObject *pMapObj = *var_r6; + + if (pMapObj != NULL && pMapObj->IsAlive() && pMapObj->func_01fff590(param1) != 0) { + pMapObj->vfunc_14(param1); + } + + var_r6++; + } +} + +void MapObjectManager::func_ov017_020c023c(s8 *param1) { + if (data_027e0cd8->func_ov000_02082124()) { + return; + } + + MapObject **var_r5 = this->mMapObjTable; + + while (var_r5 != this->mUnk_08) { + MapObject *pMapObj = *var_r5; + + if (pMapObj != NULL && pMapObj->IsAlive()) { + pMapObj->vfunc_18(param1); + } + + var_r5++; + } +} + +void MapObjectManager::func_ov017_020c02ac(volatile unk32 param1, Vec2bCpp param2) { + MapObject *pMapObj = this->func_01fff498(param2); + + if (pMapObj != NULL) { + pMapObj->vfunc_20(param1); + } +} + +void MapObjectManager::func_ov017_020c02f4(volatile unk32 param1, VecFx32 *param2) { + Vec2bCpp sp0; + func_01ffedac(&sp0, param2); + this->func_ov017_020c02ac(param1, sp0); +} + +void MapObjectManager::func_ov017_020c033c(unk32 *param1, MapObjectManager *thisx, const Vec2s *param2, unk32 param3, + unk32 param4) { + struct { + unk32 unk_00; + unk32 unk_04; + unk32 unk_08; + unk32 unk_0C; + unk32 unk_10; + unk32 unk_14; + } sp20; + + UnkStruct_027e09bc *temp_r4 = data_027e09bc; + UnkStruct_027e09bc_0C *temp_r0 = temp_r4->func_ov000_02077468(param4, func_ov000_02077480()); + bool var_r4 = false; + Vec2bCpp sp14(0, 0); + Vec2bCpp sp12(0, 0); + + Vec2s sp1A; + sp1A.x = param2->x; + sp1A.y = param2->y; + + if (temp_r0->func_ov000_02076fa8(&sp20, &sp1A, 0, data_027e0c90.max.y) != 0 && + func_ov000_02080098(&sp14, &sp12, sp20.unk_00 - 0x1000, sp20.unk_08 - 0x1000, sp20.unk_0C + 0x800, + sp20.unk_14 + 0x1000) != 0) { + var_r4 = true; + } + + if (var_r4) { + Vec2bCpp sp10(0, 0); + + for (s16 spC = sp12.y; sp14.y <= spC; spC--) { + sp10.y = spC; + + for (s16 var_r7 = sp14.x; var_r7 <= sp12.x; var_r7++) { + sp10.x = var_r7; + + MapObject *pMapObj = thisx->func_01fff498(sp10); + + if (pMapObj != NULL) { + MapObjFlags flags = pMapObj->mFlags[0]; + + if (GET_FLAG2(flags, MapObjFlag_Alive) && GET_FLAG2(flags, param3 + 9) && pMapObj->mUnk_10 != NULL) { + Vec2s sp16; + + sp16.x = param2->x; + sp16.y = param2->y; + + if (pMapObj->func_ov000_0209d144(&sp16, param3, temp_r0)) { + *param1 = *(s32 *) &pMapObj->mUnk_38; + return; + } + } + } + } + } + } + + *param1 = 0; +} + +// https://decomp.me/scratch/ceRYG +unk32 MapObjectManager::func_ov017_020c050c(unk32 param1, unk32 param2, unk32 param3, unk32 param4) { + Vec2bCpp sp0 = *(Vec2bCpp *) ((u8 *) ¶m1 + 2); + + MapObject *pMapObj = this->func_01fff498(sp0); + + if (pMapObj != NULL) { + return pMapObj->vfunc_28(param2, param3, param4); + } + + return -1; +} diff --git a/src/017_CourseExec/MapObject/MapObjectSwitchStep_017.cpp b/src/017_CourseExec/MapObject/MapObjectSwitchStep_017.cpp new file mode 100644 index 00000000..952a3118 --- /dev/null +++ b/src/017_CourseExec/MapObject/MapObjectSwitchStep_017.cpp @@ -0,0 +1,67 @@ +#include "MapObject/MapObjectSwitchStep.hpp" +#include "nitro/math.h" + +extern "C" void func_01ff91b8(unk16 *, fx32, fx32); +extern "C" fx32 func_01ffb464(fx32); + +void MapObjectSwitchStep::vfunc_08() { + s16 sp0 = this->mUnk_40.mUnk_60; + + switch (this->mState) { + case 0: + func_01ff91b8(&sp0, 0, 0x66); + break; + case 1: + if (this->mUnk_E8 > 0) { + func_01ff91b8(&sp0, -FLOAT_TO_FX32(0.1f), func_01ffb464(INT_TO_FX32(this->mUnk_E8))); + } + + if (this->mUnk_E8 <= 0) { + this->func_ov000_0209e11c(2, 0); + } + + this->mUnk_E8--; + break; + case 2: + if (this->mUnk_20.mParams[0] != 0) { + if (this->mUnk_20.mParams[0] == 2) { + if (!this->func_ov000_0209d29c(1)) { + if (this->mUnk_EA == 0 && (this->mUnk_E4 >= this->mUnk_E6 || !this->func_ov000_0209d29c(0))) { + this->func_ov000_0209e11c(0, 0); + sp0 = this->mUnk_40.mUnk_60; + } else { + if (this->mUnk_EA != 0 && (this->mUnk_E4 >= this->mUnk_E6 || !this->func_ov000_0209d29c(0))) { + this->func_ov000_0209e11c(3, 0); + } else { + this->func_ov000_0209e38c(); + } + } + } + } else if (this->mUnk_EA == 0) { + this->func_ov000_0209e11c(0, 0); + } + } + break; + case 3: + if (this->mUnk_EA == 0) { + this->func_ov000_0209e11c(0, 0); + sp0 = this->mUnk_40.mUnk_60; + } + + break; + default: + break; + } + + this->mUnk_40.mUnk_60 = sp0; + this->mUnk_EA = 0; + + if (this->mUnk_E4 < this->mUnk_E6) { + this->mUnk_E4++; + } +} + +void MapObjectSwitchStep::vfunc_14(unk32 param1) { + this->mUnk_40.func_ov000_0209dde0(); + this->mUnk_40.vfunc_18(&this->mPos); +} diff --git a/src/017_CourseExec/MapObject/MapObject_017.cpp b/src/017_CourseExec/MapObject/MapObject_017.cpp new file mode 100644 index 00000000..4a81060c --- /dev/null +++ b/src/017_CourseExec/MapObject/MapObject_017.cpp @@ -0,0 +1,11 @@ +#include "MapObject/MapObject.hpp" + +void MapObject::vfunc_08() {} + +void MapObject::vfunc_0C() {} + +void MapObject::vfunc_10() {} + +void MapObject::vfunc_14(unk32 param1) {} + +void MapObject::vfunc_18(s8 *param1) {} diff --git a/src/017_CourseExec/Player/PlayerActorBase_70_017.cpp b/src/017_CourseExec/Player/PlayerActorBase_70_017.cpp new file mode 100644 index 00000000..d11df3af --- /dev/null +++ b/src/017_CourseExec/Player/PlayerActorBase_70_017.cpp @@ -0,0 +1,138 @@ +#include "Player/PlayerActorBase.hpp" +#include "Unknown/UnkStruct_027e09ac.hpp" +#include "Unknown/UnkStruct_027e09b4.hpp" +#include "Unknown/UnkStruct_027e0d34.hpp" +#include "global.h" +#include "math.hpp" +#include "nitro/fx.h" +#include "nitro/math.h" + +extern "C" void func_01ffb714(VecFx32 *, VecFx32 *, void *); + +void PlayerActorBase_70::func_ov017_020bbaa8(VecFx32 *param1, UnkAngleStruct param2) { + if (this->mCharacter == PlayerCharacter_Link) { + ModelRender_Derived4 *var_r5 = this->mUnk_00C.GetUnk08OrUnk0C(this->mUnk_126 != 0); + + var_r5->mUnk_BC = this->mUnk_114; + var_r5->func_ov000_02057fe8(this->mUnk_124, param2, param1); + + if (this->mUnk_114 != NULL) { + VecFx32 sp4; + + func_01ffb714(&this->mUnk_114[PlayerCharacter_Link].wColumn, param1, &sp4); + VecFx32_Copy(&sp4, &this->mUnk_0E4.mUnk_0C[PlayerCharacter_Link]); + + func_01ffb714(&this->mUnk_114[PlayerCharacter_Phantom].wColumn, param1, &sp4); + VecFx32_Copy(&sp4, &this->mUnk_0E4.mUnk_0C[PlayerCharacter_Phantom]); + + func_01ffb714(&this->mUnk_114[PlayerCharacter_Zelda].wColumn, param1, &sp4); + VecFx32_Copy(&sp4, &this->mUnk_0E4.mUnk_0C[PlayerCharacter_Zelda]); + + if (this->mUnk_126 != 0) { + ModelRender_Derived4 *temp_r1 = (ModelRender_Derived4 *) this->mUnk_00C.GetUnk08(); + VecFx32_Copy(&var_r5->mUnk_68, &temp_r1->mUnk_68); + } else { + ModelRender_Derived4 *temp_r1_2 = (ModelRender_Derived4 *) this->mUnk_00C.GetUnk0C(); + VecFx32_Copy(&var_r5->mUnk_68, &temp_r1_2->mUnk_68); + } + } + } else { + ModelRender_Derived4 *var_r4 = this->mUnk_00C.GetUnk08OrUnk0C(this->mUnk_126 != 0); + + var_r4->func_ov093_0216ca38(this->mUnk_127, this->mUnk_128, this->mUnk_126 != 0, this->mUnk_12A); + var_r4->func_ov000_02057fe8(this->mUnk_124, param2, param1); + + if (this->mUnk_126 != 0) { + ModelRender_Derived4 *temp_r1_3 = (ModelRender_Derived4 *) this->mUnk_00C.GetUnk08(); + VecFx32_Copy(&var_r4->mUnk_68, &temp_r1_3->mUnk_68); + } else { + ModelRender_Derived4 *temp_r1_4 = (ModelRender_Derived4 *) this->mUnk_00C.GetUnk0C(); + VecFx32_Copy(&var_r4->mUnk_68, &temp_r1_4->mUnk_68); + } + } +} + +struct UnkStackStruct { + /* 00 */ VecFx32 unk_00; + /* 0C */ STRUCT_PAD(0x0C, 0x12); + /* 12 */ s16 unk_12; + /* 13 */ STRUCT_PAD(0x13, 0x50); + /* 50 */ +}; + +extern unk16 data_ov000_020ab318; +extern unk16 data_ov000_020ab31c; +extern "C" void func_ov017_020c1104(UnkStackStruct *param1, VecFx32 *param2, unk16 param3, unk32 param4); +extern "C" void func_ov017_020c117c(UnkStackStruct *param1, VecFx32 *param2, unk16 param3); +extern "C" void func_ov017_020c12fc(UnkStackStruct *param1, u8 param2, unk16 param3); + +struct UnkStruct_ov021_02106c5c { + /* 00 */ STRUCT_PAD(0x00, 0x13); + /* 13 */ u8 unk_13; +}; +extern "C" const UnkStruct_ov021_02106c5c *func_ov021_020ea868(int index); + +void PlayerActorBase_70::func_ov017_020bbcd8(VecFx32 *param1, UnkAngleStruct param2) { + UnkStackStruct sp28; + VecFx32 sp1C; + VecFx32 sp10; + s16 temp_r9; + u8 var_r7; + + VecFx32_Add(param1, (VecFx32 *) &this->mUnk_118, &sp1C); + + if (this->mUnk_126 != 0) { + this->mUnk_01C->func_ov000_0208c7b0(&sp1C, param2); + } else { + this->func_ov017_020bbaa8(&sp1C, param2); + } + + VecFx32_Add(&sp1C, &this->mUnk_0E4.mUnk_00, &sp10); + sp10.y = sp1C.y; + + var_r7 = Get_ov000_020ab4dc(this->mCharacter)->mUnk_83; + + if (this->mUnk_008 == -1 && this->mCharacter == PlayerCharacter_Link) { + if (!data_027e0d34->func_ov031_020d9ab8()) { + func_ov017_020c1104(&sp28, &sp10, data_ov000_020ab31c, 4); + + sp28.unk_12 = this->mUnk_132; + VecFx32_Add(&sp1C, &this->mUnk_0E4.mUnk_0C[PlayerCharacter_Link], &sp10); + temp_r9 = data_ov000_020ab318; + + func_ov017_020c117c(&sp28, &sp10, temp_r9); + VecFx32_Add(&sp1C, &this->mUnk_0E4.mUnk_0C[PlayerCharacter_Phantom], &sp10); + + func_ov017_020c117c(&sp28, &sp10, temp_r9); + func_ov017_020c12fc(&sp28, var_r7, 0x6000); + } + } else { + unk16 unk_6C = Get_ov000_020ab4dc(this->mCharacter)->mUnk_6C; + + if (this->mCharacter != PlayerCharacter_Link) { + sp10.y += 0x19A; + } else { + var_r7 = func_ov021_020ea868(this->mUnk_008)->unk_13; + } + + fx32 value = ROUND_FX32(data_027e09b4->mUnk_304 * this->mUnk_132); + + data_027e09b4->func_ov017_020c0970(&sp10, unk_6C, unk_6C, var_r7, 0xC, data_027e09ac->mUnk_014.mUnk_06, value); + } +} + +void PlayerActorBase_70::func_ov017_020bbef4(VecFx32 *param1, UnkAngleStruct param2) { + VecFx32 sp0; + ModelRender_Derived3 *var_r4; + + VecFx32_Add(param1, (VecFx32 *) &this->mUnk_118, &sp0); + var_r4 = this->mUnk_00C.GetUnk08OrUnk0C(this->mUnk_126 != 0); + + var_r4->mRenderObj.flag |= 0x02; + this->func_ov017_020bbaa8(&sp0, param2); + var_r4->mRenderObj.flag &= ~0x02; +} + +void PlayerActorBase_70::func_ov017_020bbf6c() { + this->mUnk_01C->func_ov000_0208c7f0(); +} diff --git a/src/017_CourseExec/Player/PlayerLinkActor_017.cpp b/src/017_CourseExec/Player/PlayerLinkActor_017.cpp new file mode 100644 index 00000000..107266b3 --- /dev/null +++ b/src/017_CourseExec/Player/PlayerLinkActor_017.cpp @@ -0,0 +1,341 @@ +#include "Player/PlayerLink.hpp" +#include "Unknown/UnkStruct_0204a088.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "Unknown/UnkStruct_0204af1c.hpp" +#include "Unknown/UnkStruct_027e0998.hpp" +#include "Unknown/UnkStruct_027e0cd8.hpp" +#include "Unknown/UnkStruct_027e0ce0.hpp" +#include "Unknown/UnkStruct_027e0cec.hpp" +#include "global.h" +#include "nitro/fx.h" +#include "nitro/math.h" +#include "nitro/types.h" + +extern "C" bool func_ov000_020864f8(void *, UnkAngleStruct, void *, void *); + +bool PlayerLinkActor::func_ov017_020bd6b8() { + bool ret = false; + + if (!(this->mUnk_38.mUnk_00.mUnk_08 != 0 || this->mUnk_0A0->mUnk_68 == 0x32)) { + ret = true; + } + + return ret; +} + +unk32 PlayerLinkActor::func_ov017_020bd6e0(bool param1) { + if (data_027e0ce0->mUnk_24 != 0) { + return data_027e0ce0->mUnk_24->func_ov021_020eaef0(this->mUnk_4C, param1); + } + + if (!param1 && this->func_ov000_0208cc90()) { + return 1; + } + + if (data_027e0cd8->mUnk_0C->func_ov000_0208217c(&this->mPos, 1)) { + return 2; + } + + return 0; +} + +void PlayerLinkActor::func_ov017_020bd758() { + if (!this->func_ov000_0208db08()) { + this->mUnk_0B8 = 6; + return; + } + + if (this->mUnk_0B8 != 0) { + this->mUnk_0B8--; + } +} + +void PlayerLinkActor::func_ov017_020bd788(bool param1) { + STACK_PAD(0x10); + + VecFx32_Copy(&this->mPos, &this->mPrevPos); + + if (this->func_ov000_0208d754() != 0) { + this->mUnk_138.func_ov000_020609c4(); + } else { + this->mUnk_138.func_ov000_02060b64(); + } + + this->mUnk_5C.func_ov000_02089f0c(param1); + + if (this->mUnk_0B7 != 0) { + this->mUnk_0B7--; + } + + if (this->mUnk_0B9 != 0) { + if (this->mUnk_0BA != 0) { + this->mUnk_0BC.func_ov000_020609c4(); + } else { + this->func_ov000_0208d3fc(); + } + } + + if (this->mUnk_134 != NULL) { + this->mUnk_134->func_ov031_020db160(param1); + } + + this->mUnk_70->func_ov000_02082e54(); + + if (param1) { + unk32 var_r4 = -1; + + if (this->mUnk_0A0->func_ov000_02091f08(0x0B) || this->mUnk_0A0->func_ov000_02091f08(0x0F)) { + VecFx32_Reset(&this->mVel); + } else { + if (this->mUnk_09C->mUnk_090 >= 0 && !this->mUnk_0A0->func_ov000_020936c4()) { + var_r4 = 3; + + if (this->mUnk_0A0->mUnk_68 != 0x16) { + this->mUnk_0A0->func_ov000_020921e4(0x16); + } + } else if (this->mUnk_0A0->mUnk_74 >= 0) { + var_r4 = 0; + } else { + PlayerLinkActor_A0 *ptr = this->mUnk_0A0; + + if (this->mUnk_58->Unk78HasValue()) { + var_r4 = 2; + } else if (ptr->func_ov000_020936c4()) { + var_r4 = 1; + } + } + + if (var_r4 == -1) { + var_r4 = 0; + + if (this->mUnk_0A0->mUnk_68 != 0x70) { + this->mVel.x = 0; + this->mVel.z = 0; + } + + this->func_ov000_0208cbf0(); + } else { + this->func_ov000_0208cbf0(); + } + } + + this->mUnk_09C->mUnk_098 = 0x1000; + VecFx32_Reset(&this->mAccel); + this->mUnk_0A0->func_ov000_02092648(1); + + if (this->mUnk_58->Unk78HasValue()) { + this->func_ov000_0208d60c(); + } + + PlayerCharacter temp_r6 = this->mCharacter; + PlayerActorBase_70 *temp_r7 = this->mUnk_70; + temp_r7->func_ov000_020830a4(this->func_ov017_020bd6e0(1), temp_r6, 1, 1, this->func_ov000_0208dc98()); + + if (var_r4 != -1) { + if (!this->mUnk_09C->func_ov017_020bc640(var_r4, true, this->mUnk_0A0->func_ov000_0209360c(), + this->mUnk_0A0->func_ov000_02093650(), this->func_ov017_020bd6b8(), + &this->mAccel, &this->mPos, &this->mVel)) { + if (var_r4 != 1 && this->mUnk_0A0->mUnk_68 != 0x16) { + this->mUnk_0A0->func_ov000_020921e4(0x16); + } + } + } + + this->mUnk_0A4.mUnk_08 = 0; + this->func_ov017_020bd758(); + + PlayerActorBase_70 *temp_r5_3 = this->mUnk_70; + temp_r5_3->func_ov000_020830d4(this->mAngleStruct, this->mUnk_0A0->func_ov000_02093718(), + this->mUnk_0A0->func_ov000_0209378c(), this->mUnk_0A0->mUnk_28); + + this->mUnk_0B0 = data_0204a088->mUnk_04; + return; + } + + if (this->mInvincibilityTimer != 0) { + this->mInvincibilityTimer--; + } + + if (this->mInvincibilityIconTimer != 0) { + this->mInvincibilityIconTimer--; + } + + unk32 var_r5_2 = 0; + + if (this->mUnk_09C->mUnk_090 >= 0 && !this->mUnk_0A0->func_ov000_020936c4()) { + var_r5_2 = 3; + + if (this->mUnk_0A0->mUnk_68 != 0x16) { + this->mUnk_0A0->func_ov000_020921e4(0x16); + } + } + + this->func_ov000_0208cbf0(); + this->mUnk_09C->mUnk_098 = 0x1000; + VecFx32_Reset(&this->mAccel); + this->mUnk_0A0->func_ov000_02092648(0); + + if (this->mUnk_58->Unk78HasValue()) { + this->func_ov000_0208d60c(); + } + + PlayerCharacter temp_r6_4 = this->mCharacter; + PlayerActorBase_70 *temp_r7_2 = this->mUnk_70; + temp_r7_2->func_ov000_020830a4(this->func_ov017_020bd6e0(0), temp_r6_4, 1, 1, this->func_ov000_0208dc98()); + + if (this->mUnk_58->Unk78HasValue()) { + var_r5_2 = 2; + } else if (this->mUnk_0A0->func_ov000_020936c4()) { + var_r5_2 = 1; + } + + if (!this->mUnk_09C->func_ov017_020bc640(var_r5_2, param1, this->mUnk_0A0->func_ov000_0209360c(), + this->mUnk_0A0->func_ov000_02093650(), this->func_ov017_020bd6b8(), &this->mAccel, + &this->mPos, &this->mVel)) { + if (var_r5_2 != 1 && this->mUnk_0A0->mUnk_68 != 0x16) { + this->mUnk_0A0->func_ov000_020921e4(0x16); + } + } else if (var_r5_2 == 0) { + bool var_r1; + + if (this->mUnk_09C->mUnk_0DE < 0 && !(this->mUnk_09C->mUnk_0DC & 0x20)) { + var_r1 = true; + } else { + var_r1 = false; + } + + this->mUnk_0A4.func_ov000_02089998(var_r1); + } else { + this->mUnk_0A4.mUnk_08 = false; + } + + this->func_ov017_020bd758(); + + PlayerActorBase_70 *temp_r5_4 = this->mUnk_70; + temp_r5_4->func_ov000_020830d4(this->mAngleStruct, this->mUnk_0A0->func_ov000_02093718(), + this->mUnk_0A0->func_ov000_0209378c(), this->mUnk_0A0->mUnk_28); + + this->mUnk_0A0->func_ov000_02092e38(); + this->mUnk_0B0 = data_0204a088->mUnk_04; +} + +void PlayerLinkActor::func_ov017_020bdcf4(unk32 param1, unk32 param2) { + this->mUnk_78.func_ov000_0205c5d0(param1, this); + + if (this->mUnk_78.mUnk_08[0] != 0 || this->mUnk_78.mUnk_08[1] != 0) { + this->func_ov000_0208d7f0(this->func_ov000_0208d754()); + } else { + UnkStruct_027e0cec *ptr = data_027e0cec; + + for (PlayerLinkActor_1B0 *var_r9 = this->mUnk_1B0; var_r9 != &this->mUnk_1B0[ARRAY_LEN(this->mUnk_1B0)]; var_r9++) { + ptr->func_ov000_020a0110(var_r9); + } + } + + this->mUnk_0A0->func_ov000_02092ea8(param1, param2); +} + +void PlayerLinkActor::func_ov017_020bdd84(void *param1, unk32 param2) { + VecFx32 sp10; + s32 spC; + s8 sp8; + bool var_r2; + bool temp_r1_2; + Mat4x3p *temp_r4; + bool var_r5; + + //! TODO: figure out param1's type (most likely data_0204a110.mUnk_DF8) + if (this->mUnk_38.mUnk_00.mUnk_08 == 0 && this->mUnk_78.mUnk_08[(unk32) param1] != 0) { + var_r5 = true; + } else { + var_r5 = false; + } + + if (var_r5) { + if (param2 != 0) { + if (this->mUnk_74 != 0) { + this->mUnk_70->func_ov017_020bbef4(&this->mPos, this->mAngleStruct); + } + } else { + this->mUnk_70->func_ov017_020bbcd8(&this->mPos, this->mAngleStruct); + } + + if (param1 == NULL && data_0204a110.func_02019514() == 0) { + if (this->mUnk_134 != NULL) { + this->func_ov000_0208cc20(&sp10); + PlayerLinkActor_134 *temp_r1 = this->mUnk_134; + + if (temp_r1->mUnk_04 > 0) { + UnkSystem7_UnkStruct_00 *temp_r0 = temp_r1->mUnk_00.mUnk_00; + + if (temp_r0 != NULL) { + temp_r0->mUnk_28.x = sp10.x + temp_r0->mUnk_20->mUnk_00->mUnk_04.x; + temp_r0->mUnk_28.y = sp10.y + temp_r0->mUnk_20->mUnk_00->mUnk_04.y; + temp_r0->mUnk_28.z = sp10.z + temp_r0->mUnk_20->mUnk_00->mUnk_04.z; + } + } + } + + if (this->mUnk_74 != 0) { + temp_r4 = this->mUnk_70->mUnk_114; + + sp8 = 0; + spC = 0; + + temp_r1_2 = func_ov000_020864f8(&this->mUnk_09C->mUnk_0DC, this->mUnk_09C->mUnk_5A, &sp8, &spC); + this->mUnk_74->func_ov102_02182c84(temp_r1_2, spC, this->mAngleStruct, &temp_r4[0], &temp_r4[1]); + } + } + } + + if (var_r5 && param2 == 0) { + var_r2 = true; + } else { + var_r2 = false; + } + + this->mUnk_0A0->func_ov000_02092ecc(param1, var_r2); +} + +void PlayerLinkActor::func_ov017_020bdf48(s8 *param1, unk32 param2, void *param3, UnkStruct_ov019_020d24c8_28_258_00 *param4) { + Vec2s sp8; + ActorGrabParams sp4; + + if (this->func_ov000_0208d3a8() != 0) { + return; + } + + if (!this->mUnk_0A0->func_ov000_02091f08(0x0D) && param1[1] == 1) { + sp4 = this->mUnk_50; + + if (!data_027e0998->vfunc_00(&this->mPos, &sp8, &sp4.mUnk_00)) { + return; + } + + if (param4 != 0) { + data_0204af1c.func_0201aa44(param4, &sp8, param2, param3); + } + + if (this->mUnk_0B9 != 0) { + if (this->mUnk_0BA == 0) { + return; + } + + if (this->mUnk_0BB != 0) { + sp8.y += 10; + } else { + sp8.y -= 10; + } + + data_0204af1c.func_0201aad0(&this->mUnk_0BC, &sp8, param2, param3); + } else if (this->func_ov000_0208d754()) { + data_0204af1c.func_0201aad0(&this->mUnk_138, &sp8, param2, param3); + } else { + this->func_ov000_0208d3d0(&sp8, param2, param3); + } + } +} + +void PlayerLinkActor::func_ov017_020be098() { + this->mUnk_0A0->func_ov000_02093fe8(); +} diff --git a/src/017_CourseExec/Player/PlayerLinkActor_A0_20_017.cpp b/src/017_CourseExec/Player/PlayerLinkActor_A0_20_017.cpp new file mode 100644 index 00000000..397f65ef --- /dev/null +++ b/src/017_CourseExec/Player/PlayerLinkActor_A0_20_017.cpp @@ -0,0 +1,89 @@ +#include "Player/PlayerLink.hpp" +#include "Unknown/UnkStruct_027e0954.hpp" +#include "Unknown/UnkStruct_027e09bc.hpp" + +void PlayerLinkActor_A0_38::func_ov017_020be0a8(unk32 param1) { + if (param1 != 0) { + this->mUnk_30 += 0x2454; + this->mUnk_32 = 12; + return; + } + + if (this->mUnk_32 > 0) { + this->mUnk_32--; + } +} + +void PlayerLinkActor_A0_38::func_ov017_020be0e0(s32 param1, VecFx32 *param2, bool param3, bool param4) { + if (param3 || this->mUnk_32 > 0) { + bool var_r6 = false; + + if (param4) { + this->mUnk_2C.y = this->mUnk_00.y; + this->mUnk_2C.x = this->mUnk_00.x; + this->mUnk_34 |= 0x03; + var_r6 = true; + } else if (data_027e09bc->mUnk_04[param1]->func_01ffd43c(&this->mUnk_2C, param2, 0x01)) { + var_r6 = true; + + if (this->mUnk_37 == 0 || UnknownCheck1(0x01, this->mUnk_2C.x, 170, 92) || + UnknownCheck1(0x02, this->mUnk_2C.y, 125, 88)) { + if (this->mUnk_2C.x < SUBSCREEN_WIDTH / 2) { + this->mUnk_34 |= 0x01; + } else { + this->mUnk_34 &= ~0x01; + } + + if (this->mUnk_2C.y < SUBSCREEN_HEIGHT / 2) { + this->mUnk_34 |= 0x02; + } else { + this->mUnk_34 &= ~0x02; + } + } + + if (this->mUnk_34 & 1) { + this->mUnk_2C.x += 19; + } else { + this->mUnk_2C.x -= 92; + } + + if (this->mUnk_34 & 2) { + this->mUnk_2C.y -= 4; + } else { + this->mUnk_2C.y -= 87; + } + } + + if (var_r6) { + int x = this->mUnk_2C.x + 32; + int y = this->mUnk_2C.y + 32; + + if (x >= -72 && x < 328 && y >= -72 && y < 264) { + this->mUnk_36 = param3; + + { + UnkStruct_027e0954 *ptr = data_027e0954; + PlayerLinkActor_A0_38_04 *pList = GetLinkListRef(this->mUnk_04); + ptr->mUnk_00[1].mUnk_04.Prepend(pList); + } + + { + UnkStruct_027e0954 *ptr = data_027e0954; + PlayerLinkActor_A0_38_18 *pList = GetLinkListRef(this->mUnk_18); + ptr->mUnk_00[0].mUnk_04.Prepend(pList); + } + + this->mUnk_37 = true; + return; + } + + this->mUnk_37 = false; + return; + } + + this->mUnk_37 = false; + return; + } + + this->mUnk_37 = false; +} diff --git a/src/017_CourseExec/Save/SaveManager_017.cpp b/src/017_CourseExec/Save/SaveManager_017.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/017_CourseExec/Train/UnkStruct_027e0cf8_017.cpp b/src/017_CourseExec/Train/UnkStruct_027e0cf8_017.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/017_CourseExec/UnkStruct_027e09a4_017.cpp b/src/017_CourseExec/UnkStruct_027e09a4_017.cpp new file mode 100644 index 00000000..b0a3d108 --- /dev/null +++ b/src/017_CourseExec/UnkStruct_027e09a4_017.cpp @@ -0,0 +1,105 @@ +#include "Actor/ActorManager.hpp" +#include "MapObject/MapObjectManager.hpp" +#include "System/OverlayManager.hpp" +#include "Unknown/UnkStruct_0204a088.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "Unknown/UnkStruct_027e09a4.hpp" +#include "Unknown/UnkStruct_027e09ac.hpp" +#include "Unknown/UnkStruct_027e09b8.hpp" +#include "Unknown/UnkStruct_027e09bc.hpp" +#include "Unknown/UnkStruct_027e09c0.hpp" +#include "Unknown/UnkStruct_027e0cd8.hpp" +#include "Unknown/UnkStruct_027e0ce0.hpp" +#include "Unknown/UnkStruct_ov016_020b8310.hpp" + +void UnkStruct_027e09a4::func_ov017_020bb660(unk32 param1) { + if (data_0204a110.func_02019300(param1) != 0) { + if (this->mUnk_5C != 0) { + this->mUnk_5C--; + } + + this->mUnk_64++; + + if (this->mUnk_5C == 0) { + data_027e0cd8->func_ov000_02081b9c(param1); + } + } + + if (this->mUnk_5C == 0) { + if (!data_027e09b8->func_01ffd420()) { + data_027e0ce0->func_ov017_020bd4a0(param1, 0); + gpMapObjManager->func_ov005_020b6570(param1); + gpActorManager->func_ov005_020b66a4(param1); + } else { + data_027e0ce0->func_ov017_020bd4a0(param1, 1); + gpMapObjManager->func_ov017_020c00dc(param1); + gpActorManager->func_ov017_020becd8(param1); + + if (gOverlayManager.IsRabbitCapture()) { + UnkStruct_ov016_020b8310 *ptr = &data_ov016_020b8310; + ptr->vfunc_08(); + } + } + } + + if (data_0204a110.func_02019340(param1)) { + if (this->mUnk_5C == 0) { + data_027e09b8->func_ov000_0207332c(); + } + data_027e09c0->func_ov000_0207da40(); + } + + if (this->mUnk_5C == 0) { + data_027e09bc->vfunc_00(param1); + } + + data_027e09ac->func_ov000_020723f4(); +} + +void UnkStruct_027e09a4::func_ov017_020bb7f8(void *param1) { + if (data_0204a088->mUnk_120 & 0x02) { + data_027e0cd8->func_ov000_02081bf4(); + } + + if ((data_0204a088->mUnk_120 & 0x04) && data_027e09b8->mUnk_96) { + data_027e0ce0->func_ov017_020bd5dc(param1); + } + + if (data_0204a088->mUnk_120 & 0x08) { + gpMapObjManager->func_ov017_020c01cc((unk32) param1); //! TODO: change parameters + } + + if (data_0204a088->mUnk_120 & 0x10) { + if (data_027e09b8->mUnk_97) { + gpActorManager->func_01fff2fc(ActorManager::func_ov017_020bee84, param1); + } else { + gpActorManager->func_01fff2fc(ActorManager::func_ov017_020beea4, param1); + } + } + + if (gOverlayManager.IsRabbitCapture()) { + UnkStruct_ov016_020b8310 *ptr = &data_ov016_020b8310; + ptr->vfunc_10(param1); + } + + data_027e09ac->func_ov000_02072684(param1); +} + +void UnkStruct_027e09a4::func_ov017_020bb934(void *param1) { + data_027e0cd8->func_ov000_02081b84(); + data_027e0ce0->func_ov017_020bd5c4(param1); + gpMapObjManager->func_ov017_020c01c8(param1); + gpActorManager->func_01fff2fc(ActorManager::func_ov017_020bee64, param1); +} + +void UnkStruct_027e09a4::func_ov017_020bb994(s8 *param1) { + data_027e0cd8->func_ov000_02081d58(); + data_027e0ce0->func_ov017_020bd644(param1); + gpMapObjManager->func_ov017_020c023c(param1); + gpActorManager->func_01fff2fc(ActorManager::func_ov017_020beecc, param1); + + if (gOverlayManager.IsRabbitCapture()) { + UnkStruct_ov016_020b8310 *ptr = &data_ov016_020b8310; + ptr->vfunc_0C(param1); + } +} diff --git a/src/017_CourseExec/UnkStruct_027e09b4_017.cpp b/src/017_CourseExec/UnkStruct_027e09b4_017.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/017_CourseExec/UnkStruct_027e09c0_017.cpp b/src/017_CourseExec/UnkStruct_027e09c0_017.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/017_CourseExec/UnkStruct_027e0ce0_017.cpp b/src/017_CourseExec/UnkStruct_027e0ce0_017.cpp new file mode 100644 index 00000000..0d777b62 --- /dev/null +++ b/src/017_CourseExec/UnkStruct_027e0ce0_017.cpp @@ -0,0 +1,109 @@ +#include "MainGame/CargoManager.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "Unknown/UnkStruct_027e09b8.hpp" +#include "Unknown/UnkStruct_027e0ce0.hpp" + +void UnkStruct_027e0ce0::func_ov017_020bd4a0(unk32 param1, bool param2) { + unk32 temp_r4 = data_0204a110.func_02019300(param1); + + if (this->mUnk_24 != NULL) { + if (temp_r4 == 0) { + return; + } + + this->mUnk_24->func_ov021_020eab6c(param2); + } else { + if (this->mUnk_34 != NULL && temp_r4 != 0 && !param2) { + CargoManager::DoUpdate(); + } + + if (this->mUnk_38 != NULL) { + this->mUnk_38->func_ov026_020de19c(param1, param2); + + if (temp_r4 == 0) { + return; + } + } else if (this->mUnk_3C != NULL) { + this->mUnk_3C->func_ov088_0216fbf0(param1); + + if (temp_r4 == 0) { + return; + } + } else { + if (temp_r4 == 0) { + return; + } + + this->mUnk_40->func_ov102_0218303c(param2, this->mUnk_28); + } + } + + this->mUnk_30->func_ov017_020bc5fc(this->mUnk_28); +} + +void UnkStruct_027e0ce0::func_ov017_020bd568(unk32 param1) { + bool result = data_027e09b8->func_01ffd420(); + + if (this->mUnk_24 != NULL) { + this->mUnk_24->func_ov021_020eae2c(param1); + return; + } + + if (this->mUnk_38 == NULL && this->mUnk_3C == NULL) { + this->mUnk_40->func_ov102_02183180(param1, result); + } +} + +void UnkStruct_027e0ce0::func_ov017_020bd5c4(void *param1) { + if (this->mUnk_38 != NULL) { + this->mUnk_38->func_ov026_020de45c(param1); + } +} + +void UnkStruct_027e0ce0::func_ov017_020bd5dc(void *param1) { + if (this->mUnk_24 != NULL) { + this->mUnk_24->func_ov021_020eae84(); + return; + } + + if (this->mUnk_38 != NULL) { + this->mUnk_38->func_ov026_020de46c(); + return; + } + + if (this->mUnk_3C != NULL) { + this->mUnk_3C->func_ov088_0216fca0(); + return; + } + + if (this->mUnk_28 != NULL) { + this->mUnk_28->func_ov017_020bd2e8(param1); + } + + this->mUnk_40->func_ov102_021831b4(param1); +} + +void UnkStruct_027e0ce0::func_ov017_020bd644(void *param1) { + if (this->mUnk_24 != NULL) { + this->mUnk_24->func_ov021_020eb010(); + return; + } + + if (this->mUnk_38 != NULL) { + this->mUnk_38->func_ov026_020de49c(); + return; + } + + if (this->mUnk_3C != NULL) { + this->mUnk_3C->func_ov088_0216ff10(); + return; + } + + this->mUnk_40->func_ov102_021831f0(param1); +} + +void UnkStruct_027e0ce0::func_ov017_020bd69c() { + if (this->mUnk_40 != NULL) { + this->mUnk_40->mPlayer.func_ov017_020be098(); + } +} diff --git a/src/017_CourseExec/UnkStruct_027e0ce0_30_017.cpp b/src/017_CourseExec/UnkStruct_027e0ce0_30_017.cpp new file mode 100644 index 00000000..a6f71739 --- /dev/null +++ b/src/017_CourseExec/UnkStruct_027e0ce0_30_017.cpp @@ -0,0 +1,266 @@ +#include "Player/PlayerActorBase.hpp" +#include "Unknown/Common.hpp" +#include "Unknown/UnkStruct_0204a088.hpp" +#include "Unknown/UnkStruct_027e09b8.hpp" +#include "Unknown/UnkStruct_027e09bc.hpp" +#include "Unknown/UnkStruct_027e0ce0.hpp" +#include "nitro/fx.h" +#include "nitro/math.h" +#include "nitro/types.h" + +extern "C" unk32 func_01ffb9cc(VecFx32 *, VecFx32 *); +extern "C" void func_01ff9770(VecFx32 *, unk32); +extern "C" void func_01ffb714(VecFx32 *, VecFx32 *, void *); +extern "C" void func_01ff97c8(VecFx32 *, int); +extern "C" unk32 func_ov000_02078aec(); +extern "C" unk32 func_ov000_0205b090(); +extern "C" unk32 func_ov000_0205b0ac(s16 param1); +extern "C" unk32 func_01ffb428(unk32, unk32); +extern "C" unk32 func_01ffbbe0(); +extern "C" unk32 func_ov000_0208832c(s16, unk32); + +extern u16 data_ov000_020afd08; +extern unk32 data_ov000_020afd0c; +extern unk32 data_ov000_020afd10; +extern const unk32 data_ov000_020afd14; +extern unk32 data_ov000_020afd18; + +// https://decomp.me/scratch/jtWsb +void UnkStruct_027e0ce0_30_00::func_ov017_020bbf7c(ItemManager *pItemMgr) { + VecFx32 sp4C; + UnkStackStruct_ov000_02077590 sp2C; + VecFx32 sp20; + VecFx32 sp14; + VecFx32 sp8; + Vec2s sp4; + + s32 var_r0_2; + s32 var_r1; + s32 var_r2; + s32 var_r2_2; + s32 var_r6; + bool var_r7; + s32 temp_r8_5; + bool var_r9; + + VecFx32_Copy(&this->mUnk_00, &this->mUnk_0C); + this->mUnk_1C = this->mUnk_18; + + if (this->mpPlayer != NULL) { + if (this->mUnk_28 == 0) { + if (data_027e09b8->func_ov000_020732dc(2) == 0 && data_0204a088->mUnk_04 == 1) { + if (data_0204a088->mUnk_08 == 2 || data_0204a088->mUnk_08 == 6) { + UnkStruct_027e09bc_0C *temp_r8 = data_027e09bc->mUnk_04[2]; + + UnkStackStruct_ov000_02077590 *temp_r0_2 = func_ov000_02077590(0x1B); + sp2C = *temp_r0_2; + + sp2C.mUnk_06 = temp_r8->func_ov000_02078698(); + sp2C.mUnk_04 = temp_r8->func_ov000_0207868c(); + sp2C.mUnk_02 = temp_r8->mUnk_0CA; + sp2C.mUnk_08 = MUL_FX32(func_01ffb9cc(&temp_r8->mUnk_040, &temp_r8->mUnk_034), data_ov000_020afd0c); + + sp4C = this->mpPlayer->mPos; + sp4C.y += data_ov000_020afd14; + temp_r8->func_ov000_0207834c(&sp4C, &sp2C, data_ov000_020afd08); + + this->mUnk_28 = true; + } + } + } else if (data_0204a088->mUnk_08 == 1) { + if (data_0204a088->mUnk_00 != -1 && data_0204a088->mUnk_00 != 5 && data_0204a088->mUnk_00 != 9) { + this->func_ov000_020a8af4(1); + } + } + } + + if (this->mUnk_20 > 1) { + this->mUnk_20--; + return; + } + + this->mUnk_20 = 0; + + if (this->mUnk_2C != NULL) { + this->mUnk_2C->func_ov026_020de908(this); + this->mUnk_18 = 0x10; + return; + } + + if (this->mUnk_30 != NULL) { + VecFx32_Copy(&this->mUnk_30->mUnk_00, &this->mUnk_00); + this->mUnk_00.y += data_ov000_020afd14; + this->mUnk_18 = 0x01; + return; + } + + var_r9 = this->mUnk_34->UnkCheck1(); + + if (this->mpZelda != NULL) { + this->mUnk_18 = this->mpZelda->func_ov093_0216e8e4(this); + + if (this->mUnk_18 != 0) { + if (this->mUnk_18 == 4 && pItemMgr != NULL) { + pItemMgr->func_ov000_020a8a5c(); + } + + if (var_r9 != 0) { + this->mUnk_00.y = this->mpZelda->mPos.y + 0x191F; + return; + } + + this->mUnk_00.y += data_ov000_020afd14; + + if (this->mUnk_18 != 3) { + return; + } + + if (!(this->mUnk_34->mUnk_104 & 0x40)) { + return; + } + + func_01ffb714(&this->mpPlayer->mPos, &this->mpZelda->mPos, &sp14); + sp14.y = 0; + + VecFx32_Copy(&this->mpPlayer->mPos, &sp20); + sp20.y += data_ov000_020ab4dc[PlayerCharacter_Link].mUnk_66 / 2; + + if (!data_027e09bc->mUnk_04[0]->func_01ffd43c(&sp4, &sp20, 1)) { + return; + } + + unk32 temp_r4 = data_ov000_020afd18; + + unk32 temp_r3_5 = (temp_r4 * 256) / 2; + fx32 temp_r2_3 = sp4.x - 128; + if (temp_r2_3 > -temp_r3_5 || temp_r2_3 >= temp_r3_5) { + return; + } + + unk32 temp_r3_6 = (temp_r4 * 192) / 2; + fx32 temp_r2_4 = sp4.y - 96; + if (temp_r2_4 > -temp_r3_6 || temp_r2_4 >= temp_r3_6) { + return; + } + + var_r6 = func_ov000_0205b090(); + var_r0_2 = func_ov000_0205b0ac(sp4.y); + + if (var_r6 < 0) { + var_r6 = (s16) -var_r6; + } + + if (var_r0_2 < 0) { + var_r0_2 = (s16) -var_r0_2; + } + + if (var_r6 <= var_r0_2) { + var_r6 = var_r0_2; + } + + if (var_r6 <= 0x1000) { + func_01ff97c8(&sp14, data_ov000_020afd10); + } else { + var_r2_2 = 0; + + if (temp_r4 != 0x1000) { + var_r2_2 = func_01ffb428(var_r6 - temp_r4, 0x1000 - temp_r4); + } + + if (var_r2_2 <= 0) { + return; + } + + if (var_r2_2 > 0x1000) { + var_r2_2 = 0x1000; + } + + func_01ff97c8(&sp14, ROUND_FX32(data_ov000_020afd10 * var_r2_2)); + } + + VecFx32_Add(&this->mUnk_00, &sp14, &this->mUnk_00); + return; + } + } + + if (pItemMgr != NULL) { + this->mUnk_18 = pItemMgr->func_ov000_020a8a74(this); + + if (this->mUnk_18 != 0) { + PlayerLinkActor *temp_r10_2 = this->mpPlayer; + + if (var_r9 != 0) { + this->mUnk_00.y = this->mpZelda->mPos.y + 0x191F; + } else { + this->mUnk_00.y += data_ov000_020afd14; + } + + if (this->mUnk_18 == 0x0D) { + VecFx32_SubXZ(&this->mUnk_00, &temp_r10_2->mPos, &sp8); + + PlayerLinkActor_9C *ptr = this->mpPlayer->mUnk_90; + s16 value1 = func_01ffbbe0(); + temp_r8_5 = func_ov000_0208832c(value1, ptr->func_ov000_02084944()); + + if (VecFx32_Length(&sp8) <= temp_r8_5) { + if (data_027e0ce0->func_ov000_0208bf34(0)) { + var_r7 = 0; + goto comp; + } + + if (!(sp8.x == 0 && sp8.z == 0 ? 1 : 0)) { + func_01ff9770(&sp8, temp_r8_5); + this->mUnk_00.x = temp_r10_2->mPos.x + sp8.x; + this->mUnk_00.z = temp_r10_2->mPos.z + sp8.z; + } + } + } + + UnkStruct_027e09bc_0C *temp_r7 = data_027e09bc->mUnk_04[2]; + + if (this->mUnk_18 != this->mUnk_1C) { + temp_r7->func_ov000_02078534(&temp_r7->mUnk_040, 4); + var_r7 = 1; + } else { + if (func_ov000_02078aec() == 0) { + if (pItemMgr != 0) { + pItemMgr->func_ov000_020a8a5c(); + } + + var_r7 = 0; + } else { + UnkStackStruct_ov000_02084344 *temp_r0_10 = func_ov000_02084344(this->mUnk_18); + temp_r7->func_ov000_02078aa4(this, temp_r0_10->mUnk_00, temp_r0_10->mUnk_02, temp_r0_10->mUnk_04); + + var_r7 = 1; + } + } + + comp: + if (var_r7 != 0) { + return; + } + } + } + + this->mUnk_18 = this->mpPlayer->func_ov000_0208dd60(this); + + if (var_r9 != 0) { + this->mUnk_00.y = this->mpZelda->mPos.y + 0x191F; + } else { + this->mUnk_00.y += data_ov000_020afd14; + } +} + +void UnkStruct_027e0ce0_30::func_ov017_020bc5fc(ItemManager *pItemMgr) { + if (this->mUnk_00 != NULL) { + this->mUnk_00->func_ov017_020bbf7c(pItemMgr); + return; + } + + for (u32 i = 0; i < ARRAY_LEN(this->mUnk_08); i++) { + if (this->mUnk_08[i] != NULL) { + this->mUnk_08[i]->func_ov021_020ebc68(); + } + } +} diff --git a/src/017_CourseExec/UnkStruct_027e0ce0_40_017.cpp b/src/017_CourseExec/UnkStruct_027e0ce0_40_017.cpp new file mode 100644 index 00000000..4d2429b0 --- /dev/null +++ b/src/017_CourseExec/UnkStruct_027e0ce0_40_017.cpp @@ -0,0 +1,428 @@ +#include "Item/Item.hpp" +#include "Player/PlayerActorBase.hpp" +#include "System/OverlayManager.hpp" +#include "Unknown/UICounterManager.hpp" +#include "Unknown/UnkStruct_0204a088.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "Unknown/UnkStruct_027e09b8.hpp" +#include "Unknown/UnkStruct_027e09bc.hpp" +#include "Unknown/UnkStruct_027e0ce0.hpp" +#include "Unknown/UnkStruct_027e0cf4.hpp" +#include "Unknown/UnkStruct_027e0d34.hpp" +#include "Unknown/UnkStruct_ov000_020b5214.hpp" +#include "flags.h" +#include "global.h" +#include "nitro/fx.h" +#include "nitro/math.h" + +extern "C" unk32 func_ov000_02080998(VecFx32 *); +extern "C" void func_ov000_02085d1c(void *); +extern "C" void func_ov000_0208a7a4(void *, void *); + +extern const unk16 data_ov000_020ab3b8; +extern const unk16 data_ov000_020ab3bc; +extern const unk16 data_ov000_020ab3c0; + +bool PlayerLinkActor_9C::func_ov017_020bc640(u32 param1, bool param2, bool param3, u8 param4, u8 param5, VecFx32 *pAccel, + VecFx32 *pPos, VecFx32 *pVel) { + VecFx32 sp1C; + s32 temp_r11; + UnkStruct_027e0ce0_24 *temp_r6; + s32 var_ge; + s32 var_r0; + s32 var_r0_2; + bool var_r5; + s32 var_r6; + unk32 var_r1; + unk32 var_r1_2; + u8 var_r2; + + var_r5 = true; + + this->mUnk_0F8 = param1; + this->mUnk_0FC = param3; + var_r6 = 1; + + sp1C = *pPos; + + if (!param2) { + VecFx32_Add(pVel, &this->mUnk_104, pVel); + } + + if (param1 <= 1) { + if (this->mUnk_0DE >= 0) { + var_r6 = this->func_ov000_020849d0(pAccel, pVel); + } else { + if (this->mUnk_0DE < 0 && !(this->mUnk_0DC & 0x20)) { + var_r0_2 = 1; + } else { + var_r0_2 = 0; + } + + if (var_r0_2 == 0) { + var_r6 = this->func_ov000_02084ac8(param1, pPos, pAccel, pVel); + } + } + + this->func_ov000_02084c3c(param1, param4, pVel, pPos); + } else if (param1 == 3) { + this->func_ov000_02084c3c(param1, 0, pVel, pPos); + } + + VecFx32_Copy(pVel, &this->mUnk_06C); + this->func_ov000_02086758(); + + if (param1 <= 2) { + if (func_ov000_02080998(pPos) != 0) { + var_r5 = false; + } else { + temp_r11 = this->func_ov000_02084e58(param1, param5, &sp1C, pPos, pAccel, pVel, 0xBF); + + if (func_ov000_02080998(pPos) != 0) { + var_r5 = false; + } else { + this->func_ov000_02085274(param1, param5, temp_r11, &sp1C, pPos, pVel); + } + } + + if (var_r5 || param1 == 1) { + if (param1 <= 1) { + if (param1 == 1 || this->mUnk_0DE >= 0) { + this->func_ov000_02085578(var_r6, data_ov000_020ab3c0, data_ov000_020ab3bc, data_ov000_020ab3b8, pVel); + } + + this->func_ov000_02085718(pVel); + } + } + } + + if (param1 == 1 && !var_r5) { + if (pPos->y < 0) { + pPos->y = 0; + + if (pVel->y < 0) { + pVel->y = 0; + } + + func_ov000_02085d1c(&this->mUnk_0DC); + } + } + + this->func_ov000_020867f4(); + this->func_ov000_02085840(&sp1C, pPos, pVel); + + s16 unk_138 = this->mUnk_138; + if (unk_138 != -1) { + temp_r6 = data_027e0ce0->mUnk_24; + + if (temp_r6 == NULL) { + data_027e0ce0->func_ov000_0208bc1c(0, this->mUnk_13A, this->mUnk_138, 0, &this->mUnk_13C, 0); + } else { + ActorRef sp14 = this->mUnk_008.Get32(); + ActorRef *ptr = &sp14; + + if (sp14.type_index == 0x100) { + *(u32 *) &var_r1 = -1; + } else { + var_r1 = ptr->unk_id; + } + + if (!(temp_r6->mUnk_70[var_r1] & 0x01) && + temp_r6->func_ov021_020eb870(var_r1, this->mUnk_138, 0, &this->mUnk_13C) != 0) { + + ActorRef sp10 = this->mUnk_008.Get32(); + ActorRef *ptr = &sp10; + + if (sp10.type_index == 0x100) { + var_r1_2 = -1; + } else { + var_r1_2 = ptr->unk_id; + } + + data_027e0cf4->func_ov021_020f6f58(var_r1_2, 0x1E, &this->mUnk_13C, 0, 0); + } + } + } + + return var_r5; +} + +bool UnkStruct_027e0ce0_40::func_ov017_020bc95c(bool param1) { + UnkStruct_027e09bc_0C_268 sp8; + sp8.unk_00 = 0; + sp8.unk_04 = 0; + sp8.unk_06 = false; + sp8.unk_07 = 0; + sp8.unk_08.x = 0; + sp8.unk_08.y = 0; + sp8.unk_08.z = 0; + + bool var_r4 = false; + + if (!param1) { + var_r4 = this->mUnk_014.mTouchControl.mState.touch; + + if (!GET_FLAG2(this->mUnk_104, UnkFlags3_5)) { + sp8.unk_00 = this->mUnk_014.mUnk_3C; + sp8.unk_04 = this->mUnk_014.mUnk_44; + sp8.unk_06 = var_r4; + + STACK_PAD(4); + if (this->Unk78HasValue()) { + sp8.unk_07 = this->mUnk_078->func_ov031_020dcfb4(&sp8.unk_08); + } + } + } + + UnkStruct_027e09bc_0C *temp_r0_2 = data_027e09bc->func_ov000_02077468(this->mUnk_000, 0); + temp_r0_2->mUnk_268 = sp8; + + return var_r4; +} + +const bool UnkStruct_027e0ce0_40_Base::UnknownInline1(bool param1, unk32 param2) { + if (this->GetItemMgr() != NULL && !GET_FLAG2(this->mUnk_104, UnkFlags3_5)) { + if (data_027e0d34->func_ov031_020d9a4c(1) != 0) { + bool ret = true; + + UnkStruct_0204a088 *ptr = data_0204a088; + if (ptr->mUnk_04 == OverlayIndex_None && ptr->mUnk_08 == OverlayIndex_None) { + ret = false; + } + + if (ret) { + if (param2 == 3 && ptr->IsUnknownCheck2(OverlayIndex_RailEdit, OverlayIndex_SceneInit)) { + return true; + } + } else if (!param1 && !(data_027e09b8->mUnk_94 & 8) && + ((CHECK_BUTTON_COMBO(this->mButtons.cur, PAD_BUTTON_L | PAD_BUTTON_R) && + data_0204a110.func_01ff9b64() != 3) || + param2 == 3)) { + return true; + } + } else if (!param1 && CHECK_BUTTON_COMBO(this->mButtons.press, PAD_BUTTON_L | PAD_BUTTON_R) && + !(gpUICounterManager != NULL && gpUICounterManager->func_ov024_020cd5c0(2) == 0) && + this->mpItemManager->GetCurrentItem() != ItemId_None) { + data_ov000_020b5214.func_ov000_0206db44(0x66); + } + } + + return false; +} + +void UnkStruct_027e0ce0_40::func_ov017_020bca40(bool param1, unk32 param2) { + UNSET_FLAG2(this->mUnk_104, UnkFlags3_10); + + if (this->CheckUnk104(UnkFlags3_0)) { + if (!data_02049b18.func_020137c8(this->mUnk_000)->touch) { + UNSET_FLAG2(this->mUnk_104, UnkFlags3_0); + UNSET_FLAG2(this->mUnk_104, UnkFlags3_1); + } else if (param1) { + SET_FLAG2(this->mUnk_104, UnkFlags3_1); + } else if (data_027e09bc->func_ov000_02077468(this->mUnk_000, 0)->mUnk_230->vfunc_08() == 0) { + if (this->CheckUnk104(UnkFlags3_1)) { + UNSET_FLAG2(this->mUnk_104, UnkFlags3_0); + UNSET_FLAG2(this->mUnk_104, UnkFlags3_1); + } + } else { + SET_FLAG2(this->mUnk_104, UnkFlags3_1); + } + } + + if (this->mpItemManager != NULL && this->CheckUnk104(UnkFlags3_9)) { + if (param2 == 0x2D || data_0204a088->mUnk_08 == OverlayIndex_RailEdit || + data_0204a088->mUnk_00 == OverlayIndex_RailEdit) { + UNSET_FLAG2(this->mUnk_104, UnkFlags3_8); + } else if (!param1) { + if (param2 == 4) { + if (!this->mButtons.CheckCurButtonCombo(PAD_BUTTON_L | PAD_BUTTON_R)) { + if (data_0204a110.func_01ff9b64() != 4) { + UNSET_FLAG2(this->mUnk_104, UnkFlags3_8); + } + } + } else if ((CHECK_BUTTON_COMBO(this->mButtons.release, PAD_BUTTON_L) && + !this->mButtons.CheckCurButtonCombo(PAD_BUTTON_R)) || + (CHECK_BUTTON_COMBO(this->mButtons.release, PAD_BUTTON_R) && + !this->mButtons.CheckCurButtonCombo(PAD_BUTTON_L))) { + if (data_0204a110.func_01ff9b64() != 4) { + UNSET_FLAG2(this->mUnk_104, UnkFlags3_8); + } + } + } + } else if (this->UnknownInline1(param1, param2)) { + SET_FLAG2(this->mUnk_104, UnkFlags3_8); + } else if (GET_FLAG2(this->mUnk_104, UnkFlags3_8) && + data_0204a088->IsUnknownCheck3(OverlayIndex_None, OverlayIndex_None) && !data_0204a088->IsUnknownCheck1(6, 1)) { + UNSET_FLAG2(this->mUnk_104, UnkFlags3_8); + } else if (!param1) { + UNSET_FLAG2(this->mUnk_104, UnkFlags3_8); + } + + if (param1) { + SET_FLAG2(this->mUnk_104, UnkFlags3_2); + } +} + +bool UnkStruct_027e0ce0_40::func_ov017_020bcde8(bool param1) { + s32 temp_r6; + bool var_r7; + + temp_r6 = data_0204a110.func_01ff9b50(); + + if (this->mUnk_094.mUnk_69 != 0) { + this->mUnk_094.mUnk_69--; + } + + if (param1) { + this->func_ov017_020bca40(param1, temp_r6); + this->mUnk_094.func_ov017_020bd478(); + + this->mUnk_094.mUnk_66 = 2; + this->mUnk_094.mUnk_6A = 0; + this->mUnk_094.mUnk_68 = 5; + + if (this->mUnk_074 != 0) { + this->mUnk_074->func_ov031_020e0c34(); + } + + this->mUnk_07C.func_ov000_020968e0(); + + if (GET_FLAG2(this->mUnk_104, UnkFlags3_5) && data_0204a088->mUnk_04 == OverlayIndex_SceneInit) { + if (!(data_0204a088->mUnk_08 != OverlayIndex_Collect && data_0204a088->mUnk_08 != OverlayIndex_RailEdit)) { + this->func_ov093_02168020(0); + } + } + + return this->func_ov017_020bc95c(param1); + } + + this->mButtons.func_02013b24(this->mButtons.func_02013c08(this->mUnk_000 == -1 ? data_02049b18.mUnk_2A : 0)); + this->func_ov017_020bca40(param1, temp_r6); + + var_r7 = true; + + if (this->mUnk_094.mUnk_67 != 0) { + this->mUnk_094.mUnk_67--; + var_r7 = false; + } else if (!GET_FLAG2(this->mUnk_104, UnkFlags3_0) && temp_r6 == -1) { + if (data_0204a110.func_01ff9b78() != 0) { + //! TODO: fake match + goto block_22; + } + } else { + block_22: + var_r7 = false; + } + + this->mUnk_014.func_ov017_020be44c(this->mUnk_000, var_r7); + + if (this->mUnk_074 != NULL) { + this->mUnk_074->func_ov102_0218323c(&this->mUnk_014, var_r7 && !GET_FLAG2(this->mUnk_104, UnkFlags3_9)); + } + + bool var_r3 = true; + if (temp_r6 != -1 || GET_FLAG2(this->mUnk_104, UnkFlags3_5)) { + var_r3 = false; + } + this->mUnk_094.func_ov017_020bd300(&this->mUnk_014, 0x15, var_r3); + + bool var_r10; + if (GET_FLAG2(this->mUnk_104, UnkFlags3_5)) { + var_r10 = true; + } else { + var_r10 = false; + } + + UnkParamStruct1 sp0; + UnkParamStruct1 *ptr = (UnkParamStruct1 *) &sp0; + func_ov000_0208a7a4(ptr, &this->mUnk_094); + this->mUnk_07C.func_ov017_020be2ec(&this->mUnk_014, var_r10, *ptr); + + if (this->mUnk_094.mUnk_64 != 0) { + this->mUnk_094.mUnk_64--; + } + + if (this->mUnk_094.mUnk_65 != 0) { + this->mUnk_094.mUnk_65--; + } + + if (this->mUnk_094.mUnk_66 != 0) { + this->mUnk_094.mUnk_66--; + } + + if (this->mUnk_094.mUnk_68 != 0) { + this->mUnk_094.mUnk_68--; + } + + if (this->mUnk_094.mUnk_6A != 0) { + this->mUnk_094.mUnk_6A--; + } + + if (temp_r6 == 2) { + if (GET_FLAG2(this->mUnk_104, UnkFlags3_5)) { + this->mUnk_094.mUnk_6C = 2; + } else { + this->func_ov093_021680fc(1); + this->mUnk_094.mUnk_6C = 1; + } + + SET_FLAG2(this->mUnk_104, UnkFlags3_3); + this->mUnk_094.mUnk_60 = this->mUnk_014.mTouchControl.mTouchPosLast; + } else { + switch (temp_r6) { + case 0: + this->func_ov093_021680fc(1); + break; + case 1: + this->func_ov093_02168020(1); + break; + default: + if (this->mUnk_094.mUnk_6C != 0 && !this->mUnk_014.mTouchControl.mState.touch) { + //! TODO: UnkCheck1() don't work + bool var_r1_2 = false; + + if (this->IsUnk78() != NULL && this->mUnk_078->UnkCheck1()) { + var_r1_2 = true; + } + + if (!var_r1_2) { + SET_FLAG2(this->mUnk_104, UnkFlags3_6); + } + + this->func_ov093_02168258(); + } + break; + } + + if (GET_FLAG2(this->mUnk_104, UnkFlags3_3)) { + if (this->mUnk_014.mTouchControl.mState.touch) { + if (ABS(this->mUnk_014.mTouchControl.mState.touchPos.x - this->mUnk_094.mUnk_60.x) > 12 || + ABS(this->mUnk_014.mTouchControl.mState.touchPos.y - this->mUnk_094.mUnk_60.y) > 12 || + this->mUnk_014.mTouchControl.mState.touchPos.x < 8 || + this->mUnk_014.mTouchControl.mState.touchPos.x >= 248 || + this->mUnk_014.mTouchControl.mState.touchPos.y < 8 || + this->mUnk_014.mTouchControl.mState.touchPos.y >= 184) { + UNSET_FLAG2(this->mUnk_104, UnkFlags3_3); + this->mUnk_094.mUnk_64 = 0x20; + } + } else { + //! TODO: fake match + UNSET_FLAG2(*(volatile UnkFlags3 *) &this->mUnk_104, UnkFlags3_3); + this->mUnk_094.mUnk_64 = 0x00; + } + } + } + + if (this->mUnk_094.mUnk_69 != 0 || GET_FLAG2(this->mUnk_104, UnkFlags3_2)) { + UNSET_FLAG2(this->mUnk_104, UnkFlags3_2); + SET_FLAG2(this->mUnk_104, UnkFlags3_10); + this->mUnk_094.mUnk_5C = 0x00; + } else if (GET_FLAG2(this->mUnk_104, UnkFlags3_5) || this->mUnk_094.mUnk_67 != 0) { + SET_FLAG2(this->mUnk_104, UnkFlags3_10); + this->mUnk_094.mUnk_5C = 0x00; + } else { + this->mUnk_094.mUnk_5C = this->mUnk_014.func_ov000_02096b1c(this->mUnk_094.mUnk_6A == 0); + } + + return this->func_ov017_020bc95c(param1); +} diff --git a/src/017_CourseExec/UnkStruct_027e0ce0_40_Base_94_017.cpp b/src/017_CourseExec/UnkStruct_027e0ce0_40_Base_94_017.cpp new file mode 100644 index 00000000..438aa67e --- /dev/null +++ b/src/017_CourseExec/UnkStruct_027e0ce0_40_Base_94_017.cpp @@ -0,0 +1,83 @@ +#include "Player/TouchControl.hpp" +#include "Unknown/UnkStruct_027e0ce0.hpp" +#include "math.hpp" + +extern "C" void func_ov000_02089bbc(void *, unk32); +extern "C" void func_ov000_0208abc4(ActorRef *, void *, Vec2s *); + +extern unk16 data_ov000_020ab3c8; + +// https://decomp.me/scratch/6j77v +void UnkStruct_027e0ce0_40_Base_94::func_ov017_020bd300(UnkStruct_027e0ce0_40_Base_14 *param1, unk32 param2, bool param3) { + ActorRef sp0; + s16 temp_r0_2; + s16 temp_r2; + s16 temp_r3; + s32 temp_r0; + s32 temp_r1_2; + s32 temp_r1_3; + s32 temp_r3_2; + s32 temp_r3_3; + bool var_r4; + u16 temp_r1; + + this->mUnk_4C &= ~0x01; + this->mUnk_18 = 0; + this->mUnk_4C &= ~0x02; + func_ov000_02089bbc(&this->mUnk_24, 0); + + if (param3 == 0) { + this->mTouchPosLast.x = -0x8000; + this->mTouchPosLast.y = -0x8000; + return; + } + + var_r4 = false; + + if (CHECK_TOUCH_FLAGS(¶m1->mTouchControl, TouchFlag_TouchedNow)) { + if (CHECK_TOUCH_FLAGS(¶m1->mTouchControl, TouchFlag_TouchedNow) && + (param1->mTouchControl.mTimeBetweenTouches <= 0x10)) { + var_r4 = true; + } + + if (var_r4 && this->mTouchPosLast.x != -0x8000) { + temp_r1_3 = param1->mTouchControl.mState.touchPos.x - this->mTouchPosLast.x; + temp_r1_2 = param1->mTouchControl.mState.touchPos.y - this->mTouchPosLast.y; + if (POW_2(temp_r1_3) + POW_2(temp_r1_2) < 0x190) { + this->mUnk_4C |= 0x02; + } + } + + return; + } + + if (!CHECK_TOUCH_FLAGS(¶m1->mTouchControl, TouchFlag_UntouchedNow)) { + return; + } + + if (param1->mUnk_40 < 0) { + return; + } + + if (param1->mUnk_40 >= param2) { + return; + } + + temp_r3_3 = param1->mTouchControl.mTouchPosLast.x - param1->mUnk_48.x; + temp_r3_2 = param1->mTouchControl.mTouchPosLast.y - param1->mUnk_48.y; + if (POW_2(temp_r3_3) + POW_2(temp_r3_2) >= POW_2(data_ov000_020ab3c8)) { + return; + } + + this->mTouchPosLast.x = param1->mTouchControl.mTouchPosLast.x; + this->mTouchPosLast.y = param1->mTouchControl.mTouchPosLast.y; + this->mUnk_4C |= 0x01; + func_ov000_0208abc4(&sp0, this, &this->mTouchPosLast); + this->mUnk_1C.data = this->mUnk_18.data = sp0.data; +} + +void UnkStruct_027e0ce0_40_Base_94::func_ov017_020bd478() { + func_ov000_02089bbc(&this->mUnk_24, 1); + this->mTouchPosLast.x = -0x8000; + this->mTouchPosLast.y = -0x8000; +} diff --git a/src/017_CourseExec/UnkStruct_027e0cec_017.cpp b/src/017_CourseExec/UnkStruct_027e0cec_017.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/017_CourseExec/UnkStruct_027e0cec_18_017.cpp b/src/017_CourseExec/UnkStruct_027e0cec_18_017.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/017_CourseExec/UnkStruct_ov017_020c3f70.cpp b/src/017_CourseExec/UnkStruct_ov017_020c3f70.cpp new file mode 100644 index 00000000..4e63cb8e --- /dev/null +++ b/src/017_CourseExec/UnkStruct_ov017_020c3f70.cpp @@ -0,0 +1,14 @@ +#include "Unknown/UnkStruct_ov017_020c3f70.hpp" +#include "Unknown/UnkStruct_02049b80.hpp" + +UnkStruct_ov017_020c3f70::~UnkStruct_ov017_020c3f70() { + this->func_ov017_020bba94(); +} + +void UnkStruct_ov017_020c3f70::func_ov017_020bba78() { + data_02049b80.func_02013fec(0, this); +} + +void UnkStruct_ov017_020c3f70::func_ov017_020bba94() { + data_02049b80.mUnk_0C[0] = 0; +} diff --git a/src/017_CourseExec/Unknown/UnkStruct_ov024_020d86a0_017.cpp b/src/017_CourseExec/Unknown/UnkStruct_ov024_020d86a0_017.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/017_CourseExec/code_020be2ec_017.cpp b/src/017_CourseExec/code_020be2ec_017.cpp new file mode 100644 index 00000000..bb592d61 --- /dev/null +++ b/src/017_CourseExec/code_020be2ec_017.cpp @@ -0,0 +1,264 @@ +#include "Unknown/UnkStruct_02049b18.hpp" +#include "Unknown/UnkStruct_0204a088.hpp" +#include "Unknown/UnkStruct_027e09bc.hpp" +#include "Unknown/UnkStruct_027e0cd8.hpp" +#include "Unknown/UnkStruct_027e0ce0.hpp" +#include "Unknown/UnkStruct_027e0cec.hpp" +#include "Unknown/UnkStruct_027e0cf8.hpp" +#include "global.h" +#include "math.hpp" +#include "nitro/fx.h" +#include "nitro/math.h" + +extern "C" bool func_01ff916c(void *, int, int); +extern "C" void func_01ffb974(unk32, VecFx32 *, VecFx32 *, VecFx32 *); +extern "C" void func_01ffb714(VecFx32 *, VecFx32 *, VecFx32 *); +extern "C" void func_01ff9770(VecFx32 *, unk32); +extern "C" unk32 func_01ffb428(unk32, unk32); +extern "C" u16 func_01ffbbe0(fx32 x, fx32 z); +extern "C" unk32 func_01ff9364(u16 *, UnkAngleStruct); +extern "C" bool func_ov000_02080998(VecFx32 *); +extern "C" VecFx32 *func_ov000_0205d524(unk32, unk32); +extern "C" unk32 func_ov000_02077480(); +extern "C" unk16 func_0201a710(unk16); +extern "C" void func_ov000_0205db44(void *, void *, unk32); + +void UnkStruct_027e0ce0_40_Base_7C::func_ov017_020be2ec(UnkStruct_027e0ce0_40_Base_14 *param1, bool param2, + UnkParamStruct1 param3) { + STACK_PAD(0x04); + + if (this->mUnk_04 != NULL) { + if (param2 != 0) { + this->mUnk_04->mUnk_00 = 0; + } else { + this->mUnk_04->func_ov031_020dcb60(param3); + } + } + + if (!param2 && param1->mTouchControl.mState.touch && this->func_ov000_020968fc()) { + VecFx32 sp4; + + func_01ffb974((this->mUnk_14 + FLOAT_TO_FX32(0.5999f)) - param1->mUnk_24.y, ¶m1->mUnk_30, ¶m1->mUnk_24, &sp4); + data_027e0cec->func_ov000_020a0140(&this->mUnk_08, &sp4); + fx32 originalY = func_ov000_0205d524(0, this->mUnk_00)->y; + fx32 y = originalY; + + if (func_ov000_02080998(&sp4) == 0) { + y = data_027e0cd8->mUnk_0C->vfunc_28(&sp4, 1, 0); + } + + func_01ff916c(&this->mUnk_14, ClampValue(y, originalY, originalY + FLOAT_TO_FX32(3.6f)), 0x1000); + return; + } + + this->func_ov000_020968b8(); +} + +void UnkStruct_027e0ce0_40_Base_7C::func_ov017_020be434() { + if (this->mUnk_04 != NULL) { + this->mUnk_04->func_ov031_020dca3c(); + } +} + +// https://decomp.me/scratch/hZrBx +void UnkStruct_027e0ce0_40_Base_14::func_ov017_020be44c(unk32 param1, bool param2) { + VecFx32 sp34; + VecFx32 sp28; + VecFx32 sp1C; + TouchState sp14; + Vec2s sp10; + Vec2s spC; + u16 spA; + u16 sp8; + VecFx32 *temp_r0; + s16 var_r1_3; + s16 var_r1_4; + s16 temp_r5; + s16 temp_r7; + UnkStruct_027e09bc *temp_r8; + UnkStruct_027e09bc_0C *temp_r8_2; + s32 var_r5; + s32 var_r7; + + this->mUnk_42 = this->mUnk_44; + + if (!param2) { + sp14.touch = false; + sp14.unk_01 = false; + sp14.touchPos.x = -1; + sp14.touchPos.y = -1; + + this->mTouchControl.func_02014478(&sp14, 2); + this->func_ov000_02096af4(); + return; + } + + this->mTouchControl.func_02014478(data_02049b18.func_020137c8(param1), 2); + temp_r0 = func_ov000_0205d524(0, param1); + temp_r8 = data_027e09bc; + + sp34 = *temp_r0; + sp34.y += 0x666; + + temp_r8_2 = temp_r8->func_ov000_02077468(param1, func_ov000_02077480()); + + if (!this->mTouchControl.mState.touch || this->mTouchControl.mState.touchPos.x < 0 || + this->mTouchControl.mState.touchPos.y < 0 || !temp_r8_2->func_01ffd43c(&sp10, &sp34, 0)) { + if (CHECK_TOUCH_FLAGS(&this->mTouchControl, TouchFlag_UntouchedNow)) { + s16 unk_40 = this->mUnk_40; + var_r1_4 = unk_40 + 2; + + if (unk_40 <= var_r1_4) { + unk_40 = var_r1_4; + } + + this->mUnk_40 = unk_40; + } else { + this->func_ov000_02096af4(); + } + + return; + } + + ClampValue16(&sp10.x, 8, 247); + ClampValue16(&sp10.y, 8, 183); + + spC.x = this->mTouchControl.mState.touchPos.x; + spC.y = this->mTouchControl.mState.touchPos.y; + + temp_r8_2->func_ov000_020767b4(&this->mUnk_24, &spC, temp_r0->y, 0x59, &this->mUnk_30); + + if (param1 == -1) { + func_01ffb714(&temp_r8_2->mUnk_040, &temp_r8_2->mUnk_034, &sp28); + + if (VecFx32_Dot(&sp28, &this->mUnk_30) > 0) { + func_01ffb714(&temp_r8_2->mUnk_040, &this->mUnk_24, &this->mUnk_24); + + this->mUnk_24.y = 0; + func_01ff9770(&this->mUnk_24, 0xBB8000); + VecFx32_Add(&this->mUnk_24, &temp_r8_2->mUnk_040, &this->mUnk_24); + this->mUnk_24.y = temp_r0->y; + + this->mUnk_30.x = 0; + this->mUnk_30.z = 0; + } + } + + if (data_0204a088->mUnk_00 == 1) { + var_r5 = 0x1000; + var_r7 = 0x1000; + + if (this->mTouchControl.mState.touchPos.x < sp10.x && sp10.x < 0x50) { + var_r5 = func_01ffb428(0x50, sp10.x); + } else if (sp10.x < this->mTouchControl.mState.touchPos.x && sp10.x >= 0xB0) { + var_r5 = func_01ffb428(0x50, 0xFF - sp10.x); + } + + if (this->mTouchControl.mState.touchPos.y < sp10.y && sp10.y < 0x50) { + var_r7 = func_01ffb428(0x50, sp10.y); + } else if (sp10.y < this->mTouchControl.mState.touchPos.y && sp10.y >= 0x70) { + var_r7 = func_01ffb428(0x50, 0xBF - sp10.y); + } + + VecFx32_Init(var_r5 * (this->mTouchControl.mState.touchPos.x - sp10.x), 0, + var_r7 * (this->mTouchControl.mState.touchPos.y - sp10.y), &sp1C); + + this->mUnk_3C = VecFx32_Length(&sp1C); + temp_r5 = func_01ffbbe0(sp1C.x, sp1C.z); + this->mUnk_44 = temp_r8_2->func_ov000_02078698() + temp_r5; + } else { + this->mUnk_30.x = 0; + this->mUnk_30.y = 0x1000; + this->mUnk_30.z = 0; + this->mUnk_3C = 0; + } + + temp_r7 = this->mUnk_40; + + if (temp_r7 < 0) { + if (!this->mTouchControl.mState.touch) { + return; + } + + this->mUnk_40 = 0; + this->mUnk_5C = 0; + this->mUnk_46 = this->mUnk_44; + Vec2s_Copy((Vec2s *) &this->mTouchControl.mState.touchPos, &this->mUnk_48); + return; + } + + this->mUnk_4C.y = this->mTouchControl.mState.touchPos.y - this->mTouchControl.mPrevState.touchPos.y; + this->mUnk_4C.x = this->mTouchControl.mState.touchPos.x - this->mTouchControl.mPrevState.touchPos.x; + + if (this->mUnk_58 > 0x800) { + this->mUnk_5C = temp_r7; + this->mUnk_46 = this->mUnk_44; + Vec2s_Copy((Vec2s *) &this->mTouchControl.mState.touchPos, &this->mUnk_48); + } + + s16 diffX = this->mUnk_4C.x; + s16 diffY = this->mUnk_4C.y; + s32 powX = POW_2(diffX); + s32 powY = POW_2(diffY); + s16 result = powX + powY; + + if (result <= 8) { + this->mUnk_58 = 0; + } else { + if (this->mUnk_50 != 0 && this->mUnk_54 != 0) { + sp8 = func_01ffbbe0(diffX, diffY); + spA = func_01ffbbe0(this->mUnk_50, this->mUnk_54); + this->mUnk_58 = func_01ff9364(&sp8, spA); + } + + fx32 x = INT_TO_FX32(this->mUnk_4C.x); + fx32 y = INT_TO_FX32(this->mUnk_4C.y); + + this->mUnk_50 = x; + this->mUnk_54 = y; + } + + s16 unk_40 = this->mUnk_40; + var_r1_3 = unk_40 + 2; + + if (unk_40 <= var_r1_3) { + unk_40 = var_r1_3; + } + + this->mUnk_40 = unk_40; +} + +void UnkStruct_027e0cf8_08::func_ov017_020be8a8() { + if (this->mUnk_004 == -1) { + return; + } + + if (this->mUnk_004 >= 0 && this->mUnk_004 < this->mUnk_008) { + this->mUnk_268 = 0x7FFF; + } else { + bool var_r1 = false; + + if (this->mUnk_008 <= this->mUnk_004 && this->mUnk_004 < this->mUnk_008 + this->mUnk_00C) { + var_r1 = true; + } + + if (var_r1) { + if (this->mUnk_004 == this->mUnk_008) { + this->func_ov024_020d34a0(this->mUnk_13C, 0x0F); + this->func_ov024_020d34a0(this->mUnk_010, this->mUnk_26A); + } + + u16 sp2 = func_0201a710(this->mUnk_26A); + u16 sp0 = 0x7FFF; + func_ov000_0205db44(&sp0, &sp2, ((this->mUnk_004 - this->mUnk_008) << 0xC) / this->mUnk_00C); + this->mUnk_268 = sp0; + } else if (this->mUnk_004 >= this->mUnk_008 + this->mUnk_00C) { + this->mUnk_268 = func_0201a710(this->mUnk_26A); + } + } + + //! TODO: fake match? + if (*(volatile s32 *) &this->mUnk_004 < this->mUnk_008 + this->mUnk_00C) { + this->mUnk_004++; + } +} diff --git a/src/017_CourseExec/code_020c0b24_017.cpp b/src/017_CourseExec/code_020c0b24_017.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/017_CourseExec/code_020c201c_017.cpp b/src/017_CourseExec/code_020c201c_017.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/024_MainGame/Player/PlayerActor_A0_38_024.cpp b/src/024_MainGame/Player/PlayerActor_A0_38_024.cpp index 0aa5df58..5a1c1323 100644 --- a/src/024_MainGame/Player/PlayerActor_A0_38_024.cpp +++ b/src/024_MainGame/Player/PlayerActor_A0_38_024.cpp @@ -120,8 +120,7 @@ void PlayerLinkActor_A0_38_18::vfunc_00() { THUMB_BEGIN PlayerLinkActor_A0_38::PlayerLinkActor_A0_38() : - mUnk_00(0xC0), - mUnk_02(0x80), + mUnk_00(SUBSCREEN_WIDTH / 2, SUBSCREEN_HEIGHT / 2), mUnk_04(this), mUnk_18(this) { this->func_ov024_020d19d8(); diff --git a/src/024_MainGame/Unknown/UnkStruct_027e0998_024.cpp b/src/024_MainGame/Unknown/UnkStruct_027e0998_024.cpp index 7cf3d424..7abaef38 100644 --- a/src/024_MainGame/Unknown/UnkStruct_027e0998_024.cpp +++ b/src/024_MainGame/Unknown/UnkStruct_027e0998_024.cpp @@ -25,7 +25,7 @@ UnkStruct_027e0998 *UnkStruct_027e0998::Create() { return new(HeapIndex_1) UnkStruct_027e0998(); } -bool UnkStruct_027e0998::vfunc_00(VecFx32 *pPos, Vec2s *param2, u16 *param3) { +bool UnkStruct_027e0998::vfunc_00(VecFx32 *pPos, Vec2s *param2, ActorRef *param3) { if (data_027e09a4->IsCutscene()) { CutsceneParamsEntry *pEntry = Cutscene_GetParamEntry(data_027e09a4->CurrentCSIndex()); @@ -71,13 +71,7 @@ bool UnkStruct_027e0998::vfunc_00(VecFx32 *pPos, Vec2s *param2, u16 *param3) { } if (data_027e0cd8->func_ov000_02082124()) { - bool var_r2 = true; - - if (*param3 != 0x100 && *param3 != 0x101) { - var_r2 = false; - } - - if (!var_r2) { + if (!param3->UnkCheck1()) { return false; } @@ -101,7 +95,7 @@ bool UnkStruct_027e0998::func_ov024_020c716c() { return false; } -bool UnkStruct_027e0998::func_ov024_020c7214(VecFx32 *pPos, Vec2s *param2, u16 *param3) { +bool UnkStruct_027e0998::func_ov024_020c7214(VecFx32 *pPos, Vec2s *param2, ActorRef *param3) { bool temp_r4 = this->UnkStruct_027e0998_Base::vfunc_00(pPos, param2, param3); if (data_027e09a4->IsTrain()) { @@ -115,14 +109,8 @@ bool UnkStruct_027e0998::func_ov024_020c7214(VecFx32 *pPos, Vec2s *param2, u16 * return temp_r4; } -bool UnkStruct_027e0998::func_ov024_020c727c(Vec2s *param1, u16 *param2) { - bool var_r2 = true; - - if (*param2 != 0x100 && *param2 != 0x101) { - var_r2 = false; - } - - if (!var_r2) { +bool UnkStruct_027e0998::func_ov024_020c727c(Vec2s *param1, ActorRef *param2) { + if (!param2->UnkCheck1()) { return false; } diff --git a/src/025_Title/GameModeTitleScreen.cpp b/src/025_Title/GameModeTitleScreen.cpp index 65a43932..1de6b093 100644 --- a/src/025_Title/GameModeTitleScreen.cpp +++ b/src/025_Title/GameModeTitleScreen.cpp @@ -51,7 +51,7 @@ void GameModeTitleScreen::vfunc_1C() { void GameModeTitleScreen::vfunc_20() { UnkStruct_027e09a4 *ptr4 = data_027e09a4; - void *ptr = &data_0204a110.mUnk_DF2; + s8 *ptr = &data_0204a110.mUnk_DF2; if ((data_0204a088->mUnk_120 & 1) != 0) { ptr4->func_ov017_020bb994(ptr); diff --git a/src/031_Land/Actor/ActorBomb.cpp b/src/031_Land/Actor/ActorBomb.cpp index 9e65f145..be456a07 100644 --- a/src/031_Land/Actor/ActorBomb.cpp +++ b/src/031_Land/Actor/ActorBomb.cpp @@ -505,7 +505,7 @@ void ActorBomb::func_ov031_020e2134() { } } -void ActorBomb::vfunc_2C(unk32 param1) { +void ActorBomb::vfunc_2C(Actor_vfunc_30 *param1) { if (!this->Actor::func_01fff5d0(param1, 0x0)) { for (ActorBomb_unk *ptr = this->mUnk_164; ptr != this->mUnk_164 + ARRAY_LEN(this->mUnk_164); ptr++) { ptr->func_ov000_020a0334(); diff --git a/src/031_Land/Actor/ActorHeart.cpp b/src/031_Land/Actor/ActorHeart.cpp index f6d2ed12..3f4d7868 100644 --- a/src/031_Land/Actor/ActorHeart.cpp +++ b/src/031_Land/Actor/ActorHeart.cpp @@ -238,13 +238,13 @@ void ActorHeart::func_ov031_020ef208() { if (!this->IsTimerOut()) { return; } - this->mUnk_BE = 0x01; - this->mUnk_52 = 0x3C; - this->mUnk_50 = 0x00; + this->mUnk_BE = 0x01; + this->mTimerMax = 60; + this->mTimer = 0; return; } - if ((this->mUnk_50 % 8) < 4) { + if ((this->mTimer % 8) < 4) { UNSET_FLAG(this->mFlags, ActorFlag_Visible); } else { SET_FLAG(this->mFlags, ActorFlag_Visible); @@ -285,9 +285,9 @@ void ActorHeart::func_ov031_020ef35c() { this->mVel.x = FLOAT_TO_FX32(0.0); this->mVel.y = FLOAT_TO_FX32(0.0); this->mVel.z = FLOAT_TO_FX32(0.0); - if ((u8) this->mUnk_BE == 0 && (this->mUnk_52 - this->mUnk_50) > 0xB4) { - this->mUnk_52 = 0xB4; - this->mUnk_50 = 0x00; + if ((u8) this->mUnk_BE == 0 && (this->mTimerMax - this->mTimer) > 0xB4) { + this->mTimerMax = 0xB4; + this->mTimer = 0x00; } this->mUnk_44 = 0x9F; } @@ -353,20 +353,20 @@ void ActorHeart::func_ov031_020ef4a8() { switch (this->mUnk_5C.mUnk_2C) { case 0: - this->mUnk_52 = 0xB4; - this->mUnk_50 = 0x00; + this->mTimerMax = 0xB4; + this->mTimer = 0x00; this->SetState(ActorHeartState_2); break; case 1: - this->mUnk_52 = 0x1E0; - this->mUnk_50 = 0x00; + this->mTimerMax = 0x1E0; + this->mTimer = 0x00; this->SetState(ActorHeartState_0); return; default: - this->mUnk_52 = 0x1E0; - this->mUnk_50 = 0x00; + this->mTimerMax = 0x1E0; + this->mTimer = 0x00; this->SetState(ActorHeartState_0); break; } @@ -391,7 +391,7 @@ void ActorHeart::func_ov031_020ef570() { } } -void ActorHeart::vfunc_2C(unk32 param1) { +void ActorHeart::vfunc_2C(Actor_vfunc_30 *param1) { VecFx32 iStack_20; VecFx32 iStack_2c; unk32 auStack_30; diff --git a/src/031_Land/Actor/ActorItemBoomerang.cpp b/src/031_Land/Actor/ActorItemBoomerang.cpp index c4d1c6c6..de1b508f 100644 --- a/src/031_Land/Actor/ActorItemBoomerang.cpp +++ b/src/031_Land/Actor/ActorItemBoomerang.cpp @@ -37,9 +37,9 @@ ActorItemBoomerang::ActorItemBoomerang() : mUnk_13A(0x0), mUnk_13C((u16) 0x8D71), mUnk_140(0x1000, 0x0) { - this->mState = ActorItemBoomerangState_0; - this->mUnk_52 = 0xFFFF; - this->mUnk_50 = 0x0; + this->mState = ActorItemBoomerangState_0; + this->mTimerMax = 0xFFFF; + this->mTimer = 0x0; } bool ActorItemBoomerang::vfunc_18(unk32 param1) { @@ -66,9 +66,9 @@ bool ActorItemBoomerang::vfunc_18(unk32 param1) { // non-matching void ActorItemBoomerang::SetState(ActorState state) { - this->mState = state; - this->mUnk_52 = 0xFFFF; - this->mUnk_50 = 0; + this->mState = state; + this->mTimerMax = 0xFFFF; + this->mTimer = 0; } void ActorItemBoomerang::func_ov031_020e49b0(unk32 param1) { @@ -303,12 +303,12 @@ void ActorItemBoomerang::func_ov031_020e52a0() { if (this->mUnk_128 == 0x1 || this->mUnk_128 == 0x2) { for (UnkStruct_PlayerGet_ec *ptr = this->mUnk_12C; ptr != this->mUnk_12C + 0x3; ++ptr) { UnkSystem7_UnkStruct_00 *data = ptr->mUnk_00; - if (data == NULL) { - continue; + + if (data != NULL) { + data->mUnk_28.x = this->mPos.x + data->mUnk_20->mUnk_00->mUnk_04.x; + data->mUnk_28.y = this->mPos.y + data->mUnk_20->mUnk_00->mUnk_04.y; + data->mUnk_28.z = this->mPos.z + data->mUnk_20->mUnk_00->mUnk_04.z; } - data->mUnk_28 = this->mPos.x + data->mUnk_20->mUnk_00->mUnk_04.x; - data->mUnk_2C = this->mPos.y + data->mUnk_20->mUnk_00->mUnk_04.y; - data->mUnk_30 = this->mPos.z + data->mUnk_20->mUnk_00->mUnk_04.z; } return; } @@ -318,7 +318,7 @@ void ActorItemBoomerang::func_ov031_020e52a0() { } // non-matching -void ActorItemBoomerang::vfunc_2C(unk32 param1) { +void ActorItemBoomerang::vfunc_2C(Actor_vfunc_30 *param1) { if (Actor::func_01fff5d0(param1, 0x0)) { this->mUnk_94.func_01ffc6d4(this->mAngleStruct, &this->mPos); data_027e09b4->func_ov017_020c08c4(&this->mPos, 0x400, 0x400, 0x1F, 0x0, 0x1); diff --git a/src/031_Land/Actor/ActorItemDrop.cpp b/src/031_Land/Actor/ActorItemDrop.cpp index 22708dd6..dcbdbe07 100644 --- a/src/031_Land/Actor/ActorItemDrop.cpp +++ b/src/031_Land/Actor/ActorItemDrop.cpp @@ -179,8 +179,8 @@ bool ActorItemDrop::vfunc_18(unk32 param1) { return false; } - this->mUnk_52 = FLOAT_TO_FX32(0.1173f); - this->mUnk_50 = FLOAT_TO_FX32(0.0f); + this->mTimerMax = FLOAT_TO_FX32(0.1173f); + this->mTimer = FLOAT_TO_FX32(0.0f); this->SetState(ActorItemDropState_0); return true; } @@ -326,9 +326,9 @@ void ActorItemDrop::func_ov031_020fa524() { this->mVel.y = FLOAT_TO_FX32(0.0f); this->mVel.z = FLOAT_TO_FX32(0.0f); - if (!this->mUnk_118 && this->mUnk_52 - this->mUnk_50 > FLOAT_TO_FX32(0.044f)) { - this->mUnk_52 = FLOAT_TO_FX32(0.044f); - this->mUnk_50 = FLOAT_TO_FX32(0.0f); + if (!this->mUnk_118 && this->mTimerMax - this->mTimer > FLOAT_TO_FX32(0.044f)) { + this->mTimerMax = FLOAT_TO_FX32(0.044f); + this->mTimer = FLOAT_TO_FX32(0.0f); } this->mUnk_44 = 0x9F; @@ -411,8 +411,8 @@ void ActorItemDrop::func_ov031_020fa678() { } void ActorItemDrop::func_ov031_020fa6c8() { - this->mUnk_52 = FLOAT_TO_FX32(15.9998f); - this->mUnk_50 = FLOAT_TO_FX32(0.0f); + this->mTimerMax = FLOAT_TO_FX32(15.9998f); + this->mTimer = FLOAT_TO_FX32(0.0f); this->mVel.x = FLOAT_TO_FX32(0.0f); this->mVel.y = FLOAT_TO_FX32(0.0f); this->mVel.z = FLOAT_TO_FX32(0.0f); @@ -470,7 +470,7 @@ void ActorItemDrop::func_ov031_020fa72c() { } } -void ActorItemDrop::vfunc_2C(unk32 param1) { +void ActorItemDrop::vfunc_2C(Actor_vfunc_30 *param1) { VecFx32 vec1; VecFx32 vec2; unk32 value; @@ -510,12 +510,12 @@ void ActorItemDrop::func_ov031_020fa900() { SET_FLAG(this->mFlags, ActorFlag_Visible); } else if (!this->mUnk_118) { if (this->Actor::IsTimerOut()) { - this->mUnk_118 = true; - this->mUnk_52 = 60; - this->mUnk_50 = 0; + this->mUnk_118 = true; + this->mTimerMax = 60; + this->mTimer = 0; } } else { - if ((this->mUnk_50 % 8) < 4) { + if ((this->mTimer % 8) < 4) { UNSET_FLAG(this->mFlags, ActorFlag_Visible); } else { SET_FLAG(this->mFlags, ActorFlag_Visible); diff --git a/src/031_Land/Actor/ActorItemFlower.cpp b/src/031_Land/Actor/ActorItemFlower.cpp index ce7f2cca..858e5ed5 100644 --- a/src/031_Land/Actor/ActorItemFlower.cpp +++ b/src/031_Land/Actor/ActorItemFlower.cpp @@ -60,7 +60,7 @@ void ActorItemFlower::vfunc_20() { CALL_PTMF(PTMF, data_ov031_021141b4[this->mState]); } -void ActorItemFlower::vfunc_2C(unk32 param1) { +void ActorItemFlower::vfunc_2C(Actor_vfunc_30 *param1) { if (!this->func_01fff5d0(param1, 0x0)) { return; } diff --git a/src/031_Land/Actor/ActorItemTornado.cpp b/src/031_Land/Actor/ActorItemTornado.cpp index 486a2f24..cac2a0b0 100644 --- a/src/031_Land/Actor/ActorItemTornado.cpp +++ b/src/031_Land/Actor/ActorItemTornado.cpp @@ -53,9 +53,9 @@ ActorItemTornado::ActorItemTornado() : this->mUnk_94.func_ov000_02057c98(&this->mUnk_F4); this->mUnk_94.func_ov000_02057c98(&this->mUnk_134); - this->mUnk_52 = 0xFFFF; - this->mState = ActorItemTornadoState_0; - this->mUnk_50 = 0x0; + this->mTimerMax = 0xFFFF; + this->mState = ActorItemTornadoState_0; + this->mTimer = 0x0; } bool ActorItemTornado::vfunc_18(unk32 param1) { @@ -95,9 +95,9 @@ void ActorItemTornado::SetState(ActorState state) { break; } - this->mState = state; - this->mUnk_52 = 0xFFFF; - this->mUnk_50 = 0x0; + this->mState = state; + this->mTimerMax = 0xFFFF; + this->mTimer = 0x0; } // non-matching @@ -120,7 +120,7 @@ void ActorItemTornado::func_ov031_020e5d18(unk32 param1) { switch (this->mState) { case ActorItemTornadoState_0: data_027e09a8->func_ov000_02071d34(&this->mRef, 0x8D6C, &this->mPos, 0x0); - if (this->mUnk_50 < (s16) 0xA) { + if (this->mTimer < (s16) 0xA) { this->mUnk_1DC += 0x199; break; } @@ -131,12 +131,12 @@ void ActorItemTornado::func_ov031_020e5d18(unk32 param1) { for (UnkStruct_PlayerGet_ec *ptr = this->mUnk_1E0; ptr != this->mUnk_1E0 + 0x3; ++ptr) { UnkSystem7_UnkStruct_00 *data = ptr->mUnk_00; - if (data == NULL) { - continue; + + if (data != NULL) { + data->mUnk_28.x = this->mPos.x + data->mUnk_20->mUnk_00->mUnk_04.x; + data->mUnk_28.y = this->mPos.y + data->mUnk_20->mUnk_00->mUnk_04.y; + data->mUnk_28.z = this->mPos.z + data->mUnk_20->mUnk_00->mUnk_04.z; } - data->mUnk_28 = this->mPos.x + data->mUnk_20->mUnk_00->mUnk_04.x; - data->mUnk_2C = this->mPos.y + data->mUnk_20->mUnk_00->mUnk_04.y; - data->mUnk_30 = this->mPos.z + data->mUnk_20->mUnk_00->mUnk_04.z; } ; @@ -161,7 +161,7 @@ void ActorItemTornado::func_ov031_020e5d18(unk32 param1) { } break; case ActorItemTornadoState_2: - if ((u32) this->mUnk_50 >= (u32) this->mUnk_1D6) { + if ((u32) this->mTimer >= (u32) this->mUnk_1D6) { UNSET_FLAG(this->mFlags, ActorFlag_Alive); } else if (this->mUnk_1D6 != 0) { if (this->mUnk_1CE != 0) { @@ -232,7 +232,7 @@ void ActorItemTornado::vfunc_24() { } // non-matching -void ActorItemTornado::vfunc_2C(unk32 param1) { +void ActorItemTornado::vfunc_2C(Actor_vfunc_30 *param1) { if (this->mUnk_1DC <= 0x0) { return; } diff --git a/src/031_Land/Actor/ActorPot.cpp b/src/031_Land/Actor/ActorPot.cpp index ccb93c03..8687fce3 100644 --- a/src/031_Land/Actor/ActorPot.cpp +++ b/src/031_Land/Actor/ActorPot.cpp @@ -63,7 +63,7 @@ void ActorPot::vfunc_20() { CALL_PTMF(PTMF, data_ov031_021140a0[this->mState]); } -void ActorPot::vfunc_2C(unk32 param1) { +void ActorPot::vfunc_2C(Actor_vfunc_30 *param1) { if (!this->func_01fff5d0(param1, 0x0)) { return; } diff --git a/src/031_Land/Actor/ActorRollingStone.cpp b/src/031_Land/Actor/ActorRollingStone.cpp index abf868a9..cdcda345 100644 --- a/src/031_Land/Actor/ActorRollingStone.cpp +++ b/src/031_Land/Actor/ActorRollingStone.cpp @@ -170,8 +170,8 @@ void ActorRollingStone::vfunc_20() { void ActorRollingStone::SetState(ActorState state) { this->mState = state; - this->mUnk_52 = 0xFFFF; - this->mUnk_50 = 0x0; + this->mTimerMax = 0xFFFF; + this->mTimer = 0x0; this->mUnk_38->mUnk_08 = 0x3; CALL_PTMF(PTMF, data_ov031_02114aec[this->mState]); } @@ -189,7 +189,7 @@ void ActorRollingStone::func_ov031_020f8880() { this->func_ov000_020984d0(); } -void ActorRollingStone::vfunc_2C(unk32 param1) { +void ActorRollingStone::vfunc_2C(Actor_vfunc_30 *param1) { if (!this->func_01fff5d0(param1, 0x0) || !this->mUnk_158) { return; } @@ -756,15 +756,17 @@ void ActorRollingStone::func_ov031_020f9af8() { const fx32 y = this->mPos.y + FLOAT_TO_FX32(0.4f); const fx32 x = this->mPos.x; const fx32 z = this->mPos.z; + for (UnkStruct_PlayerGet_ec *ptr = this->mUnk_130; ptr != this->mUnk_130 + 0x2; ++ptr) { UnkSystem7_UnkStruct_00 *data = ptr->mUnk_00; - if (data == NULL) { - continue; + + if (data != NULL) { + data->mUnk_28.x = x + data->mUnk_20->mUnk_00->mUnk_04.x; + data->mUnk_28.y = y + data->mUnk_20->mUnk_00->mUnk_04.y; + data->mUnk_28.z = z + data->mUnk_20->mUnk_00->mUnk_04.z; } - data->mUnk_28 = x + data->mUnk_20->mUnk_00->mUnk_04.x; - data->mUnk_2C = y + data->mUnk_20->mUnk_00->mUnk_04.y; - data->mUnk_30 = z + data->mUnk_20->mUnk_00->mUnk_04.z; } + data_027e09a8->func_ov000_02071d34(&this->mRef, 0x989F, &this->mPos, 0x0); } diff --git a/src/031_Land/Actor/ActorRupee.cpp b/src/031_Land/Actor/ActorRupee.cpp index 468240af..5c1c1928 100644 --- a/src/031_Land/Actor/ActorRupee.cpp +++ b/src/031_Land/Actor/ActorRupee.cpp @@ -244,9 +244,7 @@ void ActorRupee::func_ov031_020e9108() { void ActorRupee::func_ov031_020e91a8() { u32 sp0; - if (this->mUnk_50 < this->mUnk_52) { - this->mUnk_50++; - } + this->IsTimerOut(); this->func_ov031_020e9b88(); @@ -274,9 +272,7 @@ void ActorRupee::func_ov031_020e9234() { void ActorRupee::func_ov031_020e9254() { u32 sp0; - if (this->mUnk_50 < this->mUnk_52) { - this->mUnk_50++; - } + this->IsTimerOut(); this->func_ov031_020e9be8(); @@ -309,9 +305,7 @@ void ActorRupee::func_ov031_020e92e0() { void ActorRupee::func_ov031_020e9310() { u32 sp0; - if (this->mUnk_50 < this->mUnk_52) { - this->mUnk_50++; - } + this->IsTimerOut(); switch (this->mUnk_EC) { case 0: @@ -379,8 +373,8 @@ void ActorRupee::func_ov031_020e9450() { } void ActorRupee::func_ov031_020e94d4() { - this->mUnk_52 = -1; - this->mUnk_50 = 0; + this->mTimerMax = -1; + this->mTimer = 0; this->mVel.x = 0; this->mVel.y = 0; this->mVel.z = 0; @@ -495,8 +489,8 @@ void ActorRupee::func_ov031_020e970c() { this->mVel.z = 0; SET_FLAG(this->mFlags, ActorFlag_Visible); this->mUnk_4A[0] = 1; - this->mUnk_52 = -1; - this->mUnk_50 = 0; + this->mTimerMax = -1; + this->mTimer = 0; } // non-matching @@ -515,10 +509,10 @@ void ActorRupee::func_ov031_020e9740() { temp_r2 = (sp4 - 0x800) + temp_r0->vfunc_28(&this->mPos, 0, 0); if (this->mPos.y != temp_r2) { - this->mPos.y = temp_r2; - this->mUnk_52 = -1; - this->mUnk_50 = 0; - } else if (this->mUnk_50 == 8) { + this->mPos.y = temp_r2; + this->mTimerMax = -1; + this->mTimer = 0; + } else if (this->mTimer == 8) { this->SetState(ActorRupeeState_12); } } else { @@ -527,9 +521,7 @@ void ActorRupee::func_ov031_020e9740() { this->SetState(ActorRupeeState_12); } - if (this->mUnk_50 < this->mUnk_52) { - this->mUnk_50++; - } + this->IsTimerOut(); } // non-matching @@ -554,10 +546,10 @@ void ActorRupee::func_ov031_020e98c4() { } void ActorRupee::SetState(ActorState state) { - this->mState = state; - this->mUnk_52 = -1; - this->mUnk_50 = 0; - this->mUnk_EC = 0; + this->mState = state; + this->mTimerMax = -1; + this->mTimer = 0; + this->mUnk_EC = 0; CALL_PTMF(PTMF, data_ov031_02113520[this->mState]); } @@ -699,7 +691,7 @@ extern unk32 data_ov031_02113468[]; extern "C" void func_ov000_0205c204(unk32 *, VecFx32 *, unk32, unk32, unk32); // non-matching -void ActorRupee::vfunc_2C(unk32 param1) { +void ActorRupee::vfunc_2C(Actor_vfunc_30 *param1) { VecFx32 iStack_18; VecFx32 iStack_28; unk32 auStack_30[4]; diff --git a/src/031_Land/Actor/ActorShotArrow.cpp b/src/031_Land/Actor/ActorShotArrow.cpp index b4b48d63..645b0f4e 100644 --- a/src/031_Land/Actor/ActorShotArrow.cpp +++ b/src/031_Land/Actor/ActorShotArrow.cpp @@ -290,11 +290,11 @@ void ActorShotArrow::vfunc_20() { // non-matching void ActorShotArrow::func_ov031_020f1a64() { if (this->mUnk_5C.mParams[1] == 0x1 || this->mUnk_5C.mParams[1] == 0x4) { - this->mUnk_50 = 0x0; - this->mUnk_52 = 0x78; + this->mTimer = 0x0; + this->mTimerMax = 0x78; } else { - this->mUnk_50 = 0x0; - this->mUnk_52 = 0x3C; + this->mTimer = 0x0; + this->mTimerMax = 0x3C; } unk32 value_func_020f2270 = this->func_ov031_020f2270(); @@ -395,9 +395,9 @@ void ActorShotArrow::func_ov031_020f1dd4() { this->mUnk_174 = 0x1555; data_027e09a8->func_ov000_02071b30(0x8D7A, &this->mPos, 0); - this->mUnk_16C = 0; - this->mUnk_50 = 0; - this->mUnk_52 = this->mUnk_258; + this->mUnk_16C = 0; + this->mTimer = 0; + this->mTimerMax = this->mUnk_258; } void ActorShotArrow::func_ov031_020f1e3c() { @@ -407,8 +407,8 @@ void ActorShotArrow::func_ov031_020f1e3c() { return; } - this->mUnk_52 = this->mUnk_258; - this->mUnk_50 = 0; + this->mTimerMax = this->mUnk_258; + this->mTimer = 0; } Actor *targetActor = this->mUnk_1C8.mUnk_00; @@ -554,7 +554,7 @@ void ActorShotArrow::func_ov031_020f22d4(Mat3p *param1, VecFx32 *param2) { } // non-matching -void ActorShotArrow::vfunc_2C(unk32 param1) { +void ActorShotArrow::vfunc_2C(Actor_vfunc_30 *param1) { UnkStack_ov031_020f2310 stack; VecFx32_Copy(&this->mPos, &stack.mUnk_E4); diff --git a/src/031_Land/Actor/ActorUnkATTG.cpp b/src/031_Land/Actor/ActorUnkATTG.cpp index c62c263e..d435839a 100644 --- a/src/031_Land/Actor/ActorUnkATTG.cpp +++ b/src/031_Land/Actor/ActorUnkATTG.cpp @@ -4,21 +4,7 @@ #include "Unknown/UnkStruct_027e0cd8.hpp" #include "Unknown/UnkStruct_ov000_020b5214.hpp" -struct UnkStackStruct { - s16 mUnk_00; - s16 mUnk_02; - s16 mUnk_04; - s16 mUnk_06; - unk32 mUnk_08; - VecFx32 mUnk_0C; - u16 mUnk_18; - u16 mUnk_1A; - u16 mUnk_1C; - u16 mUnk_1E; -}; - extern "C" void func_ov000_02072fd0(UnkStackStruct1 *); -extern "C" UnkStackStruct *func_ov000_02077590(unk32); DECL_PROFILE(ActorProfileUnkATTG); @@ -82,13 +68,13 @@ void ActorUnkATTG::func_ov031_020f3eec(ActorState state, unk32 param2) { stack.mUnk_3A = 0x7; VecFx32_Copy(&this->mPos, &stack.mUnk_0C); - UnkStackStruct *r3 = func_ov000_02077590(0x1); - stack.mUnk_18 = r3->mUnk_00; - stack.mUnk_1A = r3->mUnk_02; - stack.mUnk_1C = r3->mUnk_04; - stack.mUnk_1E = r3->mUnk_06; - stack.mUnk_20 = r3->mUnk_08; - stack.mUnk_24 = r3->mUnk_0C; + UnkStackStruct_ov000_02077590 *r3 = func_ov000_02077590(0x1); + stack.mUnk_18 = r3->mUnk_00; + stack.mUnk_1A = r3->mUnk_02; + stack.mUnk_1C = r3->mUnk_04; + stack.mUnk_1E = r3->mUnk_06; + stack.mUnk_20 = r3->mUnk_08; + stack.mUnk_24 = r3->mUnk_0C; u16 unk_18 = r3->mUnk_18; u16 unk_1A = r3->mUnk_1A; diff --git a/src/031_Land/Actor/ActorUnkEFSB.cpp b/src/031_Land/Actor/ActorUnkEFSB.cpp index 4a595d1e..01aaeb18 100644 --- a/src/031_Land/Actor/ActorUnkEFSB.cpp +++ b/src/031_Land/Actor/ActorUnkEFSB.cpp @@ -51,7 +51,7 @@ void ActorUnkEFSB::vfunc_54(unk32 param1) { this->mUnk_094 = param1; } -void ActorUnkEFSB::vfunc_2C(unk32 param1) { +void ActorUnkEFSB::vfunc_2C(Actor_vfunc_30 *param1) { VecFx32 vec; VecFx32_Init(FLOAT_TO_FX32(1.0f), FLOAT_TO_FX32(1.0f), FLOAT_TO_FX32(1.0f), &vec); diff --git a/src/031_Land/Actor/ActorUnkNFSP.cpp b/src/031_Land/Actor/ActorUnkNFSP.cpp index 35eac8ef..8fcaf923 100644 --- a/src/031_Land/Actor/ActorUnkNFSP.cpp +++ b/src/031_Land/Actor/ActorUnkNFSP.cpp @@ -172,7 +172,7 @@ void ActorUnkNFSP::vfunc_54(unk32 param1) { } } -void ActorUnkNFSP::vfunc_2C(unk32 param1) {} +void ActorUnkNFSP::vfunc_2C(Actor_vfunc_30 *param1) {} void ActorUnkNFSP::func_ov031_020fbb8c() { this->mUnk_3C = &this->mUnk_A0; diff --git a/src/031_Land/Actor/ActorUnkNTTZ.cpp b/src/031_Land/Actor/ActorUnkNTTZ.cpp index 85f2da40..290f94b1 100644 --- a/src/031_Land/Actor/ActorUnkNTTZ.cpp +++ b/src/031_Land/Actor/ActorUnkNTTZ.cpp @@ -27,7 +27,7 @@ bool ActorUnkNTTZ::vfunc_18(unk32 param1) { void ActorUnkNTTZ::vfunc_20() {} -void ActorUnkNTTZ::vfunc_2C(unk32 param1) {} +void ActorUnkNTTZ::vfunc_2C(Actor_vfunc_30 *param1) {} void ActorUnkNTTZ::func_ov031_020f61a0() { if (this->mUnk_5C.mUnk_28.type == 0x0) { diff --git a/src/031_Land/Actor/ActorUnkRMTG.cpp b/src/031_Land/Actor/ActorUnkRMTG.cpp index 6b990336..5825867c 100644 --- a/src/031_Land/Actor/ActorUnkRMTG.cpp +++ b/src/031_Land/Actor/ActorUnkRMTG.cpp @@ -6,7 +6,6 @@ extern "C" const char data_ov031_02110ad0; extern "C" void func_01ffedac(Vec2bCpp *, VecFx32 *); -extern "C" unk32 func_ov000_02077590(unk32); DECL_PROFILE(ActorProfileUnkRMTG); @@ -44,6 +43,6 @@ void ActorUnkRMTG::vfunc_1C() { data->func_ov000_0207834c(&this->mPos, func_ov000_02077590(0x7), 0x0); } -void ActorUnkRMTG::vfunc_2C(unk32 param1) { +void ActorUnkRMTG::vfunc_2C(Actor_vfunc_30 *param1) { this->mUnk_94.vfunc_18(&this->mPos); } diff --git a/src/031_Land/Actor/ActorUnkROCK.cpp b/src/031_Land/Actor/ActorUnkROCK.cpp index 2756e2ab..3bfadf47 100644 --- a/src/031_Land/Actor/ActorUnkROCK.cpp +++ b/src/031_Land/Actor/ActorUnkROCK.cpp @@ -64,8 +64,8 @@ void ActorUnkROCK::vfunc_20() { } void ActorUnkROCK::func_ov031_020e8a48(ActorState state) { - this->mUnk_52 = 0xFFFF; - this->mUnk_50 = 0x0000; + this->mTimerMax = 0xFFFF; + this->mTimer = 0x0000; if (this->mState == ActorUnkROCKState_0) { data_027e09c0->func_ov000_0207e254(&this->mUnk_A0); @@ -92,7 +92,7 @@ void ActorUnkROCK::func_ov031_020e8acc() { this->func_ov000_020984d0(); } -void ActorUnkROCK::vfunc_2C(unk32 param1) { +void ActorUnkROCK::vfunc_2C(Actor_vfunc_30 *param1) { if (!this->func_01fff5d0(param1, 0x0)) { return; } diff --git a/src/031_Land/Actor/ActorUnkSWBM.cpp b/src/031_Land/Actor/ActorUnkSWBM.cpp index f902c0b5..1613809d 100644 --- a/src/031_Land/Actor/ActorUnkSWBM.cpp +++ b/src/031_Land/Actor/ActorUnkSWBM.cpp @@ -115,9 +115,9 @@ ActorUnkSWBM::ActorUnkSWBM() : mUnk_108(0x0), mUnk_10A(0x0) { MI_CpuFill32(0x0, this->mUnk_0E4, ARRAY_LEN(this->mUnk_0E4) * sizeof *this->mUnk_0E4); - this->mState = ActorUnkSWBMState_0; - this->mUnk_52 = 0xFFFF; - this->mUnk_50 = 0x0000; + this->mState = ActorUnkSWBMState_0; + this->mTimerMax = 0xFFFF; + this->mTimer = 0x0000; } bool ActorUnkSWBM::vfunc_18(unk32 param1) { @@ -190,9 +190,9 @@ void ActorUnkSWBM::func_ov031_020e6e84(ActorState state) { this->mVel.z /= 3; break; } - this->mState = state; - this->mUnk_52 = 0xFFFF; - this->mUnk_50 = 0x0000; + this->mState = state; + this->mTimerMax = 0xFFFF; + this->mTimer = 0x0000; } // non-matching @@ -307,7 +307,7 @@ void ActorUnkSWBM::func_ov031_020e718c(VecFx32 *param0, Mat3p *param1, s32 param REG_GFX_FIFO_MATRIX_POP = true; } -void ActorUnkSWBM::vfunc_2C(unk32 param1) { +void ActorUnkSWBM::vfunc_2C(Actor_vfunc_30 *param1) { if (this->mState == ActorUnkSWBMState_2) { return; } diff --git a/src/031_Land/Actor/ActorUnkSWCH.cpp b/src/031_Land/Actor/ActorUnkSWCH.cpp index c23c9e50..df7b07db 100644 --- a/src/031_Land/Actor/ActorUnkSWCH.cpp +++ b/src/031_Land/Actor/ActorUnkSWCH.cpp @@ -38,7 +38,7 @@ void ActorUnkSWCH::vfunc_20() { this->func_ov000_02098a88(0x1, 0x1); } -void ActorUnkSWCH::vfunc_2C(unk32 param1) { +void ActorUnkSWCH::vfunc_2C(Actor_vfunc_30 *param1) { if (this->func_01fff5d0(param1, 0x0)) { return; } diff --git a/src/031_Land/Actor/ActorUnkTGTZ.cpp b/src/031_Land/Actor/ActorUnkTGTZ.cpp index a20b1ef5..b0e52cf2 100644 --- a/src/031_Land/Actor/ActorUnkTGTZ.cpp +++ b/src/031_Land/Actor/ActorUnkTGTZ.cpp @@ -8,24 +8,10 @@ #include "Unknown/UnkStruct_027e09a8.hpp" #include "Unknown/UnkStruct_027e09b8.hpp" -struct UnkStruct_ov000_02077590 { - /* 00 */ s16 mUnk_00; - /* 02 */ s16 mUnk_02; - /* 04 */ s16 mUnk_04; - /* 06 */ s16 mUnk_06; - /* 08 */ unk32 mUnk_08; - /* 0C */ VecFx32 mUnk_0C; - /* 18 */ u16 mUnk_18; - /* 1A */ u16 mUnk_1A; - /* 1C */ u16 mUnk_1C; - /* 1E */ u16 mUnk_1E; -}; - extern "C" bool func_01ff916c(void *, int, int); extern "C" void func_01ff9638(VecFx32 *, s16); extern "C" void func_01ffa7a0(VecFx32 *, Mat3p *, VecFx32 *); extern "C" void func_ov000_02072fd0(UnkStackStruct1 *); -extern "C" UnkStruct_ov000_02077590 *func_ov000_02077590(unk32); #if IS_JP static const Vec3p data_ov031_02116344(FLOAT_TO_FX32(1.5f), FLOAT_TO_FX32(2.0f), FLOAT_TO_FX32(0.0f)); @@ -124,12 +110,12 @@ void ActorUnkTGTZ::vfunc_20() { stack.mUnk_00 = 0x80; stack.mUnk_3A = 0x7; - UnkStruct_ov000_02077590 *r3 = func_ov000_02077590(0x1); - stack.mUnk_18 = r3->mUnk_00; - stack.mUnk_1A = r3->mUnk_02; - stack.mUnk_1C = r3->mUnk_04; - stack.mUnk_1E = r3->mUnk_06; - stack.mUnk_20 = r3->mUnk_08; + UnkStackStruct_ov000_02077590 *r3 = func_ov000_02077590(0x1); + stack.mUnk_18 = r3->mUnk_00; + stack.mUnk_1A = r3->mUnk_02; + stack.mUnk_1C = r3->mUnk_04; + stack.mUnk_1E = r3->mUnk_06; + stack.mUnk_20 = r3->mUnk_08; stack.mUnk_24 = r3->mUnk_0C; @@ -352,12 +338,12 @@ void ActorUnkTGTZ::vfunc_30(Actor_vfunc_30 *param1) { var = 0x0; } - if (param1->mUnk_00 != var || param1->mUnk_01 != var) { + if (param1->mUnk_00.unk_00 != var || param1->mUnk_00.unk_01 != var) { return; } Vec2s vec2s; - if (!data_027e0998->vfunc_00(&this->mPos, &vec2s, (u16 *) &this->mRef)) { + if (!data_027e0998->vfunc_00(&this->mPos, &vec2s, &this->mRef)) { return; } @@ -379,7 +365,7 @@ void ActorUnkTGTZ::vfunc_30(Actor_vfunc_30 *param1) { data_0204af1c.func_0201aa44(this->mUnk_1C8, NULL, 0x2, NULL); } -void ActorUnkTGTZ::vfunc_2C(unk32 param1) { +void ActorUnkTGTZ::vfunc_2C(Actor_vfunc_30 *param1) { if (!this->func_01fff5d0(param1, 0x0)) { return; } diff --git a/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp b/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp index 66bb03cd..78f3679a 100644 --- a/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp +++ b/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp @@ -256,7 +256,8 @@ void ActorUnkZLSL::func_ov031_020ea8c4() {} void ActorUnkZLSL::func_ov031_020ea8c8() {} void ActorUnkZLSL::vfunc_20() { - UnkAngleStruct angleTmp = {.angle = this->mAngle}; + UnkAngleStruct angleTmp; + angleTmp.angle = this->mAngle; CALL_PTMF(PTMF, data_ov031_021137f8[this->mState]); if (!GET_FLAG(this->mFlags, ActorFlag_Visible)) { @@ -434,8 +435,8 @@ void ActorUnkZLSL::func_ov031_020ead7c() { this->mVel.x = FLOAT_TO_FX32(0.0f); this->mVel.y = FLOAT_TO_FX32(0.0f); this->mVel.z = FLOAT_TO_FX32(0.0f); - this->mUnk_52 = 0xA; - this->mUnk_50 = 0x0; + this->mTimerMax = 0xA; + this->mTimer = 0x0; this->mUnk_2884 = 0x0; this->mUnk_2888 = 0x0; } @@ -557,8 +558,8 @@ void ActorUnkZLSL::func_ov031_020eb61c() { } this->func_ov031_020ecc68(0x0); actor->func_ov071_021540ac(0x19); - this->mUnk_52 = 0x14; - this->mUnk_50 = 0x0; + this->mTimerMax = 0x14; + this->mTimer = 0x0; ++this->mUnk_286E; break; case 0x1: @@ -578,8 +579,8 @@ void ActorUnkZLSL::func_ov031_020eb61c() { this->func_ov031_020edd14(&vec); vec.y = this->mPos.y; if (this->func_ov031_020ed6cc(0xC00)) { - this->mUnk_52 = 0xF; - this->mUnk_50 = 0x0; + this->mTimerMax = 0xF; + this->mTimer = 0x0; ++this->mUnk_286E; } this->mAngle = func_02016958(&this->mPos, &vec); @@ -622,8 +623,8 @@ void ActorUnkZLSL::func_ov031_020eb61c() { ++this->mUnk_286E; data_027e0d8c->func_ov093_021660a8(this->mUnk_28DC); actor->func_ov071_021540ac(0x1A); - this->mUnk_52 = 0x1E; - this->mUnk_50 = 0x0; + this->mTimerMax = 0x1E; + this->mTimer = 0x0; } this->func_ov031_020ed4e4(0x5, 0x93F); break; @@ -660,8 +661,8 @@ void ActorUnkZLSL::func_ov031_020eba8c() { } this->func_ov031_020ecc68(0x1); actor->func_ov071_021540ac(0x19); - this->mUnk_52 = 0x14; - this->mUnk_50 = 0x0; + this->mTimerMax = 0x14; + this->mTimer = 0x0; ++this->mUnk_286E; break; case 0x1: @@ -683,8 +684,8 @@ void ActorUnkZLSL::func_ov031_020eba8c() { this->func_ov031_020edd14(&vec); vec.y = this->mPos.y; if (this->func_ov031_020ed8ac(0x800)) { - this->mUnk_52 = 0xF; - this->mUnk_50 = 0x0; + this->mTimerMax = 0xF; + this->mTimer = 0x0; ++this->mUnk_286E; } this->mAngle = func_02016958(&this->mPos, &vec); @@ -698,8 +699,8 @@ void ActorUnkZLSL::func_ov031_020eba8c() { data_027e0d8c->func_ov093_02166108(); ++this->mUnk_286E; this->mUnk_2884 = 0x0; - this->mUnk_52 = 0x1E; - this->mUnk_50 = 0x0; + this->mTimerMax = 0x1E; + this->mTimer = 0x0; this->func_ov031_020eb188(); } VecFx32_Copy(&this->mPos, &vec); @@ -730,8 +731,8 @@ void ActorUnkZLSL::func_ov031_020eba8c() { } this->func_ov031_020ed3c0(); - this->mUnk_52 = 0xF; - this->mUnk_50 = 0x0; + this->mTimerMax = 0xF; + this->mTimer = 0x0; break; case 0x5: if (!this->IsTimerOut()) { @@ -759,8 +760,8 @@ void ActorUnkZLSL::func_ov031_020eba8c() { ++this->mUnk_286E; data_027e0d8c->func_ov093_021660a8(this->mUnk_28DC); actor->func_ov071_021540ac(0x1A); - this->mUnk_52 = 0x1E; - this->mUnk_50 = 0x0; + this->mTimerMax = 0x1E; + this->mTimer = 0x0; break; case 0x7: if (!this->IsTimerOut()) { @@ -855,7 +856,7 @@ void ActorUnkZLSL::func_ov031_020ec170() { this->mAngle = 0x0; } -void ActorUnkZLSL::vfunc_2C(unk32 param1) { +void ActorUnkZLSL::vfunc_2C(Actor_vfunc_30 *param1) { Mat3p sp00; if (this->mUnk_28A4.x == FLOAT_TO_FX32(0.0f) && this->mUnk_28A4.y == FLOAT_TO_FX32(0.0f) && this->mUnk_28A4.z == FLOAT_TO_FX32(0.0f)) { @@ -916,8 +917,8 @@ bool ActorUnkZLSL::func_ov031_020ec3d0() { switch (this->mUnk_2872) { case 0x0: data_ov000_020b51b8.func_ov000_0206d0bc(0x0); - this->mUnk_52 = 0x0; - this->mUnk_50 = 0x0; + this->mTimerMax = 0x0; + this->mTimer = 0x0; ++this->mUnk_2872; break; case 0x1: @@ -942,8 +943,8 @@ bool ActorUnkZLSL::func_ov031_020ec49c() { switch (this->mUnk_2872) { case 0x0: data_ov000_020b51b8.func_ov000_0206d0bc(0xA); - this->mUnk_52 = 0xA; - this->mUnk_50 = 0x0; + this->mTimerMax = 0xA; + this->mTimer = 0x0; ++this->mUnk_2872; break; case 0x1: diff --git a/src/031_Land/MapObject/MapObjectBombFlower.cpp b/src/031_Land/MapObject/MapObjectBombFlower.cpp index 265184fa..07fd5c36 100644 --- a/src/031_Land/MapObject/MapObjectBombFlower.cpp +++ b/src/031_Land/MapObject/MapObjectBombFlower.cpp @@ -208,7 +208,7 @@ bool MapObjectBombFlower::SetState(MapObjState state, unk32 param2) { return true; } -void MapObjectBombFlower::vfunc_14() { +void MapObjectBombFlower::vfunc_14(unk32 param1) { this->mUnk_48.func_ov031_02102c00(); this->MapObject::func_ov000_0209d518(&this->mPos, 0x5A7, 0x5A7, 0x1F); diff --git a/src/031_Land/MapObject/MapObjectChestBase.cpp b/src/031_Land/MapObject/MapObjectChestBase.cpp index 830bb882..199703ca 100644 --- a/src/031_Land/MapObject/MapObjectChestBase.cpp +++ b/src/031_Land/MapObject/MapObjectChestBase.cpp @@ -240,8 +240,8 @@ void MapObjectChestBase::func_ov031_02103878() { } void MapObjectChestBase::vfunc_38(unk32 param1, unk32 param2) {} -void MapObjectChestBase::vfunc_18(s8 *param1, s8 param2) {} -void MapObjectChestBase::vfunc_14() {} +void MapObjectChestBase::vfunc_18(s8 *param1) {} +void MapObjectChestBase::vfunc_14(unk32 param1) {} unk32 MapObjectChestBase::vfunc_3C() {} bool MapObjectChestBase::vfunc_40() { diff --git a/src/031_Land/MapObject/MapObjectDoorBase.cpp b/src/031_Land/MapObject/MapObjectDoorBase.cpp index a2d588e8..2794230f 100644 --- a/src/031_Land/MapObject/MapObjectDoorBase.cpp +++ b/src/031_Land/MapObject/MapObjectDoorBase.cpp @@ -13,7 +13,6 @@ extern "C" unk32 func_01ffb464(unk32 param1); extern "C" void func_01ff9218(void *, unk32, unk32); extern "C" unk32 func_01ffb428(unk32, unk32); -extern "C" void *func_ov000_02077590(unk32); class UnkStruct_ov031_02117210 { public: @@ -308,19 +307,6 @@ void MapObjectDoorBase::vfunc_60() { } } -struct UnkStackStruct { - s16 mUnk_00; - s16 mUnk_02; - s16 mUnk_04; - s16 mUnk_06; - unk32 mUnk_08; - VecFx32 mUnk_0C; - u16 mUnk_18; - u16 mUnk_1A; - u16 mUnk_1C; - u16 mUnk_1E; -}; - void MapObjectDoorBase::vfunc_5C(MapObjState state, unk32 param2) { UnkStackStruct1 auStack_5c; UnkStackStruct1 auStack_9c; @@ -366,13 +352,13 @@ void MapObjectDoorBase::vfunc_5C(MapObjState state, unk32 param2) { auStack_5c.mUnk_3B = 0; } - UnkStackStruct *puVar5 = (UnkStackStruct *) func_ov000_02077590(3); - auStack_5c.mUnk_18 = puVar5->mUnk_00; - auStack_5c.mUnk_1A = puVar5->mUnk_02; - auStack_5c.mUnk_1C = puVar5->mUnk_04; - auStack_5c.mUnk_1E = puVar5->mUnk_06; - auStack_5c.mUnk_20 = puVar5->mUnk_08; - auStack_5c.mUnk_24 = puVar5->mUnk_0C; + UnkStackStruct_ov000_02077590 *puVar5 = func_ov000_02077590(3); + auStack_5c.mUnk_18 = puVar5->mUnk_00; + auStack_5c.mUnk_1A = puVar5->mUnk_02; + auStack_5c.mUnk_1C = puVar5->mUnk_04; + auStack_5c.mUnk_1E = puVar5->mUnk_06; + auStack_5c.mUnk_20 = puVar5->mUnk_08; + auStack_5c.mUnk_24 = puVar5->mUnk_0C; u16 unk_18 = puVar5->mUnk_18; u16 unk_1A = puVar5->mUnk_1A; @@ -450,13 +436,13 @@ void MapObjectDoorBase::vfunc_5C(MapObjState state, unk32 param2) { auStack_9c.mUnk_38 |= 0x200; - UnkStackStruct *puVar5 = (UnkStackStruct *) func_ov000_02077590(2); - auStack_9c.mUnk_18 = puVar5->mUnk_00; - auStack_9c.mUnk_1A = puVar5->mUnk_02; - auStack_9c.mUnk_1C = puVar5->mUnk_04; - auStack_9c.mUnk_1E = puVar5->mUnk_06; - auStack_9c.mUnk_20 = puVar5->mUnk_08; - auStack_9c.mUnk_24 = puVar5->mUnk_0C; + UnkStackStruct_ov000_02077590 *puVar5 = func_ov000_02077590(2); + auStack_9c.mUnk_18 = puVar5->mUnk_00; + auStack_9c.mUnk_1A = puVar5->mUnk_02; + auStack_9c.mUnk_1C = puVar5->mUnk_04; + auStack_9c.mUnk_1E = puVar5->mUnk_06; + auStack_9c.mUnk_20 = puVar5->mUnk_08; + auStack_9c.mUnk_24 = puVar5->mUnk_0C; u16 unk_18 = puVar5->mUnk_18; u16 unk_1A = puVar5->mUnk_1A; @@ -549,10 +535,10 @@ struct stack_struct { extern "C" void func_01ff9fbc(Mat2p *, unk32, Mat2p *); extern fx16 data_0203f964[]; -void MapObjectDoorBase::func_ov031_020fcb78(s8 *param1, s8 param2) { +void MapObjectDoorBase::func_ov031_020fcb78(s8 *param1) { Vec2s sp10; stack_struct sp8; - u32 sp4; + ActorRef sp4; bool var_r2; if (!GET_FLAG(this->mFlags, MapObjFlag_5)) { @@ -568,9 +554,9 @@ void MapObjectDoorBase::func_ov031_020fcb78(s8 *param1, s8 param2) { bool uVar4 = (this->mUnk_84 % 0x1A) >= 0x0D ? true : false; //! TODO: fake match? - sp4 = *(u32 *) &this->mUnk_38; + sp4 = *(ActorRef *) &this->mUnk_38; - if (data_027e0998->vfunc_00(&this->mPos, &sp10, (u16 *) &sp4) && uVar4 != 0) { + if (data_027e0998->vfunc_00(&this->mPos, &sp10, &sp4) && uVar4 != 0) { Mat2p m; if (this->IsOrientedVertically()) { diff --git a/src/031_Land/MapObject/MapObjectDoorClick.cpp b/src/031_Land/MapObject/MapObjectDoorClick.cpp index 25549195..4821b4c7 100644 --- a/src/031_Land/MapObject/MapObjectDoorClick.cpp +++ b/src/031_Land/MapObject/MapObjectDoorClick.cpp @@ -198,12 +198,12 @@ void MapObjectDoorClick::vfunc_08(void) { } } -void MapObjectDoorClick::vfunc_18(s8 *param1, s8 param2) { - this->func_ov031_020fcb78(param1, param2); +void MapObjectDoorClick::vfunc_18(s8 *param1) { + this->func_ov031_020fcb78(param1); } // https://decomp.me/scratch/3XTMj -void MapObjectDoorClick::vfunc_14(void) { +void MapObjectDoorClick::vfunc_14(unk32 param1) { f32 factor; f32 uVar3; s32 sVar2; @@ -256,7 +256,7 @@ void MapObjectDoorClick::vfunc_5C(MapObjState state, unk32 param2) { this->mState = state; switch (this->mState) { - case MapObjDoorClickState_3: + case MapObjDoorClickState_3: { this->vfunc_7C(); u16 result = ROUND_FX32(MUL_FX32(func_01ffb428(0x1000 - this->mUnk_6C, 0x1000), INT_TO_FX32(this->mUnk_78))); @@ -272,6 +272,7 @@ void MapObjectDoorClick::vfunc_5C(MapObjState state, unk32 param2) { } break; + } case MapObjDoorClickState_8: if (this->mUnk_20.mParams[2] & 0xFF) { this->MapObjectDoorBase::vfunc_5C(state, param2); diff --git a/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp b/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp index 9f02125a..bf0477b0 100644 --- a/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp +++ b/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp @@ -14,7 +14,6 @@ #include "Unknown/UnkStruct_ov000_020b51b8.hpp" #include "versions.h" -extern "C" void *func_ov000_02077590(unk32); extern "C" unk32 func_01ffb428(unk32, unk32); extern "C" void func_01ffaf74(VecFx32 *, Mat4x3p *, VecFx32 *); extern "C" void func_01ff93c0(VecFx32 *, fx32); @@ -126,7 +125,7 @@ void MapObjectDoorDangerSpawn::vfunc_04(void) { 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); + uVar5->func_ov000_0207834c(&auStack_20, func_ov000_02077590(0), 0); } } @@ -146,14 +145,10 @@ void MapObjectDoorDangerSpawn::vfunc2_08(void) { data_ov000_020b51b8.func_ov000_0206c96c(data_ov031_02110c00[this->mUnk_20.mParams[3]]); } -struct UnkStruct_Copy { - unk32 data[8]; -}; - // https://decomp.me/scratch/KLkdU void MapObjectDoorDangerSpawn::vfunc_08(void) { - UnkStruct_Copy sp3C; - UnkStruct_Copy sp1C; + UnkStackStruct_ov000_02077590 sp3C; + UnkStackStruct_ov000_02077590 sp1C; VecFx32 sp10; VecFx32 sp4; @@ -172,7 +167,7 @@ void MapObjectDoorDangerSpawn::vfunc_08(void) { this->mUnk_88 = 1; this->vfunc_74(); - UnkStruct_Copy *temp_r0_3 = (UnkStruct_Copy *) func_ov000_02077590(3); + UnkStackStruct_ov000_02077590 *temp_r0_3 = func_ov000_02077590(3); sp3C = *temp_r0_3; ((unk16 *) sp3C.data)[3] = this->mAngle; @@ -187,7 +182,7 @@ void MapObjectDoorDangerSpawn::vfunc_08(void) { data_027e0d8c->func_ov093_02166058(); } } else { - UnkStruct_Copy *temp_r0_3 = (UnkStruct_Copy *) func_ov000_02077590(0); + UnkStackStruct_ov000_02077590 *temp_r0_3 = func_ov000_02077590(0); sp1C = *temp_r0_3; @@ -557,11 +552,11 @@ bool MapObjectDoorDangerSpawn::func_ov031_020fdec8(void) { return false; } -void MapObjectDoorDangerSpawn::vfunc_18(s8 *param1, s8 param2) { - this->func_ov031_020fcb78(param1, param2); +void MapObjectDoorDangerSpawn::vfunc_18(s8 *param1) { + this->func_ov031_020fcb78(param1); } -void MapObjectDoorDangerSpawn::vfunc_14(void) { +void MapObjectDoorDangerSpawn::vfunc_14(unk32 param1) { Mat3p m; Mat3p_InitYRotation(&m, SIN((u16) this->mAngle), COS((u16) this->mAngle)); diff --git a/src/031_Land/MapObject/MapObjectDoorKey.cpp b/src/031_Land/MapObject/MapObjectDoorKey.cpp index 13f38d70..984c5578 100644 --- a/src/031_Land/MapObject/MapObjectDoorKey.cpp +++ b/src/031_Land/MapObject/MapObjectDoorKey.cpp @@ -42,12 +42,12 @@ void MapObjectDoorKey::vfunc_08(void) { this->mUnk_A4 = false; } -void MapObjectDoorKey::vfunc_18(s8 *param1, s8 param2) { - this->MapObjectDoorBase::func_ov031_020fcb78(param1, param2); +void MapObjectDoorKey::vfunc_18(s8 *param1) { + this->MapObjectDoorBase::func_ov031_020fcb78(param1); } // https://decomp.me/scratch/XO3u2 -void MapObjectDoorKey::vfunc_14(void) { +void MapObjectDoorKey::vfunc_14(unk32 param1) { f32 factor; f32 uVar3; s32 sVar2; diff --git a/src/031_Land/MapObject/MapObjectDoorSwitch.cpp b/src/031_Land/MapObject/MapObjectDoorSwitch.cpp index cb73ad62..6a984299 100644 --- a/src/031_Land/MapObject/MapObjectDoorSwitch.cpp +++ b/src/031_Land/MapObject/MapObjectDoorSwitch.cpp @@ -112,7 +112,7 @@ bool MapObjectDoorSwitch::vfunc_6C(void) { return true; } -void MapObjectDoorSwitch::vfunc_14(void) { +void MapObjectDoorSwitch::vfunc_14(unk32 param1) { u16 angle = this->mAngle; Mat3p m; @@ -123,8 +123,8 @@ void MapObjectDoorSwitch::vfunc_14(void) { this->mUnk_094.vfunc_14(&m, &local_40); } -void MapObjectDoorSwitch::vfunc_18(s8 *param1, s8 param2) { - this->func_ov031_020fcb78(param1, param2); +void MapObjectDoorSwitch::vfunc_18(s8 *param1) { + this->func_ov031_020fcb78(param1); } void MapObjectDoorSwitch::vfunc_74(void) { diff --git a/src/031_Land/MapObject/MapObjectGrass.cpp b/src/031_Land/MapObject/MapObjectGrass.cpp index f0a1b549..e94a311b 100644 --- a/src/031_Land/MapObject/MapObjectGrass.cpp +++ b/src/031_Land/MapObject/MapObjectGrass.cpp @@ -50,7 +50,7 @@ void MapObjectGrass::vfunc_08() { } // non-matching -void MapObjectGrass::vfunc_14() { +void MapObjectGrass::vfunc_14(unk32 param1) { VecFx32 vec; for (unk32 i = 0; i < ARRAY_LEN(this->mUnk_40); ++i) { VecFx32_Add(&this->mUnk_40[i], &this->mPos, &vec); diff --git a/src/031_Land/MapObject/MapObjectPot.cpp b/src/031_Land/MapObject/MapObjectPot.cpp index b190774c..3004c9ef 100644 --- a/src/031_Land/MapObject/MapObjectPot.cpp +++ b/src/031_Land/MapObject/MapObjectPot.cpp @@ -112,7 +112,7 @@ void MapObjectPot::vfunc_48() { this->func_ov000_0209d2c4(0x0, true); } -void MapObjectPot::vfunc_14() { +void MapObjectPot::vfunc_14(unk32 param1) { this->func_ov000_0209d518(&this->mPos, 0x5A7, 0x5A7, 0x1F); this->mUnk_48.vfunc_18(&this->mPos); } diff --git a/src/031_Land/MapObject/MapObjectUnkSKDI.cpp b/src/031_Land/MapObject/MapObjectUnkSKDI.cpp index 3c6434e4..0bca2eca 100644 --- a/src/031_Land/MapObject/MapObjectUnkSKDI.cpp +++ b/src/031_Land/MapObject/MapObjectUnkSKDI.cpp @@ -401,7 +401,7 @@ bool MapObjectUnkSKDI::vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) } } -void MapObjectUnkSKDI::vfunc_14() { +void MapObjectUnkSKDI::vfunc_14(unk32 param1) { this->mUnk_040.vfunc_18(&this->mPos); } diff --git a/src/031_Land/MapObject/MapObjectUnkSWHT.cpp b/src/031_Land/MapObject/MapObjectUnkSWHT.cpp index da3876db..6f02db45 100644 --- a/src/031_Land/MapObject/MapObjectUnkSWHT.cpp +++ b/src/031_Land/MapObject/MapObjectUnkSWHT.cpp @@ -196,7 +196,7 @@ void MapObjectUnkSWHT::vfunc_0C() { this->func_ov031_02101dd8(); } -void MapObjectUnkSWHT::vfunc_14() { +void MapObjectUnkSWHT::vfunc_14(unk32 param1) { this->mUnk_054.vfunc_18(&this->mPos); } diff --git a/src/032_MapA1/Actor/ActorFleeingSpinut.cpp b/src/032_MapA1/Actor/ActorFleeingSpinut.cpp index ca09d33d..efc87af0 100644 --- a/src/032_MapA1/Actor/ActorFleeingSpinut.cpp +++ b/src/032_MapA1/Actor/ActorFleeingSpinut.cpp @@ -210,7 +210,7 @@ void ActorFleeingSpinut::vfunc_30(Actor_vfunc_30 *param1) { var = false; } - if (param1->mUnk_00 != var && param1->mUnk_01 != var) { + if (param1->mUnk_00.unk_00 != var && param1->mUnk_00.unk_01 != var) { return; } @@ -221,14 +221,14 @@ void ActorFleeingSpinut::vfunc_30(Actor_vfunc_30 *param1) { Vec2s sp04; - if (!data_027e0998->vfunc_00(&sp08, &sp04, (u16 *) &this->mRef)) { + if (!data_027e0998->vfunc_00(&sp08, &sp04, &this->mRef)) { return; } data_0204af1c.func_0201aa44(&data_ov032_0212290c, &sp04, 0x1, NULL); } -void ActorFleeingSpinut::vfunc_2C(unk32 param1) { +void ActorFleeingSpinut::vfunc_2C(Actor_vfunc_30 *param1) { if (!this->Actor::func_01fff5d0(param1, 0x0)) { return; } @@ -285,8 +285,8 @@ void ActorFleeingSpinut::func_ov032_0211bea8() { void ActorFleeingSpinut::func_ov032_0211bf84() { this->mUnk_110.vfunc_1C(data_ov032_021223b4, 0x1000, 0x19A, 0x0); - this->mUnk_52 = 0xF; - this->mUnk_50 = 0x0; + this->mTimerMax = 0xF; + this->mTimer = 0x0; this->mVel.x = FLOAT_TO_FX32(0.0f); this->mVel.z = FLOAT_TO_FX32(0.0f); @@ -294,7 +294,7 @@ void ActorFleeingSpinut::func_ov032_0211bf84() { void ActorFleeingSpinut::func_ov032_0211bffc() { if (this->func_ov032_0211ca20()) { - if (this->mUnk_50 >= this->mUnk_52) { + if (this->mTimer >= this->mTimerMax) { this->SetState(ActorFleeingSpinutState_1); } else { this->SetState(ActorFleeingSpinutState_4); @@ -423,8 +423,8 @@ void ActorFleeingSpinut::func_ov032_0211c53c() { this->mUnk_224 = false; this->mUnk_1EC.func_ov032_0211d08c(&this->mPos); - this->mUnk_52 = 0xA; - this->mUnk_50 = 0x0; + this->mTimerMax = 0xA; + this->mTimer = 0x0; this->mVel.x = FLOAT_TO_FX32(0.0f); this->mVel.z = FLOAT_TO_FX32(0.0f); @@ -649,7 +649,8 @@ u16 *ActorFleeingSpinut_1EC::func_ov032_0211cd60(VecFx32 *param1, s16 *param2, V func_01ff9258(sp1C.x - param1->x, sp1C.z - param1->z); - UnkAngleStruct spm04 = {.angle = (u16) sp00}; + UnkAngleStruct spm04; + spm04.angle = sp00; func_02017f54(param2, spm04); } diff --git a/src/032_MapA1/Actor/ActorKeese.cpp b/src/032_MapA1/Actor/ActorKeese.cpp index abbc4902..a05a30d4 100644 --- a/src/032_MapA1/Actor/ActorKeese.cpp +++ b/src/032_MapA1/Actor/ActorKeese.cpp @@ -321,7 +321,7 @@ void ActorKeese::vfunc_20() { } // non-matching -void ActorKeese::vfunc_2C(unk32 param1) { +void ActorKeese::vfunc_2C(Actor_vfunc_30 *param1) { if (!this->func_01fff5d0(param1, 0x0)) { this->mUnk_278.func_ov000_020a0334(); @@ -341,8 +341,8 @@ void ActorKeese::vfunc_2C(unk32 param1) { // non-matching void ActorKeese::func_ov032_0211e9ec() { - this->mUnk_52 = gRandom.Next32(0x1F) + 0x1E; - this->mUnk_50 = 0x0; + this->mTimerMax = gRandom.Next32(0x1F) + 0x1E; + this->mTimer = 0x0; u32 sp00; @@ -411,8 +411,8 @@ void ActorKeese::func_ov032_0211ece8() {} void ActorKeese::func_ov032_0211ee5c() {} void ActorKeese::func_ov032_0211f054() { - this->mUnk_52 = gRandom.Next32(0x1F) + 0x1E; - this->mUnk_50 = 0x0; + this->mTimerMax = gRandom.Next32(0x1F) + 0x1E; + this->mTimer = 0x0; } void ActorKeese::func_ov032_0211f0a8() { @@ -602,8 +602,8 @@ void ActorKeese::func_ov032_0211f804() { } ++this->mUnk_228; - this->mUnk_52 = 0x1E; - this->mUnk_50 = 0x00; + this->mTimerMax = 0x1E; + this->mTimer = 0x00; break; case 0x1: { @@ -617,8 +617,8 @@ void ActorKeese::func_ov032_0211f804() { func_ov017_020c26f8(0x1, &vec, 0x1, 0x2); ++this->mUnk_228; - this->mUnk_52 = 0xA; - this->mUnk_50 = 0x0; + this->mTimerMax = 0xA; + this->mTimer = 0x0; break; } diff --git a/src/032_MapA1/Actor/ActorSpinut.cpp b/src/032_MapA1/Actor/ActorSpinut.cpp index cd1e14c0..17c49daa 100644 --- a/src/032_MapA1/Actor/ActorSpinut.cpp +++ b/src/032_MapA1/Actor/ActorSpinut.cpp @@ -164,7 +164,7 @@ void ActorSpinut::func_ov032_021194dc(ActorState state) { return; } - gpActorManager->func_01fff2fc((void (*)(Actor *, u16)) &ActorSpinut::func_ov032_0211b37c, param2); + gpActorManager->func_01fff2fc(ActorSpinut::func_ov032_0211b37c, (void *) param2); //! TODO: cast is right? } void ActorSpinut::SetState(ActorState state) { @@ -272,7 +272,7 @@ void ActorSpinut::vfunc_20() { data_027e09c0->func_ov000_0207de98(this->mRef, &stack, this->mUnk_38); } -void ActorSpinut::vfunc_2C(unk32 param1) { +void ActorSpinut::vfunc_2C(Actor_vfunc_30 *param1) { if (!this->Actor::func_01fff5d0(param1, 0x0)) { return; } @@ -307,8 +307,8 @@ void ActorSpinut::func_ov032_02119a0c() { } this->mUnk_21C = var; - this->mUnk_52 = gRandom.Next32(0x15) + 0x1E; - this->mUnk_50 = 0x00; + this->mTimerMax = gRandom.Next32(0x15) + 0x1E; + this->mTimer = 0x00; ++this->mUnk_218; break; @@ -380,16 +380,16 @@ void ActorSpinut::func_ov032_02119c80() { void ActorSpinut::func_ov032_02119d7c() { this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0); - this->mUnk_52 = 0x14; - this->mUnk_50 = 0x00; - this->mVel.x = FLOAT_TO_FX32(0.0f); - this->mVel.z = FLOAT_TO_FX32(0.0f); + this->mTimerMax = 0x14; + this->mTimer = 0x00; + this->mVel.x = FLOAT_TO_FX32(0.0f); + this->mVel.z = FLOAT_TO_FX32(0.0f); } // non-matching void ActorSpinut::func_ov032_02119df4() { s16 var; - s16 delta = this->mUnk_52 - this->mUnk_50; + s16 delta = this->mTimerMax - this->mTimer; func_ov000_020986b4(&var, this, 0x0); s16 val = var; @@ -409,8 +409,8 @@ void ActorSpinut::func_ov032_02119e90() { this->mUnk_288.x = func_01ffb66c(0x1800, func_01ffb428(0x148, 0x14) >> 0xC); - this->mUnk_50 = 0x0; - this->mUnk_52 = 0xB4; + this->mTimer = 0x0; + this->mTimerMax = 0xB4; if (this->mUnk_5C.mParams[0] == 0x2) { this->mUnk_264 = 0x14000; @@ -499,10 +499,10 @@ void ActorSpinut::func_ov032_0211a140() { this->mUnk_21C = var; - this->mVel.x = FLOAT_TO_FX32(0.0f); - this->mVel.z = FLOAT_TO_FX32(0.0f); - this->mUnk_52 = 0x1E; - this->mUnk_50 = 0x00; + this->mVel.x = FLOAT_TO_FX32(0.0f); + this->mVel.z = FLOAT_TO_FX32(0.0f); + this->mTimerMax = 0x1E; + this->mTimer = 0x00; } // non-matching @@ -620,10 +620,10 @@ void ActorSpinut::func_ov032_0211a86c() { void ActorSpinut::func_ov032_0211a950() { this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0); - this->mUnk_52 = 0x14; - this->mUnk_50 = 0x00; - this->mVel.x = FLOAT_TO_FX32(0.0f); - this->mVel.z = FLOAT_TO_FX32(0.0f); + this->mTimerMax = 0x14; + this->mTimer = 0x00; + this->mVel.x = FLOAT_TO_FX32(0.0f); + this->mVel.z = FLOAT_TO_FX32(0.0f); } void ActorSpinut::func_ov032_0211a9c8() { @@ -696,8 +696,8 @@ void ActorSpinut::func_ov032_0211ac20() { this->mVel.x = FLOAT_TO_FX32(0.0f); this->mVel.z = FLOAT_TO_FX32(0.0f); - this->mUnk_52 = 0xA; - this->mUnk_50 = 0x0; + this->mTimerMax = 0xA; + this->mTimer = 0x0; this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0); } @@ -752,7 +752,7 @@ void ActorSpinut::func_ov032_0211adf4() { data_027e0cec->func_ov000_0209feac(0x880, &this->mPos, 0x2, 0x0, 0x0); this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0); - if (this->func_ov032_0211b064(0x0) || (this->mUnk_294 && this->mUnk_50 >= this->mUnk_52)) { + if (this->func_ov032_0211b064(0x0) || (this->mUnk_294 && this->mTimer >= this->mTimerMax)) { this->SetState(ActorSpinutState_1); return; } @@ -847,11 +847,11 @@ void ActorSpinut::func_ov032_0211b298() { this->mUnk_288.y = FLOAT_TO_FX32(0.0f); } -void ActorSpinut::func_ov032_0211b37c(ActorSpinut *thisx, u16 param1) { +void ActorSpinut::func_ov032_0211b37c(Actor *thisx, Actor_vfunc_30 *param1) { if (thisx->GetActorId() == ActorId_Spinut) { - thisx->mUnk_294 = true; - thisx->mUnk_52 = param1; - thisx->mUnk_50 = 0x0; + ((ActorSpinut *) thisx)->mUnk_294 = true; + thisx->mTimerMax = (u16) param1; //! TODO: fake match + thisx->mTimer = 0x0; } } diff --git a/src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp b/src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp index 967dbd89..653daf14 100644 --- a/src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp +++ b/src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp @@ -348,8 +348,9 @@ bool MapObjectUnkSWSW::vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) return true; } - UnkAngleStruct angle = {.angle = actorNSSW->mAngle}; - VecFx32 *vec = data_027e0ce0->func_01fff148(0x0); + UnkAngleStruct angle; + angle.angle = actorNSSW->mAngle; + VecFx32 *vec = data_027e0ce0->func_01fff148(0x0); if (!func_02016ae0(&actorNSSW->mPos, vec, angle, 0x2AAB, 0x1)) { return false; @@ -486,7 +487,7 @@ void MapObjectUnkSWSW::vfunc_3C(unk32 param1) { } } -void MapObjectUnkSWSW::vfunc_14() { +void MapObjectUnkSWSW::vfunc_14(unk32 param1) { VecFx32 vec; VecFx32_Init(this->mPos.x + this->mUnk_0EC.x, this->mPos.y + this->mUnk_0EC.y, this->mPos.z + this->mUnk_0EC.z, &vec); diff --git a/src/063_Shrine/Actor/ActorUnkCANS.cpp b/src/063_Shrine/Actor/ActorUnkCANS.cpp index 27743c7d..c015e6e4 100644 --- a/src/063_Shrine/Actor/ActorUnkCANS.cpp +++ b/src/063_Shrine/Actor/ActorUnkCANS.cpp @@ -232,7 +232,7 @@ void ActorUnkCANS::func_ov063_02158448(unk32 param1) { void ActorUnkCANS::func_ov063_02158490(void) { mUnk_48 -= mUnk_200.mUnk_1E; - func_ov017_020bf050(this, &mUnk_200, 1); + this->func_ov017_020bf050(&mUnk_200, 1); this->func_ov063_02158448(2); } @@ -442,7 +442,7 @@ void ActorUnkCANS::vfunc_20(void) { } } -void ActorUnkCANS::vfunc_2C(unk32 param1) { +void ActorUnkCANS::vfunc_2C(Actor_vfunc_30 *param1) { if (!this->func_01fff5d0(param1, 0)) { return; } @@ -587,7 +587,7 @@ void ActorUnkCANS::func_ov063_02159100(void) { return; } - u16 *tmpArr = &mUnk_224.mUnk_08; + u16 *tmpArr = (u16 *) &mUnk_224.mUnk_08; if (tmpArr[0] < tmpArr[1]) { this->func_ov063_02158448(4); return; @@ -759,9 +759,9 @@ void ActorUnkCANS::func_ov063_02159784(void) { void ActorUnkCANS::func_ov063_021598fc(void) { mUnk_128.vfunc_1C(data_ov063_02163080, 0x1333, 0x19A, 0); - mUnk_52 = gRandom.Next32(0x15) + 10; - mUnk_50 = 0; - mUnk_276 = gRandom.Next32(0) & 0x80000000 ? 1 : -1; + mTimerMax = gRandom.Next32(0x15) + 10; + mTimer = 0; + mUnk_276 = gRandom.Next32(0) & 0x80000000 ? 1 : -1; } // non-matching @@ -776,24 +776,16 @@ void ActorUnkCANS::func_ov063_021599e4(void) { unk32 iVar9 = ABS((unk16) ((mUnk_26C * 0x4000 + mUnk_276) - ret1)); if (DEG_TO_ANG(90) < iVar9) { - mUnk_50 = 0; + mTimer = 0; mUnk_276 *= -1; - mUnk_52 = 0x1E; + mTimerMax = 0x1E; } } - unk32 flag; - if (mUnk_50 < mUnk_52) { - mUnk_50++; - flag = 0; - } else { - flag = 1; - } - - if (flag) { + if (this->IsTimerOut()) { mUnk_276 *= -1; - mUnk_52 = gRandom.Next32(0x15) + 10; - mUnk_50 = 0; + mTimerMax = gRandom.Next32(0x15) + 10; + mTimer = 0; } func_01ff916c(&mUnk_270, mUnk_276 * 0x19A, 0xCD); @@ -1037,7 +1029,7 @@ unk32 ActorUnkCANS::func_ov063_0215a2c0(void) { void ActorUnkCANS::func_ov063_0215a428(void) { // A not very clean code to access 22C and 22E matching the asm - u16 *values = &mUnk_224.mUnk_08; + u16 *values = (u16 *) &mUnk_224.mUnk_08; if (values[0] < values[1]) { this->func_ov063_02158448(4); } else if (mUnk_268 == NULL) { diff --git a/src/063_Shrine/Actor/ActorUnkCASE.cpp b/src/063_Shrine/Actor/ActorUnkCASE.cpp index 0047b9ff..dbeb8867 100644 --- a/src/063_Shrine/Actor/ActorUnkCASE.cpp +++ b/src/063_Shrine/Actor/ActorUnkCASE.cpp @@ -237,18 +237,14 @@ void ActorUnkCASE::func_ov063_0215b054(void) { mVel.y = 0; mVel.z = mUnk_1E0; UNSET_FLAG2(*(s16 *) &mUnk_44, ActorFlag_5); - mUnk_52 = -1; - mUnk_50 = 0; + this->mTimerMax = -1; + this->mTimer = 0; } void ActorUnkCASE::func_ov063_0215b090(void) { - if (mUnk_50 < 4) { + if (this->mTimer < 4) { this->func_ov063_0215afb8(); - - if (mUnk_50 < mUnk_52) { - mUnk_50++; - } - + this->IsTimerOut(); this->vfunc_10(&mUnk_174.mUnk_0C); data_027e09c0->func_ov000_0207e58c(mRef, 3, 4, &mUnk_174); return; @@ -428,7 +424,7 @@ post: } } -void ActorUnkCASE::vfunc_2C(unk32 param1) { +void ActorUnkCASE::vfunc_2C(Actor_vfunc_30 *param1) { if (!this->func_01fff5d0(param1, 0)) { return; } diff --git a/src/063_Shrine/Actor/ActorUnkRBLS.cpp b/src/063_Shrine/Actor/ActorUnkRBLS.cpp index b95b457b..cfeb3f0b 100644 --- a/src/063_Shrine/Actor/ActorUnkRBLS.cpp +++ b/src/063_Shrine/Actor/ActorUnkRBLS.cpp @@ -41,7 +41,7 @@ void ActorUnkRBLS::vfunc_24(void) { this->vfunc_20(); } -void ActorUnkRBLS::vfunc_2C(unk32 param1) { +void ActorUnkRBLS::vfunc_2C(Actor_vfunc_30 *param1) { ModelRender *var1 = &this->mUnk_94; VecFx32 *var2 = &this->mPos; var1->vfunc_18(var2); diff --git a/src/063_Shrine/Actor/ActorUnkRMSBase.cpp b/src/063_Shrine/Actor/ActorUnkRMSBase.cpp index f0b21fed..4d062ea0 100644 --- a/src/063_Shrine/Actor/ActorUnkRMSBase.cpp +++ b/src/063_Shrine/Actor/ActorUnkRMSBase.cpp @@ -24,7 +24,7 @@ void ActorUnkRMSBase::vfunc_24() { this->vfunc_20(); } -void ActorUnkRMSBase::vfunc_2C(unk32 param1) { +void ActorUnkRMSBase::vfunc_2C(Actor_vfunc_30 *param1) { UnkStruct_ov031_02114870::vfunc_2C(param1); if (mUnk_154) { diff --git a/src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp b/src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp index 4e223cec..b0120ecc 100644 --- a/src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp +++ b/src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp @@ -72,7 +72,7 @@ void MapObjectUnkLTRW::vfunc_08() { } } -void MapObjectUnkLTRW::vfunc_14() { +void MapObjectUnkLTRW::vfunc_14(unk32 param1) { mUnk_40.vfunc_18(&mPos); } diff --git a/src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp b/src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp index 0c3d4fcd..82dd0400 100644 --- a/src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp +++ b/src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp @@ -124,7 +124,7 @@ void MapObjectUnkMTJR::func_ov063_02161288(void) { UNSET_FLAG(mFlags, 0); } -void MapObjectUnkMTJR::vfunc_14() { +void MapObjectUnkMTJR::vfunc_14(unk32 param1) { this->func_ov000_0209d518(&mPos, 0xD9A, 0xD9A, 0x1F); mUnk_40.vfunc_18(&mPos); } diff --git a/src/063_Shrine/MapObject/MapObjectUnkSTAT.cpp b/src/063_Shrine/MapObject/MapObjectUnkSTAT.cpp index d42e2f6c..76693b3b 100644 --- a/src/063_Shrine/MapObject/MapObjectUnkSTAT.cpp +++ b/src/063_Shrine/MapObject/MapObjectUnkSTAT.cpp @@ -19,22 +19,6 @@ extern "C" f32 func_02039f04(unk32); extern "C" fx32 func_01ffb428(unk32, unk32); extern "C" unk32 func_02016b8c(VecFx32 *, VecFx32 *, unk32, UnkAngleStruct, u16, unk32); -// Overlay 0 -struct UnkStruct_ov000_02077590 { - /* 00 */ s16 mUnk_00; - /* 02 */ s16 mUnk_02; - /* 04 */ s16 mUnk_04; - /* 06 */ s16 mUnk_06; - /* 08 */ unk32 mUnk_08; - /* 0C */ VecFx32 mUnk_0C; - /* 18 */ u16 mUnk_18; - /* 1A */ u16 mUnk_1A; - /* 1C */ u16 mUnk_1C; - /* 1E */ u16 mUnk_1E; -}; - -extern "C" UnkStruct_ov000_02077590 *func_ov000_02077590(unk32); - DECL_PROFILE(MapObjectProfileUnkSTAT); unk32 data_ov063_02164508[3]; // Is probably part of the profile? @@ -117,7 +101,7 @@ void MapObjectUnkSTAT::vfunc_0C(void) { this->vfunc_08(); } -void MapObjectUnkSTAT::vfunc_14(void) { +void MapObjectUnkSTAT::vfunc_14(unk32 param1) { VecFx32 vec; VecFx32_Init(mPos.x + mUnk_60, mPos.y + mUnk_64, mPos.z + mUnk_68, &vec); mUnk_40.func_01ffc6d4(mAngleStruct, &vec); @@ -179,7 +163,7 @@ void MapObjectUnkSTAT::func_ov063_0215f7ac(void) { stackStruct.mUnk_3A = 7; stackStruct.mUnk_3B = 7; - UnkStruct_ov000_02077590 *res1 = func_ov000_02077590(1); + UnkStackStruct_ov000_02077590 *res1 = func_ov000_02077590(1); stackStruct.mUnk_18 = res1->mUnk_00; stackStruct.mUnk_1A = res1->mUnk_02; diff --git a/src/070_Dungeon/Actor/ActorUnkKEYN.cpp b/src/070_Dungeon/Actor/ActorUnkKEYN.cpp index 1feb6b7e..d9f3987d 100644 --- a/src/070_Dungeon/Actor/ActorUnkKEYN.cpp +++ b/src/070_Dungeon/Actor/ActorUnkKEYN.cpp @@ -43,9 +43,7 @@ void ActorUnkKEYN::func_ov070_021420a4(void) {} void ActorUnkKEYN::func_ov070_021420d8(void) {} void ActorUnkKEYN::func_ov070_02142140(void) { - if (this->mUnk_50 < this->mUnk_52) { - this->mUnk_50++; - } + this->IsTimerOut(); if (!data_027e09b8->func_01ffd420()) { if (data_027e0d34->TryItemGive(this->mItemId)) { diff --git a/src/071_Tower/Actor/ActorTearLight.cpp b/src/071_Tower/Actor/ActorTearLight.cpp index 34e42ed9..63a130f5 100644 --- a/src/071_Tower/Actor/ActorTearLight.cpp +++ b/src/071_Tower/Actor/ActorTearLight.cpp @@ -37,14 +37,16 @@ extern "C" void func_01ffedac(Vec2bCpp *, VecFx32 *); extern "C" fx32 func_ov000_02080068(fx32 x); extern "C" fx32 func_ov000_02080080(fx32 x); -static ActorUnkZLSL_AnimationTag data_ov071_02164be0 = {0x0, "szku"}; -static ActorTearLight_UnkStruct data_ov071_02164cd8 = {.fct = 0x0}; -static ActorTearLight_UnkStruct data_ov071_02164ce0 = {.fct = ActorTearLight::func_ov071_0215fed4}; -static ActorTearLight_UnkStruct data_ov071_02164ce8 = {.fct = ActorTearLight::func_ov071_0215ff08}; -static ActorTearLight_UnkStruct data_ov071_02164cf0 = {.fct = ActorTearLight::func_ov071_0215ff3c}; -static ActorTearLight_UnkStruct data_ov071_02164cf8 = {.fct = ActorTearLight::func_ov071_0215ff3c}; -static ActorTearLight_UnkStruct data_ov071_02164d00 = {.fct = ActorTearLight::func_ov071_0215ffb8}; -static ActorTearLight_UnkStruct data_ov071_02164d08 = {.fct = ActorTearLight::func_ov071_0215ffbc}; +extern UnkStruct_ov019_020d24c8_28_258_00 data_ov071_02165150; + +static ActorUnkZLSL_AnimationTag data_ov071_02164be0 = {0x0, "szku"}; +static const ActorTearLight_UnkStruct data_ov071_02164cd8 = {.fct = NULL}; +static ActorTearLight_UnkStruct data_ov071_02164ce0 = {.fct = ActorTearLight::func_ov071_0215fed4}; +static ActorTearLight_UnkStruct data_ov071_02164ce8 = {.fct = ActorTearLight::func_ov071_0215ff08}; +static ActorTearLight_UnkStruct data_ov071_02164cf0 = {.fct = ActorTearLight::func_ov071_0215ff3c}; +static ActorTearLight_UnkStruct data_ov071_02164cf8 = {.fct = ActorTearLight::func_ov071_0215ff3c}; +static ActorTearLight_UnkStruct data_ov071_02164d00 = {.fct = ActorTearLight::func_ov071_0215ffb8}; +static ActorTearLight_UnkStruct data_ov071_02164d08 = {.fct = ActorTearLight::func_ov071_0215ffbc}; DECL_PROFILE(ActorProfileTearLight); @@ -125,7 +127,7 @@ void ActorTearLight::vfunc_24() { if (this->mState == ActorUnkSZKUState_2) { if (this->mUnk_1B8 != 0x0) { this->IsTimerOut(); - if (this->mUnk_50 == 0x14) { + if (this->mTimer == 0x14) { this->func_ov071_0215fca4(); VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), &this->mVel); this->mUnk_1B8 = 0x0; @@ -144,7 +146,7 @@ void ActorTearLight::vfunc_24() { this->mUnk_104.vfunc_34(); } -void ActorTearLight::vfunc_2C(unk32 param1) { +void ActorTearLight::vfunc_2C(Actor_vfunc_30 *param1) { if (!this->func_01fff5d0(param1, 0x0)) { return; } @@ -159,9 +161,8 @@ void ActorTearLight::vfunc_2C(unk32 param1) { data_027e09b4->func_ov017_020c08c4(&vecC, 0x333, 0x333, 0x1F, 0x0, 0x1); } -// non-matching void ActorTearLight::vfunc_30(Actor_vfunc_30 *param1) { - this->func_ov017_020bef88(param1, GET_PROFILE(ActorProfileTearLight), 0x1); + this->func_ov017_020bef88(param1, &data_ov071_02165150, 0x1); } void ActorTearLight::func_ov071_0215f7f4(ActorState state) { @@ -309,8 +310,8 @@ void ActorTearLight::func_ov071_0215fc54() { void ActorTearLight::func_ov071_0215fca4() { this->func_ov071_0215f7f4(ActorUnkSZKUState_1); - this->mUnk_52 = 0xFFFF; - this->mUnk_50 = 0x0000; + this->mTimerMax = 0xFFFF; + this->mTimer = 0x0000; VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.25f), FLOAT_TO_FX32(0.0f), &this->mVel); @@ -335,8 +336,8 @@ void ActorTearLight::func_ov071_0215fd04() { var_z = !this->mUnk_18D; } - this->mUnk_52 = 0xFFFF; - this->mUnk_50 = 0x0000; + this->mTimerMax = 0xFFFF; + this->mTimer = 0x0000; VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), &this->mVel); this->mUnk_44 = 0; if (var_z) { @@ -350,8 +351,8 @@ void ActorTearLight::func_ov071_0215fd04() { void ActorTearLight::func_ov071_0215fd80() { this->func_ov071_0215f7f4(ActorUnkSZKUState_3); - this->mUnk_52 = 0xFFFF; - this->mUnk_50 = 0x0000; + this->mTimerMax = 0xFFFF; + this->mTimer = 0x0000; VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), &this->mVel); this->mUnk_4A[0] = 0x0; @@ -364,8 +365,8 @@ void ActorTearLight::func_ov071_0215fd80() { void ActorTearLight::func_ov071_0215fdd4() { this->func_ov071_0215f7f4(ActorUnkSZKUState_4); - this->mUnk_52 = 0xFFFF; - this->mUnk_50 = 0x0000; + this->mTimerMax = 0xFFFF; + this->mTimer = 0x0000; this->mUnk_4A[0] = 0x0; VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), &this->mVel); diff --git a/src/101_SceneInitLand/UnkStruct_027e0ce0_40_101.cpp b/src/101_SceneInitLand/UnkStruct_027e0ce0_40_101.cpp index 0df7c2e0..a0db5ad8 100644 --- a/src/101_SceneInitLand/UnkStruct_027e0ce0_40_101.cpp +++ b/src/101_SceneInitLand/UnkStruct_027e0ce0_40_101.cpp @@ -1,3 +1,4 @@ +#include "Player/PlayerZelda.hpp" #include "System/OverlayManager.hpp" #include "System/SysNew.hpp" #include "Unknown/UnkStruct_027e09a4.hpp" @@ -12,25 +13,24 @@ UnkStruct_027e0ce0_40::UnkStruct_027e0ce0_40(bool param1, UnkStruct_027e0ce0_20 mUnk_14C(gOverlayManager.IsPlayerSub() ? new(HeapIndex_1) UnkStruct_027e0ce0_40_14C() : NULL), mUnk_150(data_027e09a4->IsCastleOrTown() ? new(HeapIndex_1) UnkStruct_027e0ce0_40_150() : NULL), mPlayer(-1, pItemMgr, this, this->mUnk_150), - mUnk_328(gOverlayManager.IsPlayerSub() ? new(HeapIndex_1) - UnkStruct_027e0ce0_40_328(pItemMgr, this, this->mUnk_150, pEquippedItem) - : NULL), + mpZelda(gOverlayManager.IsPlayerSub() ? new(HeapIndex_1) PlayerZeldaActor(pItemMgr, this, this->mUnk_150, pEquippedItem) + : NULL), mEquippedItem(*pEquippedItem), mIsSceneTowerInsideStairs(data_027e09a4->IsTowerInsideStairs()), mIsSceneTowerOutsideStairs(data_027e09a4->IsTowerOutsideStairs()), mIsSceneBossByrne(data_027e09a4->IsBossByrne()), mUnk_33B(param1) { this->mpPlayer = &this->mPlayer; - this->mUnk_330 = this->mUnk_328; - this->mPlayer.func_ov001_020bcb60(this->mUnk_328); + this->mUnk_330 = this->mpZelda; + this->mPlayer.func_ov001_020bcb60(this->mpZelda); - if (this->mUnk_328 != NULL) { - this->mUnk_328->mpPlayer = &this->mPlayer; + if (this->mpZelda != NULL) { + this->mpZelda->mpPlayer = &this->mPlayer; } } UnkStruct_027e0ce0_40::~UnkStruct_027e0ce0_40() { - delete this->mUnk_328; + delete this->mpZelda; delete this->mUnk_150; delete this->mUnk_14C; } @@ -48,16 +48,16 @@ bool UnkStruct_027e0ce0_40::func_ov101_02182fb4(bool param1) { this->mPlayer.func_ov001_020bcb70(); - if (this->mUnk_328 != NULL) { - this->mUnk_328->func_ov093_0216d0d4(); + if (this->mpZelda != NULL) { + this->mpZelda->func_ov093_0216d0d4(); } return param1; } void UnkStruct_027e0ce0_40::func_ov101_02183004() { - if (this->mUnk_328 != NULL) { - this->mUnk_328->func_ov093_0216d160(); + if (this->mpZelda != NULL) { + this->mpZelda->func_ov093_0216d160(); } this->mPlayer.func_ov001_020bcba8(); @@ -68,7 +68,7 @@ void UnkStruct_027e0ce0_40::func_ov101_02183024(const UnkStruct_ov001_020c40f4 * UnkStruct_027e0ce0_30 *param6, bool param7, bool param8) { bool var_r7 = false; - if (this->mUnk_328 != NULL) { + if (this->mpZelda != NULL) { if (GET_FLAG2(this->mUnk_104, UnkFlags3_4)) { var_r7 = true; } @@ -147,7 +147,7 @@ void UnkStruct_027e0ce0_40::func_ov101_02183024(const UnkStruct_ov001_020c40f4 * this->mPlayer.func_ov001_020bcbd0(&sp40.mUnk_00); - if (this->mUnk_328 != NULL) { + if (this->mpZelda != NULL) { UnkStruct_ov001_020c40f4 sp1C = *param2; if (sp8) { @@ -174,9 +174,9 @@ void UnkStruct_027e0ce0_40::func_ov101_02183024(const UnkStruct_ov001_020c40f4 * VecFx32_Copy(&sp10, &sp1C.mUnk_00); } - this->mUnk_328->func_ov093_0216d1cc(param3, &sp1C, var_r7, param8); + this->mpZelda->func_ov093_0216d1cc(param3, &sp1C, var_r7, param8); } - param6->func_ov001_020bbf7c((unk32) this, (unk32 *) &this->mPlayer, (unk32) this->mUnk_328); + param6->func_ov001_020bbf7c(this, &this->mPlayer, this->mpZelda); this->mUnk_33B = false; } diff --git a/src/102_CourseExecLand/MapObjectUnkPTFL_102.cpp b/src/102_CourseExecLand/MapObjectUnkPTFL_102.cpp index 22ac32c7..db8f2fb3 100644 --- a/src/102_CourseExecLand/MapObjectUnkPTFL_102.cpp +++ b/src/102_CourseExecLand/MapObjectUnkPTFL_102.cpp @@ -144,7 +144,7 @@ void MapObjectUnkPTFL::vfunc_0C() { this->vfunc_08(); } -void MapObjectUnkPTFL::vfunc_14() { +void MapObjectUnkPTFL::vfunc_14(unk32 param1) { Mat4p sp44; VecFx32 sp38; VecFx32 sp2C; diff --git a/src/102_CourseExecLand/MapObjectUnkSAND_102.cpp b/src/102_CourseExecLand/MapObjectUnkSAND_102.cpp index 8a259847..1373f485 100644 --- a/src/102_CourseExecLand/MapObjectUnkSAND_102.cpp +++ b/src/102_CourseExecLand/MapObjectUnkSAND_102.cpp @@ -216,7 +216,7 @@ void MapObjectUnkSAND::vfunc_0C() { } } -void MapObjectUnkSAND::vfunc_14() { +void MapObjectUnkSAND::vfunc_14(unk32 param1) { VecFx32 sp4 = this->mPos; Vec2bCpp sp0 = this->mUnk_3A; diff --git a/src/102_CourseExecLand/UnkStruct_027e0ce0_40_102.cpp b/src/102_CourseExecLand/UnkStruct_027e0ce0_40_102.cpp index 44b291f9..bb6bb179 100644 --- a/src/102_CourseExecLand/UnkStruct_027e0ce0_40_102.cpp +++ b/src/102_CourseExecLand/UnkStruct_027e0ce0_40_102.cpp @@ -90,7 +90,7 @@ void PlayerActorBase_74::func_ov102_02182c84(bool param1, unk32 param2, UnkAngle } } -void UnkStruct_027e0ce0_40_108::func_ov102_02182e54(unk32 param1, unk32 param2, unk32 param3) { +void UnkStruct_027e0ce0_40_108::func_ov102_02182e54(unk32 param1, VecFx32 *param2, unk32 param3) { Vec2s sp6; if (!data_027e09bc->mUnk_04[param1]->func_01ffd43c(&sp6, param2, 1)) { @@ -130,7 +130,7 @@ void UnkStruct_027e0ce0_40_108::func_ov102_02182e54(unk32 param1, unk32 param2, this->mUnk_40++; } -void UnkStruct_ItemManager_20::func_ov102_02182fa8(unk32 param1, unk32 param2) { +void UnkStruct_ItemManager_20::func_ov102_02182fa8(bool param1, bool 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); @@ -138,7 +138,7 @@ void UnkStruct_ItemManager_20::func_ov102_02182fa8(unk32 param1, unk32 param2) { this->mUnk_14.func_ov031_020db7f4(); } -void UnkStruct_ItemManager_20::func_ov102_02182ffc(unk32 param1) { +void UnkStruct_ItemManager_20::func_ov102_02182ffc(void *param1) { if (!data_027e09b8->func_01ffd420()) { this->mUnk_04->func_ov031_020db528(param1); } @@ -146,12 +146,12 @@ void UnkStruct_ItemManager_20::func_ov102_02182ffc(unk32 param1) { this->mUnk_0C->func_ov031_020dba3c(param1); } -void UnkStruct_027e0ce0_40::func_ov102_0218303c(unk32 param1, ItemManager *pItemMgr) { - s32 temp_r2; +void UnkStruct_027e0ce0_40::func_ov102_0218303c(bool param1, ItemManager *pItemMgr) { + bool temp_r2; bool var_r1; UnkStruct_027e0ce0_40_150 *temp_r1; - temp_r2 = this->func_ov017_020bcde8(param1, pItemMgr); + temp_r2 = this->func_ov017_020bcde8(param1); if (pItemMgr != NULL) { pItemMgr->func_ov017_020bd2a0(param1, temp_r2); @@ -165,21 +165,21 @@ void UnkStruct_027e0ce0_40::func_ov102_0218303c(unk32 param1, ItemManager *pItem this->mPlayer.func_ov017_020bd788(param1); - if (this->mUnk_328 != NULL) { - this->mUnk_328->func_ov093_0216d5b8(param1); + if (this->mpZelda != NULL) { + this->mpZelda->func_ov093_0216d5b8(param1); - UnkStruct_027e0ce0_40_328 *ptr = this->mUnk_328; + PlayerZeldaActor *ptr = this->mpZelda; 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); + this->mpZelda->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); + var_r1 = this->mUnk_14C->func_ov092_021689e8(param1, this, &this->mPlayer, this->mpZelda); } if (var_r1) { @@ -199,27 +199,28 @@ void UnkStruct_027e0ce0_40::func_ov102_0218303c(unk32 param1, ItemManager *pItem } void UnkStruct_027e0ce0_40::func_ov102_02183180(unk32 param1, bool param2) { - this->mPlayer.func_ov017_020bdcf4(); + this->mPlayer.func_ov017_020bdcf4(param1, param2); - if (this->mUnk_328 != NULL) { - this->mUnk_328->func_ov093_0216de30(param1, param2); + if (this->mpZelda != NULL) { + this->mpZelda->func_ov093_0216de30(param1, param2); } } -void UnkStruct_027e0ce0_40::func_ov102_021831b4(unk32 param1) { +void UnkStruct_027e0ce0_40::func_ov102_021831b4(void *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); + if (this->mpZelda != NULL) { + this->mpZelda->func_ov093_0216dec8(param1); } } -void UnkStruct_027e0ce0_40::func_ov102_021831f0(unk32 param1) { - this->mPlayer.func_ov017_020bdf48(param1, 1, 0, 0); +void UnkStruct_027e0ce0_40::func_ov102_021831f0(void *param1) { + //! TODO: determine param1's type + this->mPlayer.func_ov017_020bdf48((s8 *) param1, 1, 0, 0); - if (this->mUnk_328 != NULL) { - this->mUnk_328->func_ov093_0216e1a4(param1); + if (this->mpZelda != NULL) { + this->mpZelda->func_ov093_0216e1a4(param1); } if (this->mUnk_14C != NULL) { @@ -228,7 +229,7 @@ void UnkStruct_027e0ce0_40::func_ov102_021831f0(unk32 param1) { } // https://decomp.me/scratch/d1Vky -void UnkStruct_027e0ce0_40_Base_74::func_ov102_0218323c(UnkStruct_027e0ce0_40_Base_14 *param1, s32 param2) { +void UnkStruct_027e0ce0_40_Base_74::func_ov102_0218323c(UnkStruct_027e0ce0_40_Base_14 *param1, BOOL param2) { s16 temp_r11; s16 var_r3; s32 temp_r10; @@ -249,7 +250,7 @@ void UnkStruct_027e0ce0_40_Base_74::func_ov102_0218323c(UnkStruct_027e0ce0_40_Ba s16 y; s16 x; - if (param2 == 0 || param1->mUnk_40 <= 0 || this->mUnk_58 != -1) { + if (!param2 || param1->mUnk_40 <= 0 || this->mUnk_58 != -1) { this->mUnk_00[this->mUnk_54] = 0x00; ptr = &this->mUnk_1C[this->mUnk_54]; @@ -347,62 +348,29 @@ static inline bool UnknownInline2(PlayerLinkActor_A0_1C *param2, VecFx32 *param4 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; + bool var_r5 = false; if (param3) { + STACK_PAD(0x0C); + if (param2->mUnk_00->Unk78HasValue()) { if (!UnknownInline2(param2, param4, ¶m5)) { - temp_r4 = param2->mUnk_00->mUnk_078; - var_r5 = true; - var_r1_3 = 0; + UnkStruct_027e0ce0_40 *ptr = param2->mUnk_00; + var_r5 = true; - if (temp_r4 != NULL) { - temp_r6 = temp_r4->mUnk_00; - var_r2 = 0; + //! TODO: UnkCheck1() don't work + bool var_r1_3 = false; - 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 (ptr->IsUnk78() && ptr->mUnk_078->UnkCheck1()) { + var_r1_3 = true; } - if (var_r1_3 != 0) { + if (var_r1_3) { if (!param2->mUnk_06) { func_ov095_0217aa88(&sp6, ¶m2->mUnk_04, param6, param5); param5.angle = sp6; @@ -411,7 +379,7 @@ void func_ov102_02183414(s16 *param1, PlayerLinkActor_A0_1C *param2, bool param3 param5.angle = sp4; } } else { - func_ov031_020dcea4(&sp2, *(UnkStruct_027e0ce0_40_Base_78 **) ¶m2->mUnk_00->mUnk_078, param5); + func_ov031_020dcea4(&sp2, param2->mUnk_00->GetUnk78(), param5); param5.angle = sp2 + 0x4000; } } diff --git a/src/110_PlayerGet/PlayerGet.cpp b/src/110_PlayerGet/PlayerGet.cpp index f92fe490..feeb3ea6 100644 --- a/src/110_PlayerGet/PlayerGet.cpp +++ b/src/110_PlayerGet/PlayerGet.cpp @@ -48,7 +48,6 @@ extern "C" void func_020156f4(char *); extern "C" void func_02015644(char *); extern "C" BMDSectionModel *func_ov000_0205abcc(void *, void *, unk32, unk32, void *); -extern "C" unk32 func_ov000_02077590(unk32); static const unk32 data_ov110_02185dc4[1] = {8}; @@ -538,7 +537,7 @@ void PlayerGet::vfunc_0C(UnkStruct_PlayerGet_vfunc_0C_param1 *param1) { this->mAngle = 0; this->mUnk_2C->mUnk_58 = 0; char auStack_108[12]; - func_ov000_0208ba10(auStack_108, &this->mUnk_24->mUnk_94, 0); + func_ov000_0208ba10(auStack_108, &this->mUnk_24->mUnk_094, 0); *(s16 *) &this->mUnk_40->mUnk_00 = 0x8000; pUnk_38 = this->mUnk_38; @@ -632,43 +631,20 @@ void PlayerGet::vfunc_0C(UnkStruct_PlayerGet_vfunc_0C_param1 *param1) { this->mUnk_64.func_ov000_0208a100(); } - bool var_r1_4 = 0; - void **temp_r5_2 = this->mUnk_24->mUnk_78; - if (temp_r5_2 != NULL) { - u16 temp_r6 = *(u16 *) temp_r5_2; - bool var_r3 = 1; - bool var_r2 = 0; + bool var_r1_4 = false; - if ((temp_r6 != 0x100) && (temp_r6 != 0x101)) { - var_r3 = 0; - } - - if (var_r3 != 0) { - bool var_r0_2; - - if (temp_r6 == 0x101) { - var_r0_2 = 0; - } else { - var_r0_2 = ((u16 *) temp_r5_2)[1]; - } - - if (var_r0_2 == 1) { - var_r2 = 1; - } - } - - if (var_r2 != 0) { - var_r1_4 = 1; - } + if (this->mUnk_24->mUnk_078 != NULL && this->mUnk_24->mUnk_078->UnkCheck1()) { + var_r1_4 = true; } if (!var_r1_4) { - UnkStruct_ov000_0208f820_28_98 *pUnk28_98 = this->mUnk_28->mUnk_98; + UnkStruct_ov000_0208f820_28 *ptr0 = this->mUnk_28; + UnkStruct_ov000_0208f820_28_98 *ptr1 = ptr0->mUnk_98; - if (pUnk28_98 != NULL) { - UnkStruct_PlayerGet_64 *ptr = &pUnk28_98->mUnk_38; + if (ptr1 != NULL) { + UnkStruct_PlayerGet_64 *ptr = *(UnkStruct_PlayerGet_64 **) &ptr1->mUnk_38; ptr->mUnk_08 |= 0x10; - this->mUnk_64.func_ov000_0208a100(); + ptr1->mUnk_38.func_ov000_0208a100(); } } diff --git a/src/112_PlayerSceneChange/PlayerSceneChange.cpp b/src/112_PlayerSceneChange/PlayerSceneChange.cpp index 319e97e4..767b204e 100644 --- a/src/112_PlayerSceneChange/PlayerSceneChange.cpp +++ b/src/112_PlayerSceneChange/PlayerSceneChange.cpp @@ -693,9 +693,9 @@ void PlayerSceneChange::vfunc_10(unk32 param1, unk32 param2) { } if (this->mUnk_AD) { - UnkStruct_ov000_0208f820_24 *temp_r1_6 = this->mUnk_24; + UnkStruct_027e0ce0_40 *temp_r1_6 = this->mUnk_24; temp_r1_6->mUnk_104 &= 0xFFFB; - temp_r1_6->mUnk_FE = 3; + temp_r1_6->mUnk_094.mUnk_6A = 3; this->mUnk_30->func_ov000_020921e4(1); } else if (temp_r5_2) { if (!this->func_ov000_02091e68(param2) && data_02049b18.mUnk_06.mTouchControl.mState.touch) { diff --git a/src/112_PlayerSceneChange/PlayerSceneChange2.cpp b/src/112_PlayerSceneChange/PlayerSceneChange2.cpp index 17aecb26..6c65f538 100644 --- a/src/112_PlayerSceneChange/PlayerSceneChange2.cpp +++ b/src/112_PlayerSceneChange/PlayerSceneChange2.cpp @@ -27,15 +27,13 @@ void PlayerSceneChange2::vfunc_0C(UnkStruct_PlayerGet_vfunc_0C_param1 *param1) { this->mUnk_2C->mUnk_58 = 0; - func_ov000_0208ba10(auStack_18, &this->mUnk_24->mUnk_94, 0); + func_ov000_0208ba10(auStack_18, &this->mUnk_24->mUnk_094, 0); if (this->mUnk_44->mUnk_00 != 0) { this->mUnk_28->func_ov000_0208cf20(0x1400, 0); } - void **piVar3 = this->mUnk_24->mUnk_78; - - if ((piVar3 != NULL && *piVar3 != NULL) ? 1 : 0) { + if (this->mUnk_24->mUnk_078 != NULL && this->mUnk_24->mUnk_078->HasValue() ? 1 : 0) { func_ov000_02087ee8(); } diff --git a/tools/configure.py b/tools/configure.py index 8612b383..2e32674f 100755 --- a/tools/configure.py +++ b/tools/configure.py @@ -301,7 +301,35 @@ config.libs = [ GameLib( "Overlay 17", [ + Object("017_CourseExec/UnkStruct_027e09a4_017.cpp"), + Object("017_CourseExec/UnkStruct_ov017_020c3f70.cpp"), + Object("017_CourseExec/Player/PlayerActorBase_70_017.cpp"), + Object("017_CourseExec/UnkStruct_027e0ce0_30_017.cpp"), + Object("017_CourseExec/UnkStruct_027e0ce0_40_017.cpp"), + Object("017_CourseExec/ItemManager_017.cpp"), + Object("017_CourseExec/UnkStruct_027e0ce0_40_Base_94_017.cpp"), + Object("017_CourseExec/UnkStruct_027e0ce0_017.cpp"), + Object("017_CourseExec/Player/PlayerLinkActor_017.cpp"), + Object("017_CourseExec/Player/PlayerLinkActor_A0_20_017.cpp"), + Object("017_CourseExec/code_020be2ec_017.cpp"), Object("017_CourseExec/CargoManager_017.cpp"), + Object("017_CourseExec/Actor/ActorManager_017.cpp"), + Object("017_CourseExec/Actor/Actor_017.cpp"), + Object("017_CourseExec/Actor/ActorEventIcon_017.cpp"), + Object("017_CourseExec/MapObject/MapObjectManager_017.cpp"), + Object("017_CourseExec/MapObject/MapObject_017.cpp"), + Object("017_CourseExec/MapObject/MapObjectSwitchStep_017.cpp"), + Object("017_CourseExec/UnkStruct_027e09b4_017.cpp"), + Object("017_CourseExec/code_020c0b24_017.cpp"), + Object("017_CourseExec/Game/AdventureModeManager_15C_20_00_017.cpp"), + Object("017_CourseExec/UnkStruct_027e0cec_017.cpp"), + Object("017_CourseExec/code_020c201c_017.cpp"), + Object("017_CourseExec/UnkStruct_027e0cec_18_017.cpp"), + Object("017_CourseExec/Save/SaveManager_017.cpp"), + Object("017_CourseExec/UnkStruct_027e09c0_017.cpp"), + Object("017_CourseExec/Unknown/UnkStruct_ov024_020d86a0_017.cpp"), + Object("017_CourseExec/Train/UnkStruct_027e0cf8_017.cpp"), + Object("017_CourseExec/Game/AdventureModeManager_15C_017.cpp"), ] ), GameLib(