mirror of https://github.com/zeldaret/tp.git
Add UNUSED macro for matching debug parameters
This commit is contained in:
parent
594564028a
commit
79dd53d0b5
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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); }
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -528,8 +528,8 @@ u32 Z2SoundObjAnime::getSoundID(const JAUSoundAnimationSound* animationSound,
|
|||
|
||||
bool Z2SoundObjAnime::playsSound(const JAUSoundAnimationSound* animationSound,
|
||||
const JGeometry::TVec3<f32>& 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) {
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -150,7 +150,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 +219,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 +1942,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<npc_ks_class*>(i_actor)->set_id == 0) {
|
||||
return i_actor;
|
||||
|
|
@ -1952,7 +1952,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<obj_brg_class*>(i_actor)->field_0xaef4 = VREG_F(11) + 500.0f;
|
||||
|
|
@ -1963,7 +1963,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<obj_brg_class*>(i_actor)->mType &= ~0x4 & 0xFFFFFFFB;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -642,7 +642,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 +650,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 +658,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))))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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<daObjKWheel00_c*>(param_0);
|
||||
if(kWheel00->getType() == daObjKWheel00_c::TYPE_LARGE_GOLD) {
|
||||
return kWheel00;
|
||||
return param_0;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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<dBgW::PushPullLabel>(
|
||||
pp_label, (dBgW::PushPullLabel)(dBgW::PPLABEL_PUSH | dBgW::PPLABEL_PULL));
|
||||
|
|
|
|||
|
|
@ -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)) {
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -8922,7 +8922,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)();
|
||||
|
|
|
|||
|
|
@ -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()) {
|
||||
|
|
|
|||
|
|
@ -3182,7 +3182,7 @@ static void cLib_addCalcU8(u8* i_value, u8 i_target, s16 i_scale, s16 i_maxStep)
|
|||
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 +8511,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 +8531,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 +8570,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();
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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() {
|
||||
|
|
|
|||
|
|
@ -2006,8 +2006,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 +2087,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 +2109,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 +2264,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;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -1006,7 +1006,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 +1275,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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue