From 1a7a26bc3984aa84c522108540aabf95ccb436bc Mon Sep 17 00:00:00 2001
From: Lemongrass3110 <lemongrass@kstp.at>
Date: Sun, 17 Apr 2022 21:32:27 +0200
Subject: [PATCH] Added speed bonus to Serenade of Jawaii (#6842)

---
 db/re/status.yml   | 1 +
 src/map/status.cpp | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/db/re/status.yml b/db/re/status.yml
index 8a134f7b57..00069a5089 100644
--- a/db/re/status.yml
+++ b/db/re/status.yml
@@ -7862,6 +7862,7 @@ Body:
     DurationLookup: TR_JAWAII_SERENADE
     CalcFlags:
       Smatk: true
+      Speed: true
   - Status: Pron_March
     Icon: EFST_PRON_MARCH
     DurationLookup: TR_PRON_MARCH
diff --git a/src/map/status.cpp b/src/map/status.cpp
index 83d28c7018..a04fb386da 100644
--- a/src/map/status.cpp
+++ b/src/map/status.cpp
@@ -7351,6 +7351,9 @@ static unsigned short status_calc_speed(struct block_list *bl, struct status_cha
 			val = max(val, 25); // !TODO: Confirm bonus movement speed
 		if (sc->data[SC_EMERGENCY_MOVE])
 			val = max(val, sc->data[SC_EMERGENCY_MOVE]->val2);
+		if( sc->data[SC_JAWAII_SERENADE] ){
+			val = max( val, 25 );
+		}
 
 		// !FIXME: official items use a single bonus for this [ultramage]
 		if( sc->data[SC_SPEEDUP0] ) // Temporary item-based speedup