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 | 10 | ||||
| -rw-r--r-- | config/usa/arm9/overlays/ov014/symbols.txt | 24 |
3 files changed, 19 insertions, 17 deletions
diff --git a/config/usa/arm9/overlays/ov014/delinks.txt b/config/usa/arm9/overlays/ov014/delinks.txt index 32dedf81..2bd19328 100644 --- a/config/usa/arm9/overlays/ov014/delinks.txt +++ b/config/usa/arm9/overlays/ov014/delinks.txt @@ -22,7 +22,9 @@ src/14_Land/Actor/Player/ActorRefill.cpp: .bss start:0x0215aef4 end:0x0215af94 src/14_Land/Actor/Character/ActorCharacterBase.cpp: + complete .text start:0x02144754 end:0x02144cf0 + .data start:0x02159418 end:0x0215950c src/14_Land/Actor/Character/ActorCharacter.cpp: .text start:0x02144cf0 end:0x021459d0 diff --git a/config/usa/arm9/overlays/ov014/relocs.txt b/config/usa/arm9/overlays/ov014/relocs.txt index 05c01539..3c9e2649 100644 --- a/config/usa/arm9/overlays/ov014/relocs.txt +++ b/config/usa/arm9/overlays/ov014/relocs.txt @@ -4513,22 +4513,22 @@ from:0x02144740 kind:arm_call_thumb to:0x020a958c module:overlay(0) from:0x02144748 kind:arm_call to:0x0202ea08 module:main from:0x02144864 kind:arm_call to:0x020c14f4 module:overlay(0) from:0x02144878 kind:arm_call to:0x020d1894 module:overlay(0) -from:0x021448a4 kind:load to:0x02159420 module:overlay(14) +from:0x021448a4 kind:load to:0x02159418 module:overlay(14) add:0x8 from:0x021448cc kind:arm_call to:0x02036d08 module:main from:0x021448d4 kind:arm_call to:0x020d1920 module:overlay(0) from:0x021448dc kind:arm_call to:0x020c16d0 module:overlay(0) -from:0x021448e8 kind:load to:0x02159420 module:overlay(14) +from:0x021448e8 kind:load to:0x02159418 module:overlay(14) add:0x8 from:0x021448ec kind:load to:0x027e0c68 module:dtcm from:0x02144914 kind:arm_call to:0x02036d08 module:main from:0x0214491c kind:arm_call to:0x020d1920 module:overlay(0) from:0x02144924 kind:arm_call to:0x020c16d0 module:overlay(0) from:0x0214492c kind:arm_call to:0x0202ea08 module:main -from:0x02144938 kind:load to:0x02159420 module:overlay(14) +from:0x02144938 kind:load to:0x02159418 module:overlay(14) add:0x8 from:0x0214493c kind:load to:0x027e0c68 module:dtcm from:0x02144964 kind:arm_call to:0x02036d08 module:main from:0x0214496c kind:arm_call to:0x020d1920 module:overlay(0) from:0x02144974 kind:arm_call to:0x020c16d0 module:overlay(0) -from:0x02144980 kind:load to:0x02159420 module:overlay(14) +from:0x02144980 kind:load to:0x02159418 module:overlay(14) add:0x8 from:0x02144984 kind:load to:0x027e0c68 module:dtcm from:0x021449d8 kind:load to:0x02144754 module:overlay(14) from:0x021449dc kind:load to:0x02144768 module:overlay(14) @@ -4574,7 +4574,7 @@ from:0x02144ea0 kind:arm_call_thumb to:0x020c0ba8 module:overlay(0) 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:0x02159514 module:overlay(14) +from:0x02144f54 kind:load to:0x0215950c module:overlay(14) add:0x8 from:0x02144f58 kind:load to:0x0215962c module:overlay(14) from:0x02144f5c kind:load to:0x020a9b0d module:overlay(0) from:0x02144f60 kind:load to:0x02144e0c module:overlay(14) diff --git a/config/usa/arm9/overlays/ov014/symbols.txt b/config/usa/arm9/overlays/ov014/symbols.txt index 735d3e12..297b3b00 100644 --- a/config/usa/arm9/overlays/ov014/symbols.txt +++ b/config/usa/arm9/overlays/ov014/symbols.txt @@ -1061,16 +1061,16 @@ func_ov014_02144750 kind:function(arm,size=0x38) addr:0x021446ac func_ov014_02144788 kind:function(arm,size=0x38) addr:0x021446e4 func_ov014_021447c0 kind:function(arm,size=0x1c) addr:0x0214471c func_ov014_021447dc kind:function(arm,size=0x1c) addr:0x02144738 -_Z19func_ov014_021447f8P18ActorCharacterBase kind:function(arm,size=0x14) addr:0x02144754 -_Z19func_ov014_0214480cP18ActorCharacterBase kind:function(arm,size=0x14) addr:0x02144768 -_Z19func_ov014_02144820P18ActorCharacterBase kind:function(arm,size=0x14) addr:0x0214477c -_Z19func_ov014_02144834P18ActorCharacterBase kind:function(arm,size=0x14) addr:0x02144790 -_Z19func_ov014_02144848PiiP18ActorCharacterBase kind:function(arm,size=0x8c) addr:0x021447a4 -_ZN18ActorCharacterBase8vfunc_d8Ev kind:function(arm,size=0x8) addr:0x02144830 -_ZN18ActorCharacterBase8vfunc_dcEv kind:function(arm,size=0x8) addr:0x02144838 -_ZN18ActorCharacterBase8vfunc_e0Ev kind:function(arm,size=0x8) addr:0x02144840 -_ZN18ActorCharacterBase8vfunc_e4Ev kind:function(arm,size=0x8) addr:0x02144848 -_ZN18ActorCharacterBase8vfunc_e8Ev kind:function(arm,size=0xc) addr:0x02144850 +_Z19func_ov014_021447f8Pvi kind:function(arm,size=0x14) addr:0x02144754 local +_Z19func_ov014_0214480cPvi kind:function(arm,size=0x14) addr:0x02144768 local +_Z19func_ov014_02144820Pvi kind:function(arm,size=0x14) addr:0x0214477c local +_Z19func_ov014_02144834Pvi kind:function(arm,size=0x14) addr:0x02144790 local +_Z19func_ov014_0214484824UnkStruct_ov014_02144848P18ActorCharacterBase kind:function(arm,size=0x8c) addr:0x021447a4 local +_ZN18ActorCharacterBase8vfunc_d8Ei kind:function(arm,size=0x8) addr:0x02144830 +_ZN18ActorCharacterBase8vfunc_dcEi kind:function(arm,size=0x8) addr:0x02144838 +_ZN18ActorCharacterBase8vfunc_e0Ei kind:function(arm,size=0x8) addr:0x02144840 +_ZN18ActorCharacterBase8vfunc_e4Ei kind:function(arm,size=0x8) addr:0x02144848 +_ZN18ActorCharacterBase8vfunc_e8Ett kind:function(arm,size=0xc) addr:0x02144850 _ZN18ActorCharacterBaseC2Ev kind:function(arm,size=0x4c) addr:0x0214485c _ZN18ActorCharacterBaseD1Ev kind:function(arm,size=0x48) addr:0x021448a8 _ZN18ActorCharacterBaseD0Ev kind:function(arm,size=0x50) addr:0x021448f0 @@ -2077,8 +2077,8 @@ data_ov014_021593d8 kind:data(any) addr:0x02159338 data_ov014_021593dc kind:data(any) addr:0x0215933c data_ov014_02159408 kind:data(any) addr:0x02159368 data_ov014_02159478 kind:data(any) addr:0x021593d8 -data_ov014_021594c0 kind:data(any) addr:0x02159420 -data_ov014_021595b4 kind:data(any) addr:0x02159514 +_ZTV18ActorCharacterBase kind:data(any) addr:0x02159418 +_ZTV14ActorCharacter kind:data(any) addr:0x0215950c data_ov014_021596b0 kind:data(any) addr:0x02159610 data_ov014_021596b8 kind:data(any) addr:0x02159618 data_ov014_021596bc kind:data(any) addr:0x0215961c |