Sunky Update

.gitignore

@@ -34,3 +34,5 @@ iso/*/*.tim
 iso/*/*.arc
 iso/*/*.xa
 iso/*/*.cht
+
+# Big Chungus

CMakeLists.txt

@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.16.3)
 
 option(PSXF_STDMEM "Use standard libc memory allocators instead of the fast custom one" OFF)
 set(PSXF_GL "MODERN" CACHE STRING "Which version of OpenGL to use: 'MODERN' for OpenGL Core 3.2, 'LEGACY' for OpenGL 2.1, and 'ES' for OpenGL ES 2.0")
+option(PSXF_NETWORK "Enable networking" OFF)
 
 project(funkin LANGUAGES C)
 
@@ -38,6 +39,8 @@ add_executable(funkin
 	"src/pad.h"
 	"src/pc/timer.c"
 	"src/timer.h"
+	"src/pc/movie.c"
+	"src/movie.h"
 	"src/pc/dr_mp3.h"
 	"src/pc/miniaudio.h"
 	"src/stage/dummy.c"
@@ -76,6 +79,8 @@ add_executable(funkin
 	"src/character/xmasp.h"
 	"src/character/senpai.c"
 	"src/character/senpai.h"
+	"src/character/senpaim.c"
+	"src/character/senpaim.h"
 	"src/character/tank.c"
 	"src/character/tank.h"
 	"src/character/gf.c"
@@ -125,6 +130,15 @@ if(PSXF_STDMEM)
 	target_compile_definitions(funkin PRIVATE PSXF_STDMEM)
 endif()
 
+# Use networking if requested to
+if(PSXF_NETWORK)
+	target_compile_definitions(funkin PRIVATE PSXF_NETWORK)
+	target_sources(funkin PRIVATE
+		"src/pc/network.c"
+		"src/network.h"
+	)
+endif()
+
 # Link GLFW3
 find_package(glfw3 REQUIRED)
 target_link_libraries(funkin PRIVATE glfw)

Makefile

@@ -17,6 +17,7 @@ SRCS = src/main.c \
        src/psx/audio.c \
        src/psx/pad.c \
        src/psx/timer.c \
+       src/psx/movie.c \
        src/stage/dummy.c \
        src/stage/week1.c \
        src/stage/week2.c \
@@ -35,6 +36,7 @@ SRCS = src/main.c \
        src/character/mom.c \
        src/character/xmasp.c \
        src/character/senpai.c \
+       src/character/senpaim.c \
        src/character/tank.c \
        src/character/gf.c \
        src/character/clucky.c \

Makefile.pc

@@ -9,10 +9,10 @@ GL = MODERN
 
 # Win32
 ifeq ($(OS),Windows_NT)
-  WINDOWS := 1
+  WINDOWS ?= 1
 endif
 ifeq ($(WINDOWS),1)
-  CFLAGS += -mwindows
+  CFLAGS += -DPSXF_WIN32 -mwindows
 endif
 
 # Options
@@ -30,6 +30,13 @@ ifeq ($(GL), ES)
   CFLAGS += -DPSXF_GL=PSXF_GL_ES
 endif
 
+ifeq ($(NETWORK), 1)
+  CFLAGS += -DPSXF_NETWORK
+  ifeq ($(WINDOWS),1)
+    LIBS += -lws2_32
+  endif
+endif
+
 # Release and debug
 ifeq ($(RELEASE), 1)
   CFLAGS += -O3 -Wall -Wextra -pedantic -DPSXF_PC -DNDEBUG
@@ -86,6 +93,7 @@ SOURCES = main \
           pc/audio \
           pc/pad \
           pc/timer \
+          pc/movie \
           stage/dummy \
           stage/week1 \
           stage/week2 \
@@ -104,9 +112,10 @@ SOURCES = main \
           character/mom \
           character/xmasp \
           character/senpai \
+          character/senpaim \
           character/tank \
           character/gf \
-		  character/clucky \
+          character/clucky \
           object \
           object/combo \
           object/splash
@@ -116,6 +125,11 @@ ifneq ($(GL), ES)
   SOURCES += pc/glad/glad
 endif
 
+ifeq ($(NETWORK), 1)
+  # Compile networking
+  SOURCES += pc/network
+endif
+
 # What to compile
 OBJECTS = $(addprefix obj/$(FILENAME)/, $(addsuffix .o, $(SOURCES)))
 DEPENDENCIES = $(addprefix obj/$(FILENAME)/, $(addsuffix .o.d, $(SOURCES)))

Makefile.tim

@@ -2,8 +2,10 @@ all: \
 	iso/menu/menu.arc \
 	iso/menu/loading.tim \
 	iso/font/boldfont.tim \
+	iso/font/arial.tim \
 	iso/stage/hud0.tim \
 	iso/stage/hud1.tim \
+	iso/stage/hud0weeb.tim \
 	iso/bf/main.arc \
 	iso/bf/dead.arc \
 	iso/bf/weeb.arc \
@@ -14,6 +16,7 @@ all: \
 	iso/mom/hair.tim \
 	iso/xmasp/main.arc \
 	iso/senpai/main.arc \
+	iso/senpaim/main.arc \
 	iso/tank/main.arc \
 	iso/tank/ugh.arc \
 	iso/tank/good.arc \
@@ -43,7 +46,7 @@ iso/bf/dead.arc: iso/bf/dead1.tim iso/bf/dead2.tim iso/bf/retry.tim
 iso/bf/weeb.arc: iso/bf/weeb0.tim iso/bf/weeb1.tim
 
 # Dad
-iso/dad/main.arc: iso/dad/idle0.tim iso/dad/idle1.tim iso/dad/idle2.tim iso/dad/idle3.tim iso/dad/left.tim iso/dad/left1.tim iso/dad/left2.tim iso/dad/left3.tim iso/dad/down.tim iso/dad/down1.tim iso/dad/down2.tim iso/dad/up.tim iso/dad/up1.tim iso/dad/up2.tim iso/dad/right.tim iso/dad/right1.tim iso/dad/right2.tim
+iso/dad/main.arc: iso/dad/idle0.tim iso/dad/idle1.tim iso/dad/left.tim iso/dad/down.tim iso/dad/up.tim iso/dad/right.tim
 
 # Spook
 iso/spook/main.arc: iso/spook/idle0.tim iso/spook/idle1.tim iso/spook/idle2.tim iso/spook/left.tim iso/spook/down.tim iso/spook/up.tim iso/spook/right.tim
@@ -52,16 +55,17 @@ iso/spook/main.arc: iso/spook/idle0.tim iso/spook/idle1.tim iso/spook/idle2.tim
 iso/pico/main.arc: iso/pico/idle.tim iso/pico/hit0.tim iso/pico/hit1.tim
 
 # Mom
-iso/mom/main.arc: iso/mom/idle0.tim iso/mom/idle1.tim iso/mom/idle2.tim iso/mom/idle3.tim iso/mom/left.tim iso/mom/left1.tim iso/mom/left2.tim iso/mom/down.tim iso/mom/down1.tim iso/mom/down2.tim iso/mom/up.tim iso/mom/up1.tim iso/mom/up2.tim iso/mom/right.tim iso/mom/right1.tim iso/mom/right2.tim
+iso/mom/main.arc: iso/mom/idle0.tim iso/mom/idle1.tim iso/mom/left.tim iso/mom/down.tim iso/mom/up.tim iso/mom/right.tim
 
 # XMas Parents
 iso/xmasp/main.arc: iso/xmasp/idle0.tim iso/xmasp/idle1.tim iso/xmasp/idle2.tim iso/xmasp/idle3.tim iso/xmasp/lefta0.tim iso/xmasp/lefta1.tim iso/xmasp/leftb0.tim iso/xmasp/leftb1.tim iso/xmasp/downa0.tim iso/xmasp/downa1.tim iso/xmasp/downb0.tim iso/xmasp/downb1.tim iso/xmasp/upa0.tim iso/xmasp/upa1.tim iso/xmasp/upb0.tim iso/xmasp/upb1.tim iso/xmasp/righta0.tim iso/xmasp/righta1.tim iso/xmasp/rightb0.tim iso/xmasp/rightb1.tim
 
 # Senpai
 iso/senpai/main.arc: iso/senpai/senpai0.tim iso/senpai/senpai1.tim
+iso/senpaim/main.arc: iso/senpaim/senpai0.tim iso/senpaim/senpai1.tim
 
 # Tank
-iso/tank/main.arc: iso/tank/idle0.tim iso/tank/idle1.tim iso/tank/left.tim iso/tank/down.tim iso/tank/up.tim iso/tank/right.tim
+iso/tank/main.arc: iso/tank/idle0.tim iso/tank/idle1.tim iso/tank/idle2.tim iso/tank/idle3.tim iso/tank/left.tim iso/tank/left1.tim iso/tank/down.tim iso/tank/down1.tim iso/tank/up.tim iso/tank/up1.tim iso/tank/right.tim iso/tank/right1.tim
 iso/tank/ugh.arc: iso/tank/ugh0.tim iso/tank/ugh1.tim
 iso/tank/good.arc: iso/tank/good0.tim iso/tank/good1.tim iso/tank/good2.tim iso/tank/good3.tim
 
@@ -72,10 +76,10 @@ iso/gf/main.arc: iso/gf/bopleft.tim iso/gf/bopright.tim iso/gf/cry.tim
 iso/clucky/main.arc: iso/clucky/idle0.tim iso/clucky/idle1.tim iso/clucky/left.tim iso/clucky/down.tim iso/clucky/up.tim iso/clucky/right.tim
 
 # Week 1
-iso/week1/back.arc: iso/week1/back0.tim iso/week1/back1.tim
+iso/week1/back.arc: iso/week1/back0.tim iso/week1/back1.tim iso/week1/back2.tim
 
 # Week 2
-iso/week2/back.arc: iso/week2/back0.tim iso/week2/back1.tim
+iso/week2/back.arc: iso/week2/back0.tim iso/week2/back1.tim iso/week2/back2.tim
 
 # Week 3
 iso/week3/back.arc: iso/week3/back0.tim iso/week3/back1.tim iso/week3/back2.tim iso/week3/back3.tim iso/week3/back4.tim iso/week3/back5.tim

README.md

@@ -1,9 +1,9 @@
-# SonicEXE-master
- Sonic.EXE mod for Friday Night Funkin' ported to PSXFunkin
+# PSXFunkin
+VS Sonic.EXE on the PS1 ooga booga hes gonna getcha
 
 ## Compilation
 Refer to [COMPILE.md](/COMPILE.md) here
 
 ## Disclaimer
-Please ask for permission before publishing anything with this source code.
-Lord Scout#2484
+This project is not endorsed by the original Friday Night Funkin' devs, this is just an unofficial fan project because I was bored.
+Assets are used with permission from their respective owners.

funkin.xml

@@ -30,12 +30,14 @@
 			<!-- Fonts -->
 			<dir name = "font">
 				<file name = "boldfont.tim" type = "data" source = "iso/font/boldfont.tim"/>
+				<file name = "arial.tim" type = "data" source = "iso/font/arial.tim"/>
 			</dir>
 
 			<!-- Stage assets -->
 			<dir name = "stage">
 				<file name = "hud0.tim" type = "data" source = "iso/stage/hud0.tim"/>
 				<file name = "hud1.tim" type = "data" source = "iso/stage/hud1.tim"/>
+				<file name = "hud0weeb.tim" type = "data" source = "iso/stage/hud0weeb.tim"/>
 			</dir>
 
 			<!-- Week 1 assets -->
@@ -233,6 +235,7 @@
 
 				<!-- Senpai assets -->
 				<file name = "senpai.arc" type = "data" source = "iso/senpai/main.arc"/>
+				<file name = "senpaim.arc" type = "data" source = "iso/senpaim/main.arc"/>
 
 				<!-- Tankman Captain assets -->
 				<file name = "tank.arc" type = "data" source = "iso/tank/main.arc"/>
@@ -255,10 +258,18 @@
 				<dummy sectors="128"/>
 				<file name = "week1b.xa" type = "xa" source = "iso/music/week1b.xa"/>
 				<dummy sectors="128"/>
+				<file name = "week2a.xa" type = "xa" source = "iso/music/week2a.xa"/>
+				<dummy sectors="128"/>
+				<file name = "week2b.xa" type = "xa" source = "iso/music/week2b.xa"/>
+				<dummy sectors="128"/>
 				<file name = "week3a.xa" type = "xa" source = "iso/music/week3a.xa"/>
 				<dummy sectors="128"/>
 				<file name = "week3b.xa" type = "xa" source = "iso/music/week3b.xa"/>
 				<dummy sectors="128"/>
+				<file name = "week4a.xa" type = "xa" source = "iso/music/week4a.xa"/>
+				<dummy sectors="128"/>
+				<file name = "week4b.xa" type = "xa" source = "iso/music/week4b.xa"/>
+				<dummy sectors="128"/>
 			</dir>
 
 			<!-- Dummy sectors -->