A lot has certainly happened!

8 files changed, 128 insertions, 3 deletions

diff --git a/assets/berry-rotunda.fnt b/assets/berry-rotunda.fnt
new file mode 100644
index 0000000..624cde0
--- /dev/null
+++ b/assets/berry-rotunda.fnt
@@ -0,0 +1,99 @@
+info face="Berry Rotunda" size=-16 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=2,2,2,2 spacing=2,2 outline=0
+common lineHeight=27 base=21 scaleW=256 scaleH=256 pages=1 packed=0 alphaChnl=0 redChnl=4 greenChnl=4 blueChnl=4
+page id=0 file="berry-rotunda_0.png"
+chars count=95
+char id=32   x=131   y=198   width=7     height=31    xoffset=-3    yoffset=-2    xadvance=8     page=0  chnl=15
+char id=33   x=246   y=66    width=8     height=31    xoffset=0     yoffset=-2    xadvance=6     page=0  chnl=15
+char id=34   x=149   y=165   width=11    height=31    xoffset=-2    yoffset=-2    xadvance=7     page=0  chnl=15
+char id=35   x=61    y=165   width=13    height=31    xoffset=-2    yoffset=-2    xadvance=9     page=0  chnl=15
+char id=36   x=90    y=132   width=15    height=31    xoffset=-3    yoffset=-2    xadvance=9     page=0  chnl=15
+char id=37   x=0     y=99    width=17    height=31    xoffset=-3    yoffset=-2    xadvance=11    page=0  chnl=15
+char id=38   x=107   y=132   width=15    height=31    xoffset=-2    yoffset=-2    xadvance=11    page=0  chnl=15
+char id=39   x=78    y=198   width=9     height=31    xoffset=-3    yoffset=-2    xadvance=4     page=0  chnl=15
+char id=40   x=89    y=198   width=9     height=31    xoffset=-3    yoffset=-2    xadvance=4     page=0  chnl=15
+char id=41   x=34    y=198   width=9     height=31    xoffset=-3    yoffset=-2    xadvance=4     page=0  chnl=15
+char id=42   x=175   y=165   width=11    height=31    xoffset=-2    yoffset=-2    xadvance=6     page=0  chnl=15
+char id=43   x=135   y=165   width=12    height=31    xoffset=-2    yoffset=-2    xadvance=8     page=0  chnl=15
+char id=44   x=100   y=198   width=9     height=31    xoffset=-2    yoffset=-2    xadvance=5     page=0  chnl=15
+char id=45   x=106   y=165   width=13    height=31    xoffset=-2    yoffset=-2    xadvance=9     page=0  chnl=15
+char id=46   x=111   y=198   width=8     height=31    xoffset=-2    yoffset=-2    xadvance=4     page=0  chnl=15
+char id=47   x=242   y=132   width=12    height=31    xoffset=-2    yoffset=-2    xadvance=7     page=0  chnl=15
+char id=48   x=146   y=66    width=18    height=31    xoffset=-3    yoffset=-2    xadvance=14    page=0  chnl=15
+char id=49   x=162   y=165   width=11    height=31    xoffset=-3    yoffset=-2    xadvance=7     page=0  chnl=15
+char id=50   x=57    y=99    width=17    height=31    xoffset=-3    yoffset=-2    xadvance=12    page=0  chnl=15
+char id=51   x=226   y=66    width=18    height=31    xoffset=-3    yoffset=-2    xadvance=13    page=0  chnl=15
+char id=52   x=206   y=66    width=18    height=31    xoffset=-3    yoffset=-2    xadvance=13    page=0  chnl=15
+char id=53   x=186   y=99    width=16    height=31    xoffset=-3    yoffset=-2    xadvance=11    page=0  chnl=15
+char id=54   x=126   y=66    width=18    height=31    xoffset=-3    yoffset=-2    xadvance=13    page=0  chnl=15
+char id=55   x=38    y=99    width=17    height=31    xoffset=-3    yoffset=-2    xadvance=12    page=0  chnl=15
+char id=56   x=95    y=99    width=17    height=31    xoffset=-3    yoffset=-2    xadvance=12    page=0  chnl=15
+char id=57   x=76    y=99    width=17    height=31    xoffset=-2    yoffset=-2    xadvance=14    page=0  chnl=15
+char id=58   x=56    y=198   width=9     height=31    xoffset=-1    yoffset=-2    xadvance=5     page=0  chnl=15
+char id=59   x=45    y=198   width=9     height=31    xoffset=-1    yoffset=-2    xadvance=6     page=0  chnl=15
+char id=60   x=200   y=165   width=10    height=31    xoffset=-2    yoffset=-2    xadvance=5     page=0  chnl=15
+char id=61   x=76    y=165   width=13    height=31    xoffset=-2    yoffset=-2    xadvance=9     page=0  chnl=15
+char id=62   x=188   y=165   width=10    height=31    xoffset=-2    yoffset=-2    xadvance=5     page=0  chnl=15
+char id=63   x=124   y=132   width=15    height=31    xoffset=0     yoffset=-2    xadvance=13    page=0  chnl=15
+char id=64   x=106   y=66    width=18    height=31    xoffset=-2    yoffset=-2    xadvance=13    page=0  chnl=15
+char id=65   x=0     y=33    width=21    height=31    xoffset=-3    yoffset=-2    xadvance=16    page=0  chnl=15
+char id=66   x=84    y=0     width=24    height=31    xoffset=-3    yoffset=-2    xadvance=19    page=0  chnl=15
+char id=67   x=85    y=66    width=19    height=31    xoffset=-3    yoffset=-2    xadvance=14    page=0  chnl=15
+char id=68   x=161   y=0     width=22    height=31    xoffset=-3    yoffset=-2    xadvance=17    page=0  chnl=15
+char id=69   x=43    y=66    width=19    height=31    xoffset=-3    yoffset=-2    xadvance=14    page=0  chnl=15
+char id=70   x=22    y=66    width=19    height=31    xoffset=-3    yoffset=-2    xadvance=13    page=0  chnl=15
+char id=71   x=209   y=0     width=22    height=31    xoffset=-3    yoffset=-2    xadvance=17    page=0  chnl=15
+char id=72   x=115   y=33    width=21    height=31    xoffset=-3    yoffset=-2    xadvance=16    page=0  chnl=15
+char id=73   x=166   y=66    width=18    height=31    xoffset=-3    yoffset=-2    xadvance=12    page=0  chnl=15
+char id=74   x=186   y=66    width=18    height=31    xoffset=-3    yoffset=-2    xadvance=12    page=0  chnl=15
+char id=75   x=138   y=33    width=21    height=31    xoffset=-3    yoffset=-2    xadvance=15    page=0  chnl=15
+char id=76   x=184   y=33    width=20    height=31    xoffset=-2    yoffset=-2    xadvance=15    page=0  chnl=15
+char id=77   x=0     y=0     width=28    height=31    xoffset=-3    yoffset=-2    xadvance=23    page=0  chnl=15
+char id=78   x=0     y=66    width=20    height=31    xoffset=-3    yoffset=-2    xadvance=16    page=0  chnl=15
+char id=79   x=64    y=66    width=19    height=31    xoffset=-3    yoffset=-2    xadvance=14    page=0  chnl=15
+char id=80   x=30    y=0     width=25    height=31    xoffset=-3    yoffset=-2    xadvance=19    page=0  chnl=15
+char id=81   x=92    y=33    width=21    height=31    xoffset=-3    yoffset=-2    xadvance=15    page=0  chnl=15
+char id=82   x=136   y=0     width=23    height=31    xoffset=-3    yoffset=-2    xadvance=17    page=0  chnl=15
+char id=83   x=206   y=33    width=20    height=31    xoffset=-3    yoffset=-2    xadvance=15    page=0  chnl=15
+char id=84   x=185   y=0     width=22    height=31    xoffset=-3    yoffset=-2    xadvance=15    page=0  chnl=15
+char id=85   x=46    y=33    width=21    height=31    xoffset=-3    yoffset=-2    xadvance=15    page=0  chnl=15
+char id=86   x=228   y=33    width=20    height=31    xoffset=-3    yoffset=-2    xadvance=14    page=0  chnl=15
+char id=87   x=57    y=0     width=25    height=31    xoffset=-3    yoffset=-2    xadvance=20    page=0  chnl=15
+char id=88   x=110   y=0     width=24    height=31    xoffset=-3    yoffset=-2    xadvance=18    page=0  chnl=15
+char id=89   x=69    y=33    width=21    height=31    xoffset=-2    yoffset=-2    xadvance=16    page=0  chnl=15
+char id=90   x=23    y=33    width=21    height=31    xoffset=-3    yoffset=-2    xadvance=16    page=0  chnl=15
+char id=91   x=121   y=198   width=8     height=31    xoffset=-1    yoffset=-2    xadvance=5     page=0  chnl=15
+char id=92   x=31    y=165   width=13    height=31    xoffset=-3    yoffset=-2    xadvance=7     page=0  chnl=15
+char id=93   x=12    y=198   width=9     height=31    xoffset=-2    yoffset=-2    xadvance=5     page=0  chnl=15
+char id=94   x=121   y=165   width=12    height=31    xoffset=-3    yoffset=-2    xadvance=7     page=0  chnl=15
+char id=95   x=240   y=99    width=14    height=31    xoffset=-3    yoffset=-2    xadvance=8     page=0  chnl=15
+char id=96   x=23    y=198   width=9     height=31    xoffset=-2    yoffset=-2    xadvance=4     page=0  chnl=15
+char id=97   x=204   y=99    width=16    height=31    xoffset=-3    yoffset=-2    xadvance=12    page=0  chnl=15
+char id=98   x=158   y=132   width=15    height=31    xoffset=-2    yoffset=-2    xadvance=11    page=0  chnl=15
+char id=99   x=226   y=132   width=14    height=31    xoffset=-3    yoffset=-2    xadvance=9     page=0  chnl=15
+char id=100  x=114   y=99    width=16    height=31    xoffset=-3    yoffset=-2    xadvance=11    page=0  chnl=15
+char id=101  x=175   y=132   width=15    height=31    xoffset=-3    yoffset=-2    xadvance=10    page=0  chnl=15
+char id=102  x=91    y=165   width=13    height=31    xoffset=-3    yoffset=-2    xadvance=8     page=0  chnl=15
+char id=103  x=132   y=99    width=16    height=31    xoffset=-3    yoffset=-2    xadvance=11    page=0  chnl=15
+char id=104  x=150   y=99    width=16    height=31    xoffset=-3    yoffset=-2    xadvance=11    page=0  chnl=15
+char id=105  x=224   y=165   width=10    height=31    xoffset=-3    yoffset=-2    xadvance=5     page=0  chnl=15
+char id=106  x=212   y=165   width=10    height=31    xoffset=-2    yoffset=-2    xadvance=5     page=0  chnl=15
+char id=107  x=168   y=99    width=16    height=31    xoffset=-3    yoffset=-2    xadvance=11    page=0  chnl=15
+char id=108  x=67    y=198   width=9     height=31    xoffset=-2    yoffset=-2    xadvance=5     page=0  chnl=15
+char id=109  x=233   y=0     width=21    height=31    xoffset=-2    yoffset=-2    xadvance=18    page=0  chnl=15
+char id=110  x=19    y=99    width=17    height=31    xoffset=-3    yoffset=-2    xadvance=13    page=0  chnl=15
+char id=111  x=192   y=132   width=15    height=31    xoffset=-3    yoffset=-2    xadvance=11    page=0  chnl=15
+char id=112  x=222   y=99    width=16    height=31    xoffset=-3    yoffset=-2    xadvance=12    page=0  chnl=15
+char id=113  x=0     y=132   width=16    height=31    xoffset=-3    yoffset=-2    xadvance=12    page=0  chnl=15
+char id=114  x=0     y=165   width=14    height=31    xoffset=-3    yoffset=-2    xadvance=9     page=0  chnl=15
+char id=115  x=141   y=132   width=15    height=31    xoffset=-3    yoffset=-2    xadvance=10    page=0  chnl=15
+char id=116  x=46    y=165   width=13    height=31    xoffset=-3    yoffset=-2    xadvance=8     page=0  chnl=15
+char id=117  x=18    y=132   width=16    height=31    xoffset=-2    yoffset=-2    xadvance=13    page=0  chnl=15
+char id=118  x=36    y=132   width=16    height=31    xoffset=-3    yoffset=-2    xadvance=11    page=0  chnl=15
+char id=119  x=161   y=33    width=21    height=31    xoffset=-3    yoffset=-2    xadvance=17    page=0  chnl=15
+char id=120  x=54    y=132   width=16    height=31    xoffset=-2    yoffset=-2    xadvance=13    page=0  chnl=15
+char id=121  x=72    y=132   width=16    height=31    xoffset=-3    yoffset=-2    xadvance=11    page=0  chnl=15
+char id=122  x=209   y=132   width=15    height=31    xoffset=-3    yoffset=-2    xadvance=10    page=0  chnl=15
+char id=123  x=236   y=165   width=10    height=31    xoffset=-2    yoffset=-2    xadvance=6     page=0  chnl=15
+char id=124  x=140   y=198   width=7     height=31    xoffset=0     yoffset=-2    xadvance=8     page=0  chnl=15
+char id=125  x=0     y=198   width=10    height=31    xoffset=-2    yoffset=-2    xadvance=6     page=0  chnl=15
+char id=126  x=16    y=165   width=13    height=31    xoffset=-2    yoffset=-2    xadvance=9     page=0  chnl=15
diff --git a/assets/berry-rotunda.ttf b/assets/berry-rotunda.ttf
new file mode 100644
index 0000000..679276e
--- /dev/null
+++ b/assets/berry-rotunda.ttf
diff --git a/assets/berry-rotunda_0.png b/assets/berry-rotunda_0.png
new file mode 100644
index 0000000..3810d6e
--- /dev/null
+++ b/assets/berry-rotunda_0.png
diff --git a/assets/fight/fusie_think.qoi b/assets/fight/fusie_think.qoi
new file mode 100644
index 0000000..023a5db
--- /dev/null
+++ b/assets/fight/fusie_think.qoi
diff --git a/assets/fight/sight.qoi b/assets/fight/sight.qoi
new file mode 100644
index 0000000..5511951
--- /dev/null
+++ b/assets/fight/sight.qoi
diff --git a/assets/src/gunner.h b/assets/src/gunner.h
index f99a5fd..be1b32e 100644
--- a/assets/src/gunner.h
+++ b/assets/src/gunner.h
@@ -186,6 +186,10 @@ void unload_active_shaders(void);
 
 void draw_text(const char* txt, int x, int y, int size, Color col);
 
