diff --git a/.clangd b/.clangd index 2d315f9d48..86f64c3e3a 100644 --- a/.clangd +++ b/.clangd @@ -1,10 +1,18 @@ CompileFlags: Add: [ "-Wno-c++11-compat-deprecated-writable-strings", - "-Wno-extern-initializer", "-Wno-multichar", "-fdeclspec", "-Wno-c++11-extensions", + "-Wuninitialized", + "-Wsometimes-uninitialized", + "-Wlogical-op-parentheses", + "-Wbitwise-op-parentheses", + # "-Wunused-variable", + # "-Wunused-but-set-variable", + "-Wunused-parameter", + "-Wunused-but-set-parameter", + "-Wself-assign", ] Diagnostics: Suppress: diff --git a/.vscode/settings.json b/.vscode/settings.json index 7ade75da5a..a4ee63fb46 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -49,6 +49,7 @@ "clangd.arguments": [ "--function-arg-placeholders=0", "-header-insertion=never", + // "--log=verbose", ], "clangd.detectExtensionConflicts": true, } diff --git a/configure.py b/configure.py index e97f5cc659..1cdcf6c728 100755 --- a/configure.py +++ b/configure.py @@ -287,11 +287,9 @@ if config.version in USE_REVOLUTION_SDK_VERSIONS: # Debug flags if args.debug: # Or -sym dwarf-2 for Wii compilers - cflags_base.extend(["-sym on", "-DDEBUG=1", "-DDEBUG_DEFINED=1", "-DNDEBUG_DEFINED=0"]) + cflags_base.extend(["-sym on", "-DDEBUG=1"]) elif config.version == "ShieldD": - cflags_base.extend(["-DDEBUG=1", "-DDEBUG_DEFINED=1", "-DNDEBUG_DEFINED=0"]) -else: - cflags_base.extend(["-DNDEBUG=1", "-DNDEBUG_DEFINED=1", "-DDEBUG_DEFINED=0"]) + cflags_base.extend(["-DDEBUG=1"]) # Warning flags if args.warn == "all": diff --git a/include/JSystem/JGadget/linklist.h b/include/JSystem/JGadget/linklist.h index 2fcb281f06..47a438ddb8 100644 --- a/include/JSystem/JGadget/linklist.h +++ b/include/JSystem/JGadget/linklist.h @@ -270,7 +270,11 @@ struct TLinkList_factory : public TLinkList { template TLinkList_factory::~TLinkList_factory() { +#ifdef __MWERKS__ JGADGET_ASSERTWARN(934, empty()); +#else + JGADGET_ASSERTWARN(934, this->empty()); +#endif } template diff --git a/include/JSystem/JSystem.h b/include/JSystem/JSystem.h index 82231fe4d4..2b2f1143d0 100644 --- a/include/JSystem/JSystem.h +++ b/include/JSystem/JSystem.h @@ -1,7 +1,7 @@ #ifndef JSYSTEM_H #define JSYSTEM_H -#ifdef __MWERKS__ +#if __MWERKS__ && !defined(DECOMPCTX) #include "JSystem/JSystem.mch" // IWYU pragma: export #else #include "JSystem/JSystem.pch" // IWYU pragma: export diff --git a/include/JSystem/JUtility/JUTResFont.h b/include/JSystem/JUtility/JUTResFont.h index 819c77c05e..473a8e8f99 100644 --- a/include/JSystem/JUtility/JUTResFont.h +++ b/include/JSystem/JUtility/JUTResFont.h @@ -79,7 +79,7 @@ public: /* 0x6C */ const IsLeadByte_func* mIsLeadByte; }; -extern u8 const JUTResFONT_Ascfont_fix12[16736]; -extern u8 const JUTResFONT_Ascfont_fix16[16736]; +extern u8 const JUTResFONT_Ascfont_fix12[]; +extern u8 const JUTResFONT_Ascfont_fix16[]; #endif /* JUTRESFONT_H */ diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index f8802dfc25..0ad2f717a7 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -403,24 +403,24 @@ public: virtual bool CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const { return false; } - /* vt[4] */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const = 0; - /* vt[5] */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const = 0; - /* vt[6] */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const = 0; - /* vt[7] */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const = 0; - /* vt[8] */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const = 0; - /* vt[9] */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const = 0; - /* 802649E0 vt[10]*/ virtual bool CrossCo(cCcD_ShapeAttr const&, f32*) const { return false; } - /* vt[11]*/ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const = 0; - /* vt[12]*/ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const = 0; - /* vt[13]*/ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const = 0; - /* vt[14]*/ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const = 0; - /* vt[15]*/ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const = 0; - /* vt[16]*/ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const = 0; - /* 80084E38 vt[17]*/ virtual const cXyz& GetCoCP() const { return m_virtual_center; } - /* 80084E2C vt[18]*/ virtual cXyz& GetCoCP() { return m_virtual_center; } - /* vt[19]*/ virtual void CalcAabBox() = 0; - /* vt[20]*/ virtual bool GetNVec(cXyz const&, cXyz*) const = 0; - /* 80263A64 vt[21]*/ virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const; + /* vt[4] */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const = 0; + /* vt[5] */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const = 0; + /* vt[6] */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const = 0; + /* vt[7] */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const = 0; + /* vt[8] */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const = 0; + /* vt[9] */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const = 0; + /* vt[10]*/ virtual bool CrossCo(cCcD_ShapeAttr const&, f32*) const { return false; } + /* vt[11]*/ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const = 0; + /* vt[12]*/ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const = 0; + /* vt[13]*/ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const = 0; + /* vt[14]*/ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const = 0; + /* vt[15]*/ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const = 0; + /* vt[16]*/ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const = 0; + /* vt[17]*/ virtual const cXyz& GetCoCP() const { return m_virtual_center; } + /* vt[18]*/ virtual cXyz& GetCoCP() { return m_virtual_center; } + /* vt[19]*/ virtual void CalcAabBox() = 0; + /* vt[20]*/ virtual bool GetNVec(cXyz const&, cXyz*) const = 0; + /* vt[21]*/ virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const; cM3dGAab& GetWorkAab() { return mAab; } cM3dGAab const& GetWorkAab() const { return mAab; } diff --git a/include/SSystem/SComponent/c_cc_s.h b/include/SSystem/SComponent/c_cc_s.h index b82cd29a33..334f7351d8 100644 --- a/include/SSystem/SComponent/c_cc_s.h +++ b/include/SSystem/SComponent/c_cc_s.h @@ -46,7 +46,7 @@ public: virtual void CalcTgPlusDmg(cCcD_Obj*, cCcD_Obj*, cCcD_Stts*, cCcD_Stts*); void SetAtTgCommonHitInf(cCcD_Obj*, cCcD_Obj*, cXyz*); void SetCoCommonHitInf(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32); - /* 80265750 vt[3]*/ virtual void SetPosCorrect(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32); + /* vt[3]*/ virtual void SetPosCorrect(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32); void CalcArea(); void Move(); void DrawClear(); diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h index 740ce2cfdb..135e1275b1 100644 --- a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h +++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h @@ -3,4 +3,8 @@ #include "dolphin/types.h" +void* TRK_memset(void* dest, int val, size_t count); +void* TRK_memcpy(void* dest, const void* src, size_t count); +void TRK_fill_mem(void* dest, int val, size_t count); + #endif /* METROTRK_PORTABLE_MEM_TRK_H */ diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h index d06794c1e7..ff14b43261 100644 --- a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h +++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h @@ -11,6 +11,25 @@ DSError TRKSetBufferPosition(TRKBuffer* msg, u32 pos); void* TRKGetBuffer(int); void TRKResetBuffer(TRKBuffer* msg, BOOL keepData); +DSError TRKAppendBuffer1_ui16(TRKBuffer* buffer, const u16 data); +DSError TRKAppendBuffer1_ui32(TRKBuffer* buffer, const u32 data); +DSError TRKAppendBuffer1_ui64(TRKBuffer* buffer, const u64 data); + +DSError TRKAppendBuffer_ui8(TRKBuffer* buffer, const u8* data, int count); +DSError TRKAppendBuffer_ui16(TRKBuffer* buffer, const u16* data, int count); +DSError TRKAppendBuffer_ui32(TRKBuffer* buffer, const u32* data, int count); +DSError TRKAppendBuffer_ui64(TRKBuffer* buffer, const u64* data, int count); + +DSError TRKReadBuffer1_ui8(TRKBuffer* buffer, u8* data); +DSError TRKReadBuffer1_ui16(TRKBuffer* buffer, u16* data); +DSError TRKReadBuffer1_ui32(TRKBuffer* buffer, u32* data); +DSError TRKReadBuffer1_ui64(TRKBuffer* buffer, u64* data); + +DSError TRKReadBuffer_ui8(TRKBuffer* buffer, u8* data, int count); +DSError TRKReadBuffer_ui16(TRKBuffer* buffer, u16* data, int count); +DSError TRKReadBuffer_ui32(TRKBuffer* buffer, u32* data, int count); +DSError TRKReadBuffer_ui64(TRKBuffer* buffer, u64* data, int count); + #ifdef __cplusplus } #endif diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h index 9f112f2e64..d491ced086 100644 --- a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h +++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h @@ -1,6 +1,7 @@ #ifndef METROTRK_PORTABLE_MUTEX_TRK_H #define METROTRK_PORTABLE_MUTEX_TRK_H +#include "revolution/types.h" u8 TRKReleaseMutex(); u8 TRKAcquireMutex(); diff --git a/include/d/actor/d_a_npc_cdn3.h b/include/d/actor/d_a_npc_cdn3.h index d20ddfdce5..890f362862 100644 --- a/include/d/actor/d_a_npc_cdn3.h +++ b/include/d/actor/d_a_npc_cdn3.h @@ -137,7 +137,7 @@ public: } void setSpeed(f32 param_0, f32 param_1, f32* param_2, int param_3) { - (void)param_3; + UNUSED(param_3); f32 target = field_0xb5c * (param_1 * field_0xb5c); f32 step = field_0xb5c * (param_0 * field_0xb5c); if (param_1 < target) { diff --git a/include/d/actor/d_a_npc_tk.h b/include/d/actor/d_a_npc_tk.h index 15489c9284..34833f7e0d 100644 --- a/include/d/actor/d_a_npc_tk.h +++ b/include/d/actor/d_a_npc_tk.h @@ -29,33 +29,26 @@ public: void setActionMode(int); f32 setAddCalcSpeedXZ(cXyz&, cXyz const&, f32, f32, f32); cXyz chaseTargetPos(cXyz, f32, f32, s16); - /* 80B01D84 */ fopAc_ac_c* getMasterPointer(); void setMasterShoulder(cXyz*); void setAwayAction(int); void setFlySE(); void executeFly(); void initPerchDemo(int); - /* 80B02B5C */ bool executePerchDemo(int); void executePerch(); void executeHandOn(); - /* 80B039A8 */ bool checkWaterSurface(f32); void executeAttack(); void executeAway(); void setCarryActorMtx(); - /* 80B04F64 */ f32 getTakePosY(); - /* 80B04FA8 */ f32 getTakeOffPosY(); void executeBack(); - /* 80B05BD0 */ cXyz getHanjoHandPos(); void executeStayHanjo(); void executeAttackLink(); void executeBackHanjo(); - /* 80B07114 */ bool checkAttackDemo(); void executeAttackDemo(); void executeBackHanjoDemo(); @@ -74,7 +67,6 @@ public: void cc_set(); int execute(); int _delete(); - /* 80B0B9AC */ int ctrlJoint(J3DJoint*, J3DModel*); static int JointCallBack(J3DJoint*, int); int CreateHeap(); diff --git a/include/d/actor/d_a_obj_lv6SwGate.h b/include/d/actor/d_a_obj_lv6SwGate.h index 9809cbcd63..964c073c1d 100644 --- a/include/d/actor/d_a_obj_lv6SwGate.h +++ b/include/d/actor/d_a_obj_lv6SwGate.h @@ -57,7 +57,6 @@ STATIC_ASSERT(sizeof(daLv6SwGate_c) == 0x14f8); class daLv6SwGate_HIO_c : public fOpAcm_HIO_entry_c { public: - /* 80C73F0C */ daLv6SwGate_HIO_c(); void genMessage(JORMContext*); diff --git a/include/d/actor/d_a_obj_stone.h b/include/d/actor/d_a_obj_stone.h index bad3bb5d61..b5f4da8c39 100644 --- a/include/d/actor/d_a_obj_stone.h +++ b/include/d/actor/d_a_obj_stone.h @@ -81,7 +81,7 @@ private: /* 0x094E */ bool mIsInWater; /* 0x094F */ u8 field_0x094f; /* 0x0950 */ u8 field_0x0950; - /* 0x0951 */ u8 field_0x0951; + /* 0x0951 */ bool field_0x0951; /* 0x0954 */ u32 field_0x0954; /* 0x0954 */ u32 field_0x0958; /* 0x0954 */ u32 field_0x095c; diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h index f5d7579c97..712aa3c47a 100644 --- a/include/d/d_bg_s_acch.h +++ b/include/d/d_bg_s_acch.h @@ -195,7 +195,7 @@ public: f32 GetCx() const { return pm_pos->x; } f32 GetCz() const { return pm_pos->z; } -public: +private: /* 0x02C */ u32 m_flags; /* 0x030 */ cXyz* pm_pos; /* 0x034 */ cXyz* pm_old_pos; @@ -231,9 +231,11 @@ public: /* 0x0E4 */ cXyz unk_0xe4; #endif /* 0x0D8 */ f32 field_0xd8; +public: /* 0x0DC */ dBgS_GndChk m_gnd; /* 0x130 */ dBgS_RoofChk m_roof; /* 0x180 */ dBgS_WtrChk m_wtr; +private: /* 0x1D4 */ u8 m_wtr_mode; }; // Size: 0x1D8 diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 388e2d6a4d..df64a28249 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -840,7 +840,7 @@ public: ~dComIfG_inf_c() {} void ct(); void createBaseCsr(); - dComIfG_play_c& getPlay() { return play; } + dComIfG_play_c& getPlay() { return play; } // fake inline #if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG class baseCsr_c : public mDoGph_gInf_c::csr_c { diff --git a/include/d/d_debug_camera.h b/include/d/d_debug_camera.h index 51d11fd0e5..854cf0ecfa 100644 --- a/include/d/d_debug_camera.h +++ b/include/d/d_debug_camera.h @@ -24,7 +24,7 @@ public: /* 0x1C */ f32 mBank; struct { /* 0x20 */ fpc_ProcID id; - /* 0x24 */ char name[8]; + /* 0x24 */ char name[dStage_NAME_LENGTH]; } mActorInfo; /* 0x2C */ int mAction; /* 0x30 */ int mTimer; diff --git a/include/d/d_menu_fmap.h b/include/d/d_menu_fmap.h index bd95772c59..2b450aa577 100644 --- a/include/d/d_menu_fmap.h +++ b/include/d/d_menu_fmap.h @@ -1,6 +1,7 @@ #ifndef D_MENU_D_MENU_FMAP_H #define D_MENU_D_MENU_FMAP_H +#include "JSystem/JHostIO/JORReflexible.h" #include "SSystem/SComponent/c_xyz.h" #include "d/d_menu_map_common.h" #include "d/d_msg_flow.h" diff --git a/include/d/d_menu_fmap_map.h b/include/d/d_menu_fmap_map.h index dfb1197848..2879d03d02 100644 --- a/include/d/d_menu_fmap_map.h +++ b/include/d/d_menu_fmap_map.h @@ -141,13 +141,13 @@ public: virtual void genMessage(JORMContext*); virtual u32 addString(char* param_1, u32 param_2, u32 param_3) { return field_0xc.addString(param_1, param_2, param_3); } virtual u32 addData(char* param_1, u32 param_2, u32 param_3) { - (void)param_2; - (void)param_3; + UNUSED(param_2); + UNUSED(param_3); memcpy(param_1, dMfm_HIO_prm_res_dst_s::m_res, 366); return 366; } virtual void copyReadBufToData(const char* param_1, s32 param_2) { - (void)param_2; + UNUSED(param_2); field_0xc.copyBufToHio(param_1); } virtual u32 addStringBinary(char* param_1, u32 param_2, u32 param_3) { return field_0xc.addStringBinary(param_1, param_2, param_3); } diff --git a/include/d/d_meter2_info.h b/include/d/d_meter2_info.h index 45f165341b..4738c7faf6 100644 --- a/include/d/d_meter2_info.h +++ b/include/d/d_meter2_info.h @@ -124,10 +124,7 @@ public: void resetPauseStatus() { mPauseStatus = 0; } u8 getPauseStatus() { return mPauseStatus; } bool isGameStatus(int i_status) { return (mGameStatus & (u16)i_status) != 0 ? true : false; } - bool isTouchKeyCheck(int i_status) { return mTouchKeyCheck & (1 << i_status); } - - // fake function, should be isTouchKeyCheck - bool isTouchKeyCheck_alt(int i_status) { return (mTouchKeyCheck >> i_status) & 1; } + bool isTouchKeyCheck(int i_status) { return mTouchKeyCheck & (u16)(1 << i_status) ? true : false; } void setMapKeyDirection(u16 i_direction) { mMapKeyDirection = i_direction; } bool isSub2DStatus(int i_flag) { return (mSub2DStatus & (u16)(1 << i_flag)) != 0 ? true : false; } @@ -486,11 +483,6 @@ inline bool dMeter2Info_isTouchKeyCheck(int i_status) { return g_meter2_info.isTouchKeyCheck(i_status); } -// fake function, should be dMeter2Info_isTouchKeyCheck -inline bool dMeter2Info_isTouchKeyCheck_alt(int i_status) { - return g_meter2_info.isTouchKeyCheck_alt(i_status); -} - inline void dMeter2Info_setMapKeyDirection(u16 i_direction) { g_meter2_info.setMapKeyDirection(i_direction); } diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 848e7bd21e..4afb1e9afb 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -586,7 +586,7 @@ public: /* vt[38] */ virtual void setVrboxcolNumInfo(int i_VrboxcolNumInfo) { mVrboxcolNumInfo = i_VrboxcolNumInfo; } /* vt[39] */ virtual int getVrboxcolNumInfo(void) const { return mVrboxcolNumInfo; } /* vt[42] */ virtual void setLightVecInfo(stage_pure_lightvec_info_class* i_LightVecInfo) { - (void)i_LightVecInfo; + UNUSED(i_LightVecInfo); dStage_SetErrorStage(); OSReport("stage non LightVec data !!\n"); JUT_ASSERT(3003, FALSE); @@ -597,7 +597,7 @@ public: return NULL; } /* vt[44] */ virtual void setLightVecInfoNum(int i_LightVecInfoNum) { - (void)i_LightVecInfoNum; + UNUSED(i_LightVecInfoNum); dStage_SetErrorStage(); OSReport("stage non LightVecNum data !!\n"); JUT_ASSERT(3014, FALSE); @@ -628,7 +628,7 @@ public: /* vt[62] */ virtual void setMapEventInfo(dStage_MapEventInfo_c* i_MapEventInfo) { mMapEventInfo = i_MapEventInfo; } /* vt[63] */ virtual dStage_MapEventInfo_c* getMapEventInfo(void) const { return mMapEventInfo; } /* vt[64] */ virtual void setFileList2Info(dStage_FileList2_dt_c* list) { - (void)list; + UNUSED(list); dStage_SetErrorStage(); OSReport("stage non filelist2 data!\n"); JUT_ASSERT(3123, FALSE); @@ -639,7 +639,7 @@ public: return NULL; } /* vt[66] */ virtual void setFileListInfo(dStage_FileList_dt_c* list) { - (void)list; + UNUSED(list); dStage_SetErrorStage(); OSReport("stage non filelist data!\n"); JUT_ASSERT(3138, FALSE); @@ -661,7 +661,7 @@ public: /* vt[77] */ virtual void resetOldMulti(void); /* vt[78] */ virtual dStage_Multi_c* getOldMulti(void) const { return mOldMulti; } /* vt[79] */ virtual void setLbnk(dStage_Lbnk_c* lbnk) { - (void)lbnk; + UNUSED(lbnk); dStage_SetErrorStage(); OSReport("stage non Lbnk data!\n"); JUT_ASSERT(3231, FALSE); @@ -746,7 +746,7 @@ public: virtual void setPlayerNum(u16 i_PlayerNum) { mPlayerNum = i_PlayerNum; } virtual u16 getPlayerNum(void) const { return mPlayerNum; } virtual void setRoom(roomRead_class* i_Room) { - (void)i_Room; + UNUSED(i_Room); dStage_SetErrorRoom(); OSReport("Room non room data !!\n"); JUT_ASSERT(2095, FALSE); @@ -762,7 +762,7 @@ public: virtual void setMapInfoBase(stage_map_info_dummy_class* i_MapInfoBase) { mMapInfoBase = i_MapInfoBase; } virtual stage_map_info_dummy_class* getMapInfoBase(void) const { return mMapInfoBase; } virtual void setPaletteInfo(stage_palette_info_class* i_PaletteInfo) { - (void)i_PaletteInfo; + UNUSED(i_PaletteInfo); dStage_SetErrorRoom(); OSReport("Room non palet data !!\n"); JUT_ASSERT(2126, FALSE); @@ -773,7 +773,7 @@ public: return NULL; } virtual void setPselectInfo(stage_pselect_info_class* i_PselectInfo) { - (void)i_PselectInfo; + UNUSED(i_PselectInfo); dStage_SetErrorRoom(); OSReport("Room non pselect data !!\n"); JUT_ASSERT(2137, FALSE); @@ -784,7 +784,7 @@ public: return NULL; } virtual void setEnvrInfo(stage_envr_info_class* i_EnvrInfo) { - (void)i_EnvrInfo; + UNUSED(i_EnvrInfo); dStage_SetErrorRoom(); OSReport("Room non envr data !!\n"); JUT_ASSERT(2148, FALSE); @@ -799,7 +799,7 @@ public: virtual void setVrboxcolInfo(stage_vrboxcol_info_class* i_VrboxcolInfo) { mVrboxcolInfo = i_VrboxcolInfo; } virtual stage_vrboxcol_info_class* getVrboxcolInfo(void) const { return mVrboxcolInfo; } virtual void setPlightInfo(stage_plight_info_class* i_PlightInfo) { - (void)i_PlightInfo; + UNUSED(i_PlightInfo); dStage_SetErrorRoom(); OSReport("Room non plight data !!\n"); JUT_ASSERT(2174, FALSE); @@ -810,7 +810,7 @@ public: return NULL; } virtual void setPaletteNumInfo(int i_PaletteNumInfo) { - (void)i_PaletteNumInfo; + UNUSED(i_PaletteNumInfo); dStage_SetErrorRoom(); OSReport("Room non palette num data !!\n"); JUT_ASSERT(2186, FALSE); @@ -821,7 +821,7 @@ public: return NULL; } virtual void setPselectNumInfo(int i_PselectNumInfo) { - (void)i_PselectNumInfo; + UNUSED(i_PselectNumInfo); dStage_SetErrorRoom(); OSReport("Room non pselect num data !!\n"); JUT_ASSERT(2197, FALSE); @@ -832,7 +832,7 @@ public: return NULL; } virtual void setEnvrNumInfo(int i_EnvrNumInfo) { - (void)i_EnvrNumInfo; + UNUSED(i_EnvrNumInfo); dStage_SetErrorRoom(); OSReport("Room non envr num data !!\n"); JUT_ASSERT(2208, FALSE); @@ -847,7 +847,7 @@ public: virtual void setVrboxcolNumInfo(int i_VrboxcolNumInfo) { mVrboxcolNumInfo = i_VrboxcolNumInfo; } virtual int getVrboxcolNumInfo(void) const { return mVrboxcolNumInfo; } virtual void setPlightNumInfo(int i_PlightNumInfo) { - (void)i_PlightNumInfo; + UNUSED(i_PlightNumInfo); dStage_SetErrorRoom(); OSReport("Room non plight num data !!\n"); JUT_ASSERT(2223, FALSE); @@ -862,7 +862,7 @@ public: virtual void setLightVecInfoNum(int i_LightVecInfoNum) { mLightVecInfoNum = i_LightVecInfoNum; } virtual int getLightVecInfoNum(void) const { return mLightVecInfoNum; } virtual void setStagInfo(stage_stag_info_class* i_StagInfo) { - (void)i_StagInfo; + UNUSED(i_StagInfo); dStage_SetErrorRoom(); OSReport("Room non stag data !!\n"); JUT_ASSERT(2256, FALSE); @@ -875,7 +875,7 @@ public: virtual void setSclsInfo(stage_scls_info_dummy_class* i_SclsInfo) { mSclsInfo = i_SclsInfo; } virtual stage_scls_info_dummy_class* getSclsInfo(void) const { return mSclsInfo; } virtual void setPntInfo(dStage_dPnt_c* i_PntInfo) { - (void)i_PntInfo; + UNUSED(i_PntInfo); dStage_SetErrorRoom(); OSReport("Room non Pnt data !\n"); JUT_ASSERT(2281, FALSE); @@ -886,7 +886,7 @@ public: return NULL; } virtual void setPathInfo(dStage_dPath_c* i_PathInfo) { - (void)i_PathInfo; + UNUSED(i_PathInfo); dStage_SetErrorRoom(); OSReport("Room non Path data !\n"); JUT_ASSERT(2292, FALSE); @@ -913,7 +913,7 @@ public: virtual void setFloorInfo(dStage_FloorInfo_c* i_FloorInfo) { mFloorInfo = i_FloorInfo; } virtual dStage_FloorInfo_c* getFloorInfo(void) const { return mFloorInfo; } virtual void setMemoryConfig(dStage_MemoryConfig_c* i_MemoryConfig) { - (void)i_MemoryConfig; + UNUSED(i_MemoryConfig); OSReport("Room non memory config data!\n"); JUT_ASSERT(2414, FALSE); } @@ -923,7 +923,7 @@ public: return NULL; } virtual void setMemoryMap(dStage_MemoryMap_c* i_MemoryMap) { - (void)i_MemoryMap; + UNUSED(i_MemoryMap); OSReport("Room non memory map data!\n"); JUT_ASSERT(2433, FALSE); } @@ -933,7 +933,7 @@ public: return NULL; } virtual void setMulti(dStage_Multi_c* i_Multi) { - (void)i_Multi; + UNUSED(i_Multi); OSReport("Room non multi data!\n"); JUT_ASSERT(2452, FALSE); } @@ -960,7 +960,7 @@ public: virtual void setTresure(stage_tresure_class* i_Tresure) { mTresure = i_Tresure; } virtual stage_tresure_class* getTresure(void) const { return mTresure; } virtual void setDMap(dStage_DMap_c* i_DMap) { - (void)i_DMap; + UNUSED(i_DMap); OS_REPORT("Room non DMap data\n"); JUT_ASSERT(2508, FALSE); } @@ -974,7 +974,7 @@ public: virtual void setDoor(stage_tgsc_class* i_Door) { mDoor = i_Door; } virtual stage_tgsc_class* getDoor(void) const { return mDoor; } virtual void setMapPath(void* i_MapPath) { - (void)i_MapPath; + UNUSED(i_MapPath); OSReport("stage non 2d map path data !!\n"); JUT_ASSERT(2557, FALSE); } @@ -984,7 +984,7 @@ public: return NULL; } virtual void setElst(dStage_Elst_c* i_Elst) { - (void)i_Elst; + UNUSED(i_Elst); dStage_SetErrorRoom(); OSReport("Room non envLayserSet data\n"); JUT_ASSERT(2572, FALSE); @@ -1323,6 +1323,8 @@ void dStage_dt_c_roomLoader(void* i_data, dStage_dt_c* stageDt, int param_2); dStage_KeepDoorInfo* dStage_GetKeepDoorInfo(); dStage_KeepDoorInfo* dStage_GetRoomKeepDoorInfo(); void dStage_dt_c_fieldMapLoader(void* i_data, dStage_dt_c* i_stage); + +#define dStage_NAME_LENGTH 8 const char* dStage_getName(s16 procName, s8 argument); #if VERSION == VERSION_WII_USA_R0 diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index b5a11a6beb..dbf01d374d 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -842,7 +842,7 @@ void fopAcM_showAssert_f(const fopAc_ac_c*, const char*, int, const char*, ...); #define fopAcM_setWarningMessage(...) #endif -void fopAcM_getNameString(const fopAc_ac_c*, char*); +BOOL fopAcM_getNameString(const fopAc_ac_c*, char*); class fopAcM_lc_c { public: diff --git a/include/f_op/f_op_scene.h b/include/f_op/f_op_scene.h index 2da8e5e9ba..a42eee7211 100644 --- a/include/f_op/f_op_scene.h +++ b/include/f_op/f_op_scene.h @@ -2,20 +2,25 @@ #define F_F_OP_SCENE_H_ #include "f_op/f_op_scene_tag.h" +#include "f_pc/f_pc_leaf.h" struct request_of_phase_process_class; class mDoDvdThd_command_c; +struct scene_method_class { + /* 0x00 */ leafdraw_method_class base; +}; + typedef struct scene_process_profile_definition { /* 0x00 */ node_process_profile_definition nase; - /* 0x20 */ process_method_class* submethod; // Subclass methods + /* 0x20 */ scene_method_class* submethod; // Subclass methods /* 0x24 */ u32 unk_0x24; // padding? } scene_process_profile_definition; class scene_class { public: /* 0x000 */ process_node_class base; - /* 0x1AC */ process_method_class* submethod; + /* 0x1AC */ scene_method_class* submethod; /* 0x1B0 */ scene_tag_class scene_tag; }; diff --git a/include/global.h b/include/global.h index 4f2b7a60ad..bd726e2e07 100644 --- a/include/global.h +++ b/include/global.h @@ -44,6 +44,10 @@ #define ROUND(n, a) (((u32)(n) + (a)-1) & ~((a)-1)) #define TRUNC(n, a) (((u32)(n)) & ~((a)-1)) +// Silence unused parameter warnings. +// Necessary for debug matches. +#define UNUSED(x) ((void)(x)) + #ifndef decltype #define decltype __decltype__ #endif @@ -68,6 +72,7 @@ // Silence clangd errors about MWCC PPC intrinsics by declaring them here. extern int __cntlzw(unsigned int); extern int __rlwimi(int, int, int, int, int); +extern void __dcbf(void*, int); extern void __dcbz(void*, int); extern void __sync(); extern int __abs(int); diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index 5cd89860fb..e558bd7b98 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -314,7 +314,7 @@ inline void mDoAud_loadStaticWaves() { inline int mDoAud_monsSeStart(u32 i_soundId, const Vec* i_pos, u32 i_actorId, u32 param_3, s8 i_reverb) { - (void)i_actorId; + UNUSED(i_actorId); return Z2GetAudioMgr()->seStart(i_soundId, i_pos, param_3, i_reverb, 1.0f, 1.0f, -1.0f, -1.0f, 0); } diff --git a/src/JSystem/J2DGraph/J2DGrafContext.cpp b/src/JSystem/J2DGraph/J2DGrafContext.cpp index 05a1d89cf5..3f920bc407 100644 --- a/src/JSystem/J2DGraph/J2DGrafContext.cpp +++ b/src/JSystem/J2DGraph/J2DGrafContext.cpp @@ -93,9 +93,6 @@ void J2DGrafContext::place(JGeometry::TBox2 const& bounds) { mScissorBounds = bounds; } -/* 802E9118-802E9234 2E3A58 011C+00 1/1 4/4 0/0 .text - * setColor__14J2DGrafContextFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor - */ void J2DGrafContext::setColor(JUtility::TColor colorTL, JUtility::TColor colorTR, JUtility::TColor colorBR, JUtility::TColor colorBL) { mColorTL = colorTL; diff --git a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp index 024adef56f..a0229abb69 100644 --- a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp +++ b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp @@ -60,9 +60,6 @@ u32 J2DMaterialFactory::countStages(int param_0) const { return uVar3; } -/* 802F2D1C-802F362C 2ED65C 0910+00 0/0 1/1 0/0 .text - * create__18J2DMaterialFactoryCFP11J2DMaterialiUlP15J2DResReferenceP15J2DResReferenceP10JKRArchive - */ J2DMaterial* J2DMaterialFactory::create(J2DMaterial* param_0, int index, u32 param_2, J2DResReference* param_3, J2DResReference* param_4, JKRArchive* param_5) const { diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/src/JSystem/J2DGraph/J2DPrint.cpp index 93d2db9c11..9dfb3954d2 100644 --- a/src/JSystem/J2DGraph/J2DPrint.cpp +++ b/src/JSystem/J2DGraph/J2DPrint.cpp @@ -34,9 +34,6 @@ J2DPrint::J2DPrint(JUTFont* pFont, JUtility::TColor charColor, JUtility::TColor private_initiate(pFont, 0.0f, 0.0f, charColor, gradColor, 0, 0xFFFFFFFF, true); } -/* 802F4394-802F4420 2EECD4 008C+00 0/0 6/6 0/0 .text - * __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor - */ J2DPrint::J2DPrint(JUTFont* pFont, f32 charSpacing, f32 lineSpacing, JUtility::TColor charColor, JUtility::TColor gradColor, JUtility::TColor blackColor, JUtility::TColor whiteColor) { private_initiate(pFont, charSpacing, lineSpacing, charColor, gradColor, blackColor, whiteColor, false); @@ -50,9 +47,6 @@ void J2DPrint::initiate() { } } -/* 802F4468-802F4658 2EEDA8 01F0+00 1/1 0/0 0/0 .text - * private_initiate__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorb - */ void J2DPrint::private_initiate(JUTFont* pFont, f32 charSpacing, f32 lineSpacing, JUtility::TColor charColor, JUtility::TColor gradColor, JUtility::TColor blackColor, JUtility::TColor whiteColor, bool param_7) { @@ -317,7 +311,7 @@ f32 J2DPrint::parse(const u8* pString, int length, int param_2, u16* param_3, } else { if (param_6) { if (param_3 != NULL) { - mFont->drawChar_scale(mCursorH + (f32)(s16)param_3[someIndex], mCursorV, (s32)mScaleX, (s32)mScaleY, iCharacter, true); + mFont->drawChar_scale(mCursorH + (s16)param_3[someIndex], mCursorV, (s32)mScaleX, (s32)mScaleY, iCharacter, true); } else { mFont->drawChar_scale(mCursorH, mCursorV, (s32)mScaleX, (s32)mScaleY, iCharacter, true); } diff --git a/src/JSystem/J2DGraph/J2DTevs.cpp b/src/JSystem/J2DGraph/J2DTevs.cpp index 69234af65f..cfd68821e5 100644 --- a/src/JSystem/J2DGraph/J2DTevs.cpp +++ b/src/JSystem/J2DGraph/J2DTevs.cpp @@ -108,48 +108,48 @@ J2DTexMtxInfo const j2dDefaultTexMtxInfo = {1, 1, 255, 255, 0.5f, 0.5f, J2DIndTexMtxInfo const j2dDefaultIndTexMtxInfo = {{0.5f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f}, 1}; -extern J2DTevStageInfo const j2dDefaultTevStageInfo = { +J2DTevStageInfo const j2dDefaultTevStageInfo = { 4, GX_CC_RASC, GX_CC_ZERO, GX_CC_ZERO, GX_CC_CPREV, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV, GX_CA_RASA, GX_CA_ZERO, GX_CA_ZERO, GX_CA_APREV, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV}; -extern const J2DIndTevStageInfo j2dDefaultIndTevStageInfo = { +const J2DIndTevStageInfo j2dDefaultIndTevStageInfo = { GX_INDTEXSTAGE0, GX_ITB_NONE, GX_ITB_NONE, GX_ITM_OFF, GX_ITW_OFF, GX_ITW_OFF, 0, 0, GX_ITBA_OFF, }; -extern const GXColor j2dDefaultColInfo = {255, 255, 255, 255}; +const GXColor j2dDefaultColInfo = {255, 255, 255, 255}; -extern const J2DTevOrderInfo j2dDefaultTevOrderInfoNull = { +const J2DTevOrderInfo j2dDefaultTevOrderInfoNull = { GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR_NULL, 0}; -extern const J2DIndTexOrderInfo j2dDefaultIndTexOrderNull = { +const J2DIndTexOrderInfo j2dDefaultIndTexOrderNull = { GX_TEXCOORD_NULL, GX_TEXMAP_NULL, }; -extern const GXColorS10 j2dDefaultTevColor = {255, 255, 255, 255}; +const GXColorS10 j2dDefaultTevColor = {255, 255, 255, 255}; -extern const J2DIndTexCoordScaleInfo j2dDefaultIndTexCoordScaleInfo = { +const J2DIndTexCoordScaleInfo j2dDefaultIndTexCoordScaleInfo = { GX_ITS_1, GX_ITS_1, }; -extern const GXColor j2dDefaultTevKColor = {255, 255, 255, 255}; +const GXColor j2dDefaultTevKColor = {255, 255, 255, 255}; -extern const J2DTevSwapModeInfo j2dDefaultTevSwapMode = {GX_TEV_SWAP0, GX_TEV_SWAP0, 0, 0}; +const J2DTevSwapModeInfo j2dDefaultTevSwapMode = {GX_TEV_SWAP0, GX_TEV_SWAP0, 0, 0}; -extern const J2DTevSwapModeTableInfo j2dDefaultTevSwapModeTable = { +const J2DTevSwapModeTableInfo j2dDefaultTevSwapModeTable = { GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE, GX_CH_ALPHA}; -extern const J2DBlendInfo j2dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, +const J2DBlendInfo j2dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP}; -extern const u8 j2dDefaultPEBlockDither = 0; +const u8 j2dDefaultPEBlockDither = 0; -extern const J2DColorChanInfo j2dDefaultColorChanInfo = {0, 3, 0, 0}; +const J2DColorChanInfo j2dDefaultColorChanInfo = {0, 3, 0, 0}; -extern const u8 j2dDefaultTevSwapTableID = 0x1B; +const u8 j2dDefaultTevSwapTableID = 0x1B; -extern const u16 j2dDefaultAlphaCmp = 0x00E7; +const u16 j2dDefaultAlphaCmp = 0x00E7; diff --git a/src/JSystem/J2DGraph/J2DTextBox.cpp b/src/JSystem/J2DGraph/J2DTextBox.cpp index 2370cbf41a..d82fd37586 100644 --- a/src/JSystem/J2DGraph/J2DTextBox.cpp +++ b/src/JSystem/J2DGraph/J2DTextBox.cpp @@ -109,9 +109,6 @@ J2DTextBox::J2DTextBox(J2DPane* p_pane, JSURandomInputStream* p_stream, u32 para mTextFontOwned = true; } -/* 802FFBC4-802FFC58 2FA504 0094+00 0/0 1/1 0/0 .text - * __ct__10J2DTextBoxFUxRCQ29JGeometry8TBox2PC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding - */ J2DTextBox::J2DTextBox(u64 tag, JGeometry::TBox2 const& bounds, ResFONT const* p_font, char const* string, s16 strLength, J2DTextBoxHBinding hBind, J2DTextBoxVBinding vBind) diff --git a/src/JSystem/J2DGraph/J2DWindow.cpp b/src/JSystem/J2DGraph/J2DWindow.cpp index 4ea29be479..8e02439053 100644 --- a/src/JSystem/J2DGraph/J2DWindow.cpp +++ b/src/JSystem/J2DGraph/J2DWindow.cpp @@ -423,9 +423,6 @@ void J2DWindow::resize(f32 param_0, f32 param_1) { } } -/* 802FB12C-802FB1D8 2F5A6C 00AC+00 1/1 0/0 0/0 .text - * setContentsColor__9J2DWindowFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor - */ void J2DWindow::setContentsColor(JUtility::TColor param_0, JUtility::TColor param_1, JUtility::TColor param_2, JUtility::TColor param_3) { field_0x128.set(param_0); diff --git a/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp b/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp index 5d657c773a..3dc289a73d 100644 --- a/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp @@ -20,9 +20,6 @@ J3DJointTree::J3DJointTree() mWEvlpMixMtxIndex(0), mWEvlpMixWeight(0), mInvJointMtx(NULL), mWEvlpImportantMtxIdx(0), field_0x40(0), mJointName(NULL) {} -/* 80325A9C-80325C00 3203DC 0164+00 1/0 2/2 0/0 .text - * makeHierarchy__12J3DJointTreeFP8J3DJointPPC17J3DModelHierarchyP16J3DMaterialTableP13J3DShapeTable - */ void J3DJointTree::makeHierarchy(J3DJoint* pJoint, const J3DModelHierarchy** pHierarchy, J3DMaterialTable* pMaterialTable, J3DShapeTable* pShapeTable) { J3D_ASSERT_NULLPTR(95, pHierarchy != NULL); diff --git a/src/JSystem/J3DGraphBase/J3DGD.cpp b/src/JSystem/J3DGraphBase/J3DGD.cpp index 4a4c08105a..de18c40798 100644 --- a/src/JSystem/J3DGraphBase/J3DGD.cpp +++ b/src/JSystem/J3DGraphBase/J3DGD.cpp @@ -335,9 +335,6 @@ static u8 GX2HWFiltConv[6] = { 0x00, 0x04, 0x01, 0x05, 0x02, 0x06, }; -/* 8030E438-8030E5D4 308D78 019C+00 0/0 1/1 0/0 .text - * J3DGDSetTexLookupMode__F11_GXTexMapID14_GXTexWrapMode14_GXTexWrapMode12_GXTexFilter12_GXTexFilterfffUcUc13_GXAnisotropy - */ void J3DGDSetTexLookupMode(GXTexMapID id, GXTexWrapMode wrap_s, GXTexWrapMode wrap_t, GXTexFilter min_filt, GXTexFilter mag_filt, f32 min_lod, f32 max_lod, @@ -435,9 +432,6 @@ void J3DGDSetIndTexMtx(GXIndTexMtxID mtx_id, f32 offset[2][3], s8 scale_exp) { )); } -/* 8030EE10-8030EF08 309750 00F8+00 0/0 2/2 0/0 .text - * J3DGDSetIndTexCoordScale__F16_GXIndTexStageID14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale - */ void J3DGDSetIndTexCoordScale(GXIndTexStageID indStageEven, GXIndTexScale scaleS0, GXIndTexScale scaleT0, GXIndTexScale scaleS1, GXIndTexScale scaleT1) { @@ -451,9 +445,6 @@ void J3DGDSetIndTexCoordScale(GXIndTexStageID indStageEven, GXIndTexScale scaleS )); } -/* 8030EF08-8030F108 309848 0200+00 0/0 2/2 0/0 .text - * J3DGDSetIndTexOrder__FUl13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID - */ void J3DGDSetIndTexOrder(u32 count, GXTexCoordID texCoord0, GXTexMapID texMap0, GXTexCoordID texCoord1, GXTexMapID texMap1, GXTexCoordID texCoord2, GXTexMapID texMap2, @@ -492,9 +483,6 @@ void J3DGDSetIndTexOrder(u32 count, GXTexCoordID texCoord0, GXTexMapID texMap0, J3DGDWriteBPCmd(BP_IND_MASK(mask, 0xF)); } -/* 8030F108-8030F294 309A48 018C+00 0/0 9/9 0/0 .text - * J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID - */ void J3DGDSetTevOrder(GXTevStageID evenStage, GXTexCoordID coord0, GXTexMapID map0, GXChannelID color0, GXTexCoordID coord1, GXTexMapID map1, GXChannelID color1) { diff --git a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp b/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp index 1f678df4be..acbd78b1b9 100644 --- a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp +++ b/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp @@ -67,11 +67,8 @@ u32 J3DShapeMtx::sCurrentPipeline; u8* J3DShapeMtx::sCurrentScaleFlag; -// This below is technically part of J3DScaleFlag. -/* 804515B0 0001+00 data_804515B0 None */ bool J3DShapeMtx::sNBTFlag; -/* 804515B1 0003+00 data_804515B1 None */ bool J3DShapeMtx::sLODFlag; u32 J3DShapeMtx::sTexMtxLoadType; diff --git a/src/JSystem/J3DGraphBase/J3DTevs.cpp b/src/JSystem/J3DGraphBase/J3DTevs.cpp index 86183ea6f0..c7cceac95c 100644 --- a/src/JSystem/J3DGraphBase/J3DTevs.cpp +++ b/src/JSystem/J3DGraphBase/J3DTevs.cpp @@ -315,7 +315,7 @@ void loadNBTScale(J3DNBTScale& NBTScale) { } } -extern const J3DLightInfo j3dDefaultLightInfo = { +const J3DLightInfo j3dDefaultLightInfo = { 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0xff, 0xff, 0xff, 0xff, @@ -323,14 +323,14 @@ extern const J3DLightInfo j3dDefaultLightInfo = { 1.0f, 0.0f, 0.0f, }; -extern J3DTexCoordInfo const j3dDefaultTexCoordInfo[8] = { +J3DTexCoordInfo const j3dDefaultTexCoordInfo[8] = { {GX_MTX2x4, GX_TG_TEX0, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX1, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX2, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX3, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX4, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX5, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX6, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX7, GX_IDENTITY, 0}, }; -extern J3DTexMtxInfo const j3dDefaultTexMtxInfo = { +J3DTexMtxInfo const j3dDefaultTexMtxInfo = { 0x01, 0x00, 0xFF, @@ -341,27 +341,27 @@ extern J3DTexMtxInfo const j3dDefaultTexMtxInfo = { 1.0f}, }; -extern J3DIndTexMtxInfo const j3dDefaultIndTexMtxInfo = { +J3DIndTexMtxInfo const j3dDefaultIndTexMtxInfo = { 0.5f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f, 1 }; -extern J3DTevStageInfo const j3dDefaultTevStageInfo = { +J3DTevStageInfo const j3dDefaultTevStageInfo = { 0x04, 0x0A, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x05, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, }; -extern J3DIndTevStageInfo const j3dDefaultIndTevStageInfo = { +J3DIndTevStageInfo const j3dDefaultIndTevStageInfo = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -extern J3DFogInfo const j3dDefaultFogInfo = { +J3DFogInfo const j3dDefaultFogInfo = { 0x00, 0x00, 0x0140, 0.0f, 0.0f, 0.1f, 10000.0f, 0xFF, 0xFF, 0xFF, 0x00, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, }; -extern J3DNBTScaleInfo const j3dDefaultNBTScaleInfo = { +J3DNBTScaleInfo const j3dDefaultNBTScaleInfo = { 0x00, 1.0f, 1.0f, 1.0f, }; @@ -413,7 +413,6 @@ void makeAlphaCmpTable() { } } -extern u8 j3dZModeTable[96]; u8 j3dZModeTable[96]; void makeZModeTable() { @@ -492,43 +491,43 @@ static void J3DGDLoadPostTexMtxImm(f32 (*param_1)[4], u32 param_2) { J3DGDWrite_f32(param_1[2][3]); } -extern const GXColor j3dDefaultColInfo = {0xFF, 0xFF, 0xFF, 0xFF}; +const GXColor j3dDefaultColInfo = {0xFF, 0xFF, 0xFF, 0xFF}; -extern const GXColor j3dDefaultAmbInfo = {0x32, 0x32, 0x32, 0x32}; +const GXColor j3dDefaultAmbInfo = {0x32, 0x32, 0x32, 0x32}; -extern const u8 j3dDefaultNumChans = 1; +const u8 j3dDefaultNumChans = 1; -extern const J3DTevOrderInfo j3dDefaultTevOrderInfoNull = {0xFF, 0xFF, 0xFF, 0x00}; +const J3DTevOrderInfo j3dDefaultTevOrderInfoNull = {0xFF, 0xFF, 0xFF, 0x00}; -extern const J3DIndTexOrderInfo j3dDefaultIndTexOrderNull = {0xFF, 0xFF, 0x00, 0x00}; +const J3DIndTexOrderInfo j3dDefaultIndTexOrderNull = {0xFF, 0xFF, 0x00, 0x00}; -extern const GXColorS10 j3dDefaultTevColor = {0xFF, 0xFF, 0xFF, 0xFF}; +const GXColorS10 j3dDefaultTevColor = {0xFF, 0xFF, 0xFF, 0xFF}; -extern const J3DIndTexCoordScaleInfo j3dDefaultIndTexCoordScaleInfo = { +const J3DIndTexCoordScaleInfo j3dDefaultIndTexCoordScaleInfo = { 0x00, 0x00, 0x00, 0x00, }; -extern const GXColor j3dDefaultTevKColor = {0xFF, 0xFF, 0xFF, 0xFF}; +const GXColor j3dDefaultTevKColor = {0xFF, 0xFF, 0xFF, 0xFF}; -extern J3DTevSwapModeInfo const j3dDefaultTevSwapMode = { +J3DTevSwapModeInfo const j3dDefaultTevSwapMode = { 0x00, 0x00, 0x00, 0x00, }; -extern const J3DTevSwapModeTableInfo j3dDefaultTevSwapModeTable = {0x00, 0x01, 0x02, 0x03}; +const J3DTevSwapModeTableInfo j3dDefaultTevSwapModeTable = {0x00, 0x01, 0x02, 0x03}; -extern const J3DBlendInfo j3dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP}; +const J3DBlendInfo j3dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP}; -extern const J3DColorChanInfo j3dDefaultColorChanInfo = { +const J3DColorChanInfo j3dDefaultColorChanInfo = { 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0xFF, 0xFF, }; -extern const u8 j3dDefaultTevSwapTableID = 0x1B; +const u8 j3dDefaultTevSwapTableID = 0x1B; const u16 j3dDefaultAlphaCmpID = 0x00E7; diff --git a/src/JSystem/J3DGraphBase/J3DTransform.cpp b/src/JSystem/J3DGraphBase/J3DTransform.cpp index cdc744c272..c1a246d104 100644 --- a/src/JSystem/J3DGraphBase/J3DTransform.cpp +++ b/src/JSystem/J3DGraphBase/J3DTransform.cpp @@ -70,12 +70,12 @@ void J3DCalcBBoardMtx(__REGISTER Mtx mtx) { mtx[2][2] = z; } -extern J3DTransformInfo const j3dDefaultTransformInfo = { +J3DTransformInfo const j3dDefaultTransformInfo = { {1.0f, 1.0f, 1.0f}, {0, 0, 0}, {0.0f, 0.0f, 0.0f}}; -extern Vec const j3dDefaultScale = {1.0f, 1.0f, 1.0f}; +Vec const j3dDefaultScale = {1.0f, 1.0f, 1.0f}; -extern Mtx const j3dDefaultMtx = { +Mtx const j3dDefaultMtx = { {1.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 1.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 1.0f, 0.0f}}; void J3DCalcYBBoardMtx(Mtx mtx) { @@ -541,7 +541,7 @@ loop: } #endif // clang-format on -extern f32 const PSMulUnit01[] = { +f32 const PSMulUnit01[] = { 0.0f, -1.0f, }; diff --git a/src/JSystem/JAudio2/JASAramStream.cpp b/src/JSystem/JAudio2/JASAramStream.cpp index 072e7c1766..616c8f3671 100644 --- a/src/JSystem/JAudio2/JASAramStream.cpp +++ b/src/JSystem/JAudio2/JASAramStream.cpp @@ -19,9 +19,6 @@ u32 JASAramStream::sBlockSize; u32 JASAramStream::sChannelMax; -/* 80451260 0001+00 data_80451260 None */ -/* 80451261 0001+00 data_80451261 None */ -/* 80451262 0006+00 data_80451262 None */ bool struct_80451260; bool struct_80451261; diff --git a/src/JSystem/JAudio2/JASBNKParser.cpp b/src/JSystem/JAudio2/JASBNKParser.cpp index 30de594808..ec57df253a 100644 --- a/src/JSystem/JAudio2/JASBNKParser.cpp +++ b/src/JSystem/JAudio2/JASBNKParser.cpp @@ -270,9 +270,6 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h return bank; } -/* 80299E68-80299F8C 2947A8 0124+00 1/1 0/0 0/0 .text - * findOscPtr__Q212JASBNKParser4Ver0FP12JASBasicBankPCQ312JASBNKParser4Ver07THeaderPCQ312JASBNKParser4Ver04TOsc - */ JASOscillator::Data* JASBNKParser::Ver0::findOscPtr(JASBasicBank* bank, THeader const* header, TOsc const* osc) { TOffsetData const* data = &header->mOffsets; diff --git a/src/JSystem/JAudio2/osdsp_task.cpp b/src/JSystem/JAudio2/osdsp_task.cpp index 520e1cd446..b1eae52efb 100644 --- a/src/JSystem/JAudio2/osdsp_task.cpp +++ b/src/JSystem/JAudio2/osdsp_task.cpp @@ -12,8 +12,6 @@ extern "C" void __DSP_remove_task(DSPTaskInfo* task); static void Dsp_Update_Request(); -/* 80451308 0001+00 data_80451308 None */ -/* 80451309 0003+00 data_80451309 None */ static vu8 struct_80451308; static u8 struct_80451309; diff --git a/src/JSystem/JGadget/linklist.cpp b/src/JSystem/JGadget/linklist.cpp index 2bbe15f882..4a705dd5e7 100644 --- a/src/JSystem/JGadget/linklist.cpp +++ b/src/JSystem/JGadget/linklist.cpp @@ -22,9 +22,6 @@ JGadget::TNodeLinkList::erase(JGadget::TNodeLinkList::iterator it) { return erase(it, next); } -/* 802DCAA0-802DCB08 2D73E0 0068+00 1/1 0/0 0/0 .text - * erase__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorQ37JGadget13TNodeLinkList8iterator - */ JGadget::TNodeLinkList::iterator JGadget::TNodeLinkList::erase(iterator a, iterator b) { TLinkListNode* cur = a.node; TLinkListNode* end = b.node; @@ -38,9 +35,6 @@ JGadget::TNodeLinkList::iterator JGadget::TNodeLinkList::erase(iterator a, itera return b; } -/* 802DCB08-802DCBA8 2D7448 00A0+00 1/1 0/0 0/0 .text - * splice__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorRQ27JGadget13TNodeLinkListQ37JGadget13TNodeLinkList8iterator - */ void JGadget::TNodeLinkList::splice(iterator it, TNodeLinkList& rSrc, iterator itSrc) { iterator itSrcNext = itSrc; ++itSrcNext; diff --git a/src/JSystem/JKernel/JKRDvdRipper.cpp b/src/JSystem/JKernel/JKRDvdRipper.cpp index 15a0ad5fe4..2a7a15609a 100644 --- a/src/JSystem/JKernel/JKRDvdRipper.cpp +++ b/src/JSystem/JKernel/JKRDvdRipper.cpp @@ -18,9 +18,6 @@ static int decompSZS_subroutine(u8*, u8*); static u8* firstSrcData(); static u8* nextSrcData(u8*); -/* 802D9B98-802D9C54 2D44D8 00BC+00 0/0 1/1 0/0 .text - * loadToMainRAM__12JKRDvdRipperFPCcPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl - */ void* JKRDvdRipper::loadToMainRAM(char const* name, u8* dst, JKRExpandSwitch expandSwitch, u32 dstLength, JKRHeap* heap, JKRDvdRipper::EAllocDirection allocDirection, u32 offset, @@ -33,9 +30,6 @@ void* JKRDvdRipper::loadToMainRAM(char const* name, u8* dst, JKRExpandSwitch exp pCompression, param_8); } -/* 802D9C54-802D9D10 2D4594 00BC+00 0/0 9/9 0/0 .text - * loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl - */ void* JKRDvdRipper::loadToMainRAM(s32 entryNumber, u8* dst, JKRExpandSwitch expandSwitch, u32 dstLength, JKRHeap* heap, JKRDvdRipper::EAllocDirection allocDirection, u32 offset, @@ -50,9 +44,6 @@ void* JKRDvdRipper::loadToMainRAM(s32 entryNumber, u8* dst, JKRExpandSwitch expa static u8 errorRetry = 0x01; -/* 802D9D10-802DA1E4 2D4650 04D4+00 2/2 0/0 0/0 .text - * loadToMainRAM__12JKRDvdRipperFP10JKRDvdFilePUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl - */ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch expandSwitch, u32 dstLength, JKRHeap* heap, JKRDvdRipper::EAllocDirection allocDirection, u32 offset, diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/JSystem/JKernel/JKRExpHeap.cpp index bffe0680ef..f3678cb81b 100644 --- a/src/JSystem/JKernel/JKRExpHeap.cpp +++ b/src/JSystem/JKernel/JKRExpHeap.cpp @@ -564,9 +564,6 @@ void JKRExpHeap::appendUsedList(JKRExpHeap::CMemBlock* newblock) { newblock->mNext = NULL; } -/* 802CFE68-802CFEB4 2CA7A8 004C+00 5/5 0/0 0/0 .text - * setFreeBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlock - */ void JKRExpHeap::setFreeBlock(CMemBlock* block, CMemBlock* prev, CMemBlock* next) { if (prev == NULL) { mHeadFreeList = block; diff --git a/src/JSystem/JMessage/processor.cpp b/src/JSystem/JMessage/processor.cpp index f110012717..58400bc70d 100644 --- a/src/JSystem/JMessage/processor.cpp +++ b/src/JSystem/JMessage/processor.cpp @@ -402,9 +402,6 @@ void JMessage::TSequenceProcessor::on_jump(void const* pEntry, char const* pszTe do_jump(pEntry, pszText); } -/* 802A8690-802A86A0 2A2FD0 0010+00 1/1 0/0 0/0 .text - * on_branch_register__Q28JMessage18TSequenceProcessorFPFPCQ28JMessage18TSequenceProcessorUl_PCvPCvUl - */ void JMessage::TSequenceProcessor::on_branch_register(JMessage::TSequenceProcessor::branchPfn pfn, void const* pTarget, u32 uTarget) { JUT_ASSERT(669, eStatus_==STATUS_NORMAL); diff --git a/src/JSystem/JParticle/JPAEmitterManager.cpp b/src/JSystem/JParticle/JPAEmitterManager.cpp index 8a61d9f4dc..51e95a46ad 100644 --- a/src/JSystem/JParticle/JPAEmitterManager.cpp +++ b/src/JSystem/JParticle/JPAEmitterManager.cpp @@ -39,9 +39,6 @@ JPAEmitterManager::JPAEmitterManager(u32 i_ptclNum, u32 i_emtrNum, JKRHeap* pHea JUT_ASSERT(67, pWd); } -/* 8027DEBC-8027DFA0 2787FC 00E4+00 0/0 3/3 0/0 .text - * createSimpleEmitterID__17JPAEmitterManagerFRCQ29JGeometry8TVec3UsUcUcP18JPAEmitterCallBackP19JPAParticleCallBack - */ JPABaseEmitter* JPAEmitterManager::createSimpleEmitterID(JGeometry::TVec3 const& pos, u16 resID, u8 group_id, u8 res_mgr_id, JPAEmitterCallBack* emtrCB, diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/src/JSystem/JStudio/JStudio/functionvalue.cpp index 818d891b90..3aada44eb1 100644 --- a/src/JSystem/JStudio/JStudio/functionvalue.cpp +++ b/src/JSystem/JStudio/JStudio/functionvalue.cpp @@ -189,8 +189,6 @@ void TFunctionValueAttribute_range::range_set(f64 begin, f64 end) { JUT_ASSERT(458, fDifference_>=TValue(0)); } -// /* 80281A08-80281D18 27C348 0310+00 2/2 0/0 0/0 .text -// * range_getParameter__Q27JStudio29TFunctionValueAttribute_rangeCFddd */ f64 TFunctionValueAttribute_range::range_getParameter(f64 arg1, f64 arg2, f64 arg3) const { f64 progress = range_getParameter_progress(arg1); TFunctionValue::TEAdjust adjust = range_getAdjust(); @@ -256,9 +254,6 @@ f64 TFunctionValue_composite::getValue(f64 arg1) { return pfn_(arg1, container, data_getData()); } -/* 80281E5C-80281EC8 27C79C 006C+00 0/0 1/0 0/0 .text - * composite_raw__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointerRCQ37JStudio24TFunctionValue_composite5TDatad - */ f64 TFunctionValue_composite::composite_raw(TVector_pointer const& param_1, TData const& param_2, f64 param_3) { u32 index = param_2.get_unsignedInteger(); @@ -273,9 +268,6 @@ f64 TFunctionValue_composite::composite_raw(TVector_pointer con } -/* 80281EC8-8028202C 27C808 0164+00 0/0 1/0 0/0 .text - * composite_index__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointerRCQ37JStudio24TFunctionValue_composite5TDatad - */ f64 TFunctionValue_composite::composite_index(TVector_pointer const& param_1, TData const& param_2, f64 param_3) { s32 size = param_1.size(); @@ -337,9 +329,6 @@ struct TContainerEnumerator_const_TVector : public JGadget::TEnumerator(param_1.begin(), param_1.end()) {} }; -/* 8028202C-80282094 27C96C 0068+00 0/0 1/0 0/0 .text - * composite_parameter__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointerRCQ37JStudio24TFunctionValue_composite5TDatad - */ f64 TFunctionValue_composite::composite_parameter(TVector_pointer const& param_1, TData const& param_2, f64 param_3) { @@ -353,9 +342,6 @@ TFunctionValue_composite::composite_parameter(TVector_pointer c return dVar4; } -/* 80282094-80282118 27C9D4 0084+00 0/0 1/0 0/0 .text - * composite_add__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointerRCQ37JStudio24TFunctionValue_composite5TDatad - */ f64 TFunctionValue_composite::composite_add(TVector_pointer const& param_1, TData const& param_2, f64 param_3) { f64 dVar4 = param_2.get_value(); @@ -369,9 +355,6 @@ f64 TFunctionValue_composite::composite_add(TVector_pointer con return dVar4; } -/* 80282118-80282200 27CA58 00E8+00 0/0 1/0 0/0 .text - * composite_subtract__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointerRCQ37JStudio24TFunctionValue_composite5TDatad - */ f64 TFunctionValue_composite::composite_subtract(TVector_pointer const& param_1, TData const& param_2, f64 param_3) { u32 size = param_1.size(); @@ -394,9 +377,6 @@ f64 TFunctionValue_composite::composite_subtract(TVector_pointerRCQ37JStudio24TFunctionValue_composite5TDatad - */ f64 TFunctionValue_composite::composite_multiply(TVector_pointer const& param_1, TData const& param_2, f64 param_3) { f64 dVar4 = param_2.get_value(); @@ -410,9 +390,6 @@ f64 TFunctionValue_composite::composite_multiply(TVector_pointerRCQ37JStudio24TFunctionValue_composite5TDatad - */ f64 TFunctionValue_composite::composite_divide(TVector_pointer const& param_1, TData const& param_2, f64 param_3) { u32 size = param_1.size(); @@ -633,9 +610,6 @@ f64 TFunctionValue_list::update_INTERPOLATE_LINEAR_(const TFunctionValue_list& r rThis._44[data._10 + 1]); } -/* 80282C58-80282CA8 27D598 0050+00 1/1 0/0 0/0 .text - * update_INTERPOLATE_PLATEAU___Q27JStudio19TFunctionValue_listFRCQ27JStudio19TFunctionValue_listRCQ37JStudio19TFunctionValue_list11TIndexData_ - */ f64 TFunctionValue_list::update_INTERPOLATE_PLATEAU_(const TFunctionValue_list& rThis, const TIndexData_& data) { const f32* arr = rThis._44; @@ -645,9 +619,6 @@ f64 TFunctionValue_list::update_INTERPOLATE_PLATEAU_(const TFunctionValue_list& } -/* 80282CA8-80282D34 27D5E8 008C+00 1/1 0/0 0/0 .text - * update_INTERPOLATE_BSPLINE_dataMore3___Q27JStudio19TFunctionValue_listFRCQ27JStudio19TFunctionValue_listRCQ37JStudio19TFunctionValue_list11TIndexData_ - */ f64 TFunctionValue_list::update_INTERPOLATE_BSPLINE_dataMore3_( TFunctionValue_list const& rThis, TFunctionValue_list::TIndexData_ const& param_2) { f64 dVar11 = rThis._44[param_2._10]; @@ -770,9 +741,6 @@ f64 TFunctionValue_list_parameter::update_INTERPOLATE_LINEAR_( return functionvalue::interpolateValue_linear(d, a[-2], a[-1], a[0], a[1]); } -/* 80283024-80283060 27D964 003C+00 1/1 0/0 0/0 .text - * update_INTERPOLATE_PLATEAU___Q27JStudio29TFunctionValue_list_parameterFRCQ27JStudio29TFunctionValue_list_parameterd - */ f64 TFunctionValue_list_parameter::update_INTERPOLATE_PLATEAU_( const TFunctionValue_list_parameter& rThis, f64 d) { const f32* a = rThis.dat3.get(); @@ -780,9 +748,6 @@ f64 TFunctionValue_list_parameter::update_INTERPOLATE_PLATEAU_( } -/* 80283060-802832C4 27D9A0 0264+00 1/1 0/0 0/0 .text - * update_INTERPOLATE_BSPLINE_dataMore3___Q27JStudio29TFunctionValue_list_parameterFRCQ27JStudio29TFunctionValue_list_parameterd - */ f64 TFunctionValue_list_parameter::update_INTERPOLATE_BSPLINE_dataMore3_( TFunctionValue_list_parameter const& rThis, f64 param_2) { JUT_ASSERT(1457, rThis.uData_>=3) diff --git a/src/JSystem/JStudio/JStudio/fvb-data.cpp b/src/JSystem/JStudio/JStudio/fvb-data.cpp index bae0a903ea..deee81198e 100644 --- a/src/JSystem/JStudio/JStudio/fvb-data.cpp +++ b/src/JSystem/JStudio/JStudio/fvb-data.cpp @@ -2,4 +2,4 @@ #include "JSystem/JStudio/JStudio/fvb-data.h" -extern const char JStudio::fvb::data::ga4cSignature[4] = "FVB"; +const char JStudio::fvb::data::ga4cSignature[4] = "FVB"; diff --git a/src/JSystem/JStudio/JStudio/jstudio-data.cpp b/src/JSystem/JStudio/JStudio/jstudio-data.cpp index 52e38a09f2..c6f90bc45f 100644 --- a/src/JSystem/JStudio/JStudio/jstudio-data.cpp +++ b/src/JSystem/JStudio/JStudio/jstudio-data.cpp @@ -2,4 +2,4 @@ #include "JSystem/JStudio/JStudio/jstudio-data.h" -extern const char JStudio::data::ga8cSignature[8] = "jstudio"; +const char JStudio::data::ga8cSignature[8] = "jstudio"; diff --git a/src/JSystem/JStudio/JStudio/jstudio-object.cpp b/src/JSystem/JStudio/JStudio/jstudio-object.cpp index 5d6cb6c443..8e23477cc8 100644 --- a/src/JSystem/JStudio/JStudio/jstudio-object.cpp +++ b/src/JSystem/JStudio/JStudio/jstudio-object.cpp @@ -120,9 +120,6 @@ void JStudio::TAdaptor::adaptor_do_data(void const* param_0, u32 param_1, void c /* empty function */ } -/* 8028602C-802860CC 28096C 00A0+00 8/7 0/0 0/0 .text - * adaptor_setVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUlQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio::TAdaptor::adaptor_setVariableValue(JStudio::TControl* pControl, u32 param_2, JStudio::data::TEOperationData param_3, void const* param_4, u32 param_5) { @@ -152,9 +149,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue(JStudio::TControl* pControl, u3 } -/* 802860CC-802861C0 280A0C 00F4+00 7/7 0/0 0/0 .text - * adaptor_setVariableValue_n__Q27JStudio8TAdaptorFPQ27JStudio8TControlPCUlUlQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio::TAdaptor::adaptor_setVariableValue_n(JStudio::TControl* pControl, u32 const* param_2, u32 param_3, JStudio::data::TEOperationData param_4, @@ -190,9 +184,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue_n(JStudio::TControl* pControl, } } -/* 802861C0-80286204 280B00 0044+00 0/0 2/2 0/0 .text - * adaptor_setVariableValue_immediate__Q27JStudio8TAdaptorFPCQ37JStudio8TAdaptor27TSetVariableValue_immediate - */ void JStudio::TAdaptor::adaptor_setVariableValue_immediate( JStudio::TAdaptor::TSetVariableValue_immediate const* p) { JUT_ASSERT(388, p!=NULL); @@ -244,9 +235,6 @@ void JStudio::TAdaptor::adaptor_updateVariableValue(JStudio::TControl* pControl, } } -/* 8028656C-80286584 280EAC 0018+00 2/2 0/0 0/0 .text - * adaptor_setVariableValue_VOID___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl - */ void JStudio::TAdaptor::adaptor_setVariableValue_VOID_(JStudio::TAdaptor* param_1, JStudio::TControl* param_2, u32 param_3, void const* param_4, u32 uSize) { @@ -254,9 +242,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue_VOID_(JStudio::TAdaptor* param_ param_1->pValue_[param_3].setValue_none(); } -/* 80286584-802865B0 280EC4 002C+00 2/2 0/0 0/0 .text - * adaptor_setVariableValue_IMMEDIATE___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl - */ void JStudio::TAdaptor::adaptor_setVariableValue_IMMEDIATE_(JStudio::TAdaptor* param_1, JStudio::TControl* param_2, u32 param_3, void const* param_4, u32 param_5) { @@ -264,9 +249,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue_IMMEDIATE_(JStudio::TAdaptor* p value->setValue_immediate(*(f32*)param_4); } -/* 802865B0-802865DC 280EF0 002C+00 2/2 0/0 0/0 .text - * adaptor_setVariableValue_TIME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl - */ void JStudio::TAdaptor::adaptor_setVariableValue_TIME_(JStudio::TAdaptor* param_1, JStudio::TControl* param_2, u32 param_3, void const* param_4, u32 param_5) { @@ -274,9 +256,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue_TIME_(JStudio::TAdaptor* param_ value->setValue_time(*(f32*)param_4); } -/* 802865DC-80286648 280F1C 006C+00 1/1 0/0 0/0 .text - * adaptor_setVariableValue_FVR_NAME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl - */ void JStudio::TAdaptor::adaptor_setVariableValue_FVR_NAME_(JStudio::TAdaptor* param_1, JStudio::TControl* param_2, u32 param_3, void const* param_4, u32 param_5) { @@ -284,9 +263,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue_FVR_NAME_(JStudio::TAdaptor* pa value->setValue_functionValue(param_2->getFunctionValue(param_4,param_5)); } -/* 80286648-802866B0 280F88 0068+00 2/2 0/0 0/0 .text - * adaptor_setVariableValue_FVR_INDEX___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl - */ void JStudio::TAdaptor::adaptor_setVariableValue_FVR_INDEX_(JStudio::TAdaptor* param_1, JStudio::TControl* param_2, u32 param_3, void const* param_4, u32 param_5) { @@ -339,9 +315,6 @@ JStudio::TObject::TObject(JStudio::stb::data::TParse_TBlock_object const& param_ JStudio::TAdaptor_actor::~TAdaptor_actor() { } -/* 80286910-8028694C 281250 003C+00 0/0 1/1 0/0 .text - * __ct__Q27JStudio13TObject_actorFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_actor - */ JStudio::TObject_actor::TObject_actor(JStudio::stb::data::TParse_TBlock_object const& param_0, JStudio::TAdaptor_actor* param_1) : TObject(param_0, param_1) { @@ -495,9 +468,6 @@ fun: JStudio::TAdaptor_ambientLight::~TAdaptor_ambientLight() {} -/* 80286CFC-80286D38 28163C 003C+00 0/0 1/1 0/0 .text - * __ct__Q27JStudio20TObject_ambientLightFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio21TAdaptor_ambientLight - */ JStudio::TObject_ambientLight::TObject_ambientLight( JStudio::stb::data::TParse_TBlock_object const& param_0, JStudio::TAdaptor_ambientLight* param_1) : TObject(param_0, param_1) { @@ -560,9 +530,6 @@ value_n: JStudio::TAdaptor_camera::~TAdaptor_camera() {} -/* 80286E7C-80286EB8 2817BC 003C+00 0/0 1/1 0/0 .text - * __ct__Q27JStudio14TObject_cameraFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio15TAdaptor_camera - */ JStudio::TObject_camera::TObject_camera(JStudio::stb::data::TParse_TBlock_object const& param_0, JStudio::TAdaptor_camera* param_1) : TObject(param_0, param_1) {} @@ -695,9 +662,6 @@ fun: JStudio::TAdaptor_fog::~TAdaptor_fog() {} -/* 802871DC-80287218 281B1C 003C+00 0/0 1/1 0/0 .text - * __ct__Q27JStudio11TObject_fogFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio12TAdaptor_fog - */ JStudio::TObject_fog::TObject_fog(JStudio::stb::data::TParse_TBlock_object const& param_0, JStudio::TAdaptor_fog* param_1) : TObject(param_0, param_1) {} @@ -771,9 +735,6 @@ value_n: JStudio::TAdaptor_light::~TAdaptor_light() {} -/* 80287368-802873A4 281CA8 003C+00 0/0 1/1 0/0 .text - * __ct__Q27JStudio13TObject_lightFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_light - */ JStudio::TObject_light::TObject_light(JStudio::stb::data::TParse_TBlock_object const& param_0, JStudio::TAdaptor_light* param_1) : TObject(param_0, param_1) {} @@ -910,9 +871,6 @@ fun: JStudio::TAdaptor_message::~TAdaptor_message() {} -/* 80287640-8028767C 281F80 003C+00 0/0 1/1 0/0 .text - * __ct__Q27JStudio15TObject_messageFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio16TAdaptor_message - */ JStudio::TObject_message::TObject_message(JStudio::stb::data::TParse_TBlock_object const& param_0, JStudio::TAdaptor_message* param_1) : TObject(param_0, param_1) {} @@ -939,9 +897,6 @@ void JStudio::TObject_message::do_paragraph(u32 param_1, void const* param_2, u3 JStudio::TAdaptor_particle::~TAdaptor_particle() {} -/* 8028776C-802877A8 2820AC 003C+00 0/0 1/1 0/0 .text - * __ct__Q27JStudio16TObject_particleFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio17TAdaptor_particle - */ JStudio::TObject_particle::TObject_particle( JStudio::stb::data::TParse_TBlock_object const& param_0, JStudio::TAdaptor_particle* param_1) : TObject(param_0, param_1) {} @@ -1140,9 +1095,6 @@ fun: JStudio::TAdaptor_sound::~TAdaptor_sound() {} -/* 80287B9C-80287BD8 2824DC 003C+00 0/0 1/1 0/0 .text - * __ct__Q27JStudio13TObject_soundFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_sound - */ JStudio::TObject_sound::TObject_sound(JStudio::stb::data::TParse_TBlock_object const& param_0, JStudio::TAdaptor_sound* param_1) : TObject(param_0, param_1) {} diff --git a/src/JSystem/JStudio/JStudio_JAudio2/control.cpp b/src/JSystem/JStudio/JStudio_JAudio2/control.cpp index d53afdf8d6..6fc661ddcd 100644 --- a/src/JSystem/JStudio/JStudio_JAudio2/control.cpp +++ b/src/JSystem/JStudio/JStudio_JAudio2/control.cpp @@ -9,9 +9,6 @@ JStudio_JAudio2::TCreateObject::~TCreateObject() {} -/* 8028D5B0-8028D624 287EF0 0074+00 1/0 0/0 0/0 .text - * create__Q215JStudio_JAudio213TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object - */ bool JStudio_JAudio2::TCreateObject::create( JStudio::TObject** ppObject, JStudio::stb::data::TParse_TBlock_object const& param_2) { JUT_ASSERT(40, ppObject!=NULL); @@ -27,9 +24,6 @@ bool JStudio_JAudio2::TCreateObject::create( return 1; } -/* 8028D624-8028D728 287F64 0104+00 1/1 0/0 0/0 .text - * createObject_JAI_SOUND___Q215JStudio_JAudio213TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ215JStudio_JAudio213TCreateObject - */ JStudio::TObject* JStudio_JAudio2::TCreateObject::createObject_JAI_SOUND_( JStudio::stb::data::TParse_TBlock_object const& param_1, JStudio_JAudio2::TCreateObject* param_2) { diff --git a/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp b/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp index 756e4ee0a9..95bd769eae 100644 --- a/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp +++ b/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp @@ -166,9 +166,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_BEGIN(JStudio::data::TEOperatio } } -/* 8028DC88-8028DCD0 2885C8 0048+00 1/0 0/0 0/0 .text - * adaptor_do_BEGIN_FADE_IN__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_BEGIN_FADE_IN( JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { switch (param_1) { @@ -190,9 +187,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_END(JStudio::data::TEOperationD } } -/* 8028DD00-8028DD48 288640 0048+00 1/0 0/0 0/0 .text - * adaptor_do_END_FADE_OUT__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_END_FADE_OUT( JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { switch (param_1) { @@ -222,9 +216,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT( } } -/* 8028DDB4-8028DE34 2886F4 0080+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_NODE__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_NODE(JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { switch (param_1) { @@ -246,9 +237,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_NODE(JStudio::data::TEOp } } -/* 8028DE34-8028DE50 288774 001C+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_ENABLE__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_ENABLE( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { @@ -267,9 +255,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_REPEAT(JStudio::data::TEOperati } } -/* 8028DE6C-8028DE88 2887AC 001C+00 1/0 0/0 0/0 .text - * adaptor_do_CONTINUOUS__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_CONTINUOUS(JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { @@ -292,9 +277,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_LOCATED(JStudio::data::TEOperat } } -/* 8028DEB0-8028DECC 2887F0 001C+00 1/0 0/0 0/0 .text - * adaptor_do_ON_EXIT_NOT_END__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_ON_EXIT_NOT_END( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { diff --git a/src/JSystem/JStudio/JStudio_JParticle/control.cpp b/src/JSystem/JStudio/JStudio_JParticle/control.cpp index 0d240bb15f..1f25f43f66 100644 --- a/src/JSystem/JStudio/JStudio_JParticle/control.cpp +++ b/src/JSystem/JStudio/JStudio_JParticle/control.cpp @@ -10,9 +10,6 @@ JStudio_JParticle::TCreateObject::~TCreateObject() {} -/* 8028E400-8028E474 288D40 0074+00 1/0 1/0 0/0 .text - * create__Q217JStudio_JParticle13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object - */ bool JStudio_JParticle::TCreateObject::create(JStudio::TObject** ppObject, JStudio::stb::data::TParse_TBlock_object const& param_2) { @@ -41,9 +38,6 @@ void JStudio_JParticle::TCreateObject::emitter_destroy(JPABaseEmitter* pEmitter) pJPAEmitterManager_->forceDeleteEmitter(pEmitter); } -/* 8028E508-8028E60C 288E48 0104+00 1/1 0/0 0/0 .text - * createObject_JPA_PARTICLE___Q217JStudio_JParticle13TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ217JStudio_JParticle13TCreateObject - */ JStudio::TObject* JStudio_JParticle::TCreateObject::createObject_JPA_PARTICLE_( JStudio::stb::data::TParse_TBlock_object const& param_1, JStudio_JParticle::TCreateObject* param_2) { diff --git a/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp b/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp index 532d51ab1a..0346ccd812 100644 --- a/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp +++ b/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp @@ -99,9 +99,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_update(u32 param_1) { } } -/* 8028EA68-8028EA7C 2893A8 0014+00 1/0 0/0 0/0 .text - * adaptor_do_PARTICLE__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARTICLE( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x19) { @@ -111,9 +108,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARTICLE( } } -/* 8028EA7C-8028EAB0 2893BC 0034+00 1/0 0/0 0/0 .text - * adaptor_do_BEGIN__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_BEGIN(JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { switch (param_1) { @@ -124,9 +118,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_BEGIN(JStudio::data::TEOpe } } -/* 8028EAB0-8028EAF8 2893F0 0048+00 1/0 0/0 0/0 .text - * adaptor_do_BEGIN_FADE_IN__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_BEGIN_FADE_IN( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { switch (param_1) { @@ -146,9 +137,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_END(JStudio::data::TEOpera } } -/* 8028EB24-8028EB6C 289464 0048+00 1/0 0/0 0/0 .text - * adaptor_do_END_FADE_OUT__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_END_FADE_OUT( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { switch (param_1) { @@ -160,9 +148,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_END_FADE_OUT( } } -/* 8028EB6C-8028EBD8 2894AC 006C+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { switch (param_1) { @@ -181,9 +166,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT( } } -/* 8028EBD8-8028EC58 289518 0080+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_NODE__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_NODE( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { switch (param_1) { @@ -205,9 +187,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_NODE( } } -/* 8028EC58-8028EC74 289598 001C+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_ENABLE__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { @@ -217,9 +196,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_ENABLE(JStudio::dat } } -/* 8028EC74-8028EC88 2895B4 0014+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_FUNCTION__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { @@ -229,9 +205,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_FUNCTION(JStudio::d } } -/* 8028EC88-8028ECA4 2895C8 001C+00 1/0 0/0 0/0 .text - * adaptor_do_REPEAT__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_REPEAT(JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { @@ -241,9 +214,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_REPEAT(JStudio::data::TEOp } } -/* 8028ECA4-8028ECC0 2895E4 001C+00 1/0 0/0 0/0 .text - * adaptor_do_ON_EXIT_NOT_END__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_ON_EXIT_NOT_END(JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { @@ -332,9 +302,6 @@ JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::execute(JPABaseEmit } } -/* 8028F060-8028F098 2899A0 0038+00 1/0 0/0 0/0 .text - * executeAfter__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_FP14JPABaseEmitter - */ void JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::executeAfter(JPABaseEmitter* pJPAEmitter) { if (pOld != NULL) { diff --git a/src/JSystem/JStudio/JStudio_JStage/control.cpp b/src/JSystem/JStudio/JStudio_JStage/control.cpp index b27bb05780..5ba81c8fc9 100644 --- a/src/JSystem/JStudio/JStudio_JStage/control.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/control.cpp @@ -9,9 +9,6 @@ JStudio_JStage::TCreateObject::~TCreateObject() {} -/* 80289B60-80289CE4 2844A0 0184+00 1/0 0/0 0/0 .text - * create__Q214JStudio_JStage13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object - */ bool JStudio_JStage::TCreateObject::create( JStudio::TObject** ppObject, JStudio::stb::data::TParse_TBlock_object const& rParse) { JUT_ASSERT(83, ppObject!=NULL); diff --git a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp index 435c06e2aa..40d36d80a1 100644 --- a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp @@ -92,9 +92,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_ANIMATION(JStudio::data::TEOpera } -/* 8028AA48-8028AA5C 285388 0014+00 1/0 0/0 0/0 .text - * adaptor_do_ANIMATION_MODE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_actor::adaptor_do_ANIMATION_MODE(JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { switch (operation) { @@ -106,17 +103,11 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_ANIMATION_MODE(JStudio::data::TE } } -/* 8028AA5C-8028AAB4 28539C 0058+00 1/0 0/0 0/0 .text - * adaptor_do_TEXTURE_ANIMATION__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_actor::adaptor_do_TEXTURE_ANIMATION(JStudio::data::TEOperationData operation, void const* param_2, u32 param_3) { setJSG_ID_(&JStage::TActor::JSGSetTextureAnimation, operation, param_2, param_3); } -/* 8028AAB4-8028AAC8 2853F4 0014+00 1/0 0/0 0/0 .text - * adaptor_do_TEXTURE_ANIMATION_MODE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_actor::adaptor_do_TEXTURE_ANIMATION_MODE( JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { switch (operation) { @@ -139,9 +130,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT( } } -/* 8028AB0C-8028AB68 28544C 005C+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_NODE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_NODE( JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { switch (operation) { @@ -158,9 +146,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_NODE( } } -/* 8028AB68-8028ABF0 2854A8 0088+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_ENABLE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_ENABLE( JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { switch (operation) { @@ -188,9 +173,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_ENABLE( } } -/* 8028ABF0-8028AC04 285530 0014+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_FUNCTION__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_FUNCTION( JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { switch (operation) { @@ -213,9 +195,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION( } } -/* 8028AC48-8028ACA4 285588 005C+00 1/0 0/0 0/0 .text - * adaptor_do_RELATION_NODE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_NODE( JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { switch (operation) { @@ -232,9 +211,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_NODE( } } -/* 8028ACA4-8028ACFC 2855E4 0058+00 1/0 0/0 0/0 .text - * adaptor_do_RELATION_ENABLE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_ENABLE( JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { switch (operation) { @@ -246,9 +222,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_ENABLE( } } -/* 8028ACFC-8028AD38 28563C 003C+00 3/3 0/0 0/0 .text - * setJSG_ID___Q214JStudio_JStage14TAdaptor_actorFMQ26JStage6TActorFPCvPvUl_vQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_actor::setJSG_ID_(void (JStage::TActor::*function)(u32), JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { diff --git a/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp b/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp index 9620b880f5..1a3a96b345 100644 --- a/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp @@ -88,9 +88,6 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT(JStudio::data::TEOperati } } -/* 8028BC14-8028BC70 286554 005C+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_NODE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_NODE(JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { switch (param_1) { @@ -107,9 +104,6 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_NODE(JStudio::data::TEOp } } -/* 8028BC70-8028BCEC 2865B0 007C+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_ENABLE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { @@ -136,9 +130,6 @@ JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_ENABLE(JStudio::data::TEOpera } } -/* 8028BCEC-8028BD00 28662C 0014+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_FUNCTION__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { @@ -151,9 +142,6 @@ JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_FUNCTION(JStudio::data::TEOpe } } -/* 8028BD00-8028BD44 286640 0044+00 1/0 0/0 0/0 .text - * adaptor_do_TARGET_PARENT__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT( JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { switch(param_1) { @@ -165,9 +153,6 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT( } } -/* 8028BD44-8028BDA0 286684 005C+00 1/0 0/0 0/0 .text - * adaptor_do_TARGET_PARENT_NODE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_NODE( JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { switch (param_1) { @@ -184,9 +169,6 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_NODE( } } -/* 8028BDA0-8028BDBC 2866E0 001C+00 1/0 0/0 0/0 .text - * adaptor_do_TARGET_PARENT_ENABLE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_ENABLE( JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { switch(param_1) { diff --git a/src/JSystem/JStudio/JStudio_JStage/object.cpp b/src/JSystem/JStudio/JStudio_JStage/object.cpp index d7f048fc14..968b102f0d 100644 --- a/src/JSystem/JStudio/JStudio_JStage/object.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/object.cpp @@ -6,9 +6,6 @@ #include "JSystem/JStudio/JStudio_JStage/object.h" -/* 8028A1F8-8028A290 284B38 0098+00 0/0 2/2 0/0 .text - * transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl - */ bool JStudio_JStage::transform_toGlobalFromLocal( f32 (*param_1)[4], JStudio::TControl::TTransform_translation_rotation_scaling const& param_2, JStage::TObject const* param_3, u32 param_4) { @@ -26,9 +23,6 @@ bool JStudio_JStage::transform_toGlobalFromLocal( return true; } -/* 8028A290-8028A328 284BD0 0098+00 0/0 3/3 0/0 .text - * transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl - */ bool JStudio_JStage::transform_toGlobalFromLocal( f32 (*param_1)[4], JStudio::TControl::TTransform_position const& param_2, JStage::TObject const* param_3, u32 param_4) { @@ -45,9 +39,6 @@ bool JStudio_JStage::transform_toGlobalFromLocal( return true; } -/* 8028A328-8028A3CC 284C68 00A4+00 0/0 1/1 0/0 .text - * transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl - */ bool JStudio_JStage::transform_toLocalFromGlobal( f32 (*param_1)[4], JStudio::TControl::TTransform_translation_rotation_scaling const& param_2, JStage::TObject const* param_3, u32 param_4) { @@ -67,9 +58,6 @@ bool JStudio_JStage::transform_toLocalFromGlobal( return true; } -/* 8028A3CC-8028A470 284D0C 00A4+00 0/0 2/2 0/0 .text - * transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl - */ bool JStudio_JStage::transform_toLocalFromGlobal( f32 (*param_1)[4], JStudio::TControl::TTransform_position const& param_2, JStage::TObject const* param_3, u32 param_4) { @@ -118,9 +106,6 @@ s32 JStudio_JStage::TAdaptor_object_::adaptor_object_findJSGObjectNode_( return param_1->JSGFindNodeID(param_2); } -/* 8028A550-8028A5F0 284E90 00A0+00 0/0 1/1 0/0 .text - * adaptor_object_ENABLE___Q214JStudio_JStage16TAdaptor_object_FQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_object_::adaptor_object_ENABLE_(JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/src/JSystem/JUtility/JUTCacheFont.cpp index b1202d6e78..f460f315db 100644 --- a/src/JSystem/JUtility/JUTCacheFont.cpp +++ b/src/JSystem/JUtility/JUTCacheFont.cpp @@ -339,9 +339,6 @@ JUTCacheFont::TGlyphCacheInfo* JUTCacheFont::determineBlankPage() { return NULL; } -/* 802DDBBC-802DDCE4 2D84FC 0128+00 1/1 0/0 0/0 .text - * getGlyphFromAram__12JUTCacheFontFPQ212JUTCacheFont15TGlyphCacheInfoPQ212JUTCacheFont10TCachePagePiPi - */ void JUTCacheFont::getGlyphFromAram(JUTCacheFont::TGlyphCacheInfo* param_0, JUTCacheFont::TCachePage* pCachePage, int* param_2, int* param_3) { TGlyphCacheInfo* pGylphCacheInfo = pCachePage; diff --git a/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp b/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp index a413a6751a..f37bad6200 100644 --- a/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp +++ b/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp @@ -1,9 +1,10 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep +#include "JSystem/JUtility/JUTResFont.h" #include #include "global.h" -extern u8 const JUTResFONT_Ascfont_fix12[16736] ATTRIBUTE_ALIGN(32) = { +u8 const JUTResFONT_Ascfont_fix12[] ATTRIBUTE_ALIGN(32) = { 0x46, 0x4F, 0x4E, 0x54, 0x62, 0x66, 0x6E, 0x31, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x4E, 0x46, 0x31, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, diff --git a/src/JSystem/JUtility/JUTGamePad.cpp b/src/JSystem/JUtility/JUTGamePad.cpp index c705bcab66..ea3709594a 100644 --- a/src/JSystem/JUtility/JUTGamePad.cpp +++ b/src/JSystem/JUtility/JUTGamePad.cpp @@ -172,10 +172,8 @@ void* JUTGamePad::C3ButtonReset::sCallbackArg; OSTime JUTGamePad::C3ButtonReset::sThreshold = (OSTime)(OS_TIMER_CLOCK / 60) * 30; -/* 80451500 0001+00 data_80451500 None */ bool JUTGamePad::C3ButtonReset::sResetSwitchPushing; -/* 80451501 0003+00 data_80451501 None */ bool JUTGamePad::C3ButtonReset::sResetOccurred; s32 JUTGamePad::C3ButtonReset::sResetOccurredPort; diff --git a/src/SSystem/SComponent/c_cc_s.cpp b/src/SSystem/SComponent/c_cc_s.cpp index 4b47620d78..5fdd9ea1f8 100644 --- a/src/SSystem/SComponent/c_cc_s.cpp +++ b/src/SSystem/SComponent/c_cc_s.cpp @@ -489,16 +489,10 @@ void cCcS::DrawClear() { void cCcS::SetCoGCorrectProc(cCcD_Obj* pco1_obj, cCcD_Obj* pco2_obj) {} -/* 80265DF8-80265DFC 260738 0004+00 1/0 0/0 0/0 .text - * SetCoGObjInf__4cCcSFbbP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts - */ void cCcS::SetCoGObjInf(bool co2_set, bool co1_set, cCcD_GObjInf* pco1_gobj, cCcD_GObjInf* pco2_gobj, cCcD_Stts* pco1_stts, cCcD_Stts* pco2_stts, cCcD_GStts* pco1_gstts, cCcD_GStts* pco2_gstts) {} -/* 80265DFC-80265E00 26073C 0004+00 1/0 0/0 0/0 .text - * SetAtTgGObjInf__4cCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz - */ void cCcS::SetAtTgGObjInf(bool param_0, bool param_1, cCcD_Obj* pat_obj, cCcD_Obj* ptg_obj, cCcD_GObjInf* pat_gobj, cCcD_GObjInf* ptg_gobj, cCcD_Stts* pat_stts, cCcD_Stts* ptg_stts, cCcD_GStts* pat_gstts, cCcD_GStts* ptg_gstts, @@ -509,9 +503,6 @@ bool cCcS::ChkNoHitGAtTg(const cCcD_GObjInf* pat_gobj, const cCcD_GObjInf* ptg_g return false; } -/* 80265E08-80265E10 260748 0008+00 1/0 0/0 0/0 .text - * ChkAtTgHitAfterCross__4cCcSFbbPC12cCcD_GObjInfPC12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts - */ bool cCcS::ChkAtTgHitAfterCross(bool param_0, bool param_1, const cCcD_GObjInf* pat_gobj, const cCcD_GObjInf* ptg_gobj, cCcD_Stts* pat_stts, cCcD_Stts* ptg_stts, cCcD_GStts* pat_gstts, cCcD_GStts* ptg_gstts) { diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c index 6bb12f9928..d881cbad20 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c @@ -1,5 +1,6 @@ #include "TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk.h" #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/main_TRK.h" +#include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h" #include "TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.h" #include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h" #include diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c index 55e298a88a..2b94656ef1 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c @@ -1,5 +1,6 @@ #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h" #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.h" +#include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h" TRKBuffer gTRKMsgBufs[3]; diff --git a/src/Z2AudioLib/Z2Audience.cpp b/src/Z2AudioLib/Z2Audience.cpp index fa466f962b..26f79ebbe4 100644 --- a/src/Z2AudioLib/Z2Audience.cpp +++ b/src/Z2AudioLib/Z2Audience.cpp @@ -778,9 +778,6 @@ u32 Z2Audience::calcDeltaPriority_(f32 param_0, int distVolBit, bool param_2) co return mSetting.field_0xac[distVolBit] * (param_0 - mSetting.field_0x3c); } -/* 802BDCB0-802BDD00 2B85F0 0050+00 1/1 0/0 0/0 .text - * calcPitchDoppler___10Z2AudienceCFRCQ29JGeometry8TVec3RCQ29JGeometry8TVec3RCQ29JGeometry8TVec3f - */ f32 Z2Audience::calcPitchDoppler_(const JGeometry::TVec3& param_0, const JGeometry::TVec3& param_1, const JGeometry::TVec3& param_2, f32 param_3) const { diff --git a/src/Z2AudioLib/Z2Creature.cpp b/src/Z2AudioLib/Z2Creature.cpp index db9f521507..e02d1abcd5 100644 --- a/src/Z2AudioLib/Z2Creature.cpp +++ b/src/Z2AudioLib/Z2Creature.cpp @@ -8,8 +8,6 @@ static void Z2_E_ms_modVol(Z2SoundHandlePool*, u32); static void Z2_E_mm_modPitch(Z2SoundHandlePool*, u32); static void Z2_B_zan_modPitch(Z2SoundHandlePool*, u32); -/* 80451358 0001+00 data_80451358 None */ -/* 80451359 0007+00 data_80451359 None */ s8 data_80451358; s8 data_80451359; diff --git a/src/Z2AudioLib/Z2Param.cpp b/src/Z2AudioLib/Z2Param.cpp index 201f6f5e89..064a1e0521 100644 --- a/src/Z2AudioLib/Z2Param.cpp +++ b/src/Z2AudioLib/Z2Param.cpp @@ -103,11 +103,8 @@ f32 Z2Param::MIN_DISTANCE_VOLUME; f32 Z2Param::ENEMY_LASTHIT_MUTE_VOLUME; -/* 80451340 0001+00 data_80451340 None */ u8 Z2Param::DARK_SE_FILTER_ON; -/* 80451341 0001+00 data_80451341 None */ u8 Z2Param::DARK_SE_LOW_PASS_FILTER_SETTING; -/* 80451342 0006+00 data_80451342 None */ u8 Z2Param::SYSTEM_SE_USE_DARK_SE_SETTING; diff --git a/src/Z2AudioLib/Z2SoundObject.cpp b/src/Z2AudioLib/Z2SoundObject.cpp index b2738d2549..bc92476846 100644 --- a/src/Z2AudioLib/Z2SoundObject.cpp +++ b/src/Z2AudioLib/Z2SoundObject.cpp @@ -528,8 +528,8 @@ u32 Z2SoundObjAnime::getSoundID(const JAUSoundAnimationSound* animationSound, bool Z2SoundObjAnime::playsSound(const JAUSoundAnimationSound* animationSound, const JGeometry::TVec3& param_1, f32 param_2) { - (void)param_1; - (void)param_2; + UNUSED(param_1); + UNUSED(param_2); if (animationSound->playsOnlyOnce()) { if (field_0x3c != animationSound->field_0x16) { diff --git a/src/Z2AudioLib/Z2WolfHowlMgr.cpp b/src/Z2AudioLib/Z2WolfHowlMgr.cpp index 2350c90129..5f34fab19c 100644 --- a/src/Z2AudioLib/Z2WolfHowlMgr.cpp +++ b/src/Z2AudioLib/Z2WolfHowlMgr.cpp @@ -206,7 +206,7 @@ f32 Z2WolfHowlMgr::getNowInputValue() { } void Z2WolfHowlMgr::calcPitchMod(f32 param_0, f32 param_1) { - (void)param_0; + UNUSED(param_0); f32 pitch = 1.0f; field_0x20 = getNowPitch(); diff --git a/src/d/actor/d_a_L7demo_dr.cpp b/src/d/actor/d_a_L7demo_dr.cpp index a969977cb1..a5fe1caeaf 100644 --- a/src/d/actor/d_a_L7demo_dr.cpp +++ b/src/d/actor/d_a_L7demo_dr.cpp @@ -407,7 +407,7 @@ static actor_method_class l_daDr_Method = { (process_method_func)daDr_Draw, }; -extern actor_process_profile_definition g_profile_DR = { +actor_process_profile_definition g_profile_DR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_L7low_dr.cpp b/src/d/actor/d_a_L7low_dr.cpp index f4d4868849..0e546a4eab 100644 --- a/src/d/actor/d_a_L7low_dr.cpp +++ b/src/d/actor/d_a_L7low_dr.cpp @@ -197,7 +197,7 @@ static actor_method_class l_daL7lowDr_Method = { (process_method_func)daL7lowDr_Draw, }; -extern actor_process_profile_definition g_profile_L7lowDr = { +actor_process_profile_definition g_profile_L7lowDr = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_L7op_demo_dr.cpp b/src/d/actor/d_a_L7op_demo_dr.cpp index 2a94a9a9f3..f6051370b1 100644 --- a/src/d/actor/d_a_L7op_demo_dr.cpp +++ b/src/d/actor/d_a_L7op_demo_dr.cpp @@ -839,7 +839,7 @@ static actor_method_class l_daL7ODR_Method = { (process_method_func)daL7ODR_Draw, }; -extern actor_process_profile_definition g_profile_L7ODR = { +actor_process_profile_definition g_profile_L7ODR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index ce09ff1f35..02bd952e3e 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -18882,7 +18882,7 @@ static actor_method_class l_daAlink_Method = { (process_method_func)daAlink_Draw, }; -extern actor_process_profile_definition g_profile_ALINK = { +actor_process_profile_definition g_profile_ALINK = { fpcLy_CURRENT_e, 5, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp index 93bea23526..9ad4e41b03 100644 --- a/src/d/actor/d_a_alldie.cpp +++ b/src/d/actor/d_a_alldie.cpp @@ -187,7 +187,7 @@ static actor_method_class l_daAlldie_Method = { (process_method_func)daAlldie_Draw, }; -extern actor_process_profile_definition g_profile_ALLDIE = { +actor_process_profile_definition g_profile_ALLDIE = { fpcLy_CURRENT_e, 2, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_andsw.cpp b/src/d/actor/d_a_andsw.cpp index 12d93d0b62..01e50a0a9b 100644 --- a/src/d/actor/d_a_andsw.cpp +++ b/src/d/actor/d_a_andsw.cpp @@ -111,7 +111,7 @@ static actor_method_class l_daAndsw_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_ANDSW = { +actor_process_profile_definition g_profile_ANDSW = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp index 10c8609932..9ad44d4877 100644 --- a/src/d/actor/d_a_andsw2.cpp +++ b/src/d/actor/d_a_andsw2.cpp @@ -342,7 +342,7 @@ static actor_method_class l_daAndsw2_Method = { (process_method_func)daAndsw2_Execute, }; -extern actor_process_profile_definition g_profile_ANDSW2 = { +actor_process_profile_definition g_profile_ANDSW2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index d0b6a7b226..fc26f70eb7 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -1220,7 +1220,7 @@ static actor_method_class l_daArrowMethodTable = { (process_method_func)daArrow_draw, }; -extern actor_process_profile_definition g_profile_ARROW = { +actor_process_profile_definition g_profile_ARROW = { fpcLy_CURRENT_e, // mLayerID 9, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_bh.cpp b/src/d/actor/d_a_b_bh.cpp index e4531267cd..a114328562 100644 --- a/src/d/actor/d_a_b_bh.cpp +++ b/src/d/actor/d_a_b_bh.cpp @@ -94,7 +94,6 @@ static int daB_BH_Draw(b_bh_class* i_this) { return 1; } -/* 805B33ED 0003+00 data_805B33ED None */ static u8 hio_set; static daB_BH_HIO_c l_HIO; @@ -1577,7 +1576,7 @@ static actor_method_class l_daB_BH_Method = { (process_method_func)daB_BH_Draw, }; -extern actor_process_profile_definition g_profile_B_BH = { +actor_process_profile_definition g_profile_B_BH = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index 7e6762e02d..9339260a1c 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -2672,7 +2672,7 @@ static actor_method_class l_daB_BQ_Method = { (process_method_func)daB_BQ_Draw, }; -extern actor_process_profile_definition g_profile_B_BQ = { +actor_process_profile_definition g_profile_B_BQ = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp index b651124000..bad6772369 100644 --- a/src/d/actor/d_a_b_dr.cpp +++ b/src/d/actor/d_a_b_dr.cpp @@ -281,7 +281,6 @@ daB_DR_HIO_c::daB_DR_HIO_c() { breath_feint2_OFF = true; } -/* 805C78FD 0003+00 hio_set None */ static u8 hio_set; static daB_DR_HIO_c l_HIO; @@ -4287,7 +4286,7 @@ static actor_method_class l_daB_DR_Method = { (process_method_func)daB_DR_Draw, }; -extern actor_process_profile_definition g_profile_B_DR = { +actor_process_profile_definition g_profile_B_DR = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_dre.cpp b/src/d/actor/d_a_b_dre.cpp index d7fa5a7114..b501877178 100644 --- a/src/d/actor/d_a_b_dre.cpp +++ b/src/d/actor/d_a_b_dre.cpp @@ -943,7 +943,7 @@ static actor_method_class l_daB_DRE_Method = { (process_method_func)daB_DRE_Draw, }; -extern actor_process_profile_definition g_profile_B_DRE = { +actor_process_profile_definition g_profile_B_DRE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index 2a24597c0c..5335844544 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -203,13 +203,9 @@ static bool hio_set; static daB_DS_HIO_c l_HIO; -/* 805DDB0C 0002+00 data_805DDB0C handL_ang */ -/* 805DDB0E 0002+00 data_805DDB0E handR_ang */ static s16 handL_ang; static s16 handR_ang; -/* 805DDB10 0002+00 data_805DDB10 handX_ang */ -/* 805DDB12 0002+00 breathTimerBase None */ static s16 handX_ang; static u8 breathTimerBase; @@ -5686,7 +5682,7 @@ static actor_method_class l_daB_DS_Method = { (process_method_func)daB_DS_Draw, }; -extern actor_process_profile_definition g_profile_B_DS = { +actor_process_profile_definition g_profile_B_DS = { fpcLy_CURRENT_e, 4, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp index d8699bcd21..013ed52d62 100644 --- a/src/d/actor/d_a_b_gg.cpp +++ b/src/d/actor/d_a_b_gg.cpp @@ -543,10 +543,8 @@ static s16 s_TargetAngle; static cXyz s_centerpos(217.0f, 1275.0f, -57.0f); -/* 805ED74C 0002+00 data_805ED74C s_M_Action__22@unnamed@d_a_b_gg_cpp@ */ static s16 s_M_Action; -/* 805ED74E 0002+00 data_805ED74E s_W_Action__22@unnamed@d_a_b_gg_cpp@ */ static s16 s_W_Action; } @@ -4458,7 +4456,7 @@ static actor_method_class l_daB_GG_Method = { (process_method_func)daB_GG_Draw, }; -extern actor_process_profile_definition g_profile_B_GG = { +actor_process_profile_definition g_profile_B_GG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_gm.cpp b/src/d/actor/d_a_b_gm.cpp index 78b33acb7c..7228df2ca5 100644 --- a/src/d/actor/d_a_b_gm.cpp +++ b/src/d/actor/d_a_b_gm.cpp @@ -2231,7 +2231,7 @@ static actor_method_class l_daB_GM_Method = { (process_method_func)daB_GM_Draw, }; -extern actor_process_profile_definition g_profile_B_GM = { +actor_process_profile_definition g_profile_B_GM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp index 838ef2cbd0..2fb9403d8d 100644 --- a/src/d/actor/d_a_b_gnd.cpp +++ b/src/d/actor/d_a_b_gnd.cpp @@ -4956,7 +4956,7 @@ static actor_method_class l_daB_GND_Method = { (process_method_func)daB_GND_Draw, }; -extern actor_process_profile_definition g_profile_B_GND = { +actor_process_profile_definition g_profile_B_GND = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_go.cpp b/src/d/actor/d_a_b_go.cpp index 4fd4ad4817..6f593b1597 100644 --- a/src/d/actor/d_a_b_go.cpp +++ b/src/d/actor/d_a_b_go.cpp @@ -290,7 +290,7 @@ static actor_method_class l_daB_GO_Method = { (process_method_func)daB_GO_Draw, }; -extern actor_process_profile_definition g_profile_B_GO = { +actor_process_profile_definition g_profile_B_GO = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_gos.cpp b/src/d/actor/d_a_b_gos.cpp index 4291a91ce2..190baad085 100644 --- a/src/d/actor/d_a_b_gos.cpp +++ b/src/d/actor/d_a_b_gos.cpp @@ -415,7 +415,7 @@ static actor_method_class l_daB_GOS_Method = { (process_method_func)daB_GOS_Draw, }; -extern actor_process_profile_definition g_profile_B_GOS = { +actor_process_profile_definition g_profile_B_GOS = { fpcLy_CURRENT_e, 8, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_mgn.cpp b/src/d/actor/d_a_b_mgn.cpp index 1c83092489..97575825d3 100644 --- a/src/d/actor/d_a_b_mgn.cpp +++ b/src/d/actor/d_a_b_mgn.cpp @@ -3584,7 +3584,7 @@ static actor_method_class l_daB_MGN_Method = { (process_method_func)daB_MGN_Draw, }; -extern actor_process_profile_definition g_profile_B_MGN = { +actor_process_profile_definition g_profile_B_MGN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_ob.cpp b/src/d/actor/d_a_b_ob.cpp index 32220b7988..9c34171cae 100644 --- a/src/d/actor/d_a_b_ob.cpp +++ b/src/d/actor/d_a_b_ob.cpp @@ -3648,7 +3648,7 @@ static actor_method_class l_daB_OB_Method = { (process_method_func)daB_OB_Draw, }; -extern actor_process_profile_definition g_profile_B_OB = { +actor_process_profile_definition g_profile_B_OB = { fpcLy_CURRENT_e, 4, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_oh.cpp b/src/d/actor/d_a_b_oh.cpp index 53e537f80d..aded45eee3 100644 --- a/src/d/actor/d_a_b_oh.cpp +++ b/src/d/actor/d_a_b_oh.cpp @@ -118,7 +118,6 @@ static int daB_OH_Draw(b_oh_class* i_this) { return 1; } -/* 8061DBB5 0003+00 data_8061DBB5 None */ static u8 data_8061DBB5; static daB_OH_HIO_c l_HIO; @@ -831,7 +830,7 @@ static actor_method_class l_daB_OH_Method = { (process_method_func)daB_OH_Draw, }; -extern actor_process_profile_definition g_profile_B_OH = { +actor_process_profile_definition g_profile_B_OH = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_oh2.cpp b/src/d/actor/d_a_b_oh2.cpp index 22e049f97c..b69e0cde42 100644 --- a/src/d/actor/d_a_b_oh2.cpp +++ b/src/d/actor/d_a_b_oh2.cpp @@ -299,7 +299,7 @@ static actor_method_class l_daB_OH2_Method = { (process_method_func)daB_OH2_Draw, }; -extern actor_process_profile_definition g_profile_B_OH2 = { +actor_process_profile_definition g_profile_B_OH2 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index 69eda8177a..f768a4f875 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -342,7 +342,6 @@ void daB_TN_c::calcWaistAngle() { cLib_addCalcAngleS2(&mWaistAngle, sVar1, 4, 0x1000); } -/* 8062F01D 0003+00 data_8062F01D None */ static u8 hio_set; static daB_TN_HIO_c l_HIO; @@ -5174,7 +5173,7 @@ static actor_method_class l_daB_TN_Method = { (process_method_func)daB_TN_Draw, }; -extern actor_process_profile_definition g_profile_B_TN = { +actor_process_profile_definition g_profile_B_TN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp index 1129892346..ccb33ce32d 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -122,7 +122,6 @@ enum L5_R50_RES_FIL_ID { /* 0x0A */ DZB_R50_P2, }; -/* 80639F74 0001+00 data_80639F74 @1009 */ static bool hio_set; static daB_YO_HIO_c l_HIO; @@ -3432,7 +3431,7 @@ static actor_method_class l_daB_YO_Method = { (process_method_func)daB_YO_Draw, }; -extern actor_process_profile_definition g_profile_B_YO = { +actor_process_profile_definition g_profile_B_YO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_yo_ice.cpp b/src/d/actor/d_a_b_yo_ice.cpp index 58a2133e02..c716d4a73b 100644 --- a/src/d/actor/d_a_b_yo_ice.cpp +++ b/src/d/actor/d_a_b_yo_ice.cpp @@ -1093,7 +1093,7 @@ static actor_method_class l_daB_YOI_Method = { (process_method_func)daB_YOI_Draw, }; -extern actor_process_profile_definition g_profile_B_YOI = { +actor_process_profile_definition g_profile_B_YOI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index 7d0516f467..e7e2fd146e 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -399,7 +399,6 @@ void daB_ZANT_c::setDamageSe(dCcD_Sph* i_hitSph, int i_dmgAmount) { } } -/* 8064F5F5 0003+00 hio_set None */ static u8 hio_set; static daB_ZANT_HIO_c l_HIO; @@ -5598,7 +5597,7 @@ static actor_method_class l_daB_ZANT_Method = { (process_method_func)daB_ZANT_Draw, }; -extern actor_process_profile_definition g_profile_B_ZANT = { +actor_process_profile_definition g_profile_B_ZANT = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_zant_magic.cpp b/src/d/actor/d_a_b_zant_magic.cpp index 426984d84b..d94326b6b2 100644 --- a/src/d/actor/d_a_b_zant_magic.cpp +++ b/src/d/actor/d_a_b_zant_magic.cpp @@ -276,7 +276,7 @@ static actor_method_class l_daB_ZANTM_Method = { (process_method_func)daB_ZANTM_Draw, }; -extern actor_process_profile_definition g_profile_B_ZANTM = { +actor_process_profile_definition g_profile_B_ZANTM = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp index 16c0160a35..64d09f788e 100644 --- a/src/d/actor/d_a_b_zant_mobile.cpp +++ b/src/d/actor/d_a_b_zant_mobile.cpp @@ -506,7 +506,7 @@ static actor_method_class l_daB_ZANTZ_Method = { (process_method_func)daB_ZANTZ_Draw, }; -extern actor_process_profile_definition g_profile_B_ZANTZ = { +actor_process_profile_definition g_profile_B_ZANTZ = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_zant_sima.cpp b/src/d/actor/d_a_b_zant_sima.cpp index 95d436f98c..60639516ef 100644 --- a/src/d/actor/d_a_b_zant_sima.cpp +++ b/src/d/actor/d_a_b_zant_sima.cpp @@ -227,7 +227,7 @@ static actor_method_class l_daB_ZANTS_Method = { (process_method_func)daB_ZANTS_Draw, }; -extern actor_process_profile_definition g_profile_B_ZANTS = { +actor_process_profile_definition g_profile_B_ZANTS = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_balloon_2D.cpp b/src/d/actor/d_a_balloon_2D.cpp index 925f53776e..a580f46e6b 100644 --- a/src/d/actor/d_a_balloon_2D.cpp +++ b/src/d/actor/d_a_balloon_2D.cpp @@ -717,7 +717,7 @@ static actor_method_class daBalloon2D_METHODS = { (process_method_func)daBalloon2D_draw, }; -extern actor_process_profile_definition g_profile_BALLOON2D = { +actor_process_profile_definition g_profile_BALLOON2D = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_bd.cpp b/src/d/actor/d_a_bd.cpp index 786ff431cb..a97746ce2a 100644 --- a/src/d/actor/d_a_bd.cpp +++ b/src/d/actor/d_a_bd.cpp @@ -1003,7 +1003,6 @@ static int daBd_Create(fopAc_ac_c* i_act_this) { i_act_this->field_0x560 = 1; i_this->mStts.Init(100, 0, i_act_this); - /* 804DA234-804DA274 0002AC 0040+00 1/1 0/0 0/0 .data cc_sph_src$4956 */ static dCcD_SrcSph cc_sph_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj @@ -1054,7 +1053,7 @@ static actor_method_class l_daBd_Method = { (process_method_func)daBd_Draw, }; -extern actor_process_profile_definition g_profile_BD = { +actor_process_profile_definition g_profile_BD = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index d69d589785..be8960fc51 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -623,7 +623,7 @@ static actor_method_class l_daBg_Method = { (process_method_func)daBg_Draw, }; -extern actor_process_profile_definition2 g_profile_BG = { +actor_process_profile_definition2 g_profile_BG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index 6b16768d0d..f6491ef290 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -1359,7 +1359,7 @@ static actor_method_class daBgObj_METHODS = { (process_method_func)daBgObj_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_BG_OBJ = { +actor_process_profile_definition g_profile_BG_OBJ = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index 1d085066d3..83cff8be3f 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -1494,7 +1494,7 @@ static actor_method_class l_daBoomerang_Method = { (process_method_func)daBoomerang_Draw, }; -extern actor_process_profile_definition g_profile_BOOMERANG = { +actor_process_profile_definition g_profile_BOOMERANG = { fpcLy_CURRENT_e, // mLayerID 6, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_bullet.cpp b/src/d/actor/d_a_bullet.cpp index c166293f76..cf488e347d 100644 --- a/src/d/actor/d_a_bullet.cpp +++ b/src/d/actor/d_a_bullet.cpp @@ -250,7 +250,7 @@ static actor_method_class daBullet_MethodTable = { (process_method_func)daBullet_Draw, }; -extern actor_process_profile_definition g_profile_BULLET = { +actor_process_profile_definition g_profile_BULLET = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_canoe.cpp b/src/d/actor/d_a_canoe.cpp index 93e8359fdb..588b0318e6 100644 --- a/src/d/actor/d_a_canoe.cpp +++ b/src/d/actor/d_a_canoe.cpp @@ -914,7 +914,7 @@ static actor_method_class l_daCanoe_Method = { (process_method_func)daCanoe_Draw, }; -extern actor_process_profile_definition g_profile_CANOE = { +actor_process_profile_definition g_profile_CANOE = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_coach_2D.cpp b/src/d/actor/d_a_coach_2D.cpp index 2cf5d224a0..fd21f2dac0 100644 --- a/src/d/actor/d_a_coach_2D.cpp +++ b/src/d/actor/d_a_coach_2D.cpp @@ -354,7 +354,7 @@ static actor_method_class daCoach2D_METHODS = { (process_method_func)daCoach2D_draw, }; -extern actor_process_profile_definition g_profile_COACH2D = { +actor_process_profile_definition g_profile_COACH2D = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_coach_fire.cpp b/src/d/actor/d_a_coach_fire.cpp index 2f6d2ea51c..80433c573e 100644 --- a/src/d/actor/d_a_coach_fire.cpp +++ b/src/d/actor/d_a_coach_fire.cpp @@ -163,7 +163,7 @@ static actor_method_class l_daCoachFire_Method = { (process_method_func)daCoachFire_Draw, }; -extern actor_process_profile_definition g_profile_COACH_FIRE = { +actor_process_profile_definition g_profile_COACH_FIRE = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_cow.cpp b/src/d/actor/d_a_cow.cpp index 0dc61d0bb8..df44ba3924 100644 --- a/src/d/actor/d_a_cow.cpp +++ b/src/d/actor/d_a_cow.cpp @@ -59,7 +59,7 @@ static f32 l_CowRoomPosX[20] = {-10600.0f, -10600.0f, -10800.0f, -10800.0f, -110 static f32 l_CowRoomPosZ[2] = {-19646.0f, -20926.0f}; #define N_WOLF_BUSTERS 3 -extern fpc_ProcID gWolfBustersID[N_WOLF_BUSTERS] = {fpcM_ERROR_PROCESS_ID_e, fpcM_ERROR_PROCESS_ID_e, fpcM_ERROR_PROCESS_ID_e}; +fpc_ProcID gWolfBustersID[N_WOLF_BUSTERS] = {fpcM_ERROR_PROCESS_ID_e, fpcM_ERROR_PROCESS_ID_e, fpcM_ERROR_PROCESS_ID_e}; } // namespace @@ -431,10 +431,8 @@ void daCow_c::setGroundAngle() { static f32 m_near_dist; -/* 806634F8 0002+00 data_806634F8 m_view_angle_wide */ static s16 m_view_angle_wide; -/* 806634FA 0002+00 data_806634FA m_view_angle */ static s16 m_view_angle; #define IS_COW(actor) (fopAcM_GetName((actor)) == PROC_COW) @@ -3116,10 +3114,7 @@ u8 daCow_c::initialize() { } int daCow_c::create() { - if (!fopAcM_CheckCondition(this, 8)) { - new (this) daCow_c(); - fopAcM_OnCondition(this, 8); - } + fopAcM_ct(this, daCow_c); mPrm0 = fopAcM_GetParam(this); if (mPrm0 == (u8)-1 || mPrm0 >= 5) { @@ -3280,7 +3275,7 @@ static actor_method_class daCow_MethodTable = { daCow_Create, daCow_Delete, daCow_Execute, daCow_IsDelete, daCow_Draw, }; -extern actor_process_profile_definition g_profile_COW = { +actor_process_profile_definition g_profile_COW = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_crod.cpp b/src/d/actor/d_a_crod.cpp index 405c2255a7..25f41b7714 100644 --- a/src/d/actor/d_a_crod.cpp +++ b/src/d/actor/d_a_crod.cpp @@ -382,7 +382,7 @@ static actor_method_class l_daCrod_Method = { (process_method_func)daCrod_Draw, }; -extern actor_process_profile_definition g_profile_CROD = { +actor_process_profile_definition g_profile_CROD = { fpcLy_CURRENT_e, 8, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_cstaF.cpp b/src/d/actor/d_a_cstaF.cpp index 99ad3813cc..c07eca7aff 100644 --- a/src/d/actor/d_a_cstaF.cpp +++ b/src/d/actor/d_a_cstaF.cpp @@ -576,7 +576,7 @@ static actor_method_class l_daCstaF_Method = { (process_method_func)daCstaF_Draw, }; -extern actor_process_profile_definition g_profile_CSTAF = { +actor_process_profile_definition g_profile_CSTAF = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_cstatue.cpp b/src/d/actor/d_a_cstatue.cpp index af480cb457..3c8b7ce917 100644 --- a/src/d/actor/d_a_cstatue.cpp +++ b/src/d/actor/d_a_cstatue.cpp @@ -1212,7 +1212,7 @@ static actor_method_class l_daCstatue_Method = { (process_method_func)daCstatue_Draw, }; -extern actor_process_profile_definition g_profile_CSTATUE = { +actor_process_profile_definition g_profile_CSTATUE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index ba2020af60..e3e56e9d66 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -1373,7 +1373,7 @@ static void teduna_ganon_hand_set(J3DModel* i_model, int param_2, int param_3) { } static void ke_control(daDemo00_c* i_this, demo_s1_ke_s* param_2, int param_3, f32 param_4) { - param_3; + UNUSED(param_3); fopAc_ac_c* actor = i_this; int i; cXyz sp4C, sp40; @@ -1892,7 +1892,7 @@ static actor_method_class l_daDemo00_Method = { (process_method_func)daDemo00_Draw, }; -extern actor_process_profile_definition g_profile_DEMO00 = { +actor_process_profile_definition g_profile_DEMO00 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index 4e6b70d020..aaac0e030b 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -559,7 +559,7 @@ static actor_method_class l_daDitem_Method = { (process_method_func)daDitem_Draw, }; -extern actor_process_profile_definition g_profile_Demo_Item = { +actor_process_profile_definition g_profile_Demo_Item = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index d098009ede..48efd5a3ce 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -122,7 +122,7 @@ static actor_method_class l_daDisappear_Method = { (process_method_func)daDisappear_Draw, }; -extern actor_process_profile_definition g_profile_DISAPPEAR = { +actor_process_profile_definition g_profile_DISAPPEAR = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_dmidna.cpp b/src/d/actor/d_a_dmidna.cpp index cd6d496a35..dbe02cdf85 100644 --- a/src/d/actor/d_a_dmidna.cpp +++ b/src/d/actor/d_a_dmidna.cpp @@ -88,7 +88,7 @@ static actor_method_class l_daDmidna_Method = { (process_method_func)daDmidna_Draw, }; -extern actor_process_profile_definition g_profile_DMIDNA = { +actor_process_profile_definition g_profile_DMIDNA = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_do.cpp b/src/d/actor/d_a_do.cpp index 2d02b3fe40..9e6fb93316 100644 --- a/src/d/actor/d_a_do.cpp +++ b/src/d/actor/d_a_do.cpp @@ -16,7 +16,6 @@ #include "m_Do/m_Do_controller_pad.h" #include "Z2AudioLib/Z2Instances.h" -/* 8066F2B6 0002+00 data_8066F2B6 None */ static bool noFallCheck; static bool hio_set; @@ -2500,7 +2499,7 @@ static actor_method_class l_daDo_Method = { (process_method_func)daDo_Draw, }; -extern actor_process_profile_definition g_profile_DO = { +actor_process_profile_definition g_profile_DO = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_door_boss.cpp b/src/d/actor/d_a_door_boss.cpp index 6024869822..8bc8cee3f8 100644 --- a/src/d/actor/d_a_door_boss.cpp +++ b/src/d/actor/d_a_door_boss.cpp @@ -416,7 +416,7 @@ static actor_method_class l_daBdoor_Method = { (process_method_func)daBdoor_Draw, }; -extern actor_process_profile_definition g_profile_BOSS_DOOR = { +actor_process_profile_definition g_profile_BOSS_DOOR = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_door_bossL1.cpp b/src/d/actor/d_a_door_bossL1.cpp index 90c442e206..83e9454a61 100644 --- a/src/d/actor/d_a_door_bossL1.cpp +++ b/src/d/actor/d_a_door_bossL1.cpp @@ -975,7 +975,7 @@ static actor_method_class l_daBdoorL1_Method = { (process_method_func)daBdoorL1_Draw, }; -extern actor_process_profile_definition g_profile_L1BOSS_DOOR = { +actor_process_profile_definition g_profile_L1BOSS_DOOR = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_door_bossL5.cpp b/src/d/actor/d_a_door_bossL5.cpp index fecc69d36f..e78bc00e7b 100644 --- a/src/d/actor/d_a_door_bossL5.cpp +++ b/src/d/actor/d_a_door_bossL5.cpp @@ -502,7 +502,7 @@ static actor_method_class l_daBdoorL5_Method = { (process_method_func)daBdoorL5_Draw, }; -extern actor_process_profile_definition g_profile_L5BOSS_DOOR = { +actor_process_profile_definition g_profile_L5BOSS_DOOR = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_door_dbdoor00.cpp b/src/d/actor/d_a_door_dbdoor00.cpp index 11b42526f7..4c1e8e8c5e 100644 --- a/src/d/actor/d_a_door_dbdoor00.cpp +++ b/src/d/actor/d_a_door_dbdoor00.cpp @@ -414,7 +414,7 @@ static actor_method_class l_daDbdoor00_Method = { (process_method_func)daDbdoor00_Draw, }; -extern actor_process_profile_definition g_profile_DBDOOR = { +actor_process_profile_definition g_profile_DBDOOR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_door_knob00.cpp b/src/d/actor/d_a_door_knob00.cpp index 0803abd9c7..dec122fa0c 100644 --- a/src/d/actor/d_a_door_knob00.cpp +++ b/src/d/actor/d_a_door_knob00.cpp @@ -699,7 +699,7 @@ static actor_method_class l_daKnob20_Method = { (process_method_func)daKnob20_Draw, }; -extern actor_process_profile_definition g_profile_KNOB20 = { +actor_process_profile_definition g_profile_KNOB20 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_door_mbossL1.cpp b/src/d/actor/d_a_door_mbossL1.cpp index 88937986bc..d752b14ba3 100644 --- a/src/d/actor/d_a_door_mbossL1.cpp +++ b/src/d/actor/d_a_door_mbossL1.cpp @@ -1727,7 +1727,7 @@ static actor_method_class l_daMBdoorL1_Method = { (process_method_func)daMBdoorL1_Draw, }; -extern actor_process_profile_definition g_profile_L1MBOSS_DOOR = { +actor_process_profile_definition g_profile_L1MBOSS_DOOR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_door_push.cpp b/src/d/actor/d_a_door_push.cpp index 82634f0585..29f6e6f18e 100644 --- a/src/d/actor/d_a_door_push.cpp +++ b/src/d/actor/d_a_door_push.cpp @@ -366,7 +366,7 @@ static actor_method_class daDoorPush_METHODS = { (process_method_func)daDoorPush_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_PushDoor = { +actor_process_profile_definition g_profile_PushDoor = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index 633b2e2b43..06be94937c 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -2145,7 +2145,7 @@ static actor_method_class l_daDoor20_Method = { (process_method_func)daDoor20_Draw, }; -extern actor_process_profile_definition g_profile_DOOR20 = { +actor_process_profile_definition g_profile_DOOR20 = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_door_spiral.cpp b/src/d/actor/d_a_door_spiral.cpp index 83b8fe063c..61562d0fb3 100644 --- a/src/d/actor/d_a_door_spiral.cpp +++ b/src/d/actor/d_a_door_spiral.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_door_spiral.h" #include "f_op/f_op_actor.h" -extern actor_process_profile_definition g_profile_SPIRAL_DOOR = { +actor_process_profile_definition g_profile_SPIRAL_DOOR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_dshutter.cpp b/src/d/actor/d_a_dshutter.cpp index ea3c0f5319..78d5ca6f0d 100644 --- a/src/d/actor/d_a_dshutter.cpp +++ b/src/d/actor/d_a_dshutter.cpp @@ -245,7 +245,7 @@ static actor_method_class l_daDsh_Method = { (process_method_func)daDsh_Draw, }; -extern actor_process_profile_definition2 g_profile_DSHUTTER = { +actor_process_profile_definition2 g_profile_DSHUTTER = { { fpcLy_CURRENT_e, // mLayerID 7, // mListID diff --git a/src/d/actor/d_a_e_ai.cpp b/src/d/actor/d_a_e_ai.cpp index 5852c7858e..8e8841ffc2 100644 --- a/src/d/actor/d_a_e_ai.cpp +++ b/src/d/actor/d_a_e_ai.cpp @@ -948,7 +948,7 @@ static actor_method_class l_daE_AI_Method = { (process_method_func)daE_AI_Draw, }; -extern actor_process_profile_definition g_profile_E_AI = { +actor_process_profile_definition g_profile_E_AI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_arrow.cpp b/src/d/actor/d_a_e_arrow.cpp index 81fc58142a..9827237349 100644 --- a/src/d/actor/d_a_e_arrow.cpp +++ b/src/d/actor/d_a_e_arrow.cpp @@ -753,7 +753,7 @@ static actor_method_class l_daE_ARROW_Method = { (process_method_func)daE_ARROW_Draw, }; -extern actor_process_profile_definition g_profile_E_ARROW = { +actor_process_profile_definition g_profile_E_ARROW = { fpcLy_CURRENT_e, 8, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_ba.cpp b/src/d/actor/d_a_e_ba.cpp index 9e91eb2808..2c6134559d 100644 --- a/src/d/actor/d_a_e_ba.cpp +++ b/src/d/actor/d_a_e_ba.cpp @@ -1104,7 +1104,7 @@ static actor_method_class l_daE_BA_Method = { (process_method_func)daE_BA_Draw, }; -extern actor_process_profile_definition g_profile_E_BA = { +actor_process_profile_definition g_profile_E_BA = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_bee.cpp b/src/d/actor/d_a_e_bee.cpp index e518312df7..529ca90348 100644 --- a/src/d/actor/d_a_e_bee.cpp +++ b/src/d/actor/d_a_e_bee.cpp @@ -15,7 +15,6 @@ #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" -/* 80685675 0003+00 data_80685675 None */ static bool hio_set; static daE_Bee_HIO_c l_HIO; @@ -814,7 +813,7 @@ static actor_method_class l_daE_Bee_Method = { (process_method_func)daE_Bee_Draw, }; -extern actor_process_profile_definition g_profile_E_BEE = { +actor_process_profile_definition g_profile_E_BEE = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_bg.cpp b/src/d/actor/d_a_e_bg.cpp index 317653b21f..e0c963bb86 100644 --- a/src/d/actor/d_a_e_bg.cpp +++ b/src/d/actor/d_a_e_bg.cpp @@ -1422,7 +1422,7 @@ static actor_method_class l_daE_BG_Method = { (process_method_func)daE_BG_Draw, }; -extern actor_process_profile_definition g_profile_E_BG = { +actor_process_profile_definition g_profile_E_BG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_bi.cpp b/src/d/actor/d_a_e_bi.cpp index 47be524d05..c120f8a19f 100644 --- a/src/d/actor/d_a_e_bi.cpp +++ b/src/d/actor/d_a_e_bi.cpp @@ -181,8 +181,6 @@ static void damage_check(e_bi_class* i_this) { } } -/* 8068DB1C 0001+00 data_8068DB1C @1009 */ -/* 8068DB1D 0003+00 data_8068DB1D None */ static u8 hio_set; static daE_BI_HIO_c l_HIO; @@ -994,7 +992,7 @@ static actor_method_class l_daE_BI_Method = { (process_method_func)daE_BI_Draw, }; -extern actor_process_profile_definition g_profile_E_BI = { +actor_process_profile_definition g_profile_E_BI = { fpcLy_CURRENT_e, // mLayerID 9, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_bi_leaf.cpp b/src/d/actor/d_a_e_bi_leaf.cpp index 8dd49e1444..c273b36b42 100644 --- a/src/d/actor/d_a_e_bi_leaf.cpp +++ b/src/d/actor/d_a_e_bi_leaf.cpp @@ -122,7 +122,7 @@ static actor_method_class l_daE_BI_LEAF_Method = { (process_method_func)daE_BI_LEAF_Draw, }; -extern actor_process_profile_definition g_profile_E_BI_LEAF = { +actor_process_profile_definition g_profile_E_BI_LEAF = { fpcLy_CURRENT_e, 9, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_bs.cpp b/src/d/actor/d_a_e_bs.cpp index 3f40108d5c..a8ff9d589d 100644 --- a/src/d/actor/d_a_e_bs.cpp +++ b/src/d/actor/d_a_e_bs.cpp @@ -928,7 +928,7 @@ static actor_method_class l_daE_BS_Method = { (process_method_func)daE_BS_Draw, }; -extern actor_process_profile_definition g_profile_E_BS = { +actor_process_profile_definition g_profile_E_BS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_bu.cpp b/src/d/actor/d_a_e_bu.cpp index 3bcab8c744..2bb44da4ba 100644 --- a/src/d/actor/d_a_e_bu.cpp +++ b/src/d/actor/d_a_e_bu.cpp @@ -1136,7 +1136,7 @@ static actor_method_class l_daE_BU_Method = { (process_method_func)daE_BU_Draw, }; -extern actor_process_profile_definition g_profile_E_BU = { +actor_process_profile_definition g_profile_E_BU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_bug.cpp b/src/d/actor/d_a_e_bug.cpp index 1e57cd2415..51b0561706 100644 --- a/src/d/actor/d_a_e_bug.cpp +++ b/src/d/actor/d_a_e_bug.cpp @@ -23,16 +23,12 @@ daE_Bug_HIO_c::daE_Bug_HIO_c() { field_0xc = 1.0f; } -/* 80697E6C 0001+00 data_80697E6C @1009 */ -/* 80697E6D 0003+00 data_80697E6D None */ static u8 hio_set; static daE_Bug_HIO_c l_HIO; -/* 80697E8C 0001+00 data_80697E8C None */ static s8 l_roomNo; -/* 80697E8D 0003+00 data_80697E8D None */ static s8 data_80697E8D; static int daE_Bug_Draw(e_bug_class* i_this) { @@ -904,7 +900,7 @@ static actor_method_class l_daE_Bug_Method = { (process_method_func)daE_Bug_Draw, }; -extern actor_process_profile_definition g_profile_E_BUG = { +actor_process_profile_definition g_profile_E_BUG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_cr.cpp b/src/d/actor/d_a_e_cr.cpp index 509b2b691d..d606d9eaaf 100644 --- a/src/d/actor/d_a_e_cr.cpp +++ b/src/d/actor/d_a_e_cr.cpp @@ -545,7 +545,7 @@ static actor_method_class l_daE_CR_Method = { (process_method_func)daE_CR_Draw, }; -extern actor_process_profile_definition g_profile_E_CR = { +actor_process_profile_definition g_profile_E_CR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_cr_egg.cpp b/src/d/actor/d_a_e_cr_egg.cpp index 7afb24af11..8db1b18c37 100644 --- a/src/d/actor/d_a_e_cr_egg.cpp +++ b/src/d/actor/d_a_e_cr_egg.cpp @@ -223,7 +223,7 @@ static actor_method_class l_daE_CR_EGG_Method = { (process_method_func)daE_CR_EGG_Draw, }; -extern actor_process_profile_definition g_profile_E_CR_EGG = { +actor_process_profile_definition g_profile_E_CR_EGG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_db.cpp b/src/d/actor/d_a_e_db.cpp index 1698612837..8b6bb55690 100644 --- a/src/d/actor/d_a_e_db.cpp +++ b/src/d/actor/d_a_e_db.cpp @@ -2205,7 +2205,7 @@ static actor_method_class l_daE_DB_Method = { (process_method_func)daE_DB_Draw, }; -extern actor_process_profile_definition g_profile_E_DB = { +actor_process_profile_definition g_profile_E_DB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_db_leaf.cpp b/src/d/actor/d_a_e_db_leaf.cpp index 1fa30ffdb4..0fe9346bf5 100644 --- a/src/d/actor/d_a_e_db_leaf.cpp +++ b/src/d/actor/d_a_e_db_leaf.cpp @@ -67,7 +67,7 @@ static actor_method_class l_daE_DB_LEAF_Method = { (process_method_func)daE_DB_LEAF_Draw, }; -extern actor_process_profile_definition g_profile_E_DB_LEAF = { +actor_process_profile_definition g_profile_E_DB_LEAF = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_dd.cpp b/src/d/actor/d_a_e_dd.cpp index 556a1cd70e..867d6a1335 100644 --- a/src/d/actor/d_a_e_dd.cpp +++ b/src/d/actor/d_a_e_dd.cpp @@ -1775,7 +1775,7 @@ static cPhs__Step daE_DD_Create(fopAc_ac_c* a_this) { return phase; } -extern actor_method_class l_daE_DD_Method = { +actor_method_class l_daE_DD_Method = { (process_method_func)daE_DD_Create, (process_method_func)daE_DD_Delete, (process_method_func)daE_DD_Execute, @@ -1783,7 +1783,7 @@ extern actor_method_class l_daE_DD_Method = { (process_method_func)daE_DD_Draw, }; -extern actor_process_profile_definition g_profile_E_DD = { +actor_process_profile_definition g_profile_E_DD = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp index 5e5376bc66..ac61d6deed 100644 --- a/src/d/actor/d_a_e_df.cpp +++ b/src/d/actor/d_a_e_df.cpp @@ -714,7 +714,7 @@ static actor_method_class l_daE_DF_Method = { (process_method_func)daE_DF_Draw, }; -extern actor_process_profile_definition g_profile_E_DF = { +actor_process_profile_definition g_profile_E_DF = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_dk.cpp b/src/d/actor/d_a_e_dk.cpp index 0290422504..0f13d897a4 100644 --- a/src/d/actor/d_a_e_dk.cpp +++ b/src/d/actor/d_a_e_dk.cpp @@ -1081,7 +1081,7 @@ static actor_method_class l_daE_DK_Method = { (process_method_func)daE_DK_Draw, }; -extern actor_process_profile_definition g_profile_E_DK = { +actor_process_profile_definition g_profile_E_DK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_dn.cpp b/src/d/actor/d_a_e_dn.cpp index 2c95e4759e..24b19326f8 100644 --- a/src/d/actor/d_a_e_dn.cpp +++ b/src/d/actor/d_a_e_dn.cpp @@ -354,7 +354,6 @@ static BOOL other_bg_check2(e_dn_class* i_this, cXyz* i_pos) { return FALSE; } -/* 804EEF2D 0003+00 data_804EEF2D None */ u8 hio_set; daE_DN_HIO_c l_HIO; @@ -3500,7 +3499,7 @@ static actor_method_class l_daE_DN_Method = { (process_method_func)daE_DN_Draw, }; -extern actor_process_profile_definition g_profile_E_DN = { +actor_process_profile_definition g_profile_E_DN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_dt.cpp b/src/d/actor/d_a_e_dt.cpp index 548b763633..7411529a63 100644 --- a/src/d/actor/d_a_e_dt.cpp +++ b/src/d/actor/d_a_e_dt.cpp @@ -156,7 +156,6 @@ dCcD_SrcSph E_DT_n::cc_dt_tongue_src = { } // mSphAttr }; -/* 806B629D 0003+00 data_806B629D None */ static bool hio_set; static daE_DT_HIO_c l_HIO; @@ -2561,7 +2560,7 @@ static actor_method_class l_daE_DT_Method = { (process_method_func)daE_DT_Draw, }; -extern actor_process_profile_definition g_profile_E_DT = { +actor_process_profile_definition g_profile_E_DT = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_fb.cpp b/src/d/actor/d_a_e_fb.cpp index 4e0888721e..a17e1f024f 100644 --- a/src/d/actor/d_a_e_fb.cpp +++ b/src/d/actor/d_a_e_fb.cpp @@ -1007,7 +1007,7 @@ static actor_method_class l_daE_FB_Method = { (process_method_func)daE_FB_Draw, }; -extern actor_process_profile_definition g_profile_E_FB = { +actor_process_profile_definition g_profile_E_FB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_fk.cpp b/src/d/actor/d_a_e_fk.cpp index 0ceb54aca4..8a3c406c3d 100644 --- a/src/d/actor/d_a_e_fk.cpp +++ b/src/d/actor/d_a_e_fk.cpp @@ -434,10 +434,8 @@ bool daE_FK_c::checkViewArea() { } namespace { -/* 806BB974 0002+00 data_806BB974 s_HorseAngle__22@unnamed@d_a_e_fk_cpp@ */ static s16 s_HorseAngle; -/* 806BB976 0002+00 data_806BB976 s_AttackChk__22@unnamed@d_a_e_fk_cpp@ */ static s16 s_AttackChk; } @@ -813,7 +811,7 @@ static actor_method_class l_daE_FK_Method = { (process_method_func)daE_FK_Draw, }; -extern actor_process_profile_definition g_profile_E_FK = { +actor_process_profile_definition g_profile_E_FK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_fm.cpp b/src/d/actor/d_a_e_fm.cpp index 2b81b30437..b6386d3f00 100644 --- a/src/d/actor/d_a_e_fm.cpp +++ b/src/d/actor/d_a_e_fm.cpp @@ -234,7 +234,6 @@ static void* s_fmobj_del(void* i_actor, void* i_data) { return NULL; } -/* 804FAE95 0003+00 data_804FAE95 None */ static u8 hio_set; static daE_FM_HIO_c l_HIO; @@ -3880,7 +3879,7 @@ static actor_method_class l_daE_FM_Method = { (process_method_func)daE_FM_Draw, }; -extern actor_process_profile_definition g_profile_E_FM = { +actor_process_profile_definition g_profile_E_FM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_fs.cpp b/src/d/actor/d_a_e_fs.cpp index 4e0188535c..397ace06ad 100644 --- a/src/d/actor/d_a_e_fs.cpp +++ b/src/d/actor/d_a_e_fs.cpp @@ -67,7 +67,6 @@ enum Joint { namespace { -/* 806BE79E 0002+00 data_806BE79E s_AtCount__22@unnamed@d_a_e_fs_cpp@ */ static s16 s_AtCount; } // namespace @@ -850,7 +849,7 @@ static actor_method_class l_daE_Fs_Method = { (process_method_func)daE_Fs_Draw, }; -extern actor_process_profile_definition g_profile_E_FS = { +actor_process_profile_definition g_profile_E_FS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_fz.cpp b/src/d/actor/d_a_e_fz.cpp index 28bf0a6c2b..ad11594686 100644 --- a/src/d/actor/d_a_e_fz.cpp +++ b/src/d/actor/d_a_e_fz.cpp @@ -1040,7 +1040,7 @@ static actor_method_class l_daE_FZ_Method = { (process_method_func)daE_FZ_Draw, }; -extern actor_process_profile_definition g_profile_E_FZ = { +actor_process_profile_definition g_profile_E_FZ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ga.cpp b/src/d/actor/d_a_e_ga.cpp index 0878eb9688..00fa54d706 100644 --- a/src/d/actor/d_a_e_ga.cpp +++ b/src/d/actor/d_a_e_ga.cpp @@ -264,7 +264,7 @@ static actor_method_class l_daE_Ga_Method = { (process_method_func)daE_Ga_Draw, }; -extern actor_process_profile_definition g_profile_E_GA = { +actor_process_profile_definition g_profile_E_GA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index c343855360..a7cd49b80f 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -670,7 +670,7 @@ static void kuki_control3(e_gb_class* i_this) { } static void* s_b_sub(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if (fopAcM_IsActor(i_actor) && dBomb_c::checkBombActor((fopAc_ac_c*)i_actor) && !((dBomb_c*)i_actor)->checkStateExplode()) { cXyz sp28 = ((fopAc_ac_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->home.pos; @@ -1724,7 +1724,7 @@ static actor_method_class l_daE_GB_Method = { (process_method_func)daE_GB_Draw, }; -extern actor_process_profile_definition g_profile_E_GB = { +actor_process_profile_definition g_profile_E_GB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ge.cpp b/src/d/actor/d_a_e_ge.cpp index 2cdce165c6..e47c48cdb8 100644 --- a/src/d/actor/d_a_e_ge.cpp +++ b/src/d/actor/d_a_e_ge.cpp @@ -1376,7 +1376,7 @@ static actor_method_class l_daE_GE_Method = { (process_method_func)daE_GE_Draw, }; -extern actor_process_profile_definition g_profile_E_GE = { +actor_process_profile_definition g_profile_E_GE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_gi.cpp b/src/d/actor/d_a_e_gi.cpp index 1bf8685e98..4dac5344b4 100644 --- a/src/d/actor/d_a_e_gi.cpp +++ b/src/d/actor/d_a_e_gi.cpp @@ -1111,7 +1111,7 @@ static actor_method_class l_daE_GI_Method = { (process_method_func)daE_GI_Draw, }; -extern actor_process_profile_definition g_profile_E_GI = { +actor_process_profile_definition g_profile_E_GI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_gm.cpp b/src/d/actor/d_a_e_gm.cpp index a8ac1c38fb..228779b6ea 100644 --- a/src/d/actor/d_a_e_gm.cpp +++ b/src/d/actor/d_a_e_gm.cpp @@ -90,13 +90,10 @@ public: }; namespace { - /* 806D7B34-806D7B38 000038 0004+00 2/3 0/0 0/0 .data l_hitActorID__22@unnamed@d_a_e_gm_cpp@ */ static fpc_ProcID l_hitActorID = fpcM_ERROR_PROCESS_ID_e; - /* 806D7B38-806D7B3C 00003C 0004+00 2/4 0/0 0/0 .data l_coreActorID__22@unnamed@d_a_e_gm_cpp@ */ static fpc_ProcID l_coreActorID = fpcM_ERROR_PROCESS_ID_e; - /* 806D7B3C-806D7B7C 000040 0040+00 0/1 0/0 0/0 .data cc_sph_src__22@unnamed@d_a_e_gm_cpp@ */ static dCcD_SrcSph cc_sph_src = { { {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0xD}, {0xDAFBFDFF, 0x3}, 0x75}}, @@ -139,26 +136,19 @@ static u8 hio_set; static daE_GM_HIO_c l_HIO; namespace { - /* 806D7EF8-806D7F04 000088 000C+00 0/3 0/0 0/0 .bss l_corePos__22@unnamed@d_a_e_gm_cpp@ */ static cXyz l_corePos(0.0f, 0.0f, 0.0f); - /* 806D7F10-806D7F18 0000A0 0006+02 0/3 0/0 0/0 .bss l_coreAngle__22@unnamed@d_a_e_gm_cpp@ */ static csXyz l_coreAngle; - /* 806D7F18-806D7F1C 0000A8 0004+00 0/2 0/0 0/0 .bss l_coreSpeedF__22@unnamed@d_a_e_gm_cpp@ */ static f32 l_coreSpeedF; } // namespace -/* 806D7F1C -00001 0004+00 11/14 0/0 0/0 .bss None */ static u8 lbl_195_bss_AC; -/* 806D7F1D 0001+00 data_806D7F1D None */ static u8 lbl_195_bss_AD; -/* 806D7F1E 0001+00 data_806D7F1E None */ static u8 lbl_195_bss_AE; -/* 806D7F1F 0001+00 data_806D7F1F None */ static u8 lbl_195_bss_AF; void daE_GM_c::action() { @@ -1833,7 +1823,7 @@ static actor_method_class l_daE_GM_Method = { (process_method_func)daE_GM_Draw, }; -extern actor_process_profile_definition g_profile_E_GM = { +actor_process_profile_definition g_profile_E_GM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_gob.cpp b/src/d/actor/d_a_e_gob.cpp index cb36237df5..f70008fd83 100644 --- a/src/d/actor/d_a_e_gob.cpp +++ b/src/d/actor/d_a_e_gob.cpp @@ -276,7 +276,6 @@ static void damage_check(e_gob_class* i_this) { } } -/* 806DF2C5 0003+00 data_806DF2C5 None */ static u8 hio_set; static daE_GOB_HIO_c l_HIO; @@ -2403,7 +2402,7 @@ static actor_method_class l_daE_GOB_Method = { (process_method_func)daE_GOB_Draw, }; -extern actor_process_profile_definition g_profile_E_GOB = { +actor_process_profile_definition g_profile_E_GOB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_gs.cpp b/src/d/actor/d_a_e_gs.cpp index a678880082..a9683523e6 100644 --- a/src/d/actor/d_a_e_gs.cpp +++ b/src/d/actor/d_a_e_gs.cpp @@ -232,7 +232,7 @@ static actor_method_class l_daE_GS_Method = { (process_method_func)daE_GS_Draw, }; -extern actor_process_profile_definition g_profile_E_GS = { +actor_process_profile_definition g_profile_E_GS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_hb.cpp b/src/d/actor/d_a_e_hb.cpp index ac087a09ca..3aa28fb726 100644 --- a/src/d/actor/d_a_e_hb.cpp +++ b/src/d/actor/d_a_e_hb.cpp @@ -1510,7 +1510,7 @@ static actor_method_class l_daE_HB_Method = { (process_method_func)daE_HB_Draw, }; -extern actor_process_profile_definition g_profile_E_HB = { +actor_process_profile_definition g_profile_E_HB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_hb_leaf.cpp b/src/d/actor/d_a_e_hb_leaf.cpp index 78d68a54b7..4a28434d3c 100644 --- a/src/d/actor/d_a_e_hb_leaf.cpp +++ b/src/d/actor/d_a_e_hb_leaf.cpp @@ -86,7 +86,7 @@ static actor_method_class l_daE_HB_LEAF_Method = { (process_method_func)daE_HB_LEAF_Draw, }; -extern actor_process_profile_definition g_profile_E_HB_LEAF = { +actor_process_profile_definition g_profile_E_HB_LEAF = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_hm.cpp b/src/d/actor/d_a_e_hm.cpp index 781ee1ad77..4c6e5d37da 100644 --- a/src/d/actor/d_a_e_hm.cpp +++ b/src/d/actor/d_a_e_hm.cpp @@ -1602,7 +1602,7 @@ static actor_method_class l_daE_HM_Method = { (process_method_func)daE_HM_Draw, }; -extern actor_process_profile_definition g_profile_E_HM = { +actor_process_profile_definition g_profile_E_HM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index e37042a121..90338615e6 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -169,7 +169,6 @@ static bool hio_set; static daE_HP_HIO_c l_HIO; int daE_HP_c::draw() { - /* 806EA3E8-806EA3EC 000100 0004+00 1/1 0/0 0/0 .data particleNmaeDt$4030 */ static u16 particleNmaeDt[2] = { 0x8789, 0x878A, @@ -1328,7 +1327,7 @@ static actor_method_class l_daE_HP_Method = { (process_method_func)daE_HP_Draw, }; -extern actor_process_profile_definition g_profile_E_HP = { +actor_process_profile_definition g_profile_E_HP = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_hz.cpp b/src/d/actor/d_a_e_hz.cpp index d9be18d622..7b1bc09e81 100644 --- a/src/d/actor/d_a_e_hz.cpp +++ b/src/d/actor/d_a_e_hz.cpp @@ -2092,7 +2092,7 @@ static actor_method_class l_daE_HZ_Method = { (process_method_func)daE_HZ_Draw, }; -extern actor_process_profile_definition g_profile_E_HZ = { +actor_process_profile_definition g_profile_E_HZ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_hzelda.cpp b/src/d/actor/d_a_e_hzelda.cpp index c0b066b933..6402b7f5ef 100644 --- a/src/d/actor/d_a_e_hzelda.cpp +++ b/src/d/actor/d_a_e_hzelda.cpp @@ -1534,7 +1534,7 @@ static actor_method_class l_daE_HZELDA_Method = { (process_method_func)daE_HZELDA_Draw, }; -extern actor_process_profile_definition g_profile_E_HZELDA = { +actor_process_profile_definition g_profile_E_HZELDA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_is.cpp b/src/d/actor/d_a_e_is.cpp index 82ba88099c..f95bba1755 100644 --- a/src/d/actor/d_a_e_is.cpp +++ b/src/d/actor/d_a_e_is.cpp @@ -752,7 +752,7 @@ static actor_method_class l_daE_IS_Method = { (process_method_func)daE_IS_Draw, }; -extern actor_process_profile_definition g_profile_E_IS = { +actor_process_profile_definition g_profile_E_IS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_kg.cpp b/src/d/actor/d_a_e_kg.cpp index a9f4060e5c..570944ff21 100644 --- a/src/d/actor/d_a_e_kg.cpp +++ b/src/d/actor/d_a_e_kg.cpp @@ -743,7 +743,7 @@ static actor_method_class l_daE_KG_Method = { (process_method_func)daE_KG_Draw, }; -extern actor_process_profile_definition g_profile_E_KG = { +actor_process_profile_definition g_profile_E_KG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_kk.cpp b/src/d/actor/d_a_e_kk.cpp index d9a3f49a77..a2838ee4da 100644 --- a/src/d/actor/d_a_e_kk.cpp +++ b/src/d/actor/d_a_e_kk.cpp @@ -1490,7 +1490,7 @@ static actor_method_class l_daE_KK_Method = { (process_method_func)daE_KK_Draw, }; -extern actor_process_profile_definition g_profile_E_KK = { +actor_process_profile_definition g_profile_E_KK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_kr.cpp b/src/d/actor/d_a_e_kr.cpp index dcf169de9e..4001092815 100644 --- a/src/d/actor/d_a_e_kr.cpp +++ b/src/d/actor/d_a_e_kr.cpp @@ -2390,7 +2390,7 @@ static actor_method_class l_daE_Kr_Method = { (process_method_func)daE_Kr_Draw, }; -extern actor_process_profile_definition g_profile_E_KR = { +actor_process_profile_definition g_profile_E_KR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_mb.cpp b/src/d/actor/d_a_e_mb.cpp index d7b11024a4..f99e754c62 100644 --- a/src/d/actor/d_a_e_mb.cpp +++ b/src/d/actor/d_a_e_mb.cpp @@ -89,7 +89,6 @@ static int daE_MB_Draw(e_mb_class* i_this) { return 1; } -/* 80708C2D 0003+00 data_80708C2D None */ static u8 hio_set; static daE_MB_HIO_c l_HIO; @@ -743,7 +742,7 @@ static actor_method_class l_daE_MB_Method = { (process_method_func)daE_MB_Draw, }; -extern actor_process_profile_definition g_profile_E_MB = { +actor_process_profile_definition g_profile_E_MB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_md.cpp b/src/d/actor/d_a_e_md.cpp index 034bf6b943..863482cd7e 100644 --- a/src/d/actor/d_a_e_md.cpp +++ b/src/d/actor/d_a_e_md.cpp @@ -455,7 +455,7 @@ static actor_method_class l_daE_MD_Method = { (process_method_func)daE_MD_Draw, }; -extern actor_process_profile_definition g_profile_E_MD = { +actor_process_profile_definition g_profile_E_MD = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_mf.cpp b/src/d/actor/d_a_e_mf.cpp index e91a974fd9..3374b2a919 100644 --- a/src/d/actor/d_a_e_mf.cpp +++ b/src/d/actor/d_a_e_mf.cpp @@ -3271,7 +3271,7 @@ actor_method_class l_daE_MF_Method = { (process_method_func)daE_MF_Draw, }; -extern actor_process_profile_definition g_profile_E_MF = { +actor_process_profile_definition g_profile_E_MF = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index 342145b851..50a598f172 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -115,7 +115,7 @@ static int daE_MK_Draw(e_mk_class* i_this) { } static void* s_obj_delete(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if (fopAcM_IsActor(i_actor)) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; @@ -137,10 +137,8 @@ static cXyz demo_jump_pos_3(2400.0f, 1115.0f, -1850.0f); static cXyz STAGE_CENTER_POS; -/* 8071CB08 0002+00 data_8071CB08 STAGE_ANGLE_Y */ static s16 STAGE_ANGLE_Y; -/* 8071CB0A 0001+00 .bss */ u8 hio_set; static daE_MK_HIO_c l_HIO; @@ -150,7 +148,7 @@ static void* target_info[20]; static int target_info_count; static void* s_h_sub(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Pillar) && target_info_count < 20) { target_info[target_info_count] = (daPillar_c*)i_actor; @@ -219,7 +217,7 @@ static daPillar_c* search_hasira(e_mk_class* i_this) { } static void* s_d_sub(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_DB)) { e_db_class* actor = (e_db_class*)i_actor; @@ -1942,7 +1940,7 @@ static void demo_camera_end(e_mk_class* i_this) { } static void* s_ks_sub(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) && static_cast(i_actor)->set_id == 0) { return i_actor; @@ -1952,7 +1950,7 @@ static void* s_ks_sub(void* i_actor, void* i_data) { } static void* s_brg_sub(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_BRG) { static_cast(i_actor)->field_0xaef4 = VREG_F(11) + 500.0f; @@ -1963,7 +1961,7 @@ static void* s_brg_sub(void* i_actor, void* i_data) { } static void* s_brg_sub2(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_BRG) { static_cast(i_actor)->mType &= ~0x4 & 0xFFFFFFFB; @@ -2952,7 +2950,7 @@ static actor_method_class l_daE_MK_Method = { (process_method_func)daE_MK_Draw, }; -extern actor_process_profile_definition g_profile_E_MK = { +actor_process_profile_definition g_profile_E_MK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_mk_bo.cpp b/src/d/actor/d_a_e_mk_bo.cpp index 4ba7dde5ce..8d4c430fa7 100644 --- a/src/d/actor/d_a_e_mk_bo.cpp +++ b/src/d/actor/d_a_e_mk_bo.cpp @@ -812,7 +812,7 @@ static actor_method_class l_daE_MK_BO_Method = { (process_method_func)daE_MK_BO_Draw, }; -extern actor_process_profile_definition g_profile_E_MK_BO = { +actor_process_profile_definition g_profile_E_MK_BO = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_mm.cpp b/src/d/actor/d_a_e_mm.cpp index b6c19b78af..dcca056461 100644 --- a/src/d/actor/d_a_e_mm.cpp +++ b/src/d/actor/d_a_e_mm.cpp @@ -1139,7 +1139,7 @@ static actor_method_class l_daE_MM_Method = { (process_method_func)daE_MM_Draw, }; -extern actor_process_profile_definition g_profile_E_MM = { +actor_process_profile_definition g_profile_E_MM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_mm_mt.cpp b/src/d/actor/d_a_e_mm_mt.cpp index 9c5ec2d38f..61976863ce 100644 --- a/src/d/actor/d_a_e_mm_mt.cpp +++ b/src/d/actor/d_a_e_mm_mt.cpp @@ -261,8 +261,6 @@ static void e_mm_mt_carry(e_mm_mt_class* i_this) { cLib_addCalcAngleS2(&i_this->m_carryAngleSpeed, 0x2000, 1, 0x100); } -// /* 807239CC-80723B70 000ACC 01A4+00 1/1 0/0 0/0 .text wall_angle_get__FP13e_mm_mt_class -// */ static s16 wall_angle_get(e_mm_mt_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; cXyz vec1, vec2, vec3[2]; @@ -603,7 +601,7 @@ static void action(e_mm_mt_class* i_this) { daPy_getPlayerActorClass()->getCutType() == 24) { actor->speedF = cM_rndF(10.0f) + 40.0f + TREG_F(16); i_this->m_spin = (s16)(cM_rndF(2000.0f) + 5500.0f); - i_this->field_0x69C = (f32)(s16)(cM_rndF(1000.0f) + 5000.0f); + i_this->field_0x69C = (s16)(cM_rndF(1000.0f) + 5000.0f); } else { actor->speedF = TREG_F(17) + 30.0f; i_this->m_spin = (s16)cM_rndFX(3000.0f); @@ -850,7 +848,7 @@ static actor_method_class l_daE_MM_MT_Method = { (process_method_func)daE_MM_MT_Draw, }; -extern actor_process_profile_definition g_profile_E_MM_MT = { +actor_process_profile_definition g_profile_E_MM_MT = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ms.cpp b/src/d/actor/d_a_e_ms.cpp index b8595f2ce5..a70515fe13 100644 --- a/src/d/actor/d_a_e_ms.cpp +++ b/src/d/actor/d_a_e_ms.cpp @@ -67,7 +67,7 @@ static int daE_MS_Draw(e_ms_class* i_this) { cXyz shadow_pos(i_this->current.pos.x, i_this->current.pos.y + 100.0f, i_this->current.pos.z); i_this->mShadowKey = dComIfGd_setShadow(i_this->mShadowKey, 1, model, &shadow_pos, 400.0f, 40.0f, - i_this->current.pos.y, i_this->mAcch.m_ground_h, i_this->mAcch.m_gnd, + i_this->current.pos.y, i_this->mAcch.GetGroundH(), i_this->mAcch.m_gnd, &i_this->tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); return 1; @@ -79,7 +79,7 @@ static void sibuki_set(e_ms_class* i_this) { cXyz pos(i_this->current.pos); pos.y = i_this->field_0x690; fopKyM_createWpillar(&pos, 1.0f, 0); - if (i_this->field_0x690 - i_this->mAcch.m_ground_h > 50.0f) { + if (i_this->field_0x690 - i_this->mAcch.GetGroundH() > 50.0f) { i_this->mSound.startCreatureSound(Z2SE_CM_BODYFALL_ASASE_S, 0, -1); } else { i_this->mSound.startCreatureSound(Z2SE_EN_MS_FALLWATER, 0, -1); @@ -108,7 +108,6 @@ static void ms_disappear(e_ms_class* i_this) { } } -/* 807297FD 0003+00 data_807297FD None */ static u8 hio_set; static daE_MS_HIO_c l_HIO; @@ -1062,7 +1061,7 @@ static actor_method_class l_daE_MS_Method = { (process_method_func)daE_MS_Draw, }; -extern actor_process_profile_definition g_profile_E_MS = { +actor_process_profile_definition g_profile_E_MS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_nest.cpp b/src/d/actor/d_a_e_nest.cpp index 319811a76b..44fa483e6e 100644 --- a/src/d/actor/d_a_e_nest.cpp +++ b/src/d/actor/d_a_e_nest.cpp @@ -1071,7 +1071,7 @@ static actor_method_class l_daE_Nest_Method = { (process_method_func)daE_Nest_Draw, }; -extern actor_process_profile_definition g_profile_E_NEST = { +actor_process_profile_definition g_profile_E_NEST = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_nz.cpp b/src/d/actor/d_a_e_nz.cpp index 5c98407484..7918dfe541 100644 --- a/src/d/actor/d_a_e_nz.cpp +++ b/src/d/actor/d_a_e_nz.cpp @@ -745,7 +745,7 @@ static actor_method_class l_daE_NZ_Method = { (process_method_func)daE_NZ_Draw, }; -extern actor_process_profile_definition g_profile_E_NZ = { +actor_process_profile_definition g_profile_E_NZ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_oc.cpp b/src/d/actor/d_a_e_oc.cpp index 30d4fb52d0..6a266cb87a 100644 --- a/src/d/actor/d_a_e_oc.cpp +++ b/src/d/actor/d_a_e_oc.cpp @@ -2803,7 +2803,7 @@ static actor_method_class l_daE_OC_Method = { (process_method_func)daE_OC_Draw, }; -extern actor_process_profile_definition g_profile_E_OC = { +actor_process_profile_definition g_profile_E_OC = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_oct_bg.cpp b/src/d/actor/d_a_e_oct_bg.cpp index 6b549a19f6..b2edcdea7e 100644 --- a/src/d/actor/d_a_e_oct_bg.cpp +++ b/src/d/actor/d_a_e_oct_bg.cpp @@ -154,7 +154,6 @@ void daE_OctBg_c::action() { } } -/* 8073A13D 0003+00 data_8073A13D None */ static u8 struct_8073A13D; int daE_OctBg_c::_delete() { @@ -172,9 +171,6 @@ static int daE_OctBg_Delete(daE_OctBg_c* i_this) { return i_this->_delete(); } -/* 8073A14C 0024+01 data_8073A14C l_HIO */ -/* 8073A171 0001+00 data_8073A171 None */ -/* 8073A172 0002+00 data_8073A172 None */ static daE_OctBg_HIO_c l_HIO; u8 unk_bss_78; @@ -890,7 +886,7 @@ static actor_method_class l_daE_OctBg_Method = { (process_method_func)daE_OctBg_Draw, }; -extern actor_process_profile_definition g_profile_E_OctBg = { +actor_process_profile_definition g_profile_E_OctBg = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ot.cpp b/src/d/actor/d_a_e_ot.cpp index 8ef12705d1..ac7ed366f7 100644 --- a/src/d/actor/d_a_e_ot.cpp +++ b/src/d/actor/d_a_e_ot.cpp @@ -86,13 +86,10 @@ static dCcD_SrcSph cc_ot_at_src = { } // namespace -/* 8073D2AD 0003+00 data_8073D2AD None */ static bool hio_set; static daE_OT_HIO_c l_HIO; -/* 8073D2DC 0001+00 data_8073D2DC None */ -/* 8073D2DD 0003+00 data_8073D2DD None */ static u8 data_8073D2DC; static u8 data_8073D2DD; @@ -840,7 +837,7 @@ static actor_method_class l_daE_OT_Method = { (process_method_func)daE_OT_Draw, }; -extern actor_process_profile_definition g_profile_E_OT = { +actor_process_profile_definition g_profile_E_OT = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ph.cpp b/src/d/actor/d_a_e_ph.cpp index 1e4e8c2028..63365ee1ce 100644 --- a/src/d/actor/d_a_e_ph.cpp +++ b/src/d/actor/d_a_e_ph.cpp @@ -1296,7 +1296,7 @@ static actor_method_class l_daE_PH_Method = { (process_method_func)daE_PH_Draw, }; -extern actor_process_profile_definition g_profile_E_PH = { +actor_process_profile_definition g_profile_E_PH = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp index 44012d42c8..aa134b2820 100644 --- a/src/d/actor/d_a_e_pm.cpp +++ b/src/d/actor/d_a_e_pm.cpp @@ -128,7 +128,6 @@ enum Mode { /* 0x07 */ Mode7, }; -/* 8074C385 0003+00 data_8074C385 None */ static bool hio_set; static daE_PM_HIO_c l_HIO; @@ -2868,7 +2867,7 @@ static actor_method_class l_daE_PM_Method = { (process_method_func)daE_PM_Draw, }; -extern actor_process_profile_definition g_profile_E_PM = { +actor_process_profile_definition g_profile_E_PM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index d8fa2eb877..cd6099ef04 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -3171,7 +3171,7 @@ static actor_method_class l_daE_PO_Method = { (process_method_func)daE_PO_Draw, }; -extern actor_process_profile_definition g_profile_E_PO = { +actor_process_profile_definition g_profile_E_PO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_pz.cpp b/src/d/actor/d_a_e_pz.cpp index aced6e3cab..2cf270e694 100644 --- a/src/d/actor/d_a_e_pz.cpp +++ b/src/d/actor/d_a_e_pz.cpp @@ -182,13 +182,10 @@ void daE_PZ_c::mEntrySUB(bool param_0) { } } -/* 80761DFD 0003+00 hio_set None */ static u8 hio_set; -/* 80761E0C 001C+01 data_80761E0C l_HIO */ static daE_PZ_HIO_c l_HIO; -/* 80761E29 0003+00 data_80761E29 None */ static u8 lbl_222_bss_70; static u8 lbl_222_bss_71; @@ -2655,7 +2652,7 @@ static actor_method_class l_daE_PZ_Method = { (process_method_func)daE_PZ_Draw, }; -extern actor_process_profile_definition g_profile_E_PZ = { +actor_process_profile_definition g_profile_E_PZ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_rb.cpp b/src/d/actor/d_a_e_rb.cpp index d60287ceec..bf8e917245 100644 --- a/src/d/actor/d_a_e_rb.cpp +++ b/src/d/actor/d_a_e_rb.cpp @@ -869,7 +869,7 @@ static actor_method_class l_daE_RB_Method = { (process_method_func)daE_RB_Draw, }; -extern actor_process_profile_definition g_profile_E_RB = { +actor_process_profile_definition g_profile_E_RB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_rd.cpp b/src/d/actor/d_a_e_rd.cpp index 186ca6bab6..89904ae397 100644 --- a/src/d/actor/d_a_e_rd.cpp +++ b/src/d/actor/d_a_e_rd.cpp @@ -585,7 +585,6 @@ static u8 hio_set; static daE_RD_HIO_c l_HIO; -/* 805191E4 0002+00 data_805191E4 S_find */ static s16 S_find; static s8 lbl_70_bss_AE; @@ -7372,7 +7371,7 @@ static actor_method_class l_daE_RD_Method = { (process_method_func)daE_RD_Draw, }; -extern actor_process_profile_definition g_profile_E_RD = { +actor_process_profile_definition g_profile_E_RD = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index cd7842fb99..c3a8b87d77 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -1917,7 +1917,7 @@ static actor_method_class l_daE_RDB_Method = { (process_method_func)daE_RDB_Draw, }; -extern actor_process_profile_definition g_profile_E_RDB = { +actor_process_profile_definition g_profile_E_RDB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp index e3192621f7..4227cae259 100644 --- a/src/d/actor/d_a_e_rdy.cpp +++ b/src/d/actor/d_a_e_rdy.cpp @@ -4995,7 +4995,7 @@ static actor_method_class l_daE_RDY_Method = { (process_method_func)daE_RDY_Draw, }; -extern actor_process_profile_definition g_profile_E_RDY = { +actor_process_profile_definition g_profile_E_RDY = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_s1.cpp b/src/d/actor/d_a_e_s1.cpp index b7280cec47..a50615874e 100644 --- a/src/d/actor/d_a_e_s1.cpp +++ b/src/d/actor/d_a_e_s1.cpp @@ -2246,7 +2246,7 @@ static actor_method_class l_daE_S1_Method = { (process_method_func)daE_S1_Draw, }; -extern actor_process_profile_definition g_profile_E_S1 = { +actor_process_profile_definition g_profile_E_S1 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_sb.cpp b/src/d/actor/d_a_e_sb.cpp index 30b28d03a0..9b793f4a6d 100644 --- a/src/d/actor/d_a_e_sb.cpp +++ b/src/d/actor/d_a_e_sb.cpp @@ -257,11 +257,8 @@ static u8 hio_set; static daE_SB_HIO_c l_HIO; namespace { - /* 80784FC4-80784FC8 000094 0004+00 2/2 0/0 0/0 .bss s_Bomb__22@unnamed@d_a_e_sb_cpp@ */ static fopAc_ac_c* s_Bomb; - /* 80784FC8-80784FCC 000098 0002+02 3/5 0/0 0/0 .bss s_TargetAngle__22@unnamed@d_a_e_sb_cpp@ */ static s16 s_TargetAngle; - /* 80784FCC-80784FD0 00009C 0004+00 5/7 0/0 0/0 .bss s_LinkPos__22@unnamed@d_a_e_sb_cpp@ */ static cXyz* s_LinkPos; } @@ -1169,7 +1166,7 @@ static actor_method_class l_daE_SB_Method = { (process_method_func)daE_SB_Draw, }; -extern actor_process_profile_definition g_profile_E_SB = { +actor_process_profile_definition g_profile_E_SB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_sf.cpp b/src/d/actor/d_a_e_sf.cpp index fe1b32491c..7fb4012ee7 100644 --- a/src/d/actor/d_a_e_sf.cpp +++ b/src/d/actor/d_a_e_sf.cpp @@ -1883,7 +1883,7 @@ static actor_method_class l_daE_SF_Method = { (process_method_func)daE_SF_Draw, }; -extern actor_process_profile_definition g_profile_E_SF = { +actor_process_profile_definition g_profile_E_SF = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_sg.cpp b/src/d/actor/d_a_e_sg.cpp index 71de575d63..f65b058eb4 100644 --- a/src/d/actor/d_a_e_sg.cpp +++ b/src/d/actor/d_a_e_sg.cpp @@ -1252,7 +1252,7 @@ static actor_method_class l_daE_SG_Method = { (process_method_func)daE_SG_Draw, }; -extern actor_process_profile_definition g_profile_E_SG = { +actor_process_profile_definition g_profile_E_SG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_sh.cpp b/src/d/actor/d_a_e_sh.cpp index aae75bcccf..bda0eb701b 100644 --- a/src/d/actor/d_a_e_sh.cpp +++ b/src/d/actor/d_a_e_sh.cpp @@ -1262,7 +1262,7 @@ static actor_method_class l_daE_SH_Method = { (process_method_func)daE_SH_Draw, }; -extern actor_process_profile_definition g_profile_E_SH = { +actor_process_profile_definition g_profile_E_SH = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_sm.cpp b/src/d/actor/d_a_e_sm.cpp index 77d12e8b86..a00d3a2f62 100644 --- a/src/d/actor/d_a_e_sm.cpp +++ b/src/d/actor/d_a_e_sm.cpp @@ -461,10 +461,8 @@ static u8 hio_set; static daE_Sm_HIO_c l_HIO; namespace { - /* 807989E0-807989E4 000068 0004+00 3/4 0/0 0/0 .bss s_Dis__22@unnamed@d_a_e_sm_cpp@ */ static f32 s_Dis; - /* 807989E4-807989E8 00006C 0002+02 9/10 0/0 0/0 .bss s_TargetAngle__22@unnamed@d_a_e_sm_cpp@ */ static s16 s_TargetAngle; }; @@ -2018,7 +2016,7 @@ static actor_method_class l_daE_SM_Method = { (process_method_func)daE_SM_Draw, }; -extern actor_process_profile_definition g_profile_E_SM = { +actor_process_profile_definition g_profile_E_SM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp index 09b2dcf99c..9c02533746 100644 --- a/src/d/actor/d_a_e_sm2.cpp +++ b/src/d/actor/d_a_e_sm2.cpp @@ -1634,7 +1634,7 @@ static actor_method_class l_daE_SM2_Method = { (process_method_func)daE_SM2_Draw, }; -extern actor_process_profile_definition g_profile_E_SM2 = { +actor_process_profile_definition g_profile_E_SM2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_st.cpp b/src/d/actor/d_a_e_st.cpp index f9e054df78..41c9d2a143 100644 --- a/src/d/actor/d_a_e_st.cpp +++ b/src/d/actor/d_a_e_st.cpp @@ -3166,7 +3166,7 @@ static actor_method_class l_daE_ST_Method = { (process_method_func)daE_ST_Draw, }; -extern actor_process_profile_definition g_profile_E_ST = { +actor_process_profile_definition g_profile_E_ST = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_st_line.cpp b/src/d/actor/d_a_e_st_line.cpp index 873e70cca0..bc832b7a57 100644 --- a/src/d/actor/d_a_e_st_line.cpp +++ b/src/d/actor/d_a_e_st_line.cpp @@ -122,7 +122,7 @@ static actor_method_class l_daE_ST_LINE_Method = { (process_method_func)daE_ST_LINE_Draw, }; -extern actor_process_profile_definition g_profile_E_ST_LINE = { +actor_process_profile_definition g_profile_E_ST_LINE = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_sw.cpp b/src/d/actor/d_a_e_sw.cpp index d9e95a80b7..6f2ccf382c 100644 --- a/src/d/actor/d_a_e_sw.cpp +++ b/src/d/actor/d_a_e_sw.cpp @@ -184,23 +184,17 @@ void daE_SW_c::setHideEffect() { } namespace { - /* 807B01F8-807B01FC 000048 0004+00 1/2 0/0 0/0 .bss target_info__22@unnamed@d_a_e_sw_cpp@ */ static fopAc_ac_c* target_info; - /* 807B01FC-807B0200 00004C 0004+00 1/2 0/0 0/0 .bss target_dist__22@unnamed@d_a_e_sw_cpp@ */ static f32 target_dist; }; -/* 807B0200 */ static u8 data_807B0200; -/* 807B0201 */ static u8 data_807B0201; -/* 807B0202 */ static u8 data_807B0202; -/* 807B0203 0001+00 data_807B0203 None */ static u8 hio_set; void daE_SW_c::setActionMode(s16 i_actionMode, s16 i_moveMode) { @@ -1808,7 +1802,7 @@ static actor_method_class l_daE_SW_Method = { (process_method_func)daE_SW_Draw, }; -extern actor_process_profile_definition g_profile_E_SW = { +actor_process_profile_definition g_profile_E_SW = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_th.cpp b/src/d/actor/d_a_e_th.cpp index f62aa40fbd..896a465ea1 100644 --- a/src/d/actor/d_a_e_th.cpp +++ b/src/d/actor/d_a_e_th.cpp @@ -1307,7 +1307,7 @@ static actor_method_class l_daE_TH_Method = { (process_method_func)daE_TH_Draw, }; -extern actor_process_profile_definition g_profile_E_TH = { +actor_process_profile_definition g_profile_E_TH = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_th_ball.cpp b/src/d/actor/d_a_e_th_ball.cpp index b53ba952ce..a6fad3bbaa 100644 --- a/src/d/actor/d_a_e_th_ball.cpp +++ b/src/d/actor/d_a_e_th_ball.cpp @@ -1123,7 +1123,7 @@ static actor_method_class l_daE_TH_BALL_Method = { (process_method_func)daE_TH_BALL_Draw, }; -extern actor_process_profile_definition g_profile_E_TH_BALL = { +actor_process_profile_definition g_profile_E_TH_BALL = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_tk.cpp b/src/d/actor/d_a_e_tk.cpp index 6b8c949127..1531055bee 100644 --- a/src/d/actor/d_a_e_tk.cpp +++ b/src/d/actor/d_a_e_tk.cpp @@ -747,7 +747,7 @@ static actor_method_class l_daE_TK_Method = { (process_method_func)daE_TK_Draw, }; -extern actor_process_profile_definition g_profile_E_TK = { +actor_process_profile_definition g_profile_E_TK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_tk2.cpp b/src/d/actor/d_a_e_tk2.cpp index 3a8ad757b0..9c85a529c6 100644 --- a/src/d/actor/d_a_e_tk2.cpp +++ b/src/d/actor/d_a_e_tk2.cpp @@ -551,7 +551,7 @@ static actor_method_class l_daE_TK2_Method = { (process_method_func)daE_TK2_Draw, }; -extern actor_process_profile_definition g_profile_E_TK2 = { +actor_process_profile_definition g_profile_E_TK2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_tk_ball.cpp b/src/d/actor/d_a_e_tk_ball.cpp index 2942bc4556..4429670d69 100644 --- a/src/d/actor/d_a_e_tk_ball.cpp +++ b/src/d/actor/d_a_e_tk_ball.cpp @@ -436,7 +436,7 @@ static actor_method_class l_daE_TK_BALL_Method = { (process_method_func)daE_TK_BALL_Draw, }; -extern actor_process_profile_definition g_profile_E_TK_BALL = { +actor_process_profile_definition g_profile_E_TK_BALL = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_tt.cpp b/src/d/actor/d_a_e_tt.cpp index d4baf9725f..45e95c5690 100644 --- a/src/d/actor/d_a_e_tt.cpp +++ b/src/d/actor/d_a_e_tt.cpp @@ -1319,7 +1319,7 @@ static actor_method_class l_daE_TT_Method = { (process_method_func)daE_TT_Draw, }; -extern actor_process_profile_definition g_profile_E_TT = { +actor_process_profile_definition g_profile_E_TT = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index 11c74e8cfc..98edc800bc 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -204,7 +204,6 @@ daE_VA_HIO_c::daE_VA_HIO_c() { mKRegLightA = 210.0f; } -/* 807CF4B5 0003+00 data_807CF4B5 None */ #pragma push #pragma force_active on static u8 hio_set; @@ -3901,7 +3900,7 @@ static actor_method_class l_daE_VA_Method = { (process_method_func)daE_VA_Draw, }; -extern actor_process_profile_definition g_profile_E_VT = { +actor_process_profile_definition g_profile_E_VT = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_warpappear.cpp b/src/d/actor/d_a_e_warpappear.cpp index 9b466bc1d2..07a7b71d11 100644 --- a/src/d/actor/d_a_e_warpappear.cpp +++ b/src/d/actor/d_a_e_warpappear.cpp @@ -895,7 +895,7 @@ static actor_method_class l_daE_Warpappear_Method = { (process_method_func)daE_Warpappear_Draw, }; -extern actor_process_profile_definition g_profile_E_WAP = { +actor_process_profile_definition g_profile_E_WAP = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index f6b24f569c..055e882782 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -5819,7 +5819,7 @@ static actor_method_class l_daE_WB_Method = { (process_method_func)daE_WB_Draw, }; -extern actor_process_profile_definition g_profile_E_WB = { +actor_process_profile_definition g_profile_E_WB = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ws.cpp b/src/d/actor/d_a_e_ws.cpp index ac4e851412..2a9920ddd4 100644 --- a/src/d/actor/d_a_e_ws.cpp +++ b/src/d/actor/d_a_e_ws.cpp @@ -984,7 +984,7 @@ static actor_method_class l_daE_WS_Method = { (process_method_func)daE_WS_Draw, }; -extern actor_process_profile_definition g_profile_E_WS = { +actor_process_profile_definition g_profile_E_WS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ww.cpp b/src/d/actor/d_a_e_ww.cpp index d57f6c23cc..dc750410a2 100644 --- a/src/d/actor/d_a_e_ww.cpp +++ b/src/d/actor/d_a_e_ww.cpp @@ -118,7 +118,6 @@ public: }; namespace { - /* 807EF904-807EF944 000038 0040+00 1/1 0/0 0/0 .data cc_ww_src__22@unnamed@d_a_e_ww_cpp@ */ dCcD_SrcSph cc_ww_src = { { {0x0, {{0x400, 0x1, 0xC}, {0x0, 0x0}, 0x75}}, // mObj @@ -131,7 +130,6 @@ namespace { } // mSphAttr }; - /* 807EF944-807EF984 000078 0040+00 1/1 0/0 0/0 .data cc_ww_tg_src__22@unnamed@d_a_e_ww_cpp@ */ dCcD_SrcSph cc_ww_tg_src = { { {0x0, {{0x0, 0x1, 0x0}, {0xD8FBFDFF, 0x43}, 0x0}}, // mObj @@ -2306,7 +2304,7 @@ static actor_method_class l_daE_WW_Method = { (process_method_func)daE_WW_Draw, }; -extern actor_process_profile_definition g_profile_E_WW = { +actor_process_profile_definition g_profile_E_WW = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_yc.cpp b/src/d/actor/d_a_e_yc.cpp index 8395641bca..7dc53234c4 100644 --- a/src/d/actor/d_a_e_yc.cpp +++ b/src/d/actor/d_a_e_yc.cpp @@ -834,7 +834,7 @@ static actor_method_class l_daE_YC_Method = { (process_method_func)daE_YC_Draw, }; -extern actor_process_profile_definition g_profile_E_YC = { +actor_process_profile_definition g_profile_E_YC = { fpcLy_CURRENT_e, 4, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_yd.cpp b/src/d/actor/d_a_e_yd.cpp index 042af178ab..bd54664088 100644 --- a/src/d/actor/d_a_e_yd.cpp +++ b/src/d/actor/d_a_e_yd.cpp @@ -1492,7 +1492,7 @@ static actor_method_class l_daE_YD_Method = { (process_method_func)daE_YD_Draw, }; -extern actor_process_profile_definition g_profile_E_YD = { +actor_process_profile_definition g_profile_E_YD = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_yd_leaf.cpp b/src/d/actor/d_a_e_yd_leaf.cpp index 31e26716a1..dbcc9a2f93 100644 --- a/src/d/actor/d_a_e_yd_leaf.cpp +++ b/src/d/actor/d_a_e_yd_leaf.cpp @@ -94,7 +94,7 @@ static actor_method_class l_daE_YD_LEAF_Method = { (process_method_func)daE_YD_LEAF_Draw, }; -extern actor_process_profile_definition g_profile_E_YD_LEAF = { +actor_process_profile_definition g_profile_E_YD_LEAF = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_yg.cpp b/src/d/actor/d_a_e_yg.cpp index 45e10382fe..7bc63dfba9 100644 --- a/src/d/actor/d_a_e_yg.cpp +++ b/src/d/actor/d_a_e_yg.cpp @@ -1446,7 +1446,7 @@ static actor_method_class l_daE_YG_Method = { (process_method_func)daE_YG_Draw, }; -extern actor_process_profile_definition g_profile_E_YG = { +actor_process_profile_definition g_profile_E_YG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_yh.cpp b/src/d/actor/d_a_e_yh.cpp index 93bb9e7f5d..79d344eb51 100644 --- a/src/d/actor/d_a_e_yh.cpp +++ b/src/d/actor/d_a_e_yh.cpp @@ -2257,7 +2257,7 @@ static actor_method_class l_daE_YH_Method = { (process_method_func)daE_YH_Draw, }; -extern actor_process_profile_definition g_profile_E_YH = { +actor_process_profile_definition g_profile_E_YH = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_yk.cpp b/src/d/actor/d_a_e_yk.cpp index 78a92833f0..33d293d5f7 100644 --- a/src/d/actor/d_a_e_yk.cpp +++ b/src/d/actor/d_a_e_yk.cpp @@ -158,7 +158,6 @@ static int daE_YK_Draw(e_yk_class* i_this) { * Used by the Shadow Keese's wind state to determine if it should be affected * by a charged boomerang's wind effect. */ - /* 80804B38-80804BB0 0003F8 0078+00 1/1 0/0 0/0 .text shot_b_sub__FPvPv */ static void* shot_b_sub(void* i_actor, void* param_1) { if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_BOOMERANG && !dComIfGp_checkPlayerStatus0(0,0x80000) && @@ -1558,7 +1557,7 @@ static actor_method_class l_daE_YK_Method = { (process_method_func)daE_YK_Draw, }; -extern actor_process_profile_definition g_profile_E_YK = { +actor_process_profile_definition g_profile_E_YK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp index c96dc6865e..81a24edf3a 100644 --- a/src/d/actor/d_a_e_ym.cpp +++ b/src/d/actor/d_a_e_ym.cpp @@ -3503,7 +3503,7 @@ static actor_method_class l_daE_YM_Method = { (process_method_func)daE_YM_Draw, }; -extern actor_process_profile_definition g_profile_E_YM = { +actor_process_profile_definition g_profile_E_YM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ym_tag.cpp b/src/d/actor/d_a_e_ym_tag.cpp index 0674464aa7..fd607a778e 100644 --- a/src/d/actor/d_a_e_ym_tag.cpp +++ b/src/d/actor/d_a_e_ym_tag.cpp @@ -68,7 +68,7 @@ static actor_method_class l_daE_YM_TAG_Method = { (process_method_func)daE_YM_TAG_Draw }; -extern actor_process_profile_definition g_profile_E_YM_TAG = { +actor_process_profile_definition g_profile_E_YM_TAG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp index a01a3f1981..0bbc284203 100644 --- a/src/d/actor/d_a_e_ymb.cpp +++ b/src/d/actor/d_a_e_ymb.cpp @@ -170,7 +170,6 @@ enum Particle { }; namespace { - /* 80821B30-80821B70 000020 0040+00 0/1 0/0 0/0 .data cc_ymb_src__23@unnamed@d_a_e_ymb_cpp@ */ static dCcD_SrcSph cc_ymb_src = { {{0x0, {{AT_TYPE_CSTATUE_SWING, 0x2, 0xD}, {0xD8FBFDFF, 0x3}, 0x75}}, // mObj {dCcD_SE_METAL, 0x0, 0x1, 0x7, 0x0}, // mGObjAt @@ -182,7 +181,6 @@ namespace { } // mSphAttr }; - /* 80821B70-80821BB0 000060 0040+00 0/1 0/0 0/0 .data cc_ymb_at_src__23@unnamed@d_a_e_ymb_cpp@ */ static dCcD_SrcSph cc_ymb_at_src = { {{0x0, {{AT_TYPE_CSTATUE_SWING, 0x2, 0xD}, {0xD8FBFDFF, 0x0}, 0x0}}, // mObj {dCcD_SE_METAL, 0x0, 0x1, 0x7, 0x0}, // mGObjAt @@ -194,7 +192,6 @@ namespace { } // mSphAttr }; - /* 80821BB0-80821BF0 0000A0 0040+00 0/1 0/0 0/0 .data cc_ymb_eye_src__23@unnamed@d_a_e_ymb_cpp@ */ static dCcD_SrcSph cc_ymb_eye_src = { {{0x0, {{AT_TYPE_0, 0x0, 0x0}, {0x80000000, 0x3}, 0x0}}, // mObj {dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -206,7 +203,6 @@ namespace { } // mSphAttr }; - /* 80821BF0-80821C30 0000E0 0040+00 0/1 0/0 0/0 .data cc_ymb_tube_src__23@unnamed@d_a_e_ymb_cpp@ */ static dCcD_SrcSph cc_ymb_tube_src = { {{0x0, {{AT_TYPE_0, 0x0, 0x0}, {0xD8FBFDFF, 0x2}, 0x75}}, // mObj {dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -217,12 +213,10 @@ namespace { } // mSphAttr }; - /* 80821C30-80821C48 000120 0018+00 3/4 0/0 0/0 .data YMB_DOWN_ATT_JNT__23@unnamed@d_a_e_ymb_cpp@ */ static int YMB_DOWN_ATT_JNT[6] = { JNT_TUBE_LC2, JNT_TUBE_RA2, JNT_TUBE_LB2, JNT_TUBE_RC2, JNT_TUBE_LA2, JNT_TUBE_RB2, }; - /* 80821C48-80821C54 000138 000C+00 0/0 0/0 0/0 .data YMB_DROP_JNT__23@unnamed@d_a_e_ymb_cpp@ */ static int YMB_DROP_JNT[3] = { JNT_TUBE_LC2, JNT_TUBE_RA2, JNT_BODY1, }; @@ -625,7 +619,6 @@ void daE_YMB_c::setElecEffect2() { } namespace { - /* 80821F38-80821FEC 000128 00B4+00 4/5 0/0 0/0 .bss YMB_DOWN_POS__23@unnamed@d_a_e_ymb_cpp@ */ static cXyz YMB_DOWN_POS[15] = { cXyz(-88457.0f, -18786.0f, 42166.0f), cXyz(-89307.0f, -18786.0f, 41366.0f), @@ -3252,7 +3245,7 @@ static actor_method_class l_daE_YMB_Method = { (process_method_func)daE_YMB_Draw, }; -extern actor_process_profile_definition g_profile_E_YMB = { +actor_process_profile_definition g_profile_E_YMB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_yr.cpp b/src/d/actor/d_a_e_yr.cpp index a2af66423f..379df6c34d 100644 --- a/src/d/actor/d_a_e_yr.cpp +++ b/src/d/actor/d_a_e_yr.cpp @@ -2569,7 +2569,7 @@ static actor_method_class l_daE_Yr_Method = { (process_method_func)daE_Yr_Draw, }; -extern actor_process_profile_definition g_profile_E_YR = { +actor_process_profile_definition g_profile_E_YR = { (u32)fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index 5ad7c499ae..6451a2ac38 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -84,7 +84,6 @@ namespace { } }; - /* 8082F480-8082F4C4 000060 0044+00 0/1 0/0 0/0 .data cc_zhCyl_src__22@unnamed@d_a_e_zh_cpp@ */ static dCcD_SrcCyl cc_zhCyl_src = { { {0, {{AT_TYPE_0, 0, 0}, {0xD84860BA, 3}, 0x15}}, @@ -97,7 +96,6 @@ namespace { } }; - /* 8082F4C4-8082F508 0000A4 0044+00 0/1 0/0 0/0 .data cc_zhCyl_at_src__22@unnamed@d_a_e_zh_cpp@ */ static dCcD_SrcCyl cc_zhCyl_at_src = { { {0, {{AT_TYPE_CSTATUE_SWING, 4, 0xD}, {0, 0}, 0}}, @@ -121,7 +119,6 @@ daE_ZH_HIO_c::daE_ZH_HIO_c() { dungeon_bit_check = 0; } -/* 8082F725 0003+00 data_8082F725 None */ static u8 hio_set; static daE_ZH_HIO_c l_HIO; @@ -2333,7 +2330,7 @@ static actor_method_class l_daE_ZH_Method = { (process_method_func)daE_ZH_Draw, }; -extern actor_process_profile_definition g_profile_E_ZH = { +actor_process_profile_definition g_profile_E_ZH = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_zm.cpp b/src/d/actor/d_a_e_zm.cpp index d1c3287dc2..8fa15b01f4 100644 --- a/src/d/actor/d_a_e_zm.cpp +++ b/src/d/actor/d_a_e_zm.cpp @@ -70,7 +70,6 @@ static u8 hio_set; static daE_ZM_HIO_c l_HIO; namespace { - /* 80832DFC-80832E40 000038 0044+00 1/1 0/0 0/0 .data cc_zm_src__22@unnamed@d_a_e_zm_cpp@ */ static dCcD_SrcCyl cc_zm_src = { { {0, {{AT_TYPE_0, 0, 0}, {0xD8FBFDFF, 0x43}, 0x45}}, @@ -83,7 +82,6 @@ namespace { }, }; - /* 80832E40-80832E80 00007C 0040+00 1/1 0/0 0/0 .data cc_zm_at_src__22@unnamed@d_a_e_zm_cpp@ */ static dCcD_SrcSph cc_zm_at_src = { { {0, {{AT_TYPE_CSTATUE_SWING, 2, 0xD}, {0xD8FBFDFF, 0x43}, 0}}, @@ -1032,7 +1030,7 @@ static actor_method_class l_daE_ZM_Method = { (process_method_func)daE_ZM_Draw, }; -extern actor_process_profile_definition g_profile_E_ZM = { +actor_process_profile_definition g_profile_E_ZM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_zs.cpp b/src/d/actor/d_a_e_zs.cpp index ad7d54b790..cba87d9373 100644 --- a/src/d/actor/d_a_e_zs.cpp +++ b/src/d/actor/d_a_e_zs.cpp @@ -567,7 +567,7 @@ static actor_method_class l_daE_ZS_Method = { (process_method_func)daE_ZS_Draw, }; -extern actor_process_profile_definition g_profile_E_ZS = { +actor_process_profile_definition g_profile_E_ZS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_econt.cpp b/src/d/actor/d_a_econt.cpp index 1d2fd1c680..cdfe48bc51 100644 --- a/src/d/actor/d_a_econt.cpp +++ b/src/d/actor/d_a_econt.cpp @@ -79,7 +79,7 @@ static actor_method_class l_daEcont_Method = { (process_method_func)daEcont_Draw }; -extern actor_process_profile_definition g_profile_ECONT = { +actor_process_profile_definition g_profile_ECONT = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp index 926304e509..f2a1c2aae1 100644 --- a/src/d/actor/d_a_ep.cpp +++ b/src/d/actor/d_a_ep.cpp @@ -954,7 +954,7 @@ static actor_method_class l_daEp_Method = { (process_method_func)daEp_Draw, }; -extern actor_process_profile_definition g_profile_EP = { +actor_process_profile_definition g_profile_EP = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_formation_mng.cpp b/src/d/actor/d_a_formation_mng.cpp index cd9cf50107..531172731b 100644 --- a/src/d/actor/d_a_formation_mng.cpp +++ b/src/d/actor/d_a_formation_mng.cpp @@ -394,7 +394,7 @@ static actor_method_class l_daFmtMng_Method = { (process_method_func)daFmtMng_Draw, }; -extern actor_process_profile_definition g_profile_FORMATION_MNG = { +actor_process_profile_definition g_profile_FORMATION_MNG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_fr.cpp b/src/d/actor/d_a_fr.cpp index 905f49b16e..4dbe0d2a74 100644 --- a/src/d/actor/d_a_fr.cpp +++ b/src/d/actor/d_a_fr.cpp @@ -83,7 +83,7 @@ static void sibuki_set(fr_class* i_this) { } static void* s_wd_sub(void* param_1, void* param_2) { - (void)param_2; + UNUSED(param_2); if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_OBJ_LP) { return param_1; } @@ -739,7 +739,7 @@ static actor_method_class l_daFr_Method = { (process_method_func)daFr_Draw, }; -extern actor_process_profile_definition g_profile_FR = { +actor_process_profile_definition g_profile_FR = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index 937522c05c..83fe7c78d2 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -400,7 +400,7 @@ static actor_method_class daGrass_METHODS = { (process_method_func)daGrass_draw, }; -extern actor_process_profile_definition g_profile_GRASS = { +actor_process_profile_definition g_profile_GRASS = { fpcLy_CURRENT_e, // mLayerID 11, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_guard_mng.cpp b/src/d/actor/d_a_guard_mng.cpp index c104f603ce..e70f82388f 100644 --- a/src/d/actor/d_a_guard_mng.cpp +++ b/src/d/actor/d_a_guard_mng.cpp @@ -66,7 +66,7 @@ static actor_method_class l_daGuardMng_Method = { (process_method_func)daGuardMng_IsDelete }; -extern actor_process_profile_definition g_profile_GUARD_MNG = { +actor_process_profile_definition g_profile_GUARD_MNG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_hitobj.cpp b/src/d/actor/d_a_hitobj.cpp index 9333b1617f..1e39edf37f 100644 --- a/src/d/actor/d_a_hitobj.cpp +++ b/src/d/actor/d_a_hitobj.cpp @@ -73,7 +73,7 @@ static actor_method_class l_daHitobj_Method = { (process_method_func)daHitobj_Draw }; -extern actor_process_profile_definition g_profile_HITOBJ = { +actor_process_profile_definition g_profile_HITOBJ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index 73c2af65eb..688e997f13 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -351,21 +351,21 @@ void daHorse_c::coHitCallbackCowHit(fopAc_ac_c* i_hitActor) { static void daHorse_coHitCallbackBoarJump(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA, fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) { - (void)i_coObjInfA; - (void)i_coObjInfB; + UNUSED(i_coObjInfA); + UNUSED(i_coObjInfB); ((daHorse_c*)i_coActorA)->coHitCallbackBoarJump(i_coActorB); } static void daHorse_coHitCallbackCowHit(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA, fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) { - (void)i_coObjInfA; - (void)i_coObjInfB; + UNUSED(i_coObjInfA); + UNUSED(i_coObjInfB); ((daHorse_c*)i_coActorA)->coHitCallbackCowHit(i_coActorB); } static void daHorse_coHitCallbackAll(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA, fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) { - (void)i_coObjInfA; + UNUSED(i_coObjInfA); daHorse_c* a_this = (daHorse_c*)i_coActorA; a_this->coHitCallbackBoarJump(i_coActorB); @@ -2159,7 +2159,7 @@ void daHorse_c::setMatrix() { var_f30 = 0.5f + ((0.5f * speedF) / m_lashMaxSpeedF); } - var_r29 = 4.0f * var_f30 * ((500.0f / (f32)field_0x16c2) * (f32)(s16)(field_0x16e8 - shape_angle.y)); + var_r29 = 4.0f * var_f30 * ((500.0f / (f32)field_0x16c2) * (s16)(field_0x16e8 - shape_angle.y)); var_r27 = -var_r29; } @@ -4218,7 +4218,7 @@ void daHorse_c::searchSceneChangeArea(fopAc_ac_c* i_scnChg) { } static void* daHorse_searchSceneChangeArea(fopAc_ac_c* i_actor, void* i_data) { - (void)i_data; + UNUSED(i_data); dComIfGp_getHorseActor()->searchSceneChangeArea(i_actor); return NULL; } @@ -4546,7 +4546,7 @@ static actor_method_class l_daHorse_Method = { (process_method_func)daHorse_Draw, }; -extern actor_process_profile_definition g_profile_HORSE = { +actor_process_profile_definition g_profile_HORSE = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_hozelda.cpp b/src/d/actor/d_a_hozelda.cpp index 238aadc051..3364fd3989 100644 --- a/src/d/actor/d_a_hozelda.cpp +++ b/src/d/actor/d_a_hozelda.cpp @@ -23,7 +23,7 @@ void daHoZelda_hio_c::genMessage(JORMContext* context) { #endif static void* daHoZelda_searchGanon(fopAc_ac_c* i_actor, void* i_data) { - (void)i_data; + UNUSED(i_data); if (fopAcM_GetName(i_actor) == PROC_B_GND) { return i_actor; } @@ -938,7 +938,7 @@ static actor_method_class l_daHoZelda_Method = { (process_method_func)daHoZelda_Draw, }; -extern actor_process_profile_definition g_profile_HOZELDA = { +actor_process_profile_definition g_profile_HOZELDA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_izumi_gate.cpp b/src/d/actor/d_a_izumi_gate.cpp index 56fb335851..a7b79021df 100644 --- a/src/d/actor/d_a_izumi_gate.cpp +++ b/src/d/actor/d_a_izumi_gate.cpp @@ -92,7 +92,7 @@ static actor_method_class l_daIzumiGate_Method = { (process_method_func)daIzumiGate_Draw, }; -extern actor_process_profile_definition g_profile_Izumi_Gate = { +actor_process_profile_definition g_profile_Izumi_Gate = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index 501c036429..494f85bd72 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -1740,8 +1740,12 @@ void daKago_c::initPerchDemo() { } cXyz cStack_54 = dPath_GetPnt(mpPath2, local_80)->m_position; - s16 temp = (s16)sVar5 - cLib_targetAngleY(¤t.pos, &cStack_48); - sVar5 = temp < 0 ? (s16)((s16)sVar5 - 0x1000) : (s16)((s16)sVar5 + 0x1000); // fakematch + s16 sp08 = cLib_targetAngleY(¤t.pos, &cStack_48); + if ((s16)(sVar5 - sp08) < 0) { + sVar5 = sVar5 - 0x1000; + } else { + sVar5 = sVar5 + 0x1000; + } shape_angle.y = current.angle.y = sVar5; shape_angle.x = shape_angle.z = 0; @@ -3892,7 +3896,7 @@ static actor_method_class l_daKago_Method = { (process_method_func)daKago_Draw, }; -extern actor_process_profile_definition g_profile_KAGO = { +actor_process_profile_definition g_profile_KAGO = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp index d47ff1d337..00416444ed 100644 --- a/src/d/actor/d_a_kytag00.cpp +++ b/src/d/actor/d_a_kytag00.cpp @@ -465,7 +465,7 @@ static actor_method_class l_daKytag00_Method = { (process_method_func)daKytag00_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG00 = { +actor_process_profile_definition g_profile_KYTAG00 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp index cf4a87022c..2025f6acf1 100644 --- a/src/d/actor/d_a_kytag01.cpp +++ b/src/d/actor/d_a_kytag01.cpp @@ -81,7 +81,7 @@ static void mist_tag_move(kytag01_class* i_this) { s16 var_r29_2 = cM_atan2s(sp98.x, sp98.z); s16 var_r26 = cM_atan2s(spA4.x, spA4.z); - f32 temp_f2_2 = 1.0f - ((f32)(s16)abs((s16)(var_r29_2 - var_r26)) / 32768.0f); + f32 temp_f2_2 = 1.0f - ((s16)abs((s16)(var_r29_2 - var_r26)) / 32768.0f); temp_f2_2 *= temp_f2_2 * temp_f2_2 * temp_f2_2; f32 var_f3 = 1.0f - temp_f2_2; @@ -221,7 +221,7 @@ static actor_method_class l_daKytag01_Method = { (process_method_func)daKytag01_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG01 = { +actor_process_profile_definition g_profile_KYTAG01 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag02.cpp b/src/d/actor/d_a_kytag02.cpp index 76e9bd75f1..c8df0868b6 100644 --- a/src/d/actor/d_a_kytag02.cpp +++ b/src/d/actor/d_a_kytag02.cpp @@ -136,7 +136,7 @@ static actor_method_class l_daKytag02_Method = { (process_method_func)daKytag02_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG02 = { +actor_process_profile_definition g_profile_KYTAG02 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp index b56751e054..b1a5c745ea 100644 --- a/src/d/actor/d_a_kytag03.cpp +++ b/src/d/actor/d_a_kytag03.cpp @@ -456,7 +456,7 @@ static actor_method_class l_daKytag03_Method = { (process_method_func)daKytag03_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG03 = { +actor_process_profile_definition g_profile_KYTAG03 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index 093ba53aa7..173564854a 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/src/d/actor/d_a_kytag04.cpp @@ -359,7 +359,7 @@ static actor_method_class l_daKytag04_Method = { (process_method_func)daKytag04_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG04 = { +actor_process_profile_definition g_profile_KYTAG04 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index 52ec6d912a..fe66630bdd 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -46,7 +46,7 @@ static actor_method_class l_daKytag05_Method = { (process_method_func)daKytag05_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG05 = { +actor_process_profile_definition g_profile_KYTAG05 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index 35e3ba1803..7271bcf924 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -1193,7 +1193,7 @@ static actor_method_class l_daKytag06_Method = { (process_method_func)daKytag06_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG06 = { +actor_process_profile_definition g_profile_KYTAG06 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag07.cpp b/src/d/actor/d_a_kytag07.cpp index 1ad9c00095..aa98dea057 100644 --- a/src/d/actor/d_a_kytag07.cpp +++ b/src/d/actor/d_a_kytag07.cpp @@ -67,7 +67,7 @@ static actor_method_class l_daKytag07_Method = { (process_method_func)daKytag07_Execute, (process_method_func)daKytag07_IsDelete, (process_method_func)daKytag07_Draw}; -extern actor_process_profile_definition g_profile_KYTAG07 = { +actor_process_profile_definition g_profile_KYTAG07 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_kytag08.cpp b/src/d/actor/d_a_kytag08.cpp index a72b3480ce..3343b08c7e 100644 --- a/src/d/actor/d_a_kytag08.cpp +++ b/src/d/actor/d_a_kytag08.cpp @@ -273,7 +273,7 @@ static actor_method_class l_daKytag08_Method = { (process_method_func)daKytag08_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG08 = { +actor_process_profile_definition g_profile_KYTAG08 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag09.cpp b/src/d/actor/d_a_kytag09.cpp index c94700f27c..39a6edbed7 100644 --- a/src/d/actor/d_a_kytag09.cpp +++ b/src/d/actor/d_a_kytag09.cpp @@ -144,7 +144,7 @@ static actor_method_class l_daKytag09_Method = { (process_method_func)daKytag09_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG09 = { +actor_process_profile_definition g_profile_KYTAG09 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag10.cpp b/src/d/actor/d_a_kytag10.cpp index 003443f6dd..57db98a16e 100644 --- a/src/d/actor/d_a_kytag10.cpp +++ b/src/d/actor/d_a_kytag10.cpp @@ -206,7 +206,7 @@ static actor_method_class l_daKytag10_Method = { (process_method_func)daKytag10_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG10 = { +actor_process_profile_definition g_profile_KYTAG10 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag11.cpp b/src/d/actor/d_a_kytag11.cpp index 65b1b1ee68..baa4776485 100644 --- a/src/d/actor/d_a_kytag11.cpp +++ b/src/d/actor/d_a_kytag11.cpp @@ -113,7 +113,7 @@ static actor_method_class l_daKytag11_Method = { (process_method_func)daKytag11_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG11 = { +actor_process_profile_definition g_profile_KYTAG11 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag12.cpp b/src/d/actor/d_a_kytag12.cpp index 3b46a25c20..4cea546573 100644 --- a/src/d/actor/d_a_kytag12.cpp +++ b/src/d/actor/d_a_kytag12.cpp @@ -1026,7 +1026,7 @@ static actor_method_class l_daKytag12_Method = { (process_method_func)daKytag12_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG12 = { +actor_process_profile_definition g_profile_KYTAG12 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_kytag13.cpp b/src/d/actor/d_a_kytag13.cpp index 82b840b6f0..7af7ae597d 100644 --- a/src/d/actor/d_a_kytag13.cpp +++ b/src/d/actor/d_a_kytag13.cpp @@ -387,7 +387,7 @@ static actor_method_class l_daKytag13_Method = { (process_method_func)daKytag13_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG13 = { +actor_process_profile_definition g_profile_KYTAG13 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_kytag14.cpp b/src/d/actor/d_a_kytag14.cpp index faee63a4e4..66343d2656 100644 --- a/src/d/actor/d_a_kytag14.cpp +++ b/src/d/actor/d_a_kytag14.cpp @@ -108,7 +108,7 @@ static actor_method_class l_daKytag14_Method = { (process_method_func)daKytag14_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG14 = { +actor_process_profile_definition g_profile_KYTAG14 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag15.cpp b/src/d/actor/d_a_kytag15.cpp index acef46bd3d..dd5abd20a6 100644 --- a/src/d/actor/d_a_kytag15.cpp +++ b/src/d/actor/d_a_kytag15.cpp @@ -128,7 +128,7 @@ static actor_method_class l_daKytag15_Method = { (process_method_func)daKytag15_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG15 = { +actor_process_profile_definition g_profile_KYTAG15 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag16.cpp b/src/d/actor/d_a_kytag16.cpp index ad150e18e9..9e05cd5778 100644 --- a/src/d/actor/d_a_kytag16.cpp +++ b/src/d/actor/d_a_kytag16.cpp @@ -165,7 +165,7 @@ static actor_method_class l_daKytag16_Method = { (process_method_func)daKytag16_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG16 = { +actor_process_profile_definition g_profile_KYTAG16 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag17.cpp b/src/d/actor/d_a_kytag17.cpp index ac5f775c7c..128763f2c2 100644 --- a/src/d/actor/d_a_kytag17.cpp +++ b/src/d/actor/d_a_kytag17.cpp @@ -39,7 +39,7 @@ static actor_method_class l_daKytag17_Method = { (process_method_func)daKytag17_Execute, (process_method_func)daKytag17_IsDelete, (process_method_func)daKytag17_Draw}; -extern actor_process_profile_definition g_profile_KYTAG17 = { +actor_process_profile_definition g_profile_KYTAG17 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_mant.cpp b/src/d/actor/d_a_mant.cpp index 302a110843..af433d0a77 100644 --- a/src/d/actor/d_a_mant.cpp +++ b/src/d/actor/d_a_mant.cpp @@ -151,9 +151,6 @@ static u32 l_normal[3] = { 0x00000000, 0x3F800000, 0x00000000, }; -// /* 8086BF70-8086BF74 000000 0004+00 3/3 0/0 0/0 .bss None */ -// static u8 data_8086BF70[4]; - static u32 l_texCoord[338] = { 0x00000000, 0x3F6AAAB0, 0x3DAAAA7E, 0x3F6AAAB0, 0x3DAAAA7E, 0x3F800000, 0x00000000, 0x3F800000, @@ -811,7 +808,7 @@ static actor_method_class l_daMant_Method = { (process_method_func)daMant_Draw, }; -extern actor_process_profile_definition g_profile_MANT = { +actor_process_profile_definition g_profile_MANT = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_mg_fish.cpp b/src/d/actor/d_a_mg_fish.cpp index c5ed70b740..c06414c452 100644 --- a/src/d/actor/d_a_mg_fish.cpp +++ b/src/d/actor/d_a_mg_fish.cpp @@ -673,7 +673,7 @@ s32 daMg_Fish_Draw(mg_fish_class* i_this) { i_this->actor.current.pos.z); i_this->mShadowId = dComIfGd_setShadow(i_this->mShadowId, 1, i_model, &pos, 600.0f * i_this->mJointScale, 0.0f, - i_this->actor.current.pos.y, i_this->mAcch.m_ground_h, i_this->mAcch.m_gnd, + i_this->actor.current.pos.y, i_this->mAcch.GetGroundH(), i_this->mAcch.m_gnd, &i_this->actor.tevStr, 0, 1.0f, &dDlst_shadowControl_c::mSimpleTexObj); } if (i_this->mKind2 == 3) { @@ -1039,7 +1039,7 @@ static void mf_away(mg_fish_class* i_this) { break; case 5: if (i_this->mGedouKind < GEDOU_KIND_BG) { - if ((i_this->mAcch.m_flags & (1 << 4)) != 0) { + if (i_this->mAcch.ChkWallHit()) { if (i_this->field_0x624[1] == 0) { i_this->mActionPhase = 0; i_this->field_0x624[1] = 40; @@ -1982,7 +1982,7 @@ static void mf_jump(mg_fish_class* i_this) { i_this->mMaxStep = 0x600; i_this->actor.current.pos += i_this->field_0x5e0; i_this->field_0x5e0.y = i_this->field_0x5e0.y - 2.0f; - if ((i_this->mAcch.m_flags & 0x20) != 0) { + if (i_this->mAcch.ChkGroundHit()) { i_this->actor.current.pos.x = i_this->actor.old.pos.x; i_this->actor.current.pos.y = i_this->actor.old.pos.y; i_this->actor.current.pos.z = i_this->actor.old.pos.z; @@ -3760,7 +3760,6 @@ static int useHeapImg_fisht(fopAc_ac_c* i_actor) { } static int daMg_Fish_Create(fopAc_ac_c* i_this) { - /* 805369FC-80536A40 000558 0044+00 0/1 0/0 0/0 .data cc_cyl_src$8395 */ static dCcD_SrcCyl cc_cyl_src = { { { 0x0, { { 0x0, 0x0, 0x0 }, { 0x0, 0x0 }, 0x75 } }, // mObj @@ -4059,7 +4058,7 @@ static actor_method_class l_daMg_Fish_Method = { (process_method_func)daMg_Fish_Draw, }; -extern actor_process_profile_definition g_profile_MG_FISH = { +actor_process_profile_definition g_profile_MG_FISH = { (uint)fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_mg_fshop.cpp b/src/d/actor/d_a_mg_fshop.cpp index 99af4761d4..995979031c 100644 --- a/src/d/actor/d_a_mg_fshop.cpp +++ b/src/d/actor/d_a_mg_fshop.cpp @@ -1680,7 +1680,7 @@ static actor_method_class l_daFshop_Method = { (process_method_func)daFshop_Draw, }; -extern actor_process_profile_definition g_profile_FSHOP = { +actor_process_profile_definition g_profile_FSHOP = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index 4d0b3c64a3..aa85bfcfdb 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -519,7 +519,6 @@ static void rod_main(dmg_rod_class* i_this) { static npc_henna_class* henna; -/* 804BBBD4 0001+00 data_804BBBD4 None */ static u8 data_804BBBD4; static u8 hio_set; @@ -6353,7 +6352,7 @@ static actor_method_class l_dmg_rod_Method = { (process_method_func)dmg_rod_Draw, }; -extern actor_process_profile_definition g_profile_MG_ROD = { +actor_process_profile_definition g_profile_MG_ROD = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_midna.cpp b/src/d/actor/d_a_midna.cpp index 4bb6ee25ed..a906af3f97 100644 --- a/src/d/actor/d_a_midna.cpp +++ b/src/d/actor/d_a_midna.cpp @@ -3597,7 +3597,7 @@ static actor_method_class l_daMidna_Method = { (process_method_func)daMidna_Draw, }; -extern actor_process_profile_definition g_profile_MIDNA = { +actor_process_profile_definition g_profile_MIDNA = { fpcLy_CURRENT_e, 6, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_mirror.cpp b/src/d/actor/d_a_mirror.cpp index 4c4787c8b3..a15d2fd2ce 100644 --- a/src/d/actor/d_a_mirror.cpp +++ b/src/d/actor/d_a_mirror.cpp @@ -617,7 +617,7 @@ static actor_method_class daMirror_METHODS = { (process_method_func)daMirror_draw, }; -extern actor_process_profile_definition g_profile_MIRROR = { +actor_process_profile_definition g_profile_MIRROR = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index 0356df3dae..fbee0d4fa5 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -4195,7 +4195,7 @@ static actor_method_class daMP_METHODS = { (process_method_func)daMP_c::daMP_c_Callback_Draw, }; -extern actor_process_profile_definition g_profile_MOVIE_PLAYER = { +actor_process_profile_definition g_profile_MOVIE_PLAYER = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_myna.cpp b/src/d/actor/d_a_myna.cpp index d698b5b92d..4289833173 100644 --- a/src/d/actor/d_a_myna.cpp +++ b/src/d/actor/d_a_myna.cpp @@ -1813,7 +1813,7 @@ static actor_method_class daMyna_MethodTable = { (process_method_func)daMyna_Draw, }; -extern actor_process_profile_definition g_profile_MYNA = { +actor_process_profile_definition g_profile_MYNA = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp index 13deb6780d..6e1f937010 100644 --- a/src/d/actor/d_a_nbomb.cpp +++ b/src/d/actor/d_a_nbomb.cpp @@ -1683,7 +1683,7 @@ static actor_method_class l_daNbombMethod = { (process_method_func)daNbomb_Draw, }; -extern actor_process_profile_definition g_profile_NBOMB = { +actor_process_profile_definition g_profile_NBOMB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_ni.cpp b/src/d/actor/d_a_ni.cpp index b06b8964ed..982276ff8b 100644 --- a/src/d/actor/d_a_ni.cpp +++ b/src/d/actor/d_a_ni.cpp @@ -1996,7 +1996,7 @@ static actor_method_class l_daNi_Method = { (process_method_func)daNi_Draw, }; -extern actor_process_profile_definition g_profile_NI = { +actor_process_profile_definition g_profile_NI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_no_chg_room.cpp b/src/d/actor/d_a_no_chg_room.cpp index 1ae276a6a2..f2ec6e4b82 100644 --- a/src/d/actor/d_a_no_chg_room.cpp +++ b/src/d/actor/d_a_no_chg_room.cpp @@ -156,7 +156,7 @@ static actor_method_class daNocrm_METHODS = { (process_method_func)daNocrm_draw, }; -extern actor_process_profile_definition g_profile_NO_CHG_ROOM = { +actor_process_profile_definition g_profile_NO_CHG_ROOM = { fpcLy_CURRENT_e, 2, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc2.cpp b/src/d/actor/d_a_npc2.cpp index 7573fbeb54..6f5b85bc0f 100644 --- a/src/d/actor/d_a_npc2.cpp +++ b/src/d/actor/d_a_npc2.cpp @@ -263,12 +263,7 @@ void daBaseNpc_lookat_c::limitter(s16 i_value, s16* o_value_p, s16 i_max, s16 i_ } if (i_min < i_value) { - //TODO: fakematch -#if VERSION == VERSION_SHIELD_DEBUG - *o_value_p -= tmp - i_min; -#else - *o_value_p -= tmp - (s16)i_min; -#endif + *o_value_p = *o_value_p - (tmp - i_min); return; } @@ -734,9 +729,6 @@ int daBaseNpc_moveBgActor_c::MoveBGCreateHeap() { return 1; } -/* 8014F60C-8014F6FC 149F4C 00F0+00 0/0 0/0 1/1 .text - * MoveBGCreate__23daBaseNpc_moveBgActor_cFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUl - */ int daBaseNpc_moveBgActor_c::MoveBGCreate(char const* i_arcName, int i_dzbId, MoveBGActor_SetFunc i_setFunc, u32 i_heapSize) { int unusedInt1 = 1; diff --git a/src/d/actor/d_a_npc_aru.cpp b/src/d/actor/d_a_npc_aru.cpp index 6d77b5a3c8..e6881a106c 100644 --- a/src/d/actor/d_a_npc_aru.cpp +++ b/src/d/actor/d_a_npc_aru.cpp @@ -2068,7 +2068,7 @@ static actor_method_class daNpc_Aru_MethodTable = { (process_method_func)daNpc_Aru_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ARU = { +actor_process_profile_definition g_profile_NPC_ARU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_ash.cpp b/src/d/actor/d_a_npc_ash.cpp index 60f2f00468..423817b1ac 100644 --- a/src/d/actor/d_a_npc_ash.cpp +++ b/src/d/actor/d_a_npc_ash.cpp @@ -107,7 +107,7 @@ BOOL daNpcAsh_c::chkFindPlayer() { bool daNpcAsh_c::step(s16 i_angY, bool i_animate) { if (mTurnMode == 0) { if (i_animate) { - if ((s32)fabsf(cM_sht2d((f32)(s16)(i_angY - mCurAngle.y))) > 40) { + if ((s32)fabsf(cM_sht2d((s16)(i_angY - mCurAngle.y))) > 40) { setExpression(EXPR_NONE, -1.0f); setMotion(MOT_STEP, -1.0f, false); } @@ -1334,7 +1334,7 @@ static actor_method_class daNpcAsh_MethodTable = { (process_method_func)daNpcAsh_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ASH = { +actor_process_profile_definition g_profile_NPC_ASH = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp index 6658577cb0..75421ce2e0 100644 --- a/src/d/actor/d_a_npc_ashB.cpp +++ b/src/d/actor/d_a_npc_ashB.cpp @@ -1204,7 +1204,7 @@ static actor_method_class daNpcAshB_MethodTable = { (process_method_func)daNpcAshB_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ASHB = { +actor_process_profile_definition g_profile_NPC_ASHB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_bans.cpp b/src/d/actor/d_a_npc_bans.cpp index 4f6ea12fc8..b083ecdcbc 100644 --- a/src/d/actor/d_a_npc_bans.cpp +++ b/src/d/actor/d_a_npc_bans.cpp @@ -1876,7 +1876,7 @@ static actor_method_class daNpc_Bans_MethodTable = { (process_method_func)daNpc_Bans_Draw, }; -extern actor_process_profile_definition g_profile_NPC_BANS = { +actor_process_profile_definition g_profile_NPC_BANS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_besu.cpp b/src/d/actor/d_a_npc_besu.cpp index d7d5056d81..5fd697742d 100644 --- a/src/d/actor/d_a_npc_besu.cpp +++ b/src/d/actor/d_a_npc_besu.cpp @@ -3006,7 +3006,7 @@ static actor_method_class daNpc_Besu_MethodTable = { (process_method_func)daNpc_Besu_Draw, }; -extern actor_process_profile_definition g_profile_NPC_BESU = { +actor_process_profile_definition g_profile_NPC_BESU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_blue_ns.cpp b/src/d/actor/d_a_npc_blue_ns.cpp index c0f4d5f032..d214ade475 100644 --- a/src/d/actor/d_a_npc_blue_ns.cpp +++ b/src/d/actor/d_a_npc_blue_ns.cpp @@ -1404,7 +1404,7 @@ static actor_method_class daNpcBlueNS_MethodTable = { (process_method_func)daNpcBlueNS_Draw, }; -extern actor_process_profile_definition g_profile_NPC_BLUENS = { +actor_process_profile_definition g_profile_NPC_BLUENS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_bou.cpp b/src/d/actor/d_a_npc_bou.cpp index 2486ba8547..9e0a753c10 100644 --- a/src/d/actor/d_a_npc_bou.cpp +++ b/src/d/actor/d_a_npc_bou.cpp @@ -1639,7 +1639,7 @@ static actor_method_class daNpc_Bou_MethodTable = { (process_method_func)daNpc_Bou_Draw, }; -extern actor_process_profile_definition g_profile_NPC_BOU = { +actor_process_profile_definition g_profile_NPC_BOU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_bouS.cpp b/src/d/actor/d_a_npc_bouS.cpp index 4300c85670..e1e2a1e726 100644 --- a/src/d/actor/d_a_npc_bouS.cpp +++ b/src/d/actor/d_a_npc_bouS.cpp @@ -1606,7 +1606,7 @@ static actor_method_class daNpcBouS_MethodTable = { (process_method_func)daNpcBouS_Draw, }; -extern actor_process_profile_definition g_profile_NPC_BOU_S = { +actor_process_profile_definition g_profile_NPC_BOU_S = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_cd.cpp b/src/d/actor/d_a_npc_cd.cpp index 33ec805406..dde66fd193 100644 --- a/src/d/actor/d_a_npc_cd.cpp +++ b/src/d/actor/d_a_npc_cd.cpp @@ -561,7 +561,6 @@ J3DModelData* daNpcCd_c::getObjMdlDataP(int param_1) { } daNpcCd_HIO_c::daNpcCd_HIO_c() { - /* 803B3DE4-803B4CE4 010F04 0F00+00 0/1 0/0 0/0 .data a_jntTbl_M$3905 */ static u8 a_jntTbl_M[16][12][20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -821,7 +820,6 @@ daNpcCd_HIO_c::daNpcCd_HIO_c() { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; - /* 803B4CE4-803B50E4 011E04 0400+00 0/1 0/0 0/0 .data a_prmTbl_M$3906 */ static u8 a_prmTbl_M[1024] = { 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, @@ -894,7 +892,6 @@ daNpcCd_HIO_c::daNpcCd_HIO_c() { 0x42, 0x0C, 0x00, 0x00, }; - /* 803B50E4-803B5E04 012204 0D20+00 0/1 0/0 0/0 .data a_jntTbl_W$3907 */ static u8 a_jntTbl_W[14][12][20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1122,7 +1119,6 @@ daNpcCd_HIO_c::daNpcCd_HIO_c() { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; - /* 803B5E04-803B6184 012F24 0380+00 0/1 0/0 0/0 .data a_prmTbl_W$3908 */ static u8 a_prmTbl_W[896] = { 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, diff --git a/src/d/actor/d_a_npc_cdn3.cpp b/src/d/actor/d_a_npc_cdn3.cpp index 735926a60b..6f7a28e6a3 100644 --- a/src/d/actor/d_a_npc_cdn3.cpp +++ b/src/d/actor/d_a_npc_cdn3.cpp @@ -1739,7 +1739,7 @@ static actor_method_class daNpcCdn3_METHODS = { (process_method_func)daNpcCdn3_Draw, }; -extern actor_process_profile_definition g_profile_NPC_CD3 = { +actor_process_profile_definition g_profile_NPC_CD3 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_chat.cpp b/src/d/actor/d_a_npc_chat.cpp index 94295c8996..f4e73ffa9e 100644 --- a/src/d/actor/d_a_npc_chat.cpp +++ b/src/d/actor/d_a_npc_chat.cpp @@ -2660,10 +2660,7 @@ inline f32 CylH(int type) { } cPhs__Step daNpcChat_c::Create() { - if (!fopAcM_CheckCondition(this, fopAcCnd_INIT_e)) { - new (this) daNpcChat_c(); - fopAcM_OnCondition(this, fopAcCnd_INIT_e); - } + fopAcM_ct(this, daNpcChat_c); mTwilight = dKy_darkworld_check(); mType = getType(); @@ -4128,7 +4125,7 @@ static actor_method_class daNpcChat_MethodTable = { (process_method_func)daNpcChat_Draw, }; -extern actor_process_profile_definition g_profile_NPC_CHAT = { +actor_process_profile_definition g_profile_NPC_CHAT = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_chin.cpp b/src/d/actor/d_a_npc_chin.cpp index 423192b4c5..553a6e8abb 100644 --- a/src/d/actor/d_a_npc_chin.cpp +++ b/src/d/actor/d_a_npc_chin.cpp @@ -2119,7 +2119,7 @@ static actor_method_class daNpcChin_MethodTable = { (process_method_func)daNpcChin_Draw, }; -extern actor_process_profile_definition g_profile_NPC_CHIN = { +actor_process_profile_definition g_profile_NPC_CHIN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_clerka.cpp b/src/d/actor/d_a_npc_clerka.cpp index 020fc6bc0c..20e61bd91d 100644 --- a/src/d/actor/d_a_npc_clerka.cpp +++ b/src/d/actor/d_a_npc_clerka.cpp @@ -788,7 +788,7 @@ static actor_method_class daNpc_clerkA_MethodTable = { (process_method_func)daNpc_clerkA_Draw, }; -extern actor_process_profile_definition g_profile_NPC_CLERKA = { +actor_process_profile_definition g_profile_NPC_CLERKA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_clerkb.cpp b/src/d/actor/d_a_npc_clerkb.cpp index 1f21f35fa0..9b22c324f7 100644 --- a/src/d/actor/d_a_npc_clerkb.cpp +++ b/src/d/actor/d_a_npc_clerkb.cpp @@ -940,7 +940,7 @@ static actor_method_class daNpc_clerkB_MethodTable = { (process_method_func)daNpc_clerkB_Draw, }; -extern actor_process_profile_definition g_profile_NPC_CLERKB = { +actor_process_profile_definition g_profile_NPC_CLERKB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_clerkt.cpp b/src/d/actor/d_a_npc_clerkt.cpp index 3add3daa81..0ca1ee24ee 100644 --- a/src/d/actor/d_a_npc_clerkt.cpp +++ b/src/d/actor/d_a_npc_clerkt.cpp @@ -701,7 +701,7 @@ static actor_method_class daNpcClerkt_MethodTable = { (process_method_func)daNpcClerkt_Draw, }; -extern actor_process_profile_definition g_profile_NPC_CLERKT = { +actor_process_profile_definition g_profile_NPC_CLERKT = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_coach.cpp b/src/d/actor/d_a_npc_coach.cpp index 6958626c34..43600c6ae2 100644 --- a/src/d/actor/d_a_npc_coach.cpp +++ b/src/d/actor/d_a_npc_coach.cpp @@ -2173,7 +2173,7 @@ static actor_method_class l_daNpcCoach_Method = { (process_method_func)daNpcCoach_Draw, }; -extern actor_process_profile_definition g_profile_NPC_COACH = { +actor_process_profile_definition g_profile_NPC_COACH = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_df.cpp b/src/d/actor/d_a_npc_df.cpp index 00c3eb5fdf..08d6ab6108 100644 --- a/src/d/actor/d_a_npc_df.cpp +++ b/src/d/actor/d_a_npc_df.cpp @@ -421,7 +421,7 @@ static actor_method_class l_daNpc_Df_Method = { (process_method_func)daNpc_Df_Draw, }; -extern actor_process_profile_definition g_profile_NPC_DF = { +actor_process_profile_definition g_profile_NPC_DF = { fpcLy_CURRENT_e, // mLayerID 9, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp index 9033238475..d7ac07b853 100644 --- a/src/d/actor/d_a_npc_doc.cpp +++ b/src/d/actor/d_a_npc_doc.cpp @@ -879,7 +879,7 @@ static actor_method_class daNpc_Doc_MethodTable = { (process_method_func)daNpc_Doc_Draw, }; -extern actor_process_profile_definition g_profile_NPC_DOC = { +actor_process_profile_definition g_profile_NPC_DOC = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_doorboy.cpp b/src/d/actor/d_a_npc_doorboy.cpp index 66d5c726a5..550f03aea6 100644 --- a/src/d/actor/d_a_npc_doorboy.cpp +++ b/src/d/actor/d_a_npc_doorboy.cpp @@ -864,7 +864,7 @@ static actor_method_class daNpcDoorBoy_MethodTable = { (process_method_func)daNpcDoorBoy_Draw, }; -extern actor_process_profile_definition g_profile_NPC_DOORBOY = { +actor_process_profile_definition g_profile_NPC_DOORBOY = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_drainSol.cpp b/src/d/actor/d_a_npc_drainSol.cpp index ba66a02084..f7f8d8469a 100644 --- a/src/d/actor/d_a_npc_drainSol.cpp +++ b/src/d/actor/d_a_npc_drainSol.cpp @@ -444,7 +444,7 @@ static actor_method_class daNpcDrSol_MethodTable = { (process_method_func)daNpcDrSol_Draw, }; -extern actor_process_profile_definition g_profile_NPC_DRSOL = { +actor_process_profile_definition g_profile_NPC_DRSOL = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_du.cpp b/src/d/actor/d_a_npc_du.cpp index 9f353db664..591d594adc 100644 --- a/src/d/actor/d_a_npc_du.cpp +++ b/src/d/actor/d_a_npc_du.cpp @@ -702,7 +702,7 @@ static actor_method_class l_daNpc_Du_Method = { (process_method_func)daNpc_Du_Draw, }; -extern actor_process_profile_definition g_profile_NPC_DU = { +actor_process_profile_definition g_profile_NPC_DU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_fairy.cpp b/src/d/actor/d_a_npc_fairy.cpp index be4f8be689..f35d28ef42 100644 --- a/src/d/actor/d_a_npc_fairy.cpp +++ b/src/d/actor/d_a_npc_fairy.cpp @@ -1358,7 +1358,6 @@ int daNpc_Fairy_c::cutAppear_10F_01(int i_staffId) { return _cutAppear_10F_01_Main(*cutId); } -/* 809B46E0-809B48C4 002CC0 01E4+00 1/1 0/0 0/0 .text _cutAppear_10F_01_Init__13daNpc_Fairy_cFRCi*/ int daNpc_Fairy_c::_cutAppear_10F_01_Init(int const& i_cutId) { int rv = 0; @@ -3063,7 +3062,7 @@ static actor_method_class daNpc_Fairy_MethodTable = { (process_method_func)daNpc_Fairy_Draw, }; -extern actor_process_profile_definition g_profile_NPC_FAIRY = { +actor_process_profile_definition g_profile_NPC_FAIRY = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_fairy_seirei.cpp b/src/d/actor/d_a_npc_fairy_seirei.cpp index 062db6fe34..e3457d0919 100644 --- a/src/d/actor/d_a_npc_fairy_seirei.cpp +++ b/src/d/actor/d_a_npc_fairy_seirei.cpp @@ -394,7 +394,7 @@ static actor_method_class daNpc_FairySeirei_MethodTable = { daNpc_FairySeirei_IsDelete, daNpc_FairySeirei_Draw, }; -extern actor_process_profile_definition g_profile_NPC_FAIRY_SEIREI = { +actor_process_profile_definition g_profile_NPC_FAIRY_SEIREI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_fguard.cpp b/src/d/actor/d_a_npc_fguard.cpp index 0f58c48228..69a087156a 100644 --- a/src/d/actor/d_a_npc_fguard.cpp +++ b/src/d/actor/d_a_npc_fguard.cpp @@ -208,7 +208,7 @@ static actor_method_class daNpcFgd_METHODS = { (process_method_func)daNpcFgd_Draw, }; -extern actor_process_profile_definition g_profile_NPC_FGUARD = { +actor_process_profile_definition g_profile_NPC_FGUARD = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_fish.cpp b/src/d/actor/d_a_npc_fish.cpp index 82101de714..64a8f81e01 100644 --- a/src/d/actor/d_a_npc_fish.cpp +++ b/src/d/actor/d_a_npc_fish.cpp @@ -151,7 +151,7 @@ static actor_method_class l_daNpc_Fish_Method = { (process_method_func)daNpc_Fish_Draw, }; -extern actor_process_profile_definition g_profile_NPC_FISH = { +actor_process_profile_definition g_profile_NPC_FISH = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_gnd.cpp b/src/d/actor/d_a_npc_gnd.cpp index eb5f96293a..8856e476d0 100644 --- a/src/d/actor/d_a_npc_gnd.cpp +++ b/src/d/actor/d_a_npc_gnd.cpp @@ -683,7 +683,7 @@ static actor_method_class daNpc_Gnd_MethodTable = { (process_method_func)daNpc_Gnd_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GND = { +actor_process_profile_definition g_profile_NPC_GND = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp index 11b84dfd41..aa00f9cf7d 100644 --- a/src/d/actor/d_a_npc_gra.cpp +++ b/src/d/actor/d_a_npc_gra.cpp @@ -94,10 +94,6 @@ static int l_bckGetParamList[][2] = { 0x07, 0x0F, }; -/* 809CA7F4 809CA874 0080 -00 -/1 0/0 -.data l_btpGetParamList */ static int l_btpGetParamList[][2] = { 0x1C, 0x00, 0x1F, 0x00, @@ -642,7 +638,7 @@ bool daNpc_grA_c::checkTagGraSub2(fopAc_ac_c* i_this) { } static void* s_subShop(void* i_actor, void* i_this) { - (void)i_this; + UNUSED(i_this); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_GRM) { return i_actor; } @@ -650,7 +646,7 @@ static void* s_subShop(void* i_actor, void* i_this) { } static void* s_subGRD(void* i_actor, void* i_this) { - (void)i_this; + UNUSED(i_this); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_WRESTLER) { return i_actor; } @@ -658,7 +654,7 @@ static void* s_subGRD(void* i_actor, void* i_this) { } static void *s_subOnsenTaru(void* i_actor, void* i_this) { - (void)i_this; + UNUSED(i_this); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_OnsenTaru && !fpcM_IsCreating(fopAcM_GetID((i_actor)))) { @@ -4115,7 +4111,7 @@ static actor_method_class daNpc_grA_MethodTable = { (process_method_func)daNpc_grA_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GRA = { +actor_process_profile_definition g_profile_NPC_GRA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_grc.cpp b/src/d/actor/d_a_npc_grc.cpp index 5a507f7764..577763adab 100644 --- a/src/d/actor/d_a_npc_grc.cpp +++ b/src/d/actor/d_a_npc_grc.cpp @@ -1547,7 +1547,7 @@ static actor_method_class daNpc_grC_MethodTable = { (process_method_func)daNpc_grC_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GRC = { +actor_process_profile_definition g_profile_NPC_GRC = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_grd.cpp b/src/d/actor/d_a_npc_grd.cpp index 5e4cb8a474..f81e422472 100644 --- a/src/d/actor/d_a_npc_grd.cpp +++ b/src/d/actor/d_a_npc_grd.cpp @@ -1248,7 +1248,7 @@ static actor_method_class daNpc_Grd_MethodTable = { (process_method_func)daNpc_Grd_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GRD = { +actor_process_profile_definition g_profile_NPC_GRD = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_grm.cpp b/src/d/actor/d_a_npc_grm.cpp index cb9635f0d2..f0a53d4428 100644 --- a/src/d/actor/d_a_npc_grm.cpp +++ b/src/d/actor/d_a_npc_grm.cpp @@ -802,7 +802,7 @@ static actor_method_class daNpc_grM_MethodTable = { (process_method_func)daNpc_grM_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GRM = { +actor_process_profile_definition g_profile_NPC_GRM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_grmc.cpp b/src/d/actor/d_a_npc_grmc.cpp index 621dc26fe3..fd9671e4e0 100644 --- a/src/d/actor/d_a_npc_grmc.cpp +++ b/src/d/actor/d_a_npc_grmc.cpp @@ -791,7 +791,7 @@ static actor_method_class daNpc_grMC_MethodTable = { (process_method_func)daNpc_grMC_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GRMC = { +actor_process_profile_definition g_profile_NPC_GRMC = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp index e7a9d12317..71e5f7367a 100644 --- a/src/d/actor/d_a_npc_gro.cpp +++ b/src/d/actor/d_a_npc_gro.cpp @@ -1903,7 +1903,7 @@ static actor_method_class daNpc_grO_MethodTable = { (process_method_func)daNpc_grO_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GRO = { +actor_process_profile_definition g_profile_NPC_GRO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp index c2619aa657..c8eb2daf26 100644 --- a/src/d/actor/d_a_npc_grr.cpp +++ b/src/d/actor/d_a_npc_grr.cpp @@ -1433,7 +1433,7 @@ static actor_method_class daNpc_grR_MethodTable = { (process_method_func)daNpc_grR_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GRR = { +actor_process_profile_definition g_profile_NPC_GRR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp index 77baa5480d..06e9bf36b1 100644 --- a/src/d/actor/d_a_npc_grs.cpp +++ b/src/d/actor/d_a_npc_grs.cpp @@ -1298,7 +1298,7 @@ static actor_method_class daNpc_grS_MethodTable = { (process_method_func)daNpc_grS_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GRS = { +actor_process_profile_definition g_profile_NPC_GRS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_grz.cpp b/src/d/actor/d_a_npc_grz.cpp index 1fb7bf9135..39fb696106 100644 --- a/src/d/actor/d_a_npc_grz.cpp +++ b/src/d/actor/d_a_npc_grz.cpp @@ -2508,7 +2508,7 @@ static actor_method_class daNpc_Grz_MethodTable = { (process_method_func)daNpc_Grz_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GRZ = { +actor_process_profile_definition g_profile_NPC_GRZ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_guard.cpp b/src/d/actor/d_a_npc_guard.cpp index 813ca5e215..ab82f88ee9 100644 --- a/src/d/actor/d_a_npc_guard.cpp +++ b/src/d/actor/d_a_npc_guard.cpp @@ -609,7 +609,7 @@ static actor_method_class daNpcGuard_METHODS = { (process_method_func)daNpcGuard_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GUARD = { +actor_process_profile_definition g_profile_NPC_GUARD = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_gwolf.cpp b/src/d/actor/d_a_npc_gwolf.cpp index 9ac8c14951..cc4395c1c1 100644 --- a/src/d/actor/d_a_npc_gwolf.cpp +++ b/src/d/actor/d_a_npc_gwolf.cpp @@ -1896,7 +1896,7 @@ static actor_method_class daNpc_GWolf_MethodTable = { (process_method_func)daNpc_GWolf_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GWOLF = { +actor_process_profile_definition g_profile_NPC_GWOLF = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_hanjo.cpp b/src/d/actor/d_a_npc_hanjo.cpp index 3d37511191..b5522ac0fa 100644 --- a/src/d/actor/d_a_npc_hanjo.cpp +++ b/src/d/actor/d_a_npc_hanjo.cpp @@ -1932,7 +1932,7 @@ static actor_method_class daNpc_Hanjo_MethodTable = { (process_method_func)daNpc_Hanjo_Draw, }; -extern actor_process_profile_definition g_profile_NPC_HANJO = { +actor_process_profile_definition g_profile_NPC_HANJO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index 846cc6b1a1..072a3be72f 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -221,7 +221,7 @@ static void* s_npc_sub(void* param_0, void* param_1) { } static void* s_piro_sub(void* param_0, void* param_1) { - (void)param_1; // debug match + UNUSED(param_1); if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_NPC_INKO) { return param_0; } @@ -239,7 +239,7 @@ static void* s_du_sub(void* param_0, void* param_1) { } static void* s_shop_sub(void* param_0, void* param_1) { - (void)param_1; // debug match + UNUSED(param_1); if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_FSHOP && (s32)(fopAcM_GetParam(param_0) & 0xff) < 35) { @@ -249,7 +249,7 @@ static void* s_shop_sub(void* param_0, void* param_1) { } static void* s_koro2ball_sub(void* param_0, void* param_1) { - (void)param_1; // debug match + UNUSED(param_1); if (fopAcM_IsActor(param_0)) { if (fopAcM_GetName(param_0) == PROC_FSHOP && (fopAcM_GetParam(param_0) & 0xff) == 35) { return param_0; @@ -402,7 +402,7 @@ static void henna_shop(npc_henna_class* i_this) { } static void* s_rod_sub(void* param_0, void* param_1) { - (void)param_1; // debug match + UNUSED(param_1); if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_MG_ROD) { return param_0; } @@ -2833,7 +2833,7 @@ static actor_method_class l_daNpc_Henna_Method = { (process_method_func)daNpc_Henna_Draw, }; -extern actor_process_profile_definition g_profile_NPC_HENNA = { +actor_process_profile_definition g_profile_NPC_HENNA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_henna0.cpp b/src/d/actor/d_a_npc_henna0.cpp index 54885d8c41..78b2dae150 100644 --- a/src/d/actor/d_a_npc_henna0.cpp +++ b/src/d/actor/d_a_npc_henna0.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_henna0.h" -extern actor_process_profile_definition g_profile_NPC_HENNA0 = { +actor_process_profile_definition g_profile_NPC_HENNA0 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp index 5abf670fc5..081b398098 100644 --- a/src/d/actor/d_a_npc_hoz.cpp +++ b/src/d/actor/d_a_npc_hoz.cpp @@ -1667,7 +1667,7 @@ static actor_method_class daNpc_Hoz_MethodTable = { (process_method_func)daNpc_Hoz_Draw, }; -extern actor_process_profile_definition g_profile_NPC_HOZ = { +actor_process_profile_definition g_profile_NPC_HOZ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_impal.cpp b/src/d/actor/d_a_npc_impal.cpp index 0d797f2773..b3449f4303 100644 --- a/src/d/actor/d_a_npc_impal.cpp +++ b/src/d/actor/d_a_npc_impal.cpp @@ -299,7 +299,7 @@ void daNpcImpal_c::setExpressionTalkAfter() { int daNpcImpal_c::step(s16 i_angle, int i_animate) { if (mTurnMode == 0) { if (i_animate) { - if ((s32)fabsf(cM_sht2d((f32)(s16)(i_angle - mCurAngle.y))) > 40) { + if ((s32)fabsf(cM_sht2d((s16)(i_angle - mCurAngle.y))) > 40) { setExpression(EXPR_7, -1.0f); setMotion(MOT_6, -1.0f, false); } @@ -1236,7 +1236,7 @@ static actor_method_class daNpcImpal_MethodTable = { (process_method_func)daNpcImpal_Draw, }; -extern actor_process_profile_definition g_profile_NPC_IMPAL = { +actor_process_profile_definition g_profile_NPC_IMPAL = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_inko.cpp b/src/d/actor/d_a_npc_inko.cpp index a69dcc8f8f..a1ad459fdc 100644 --- a/src/d/actor/d_a_npc_inko.cpp +++ b/src/d/actor/d_a_npc_inko.cpp @@ -471,7 +471,7 @@ static actor_method_class l_daNpc_Inko_Method = { (process_method_func)daNpc_Inko_Draw, }; -extern actor_process_profile_definition g_profile_NPC_INKO = { +actor_process_profile_definition g_profile_NPC_INKO = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_ins.cpp b/src/d/actor/d_a_npc_ins.cpp index 1e8cc049bf..3ef01d3cf5 100644 --- a/src/d/actor/d_a_npc_ins.cpp +++ b/src/d/actor/d_a_npc_ins.cpp @@ -1788,7 +1788,7 @@ static actor_method_class daNpcIns_MethodTable = { (process_method_func)daNpcIns_Draw, }; -extern actor_process_profile_definition g_profile_NPC_INS = { +actor_process_profile_definition g_profile_NPC_INS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_jagar.cpp b/src/d/actor/d_a_npc_jagar.cpp index 1c780a12ff..240203087a 100644 --- a/src/d/actor/d_a_npc_jagar.cpp +++ b/src/d/actor/d_a_npc_jagar.cpp @@ -1790,7 +1790,7 @@ static actor_method_class daNpc_Jagar_MethodTable = { (process_method_func)daNpc_Jagar_Draw, }; -extern actor_process_profile_definition g_profile_NPC_JAGAR = { +actor_process_profile_definition g_profile_NPC_JAGAR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kakashi.cpp b/src/d/actor/d_a_npc_kakashi.cpp index 134f68b1d0..0b7d665fae 100644 --- a/src/d/actor/d_a_npc_kakashi.cpp +++ b/src/d/actor/d_a_npc_kakashi.cpp @@ -1145,7 +1145,7 @@ static actor_method_class daNpc_Kakashi_MethodTable = { (process_method_func)daNpc_Kakashi_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KAKASHI = { +actor_process_profile_definition g_profile_NPC_KAKASHI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kasi_hana.cpp b/src/d/actor/d_a_npc_kasi_hana.cpp index 7aefa40ac8..011f504abe 100644 --- a/src/d/actor/d_a_npc_kasi_hana.cpp +++ b/src/d/actor/d_a_npc_kasi_hana.cpp @@ -2320,7 +2320,7 @@ static actor_method_class daNpcKasiHana_MethodTable = { (process_method_func)daNpcKasiHana_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KASIHANA = { +actor_process_profile_definition g_profile_NPC_KASIHANA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kasi_kyu.cpp b/src/d/actor/d_a_npc_kasi_kyu.cpp index 77bf43fa33..64ce7ef027 100644 --- a/src/d/actor/d_a_npc_kasi_kyu.cpp +++ b/src/d/actor/d_a_npc_kasi_kyu.cpp @@ -349,8 +349,6 @@ daTagEscape_c* daNpcKasiKyu_c::mTargetTag; f32 daNpcKasiKyu_c::mTargetTagDist; -/* 80A26068 0002+00 data_80A26068 mWolfAngle__14daNpcKasiKyu_c */ -/* 80A2606A 0002+00 data_80A2606A None */ s16 daNpcKasiKyu_c::mWolfAngle; BOOL daNpcKasiKyu_c::main() { @@ -1427,7 +1425,7 @@ static actor_method_class daNpcKasiKyu_MethodTable = { (process_method_func)daNpcKasiKyu_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KASIKYU = { +actor_process_profile_definition g_profile_NPC_KASIKYU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kasi_mich.cpp b/src/d/actor/d_a_npc_kasi_mich.cpp index d217e50df9..5b15b65834 100644 --- a/src/d/actor/d_a_npc_kasi_mich.cpp +++ b/src/d/actor/d_a_npc_kasi_mich.cpp @@ -349,8 +349,6 @@ daTagEscape_c* daNpcKasiMich_c::mTargetTag; f32 daNpcKasiMich_c::mTargetTagDist; -/* 80A2A7F8 0002+00 data_80A2A7F8 mWolfAngle__15daNpcKasiMich_c */ -/* 80A2A7FA 0002+00 data_80A2A7FA None */ s16 daNpcKasiMich_c::mWolfAngle; BOOL daNpcKasiMich_c::main() { @@ -1414,7 +1412,7 @@ static actor_method_class daNpcKasiMich_MethodTable = { (process_method_func)daNpcKasiMich_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KASIMICH = { +actor_process_profile_definition g_profile_NPC_KASIMICH = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kdk.cpp b/src/d/actor/d_a_npc_kdk.cpp index 9496798711..1522311e8b 100644 --- a/src/d/actor/d_a_npc_kdk.cpp +++ b/src/d/actor/d_a_npc_kdk.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_npc_kdk.h" -extern actor_process_profile_definition g_profile_NPC_KDK = { +actor_process_profile_definition g_profile_NPC_KDK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kkri.cpp b/src/d/actor/d_a_npc_kkri.cpp index 1003ab7053..bdd4b635a0 100644 --- a/src/d/actor/d_a_npc_kkri.cpp +++ b/src/d/actor/d_a_npc_kkri.cpp @@ -1219,7 +1219,7 @@ static actor_method_class daNpc_Kkri_MethodTable = { (process_method_func)daNpc_Kkri_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KKRI = { +actor_process_profile_definition g_profile_NPC_KKRI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp index e39128192c..ab87d87d6a 100644 --- a/src/d/actor/d_a_npc_kn.cpp +++ b/src/d/actor/d_a_npc_kn.cpp @@ -5279,7 +5279,7 @@ static actor_method_class daNpc_Kn_MethodTable = { (process_method_func)daNpc_Kn_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KN = { +actor_process_profile_definition g_profile_NPC_KN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_knj.cpp b/src/d/actor/d_a_npc_knj.cpp index 2f8f8c77d1..7a6993223f 100644 --- a/src/d/actor/d_a_npc_knj.cpp +++ b/src/d/actor/d_a_npc_knj.cpp @@ -532,7 +532,7 @@ static actor_method_class daNpc_Knj_MethodTable = { (process_method_func)daNpc_Knj_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KNJ = { +actor_process_profile_definition g_profile_NPC_KNJ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kolin.cpp b/src/d/actor/d_a_npc_kolin.cpp index 5a63a56ad8..f6c24e9ad7 100644 --- a/src/d/actor/d_a_npc_kolin.cpp +++ b/src/d/actor/d_a_npc_kolin.cpp @@ -2225,7 +2225,7 @@ static actor_method_class daNpc_Kolin_MethodTable = { (process_method_func)daNpc_Kolin_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KOLIN = { +actor_process_profile_definition g_profile_NPC_KOLIN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kolinb.cpp b/src/d/actor/d_a_npc_kolinb.cpp index fcf881e7f4..0f55b887e3 100644 --- a/src/d/actor/d_a_npc_kolinb.cpp +++ b/src/d/actor/d_a_npc_kolinb.cpp @@ -917,7 +917,7 @@ static actor_method_class daNpc_Kolinb_MethodTable = { (process_method_func)daNpc_Kolinb_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KOLINB = { +actor_process_profile_definition g_profile_NPC_KOLINB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index df3fa31072..5e6e00844a 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -7465,7 +7465,7 @@ static actor_method_class l_daNpc_Ks_Method = { (process_method_func)daNpc_Ks_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KS = { +actor_process_profile_definition g_profile_NPC_KS = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kyury.cpp b/src/d/actor/d_a_npc_kyury.cpp index 055cd56d9a..4a94648eb4 100644 --- a/src/d/actor/d_a_npc_kyury.cpp +++ b/src/d/actor/d_a_npc_kyury.cpp @@ -876,7 +876,7 @@ static actor_method_class daNpc_Kyury_MethodTable = { (process_method_func)daNpc_Kyury_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KYURY = { +actor_process_profile_definition g_profile_NPC_KYURY = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_len.cpp b/src/d/actor/d_a_npc_len.cpp index 1a4cf2b58c..6d3586be20 100644 --- a/src/d/actor/d_a_npc_len.cpp +++ b/src/d/actor/d_a_npc_len.cpp @@ -1295,7 +1295,7 @@ static actor_method_class daNpc_Len_MethodTable = { (process_method_func)daNpc_Len_Draw, }; -extern actor_process_profile_definition g_profile_NPC_LEN = { +actor_process_profile_definition g_profile_NPC_LEN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_lf.cpp b/src/d/actor/d_a_npc_lf.cpp index c8517c3ff6..43ea8362f3 100644 --- a/src/d/actor/d_a_npc_lf.cpp +++ b/src/d/actor/d_a_npc_lf.cpp @@ -332,7 +332,7 @@ static actor_method_class l_daNPC_LF_Method = { (process_method_func)daNPC_LF_Draw, }; -extern actor_process_profile_definition g_profile_NPC_LF = { +actor_process_profile_definition g_profile_NPC_LF = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_lud.cpp b/src/d/actor/d_a_npc_lud.cpp index 8701ef64a7..b15297f89d 100644 --- a/src/d/actor/d_a_npc_lud.cpp +++ b/src/d/actor/d_a_npc_lud.cpp @@ -1511,7 +1511,7 @@ static actor_method_class daNpc_Lud_MethodTable = { (process_method_func)daNpc_Lud_Draw, }; -extern actor_process_profile_definition g_profile_NPC_LUD = { +actor_process_profile_definition g_profile_NPC_LUD = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_maro.cpp b/src/d/actor/d_a_npc_maro.cpp index 086e5eb6ce..2576375bbc 100644 --- a/src/d/actor/d_a_npc_maro.cpp +++ b/src/d/actor/d_a_npc_maro.cpp @@ -3391,7 +3391,7 @@ static actor_method_class daNpc_Maro_MethodTable = { (process_method_func)daNpc_Maro_Draw, }; -extern actor_process_profile_definition g_profile_NPC_MARO = { +actor_process_profile_definition g_profile_NPC_MARO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_midp.cpp b/src/d/actor/d_a_npc_midp.cpp index caa6462764..2ef3eb0a52 100644 --- a/src/d/actor/d_a_npc_midp.cpp +++ b/src/d/actor/d_a_npc_midp.cpp @@ -619,7 +619,7 @@ static actor_method_class daNpc_midP_MethodTable = { (process_method_func)daNpc_midP_Draw, }; -extern actor_process_profile_definition g_profile_NPC_MIDP = { +actor_process_profile_definition g_profile_NPC_MIDP = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_mk.cpp b/src/d/actor/d_a_npc_mk.cpp index c279c03664..d9775816f8 100644 --- a/src/d/actor/d_a_npc_mk.cpp +++ b/src/d/actor/d_a_npc_mk.cpp @@ -35,7 +35,7 @@ static actor_method_class daNpc_Mk_MethodTable = { (process_method_func)daNpc_Mk_Draw, }; -extern actor_process_profile_definition g_profile_NPC_MK = { +actor_process_profile_definition g_profile_NPC_MK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_moi.cpp b/src/d/actor/d_a_npc_moi.cpp index cacf6e2368..13f2e9749b 100644 --- a/src/d/actor/d_a_npc_moi.cpp +++ b/src/d/actor/d_a_npc_moi.cpp @@ -1976,7 +1976,7 @@ static actor_method_class daNpc_Moi_MethodTable = { (process_method_func)daNpc_Moi_Draw, }; -extern actor_process_profile_definition g_profile_NPC_MOI = { +actor_process_profile_definition g_profile_NPC_MOI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp index 13f879df14..de4fcee8dc 100644 --- a/src/d/actor/d_a_npc_moir.cpp +++ b/src/d/actor/d_a_npc_moir.cpp @@ -2018,7 +2018,7 @@ static actor_method_class daNpcMoiR_MethodTable = { (process_method_func)daNpcMoiR_Draw, }; -extern actor_process_profile_definition g_profile_NPC_MOIR = { +actor_process_profile_definition g_profile_NPC_MOIR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_myna2.cpp b/src/d/actor/d_a_npc_myna2.cpp index 2ac5933d2f..96b0e67bf1 100644 --- a/src/d/actor/d_a_npc_myna2.cpp +++ b/src/d/actor/d_a_npc_myna2.cpp @@ -1335,7 +1335,7 @@ static actor_method_class daNpc_myna2_MethodTable = { (process_method_func)daNpc_myna2_Draw, }; -extern actor_process_profile_definition g_profile_MYNA2 = { +actor_process_profile_definition g_profile_MYNA2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp index 496e90a3c1..3aa0c95b08 100644 --- a/src/d/actor/d_a_npc_ne.cpp +++ b/src/d/actor/d_a_npc_ne.cpp @@ -300,7 +300,6 @@ static s16 climb_angle_get(npc_ne_class* i_this) { return 0; } -/* 80A92AC5 0003+00 data_80A92AC5 None */ static bool hio_set; static daNpc_Ne_HIO_c l_HIO; @@ -3177,7 +3176,6 @@ static cPhs__Step daNpc_Ne_Create(fopAc_ac_c* i_this) { i_this->health = 1; _this->field_0x560 = 1; - /* 80A92950-80A92990 000360 0040+00 1/1 0/0 0/0 .data cc_sph_src$7518 */ static dCcD_SrcSph cc_sph_src = { { {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x75}}, // mObj @@ -3190,7 +3188,6 @@ static cPhs__Step daNpc_Ne_Create(fopAc_ac_c* i_this) { } // mSphAttr }; - /* 80A92990-80A929D0 0003A0 0040+00 1/1 0/0 0/0 .data at_sph_src$7519 */ static dCcD_SrcSph at_sph_src = { { {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x1f}, {0x0, 0x0}, 0x0}}, // mObj @@ -3257,7 +3254,7 @@ static actor_method_class l_daNpc_Ne_Method = { (process_method_func)daNpc_Ne_Draw, }; -extern actor_process_profile_definition g_profile_NPC_NE = { +actor_process_profile_definition g_profile_NPC_NE = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_p2.cpp b/src/d/actor/d_a_npc_p2.cpp index 4b2edf7db0..181cf352b0 100644 --- a/src/d/actor/d_a_npc_p2.cpp +++ b/src/d/actor/d_a_npc_p2.cpp @@ -35,7 +35,7 @@ static actor_method_class daNpc_P2MethodTable = { (process_method_func)daNpc_P2Draw, }; -extern actor_process_profile_definition g_profile_NPC_P2 = { +actor_process_profile_definition g_profile_NPC_P2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_pachi_besu.cpp b/src/d/actor/d_a_npc_pachi_besu.cpp index a4e02c2211..8fbdd03c22 100644 --- a/src/d/actor/d_a_npc_pachi_besu.cpp +++ b/src/d/actor/d_a_npc_pachi_besu.cpp @@ -1544,7 +1544,7 @@ static actor_method_class daNpc_Pachi_Besu_MethodTable = { (process_method_func)daNpc_Pachi_Besu_Draw, }; -extern actor_process_profile_definition g_profile_NPC_PACHI_BESU = { +actor_process_profile_definition g_profile_NPC_PACHI_BESU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_pachi_maro.cpp b/src/d/actor/d_a_npc_pachi_maro.cpp index f392fc6717..0685272d75 100644 --- a/src/d/actor/d_a_npc_pachi_maro.cpp +++ b/src/d/actor/d_a_npc_pachi_maro.cpp @@ -1663,7 +1663,7 @@ static actor_method_class daNpc_Pachi_Maro_MethodTable = { (process_method_func)daNpc_Pachi_Maro_Draw, }; -extern actor_process_profile_definition g_profile_NPC_PACHI_MARO = { +actor_process_profile_definition g_profile_NPC_PACHI_MARO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_pachi_taro.cpp b/src/d/actor/d_a_npc_pachi_taro.cpp index 8b7c1cc658..9ca34144e4 100644 --- a/src/d/actor/d_a_npc_pachi_taro.cpp +++ b/src/d/actor/d_a_npc_pachi_taro.cpp @@ -2556,7 +2556,7 @@ static actor_method_class daNpc_Pachi_Taro_MethodTable = { (process_method_func)daNpc_Pachi_Taro_Draw, }; -extern actor_process_profile_definition g_profile_NPC_PACHI_TARO = { +actor_process_profile_definition g_profile_NPC_PACHI_TARO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_passer.cpp b/src/d/actor/d_a_npc_passer.cpp index f9c4599a4f..144542d9d6 100644 --- a/src/d/actor/d_a_npc_passer.cpp +++ b/src/d/actor/d_a_npc_passer.cpp @@ -1159,7 +1159,7 @@ static actor_method_class daNpcPasser_METHODS = { (process_method_func)daNpcPasser_Draw, }; -extern actor_process_profile_definition g_profile_NPC_PASSER = { +actor_process_profile_definition g_profile_NPC_PASSER = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_passer2.cpp b/src/d/actor/d_a_npc_passer2.cpp index 848693890f..4889cb7398 100644 --- a/src/d/actor/d_a_npc_passer2.cpp +++ b/src/d/actor/d_a_npc_passer2.cpp @@ -378,7 +378,7 @@ static actor_method_class daNpcPasser2_METHODS = { (process_method_func)daNpcPasser2_Draw, }; -extern actor_process_profile_definition g_profile_NPC_PASSER2 = { +actor_process_profile_definition g_profile_NPC_PASSER2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_post.cpp b/src/d/actor/d_a_npc_post.cpp index 07f65ecd49..f82ef91e57 100644 --- a/src/d/actor/d_a_npc_post.cpp +++ b/src/d/actor/d_a_npc_post.cpp @@ -1561,7 +1561,7 @@ static actor_method_class daNpc_Post_MethodTable = { (process_method_func)daNpc_Post_Draw, }; -extern actor_process_profile_definition g_profile_NPC_POST = { +actor_process_profile_definition g_profile_NPC_POST = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_pouya.cpp b/src/d/actor/d_a_npc_pouya.cpp index c031090c8f..2129c5c52f 100644 --- a/src/d/actor/d_a_npc_pouya.cpp +++ b/src/d/actor/d_a_npc_pouya.cpp @@ -1197,7 +1197,7 @@ static actor_method_class daNpc_Pouya_MethodTable = { (process_method_func)daNpc_Pouya_Draw, }; -extern actor_process_profile_definition g_profile_NPC_POUYA = { +actor_process_profile_definition g_profile_NPC_POUYA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_prayer.cpp b/src/d/actor/d_a_npc_prayer.cpp index d8f17fa771..57fcebbc69 100644 --- a/src/d/actor/d_a_npc_prayer.cpp +++ b/src/d/actor/d_a_npc_prayer.cpp @@ -824,7 +824,7 @@ static actor_method_class daNpcPray_MethodTable = { (process_method_func)daNpcPray_Draw, }; -extern actor_process_profile_definition g_profile_NPC_PRAYER = { +actor_process_profile_definition g_profile_NPC_PRAYER = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_raca.cpp b/src/d/actor/d_a_npc_raca.cpp index 2fe7966305..8452338247 100644 --- a/src/d/actor/d_a_npc_raca.cpp +++ b/src/d/actor/d_a_npc_raca.cpp @@ -825,7 +825,7 @@ static actor_method_class daNpc_Raca_MethodTable = { (process_method_func)daNpc_Raca_Draw, }; -extern actor_process_profile_definition g_profile_NPC_RACA = { +actor_process_profile_definition g_profile_NPC_RACA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_rafrel.cpp b/src/d/actor/d_a_npc_rafrel.cpp index c9a1166a07..e35c843276 100644 --- a/src/d/actor/d_a_npc_rafrel.cpp +++ b/src/d/actor/d_a_npc_rafrel.cpp @@ -1776,7 +1776,7 @@ static actor_method_class daNpcRafrel_MethodTable = { (process_method_func)daNpcRafrel_Draw, }; -extern actor_process_profile_definition g_profile_NPC_RAFREL = { +actor_process_profile_definition g_profile_NPC_RAFREL = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_saru.cpp b/src/d/actor/d_a_npc_saru.cpp index 735152b035..6096224406 100644 --- a/src/d/actor/d_a_npc_saru.cpp +++ b/src/d/actor/d_a_npc_saru.cpp @@ -1210,7 +1210,7 @@ static actor_method_class daNpc_Saru_MethodTable = { (process_method_func)daNpc_Saru_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SARU = { +actor_process_profile_definition g_profile_NPC_SARU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_seib.cpp b/src/d/actor/d_a_npc_seib.cpp index 6544919b9a..129ae3fb7e 100644 --- a/src/d/actor/d_a_npc_seib.cpp +++ b/src/d/actor/d_a_npc_seib.cpp @@ -531,7 +531,7 @@ static actor_method_class daNpc_seiB_MethodTable = { (process_method_func)daNpc_seiB_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SEIB = { +actor_process_profile_definition g_profile_NPC_SEIB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_seic.cpp b/src/d/actor/d_a_npc_seic.cpp index 6c32627cf8..1fca422939 100644 --- a/src/d/actor/d_a_npc_seic.cpp +++ b/src/d/actor/d_a_npc_seic.cpp @@ -486,7 +486,7 @@ static actor_method_class daNpc_seiC_MethodTable = { (process_method_func)daNpc_seiC_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SEIC = { +actor_process_profile_definition g_profile_NPC_SEIC = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_seid.cpp b/src/d/actor/d_a_npc_seid.cpp index 431cac1c9a..f5ae798253 100644 --- a/src/d/actor/d_a_npc_seid.cpp +++ b/src/d/actor/d_a_npc_seid.cpp @@ -484,7 +484,7 @@ static actor_method_class daNpc_seiD_MethodTable = { (process_method_func)daNpc_seiD_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SEID = { +actor_process_profile_definition g_profile_NPC_SEID = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_seira.cpp b/src/d/actor/d_a_npc_seira.cpp index ed6f43831d..7bf59cff96 100644 --- a/src/d/actor/d_a_npc_seira.cpp +++ b/src/d/actor/d_a_npc_seira.cpp @@ -1382,7 +1382,7 @@ static actor_method_class daNpc_Seira_MethodTable = { (process_method_func)daNpc_Seira_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SEIRA = { +actor_process_profile_definition g_profile_NPC_SEIRA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_seira2.cpp b/src/d/actor/d_a_npc_seira2.cpp index 902dacf90c..692d74d1cf 100644 --- a/src/d/actor/d_a_npc_seira2.cpp +++ b/src/d/actor/d_a_npc_seira2.cpp @@ -1097,7 +1097,7 @@ static actor_method_class daNpc_Seira2_MethodTable = { (process_method_func)daNpc_Seira2_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SERA2 = { +actor_process_profile_definition g_profile_NPC_SERA2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_seirei.cpp b/src/d/actor/d_a_npc_seirei.cpp index 6fd3d7152d..d9984b9047 100644 --- a/src/d/actor/d_a_npc_seirei.cpp +++ b/src/d/actor/d_a_npc_seirei.cpp @@ -797,7 +797,7 @@ static actor_method_class daNpc_Seirei_MethodTable = { (process_method_func)daNpc_Seirei_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SEIREI = { +actor_process_profile_definition g_profile_NPC_SEIREI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_shad.cpp b/src/d/actor/d_a_npc_shad.cpp index 9fac537355..9ee4e08486 100644 --- a/src/d/actor/d_a_npc_shad.cpp +++ b/src/d/actor/d_a_npc_shad.cpp @@ -2645,7 +2645,7 @@ static actor_method_class daNpcShad_MethodTable = { (process_method_func)daNpcShad_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SHAD = { +actor_process_profile_definition g_profile_NPC_SHAD = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_shaman.cpp b/src/d/actor/d_a_npc_shaman.cpp index 2fd65efc6d..d54e922857 100644 --- a/src/d/actor/d_a_npc_shaman.cpp +++ b/src/d/actor/d_a_npc_shaman.cpp @@ -1253,7 +1253,7 @@ static actor_method_class daNpc_Sha_MethodTable = { (process_method_func)daNpc_Sha_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SHAMAN = { +actor_process_profile_definition g_profile_NPC_SHAMAN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_shoe.cpp b/src/d/actor/d_a_npc_shoe.cpp index eb2db6c90b..40d70575c3 100644 --- a/src/d/actor/d_a_npc_shoe.cpp +++ b/src/d/actor/d_a_npc_shoe.cpp @@ -158,7 +158,7 @@ cPhs__Step daNpcShoe_c::Create() { mCcCyl.SetTgSPrm(0); mGndChk = mAcch.m_gnd; - mGroundH = mAcch.m_ground_h; + mGroundH = mAcch.GetGroundH(); gravity = mpHIO->m.common.gravity; setEnvTevColor(); @@ -742,7 +742,7 @@ static actor_method_class daNpcShoe_MethodTable = { (process_method_func)daNpcShoe_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SHOE = { +actor_process_profile_definition g_profile_NPC_SHOE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_shop0.cpp b/src/d/actor/d_a_npc_shop0.cpp index 4a17fb849b..3be79434ac 100644 --- a/src/d/actor/d_a_npc_shop0.cpp +++ b/src/d/actor/d_a_npc_shop0.cpp @@ -347,7 +347,7 @@ static actor_method_class daNpc_Shop0_MethodTable = { daNpc_Shop0_Create, daNpc_Shop0_Delete, daNpc_Shop0_Execute, daNpc_Shop0_IsDelete, daNpc_Shop0_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SHOP0 = { +actor_process_profile_definition g_profile_NPC_SHOP0 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_shop_maro.cpp b/src/d/actor/d_a_npc_shop_maro.cpp index fb404f1bb5..13133a1355 100644 --- a/src/d/actor/d_a_npc_shop_maro.cpp +++ b/src/d/actor/d_a_npc_shop_maro.cpp @@ -41,7 +41,7 @@ static actor_method_class daNpc_shopMaro_MethodTable = { (process_method_func)daNpc_shopMaro_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SMARO = { +actor_process_profile_definition g_profile_NPC_SMARO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_soldierA.cpp b/src/d/actor/d_a_npc_soldierA.cpp index 6379d31539..80dabacb74 100644 --- a/src/d/actor/d_a_npc_soldierA.cpp +++ b/src/d/actor/d_a_npc_soldierA.cpp @@ -1149,7 +1149,7 @@ static actor_method_class daNpc_SoldierA_MethodTable = { (process_method_func)daNpc_SoldierA_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SOLDIERa = { +actor_process_profile_definition g_profile_NPC_SOLDIERa = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_soldierB.cpp b/src/d/actor/d_a_npc_soldierB.cpp index 4e86992e73..deacd75f6a 100644 --- a/src/d/actor/d_a_npc_soldierB.cpp +++ b/src/d/actor/d_a_npc_soldierB.cpp @@ -977,7 +977,7 @@ static actor_method_class daNpc_SoldierB_MethodTable = { (process_method_func)daNpc_SoldierB_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SOLDIERb = { +actor_process_profile_definition g_profile_NPC_SOLDIERb = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_sq.cpp b/src/d/actor/d_a_npc_sq.cpp index e51ad61dc1..834cd33476 100644 --- a/src/d/actor/d_a_npc_sq.cpp +++ b/src/d/actor/d_a_npc_sq.cpp @@ -389,7 +389,7 @@ static actor_method_class l_daNpc_Sq_Method = { (process_method_func)daNpc_Sq_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SQ = { +actor_process_profile_definition g_profile_NPC_SQ = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index 1a8072004e..6585bbd22c 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -3382,7 +3382,7 @@ static actor_method_class daNpc_Taro_MethodTable = { (process_method_func)daNpc_Taro_Draw, }; -extern actor_process_profile_definition g_profile_NPC_TARO = { +actor_process_profile_definition g_profile_NPC_TARO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp index cd1e0c7b63..c02974579d 100644 --- a/src/d/actor/d_a_npc_the.cpp +++ b/src/d/actor/d_a_npc_the.cpp @@ -1345,7 +1345,7 @@ static actor_method_class daNpcThe_MethodTable = { (process_method_func)daNpcThe_Draw, }; -extern actor_process_profile_definition g_profile_NPC_THE = { +actor_process_profile_definition g_profile_NPC_THE = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_theB.cpp b/src/d/actor/d_a_npc_theB.cpp index 26f68b50fa..31261fd91a 100644 --- a/src/d/actor/d_a_npc_theB.cpp +++ b/src/d/actor/d_a_npc_theB.cpp @@ -1575,7 +1575,7 @@ static actor_method_class daNpcTheB_MethodTable = { (process_method_func)daNpcTheB_Draw, }; -extern actor_process_profile_definition g_profile_NPC_THEB = { +actor_process_profile_definition g_profile_NPC_THEB = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_tk.cpp b/src/d/actor/d_a_npc_tk.cpp index d0c8e12edc..61e4884bdf 100644 --- a/src/d/actor/d_a_npc_tk.cpp +++ b/src/d/actor/d_a_npc_tk.cpp @@ -3194,7 +3194,6 @@ static int useHeapInit(fopAc_ac_c* i_this) { } int daNPC_TK_c::create() { - /* 80B0C4D4-80B0C514 0000E0 0040+00 1/1 0/0 0/0 .data cc_sph_src$8096 */ static dCcD_SrcSph cc_sph_src = { { {0x0, {{AT_TYPE_THROW_OBJ, 0x1, 0x1f}, {0x0, 0x0}, 0x69}}, // mObj @@ -3264,7 +3263,7 @@ static actor_method_class l_daNPC_TK_Method = { (process_method_func)daNPC_TK_Draw, }; -extern actor_process_profile_definition g_profile_NPC_TK = { +actor_process_profile_definition g_profile_NPC_TK = { fpcLy_CURRENT_e, // mLayerID 6, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_tkc.cpp b/src/d/actor/d_a_npc_tkc.cpp index 1ec8a25c18..91ba23f714 100644 --- a/src/d/actor/d_a_npc_tkc.cpp +++ b/src/d/actor/d_a_npc_tkc.cpp @@ -1387,7 +1387,7 @@ static actor_method_class daNpcTkc_MethodTable = { (process_method_func)daNpcTkc_Draw, }; -extern actor_process_profile_definition g_profile_NPC_TKC = { +actor_process_profile_definition g_profile_NPC_TKC = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_tkj.cpp b/src/d/actor/d_a_npc_tkj.cpp index 46c57e776d..3127a4a338 100644 --- a/src/d/actor/d_a_npc_tkj.cpp +++ b/src/d/actor/d_a_npc_tkj.cpp @@ -664,7 +664,7 @@ static actor_method_class daNpc_Tkj_MethodTable = { (process_method_func)daNpc_Tkj_Draw, }; -extern actor_process_profile_definition g_profile_NPC_TKJ = { +actor_process_profile_definition g_profile_NPC_TKJ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_tkj2.cpp b/src/d/actor/d_a_npc_tkj2.cpp index 616b263fde..9387988865 100644 --- a/src/d/actor/d_a_npc_tkj2.cpp +++ b/src/d/actor/d_a_npc_tkj2.cpp @@ -1156,7 +1156,7 @@ static actor_method_class l_daNpc_Tkj2_Method = { (process_method_func)daNpc_Tkj2_Draw, }; -extern actor_process_profile_definition g_profile_NPC_TKJ2 = { +actor_process_profile_definition g_profile_NPC_TKJ2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_tks.cpp b/src/d/actor/d_a_npc_tks.cpp index ce20c8387b..b60efb4595 100644 --- a/src/d/actor/d_a_npc_tks.cpp +++ b/src/d/actor/d_a_npc_tks.cpp @@ -1035,7 +1035,7 @@ void daNpcTks_c::waitNude() { if (fVar1 > -200.0f && fVar1 < 150.0f && fopAcM_searchPlayerDistanceXZ(this) <= 300.0f) { if (!fopAcM_otherBgCheck(this, daPy_getPlayerActorClass())) { - eventInfo.onCondition(dEvtCmd_INTALK_e); + eventInfo.onCondition(dEvtCnd_CANTALK_e); fopAcM_orderSpeakEvent(this, 0, 0); } } @@ -1089,7 +1089,7 @@ void daNpcTks_c::waitLv6() { if (current.pos.y - fopAcM_GetPosition_p(daPy_getPlayerActorClass())->y < 100.0f && fopAcM_searchPlayerDistanceXZ(this) <= 400.0f) { attention_info.flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e; - eventInfo.onCondition(dEvtCmd_INTALK_e); + eventInfo.onCondition(dEvtCnd_CANTALK_e); fopAcM_orderSpeakEvent(this, 0, 0); } @@ -3019,7 +3019,7 @@ static actor_method_class daNpcTks_MethodTable = { (process_method_func)daNpcTks_Draw, }; -extern actor_process_profile_definition g_profile_NPC_TKS = { +actor_process_profile_definition g_profile_NPC_TKS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp index e8d9eeaf6e..c47fd622e3 100644 --- a/src/d/actor/d_a_npc_toby.cpp +++ b/src/d/actor/d_a_npc_toby.cpp @@ -2231,7 +2231,7 @@ static actor_method_class daNpc_Toby_MethodTable = { (process_method_func)daNpc_Toby_Draw, }; -extern actor_process_profile_definition g_profile_NPC_TOBY = { +actor_process_profile_definition g_profile_NPC_TOBY = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_tr.cpp b/src/d/actor/d_a_npc_tr.cpp index e41ece6b77..cc30258dcd 100644 --- a/src/d/actor/d_a_npc_tr.cpp +++ b/src/d/actor/d_a_npc_tr.cpp @@ -253,7 +253,7 @@ static actor_method_class l_daNPC_TR_Method = { (process_method_func)daNPC_TR_Draw, }; -extern actor_process_profile_definition g_profile_NPC_TR = { +actor_process_profile_definition g_profile_NPC_TR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_uri.cpp b/src/d/actor/d_a_npc_uri.cpp index 19bd6160bc..0482eeeb79 100644 --- a/src/d/actor/d_a_npc_uri.cpp +++ b/src/d/actor/d_a_npc_uri.cpp @@ -1905,7 +1905,7 @@ static actor_method_class daNpc_Uri_MethodTable = { (process_method_func)daNpc_Uri_Draw, }; -extern actor_process_profile_definition g_profile_NPC_URI = { +actor_process_profile_definition g_profile_NPC_URI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_worm.cpp b/src/d/actor/d_a_npc_worm.cpp index cba5eaa209..50789f2e80 100644 --- a/src/d/actor/d_a_npc_worm.cpp +++ b/src/d/actor/d_a_npc_worm.cpp @@ -400,7 +400,7 @@ static actor_method_class l_daNPC_WORM_Method = { (process_method_func)daNPC_WORM_Draw, }; -extern actor_process_profile_definition g_profile_NPC_WORM = { +actor_process_profile_definition g_profile_NPC_WORM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index 10d86a5df1..008133fc49 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -5219,7 +5219,7 @@ static actor_method_class daNpcWrestler_MethodTable = { (process_method_func)daNpcWrestler_Draw, }; -extern actor_process_profile_definition g_profile_NPC_WRESTLER = { +actor_process_profile_definition g_profile_NPC_WRESTLER = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_yamid.cpp b/src/d/actor/d_a_npc_yamid.cpp index 3018f1415c..cfa98ce53f 100644 --- a/src/d/actor/d_a_npc_yamid.cpp +++ b/src/d/actor/d_a_npc_yamid.cpp @@ -794,7 +794,7 @@ static actor_method_class daNpc_yamiD_MethodTable = { (process_method_func)daNpc_yamiD_Draw, }; -extern actor_process_profile_definition g_profile_NPC_YAMID = { +actor_process_profile_definition g_profile_NPC_YAMID = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_yamis.cpp b/src/d/actor/d_a_npc_yamis.cpp index 021fef2f9c..4eafe9a6e3 100644 --- a/src/d/actor/d_a_npc_yamis.cpp +++ b/src/d/actor/d_a_npc_yamis.cpp @@ -725,7 +725,7 @@ static actor_method_class daNpc_yamiS_MethodTable = { (process_method_func)daNpc_yamiS_Draw, }; -extern actor_process_profile_definition g_profile_NPC_YAMIS = { +actor_process_profile_definition g_profile_NPC_YAMIS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_yamit.cpp b/src/d/actor/d_a_npc_yamit.cpp index 400752c649..c281758b95 100644 --- a/src/d/actor/d_a_npc_yamit.cpp +++ b/src/d/actor/d_a_npc_yamit.cpp @@ -754,7 +754,7 @@ static actor_method_class daNpc_yamiT_MethodTable = { (process_method_func)daNpc_yamiT_Draw, }; -extern actor_process_profile_definition g_profile_NPC_YAMIT = { +actor_process_profile_definition g_profile_NPC_YAMIT = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_yelia.cpp b/src/d/actor/d_a_npc_yelia.cpp index 0327d88d6b..ecb987c996 100644 --- a/src/d/actor/d_a_npc_yelia.cpp +++ b/src/d/actor/d_a_npc_yelia.cpp @@ -348,11 +348,8 @@ daNpc_Yelia_c::~daNpc_Yelia_c() { } cPhs__Step daNpc_Yelia_c::create() { - if (!fopAcM_CheckCondition(this, fopAcCnd_INIT_e)) { - new (this) daNpc_Yelia_c(l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4, - l_motionSequenceData, 4, l_evtList, l_resNameList); - fopAcM_OnCondition(this, fopAcCnd_INIT_e); - } + daNpcT_ct(this, daNpc_Yelia_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4, + l_motionSequenceData, 4, l_evtList, l_resNameList); mType = getType(); mFlowNodeNo = getFlowNodeNo(); @@ -1559,7 +1556,7 @@ static actor_method_class daNpc_Yelia_MethodTable = { (process_method_func)daNpc_Yelia_Draw, }; -extern actor_process_profile_definition g_profile_NPC_YELIA = { +actor_process_profile_definition g_profile_NPC_YELIA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_ykm.cpp b/src/d/actor/d_a_npc_ykm.cpp index 543e3f5559..44793b7c8f 100644 --- a/src/d/actor/d_a_npc_ykm.cpp +++ b/src/d/actor/d_a_npc_ykm.cpp @@ -3746,7 +3746,7 @@ static actor_method_class daNpc_ykM_MethodTable = { (process_method_func)daNpc_ykM_Draw, }; -extern actor_process_profile_definition g_profile_NPC_YKM = { +actor_process_profile_definition g_profile_NPC_YKM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp index db9f8bdb69..24dcf7a925 100644 --- a/src/d/actor/d_a_npc_ykw.cpp +++ b/src/d/actor/d_a_npc_ykw.cpp @@ -3042,7 +3042,7 @@ static actor_method_class daNpc_ykW_MethodTable = { (process_method_func)daNpc_ykW_Draw, }; -extern actor_process_profile_definition g_profile_NPC_YKW = { +actor_process_profile_definition g_profile_NPC_YKW = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_zanb.cpp b/src/d/actor/d_a_npc_zanb.cpp index 03285707f5..072467a470 100644 --- a/src/d/actor/d_a_npc_zanb.cpp +++ b/src/d/actor/d_a_npc_zanb.cpp @@ -711,7 +711,7 @@ static actor_method_class daNpc_zanB_MethodTable = { (process_method_func)daNpc_zanB_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ZANB = { +actor_process_profile_definition g_profile_NPC_ZANB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_zant.cpp b/src/d/actor/d_a_npc_zant.cpp index bab7bd7d70..0a385505c2 100644 --- a/src/d/actor/d_a_npc_zant.cpp +++ b/src/d/actor/d_a_npc_zant.cpp @@ -105,7 +105,7 @@ int daNpc_Zant_c::create() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; - mGroundH = mAcch.m_ground_h; + mGroundH = mAcch.GetGroundH(); if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); @@ -532,7 +532,7 @@ static actor_method_class daNpc_Zant_MethodTable = { (process_method_func)daNpc_Zant_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ZANT = { +actor_process_profile_definition g_profile_NPC_ZANT = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_zelR.cpp b/src/d/actor/d_a_npc_zelR.cpp index 8d1362e9d5..ce17fc78c4 100644 --- a/src/d/actor/d_a_npc_zelR.cpp +++ b/src/d/actor/d_a_npc_zelR.cpp @@ -148,7 +148,7 @@ int daNpc_ZelR_c::create() { mAcch.Set(¤t.pos, &old.pos, this, 1, &mAcchCir, &speed, ¤t.angle, &shape_angle); mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; - mGroundH = mAcch.m_ground_h; + mGroundH = mAcch.GetGroundH(); setEnvTevColor(); setRoomNo(); @@ -603,7 +603,7 @@ static actor_method_class daNpc_ZelR_MethodTable = { (process_method_func)daNpc_ZelR_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ZELR = { +actor_process_profile_definition g_profile_NPC_ZELR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_zelRo.cpp b/src/d/actor/d_a_npc_zelRo.cpp index a80d0770bb..dd042dbb28 100644 --- a/src/d/actor/d_a_npc_zelRo.cpp +++ b/src/d/actor/d_a_npc_zelRo.cpp @@ -661,7 +661,7 @@ static actor_method_class daNpc_ZelRo_MethodTable = { (process_method_func)daNpc_ZelRo_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ZELRO = { +actor_process_profile_definition g_profile_NPC_ZELRO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_zelda.cpp b/src/d/actor/d_a_npc_zelda.cpp index e3c3239c5b..0010b053ef 100644 --- a/src/d/actor/d_a_npc_zelda.cpp +++ b/src/d/actor/d_a_npc_zelda.cpp @@ -795,7 +795,7 @@ static actor_method_class daNpc_Zelda_MethodTable = { (process_method_func)daNpc_Zelda_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ZELDA = { +actor_process_profile_definition g_profile_NPC_ZELDA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_zra.cpp b/src/d/actor/d_a_npc_zra.cpp index 75547eef93..9631856f8a 100644 --- a/src/d/actor/d_a_npc_zra.cpp +++ b/src/d/actor/d_a_npc_zra.cpp @@ -2319,7 +2319,7 @@ static actor_method_class daNpc_zrA_MethodTable = { (process_method_func)daNpc_zrA_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ZRA = { +actor_process_profile_definition g_profile_NPC_ZRA = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_zra.inc b/src/d/actor/d_a_npc_zra.inc index 05503f3087..4fa5b46b87 100644 --- a/src/d/actor/d_a_npc_zra.inc +++ b/src/d/actor/d_a_npc_zra.inc @@ -1,4 +1,3 @@ -/* 80B7F8C4-80B7FD10 0074A4 044C+00 3/0 0/0 0/0 .text wait__11daNpc_zrA_cFPv */ BOOL daNpc_zrA_c::wait(void* param_0) { switch (mMode) { case 0: diff --git a/src/d/actor/d_a_npc_zrc.cpp b/src/d/actor/d_a_npc_zrc.cpp index 52dd101dd5..c6245ebae9 100644 --- a/src/d/actor/d_a_npc_zrc.cpp +++ b/src/d/actor/d_a_npc_zrc.cpp @@ -1769,7 +1769,7 @@ static actor_method_class daNpc_zrC_MethodTable = { (process_method_func)daNpc_zrC_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ZRC = { +actor_process_profile_definition g_profile_NPC_ZRC = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_zrz.cpp b/src/d/actor/d_a_npc_zrz.cpp index 4efb47ccc3..62cf3a6b8f 100644 --- a/src/d/actor/d_a_npc_zrz.cpp +++ b/src/d/actor/d_a_npc_zrz.cpp @@ -2423,7 +2423,7 @@ static actor_method_class daNpc_zrZ_MethodTable = { (process_method_func)daNpc_zrZ_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ZRZ = { +actor_process_profile_definition g_profile_NPC_ZRZ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_Lv5Key.cpp b/src/d/actor/d_a_obj_Lv5Key.cpp index 43845629dd..f6251271d4 100644 --- a/src/d/actor/d_a_obj_Lv5Key.cpp +++ b/src/d/actor/d_a_obj_Lv5Key.cpp @@ -339,7 +339,7 @@ static actor_method_class l_daObjLv5Key_Method = { (process_method_func)daObjLv5Key_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv5Key = { +actor_process_profile_definition g_profile_Obj_Lv5Key = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_Turara.cpp b/src/d/actor/d_a_obj_Turara.cpp index b1fffc09ee..c847b96223 100644 --- a/src/d/actor/d_a_obj_Turara.cpp +++ b/src/d/actor/d_a_obj_Turara.cpp @@ -416,7 +416,7 @@ static actor_method_class l_daTurara_Method = { (process_method_func)daTurara_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Turara = { +actor_process_profile_definition g_profile_Obj_Turara = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_TvCdlst.cpp b/src/d/actor/d_a_obj_TvCdlst.cpp index 7c44b64ff7..8f07b81887 100644 --- a/src/d/actor/d_a_obj_TvCdlst.cpp +++ b/src/d/actor/d_a_obj_TvCdlst.cpp @@ -220,7 +220,7 @@ static actor_method_class l_daTvCdlst_Method = { (process_method_func)daTvCdlst_Draw, }; -extern actor_process_profile_definition g_profile_Obj_TvCdlst = { +actor_process_profile_definition g_profile_Obj_TvCdlst = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_Y_taihou.cpp b/src/d/actor/d_a_obj_Y_taihou.cpp index 5a9e8dcdba..cf51e021af 100644 --- a/src/d/actor/d_a_obj_Y_taihou.cpp +++ b/src/d/actor/d_a_obj_Y_taihou.cpp @@ -379,7 +379,7 @@ static actor_method_class daObjYtaihou_METHODS = { (process_method_func)daObjYtaihou_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Ytaihou = { +actor_process_profile_definition g_profile_Obj_Ytaihou = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_amiShutter.cpp b/src/d/actor/d_a_obj_amiShutter.cpp index 9eed1d4c4b..a6554a9d8a 100644 --- a/src/d/actor/d_a_obj_amiShutter.cpp +++ b/src/d/actor/d_a_obj_amiShutter.cpp @@ -297,7 +297,7 @@ actor_method_class l_daAmiShutter_Method = { }; -extern actor_process_profile_definition g_profile_Obj_AmiShutter = { +actor_process_profile_definition g_profile_Obj_AmiShutter = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ari.cpp b/src/d/actor/d_a_obj_ari.cpp index ee0c02efd4..0250f14643 100644 --- a/src/d/actor/d_a_obj_ari.cpp +++ b/src/d/actor/d_a_obj_ari.cpp @@ -738,7 +738,7 @@ static actor_method_class l_daObjARI_Method = { (process_method_func)daObjARI_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Ari = { +actor_process_profile_definition g_profile_Obj_Ari = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_automata.cpp b/src/d/actor/d_a_obj_automata.cpp index a8a9090ede..aecb349f3e 100644 --- a/src/d/actor/d_a_obj_automata.cpp +++ b/src/d/actor/d_a_obj_automata.cpp @@ -309,7 +309,7 @@ static actor_method_class daObj_AutoMata_MethodTable = { (process_method_func)daObj_AutoMata_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_AUTOMATA = { +actor_process_profile_definition g_profile_OBJ_AUTOMATA = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_avalanche.cpp b/src/d/actor/d_a_obj_avalanche.cpp index 013ace1dc1..23b4daf8fa 100644 --- a/src/d/actor/d_a_obj_avalanche.cpp +++ b/src/d/actor/d_a_obj_avalanche.cpp @@ -298,7 +298,7 @@ static actor_method_class daObjAvalanche_METHODS = { (process_method_func)daObjAvalanche_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Avalanche = { +actor_process_profile_definition g_profile_Obj_Avalanche = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_balloon.cpp b/src/d/actor/d_a_obj_balloon.cpp index fcbea2b3cb..94e24bf3dc 100644 --- a/src/d/actor/d_a_obj_balloon.cpp +++ b/src/d/actor/d_a_obj_balloon.cpp @@ -295,7 +295,7 @@ static actor_method_class l_daObj_Balloon_Method = { (process_method_func)daObj_Balloon_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_BALLOON = { +actor_process_profile_definition g_profile_OBJ_BALLOON = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_barDesk.cpp b/src/d/actor/d_a_obj_barDesk.cpp index 71ed8871ba..28ba74c407 100644 --- a/src/d/actor/d_a_obj_barDesk.cpp +++ b/src/d/actor/d_a_obj_barDesk.cpp @@ -158,7 +158,7 @@ static actor_method_class l_daBarDesk_Method = { (process_method_func)daBarDesk_Draw, }; -extern actor_process_profile_definition g_profile_Obj_BarDesk = { +actor_process_profile_definition g_profile_Obj_BarDesk = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_batta.cpp b/src/d/actor/d_a_obj_batta.cpp index 120c05a999..a790bc19c6 100644 --- a/src/d/actor/d_a_obj_batta.cpp +++ b/src/d/actor/d_a_obj_batta.cpp @@ -695,7 +695,7 @@ static actor_method_class l_daObjBATTA_Method = { (process_method_func)daObjBATTA_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Batta = { +actor_process_profile_definition g_profile_Obj_Batta = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bbox.cpp b/src/d/actor/d_a_obj_bbox.cpp index 861209be5b..89c373c168 100644 --- a/src/d/actor/d_a_obj_bbox.cpp +++ b/src/d/actor/d_a_obj_bbox.cpp @@ -133,7 +133,7 @@ static actor_method_class daObjBBox_METHODS = { (process_method_func)daObjBBox_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_BBox = { +actor_process_profile_definition g_profile_Obj_BBox = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bed.cpp b/src/d/actor/d_a_obj_bed.cpp index b5d776f286..d2248c3b55 100644 --- a/src/d/actor/d_a_obj_bed.cpp +++ b/src/d/actor/d_a_obj_bed.cpp @@ -180,7 +180,7 @@ static actor_method_class daObj_Bed_MethodTable = { (process_method_func)daObj_Bed_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_BED = { +actor_process_profile_definition g_profile_OBJ_BED = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 8e3ef9a5a8..788e24e294 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -1907,7 +1907,7 @@ static actor_method_class daObjBm_METHODS = { (process_method_func)daObjBm_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Bemos = { +actor_process_profile_definition g_profile_Obj_Bemos = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bhashi.cpp b/src/d/actor/d_a_obj_bhashi.cpp index fc436642b1..a5b7a104ca 100644 --- a/src/d/actor/d_a_obj_bhashi.cpp +++ b/src/d/actor/d_a_obj_bhashi.cpp @@ -500,7 +500,7 @@ static actor_method_class l_daObjBHASHI_Method = { (process_method_func)daObjBHASHI_Draw, }; -extern actor_process_profile_definition g_profile_Obj_BHASHI = { +actor_process_profile_definition g_profile_Obj_BHASHI = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bhbridge.cpp b/src/d/actor/d_a_obj_bhbridge.cpp index 58b3433774..0697f830c3 100644 --- a/src/d/actor/d_a_obj_bhbridge.cpp +++ b/src/d/actor/d_a_obj_bhbridge.cpp @@ -198,7 +198,7 @@ static actor_method_class l_daObjBhbridge_Method = { (process_method_func)daObjBhbridge_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Bhbridge = { +actor_process_profile_definition g_profile_Obj_Bhbridge = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bk_leaf.cpp b/src/d/actor/d_a_obj_bk_leaf.cpp index fddca4fb8e..e5f6a56994 100644 --- a/src/d/actor/d_a_obj_bk_leaf.cpp +++ b/src/d/actor/d_a_obj_bk_leaf.cpp @@ -159,7 +159,7 @@ static actor_method_class l_daBkLeaf_Method = { (process_method_func)daBkLeaf_Draw, }; -extern actor_process_profile_definition g_profile_Obj_BkLeaf = {fpcLy_CURRENT_e, +actor_process_profile_definition g_profile_Obj_BkLeaf = {fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, PROC_Obj_BkLeaf, diff --git a/src/d/actor/d_a_obj_bkdoor.cpp b/src/d/actor/d_a_obj_bkdoor.cpp index d07d39db5d..b7eb850ade 100644 --- a/src/d/actor/d_a_obj_bkdoor.cpp +++ b/src/d/actor/d_a_obj_bkdoor.cpp @@ -204,7 +204,7 @@ static actor_method_class daObjBkDoor_METHODS = { (process_method_func)daObjBkDoor_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_BkDoor = { +actor_process_profile_definition g_profile_Obj_BkDoor = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bky_rock.cpp b/src/d/actor/d_a_obj_bky_rock.cpp index e99526ae5d..fae6153ae1 100644 --- a/src/d/actor/d_a_obj_bky_rock.cpp +++ b/src/d/actor/d_a_obj_bky_rock.cpp @@ -421,7 +421,7 @@ static actor_method_class daBkyRock_METHODS = { (process_method_func)daBkyRock_draw, }; -extern actor_process_profile_definition g_profile_BkyRock = { +actor_process_profile_definition g_profile_BkyRock = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bmWindow.cpp b/src/d/actor/d_a_obj_bmWindow.cpp index 432e7f9bfe..f913dfecbf 100644 --- a/src/d/actor/d_a_obj_bmWindow.cpp +++ b/src/d/actor/d_a_obj_bmWindow.cpp @@ -330,7 +330,7 @@ static actor_method_class l_daBmWindow_Method = { (process_method_func)daBmWindow_Draw, }; -extern actor_process_profile_definition g_profile_Obj_BmWindow = { +actor_process_profile_definition g_profile_Obj_BmWindow = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bmshutter.cpp b/src/d/actor/d_a_obj_bmshutter.cpp index 2de8fa71be..ace4baefe3 100644 --- a/src/d/actor/d_a_obj_bmshutter.cpp +++ b/src/d/actor/d_a_obj_bmshutter.cpp @@ -296,7 +296,7 @@ static actor_method_class l_daObjBmSh_Method = { (process_method_func)daObjBmSh_Draw, }; -extern actor_process_profile_definition g_profile_Obj_BoomShutter = { +actor_process_profile_definition g_profile_Obj_BoomShutter = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bombf.cpp b/src/d/actor/d_a_obj_bombf.cpp index 0a294e9a52..6e837134bc 100644 --- a/src/d/actor/d_a_obj_bombf.cpp +++ b/src/d/actor/d_a_obj_bombf.cpp @@ -113,7 +113,7 @@ static actor_method_class l_daObjBombf_Method = { (process_method_func)daObjBombf_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Bombf = { +actor_process_profile_definition g_profile_Obj_Bombf = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bosswarp.cpp b/src/d/actor/d_a_obj_bosswarp.cpp index bec7a64cbb..a743466f7a 100644 --- a/src/d/actor/d_a_obj_bosswarp.cpp +++ b/src/d/actor/d_a_obj_bosswarp.cpp @@ -669,7 +669,7 @@ static actor_method_class l_daObjBossWarp_Method = { (process_method_func)daObjBossWarp_Draw, }; -extern actor_process_profile_definition g_profile_Obj_BossWarp = { +actor_process_profile_definition g_profile_Obj_BossWarp = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_boumato.cpp b/src/d/actor/d_a_obj_boumato.cpp index 90c0e7d7fd..df2ecc9a70 100644 --- a/src/d/actor/d_a_obj_boumato.cpp +++ b/src/d/actor/d_a_obj_boumato.cpp @@ -84,7 +84,6 @@ int daObj_BouMato_c::CreateHeap() { {0.0f, 300.0f, 0.0f}, }; - // /* 80BBC58C-80BBC598 -00001 000C+00 1/1 0/0 0/0 .data jntCoData$4045 */ static dJntColData_c jntCoData = { 1, 1, 0, 4.0f, jntCoOffset, }; @@ -340,7 +339,7 @@ static actor_method_class daObj_BouMato_MethodTable = { (process_method_func)daObj_BouMato_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_BOUMATO = { +actor_process_profile_definition g_profile_OBJ_BOUMATO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_brakeeff.cpp b/src/d/actor/d_a_obj_brakeeff.cpp index 553c731e48..cf8a2b06b0 100644 --- a/src/d/actor/d_a_obj_brakeeff.cpp +++ b/src/d/actor/d_a_obj_brakeeff.cpp @@ -235,7 +235,7 @@ actor_method_class l_daObj_Brakeeff_Method = { (process_method_func)daObj_Brakeeff_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_BEF = { +actor_process_profile_definition g_profile_OBJ_BEF = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp index 24e6142181..c82fb96e7c 100644 --- a/src/d/actor/d_a_obj_brg.cpp +++ b/src/d/actor/d_a_obj_brg.cpp @@ -353,7 +353,6 @@ static int daObj_Brg_Draw(obj_brg_class* i_this) { return 1; } -/* 80BC2526 0002+00 data_80BC2526 wy */ static s16 wy; static void control1(obj_brg_class* i_this, br_s* i_part) { @@ -1825,7 +1824,7 @@ static actor_method_class l_daObj_Brg_Method = { (process_method_func)daObj_Brg_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_BRG = { +actor_process_profile_definition g_profile_OBJ_BRG = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bsGate.cpp b/src/d/actor/d_a_obj_bsGate.cpp index a150763be3..e74892cfe9 100644 --- a/src/d/actor/d_a_obj_bsGate.cpp +++ b/src/d/actor/d_a_obj_bsGate.cpp @@ -170,7 +170,7 @@ static actor_method_class l_daBsGate_Method = { (process_method_func)daBsGate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_BsGate = { +actor_process_profile_definition g_profile_Obj_BsGate = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bubblePilar.cpp b/src/d/actor/d_a_obj_bubblePilar.cpp index c90a88799c..fd4d53a350 100644 --- a/src/d/actor/d_a_obj_bubblePilar.cpp +++ b/src/d/actor/d_a_obj_bubblePilar.cpp @@ -224,7 +224,7 @@ static actor_method_class l_daBubbPilar_Method = { (process_method_func)daBubbPilar_Draw, }; -extern actor_process_profile_definition g_profile_Obj_awaPlar = { +actor_process_profile_definition g_profile_Obj_awaPlar = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_burnbox.cpp b/src/d/actor/d_a_obj_burnbox.cpp index 8d4c9ac2b5..70b6ce41c6 100644 --- a/src/d/actor/d_a_obj_burnbox.cpp +++ b/src/d/actor/d_a_obj_burnbox.cpp @@ -190,7 +190,7 @@ actor_method_class daObjBurnBox_METHODS = { (process_method_func) daObjBurnBox_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_BurnBox = { +actor_process_profile_definition g_profile_Obj_BurnBox = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index 02dd9b8d92..8363d91bbe 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -4299,7 +4299,7 @@ static actor_method_class l_daObjCarry_Method = { (process_method_func)daObjCarry_Execute, (process_method_func)NULL, (process_method_func)daObjCarry_Draw}; -extern actor_process_profile_definition g_profile_Obj_Carry = { +actor_process_profile_definition g_profile_Obj_Carry = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_catdoor.cpp b/src/d/actor/d_a_obj_catdoor.cpp index 2812e19c66..d60831b6d2 100644 --- a/src/d/actor/d_a_obj_catdoor.cpp +++ b/src/d/actor/d_a_obj_catdoor.cpp @@ -181,7 +181,7 @@ static actor_method_class l_daObjCatDoor_Method = { (process_method_func)daObjCatDoor_Draw, }; -extern actor_process_profile_definition g_profile_Obj_CatDoor = { +actor_process_profile_definition g_profile_Obj_CatDoor = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_cb.cpp b/src/d/actor/d_a_obj_cb.cpp index 23b862399d..9744a71b1e 100644 --- a/src/d/actor/d_a_obj_cb.cpp +++ b/src/d/actor/d_a_obj_cb.cpp @@ -233,7 +233,7 @@ static actor_method_class l_daObj_Cb_Method = { (process_method_func)daObj_Cb_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_CB = { +actor_process_profile_definition g_profile_OBJ_CB = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_cblock.cpp b/src/d/actor/d_a_obj_cblock.cpp index 1575a759ff..fc4a336e62 100644 --- a/src/d/actor/d_a_obj_cblock.cpp +++ b/src/d/actor/d_a_obj_cblock.cpp @@ -407,7 +407,7 @@ static actor_method_class l_daObjCBlk_Method = { (process_method_func)daObjCBlk_Draw, }; -extern actor_process_profile_definition g_profile_Obj_ChainBlock = { +actor_process_profile_definition g_profile_Obj_ChainBlock = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_cboard.cpp b/src/d/actor/d_a_obj_cboard.cpp index 0bf662fb78..a918613f4a 100644 --- a/src/d/actor/d_a_obj_cboard.cpp +++ b/src/d/actor/d_a_obj_cboard.cpp @@ -156,7 +156,7 @@ static actor_method_class daObjBoard_METHODS = { (process_method_func)daObjBoard_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Cboard = { +actor_process_profile_definition g_profile_Obj_Cboard = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_cdoor.cpp b/src/d/actor/d_a_obj_cdoor.cpp index 089c9838e8..d98333c8dd 100644 --- a/src/d/actor/d_a_obj_cdoor.cpp +++ b/src/d/actor/d_a_obj_cdoor.cpp @@ -296,7 +296,7 @@ static actor_method_class l_daObjCdoor_Method = { (process_method_func)daObjCdoor_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Cdoor = { +actor_process_profile_definition g_profile_Obj_Cdoor = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_chandelier.cpp b/src/d/actor/d_a_obj_chandelier.cpp index c45fde1122..9a344acb0c 100644 --- a/src/d/actor/d_a_obj_chandelier.cpp +++ b/src/d/actor/d_a_obj_chandelier.cpp @@ -256,7 +256,7 @@ static actor_method_class daObjChandelier_METHODS = { (process_method_func)daObjChandelier_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Chandelier = { +actor_process_profile_definition g_profile_Obj_Chandelier = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_chest.cpp b/src/d/actor/d_a_obj_chest.cpp index a770f2ab71..8e74fad3e3 100644 --- a/src/d/actor/d_a_obj_chest.cpp +++ b/src/d/actor/d_a_obj_chest.cpp @@ -246,7 +246,7 @@ static actor_method_class l_daObjChest_Method = { (process_method_func)daObjChest_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Chest = { +actor_process_profile_definition g_profile_Obj_Chest = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_cho.cpp b/src/d/actor/d_a_obj_cho.cpp index 51d47ec630..24874778d5 100644 --- a/src/d/actor/d_a_obj_cho.cpp +++ b/src/d/actor/d_a_obj_cho.cpp @@ -605,7 +605,7 @@ static actor_method_class l_daObjCHO_Method = { (process_method_func)daObjCHO_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Cho = { +actor_process_profile_definition g_profile_Obj_Cho = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_cowdoor.cpp b/src/d/actor/d_a_obj_cowdoor.cpp index d54b9459c3..da2151d4d1 100644 --- a/src/d/actor/d_a_obj_cowdoor.cpp +++ b/src/d/actor/d_a_obj_cowdoor.cpp @@ -91,7 +91,7 @@ static actor_method_class l_daCowdoor_Method = { (process_method_func)daCowdoor_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Cowdoor = { +actor_process_profile_definition g_profile_Obj_Cowdoor = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_crope.cpp b/src/d/actor/d_a_obj_crope.cpp index 87679188a3..d19a478842 100644 --- a/src/d/actor/d_a_obj_crope.cpp +++ b/src/d/actor/d_a_obj_crope.cpp @@ -378,7 +378,7 @@ static actor_method_class l_daObjCrope_Method = { (process_method_func)daObjCrope_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Crope = { +actor_process_profile_definition g_profile_Obj_Crope = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_crvfence.cpp b/src/d/actor/d_a_obj_crvfence.cpp index 6e7d602dc2..b0bd21ba57 100644 --- a/src/d/actor/d_a_obj_crvfence.cpp +++ b/src/d/actor/d_a_obj_crvfence.cpp @@ -423,7 +423,7 @@ static actor_method_class l_daObjCRVFENCE_Method = { (process_method_func)daObjCRVFENCE_Draw, }; -extern actor_process_profile_definition g_profile_Obj_CRVFENCE = { +actor_process_profile_definition g_profile_Obj_CRVFENCE = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_crvgate.cpp b/src/d/actor/d_a_obj_crvgate.cpp index 98072faa6c..f8ac63adfe 100644 --- a/src/d/actor/d_a_obj_crvgate.cpp +++ b/src/d/actor/d_a_obj_crvgate.cpp @@ -834,7 +834,7 @@ static actor_method_class l_daObjCRVGATE_Method = { (process_method_func)daObjCRVGATE_Draw, }; -extern actor_process_profile_definition g_profile_Obj_CRVGATE = { +actor_process_profile_definition g_profile_Obj_CRVGATE = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_crvhahen.cpp b/src/d/actor/d_a_obj_crvhahen.cpp index 8522d99bf2..abc9aef6aa 100644 --- a/src/d/actor/d_a_obj_crvhahen.cpp +++ b/src/d/actor/d_a_obj_crvhahen.cpp @@ -243,7 +243,7 @@ static actor_method_class l_daObjCRVHAHEN_Method = { (process_method_func)daObjCRVHAHEN_Draw, }; -extern actor_process_profile_definition g_profile_Obj_CRVHAHEN = { +actor_process_profile_definition g_profile_Obj_CRVHAHEN = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_crvlh_down.cpp b/src/d/actor/d_a_obj_crvlh_down.cpp index f8d498da82..2be8d83865 100644 --- a/src/d/actor/d_a_obj_crvlh_down.cpp +++ b/src/d/actor/d_a_obj_crvlh_down.cpp @@ -237,7 +237,7 @@ static actor_method_class l_daObjCRVLH_DW_Method = { (process_method_func)daObjCRVLH_DW_Draw, }; -extern actor_process_profile_definition g_profile_Obj_CRVLH_DW = { +actor_process_profile_definition g_profile_Obj_CRVLH_DW = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_crvlh_up.cpp b/src/d/actor/d_a_obj_crvlh_up.cpp index faeb027cd5..3facb4d696 100644 --- a/src/d/actor/d_a_obj_crvlh_up.cpp +++ b/src/d/actor/d_a_obj_crvlh_up.cpp @@ -198,7 +198,7 @@ static actor_method_class l_daObjCRVLH_UP_Method = { (process_method_func)daObjCRVLH_UP_Draw, }; -extern actor_process_profile_definition g_profile_Obj_CRVLH_UP = { +actor_process_profile_definition g_profile_Obj_CRVLH_UP = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_crvsteel.cpp b/src/d/actor/d_a_obj_crvsteel.cpp index 36caeb4880..5e5e4216a5 100644 --- a/src/d/actor/d_a_obj_crvsteel.cpp +++ b/src/d/actor/d_a_obj_crvsteel.cpp @@ -148,7 +148,7 @@ static actor_method_class l_daObjCRVSTEEL_Method = { (process_method_func)daObjCRVSTEEL_Draw, }; -extern actor_process_profile_definition g_profile_Obj_CRVSTEEL = { +actor_process_profile_definition g_profile_Obj_CRVSTEEL = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_crystal.cpp b/src/d/actor/d_a_obj_crystal.cpp index 434a4e8a17..bca278b944 100644 --- a/src/d/actor/d_a_obj_crystal.cpp +++ b/src/d/actor/d_a_obj_crystal.cpp @@ -136,7 +136,7 @@ static actor_method_class l_daObjCrystal_Method = { (process_method_func)daObjCrystal_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Crystal = { +actor_process_profile_definition g_profile_Obj_Crystal = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_cwall.cpp b/src/d/actor/d_a_obj_cwall.cpp index 0717bc4942..418de6547e 100644 --- a/src/d/actor/d_a_obj_cwall.cpp +++ b/src/d/actor/d_a_obj_cwall.cpp @@ -830,7 +830,7 @@ static actor_method_class daObjCwall_METHODS = { (process_method_func)daObjCwall_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_ChainWall = { +actor_process_profile_definition g_profile_Obj_ChainWall = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_damCps.cpp b/src/d/actor/d_a_obj_damCps.cpp index 2bdbdf644a..8434e43d05 100644 --- a/src/d/actor/d_a_obj_damCps.cpp +++ b/src/d/actor/d_a_obj_damCps.cpp @@ -199,7 +199,7 @@ static actor_method_class l_daObjDamCps_Method = { }; #endif -extern actor_process_profile_definition g_profile_Obj_DamCps = { +actor_process_profile_definition g_profile_Obj_DamCps = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_dan.cpp b/src/d/actor/d_a_obj_dan.cpp index 78f200f9e8..ed3d319128 100644 --- a/src/d/actor/d_a_obj_dan.cpp +++ b/src/d/actor/d_a_obj_dan.cpp @@ -601,7 +601,7 @@ static actor_method_class l_daObjDAN_Method = { (process_method_func)daObjDAN_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Dan = { +actor_process_profile_definition g_profile_Obj_Dan = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_digholl.cpp b/src/d/actor/d_a_obj_digholl.cpp index 6633135f43..0e9aca1f7c 100644 --- a/src/d/actor/d_a_obj_digholl.cpp +++ b/src/d/actor/d_a_obj_digholl.cpp @@ -101,7 +101,7 @@ static actor_method_class l_daObjDigholl_Method = { (process_method_func)daObjDigholl_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Digholl = { +actor_process_profile_definition g_profile_Obj_Digholl = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_digplace.cpp b/src/d/actor/d_a_obj_digplace.cpp index 85b588165d..8e3eee9fe3 100644 --- a/src/d/actor/d_a_obj_digplace.cpp +++ b/src/d/actor/d_a_obj_digplace.cpp @@ -175,7 +175,7 @@ static actor_method_class l_daObjDigpl_Method = { (process_method_func)daObjDigpl_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Digpl = { +actor_process_profile_definition g_profile_Obj_Digpl = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_digsnow.cpp b/src/d/actor/d_a_obj_digsnow.cpp index 1fa9f10c73..9a1335844d 100644 --- a/src/d/actor/d_a_obj_digsnow.cpp +++ b/src/d/actor/d_a_obj_digsnow.cpp @@ -179,7 +179,7 @@ static actor_method_class daObjDigSnow_METHODS = { (process_method_func)daObjDigSnow_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_DigSnow = { +actor_process_profile_definition g_profile_Obj_DigSnow = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_dmelevator.cpp b/src/d/actor/d_a_obj_dmelevator.cpp index 58b7ec352f..3f9a1bdb12 100644 --- a/src/d/actor/d_a_obj_dmelevator.cpp +++ b/src/d/actor/d_a_obj_dmelevator.cpp @@ -683,7 +683,7 @@ static actor_method_class daObjDmElevator_METHODS = { (process_method_func)daObjDmElevator_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Elevator = { +actor_process_profile_definition g_profile_Obj_Elevator = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index bf88385049..85f5564e4c 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -583,7 +583,7 @@ static actor_method_class l_daObjDrop_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Obj_Drop = { +actor_process_profile_definition g_profile_Obj_Drop = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_dust.cpp b/src/d/actor/d_a_obj_dust.cpp index 5233819eee..7cab7b9fa5 100644 --- a/src/d/actor/d_a_obj_dust.cpp +++ b/src/d/actor/d_a_obj_dust.cpp @@ -250,7 +250,7 @@ static actor_method_class l_daObjDust_Method = { }; -extern actor_process_profile_definition g_profile_Obj_DUST = { +actor_process_profile_definition g_profile_Obj_DUST = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_eff.cpp b/src/d/actor/d_a_obj_eff.cpp index 4724a92643..8284980e8f 100644 --- a/src/d/actor/d_a_obj_eff.cpp +++ b/src/d/actor/d_a_obj_eff.cpp @@ -55,7 +55,7 @@ static actor_method_class Mthd_Table = { }; }; // namespace daObjEff -extern actor_process_profile_definition g_profile_Obj_Eff = { +actor_process_profile_definition g_profile_Obj_Eff = { fpcLy_CURRENT_e, 9, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_enemy_create.cpp b/src/d/actor/d_a_obj_enemy_create.cpp index 2bad4cf956..c85d1c8f94 100644 --- a/src/d/actor/d_a_obj_enemy_create.cpp +++ b/src/d/actor/d_a_obj_enemy_create.cpp @@ -253,7 +253,7 @@ static actor_method_class l_daObjE_CREATE_Method = { (process_method_func)daObjE_CREATE_Draw, }; -extern actor_process_profile_definition g_profile_Obj_E_CREATE = { +actor_process_profile_definition g_profile_Obj_E_CREATE = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_fallobj.cpp b/src/d/actor/d_a_obj_fallobj.cpp index 3387a97f3d..063df5327a 100644 --- a/src/d/actor/d_a_obj_fallobj.cpp +++ b/src/d/actor/d_a_obj_fallobj.cpp @@ -412,7 +412,7 @@ static actor_method_class daObjFallObj_METHODS = { (process_method_func)daObjFallObj_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_FallObj = { +actor_process_profile_definition g_profile_Obj_FallObj = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_fan.cpp b/src/d/actor/d_a_obj_fan.cpp index 61aa595b8c..52f864d150 100644 --- a/src/d/actor/d_a_obj_fan.cpp +++ b/src/d/actor/d_a_obj_fan.cpp @@ -335,7 +335,7 @@ static actor_method_class daObjFan_METHODS = { (process_method_func)daObjFan_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Fan = { +actor_process_profile_definition g_profile_Obj_Fan = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_fchain.cpp b/src/d/actor/d_a_obj_fchain.cpp index 6a991bb89b..390e1ab36b 100644 --- a/src/d/actor/d_a_obj_fchain.cpp +++ b/src/d/actor/d_a_obj_fchain.cpp @@ -309,7 +309,7 @@ static actor_method_class l_daObjFchain_Method = { (process_method_func)daObjFchain_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Fchain = { +actor_process_profile_definition g_profile_Obj_Fchain = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_fireWood.cpp b/src/d/actor/d_a_obj_fireWood.cpp index 4ab9eac175..aab5c4406e 100644 --- a/src/d/actor/d_a_obj_fireWood.cpp +++ b/src/d/actor/d_a_obj_fireWood.cpp @@ -188,7 +188,7 @@ static actor_method_class l_daFireWood_Method = { (process_method_func)daFireWood_Draw, }; -extern actor_process_profile_definition g_profile_Obj_FireWood = { +actor_process_profile_definition g_profile_Obj_FireWood = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_fireWood2.cpp b/src/d/actor/d_a_obj_fireWood2.cpp index 9f192fc03f..26df7b03a3 100644 --- a/src/d/actor/d_a_obj_fireWood2.cpp +++ b/src/d/actor/d_a_obj_fireWood2.cpp @@ -272,7 +272,7 @@ static actor_method_class l_daFireWood2_Method = { (process_method_func)daFireWood2_Draw, }; -extern actor_process_profile_definition g_profile_Obj_FireWood2 = { +actor_process_profile_definition g_profile_Obj_FireWood2 = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_firepillar.cpp b/src/d/actor/d_a_obj_firepillar.cpp index 6c32453b01..6e84d02107 100644 --- a/src/d/actor/d_a_obj_firepillar.cpp +++ b/src/d/actor/d_a_obj_firepillar.cpp @@ -221,7 +221,7 @@ static actor_method_class l_daObjFPillar_Method = { (process_method_func)daObjFPillar_Draw, }; -extern actor_process_profile_definition g_profile_Obj_FirePillar = { +actor_process_profile_definition g_profile_Obj_FirePillar = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_firepillar2.cpp b/src/d/actor/d_a_obj_firepillar2.cpp index cd699e8f3d..a61b60bf5b 100644 --- a/src/d/actor/d_a_obj_firepillar2.cpp +++ b/src/d/actor/d_a_obj_firepillar2.cpp @@ -503,7 +503,7 @@ static actor_method_class l_daObjFPillar2_Method = { (process_method_func)daObjFPillar2_Draw, }; -extern actor_process_profile_definition g_profile_Obj_FirePillar2 = { +actor_process_profile_definition g_profile_Obj_FirePillar2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_flag.cpp b/src/d/actor/d_a_obj_flag.cpp index 5fbb14e0a2..1a4f266c2d 100644 --- a/src/d/actor/d_a_obj_flag.cpp +++ b/src/d/actor/d_a_obj_flag.cpp @@ -306,7 +306,7 @@ static actor_method_class l_daObjFlag_Method = { (process_method_func)daObjFlag_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Flag = { +actor_process_profile_definition g_profile_Obj_Flag = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_flag2.cpp b/src/d/actor/d_a_obj_flag2.cpp index c7ae1b0070..ab824c1328 100644 --- a/src/d/actor/d_a_obj_flag2.cpp +++ b/src/d/actor/d_a_obj_flag2.cpp @@ -507,7 +507,7 @@ static actor_method_class l_daObjFlag2_Method = { (process_method_func)daObjFlag2_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Flag2 = { +actor_process_profile_definition g_profile_Obj_Flag2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_flag3.cpp b/src/d/actor/d_a_obj_flag3.cpp index 8f2683aa3a..cd69f4b407 100644 --- a/src/d/actor/d_a_obj_flag3.cpp +++ b/src/d/actor/d_a_obj_flag3.cpp @@ -514,7 +514,7 @@ static actor_method_class l_daObjFlag3_Method = { (process_method_func)daObjFlag3_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Flag3 = { +actor_process_profile_definition g_profile_Obj_Flag3 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_fmobj.cpp b/src/d/actor/d_a_obj_fmobj.cpp index 1f44709e73..e3de14f9b4 100644 --- a/src/d/actor/d_a_obj_fmobj.cpp +++ b/src/d/actor/d_a_obj_fmobj.cpp @@ -118,7 +118,7 @@ static actor_method_class l_daObj_Fmobj_Method = { (process_method_func)daObj_Fmobj_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_FMOBJ = { +actor_process_profile_definition g_profile_OBJ_FMOBJ = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_food.cpp b/src/d/actor/d_a_obj_food.cpp index 31dde10a02..3135d7a444 100644 --- a/src/d/actor/d_a_obj_food.cpp +++ b/src/d/actor/d_a_obj_food.cpp @@ -502,7 +502,7 @@ static actor_method_class l_daObj_Food_Method = { (process_method_func)daObj_Food_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_FOOD = { +actor_process_profile_definition g_profile_OBJ_FOOD = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_fw.cpp b/src/d/actor/d_a_obj_fw.cpp index 0242c01f92..79304a02c3 100644 --- a/src/d/actor/d_a_obj_fw.cpp +++ b/src/d/actor/d_a_obj_fw.cpp @@ -305,7 +305,7 @@ static actor_method_class l_daObj_Fw_Method = { (process_method_func)daObj_Fw_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_FW = { +actor_process_profile_definition g_profile_OBJ_FW = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_gadget.cpp b/src/d/actor/d_a_obj_gadget.cpp index 5f73a4fa86..3ce3d54be9 100644 --- a/src/d/actor/d_a_obj_gadget.cpp +++ b/src/d/actor/d_a_obj_gadget.cpp @@ -615,7 +615,7 @@ static actor_method_class daObj_Gadget_MethodTable = { (process_method_func)daObj_Gadget_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_GADGET = { +actor_process_profile_definition g_profile_OBJ_GADGET = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ganonwall.cpp b/src/d/actor/d_a_obj_ganonwall.cpp index 3d5a21ccd3..d2f04ddbb1 100644 --- a/src/d/actor/d_a_obj_ganonwall.cpp +++ b/src/d/actor/d_a_obj_ganonwall.cpp @@ -187,7 +187,7 @@ static actor_method_class l_daObjGWall_Method = { (process_method_func)daObjGWall_Draw, }; -extern actor_process_profile_definition g_profile_Obj_GanonWall = { +actor_process_profile_definition g_profile_Obj_GanonWall = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ganonwall2.cpp b/src/d/actor/d_a_obj_ganonwall2.cpp index 4718146d44..7ab8705d3a 100644 --- a/src/d/actor/d_a_obj_ganonwall2.cpp +++ b/src/d/actor/d_a_obj_ganonwall2.cpp @@ -173,7 +173,7 @@ static actor_method_class daObjGWall2_METHODS = { (process_method_func)daObjGWall2_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_GanonWall2 = { +actor_process_profile_definition g_profile_Obj_GanonWall2 = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_gb.cpp b/src/d/actor/d_a_obj_gb.cpp index 5618aed1b4..238099a0f6 100644 --- a/src/d/actor/d_a_obj_gb.cpp +++ b/src/d/actor/d_a_obj_gb.cpp @@ -228,7 +228,7 @@ static actor_method_class l_daObj_Gb_Method = { (process_method_func)daObj_Gb_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_GB = { +actor_process_profile_definition g_profile_OBJ_GB = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_geyser.cpp b/src/d/actor/d_a_obj_geyser.cpp index 3b8dfee27c..ee0a774e4a 100644 --- a/src/d/actor/d_a_obj_geyser.cpp +++ b/src/d/actor/d_a_obj_geyser.cpp @@ -689,7 +689,7 @@ static actor_method_class daObjGeyser_METHODS = { (process_method_func)daObjGeyser_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Geyser = { +actor_process_profile_definition g_profile_Obj_Geyser = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_glowSphere.cpp b/src/d/actor/d_a_obj_glowSphere.cpp index 437a94f0cc..045d5ec784 100644 --- a/src/d/actor/d_a_obj_glowSphere.cpp +++ b/src/d/actor/d_a_obj_glowSphere.cpp @@ -415,10 +415,8 @@ BOOL _GlSph_Mng_c::_chkAllGet_main() { return TRUE; } -/* 80BFAFE8 0002+00 data_80BFAFE8 mSphSe__12_GlSph_Mng_c */ u16 _GlSph_Mng_c::mSphSe; -/* 80BFAFEA 0002+00 data_80BFAFEA mSeClrTmr__12_GlSph_Mng_c */ s16 _GlSph_Mng_c::mSeClrTmr; void _GlSph_Mng_c::SphSeProc() { @@ -464,7 +462,7 @@ static actor_method_class l_daGlwSph_Method = { (process_method_func)daGlwSph_Draw, }; -extern actor_process_profile_definition g_profile_Obj_glowSphere = { +actor_process_profile_definition g_profile_Obj_glowSphere = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_gm.cpp b/src/d/actor/d_a_obj_gm.cpp index 33d4ccc6a0..a5fd980fc0 100644 --- a/src/d/actor/d_a_obj_gm.cpp +++ b/src/d/actor/d_a_obj_gm.cpp @@ -726,7 +726,7 @@ static actor_method_class l_daObj_Gm_Method = { (process_method_func)daObj_Gm_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_GM = { +actor_process_profile_definition g_profile_OBJ_GM = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_goGate.cpp b/src/d/actor/d_a_obj_goGate.cpp index 4ab9916f1d..fba08ce0ea 100644 --- a/src/d/actor/d_a_obj_goGate.cpp +++ b/src/d/actor/d_a_obj_goGate.cpp @@ -176,7 +176,7 @@ static actor_method_class l_daGoGate_Method = { (process_method_func)daGoGate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_GoGate = { +actor_process_profile_definition g_profile_Obj_GoGate = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_gomikabe.cpp b/src/d/actor/d_a_obj_gomikabe.cpp index 6d5cbfbe62..cfe0a19aca 100644 --- a/src/d/actor/d_a_obj_gomikabe.cpp +++ b/src/d/actor/d_a_obj_gomikabe.cpp @@ -393,7 +393,7 @@ static actor_method_class l_daObjGOMIKABE_Method = { (process_method_func)daObjGOMIKABE_Draw, }; -extern actor_process_profile_definition g_profile_Obj_GOMIKABE = { +actor_process_profile_definition g_profile_Obj_GOMIKABE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_gpTaru.cpp b/src/d/actor/d_a_obj_gpTaru.cpp index 969073afda..08b879ad16 100644 --- a/src/d/actor/d_a_obj_gpTaru.cpp +++ b/src/d/actor/d_a_obj_gpTaru.cpp @@ -587,7 +587,7 @@ static actor_method_class l_daGpTaru_Method = { (process_method_func)daGpTaru_Draw, }; -extern actor_process_profile_definition g_profile_Obj_GpTaru = { +actor_process_profile_definition g_profile_Obj_GpTaru = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp index b849f33d21..06ae7700c7 100644 --- a/src/d/actor/d_a_obj_gra2.cpp +++ b/src/d/actor/d_a_obj_gra2.cpp @@ -2136,7 +2136,7 @@ static actor_method_class daObj_GrA_MethodTable = { (process_method_func)daObj_GrA_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_GRA = { +actor_process_profile_definition g_profile_OBJ_GRA = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_graWall.cpp b/src/d/actor/d_a_obj_graWall.cpp index c82892ef52..ee5911eea5 100644 --- a/src/d/actor/d_a_obj_graWall.cpp +++ b/src/d/actor/d_a_obj_graWall.cpp @@ -101,7 +101,7 @@ static actor_method_class l_daObjGraWall_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_GRA_WALL = { +actor_process_profile_definition g_profile_GRA_WALL = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_gra_rock.cpp b/src/d/actor/d_a_obj_gra_rock.cpp index b27c929840..230e26e297 100644 --- a/src/d/actor/d_a_obj_gra_rock.cpp +++ b/src/d/actor/d_a_obj_gra_rock.cpp @@ -304,7 +304,7 @@ static actor_method_class l_daObjGraRock_Method = { (process_method_func)daObjGraRock_Draw, }; -extern actor_process_profile_definition g_profile_Obj_GraRock = { +actor_process_profile_definition g_profile_Obj_GraRock = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_grave_stone.cpp b/src/d/actor/d_a_obj_grave_stone.cpp index 078d1db4f0..b5a3c9e105 100644 --- a/src/d/actor/d_a_obj_grave_stone.cpp +++ b/src/d/actor/d_a_obj_grave_stone.cpp @@ -221,7 +221,7 @@ static actor_method_class l_daGraveStone_Method = { (process_method_func)daGraveStone_Draw, }; -extern actor_process_profile_definition g_profile_Obj_GraveStone = { +actor_process_profile_definition g_profile_Obj_GraveStone = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_groundwater.cpp b/src/d/actor/d_a_obj_groundwater.cpp index 75da32b6a8..918d179444 100644 --- a/src/d/actor/d_a_obj_groundwater.cpp +++ b/src/d/actor/d_a_obj_groundwater.cpp @@ -343,7 +343,7 @@ static actor_method_class l_daGrdWater_Method = { (process_method_func)daGrdWater_Draw, }; -extern actor_process_profile_definition g_profile_GRDWATER = { +actor_process_profile_definition g_profile_GRDWATER = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_grz_rock.cpp b/src/d/actor/d_a_obj_grz_rock.cpp index 3fa62de98b..3d75b738c9 100644 --- a/src/d/actor/d_a_obj_grz_rock.cpp +++ b/src/d/actor/d_a_obj_grz_rock.cpp @@ -161,7 +161,7 @@ static actor_method_class l_daObjGrzRock_Method = { (process_method_func)daObjGrzRock_Draw, }; -extern actor_process_profile_definition g_profile_Obj_GrzRock = { +actor_process_profile_definition g_profile_Obj_GrzRock = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_h_saku.cpp b/src/d/actor/d_a_obj_h_saku.cpp index 84f07b814b..04877443cd 100644 --- a/src/d/actor/d_a_obj_h_saku.cpp +++ b/src/d/actor/d_a_obj_h_saku.cpp @@ -302,7 +302,7 @@ static actor_method_class l_daObjH_Saku_Method = { (process_method_func)daObjH_Saku_Draw, }; -extern actor_process_profile_definition g_profile_Obj_H_Saku = { +actor_process_profile_definition g_profile_Obj_H_Saku = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_hakai_brl.cpp b/src/d/actor/d_a_obj_hakai_brl.cpp index 851c2be7ed..3d8d31f782 100644 --- a/src/d/actor/d_a_obj_hakai_brl.cpp +++ b/src/d/actor/d_a_obj_hakai_brl.cpp @@ -195,7 +195,7 @@ static actor_method_class daObjHBarrel_METHODS = { (process_method_func)daObjHBarrel_draw, }; -extern actor_process_profile_definition g_profile_Obj_HBarrel = { +actor_process_profile_definition g_profile_Obj_HBarrel = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_hakai_ftr.cpp b/src/d/actor/d_a_obj_hakai_ftr.cpp index 0ab4db6415..63c0a93b99 100644 --- a/src/d/actor/d_a_obj_hakai_ftr.cpp +++ b/src/d/actor/d_a_obj_hakai_ftr.cpp @@ -205,7 +205,7 @@ static actor_method_class daObjHFtr_METHODS = { (process_method_func)daObjHFtr_draw, }; -extern actor_process_profile_definition g_profile_Obj_HFtr = { +actor_process_profile_definition g_profile_Obj_HFtr = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_hasu2.cpp b/src/d/actor/d_a_obj_hasu2.cpp index fc4707c2c6..67f98dcfcc 100644 --- a/src/d/actor/d_a_obj_hasu2.cpp +++ b/src/d/actor/d_a_obj_hasu2.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_hasu2.h" static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) { - (void)param_0; + UNUSED(param_0); if (fopAcM_GetName(param_2) == PROC_ALINK) { nObjMHasu::daObjMHasu_c* hasu = (nObjMHasu::daObjMHasu_c*)(param_1); hasu->setRideFlag(true); @@ -184,7 +184,7 @@ actor_method_class daObjMHasu_METHODS = { (process_method_func)&daObjMHasu_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_MHasu = { +actor_process_profile_definition g_profile_Obj_MHasu = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_hata.cpp b/src/d/actor/d_a_obj_hata.cpp index bd55c8b7c8..2135eb42b1 100644 --- a/src/d/actor/d_a_obj_hata.cpp +++ b/src/d/actor/d_a_obj_hata.cpp @@ -180,7 +180,7 @@ static actor_method_class daObjHata_METHODS = { (process_method_func)daObjHata_draw, }; -extern actor_process_profile_definition g_profile_Obj_Hata = { +actor_process_profile_definition g_profile_Obj_Hata = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_hb.cpp b/src/d/actor/d_a_obj_hb.cpp index 1e74d83437..331bb831af 100644 --- a/src/d/actor/d_a_obj_hb.cpp +++ b/src/d/actor/d_a_obj_hb.cpp @@ -716,7 +716,7 @@ static actor_method_class l_daOBJ_HB_Method = { (process_method_func)daOBJ_HB_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_HB = { +actor_process_profile_definition g_profile_OBJ_HB = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_hbombkoya.cpp b/src/d/actor/d_a_obj_hbombkoya.cpp index 7f54e51963..ceb8a96a30 100644 --- a/src/d/actor/d_a_obj_hbombkoya.cpp +++ b/src/d/actor/d_a_obj_hbombkoya.cpp @@ -270,7 +270,7 @@ static actor_method_class daObjHBombkoya_METHODS = { (process_method_func)daObjHBombkoya_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_HBombkoya = { +actor_process_profile_definition g_profile_Obj_HBombkoya = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_heavySw.cpp b/src/d/actor/d_a_obj_heavySw.cpp index 1fd6a8cbc3..a6c4dfd7d1 100644 --- a/src/d/actor/d_a_obj_heavySw.cpp +++ b/src/d/actor/d_a_obj_heavySw.cpp @@ -289,7 +289,7 @@ static actor_method_class l_daHeavySw_Method = { (process_method_func)daHeavySw_Draw, }; -extern actor_process_profile_definition g_profile_Obj_HeavySw = { +actor_process_profile_definition g_profile_Obj_HeavySw = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_hfuta.cpp b/src/d/actor/d_a_obj_hfuta.cpp index 056cdc2909..b3b2edf4e7 100644 --- a/src/d/actor/d_a_obj_hfuta.cpp +++ b/src/d/actor/d_a_obj_hfuta.cpp @@ -196,7 +196,7 @@ static actor_method_class daObjFuta_METHODS = { (process_method_func)daObjFuta_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Hfuta = { +actor_process_profile_definition g_profile_Obj_Hfuta = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_hhashi.cpp b/src/d/actor/d_a_obj_hhashi.cpp index 923a498c17..05ff5a8298 100644 --- a/src/d/actor/d_a_obj_hhashi.cpp +++ b/src/d/actor/d_a_obj_hhashi.cpp @@ -379,7 +379,7 @@ static actor_method_class l_daObjHHASHI_Method = { (process_method_func)daObjHHASHI_Draw, }; -extern actor_process_profile_definition g_profile_Obj_HHASHI = { +actor_process_profile_definition g_profile_Obj_HHASHI = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_hsTarget.cpp b/src/d/actor/d_a_obj_hsTarget.cpp index ad894c4975..4ee973f8f3 100644 --- a/src/d/actor/d_a_obj_hsTarget.cpp +++ b/src/d/actor/d_a_obj_hsTarget.cpp @@ -94,7 +94,7 @@ static actor_method_class l_daHsTarget_Method = { (process_method_func)daHsTarget_Draw, }; -extern actor_process_profile_definition g_profile_Obj_HsTarget = { +actor_process_profile_definition g_profile_Obj_HsTarget = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ice_l.cpp b/src/d/actor/d_a_obj_ice_l.cpp index e3839c5c1b..46ddd0ed60 100644 --- a/src/d/actor/d_a_obj_ice_l.cpp +++ b/src/d/actor/d_a_obj_ice_l.cpp @@ -67,7 +67,7 @@ void daObjIce_l_c::setBaseMtx() { } static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) { - (void)param_0; + UNUSED(param_0); daObjIce_l_c* ice_p = (daObjIce_l_c*)param_1; daPy_py_c* player_p = daPy_getPlayerActorClass(); cXyz* ball_pos = player_p->getIronBallCenterPos(); @@ -255,7 +255,7 @@ static actor_method_class l_daObjIce_l_Method = { (process_method_func)daObjIce_l_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Ice_l = { +actor_process_profile_definition g_profile_Obj_Ice_l = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp index 326bb0b7c8..f58db9592b 100644 --- a/src/d/actor/d_a_obj_ice_s.cpp +++ b/src/d/actor/d_a_obj_ice_s.cpp @@ -118,7 +118,7 @@ void daObjIce_s_c::setBaseMtx() { } static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3) { - (void)param_1; + UNUSED(param_1); daObjIce_s_c* ice = (daObjIce_s_c*)param_2; daPy_py_c* player = daPy_getPlayerActorClass(); cXyz* playerPos = &fopAcM_GetPosition(player); @@ -301,7 +301,7 @@ static actor_method_class l_daObjIce_s_Method = { (process_method_func)daObjIce_s_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Ice_s = { +actor_process_profile_definition g_profile_Obj_Ice_s = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp index 93c7062220..836f68d71d 100644 --- a/src/d/actor/d_a_obj_iceblock.cpp +++ b/src/d/actor/d_a_obj_iceblock.cpp @@ -739,7 +739,7 @@ void daObjIceBlk_c::actionWait() { if (mMode == MODE_PROC_WALK_e && mWalkType == WALK_PUSH) { setAction(ACTION_ORDER_EVENT_e); fopAcM_orderPotentialEvent(this, 2, 0, 0); - eventInfo.onCondition(fopAcCnd_NOEXEC_e); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); } } @@ -752,7 +752,7 @@ void daObjIceBlk_c::actionOrderEvent() { camera->mCamera.SetTrimSize(1); } else if (mMode == MODE_PROC_WALK_e) { fopAcM_orderPotentialEvent(this, 2, 0, 0); - eventInfo.onCondition(fopAcCnd_NOEXEC_e); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); } else { setAction(ACTION_WAIT_e); } @@ -833,7 +833,7 @@ static actor_method_class daObjIceBlk_METHODS = { (process_method_func)daObjIceBlk_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_IceBlock = { +actor_process_profile_definition g_profile_Obj_IceBlock = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_iceleaf.cpp b/src/d/actor/d_a_obj_iceleaf.cpp index 1bfaf8bb4d..e5fd929932 100644 --- a/src/d/actor/d_a_obj_iceleaf.cpp +++ b/src/d/actor/d_a_obj_iceleaf.cpp @@ -409,7 +409,7 @@ static actor_method_class l_daObjIceLeaf_Method = { (process_method_func)daObjIceLeaf_Draw, }; -extern actor_process_profile_definition g_profile_Obj_IceLeaf = { +actor_process_profile_definition g_profile_Obj_IceLeaf = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ihasi.cpp b/src/d/actor/d_a_obj_ihasi.cpp index a3f6eb0b3f..64a79899d2 100644 --- a/src/d/actor/d_a_obj_ihasi.cpp +++ b/src/d/actor/d_a_obj_ihasi.cpp @@ -221,7 +221,7 @@ static actor_method_class l_daObj_Ihasi_Method = { (process_method_func)daObj_Ihasi_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_IHASI = { +actor_process_profile_definition g_profile_OBJ_IHASI = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index e749c6e56d..a6bc5f2cf1 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -204,7 +204,7 @@ static actor_method_class l_daObjIkada_Method = { (process_method_func)daObjIkada_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Ikada = { +actor_process_profile_definition g_profile_Obj_Ikada = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_inobone.cpp b/src/d/actor/d_a_obj_inobone.cpp index bf0965748e..ab7e95e1c4 100644 --- a/src/d/actor/d_a_obj_inobone.cpp +++ b/src/d/actor/d_a_obj_inobone.cpp @@ -281,7 +281,7 @@ static actor_method_class l_daObjIBone_Method = { (process_method_func)daObjIBone_Draw, }; -extern actor_process_profile_definition g_profile_Obj_InoBone = { +actor_process_profile_definition g_profile_Obj_InoBone = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ita.cpp b/src/d/actor/d_a_obj_ita.cpp index f5b49cac7e..d163fe19a3 100644 --- a/src/d/actor/d_a_obj_ita.cpp +++ b/src/d/actor/d_a_obj_ita.cpp @@ -53,10 +53,8 @@ f32 daObjIta_c::dummy2() { static daObj_ITA_HIO_c l_HIO; namespace { - /* 80C293F4-80C293F8 00002C 0004+00 2/2 0/0 0/0 .bss e_ymb__25@unnamed@d_a_obj_ita_cpp@ */ static daE_YMB_c* e_ymb; - /* 80C293F8-80C293FC 000030 0004+00 2/2 0/0 0/0 .bss e_ymb_Pos__25@unnamed@d_a_obj_ita_cpp@ */ static cXyz* e_ymb_Pos; } // namespace @@ -286,7 +284,7 @@ static actor_method_class l_daObjIta_Method = { (process_method_func)daObjIta_Draw, }; -extern actor_process_profile_definition g_profile_Obj_ITA = { +actor_process_profile_definition g_profile_Obj_ITA = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_itamato.cpp b/src/d/actor/d_a_obj_itamato.cpp index 234c330232..65f1de8765 100644 --- a/src/d/actor/d_a_obj_itamato.cpp +++ b/src/d/actor/d_a_obj_itamato.cpp @@ -502,7 +502,7 @@ static actor_method_class daObj_ItaMato_MethodTable = { (process_method_func)daObj_ItaMato_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_ITAMATO = { +actor_process_profile_definition g_profile_OBJ_ITAMATO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp index ffa1a3b5f6..9170050135 100644 --- a/src/d/actor/d_a_obj_item.cpp +++ b/src/d/actor/d_a_obj_item.cpp @@ -1237,7 +1237,7 @@ static actor_method_class l_daItem_Method = { (process_method_func)daItem_Draw, }; -extern actor_process_profile_definition g_profile_ITEM = { +actor_process_profile_definition g_profile_ITEM = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ito.cpp b/src/d/actor/d_a_obj_ito.cpp index 1e78250bb4..c17ac611dc 100644 --- a/src/d/actor/d_a_obj_ito.cpp +++ b/src/d/actor/d_a_obj_ito.cpp @@ -690,7 +690,7 @@ static actor_method_class l_daObj_Ito_Method = { (process_method_func)daObj_Ito_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_ITO = { +actor_process_profile_definition g_profile_OBJ_ITO = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kabuto.cpp b/src/d/actor/d_a_obj_kabuto.cpp index e3dbeee34b..ddfaedaa41 100644 --- a/src/d/actor/d_a_obj_kabuto.cpp +++ b/src/d/actor/d_a_obj_kabuto.cpp @@ -862,7 +862,7 @@ static actor_method_class l_daObjKABUTO_Method = { (process_method_func)daObjKABUTO_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Kabuto = { +actor_process_profile_definition g_profile_Obj_Kabuto = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kag.cpp b/src/d/actor/d_a_obj_kag.cpp index 6ea9116146..e265521494 100644 --- a/src/d/actor/d_a_obj_kag.cpp +++ b/src/d/actor/d_a_obj_kag.cpp @@ -767,7 +767,7 @@ static actor_method_class l_daObjKAG_Method = { (process_method_func)daObjKAG_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Kag = { +actor_process_profile_definition g_profile_Obj_Kag = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kage.cpp b/src/d/actor/d_a_obj_kage.cpp index df3688c22a..b7b794a2be 100644 --- a/src/d/actor/d_a_obj_kage.cpp +++ b/src/d/actor/d_a_obj_kage.cpp @@ -129,7 +129,7 @@ static actor_method_class l_daObj_Kage_Method = { (process_method_func)daObj_Kage_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_KAGE = { +actor_process_profile_definition g_profile_OBJ_KAGE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kago.cpp b/src/d/actor/d_a_obj_kago.cpp index 1f1af993c1..9f573a1bdd 100644 --- a/src/d/actor/d_a_obj_kago.cpp +++ b/src/d/actor/d_a_obj_kago.cpp @@ -28,7 +28,6 @@ daObj_Kago_Param_c::Data const daObj_Kago_Param_c::m = { 10.0f, }; -// /* 80C33CAC-80C33CDC 00002C 0030+00 0/0 0/0 0/0 .rodata l_ccDObjData */ const dCcD_SrcGObjInf l_ccDObjData = { {0, // mFlags { @@ -656,7 +655,7 @@ static actor_method_class daObj_Kago_MethodTable = { (process_method_func)daObj_Kago_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_KAGO = { +actor_process_profile_definition g_profile_OBJ_KAGO = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kaisou.cpp b/src/d/actor/d_a_obj_kaisou.cpp index 6d825948ec..3b809ccc52 100644 --- a/src/d/actor/d_a_obj_kaisou.cpp +++ b/src/d/actor/d_a_obj_kaisou.cpp @@ -300,7 +300,7 @@ static actor_method_class l_daObjKaisou_Method = { (process_method_func)daObjKaisou_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Kaisou = { +actor_process_profile_definition g_profile_Obj_Kaisou = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kamakiri.cpp b/src/d/actor/d_a_obj_kamakiri.cpp index 052283761a..91139f6587 100644 --- a/src/d/actor/d_a_obj_kamakiri.cpp +++ b/src/d/actor/d_a_obj_kamakiri.cpp @@ -903,7 +903,7 @@ static actor_method_class l_daObjKAM_Method = { (process_method_func)daObjKAM_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Kam = { +actor_process_profile_definition g_profile_Obj_Kam = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kanban2.cpp b/src/d/actor/d_a_obj_kanban2.cpp index 1a72f1b34b..7621643c09 100644 --- a/src/d/actor/d_a_obj_kanban2.cpp +++ b/src/d/actor/d_a_obj_kanban2.cpp @@ -691,7 +691,6 @@ void daObj_Kanban2_c::setSmokeEffect(cXyz i_pos) { fopAcM_effSmokeSet1(&field_0x9e0, &field_0x9e4, &i_pos, NULL, 0.02 * field_0x600, &tevStr, 1); } -/* 80585CB5 0003+00 hio_set None */ static u8 hio_set; static daObj_Kanban2_HIO_c l_HIO; @@ -1791,7 +1790,7 @@ static actor_method_class l_daObj_Kanban2_Method = { (process_method_func)daObj_Kanban2_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_KANBAN2 = { +actor_process_profile_definition g_profile_OBJ_KANBAN2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kantera.cpp b/src/d/actor/d_a_obj_kantera.cpp index c06f02b123..c558db9b7b 100644 --- a/src/d/actor/d_a_obj_kantera.cpp +++ b/src/d/actor/d_a_obj_kantera.cpp @@ -260,7 +260,7 @@ static actor_method_class l_daItemKantera_Method = { (process_method_func)daItemKantera_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Kantera = { +actor_process_profile_definition g_profile_Obj_Kantera = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_katatsumuri.cpp b/src/d/actor/d_a_obj_katatsumuri.cpp index e0a649a674..ea1ff0633b 100644 --- a/src/d/actor/d_a_obj_katatsumuri.cpp +++ b/src/d/actor/d_a_obj_katatsumuri.cpp @@ -30,7 +30,6 @@ static u8 const l_kat_itemno[2] = { }; void daObjKAT_c::InitCcSph() { - /* 80C3C67C-80C3C6BC 000008 0040+00 1/1 0/0 0/0 .rodata ccSphSrc$3779 */ const static dCcD_SrcSph ccSphSrc = { { {0x0, {{0x0, 0x0, 0x0}, {0x14002, 0x11}, 0x0}}, // mObj @@ -856,7 +855,7 @@ static actor_method_class l_daObjKAT_Method = { (process_method_func)daObjKAT_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Kat = { +actor_process_profile_definition g_profile_Obj_Kat = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kazeneko.cpp b/src/d/actor/d_a_obj_kazeneko.cpp index b6b178cc39..f964e7eac8 100644 --- a/src/d/actor/d_a_obj_kazeneko.cpp +++ b/src/d/actor/d_a_obj_kazeneko.cpp @@ -225,7 +225,7 @@ static actor_method_class l_daObjKazeNeko_Method = { (process_method_func)daObjKazeNeko_Draw, }; -extern actor_process_profile_definition g_profile_Obj_KazeNeko = { +actor_process_profile_definition g_profile_Obj_KazeNeko = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kbacket.cpp b/src/d/actor/d_a_obj_kbacket.cpp index 31ec1836ea..586cf56ccd 100644 --- a/src/d/actor/d_a_obj_kbacket.cpp +++ b/src/d/actor/d_a_obj_kbacket.cpp @@ -635,7 +635,6 @@ void daObj_KBacket_c::setSmokePrtcl() { } void daObj_KBacket_c::setWaterPrtcl() { - /* 80587EF0-80587EF8 000078 0008+00 1/1 0/0 0/0 .data emttrId$4670 */ static u16 emttrId[4] = { 0x01B8, 0x01B9, @@ -686,7 +685,7 @@ static actor_method_class daObj_KBacket_MethodTable = { (process_method_func)daObj_KBacket_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_KBACKET = { +actor_process_profile_definition g_profile_OBJ_KBACKET = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kbox.cpp b/src/d/actor/d_a_obj_kbox.cpp index 205b0e2bc4..1e5f101003 100644 --- a/src/d/actor/d_a_obj_kbox.cpp +++ b/src/d/actor/d_a_obj_kbox.cpp @@ -528,7 +528,7 @@ static actor_method_class l_daObj_Kbox_Method = { (process_method_func)daObj_Kbox_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_KBOX = { +actor_process_profile_definition g_profile_OBJ_KBOX = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_key.cpp b/src/d/actor/d_a_obj_key.cpp index a1e8f5b110..873b1f71e9 100644 --- a/src/d/actor/d_a_obj_key.cpp +++ b/src/d/actor/d_a_obj_key.cpp @@ -648,7 +648,7 @@ static actor_method_class l_daObj_Key_Method = { (process_method_func)daObj_Key_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_KEY = { +actor_process_profile_definition g_profile_OBJ_KEY = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_keyhole.cpp b/src/d/actor/d_a_obj_keyhole.cpp index 7ca8611077..73733ebfed 100644 --- a/src/d/actor/d_a_obj_keyhole.cpp +++ b/src/d/actor/d_a_obj_keyhole.cpp @@ -253,7 +253,6 @@ static void chain_control3(obj_keyhole_class* i_this, kh_chain_s* i_chain_s, int } } -/* 80C43CE5 0003+00 data_80C43CE5 None */ static u8 hio_set; static daObj_Keyhole_HIO_c l_HIO; @@ -842,7 +841,7 @@ static actor_method_class l_daObj_Keyhole_Method = { (process_method_func)daObj_Keyhole_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_KEYHOLE = { +actor_process_profile_definition g_profile_OBJ_KEYHOLE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kgate.cpp b/src/d/actor/d_a_obj_kgate.cpp index 1af514b6ee..909a14616b 100644 --- a/src/d/actor/d_a_obj_kgate.cpp +++ b/src/d/actor/d_a_obj_kgate.cpp @@ -985,7 +985,7 @@ static actor_method_class daObjKGate_METHODS = { (process_method_func)daObjKGate_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_KkrGate = { +actor_process_profile_definition g_profile_Obj_KkrGate = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ki.cpp b/src/d/actor/d_a_obj_ki.cpp index 5922cb1ad0..f8a8192a42 100644 --- a/src/d/actor/d_a_obj_ki.cpp +++ b/src/d/actor/d_a_obj_ki.cpp @@ -224,7 +224,7 @@ static actor_method_class l_daObj_Ki_Method = { (process_method_func)daObj_Ki_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_KI = { +actor_process_profile_definition g_profile_OBJ_KI = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kiPot.cpp b/src/d/actor/d_a_obj_kiPot.cpp index cbbf33e408..e7964f2b52 100644 --- a/src/d/actor/d_a_obj_kiPot.cpp +++ b/src/d/actor/d_a_obj_kiPot.cpp @@ -114,7 +114,7 @@ static actor_method_class l_daKiPot_Method = { (process_method_func)daKiPot_Draw, }; -extern actor_process_profile_definition g_profile_Obj_KiPot = { +actor_process_profile_definition g_profile_Obj_KiPot = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kita.cpp b/src/d/actor/d_a_obj_kita.cpp index 2aa8b20005..04473a2838 100644 --- a/src/d/actor/d_a_obj_kita.cpp +++ b/src/d/actor/d_a_obj_kita.cpp @@ -264,7 +264,7 @@ static actor_method_class l_daObj_Kita_Method = { (process_method_func)daObj_Kita_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_KITA = { +actor_process_profile_definition g_profile_OBJ_KITA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kjgjs.cpp b/src/d/actor/d_a_obj_kjgjs.cpp index 7c2b458306..40e8514875 100644 --- a/src/d/actor/d_a_obj_kjgjs.cpp +++ b/src/d/actor/d_a_obj_kjgjs.cpp @@ -96,7 +96,6 @@ static int daObjKJgjs_MoveBGDelete(daObjKJgjs_c* i_this) { return static_cast(i_this)->MoveBGDelete(); } -/* 80C46480-80C464A0 000460 0020+00 1/0 0/0 0/0 .text daObjKJgjs_MoveBGExecute__FP12daObjKJgjs_c*/ static int daObjKJgjs_MoveBGExecute(daObjKJgjs_c* i_this) { return static_cast(i_this)->MoveBGExecute(); } @@ -113,7 +112,7 @@ static actor_method_class daObjKJgjs_METHODS = { (process_method_func)daObjKJgjs_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_KJgjs = { +actor_process_profile_definition g_profile_Obj_KJgjs = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kkanban.cpp b/src/d/actor/d_a_obj_kkanban.cpp index 722d922282..fbd4e58223 100644 --- a/src/d/actor/d_a_obj_kkanban.cpp +++ b/src/d/actor/d_a_obj_kkanban.cpp @@ -154,7 +154,7 @@ static actor_method_class daObjKKanban_METHODS = { (process_method_func)daObjKKanban_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_KKanban = { +actor_process_profile_definition g_profile_Obj_KKanban = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_klift00.cpp b/src/d/actor/d_a_obj_klift00.cpp index 8476751b42..1723ab03c5 100644 --- a/src/d/actor/d_a_obj_klift00.cpp +++ b/src/d/actor/d_a_obj_klift00.cpp @@ -493,7 +493,7 @@ static actor_method_class daObjKLift00_METHODS = { (process_method_func)daObjKLift00_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_KLift00 = { +actor_process_profile_definition g_profile_Obj_KLift00 = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_knBullet.cpp b/src/d/actor/d_a_obj_knBullet.cpp index 9f63965cb7..88ebf33240 100644 --- a/src/d/actor/d_a_obj_knBullet.cpp +++ b/src/d/actor/d_a_obj_knBullet.cpp @@ -202,7 +202,7 @@ static actor_method_class l_daObjKnBullet_Method = { (process_method_func)daObjKnBullet_Draw, }; -extern actor_process_profile_definition g_profile_KN_BULLET = { +actor_process_profile_definition g_profile_KN_BULLET = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kshutter.cpp b/src/d/actor/d_a_obj_kshutter.cpp index 1bd2b6711f..96c3711ca3 100644 --- a/src/d/actor/d_a_obj_kshutter.cpp +++ b/src/d/actor/d_a_obj_kshutter.cpp @@ -972,7 +972,7 @@ static actor_method_class daObjKshtr_METHODS = { (process_method_func)daObjKshtr_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Kshutter = { +actor_process_profile_definition g_profile_Obj_Kshutter = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ktOnFire.cpp b/src/d/actor/d_a_obj_ktOnFire.cpp index 082dc1341b..e9608f761e 100644 --- a/src/d/actor/d_a_obj_ktOnFire.cpp +++ b/src/d/actor/d_a_obj_ktOnFire.cpp @@ -200,7 +200,7 @@ static actor_method_class l_daKtOnFire_Method = { (process_method_func)daKtOnFire_Draw, }; -extern actor_process_profile_definition g_profile_Tag_KtOnFire = { +actor_process_profile_definition g_profile_Tag_KtOnFire = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kuwagata.cpp b/src/d/actor/d_a_obj_kuwagata.cpp index 761cee8f8d..9898f83085 100644 --- a/src/d/actor/d_a_obj_kuwagata.cpp +++ b/src/d/actor/d_a_obj_kuwagata.cpp @@ -900,7 +900,7 @@ static actor_method_class l_daObjKUW_Method = { (process_method_func)daObjKUW_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Kuw = { +actor_process_profile_definition g_profile_Obj_Kuw = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kwheel00.cpp b/src/d/actor/d_a_obj_kwheel00.cpp index 7512f46ad1..f067d99670 100644 --- a/src/d/actor/d_a_obj_kwheel00.cpp +++ b/src/d/actor/d_a_obj_kwheel00.cpp @@ -355,7 +355,7 @@ static actor_method_class daObjKWheel00_METHODS = { (process_method_func)daObjKWheel00_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_KWheel00 = { +actor_process_profile_definition g_profile_Obj_KWheel00 = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kwheel01.cpp b/src/d/actor/d_a_obj_kwheel01.cpp index a786bb5312..67ea5579c0 100644 --- a/src/d/actor/d_a_obj_kwheel01.cpp +++ b/src/d/actor/d_a_obj_kwheel01.cpp @@ -183,11 +183,11 @@ int daObjKWheel01_c::Create() { } static void* searchKWheel00(void* param_0, void* i_this) { - i_this; // Needed to bring closer to matching debug REL + UNUSED(i_this); if(param_0 && fopAcM_IsActor(param_0) && fopAcM_GetProfName(param_0) == PROC_Obj_KWheel00) { daObjKWheel00_c* const kWheel00 = static_cast(param_0); if(kWheel00->getType() == daObjKWheel00_c::TYPE_LARGE_GOLD) { - return kWheel00; + return param_0; } } @@ -335,7 +335,7 @@ static actor_method_class daObjKWheel01_METHODS = { (process_method_func)daObjKWheel01_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_KWheel01 = { +actor_process_profile_definition g_profile_Obj_KWheel01 = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kznkarm.cpp b/src/d/actor/d_a_obj_kznkarm.cpp index 7ea35c1e2e..059cb6601a 100644 --- a/src/d/actor/d_a_obj_kznkarm.cpp +++ b/src/d/actor/d_a_obj_kznkarm.cpp @@ -451,7 +451,7 @@ static actor_method_class l_daObjKznkarm_Method = { (process_method_func)daObjKznkarm_Draw, }; -extern actor_process_profile_definition g_profile_Obj_KznkArm = { +actor_process_profile_definition g_profile_Obj_KznkArm = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp index 884e4ac59b..9f49f2b73c 100644 --- a/src/d/actor/d_a_obj_ladder.cpp +++ b/src/d/actor/d_a_obj_ladder.cpp @@ -294,7 +294,7 @@ static actor_method_class Mthd_Table = { } } -extern actor_process_profile_definition g_profile_Obj_Ladder = { +actor_process_profile_definition g_profile_Obj_Ladder = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_laundry.cpp b/src/d/actor/d_a_obj_laundry.cpp index 24ea9eab26..49d47d1f8e 100644 --- a/src/d/actor/d_a_obj_laundry.cpp +++ b/src/d/actor/d_a_obj_laundry.cpp @@ -281,7 +281,7 @@ static actor_method_class l_daObjLdy_Method = { (process_method_func)daObjLdy_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Laundry = { +actor_process_profile_definition g_profile_Obj_Laundry = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_laundry_rope.cpp b/src/d/actor/d_a_obj_laundry_rope.cpp index f147a088c1..f23271db21 100644 --- a/src/d/actor/d_a_obj_laundry_rope.cpp +++ b/src/d/actor/d_a_obj_laundry_rope.cpp @@ -288,7 +288,7 @@ static actor_method_class l_daObjLndRope_Method = { (process_method_func)daObjLndRope_Draw, }; -extern actor_process_profile_definition g_profile_Obj_LndRope = { +actor_process_profile_definition g_profile_Obj_LndRope = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lbox.cpp b/src/d/actor/d_a_obj_lbox.cpp index 8f23621e2c..cbd2c361a5 100644 --- a/src/d/actor/d_a_obj_lbox.cpp +++ b/src/d/actor/d_a_obj_lbox.cpp @@ -52,7 +52,7 @@ static void action(obj_lbox_class* i_this) { i_this->speed.y -= 0.1f; } i_this->current.pos.y += i_this->speed.y; - if (i_this->mObjAcch.m_flags & 0x20) { + if (i_this->mObjAcch.ChkGroundHit()) { dComIfGp_getVibration().StartShock(5, 15, cXyz(0.0f, 1.0f, 0.0f)); fopAcM_seStart(i_this, Z2SE_EN_FM_FOOTNOTE, 0); i_this->field_0x57a = 2; @@ -195,7 +195,7 @@ static actor_method_class l_daObj_Lbox_Method = { (process_method_func)daObj_Lbox_Execute, (process_method_func)daObj_Lbox_IsDelete, (process_method_func)daObj_Lbox_Draw}; -extern actor_process_profile_definition g_profile_OBJ_LBOX = { +actor_process_profile_definition g_profile_OBJ_LBOX = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_life_container.cpp b/src/d/actor/d_a_obj_life_container.cpp index 45cf09f03b..4924d14d85 100644 --- a/src/d/actor/d_a_obj_life_container.cpp +++ b/src/d/actor/d_a_obj_life_container.cpp @@ -507,7 +507,7 @@ static actor_method_class l_daObjLife_Method = { (process_method_func)daObjLife_Draw, }; -extern actor_process_profile_definition g_profile_Obj_LifeContainer = { +actor_process_profile_definition g_profile_Obj_LifeContainer = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lp.cpp b/src/d/actor/d_a_obj_lp.cpp index aff7b4de82..5148a8a6e2 100644 --- a/src/d/actor/d_a_obj_lp.cpp +++ b/src/d/actor/d_a_obj_lp.cpp @@ -493,7 +493,7 @@ static actor_method_class l_daObj_Lp_Method = { (process_method_func)daObj_Lp_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_LP = { +actor_process_profile_definition g_profile_OBJ_LP = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv1Candle00.cpp b/src/d/actor/d_a_obj_lv1Candle00.cpp index 33eeb9c3c4..7b328b5059 100644 --- a/src/d/actor/d_a_obj_lv1Candle00.cpp +++ b/src/d/actor/d_a_obj_lv1Candle00.cpp @@ -273,7 +273,7 @@ static actor_method_class l_daLv1Cdl00_Method = { (process_method_func)daLv1Cdl00_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv1Cdl00 = { +actor_process_profile_definition g_profile_Obj_Lv1Cdl00 = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv1Candle01.cpp b/src/d/actor/d_a_obj_lv1Candle01.cpp index c0c6a1f859..e5558ed550 100644 --- a/src/d/actor/d_a_obj_lv1Candle01.cpp +++ b/src/d/actor/d_a_obj_lv1Candle01.cpp @@ -227,7 +227,7 @@ static actor_method_class l_daLv1Cdl01_Method = { (process_method_func)daLv1Cdl01_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv1Cdl01 = { +actor_process_profile_definition g_profile_Obj_Lv1Cdl01 = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv2Candle.cpp b/src/d/actor/d_a_obj_lv2Candle.cpp index 2f38049f01..28d7f1cb58 100644 --- a/src/d/actor/d_a_obj_lv2Candle.cpp +++ b/src/d/actor/d_a_obj_lv2Candle.cpp @@ -392,7 +392,7 @@ static actor_method_class l_daLv2Candle_Method = { (process_method_func)daLv2Candle_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv2Candle = { +actor_process_profile_definition g_profile_Obj_Lv2Candle = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv3Candle.cpp b/src/d/actor/d_a_obj_lv3Candle.cpp index d38da29adc..6f48136279 100644 --- a/src/d/actor/d_a_obj_lv3Candle.cpp +++ b/src/d/actor/d_a_obj_lv3Candle.cpp @@ -218,7 +218,7 @@ static actor_method_class l_daLv3Candle_Method = { (process_method_func)daLv3Candle_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv3Candle = { +actor_process_profile_definition g_profile_Obj_Lv3Candle = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv3Water.cpp b/src/d/actor/d_a_obj_lv3Water.cpp index a3c733e0a3..02b5941151 100644 --- a/src/d/actor/d_a_obj_lv3Water.cpp +++ b/src/d/actor/d_a_obj_lv3Water.cpp @@ -404,7 +404,7 @@ static actor_method_class l_daLv3Water_Method = { (process_method_func)daLv3Water_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv3Water = { +actor_process_profile_definition g_profile_Obj_Lv3Water = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv3Water2.cpp b/src/d/actor/d_a_obj_lv3Water2.cpp index 35a2ca0ef3..d572411b09 100644 --- a/src/d/actor/d_a_obj_lv3Water2.cpp +++ b/src/d/actor/d_a_obj_lv3Water2.cpp @@ -52,7 +52,7 @@ static actor_method_class l_daLv3Water2_Method = { (process_method_func)daLv3Water2_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv3Water2 = { +actor_process_profile_definition g_profile_Obj_Lv3Water2 = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv3WaterB.cpp b/src/d/actor/d_a_obj_lv3WaterB.cpp index 4126100671..43a3e3d76f 100644 --- a/src/d/actor/d_a_obj_lv3WaterB.cpp +++ b/src/d/actor/d_a_obj_lv3WaterB.cpp @@ -204,7 +204,7 @@ static actor_method_class l_daObj_Lv3waterB_Method = { (process_method_func)daObj_Lv3waterB_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_LV3WATERB = { +actor_process_profile_definition g_profile_OBJ_LV3WATERB = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv3saka00.cpp b/src/d/actor/d_a_obj_lv3saka00.cpp index e927138514..b6e1a5ce70 100644 --- a/src/d/actor/d_a_obj_lv3saka00.cpp +++ b/src/d/actor/d_a_obj_lv3saka00.cpp @@ -138,7 +138,7 @@ static actor_method_class daObjLv3saka_METHODS = { (process_method_func)daObjLv3saka_MoveBGExecute, (process_method_func)NULL, (process_method_func)daObjLv3saka_MoveBGDraw}; -extern actor_process_profile_definition g_profile_Obj_Lv3R10Saka = { +actor_process_profile_definition g_profile_Obj_Lv3R10Saka = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv3waterEff.cpp b/src/d/actor/d_a_obj_lv3waterEff.cpp index c500d876a6..fd8b50a979 100644 --- a/src/d/actor/d_a_obj_lv3waterEff.cpp +++ b/src/d/actor/d_a_obj_lv3waterEff.cpp @@ -91,7 +91,7 @@ static actor_method_class l_daObjWaterEff_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Obj_WaterEff = { +actor_process_profile_definition g_profile_Obj_WaterEff = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp index d10ba0d3be..ea74e61b26 100644 --- a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp +++ b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp @@ -194,7 +194,7 @@ static actor_method_class l_dalv4CandleDemoTag_Method = { (process_method_func)dalv4CandleDemoTag_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Lv4CandleDm = { +actor_process_profile_definition g_profile_Tag_Lv4CandleDm = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4CandleTag.cpp b/src/d/actor/d_a_obj_lv4CandleTag.cpp index c3fa9e5483..8f924aa186 100644 --- a/src/d/actor/d_a_obj_lv4CandleTag.cpp +++ b/src/d/actor/d_a_obj_lv4CandleTag.cpp @@ -148,7 +148,7 @@ static actor_method_class l_dalv4CandleTag_Method = { (process_method_func)dalv4CandleTag_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Lv4Candle = { +actor_process_profile_definition g_profile_Tag_Lv4Candle = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4EdShutter.cpp b/src/d/actor/d_a_obj_lv4EdShutter.cpp index 389e2960c9..edc31c8641 100644 --- a/src/d/actor/d_a_obj_lv4EdShutter.cpp +++ b/src/d/actor/d_a_obj_lv4EdShutter.cpp @@ -222,7 +222,7 @@ static actor_method_class l_daLv4EdShutter_Method = { (process_method_func)daLv4EdShutter_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4EdShutter = { +actor_process_profile_definition g_profile_Obj_Lv4EdShutter = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4Gate.cpp b/src/d/actor/d_a_obj_lv4Gate.cpp index c5424c2882..82e5300225 100644 --- a/src/d/actor/d_a_obj_lv4Gate.cpp +++ b/src/d/actor/d_a_obj_lv4Gate.cpp @@ -179,7 +179,7 @@ static actor_method_class l_daLv4Gate_Method = { (process_method_func)daLv4Gate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4Gate = { +actor_process_profile_definition g_profile_Obj_Lv4Gate = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4HsTarget.cpp b/src/d/actor/d_a_obj_lv4HsTarget.cpp index 1534cd5175..320b6e4d49 100644 --- a/src/d/actor/d_a_obj_lv4HsTarget.cpp +++ b/src/d/actor/d_a_obj_lv4HsTarget.cpp @@ -90,7 +90,7 @@ static actor_method_class l_daLv4HsTarget_Method = { (process_method_func)daLv4HsTarget_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4HsTarget = { +actor_process_profile_definition g_profile_Obj_Lv4HsTarget = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4PoGate.cpp b/src/d/actor/d_a_obj_lv4PoGate.cpp index ba99c61da9..4c9a72d40e 100644 --- a/src/d/actor/d_a_obj_lv4PoGate.cpp +++ b/src/d/actor/d_a_obj_lv4PoGate.cpp @@ -259,7 +259,7 @@ static actor_method_class l_daLv4PoGate_Method = { (process_method_func)daLv4PoGate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4PoGate = { +actor_process_profile_definition g_profile_Obj_Lv4PoGate = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4RailWall.cpp b/src/d/actor/d_a_obj_lv4RailWall.cpp index 339d6da31d..7df09f85b3 100644 --- a/src/d/actor/d_a_obj_lv4RailWall.cpp +++ b/src/d/actor/d_a_obj_lv4RailWall.cpp @@ -249,7 +249,7 @@ static actor_method_class daObjLv4Wall_METHODS = { (process_method_func)daObjLv4Wall_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4RailWall = { +actor_process_profile_definition g_profile_Obj_Lv4RailWall = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4SlideWall.cpp b/src/d/actor/d_a_obj_lv4SlideWall.cpp index 9e89c7b56d..26efe7a77e 100644 --- a/src/d/actor/d_a_obj_lv4SlideWall.cpp +++ b/src/d/actor/d_a_obj_lv4SlideWall.cpp @@ -175,7 +175,7 @@ static actor_method_class l_daSldWall_Method = { (process_method_func)daSldWall_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4SlideWall = { +actor_process_profile_definition g_profile_Obj_Lv4SlideWall = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4bridge.cpp b/src/d/actor/d_a_obj_lv4bridge.cpp index 8331c5f41a..3a1e293dd1 100644 --- a/src/d/actor/d_a_obj_lv4bridge.cpp +++ b/src/d/actor/d_a_obj_lv4bridge.cpp @@ -170,7 +170,7 @@ static actor_method_class daObjLv4Brg_METHODS = { (process_method_func)daObjLv4Brg_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4Bridge = { +actor_process_profile_definition g_profile_Obj_Lv4Bridge = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4chandelier.cpp b/src/d/actor/d_a_obj_lv4chandelier.cpp index e039ff3417..07b2b90775 100644 --- a/src/d/actor/d_a_obj_lv4chandelier.cpp +++ b/src/d/actor/d_a_obj_lv4chandelier.cpp @@ -873,7 +873,7 @@ static actor_method_class daObjLv4Chan_METHODS = { (process_method_func)daObjLv4Chan_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4Chan = { +actor_process_profile_definition g_profile_Obj_Lv4Chan = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4digsand.cpp b/src/d/actor/d_a_obj_lv4digsand.cpp index 1680da93f4..8b90c751a2 100644 --- a/src/d/actor/d_a_obj_lv4digsand.cpp +++ b/src/d/actor/d_a_obj_lv4digsand.cpp @@ -179,7 +179,7 @@ static actor_method_class daObjL4DigSand_METHODS = { (process_method_func)daObjL4DigSand_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4DigSand = { +actor_process_profile_definition g_profile_Obj_Lv4DigSand = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4floor.cpp b/src/d/actor/d_a_obj_lv4floor.cpp index a951b8cb09..b4122862b8 100644 --- a/src/d/actor/d_a_obj_lv4floor.cpp +++ b/src/d/actor/d_a_obj_lv4floor.cpp @@ -140,7 +140,7 @@ static actor_method_class daObjLv4Floor_METHODS = { (process_method_func)daObjLv4Floor_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4Floor = { +actor_process_profile_definition g_profile_Obj_Lv4Floor = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4gear.cpp b/src/d/actor/d_a_obj_lv4gear.cpp index 686c651e2e..75f19496a4 100644 --- a/src/d/actor/d_a_obj_lv4gear.cpp +++ b/src/d/actor/d_a_obj_lv4gear.cpp @@ -160,7 +160,7 @@ static actor_method_class l_daObjLv4Gear_Method = { (process_method_func)daObjLv4Gear_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4Gear = { +actor_process_profile_definition g_profile_Obj_Lv4Gear = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4prelvtr.cpp b/src/d/actor/d_a_obj_lv4prelvtr.cpp index 49b60eeba5..5cbc543dd6 100644 --- a/src/d/actor/d_a_obj_lv4prelvtr.cpp +++ b/src/d/actor/d_a_obj_lv4prelvtr.cpp @@ -115,7 +115,7 @@ static actor_method_class daObjPRElvtr_METHODS = { (process_method_func)daObjPRElvtr_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_PRElvtr = { +actor_process_profile_definition g_profile_Obj_PRElvtr = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4prwall.cpp b/src/d/actor/d_a_obj_lv4prwall.cpp index 44a554808e..d904dc5771 100644 --- a/src/d/actor/d_a_obj_lv4prwall.cpp +++ b/src/d/actor/d_a_obj_lv4prwall.cpp @@ -302,7 +302,7 @@ static actor_method_class daObjLv4PRwall_METHODS = { (process_method_func)daObjLv4PRwall_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4PRwall = { +actor_process_profile_definition g_profile_Obj_Lv4PRwall = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4sand.cpp b/src/d/actor/d_a_obj_lv4sand.cpp index f49ac3edc9..6552b64759 100644 --- a/src/d/actor/d_a_obj_lv4sand.cpp +++ b/src/d/actor/d_a_obj_lv4sand.cpp @@ -170,7 +170,7 @@ static actor_method_class daObjLv4Sand_METHODS = { (process_method_func)daObjLv4Sand_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4Sand = { +actor_process_profile_definition g_profile_Obj_Lv4Sand = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv5FloorBoard.cpp b/src/d/actor/d_a_obj_lv5FloorBoard.cpp index 7cffaf0a2b..f94f8ba986 100644 --- a/src/d/actor/d_a_obj_lv5FloorBoard.cpp +++ b/src/d/actor/d_a_obj_lv5FloorBoard.cpp @@ -187,7 +187,7 @@ static actor_method_class l_daFlorBoad_Method = { (process_method_func)daFlorBoad_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv5FBoard = { +actor_process_profile_definition g_profile_Obj_Lv5FBoard = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv5IceWall.cpp b/src/d/actor/d_a_obj_lv5IceWall.cpp index 7dfe4e3134..36c21f56d6 100644 --- a/src/d/actor/d_a_obj_lv5IceWall.cpp +++ b/src/d/actor/d_a_obj_lv5IceWall.cpp @@ -293,7 +293,7 @@ static actor_method_class l_daIceWall_Method = { (process_method_func)daIceWall_Draw, }; -extern actor_process_profile_definition g_profile_Obj_IceWall = { +actor_process_profile_definition g_profile_Obj_IceWall = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv5SwIce.cpp b/src/d/actor/d_a_obj_lv5SwIce.cpp index e2065e2bb9..da91936bfa 100644 --- a/src/d/actor/d_a_obj_lv5SwIce.cpp +++ b/src/d/actor/d_a_obj_lv5SwIce.cpp @@ -197,7 +197,7 @@ static actor_method_class l_daLv5SwIce_Method = { (process_method_func)daLv5SwIce_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv5SwIce = { +actor_process_profile_definition g_profile_Obj_Lv5SwIce = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv5ychndlr.cpp b/src/d/actor/d_a_obj_lv5ychndlr.cpp index f9def42d2a..eeeecdc351 100644 --- a/src/d/actor/d_a_obj_lv5ychndlr.cpp +++ b/src/d/actor/d_a_obj_lv5ychndlr.cpp @@ -356,7 +356,7 @@ static actor_method_class daObjYchndlr_METHODS = { (process_method_func)daObjYchndlr_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Ychndlr = { +actor_process_profile_definition g_profile_Obj_Ychndlr = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv5yiblltray.cpp b/src/d/actor/d_a_obj_lv5yiblltray.cpp index d5393d6379..f0400aa04d 100644 --- a/src/d/actor/d_a_obj_lv5yiblltray.cpp +++ b/src/d/actor/d_a_obj_lv5yiblltray.cpp @@ -578,7 +578,7 @@ static actor_method_class daObjYIblltray_METHODS = { (process_method_func)daObjYIblltray_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_YIblltray = { +actor_process_profile_definition g_profile_Obj_YIblltray = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6ChangeGate.cpp b/src/d/actor/d_a_obj_lv6ChangeGate.cpp index bc43006fe6..d0ffff13f1 100644 --- a/src/d/actor/d_a_obj_lv6ChangeGate.cpp +++ b/src/d/actor/d_a_obj_lv6ChangeGate.cpp @@ -308,7 +308,7 @@ static actor_method_class l_daLv6ChangeGate_Method = { (process_method_func)daLv6ChangeGate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6ChgGate = { +actor_process_profile_definition g_profile_Obj_Lv6ChgGate = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp index 79bf3a8438..c469229944 100644 --- a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp +++ b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp @@ -193,7 +193,7 @@ static actor_method_class l_daLv6FurikoTrap_Method = { (process_method_func)daLv6FurikoTrap_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6FuriTrap = { +actor_process_profile_definition g_profile_Obj_Lv6FuriTrap = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6Lblock.cpp b/src/d/actor/d_a_obj_lv6Lblock.cpp index 813a9fb366..7d18d28af3 100644 --- a/src/d/actor/d_a_obj_lv6Lblock.cpp +++ b/src/d/actor/d_a_obj_lv6Lblock.cpp @@ -179,7 +179,7 @@ static actor_method_class l_daLv6Lblock_Method = { (process_method_func)daLv6Lblock_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6Lblock = { +actor_process_profile_definition g_profile_Obj_Lv6Lblock = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6SwGate.cpp b/src/d/actor/d_a_obj_lv6SwGate.cpp index c8002190f3..c7ddba314e 100644 --- a/src/d/actor/d_a_obj_lv6SwGate.cpp +++ b/src/d/actor/d_a_obj_lv6SwGate.cpp @@ -313,7 +313,7 @@ static actor_method_class l_daLv6SwGate_Method = { (process_method_func)daLv6SwGate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6SwGate = { +actor_process_profile_definition g_profile_Obj_Lv6SwGate = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6SzGate.cpp b/src/d/actor/d_a_obj_lv6SzGate.cpp index b683f3618d..c8e0d05efc 100644 --- a/src/d/actor/d_a_obj_lv6SzGate.cpp +++ b/src/d/actor/d_a_obj_lv6SzGate.cpp @@ -256,7 +256,7 @@ static actor_method_class l_daLv6SzGate_Method = { (process_method_func)daLv6SzGate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6SzGate = { +actor_process_profile_definition g_profile_Obj_Lv6SzGate = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6Tenbin.cpp b/src/d/actor/d_a_obj_lv6Tenbin.cpp index 151f070fab..659f116c4d 100644 --- a/src/d/actor/d_a_obj_lv6Tenbin.cpp +++ b/src/d/actor/d_a_obj_lv6Tenbin.cpp @@ -155,7 +155,7 @@ int daTenbin_c::create() { } void daTenbin_c::rideCallBackRight(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c* i_act2) { - (void)i_dBgW; + UNUSED(i_dBgW); daTenbin_c* i_tenbin = (daTenbin_c*)i_act1; daPy_py_c* player = dComIfGp_getLinkPlayer(); if (fopAcM_GetName(i_act2) == PROC_SPINNER) { @@ -187,7 +187,7 @@ void daTenbin_c::rideCallBackRight(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c* } void daTenbin_c::rideCallBackLeft(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c* i_act2) { - (void)i_dBgW; + UNUSED(i_dBgW); daTenbin_c* i_tenbin = (daTenbin_c*)i_act1; daPy_py_c* player = dComIfGp_getLinkPlayer(); if (fopAcM_GetName(i_act2) == PROC_SPINNER) { @@ -355,7 +355,7 @@ static actor_method_class l_daTenbin_Method = { (process_method_func)daTenbin_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6Tenbin = { +actor_process_profile_definition g_profile_Obj_Lv6Tenbin = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6TogeRoll.cpp b/src/d/actor/d_a_obj_lv6TogeRoll.cpp index 3a18fbeafa..9fe1438399 100644 --- a/src/d/actor/d_a_obj_lv6TogeRoll.cpp +++ b/src/d/actor/d_a_obj_lv6TogeRoll.cpp @@ -438,7 +438,7 @@ static actor_method_class l_daTogeRoll_Method = { (process_method_func)daTogeRoll_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6TogeRoll = { +actor_process_profile_definition g_profile_Obj_Lv6TogeRoll = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6TogeTrap.cpp b/src/d/actor/d_a_obj_lv6TogeTrap.cpp index a80598ca88..71d741a290 100644 --- a/src/d/actor/d_a_obj_lv6TogeTrap.cpp +++ b/src/d/actor/d_a_obj_lv6TogeTrap.cpp @@ -770,7 +770,7 @@ static actor_method_class l_daLv6TogeTrap_Method = { (process_method_func)daLv6TogeTrap_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6TogeTrap = { +actor_process_profile_definition g_profile_Obj_Lv6TogeTrap = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6bemos.cpp b/src/d/actor/d_a_obj_lv6bemos.cpp index f048c74f21..40f7fddbb2 100644 --- a/src/d/actor/d_a_obj_lv6bemos.cpp +++ b/src/d/actor/d_a_obj_lv6bemos.cpp @@ -415,7 +415,7 @@ static actor_method_class daObjL6Bm_METHODS = { (process_method_func)daObjL6Bm_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6bemos = { +actor_process_profile_definition g_profile_Obj_Lv6bemos = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6bemos2.cpp b/src/d/actor/d_a_obj_lv6bemos2.cpp index 7711f18f5b..acb172e98a 100644 --- a/src/d/actor/d_a_obj_lv6bemos2.cpp +++ b/src/d/actor/d_a_obj_lv6bemos2.cpp @@ -1172,7 +1172,7 @@ static actor_method_class daObjLv6Bm_METHODS = { (process_method_func)daObjLv6Bm_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6bemos2 = { +actor_process_profile_definition g_profile_Obj_Lv6bemos2 = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6egate.cpp b/src/d/actor/d_a_obj_lv6egate.cpp index 92a80c9d3d..9b0e2029d5 100644 --- a/src/d/actor/d_a_obj_lv6egate.cpp +++ b/src/d/actor/d_a_obj_lv6egate.cpp @@ -210,7 +210,7 @@ static actor_method_class daObjLv6EGate_METHODS = { (process_method_func)daObjLv6EGate_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6EGate = { +actor_process_profile_definition g_profile_Obj_Lv6EGate = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6elevta.cpp b/src/d/actor/d_a_obj_lv6elevta.cpp index 1810a8e865..2c9cbf0f15 100644 --- a/src/d/actor/d_a_obj_lv6elevta.cpp +++ b/src/d/actor/d_a_obj_lv6elevta.cpp @@ -272,7 +272,7 @@ static actor_method_class daObjLv6ElevtA_METHODS = { (process_method_func)daObjLv6ElevtA_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6ElevtA = { +actor_process_profile_definition g_profile_Obj_Lv6ElevtA = { fpcLy_CURRENT_e, // mLayerID 2, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6swturn.cpp b/src/d/actor/d_a_obj_lv6swturn.cpp index 92484685f7..f2694b715e 100644 --- a/src/d/actor/d_a_obj_lv6swturn.cpp +++ b/src/d/actor/d_a_obj_lv6swturn.cpp @@ -30,7 +30,7 @@ void daObjLv6SwTurn_HIO_c::genMessage(JORMContext* context) { static fopAc_ac_c* PPCallBack(fopAc_ac_c* actor1, fopAc_ac_c* actor2, s16 param_2, dBgW_Base::PushPullLabel pushPull) { - (void)param_2; // needed to match debug + UNUSED(param_2); dBgW_Base::PushPullLabel pushPull_3 = cLib_checkBit(pushPull, dBgW_Base::PPLABEL_3); daObjLv6SwTurn_c* swTurnActor1 = (daObjLv6SwTurn_c*)actor1; daObjLv6SwTurn_c* swTurnActor2 = (daObjLv6SwTurn_c*)actor2; @@ -351,7 +351,7 @@ static actor_method_class daObjLv6SwTurn_METHODS = { (process_method_func)daObjLv6SwTurn_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6SwTurn = { +actor_process_profile_definition g_profile_Obj_Lv6SwTurn = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv7BsGate.cpp b/src/d/actor/d_a_obj_lv7BsGate.cpp index d7bb8c2815..a3335f2bd1 100644 --- a/src/d/actor/d_a_obj_lv7BsGate.cpp +++ b/src/d/actor/d_a_obj_lv7BsGate.cpp @@ -207,7 +207,7 @@ static actor_method_class l_daLv7BsGate_Method = { (process_method_func)daLv7BsGate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv7BsGate = { +actor_process_profile_definition g_profile_Obj_Lv7BsGate = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv7PropellerY.cpp b/src/d/actor/d_a_obj_lv7PropellerY.cpp index 9593ac84a1..1725cd5bec 100644 --- a/src/d/actor/d_a_obj_lv7PropellerY.cpp +++ b/src/d/actor/d_a_obj_lv7PropellerY.cpp @@ -297,7 +297,7 @@ static actor_method_class l_daPropY_Method = { (process_method_func)daPropY_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv7PropY = { +actor_process_profile_definition g_profile_Obj_Lv7PropY = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv7bridge.cpp b/src/d/actor/d_a_obj_lv7bridge.cpp index 73fc13ca86..08e6f62d1d 100644 --- a/src/d/actor/d_a_obj_lv7bridge.cpp +++ b/src/d/actor/d_a_obj_lv7bridge.cpp @@ -472,7 +472,7 @@ static actor_method_class daObjLv7Brg_METHODS = { (process_method_func)daObjLv7Brg_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv7Bridge = { +actor_process_profile_definition g_profile_Obj_Lv7Bridge = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp index a980d06f7d..f74ca42dc2 100644 --- a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp +++ b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp @@ -211,7 +211,7 @@ static actor_method_class l_daKekaiTrap_Method = { (process_method_func)daKekaiTrap_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv8KekkaiTrap = { +actor_process_profile_definition g_profile_Obj_Lv8KekkaiTrap = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv8Lift.cpp b/src/d/actor/d_a_obj_lv8Lift.cpp index ae41f36554..4542c6f41e 100644 --- a/src/d/actor/d_a_obj_lv8Lift.cpp +++ b/src/d/actor/d_a_obj_lv8Lift.cpp @@ -444,7 +444,7 @@ static actor_method_class l_daL8Lift_Method = { (process_method_func)daL8Lift_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv8Lift = { +actor_process_profile_definition g_profile_Obj_Lv8Lift = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv8OptiLift.cpp b/src/d/actor/d_a_obj_lv8OptiLift.cpp index dc35898871..b8a040c615 100644 --- a/src/d/actor/d_a_obj_lv8OptiLift.cpp +++ b/src/d/actor/d_a_obj_lv8OptiLift.cpp @@ -476,7 +476,7 @@ static actor_method_class l_daOptiLift_Method = { (process_method_func)daOptiLift_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv8OptiLift = { +actor_process_profile_definition g_profile_Obj_Lv8OptiLift = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv8UdFloor.cpp b/src/d/actor/d_a_obj_lv8UdFloor.cpp index 8426b5aa8f..3015e52846 100644 --- a/src/d/actor/d_a_obj_lv8UdFloor.cpp +++ b/src/d/actor/d_a_obj_lv8UdFloor.cpp @@ -287,7 +287,7 @@ static actor_method_class l_daUdFloor_Method = { (process_method_func)daUdFloor_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv8UdFloor = { +actor_process_profile_definition g_profile_Obj_Lv8UdFloor = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv9SwShutter.cpp b/src/d/actor/d_a_obj_lv9SwShutter.cpp index 1e5d6f6365..9f49edaa40 100644 --- a/src/d/actor/d_a_obj_lv9SwShutter.cpp +++ b/src/d/actor/d_a_obj_lv9SwShutter.cpp @@ -193,7 +193,7 @@ static actor_method_class l_daLv9SwShutter_Method = { (process_method_func)daLv9SwShutter_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv9SwShutter = { +actor_process_profile_definition g_profile_Obj_Lv9SwShutter = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_magLift.cpp b/src/d/actor/d_a_obj_magLift.cpp index 062a6d10ce..9f82a8f8c4 100644 --- a/src/d/actor/d_a_obj_magLift.cpp +++ b/src/d/actor/d_a_obj_magLift.cpp @@ -242,7 +242,7 @@ static actor_method_class l_daMagLift_Method = { (process_method_func) daMagLift_Draw, }; -extern actor_process_profile_definition g_profile_Obj_MagLift = { +actor_process_profile_definition g_profile_Obj_MagLift = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_magLiftRot.cpp b/src/d/actor/d_a_obj_magLiftRot.cpp index a4f09b2d49..ca5970915a 100644 --- a/src/d/actor/d_a_obj_magLiftRot.cpp +++ b/src/d/actor/d_a_obj_magLiftRot.cpp @@ -363,7 +363,7 @@ static actor_method_class l_daMagLiftRot_Method = { (process_method_func)daMagLiftRot_Draw, }; -extern actor_process_profile_definition g_profile_Obj_MagLiftRot = { +actor_process_profile_definition g_profile_Obj_MagLiftRot = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_magne_arm.cpp b/src/d/actor/d_a_obj_magne_arm.cpp index ffba4604bd..2557777987 100644 --- a/src/d/actor/d_a_obj_magne_arm.cpp +++ b/src/d/actor/d_a_obj_magne_arm.cpp @@ -1098,7 +1098,7 @@ static actor_method_class daObjMarm_METHODS = { (process_method_func)daObjMarm_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_MagneArm = { +actor_process_profile_definition g_profile_Obj_MagneArm = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_maki.cpp b/src/d/actor/d_a_obj_maki.cpp index dba1c62a8b..c20b7f3004 100644 --- a/src/d/actor/d_a_obj_maki.cpp +++ b/src/d/actor/d_a_obj_maki.cpp @@ -242,7 +242,7 @@ actor_method_class l_daObj_Maki_Method = { (process_method_func)daObj_Maki_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_MAKI = { +actor_process_profile_definition g_profile_OBJ_MAKI = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_master_sword.cpp b/src/d/actor/d_a_obj_master_sword.cpp index 629ef7b826..1704dc2605 100644 --- a/src/d/actor/d_a_obj_master_sword.cpp +++ b/src/d/actor/d_a_obj_master_sword.cpp @@ -242,7 +242,7 @@ static actor_method_class l_daObjMasterSword_Method = { (process_method_func)daObjMasterSword_Draw, }; -extern actor_process_profile_definition g_profile_Obj_MasterSword = { +actor_process_profile_definition g_profile_Obj_MasterSword = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_mato.cpp b/src/d/actor/d_a_obj_mato.cpp index 0cdbd235fa..8a5a431e6e 100644 --- a/src/d/actor/d_a_obj_mato.cpp +++ b/src/d/actor/d_a_obj_mato.cpp @@ -371,7 +371,7 @@ static actor_method_class l_daObjMATO_Method = { (process_method_func)daObjMATO_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Mato = { +actor_process_profile_definition g_profile_Obj_Mato = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_metalbox.cpp b/src/d/actor/d_a_obj_metalbox.cpp index 86241d83d1..c769c8af8e 100644 --- a/src/d/actor/d_a_obj_metalbox.cpp +++ b/src/d/actor/d_a_obj_metalbox.cpp @@ -106,7 +106,7 @@ static actor_method_class l_daObjMBox_Method = { (process_method_func)daObjMBox_Draw, }; -extern actor_process_profile_definition g_profile_Obj_MetalBox = { +actor_process_profile_definition g_profile_Obj_MetalBox = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_mgate.cpp b/src/d/actor/d_a_obj_mgate.cpp index 923faa6e3c..e8a56dff01 100644 --- a/src/d/actor/d_a_obj_mgate.cpp +++ b/src/d/actor/d_a_obj_mgate.cpp @@ -241,7 +241,7 @@ static actor_method_class daObjMGate_METHODS = { (process_method_func)daObjMGate_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_MGate = { +actor_process_profile_definition g_profile_Obj_MGate = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mhole.cpp b/src/d/actor/d_a_obj_mhole.cpp index 69baaea558..73b707e5b0 100644 --- a/src/d/actor/d_a_obj_mhole.cpp +++ b/src/d/actor/d_a_obj_mhole.cpp @@ -382,7 +382,7 @@ static actor_method_class l_daObjMHole_Method = { (process_method_func)daObjMHole_Draw, }; -extern actor_process_profile_definition g_profile_Obj_MHole = { +actor_process_profile_definition g_profile_Obj_MHole = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_mie.cpp b/src/d/actor/d_a_obj_mie.cpp index 2ed126eb06..c2e85e7290 100644 --- a/src/d/actor/d_a_obj_mie.cpp +++ b/src/d/actor/d_a_obj_mie.cpp @@ -521,7 +521,7 @@ static actor_method_class daObj_Mie_MethodTable = { (process_method_func)daObj_Mie_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_MIE = { +actor_process_profile_definition g_profile_OBJ_MIE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_mirror_6pole.cpp b/src/d/actor/d_a_obj_mirror_6pole.cpp index c29220e154..9d596501ad 100644 --- a/src/d/actor/d_a_obj_mirror_6pole.cpp +++ b/src/d/actor/d_a_obj_mirror_6pole.cpp @@ -172,7 +172,7 @@ static actor_method_class l_daObjMirror6Pole_Method = { (process_method_func)daObjMirror6Pole_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Mirror6Pole = { +actor_process_profile_definition g_profile_Obj_Mirror6Pole = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mirror_chain.cpp b/src/d/actor/d_a_obj_mirror_chain.cpp index 5612a9ddc3..65cd8c533a 100644 --- a/src/d/actor/d_a_obj_mirror_chain.cpp +++ b/src/d/actor/d_a_obj_mirror_chain.cpp @@ -504,7 +504,7 @@ static actor_method_class l_daObjMirrorChain_Method = { (process_method_func)daObjMirrorChain_Draw, }; -extern actor_process_profile_definition g_profile_Obj_MirrorChain = { +actor_process_profile_definition g_profile_Obj_MirrorChain = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mirror_sand.cpp b/src/d/actor/d_a_obj_mirror_sand.cpp index 3fcb48c5ed..112d2f69c0 100644 --- a/src/d/actor/d_a_obj_mirror_sand.cpp +++ b/src/d/actor/d_a_obj_mirror_sand.cpp @@ -169,7 +169,7 @@ static actor_method_class l_daObjMirrorSand_Method = { (process_method_func)daObjMirrorSand_Draw, }; -extern actor_process_profile_definition g_profile_Obj_MirrorSand = { +actor_process_profile_definition g_profile_Obj_MirrorSand = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mirror_screw.cpp b/src/d/actor/d_a_obj_mirror_screw.cpp index b289b74685..a261c08cce 100644 --- a/src/d/actor/d_a_obj_mirror_screw.cpp +++ b/src/d/actor/d_a_obj_mirror_screw.cpp @@ -260,7 +260,7 @@ static actor_method_class l_daObjMirrorScrew_Method = { (process_method_func)daObjMirrorScrew_Draw, }; -extern actor_process_profile_definition g_profile_Obj_MirrorScrew = { +actor_process_profile_definition g_profile_Obj_MirrorScrew = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mirror_table.cpp b/src/d/actor/d_a_obj_mirror_table.cpp index ea651144ae..c366e2dae3 100644 --- a/src/d/actor/d_a_obj_mirror_table.cpp +++ b/src/d/actor/d_a_obj_mirror_table.cpp @@ -461,7 +461,7 @@ static actor_method_class l_daObjMirrorTable_Method = { (process_method_func)daObjMirrorTable_Draw, }; -extern actor_process_profile_definition g_profile_Obj_MirrorTable = { +actor_process_profile_definition g_profile_Obj_MirrorTable = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 64e91865ef..dccfd84bf3 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -643,7 +643,7 @@ int daObjMovebox::Act_c::CreateHeap() { } void daObjMovebox::Act_c::RideCallBack(dBgW* i_bgw, fopAc_ac_c* i_actor, fopAc_ac_c* i_rideActor) { - (void)i_bgw; + UNUSED(i_bgw); Act_c* a_this = (Act_c*)i_actor; if (a_this->field_0x5ac == 2) { @@ -697,7 +697,7 @@ enum MOVE_DIR { fopAc_ac_c* daObjMovebox::Act_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i_pushActor, s16 i_angle, dBgW_Base::PushPullLabel pp_label) { - (void)i_pushActor; + UNUSED(i_pushActor); dBgW::PushPullLabel var_r26 = cLib_checkBit( pp_label, (dBgW::PushPullLabel)(dBgW::PPLABEL_PUSH | dBgW::PPLABEL_PULL)); @@ -1410,7 +1410,7 @@ static actor_method_class Mthd_Table = { }; // namespace }; // namespace daObjMovebox -extern actor_process_profile_definition g_profile_Obj_Movebox = { +actor_process_profile_definition g_profile_Obj_Movebox = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_msima.cpp b/src/d/actor/d_a_obj_msima.cpp index d98ee17945..fadf316c4a 100644 --- a/src/d/actor/d_a_obj_msima.cpp +++ b/src/d/actor/d_a_obj_msima.cpp @@ -86,8 +86,6 @@ static void msima_start(obj_msima_class* i_this) { i_this->field_0x59a = 0x708; } -/* 80C9CEA4 0001+00 data_80C9CEA4 @1009 */ -/* 80C9CEA5 0003+00 data_80C9CEA5 None */ static bool hio_set; static daObj_Msima_HIO_c l_HIO; @@ -514,7 +512,7 @@ static actor_method_class l_daObj_Msima_Method = { (process_method_func)daObj_Msima_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_MSIMA = { +actor_process_profile_definition g_profile_OBJ_MSIMA = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_mvstair.cpp b/src/d/actor/d_a_obj_mvstair.cpp index 08cde715cb..e2525d22a7 100644 --- a/src/d/actor/d_a_obj_mvstair.cpp +++ b/src/d/actor/d_a_obj_mvstair.cpp @@ -462,7 +462,7 @@ static actor_method_class daObjStair_METHODS = { (process_method_func)daObjStair_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_MvStair = { +actor_process_profile_definition g_profile_Obj_MvStair = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_myogan.cpp b/src/d/actor/d_a_obj_myogan.cpp index 346bb1e648..2c7e7ee191 100644 --- a/src/d/actor/d_a_obj_myogan.cpp +++ b/src/d/actor/d_a_obj_myogan.cpp @@ -167,7 +167,7 @@ static actor_method_class l_daObj_Myogan_Method = { (process_method_func)daObj_Myogan_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_MYOGAN = { +actor_process_profile_definition g_profile_OBJ_MYOGAN = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_nagaisu.cpp b/src/d/actor/d_a_obj_nagaisu.cpp index 6cee9cf7b0..4eb368f552 100644 --- a/src/d/actor/d_a_obj_nagaisu.cpp +++ b/src/d/actor/d_a_obj_nagaisu.cpp @@ -318,7 +318,7 @@ static actor_method_class daObjNagaisu_METHODS = { (process_method_func)daObjNagaisu_draw, }; -extern actor_process_profile_definition g_profile_Obj_Nagaisu = { +actor_process_profile_definition g_profile_Obj_Nagaisu = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_nameplate.cpp b/src/d/actor/d_a_obj_nameplate.cpp index 13980a228b..9c8a043a87 100644 --- a/src/d/actor/d_a_obj_nameplate.cpp +++ b/src/d/actor/d_a_obj_nameplate.cpp @@ -67,7 +67,6 @@ void daObjNameplate_c::setBaseMtx() { } void daObjNameplate_c::initCcSphere() { - /* 80594EB4-80594EF4 000040 0040+00 1/1 0/0 0/0 .rodata ccSphSrc$3700 */ const static dCcD_SrcSph ccSphSrc = { { {0x0, {{0x0, 0x0, 0x0}, {0x1607a, 0x11}, 0x99}}, // mObj @@ -263,9 +262,6 @@ static int daObjNameplate_Draw(daObjNameplate_c* i_this) { return i_this->draw(); } -/* 80594A6C-80594AB4 000A4C 0048+00 1/0 0/0 0/0 .text - * daObjNameplate_Execute__FP16daObjNameplate_c - */ static int daObjNameplate_Execute(daObjNameplate_c* i_this) { i_this->calcAngle(); i_this->setBaseMtx(); @@ -279,9 +275,6 @@ static int daObjNameplate_IsDelete(daObjNameplate_c* i_this) { return 1; } -/* 80594ABC-80594BF8 000A9C 013C+00 1/0 0/0 0/0 .text - * daObjNameplate_Delete__FP16daObjNameplate_c - */ static int daObjNameplate_Delete(daObjNameplate_c* i_this) { i_this->~daObjNameplate_c(); return 1; @@ -314,7 +307,7 @@ static actor_method_class l_daObjNameplate_Method = { (process_method_func)daObjNameplate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_NamePlate = { +actor_process_profile_definition g_profile_Obj_NamePlate = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_nan.cpp b/src/d/actor/d_a_obj_nan.cpp index 597cce820e..03284cf3d9 100644 --- a/src/d/actor/d_a_obj_nan.cpp +++ b/src/d/actor/d_a_obj_nan.cpp @@ -727,7 +727,7 @@ static actor_method_class l_daObjNAN_Method = { (process_method_func)daObjNAN_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Nan = { +actor_process_profile_definition g_profile_Obj_Nan = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ndoor.cpp b/src/d/actor/d_a_obj_ndoor.cpp index 770e7311f9..f6bed90cc3 100644 --- a/src/d/actor/d_a_obj_ndoor.cpp +++ b/src/d/actor/d_a_obj_ndoor.cpp @@ -131,7 +131,7 @@ static actor_method_class l_daObj_Ndoor_Method = { (process_method_func)daObj_Ndoor_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_NDOOR = { +actor_process_profile_definition g_profile_OBJ_NDOOR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_nougu.cpp b/src/d/actor/d_a_obj_nougu.cpp index 2c65db643f..37e50a7a5b 100644 --- a/src/d/actor/d_a_obj_nougu.cpp +++ b/src/d/actor/d_a_obj_nougu.cpp @@ -209,7 +209,7 @@ static actor_method_class daObj_Nougu_MethodTable = { (process_method_func)daObj_Nougu_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_NOUGU = { +actor_process_profile_definition g_profile_OBJ_NOUGU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_octhashi.cpp b/src/d/actor/d_a_obj_octhashi.cpp index dc2565daad..c0f2f3eb8f 100644 --- a/src/d/actor/d_a_obj_octhashi.cpp +++ b/src/d/actor/d_a_obj_octhashi.cpp @@ -381,7 +381,7 @@ static actor_method_class l_daObjOCTHASHI_Method = { (process_method_func)daObjOCTHASHI_Draw, }; -extern actor_process_profile_definition g_profile_OCTHASHI = { +actor_process_profile_definition g_profile_OCTHASHI = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_oiltubo.cpp b/src/d/actor/d_a_obj_oiltubo.cpp index fb89e3ac97..1d8873d462 100644 --- a/src/d/actor/d_a_obj_oiltubo.cpp +++ b/src/d/actor/d_a_obj_oiltubo.cpp @@ -288,7 +288,7 @@ static actor_method_class daObj_Oiltubo_MethodTable = { (process_method_func)daObj_Oiltubo_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_OILTUBO = { +actor_process_profile_definition g_profile_OBJ_OILTUBO = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_onsen.cpp b/src/d/actor/d_a_obj_onsen.cpp index 605b7e2b88..ac339bb52f 100644 --- a/src/d/actor/d_a_obj_onsen.cpp +++ b/src/d/actor/d_a_obj_onsen.cpp @@ -127,7 +127,7 @@ static actor_method_class daObjOnsen_METHODS = { (process_method_func)daObjOnsen_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Onsen = { +actor_process_profile_definition g_profile_Obj_Onsen = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_onsenFire.cpp b/src/d/actor/d_a_obj_onsenFire.cpp index a5c521a599..f9540a3681 100644 --- a/src/d/actor/d_a_obj_onsenFire.cpp +++ b/src/d/actor/d_a_obj_onsenFire.cpp @@ -44,7 +44,7 @@ static actor_method_class l_daObjOnsenFire_Method = { (process_method_func)daObjOnsenFire_Execute }; -extern actor_process_profile_definition g_profile_OBJ_ONSEN_FIRE = { +actor_process_profile_definition g_profile_OBJ_ONSEN_FIRE = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_onsenTaru.cpp b/src/d/actor/d_a_obj_onsenTaru.cpp index 47092de050..32da9d72fa 100644 --- a/src/d/actor/d_a_obj_onsenTaru.cpp +++ b/src/d/actor/d_a_obj_onsenTaru.cpp @@ -383,7 +383,7 @@ static actor_method_class l_daOnsTaru_Method = { (process_method_func)daOnsTaru_Draw, }; -extern actor_process_profile_definition g_profile_Obj_OnsenTaru = { +actor_process_profile_definition g_profile_Obj_OnsenTaru = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ornament_cloth.cpp b/src/d/actor/d_a_obj_ornament_cloth.cpp index 085b1e6fcf..9ec1f9e86a 100644 --- a/src/d/actor/d_a_obj_ornament_cloth.cpp +++ b/src/d/actor/d_a_obj_ornament_cloth.cpp @@ -333,7 +333,7 @@ static actor_method_class l_daObjOnCloth_Method = { (process_method_func)daObjOnCloth_Draw, }; -extern actor_process_profile_definition g_profile_Obj_OnCloth = { +actor_process_profile_definition g_profile_Obj_OnCloth = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_pdoor.cpp b/src/d/actor/d_a_obj_pdoor.cpp index e3a21183b5..fe71c9fca2 100644 --- a/src/d/actor/d_a_obj_pdoor.cpp +++ b/src/d/actor/d_a_obj_pdoor.cpp @@ -278,7 +278,7 @@ static actor_method_class daObjPDoor_METHODS = { (process_method_func)daObjPDoor_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_PushDoor = { +actor_process_profile_definition g_profile_Obj_PushDoor = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_pdtile.cpp b/src/d/actor/d_a_obj_pdtile.cpp index 4bef0fb00e..911d9ac999 100644 --- a/src/d/actor/d_a_obj_pdtile.cpp +++ b/src/d/actor/d_a_obj_pdtile.cpp @@ -520,7 +520,7 @@ static actor_method_class daObjPDtile_METHODS = { (process_method_func)daObjPDtile_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_PDtile = { +actor_process_profile_definition g_profile_Obj_PDtile = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_pdwall.cpp b/src/d/actor/d_a_obj_pdwall.cpp index e33ee4e5b0..6132e10d7c 100644 --- a/src/d/actor/d_a_obj_pdwall.cpp +++ b/src/d/actor/d_a_obj_pdwall.cpp @@ -198,7 +198,7 @@ static actor_method_class daObjPDwall_METHODS = { (process_method_func)daObjPDwall_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_PDwall = { +actor_process_profile_definition g_profile_Obj_PDwall = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_picture.cpp b/src/d/actor/d_a_obj_picture.cpp index 0e56c045d3..1fae189c54 100644 --- a/src/d/actor/d_a_obj_picture.cpp +++ b/src/d/actor/d_a_obj_picture.cpp @@ -554,7 +554,7 @@ static actor_method_class daObjPicture_METHODS = { (process_method_func)daObjPicture_draw, }; -extern actor_process_profile_definition g_profile_Obj_Picture = { +actor_process_profile_definition g_profile_Obj_Picture = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_pillar.cpp b/src/d/actor/d_a_obj_pillar.cpp index 2b94b225b6..d991879540 100644 --- a/src/d/actor/d_a_obj_pillar.cpp +++ b/src/d/actor/d_a_obj_pillar.cpp @@ -484,7 +484,7 @@ static actor_method_class daPillar_METHODS = { (process_method_func)daPillar_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Pillar = { +actor_process_profile_definition g_profile_Obj_Pillar = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_pleaf.cpp b/src/d/actor/d_a_obj_pleaf.cpp index c76c4ccfad..fac9e4b42e 100644 --- a/src/d/actor/d_a_obj_pleaf.cpp +++ b/src/d/actor/d_a_obj_pleaf.cpp @@ -150,7 +150,7 @@ static actor_method_class daObj_Pleaf_MethodTable = { (process_method_func)daObj_Pleaf_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_PLEAF = { +actor_process_profile_definition g_profile_OBJ_PLEAF = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_poCandle.cpp b/src/d/actor/d_a_obj_poCandle.cpp index 2604a19296..0b477c49b0 100644 --- a/src/d/actor/d_a_obj_poCandle.cpp +++ b/src/d/actor/d_a_obj_poCandle.cpp @@ -249,7 +249,7 @@ static actor_method_class l_daPoCandle_Method = { (process_method_func)daPoCandle_Draw, }; -extern actor_process_profile_definition g_profile_Obj_poCandle = { +actor_process_profile_definition g_profile_Obj_poCandle = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_poFire.cpp b/src/d/actor/d_a_obj_poFire.cpp index 25a1094276..1fd555dd57 100644 --- a/src/d/actor/d_a_obj_poFire.cpp +++ b/src/d/actor/d_a_obj_poFire.cpp @@ -438,7 +438,7 @@ static actor_method_class l_daPoFire_Method = { (process_method_func)daPoFire_Draw, }; -extern actor_process_profile_definition g_profile_Obj_poFire = { +actor_process_profile_definition g_profile_Obj_poFire = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_poTbox.cpp b/src/d/actor/d_a_obj_poTbox.cpp index c1b0a5c56b..74a4f89de3 100644 --- a/src/d/actor/d_a_obj_poTbox.cpp +++ b/src/d/actor/d_a_obj_poTbox.cpp @@ -303,7 +303,7 @@ static actor_method_class l_daPoTbox_Method = { (process_method_func)daPoTbox_Draw, }; -extern actor_process_profile_definition g_profile_Obj_poTbox = { +actor_process_profile_definition g_profile_Obj_poTbox = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_prop.cpp b/src/d/actor/d_a_obj_prop.cpp index 709d8837dc..166752ad62 100644 --- a/src/d/actor/d_a_obj_prop.cpp +++ b/src/d/actor/d_a_obj_prop.cpp @@ -101,7 +101,7 @@ static actor_method_class daObjProp_METHODS = { (process_method_func)daObjProp_draw, }; -extern actor_process_profile_definition g_profile_Obj_Prop = { +actor_process_profile_definition g_profile_Obj_Prop = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_pumpkin.cpp b/src/d/actor/d_a_obj_pumpkin.cpp index f13a30ef89..61346b493f 100644 --- a/src/d/actor/d_a_obj_pumpkin.cpp +++ b/src/d/actor/d_a_obj_pumpkin.cpp @@ -886,7 +886,7 @@ static actor_method_class daObj_Pumpkin_MethodTable = { (process_method_func)daObj_Pumpkin_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_PUMPKIN = { +actor_process_profile_definition g_profile_OBJ_PUMPKIN = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_rcircle.cpp b/src/d/actor/d_a_obj_rcircle.cpp index 4836748dd1..9da3f620f7 100644 --- a/src/d/actor/d_a_obj_rcircle.cpp +++ b/src/d/actor/d_a_obj_rcircle.cpp @@ -122,7 +122,7 @@ static actor_method_class daObjRCircle_METHODS = { (process_method_func)daObjRCircle_draw, }; -extern actor_process_profile_definition g_profile_Obj_RCircle = { +actor_process_profile_definition g_profile_Obj_RCircle = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_rfHole.cpp b/src/d/actor/d_a_obj_rfHole.cpp index 5667750d46..02d1883cd1 100644 --- a/src/d/actor/d_a_obj_rfHole.cpp +++ b/src/d/actor/d_a_obj_rfHole.cpp @@ -201,7 +201,7 @@ static actor_method_class l_daRfHole_Method = { (process_method_func)daRfHole_Draw, }; -extern actor_process_profile_definition g_profile_Obj_RfHole = { +actor_process_profile_definition g_profile_Obj_RfHole = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_rgate.cpp b/src/d/actor/d_a_obj_rgate.cpp index 2194493de3..26ca7f138b 100644 --- a/src/d/actor/d_a_obj_rgate.cpp +++ b/src/d/actor/d_a_obj_rgate.cpp @@ -876,7 +876,7 @@ static actor_method_class daObjRgate_METHODS = { (process_method_func)daObjRgate_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_RiderGate = { +actor_process_profile_definition g_profile_Obj_RiderGate = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_riverrock.cpp b/src/d/actor/d_a_obj_riverrock.cpp index 81ad137d34..69bea987c6 100644 --- a/src/d/actor/d_a_obj_riverrock.cpp +++ b/src/d/actor/d_a_obj_riverrock.cpp @@ -318,7 +318,7 @@ static actor_method_class l_daObjRIVERROCK_Method = { (process_method_func)daObjRIVERROCK_Draw, }; -extern actor_process_profile_definition g_profile_Obj_RIVERROCK = { +actor_process_profile_definition g_profile_Obj_RIVERROCK = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_rock.cpp b/src/d/actor/d_a_obj_rock.cpp index 2301852a13..65fe8a4493 100644 --- a/src/d/actor/d_a_obj_rock.cpp +++ b/src/d/actor/d_a_obj_rock.cpp @@ -200,7 +200,7 @@ static actor_method_class l_daObj_Rock_Method = { (process_method_func)daObj_Rock_Execute, (process_method_func)daObj_Rock_IsDelete, (process_method_func)daObj_Rock_Draw}; -extern actor_process_profile_definition g_profile_OBJ_ROCK = { +actor_process_profile_definition g_profile_OBJ_ROCK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_rope_bridge.cpp b/src/d/actor/d_a_obj_rope_bridge.cpp index 4d28591b5a..c50e0ed155 100644 --- a/src/d/actor/d_a_obj_rope_bridge.cpp +++ b/src/d/actor/d_a_obj_rope_bridge.cpp @@ -636,7 +636,7 @@ static actor_method_class daObjRBridge_METHODS = { (process_method_func)daObjRBridge_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_RopeBridge = { +actor_process_profile_definition g_profile_Obj_RopeBridge = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_rotBridge.cpp b/src/d/actor/d_a_obj_rotBridge.cpp index ec3bdb1113..cdc6e7fb42 100644 --- a/src/d/actor/d_a_obj_rotBridge.cpp +++ b/src/d/actor/d_a_obj_rotBridge.cpp @@ -260,7 +260,7 @@ static actor_method_class l_daRotBridge_Method = { (process_method_func)daRotBridge_Draw, }; -extern actor_process_profile_definition g_profile_Obj_RotBridge = { +actor_process_profile_definition g_profile_Obj_RotBridge = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_rotTrap.cpp b/src/d/actor/d_a_obj_rotTrap.cpp index 3bdc7bb769..bcd0f60079 100644 --- a/src/d/actor/d_a_obj_rotTrap.cpp +++ b/src/d/actor/d_a_obj_rotTrap.cpp @@ -317,7 +317,7 @@ static actor_method_class l_daRotTrap_Method = { (process_method_func)daRotTrap_Draw, }; -extern actor_process_profile_definition g_profile_Obj_RotTrap = { +actor_process_profile_definition g_profile_Obj_RotTrap = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp index fa3048b733..1e5d6ebc69 100644 --- a/src/d/actor/d_a_obj_roten.cpp +++ b/src/d/actor/d_a_obj_roten.cpp @@ -177,7 +177,7 @@ static actor_method_class daObj_Roten_MethodTable = { (process_method_func)daObj_Roten_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_ROTEN = { +actor_process_profile_definition g_profile_OBJ_ROTEN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_rstair.cpp b/src/d/actor/d_a_obj_rstair.cpp index 803f9f365b..32112c3135 100644 --- a/src/d/actor/d_a_obj_rstair.cpp +++ b/src/d/actor/d_a_obj_rstair.cpp @@ -362,7 +362,7 @@ static actor_method_class daObjRotStair_METHODS = { (process_method_func)daObjRotStair_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_RotStair = { +actor_process_profile_definition g_profile_Obj_RotStair = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_rw.cpp b/src/d/actor/d_a_obj_rw.cpp index e0f7332d6d..eff67a34b7 100644 --- a/src/d/actor/d_a_obj_rw.cpp +++ b/src/d/actor/d_a_obj_rw.cpp @@ -392,7 +392,7 @@ static actor_method_class l_daOBJ_RW_Method = { (process_method_func)daOBJ_RW_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_RW = { +actor_process_profile_definition g_profile_OBJ_RW = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_sWallShutter.cpp b/src/d/actor/d_a_obj_sWallShutter.cpp index 1572b883f6..6f54f9ee57 100644 --- a/src/d/actor/d_a_obj_sWallShutter.cpp +++ b/src/d/actor/d_a_obj_sWallShutter.cpp @@ -237,7 +237,7 @@ static actor_method_class l_daSwShutter_Method = { (process_method_func)daSwShutter_Draw, }; -extern actor_process_profile_definition g_profile_Obj_SwallShutter = { +actor_process_profile_definition g_profile_Obj_SwallShutter = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_saidan.cpp b/src/d/actor/d_a_obj_saidan.cpp index 0ded1a1fc8..fcbbbb9e6f 100644 --- a/src/d/actor/d_a_obj_saidan.cpp +++ b/src/d/actor/d_a_obj_saidan.cpp @@ -154,7 +154,7 @@ static actor_method_class l_daSaidan_Method = { (process_method_func)daSaidan_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Saidan = { +actor_process_profile_definition g_profile_Obj_Saidan = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_sakuita.cpp b/src/d/actor/d_a_obj_sakuita.cpp index 05a8cfbf91..655f87a9ab 100644 --- a/src/d/actor/d_a_obj_sakuita.cpp +++ b/src/d/actor/d_a_obj_sakuita.cpp @@ -220,7 +220,7 @@ static actor_method_class l_daObjSakuita_Method = { (process_method_func)daObjSakuita_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Sakuita = { +actor_process_profile_definition g_profile_Obj_Sakuita = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_sakuita_rope.cpp b/src/d/actor/d_a_obj_sakuita_rope.cpp index 60b096d963..12ce066a39 100644 --- a/src/d/actor/d_a_obj_sakuita_rope.cpp +++ b/src/d/actor/d_a_obj_sakuita_rope.cpp @@ -386,7 +386,7 @@ static actor_method_class l_daObjItaRope_Method = { (process_method_func)daObjItaRope_Draw, }; -extern actor_process_profile_definition g_profile_Obj_ItaRope = { +actor_process_profile_definition g_profile_Obj_ItaRope = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_scannon.cpp b/src/d/actor/d_a_obj_scannon.cpp index c6f6354d7d..362d540850 100644 --- a/src/d/actor/d_a_obj_scannon.cpp +++ b/src/d/actor/d_a_obj_scannon.cpp @@ -849,7 +849,7 @@ static actor_method_class daSCannon_METHODS = { (process_method_func)daSCannon_draw, }; -extern actor_process_profile_definition g_profile_Obj_SCannon = { +actor_process_profile_definition g_profile_Obj_SCannon = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_scannon_crs.cpp b/src/d/actor/d_a_obj_scannon_crs.cpp index 0e913238fe..27b0e80533 100644 --- a/src/d/actor/d_a_obj_scannon_crs.cpp +++ b/src/d/actor/d_a_obj_scannon_crs.cpp @@ -516,7 +516,7 @@ static actor_method_class daSCannonCrs_METHODS = { (process_method_func)daSCannonCrs_draw, }; -extern actor_process_profile_definition g_profile_Obj_SCannonCrs = { +actor_process_profile_definition g_profile_Obj_SCannonCrs = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_scannon_ten.cpp b/src/d/actor/d_a_obj_scannon_ten.cpp index 44880af3b6..560fe14948 100644 --- a/src/d/actor/d_a_obj_scannon_ten.cpp +++ b/src/d/actor/d_a_obj_scannon_ten.cpp @@ -465,7 +465,7 @@ static actor_method_class daObjSCannonTen_METHODS = { (process_method_func)daObjSCannonTen_draw, }; -extern actor_process_profile_definition g_profile_Obj_SCannonTen = { +actor_process_profile_definition g_profile_Obj_SCannonTen = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_sekidoor.cpp b/src/d/actor/d_a_obj_sekidoor.cpp index 78619c266f..44d54ccffd 100644 --- a/src/d/actor/d_a_obj_sekidoor.cpp +++ b/src/d/actor/d_a_obj_sekidoor.cpp @@ -257,7 +257,7 @@ static actor_method_class daObj_SekiDoor_MethodTable = { (process_method_func)daObj_SekiDoor_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_SEKIDOOR = { +actor_process_profile_definition g_profile_OBJ_SEKIDOOR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_sekizo.cpp b/src/d/actor/d_a_obj_sekizo.cpp index c2303e6b78..ad9cdeb4d6 100644 --- a/src/d/actor/d_a_obj_sekizo.cpp +++ b/src/d/actor/d_a_obj_sekizo.cpp @@ -132,7 +132,7 @@ static actor_method_class daObj_Sekizo_MethodTable = { (process_method_func)daObj_Sekizo_Execute, (process_method_func)daObj_Sekizo_IsDelete, (process_method_func)daObj_Sekizo_Draw}; -extern actor_process_profile_definition g_profile_OBJ_SEKIZO = { +actor_process_profile_definition g_profile_OBJ_SEKIZO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp index 20c8bfb288..edf15095fd 100644 --- a/src/d/actor/d_a_obj_sekizoa.cpp +++ b/src/d/actor/d_a_obj_sekizoa.cpp @@ -2418,7 +2418,7 @@ static actor_method_class daObj_Sekizoa_MethodTable = { daObj_Sekizoa_IsDelete, daObj_Sekizoa_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_SEKIZOA = { +actor_process_profile_definition g_profile_OBJ_SEKIZOA = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index e177c63278..d2105d38b0 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -364,7 +364,7 @@ static actor_method_class l_daItemShield_Method = { (process_method_func)daItemShield_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Shield = { +actor_process_profile_definition g_profile_Obj_Shield = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_sm_door.cpp b/src/d/actor/d_a_obj_sm_door.cpp index 18e6ec5186..fffd8a6f4e 100644 --- a/src/d/actor/d_a_obj_sm_door.cpp +++ b/src/d/actor/d_a_obj_sm_door.cpp @@ -292,7 +292,7 @@ static actor_method_class l_daObjSM_DOOR_Method = { (process_method_func)daObjSM_DOOR_Draw, }; -extern actor_process_profile_definition g_profile_Obj_SM_DOOR = { +actor_process_profile_definition g_profile_Obj_SM_DOOR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_smallkey.cpp b/src/d/actor/d_a_obj_smallkey.cpp index 9e78e78c40..49953d0084 100644 --- a/src/d/actor/d_a_obj_smallkey.cpp +++ b/src/d/actor/d_a_obj_smallkey.cpp @@ -554,7 +554,7 @@ static actor_method_class l_daKey_Method = { (process_method_func)daKey_Draw, }; -extern actor_process_profile_definition g_profile_Obj_SmallKey = { +actor_process_profile_definition g_profile_Obj_SmallKey = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_smgdoor.cpp b/src/d/actor/d_a_obj_smgdoor.cpp index 88cc4b30ac..2bd117f1ea 100644 --- a/src/d/actor/d_a_obj_smgdoor.cpp +++ b/src/d/actor/d_a_obj_smgdoor.cpp @@ -425,7 +425,7 @@ static actor_method_class daObjSmgDoor_METHODS = { (process_method_func)daObjSmgDoor_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_SmgDoor = { +actor_process_profile_definition g_profile_Obj_SmgDoor = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_smoke.cpp b/src/d/actor/d_a_obj_smoke.cpp index d23c8acbb4..7edb5fe4c8 100644 --- a/src/d/actor/d_a_obj_smoke.cpp +++ b/src/d/actor/d_a_obj_smoke.cpp @@ -72,7 +72,7 @@ static actor_method_class l_daObjSmoke_Method = { (process_method_func)daObjSmoke_Execute, }; -extern actor_process_profile_definition g_profile_Obj_Smoke = { +actor_process_profile_definition g_profile_Obj_Smoke = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_smtile.cpp b/src/d/actor/d_a_obj_smtile.cpp index a3d3963b8d..57586d252e 100644 --- a/src/d/actor/d_a_obj_smtile.cpp +++ b/src/d/actor/d_a_obj_smtile.cpp @@ -323,7 +323,7 @@ static actor_method_class daObj_SMTile_MethodTable = { (process_method_func)daObj_SMTile_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_SMTILE = { +actor_process_profile_definition g_profile_OBJ_SMTILE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_smw_stone.cpp b/src/d/actor/d_a_obj_smw_stone.cpp index 169d79749e..e243a6f17a 100644 --- a/src/d/actor/d_a_obj_smw_stone.cpp +++ b/src/d/actor/d_a_obj_smw_stone.cpp @@ -195,7 +195,7 @@ static actor_method_class daSmWStone_METHODS = { (process_method_func)daSmWStone_draw, }; -extern actor_process_profile_definition g_profile_Obj_SmWStone = { +actor_process_profile_definition g_profile_Obj_SmWStone = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_snowEffTag.cpp b/src/d/actor/d_a_obj_snowEffTag.cpp index e06e2b0083..eef00f6a5e 100644 --- a/src/d/actor/d_a_obj_snowEffTag.cpp +++ b/src/d/actor/d_a_obj_snowEffTag.cpp @@ -130,7 +130,7 @@ static actor_method_class l_daSnowEffTag_Method = { (process_method_func)daSnowEffTag_Draw, }; -extern actor_process_profile_definition g_profile_Tag_SnowEff = { +actor_process_profile_definition g_profile_Tag_SnowEff = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_snow_soup.cpp b/src/d/actor/d_a_obj_snow_soup.cpp index 9fb1a611c7..f911d9cc90 100644 --- a/src/d/actor/d_a_obj_snow_soup.cpp +++ b/src/d/actor/d_a_obj_snow_soup.cpp @@ -192,7 +192,7 @@ static actor_method_class daObjSnowSoup_METHODS = { (process_method_func)daObjSnowSoup_draw, }; -extern actor_process_profile_definition g_profile_Obj_SnowSoup = { +actor_process_profile_definition g_profile_Obj_SnowSoup = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp index ebf7648909..68ae4dc357 100644 --- a/src/d/actor/d_a_obj_so.cpp +++ b/src/d/actor/d_a_obj_so.cpp @@ -1085,7 +1085,7 @@ static actor_method_class l_daObj_So_Method = { (process_method_func)daObj_So_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_SO = { +actor_process_profile_definition g_profile_OBJ_SO = { fpcLy_CURRENT_e, // mLayerID 2, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_spinLift.cpp b/src/d/actor/d_a_obj_spinLift.cpp index 4e2f3120c9..6f76e114b0 100644 --- a/src/d/actor/d_a_obj_spinLift.cpp +++ b/src/d/actor/d_a_obj_spinLift.cpp @@ -278,7 +278,7 @@ static actor_method_class l_daSpinLift_Method = { (process_method_func)daSpinLift_Draw, }; -extern actor_process_profile_definition g_profile_Obj_SpinLift = { +actor_process_profile_definition g_profile_Obj_SpinLift = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ss_drink.cpp b/src/d/actor/d_a_obj_ss_drink.cpp index 899d8c92d5..9230868e47 100644 --- a/src/d/actor/d_a_obj_ss_drink.cpp +++ b/src/d/actor/d_a_obj_ss_drink.cpp @@ -493,7 +493,7 @@ static actor_method_class daObj_SSDrink_MethodTable = { (process_method_func)daObj_SSDrink_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_SSDRINK = { +actor_process_profile_definition g_profile_OBJ_SSDRINK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ss_item.cpp b/src/d/actor/d_a_obj_ss_item.cpp index ceb32622f6..d395c234bb 100644 --- a/src/d/actor/d_a_obj_ss_item.cpp +++ b/src/d/actor/d_a_obj_ss_item.cpp @@ -371,7 +371,7 @@ static actor_method_class daObj_SSItem_MethodTable = { (process_method_func)daObj_SSItem_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_SSITEM = { +actor_process_profile_definition g_profile_OBJ_SSITEM = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_stairBlock.cpp b/src/d/actor/d_a_obj_stairBlock.cpp index 99c5f04d43..377d3438b8 100644 --- a/src/d/actor/d_a_obj_stairBlock.cpp +++ b/src/d/actor/d_a_obj_stairBlock.cpp @@ -174,7 +174,7 @@ static actor_method_class l_daStairBlock_Method = { (process_method_func)daStairBlock_Draw, }; -extern actor_process_profile_definition g_profile_Obj_StairBlock = { +actor_process_profile_definition g_profile_Obj_StairBlock = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_stick.cpp b/src/d/actor/d_a_obj_stick.cpp index b868cc59c1..b4abdbea94 100644 --- a/src/d/actor/d_a_obj_stick.cpp +++ b/src/d/actor/d_a_obj_stick.cpp @@ -60,7 +60,7 @@ int daObj_Stick_c::create() { mSph.SetStts(&mStts); mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; - mGroundHeight = mAcch.m_ground_h; + mGroundHeight = mAcch.GetGroundH(); if(mGroundHeight != -G_CM3D_F_INF) { setEnvTevColor(); @@ -96,7 +96,7 @@ int daObj_Stick_c::Execute() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; - mGroundHeight = mAcch.m_ground_h; + mGroundHeight = mAcch.GetGroundH(); if (mGroundHeight != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); @@ -198,7 +198,7 @@ static actor_method_class daObj_Stick_MethodTable = { (process_method_func)daObj_Stick_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_STICK = { +actor_process_profile_definition g_profile_OBJ_STICK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_stone.cpp b/src/d/actor/d_a_obj_stone.cpp index 36ff9973b6..bea118ce80 100644 --- a/src/d/actor/d_a_obj_stone.cpp +++ b/src/d/actor/d_a_obj_stone.cpp @@ -318,11 +318,11 @@ void daObjStone_c::mode_proc_call() { if (mCollider.ChkAtHit()) { init_modeBreak(); } - bool isGroundLanding = mChkObj.ChkGroundLanding() != 0; - u32 isWallhit = mChkObj.m_flags & dBgS_Acch::WALL_HIT; - bool isGroundHit = mChkObj.ChkGroundHit() != 0; - bool isWaterHit = mChkObj.ChkWaterHit() != 0; - bool isWaterIn = mChkObj.ChkWaterIn() != 0; + bool isGroundLanding = mChkObj.ChkGroundLanding(); + u32 isWallhit = mChkObj.ChkWallHit(); + bool isGroundHit = mChkObj.ChkGroundHit(); + bool isWaterHit = mChkObj.ChkWaterHit(); + bool isWaterIn = mChkObj.ChkWaterIn(); if (field_0x0907 == 1) { if (isGroundLanding && !isWaterIn) { speed.x = speedF * cM_ssin(current.angle.y); @@ -336,7 +336,7 @@ void daObjStone_c::mode_proc_call() { speedF = speed.absXZ(); current.angle.y = cM_atan2s(speed.x, speed.z); } else { - if (isWallhit && field_0x0951 == 0 && isWaterIn) { + if (isWallhit && !field_0x0951 && isWaterIn) { speed.x = speedF * cM_ssin(current.angle.y); speed.z = speedF * cM_scos(current.angle.y); speed.y = mLastSpeedY; @@ -489,7 +489,7 @@ void daObjStone_c::mode_proc_call() { } (this->*(l_func[field_0x0907]))(); CrrPos(); - field_0x0951 = isWallhit != 0; + field_0x0951 = isWallhit; } void daObjStone_c::init_modePutWait() { @@ -1022,7 +1022,7 @@ static actor_method_class l_daObjStone_Method = { (process_method_func)daObjStone_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Stone = { +actor_process_profile_definition g_profile_Obj_Stone = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_stoneMark.cpp b/src/d/actor/d_a_obj_stoneMark.cpp index 2fc0713860..e8f08bc5f9 100644 --- a/src/d/actor/d_a_obj_stoneMark.cpp +++ b/src/d/actor/d_a_obj_stoneMark.cpp @@ -83,7 +83,7 @@ static actor_method_class l_daObjSMark_Method = { (process_method_func)daObjSMark_Draw, }; -extern actor_process_profile_definition g_profile_Obj_StoneMark = { +actor_process_profile_definition g_profile_Obj_StoneMark = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_stopper.cpp b/src/d/actor/d_a_obj_stopper.cpp index a8ef3e2c54..557f02c22a 100644 --- a/src/d/actor/d_a_obj_stopper.cpp +++ b/src/d/actor/d_a_obj_stopper.cpp @@ -514,7 +514,7 @@ static actor_method_class l_daObjStopper_Method = { (process_method_func)daObjStopper_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Stopper = { +actor_process_profile_definition g_profile_Obj_Stopper = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_stopper2.cpp b/src/d/actor/d_a_obj_stopper2.cpp index 97641f7e7e..5375998958 100644 --- a/src/d/actor/d_a_obj_stopper2.cpp +++ b/src/d/actor/d_a_obj_stopper2.cpp @@ -307,7 +307,7 @@ static actor_method_class l_daObjStopper2_Method = { (process_method_func)daObjStopper2_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Stopper2 = { +actor_process_profile_definition g_profile_Obj_Stopper2 = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_suisya.cpp b/src/d/actor/d_a_obj_suisya.cpp index 69fa4f8325..ee3a3fa56b 100644 --- a/src/d/actor/d_a_obj_suisya.cpp +++ b/src/d/actor/d_a_obj_suisya.cpp @@ -104,7 +104,7 @@ static actor_method_class l_daObj_Suisya_Method = { (process_method_func)daObj_Suisya_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_SUISYA = { +actor_process_profile_definition g_profile_OBJ_SUISYA = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_sw.cpp b/src/d/actor/d_a_obj_sw.cpp index 8721eb5eef..b5beb5d2e3 100644 --- a/src/d/actor/d_a_obj_sw.cpp +++ b/src/d/actor/d_a_obj_sw.cpp @@ -818,7 +818,7 @@ static actor_method_class l_daObj_Sw_Method = { (process_method_func)daObj_Sw_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_SW = { +actor_process_profile_definition g_profile_OBJ_SW = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swBallA.cpp b/src/d/actor/d_a_obj_swBallA.cpp index 44ebafa0a8..ffed7cbaa2 100644 --- a/src/d/actor/d_a_obj_swBallA.cpp +++ b/src/d/actor/d_a_obj_swBallA.cpp @@ -347,7 +347,7 @@ static actor_method_class l_daObjSwBallA_Method = { (process_method_func)daObjSwBallA_Draw, }; -extern actor_process_profile_definition g_profile_Obj_SwBallA = { +actor_process_profile_definition g_profile_Obj_SwBallA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swBallB.cpp b/src/d/actor/d_a_obj_swBallB.cpp index 691d00ec72..94c837e986 100644 --- a/src/d/actor/d_a_obj_swBallB.cpp +++ b/src/d/actor/d_a_obj_swBallB.cpp @@ -410,7 +410,7 @@ static actor_method_class l_daObjSwBallB_Method = { (process_method_func)daObjSwBallB_Draw, }; -extern actor_process_profile_definition g_profile_Obj_SwBallB = { +actor_process_profile_definition g_profile_Obj_SwBallB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swBallC.cpp b/src/d/actor/d_a_obj_swBallC.cpp index bee4c46181..7461739c8e 100644 --- a/src/d/actor/d_a_obj_swBallC.cpp +++ b/src/d/actor/d_a_obj_swBallC.cpp @@ -410,7 +410,7 @@ static actor_method_class l_daObjSwBallC_Method = { (process_method_func)daObjSwBallC_Draw, }; -extern actor_process_profile_definition g_profile_Obj_SwBallC = { +actor_process_profile_definition g_profile_Obj_SwBallC = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_swLight.cpp b/src/d/actor/d_a_obj_swLight.cpp index 025314b0bb..3d419b2e16 100644 --- a/src/d/actor/d_a_obj_swLight.cpp +++ b/src/d/actor/d_a_obj_swLight.cpp @@ -12,8 +12,8 @@ #if DEBUG class daObjSwLight_HIO_c : public mDoHIO_entry_c { public: - /* 811CF8C0 */ daObjSwLight_HIO_c(); - /* 811CF920 */ void genMessage(JORMContext*); + daObjSwLight_HIO_c(); + void genMessage(JORMContext*); /* 0x06 */ u8 field_0x06; /* 0x08 */ f32 mLightMaxRadius; @@ -474,7 +474,7 @@ static actor_method_class daObjSwLight_METHODS = { (process_method_func)daObjSwLight_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_SwLight = { +actor_process_profile_definition g_profile_Obj_SwLight = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swchain.cpp b/src/d/actor/d_a_obj_swchain.cpp index 49d6576b35..8dfb91bab4 100644 --- a/src/d/actor/d_a_obj_swchain.cpp +++ b/src/d/actor/d_a_obj_swchain.cpp @@ -15,8 +15,8 @@ #if DEBUG class daObjSwChain_HIO_c : public mDoHIO_entry_c { public: - /* 811C8DE0 */ daObjSwChain_HIO_c(); - /* 811C8EE0 */ void genMessage(JORMContext*); + daObjSwChain_HIO_c(); + void genMessage(JORMContext*); /* 0x06 */ u8 field_0x06; /* 0x08 */ f32 mGravity; @@ -1196,7 +1196,7 @@ static actor_method_class l_daObjSwChain_Method = { (process_method_func)daObjSwChain_Draw, }; -extern actor_process_profile_definition g_profile_Obj_SwChain = { +actor_process_profile_definition g_profile_Obj_SwChain = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swhang.cpp b/src/d/actor/d_a_obj_swhang.cpp index 4387d35e7a..8b75c9b5db 100644 --- a/src/d/actor/d_a_obj_swhang.cpp +++ b/src/d/actor/d_a_obj_swhang.cpp @@ -500,7 +500,7 @@ static actor_method_class daObjSwHang_METHODS = { (process_method_func)daObjSwHang_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_SwHang = { +actor_process_profile_definition g_profile_Obj_SwHang = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_sword.cpp b/src/d/actor/d_a_obj_sword.cpp index 5762fccd9d..ba7aa3c439 100644 --- a/src/d/actor/d_a_obj_sword.cpp +++ b/src/d/actor/d_a_obj_sword.cpp @@ -146,7 +146,7 @@ static actor_method_class l_daObjSword_Method = { (process_method_func)daObjSword_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Sword = { +actor_process_profile_definition g_profile_Obj_Sword = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swpropeller.cpp b/src/d/actor/d_a_obj_swpropeller.cpp index 43c5b6ba23..ea190d0ba2 100644 --- a/src/d/actor/d_a_obj_swpropeller.cpp +++ b/src/d/actor/d_a_obj_swpropeller.cpp @@ -328,7 +328,7 @@ static actor_method_class l_daObjSwPr_Method = { (process_method_func)daObjSwPr_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Swpropeller = { +actor_process_profile_definition g_profile_Obj_Swpropeller = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index d7a82cc7e3..901b3f4210 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -675,7 +675,7 @@ void daObjSwpush::Act_c::demo_reqPause_init() { if (mDemoMode == DEMO_MODE_NON) { mDemoMode = DEMO_MODE_REQ_PAUSE; fopAcM_orderPotentialEvent(this, 2, 0, 0); - eventInfo.onCondition(fopAcCnd_NOEXEC_e); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); } } @@ -718,7 +718,7 @@ void daObjSwpush::Act_c::demo_reqSw_init() { demo_stop_puase(); mDemoMode = DEMO_MODE_REQ_SW; fopAcM_orderOtherEventId(this, mEventID, prm_get_evId(), 0xFFFF, 0, 1); - eventInfo.onCondition(fopAcCnd_NOEXEC_e); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); } } @@ -727,7 +727,7 @@ void daObjSwpush::Act_c::demo_reqSw() { demo_runSw_init(); } else { fopAcM_orderOtherEventId(this, mEventID, prm_get_evId(), 0xFFFF, 0, 1); - eventInfo.onCondition(fopAcCnd_NOEXEC_e); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); } } @@ -852,7 +852,6 @@ namespace { return 1; } - /* 80484F88-80484FA8 -00001 0020+00 1/0 0/0 0/0 .data Mthd_Table__Q211daObjSwpush28@unnamed@d_a_obj_swpush_cpp@ */ static actor_method_class Mthd_Table = { (process_method_func)Mthd_Create, (process_method_func)Mthd_Delete, @@ -865,7 +864,7 @@ namespace { AUDIO_INSTANCES; -extern actor_process_profile_definition g_profile_Obj_Swpush = { +actor_process_profile_definition g_profile_Obj_Swpush = { fpcLy_CURRENT_e, // mLayerID 2, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swpush2.cpp b/src/d/actor/d_a_obj_swpush2.cpp index 23c16ed0ae..58a3286517 100644 --- a/src/d/actor/d_a_obj_swpush2.cpp +++ b/src/d/actor/d_a_obj_swpush2.cpp @@ -351,7 +351,7 @@ void daObjSwpush2::Act_c::init_mtx() { } void daObjSwpush2::Act_c::rideCB(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) { - (void)i_bgw; + UNUSED(i_bgw); daObjSwpush2::Act_c* a_this = (daObjSwpush2::Act_c*)i_this; if (fopAcM_CheckStatus(i_rideActor, 0x400)) { @@ -714,7 +714,7 @@ actor_method_class Mthd_Table = { } } -extern actor_process_profile_definition g_profile_Obj_Swpush2 = { +actor_process_profile_definition g_profile_Obj_Swpush2 = { fpcLy_CURRENT_e, // mLayerID 2, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swpush5.cpp b/src/d/actor/d_a_obj_swpush5.cpp index 38e8b0f4e8..b3b5fad08f 100644 --- a/src/d/actor/d_a_obj_swpush5.cpp +++ b/src/d/actor/d_a_obj_swpush5.cpp @@ -417,7 +417,7 @@ static actor_method_class l_daObjSw5_Method = { (process_method_func)daObjSw5_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Swpush5 = { +actor_process_profile_definition g_profile_Obj_Swpush5 = { fpcLy_CURRENT_e, // mLayerID 2, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swspinner.cpp b/src/d/actor/d_a_obj_swspinner.cpp index ef05a2e449..bb72938ba9 100644 --- a/src/d/actor/d_a_obj_swspinner.cpp +++ b/src/d/actor/d_a_obj_swspinner.cpp @@ -224,7 +224,7 @@ static actor_method_class daObjSwSpinner_METHODS = { (process_method_func)daObjSwSpinner_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_SwSpinner = { +actor_process_profile_definition g_profile_Obj_SwSpinner = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swturn.cpp b/src/d/actor/d_a_obj_swturn.cpp index 024ed40ce3..3d2f64299d 100644 --- a/src/d/actor/d_a_obj_swturn.cpp +++ b/src/d/actor/d_a_obj_swturn.cpp @@ -436,7 +436,7 @@ static actor_method_class daObjSwTurn_METHODS = { (process_method_func)daObjSwTurn_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_SwTurn = { +actor_process_profile_definition g_profile_Obj_SwTurn = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_syRock.cpp b/src/d/actor/d_a_obj_syRock.cpp index 3214bcf364..cd053b8791 100644 --- a/src/d/actor/d_a_obj_syRock.cpp +++ b/src/d/actor/d_a_obj_syRock.cpp @@ -520,7 +520,7 @@ static actor_method_class l_daSyRock_Method = { (process_method_func)daSyRock_Draw, }; -extern actor_process_profile_definition g_profile_Obj_SyRock = { +actor_process_profile_definition g_profile_Obj_SyRock = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_szbridge.cpp b/src/d/actor/d_a_obj_szbridge.cpp index cf3e70897e..d12efae324 100644 --- a/src/d/actor/d_a_obj_szbridge.cpp +++ b/src/d/actor/d_a_obj_szbridge.cpp @@ -172,7 +172,7 @@ static actor_method_class daObjSZbridge_METHODS = { (process_method_func)daObjSZbridge_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_SZbridge = { +actor_process_profile_definition g_profile_Obj_SZbridge = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_taFence.cpp b/src/d/actor/d_a_obj_taFence.cpp index fc03e4f7b4..999c7b3122 100644 --- a/src/d/actor/d_a_obj_taFence.cpp +++ b/src/d/actor/d_a_obj_taFence.cpp @@ -413,7 +413,7 @@ static actor_method_class l_daTaFence_Method = { (process_method_func)daTaFence_Draw, }; -extern actor_process_profile_definition g_profile_Obj_TaFence = { +actor_process_profile_definition g_profile_Obj_TaFence = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_table.cpp b/src/d/actor/d_a_obj_table.cpp index 3928dfcff3..fdd92a010a 100644 --- a/src/d/actor/d_a_obj_table.cpp +++ b/src/d/actor/d_a_obj_table.cpp @@ -144,7 +144,7 @@ int daObjTable_c::Execute(Mtx** i_mtx) { if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { if (mMsgFlow.doFlow(this, NULL, 0) != 0) { - gameInfo.getPlay().getEvent().reset(this); // Fake match? + gameInfo.play.getEvent().reset(this); // Fake match? eventInfo.setArchiveName("Table"); dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventID = dComIfGp_getEventManager().getEventIdx(this, "TABLE_MAP", -1); @@ -193,7 +193,7 @@ static actor_method_class l_daObjTable_Method = { (process_method_func)daObjTable_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Table = { +actor_process_profile_definition g_profile_Obj_Table = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_takaraDai.cpp b/src/d/actor/d_a_obj_takaraDai.cpp index 2f88fe7993..c57060c4b5 100644 --- a/src/d/actor/d_a_obj_takaraDai.cpp +++ b/src/d/actor/d_a_obj_takaraDai.cpp @@ -202,7 +202,7 @@ static actor_method_class l_daTkraDai_Method = { (process_method_func)daTkraDai_Draw, }; -extern actor_process_profile_definition g_profile_Obj_TakaraDai = { +actor_process_profile_definition g_profile_Obj_TakaraDai = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_tatigi.cpp b/src/d/actor/d_a_obj_tatigi.cpp index ff49667c98..5c19b7f286 100644 --- a/src/d/actor/d_a_obj_tatigi.cpp +++ b/src/d/actor/d_a_obj_tatigi.cpp @@ -212,7 +212,7 @@ static actor_method_class l_daObj_Tatigi_Method = { (process_method_func)daObj_Tatigi_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_TATIGI = { +actor_process_profile_definition g_profile_OBJ_TATIGI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ten.cpp b/src/d/actor/d_a_obj_ten.cpp index 729f3ac8a9..82a24672c5 100644 --- a/src/d/actor/d_a_obj_ten.cpp +++ b/src/d/actor/d_a_obj_ten.cpp @@ -808,7 +808,7 @@ static actor_method_class l_daObjTEN_Method = { (process_method_func)daObjTEN_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Ten = { +actor_process_profile_definition g_profile_Obj_Ten = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_testcube.cpp b/src/d/actor/d_a_obj_testcube.cpp index 84e5087771..0406c17416 100644 --- a/src/d/actor/d_a_obj_testcube.cpp +++ b/src/d/actor/d_a_obj_testcube.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_testcube.h" -extern actor_process_profile_definition g_profile_Obj_TestCube = { +actor_process_profile_definition g_profile_Obj_TestCube = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_tgake.cpp b/src/d/actor/d_a_obj_tgake.cpp index 295b7f1c32..4e2074b56b 100644 --- a/src/d/actor/d_a_obj_tgake.cpp +++ b/src/d/actor/d_a_obj_tgake.cpp @@ -131,7 +131,7 @@ static actor_method_class daObjGake_METHODS = { (process_method_func)daObjGake_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Gake = { +actor_process_profile_definition g_profile_Obj_Gake = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_thashi.cpp b/src/d/actor/d_a_obj_thashi.cpp index a63d633047..fe1d9d33d6 100644 --- a/src/d/actor/d_a_obj_thashi.cpp +++ b/src/d/actor/d_a_obj_thashi.cpp @@ -245,7 +245,7 @@ static actor_method_class l_daObjTHASHI_Method = { (process_method_func)daObjTHASHI_Draw, }; -extern actor_process_profile_definition g_profile_Obj_THASHI = { +actor_process_profile_definition g_profile_Obj_THASHI = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_thdoor.cpp b/src/d/actor/d_a_obj_thdoor.cpp index 868bdce1fa..5bb8d461e1 100644 --- a/src/d/actor/d_a_obj_thdoor.cpp +++ b/src/d/actor/d_a_obj_thdoor.cpp @@ -361,7 +361,7 @@ static actor_method_class daObjThDoor_METHODS = { (process_method_func)daObjThDoor_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_TDoor = { +actor_process_profile_definition g_profile_Obj_TDoor = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_timeFire.cpp b/src/d/actor/d_a_obj_timeFire.cpp index 8f3e95a855..e86e092cdd 100644 --- a/src/d/actor/d_a_obj_timeFire.cpp +++ b/src/d/actor/d_a_obj_timeFire.cpp @@ -154,7 +154,7 @@ static actor_method_class l_daTimeFire_Method = { (process_method_func)daTimeFire_Draw, }; -extern actor_process_profile_definition g_profile_Obj_TimeFire = { +actor_process_profile_definition g_profile_Obj_TimeFire = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_timer.cpp b/src/d/actor/d_a_obj_timer.cpp index da06396c0a..3f5bd30269 100644 --- a/src/d/actor/d_a_obj_timer.cpp +++ b/src/d/actor/d_a_obj_timer.cpp @@ -100,32 +100,26 @@ bool daObjTimer::Act_c::_execute() { namespace daObjTimer { namespace { - /* 804855A4-804855C0 .text daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_Create */ int Mthd_Create(void* i_this) { return static_cast(i_this)->_create(); } - /* 804855C4-804855E4 .text daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_Delete */ int Mthd_Delete(void* i_this) { return static_cast(i_this)->_delete(); } - /* 804855E8-80485608 .text daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_Execute */ int Mthd_Execute(void* i_this) { return static_cast(i_this)->_execute(); } - /* 8048560C-80485610 .text daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_Draw */ int Mthd_Draw(void* i_this) { return 1; } - /* 80485614-80485618 .text daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_IsDelete */ int Mthd_IsDelete(void* i_this) { return 1; } - /* 80485698-804856B8 -00001 0020+00 1/0 0/0 0/0 .data Mthd_Table__Q210daObjTimer27@unnamed@d_a_obj_timer_cpp@ */ actor_method_class l_daTimer_Method = { (process_method_func)Mthd_Create, (process_method_func)Mthd_Delete, @@ -137,7 +131,7 @@ namespace { }; // namespace daObjTimer -extern actor_process_profile_definition g_profile_Obj_Timer = { +actor_process_profile_definition g_profile_Obj_Timer = { fpcLy_CURRENT_e, // mLayerID 10, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_tks.cpp b/src/d/actor/d_a_obj_tks.cpp index 9ce58995a0..942ad5b3f0 100644 --- a/src/d/actor/d_a_obj_tks.cpp +++ b/src/d/actor/d_a_obj_tks.cpp @@ -882,7 +882,7 @@ static actor_method_class daObjTks_MethodTable = { (process_method_func)daObjTks_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_TKS = { +actor_process_profile_definition g_profile_OBJ_TKS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_tmoon.cpp b/src/d/actor/d_a_obj_tmoon.cpp index ee4c1e14a7..d7ffe9fbdb 100644 --- a/src/d/actor/d_a_obj_tmoon.cpp +++ b/src/d/actor/d_a_obj_tmoon.cpp @@ -101,7 +101,7 @@ static actor_method_class l_daObjTMoon_Method = { (process_method_func)daObjTMoon_Draw, }; -extern actor_process_profile_definition g_profile_Obj_TMoon = { +actor_process_profile_definition g_profile_Obj_TMoon = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_toaru_maki.cpp b/src/d/actor/d_a_obj_toaru_maki.cpp index 475cfe423f..17ee50cfcc 100644 --- a/src/d/actor/d_a_obj_toaru_maki.cpp +++ b/src/d/actor/d_a_obj_toaru_maki.cpp @@ -128,7 +128,7 @@ static actor_method_class daObjToaruMaki_METHODS = { (process_method_func)daObjToaruMaki_draw, }; -extern actor_process_profile_definition g_profile_Obj_ToaruMaki = { +actor_process_profile_definition g_profile_Obj_ToaruMaki = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp index b457f617cd..6e98282eb1 100644 --- a/src/d/actor/d_a_obj_toby.cpp +++ b/src/d/actor/d_a_obj_toby.cpp @@ -138,8 +138,6 @@ static void* shot_b_sub(void* param_1, void* param_2) { return NULL; } -/* 80D158F4 0001+00 data_80D158F4 @1009 */ -/* 80D158F5 0003+00 data_80D158F5 None */ static u8 hio_set; static daObj_Toby_HIO_c l_HIO; @@ -705,7 +703,7 @@ static actor_method_class l_daObj_Toby_Method = { (process_method_func)daObj_Toby_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_TOBY = { +actor_process_profile_definition g_profile_OBJ_TOBY = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_tobyhouse.cpp b/src/d/actor/d_a_obj_tobyhouse.cpp index da5fc97992..3c7540b530 100644 --- a/src/d/actor/d_a_obj_tobyhouse.cpp +++ b/src/d/actor/d_a_obj_tobyhouse.cpp @@ -603,7 +603,7 @@ static actor_method_class daObjTobyHouse_METHODS = { (process_method_func)daObjTobyHouse_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_TobyHouse = { +actor_process_profile_definition g_profile_Obj_TobyHouse = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_togeTrap.cpp b/src/d/actor/d_a_obj_togeTrap.cpp index 335ce5b8a3..adef7a2c8b 100644 --- a/src/d/actor/d_a_obj_togeTrap.cpp +++ b/src/d/actor/d_a_obj_togeTrap.cpp @@ -299,7 +299,7 @@ static actor_method_class l_daTogeTrap_Method = { (process_method_func)daTogeTrap_Draw, }; -extern actor_process_profile_definition g_profile_Obj_TogeTrap = { +actor_process_profile_definition g_profile_Obj_TogeTrap = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp index 1252922559..574a3cb274 100644 --- a/src/d/actor/d_a_obj_tombo.cpp +++ b/src/d/actor/d_a_obj_tombo.cpp @@ -683,7 +683,7 @@ static actor_method_class l_daObjTOMBO_Method = { (process_method_func)daObjTOMBO_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Tombo = { +actor_process_profile_definition g_profile_Obj_Tombo = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_tornado.cpp b/src/d/actor/d_a_obj_tornado.cpp index 16f5b4c8e4..3b6c837f73 100644 --- a/src/d/actor/d_a_obj_tornado.cpp +++ b/src/d/actor/d_a_obj_tornado.cpp @@ -226,7 +226,7 @@ static actor_method_class l_daObjTrnd_Method = { (process_method_func)daObjTrnd_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Tornado = { +actor_process_profile_definition g_profile_Obj_Tornado = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_tornado2.cpp b/src/d/actor/d_a_obj_tornado2.cpp index 704ac0c9d1..460459fa32 100644 --- a/src/d/actor/d_a_obj_tornado2.cpp +++ b/src/d/actor/d_a_obj_tornado2.cpp @@ -398,7 +398,7 @@ static actor_method_class l_daObjTrnd2_Method = { (process_method_func)daObjTrnd2_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Tornado2 = { +actor_process_profile_definition g_profile_Obj_Tornado2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_tp.cpp b/src/d/actor/d_a_obj_tp.cpp index 285b9f6448..d23976dc5a 100644 --- a/src/d/actor/d_a_obj_tp.cpp +++ b/src/d/actor/d_a_obj_tp.cpp @@ -488,7 +488,7 @@ static actor_method_class l_daObj_Tp_Method = { (process_method_func)daObj_Tp_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_TP = { +actor_process_profile_definition g_profile_OBJ_TP = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_treesh.cpp b/src/d/actor/d_a_obj_treesh.cpp index de87cf879b..29cd0a83af 100644 --- a/src/d/actor/d_a_obj_treesh.cpp +++ b/src/d/actor/d_a_obj_treesh.cpp @@ -159,7 +159,7 @@ static actor_method_class daTreeSh_METHODS = { (process_method_func)daTreeSh_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_TREESH = { +actor_process_profile_definition g_profile_TREESH = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_twGate.cpp b/src/d/actor/d_a_obj_twGate.cpp index 50d769f82c..733451be37 100644 --- a/src/d/actor/d_a_obj_twGate.cpp +++ b/src/d/actor/d_a_obj_twGate.cpp @@ -219,7 +219,7 @@ static actor_method_class l_daTwGate_Method = { (process_method_func)daTwGate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_TwGate = { +actor_process_profile_definition g_profile_Obj_TwGate = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_udoor.cpp b/src/d/actor/d_a_obj_udoor.cpp index 0a23727f5b..4cdc971875 100644 --- a/src/d/actor/d_a_obj_udoor.cpp +++ b/src/d/actor/d_a_obj_udoor.cpp @@ -164,7 +164,7 @@ static actor_method_class l_daObj_Udoor_Method = { (process_method_func)daObj_Udoor_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_UDOOR = { +actor_process_profile_definition g_profile_OBJ_UDOOR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_usaku.cpp b/src/d/actor/d_a_obj_usaku.cpp index dd411b050a..acf8b1c5ab 100644 --- a/src/d/actor/d_a_obj_usaku.cpp +++ b/src/d/actor/d_a_obj_usaku.cpp @@ -116,7 +116,7 @@ static actor_method_class l_daObj_Usaku_Method = { (process_method_func)daObj_Usaku_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_USAKU = { +actor_process_profile_definition g_profile_OBJ_USAKU = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_vground.cpp b/src/d/actor/d_a_obj_vground.cpp index 8ba4c3d282..9940fcfb93 100644 --- a/src/d/actor/d_a_obj_vground.cpp +++ b/src/d/actor/d_a_obj_vground.cpp @@ -135,7 +135,7 @@ static actor_method_class l_daObjVGnd_Method = { (process_method_func)daObjVGnd_Draw, }; -extern actor_process_profile_definition g_profile_Obj_VolcGnd = { +actor_process_profile_definition g_profile_Obj_VolcGnd = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_volcball.cpp b/src/d/actor/d_a_obj_volcball.cpp index d1b90b6493..faad909e12 100644 --- a/src/d/actor/d_a_obj_volcball.cpp +++ b/src/d/actor/d_a_obj_volcball.cpp @@ -612,7 +612,7 @@ static actor_method_class l_daObjVolcBall_Method = { (process_method_func)daObjVolcBall_Draw, }; -extern actor_process_profile_definition g_profile_Obj_VolcanicBall = { +actor_process_profile_definition g_profile_Obj_VolcanicBall = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_volcbom.cpp b/src/d/actor/d_a_obj_volcbom.cpp index 6280b5a703..7711aefa25 100644 --- a/src/d/actor/d_a_obj_volcbom.cpp +++ b/src/d/actor/d_a_obj_volcbom.cpp @@ -598,15 +598,13 @@ void daObjVolcBom_c::actionWait() { } daMidna_c* midna = daPy_py_c::getMidnaActor(); - daPy_py_c* player = (daPy_py_c*)daPy_getPlayerActorClass(); + daPy_py_c* player = daPy_getPlayerActorClass(); - // Probably fake match since ebug calls different manager functions - dEvent_manager_c& evtMgr = g_dComIfG_gameInfo.play.getEvtManager(); - if (evtMgr.startCheck(mEventId)) { - if (strcmp(evtMgr.getRunEventName(), "PORTAL_WARP_BIGVOLC") == 0) { + if (dComIfGp_evmng_startCheck(mEventId)) { + if (strcmp(dComIfGp_getEventManager().getRunEventName(), "PORTAL_WARP_BIGVOLC") == 0) { player->onWarpObjDemo(); dComIfGp_getEvent().setPt2(this); - mStaffId = evtMgr.getMyStaffId(l_staff_name, 0, 0); + mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); setAction(ACTION_WARP_EVENT); demoProc(); } @@ -882,7 +880,7 @@ static actor_method_class daObjVolcBom_METHODS = { (process_method_func)daObjVolcBom_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_VolcanicBomb = { +actor_process_profile_definition g_profile_Obj_VolcanicBomb = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_warp_kbrg.cpp b/src/d/actor/d_a_obj_warp_kbrg.cpp index 166fc1e18f..e3c20eb359 100644 --- a/src/d/actor/d_a_obj_warp_kbrg.cpp +++ b/src/d/actor/d_a_obj_warp_kbrg.cpp @@ -822,7 +822,7 @@ static actor_method_class daObjWarpKBrg_METHODS = { (process_method_func)daObjWarpKBrg_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_KakarikoBrg = { +actor_process_profile_definition g_profile_Obj_KakarikoBrg = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_warp_obrg.cpp b/src/d/actor/d_a_obj_warp_obrg.cpp index 3e32c628d6..38773c9e91 100644 --- a/src/d/actor/d_a_obj_warp_obrg.cpp +++ b/src/d/actor/d_a_obj_warp_obrg.cpp @@ -600,7 +600,7 @@ static actor_method_class daObjWarpOBrg_METHODS = { (process_method_func)daObjWarpOBrg_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_OrdinBrg = { +actor_process_profile_definition g_profile_Obj_OrdinBrg = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_waterGate.cpp b/src/d/actor/d_a_obj_waterGate.cpp index 83731e4b54..d5b98afc33 100644 --- a/src/d/actor/d_a_obj_waterGate.cpp +++ b/src/d/actor/d_a_obj_waterGate.cpp @@ -214,7 +214,7 @@ static actor_method_class l_daWtGate_Method = { (process_method_func)daWtGate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_WtGate = { +actor_process_profile_definition g_profile_Obj_WtGate = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_waterPillar.cpp b/src/d/actor/d_a_obj_waterPillar.cpp index 719a04db84..5dd8545e19 100644 --- a/src/d/actor/d_a_obj_waterPillar.cpp +++ b/src/d/actor/d_a_obj_waterPillar.cpp @@ -575,7 +575,7 @@ actor_method_class l_daWtPillar_Method = { (process_method_func)daWtPillar_Draw, }; -extern actor_process_profile_definition g_profile_Obj_WaterPillar = { +actor_process_profile_definition g_profile_Obj_WaterPillar = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_waterfall.cpp b/src/d/actor/d_a_obj_waterfall.cpp index 9fb2f92b00..9eb4abe824 100644 --- a/src/d/actor/d_a_obj_waterfall.cpp +++ b/src/d/actor/d_a_obj_waterfall.cpp @@ -225,7 +225,7 @@ static actor_method_class l_daObjWaterFall_Method = { (process_method_func)daObjWaterFall_Draw, }; -extern actor_process_profile_definition g_profile_Obj_WaterFall = { +actor_process_profile_definition g_profile_Obj_WaterFall = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_wchain.cpp b/src/d/actor/d_a_obj_wchain.cpp index 6fc56d3add..f3555cdff7 100644 --- a/src/d/actor/d_a_obj_wchain.cpp +++ b/src/d/actor/d_a_obj_wchain.cpp @@ -383,7 +383,7 @@ static actor_method_class l_daObjWchain_Method = { (process_method_func)daObjWchain_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Wchain = { +actor_process_profile_definition g_profile_Obj_Wchain = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_wdStick.cpp b/src/d/actor/d_a_obj_wdStick.cpp index b3d1627306..1949c2f395 100644 --- a/src/d/actor/d_a_obj_wdStick.cpp +++ b/src/d/actor/d_a_obj_wdStick.cpp @@ -507,7 +507,7 @@ static actor_method_class l_daWdStick_Method = { (process_method_func)daWdStick_Draw, }; -extern actor_process_profile_definition g_profile_Obj_WdStick = { +actor_process_profile_definition g_profile_Obj_WdStick = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_web0.cpp b/src/d/actor/d_a_obj_web0.cpp index e9182f827b..58a002058c 100644 --- a/src/d/actor/d_a_obj_web0.cpp +++ b/src/d/actor/d_a_obj_web0.cpp @@ -286,7 +286,7 @@ static actor_method_class l_daObj_Web0_Method = { (process_method_func)daObj_Web0_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_WEB0 = { +actor_process_profile_definition g_profile_OBJ_WEB0 = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_web1.cpp b/src/d/actor/d_a_obj_web1.cpp index ac5020f8d6..5b28d3a5a2 100644 --- a/src/d/actor/d_a_obj_web1.cpp +++ b/src/d/actor/d_a_obj_web1.cpp @@ -313,7 +313,7 @@ static actor_method_class l_daObj_Web1_Method = { (process_method_func)daObj_Web1_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_WEB1 = { +actor_process_profile_definition g_profile_OBJ_WEB1 = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_well_cover.cpp b/src/d/actor/d_a_obj_well_cover.cpp index 954dc3291b..a39b7d73f3 100644 --- a/src/d/actor/d_a_obj_well_cover.cpp +++ b/src/d/actor/d_a_obj_well_cover.cpp @@ -146,7 +146,7 @@ static actor_method_class l_daObjWCover_Method = { (process_method_func)daObjWCover_Draw, }; -extern actor_process_profile_definition g_profile_Obj_WellCover = { +actor_process_profile_definition g_profile_Obj_WellCover = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_wflag.cpp b/src/d/actor/d_a_obj_wflag.cpp index 7c35664b04..7fea4e50df 100644 --- a/src/d/actor/d_a_obj_wflag.cpp +++ b/src/d/actor/d_a_obj_wflag.cpp @@ -214,7 +214,7 @@ static actor_method_class l_daObj_Wflag_Method = { (process_method_func)daObj_Wflag_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_WFLAG = { +actor_process_profile_definition g_profile_OBJ_WFLAG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_wind_stone.cpp b/src/d/actor/d_a_obj_wind_stone.cpp index 7fdf27847e..cd055d895f 100644 --- a/src/d/actor/d_a_obj_wind_stone.cpp +++ b/src/d/actor/d_a_obj_wind_stone.cpp @@ -247,7 +247,7 @@ static actor_method_class daWindStone_METHODS = { (process_method_func)daWindStone_draw, }; -extern actor_process_profile_definition g_profile_Obj_WindStone = { +actor_process_profile_definition g_profile_Obj_WindStone = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_window.cpp b/src/d/actor/d_a_obj_window.cpp index c15f97e3cf..915abc25db 100644 --- a/src/d/actor/d_a_obj_window.cpp +++ b/src/d/actor/d_a_obj_window.cpp @@ -175,7 +175,7 @@ static actor_method_class daObjWindow_METHODS = { (process_method_func)daObjWindow_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Window = { +actor_process_profile_definition g_profile_Obj_Window = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_wood_pendulum.cpp b/src/d/actor/d_a_obj_wood_pendulum.cpp index c724e7380f..8cf29afb59 100644 --- a/src/d/actor/d_a_obj_wood_pendulum.cpp +++ b/src/d/actor/d_a_obj_wood_pendulum.cpp @@ -168,7 +168,7 @@ static actor_method_class l_daObjWPndlm_Method = { (process_method_func)daObjWPndlm_Draw, }; -extern actor_process_profile_definition g_profile_Obj_WoodPendulum = { +actor_process_profile_definition g_profile_Obj_WoodPendulum = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp index 0a13402949..eb03316072 100644 --- a/src/d/actor/d_a_obj_wood_statue.cpp +++ b/src/d/actor/d_a_obj_wood_statue.cpp @@ -469,7 +469,7 @@ static actor_method_class l_daObjWStatue_Method = { (process_method_func)daObjWStatue_Draw, }; -extern actor_process_profile_definition g_profile_Obj_WoodStatue = { +actor_process_profile_definition g_profile_Obj_WoodStatue = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_wsword.cpp b/src/d/actor/d_a_obj_wsword.cpp index 7f3008e76f..908074e456 100644 --- a/src/d/actor/d_a_obj_wsword.cpp +++ b/src/d/actor/d_a_obj_wsword.cpp @@ -112,7 +112,7 @@ static actor_method_class l_daObjWSword_Method = { (process_method_func)daObjWSword_Draw, }; -extern actor_process_profile_definition g_profile_Obj_WoodenSword = { +actor_process_profile_definition g_profile_Obj_WoodenSword = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_yel_bag.cpp b/src/d/actor/d_a_obj_yel_bag.cpp index d9a4b4b2a0..67f6f1b15e 100644 --- a/src/d/actor/d_a_obj_yel_bag.cpp +++ b/src/d/actor/d_a_obj_yel_bag.cpp @@ -514,7 +514,7 @@ static actor_method_class daObj_YBag_MethodTable = { (process_method_func)daObj_YBag_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_YBAG = { +actor_process_profile_definition g_profile_OBJ_YBAG = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_yobikusa.cpp b/src/d/actor/d_a_obj_yobikusa.cpp index 73074aead3..1981d5aeaa 100644 --- a/src/d/actor/d_a_obj_yobikusa.cpp +++ b/src/d/actor/d_a_obj_yobikusa.cpp @@ -416,7 +416,7 @@ static actor_method_class l_daObjYobikusa_Method = { (process_method_func)daObjYobikusa_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Yobikusa = { +actor_process_profile_definition g_profile_Obj_Yobikusa = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_yousei.cpp b/src/d/actor/d_a_obj_yousei.cpp index 133e29fe62..20555536f1 100644 --- a/src/d/actor/d_a_obj_yousei.cpp +++ b/src/d/actor/d_a_obj_yousei.cpp @@ -187,10 +187,8 @@ void daObjYOUSEI_c::BinAction() { field_0x608 = dComIfGp_particle_set(field_0x608, 0x731, ¤t.pos, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL); } -/* 804D1830 0001+00 data_804D1830 None */ static u8 data_804D1830; -/* 804D1831 0003+00 data_804D1831 None */ static u8 data_804D1831; void daObjYOUSEI_c::LinkChk() { @@ -861,7 +859,7 @@ static actor_method_class l_daObjYOUSEI_Method = { (process_method_func)daObjYOUSEI_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Yousei = { +actor_process_profile_definition g_profile_Obj_Yousei = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ystone.cpp b/src/d/actor/d_a_obj_ystone.cpp index d94f5e702d..93f752a986 100644 --- a/src/d/actor/d_a_obj_ystone.cpp +++ b/src/d/actor/d_a_obj_ystone.cpp @@ -293,7 +293,7 @@ static actor_method_class l_daObj_Ystone_Method = { (process_method_func)daObj_Ystone_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_YSTONE = { +actor_process_profile_definition g_profile_OBJ_YSTONE = { fpcLy_CURRENT_e, 8, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_zcloth.cpp b/src/d/actor/d_a_obj_zcloth.cpp index a8b4388d42..363ebe28ab 100644 --- a/src/d/actor/d_a_obj_zcloth.cpp +++ b/src/d/actor/d_a_obj_zcloth.cpp @@ -86,7 +86,7 @@ static actor_method_class l_daObjZCloth_Method = { (process_method_func)daObjZCloth_Draw, }; -extern actor_process_profile_definition g_profile_Obj_ZoraCloth = { +actor_process_profile_definition g_profile_Obj_ZoraCloth = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_zdoor.cpp b/src/d/actor/d_a_obj_zdoor.cpp index b5f4f4ecb4..bd616d5be4 100644 --- a/src/d/actor/d_a_obj_zdoor.cpp +++ b/src/d/actor/d_a_obj_zdoor.cpp @@ -380,7 +380,7 @@ static actor_method_class daZdoor_METHODS = { (process_method_func)daZdoor_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_ZDoor = { +actor_process_profile_definition g_profile_Obj_ZDoor = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_zrTurara.cpp b/src/d/actor/d_a_obj_zrTurara.cpp index 480dc394ef..63191c70cf 100644 --- a/src/d/actor/d_a_obj_zrTurara.cpp +++ b/src/d/actor/d_a_obj_zrTurara.cpp @@ -258,7 +258,7 @@ static actor_method_class l_daZrTurara_Method = { (process_method_func)daZrTurara_Draw, }; -extern actor_process_profile_definition g_profile_Obj_zrTurara = { +actor_process_profile_definition g_profile_Obj_zrTurara = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_zrTuraraRock.cpp b/src/d/actor/d_a_obj_zrTuraraRock.cpp index 538227d539..90fc794a69 100644 --- a/src/d/actor/d_a_obj_zrTuraraRock.cpp +++ b/src/d/actor/d_a_obj_zrTuraraRock.cpp @@ -125,8 +125,8 @@ void daZrTuraRc_c::modeDrop() { } void daZrTuraRc_c::bgCheck() { - // this should be ChkGroundHit but that doesn't match - if (mAcch.m_flags >> 5 & 1) { + bool r31 = mAcch.ChkGroundHit(); + if (r31) { init_modeDropEnd(); } } @@ -177,7 +177,7 @@ static actor_method_class l_daZrTuraRc_Method = { (process_method_func)daZrTuraRc_Draw, }; -extern actor_process_profile_definition g_profile_Obj_zrTuraraRc = { +actor_process_profile_definition g_profile_Obj_zrTuraraRc = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_zraMark.cpp b/src/d/actor/d_a_obj_zraMark.cpp index 02f593e25f..bf93888f74 100644 --- a/src/d/actor/d_a_obj_zraMark.cpp +++ b/src/d/actor/d_a_obj_zraMark.cpp @@ -535,7 +535,7 @@ static actor_method_class l_daObjZraMark_Method = { (process_method_func)daObjZraMark_Draw, }; -extern actor_process_profile_definition g_profile_ZRA_MARK = { +actor_process_profile_definition g_profile_ZRA_MARK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_zra_freeze.cpp b/src/d/actor/d_a_obj_zra_freeze.cpp index faf0234e79..833fd4317b 100644 --- a/src/d/actor/d_a_obj_zra_freeze.cpp +++ b/src/d/actor/d_a_obj_zra_freeze.cpp @@ -199,7 +199,7 @@ static actor_method_class l_daZraFreeze_Method = { (process_method_func)daZraFreeze_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_ZRAFREEZE = { +actor_process_profile_definition g_profile_OBJ_ZRAFREEZE = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_zra_rock.cpp b/src/d/actor/d_a_obj_zra_rock.cpp index 0f8ed50ac9..01613adc52 100644 --- a/src/d/actor/d_a_obj_zra_rock.cpp +++ b/src/d/actor/d_a_obj_zra_rock.cpp @@ -149,7 +149,7 @@ static actor_method_class l_daObjZraRock_Method = { }; -extern actor_process_profile_definition g_profile_Obj_ZraRock = { +actor_process_profile_definition g_profile_Obj_ZraRock = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_passer_mng.cpp b/src/d/actor/d_a_passer_mng.cpp index fc7836276b..c48a9e76ad 100644 --- a/src/d/actor/d_a_passer_mng.cpp +++ b/src/d/actor/d_a_passer_mng.cpp @@ -601,7 +601,7 @@ static actor_method_class l_daPasserMng_Method = { (process_method_func)daPasserMng_IsDelete, }; -extern actor_process_profile_definition g_profile_PASSER_MNG = { +actor_process_profile_definition g_profile_PASSER_MNG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_path_line.cpp b/src/d/actor/d_a_path_line.cpp index 0f17d4d256..3a4cc4ef60 100644 --- a/src/d/actor/d_a_path_line.cpp +++ b/src/d/actor/d_a_path_line.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_path_line.h" #include "f_op/f_op_actor_mng.h" -extern actor_process_profile_definition2 g_profile_PATH_LINE = { +actor_process_profile_definition2 g_profile_PATH_LINE = { fpcLy_CURRENT_e, // mLayerID 9, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_peru.cpp b/src/d/actor/d_a_peru.cpp index bbb9142154..764901c3a9 100644 --- a/src/d/actor/d_a_peru.cpp +++ b/src/d/actor/d_a_peru.cpp @@ -1217,7 +1217,7 @@ static actor_method_class daPeru_MethodTable = { (process_method_func)daPeru_Draw, }; -extern actor_process_profile_definition g_profile_PERU = { +actor_process_profile_definition g_profile_PERU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_player.cpp b/src/d/actor/d_a_player.cpp index 855ee03690..dacbcd0735 100644 --- a/src/d/actor/d_a_player.cpp +++ b/src/d/actor/d_a_player.cpp @@ -67,10 +67,8 @@ void daPy_boomerangMove_c::initOffset(cXyz const* i_offset) { daMidna_c* daPy_py_c::m_midnaActor; -/* 8045101C 0002+00 data_8045101C m_dropAngleY__20daPy_boomerangMove_c */ s16 daPy_boomerangMove_c::m_dropAngleY; -/* 8045101E 0002+00 data_8045101E m_eventKeepFlg__20daPy_boomerangMove_c */ s16 daPy_boomerangMove_c::m_eventKeepFlg; int daPy_boomerangMove_c::posMove(cXyz* param_0, s16* param_1, fopAc_ac_c* param_2, s16 param_3) { diff --git a/src/d/actor/d_a_ppolamp.cpp b/src/d/actor/d_a_ppolamp.cpp index 0b9d0cca4d..e760171d4e 100644 --- a/src/d/actor/d_a_ppolamp.cpp +++ b/src/d/actor/d_a_ppolamp.cpp @@ -177,7 +177,7 @@ static actor_method_class daPPolamp_METHODS = { (process_method_func)daPPolamp_draw, }; -extern actor_process_profile_definition g_profile_PPolamp = { +actor_process_profile_definition g_profile_PPolamp = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_scene_exit.cpp b/src/d/actor/d_a_scene_exit.cpp index d220a3a512..846b833faa 100644 --- a/src/d/actor/d_a_scene_exit.cpp +++ b/src/d/actor/d_a_scene_exit.cpp @@ -104,7 +104,7 @@ static actor_method_class l_daScex_Method = { (process_method_func)daScex_Execute, }; -extern actor_process_profile_definition2 g_profile_SCENE_EXIT = { +actor_process_profile_definition2 g_profile_SCENE_EXIT = { fpcLy_CURRENT_e, // mLayerID 10, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_scene_exit2.cpp b/src/d/actor/d_a_scene_exit2.cpp index 49cff71bd5..a9defc6591 100644 --- a/src/d/actor/d_a_scene_exit2.cpp +++ b/src/d/actor/d_a_scene_exit2.cpp @@ -172,7 +172,7 @@ static actor_method_class l_daScExit_Method = { (process_method_func)daScExit_Draw, }; -extern actor_process_profile_definition g_profile_SCENE_EXIT2 = { +actor_process_profile_definition g_profile_SCENE_EXIT2 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_set_bgobj.cpp b/src/d/actor/d_a_set_bgobj.cpp index e13945e7ae..9aafaa6e2f 100644 --- a/src/d/actor/d_a_set_bgobj.cpp +++ b/src/d/actor/d_a_set_bgobj.cpp @@ -55,7 +55,7 @@ static actor_method_class l_daSetBgObj_Method = { (process_method_func)daSetBgObj_Delete, }; -extern actor_process_profile_definition g_profile_SET_BG_OBJ = { +actor_process_profile_definition g_profile_SET_BG_OBJ = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 2adae1cce4..64748a1dae 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -274,7 +274,7 @@ static actor_method_class daShopItemMethodTable = { (process_method_func)daShopItem_Draw, }; -extern actor_process_profile_definition g_profile_ShopItem = { +actor_process_profile_definition g_profile_ShopItem = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_skip_2D.cpp b/src/d/actor/d_a_skip_2D.cpp index e90975a6eb..d1e91a366f 100644 --- a/src/d/actor/d_a_skip_2D.cpp +++ b/src/d/actor/d_a_skip_2D.cpp @@ -78,7 +78,7 @@ static actor_method_class daSkip2D_MethodTable = { (process_method_func)daSkip2D_Draw, }; -extern actor_process_profile_definition g_profile_SKIP2D = { +actor_process_profile_definition g_profile_SKIP2D = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_spinner.cpp b/src/d/actor/d_a_spinner.cpp index 15473a148a..e0b3e7e0ff 100644 --- a/src/d/actor/d_a_spinner.cpp +++ b/src/d/actor/d_a_spinner.cpp @@ -934,7 +934,7 @@ static actor_method_class l_daSpinner_Method = { (process_method_func)daSpinner_Draw, }; -extern actor_process_profile_definition g_profile_SPINNER = { +actor_process_profile_definition g_profile_SPINNER = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_sq.cpp b/src/d/actor/d_a_sq.cpp index ba29686f2e..5fa3f83750 100644 --- a/src/d/actor/d_a_sq.cpp +++ b/src/d/actor/d_a_sq.cpp @@ -583,7 +583,7 @@ static actor_method_class l_daSq_Method = { (process_method_func)daSq_Draw, }; -extern actor_process_profile_definition g_profile_SQ = { +actor_process_profile_definition g_profile_SQ = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_startAndGoal.cpp b/src/d/actor/d_a_startAndGoal.cpp index c27b839a89..66ef5a6de6 100644 --- a/src/d/actor/d_a_startAndGoal.cpp +++ b/src/d/actor/d_a_startAndGoal.cpp @@ -188,7 +188,7 @@ static actor_method_class l_daStartAndGoal_Method = { (process_method_func)daStartAndGoal_Draw, }; -extern actor_process_profile_definition g_profile_START_AND_GOAL = { +actor_process_profile_definition g_profile_START_AND_GOAL = { fpcLy_CURRENT_e, 9, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_suspend.cpp b/src/d/actor/d_a_suspend.cpp index 74f07e4750..3c4a01a318 100644 --- a/src/d/actor/d_a_suspend.cpp +++ b/src/d/actor/d_a_suspend.cpp @@ -42,7 +42,7 @@ static actor_method_class daSus_METHODS = { (process_method_func)daSus_create, NULL, NULL, NULL, NULL, }; -extern actor_process_profile_definition g_profile_SUSPEND = { +actor_process_profile_definition g_profile_SUSPEND = { fpcLy_CURRENT_e, 11, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_swBall.cpp b/src/d/actor/d_a_swBall.cpp index 7416f25cab..f12c06a2f7 100644 --- a/src/d/actor/d_a_swBall.cpp +++ b/src/d/actor/d_a_swBall.cpp @@ -276,7 +276,7 @@ static actor_method_class l_daSwBall_Method = { (process_method_func)daSwBall_Execute, }; -extern actor_process_profile_definition g_profile_SwBall = { +actor_process_profile_definition g_profile_SwBall = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_swLBall.cpp b/src/d/actor/d_a_swLBall.cpp index 0940fd6d45..a2b3cb55f1 100644 --- a/src/d/actor/d_a_swLBall.cpp +++ b/src/d/actor/d_a_swLBall.cpp @@ -254,7 +254,7 @@ static actor_method_class l_daSwLBall_Method = { NULL, }; -extern actor_process_profile_definition g_profile_SwLBall = { +actor_process_profile_definition g_profile_SwLBall = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_swTime.cpp b/src/d/actor/d_a_swTime.cpp index 6064cb669b..949c60b239 100644 --- a/src/d/actor/d_a_swTime.cpp +++ b/src/d/actor/d_a_swTime.cpp @@ -58,7 +58,7 @@ static actor_method_class l_daSwTime_Method = { (process_method_func)daSwTime_Execute }; -extern actor_process_profile_definition g_profile_SwTime = { +actor_process_profile_definition g_profile_SwTime = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index 89d319ae89..35b4cb9f50 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/src/d/actor/d_a_swc00.cpp @@ -336,7 +336,7 @@ static actor_method_class l_daSwc00_Method = { #endif }; -extern actor_process_profile_definition g_profile_SWC00 = { +actor_process_profile_definition g_profile_SWC00 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index 7d6a9dc14a..040e698754 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -476,7 +476,7 @@ static actor_method_class l_daSwhit0_Method = { (process_method_func)daSwhit0_Draw, }; -extern actor_process_profile_definition g_profile_SWHIT0 = { +actor_process_profile_definition g_profile_SWHIT0 = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_CstaSw.cpp b/src/d/actor/d_a_tag_CstaSw.cpp index a2997806d1..9d24b13c50 100644 --- a/src/d/actor/d_a_tag_CstaSw.cpp +++ b/src/d/actor/d_a_tag_CstaSw.cpp @@ -94,7 +94,7 @@ static actor_method_class l_daTagCstaSw_Method = { (process_method_func)daTagCstaSw_Draw, }; -extern actor_process_profile_definition g_profile_Tag_CstaSw = { +actor_process_profile_definition g_profile_Tag_CstaSw = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_Lv6Gate.cpp b/src/d/actor/d_a_tag_Lv6Gate.cpp index 66332e1789..d2b2b729a5 100644 --- a/src/d/actor/d_a_tag_Lv6Gate.cpp +++ b/src/d/actor/d_a_tag_Lv6Gate.cpp @@ -116,8 +116,8 @@ inline bool daTagLv6Gate_c::checkOpenArea() { } inline int daTagLv6Gate_c::execute() { - dComIfG_inf_c& game_info = g_dComIfG_gameInfo; // Fake match? - + // TODO: gameInfo fake match to force reuse of pointer + dComIfG_inf_c& game_info = g_dComIfG_gameInfo; if (game_info.getPlay().getEvent().runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); s32 cut_index = eventManager.getMyStaffId(l_arcName, NULL, 0); @@ -372,7 +372,7 @@ static actor_method_class l_daTagLv6Gate_Method = { (process_method_func)daTagLv6Gate_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Lv6Gate = { +actor_process_profile_definition g_profile_Tag_Lv6Gate = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_Lv7Gate.cpp b/src/d/actor/d_a_tag_Lv7Gate.cpp index 0f40c60b9c..4ef355cc28 100644 --- a/src/d/actor/d_a_tag_Lv7Gate.cpp +++ b/src/d/actor/d_a_tag_Lv7Gate.cpp @@ -218,8 +218,8 @@ void daTagLv7Gate_c::flyAnime() { } int daTagLv7Gate_c::execute() { - // Fakematch - dComIfG_play_c& play = g_dComIfG_gameInfo.getPlay(); + // TODO: gameInfo fake match to force reuse of pointer + dComIfG_play_c& play = g_dComIfG_gameInfo.play; if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk()) { dEvent_manager_c& evtMgr = dComIfGp_getEventManager(); s32 cut_index = evtMgr.getMyStaffId(l_arcName, NULL, 0); @@ -374,7 +374,7 @@ static actor_method_class l_daTagLv7Gate_Method = { (process_method_func)daTagLv7Gate_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Lv7Gate = { +actor_process_profile_definition g_profile_Tag_Lv7Gate = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_Lv8Gate.cpp b/src/d/actor/d_a_tag_Lv8Gate.cpp index 714d8dfe46..4bed7e7b61 100644 --- a/src/d/actor/d_a_tag_Lv8Gate.cpp +++ b/src/d/actor/d_a_tag_Lv8Gate.cpp @@ -234,7 +234,7 @@ static actor_method_class l_daTagLv8Gate_Method = { (process_method_func)daTagLv8Gate_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Lv8Gate = { +actor_process_profile_definition g_profile_Tag_Lv8Gate = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_TWgate.cpp b/src/d/actor/d_a_tag_TWgate.cpp index 9d4e465ceb..62e8d72bf2 100644 --- a/src/d/actor/d_a_tag_TWgate.cpp +++ b/src/d/actor/d_a_tag_TWgate.cpp @@ -1045,7 +1045,7 @@ static actor_method_class l_daTagTWGate_Method = { (process_method_func)daTagTWGate_Draw, }; -extern actor_process_profile_definition g_profile_Tag_TWGate = { +actor_process_profile_definition g_profile_Tag_TWGate = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_ajnot.cpp b/src/d/actor/d_a_tag_ajnot.cpp index 20792436e8..cc5cc9155a 100644 --- a/src/d/actor/d_a_tag_ajnot.cpp +++ b/src/d/actor/d_a_tag_ajnot.cpp @@ -62,7 +62,7 @@ static actor_method_class l_daTagAJnot_Method = { (process_method_func)daTagAJnot_Draw, }; -extern actor_process_profile_definition g_profile_Tag_AJnot = { +actor_process_profile_definition g_profile_Tag_AJnot = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_allmato.cpp b/src/d/actor/d_a_tag_allmato.cpp index 545889075c..27a4533eab 100644 --- a/src/d/actor/d_a_tag_allmato.cpp +++ b/src/d/actor/d_a_tag_allmato.cpp @@ -584,7 +584,7 @@ static actor_method_class daTag_AllMato_MethodTable = { (process_method_func)daTag_AllMato_Draw }; -extern actor_process_profile_definition g_profile_TAG_ALLMATO = { +actor_process_profile_definition g_profile_TAG_ALLMATO = { fpcLy_CURRENT_e, // mLayerID 10, // mListID fpcPi_CURRENT_e, // mListPri diff --git a/src/d/actor/d_a_tag_arena.cpp b/src/d/actor/d_a_tag_arena.cpp index bf510a2d09..bdaa2dc16a 100644 --- a/src/d/actor/d_a_tag_arena.cpp +++ b/src/d/actor/d_a_tag_arena.cpp @@ -22,7 +22,7 @@ static actor_method_class l_daTagArena_Method = { (process_method_func)daTagArena_Delete, }; -extern actor_process_profile_definition g_profile_Tag_Arena = { +actor_process_profile_definition g_profile_Tag_Arena = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_assistance.cpp b/src/d/actor/d_a_tag_assistance.cpp index 2f894ea23b..8fce57e12e 100644 --- a/src/d/actor/d_a_tag_assistance.cpp +++ b/src/d/actor/d_a_tag_assistance.cpp @@ -32,7 +32,7 @@ static actor_method_class l_daTagAssist_Method = { (process_method_func)daTagAssist_IsDelete }; -extern actor_process_profile_definition g_profile_Tag_Assist = { +actor_process_profile_definition g_profile_Tag_Assist = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_attack_item.cpp b/src/d/actor/d_a_tag_attack_item.cpp index 78e97941fd..8924b628f7 100644 --- a/src/d/actor/d_a_tag_attack_item.cpp +++ b/src/d/actor/d_a_tag_attack_item.cpp @@ -150,7 +150,7 @@ static actor_method_class l_daTagAtkItem_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Tag_AttackItem = { +actor_process_profile_definition g_profile_Tag_AttackItem = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_attention.cpp b/src/d/actor/d_a_tag_attention.cpp index 79936139ef..29a1fa5279 100644 --- a/src/d/actor/d_a_tag_attention.cpp +++ b/src/d/actor/d_a_tag_attention.cpp @@ -150,7 +150,7 @@ static actor_method_class l_daAttp_Method = { (process_method_func)daAttp_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Attp = { +actor_process_profile_definition g_profile_Tag_Attp = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_bottle_item.cpp b/src/d/actor/d_a_tag_bottle_item.cpp index 2a26995e22..c876ce8588 100644 --- a/src/d/actor/d_a_tag_bottle_item.cpp +++ b/src/d/actor/d_a_tag_bottle_item.cpp @@ -192,7 +192,7 @@ static actor_method_class daTag_BottleItem_MethodTable = { (process_method_func)daTag_BottleItem_Draw }; -extern actor_process_profile_definition g_profile_TAG_BTLITM = { +actor_process_profile_definition g_profile_TAG_BTLITM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPri diff --git a/src/d/actor/d_a_tag_camera.cpp b/src/d/actor/d_a_tag_camera.cpp index ca33e67b0c..99c2c69f6b 100644 --- a/src/d/actor/d_a_tag_camera.cpp +++ b/src/d/actor/d_a_tag_camera.cpp @@ -297,7 +297,7 @@ static actor_method_class l_daTag_Cam_Method = { (process_method_func)daTag_Cam_Draw, }; -extern actor_process_profile_definition g_profile_TAG_CAMERA = { +actor_process_profile_definition g_profile_TAG_CAMERA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_chgrestart.cpp b/src/d/actor/d_a_tag_chgrestart.cpp index f7c17fbf5b..c2eb2260b9 100644 --- a/src/d/actor/d_a_tag_chgrestart.cpp +++ b/src/d/actor/d_a_tag_chgrestart.cpp @@ -104,7 +104,7 @@ static actor_method_class l_daTagChgRestart_Method = { (process_method_func)daTagChgRestart_Execute, }; -extern actor_process_profile_definition g_profile_Tag_ChgRestart = { +actor_process_profile_definition g_profile_Tag_ChgRestart = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_chkpoint.cpp b/src/d/actor/d_a_tag_chkpoint.cpp index f66cdb59e2..a033afdfe0 100644 --- a/src/d/actor/d_a_tag_chkpoint.cpp +++ b/src/d/actor/d_a_tag_chkpoint.cpp @@ -101,7 +101,7 @@ static actor_method_class l_daTag_Chk_Method = { (process_method_func)daTag_Chk_Execute, (process_method_func)daTag_Chk_IsDelete, (process_method_func)daTag_Chk_Draw}; -extern actor_process_profile_definition g_profile_TAG_CHKPOINT = { +actor_process_profile_definition g_profile_TAG_CHKPOINT = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_csw.cpp b/src/d/actor/d_a_tag_csw.cpp index 674959ab27..baea03d037 100644 --- a/src/d/actor/d_a_tag_csw.cpp +++ b/src/d/actor/d_a_tag_csw.cpp @@ -505,7 +505,7 @@ static actor_method_class l_daTagCsw_Method = { (process_method_func)daTagCsw_Draw, }; -extern actor_process_profile_definition g_profile_TAG_CSW = { +actor_process_profile_definition g_profile_TAG_CSW = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_escape.cpp b/src/d/actor/d_a_tag_escape.cpp index 6f318f7ee1..268f3e3ed1 100644 --- a/src/d/actor/d_a_tag_escape.cpp +++ b/src/d/actor/d_a_tag_escape.cpp @@ -26,7 +26,7 @@ static actor_method_class l_daTagEscape_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Tag_Escape = { +actor_process_profile_definition g_profile_Tag_Escape = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_event.cpp b/src/d/actor/d_a_tag_event.cpp index b7071829e3..019cfb6583 100644 --- a/src/d/actor/d_a_tag_event.cpp +++ b/src/d/actor/d_a_tag_event.cpp @@ -330,7 +330,7 @@ static actor_method_class l_daTag_Event_Method = { (process_method_func)daTag_Event_Draw, }; -extern actor_process_profile_definition g_profile_TAG_EVENT = { +actor_process_profile_definition g_profile_TAG_EVENT = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_evt.cpp b/src/d/actor/d_a_tag_evt.cpp index 414a68a3d8..131bde5f2a 100644 --- a/src/d/actor/d_a_tag_evt.cpp +++ b/src/d/actor/d_a_tag_evt.cpp @@ -232,7 +232,7 @@ static actor_method_class daTag_Evt_MethodTable = { (process_method_func)daTag_Evt_Draw, }; -extern actor_process_profile_definition g_profile_TAG_EVT = { +actor_process_profile_definition g_profile_TAG_EVT = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_evtarea.cpp b/src/d/actor/d_a_tag_evtarea.cpp index 84c36219f2..5833296ffe 100644 --- a/src/d/actor/d_a_tag_evtarea.cpp +++ b/src/d/actor/d_a_tag_evtarea.cpp @@ -230,7 +230,7 @@ static actor_method_class daTag_EvtArea_MethodTable = { (process_method_func)daTag_EvtArea_Draw, }; -extern actor_process_profile_definition g_profile_TAG_EVTAREA = { +actor_process_profile_definition g_profile_TAG_EVTAREA = { fpcLy_CURRENT_e, 8, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_evtmsg.cpp b/src/d/actor/d_a_tag_evtmsg.cpp index 084e7198e2..5b18a10ef8 100644 --- a/src/d/actor/d_a_tag_evtmsg.cpp +++ b/src/d/actor/d_a_tag_evtmsg.cpp @@ -234,7 +234,7 @@ static actor_method_class daTag_EvtMsg_MethodTable = { (process_method_func)daTag_EvtMsg_Draw, }; -extern actor_process_profile_definition g_profile_TAG_EVTMSG = { +actor_process_profile_definition g_profile_TAG_EVTMSG = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_firewall.cpp b/src/d/actor/d_a_tag_firewall.cpp index 02838ccdac..7b77433fbb 100644 --- a/src/d/actor/d_a_tag_firewall.cpp +++ b/src/d/actor/d_a_tag_firewall.cpp @@ -213,7 +213,7 @@ static actor_method_class l_daTag_FWall_Method = { (process_method_func)daTag_FWall_Draw, }; -extern actor_process_profile_definition g_profile_Tag_FWall = { +actor_process_profile_definition g_profile_Tag_FWall = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_gra.cpp b/src/d/actor/d_a_tag_gra.cpp index cf22e4a191..083aca0aa4 100644 --- a/src/d/actor/d_a_tag_gra.cpp +++ b/src/d/actor/d_a_tag_gra.cpp @@ -22,7 +22,7 @@ static actor_method_class l_daTagGra_Method = { (process_method_func)daTagGra_Delete }; -extern actor_process_profile_definition g_profile_TAG_GRA = { +actor_process_profile_definition g_profile_TAG_GRA = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_gstart.cpp b/src/d/actor/d_a_tag_gstart.cpp index d525baba31..7a05742d52 100644 --- a/src/d/actor/d_a_tag_gstart.cpp +++ b/src/d/actor/d_a_tag_gstart.cpp @@ -58,7 +58,7 @@ static actor_method_class l_daTagGstart_Method = { (process_method_func)daTagGstart_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Gstart = { +actor_process_profile_definition g_profile_Tag_Gstart = { fpcLy_CURRENT_e, 2, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_guard.cpp b/src/d/actor/d_a_tag_guard.cpp index 8ce2487596..f07448bc8d 100644 --- a/src/d/actor/d_a_tag_guard.cpp +++ b/src/d/actor/d_a_tag_guard.cpp @@ -61,7 +61,7 @@ static actor_method_class l_daTagGuard_Method = { (process_method_func)daTagGuard_Delete, }; -extern actor_process_profile_definition g_profile_TAG_GUARD = { +actor_process_profile_definition g_profile_TAG_GUARD = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_hinit.cpp b/src/d/actor/d_a_tag_hinit.cpp index b11458bdb0..db98089988 100644 --- a/src/d/actor/d_a_tag_hinit.cpp +++ b/src/d/actor/d_a_tag_hinit.cpp @@ -70,7 +70,7 @@ static actor_method_class l_daTagHinit_Method = { }; -extern actor_process_profile_definition g_profile_Tag_Hinit = { +actor_process_profile_definition g_profile_Tag_Hinit = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_hjump.cpp b/src/d/actor/d_a_tag_hjump.cpp index 8e42bf334a..0e49eb14de 100644 --- a/src/d/actor/d_a_tag_hjump.cpp +++ b/src/d/actor/d_a_tag_hjump.cpp @@ -186,7 +186,7 @@ static actor_method_class l_daTagHjump_Method = { (process_method_func)daTagHjump_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Hjump = { +actor_process_profile_definition g_profile_Tag_Hjump = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_howl.cpp b/src/d/actor/d_a_tag_howl.cpp index 246205421a..3480d4acc4 100644 --- a/src/d/actor/d_a_tag_howl.cpp +++ b/src/d/actor/d_a_tag_howl.cpp @@ -95,7 +95,7 @@ static actor_method_class daTag_Howl_MethodTable = { }; -extern actor_process_profile_definition g_profile_TAG_HOWL = { +actor_process_profile_definition g_profile_TAG_HOWL = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_hstop.cpp b/src/d/actor/d_a_tag_hstop.cpp index c7d8b4c256..5692f6fa5f 100644 --- a/src/d/actor/d_a_tag_hstop.cpp +++ b/src/d/actor/d_a_tag_hstop.cpp @@ -177,7 +177,7 @@ static actor_method_class l_daTagHstop_Method = { (process_method_func)daTagHstop_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Hstop = { +actor_process_profile_definition g_profile_Tag_Hstop = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_instruction.cpp b/src/d/actor/d_a_tag_instruction.cpp index 3bbabb540c..e6493d0358 100644 --- a/src/d/actor/d_a_tag_instruction.cpp +++ b/src/d/actor/d_a_tag_instruction.cpp @@ -26,7 +26,7 @@ static actor_method_class l_daTagInst_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Tag_Instruction = { +actor_process_profile_definition g_profile_Tag_Instruction = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_kago_fall.cpp b/src/d/actor/d_a_tag_kago_fall.cpp index 5f5435761b..973394d90d 100644 --- a/src/d/actor/d_a_tag_kago_fall.cpp +++ b/src/d/actor/d_a_tag_kago_fall.cpp @@ -278,7 +278,7 @@ static actor_method_class l_daTagKagoFall_Method = { (process_method_func)daTagKagoFall_Execute, }; -extern actor_process_profile_definition g_profile_Tag_KagoFall = { +actor_process_profile_definition g_profile_Tag_KagoFall = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_kmsg.cpp b/src/d/actor/d_a_tag_kmsg.cpp index 2737dc370f..6e51a28c7f 100644 --- a/src/d/actor/d_a_tag_kmsg.cpp +++ b/src/d/actor/d_a_tag_kmsg.cpp @@ -263,19 +263,27 @@ static int daTag_KMsg_IsDelete(void* param_0) { return 1; } -static void* daTag_KMsg_MethodTable[8] = { - (void*)daTag_KMsg_Create, - (void*)daTag_KMsg_Delete, - (void*)daTag_KMsg_Execute, - (void*)daTag_KMsg_IsDelete, - (void*)daTag_KMsg_Draw, +static actor_method_class daTag_KMsg_MethodTable = { + (process_method_func)daTag_KMsg_Create, + (process_method_func)daTag_KMsg_Delete, + (process_method_func)daTag_KMsg_Execute, + (process_method_func)daTag_KMsg_IsDelete, + (process_method_func)daTag_KMsg_Draw, }; -extern void* g_profile_TAG_KMSG[12] = { - (void*)0xFFFFFFFD, (void*)0x0008FFFD, - (void*)0x02EB0000, (void*)&g_fpcLf_Method, - (void*)0x000005CC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01220000, (void*)&daTag_KMsg_MethodTable, - (void*)0x00044000, (void*)0x000E0000, +actor_process_profile_definition g_profile_TAG_KMSG = { + fpcLy_CURRENT_e, + 8, + fpcPi_CURRENT_e, + PROC_TAG_KMSG, + &g_fpcLf_Method.base, + sizeof(daTag_KMsg_c), + 0, + 0, + &g_fopAc_Method.base, + 0x122, + &daTag_KMsg_MethodTable, + 0x44000, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_lantern.cpp b/src/d/actor/d_a_tag_lantern.cpp index f3057743ff..e04fe2ecd3 100644 --- a/src/d/actor/d_a_tag_lantern.cpp +++ b/src/d/actor/d_a_tag_lantern.cpp @@ -22,7 +22,8 @@ int daTag_Lantern_c::Delete() { } int daTag_Lantern_c::Execute() { - dComIfG_play_c& play = g_dComIfG_gameInfo.getPlay(); // fake match + // TODO: gameInfo fake match to force reuse of pointer + dComIfG_play_c& play = g_dComIfG_gameInfo.play; if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { @@ -110,7 +111,7 @@ static actor_method_class daTag_Lantern_MethodTable = { (process_method_func)daTag_Lantern_Draw, }; -extern actor_process_profile_definition g_profile_TAG_LANTERN = { +actor_process_profile_definition g_profile_TAG_LANTERN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_lightball.cpp b/src/d/actor/d_a_tag_lightball.cpp index 6d628ccbe0..f524503921 100644 --- a/src/d/actor/d_a_tag_lightball.cpp +++ b/src/d/actor/d_a_tag_lightball.cpp @@ -115,7 +115,7 @@ static actor_method_class l_daTagLightBall_Method = { (process_method_func)daTagLightBall_Draw, }; -extern actor_process_profile_definition g_profile_Tag_LightBall = { +actor_process_profile_definition g_profile_Tag_LightBall = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_lv2prchk.cpp b/src/d/actor/d_a_tag_lv2prchk.cpp index a0a16af039..bb7e7d186b 100644 --- a/src/d/actor/d_a_tag_lv2prchk.cpp +++ b/src/d/actor/d_a_tag_lv2prchk.cpp @@ -177,7 +177,7 @@ static actor_method_class l_daTagLv2PrChk_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Tag_Lv2PrChk = { +actor_process_profile_definition g_profile_Tag_Lv2PrChk = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_lv5soup.cpp b/src/d/actor/d_a_tag_lv5soup.cpp index 2a280630b4..2c000a0b92 100644 --- a/src/d/actor/d_a_tag_lv5soup.cpp +++ b/src/d/actor/d_a_tag_lv5soup.cpp @@ -81,7 +81,7 @@ static actor_method_class daTag_Lv5Soup_MethodTable = { (process_method_func)daTag_Lv5Soup_Draw, }; -extern actor_process_profile_definition g_profile_TAG_LV5SOUP = { +actor_process_profile_definition g_profile_TAG_LV5SOUP = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_lv6CstaSw.cpp b/src/d/actor/d_a_tag_lv6CstaSw.cpp index b110597add..2e1ba6105d 100644 --- a/src/d/actor/d_a_tag_lv6CstaSw.cpp +++ b/src/d/actor/d_a_tag_lv6CstaSw.cpp @@ -96,7 +96,7 @@ static actor_method_class l_daLv6CstaSw_Method = { (process_method_func)daLv6CstaSw_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Lv6CstaSw = { +actor_process_profile_definition g_profile_Tag_Lv6CstaSw = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_magne.cpp b/src/d/actor/d_a_tag_magne.cpp index 086b0ccae5..8d292552e8 100644 --- a/src/d/actor/d_a_tag_magne.cpp +++ b/src/d/actor/d_a_tag_magne.cpp @@ -56,7 +56,7 @@ static actor_method_class l_daTagMagne_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Tag_Magne = { +actor_process_profile_definition g_profile_Tag_Magne = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_mhint.cpp b/src/d/actor/d_a_tag_mhint.cpp index 2fae8c8102..1844169355 100644 --- a/src/d/actor/d_a_tag_mhint.cpp +++ b/src/d/actor/d_a_tag_mhint.cpp @@ -234,7 +234,7 @@ static actor_method_class l_daTagMhint_Method = { (process_method_func)daTagMhint_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Mhint = { +actor_process_profile_definition g_profile_Tag_Mhint = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_mist.cpp b/src/d/actor/d_a_tag_mist.cpp index ad7168eed1..c73f347840 100644 --- a/src/d/actor/d_a_tag_mist.cpp +++ b/src/d/actor/d_a_tag_mist.cpp @@ -146,7 +146,7 @@ static actor_method_class l_daTagMist_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Tag_Mist = { +actor_process_profile_definition g_profile_Tag_Mist = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_mmsg.cpp b/src/d/actor/d_a_tag_mmsg.cpp index 00f4201ad2..05f86f48cc 100644 --- a/src/d/actor/d_a_tag_mmsg.cpp +++ b/src/d/actor/d_a_tag_mmsg.cpp @@ -96,7 +96,7 @@ static actor_method_class l_daTagMmsg_Method = { (process_method_func)daTagMmsg_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Mmsg = { +actor_process_profile_definition g_profile_Tag_Mmsg = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index 2a9c59d708..25e2469c8e 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -66,7 +66,8 @@ int daTag_Msg_c::execute() { eyePos.set(current.pos.x, current.pos.y + 150.0f, current.pos.z); attention_info.position = eyePos; - dComIfG_play_c& play = g_dComIfG_gameInfo.play; // FAKE, event inlines need to be fixed + // TODO: gameInfo fake match to force reuse of pointer + dComIfG_play_c& play = g_dComIfG_gameInfo.play; if (play.getEvent().runCheck()) { set_event = false; @@ -238,7 +239,7 @@ static actor_method_class daTag_Msg_MethodTable = { (process_method_func)daTag_Msg_Draw, }; -extern actor_process_profile_definition g_profile_TAG_MSG = { +actor_process_profile_definition g_profile_TAG_MSG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_mstop.cpp b/src/d/actor/d_a_tag_mstop.cpp index 4a6d974a2e..377f5ee39c 100644 --- a/src/d/actor/d_a_tag_mstop.cpp +++ b/src/d/actor/d_a_tag_mstop.cpp @@ -176,7 +176,7 @@ static actor_method_class l_daTagMstop_Method = { (process_method_func)daTagMstop_Create, (process_method_func)daTagMstop_Delete, (process_method_func)daTagMstop_Execute, NULL, (process_method_func)daTagMstop_Draw}; -extern actor_process_profile_definition g_profile_Tag_Mstop = { +actor_process_profile_definition g_profile_Tag_Mstop = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_mwait.cpp b/src/d/actor/d_a_tag_mwait.cpp index 2fd9cfa7b9..fcb85b51ee 100644 --- a/src/d/actor/d_a_tag_mwait.cpp +++ b/src/d/actor/d_a_tag_mwait.cpp @@ -155,7 +155,7 @@ static actor_method_class l_daTagMwait_Method = { (process_method_func)daTagMwait_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Mwait = { +actor_process_profile_definition g_profile_Tag_Mwait = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_myna2.cpp b/src/d/actor/d_a_tag_myna2.cpp index f1984096c3..fd84d698e2 100644 --- a/src/d/actor/d_a_tag_myna2.cpp +++ b/src/d/actor/d_a_tag_myna2.cpp @@ -70,7 +70,7 @@ static actor_method_class l_daTagMyna2_Method = { (process_method_func)daTagMyna2_Execute, }; -extern actor_process_profile_definition g_profile_TAG_MYNA2 = { +actor_process_profile_definition g_profile_TAG_MYNA2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_myna_light.cpp b/src/d/actor/d_a_tag_myna_light.cpp index c62fcd84e7..11ab9df604 100644 --- a/src/d/actor/d_a_tag_myna_light.cpp +++ b/src/d/actor/d_a_tag_myna_light.cpp @@ -159,7 +159,7 @@ static actor_method_class daTag_MynaLight_MethodTable = { (process_method_func)daTag_MynaLight_Draw, }; -extern actor_process_profile_definition g_profile_TAG_MNLIGHT = { +actor_process_profile_definition g_profile_TAG_MNLIGHT = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_pachi.cpp b/src/d/actor/d_a_tag_pachi.cpp index 63a1c8d297..530d796043 100644 --- a/src/d/actor/d_a_tag_pachi.cpp +++ b/src/d/actor/d_a_tag_pachi.cpp @@ -66,7 +66,7 @@ static actor_method_class l_daTagPati_Method = { (process_method_func)daTagPati_Execute, }; -extern actor_process_profile_definition g_profile_TAG_PATI = { +actor_process_profile_definition g_profile_TAG_PATI = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_poFire.cpp b/src/d/actor/d_a_tag_poFire.cpp index 76e0c30ddd..5cbdb87a5a 100644 --- a/src/d/actor/d_a_tag_poFire.cpp +++ b/src/d/actor/d_a_tag_poFire.cpp @@ -67,7 +67,7 @@ static actor_method_class l_daTagPoFire_Method = { (process_method_func)daTagPoFire_Draw, }; -extern actor_process_profile_definition g_profile_Tag_poFire = { +actor_process_profile_definition g_profile_Tag_poFire = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_push.cpp b/src/d/actor/d_a_tag_push.cpp index 49dc2230e5..a6bed6cfa4 100644 --- a/src/d/actor/d_a_tag_push.cpp +++ b/src/d/actor/d_a_tag_push.cpp @@ -156,7 +156,7 @@ static actor_method_class daTag_Push_MethodTable = { (process_method_func)daTag_Push_Draw, }; -extern actor_process_profile_definition g_profile_TAG_PUSH = { +actor_process_profile_definition g_profile_TAG_PUSH = { fpcLy_CURRENT_e, 8, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_qs.cpp b/src/d/actor/d_a_tag_qs.cpp index 3e57df3334..8061311d57 100644 --- a/src/d/actor/d_a_tag_qs.cpp +++ b/src/d/actor/d_a_tag_qs.cpp @@ -234,7 +234,7 @@ static actor_method_class l_daTagQs_Method = { (process_method_func)daTagQs_Draw, }; -extern actor_process_profile_definition g_profile_TAG_QS = { +actor_process_profile_definition g_profile_TAG_QS = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_ret_room.cpp b/src/d/actor/d_a_tag_ret_room.cpp index 6d336fb945..f22cbd4f55 100644 --- a/src/d/actor/d_a_tag_ret_room.cpp +++ b/src/d/actor/d_a_tag_ret_room.cpp @@ -90,7 +90,7 @@ static actor_method_class daTagRetRm_METHODS = { }; -extern actor_process_profile_definition g_profile_Tag_RetRoom = { +actor_process_profile_definition g_profile_Tag_RetRoom = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_river_back.cpp b/src/d/actor/d_a_tag_river_back.cpp index 60f3931618..c902f125a7 100644 --- a/src/d/actor/d_a_tag_river_back.cpp +++ b/src/d/actor/d_a_tag_river_back.cpp @@ -51,7 +51,6 @@ static char* l_staffName = "rvback"; void daTagRiverBack_c::event_proc_call() { typedef void (daTagRiverBack_c::*actionFunc)(); - /* 80D5F9DC-80D5FA0C 00005C 0030+00 0/1 0/0 0/0 .data l_func$3711 */ static actionFunc l_func[] = {&daTagRiverBack_c::actionWait, &daTagRiverBack_c::actionOrderEvent, &daTagRiverBack_c::actionEvent, &daTagRiverBack_c::actionDead}; @@ -155,7 +154,7 @@ static actor_method_class l_daTagRiverBack_Method = {(process_method_func)daTagR (process_method_func)daTagRiverBack_Delete, (process_method_func)daTagRiverBack_Execute}; -extern actor_process_profile_definition g_profile_Tag_RiverBack = { +actor_process_profile_definition g_profile_Tag_RiverBack = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_rmbit_sw.cpp b/src/d/actor/d_a_tag_rmbit_sw.cpp index 24608dc1a8..5ea0480999 100644 --- a/src/d/actor/d_a_tag_rmbit_sw.cpp +++ b/src/d/actor/d_a_tag_rmbit_sw.cpp @@ -121,7 +121,7 @@ static actor_method_class daTagRmbitSw_METHODS = { }; -extern actor_process_profile_definition g_profile_Tag_RmbitSw = { +actor_process_profile_definition g_profile_Tag_RmbitSw = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_schedule.cpp b/src/d/actor/d_a_tag_schedule.cpp index ba2fa83032..8b8df4d1f5 100644 --- a/src/d/actor/d_a_tag_schedule.cpp +++ b/src/d/actor/d_a_tag_schedule.cpp @@ -22,7 +22,7 @@ static actor_method_class l_daTagSchedule_Method = { (process_method_func)daTagSchedule_Delete }; -extern actor_process_profile_definition g_profile_Tag_Schedule = { +actor_process_profile_definition g_profile_Tag_Schedule = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_setBall.cpp b/src/d/actor/d_a_tag_setBall.cpp index e395c5a7af..57d7038dec 100644 --- a/src/d/actor/d_a_tag_setBall.cpp +++ b/src/d/actor/d_a_tag_setBall.cpp @@ -58,7 +58,7 @@ static actor_method_class l_daTagSetBall_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Tag_SetBall = { +actor_process_profile_definition g_profile_Tag_SetBall = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_setrestart.cpp b/src/d/actor/d_a_tag_setrestart.cpp index ab3d6ff7c5..d96fc0ac01 100644 --- a/src/d/actor/d_a_tag_setrestart.cpp +++ b/src/d/actor/d_a_tag_setrestart.cpp @@ -106,7 +106,7 @@ static actor_method_class l_daTagRestart_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Tag_Restart = { +actor_process_profile_definition g_profile_Tag_Restart = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_shop_camera.cpp b/src/d/actor/d_a_tag_shop_camera.cpp index 32a89a6176..07c8d931ba 100644 --- a/src/d/actor/d_a_tag_shop_camera.cpp +++ b/src/d/actor/d_a_tag_shop_camera.cpp @@ -60,7 +60,7 @@ static actor_method_class daTag_ShopCamera_MethodTable = { (process_method_func)daTag_ShopCamera_Draw, }; -extern actor_process_profile_definition g_profile_TAG_SHOPCAM = { +actor_process_profile_definition g_profile_TAG_SHOPCAM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_shop_item.cpp b/src/d/actor/d_a_tag_shop_item.cpp index be9557c131..a9f0ea9171 100644 --- a/src/d/actor/d_a_tag_shop_item.cpp +++ b/src/d/actor/d_a_tag_shop_item.cpp @@ -177,7 +177,7 @@ static actor_method_class daTag_ShopItem_MethodTable = { (process_method_func)daTag_ShopItem_Draw, }; -extern actor_process_profile_definition g_profile_TAG_SHOPITM = { +actor_process_profile_definition g_profile_TAG_SHOPITM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_smk_emt.cpp b/src/d/actor/d_a_tag_smk_emt.cpp index ba2d60e688..035a667e2d 100644 --- a/src/d/actor/d_a_tag_smk_emt.cpp +++ b/src/d/actor/d_a_tag_smk_emt.cpp @@ -83,7 +83,7 @@ static actor_method_class daTagSmkEmt_METHODS = { (process_method_func)daTagSmkEmt_draw }; -extern actor_process_profile_definition g_profile_Tag_SmkEmt = { +actor_process_profile_definition g_profile_Tag_SmkEmt = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_spinner.cpp b/src/d/actor/d_a_tag_spinner.cpp index 2459ad8caf..d3c928cb3e 100644 --- a/src/d/actor/d_a_tag_spinner.cpp +++ b/src/d/actor/d_a_tag_spinner.cpp @@ -99,7 +99,7 @@ static actor_method_class l_daTagSpinner_Method = { }; -extern actor_process_profile_definition g_profile_Tag_Spinner = { +actor_process_profile_definition g_profile_Tag_Spinner = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_sppath.cpp b/src/d/actor/d_a_tag_sppath.cpp index 0ada92d5d8..62121c7c71 100644 --- a/src/d/actor/d_a_tag_sppath.cpp +++ b/src/d/actor/d_a_tag_sppath.cpp @@ -200,7 +200,7 @@ static actor_method_class l_daTagSppath_Method = { (process_method_func)daTagSppath_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Sppath = { +actor_process_profile_definition g_profile_Tag_Sppath = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_spring.cpp b/src/d/actor/d_a_tag_spring.cpp index 2236440fda..afc26df117 100644 --- a/src/d/actor/d_a_tag_spring.cpp +++ b/src/d/actor/d_a_tag_spring.cpp @@ -93,7 +93,7 @@ static actor_method_class l_daTagSpring_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Tag_Spring = { +actor_process_profile_definition g_profile_Tag_Spring = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_ss_drink.cpp b/src/d/actor/d_a_tag_ss_drink.cpp index 0c6ab21804..b41ef6e33d 100644 --- a/src/d/actor/d_a_tag_ss_drink.cpp +++ b/src/d/actor/d_a_tag_ss_drink.cpp @@ -264,7 +264,7 @@ static actor_method_class daTag_SSDrink_MethodTable = { (process_method_func)daTag_SSDrink_Draw, }; -extern actor_process_profile_definition g_profile_TAG_SSDRINK = { +actor_process_profile_definition g_profile_TAG_SSDRINK = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_statue_evt.cpp b/src/d/actor/d_a_tag_statue_evt.cpp index a0d4f694c3..eac78855db 100644 --- a/src/d/actor/d_a_tag_statue_evt.cpp +++ b/src/d/actor/d_a_tag_statue_evt.cpp @@ -466,7 +466,7 @@ NULL, reinterpret_cast(daTagStatue_Draw), }; -extern actor_process_profile_definition g_profile_Tag_Statue = { +actor_process_profile_definition g_profile_Tag_Statue = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_stream.cpp b/src/d/actor/d_a_tag_stream.cpp index ab8a611eb1..d681a130bb 100644 --- a/src/d/actor/d_a_tag_stream.cpp +++ b/src/d/actor/d_a_tag_stream.cpp @@ -108,7 +108,7 @@ static actor_method_class l_daTagStream_Method = { (process_method_func)daTagStream_Draw }; -extern actor_process_profile_definition g_profile_Tag_Stream = { +actor_process_profile_definition g_profile_Tag_Stream = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_telop.cpp b/src/d/actor/d_a_tag_telop.cpp index 9f0fcff0ee..76a27ed0e0 100644 --- a/src/d/actor/d_a_tag_telop.cpp +++ b/src/d/actor/d_a_tag_telop.cpp @@ -66,7 +66,7 @@ static actor_method_class l_daTag_Telop_Method = { (process_method_func)daTag_Telop_Draw, }; -extern actor_process_profile_definition g_profile_TAG_TELOP = { +actor_process_profile_definition g_profile_TAG_TELOP = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_theB_hint.cpp b/src/d/actor/d_a_tag_theB_hint.cpp index 65058ab6cd..25acc4361e 100644 --- a/src/d/actor/d_a_tag_theB_hint.cpp +++ b/src/d/actor/d_a_tag_theB_hint.cpp @@ -26,7 +26,7 @@ static actor_method_class l_daTagTheBHint_Method = { (process_method_func)daTagTheBHint_Execute }; -extern actor_process_profile_definition g_profile_Tag_TheBHint = { +actor_process_profile_definition g_profile_Tag_TheBHint = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_wara_howl.cpp b/src/d/actor/d_a_tag_wara_howl.cpp index fa3732ee29..0a4afbeb29 100644 --- a/src/d/actor/d_a_tag_wara_howl.cpp +++ b/src/d/actor/d_a_tag_wara_howl.cpp @@ -82,7 +82,7 @@ static actor_method_class daTagWrHowl_METHODS = { (process_method_func)daTagWrHowl_draw, }; -extern actor_process_profile_definition g_profile_Tag_WaraHowl = { +actor_process_profile_definition g_profile_Tag_WaraHowl = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_watchge.cpp b/src/d/actor/d_a_tag_watchge.cpp index 92102c77a0..7c1b06a5c1 100644 --- a/src/d/actor/d_a_tag_watchge.cpp +++ b/src/d/actor/d_a_tag_watchge.cpp @@ -90,7 +90,7 @@ static actor_method_class l_daTagWatchGe_Method = { (process_method_func)daTagWatchGe_Draw }; -extern actor_process_profile_definition g_profile_Tag_WatchGe = { +actor_process_profile_definition g_profile_Tag_WatchGe = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_waterfall.cpp b/src/d/actor/d_a_tag_waterfall.cpp index 6bffd89a36..066936d634 100644 --- a/src/d/actor/d_a_tag_waterfall.cpp +++ b/src/d/actor/d_a_tag_waterfall.cpp @@ -239,7 +239,7 @@ static actor_method_class l_daTagWaterFall_Method = { (process_method_func)daTagWaterFall_Draw, }; -extern actor_process_profile_definition g_profile_Tag_WaterFall = { +actor_process_profile_definition g_profile_Tag_WaterFall = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_wljump.cpp b/src/d/actor/d_a_tag_wljump.cpp index c896c2406e..0c229719ac 100644 --- a/src/d/actor/d_a_tag_wljump.cpp +++ b/src/d/actor/d_a_tag_wljump.cpp @@ -240,7 +240,7 @@ static actor_method_class l_daTagWljump_Method = { (process_method_func)daTagWljump_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Wljump = { +actor_process_profile_definition g_profile_Tag_Wljump = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_yami.cpp b/src/d/actor/d_a_tag_yami.cpp index 8708b8d395..7420bd48dc 100644 --- a/src/d/actor/d_a_tag_yami.cpp +++ b/src/d/actor/d_a_tag_yami.cpp @@ -125,7 +125,7 @@ static actor_method_class l_daTagYami_Method = { (process_method_func)daTagYami_Execute, }; -extern actor_process_profile_definition g_profile_TAG_YAMI = { +actor_process_profile_definition g_profile_TAG_YAMI = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_talk.cpp b/src/d/actor/d_a_talk.cpp index 82132b589b..071f53ba74 100644 --- a/src/d/actor/d_a_talk.cpp +++ b/src/d/actor/d_a_talk.cpp @@ -107,7 +107,7 @@ static actor_method_class l_daTalk_Method = { (process_method_func)daTalk_Draw, }; -extern actor_process_profile_definition g_profile_TALK = { +actor_process_profile_definition g_profile_TALK = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index faed410404..bb12fd1886 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -1900,7 +1900,7 @@ static actor_method_class daTbox_METHODS = { (process_method_func)daTbox_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_TBOX = { +actor_process_profile_definition g_profile_TBOX = { fpcLy_CURRENT_e, 4, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tbox2.cpp b/src/d/actor/d_a_tbox2.cpp index f844bff156..06f0ac9aa4 100644 --- a/src/d/actor/d_a_tbox2.cpp +++ b/src/d/actor/d_a_tbox2.cpp @@ -452,7 +452,7 @@ static actor_method_class daTbox2_METHODS = { (process_method_func)daTbox2_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_TBOX2 = { +actor_process_profile_definition g_profile_TBOX2 = { fpcLy_CURRENT_e, 4, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tboxSw.cpp b/src/d/actor/d_a_tboxSw.cpp index 1e4a0d788b..e0d13dfe7f 100644 --- a/src/d/actor/d_a_tboxSw.cpp +++ b/src/d/actor/d_a_tboxSw.cpp @@ -62,7 +62,7 @@ static actor_method_class l_daTboxSw_Method = { (process_method_func)daTboxSw_Draw, }; -extern actor_process_profile_definition g_profile_TBOX_SW = { +actor_process_profile_definition g_profile_TBOX_SW = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index 6e08dd431b..22d39a7bbb 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -371,7 +371,7 @@ static actor_method_class l_daTitle_Method = { (process_method_func)daTitle_Draw, }; -extern actor_process_profile_definition g_profile_TITLE = { +actor_process_profile_definition g_profile_TITLE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp index fa7682526f..681ed0ed92 100644 --- a/src/d/actor/d_a_vrbox.cpp +++ b/src/d/actor/d_a_vrbox.cpp @@ -148,7 +148,7 @@ static actor_method_class l_daVrbox_Method = { (process_method_func)daVrbox_Draw, }; -extern actor_process_profile_definition g_profile_VRBOX = { +actor_process_profile_definition g_profile_VRBOX = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index 815a33dd63..94cd1510de 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -180,7 +180,6 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == 0) { - /* 80499B78-80499B7C 000000 0002+02 1/1 0/0 0/0 .bss mangZ$3688 */ static s16 mangZ; sp14 = sun_p->mPos[0]; @@ -387,7 +386,7 @@ static int daVrbox2_color_set(vrbox2_class* i_this) { } static int daVrbox2_Execute(vrbox2_class* i_this) { - i_this = i_this; // ?? fakematch? only needed for debug + UNUSED(i_this); if (g_env_light.daytime > 255.0f) { i_this->mSunBtk.play(); @@ -454,7 +453,7 @@ static actor_method_class l_daVrbox2_Method = { (process_method_func)daVrbox2_Draw, }; -extern actor_process_profile_definition g_profile_VRBOX2 = { +actor_process_profile_definition g_profile_VRBOX2 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_warp_bug.cpp b/src/d/actor/d_a_warp_bug.cpp index ea16657ddd..2e0a1bc089 100644 --- a/src/d/actor/d_a_warp_bug.cpp +++ b/src/d/actor/d_a_warp_bug.cpp @@ -158,7 +158,7 @@ static actor_method_class l_daWarpBug_Method = { (process_method_func)daWarpBug_Draw, }; -extern actor_process_profile_definition g_profile_WarpBug = { +actor_process_profile_definition g_profile_WarpBug = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index 208d44d0d7..45e162575a 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -278,7 +278,7 @@ static actor_method_class daYkgrMethodTable = { daYkgrDraw, }; -extern actor_process_profile_definition g_profile_Ykgr = { +actor_process_profile_definition g_profile_Ykgr = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/d_a_obj.cpp b/src/d/d_a_obj.cpp index 9f2efe0894..e1fa3b8e22 100644 --- a/src/d/d_a_obj.cpp +++ b/src/d/d_a_obj.cpp @@ -72,9 +72,6 @@ void posMoveF_resist_acc(cXyz* pos, const fopAc_ac_c* i_actor, cXyz const* strea pos->set(sp14); } -/* 800374EC-80037620 031E2C 0134+00 1/1 0/0 0/0 .text - * posMoveF_grade_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzffPC4cXyzPC4cXyz - */ void posMoveF_grade_acc(cXyz* pos, const fopAc_ac_c* i_actor, cXyz const* param_2, f32 friction, f32 no_grade_cos, const cXyz* param_5, const cXyz* param_6) { pos->set(cXyz::Zero); diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index d41cef2b19..96f5d0ad69 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -1761,17 +1761,9 @@ void dAttCatch_c::proc() { mCatchItemNo = fpcNm_ITEM_WATER_BOTTLE; } -// FAKEMATCH: this fixes regalloc in `dAttCatch_c::request` but breaks most other calls -// some more accurate fix should be found eventually -inline fopAc_ac_c* dComIfGp_getPlayer_fakematch(int idx) { - daAlink_c* const link = (daAlink_c* const)g_dComIfG_gameInfo.play.getPlayer(idx); - fopAc_ac_c* player = (fopAc_ac_c*)link; - return player; -} - int dAttCatch_c::request(fopAc_ac_c* i_reqActor, u8 i_itemNo, f32 i_horizontalDist, f32 i_upDist, f32 i_downDist, s16 i_angle, int param_7) { - fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer_fakematch(0); + fopAc_ac_c* player = dComIfGp_getPlayer(0); if (param_7 > field_0x4) { return 0; } diff --git a/src/d/d_bg_s_acch.cpp b/src/d/d_bg_s_acch.cpp index bc16cdade6..1f3046128c 100644 --- a/src/d/d_bg_s_acch.cpp +++ b/src/d/d_bg_s_acch.cpp @@ -121,9 +121,8 @@ void dBgS_Acch::Set(fopAc_ac_c* i_actor, int i_tbl_size, dBgS_AcchCir* i_acchcir } void dBgS_Acch::GroundCheckInit(dBgS& i_bgs) { + UNUSED(i_bgs); if (!(m_flags & 2)) { - i_bgs; // necessary to match - m_ground_h = -G_CM3D_F_INF; m_gnd.SetExtChk(*this); field_0xb4 = ChkGroundHit(); diff --git a/src/d/d_bg_s_movebg_actor.cpp b/src/d/d_bg_s_movebg_actor.cpp index e0bdabc811..3e0735cf91 100644 --- a/src/d/d_bg_s_movebg_actor.cpp +++ b/src/d/d_bg_s_movebg_actor.cpp @@ -85,9 +85,6 @@ int dBgS_MoveBgActor::MoveBGCreateHeap() { return 1; } -/* 800787BC-800788DC 0730FC 0120+00 0/0 0/0 169/169 .text - * MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f - */ int dBgS_MoveBgActor::MoveBGCreate(char const* i_arcName, int i_dzb_id, MoveBGActor_SetFunc i_setFunc, u32 i_heapSize, Mtx* i_bgMtx) { if (i_bgMtx == NULL) { diff --git a/src/d/d_bg_w.cpp b/src/d/d_bg_w.cpp index 09a96ed166..d0f5a718eb 100644 --- a/src/d/d_bg_w.cpp +++ b/src/d/d_bg_w.cpp @@ -2144,9 +2144,5 @@ dBgW* dBgW_NewSet(cBgD_t* pbgd, u32 flags, Mtx* pbase_mtx) { return nw; } -/* 80450F88 0001+00 data_80450F88 None */ -/* 80450F89 0001+00 data_80450F89 None */ -/* 80450F8A 0001+00 data_80450F8A None */ -/* 80450F8B 0005+00 data_80450F8B None */ extern u8 struct_80450F88[8]; u8 struct_80450F88[8]; diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index b6ca10750e..9425cfdde4 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -720,8 +720,7 @@ void dCamera_c::initPad() { mHoldY = mDoCPd_c::getHoldY(mPadID) ? true : false; mTrigY = mDoCPd_c::getTrigY(mPadID) ? true : false; - // fakematch (doesn't match in debug) - mHoldZ = (u8)mDoCPd_c::getHoldZ(mPadID) ? true : false; + mHoldZ = mDoCPd_c::getHoldZ(mPadID) ? true : false; mTrigZ = mDoCPd_c::getTrigZ(mPadID) ? true : false; field_0x21f = 0; @@ -4223,15 +4222,13 @@ bool dCamera_c::lockonCamera(s32 param_0) { target_attention_pos.z = positionOf(mpLockonTarget).z; } - // this should probably be an ifdef, but we force it to be compiled - // to make the function large enough to stop doing inlining - if (!NDEBUG_DEFINED) { - if (mCamSetup.CheckFlag(0x8000)) { - //char name[28]; - fopAcM_getNameString(mpPlayerActor, NULL); - dDbVw_Report(0x1e0, 0x109, "%s", NULL); - } +#if DEBUG + if (mCamSetup.CheckFlag(0x8000)) { + char name[dStage_NAME_LENGTH]; + fopAcM_getNameString(mpPlayerActor, name); + dDbVw_Report(0x1e0, 0x109, "%s", name); } +#endif if (check_owner_action(mPadID, 0x2000008)) { cXyz vec(0.0f, 0.0f, -90.0f); @@ -8924,7 +8921,7 @@ bool dCamera_c::oneSideCamera(s32 param_1) { bool dCamera_c::eventCamera(s32 param_0) { char sp90[12]; - (void)param_0; + UNUSED(param_0); int var_r29 = -1; typedef bool (dCamera_c::*func)(); @@ -10072,7 +10069,7 @@ static leafdraw_method_class method = { (process_method_func)camera_draw, }; -extern camera_process_profile_definition g_profile_CAMERA = { +camera_process_profile_definition g_profile_CAMERA = { fpcLy_CURRENT_e, 11, fpcPi_CURRENT_e, @@ -10093,7 +10090,7 @@ extern camera_process_profile_definition g_profile_CAMERA = { 0, }; -extern camera_process_profile_definition g_profile_CAMERA2 = { +camera_process_profile_definition g_profile_CAMERA2 = { fpcLy_CURRENT_e, 11, fpcPi_CURRENT_e, diff --git a/src/d/d_cc_s.cpp b/src/d/d_cc_s.cpp index 989cb3776c..f7e275dea4 100644 --- a/src/d/d_cc_s.cpp +++ b/src/d/d_cc_s.cpp @@ -107,9 +107,6 @@ bool dCcS::ChkShield(cCcD_Obj* i_atObj, cCcD_Obj* i_tgObj, dCcD_GObjInf* i_atObj void dCcS::CalcTgPlusDmg(cCcD_Obj* i_atObj, cCcD_Obj* i_tgObj, cCcD_Stts* i_atStts, cCcD_Stts* i_tgStts) {} -/* 800861B4-80086240 080AF4 008C+00 1/0 0/0 0/0 .text - * ChkAtTgHitAfterCross__4dCcSFbbPC12cCcD_GObjInfPC12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts - */ bool dCcS::ChkAtTgHitAfterCross(bool i_setAt, bool i_setTg, cCcD_GObjInf const* i_atObjInf, cCcD_GObjInf const* i_tgObjInf, cCcD_Stts* i_atStts, cCcD_Stts* i_tgStts, cCcD_GStts* i_atGStts, cCcD_GStts* i_tgGStts) { @@ -142,9 +139,6 @@ bool dCcS::ChkAtTgHitAfterCross(bool i_setAt, bool i_setTg, cCcD_GObjInf const* return false; } -/* 80086240-80086360 080B80 0120+00 1/0 0/0 0/0 .text - * SetCoGObjInf__4dCcSFbbP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts - */ void dCcS::SetCoGObjInf(bool i_co1Set, bool i_co2Set, cCcD_GObjInf* i_co1Obj, cCcD_GObjInf* i_co2Obj, cCcD_Stts* i_co1Stts, cCcD_Stts* i_co2Stts, cCcD_GStts* i_co1GStts, cCcD_GStts* i_co2GStts) { @@ -364,9 +358,6 @@ void dCcS::CalcParticleAngle(dCcD_GObjInf* i_atObjInf, cCcD_Stts* i_atStts, cCcD cM3d_CalcVecZAngle(vec, o_angle); } -/* 8008685C-80086AC0 08119C 0264+00 1/1 0/0 0/0 .text - * ProcAtTgHitmark__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10dCcD_GSttsP10dCcD_GSttsP4cXyzb - */ void dCcS::ProcAtTgHitmark(bool i_setAt, bool i_setTg, cCcD_Obj* param_2, cCcD_Obj* param_3, dCcD_GObjInf* i_atObjInf, dCcD_GObjInf* i_tgObjInf, cCcD_Stts* param_6, cCcD_Stts* param_7, dCcD_GStts* param_8, dCcD_GStts* param_9, @@ -429,9 +420,6 @@ void dCcS::ProcAtTgHitmark(bool i_setAt, bool i_setTg, cCcD_Obj* param_2, cCcD_O } } -/* 80086AC0-80086D8C 081400 02CC+00 1/0 0/0 0/0 .text - * SetAtTgGObjInf__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz - */ void dCcS::SetAtTgGObjInf(bool i_setAt, bool i_setTg, cCcD_Obj* i_atObj, cCcD_Obj* i_tgObj, cCcD_GObjInf* i_atObjInf, cCcD_GObjInf* i_tgObjInf, cCcD_Stts* i_atStts, cCcD_Stts* i_tgStts, cCcD_GStts* i_atGStts, cCcD_GStts* i_tgGStts, diff --git a/src/d/d_com_static.cpp b/src/d/d_com_static.cpp index 794a663f61..461f182719 100644 --- a/src/d/d_com_static.cpp +++ b/src/d/d_com_static.cpp @@ -115,10 +115,8 @@ daSus_c::data_c daSus_c::mData[0x20]; daSus_c::room_c daSus_c::mRoom[0x40]; -/* 80450D88 0002+00 data_80450D88 m_count__9daArrow_c */ s16 daArrow_c::m_count; -/* 80450D8A 0002+00 data_80450D8A mSetTop__7daSus_c */ s16 daSus_c::mSetTop; int daSus_c::newData(s8 i_roomNo, cXyz const& param_1, cXyz const& param_2, u8 param_3, u8 param_4, @@ -247,13 +245,10 @@ void daNpcKakashi_clrSuccessCount() { dComIfGs_setTmpReg(0xFEFF, 0); } -/* 80450D8C 0001+00 data_80450D8C None */ bool daYkgr_c::m_flag; -/* 80450D8D 0001+00 data_80450D8D None */ bool daYkgr_c::m_alpha_flag; -/* 80450D8E 0002+00 data_80450D8E None */ u8 daYkgr_c::m_alpha; f32 daYkgr_c::m_aim_rate; @@ -416,10 +411,8 @@ int daTagMagne_c::checkMagneC() { return 0; } -/* 80450DC0 0001+00 data_80450DC0 None */ u8 daTagMist_c::mPlayerNo; -/* 80450DC1 0003+00 data_80450DC1 None */ bool daObjCarry_c::mSaveFlag; u8 daTagMist_c::getPlayerNo() { diff --git a/src/d/d_debug_viewer.cpp b/src/d/d_debug_viewer.cpp index f34328afc0..eb873f483d 100644 --- a/src/d/d_debug_viewer.cpp +++ b/src/d/d_debug_viewer.cpp @@ -122,7 +122,7 @@ static JUtility::TColor ShadowDarkColor(0, 0, 0, 0x80); static JUtility::TColor ShadowLightColor(0xFF, 0xFF, 0xFF, 0x80); int dDbVw_Report(int x, int y, char const* string, ...) { - string; + UNUSED(string); char buffer[256]; if (reportOK()) { diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index f199a7a3b9..e324a22272 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -14,9 +14,6 @@ s16 dDemo_c::m_branchId = -1; namespace { jstudio_tAdaptor_message::~jstudio_tAdaptor_message() {} -/* 80037E44-80037E74 032784 0030+00 1/0 0/0 0/0 .text - * adaptor_do_MESSAGE__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_messageFQ37JStudio4data15TEOperationDataPCvUl - */ void jstudio_tAdaptor_message::adaptor_do_MESSAGE(JStudio::data::TEOperationData iType, const void* pContent, u32 uSize) { switch (iType) { @@ -40,9 +37,6 @@ void jstudio_tAdaptor_message::adaptor_do_MESSAGE(JStudio::data::TEOperationData jstudio_tCreateObject_message::~jstudio_tCreateObject_message() {} -/* 80037ED4-80038020 032814 014C+00 1/0 0/0 0/0 .text - * create__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_messageFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object - */ bool jstudio_tCreateObject_message::create(JStudio::TObject** ppObject, const JStudio::stb::data::TParse_TBlock_object& iBlock) { diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index def0edfd65..51b082baf7 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -236,7 +236,7 @@ static leafdraw_method_class l_dEnvSe_Method = { (process_method_func)dEnvSe_Draw, }; -extern kankyo_process_profile_definition g_profile_ENVSE = { +kankyo_process_profile_definition g_profile_ENVSE = { fpcLy_CURRENT_e, 2, fpcPi_CURRENT_e, diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index ac0f1191f1..a961562f80 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -13,7 +13,6 @@ #include "d/actor/d_a_alink.h" namespace { - /* 800889F8-80088A7C 083338 0084+00 1/1 0/0 0/0 .text isStageEvent__25@unnamed@d_ev_camera_cpp@Fi */ static bool isStageEvent(int param_0) { dStage_MapEventInfo_c* info = dComIfGp_getStage()->getMapEventInfo(); if (info != NULL) { @@ -496,7 +495,6 @@ bool dCamera_c::pauseEvCamera() { } namespace { - /* 804253B4-804253C0 0520D4 000C+00 2/3 0/0 0/0 .bss WolfAdditionVec__25@unnamed@d_ev_camera_cpp@*/ static cXyz WolfAdditionVec(0.0f, -70.0f, 70.0f); } @@ -840,10 +838,8 @@ bool dCamera_c::rollingEvCamera() { } namespace { - /* 804253CC-804253D8 0520EC 000C+00 1/2 0/0 0/0 .bss MidnaAdditionVec__25@unnamed@d_ev_camera_cpp@ */ static cXyz MidnaAdditionVec(0.0f, 0.0f, 70.0f); - /* 8008E750-8008E774 089090 0024+00 1/1 0/0 0/0 .text isRelChar__25@unnamed@d_ev_camera_cpp@Fc */ static inline bool isRelChar(char param_1) { return param_1 != '-' && param_1 != 'x'; } @@ -995,7 +991,7 @@ bool dCamera_c::transEvCamera(int param_1) { trans->mEye = (*ptr1).mEye; trans->mFovy = (*ptr1).mFovy; trans->field_0x3c = (*ptr1).mBank; - if (float(s16(ptr1->mBank)) != 0.0f) { + if (s16(ptr1->mBank) != 0.0f) { trans->field_0x68 = true; } } @@ -1011,7 +1007,7 @@ bool dCamera_c::transEvCamera(int param_1) { trans->mStartEye = (*ptr2).mEye; trans->mStartFovy = (*ptr2).mFovy; trans->field_0x1c = (*ptr2).mBank; - if (float(s16(ptr2->mBank)) != 0.0f) { + if (s16(ptr2->mBank) != 0.0f) { trans->field_0x68 = true; } } diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index 881d1cc05b..4bf16c7e42 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -489,18 +489,24 @@ bool d_GameOver_Delete(fpc_ProcID& i_id) { return false; } -static void* l_dGameover_Method[5] = { - (void*)dGameover_Create, - (void*)dGameover_Delete, - (void*)dGameover_Execute, - (void*)dGameover_IsDelete, - (void*)dGameover_Draw, +static leafdraw_method_class l_dGameover_Method = { + (process_method_func)dGameover_Create, + (process_method_func)dGameover_Delete, + (process_method_func)dGameover_Execute, + (process_method_func)dGameover_IsDelete, + (process_method_func)dGameover_Draw, }; -extern void* g_profile_GAMEOVER[10] = { - (void*)0xFFFFFFFD, (void*)0x000CFFFD, - (void*)0x03170000, (void*)&g_fpcLf_Method, - (void*)0x0000011C, (void*)NULL, - (void*)NULL, (void*)&g_fopMsg_Method, - (void*)0x03030000, (void*)&l_dGameover_Method, +msg_process_profile_definition g_profile_GAMEOVER = { + fpcLy_CURRENT_e, + 0x0C, + fpcPi_CURRENT_e, + PROC_GAMEOVER, + &g_fpcLf_Method.base, + sizeof(dGameover_c), + 0, + 0, + &g_fopMsg_Method, + 0x303, + &l_dGameover_Method, }; diff --git a/src/d/d_k_wmark.cpp b/src/d/d_k_wmark.cpp index f8167d974e..a619943ccc 100644 --- a/src/d/d_k_wmark.cpp +++ b/src/d/d_k_wmark.cpp @@ -168,7 +168,7 @@ static leafdraw_method_class l_dkWmark_Method = { (process_method_func)dkWmark_Draw, }; -extern kankyo_process_profile_definition g_profile_WMARK = { +kankyo_process_profile_definition g_profile_WMARK = { fpcLy_CURRENT_e, 9, fpcPi_CURRENT_e, diff --git a/src/d/d_k_wpillar.cpp b/src/d/d_k_wpillar.cpp index f2d8cd5a3e..b89783c6ee 100644 --- a/src/d/d_k_wpillar.cpp +++ b/src/d/d_k_wpillar.cpp @@ -132,7 +132,7 @@ static leafdraw_method_class l_dkWpillar_Method = { (process_method_func)dkWpillar_Draw, }; -extern kankyo_process_profile_definition g_profile_WPILLAR = { +kankyo_process_profile_definition g_profile_WPILLAR = { fpcLy_CURRENT_e, 9, fpcPi_CURRENT_e, diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 227a2b54ad..47a72be75f 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -2219,9 +2219,6 @@ void dScnKy_env_light_c::setLight_palno_get(u8* prev_envr_id_p, u8* next_envr_id #endif } -/* 801A0340-801A040C 19AC80 00CC+00 3/3 0/0 0/0 .text - * dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f - */ void dKy_calc_color_set(GXColorS10* out_color_p, color_RGB_class* color_a_start_p, color_RGB_class* color_b_start_p, color_RGB_class* color_a_end_p, color_RGB_class* color_b_end_p, f32 color_ratio, f32 blend_ratio, @@ -3046,9 +3043,6 @@ void dScnKy_env_light_c::setLight_actor(dKy_tevstr_c* tevstr_p, GXColorS10* fog_ } } -/* 801A1D64-801A1F58 19C6A4 01F4+00 1/1 0/0 0/0 .text - * settingTevStruct_colget_actor__18dScnKy_env_light_cFP4cXyzP12dKy_tevstr_cP11_GXColorS10P11_GXColorS10PfPf - */ void dScnKy_env_light_c::settingTevStruct_colget_actor(cXyz* unused, dKy_tevstr_c* tevstr_p, GXColorS10* out_color_p, GXColorS10* fog_col_p, f32* fog_near_p, @@ -3176,13 +3170,10 @@ static void cLib_addCalcU8(u8* i_value, u8 i_target, s16 i_scale, s16 i_maxStep) *i_value = value; } -/* 801A2128-801A37C4 19CA68 169C+00 2/1 0/0 0/0 .text - * settingTevStruct_plightcol_plus__18dScnKy_env_light_cFP4cXyzP12dKy_tevstr_c11_GXColorS1011_GXColorS10Uc - */ void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* pos_p, dKy_tevstr_c* tevstr_p, GXColorS10 param_2, GXColorS10 param_3, u8 init_timer) { - (void)param_3; + UNUSED(param_3); dScnKy_env_light_c* kankyo = dKy_getEnvlight(); cXyz light_pos; Vec spDC; @@ -8511,7 +8502,7 @@ void dKy_undwater_filter_draw() { } static int dKy_Draw(sub_kankyo__class* i_this) { - (void)i_this; + UNUSED(i_this); g_env_light.drawKankyo(); #if DEBUG @@ -8531,7 +8522,7 @@ static int dKy_Draw(sub_kankyo__class* i_this) { } static int dKy_Execute(sub_kankyo__class* i_this) { - (void)i_this; + UNUSED(i_this); dScnKy_env_light_c* kankyo = dKy_getEnvlight(); g_env_light.exeKankyo(); dKyw_wind_set(); @@ -8570,7 +8561,7 @@ static int dKy_IsDelete(sub_kankyo__class* i_this) { } static int dKy_Delete(sub_kankyo__class* i_this) { - (void)i_this; + UNUSED(i_this); plight_init(); mDoAud_mEnvse_resetScene(); @@ -8670,7 +8661,7 @@ static leafdraw_method_class l_dKy_Method = { (process_method_func)dKy_Draw, }; -extern kankyo_process_profile_definition g_profile_KANKYO = { +kankyo_process_profile_definition g_profile_KANKYO = { fpcLy_CURRENT_e, 1, fpcPi_CURRENT_e, diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 6cf04ee9cc..77545a769c 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -269,7 +269,7 @@ static leafdraw_method_class l_dThunder_Method = { (process_method_func)dThunder_Draw, }; -extern kankyo_process_profile_definition g_profile_KY_THUNDER = { +kankyo_process_profile_definition g_profile_KY_THUNDER = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index 01cba3718b..f3c4839002 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -71,7 +71,7 @@ static leafdraw_method_class l_dKyeff_Method = { (process_method_func)dKyeff_Draw, }; -extern kankyo_process_profile_definition g_profile_KYEFF = { +kankyo_process_profile_definition g_profile_KYEFF = { fpcLy_CURRENT_e, 12, fpcPi_CURRENT_e, diff --git a/src/d/d_kyeff2.cpp b/src/d/d_kyeff2.cpp index c9c914eaf9..b58d781ff4 100644 --- a/src/d/d_kyeff2.cpp +++ b/src/d/d_kyeff2.cpp @@ -43,7 +43,7 @@ static leafdraw_method_class l_dKyeff2_Method = { (process_method_func)dKyeff2_Draw, }; -extern kankyo_process_profile_definition g_profile_KYEFF2 = { +kankyo_process_profile_definition g_profile_KYEFF2 = { fpcLy_CURRENT_e, 12, fpcPi_CURRENT_e, diff --git a/src/d/d_map_path_dmap.cpp b/src/d/d_map_path_dmap.cpp index a7d6172436..4f45717806 100644 --- a/src/d/d_map_path_dmap.cpp +++ b/src/d/d_map_path_dmap.cpp @@ -357,10 +357,8 @@ bool dMpath_c::isExistMapPathData() { int dMapInfo_c::mNextRoomNo = -1; -/* 80450634 0001+00 data_80450634 None */ s8 dMpath_c::mBottomFloorNo = 127; -/* 80450635 0001+00 data_80450635 None */ s8 dMpath_c::mTopFloorNo = -128; int dMpath_c::getTopBottomFloorNo(s8* i_topFloorNo, s8* i_bottomFloorNo) { diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp index bfe946f726..649df3039f 100644 --- a/src/d/d_menu_fmap.cpp +++ b/src/d/d_menu_fmap.cpp @@ -1383,12 +1383,9 @@ void dMenu_Fmap_c::portal_demo5_init() { void dMenu_Fmap_c::portal_demo5_move() { mpStick->checkTrigger(); - // fakematch: the call to the fake inline function dMeter2Info_isTouchKeyCheck_alt - // should actually call dMeter2Info_isTouchKeyCheck, but for some reason the generated asm - // is different from every other call to dMeter2Info_isTouchKeyCheck if (dMw_B_TRIGGER() || dMw_Z_TRIGGER() || dMw_START_TRIGGER() || dMw_UP_TRIGGER() || dMw_DOWN_TRIGGER() || dMw_LEFT_TRIGGER() || dMw_RIGHT_TRIGGER() - || dMeter2Info_isTouchKeyCheck_alt(0xc)) + || dMeter2Info_isTouchKeyCheck(0xc)) { dMsgObject_setTalkHeap(mpTalkHeap); fopMsgM_messageSet(2015, 1000); diff --git a/src/d/d_menu_fmap2D.cpp b/src/d/d_menu_fmap2D.cpp index dc5fd5d4f5..a8776ee94b 100644 --- a/src/d/d_menu_fmap2D.cpp +++ b/src/d/d_menu_fmap2D.cpp @@ -1892,7 +1892,7 @@ void dMenu_Fmap2DBack_c::regionMapMove(STControl* i_stick) { } void dMenu_Fmap2DBack_c::stageMapMove(STControl* i_stick, u8 param_1, bool param_2) { - (void)param_1; + UNUSED(param_1); f32 slow_bound = g_fmapHIO.mScrollSpeedSlowBound < g_fmapHIO.mScrollSpeedFastBound ? g_fmapHIO.mScrollSpeedSlowBound : g_fmapHIO.mScrollSpeedFastBound; diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp index c47431df70..8542d0eac9 100644 --- a/src/d/d_menu_window.cpp +++ b/src/d/d_menu_window.cpp @@ -1728,7 +1728,7 @@ static leafdraw_method_class l_dMw_Method = { (process_method_func)dMw_Draw, }; -extern msg_process_profile_definition g_profile_MENUWINDOW = { +msg_process_profile_definition g_profile_MENUWINDOW = { fpcLy_CURRENT_e, 12, fpcPi_CURRENT_e, diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp index 1c282afedd..14efe0fc34 100644 --- a/src/d/d_meter2.cpp +++ b/src/d/d_meter2.cpp @@ -3087,12 +3087,12 @@ static leafdraw_method_class l_dMeter2_Method = { (process_method_func)dMeter2_Draw, }; -extern msg_process_profile_definition g_profile_METER2 = { +msg_process_profile_definition g_profile_METER2 = { fpcLy_CURRENT_e, 12, fpcPi_CURRENT_e, PROC_METER2, - (process_method_class*)&g_fpcLf_Method, + &g_fpcLf_Method.base, sizeof(dMeter2_c), 0, 0, diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp index aed3bf7fe1..971868b3fa 100644 --- a/src/d/d_meter2_draw.cpp +++ b/src/d/d_meter2_draw.cpp @@ -1298,9 +1298,6 @@ void dMeter2Draw_c::playOxygenBpkAnimation(J2DAnmColor* i_bpk) { } } -/* 80213FF0-802140DC 20E930 00EC+00 1/1 0/0 0/0 .text - * drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc - */ void dMeter2Draw_c::drawPikari(CPaneMgr* i_pane, f32* i_framep, f32 i_scale, JUtility::TColor i_moyaBlack, JUtility::TColor i_moyaWhite, JUtility::TColor i_moyabsBlack, JUtility::TColor i_moyabsWhite, @@ -1310,9 +1307,6 @@ void dMeter2Draw_c::drawPikari(CPaneMgr* i_pane, f32* i_framep, f32 i_scale, i_moyabsWhite, param_7, param_8); } -/* 802140DC-8021462C 20EA1C 0550+00 1/1 6/6 0/0 .text - * drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc - */ void dMeter2Draw_c::drawPikari(f32 i_posX, f32 i_posY, f32* i_framep, f32 i_scale, JUtility::TColor i_moyaBlack, JUtility::TColor i_moyaWhite, JUtility::TColor i_moyabsBlack, JUtility::TColor i_moyabsWhite, @@ -1385,9 +1379,6 @@ void dMeter2Draw_c::drawPikari(f32 i_posX, f32 i_posY, f32* i_framep, f32 i_scal } } -/* 8021462C-802147CC 20EF6C 01A0+00 0/0 1/1 0/0 .text - * drawPikariHakusha__13dMeter2Draw_cFffffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor - */ void dMeter2Draw_c::drawPikariHakusha(f32 i_posX, f32 i_posY, f32 i_frame, f32 i_scale, JUtility::TColor i_moyaBlack, JUtility::TColor i_moyaWhite, JUtility::TColor i_moyabsBlack, diff --git a/src/d/d_meter2_info.cpp b/src/d/d_meter2_info.cpp index 94ddceb726..138c15eb33 100644 --- a/src/d/d_meter2_info.cpp +++ b/src/d/d_meter2_info.cpp @@ -791,9 +791,6 @@ u8 dMeter2Info_c::getItemType(u8 i_itemNo) { return type; } -/* 8021CF08-8021D36C 217848 0464+00 0/0 9/9 0/0 .text - * readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei - */ int dMeter2Info_c::readItemTexture(u8 i_itemNo, void* i_texBuf1, J2DPicture* i_pic1, void* i_texBuf2, J2DPicture* i_pic2, void* i_texBuf3, J2DPicture* i_pic3, void* i_texBuf4, J2DPicture* i_pic4, int param_9) { diff --git a/src/d/d_meter_HIO.cpp b/src/d/d_meter_HIO.cpp index a3b92cb9b9..20a5fe7ba1 100644 --- a/src/d/d_meter_HIO.cpp +++ b/src/d/d_meter_HIO.cpp @@ -3481,7 +3481,7 @@ void dMeter_ringHIO_c::genMessage(JORMContext* mctx) { } BOOL subJOREventCallbackListNode::JORAct(u32 param_1, const char* param_2) { - (void)param_1; + UNUSED(param_1); JORFile file; if (file.open(param_2, 1, "", NULL, NULL, NULL)) { if (!g_fmapHIO.mpArcFile) { diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp index f8ba9a788a..c7ecc0780a 100644 --- a/src/d/d_msg_class.cpp +++ b/src/d/d_msg_class.cpp @@ -865,7 +865,7 @@ jmessage_tMeasureProcessor::jmessage_tMeasureProcessor(jmessage_tReference const } void jmessage_tMeasureProcessor::do_begin(void const* pEntry, char const* pszText) { - (void)pszText; + UNUSED(pszText); jmessage_tReference* pReference = (jmessage_tReference*)getReference(); pReference->resetCharactor(); @@ -3928,8 +3928,8 @@ jmessage_string_tMeasureProcessor::jmessage_string_tMeasureProcessor(jmessage_st } void jmessage_string_tMeasureProcessor::do_begin(void const* pEntry, char const* pszText) { - (void)pEntry; - (void)pszText; + UNUSED(pEntry); + UNUSED(pszText); mpReference->setLineCount(0); mpReference->resetCharactor(); } @@ -4357,9 +4357,6 @@ void jmessage_string_tMeasureProcessor::do_rubyset(void const* i_data, u32 i_siz } } -/* 80230A08-80230A5C 22B348 0054+00 0/0 1/1 0/0 .text - * __ct__34jmessage_string_tSequenceProcessorFPC26jmessage_string_tReferenceP24jmessage_string_tControl - */ jmessage_string_tSequenceProcessor::jmessage_string_tSequenceProcessor( jmessage_string_tReference const* pReference, jmessage_string_tControl* pControl) : JMessage::TSequenceProcessor(pReference, pControl), diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index 42301e6507..6e2287a869 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -2461,7 +2461,7 @@ static leafdraw_method_class l_dMsgObject_Method = { (process_method_func)dMsgObject_Draw, }; -extern msg_process_profile_definition g_profile_MSG_OBJECT = { +msg_process_profile_definition g_profile_MSG_OBJECT = { fpcLy_CURRENT_e, // mLayerID 12, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/d_msg_string_base.cpp b/src/d/d_msg_string_base.cpp index 531f543144..2e3124e6bd 100644 --- a/src/d/d_msg_string_base.cpp +++ b/src/d/d_msg_string_base.cpp @@ -88,9 +88,6 @@ f32 dMsgStringBase_c::getStringLocal(u32 param_1, J2DTextBox* param_2, J2DTextBo return lineLength; } -/* 802498D8-80249A48 244218 0170+00 1/1 1/1 0/0 .text - * getStringPageLocal__16dMsgStringBase_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc - */ f32 dMsgStringBase_c::getStringPageLocal(u32 param_1, u8 param_2, u8 param_3, J2DTextBox* param_4, J2DTextBox* param_5, JUTFont* param_6, COutFont_c* param_7, u8 param_8) { diff --git a/src/d/d_ovlp_fade.cpp b/src/d/d_ovlp_fade.cpp index a605e8d4bd..d8edae5d33 100644 --- a/src/d/d_ovlp_fade.cpp +++ b/src/d/d_ovlp_fade.cpp @@ -132,7 +132,7 @@ static leafdraw_method_class l_dOvlpFd_Method = { (process_method_func)dOvlpFd_Draw, }; -extern overlap_process_profile_definition g_profile_OVERLAP0 = { +overlap_process_profile_definition g_profile_OVERLAP0 = { fpcLy_ROOT_e, 0, fpcPi_CURRENT_e, @@ -146,7 +146,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP0 = { &l_dOvlpFd_Method, }; -extern overlap_process_profile_definition g_profile_OVERLAP1 = { +overlap_process_profile_definition g_profile_OVERLAP1 = { fpcLy_ROOT_e, 0, fpcPi_CURRENT_e, @@ -160,7 +160,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP1 = { &l_dOvlpFd_Method, }; -extern overlap_process_profile_definition g_profile_OVERLAP6 = { +overlap_process_profile_definition g_profile_OVERLAP6 = { fpcLy_ROOT_e, 0, fpcPi_CURRENT_e, @@ -174,7 +174,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP6 = { &l_dOvlpFd_Method, }; -extern overlap_process_profile_definition g_profile_OVERLAP7 = { +overlap_process_profile_definition g_profile_OVERLAP7 = { fpcLy_ROOT_e, 0, fpcPi_CURRENT_e, @@ -188,7 +188,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP7 = { &l_dOvlpFd_Method, }; -extern overlap_process_profile_definition g_profile_OVERLAP8 = { +overlap_process_profile_definition g_profile_OVERLAP8 = { fpcLy_ROOT_e, 0, fpcPi_CURRENT_e, @@ -202,7 +202,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP8 = { &l_dOvlpFd_Method, }; -extern overlap_process_profile_definition g_profile_OVERLAP9 = { +overlap_process_profile_definition g_profile_OVERLAP9 = { fpcLy_ROOT_e, 0, fpcPi_CURRENT_e, @@ -216,7 +216,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP9 = { &l_dOvlpFd_Method, }; -extern overlap_process_profile_definition g_profile_OVERLAP10 = { +overlap_process_profile_definition g_profile_OVERLAP10 = { fpcLy_ROOT_e, 0, fpcPi_CURRENT_e, @@ -230,7 +230,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP10 = { &l_dOvlpFd_Method, }; -extern overlap_process_profile_definition g_profile_OVERLAP11 = { +overlap_process_profile_definition g_profile_OVERLAP11 = { fpcLy_ROOT_e, 0, fpcPi_CURRENT_e, diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp index 2ecf5a5f16..21abd58cdd 100644 --- a/src/d/d_ovlp_fade2.cpp +++ b/src/d/d_ovlp_fade2.cpp @@ -236,7 +236,7 @@ static leafdraw_method_class l_dOvlpFd2_Method = { (process_method_func)dOvlpFd2_Draw, }; -extern overlap_process_profile_definition g_profile_OVERLAP2 = { +overlap_process_profile_definition g_profile_OVERLAP2 = { fpcLy_ROOT_e, 2, fpcPi_CURRENT_e, diff --git a/src/d/d_ovlp_fade3.cpp b/src/d/d_ovlp_fade3.cpp index cc180c6ca4..8911220768 100644 --- a/src/d/d_ovlp_fade3.cpp +++ b/src/d/d_ovlp_fade3.cpp @@ -234,7 +234,7 @@ static leafdraw_method_class l_dOvlpFd3_Method = { (process_method_func)dOvlpFd3_Draw, }; -extern overlap_process_profile_definition g_profile_OVERLAP3 = { +overlap_process_profile_definition g_profile_OVERLAP3 = { fpcLy_ROOT_e, 0, fpcPi_CURRENT_e, diff --git a/src/d/d_pane_class.cpp b/src/d/d_pane_class.cpp index 8b4e3543f6..0b12ff7d15 100644 --- a/src/d/d_pane_class.cpp +++ b/src/d/d_pane_class.cpp @@ -283,9 +283,6 @@ bool CPaneMgr::scaleAnime(s16 param_0, f32 param_1, f32 param_2, u8 param_3) { return false; } -/* 802548BC-80254C90 24F1FC 03D4+00 0/0 4/4 0/0 .text - * colorAnime__8CPaneMgrFsQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorUc - */ bool CPaneMgr::colorAnime(s16 anmTimer, JUtility::TColor startBlack, JUtility::TColor endBlack, JUtility::TColor startWhite, JUtility::TColor endWhite, u8 calcType) { if (mColorAnime < anmTimer - 1) { diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index bd1c524b8b..c28ef4be0c 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -139,9 +139,6 @@ dPa_modelEcallBack::model_c* dPa_modelEcallBack::mModel; u8 dPa_modelEcallBack::mNum; #endif -/* 80450E9C 0001+00 data_80450E9C None */ -/* 80450E9D 0001+00 data_80450E9D None */ -/* 80450E9E 0002+00 data_80450E9E None */ static u8 struct_80450E9C; static u8 struct_80450E9D; @@ -1419,9 +1416,6 @@ void dPa_control_c::setWaterRipple(u32* param_0, cBgS_PolyInfo& param_1, cXyz co } } -/* 8004CA90-8004CF90 0473D0 0500+00 3/3 20/20 418/418 .text - * set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf - */ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos, dKy_tevstr_c const* param_3, csXyz const* i_rotation, cXyz const* i_scale, u8 i_alpha, dPa_levelEcallBack* param_7, @@ -1606,9 +1600,6 @@ s32 dPa_control_c::getPolyColor(cBgS_PolyInfo& param_0, int param_1, _GXColor* p return 1; } -/* 8004D068-8004D128 0479A8 00C0+00 0/0 1/1 17/17 .text - * setPoly__13dPa_control_cFUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz - */ JPABaseEmitter* dPa_control_c::setPoly(u16 param_0, cBgS_PolyInfo& param_1, cXyz const* param_2, dKy_tevstr_c const* param_3, csXyz const* param_4, cXyz const* param_5, int param_6, dPa_levelEcallBack* param_7, @@ -1716,9 +1707,6 @@ static void dPa_kankyocolor_set(f32 param_0, JPABaseEmitter* param_1, } } -/* 8004D4CC-8004D6A4 047E0C 01D8+00 3/3 11/11 364/364 .text - * set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf - */ u32 dPa_control_c::set(u32 param_0, u8 param_1, u16 param_2, cXyz const* pos, dKy_tevstr_c const* param_4, csXyz const* i_rotation, cXyz const* i_scale, u8 alpha, dPa_levelEcallBack* param_8, s8 param_9, _GXColor const* param_10, @@ -1762,9 +1750,6 @@ u32 dPa_control_c::set(u32 param_0, u8 param_1, u16 param_2, cXyz const* pos, return field_0x210.entry(param_2, pJVar5, param_8); } -/* 8004D6A4-8004D770 047FE4 00CC+00 1/1 3/3 10/10 .text - * setPoly__13dPa_control_cFUlUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz - */ u32 dPa_control_c::setPoly(u32 param_0, u16 param_1, cBgS_PolyInfo& param_2, cXyz const* param_3, dKy_tevstr_c const* param_4, csXyz const* param_5, cXyz const* param_6, int param_7, @@ -1792,9 +1777,6 @@ u32 dPa_control_c::setStopContinue(u32 param_0) { return 0; } -/* 8004D7C4-8004D988 048104 01C4+00 0/0 1/1 0/0 .text - * setSimpleFoot__13dPa_control_cFUlPUlR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_ciPC5csXyzPC4cXyzP18dPa_levelEcallBackScPC4cXyz - */ u32 dPa_control_c::setSimpleFoot(u32 param_0, u32* param_1, cBgS_PolyInfo& param_2, cXyz const* param_3, dKy_tevstr_c const* param_4, int param_5, csXyz const* param_6, cXyz const* param_7, @@ -1833,9 +1815,6 @@ u32 dPa_control_c::setSimpleFoot(u32 param_0, u32* param_1, cBgS_PolyInfo& param return rv; } -/* 8004D988-8004DC28 0482C8 02A0+00 0/0 1/1 0/0 .text - * setCommonPoly__13dPa_control_cFPUlP13cBgS_PolyInfoPC4cXyzPC4cXyzPC12dKy_tevstr_cUlUlPC5csXyzPC4cXyzSc - */ u16 dPa_control_c::setCommonPoly(u32* param_0, cBgS_PolyInfo* param_1, cXyz const* param_2, cXyz const* param_3, dKy_tevstr_c const* param_4, u32 param_5, u32 param_6, csXyz const* param_7, cXyz const* param_8, diff --git a/src/d/d_particle_copoly.cpp b/src/d/d_particle_copoly.cpp index 82127db43e..f14e90e488 100644 --- a/src/d/d_particle_copoly.cpp +++ b/src/d/d_particle_copoly.cpp @@ -178,9 +178,6 @@ void dPaPoT_c::clearTwoAllID() { clearCenterID(); } -/* 800512E8-80051424 04BC28 013C+00 0/0 1/1 1/1 .text - * setEffectFour__8dPaPoF_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC5csXyzPC4cXyzScff - */ int dPaPoF_c::setEffectFour(dKy_tevstr_c const* param_0, cXyz const* param_1, u32 param_2, u32 param_3, cXyz const* param_4, cXyz const* param_5, cXyz const* param_6, cXyz const* param_7, cXyz const* param_8, diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index 569098c43b..e905222717 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -935,15 +935,15 @@ void dScnLogo_c::setRenderMode() { dLog_HIO_c::~dLog_HIO_c() {} -static dScnLogo_Method l_dScnLogo_Method[5] = { - (dScnLogo_Method)dScnLogo_Create, - dScnLogo_Delete, - dScnLogo_Execute, - dScnLogo_IsDelete, - dScnLogo_Draw, +static scene_method_class l_dScnLogo_Method = { + (process_method_func)dScnLogo_Create, + (process_method_func)dScnLogo_Delete, + (process_method_func)dScnLogo_Execute, + (process_method_func)dScnLogo_IsDelete, + (process_method_func)dScnLogo_Draw, }; -extern scene_process_profile_definition g_profile_LOGO_SCENE = { +scene_process_profile_definition g_profile_LOGO_SCENE = { fpcLy_ROOT_e, 1, fpcPi_CURRENT_e, @@ -953,6 +953,6 @@ extern scene_process_profile_definition g_profile_LOGO_SCENE = { 0, 0, &g_fopScn_Method.base, - (process_method_class*)&l_dScnLogo_Method, + &l_dScnLogo_Method, NULL, }; diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index 6f8ef0d3f3..da6d9d5918 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -1988,7 +1988,7 @@ bool dScnMenu_setPlayerDebugModeDungeon() { myFontClass::~myFontClass() {} f32 myFontClass::drawChar_scale(f32 param_0, f32 param_1, f32 param_2, f32 param_3, int param_4, bool param_5) { - param_2; + UNUSED(param_2); if (param_4 < 0xFF) { return field_0x70.drawChar_scale(param_0, param_1, 8.75f, param_3, param_4, param_5); @@ -1997,13 +1997,13 @@ f32 myFontClass::drawChar_scale(f32 param_0, f32 param_1, f32 param_2, f32 param } } -static leafdraw_method_class l_dScnMenu_Method = { +static scene_method_class l_dScnMenu_Method = { (process_method_func)dScnMenu_Create, (process_method_func)dScnMenu_Delete, (process_method_func)dScnMenu_Execute, (process_method_func)dScnMenu_IsDelete, (process_method_func)dScnMenu_Draw, }; -extern scene_process_profile_definition g_profile_MENU_SCENE = { +scene_process_profile_definition g_profile_MENU_SCENE = { fpcLy_ROOT_e, // mLayerID 1, // mListID fpcPi_CURRENT_e, // mListPrio @@ -2013,10 +2013,10 @@ extern scene_process_profile_definition g_profile_MENU_SCENE = { 0, // mSizeOther 0, // mParameters &g_fopScn_Method.base, // sub_method - (process_method_class*)&l_dScnMenu_Method, // mpMtd + &l_dScnMenu_Method, // mpMtd }; #else -extern scene_process_profile_definition g_profile_MENU_SCENE = { +scene_process_profile_definition g_profile_MENU_SCENE = { fpcLy_ROOT_e, // mLayerID 1, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index 660e2c71a9..6ba2f9247b 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -322,13 +322,13 @@ static int dScnName_Create(scene_class* i_this) { return static_cast(i_this)->create(); } -static leafdraw_method_class l_dScnName_Method = { +static scene_method_class l_dScnName_Method = { (process_method_func)dScnName_Create, (process_method_func)dScnName_Delete, (process_method_func)dScnName_Execute, (process_method_func)dScnName_IsDelete, (process_method_func)dScnName_Draw, }; -extern scene_process_profile_definition g_profile_NAME_SCENE = { +scene_process_profile_definition g_profile_NAME_SCENE = { fpcLy_ROOT_e, 1, fpcPi_CURRENT_e, @@ -338,11 +338,11 @@ extern scene_process_profile_definition g_profile_NAME_SCENE = { 0, 0, &g_fopScn_Method.base, - (process_method_class*)&l_dScnName_Method, + &l_dScnName_Method, NULL, }; -extern scene_process_profile_definition g_profile_NAMEEX_SCENE = { +scene_process_profile_definition g_profile_NAMEEX_SCENE = { fpcLy_ROOT_e, 1, fpcPi_CURRENT_e, @@ -352,6 +352,6 @@ extern scene_process_profile_definition g_profile_NAMEEX_SCENE = { 0, 0, &g_fopScn_Method.base, - (process_method_class*)&l_dScnName_Method, + &l_dScnName_Method, NULL, }; diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 7187d0229d..1a9932d502 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -61,10 +61,8 @@ static OSTime resPreLoadTime1; static dScnPly_preLoad_HIO_c g_preLoadHIO; -/* 80451124 0001+00 data_80451124 None */ s8 dScnPly_c::pauseTimer; -/* 80451125 0003+00 nextPauseTimer__9dScnPly_c None */ s8 dScnPly_c::nextPauseTimer; s8 dScnPly_c::calcPauseTimer() { @@ -732,7 +730,7 @@ static void dScnPly_Create(scene_class* i_this) { dComLbG_PhaseHandler(&static_cast(i_this)->field_0x1c4, l_method, i_this); } -static leafdraw_method_class l_dScnPly_Method = { +static scene_method_class l_dScnPly_Method = { (process_method_func)dScnPly_Create, (process_method_func)dScnPly_Delete, (process_method_func)dScnPly_Execute, (process_method_func)dScnPly_IsDelete, (process_method_func)dScnPly_Draw, @@ -748,7 +746,7 @@ scene_process_profile_definition g_profile_PLAY_SCENE = { 0, // mSizeOther 0, // mParameters &g_fopScn_Method.base, // sub_method - (process_method_class*)&l_dScnPly_Method, // mpMtd + &l_dScnPly_Method, // mpMtd }; scene_process_profile_definition g_profile_OPENING_SCENE = { @@ -761,5 +759,5 @@ scene_process_profile_definition g_profile_OPENING_SCENE = { 0, // mSizeOther 0, // mParameters &g_fopScn_Method.base, // sub_method - (process_method_class*)&l_dScnPly_Method, // mpMtd + &l_dScnPly_Method, // mpMtd }; diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 46c4ac3b67..d74a86ab9a 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -417,7 +417,7 @@ static int dScnRoom_Create(scene_class* i_this) { return dComLbG_PhaseHandler(&room->field_0x1c4, l_method, i_this); } -static leafdraw_method_class l_dScnRoom_Method = { +static scene_method_class l_dScnRoom_Method = { (process_method_func)dScnRoom_Create, (process_method_func)dScnRoom_Delete, (process_method_func)dScnRoom_Execute, (process_method_func)dScnRoom_IsDelete, (process_method_func)dScnRoom_Draw, @@ -433,5 +433,5 @@ scene_process_profile_definition g_profile_ROOM_SCENE = { 0, // mSizeOther 0, // mParameters &g_fopScn_Method.base, // sub_method - (process_method_class*)&l_dScnRoom_Method, // mpMtd + &l_dScnRoom_Method, // mpMtd }; diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index c4d6fd1dc7..cf91ed7b17 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -9,7 +9,7 @@ #include "f_op/f_op_scene.h" #include "f_pc/f_pc_leaf.h" -extern scene_process_profile_definition g_profile_WARNING_SCENE = { +scene_process_profile_definition g_profile_WARNING_SCENE = { fpcLy_ROOT_e, // mLayerID 1, // mListID fpcPi_CURRENT_e, // mListPrio @@ -22,7 +22,7 @@ extern scene_process_profile_definition g_profile_WARNING_SCENE = { NULL, // mpMtd }; -extern scene_process_profile_definition g_profile_WARNING2_SCENE = { +scene_process_profile_definition g_profile_WARNING2_SCENE = { fpcLy_ROOT_e, // mLayerID 1, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index f5ecb91470..0395d351dc 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -285,8 +285,8 @@ void dSv_player_last_mark_info_c::setWarpItemData(const char* i_name, const cXyz mAngleY = i_angle; mRoomNo = i_roomNo; - (void)unk_4; - (void)unk_5; + UNUSED(unk_4); + UNUSED(unk_5); } void dSv_player_item_c::init() { diff --git a/src/d/d_shop_camera.cpp b/src/d/d_shop_camera.cpp index 449e38e449..c2a8f8a711 100644 --- a/src/d/d_shop_camera.cpp +++ b/src/d/d_shop_camera.cpp @@ -171,9 +171,6 @@ void ShopCam_action_c::move() { } } -/* 80196544-80196608 190E84 00C4+00 0/0 1/1 0/0 .text - * setCamDataIdx__16ShopCam_action_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyz - */ void ShopCam_action_c::setCamDataIdx(fopAc_ac_c* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3, fopAc_ac_c* param_4, cXyz* param_5, cXyz* param_6) { mCamDataIdx = -1; @@ -205,9 +202,6 @@ void ShopCam_action_c::setCamDataIdx(fopAc_ac_c* param_1, fopAc_ac_c* param_2, f _debugSetCamera(); } -/* 80196608-801966D4 190F48 00CC+00 0/0 1/1 0/0 .text - * setCamDataIdx2__16ShopCam_action_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyz - */ void ShopCam_action_c::setCamDataIdx2(fopAc_ac_c* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3, fopAc_ac_c* param_4, fopAc_ac_c* param_5, fopAc_ac_c* param_6, fopAc_ac_c* param_7, cXyz* param_8, cXyz* param_9) { diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index d323df4abf..cbb907c16d 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -1471,7 +1471,7 @@ dStage_objectNameInf* dStage_searchName(char const* objName) { } const char* dStage_getName(s16 procName, s8 argument) { - static char tmp_name[8]; + static char tmp_name[dStage_NAME_LENGTH]; dStage_objectNameInf* obj = l_objectName; char* tmp = NULL; @@ -1489,7 +1489,7 @@ const char* dStage_getName(s16 procName, s8 argument) { } if (tmp == NULL) { - snprintf(tmp_name, 8, "%d%+0d", procName, argument); + snprintf(tmp_name, dStage_NAME_LENGTH, "%d%+0d", procName, argument); tmp = tmp_name; } return tmp; @@ -1501,16 +1501,12 @@ const char* dStage_getName2(s16 procName, s8 argument) { u32 dStage_roomControl_c::mProcID; -/* 80450D64 0001+00 data_80450D64 None */ s8 dStage_roomControl_c::mStayNo; -/* 80450D65 0001+00 data_80450D65 None */ s8 dStage_roomControl_c::mOldStayNo; -/* 80450D66 0001+00 data_80450D66 None */ s8 dStage_roomControl_c::mNextStayNo; -/* 80450D67 0001+00 data_80450D67 None */ u8 dStage_roomControl_c::m_time_pass; u8 dStage_roomControl_c::mNoChangeRoom; @@ -2006,8 +2002,8 @@ static int dStage_rppnInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, } static int dStage_rpatInfoInit(dStage_dt_c* i_stage, void* i_data, int i_num, void* param_3) { - (void)i_num; - (void)param_3; + UNUSED(i_num); + UNUSED(param_3); dStage_dPath_c* pStagePath = (dStage_dPath_c*)((char*)i_data + 4); dPath* pPath = pStagePath->m_path; @@ -2087,8 +2083,8 @@ static int dStage_floorInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum } static int dStage_memaInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2, void* param_3) { - (void)param_2; - (void)param_3; + UNUSED(param_2); + UNUSED(param_3); dStage_MemoryMap_c* pd = (dStage_MemoryMap_c*)((char*)i_data + 4); i_stage->setMemoryMap(pd); @@ -2109,8 +2105,8 @@ static int dStage_memaInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2, } static int dStage_mecoInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2, void* param_3) { - (void)param_2; - (void)param_3; + UNUSED(param_2); + UNUSED(param_3); dStage_MemoryConfig_c* pd = (dStage_MemoryConfig_c*)((char*)i_data + 4); i_stage->setMemoryConfig(pd); @@ -2264,8 +2260,8 @@ static int dStage_layerTresureInit(dStage_dt_c* i_stage, void* i_data, int entry } static int dStage_dmapInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) { - (void)entryNum; - (void)param_3; + UNUSED(entryNum); + UNUSED(param_3); dStage_DMap_c* dmap = (dStage_DMap_c*)((char*)i_data + 4); i_stage->setDMap(dmap); return 1; diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 1a6ab89e9a..4bb87da478 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -1632,12 +1632,12 @@ static leafdraw_method_class l_dTimer_Method = { (process_method_func)dTimer_Draw, }; -extern msg_process_profile_definition g_profile_TIMER = { +msg_process_profile_definition g_profile_TIMER = { fpcLy_CURRENT_e, 12, fpcPi_CURRENT_e, PROC_TIMER, - (process_method_class*)&g_fpcLf_Method, + &g_fpcLf_Method.base, sizeof(dTimer_c), 0, 0, diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 7fa86e9728..7ad3bae85e 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -110,7 +110,7 @@ void print_error_check_c::check() { } if (mPrintErrors != print_errors) { - static char l_name[8]; + static char l_name[dStage_NAME_LENGTH]; fopAcM_getNameString(mpActor, l_name); OS_REPORT("\x1b[36m↑%s_SUBMETHOD %08x %08x %s %s\n\x1b[m", mName, mpActor, mpActor->base.base.name, fpcDbSv_getNameString(mpActor->base.base.name), l_name); @@ -119,7 +119,7 @@ void print_error_check_c::check() { if (mThresholdEnable) { OSTick tick_diff = tick - mTick; if (mTimeMs != 0 && tick_diff > OSMicrosecondsToTicks(mTimeMs)) { - static char l_name[8]; + static char l_name[dStage_NAME_LENGTH]; fopAcM_getNameString(mpActor, l_name); OSReport_Warning("%s_SUBMETHOD 処理時間ながすぎ %4d us [%s] %s\n", mName, OSTicksToMicroseconds(tick_diff), fpcDbSv_getNameString(mpActor->base.base.name), l_name); @@ -219,7 +219,7 @@ static int fopAc_Draw(void* i_this) { fapGm_HIO_c::startCpuTimer(); if (mDoCPd_c::getTrigB(PAD_1) && l_HIO.mBBtnInfoDisp) { - static char l_name[8]; + static char l_name[dStage_NAME_LENGTH]; fopAcM_getNameString(actor, l_name); OSReport("%7s %3d %5d x %10.2f y %10.2f z %10.2f\n", @@ -228,7 +228,7 @@ static int fopAc_Draw(void* i_this) { if (l_HIO.mActorNum == fopAcM_GetName(actor) && l_HIO.mStopDraw) { if (l_HIO.field_0x8 != l_HIO.mStopDraw) { - static char l_name[8]; + static char l_name[dStage_NAME_LENGTH]; fopAcM_getNameString(actor, l_name); OSReport("<%s> の描画を停止します\n", l_name); } @@ -271,11 +271,11 @@ static int fopAc_Draw(void* i_this) { } #if DEBUG - char sp38[40]; - char sp10[8]; - fopAcM_getNameString(actor, sp10); - sprintf(sp38, "%s（描画処理）", sp10); - fapGm_HIO_c::stopCpuTimer(sp38); + char message[40]; + char name[dStage_NAME_LENGTH]; + fopAcM_getNameString(actor, name); + sprintf(message, "%s（描画処理）", name); + fapGm_HIO_c::stopCpuTimer(message); #endif return ret; @@ -290,7 +290,7 @@ static int fopAc_Execute(void* i_this) { if (l_HIO.mActorNum == fopAcM_GetName(actor) && l_HIO.mStopExecute) { if (l_HIO.field_0x7 != l_HIO.mStopExecute) { - static char l_name[8]; + static char l_name[dStage_NAME_LENGTH]; fopAcM_getNameString(actor, l_name); OSReport("<%s> の処理を停止します\n", l_name); } @@ -307,7 +307,7 @@ static int fopAc_Execute(void* i_this) { if (!(-1.0e32f < actor->current.pos.x && actor->current.pos.x < 1.0e32f && -1.0e32f < actor->current.pos.y && actor->current.pos.y < 1.0e32f && -1.0e32f < actor->current.pos.z && actor->current.pos.z < 1.0e32f)) { - static char l_name[8]; + static char l_name[dStage_NAME_LENGTH]; fopAcM_getNameString(actor, l_name); OSReport("！！！<%s> が範囲外にいます！！！\n", l_name); } @@ -366,11 +366,11 @@ static int fopAc_Execute(void* i_this) { } #if DEBUG - char sp38[40]; - char sp10[8]; - fopAcM_getNameString(actor, sp10); - sprintf(sp38, "%s（計算処理）", sp10); - fapGm_HIO_c::stopCpuTimer(sp38); + char message[40]; + char name[dStage_NAME_LENGTH]; + fopAcM_getNameString(actor, name); + sprintf(message, "%s（計算処理）", name); + fapGm_HIO_c::stopCpuTimer(message); #endif return ret; @@ -629,7 +629,7 @@ void fopEn_enemy_c::drawBallModel(dKy_tevstr_c* i_tevstr) { } } -extern actor_method_class g_fopAc_Method = { +actor_method_class g_fopAc_Method = { (process_method_func)fopAc_Create, (process_method_func)fopAc_Delete, (process_method_func)fopAc_Execute, (process_method_func)fopAc_IsDelete, (process_method_func)fopAc_Draw, diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index e12a37fafe..e1d986fb65 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -2016,4 +2016,9 @@ bool fopAcM_wt_c::waterCheck(cXyz const* i_pos) { return false; } +BOOL fopAcM_getNameString(const fopAc_ac_c* i_actor, char* o_name) { + strcpy(o_name, dStage_getName(fopAcM_GetProfName(i_actor), i_actor->argument)); + return TRUE; +} + void fopAcM_initManager() {} diff --git a/src/f_op/f_op_scene.cpp b/src/f_op/f_op_scene.cpp index 9b37639502..68624b5548 100644 --- a/src/f_op/f_op_scene.cpp +++ b/src/f_op/f_op_scene.cpp @@ -11,16 +11,16 @@ static int fopScn_Draw(scene_class* i_this) { } static int fopScn_Execute(scene_class* i_this) { - return fpcMtd_Execute(i_this->submethod, i_this); + return fpcMtd_Execute((process_method_class*)i_this->submethod, i_this); } static int fopScn_IsDelete(void* i_this) { - return fpcMtd_IsDelete(static_cast(i_this)->submethod, i_this); + return fpcMtd_IsDelete((process_method_class*)static_cast(i_this)->submethod, i_this); } static int fopScn_Delete(void* i_this) { scene_class* scene = (scene_class*)i_this; - int ret = fpcMtd_Delete(scene->submethod, scene); + int ret = fpcMtd_Delete((process_method_class*)scene->submethod, scene); if (ret == 1) { fopScnTg_QueueTo(&scene->scene_tag); } @@ -42,7 +42,7 @@ static int fopScn_Create(void* i_this) { } } - return fpcMtd_Create(scene->submethod, i_this); + return fpcMtd_Create((process_method_class*)scene->submethod, i_this); } leafdraw_method_class g_fopScn_Method = { diff --git a/src/f_pc/f_pc_debug_sv.cpp b/src/f_pc/f_pc_debug_sv.cpp index 5d78ea3e22..52d89cfb31 100644 --- a/src/f_pc/f_pc_debug_sv.cpp +++ b/src/f_pc/f_pc_debug_sv.cpp @@ -8,7 +8,7 @@ int fpcBs_pc_c__print(base_process_class* i_process) { } void fpcBs_pc_c__fpcDbSv_callbackXX(void* i_process, char* arg1) { - arg1; + UNUSED(arg1); fpcBs_pc_c__print((base_process_class*)i_process); } diff --git a/src/f_pc/f_pc_layer.cpp b/src/f_pc/f_pc_layer.cpp index d376a64904..2c290c285d 100644 --- a/src/f_pc/f_pc_layer.cpp +++ b/src/f_pc/f_pc_layer.cpp @@ -34,7 +34,7 @@ s32 fpcLy_ToQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_cr } s32 fpcLy_QueueTo(layer_class* i_layer, create_tag_class* i_createTag) { - i_layer; + UNUSED(i_layer); int ret = cTg_SingleCutFromTree(i_createTag); return ret; diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp index 4a1479d1b7..07e593642c 100644 --- a/src/m_Do/m_Do_audio.cpp +++ b/src/m_Do/m_Do_audio.cpp @@ -18,9 +18,6 @@ #include #endif -/* 80450BB8 0001+00 data_80450BB8 None */ -/* 80450BB9 0001+00 data_80450BB9 None */ -/* 80450BBA 0002+00 data_80450BBA None */ bool mDoAud_zelAudio_c::mInitFlag; bool mDoAud_zelAudio_c::mResetFlag; diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index b1c6ab26ce..f8c2d65728 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -1060,9 +1060,6 @@ void mDoExt_morf_c::frameUpdate() { mFrameCtrl.update(); } -/* 8000FC4C-8000FD10 00A58C 00C4+00 0/0 0/0 34/34 .text - * __ct__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl - */ mDoExt_McaMorf::mDoExt_McaMorf(J3DModelData* modelData, mDoExt_McaMorfCallBack1_c* callback1, mDoExt_McaMorfCallBack2_c* callback2, J3DAnmTransform* anmTransform, int param_4, f32 param_5, int param_6, int param_7, int param_8, @@ -1079,9 +1076,6 @@ mDoExt_McaMorf::~mDoExt_McaMorf() { } } -/* 8000FD94-80010074 00A6D4 02E0+00 1/1 0/0 0/0 .text - * create__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl - */ int mDoExt_McaMorf::create(J3DModelData* modelData, mDoExt_McaMorfCallBack1_c* callback1, mDoExt_McaMorfCallBack2_c* callback2, J3DAnmTransform* anmTransform, int param_4, f32 param_5, int param_6, int param_7, int param_8, @@ -1320,9 +1314,6 @@ void mDoExt_McaMorf::getTransform(u16 param_0, J3DTransformInfo* param_1) { } } -/* 800107D0-80010888 00B110 00B8+00 0/0 2/2 222/222 .text - * __ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl - */ mDoExt_McaMorfSO::mDoExt_McaMorfSO(J3DModelData* param_0, mDoExt_McaMorfCallBack1_c* param_1, mDoExt_McaMorfCallBack2_c* param_2, J3DAnmTransform* param_3, int param_4, f32 param_5, int param_6, int param_7, @@ -1337,9 +1328,6 @@ mDoExt_McaMorfSO::~mDoExt_McaMorfSO() { stopZelAnime(); } -/* 800108F0-80010B68 00B230 0278+00 1/1 0/0 0/0 .text - * create__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl - */ int mDoExt_McaMorfSO::create(J3DModelData* i_modelData, mDoExt_McaMorfCallBack1_c* param_1, mDoExt_McaMorfCallBack2_c* param_2, J3DAnmTransform* param_3, int param_4, f32 param_5, int param_6, int param_7, @@ -1618,9 +1606,6 @@ void mDoExt_McaMorfSO::stopZelAnime() { } } -/* 80011348-800113FC 00BC88 00B4+00 0/0 0/0 1/1 .text - * __ct__15mDoExt_McaMorf2FP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformP15J3DAnmTransformifiiP10Z2CreatureUlUl - */ mDoExt_McaMorf2::mDoExt_McaMorf2(J3DModelData* param_0, mDoExt_McaMorfCallBack1_c* param_1, mDoExt_McaMorfCallBack2_c* param_2, J3DAnmTransform* param_3, J3DAnmTransform* param_4, int param_5, f32 param_6, int param_7, @@ -1633,9 +1618,6 @@ mDoExt_McaMorf2::~mDoExt_McaMorf2() { stopZelAnime(); } -/* 80011464-800116B4 00BDA4 0250+00 1/1 0/0 0/0 .text - * create__15mDoExt_McaMorf2FP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformP15J3DAnmTransformifiiP10Z2CreatureUlUl - */ int mDoExt_McaMorf2::create(J3DModelData* param_0, mDoExt_McaMorfCallBack1_c* param_1, mDoExt_McaMorfCallBack2_c* param_2, J3DAnmTransform* param_3, J3DAnmTransform* param_4, int param_5, f32 param_6, int param_7, diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 38f0b3dfb1..a34af824f4 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -266,10 +266,6 @@ GXColor mDoGph_gInf_c::mBackColor = {0, 0, 0, 0}; GXColor mDoGph_gInf_c::mFadeColor = {0, 0, 0, 0}; -/* 80450BE4 0001+00 data_80450BE4 None */ -/* 80450BE5 0001+00 data_80450BE5 None */ -/* 80450BE6 0001+00 mFade__13mDoGph_gInf_c None */ -/* 80450BE7 0001+00 data_80450BE7 None */ u8 mDoGph_gInf_c::mBlureFlag; u8 mDoGph_gInf_c::mBlureRate; @@ -1006,7 +1002,7 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_ } static void trimming(view_class* param_0, view_port_class* param_1) { - (void)param_0; + UNUSED(param_0); s16 y_orig = (int)param_1->y_orig & ~7; s16 y_orig_pos = y_orig < 0 ? 0 : y_orig; @@ -1275,8 +1271,8 @@ void mDoGph_gInf_c::bloom_c::draw() { } static void retry_captue_frame(view_class* param_0, view_port_class* param_1, int param_2) { - (void)param_0; - (void)param_2; + UNUSED(param_0); + UNUSED(param_2); s16 x_orig = (int)param_1->x_orig & 0xFFFFFFF8; s16 y_orig = (int)param_1->y_orig & 0xFFFFFFF8; diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 53f955b453..430bbadc9b 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -195,14 +195,12 @@ OSTime mDoMain::sPowerOnTime; OSTime mDoMain::sHungUpTime; -/* 80450B18 0001+00 data_80450B18 None */ static u8 mDisplayHeapSize; #if DEBUG static u8 mReportDisable; #endif -/* 80450B19 0001+00 data_80450B19 None */ static u8 mSelectHeapBar; #if DEBUG @@ -210,7 +208,6 @@ static u8 mVisibleHeapBar; static u8 mPrintFrameLine; #endif -/* 80450B1A 0002+00 data_80450B1A None */ static u8 mCheckHeap; #if DEBUG diff --git a/src/m_Do/m_Do_mtx.cpp b/src/m_Do/m_Do_mtx.cpp index 379e7f2a80..3b8bcd137e 100644 --- a/src/m_Do/m_Do_mtx.cpp +++ b/src/m_Do/m_Do_mtx.cpp @@ -23,7 +23,7 @@ static mDoMtx_stack_c mDoMtx_stack; static mDoMtx_quatStack_c mDoMtx_quatStack; -extern Mtx g_mDoMtx_identity = { +Mtx g_mDoMtx_identity = { {1.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 1.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 1.0f, 0.0f}, diff --git a/src/revolution/dvd/dvdidutils.c b/src/revolution/dvd/dvdidutils.c index e08209f021..ed6c815b83 100644 --- a/src/revolution/dvd/dvdidutils.c +++ b/src/revolution/dvd/dvdidutils.c @@ -17,7 +17,7 @@ static u32 strnlen(const char* str, u32 maxlen) { } int DVDCompareDiskID(const DVDDiskID* id1, const DVDDiskID* id2) { -#ifdef DEBUG +#if DEBUG const char* game1; const char* game2; const char* company1;