diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index d4f2622a..e0bce424 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -2746,14 +2746,14 @@ _ZN9EquipItem19func_ov000_020be9e4Eiiis kind:function(arm,size=0x14c) addr:0x20b _ZN9EquipItem7GetAmmoEv kind:function(arm,size=0x2c) addr:0x20beb30 _ZN9EquipItem8GiveAmmoEj kind:function(arm,size=0x34) addr:0x20beb5c _ZNK9EquipItem9GetHitboxEP8Cylinder kind:function(arm,size=0x18) addr:0x20beb90 -func_ov000_020beba8 kind:function(arm,size=0x18) addr:0x20beba8 -func_ov000_020bebc0 kind:function(arm,size=0x18) addr:0x20bebc0 -func_ov000_020bebd8 kind:function(arm,size=0x84) addr:0x20bebd8 -func_ov000_020bec5c kind:function(arm,size=0x84) addr:0x20bec5c -func_ov000_020bece0 kind:function(arm,size=0x9c) addr:0x20bece0 -func_ov000_020bed7c kind:function(arm,size=0x50) addr:0x20bed7c -func_ov000_020bedcc kind:function(arm,size=0x98) addr:0x20bedcc -func_ov000_020bee64 kind:function(arm,size=0x14) addr:0x20bee64 +_ZN24UnkStruct_ov000_020beba8C1Ei kind:function(arm,size=0x18) addr:0x20beba8 +_ZN24UnkStruct_ov000_020beba88vfunc_04EPs kind:function(arm,size=0x18) addr:0x20bebc0 +_ZN24UnkStruct_ov000_020beba88vfunc_08EPs kind:function(arm,size=0x84) addr:0x20bebd8 +_ZN24UnkStruct_ov000_020beba88vfunc_0cEPi kind:function(arm,size=0x84) addr:0x20bec5c +_ZN24UnkStruct_ov000_020beba88vfunc_14EPi kind:function(arm,size=0x9c) addr:0x20bece0 +_ZN24UnkStruct_ov000_020beba88vfunc_10EPt kind:function(arm,size=0x50) addr:0x20bed7c +_ZN24UnkStruct_ov000_020beba8D1Ev kind:function(arm,size=0x98) addr:0x20bedcc +_ZN24UnkStruct_ov000_020beba8D0Ev kind:function(arm,size=0x14) addr:0x20bee64 func_ov000_020bee78 kind:function(arm,size=0x1c) addr:0x20bee78 func_ov000_020bee94 kind:function(arm,size=0x3c) addr:0x20bee94 func_ov000_020beed0 kind:function(arm,size=0x40) addr:0x20beed0 diff --git a/config/eur/arm9/overlays/ov005/symbols.txt b/config/eur/arm9/overlays/ov005/symbols.txt index 347df020..2689f39f 100644 --- a/config/eur/arm9/overlays/ov005/symbols.txt +++ b/config/eur/arm9/overlays/ov005/symbols.txt @@ -134,7 +134,7 @@ _Z15GetEquipBombchuv kind:function(arm,size=0x10) addr:0x21057b4 _ZN13LinkStateItem8vfunc_24Ei kind:function(arm,size=0x8c) addr:0x21057c4 _ZN13LinkStateItem19func_ov005_02105850Ev kind:function(arm,size=0x3d8) addr:0x2105850 _ZN13LinkStateItem19func_ov005_02105c28Ev kind:function(arm,size=0x15c) addr:0x2105c28 -_Z14GetEquipShieldv kind:function(arm,size=0x10) addr:0x2105d84 +_Z14GetEquipShieldv kind:function(arm,size=0x10) addr:0x2105d84 local _ZN13LinkStateItem19func_ov005_02105d94Ev kind:function(arm,size=0x18) addr:0x2105d94 _ZN13LinkStateItem19func_ov005_02105dacEv kind:function(arm,size=0x888) addr:0x2105dac _Z16GetLinkStateRollv kind:function(arm,size=0x10) addr:0x2106634 @@ -223,7 +223,7 @@ _ZN17LinkStateInteract8vfunc_2cEPt kind:function(arm,size=0x138) addr:0x210b3bc _ZN17LinkStateInteract19func_ov005_0210b4f4EP5Vec3pP5Actor kind:function(arm,size=0x6c) addr:0x210b4f4 func_ov005_0210b560 kind:function(arm,size=0x1c) addr:0x210b560 _ZN15LinkStateFollow12OnStateEnterEv kind:function(arm,size=0x3f0) addr:0x210b57c -_Z12GetEquipRopev kind:function(arm,size=0x10) addr:0x210b96c +_ZN15LinkStateFollow12GetEquipRopeEv kind:function(arm,size=0x10) addr:0x210b96c _ZN15LinkStateFollow8vfunc_1cEv kind:function(arm,size=0x48) addr:0x210b97c _ZN15LinkStateFollow19func_ov005_0210b9c4Ev kind:function(arm,size=0xd4) addr:0x210b9c4 _ZN15LinkStateFollow19func_ov005_0210ba98Ev kind:function(arm,size=0x24) addr:0x210ba98 diff --git a/config/eur/arm9/overlays/ov014/symbols.txt b/config/eur/arm9/overlays/ov014/symbols.txt index 7acd5b06..8046d9f2 100644 --- a/config/eur/arm9/overlays/ov014/symbols.txt +++ b/config/eur/arm9/overlays/ov014/symbols.txt @@ -9,66 +9,66 @@ 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 -func_ov014_0211fd50 kind:function(arm,size=0x30) addr:0x211fd50 -func_ov014_0211fd80 kind:function(arm,size=0x10) addr:0x211fd80 -func_ov014_0211fd90 kind:function(arm,size=0x14) addr:0x211fd90 -func_ov014_0211fda4 kind:function(arm,size=0x108) addr:0x211fda4 -func_ov014_0211feac kind:function(arm,size=0x28) addr:0x211feac -func_ov014_0211fed4 kind:function(arm,size=0x30) addr:0x211fed4 -func_ov014_0211ff04 kind:function(arm,size=0x148) addr:0x211ff04 -func_ov014_0212004c kind:function(arm,size=0x88) addr:0x212004c -func_ov014_021200d4 kind:function(arm,size=0x44) addr:0x21200d4 -func_ov014_02120118 kind:function(arm,size=0x68) addr:0x2120118 -func_ov014_02120180 kind:function(arm,size=0x170) addr:0x2120180 -func_ov014_021202f0 kind:function(arm,size=0x10) addr:0x21202f0 -func_ov014_02120300 kind:function(arm,size=0x474) addr:0x2120300 -func_ov014_02120774 kind:function(arm,size=0xc) addr:0x2120774 -func_ov014_02120780 kind:function(arm,size=0x20) addr:0x2120780 -func_ov014_021207a0 kind:function(arm,size=0x18) addr:0x21207a0 -func_ov014_021207b8 kind:function(arm,size=0x1e0) addr:0x21207b8 -func_ov014_02120998 kind:function(arm,size=0xe8) addr:0x2120998 -func_ov014_02120a80 kind:function(arm,size=0x44) addr:0x2120a80 -func_ov014_02120ac4 kind:function(arm,size=0x1d4) addr:0x2120ac4 -func_ov014_02120c98 kind:function(arm,size=0xc0) addr:0x2120c98 -func_ov014_02120d58 kind:function(arm,size=0x50) addr:0x2120d58 -func_ov014_02120da8 kind:function(arm,size=0x44) addr:0x2120da8 -func_ov014_02120dec kind:function(arm,size=0x68) addr:0x2120dec -func_ov014_02120e54 kind:function(arm,size=0x80) addr:0x2120e54 -func_ov014_02120ed4 kind:function(arm,size=0x10) addr:0x2120ed4 -func_ov014_02120ee4 kind:function(arm,size=0x4e4) addr:0x2120ee4 +_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 +_ZN10ActorArrowC2Ev kind:function(arm,size=0x108) addr:0x211fda4 +_ZN10ActorArrowD1Ev kind:function(arm,size=0x28) addr:0x211feac +_ZN10ActorArrowD0Ev kind:function(arm,size=0x30) addr:0x211fed4 +_ZN10ActorArrow8vfunc_08Ev kind:function(arm,size=0x148) addr:0x211ff04 +_ZN10ActorArrow12CollidesWithEP5Actor kind:function(arm,size=0x88) addr:0x212004c +_ZN10ActorArrow19func_ov014_021200d4Ev kind:function(arm,size=0x44) addr:0x21200d4 +_ZN10ActorArrow19func_ov014_02120118Ev kind:function(arm,size=0x68) addr:0x2120118 +_ZN10ActorArrow19func_ov014_02120180Ev kind:function(arm,size=0x170) addr:0x2120180 +_ZN10ActorArrow12GetEquipRopeEv kind:function(arm,size=0x10) addr:0x21202f0 +_ZN10ActorArrow8vfunc_14Ej kind:function(arm,size=0x474) addr:0x2120300 +_Z19func_ov014_02120774Pji kind:function(arm,size=0xc) addr:0x2120774 +_ZN10ActorArrow8vfunc_18Ej kind:function(arm,size=0x20) addr:0x2120780 +_ZN10ActorArrow8vfunc_10Ej kind:function(arm,size=0x18) addr:0x21207a0 +_ZN10ActorArrow19func_ov014_021207b8EP8ActorRefii kind:function(arm,size=0x1e0) addr:0x21207b8 +_ZN10ActorArrow19func_ov014_02120998EP8ActorRefiiis kind:function(arm,size=0xe8) addr:0x2120998 +_Z19func_ov014_02120a80iP10ActorArrow kind:function(arm,size=0x44) addr:0x2120a80 +_ZN10ActorArrow19func_ov014_02120ac4Eib kind:function(arm,size=0x1d4) addr:0x2120ac4 +_ZN10ActorArrow19func_ov014_02120c98EP5Vec3p kind:function(arm,size=0xc0) addr:0x2120c98 +_ZN10ActorArrow19func_ov014_02120d58Ev kind:function(arm,size=0x50) addr:0x2120d58 +_ZN10ActorArrow19func_ov014_02120da8Ev kind:function(arm,size=0x44) addr:0x2120da8 +_ZN10ActorArrow19func_ov014_02120decEi kind:function(arm,size=0x68) addr:0x2120dec +_ZN10ActorArrow8vfunc_48EP9Knockback kind:function(arm,size=0x80) addr:0x2120e54 +_Z14GetEquipShieldv kind:function(arm,size=0x10) addr:0x2120ed4 local +_ZN10ActorArrow8vfunc_20Eb kind:function(arm,size=0x4e4) addr:0x2120ee4 func_ov014_021213c8 kind:function(arm,size=0x14) addr:0x21213c8 -func_ov014_021213dc kind:function(arm,size=0x30) addr:0x21213dc -func_ov014_0212140c kind:function(arm,size=0xa4) addr:0x212140c -func_ov014_021214b0 kind:function(arm,size=0x8c) addr:0x21214b0 -func_ov014_0212153c kind:function(arm,size=0x14) addr:0x212153c -func_ov014_02121550 kind:function(arm,size=0x1c) addr:0x2121550 -func_ov014_0212156c kind:function(arm,size=0x260) addr:0x212156c -func_ov014_021217cc kind:function(arm,size=0x218) addr:0x21217cc -func_ov014_021219e4 kind:function(arm,size=0x14) addr:0x21219e4 -func_ov014_021219f8 kind:function(arm,size=0x90) addr:0x21219f8 -func_ov014_02121a88 kind:function(arm,size=0x1c) addr:0x2121a88 -func_ov014_02121aa4 kind:function(arm,size=0x30) addr:0x2121aa4 -func_ov014_02121ad4 kind:function(arm,size=0x9c) addr:0x2121ad4 -func_ov014_02121b70 kind:function(arm,size=0x74) addr:0x2121b70 -func_ov014_02121be4 kind:function(arm,size=0xf4) addr:0x2121be4 -func_ov014_02121cd8 kind:function(arm,size=0x1c) addr:0x2121cd8 -func_ov014_02121cf4 kind:function(arm,size=0x38) addr:0x2121cf4 -func_ov014_02121d2c kind:function(arm,size=0x40) addr:0x2121d2c -func_ov014_02121d6c kind:function(arm,size=0x14) addr:0x2121d6c -func_ov014_02121d80 kind:function(arm,size=0x134) addr:0x2121d80 -func_ov014_02121eb4 kind:function(arm,size=0xc58) addr:0x2121eb4 -func_ov014_02122b0c kind:function(arm,size=0x14) addr:0x2122b0c -func_ov014_02122b20 kind:function(arm,size=0x98) addr:0x2122b20 -func_ov014_02122bb8 kind:function(arm,size=0xe4) addr:0x2122bb8 -func_ov014_02122c9c kind:function(arm,size=0x18) addr:0x2122c9c -func_ov014_02122cb4 kind:function(arm,size=0xb8) addr:0x2122cb4 -func_ov014_02122d6c kind:function(arm,size=0xdc) addr:0x2122d6c -func_ov014_02122e48 kind:function(arm,size=0x34) addr:0x2122e48 -func_ov014_02122e7c kind:function(arm,size=0x1c) addr:0x2122e7c -func_ov014_02122e98 kind:function(arm,size=0x20) addr:0x2122e98 -func_ov014_02122eb8 kind:function(arm,size=0x1c) addr:0x2122eb8 -func_ov014_02122ed4 kind:function(arm,size=0x188) addr:0x2122ed4 -func_ov014_0212305c kind:function(arm,size=0x1c) addr:0x212305c +_ZN10ActorBlast6CreateEv kind:function(arm,size=0x30) addr:0x21213dc +_ZN15ActorBlast_Unk18vfunc_0cEPi kind:function(arm,size=0xa4) addr:0x212140c +_ZN10ActorBlastC2Ev kind:function(arm,size=0x8c) addr:0x21214b0 +_ZN10ActorBlastD1Ev kind:function(arm,size=0x14) addr:0x212153c +_ZN10ActorBlastD0Ev kind:function(arm,size=0x1c) addr:0x2121550 +_ZN10ActorBlast8vfunc_08Ev kind:function(arm,size=0x260) addr:0x212156c +_ZN10ActorBlast8vfunc_14Ej kind:function(arm,size=0x218) addr:0x21217cc +_ZN15ActorBlast_Unk1D1Ev kind:function(arm,size=0x14) addr:0x21219e4 +_ZN10ActorBlast8vfunc_18Ej kind:function(arm,size=0x90) addr:0x21219f8 +_ZN15ActorBlast_Unk1D0Ev kind:function(arm,size=0x1c) addr:0x2121a88 +_ZN9ActorBomb6CreateEv kind:function(arm,size=0x30) addr:0x2121aa4 +_ZN14ActorBomb_Unk18vfunc_08EPs kind:function(arm,size=0x9c) addr:0x2121ad4 +_ZN14ActorBomb_Unk18vfunc_0cEPi kind:function(arm,size=0x74) addr:0x2121b70 +_ZN9ActorBombC2Ev kind:function(arm,size=0xf4) addr:0x2121be4 +_ZN14ActorBomb_Unk2D1Ev kind:function(arm,size=0x1c) addr:0x2121cd8 +_ZN9ActorBombD1Ev kind:function(arm,size=0x38) addr:0x2121cf4 +_ZN9ActorBombD0Ev kind:function(arm,size=0x40) addr:0x2121d2c +_ZN14ActorBomb_Unk2C1Ev kind:function(arm,size=0x14) addr:0x2121d6c +_ZN9ActorBomb8vfunc_08Ev kind:function(arm,size=0x134) addr:0x2121d80 +_ZN9ActorBomb8vfunc_14Ej kind:function(arm,size=0xc58) addr:0x2121eb4 +_ZN14ActorBomb_Unk1D1Ev kind:function(arm,size=0x14) addr:0x2122b0c +_ZN9ActorBomb8vfunc_18Ej kind:function(arm,size=0x98) addr:0x2122b20 +_ZN9ActorBomb19func_ov014_02122bb8Ei kind:function(arm,size=0xe4) addr:0x2122bb8 +_ZN9ActorBomb8vfunc_54Ev kind:function(arm,size=0x18) addr:0x2122c9c +_ZN9ActorBomb8vfunc_20Eb kind:function(arm,size=0xb8) addr:0x2122cb4 +_ZN9ActorBomb11SetVelocityEP5Vec3p kind:function(arm,size=0xdc) addr:0x2122d6c +_ZN9ActorBomb19func_ov014_02122e48EPi kind:function(arm,size=0x34) addr:0x2122e48 +_ZN9ActorBomb19func_ov014_02122e7cEv kind:function(arm,size=0x1c) addr:0x2122e7c +_ZN9ActorBomb19func_ov014_02122e98Ev kind:function(arm,size=0x20) addr:0x2122e98 +_ZN9ActorBomb19func_ov014_02122eb8Ev kind:function(arm,size=0x1c) addr:0x2122eb8 +_ZN9ActorBomb19func_ov014_02122ed4Ev kind:function(arm,size=0x188) addr:0x2122ed4 +_ZN14ActorBomb_Unk1D0Ev kind:function(arm,size=0x1c) addr:0x212305c func_ov014_02123078 kind:function(arm,size=0x30) addr:0x2123078 func_ov014_021230a8 kind:function(arm,size=0x8c) addr:0x21230a8 func_ov014_02123134 kind:function(arm,size=0x28) addr:0x2123134 @@ -848,111 +848,111 @@ 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 func_ov014_0213cf2c kind:function(arm,size=0x5c) addr:0x213cf2c -func_ov014_0213cf88 kind:function(thumb,size=0x14) addr:0x213cf88 -func_ov014_0213cf9c kind:function(thumb,size=0xc) addr:0x213cf9c -func_ov014_0213cfa8 kind:function(thumb,size=0x14) addr:0x213cfa8 -func_ov014_0213cfbc kind:function(arm,size=0x8) addr:0x213cfbc -func_ov014_0213cfc4 kind:function(thumb,size=0x4c) addr:0x213cfc4 -func_ov014_0213d010 kind:function(thumb,size=0x2c) addr:0x213d010 -func_ov014_0213d03c kind:function(thumb,size=0x30) addr:0x213d03c -func_ov014_0213d06c kind:function(arm,size=0xc) addr:0x213d06c -func_ov014_0213d078 kind:function(thumb,size=0x20) addr:0x213d078 -func_ov014_0213d098 kind:function(arm,size=0x24) addr:0x213d098 -func_ov014_0213d0bc kind:function(arm,size=0xa0) addr:0x213d0bc +_ZN10EquipScoopC2Ev kind:function(thumb,size=0x14) addr:0x213cf88 +_ZN10EquipScoopD1Ev kind:function(thumb,size=0xc) addr:0x213cf9c +_ZN10EquipScoopD0Ev kind:function(thumb,size=0x14) addr:0x213cfa8 +_ZNK10EquipScoop5GetIdEv kind:function(arm,size=0x8) addr:0x213cfbc +_ZN14EquipBoomerangC2Ev kind:function(thumb,size=0x4c) addr:0x213cfc4 +_ZN14EquipBoomerangD1Ev kind:function(thumb,size=0x2c) addr:0x213d010 +_ZN14EquipBoomerangD0Ev kind:function(thumb,size=0x30) addr:0x213d03c +_ZN14EquipBoomerang11UpdateInUseEi kind:function(arm,size=0xc) addr:0x213d06c +_ZN14EquipBoomerang8vfunc_10Ev kind:function(thumb,size=0x20) addr:0x213d078 +_ZN14EquipBoomerang19func_ov014_0213d098Ev kind:function(arm,size=0x24) addr:0x213d098 +_ZN14EquipBoomerang19func_ov014_0213d0bcEP5Vec3p kind:function(arm,size=0xa0) addr:0x213d0bc _ZN14EquipBoomerang8GetActorEv kind:function(arm,size=0x20) addr:0x213d15c -func_ov014_0213d17c kind:function(arm,size=0x8) addr:0x213d17c -func_ov014_0213d184 kind:function(arm,size=0x2c) addr:0x213d184 -func_ov014_0213d1b0 kind:function(arm,size=0x14) addr:0x213d1b0 -func_ov014_0213d1c4 kind:function(thumb,size=0x2c) addr:0x213d1c4 -func_ov014_0213d1f0 kind:function(arm,size=0x8) addr:0x213d1f0 -func_ov014_0213d1f8 kind:function(arm,size=0x1c) addr:0x213d1f8 -func_ov014_0213d214 kind:function(arm,size=0x14) addr:0x213d214 -func_ov014_0213d228 kind:function(arm,size=0x8) addr:0x213d228 -func_ov014_0213d230 kind:function(arm,size=0x18) addr:0x213d230 -func_ov014_0213d248 kind:function(arm,size=0x14) addr:0x213d248 -func_ov014_0213d25c kind:function(thumb,size=0x8c) addr:0x213d25c -func_ov014_0213d2e8 kind:function(thumb,size=0x4) addr:0x213d2e8 -func_ov014_0213d2ec kind:function(arm,size=0x28) addr:0x213d2ec -func_ov014_0213d314 kind:function(thumb,size=0x44) addr:0x213d314 -func_ov014_0213d358 kind:function(thumb,size=0x48) addr:0x213d358 -func_ov014_0213d3a0 kind:function(thumb,size=0x2c) addr:0x213d3a0 -func_ov014_0213d3cc kind:function(arm,size=0x8) addr:0x213d3cc -func_ov014_0213d3d4 kind:function(arm,size=0x30) addr:0x213d3d4 -func_ov014_0213d404 kind:function(arm,size=0x1c) addr:0x213d404 +_ZNK14EquipBoomerang5GetIdEv kind:function(arm,size=0x8) addr:0x213d17c +_ZN14EquipBoomerang19func_ov014_0213d184Ev kind:function(arm,size=0x2c) addr:0x213d184 +_ZN14EquipBoomerang19func_ov014_0213d1b0Ev kind:function(arm,size=0x14) addr:0x213d1b0 +_ZN9EquipBombC2Ev kind:function(thumb,size=0x2c) addr:0x213d1c4 +_ZNK9EquipBomb5GetIdEv kind:function(arm,size=0x8) addr:0x213d1f0 +_ZN9EquipBombD1Ev kind:function(arm,size=0x1c) addr:0x213d1f8 +_ZN9EquipBombD0Ev kind:function(arm,size=0x14) addr:0x213d214 +_ZN9EquipBomb8vfunc_50Ev kind:function(arm,size=0x8) addr:0x213d228 +_Z19func_ov014_0213d230ii kind:function(arm,size=0x18) addr:0x213d230 +_Z19func_ov013_0213d248i kind:function(arm,size=0x14) addr:0x213d248 +_ZN9EquipRopeC2Ev kind:function(thumb,size=0x8c) addr:0x213d25c +_Z19func_ov014_0213d2e8v kind:function(thumb,size=0x4) addr:0x213d2e8 +_Z19func_ov014_0213d2eci kind:function(arm,size=0x28) addr:0x213d2ec +_ZN9EquipRopeD1Ev kind:function(thumb,size=0x44) addr:0x213d314 +_ZN9EquipRopeD0Ev kind:function(thumb,size=0x48) addr:0x213d358 +_ZN9EquipRope8vfunc_10Ev kind:function(thumb,size=0x2c) addr:0x213d3a0 +_ZNK9EquipRope5GetIdEv kind:function(arm,size=0x8) addr:0x213d3cc +_ZN9EquipRope19func_ov014_0213d3d4EP5Vec3p kind:function(arm,size=0x30) addr:0x213d3d4 +_ZN9EquipRope19func_ov014_0213d404EPi kind:function(arm,size=0x1c) addr:0x213d404 _ZN9EquipRope18func_ov14_0213d420Ev kind:function(arm,size=0x20) addr:0x213d420 _ZN9EquipRope18func_ov14_0213d440Ei kind:function(arm,size=0x40) addr:0x213d440 _ZN9EquipRope18func_ov14_0213d480Ei kind:function(arm,size=0x48) addr:0x213d480 -func_ov014_0213d4c8 kind:function(arm,size=0x24) addr:0x213d4c8 -func_ov014_0213d4ec kind:function(arm,size=0xa8) addr:0x213d4ec -func_ov014_0213d594 kind:function(arm,size=0x3c) addr:0x213d594 -func_ov014_0213d5d0 kind:function(arm,size=0x6c) addr:0x213d5d0 -func_ov014_0213d63c kind:function(arm,size=0x48) addr:0x213d63c -func_ov014_0213d684 kind:function(arm,size=0x5c) addr:0x213d684 -func_ov014_0213d6e0 kind:function(arm,size=0x3c) addr:0x213d6e0 -func_ov014_0213d71c kind:function(arm,size=0x6c) addr:0x213d71c -func_ov014_0213d788 kind:function(arm,size=0x94) addr:0x213d788 +_ZN9EquipRope19func_ov014_0213d4c8Ev kind:function(arm,size=0x24) addr:0x213d4c8 +_ZN9EquipRope19func_ov014_0213d4ecEPii kind:function(arm,size=0xa8) addr:0x213d4ec +_ZN9EquipRope19func_ov014_0213d594Ei kind:function(arm,size=0x3c) addr:0x213d594 +_ZN9EquipRope19func_ov014_0213d5d0EPii kind:function(arm,size=0x6c) addr:0x213d5d0 +_ZN9EquipRope19func_ov014_0213d63cEi kind:function(arm,size=0x48) addr:0x213d63c +_ZN9EquipRope19func_ov014_0213d684Ev kind:function(arm,size=0x5c) addr:0x213d684 +_ZN9EquipRope19func_ov014_0213d6e0Ev kind:function(arm,size=0x3c) addr:0x213d6e0 +_ZN9EquipRope19func_ov014_0213d71cEiP8ActorRef kind:function(arm,size=0x6c) addr:0x213d71c +_ZN9EquipRope19func_ov014_0213d788Ei kind:function(arm,size=0x94) addr:0x213d788 _ZN9EquipRope18func_ov14_0213d81cEiP5Vec3p kind:function(arm,size=0x100) addr:0x213d81c _ZN9EquipRope18func_ov14_0213d91cEi kind:function(arm,size=0x90) addr:0x213d91c -func_ov014_0213d9ac kind:function(arm,size=0x130) addr:0x213d9ac +_ZN9EquipRope19func_ov014_0213d9acEv kind:function(arm,size=0x130) addr:0x213d9ac _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder kind:function(arm,size=0x58) addr:0x213dadc -func_ov014_0213db34 kind:function(thumb,size=0x2c) addr:0x213db34 -func_ov014_0213db60 kind:function(arm,size=0x44) addr:0x213db60 -func_ov014_0213dba4 kind:function(arm,size=0x1fc) addr:0x213dba4 -func_ov014_0213dda0 kind:function(arm,size=0x34) addr:0x213dda0 +_ZN9EquipRope19func_ov014_0213db34Ev kind:function(thumb,size=0x2c) addr:0x213db34 +_ZN9EquipRope19func_ov014_0213db60Ev kind:function(arm,size=0x44) addr:0x213db60 +_ZN9EquipRope19func_ov014_0213dba4EP5Vec3p kind:function(arm,size=0x1fc) addr:0x213dba4 +_ZN9EquipRope19func_ov014_0213dda0Ev kind:function(arm,size=0x34) addr:0x213dda0 _ZN9EquipRope18func_ov14_0213ddd4EP5Actor kind:function(arm,size=0x128) addr:0x213ddd4 _ZN9EquipRope18func_ov14_0213defcEP5Actor kind:function(arm,size=0xc0) addr:0x213defc -func_ov014_0213dfbc kind:function(arm,size=0x188) addr:0x213dfbc -func_ov014_0213e144 kind:function(arm,size=0xc8) addr:0x213e144 -func_ov014_0213e20c kind:function(arm,size=0x11c) addr:0x213e20c -func_ov014_0213e328 kind:function(arm,size=0x21c) addr:0x213e328 -func_ov014_0213e544 kind:function(arm,size=0x18) addr:0x213e544 -func_ov014_0213e55c kind:function(arm,size=0x55c) addr:0x213e55c -func_ov014_0213eab8 kind:function(thumb,size=0x1c) addr:0x213eab8 -func_ov014_0213ead4 kind:function(thumb,size=0xc) addr:0x213ead4 -func_ov014_0213eae0 kind:function(thumb,size=0x14) addr:0x213eae0 -func_ov014_0213eaf4 kind:function(arm,size=0x8) addr:0x213eaf4 -func_ov014_0213eafc kind:function(thumb,size=0x50) addr:0x213eafc -func_ov014_0213eb4c kind:function(arm,size=0x10) addr:0x213eb4c -func_ov014_0213eb5c kind:function(thumb,size=0x20) addr:0x213eb5c -func_ov014_0213eb7c kind:function(thumb,size=0x28) addr:0x213eb7c -func_ov014_0213eba4 kind:function(arm,size=0x9c) addr:0x213eba4 -func_ov014_0213ec40 kind:function(arm,size=0x24) addr:0x213ec40 -_Z19func_ov014_0213ec64i kind:function(arm,size=0x48) addr:0x213ec64 -func_ov014_0213ecac kind:function(arm,size=0x8) addr:0x213ecac -func_ov014_0213ecb4 kind:function(arm,size=0xc0) addr:0x213ecb4 -func_ov014_0213ed74 kind:function(arm,size=0x20) addr:0x213ed74 -func_ov014_0213ed94 kind:function(arm,size=0xc) addr:0x213ed94 -func_ov014_0213eda0 kind:function(thumb,size=0x20) addr:0x213eda0 -func_ov014_0213edc0 kind:function(thumb,size=0x24) addr:0x213edc0 -func_ov014_0213ede4 kind:function(thumb,size=0xc) addr:0x213ede4 -func_ov014_0213edf0 kind:function(thumb,size=0x14) addr:0x213edf0 -func_ov014_0213ee04 kind:function(thumb,size=0x4) addr:0x213ee04 -func_ov014_0213ee08 kind:function(arm,size=0x8) addr:0x213ee08 -func_ov014_0213ee10 kind:function(arm,size=0x98) addr:0x213ee10 -func_ov014_0213eea8 kind:function(arm,size=0xc) addr:0x213eea8 -func_ov014_0213eeb4 kind:function(thumb,size=0x2c) addr:0x213eeb4 -func_ov014_0213eee0 kind:function(arm,size=0x10) addr:0x213eee0 -func_ov014_0213eef0 kind:function(arm,size=0x30) addr:0x213eef0 -func_ov014_0213ef20 kind:function(thumb,size=0xc) addr:0x213ef20 -func_ov014_0213ef2c kind:function(thumb,size=0x34) addr:0x213ef2c -func_ov014_0213ef60 kind:function(thumb,size=0x34) addr:0x213ef60 -func_ov014_0213ef94 kind:function(thumb,size=0x3c) addr:0x213ef94 -func_ov014_0213efd0 kind:function(thumb,size=0x80) addr:0x213efd0 -func_ov014_0213f050 kind:function(arm,size=0x3c) addr:0x213f050 -func_ov014_0213f08c kind:function(arm,size=0x2c) addr:0x213f08c -func_ov014_0213f0b8 kind:function(arm,size=0x4c) addr:0x213f0b8 -func_ov014_0213f104 kind:function(arm,size=0x230) addr:0x213f104 -func_ov014_0213f334 kind:function(arm,size=0x48) addr:0x213f334 -func_ov014_0213f37c kind:function(arm,size=0xf0) addr:0x213f37c -func_ov014_0213f46c kind:function(thumb,size=0x60) addr:0x213f46c -func_ov014_0213f4cc kind:function(thumb,size=0xdc) addr:0x213f4cc -func_ov014_0213f5a8 kind:function(arm,size=0x34) addr:0x213f5a8 -func_ov014_0213f5dc kind:function(arm,size=0x24) addr:0x213f5dc -func_ov014_0213f600 kind:function(arm,size=0x124) addr:0x213f600 -func_ov014_0213f724 kind:function(arm,size=0x10) addr:0x213f724 -func_ov014_0213f734 kind:function(arm,size=0xc) addr:0x213f734 -func_ov014_0213f740 kind:function(arm,size=0x23c) addr:0x213f740 -func_ov014_0213f97c kind:function(arm,size=0xb0) addr:0x213f97c +_ZN9EquipRope19func_ov014_0213dfbcEP8CylinderiP5Vec3p kind:function(arm,size=0x188) addr:0x213dfbc +_ZN9EquipRope19func_ov014_0213e144EP5Vec3pS1_i kind:function(arm,size=0xc8) addr:0x213e144 +_ZN9EquipRope19func_ov014_0213e20cEiP5Vec3p kind:function(arm,size=0x11c) addr:0x213e20c +_ZN9EquipRope19func_ov014_0213e328Ev kind:function(arm,size=0x21c) addr:0x213e328 +_Z19func_ov014_0213e544ii kind:function(arm,size=0x18) addr:0x213e544 +_Z19func_ov014_0213e55cPi kind:function(arm,size=0x55c) addr:0x213e55c +_ZN8EquipBowC2Ev kind:function(thumb,size=0x1c) addr:0x213eab8 +_ZN8EquipBowD1Ev kind:function(thumb,size=0xc) addr:0x213ead4 +_ZN8EquipBowD0Ev kind:function(thumb,size=0x14) addr:0x213eae0 +_ZNK8EquipBow5GetIdEv kind:function(arm,size=0x8) addr:0x213eaf4 +_ZN12EquipBombchuC2Ev kind:function(thumb,size=0x50) addr:0x213eafc +_ZN17EquipBombchu_Unk1C1Ev kind:function(arm,size=0x10) addr:0x213eb4c +_ZN12EquipBombchuD1Ev kind:function(thumb,size=0x20) addr:0x213eb5c +_ZN12EquipBombchuD0Ev kind:function(thumb,size=0x28) addr:0x213eb7c +_ZN12EquipBombchu19func_ov014_0213eba4Ev kind:function(arm,size=0x9c) addr:0x213eba4 +_ZN12EquipBombchu19func_ov014_0213ec40Ev kind:function(arm,size=0x24) addr:0x213ec40 +_ZN12EquipBombchu19func_ov014_0213ec64Ev kind:function(arm,size=0x48) addr:0x213ec64 +_ZNK12EquipBombchu5GetIdEv kind:function(arm,size=0x8) addr:0x213ecac +_ZN12EquipBombchu8vfunc_34EPs kind:function(arm,size=0xc0) addr:0x213ecb4 +_ZN12EquipBombchu19func_ov014_0213ed74Ev kind:function(arm,size=0x20) addr:0x213ed74 +_ZN12EquipBombchu19func_ov014_0213ed94Ei kind:function(arm,size=0xc) addr:0x213ed94 +_ZN12EquipBombchu19func_ov014_0213eda0Ev kind:function(thumb,size=0x20) addr:0x213eda0 +_ZN11EquipHammerC2Ev kind:function(thumb,size=0x24) addr:0x213edc0 +_ZN11EquipHammerD1Ev kind:function(thumb,size=0xc) addr:0x213ede4 +_ZN11EquipHammerD0Ev kind:function(thumb,size=0x14) addr:0x213edf0 +_ZN11EquipHammer8vfunc_10Ev kind:function(thumb,size=0x4) addr:0x213ee04 +_ZNK11EquipHammer5GetIdEv kind:function(arm,size=0x8) addr:0x213ee08 +_ZNK11EquipHammer9GetHitboxEP8Cylinder kind:function(arm,size=0x98) addr:0x213ee10 +_ZNK11EquipHammer8vfunc_4cEv kind:function(arm,size=0xc) addr:0x213eea8 +_ZN10PlayerLink6CreateEv kind:function(thumb,size=0x2c) addr:0x213eeb4 +_ZN10PlayerLink11GetInstanceEv kind:function(arm,size=0x10) addr:0x213eee0 +_ZN10PlayerLink19func_ov014_0213eef0Ei kind:function(arm,size=0x30) addr:0x213eef0 +_ZN10PlayerLink20GetLinkStateCutsceneEv kind:function(thumb,size=0xc) addr:0x213ef20 +_ZN10PlayerLinkC2Ev kind:function(thumb,size=0x34) addr:0x213ef2c +_ZN10PlayerLinkD1Ev kind:function(thumb,size=0x34) addr:0x213ef60 +_ZN10PlayerLinkD0Ev kind:function(thumb,size=0x3c) addr:0x213ef94 +_ZN10PlayerLink4InitEv kind:function(thumb,size=0x80) addr:0x213efd0 +_ZN10PlayerLink8vfunc_04Ev kind:function(arm,size=0x3c) addr:0x213f050 +_ZN10PlayerLink8vfunc_78Ev kind:function(arm,size=0x2c) addr:0x213f08c +_ZN10PlayerLink11ResetUnk_5eEv kind:function(arm,size=0x4c) addr:0x213f0b8 +_ZN10PlayerLink8vfunc_2cEic kind:function(arm,size=0x230) addr:0x213f104 +_ZN10PlayerLink9UpdatePosEv kind:function(arm,size=0x48) addr:0x213f334 +_ZN10PlayerLink19func_ov014_0213f37cEv kind:function(arm,size=0xf0) addr:0x213f37c +_ZN10PlayerLink8vfunc_74Ev kind:function(thumb,size=0x60) addr:0x213f46c +_ZN10PlayerLink7OnDeathEb kind:function(thumb,size=0xdc) addr:0x213f4cc +_ZN10PlayerLink8vfunc_7cEv kind:function(arm,size=0x34) addr:0x213f5a8 +_ZN10PlayerLink9AddHealthEs kind:function(arm,size=0x24) addr:0x213f5dc +_ZN10PlayerLink8vfunc_68Ev kind:function(arm,size=0x124) addr:0x213f600 +_ZN10PlayerLink16GetLinkStateItemEv kind:function(arm,size=0x10) addr:0x213f724 +_ZN10PlayerLink19func_ov014_0213f734EPiP18UnkStruct_027e0fd4 kind:function(arm,size=0xc) addr:0x213f734 +_ZN10PlayerLink19func_ov014_0213f740Ev kind:function(arm,size=0x23c) addr:0x213f740 +_ZN10PlayerLink19func_ov014_0213f97cEv kind:function(arm,size=0xb0) addr:0x213f97c func_ov014_0213fa2c kind:function(arm,size=0xc) addr:0x213fa2c func_ov014_0213fa38 kind:function(arm,size=0x4) addr:0x213fa38 func_ov014_0213fa3c kind:function(arm,size=0xc) addr:0x213fa3c @@ -1456,19 +1456,19 @@ func_ov014_021513d4 kind:function(arm,size=0x28) addr:0x21513d4 func_ov014_021513fc kind:function(arm,size=0x20) addr:0x21513fc func_ov014_0215141c kind:function(arm,size=0x110) addr:0x215141c func_ov014_0215152c kind:function(arm,size=0x20) addr:0x215152c -func_ov014_0215154c kind:function(thumb,size=0x18) addr:0x215154c -func_ov014_02151564 kind:function(thumb,size=0xc) addr:0x2151564 -func_ov014_02151570 kind:function(thumb,size=0x14) addr:0x2151570 -func_ov014_02151584 kind:function(thumb,size=0xc) addr:0x2151584 -func_ov014_02151590 kind:function(thumb,size=0x18) addr:0x2151590 -func_ov014_021515a8 kind:function(thumb,size=0xc) addr:0x21515a8 -func_ov014_021515b4 kind:function(thumb,size=0x14) addr:0x21515b4 -func_ov014_021515c8 kind:function(arm,size=0x8) addr:0x21515c8 -func_ov014_021515d0 kind:function(thumb,size=0x18) addr:0x21515d0 -func_ov014_021515e8 kind:function(thumb,size=0xc) addr:0x21515e8 -func_ov014_021515f4 kind:function(thumb,size=0x14) addr:0x21515f4 -func_ov014_02151608 kind:function(arm,size=0x8) addr:0x2151608 -func_ov014_02151610 kind:function(arm,size=0x7c) addr:0x2151610 +_ZN11EquipPotionC2Ev kind:function(thumb,size=0x18) addr:0x215154c +_ZN11EquipPotionD1Ev kind:function(thumb,size=0xc) addr:0x2151564 +_ZN11EquipPotionD0Ev kind:function(thumb,size=0x14) addr:0x2151570 +_ZN11EquipPotionD2Ev kind:function(thumb,size=0xc) addr:0x2151584 +_ZN12EquipPotionAC2Ev kind:function(thumb,size=0x18) addr:0x2151590 +_ZN12EquipPotionAD1Ev kind:function(thumb,size=0xc) addr:0x21515a8 +_ZN12EquipPotionAD0Ev kind:function(thumb,size=0x14) addr:0x21515b4 +_ZNK12EquipPotionA5GetIdEv kind:function(arm,size=0x8) addr:0x21515c8 +_ZN12EquipPotionBC2Ev kind:function(thumb,size=0x18) addr:0x21515d0 +_ZN12EquipPotionBD1Ev kind:function(thumb,size=0xc) addr:0x21515e8 +_ZN12EquipPotionBD0Ev kind:function(thumb,size=0x14) addr:0x21515f4 +_ZNK12EquipPotionB5GetIdEv kind:function(arm,size=0x8) addr:0x2151608 +_ZNK11EquipPotion8IsUsableEi kind:function(arm,size=0x7c) addr:0x2151610 func_ov014_0215168c kind:function(arm,size=0x38) addr:0x215168c func_ov014_021516c4 kind:function(arm,size=0x60) addr:0x21516c4 func_ov014_02151724 kind:function(arm,size=0x20) addr:0x2151724 @@ -1632,9 +1632,9 @@ data_ov014_02154199 kind:data(any) addr:0x2154199 data_ov014_0215419c kind:data(any) addr:0x215419c data_ov014_021541d0 kind:data(any) addr:0x21541d0 data_ov014_021541d4 kind:data(any) addr:0x21541d4 -__sinit_ov014_021541ec kind:function(arm,size=0x68) addr:0x21541ec -__sinit_ov014_02154254 kind:function(arm,size=0x40) addr:0x2154254 -__sinit_ov014_02154294 kind:function(arm,size=0x60) addr:0x2154294 +__sinit_ActorArrow.cpp kind:function(arm,size=0x68) addr:0x21541ec +__sinit_ActorBlast.cpp kind:function(arm,size=0x40) addr:0x2154254 +__sinit_ActorBomb.cpp kind:function(arm,size=0x60) addr:0x2154294 __sinit_ov014_021542f4 kind:function(arm,size=0x40) addr:0x21542f4 __sinit_ov014_02154334 kind:function(arm,size=0x40) addr:0x2154334 __sinit_ov014_02154374 kind:function(arm,size=0x84) addr:0x2154374 @@ -1719,9 +1719,9 @@ data_ov014_021559b0 kind:data(any) addr:0x21559b0 data_ov014_021559b4 kind:data(any) addr:0x21559b4 data_ov014_021559b8 kind:data(any) addr:0x21559b8 data_ov014_021559bc kind:data(any) addr:0x21559bc -data_ov014_021559e8 kind:data(any) addr:0x21559e8 -data_ov014_02155aa4 kind:data(any) addr:0x2155aa4 -data_ov014_02155ac8 kind:data(any) addr:0x2155ac8 +_ZTV10ActorArrow kind:data(any) addr:0x21559e8 +_ZTV15ActorBlast_Unk1 kind:data(any) addr:0x2155aa4 +_ZTV10ActorBlast kind:data(any) addr:0x2155ac8 data_ov014_02155b7c kind:data(any) addr:0x2155b7c data_ov014_02155b80 kind:data(any) addr:0x2155b80 data_ov014_02155b84 kind:data(any) addr:0x2155b84 @@ -1731,8 +1731,8 @@ data_ov014_02155b90 kind:data(any) addr:0x2155b90 data_ov014_02155b94 kind:data(any) addr:0x2155b94 data_ov014_02155b98 kind:data(any) addr:0x2155b98 data_ov014_02155b9c kind:data(any) addr:0x2155b9c -data_ov014_02155bcc kind:data(any) addr:0x2155bcc -data_ov014_02155bf0 kind:data(any) addr:0x2155bf0 +_ZTV14ActorBomb_Unk1 kind:data(any) addr:0x2155bcc +_ZTV9ActorBomb kind:data(any) addr:0x2155bf0 data_ov014_02155cac kind:data(any) addr:0x2155cac data_ov014_02155cb4 kind:data(any) addr:0x2155cb4 data_ov014_02155cb8 kind:data(any) addr:0x2155cb8 @@ -1944,8 +1944,8 @@ data_ov014_02158db8 kind:data(any) addr:0x2158db8 data_ov014_02158dbc kind:data(any) addr:0x2158dbc data_ov014_02158dc0 kind:data(any) addr:0x2158dc0 data_ov014_02158dc4 kind:data(any) addr:0x2158dc4 -data_ov014_02158df0 kind:data(any) addr:0x2158df0 -data_ov014_02158e48 kind:data(any) addr:0x2158e48 +_ZTV14EquipBoomerang kind:data(any) addr:0x2158df0 +_ZTV9EquipBomb kind:data(any) addr:0x2158e48 data_ov014_02158e84 kind:data(any) addr:0x2158e84 ambiguous data_ov014_02158e9c kind:data(any) addr:0x2158e9c data_ov014_02158ea0 kind:data(any) addr:0x2158ea0 @@ -1955,10 +1955,10 @@ data_ov014_02158eac kind:data(any) addr:0x2158eac data_ov014_02158eb0 kind:data(any) addr:0x2158eb0 data_ov014_02158eb4 kind:data(any) addr:0x2158eb4 data_ov014_02158eb8 kind:data(any) addr:0x2158eb8 -data_ov014_02158ee4 kind:data(any) addr:0x2158ee4 -data_ov014_02158f3c kind:data(any) addr:0x2158f3c -data_ov014_02158f94 kind:data(any) addr:0x2158f94 -data_ov014_02158fec kind:data(any) addr:0x2158fec +_ZTV9EquipRope kind:data(any) addr:0x2158ee4 +_ZTV8EquipBow kind:data(any) addr:0x2158f3c +_ZTV17EquipBombchu kind:data(any) addr:0x2158f94 +_ZTV11EquipHammer kind:data(any) addr:0x2158fec data_ov014_0215903c kind:data(any) addr:0x215903c data_ov014_02159040 kind:data(any) addr:0x2159040 data_ov014_02159044 kind:data(any) addr:0x2159044 @@ -1967,7 +1967,7 @@ data_ov014_0215904c kind:data(any) addr:0x215904c data_ov014_02159050 kind:data(any) addr:0x2159050 data_ov014_02159054 kind:data(any) addr:0x2159054 data_ov014_02159058 kind:data(any) addr:0x2159058 -data_ov014_02159084 kind:data(any) addr:0x2159084 +_ZTV10PlayerLink kind:data(any) addr:0x2159084 data_ov014_021590a0 kind:data(any) addr:0x21590a0 ambiguous data_ov014_02159110 kind:data(any) addr:0x2159110 data_ov014_02159114 kind:data(any) addr:0x2159114 @@ -2065,9 +2065,9 @@ data_ov014_0215a790 kind:data(any) addr:0x215a790 data_ov014_0215a794 kind:data(any) addr:0x215a794 data_ov014_0215a798 kind:data(any) addr:0x215a798 data_ov014_0215a79c kind:data(any) addr:0x215a79c -data_ov014_0215a7c8 kind:data(any) addr:0x215a7c8 -data_ov014_0215a820 kind:data(any) addr:0x215a820 -data_ov014_0215a878 kind:data(any) addr:0x215a878 +_ZTV12EquipPotionB kind:data(any) addr:0x215a7c8 +_ZTV12EquipPotionA kind:data(any) addr:0x215a820 +_ZTV11EquipPotion kind:data(any) addr:0x215a878 data_ov014_0215a8d0 kind:data(any) addr:0x215a8d0 data_ov014_0215a95c kind:data(any) addr:0x215a95c data_ov014_0215a960 kind:data(any) addr:0x215a960 @@ -2109,13 +2109,13 @@ data_ov014_0215ab64 kind:data(any) addr:0x215ab64 data_ov014_0215ab8c kind:data(any) addr:0x215ab8c data_ov014_0215ab90 kind:data(any) addr:0x215ab90 data_ov014_0215abc0 kind:bss addr:0x215abc0 -data_ov014_0215abcc kind:bss addr:0x215abcc +_ZN10ActorArrow5gTypeE kind:bss addr:0x215abcc data_ov014_0215abe0 kind:bss addr:0x215abe0 data_ov014_0215abec kind:bss addr:0x215abec data_ov014_0215abfc kind:bss addr:0x215abfc -data_ov014_0215ac08 kind:bss addr:0x215ac08 +_ZN10ActorBlast5gTypeE kind:bss addr:0x215ac08 data_ov014_0215ac1c kind:bss addr:0x215ac1c -data_ov014_0215ac28 kind:bss addr:0x215ac28 +_ZN9ActorBomb5gTypeE kind:bss addr:0x215ac28 data_ov014_0215ac40 kind:bss addr:0x215ac40 data_ov014_0215ac4c kind:bss addr:0x215ac4c data_ov014_0215ac5c kind:bss addr:0x215ac5c diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index f3f6cde5..53a8162a 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -2648,14 +2648,14 @@ _ZN9EquipItem19func_ov000_020be9e4Eiiis kind:function(arm,size=0x14c) addr:0x20b _ZN9EquipItem7GetAmmoEv kind:function(arm,size=0x2c) addr:0x20bead0 _ZN9EquipItem8GiveAmmoEj kind:function(arm,size=0x34) addr:0x20beafc _ZNK9EquipItem9GetHitboxEP8Cylinder kind:function(arm,size=0x18) addr:0x20beb30 -func_ov000_020beba8 kind:function(arm,size=0x18) addr:0x20beb48 -func_ov000_020bebc0 kind:function(arm,size=0x18) addr:0x20beb60 -func_ov000_020bebd8 kind:function(arm,size=0x84) addr:0x20beb78 -func_ov000_020bec5c kind:function(arm,size=0x84) addr:0x20bebfc -func_ov000_020bece0 kind:function(arm,size=0x9c) addr:0x20bec80 -func_ov000_020bed7c kind:function(arm,size=0x50) addr:0x20bed1c -func_ov000_020bedcc kind:function(arm,size=0x98) addr:0x20bed6c -func_ov000_020bee64 kind:function(arm,size=0x14) addr:0x20bee04 +_ZN24UnkStruct_ov000_020beba8C1Ei kind:function(arm,size=0x18) addr:0x20beb48 +_ZN24UnkStruct_ov000_020beba88vfunc_04EPs kind:function(arm,size=0x18) addr:0x20beb60 +_ZN24UnkStruct_ov000_020beba88vfunc_08EPs kind:function(arm,size=0x84) addr:0x20beb78 +_ZN24UnkStruct_ov000_020beba88vfunc_0cEPi kind:function(arm,size=0x84) addr:0x20bebfc +_ZN24UnkStruct_ov000_020beba88vfunc_14EPi kind:function(arm,size=0x9c) addr:0x20bec80 +_ZN24UnkStruct_ov000_020beba88vfunc_10EPt kind:function(arm,size=0x50) addr:0x20bed1c +_ZN24UnkStruct_ov000_020beba8D1Ev kind:function(arm,size=0x98) addr:0x20bed6c +_ZN24UnkStruct_ov000_020beba8D0Ev kind:function(arm,size=0x14) addr:0x20bee04 func_ov000_020bee78 kind:function(arm,size=0x1c) addr:0x20bee18 func_ov000_020bee94 kind:function(arm,size=0x3c) addr:0x20bee34 func_ov000_020beed0 kind:function(arm,size=0x40) addr:0x20bee70 diff --git a/config/usa/arm9/overlays/ov005/symbols.txt b/config/usa/arm9/overlays/ov005/symbols.txt index fe67dea3..a29c8cc9 100644 --- a/config/usa/arm9/overlays/ov005/symbols.txt +++ b/config/usa/arm9/overlays/ov005/symbols.txt @@ -134,7 +134,7 @@ _Z15GetEquipBombchuv kind:function(arm,size=0x10) addr:0x2105734 _ZN13LinkStateItem8vfunc_24Ei kind:function(arm,size=0x8c) addr:0x2105744 _ZN13LinkStateItem19func_ov005_02105850Ev kind:function(arm,size=0x3d8) addr:0x21057d0 _ZN13LinkStateItem19func_ov005_02105c28Ev kind:function(arm,size=0x15c) addr:0x2105ba8 -_Z14GetEquipShieldv kind:function(arm,size=0x10) addr:0x2105d04 +_Z14GetEquipShieldv kind:function(arm,size=0x10) addr:0x2105d04 local _ZN13LinkStateItem19func_ov005_02105d94Ev kind:function(arm,size=0x18) addr:0x2105d14 _ZN13LinkStateItem19func_ov005_02105dacEv kind:function(arm,size=0x888) addr:0x2105d2c _Z16GetLinkStateRollv kind:function(arm,size=0x10) addr:0x21065b4 @@ -223,7 +223,7 @@ _ZN17LinkStateInteract8vfunc_2cEPt kind:function(arm,size=0x138) addr:0x210b33c _ZN17LinkStateInteract19func_ov005_0210b4f4EP5Vec3pP5Actor kind:function(arm,size=0x6c) addr:0x210b474 func_ov005_0210b560 kind:function(arm,size=0x1c) addr:0x210b4e0 _ZN15LinkStateFollow12OnStateEnterEv kind:function(arm,size=0x3f0) addr:0x210b4fc -_Z12GetEquipRopev kind:function(arm,size=0x10) addr:0x210b8ec +_ZN15LinkStateFollow12GetEquipRopeEv kind:function(arm,size=0x10) addr:0x210b8ec _ZN15LinkStateFollow8vfunc_1cEv kind:function(arm,size=0x48) addr:0x210b8fc _ZN15LinkStateFollow19func_ov005_0210b9c4Ev kind:function(arm,size=0xd4) addr:0x210b944 _ZN15LinkStateFollow19func_ov005_0210ba98Ev kind:function(arm,size=0x24) addr:0x210ba18 diff --git a/config/usa/arm9/overlays/ov014/symbols.txt b/config/usa/arm9/overlays/ov014/symbols.txt index bd80ef53..9fe9591d 100644 --- a/config/usa/arm9/overlays/ov014/symbols.txt +++ b/config/usa/arm9/overlays/ov014/symbols.txt @@ -9,66 +9,66 @@ 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 -func_ov014_0211fd50 kind:function(arm,size=0x30) addr:0x211fcd0 -func_ov014_0211fd80 kind:function(arm,size=0x10) addr:0x211fd00 -func_ov014_0211fd90 kind:function(arm,size=0x14) addr:0x211fd10 -func_ov014_0211fda4 kind:function(arm,size=0x108) addr:0x211fd24 -func_ov014_0211feac kind:function(arm,size=0x28) addr:0x211fe2c -func_ov014_0211fed4 kind:function(arm,size=0x30) addr:0x211fe54 -func_ov014_0211ff04 kind:function(arm,size=0x148) addr:0x211fe84 -func_ov014_0212004c kind:function(arm,size=0x88) addr:0x211ffcc -func_ov014_021200d4 kind:function(arm,size=0x44) addr:0x2120054 -func_ov014_02120118 kind:function(arm,size=0x68) addr:0x2120098 -func_ov014_02120180 kind:function(arm,size=0x170) addr:0x2120100 -func_ov014_021202f0 kind:function(arm,size=0x10) addr:0x2120270 -func_ov014_02120300 kind:function(arm,size=0x474) addr:0x2120280 -func_ov014_02120774 kind:function(arm,size=0xc) addr:0x21206f4 -func_ov014_02120780 kind:function(arm,size=0x20) addr:0x2120700 -func_ov014_021207a0 kind:function(arm,size=0x18) addr:0x2120720 -func_ov014_021207b8 kind:function(arm,size=0x1e0) addr:0x2120738 -func_ov014_02120998 kind:function(arm,size=0xe8) addr:0x2120918 -func_ov014_02120a80 kind:function(arm,size=0x44) addr:0x2120a00 -func_ov014_02120ac4 kind:function(arm,size=0x1d4) addr:0x2120a44 -func_ov014_02120c98 kind:function(arm,size=0xc0) addr:0x2120c18 -func_ov014_02120d58 kind:function(arm,size=0x50) addr:0x2120cd8 -func_ov014_02120da8 kind:function(arm,size=0x44) addr:0x2120d28 -func_ov014_02120dec kind:function(arm,size=0x68) addr:0x2120d6c -func_ov014_02120e54 kind:function(arm,size=0x80) addr:0x2120dd4 -func_ov014_02120ed4 kind:function(arm,size=0x10) addr:0x2120e54 -func_ov014_02120ee4 kind:function(arm,size=0x4e4) addr:0x2120e64 +_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 +_ZN10ActorArrowC2Ev kind:function(arm,size=0x108) addr:0x211fd24 +_ZN10ActorArrowD1Ev kind:function(arm,size=0x28) addr:0x211fe2c +_ZN10ActorArrowD0Ev kind:function(arm,size=0x30) addr:0x211fe54 +_ZN10ActorArrow8vfunc_08Ev kind:function(arm,size=0x148) addr:0x211fe84 +_ZN10ActorArrow12CollidesWithEP5Actor kind:function(arm,size=0x88) addr:0x211ffcc +_ZN10ActorArrow19func_ov014_021200d4Ev kind:function(arm,size=0x44) addr:0x2120054 +_ZN10ActorArrow19func_ov014_02120118Ev kind:function(arm,size=0x68) addr:0x2120098 +_ZN10ActorArrow19func_ov014_02120180Ev kind:function(arm,size=0x170) addr:0x2120100 +_ZN10ActorArrow12GetEquipRopeEv kind:function(arm,size=0x10) addr:0x2120270 +_ZN10ActorArrow8vfunc_14Ej kind:function(arm,size=0x474) addr:0x2120280 +_Z19func_ov014_02120774Pji kind:function(arm,size=0xc) addr:0x21206f4 +_ZN10ActorArrow8vfunc_18Ej kind:function(arm,size=0x20) addr:0x2120700 +_ZN10ActorArrow8vfunc_10Ej kind:function(arm,size=0x18) addr:0x2120720 +_ZN10ActorArrow19func_ov014_021207b8EP8ActorRefii kind:function(arm,size=0x1e0) addr:0x2120738 +_ZN10ActorArrow19func_ov014_02120998EP8ActorRefiiis kind:function(arm,size=0xe8) addr:0x2120918 +_Z19func_ov014_02120a80iP10ActorArrow kind:function(arm,size=0x44) addr:0x2120a00 +_ZN10ActorArrow19func_ov014_02120ac4Eib kind:function(arm,size=0x1d4) addr:0x2120a44 +_ZN10ActorArrow19func_ov014_02120c98EP5Vec3p kind:function(arm,size=0xc0) addr:0x2120c18 +_ZN10ActorArrow19func_ov014_02120d58Ev kind:function(arm,size=0x50) addr:0x2120cd8 +_ZN10ActorArrow19func_ov014_02120da8Ev kind:function(arm,size=0x44) addr:0x2120d28 +_ZN10ActorArrow19func_ov014_02120decEi kind:function(arm,size=0x68) addr:0x2120d6c +_ZN10ActorArrow8vfunc_48EP9Knockback kind:function(arm,size=0x80) addr:0x2120dd4 +_Z14GetEquipShieldv kind:function(arm,size=0x10) addr:0x2120e54 local +_ZN10ActorArrow8vfunc_20Eb kind:function(arm,size=0x4e4) addr:0x2120e64 func_ov014_021213c8 kind:function(arm,size=0x14) addr:0x2121348 -func_ov014_021213dc kind:function(arm,size=0x30) addr:0x212135c -func_ov014_0212140c kind:function(arm,size=0xa4) addr:0x212138c -func_ov014_021214b0 kind:function(arm,size=0x8c) addr:0x2121430 -func_ov014_0212153c kind:function(arm,size=0x14) addr:0x21214bc -func_ov014_02121550 kind:function(arm,size=0x1c) addr:0x21214d0 -func_ov014_0212156c kind:function(arm,size=0x260) addr:0x21214ec -func_ov014_021217cc kind:function(arm,size=0x218) addr:0x212174c -func_ov014_021219e4 kind:function(arm,size=0x14) addr:0x2121964 -func_ov014_021219f8 kind:function(arm,size=0x90) addr:0x2121978 -func_ov014_02121a88 kind:function(arm,size=0x1c) addr:0x2121a08 -func_ov014_02121aa4 kind:function(arm,size=0x30) addr:0x2121a24 -func_ov014_02121ad4 kind:function(arm,size=0x9c) addr:0x2121a54 -func_ov014_02121b70 kind:function(arm,size=0x74) addr:0x2121af0 -func_ov014_02121be4 kind:function(arm,size=0xf4) addr:0x2121b64 -func_ov014_02121cd8 kind:function(arm,size=0x1c) addr:0x2121c58 -func_ov014_02121cf4 kind:function(arm,size=0x38) addr:0x2121c74 -func_ov014_02121d2c kind:function(arm,size=0x40) addr:0x2121cac -func_ov014_02121d6c kind:function(arm,size=0x14) addr:0x2121cec -func_ov014_02121d80 kind:function(arm,size=0x134) addr:0x2121d00 -func_ov014_02121eb4 kind:function(arm,size=0xc58) addr:0x2121e34 -func_ov014_02122b0c kind:function(arm,size=0x14) addr:0x2122a8c -func_ov014_02122b20 kind:function(arm,size=0x98) addr:0x2122aa0 -func_ov014_02122bb8 kind:function(arm,size=0xe4) addr:0x2122b38 -func_ov014_02122c9c kind:function(arm,size=0x18) addr:0x2122c1c -func_ov014_02122cb4 kind:function(arm,size=0xb8) addr:0x2122c34 -func_ov014_02122d6c kind:function(arm,size=0xdc) addr:0x2122cec -func_ov014_02122e48 kind:function(arm,size=0x34) addr:0x2122dc8 -func_ov014_02122e7c kind:function(arm,size=0x1c) addr:0x2122dfc -func_ov014_02122e98 kind:function(arm,size=0x20) addr:0x2122e18 -func_ov014_02122eb8 kind:function(arm,size=0x1c) addr:0x2122e38 -func_ov014_02122ed4 kind:function(arm,size=0x188) addr:0x2122e54 -func_ov014_0212305c kind:function(arm,size=0x1c) addr:0x2122fdc +_ZN10ActorBlast6CreateEv kind:function(arm,size=0x30) addr:0x212135c +_ZN15ActorBlast_Unk18vfunc_0cEPi kind:function(arm,size=0xa4) addr:0x212138c +_ZN10ActorBlastC2Ev kind:function(arm,size=0x8c) addr:0x2121430 +_ZN10ActorBlastD1Ev kind:function(arm,size=0x14) addr:0x21214bc +_ZN10ActorBlastD0Ev kind:function(arm,size=0x1c) addr:0x21214d0 +_ZN10ActorBlast8vfunc_08Ev kind:function(arm,size=0x260) addr:0x21214ec +_ZN10ActorBlast8vfunc_14Ej kind:function(arm,size=0x218) addr:0x212174c +_ZN15ActorBlast_Unk1D1Ev kind:function(arm,size=0x14) addr:0x2121964 +_ZN10ActorBlast8vfunc_18Ej kind:function(arm,size=0x90) addr:0x2121978 +_ZN15ActorBlast_Unk1D0Ev kind:function(arm,size=0x1c) addr:0x2121a08 +_ZN9ActorBomb6CreateEv kind:function(arm,size=0x30) addr:0x2121a24 +_ZN14ActorBomb_Unk18vfunc_08EPs kind:function(arm,size=0x9c) addr:0x2121a54 +_ZN14ActorBomb_Unk18vfunc_0cEPi kind:function(arm,size=0x74) addr:0x2121af0 +_ZN9ActorBombC2Ev kind:function(arm,size=0xf4) addr:0x2121b64 +_ZN14ActorBomb_Unk2D1Ev kind:function(arm,size=0x1c) addr:0x2121c58 +_ZN9ActorBombD1Ev kind:function(arm,size=0x38) addr:0x2121c74 +_ZN9ActorBombD0Ev kind:function(arm,size=0x40) addr:0x2121cac +_ZN14ActorBomb_Unk2C1Ev kind:function(arm,size=0x14) addr:0x2121cec +_ZN9ActorBomb8vfunc_08Ev kind:function(arm,size=0x134) addr:0x2121d00 +_ZN9ActorBomb8vfunc_14Ej kind:function(arm,size=0xc58) addr:0x2121e34 +_ZN14ActorBomb_Unk1D1Ev kind:function(arm,size=0x14) addr:0x2122a8c +_ZN9ActorBomb8vfunc_18Ej kind:function(arm,size=0x98) addr:0x2122aa0 +_ZN9ActorBomb19func_ov014_02122bb8Ei kind:function(arm,size=0xe4) addr:0x2122b38 +_ZN9ActorBomb8vfunc_54Ev kind:function(arm,size=0x18) addr:0x2122c1c +_ZN9ActorBomb8vfunc_20Eb kind:function(arm,size=0xb8) addr:0x2122c34 +_ZN9ActorBomb11SetVelocityEP5Vec3p kind:function(arm,size=0xdc) addr:0x2122cec +_ZN9ActorBomb19func_ov014_02122e48EPi kind:function(arm,size=0x34) addr:0x2122dc8 +_ZN9ActorBomb19func_ov014_02122e7cEv kind:function(arm,size=0x1c) addr:0x2122dfc +_ZN9ActorBomb19func_ov014_02122e98Ev kind:function(arm,size=0x20) addr:0x2122e18 +_ZN9ActorBomb19func_ov014_02122eb8Ev kind:function(arm,size=0x1c) addr:0x2122e38 +_ZN9ActorBomb19func_ov014_02122ed4Ev kind:function(arm,size=0x188) addr:0x2122e54 +_ZN14ActorBomb_Unk1D0Ev kind:function(arm,size=0x1c) addr:0x2122fdc func_ov014_02123078 kind:function(arm,size=0x30) addr:0x2122ff8 func_ov014_021230a8 kind:function(arm,size=0x8c) addr:0x2123028 func_ov014_02123134 kind:function(arm,size=0x28) addr:0x21230b4 @@ -848,111 +848,111 @@ 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 func_ov014_0213cf2c kind:function(arm,size=0x5c) addr:0x213ce88 -func_ov014_0213cf88 kind:function(thumb,size=0x14) addr:0x213cee4 -func_ov014_0213cf9c kind:function(thumb,size=0xc) addr:0x213cef8 -func_ov014_0213cfa8 kind:function(thumb,size=0x14) addr:0x213cf04 -func_ov014_0213cfbc kind:function(arm,size=0x8) addr:0x213cf18 -func_ov014_0213cfc4 kind:function(thumb,size=0x4c) addr:0x213cf20 -func_ov014_0213d010 kind:function(thumb,size=0x2c) addr:0x213cf6c -func_ov014_0213d03c kind:function(thumb,size=0x30) addr:0x213cf98 -func_ov014_0213d06c kind:function(arm,size=0xc) addr:0x213cfc8 -func_ov014_0213d078 kind:function(thumb,size=0x20) addr:0x213cfd4 -func_ov014_0213d098 kind:function(arm,size=0x24) addr:0x213cff4 -func_ov014_0213d0bc kind:function(arm,size=0xa0) addr:0x213d018 +_ZN10EquipScoopC2Ev kind:function(thumb,size=0x14) addr:0x213cee4 +_ZN10EquipScoopD1Ev kind:function(thumb,size=0xc) addr:0x213cef8 +_ZN10EquipScoopD0Ev kind:function(thumb,size=0x14) addr:0x213cf04 +_ZNK10EquipScoop5GetIdEv kind:function(arm,size=0x8) addr:0x213cf18 +_ZN14EquipBoomerangC2Ev kind:function(thumb,size=0x4c) addr:0x213cf20 +_ZN14EquipBoomerangD1Ev kind:function(thumb,size=0x2c) addr:0x213cf6c +_ZN14EquipBoomerangD0Ev kind:function(thumb,size=0x30) addr:0x213cf98 +_ZN14EquipBoomerang11UpdateInUseEi kind:function(arm,size=0xc) addr:0x213cfc8 +_ZN14EquipBoomerang8vfunc_10Ev kind:function(thumb,size=0x20) addr:0x213cfd4 +_ZN14EquipBoomerang19func_ov014_0213d098Ev kind:function(arm,size=0x24) addr:0x213cff4 +_ZN14EquipBoomerang19func_ov014_0213d0bcEP5Vec3p kind:function(arm,size=0xa0) addr:0x213d018 _ZN14EquipBoomerang8GetActorEv kind:function(arm,size=0x20) addr:0x213d0b8 -func_ov014_0213d17c kind:function(arm,size=0x8) addr:0x213d0d8 -func_ov014_0213d184 kind:function(arm,size=0x2c) addr:0x213d0e0 -func_ov014_0213d1b0 kind:function(arm,size=0x14) addr:0x213d10c -func_ov014_0213d1c4 kind:function(thumb,size=0x2c) addr:0x213d120 -func_ov014_0213d1f0 kind:function(arm,size=0x8) addr:0x213d14c -func_ov014_0213d1f8 kind:function(arm,size=0x1c) addr:0x213d154 -func_ov014_0213d214 kind:function(arm,size=0x14) addr:0x213d170 -func_ov014_0213d228 kind:function(arm,size=0x8) addr:0x213d184 -func_ov014_0213d230 kind:function(arm,size=0x18) addr:0x213d18c -func_ov014_0213d248 kind:function(arm,size=0x14) addr:0x213d1a4 -func_ov014_0213d25c kind:function(thumb,size=0x8c) addr:0x213d1b8 -func_ov014_0213d2e8 kind:function(thumb,size=0x4) addr:0x213d244 -func_ov014_0213d2ec kind:function(arm,size=0x28) addr:0x213d248 -func_ov014_0213d314 kind:function(thumb,size=0x44) addr:0x213d270 -func_ov014_0213d358 kind:function(thumb,size=0x48) addr:0x213d2b4 -func_ov014_0213d3a0 kind:function(thumb,size=0x2c) addr:0x213d2fc -func_ov014_0213d3cc kind:function(arm,size=0x8) addr:0x213d328 -func_ov014_0213d3d4 kind:function(arm,size=0x30) addr:0x213d330 -func_ov014_0213d404 kind:function(arm,size=0x1c) addr:0x213d360 +_ZNK14EquipBoomerang5GetIdEv kind:function(arm,size=0x8) addr:0x213d0d8 +_ZN14EquipBoomerang19func_ov014_0213d184Ev kind:function(arm,size=0x2c) addr:0x213d0e0 +_ZN14EquipBoomerang19func_ov014_0213d1b0Ev kind:function(arm,size=0x14) addr:0x213d10c +_ZN9EquipBombC2Ev kind:function(thumb,size=0x2c) addr:0x213d120 +_ZNK9EquipBomb5GetIdEv kind:function(arm,size=0x8) addr:0x213d14c +_ZN9EquipBombD1Ev kind:function(arm,size=0x1c) addr:0x213d154 +_ZN9EquipBombD0Ev kind:function(arm,size=0x14) addr:0x213d170 +_ZN9EquipBomb8vfunc_50Ev kind:function(arm,size=0x8) addr:0x213d184 +_Z19func_ov014_0213d230ii kind:function(arm,size=0x18) addr:0x213d18c +_Z19func_ov013_0213d248i kind:function(arm,size=0x14) addr:0x213d1a4 +_ZN9EquipRopeC2Ev kind:function(thumb,size=0x8c) addr:0x213d1b8 +_Z19func_ov014_0213d2e8v kind:function(thumb,size=0x4) addr:0x213d244 +_Z19func_ov014_0213d2eci kind:function(arm,size=0x28) addr:0x213d248 +_ZN9EquipRopeD1Ev kind:function(thumb,size=0x44) addr:0x213d270 +_ZN9EquipRopeD0Ev kind:function(thumb,size=0x48) addr:0x213d2b4 +_ZN9EquipRope8vfunc_10Ev kind:function(thumb,size=0x2c) addr:0x213d2fc +_ZNK9EquipRope5GetIdEv kind:function(arm,size=0x8) addr:0x213d328 +_ZN9EquipRope19func_ov014_0213d3d4EP5Vec3p kind:function(arm,size=0x30) addr:0x213d330 +_ZN9EquipRope19func_ov014_0213d404EPi kind:function(arm,size=0x1c) addr:0x213d360 _ZN9EquipRope18func_ov14_0213d420Ev kind:function(arm,size=0x20) addr:0x213d37c _ZN9EquipRope18func_ov14_0213d440Ei kind:function(arm,size=0x40) addr:0x213d39c _ZN9EquipRope18func_ov14_0213d480Ei kind:function(arm,size=0x48) addr:0x213d3dc -func_ov014_0213d4c8 kind:function(arm,size=0x24) addr:0x213d424 -func_ov014_0213d4ec kind:function(arm,size=0xa8) addr:0x213d448 -func_ov014_0213d594 kind:function(arm,size=0x3c) addr:0x213d4f0 -func_ov014_0213d5d0 kind:function(arm,size=0x6c) addr:0x213d52c -func_ov014_0213d63c kind:function(arm,size=0x48) addr:0x213d598 -func_ov014_0213d684 kind:function(arm,size=0x5c) addr:0x213d5e0 -func_ov014_0213d6e0 kind:function(arm,size=0x3c) addr:0x213d63c -func_ov014_0213d71c kind:function(arm,size=0x6c) addr:0x213d678 -func_ov014_0213d788 kind:function(arm,size=0x94) addr:0x213d6e4 +_ZN9EquipRope19func_ov014_0213d4c8Ev kind:function(arm,size=0x24) addr:0x213d424 +_ZN9EquipRope19func_ov014_0213d4ecEPii kind:function(arm,size=0xa8) addr:0x213d448 +_ZN9EquipRope19func_ov014_0213d594Ei kind:function(arm,size=0x3c) addr:0x213d4f0 +_ZN9EquipRope19func_ov014_0213d5d0EPii kind:function(arm,size=0x6c) addr:0x213d52c +_ZN9EquipRope19func_ov014_0213d63cEi kind:function(arm,size=0x48) addr:0x213d598 +_ZN9EquipRope19func_ov014_0213d684Ev kind:function(arm,size=0x5c) addr:0x213d5e0 +_ZN9EquipRope19func_ov014_0213d6e0Ev kind:function(arm,size=0x3c) addr:0x213d63c +_ZN9EquipRope19func_ov014_0213d71cEiP8ActorRef kind:function(arm,size=0x6c) addr:0x213d678 +_ZN9EquipRope19func_ov014_0213d788Ei kind:function(arm,size=0x94) addr:0x213d6e4 _ZN9EquipRope18func_ov14_0213d81cEiP5Vec3p kind:function(arm,size=0x100) addr:0x213d778 _ZN9EquipRope18func_ov14_0213d91cEi kind:function(arm,size=0x90) addr:0x213d878 -func_ov014_0213d9ac kind:function(arm,size=0x130) addr:0x213d908 +_ZN9EquipRope19func_ov014_0213d9acEv kind:function(arm,size=0x130) addr:0x213d908 _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder kind:function(arm,size=0x58) addr:0x213da38 -func_ov014_0213db34 kind:function(thumb,size=0x2c) addr:0x213da90 -func_ov014_0213db60 kind:function(arm,size=0x44) addr:0x213dabc -func_ov014_0213dba4 kind:function(arm,size=0x1fc) addr:0x213db00 -func_ov014_0213dda0 kind:function(arm,size=0x34) addr:0x213dcfc +_ZN9EquipRope19func_ov014_0213db34Ev kind:function(thumb,size=0x2c) addr:0x213da90 +_ZN9EquipRope19func_ov014_0213db60Ev kind:function(arm,size=0x44) addr:0x213dabc +_ZN9EquipRope19func_ov014_0213dba4EP5Vec3p kind:function(arm,size=0x1fc) addr:0x213db00 +_ZN9EquipRope19func_ov014_0213dda0Ev kind:function(arm,size=0x34) addr:0x213dcfc _ZN9EquipRope18func_ov14_0213ddd4EP5Actor kind:function(arm,size=0x128) addr:0x213dd30 _ZN9EquipRope18func_ov14_0213defcEP5Actor kind:function(arm,size=0xc0) addr:0x213de58 -func_ov014_0213dfbc kind:function(arm,size=0x188) addr:0x213df18 -func_ov014_0213e144 kind:function(arm,size=0xc8) addr:0x213e0a0 -func_ov014_0213e20c kind:function(arm,size=0x11c) addr:0x213e168 -func_ov014_0213e328 kind:function(arm,size=0x21c) addr:0x213e284 -func_ov014_0213e544 kind:function(arm,size=0x18) addr:0x213e4a0 -func_ov014_0213e55c kind:function(arm,size=0x55c) addr:0x213e4b8 -func_ov014_0213eab8 kind:function(thumb,size=0x1c) addr:0x213ea14 -func_ov014_0213ead4 kind:function(thumb,size=0xc) addr:0x213ea30 -func_ov014_0213eae0 kind:function(thumb,size=0x14) addr:0x213ea3c -func_ov014_0213eaf4 kind:function(arm,size=0x8) addr:0x213ea50 -func_ov014_0213eafc kind:function(thumb,size=0x50) addr:0x213ea58 -func_ov014_0213eb4c kind:function(arm,size=0x10) addr:0x213eaa8 -func_ov014_0213eb5c kind:function(thumb,size=0x20) addr:0x213eab8 -func_ov014_0213eb7c kind:function(thumb,size=0x28) addr:0x213ead8 -func_ov014_0213eba4 kind:function(arm,size=0x9c) addr:0x213eb00 -func_ov014_0213ec40 kind:function(arm,size=0x24) addr:0x213eb9c -_Z19func_ov014_0213ec64i kind:function(arm,size=0x48) addr:0x213ebc0 -func_ov014_0213ecac kind:function(arm,size=0x8) addr:0x213ec08 -func_ov014_0213ecb4 kind:function(arm,size=0xc0) addr:0x213ec10 -func_ov014_0213ed74 kind:function(arm,size=0x20) addr:0x213ecd0 -func_ov014_0213ed94 kind:function(arm,size=0xc) addr:0x213ecf0 -func_ov014_0213eda0 kind:function(thumb,size=0x20) addr:0x213ecfc -func_ov014_0213edc0 kind:function(thumb,size=0x24) addr:0x213ed1c -func_ov014_0213ede4 kind:function(thumb,size=0xc) addr:0x213ed40 -func_ov014_0213edf0 kind:function(thumb,size=0x14) addr:0x213ed4c -func_ov014_0213ee04 kind:function(thumb,size=0x4) addr:0x213ed60 -func_ov014_0213ee08 kind:function(arm,size=0x8) addr:0x213ed64 -func_ov014_0213ee10 kind:function(arm,size=0x98) addr:0x213ed6c -func_ov014_0213eea8 kind:function(arm,size=0xc) addr:0x213ee04 -func_ov014_0213eeb4 kind:function(thumb,size=0x2c) addr:0x213ee10 -func_ov014_0213eee0 kind:function(arm,size=0x10) addr:0x213ee3c -func_ov014_0213eef0 kind:function(arm,size=0x30) addr:0x213ee4c -func_ov014_0213ef20 kind:function(thumb,size=0xc) addr:0x213ee7c -func_ov014_0213ef2c kind:function(thumb,size=0x34) addr:0x213ee88 -func_ov014_0213ef60 kind:function(thumb,size=0x34) addr:0x213eebc -func_ov014_0213ef94 kind:function(thumb,size=0x3c) addr:0x213eef0 -func_ov014_0213efd0 kind:function(thumb,size=0x80) addr:0x213ef2c -func_ov014_0213f050 kind:function(arm,size=0x3c) addr:0x213efac -func_ov014_0213f08c kind:function(arm,size=0x2c) addr:0x213efe8 -func_ov014_0213f0b8 kind:function(arm,size=0x4c) addr:0x213f014 -func_ov014_0213f104 kind:function(arm,size=0x230) addr:0x213f060 -func_ov014_0213f334 kind:function(arm,size=0x48) addr:0x213f290 -func_ov014_0213f37c kind:function(arm,size=0xf0) addr:0x213f2d8 -func_ov014_0213f46c kind:function(thumb,size=0x60) addr:0x213f3c8 -func_ov014_0213f4cc kind:function(thumb,size=0xdc) addr:0x213f428 -func_ov014_0213f5a8 kind:function(arm,size=0x34) addr:0x213f504 -func_ov014_0213f5dc kind:function(arm,size=0x24) addr:0x213f538 -func_ov014_0213f600 kind:function(arm,size=0x124) addr:0x213f55c -func_ov014_0213f724 kind:function(arm,size=0x10) addr:0x213f680 -func_ov014_0213f734 kind:function(arm,size=0xc) addr:0x213f690 -func_ov014_0213f740 kind:function(arm,size=0x23c) addr:0x213f69c -func_ov014_0213f97c kind:function(arm,size=0xb0) addr:0x213f8d8 +_ZN9EquipRope19func_ov014_0213dfbcEP8CylinderiP5Vec3p kind:function(arm,size=0x188) addr:0x213df18 +_ZN9EquipRope19func_ov014_0213e144EP5Vec3pS1_i kind:function(arm,size=0xc8) addr:0x213e0a0 +_ZN9EquipRope19func_ov014_0213e20cEiP5Vec3p kind:function(arm,size=0x11c) addr:0x213e168 +_ZN9EquipRope19func_ov014_0213e328Ev kind:function(arm,size=0x21c) addr:0x213e284 +_Z19func_ov014_0213e544ii kind:function(arm,size=0x18) addr:0x213e4a0 +_Z19func_ov014_0213e55cPi kind:function(arm,size=0x55c) addr:0x213e4b8 +_ZN8EquipBowC2Ev kind:function(thumb,size=0x1c) addr:0x213ea14 +_ZN8EquipBowD1Ev kind:function(thumb,size=0xc) addr:0x213ea30 +_ZN8EquipBowD0Ev kind:function(thumb,size=0x14) addr:0x213ea3c +_ZNK8EquipBow5GetIdEv kind:function(arm,size=0x8) addr:0x213ea50 +_ZN12EquipBombchuC2Ev kind:function(thumb,size=0x50) addr:0x213ea58 +_ZN17EquipBombchu_Unk1C1Ev kind:function(arm,size=0x10) addr:0x213eaa8 +_ZN12EquipBombchuD1Ev kind:function(thumb,size=0x20) addr:0x213eab8 +_ZN12EquipBombchuD0Ev kind:function(thumb,size=0x28) addr:0x213ead8 +_ZN12EquipBombchu19func_ov014_0213eba4Ev kind:function(arm,size=0x9c) addr:0x213eb00 +_ZN12EquipBombchu19func_ov014_0213ec40Ev kind:function(arm,size=0x24) addr:0x213eb9c +_ZN12EquipBombchu19func_ov014_0213ec64Ev kind:function(arm,size=0x48) addr:0x213ebc0 +_ZNK12EquipBombchu5GetIdEv kind:function(arm,size=0x8) addr:0x213ec08 +_ZN12EquipBombchu8vfunc_34EPs kind:function(arm,size=0xc0) addr:0x213ec10 +_ZN12EquipBombchu19func_ov014_0213ed74Ev kind:function(arm,size=0x20) addr:0x213ecd0 +_ZN12EquipBombchu19func_ov014_0213ed94Ei kind:function(arm,size=0xc) addr:0x213ecf0 +_ZN12EquipBombchu19func_ov014_0213eda0Ev kind:function(thumb,size=0x20) addr:0x213ecfc +_ZN11EquipHammerC2Ev kind:function(thumb,size=0x24) addr:0x213ed1c +_ZN11EquipHammerD1Ev kind:function(thumb,size=0xc) addr:0x213ed40 +_ZN11EquipHammerD0Ev kind:function(thumb,size=0x14) addr:0x213ed4c +_ZN11EquipHammer8vfunc_10Ev kind:function(thumb,size=0x4) addr:0x213ed60 +_ZNK11EquipHammer5GetIdEv kind:function(arm,size=0x8) addr:0x213ed64 +_ZNK11EquipHammer9GetHitboxEP8Cylinder kind:function(arm,size=0x98) addr:0x213ed6c +_ZNK11EquipHammer8vfunc_4cEv kind:function(arm,size=0xc) addr:0x213ee04 +_ZN10PlayerLink6CreateEv kind:function(thumb,size=0x2c) addr:0x213ee10 +_ZN10PlayerLink11GetInstanceEv kind:function(arm,size=0x10) addr:0x213ee3c +_ZN10PlayerLink19func_ov014_0213eef0Ei kind:function(arm,size=0x30) addr:0x213ee4c +_ZN10PlayerLink20GetLinkStateCutsceneEv kind:function(thumb,size=0xc) addr:0x213ee7c +_ZN10PlayerLinkC2Ev kind:function(thumb,size=0x34) addr:0x213ee88 +_ZN10PlayerLinkD1Ev kind:function(thumb,size=0x34) addr:0x213eebc +_ZN10PlayerLinkD0Ev kind:function(thumb,size=0x3c) addr:0x213eef0 +_ZN10PlayerLink4InitEv kind:function(thumb,size=0x80) addr:0x213ef2c +_ZN10PlayerLink8vfunc_04Ev kind:function(arm,size=0x3c) addr:0x213efac +_ZN10PlayerLink8vfunc_78Ev kind:function(arm,size=0x2c) addr:0x213efe8 +_ZN10PlayerLink11ResetUnk_5eEv kind:function(arm,size=0x4c) addr:0x213f014 +_ZN10PlayerLink8vfunc_2cEic kind:function(arm,size=0x230) addr:0x213f060 +_ZN10PlayerLink9UpdatePosEv kind:function(arm,size=0x48) addr:0x213f290 +_ZN10PlayerLink19func_ov014_0213f37cEv kind:function(arm,size=0xf0) addr:0x213f2d8 +_ZN10PlayerLink8vfunc_74Ev kind:function(thumb,size=0x60) addr:0x213f3c8 +_ZN10PlayerLink7OnDeathEb kind:function(thumb,size=0xdc) addr:0x213f428 +_ZN10PlayerLink8vfunc_7cEv kind:function(arm,size=0x34) addr:0x213f504 +_ZN10PlayerLink9AddHealthEs kind:function(arm,size=0x24) addr:0x213f538 +_ZN10PlayerLink8vfunc_68Ev kind:function(arm,size=0x124) addr:0x213f55c +_ZN10PlayerLink16GetLinkStateItemEv kind:function(arm,size=0x10) addr:0x213f680 +_ZN10PlayerLink19func_ov014_0213f734EPiP18UnkStruct_027e0fd4 kind:function(arm,size=0xc) addr:0x213f690 +_ZN10PlayerLink19func_ov014_0213f740Ev kind:function(arm,size=0x23c) addr:0x213f69c +_ZN10PlayerLink19func_ov014_0213f97cEv kind:function(arm,size=0xb0) addr:0x213f8d8 func_ov014_0213fa2c kind:function(arm,size=0xc) addr:0x213f988 func_ov014_0213fa38 kind:function(arm,size=0x4) addr:0x213f994 func_ov014_0213fa3c kind:function(arm,size=0xc) addr:0x213f998 @@ -1456,19 +1456,19 @@ func_ov014_021513d4 kind:function(arm,size=0x28) addr:0x2151330 func_ov014_021513fc kind:function(arm,size=0x20) addr:0x2151358 func_ov014_0215141c kind:function(arm,size=0x110) addr:0x2151378 func_ov014_0215152c kind:function(arm,size=0x20) addr:0x2151488 -func_ov014_0215154c kind:function(thumb,size=0x18) addr:0x21514a8 -func_ov014_02151564 kind:function(thumb,size=0xc) addr:0x21514c0 -func_ov014_02151570 kind:function(thumb,size=0x14) addr:0x21514cc -func_ov014_02151584 kind:function(thumb,size=0xc) addr:0x21514e0 -func_ov014_02151590 kind:function(thumb,size=0x18) addr:0x21514ec -func_ov014_021515a8 kind:function(thumb,size=0xc) addr:0x2151504 -func_ov014_021515b4 kind:function(thumb,size=0x14) addr:0x2151510 -func_ov014_021515c8 kind:function(arm,size=0x8) addr:0x2151524 -func_ov014_021515d0 kind:function(thumb,size=0x18) addr:0x215152c -func_ov014_021515e8 kind:function(thumb,size=0xc) addr:0x2151544 -func_ov014_021515f4 kind:function(thumb,size=0x14) addr:0x2151550 -func_ov014_02151608 kind:function(arm,size=0x8) addr:0x2151564 -func_ov014_02151610 kind:function(arm,size=0x7c) addr:0x215156c +_ZN11EquipPotionC2Ev kind:function(thumb,size=0x18) addr:0x21514a8 +_ZN11EquipPotionD1Ev kind:function(thumb,size=0xc) addr:0x21514c0 +_ZN11EquipPotionD0Ev kind:function(thumb,size=0x14) addr:0x21514cc +_ZN11EquipPotionD2Ev kind:function(thumb,size=0xc) addr:0x21514e0 +_ZN12EquipPotionAC2Ev kind:function(thumb,size=0x18) addr:0x21514ec +_ZN12EquipPotionAD1Ev kind:function(thumb,size=0xc) addr:0x2151504 +_ZN12EquipPotionAD0Ev kind:function(thumb,size=0x14) addr:0x2151510 +_ZNK12EquipPotionA5GetIdEv kind:function(arm,size=0x8) addr:0x2151524 +_ZN12EquipPotionBC2Ev kind:function(thumb,size=0x18) addr:0x215152c +_ZN12EquipPotionBD1Ev kind:function(thumb,size=0xc) addr:0x2151544 +_ZN12EquipPotionBD0Ev kind:function(thumb,size=0x14) addr:0x2151550 +_ZNK12EquipPotionB5GetIdEv kind:function(arm,size=0x8) addr:0x2151564 +_ZNK11EquipPotion8IsUsableEi kind:function(arm,size=0x7c) addr:0x215156c func_ov014_0215168c kind:function(arm,size=0x38) addr:0x21515e8 func_ov014_021516c4 kind:function(arm,size=0x60) addr:0x2151620 func_ov014_02151724 kind:function(arm,size=0x20) addr:0x2151680 @@ -1632,9 +1632,9 @@ data_ov014_02154199 kind:data(any) addr:0x21540f5 data_ov014_0215419c kind:data(any) addr:0x21540f8 data_ov014_021541d0 kind:data(any) addr:0x215412c data_ov014_021541d4 kind:data(any) addr:0x2154130 -__sinit_ov014_021541ec kind:function(arm,size=0x68) addr:0x2154148 -__sinit_ov014_02154254 kind:function(arm,size=0x40) addr:0x21541b0 -__sinit_ov014_02154294 kind:function(arm,size=0x60) addr:0x21541f0 +__sinit_ActorArrow.cpp kind:function(arm,size=0x68) addr:0x2154148 +__sinit_ActorBlast.cpp kind:function(arm,size=0x40) addr:0x21541b0 +__sinit_ActorBomb.cpp kind:function(arm,size=0x60) addr:0x21541f0 __sinit_ov014_021542f4 kind:function(arm,size=0x40) addr:0x2154250 __sinit_ov014_02154334 kind:function(arm,size=0x40) addr:0x2154290 __sinit_ov014_02154374 kind:function(arm,size=0x84) addr:0x21542d0 @@ -1719,9 +1719,9 @@ data_ov014_021559b0 kind:data(any) addr:0x2155910 data_ov014_021559b4 kind:data(any) addr:0x2155914 data_ov014_021559b8 kind:data(any) addr:0x2155918 data_ov014_021559bc kind:data(any) addr:0x215591c -data_ov014_021559e8 kind:data(any) addr:0x2155948 -data_ov014_02155aa4 kind:data(any) addr:0x2155a04 -data_ov014_02155ac8 kind:data(any) addr:0x2155a28 +_ZTV10ActorArrow kind:data(any) addr:0x2155948 +_ZTV15ActorBlast_Unk1 kind:data(any) addr:0x2155a04 +_ZTV10ActorBlast kind:data(any) addr:0x2155a28 data_ov014_02155b7c kind:data(any) addr:0x2155adc data_ov014_02155b80 kind:data(any) addr:0x2155ae0 data_ov014_02155b84 kind:data(any) addr:0x2155ae4 @@ -1731,8 +1731,8 @@ data_ov014_02155b90 kind:data(any) addr:0x2155af0 data_ov014_02155b94 kind:data(any) addr:0x2155af4 data_ov014_02155b98 kind:data(any) addr:0x2155af8 data_ov014_02155b9c kind:data(any) addr:0x2155afc -data_ov014_02155bcc kind:data(any) addr:0x2155b2c -data_ov014_02155bf0 kind:data(any) addr:0x2155b50 +_ZTV14ActorBomb_Unk1 kind:data(any) addr:0x2155b2c +_ZTV9ActorBomb kind:data(any) addr:0x2155b50 data_ov014_02155cac kind:data(any) addr:0x2155c0c data_ov014_02155cb4 kind:data(any) addr:0x2155c14 data_ov014_02155cb8 kind:data(any) addr:0x2155c18 @@ -1944,8 +1944,8 @@ data_ov014_02158db8 kind:data(any) addr:0x2158d18 data_ov014_02158dbc kind:data(any) addr:0x2158d1c data_ov014_02158dc0 kind:data(any) addr:0x2158d20 data_ov014_02158dc4 kind:data(any) addr:0x2158d24 -data_ov014_02158df0 kind:data(any) addr:0x2158d50 -data_ov014_02158e48 kind:data(any) addr:0x2158da8 +_ZTV14EquipBoomerang kind:data(any) addr:0x2158d50 +_ZTV9EquipBomb kind:data(any) addr:0x2158da8 data_ov014_02158e9c kind:data(any) addr:0x2158dfc data_ov014_02158ea0 kind:data(any) addr:0x2158e00 data_ov014_02158ea4 kind:data(any) addr:0x2158e04 @@ -1955,10 +1955,10 @@ data_ov014_02158eb0 kind:data(any) addr:0x2158e10 data_ov014_02158eb4 kind:data(any) addr:0x2158e14 data_ov014_02158eb8 kind:data(any) addr:0x2158e18 data_ov014_02158ed0 kind:data(any) addr:0x2158e30 ambiguous -data_ov014_02158ee4 kind:data(any) addr:0x2158e44 -data_ov014_02158f3c kind:data(any) addr:0x2158e9c -data_ov014_02158f94 kind:data(any) addr:0x2158ef4 -data_ov014_02158fec kind:data(any) addr:0x2158f4c +_ZTV9EquipRope kind:data(any) addr:0x2158e44 +_ZTV8EquipBow kind:data(any) addr:0x2158e9c +_ZTV17EquipBombchu kind:data(any) addr:0x2158ef4 +_ZTV11EquipHammer kind:data(any) addr:0x2158f4c data_ov014_0215903c kind:data(any) addr:0x2158f9c data_ov014_02159040 kind:data(any) addr:0x2158fa0 data_ov014_02159044 kind:data(any) addr:0x2158fa4 @@ -1967,7 +1967,7 @@ data_ov014_0215904c kind:data(any) addr:0x2158fac data_ov014_02159050 kind:data(any) addr:0x2158fb0 data_ov014_02159054 kind:data(any) addr:0x2158fb4 data_ov014_02159058 kind:data(any) addr:0x2158fb8 -data_ov014_02159084 kind:data(any) addr:0x2158fe4 +_ZTV10PlayerLink kind:data(any) addr:0x2158fe4 data_ov014_021590c0 kind:data(any) addr:0x2159020 ambiguous data_ov014_02159110 kind:data(any) addr:0x2159070 data_ov014_02159114 kind:data(any) addr:0x2159074 @@ -2065,9 +2065,9 @@ data_ov014_0215a790 kind:data(any) addr:0x215a6f0 data_ov014_0215a794 kind:data(any) addr:0x215a6f4 data_ov014_0215a798 kind:data(any) addr:0x215a6f8 data_ov014_0215a79c kind:data(any) addr:0x215a6fc -data_ov014_0215a7c8 kind:data(any) addr:0x215a728 -data_ov014_0215a820 kind:data(any) addr:0x215a780 -data_ov014_0215a878 kind:data(any) addr:0x215a7d8 +_ZTV12EquipPotionB kind:data(any) addr:0x215a728 +_ZTV12EquipPotionA kind:data(any) addr:0x215a780 +_ZTV11EquipPotion kind:data(any) addr:0x215a7d8 data_ov014_0215a8d0 kind:data(any) addr:0x215a830 data_ov014_0215a95c kind:data(any) addr:0x215a8bc data_ov014_0215a960 kind:data(any) addr:0x215a8c0 @@ -2109,13 +2109,13 @@ data_ov014_0215ab64 kind:data(any) addr:0x215aac4 data_ov014_0215ab8c kind:data(any) addr:0x215aaec data_ov014_0215ab90 kind:data(any) addr:0x215aaf0 data_ov014_0215abc0 kind:bss addr:0x215ab20 -data_ov014_0215abcc kind:bss addr:0x215ab2c +_ZN10ActorArrow5gTypeE kind:bss addr:0x215ab2c data_ov014_0215abe0 kind:bss addr:0x215ab40 data_ov014_0215abec kind:bss addr:0x215ab4c data_ov014_0215abfc kind:bss addr:0x215ab5c -data_ov014_0215ac08 kind:bss addr:0x215ab68 +_ZN10ActorBlast5gTypeE kind:bss addr:0x215ab68 data_ov014_0215ac1c kind:bss addr:0x215ab7c -data_ov014_0215ac28 kind:bss addr:0x215ab88 +_ZN9ActorBomb5gTypeE kind:bss addr:0x215ab88 data_ov014_0215ac40 kind:bss addr:0x215aba0 data_ov014_0215ac4c kind:bss addr:0x215abac data_ov014_0215ac5c kind:bss addr:0x215abbc diff --git a/include/Actor/ActorType.hpp b/include/Actor/ActorType.hpp index e9dc8318..0f711f0a 100644 --- a/include/Actor/ActorType.hpp +++ b/include/Actor/ActorType.hpp @@ -28,8 +28,9 @@ enum ActorTypeId_ { ActorTypeId_Heart = 'HART', ActorTypeId_Rupee = 'RUPY', - ActorTypeId_Bomb = 'BOMB', ActorTypeId_Arrow = 'ARRW', + ActorTypeId_Blast = 'BLST', + ActorTypeId_Bomb = 'BOMB', ActorTypeId_PlayerDummy = 'PLDM', ActorTypeId_PushBlock = 'PSBL', @@ -66,7 +67,6 @@ enum ActorTypeId_ { ActorTypeId_BIGR = 'BIGR', ActorTypeId_BKEY = 'BKEY', - ActorTypeId_BLST = 'BLST', ActorTypeId_BMRN = 'BMRN', ActorTypeId_BMTY = 'BMTY', ActorTypeId_BTRF = 'BTRF', diff --git a/include/Actor/Player/ActorArrow.hpp b/include/Actor/Player/ActorArrow.hpp new file mode 100644 index 00000000..031e35cc --- /dev/null +++ b/include/Actor/Player/ActorArrow.hpp @@ -0,0 +1,63 @@ +#pragma once + +#include "global.h" +#include "nds/math.h" +#include "types.h" + +#include "Actor/Actor.hpp" +#include "Actor/ActorType.hpp" +#include "Player/EquipRope.hpp" + +class ActorArrow : public Actor { +public: + static ActorType gType; + + /* 000 (base) */ + /* 158 */ Vec3p mUnk_158; + /* 164 */ ActorRef mUnk_164; + /* 16c */ unk32 mUnk_16c; + /* 170 */ unk8 mUnk_170[0x14]; + /* 184 */ void *mUnk_184; + /* 188 */ unk8 mUnk_188[0x4]; + /* 18c */ s32 mUnk_18c; + /* 190 */ s32 mUnk_190; + /* 194 */ s32 mUnk_194; + /* 198 */ s32 mUnk_198; + /* 19c */ unk32 mUnk_19c; + /* 1a0 */ unk32 mSpeed; + /* 1a4 */ unk32 mUnk_1a4; + /* 1a8 */ s32 mUnk_1a8; + /* 1ac */ unk16 mUnk_1ac; + /* 1ae */ s16 mUnk_1ae; + /* 1b0 */ s16 mUnk_1b0; + /* 1b2 */ unk16 mUnk_1b2; + /* 1b4 */ unk8 mUnk_1b4[0x3]; + /* 1b7 */ bool mUnk_1b7; + /* 1b8 */ + + /* 00 */ ~ActorArrow() override; + /* 08 */ bool vfunc_08() override; + /* 10 */ void vfunc_10(u32 param1) override; + /* 14 */ void vfunc_14(u32 param1) override; + /* 18 */ void vfunc_18(u32 param1) override; + /* 20 */ void vfunc_20(bool param1) override; + /* 44 */ bool CollidesWith(Actor *other) override; + /* 48 */ bool vfunc_48(Knockback *param1) override; + /* b4 */ + + static ActorArrow *Create(); + static void func_ov014_0211fd80(unk32 param1); + static void func_ov014_0211fd90(); + ActorArrow(); + void func_ov014_021200d4(); + void func_ov014_02120118(); + bool func_ov014_02120180(); + static EquipRope *GetEquipRope(); + void func_ov014_021207b8(ActorRef *ref, s32 param2, s32 param3); + void func_ov014_02120998(ActorRef *ref, q20 x, q20 y, q20 z, s16 param5); + void func_ov014_02120ac4(unk32 param1, bool param2); + void func_ov014_02120c98(Vec3p *param1); + void func_ov014_02120d58(); + void func_ov014_02120da8(); + bool func_ov014_02120dec(unk32 param1); +}; diff --git a/include/Actor/Player/ActorBlast.hpp b/include/Actor/Player/ActorBlast.hpp new file mode 100644 index 00000000..c7148755 --- /dev/null +++ b/include/Actor/Player/ActorBlast.hpp @@ -0,0 +1,59 @@ +#pragma once + +#include "global.h" +#include "nds/math.h" +#include "types.h" + +#include "Actor/Actor.hpp" +#include "Actor/ActorType.hpp" +#include "Unknown/UnkStruct_ov000_020beba8.hpp" + +class ActorBlast : public Actor { +public: + static ActorType gType; + + /* 000 (base) */ + /* 158 */ unk8 mUnk_158[0x4]; + /* 15c */ s32 mUnk_15c; + /* 160 */ s32 mUnk_160; + /* 164 */ + + /* 00 */ ~ActorBlast() override; + /* 08 */ bool vfunc_08() override; + /* 14 */ void vfunc_14(u32 param1) override; + /* 18 */ void vfunc_18(u32 param1) override; + /* b4 */ + + static ActorBlast *Create(); + ActorBlast(); +}; + +class ActorBlast_Unk1 : public UnkStruct_ov000_020beba8 { + /* 00 (base) */ + /* 0c */ ActorBlast *mBlast; + /* 10 */ Vec3p mUnk_10; + /* 1c */ unk8 mUnk_1c[0x18]; + /* 34 */ unk16 mUnk_34; + /* 36 */ unk16 mUnk_36; + /* 38 */ unk16 mUnk_38; + /* 3a */ unk16 mUnk_3a; + /* 3c */ unk16 mUnk_3c; + /* 3e */ unk8 mUnk_3e[0x20]; + /* 5e */ unk8 mUnk_5e; + /* 5f */ unk8 mUnk_5f; + /* 60 */ unk8 mUnk_60; + /* 61 */ unk8 mUnk_61; + /* 62 */ unk8 mUnk_62[0x6]; + /* 68 */ unk8 mUnk_68; + /* 69 */ unk8 mUnk_69; + /* 6a */ unk8 mUnk_6a; + /* 6b */ unk8 mUnk_6b; + /* 6c */ unk8 mUnk_6c; + /* 6d */ unk8 mUnk_6d; + /* 6e */ unk8 mUnk_6e[0x2]; + /* 70 */ + + /* 00 */ virtual ~ActorBlast_Unk1(); + /* 0c */ virtual void vfunc_0c(s32 *param1); + /* 18 */ +}; diff --git a/include/Actor/Player/ActorBomb.hpp b/include/Actor/Player/ActorBomb.hpp new file mode 100644 index 00000000..d2ba402c --- /dev/null +++ b/include/Actor/Player/ActorBomb.hpp @@ -0,0 +1,73 @@ +#pragma once + +#include "global.h" +#include "nds/math.h" +#include "types.h" + +#include "Actor/Actor.hpp" +#include "Actor/ActorType.hpp" +#include "Unknown/UnkStruct_ov000_020beba8.hpp" + +class ActorBomb_Unk1 : public UnkStruct_ov000_020beba8 { +public: + /* 00 (base) */ + /* 0c */ unk32 mUnk_0c; + /* 10 */ + + /* 00 */ ~ActorBomb_Unk1() override; + /* 08 */ void vfunc_08(unk16 *param1) override; + /* 0c */ void vfunc_0c(s32 *param1) override; + /* 18 */ +}; + +class ActorBomb_Unk2 { + /* 0 */ unk32 mUnk_0; + /* 4 */ unk32 mUnk_4; + /* 8 */ unk32 mUnk_8; + /* c */ + + ActorBomb_Unk2(); + ~ActorBomb_Unk2(); +}; + +class ActorBomb : public Actor { +public: + static ActorType gType; + + /* 000 (base) */ + /* 158 */ unk8 mUnk_158[0x7c]; + /* 1c4 */ unk32 mUnk_1c4; + /* 1c8 */ void *mUnk_1c8; + /* 1cc */ unk8 mUnk_1cc[0x24]; + /* 230 */ unk32 mUnk_230; + /* 234 */ unk32 mUnk_234; + /* 238 */ unk8 mUnk_238[0x4]; + /* 23c */ unk32 mUnk_23c; + /* 240 */ unk32 mUnk_240; + /* 244 */ unk32 mUnk_244; + /* 248 */ unk8 mUnk_248[0xc]; + /* 254 */ unk32 mUnk_254; + /* 258 */ unk32 mUnk_258; + /* 25c */ unk32 mUnk_25c; + /* 260 */ unk32 mUnk_260; + /* 264 */ unk8 mUnk_264[0x8]; + /* 26c */ + + /* 00 */ ~ActorBomb() override; + /* 08 */ bool vfunc_08() override; + /* 14 */ void vfunc_14(u32 param1) override; + /* 18 */ void vfunc_18(u32 param1) override; + /* 20 */ void vfunc_20(bool param1) override; + /* 54 */ void vfunc_54() override; + /* 5c */ bool SetVelocity(Vec3p *vel) override; + /* b4 */ + + static ActorBomb *Create(); + ActorBomb(); + bool func_ov014_02122bb8(s32 param1); + bool func_ov014_02122e48(unk32 *param1); + bool func_ov014_02122e7c(); + bool func_ov014_02122e98(); + bool func_ov014_02122eb8(); + bool func_ov014_02122ed4(); +}; diff --git a/include/Player/EquipBomb.hpp b/include/Player/EquipBomb.hpp index 9eb26ec9..4223adde 100644 --- a/include/Player/EquipBomb.hpp +++ b/include/Player/EquipBomb.hpp @@ -15,19 +15,17 @@ private: /* 24 */ public: - EquipBomb(); - - /* 00 */ virtual void vfunc_00() override; // func_ov55_02198d00 + /* 00 */ virtual void vfunc_00() override; /* 04 */ virtual ~EquipBomb() override; /* 0c */ virtual ItemFlag GetId() const override; - /* 14 */ virtual bool IsUsable(unk32 param1) const override; - /* 18 */ virtual void vfunc_18() override; // func_ov55_02198d8c - - /* 30 */ virtual void vfunc_30() override; // func_ov55_02198da4 - /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_ov55_2198df8 - /* 50 */ virtual void vfunc_50(); // func_ov14_0213d228 + /* 18 */ virtual void vfunc_18() override; + /* 30 */ virtual void vfunc_30() override; + /* 38 */ virtual void vfunc_38(unk32 param1) override; + /* 50 */ virtual unk32 vfunc_50(); /* 54 */ static void StopUsing(LinkStateItem *param1, unk32 param2); + + EquipBomb(); }; diff --git a/include/Player/EquipBombchu.hpp b/include/Player/EquipBombchu.hpp index 449e6512..eba684fb 100644 --- a/include/Player/EquipBombchu.hpp +++ b/include/Player/EquipBombchu.hpp @@ -2,15 +2,24 @@ #include "types.h" +#include "Actor/Actor.hpp" #include "Player/EquipItem.hpp" +struct EquipBombchu_Unk1 { + /* 0 */ unk8 mUnk_0; + /* 1 */ unk8 mUnk_1; + /* 2 */ + + EquipBombchu_Unk1(); +}; + class EquipBombchu : public EquipItem { private: /* 00 (base) */ /* 09 */ u8 mUnk_09[3]; /* 0c */ u8 mUnk_0c[0x0c]; /* 18 */ u32 mUnk_18; - /* 1c */ void *mUnk_1c; + /* 1c */ EquipBombchu_Unk1 *mUnk_1c; /* 20 */ void *mUnk_20; /* 24 */ u32 mUnk_24; /* 28 */ u32 mUnk_28; @@ -26,19 +35,24 @@ private: /* 4c */ public: - EquipBombchu(); - - /* 00 */ virtual void vfunc_00() override; // func_ov58_02198fc0 + /* 00 */ virtual void vfunc_00() override; /* 04 */ virtual ~EquipBombchu() override; /* 0c */ virtual ItemFlag GetId() const override; + /* 14 */ virtual bool IsUsable(unk32 param1) const override; + /* 18 */ virtual void vfunc_18() override; + /* 1c */ virtual void vfunc_1c() override; + /* 30 */ virtual void vfunc_30() override; + /* 34 */ virtual void vfunc_34(unk16 *param1) override; + /* 38 */ virtual void vfunc_38(unk32 param1) override; + /* 50 */ bool CheckUsable(unk32 param1) const; - /* 14 */ virtual bool IsUsable(unk32 param1) const override; - /* 18 */ virtual void vfunc_18() override; // func_ov58_0219903c - /* 1c */ virtual void vfunc_1c() override; // func_ov58_02199060 - /* 30 */ virtual void vfunc_30() override; // func_ov58_0219906c - /* 34 */ virtual void vfunc_34(unk16 *param1) override; // func_ov58_0213ecb4 - /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_ov58_02199170 - /* 50 */ + EquipBombchu(); + void func_ov014_0213eba4(); + void func_ov014_0213ec40(); + void func_ov014_0213ec64(); + Actor *func_ov014_0213ed74(); + void *func_ov014_0213ed94(s32 param1); + void func_ov014_0213eda0(); }; diff --git a/include/Player/EquipBoomerang.hpp b/include/Player/EquipBoomerang.hpp index 1fc97caa..d16b1fe0 100644 --- a/include/Player/EquipBoomerang.hpp +++ b/include/Player/EquipBoomerang.hpp @@ -25,15 +25,19 @@ private: public: /* 04 */ virtual ~EquipBoomerang() override; /* 0c */ virtual ItemFlag GetId() const override; - /* 10 */ virtual void vfunc_10() override; // func_ov14_0213d078 - + /* 10 */ virtual void vfunc_10() override; /* 14 */ virtual bool IsUsable(unk32 param1) const override; - /* 18 */ virtual void vfunc_18() override; // func_ov53_02199064 - /* 1c */ virtual void vfunc_1c() override; // func_ov53_021990d0 - - /* 30 */ virtual void vfunc_30() override; // func_ov53_0219913c - /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_ov53_02199318 + /* 18 */ virtual void vfunc_18() override; + /* 1c */ virtual void vfunc_1c() override; + /* 28 */ virtual bool UpdateInUse(unk32 param1) override; + /* 30 */ virtual void vfunc_30() override; + /* 38 */ virtual void vfunc_38(unk32 param1) override; /* 50 */ + EquipBoomerang(); + void func_ov014_0213d098(); + void func_ov014_0213d0bc(Vec3p *param1); Actor *GetActor(); + void func_ov014_0213d184(); + void func_ov014_0213d1b0(); }; diff --git a/include/Player/EquipBow.hpp b/include/Player/EquipBow.hpp index d9cf0433..3552fc30 100644 --- a/include/Player/EquipBow.hpp +++ b/include/Player/EquipBow.hpp @@ -15,16 +15,14 @@ private: /* 10 */ public: - EquipBow(); - - /* 00 */ virtual void vfunc_00() override; // func_ov56_02198d00 + /* 00 */ virtual void vfunc_00() override; /* 04 */ virtual ~EquipBow() override; /* 0c */ virtual ItemFlag GetId() const override; - /* 14 */ virtual bool IsUsable(unk32 param1) const override; - /* 18 */ virtual void vfunc_18() override; // func_ov56_02198d84 - - /* 30 */ virtual void vfunc_30() override; // func_ov56_02198de4 - /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_ov56_02198df8 + /* 18 */ virtual void vfunc_18() override; + /* 30 */ virtual void vfunc_30() override; + /* 38 */ virtual void vfunc_38(unk32 param1) override; /* 50 */ + + EquipBow(); }; diff --git a/include/Player/EquipHammer.hpp b/include/Player/EquipHammer.hpp index 9d3f0394..76149bee 100644 --- a/include/Player/EquipHammer.hpp +++ b/include/Player/EquipHammer.hpp @@ -21,22 +21,20 @@ private: /* 2c */ public: - EquipHammer(); - /* 04 */ virtual ~EquipHammer() override; /* 0c */ virtual ItemFlag GetId() const override; - /* 10 */ virtual void vfunc_10() override; // func_ov14_0213ee04 - + /* 10 */ virtual void vfunc_10() override; /* 14 */ virtual bool IsUsable(unk32 param1) const override; - /* 18 */ virtual void vfunc_18() override; // func_ov59_02198e3c - /* 1c */ virtual void vfunc_1c() override; // func_ov59_02198e58 - - /* 2c */ virtual u32 vfunc_2c() override; // func_ov59_02198fcc - /* 30 */ virtual void vfunc_30() override; // func_ov59_02198e6c - /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_0v59_02198fc8 - /* 3c */ virtual bool GetHitbox(Cylinder *hitbox) const override; // func_ov14_0213ee10 - /* 4c */ virtual s32 vfunc_4c() const override; // func_ov14_0213eea8 + /* 18 */ virtual void vfunc_18() override; + /* 1c */ virtual void vfunc_1c() override; + /* 2c */ virtual u32 vfunc_2c() override; + /* 30 */ virtual void vfunc_30() override; + /* 38 */ virtual void vfunc_38(unk32 param1) override; + /* 3c */ virtual bool GetHitbox(Cylinder *hitbox) const override; + /* 4c */ virtual s32 vfunc_4c() const override; /* 50 */ static void StopUsing(LinkStateItem *param1); + + EquipHammer(); }; diff --git a/include/Player/EquipPotion.hpp b/include/Player/EquipPotion.hpp index a80c0492..ea7d4434 100644 --- a/include/Player/EquipPotion.hpp +++ b/include/Player/EquipPotion.hpp @@ -12,34 +12,32 @@ private: /* 10 */ public: - EquipPotion(); - - /* 00 */ virtual void vfunc_00() override; // func_ov55_021991a8 + /* 00 */ virtual void vfunc_00() override; /* 04 */ virtual ~EquipPotion() override; - /* 14 */ virtual bool IsUsable(unk32 param1) const override; - /* 18 */ virtual void vfunc_18() override; // func_ov55_021991ac - /* 1c */ virtual void vfunc_1c() override; // func_ov55_021991b0 - - /* 30 */ virtual void vfunc_30() override; // func_ov55_02199274 - /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_0v55_02199278 + /* 18 */ virtual void vfunc_18() override; + /* 1c */ virtual void vfunc_1c() override; + /* 30 */ virtual void vfunc_30() override; + /* 38 */ virtual void vfunc_38(unk32 param1) override; /* 50 */ + + EquipPotion(); }; class EquipPotionA : public EquipPotion { public: - EquipPotionA(); - /* 04 */ virtual ~EquipPotionA() override; /* 0c */ virtual ItemFlag GetId() const override; /* 50 */ + + EquipPotionA(); }; class EquipPotionB : public EquipPotion { public: - EquipPotionB(); - /* 04 */ virtual ~EquipPotionB() override; /* 0c */ virtual ItemFlag GetId() const override; /* 50 */ + + EquipPotionB(); }; diff --git a/include/Player/EquipRope.hpp b/include/Player/EquipRope.hpp index 906f813b..6b7927b2 100644 --- a/include/Player/EquipRope.hpp +++ b/include/Player/EquipRope.hpp @@ -37,29 +37,47 @@ public: /* a0 */ unk32 mUnk_a0; /* a4 */ - EquipRope(); - /* 04 */ virtual ~EquipRope() override; /* 0c */ virtual ItemFlag GetId() const override; - /* 10 */ virtual void vfunc_10() override; // func_ov14_0213d3a0 - - u16 GetAmmo(); + /* 10 */ virtual void vfunc_10() override; /* 14 */ virtual bool IsUsable(unk32 param1) const override; - /* 18 */ virtual void vfunc_18() override; // func_ov57_021992f4 - /* 1c */ virtual void vfunc_1c() override; // func_ov57_0219935c - - /* 30 */ virtual void vfunc_30() override; // func_ov57_02199744 - /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_ov57_021998f0 + /* 18 */ virtual void vfunc_18() override; + /* 1c */ virtual void vfunc_1c() override; + /* 30 */ virtual void vfunc_30() override; + /* 38 */ virtual void vfunc_38(unk32 param1) override; /* 50 */ + u16 GetAmmo(); + + EquipRope(); + bool func_ov014_0213d3d4(Vec3p *vec); + void func_ov014_0213d404(unk32 *param1); Actor *func_ov14_0213d420(); s32 func_ov14_0213d440(s32 actorId); s32 func_ov14_0213d480(s32 actorId); + bool func_ov014_0213d4c8(); + bool func_ov014_0213d4ec(unk32 *param1, s32 param2); + s32 func_ov014_0213d594(s32 param1); + bool func_ov014_0213d5d0(unk32 *param1, s32 param2); + s32 func_ov014_0213d63c(s32 param1); + bool func_ov014_0213d684(); + bool func_ov014_0213d6e0(); + bool func_ov014_0213d71c(s32 param1, ActorRef *param2); + bool func_ov014_0213d788(s32 param1); bool func_ov14_0213d81c(s32 index, Vec3p *vec); void func_ov14_0213d91c(s32 index); + bool func_ov014_0213d9ac(); bool func_ov14_0213dadc(s32 index, Cylinder *cylinder); + void func_ov014_0213db34(); + void func_ov014_0213db60(); + void func_ov014_0213dba4(Vec3p *param1); + s32 func_ov014_0213dda0(); s32 func_ov14_0213ddd4(Actor *actor); bool func_ov14_0213defc(Actor *actor); + bool func_ov014_0213dfbc(Cylinder *cylinder, s32 param2, Vec3p *vec); + void func_ov014_0213e144(Vec3p *param1, Vec3p *param2, s32 param3); + bool func_ov014_0213e20c(s32 param1, Vec3p *param2); + bool func_ov014_0213e328(); static void StopUsing(LinkStateItem *param1); }; diff --git a/include/Player/EquipScoop.hpp b/include/Player/EquipScoop.hpp index 8c4694bc..dfc95103 100644 --- a/include/Player/EquipScoop.hpp +++ b/include/Player/EquipScoop.hpp @@ -13,19 +13,19 @@ private: /* c */ public: - /* 00 */ virtual void vfunc_00() override; // func_ov54_02198d00 + /* 00 */ virtual void vfunc_00() override; /* 04 */ virtual ~EquipScoop() override; /* 0c */ virtual ItemFlag GetId() const override; - /* 14 */ virtual bool IsUsable(unk32 param1) const override; - /* 18 */ virtual void vfunc_18() override; // func_0v54_02198d2c - - /* 30 */ virtual void vfunc_30() override; // func_ov54_02198e04 - /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_ov54_02198e4c - /* 40 */ virtual unk32 vfunc_40() const override; // func_ov54_02198d30 - /* 44 */ virtual unk32 vfunc_44(unk32 param1) const override; // func_ov54_02198d38 - /* 48 */ virtual unk32 vfunc_48(unk32 param1) const override; // func_ov54_02198d48 + /* 18 */ virtual void vfunc_18() override; + /* 30 */ virtual void vfunc_30() override; + /* 38 */ virtual void vfunc_38(unk32 param1) override; + /* 40 */ virtual unk32 vfunc_40() const override; + /* 44 */ virtual unk32 vfunc_44(unk32 param1) const override; + /* 48 */ virtual unk32 vfunc_48(unk32 param1) const override; /* 50 */ static void StopUsing(LinkStateItem *param1); + + EquipScoop(); }; diff --git a/include/Player/LinkStateFollow.hpp b/include/Player/LinkStateFollow.hpp index decf3abb..add6d456 100644 --- a/include/Player/LinkStateFollow.hpp +++ b/include/Player/LinkStateFollow.hpp @@ -40,6 +40,7 @@ public: LinkStateFollow(PlayerLinkBase *link); + static EquipRope *GetEquipRope(); void func_ov005_0210b9c4(); void func_ov005_0210ba98(); void func_ov005_0210babc(); diff --git a/include/Player/PlayerBase.hpp b/include/Player/PlayerBase.hpp index 893335bb..354e1078 100644 --- a/include/Player/PlayerBase.hpp +++ b/include/Player/PlayerBase.hpp @@ -32,7 +32,7 @@ public: /* 18 */ virtual void vfunc_18() = 0; /* 1c */ virtual void Init() = 0; /* 20 */ virtual void vfunc_20() = 0; - /* 24 */ virtual void vfunc_24() = 0; + /* 24 */ virtual void UpdatePos() = 0; /* 28 */ virtual void vfunc_28(s32 param1) = 0; /* 2c */ virtual void vfunc_2c(s32 param1, unk8 param2) = 0; /* 30 */ virtual bool vfunc_30(s32 param1, Vec3p *param2, s32 param3) = 0; diff --git a/include/Player/PlayerLink.hpp b/include/Player/PlayerLink.hpp new file mode 100644 index 00000000..497672d4 --- /dev/null +++ b/include/Player/PlayerLink.hpp @@ -0,0 +1,51 @@ +#pragma once + +#include "global.h" +#include "types.h" + +#include "DTCM/UnkStruct_027e0fd4.hpp" +#include "Player/LinkStateCutscene.hpp" +#include "Player/PlayerLinkBase.hpp" + +class PlayerLink : public PlayerLinkBase { +public: + /* 00 (base) */ + /* 70 */ s32 mUnk_70; + /* 74 */ unk8 mUnk_74[0x4]; + /* 78 */ unk32 mUnk_78; + /* 7c */ unk32 mUnk_7c; + /* 80 */ char mUnk_80; + /* 81 */ unk8 mUnk_81[0x3]; + /* 84 */ + + /* 00 */ s32 GetMaxHealth() override; + /* 04 */ bool vfunc_04() override; + /* 1c */ void Init() override; + /* 24 */ void UpdatePos() override; + /* 2c */ void vfunc_2c(s32 param1, unk8 param2) override; + /* 40 */ void AddHealth(s16 amount) override; + /* 44 */ void vfunc_44() override; + /* 48 */ void vfunc_48() override; + /* 4c */ void vfunc_4c() override; + /* 50 */ ~PlayerLink() override; + /* 68 */ void vfunc_68() override; + /* 6c */ void vfunc_6c() override; + /* 74 */ void vfunc_74() override; + /* 78 */ unk32 vfunc_78() override; + /* 7c */ void vfunc_7c() override; + /* 80 */ void SetUnk_5e() override; + /* 84 */ void ResetUnk_5e() override; + /* 88 */ virtual void OnDeath(bool param1); + /* 8c */ + + static PlayerLink *Create(); + static PlayerLink *GetInstance(); + void func_ov014_0213eef0(s32 param1); + static LinkStateCutscene *GetLinkStateCutscene(); + PlayerLink(); + void func_ov014_0213f37c(); + static LinkStateItem *GetLinkStateItem(); + static void func_ov014_0213f734(unk32 *param1, UnkStruct_027e0fd4 *param2); + void func_ov014_0213f740(); + void func_ov014_0213f97c(); +}; diff --git a/include/Player/PlayerLinkBase.hpp b/include/Player/PlayerLinkBase.hpp index 8d97676c..4732e63f 100644 --- a/include/Player/PlayerLinkBase.hpp +++ b/include/Player/PlayerLinkBase.hpp @@ -53,7 +53,7 @@ public: /* 18 */ void vfunc_18(s32 param1) override; /* 1c */ void Init() override; /* 20 */ void vfunc_20() override; - /* 24 */ void vfunc_24() override; + /* 24 */ void UpdatePos() override; /* 28 */ void vfunc_28(s32 param1) override; /* 2c */ void vfunc_2c(s32 param1, unk8 param2) override; /* 30 */ bool vfunc_30(s32 param1, Vec3p *param2, s32 param3) override; diff --git a/include/Unknown/UnkStruct_ov000_020beba8.hpp b/include/Unknown/UnkStruct_ov000_020beba8.hpp new file mode 100644 index 00000000..5edcbe59 --- /dev/null +++ b/include/Unknown/UnkStruct_ov000_020beba8.hpp @@ -0,0 +1,22 @@ +#pragma once + +#include "global.h" +#include "types.h" + +class UnkStruct_ov000_020beba8 { +public: + /* 0 (vtable) */ + /* 4 */ unk32 mUnk_4; + /* 8 */ unk32 mUnk_8; + /* c */ + + /* 00 */ virtual ~UnkStruct_ov000_020beba8(); + /* 04 */ virtual void vfunc_04(unk16 *param1); + /* 08 */ virtual void vfunc_08(unk16 *param1); + /* 0c */ virtual void vfunc_0c(s32 *param1); + /* 10 */ virtual void vfunc_10(u16 *param1); + /* 14 */ virtual void vfunc_14(s32 *param1); + /* 18 */ + + UnkStruct_ov000_020beba8(unk32 param1); +}; diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp index d72307f4..3944a710 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -556,7 +556,7 @@ ARM bool Actor::func_ov00_020c243c(ActorTypeId *actorTypes, Actor **out) { } break; case ActorTypeId_Bomb: - case ActorTypeId_BLST: + case ActorTypeId_Blast: case ActorTypeId_BMTY: case ActorTypeId_CBLS: { knockback.mUnk_10 = 6; diff --git a/src/00_Core/Player/LinkStateItem.cpp b/src/00_Core/Player/LinkStateItem.cpp index eb4ad1ed..bb6c8f08 100644 --- a/src/00_Core/Player/LinkStateItem.cpp +++ b/src/00_Core/Player/LinkStateItem.cpp @@ -40,7 +40,7 @@ ARM void LinkStateItem::OnStateLeave(s32 param1) { case ItemFlag_BombchuBag: iVar3 = data_027e103c->func_ov000_020cf01c(); if (*(u8 *) (iVar3 + 0xe0) == '\0') { - func_ov014_0213ec64((s32) GetEquipBombchu()); + GetEquipBombchu()->func_ov014_0213ec64(); } func_ov014_0211fd04(data_027e1098); break; diff --git a/src/00_Core/Unknown/UnkStruct_ov000_020beba8.cpp b/src/00_Core/Unknown/UnkStruct_ov000_020beba8.cpp new file mode 100644 index 00000000..8830b4c1 --- /dev/null +++ b/src/00_Core/Unknown/UnkStruct_ov000_020beba8.cpp @@ -0,0 +1,9 @@ +#include "Unknown/UnkStruct_ov000_020beba8.hpp" + +UnkStruct_ov000_020beba8::UnkStruct_ov000_020beba8(unk32 param1) {} +void UnkStruct_ov000_020beba8::vfunc_04(unk16 *param1) {} +void UnkStruct_ov000_020beba8::vfunc_08(unk16 *param1) {} +void UnkStruct_ov000_020beba8::vfunc_0c(s32 *param1) {} +void UnkStruct_ov000_020beba8::vfunc_14(s32 *param1) {} +void UnkStruct_ov000_020beba8::vfunc_10(u16 *param1) {} +UnkStruct_ov000_020beba8::~UnkStruct_ov000_020beba8() {} diff --git a/src/05/Player/LinkStateFollow.cpp b/src/05/Player/LinkStateFollow.cpp index 7ad2d7e9..7b1dda53 100644 --- a/src/05/Player/LinkStateFollow.cpp +++ b/src/05/Player/LinkStateFollow.cpp @@ -2,7 +2,7 @@ #include "Player/LinkStateCutscene.hpp" void LinkStateFollow::OnStateEnter() {} -EquipRope *GetEquipRope() {} +EquipRope *LinkStateFollow::GetEquipRope() {} void LinkStateFollow::vfunc_1c() {} void LinkStateFollow::func_ov005_0210b9c4() {} void LinkStateFollow::func_ov005_0210ba98() {} diff --git a/src/14_Land/Actor/Player/ActorArrow.cpp b/src/14_Land/Actor/Player/ActorArrow.cpp new file mode 100644 index 00000000..48d27797 --- /dev/null +++ b/src/14_Land/Actor/Player/ActorArrow.cpp @@ -0,0 +1,34 @@ +#include "Actor/Player/ActorArrow.hpp" +#include "Player/EquipShield.hpp" +#include "Unknown/UnkStruct_ov000_020beba8.hpp" + +ActorType ActorArrow::gType = ActorType(ActorTypeId_Arrow, (ActorCreateFunc) ActorArrow::Create, NULL); + +UnkStruct_ov000_020beba8 data_ov014_0215abec = UnkStruct_ov000_020beba8(0); + +ActorArrow *ActorArrow::Create() {} +void ActorArrow::func_ov014_0211fd80(unk32 param1) {} +void ActorArrow::func_ov014_0211fd90() {} +ActorArrow::ActorArrow() {} +ActorArrow::~ActorArrow() {} +bool ActorArrow::vfunc_08() {} +bool ActorArrow::CollidesWith(Actor *other) {} +void ActorArrow::func_ov014_021200d4() {} +void ActorArrow::func_ov014_02120118() {} +bool ActorArrow::func_ov014_02120180() {} +EquipRope *ActorArrow::GetEquipRope() {} +void ActorArrow::vfunc_14(u32 param1) {} +void func_ov014_02120774(u32 *param1, s32 param2) {} +void ActorArrow::vfunc_18(u32 param1) {} +void ActorArrow::vfunc_10(u32 param1) {} +void ActorArrow::func_ov014_021207b8(ActorRef *ref, s32 param2, s32 param3) {} +void ActorArrow::func_ov014_02120998(ActorRef *ref, q20 x, q20 y, q20 z, s16 param5) {} +void func_ov014_02120a80(s32 param1, ActorArrow *arrow) {} +void ActorArrow::func_ov014_02120ac4(unk32 param1, bool param2) {} +void ActorArrow::func_ov014_02120c98(Vec3p *param1) {} +void ActorArrow::func_ov014_02120d58() {} +void ActorArrow::func_ov014_02120da8() {} +bool ActorArrow::func_ov014_02120dec(unk32 param1) {} +bool ActorArrow::vfunc_48(Knockback *param1) {} +EquipShield *GetEquipShield() {} +void ActorArrow::vfunc_20(bool param1) {} \ No newline at end of file diff --git a/src/14_Land/Actor/Player/ActorBlast.cpp b/src/14_Land/Actor/Player/ActorBlast.cpp new file mode 100644 index 00000000..f8369b18 --- /dev/null +++ b/src/14_Land/Actor/Player/ActorBlast.cpp @@ -0,0 +1,12 @@ +#include "Actor/Player/ActorBlast.hpp" + +ActorType ActorBlast::gType = ActorType(ActorTypeId_Blast, (ActorCreateFunc) ActorBlast::Create, NULL); + +ActorBlast *ActorBlast::Create() {} +void ActorBlast_Unk1::vfunc_0c(s32 *param1) {} +ActorBlast::ActorBlast() {} +ActorBlast::~ActorBlast() {} +bool ActorBlast::vfunc_08() {} +void ActorBlast::vfunc_14(u32 param1) {} +ActorBlast_Unk1::~ActorBlast_Unk1() {} +void ActorBlast::vfunc_18(u32 param1) {} diff --git a/src/14_Land/Actor/Player/ActorBomb.cpp b/src/14_Land/Actor/Player/ActorBomb.cpp new file mode 100644 index 00000000..62454cce --- /dev/null +++ b/src/14_Land/Actor/Player/ActorBomb.cpp @@ -0,0 +1,24 @@ +#include "Actor/Player/ActorBomb.hpp" + +ActorType ActorBomb::gType = ActorType(ActorTypeId_Bomb, (ActorCreateFunc) ActorBomb::Create, NULL); + +ActorBomb *ActorBomb::Create() {} +void ActorBomb_Unk1::vfunc_08(unk16 *param1) {} +void ActorBomb_Unk1::vfunc_0c(s32 *param1) {} +ActorBomb::ActorBomb() {} +ActorBomb_Unk2::~ActorBomb_Unk2() {} +ActorBomb::~ActorBomb() {} +ActorBomb_Unk2::ActorBomb_Unk2() {} +bool ActorBomb::vfunc_08() {} +void ActorBomb::vfunc_14(u32 param1) {} +ActorBomb_Unk1::~ActorBomb_Unk1() {} +void ActorBomb::vfunc_18(u32 param1) {} +bool ActorBomb::func_ov014_02122bb8(s32 param1) {} +void ActorBomb::vfunc_54() {} +void ActorBomb::vfunc_20(bool param1) {} +bool ActorBomb::SetVelocity(Vec3p *vel) {} +bool ActorBomb::func_ov014_02122e48(unk32 *param1) {} +bool ActorBomb::func_ov014_02122e7c() {} +bool ActorBomb::func_ov014_02122e98() {} +bool ActorBomb::func_ov014_02122eb8() {} +bool ActorBomb::func_ov014_02122ed4() {} diff --git a/src/14_Land/Player/EquipBomb.cpp b/src/14_Land/Player/EquipBomb.cpp new file mode 100644 index 00000000..12efed6b --- /dev/null +++ b/src/14_Land/Player/EquipBomb.cpp @@ -0,0 +1,6 @@ +#include "Player/EquipBomb.hpp" + +EquipBomb::EquipBomb() {} +ItemFlag EquipBomb::GetId() const {} +EquipBomb::~EquipBomb() {} +unk32 EquipBomb::vfunc_50() {} diff --git a/src/14_Land/Player/EquipBombchu.cpp b/src/14_Land/Player/EquipBombchu.cpp new file mode 100644 index 00000000..5ebfe5b8 --- /dev/null +++ b/src/14_Land/Player/EquipBombchu.cpp @@ -0,0 +1,13 @@ +#include "Player/EquipBombchu.hpp" + +EquipBombchu::EquipBombchu() {} +EquipBombchu_Unk1::EquipBombchu_Unk1() {} +EquipBombchu::~EquipBombchu() {} +void EquipBombchu::func_ov014_0213eba4() {} +void EquipBombchu::func_ov014_0213ec40() {} +void EquipBombchu::func_ov014_0213ec64() {} +ItemFlag EquipBombchu::GetId() const {} +void EquipBombchu::vfunc_34(unk16 *param1) {} +Actor *EquipBombchu::func_ov014_0213ed74() {} +void *EquipBombchu::func_ov014_0213ed94(s32 param1) {} +void EquipBombchu::func_ov014_0213eda0() {} diff --git a/src/14_Land/Player/EquipBoomerang.cpp b/src/14_Land/Player/EquipBoomerang.cpp new file mode 100644 index 00000000..004379f4 --- /dev/null +++ b/src/14_Land/Player/EquipBoomerang.cpp @@ -0,0 +1,12 @@ +#include "Player/EquipBoomerang.hpp" + +EquipBoomerang::EquipBoomerang() {} +EquipBoomerang::~EquipBoomerang() {} +bool EquipBoomerang::UpdateInUse(unk32 param1) {} +void EquipBoomerang::vfunc_10() {} +void EquipBoomerang::func_ov014_0213d098() {} +void EquipBoomerang::func_ov014_0213d0bc(Vec3p *param1) {} +Actor *EquipBoomerang::GetActor() {} +ItemFlag EquipBoomerang::GetId() const {} +void EquipBoomerang::func_ov014_0213d184() {} +void EquipBoomerang::func_ov014_0213d1b0() {} diff --git a/src/14_Land/Player/EquipBow.cpp b/src/14_Land/Player/EquipBow.cpp new file mode 100644 index 00000000..609985b6 --- /dev/null +++ b/src/14_Land/Player/EquipBow.cpp @@ -0,0 +1,5 @@ +#include "Player/EquipBow.hpp" + +EquipBow::EquipBow() {} +EquipBow::~EquipBow() {} +ItemFlag EquipBow::GetId() const {} diff --git a/src/14_Land/Player/EquipHammer.cpp b/src/14_Land/Player/EquipHammer.cpp new file mode 100644 index 00000000..6a59f82a --- /dev/null +++ b/src/14_Land/Player/EquipHammer.cpp @@ -0,0 +1,8 @@ +#include "Player/EquipHammer.hpp" + +EquipHammer::EquipHammer() {} +EquipHammer::~EquipHammer() {} +void EquipHammer::vfunc_10() {} +ItemFlag EquipHammer::GetId() const {} +bool EquipHammer::GetHitbox(Cylinder *hitbox) const {} +s32 EquipHammer::vfunc_4c() const {} diff --git a/src/14_Land/Player/EquipPotion.cpp b/src/14_Land/Player/EquipPotion.cpp new file mode 100644 index 00000000..7cf51cf7 --- /dev/null +++ b/src/14_Land/Player/EquipPotion.cpp @@ -0,0 +1,11 @@ +#include "Player/EquipPotion.hpp" + +EquipPotion::EquipPotion() {} +EquipPotion::~EquipPotion() {} +EquipPotionA::EquipPotionA() {} +EquipPotionA::~EquipPotionA() {} +ItemFlag EquipPotionA::GetId() const {} +EquipPotionB::EquipPotionB() {} +EquipPotionB::~EquipPotionB() {} +ItemFlag EquipPotionB::GetId() const {} +bool EquipPotion::IsUsable(unk32 param1) const {} diff --git a/src/14_Land/Player/EquipRope.cpp b/src/14_Land/Player/EquipRope.cpp new file mode 100644 index 00000000..ee5c2da8 --- /dev/null +++ b/src/14_Land/Player/EquipRope.cpp @@ -0,0 +1,40 @@ +#include "Player/EquipRope.hpp" + +void func_ov014_0213d230(unk32 param1, s32 param2) {} +bool func_ov013_0213d248(s32 param1) {} +EquipRope::EquipRope() {} +void func_ov014_0213d2e8() {} +void func_ov014_0213d2ec(s32 param1) {} +EquipRope::~EquipRope() {} +void EquipRope::vfunc_10() {} +ItemFlag EquipRope::GetId() const {} +bool EquipRope::func_ov014_0213d3d4(Vec3p *vec) {} +void EquipRope::func_ov014_0213d404(unk32 *param1) {} +Actor *EquipRope::func_ov14_0213d420() {} +s32 EquipRope::func_ov14_0213d440(s32 actorId) {} +s32 EquipRope::func_ov14_0213d480(s32 actorId) {} +bool EquipRope::func_ov014_0213d4c8() {} +bool EquipRope::func_ov014_0213d4ec(unk32 *param1, s32 param2) {} +s32 EquipRope::func_ov014_0213d594(s32 param1) {} +bool EquipRope::func_ov014_0213d5d0(unk32 *param1, s32 param2) {} +s32 EquipRope::func_ov014_0213d63c(s32 param1) {} +bool EquipRope::func_ov014_0213d684() {} +bool EquipRope::func_ov014_0213d6e0() {} +bool EquipRope::func_ov014_0213d71c(s32 param1, ActorRef *param2) {} +bool EquipRope::func_ov014_0213d788(s32 param1) {} +bool EquipRope::func_ov14_0213d81c(s32 index, Vec3p *vec) {} +void EquipRope::func_ov14_0213d91c(s32 index) {} +bool EquipRope::func_ov014_0213d9ac() {} +bool EquipRope::func_ov14_0213dadc(s32 index, Cylinder *cylinder) {} +void EquipRope::func_ov014_0213db34() {} +void EquipRope::func_ov014_0213db60() {} +void EquipRope::func_ov014_0213dba4(Vec3p *param1) {} +s32 EquipRope::func_ov014_0213dda0() {} +s32 EquipRope::func_ov14_0213ddd4(Actor *actor) {} +bool EquipRope::func_ov14_0213defc(Actor *actor) {} +bool EquipRope::func_ov014_0213dfbc(Cylinder *cylinder, s32 param2, Vec3p *vec) {} +void EquipRope::func_ov014_0213e144(Vec3p *param1, Vec3p *param2, s32 param3) {} +bool EquipRope::func_ov014_0213e20c(s32 param1, Vec3p *param2) {} +bool EquipRope::func_ov014_0213e328() {} +void func_ov014_0213e544(s32 param1, unk32 param2) {} +void func_ov014_0213e55c(unk32 *param1) {} diff --git a/src/14_Land/Player/EquipScoop.cpp b/src/14_Land/Player/EquipScoop.cpp new file mode 100644 index 00000000..12cf112e --- /dev/null +++ b/src/14_Land/Player/EquipScoop.cpp @@ -0,0 +1,5 @@ +#include "Player/EquipScoop.hpp" + +EquipScoop::EquipScoop() {} +EquipScoop::~EquipScoop() {} +ItemFlag EquipScoop::GetId() const {} diff --git a/src/14_Land/Player/PlayerLink.cpp b/src/14_Land/Player/PlayerLink.cpp new file mode 100644 index 00000000..3de34d13 --- /dev/null +++ b/src/14_Land/Player/PlayerLink.cpp @@ -0,0 +1,24 @@ +#include "Player/PlayerLink.hpp" + +PlayerLink *PlayerLink::Create() {} +PlayerLink *PlayerLink::GetInstance() {} +void PlayerLink::func_ov014_0213eef0(s32 param1) {} +LinkStateCutscene *PlayerLink::GetLinkStateCutscene() {} +PlayerLink::PlayerLink() {} +PlayerLink::~PlayerLink() {} +void PlayerLink::Init() {} +bool PlayerLink::vfunc_04() {} +unk32 PlayerLink::vfunc_78() {} +void PlayerLink::ResetUnk_5e() {} +void PlayerLink::vfunc_2c(s32 param1, unk8 param2) {} +void PlayerLink::UpdatePos() {} +void PlayerLink::func_ov014_0213f37c() {} +void PlayerLink::vfunc_74() {} +void PlayerLink::OnDeath(bool param1) {} +void PlayerLink::vfunc_7c() {} +void PlayerLink::AddHealth(s16 amount) {} +void PlayerLink::vfunc_68() {} +LinkStateItem *PlayerLink::GetLinkStateItem() {} +void PlayerLink::func_ov014_0213f734(unk32 *param1, UnkStruct_027e0fd4 *param2) {} +void PlayerLink::func_ov014_0213f740() {} +void PlayerLink::func_ov014_0213f97c() {}