dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify division in berry_crush and field weather functions

Browse Source
This commit is contained in:
DizzyEggg
2024-03-09 20:06:58 +01:00
parent 9e67594dce
commit 82f8636502
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/berry_crush.c
Executable → Regular
+1 -6
View File
@@ -1373,7 +1373,6 @@ static void CreateBerrySprites(struct BerryCrushGame *game, struct BerryCrushGam
u8 spriteId; u8 spriteId;
s16 distance, var1; s16 distance, var1;
s16 *data; s16 *data;
s32 amplitude;
s16 speed; s16 speed;
u32 var2; u32 var2;
@@ -1395,11 +1394,7 @@ static void CreateBerrySprites(struct BerryCrushGame *game, struct BerryCrushGam
sYAccel = 32; sYAccel = 32;
sBitfield = 112; // Setting bits in MASK_TARGET_Y sBitfield = 112; // Setting bits in MASK_TARGET_Y
distance = gfx->playerCoords[i]->berryXDest - gfx->playerCoords[i]->berryXOffset; distance = gfx->playerCoords[i]->berryXDest - gfx->playerCoords[i]->berryXOffset;
amplitude = distance; sAmplitude = distance / 4;
if (distance < 0)
amplitude += 3;
sAmplitude = amplitude >> 2;
distance *= 128; distance *= 128;
var2 = speed + 32; var2 = speed + 32;
var2 = var2 / 2; var2 = var2 / 2;
src/field_weather.c
+1 -6
View File
@@ -277,7 +277,6 @@ static void BuildColorMaps(void)
u16 brightnessDelta; u16 brightnessDelta;
u16 colorMapIndex; u16 colorMapIndex;
u16 baseBrightness; u16 baseBrightness;
u32 remainingBrightness;
s16 diff; s16 diff;
sPaletteColorMapTypes = sBasePaletteColorMapTypes; sPaletteColorMapTypes = sBasePaletteColorMapTypes;
@@ -305,11 +304,7 @@ static void BuildColorMaps(void)
} }
baseBrightness = curBrightness; baseBrightness = curBrightness;
remainingBrightness = 0x1f00 - curBrightness; brightnessDelta = (0x1f00 - curBrightness) / (NUM_WEATHER_COLOR_MAPS - 3);
if ((0x1f00 - curBrightness) < 0)
remainingBrightness += 0xf;
brightnessDelta = remainingBrightness / (NUM_WEATHER_COLOR_MAPS - 3);
if (colorVal < 12) if (colorVal < 12)
{ {
// For shadows (color values < 12), the remaining color mappings are // For shadows (color values < 12), the remaining color mappings are