mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-23 06:54:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Delink and 81% decomp ActorActionObject

Browse Source
This commit is contained in:
Aetias
2025-03-08 12:35:55 +01:00
parent 44ba14e823
commit a8dc7ef705
12 changed files with 150 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/eur/arm9/overlays/ov000/delinks.txt
+7
View File
@@ -51,6 +51,13 @@ src/00_Core/Actor/Navi/ActorNaviBase.cpp:
.data start:0x020e676c end:0x020e68d4
.sbss start:0x020ee1f8 end:0x020ee1fc
src/00_Core/Actor/Dungeon/ActorActionObject.cpp:
.text start:0x020be198 end:0x020be418
.init start:0x020e1b14 end:0x020e1b54
.ctor start:0x020e1f14 end:0x020e1f18
.data start:0x020e6d3c end:0x020e6df8
.sbss start:0x020ee55c end:0x020ee57c
src/00_Core/Actor/Navi/ActorWisdomNavi.cpp:
complete
.text start:0x020c0b64 end:0x020c0bdc
config/eur/arm9/overlays/ov000/symbols.txt
+12 -12
View File
@@ -2617,13 +2617,13 @@ func_ov000_020bd958 kind:function(arm,size=0x4fc) addr:0x20bd958
func_ov000_020bde54 kind:function(arm,size=0x60) addr:0x20bde54
func_ov000_020bdeb4 kind:function(arm,size=0x10c) addr:0x20bdeb4
func_ov000_020bdfc0 kind:function(arm,size=0x1d8) addr:0x20bdfc0
func_ov000_020be198 kind:function(arm,size=0x30) addr:0x20be198
func_ov000_020be1c8 kind:function(arm,size=0x20) addr:0x20be1c8
func_ov000_020be1e8 kind:function(arm,size=0x14) addr:0x20be1e8
func_ov000_020be1fc kind:function(arm,size=0x1c) addr:0x20be1fc
func_ov000_020be218 kind:function(arm,size=0x7c) addr:0x20be218
func_ov000_020be294 kind:function(arm,size=0x178) addr:0x20be294
func_ov000_020be40c kind:function(arm,size=0xc) addr:0x20be40c
_ZN17ActorActionObject6CreateEv kind:function(arm,size=0x30) addr:0x20be198
_ZN17ActorActionObjectC1Ev kind:function(arm,size=0x20) addr:0x20be1c8
_ZN17ActorActionObjectD1Ev kind:function(arm,size=0x14) addr:0x20be1e8
_ZN17ActorActionObjectD0Ev kind:function(arm,size=0x1c) addr:0x20be1fc
_ZN17ActorActionObject8vfunc_08Ev kind:function(arm,size=0x7c) addr:0x20be218
_ZN17ActorActionObject8vfunc_14Ej kind:function(arm,size=0x178) addr:0x20be294
_ZN17ActorActionObject8vfunc_18Ej kind:function(arm,size=0xc) addr:0x20be40c
func_ov000_020be418 kind:function(arm,size=0x4c) addr:0x20be418
func_ov000_020be464 kind:function(arm,size=0x78) addr:0x20be464
func_ov000_020be4dc kind:function(arm,size=0x64) addr:0x20be4dc
@@ -2745,7 +2745,7 @@ _ZN5Actor8vfunc_30Ev kind:function(arm,size=0x8) addr:0x20c17b0
_ZN5Actor8vfunc_14Ej kind:function(arm,size=0x4) addr:0x20c17b8
_ZN5Actor8vfunc_18Ej kind:function(arm,size=0x18) addr:0x20c17bc
_ZN5Actor8vfunc_1cEPt kind:function(arm,size=0xc0) addr:0x20c17d4
_ZN5Actor8vfunc_20Ei kind:function(arm,size=0x4) addr:0x20c1894
_ZN5Actor8vfunc_20Eb kind:function(arm,size=0x4) addr:0x20c1894
_ZN5Actor10SetUnk_129Eb kind:function(arm,size=0x10) addr:0x20c1898
_ZN5Actor10SetUnk_11bEv kind:function(arm,size=0x1c) addr:0x20c18a8
_ZN5Actor11SetVelocityEP5Vec3p kind:function(arm,size=0x38) addr:0x20c18c4
@@ -3958,7 +3958,7 @@ __sinit_ov000_020e1290 kind:function(arm,size=0x48) addr:0x20e1290
__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_ActorActionObject.cpp kind:function(arm,size=0x40) addr:0x20e1b14
__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
@@ -5017,7 +5017,7 @@ data_ov000_020e6c58 kind:data(any) addr:0x20e6c58
data_ov000_020e6c5c kind:data(any) addr:0x20e6c5c
_ZTV14PlayerLinkBase kind:data(any) addr:0x20e6c88
data_ov000_020e6d18 kind:data(any) addr:0x20e6d18
data_ov000_020e6d44 kind:data(any) addr:0x20e6d44
_ZTV17ActorActionObject kind:data(any) addr:0x20e6d44
data_ov000_020e6df8 kind:data(any) addr:0x20e6df8
data_ov000_020e6dfc kind:data(any) addr:0x20e6dfc
data_ov000_020e6e08 kind:data(any) addr:0x20e6e08
@@ -5939,8 +5939,8 @@ data_ov000_020ee50c kind:bss addr:0x20ee50c
data_ov000_020ee520 kind:bss addr:0x20ee520
data_ov000_020ee534 kind:bss addr:0x20ee534
data_ov000_020ee548 kind:bss addr:0x20ee548
data_ov000_020ee55c kind:bss addr:0x20ee55c
data_ov000_020ee568 kind:bss addr:0x20ee568
@360 kind:bss addr:0x20ee55c local
_ZN17ActorActionObject5gTypeE kind:bss addr:0x20ee568
gPlayerAnimHandler kind:bss addr:0x20ee57c
data_ov000_020ee588 kind:bss addr:0x20ee588
@405 kind:bss addr:0x20ee590 local
config/usa/arm9/overlays/ov000/delinks.txt
+7
View File
@@ -51,6 +51,13 @@ src/00_Core/Actor/Navi/ActorNaviBase.cpp:
.data start:0x020e670c end:0x020e6874
.sbss start:0x020ee198 end:0x020ee19c
src/00_Core/Actor/Dungeon/ActorActionObject.cpp:
.text start:0x020be138 end:0x020be3b8
.init start:0x020e1ab4 end:0x020e1af4
.ctor start:0x020e1eb4 end:0x020e1eb8
.data start:0x020e6cdc end:0x020e6d98
.sbss start:0x020ee4fc end:0x020ee51c
src/00_Core/Actor/Navi/ActorWisdomNavi.cpp:
complete
.text start:0x020c0b04 end:0x020c0b7c
config/usa/arm9/overlays/ov000/symbols.txt
+12 -12
View File
@@ -2617,13 +2617,13 @@ func_ov000_020bd958 kind:function(arm,size=0x4fc) addr:0x20bd8f8
func_ov000_020bde54 kind:function(arm,size=0x60) addr:0x20bddf4
func_ov000_020bdeb4 kind:function(arm,size=0x10c) addr:0x20bde54
func_ov000_020bdfc0 kind:function(arm,size=0x1d8) addr:0x20bdf60
func_ov000_020be198 kind:function(arm,size=0x30) addr:0x20be138
func_ov000_020be1c8 kind:function(arm,size=0x20) addr:0x20be168
func_ov000_020be1e8 kind:function(arm,size=0x14) addr:0x20be188
func_ov000_020be1fc kind:function(arm,size=0x1c) addr:0x20be19c
func_ov000_020be218 kind:function(arm,size=0x7c) addr:0x20be1b8
func_ov000_020be294 kind:function(arm,size=0x178) addr:0x20be234
func_ov000_020be40c kind:function(arm,size=0xc) addr:0x20be3ac
_ZN17ActorActionObject6CreateEv kind:function(arm,size=0x30) addr:0x20be138
_ZN17ActorActionObjectC1Ev kind:function(arm,size=0x20) addr:0x20be168
_ZN17ActorActionObjectD1Ev kind:function(arm,size=0x14) addr:0x20be188
_ZN17ActorActionObjectD0Ev kind:function(arm,size=0x1c) addr:0x20be19c
_ZN17ActorActionObject8vfunc_08Ev kind:function(arm,size=0x7c) addr:0x20be1b8
_ZN17ActorActionObject8vfunc_14Ej kind:function(arm,size=0x178) addr:0x20be234
_ZN17ActorActionObject8vfunc_18Ej kind:function(arm,size=0xc) addr:0x20be3ac
func_ov000_020be418 kind:function(arm,size=0x4c) addr:0x20be3b8
func_ov000_020be464 kind:function(arm,size=0x78) addr:0x20be404
func_ov000_020be4dc kind:function(arm,size=0x64) addr:0x20be47c
@@ -2745,7 +2745,7 @@ _ZN5Actor8vfunc_30Ev kind:function(arm,size=0x8) addr:0x20c1750
_ZN5Actor8vfunc_14Ej kind:function(arm,size=0x4) addr:0x20c1758
_ZN5Actor8vfunc_18Ej kind:function(arm,size=0x18) addr:0x20c175c
_ZN5Actor8vfunc_1cEPt kind:function(arm,size=0xc0) addr:0x20c1774
_ZN5Actor8vfunc_20Ei kind:function(arm,size=0x4) addr:0x20c1834
_ZN5Actor8vfunc_20Eb kind:function(arm,size=0x4) addr:0x20c1834
_ZN5Actor10SetUnk_129Eb kind:function(arm,size=0x10) addr:0x20c1838
_ZN5Actor10SetUnk_11bEv kind:function(arm,size=0x1c) addr:0x20c1848
_ZN5Actor11SetVelocityEP5Vec3p kind:function(arm,size=0x38) addr:0x20c1864
@@ -3958,7 +3958,7 @@ __sinit_ov000_020e1290 kind:function(arm,size=0x48) addr:0x20e1230
__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_ActorActionObject.cpp kind:function(arm,size=0x40) addr:0x20e1ab4
__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
@@ -5017,7 +5017,7 @@ data_ov000_020e6c58 kind:data(any) addr:0x20e6bf8
data_ov000_020e6c5c kind:data(any) addr:0x20e6bfc
_ZTV14PlayerLinkBase kind:data(any) addr:0x20e6c28
data_ov000_020e6d18 kind:data(any) addr:0x20e6cb8
data_ov000_020e6d44 kind:data(any) addr:0x20e6ce4
_ZTV17ActorActionObject kind:data(any) addr:0x20e6ce4
data_ov000_020e6df8 kind:data(any) addr:0x20e6d98
data_ov000_020e6dfc kind:data(any) addr:0x20e6d9c
data_ov000_020e6e08 kind:data(any) addr:0x20e6da8
@@ -5939,8 +5939,8 @@ data_ov000_020ee50c kind:bss addr:0x20ee4ac
data_ov000_020ee520 kind:bss addr:0x20ee4c0
data_ov000_020ee534 kind:bss addr:0x20ee4d4
data_ov000_020ee548 kind:bss addr:0x20ee4e8
data_ov000_020ee55c kind:bss addr:0x20ee4fc
data_ov000_020ee568 kind:bss addr:0x20ee508
@360 kind:bss addr:0x20ee4fc local
_ZN17ActorActionObject5gTypeE kind:bss addr:0x20ee508
gPlayerAnimHandler kind:bss addr:0x20ee51c
data_ov000_020ee588 kind:bss addr:0x20ee528
@405 kind:bss addr:0x20ee530 local
include/Actor/Actor.hpp
+1 -1
View File
@@ -227,7 +227,7 @@ public:
bool func_ov00_020c195c();
bool func_ov00_020c198c();
void KillPickupItemActors();
void func_Ov00_020c1bfc(s32 param1);
bool func_Ov00_020c1bfc(s32 param1);
void func_ov00_020c1c20(s32 param1, unk32 param2);
bool IsNearLink();
void func_ov00_020c1cf8();
include/Actor/ActorType.hpp
+1
View File
@@ -41,6 +41,7 @@ enum ActorTypeId_ {
ActorTypeId_SmallKey = 'NKEY',
ActorTypeId_SwitchObject = 'SWOB',
ActorTypeId_EventIcon = 'EVIC',
ActorTypeId_ActionObject = 'ACOB',
ActorTypeId_Sandworm = 'MLDW',
ActorTypeId_Tektite = 'TEKT',
include/Actor/Dungeon/ActorActionObject.hpp
+20
View File
@@ -0,0 +1,20 @@
#pragma once
#include "Actor/Actor.hpp"
class ActorActionObject : public Actor {
public:
static ActorType gType;
/* 000 (base) */
/* 158 */
/* 00 */ virtual ~ActorActionObject() override;
/* 08 */ virtual bool vfunc_08() override;
/* 14 */ virtual void vfunc_14(u32 param1) override;
/* 18 */ virtual void vfunc_18(u32 param1) override;
/* b4 */
static ActorActionObject *Create();
ActorActionObject();
};
include/Player/PlayerBase.hpp
+1 -1
View File
@@ -29,7 +29,7 @@ public:
/* 0c */ virtual bool CanMove();
/* 10 */ virtual void vfunc_10(Cylinder *param1) = 0;
/* 14 */ virtual void vfunc_14(Cylinder *param1) = 0;
/* 18 */ virtual void vfunc_18() = 0;
/* 18 */ virtual bool vfunc_18(s32 param1) = 0;
/* 1c */ virtual void Init() = 0;
/* 20 */ virtual void vfunc_20() = 0;
/* 24 */ virtual void UpdatePos() = 0;
include/Player/PlayerLinkBase.hpp
+1 -1
View File
@@ -50,7 +50,7 @@ public:
/* 0c */ virtual bool CanMove() override;
/* 10 */ virtual void vfunc_10(Cylinder *param1) override;
/* 14 */ virtual void vfunc_14(Cylinder *param1) override;
/* 18 */ virtual void vfunc_18(s32 param1) override;
/* 18 */ virtual bool vfunc_18(s32 param1) override;
/* 1c */ virtual void Init() override;
/* 20 */ virtual void vfunc_20() override;
/* 24 */ virtual void UpdatePos() override;
src/00_Core/Actor/Actor.cpp
+2 -2
View File
@@ -318,8 +318,8 @@ ARM void Actor::SetTransform(Transform *transform) {
ARM void Actor::vfunc_a8() {}
ARM void Actor::func_Ov00_020c1bfc(s32 param1) {
gMapManager->func_ov00_02084be0(mUnk_020.mUnk_0a[param1], mUnk_020.mUnk_08[param1]);
ARM bool Actor::func_Ov00_020c1bfc(s32 param1) {
return gMapManager->func_ov00_02084be0(mUnk_020.mUnk_0a[param1], mUnk_020.mUnk_08[param1]);
}
ARM void Actor::func_ov00_020c1c20(s32 param1, unk32 param2) {
src/00_Core/Actor/Dungeon/ActorActionObject.cpp
+85
View File
@@ -0,0 +1,85 @@
#include "Actor/Dungeon/ActorActionObject.hpp"
#include "Map/MapManager.hpp"
#include "Player/LinkStateBase.hpp"
#include "Player/PlayerLinkBase.hpp"
#include "Save/AdventureFlags.hpp"
#pragma section sbss begin
ActorType ActorActionObject::gType = ActorType(ActorTypeId_ActionObject, (ActorCreateFunc) ActorActionObject::Create, NULL);
#pragma section sbss end
extern u32 **data_027e0fe0[];
ARM ActorActionObject *ActorActionObject::Create() {
return new(*data_027e0fe0[0], 4) ActorActionObject();
}
ARM ActorActionObject::ActorActionObject() {}
ARM ActorActionObject::~ActorActionObject() {}
// non-matching
ARM bool ActorActionObject::vfunc_08() {
mGravity = 0;
mHitbox.pos = gVec3p_ZERO;
mHitbox.size = -1;
mUnk_08c.pos = mHitbox.pos;
mUnk_08c.size = mHitbox.size;
mUnk_0a4.mUnk_04 = gVec3p_ZERO;
mUnk_0a4.mUnk_10 = -1;
mVisible = false;
mUnk_130 = 0;
return true;
}
ARM void ActorActionObject::vfunc_14(u32 param1) {
if (!this->func_ov00_020c313c(param1)) {
return;
}
u32 flag = mUnk_020.mUnk_00[2];
bool bVar3;
switch (mUnk_020.mUnk_00[0]) {
case 0: bVar3 = true; break;
case 1:
if (gPlayerLink->mGrabActor.id != -1 && gPlayerLink->GetStateId() == LinkStateId_Move) {
bVar3 = true;
} else {
bVar3 = false;
}
break;
case 2:
if (gPlayerLink->mGrabActor.id == -1 && gPlayerLink->GetStateId() == LinkStateId_Move) {
bVar3 = true;
} else {
bVar3 = false;
}
break;
default: bVar3 = false; break;
}
if (!bVar3) {
return;
}
if (!gMapManager->func_ov00_020836dc((u32) mUnk_020.mUnk_00[1], 0)) {
return;
}
if (mUnk_020.mUnk_0a[0] != 0 && !this->func_Ov00_020c1bfc(0)) {
return;
}
if (flag != 0 && !gAdventureFlags->Get(flag)) {
return;
}
PlayerLinkBase *link = gPlayerLink;
if (link != NULL && link->vfunc_18(7)) {
if (mUnk_020.mUnk_00[3] == 1) {
link->func_ov000_020bcf50(&mPos, 0x800);
}
this->func_ov00_020c1c20(1, 1);
this->Kill();
}
}
ARM void ActorActionObject::vfunc_18(u32 param1) {
this->func_ov00_020c313c(param1);
}
src/00_Core/Player/PlayerLinkBase.cpp
+1 -1
View File
@@ -20,7 +20,7 @@ bool PlayerLinkBase::func_ov000_020bba00() {}
bool PlayerLinkBase::func_ov000_020bba14() {}
bool PlayerLinkBase::func_ov000_020bba28() {}
void PlayerLinkBase::func_ov000_020bba48() {}
void PlayerLinkBase::vfunc_18(s32 param1) {}
bool PlayerLinkBase::vfunc_18(s32 param1) {}
bool PlayerLinkBase::CanMove() {}
bool PlayerLinkBase::vfunc_58() {}
bool PlayerLinkBase::vfunc_5c() {}