diff options
| -rw-r--r-- | config/eur/arm9/overlays/ov000/delinks.txt | 7 | ||||
| -rw-r--r-- | config/eur/arm9/overlays/ov000/symbols.txt | 22 | ||||
| -rw-r--r-- | config/usa/arm9/overlays/ov000/delinks.txt | 7 | ||||
| -rw-r--r-- | config/usa/arm9/overlays/ov000/symbols.txt | 22 | ||||
| -rw-r--r-- | include/Actor/Navi/ActorWisdomNavi.hpp | 16 | ||||
| -rw-r--r-- | src/00_Core/Actor/Navi/ActorWisdomNavi.cpp | 7 |
6 files changed, 59 insertions, 22 deletions
diff --git a/config/eur/arm9/overlays/ov000/delinks.txt b/config/eur/arm9/overlays/ov000/delinks.txt index 0849ccdc..3cea47c4 100644 --- a/config/eur/arm9/overlays/ov000/delinks.txt +++ b/config/eur/arm9/overlays/ov000/delinks.txt @@ -50,6 +50,13 @@ src/00_Core/Actor/Navi/ActorNaviBase.cpp: .data start:0x020e676c end:0x020e68d4 .sbss start:0x020ee1f8 end:0x020ee1fc +src/00_Core/Actor/Navi/ActorWisdomNavi.cpp: + .text start:0x020c0b64 end:0x020c0bdc + .init start:0x020e1b54 end:0x020e1b94 + .ctor start:0x020e1f18 end:0x020e1f1c + .data start:0x020e7098 end:0x020e7190 + .sbss start:0x020ee590 end:0x020ee5b0 + src/00_Core/Item/Item.cpp: .text start:0x020ad020 end:0x020ad090 .rodata start:0x020dc574 end:0x020dc6c4 diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 893b1f66..b3642fb1 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -2696,10 +2696,10 @@ _ZN11EquipShield8vfunc_1cEv kind:function(arm,size=0xc) addr:0x20c07f8 _ZN11EquipShield8vfunc_30Ev kind:function(arm,size=0x68) addr:0x20c0804 _ZN11EquipShield8vfunc_38Ei kind:function(arm,size=0x21c) addr:0x20c086c _ZNK11EquipShield9GetHitboxEP8Cylinder kind:function(arm,size=0xdc) addr:0x20c0a88 -func_ov000_020c0b64 kind:function(arm,size=0x40) addr:0x20c0b64 -func_ov000_020c0ba4 kind:function(arm,size=0x8) addr:0x20c0ba4 -func_ov000_020c0bac kind:function(arm,size=0x1c) addr:0x20c0bac -func_ov000_020c0bc8 kind:function(arm,size=0x14) addr:0x20c0bc8 +_ZN15ActorWisdomNavi6CreateEv kind:function(arm,size=0x40) addr:0x20c0b64 +_ZN15ActorWisdomNavi8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x20c0ba4 +_ZN15ActorWisdomNaviD1Ev kind:function(arm,size=0x1c) addr:0x20c0bac +_ZN15ActorWisdomNaviD0Ev kind:function(arm,size=0x14) addr:0x20c0bc8 func_ov000_020c0bdc kind:function(arm,size=0x2c) addr:0x20c0bdc func_ov000_020c0c08 kind:function(thumb,size=0x28) addr:0x20c0c08 func_ov000_020c0c30 kind:function(thumb,size=0x4) addr:0x20c0c30 @@ -3959,7 +3959,7 @@ __sinit_ActorNavi.cpp kind:function(arm,size=0x64) addr:0x20e12d8 __sinit_ActorForceNavi.cpp 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_ActorWisdomNavi.cpp 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 @@ -5057,7 +5057,7 @@ data_ov000_020e7014 kind:data(any) addr:0x20e7014 data_ov000_020e7018 kind:data(any) addr:0x20e7018 data_ov000_020e701c kind:data(any) addr:0x20e701c data_ov000_020e7048 kind:data(any) addr:0x20e7048 -data_ov000_020e70a0 kind:data(any) addr:0x20e70a0 +_ZTV15ActorWisdomNavi kind:data(any) addr:0x20e70a0 data_ov000_020e7198 kind:data(any) addr:0x20e7198 data_ov000_020e71a0 kind:data(any) addr:0x20e71a0 data_ov000_020e71a4 kind:data(any) addr:0x20e71a4 @@ -5875,11 +5875,11 @@ data_ov000_020ee16c kind:bss addr:0x20ee16c data_ov000_020ee178 kind:bss addr:0x20ee178 data_ov000_020ee184 kind:bss addr:0x20ee184 data_ov000_020ee198 kind:bss addr:0x20ee198 -@418 kind:bss addr:0x20ee1a0 +@418 kind:bss addr:0x20ee1a0 local _ZN9ActorNavi5gTypeE kind:bss addr:0x20ee1ac -@419 kind:bss addr:0x20ee1c0 +@419 kind:bss addr:0x20ee1c0 local data_ov000_020ee1cc kind:bss addr:0x20ee1cc -@405 kind:bss addr:0x20ee1d8 +@405 kind:bss addr:0x20ee1d8 local _ZN14ActorForceNavi5gTypeE kind:bss addr:0x20ee1e4 data_ov000_020ee1f8 kind:bss addr:0x20ee1f8 data_ov000_020ee1fc kind:bss addr:0x20ee1fc @@ -5943,8 +5943,8 @@ data_ov000_020ee55c kind:bss addr:0x20ee55c data_ov000_020ee568 kind:bss addr:0x20ee568 gPlayerAnimHandler kind:bss addr:0x20ee57c data_ov000_020ee588 kind:bss addr:0x20ee588 -data_ov000_020ee590 kind:bss addr:0x20ee590 -data_ov000_020ee59c kind:bss addr:0x20ee59c +@405 kind:bss addr:0x20ee590 local +_ZN15ActorWisdomNavi5gTypeE kind:bss addr:0x20ee59c data_ov000_020ee5b0 kind:bss addr:0x20ee5b0 data_ov000_020ee5bc kind:bss addr:0x20ee5bc data_ov000_020ee5d0 kind:bss addr:0x20ee5d0 diff --git a/config/usa/arm9/overlays/ov000/delinks.txt b/config/usa/arm9/overlays/ov000/delinks.txt index 9fe997fb..95a103c2 100644 --- a/config/usa/arm9/overlays/ov000/delinks.txt +++ b/config/usa/arm9/overlays/ov000/delinks.txt @@ -50,6 +50,13 @@ src/00_Core/Actor/Navi/ActorNaviBase.cpp: .data start:0x020e670c end:0x020e6874 .sbss start:0x020ee198 end:0x020ee19c +src/00_Core/Actor/Navi/ActorWisdomNavi.cpp: + .text start:0x020c0b04 end:0x020c0b7c + .init start:0x020e1af4 end:0x020e1b34 + .ctor start:0x020e1eb8 end:0x020e1ebc + .data start:0x020e7038 end:0x020e7130 + .sbss start:0x020ee530 end:0x020ee53c + src/00_Core/Item/Item.cpp: .text start:0x020acfc0 end:0x020ad030 .rodata start:0x020dc514 end:0x020dc664 diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 0b2c4428..3de717bc 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -2696,10 +2696,10 @@ _ZN11EquipShield8vfunc_1cEv kind:function(arm,size=0xc) addr:0x20c0798 _ZN11EquipShield8vfunc_30Ev kind:function(arm,size=0x68) addr:0x20c07a4 _ZN11EquipShield8vfunc_38Ei kind:function(arm,size=0x21c) addr:0x20c080c _ZNK11EquipShield9GetHitboxEP8Cylinder kind:function(arm,size=0xdc) addr:0x20c0a28 -func_ov000_020c0b64 kind:function(arm,size=0x40) addr:0x20c0b04 -func_ov000_020c0ba4 kind:function(arm,size=0x8) addr:0x20c0b44 -func_ov000_020c0bac kind:function(arm,size=0x1c) addr:0x20c0b4c -func_ov000_020c0bc8 kind:function(arm,size=0x14) addr:0x20c0b68 +_ZN15ActorWisdomNavi6CreateEv kind:function(arm,size=0x40) addr:0x20c0b04 +_ZN15ActorWisdomNavi8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x20c0b44 +_ZN15ActorWisdomNaviD1Ev kind:function(arm,size=0x1c) addr:0x20c0b4c +_ZN15ActorWisdomNaviD0Ev kind:function(arm,size=0x14) addr:0x20c0b68 func_ov000_020c0bdc kind:function(arm,size=0x2c) addr:0x20c0b7c func_ov000_020c0c08 kind:function(thumb,size=0x28) addr:0x20c0ba8 func_ov000_020c0c30 kind:function(thumb,size=0x4) addr:0x20c0bd0 @@ -3959,7 +3959,7 @@ __sinit_ActorNavi.cpp kind:function(arm,size=0x64) addr:0x20e1278 __sinit_ActorForceNavi.cpp 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_ActorWisdomNavi.cpp 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 @@ -5057,7 +5057,7 @@ data_ov000_020e7014 kind:data(any) addr:0x20e6fb4 data_ov000_020e7018 kind:data(any) addr:0x20e6fb8 data_ov000_020e701c kind:data(any) addr:0x20e6fbc data_ov000_020e7048 kind:data(any) addr:0x20e6fe8 -data_ov000_020e70a0 kind:data(any) addr:0x20e7040 +_ZTV15ActorWisdomNavi kind:data(any) addr:0x20e7040 data_ov000_020e7198 kind:data(any) addr:0x20e7138 data_ov000_020e71a0 kind:data(any) addr:0x20e7140 data_ov000_020e71a4 kind:data(any) addr:0x20e7144 @@ -5875,11 +5875,11 @@ data_ov000_020ee16c kind:bss addr:0x20ee10c data_ov000_020ee178 kind:bss addr:0x20ee118 data_ov000_020ee184 kind:bss addr:0x20ee124 data_ov000_020ee198 kind:bss addr:0x20ee138 -@418 kind:bss addr:0x20ee140 +@418 kind:bss addr:0x20ee140 local _ZN9ActorNavi5gTypeE kind:bss addr:0x20ee14c -@419 kind:bss addr:0x20ee160 +@419 kind:bss addr:0x20ee160 local data_ov000_020ee1cc kind:bss addr:0x20ee16c -@405 kind:bss addr:0x20ee178 +@405 kind:bss addr:0x20ee178 local _ZN14ActorForceNavi5gTypeE kind:bss addr:0x20ee184 data_ov000_020ee1f8 kind:bss addr:0x20ee198 data_ov000_020ee1fc kind:bss addr:0x20ee19c @@ -5943,8 +5943,8 @@ data_ov000_020ee55c kind:bss addr:0x20ee4fc data_ov000_020ee568 kind:bss addr:0x20ee508 gPlayerAnimHandler kind:bss addr:0x20ee51c data_ov000_020ee588 kind:bss addr:0x20ee528 -data_ov000_020ee590 kind:bss addr:0x20ee530 -data_ov000_020ee59c kind:bss addr:0x20ee53c +@405 kind:bss addr:0x20ee530 local +_ZN15ActorWisdomNavi5gTypeE kind:bss addr:0x20ee53c data_ov000_020ee5b0 kind:bss addr:0x20ee550 data_ov000_020ee5bc kind:bss addr:0x20ee55c data_ov000_020ee5d0 kind:bss addr:0x20ee570 diff --git a/include/Actor/Navi/ActorWisdomNavi.hpp b/include/Actor/Navi/ActorWisdomNavi.hpp new file mode 100644 index 00000000..85bce572 --- /dev/null +++ b/include/Actor/Navi/ActorWisdomNavi.hpp @@ -0,0 +1,16 @@ +#pragma once + +#include "Actor/Navi/ActorNaviBase.hpp" + +class ActorWisdomNavi : public ActorNaviBase { +public: + static ActorType gType; + + /* 000 (base) */ + /* 294 */ + + /* 00 */ virtual ~ActorWisdomNavi() override; + /* b4 */ virtual void vfunc_b4() override; + + static ActorWisdomNavi *Create(); +}; diff --git a/src/00_Core/Actor/Navi/ActorWisdomNavi.cpp b/src/00_Core/Actor/Navi/ActorWisdomNavi.cpp new file mode 100644 index 00000000..2567dc03 --- /dev/null +++ b/src/00_Core/Actor/Navi/ActorWisdomNavi.cpp @@ -0,0 +1,7 @@ +#include "Actor/Navi/ActorWisdomNavi.hpp" + +ActorType ActorWisdomNavi::gType = ActorType(ActorTypeId_WisdomNavi, (ActorCreateFunc) ActorWisdomNavi::Create, NULL); + +ActorWisdomNavi *ActorWisdomNavi::Create() {} +void ActorWisdomNavi::vfunc_b4() {} +ActorWisdomNavi::~ActorWisdomNavi() {} |