From d9183b121af7c03f8b60b4c03466ebed02461d04 Mon Sep 17 00:00:00 2001 From: Trueffeloot Date: Sat, 8 Apr 2023 15:17:57 +0200 Subject: [PATCH] Fixes --- .../rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h | 2 +- rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp | 14 +++++++------- rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h b/include/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h index 3c5cc4451fe..308919d4306 100644 --- a/include/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h +++ b/include/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h @@ -15,7 +15,7 @@ public: /* 0x568 */ u8 field_0x568; /* 0x569 */ u8 field_0x569; - /* 0x56B */ u16 field_0x56b; + /* 0x56A */ u16 field_0x56a; }; class daTagPoFire_HIO_c : public mDoHIO_entry_c { diff --git a/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp b/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp index 2da2f7918ab..9e7ebcc1007 100644 --- a/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp +++ b/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp @@ -23,20 +23,20 @@ int daCowdoor_c::Create() { } /* 80BCCBDC-80BCCBE0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -static const char* l_arcName[] = {"A_UHDoor"}; +static const char* l_arcName = "A_UHDoor"; /* 80BCCBE0-80BCCBE4 -00001 0004+00 1/1 0/0 0/0 .data l_bmdName */ -static const char* l_bmdName[] = {"A_UHDoor.bmd"}; +static const char* l_bmdName = "A_UHDoor.bmd"; /* 80BCC8C4-80BCC93C 000144 0078+00 1/0 0/0 0/0 .text CreateHeap__11daCowdoor_cFv */ int daCowdoor_c::CreateHeap() { field_0x5a8 = mDoExt_J3DModel__create( - (J3DModelData*)dComIfG_getObjectRes(l_arcName[0], l_bmdName[0]), 0x80000, 0x11000084); + (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdName), 0x80000, 0x11000084); return (field_0x5a8 != NULL) ? 1 : 0; } /* 80BCCBE4-80BCCBE8 -00001 0004+00 1/1 0/0 0/0 .data l_dzbName */ -static const char* l_dzbName[] = {"A_UHDoor.dzb"}; +static const char* l_dzbName = "A_UHDoor.dzb"; /* 80BCC93C-80BCCA1C 0001BC 00E0+00 1/1 0/0 0/0 .text create__11daCowdoor_cFv */ int daCowdoor_c::create() { @@ -44,10 +44,10 @@ int daCowdoor_c::create() { new (this) daCowdoor_c(); fopAcM_OnCondition(this, 8); } - int phase = dComIfG_resLoad(&field_0x5a0, l_arcName[0]); + int phase = dComIfG_resLoad(&field_0x5a0, l_arcName); if (phase == cPhs_COMPLEATE_e) { phase = - MoveBGCreate(l_arcName[0], dComIfG_getObjctResName2Index(l_arcName[0], l_dzbName[0]), + MoveBGCreate(l_arcName, dComIfG_getObjctResName2Index(l_arcName, l_dzbName), dBgS_MoveBGProc_TypicalRotY, 0x4000, NULL); if (phase == cPhs_ERROR_e) { return phase; @@ -75,7 +75,7 @@ int daCowdoor_c::Draw() { /* 80BCCAEC-80BCCB20 00036C 0034+00 1/0 0/0 0/0 .text Delete__11daCowdoor_cFv */ int daCowdoor_c::Delete() { - dComIfG_resDelete(&field_0x5a0, l_arcName[0]); + dComIfG_resDelete(&field_0x5a0, l_arcName); return 1; } diff --git a/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp b/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp index a1457dbef4a..7824cd6a733 100644 --- a/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp +++ b/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp @@ -33,11 +33,11 @@ int daObjTMoon_c::Create() { } /* 80D12FA0-80D12FA4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -static const char* l_arcName[] = {"A_TMoon"}; +static const char* l_arcName = "A_TMoon"; /* 80D12C9C-80D12D0C 00017C 0070+00 1/1 0/0 0/0 .text CreateHeap__12daObjTMoon_cFv */ bool daObjTMoon_c::CreateHeap() { - field_0x570 = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes(l_arcName[0], 3), + field_0x570 = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes(l_arcName, 3), 0x80000, 0x11000084); return field_0x570 != NULL; } @@ -48,7 +48,7 @@ int daObjTMoon_c::create() { new (this) daObjTMoon_c(); fopAcM_OnCondition(this, 8); } - int phase = dComIfG_resLoad(&field_0x568, l_arcName[0]); + int phase = dComIfG_resLoad(&field_0x568, l_arcName); if (phase == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)CheckCreateHeap, 0x880)) { return cPhs_ERROR_e; @@ -85,7 +85,7 @@ int daObjTMoon_c::draw() { /* 80D12EDC-80D12F10 0003BC 0034+00 1/1 0/0 0/0 .text _delete__12daObjTMoon_cFv */ int daObjTMoon_c::_delete() { - dComIfG_resDelete(&field_0x568, l_arcName[0]); + dComIfG_resDelete(&field_0x568, l_arcName); return 1; }