From 11bdbfb658473e9a85fa2c2084ade90fb71c45d9 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 26 Jan 2025 16:35:05 -0300 Subject: [PATCH] Fix compile issues --- asm/macros/event.inc | 2 +- include/palette.h | 2 +- src/field_weather.c | 2 +- src/scrcmd.c | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index e460f8e2ff..1c529b0ca7 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -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 diff --git a/include/palette.h b/include/palette.h index ab61068e73..9ada6f1d96 100644 --- a/include/palette.h +++ b/include/palette.h @@ -46,7 +46,7 @@ struct BlendSettings u32 unused:2; }; -struct __attribute__((packed)) TimeBlendSettings { +struct TimeBlendSettings { struct BlendSettings bld0; struct BlendSettings bld1; u16 weight; diff --git a/src/field_weather.c b/src/field_weather.c index 2bca450744..f0066811a1 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -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; diff --git a/src/scrcmd.c b/src/scrcmd.c index 499792cb70..901df3b8ed 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -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);