Expand dAcBase work

2026-06-16 14:49:57 -04:00 · 2024-05-24 14:37:17 +01:00
parent db430ccc91
commit d9e22fe76d
21 changed files with 882 additions and 187 deletions
@@ -1,6 +1,13 @@
 #include "d/a/d_a_base.h"
+#include "m/m_vec.h"
+#include "d/d_player.h"
+#include "f/f_list_nd.h"
+#include "toBeSorted/misc_flag_managers.h"
+#include "toBeSorted/special_item_drop_mgr.h"
+#include "toBeSorted/scgame.h"
+#include "toBeSorted/event.h"
+#include "toBeSorted/file_manager.h"

-// RoomManager* RoomManager::m_Instance;

 // .sdata
 u32 dAcBase_c::s_Create_RoomId = -1;
@@ -17,8 +24,15 @@ ObjInfo *dAcBase_c::s_Create_ObjInfo;
 u8 dAcBase_c::s_Create_Subtype;

 extern "C" ObjInfo *getObjByActorIdAndSubtype_unkNamespace(ProfileName, u8);
+extern "C" ObjInfo *getObjByActorName_unkNamespace(char *name);
 extern "C" char *getObjectName_8006a730(ObjInfo *);
-extern "C" void *soundForActorInitRelated_803889c0(s8, fBase_c *, char *, u8);
+extern "C" SoundSource *soundForActorInitRelated_803889c0(s8, fBase_c *, char *, u8);
+extern "C" short targetAngleY(mVec3_c *, mVec3_c *);
+extern "C" short targetAngleX(mVec3_c *, mVec3_c *);
+extern "C" bool checkCollision(mVec3_c *pos);
+extern "C" s8 collisionCheckGetRoom();
+extern "C" dRoom *getRoomByIndex(RoomManager *mgr, s8 roomid);
+extern "C" bool alsoSetAsCurrentEvent(dAcBase_c*, Event*, void *);

 bool dAcBase_c::createHeap() {
    return true;
@@ -27,27 +41,30 @@ bool dAcBase_c::createHeap() {
 // Doesnt Match Yet
 dAcBase_c::dAcBase_c()
    : heap_allocator(), obj_info(s_Create_ObjInfo), sound_info_tail(&heap_allocator.mHeap),
-      sound_info_next(&heap_allocator.mHeap), count(0), obj_sound(nullptr), obj_pos(&position),
-      params2(s_Create_Params2), obj_id(s_Create_UnkFlags), viewclip_index(s_Create_ViewClipIdx), actor_node(),
+      sound_info_next(&heap_allocator.mHeap), count(0), sound_source(nullptr), obj_pos(&position),
+      params2(s_Create_Params2), obj_id(s_Create_UnkFlags), viewclip_index(s_Create_ViewClipIdx), actor_node(nullptr),
      roomid(s_Create_RoomId), actor_subtype(s_Create_Subtype) {
    JStudio_actor = 0;
    someStr[0] = 0;
+
    if (s_Create_Position != nullptr) {
-        // void set(f32 fx, f32 fy, f32 fz) { x = fx; y = fy; z = fz; }
        position.set(s_Create_Position->x, s_Create_Position->y, s_Create_Position->z);
-        // position = *s_Create_Position;
    }
-    if (s_Create_Rotation != 0) {
+
+    if (s_Create_Rotation != nullptr) {
        rotation = *(s_Create_Rotation);
    }
-    if (s_Create_Scale != 0) {
+
+    if (s_Create_Scale != nullptr) {
        setScale(s_Create_Scale->x, s_Create_Scale->y, s_Create_Scale->z);
    } else {
        setScale(1.0, 1.0, 1.0);
    }
-    if (s_Create_Parent != 0) {
+
+    if (s_Create_Parent != nullptr) {
        setActorRef(s_Create_Parent);
    }
+
    fProfile::fActorProfile_c *profile = (fProfile::fActorProfile_c *)((*fProfile::sProfileList)[profile_name]);
    actor_properties = profile->mActorProperties;
    if (obj_info == nullptr) {
@@ -56,9 +73,14 @@ dAcBase_c::dAcBase_c()
    someStr[0] = '\0';
 }

-/* 8002c530 */ dBase_c::~dBase_c() {}
+// 8002c530
+dBase_c::~dBase_c() {}

-dAcBase_c::~dAcBase_c() {}
+dAcBase_c::~dAcBase_c() {
+    if (sound_source != nullptr) {
+        // call obj_sound dtor once defined
+    }
+}

 void dAcBase_c::setTempCreateParams(mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, s32 roomId, u32 params2,
        dAcBase_c *parent, u8 subtype, s16 unkFlag, u8 viewClipIdx, ObjInfo *objInfo) {
@@ -75,14 +97,16 @@ void dAcBase_c::setTempCreateParams(mVec3_c *pos, mAng3_c *rot, mVec3_c *scale,
 }

 // has regswap
-void *dAcBase_c::FUN_8002c690() {
+SoundSource *dAcBase_c::FUN_8002c690() {
    if (obj_info == nullptr) {
        return nullptr;
    }
-    s8 unk_val = obj_info->unk_0xA;
+
+    s32 unk_val = obj_info->unk_0xA;
    if (unk_val == -1) {
        return nullptr;
    }
+
    char *objName = getObjectName_8006a730(obj_info);
    return soundForActorInitRelated_803889c0(unk_val, this, objName, subtype);
 }
@@ -96,7 +120,7 @@ int dAcBase_c::initAllocator(int size, char *name, EGG::Heap *heap, int align) {
    if (fn_802EE510(&heap_allocator, size, heap, name, 0x20, 0) == 0) {
        return 0;
    }
-    obj_sound = FUN_8002c690();
+    sound_source = FUN_8002c690();
    int success = createHeap();
    heap_allocator.adjustFrmHeapRestoreCurrent();
    return success;
@@ -117,15 +141,19 @@ bool dAcBase_c::addActorToRoom(s32 roomId) {
    }
    return false;
 }
+
 void dAcBase_c::setBit_field_0xE8(s32 shift) {
    field_0xe8 |= (1 << shift);
 }
+
 int dAcBase_c::actorCreate() {
    return SUCCEEDED;
 }
+
 int dAcBase_c::actorPostCreate() {
    return SUCCEEDED;
 }
+
 int dAcBase_c::create() {
    if (actor_properties & 0x8000000) {
        return actorPostCreate();
@@ -138,6 +166,8 @@ int dAcBase_c::create() {
    return success;
 }

+// 8002c8f0
+// loads f2 before f0 instead of f0 then f2
 void dAcBase_c::postCreate(fBase_c::MAIN_STATE_e state) {
    if (state == SUCCESS) {
        pos_copy = position;
@@ -147,8 +177,10 @@ void dAcBase_c::postCreate(fBase_c::MAIN_STATE_e state) {
    dBase_c::postCreate(state);
 }

+// 8002c940
 int dAcBase_c::preDelete() {}

+// 8002cb10
 int dAcBase_c::preExecute() {
    if (dBase_c::preExecute() == NOT_READY) {
        return NOT_READY;
@@ -161,44 +193,260 @@ int dAcBase_c::preExecute() {
    }
    return SUCCEEDED;
 }
+
+// 8002cc10
 int dAcBase_c::execute() {}
-int dAcBase_c::actorExecute() {}
-int dAcBase_c::actorExecuteInEvent() {}
+
+// 8002cca0
+int dAcBase_c::actorExecute() {
+    return 1;
+}
+
+// 8002ccb0
+int dAcBase_c::actorExecuteInEvent() {
+    return actorExecute();
+}
+
+// 8002ccc0
 void dAcBase_c::postExecute(fBase_c::MAIN_STATE_e state) {}
+
+// 8002ce90
 void dAcBase_c::unkVirtFunc_0x5C() {
    return;
 }
+
+// 8002cea0
 void dAcBase_c::unkVirtFunc_0x60() {
    return;
 }
-bool dAcBase_c::restorePosRotFromCopy() {}
-u32 dAcBase_c::itemDroppingAndGivingRelated(Vec3f *spawnPos, int subtype) {}
-void dAcBase_c::fillUpperParams2Byte() {}
-u32 dAcBase_c::getParams2_ignoreLower() {}
-void dAcBase_c::setParams2Upper_ignoreLower(u32 val) {}
-u8 dAcBase_c::getParams2UpperByte() {}
-void dAcBase_c::setParams2UpperByte(u32 val) {}
-u32 dAcBase_c::buildParams2(u32 lower, u8 upper) {}
-u32 dAcBase_c::getParams2Lower() {}
-dAcBase_c *dAcBase_c::findActor(char *objName, dAcBase_c *parent) {}
-// searches for actor based on groupType
-dAcBase_c *dAcBase_c::searchActor(dAcBase_c &optionalParent) {}

-void dAcBase_c::forEachActor(void *, dAcBase_c &) {}
-mAng dAcBase_c::getXZAngleToPlayer() {}
-bool dAcBase_c::getDistanceToActor(dAcBase_c &actor, f32 distThresh, f32 *outDist) {}
-bool dAcBase_c::getDistanceAndAngleToActor(dAcBase_c &actor, f32 distThresh, s16 yAngle, s16 xAngle, f32 *outDist,
-        s16 *outDiffAngleY, s16 *outDiffAngleX) {}
-bool dAcBase_c::isWithinPlayerRadius(f32 radius) {}
-bool dAcBase_c::getDistanceAndAngleToPlayer(f32 distThresh, s16 yAngle, s16 xAngle, f32 *outDist, s16 *outDiffAngleY,
-        s16 *outDiffAngleX) {
-    // return getDistanceAndAngleToActor(PLAYER, distThresh, yAngle, xAngle, outDist, outDiffAngleY, outDiffAngleX);
+// 8002ceb0
+// loads f2 before f0 instead of f0 then f2
+bool dAcBase_c::restorePosRotFromCopy() {
+    if (roomid != room_id_copy) {
+        return 0;
+    }
+    position = pos_copy;
+    rotation = rot_copy;
+    return 1;
 }

-f32 dAcBase_c::getDistToPlayer() {}
-f32 dAcBase_c::getSquareDistToPlayer() {}
-void dAcBase_c::updateRoomId(f32 yOffs) {}
-bool dAcBase_c::isRoomFlags_0x6_Set() {}
+// 8002cf10
+u32 dAcBase_c::itemDroppingAndGivingRelated(mVec3_c *spawnPos, int subtype) {
+    if (ScGame::currentSpawnInfo.trial == 1) {
+        return 0;
+    }
+
+    if (spawnPos == nullptr) {
+        spawnPos = &position;
+    }
+
+    u32 param2Copy = params2; 
+    params2 = param2Copy | 0xFF000000;
+    // mAng3_c rot = {};
+    s16 rot = 0;
+    return SpecialItemDropMgr::giveSpecialDropItem(SpecialItemDropMgr::sInstance, param2Copy >> 0x18, roomid, spawnPos, subtype, &rot, -1);
+}
+
+// 8002cf90
+void dAcBase_c::fillUpperParams2Byte() {
+    params2 |= 0xFF000000;
+}
+
+// 8002cfa0
+u32 dAcBase_c::getParams2_ignoreLower() {
+    return params2 | 0xFFFF;
+}
+
+// 8002cfb0
+void dAcBase_c::setParams2Upper_ignoreLower(u32 val) {
+    params2 = val | 0xFFFF;
+}
+
+// 8002cfc0
+u8 dAcBase_c::getParams2UpperByte() {
+    return params2 >> 0x18;
+}
+
+// 8002cfd0
+void dAcBase_c::setParams2UpperByte(u32 val) {
+    params2 = (params2 & 0xFFFFFF) | val << 0x18;
+}
+
+// 8002cff0
+u32 dAcBase_c::buildParams2(u32 lower, u32 upper) {
+    return ((upper & 0xFFFF) | 0xFFFF0000) & ((lower << 0x18) | 0xFFFFFF);
+}
+
+// 8002d010
+u32 dAcBase_c::getParams2Lower() {
+    return params2 & 0xFFFF;
+}
+
+// 8002d020
+dAcBase_c *dAcBase_c::findActor(char *objName, dAcBase_c *parent) {
+    ObjInfo *objInfo = getObjByActorName_unkNamespace(objName);
+    if (objInfo == nullptr) {
+        return nullptr;
+    } else {
+        do {
+            parent = (dAcBase_c *)fManager_c::searchBaseByProfName(objInfo->obj_id, parent);
+            if (parent == nullptr) {
+                break;
+            }
+        } while (parent->actor_subtype != objInfo->subtype);
+    }
+    return parent;
+}
+
+// searches for actor based on groupType
+// 8002d0a0
+dAcBase_c *dAcBase_c::searchActor(dAcBase_c *parent) {
+    dAcBase_c *foundActor = nullptr;
+
+    if (parent == nullptr) {
+        foundActor = (dAcBase_c *)fManager_c::searchBaseByGroupType(ACTOR, nullptr);
+    } else if (parent->group_type == 2) {
+        foundActor = (dAcBase_c *)fManager_c::searchBaseByGroupType(ACTOR, parent);
+        parent = foundActor;
+    }
+
+    if (foundActor == nullptr) {
+        return (dAcBase_c *)fManager_c::searchBaseByGroupType(STAGE, parent);
+    }
+
+    return foundActor;
+}
+
+// 8002d130
+void dAcBase_c::forEveryActor(void *func(dAcBase_c *, dAcBase_c *), dAcBase_c *parent) {
+    dAcBase_c *foundActor = searchActor(nullptr);
+
+    while (foundActor != nullptr) {
+        dAcBase_c *nextActor = (dAcBase_c *)func(foundActor, parent);
+        foundActor = searchActor(nextActor);
+    }
+}
+
+// 8002d190
+void dAcBase_c::getXZAngleToPlayer(s16 *angle) {
+    *angle = targetAngleY(&this->position, &dPlayer::LINK->position);
+}
+
+// The "distSquared > dist" bit is misbehaving.
+// Trying different operators doesn't work so I'm leaving it as the most simple wrong choice.
+// 8002d1d0
+bool dAcBase_c::getDistanceToActor(dAcBase_c *actor, f32 distThresh, f32 *outDist) {
+    f32 distSquared = 3.402823e+38;
+    bool isWithinThreshhold = false;
+
+    if (actor != nullptr) {
+        distSquared = PSVECSquareDistance(position, actor->position);
+
+        if (distSquared <= distThresh*distThresh) {
+            isWithinThreshhold = true;
+        }
+    }
+
+    if (outDist != nullptr) {
+        f32 dist = 0.0;
+        // TODO: make this not sad :(
+        if (distSquared <= dist) {
+            dist = nw4r::math::FrSqrt(distSquared) * distSquared;
+        }
+        *outDist = dist;
+    }
+    return isWithinThreshhold;
+}
+
+// Similar weirdness as the above function. Also, r29->31 are initted in the wrong order?
+// 8002d290
+bool dAcBase_c::getDistanceAndAngleToActor(dAcBase_c *actor, f32 distThresh, s16 yAngle, s16 xAngle, f32 *outDist, s16 *outDiffAngleY, s16 *outDiffAngleX) {
+    f32 distSquared = 3.402823e+38;
+    s16 angleToActorY = 0;
+    s16 angleToActorX = 0;
+    bool isWithinRange = false;
+
+    if (actor != nullptr) {
+        distSquared = PSVECSquareDistance(position, actor->position);
+        angleToActorY = targetAngleY(&position, &actor->position);
+        angleToActorX = targetAngleX(&position, &actor->position);
+
+        if ((distSquared <= distThresh*distThresh)
+            && (labs(rotation.y - angleToActorY) <= yAngle)
+            && (labs(rotation.x - angleToActorX) <= xAngle)
+        ) {
+            isWithinRange = true;
+        }
+    }
+
+    if (outDist != nullptr) {
+        f32 dist = 0.0;
+        if (distSquared <= dist) {
+            dist = nw4r::math::FrSqrt(distSquared);
+            dist *= distSquared;
+        }
+        *outDist = dist;
+    }
+
+    if (outDiffAngleY != nullptr) {
+        *outDiffAngleY = angleToActorY;
+    }
+
+    if (outDiffAngleX != nullptr) {
+        *outDiffAngleX = angleToActorX;
+    }
+
+    return isWithinRange;
+}
+
+// Very notmatching
+// 8002d3e0
+bool dAcBase_c::isWithinPlayerRadius(f32 radius) {
+    f32 zDist = position.z - dPlayer::LINK->position.z;
+    f32 xDist = position.x - dPlayer::LINK->position.x;
+    return (xDist*xDist + zDist*zDist) < radius*radius;
+}
+
+// 8002d440
+bool dAcBase_c::getDistanceAndAngleToPlayer(f32 distThresh, s16 yAngle, s16 xAngle, f32 *outDist, s16 *outDiffAngleY, s16 *outDiffAngleX) {
+    return getDistanceAndAngleToActor(dPlayer::LINK, distThresh, yAngle, xAngle, outDist, outDiffAngleY, outDiffAngleX);
+}
+
+// 8002d470
+f32 dAcBase_c::getDistToPlayer() {
+    return EGG::Math<f32>::sqrt(PSVECSquareDistance(position, dPlayer::LINK->position));
+}
+
+// 8002d4a0
+f32 dAcBase_c::getSquareDistToPlayer() {
+    return PSVECSquareDistance(position, dPlayer::LINK->position);
+}
+
+// Some weirdness with the float registers being used
+// 8002d4b0
+void dAcBase_c::updateRoomId(f32 yOffset) {
+    if (getConnectParent()->profile_name != 701 /* fProfile::PROFILE_NAME_e::ROOM */) {
+        mVec3_c actorPos;
+        actorPos.x = position.x;
+        actorPos.y = position.y + yOffset;
+        actorPos.z = position.z;
+
+        if (checkCollision(&actorPos)) {
+            roomid = collisionCheckGetRoom();
+        } else {
+            roomid = RoomManager::m_Instance->curr_room_id;
+        }
+    }
+}
+
+// 8002d540
+bool dAcBase_c::isRoomFlags_0x6_Set() {
+    dRoom *room = getRoomByIndex(RoomManager::m_Instance, roomid);
+    return (room->flags & 6) != 0;
+}
+
+// Start of SoundSource stuff
 void dAcBase_c::FUN_8002d590() {}
 void dAcBase_c::FUN_8002d5b0() {}
 void dAcBase_c::playSound() {}
@@ -215,31 +463,168 @@ void dAcBase_c::FUN_8002d7f0() {}
 void dAcBase_c::FUN_8002d810() {}
 void dAcBase_c::FUN_8002d830() {}
 void dAcBase_c::FUN_8002d860() {}
-void dAcBase_c::FUN_8002d880() {}
+
+// 8002d880
+SoundSource *dAcBase_c::getSoundSource() {
+    return sound_source;
+}
+// End of SoundSource stuff
+
 // first param is not dAcBase_c
+// 8002d890
 void dAcBase_c::FUN_8002d890() {}
+
 // current name is Global__setActorRef
-void dAcBase_c::setActorRef(dBase_c *) {}
+void dAcBase_c::setActorRef(dBase_c *ref) {
+    actor_node.link(ref);
+}
+
 // May not be only purpose
-void dAcBase_c::setUnkFlag() {}
-void dAcBase_c::FUN_8002d940() {}
-void dAcBase_c::FUN_8002d960() {}
+void dAcBase_c::setEnemyDefeatFlag() {
+    EnemyDefeatManager::sInstance->setFlag(obj_id);
+}
+
+// 8002d940
+void dAcBase_c::changeLoadedEntitiesWithSet() {
+    RoomManager::m_Instance->changeLoadedEntities(RoomManager::m_Instance, obj_id, true);
+}
+
+// 8002d960
+void dAcBase_c::changeLoadedEntitiesNoSet() {
+    RoomManager::m_Instance->changeLoadedEntities(RoomManager::m_Instance, obj_id, false);
+}

 // spawns GroupType2 (ACTOR)
-dAcBase_c dAcBase_c::createActor(ProfileName actorId, u32 params1, Vec3f *pos, Vec3s *rot, Vec3f *scale, u32 params2,
-        s32 roomId, dBase_c *ref) {}
+// 8002d980
+dAcBase_c *dAcBase_c::createActor(ProfileName actorId, u32 actorParams1, mVec3_c *actorPosition, mAng3_c *actorRotation, mVec3_c *actorScale, u32 actorParams2, s32 actorRoomid, dBase_c *actorRef) {
+    if (actorPosition == nullptr) {
+        actorPosition = &position;
+    }

-dAcBase_c dAcBase_c::createActorUnkGroup3(ProfileName actorId, u32 params1, Vec3f *pos, Vec3s *rot, Vec3f *scale,
-        u32 params2, s32 roomId, dBase_c *ref) {}
+    if (actorRotation == nullptr) {
+        actorRotation = &rotation;
+    }

+    if (actorScale == nullptr) {
+        actorScale = &scale;
+    }
+
+    if (actorRoomid == 63) {
+        actorRoomid = roomid;
+    }
+
+    u32 newParams2 = -1;
+    if (actorParams2 != 0) {
+        newParams2 = getParams2_ignoreLower();
+    }
+
+    setTempCreateParams(actorPosition, actorRotation, actorScale, actorRoomid, newParams2, (dAcBase_c *)actorRef, 0, -1, 0xFF, nullptr);
+    dBase_c *room = RoomManager::getRoom(roomid);
+    return (dAcBase_c *)dBase_c::createBase(actorId, room, actorParams1, ACTOR);
+}
+
+// spawns GroupType2 (STAGE)
+// 8002da80
+dAcBase_c *dAcBase_c::createActorStage(ProfileName actorId, u32 actorParams1, mVec3_c *actorPosition, mAng3_c *actorRotation, mVec3_c *actorScale, u32 actorParams2, s32 actorRoomid, dBase_c *actorRef) {
+    if (actorPosition == nullptr) {
+        actorPosition = &position;
+    }
+
+    if (actorRotation == nullptr) {
+        actorRotation = &rotation;
+    }
+
+    if (actorScale == nullptr) {
+        actorScale = &scale;
+    }
+
+    if (actorRoomid == 63) {
+        actorRoomid = roomid;
+    }
+
+    u32 newParams2 = -1;
+    if (actorParams2 != 0) {
+        newParams2 = getParams2_ignoreLower();
+    }
+
+    setTempCreateParams(actorPosition, actorRotation, actorScale, actorRoomid, newParams2, (dAcBase_c *)actorRef, 0, -1, 0xFF, nullptr);
+    dBase_c *room = RoomManager::getRoom(roomid);
+    return (dAcBase_c *)dBase_c::createBase(actorId, room, actorParams1, STAGE);
+}
+
+// 8002db80
 void *dAcBase_c::getCurrentEventActor() {}
+
+// 8002db90
 void dAcBase_c::unkVirtFunc_0x6C() {}
-void dAcBase_c::doInteraction(s32) {}
-void dAcBase_c::FUN_8002dc20(s16 *, s16 *) {}
-void dAcBase_c::incrementKillCounter() {}
-void dAcBase_c::FUN_8002dcd0() {}
-void dAcBase_c::FUN_8002dd10() {}
-void dAcBase_c::FUN_8002dd50() {}
-void dAcBase_c::FUN_8002dd90() {}
-void dAcBase_c::FUN_8002ddd0() {}
-void dAcBase_c::FUN_8002de30() {}
+
+// 8002dba0
+void dAcBase_c::doInteraction(s32 param) {
+    if (param == 4 || param == 5 || param == 12) {
+        Event *event = &Event("DefaultTalk", 400, 0x100001, nullptr, nullptr);
+        alsoSetAsCurrentEvent(this, event, nullptr);
+        event->~Event();
+    }
+}
+
+// Only called by dPlayer::dig and that function fails to decomp in ghidra?
+// 8002dc20
+void dAcBase_c::FUN_8002dc20(s16 *, s16 *) {
+    
+}
+
+// This whole function gets compiled to just a `blr`
+// Not sure how to make this work as expected
+// 8002dc50
+void dAcBase_c::incrementKillCounter() {
+    dAcObjBase_c *object = (dAcObjBase_c *)this; // Probably wrong
+
+    FileManager *fileMgr = FileManager::sInstance;
+
+    if (group_type == ACTOR && object->unkByteTargetFiRelated == 1) {
+        s16 killCounterId = object->targetFiTextId;
+
+        if (killCounterId < 91 && killCounterId & 0x300 == 0) {
+            s16 killCount = fileMgr->getEnemyKillCount(killCounterId & 0xFF);
+            fileMgr->setEnemyKillCount(killCounterId, killCount);
+        }
+    }
+}
+
+// 8002dcd0
+void dAcBase_c::FUN_8002dcd0() {
+    fillUpperParams2Byte();
+    fBase_c::deleteRequest();
+    incrementKillCounter();
+}
+
+// 8002dd10
+void dAcBase_c::FUN_8002dd10() {
+    setEnemyDefeatFlag();
+    fBase_c::deleteRequest();
+    incrementKillCounter();
+}
+
+// 8002dd50
+void dAcBase_c::FUN_8002dd50() {
+    fillUpperParams2Byte();
+    FUN_8002dd10();
+}
+
+// 8002dd90
+void dAcBase_c::FUN_8002dd90() {
+    fillUpperParams2Byte();
+    setEnemyDefeatFlag();
+    fBase_c::deleteRequest();
+}
+
+// Some collision related thing
+// 8002ddd0
+void dAcBase_c::FUN_8002ddd0() {
+
+}
+
+// 8002de30
+void dAcBase_c::FUN_8002de30() {
+    FUN_8002ddd0();
+}