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 a6b5f97826.

* title
This commit is contained in:
Derek Hensley
2022-07-23 12:15:09 -07:00
committed by GitHub
parent dfd00a8c1f
commit 63447c5649
24 changed files with 71 additions and 84 deletions
+1 -1
View File
@@ -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,
+2 -2
View File
@@ -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;