Rename entry.c to boot.c, controller.c to joy.c, core.c to lv.c, texture.c to texdecompress.c, room.c to bg.c, lib_0e9d0.c to snd.c and associated functions

src/include/game/bg.h

@@ -1,5 +1,5 @@
-#ifndef IN_GAME_ROOM_H
-#define IN_GAME_ROOM_H
+#ifndef IN_GAME_BG_H
+#define IN_GAME_BG_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"

src/include/game/core.h

@@ -1,41 +0,0 @@
-#ifndef _IN_GAME_CORE_H
-#define _IN_GAME_CORE_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-u32 getVar80084040(void);
-void func0f167af8(void);
-void coreStopAllMiscSfx(void);
-s32 coreGetMiscSfxIndex(u32 arg0);
-void coreSetMiscSfxState(u32 type, bool play);
-void coreUpdateMiscSfx(void);
-void coreLoadStage(s32 stagenum);
-Gfx *coreRenderFade(Gfx *gdl);
-void coreCancelFade(void);
-bool coreCheckCmpFollowThreat(struct threat *threat, s32 index);
-void coreFindThreatsForProp(struct prop *prop, bool inchild, struct coord *playerpos, s32 *activeslots, f32 *param_5);
-void func0f168f24(struct prop *prop, bool inchild, struct coord *playerpos, s32 *activeslots, f32 *distances);
-void coreFindThreats(void);
-Gfx *coreRender(Gfx *gdl);
-void coreUpdateSoloHandicaps(void);
-s32 sub54321(s32 value);
-void coreUpdateCutsceneTime(void);
-s32 coreGetSlowMotionType(void);
-void coreTick(void);
-void coreRecordDistanceMoved(void);
-void coreCheckPauseStateChanged(void);
-void coreSetPaused(bool paused);
-void coreConfigureFade(u32 color, s16 num_frames);
-bool coreIsFadeActive(void);
-void coreUnloadStage(void);
-bool coreIsPaused(void);
-s32 coreGetDifficulty(void);
-void coreSetDifficulty(s32 difficulty);
-void coreSetMpTimeLimit60(u32 limit);
-void coreSetMpScoreLimit(u32 limit);
-void coreSetMpTeamScoreLimit(u32 limit);
-f32 coreGetStageTimeInSeconds(void);
-s32 coreGetStageTime60(void);
-
-#endif

src/include/game/lv.h

@@ -0,0 +1,41 @@
+#ifndef _IN_GAME_LV_H
+#define _IN_GAME_LV_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+u32 getVar80084040(void);
+void lv0f167af8(void);
+void lvStopAllMiscSfx(void);
+s32 lvGetMiscSfxIndex(u32 arg0);
+void lvSetMiscSfxState(u32 type, bool play);
+void lvUpdateMiscSfx(void);
+void lvInit(s32 stagenum);
+Gfx *lvRenderFade(Gfx *gdl);
+void lvCancelFade(void);
+bool lvCheckCmpFollowThreat(struct threat *threat, s32 index);
+void lvFindThreatsForProp(struct prop *prop, bool inchild, struct coord *playerpos, s32 *activeslots, f32 *param_5);
+void func0f168f24(struct prop *prop, bool inchild, struct coord *playerpos, s32 *activeslots, f32 *distances);
+void lvFindThreats(void);
+Gfx *lvRender(Gfx *gdl);
+void lvUpdateSoloHandicaps(void);
+s32 sub54321(s32 value);
+void lvUpdateCutsceneTime(void);
+s32 lvGetSlowMotionType(void);
+void lvTick(void);
+void lvRecordDistanceMoved(void);
+void lvCheckPauseStateChanged(void);
+void lvSetPaused(bool paused);
+void lvConfigureFade(u32 color, s16 num_frames);
+bool lvIsFadeActive(void);
+void lvReset(void);
+bool lvIsPaused(void);
+s32 lvGetDifficulty(void);
+void lvSetDifficulty(s32 difficulty);
+void lvSetMpTimeLimit60(u32 limit);
+void lvSetMpScoreLimit(u32 limit);
+void lvSetMpTeamScoreLimit(u32 limit);
+f32 lvGetStageTimeInSeconds(void);
+s32 lvGetStageTime60(void);
+
+#endif

src/include/game/texdecompress.h

@@ -1,5 +1,5 @@
-#ifndef IN_GAME_TEXTURE_H
-#define IN_GAME_TEXTURE_H
+#ifndef IN_GAME_TEXDECOMPRESS_H
+#define IN_GAME_TEXDECOMPRESS_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"

src/include/lib/boot.h

