Combat is now working.

src/meson.build

@@ -5,8 +5,8 @@ sources = files(
   'ai/goap.cpp',
 
   # combat
-  'battle.cpp',
-  'combat.cpp',
+  'combat/battle.cpp',
+  'combat/combat.cpp',
 
   # boss fight mini game
   'boss/fight.cpp',
@@ -32,9 +32,6 @@ sources = files(
   # cutscenes
   'storyboard/ui.cpp',
 
-  # sound
-  'sound.cpp',
-
   # graphics
   'textures.cpp',
   'palette.cpp',
@@ -64,6 +61,7 @@ sources = files(
   'game_level.cpp',
   'config.cpp',
   'map.cpp',
+  'sound.cpp',
 
   # root
   'dbc.cpp',