Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up some auto merge stuff

Browse Source
This commit is contained in:
Greenphx9 2024-08-25 18:01:23 +10:00
parent ad969c968c
commit fc3a700357
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/global.h
View File

@ -536,6 +536,8 @@ struct SaveBlock2
extern struct SaveBlock2 *gSaveBlock2Ptr;
extern u8 UpdateSpritePaletteWithTime(u8);
struct SecretBaseParty
{
u32 personality[PARTY_SIZE];

4
include/overworld.h
View File

@ -25,6 +25,10 @@
#define MOVEMENT_MODE_SCRIPTED 2
#define SKIP_OBJECT_EVENT_LOAD 1
#define TIME_OF_DAY_NIGHT 0
#define TIME_OF_DAY_TWILIGHT 1
#define TIME_OF_DAY_DAY 2
#define TIME_OF_DAY_MAX TIME_OF_DAY_DAY
struct InitialPlayerAvatarState
{

4
src/decompress.c
View File

@ -60,7 +60,7 @@ u16 LoadCompressedSpriteSheetByTemplate(const struct SpriteTemplate *template, s
// Check for LZ77 header and read uncompressed size, or fallback if not compressed (zero size)
if ((size = IsLZ77Data(template->images->data, TILE_SIZE_4BPP, sizeof(gDecompressionBuffer))) == 0)
return LoadSpriteSheetByTemplate(template, 0, offset);
return LoadSpriteSheetByTemplateWithOffset(template, 0, offset);
LZ77UnCompWram(template->images->data, gDecompressionBuffer);
myImage.data = gDecompressionBuffer;
@ -68,7 +68,7 @@ u16 LoadCompressedSpriteSheetByTemplate(const struct SpriteTemplate *template, s
myTemplate.images = &myImage;
myTemplate.tileTag = template->tileTag;
return LoadSpriteSheetByTemplate(&myTemplate, 0, offset);
return LoadSpriteSheetByTemplateWithOffset(&myTemplate, 0, offset);
}
void LoadCompressedSpriteSheetOverrideBuffer(const struct CompressedSpriteSheet *src, void *buffer)

1
src/field_weather_effect.c
View File

@ -1410,7 +1410,6 @@ void FogHorizontal_Main(void)
case 0:
CreateFogHorizontalSprites();
if (gWeatherPtr->currWeather == WEATHER_FOG_HORIZONTAL) {
u8 paletteNum = IndexOfSpritePaletteTag(TAG_WEATHER_START);
Weather_SetTargetBlendCoeffs(12, 8, 3);
UpdateShadowColor(0x3DEF); // Gray
} else