@@ -1,5 +1,5 @@
-#ifndef _IN_BOOT_ENTRY_H
-#define _IN_BOOT_ENTRY_H
+#ifndef _IN_LIB_BOOT_H
+#define _IN_LIB_BOOT_H
 #include <ultra64.h>
 
 void boot(void);

src/include/lib/controller.h

@@ -1,57 +0,0 @@
-#ifndef _IN_LIB_CONTROLLER_H
-#define _IN_LIB_CONTROLLER_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void func00013900(void);
-void func00013938(void);
-void func00013974(u32 value);
-u32 func00013980(void);
-void func0001398c(s32 value);
-void func000139c8(void);
-s32 contShiftPfsStates(void);
-void contRecordPfsState(u8 pfsstate);
-void contCheckPfs(s32 arg0);
-void contSetPfsTemporarilyPlugged(s8 index);
-void contSystemInit(void);
-void contDisableTemporarily(void);
-void func00013dfc(void);
-void func00013e84(void);
-u32 contGetConnectedControllers(void);
-void contConsumeSamples(struct contdata *contdata);
-void func00014238(void);
-void contDebugJoy(void);
-s32 contStartReadData(OSMesgQueue *mq);
-void contReadData(void);
-void contPoll(void);
-void func00014810(bool value);
-s32 contGetNumSamples(void);
-s32 contGetStickXOnSample(s32 samplenum, s8 contpadnum);
-s32 contGetStickYOnSample(s32 samplenum, s8 contpadnum);
-s32 contGetStickYOnSampleIndex(s32 samplenum, s8 contpadnum);
-u16 contGetButtonsOnSample(s32 samplenum, s8 contpadnum, u16 mask);
-u16 contGetButtonsPressedOnSample(s32 samplenum, s8 contpadnum, u16 mask);
-s32 contCountButtonsOnSpecificSamples(u32 *arg0, s8 contpadnum, u16 mask);
-s8 contGetStickX(s8 contpadnum);
-s8 contGetStickY(s8 contpadnum);
-u16 contGetButtons(s8 contpadnum, u16 mask);
-u16 contGetButtonsPressedThisFrame(s8 contpadnum, u16 mask);
-s32 func000150c4(void);
-
-#if VERSION >= VERSION_NTSC_1_0
-void func000150e8(void);
-void func00015144(void);
-#else
-void func000150e8(s32 line, char *file);
-void func00015144(s32 line, char *file);
-#endif
-
-void func0001519c(void);
-void func000152d0(s8 playernum, s32 *arg1, s32 *arg2);
-void func000153c4(s8 arg0, s32 arg1);
-s32 func000155b4(s8 index);
-s32 func000155f4(s8 index);
-void func0001561c(void);
-
-#endif

src/include/lib/joy.h

@@ -0,0 +1,57 @@
+#ifndef _IN_LIB_JOY_H
+#define _IN_LIB_JOY_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+void joy00013900(void);
+void joy00013938(void);
+void joy00013974(u32 value);
+u32 joy00013980(void);
+void joy0001398c(s32 value);
+void joy000139c8(void);
+s32 joyShiftPfsStates(void);
+void joyRecordPfsState(u8 pfsstate);
+void joyCheckPfs(s32 arg0);
+void joySetPfsTemporarilyPlugged(s8 index);
+void joySystemInit(void);
+void joyDisableTemporarily(void);
+void joy00013dfc(void);
+void joy00013e84(void);
+u32 joyGetConnectedControllers(void);
+void joyConsumeSamples(struct joydata *joydata);
+void joy00014238(void);
+void joyDebugJoy(void);
+s32 joyStartReadData(OSMesgQueue *mq);
+void joyReadData(void);
+void joyPoll(void);
+void joy00014810(bool value);
+s32 joyGetNumSamples(void);
+s32 joyGetStickXOnSample(s32 samplenum, s8 contpadnum);
+s32 joyGetStickYOnSample(s32 samplenum, s8 contpadnum);
+s32 joyGetStickYOnSampleIndex(s32 samplenum, s8 contpadnum);
+u16 joyGetButtonsOnSample(s32 samplenum, s8 contpadnum, u16 mask);
+u16 joyGetButtonsPressedOnSample(s32 samplenum, s8 contpadnum, u16 mask);
+s32 joyCountButtonsOnSpecificSamples(u32 *arg0, s8 contpadnum, u16 mask);
+s8 joyGetStickX(s8 contpadnum);
+s8 joyGetStickY(s8 contpadnum);
+u16 joyGetButtons(s8 contpadnum, u16 mask);
+u16 joyGetButtonsPressedThisFrame(s8 contpadnum, u16 mask);
+s32 joy000150c4(void);
+
+#if VERSION >= VERSION_NTSC_1_0
+void joy000150e8(void);
+void joy00015144(void);
+#else
+void joy000150e8(s32 line, char *file);
+void joy00015144(s32 line, char *file);
+#endif
+
+void joy0001519c(void);
+void joy000152d0(s8 playernum, s32 *arg1, s32 *arg2);
+void joy000153c4(s8 arg0, s32 arg1);
+s32 joy000155b4(s8 index);
+s32 joy000155f4(s8 index);
+void joy0001561c(void);
+
+#endif

