diff options
Diffstat (limited to 'config/usa/arm9/overlays/ov014')
| -rw-r--r-- | config/usa/arm9/overlays/ov014/delinks.txt | 2 | ||||
| -rw-r--r-- | config/usa/arm9/overlays/ov014/relocs.txt | 6 | ||||
| -rw-r--r-- | config/usa/arm9/overlays/ov014/symbols.txt | 36 |
3 files changed, 23 insertions, 21 deletions
diff --git a/config/usa/arm9/overlays/ov014/delinks.txt b/config/usa/arm9/overlays/ov014/delinks.txt index 2bd19328..b433af80 100644 --- a/config/usa/arm9/overlays/ov014/delinks.txt +++ b/config/usa/arm9/overlays/ov014/delinks.txt @@ -27,7 +27,9 @@ src/14_Land/Actor/Character/ActorCharacterBase.cpp: .data start:0x02159418 end:0x0215950c src/14_Land/Actor/Character/ActorCharacter.cpp: + complete .text start:0x02144cf0 end:0x021459d0 + .data start:0x0215950c end:0x02159608 src/14_Land/Actor/Character/ActorGenericCharacter.cpp: .text start:0x0214762c end:0x02148190 diff --git a/config/usa/arm9/overlays/ov014/relocs.txt b/config/usa/arm9/overlays/ov014/relocs.txt index 3c9e2649..612b8ca1 100644 --- a/config/usa/arm9/overlays/ov014/relocs.txt +++ b/config/usa/arm9/overlays/ov014/relocs.txt @@ -4564,7 +4564,7 @@ from:0x02144dcc kind:load to:0x02097700 module:overlay(0) from:0x02144de0 kind:arm_call to:0x02144db4 module:overlay(14) from:0x02144e00 kind:arm_call_thumb to:0x020a958c module:overlay(0) from:0x02144e1c kind:arm_call_thumb to:0x020c0ba8 module:overlay(0) -from:0x02144e30 kind:load to:0x02159610 module:overlay(14) +from:0x02144e30 kind:load to:0x02159608 module:overlay(14) add:0x8 from:0x02144e40 kind:arm_call to:0x0214485c module:overlay(14) from:0x02144e50 kind:arm_call to:0x020cce90 module:overlay(0) from:0x02144e64 kind:arm_call to:0x020c5bcc module:overlay(0) @@ -4575,10 +4575,10 @@ from:0x02144ef0 kind:arm_call to:0x020c665c module:overlay(0) from:0x02144f30 kind:arm_call to:0x020078f4 module:main from:0x02144f44 kind:arm_call to:0x020078f4 module:main from:0x02144f54 kind:load to:0x0215950c module:overlay(14) add:0x8 -from:0x02144f58 kind:load to:0x0215962c module:overlay(14) +from:0x02144f58 kind:load to:0x02159624 module:overlay(14) add:0x8 from:0x02144f5c kind:load to:0x020a9b0d module:overlay(0) from:0x02144f60 kind:load to:0x02144e0c module:overlay(14) -from:0x02144f64 kind:load to:0x02159610 module:overlay(14) +from:0x02144f64 kind:load to:0x02159608 module:overlay(14) add:0x8 from:0x02144f78 kind:arm_call to:0x020c6670 module:overlay(0) from:0x02144f80 kind:arm_call_thumb to:0x020a9b0c module:overlay(0) from:0x02144f94 kind:arm_call to:0x0204f710 module:main diff --git a/config/usa/arm9/overlays/ov014/symbols.txt b/config/usa/arm9/overlays/ov014/symbols.txt index 297b3b00..c8730b51 100644 --- a/config/usa/arm9/overlays/ov014/symbols.txt +++ b/config/usa/arm9/overlays/ov014/symbols.txt @@ -1096,8 +1096,8 @@ _ZN14ActorCharacter19func_ov014_02144e28Ev kind:function(arm,size=0x14) addr:0x0 _ZN14ActorCharacter19func_ov014_02144e3cEv kind:function(arm,size=0x1c) addr:0x02144d98 _ZN14ActorCharacter19func_ov014_02144e58Ev kind:function(arm,size=0x1c) addr:0x02144db4 _ZN14ActorCharacter19func_ov014_02144e74Ev kind:function(arm,size=0x28) addr:0x02144dd0 -_ZN19ActorCharacterModelD0Ev kind:function(arm,size=0x14) addr:0x02144df8 -_ZN18ActorCharacter_288C1Ev kind:function(arm,size=0x28) addr:0x02144e0c +_ZN19ActorCharacterModelD1Ev kind:function(arm,size=0x14) addr:0x02144df8 +_ZN21ActorCharacter_1d8_b0C1Ev kind:function(arm,size=0x28) addr:0x02144e0c _ZN14ActorCharacterC2Ev kind:function(arm,size=0x138) addr:0x02144e34 _ZN14ActorCharacterD1Ev kind:function(arm,size=0x48) addr:0x02144f6c _ZN14ActorCharacterD0Ev kind:function(arm,size=0x50) addr:0x02144fb4 @@ -1109,26 +1109,26 @@ _ZN14ActorCharacter19func_ov014_021451f0EPi kind:function(arm,size=0x68) addr:0x _ZN14ActorCharacter19func_ov014_02145258Ev kind:function(arm,size=0x58) addr:0x021451b4 _ZN14ActorCharacter19func_ov014_021452b0Ev kind:function(arm,size=0x68) addr:0x0214520c _ZN14ActorCharacter19func_ov014_02145318Ev kind:function(arm,size=0xdc) addr:0x02145274 -_ZN14ActorCharacter19func_ov014_021453f4Ev kind:function(arm,size=0x20) addr:0x02145350 -_ZN14ActorCharacter19func_ov014_02145414Ev kind:function(arm,size=0x78) addr:0x02145370 -_ZN14ActorCharacter19func_ov014_0214548cEv kind:function(arm,size=0x7c) addr:0x021453e8 +_ZN14ActorCharacter19func_ov014_021453f4Ei kind:function(arm,size=0x20) addr:0x02145350 +_ZN14ActorCharacter19func_ov014_02145414Eii kind:function(arm,size=0x78) addr:0x02145370 +_ZN14ActorCharacter19func_ov014_0214548cEi kind:function(arm,size=0x7c) addr:0x021453e8 _ZN14ActorCharacter19func_ov014_02145508Ev kind:function(arm,size=0x18) addr:0x02145464 -_Z19func_ov014_02145520P14ActorCharacter kind:function(arm,size=0xc) addr:0x0214547c +_ZN14ActorCharacter19func_ov014_02145520EP18ActorCharacterBase kind:function(arm,size=0xc) addr:0x0214547c _ZN14ActorCharacter19func_ov014_0214552cEv kind:function(arm,size=0x4c) addr:0x02145488 _ZN14ActorCharacter8vfunc_80Ev kind:function(arm,size=0x38) addr:0x021454d4 _ZN14ActorCharacter8vfunc_84Ev kind:function(arm,size=0x34) addr:0x0214550c _ZN14ActorCharacter8vfunc_ccEv kind:function(arm,size=0x94) addr:0x02145540 _ZN14ActorCharacter8vfunc_c8Ev kind:function(arm,size=0x18) addr:0x021455d4 _ZN14ActorCharacter8vfunc_78Ev kind:function(arm,size=0x8) addr:0x021455ec -_ZN14ActorCharacter8vfunc_74Ev kind:function(arm,size=0xa4) addr:0x021455f4 -_ZN14ActorCharacter8vfunc_7cEv kind:function(arm,size=0x24) addr:0x02145698 -_ZN14ActorCharacter8vfunc_90Ev kind:function(arm,size=0xb4) addr:0x021456bc -_ZN14ActorCharacter8vfunc_94Ev kind:function(arm,size=0x60) addr:0x02145770 +_ZN14ActorCharacter8vfunc_74EP8ActorRef kind:function(arm,size=0xa4) addr:0x021455f4 +_ZN14ActorCharacter8vfunc_7cEP8ActorRef kind:function(arm,size=0x24) addr:0x02145698 +_ZN14ActorCharacter8vfunc_90Eii kind:function(arm,size=0xb4) addr:0x021456bc +_ZN14ActorCharacter8vfunc_94Eii kind:function(arm,size=0x60) addr:0x02145770 _ZN14ActorCharacter8vfunc_98Ev kind:function(arm,size=0x2c) addr:0x021457d0 _ZN14ActorCharacter8vfunc_d0Ev kind:function(arm,size=0x10) addr:0x021457fc _ZN14ActorCharacter8vfunc_9cEv kind:function(arm,size=0x1c) addr:0x0214580c _ZN14ActorCharacter8vfunc_ecEi kind:function(arm,size=0x34) addr:0x02145828 -_ZN14ActorCharacter8vfunc_f0Ei kind:function(arm,size=0x1c) addr:0x0214585c +_ZN14ActorCharacter8vfunc_f0Eii kind:function(arm,size=0x1c) addr:0x0214585c _ZN14ActorCharacter19func_ov014_0214591cEv kind:function(arm,size=0x58) addr:0x02145878 _ZN14ActorCharacter15IsHitboxTouchedEb kind:function(arm,size=0x100) addr:0x021458d0 func_ov014_02145a74 kind:function(arm,size=0x74) addr:0x021459d0 @@ -1136,9 +1136,9 @@ func_ov014_02145ae8 kind:function(arm,size=0x30) addr:0x02145a44 func_ov014_02145b18 kind:function(arm,size=0xb4) addr:0x02145a74 func_ov014_02145bcc kind:function(arm,size=0xb0) addr:0x02145b28 func_ov014_02145c7c kind:function(arm,size=0x30) addr:0x02145bd8 -func_ov014_02145cac kind:function(arm,size=0x19c) addr:0x02145c08 +_ZN18ActorCharacter_1d819func_ov014_02145cacEv kind:function(arm,size=0x19c) addr:0x02145c08 func_ov014_02145e48 kind:function(arm,size=0xc4) addr:0x02145da4 -func_ov014_02145f0c kind:function(arm,size=0x1ac) addr:0x02145e68 +_ZN18ActorCharacter_1d819func_ov014_02145f0cEi kind:function(arm,size=0x1ac) addr:0x02145e68 func_ov014_021460b8 kind:function(arm,size=0x54) addr:0x02146014 func_ov014_0214610c kind:function(arm,size=0x14) addr:0x02146068 func_ov014_02146120 kind:function(arm,size=0x74) addr:0x0214607c @@ -1254,12 +1254,12 @@ func_ov014_0214a4bc kind:function(arm,size=0x8) addr:0x0214a418 func_ov014_0214a4c4 kind:function(arm,size=0x20) addr:0x0214a420 func_ov014_0214a4e4 kind:function(arm,size=0x18) addr:0x0214a440 func_ov014_0214a4fc kind:function(arm,size=0x64) addr:0x0214a458 -func_ov014_0214a560 kind:function(arm,size=0xa4) addr:0x0214a4bc +_ZN19ActorCharacterModelC1Ev kind:function(arm,size=0xa4) addr:0x0214a4bc func_ov014_0214a604 kind:function(arm,size=0x14) addr:0x0214a560 func_ov014_0214a618 kind:function(arm,size=0x108) addr:0x0214a574 func_ov014_0214a720 kind:function(arm,size=0x20c) addr:0x0214a67c -func_ov014_0214a92c kind:function(arm,size=0xe0) addr:0x0214a888 -func_ov014_0214aa0c kind:function(arm,size=0x20) addr:0x0214a968 +_ZN19ActorCharacterModel19func_ov014_0214a92cEP5Vec3pS1_s kind:function(arm,size=0xe0) addr:0x0214a888 +_ZN19ActorCharacterModel19func_ov014_0214aa0cEP5Vec3ps kind:function(arm,size=0x20) addr:0x0214a968 func_ov014_0214aa2c kind:function(arm,size=0xe8) addr:0x0214a988 func_ov014_0214ab14 kind:function(arm,size=0x1c) addr:0x0214aa70 func_ov014_0214ab30 kind:function(arm,size=0x30) addr:0x0214aa8c @@ -2079,10 +2079,10 @@ data_ov014_02159408 kind:data(any) addr:0x02159368 data_ov014_02159478 kind:data(any) addr:0x021593d8 _ZTV18ActorCharacterBase kind:data(any) addr:0x02159418 _ZTV14ActorCharacter kind:data(any) addr:0x0215950c -data_ov014_021596b0 kind:data(any) addr:0x02159610 +_ZTV21ActorCharacter_1d8_b0 kind:data(any) addr:0x02159608 data_ov014_021596b8 kind:data(any) addr:0x02159618 data_ov014_021596bc kind:data(any) addr:0x0215961c -data_ov014_021596cc kind:data(any) addr:0x0215962c +_ZTV18ActorCharacter_1d8 kind:data(any) addr:0x02159624 data_ov014_021596d8 kind:data(any) addr:0x02159638 data_ov014_021596dc kind:data(any) addr:0x0215963c data_ov014_021596e0 kind:data(any) addr:0x02159640 |