diff options
Diffstat (limited to 'config/eur/arm9/overlays')
| -rw-r--r-- | config/eur/arm9/overlays/ov014/delinks.txt | 9 | ||||
| -rw-r--r-- | config/eur/arm9/overlays/ov014/symbols.txt | 216 | ||||
| -rw-r--r-- | config/eur/arm9/overlays/ov031/delinks.txt | 12 | ||||
| -rw-r--r-- | config/eur/arm9/overlays/ov031/symbols.txt | 170 |
4 files changed, 214 insertions, 193 deletions
diff --git a/config/eur/arm9/overlays/ov014/delinks.txt b/config/eur/arm9/overlays/ov014/delinks.txt index d921ab14..fb52d807 100644 --- a/config/eur/arm9/overlays/ov014/delinks.txt +++ b/config/eur/arm9/overlays/ov014/delinks.txt @@ -20,3 +20,12 @@ src/14_Land/Actor/Player/ActorRefill.cpp: .ctor start:0x021558ec end:0x021558f0 .data start:0x021578b0 end:0x02157d70 .bss start:0x0215af94 end:0x0215b034 + +src/14_Land/Actor/Character/ActorCharacterBase.cpp: + .text start:0x021447f8 end:0x02144d94 + +src/14_Land/Actor/Character/ActorCharacter.cpp: + .text start:0x02144d94 end:0x02145a74 + +src/14_Land/Actor/Character/ActorGenericCharacter.cpp: + .text start:0x021476d0 end:0x02148234 diff --git a/config/eur/arm9/overlays/ov014/symbols.txt b/config/eur/arm9/overlays/ov014/symbols.txt index db56cc1d..a5b3a461 100644 --- a/config/eur/arm9/overlays/ov014/symbols.txt +++ b/config/eur/arm9/overlays/ov014/symbols.txt @@ -1061,76 +1061,76 @@ func_ov014_02144750 kind:function(arm,size=0x38) addr:0x02144750 func_ov014_02144788 kind:function(arm,size=0x38) addr:0x02144788 func_ov014_021447c0 kind:function(arm,size=0x1c) addr:0x021447c0 func_ov014_021447dc kind:function(arm,size=0x1c) addr:0x021447dc -func_ov014_021447f8 kind:function(arm,size=0x14) addr:0x021447f8 -func_ov014_0214480c kind:function(arm,size=0x14) addr:0x0214480c -func_ov014_02144820 kind:function(arm,size=0x14) addr:0x02144820 -func_ov014_02144834 kind:function(arm,size=0x14) addr:0x02144834 -func_ov014_02144848 kind:function(arm,size=0x8c) addr:0x02144848 -func_ov014_021448d4 kind:function(arm,size=0x8) addr:0x021448d4 -func_ov014_021448dc kind:function(arm,size=0x8) addr:0x021448dc -func_ov014_021448e4 kind:function(arm,size=0x8) addr:0x021448e4 -func_ov014_021448ec kind:function(arm,size=0x8) addr:0x021448ec -func_ov014_021448f4 kind:function(arm,size=0xc) addr:0x021448f4 -func_ov014_02144900 kind:function(arm,size=0x4c) addr:0x02144900 -func_ov014_0214494c kind:function(arm,size=0x48) addr:0x0214494c -func_ov014_02144994 kind:function(arm,size=0x50) addr:0x02144994 -func_ov014_021449e4 kind:function(arm,size=0x48) addr:0x021449e4 -func_ov014_02144a2c kind:function(arm,size=0x64) addr:0x02144a2c -func_ov014_02144a90 kind:function(arm,size=0x6c) addr:0x02144a90 -func_ov014_02144afc kind:function(arm,size=0x68) addr:0x02144afc -func_ov014_02144b64 kind:function(arm,size=0x19c) addr:0x02144b64 -func_ov014_02144d00 kind:function(arm,size=0x8) addr:0x02144d00 -func_ov014_02144d08 kind:function(arm,size=0x2c) addr:0x02144d08 -func_ov014_02144d34 kind:function(arm,size=0x18) addr:0x02144d34 -func_ov014_02144d4c kind:function(arm,size=0xc) addr:0x02144d4c -func_ov014_02144d58 kind:function(arm,size=0xc) addr:0x02144d58 -func_ov014_02144d64 kind:function(arm,size=0x4) addr:0x02144d64 -func_ov014_02144d68 kind:function(arm,size=0x4) addr:0x02144d68 -func_ov014_02144d6c kind:function(arm,size=0x4) addr:0x02144d6c -func_ov014_02144d70 kind:function(arm,size=0x4) addr:0x02144d70 -func_ov014_02144d74 kind:function(arm,size=0x20) addr:0x02144d74 -func_ov014_02144d94 kind:function(arm,size=0x58) addr:0x02144d94 -func_ov014_02144dec kind:function(arm,size=0x28) addr:0x02144dec -func_ov014_02144e14 kind:function(arm,size=0x14) addr:0x02144e14 -func_ov014_02144e28 kind:function(arm,size=0x14) addr:0x02144e28 -func_ov014_02144e3c kind:function(arm,size=0x1c) addr:0x02144e3c -func_ov014_02144e58 kind:function(arm,size=0x1c) addr:0x02144e58 -func_ov014_02144e74 kind:function(arm,size=0x28) addr:0x02144e74 -func_ov014_02144e9c kind:function(arm,size=0x14) addr:0x02144e9c -func_ov014_02144eb0 kind:function(arm,size=0x28) addr:0x02144eb0 -func_ov014_02144ed8 kind:function(arm,size=0x138) addr:0x02144ed8 -func_ov014_02145010 kind:function(arm,size=0x48) addr:0x02145010 -func_ov014_02145058 kind:function(arm,size=0x50) addr:0x02145058 -func_ov014_021450a8 kind:function(arm,size=0x48) addr:0x021450a8 -func_ov014_021450f0 kind:function(arm,size=0x10) addr:0x021450f0 -func_ov014_02145100 kind:function(arm,size=0x78) addr:0x02145100 -func_ov014_02145178 kind:function(arm,size=0x78) addr:0x02145178 -func_ov014_021451f0 kind:function(arm,size=0x68) addr:0x021451f0 -func_ov014_02145258 kind:function(arm,size=0x58) addr:0x02145258 -func_ov014_021452b0 kind:function(arm,size=0x68) addr:0x021452b0 -func_ov014_02145318 kind:function(arm,size=0xdc) addr:0x02145318 -func_ov014_021453f4 kind:function(arm,size=0x20) addr:0x021453f4 -func_ov014_02145414 kind:function(arm,size=0x78) addr:0x02145414 -func_ov014_0214548c kind:function(arm,size=0x7c) addr:0x0214548c -func_ov014_02145508 kind:function(arm,size=0x18) addr:0x02145508 -func_ov014_02145520 kind:function(arm,size=0xc) addr:0x02145520 -func_ov014_0214552c kind:function(arm,size=0x4c) addr:0x0214552c -func_ov014_02145578 kind:function(arm,size=0x38) addr:0x02145578 -func_ov014_021455b0 kind:function(arm,size=0x34) addr:0x021455b0 -func_ov014_021455e4 kind:function(arm,size=0x94) addr:0x021455e4 -func_ov014_02145678 kind:function(arm,size=0x18) addr:0x02145678 -func_ov014_02145690 kind:function(arm,size=0x8) addr:0x02145690 -func_ov014_02145698 kind:function(arm,size=0xa4) addr:0x02145698 -func_ov014_0214573c kind:function(arm,size=0x24) addr:0x0214573c -func_ov014_02145760 kind:function(arm,size=0xb4) addr:0x02145760 -func_ov014_02145814 kind:function(arm,size=0x60) addr:0x02145814 -func_ov014_02145874 kind:function(arm,size=0x2c) addr:0x02145874 -func_ov014_021458a0 kind:function(arm,size=0x10) addr:0x021458a0 -func_ov014_021458b0 kind:function(arm,size=0x1c) addr:0x021458b0 -func_ov014_021458cc kind:function(arm,size=0x34) addr:0x021458cc -func_ov014_02145900 kind:function(arm,size=0x1c) addr:0x02145900 -func_ov014_0214591c kind:function(arm,size=0x58) addr:0x0214591c -func_ov014_02145974 kind:function(arm,size=0x100) addr:0x02145974 +_Z19func_ov014_021447f8P18ActorCharacterBase kind:function(arm,size=0x14) addr:0x021447f8 +_Z19func_ov014_0214480cP18ActorCharacterBase kind:function(arm,size=0x14) addr:0x0214480c +_Z19func_ov014_02144820P18ActorCharacterBase kind:function(arm,size=0x14) addr:0x02144820 +_Z19func_ov014_02144834P18ActorCharacterBase kind:function(arm,size=0x14) addr:0x02144834 +_Z19func_ov014_02144848PiiP18ActorCharacterBase kind:function(arm,size=0x8c) addr:0x02144848 +_ZN18ActorCharacterBase8vfunc_d8Ev kind:function(arm,size=0x8) addr:0x021448d4 +_ZN18ActorCharacterBase8vfunc_dcEv kind:function(arm,size=0x8) addr:0x021448dc +_ZN18ActorCharacterBase8vfunc_e0Ev kind:function(arm,size=0x8) addr:0x021448e4 +_ZN18ActorCharacterBase8vfunc_e4Ev kind:function(arm,size=0x8) addr:0x021448ec +_ZN18ActorCharacterBase8vfunc_e8Ev kind:function(arm,size=0xc) addr:0x021448f4 +_ZN18ActorCharacterBaseC2Ev kind:function(arm,size=0x4c) addr:0x02144900 +_ZN18ActorCharacterBaseD1Ev kind:function(arm,size=0x48) addr:0x0214494c +_ZN18ActorCharacterBaseD0Ev kind:function(arm,size=0x50) addr:0x02144994 +_ZN18ActorCharacterBaseD2Ev kind:function(arm,size=0x48) addr:0x021449e4 +_ZN18ActorCharacterBase4InitEv kind:function(arm,size=0x64) addr:0x02144a2c +_ZN18ActorCharacterBase8vfunc_14Ej kind:function(arm,size=0x6c) addr:0x02144a90 +_ZN18ActorCharacterBase8vfunc_c0Ev kind:function(arm,size=0x68) addr:0x02144afc +_ZN18ActorCharacterBase8vfunc_18Ej kind:function(arm,size=0x19c) addr:0x02144b64 +_ZN18ActorCharacterBase8vfunc_d4Ev kind:function(arm,size=0x8) addr:0x02144d00 +_ZN18ActorCharacterBase8vfunc_b4Ev kind:function(arm,size=0x2c) addr:0x02144d08 +_ZN18ActorCharacterBase8vfunc_b8Ev kind:function(arm,size=0x18) addr:0x02144d34 +_ZN18ActorCharacterBase8vfunc_80Ev kind:function(arm,size=0xc) addr:0x02144d4c +_ZN18ActorCharacterBase8vfunc_84Ev kind:function(arm,size=0xc) addr:0x02144d58 +_ZN18ActorCharacterBase8vfunc_ccEv kind:function(arm,size=0x4) addr:0x02144d64 +_ZN18ActorCharacterBase8vfunc_c8Ev kind:function(arm,size=0x4) addr:0x02144d68 +_ZN18ActorCharacterBase8vfunc_d0Ev kind:function(arm,size=0x4) addr:0x02144d6c +_ZN18ActorCharacterBase8vfunc_68Ev kind:function(arm,size=0x4) addr:0x02144d70 +_ZN18ActorCharacterBase8vfunc_bcEv kind:function(arm,size=0x20) addr:0x02144d74 +_ZN14ActorCharacter19func_ov014_02144d94Ev kind:function(arm,size=0x58) addr:0x02144d94 +_ZN14ActorCharacter19func_ov014_02144decEv kind:function(arm,size=0x28) addr:0x02144dec +_ZN14ActorCharacter19func_ov014_02144e14Ev kind:function(arm,size=0x14) addr:0x02144e14 +_ZN14ActorCharacter19func_ov014_02144e28Ev kind:function(arm,size=0x14) addr:0x02144e28 +_ZN14ActorCharacter19func_ov014_02144e3cEv kind:function(arm,size=0x1c) addr:0x02144e3c +_ZN14ActorCharacter19func_ov014_02144e58Ev kind:function(arm,size=0x1c) addr:0x02144e58 +_ZN14ActorCharacter19func_ov014_02144e74Ev kind:function(arm,size=0x28) addr:0x02144e74 +_ZN19ActorCharacterModelD0Ev kind:function(arm,size=0x14) addr:0x02144e9c +_ZN18ActorCharacter_288C1Ev kind:function(arm,size=0x28) addr:0x02144eb0 +_ZN14ActorCharacterC2Ev kind:function(arm,size=0x138) addr:0x02144ed8 +_ZN14ActorCharacterD1Ev kind:function(arm,size=0x48) addr:0x02145010 +_ZN14ActorCharacterD0Ev kind:function(arm,size=0x50) addr:0x02145058 +_ZN14ActorCharacterD2Ev kind:function(arm,size=0x48) addr:0x021450a8 +_ZN14ActorCharacter4InitEv kind:function(arm,size=0x10) addr:0x021450f0 +_ZN14ActorCharacter8vfunc_20Eb kind:function(arm,size=0x78) addr:0x02145100 +_ZN14ActorCharacter19func_ov014_02145178Ev kind:function(arm,size=0x78) addr:0x02145178 +_ZN14ActorCharacter19func_ov014_021451f0EPi kind:function(arm,size=0x68) addr:0x021451f0 +_ZN14ActorCharacter19func_ov014_02145258Ev kind:function(arm,size=0x58) addr:0x02145258 +_ZN14ActorCharacter19func_ov014_021452b0Ev kind:function(arm,size=0x68) addr:0x021452b0 +_ZN14ActorCharacter19func_ov014_02145318Ev kind:function(arm,size=0xdc) addr:0x02145318 +_ZN14ActorCharacter19func_ov014_021453f4Ev kind:function(arm,size=0x20) addr:0x021453f4 +_ZN14ActorCharacter19func_ov014_02145414Ev kind:function(arm,size=0x78) addr:0x02145414 +_ZN14ActorCharacter19func_ov014_0214548cEv kind:function(arm,size=0x7c) addr:0x0214548c +_ZN14ActorCharacter19func_ov014_02145508Ev kind:function(arm,size=0x18) addr:0x02145508 +_Z19func_ov014_02145520P14ActorCharacter kind:function(arm,size=0xc) addr:0x02145520 +_ZN14ActorCharacter19func_ov014_0214552cEv kind:function(arm,size=0x4c) addr:0x0214552c +_ZN14ActorCharacter8vfunc_80Ev kind:function(arm,size=0x38) addr:0x02145578 +_ZN14ActorCharacter8vfunc_84Ev kind:function(arm,size=0x34) addr:0x021455b0 +_ZN14ActorCharacter8vfunc_ccEv kind:function(arm,size=0x94) addr:0x021455e4 +_ZN14ActorCharacter8vfunc_c8Ev kind:function(arm,size=0x18) addr:0x02145678 +_ZN14ActorCharacter8vfunc_78Ev kind:function(arm,size=0x8) addr:0x02145690 +_ZN14ActorCharacter8vfunc_74Ev kind:function(arm,size=0xa4) addr:0x02145698 +_ZN14ActorCharacter8vfunc_7cEv kind:function(arm,size=0x24) addr:0x0214573c +_ZN14ActorCharacter8vfunc_90Ev kind:function(arm,size=0xb4) addr:0x02145760 +_ZN14ActorCharacter8vfunc_94Ev kind:function(arm,size=0x60) addr:0x02145814 +_ZN14ActorCharacter8vfunc_98Ev kind:function(arm,size=0x2c) addr:0x02145874 +_ZN14ActorCharacter8vfunc_d0Ev kind:function(arm,size=0x10) addr:0x021458a0 +_ZN14ActorCharacter8vfunc_9cEv kind:function(arm,size=0x1c) addr:0x021458b0 +_ZN14ActorCharacter8vfunc_ecEi kind:function(arm,size=0x34) addr:0x021458cc +_ZN14ActorCharacter8vfunc_f0Ei kind:function(arm,size=0x1c) addr:0x02145900 +_ZN14ActorCharacter19func_ov014_0214591cEv kind:function(arm,size=0x58) addr:0x0214591c +_ZN14ActorCharacter15IsHitboxTouchedEb kind:function(arm,size=0x100) addr:0x02145974 func_ov014_02145a74 kind:function(arm,size=0x74) addr:0x02145a74 func_ov014_02145ae8 kind:function(arm,size=0x30) addr:0x02145ae8 func_ov014_02145b18 kind:function(arm,size=0xb4) addr:0x02145b18 @@ -1178,44 +1178,44 @@ func_ov014_021474d8 kind:function(arm,size=0x70) addr:0x021474d8 func_ov014_02147548 kind:function(arm,size=0x3c) addr:0x02147548 func_ov014_02147584 kind:function(arm,size=0x108) addr:0x02147584 func_ov014_0214768c kind:function(arm,size=0x44) addr:0x0214768c -func_ov014_021476d0 kind:function(arm,size=0x78) addr:0x021476d0 -func_ov014_02147748 kind:function(arm,size=0xe0) addr:0x02147748 -func_ov014_02147828 kind:function(arm,size=0x18) addr:0x02147828 -func_ov014_02147840 kind:function(arm,size=0x30) addr:0x02147840 -func_ov014_02147870 kind:function(arm,size=0xd0) addr:0x02147870 -func_ov014_02147940 kind:function(arm,size=0x10) addr:0x02147940 -func_ov014_02147950 kind:function(arm,size=0x114) addr:0x02147950 -func_ov014_02147a64 kind:function(arm,size=0x44) addr:0x02147a64 -func_ov014_02147aa8 kind:function(arm,size=0x40) addr:0x02147aa8 -func_ov014_02147ae8 kind:function(arm,size=0x30) addr:0x02147ae8 -func_ov014_02147b18 kind:function(arm,size=0x88) addr:0x02147b18 -func_ov014_02147ba0 kind:function(arm,size=0x10) addr:0x02147ba0 -func_ov014_02147bb0 kind:function(arm,size=0x28) addr:0x02147bb0 -func_ov014_02147bd8 kind:function(arm,size=0x28) addr:0x02147bd8 -func_ov014_02147c00 kind:function(arm,size=0x64) addr:0x02147c00 -func_ov014_02147c64 kind:function(arm,size=0x1c) addr:0x02147c64 -func_ov014_02147c80 kind:function(arm,size=0x14) addr:0x02147c80 -func_ov014_02147c94 kind:function(arm,size=0x4) addr:0x02147c94 -func_ov014_02147c98 kind:function(arm,size=0x50) addr:0x02147c98 -func_ov014_02147ce8 kind:function(arm,size=0x5c) addr:0x02147ce8 -func_ov014_02147d44 kind:function(arm,size=0xac) addr:0x02147d44 -func_ov014_02147df0 kind:function(arm,size=0xc) addr:0x02147df0 -func_ov014_02147dfc kind:function(arm,size=0x20) addr:0x02147dfc -func_ov014_02147e1c kind:function(arm,size=0x48) addr:0x02147e1c -func_ov014_02147e64 kind:function(arm,size=0x58) addr:0x02147e64 -func_ov014_02147ebc kind:function(arm,size=0x1c) addr:0x02147ebc -func_ov014_02147ed8 kind:function(arm,size=0xc) addr:0x02147ed8 -func_ov014_02147ee4 kind:function(arm,size=0xd8) addr:0x02147ee4 -func_ov014_02147fbc kind:function(arm,size=0x10) addr:0x02147fbc -func_ov014_02147fcc kind:function(arm,size=0x108) addr:0x02147fcc -func_ov014_021480d4 kind:function(arm,size=0x5c) addr:0x021480d4 -func_ov014_02148130 kind:function(arm,size=0xc) addr:0x02148130 -func_ov014_0214813c kind:function(arm,size=0x2c) addr:0x0214813c -func_ov014_02148168 kind:function(arm,size=0x30) addr:0x02148168 -func_ov014_02148198 kind:function(arm,size=0x34) addr:0x02148198 -func_ov014_021481cc kind:function(arm,size=0x30) addr:0x021481cc -func_ov014_021481fc kind:function(arm,size=0x2c) addr:0x021481fc -func_ov014_02148228 kind:function(arm,size=0xc) addr:0x02148228 +_ZN21ActorGenericCharacterC2Ev kind:function(arm,size=0x78) addr:0x021476d0 +_ZN21ActorGenericCharacter4InitEv kind:function(arm,size=0xe0) addr:0x02147748 +_ZN21ActorGenericCharacter8vfunc_68Ev kind:function(arm,size=0x18) addr:0x02147828 +_ZN21ActorGenericCharacter8vfunc_c0Ev kind:function(arm,size=0x30) addr:0x02147840 +_ZN21ActorGenericCharacter8vfunc_c4Ev kind:function(arm,size=0xd0) addr:0x02147870 +_ZN21ActorGenericCharacter19func_ov014_02147940Ev kind:function(arm,size=0x10) addr:0x02147940 +_ZN21ActorGenericCharacter19func_ov014_02147950Ev kind:function(arm,size=0x114) addr:0x02147950 +_ZN21ActorGenericCharacter8vfunc_80Ev kind:function(arm,size=0x44) addr:0x02147a64 +_ZN21ActorGenericCharacter8vfunc_84Ev kind:function(arm,size=0x40) addr:0x02147aa8 +_ZN21ActorGenericCharacter19func_ov014_02147ae8Ev kind:function(arm,size=0x30) addr:0x02147ae8 +_ZN21ActorGenericCharacter19func_ov014_02147b18Ev kind:function(arm,size=0x88) addr:0x02147b18 +_ZN21ActorGenericCharacter19func_ov014_02147ba0Ev kind:function(arm,size=0x10) addr:0x02147ba0 +_ZN21ActorGenericCharacter19func_ov014_02147bb0Ev kind:function(arm,size=0x28) addr:0x02147bb0 +_ZN21ActorGenericCharacter19func_ov014_02147bd8Ev kind:function(arm,size=0x28) addr:0x02147bd8 +_ZN21ActorGenericCharacter19func_ov014_02147c00Ev kind:function(arm,size=0x64) addr:0x02147c00 +_ZN21ActorGenericCharacterD1Ev kind:function(arm,size=0x1c) addr:0x02147c64 +_ZN21ActorGenericCharacterD0Ev kind:function(arm,size=0x14) addr:0x02147c80 +_ZN21ActorGenericCharacter8vfunc_f8Ev kind:function(arm,size=0x4) addr:0x02147c94 +_ZN21ActorGenericCharacter19func_ov014_02147c98Ev kind:function(arm,size=0x50) addr:0x02147c98 +_ZN21ActorGenericCharacter19func_ov014_02147ce8Ei kind:function(arm,size=0x5c) addr:0x02147ce8 +_ZN21ActorGenericCharacter19func_ov014_02147d44Ei kind:function(arm,size=0xac) addr:0x02147d44 +_Z19func_ov014_02147df0P21ActorGenericCharacter kind:function(arm,size=0xc) addr:0x02147df0 +_ZN21ActorGenericCharacter19func_ov014_02147dfcEv kind:function(arm,size=0x20) addr:0x02147dfc +_ZN21ActorGenericCharacter19func_ov014_02147e1cEv kind:function(arm,size=0x48) addr:0x02147e1c +_ZN21ActorGenericCharacter19func_ov014_02147e64Ev kind:function(arm,size=0x58) addr:0x02147e64 +_ZN21ActorGenericCharacter19func_ov014_02147ebcEv kind:function(arm,size=0x1c) addr:0x02147ebc +_Z19func_ov014_02147ed8P21ActorGenericCharacter kind:function(arm,size=0xc) addr:0x02147ed8 +_ZN21ActorGenericCharacter19func_ov014_02147ee4Ev kind:function(arm,size=0xd8) addr:0x02147ee4 +_ZN21ActorGenericCharacter19func_ov014_02147fbcEv kind:function(arm,size=0x10) addr:0x02147fbc +_ZN21ActorGenericCharacter19func_ov014_02147fccEv kind:function(arm,size=0x108) addr:0x02147fcc +_ZN21ActorGenericCharacter19func_ov014_021480dcEv kind:function(arm,size=0x5c) addr:0x021480d4 +_ZN21ActorGenericCharacter19func_ov014_02148130Ev kind:function(arm,size=0xc) addr:0x02148130 +_ZN21ActorGenericCharacter19func_ov014_0214813cEv kind:function(arm,size=0x2c) addr:0x0214813c +_ZN21ActorGenericCharacter19func_ov014_02148168Ev kind:function(arm,size=0x30) addr:0x02148168 +_ZN21ActorGenericCharacter19func_ov014_02148198Ev kind:function(arm,size=0x34) addr:0x02148198 +_ZN21ActorGenericCharacter19func_ov014_021481ccEv kind:function(arm,size=0x30) addr:0x021481cc +_ZN21ActorGenericCharacter19func_ov014_021481fcEv kind:function(arm,size=0x2c) addr:0x021481fc +_Z19func_ov014_02148228P21ActorGenericCharacter kind:function(arm,size=0xc) addr:0x02148228 func_ov014_02148234 kind:function(arm,size=0x38) addr:0x02148234 func_ov014_0214826c kind:function(arm,size=0x14) addr:0x0214826c func_ov014_02148280 kind:function(arm,size=0x1c) addr:0x02148280 diff --git a/config/eur/arm9/overlays/ov031/delinks.txt b/config/eur/arm9/overlays/ov031/delinks.txt index 5d5e1607..cf7a6053 100644 --- a/config/eur/arm9/overlays/ov031/delinks.txt +++ b/config/eur/arm9/overlays/ov031/delinks.txt @@ -5,6 +5,9 @@ .data start:0x021820a0 end:0x02183e80 kind:data align:32 .bss start:0x02183e80 end:0x02184200 kind:bss align:32 +src/31_Shop/Actor/ActorItemSellerBase.cpp: + .text start:0x0217cf2c end:0x0217dbdc + src/31_Shop/Actor/ActorShopItem.cpp: .text start:0x0217dbdc end:0x02180708 .rodata start:0x021818e8 end:0x02181a88 @@ -12,3 +15,12 @@ src/31_Shop/Actor/ActorShopItem.cpp: .ctor start:0x02182080 end:0x02182084 .data start:0x02182290 end:0x02183a98 .bss start:0x02183e88 end:0x02184154 + +src/31_Shop/Actor/ActorItemSeller.cpp: + .text start:0x02180708 end:0x02180a84 + +src/31_Shop/Actor/ActorBeedle.cpp: + .text start:0x02180a84 end:0x02181448 + +src/31_Shop/Actor/ActorTetra.cpp: + .text start:0x02181448 end:0x021818a0 diff --git a/config/eur/arm9/overlays/ov031/symbols.txt b/config/eur/arm9/overlays/ov031/symbols.txt index 0473807f..64f71d4b 100644 --- a/config/eur/arm9/overlays/ov031/symbols.txt +++ b/config/eur/arm9/overlays/ov031/symbols.txt @@ -35,40 +35,40 @@ HasFreebieCard kind:function(arm,size=0x30) addr:0x0217ce90 _ZN24UnkStruct_ov031_02183e8019func_ov031_0217cec0Ev kind:function(arm,size=0x40) addr:0x0217cec0 func_ov031_0217cf00 kind:function(arm,size=0x1c) addr:0x0217cf00 _Z19func_ov031_0217cf1cv kind:function(arm,size=0x10) addr:0x0217cf1c -func_ov031_0217cf2c kind:function(arm,size=0x34) addr:0x0217cf2c -func_ov031_0217cf60 kind:function(arm,size=0x24) addr:0x0217cf60 -func_ov031_0217cf84 kind:function(arm,size=0x2c) addr:0x0217cf84 -func_ov031_0217cfb0 kind:function(arm,size=0x24) addr:0x0217cfb0 -func_ov031_0217cfd4 kind:function(arm,size=0x440) addr:0x0217cfd4 -func_ov031_0217d414 kind:function(arm,size=0x30) addr:0x0217d414 -func_ov031_0217d444 kind:function(arm,size=0x2c) addr:0x0217d444 -func_ov031_0217d470 kind:function(arm,size=0x118) addr:0x0217d470 -func_ov031_0217d588 kind:function(arm,size=0x38) addr:0x0217d588 -func_ov031_0217d5c0 kind:function(arm,size=0x4) addr:0x0217d5c0 -func_ov031_0217d5c4 kind:function(arm,size=0x24) addr:0x0217d5c4 -func_ov031_0217d5e8 kind:function(arm,size=0x28) addr:0x0217d5e8 -func_ov031_0217d610 kind:function(arm,size=0x1c) addr:0x0217d610 -func_ov031_0217d62c kind:function(arm,size=0xc) addr:0x0217d62c -func_ov031_0217d638 kind:function(arm,size=0x74) addr:0x0217d638 -func_ov031_0217d6ac kind:function(arm,size=0x24) addr:0x0217d6ac -func_ov031_0217d6d0 kind:function(arm,size=0x90) addr:0x0217d6d0 -func_ov031_0217d760 kind:function(arm,size=0x24) addr:0x0217d760 -func_ov031_0217d784 kind:function(arm,size=0x28) addr:0x0217d784 -func_ov031_0217d7ac kind:function(arm,size=0x84) addr:0x0217d7ac -func_ov031_0217d830 kind:function(arm,size=0x28) addr:0x0217d830 -func_ov031_0217d858 kind:function(arm,size=0x38) addr:0x0217d858 -func_ov031_0217d890 kind:function(arm,size=0x40) addr:0x0217d890 -func_ov031_0217d8d0 kind:function(arm,size=0xc) addr:0x0217d8d0 -func_ov031_0217d8dc kind:function(arm,size=0x60) addr:0x0217d8dc -func_ov031_0217d93c kind:function(arm,size=0x38) addr:0x0217d93c -func_ov031_0217d974 kind:function(arm,size=0x14) addr:0x0217d974 -func_ov031_0217d988 kind:function(arm,size=0xc) addr:0x0217d988 -func_ov031_0217d994 kind:function(arm,size=0x8c) addr:0x0217d994 -func_ov031_0217da20 kind:function(arm,size=0x60) addr:0x0217da20 -func_ov031_0217da80 kind:function(arm,size=0x38) addr:0x0217da80 -func_ov031_0217dab8 kind:function(arm,size=0x90) addr:0x0217dab8 -func_ov031_0217db48 kind:function(arm,size=0x8) addr:0x0217db48 -func_ov031_0217db50 kind:function(arm,size=0x8c) addr:0x0217db50 +_ZN19ActorItemSellerBaseC2Ev kind:function(arm,size=0x34) addr:0x0217cf2c +_ZN19ActorItemSellerBaseD1Ev kind:function(arm,size=0x24) addr:0x0217cf60 +_ZN19ActorItemSellerBaseD0Ev kind:function(arm,size=0x2c) addr:0x0217cf84 +_ZN19ActorItemSellerBaseD2Ev kind:function(arm,size=0x24) addr:0x0217cfb0 +_ZN19ActorItemSellerBase4InitEv kind:function(arm,size=0x440) addr:0x0217cfd4 +_ZN19ActorItemSellerBase8vfunc_20Eb kind:function(arm,size=0x30) addr:0x0217d414 +_ZN19ActorItemSellerBase8vfunc_c0Ev kind:function(arm,size=0x2c) addr:0x0217d444 +_ZN19ActorItemSellerBase8vfunc_c4Ev kind:function(arm,size=0x118) addr:0x0217d470 +_ZN19ActorItemSellerBase19func_ov031_0217d588Ev kind:function(arm,size=0x38) addr:0x0217d588 +_ZN19ActorItemSellerBase19func_ov031_0217d5c0Ev kind:function(arm,size=0x4) addr:0x0217d5c0 +_ZN19ActorItemSellerBase19func_ov031_0217d5c4Ev kind:function(arm,size=0x24) addr:0x0217d5c4 +_ZN19ActorItemSellerBase19func_ov031_0217d5e8Ev kind:function(arm,size=0x28) addr:0x0217d5e8 +_ZN19ActorItemSellerBase19func_ov031_0217d610Ev kind:function(arm,size=0x1c) addr:0x0217d610 +_ZN19ActorItemSellerBase19func_ov031_0217d62cEv kind:function(arm,size=0xc) addr:0x0217d62c +_ZN19ActorItemSellerBase19func_ov031_0217d638Ev kind:function(arm,size=0x74) addr:0x0217d638 +_ZN19ActorItemSellerBase19func_ov031_0217d6acEv kind:function(arm,size=0x24) addr:0x0217d6ac +_ZN19ActorItemSellerBase19func_ov031_0217d6d0Ev kind:function(arm,size=0x90) addr:0x0217d6d0 +_ZN19ActorItemSellerBase19func_ov031_0217d760Ev kind:function(arm,size=0x24) addr:0x0217d760 +_ZN19ActorItemSellerBase19func_ov031_0217d784Ev kind:function(arm,size=0x28) addr:0x0217d784 +_ZN19ActorItemSellerBase19func_ov031_0217d7acEv kind:function(arm,size=0x84) addr:0x0217d7ac +_ZN19ActorItemSellerBase19func_ov031_0217d830Ev kind:function(arm,size=0x28) addr:0x0217d830 +_ZN19ActorItemSellerBase19func_ov031_0217d858Ev kind:function(arm,size=0x38) addr:0x0217d858 +_ZN19ActorItemSellerBase19func_ov031_0217d890Ev kind:function(arm,size=0x40) addr:0x0217d890 +_ZN19ActorItemSellerBase19func_ov031_0217d8d0Ev kind:function(arm,size=0xc) addr:0x0217d8d0 +_ZN19ActorItemSellerBase19func_ov031_0217d8dcEv kind:function(arm,size=0x60) addr:0x0217d8dc +_ZN19ActorItemSellerBase19func_ov031_0217d93cEv kind:function(arm,size=0x38) addr:0x0217d93c +_ZN19ActorItemSellerBase19func_ov031_0217d974Ev kind:function(arm,size=0x14) addr:0x0217d974 +_ZN19ActorItemSellerBase8vfunc_d4Ev kind:function(arm,size=0xc) addr:0x0217d988 +_ZN19ActorItemSellerBase8vfunc_8cEv kind:function(arm,size=0x8c) addr:0x0217d994 +_ZN19ActorItemSellerBase19func_ov031_0217da20Ei kind:function(arm,size=0x60) addr:0x0217da20 +_ZN19ActorItemSellerBase8vfunc_68Ev kind:function(arm,size=0x38) addr:0x0217da80 +_ZN19ActorItemSellerBase16CollidesWithLinkEv kind:function(arm,size=0x90) addr:0x0217dab8 +_ZN19ActorItemSellerBase9vfunc_11cEv kind:function(arm,size=0x8) addr:0x0217db48 +_ZN19ActorItemSellerBase15IsHitboxTouchedEb kind:function(arm,size=0x8c) addr:0x0217db50 _ZN15ActorShopItemDM6CreateEv kind:function(arm,size=0x40) addr:0x0217dbdc _ZN20ActorShopItemSoldOut6CreateEv kind:function(arm,size=0x40) addr:0x0217dc1c _ZN27ActorShopItemHeartContainer6CreateEv kind:function(arm,size=0x40) addr:0x0217dc5c @@ -238,57 +238,57 @@ _ZN27ActorShopItemHeartContainerD0Ev kind:function(arm,size=0x1c) addr:0x021806a _ZN27ActorShopItemHeartContainerD1Ev kind:function(arm,size=0x14) addr:0x021806c4 _ZN15ActorShopItemDMD0Ev kind:function(arm,size=0x1c) addr:0x021806d8 _ZN15ActorShopItemDMD1Ev kind:function(arm,size=0x14) addr:0x021806f4 -func_ov031_02180708 kind:function(arm,size=0x44) addr:0x02180708 -func_ov031_0218074c kind:function(arm,size=0x44) addr:0x0218074c -func_ov031_02180790 kind:function(arm,size=0x44) addr:0x02180790 -func_ov031_021807d4 kind:function(arm,size=0x84) addr:0x021807d4 -func_ov031_02180858 kind:function(arm,size=0x108) addr:0x02180858 -func_ov031_02180960 kind:function(arm,size=0xc) addr:0x02180960 -func_ov031_0218096c kind:function(arm,size=0xc) addr:0x0218096c -func_ov031_02180978 kind:function(arm,size=0xc) addr:0x02180978 -func_ov031_02180984 kind:function(arm,size=0xc) addr:0x02180984 -func_ov031_02180990 kind:function(arm,size=0xc) addr:0x02180990 -func_ov031_0218099c kind:function(arm,size=0x18) addr:0x0218099c -func_ov031_021809b4 kind:function(arm,size=0xc) addr:0x021809b4 -func_ov031_021809c0 kind:function(arm,size=0x18) addr:0x021809c0 -func_ov031_021809d8 kind:function(arm,size=0x2c) addr:0x021809d8 -func_ov031_02180a04 kind:function(arm,size=0x50) addr:0x02180a04 -func_ov031_02180a54 kind:function(arm,size=0x1c) addr:0x02180a54 -func_ov031_02180a70 kind:function(arm,size=0x14) addr:0x02180a70 -func_ov031_02180a84 kind:function(arm,size=0x44) addr:0x02180a84 -func_ov031_02180ac8 kind:function(arm,size=0x108) addr:0x02180ac8 -func_ov031_02180bd0 kind:function(arm,size=0x118) addr:0x02180bd0 -func_ov031_02180ce8 kind:function(arm,size=0xf4) addr:0x02180ce8 -func_ov031_02180ddc kind:function(arm,size=0x68) addr:0x02180ddc -func_ov031_02180e44 kind:function(arm,size=0x8) addr:0x02180e44 -func_ov031_02180e4c kind:function(arm,size=0x4c) addr:0x02180e4c -func_ov031_02180e98 kind:function(arm,size=0x4c) addr:0x02180e98 -func_ov031_02180ee4 kind:function(arm,size=0x1c) addr:0x02180ee4 -func_ov031_02180f00 kind:function(arm,size=0x1c) addr:0x02180f00 -func_ov031_02180f1c kind:function(arm,size=0x1c) addr:0x02180f1c -func_ov031_02180f38 kind:function(arm,size=0x190) addr:0x02180f38 -func_ov031_021810c8 kind:function(arm,size=0x2c) addr:0x021810c8 -func_ov031_021810f4 kind:function(arm,size=0x38) addr:0x021810f4 -func_ov031_0218112c kind:function(arm,size=0x74) addr:0x0218112c -func_ov031_021811a0 kind:function(arm,size=0xc8) addr:0x021811a0 -func_ov031_02181268 kind:function(arm,size=0x18) addr:0x02181268 -func_ov031_02181280 kind:function(arm,size=0x14) addr:0x02181280 -func_ov031_02181294 kind:function(arm,size=0x50) addr:0x02181294 -func_ov031_021812e4 kind:function(arm,size=0x48) addr:0x021812e4 -func_ov031_0218132c kind:function(arm,size=0x8c) addr:0x0218132c -func_ov031_021813b8 kind:function(arm,size=0x40) addr:0x021813b8 -func_ov031_021813f8 kind:function(arm,size=0x20) addr:0x021813f8 -func_ov031_02181418 kind:function(arm,size=0x1c) addr:0x02181418 -func_ov031_02181434 kind:function(arm,size=0x14) addr:0x02181434 -func_ov031_02181448 kind:function(arm,size=0x70) addr:0x02181448 -func_ov031_021814b8 kind:function(arm,size=0x100) addr:0x021814b8 -func_ov031_021815b8 kind:function(arm,size=0x28) addr:0x021815b8 -func_ov031_021815e0 kind:function(arm,size=0x30) addr:0x021815e0 -func_ov031_02181610 kind:function(arm,size=0x188) addr:0x02181610 -func_ov031_02181798 kind:function(arm,size=0xd4) addr:0x02181798 -func_ov031_0218186c kind:function(arm,size=0x1c) addr:0x0218186c -func_ov031_02181888 kind:function(arm,size=0x14) addr:0x02181888 -func_ov031_0218189c kind:function(arm,size=0x4) addr:0x0218189c +_ZN16ActorItemSeller16CreateEv kind:function(arm,size=0x44) addr:0x02180708 +_ZN16ActorItemSeller26CreateEv kind:function(arm,size=0x44) addr:0x0218074c +_ZN16ActorItemSeller36CreateEv kind:function(arm,size=0x44) addr:0x02180790 +_ZN15ActorItemSeller4InitEv kind:function(arm,size=0x84) addr:0x021807d4 +_ZN15ActorItemSeller9vfunc_114Ev kind:function(arm,size=0x108) addr:0x02180858 +_ZN15ActorItemSeller8vfunc_f4Ev kind:function(arm,size=0xc) addr:0x02180960 +_ZN15ActorItemSeller8vfunc_f8Ev kind:function(arm,size=0xc) addr:0x0218096c +_ZN15ActorItemSeller8vfunc_fcEv kind:function(arm,size=0xc) addr:0x02180978 +_ZN15ActorItemSeller9vfunc_100Ev kind:function(arm,size=0xc) addr:0x02180984 +_ZN15ActorItemSeller9vfunc_104Ev kind:function(arm,size=0xc) addr:0x02180990 +_ZN15ActorItemSeller9vfunc_118Ev kind:function(arm,size=0x18) addr:0x0218099c +_ZN15ActorItemSeller8vfunc_d4Ev kind:function(arm,size=0xc) addr:0x021809b4 +_ZN15ActorItemSeller9vfunc_108Ev kind:function(arm,size=0x18) addr:0x021809c0 +_ZN15ActorItemSeller9vfunc_10cEv kind:function(arm,size=0x2c) addr:0x021809d8 +_ZN15ActorItemSeller9vfunc_110Ev kind:function(arm,size=0x50) addr:0x02180a04 +_ZN15ActorItemSellerD1Ev kind:function(arm,size=0x1c) addr:0x02180a54 +_ZN15ActorItemSellerD0Ev kind:function(arm,size=0x14) addr:0x02180a70 +_ZN11ActorBeedle6CreateEv kind:function(arm,size=0x44) addr:0x02180a84 +_ZN11ActorBeedle4InitEv kind:function(arm,size=0x108) addr:0x02180ac8 +_ZN11ActorBeedle8vfunc_c4Ev kind:function(arm,size=0x118) addr:0x02180bd0 +_ZN11ActorBeedle9vfunc_114Ev kind:function(arm,size=0xf4) addr:0x02180ce8 +_ZN11ActorBeedle8vfunc_d4Ev kind:function(arm,size=0x68) addr:0x02180ddc +_Z19func_ov031_02180e44ii kind:function(arm,size=0x8) addr:0x02180e44 +_ZN11ActorBeedle8vfunc_f4Ev kind:function(arm,size=0x4c) addr:0x02180e4c +_ZN11ActorBeedle8vfunc_f8Ev kind:function(arm,size=0x4c) addr:0x02180e98 +_ZN11ActorBeedle8vfunc_fcEv kind:function(arm,size=0x1c) addr:0x02180ee4 +_ZN11ActorBeedle9vfunc_100Ev kind:function(arm,size=0x1c) addr:0x02180f00 +_ZN11ActorBeedle9vfunc_104Ev kind:function(arm,size=0x1c) addr:0x02180f1c +_ZN11ActorBeedle8vfunc_d8Ev kind:function(arm,size=0x190) addr:0x02180f38 +_ZN11ActorBeedle8vfunc_dcEv kind:function(arm,size=0x2c) addr:0x021810c8 +_ZN11ActorBeedle8vfunc_e0Ev kind:function(arm,size=0x38) addr:0x021810f4 +_ZN11ActorBeedle8vfunc_70Ev kind:function(arm,size=0x74) addr:0x0218112c +_ZN11ActorBeedle8vfunc_6cEv kind:function(arm,size=0xc8) addr:0x021811a0 +_ZN11ActorBeedle9vfunc_108Ev kind:function(arm,size=0x18) addr:0x02181268 +_ZN11ActorBeedle9vfunc_10cEv kind:function(arm,size=0x14) addr:0x02181280 +_ZN11ActorBeedle9vfunc_110Ev kind:function(arm,size=0x50) addr:0x02181294 +_ZN11ActorBeedle19func_ov031_021812e4Ei kind:function(arm,size=0x48) addr:0x021812e4 +_ZN11ActorBeedle19func_ov031_0218132cEi kind:function(arm,size=0x8c) addr:0x0218132c +_ZN11ActorBeedle9vfunc_11cEv kind:function(arm,size=0x40) addr:0x021813b8 +_ZN11ActorBeedle9vfunc_118Ev kind:function(arm,size=0x20) addr:0x021813f8 +_ZN11ActorBeedleD1Ev kind:function(arm,size=0x1c) addr:0x02181418 +_ZN11ActorBeedleD0Ev kind:function(arm,size=0x14) addr:0x02181434 +_ZN10ActorTetra6CreateEv kind:function(arm,size=0x70) addr:0x02181448 +_ZN10ActorTetra8vfunc_f4Ev kind:function(arm,size=0x100) addr:0x021814b8 +_ZN10ActorTetra8vfunc_c4Ev kind:function(arm,size=0x28) addr:0x021815b8 +_ZN10ActorTetra8vfunc_20Eb kind:function(arm,size=0x30) addr:0x021815e0 +_ZN14ActorTetra_4b019func_ov031_02181610Eiiiit kind:function(arm,size=0x188) addr:0x02181610 +_ZN14ActorTetra_4b019func_ov031_02181798Ev kind:function(arm,size=0xd4) addr:0x02181798 +_ZN10ActorTetraD1Ev kind:function(arm,size=0x1c) addr:0x0218186c +_ZN10ActorTetraD0Ev kind:function(arm,size=0x14) addr:0x02181888 +_ZN10ActorTetra8vfunc_f8Ev kind:function(arm,size=0x4) addr:0x0218189c data_ov031_021818a0 kind:data(any) addr:0x021818a0 sShopItemBaseNames kind:data(any) addr:0x021818e8 local unk$1534 kind:data(any) addr:0x02181a58 local |