1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00

Enable more IDO warnings and apply fixes (#1264)

* Update asm-processor and fix includes with EARLY

* Enable more IDO warnings and disable unwanted warning 516

* Fix most new and remaining warnings

* Improve skelanime comment

* Improve asmproc pragma comment

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Add suggested comment for a wrong prototype

* Update asm-processor with the latest fix

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
This commit is contained in:
Roman971 2022-06-13 01:24:45 +02:00 committed by GitHub
parent 4cb1c3345f
commit feadb0d9ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 269 additions and 148 deletions

View file

@ -2038,7 +2038,7 @@ void BossVa_ZapperAttack(BossVa* this, PlayState* play) {
this->skelAnime.playSpeed = 0.0f;
if (Math_SmoothStepToF(&this->skelAnime.curFrame, 0.0f, 1.0f, 2.0f, 0.0f) == 0.0f) {
if (sp88 < sp90) {
if (sp88 < (u32)sp90) {
this->timer2 = 0;
this->burst++;
this->unk_1D8 = sp7C;

View file

@ -16,7 +16,8 @@ void DemoDu_Draw(Actor* thisx, PlayState* play);
static s32 sUnused = 0;
#include "z_demo_du_cutscene_data.c" EARLY
#pragma asmproc recurse
#include "z_demo_du_cutscene_data.c"
static void* sEyeTextures[] = { gDaruniaEyeOpenTex, gDaruniaEyeOpeningTex, gDaruniaEyeShutTex, gDaruniaEyeClosingTex };
static void* sMouthTextures[] = { gDaruniaMouthSeriousTex, gDaruniaMouthGrinningTex, gDaruniaMouthOpenTex,
@ -707,7 +708,7 @@ void DemoDu_InitCs_AfterGanon(DemoDu* this, PlayState* play) {
this->actor.shape.shadowAlpha = 0;
}
void DemoDu_CsPlaySfx_WhiteOut() {
void DemoDu_CsPlaySfx_WhiteOut(void) {
func_800788CC(NA_SE_SY_WHITE_OUT_T);
}

View file

@ -19,7 +19,7 @@ void DemoGt_Destroy(Actor* thisx, PlayState* play) {
}
}
void DemoGt_PlayEarthquakeSfx() {
void DemoGt_PlayEarthquakeSfx(void) {
func_800788CC(NA_SE_EV_EARTHQUAKE - SFX_FLAG);
}
@ -435,7 +435,7 @@ void func_8097ED64(DemoGt* this, PlayState* play, s32 actionIdx) {
func_8097E824(this, actionIdx);
}
u8 func_8097ED94() {
u8 func_8097ED94(void) {
if (kREG(2) != 0) {
return true;
} else if (gSaveContext.sceneSetupIndex < 4) {

View file

@ -72,7 +72,8 @@ static ColliderCylinderInitType1 sCylinderInit = {
{ 25, 80, 0, { 0, 0, 0 } },
};
#include "z_demo_im_cutscene_data.c" EARLY
#pragma asmproc recurse
#include "z_demo_im_cutscene_data.c"
static DemoImActionFunc sActionFuncs[] = {
func_809856F8, func_80985718, func_80985738, func_80985770, func_809857B0, func_809857F0, func_80985830,

View file

@ -71,7 +71,8 @@ static void* sMouthTextures[] = {
static u32 D_80990108 = 0;
#include "z_demo_sa_cutscene_data.c" EARLY
#pragma asmproc recurse
#include "z_demo_sa_cutscene_data.c"
static DemoSaActionFunc sActionFuncs[] = {
func_8098EBB8, func_8098EBD8, func_8098EBF8, func_8098EC28, func_8098EC60, func_8098EC94, func_8098ECCC,

View file

@ -155,7 +155,7 @@ void EnDs_OfferOddPotion(EnDs* this, PlayState* play) {
}
}
s32 EnDs_CheckRupeesAndBottle() {
s32 EnDs_CheckRupeesAndBottle(void) {
if (gSaveContext.rupees < 100) {
return 0;
} else if (Inventory_HasEmptyBottle() == 0) {

View file

@ -34,7 +34,7 @@ const ActorInit En_Eg_InitVars = {
(ActorFunc)EnEg_Draw,
};
void EnEg_PlayVoidOutSFX() {
void EnEg_PlayVoidOutSFX(void) {
func_800788CC(NA_SE_OC_ABYSS);
}

View file

@ -798,7 +798,7 @@ void EnFr_CheckOcarinaInputFrogSong(u8 ocarinaNote) {
}
}
void EnFr_DeactivateButterfly() {
void EnFr_DeactivateButterfly(void) {
s32 frogIndex;
EnFr* frog;

View file

@ -75,7 +75,7 @@ void EnHoll_SetupAction(EnHoll* this, EnHollActionFunc func) {
this->actionFunc = func;
}
s32 EnHoll_IsKokiriSetup8() {
s32 EnHoll_IsKokiriSetup8(void) {
return gSaveContext.entranceIndex == ENTR_SPOT04_0 && gSaveContext.sceneSetupIndex == 8;
}

View file

@ -42,7 +42,8 @@ const ActorInit En_Jj_InitVars = {
static s32 sUnused = 0;
#include "z_en_jj_cutscene_data.c" EARLY
#pragma asmproc recurse
#include "z_en_jj_cutscene_data.c"
static s32 sUnused2[] = { 0, 0 };

View file

@ -69,7 +69,7 @@ typedef enum {
/* 10 */ ENMD_ANIM_10,
/* 11 */ ENMD_ANIM_11,
/* 12 */ ENMD_ANIM_12,
/* 13 */ ENMD_ANIM_13,
/* 13 */ ENMD_ANIM_13
} EnMdAnimation;
static AnimationInfo sAnimationInfo[] = {

View file

@ -85,7 +85,8 @@ static void* sEyeTextures[] = {
static s32 D_80AB4318 = 0;
#include "z_en_nb_cutscene_data.c" EARLY
#pragma asmproc recurse
#include "z_en_nb_cutscene_data.c"
s32 EnNb_GetPath(EnNb* this) {
s32 path = this->actor.params >> 8;

View file

@ -105,7 +105,8 @@ static void* sMouthTextures[] = {
static s32 sUnused = 0;
#include "z_en_ru1_cutscene_data.c" EARLY
#pragma asmproc recurse
#include "z_en_ru1_cutscene_data.c"
static u32 D_80AF1938 = 0;

View file

@ -63,7 +63,8 @@ static void* sEyeTextures[] = {
static UNK_TYPE D_80AF4118 = 0;
#include "z_en_ru2_cutscene_data.c" EARLY
#pragma asmproc recurse
#include "z_en_ru2_cutscene_data.c"
static EnRu2ActionFunc sActionFuncs[] = {
func_80AF2CB4, func_80AF2CD4, func_80AF2CF4, func_80AF2D2C, func_80AF2D6C, func_80AF2DAC, func_80AF2DEC,
@ -379,7 +380,7 @@ void func_80AF2E1C(EnRu2* this, PlayState* play) {
this->actor.shape.shadowAlpha = 0;
}
void func_80AF2E64() {
void func_80AF2E64(void) {
func_800788CC(NA_SE_SY_WHITE_OUT_T);
}

View file

@ -160,7 +160,8 @@ void EnTp_Init(Actor* thisx, PlayState* play2) {
next = (EnTp*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_TP, this->actor.world.pos.x,
this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0 * i);
if (0 * i) {} // Very fake, but needed to get the s registers right
if ((0 * i) != 0) {} // Very fake, but needed to get the s registers right
if (next != NULL) {
now->actor.child = &next->actor;
next->actor.parent = &now->actor;
@ -176,7 +177,8 @@ void EnTp_Init(Actor* thisx, PlayState* play2) {
next->timer = next->unk_15C = i * -5;
next->horizontalVariation = 6.0f - (i * 0.75f);
now = next;
if (0 * i) {}
if ((0 * i) != 0) {}
}
}
} else if (this->actor.params == TAILPASARAN_TAIL) {

View file

@ -1360,7 +1360,7 @@ void func_80B3F3C8(EnXc* this, PlayState* play) {
this->action = SHEIK_ACTION_45;
}
void func_80B3F3D8() {
void func_80B3F3D8(void) {
func_800788CC(NA_SE_PL_SKIP);
}

View file

@ -113,6 +113,9 @@ void KaleidoScope_DrawPlayerWork(PlayState* play) {
BOOTS_EQUIP_TO_PLAYER(CUR_EQUIP_VALUE(EQUIP_TYPE_BOOTS)));
}
// Wrong prototype; this function is called with `play` even though it has no arguments
void KaleidoScope_ProcessPlayerPreRender(PlayState* play);
void KaleidoScope_DrawEquipment(PlayState* play) {
PauseContext* pauseCtx = &play->pauseCtx;
Input* input = &play->state.input[0];