diff --git a/configure.py b/configure.py
index 9d26fa13..ff0a89a6 100644
--- a/configure.py
+++ b/configure.py
@@ -1264,7 +1264,7 @@ config.libs = [
             Object(Matching, "effect/ef_hanabi_dummy.c"),
             Object(Matching, "effect/ef_hanabi_hoshi.c"),
             Object(Matching, "effect/ef_hanabi_set.c"),
-            Object(NonMatching, "effect/ef_hanabi_switch.c"),
+            Object(Matching, "effect/ef_hanabi_switch.c"),
             Object(NonMatching, "effect/ef_hanabi_yanagi.c"),
             Object(NonMatching, "effect/ef_hanabira.c"),
             Object(Matching, "effect/ef_hanatiri.c"),
diff --git a/src/effect/ef_hanabi_switch.c b/src/effect/ef_hanabi_switch.c
index 005ef222..29823985 100644
--- a/src/effect/ef_hanabi_switch.c
+++ b/src/effect/ef_hanabi_switch.c
@@ -1,10 +1,14 @@
 #include "ef_effect_control.h"
+#include "m_common_data.h"
+#include "m_player_lib.h"
 
 static void eHanabiSwitch_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1);
 static void eHanabiSwitch_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg);
 static void eHanabiSwitch_mv(eEC_Effect_c* effect, GAME* game);
 static void eHanabiSwitch_dw(eEC_Effect_c* effect, GAME* game);
 
+#define EFFECT_LIFETIME 300
+
 eEC_PROFILE_c iam_ef_hanabi_switch = {
     // clang-format off
     &eHanabiSwitch_init,
@@ -17,18 +21,54 @@ eEC_PROFILE_c iam_ef_hanabi_switch = {
     // clang-format on
 };
 
+static void eHanabiSwitch_SearchLakePos(xyz_t* pos) {
+    int bx, bz;
+    xyz_t a = ZeroVec;
+    *pos = ZeroVec;
+    if (mFI_BlockKind2BkNum(&bx, &bz, mRF_BLOCKKIND_POOL) && mFI_BkNum2WposXZ(&a.x, &a.z, bx, bz)) {
+        a.x += 320.f;
+        a.y = 0.f;
+        a.z += 320.f;
+        pos->x = a.x;
+        pos->y = mFI_BkNum2BaseHeight(bx, bz) + 20.f;
+        pos->z = a.z;
+    }
+}
+
 static void eHanabiSwitch_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) {
-    // TODO
+    eEC_CLIP->make_effect_proc(eEC_EFFECT_HANABI_SWITCH, pos, NULL, game, NULL, item_name, prio, 0, 0);
 }
 
 static void eHanabiSwitch_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
-    // TODO
+    effect->timer = 300;
+    eHanabiSwitch_SearchLakePos(&effect->position);
+    effect->offset = effect->position;
 }
 
 static void eHanabiSwitch_mv(eEC_Effect_c* effect, GAME* game) {
-    // TODO
+    eEC_CLIP->set_continious_env_proc(effect, 300, 300);
+    if (mEv_CheckTitleDemo() != -9) {
+        s16 alive_frames;
+        if (effect->state == 0) {
+            alive_frames = EFFECT_LIFETIME - effect->timer;
+        } else {
+            alive_frames = EFFECT_LIFETIME - effect->timer;
+        }
+        if (alive_frames == 40) {
+            eEC_CLIP->effect_make_proc(eEC_EFFECT_HANABI_SET, effect->position, effect->prio, 0, game,
+                                       (mActor_name_t)effect->item_name, 0, 0);
+        }
+        if (alive_frames == 0 && eEC_CLIP->check_lookat_block_proc(effect->position)) {
+            effect->offset = effect->position;
+        }
+        if (alive_frames < 240 && eEC_CLIP->check_lookat_block_proc(effect->position)) {
+            effect->offset.y =
+                eEC_CLIP->calc_adjust_proc(alive_frames, 0, 40, effect->position.y, effect->position.y + 200.f);
+            NPC_CLIP->set_attention_request_proc(aNPC_ATTENTION_TYPE_POSITION, NULL, &effect->offset);
+        }
+    }
 }
 
 static void eHanabiSwitch_dw(eEC_Effect_c* effect, GAME* game) {
-    // TODO
+    return;
 }