src/include/lib/lib_0e9d0.h

@@ -1,46 +0,0 @@
-#ifndef _IN_LIB_LIB_0E9D0_H
-#define _IN_LIB_LIB_0E9D0_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-bool audioIsFiltered(s32 audioid);
-u32 func0000e9d0(void);
-u32 func0000e9dc(void);
-void audioSetSfxVolume(u16 volume);
-u32 func0000ea80(void);
-void func0000eadc(void);
-u32 func0000eb2c(void);
-u32 func0000ed14(void);
-u32 func0000ed68(void);
-u32 func0000ee88(void);
-u32 func0000efa8(void);
-u32 func0000f0d4(void);
-u32 func0000f228(void);
-void audioSetSoundMode(s32 mode);
-u32 func0000f49c(void);
-u32 func0000f67c(void);
-u32 func0000f804(void);
-bool func0000fba0(s32 soundnum);
-void func0000fbc4(s16 arg0);
-u32 func0000fc48(void);
-u32 func0000fd74(void);
-void func0000fd9c(struct var80094ed8 *arg0, u16 volume);
-void func0000fe18(void);
-void func0000fe20(void);
-void func0000fe50(void);
-void func0000fe88(void);
-u32 func00010360(void);
-u32 func0001036c(void);
-void audioAdjust(struct audiohandle **handle, u32 arg1, u32 arg2, s32 speakerweight, s16 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8);
-struct audiohandle *func00010718(struct audiohandle **handle, s32 arg1, s32 arg2, s32 arg3, s32 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8);
-struct audiohandle *audioStart(s32 arg0, s16 sound, struct audiohandle **handle, s32 arg3, s32 arg4, f32 arg5, s32 arg6, s32 arg7);
-u32 func00010ae4(void);
-void envPlayNosedive(s32 room_id);
-void envStopNosedive(void);
-u32 func00010e10(void);
-void envPlayUfoHum(s32 value);
-void envStopUfoHum(void);
-u32 func0001111c(void);
-
-#endif

src/include/lib/snd.h

@@ -0,0 +1,46 @@
+#ifndef _IN_LIB_SND_H
+#define _IN_LIB_SND_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+bool sndIsFiltered(s32 audioid);
+u32 snd0000e9d0(void);
+u32 snd0000e9dc(void);
+void sndSetSfxVolume(u16 volume);
+u32 snd0000ea80(void);
+void snd0000eadc(void);
+u32 snd0000eb2c(void);
+u32 snd0000ed14(void);
+u32 snd0000ed68(void);
+u32 snd0000ee88(void);
+u32 snd0000efa8(void);
+u32 snd0000f0d4(void);
+u32 snd0000f228(void);
+void sndSetSoundMode(s32 mode);
+u32 snd0000f49c(void);
+u32 snd0000f67c(void);
+u32 snd0000f804(void);
+bool snd0000fba0(s32 soundnum);
+void snd0000fbc4(s16 arg0);
+u32 snd0000fc48(void);
+u32 snd0000fd74(void);
+void snd0000fd9c(struct var80094ed8 *arg0, u16 volume);
+void snd0000fe18(void);
+void snd0000fe20(void);
+void snd0000fe50(void);
+void snd0000fe88(void);
+u32 snd00010360(void);
+u32 snd0001036c(void);
+void sndAdjust(struct audiohandle **handle, u32 arg1, u32 arg2, s32 speakerweight, s16 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8);
+struct audiohandle *snd00010718(struct audiohandle **handle, s32 arg1, s32 arg2, s32 arg3, s32 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8);
+struct audiohandle *sndStart(s32 arg0, s16 sound, struct audiohandle **handle, s32 arg3, s32 arg4, f32 arg5, s32 arg6, s32 arg7);
+u32 snd00010ae4(void);
+void sndPlayNosedive(s32 room_id);
+void sndStopNosedive(void);
+u32 snd00010e10(void);
+void sndPlayUfoHum(s32 value);
+void sndStopUfoHum(void);
+u32 snd0001111c(void);
+
+#endif

src/include/types.h

@@ -6762,7 +6762,7 @@ struct contsample {
 	OSContPad pads[4];
 };
 
-struct contdata {
+struct joydata {
 	struct contsample samples[20];
 	s32 curlast;
 	s32 curstart;