common: Some fixes

include/harada.h

@@ -13,6 +13,7 @@
 #pragma region Structs
 
 typedef enum {
+    unk = -1,
     PTOPENING,
     PT0100_S2,
     PT0100_S0,

include/sfx.h

@@ -2,6 +2,7 @@
 #define SFX_H
 
 #include "types.h"
+#include "ps2.h"
 
 typedef struct { // 0x10
     /* 0x0 */ u64 data;

src/abe/ab_object.h

@@ -1,5 +1,5 @@
 #include <libvu0.h>
-#include "../../../types.h"
+#include "types.h"
 
 template <class T>
 class CVector {

src/abe/ab_objtest.c

@@ -1,4 +1,4 @@
-#include "ab_objtest.h"
+#include "abe/ab_objtest.h"
 #include "nakano/main.h"
 #include "nakano/objfunc.h"
 

src/abe/sample.c

@@ -1,5 +1,4 @@
 #include "sample.h"
-#include "harada/hr_mapdr.h"
 #include "nakano/main.h"
 #include "nakano/objfunc.h"
 #include "nakano/dma.h"

src/harada/hr_pall.c

@@ -1,6 +1,6 @@
-#include "hr_pall.h"
-#include "hr_pbgm.h"
-#include "hr_pflag.h"
+#include "harada/hr_pall.h"
+#include "harada/hr_pbgm.h"
+#include "harada/hr_pflag.h"
 
 // PCAMS ppcam = {};
 // PCAMS *hrpcam = NULL;

src/harada/hr_pflag.c

@@ -1,5 +1,5 @@
-#include "hr_pflag.h"
-#include "hr_pall.h"
+#include "harada/hr_pflag.h"
+#include "harada/hr_pall.h"
 
 static PTDATA scene_table[90] = {};
 
@@ -19,11 +19,15 @@ void hr_pflag_init() {
 }
 
 PT hr_pflag_get_id() {
-    s32 i;
+    PTDATA *table = scene_table;
+    PT i;
 
-    for (i = 0; i < 90; i++) {
-        if (scene_table[i].area == GameGbl.vision && scene_table[i].scene == hrpt_scene)
-            return (PT)i;
+    for (i = PTOPENING; i < PTSCENE_NUM; i++) {
+        if (table->area == GameGbl.vision && table->scene == hrpt_scene) {
+            return i;
+        }
+        table++;
     }
+
     return -1;
 }

src/hoshino/h_cdvd.h

@@ -2,6 +2,7 @@
 #define H_CDVD_H
 
 #include "hoshino.h"
+#include <libcdvd.h>
 
 typedef enum {
     CDREAD_IDLE,

src/hoshino/h_event.c

@@ -2,6 +2,7 @@
 #include "h_wkmng.h"
 #include "h_gamesnd.h"
 #include "nakano/light.h"
+#include "take/motsys.h"
 
 hMNGLIST EvMng[64];
 hEvOBJECT EvObj[64];

src/hoshino/h_game.c

@@ -2,6 +2,7 @@
 #include "h_event.h"
 #include "harada/hr_pbgm.h"
 #include "h_str.h"
+#include "h_gamesnd.h"
 
 BGMAREA v____[8] = {
     {-1, 0, 0.0f, 0.0f},

src/hoshino/h_init.c

@@ -1,3 +1,5 @@
+#include <sifdev.h>
+#include <sifrpc.h>
 #include "h_init.h"
 #include "nakano/init.h"
 #include "h_cdvd.h"

src/hoshino/h_movie.h

@@ -2,6 +2,7 @@
 #define H_MOVIE_H
 
 #include "hoshino.h"
+#include <libcdvd.h>
 
 typedef struct {
     sceCdlFILE file;

src/hoshino/h_rpc.c

@@ -2,6 +2,8 @@
 #include "h_sound.h"
 #include "h_str.h"
 #include "h_menu.h"
+#include <sif.h>
+#include <sifrpc.h>
 
 static s32 sbuff[16] __attribute__((aligned(16)));
 static s32 sndBuff[16] __attribute__((aligned(16)));

src/hoshino/h_str.h

@@ -3,6 +3,7 @@
 
 #include "hoshino.h"
 #include "h_sound.h"
+#include <libcdvd.h>
 
 typedef enum {
     BGMNO = -1,

src/hoshino/h_util.c

@@ -1,3 +1,4 @@
+#include <sifdev.h>
 #include "h_util.h"
 
 void dump8(u8 *p) {

src/nakano/main.c

@@ -3,6 +3,10 @@
 #include "init.h"
 #include "harada/hr_pall.h"
 #include "harada/hr_main.h"
+#include "okanoyo/okinit.h"
+#include "hoshino/h_init.h"
+#include "okanoyo/okio.h"
+#include "mfunc.h"
 
 NKDEBGBL nkDG = {};
 SYSGBL SysGbl = {};

src/nakano/mapview.c

@@ -1,9 +1,13 @@
+#include <sifdev.h>
+#include <eetypes.h>
+#include <libdev.h>
 #include "mapview.h"
 #include "main.h"
 #include "dma.h"
 #include "harada/hr_main.h"
 #include "harada/hr_bgwk.h"
 #include "nkpad.h"
+#include "okanoyo/okprint.h"
 
 static s32 MapVMenu;
 static s32 MapVMsw;

src/okanoyo/okio.c

@@ -1,3 +1,4 @@
+#include <sifdev.h>
 #include "okio.h"
 #include "okmain.h"
 

src/take/mimesys.c

@@ -1,4 +1,5 @@
-#include "common.h"
+#include "mimesys.h"
+#include "sfxbios.h"
 
 void MimeWork(SFXOBJ *pObj) {
     VoiceMime(pObj);