summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.pngbin100 -> 155 bytes
-rw-r--r--graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.pngbin91 -> 146 bytes
-rw-r--r--graphics/field_effects/pics/deoxys_rock_fragment_top_left.pngbin99 -> 157 bytes
-rw-r--r--graphics/field_effects/pics/deoxys_rock_fragment_top_right.pngbin102 -> 157 bytes
-rw-r--r--graphics/field_effects/pics/emotion_exclamation.pngbin108 -> 166 bytes
-rw-r--r--graphics/field_effects/pics/emotion_heart.pngbin126 -> 183 bytes
-rw-r--r--graphics/field_effects/pics/emotion_question.pngbin117 -> 175 bytes
-rw-r--r--graphics/field_effects/pics/hof_monitor_big.pngbin184 -> 189 bytes
-rw-r--r--graphics/field_effects/pics/hof_monitor_small.pngbin177 -> 236 bytes
-rw-r--r--graphics/field_effects/pics/pokeball_glow.pngbin100 -> 155 bytes
-rw-r--r--src/field_effect.c4
11 files changed, 2 insertions, 2 deletions
diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png
index 3f5b8d5c3..bc4f27a40 100644
--- a/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png
+++ b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png
Binary files differ
diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png
index 7684451e4..48cd43d97 100644
--- a/graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png
+++ b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png
Binary files differ
diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png b/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png
index d601cb6e5..f0eb9c0cb 100644
--- a/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png
+++ b/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png
Binary files differ
diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_top_right.png b/graphics/field_effects/pics/deoxys_rock_fragment_top_right.png
index 01f10cd07..1fac486c9 100644
--- a/graphics/field_effects/pics/deoxys_rock_fragment_top_right.png
+++ b/graphics/field_effects/pics/deoxys_rock_fragment_top_right.png
Binary files differ
diff --git a/graphics/field_effects/pics/emotion_exclamation.png b/graphics/field_effects/pics/emotion_exclamation.png
index 595566d2f..798b83092 100644
--- a/graphics/field_effects/pics/emotion_exclamation.png
+++ b/graphics/field_effects/pics/emotion_exclamation.png
Binary files differ
diff --git a/graphics/field_effects/pics/emotion_heart.png b/graphics/field_effects/pics/emotion_heart.png
index 9995984b4..783a1e3bd 100644
--- a/graphics/field_effects/pics/emotion_heart.png
+++ b/graphics/field_effects/pics/emotion_heart.png
Binary files differ
diff --git a/graphics/field_effects/pics/emotion_question.png b/graphics/field_effects/pics/emotion_question.png
index 7376fd058..4907f14b7 100644
--- a/graphics/field_effects/pics/emotion_question.png
+++ b/graphics/field_effects/pics/emotion_question.png
Binary files differ
diff --git a/graphics/field_effects/pics/hof_monitor_big.png b/graphics/field_effects/pics/hof_monitor_big.png
index 510e6a232..c70046ad7 100644
--- a/graphics/field_effects/pics/hof_monitor_big.png
+++ b/graphics/field_effects/pics/hof_monitor_big.png
Binary files differ
diff --git a/graphics/field_effects/pics/hof_monitor_small.png b/graphics/field_effects/pics/hof_monitor_small.png
index dcff33095..368bbfce4 100644
--- a/graphics/field_effects/pics/hof_monitor_small.png
+++ b/graphics/field_effects/pics/hof_monitor_small.png
Binary files differ
diff --git a/graphics/field_effects/pics/pokeball_glow.png b/graphics/field_effects/pics/pokeball_glow.png
index 1c1133b76..6e074afc3 100644
--- a/graphics/field_effects/pics/pokeball_glow.png
+++ b/graphics/field_effects/pics/pokeball_glow.png
Binary files differ
diff --git a/src/field_effect.c b/src/field_effect.c
index 446d3cc27..f57ce8cdd 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2620,7 +2620,7 @@ static void FieldMoveShowMonOutdoorsEffect_LoadGfx(struct Task *task)
u16 delta = ((REG_BG0CNT >> 8) << 11);
CpuCopy16(sFieldMoveStreaksOutdoors_Gfx, (void *)(VRAM + offset), 0x200);
CpuFill32(0, (void *)(VRAM + delta), 0x800);
- LoadPalette(sFieldMoveStreaksOutdoors_Pal, 0xf0, 0x20);
+ LoadPalette(sFieldMoveStreaksOutdoors_Pal, 0xf0, sizeof(sFieldMoveStreaksOutdoors_Pal));
LoadFieldMoveOutdoorStreaksTilemap(delta);
task->tState++;
}
@@ -2783,7 +2783,7 @@ static void FieldMoveShowMonIndoorsEffect_LoadGfx(struct Task *task)
task->data[12] = delta;
CpuCopy16(sFieldMoveStreaksIndoors_Gfx, (void *)(VRAM + offset), 0x80);
CpuFill32(0, (void *)(VRAM + delta), 0x800);
- LoadPalette(sFieldMoveStreaksIndoors_Pal, 0xf0, 0x20);
+ LoadPalette(sFieldMoveStreaksIndoors_Pal, 0xf0, sizeof(sFieldMoveStreaksIndoors_Pal));
task->tState++;
}