+i32 load_font(const char* path);
+
+void draw_text_font(i32 idx, const char* text, vec2 pos, fx32 size, Color col);
+
 // Controller //
 
 b32 is_key_pressed(i32 btn);
@@ -203,3 +207,17 @@ void stop_rumble(void);
 u32 rand_u32(void);
 
 int rand_range(i32 min, i32 max);
+
+// Audio //
+
+i32 load_audio(const char* path);
+
+void play_audio(i32 idx);
+
+void load_music(const char* path);
+
+void play_music(void);
+
+void set_music_loop(b32 loop);
+
+void set_music_loop_point(f32 point); 
diff --git a/assets/src/main.c b/assets/src/main.c
index 188a7ee..0913641 100644
--- a/assets/src/main.c
+++ b/assets/src/main.c
@@ -2,19 +2,27 @@
 
 static int femme = -1;
 static int grayscale = -1;
+static int berry = -1;
+static int night = -1;
+
 static vec2 position = (vec2){TO_FIXED(32), TO_FIXED(48)};
+static vec2 text_pos = (vec2){TO_FIXED(64), TO_FIXED(16)};
 
 void init(void)
 {
 	femme = load_new_tex("assets/femme.png");
 	grayscale = load_new_shader("assets/gs_full.glsl");
+	berry = load_font("assets/berry-rotunda.fnt");
+	
+	load_music("assets/wicked_glee.ogg");
+	set_music_loop_point(15.73f);
+	
+	play_music();
 }
 
 void update(void)
 {
-	if(is_key_held(KEY_B)){
-		draw_text("Femme my beloved!", 4, 4, 20, BLACK);
-	}
+	draw_text_font(berry, "Femme is a cute", text_pos, 24, BLACK);
 	
 	vec2 current_input = get_dir_input();
 	if(current_input.x != 0 || current_input.y != 0){
diff --git a/assets/wicked_glee.ogg b/assets/wicked_glee.ogg
new file mode 100644
index 0000000..9c962a3
--- /dev/null
+++ b/assets/wicked_glee.ogg