mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-09 22:11:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Misc cleanup

Browse Source
This commit is contained in:
LagoLunatic
2025-01-11 22:12:10 -05:00
parent 532bdb29ad
commit 40d18bef9d
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_hbrf1.cpp
+1 -1
View File
@@ -70,7 +70,7 @@ BOOL daObjHbrf1::Act_c::Delete() {
BOOL daObjHbrf1::Act_c::Mthd_Delete() {
BOOL ret = MoveBGDelete();
// Debug map shows dComIfG_deleteObjectRes here?
// The demo version (and thus the demo debug maps) used dComIfG_deleteObjectRes here instead.
dComIfG_resDelete(&mPhs, M_arcname);
return ret;
src/d/actor/d_a_obj_rforce.cpp
+4 -4
View File
@@ -25,7 +25,7 @@ bool daObjRforce::Act_c::create_heap() {
set_mtx();
cBgD_t* bgw_data = static_cast<cBgD_t*>(dComIfG_getObjectRes(M_arcname, 0x07));
cBgD_t* bgw_data = static_cast<cBgD_t*>(dComIfG_getObjectRes(M_arcname, STPTETU_DZB_STPTETU));
JUT_ASSERT(0x64, bgw_data != NULL);
if(bgw_data != NULL){
mpBgw = new dBgW();
@@ -107,17 +107,17 @@ s32 Mthd_Create(void* obj) {
}
/* 00000528-0000054C .text Mthd_Delete__Q211daObjRforce28@unnamed@d_a_obj_rforce_cpp@FPv */
s32 Mthd_Delete(void* obj) {
BOOL Mthd_Delete(void* obj) {
return static_cast<daObjRforce::Act_c*>(obj)->_delete();
}
/* 0000054C-00000570 .text Mthd_Execute__Q211daObjRforce28@unnamed@d_a_obj_rforce_cpp@FPv */
int Mthd_Execute(void* obj) {
BOOL Mthd_Execute(void* obj) {
return static_cast<daObjRforce::Act_c*>(obj)->_execute();
}
/* 00000570-00000594 .text Mthd_Draw__Q211daObjRforce28@unnamed@d_a_obj_rforce_cpp@FPv */
int Mthd_Draw(void* obj) {
BOOL Mthd_Draw(void* obj) {
return static_cast<daObjRforce::Act_c*>(obj)->_draw();
}
src/d/d_item_data.cpp
+3 -3
View File
@@ -9815,7 +9815,7 @@ dItem_data_item_info dItem_data::item_info[0x100] = {
};
/* 803886B0-803888B4 .data effect_info__10dItem_data */
dItem_data_effect_info dItem_data::effect_info[0x81] = {
dItem_data_effect_info dItem_data::effect_info[] = {
{
// 0x00: dItem_HEART_e
0x0002,
@@ -10465,7 +10465,7 @@ dItem_data_effect_info dItem_data::effect_info[0x81] = {
/* 800C12F4-800C1334 .text checkAppearEffect__10dItem_dataFUc */
bool dItem_data::checkAppearEffect(u8 no) {
if (no > 0x80) {
if (no > ARRAY_SIZE(effect_info)-1) {
return false;
}
return effect_info[no].m_appear != dPa_name::ID_SCENE_END;
@@ -10479,7 +10479,7 @@ u16 dItem_data::getAppearEffect(u8 no) {
/* 800C13B4-800C13F8 .text checkSpecialEffect__10dItem_dataFUc */
bool dItem_data::checkSpecialEffect(u8 no) {
if (no > 0x80) {
if (no > ARRAY_SIZE(effect_info)-1) {
return false;
}
return effect_info[no].m_sp_effect != dPa_name::ID_SCENE_END;