From 2e18eb334bad77db0625549c62849333705214b8 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Tue, 30 Aug 2022 23:35:00 +0200 Subject: [PATCH] Fix misc 16 (#1371) * Replace tabs in exceptasm.s source * Replace tabs with \t in strings * Fix grammar in various comments * Fix "initalize" typos in code * (fix typo) `__osMallocIsInitalized` -> `__osMallocIsInitialized` * Some Link -> Player * Use `EXCH_ITEM_` more * "bgm music" -> "background music" * Fix typos in `place_title_cards.xml` * `SkelAnime_Update` returns a boolean * Run formatter --- assets/xml/textures/place_title_cards.xml | 12 ++-- include/functions.h | 8 +-- include/variables.h | 2 +- include/z64.h | 2 +- include/z64actor.h | 2 +- include/z64camera.h | 2 +- src/code/__osMalloc.c | 8 +-- src/code/audio_heap.c | 2 +- src/code/audio_load.c | 4 +- src/code/audio_synthesis.c | 2 +- src/code/code_800E4FE0.c | 2 +- src/code/code_800EC960.c | 2 +- src/code/debug_malloc.c | 4 +- src/code/speed_meter.c | 2 +- src/code/system_malloc.c | 4 +- src/code/z_actor.c | 2 +- src/code/z_camera.c | 30 ++++----- src/code/z_malloc.c | 4 +- src/code/z_play.c | 4 +- src/code/z_view.c | 4 +- src/libultra/os/exceptasm.s | 64 +++++++++---------- .../actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c | 6 +- .../actors/ovl_Bg_Treemouth/z_bg_treemouth.c | 2 +- src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 22 +++---- src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h | 4 +- src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 8 +-- src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 2 +- src/overlays/actors/ovl_En_Ani/z_en_ani.c | 2 +- src/overlays/actors/ovl_En_Cow/z_en_cow.c | 4 +- src/overlays/actors/ovl_En_Cs/z_en_cs.c | 2 +- .../actors/ovl_En_Dodongo/z_en_dodongo.c | 2 +- src/overlays/actors/ovl_En_Ds/z_en_ds.c | 2 +- .../actors/ovl_En_Floormas/z_en_floormas.c | 12 ++-- src/overlays/actors/ovl_En_Fu/z_en_fu.c | 2 +- src/overlays/actors/ovl_En_GeldB/z_en_geldb.c | 8 +-- .../ovl_En_Horse_Ganon/z_en_horse_ganon.c | 2 +- src/overlays/actors/ovl_En_Hs2/z_en_hs2.c | 2 +- src/overlays/actors/ovl_En_In/z_en_in.c | 2 +- .../actors/ovl_En_Niw_Lady/z_en_niw_lady.c | 4 +- src/overlays/actors/ovl_En_Owl/z_en_owl.c | 4 +- src/overlays/actors/ovl_En_Skb/z_en_skb.c | 8 +-- src/overlays/actors/ovl_En_St/z_en_st.c | 8 +-- src/overlays/actors/ovl_En_Tite/z_en_tite.c | 2 +- src/overlays/actors/ovl_En_Tr/z_en_tr.c | 2 +- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 14 ++-- .../misc/ovl_kaleido_scope/z_kaleido_item.c | 2 +- 46 files changed, 147 insertions(+), 147 deletions(-) diff --git a/assets/xml/textures/place_title_cards.xml b/assets/xml/textures/place_title_cards.xml index c1771d4c8e..44bd6c8fb4 100644 --- a/assets/xml/textures/place_title_cards.xml +++ b/assets/xml/textures/place_title_cards.xml @@ -150,9 +150,9 @@ - - - + + + @@ -215,9 +215,9 @@ - - - + + + diff --git a/include/functions.h b/include/functions.h index 28ad31f25b..fe1e99d357 100644 --- a/include/functions.h +++ b/include/functions.h @@ -939,7 +939,7 @@ void ZeldaArena_GetSizes(u32* outMaxFree, u32* outFree, u32* outAlloc); void ZeldaArena_Check(void); void ZeldaArena_Init(void* start, u32 size); void ZeldaArena_Cleanup(void); -u8 ZeldaArena_IsInitalized(void); +u8 ZeldaArena_IsInitialized(void); void MapMark_Init(PlayState* play); void MapMark_ClearPointers(PlayState* play); void MapMark_Draw(PlayState* play); @@ -1729,7 +1729,7 @@ void DebugArena_GetSizes(u32* outMaxFree, u32* outFree, u32* outAlloc); void DebugArena_Check(void); void DebugArena_Init(void* start, u32 size); void DebugArena_Cleanup(void); -u8 DebugArena_IsInitalized(void); +u8 DebugArena_IsInitialized(void); void UCodeDisas_Init(UCodeDisas*); void UCodeDisas_Destroy(UCodeDisas*); // void UCodeDisas_Disassemble(UCodeDisas*, Gfx*); @@ -2031,7 +2031,7 @@ void SystemArena_GetSizes(u32* outMaxFree, u32* outFree, u32* outAlloc); void SystemArena_Check(void); void SystemArena_Init(void* start, u32 size); void SystemArena_Cleanup(void); -u8 SystemArena_IsInitalized(void); +u8 SystemArena_IsInitialized(void); u32 Rand_Next(void); void Rand_Seed(u32 seed); f32 Rand_ZeroOne(void); @@ -2060,7 +2060,7 @@ void __osMallocInit(Arena* arena, void* start, u32 size); void __osMallocAddBlock(Arena* arena, void* start, s32 size); void ArenaImpl_RemoveAllBlocks(Arena* arena); void __osMallocCleanup(Arena* arena); -u8 __osMallocIsInitalized(Arena* arena); +u8 __osMallocIsInitialized(Arena* arena); void __osMalloc_FreeBlockTest(Arena* arena, ArenaNode* node); void* __osMalloc_NoLockDebug(Arena* arena, u32 size, const char* file, s32 line); void* __osMallocDebug(Arena* arena, u32 size, const char* file, s32 line); diff --git a/include/variables.h b/include/variables.h index f947ef989d..79b17f5ce6 100644 --- a/include/variables.h +++ b/include/variables.h @@ -128,7 +128,7 @@ extern f32 gStereoPanVolume[128]; extern f32 gDefaultPanVolume[128]; extern s16 gLowPassFilterData[16 * 8]; extern s16 gHighPassFilterData[15 * 8]; -extern s32 gAudioContextInitalized; +extern s32 gAudioContextInitialized; extern u8 gIsLargeSfxBank[7]; extern u8 gChannelsPerBank[4][7]; extern u8 gUsedChannelsPerBank[4][7]; diff --git a/include/z64.h b/include/z64.h index e5ec9e9ae0..c9df02d0e2 100644 --- a/include/z64.h +++ b/include/z64.h @@ -811,7 +811,7 @@ typedef enum { /* 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 kaliedoscope handles the game over menu + /* 04 */ 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/z64actor.h b/include/z64actor.h index f3d43e76ea..03418601d0 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -220,7 +220,7 @@ typedef struct Actor { /* 0x100 */ Vec3f prevPos; // World position from the previous update cycle /* 0x10C */ u8 isTargeted; // Set to true if the actor is currently being targeted by the player /* 0x10D */ u8 targetPriority; // Lower values have higher priority. Resets to 0 when player stops targeting - /* 0x10E */ u16 textId; // Text ID to pass to link/display when interacting with the actor + /* 0x10E */ u16 textId; // Text ID to pass to player/display when interacting with the actor /* 0x110 */ u16 freezeTimer; // Actor does not update when set. Timer decrements automatically /* 0x112 */ u16 colorFilterParams; // Set color filter to red, blue, or white. Toggle opa or xlu /* 0x114 */ u8 colorFilterTimer; // A non-zero value enables the color filter. Decrements automatically diff --git a/include/z64camera.h b/include/z64camera.h index 944709bf95..ab87799110 100644 --- a/include/z64camera.h +++ b/include/z64camera.h @@ -68,7 +68,7 @@ typedef enum { /* 0x18 */ CAM_SET_PIVOT_IN_FRONT, // The camera used on Link's balcony in Kokiri forest. Data present in scene data for Deku Tree, GTG, Inside Ganon's Castle (TODO: may or may not be used) "CIRCLE3" /* 0x19 */ CAM_SET_PREREND_FIXED, // Camera is fixed in position and rotation "PREREND0" /* 0x1A */ CAM_SET_PREREND_PIVOT, // Camera is fixed in position with fixed pitch, but is free to rotate in the yaw direction 360 degrees "PREREND1" - /* 0x1B */ CAM_SET_PREREND_SIDE_SCROLL, // Camera side-scrolls position to follow link. Only used in castle courtyard with the guards "PREREND3" + /* 0x1B */ CAM_SET_PREREND_SIDE_SCROLL, // Camera side-scrolls position to follow the player. Only used in castle courtyard with the guards "PREREND3" /* 0x1C */ CAM_SET_DOOR0, // Custom room door transitions, used in fire and royal family tomb /* 0x1D */ CAM_SET_DOORC, // Generic room door transitions, camera moves and follows player as the door is open and closed /* 0x1E */ CAM_SET_CRAWLSPACE, // Used in all crawlspaces "RAIL3" diff --git a/src/code/__osMalloc.c b/src/code/__osMalloc.c index 19de34a8be..22cabc0b5a 100644 --- a/src/code/__osMalloc.c +++ b/src/code/__osMalloc.c @@ -163,7 +163,7 @@ void __osMallocCleanup(Arena* arena) { bzero(arena, sizeof(*arena)); } -u8 __osMallocIsInitalized(Arena* arena) { +u8 __osMallocIsInitialized(Arena* arena) { return arena->isInit; } @@ -682,8 +682,8 @@ void __osDisplayArena(Arena* arena) { ArenaNode* iter; ArenaNode* next; - if (!__osMallocIsInitalized(arena)) { - osSyncPrintf("アリーナは初期化されていません\n"); // "Arena is not initalized" + if (!__osMallocIsInitialized(arena)) { + osSyncPrintf("アリーナは初期化されていません\n"); // "Arena is not initialized" return; } @@ -746,7 +746,7 @@ void ArenaImpl_FaultClient(Arena* arena) { ArenaNode* next; FaultDrawer_Printf("ARENA INFO (0x%08x)\n", arena); - if (!__osMallocIsInitalized(arena)) { + if (!__osMallocIsInitialized(arena)) { FaultDrawer_Printf("Arena is uninitalized\n", arena); return; } diff --git a/src/code/audio_heap.c b/src/code/audio_heap.c index 7cdfe086b0..504b56244e 100644 --- a/src/code/audio_heap.c +++ b/src/code/audio_heap.c @@ -1059,7 +1059,7 @@ void AudioHeap_Init(void) { AudioHeap_InitSampleCaches(spec->persistentSampleCacheSize, spec->temporarySampleCacheSize); AudioLoad_InitSampleDmaBuffers(gAudioContext.numNotes); - // Initalize Loads + // Initialize Loads gAudioContext.preloadSampleStackTop = 0; AudioLoad_InitSlowLoads(); AudioLoad_InitScriptLoads(); diff --git a/src/code/audio_load.c b/src/code/audio_load.c index 73de884116..c234538f34 100644 --- a/src/code/audio_load.c +++ b/src/code/audio_load.c @@ -70,7 +70,7 @@ s32 sAudioLoadPad2[4]; // double file padding? DmaHandler sDmaHandler = osEPiStartDma; void* sUnusedHandler = NULL; -s32 gAudioContextInitalized = false; +s32 gAudioContextInitialized = false; void AudioLoad_DecreaseSampleDmaTtls(void) { u32 i; @@ -1235,7 +1235,7 @@ void AudioLoad_Init(void* heap, u32 heapSize) { } AudioHeap_InitPool(&gAudioContext.permanentPool, ramAddr, gAudioHeapInitSizes.permanentPoolSize); - gAudioContextInitalized = true; + gAudioContextInitialized = true; osSendMesg(gAudioContext.taskStartQueueP, (OSMesg)gAudioContext.totalTaskCount, OS_MESG_NOBLOCK); } diff --git a/src/code/audio_synthesis.c b/src/code/audio_synthesis.c index a00c57ffae..26538dcfde 100644 --- a/src/code/audio_synthesis.c +++ b/src/code/audio_synthesis.c @@ -1266,7 +1266,7 @@ Acmd* AudioSynth_LoadWaveSamples(Acmd* cmd, NoteSubEu* noteSubEu, NoteSynthesisS } /** - * The Haas Effect gives directionality to sound by appling a small (< 35ms) delay to either the left or right channel. + * The Haas Effect gives directionality to sound by applying a small (< 35ms) delay to either the left or right channel. * The delay is small enough that the sound is still perceived as one sound, but the channel that is not delayed will * reach our ear first and give a sense of directionality. The sound is directed towards the opposite side of the delay. */ diff --git a/src/code/code_800E4FE0.c b/src/code/code_800E4FE0.c index c1a75de4af..3b140b6cf7 100644 --- a/src/code/code_800E4FE0.c +++ b/src/code/code_800E4FE0.c @@ -573,7 +573,7 @@ s32 func_800E5F88(s32 resetPreloadID) { void Audio_PreNMIInternal(void) { gAudioContext.resetTimer = 1; - if (gAudioContextInitalized) { + if (gAudioContextInitialized) { func_800E5F88(0); gAudioContext.resetStatus = 0; } diff --git a/src/code/code_800EC960.c b/src/code/code_800EC960.c index 074fececa9..fc05e71ad6 100644 --- a/src/code/code_800EC960.c +++ b/src/code/code_800EC960.c @@ -4854,7 +4854,7 @@ void Audio_SetSequenceMode(u8 seqMode) { sPrevSeqMode = seqMode + 0x80; } } else { - // Hyrule Field will play slightly different bgm music depending on whether player is standing + // Hyrule Field will play slightly different background music depending on whether player is standing // still or moving. This is the logic to determine the transition between those two states if (seqMode == SEQ_MODE_DEFAULT) { if (sPrevSeqMode == SEQ_MODE_STILL) { diff --git a/src/code/debug_malloc.c b/src/code/debug_malloc.c index 60c7607cb5..670ce857ab 100644 --- a/src/code/debug_malloc.c +++ b/src/code/debug_malloc.c @@ -106,6 +106,6 @@ void DebugArena_Cleanup(void) { __osMallocCleanup(&sDebugArena); } -u8 DebugArena_IsInitalized(void) { - return __osMallocIsInitalized(&sDebugArena); +u8 DebugArena_IsInitialized(void) { + return __osMallocIsInitialized(&sDebugArena); } diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c index 59fe130678..f37a227888 100644 --- a/src/code/speed_meter.c +++ b/src/code/speed_meter.c @@ -167,7 +167,7 @@ void SpeedMeter_DrawAllocEntries(SpeedMeter* meter, GraphicsContext* gfxCtx, Gam y = 212; if (SREG(0) > 2) { - if (ZeldaArena_IsInitalized()) { + if (ZeldaArena_IsInitialized()) { ZeldaArena_GetSizes(&zeldaFreeMax, &zeldaFree, &zeldaAlloc); SpeedMeter_InitAllocEntry(&entry, zeldaFree + zeldaAlloc, zeldaAlloc, GPACK_RGBA5551(0, 0, 255, 1), GPACK_RGBA5551(255, 255, 255, 1), ulx, lrx, y, y + 1); diff --git a/src/code/system_malloc.c b/src/code/system_malloc.c index d9085c12f1..f62e5639ae 100644 --- a/src/code/system_malloc.c +++ b/src/code/system_malloc.c @@ -105,6 +105,6 @@ void SystemArena_Cleanup(void) { __osMallocCleanup(&gSystemArena); } -u8 SystemArena_IsInitalized(void) { - return __osMallocIsInitalized(&gSystemArena); +u8 SystemArena_IsInitialized(void) { + return __osMallocIsInitialized(&gSystemArena); } diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 9c71c31285..5e331cbe4f 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -2939,7 +2939,7 @@ void func_800328D4(PlayState* play, ActorContext* actorCtx, Player* player, u32 if ((actor->update != NULL) && ((Player*)actor != player) && CHECK_FLAG_ALL(actor->flags, ACTOR_FLAG_0)) { // This block below is for determining the closest actor to player in determining the volume - // used while playing enemy bgm music + // used while playing enemy background music if ((actorCategory == ACTORCAT_ENEMY) && CHECK_FLAG_ALL(actor->flags, ACTOR_FLAG_0 | ACTOR_FLAG_2) && (actor->xyzDistToPlayerSq < SQ(500.0f)) && (actor->xyzDistToPlayerSq < sbgmEnemyDistSq)) { actorCtx->targetCtx.bgmEnemy = actor; diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 2349859692..a46705140f 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -68,8 +68,8 @@ f32 Camera_InterpolateCurve(f32 a, f32 b) { } /* - * Performs linear interpoloation between `cur` and `target`. If `cur` is within - * `minDiff` units, The result is rounded up to `target` + * Performs linear interpolation between `cur` and `target`. If `cur` is within + * `minDiff` units, the result is rounded up to `target` */ f32 Camera_LERPCeilF(f32 target, f32 cur, f32 stepScale, f32 minDiff) { f32 diff = target - cur; @@ -87,8 +87,8 @@ f32 Camera_LERPCeilF(f32 target, f32 cur, f32 stepScale, f32 minDiff) { } /* - * Performs linear interpoloation between `cur` and `target`. If `cur` is within - * `minDiff` units, The result is rounded down to `cur` + * Performs linear interpolation between `cur` and `target`. If `cur` is within + * `minDiff` units, the result is rounded down to `cur` */ f32 Camera_LERPFloorF(f32 target, f32 cur, f32 stepScale, f32 minDiff) { f32 diff = target - cur; @@ -106,8 +106,8 @@ f32 Camera_LERPFloorF(f32 target, f32 cur, f32 stepScale, f32 minDiff) { } /* - * Performs linear interpoloation between `cur` and `target`. If `cur` is within - * `minDiff` units, The result is rounded up to `target` + * Performs linear interpolation between `cur` and `target`. If `cur` is within + * `minDiff` units, the result is rounded up to `target` */ s16 Camera_LERPCeilS(s16 target, s16 cur, f32 stepScale, s16 minDiff) { s16 diff = target - cur; @@ -125,8 +125,8 @@ s16 Camera_LERPCeilS(s16 target, s16 cur, f32 stepScale, s16 minDiff) { } /* - * Performs linear interpoloation between `cur` and `target`. If `cur` is within - * `minDiff` units, The result is rounded down to `cur` + * Performs linear interpolation between `cur` and `target`. If `cur` is within + * `minDiff` units, the result is rounded down to `cur` */ s16 Camera_LERPFloorS(s16 target, s16 cur, f32 stepScale, s16 minDiff) { s16 diff = target - cur; @@ -144,8 +144,8 @@ s16 Camera_LERPFloorS(s16 target, s16 cur, f32 stepScale, s16 minDiff) { } /* - * Performs linear interpoloation between `cur` and `target`. If `cur` is within - * `minDiff` units, The result is rounded up to `target` + * Performs linear interpolation between `cur` and `target`. If `cur` is within + * `minDiff` units, the result is rounded up to `target` */ void Camera_LERPCeilVec3f(Vec3f* target, Vec3f* cur, f32 yStepScale, f32 xzStepScale, f32 minDiff) { cur->x = Camera_LERPCeilF(target->x, cur->x, xzStepScale, minDiff); @@ -5642,7 +5642,7 @@ s32 Camera_Demo1(Camera* camera) { switch (camera->animState) { case 0: - // initalize camera state + // initialize camera state rwData->keyframe = 0; rwData->curFrame = 0.0f; camera->animState++; @@ -6174,7 +6174,7 @@ s32 Camera_Demo6(Camera* camera) { switch (camera->animState) { case 0: - // initalizes the camera state. + // initializes the camera state. rwData->animTimer = 0; camera->fov = 60.0f; Actor_GetWorld(&focusPosRot, camFocus); @@ -6280,7 +6280,7 @@ s32 Camera_Demo9(Camera* camera) { switch (camera->animState) { case 0: - // initalize the camera state + // initialize the camera state rwData->keyframe = 0; rwData->finishAction = 0; rwData->curFrame = 0.0f; @@ -6301,7 +6301,7 @@ s32 Camera_Demo9(Camera* camera) { // if the animation timer is still running, run the demo logic // if it is not, then the case will fallthrough to the finish logic. - // Run the at and eye cs interpoloation functions, if either of them return 1 (that no more points + // Run the at and eye cs interpolation functions, if either of them returns 1 (that no more points // exist) change the animation state to 2 (standby) if (func_800BB2B4(&csEyeUpdate, &newRoll, camFOV, onePointCamData->eyePoints, &rwData->keyframe, &rwData->curFrame) != 0 || @@ -6711,7 +6711,7 @@ s32 Camera_Special6(Camera* camera) { camera->fov += (CAM_DATA_SCALED(fov) - camera->fov) / rwData->animTimer; rwData->animTimer--; } else { - // Camera following link on the x axis. + // Camera following player on the x axis. sCameraInterfaceFlags &= 0xF0FF; eyePosCalc = *eyeNext; eyePosCalc.x += (playerPosRot->pos.x - eyePosCalc.x) * 0.5f; diff --git a/src/code/z_malloc.c b/src/code/z_malloc.c index e51d381cb6..35942de28f 100644 --- a/src/code/z_malloc.c +++ b/src/code/z_malloc.c @@ -104,6 +104,6 @@ void ZeldaArena_Cleanup(void) { __osMallocCleanup(&sZeldaArena); } -u8 ZeldaArena_IsInitalized(void) { - return __osMallocIsInitalized(&sZeldaArena); +u8 ZeldaArena_IsInitialized(void) { + return __osMallocIsInitialized(&sZeldaArena); } diff --git a/src/code/z_play.c b/src/code/z_play.c index 33013a2e55..ceeb68f75b 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -517,10 +517,10 @@ void Play_Update(PlayState* this) { // fade out bgm if "continue bgm" flag is not set if (!(gEntranceTable[this->nextEntranceIndex + sceneLayer].field & ENTRANCE_INFO_CONTINUE_BGM_FLAG)) { - // "Sound initalized. 111" + // "Sound initialized. 111" osSyncPrintf("\n\n\nサウンドイニシャル来ました。111"); if ((this->transitionType < TRANS_TYPE_MAX) && !Environment_IsForcedSequenceDisabled()) { - // "Sound initalized. 222" + // "Sound initialized. 222" osSyncPrintf("\n\n\nサウンドイニシャル来ました。222"); func_800F6964(0x14); gSaveContext.seqId = (u8)NA_BGM_DISABLED; diff --git a/src/code/z_view.c b/src/code/z_view.c index 96c7b79d19..044e5603e7 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -334,7 +334,7 @@ s32 View_ApplyPerspective(View* view) { Matrix_MtxToMtxF(projection, &mf); osSyncPrintf("projection\n"); for (i = 0; i < 4; i++) { - osSyncPrintf(" %f %f %f %f\n", mf.mf[i][0], mf.mf[i][1], mf.mf[i][2], mf.mf[i][3]); + osSyncPrintf("\t%f\t%f\t%f\t%f\n", mf.mf[i][0], mf.mf[i][1], mf.mf[i][2], mf.mf[i][3]); } osSyncPrintf("\n"); } @@ -373,7 +373,7 @@ s32 View_ApplyPerspective(View* view) { Matrix_MtxToMtxF(view->viewingPtr, &mf); osSyncPrintf("viewing\n"); for (i = 0; i < 4; i++) { - osSyncPrintf(" %f %f %f %f\n", mf.mf[i][0], mf.mf[i][1], mf.mf[i][2], mf.mf[i][3]); + osSyncPrintf("\t%f\t%f\t%f\t%f\n", mf.mf[i][0], mf.mf[i][1], mf.mf[i][2], mf.mf[i][3]); } osSyncPrintf("\n"); } diff --git a/src/libultra/os/exceptasm.s b/src/libultra/os/exceptasm.s index 79a6ed1a2b..d6bd3082ce 100644 --- a/src/libultra/os/exceptasm.s +++ b/src/libultra/os/exceptasm.s @@ -31,38 +31,38 @@ ENDDATA(__osPiIntTable) .balign 16 __osIntOffTable: - .byte 0x00 /* redispatch */ - .byte 0x14 /* prenmi */ - .byte 0x18 /* IP6_Hdlr */ - .byte 0x18 /* IP6_Hdlr */ - .byte 0x1C /* IP7_Hdlr */ - .byte 0x1C /* IP7_Hdlr */ - .byte 0x1C /* IP7_Hdlr */ - .byte 0x1C /* IP7_Hdlr */ - .byte 0x20 /* counter */ - .byte 0x20 /* counter */ - .byte 0x20 /* counter */ - .byte 0x20 /* counter */ - .byte 0x20 /* counter */ - .byte 0x20 /* counter */ - .byte 0x20 /* counter */ - .byte 0x20 /* counter */ - .byte 0x00 /* redispatch */ - .byte 0x04 /* sw1 */ - .byte 0x08 /* sw2 */ - .byte 0x08 /* sw2 */ - .byte 0x0C /* rcp */ - .byte 0x0C /* rcp */ - .byte 0x0C /* rcp */ - .byte 0x0C /* rcp */ - .byte 0x10 /* cart */ - .byte 0x10 /* cart */ - .byte 0x10 /* cart */ - .byte 0x10 /* cart */ - .byte 0x10 /* cart */ - .byte 0x10 /* cart */ - .byte 0x10 /* cart */ - .byte 0x10 /* cart */ + .byte 0x00 /* redispatch */ + .byte 0x14 /* prenmi */ + .byte 0x18 /* IP6_Hdlr */ + .byte 0x18 /* IP6_Hdlr */ + .byte 0x1C /* IP7_Hdlr */ + .byte 0x1C /* IP7_Hdlr */ + .byte 0x1C /* IP7_Hdlr */ + .byte 0x1C /* IP7_Hdlr */ + .byte 0x20 /* counter */ + .byte 0x20 /* counter */ + .byte 0x20 /* counter */ + .byte 0x20 /* counter */ + .byte 0x20 /* counter */ + .byte 0x20 /* counter */ + .byte 0x20 /* counter */ + .byte 0x20 /* counter */ + .byte 0x00 /* redispatch */ + .byte 0x04 /* sw1 */ + .byte 0x08 /* sw2 */ + .byte 0x08 /* sw2 */ + .byte 0x0C /* rcp */ + .byte 0x0C /* rcp */ + .byte 0x0C /* rcp */ + .byte 0x0C /* rcp */ + .byte 0x10 /* cart */ + .byte 0x10 /* cart */ + .byte 0x10 /* cart */ + .byte 0x10 /* cart */ + .byte 0x10 /* cart */ + .byte 0x10 /* cart */ + .byte 0x10 /* cart */ + .byte 0x10 /* cart */ __osIntTable: .word redispatch diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c index 55db2c7ceb..f422b9169d 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c +++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c @@ -158,7 +158,7 @@ void BgHakaGate_StatueInactive(BgHakaGate* this, PlayState* play) { void BgHakaGate_StatueIdle(BgHakaGate* this, PlayState* play) { Player* player = GET_PLAYER(play); - s32 linkDirection; + s32 playerDirection; f32 forceDirection; if (this->dyna.unk_150 != 0.0f) { @@ -166,8 +166,8 @@ void BgHakaGate_StatueIdle(BgHakaGate* this, PlayState* play) { this->vInitTurnAngle = this->dyna.actor.shape.rot.y - this->dyna.actor.yawTowardsPlayer; sStatueDistToPlayer = this->dyna.actor.xzDistToPlayer; forceDirection = (this->dyna.unk_150 >= 0.0f) ? 1.0f : -1.0f; - linkDirection = ((s16)(this->dyna.actor.yawTowardsPlayer - player->actor.shape.rot.y) > 0) ? -1 : 1; - this->vTurnDirection = linkDirection * forceDirection; + playerDirection = ((s16)(this->dyna.actor.yawTowardsPlayer - player->actor.shape.rot.y) > 0) ? -1 : 1; + this->vTurnDirection = playerDirection * forceDirection; this->actionFunc = BgHakaGate_StatueTurn; } else { player->stateFlags2 &= ~PLAYER_STATE2_4; diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index 63d3fe9f2a..7883ac944b 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -236,7 +236,7 @@ void BgTreemouth_Draw(Actor* thisx, PlayState* play) { if (GET_EVENTCHKINF(EVENTCHKINF_07)) { alpha = 2150; } - } else { // neeeded to match + } else { // needed to match } if (gSaveContext.sceneLayer == 6) { diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index bd26c167fe..ff4c0094f1 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -660,7 +660,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) { this->targetPos = this->actor.world.pos; Math_ApproachF(&this->tentMaxAngle, 0.5f, 1.0f, 0.01); Math_ApproachF(&this->tentSpeed, 160.0f, 1.0f, 50.0f); - if ((this->timers[0] == 0) || (this->linkHitTimer != 0)) { + if ((this->timers[0] == 0) || (this->playerHitTimer != 0)) { dx = this->tentPos[22].x - player->actor.world.pos.x; dy = this->tentPos[22].y - player->actor.world.pos.y; dz = this->tentPos[22].z - player->actor.world.pos.z; @@ -670,9 +670,9 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) { this->timers[0] = 40; this->tentSpeed = 0; if ((s16)(this->actor.shape.rot.y - this->actor.yawTowardsPlayer) >= 0) { - this->linkToLeft = false; + this->playerToLeft = false; } else { - this->linkToLeft = true; + this->playerToLeft = true; } } else { this->tentMaxAngle = .001f; @@ -702,7 +702,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) { } for (indS1 = 0; indS1 < 41; indS1++) { if (this->timers[0] > 25) { - if (!this->linkToLeft) { + if (!this->playerToLeft) { Math_ApproachS(&this->tentRot[indS1].z, sCurlRot[indS1] * 0x100, 1.0f / this->tentMaxAngle, this->tentSpeed); } else { @@ -710,7 +710,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) { this->tentSpeed); } } else { - if (!this->linkToLeft) { + if (!this->playerToLeft) { Math_ApproachS(&this->tentRot[indS1].z, sGrabRot[indS1] * 0x100, 1.0f / this->tentMaxAngle, this->tentSpeed); } else { @@ -725,7 +725,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) { Math_ApproachS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 5, 0xC8); } if (this->work[MO_TENT_ACTION_STATE] == MO_TENT_CURL) { - if ((this->timers[0] >= 5) && (this->linkHitTimer != 0) && (player->actor.parent == NULL)) { + if ((this->timers[0] >= 5) && (this->playerHitTimer != 0) && (player->actor.parent == NULL)) { if (play->grabPlayer(play, player)) { player->actor.parent = &this->actor; this->work[MO_TENT_ACTION_STATE] = MO_TENT_GRAB; @@ -1158,7 +1158,7 @@ void BossMo_TentCollisionCheck(BossMo* this, PlayState* play) { this->cutScale = 1.0f; } else if (hurtbox->toucher.dmgFlags & (DMG_JUMP_MASTER | DMG_JUMP_GIANT | DMG_SPIN_MASTER | DMG_SPIN_GIANT | DMG_SLASH_GIANT | DMG_SLASH_MASTER)) { - this->linkHitTimer = 5; + this->playerHitTimer = 5; } this->tentRippleSize = 0.2f; for (i2 = 0; i2 < 10; i2++) { @@ -1177,7 +1177,7 @@ void BossMo_TentCollisionCheck(BossMo* this, PlayState* play) { break; } else if (this->tentCollider.elements[i1].info.toucherFlags & TOUCH_HIT) { this->tentCollider.elements[i1].info.toucherFlags &= ~TOUCH_HIT; - this->linkHitTimer = 5; + this->playerHitTimer = 5; break; } } @@ -2377,8 +2377,8 @@ void BossMo_UpdateTent(Actor* thisx, PlayState* play) { if (this->work[MO_TENT_INVINC_TIMER] != 0) { this->work[MO_TENT_INVINC_TIMER]--; } - if (this->linkHitTimer != 0) { - this->linkHitTimer--; + if (this->playerHitTimer != 0) { + this->playerHitTimer--; } if (this->drawActor) { @@ -2540,7 +2540,7 @@ void BossMo_DrawTentacle(BossMo* this, PlayState* play) { Vec3s sp84; Matrix_Push(); - if (this->linkToLeft) { + if (this->playerToLeft) { sp8C.x *= -1.0f; } Matrix_MultVec3f(&sp8C, &this->grabPosRot.pos); diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h index 310af26fcc..310a45ce9c 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h @@ -67,7 +67,7 @@ typedef struct BossMo { /* 0x0170 */ s16 zSwing; /* 0x0172 */ s16 cutIndex; /* 0x0174 */ s16 meltIndex; - /* 0x0176 */ s16 linkToLeft; + /* 0x0176 */ s16 playerToLeft; /* 0x0178 */ s16 mashCounter; /* 0x017A */ s16 noBubbles; /* 0x017C */ s16 sfxTimer; @@ -87,7 +87,7 @@ typedef struct BossMo { /* 0x01CE */ s16 attackAngleMod; /* 0x01D0 */ u8 unk_1D0; // unused? /* 0x01D1 */ u8 drawActor; - /* 0x01D2 */ u8 linkHitTimer; + /* 0x01D2 */ u8 playerHitTimer; /* 0x01D4 */ Vec3f targetPos; /* 0x01E0 */ f32 tentRippleSize; /* 0x01E4 */ PosRot grabPosRot; diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index 271e9d73bc..fed332efcb 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -198,7 +198,7 @@ static Vec3f sTwinrovaPillarPos[] = { { 0.0f, 380.0f, -580.0f }, }; -static u8 sTwInitalized = false; +static u8 sTwInitialized = false; static InitChainEntry sInitChain[] = { ICHAIN_U8(targetMode, 5, ICHAIN_CONTINUE), @@ -488,8 +488,8 @@ void BossTw_Init(Actor* thisx, PlayState* play2) { this->actor.colChkInfo.health = 0; Collider_InitCylinder(play, &this->collider); - if (!sTwInitalized) { - sTwInitalized = true; + if (!sTwInitialized) { + sTwInitialized = true; play->envCtx.lightSettingOverride = 1; play->envCtx.prevLightSetting = 1; play->envCtx.lightSetting = 1; @@ -600,7 +600,7 @@ void BossTw_Destroy(Actor* thisx, PlayState* play) { } if (thisx->params == TW_TWINROVA) { - sTwInitalized = false; + sTwInitialized = false; } } diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index 67a493c6d9..c0c4a78cbb 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -3463,7 +3463,7 @@ void BossVa_UpdateEffects(PlayState* play) { if (effect->type == VA_TUMOR) { s16 yaw; - + refActor = effect->parent; effect->rot.z += 0x157C; diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index fbc3480229..b71623d5c2 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -263,7 +263,7 @@ void EnAni_Update(Actor* thisx, PlayState* play) { func_800788CC(NA_SE_IT_EARTHQUAKE); } } else { - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { this->skelAnime.curFrame = 0.0f; } this->actionFunc(this, play); diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index 389d154b71..cffc77dbe4 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -303,7 +303,7 @@ void EnCow_Update(Actor* thisx, PlayState* play2) { CollisionCheck_SetOC(play, &play->colChkCtx, &this->colliders[1].base); Actor_MoveForward(thisx); Actor_UpdateBgCheckInfo(play, thisx, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2); - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { if (this->skelAnime.animation == &gCowBodyChewAnim) { Audio_PlayActorSfx2(thisx, NA_SE_EV_COW_CRY); Animation_Change(&this->skelAnime, &gCowBodyMoveHeadAnim, 1.0f, 0.0f, @@ -343,7 +343,7 @@ void func_809DFE98(Actor* thisx, PlayState* play) { EnCow* this = (EnCow*)thisx; s32 pad; - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { if (this->skelAnime.animation == &gCowTailIdleAnim) { Animation_Change(&this->skelAnime, &gCowTailSwishAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gCowTailSwishAnim), ANIMMODE_ONCE, 1.0f); diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/src/overlays/actors/ovl_En_Cs/z_en_cs.c index 083f7d0545..f5b6c502d6 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c +++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.c @@ -398,7 +398,7 @@ void EnCs_Wait(EnCs* this, PlayState* play) { void EnCs_Talk(EnCs* this, PlayState* play) { Player* player = GET_PLAYER(play); - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { EnCs_ChangeAnim(this, this->currentAnimIndex, &this->currentAnimIndex); } diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index d17dcdcbe8..e2634d0c16 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -678,7 +678,7 @@ void EnDodongo_Death(EnDodongo* this, PlayState* play) { } else if (this->actor.colorFilterTimer == 0) { Actor_SetColorFilter(&this->actor, 0x4000, 0x78, 0, 4); } - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { if (this->timer == 0) { bomb = (EnBom*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOM, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 6, BOMB_BODY); diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/src/overlays/actors/ovl_En_Ds/z_en_ds.c index 02eb8c5baa..b58efadc8b 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.c @@ -236,7 +236,7 @@ void EnDs_Wait(EnDs* this, PlayState* play) { void EnDs_Update(Actor* thisx, PlayState* play) { EnDs* this = (EnDs*)thisx; - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { this->skelAnime.curFrame = 0.0f; } diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index e8235cedb5..fd64bf6603 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -442,11 +442,11 @@ void EnFloormas_Die(EnFloormas* this, PlayState* play) { void EnFloormas_BigDecideAction(EnFloormas* this, PlayState* play) { if (SkelAnime_Update(&this->skelAnime)) { - // within 400 units of link and within 90 degrees rotation of him + // within 400 units and within 90 degrees rotation of player if (this->actor.xzDistToPlayer < 400.0f && !Actor_IsFacingPlayer(&this->actor, 0x4000)) { this->actionTarget = this->actor.yawTowardsPlayer; EnFloormas_SetupTurn(this); - // within 280 units of link and within 45 degrees rotation of him + // within 280 units and within 45 degrees rotation of player } else if (this->actor.xzDistToPlayer < 280.0f && Actor_IsFacingPlayer(&this->actor, 0x2000)) { EnFloormas_SetupHover(this, play); } else { @@ -490,7 +490,7 @@ void EnFloormas_BigWalk(EnFloormas* this, PlayState* play) { this->actionTarget = this->actor.wallYaw; EnFloormas_SetupTurn(this); } else if ((this->actor.xzDistToPlayer < 400.0f) && !Actor_IsFacingPlayer(&this->actor, 0x4000)) { - // set target rotation to link. + // set target rotation to player. this->actionTarget = this->actor.yawTowardsPlayer; EnFloormas_SetupTurn(this); } else if (this->actionTimer == 0) { @@ -910,7 +910,7 @@ void EnFloormas_Merge(EnFloormas* this, PlayState* play) { this->collider.dim.radius = (sCylinderInit.dim.radius * 100.0f) * this->actor.scale.x; this->collider.dim.height = (sCylinderInit.dim.height * 100.0f) * this->actor.scale.x; - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { if (this->actor.scale.x >= 0.01f) { this->actor.flags &= ~ACTOR_FLAG_4; EnFloormas_MakeVulnerable(this); @@ -935,7 +935,7 @@ void EnFloormas_SmWait(EnFloormas* this, PlayState* play) { } void EnFloormas_TakeDamage(EnFloormas* this, PlayState* play) { - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { if (this->actor.colChkInfo.health == 0) { EnFloormas_Die(this, play); } else { @@ -954,7 +954,7 @@ void EnFloormas_TakeDamage(EnFloormas* this, PlayState* play) { } void EnFloormas_Recover(EnFloormas* this, PlayState* play) { - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { EnFloormas_SetupStand(this); } } diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index c95d288926..cc6c59ad4a 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -241,7 +241,7 @@ void EnFu_Update(Actor* thisx, PlayState* play) { CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); Actor_MoveForward(&this->actor); Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2); - if (!(this->behaviorFlags & FU_WAIT) && (SkelAnime_Update(&this->skelanime) != 0)) { + if (!(this->behaviorFlags & FU_WAIT) && SkelAnime_Update(&this->skelanime)) { Animation_Change(&this->skelanime, this->skelanime.animation, 1.0f, 0.0f, Animation_GetLastFrame(this->skelanime.animation), ANIMMODE_ONCE, 0.0f); } diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index dd1880b8bb..f8af274cf5 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -1183,17 +1183,17 @@ void EnGeldB_Block(EnGeldB* this, PlayState* play) { } void EnGeldB_SetupSidestep(EnGeldB* this, PlayState* play) { - s16 linkAngle; + s16 playerRotY; Player* player; f32 lastFrame = Animation_GetLastFrame(&gGerudoRedSidestepAnim); Animation_Change(&this->skelAnime, &gGerudoRedSidestepAnim, 1.0f, 0.0f, lastFrame, ANIMMODE_LOOP_INTERP, 0.0f); player = GET_PLAYER(play); Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 1, 0xFA0, 1); - linkAngle = player->actor.shape.rot.y; - if (Math_SinS(linkAngle - this->actor.shape.rot.y) > 0.0f) { + playerRotY = player->actor.shape.rot.y; + if (Math_SinS(playerRotY - this->actor.shape.rot.y) > 0.0f) { this->actor.speedXZ = -6.0f; - } else if (Math_SinS(linkAngle - this->actor.shape.rot.y) < 0.0f) { + } else if (Math_SinS(playerRotY - this->actor.shape.rot.y) < 0.0f) { this->actor.speedXZ = 6.0f; } else { this->actor.speedXZ = Rand_CenteredFloat(12.0f); diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c index 0c7085b902..b974ca0b40 100644 --- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c +++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c @@ -263,7 +263,7 @@ void func_80A68DB0(EnHorseGanon* this, PlayState* play) { func_80A686A8(this, play); - if (SkelAnime_Update(&this->skin.skelAnime) != 0) { + if (SkelAnime_Update(&this->skin.skelAnime)) { func_80A68B20(this); } } diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index 2a681bc731..59af9f5bfa 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -113,7 +113,7 @@ void EnHs2_Update(Actor* thisx, PlayState* play) { CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); Actor_MoveForward(&this->actor); Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2); - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { this->skelAnime.curFrame = 0.0f; } this->actionFunc(this, play); diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index bb2ea36f33..33a2e33f1f 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -617,7 +617,7 @@ void func_80A7A304(EnIn* this, PlayState* play) { if (this->skelAnime.animation == &object_in_Anim_018C38 && this->skelAnime.curFrame == 20.0f) { Audio_PlayActorSfx2(&this->actor, NA_SE_VO_IN_CRY_0); } - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { this->animationIdx %= 8; this->unk_1E8 = this->animationIdx; if (this->animationIdx == 3 || this->animationIdx == 4) { diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index 8fe5b1c59d..b87d87daf8 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -365,13 +365,13 @@ void func_80ABA878(EnNiwLady* this, PlayState* play) { } if (Actor_ProcessTalkRequest(&this->actor, play)) { playerExchangeItemId = func_8002F368(play); - if ((playerExchangeItemId == 6) && GET_EVENTCHKINF(EVENTCHKINF_6A)) { + if ((playerExchangeItemId == EXCH_ITEM_POCKET_CUCCO) && GET_EVENTCHKINF(EVENTCHKINF_6A)) { func_80078884(NA_SE_SY_TRE_BOX_APPEAR); player->actor.textId = sTradeItemTextIds[5]; this->unk_26E = this->unk_27A + 21; this->unk_262 = TEXT_STATE_CHOICE; this->actionFunc = func_80ABAB08; - } else if (playerExchangeItemId != 0) { + } else if (playerExchangeItemId != EXCH_ITEM_NONE) { player->actor.textId = sTradeItemTextIds[7]; this->unk_26E = this->unk_27A + 21; } else { diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index 32e70bbdec..92c5a5a170 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -249,9 +249,9 @@ void EnOwl_LookAtLink(EnOwl* this, PlayState* play) { } /** - * Checks if link is within `targetDist` units, initalize the camera for the owl. + * Checks if link is within `targetDist` units, initialize the camera for the owl. * returns 0 if the link is not within `targetDistance`, returns 1 once link is within - * the distance, and the camera has been initalized. + * the distance, and the camera has been initialized. */ s32 EnOwl_CheckInitTalk(EnOwl* this, PlayState* play, u16 textId, f32 targetDist, u16 flags) { s32 timer; diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index daf85fa86f..dce775f55f 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -231,7 +231,7 @@ void EnSkb_RiseFromGround(EnSkb* this, PlayState* play) { if ((play->gameplayFrames & 1) != 0) { EnSkb_SpawnDebris(play, this, &this->actor.world.pos); } - if ((SkelAnime_Update(&this->skelAnime) != 0) && (0.0f == this->actor.shape.yOffset)) { + if (SkelAnime_Update(&this->skelAnime) && (0.0f == this->actor.shape.yOffset)) { EnSkb_DecideNextAction(this); } } @@ -253,7 +253,7 @@ void EnSkb_Despawn(EnSkb* this, PlayState* play) { EnSkb_SpawnDebris(play, this, &this->actor.world.pos); } Math_SmoothStepToF(&this->actor.shape.shadowScale, 0.0f, 1.0f, 2.5f, 0.0f); - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { Actor_Kill(&this->actor); } } @@ -328,7 +328,7 @@ void EnSkb_Attack(EnSkb* this, PlayState* play) { if (this->collider.base.atFlags & AT_BOUNCED) { this->collider.base.atFlags &= ~(AT_HIT | AT_BOUNCED); EnSkb_SetupRecoil(this); - } else if (SkelAnime_Update(&this->skelAnime) != 0) { + } else if (SkelAnime_Update(&this->skelAnime)) { EnSkb_DecideNextAction(this); } } @@ -343,7 +343,7 @@ void EnSkb_SetupRecoil(EnSkb* this) { } void EnSkb_Recoil(EnSkb* this, PlayState* play) { - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { EnSkb_DecideNextAction(this); } } diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index 68951a0996..3997f23691 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -270,7 +270,7 @@ void EnSt_SetDropAnimAndVel(EnSt* this) { } /** - * Initalizes the Skulltula's 6 cylinders, and sphere collider. + * Initializes the Skulltula's 6 cylinders, and sphere collider. */ void EnSt_InitColliders(EnSt* this, PlayState* play) { ColliderCylinderInit* cylinders[6] = { @@ -380,7 +380,7 @@ void EnSt_UpdateCylinders(EnSt* this, PlayState* play) { } } -s32 EnSt_CheckHitLink(EnSt* this, PlayState* play) { +s32 EnSt_CheckHitPlayer(EnSt* this, PlayState* play) { Player* player = GET_PLAYER(play); s32 hit; s32 i; @@ -500,8 +500,8 @@ s32 EnSt_CheckColliders(EnSt* this, PlayState* play) { } if (this->stunTimer == 0 && this->takeDamageSpinTimer == 0) { - // check if the Skulltula has hit link. - EnSt_CheckHitLink(this, play); + // check if the Skulltula has hit the player. + EnSt_CheckHitPlayer(this, play); } return false; } diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index 2011f4c01a..dbf62376ad 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -267,7 +267,7 @@ void EnTite_Attack(EnTite* this, PlayState* play) { s32 attackState; Vec3f ripplePos; - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { attackState = this->vAttackState; // for deciding whether to change animation switch (this->vAttackState) { case TEKTITE_BEGIN_LUNGE: diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/src/overlays/actors/ovl_En_Tr/z_en_tr.c index 730e23973e..f6da3b2602 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -378,7 +378,7 @@ void EnTr_Update(Actor* thisx, PlayState* play) { Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2); this->actionFunc(this, play); - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { if (this->animation != NULL) { if ((this->animation == &object_tr_Anim_0035CC) || (this->animation == &object_tr_Anim_0013CC)) { if (this->actor.params != TR_KOUME) { 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 ca83f96806..15ab641146 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -328,13 +328,13 @@ void EnWallmas_Drop(EnWallmas* this, PlayState* play) { } void EnWallmas_Land(EnWallmas* this, PlayState* play) { - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { EnWallmas_SetupStand(this); } } void EnWallmas_Stand(EnWallmas* this, PlayState* play) { - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { EnWallmas_SetupWalk(this); } @@ -342,7 +342,7 @@ void EnWallmas_Stand(EnWallmas* this, PlayState* play) { } void EnWallmas_Walk(EnWallmas* this, PlayState* play) { - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { EnWallmas_SetupJumpToCeiling(this); } @@ -355,7 +355,7 @@ void EnWallmas_Walk(EnWallmas* this, PlayState* play) { } void EnWallmas_JumpToCeiling(EnWallmas* this, PlayState* play) { - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { EnWallmas_SetupReturnToCeiling(this); } } @@ -388,7 +388,7 @@ void EnWallmas_ReturnToCeiling(EnWallmas* this, PlayState* play) { } void EnWallmas_TakeDamage(EnWallmas* this, PlayState* play) { - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { if (this->actor.colChkInfo.health == 0) { EnWallmas_SetupDie(this, play); } else { @@ -403,7 +403,7 @@ void EnWallmas_TakeDamage(EnWallmas* this, PlayState* play) { } void EnWallmas_Cooldown(EnWallmas* this, PlayState* play) { - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { EnWallmas_SetupReturnToCeiling(this); } } @@ -430,7 +430,7 @@ void EnWallmas_TakePlayer(EnWallmas* this, PlayState* play) { Audio_PlayActorSfx2(&this->actor, NA_SE_EN_FALL_CATCH); } - if (SkelAnime_Update(&this->skelAnime) != 0) { + if (SkelAnime_Update(&this->skelAnime)) { player->actor.world.pos.x = this->actor.world.pos.x; player->actor.world.pos.z = this->actor.world.pos.z; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c index 64acff818c..0b098404e2 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c @@ -124,7 +124,7 @@ void KaleidoScope_DrawItemSelect(PlayState* play) { osSyncPrintf("now=%d ccc=%d\n", cursorPoint, cursorItem); - // Seem necessary to match + // Seems necessary to match if (pauseCtx->cursorX[PAUSE_ITEM]) {} if (gSaveContext.inventory.items[pauseCtx->cursorPoint[PAUSE_ITEM]]) {}