Rename many lifecycle functions to use consistent names and rename many files

src/include/game/activemenu.h

@@ -1,9 +1,11 @@
-#ifndef IN_GAME_ACTIVEMENU_ACTIVEMENU_H
-#define IN_GAME_ACTIVEMENU_ACTIVEMENU_H
+#ifndef IN_GAME_ACTIVEMENU_H
+#define IN_GAME_ACTIVEMENU_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"
 
+void amTick(void);
+
 void amOpenPickTarget(void);
 s32 menudialog000fcd48(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
 s32 amPickTargetMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
@@ -12,7 +14,7 @@ void amSetAiBuddyStealth(void);
 s32 amGetFirstBuddyIndex(void);
 void amApply(s32 slot);
 void amGetSlotDetails(s32 slot, u32 *flags, char *label);
-void amInit(void);
+void amReset(void);
 s16 amCalculateSlotWidth(void);
 void amChangeScreen(s32 step);
 void amAssignWeaponSlots(void);

src/include/game/activemenu/tick.h

@@ -1,9 +0,0 @@
-#ifndef _IN_GAME_ACTIVEMENU_TICK_H
-#define _IN_GAME_ACTIVEMENU_TICK_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void amTick(void);
-
-#endif

src/include/game/bg.h

@@ -24,9 +24,9 @@ f32 func0f15b274(s32 portal);
 u8 func0f15b4c0(s32 portal);
 u32 not(u32 arg);
 u32 xorBabebabe(u32 value);
-void bgInit(s32 stagenum);
+void bgReset(s32 stagenum);
 void bgBuildTables(s32 stagenum);
-void bgReset(void);
+void bgStop(void);
 void func0f15c880(f32 arg0);
 f32 func0f15c888(void);
 f32 currentPlayerGetScaleBg2Gfx(void);

src/include/game/bondgun.h

@@ -4,6 +4,10 @@
 #include "data.h"
 #include "types.h"
 
+void bgunReset(void);
+
+void bgunStop(void);
+
 void bgunRumble(s32 handnum, s32 weaponnum);
 s32 bgunGetUnequippedReloadIndex(s32 weaponnum);
 void bgunTickUnequippedReload(void);

src/include/game/bondguninit.h

@@ -4,6 +4,6 @@
 #include "data.h"
 #include "types.h"
 
-void bgunInit(void);
+void bgunReset(void);
 
 #endif

src/include/game/bondhead.h

@@ -4,6 +4,8 @@
 #include "data.h"
 #include "types.h"
 
+void bheadReset(void);
+
 void bheadFlipAnimation(void);
 void bheadUpdateIdleRoll(void);
 void bheadUpdatePos(struct coord *vel);

src/include/game/botmgr.h

@@ -0,0 +1,10 @@
+#ifndef _IN_GAME_BOTMGR_H
+#define _IN_GAME_BOTMGR_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+void botmgrRemoveAll(void);
+void botmgrAllocateBot(s32 chrnum, s32 aibotnum);
+
+#endif

src/include/game/camdraw.h

@@ -15,8 +15,8 @@ char *phGetColourName(s32 colournum);
 struct var8007f8dc *func0f14a20c(void);
 void func0f14a240(void);
 bool func0f14a2fc(s32 index, u32 line, char *file);
-void phAllocate(void);
-void func0f14a3c4(void);
+void pheadInit(void);
+void pheadReset(void);
 void func0f14a52c(void);
 void func0f14a560(void);
 void func0f14a594(s32 arg0);

src/include/game/cheats.h

@@ -16,8 +16,8 @@ u32 cheatIsUnlocked(s32 cheat_id);
 bool cheatIsActive(s32 cheat_id);
 void cheatActivate(s32 cheat_id);
 void cheatDeactivate(s32 cheat_id);
-void cheatsDisableAll(void);
-void cheatsActivate(void);
+void cheatsInit(void);
+void cheatsReset(void);
 char *cheatGetNameIfUnlocked(struct menuitem *item);
 char *cheatGetMarquee(struct menuitem *item);
 s32 cheatGetByTimedStageIndex(s32 stage_index, s32 difficulty);

src/include/game/chr.h

@@ -19,7 +19,7 @@ bool chr0f01f378(struct model *model, struct coord *arg1, struct coord *arg2, f3
 s32 chrsGetNumFree(void);
 s16 chrsGetNextUnusedChrnum(void);
 struct prop *chr0f020b14(struct prop *prop, struct model *model, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist);
-void chr0f020d44(struct prop *prop, bool removechr);
+void chrRemove(struct prop *prop, bool removechr);
 void chrUpdateAimProperties(struct chrdata *chr);
 void chrFlinchBody(struct chrdata *chr);
 void chrFlinchHead(struct chrdata *chr, f32 arg1);

src/include/game/chrmgr.h

@@ -0,0 +1,12 @@
+#ifndef IN_GAME_CHRMGR_H
+#define IN_GAME_CHRMGR_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+void chrmgrReset(void);
+void chrmgrConfigure(s32 numchrs);
+
+void chrmgrStop(void);
+
+#endif

src/include/game/credits.h

@@ -26,7 +26,7 @@ Gfx *func0f13a3ec(Gfx *gdl);
 void credits0f13ae04(Mtxf *mtx);
 void creditsTick(void);
 Gfx *creditsRender(Gfx *gdl);
-void creditsInit(void);
+void creditsReset(void);
 void creditsRequestAltTitle(void);
 
 struct credits000c {

src/include/game/dlights.h

@@ -25,7 +25,7 @@ void roomInitLights(s32 roomnum);
 s32 func0f001734(struct coord *arg0, struct coord *arg1, s32 roomnum);
 void roomSetLightsFaulty(s32 roomnum, s32 chance);
 void roomSetLightBroken(s32 roomnum, s32 lightnum);
-void func0f001bdc(void);
+void lightsReset(void);
 void func0f001c0c(void);
 u32 func0f00215c(void);
 u32 func0f0023b8(void);
@@ -40,7 +40,7 @@ void func0f003444(void);
 void func0f0035c0(void);
 void func0f00372c(void);
 void func0f0037ac(void);
-void func0f004314(void);
+void lightsTick(void);
 void roomAdjustLighting(s32 roomnum, s32 start, s32 limit);
 void func0f004558(s32 roomnum, s32 increment, s32 limit);
 void func0f004604(s32 roomnum);

src/include/game/env.h

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

src/include/game/explosions.h

@@ -1,9 +1,13 @@
-#ifndef IN_GAME_EXPLOSIONS_EXPLOSIONS_H
-#define IN_GAME_EXPLOSIONS_EXPLOSIONS_H
+#ifndef IN_GAME_EXPLOSIONS_H
+#define IN_GAME_EXPLOSIONS_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"
 
+void explosionsReset(void);
+
+void explosionsStop(void);
+
 bool explosionCreateSimple(struct prop *prop, struct coord *pos, s16 *rooms, s16 type, s32 playernum);
 bool explosionCreateComplex(struct prop *prop, struct coord *pos, s16 *rooms, s16 type, s32 playernum);
 f32 explosionGetHorizontalRangeAtFrame(struct explosion *exp, s32 frame);

src/include/game/explosions/init.h

@@ -1,9 +0,0 @@
-#ifndef _IN_GAME_EXPLOSIONS_INIT_H
-#define _IN_GAME_EXPLOSIONS_INIT_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void explosionsInit(void);
-
-#endif

src/include/game/explosions/reset.h

@@ -1,9 +0,0 @@
-#ifndef IN_GAME_EXPLOSIONS_RESET_H
-#define IN_GAME_EXPLOSIONS_RESET_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void explosionsReset(void);
-
-#endif

src/include/game/file.h

@@ -6,7 +6,7 @@
 
 u32 fileGetRomAddress(s32 filenum);
 s32 fileGetRomSize(s32 filenum);
-void filesResetAndPrint(void);
+void filesInit(void);
 void fileLoadPartToAddr(u16 filenum, void *memaddr, s32 offset, u32 len);
 u32 fileGetInflatedSize(u32 filenum);
 void *fileLoadToNew(s32 filenum, u32 method);
@@ -14,7 +14,7 @@ void *fileLoadToAddr(s32 filenum, s32 method, u8 *ptr, u32 size);
 u32 fileGetLoadedSize(s32 filenum);
 u32 fileGetAllocationSize(s32 filenum);
 void fileSetSize(s32 filenum, void *ptr, u32 size, bool reallocate);
-void filesReset(u8 arg0);
+void filesStop(u8 arg0);
 void func0f167330(void);
 
 #endif

src/include/game/filemgr.h

@@ -49,7 +49,7 @@ char *pakMenuTextPagesUsed(struct menuitem *item);
 char *pakMenuTextStatusMessage(struct menuitem *item);
 char *pakMenuTextEditingPakName(struct menuitem *item);
 bool filemgrConsiderPushingFileSelectDialog(void);
-void pakPushPakMenuDialog(void);
+void bootmenuReset(void);
 s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
 s32 pakGameNoteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
 s32 filemgrFileToCopyListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);

src/include/game/game_000100.h

@@ -4,6 +4,6 @@
 #include "data.h"
 #include "types.h"
 
-void func0f000100(void);
+void racesInit(void);
 
 #endif

src/include/game/game_000130.h

@@ -4,7 +4,7 @@
 #include "data.h"
 #include "types.h"
 
-void func0f000130(void);
+void bodiesInit(void);
 u16 func0f0002a0(s16 animnum, s32 frame, s32 endframe);
 s32 func0f000358(s16 animnum, s32 startframe, s32 endframe);
 s32 func0f00040c(struct attackanimconfig *configs);

src/include/game/game_00b190.h

@@ -4,6 +4,6 @@
 #include "data.h"
 #include "types.h"
 
-void loadTextureList(void);
+void texInit(void);
 
 #endif

src/include/game/game_00b210.h

@@ -4,6 +4,6 @@
 #include "data.h"
 #include "types.h"
 
-void mpInitPresetFeatures(void);
+void challengesInit(void);
 
 #endif

src/include/game/game_00b320.h

@@ -4,7 +4,7 @@
 #include "data.h"
 #include "types.h"
 
-void stageLoadCommonLang(s32 stagenum);
+void langReset(s32 stagenum);
 void func0f00b420(void);
 
 #endif

src/include/game/game_00b480.h

@@ -1,11 +0,0 @@
-#ifndef _IN_GAME_GAME_00B480_H
-#define _IN_GAME_GAME_00B480_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void func0f00b480(void);
-void func0f00b510(void);
-void func0f00b62c(s32 numchrs);
-
-#endif

src/include/game/game_00b820.h

@@ -4,7 +4,7 @@
 #include "data.h"
 #include "types.h"
 
-void stageChooseActiveHeads(s32 stagenum);
+void headsReset(s32 stagenum);
 void resetSomeStageThings(void);
 void stageAllocateBgChrs(void);
 

src/include/game/game_00c240.h

@@ -1,10 +0,0 @@
-#ifndef IN_GAME_GAME_00C240_H
-#define IN_GAME_GAME_00C240_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void gvarsInitProps(void);
-void gvarsInitRoomProps(void);
-
-#endif

src/include/game/game_00c490.h

@@ -4,7 +4,7 @@
 #include "data.h"
 #include "types.h"
 
-void setupInit(void);
+void propsReset(void);
 void addLiftDoor(struct linkliftdoorobj *link);
 void addPadlockedDoor(struct padlockeddoorobj *link);
 void addSafeItem(struct safeitemobj *link);
@@ -28,7 +28,7 @@ s32 func0f00e2b0(s32 padnum);
 void setupDoor(struct doorobj *door, s32 cmdindex);
 void setupHov(struct defaultobj *obj, struct hov *hov);
 void setupLoadBriefing(s32 stagenum, u8 *buffer, s32 bufferlen, struct briefing *briefing);
-void setupLoadFiles(s32 stagenum);
-void setupParseObjects(s32 stagenum);
+void setupReset(s32 stagenum);
+void propsCreate(s32 stagenum);
 
 #endif

src/include/game/game_0108d0.h

@@ -1,9 +0,0 @@
-#ifndef _IN_GAME_GAME_0108D0_H
-#define _IN_GAME_GAME_0108D0_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void func0f0108d0(void);
-
-#endif

src/include/game/game_0125a0.h

@@ -1,10 +0,0 @@
-#ifndef IN_GAME_GAME_0125A0_H
-#define IN_GAME_GAME_0125A0_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void func0f0125a0(s16 animnum, s32 loopframe, s32 endframe, s32 *arg3);
-void currentPlayerInitAnimation(void);
-
-#endif

src/include/game/game_013b80.h

@@ -4,7 +4,7 @@
 #include "data.h"
 #include "types.h"
 
-void func0f013b80(void);
-void func0f013ba0(void);
+void texReset(void);
+void vtxstoreReset(void);
 
 #endif

src/include/game/game_013cf0.h

@@ -1,10 +0,0 @@
-#ifndef _IN_GAME_GAME_013CF0_H
-#define _IN_GAME_GAME_013CF0_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void stageLoadTiles(void);
-void stageParseTiles(void);
-
-#endif

src/include/game/game_0147d0.h

@@ -6,7 +6,5 @@
 
 void func0f0147d0(void);
 void lasersightsReset(void);
-void botmgrRemoveAll(void);
-void botmgrAllocateBot(s32 chrnum, s32 aibotnum);
 
 #endif

src/include/game/game_014f10.h

@@ -1,10 +0,0 @@
-#ifndef IN_GAME_GAME_014F10_H
-#define IN_GAME_GAME_014F10_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void chrsReset(void);
-void alarmReset(void);
-
-#endif

src/include/game/game_015010.h

@@ -4,6 +4,6 @@
 #include "data.h"
 #include "types.h"
 
-void objsReset(void);
+void objsStop(void);
 
 #endif

src/include/game/game_0150a0.h

@@ -1,9 +0,0 @@
-#ifndef IN_GAME_GAME_0150A0_H
-#define IN_GAME_GAME_0150A0_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-u32 func0f0150a0(void);
-
-#endif

src/include/game/game_015470.h

@@ -1,12 +0,0 @@
-#ifndef IN_GAME_GAME_015470_H
-#define IN_GAME_GAME_015470_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void func0f015470(void);
-void getitleInit(void *addr, u32 arg1);
-Gfx *getitleRender(Gfx *gdl);
-
-
-#endif

src/include/game/game_01bea0.h

@@ -1,11 +0,0 @@
-#ifndef _IN_GAME_GAME_01BEA0_H
-#define _IN_GAME_GAME_01BEA0_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void func0f01bea0(void);
-void menuCountDialogs(void);
-void menuTick(void);
-
-#endif

src/include/game/game_10c9c0.h

@@ -4,7 +4,7 @@
 #include "data.h"
 #include "types.h"
 
-void func0f10cb2c(void);
+void fmbmenuReset(void);
 s32 menuhandler4MbDropOut(s32 operation, struct menuitem *item, union handlerdata *data);
 s32 menuhandler0010ca1c(s32 operation, struct menuitem *item, union handlerdata *data);
 s32 menuhandler4MbAdvancedSetup(s32 operation, struct menuitem *item, union handlerdata *data);

src/include/game/game_1531a0.h

@@ -10,7 +10,7 @@ void func0f1531c4(s32 arg0);
 void func0f1531d0(s32 arg0);
 void func0f1531dc(bool arg0);
 void fontLoad(u8 *romstart, u8 *romend, struct font **fontptr, struct fontchar **charsptr, bool monospace);
-void fontsLoadForCurrentStage(void);
+void fontsReset(void);
 Gfx *func0f153628(Gfx *gdl);
 Gfx *func0f153780(Gfx *gdl);
 Gfx *gfxSetPrimColour(Gfx *gdl, u32 colour);

src/include/game/getitle.h

@@ -0,0 +1,10 @@
+#ifndef IN_GAME_GETITLE_H
+#define IN_GAME_GETITLE_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+void getitleReset(void *addr, u32 arg1);
+Gfx *getitleRender(Gfx *gdl);
+
+#endif

src/include/game/gfxmemory.h

@@ -6,7 +6,7 @@
 
 extern u8 *g_GfxBuffers[3];
 
-void gfxInitMemory(void);
+void gfxReset(void);
 Gfx *gfxGetMasterDisplayList(void);
 struct gfxvtx *gfxAllocateVertices(s32 count);
 void *gfxAllocateMatrix(void);

src/include/game/hudmsg.h

@@ -11,7 +11,7 @@ Gfx *hudmsgRenderZoomRange(Gfx *gdl, u32 alpha);
 Gfx *hudmsgRenderBox(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, f32 bgopacity, u32 bordercolour, f32 textopacity);
 s32 hudmsg0f0ddb1c(s32 *arg0, s32 arg1);
 void hudmsgsHideByChannel(s32 value);
-void hudmsgsInit(void);
+void hudmsgsReset(void);
 void hudmsgRemoveAll(void);
 s32 hudmsgGetNext(s32 refid);
 void hudmsgCreate(char *text, s32 type);
@@ -29,6 +29,6 @@ void hudmsgsSetOn(u32 reason);
 void hudmsgsSetOff(u32 reason);
 void hudmsgsRemoveForDeadPlayer(s32 playernum);
 Gfx *hudmsgsRender(Gfx *gdl);
-void hudmsgsReset(void);
+void hudmsgsStop(void);
 
 #endif

src/include/game/inv.h

@@ -1,9 +1,16 @@
-#ifndef IN_GAME_INVENTORY_INVENTORY_H
-#define IN_GAME_INVENTORY_INVENTORY_H
+#ifndef IN_GAME_INV_H
+#define IN_GAME_INV_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"
 
+extern struct noisesettings invnoisesettings_00010fd0;
+extern struct inventory_class invclass_default;
+extern struct weapon *g_Weapons[WEAPON_SUICIDEPILL + 1];
+
+void invReset(void);
+void invInit(s32 numdoubles);
+
 void invClear(void);
 void invSortItem(struct invitem *item);
 void invInsertItem(struct invitem *item);

src/include/game/inventory/init.h

@@ -1,10 +0,0 @@
-#ifndef IN_GAME_INVENTORY_INIT_H
-#define IN_GAME_INVENTORY_INIT_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void invInitGunsHeld(void);
-void invInit(s32 numdoubles);
-
-#endif

src/include/game/inventory/items.h

@@ -1,9 +0,0 @@
-#ifndef IN_GAME_INVENTORY_ITEMS_H
-#define IN_GAME_INVENTORY_ITEMS_H
-#include <ultra64.h>
-
-extern struct noisesettings invnoisesettings_00010fd0;
-extern struct inventory_class invclass_default;
-extern struct weapon *g_Weapons[WEAPON_SUICIDEPILL + 1];
-
-#endif

src/include/game/lasersights.h

@@ -0,0 +1,10 @@
+#ifndef _IN_GAME_LASERSIGHTS_H
+#define _IN_GAME_LASERSIGHTS_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+void func0f0147d0(void);
+void lasersightsReset(void);
+
+#endif

src/include/game/lv.h

@@ -5,14 +5,14 @@
 #include "types.h"
 
 u32 getVar80084040(void);
-void lv0f167af8(void);
-void lvStopAllMiscSfx(void);
+void lvInit(void);
+void lvResetMiscSfx(void);
 s32 lvGetMiscSfxIndex(u32 arg0);
 void lvSetMiscSfxState(u32 type, bool play);
 void lvUpdateMiscSfx(void);
-void lvInit(s32 stagenum);
+void lvReset(s32 stagenum);
 Gfx *lvRenderFade(Gfx *gdl);
-void lvCancelFade(void);
+void lvFadeReset(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);
@@ -28,7 +28,7 @@ void lvCheckPauseStateChanged(void);
 void lvSetPaused(bool paused);
 void lvConfigureFade(u32 color, s16 num_frames);
 bool lvIsFadeActive(void);
-void lvReset(void);
+void lvStop(void);
 bool lvIsPaused(void);
 s32 lvGetDifficulty(void);
 void lvSetDifficulty(s32 difficulty);

src/include/game/menu.h

@@ -8,6 +8,10 @@ extern const struct menucolourpalette g_MenuColourPalettes[];
 extern const struct menucolourpalette g_MenuColourPalettes2[];
 extern const struct menucolourpalette g_MenuColourPalettes3[];
 
+void menuTick(void);
+
+void menuStop(void);
+
 void menuPlaySound(s32 menusound);
 bool menuIsSoloMissionOrMp(void);
 bool currentPlayerIsMenuOpenInSoloOrMp(void);
@@ -82,7 +86,7 @@ void func0f0f85e0(struct menudialogdef *dialogdef, s32 root);
 Gfx *menuRenderDialog(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool lightweight);
 Gfx *menuRenderDialogs(Gfx *gdl);
 void func0f0f8bb4(struct menu840 *arg0, u32 arg1, u32 arg2);
-void menuInit(void);
+void menuReset(void);
 void menuSwipe(s32 direction);
 void dialogTick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags);
 void dialogInitItems(struct menudialog *dialog);

src/include/game/mplayer/mplayer.h

@@ -7,13 +7,13 @@
 f32 mpHandicapToDamageScale(u8 value);
 void func0f187838(struct mpchrconfig *mpchr);
 void mpStartMatch(void);
-void mpInit(void);
+void mpReset(void);
 void mpCalculateTeamIsOnlyAi(void);
 void func0f187fbc(s32 playernum);
 void func0f187fec(void);
 void mpPlayerSetDefaults(s32 playernum, bool autonames);
 void func0f1881d4(s32 index);
-void mpSetDefaultSetup(void);
+void mpInit(void);
 void mpSetDefaultNamesIfEmpty(void);
 s32 mpCalculateTeamScoreLimit(void);
 void mpApplyLimits(void);

src/include/game/music.h

@@ -11,7 +11,7 @@ s32 func0f16d124(s32 tracktype);
 void musicQueueStartEvent(u32 tracktype, u32 tracknum, f32 arg2, u16 volume);
 void musicQueueStopEvent(s32 tracktype);
 void musicQueueFadeEvent(s32 tracktype, f32 arg1, bool fadetopause);
-void musicInit(void);
+void musicReset(void);
 void musicQueueStopAllEvent(void);
 void func0f16d430(void);
 void musicQueueType5Event(void);
@@ -22,7 +22,7 @@ void musicStartNrg(f32 arg0);
 void musicStartTrackAsMenu(s32 tracknum);
 void musicSetStageAndStartMusic(s32 stagenum);
 void musicSetStage(s32 stagenum);
-void musicReset(void);
+void musicStop(void);
 void musicActivateNrg(void);
 void musicDeactivateNrg(void);
 void musicStartMenu(void);

src/include/game/objectives.h

@@ -4,7 +4,7 @@
 #include "data.h"
 #include "types.h"
 
-void objectivesAutocomplete(void);
+void objectivesStop(void);
 
 void objectivesReset(void);
 void tagInsert(struct tag *tag);
@@ -17,7 +17,7 @@ void objectiveAddHolographCriteria(struct criteria_holograph *criteria);
 u32 xorBaffbeff(u32 value);
 u32 xorBabeffff(u32 value);
 u32 xorBoobless(u32 value);
-void tagsAllocatePtrs(void);
+void tagsReset(void);
 s32 objGetTagNum(struct defaultobj *obj);
 s32 objectiveGetCount(void);
 u32 objectiveGetDifficultyBits(s32 index);

src/include/game/pak.h

@@ -1,5 +1,5 @@
-#ifndef IN_GAME_PAK_PAK_H
-#define IN_GAME_PAK_PAK_H
+#ifndef IN_GAME_PAK_H
+#define IN_GAME_PAK_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"
@@ -66,7 +66,7 @@ s32 _pakCreateCameraFile(s8 device, s32 *outfileid);
 bool pakResizeNote(s8 device, s32 numpages);
 void pak0f1185e0(s8 device, s32 arg1, s32 arg2);
 u32 pak0f118674(s8 device, u32 filetype, s32 *outfileid);
-void pakInitAll(void);
+void paksInit(void);
 void pakCalculateChecksum(u8 *arg0, u8 *arg1, u16 *arg2);
 s32 _pakReadBodyAtGuid(s8 device, s32 fileid, u8 *body, s32 arg3);
 s32 _pakGetFileIdsByType(s8 device, u32 filetype, u32 *fileids);
@@ -83,7 +83,7 @@ void pakCorrupt(void);
 bool pakCreateInitialFiles(s8 device);
 s32 pakFindMaxFileId(s8 device);
 void pakMergeBlanks(s8 device);
-void pak0f11a2e4(void);
+void paksReset(void);
 void pak0f11a32c(s8 device, u8 arg1, u32 line, char *file);
 void pakInit(s8 arg0);
 PakErr1 pakReadWriteBlock(s8 device, OSPfs *pfs, s32 file_no, u8 flag, u32 address, u32 len, u8 *buffer);
@@ -101,7 +101,7 @@ bool pakReplaceFileAtOffsetWithBlank(s8 device, u32 offset);
 s32 pakWriteFileAtOffset(s8 device, u32 offset, u32 filetype, u8 *newdata, s32 bodylen, s32 *outfileid, u8 *olddata, u32 fileid, u32 generation);
 bool pakRepair(s8 device);
 bool pakHandleResult(s32 err1, s8 device, bool arg2, u32 line);
-void pak0f11c54c(void);
+void paksTick(void);
 void pak0f11c6d0(void);
 void pakExecuteDebugOperations(void);
 void pak0f11ca30(void);
@@ -128,7 +128,7 @@ void pakRumble(s32 device, f32 numsecs, s32 onduration, s32 offduration);
 void pakRumble(s8 device, f32 numsecs, s32 onduration, s32 offduration);
 #endif
 
-void pakStopRumbleForAllPaks(bool disablepolling);
+void paksStop(bool disablepolling);
 void pakDisableRumbleForPlayer(s8 playernum);
 void pakEnableRumbleForPlayer(s8 playernum);
 void pakDisableRumbleForAllPlayers(void);

src/include/game/player.h

@@ -14,7 +14,7 @@ void playerResetBond(struct playerbond *pb, struct coord *pos);
 void playersTickAllChrBodies(void);
 void playerChooseBodyAndHead(s32 *bodynum, s32 *headnum, s32 *arg2);
 void playerTickChrBody(void);
-void player0f0b9538(void);
+void playerRemoveChrBody(void);
 void playerTickMpSwirl(void);
 void playerExecutePreparedWarp(void);
 void playerStartCutscene(s16 anim_id);

src/include/game/playerreset.h

@@ -1,5 +1,5 @@
-#ifndef IN_GAME_PLAYERINIT_H
-#define IN_GAME_PLAYERINIT_H
+#ifndef IN_GAME_PLAYERRESET_H
+#define IN_GAME_PLAYERRESET_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"
@@ -9,6 +9,6 @@ void func0f011124(bool value);
 void func0f011130(s32 arg0, s32 numchrs);
 bool weaponLoadProjectileModels(s32 weaponnum);
 void playerInitEyespy(void);
-void playerInit(void);
+void playerReset(void);
 
 #endif

src/include/game/prop.h

@@ -36,7 +36,7 @@ void propUnpause(struct prop *prop);
 void propsTick(u32 islastplayer);
 void propsTickPadEffects(void);
 void propSetPerimEnabled(struct prop *prop, bool enable);
-void func0f0641f4(void);
+void propsTestForPickup(void);
 f32 func0f06438c(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3, f32 *arg4, s32 arg5, bool cangangsta, s32 arg7);
 void farsightChooseTarget(void);
 void autoaimTick(void);

src/include/game/propsnd.h

@@ -1,9 +1,13 @@
-#ifndef IN_GAME_GAME_092610_H
-#define IN_GAME_GAME_092610_H
+#ifndef IN_GAME_PROPSND_H
+#define IN_GAME_PROPSND_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"
 
+void propsndReset(void);
+
+void propsndStop(void);
+
 bool func0f092610(struct prop *prop, s32 arg1);
 void func0f0926bc(struct prop *prop, s32 arg1, u16 arg2);
 s32 func0f0927d4(f32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4);

src/include/game/shards.h

@@ -5,9 +5,9 @@
 #include "types.h"
 
 void shardsCreate(struct coord *pos, f32 *rotx, f32 *roty, f32 *rotz, f32 xmin, f32 xmax, f32 ymin, f32 ymax, s32 type, struct prop *prop);
-void shardsInit(void);
-Gfx *shardsRender(Gfx *gdl);
 void shardsReset(void);
+Gfx *shardsRender(Gfx *gdl);
+void shardsStop(void);
 void shardsTick(void);
 
 #endif

src/include/game/sky.h

@@ -6,7 +6,7 @@
 
 void func0f135c70(void);
 u32 func0f135f08(void);
-void skyInit(void);
+void skyReset(void);
 Gfx *func0f13687c(Gfx *gdl);
 
 #endif

src/include/game/smoke.h

@@ -1,9 +1,13 @@
-#ifndef _IN_GAME_SMOKE_SMOKE_H
-#define _IN_GAME_SMOKE_SMOKE_H
+#ifndef _IN_GAME_SMOKE_H
+#define _IN_GAME_SMOKE_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"
 
+void smokeReset(void);
+
+void smokeStop(void);
+
 Gfx *smokeRenderPart(struct smoke *smoke, struct smokepart *part, Gfx *gdl, struct coord *coord, f32 size);
 struct smoke *smokeCreate(struct coord *pos, s16 *rooms, s16 type);
 bool func0f12e454(struct coord *pos, s16 *rooms, s16 type, u32 arg4);

src/include/game/smoke/init.h

@@ -1,9 +0,0 @@
-#ifndef _IN_GAME_SMOKE_INIT_H
-#define _IN_GAME_SMOKE_INIT_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void smokeInit(void);
-
-#endif

src/include/game/smoke/reset.h

@@ -1,9 +0,0 @@
-#ifndef _IN_GAME_SMOKE_RESET_H
-#define _IN_GAME_SMOKE_RESET_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void smokeReset(void);
-
-#endif

src/include/game/sparks.h

@@ -1,9 +1,13 @@
-#ifndef _IN_GAME_SPARKS_SPARKS_H
-#define _IN_GAME_SPARKS_SPARKS_H
+#ifndef _IN_GAME_SPARKS_H
+#define _IN_GAME_SPARKS_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"
 
+void sparksReset(void);
+
+void sparksTick(void);
+
 u32 func0f12f6c0(void);
 void sparkgroupEnsureFreeSparkSlot(struct sparkgroup *group);
 void sparksCreate(s32 room, struct prop *prop, struct coord *pos, struct coord *arg3, struct coord *dir, s32 type);

src/include/game/sparks/init.h

@@ -1,9 +0,0 @@
-#ifndef IN_GAME_SPARKS_INIT_H
-#define IN_GAME_SPARKS_INIT_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void sparksInit(void);
-
-#endif

src/include/game/sparks/tick.h

@@ -1,9 +0,0 @@
-#ifndef IN_GAME_SPARKS_TICK_H
-#define IN_GAME_SPARKS_TICK_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void sparksTick(void);
-
-#endif

src/include/game/splat.h

@@ -8,9 +8,9 @@ void splatTick(struct prop *prop);
 void splatsCreateForChrHit(struct prop *prop, struct splat *arg1, struct coord *arg2, struct coord *arg3, s32 arg4, s32 arg5, struct chrdata *arg6);
 s32 splatsCreate(s32 qty, f32 arg1, struct prop *prop, struct splat *arg3, struct coord *arg4, struct coord *arg5, s32 arg6, s32 arg7, s32 arg8, struct chrdata *arg9, s32 arg10);
 bool func0f149274(f32 arg0, struct prop *prop, struct splat *arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, struct chrdata *arg7, s32 arg8);
-void func0f149864(void);
+void splatsTick(void);
 u32 func0f14986c(void);
 void chrInitSplats(struct chrdata *chr);
-void func0f14a3bc(void);
+void pheadInit2(void);
 
 #endif

src/include/game/texdecompress.h

@@ -37,6 +37,6 @@ void texLoadFromConfigs(struct textureconfig *configs, s32 numconfigs, struct te
 void texLoadFromTextureNum(u32 arg0, struct texturething *arg1);
 void texSetBitstring(u8 *arg0);
 s32 texReadBits(s32 arg0);
-void texturesLoadConfigs(void);
+void texReset(void);
 
 #endif

src/include/game/tiles.h

@@ -0,0 +1,9 @@
+#ifndef _IN_GAME_TILES_H
+#define _IN_GAME_TILES_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+void tilesReset(void);
+
+#endif

src/include/game/title.h

@@ -10,6 +10,8 @@ extern u32 var800624dc;
 
 void titleInit(void);
 
+void titleReset(void);
+
 char *mpPlayerGetWeaponOfChoiceName(u32 playernum, u32 slot);
 void func0f01616c(void *light, u8 arg1, u8 arg2, u8 arg3, f32 arg4, struct coord *arg5);
 void titleInitLegal(void);

src/include/game/training.h

@@ -28,7 +28,7 @@ u32 frGetWeaponBySlot(s32 slot);
 s32 frGetNumWeaponsAvailable(void);
 void frInitLighting(void);
 void frRestoreLighting(void);
-void frUnloadData(void);
+void frReset(void);
 void *frLoadRomData(u32 len);
 void frSetDifficulty(s32 difficulty);
 u32 frGetDifficulty(void);

src/include/game/utils.h

@@ -8,14 +8,14 @@ void func0f176d70(s32 arg0);
 u32 align4(u32 arg0);
 u32 align16(u32 arg0);
 u32 align32(u32 arg0);
-void func0f176ddc(void);
+void utilsInit(void);
 void func0f1770ac(struct coord *a, struct coord *b, struct coord *out);
 bool func0f177164(struct coord *arg0, struct coord *arg1, u32 line, char *file);
 bool func0f1773c8(struct coord *a, struct coord *b);
 f32 coordsGetDistance(struct coord *a, struct coord *b);
 f32 func0f1776cc(struct coord *a, struct coord *b, struct coord *c);
 bool func0f17776c(struct coord *a, struct coord *b, f32 mult, struct coord *out);
-void func0f1777f8(void);
+void utilsReset(void);
 u32 func0f177a54(void);
 u32 func0f177bb4(void);
 s32 func0f177c8c(s32 arg0, s32 *arg1, s32 *arg2);

src/include/game/vtxstore.h

@@ -4,6 +4,8 @@
 #include "data.h"
 #include "types.h"
 
+void vtxstoreReset(void);
+
 void vtxstoreFixRefs(union modelrwdata *find, union modelrwdata *replacement);
 void vtxstoreTick(void);
 void *vtxstoreAllocate(s32 count, s32 index, s32 arg2, s32 arg3);

src/include/game/weather.h

@@ -1,9 +1,13 @@
-#ifndef _IN_GAME_WEATHER_WEATHER_H
-#define _IN_GAME_WEATHER_WEATHER_H
+#ifndef _IN_GAME_WEATHER_H
+#define _IN_GAME_WEATHER_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"
 
+void weatherReset(void);
+
+void weatherTick(void);
+
 Gfx *weatherRender(Gfx *gdl);
 void weatherSetBoundaries(struct weatherparticledata *data, s32 index, f32 min, f32 max);
 struct weatherparticledata *weatherAllocateParticles(void);
@@ -17,6 +21,6 @@ void weatherConfigureSnow(u32 intensity);
 bool weatherIsRoomWeatherProof(s32 room);
 Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2);
 Gfx *weatherRenderSnow(Gfx *gdl, struct weatherdata *weather, s32 arg2);
-void weatherReset(void);
+void weatherStop(void);
 
 #endif

src/include/game/weather/init.h

@@ -1,9 +0,0 @@
-#ifndef _IN_GAME_WEATHER_INIT_H
-#define _IN_GAME_WEATHER_INIT_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void weatherInit(void);
-
-#endif

src/include/game/weather/tick.h

@@ -1,9 +0,0 @@
-#ifndef _IN_GAME_WEATHER_TICK_H
-#define _IN_GAME_WEATHER_TICK_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void weatherTick(void);
-
-#endif

src/include/lib/anim.h

@@ -6,7 +6,7 @@
 
 void animsInit(void);
 void animsInitTables(void);
-void anim0002373c(void);
+void animsReset(void);
 s32 animGetNumFrames(s16 anim_id);
 bool animHasFrames(s16 animnum);
 s32 animGetNumAnimations(void);

src/include/lib/audiomgr.h

@@ -4,7 +4,7 @@
 #include "data.h"
 #include "types.h"
 
-void amgrAllocateStack(void);
+void amgrInit(void);
 
 #if VERSION >= VERSION_PAL_BETA
 void amgrCreate(ALSynConfig *config, u32 *settings);

src/include/lib/debughud.h

@@ -6,8 +6,8 @@
 
 void dhudPutCharAt(s32 x, s32 y, char c);
 void dhudInit(void);
-void dhudTryReset(void);
 void dhudReset(void);
+void dhudClear(void);
 void dhudSetPos(s32 x, s32 y);
 void dhudPrintChar(u8 c);
 void dhudPrintString(char *text);

src/include/lib/fault.h

@@ -4,7 +4,7 @@
 #include "data.h"
 #include "types.h"
 
-void faultCreateThread(void);
+void faultInit(void);
 void faultAssert(char *msg, char *file, s32 line);
 
 #endif

src/include/lib/joy.h

@@ -14,9 +14,9 @@ s32 joyShiftPfsStates(void);
 void joyRecordPfsState(u8 pfsstate);
 void joyCheckPfs(s32 arg0);
 void joySetPfsTemporarilyPlugged(s8 index);
-void joySystemInit(void);
+void joyInit(void);
 void joyDisableTemporarily(void);
-void joy00013dfc(void);
+void joyReset(void);
 void joy00013e84(void);
 u32 joyGetConnectedControllers(void);
 void joyConsumeSamples(struct joydata *joydata);
@@ -47,7 +47,7 @@ void joyDisableCyclicPolling(s32 line, char *file);
 void joyEnableCyclicPolling(s32 line, char *file);
 #endif
 
-void joyReset(void);
+void joyDestroy(void);
 void joyGetContpadNumsForPlayer(s8 playernum, s32 *pad1, s32 *pad2);
 void joyStopRumble(s8 device, bool disablepolling);
 s32 joy000155b4(s8 device);

src/include/lib/mema.h

@@ -6,7 +6,7 @@
 
 void memaDefrag(void);
 void memaInit(void);
-void memaHeapInit(void *ptr, u32 size);
+void memaReset(void *ptr, u32 size);
 void memaPrint(void);
 void *memaAlloc(u32 size);
 s32 memaGrow(s32 addr, u32 amount);

src/include/lib/memp.h

@@ -4,8 +4,8 @@
 #include "data.h"
 #include "types.h"
 
-void memp000121e0(void);
-void mempInit(u8 *heapstart, u32 heaplen);
+void mempInit(void);
+void mempSetHeap(u8 *heapstart, u32 heaplen);
 u32 mempGetStageFree(void);
 void *mempGetNextStageAllocation(void);
 void *mempAlloc(u32 len, u8 pool);

src/include/lib/vars.h

@@ -4,6 +4,8 @@
 #include "data.h"
 #include "types.h"
 
-void gvarsInit(void);
+void varsInit(void);
+
+void varsReset(void);
 
 #endif

src/include/lib/vi.h

@@ -6,14 +6,14 @@
 
 void profileInit(void);
 void profileTick(void);
-void profile00009a90(void);
+void profileReset(void);
 void profile00009a98(void);
 void profileSetMarker(u32 arg0);
 Gfx *profileRender(Gfx *gdl);
 void viConfigureForLogos(void);
 void viConfigureForBanner(u8 *fb);
 void viConfigureForLegal(void);
-void viAllocateFbs(s32 stagenum);
+void viReset(s32 stagenum);
 void viBlack(bool black);
 void vi00009ed4(void);
 void viUpdateMode(void);

src/include/lib/videbug.h

@@ -4,7 +4,7 @@
 #include "data.h"
 #include "types.h"
 
+void videbugCreate(void);
 void videbugInit(void);
-void videbugCreateMesgQueue(void);
 
 #endif