diff options
40 files changed, 1343 insertions, 197 deletions
diff --git a/config/eur/arm9/dtcm/symbols.txt b/config/eur/arm9/dtcm/symbols.txt index 62eea4b0..585b0761 100644 --- a/config/eur/arm9/dtcm/symbols.txt +++ b/config/eur/arm9/dtcm/symbols.txt @@ -72,7 +72,7 @@ data_027e06d8 kind:bss addr:0x27e06d8 data_027e06e4 kind:bss addr:0x27e06e4 data_027e0718 kind:bss addr:0x27e0718 data_027e071c kind:bss addr:0x27e071c -gRandom kind:bss addr:0x27e0764 +gRandom kind:bss(size=0x18) addr:0x27e0764 data_027e077c kind:bss addr:0x27e077c data_027e080c kind:bss addr:0x27e080c data_027e081c kind:bss addr:0x27e081c diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 221db740..4758d647 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -601,7 +601,7 @@ _ZN10MapManager18func_ov00_020839b4Ei kind:function(arm,size=0x10) addr:0x20839b _ZN10MapManager18func_ov00_020839c4Ei kind:function(arm,size=0x10) addr:0x20839c4 _ZN10MapManager18func_ov00_020839d4Ev kind:function(arm,size=0x24) addr:0x20839d4 _ZN10MapManager18func_ov00_020839f8Ev kind:function(arm,size=0x24) addr:0x20839f8 -_ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p kind:function(arm,size=0x38) addr:0x2083a1c +_ZN10MapManager18func_ov00_02083a1cEP5Vec2bPS_P5Vec3p kind:function(arm,size=0x38) addr:0x2083a1c _ZN10MapManager18func_ov00_02083a54EiPS_iii kind:function(arm,size=0x130) addr:0x2083a54 _ZN10MapManager18func_ov00_02083b84Ev kind:function(arm,size=0x28) addr:0x2083b84 _ZN10MapManager18func_ov00_02083bacEv kind:function(arm,size=0x28) addr:0x2083bac @@ -609,7 +609,7 @@ _ZN10MapManager18func_ov00_02083bd4Ev kind:function(arm,size=0x28) addr:0x2083bd _ZN10MapManager18func_ov00_02083bfcEv kind:function(arm,size=0x28) addr:0x2083bfc _ZN10MapManager18func_ov00_02083c24Ei kind:function(arm,size=0x2c) addr:0x2083c24 _ZN10MapManager18func_ov00_02083c50Ei kind:function(arm,size=0x2c) addr:0x2083c50 -_ZN10MapManager18func_ov00_02083c7cEP5Vec3pi kind:function(arm,size=0x6c) addr:0x2083c7c +_ZN10MapManager18func_ov00_02083c7cEP5Vec3p5Vec2b kind:function(arm,size=0x6c) addr:0x2083c7c _ZN10MapManager18func_ov00_02083ce8Ecccci kind:function(arm,size=0x14c) addr:0x2083ce8 _ZN10MapManager18func_ov00_02083e34Ecci kind:function(arm,size=0x24) addr:0x2083e34 _ZN10MapManager16MapData_vfunc_60Ev kind:function(arm,size=0x18) addr:0x2083e58 @@ -623,7 +623,7 @@ _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p kind:function(arm,size=0x74) ad _ZN10MapManager18GetTileWorldBoundsEP5Vec2bP4AABB kind:function(arm,size=0x64) addr:0x2084024 _ZN10MapManager16MapData_vfunc_54Ev kind:function(arm,size=0x18) addr:0x2084088 _ZN10MapManager18func_ov00_020840a0Ecci kind:function(arm,size=0x24) addr:0x20840a0 -_ZN10MapManager16MapData_vfunc_78Ev kind:function(arm,size=0x18) addr:0x20840c4 +_ZN10MapManager16MapData_vfunc_78EP5Vec2b kind:function(arm,size=0x18) addr:0x20840c4 _ZN10MapManager18func_ov00_020840dcEv kind:function(arm,size=0x24) addr:0x20840dc _ZN10MapManager18func_ov00_02084100EiPS_ kind:function(arm,size=0x14) addr:0x2084100 _ZN10MapManager17GetMapData_Unk_48Ev kind:function(arm,size=0xc) addr:0x2084114 @@ -675,10 +675,10 @@ _ZN10MapManager17GetMapData_Unk_09Ev kind:function(arm,size=0xc) addr:0x2084d18 _ZN10MapManager18func_ov00_02084d24Ecci kind:function(arm,size=0x28) addr:0x2084d24 _ZN10MapManager18func_ov00_02084d4cEiiP5Vec3p kind:function(arm,size=0x170) addr:0x2084d4c _ZN10MapManager18func_ov00_02084ebcEi kind:function(arm,size=0x24c) addr:0x2084ebc -_ZN10MapManager18func_ov00_02085108EPi kind:function(arm,size=0x174) addr:0x2085108 +_ZN10MapManager18func_ov00_02085108EP5Vec3p kind:function(arm,size=0x174) addr:0x2085108 _ZN10MapManager18func_ov00_0208527cEv kind:function(arm,size=0x180) addr:0x208527c _ZN10MapManager18func_ov00_020853fcEv kind:function(arm,size=0x198) addr:0x20853fc -_ZN10MapManager18func_ov00_02085594Ev kind:function(arm,size=0x2a8) addr:0x2085594 +_ZN10MapManager18func_ov00_02085594EP5Vec3p kind:function(arm,size=0x2a8) addr:0x2085594 _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi kind:function(arm,size=0x74) addr:0x208583c _ZN10MapManager18func_ov00_020858b0Ev kind:function(arm,size=0x184) addr:0x20858b0 _ZN10MapManager18func_ov00_02085a34Eii kind:function(arm,size=0x22c) addr:0x2085a34 @@ -779,7 +779,7 @@ func_ov000_0208aed8 kind:function(arm,size=0x244) addr:0x208aed8 func_ov000_0208b11c kind:function(arm,size=0x20) addr:0x208b11c func_ov000_0208b13c kind:function(arm,size=0x1c) addr:0x208b13c func_ov000_0208b158 kind:function(arm,size=0x28) addr:0x208b158 -func_ov000_0208b180 kind:function(arm,size=0x28) addr:0x208b180 +_ZN18UnkStruct_027e0f6419func_ov000_0208b180Ev kind:function(arm,size=0x28) addr:0x208b180 func_ov000_0208b1a8 kind:function(arm,size=0x28) addr:0x208b1a8 func_ov000_0208b1d0 kind:function(arm,size=0x28) addr:0x208b1d0 func_ov000_0208b1f8 kind:function(arm,size=0x28) addr:0x208b1f8 @@ -2179,12 +2179,12 @@ _ZN13LinkStateRoll8vfunc_20Ei kind:function(arm,size=0x180) addr:0x20aec10 _ZN13LinkStateRoll8vfunc_24Ei kind:function(arm,size=0xc8) addr:0x20aed90 _ZN13LinkStateRoll18func_ov00_020aee58Est kind:function(arm,size=0x2c) addr:0x20aee58 _ZN13LinkStateRoll18func_ov00_020aee84Ev kind:function(arm,size=0x28) addr:0x20aee84 -_ZN13PlayerControl18_ZN13PlayerControl18func_ov00_020aeeacEvEv kind:function(arm,size=0x4c) addr:0x20aeeac +_ZN13PlayerControl18func_ov00_020aeeacEv kind:function(arm,size=0x4c) addr:0x20aeeac _ZN13PlayerControl18func_ov00_020aeef8Ev kind:function(arm,size=0x38) addr:0x20aeef8 _ZN13PlayerControl18func_ov00_020aef30Ev kind:function(thumb,size=0x38) addr:0x20aef30 _ZN13PlayerControl9UpdateAimEv kind:function(thumb,size=0x94) addr:0x20aef68 _ZN13PlayerControl14GetFollowActorEv kind:function(arm,size=0x20) addr:0x20aeffc -_ZN13PlayerControl18func_ov00_020af01cEPc kind:function(arm,size=0x28) addr:0x20af01c +_ZN13PlayerControl18func_ov00_020af01cEP5Vec2b kind:function(arm,size=0x28) addr:0x20af01c _ZN13PlayerControl9SetUnk_80Ev kind:function(arm,size=0xc) addr:0x20af044 _ZN13PlayerControl13StopFollowingEv kind:function(arm,size=0x1c) addr:0x20af050 _ZN13PlayerControl18func_ov00_020af06cEv kind:function(arm,size=0x22c) addr:0x20af06c @@ -2195,24 +2195,24 @@ _ZN13PlayerControl17CheckUntouchedNowEj kind:function(arm,size=0x30) addr:0x20af _ZN13PlayerControl13CheckTouchingEj kind:function(arm,size=0x28) addr:0x20af42c _ZN13PlayerControl14CheckTouchFastEj kind:function(arm,size=0x50) addr:0x20af454 _ZN13PlayerControl18func_ov00_020af4a4Ev kind:function(arm,size=0x94) addr:0x20af4a4 -_ZN13PlayerControl18func_ov00_020af538Ev kind:function(arm,size=0x1ac) addr:0x20af538 +_ZN13PlayerControl18func_ov00_020af538Ebh kind:function(arm,size=0x1ac) addr:0x20af538 _ZN13PlayerControl18func_ov00_020af6e4EP5Vec3pii kind:function(arm,size=0x94) addr:0x20af6e4 _ZN13PlayerControl18func_ov00_020af778Ev kind:function(arm,size=0x360) addr:0x20af778 _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p kind:function(arm,size=0x94) addr:0x20afad8 _ZN13PlayerControl18func_ov00_020afb6cEv kind:function(arm,size=0x31c) addr:0x20afb6c _ZN13PlayerControl18func_ov00_020afe88Eib kind:function(arm,size=0x64) addr:0x20afe88 _ZN13PlayerControl18func_ov00_020afeecEib kind:function(arm,size=0xa4) addr:0x20afeec -_ZN13PlayerControl18func_ov00_020aff90Eii kind:function(arm,size=0x5c) addr:0x20aff90 +_ZN13PlayerControl18func_ov00_020aff90EP5Vec3pi kind:function(arm,size=0x5c) addr:0x20aff90 _ZN13PlayerControl18func_ov00_020affecEP5Vec3piiS1_ kind:function(arm,size=0x160) addr:0x20affec -_ZN13PlayerControl18func_ov00_020b014cEv kind:function(arm,size=0xd0) addr:0x20b014c -_ZN13PlayerControl6SetAimEv kind:function(arm,size=0x24) addr:0x20b021c +_ZN13PlayerControl18func_ov00_020b014cEP5Vec3p kind:function(arm,size=0xd0) addr:0x20b014c +_ZN13PlayerControl8ResetAimEv kind:function(arm,size=0x24) addr:0x20b021c _ZN13PlayerControl14UpdateAimWorldEP5Vec3p kind:function(arm,size=0xe8) addr:0x20b0240 _ZN13PlayerControl13GetTouchAngleEv kind:function(arm,size=0x24) addr:0x20b0328 _ZN13PlayerControl18func_ov00_020b034cEv kind:function(arm,size=0xcc) addr:0x20b034c _ZN13PlayerControl18func_ov00_020b0418Ev kind:function(arm,size=0x84) addr:0x20b0418 _ZN13PlayerControl18func_ov00_020b049cEP5Vec3pb kind:function(arm,size=0x14c) addr:0x20b049c _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p kind:function(arm,size=0x190) addr:0x20b05e8 -_ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji kind:function(arm,size=0x33c) addr:0x20b0778 +_ZN13PlayerControl18func_ov00_020b0778EP5Vec3pjPi kind:function(arm,size=0x33c) addr:0x20b0778 _ZN13PlayerControl16CheckNotTouchingEv kind:function(arm,size=0x1c) addr:0x20b0ab4 _ZN13PlayerControl18func_ov00_020b0ad0EP5Actor kind:function(arm,size=0x3c) addr:0x20b0ad0 _ZN13PlayerControl18func_ov00_020b0b0cEPsPiS1_Pb kind:function(arm,size=0x2dc) addr:0x20b0b0c @@ -2640,7 +2640,7 @@ _ZN9EquipItem8vfunc_2cEv kind:function(arm,size=0x8) addr:0x20be964 _ZN9EquipItem8vfunc_34EPs kind:function(arm,size=0x4) addr:0x20be96c _ZNK9EquipItem8vfunc_40Ev kind:function(arm,size=0x8) addr:0x20be970 _ZNK9EquipItem8vfunc_44Ei kind:function(arm,size=0x8) addr:0x20be978 -_ZNK9EquipItem8vfunc_48Ei kind:function(arm,size=0x8) addr:0x20be980 +_ZNK9EquipItem8vfunc_48Eii kind:function(arm,size=0x8) addr:0x20be980 _ZNK9EquipItem8vfunc_4cEv kind:function(arm,size=0x8) addr:0x20be988 _ZN9EquipItem12GetPlayerPosEv kind:function(arm,size=0xc) addr:0x20be990 _ZN9EquipItem19func_ov000_020be99cEP5Vec3p kind:function(arm,size=0x48) addr:0x20be99c @@ -3222,12 +3222,12 @@ func_ov000_020cea3c kind:function(arm,size=0x44) addr:0x20cea3c func_ov000_020cea80 kind:function(arm,size=0x4c) addr:0x20cea80 func_ov000_020ceacc kind:function(arm,size=0x58) addr:0x20ceacc func_ov000_020ceb24 kind:function(arm,size=0xa8) addr:0x20ceb24 -func_ov000_020cebcc kind:function(arm,size=0x3c) addr:0x20cebcc +_ZN18UnkStruct_027e0ffc19func_ov000_020cebccEjsi kind:function(arm,size=0x3c) addr:0x20cebcc func_ov000_020cec08 kind:function(arm,size=0x58) addr:0x20cec08 func_ov000_020cec60 kind:function(arm,size=0x78) addr:0x20cec60 func_ov000_020cecd8 kind:function(arm,size=0x8c) addr:0x20cecd8 -func_ov000_020ced64 kind:function(arm,size=0x18) addr:0x20ced64 -func_ov000_020ced7c kind:function(arm,size=0x40) addr:0x20ced7c +_ZN18UnkStruct_027e0ffc19func_ov000_020ced64EP8Cylinderjj kind:function(arm,size=0x18) addr:0x20ced64 +_ZN18UnkStruct_027e0ffc19func_ov000_020ced7cEP5Vec3piii kind:function(arm,size=0x40) addr:0x20ced7c func_ov000_020cedbc kind:function(arm,size=0x54) addr:0x20cedbc func_ov000_020cee10 kind:function(arm,size=0x48) addr:0x20cee10 func_ov000_020cee58 kind:function(arm,size=0x88) addr:0x20cee58 @@ -4896,16 +4896,17 @@ data_ov000_020e6088 kind:data(any) addr:0x20e6088 data_ov000_020e6098 kind:data(any) addr:0x20e6098 data_ov000_020e60a8 kind:data(any) addr:0x20e60a8 _ZTV13LinkStateRoll kind:data(any) addr:0x20e60c0 -data_ov000_020e6104 kind:data(any) addr:0x20e6104 -data_ov000_020e6108 kind:data(any) addr:0x20e6108 -data_ov000_020e610c kind:data(any) addr:0x20e610c -data_ov000_020e6110 kind:data(any) addr:0x20e6110 -data_ov000_020e6114 kind:data(any) addr:0x20e6114 -data_ov000_020e6118 kind:data(any) addr:0x20e6118 -data_ov000_020e611c kind:data(any) addr:0x20e611c -data_ov000_020e6120 kind:data(any) addr:0x20e6120 -data_ov000_020e6124 kind:data(any) addr:0x20e6124 -data_ov000_020e6148 kind:data(any) addr:0x20e6148 +@1505 kind:data(any) addr:0x20e6104 +@1504 kind:data(any) addr:0x20e6108 +@1503 kind:data(any) addr:0x20e610c +@1502 kind:data(any) addr:0x20e6110 +@1501 kind:data(any) addr:0x20e6114 +@1500 kind:data(any) addr:0x20e6118 +@1499 kind:data(any) addr:0x20e611c +@1498 kind:data(any) addr:0x20e6120 +sShipTypes kind:data(any) addr:0x20e6124 local +data_ov000_020e6144 kind:data(any) addr:0x20e6144 +@1556 kind:data(any) addr:0x20e6148 data_ov000_020e6158 kind:data(any) addr:0x20e6158 data_ov000_020e6174 kind:data(any) addr:0x20e6174 data_ov000_020e6178 kind:data(any) addr:0x20e6178 @@ -5876,6 +5877,7 @@ data_ov000_020ee16c kind:bss addr:0x20ee16c data_ov000_020ee178 kind:bss addr:0x20ee178 data_ov000_020ee184 kind:bss addr:0x20ee184 data_ov000_020ee198 kind:bss addr:0x20ee198 +data_ov000_020ee19c kind:bss addr:0x20ee19c @418 kind:bss addr:0x20ee1a0 local _ZN9ActorNavi5gTypeE kind:bss addr:0x20ee1ac @419 kind:bss addr:0x20ee1c0 local diff --git a/config/eur/arm9/overlays/ov014/symbols.txt b/config/eur/arm9/overlays/ov014/symbols.txt index 0e54a96d..57a2177c 100644 --- a/config/eur/arm9/overlays/ov014/symbols.txt +++ b/config/eur/arm9/overlays/ov014/symbols.txt @@ -8,7 +8,7 @@ func_ov014_0211f980 kind:function(arm,size=0x130) addr:0x211f980 func_ov014_0211fab0 kind:function(arm,size=0x1dc) addr:0x211fab0 func_ov014_0211fc8c kind:function(arm,size=0x50) addr:0x211fc8c func_ov014_0211fcdc kind:function(thumb,size=0x28) addr:0x211fcdc -_Z19func_ov014_0211fd04Pi kind:function(thumb,size=0x4c) addr:0x211fd04 +_ZN18UnkStruct_027e109819func_ov014_0211fd04Ev kind:function(thumb,size=0x4c) addr:0x211fd04 _ZN10ActorArrow6CreateEv kind:function(arm,size=0x30) addr:0x211fd50 _ZN10ActorArrow19func_ov014_0211fd80Ei kind:function(arm,size=0x10) addr:0x211fd80 _ZN10ActorArrow19func_ov014_0211fd90Ev kind:function(arm,size=0x14) addr:0x211fd90 @@ -846,7 +846,7 @@ func_ov014_0213ccd8 kind:function(arm,size=0xe8) addr:0x213ccd8 func_ov014_0213cdc0 kind:function(arm,size=0x3c) addr:0x213cdc0 func_ov014_0213cdfc kind:function(arm,size=0x5c) addr:0x213cdfc func_ov014_0213ce58 kind:function(arm,size=0x18) addr:0x213ce58 -func_ov014_0213ce70 kind:function(arm,size=0xbc) addr:0x213ce70 +_ZN24UnkStruct_ov015_0213ce4c11GetInstanceEv kind:function(arm,size=0xbc) addr:0x213ce70 local func_ov014_0213cf2c kind:function(arm,size=0x5c) addr:0x213cf2c _ZN10EquipScoopC2Ev kind:function(thumb,size=0x14) addr:0x213cf88 _ZN10EquipScoopD1Ev kind:function(thumb,size=0xc) addr:0x213cf9c diff --git a/config/eur/arm9/overlays/ov015/symbols.txt b/config/eur/arm9/overlays/ov015/symbols.txt index 710f83b9..325923f3 100644 --- a/config/eur/arm9/overlays/ov015/symbols.txt +++ b/config/eur/arm9/overlays/ov015/symbols.txt @@ -613,7 +613,7 @@ func_ov015_0213cc98 kind:function(arm,size=0x14) addr:0x213cc98 func_ov015_0213ccac kind:function(arm,size=0x38) addr:0x213ccac func_ov015_0213cce4 kind:function(arm,size=0x78) addr:0x213cce4 func_ov015_0213cd5c kind:function(arm,size=0xf0) addr:0x213cd5c -func_ov015_0213ce4c kind:function(arm,size=0x10) addr:0x213ce4c +_ZN24UnkStruct_ov015_0213ce4c11GetInstanceEv kind:function(arm,size=0x10) addr:0x213ce4c func_ov015_0213ce5c kind:function(arm,size=0xb4) addr:0x213ce5c func_ov015_0213cf10 kind:function(arm,size=0x20) addr:0x213cf10 func_ov015_0213cf30 kind:function(arm,size=0x48) addr:0x213cf30 @@ -640,8 +640,8 @@ func_ov015_0213d87c kind:function(arm,size=0x28c) addr:0x213d87c func_ov015_0213db08 kind:function(arm,size=0xb0) addr:0x213db08 func_ov015_0213dbb8 kind:function(arm,size=0xb0) addr:0x213dbb8 func_ov015_0213dc68 kind:function(arm,size=0x48) addr:0x213dc68 -func_ov015_0213dcb0 kind:function(arm,size=0x8) addr:0x213dcb0 -func_ov015_0213dcb8 kind:function(arm,size=0x8) addr:0x213dcb8 +_ZN24UnkStruct_ov015_0213ce4c8GetUnk3fEv kind:function(arm,size=0x8) addr:0x213dcb0 +_ZN24UnkStruct_ov015_0213ce4c8GetUnk40Ev kind:function(arm,size=0x8) addr:0x213dcb8 func_ov015_0213dcc0 kind:function(arm,size=0x4) addr:0x213dcc0 func_ov015_0213dcc4 kind:function(arm,size=0x8c) addr:0x213dcc4 func_ov015_0213dd50 kind:function(arm,size=0x24) addr:0x213dd50 diff --git a/config/eur/arm9/overlays/ov024/symbols.txt b/config/eur/arm9/overlays/ov024/symbols.txt index bca88683..1cd13f2a 100644 --- a/config/eur/arm9/overlays/ov024/symbols.txt +++ b/config/eur/arm9/overlays/ov024/symbols.txt @@ -286,7 +286,7 @@ func_ov024_02178204 kind:function(arm,size=0x30) addr:0x2178204 func_ov024_02178234 kind:function(arm,size=0xec) addr:0x2178234 func_ov024_02178320 kind:function(arm,size=0x20) addr:0x2178320 func_ov024_02178340 kind:function(arm,size=0x8) addr:0x2178340 -func_ov024_02178348 kind:function(arm,size=0x358) addr:0x2178348 +_ZN13PlayerControl19func_ov024_02178348EP5Vec3p kind:function(arm,size=0x358) addr:0x2178348 func_ov024_021786a0 kind:function(arm,size=0x10) addr:0x21786a0 func_ov024_021786b0 kind:function(arm,size=0x30) addr:0x21786b0 func_ov024_021786e0 kind:function(arm,size=0x20) addr:0x21786e0 diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 859a6e60..ce2d0904 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -56,7 +56,7 @@ func_020029fc kind:function(arm,size=0x1b0) addr:0x20029fc func_02002bac kind:function(arm,size=0xc) addr:0x2002bac func_02002bb8 kind:function(arm,size=0x3c) addr:0x2002bb8 func_02002bf4 kind:function(arm,size=0x20) addr:0x2002bf4 -SoftDivideMod kind:function(arm,size=0x20c) addr:0x2002c14 +_s32_div_f kind:function(arm,size=0x20c) addr:0x2002c14 SoftDivide kind:function(arm,size=0x1e4) addr:0x2002e20 .L_02002e28 kind:label(arm) addr:0x2002e28 func_0200301c kind:function(arm,size=0x544) addr:0x200301c @@ -2581,7 +2581,7 @@ data_02056af8 kind:data(any) addr:0x2056af8 data_02056afd kind:data(any) addr:0x2056afd data_02056afe kind:data(any) addr:0x2056afe data_02056b00 kind:data(any) addr:0x2056b00 -data_02056be4 kind:data(any) addr:0x2056be4 +data_02056be4 kind:data(byte[64]) addr:0x2056be4 data_02056c24 kind:data(any) addr:0x2056c24 data_02056c25 kind:data(any) addr:0x2056c25 gpBuildDate kind:data(any) addr:0x2056c30 diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 1f13b8be..a656d213 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -601,7 +601,7 @@ _ZN10MapManager18func_ov00_020839b4Ei kind:function(arm,size=0x10) addr:0x208395 _ZN10MapManager18func_ov00_020839c4Ei kind:function(arm,size=0x10) addr:0x2083964 _ZN10MapManager18func_ov00_020839d4Ev kind:function(arm,size=0x24) addr:0x2083974 _ZN10MapManager18func_ov00_020839f8Ev kind:function(arm,size=0x24) addr:0x2083998 -_ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p kind:function(arm,size=0x38) addr:0x20839bc +_ZN10MapManager18func_ov00_02083a1cEP5Vec2bPS_P5Vec3p kind:function(arm,size=0x38) addr:0x20839bc _ZN10MapManager18func_ov00_02083a54EiPS_iii kind:function(arm,size=0x130) addr:0x20839f4 _ZN10MapManager18func_ov00_02083b84Ev kind:function(arm,size=0x28) addr:0x2083b24 _ZN10MapManager18func_ov00_02083bacEv kind:function(arm,size=0x28) addr:0x2083b4c @@ -609,7 +609,7 @@ _ZN10MapManager18func_ov00_02083bd4Ev kind:function(arm,size=0x28) addr:0x2083b7 _ZN10MapManager18func_ov00_02083bfcEv kind:function(arm,size=0x28) addr:0x2083b9c _ZN10MapManager18func_ov00_02083c24Ei kind:function(arm,size=0x2c) addr:0x2083bc4 _ZN10MapManager18func_ov00_02083c50Ei kind:function(arm,size=0x2c) addr:0x2083bf0 -_ZN10MapManager18func_ov00_02083c7cEP5Vec3pi kind:function(arm,size=0x6c) addr:0x2083c1c +_ZN10MapManager18func_ov00_02083c7cEP5Vec3p5Vec2b kind:function(arm,size=0x6c) addr:0x2083c1c _ZN10MapManager18func_ov00_02083ce8Ecccci kind:function(arm,size=0x14c) addr:0x2083c88 _ZN10MapManager18func_ov00_02083e34Ecci kind:function(arm,size=0x24) addr:0x2083dd4 _ZN10MapManager16MapData_vfunc_60Ev kind:function(arm,size=0x18) addr:0x2083df8 @@ -623,7 +623,7 @@ _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p kind:function(arm,size=0x74) ad _ZN10MapManager18GetTileWorldBoundsEP5Vec2bP4AABB kind:function(arm,size=0x64) addr:0x2083fc4 _ZN10MapManager16MapData_vfunc_54Ev kind:function(arm,size=0x18) addr:0x2084028 _ZN10MapManager18func_ov00_020840a0Ecci kind:function(arm,size=0x24) addr:0x2084040 -_ZN10MapManager16MapData_vfunc_78Ev kind:function(arm,size=0x18) addr:0x2084064 +_ZN10MapManager16MapData_vfunc_78EP5Vec2b kind:function(arm,size=0x18) addr:0x2084064 _ZN10MapManager18func_ov00_020840dcEv kind:function(arm,size=0x24) addr:0x208407c _ZN10MapManager18func_ov00_02084100EiPS_ kind:function(arm,size=0x14) addr:0x20840a0 _ZN10MapManager17GetMapData_Unk_48Ev kind:function(arm,size=0xc) addr:0x20840b4 @@ -675,10 +675,10 @@ _ZN10MapManager17GetMapData_Unk_09Ev kind:function(arm,size=0xc) addr:0x2084cb8 _ZN10MapManager18func_ov00_02084d24Ecci kind:function(arm,size=0x28) addr:0x2084cc4 _ZN10MapManager18func_ov00_02084d4cEiiP5Vec3p kind:function(arm,size=0x170) addr:0x2084cec _ZN10MapManager18func_ov00_02084ebcEi kind:function(arm,size=0x24c) addr:0x2084e5c -_ZN10MapManager18func_ov00_02085108EPi kind:function(arm,size=0x174) addr:0x20850a8 +_ZN10MapManager18func_ov00_02085108EP5Vec3p kind:function(arm,size=0x174) addr:0x20850a8 _ZN10MapManager18func_ov00_0208527cEv kind:function(arm,size=0x180) addr:0x208521c _ZN10MapManager18func_ov00_020853fcEv kind:function(arm,size=0x198) addr:0x208539c -_ZN10MapManager18func_ov00_02085594Ev kind:function(arm,size=0x2a8) addr:0x2085534 +_ZN10MapManager18func_ov00_02085594EP5Vec3p kind:function(arm,size=0x2a8) addr:0x2085534 _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi kind:function(arm,size=0x74) addr:0x20857dc _ZN10MapManager18func_ov00_020858b0Ev kind:function(arm,size=0x184) addr:0x2085850 _ZN10MapManager18func_ov00_02085a34Eii kind:function(arm,size=0x22c) addr:0x20859d4 @@ -779,7 +779,7 @@ func_ov000_0208aed8 kind:function(arm,size=0x244) addr:0x208ae78 func_ov000_0208b11c kind:function(arm,size=0x20) addr:0x208b0bc func_ov000_0208b13c kind:function(arm,size=0x1c) addr:0x208b0dc func_ov000_0208b158 kind:function(arm,size=0x28) addr:0x208b0f8 -func_ov000_0208b180 kind:function(arm,size=0x28) addr:0x208b120 +_ZN18UnkStruct_027e0f6419func_ov000_0208b180Ev kind:function(arm,size=0x28) addr:0x208b120 func_ov000_0208b1a8 kind:function(arm,size=0x28) addr:0x208b148 func_ov000_0208b1d0 kind:function(arm,size=0x28) addr:0x208b170 func_ov000_0208b1f8 kind:function(arm,size=0x28) addr:0x208b198 @@ -2179,12 +2179,12 @@ _ZN13LinkStateRoll8vfunc_20Ei kind:function(arm,size=0x180) addr:0x20aebb0 _ZN13LinkStateRoll8vfunc_24Ei kind:function(arm,size=0xc8) addr:0x20aed30 _ZN13LinkStateRoll18func_ov00_020aee58Est kind:function(arm,size=0x2c) addr:0x20aedf8 _ZN13LinkStateRoll18func_ov00_020aee84Ev kind:function(arm,size=0x28) addr:0x20aee24 -_ZN13PlayerControl18_ZN13PlayerControl18func_ov00_020aeeacEvEv kind:function(arm,size=0x4c) addr:0x20aee4c +_ZN13PlayerControl18func_ov00_020aeeacEv kind:function(arm,size=0x4c) addr:0x20aee4c _ZN13PlayerControl18func_ov00_020aeef8Ev kind:function(arm,size=0x38) addr:0x20aee98 _ZN13PlayerControl18func_ov00_020aef30Ev kind:function(thumb,size=0x38) addr:0x20aeed0 _ZN13PlayerControl9UpdateAimEv kind:function(thumb,size=0x94) addr:0x20aef08 _ZN13PlayerControl14GetFollowActorEv kind:function(arm,size=0x20) addr:0x20aef9c -_ZN13PlayerControl18func_ov00_020af01cEPc kind:function(arm,size=0x28) addr:0x20aefbc +_ZN13PlayerControl18func_ov00_020af01cEP5Vec2b kind:function(arm,size=0x28) addr:0x20aefbc _ZN13PlayerControl9SetUnk_80Ev kind:function(arm,size=0xc) addr:0x20aefe4 _ZN13PlayerControl13StopFollowingEv kind:function(arm,size=0x1c) addr:0x20aeff0 _ZN13PlayerControl18func_ov00_020af06cEv kind:function(arm,size=0x22c) addr:0x20af00c @@ -2195,24 +2195,24 @@ _ZN13PlayerControl17CheckUntouchedNowEj kind:function(arm,size=0x30) addr:0x20af _ZN13PlayerControl13CheckTouchingEj kind:function(arm,size=0x28) addr:0x20af3cc _ZN13PlayerControl14CheckTouchFastEj kind:function(arm,size=0x50) addr:0x20af3f4 _ZN13PlayerControl18func_ov00_020af4a4Ev kind:function(arm,size=0x94) addr:0x20af444 -_ZN13PlayerControl18func_ov00_020af538Ev kind:function(arm,size=0x1ac) addr:0x20af4d8 +_ZN13PlayerControl18func_ov00_020af538Ebh kind:function(arm,size=0x1ac) addr:0x20af4d8 _ZN13PlayerControl18func_ov00_020af6e4EP5Vec3pii kind:function(arm,size=0x94) addr:0x20af684 _ZN13PlayerControl18func_ov00_020af778Ev kind:function(arm,size=0x360) addr:0x20af718 _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p kind:function(arm,size=0x94) addr:0x20afa78 _ZN13PlayerControl18func_ov00_020afb6cEv kind:function(arm,size=0x31c) addr:0x20afb0c _ZN13PlayerControl18func_ov00_020afe88Eib kind:function(arm,size=0x64) addr:0x20afe28 _ZN13PlayerControl18func_ov00_020afeecEib kind:function(arm,size=0xa4) addr:0x20afe8c -_ZN13PlayerControl18func_ov00_020aff90Eii kind:function(arm,size=0x5c) addr:0x20aff30 +_ZN13PlayerControl18func_ov00_020aff90EP5Vec3pi kind:function(arm,size=0x5c) addr:0x20aff30 _ZN13PlayerControl18func_ov00_020affecEP5Vec3piiS1_ kind:function(arm,size=0x160) addr:0x20aff8c -_ZN13PlayerControl18func_ov00_020b014cEv kind:function(arm,size=0xd0) addr:0x20b00ec -_ZN13PlayerControl6SetAimEv kind:function(arm,size=0x24) addr:0x20b01bc +_ZN13PlayerControl18func_ov00_020b014cEP5Vec3p kind:function(arm,size=0xd0) addr:0x20b00ec +_ZN13PlayerControl8ResetAimEv kind:function(arm,size=0x24) addr:0x20b01bc _ZN13PlayerControl14UpdateAimWorldEP5Vec3p kind:function(arm,size=0xe8) addr:0x20b01e0 _ZN13PlayerControl13GetTouchAngleEv kind:function(arm,size=0x24) addr:0x20b02c8 _ZN13PlayerControl18func_ov00_020b034cEv kind:function(arm,size=0xcc) addr:0x20b02ec _ZN13PlayerControl18func_ov00_020b0418Ev kind:function(arm,size=0x84) addr:0x20b03b8 _ZN13PlayerControl18func_ov00_020b049cEP5Vec3pb kind:function(arm,size=0x14c) addr:0x20b043c _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p kind:function(arm,size=0x190) addr:0x20b0588 -_ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji kind:function(arm,size=0x33c) addr:0x20b0718 +_ZN13PlayerControl18func_ov00_020b0778EP5Vec3pjPi kind:function(arm,size=0x33c) addr:0x20b0718 _ZN13PlayerControl16CheckNotTouchingEv kind:function(arm,size=0x1c) addr:0x20b0a54 _ZN13PlayerControl18func_ov00_020b0ad0EP5Actor kind:function(arm,size=0x3c) addr:0x20b0a70 _ZN13PlayerControl18func_ov00_020b0b0cEPsPiS1_Pb kind:function(arm,size=0x2dc) addr:0x20b0aac @@ -2640,7 +2640,7 @@ _ZN9EquipItem8vfunc_2cEv kind:function(arm,size=0x8) addr:0x20be904 _ZN9EquipItem8vfunc_34EPs kind:function(arm,size=0x4) addr:0x20be90c _ZNK9EquipItem8vfunc_40Ev kind:function(arm,size=0x8) addr:0x20be910 _ZNK9EquipItem8vfunc_44Ei kind:function(arm,size=0x8) addr:0x20be918 -_ZNK9EquipItem8vfunc_48Ei kind:function(arm,size=0x8) addr:0x20be920 +_ZNK9EquipItem8vfunc_48Eii kind:function(arm,size=0x8) addr:0x20be920 _ZNK9EquipItem8vfunc_4cEv kind:function(arm,size=0x8) addr:0x20be928 _ZN9EquipItem12GetPlayerPosEv kind:function(arm,size=0xc) addr:0x20be930 _ZN9EquipItem19func_ov000_020be99cEP5Vec3p kind:function(arm,size=0x48) addr:0x20be93c @@ -3222,12 +3222,12 @@ func_ov000_020cea3c kind:function(arm,size=0x44) addr:0x20ce9dc func_ov000_020cea80 kind:function(arm,size=0x4c) addr:0x20cea20 func_ov000_020ceacc kind:function(arm,size=0x58) addr:0x20cea6c func_ov000_020ceb24 kind:function(arm,size=0xa8) addr:0x20ceac4 -func_ov000_020cebcc kind:function(arm,size=0x3c) addr:0x20ceb6c +_ZN18UnkStruct_027e0ffc19func_ov000_020cebccEjsi kind:function(arm,size=0x3c) addr:0x20ceb6c func_ov000_020cec08 kind:function(arm,size=0x58) addr:0x20ceba8 func_ov000_020cec60 kind:function(arm,size=0x78) addr:0x20cec00 func_ov000_020cecd8 kind:function(arm,size=0x8c) addr:0x20cec78 -func_ov000_020ced64 kind:function(arm,size=0x18) addr:0x20ced04 -func_ov000_020ced7c kind:function(arm,size=0x40) addr:0x20ced1c +_ZN18UnkStruct_027e0ffc19func_ov000_020ced64EP8Cylinderjj kind:function(arm,size=0x18) addr:0x20ced04 +_ZN18UnkStruct_027e0ffc19func_ov000_020ced7cEP5Vec3piii kind:function(arm,size=0x40) addr:0x20ced1c func_ov000_020cedbc kind:function(arm,size=0x54) addr:0x20ced5c func_ov000_020cee10 kind:function(arm,size=0x48) addr:0x20cedb0 func_ov000_020cee58 kind:function(arm,size=0x88) addr:0x20cedf8 @@ -4896,16 +4896,17 @@ data_ov000_020e6088 kind:data(any) addr:0x20e6028 data_ov000_020e6098 kind:data(any) addr:0x20e6038 data_ov000_020e60a8 kind:data(any) addr:0x20e6048 _ZTV13LinkStateRoll kind:data(any) addr:0x20e6060 -data_ov000_020e6104 kind:data(any) addr:0x20e60a4 -data_ov000_020e6108 kind:data(any) addr:0x20e60a8 -data_ov000_020e610c kind:data(any) addr:0x20e60ac -data_ov000_020e6110 kind:data(any) addr:0x20e60b0 -data_ov000_020e6114 kind:data(any) addr:0x20e60b4 -data_ov000_020e6118 kind:data(any) addr:0x20e60b8 -data_ov000_020e611c kind:data(any) addr:0x20e60bc -data_ov000_020e6120 kind:data(any) addr:0x20e60c0 -data_ov000_020e6124 kind:data(any) addr:0x20e60c4 -data_ov000_020e6148 kind:data(any) addr:0x20e60e8 +@1505 kind:data(any) addr:0x20e60a4 +@1504 kind:data(any) addr:0x20e60a8 +@1503 kind:data(any) addr:0x20e60ac +@1502 kind:data(any) addr:0x20e60b0 +@1501 kind:data(any) addr:0x20e60b4 +@1500 kind:data(any) addr:0x20e60b8 +@1499 kind:data(any) addr:0x20e60bc +@1498 kind:data(any) addr:0x20e60c0 +sShipTypes kind:data(any) addr:0x20e60c4 local +data_ov000_020e6144 kind:data(any) addr:0x20e6144 +@1556 kind:data(any) addr:0x20e60e8 data_ov000_020e6158 kind:data(any) addr:0x20e60f8 data_ov000_020e6174 kind:data(any) addr:0x20e6114 data_ov000_020e6178 kind:data(any) addr:0x20e6118 diff --git a/config/usa/arm9/overlays/ov014/symbols.txt b/config/usa/arm9/overlays/ov014/symbols.txt index 08ebfdd5..1fb08698 100644 --- a/config/usa/arm9/overlays/ov014/symbols.txt +++ b/config/usa/arm9/overlays/ov014/symbols.txt @@ -8,7 +8,7 @@ func_ov014_0211f980 kind:function(arm,size=0x130) addr:0x211f900 func_ov014_0211fab0 kind:function(arm,size=0x1dc) addr:0x211fa30 func_ov014_0211fc8c kind:function(arm,size=0x50) addr:0x211fc0c func_ov014_0211fcdc kind:function(thumb,size=0x28) addr:0x211fc5c -_Z19func_ov014_0211fd04Pi kind:function(thumb,size=0x4c) addr:0x211fc84 +_ZN18UnkStruct_027e109819func_ov014_0211fd04Ev kind:function(thumb,size=0x4c) addr:0x211fc84 _ZN10ActorArrow6CreateEv kind:function(arm,size=0x30) addr:0x211fcd0 _ZN10ActorArrow19func_ov014_0211fd80Ei kind:function(arm,size=0x10) addr:0x211fd00 _ZN10ActorArrow19func_ov014_0211fd90Ev kind:function(arm,size=0x14) addr:0x211fd10 @@ -846,7 +846,7 @@ func_ov014_0213ccd8 kind:function(arm,size=0xe8) addr:0x213cc34 func_ov014_0213cdc0 kind:function(arm,size=0x3c) addr:0x213cd1c func_ov014_0213cdfc kind:function(arm,size=0x5c) addr:0x213cd58 func_ov014_0213ce58 kind:function(arm,size=0x18) addr:0x213cdb4 -func_ov014_0213ce70 kind:function(arm,size=0xbc) addr:0x213cdcc +_ZN24UnkStruct_ov015_0213ce4c11GetInstanceEv kind:function(arm,size=0xbc) addr:0x213cdcc local func_ov014_0213cf2c kind:function(arm,size=0x5c) addr:0x213ce88 _ZN10EquipScoopC2Ev kind:function(thumb,size=0x14) addr:0x213cee4 _ZN10EquipScoopD1Ev kind:function(thumb,size=0xc) addr:0x213cef8 diff --git a/config/usa/arm9/overlays/ov015/symbols.txt b/config/usa/arm9/overlays/ov015/symbols.txt index c9b2ed11..17c977cb 100644 --- a/config/usa/arm9/overlays/ov015/symbols.txt +++ b/config/usa/arm9/overlays/ov015/symbols.txt @@ -613,7 +613,7 @@ func_ov015_0213cc98 kind:function(arm,size=0x14) addr:0x213cc18 func_ov015_0213ccac kind:function(arm,size=0x38) addr:0x213cc2c func_ov015_0213cce4 kind:function(arm,size=0x78) addr:0x213cc64 func_ov015_0213cd5c kind:function(arm,size=0xf0) addr:0x213ccdc -func_ov015_0213ce4c kind:function(arm,size=0x10) addr:0x213cdcc +_ZN24UnkStruct_ov015_0213ce4c11GetInstanceEv kind:function(arm,size=0x10) addr:0x213cdcc func_ov015_0213ce5c kind:function(arm,size=0xb4) addr:0x213cddc func_ov015_0213cf10 kind:function(arm,size=0x20) addr:0x213ce90 func_ov015_0213cf30 kind:function(arm,size=0x48) addr:0x213ceb0 @@ -640,8 +640,8 @@ func_ov015_0213d87c kind:function(arm,size=0x28c) addr:0x213d7fc func_ov015_0213db08 kind:function(arm,size=0xb0) addr:0x213da88 func_ov015_0213dbb8 kind:function(arm,size=0xb0) addr:0x213db38 func_ov015_0213dc68 kind:function(arm,size=0x48) addr:0x213dbe8 -func_ov015_0213dcb0 kind:function(arm,size=0x8) addr:0x213dc30 -func_ov015_0213dcb8 kind:function(arm,size=0x8) addr:0x213dc38 +_ZN24UnkStruct_ov015_0213ce4c8GetUnk3fEv kind:function(arm,size=0x8) addr:0x213dc30 +_ZN24UnkStruct_ov015_0213ce4c8GetUnk40Ev kind:function(arm,size=0x8) addr:0x213dc38 func_ov015_0213dcc0 kind:function(arm,size=0x4) addr:0x213dc40 func_ov015_0213dcc4 kind:function(arm,size=0x8c) addr:0x213dc44 func_ov015_0213dd50 kind:function(arm,size=0x24) addr:0x213dcd0 diff --git a/config/usa/arm9/overlays/ov024/symbols.txt b/config/usa/arm9/overlays/ov024/symbols.txt index 2ab381dd..39e1c794 100644 --- a/config/usa/arm9/overlays/ov024/symbols.txt +++ b/config/usa/arm9/overlays/ov024/symbols.txt @@ -286,7 +286,7 @@ func_ov024_02178204 kind:function(arm,size=0x30) addr:0x2178164 func_ov024_02178234 kind:function(arm,size=0xec) addr:0x2178194 func_ov024_02178320 kind:function(arm,size=0x20) addr:0x2178280 func_ov024_02178340 kind:function(arm,size=0x8) addr:0x21782a0 -func_ov024_02178348 kind:function(arm,size=0x358) addr:0x21782a8 +_ZN13PlayerControl19func_ov024_02178348EP5Vec3p kind:function(arm,size=0x358) addr:0x21782a8 func_ov024_021786a0 kind:function(arm,size=0x10) addr:0x2178600 func_ov024_021786b0 kind:function(arm,size=0x30) addr:0x2178610 func_ov024_021786e0 kind:function(arm,size=0x20) addr:0x2178640 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index af09f863..fe14219e 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -56,7 +56,7 @@ func_020029fc kind:function(arm,size=0x1b0) addr:0x20029fc func_02002bac kind:function(arm,size=0xc) addr:0x2002bac func_02002bb8 kind:function(arm,size=0x3c) addr:0x2002bb8 func_02002bf4 kind:function(arm,size=0x20) addr:0x2002bf4 -SoftDivideMod kind:function(arm,size=0x20c) addr:0x2002c14 +_s32_div_f kind:function(arm,size=0x20c) addr:0x2002c14 SoftDivide kind:function(arm,size=0x1e4) addr:0x2002e20 .L_02002e28 kind:label(arm) addr:0x2002e28 func_0200301c kind:function(arm,size=0x544) addr:0x200301c diff --git a/include/Actor/ActorRef.hpp b/include/Actor/ActorRef.hpp index 5ef03f2c..eeace571 100644 --- a/include/Actor/ActorRef.hpp +++ b/include/Actor/ActorRef.hpp @@ -8,9 +8,7 @@ struct ActorRef { /* 4 */ s32 index; /* 8 */ - inline ActorRef() { - Reset(); - } + inline ActorRef() {} inline ActorRef(s32 id, s32 index) : id(id), index(index) {} diff --git a/include/Actor/Navi/ActorNaviBase.hpp b/include/Actor/Navi/ActorNaviBase.hpp index 4c2a20cf..59db230b 100644 --- a/include/Actor/Navi/ActorNaviBase.hpp +++ b/include/Actor/Navi/ActorNaviBase.hpp @@ -21,7 +21,7 @@ class ActorNaviBase_Unk1 {}; class ActorNaviBase : public Actor { public: /* 000 (base) */ - /* 158 */ Vec3p mUnk_158; + /* 158 */ Vec3p mOffsetPos; /* 164 */ unk32 mUnk_164; /* 168 */ ModelRender mUnk_168; /* 1c4 */ unk8 mUnk_1c4[0xc]; diff --git a/include/DTCM/UnkStruct_027e05f8.hpp b/include/DTCM/UnkStruct_027e05f8.hpp index 43e83540..a5bc24d6 100644 --- a/include/DTCM/UnkStruct_027e05f8.hpp +++ b/include/DTCM/UnkStruct_027e05f8.hpp @@ -4,7 +4,10 @@ #include "types.h" struct UnkStruct_027e05f8 { - // TODO: Add fields + /* 0 */ u16 mUnk_0; + /* 2 */ u16 mUnk_2; + /* 4 */ unk16 mUnk_4; + /* 6 */ void func_0202adf4(unk32 param1, s32 param2); ~UnkStruct_027e05f8(); @@ -15,3 +18,5 @@ struct UnkStruct_027e05f8 { void func_02037480(); static unk32 func_02037490(unk32 param1); }; + +extern UnkStruct_027e05f8 data_027e05f8; diff --git a/include/DTCM/UnkStruct_027e077c.hpp b/include/DTCM/UnkStruct_027e077c.hpp index 3adda2bc..57ef477d 100644 --- a/include/DTCM/UnkStruct_027e077c.hpp +++ b/include/DTCM/UnkStruct_027e077c.hpp @@ -4,8 +4,26 @@ #include "types.h" struct UnkStruct_027e077c { - // TODO: Add fields +private: + /* 0 */ unk32 mUnk_0; + /* 4 */ unk32 mUnk_4; + +public: + /* 8 */ unk16 mUnk_8; + /* a */ unk8 mUnk_a; + /* b */ UnkStruct_027e077c(unk32 param1); bool func_0202e740(unk32 param1); + + inline volatile unk32 GetUnk0() const { + return mUnk_0; + } + + inline unk32 GetUnk4() const { + return mUnk_4; + } }; + +extern UnkStruct_027e077c data_027e077c; +extern volatile u8 data_02056be4[]; diff --git a/include/DTCM/UnkStruct_027e0c68.hpp b/include/DTCM/UnkStruct_027e0c68.hpp new file mode 100644 index 00000000..e172e51e --- /dev/null +++ b/include/DTCM/UnkStruct_027e0c68.hpp @@ -0,0 +1,27 @@ +#pragma once + +#include "global.h" +#include "types.h" + +#include "Debug/DebugHierarchyBase.hpp" + +struct UnkStruct_027e0c68 { + /* 00 */ unk8 mUnk_00[4]; + /* 04 */ u8 mUnk_04; + /* 05 */ unk8 mUnk_05[3]; + /* 08 */ unk32 mUnk_08; + /* 0c */ unk8 mUnk_0c[4]; + /* 10 */ unk16 mUnk_10; + /* 12 */ unk8 mUnk_12[2]; + /* 14 */ unk32 mUnk_14; + /* 18 */ s32 mUnk_18; + /* 1c */ s32 mUnk_1c; + /* 20 */ s32 *mUnk_20; + /* 24 */ unk32 mUnk_24; + /* 28 */ s32 *mUnk_28; + /* 2c */ unk8 mUnk_2c[0x1c]; + /* 48 */ DebugHierarchyBase *mDebug; + /* 4c */ +}; + +extern UnkStruct_027e0c68 data_027e0c68; diff --git a/include/DTCM/UnkStruct_027e0d38.hpp b/include/DTCM/UnkStruct_027e0d38.hpp index a36af0fe..b2e50a89 100644 --- a/include/DTCM/UnkStruct_027e0d38.hpp +++ b/include/DTCM/UnkStruct_027e0d38.hpp @@ -3,6 +3,12 @@ #include "global.h" #include "types.h" +struct UnkStruct_027e0d38_Unk28 { + /* 00 */ unk8 mUnk_00[0x34]; + /* 34 */ bool mUnk_34; + /* 35 */ +}; + struct UnkStruct_027e0d38 { /* 00 */ unk8 mUnk_00; /* 01 */ unk8 mUnk_01[3]; // padding? @@ -19,10 +25,10 @@ struct UnkStruct_027e0d38 { /* 21 */ unk8 mUnk_21; /* 22 */ unk8 mUnk_22[2]; // padding? /* 24 */ void *mUnk_24; - /* 28 */ void *mUnk_28; + /* 28 */ UnkStruct_027e0d38_Unk28 *mUnk_28; /* 2c */ - unk32 func_ov000_02078b40(); + s32 func_ov000_02078b40(); unk8 func_ov000_02078b64(); bool func_ov000_02078b88(); }; diff --git a/include/DTCM/UnkStruct_027e0e2c.hpp b/include/DTCM/UnkStruct_027e0e2c.hpp new file mode 100644 index 00000000..b8923bde --- /dev/null +++ b/include/DTCM/UnkStruct_027e0e2c.hpp @@ -0,0 +1,22 @@ +#pragma once + +#include "global.h" +#include "types.h" + +struct UnkStruct_027e0e2c { + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + /* 0c */ unk32 mUnk_0c; + /* 10 */ unk32 mUnk_10; + /* 14 */ unk16 mUnk_14; + /* 16 */ unk16 mUnk_16; + /* 18 */ unk32 mUnk_18; + /* 1c */ unk32 mUnk_1c; + /* 20 */ unk32 mUnk_20; + /* 24 */ unk32 mUnk_24; + /* 28 */ unk32 mUnk_28; + /* 2c */ +}; + +extern UnkStruct_027e0e2c data_027e0e2c; diff --git a/include/DTCM/UnkStruct_027e0f64.hpp b/include/DTCM/UnkStruct_027e0f64.hpp new file mode 100644 index 00000000..33728a7e --- /dev/null +++ b/include/DTCM/UnkStruct_027e0f64.hpp @@ -0,0 +1,15 @@ +#pragma once + +#include "global.h" +#include "types.h" + +struct UnkStruct_027e0f64 { + /* 0 */ DebugHierarchyBase *mUnk_0; + /* 4 */ void *mUnk_4; + /* 8 */ void *mUnk_8; + /* c */ + + unk32 func_ov000_0208b180(); +}; + +extern UnkStruct_027e0f64 *data_027e0f64; diff --git a/include/DTCM/UnkStruct_027e0ffc.hpp b/include/DTCM/UnkStruct_027e0ffc.hpp new file mode 100644 index 00000000..463d9ec8 --- /dev/null +++ b/include/DTCM/UnkStruct_027e0ffc.hpp @@ -0,0 +1,27 @@ +#pragma once + +#include "global.h" +#include "types.h" + +struct UnkStruct_027e0ffc { + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04[0x4]; + /* 14 */ unk32 mUnk_14; + /* 18 */ unk32 mUnk_18; + /* 1c */ unk32 mUnk_1c; + /* 20 */ unk32 mUnk_20; + /* 24 */ unk8 mUnk_24; + /* 25 */ unk8 mUnk_25[0x3]; + /* 28 */ unk32 mUnk_28; + /* 2c */ unk32 mUnk_2c; + /* 30 */ unk32 mUnk_30; + /* 34 */ unk32 mUnk_34; + /* 38 */ unk8 mUnk_38; + /* 39 */ + + void func_ov000_020cebcc(u32 param1, unk16 param2, unk32 param3); + void func_ov000_020ced64(Cylinder *param1, u32 param2, u32 param3); + void func_ov000_020ced7c(Vec3p *param1, s32 param2, s32 param3, unk32 param4); +}; + +extern UnkStruct_027e0ffc data_027e0ffc; diff --git a/include/DTCM/UnkStruct_027e1098.hpp b/include/DTCM/UnkStruct_027e1098.hpp new file mode 100644 index 00000000..043e108a --- /dev/null +++ b/include/DTCM/UnkStruct_027e1098.hpp @@ -0,0 +1,21 @@ +#pragma once + +#include "types.h" + +struct UnkStruct_027e1098 { + /* 00 */ unk8 mUnk_00[0x38]; + /* 38 */ unk32 mUnk_38; + /* 3c */ unk32 mUnk_3c; + /* 40 */ unk32 mUnk_40; + /* 44 */ unk32 mUnk_44; + /* 48 */ unk8 mUnk_48; + /* 49 */ unk8 mUnk_49; + /* 4a */ unk8 mUnk_4a; + /* 4b */ unk8 mUnk_4b; + /* 4c */ unk32 mUnk_4c; + /* 50 */ + + void func_ov014_0211fd04(); +}; + +extern UnkStruct_027e1098 *data_027e1098; diff --git a/include/Debug/DebugHierarchyBase.hpp b/include/Debug/DebugHierarchyBase.hpp index 0e57c9a7..ca1e0eb7 100644 --- a/include/Debug/DebugHierarchyBase.hpp +++ b/include/Debug/DebugHierarchyBase.hpp @@ -19,7 +19,7 @@ public: /* 14 */ virtual void vfunc_14(); /* 18 */ virtual void vfunc_18(); /* 1c */ virtual void vfunc_1c(); - /* 20 */ virtual void vfunc_20(); + /* 20 */ virtual void vfunc_20(unk32 param1, const char *param2, unk32 param3, unk32 param4, unk32 param5, unk32 param6); /* 24 */ virtual void vfunc_24(); /* 28 */ virtual void vfunc_28(); /* 2c */ virtual void vfunc_2c(); diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index 9e473fc2..37f22457 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -51,7 +51,7 @@ enum DungeonItemModelId_ { };
class ItemManager : public SysObject {
-private:
+public:
/* 000 */ ItemFlag mEquippedItem;
/* 004 */ ItemFlag mPrevEquippedItem;
/* 008 */ ItemFlag mForcedItem; // game crashes when any item besides this one is equipped
@@ -92,7 +92,6 @@ private: /* 14e */ unk8 mUnk_14e[0x2]; // padding?
/* 150 */
-public:
static ItemManager *Create();
static void Destroy();
ItemManager();
diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index f6557c07..91e958d8 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -158,7 +158,7 @@ public: bool func_ov00_020839c4(s32 param_2); static unk8 func_ov00_020839d4(); static unk8 func_ov00_020839f8(); - static void func_ov00_02083a1c(unk32 param_1, MapManager *param_2, Vec3p *param_3); + static void func_ov00_02083a1c(Vec2b *param_1, MapManager *param_2, Vec3p *param_3); static unk8 func_ov00_02083a54(unk32 param_1, MapManager *param_2, unk32 param_3, unk32 param_4, unk32 param_5); static unk8 func_ov00_02083b84(); static unk8 func_ov00_02083bac(); @@ -166,7 +166,7 @@ public: static unk8 func_ov00_02083bfc(); unk8 func_ov00_02083c24(unk32 param_2); unk8 func_ov00_02083c50(unk32 param_2); - unk8 func_ov00_02083c7c(Vec3p *param_2, unk32 param_3); + unk8 func_ov00_02083c7c(Vec3p *param_2, Vec2b param_3); static unk8 func_ov00_02083ce8(unk8 param_1, unk8 param_2, unk8 param_3, unk8 param_4, unk32 param_5); unk8 func_ov00_02083e34(unk8 param_2, unk8 param_3, unk32 param_4); unk8 MapData_vfunc_60(); @@ -180,7 +180,7 @@ public: void GetTileWorldBounds(Vec2b *tile, AABB *tileBounds); unk8 MapData_vfunc_54(); unk8 func_ov00_020840a0(unk8 param_2, unk8 param_3, unk32 param_4); - unk8 MapData_vfunc_78(); + unk32 MapData_vfunc_78(Vec2b *param1); static unk8 func_ov00_020840dc(); static unk8 func_ov00_02084100(unk32 param_1, MapManager *param_2); unk8 GetMapData_Unk_48(); @@ -232,10 +232,10 @@ public: unk8 func_ov00_02084d24(unk8 param_2, unk8 param_3, unk32 param_4); s32 func_ov00_02084d4c(unk32 param_2, unk32 param_3, Vec3p *param_4); unk8 func_ov00_02084ebc(unk32 param_2); - s32 func_ov00_02085108(s32 *param_2); + s32 func_ov00_02085108(Vec3p *param_2); static unk8 func_ov00_0208527c(); static unk8 func_ov00_020853fc(); - static unk8 func_ov00_02085594(); + unk8 func_ov00_02085594(Vec3p *param_1); static void func_ov00_0208583c(unk32 param_1, Vec3p *param_2, unk32 param_3); static unk8 func_ov00_020858b0(); s32 func_ov00_02085a34(unk32 param_2, unk32 param_3); diff --git a/include/Player/PlayerBase.hpp b/include/Player/PlayerBase.hpp index d2ffea38..744ff464 100644 --- a/include/Player/PlayerBase.hpp +++ b/include/Player/PlayerBase.hpp @@ -64,4 +64,4 @@ public: extern PlayerBase *gPlayer; extern Vec3p gPlayerPos; extern Vec3p gPlayerVel; -extern s16 gPlayerAngle; +extern u16 gPlayerAngle; diff --git a/include/Player/PlayerControl.hpp b/include/Player/PlayerControl.hpp index f2cc23eb..11dd6488 100644 --- a/include/Player/PlayerControl.hpp +++ b/include/Player/PlayerControl.hpp @@ -11,7 +11,7 @@ #include "Player/TouchControl.hpp" #include "Player/TouchGesture.hpp" -typedef u16 TouchEdge; +typedef s16 TouchEdge; enum TouchEdge_ { TouchEdge_Right = 0, TouchEdge_Left = 1, @@ -28,7 +28,7 @@ public: /* 50 */ q20 mTouchSpeedX; // how fast the stylus moves /* 54 */ q20 mTouchSpeedY; /* 58 */ q20 mTouchDist; // pixel distance from touch to link, deadzone is 20 pixels - /* 5c */ unk32 mUnk_5c; + /* 5c */ q20 mTouchSpeed; /* 60 */ s16 mTouchDuration; /* 62 */ s16 mTouchSlowDuration; // resets to 0 if stylus is fast enough /* 64 */ s16 mTouchFastTime; // gets set to mTouchDuration if stylus is fast enough @@ -46,24 +46,23 @@ public: /* 79 */ bool mUsingEquipItem; /* 7a */ bool mUnk_7a; /* 7b */ bool mUnk_7b; - /* 7c */ s8 mUnk_7c; + /* 7c */ u8 mUnk_7c; /* 7d */ bool mUnk_7d; - /* 7e */ s8 mUnk_7e; + /* 7e */ u8 mUnk_7e; /* 7f */ bool mUnk_7f; /* 80 */ bool mUnk_80; /* 81 */ bool mFollowing; - /* 82 */ unk8 mUnk_82; + /* 82 */ bool mUnk_82; /* 83 */ bool mUnk_83; /* 84 */ ActorRef mFollowRef; /* 8c */ ActorRef mNextFollowRef; /* 94 */ ActorRef mLastFollowRef; - /* 9c */ unk8 mUnk_9c; - /* 9d */ unk8 mUnk_9d; + /* 9c */ Vec2b mUnk_9c; /* 9e */ unk8 mUnk_9e[2]; - /* a0 */ void *mFollowActor; + /* a0 */ void *mFollowObject; /* a4 */ q20 mFollowDist; - /* a8 */ u16 mFollowStuckTimer; - /* aa */ u16 mCutsceneEndTimer; + /* a8 */ s16 mFollowStuckTimer; + /* aa */ s16 mCutsceneEndTimer; /* ac */ s16 mUnk_ac; /* ae */ unk16 mUnk_ae; /* b0 */ Vec3p mAim; // used by boomerang, bow and rope @@ -75,11 +74,11 @@ public: /* d8 */ static bool func_ov00_020aeeac(); - void func_ov00_020aeef8(); + static bool func_ov00_020aeef8(); void func_ov00_020aef30(); void UpdateAim(); Actor *GetFollowActor(); - bool func_ov00_020af01c(unk8 *param1); + bool func_ov00_020af01c(Vec2b *param1); void SetUnk_80(); void StopFollowing(); void func_ov00_020af06c(); @@ -90,30 +89,30 @@ public: bool CheckTouching(u32 param1); bool CheckTouchFast(u32 param1); bool func_ov00_020af4a4(); - void func_ov00_020af538(); + void func_ov00_020af538(bool param1, u8 param2); void func_ov00_020af6e4(Vec3p *param1, s32 param3, s32 param4); bool func_ov00_020af778(); bool func_ov00_020afad8(Vec3p *param1); void func_ov00_020afb6c(); bool func_ov00_020afe88(s32 param1, bool param2); bool func_ov00_020afeec(unk32 param1, bool param2); - void func_ov00_020aff90(unk32 param1, unk32 param2); + void func_ov00_020aff90(Vec3p *param1, unk32 param2); void func_ov00_020affec(Vec3p *param1, s32 y, s32 param3, Vec3p *param4); - void func_ov00_020b014c(); - void SetAim(); + void func_ov00_020b014c(Vec3p *param1); + void ResetAim(); bool UpdateAimWorld(Vec3p *param1); s16 GetTouchAngle(); u32 func_ov00_020b034c(); s32 func_ov00_020b0418(); bool func_ov00_020b049c(Vec3p *param1, bool param2); bool func_ov00_020b05e8(Vec3p *param1); - bool func_ov00_020b0778(Vec3p *param1, u32 param2, unk32 param3); + bool func_ov00_020b0778(Vec3p *param1, u32 param2, unk32 *param3); bool CheckNotTouching(); bool func_ov00_020b0ad0(Actor *actor); bool func_ov00_020b0b0c(s16 *pAngle, ItemFlag *pEquipId, unk32 *pCardinal, bool *pFast); bool func_ov00_020b0de8(Vec3p *param1); bool func_ov00_020b0e54(Vec3p *param1, Vec3p *param2); - bool func_ov00_020b0f88(Vec3p *param1, unk32 param2, Vec3p *param3); + bool func_ov00_020b0f88(Vec3p *param1, unk32 scale, Vec3p *param3); bool func_ov00_020b1058(Vec3p *param1, unk32 param2, Vec3p *param3, Vec3p *param4); bool IsUntouchedNow(); bool IsNotUntouchedNow(); @@ -138,6 +137,8 @@ public: void Init(); void func_ov004_0210b1d0(); static void func_ov004_0210b1f0(); + + bool func_ov024_02178348(Vec3p *param1); }; extern PlayerControl *gPlayerControl; diff --git a/include/Player/PlayerControlData.hpp b/include/Player/PlayerControlData.hpp index 3527810c..cdcd8db8 100644 --- a/include/Player/PlayerControlData.hpp +++ b/include/Player/PlayerControlData.hpp @@ -87,8 +87,8 @@ public: /* 68 */ virtual void vfunc_68(unk32 param1, unk32 param2); /* 6c */ virtual void vfunc_6c(s32 param1, Vec3p *param2); /* 70 */ virtual void vfunc_70(s32 param1); - /* 74 */ virtual unk32 vfunc_74(); - /* 78 */ virtual unk32 vfunc_78(); + /* 74 */ virtual unk32 vfunc_74(s32 param1); + /* 78 */ virtual unk32 vfunc_78(s32 param1); /* 7c */ virtual unk32 vfunc_7c(); /* 80 */ @@ -105,3 +105,5 @@ public: PlayerControlData(); }; + +extern PlayerControlData *gPlayerControlData; diff --git a/include/Player/TouchGesture.hpp b/include/Player/TouchGesture.hpp index 5009525e..0ed897a7 100644 --- a/include/Player/TouchGesture.hpp +++ b/include/Player/TouchGesture.hpp @@ -22,7 +22,8 @@ public: class TouchGesture : public TouchGestureBase { public: /* 00 (base) */ - /* 05 */ unk8 mUnk_05[7]; + /* 05 */ unk8 mUnk_05[3]; + /* 08 */ s32 mUnk_08; /* 0c */ u16 mIndex; /* 0e */ unk16 mUnk_0e; /* 10 */ u16 mUnk_10[GESTURE_BUFFER_LENGTH]; diff --git a/libs/nds/include/nds/math.h b/libs/nds/include/nds/math.h index 517cbde2..18332db1 100644 --- a/libs/nds/include/nds/math.h +++ b/libs/nds/include/nds/math.h @@ -8,6 +8,8 @@ extern "C" { #endif +#define ABS(x) ((x) < 0 ? -(x) : (x)) + // Q20.12 fixed point number typedef s32 q20; // Q4.12 fixed point number @@ -19,6 +21,7 @@ typedef s16 q4; #define FLOAT_TO_Q19(n) ((s32) (((n) * 8192 + 1))) #define ROUND_Q20(n) (((s32) (n) + 0x800) >> 12) #define MUL_Q20(a, b) (q20)((((s64) (a)) * ((s64) (b)) + 0x800) >> 12) +#define DIV_Q20(a, b) (((a) << 12) / (b)) #define DEG_TO_ANG(n) ((n) * 0x10000 / 360) #define SIN(n) (gSinCosTable[2 * ((n) >> 4)]) @@ -31,7 +34,7 @@ u32 SoftDivide(u32 a, u32 b); u32 CoDivide64By32(u32 a, u32 b); u32 func_01ff98f0(u32 a, u32 b); u32 CoReciprocal(u32 x); -u32 func_01ff992c(u32 x); +u64 func_01ff992c(u32 x); u32 CoSqrt(u32 x); u32 CoInvSqrt(u32 x); u32 AwaitDivisionResult(); @@ -49,8 +52,8 @@ bool Approach_thunk(unk32 *src, unk32 dest, unk32 step); extern q4 gSinCosTable[]; typedef struct { - /* 0 */ s8 x; - /* 1 */ s8 y; + /* 0 */ u8 x; + /* 1 */ u8 y; /* 2 */ } Vec2b; diff --git a/libs/nds/src/itcm/math_1.c b/libs/nds/src/itcm/math_1.c index ee452869..bbc5f740 100644 --- a/libs/nds/src/itcm/math_1.c +++ b/libs/nds/src/itcm/math_1.c @@ -37,7 +37,7 @@ void Mat4p_Multiply(Mat4p *a, Mat4p *b, Mat4p *out) {} u32 CoDivide64By32(u32 a, u32 b) {} u32 func_01ff98f0(u32 a, u32 b) {} u32 CoReciprocal(u32 x) {} -u32 func_01ff992c(u32 x) {} +u64 func_01ff992c(u32 x) {} u32 CoSqrt(u32 x) {} u32 CoInvSqrt(u32 x) {} u32 AwaitDivisionResult() {} diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp index 74f0da25..db721414 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -5,6 +5,8 @@ extern "C" { #include "Actor/Actor.hpp" #include "Actor/ActorManager.hpp" #include "Actor/ActorPlayerDummy.hpp" +#include "DTCM/UnkStruct_027e077c.hpp" +#include "DTCM/UnkStruct_027e103c.hpp" #include "Item/ItemManager.hpp" #include "Map/MapManager.hpp" #include "Player/EquipSword.hpp" @@ -255,20 +257,9 @@ ARM bool Actor::func_ov00_020c195c() { return true; } -struct UnkStruct2 { - /* 0 */ u32 mUnk_0; - /* 4 */ u32 mUnk_4; - /* 8 */ -}; -extern UnkStruct2 data_027e077c; -extern u8 data_02056be4[]; -extern "C" bool func_ov05_02103f4c(s32 param1); -extern s32 data_027e103c; ARM bool Actor::func_ov00_020c198c() { - u32 unk1 = data_027e077c.mUnk_0; - u32 unk2 = data_027e077c.mUnk_4; - if (data_027e077c.mUnk_0 != data_027e077c.mUnk_4 || (data_02056be4[unk1] & 1) != 0 || (data_02056be4[unk2] & 4) != 0 || - func_ov05_02103f4c(data_027e103c) || gPlayer->mHealth <= 0) + if (data_027e077c.GetUnk0() != data_027e077c.GetUnk4() || (data_02056be4[data_027e077c.GetUnk0()] & 1) != 0 || + (data_02056be4[data_027e077c.GetUnk4()] & 4) != 0 || data_027e103c->func_ov005_02103f4c() || gPlayer->mHealth <= 0) { return false; } diff --git a/src/00_Core/Actor/ActorManager.cpp b/src/00_Core/Actor/ActorManager.cpp index 73ab6bbb..fed1075e 100644 --- a/src/00_Core/Actor/ActorManager.cpp +++ b/src/00_Core/Actor/ActorManager.cpp @@ -1,4 +1,5 @@ #include "Actor/ActorManager.hpp" +#include "DTCM/UnkStruct_027e077c.hpp" #include "DTCM/UnkStruct_027e103c.hpp" #include "Map/MapManager.hpp" @@ -8,8 +9,6 @@ extern "C" Cylinder *func_ov000_020c3ef0(void *, u32 index); extern "C" bool func_ov000_020c3f08(void *, u32 index); extern "C" void func_ov000_020c3f3c(void *, u32 index, Cylinder *cylinder); extern "C" void func_ov000_020c3f54(void *, u32 param2); -extern s32 data_027e077c; -extern u8 data_02056be4[]; ARM void ActorManager::DeleteActor(u32 index, bool param2) { if (!param2) { @@ -52,7 +51,7 @@ ARM void ActorManager::func_ov00_020c3484(ActorRef *ref, ActorManager *actorMgr, q20 minDistance = 0x7fffffff; Actor **actorIter = actorMgr->mActorTable; - u8 unkByte = data_02056be4[data_027e077c]; + u8 unkByte = data_02056be4[data_027e077c.GetUnk0()]; bool unk1 = (unkByte & 1) != 0; Actor **actorTableEnd = actorIter + actorMgr->mMaxActorIndex; diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index aef0ec94..d85fc6ab 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -240,9 +240,6 @@ ARM void ItemManager::GiveAmmo(ItemFlag equipId, u16 amount) { extern void *data_027e10a4;
extern "C" bool func_ov015_02136670(void *param1);
extern u8 data_ov022_0217a4ac[];
-extern "C" bool _ZN14PlayerLinkBase18func_ov00_020bbd80Ei(unk32 param1, unk32 param2);
-extern "C" bool _ZNK11ItemManager7HasItemEi();
-extern "C" void _ZN11ItemManager12GetEquipItemEi();
ARM bool ItemManager::func_ov00_020ad790(unk32 param1) {
unk32 unk1 = data_027e0d38->func_ov000_02078b40();
if (unk1 == 2) return func_ov015_02136670(data_027e10a4);
diff --git a/src/00_Core/Map/MapManager.cpp b/src/00_Core/Map/MapManager.cpp index 82de433f..6abb27cc 100644 --- a/src/00_Core/Map/MapManager.cpp +++ b/src/00_Core/Map/MapManager.cpp @@ -113,7 +113,7 @@ bool MapManager::func_ov00_020839b4(s32 param_2) {} bool MapManager::func_ov00_020839c4(s32 param_2) {} unk8 MapManager::func_ov00_020839d4() {} unk8 MapManager::func_ov00_020839f8() {} -void MapManager::func_ov00_02083a1c(unk32 param_1, MapManager *param_2, Vec3p *param_3) {} +void MapManager::func_ov00_02083a1c(Vec2b *param_1, MapManager *param_2, Vec3p *param_3) {} unk8 MapManager::func_ov00_02083a54(unk32 param_1, MapManager *param_2, unk32 param_3, unk32 param_4, unk32 param_5) {} unk8 MapManager::func_ov00_02083b84() {} unk8 MapManager::func_ov00_02083bac() {} @@ -121,7 +121,7 @@ unk8 MapManager::func_ov00_02083bd4() {} unk8 MapManager::func_ov00_02083bfc() {} unk8 MapManager::func_ov00_02083c24(unk32 param_2) {} unk8 MapManager::func_ov00_02083c50(unk32 param_2) {} -unk8 MapManager::func_ov00_02083c7c(Vec3p *param_2, unk32 param_3) {} +unk8 MapManager::func_ov00_02083c7c(Vec3p *param_2, Vec2b param_3) {} unk8 MapManager::func_ov00_02083ce8(unk8 param_1, unk8 param_2, unk8 param_3, unk8 param_4, unk32 param_5) {} unk8 MapManager::func_ov00_02083e34(unk8 param_2, unk8 param_3, unk32 param_4) {} unk8 MapManager::MapData_vfunc_60() {} @@ -135,7 +135,7 @@ unk8 MapManager::func_ov00_02083fb0(u32 *param_1, MapManager *param_2, Vec3p *pa void MapManager::GetTileWorldBounds(Vec2b *tile, AABB *tileBounds) {} unk8 MapManager::MapData_vfunc_54() {} unk8 MapManager::func_ov00_020840a0(unk8 param_2, unk8 param_3, unk32 param_4) {} -unk8 MapManager::MapData_vfunc_78() {} +unk32 MapManager::MapData_vfunc_78(Vec2b *param1) {} unk8 MapManager::func_ov00_020840dc() {} unk8 MapManager::func_ov00_02084100(unk32 param_1, MapManager *param_2) {} unk8 MapManager::GetMapData_Unk_48() {} @@ -187,10 +187,10 @@ unk8 MapManager::GetMapData_Unk_09() {} unk8 MapManager::func_ov00_02084d24(unk8 param_2, unk8 param_3, unk32 param_4) {} s32 MapManager::func_ov00_02084d4c(unk32 param_2, unk32 param_3, Vec3p *param_4) {} unk8 MapManager::func_ov00_02084ebc(unk32 param_2) {} -s32 MapManager::func_ov00_02085108(s32 *param_2) {} +s32 MapManager::func_ov00_02085108(Vec3p *param_2) {} unk8 MapManager::func_ov00_0208527c() {} unk8 MapManager::func_ov00_020853fc() {} -unk8 MapManager::func_ov00_02085594() {} +unk8 MapManager::func_ov00_02085594(Vec3p *param_1) {} void MapManager::func_ov00_0208583c(unk32 param_1, Vec3p *param_2, unk32 param_3) {} unk8 MapManager::func_ov00_020858b0() {} s32 MapManager::func_ov00_02085a34(unk32 param_2, unk32 param_3) {} diff --git a/src/00_Core/Player/LinkStateItem.cpp b/src/00_Core/Player/LinkStateItem.cpp index 240b94c8..9e42961f 100644 --- a/src/00_Core/Player/LinkStateItem.cpp +++ b/src/00_Core/Player/LinkStateItem.cpp @@ -1,5 +1,6 @@ #include "Player/LinkStateItem.hpp" #include "DTCM/UnkStruct_027e103c.hpp" +#include "DTCM/UnkStruct_027e1098.hpp" #include "Item/ItemManager.hpp" #include "Player/EquipBomb.hpp" #include "Player/EquipHammer.hpp" @@ -8,13 +9,8 @@ #include "Player/PlayerControl.hpp" #include "Save/AdventureFlags.hpp" -extern void func_ov000_020cf9dc(s32 param1, s32 param2, s32 param3); -extern void func_ov014_0213ec64(s32 param1); -extern void func_ov014_0211fd04(s32 *param1); extern void func_ov000_020b7e6c(s32 *param1); -extern s32 *data_027e1098; - THUMB void LinkStateItem::vfunc_00() {} ARM LinkStateId LinkStateItem::GetId() { @@ -42,7 +38,7 @@ ARM void LinkStateItem::OnStateLeave(s32 param1) { if (*(u8 *) (iVar3 + 0xe0) == '\0') { GetEquipBombchu()->func_ov014_0213ec64(); } - func_ov014_0211fd04(data_027e1098); + data_027e1098->func_ov014_0211fd04(); break; case ItemFlag_OshusSword: break; case ItemFlag_WoodenShield: break; diff --git a/src/00_Core/Player/PlayerControl.cpp b/src/00_Core/Player/PlayerControl.cpp index 6cf39bda..406fe1da 100644 --- a/src/00_Core/Player/PlayerControl.cpp +++ b/src/00_Core/Player/PlayerControl.cpp @@ -1,52 +1,1066 @@ #include "Player/PlayerControl.hpp" +#include "Actor/ActorManager.hpp" +#include "Actor/Navi/ActorNaviBase.hpp" +#include "DTCM/UnkStruct_027e05f8.hpp" +#include "DTCM/UnkStruct_027e077c.hpp" +#include "DTCM/UnkStruct_027e0c68.hpp" +#include "DTCM/UnkStruct_027e0d38.hpp" +#include "DTCM/UnkStruct_027e0e2c.hpp" +#include "DTCM/UnkStruct_027e0f64.hpp" +#include "DTCM/UnkStruct_027e0ffc.hpp" +#include "DTCM/UnkStruct_027e103c.hpp" +#include "Item/ItemManager.hpp" +#include "Map/MapManager.hpp" +#include "Player/PlayerBase.hpp" +#include "Player/PlayerLinkBase.hpp" +#include "Save/AdventureFlags.hpp" -bool PlayerControl::func_ov00_020aeeac() {} -void PlayerControl::func_ov00_020aeef8() {} -void PlayerControl::func_ov00_020aef30() {} -void PlayerControl::UpdateAim() {} -Actor *PlayerControl::GetFollowActor() {} -bool PlayerControl::func_ov00_020af01c(unk8 *param1) {} -void PlayerControl::SetUnk_80() {} -void PlayerControl::StopFollowing() {} -void PlayerControl::func_ov00_020af06c() {} -void PlayerControl::UpdateUsingEquipItem() {} -bool PlayerControl::func_ov00_020af2d4(u32 param1, bool param2) {} -bool PlayerControl::CheckTouchedNow(u32 param1) {} -bool PlayerControl::CheckUntouchedNow(u32 param1) {} -bool PlayerControl::CheckTouching(u32 param1) {} -bool PlayerControl::CheckTouchFast(u32 param1) {} -bool PlayerControl::func_ov00_020af4a4() {} -void PlayerControl::func_ov00_020af538() {} -void PlayerControl::func_ov00_020af6e4(Vec3p *param1, s32 param3, s32 param4) {} -bool PlayerControl::func_ov00_020af778() {} -bool PlayerControl::func_ov00_020afad8(Vec3p *param1) {} -void PlayerControl::func_ov00_020afb6c() {} -bool PlayerControl::func_ov00_020afe88(s32 param1, bool param2) {} -bool PlayerControl::func_ov00_020afeec(unk32 param1, bool param2) {} -void PlayerControl::func_ov00_020aff90(unk32 param1, unk32 param2) {} -void PlayerControl::func_ov00_020affec(Vec3p *param1, s32 y, s32 param3, Vec3p *param4) {} -void PlayerControl::func_ov00_020b014c() {} -void PlayerControl::SetAim() {} -bool PlayerControl::UpdateAimWorld(Vec3p *param1) {} -s16 PlayerControl::GetTouchAngle() {} -u32 PlayerControl::func_ov00_020b034c() {} -s32 PlayerControl::func_ov00_020b0418() {} -bool PlayerControl::func_ov00_020b049c(Vec3p *param1, bool param2) {} -bool PlayerControl::func_ov00_020b05e8(Vec3p *param1) {} -bool PlayerControl::func_ov00_020b0778(Vec3p *param1, u32 param2, unk32 param3) {} -bool PlayerControl::CheckNotTouching() {} -bool PlayerControl::func_ov00_020b0ad0(Actor *actor) {} -bool PlayerControl::func_ov00_020b0b0c(s16 *pAngle, ItemFlag *pEquipId, unk32 *pCardinal, bool *pFast) {} -bool PlayerControl::func_ov00_020b0de8(Vec3p *param1) {} -bool PlayerControl::func_ov00_020b0e54(Vec3p *param1, Vec3p *param2) {} -bool PlayerControl::func_ov00_020b0f88(Vec3p *param1, unk32 param2, Vec3p *param3) {} -bool PlayerControl::func_ov00_020b1058(Vec3p *param1, unk32 param2, Vec3p *param3, Vec3p *param4) {} -bool PlayerControl::IsUntouchedNow() {} -bool PlayerControl::IsNotUntouchedNow() {} -bool PlayerControl::func_ov00_020b1248(unk32 *param1) {} -bool PlayerControl::func_ov00_020b129c() {} -bool PlayerControl::func_ov00_020b12d0(s16 *pAngle) {} -bool PlayerControl::IsNotTouching() {} -bool PlayerControl::IsTouchingFast() {} -bool PlayerControl::IsTappedNow() {} -bool PlayerControl::func_ov00_020b13c4() {} +static char *sShipTypes[] = {"brg", "anc", "pdl", "hul", "can", "dco", "bow", "fnl"}; + +ARM bool PlayerControl::func_ov00_020aeeac() { + if (((data_02056be4[data_027e077c.GetUnk0()] & 1) != 0) || ((data_02056be4[data_027e077c.GetUnk0()] & 4) != 0)) { + return false; + } + return data_027e077c.GetUnk0() == data_027e077c.GetUnk4(); +} + +ARM bool PlayerControl::func_ov00_020aeef8() { + if (data_027e077c.GetUnk0() == 0x37 || data_027e077c.GetUnk0() == 0x3b) { + return false; + } + if (data_027e077c.GetUnk0() == 0x3d) { + return true; + } + return func_ov00_020aeeac(); +} + +THUMB void PlayerControl::func_ov00_020aef30() { + this->ResetTouchWorld(); + if (mDebug) { + // 操作 = Operation + mDebug->vfunc_20(0, "\x91\x80\x8d\xec", 'PCTL', 'PLYR', 0, 0); + } +} + +// NONMATCH: Instruction ordering +THUMB void PlayerControl::UpdateAim() { + ResetTouchWorld(); + mAimWorld.x = 0; + mAimWorld.y = 0; + mAimWorld.z = 0; + mUnk_80 = false; + mUnk_82 = 0; + mFollowRef.Reset(); + mNextFollowRef.Reset(); + mFollowing = false; + mAim = gVec3p_ZERO; + s32 iVar2 = data_027e0d38->func_ov000_02078b40(); + if (iVar2 == 2) { + data_027e103c->func_ov000_020cf2b8(); + } + mUnk_c8 = -1; + mUnk_cc = -1; +} + +ARM Actor *PlayerControl::GetFollowActor() { + return gActorManager->GetActor(&mFollowRef); +} + +ARM bool PlayerControl::func_ov00_020af01c(Vec2b *param1) { + if (mFollowing) { + *param1 = mUnk_9c; + return true; + } + return false; +} + +ARM void PlayerControl::SetUnk_80() { + mUnk_80 = true; +} + +ARM void PlayerControl::StopFollowing() { + mFollowRef.Reset(); + mFollowing = false; + mFollowObject = NULL; +} + +ARM void PlayerControl::func_ov00_020af06c() { + if (!mUnk_78) { + mUsingEquipItem = false; + return; + } + ItemFlag equippedItem; + bool usingEquipItem = mUsingEquipItem; + if (mUnk_7a) { + mUnk_7b = usingEquipItem; + } + if (gAdventureFlags->func_ov00_02097738() || data_027e0c68.mUnk_04 != 0) { + if (data_027e0d38->func_ov000_02078b40() != 2) { + mUsingEquipItem = false; + } + return; + } + ItemManager *itemManager = gItemManager; + equippedItem = itemManager->mEquippedItem; + if (equippedItem == ItemFlag_PotionA) { + if (itemManager->HasPotion(0)) { + mUsingEquipItem = true; + return; + } + } else if (equippedItem == ItemFlag_PotionB) { + if (itemManager->HasPotion(1)) { + mUsingEquipItem = true; + return; + } + } + if (data_027e0d38->func_ov000_02078b40() == 2) { + mUnk_7b = true; + mUnk_7b = (mUnk_7b & gItemManager->func_ov00_020ad790(1)) != 0; + } else { + if (((data_027e05f8.mUnk_0 & 0x300) != 0) && mUnk_7e != 0 && func_ov00_020aeef8()) { + mUnk_7b = true; + } else { + if (((data_027e05f8.mUnk_0 & 0x300) == 0) && mUnk_83) { + mUnk_7b = false; + } else { + if (data_027e103c->mUnk_20 == 2 && !mTouch && func_ov00_020aeef8()) { + mUnk_7b = !mUnk_7b; + mUnk_7c = 0; + } + } + } + mUnk_7b = (mUnk_7b & gItemManager->func_ov00_020ad790(1)) != 0; + + if (equippedItem == ItemFlag_Hammer && !usingEquipItem && mUnk_7b == true) { + ActorNaviBase *courageFairy = gItemManager->GetFairy(FairyId_Courage); + if (courageFairy != NULL) { + q20 x = courageFairy->mPos.x; + q20 y = gPlayerPos.y + FLOAT_TO_Q20(0.5); + q20 z = courageFairy->mPos.z; + mAimWorld.x = x; + mAimWorld.y = y; + mAimWorld.z = z; + } + } + } + if (mUnk_7a) { + mUsingEquipItem = mUnk_7b; + } +} + +void PlayerControl::UpdateUsingEquipItem() { + if ((data_027e05f8.mUnk_0 & 0x300) != 0 && this->func_ov00_020aeef8()) { + mUsingEquipItem = true; + return; + } + mUsingEquipItem = false; +} + +struct UnkStruct_ov015_0213ce4c { + /* 00 */ unk8 mUnk_00[0x3d]; + /* 3d */ bool mUnk_3d; + /* 3e */ unk8 mUnk_3e[0x1]; + /* 3f */ bool mUnk_3f; + /* 40 */ bool mUnk_40; + /* 41 */ + + static UnkStruct_ov015_0213ce4c *GetInstance(); + + bool GetUnk3f(); + bool GetUnk40(); +}; + +bool PlayerControl::func_ov00_020af2d4(u32 param1, bool param2) { + if (data_027e0d38->func_ov000_02078b40() == 2 && param2) { + if (UnkStruct_ov015_0213ce4c::GetInstance()->mUnk_3d) { + return false; + } + if (UnkStruct_ov015_0213ce4c::GetInstance()->GetUnk3f() || UnkStruct_ov015_0213ce4c::GetInstance()->GetUnk40()) { + return false; + } + } + + if (mUnk_7c) { + bool unk1 = true; + bool unk2 = false; + if ((param1 & 0x2) != 0 && (data_02056be4[data_027e077c.GetUnk0()] & 0x1) != 0) { + unk2 = true; + } + if (!unk2 && ((param1 & 0x1) == 0 || !this->func_ov00_020aeef8() || !data_027e103c->mUnk_24)) { + unk1 = false; + } + return unk1; + } else { + return (param1 & 0x4) != 0; + } +} + +ARM bool PlayerControl::CheckTouchedNow(u32 param1) { + bool result = false; + if (this->func_ov00_020af2d4(param1, true)) { + result = (mFlags & TouchFlag_TouchedNow) != 0; + } + return result; +} + +ARM bool PlayerControl::CheckUntouchedNow(u32 param1) { + bool result = false; + if (this->func_ov00_020af2d4(param1, true)) { + result = (mFlags & TouchFlag_UntouchedNow) != 0; + } + return result; +} + +ARM bool PlayerControl::CheckTouching(u32 param1) { + return this->func_ov00_020af2d4(param1, true) && mTouch; +} + +ARM bool PlayerControl::CheckTouchFast(u32 param1) { + if (this->func_ov00_020af2d4(param1, true)) { + if (mTouchSpeed > FLOAT_TO_Q20(0.5) && mTouchFastTime > 0) { + if (mTouchFastTime <= mTouchDuration) { + if (mTouchDuration < mTouchFastTime + 15) { + return true; + } + } + } + } + return false; +} + +ARM bool PlayerControl::func_ov00_020af4a4() { + if (!data_027e0d38->mUnk_28->mUnk_34 && data_027e0e2c.mUnk_04 == -1 && !data_027e103c->func_ov005_02103f4c()) { + if (this->func_ov00_020aeeac()) { + return true; + } + switch (data_027e077c.GetUnk0()) { + case 0x1a: + case 0x1b: + case 0x1c: return true; + default: return false; + } + } + return false; +} + +ARM void PlayerControl::func_ov00_020af538(bool param1, u8 param2) { + mUnk_7c = param1; + mUnk_7e = param2; + mUnk_7d = param1; + + bool unk = !mUnk_78 || gAdventureFlags->func_ov00_02097738() || data_027e0c68.mUnk_04; + if (unk || !this->func_ov00_020af4a4()) { + mUnk_7c = false; + } + if (unk || !this->func_ov00_020aeef8()) { + mUnk_7d = false; + } + + this->func_ov000_020b7924(mUnk_7c); + if (mUnk_7c) { + if (mTouchDuration == 0) { + if (this->GetFollowActor() != NULL || mFollowing) { + data_027e0ffc.func_ov000_020cebcc(0x10a, gPlayerAngle, 0); + this->StopFollowing(); + } + + Vec3p vec; + s32 unk = gMapManager->func_ov00_02085108(&vec); + mUnk_82 = unk == 0x3 || unk == 0x7; + } + } + + bool usingEquipBefore = mUsingEquipItem; + this->func_ov00_020af06c(); + if (usingEquipBefore && !mUsingEquipItem) { + data_027e103c->func_ov000_020cf20c(); + } + + for (s32 i = 0; i < 2; ++i) { + if (mTouchGesture[i] != NULL) { + mTouchGesture[i]->Update(this); + } + } + + mUnk_7f = false; + mUnk_83 = data_027e05f8.mUnk_0 & 0x300; +} + +ARM void PlayerControl::func_ov00_020af6e4(Vec3p *param1, s32 param3, s32 param4) { + if (param4 == 4) { + return; + } + if (param3 > 0) { + q20 distance = Vec3p_Distance(&gPlayerPos, param1); + if (distance >= param3) { + return; + } + mFollowRef.Reset(); + } + + Vec2b unk; + MapManager::func_ov00_02083a1c(&unk, gMapManager, param1); + mUnk_9c = unk; + mFollowing = true; + mUnk_80 = false; + mFollowStuckTimer = 15; +} + +ARM bool PlayerControl::func_ov00_020af778() { + if (!mUnk_78 || gAdventureFlags->func_ov00_02097738() || gAdventureFlags->func_ov00_02097750()) { + mCutsceneEndTimer = 15; + return false; + } + if (mCutsceneEndTimer > 0) { + mCutsceneEndTimer -= 1; + return false; + } + if (!this->func_ov00_020aeef8()) { + mNextFollowRef.Reset(); + return false; + } + + bool bVar1 = false; + EquipItem *equipItem = NULL; + if ((mFlags & TouchFlag_UntouchedNow) != 0 && mTouchDuration < 21) { + s32 dx = mTouchLastX - mTouchFastX; + s32 dy = mTouchLastY - mTouchFastY; + if (dx * dx + dy * dy < 100) { + if (this->func_ov00_020af2d4(7, true)) { + bVar1 = true; + if (mUsingEquipItem) { + ItemFlag equipId = gPlayer->GetEquipId(); + if (equipId != ItemFlag_None) { + equipItem = gItemManager->GetEquipItem(equipId); + } + } + } + } + } + + bool isGrabbing = gPlayerLink != NULL && gActorManager->GetActor(&gPlayerLink->mGrabActor) != NULL; + q20 followDistance = 0; + if (bVar1) { + Actor *nextFollowActor = gActorManager->GetActor(&mNextFollowRef); + unk32 uVar4 = 0; + if (nextFollowActor != NULL) { + uVar4 = nextFollowActor->mUnk_12c; + if (this->func_ov00_020afe88(uVar4, isGrabbing) && (equipItem == NULL || equipItem->vfunc_44(uVar4))) { + mFollowRef = mNextFollowRef; + mNextFollowRef.Reset(); + mUnk_80 = false; + mFollowStuckTimer = 15; + followDistance = nextFollowActor->XzDistanceToLink(); + } + } + + Vec3p vec; + s32 iVar4 = gMapManager->func_ov00_02085108(&vec); + vec.y = gPlayerPos.y; + if (equipItem == NULL) { + if (iVar4 != 0 && this->func_ov00_020afeec(iVar4, isGrabbing)) { + this->func_ov00_020af6e4(&vec, followDistance, uVar4); + return true; + } + } else { + if (equipItem->vfunc_48(iVar4)) { + this->func_ov00_020af6e4(&vec, followDistance, uVar4); + return true; + } + if (followDistance == 0 && equipItem->vfunc_40()) { + this->ApplyTouchWorld(&vec, 0); + this->func_ov00_020af6e4(&vec, followDistance, uVar4); + return true; + } + } + } else { + ActorRef ref; + ActorManager::func_ov00_020c3484(&ref, gActorManager, 0); + mNextFollowRef = ref; + if (mTouchDuration == 0) { + mLastFollowRef = mNextFollowRef; + } + } + return followDistance > 0; +} + +ARM bool PlayerControl::func_ov00_020afad8(Vec3p *param1) { + if (param1->y >= gPlayerPos.y) { + return false; + } + if (mUsingEquipItem) { + if (gPlayer->GetEquipId() == ItemFlag_Shovel) { + Vec3p vec; + return gMapManager->func_ov00_02085594(&vec); + } + return false; + } + return false; +} + +ARM void PlayerControl::func_ov00_020afb6c() { + bool iVar1 = this->func_ov00_020af778(); + Actor *followActor = gActorManager->GetActor(&mFollowRef); + ItemManager *itemMgr = gItemManager; + FairyId fairyId = itemMgr->GetEquippedFairy(); + ActorNaviBase *fairy = itemMgr->GetFairy(fairyId); + + if (followActor == NULL && !mFollowing && fairy != NULL) { + fairy->func_ov000_020bad18(); + } + + q20 followDist = mFollowDist; + if (followActor != NULL) { + followDist = Vec3p_Distance(&gPlayerPos, &followActor->mPos); + Cylinder followHitbox; + followActor->GetHitbox(&followHitbox); + followHitbox.pos.y += FLOAT_TO_Q20(0.4); + + s32 iVar8 = 0; + u32 uVar9 = 3; + switch (followActor->mUnk_12c) { + case 0: mFollowRef.Reset(); break; + case 1: iVar8 = 1; break; + case 5: + iVar8 = 2; + uVar9 = 1; + followHitbox.pos.y += followActor->mYOffset; + break; + case 2: + iVar8 = 3; + followHitbox.pos.y += followHitbox.size; + uVar9 = 0; + break; + default: + iVar8 = 2; + followHitbox.pos.y += followHitbox.size; + uVar9 = 2; + break; + } + if (iVar8 != 0 && gPlayerLink->GetCurrentCharacter() == PlayerCharacter_Link) { + this->func_ov00_020aff90(&followHitbox.pos, iVar8); + if (iVar1) { + data_027e0ffc.func_ov000_020ced64(&followHitbox, followActor->mRef.id, uVar9); + } + } + } else { + mFollowRef.Reset(); + } + + if (mFollowing) { + mFollowObject = (void *) gMapManager->MapData_vfunc_78(&mUnk_9c); + Vec3p local_3c; + s32 iVar2; + s32 iVar7; + if (mFollowObject != NULL) { + local_3c = *(Vec3p *) ((u32) mFollowObject + 0x18); + void *piVar4 = (*(void *(**) (void *) )((*(u32 *) mFollowObject) + 0x54))(mFollowObject); + if (piVar4 == NULL) { + iVar7 = 0; + } else { + iVar7 = (*(s32(**)(void *))((*(u32 *) piVar4) + 0x44))(piVar4); + } + local_3c.y += iVar7; + if (*(s8 *) ((u32) mFollowObject + 0x12) == 1) { + iVar2 = 1; + iVar7 = 3; + } else { + iVar2 = 2; + iVar7 = 2; + } + } else { + local_3c.y = gPlayerPos.y; + Vec2b local_44 = mUnk_9c; + gMapManager->func_ov00_02083c7c(&local_3c, local_44); + iVar2 = 2; + iVar7 = 3; + } + + if (iVar2 != 0 && gPlayerLink->GetCurrentCharacter() == PlayerCharacter_Link) { + this->func_ov00_020aff90(&local_3c, iVar2); + if (iVar1) { + data_027e0ffc.func_ov000_020ced7c(&local_3c, mUnk_9c.x, mUnk_9c.y, iVar7); + } + } + followDist = Vec3p_Distance(&gPlayerPos, &local_3c); + } else { + mFollowObject = NULL; + } + + if (mFollowStuckTimer > 0 && mFollowDist - followDist <= FLOAT_TO_Q20(0.01)) { + mFollowStuckTimer -= 1; + if (mFollowStuckTimer <= 0) { + this->StopFollowing(); + } + } + + mFollowDist = followDist; +} + +ARM bool PlayerControl::func_ov00_020afe88(s32 param1, bool param2) { + if (!mUnk_7d || !gPlayerControlData->vfunc_74(param1)) { + return false; + } + if (!param2) { + return true; + } + return param1 == 2 || param1 == 6; +} + +ARM bool PlayerControl::func_ov00_020afeec(unk32 param1, bool param2) { + if (!mUnk_7d) { + return false; + } + if (!gPlayerControlData->vfunc_78(param1)) { + return false; + } + switch (param1) { + case 1: + case 2: + case 7: + case 13: return true; + + case 10: + case 11: return param2; + + default: return !param2; + } +} + +ARM void PlayerControl::func_ov00_020aff90(Vec3p *param1, unk32 param2) { + if (data_027e0d38->func_ov000_02078b40() == 2) { + return; + } + ItemManager *itemMgr = gItemManager; + FairyId fairyId = itemMgr->GetEquippedFairy(); + ActorNaviBase *fairy = itemMgr->GetFairy(fairyId); + if (fairy == NULL) { + return; + } + fairy->func_ov000_020baca8(param1, param2); +} + +ARM void PlayerControl::func_ov00_020affec(Vec3p *param1, s32 y, s32 param3, Vec3p *param4) { + if (mUnk_44.x != 0 || mUnk_44.z != 0) { + Vec3p local_24; + Vec3p_Axpy(y, &mUnk_44, &mTouchWorld, &local_24); + + Vec3p local_30 = {param4->x - local_24.x, 0, param4->z - local_24.z}; + q20 iVar2 = Vec3p_Length(&local_30); + if (iVar2 <= param3) { + *param1 = local_24; + return; + } + + Vec3p local_3c = {mUnk_44.x, 0, mUnk_44.z}; + q20 lengthInv = CoReciprocal(Vec3p_Length(&local_3c)); + local_3c.x = MUL_Q20(local_3c.x, lengthInv); + local_3c.z = MUL_Q20(local_3c.z, lengthInv); + iVar2 = Vec3p_Dot(&local_30, &local_3c); + + Vec3p local_48 = local_3c; + local_48.y = lengthInv; + Vec3p_Axpy(iVar2 - param3, &local_48, &local_24, param1); + return; + } + + param1->x = mTouchWorld.x; + param1->y = y; + param1->z = mTouchWorld.z; +} + +#pragma section sbss begin +static u32 data_ov000_020ee198; +static u32 data_ov000_020ee19c; +#pragma section sbss end + +ARM void PlayerControl::func_ov00_020b014c(Vec3p *param1) { + if ((data_ov000_020ee198 & 1) == 0) { + data_ov000_020ee198 |= 1; + } + if (*(s32 *) ((s32) data_027e0f64->mUnk_4 + 0x15c) == 0x16) { + return; + } + if (!this->func_ov00_020aeef8()) { + return; + } + if (mTouchDuration > 0) { + ItemManager *itemMgr = gItemManager; + FairyId fairyId = itemMgr->GetEquippedFairy(); + ActorNaviBase *fairy = itemMgr->GetFairy(fairyId); + if (fairy != NULL) { + Vec3p auStack_1c; + this->func_ov00_020affec(&auStack_1c, FLOAT_TO_Q20(0.5), FLOAT_TO_Q20(8.0), param1); + fairy->func_ov000_020ba204(&auStack_1c, &mUnk_44, mTouchWorld.y + FLOAT_TO_Q20(4.2)); + } + } +} + +ARM void PlayerControl::ResetAim() { + mAim = gVec3p_ZERO; +} + +extern "C" s32 func_ov000_020a5e9c(unk32 *param1); + +ARM bool PlayerControl::UpdateAimWorld(Vec3p *param1) { + Vec3p pos = gPlayerPos; + + s32 iVar2 = func_ov000_020a5e9c(&data_027e0d38->mUnk_0c); + if (iVar2 == 0x2f && *(s32 *) (*(s32 *) ((s32) data_027e0f64 + 0x4) + 0x15c) == 0x31) { + return this->func_ov024_02178348(param1); + } + + if (this->CheckTouching(1)) { + this->func_ov00_020affec(param1, 0, FLOAT_TO_Q20(8.0), &pos); + mAimWorld = *param1; + return true; + } + *param1 = mAimWorld; + return false; +} + +ARM s16 PlayerControl::GetTouchAngle() { + if (mTouchDuration >= 0) { + return mTouchAngle; + } + if (!mUnk_7f) { + return 0; + } + return mUnk_ac; +} + +static q20 data_ov000_020e6144 = FLOAT_TO_Q20(80.0); + +ARM u32 PlayerControl::func_ov00_020b034c() { + if ((mTouchDuration >= 0) && (this->func_ov00_020af2d4(1, 1) != 0)) { + u64 temp_r0_r1 = func_01ff992c(data_ov000_020e6144); // 0x03333333 + s32 temp_r3 = (temp_r0_r1 * mTouchDist + 0x80000000) >> 32; + s32 temp_r1_r0 = MUL_Q20(temp_r3, temp_r3); + if (mTouchDuration < 4) { + s32 temp_r2_2 = (4 - mTouchDuration) << 0xc; + temp_r1_r0 -= (s32) (temp_r2_2 + ((u32) (temp_r2_2 >> 1) >> 0x1e)) >> 2; + } + if (temp_r1_r0 < 0) { + return 0; + } + if (temp_r1_r0 > FLOAT_TO_Q20(1.0)) { + temp_r1_r0 = FLOAT_TO_Q20(1.0); + } + return temp_r1_r0; + } + if ((mUnk_7f != 0) && (data_027e05f8.mUnk_0 & 0xf0)) { + return FLOAT_TO_Q20(1.0); + } + return 0; +} + +extern unk32 data_ov000_020eec60; +extern "C" unk32 func_ov000_020d6be4(unk32 *param1); + +ARM s32 PlayerControl::func_ov00_020b0418() { + unk32 unk = func_ov000_020d6be4(&data_ov000_020eec60); + if (unk < 10) { + return 0; + } + if (unk < 25) { + return (unk * FLOAT_TO_Q20(0.6666)) / 25; + } + if (unk < 150) { + return (unk - 25) * FLOAT_TO_Q20(0.3334) / 125 + FLOAT_TO_Q20(0.6666); + } + return FLOAT_TO_Q20(1.0); +} + +extern "C" void func_0202d95c(Vec3p *param1, q20 param2); +// NONMATCH: Register allocation, instruction ordering +ARM bool PlayerControl::func_ov00_020b049c(Vec3p *param1, bool param2) { + if (this->CheckUntouchedNow(1) && mTouchDuration >= 0 && mTouchDuration < 21) { + this->ApplyTouchWorld(param1, FLOAT_TO_Q20(0.25)); + Vec3p_Sub(param1, &gPlayerPos, param1); + q20 length = Vec3p_Length(param1); + if (length >= FLOAT_TO_Q20(1.25)) { + return true; + } + if (param2) { + if (length < FLOAT_TO_Q20(0.25)) { + *param1 = gVec3p_ZERO; + param1->x += MUL_Q20(SIN(gPlayerAngle), FLOAT_TO_Q20(1.25)); + param1->z += MUL_Q20(COS(gPlayerAngle), FLOAT_TO_Q20(1.25)); + } else { + func_0202d95c(param1, FLOAT_TO_Q20(1.25)); + } + return true; + } + } + return false; +} + +ARM bool PlayerControl::func_ov00_020b05e8(Vec3p *param1) { + if (this->CheckUntouchedNow(1) && mTouchDuration >= 0 && mTouchDuration < 21) { + Vec3p *playerPos = &gPlayerPos; + + Vec3p VStack_1c; + this->ApplyTouchWorld(&VStack_1c, FLOAT_TO_Q20(0.2)); + VStack_1c.y = gPlayerPos.y; + + q20 distance = Vec3p_Distance(&VStack_1c, playerPos); + if (distance > FLOAT_TO_Q20(1.25)) { + return false; + } + + if (distance < FLOAT_TO_Q20(0.25)) { + VStack_1c = *playerPos; + VStack_1c.x += MUL_Q20(SIN(gPlayerAngle), FLOAT_TO_Q20(0.25)); + VStack_1c.z += MUL_Q20(COS(gPlayerAngle), FLOAT_TO_Q20(0.25)); + } + + Vec2b VStack_20; + MapManager::func_ov00_02083a1c(&VStack_20, gMapManager, &VStack_1c); + VStack_1c.x += (gMapManager->func_ov00_02083c24(VStack_20.x) - VStack_1c.x) / 2; + VStack_1c.z += (gMapManager->func_ov00_02083c50(VStack_20.y) - VStack_1c.z) / 2; + Vec3p_Sub(&VStack_1c, playerPos, param1); + return true; + } + return false; +} + +extern "C" bool func_01ffe468(unk32 param1, Vec3p *param2, s32 *param3, s32 *param4, bool param5); + +ARM bool PlayerControl::func_ov00_020b0778(Vec3p *param1, u32 angle, unk32 *param3) { + Vec3p spC; + *param3 = 0; + spC = *param1; + + s32 sp8; + s32 sp4; + bool var_r0 = !func_01ffe468(data_027e0f64->func_ov000_0208b180(), &spC, &sp8, &sp4, 0); + if (var_r0) { + return 0; + } + + // NONMATCH: Register allocation + q20 temp_r2 = SIN((u16) angle) * 0x30; + q20 temp_r3 = COS((u16) angle) * 0x30; + s32 temp_r4; + s32 temp_r5; + q20 var_r6; + q20 var_r7; + var_r6 = (s32) (temp_r2 + ((u32) (temp_r2 >> 11) >> 20)) >> 0xC; + var_r7 = (s32) (temp_r3 + ((u32) (temp_r3 >> 11) >> 20)) >> 0xC; + temp_r4 = mTouchX - sp8; + temp_r5 = mTouchY - sp4; + if (this->CheckTouchedNow(1) != 0) { + if (((var_r6 - 0x18) <= temp_r4) && (temp_r4 <= (var_r6 + 0x18)) && ((var_r7 - 0x18) <= temp_r5) && + (temp_r5 <= (var_r7 + 0x18))) + { + *param3 = FLOAT_TO_Q20(1.0); + return true; + } + if (((-0x18 - var_r6) <= temp_r4) && (temp_r4 <= (0x18 - var_r6)) && ((-0x18 - var_r7) <= temp_r5) && + (temp_r5 <= (0x18 - var_r7))) + { + *param3 = -FLOAT_TO_Q20(1.0); + return true; + } + s32 temp_r1_2 = 0 - var_r6; + s32 var_r0_2 = var_r6 < temp_r1_2 ? var_r6 : temp_r1_2; + if (temp_r4 >= (var_r0_2 - 0x18)) { + if (var_r6 <= temp_r1_2) { + var_r6 = temp_r1_2; + } + if ((var_r6 + 0x18) >= temp_r4) { + s32 temp_r1_3 = 0 - var_r7; + s32 var_r0_3 = var_r7 < temp_r1_3 ? var_r7 : temp_r1_3; + if (temp_r5 >= (var_r0_3 - 0x18)) { + if (var_r7 <= temp_r1_3) { + var_r7 = temp_r1_3; + } + if ((var_r7 + 0x18) >= temp_r5) { + goto ret_true; + } + } + } + } + return false; + } + if (this->CheckTouching(1) != 0) { + if (((var_r6 < 0) && (temp_r4 < (var_r6 + 0x18))) || ((var_r6 > 0) && (temp_r4 > (var_r6 - 0x18))) || + ((var_r7 < 0) && (temp_r5 < (var_r7 + 0x18))) || ((var_r7 > 0) && (temp_r5 > (var_r7 - 0x18)))) + { + *param3 = FLOAT_TO_Q20(1.0); + return true; + } + if (((var_r6 > 0) && (temp_r4 < (0x18 - var_r6))) || ((var_r6 < 0) && (temp_r4 > (-0x18 - var_r6))) || + ((var_r7 > 0) && (temp_r5 < (0x18 - var_r7))) || ((var_r7 < 0) && (temp_r5 > (-0x18 - var_r7)))) + { + *param3 = -FLOAT_TO_Q20(1.0); + return true; + } + } else if (this->CheckUntouchedNow(1) != 0) { + if (var_r6 < 0) { + var_r6 = -var_r6; + } + if (var_r7 < 0) { + var_r7 = -var_r7; + } + s32 var_r2 = mTouchPrevX - sp8; + s32 var_r1 = mTouchPrevY - sp4; + // NONMATCH: Instruction ordering + if (var_r6 > 0x18) { + if (var_r2 < 0) { + var_r2 = -var_r2; + } + if (var_r2 > (var_r6 - 0x18)) { + goto ret_false; + } + } + if (var_r7 > 0x18) { + if (var_r1 < 0) { + var_r1 = -var_r1; + } + if (var_r1 > (var_r7 - 0x18)) { + ret_false: + return false; + } + } + } +ret_true: + return true; +} + +ARM bool PlayerControl::CheckNotTouching() { + return !this->CheckTouching(1); +} + +ARM bool PlayerControl::func_ov00_020b0ad0(Actor *actor) { + if (actor != NULL && actor->mRef.id == mLastFollowRef.id) { + return mTouchDuration >= 15 && mTouchDuration < 30; + } + return false; +} + +ARM bool PlayerControl::func_ov00_020b0b0c(s16 *pAngle, ItemFlag *pEquipId, unk32 *pCardinal, bool *pFast) { + if (mUsingEquipItem && gItemManager->func_ov00_020ad790(1)) { + ItemFlag equipId = gItemManager->GetEquippedItem(); + *pEquipId = equipId; + data_027e103c->func_ov000_020cf330(); + return *pEquipId != ItemFlag_None; + } + + *pEquipId = ItemFlag_OshusSword; + if (this->func_ov00_020b1248(pCardinal)) { + *pEquipId = ItemFlag_OshusSword; + return true; + } + + if ((this->CheckUntouchedNow(1) && mTouchDuration >= 0 && mTouchDuration < 21) || + (this->CheckTouchFast(1) && mTouchSlowDuration > 21)) + { + s32 dy = INT_TO_Q20(mTouchLastY - mTouchFastY); + s32 dx = INT_TO_Q20(mTouchLastX - mTouchFastX); + Vec3p local_20; + local_20.x = dx; + local_20.y = 0; + local_20.z = dy; + q20 length = Vec3p_Length(&local_20); + if (length < FLOAT_TO_Q20(10.0)) { + return false; + } + if (mUnk_82 && length < FLOAT_TO_Q20(20.0)) { + return false; + } + + *pEquipId = ItemFlag_OshusSword; + *pAngle = mTouchAngle + ((s16) (mTouchFastAngle - mTouchAngle)) / 2; + + if (mTouchSpeed > FLOAT_TO_Q20(0.5)) { + q4 touchMoveAngle = Atan2(mTouchSpeedX, mTouchSpeedY) - *pAngle; + if (pFast != NULL) { + *pFast = true; + } + *pCardinal = touchMoveAngle >= 0 ? 1 : 2; + return true; + } + + s32 unkAngle = Atan2(local_20.x, local_20.z); + + s32 unkAngle2 = (s16) ((s16) unkAngle - *pAngle); + Vec3p VStack_2c = {INT_TO_Q20(mTouchFastX), INT_TO_Q20(mTouchFastY), 0}; + Vec3p VStack_38 = {INT_TO_Q20(mTouchLastX), INT_TO_Q20(mTouchLastY), 0}; + + Vec3p_Sub(&VStack_38, &VStack_2c, &VStack_38); + if (mTouchDist <= FLOAT_TO_Q20(10.0)) { + *pCardinal = 0; + *pAngle = mTouchFastAngle; + return true; + } + if (unkAngle2 >= 0x6000 || unkAngle2 <= -0x6000) { + *pCardinal = 0; + } else if (unkAngle2 >= 0x2000) { + *pCardinal = 1; + } else if (unkAngle2 < -0x2000) { + *pCardinal = 2; + } else { + *pCardinal = 3; + } + return true; + } + return false; +} + +// NONMATCH: Instruction ordering +ARM bool PlayerControl::func_ov00_020b0de8(Vec3p *param1) { + if (!this->CheckTouching(1)) { + return false; + } + s32 z = (mTouchLastY - 96) * FLOAT_TO_Q20(10.625) / 192; + s32 x = (mTouchLastX - 128) * (FLOAT_TO_Q20(10.625) / 256); + param1->x = x; + param1->y = 0; + param1->z = z; + return true; +} + +ARM bool PlayerControl::func_ov00_020b0e54(Vec3p *param1, Vec3p *param2) { + Vec3p local_20; + if (mTouchDuration >= 16 && this->func_ov00_020b0de8(&local_20)) { + this->ApplyTouchWorld(param1, FLOAT_TO_Q20(0.5)); + q20 length = Vec3p_Length(&local_20); + if (length > FLOAT_TO_Q20(4.0)) { + local_20.x = DIV_Q20(local_20.x * 4, length); + local_20.z = DIV_Q20(local_20.z * 4, length); + } + mAim = local_20; + *param2 = local_20; + return true; + } + + if (mTouchDuration >= 0 && this->func_ov00_020af2d4(1, true)) { + if (mTouchDist > FLOAT_TO_Q20(24.0)) { + this->ApplyTouchWorld(param1, FLOAT_TO_Q20(0.5)); + } else { + *param1 = gPlayerPos; + } + return true; + } + + return false; +} + +extern "C" bool func_0202b2e8(Vec3p *param1, Vec3p *param2, q20 param3); +ARM bool PlayerControl::func_ov00_020b0f88(Vec3p *param1, unk32 scale, Vec3p *param3) { + Vec3p local_20; + if (this->func_ov00_020b0de8(&local_20)) { + this->ApplyTouchWorld(param1, scale); + q20 length = Vec3p_Length(&local_20); + if (length > FLOAT_TO_Q20(4.0)) { + local_20.x = DIV_Q20(local_20.x * 4, length); + local_20.z = DIV_Q20(local_20.z * 4, length); + } + q20 touchSpeed = CoSqrt((mTouchDiffX * mTouchDiffX + mTouchDiffY * mTouchDiffY + 4) * 0x10); + func_0202b2e8(param3, &local_20, touchSpeed); + mAim = local_20; + return true; + } + return false; +} + +ARM bool PlayerControl::func_ov00_020b1058(Vec3p *param1, unk32 param2, Vec3p *param3, Vec3p *param4) { + Vec3p local_24; + if (this->func_ov00_020b0de8(&local_24)) { + this->ApplyTouchWorld(param1, param2); + if (param4 != NULL) { + Vec3p local_30; + Vec3p_Sub(param4, &gPlayerPos, &local_30); + local_30.x = MUL_Q20(local_30.x, FLOAT_TO_Q20(0.5)); + local_30.y = MUL_Q20(local_30.y, FLOAT_TO_Q20(0.5)); + local_30.z = MUL_Q20(local_30.z, FLOAT_TO_Q20(0.5)); + func_0202b2e8(&local_30, &local_24, FLOAT_TO_Q20(2.5)); + local_24 = local_30; + } + q20 length = Vec3p_Length(&local_24); + if (length > FLOAT_TO_Q20(4.0)) { + local_24.x = DIV_Q20(local_24.x * 4, length); + local_24.z = DIV_Q20(local_24.z * 4, length); + } + q20 touchSpeed = CoSqrt((mTouchDiffX * mTouchDiffX + mTouchDiffY * mTouchDiffY + 4) * 0x10); + func_0202b2e8(param3, &local_24, touchSpeed); + mAim = *param3; + return true; + } + return false; +} + +ARM bool PlayerControl::IsUntouchedNow() { + return this->CheckUntouchedNow(7) && data_027e103c->mUnk_1c == 0; +} + +ARM bool PlayerControl::IsNotUntouchedNow() { + if (!this->CheckUntouchedNow(7)) { + return (data_027e05f8.mUnk_2 & 3) != 0; + } + return true; +} + +ARM bool PlayerControl::func_ov00_020b1248(unk32 *param1) { + if (*this->mTouchGesture != NULL && (*this->mTouchGesture)->mUnk_4) { + *param1 = (*this->mTouchGesture)->mUnk_08 == 0 ? 5 : 6; + (*this->mTouchGesture)->ResetTouchHistory(); + return true; + } + return false; +} + +ARM bool PlayerControl::func_ov00_020b129c() { + return mTouchDuration < 2 || mTouchDuration > 10 || mTouchDuration != mTimeSinceTouch; +} + +ARM bool PlayerControl::func_ov00_020b12d0(s16 *pAngle) { + if (!this->func_ov00_020af2d4(1, true)) { + return false; + } + if (mTouchSlowDuration <= 15 && this->func_ov000_020b7d6c() && mTouchEdge == mTouchLastEdge) { + *pAngle = mTouchAngle; + return true; + } + return false; +} + +ARM bool PlayerControl::IsNotTouching() { + return !mTouch; +} + +extern u32 data_ov000_020eec9c[]; +extern "C" void func_ov000_020d77e4(u32 *param1, u32 param2); +ARM bool PlayerControl::IsTouchingFast() { + if (this->CheckTouchFast(1)) { + func_ov000_020d77e4(data_ov000_020eec9c, 0x17); + return true; + } + return false; +} + +ARM bool PlayerControl::IsTappedNow() { + return mTouchDuration < 10 && this->func_ov00_020af2d4(1, true) && this->CheckUntouchedNow(1); +} + +ARM bool PlayerControl::func_ov00_020b13c4() { + if (!this->CheckTouching(1)) { + return false; + } + func_01ff992c(data_ov000_020e6144); + q20 touchDist = mTouchDist; + s32 iVar2 = mTouchDuration; + if (mTouchFastTime > 0 && mTouchFastTime < iVar2) { + iVar2 = (iVar2 - mTouchFastTime) << 16 >> 16; + } + if (touchDist >= FLOAT_TO_Q20(80.0)) { + return iVar2 >= 2; + } + if (mTouchDist < FLOAT_TO_Q20(16.0)) { + return false; + } + q20 uVar4 = CoReciprocal(FLOAT_TO_Q20(64.0)); + q20 unk1 = MUL_Q20(mTouchDist - FLOAT_TO_Q20(16.0), uVar4); + return iVar2 >= MUL_Q20(FLOAT_TO_Q20(1.0) - unk1, FLOAT_TO_Q20(0.0058)) + 2; +} diff --git a/src/00_Core/Player/PlayerControlData.cpp b/src/00_Core/Player/PlayerControlData.cpp index 50e6c853..1485048a 100644 --- a/src/00_Core/Player/PlayerControlData.cpp +++ b/src/00_Core/Player/PlayerControlData.cpp @@ -18,8 +18,8 @@ void PlayerControlData::vfunc_2c() {} void PlayerControlData::vfunc_30() {} void PlayerControlData::vfunc_34() {} unk32 PlayerControlData::vfunc_7c() {} -unk32 PlayerControlData::vfunc_74() {} -unk32 PlayerControlData::vfunc_78() {} +unk32 PlayerControlData::vfunc_74(s32 param1) {} +unk32 PlayerControlData::vfunc_78(s32 param1) {} void PlayerControlData::func_ov000_020b484c(s32 param1, s32 param2, s32 param3) {} void PlayerControlData::vfunc_6c(s32 param1, Vec3p *param2) {} void PlayerControlData::vfunc_5c() {} diff --git a/src/05/Player/LinkStateMove.cpp b/src/05/Player/LinkStateMove.cpp index 815d9060..0ca48089 100644 --- a/src/05/Player/LinkStateMove.cpp +++ b/src/05/Player/LinkStateMove.cpp @@ -200,6 +200,7 @@ ARM void LinkStateMove::vfunc_1c() { } } ActorRef sp4; + sp4.Reset(); this->PlayerLinkBase_vfunc_58(0, &sp4); return; } @@ -207,7 +208,7 @@ ARM void LinkStateMove::vfunc_1c() { } ARM bool LinkStateMove::vfunc_3c() { - if ((gPlayerControl->GetFollowActor() == NULL) && (gPlayerControl->mFollowActor == NULL) && + if ((gPlayerControl->GetFollowActor() == NULL) && (gPlayerControl->mFollowObject == NULL) && (this->Get_PlayerControlData_Unk120() != 2) && (this->Get_PlayerControlData_Unk120() != 3)) { return true; diff --git a/src/Main/Debug/DebugHierarchyBase.cpp b/src/Main/Debug/DebugHierarchyBase.cpp index e6bf24c1..cdcb1fb7 100644 --- a/src/Main/Debug/DebugHierarchyBase.cpp +++ b/src/Main/Debug/DebugHierarchyBase.cpp @@ -11,7 +11,7 @@ void DebugHierarchyBase::vfunc_10() {} void DebugHierarchyBase::vfunc_14() {} void DebugHierarchyBase::vfunc_18() {} void DebugHierarchyBase::vfunc_1c() {} -void DebugHierarchyBase::vfunc_20() {} +void DebugHierarchyBase::vfunc_20(unk32 param1, const char *param2, unk32 param3, unk32 param4, unk32 param5, unk32 param6) {} void DebugHierarchyBase::vfunc_24() {} void DebugHierarchyBase::vfunc_28() {} void DebugHierarchyBase::vfunc_2c() {} diff --git a/tools/m2ctx.py b/tools/m2ctx.py index 64186fa6..9684424f 100755 --- a/tools/m2ctx.py +++ b/tools/m2ctx.py @@ -36,7 +36,7 @@ INCLUDE_REGEX = r'^\s*#\s*include\s*([<"][\S ]+[>"])\s*$' # Finds all line comments and multiline comments COMMENT_REGEX = r'\/\/.*$|\/\*(?:.|\r|\n)+?\*\/' -with open(args.file, 'r', encoding="utf8") as f: +with open(args.file, 'r', encoding=args.encoding) as f: contents = f.read() contents = re.sub(COMMENT_REGEX, '', contents, count=0, flags=re.MULTILINE) includes = re.findall(INCLUDE_REGEX, contents, flags=re.MULTILINE) |