From f08eab499c5a45796532aa93ef8650ec4917db04 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Fri, 23 Oct 2020 20:17:35 +0100
Subject: [PATCH] fix warnings

---
 src/world/area_kmr/kmr_12/events.c | 4 ++--
 tools/compile_dsl_macros.py        | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/world/area_kmr/kmr_12/events.c b/src/world/area_kmr/kmr_12/events.c
index 4126d77fa4..244a94b5ed 100644
--- a/src/world/area_kmr/kmr_12/events.c
+++ b/src/world/area_kmr/kmr_12/events.c
@@ -46,8 +46,8 @@ NpcSettings M(goombaNpcSettings) = {
     .height = 20,
     .radius = 23,
     .ai = &M(GoombaAI),
-    .onHit = EnemyNpcHit,
-    .onDefeat = EnemyNpcDefeat,
+    .onHit = &EnemyNpcHit,
+    .onDefeat = &EnemyNpcDefeat,
     .level = 5,
 };
 
diff --git a/tools/compile_dsl_macros.py b/tools/compile_dsl_macros.py
index 85f780dcc2..bfd8493870 100755
--- a/tools/compile_dsl_macros.py
+++ b/tools/compile_dsl_macros.py
@@ -205,7 +205,6 @@ class LabelAllocation(Visitor):
 class Compile(Transformer):
     SIGNED_INT = str
     HEX_INT = str
-    ESCAPED_STRING = str
 
     def transform(self, tree):
         self.alloc = LabelAllocation()
@@ -215,6 +214,9 @@ class Compile(Transformer):
     def CNAME(self, name):
         return f"(Bytecode)(&{name})"
 
+    def ESCAPED_STRING(self, str_with_quotes):
+        return f"(Bytecode)({str_with_quotes})"
+
     NOT_PARENS = str
     def c_const_expr_internal(self, tree):
         return f"({' '.join(tree.children)})"