From d6021854d0f8de4c11059aec7bb086d00b8fba40 Mon Sep 17 00:00:00 2001 From: Aetias Date: Fri, 24 Jan 2025 21:29:43 +0100 Subject: [PATCH] Move ov000 function names from Ghidra --- config/eur/arm9/overlays/ov000/symbols.txt | 278 ++++++++++----------- config/usa/arm9/overlays/ov000/symbols.txt | 278 ++++++++++----------- include/DTCM/UnkStruct_027e103c.hpp | 85 ++++++- src/00_Core/DTCM/UnkStruct_027e103c.cpp | 82 ++++++ src/00_Core/Player/LinkStateItem.cpp | 11 +- 5 files changed, 449 insertions(+), 285 deletions(-) create mode 100644 src/00_Core/DTCM/UnkStruct_027e103c.cpp diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 001cc1b7..b9b705e6 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -2966,7 +2966,7 @@ func_ov000_020c4010 kind:function(arm,size=0x4) addr:0x20c4010 func_ov000_020c4014 kind:function(arm,size=0x4) addr:0x20c4014 func_ov000_020c4018 kind:function(arm,size=0x4) addr:0x20c4018 func_ov000_020c401c kind:function(arm,size=0x2c) addr:0x20c401c -func_ov000_020c4048 kind:function(arm,size=0x290) addr:0x20c4048 +SpawnNpc kind:function(arm,size=0x290) addr:0x20c4048 func_ov000_020c42d8 kind:function(arm,size=0x14) addr:0x20c42d8 func_ov000_020c42ec kind:function(arm,size=0x30) addr:0x20c42ec func_ov000_020c431c kind:function(arm,size=0x6c) addr:0x20c431c @@ -3174,7 +3174,7 @@ func_ov000_020ca470 kind:function(arm,size=0x74) addr:0x20ca470 func_ov000_020ca4e4 kind:function(arm,size=0x11c) addr:0x20ca4e4 func_ov000_020ca600 kind:function(arm,size=0x54) addr:0x20ca600 func_ov000_020ca654 kind:function(arm,size=0x14) addr:0x20ca654 -func_ov000_020ca668 kind:function(arm,size=0x180) addr:0x20ca668 +_ZN14ActorEnemyBaseC1Ev kind:function(arm,size=0x180) addr:0x20ca668 func_ov000_020ca7e8 kind:function(arm,size=0x4c) addr:0x20ca7e8 func_ov000_020ca834 kind:function(arm,size=0xc) addr:0x20ca834 func_ov000_020ca840 kind:function(arm,size=0x64) addr:0x20ca840 @@ -3334,86 +3334,86 @@ func_ov000_020cef10 kind:function(arm,size=0x18) addr:0x20cef10 func_ov000_020cef28 kind:function(arm,size=0x18) addr:0x20cef28 func_ov000_020cef40 kind:function(arm,size=0x10) addr:0x20cef40 func_ov000_020cef50 kind:function(arm,size=0x4c) addr:0x20cef50 -func_ov000_020cef9c kind:function(arm,size=0x20) addr:0x20cef9c -func_ov000_020cefbc kind:function(arm,size=0x20) addr:0x20cefbc -func_ov000_020cefdc kind:function(arm,size=0x20) addr:0x20cefdc -func_ov000_020ceffc kind:function(arm,size=0x20) addr:0x20ceffc -_Z19func_ov000_020cf01cPi kind:function(arm,size=0x20) addr:0x20cf01c -func_ov000_020cf03c kind:function(arm,size=0x20) addr:0x20cf03c -func_ov000_020cf05c kind:function(arm,size=0x20) addr:0x20cf05c -func_ov000_020cf07c kind:function(arm,size=0x20) addr:0x20cf07c -func_ov000_020cf09c kind:function(arm,size=0x20) addr:0x20cf09c -func_ov000_020cf0bc kind:function(arm,size=0x20) addr:0x20cf0bc -func_ov000_020cf0dc kind:function(arm,size=0x20) addr:0x20cf0dc -func_ov000_020cf0fc kind:function(arm,size=0x20) addr:0x20cf0fc -func_ov000_020cf11c kind:function(arm,size=0x20) addr:0x20cf11c -func_ov000_020cf13c kind:function(arm,size=0x7c) addr:0x20cf13c -func_ov000_020cf1b8 kind:function(arm,size=0x1c) addr:0x20cf1b8 -func_ov000_020cf1d4 kind:function(arm,size=0x38) addr:0x20cf1d4 -func_ov000_020cf20c kind:function(arm,size=0x18) addr:0x20cf20c -func_ov000_020cf224 kind:function(arm,size=0x14) addr:0x20cf224 -func_ov000_020cf238 kind:function(arm,size=0x38) addr:0x20cf238 -func_ov000_020cf270 kind:function(arm,size=0x14) addr:0x20cf270 -func_ov000_020cf284 kind:function(arm,size=0x1c) addr:0x20cf284 -func_ov000_020cf2a0 kind:function(arm,size=0x18) addr:0x20cf2a0 -func_ov000_020cf2b8 kind:function(arm,size=0x20) addr:0x20cf2b8 -func_ov000_020cf2d8 kind:function(arm,size=0x20) addr:0x20cf2d8 -func_ov000_020cf2f8 kind:function(arm,size=0x38) addr:0x20cf2f8 -func_ov000_020cf330 kind:function(arm,size=0x18) addr:0x20cf330 -func_ov000_020cf348 kind:function(arm,size=0x2c) addr:0x20cf348 -func_ov000_020cf374 kind:function(arm,size=0x10) addr:0x20cf374 -func_ov000_020cf384 kind:function(arm,size=0x14) addr:0x20cf384 -func_ov000_020cf398 kind:function(arm,size=0x20) addr:0x20cf398 -func_ov000_020cf3b8 kind:function(arm,size=0x10) addr:0x20cf3b8 -func_ov000_020cf3c8 kind:function(arm,size=0x14) addr:0x20cf3c8 -func_ov000_020cf3dc kind:function(arm,size=0x14) addr:0x20cf3dc -func_ov000_020cf3f0 kind:function(arm,size=0x14) addr:0x20cf3f0 -func_ov000_020cf404 kind:function(arm,size=0x10) addr:0x20cf404 -func_ov000_020cf414 kind:function(arm,size=0x18) addr:0x20cf414 -func_ov000_020cf42c kind:function(arm,size=0x18) addr:0x20cf42c -func_ov000_020cf444 kind:function(arm,size=0x44) addr:0x20cf444 -func_ov000_020cf488 kind:function(arm,size=0x34) addr:0x20cf488 -func_ov000_020cf4bc kind:function(arm,size=0x1c) addr:0x20cf4bc -func_ov000_020cf4d8 kind:function(arm,size=0x1c) addr:0x20cf4d8 -func_ov000_020cf4f4 kind:function(arm,size=0x24) addr:0x20cf4f4 -func_ov000_020cf518 kind:function(arm,size=0x1c) addr:0x20cf518 -func_ov000_020cf534 kind:function(arm,size=0x1c) addr:0x20cf534 -func_ov000_020cf550 kind:function(arm,size=0x128) addr:0x20cf550 -func_ov000_020cf678 kind:function(arm,size=0xd8) addr:0x20cf678 -func_ov000_020cf750 kind:function(arm,size=0x74) addr:0x20cf750 -func_ov000_020cf7c4 kind:function(arm,size=0x24) addr:0x20cf7c4 -func_ov000_020cf7e8 kind:function(arm,size=0x7c) addr:0x20cf7e8 -func_ov000_020cf864 kind:function(arm,size=0x98) addr:0x20cf864 -func_ov000_020cf8fc kind:function(arm,size=0x4c) addr:0x20cf8fc -func_ov000_020cf948 kind:function(arm,size=0x94) addr:0x20cf948 -_Z19func_ov000_020cf9dciii kind:function(arm,size=0x48) addr:0x20cf9dc -func_ov000_020cfa24 kind:function(arm,size=0x40) addr:0x20cfa24 -func_ov000_020cfa64 kind:function(arm,size=0xc) addr:0x20cfa64 -func_ov000_020cfa70 kind:function(arm,size=0x40) addr:0x20cfa70 -func_ov000_020cfab0 kind:function(arm,size=0xc) addr:0x20cfab0 -func_ov000_020cfabc kind:function(arm,size=0x2c) addr:0x20cfabc -func_ov000_020cfae8 kind:function(arm,size=0x38) addr:0x20cfae8 -func_ov000_020cfb20 kind:function(arm,size=0x18) addr:0x20cfb20 -func_ov000_020cfb38 kind:function(arm,size=0x10) addr:0x20cfb38 -func_ov000_020cfb48 kind:function(arm,size=0x10) addr:0x20cfb48 -func_ov000_020cfb58 kind:function(arm,size=0x10) addr:0x20cfb58 -func_ov000_020cfb68 kind:function(arm,size=0x1c) addr:0x20cfb68 -func_ov000_020cfb84 kind:function(arm,size=0x10) addr:0x20cfb84 -func_ov000_020cfb94 kind:function(arm,size=0x1c) addr:0x20cfb94 -func_ov000_020cfbb0 kind:function(arm,size=0x28) addr:0x20cfbb0 -func_ov000_020cfbd8 kind:function(arm,size=0x18) addr:0x20cfbd8 -func_ov000_020cfbf0 kind:function(arm,size=0x30) addr:0x20cfbf0 -func_ov000_020cfc20 kind:function(arm,size=0x24) addr:0x20cfc20 -func_ov000_020cfc44 kind:function(arm,size=0x2c) addr:0x20cfc44 -func_ov000_020cfc70 kind:function(arm,size=0x2c) addr:0x20cfc70 -func_ov000_020cfc9c kind:function(arm,size=0x50) addr:0x20cfc9c -func_ov000_020cfcec kind:function(arm,size=0xc) addr:0x20cfcec -func_ov000_020cfcf8 kind:function(arm,size=0xec) addr:0x20cfcf8 -func_ov000_020cfde4 kind:function(arm,size=0x2c) addr:0x20cfde4 -func_ov000_020cfe10 kind:function(arm,size=0x30) addr:0x20cfe10 -func_ov000_020cfe40 kind:function(arm,size=0x34) addr:0x20cfe40 -func_ov000_020cfe74 kind:function(arm,size=0x34) addr:0x20cfe74 -func_ov000_020cfea8 kind:function(arm,size=0x28) addr:0x20cfea8 +_ZN18UnkStruct_027e103c19func_ov000_020cef9cEv kind:function(arm,size=0x20) addr:0x20cef9c +_ZN18UnkStruct_027e103c19func_ov000_020cefbcEv kind:function(arm,size=0x20) addr:0x20cefbc +_ZN18UnkStruct_027e103c19func_ov000_020cefdcEv kind:function(arm,size=0x20) addr:0x20cefdc +_ZN18UnkStruct_027e103c19func_ov000_020ceffcEv kind:function(arm,size=0x20) addr:0x20ceffc +_ZN18UnkStruct_027e103c19func_ov000_020cf01cEv kind:function(arm,size=0x20) addr:0x20cf01c +_ZN18UnkStruct_027e103c19func_ov000_020cf03cEv kind:function(arm,size=0x20) addr:0x20cf03c +_ZN18UnkStruct_027e103c19func_ov000_020cf05cEv kind:function(arm,size=0x20) addr:0x20cf05c +_ZN18UnkStruct_027e103c19func_ov000_020cf07cEv kind:function(arm,size=0x20) addr:0x20cf07c +_ZN18UnkStruct_027e103c19func_ov000_020cf09cEv kind:function(arm,size=0x20) addr:0x20cf09c +_ZN18UnkStruct_027e103c19func_ov000_020cf0bcEv kind:function(arm,size=0x20) addr:0x20cf0bc +_ZN18UnkStruct_027e103c19func_ov000_020cf0dcEv kind:function(arm,size=0x20) addr:0x20cf0dc +_ZN18UnkStruct_027e103c19func_ov000_020cf0fcEv kind:function(arm,size=0x20) addr:0x20cf0fc +_ZN18UnkStruct_027e103c19func_ov000_020cf11cEv kind:function(arm,size=0x20) addr:0x20cf11c +_ZN18UnkStruct_027e103c19func_ov000_020cf13cEi kind:function(arm,size=0x7c) addr:0x20cf13c +_ZN18UnkStruct_027e103c19func_ov000_020cf1b8Ev kind:function(arm,size=0x1c) addr:0x20cf1b8 +_ZN18UnkStruct_027e103c19func_ov000_020cf1d4Ei kind:function(arm,size=0x38) addr:0x20cf1d4 +_ZN18UnkStruct_027e103c19func_ov000_020cf20cEv kind:function(arm,size=0x18) addr:0x20cf20c +_ZN18UnkStruct_027e103c19func_ov000_020cf224Ei kind:function(arm,size=0x14) addr:0x20cf224 +_ZN18UnkStruct_027e103c19func_ov000_020cf238Eii kind:function(arm,size=0x38) addr:0x20cf238 +_ZN18UnkStruct_027e103c19func_ov000_020cf270Et kind:function(arm,size=0x14) addr:0x20cf270 +_ZN18UnkStruct_027e103c19func_ov000_020cf284Eti kind:function(arm,size=0x1c) addr:0x20cf284 +_ZN18UnkStruct_027e103c19func_ov000_020cf2a0Ej kind:function(arm,size=0x18) addr:0x20cf2a0 +_ZN18UnkStruct_027e103c19func_ov000_020cf2b8Ev kind:function(arm,size=0x20) addr:0x20cf2b8 +_ZN18UnkStruct_027e103c19func_ov000_020cf2d8Ev kind:function(arm,size=0x20) addr:0x20cf2d8 +_ZN18UnkStruct_027e103c19func_ov000_020cf2f8Ev kind:function(arm,size=0x38) addr:0x20cf2f8 +_ZN18UnkStruct_027e103c19func_ov000_020cf330Ev kind:function(arm,size=0x18) addr:0x20cf330 +_ZN18UnkStruct_027e103c19func_ov000_020cf348Ev kind:function(arm,size=0x2c) addr:0x20cf348 +_ZN18UnkStruct_027e103c19func_ov000_020cf374Eb kind:function(arm,size=0x10) addr:0x20cf374 +_ZN18UnkStruct_027e103c19func_ov000_020cf384Ev kind:function(arm,size=0x14) addr:0x20cf384 +_ZN18UnkStruct_027e103c19func_ov000_020cf398Ev kind:function(arm,size=0x20) addr:0x20cf398 +_ZN18UnkStruct_027e103c19func_ov000_020cf3b8Ev kind:function(arm,size=0x10) addr:0x20cf3b8 +_ZN18UnkStruct_027e103c19func_ov000_020cf3c8Ev kind:function(arm,size=0x14) addr:0x20cf3c8 +_ZN18UnkStruct_027e103c19func_ov000_020cf3dcEv kind:function(arm,size=0x14) addr:0x20cf3dc +_ZN18UnkStruct_027e103c19func_ov000_020cf3f0Ev kind:function(arm,size=0x14) addr:0x20cf3f0 +_ZN18UnkStruct_027e103c19func_ov000_020cf404Ev kind:function(arm,size=0x10) addr:0x20cf404 +_ZN18UnkStruct_027e103c19func_ov000_020cf414Ev kind:function(arm,size=0x18) addr:0x20cf414 +_ZN18UnkStruct_027e103c19func_ov000_020cf42cEv kind:function(arm,size=0x18) addr:0x20cf42c +_ZN18UnkStruct_027e103c19func_ov000_020cf444Ev kind:function(arm,size=0x44) addr:0x20cf444 +_ZN18UnkStruct_027e103c19func_ov000_020cf488Ev kind:function(arm,size=0x34) addr:0x20cf488 +_ZN18UnkStruct_027e103c19func_ov000_020cf4bcEv kind:function(arm,size=0x1c) addr:0x20cf4bc +_ZN18UnkStruct_027e103c19func_ov000_020cf4d8Ev kind:function(arm,size=0x1c) addr:0x20cf4d8 +_ZN18UnkStruct_027e103c19func_ov000_020cf4f4Ev kind:function(arm,size=0x24) addr:0x20cf4f4 +_ZN18UnkStruct_027e103c19func_ov000_020cf518Ev kind:function(arm,size=0x1c) addr:0x20cf518 +_ZN18UnkStruct_027e103c19func_ov000_020cf534Ev kind:function(arm,size=0x1c) addr:0x20cf534 +_ZN18UnkStruct_027e103c19func_ov000_020cf550Ev kind:function(arm,size=0x128) addr:0x20cf550 +_ZN18UnkStruct_027e103c19func_ov000_020cf678Ev kind:function(arm,size=0xd8) addr:0x20cf678 +_ZN18UnkStruct_027e103c19func_ov000_020cf750Ev kind:function(arm,size=0x74) addr:0x20cf750 +_ZN18UnkStruct_027e103c19func_ov000_020cf7c4Ev kind:function(arm,size=0x24) addr:0x20cf7c4 +_ZN18UnkStruct_027e103c19func_ov000_020cf7e8Ev kind:function(arm,size=0x7c) addr:0x20cf7e8 +_ZN18UnkStruct_027e103c19func_ov000_020cf864Ej kind:function(arm,size=0x98) addr:0x20cf864 +_ZN18UnkStruct_027e103c19func_ov000_020cf8fcEj kind:function(arm,size=0x4c) addr:0x20cf8fc +_ZN18UnkStruct_027e103c19func_ov000_020cf948Ev kind:function(arm,size=0x94) addr:0x20cf948 +_ZN18UnkStruct_027e103c19func_ov000_020cf9dcEii kind:function(arm,size=0x48) addr:0x20cf9dc +_ZN18UnkStruct_027e103c19func_ov000_020cfa24Eii kind:function(arm,size=0x40) addr:0x20cfa24 +_ZN18UnkStruct_027e103c19func_ov000_020cfa64Ev kind:function(arm,size=0xc) addr:0x20cfa64 +_ZN18UnkStruct_027e103c19func_ov000_020cfa70Eii kind:function(arm,size=0x40) addr:0x20cfa70 +_ZN18UnkStruct_027e103c19func_ov000_020cfab0Ev kind:function(arm,size=0xc) addr:0x20cfab0 +_ZN18UnkStruct_027e103c19func_ov000_020cfabcEii kind:function(arm,size=0x2c) addr:0x20cfabc +_ZN18UnkStruct_027e103c19func_ov000_020cfae8Eii kind:function(arm,size=0x38) addr:0x20cfae8 +_ZN18UnkStruct_027e103c19func_ov000_020cfb20Ei kind:function(arm,size=0x18) addr:0x20cfb20 +_ZN18UnkStruct_027e103c19func_ov000_020cfb38Ev kind:function(arm,size=0x10) addr:0x20cfb38 +_ZN18UnkStruct_027e103c19func_ov000_020cfb48Ev kind:function(arm,size=0x10) addr:0x20cfb48 +_ZN18UnkStruct_027e103c19func_ov000_020cfb58Ev kind:function(arm,size=0x10) addr:0x20cfb58 +_ZN18UnkStruct_027e103c19func_ov000_020cfb68Ev kind:function(arm,size=0x1c) addr:0x20cfb68 +_ZN18UnkStruct_027e103c19func_ov000_020cfb84Ev kind:function(arm,size=0x10) addr:0x20cfb84 +_ZN18UnkStruct_027e103c19func_ov000_020cfb94Ev kind:function(arm,size=0x1c) addr:0x20cfb94 +_ZN18UnkStruct_027e103c19func_ov000_020cfbb0Ev kind:function(arm,size=0x28) addr:0x20cfbb0 +_ZN18UnkStruct_027e103c19func_ov000_020cfbd8Ec kind:function(arm,size=0x18) addr:0x20cfbd8 +_ZN18UnkStruct_027e103c19func_ov000_020cfbf0Eiii kind:function(arm,size=0x30) addr:0x20cfbf0 +_ZN18UnkStruct_027e103c19func_ov000_020cfc20Ev kind:function(arm,size=0x24) addr:0x20cfc20 +_ZN18UnkStruct_027e103c19func_ov000_020cfc44Ei kind:function(arm,size=0x2c) addr:0x20cfc44 +_ZN18UnkStruct_027e103c19func_ov000_020cfc70Ei kind:function(arm,size=0x2c) addr:0x20cfc70 +_ZN18UnkStruct_027e103c19func_ov000_020cfc9cEii kind:function(arm,size=0x50) addr:0x20cfc9c +_ZN18UnkStruct_027e103c19func_ov000_020cfcecEv kind:function(arm,size=0xc) addr:0x20cfcec +_ZN18UnkStruct_027e103c19func_ov000_020cfcf8Ev kind:function(arm,size=0xec) addr:0x20cfcf8 +_ZN18UnkStruct_027e103c19func_ov000_020cfde4Ei kind:function(arm,size=0x2c) addr:0x20cfde4 +_ZN18UnkStruct_027e103c19func_ov000_020cfe10Ec kind:function(arm,size=0x30) addr:0x20cfe10 +_ZN18UnkStruct_027e103c19func_ov000_020cfe40Eci kind:function(arm,size=0x34) addr:0x20cfe40 +_ZN18UnkStruct_027e103c19func_ov000_020cfe74Eii kind:function(arm,size=0x34) addr:0x20cfe74 +_ZN18UnkStruct_027e103c19func_ov000_020cfea8Ev kind:function(arm,size=0x28) addr:0x20cfea8 func_ov000_020cfed0 kind:function(arm,size=0x4c) addr:0x20cfed0 func_ov000_020cff1c kind:function(arm,size=0x70) addr:0x20cff1c func_ov000_020cff8c kind:function(arm,size=0x74) addr:0x20cff8c @@ -3551,7 +3551,7 @@ func_ov000_020d387c kind:function(arm,size=0x78) addr:0x20d387c func_ov000_020d38f4 kind:function(arm,size=0xc) addr:0x20d38f4 func_ov000_020d3900 kind:function(arm,size=0xc) addr:0x20d3900 func_ov000_020d390c kind:function(arm,size=0x4) addr:0x20d390c -func_ov000_020d3910 kind:function(arm,size=0x34) addr:0x20d3910 +_ZN12ActorMSGBaseC1Ev kind:function(arm,size=0x34) addr:0x20d3910 func_ov000_020d3944 kind:function(arm,size=0x14) addr:0x20d3944 func_ov000_020d3958 kind:function(arm,size=0x1c) addr:0x20d3958 func_ov000_020d3974 kind:function(arm,size=0x14) addr:0x20d3974 @@ -3591,7 +3591,7 @@ func_ov000_020d433c kind:function(arm,size=0x20) addr:0x20d433c func_ov000_020d435c kind:function(arm,size=0x14) addr:0x20d435c func_ov000_020d4370 kind:function(arm,size=0x1c) addr:0x20d4370 func_ov000_020d438c kind:function(arm,size=0x88) addr:0x20d438c -func_ov000_020d4414 kind:function(arm,size=0x34) addr:0x20d4414 +_ZN20ActorDungeonItemBaseC1Ev kind:function(arm,size=0x34) addr:0x20d4414 func_ov000_020d4448 kind:function(arm,size=0x14) addr:0x20d4448 func_ov000_020d445c kind:function(arm,size=0x1c) addr:0x20d445c func_ov000_020d4478 kind:function(arm,size=0x14) addr:0x20d4478 @@ -4021,62 +4021,62 @@ data_ov000_020df2ec kind:data(any) addr:0x20df2ec data_ov000_020df2f8 kind:data(any) addr:0x20df2f8 data_ov000_020df31c kind:data(any) addr:0x20df31c data_ov000_020df330 kind:data(any) addr:0x20df330 -func_ov000_020df338 kind:function(arm,size=0x14) addr:0x20df338 -func_ov000_020df34c kind:function(arm,size=0x2c) addr:0x20df34c -func_ov000_020df378 kind:function(arm,size=0x14) addr:0x20df378 -func_ov000_020df38c kind:function(arm,size=0x2c) addr:0x20df38c -func_ov000_020df3b8 kind:function(arm,size=0x14) addr:0x20df3b8 -func_ov000_020df3cc kind:function(arm,size=0x14) addr:0x20df3cc -func_ov000_020df3e0 kind:function(arm,size=0x14) addr:0x20df3e0 -func_ov000_020df3f4 kind:function(arm,size=0x2c) addr:0x20df3f4 -func_ov000_020df420 kind:function(arm,size=0x3c) addr:0x20df420 -func_ov000_020df45c kind:function(arm,size=0x14) addr:0x20df45c -func_ov000_020df470 kind:function(arm,size=0x34) addr:0x20df470 -func_ov000_020df4a4 kind:function(arm,size=0x14) addr:0x20df4a4 -func_ov000_020df4b8 kind:function(arm,size=0x14) addr:0x20df4b8 -func_ov000_020df4cc kind:function(arm,size=0x174) addr:0x20df4cc -func_ov000_020df640 kind:function(arm,size=0x38) addr:0x20df640 +__sinit_ov000_020df338 kind:function(arm,size=0x14) addr:0x20df338 +__sinit_ov000_020df34c kind:function(arm,size=0x2c) addr:0x20df34c +__sinit_ov000_020df378 kind:function(arm,size=0x14) addr:0x20df378 +__sinit_ov000_020df38c kind:function(arm,size=0x2c) addr:0x20df38c +__sinit_ov000_020df3b8 kind:function(arm,size=0x14) addr:0x20df3b8 +__sinit_ov000_020df3cc kind:function(arm,size=0x14) addr:0x20df3cc +__sinit_ov000_020df3e0 kind:function(arm,size=0x14) addr:0x20df3e0 +__sinit_ov000_020df3f4 kind:function(arm,size=0x2c) addr:0x20df3f4 +__sinit_ov000_020df420 kind:function(arm,size=0x3c) addr:0x20df420 +__sinit_ov000_020df45c kind:function(arm,size=0x14) addr:0x20df45c +__sinit_ov000_020df470 kind:function(arm,size=0x34) addr:0x20df470 +__sinit_ov000_020df4a4 kind:function(arm,size=0x14) addr:0x20df4a4 +__sinit_ov000_020df4b8 kind:function(arm,size=0x14) addr:0x20df4b8 +__sinit_ov000_020df4cc kind:function(arm,size=0x174) addr:0x20df4cc +__sinit_ov000_020df640 kind:function(arm,size=0x38) addr:0x20df640 __sinit_ActorSwitchObject.cpp kind:function(arm,size=0x40) addr:0x20df678 -func_ov000_020df6b8 kind:function(arm,size=0x40) addr:0x20df6b8 -func_ov000_020df6f8 kind:function(arm,size=0x40) addr:0x20df6f8 -func_ov000_020df738 kind:function(arm,size=0x38) addr:0x20df738 -func_ov000_020df770 kind:function(arm,size=0x20) addr:0x20df770 -func_ov000_020df790 kind:function(arm,size=0x1718) addr:0x20df790 -func_ov000_020e0ea8 kind:function(arm,size=0x188) addr:0x20e0ea8 -func_ov000_020e1030 kind:function(arm,size=0x2c) addr:0x20e1030 -func_ov000_020e105c kind:function(arm,size=0x40) addr:0x20e105c -func_ov000_020e109c kind:function(arm,size=0x38) addr:0x20e109c -func_ov000_020e10d4 kind:function(arm,size=0x40) addr:0x20e10d4 -func_ov000_020e1114 kind:function(arm,size=0x14) addr:0x20e1114 -func_ov000_020e1128 kind:function(arm,size=0xb0) addr:0x20e1128 -func_ov000_020e11d8 kind:function(arm,size=0x34) addr:0x20e11d8 -func_ov000_020e120c kind:function(arm,size=0x44) addr:0x20e120c -func_ov000_020e1250 kind:function(arm,size=0x40) addr:0x20e1250 -func_ov000_020e1290 kind:function(arm,size=0x48) addr:0x20e1290 -func_ov000_020e12d8 kind:function(arm,size=0x64) addr:0x20e12d8 -func_ov000_020e133c kind:function(arm,size=0x40) addr:0x20e133c -func_ov000_020e137c kind:function(arm,size=0x798) addr:0x20e137c -func_ov000_020e1b14 kind:function(arm,size=0x40) addr:0x20e1b14 -func_ov000_020e1b54 kind:function(arm,size=0x40) addr:0x20e1b54 -func_ov000_020e1b94 kind:function(arm,size=0x40) addr:0x20e1b94 -func_ov000_020e1bd4 kind:function(arm,size=0x40) addr:0x20e1bd4 -func_ov000_020e1c14 kind:function(arm,size=0x40) addr:0x20e1c14 -func_ov000_020e1c54 kind:function(arm,size=0x14) addr:0x20e1c54 -func_ov000_020e1c68 kind:function(arm,size=0x24) addr:0x20e1c68 -func_ov000_020e1c8c kind:function(arm,size=0x40) addr:0x20e1c8c -func_ov000_020e1ccc kind:function(arm,size=0x40) addr:0x20e1ccc -func_ov000_020e1d0c kind:function(arm,size=0x40) addr:0x20e1d0c -func_ov000_020e1d4c kind:function(arm,size=0x30) addr:0x20e1d4c -func_ov000_020e1d7c kind:function(arm,size=0x2c) addr:0x20e1d7c -func_ov000_020e1da8 kind:function(arm,size=0x40) addr:0x20e1da8 -func_ov000_020e1de8 kind:function(arm,size=0x14) addr:0x20e1de8 -func_ov000_020e1dfc kind:function(arm,size=0x14) addr:0x20e1dfc -func_ov000_020e1e10 kind:function(arm,size=0x14) addr:0x20e1e10 -func_ov000_020e1e24 kind:function(arm,size=0x14) addr:0x20e1e24 -func_ov000_020e1e38 kind:function(arm,size=0x14) addr:0x20e1e38 -func_ov000_020e1e4c kind:function(arm,size=0x14) addr:0x20e1e4c -func_ov000_020e1e60 kind:function(arm,size=0x14) addr:0x20e1e60 -func_ov000_020e1e74 kind:function(arm,size=0x14) addr:0x20e1e74 +__sinit_ov000_020df6b8 kind:function(arm,size=0x40) addr:0x20df6b8 +__sinit_ov000_020df6f8 kind:function(arm,size=0x40) addr:0x20df6f8 +__sinit_ov000_020df738 kind:function(arm,size=0x38) addr:0x20df738 +__sinit_ov000_020df770 kind:function(arm,size=0x20) addr:0x20df770 +__sinit_ov000_020df790 kind:function(arm,size=0x1718) addr:0x20df790 +__sinit_ov000_020e0ea8 kind:function(arm,size=0x188) addr:0x20e0ea8 +__sinit_ov000_020e1030 kind:function(arm,size=0x2c) addr:0x20e1030 +__sinit_ov000_020e105c kind:function(arm,size=0x40) addr:0x20e105c +__sinit_ov000_020e109c kind:function(arm,size=0x38) addr:0x20e109c +__sinit_ov000_020e10d4 kind:function(arm,size=0x40) addr:0x20e10d4 +__sinit_ov000_020e1114 kind:function(arm,size=0x14) addr:0x20e1114 +__sinit_ov000_020e1128 kind:function(arm,size=0xb0) addr:0x20e1128 +__sinit_ov000_020e11d8 kind:function(arm,size=0x34) addr:0x20e11d8 +__sinit_ov000_020e120c kind:function(arm,size=0x44) addr:0x20e120c +__sinit_ov000_020e1250 kind:function(arm,size=0x40) addr:0x20e1250 +__sinit_ov000_020e1290 kind:function(arm,size=0x48) addr:0x20e1290 +__sinit_ov000_020e12d8 kind:function(arm,size=0x64) addr:0x20e12d8 +__sinit_ov000_020e133c kind:function(arm,size=0x40) addr:0x20e133c +__sinit_ov000_020e137c kind:function(arm,size=0x798) addr:0x20e137c +__sinit_ov000_020e1b14 kind:function(arm,size=0x40) addr:0x20e1b14 +__sinit_ov000_020e1b54 kind:function(arm,size=0x40) addr:0x20e1b54 +__sinit_ov000_020e1b94 kind:function(arm,size=0x40) addr:0x20e1b94 +__sinit_ov000_020e1bd4 kind:function(arm,size=0x40) addr:0x20e1bd4 +__sinit_ov000_020e1c14 kind:function(arm,size=0x40) addr:0x20e1c14 +__sinit_ov000_020e1c54 kind:function(arm,size=0x14) addr:0x20e1c54 +__sinit_ov000_020e1c68 kind:function(arm,size=0x24) addr:0x20e1c68 +__sinit_ov000_020e1c8c kind:function(arm,size=0x40) addr:0x20e1c8c +__sinit_ov000_020e1ccc kind:function(arm,size=0x40) addr:0x20e1ccc +__sinit_ov000_020e1d0c kind:function(arm,size=0x40) addr:0x20e1d0c +__sinit_ov000_020e1d4c kind:function(arm,size=0x30) addr:0x20e1d4c +__sinit_ov000_020e1d7c kind:function(arm,size=0x2c) addr:0x20e1d7c +__sinit_ov000_020e1da8 kind:function(arm,size=0x40) addr:0x20e1da8 +__sinit_ov000_020e1de8 kind:function(arm,size=0x14) addr:0x20e1de8 +__sinit_ov000_020e1dfc kind:function(arm,size=0x14) addr:0x20e1dfc +__sinit_ov000_020e1e10 kind:function(arm,size=0x14) addr:0x20e1e10 +__sinit_ov000_020e1e24 kind:function(arm,size=0x14) addr:0x20e1e24 +__sinit_ov000_020e1e38 kind:function(arm,size=0x14) addr:0x20e1e38 +__sinit_ov000_020e1e4c kind:function(arm,size=0x14) addr:0x20e1e4c +__sinit_ov000_020e1e60 kind:function(arm,size=0x14) addr:0x20e1e60 +__sinit_ov000_020e1e74 kind:function(arm,size=0x14) addr:0x20e1e74 data_ov000_020e1f80 kind:data(any) addr:0x20e1f80 data_ov000_020e1fa4 kind:data(any) addr:0x20e1fa4 data_ov000_020e1fb4 kind:data(any) addr:0x20e1fb4 diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 0eaacff1..e2891d82 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -2868,7 +2868,7 @@ func_ov000_020c4010 kind:function(arm,size=0x4) addr:0x20c3fb0 func_ov000_020c4014 kind:function(arm,size=0x4) addr:0x20c3fb4 func_ov000_020c4018 kind:function(arm,size=0x4) addr:0x20c3fb8 func_ov000_020c401c kind:function(arm,size=0x2c) addr:0x20c3fbc -func_ov000_020c4048 kind:function(arm,size=0x290) addr:0x20c3fe8 +SpawnNpc kind:function(arm,size=0x290) addr:0x20c3fe8 func_ov000_020c42d8 kind:function(arm,size=0x14) addr:0x20c4278 func_ov000_020c42ec kind:function(arm,size=0x30) addr:0x20c428c func_ov000_020c431c kind:function(arm,size=0x6c) addr:0x20c42bc @@ -3076,7 +3076,7 @@ func_ov000_020ca470 kind:function(arm,size=0x74) addr:0x20ca410 func_ov000_020ca4e4 kind:function(arm,size=0x11c) addr:0x20ca484 func_ov000_020ca600 kind:function(arm,size=0x54) addr:0x20ca5a0 func_ov000_020ca654 kind:function(arm,size=0x14) addr:0x20ca5f4 -func_ov000_020ca668 kind:function(arm,size=0x180) addr:0x20ca608 +_ZN14ActorEnemyBaseC1Ev kind:function(arm,size=0x180) addr:0x20ca608 func_ov000_020ca7e8 kind:function(arm,size=0x4c) addr:0x20ca788 func_ov000_020ca834 kind:function(arm,size=0xc) addr:0x20ca7d4 func_ov000_020ca840 kind:function(arm,size=0x64) addr:0x20ca7e0 @@ -3236,86 +3236,86 @@ func_ov000_020cef10 kind:function(arm,size=0x18) addr:0x20ceeb0 func_ov000_020cef28 kind:function(arm,size=0x18) addr:0x20ceec8 func_ov000_020cef40 kind:function(arm,size=0x10) addr:0x20ceee0 func_ov000_020cef50 kind:function(arm,size=0x4c) addr:0x20ceef0 -func_ov000_020cef9c kind:function(arm,size=0x20) addr:0x20cef3c -func_ov000_020cefbc kind:function(arm,size=0x20) addr:0x20cef5c -func_ov000_020cefdc kind:function(arm,size=0x20) addr:0x20cef7c -func_ov000_020ceffc kind:function(arm,size=0x20) addr:0x20cef9c -_Z19func_ov000_020cf01cPi kind:function(arm,size=0x20) addr:0x20cefbc -func_ov000_020cf03c kind:function(arm,size=0x20) addr:0x20cefdc -func_ov000_020cf05c kind:function(arm,size=0x20) addr:0x20ceffc -func_ov000_020cf07c kind:function(arm,size=0x20) addr:0x20cf01c -func_ov000_020cf09c kind:function(arm,size=0x20) addr:0x20cf03c -func_ov000_020cf0bc kind:function(arm,size=0x20) addr:0x20cf05c -func_ov000_020cf0dc kind:function(arm,size=0x20) addr:0x20cf07c -func_ov000_020cf0fc kind:function(arm,size=0x20) addr:0x20cf09c -func_ov000_020cf11c kind:function(arm,size=0x20) addr:0x20cf0bc -func_ov000_020cf13c kind:function(arm,size=0x7c) addr:0x20cf0dc -func_ov000_020cf1b8 kind:function(arm,size=0x1c) addr:0x20cf158 -func_ov000_020cf1d4 kind:function(arm,size=0x38) addr:0x20cf174 -func_ov000_020cf20c kind:function(arm,size=0x18) addr:0x20cf1ac -func_ov000_020cf224 kind:function(arm,size=0x14) addr:0x20cf1c4 -func_ov000_020cf238 kind:function(arm,size=0x38) addr:0x20cf1d8 -func_ov000_020cf270 kind:function(arm,size=0x14) addr:0x20cf210 -func_ov000_020cf284 kind:function(arm,size=0x1c) addr:0x20cf224 -func_ov000_020cf2a0 kind:function(arm,size=0x18) addr:0x20cf240 -func_ov000_020cf2b8 kind:function(arm,size=0x20) addr:0x20cf258 -func_ov000_020cf2d8 kind:function(arm,size=0x20) addr:0x20cf278 -func_ov000_020cf2f8 kind:function(arm,size=0x38) addr:0x20cf298 -func_ov000_020cf330 kind:function(arm,size=0x18) addr:0x20cf2d0 -func_ov000_020cf348 kind:function(arm,size=0x2c) addr:0x20cf2e8 -func_ov000_020cf374 kind:function(arm,size=0x10) addr:0x20cf314 -func_ov000_020cf384 kind:function(arm,size=0x14) addr:0x20cf324 -func_ov000_020cf398 kind:function(arm,size=0x20) addr:0x20cf338 -func_ov000_020cf3b8 kind:function(arm,size=0x10) addr:0x20cf358 -func_ov000_020cf3c8 kind:function(arm,size=0x14) addr:0x20cf368 -func_ov000_020cf3dc kind:function(arm,size=0x14) addr:0x20cf37c -func_ov000_020cf3f0 kind:function(arm,size=0x14) addr:0x20cf390 -func_ov000_020cf404 kind:function(arm,size=0x10) addr:0x20cf3a4 -func_ov000_020cf414 kind:function(arm,size=0x18) addr:0x20cf3b4 -func_ov000_020cf42c kind:function(arm,size=0x18) addr:0x20cf3cc -func_ov000_020cf444 kind:function(arm,size=0x44) addr:0x20cf3e4 -func_ov000_020cf488 kind:function(arm,size=0x34) addr:0x20cf428 -func_ov000_020cf4bc kind:function(arm,size=0x1c) addr:0x20cf45c -func_ov000_020cf4d8 kind:function(arm,size=0x1c) addr:0x20cf478 -func_ov000_020cf4f4 kind:function(arm,size=0x24) addr:0x20cf494 -func_ov000_020cf518 kind:function(arm,size=0x1c) addr:0x20cf4b8 -func_ov000_020cf534 kind:function(arm,size=0x1c) addr:0x20cf4d4 -func_ov000_020cf550 kind:function(arm,size=0x128) addr:0x20cf4f0 -func_ov000_020cf678 kind:function(arm,size=0xd8) addr:0x20cf618 -func_ov000_020cf750 kind:function(arm,size=0x74) addr:0x20cf6f0 -func_ov000_020cf7c4 kind:function(arm,size=0x24) addr:0x20cf764 -func_ov000_020cf7e8 kind:function(arm,size=0x7c) addr:0x20cf788 -func_ov000_020cf864 kind:function(arm,size=0x98) addr:0x20cf804 -func_ov000_020cf8fc kind:function(arm,size=0x4c) addr:0x20cf89c -func_ov000_020cf948 kind:function(arm,size=0x94) addr:0x20cf8e8 -_Z19func_ov000_020cf9dciii kind:function(arm,size=0x48) addr:0x20cf97c -func_ov000_020cfa24 kind:function(arm,size=0x40) addr:0x20cf9c4 -func_ov000_020cfa64 kind:function(arm,size=0xc) addr:0x20cfa04 -func_ov000_020cfa70 kind:function(arm,size=0x40) addr:0x20cfa10 -func_ov000_020cfab0 kind:function(arm,size=0xc) addr:0x20cfa50 -func_ov000_020cfabc kind:function(arm,size=0x2c) addr:0x20cfa5c -func_ov000_020cfae8 kind:function(arm,size=0x38) addr:0x20cfa88 -func_ov000_020cfb20 kind:function(arm,size=0x18) addr:0x20cfac0 -func_ov000_020cfb38 kind:function(arm,size=0x10) addr:0x20cfad8 -func_ov000_020cfb48 kind:function(arm,size=0x10) addr:0x20cfae8 -func_ov000_020cfb58 kind:function(arm,size=0x10) addr:0x20cfaf8 -func_ov000_020cfb68 kind:function(arm,size=0x1c) addr:0x20cfb08 -func_ov000_020cfb84 kind:function(arm,size=0x10) addr:0x20cfb24 -func_ov000_020cfb94 kind:function(arm,size=0x1c) addr:0x20cfb34 -func_ov000_020cfbb0 kind:function(arm,size=0x28) addr:0x20cfb50 -func_ov000_020cfbd8 kind:function(arm,size=0x18) addr:0x20cfb78 -func_ov000_020cfbf0 kind:function(arm,size=0x30) addr:0x20cfb90 -func_ov000_020cfc20 kind:function(arm,size=0x24) addr:0x20cfbc0 -func_ov000_020cfc44 kind:function(arm,size=0x2c) addr:0x20cfbe4 -func_ov000_020cfc70 kind:function(arm,size=0x2c) addr:0x20cfc10 -func_ov000_020cfc9c kind:function(arm,size=0x50) addr:0x20cfc3c -func_ov000_020cfcec kind:function(arm,size=0xc) addr:0x20cfc8c -func_ov000_020cfcf8 kind:function(arm,size=0xec) addr:0x20cfc98 -func_ov000_020cfde4 kind:function(arm,size=0x2c) addr:0x20cfd84 -func_ov000_020cfe10 kind:function(arm,size=0x30) addr:0x20cfdb0 -func_ov000_020cfe40 kind:function(arm,size=0x34) addr:0x20cfde0 -func_ov000_020cfe74 kind:function(arm,size=0x34) addr:0x20cfe14 -func_ov000_020cfea8 kind:function(arm,size=0x28) addr:0x20cfe48 +_ZN18UnkStruct_027e103c19func_ov000_020cef9cEv kind:function(arm,size=0x20) addr:0x20cef3c +_ZN18UnkStruct_027e103c19func_ov000_020cefbcEv kind:function(arm,size=0x20) addr:0x20cef5c +_ZN18UnkStruct_027e103c19func_ov000_020cefdcEv kind:function(arm,size=0x20) addr:0x20cef7c +_ZN18UnkStruct_027e103c19func_ov000_020ceffcEv kind:function(arm,size=0x20) addr:0x20cef9c +_ZN18UnkStruct_027e103c19func_ov000_020cf01cEv kind:function(arm,size=0x20) addr:0x20cefbc +_ZN18UnkStruct_027e103c19func_ov000_020cf03cEv kind:function(arm,size=0x20) addr:0x20cefdc +_ZN18UnkStruct_027e103c19func_ov000_020cf05cEv kind:function(arm,size=0x20) addr:0x20ceffc +_ZN18UnkStruct_027e103c19func_ov000_020cf07cEv kind:function(arm,size=0x20) addr:0x20cf01c +_ZN18UnkStruct_027e103c19func_ov000_020cf09cEv kind:function(arm,size=0x20) addr:0x20cf03c +_ZN18UnkStruct_027e103c19func_ov000_020cf0bcEv kind:function(arm,size=0x20) addr:0x20cf05c +_ZN18UnkStruct_027e103c19func_ov000_020cf0dcEv kind:function(arm,size=0x20) addr:0x20cf07c +_ZN18UnkStruct_027e103c19func_ov000_020cf0fcEv kind:function(arm,size=0x20) addr:0x20cf09c +_ZN18UnkStruct_027e103c19func_ov000_020cf11cEv kind:function(arm,size=0x20) addr:0x20cf0bc +_ZN18UnkStruct_027e103c19func_ov000_020cf13cEi kind:function(arm,size=0x7c) addr:0x20cf0dc +_ZN18UnkStruct_027e103c19func_ov000_020cf1b8Ev kind:function(arm,size=0x1c) addr:0x20cf158 +_ZN18UnkStruct_027e103c19func_ov000_020cf1d4Ei kind:function(arm,size=0x38) addr:0x20cf174 +_ZN18UnkStruct_027e103c19func_ov000_020cf20cEv kind:function(arm,size=0x18) addr:0x20cf1ac +_ZN18UnkStruct_027e103c19func_ov000_020cf224Ei kind:function(arm,size=0x14) addr:0x20cf1c4 +_ZN18UnkStruct_027e103c19func_ov000_020cf238Eii kind:function(arm,size=0x38) addr:0x20cf1d8 +_ZN18UnkStruct_027e103c19func_ov000_020cf270Et kind:function(arm,size=0x14) addr:0x20cf210 +_ZN18UnkStruct_027e103c19func_ov000_020cf284Eti kind:function(arm,size=0x1c) addr:0x20cf224 +_ZN18UnkStruct_027e103c19func_ov000_020cf2a0Ej kind:function(arm,size=0x18) addr:0x20cf240 +_ZN18UnkStruct_027e103c19func_ov000_020cf2b8Ev kind:function(arm,size=0x20) addr:0x20cf258 +_ZN18UnkStruct_027e103c19func_ov000_020cf2d8Ev kind:function(arm,size=0x20) addr:0x20cf278 +_ZN18UnkStruct_027e103c19func_ov000_020cf2f8Ev kind:function(arm,size=0x38) addr:0x20cf298 +_ZN18UnkStruct_027e103c19func_ov000_020cf330Ev kind:function(arm,size=0x18) addr:0x20cf2d0 +_ZN18UnkStruct_027e103c19func_ov000_020cf348Ev kind:function(arm,size=0x2c) addr:0x20cf2e8 +_ZN18UnkStruct_027e103c19func_ov000_020cf374Eb kind:function(arm,size=0x10) addr:0x20cf314 +_ZN18UnkStruct_027e103c19func_ov000_020cf384Ev kind:function(arm,size=0x14) addr:0x20cf324 +_ZN18UnkStruct_027e103c19func_ov000_020cf398Ev kind:function(arm,size=0x20) addr:0x20cf338 +_ZN18UnkStruct_027e103c19func_ov000_020cf3b8Ev kind:function(arm,size=0x10) addr:0x20cf358 +_ZN18UnkStruct_027e103c19func_ov000_020cf3c8Ev kind:function(arm,size=0x14) addr:0x20cf368 +_ZN18UnkStruct_027e103c19func_ov000_020cf3dcEv kind:function(arm,size=0x14) addr:0x20cf37c +_ZN18UnkStruct_027e103c19func_ov000_020cf3f0Ev kind:function(arm,size=0x14) addr:0x20cf390 +_ZN18UnkStruct_027e103c19func_ov000_020cf404Ev kind:function(arm,size=0x10) addr:0x20cf3a4 +_ZN18UnkStruct_027e103c19func_ov000_020cf414Ev kind:function(arm,size=0x18) addr:0x20cf3b4 +_ZN18UnkStruct_027e103c19func_ov000_020cf42cEv kind:function(arm,size=0x18) addr:0x20cf3cc +_ZN18UnkStruct_027e103c19func_ov000_020cf444Ev kind:function(arm,size=0x44) addr:0x20cf3e4 +_ZN18UnkStruct_027e103c19func_ov000_020cf488Ev kind:function(arm,size=0x34) addr:0x20cf428 +_ZN18UnkStruct_027e103c19func_ov000_020cf4bcEv kind:function(arm,size=0x1c) addr:0x20cf45c +_ZN18UnkStruct_027e103c19func_ov000_020cf4d8Ev kind:function(arm,size=0x1c) addr:0x20cf478 +_ZN18UnkStruct_027e103c19func_ov000_020cf4f4Ev kind:function(arm,size=0x24) addr:0x20cf494 +_ZN18UnkStruct_027e103c19func_ov000_020cf518Ev kind:function(arm,size=0x1c) addr:0x20cf4b8 +_ZN18UnkStruct_027e103c19func_ov000_020cf534Ev kind:function(arm,size=0x1c) addr:0x20cf4d4 +_ZN18UnkStruct_027e103c19func_ov000_020cf550Ev kind:function(arm,size=0x128) addr:0x20cf4f0 +_ZN18UnkStruct_027e103c19func_ov000_020cf678Ev kind:function(arm,size=0xd8) addr:0x20cf618 +_ZN18UnkStruct_027e103c19func_ov000_020cf750Ev kind:function(arm,size=0x74) addr:0x20cf6f0 +_ZN18UnkStruct_027e103c19func_ov000_020cf7c4Ev kind:function(arm,size=0x24) addr:0x20cf764 +_ZN18UnkStruct_027e103c19func_ov000_020cf7e8Ev kind:function(arm,size=0x7c) addr:0x20cf788 +_ZN18UnkStruct_027e103c19func_ov000_020cf864Ej kind:function(arm,size=0x98) addr:0x20cf804 +_ZN18UnkStruct_027e103c19func_ov000_020cf8fcEj kind:function(arm,size=0x4c) addr:0x20cf89c +_ZN18UnkStruct_027e103c19func_ov000_020cf948Ev kind:function(arm,size=0x94) addr:0x20cf8e8 +_ZN18UnkStruct_027e103c19func_ov000_020cf9dcEii kind:function(arm,size=0x48) addr:0x20cf97c +_ZN18UnkStruct_027e103c19func_ov000_020cfa24Eii kind:function(arm,size=0x40) addr:0x20cf9c4 +_ZN18UnkStruct_027e103c19func_ov000_020cfa64Ev kind:function(arm,size=0xc) addr:0x20cfa04 +_ZN18UnkStruct_027e103c19func_ov000_020cfa70Eii kind:function(arm,size=0x40) addr:0x20cfa10 +_ZN18UnkStruct_027e103c19func_ov000_020cfab0Ev kind:function(arm,size=0xc) addr:0x20cfa50 +_ZN18UnkStruct_027e103c19func_ov000_020cfabcEii kind:function(arm,size=0x2c) addr:0x20cfa5c +_ZN18UnkStruct_027e103c19func_ov000_020cfae8Eii kind:function(arm,size=0x38) addr:0x20cfa88 +_ZN18UnkStruct_027e103c19func_ov000_020cfb20Ei kind:function(arm,size=0x18) addr:0x20cfac0 +_ZN18UnkStruct_027e103c19func_ov000_020cfb38Ev kind:function(arm,size=0x10) addr:0x20cfad8 +_ZN18UnkStruct_027e103c19func_ov000_020cfb48Ev kind:function(arm,size=0x10) addr:0x20cfae8 +_ZN18UnkStruct_027e103c19func_ov000_020cfb58Ev kind:function(arm,size=0x10) addr:0x20cfaf8 +_ZN18UnkStruct_027e103c19func_ov000_020cfb68Ev kind:function(arm,size=0x1c) addr:0x20cfb08 +_ZN18UnkStruct_027e103c19func_ov000_020cfb84Ev kind:function(arm,size=0x10) addr:0x20cfb24 +_ZN18UnkStruct_027e103c19func_ov000_020cfb94Ev kind:function(arm,size=0x1c) addr:0x20cfb34 +_ZN18UnkStruct_027e103c19func_ov000_020cfbb0Ev kind:function(arm,size=0x28) addr:0x20cfb50 +_ZN18UnkStruct_027e103c19func_ov000_020cfbd8Ec kind:function(arm,size=0x18) addr:0x20cfb78 +_ZN18UnkStruct_027e103c19func_ov000_020cfbf0Eiii kind:function(arm,size=0x30) addr:0x20cfb90 +_ZN18UnkStruct_027e103c19func_ov000_020cfc20Ev kind:function(arm,size=0x24) addr:0x20cfbc0 +_ZN18UnkStruct_027e103c19func_ov000_020cfc44Ei kind:function(arm,size=0x2c) addr:0x20cfbe4 +_ZN18UnkStruct_027e103c19func_ov000_020cfc70Ei kind:function(arm,size=0x2c) addr:0x20cfc10 +_ZN18UnkStruct_027e103c19func_ov000_020cfc9cEii kind:function(arm,size=0x50) addr:0x20cfc3c +_ZN18UnkStruct_027e103c19func_ov000_020cfcecEv kind:function(arm,size=0xc) addr:0x20cfc8c +_ZN18UnkStruct_027e103c19func_ov000_020cfcf8Ev kind:function(arm,size=0xec) addr:0x20cfc98 +_ZN18UnkStruct_027e103c19func_ov000_020cfde4Ei kind:function(arm,size=0x2c) addr:0x20cfd84 +_ZN18UnkStruct_027e103c19func_ov000_020cfe10Ec kind:function(arm,size=0x30) addr:0x20cfdb0 +_ZN18UnkStruct_027e103c19func_ov000_020cfe40Eci kind:function(arm,size=0x34) addr:0x20cfde0 +_ZN18UnkStruct_027e103c19func_ov000_020cfe74Eii kind:function(arm,size=0x34) addr:0x20cfe14 +_ZN18UnkStruct_027e103c19func_ov000_020cfea8Ev kind:function(arm,size=0x28) addr:0x20cfe48 func_ov000_020cfed0 kind:function(arm,size=0x4c) addr:0x20cfe70 func_ov000_020cff1c kind:function(arm,size=0x70) addr:0x20cfebc func_ov000_020cff8c kind:function(arm,size=0x74) addr:0x20cff2c @@ -3453,7 +3453,7 @@ func_ov000_020d387c kind:function(arm,size=0x78) addr:0x20d381c func_ov000_020d38f4 kind:function(arm,size=0xc) addr:0x20d3894 func_ov000_020d3900 kind:function(arm,size=0xc) addr:0x20d38a0 func_ov000_020d390c kind:function(arm,size=0x4) addr:0x20d38ac -func_ov000_020d3910 kind:function(arm,size=0x34) addr:0x20d38b0 +_ZN12ActorMSGBaseC1Ev kind:function(arm,size=0x34) addr:0x20d38b0 func_ov000_020d3944 kind:function(arm,size=0x14) addr:0x20d38e4 func_ov000_020d3958 kind:function(arm,size=0x1c) addr:0x20d38f8 func_ov000_020d3974 kind:function(arm,size=0x14) addr:0x20d3914 @@ -3493,7 +3493,7 @@ func_ov000_020d433c kind:function(arm,size=0x20) addr:0x20d42dc func_ov000_020d435c kind:function(arm,size=0x14) addr:0x20d42fc func_ov000_020d4370 kind:function(arm,size=0x1c) addr:0x20d4310 func_ov000_020d438c kind:function(arm,size=0x88) addr:0x20d432c -func_ov000_020d4414 kind:function(arm,size=0x34) addr:0x20d43b4 +_ZN20ActorDungeonItemBaseC1Ev kind:function(arm,size=0x34) addr:0x20d43b4 func_ov000_020d4448 kind:function(arm,size=0x14) addr:0x20d43e8 func_ov000_020d445c kind:function(arm,size=0x1c) addr:0x20d43fc func_ov000_020d4478 kind:function(arm,size=0x14) addr:0x20d4418 @@ -3923,62 +3923,62 @@ data_ov000_020df2ec kind:data(any) addr:0x20df28c data_ov000_020df2f8 kind:data(any) addr:0x20df298 data_ov000_020df31c kind:data(any) addr:0x20df2bc data_ov000_020df330 kind:data(any) addr:0x20df2d0 -func_ov000_020df338 kind:function(arm,size=0x14) addr:0x20df2d8 -func_ov000_020df34c kind:function(arm,size=0x2c) addr:0x20df2ec -func_ov000_020df378 kind:function(arm,size=0x14) addr:0x20df318 -func_ov000_020df38c kind:function(arm,size=0x2c) addr:0x20df32c -func_ov000_020df3b8 kind:function(arm,size=0x14) addr:0x20df358 -func_ov000_020df3cc kind:function(arm,size=0x14) addr:0x20df36c -func_ov000_020df3e0 kind:function(arm,size=0x14) addr:0x20df380 -func_ov000_020df3f4 kind:function(arm,size=0x2c) addr:0x20df394 -func_ov000_020df420 kind:function(arm,size=0x3c) addr:0x20df3c0 -func_ov000_020df45c kind:function(arm,size=0x14) addr:0x20df3fc -func_ov000_020df470 kind:function(arm,size=0x34) addr:0x20df410 -func_ov000_020df4a4 kind:function(arm,size=0x14) addr:0x20df444 -func_ov000_020df4b8 kind:function(arm,size=0x14) addr:0x20df458 -func_ov000_020df4cc kind:function(arm,size=0x174) addr:0x20df46c -func_ov000_020df640 kind:function(arm,size=0x38) addr:0x20df5e0 +__sinit_ov000_020df338 kind:function(arm,size=0x14) addr:0x20df2d8 +__sinit_ov000_020df34c kind:function(arm,size=0x2c) addr:0x20df2ec +__sinit_ov000_020df378 kind:function(arm,size=0x14) addr:0x20df318 +__sinit_ov000_020df38c kind:function(arm,size=0x2c) addr:0x20df32c +__sinit_ov000_020df3b8 kind:function(arm,size=0x14) addr:0x20df358 +__sinit_ov000_020df3cc kind:function(arm,size=0x14) addr:0x20df36c +__sinit_ov000_020df3e0 kind:function(arm,size=0x14) addr:0x20df380 +__sinit_ov000_020df3f4 kind:function(arm,size=0x2c) addr:0x20df394 +__sinit_ov000_020df420 kind:function(arm,size=0x3c) addr:0x20df3c0 +__sinit_ov000_020df45c kind:function(arm,size=0x14) addr:0x20df3fc +__sinit_ov000_020df470 kind:function(arm,size=0x34) addr:0x20df410 +__sinit_ov000_020df4a4 kind:function(arm,size=0x14) addr:0x20df444 +__sinit_ov000_020df4b8 kind:function(arm,size=0x14) addr:0x20df458 +__sinit_ov000_020df4cc kind:function(arm,size=0x174) addr:0x20df46c +__sinit_ov000_020df640 kind:function(arm,size=0x38) addr:0x20df5e0 __sinit_ActorSwitchObject.cpp kind:function(arm,size=0x40) addr:0x20df618 -func_ov000_020df6b8 kind:function(arm,size=0x40) addr:0x20df658 -func_ov000_020df6f8 kind:function(arm,size=0x40) addr:0x20df698 -func_ov000_020df738 kind:function(arm,size=0x38) addr:0x20df6d8 -func_ov000_020df770 kind:function(arm,size=0x20) addr:0x20df710 -func_ov000_020df790 kind:function(arm,size=0x1718) addr:0x20df730 -func_ov000_020e0ea8 kind:function(arm,size=0x188) addr:0x20e0e48 -func_ov000_020e1030 kind:function(arm,size=0x2c) addr:0x20e0fd0 -func_ov000_020e105c kind:function(arm,size=0x40) addr:0x20e0ffc -func_ov000_020e109c kind:function(arm,size=0x38) addr:0x20e103c -func_ov000_020e10d4 kind:function(arm,size=0x40) addr:0x20e1074 -func_ov000_020e1114 kind:function(arm,size=0x14) addr:0x20e10b4 -func_ov000_020e1128 kind:function(arm,size=0xb0) addr:0x20e10c8 -func_ov000_020e11d8 kind:function(arm,size=0x34) addr:0x20e1178 -func_ov000_020e120c kind:function(arm,size=0x44) addr:0x20e11ac -func_ov000_020e1250 kind:function(arm,size=0x40) addr:0x20e11f0 -func_ov000_020e1290 kind:function(arm,size=0x48) addr:0x20e1230 -func_ov000_020e12d8 kind:function(arm,size=0x64) addr:0x20e1278 -func_ov000_020e133c kind:function(arm,size=0x40) addr:0x20e12dc -func_ov000_020e137c kind:function(arm,size=0x798) addr:0x20e131c -func_ov000_020e1b14 kind:function(arm,size=0x40) addr:0x20e1ab4 -func_ov000_020e1b54 kind:function(arm,size=0x40) addr:0x20e1af4 -func_ov000_020e1b94 kind:function(arm,size=0x40) addr:0x20e1b34 -func_ov000_020e1bd4 kind:function(arm,size=0x40) addr:0x20e1b74 -func_ov000_020e1c14 kind:function(arm,size=0x40) addr:0x20e1bb4 -func_ov000_020e1c54 kind:function(arm,size=0x14) addr:0x20e1bf4 -func_ov000_020e1c68 kind:function(arm,size=0x24) addr:0x20e1c08 -func_ov000_020e1c8c kind:function(arm,size=0x40) addr:0x20e1c2c -func_ov000_020e1ccc kind:function(arm,size=0x40) addr:0x20e1c6c -func_ov000_020e1d0c kind:function(arm,size=0x40) addr:0x20e1cac -func_ov000_020e1d4c kind:function(arm,size=0x30) addr:0x20e1cec -func_ov000_020e1d7c kind:function(arm,size=0x2c) addr:0x20e1d1c -func_ov000_020e1da8 kind:function(arm,size=0x40) addr:0x20e1d48 -func_ov000_020e1de8 kind:function(arm,size=0x14) addr:0x20e1d88 -func_ov000_020e1dfc kind:function(arm,size=0x14) addr:0x20e1d9c -func_ov000_020e1e10 kind:function(arm,size=0x14) addr:0x20e1db0 -func_ov000_020e1e24 kind:function(arm,size=0x14) addr:0x20e1dc4 -func_ov000_020e1e38 kind:function(arm,size=0x14) addr:0x20e1dd8 -func_ov000_020e1e4c kind:function(arm,size=0x14) addr:0x20e1dec -func_ov000_020e1e60 kind:function(arm,size=0x14) addr:0x20e1e00 -func_ov000_020e1e74 kind:function(arm,size=0x14) addr:0x20e1e14 +__sinit_ov000_020df6b8 kind:function(arm,size=0x40) addr:0x20df658 +__sinit_ov000_020df6f8 kind:function(arm,size=0x40) addr:0x20df698 +__sinit_ov000_020df738 kind:function(arm,size=0x38) addr:0x20df6d8 +__sinit_ov000_020df770 kind:function(arm,size=0x20) addr:0x20df710 +__sinit_ov000_020df790 kind:function(arm,size=0x1718) addr:0x20df730 +__sinit_ov000_020e0ea8 kind:function(arm,size=0x188) addr:0x20e0e48 +__sinit_ov000_020e1030 kind:function(arm,size=0x2c) addr:0x20e0fd0 +__sinit_ov000_020e105c kind:function(arm,size=0x40) addr:0x20e0ffc +__sinit_ov000_020e109c kind:function(arm,size=0x38) addr:0x20e103c +__sinit_ov000_020e10d4 kind:function(arm,size=0x40) addr:0x20e1074 +__sinit_ov000_020e1114 kind:function(arm,size=0x14) addr:0x20e10b4 +__sinit_ov000_020e1128 kind:function(arm,size=0xb0) addr:0x20e10c8 +__sinit_ov000_020e11d8 kind:function(arm,size=0x34) addr:0x20e1178 +__sinit_ov000_020e120c kind:function(arm,size=0x44) addr:0x20e11ac +__sinit_ov000_020e1250 kind:function(arm,size=0x40) addr:0x20e11f0 +__sinit_ov000_020e1290 kind:function(arm,size=0x48) addr:0x20e1230 +__sinit_ov000_020e12d8 kind:function(arm,size=0x64) addr:0x20e1278 +__sinit_ov000_020e133c kind:function(arm,size=0x40) addr:0x20e12dc +__sinit_ov000_020e137c kind:function(arm,size=0x798) addr:0x20e131c +__sinit_ov000_020e1b14 kind:function(arm,size=0x40) addr:0x20e1ab4 +__sinit_ov000_020e1b54 kind:function(arm,size=0x40) addr:0x20e1af4 +__sinit_ov000_020e1b94 kind:function(arm,size=0x40) addr:0x20e1b34 +__sinit_ov000_020e1bd4 kind:function(arm,size=0x40) addr:0x20e1b74 +__sinit_ov000_020e1c14 kind:function(arm,size=0x40) addr:0x20e1bb4 +__sinit_ov000_020e1c54 kind:function(arm,size=0x14) addr:0x20e1bf4 +__sinit_ov000_020e1c68 kind:function(arm,size=0x24) addr:0x20e1c08 +__sinit_ov000_020e1c8c kind:function(arm,size=0x40) addr:0x20e1c2c +__sinit_ov000_020e1ccc kind:function(arm,size=0x40) addr:0x20e1c6c +__sinit_ov000_020e1d0c kind:function(arm,size=0x40) addr:0x20e1cac +__sinit_ov000_020e1d4c kind:function(arm,size=0x30) addr:0x20e1cec +__sinit_ov000_020e1d7c kind:function(arm,size=0x2c) addr:0x20e1d1c +__sinit_ov000_020e1da8 kind:function(arm,size=0x40) addr:0x20e1d48 +__sinit_ov000_020e1de8 kind:function(arm,size=0x14) addr:0x20e1d88 +__sinit_ov000_020e1dfc kind:function(arm,size=0x14) addr:0x20e1d9c +__sinit_ov000_020e1e10 kind:function(arm,size=0x14) addr:0x20e1db0 +__sinit_ov000_020e1e24 kind:function(arm,size=0x14) addr:0x20e1dc4 +__sinit_ov000_020e1e38 kind:function(arm,size=0x14) addr:0x20e1dd8 +__sinit_ov000_020e1e4c kind:function(arm,size=0x14) addr:0x20e1dec +__sinit_ov000_020e1e60 kind:function(arm,size=0x14) addr:0x20e1e00 +__sinit_ov000_020e1e74 kind:function(arm,size=0x14) addr:0x20e1e14 data_ov000_020e1f80 kind:data(any) addr:0x20e1f20 data_ov000_020e1fa4 kind:data(any) addr:0x20e1f44 data_ov000_020e1fb4 kind:data(any) addr:0x20e1f54 diff --git a/include/DTCM/UnkStruct_027e103c.hpp b/include/DTCM/UnkStruct_027e103c.hpp index c95f759a..7761fb0e 100644 --- a/include/DTCM/UnkStruct_027e103c.hpp +++ b/include/DTCM/UnkStruct_027e103c.hpp @@ -16,8 +16,91 @@ struct UnkStruct_027e103c { /* 20 */ unk16 mUnk_20; /* 22 */ s16 mUnk_22; /* 24 */ u8 mUnk_24; - /* 25 */ unk8 mUnk_25[7]; + /* 25 */ unk8 mUnk_25[0x5]; + /* 2a */ unk8 mUnk_2a; + /* 2b */ unk8 mUnk_2b; /* 2c */ + + void *func_ov000_020cef9c(); + unk32 func_ov000_020cefbc(); + unk32 func_ov000_020cefdc(); + unk32 func_ov000_020ceffc(); + unk32 func_ov000_020cf01c(); + unk32 func_ov000_020cf03c(); + unk32 func_ov000_020cf05c(); + unk32 func_ov000_020cf07c(); + unk32 func_ov000_020cf09c(); + unk32 func_ov000_020cf0bc(); + unk32 func_ov000_020cf0dc(); + unk32 func_ov000_020cf0fc(); + unk32 func_ov000_020cf11c(); + void func_ov000_020cf13c(s32 param1); + void func_ov000_020cf1b8(); + void func_ov000_020cf1d4(unk32 param1); + void func_ov000_020cf20c(); + void func_ov000_020cf224(unk32 param1); + void func_ov000_020cf238(unk32 param1, unk32 param2); + bool func_ov000_020cf270(u16 param1); + void func_ov000_020cf284(u16 param1, s32 param2); + void func_ov000_020cf2a0(u32 param1); + void func_ov000_020cf2b8(); + void func_ov000_020cf2d8(); + void func_ov000_020cf2f8(); + void func_ov000_020cf330(); + void func_ov000_020cf348(); + s32 func_ov000_020cf374(bool param1); + void func_ov000_020cf384(); + void func_ov000_020cf398(); + void func_ov000_020cf3b8(); + void func_ov000_020cf3c8(); + void func_ov000_020cf3dc(); + void func_ov000_020cf3f0(); + void func_ov000_020cf404(); + void func_ov000_020cf414(); + void func_ov000_020cf42c(); + bool func_ov000_020cf444(); + bool func_ov000_020cf488(); + bool func_ov000_020cf4bc(); + bool func_ov000_020cf4d8(); + bool func_ov000_020cf4f4(); + bool func_ov000_020cf518(); + bool func_ov000_020cf534(); + bool func_ov000_020cf550(); + bool func_ov000_020cf678(); + bool func_ov000_020cf750(); + bool func_ov000_020cf7c4(); + void func_ov000_020cf7e8(); + u32 func_ov000_020cf864(u32 param1); + bool func_ov000_020cf8fc(u32 param1); + bool func_ov000_020cf948(); + void func_ov000_020cf9dc(s32 param1, s32 param2); + void func_ov000_020cfa24(s32 param1, s32 param2); + unk8 func_ov000_020cfa64(); + void func_ov000_020cfa70(s32 param1, s32 param2); + unk8 func_ov000_020cfab0(); + void func_ov000_020cfabc(s32 param1, s32 param2); + void func_ov000_020cfae8(s32 param1, s32 param2); + void func_ov000_020cfb20(unk32 param1); + void func_ov000_020cfb38(); + void func_ov000_020cfb48(); + void func_ov000_020cfb58(); + void func_ov000_020cfb68(); + void func_ov000_020cfb84(); + void func_ov000_020cfb94(); + unk32 func_ov000_020cfbb0(); + void func_ov000_020cfbd8(unk8 param1); + void func_ov000_020cfbf0(unk32 param1, unk32 param2, unk32 param3); + void func_ov000_020cfc20(); + void func_ov000_020cfc44(unk32 param1); + void func_ov000_020cfc70(unk32 param1); + void func_ov000_020cfc9c(unk32 param1, unk32 param2); + void func_ov000_020cfcec(); + bool func_ov000_020cfcf8(); + void func_ov000_020cfde4(unk32 param1); + void func_ov000_020cfe10(unk8 param1); + void func_ov000_020cfe40(unk8 param1, unk32 param2); + void func_ov000_020cfe74(unk32 param1, unk32 param2); + unk32 func_ov000_020cfea8(); }; extern UnkStruct_027e103c *data_027e103c; diff --git a/src/00_Core/DTCM/UnkStruct_027e103c.cpp b/src/00_Core/DTCM/UnkStruct_027e103c.cpp new file mode 100644 index 00000000..53f72d35 --- /dev/null +++ b/src/00_Core/DTCM/UnkStruct_027e103c.cpp @@ -0,0 +1,82 @@ +#include "DTCM/UnkStruct_027e103c.hpp" + +void *UnkStruct_027e103c::func_ov000_020cef9c() {} +unk32 UnkStruct_027e103c::func_ov000_020cefbc() {} +unk32 UnkStruct_027e103c::func_ov000_020cefdc() {} +unk32 UnkStruct_027e103c::func_ov000_020ceffc() {} +unk32 UnkStruct_027e103c::func_ov000_020cf01c() {} +unk32 UnkStruct_027e103c::func_ov000_020cf03c() {} +unk32 UnkStruct_027e103c::func_ov000_020cf05c() {} +unk32 UnkStruct_027e103c::func_ov000_020cf07c() {} +unk32 UnkStruct_027e103c::func_ov000_020cf09c() {} +unk32 UnkStruct_027e103c::func_ov000_020cf0bc() {} +unk32 UnkStruct_027e103c::func_ov000_020cf0dc() {} +unk32 UnkStruct_027e103c::func_ov000_020cf0fc() {} +unk32 UnkStruct_027e103c::func_ov000_020cf11c() {} +void UnkStruct_027e103c::func_ov000_020cf13c(s32 param1) {} +void UnkStruct_027e103c::func_ov000_020cf1b8() {} +void UnkStruct_027e103c::func_ov000_020cf1d4(unk32 param1) {} +void UnkStruct_027e103c::func_ov000_020cf20c() {} +void UnkStruct_027e103c::func_ov000_020cf224(unk32 param1) {} +void UnkStruct_027e103c::func_ov000_020cf238(unk32 param1, unk32 param2) {} +bool UnkStruct_027e103c::func_ov000_020cf270(u16 param1) {} +void UnkStruct_027e103c::func_ov000_020cf284(u16 param1, s32 param2) {} +void UnkStruct_027e103c::func_ov000_020cf2a0(u32 param1) {} +void UnkStruct_027e103c::func_ov000_020cf2b8() {} +void UnkStruct_027e103c::func_ov000_020cf2d8() {} +void UnkStruct_027e103c::func_ov000_020cf2f8() {} +void UnkStruct_027e103c::func_ov000_020cf330() {} +void UnkStruct_027e103c::func_ov000_020cf348() {} +s32 UnkStruct_027e103c::func_ov000_020cf374(bool param1) {} +void UnkStruct_027e103c::func_ov000_020cf384() {} +void UnkStruct_027e103c::func_ov000_020cf398() {} +void UnkStruct_027e103c::func_ov000_020cf3b8() {} +void UnkStruct_027e103c::func_ov000_020cf3c8() {} +void UnkStruct_027e103c::func_ov000_020cf3dc() {} +void UnkStruct_027e103c::func_ov000_020cf3f0() {} +void UnkStruct_027e103c::func_ov000_020cf404() {} +void UnkStruct_027e103c::func_ov000_020cf414() {} +void UnkStruct_027e103c::func_ov000_020cf42c() {} +bool UnkStruct_027e103c::func_ov000_020cf444() {} +bool UnkStruct_027e103c::func_ov000_020cf488() {} +bool UnkStruct_027e103c::func_ov000_020cf4bc() {} +bool UnkStruct_027e103c::func_ov000_020cf4d8() {} +bool UnkStruct_027e103c::func_ov000_020cf4f4() {} +bool UnkStruct_027e103c::func_ov000_020cf518() {} +bool UnkStruct_027e103c::func_ov000_020cf534() {} +bool UnkStruct_027e103c::func_ov000_020cf550() {} +bool UnkStruct_027e103c::func_ov000_020cf678() {} +bool UnkStruct_027e103c::func_ov000_020cf750() {} +bool UnkStruct_027e103c::func_ov000_020cf7c4() {} +void UnkStruct_027e103c::func_ov000_020cf7e8() {} +u32 UnkStruct_027e103c::func_ov000_020cf864(u32 param1) {} +bool UnkStruct_027e103c::func_ov000_020cf8fc(u32 param1) {} +bool UnkStruct_027e103c::func_ov000_020cf948() {} +void UnkStruct_027e103c::func_ov000_020cf9dc(s32 param1, s32 param2) {} +void UnkStruct_027e103c::func_ov000_020cfa24(s32 param1, s32 param2) {} +unk8 UnkStruct_027e103c::func_ov000_020cfa64() {} +void UnkStruct_027e103c::func_ov000_020cfa70(s32 param1, s32 param2) {} +unk8 UnkStruct_027e103c::func_ov000_020cfab0() {} +void UnkStruct_027e103c::func_ov000_020cfabc(s32 param1, s32 param2) {} +void UnkStruct_027e103c::func_ov000_020cfae8(s32 param1, s32 param2) {} +void UnkStruct_027e103c::func_ov000_020cfb20(unk32 param1) {} +void UnkStruct_027e103c::func_ov000_020cfb38() {} +void UnkStruct_027e103c::func_ov000_020cfb48() {} +void UnkStruct_027e103c::func_ov000_020cfb58() {} +void UnkStruct_027e103c::func_ov000_020cfb68() {} +void UnkStruct_027e103c::func_ov000_020cfb84() {} +void UnkStruct_027e103c::func_ov000_020cfb94() {} +unk32 UnkStruct_027e103c::func_ov000_020cfbb0() {} +void UnkStruct_027e103c::func_ov000_020cfbd8(unk8 param1) {} +void UnkStruct_027e103c::func_ov000_020cfbf0(unk32 param1, unk32 param2, unk32 param3) {} +void UnkStruct_027e103c::func_ov000_020cfc20() {} +void UnkStruct_027e103c::func_ov000_020cfc44(unk32 param1) {} +void UnkStruct_027e103c::func_ov000_020cfc70(unk32 param1) {} +void UnkStruct_027e103c::func_ov000_020cfc9c(unk32 param1, unk32 param2) {} +void UnkStruct_027e103c::func_ov000_020cfcec() {} +bool UnkStruct_027e103c::func_ov000_020cfcf8() {} +void UnkStruct_027e103c::func_ov000_020cfde4(unk32 param1) {} +void UnkStruct_027e103c::func_ov000_020cfe10(unk8 param1) {} +void UnkStruct_027e103c::func_ov000_020cfe40(unk8 param1, unk32 param2) {} +void UnkStruct_027e103c::func_ov000_020cfe74(unk32 param1, unk32 param2) {} +unk32 UnkStruct_027e103c::func_ov000_020cfea8() {} \ No newline at end of file diff --git a/src/00_Core/Player/LinkStateItem.cpp b/src/00_Core/Player/LinkStateItem.cpp index 5cbccd85..eb4ad1ed 100644 --- a/src/00_Core/Player/LinkStateItem.cpp +++ b/src/00_Core/Player/LinkStateItem.cpp @@ -1,4 +1,5 @@ #include "Player/LinkStateItem.hpp" +#include "DTCM/UnkStruct_027e103c.hpp" #include "Item/ItemManager.hpp" #include "Player/EquipBomb.hpp" #include "Player/EquipHammer.hpp" @@ -7,13 +8,11 @@ #include "Player/PlayerControl.hpp" #include "Save/AdventureFlags.hpp" -extern unk32 func_ov000_020cf01c(s32 *param1); extern void func_ov000_020cf9dc(s32 param1, s32 param2, s32 param3); extern void func_ov014_0213ec64(s32 param1); extern void func_ov014_0211fd04(s32 *param1); extern void func_ov000_020b7e6c(s32 *param1); -extern s32 *data_027e103c; extern s32 *data_027e1098; THUMB void LinkStateItem::vfunc_00() {} @@ -39,7 +38,7 @@ ARM void LinkStateItem::OnStateLeave(s32 param1) { switch (this->mEquipId) { case ItemFlag_BombchuBag: - iVar3 = func_ov000_020cf01c(data_027e103c); + iVar3 = data_027e103c->func_ov000_020cf01c(); if (*(u8 *) (iVar3 + 0xe0) == '\0') { func_ov014_0213ec64((s32) GetEquipBombchu()); } @@ -54,9 +53,9 @@ ARM void LinkStateItem::OnStateLeave(s32 param1) { case ItemFlag_Hammer: EquipHammer::StopUsing(this); break; case ItemFlag_PotionA: case ItemFlag_PotionB: - iVar3 = (int) (data_027e103c); - *(unk8 *) ((s16 *) data_027e103c + 0x15) = 0; - func_ov000_020cf9dc(iVar3, 0, 0); + UnkStruct_027e103c *pData_027e103c = data_027e103c; + pData_027e103c->mUnk_2a = 0; + pData_027e103c->func_ov000_020cf9dc(0, 0); break; case ItemFlag_Shovel: EquipScoop::StopUsing(this); break; }