mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-23 16:45:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup 3 (#778)

Browse Source 
* lights

* D_801D88A0 -> gScarecrowSpawnSongPtr

* Misc fixes

* CHECK_FLAG_ALL

* Trailing commas in enums

* matches

* Remove todo from lights bss

* Update src/overlays/actors/ovl_En_In/z_en_in.c

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* thisx -> this2

* fix

* Todos

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
This commit is contained in:
Derek Hensley
2022-04-07 12:39:11 -07:00
committed by GitHub
parent c2f4572d13
commit 06412c070f
24 changed files with 93 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_lights.c
+5 -2
View File
@@ -1,6 +1,8 @@
#include "global.h"
#include "objects/gameplay_keep/gameplay_keep.h"
LightsBuffer sLightsBuffer;
void Lights_PointSetInfo(LightInfo* info, s16 x, s16 y, s16 z, u8 r, u8 g, u8 b, s16 radius, s32 type) {
info->type = type;
info->params.point.x = x;
@@ -128,6 +130,7 @@ void Lights_BindPoint(Lights* lights, LightParams* params, GlobalContext* global
Vec3f posF;
Vec3f adjustedPos;
u32 pad;
if (radiusF > 0) {
posF.x = params->point.x;
posF.y = params->point.y;
@@ -373,7 +376,7 @@ void Lights_GlowCheck(GlobalContext* globalCtx) {
LightNode* light = globalCtx->lightCtx.listHead;
while (light != NULL) {
LightPoint* params = (LightPoint*)&light->info->params;
LightPoint* params = &light->info->params.point;
if (light->info->type == LIGHT_POINT_GLOW) {
Vec3f pos;
@@ -422,7 +425,7 @@ void Lights_DrawGlow(GlobalContext* globalCtx) {
do {
if (light->info->type == LIGHT_POINT_GLOW) {
params = (LightPoint*)&light->info->params;
params = &light->info->params.point;
if (params->drawGlow) {
f32 scale = SQ((f32)params->radius) * 2e-6f;
src/code/z_sram_NES.c
+2 -1
View File
@@ -979,7 +979,8 @@ void Sram_OpenSave(FileChooseContext* fileChooseCtx, SramContext* sramCtx) {
}
if (gSaveContext.save.unk_F65) {
Lib_MemCpy(D_801D88A0, gSaveContext.save.scarecrowsSong, sizeof(gSaveContext.save.scarecrowsSong));
Lib_MemCpy(gScarecrowSpawnSongPtr, gSaveContext.save.scarecrowsSong,
sizeof(gSaveContext.save.scarecrowsSong));
for (i = 0; i != ARRAY_COUNT(gSaveContext.save.scarecrowsSong); i++) {}
}