Fix more stuff

README.md

@@ -6,23 +6,23 @@
 
 **DDLC-LOVE** is a Doki Doki Literature Club port programmed in Lua for the **Nintendo Switch, 3DS, Sony PS Vita, PSP, and PS3!**
 
-**This port is unofficial and is not affiliated with Team Salvato. Please support the official game. You can download Doki Doki Literature Club at: http://ddlc.moe**
+**This port is unofficial and is not affiliated with Team Salvato. Please support the official game. You can download Doki Doki Literature Club at: https://ddlc.moe**
 
 ## Downloads:
 - [PS Vita v1.2.0 (.vpk)](https://github.com/LukeZGD/DDLC-LOVE/releases/download/v1.2.0/DDLC-LOVE.vpk)
 - [Switch v1.1.9 (.nro)](https://github.com/LukeZGD/DDLC-LOVE/releases/download/v1.1.9/DDLC-LOVE-Switch-fix2.nro)
 - [Switch v1.1.9 (.nro) (LP1.1.0)](https://github.com/LukeZGD/DDLC-LOVE/releases/download/v1.1.9/DDLC-LOVE-Switch-LP1.1.0.nro)
 - [PSP v1.1.9 (.zip)](https://github.com/LukeZGD/DDLC-LOVE/releases/download/v1.1.9/DDLC-LOVE-PSP-fix1.zip)
-- [PS3 v1.1.9 (.zip)](https://github.com/LukeZGD/DDLC-LOVE/releases/download/v1.1.9/DDLC-LOVE-PS3-fix1.zip)
 - [3DS v1.1.8-2 (.3dsx)](https://github.com/LukeZGD/DDLC-LOVE/releases/download/v1.1.9/DDLC-LOVE-3DS.3dsx)
 - [3DS v1.1.8-2 (.cia)](https://github.com/LukeZGD/DDLC-LOVE/releases/download/v1.1.9/DDLC-LOVE-3DS.cia)
+- [PS3 v1.1.9 (.zip)](https://github.com/LukeZGD/DDLC-LOVE/releases/download/v1.1.9/DDLC-LOVE-PS3-fix1.zip)
 
 ## Usage:
+- **PS Vita** - Install the `.vpk` using [VitaShell](https://github.com/TheOfficialFloW/VitaShell). You can now run DDLC-LOVE from the home screen
 - **Switch** - Run the `.nro` with [Atmosphère](https://github.com/Atmosphere-NX/Atmosphere) title takeover functionality. Other methods can be found [here](https://turtlep.github.io/LovePotion/wiki/#/packaging)
+- **PSP** - Download the `.zip` for the PSP version, and extract the folder with `EBOOT.PBP` to your memory stick at `ms0:/PSP/GAME/`. You can now run DDLC-LOVE from the XMB
 - **3DS .3dsx** - Put the `.3dsx` to the `3ds` folder on the root of your SD card. You can now run DDLC-LOVE from [The Homebrew Launcher](https://github.com/fincs/new-hbmenu)
 - **3DS .cia** - Install the `.cia`  using [FBI](https://github.com/Steveice10/FBI). You can now run DDLC-LOVE from the home menu
-- **PS Vita** - Install the `.vpk` using [VitaShell](https://github.com/TheOfficialFloW/VitaShell). You can now run DDLC-LOVE from the home screen
-- **PSP** - Download the `.zip` for the PSP version, and extract the folder with `EBOOT.PBP` to your memory stick at `ms0:/PSP/GAME/`. You can now run DDLC-LOVE from the XMB
 - **PS3:**
   1. Download the `.zip` for the PS3 version.
   2. Extract all files of the `.zip` to the root of a compatible USB drive to be used for the PS3, and install `Lua Player PS3.pkg` (you need CFW/[HEN](https://www.psx-place.com/threads/update-ps3hen-v3-0-0-view-latest-changes-to-the-ps3-exploit-for-superslims-noncfw-models.23955/) to get Package Manager). This only needs to be done once for setting up
@@ -34,9 +34,9 @@
 - Limited support for Switch, PSP, 3DS, and PS3 (see [#123](https://github.com/LukeZGD/DDLC-LOVE/issues/123))
 - (Switch) Only **[Atmosphère](https://github.com/Atmosphere-NX/Atmosphere)** is supported.
 - (Switch) (LP1.1.0) For Atmosphère 0.10.2 and up, add `enable_deprecated_hid_mitm = u8!0x1` in `sdmc:/atmosphere/config/system_settings.ini` under `[Atmosphere]` (see [#111](https://github.com/LukeZGD/DDLC-LOVE/issues/111))
+- (PSP) PSP 1000 systems are not supported.
 - (3DS) Only the **latest [Luma3DS](https://github.com/AuroraWright/Luma3DS)** is supported.
 - (3DS) Make sure that `dspfirm.cdc` is dumped for audio to work (use [DSP1](https://github.com/zoogie/DSP1/releases))
-- (PSP) PSP 1000 systems are not supported.
 
 ## Locations of save files:
 

game/loader/images.lua

@@ -9,19 +9,27 @@ function bgUpdate(bgx, forceload) --background changes
 	end
 
 	if xaload == 0 or forceload then
-		if autoskip == 0 and not forceload then bgch2 = bgch end
-        if bgch then Graphics.freeImage(bgch) end
-		bgch = nil
+		if autoskip == 0 and not forceload then
+			bgch2 = bgch
+		else
+			if type(bgch) == "number" then Graphics.freeImage(bgch) end
+			bgch = nil
+		end
+
 		bgch = lgnewImage('assets/images/bg/'..bgx..'.png')
 	end	
 	bg1 = bgx
 end
 
 function cgUpdate(cgx, forceload) --cg changes
 	if cg1 ~= cgx or forceload then
-		if autoskip == 0 and not forceload then cgch2 = cgch end
-        if cgch then Graphics.freeImage(cgch) end
-		cgch = nil		
+		if autoskip == 0 and not forceload then
+			cgch2 = cgch
+		else
+			if type(cgch) == "number" then Graphics.freeImage(cgch) end
+			cgch = nil
+		end
+		cgch = nil
 		cgch = lgnewImage('assets/images/cg/'..cgx..'.png')
 	end	
 	cg1 = cgx
@@ -36,6 +44,7 @@ function loaderGame()
 		bgalpha = math.max(bgalpha - 15, 0)
 		if bgalpha == 0 then
 			bgalpha = 255
+			Graphics.freeImage(bgch2)
 			bgch2 = nil
 		end
 	end
@@ -44,6 +53,7 @@ function loaderGame()
 		cgalpha = math.max(cgalpha - 15, 0)
 		if cgalpha == 0 then
 			cgalpha = 255
+			Graphics.freeImage(cgch2)
 			cgch2 = nil
 		end
 	end

game/menu.lua

@@ -562,15 +562,9 @@ function m_select(arg)
 	cY = 110+(50*(m_selected-1))
 end
 
-function sfx2play()
-	if global_os ~= 'LOVE-WrapLua' then
-		sfx2:play()
-	end
-end
-
 function menu_keypressed(key)
 	if key == 'down' then
-		sfx2play()
+		sfx2:play()
 		if menu_type == 'savegame' or menu_type == 'loadgame' then
 			if m_selected <= 4 then
 				m_selected = m_selected + 3
@@ -585,7 +579,7 @@ function menu_keypressed(key)
 		m_select()
 
 	elseif key == 'up' then
-		sfx2play()
+		sfx2:play()
 		if menu_type == 'savegame' or menu_type == 'loadgame' then
 			if m_selected >= 5 and m_selected <= 7 then
 				m_selected = m_selected - 3
@@ -618,7 +612,7 @@ function menu_keypressed(key)
 
 	elseif key == 'left' then
 		if menu_type == 'savegame' or menu_type == 'loadgame' then
-			sfx2play()
+			sfx2:play()
 			if m_selected == 2 or m_selected == 5 then
 				m_selected = m_selected + 2
 			elseif m_selected > 2 then
@@ -646,7 +640,7 @@ function menu_keypressed(key)
 
 	elseif key == 'right' then
 		if menu_type == 'savegame' or menu_type == 'loadgame' then
-			sfx2play()
+			sfx2:play()
 			if m_selected == 4 or m_selected == 7 then
 				m_selected = m_selected - 2
 			elseif m_selected < 7 then

game/scripts/eng/script-ch0.lua

@@ -934,7 +934,7 @@ function ch0script()
 	elseif cl == 10017 then
 		cw('bl','This port, or the original game is not suitable for children or those who are easily disturbed.')
 	elseif cl == 10018 then
-		cw('bl','Individuals suffering from anxiety or depression may not have a safe experience playing this game. For content warnings, please visit: http://ddlc.moe/warning.html')
+		cw('bl','Individuals suffering from anxiety or depression may not have a safe experience playing this game. For content warnings, please visit: https://ddlc.moe/warning.html')
 	elseif cl == 10019 then
 		cw('bl','By playing Doki Doki Literature Club, you agree that you are at least 13 years of age, and you consent to your exposure of highly disturbing content.')
 	elseif cl == 10020 then

game/states/game.lua

@@ -10,9 +10,9 @@ function drawGame()
 	lg.draw(bgch)
 	lg.draw(cgch)
 	lgsetColor(255,255,255,bgalpha)
-	--lg.draw(bgch2)
+	lg.draw(bgch2)
 	lgsetColor(255,255,255,cgalpha)
-	--lg.draw(cgch2)
+	lg.draw(cgch2)
 
 	lgsetColor(255,255,255,alpha)
 	drawSayori()

game/states/poemgame.lua

@@ -252,7 +252,7 @@ function drawPoemGame()
 end
 
 function updatePoemGame()
-	xaload = xaload + 1
+	xaload = xaload + dt*60.3
 	if not spAdd then spAdd = 0 end
 	if not npAdd then npAdd = 0 end
 	if not ypAdd then ypAdd = 0 end