- [Psy-X] include files renames

- re-arrange includes

src_rebuild/DebugOverlay.cpp

@@ -1,7 +1,3 @@
-#include "LIBGTE.H"
-#include "LIBGPU.H"
-#include "INLINE_C.H"
-
 #include "Game/driver2.h"
 
 #include "Game/C/mission.h"

src_rebuild/Game/ASM/rnc_2.c

@@ -8,8 +8,6 @@
 
 #include "driver2.h"
 
-#include "STRINGS.H"
-
 struct RNCheader
 {
     u_int identifier;    //must contain 'R', 'N', 'C', method

src_rebuild/Game/ASM/rndrasm.c

@@ -2,8 +2,6 @@
 #include "C/camera.h"
 #include "C/draw.h"
 
-#include "INLINE_C.H"
-
 extern MATRIX frustrum_matrix;
 
 // [D] [T]

src_rebuild/Game/C/E3stuff.c

@@ -7,8 +7,6 @@
 #include "pause.h"
 #include "sound.h"
 
-#include "LIBETC.H"
-
 struct POLYCOORD
 {
 	short x;

src_rebuild/Game/C/bcollide.c

@@ -14,14 +14,6 @@
 #include "objanim.h"
 #include "system.h"
 
-#include "RAND.H"
-#include "STRINGS.H"
-#include "LIMITS.H"
-
-#include "INLINE_C.H"
-#include "LIBETC.H"
-
-
 extern int gCameraBoxOverlap;
 
 // Checks of two bodies collides (basic check) with Separating Axis Theorem

src_rebuild/Game/C/bomberman.c

@@ -19,9 +19,6 @@
 
 #include "ASM/rndrasm.h"
 
-#include "INLINE_C.H"
-#include "RAND.H"
-
 MODEL* gBombModel;
 
 static BOMB ThrownBombs[MAX_THROWN_BOMBS];

src_rebuild/Game/C/camera.c

@@ -21,11 +21,6 @@
 #include "pedest.h"
 #include "cell.h"
 
-#include "INLINE_C.H"
-#include "LIBGTE.H"
-
-
-
 VECTOR gCameraOffset = { 0};
 VECTOR camera_position = { 0, 380, 0, 0 };
 SVECTOR camera_angle = { 0,0,0 };

src_rebuild/Game/C/cars.c

@@ -20,10 +20,6 @@
 #include "glaunch.h"
 #include "ASM/rndrasm.h"
 
-#include "INLINE_C.H"
-#include "LIBAPI.H"
-#include "LIBETC.H"
-
 #ifndef PSX
 #define CAR_LOD_SWITCH_DISTANCE switch_detail_distance
 #else

src_rebuild/Game/C/civ_ai.c

@@ -24,10 +24,6 @@
 #include "objcoll.h"
 #include "overlay.h"
 
-#include "INLINE_C.H"
-#include "STRINGS.H"
-#include "ABS.H"
-
 const u_char speedLimits[3] = { 56, 97, 138 };
 
 struct

src_rebuild/Game/C/convert.c

@@ -3,8 +3,6 @@
 #include "draw.h"
 #include "camera.h"
 
-#include "INLINE_C.H"
-
 // [D] [T]
 void Calc_Object_MatrixYZX(MATRIX *mat, SVECTOR *angles)
 {

src_rebuild/Game/C/cosmetic.c

@@ -10,11 +10,6 @@
 #include "director.h"
 #include "main.h"
 
-#include "INLINE_C.H"
-
-#include "RAND.H"
-#include "STRINGS.H"
-
 char* CosmeticFiles[] = {
 	"LEVELS\\CHICAGO.LCF",
 	"LEVELS\\HAVANA.LCF",

src_rebuild/Game/C/cutscene.c

@@ -22,10 +22,6 @@
 #include "xaplay.h"
 #include "overlay.h"
 
-#include "LIBETC.H"
-#include "STRINGS.H"
-#include "RAND.H"
-
 int gSkipInGameCutscene = 0;
 
 int gInGameCutsceneActive = 0;

src_rebuild/Game/C/debris.c

@@ -24,9 +24,6 @@
 
 #include "ASM/rndrasm.h"
 
-#include "INLINE_C.H"
-#include "RAND.H"
-
 TEXTURE_DETAILS digit_texture;
 
 TRI_POINT debris_rot1[32]; // offset 0xC0A60

src_rebuild/Game/C/denting.c

@@ -2,7 +2,6 @@
 #include "denting.h"
 #include "system.h"
 #include "mission.h"
-#include "models.h"
 #include "cars.h"
 #include "convert.h"
 #include "pause.h"
@@ -13,8 +12,6 @@
 #include "players.h"
 #include "main.h"
 
-#include "STRINGS.H"
-
 char* DentingFiles[] =
 {
 	"LEVELS\\CHICAGO.DEN",

src_rebuild/Game/C/director.c

@@ -18,9 +18,6 @@
 #include "sound.h"
 #include "system.h"
 
-#include "RAND.H"
-#include "STRINGS.H"
-
 struct REPLAY_ICON
 {
 	short x;

src_rebuild/Game/C/draw.c

@@ -14,11 +14,7 @@
 #include "cars.h"
 #include "debris.h"
 #include "ASM/rndrasm.h"
-
-#include "INLINE_C.H"
-
 #include "event.h"
-#include "LIBETC.H"
 
 
 MATRIX aspect =

src_rebuild/Game/C/drivinggames.c

@@ -19,9 +19,6 @@
 
 #include "ASM/rndrasm.h"
 
-#include "INLINE_C.H"
-#include "RAND.H"
-
 MODEL* gTrailblazerConeModel; 
 SMASHED_CONE smashed_cones[MAX_SMASHED_CONES];
 

src_rebuild/Game/C/event.c

@@ -14,7 +14,6 @@
 #include "main.h"
 #include "system.h"
 #include "spool.h"
-#include "map.h"
 #include "texture.h"
 #include "civ_ai.h"
 #include "pedest.h"
@@ -23,10 +22,6 @@
 #include "dr2roads.h"
 #include "ASM/rndrasm.h"
 
-#include "INLINE_C.H"
-#include "GTEMAC.H"
-#include "RAND.H"
-
 #define PATH_NODE_WRAP		0x80000000	// go back to first node without interpolation
 #define PATH_NODE_CYCLE		0x80000001	// cycle nodes with interpolation
 #define PATH_NODE_STATION	0x80000002	// stop point

src_rebuild/Game/C/felony.c

@@ -10,10 +10,6 @@
 #include "gamesnd.h"
 #include "dr2roads.h"
 #include "overlay.h"
-#include "mission.h"
-
-#include "ABS.H"
-#include "STRINGS.H"
 
 short initialOccurrenceDelay[12] = { 24, 0, 0, 0, 0, 0, 0, 0, 24, 0, 24, 0 };
 short initialReccurrenceDelay[12] = { 128, 0, 128, 64, 64, 32, 32, 0, 128, 256 };

src_rebuild/Game/C/fmvplay.c

@@ -7,12 +7,6 @@
 #include "E3stuff.h"
 #include "main.h"
 
-#include "LIBETC.H"
-#include "LIBSPU.H"
-#include "LIBGPU.H"
-#include "LIBAPI.H"
-#include "LIBMCRD.H"
-
 
 // FMV
 int gSubtitles = 0;

src_rebuild/Game/C/gamesnd.c

@@ -24,9 +24,6 @@
 #include "debris.h"
 #include "felony.h"
 
-#include "LIBSPU.H"
-#include "LIBMATH.H"
-
 typedef void(*envsoundfunc)(envsound* ep /*$s1*/, envsoundinfo* E /*$a1*/, int pl /*$a2*/);
 
 void IdentifyZone(envsound* ep, envsoundinfo* E, int pl);

src_rebuild/Game/C/glaunch.c

@@ -12,12 +12,10 @@
 #include "camera.h"
 #include "fmvplay.h"
 #include "state.h"
-#include "Frontend/FEmain.h"
-
-#include "LIBETC.H"
-#include "STRINGS.H"
 #include "xaplay.h"
 
+#include "Frontend/FEmain.h"
+
 MISSION_STEP MissionLadder[68] =
 {
   { 1, 0, 1, 0 },

src_rebuild/Game/C/handling.c

@@ -23,11 +23,6 @@
 #include "shadow.h"
 #include "players.h"
 
-#include "INLINE_C.H"
-#include "STRINGS.H"
-#include "RAND.H"
-#include "LIMITS.H"
-
 inline void UpdateCarDrawMatrix(CAR_DATA* cp)
 {
 	cp->hd.drawCarMat.m[0][0] = -cp->hd.where.m[0][0];

src_rebuild/Game/C/job_fx.c

@@ -11,9 +11,6 @@
 
 #include "ASM/rndrasm.h"
 
-#include "INLINE_C.H"
-#include "RAND.H"
-
 EXOBJECT explosion[MAX_EXPLOSION_OBJECTS];
 
 MATRIX SS = { 0 };

src_rebuild/Game/C/loadsave.c

@@ -13,11 +13,6 @@
 #include "pause.h"
 #include "platform.h"
 
-#include "LIBGPU.H"
-#include "LIBETC.H"
-#include "STRINGS.H"
-
-
 #ifndef PSX
 #include <stdlib.h>		// getenv
 

src_rebuild/Game/C/loadview.c

@@ -11,8 +11,6 @@
 #include "main.h"
 #include "cutscene.h"
 
-#include "LIBETC.H"
-
 DRAWENV load_draw = { 0 };
 DISPENV load_disp = { 0 };
 

src_rebuild/Game/C/main.c

@@ -1,12 +1,6 @@
 #include "driver2.h"
 #include "main.h"
 
-#include "LIBETC.H"
-#include "LIBSPU.H"
-#include "LIBGPU.H"
-#include "LIBAPI.H"
-#include "LIBMCRD.H"
-
 #include "ASM/rndrasm.h"
 #include "ASM/d2mapasm.h"
 
@@ -61,15 +55,8 @@
 #include "xaplay.h"
 #include "shadow.h"
 #include "pause.h"
-
 #include "sysclock.h"
-
 #include "platform.h"
-
-#include "RAND.H"
-#include "STRINGS.H"
-
-#include "INLINE_C.H"
 #include "state.h"
 
 int levelstartpos[8][4] = {

src_rebuild/Game/C/map.c

@@ -8,13 +8,9 @@
 #include "draw.h"
 #include "camera.h"
 #include "glaunch.h"
-#include "models.h"
 #include "players.h"
 #include "main.h"
 
-#include "STRINGS.H"
-#include "LIBETC.H"
-
 char *map_lump = NULL;
 int initarea = 0;
 int LoadedArea;

src_rebuild/Game/C/mgeneric.c

@@ -8,8 +8,6 @@
 #include "replays.h"
 #include "system.h"
 
-#include "STRINGS.H"
-
 // [D] [T]
 void StorePlayerPosition(SAVED_PLAYER_POS *data)
 {

src_rebuild/Game/C/mission.c

@@ -29,8 +29,6 @@
 #include "shadow.h"
 #include "handling.h"
 
-#include "STRINGS.H"
-
 #ifndef PSX
 #include <stdint.h>
 #include <SDL.h>

src_rebuild/Game/C/models.c

@@ -5,8 +5,6 @@
 #include "mission.h"
 #include "cars.h"
 
-#include "STRINGS.H"
-
 MODEL dummyModel = { 0 };
 
 char* modelname_buffer = NULL;

src_rebuild/Game/C/motion_c.c

@@ -16,16 +16,10 @@
 #include "cars.h"
 #include "convert.h"
 
-#include "STRINGS.H"
-
 #ifdef USE_PGXP
 #include <math.h>
 #endif
 
-#include "INLINE_C.H"
-#include "GTEMAC.H"
-#include <LIBETC.H>
-
 enum LIMBS
 {
 	ROOT = 0,

src_rebuild/Game/C/objanim.c

@@ -15,8 +15,6 @@
 #include "system.h"
 #include "pause.h"
 
-#include "STRINGS.H"
-
 CYCLE_OBJECT Lev0[2] =
 {
 	{ "REDRVR", 0, 0, 6, 10, 2, 11, 15, 2 },

src_rebuild/Game/C/objcoll.c

@@ -14,8 +14,6 @@
 #include "players.h"
 #include "main.h"
 
-#include "LIBETC.H"
-
 // [D] [T]
 char CellEmpty(VECTOR *pPosition, int radius)
 {

src_rebuild/Game/C/overmap.c

@@ -18,10 +18,6 @@
 #include "pad.h"
 #include "ASM/rnc_2.h"
 
-#include "STRINGS.H"
-#include "INLINE_C.H"
-
-
 OVERMAP overlaidmaps[4] =
 {
 	{ 197, 318, 384, 672, 252, 153, 2145 },

src_rebuild/Game/C/pad.c

@@ -1,6 +1,5 @@
 #include "driver2.h"
 #include "pad.h"
-#include "system.h"
 #include "mission.h"
 #include "cutscene.h"
 #include "pause.h"
@@ -9,7 +8,7 @@
 #include "players.h"
 #include "cars.h"
 
-#include "STRINGS.H"
+#include <libpad.h>
 
 #ifdef PSX
 typedef struct PADRAW

src_rebuild/Game/C/pad.h

@@ -1,8 +1,6 @@
 #ifndef PAD_H
 #define PAD_H
 
-#include "LIBPAD.H"
-
 #define PADBUFFER_SIZE 34
 
 enum ECameraPad

src_rebuild/Game/C/pause.c

@@ -16,8 +16,6 @@
 #include "platform.h"
 #include "loadsave.h"
 
-#include "STRINGS.H"
-
 #define REPLAY_NAME_LEN		16
 #define SCORE_NAME_LEN		5
 

src_rebuild/Game/C/pedest.c

@@ -27,10 +27,6 @@
 
 #include "ASM/rndrasm.h"
 
-#include "STRINGS.H"
-#include "INLINE_C.H"
-
-
 MODEL* pmTannerModels[17] = { 0 };
 MODEL* pmJerichoModels[6] = { 0 };
 

src_rebuild/Game/C/pres.c

@@ -3,8 +3,6 @@
 #include "system.h"
 #include "texture.h"
 
-#include <STRINGS.H>
-
 extern TEXTURE_DETAILS digit_texture;
 
 FONT_DIGIT fontDigit[] = {

src_rebuild/Game/C/replays.c

@@ -13,10 +13,6 @@
 #include "civ_ai.h"
 #include "state.h"
 
-#include "STRINGS.H"
-#include "RAND.H"
-
-
 char AnalogueUnpack[16] = { 
 	0, -51, -63, -75, -87, -99, -111, -123,
 	0,  51,  63,  75,  87,  99,  111,  123

src_rebuild/Game/C/scores.c

@@ -3,8 +3,6 @@
 #include "glaunch.h"
 #include "mission.h"
 
-#include "STRINGS.H"
-
 SCORE_TABLES ScoreTables;
 PLAYER_SCORE gPlayerScore;
 

src_rebuild/Game/C/shadow.c

@@ -14,9 +14,6 @@
 #include "mission.h"
 #include "tile.h"
 
-#include "INLINE_C.H"
-#include "STRINGS.H"
-
 int gShadowTexturePage;
 int gShadowTextureNum;
 

src_rebuild/Game/C/sky.c

@@ -9,9 +9,6 @@
 #include "debris.h"
 #include "players.h"
 
-#include "LIBGTE.H"
-#include "INLINE_C.H"
-
 struct RGB16
 {
 	short r;

src_rebuild/Game/C/sound.c

@@ -8,15 +8,6 @@
 #include "xaplay.h"
 #include "players.h"
 
-#include "LIBSPU.H"
-#include "LIBETC.H"
-#include "LIBGTE.H"
-
-#include "INLINE_C.H"
-
-#include "RAND.H"
-#include "STRINGS.H"
-
 #define SPU_CHANNEL_COUNT 24
 #define LSB_BANK_COUNT 7
 

src_rebuild/Game/C/spool.c

@@ -5,9 +5,6 @@
 #include <SDL.h>
 #endif // !PSX
 
-#include <STRINGS.H>
-
-#include "LIBETC.H"
 #include "pad.h"
 #include "spool.h"
 #include "map.h"
@@ -19,11 +16,9 @@
 #include "texture.h"
 #include "models.h"
 #include "objanim.h"
-#include "glaunch.h"
 #include "cars.h"
 #include "cosmetic.h"
 #include "denting.h"
-#include "handling.h"
 #include "mission.h"
 #include "civ_ai.h"
 #include "camera.h"

src_rebuild/Game/C/sysclock.c

@@ -2,9 +2,6 @@
 #include "driver2.h"
 #include "sysclock.h"
 
-#include "LIBAPI.H"
-#include "STRINGS.H"
-
 tmr_func tmrsub[8];
 
 int timerflag = 0;

src_rebuild/Game/C/system.c

@@ -16,9 +16,6 @@
 #include "draw.h"
 #include "pause.h"
 
-#include "LIBETC.H"
-#include "STRINGS.H"
-
 char gDataFolder[32] = "DRIVER2\\";
 
 #ifdef PSX

src_rebuild/Game/C/targets.c

@@ -11,8 +11,6 @@
 
 #include "ASM/rndrasm.h"
 
-#include "INLINE_C.H"
-
 struct TARGET_ARROW_MODEL
 {
 	SVECTOR* pVerts;

src_rebuild/Game/C/texture.c

@@ -7,8 +7,6 @@
 #include "objanim.h"
 #include "ASM/compres.h"
 
-#include "STRINGS.H"
-
 SXYPAIR tpagepos[20] =
 {
 	{ 640, 0 },

src_rebuild/Game/C/tile.c

@@ -8,8 +8,6 @@
 
 #include "ASM/rndrasm.h"
 
-#include "INLINE_C.H"
-
 // [D] [T] [A]
 void Tile1x1(MODEL *model)
 {

src_rebuild/Game/C/wheelforces.c

@@ -13,9 +13,6 @@
 #include "glaunch.h"
 #include "system.h"
 
-#include "INLINE_C.H"
-#include "LIBMATH.H"
-
 struct CAR_LOCALS
 {
 	LONGVECTOR4 vel;

src_rebuild/Game/C/xaplay.c

@@ -21,8 +21,6 @@
 #include "AL/al.h"
 #include "AL/alext.h"
 
-#include "LIBETC.H"
-
 const char* XANameFormat = "%sXA\\XABNK0%d.XA[%d].wav";
 ALuint g_XASource = AL_NONE;
 CSoundSource_WaveCache* g_wavData = NULL;

src_rebuild/Game/C/xmplay.c

@@ -8,19 +8,13 @@ XMPLAY.C
 
 ****************************************************************************/
 
-#include "TYPES.H"
-#include "STRINGS.H"
-#include "ABS.H"
+#include <types.h>
+#include <abs.h>
+#include <libspu.h>
 
 #include "xmplay.h"
 #include "xmcalls.h"
 
-#include "LIBETC.H"
-#include "LIBSPU.H"
-#include "LIBMATH.H"
-
-
-
 /**** PSX SPECIFIC ****/
 
 SpuVoiceAttr xm_g_s_attr; 		/* Structure for individual voice attributes*/

src_rebuild/Game/Frontend/FEmain.c

@@ -2,10 +2,6 @@
 
 #include "FEmain.h"
 
-#include "LIBGPU.H"
-#include "LIBETC.H"
-#include "STRINGS.H"
-
 #include "C/cd_icon.h"
 
 #include "C/system.h"

src_rebuild/Game/dr2math.h

@@ -1,7 +1,7 @@
 #ifndef DR2MATH_H
 #define DR2MATH_H
 
-#include "ABS.H"
+#include <abs.h>
 
 // Driver 2 math definitions
 extern short rcossin_tbl[8192];

src_rebuild/Game/dr2types.h

@@ -2,7 +2,7 @@
 #define DR2TYPES_H
 
 // Platform types
-#include "TYPES.H"
+#include <types.h>
 
 // Driver 2 system types
 typedef short	SHORTVECTOR4[4];

src_rebuild/Game/driver2.h

@@ -1,14 +1,23 @@
 #ifndef DRIVER2_H
 #define DRIVER2_H
 
-#include "KERNEL.H"
-#include "TYPES.H"
-#include "LIBCD.H"
-#include "LIBGTE.H"
-#include "LIBGPU.H"
-#include "LIBSPU.H"
+#include <types.h>
+#include <libcd.h>
+#include <libgte.h>
+#include <libgpu.h>
+#include <libspu.h>
+#include <libmcrd.h>
+#include <libmath.h>
+#include <libetc.h>
+#include <libapi.h>
 
+#include <gtemac.h>
+#include <inline_c.h>
+
+#include <strings.h>
+#include <rand.h>
 #include <stdio.h>
+#include <limits.h>
 
 #include "platform.h"
 

src_rebuild/Game/platform.h

@@ -6,7 +6,6 @@
 #include <emscripten/html5.h>
 #endif
 
-#include "STRINGS.H"
 #include "psyx_compat.h"
 
 #ifndef PSX

src_rebuild/Game/psyx_compat.h

@@ -5,8 +5,8 @@
 
 // Necessary includes
 #ifndef PSX
-#include "PSYX_PUBLIC.H"
-#include "PSYX_GLOBALS.H"
+#include "PsyX/PsyX_public.h"
+#include "PsyX/PsyX_globals.h"
 #endif
 
 // Necessary types

src_rebuild/PsyX/include/ASM.H

@@ -1,150 +0,0 @@
-#ifndef ASM_H
-#define ASM_H
-
-#define R0  $0
-#define R1  $1
-#define R2  $2
-#define R3  $3
-#define R4  $4
-#define R5  $5
-#define R6  $6
-#define R7  $7
-#define R8  $8
-#define R9  $9
-#define R10 $10
-#define R11 $11
-#define R12 $12
-#define R13 $13
-#define R14 $14
-#define R15 $15
-#define R16 $16
-#define R17 $17
-#define R18 $18
-#define R19 $19
-#define R20 $20
-#define R21 $21
-#define R22 $22
-#define R23 $23
-#define R24 $24
-#define R25 $25
-#define R26 $26
-#define R27 $27
-#define R28 $28
-#define R29 $29
-#define R30 $30
-#define R31 $31
-
-#if defined(_LANGUAGE_C)||defined(LANGUAGE_C)||defined(_LANGUAGE_C_PLUS_PLUS)||defined(__cplusplus)||defined(c_plusplus)
-#else
-#define zero	$0	/* wired zero */
-#define AT	$1	/* assembler temp */
-#define v0	$2	/* return value */
-#define v1	$3
-#define a0	$4	/* argument registers */
-#define a1	$5
-#define a2	$6
-#define a3	$7
-#define t0	$8	/* caller saved */
-#define t1	$9
-#define t2	$10
-#define t3	$11
-#define t4	$12
-#define t5	$13
-#define t6	$14
-#define t7	$15
-#define s0	$16	/* callee saved */
-#define s1	$17
-#define s2	$18
-#define s3	$19
-#define s4	$20
-#define s5	$21
-#define s6	$22
-#define s7	$23
-#define t8	$24	/* code generator */
-#define t9	$25
-#define k0	$26	/* kernel temporary */
-#define k1	$27
-#define gp	$28	/* global pointer */
-#define sp	$29	/* stack pointer */
-#define fp	$30	/* frame pointer */
-#define ra	$31	/* return address */
-#endif
-
-
-/* register offset */
-#define	R_R0		0
-#define	R_R1		1
-#define	R_R2		2
-#define	R_R3		3
-#define	R_R4		4
-#define	R_R5		5
-#define	R_R6		6
-#define	R_R7		7
-#define	R_R8		8
-#define	R_R9		9
-#define	R_R10		10
-#define	R_R11		11
-#define	R_R12		12
-#define	R_R13		13
-#define	R_R14		14
-#define	R_R15		15
-#define	R_R16		16
-#define	R_R17		17
-#define	R_R18		18
-#define	R_R19		19
-#define	R_R20		20
-#define	R_R21		21
-#define	R_R22		22
-#define	R_R23		23
-#define	R_R24		24
-#define	R_R25		25
-#define	R_R26		26
-#define	R_R27		27
-#define	R_R28		28
-#define	R_R29		29
-#define	R_R30		30
-#define	R_R31		31
-#define	R_EPC		32
-#define	R_MDHI		33
-#define	R_MDLO		34
-#define	R_SR		35
-#define	R_CAUSE		36
-#define	NREGS		40
-
-/*
- * compiler defined bindings
- */
-#define	R_ZERO		R_R0
-#define	R_AT		R_R1
-#define	R_V0		R_R2
-#define	R_V1		R_R3
-#define	R_A0		R_R4
-#define	R_A1		R_R5
-#define	R_A2		R_R6
-#define	R_A3		R_R7
-#define	R_T0		R_R8
-#define	R_T1		R_R9
-#define	R_T2		R_R10
-#define	R_T3		R_R11
-#define	R_T4		R_R12
-#define	R_T5		R_R13
-#define	R_T6		R_R14
-#define	R_T7		R_R15
-#define	R_S0		R_R16
-#define	R_S1		R_R17
-#define	R_S2		R_R18
-#define	R_S3		R_R19
-#define	R_S4		R_R20
-#define	R_S5		R_R21
-#define	R_S6		R_R22
-#define	R_S7		R_R23
-#define	R_T8		R_R24
-#define	R_T9		R_R25
-#define	R_K0		R_R26
-#define	R_K1		R_R27
-#define	R_GP		R_R28
-#define	R_SP		R_R29
-#define	R_FP		R_R30
-#define	R_RA		R_R31
-
-#endif

src_rebuild/PsyX/include/LIMITS.H

@@ -1 +0,0 @@
-#include <limits.h>

src_rebuild/PsyX/include/PsyX/common/pgxp_defs.h

@@ -2,7 +2,7 @@
 #define PGXP_DEFS_H
 
 #ifdef USE_PGXP
-#include "COMMON/half_float.h"
+#include "PsyX/common/half_float.h"
 
 typedef half VERTTYPE;
 #define PGXP_LOOKUP_VALUE(x, y) (x.sh | (y.sh << 16))

src_rebuild/PsyX/include/abs.h

@@ -7,6 +7,4 @@
 
 extern int fst_abs(int x);
 
-// TODO: MINMAX.H
-
 #endif

src_rebuild/PsyX/include/asm.h

@@ -0,0 +1,12 @@
+#ifndef ASM_H
+#define ASM_H
+
+/*
+
+This header must be empty
+
+*/
+
+#define	NREGS		40
+
+#endif

src_rebuild/PsyX/include/libcd.h

@@ -1,8 +1,7 @@
 #ifndef LIBCD_H
 #define LIBCD_H
 
-#include "TYPES.H"
-
+#include "types.h"
 
 #define DECODE_BCD(x) (((x) >> 4) * 10 + ((x) & 0xF))
 #define ENCODE_BCD(x) ((((x) / 10) << 4) | ((x) % 10))

src_rebuild/PsyX/include/libetc.h

@@ -1,7 +1,7 @@
 #ifndef LIBETC_H
 #define LIBETC_H
 
-#include "TYPES.H"
+#include "types.h"
 
 extern int PadIdentifier;
 

src_rebuild/PsyX/include/libgpu.h

@@ -1,8 +1,8 @@
 #ifndef LIBGPU_H
 #define LIBGPU_H
 
-#include "TYPES.H"
-#include "COMMON/PGXP_DEFS.H"
+#include "types.h"
+#include "PsyX/common/pgxp_defs.h"
 
 extern	int (*GPU_printf)(const char *fmt, ...);
 

src_rebuild/PsyX/include/libgte.h

@@ -1,8 +1,8 @@
 #ifndef LIBGTE_H
 #define LIBGTE_H
 
-#include "TYPES.H"
-#include "COMMON/PGXP_DEFS.H"
+#include "types.h"
+#include "PsyX/common/pgxp_defs.h"
 
 typedef struct {
 	short	m[3][3];	/* 3x3 rotation matrix */

src_rebuild/PsyX/include/types.h

@@ -1,11 +1,10 @@
 #ifndef	TYPES_H
 #define	TYPES_H
 
-#include "PSYX_CONFIG.H"
+#include "PsyX/PsyX_config.h"
 
 #include <stdint.h>
 #include <stddef.h>
-#include <limits.h>
 
 #if !defined(__APPLE__)
 /* major part of a device */

src_rebuild/PsyX/src/ABS.C

@@ -1,4 +1,4 @@
-#include "ABS.H"
+#include "abs.h"
 
 // this is definitely NOT in psx runtime libs
 int fst_abs(int x)

src_rebuild/PsyX/src/GPU/PsyX_GPU.C

@@ -1,8 +1,8 @@
 #include "PsyX_GPU.H"
 
-#include "PSYX_PUBLIC.H"
-#include "PSYX_GLOBALS.H"
-#include "PSYX_RENDER.H"
+#include "PsyX/PsyX_public.h"
+#include "PsyX/PsyX_globals.h"
+#include "PsyX/PsyX_render.h"
 
 #include "../PSYX_SETUP.H"
 

src_rebuild/PsyX/src/GPU/PsyX_GPU.H

@@ -1,10 +1,10 @@
 #ifndef PSYX_GPU_H
 #define PSYX_GPU_H
 
-#include "LIBGTE.H"
-#include "LIBGPU.H"
-#include "TYPES.H"
-#include "COMMON/PGXP_DEFS.H"
+#include "libgte.h"
+#include "libgpu.h"
+#include "types.h"
+#include "PsyX/common/pgxp_defs.h"
 
 extern OT_TAG prim_terminator; // P_TAG with zero length
 

src_rebuild/PsyX/src/GTE/half_float.cpp

@@ -1,5 +1,5 @@
-#include "COMMON/half_float.h"
-#include <TYPES.H>
+#include "PsyX/common/half_float.h"
+#include "types.h"
 
 // see https://gist.github.com/rygorous/2156668
 

src_rebuild/PsyX/src/PLATFORM_SETUP.H

@@ -27,6 +27,8 @@
 #define FUNCNAME __func__
 #endif
 
+#include "PsyX/PsyX_globals.H"
+
 #if defined(__ANDROID__)
 #   include <android/log.h>
 #   define LOG_TAG_EMU "[PsyX] "
@@ -35,7 +37,6 @@
 #   define eprintwarnf(fmt, ...)   __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG_EMU " [WARN]", fmt, ##__VA_ARGS__)
 #   define eprinterr(fmt, ...)     eprintf("[%s] - " fmt, FUNCNAME, ##__VA_ARGS__);
 #else
-#   include "PSYX_GLOBALS.H"
 #   define eprintf(fmt, ...)       PsyX_Log("[Psy-X] " fmt, ##__VA_ARGS__)
 #   define eprintinfo(fmt, ...)    PsyX_Log_Info("[Psy-X] " fmt, ##__VA_ARGS__)
 #   define eprintwarn(fmt, ...)    PsyX_Log_Warning("[Psy-X] " fmt, ##__VA_ARGS__)

src_rebuild/PsyX/src/PSX/INLINE_C.C

@@ -1,7 +1,6 @@
-#include "INLINE_C.H"
-
-#include "LIBGTE.H"
-#include "GTEREG.H"
+#include "inline_c.h"
+#include "libgte.h"
+#include "gtereg.h"
 #include "../GTE/PsyX_GTE.H"
 
 unsigned int MFC2(int reg)

src_rebuild/PsyX/src/PSX/LIBETC.C

@@ -1,7 +1,7 @@
 #include "LIBETC.H"
 
 #include "../PSYX_SETUP.H"
-#include "PSYX_PUBLIC.H"
+#include "PsyX/PsyX_public.h"
 
 #include <SDL_timer.h>
 

src_rebuild/PsyX/src/PSX/LIBGPU.C

@@ -2,8 +2,8 @@
 #include "LIBGPU.H"
 
 #include "../GPU/PsyX_GPU.H"
-#include "PSYX_RENDER.H"
-#include "PSYX_PUBLIC.H"
+#include "PsyX/PsyX_render.h"
+#include "PsyX/PsyX_public.h"
 
 #include <stdint.h>
 
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "PSYX_GLOBALS.H"
+#include "PsyX/PsyX_globals.h"
 #include "../PSYX_SETUP.H"
 #include "../GPU/FONT.H"