diff --git a/Makefile b/Makefile index 2d4efa49a8..4786ce2b3c 100644 --- a/Makefile +++ b/Makefile @@ -214,7 +214,6 @@ ifeq ($(NON_MATCHING),1) COMPARE := 0 endif -PROJECT_DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) BUILD_DIR := build/$(VERSION) EXPECTED_DIR := expected/$(BUILD_DIR) BASEROM_DIR := baseroms/$(VERSION) diff --git a/assets/xml/objects/object_link_boy.xml b/assets/xml/objects/object_link_boy.xml index eab6ae3ab9..20fbfbf3c5 100644 --- a/assets/xml/objects/object_link_boy.xml +++ b/assets/xml/objects/object_link_boy.xml @@ -553,7 +553,7 @@ - + diff --git a/include/collision_check.h b/include/collision_check.h index d3d756abcc..2e486d83d9 100644 --- a/include/collision_check.h +++ b/include/collision_check.h @@ -381,7 +381,7 @@ typedef struct CollisionCheckContext { #define ATELEM_HIT (1 << 1) // Had an AT collision #define ATELEM_NEAREST (1 << 2) // For COLSHAPE_QUAD colliders, only collide with the closest AC element #define ATELEM_SFX_MASK (3 << 3) -#define ATELEM_SFX_NORMAL (0 << 3) // Hit sound effect based on AC collider's type +#define ATELEM_SFX_NORMAL (0 << 3) // Hit sound effect based on AC collider's material #define ATELEM_SFX_HARD (1 << 3) // Always uses hard deflection sound #define ATELEM_SFX_WOOD (2 << 3) // Always uses wood deflection sound #define ATELEM_SFX_NONE (3 << 3) // No hit sound effect diff --git a/include/game_over.h b/include/game_over.h index e91ad0413a..2d3d4ebcc4 100644 --- a/include/game_over.h +++ b/include/game_over.h @@ -6,11 +6,11 @@ struct PlayState; typedef enum GameOverState { - /* 00 */ GAMEOVER_INACTIVE, - /* 01 */ GAMEOVER_DEATH_START, - /* 02 */ GAMEOVER_DEATH_WAIT_GROUND, // wait for link to fall and hit the ground - /* 03 */ GAMEOVER_DEATH_DELAY_MENU, // wait for 1 second before showing the game over menu - /* 04 */ GAMEOVER_DEATH_MENU, // do nothing while kaleidoscope handles the game over menu + /* 0 */ GAMEOVER_INACTIVE, + /* 1 */ GAMEOVER_DEATH_START, + /* 2 */ GAMEOVER_DEATH_WAIT_GROUND, // wait for link to fall and hit the ground + /* 3 */ GAMEOVER_DEATH_DELAY_MENU, // wait for 1 second before showing the game over menu + /* 4 */ GAMEOVER_DEATH_MENU, // do nothing while kaleidoscope handles the game over menu /* 20 */ GAMEOVER_REVIVE_START = 20, /* 21 */ GAMEOVER_REVIVE_RUMBLE, /* 22 */ GAMEOVER_REVIVE_WAIT_GROUND, // wait for link to fall and hit the ground diff --git a/include/ultra64/gu.h b/include/ultra64/gu.h index d0548b3a8d..19be1a1a92 100644 --- a/include/ultra64/gu.h +++ b/include/ultra64/gu.h @@ -5,7 +5,9 @@ #define GU_PI 3.1415926 +#ifndef FTOFIX32 #define FTOFIX32(x) (s32)((x) * (f32)0x00010000) +#endif #define FIX32TOF(x) ((f32)(x) * (1.0f / (f32)0x00010000)) #define ROUND(x) (s32)(((x) >= 0.0) ? ((x) + 0.5) : ((x) - 0.5)) diff --git a/src/audio/game/general.c b/src/audio/game/general.c index 2e58289d27..cf64eefe6a 100644 --- a/src/audio/game/general.c +++ b/src/audio/game/general.c @@ -2714,7 +2714,7 @@ void Audio_SetSfxProperties(u8 bankId, u8 entryIdx, u8 channelIndex) { sSfxChannelState[channelIndex].freqScale = freqScale; } - //! @bug: comparing a `u8` to an `s8`. if the most significant bit is set, + //! @bug comparing a `u8` to an `s8`. if the most significant bit is set, //! it'll always pass because the s8 value will be <0 and the u8 value is always >=0 if (stereoBits != sSfxChannelState[channelIndex].stereoBits) { AUDIOCMD_CHANNEL_SET_STEREO(SEQ_PLAYER_SFX, channelIndex, stereoBits | 0x10); diff --git a/src/audio/internal/seqplayer.c b/src/audio/internal/seqplayer.c index 7ddf12d4bd..fe3cb7332d 100644 --- a/src/audio/internal/seqplayer.c +++ b/src/audio/internal/seqplayer.c @@ -1565,7 +1565,7 @@ void AudioSeq_SequenceChannelProcessScript(SequenceChannel* channel) { case ASEQ_OP_CHAN_DYNCALL: if (scriptState->value != -1) { data = (*channel->dynTable)[scriptState->value]; - //! @bug: Missing a stack depth check here + //! @bug Missing a stack depth check here scriptState->stack[scriptState->depth++] = scriptState->pc; cmdArgU16 = (u16)((data[0] << 8) + data[1]); scriptState->pc = seqPlayer->seqData + cmdArgU16; @@ -1588,7 +1588,7 @@ void AudioSeq_SequenceChannelProcessScript(SequenceChannel* channel) { channel->panChannelWeight = *data++; channel->targetReverbVol = *data++; channel->reverbIndex = *data++; - //! @bug: Not marking reverb state as changed + //! @bug Not marking reverb state as changed channel->changes.s.pan = true; break; @@ -1602,7 +1602,7 @@ void AudioSeq_SequenceChannelProcessScript(SequenceChannel* channel) { channel->panChannelWeight = AudioSeq_ScriptReadU8(scriptState); channel->targetReverbVol = AudioSeq_ScriptReadU8(scriptState); channel->reverbIndex = AudioSeq_ScriptReadU8(scriptState); - //! @bug: Not marking reverb state as changed + //! @bug Not marking reverb state as changed channel->changes.s.pan = true; break; diff --git a/src/audio/internal/thread.c b/src/audio/internal/thread.c index 74da389b05..d6375a2dfc 100644 --- a/src/audio/internal/thread.c +++ b/src/audio/internal/thread.c @@ -52,12 +52,12 @@ AudioTask* AudioThread_UpdateImpl(void) { s32 i; gAudioCtx.totalTaskCount++; - if (gAudioCtx.totalTaskCount % (gAudioCtx.audioBufferParameters.specUnk4) != 0) { + if ((gAudioCtx.totalTaskCount % gAudioCtx.audioBufferParameters.specUnk4) != 0) { if (gAudioCustomUpdateFunction != NULL) { gAudioCustomUpdateFunction(); } - if ((gAudioCtx.totalTaskCount % gAudioCtx.audioBufferParameters.specUnk4) + 1 == + if (((gAudioCtx.totalTaskCount % gAudioCtx.audioBufferParameters.specUnk4) + 1) == gAudioCtx.audioBufferParameters.specUnk4) { return sWaitingAudioTask; } else { @@ -758,7 +758,7 @@ void AudioThread_ProcessChannelCmd(SequenceChannel* channel, AudioCmd* cmd) { break; case AUDIOCMD_OP_CHANNEL_SET_PAN_WEIGHT: - //! @bug: Should compare `asSbyte` to `panChannelWeight` + //! @bug Should compare `asSbyte` to `panChannelWeight` if (channel->newPan != cmd->asSbyte) { channel->panChannelWeight = cmd->asSbyte; channel->changes.s.pan = true; diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index 5f41973ffe..0287a64e2b 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -636,7 +636,7 @@ s32 Math3D_PointRelativeToCubeVertices(Vec3f* point, Vec3f* min, Vec3f* max) { ret |= 0x10; } - //! @bug: The next 2 conditions are the same check. + //! @bug The next 2 conditions are the same check. if ((-min->x - min->y + max->z) < (-point->x - point->y + point->z)) { ret |= 0x20; } @@ -996,7 +996,7 @@ s32 Math3D_TriChkPointParaYImpl(Vec3f* v0, Vec3f* v1, Vec3f* v2, f32 z, f32 x, f } if (fabsf(ny) > 0.5f) { - // Do a check on each face of the triangle, if the point is within `chkDist` units return true. + // Do a check on each edge of the triangle, if the point is within `chkDist` units return true. if (Math3D_PointDistSqToLine2D(z, x, v0->z, v0->x, v1->z, v1->x, &distToEdgeSq) && (distToEdgeSq < chkDistSq)) { return true; } diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index 0cd8ab9e23..22dbe31ffb 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -326,7 +326,7 @@ void CollisionPoly_GetVerticesByBgId(CollisionPoly* poly, s32 bgId, CollisionCon PRINTF_RST(); if (dest != NULL) { - //! @bug: dest[2] x and y are not set to 0 + //! @bug dest[2] x and y are not set to 0 dest[0].x = dest[0].y = dest[0].z = dest[1].x = dest[1].y = dest[1].z = dest[2].z = 0.0f; } } else { diff --git a/src/code/z_camera.c b/src/code/z_camera.c index bce3057885..f5d88d806d 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -479,15 +479,15 @@ s32 func_80043F94(Camera* camera, Vec3f* from, CamColChk* to) { to->pos.x = to->norm.x + toNewPos.x; to->pos.y = to->norm.y + toNewPos.y; to->pos.z = to->norm.z + toNewPos.z; - } else if (playerFloorPoly != NULL) { - playerFloorNormF.x = COLPOLY_GET_NORMAL(playerFloorPoly->normal.x); - playerFloorNormF.y = COLPOLY_GET_NORMAL(playerFloorPoly->normal.y); - playerFloorNormF.z = COLPOLY_GET_NORMAL(playerFloorPoly->normal.z); - if (Math3D_LineSegVsPlane(playerFloorNormF.x, playerFloorNormF.y, playerFloorNormF.z, playerFloorPoly->dist, + } else if (sPlayerFloorPoly != NULL) { + playerFloorNormF.x = COLPOLY_GET_NORMAL(sPlayerFloorPoly->normal.x); + playerFloorNormF.y = COLPOLY_GET_NORMAL(sPlayerFloorPoly->normal.y); + playerFloorNormF.z = COLPOLY_GET_NORMAL(sPlayerFloorPoly->normal.z); + if (Math3D_LineSegVsPlane(playerFloorNormF.x, playerFloorNormF.y, playerFloorNormF.z, sPlayerFloorPoly->dist, from, &toPos, &toNewPos, 1)) { // line is from->to is touching the poly the player is on. to->norm = playerFloorNormF; - to->poly = playerFloorPoly; + to->poly = sPlayerFloorPoly; to->bgId = camera->bgId; to->pos.x = to->norm.x + toNewPos.x; to->pos.y = to->norm.y + toNewPos.y; @@ -8080,13 +8080,13 @@ Vec3s Camera_Update(Camera* camera) { pos = curPlayerPosRot.pos; pos.y += Player_GetHeight(camera->player); - playerGroundY = BgCheck_EntityRaycastDown5(camera->play, &camera->play->colCtx, &playerFloorPoly, &bgId, + playerGroundY = BgCheck_EntityRaycastDown5(camera->play, &camera->play->colCtx, &sPlayerFloorPoly, &bgId, &camera->player->actor, &pos); if (playerGroundY != BGCHECK_Y_MIN) { // player is above ground. - camera->floorNorm.x = COLPOLY_GET_NORMAL(playerFloorPoly->normal.x); - camera->floorNorm.y = COLPOLY_GET_NORMAL(playerFloorPoly->normal.y); - camera->floorNorm.z = COLPOLY_GET_NORMAL(playerFloorPoly->normal.z); + camera->floorNorm.x = COLPOLY_GET_NORMAL(sPlayerFloorPoly->normal.x); + camera->floorNorm.y = COLPOLY_GET_NORMAL(sPlayerFloorPoly->normal.y); + camera->floorNorm.z = COLPOLY_GET_NORMAL(sPlayerFloorPoly->normal.z); camera->bgId = bgId; camera->playerGroundY = playerGroundY; sOOBTimer = 0; @@ -8114,7 +8114,7 @@ Vec3s Camera_Update(Camera* camera) { !(camera->stateFlags & CAM_STATE_BLOCK_BG) && (!(camera->stateFlags & CAM_STATE_PLAYER_IN_WATER) || (player->currentBoots == PLAYER_BOOTS_IRON)) && !(camera->stateFlags & CAM_STATE_PLAYER_DIVING) && (playerGroundY != BGCHECK_Y_MIN)) { - bgCamIndex = Camera_GetBgCamIndex(camera, &bgId, playerFloorPoly); + bgCamIndex = Camera_GetBgCamIndex(camera, &bgId, sPlayerFloorPoly); if (bgCamIndex != -1) { camera->nextBgId = bgId; if (bgId == BGCHECK_SCENE) { @@ -8619,12 +8619,12 @@ s32 Camera_RequestBgCam(Camera* camera, s32 requestedBgCamIndex) { settingChangeSuccessful = Camera_RequestSettingImpl(camera, requestedCamSetting, CAM_REQUEST_SETTING_PRESERVE_BG_CAM_INDEX | CAM_REQUEST_SETTING_FORCE_CHANGE) >= 0; - if ((settingChangeSuccessful != CAM_SET_NONE) || (sCameraSettings[camera->setting].unk_00 & 0x80000000)) { + if (settingChangeSuccessful || (sCameraSettings[camera->setting].unk_00 & 0x80000000)) { camera->bgCamIndex = requestedBgCamIndex; camera->behaviorFlags |= CAM_BEHAVIOR_BG_SUCCESS; Camera_CopyDataToRegs(camera, camera->mode); } else if (settingChangeSuccessful < -1) { - //! @bug: `settingChangeSuccessful` is a bool and is likely checking the wrong value. This can never pass. + //! @bug `settingChangeSuccessful` is a bool and is likely checking the wrong value. This can never pass. //! The actual return of Camera_RequestSettingImpl or bgCamIndex would make more sense. PRINTF(VT_COL(RED, WHITE) "camera: error: illegal camera ID (%d) !! (%d|%d|%d)\n" VT_RST, requestedBgCamIndex, camera->camId, BGCHECK_SCENE, requestedCamSetting); diff --git a/src/code/z_camera_data.inc.c b/src/code/z_camera_data.inc.c index 82d1dd619a..c2364b76eb 100644 --- a/src/code/z_camera_data.inc.c +++ b/src/code/z_camera_data.inc.c @@ -2687,4 +2687,4 @@ PlayState* D_8015BD7C; DebugCam D_8015BD80; #endif -CollisionPoly* playerFloorPoly; +CollisionPoly* sPlayerFloorPoly; diff --git a/src/code/z_room.c b/src/code/z_room.c index 729eec25fa..164ccd8d60 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -636,7 +636,7 @@ u32 Room_SetupFirstRoom(PlayState* play, RoomContext* roomCtx) { } } - // If there any rooms are connected, find their combined size and update roomBufferSize if larger + // If there are any connected rooms, find their combined size and update roomBufferSize if larger if ((u32)play->transitionActors.count != 0) { RomFile* roomList = play->roomList.romFiles; TransitionActorEntry* transitionActor = &play->transitionActors.list[0]; diff --git a/src/libc64/__osMalloc_gc.c b/src/libc64/__osMalloc_gc.c index d6e4e17d13..d18647689f 100644 --- a/src/libc64/__osMalloc_gc.c +++ b/src/libc64/__osMalloc_gc.c @@ -866,7 +866,7 @@ s32 __osCheckArena(Arena* arena) { arena); iter = arena->head; while (iter != NULL) { - //! @bug: Probably intended to be `!NODE_IS_VALID(iter)` + //! @bug Probably intended to be `!NODE_IS_VALID(iter)` if (NODE_IS_VALID(iter)) { #if DEBUG_FEATURES osSyncPrintf(VT_COL(RED, WHITE) T("おおっと！！ (%08x %08x)\n", "Oops!! (%08x %08x)\n") VT_RST, iter, diff --git a/src/libultra/io/epidma.c b/src/libultra/io/epidma.c index f2a073cb48..5430e91628 100644 --- a/src/libultra/io/epidma.c +++ b/src/libultra/io/epidma.c @@ -15,7 +15,7 @@ s32 osEPiStartDma(OSPiHandle* handle, OSIoMesg* mb, s32 direction) { mb->hdr.type = 0x10; } - if (mb->hdr.pri == 1) { + if (mb->hdr.pri == OS_MESG_PRI_HIGH) { ret = osJamMesg(osPiGetCmdQueue(), (OSMesg)mb, OS_MESG_NOBLOCK); } else { ret = osSendMesg(osPiGetCmdQueue(), (OSMesg)mb, OS_MESG_NOBLOCK); diff --git a/src/n64dd/n64dd_801C9B70.c b/src/n64dd/n64dd_801C9B70.c index 79f205c777..d11a7b13f8 100644 --- a/src/n64dd/n64dd_801C9B70.c +++ b/src/n64dd/n64dd_801C9B70.c @@ -100,7 +100,7 @@ void func_801C9D54(u8* buf, s32 number) { void func_801C9DB8(u8* arg0, s32 errorNum) { u8* errorHeader = (u8*)func_801C9CA4(); - //! @bug: both of these functions will write to the pointer target, but errorHeader points to a string literal, + //! @bug both of these functions will write to the pointer target, but errorHeader points to a string literal, //! which is meant to be const. if (gCurrentRegion == 1) { func_801C9CD4(&errorHeader[12], errorNum); diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c index f2218398ae..3c096343bc 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c +++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c @@ -261,13 +261,14 @@ void BgHakaZou_SpawnRubbleParticles(BgHakaZou* this, PlayState* play) { fragmentPos.y = this->collider.dim.pos.y; fragmentPos.z = this->collider.dim.pos.z; - EffectSsHahen_SpawnBurst(play, &fragmentPos, 10.0f, 0, 10, 10, 4, 141, 40, gBotwBombableRubbleDL); + EffectSsHahen_SpawnBurst(play, &fragmentPos, 10.0f, 0, 10, 10, 4, OBJECT_HAKACH_OBJECTS, 40, gBotwBombableRubbleDL); for (i = 0; i < 2; i++) { for (j = 0; j < 2; j++) { fragmentPos.x = this->collider.dim.pos.x + (((j * 2) - 1) * num); fragmentPos.z = this->collider.dim.pos.z + (((i * 2) - 1) * num); - EffectSsHahen_SpawnBurst(play, &fragmentPos, 10.0f, 0, 10, 10, 4, 141, 40, gBotwBombableRubbleDL); + EffectSsHahen_SpawnBurst(play, &fragmentPos, 10.0f, 0, 10, 10, 4, OBJECT_HAKACH_OBJECTS, 40, + gBotwBombableRubbleDL); func_800286CC(play, &fragmentPos, &sZeroVec, &sZeroVec, 1000, 50); } } diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index 03747c6de2..5b86b08576 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -56,16 +56,16 @@ void DemoEc_Update(Actor* thisx, PlayState* play); void DemoEc_Draw(Actor* thisx, PlayState* play); typedef enum DemoEcUpdateMode { - /* 00 */ EC_UPDATE_COMMON, - /* 01 */ EC_UPDATE_INGO, - /* 02 */ EC_UPDATE_TALON, - /* 03 */ EC_UPDATE_WINDMILL_MAN, - /* 04 */ EC_UPDATE_KOKIRI_BOY, - /* 05 */ EC_UPDATE_KOKIRI_GIRL, - /* 06 */ EC_UPDATE_OLD_MAN, - /* 07 */ EC_UPDATE_BEARDED_MAN, - /* 08 */ EC_UPDATE_WOMAN, - /* 09 */ EC_UPDATE_OLD_WOMAN, + /* 0 */ EC_UPDATE_COMMON, + /* 1 */ EC_UPDATE_INGO, + /* 2 */ EC_UPDATE_TALON, + /* 3 */ EC_UPDATE_WINDMILL_MAN, + /* 4 */ EC_UPDATE_KOKIRI_BOY, + /* 5 */ EC_UPDATE_KOKIRI_GIRL, + /* 6 */ EC_UPDATE_OLD_MAN, + /* 7 */ EC_UPDATE_BEARDED_MAN, + /* 8 */ EC_UPDATE_WOMAN, + /* 9 */ EC_UPDATE_OLD_WOMAN, /* 10 */ EC_UPDATE_BOSS_CARPENTER, /* 11 */ EC_UPDATE_CARPENTER, /* 12 */ EC_UPDATE_DANCING_KOKIRI_BOY, @@ -88,16 +88,16 @@ typedef enum DemoEcUpdateMode { } DemoEcUpdateMode; typedef enum DemoEcDrawconfig { - /* 00 */ EC_DRAW_COMMON, - /* 01 */ EC_DRAW_INGO, - /* 02 */ EC_DRAW_TALON, - /* 03 */ EC_DRAW_WINDMILL_MAN, - /* 04 */ EC_DRAW_KOKIRI_BOY, - /* 05 */ EC_DRAW_KOKIRI_GIRL, - /* 06 */ EC_DRAW_OLD_MAN, - /* 07 */ EC_DRAW_BEARDED_MAN, - /* 08 */ EC_DRAW_WOMAN, - /* 09 */ EC_DRAW_OLD_WOMAN, + /* 0 */ EC_DRAW_COMMON, + /* 1 */ EC_DRAW_INGO, + /* 2 */ EC_DRAW_TALON, + /* 3 */ EC_DRAW_WINDMILL_MAN, + /* 4 */ EC_DRAW_KOKIRI_BOY, + /* 5 */ EC_DRAW_KOKIRI_GIRL, + /* 6 */ EC_DRAW_OLD_MAN, + /* 7 */ EC_DRAW_BEARDED_MAN, + /* 8 */ EC_DRAW_WOMAN, + /* 9 */ EC_DRAW_OLD_WOMAN, /* 10 */ EC_DRAW_BOSS_CARPENTER, /* 11 */ EC_DRAW_CARPENTER, /* 12 */ EC_DRAW_GERUDO, diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h index f63a87c40b..73d38153fb 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h @@ -29,9 +29,9 @@ typedef struct DemoGj { * bits 0- 7: A value of the enum DemoGjType. */ typedef enum DemoGjType { - /* 04 */ DEMOGJ_TYPE_AROUNDARENA = 4, // This is the indestructible rubble around the arena. This actor keeps alive the whole fight. - /* 08 */ DEMOGJ_TYPE_RUBBLE_PILE_1 = 8, // DEMOGJ_TYPE_RUBBLE_PILE_X are the rubbles from where Ganondorf rises. When he transforms into Ganon these are removed from the scene (Actor_Kill). - /* 09 */ DEMOGJ_TYPE_RUBBLE_PILE_2, + /* 4 */ DEMOGJ_TYPE_AROUNDARENA = 4, // This is the indestructible rubble around the arena. This actor keeps alive the whole fight. + /* 8 */ DEMOGJ_TYPE_RUBBLE_PILE_1 = 8, // DEMOGJ_TYPE_RUBBLE_PILE_X are the rubbles from where Ganondorf rises. When he transforms into Ganon these are removed from the scene (Actor_Kill). + /* 9 */ DEMOGJ_TYPE_RUBBLE_PILE_2, /* 10 */ DEMOGJ_TYPE_RUBBLE_PILE_3, /* 11 */ DEMOGJ_TYPE_RUBBLE_PILE_4, /* 12 */ DEMOGJ_TYPE_RUBBLE_PILE_5, diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index 886db5d0a5..0e6b8e7a47 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -876,7 +876,7 @@ s32 func_80986A5C(DemoIm* this, PlayState* play) { f32 playerPosX = player->actor.world.pos.x; f32 thisPosX = this->actor.world.pos.x; - if ((thisPosX - (kREG(17) + 130.0f) < playerPosX) && (!Play_InCsMode(play))) { + if ((thisPosX - (kREG(17) + 130.0f) < playerPosX) && !Play_InCsMode(play)) { return true; } else { return false; diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index eebcc925a1..35a0e0f590 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -406,7 +406,7 @@ void DemoSa_InitTrialOrSealingGanon(DemoSa* this, PlayState* play) { void DemoSa_SageMagic_LowerEyes(DemoSa* this) { f32 curFrame = this->skelAnime.curFrame; - if ((this->skelAnime.mode == 2) && (curFrame >= 32.0f)) { + if ((this->skelAnime.mode == ANIMMODE_ONCE) && (curFrame >= 32.0f)) { DemoSa_SetEyes(this, SARIA_EYE_HALF); DemoSa_SetMouth(this, SARIA_MOUTH_CLOSED2); } diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index 75927f7cb7..2f7ac220e7 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -45,13 +45,13 @@ void EnAm_Stunned(EnAm* this, PlayState* play); void EnAm_RecoilFromDamage(EnAm* this, PlayState* play); typedef enum ArmosBehavior { - /* 00 */ AM_BEHAVIOR_NONE, - /* 01 */ AM_BEHAVIOR_DAMAGED, - /* 03 */ AM_BEHAVIOR_DO_NOTHING = 3, - /* 05 */ AM_BEHAVIOR_5 = 5, // checked but never set - /* 06 */ AM_BEHAVIOR_STUNNED, - /* 07 */ AM_BEHAVIOR_GO_HOME, - /* 08 */ AM_BEHAVIOR_RICOCHET, + /* 0 */ AM_BEHAVIOR_NONE, + /* 1 */ AM_BEHAVIOR_DAMAGED, + /* 3 */ AM_BEHAVIOR_DO_NOTHING = 3, + /* 5 */ AM_BEHAVIOR_5 = 5, // checked but never set + /* 6 */ AM_BEHAVIOR_STUNNED, + /* 7 */ AM_BEHAVIOR_GO_HOME, + /* 8 */ AM_BEHAVIOR_RICOCHET, /* 10 */ AM_BEHAVIOR_AGGRO = 10 } ArmosBehavior; diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index 59a3a06a22..08d9907415 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -1317,7 +1317,7 @@ void EnBb_Draw(Actor* thisx, PlayState* play) { if (this->fireIceTimer != 0) { this->actor.colorFilterTimer++; - //! @bug: + //! @bug //! The purpose of this is to counteract Actor_UpdateAll decrementing colorFilterTimer. However, //! the above bugs mean unk_2A8 can be nonzero without damage effects ever having been set. //! This routine will then increment colorFilterTimer, and on the next frame Actor_Draw will try diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h index 70261f9758..b655626f01 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h @@ -64,7 +64,7 @@ typedef enum EnDivingGameState { typedef enum EnDivingGameRupeePhase { /* 0 */ ENDIVINGGAME_RUPEE_PHASE_NONE, // No rupees underwater yet, but they might be thrown. /* 1 */ ENDIVINGGAME_RUPEE_PHASE_SWITCHING_CAM, // Switching to underwater view. - /* 2 */ ENDIVINGGAME_RUPEE_PHASE_SINKING, // Rupees are spawned and sinking, player can grab them. + /* 2 */ ENDIVINGGAME_RUPEE_PHASE_SINKING // Rupees are spawned and sinking, player can grab them. } EnDivingGameRupeePhase; #endif diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h index 99a4190054..c8a375d2b3 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h @@ -26,7 +26,7 @@ typedef enum EnExRuppyType { /* 1 */ ENEXRUPPY_TYPE_BOMB_LARGE, // Giant pink Rupee that explodes when you touch it /* 2 */ ENEXRUPPY_TYPE_BOMB_SMALL, // Smaller version of the same /* 3 */ ENEXRUPPY_TYPE_HYRULE_COURTYARD, // Spawned by the guard in Hyrule courtyard - /* 4 */ ENEXRUPPY_TYPE_SHOOTING_GALLERY_PROGRESS, // Progress markers in the shooting gallery + /* 4 */ ENEXRUPPY_TYPE_SHOOTING_GALLERY_PROGRESS // Progress markers in the shooting gallery } EnExRuppyType; #endif diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index bafe38998e..507fa339e6 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -32,9 +32,9 @@ #define GE1_STATE_STOP_FIDGET (1 << 3) typedef enum EnGe1Hairstyle { - /* 00 */ GE1_HAIR_BOB, - /* 01 */ GE1_HAIR_STRAIGHT, - /* 02 */ GE1_HAIR_SPIKY + /* 0 */ GE1_HAIR_BOB, + /* 1 */ GE1_HAIR_STRAIGHT, + /* 2 */ GE1_HAIR_SPIKY } EnGe1Hairstyle; void EnGe1_Init(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.h b/src/overlays/actors/ovl_En_Horse/z_en_horse.h index db953948fe..1e488a6526 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.h +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.h @@ -91,16 +91,16 @@ typedef enum HorseType { } HorseType; typedef enum HorseParamType { - /* 00 */ HORSE_PTYPE_0, - /* 01 */ HORSE_PTYPE_1, - /* 02 */ HORSE_PTYPE_INACTIVE, // Waits for Epona's Song to appear - /* 03 */ HORSE_PTYPE_INGO_SPAWNED_RIDING, - /* 04 */ HORSE_PTYPE_4, - /* 05 */ HORSE_PTYPE_5, - /* 06 */ HORSE_PTYPE_6, - /* 07 */ HORSE_PTYPE_7, - /* 08 */ HORSE_PTYPE_HORSEBACK_ARCHERY, - /* 09 */ HORSE_PTYPE_PLAYER_SPAWNED_RIDING, + /* 0 */ HORSE_PTYPE_0, + /* 1 */ HORSE_PTYPE_1, + /* 2 */ HORSE_PTYPE_INACTIVE, // Waits for Epona's Song to appear + /* 3 */ HORSE_PTYPE_INGO_SPAWNED_RIDING, + /* 4 */ HORSE_PTYPE_4, + /* 5 */ HORSE_PTYPE_5, + /* 6 */ HORSE_PTYPE_6, + /* 7 */ HORSE_PTYPE_7, + /* 8 */ HORSE_PTYPE_HORSEBACK_ARCHERY, + /* 9 */ HORSE_PTYPE_PLAYER_SPAWNED_RIDING, /* 10 */ HORSE_PTYPE_10, /* 11 */ HORSE_PTYPE_11 } HorseParamType; diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index d789b8b980..47f0afd7da 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -209,7 +209,7 @@ u32 EnIceHono_InBottleRange(EnIceHono* this, PlayState* play) { tempPos.y = player->actor.world.pos.y; tempPos.z = Math_CosS(this->actor.yawTowardsPlayer + 0x8000) * 40.0f + player->actor.world.pos.z; - //! @bug: this check is superfluous: it is automatically satisfied if the coarse check is satisfied. It may have + //! @bug this check is superfluous: it is automatically satisfied if the coarse check is satisfied. It may have //! been intended to check the actor is in front of Player, but yawTowardsPlayer does not depend on Player's //! world rotation. if (EnIceHono_XZDistanceSquared(&tempPos, &this->actor.world.pos) <= SQ(40.0f)) { diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index 9562acf3f4..aef6f8f1ed 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -134,7 +134,7 @@ s32 EnInsect_InBottleRange(EnInsect* this, PlayState* play) { pos.y = player->actor.world.pos.y; pos.z = Math_CosS(this->actor.yawTowardsPlayer + 0x8000) * 16.0f + player->actor.world.pos.z; - //! @bug: this check is superfluous: it is automatically satisfied if the coarse check is satisfied. It may have + //! @bug this check is superfluous: it is automatically satisfied if the coarse check is satisfied. It may have //! been intended to check the actor is in front of Player, but yawTowardsPlayer does not depend on Player's //! world rotation. if (EnInsect_XZDistanceSquared(&pos, &this->actor.world.pos) <= SQ(20.0f)) { diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index cd4d2c3993..a202276a4d 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -748,7 +748,7 @@ void EnNb_PlayKnuckleDefeatSFX(EnNb* this, PlayState* play) { void EnNb_PlayKneelingOnGroundSFX(EnNb* this) { s32 pad[2]; - if ((this->skelAnime.mode == 2) && + if ((this->skelAnime.mode == ANIMMODE_ONCE) && (Animation_OnFrame(&this->skelAnime, 18.0f) || Animation_OnFrame(&this->skelAnime, 25.0f))) { Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_HUMAN_BOUND); } @@ -757,7 +757,7 @@ void EnNb_PlayKneelingOnGroundSFX(EnNb* this) { void EnNb_PlayLookRightSFX(EnNb* this) { s32 pad[2]; - if ((this->skelAnime.mode == 2) && Animation_OnFrame(&this->skelAnime, 9.0f)) { + if ((this->skelAnime.mode == ANIMMODE_ONCE) && Animation_OnFrame(&this->skelAnime, 9.0f)) { Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_STONE); } } diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index 2284d9eabb..ca0f93450d 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -512,7 +512,7 @@ void EnOkuta_ProjectileFly(EnOkuta* this, PlayState* play) { pos.x = this->actor.world.pos.x; pos.y = this->actor.world.pos.y + 11.0f; pos.z = this->actor.world.pos.z; - EffectSsHahen_SpawnBurst(play, &pos, 6.0f, 0, 1, 2, 15, 7, 10, gOctorokProjectileDL); + EffectSsHahen_SpawnBurst(play, &pos, 6.0f, 0, 1, 2, 15, OBJECT_OKUTA, 10, gOctorokProjectileDL); SfxSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 20, NA_SE_EN_OCTAROCK_ROCK); Actor_Kill(&this->actor); } diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h index e1b9e4691d..99f355044e 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h @@ -82,30 +82,30 @@ typedef struct EnOssan { } EnOssan; // size = 0x02D8 typedef enum OssanType { - /* 00 */ OSSAN_TYPE_KOKIRI, - /* 01 */ OSSAN_TYPE_KAKARIKO_POTION, - /* 02 */ OSSAN_TYPE_BOMBCHUS, - /* 03 */ OSSAN_TYPE_MARKET_POTION, - /* 04 */ OSSAN_TYPE_BAZAAR, - /* 05 */ OSSAN_TYPE_ADULT, - /* 06 */ OSSAN_TYPE_TALON, - /* 07 */ OSSAN_TYPE_ZORA, - /* 08 */ OSSAN_TYPE_GORON, - /* 09 */ OSSAN_TYPE_INGO, + /* 0 */ OSSAN_TYPE_KOKIRI, + /* 1 */ OSSAN_TYPE_KAKARIKO_POTION, + /* 2 */ OSSAN_TYPE_BOMBCHUS, + /* 3 */ OSSAN_TYPE_MARKET_POTION, + /* 4 */ OSSAN_TYPE_BAZAAR, + /* 5 */ OSSAN_TYPE_ADULT, + /* 6 */ OSSAN_TYPE_TALON, + /* 7 */ OSSAN_TYPE_ZORA, + /* 8 */ OSSAN_TYPE_GORON, + /* 9 */ OSSAN_TYPE_INGO, /* 10 */ OSSAN_TYPE_MASK } OssanType; typedef enum EnOssanState { - /* 00 */ OSSAN_STATE_IDLE, - /* 01 */ OSSAN_STATE_START_CONVERSATION, - /* 02 */ OSSAN_STATE_FACING_SHOPKEEPER, - /* 03 */ OSSAN_STATE_TALKING_TO_SHOPKEEPER, - /* 04 */ OSSAN_STATE_LOOK_SHELF_LEFT, - /* 05 */ OSSAN_STATE_LOOK_SHELF_RIGHT, - /* 06 */ OSSAN_STATE_BROWSE_LEFT_SHELF, - /* 07 */ OSSAN_STATE_BROWSE_RIGHT_SHELF, - /* 08 */ OSSAN_STATE_LOOK_SHOPKEEPER, // From looking at shelf - /* 09 */ OSSAN_STATE_SELECT_ITEM, // Select most items + /* 0 */ OSSAN_STATE_IDLE, + /* 1 */ OSSAN_STATE_START_CONVERSATION, + /* 2 */ OSSAN_STATE_FACING_SHOPKEEPER, + /* 3 */ OSSAN_STATE_TALKING_TO_SHOPKEEPER, + /* 4 */ OSSAN_STATE_LOOK_SHELF_LEFT, + /* 5 */ OSSAN_STATE_LOOK_SHELF_RIGHT, + /* 6 */ OSSAN_STATE_BROWSE_LEFT_SHELF, + /* 7 */ OSSAN_STATE_BROWSE_RIGHT_SHELF, + /* 8 */ OSSAN_STATE_LOOK_SHOPKEEPER, // From looking at shelf + /* 9 */ OSSAN_STATE_SELECT_ITEM, // Select most items /* 10 */ OSSAN_STATE_SELECT_ITEM_BOTTLE_MILK_FULL, /* 11 */ OSSAN_STATE_SELECT_ITEM_WEIRD_EGG, /* 12 */ OSSAN_STATE_SELECT_ITEM_UNIMPLEMENTED, // Handles two unfinished shop items diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index 980802bd28..76311fbc09 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -139,8 +139,8 @@ static ColliderQuadInit sQuadInit = { }; typedef enum EnPeehatDamageReaction { - /* 00 */ PEAHAT_DMG_REACT_ATTACK = 0, - /* 06 */ PEAHAT_DMG_REACT_LIGHT_ICE_ARROW = 6, + /* 0 */ PEAHAT_DMG_REACT_ATTACK = 0, + /* 6 */ PEAHAT_DMG_REACT_LIGHT_ICE_ARROW = 6, /* 12 */ PEAHAT_DMG_REACT_FIRE = 12, /* 13 */ PEAHAT_DMG_REACT_HOOKSHOT = 13, /* 14 */ PEAHAT_DMG_REACT_BOOMERANG = 14, @@ -183,14 +183,14 @@ static DamageTable sDamageTable = { }; typedef enum PeahatState { - /* 00 */ PEAHAT_STATE_DYING, - /* 01 */ PEAHAT_STATE_EXPLODE, - /* 03 */ PEAHAT_STATE_3 = 3, - /* 04 */ PEAHAT_STATE_4, - /* 05 */ PEAHAT_STATE_FLY, - /* 07 */ PEAHAT_STATE_ATTACK_RECOIL = 7, - /* 08 */ PEAHAT_STATE_8, - /* 09 */ PEAHAT_STATE_9, + /* 0 */ PEAHAT_STATE_DYING, + /* 1 */ PEAHAT_STATE_EXPLODE, + /* 3 */ PEAHAT_STATE_3 = 3, + /* 4 */ PEAHAT_STATE_4, + /* 5 */ PEAHAT_STATE_FLY, + /* 7 */ PEAHAT_STATE_ATTACK_RECOIL = 7, + /* 8 */ PEAHAT_STATE_8, + /* 9 */ PEAHAT_STATE_9, /* 10 */ PEAHAT_STATE_LANDING, /* 12 */ PEAHAT_STATE_RETURN_HOME = 12, /* 13 */ PEAHAT_STATE_STUNNED, @@ -374,7 +374,7 @@ void EnPeehat_Flying_SetStateGround(EnPeehat* this) { ANIMMODE_ONCE, 0.0f); this->seekPlayerTimer = 400; this->unk_2D4 = 0; - this->unk_2FA = 0; //! @bug: overwrites number of child larva spawned, allowing for more than MAX_LARVA spawns + this->unk_2FA = 0; //! @bug overwrites number of child larva spawned, allowing for more than MAX_LARVA spawns this->state = PEAHAT_STATE_4; EnPeehat_SetupAction(this, EnPeehat_Flying_StateGrounded); } @@ -495,7 +495,7 @@ void EnPeehat_Flying_StateRise(EnPeehat* this, PlayState* play) { } } if (SkelAnime_Update(&this->skelAnime) || this->animTimer == 0) { - //! @bug: overwrites number of child larva spawned, allowing for more than MAX_LARVA spawns + //! @bug overwrites number of child larva spawned, allowing for more than MAX_LARVA spawns this->unk_2FA = 0; EnPeehat_Flying_SetStateFly(this); } else { diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 8d0acd8ff6..18d6b5f8fb 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -955,7 +955,7 @@ void EnRu1_CheckStartFirstEncounter(EnRu1* this, PlayState* play) { s32 pad; Player* player = GET_PLAYER(play); - if ((EnRu1_IsPlayerInRangeForFirstEncounter(this, play)) && (!Play_InCsMode(play)) && + if ((EnRu1_IsPlayerInRangeForFirstEncounter(this, play)) && !Play_InCsMode(play) && (!(player->stateFlags1 & (PLAYER_STATE1_13 | PLAYER_STATE1_14 | PLAYER_STATE1_21))) && (player->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) { @@ -1340,7 +1340,7 @@ s32 func_80AED624(EnRu1* this, PlayState* play) { (this->actor.depthInWater > kREG(16) + 50.0f) && (this->action != ENRU1_ACTION_SITTING_DISAPPEARING)) { this->action = ENRU1_ACTION_SITTING_DISAPPEARING; this->drawConfig = ENRU1_DRAW_XLU; - this->alpha = 0xFF; + this->alpha = 255; this->sinkTimer = 0.0f; } return true; @@ -2054,7 +2054,7 @@ void EnRu1_RespondToSapphirePlatformMoving(EnRu1* this) { if (EnRu1_GetPlatformCamSetting(this) == 2) { EnRu1_SetEyes(this, ENRU1_EYES_UP); EnRu1_SetMouth(this, ENRU1_MOUTH_OPEN); - if (this->skelAnime.mode != 2) { + if (this->skelAnime.mode != ANIMMODE_ONCE) { EnRu1_AnimationChange(this, &gRutoChildShutterAnim, ANIMMODE_ONCE, -8.0f, false); EnRu1_PlayStartledSfx(this); } diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h index d3fe83ea37..a10f1d7aa2 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h @@ -126,6 +126,7 @@ typedef enum EnRu1Type { #if DEBUG_FEATURES /* 10 */ ENRU1_TYPE_DEBUG = 10, #endif + ENRU1_TYPE_MAX } EnRu1Type; typedef enum EnRu1Eyes { diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 748b8054d1..9de0a07a16 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -61,16 +61,16 @@ void EnRu2_DrawXlu(EnRu2* this, PlayState* play); void EnRu2_CheckWaterMedallionCutscene(EnRu2* this, PlayState* play); typedef enum { - /* 00 */ ENRU2_SETUP_WATER_MEDALLION_CS, - /* 01 */ ENRU2_AWAIT_BLUE_WARP, - /* 02 */ ENRU2_RISE_THROUGH_BLUE_WARP, - /* 03 */ ENRU2_SAGE_OF_WATER_DIALOG, - /* 04 */ ENRU2_RAISE_ARMS, - /* 05 */ ENRU2_AWAIT_SPAWN_WATER_MEDALLION, - /* 06 */ ENRU2_FINISH_WATER_MEDALLION_CS, - /* 07 */ ENRU2_WATER_TRIAL_INVISIBLE, - /* 08 */ ENRU2_WATER_TRIAL_FADE, - /* 09 */ ENRU2_AWAIT_SPAWN_LIGHT_BALL, + /* 0 */ ENRU2_SETUP_WATER_MEDALLION_CS, + /* 1 */ ENRU2_AWAIT_BLUE_WARP, + /* 2 */ ENRU2_RISE_THROUGH_BLUE_WARP, + /* 3 */ ENRU2_SAGE_OF_WATER_DIALOG, + /* 4 */ ENRU2_RAISE_ARMS, + /* 5 */ ENRU2_AWAIT_SPAWN_WATER_MEDALLION, + /* 6 */ ENRU2_FINISH_WATER_MEDALLION_CS, + /* 7 */ ENRU2_WATER_TRIAL_INVISIBLE, + /* 8 */ ENRU2_WATER_TRIAL_FADE, + /* 9 */ ENRU2_AWAIT_SPAWN_LIGHT_BALL, /* 10 */ ENRU2_CREDITS_INVISIBLE, /* 11 */ ENRU2_CREDITS_FADE_IN, /* 12 */ ENRU2_CREDITS_VISIBLE, @@ -84,9 +84,9 @@ typedef enum { } EnRu2Action; typedef enum { - /* 00 */ ENRU2_DRAW_NOTHING, - /* 01 */ ENRU2_DRAW_OPA, - /* 02 */ ENRU2_DRAW_XLU + /* 0 */ ENRU2_DRAW_NOTHING, + /* 1 */ ENRU2_DRAW_OPA, + /* 2 */ ENRU2_DRAW_XLU } EnRu2DrawConfig; static ColliderCylinderInitType1 sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index 975fb0af97..5b72dd4544 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -143,16 +143,16 @@ typedef enum SkullKidOcarinaGameState { } SkullKidOcarinaGameState; typedef enum SkullKidAction { - /* 00 */ SKJ_ACTION_FADE, - /* 01 */ SKJ_ACTION_WAIT_TO_SHOOT_NEEDLE, - /* 02 */ SKJ_ACTION_SARIA_SONG_IDLE, - /* 03 */ SKJ_ACTION_WAIT_FOR_DEATH_ANIM, - /* 04 */ SKJ_ACTION_PICK_NEXT_FIHGT_ACTION, - /* 05 */ SKJ_ACTION_WAIT_FOR_LAND_ANIM, - /* 06 */ SKJ_ACTION_RESET_FIGHT, - /* 07 */ SKJ_ACTION_FIGHT, - /* 08 */ SKJ_ACTION_NEEDLE_RECOVER, - /* 09 */ SKJ_ACTION_SPAWN_DEATH_EFFECT, + /* 0 */ SKJ_ACTION_FADE, + /* 1 */ SKJ_ACTION_WAIT_TO_SHOOT_NEEDLE, + /* 2 */ SKJ_ACTION_SARIA_SONG_IDLE, + /* 3 */ SKJ_ACTION_WAIT_FOR_DEATH_ANIM, + /* 4 */ SKJ_ACTION_PICK_NEXT_FIHGT_ACTION, + /* 5 */ SKJ_ACTION_WAIT_FOR_LAND_ANIM, + /* 6 */ SKJ_ACTION_RESET_FIGHT, + /* 7 */ SKJ_ACTION_FIGHT, + /* 8 */ SKJ_ACTION_NEEDLE_RECOVER, + /* 9 */ SKJ_ACTION_SPAWN_DEATH_EFFECT, /* 10 */ SKJ_ACTION_SARIA_SONG_WAIT_IN_RANGE, /* 11 */ SKJ_ACTION_SARIA_SONG_WAIT_FOR_SONG, /* 12 */ SKJ_ACTION_SARIA_SONG_AFTER_SONG, diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index f493c4fd8a..35fb046924 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -442,10 +442,10 @@ void EnWallmas_TakePlayer(EnWallmas* this, PlayState* play) { if (Animation_OnFrame(&this->skelAnime, 1.0f) != 0) { if (!LINK_IS_ADULT) { - //! @bug: This is an unsafe cast, although the sound effect will still play + //! @bug This is an unsafe cast, although the sound effect will still play Player_PlaySfx((Player*)&this->actor, NA_SE_VO_LI_DAMAGE_S_KID); } else { - //! @bug: This is an unsafe cast, although the sound effect will still play + //! @bug This is an unsafe cast, although the sound effect will still play Player_PlaySfx((Player*)&this->actor, NA_SE_VO_LI_DAMAGE_S); } @@ -469,10 +469,10 @@ void EnWallmas_TakePlayer(EnWallmas* this, PlayState* play) { if (this->timer == -0x1E) { if (!LINK_IS_ADULT) { - //! @bug: This is an unsafe cast, although the sound effect will still play + //! @bug This is an unsafe cast, although the sound effect will still play Player_PlaySfx((Player*)&this->actor, NA_SE_VO_LI_TAKEN_AWAY_KID); } else { - //! @bug: This is an unsafe cast, although the sound effect will still play + //! @bug This is an unsafe cast, although the sound effect will still play Player_PlaySfx((Player*)&this->actor, NA_SE_VO_LI_TAKEN_AWAY); } } diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.h b/src/overlays/actors/ovl_En_Xc/z_en_xc.h index 419f67d55d..d475ceaddf 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.h +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.h @@ -32,16 +32,16 @@ typedef enum EnXcDrawMode { } EnXcDrawMode; typedef enum EnXcAction { - /* 00 */ SHEIK_ACTION_INIT, - /* 01 */ SHEIK_ACTION_WAIT, - /* 02 */ SHEIK_ACTION_GRACEFUL_FALL, - /* 03 */ SHEIK_ACTION_ACCEL, - /* 04 */ SHEIK_ACTION_WALK, - /* 05 */ SHEIK_ACTION_HALT, - /* 06 */ SHEIK_ACTION_STOPPED, - /* 07 */ SHEIK_ACTION_7, - /* 08 */ SHEIK_ACTION_HARP_READY, - /* 09 */ SHEIK_PLAYING_HARP, + /* 0 */ SHEIK_ACTION_INIT, + /* 1 */ SHEIK_ACTION_WAIT, + /* 2 */ SHEIK_ACTION_GRACEFUL_FALL, + /* 3 */ SHEIK_ACTION_ACCEL, + /* 4 */ SHEIK_ACTION_WALK, + /* 5 */ SHEIK_ACTION_HALT, + /* 6 */ SHEIK_ACTION_STOPPED, + /* 7 */ SHEIK_ACTION_7, + /* 8 */ SHEIK_ACTION_HARP_READY, + /* 9 */ SHEIK_PLAYING_HARP, /* 10 */ SHEIK_ACTION_10, /* 11 */ SHEIK_ACTION_PUT_HARP_AWAY, /* 12 */ SHEIK_ACTION_12, diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index 2a142d8179..d7bd76f1c5 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -1261,7 +1261,7 @@ void func_80B514F8(EnZl2* this, PlayState* play) { void func_80B5154C(EnZl2* this, PlayState* play) { CutsceneContext* csCtx; - if (this->skelAnime.mode != 0) { + if (this->skelAnime.mode != ANIMMODE_LOOP) { EnZl2_UpdateEyes(this); } else { csCtx = &play->csCtx; diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 23dbdc8822..5dac2acd0a 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -259,7 +259,7 @@ void func_80B53980(EnZl3* thisx, s16 y, s32 idx) { } if (idx == 0 && action == 3) { yTemp = y + -11000; - if (skelAnime->mode == 2) { + if (skelAnime->mode == ANIMMODE_ONCE) { curFrame = skelAnime->curFrame; unk_3DC = this->unk_3DC; yTemp = (s32)((curFrame / unk_3DC) * -11000) + y; @@ -341,13 +341,13 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) { phi_v0 -= (phi_v1 - phi_v0) / 10; } - } else if (idx == 2 && action == 22 && skelAnime->mode == 2) { + } else if (idx == 2 && action == 22 && skelAnime->mode == ANIMMODE_ONCE) { if (phi_v1 != 0) { s32 pad; phi_v0 -= (phi_v1 - phi_v0) / 10; } - } else if (idx == 2 && (action == 20 || action == 21) && skelAnime->mode == 2) { + } else if (idx == 2 && (action == 20 || action == 21) && skelAnime->mode == ANIMMODE_ONCE) { if (phi_v1 != 0) { s32 pad; @@ -379,7 +379,7 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) { if (idx == 2) { if (action == 4) { - if (skelAnime->mode == 2) { + if (skelAnime->mode == ANIMMODE_ONCE) { f32 curFrame = skelAnime->curFrame; f32 unk_3E0 = this->unk_3E0; s32 phi_v1_2 = (s32)(((unk_3E0 - curFrame) / unk_3E0) * -2000.0f) + phi_a1; @@ -392,7 +392,7 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) { } } } else if (action == 5) { - if (skelAnime->mode == 2) { + if (skelAnime->mode == ANIMMODE_ONCE) { f32 curFrame = skelAnime->curFrame; f32 unk_3E4 = this->unk_3E4; s32 phi_v1_2 = (s32)((curFrame / unk_3E4) * -2000.0f) + phi_a1; @@ -414,7 +414,7 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) { } } } else if ((action == 20) || (action == 21)) { - if (skelAnime->mode == 2) { + if (skelAnime->mode == ANIMMODE_ONCE) { f32 curFrame = skelAnime->curFrame; f32 unk_3F4 = this->unk_3F4; s32 phi_v1_2; @@ -442,7 +442,7 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) { } } } else if (action == 22) { - if (skelAnime->mode == 2) { + if (skelAnime->mode == ANIMMODE_ONCE) { f32 curFrame = skelAnime->curFrame; f32 unk_3EC = this->unk_3EC; s32 phi_v1_2 = (s32)(((curFrame / unk_3EC) * -5200.0f) + 4200.0f) + phi_a1; @@ -464,7 +464,7 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) { } } } else if (action == 23) { - if (skelAnime->mode == 2) { + if (skelAnime->mode == ANIMMODE_ONCE) { f32 curFrame = skelAnime->curFrame; f32 unk_3F0 = this->unk_3F0; s32 phi_v1_2 = (s32)(((curFrame / unk_3F0) * -7600.0f) + -2000.0f) + phi_a1; @@ -486,7 +486,7 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) { } } } else if (action == 24) { - if (skelAnime->mode == 2) { + if (skelAnime->mode == ANIMMODE_ONCE) { f32 curFrame = skelAnime->curFrame; f32 unk_3E8 = this->unk_3E8; s32 phi_v1_2 = (s32)(((curFrame / unk_3E8) * 21000.0f) + -9600.0f) + phi_a1; @@ -510,7 +510,7 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) { } } else if (idx == 11 || idx == 17) { if (action == 4) { - if (skelAnime->mode == 2) { + if (skelAnime->mode == ANIMMODE_ONCE) { f32 curFrame = skelAnime->curFrame; f32 unk_3E0 = this->unk_3E0; s32 phi_v1_2 = (s32)((curFrame / unk_3E0) * -7000.0f) + phi_a1; @@ -532,7 +532,7 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) { } } } else if (action == 5) { - if (skelAnime->mode == 2) { + if (skelAnime->mode == ANIMMODE_ONCE) { f32 curFrame = skelAnime->curFrame; f32 unk_3E4 = this->unk_3E4; s32 phi_v1_2 = (s32)(((unk_3E4 - curFrame) / unk_3E4) * -7000.0f) + phi_a1; @@ -1054,7 +1054,7 @@ void func_80B5582C(EnZl3* this) { void func_80B5585C(EnZl3* this) { SkelAnime* skelAnime = &this->skelAnime; - if ((skelAnime->mode == 2) && Animation_OnFrame(skelAnime, 4.0f)) { + if ((skelAnime->mode == ANIMMODE_ONCE) && Animation_OnFrame(skelAnime, 4.0f)) { Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); } } @@ -1575,7 +1575,7 @@ void func_80B56DC8(EnZl3* this) { void func_80B56DEC(EnZl3* this) { SkelAnime* skelAnime = &this->skelAnime; - if ((skelAnime->mode == 2) && Animation_OnFrame(skelAnime, 9.0f) != 0) { + if ((skelAnime->mode == ANIMMODE_ONCE) && Animation_OnFrame(skelAnime, 9.0f) != 0) { Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_Z1_OPENDOOR); } } @@ -2164,7 +2164,7 @@ void func_80B584B4(EnZl3* this, PlayState* play) { Actor* nearbyEnTest = Actor_FindNearby(play, &this->actor, ACTOR_EN_TEST, ACTORCAT_ENEMY, 8000.0f); if (D_80B5A4BC == 0) { - if ((nearbyEnTest == NULL) && (!Play_InCsMode(play))) { + if ((nearbyEnTest == NULL) && !Play_InCsMode(play)) { this->action = 33; OnePointCutscene_Init(play, 4011, -99, &this->actor, CAM_ID_MAIN); } else if (invincibilityTimer > 0) { @@ -2173,7 +2173,7 @@ void func_80B584B4(EnZl3* this, PlayState* play) { func_80B56DC8(this); } } else { - if ((nearbyEnTest == NULL) && (!Play_InCsMode(play))) { + if ((nearbyEnTest == NULL) && !Play_InCsMode(play)) { func_80B54E14(this, &gZelda2Anime2Anim_007664, 0, -12.0f, 0); D_80B5A4BC = 0; this->action = 33; diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index 445d4929b9..4010b262bd 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -231,7 +231,7 @@ void ObjKibako_Idle(ObjKibako* this, PlayState* play) { void ObjKibako_SetupHeld(ObjKibako* this) { this->actionFunc = ObjKibako_Held; this->actor.room = -1; - //! @bug: This is an unsafe cast, although the sound effect will still play + //! @bug This is an unsafe cast, although the sound effect will still play Player_PlaySfx((Player*)&this->actor, NA_SE_PL_PULL_UP_WOODBOX); } diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index d3ba509720..313252049d 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -291,7 +291,7 @@ void ObjTsubo_Idle(ObjTsubo* this, PlayState* play) { void ObjTsubo_SetupLiftedUp(ObjTsubo* this) { this->actionFunc = ObjTsubo_LiftedUp; this->actor.room = -1; - //! @bug: This is an unsafe cast, although the sound effect will still play + //! @bug This is an unsafe cast, although the sound effect will still play Player_PlaySfx((Player*)&this->actor, NA_SE_PL_PULL_UP_POT); this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index b604a9d4cc..81519d2248 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -8364,7 +8364,7 @@ void Player_Action_80840DE4(Player* this, PlayState* play) { s32 temp3; s32 direction; - this->skelAnime.mode = 0; + this->skelAnime.mode = ANIMMODE_LOOP; LinkAnimation_SetUpdateFunction(&this->skelAnime); this->skelAnime.animation = func_8083356C(this); diff --git a/src/overlays/gamestates/ovl_file_choose/file_select.h b/src/overlays/gamestates/ovl_file_choose/file_select.h index 016c04dce5..1e571ba4d8 100644 --- a/src/overlays/gamestates/ovl_file_choose/file_select.h +++ b/src/overlays/gamestates/ovl_file_choose/file_select.h @@ -28,16 +28,16 @@ typedef enum MenuMode { } MenuMode; typedef enum ConfigMode { - /* 00 */ CM_FADE_IN_START, - /* 01 */ CM_FADE_IN_END, - /* 02 */ CM_MAIN_MENU, - /* 03 */ CM_SETUP_COPY_SOURCE, - /* 04 */ CM_SELECT_COPY_SOURCE, - /* 05 */ CM_SETUP_COPY_DEST_1, - /* 06 */ CM_SETUP_COPY_DEST_2, - /* 07 */ CM_SELECT_COPY_DEST, - /* 08 */ CM_EXIT_TO_COPY_SOURCE_1, - /* 09 */ CM_EXIT_TO_COPY_SOURCE_2, + /* 0 */ CM_FADE_IN_START, + /* 1 */ CM_FADE_IN_END, + /* 2 */ CM_MAIN_MENU, + /* 3 */ CM_SETUP_COPY_SOURCE, + /* 4 */ CM_SELECT_COPY_SOURCE, + /* 5 */ CM_SETUP_COPY_DEST_1, + /* 6 */ CM_SETUP_COPY_DEST_2, + /* 7 */ CM_SELECT_COPY_DEST, + /* 8 */ CM_EXIT_TO_COPY_SOURCE_1, + /* 9 */ CM_EXIT_TO_COPY_SOURCE_2, /* 10 */ CM_SETUP_COPY_CONFIRM_1, /* 11 */ CM_SETUP_COPY_CONFIRM_2, /* 12 */ CM_COPY_CONFIRM, @@ -168,11 +168,11 @@ typedef enum CharPage { } CharPage; typedef enum KeyboardButton { - /* 00 */ FS_KBD_BTN_HIRA, - /* 01 */ FS_KBD_BTN_KATA, - /* 02 */ FS_KBD_BTN_ENG, - /* 03 */ FS_KBD_BTN_BACKSPACE, - /* 04 */ FS_KBD_BTN_END, + /* 0 */ FS_KBD_BTN_HIRA, + /* 1 */ FS_KBD_BTN_KATA, + /* 2 */ FS_KBD_BTN_ENG, + /* 3 */ FS_KBD_BTN_BACKSPACE, + /* 4 */ FS_KBD_BTN_END, /* 99 */ FS_KBD_BTN_NONE = 99 } KeyboardButton; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c index 1761c64750..58cb01589e 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c @@ -690,7 +690,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) { if ((pauseCtx->mainState == PAUSE_MAIN_STATE_EQUIP_CHANGED) && (sEquipTimer == 9)) { #ifndef AVOID_UB - //! @bug: This function shouldn't take any arguments + //! @bug This function shouldn't take any arguments KaleidoScope_ProcessPlayerPreRender(play); #else KaleidoScope_ProcessPlayerPreRender();