From 63447c564944c6b3514f0e6e33de97ae1bd6c46b Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Sat, 23 Jul 2022 12:15:09 -0700 Subject: General Cleanup 7 (#944) * (f32*) cast * fireobj * BgKeikokuSaku h file newline * dmchar07 flag defines * EnKakasi h file comments * ObjKibako2Contents * ++ ^ 1 * func_80B4BA84 * EnBji01 * EnShn * render modes * D_80097F90 * xprintf * WeatherTag * Sram_InitDebugSave * func_80C1DF18 * func_80183430 * ObjRaillift_Move * DmChar00Struct * format * DmNb csAction * Revert "EnKakasi h file comments" This reverts commit a6b5f97826f4eb5140050c65cdc40cd142d5a573. * title --- src/code/z_fireobj.c | 2 +- src/code/z_sram_NES.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/code') diff --git a/src/code/z_fireobj.c b/src/code/z_fireobj.c index e1fb63fa1..f77fc5158 100644 --- a/src/code/z_fireobj.c +++ b/src/code/z_fireobj.c @@ -187,7 +187,7 @@ void FireObj_UpdateLight(PlayState* play, FireObjLight* light, FireObj* fire) { if (fire->state == FIRE_STATE_3) { Lights_PointSetColorAndRadius(&light->lightInfo, 0, 0, 0, -1); } else { - radius = ((fire->yScale * 140.0f * fire->sizeInv) + 60.0f); + radius = (fire->yScale * 140.0f * fire->sizeInv) + 60.0f; Lights_PointGlowSetInfo(&light->lightInfo, fire->position.x, (fire->position.y + (fire->yScale * 6500.0f)), fire->position.z, diff --git a/src/code/z_sram_NES.c b/src/code/z_sram_NES.c index 10ce64f47..b5491e33b 100644 --- a/src/code/z_sram_NES.c +++ b/src/code/z_sram_NES.c @@ -808,8 +808,8 @@ void Sram_InitDebugSave(void) { Lib_MemCpy(&gSaveContext.save.checksum, &sSaveDebugChecksum, sizeof(gSaveContext.save.checksum)); if (gSaveContext.save.playerForm != PLAYER_FORM_HUMAN) { - BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) = D_801C6A48[((void)0, gSaveContext.save.playerForm & 0xFF)]; - C_SLOT_EQUIP(0, EQUIP_SLOT_C_DOWN) = D_801C6A50[((void)0, gSaveContext.save.playerForm & 0xFF)]; + BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) = D_801C6A48[((void)0, gSaveContext.save.playerForm)]; + C_SLOT_EQUIP(0, EQUIP_SLOT_C_DOWN) = D_801C6A50[((void)0, gSaveContext.save.playerForm)]; } gSaveContext.save.hasTatl = true; -- cgit v1.2.3