d_a_b_ds mostly done (#2098)

This commit is contained in:
Caroline Madsen
2024-03-17 18:53:08 -04:00
committed by GitHub
parent df77eae2b3
commit 38e0f8927a
33 changed files with 6120 additions and 1243 deletions
+3 -3
View File
@@ -2508,7 +2508,7 @@ SECTION_DEAD static char const* const pad_8039263C = "\0\0\0";
int daAlink_c::execute() {
loadModelDVD();
if (checkEndResetFlg0(ERFLG0_UNK_2000000) && getMidnaActor() != NULL) {
if (checkEndResetFlg0(ERFLG0_BOSS_ROOM_WAIT) && getMidnaActor() != NULL) {
getMidnaActor()->onNoServiceWait();
}
@@ -4696,7 +4696,7 @@ bool daAlink_c::checkAcceptDungeonWarpAlink(int param_0) {
}
/* 800D0228-800D0274 0CAB68 004C+00 1/0 0/0 0/0 .text getSpinnerActor__9daAlink_cFv */
fopAc_ac_c* daAlink_c::getSpinnerActor() {
daSpinner_c* daAlink_c::getSpinnerActor() {
fopAc_ac_c* spinnerActor;
if (!checkSpinnerRide()) {
@@ -4704,7 +4704,7 @@ fopAc_ac_c* daAlink_c::getSpinnerActor() {
} else {
spinnerActor = mRideAcKeep.getActor();
}
return spinnerActor;
return static_cast<daSpinner_c*>(spinnerActor);
}
/* 800D0274-800D027C 0CABB4 0008+00 1/0 0/0 0/0 .text getSumouCounter__9daAlink_cCFv */
+2 -2
View File
@@ -780,7 +780,7 @@ void daPy_py_c::setAnimeFrame(f32 param_0) {
}
/* 801416A0-801416A8 13BFE0 0008+00 1/0 0/0 0/0 .text checkWolfLock__9daPy_py_cCFP10fopAc_ac_c */
bool daPy_py_c::checkWolfLock(fopAc_ac_c* param_0) const {
BOOL daPy_py_c::checkWolfLock(fopAc_ac_c* param_0) const {
return false;
}
@@ -969,7 +969,7 @@ void daPy_py_c::onSceneChangeDead(u8 param_0, int param_1) {
}
/* 80141770-80141778 13C0B0 0008+00 1/0 0/0 0/0 .text getSpinnerActor__9daPy_py_cFv */
fopAc_ac_c* daPy_py_c::getSpinnerActor() {
daSpinner_c* daPy_py_c::getSpinnerActor() {
return NULL;
}
+1 -1
View File
@@ -5594,7 +5594,7 @@ asm void daAlink_c::checkWolfLockData() {
#endif
/* 8013911C-8013916C 133A5C 0050+00 1/0 0/0 0/0 .text checkWolfLock__9daAlink_cCFP10fopAc_ac_c */
bool daAlink_c::checkWolfLock(fopAc_ac_c* i_actor) const {
BOOL daAlink_c::checkWolfLock(fopAc_ac_c* i_actor) const {
u32 actor_id = fopAcM_GetID(i_actor);
for (int i = 0; i < mWolfLockNum; i++) {
+2 -1
View File
@@ -10,6 +10,7 @@
#include "d/d_procname.h"
#include "d/s/d_s_room.h"
#include "rel/d/a/d_a_horse/d_a_horse.h"
#include "rel/d/a/d_a_spinner/d_a_spinner.h"
/* 801451EC-801452DC 13FB2C 00F0+00 1/1 0/0 0/0 .text isLoadRoom__Fi */
static bool isLoadRoom(int i_roomNo) {
@@ -56,7 +57,7 @@ int daNocrm_c::execute() {
if (player_p->checkHorseRide()) {
cur_player_pos.y = i_dComIfGp_getHorseActor()->current.pos.y;
} else if (player_p->checkSpinnerRide()) {
fopAc_ac_c* spinner_actor = player_p->getSpinnerActor();
daSpinner_c* spinner_actor = player_p->getSpinnerActor();
if (spinner_actor != NULL) {
cur_player_pos.y = spinner_actor->current.pos.y;
+1 -1
View File
@@ -580,7 +580,7 @@ f32 daPy_py_c::getSpinnerRideSpeed() const {
/* 8015F814-8015F89C 15A154 0088+00 0/0 0/0 1/1 .text checkSpinnerReflectEffect__9daPy_py_cFv */
bool daPy_py_c::checkSpinnerReflectEffect() {
daSpinner_c* spinner_p = (daSpinner_c*)getSpinnerActor();
daSpinner_c* spinner_p = getSpinnerActor();
if (spinner_p != NULL && spinner_p->reflectAccept()) {
return true;