From b413e30a662062326540016e3d60c908ba279c51 Mon Sep 17 00:00:00 2001
From: Gabriel-Gravin <gdavg2@gmail.com>
Date: Mon, 23 Oct 2023 13:42:55 -0700
Subject: [PATCH 1/2] updates to integration

---
 _posts/2023-10-11-MainGameFile.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_posts/2023-10-11-MainGameFile.md b/_posts/2023-10-11-MainGameFile.md
index 9bb9d2b..dad8a1d 100644
--- a/_posts/2023-10-11-MainGameFile.md
+++ b/_posts/2023-10-11-MainGameFile.md
@@ -20,7 +20,7 @@ Freeplay with Link! Use "D" to make him move right, use the "A" to make him move
     <canvas id="gameCanvas" width="800" height="400"></canvas>
     <script type="module">
         import { Character } from '{{site.baseurl}}/assets/js/Character.js'
-        var Link = new Character('{{site.baseurl}}/images/linksprites.png', 96, 104, 100, 800 - 400, -10, .5, 2);
+        var Link = new Character('{{site.baseurl}}/images/linksprites.png', 96, 104, 100, 400 - 104, -10, .5, 2);
         // Get the canvas and its 2D rendering context
         const canvas = document.getElementById('gameCanvas');
         const ctx = canvas.getContext('2d');

From d575b48f5402ea200509dbc8591cf75f46796333 Mon Sep 17 00:00:00 2001
From: daisyzhang2024 <daisyzhang1257@gmail.com>
Date: Mon, 23 Oct 2023 13:43:37 -0700
Subject: [PATCH 2/2] minigame stuff?

---
 _posts/2023-10-12-gameframework_2.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/_posts/2023-10-12-gameframework_2.md b/_posts/2023-10-12-gameframework_2.md
index dd33d09..4c3d389 100644
--- a/_posts/2023-10-12-gameframework_2.md
+++ b/_posts/2023-10-12-gameframework_2.md
@@ -210,13 +210,8 @@ backgroundImg.onload = function () {
     const defaultFilter = getComputedStyle(document.documentElement).getPropertyValue('--default-canvas-filter');
     toggleCanvasEffect.addEventListener("click", function () {
         if (isFilterEnabled) {
-<<<<<<< HEAD:_posts/2023-10-12-gameframework_2.md
-            canvas.style.filter = "none";  // remove filter
-            linkCanvas.style.filter = "none";
-=======
             canvas.style.filter = "invert(100%)";  // remove filter
-            goblinCanvas.style.filter = "invert(100%)";
->>>>>>> 4265fb72c50b00f8f7b706b386e348435f1880a9:_posts/2023-10-12-teamwork copy.md
+            linkCanvas.style.filter = "invert(100%)";
         } else {
             canvas.style.filter = defaultFilter; // Apply the default filter value
             linkCanvas.style.filter = defaultFilter;