From 7db9692c9fe7c93823ead045c2161187b70f60b9 Mon Sep 17 00:00:00 2001
From: taco360 <taco360headquarters@gmail.com>
Date: Wed, 31 Mar 2021 14:34:02 -0400
Subject: [PATCH] copy changes to blank cart

---
 evercore_blank.p8 | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/evercore_blank.p8 b/evercore_blank.p8
index b99ab15..9334390 100644
--- a/evercore_blank.p8
+++ b/evercore_blank.p8
@@ -3,7 +3,7 @@ version 32
 __lua__
 --~evercore~
 --a celeste classic mod base
---v2.0.0 stable
+--v2.0.1 stable
 
 --original game by:
 --maddy thorson + noel berry
@@ -584,6 +584,9 @@ lifeup={
 
 fake_wall={
   check_fruit=true,
+  init=function(this)
+    this.solid_obj=true
+  end,
   update=function(this)
     this.hitbox=rectangle(-1,-1,18,18)
     local hit=this.player_here()
@@ -758,27 +761,30 @@ orb={
 flag={
   init=function(this)
     this.x+=5
-    this.score=0
-    for lvl in all(got_fruit) do
-      for f in all(lvl) do
-        this.score+=1
-      end
-    end
   end,
   update=function(this)
     if not this.show and this.player_here() then
+      --count berries
+      if not berry_count then
+        berry_count=0
+        for lvl in all(got_fruit) do
+          for f in all(lvl) do
+            berry_count+=1
+          end
+        end
+      end
+
       sfx(55)
       sfx_timer,this.show,time_ticking=30,true,false
     end
   end,
   draw=function(this)
-    this.spr=118+frames/5%3
-    draw_obj_sprite(this)
+    spr(118+frames/5%3,this.x,this.y)
     if this.show then
       camera()
       rectfill(32,2,96,31,0)
       spr(26,55,6)
-      ?"x"..this.score,64,9,7
+      ?"x"..berry_count,64,9,7
       draw_time(49,16)
       ?"deaths:"..deaths,48,24,7
       camera(draw_x,draw_y)
@@ -994,6 +1000,13 @@ end
 
 function next_level()
   local next_lvl=lvl_id+1
+  if next_lvl==2 then
+    --old site music
+    music(20,500,7)
+  elseif next_lvl==3 then
+    --wind music
+    music(30,500,7)
+  end
   load_level(next_lvl)
 end