diff --git a/config/SOUE01/rels/d_a_obj_desert_debrisNP/symbols.txt b/config/SOUE01/rels/d_a_obj_desert_debrisNP/symbols.txt index 97a24cf5..1a8f83af 100644 --- a/config/SOUE01/rels/d_a_obj_desert_debrisNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_desert_debrisNP/symbols.txt @@ -7,7 +7,7 @@ create__18dAcOdesertDebris_cFv = .text:0x00000200; // type:function size:0xF0 doDelete__18dAcOdesertDebris_cFv = .text:0x000002F0; // type:function size:0x38 actorExecute__18dAcOdesertDebris_cFv = .text:0x00000330; // type:function size:0x40 draw__18dAcOdesertDebris_cFv = .text:0x00000370; // type:function size:0x28 -checkStoryFlag__18dAcOdesertDebris_cFv = .text:0x000003A0; // type:function size:0x5C +checkStoryFlag__18dAcOdesertDebris_cCFv = .text:0x000003A0; // type:function size:0x5C __dt__18dAcOdesertDebris_cFv = .text:0x00000400; // type:function size:0x74 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global diff --git a/include/d/a/obj/d_a_obj_desert_debris.h b/include/d/a/obj/d_a_obj_desert_debris.h index 552afa7d..aa71d601 100644 --- a/include/d/a/obj/d_a_obj_desert_debris.h +++ b/include/d/a/obj/d_a_obj_desert_debris.h @@ -17,9 +17,9 @@ public: virtual int actorExecute() override; virtual int draw() override; - bool checkStoryFlag(); - private: + bool checkStoryFlag() const; + nw4r::g3d::ResFile mResFile; m3d::smdl_c mMdl; dBgW mBgW; diff --git a/src/REL/d/a/obj/d_a_obj_desert_debris.cpp b/src/REL/d/a/obj/d_a_obj_desert_debris.cpp index b67a9f0e..f8dac550 100644 --- a/src/REL/d/a/obj/d_a_obj_desert_debris.cpp +++ b/src/REL/d/a/obj/d_a_obj_desert_debris.cpp @@ -59,6 +59,6 @@ int dAcOdesertDebris_c::draw() { return SUCCEEDED; } -bool dAcOdesertDebris_c::checkStoryFlag() { +bool dAcOdesertDebris_c::checkStoryFlag() const { return mStoryFlag < 0x7FF && StoryflagManager::sInstance->getCounterOrFlag(mStoryFlag); }