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

Fix compile issues

Browse Source
This commit is contained in:
Eduardo Quezada 2025-01-26 16:35:05 -03:00
parent 0b8aa7b0dc
commit 11bdbfb658
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/macros/event.inc
View File

@ -2545,6 +2545,6 @@
@ putting them into their pokeball;
@ by default waits for their movement to finish
.macro hidefollower wait=1
callfunc ScrFunc_hidefollower
callnative ScrFunc_hidefollower
.2byte \wait
.endm

2
include/palette.h
View File

@ -46,7 +46,7 @@ struct BlendSettings
u32 unused:2;
};
struct __attribute__((packed)) TimeBlendSettings {
struct TimeBlendSettings {
struct BlendSettings bld0;
struct BlendSettings bld1;
u16 weight;

2
src/field_weather.c
View File

@ -1166,7 +1166,7 @@ const u8* SetPaletteColorMapType(u8 paletteIndex, u8 colorMapType) {
return sPaletteColorMapTypes;
// setup field effect color map
if (sPaletteColorMapTypes != sFieldEffectPaletteColorMapTypes) {
CpuFastCopy(sBasePaletteColorMapTypes, sFieldEffectPaletteColorMapTypes, 32);
CpuCopy16(sBasePaletteColorMapTypes, sFieldEffectPaletteColorMapTypes, 32);
sPaletteColorMapTypes = sFieldEffectPaletteColorMapTypes;
}
sFieldEffectPaletteColorMapTypes[paletteIndex] = colorMapType;

2
src/scrcmd.c
View File

@ -826,8 +826,6 @@ bool8 ScrCmd_fadescreenspeed(struct ScriptContext *ctx)
return TRUE;
}
static EWRAM_DATA u32 *sPalBuffer = NULL;
bool8 ScrCmd_fadescreenswapbuffers(struct ScriptContext *ctx)
{
u8 mode = ScriptReadByte(ctx);