mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
warnings
This commit is contained in:
@@ -108,7 +108,7 @@ endif
|
||||
|
||||
# Check code syntax with host compiler
|
||||
ifneq ($(RUN_CC_CHECK),0)
|
||||
CHECK_WARNINGS := -Wall -Wextra -Werror-implicit-function-declaration -Wno-unknown-pragmas -Wno-unused-parameter -Wno-unused-variable -Wno-missing-braces -Wno-unused-but-set-variable -Wno-unused-label -Wno-sign-compare -Wno-tautological-compare
|
||||
CHECK_WARNINGS := -Wall -Wextra -Werror-implicit-function-declaration -Wno-enum-compare -Wno-unknown-pragmas -Wno-unused-parameter -Wno-unused-variable -Wno-missing-braces -Wno-unused-but-set-variable -Wno-unused-label -Wno-sign-compare -Wno-tautological-compare
|
||||
CC_CHECK := gcc -fno-builtin -fsyntax-only -funsigned-char -fdiagnostics-color -std=gnu89 -D _LANGUAGE_C -D NON_MATCHING $(IINC) -nostdinc $(CHECK_WARNINGS)
|
||||
ifneq ($(WERROR), 0)
|
||||
CC_CHECK += -Werror
|
||||
@@ -130,7 +130,7 @@ ASFLAGS := -march=vr4300 -32 -Iinclude
|
||||
MIPS_VERSION := -mips2
|
||||
|
||||
# we support Microsoft extensions such as anonymous structs, which the compiler does support but warns for their usage. Suppress the warnings with -woff.
|
||||
CFLAGS += -G 0 -non_shared -fullwarn -verbose -Xcpluscomm $(IINC) -nostdinc -Wab,-r4300_mul -woff 649,838,712,516
|
||||
CFLAGS += -G 0 -non_shared -fullwarn -verbose -Xcpluscomm $(IINC) -nostdinc -Wab,-r4300_mul -woff 649,838,712,516,624
|
||||
|
||||
# Use relocations and abi fpr names in the dump
|
||||
OBJDUMP_FLAGS := --disassemble --reloc --disassemble-zeroes -Mreg-names=32
|
||||
|
||||
@@ -1606,7 +1606,7 @@ void Boss07_Wrath_Grab(Boss07* this, PlayState* play) {
|
||||
}
|
||||
|
||||
void Boss07_Wrath_GrabPlayer(Boss07* this, PlayState* play) {
|
||||
s32 sp2C;
|
||||
PlayerImpactType sp2C;
|
||||
Player* player = GET_PLAYER(play);
|
||||
|
||||
SkelAnime_Update(&this->skelAnime);
|
||||
@@ -1632,7 +1632,7 @@ void Boss07_Wrath_ThrowPlayer(Boss07* this, PlayState* play) {
|
||||
Player* player = GET_PLAYER(play);
|
||||
f32 phi_f0;
|
||||
f32 phi_f2;
|
||||
s32 sp30;
|
||||
PlayerImpactType sp30;
|
||||
|
||||
SkelAnime_Update(&this->skelAnime);
|
||||
this->whipCollisionTimer = 20;
|
||||
@@ -1867,7 +1867,7 @@ void Boss07_Wrath_Damaged(Boss07* this, PlayState* play) {
|
||||
|
||||
void Boss07_Wrath_WhipCollisionCheck(Vec3f* whipPos, f32 tension, Boss07* this, PlayState* play) {
|
||||
s32 i;
|
||||
s32 sp98 = -1;
|
||||
PlayerImpactType sp98 = -1;
|
||||
Player* player = GET_PLAYER(play);
|
||||
f32 dx;
|
||||
f32 dy;
|
||||
@@ -3199,7 +3199,7 @@ void Boss07_Incarnation_SetupRun(Boss07* this, PlayState* play) {
|
||||
void Boss07_Incarnation_Run(Boss07* this, PlayState* play) {
|
||||
f32 sp34;
|
||||
f32 sp30;
|
||||
s32 sp2C;
|
||||
PlayerImpactType sp2C;
|
||||
|
||||
Actor_PlaySfx(&this->actor, NA_SE_EN_LAST2_WALK_OLD - SFX_FLAG);
|
||||
this->timer_AB40++;
|
||||
@@ -5747,7 +5747,7 @@ void Boss07_Top_Collide(Boss07* this, PlayState* play) {
|
||||
}
|
||||
|
||||
void Boss07_Top_CollisionCheck(Boss07* this, PlayState* play) {
|
||||
s32 sp3C;
|
||||
PlayerImpactType sp3C;
|
||||
s32 sp38 = false;
|
||||
Player* player = GET_PLAYER(play);
|
||||
s32 pad[3];
|
||||
|
||||
@@ -46,9 +46,9 @@ void DemoMoonend_Init(Actor* thisx, PlayState* play) {
|
||||
this->actionFunc = func_80C17B60;
|
||||
} else {
|
||||
Actor_SetScale(&this->actor, 0.095f);
|
||||
func_80183430(&this->skeletonInfo, &object_moonend_Blob_00B5A0, &object_moonend_Blob_001214, this->jointTable,
|
||||
func_80183430(&this->skeletonInfo, (void*)object_moonend_Blob_00B5A0, (void*)object_moonend_Blob_001214, this->jointTable,
|
||||
this->morphTable, NULL);
|
||||
func_801834A8(&this->skeletonInfo, &object_moonend_Blob_001214);
|
||||
func_801834A8(&this->skeletonInfo, (void*)object_moonend_Blob_001214);
|
||||
this->cueType = CS_CMD_ACTOR_CUE_560;
|
||||
this->actionFunc = func_80C17C48;
|
||||
this->actor.home.rot.z = 0;
|
||||
@@ -110,13 +110,13 @@ void func_80C17C48(DemoMoonend* this, PlayState* play) {
|
||||
switch (this->cueId) {
|
||||
case 1:
|
||||
this->actor.draw = DemoMoonend_Draw;
|
||||
func_801834A8(&this->skeletonInfo, &object_moonend_Blob_001214);
|
||||
func_801834A8(&this->skeletonInfo, (void*)object_moonend_Blob_001214);
|
||||
this->skeletonInfo.frameCtrl.unk_C = 0.0f;
|
||||
break;
|
||||
|
||||
case 2:
|
||||
this->actor.draw = DemoMoonend_Draw;
|
||||
func_801834A8(&this->skeletonInfo, &object_moonend_Blob_001214);
|
||||
func_801834A8(&this->skeletonInfo, (void*)object_moonend_Blob_001214);
|
||||
this->skeletonInfo.frameCtrl.unk_C = 2.0f / 3.0f;
|
||||
Actor_PlaySfx(&this->actor, NA_SE_EV_MOON_EXPLOSION);
|
||||
this->actor.home.rot.z = 1;
|
||||
@@ -166,7 +166,7 @@ void DemoMoonend_Update(Actor* thisx, PlayState* play) {
|
||||
this->actionFunc(this, play);
|
||||
}
|
||||
|
||||
s32 func_80C17E70(PlayState* play, SkeletonInfo* skeletonInfo, s32 limbIndex, Gfx** dList, u8* flags, Actor* thisx,
|
||||
s32 func_80C17E70(PlayState* play, SkeletonInfo* skeletonInfo, s32 limbIndex, Gfx** dList, u8* flags, void* thisx,
|
||||
Vec3f* scale, Vec3s* rot, Vec3f* pos) {
|
||||
DemoMoonend* this = THIS;
|
||||
|
||||
@@ -178,7 +178,7 @@ s32 func_80C17E70(PlayState* play, SkeletonInfo* skeletonInfo, s32 limbIndex, Gf
|
||||
return true;
|
||||
}
|
||||
|
||||
s32 func_80C17EE0(PlayState* play, SkeletonInfo* skeleton, s32 limbIndex, Gfx** dList, u8* flags, Actor* thisx,
|
||||
s32 func_80C17EE0(PlayState* play, SkeletonInfo* skeleton, s32 limbIndex, Gfx** dList, u8* flags, void* thisx,
|
||||
Vec3f* scale, Vec3s* rot, Vec3f* pos) {
|
||||
DemoMoonend* this = THIS;
|
||||
|
||||
@@ -208,7 +208,7 @@ void func_80C17FCC(Actor* thisx, PlayState* play) {
|
||||
OPEN_DISPS(play->state.gfxCtx);
|
||||
|
||||
Gfx_SetupDL25_Xlu(play->state.gfxCtx);
|
||||
AnimatedMat_DrawXlu(play, Lib_SegmentedToVirtual(object_moonend_Matanimheader_0129F0));
|
||||
AnimatedMat_DrawXlu(play, Lib_SegmentedToVirtual((void*)object_moonend_Matanimheader_0129F0));
|
||||
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(POLY_XLU_DISP++, object_moonend_DL_010C40);
|
||||
|
||||
|
||||
@@ -73,9 +73,9 @@ void DemoSyoten_Init(Actor* thisx, PlayState* play) {
|
||||
|
||||
switch (DEMOSYOTEN_GET_F(&this->actor)) {
|
||||
case DEMOSYOTEN_F_0:
|
||||
func_80183430(&this->unk_144, &object_syoten_Blob_001328, &object_syoten_Blob_00023C, this->unk_174,
|
||||
func_80183430(&this->unk_144, (void*)object_syoten_Blob_001328, (void*)object_syoten_Blob_00023C, this->unk_174,
|
||||
this->unk_2A6, NULL);
|
||||
func_801835EC(&this->unk_144, &object_syoten_Blob_00023C);
|
||||
func_801835EC(&this->unk_144, (void*)object_syoten_Blob_00023C);
|
||||
this->actor.draw = NULL;
|
||||
this->actionFunc = func_80C16A74;
|
||||
this->actor.child =
|
||||
|
||||
@@ -15,7 +15,7 @@ typedef struct EnDnh {
|
||||
/* 0x144 */ EnDnhActionFunc actionFunc;
|
||||
/* 0x148 */ SkelAnime skelAnime;
|
||||
/* 0x18C */ u16 unk18C;
|
||||
/* 0x190 */ s32* msgEventScript;
|
||||
/* 0x190 */ MsgScript* msgEventScript;
|
||||
/* 0x194 */ s32 unk194;
|
||||
/* 0x198 */ s16 unk198;
|
||||
/* 0x19A */ UNK_TYPE1 pad19A[0x2];
|
||||
|
||||
@@ -35,10 +35,10 @@ void EnFall2_Init(Actor* thisx, PlayState* play) {
|
||||
|
||||
Actor_SetScale(&this->actor, 1.0f);
|
||||
this->actionFunc = EnFall2_DoNothing;
|
||||
func_80183430(&this->skeletonInfo, object_fall2_Blob_008898, object_fall2_Blob_005EF4, this->unk174, this->unk228,
|
||||
func_80183430(&this->skeletonInfo, (void*)object_fall2_Blob_008898, (void*)object_fall2_Blob_005EF4, this->unk174, this->unk228,
|
||||
NULL);
|
||||
func_801835EC(&this->skeletonInfo, object_fall2_Blob_005EF4);
|
||||
this->unk2DC = Lib_SegmentedToVirtual(object_fall2_Matanimheader_008840);
|
||||
func_801835EC(&this->skeletonInfo, (void*)object_fall2_Blob_005EF4);
|
||||
this->unk2DC = Lib_SegmentedToVirtual((void*)object_fall2_Matanimheader_008840);
|
||||
Actor_SetScale(&this->actor, 0.02f);
|
||||
this->actionFunc = EnFall2_HandleCutscene;
|
||||
this->cueType = CS_CMD_ACTOR_CUE_561;
|
||||
|
||||
@@ -33,7 +33,7 @@ typedef struct EnGm {
|
||||
/* 0x260 */ s8 unk_260;
|
||||
/* 0x261 */ s8 unk_261;
|
||||
/* 0x262 */ s8 objectSlot;
|
||||
/* 0x264 */ s32* unk_264;
|
||||
/* 0x264 */ MsgScript* unk_264;
|
||||
/* 0x268 */ Actor* unk_268;
|
||||
/* 0x26C */ UNK_TYPE1 unk_26C[0xC];
|
||||
/* 0x278 */ Vec3f unk_278;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user