diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 8bf0aec921..382b4ca4cc 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -4591,6 +4591,7 @@ bool8 MovementType_FollowPlayer_Shadow(struct ObjectEvent *objectEvent, struct S
     if (!IsFollowerVisible()) { // Shadow player's position
       objectEvent->invisible = TRUE;
       MoveObjectEventToMapCoords(objectEvent, gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x, gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y);
+      objectEvent->triggerGroundEffectsOnMove = FALSE; // Stop endless reflection spawning
       return FALSE;
     }
     sprite->data[1] = 1; // Enter idle state
@@ -4610,7 +4611,7 @@ bool8 MovementType_FollowPlayer_Active(struct ObjectEvent *objectEvent, struct S
       ClearObjectEventMovement(objectEvent, sprite);
       ObjectEventSetSingleMovement(objectEvent, sprite, MOVEMENT_ACTION_ENTER_POKEBALL);
       objectEvent->singleMovementActive = 1;
-      sprite->animCmdIndex = 0; // Needed because of weird animCmdIndex stuff
+      sprite->animCmdIndex = 0; // Needed for animCmdIndex weirdness
       sprite->data[1] = 2; // movement action sets state to 0
       return TRUE;
     }
@@ -6211,19 +6212,14 @@ bool8 MovementAction_WalkInPlaceSlowDown_Step0(struct ObjectEvent *objectEvent,
 
 // Copy and load objectEvent's palette, but set all opaque colors to white
 static u8 LoadWhiteFlashPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite) {
-  struct SpritePalette dynamicPalette;
+
+  u8 i;
   u16 paletteData[16];
-  u16 i = GetObjectEventGraphicsInfo(objectEvent->graphicsId)->paletteTag1;
-  u8 j;
-  i = FindObjectEventPaletteIndexByTag(i);
-  dynamicPalette.tag = OBJ_EVENT_PAL_TAG_NONE-1; // TODO: Use a proper palette tag here
-  dynamicPalette.data = paletteData;
-  paletteData[0] = sObjectEventSpritePalettes[i].data[0];
-  for (j=1; j<16; j++) {
-    paletteData[j] = 0xFFFF;
+  struct SpritePalette dynamicPalette = {.tag = OBJ_EVENT_PAL_TAG_NONE-1, .data = paletteData};  // TODO: Use a proper palette tag here
+  for (i=1; i<16; i++) {
+    paletteData[i] = 0xFFFF;
   }
-  sprite->oam.paletteNum = LoadSpritePalette(&dynamicPalette);
-  return sprite->oam.paletteNum;
+  return UpdateSpritePalette(&dynamicPalette, sprite);
 }
 
 bool8 MovementAction_ExitPokeball_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) {
@@ -6256,8 +6252,9 @@ bool8 MovementAction_ExitPokeball_Step1(struct ObjectEvent *objectEvent, struct
       LoadWhiteFlashPalette(objectEvent, sprite);
     // Restore original palette
     } else if ((duration == 0 && sprite->data[3] == 1) || (duration == 1 && sprite->data[3] == 3)) {
-      FreeSpritePaletteByTag(OBJ_EVENT_PAL_TAG_NONE-1);
-      sprite->oam.paletteNum = (sprite->data[6] >> 4) & 0xF;
+      FollowerSetGraphics(objectEvent, sprite->data[7]);
+      // FreeSpritePaletteByTag(OBJ_EVENT_PAL_TAG_NONE-1);
+      // sprite->oam.paletteNum = (sprite->data[6] >> 4) & 0xF;
     }
     return FALSE;
 }
@@ -6278,7 +6275,6 @@ bool8 MovementAction_EnterPokeball_Step1(struct ObjectEvent *objectEvent, struct
     } else if (sprite->data[3] == 11) { // Set palette to white
       LoadWhiteFlashPalette(objectEvent, sprite);
     } else if (sprite->data[3] == 7) { // Free white palette and change to pokeball
-      FreeSpritePaletteByTag(OBJ_EVENT_PAL_TAG_NONE-1);
       ObjectEventSetGraphicsId(objectEvent, OBJ_EVENT_GFX_ANIMATED_BALL);
     }
     return FALSE;
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index b4c0fcfdf8..3258c72995 100755
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -14,8 +14,9 @@
 #include "constants/field_effects.h"
 #include "constants/songs.h"
 
-#define OBJ_EVENT_PAL_START  0x1103 // duplicate of define in event_object_movement.c
 #define OBJ_EVENT_PAL_TAG_NONE 0x11FF // duplicate of define in event_object_movement.c
+#define PAL_TAG_REFLECTION_OFFSET 0x2000 // reflection tag value is paletteTag + 0x2000
+#define PAL_RAW_REFLECTION_OFFSET 0x4000 // raw reflection tag is paletteNum + 0x4000
 
 static void UpdateObjectReflectionSprite(struct Sprite *);
 static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite);
@@ -103,7 +104,7 @@ static void LoadObjectRegularReflectionPalette(struct ObjectEvent *objectEvent,
     const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
     const struct Sprite *mainSprite = &gSprites[objectEvent->spriteId];
     u16 baseTag = GetSpritePaletteTagByPaletteNum(mainSprite->oam.paletteNum);
-    u16 paletteTag = baseTag == 0xFFFF ? mainSprite->oam.paletteNum + 0x2000 : baseTag + 0x2000;
+    u16 paletteTag = baseTag == 0xFFFF ? mainSprite->oam.paletteNum + PAL_RAW_REFLECTION_OFFSET : baseTag + PAL_TAG_REFLECTION_OFFSET;
     u8 paletteNum = IndexOfSpritePaletteTag(paletteTag);
     if (paletteNum == 0xFF) { // Load filtered palette
       u16 filteredData[16] = {0};
@@ -115,7 +116,7 @@ static void LoadObjectRegularReflectionPalette(struct ObjectEvent *objectEvent,
     sprite->oam.paletteNum = paletteNum;
 }
 
-#define HIGH_BRIDGE_PAL_TAG 0x4000
+#define HIGH_BRIDGE_PAL_TAG 0x4010
 
 // When walking on a bridge high above water (Route 120), the reflection is a solid dark blue color.
 // This is so the sprite blends in with the dark water metatile underneath the bridge.
@@ -146,7 +147,7 @@ static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite)
     // Only filter palette if not using the high bridge blue palette
     if (IndexOfSpritePaletteTag(HIGH_BRIDGE_PAL_TAG) != reflectionSprite->oam.paletteNum) {
       u16 baseTag = GetSpritePaletteTagByPaletteNum(mainSprite->oam.paletteNum);
-      u16 paletteTag = baseTag == 0xFFFF ? mainSprite->oam.paletteNum + 0x2000 : baseTag + 0x2000;
+      u16 paletteTag = baseTag == 0xFFFF ? mainSprite->oam.paletteNum + PAL_RAW_REFLECTION_OFFSET : baseTag + PAL_TAG_REFLECTION_OFFSET;
       u8 paletteNum;
       // Free palette if unused
       reflectionSprite->inUse = FALSE;