diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 1d85fb2d..5173e57d 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -959,16 +959,16 @@ func_ov000_02090404 kind:function(arm,size=0x88) addr:0x2090404 func_ov000_0209048c kind:function(arm,size=0x38) addr:0x209048c func_ov000_020904c4 kind:function(arm,size=0x14) addr:0x20904c4 func_ov000_020904d8 kind:function(arm,size=0x1c) addr:0x20904d8 -func_ov000_020904f4 kind:function(arm,size=0x30) addr:0x20904f4 -func_ov000_02090524 kind:function(arm,size=0x5c) addr:0x2090524 -func_ov000_02090580 kind:function(arm,size=0xb0) addr:0x2090580 -func_ov000_02090630 kind:function(arm,size=0xc) addr:0x2090630 -func_ov000_0209063c kind:function(arm,size=0xc) addr:0x209063c -func_ov000_02090648 kind:function(arm,size=0x12c) addr:0x2090648 -func_ov000_02090774 kind:function(arm,size=0x2c) addr:0x2090774 -func_ov000_020907a0 kind:function(arm,size=0x110) addr:0x20907a0 -func_ov000_020908b0 kind:function(arm,size=0x20) addr:0x20908b0 -func_ov000_020908d0 kind:function(arm,size=0x28) addr:0x20908d0 +_ZN14ActorEventIcon6CreateEv kind:function(arm,size=0x30) addr:0x20904f4 +_ZN14ActorEventIconC2Ev kind:function(arm,size=0x5c) addr:0x2090524 +_ZN14ActorEventIcon8vfunc_08Ev kind:function(arm,size=0xb0) addr:0x2090580 +_ZN14ActorEventIcon8vfunc_14Ej kind:function(arm,size=0xc) addr:0x2090630 +_ZN14ActorEventIcon8vfunc_18Ej kind:function(arm,size=0xc) addr:0x209063c +_ZN14ActorEventIcon19func_ov000_02090648Ej kind:function(arm,size=0x12c) addr:0x2090648 +_Z19func_ov000_02090774j kind:function(arm,size=0x2c) addr:0x2090774 +_ZN14ActorEventIcon8vfunc_1cEPt kind:function(arm,size=0x110) addr:0x20907a0 +_ZN14ActorEventIconD1Ev kind:function(arm,size=0x20) addr:0x20908b0 +_ZN14ActorEventIconD0Ev kind:function(arm,size=0x28) addr:0x20908d0 func_ov000_020908f8 kind:function(arm,size=0x80) addr:0x20908f8 func_ov000_02090978 kind:function(arm,size=0x4) addr:0x2090978 func_ov000_0209097c kind:function(arm,size=0x4) addr:0x209097c @@ -4066,7 +4066,7 @@ data_ov000_020e2870 kind:data(any) addr:0x20e2870 data_ov000_020e289c kind:data(any) addr:0x20e289c _ZTV17ActorSwitchObject kind:data(any) addr:0x20e2930 data_ov000_020e29ec kind:data(any) addr:0x20e29ec -data_ov000_020e2aa8 kind:data(any) addr:0x20e2aa8 +_ZTV14ActorEventIcon kind:data(any) addr:0x20e2aa8 data_ov000_020e2b64 kind:data(any) addr:0x20e2b64 data_ov000_020e2bb4 kind:data(any) addr:0x20e2bb4 data_ov000_020e2c04 kind:data(any) addr:0x20e2c04 @@ -5848,7 +5848,7 @@ _ZN17ActorSwitchObject5gTypeE kind:bss addr:0x20ecd70 data_ov000_020ecd84 kind:bss addr:0x20ecd84 data_ov000_020ecd90 kind:bss addr:0x20ecd90 data_ov000_020ecda4 kind:bss addr:0x20ecda4 -data_ov000_020ecdb0 kind:bss addr:0x20ecdb0 +_ZN14ActorEventIcon5gTypeE kind:bss addr:0x20ecdb0 data_ov000_020ecdc4 kind:bss addr:0x20ecdc4 data_ov000_020ecdcc kind:bss addr:0x20ecdcc data_ov000_020ecdd8 kind:bss addr:0x20ecdd8 diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 5355eccb..2cbd9f7a 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -959,16 +959,16 @@ func_ov000_02090404 kind:function(arm,size=0x88) addr:0x20903a4 func_ov000_0209048c kind:function(arm,size=0x38) addr:0x209042c func_ov000_020904c4 kind:function(arm,size=0x14) addr:0x2090464 func_ov000_020904d8 kind:function(arm,size=0x1c) addr:0x2090478 -func_ov000_020904f4 kind:function(arm,size=0x30) addr:0x2090494 -func_ov000_02090524 kind:function(arm,size=0x5c) addr:0x20904c4 -func_ov000_02090580 kind:function(arm,size=0xb0) addr:0x2090520 -func_ov000_02090630 kind:function(arm,size=0xc) addr:0x20905d0 -func_ov000_0209063c kind:function(arm,size=0xc) addr:0x20905dc -func_ov000_02090648 kind:function(arm,size=0x12c) addr:0x20905e8 -func_ov000_02090774 kind:function(arm,size=0x2c) addr:0x2090714 -func_ov000_020907a0 kind:function(arm,size=0x110) addr:0x2090740 -func_ov000_020908b0 kind:function(arm,size=0x20) addr:0x2090850 -func_ov000_020908d0 kind:function(arm,size=0x28) addr:0x2090870 +_ZN14ActorEventIcon6CreateEv kind:function(arm,size=0x30) addr:0x2090494 +_ZN14ActorEventIconC2Ev kind:function(arm,size=0x5c) addr:0x20904c4 +_ZN14ActorEventIcon8vfunc_08Ev kind:function(arm,size=0xb0) addr:0x2090520 +_ZN14ActorEventIcon8vfunc_14Ej kind:function(arm,size=0xc) addr:0x20905d0 +_ZN14ActorEventIcon8vfunc_18Ej kind:function(arm,size=0xc) addr:0x20905dc +_ZN14ActorEventIcon19func_ov000_02090648Ej kind:function(arm,size=0x12c) addr:0x20905e8 +_Z19func_ov000_02090774j kind:function(arm,size=0x2c) addr:0x2090714 +_ZN14ActorEventIcon8vfunc_1cEPt kind:function(arm,size=0x110) addr:0x2090740 +_ZN14ActorEventIconD1Ev kind:function(arm,size=0x20) addr:0x2090850 +_ZN14ActorEventIconD0Ev kind:function(arm,size=0x28) addr:0x2090870 func_ov000_020908f8 kind:function(arm,size=0x80) addr:0x2090898 func_ov000_02090978 kind:function(arm,size=0x4) addr:0x2090918 func_ov000_0209097c kind:function(arm,size=0x4) addr:0x209091c @@ -4066,7 +4066,7 @@ data_ov000_020e2870 kind:data(any) addr:0x20e2810 data_ov000_020e289c kind:data(any) addr:0x20e283c _ZTV17ActorSwitchObject kind:data(any) addr:0x20e28d0 data_ov000_020e29ec kind:data(any) addr:0x20e298c -data_ov000_020e2aa8 kind:data(any) addr:0x20e2a48 +_ZTV14ActorEventIcon kind:data(any) addr:0x20e2a48 data_ov000_020e2b64 kind:data(any) addr:0x20e2b04 data_ov000_020e2bb4 kind:data(any) addr:0x20e2b54 data_ov000_020e2c04 kind:data(any) addr:0x20e2ba4 @@ -5848,7 +5848,7 @@ _ZN17ActorSwitchObject5gTypeE kind:bss addr:0x20ecd10 data_ov000_020ecd84 kind:bss addr:0x20ecd24 data_ov000_020ecd90 kind:bss addr:0x20ecd30 data_ov000_020ecda4 kind:bss addr:0x20ecd44 -data_ov000_020ecdb0 kind:bss addr:0x20ecd50 +_ZN14ActorEventIcon5gTypeE kind:bss addr:0x20ecd50 data_ov000_020ecdc4 kind:bss addr:0x20ecd64 data_ov000_020ecdcc kind:bss addr:0x20ecd6c data_ov000_020ecdd8 kind:bss addr:0x20ecd78 diff --git a/include/Actor/ActorType.hpp b/include/Actor/ActorType.hpp index dda4da70..e9dc8318 100644 --- a/include/Actor/ActorType.hpp +++ b/include/Actor/ActorType.hpp @@ -38,6 +38,7 @@ enum ActorTypeId_ { ActorTypeId_SmallKey = 'NKEY', ActorTypeId_SwitchObject = 'SWOB', + ActorTypeId_EventIcon = 'EVIC', ActorTypeId_Sandworm = 'MLDW', ActorTypeId_Tektite = 'TEKT', diff --git a/include/Actor/Dungeon/ActorEventIcon.hpp b/include/Actor/Dungeon/ActorEventIcon.hpp new file mode 100644 index 00000000..ccef162d --- /dev/null +++ b/include/Actor/Dungeon/ActorEventIcon.hpp @@ -0,0 +1,30 @@ +#pragma once + +#include "global.h" +#include "types.h" + +#include "Actor/Actor.hpp" +#include "Actor/ActorType.hpp" +#include "Unknown/UnkStruct_02035064.hpp" + +class ActorEventIcon : public Actor { +public: + static ActorType gType; + + /* 000 (base) */ + /* 158 */ void *mUnk_158; + /* 15c */ u32 mUnk_15c; + /* 160 */ UnkStruct_02035064 mUnk_160; + + /* 00 */ virtual ~ActorEventIcon() override; + /* 08 */ virtual bool vfunc_08() override; + /* 14 */ virtual void vfunc_14(u32 param1) override; + /* 18 */ virtual void vfunc_18(u32 param1) override; + /* 1c */ virtual void vfunc_1c(u16 *param1) override; + /* b4 */ + + static ActorEventIcon *Create(); + ActorEventIcon(); + u32 func_ov000_02090648(u32 param1); + bool func_ov000_02090774(u32 param1); +}; diff --git a/src/00_Core/Actor/Dungeon/ActorEventIcon.cpp b/src/00_Core/Actor/Dungeon/ActorEventIcon.cpp new file mode 100644 index 00000000..8e943095 --- /dev/null +++ b/src/00_Core/Actor/Dungeon/ActorEventIcon.cpp @@ -0,0 +1,13 @@ +#include "Actor/Dungeon/ActorEventIcon.hpp" + +ActorType ActorEventIcon::gType = ActorType(ActorTypeId_EventIcon, (ActorCreateFunc) ActorEventIcon::Create, NULL); + +ActorEventIcon *ActorEventIcon::Create() {} +ActorEventIcon::ActorEventIcon() {} +bool ActorEventIcon::vfunc_08() {} +void ActorEventIcon::vfunc_14(u32 param1) {} +void ActorEventIcon::vfunc_18(u32 param1) {} +u32 ActorEventIcon::func_ov000_02090648(u32 param1) {} +bool func_ov000_02090774(u32 param1) {} +void ActorEventIcon::vfunc_1c(u16 *param1) {} +ActorEventIcon::~ActorEventIcon() {}