hoshino: A couple fixes

entriphy · Jul 18, 2024 · 1331d01 · 1331d01
1 parent 9243809
commit 1331d01
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,7 +23,7 @@ set_target_properties(PS2_CRT0 PROPERTIES OUTPUT_NAME "crt0.o")
 set(EXECUTABLES)
 
 # C files
-set(SUBDIRS abe harada hato hoshino kazuya nakano okanoyo taka take okanoyo/debug vtusr hoshino/kit vtusr/taro okanoyo/linux)
+set(SUBDIRS abe harada hato hoshino kazuya nakano okanoyo taka take okanoyo/debug vtusr hoshino/kit hoshino/take vtusr/taro okanoyo/linux)
 foreach (SUBDIR IN LISTS SUBDIRS)
     file(GLOB files src/${SUBDIR}/*.c)
     foreach (file ${files})

diff --git a/src/hoshino/h_sound.c b/src/hoshino/h_sound.c
@@ -1,12 +1,14 @@
-#include "h_sound.h"
-#include "h_rpc.h"
-#include "h_gamesnd.h"
-#include "h_menu.h"
-#include "h_str.h"
-#include "h_util.h"
-#include "h_cdvd.h"
+#include <eetypes.h>
+#include <libsdr.h>
+#include "hoshino/h_sound.h"
+#include "hoshino/h_rpc.h"
+#include "hoshino/h_gamesnd.h"
+#include "hoshino/h_menu.h"
+#include "hoshino/h_str.h"
+#include "hoshino/h_util.h"
+#include "hoshino/h_cdvd.h"
+#include "hoshino/h_file.h"
 #include "okanoyo/okio.h"
-#include "h_file.h"
 
 EFXSE efdm[1] = {
     {4, 0.1f, 0, 0, 1, 0.05f, 0.0f, 0, 0}
@@ -716,7 +718,7 @@ void hSndPkSetPitch(s32 voice, s32 pitch) {
     *sD->Pk++ = pitch >> 8;
 }
 
-void hSndPkSetPalPitch(s32 voice) {
+void hSndPkPalPitch(s32 voice) {
     sD->PkNum++;
     *sD->Pk++ = SNDCMD_PALPITCH;
     *sD->Pk++ = voice;

diff --git a/src/hoshino/h_str.c b/src/hoshino/h_str.c
@@ -1,10 +1,12 @@
-#include "h_str.h"
-#include "h_sound.h"
-#include "h_cdvd.h"
-#include "h_game.h"
-#include "h_rpc.h"
-#include "h_menu.h"
-#include "h_test.h"
+#include <eetypes.h>
+#include <libsdr.h>
+#include "hoshino/h_str.h"
+#include "hoshino/h_sound.h"
+#include "hoshino/h_cdvd.h"
+#include "hoshino/h_game.h"
+#include "hoshino/h_rpc.h"
+#include "hoshino/h_menu.h"
+#include "hoshino/h_test.h"
 
 KLTABLE *KlTable = NULL; // ?
 PPTTABLE *PptTable = NULL;

diff --git a/src/hoshino/take/t_vu0work.c b/src/hoshino/take/t_vu0work.c
@@ -0,0 +1,5 @@
+#include "hoshino/take/t_vu0work.h"
+
+void TransVu0Prog() {
+    // Empty function
+}
diff --git a/src/hoshino/take/t_vu0work.h b/src/hoshino/take/t_vu0work.h
@@ -0,0 +1,6 @@
+#ifndef TAKE_VU0WORK_H
+#define TAKE_VU0WORK_H
+
+extern void TransVu0Prog();
+
+#endif