From 96d2bc489db7ac6c97158bcc750f168604bae6c2 Mon Sep 17 00:00:00 2001
From: Reaperoe <reaperoee@gmail.com>
Date: Sat, 31 Aug 2024 11:52:57 -0400
Subject: [PATCH] Implement & link ef_pun.c (#411)

Includes fixes to ef_halloween_smoke.c and rel_slices.yml
---
 config/rel_slices.yml    | 11 ++++++++---
 src/ef_halloween_smoke.c |  2 ++
 src/ef_pun.c             | 28 ++++++++++++++++++++++++----
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/config/rel_slices.yml b/config/rel_slices.yml
index 32ffbd0d..d6365d94 100644
--- a/config/rel_slices.yml
+++ b/config/rel_slices.yml
@@ -1172,6 +1172,10 @@ ef_halloween.c:
     .text: [0x8060D44C, 0x8060D654]
     .rodata: [0x8064C1C0, 0x8064C1D0]
     .data: [0x806D2600, 0x806D2618]
+ef_halloween_smoke.c:
+    .text: [0x8060D654, 0x8060D8D8]
+    .rodata: [0x8064C1D0, 0x8064C1E0]
+    .data: [0x806D2618, 0x806D2660]
 ef_hanabi_dummy.c:
     .text: [0x8060E6D8, 0x8060E9B8]
     .rodata: [0x8064C2A0, 0x8064C2C0]
@@ -1187,6 +1191,10 @@ ef_make_hem.c:
     .text: [0x806162B0, 0x8061710C]
     .rodata: [0x8064C818, 0x8064C860]
     .data: [0x806D3160, 0x806D31B8]
+ef_pun.c:
+    .text: [0x8061A650, 0x8061A824]
+    .rodata: [0x8064CAB8, 0x8064CAC0]
+    .data: [0x806D33D8, 0x806D33F0]
 ef_tent_lamp.c:
     .text: [0x80622304, 0x8062260C]
     .rodata: [0x8064CF10, 0x8064CF38]
@@ -1290,10 +1298,8 @@ data/npc/model/tex/bea_9.c:
     .data: [0x806F8F20, 0x806FA140]
 data/npc/model/tex/bea_10.c:
     .data: [0x806FA140, 0x806FB360]
-
 data/field/bg/acre/bg_data.c:
     .data: [0x806FE048, 0x8074B840]
-
 # dataobject.obj files
 data/field/bg/flower/obj_flower.c:
     .data: [0x8074FE80, 0x807508C0]
@@ -2787,7 +2793,6 @@ data/field/bg/acre/grd_s_t_st1_3/grd_s_t_st1_3.c:
     .data: [0x80DD5280, 0x80DD61A0]
 data/field/bg/acre/rom_toudai/rom_toudai.c:
     .data: [0x80F08520, 0x80F0B020]
-
 # acres
 # data/field/bg/acre/grd_post_office/grd_post_office.c:
     # .data: [0x80C5DBA0, 0x80C63408]
diff --git a/src/ef_halloween_smoke.c b/src/ef_halloween_smoke.c
index 3c512054..482a7fca 100644
--- a/src/ef_halloween_smoke.c
+++ b/src/ef_halloween_smoke.c
@@ -1,5 +1,7 @@
 #include "ef_effect_control.h"
 
+#include "m_common_data.h"
+
 static void eHalloween_Smoke_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1);
 static void eHalloween_Smoke_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg);
 static void eHalloween_Smoke_mv(eEC_Effect_c* effect, GAME* game);
diff --git a/src/ef_pun.c b/src/ef_pun.c
index 0c933b48..dd9c9e46 100644
--- a/src/ef_pun.c
+++ b/src/ef_pun.c
@@ -1,5 +1,7 @@
 #include "ef_effect_control.h"
 
+#include "m_common_data.h"
+
 static void ePun_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1);
 static void ePun_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg);
 static void ePun_mv(eEC_Effect_c* effect, GAME* game);
@@ -18,17 +20,35 @@ eEC_PROFILE_c iam_ef_pun = {
 };
 
 static void ePun_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_PUN, pos, NULL, game, &angle, item_name, prio, 0, 0);
 }
 
 static void ePun_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
-    // TODO
+    s16 var = *(s16*)ct_arg;
+    effect->effect_specific[0] = var;
+    effect->timer = 24;
 }
 
 static void ePun_mv(eEC_Effect_c* effect, GAME* game) {
-    // TODO
+    eEC_CLIP->set_continious_env_proc(effect, 24, 44);
+    
+    if (effect->state == eEC_STATE_CONTINUOUS) {
+        s16 timer_left = 44 - effect->timer;
+        
+        if (timer_left == 0) {
+            effect->effect_specific[1] = RANDOM(100) & 1;
+        }   
+            
+        if (timer_left == 8) {
+            eEC_CLIP->effect_make_proc(eEC_EFFECT_PUN_YUGE, effect->position, effect->prio, effect->effect_specific[0], game, (u16)effect->item_name, effect->effect_specific[1], 0);
+            
+            effect->effect_specific[1] = ++effect->effect_specific[1] & 1;
+            
+            eEC_CLIP->effect_make_proc(eEC_EFFECT_PUN_SEKIMEN, effect->position, effect->prio, effect->effect_specific[0], game, (u16)effect->item_name, 0, 0);
+        }
+    }
 }
 
 static void ePun_dw(eEC_Effect_c* effect, GAME* game) {
-    // TODO
+    
 }