Rename dozens of game files and functions

src/include/constants.h

@@ -2342,6 +2342,8 @@
 #define OBJECTIVE_COMPLETE   1
 #define OBJECTIVE_FAILED     2
 
+#define OBJECTIVEFLAG_AUTOCOMPLETE 0x01
+
 // obj->flags
 #define OBJFLAG_00000001            0x00000001 // Editor: "Fall to Ground"
 #define OBJFLAG_00000002            0x00000002 // Editor: "In Air Rotated 90 Deg Upside-Down"

src/include/game/dlights.h

@@ -34,7 +34,7 @@ void func0f002a98(void);
 void roomSetLightsOn(s32 roomnum, s32 enable);
 void roomSetLighting(s32 roomnum, s32 operation, u8 arg2, u8 arg3, u8 arg4);
 u32 func0f002ef8(void);
-void func0f0033b0(void);
+void lightingTick(void);
 void func0f003444(void);
 void func0f0035c0(void);
 void func0f00372c(void);

src/include/game/explosions/free.h

@@ -1,8 +0,0 @@
-#ifndef IN_GAME_EXPLOSIONS_FREE_H
-#define IN_GAME_EXPLOSIONS_FREE_H
-#include <ultra64.h>
-#include "types.h"
-
-void explosionsFree(void);
-
-#endif

src/include/game/explosions/reset.h

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

src/include/game/game_0109d0.h

@@ -1,14 +0,0 @@
-#ifndef IN_GAME_GAME_0109D0_H
-#define IN_GAME_GAME_0109D0_H
-#include <ultra64.h>
-#include "types.h"
-
-void setupResetObjectives(void);
-void tagInsert(struct tag *tag);
-void briefingInsert(struct briefingobj *obj);
-void objectiveInsert(struct objective *objective);
-void objectiveAddRoomEnteredCriteria(struct criteria_roomentered *criteria);
-void objectiveAddMultiroomEnteredCriteria(struct criteria_multiroomentered *criteria);
-void objectiveAddHolographCriteria(struct criteria_holograph *criteria);
-
-#endif

src/include/game/game_014f10.h

@@ -3,7 +3,7 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func0f014f10(void);
-void func0f014fe0(void);
+void chrsReset(void);
+void alarmReset(void);
 
 #endif

src/include/game/game_0151f0.h

@@ -1,8 +0,0 @@
-#ifndef _IN_GAME_GAME_0151F0_H
-#define _IN_GAME_GAME_0151F0_H
-#include <ultra64.h>
-#include "types.h"
-
-void func0f0151f0(void);
-
-#endif

src/include/game/game_0b69d0.h

@@ -3,9 +3,9 @@
 #include <ultra64.h>
 #include "types.h"
 
-f32 func0f0b69d0(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop, s16 *spawnpads, s16 numspawnpads);
-f32 func0f0b72a8(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop);
-void func0f0b72dc(void);
+f32 playerChooseSpawnLocation(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop, s16 *spawnpads, s16 numspawnpads);
+f32 playerChooseGeneralSpawnLocation(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop);
+void currentPlayerStartNewLife(void);
 void currentPlayerResetToDefault(void);
 bool currentPlayerAssumeChrForAnti(struct chrdata *chr, s32 param_2);
 void currentPlayerSpawn(void);

src/include/game/game_0d5a90.h

@@ -1,10 +0,0 @@
-#ifndef _IN_GAME_GAME_0D5A90_H
-#define _IN_GAME_GAME_0D5A90_H
-#include <ultra64.h>
-#include "types.h"
-
-u32 func0f0d5a90(void);
-u32 func0f0d5c60(void);
-Gfx *func0f0d5d8c(Gfx *gdl, u32 arg1, u32 arg2, f32 arg3);
-
-#endif

src/include/game/healthbar.h

@@ -0,0 +1,10 @@
+#ifndef _IN_GAME_HEALTHBAR_H
+#define _IN_GAME_HEALTHBAR_H
+#include <ultra64.h>
+#include "types.h"
+
+u32 func0f0d5a90(void);
+u32 func0f0d5c60(void);
+Gfx *healthbarRender(Gfx *gdl, u32 arg1, u32 arg2, f32 arg3);
+
+#endif

src/include/game/hudmsg.h

@@ -1,5 +1,5 @@
-#ifndef IN_GAME_GAME_0DCDB0_H
-#define IN_GAME_GAME_0DCDB0_H
+#ifndef IN_GAME_HUDMSG_H
+#define IN_GAME_HUDMSG_H
 #include <ultra64.h>
 #include "types.h"
 
@@ -10,7 +10,7 @@ Gfx *hudRenderZoomRange(Gfx *gdl, s32 arg1);
 Gfx *hudRenderMessageBox(Gfx *gdl, s32 x, s32 y, s32 width, s32 height, f32 bgopacity, u32 bordercolour, f32 textopacity);
 s32 func0f0ddb1c(u32 *arg0, u32 arg1);
 void func0f0ddd44(s32 value);
-void hudmsgSystemInit(void);
+void hudmsgsInit(void);
 void hudmsgRemoveAll(void);
 s32 hudmsgGetNext(s32 refid);
 void hudmsgCreateViaPreset(char *text, s32 type);
@@ -23,11 +23,11 @@ void hudmsgCreate(char *text, s32 type, s32 conf00, s32 conf01, s32 conf02,
 		struct hudmessagething *conf04, struct hudmessagething *conf08,
 		u32 textcolour, u32 shadowcolour,
 		u32 alignh, s32 conf16, u32 alignv, s32 conf18, s32 arg14, u32 flags);
-void func0f0df364(void);
+void hudmsgsTick(void);
 void currentPlayerUnsetFlag(u32 flag);
 void currentPlayerSetFlag(u32 flag);
 void hudmsgRemoveForDeadPlayer(s32 playernum);
-Gfx *hudRenderMessages(Gfx *gdl);
+Gfx *hudmsgsRender(Gfx *gdl);
 void hudmsgsReset(void);
 
 #endif

src/include/game/mplayer/mplayer.h

@@ -37,7 +37,7 @@ void func0f1895e8(void);
 s32 mpGetWeaponSet(void);
 bool mpIsPaused(void);
 void mpSetPaused(u8 mode);
-Gfx *func0f18973c(Gfx *gdl);
+Gfx *mpRenderModalText(Gfx *gdl);
 u32 func0f189cc0(void);
 u32 func0f189dc8(void);
 u32 func0f189ed0(void);

src/include/game/mplayer/options.h

@@ -9,11 +9,11 @@ void scenarioCallback44(s32 *arg0);
 void scenarioInit(void);
 s32 scenarioCallback08(void);
 void scenarioReset(void);
-void scenarioCallback10(void);
+void scenarioTick(void);
 void scenarioCallback14(struct chrdata *chr);
 Gfx *scenarioRadar(Gfx *gdl);
 bool scenarioRadar2(Gfx **gdl, struct prop *prop);
-f32 scenarioCallback2c(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop);
+f32 scenarioChooseSpawnLocation(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop);
 s32 scenarioGetMaxTeams(void);
 void scenarioCallback38(s16 arg0, s32 *arg1, s32 *arg2, s32 *arg3);
 

src/include/game/mplayer/scenarios.h

@@ -6,7 +6,7 @@
 void scenarioHtbInit(void);
 s32 scenarioHtbCallback08(void);
 void scenarioHtbReset(void);
-void scenarioHtbCallback10(void);
+void scenarioHtbTick(void);
 void scenarioHtbCallback14(struct chrdata *chr);
 void scenarioHtbKill(struct mpchr *mpchr, s32 mpchrnum, s32 *score, s32 *arg3);
 Gfx *scenarioHtbRadar(Gfx *gdl);
@@ -14,12 +14,12 @@ bool scenarioHtbRadar2(Gfx **gdl, struct prop *prop);
 bool scenarioHtbHighlight(struct prop *prop, u32 *colour);
 void scenarioCtcInit(void);
 s32 scenarioCtcCallback08(void);
-void scenarioCtcCallback10(void);
+void scenarioCtcTick(void);
 void scenarioCtcCallback14();
 void scenarioCtcKill(struct mpchr *mpchr, s32 mpchrnum, s32 *score, s32 *arg3);
 Gfx *scenarioCtcRadar(Gfx *gdl);
 bool scenarioCtcRadar2(Gfx **gdl, struct prop *prop);
-bool scenarioCtcCallback2c(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop, f32 *arg4);
+bool scenarioCtcChooseSpawnLocation(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop, f32 *arg4);
 s32 scenarioCtcGetMaxTeams(void);
 bool scenarioCtcIsRoomHighlighted(s16 room);
 s32 menuhandlerMpHillTime(u32 operation, struct menuitem *item, union handlerdata *data);
@@ -32,7 +32,7 @@ Gfx *scenarioKohRadar(Gfx *gdl);
 bool scenarioKohIsRoomHighlighted(s16 arg0);
 void scenarioHtmInit(void);
 s32 scenarioHtmCallback08(void);
-void scenarioHtmCallback10(void);
+void scenarioHtmTick(void);
 void scenarioHtmKill(struct mpchr *mpchr, s32 mpchrnum, s32 *score, s32 *arg3);
 bool scenarioHtmRadar2(Gfx **gdl, struct prop *prop);
 bool scenarioHtmHighlight(struct prop *prop, u32 *colour);
@@ -46,11 +46,11 @@ void scenarioCallback44(s32 *arg0);
 void scenarioInit(void);
 s32 scenarioCallback08(void);
 void scenarioReset(void);
-void scenarioCallback10(void);
+void scenarioTick(void);
 void scenarioCallback14(struct chrdata *chr);
 Gfx *scenarioRadar(Gfx *gdl);
 bool scenarioRadar2(Gfx **gdl, struct prop *prop);
-f32 scenarioCallback2c(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop);
+f32 scenarioChooseSpawnLocation(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop);
 s32 scenarioGetMaxTeams(void);
 void scenarioCallback38(s16 arg0, s32 *arg1, s32 *arg2, s32 *arg3);
 

src/include/game/mplayer/setup.h

@@ -81,7 +81,7 @@ void scenarioCtcReset(void);
 bool scenarioCtcHighlight(struct prop *prop, u32 *colour);
 void mpCtcAddPad(s32 *cmd);
 void scenarioCtcCallback38(s16 arg0, s32 *arg1, s32 *arg2, s32 *arg3);
-void scenarioKohCallback10(void);
+void scenarioKohTick(void);
 u32 scenarioKohCallback18(void);
 void mpKohAddHill(s32 *cmd);
 void scenarioKohCallback38(s16 arg0, s32 *arg1, s32 *arg2, s32 *arg3);
@@ -96,7 +96,7 @@ void scenarioPacChooseVictims(void);
 bool scenarioPacHighlight(struct prop *prop, u32 *colour);
 void func0f1845bc(void);
 u32 func0f1847b8(void);
-void scenarioPacCallback10(void);
+void scenarioPacTick(void);
 u32 scenarioPacCallback18(void);
 bool scenarioPacRadar2(Gfx **gdl, struct prop *prop);
 s32 mpOptionsMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data);

src/include/game/music.h

@@ -21,7 +21,7 @@ void musicStartX(f32 arg0);
 void musicStartMenu2(s32 tracknum);
 void musicSetStageAndStartMusic(s32 stagenum);
 void musicSetStage(s32 stagenum);
-void func0f16d9fc(void);
+void musicReset(void);
 void func0f16da2c(void);
 void func0f16daa4(void);
 void musicStartForMenu(void);

src/include/game/nbomb.h

@@ -0,0 +1,22 @@
+#ifndef IN_GAME_NBOMB_H
+#define IN_GAME_NBOMB_H
+#include <ultra64.h>
+#include "types.h"
+
+u32 func0f006c80(void);
+Gfx *func0f008558(Gfx *gdl, s32 arg1);
+void nbombResetAge(struct nbomb *nbomb);
+s32 nbombCalculateAlpha(struct nbomb *nbomb);
+Gfx *nbombCreateGdl(void);
+Gfx *nbombRender(Gfx *gdl, struct nbomb *nbomb, Gfx *subgdl);
+void func0f0099a4(void);
+void nbombInflictDamage(struct nbomb *nbomb);
+void nbombTick(struct nbomb *nbomb);
+void nbombsTick(void);
+Gfx *nbombsRender(Gfx *gdl);
+void nbombCreate(struct coord *pos, struct prop *prop);
+f32 gasGetDoorFrac(s32 tagnum);
+Gfx *func0f00a490(Gfx *gdl);
+Gfx *gasRender(Gfx *gdl);
+
+#endif

src/include/game/objectives.h

@@ -0,0 +1,35 @@
+#ifndef IN_GAME_OBJECTIVES_H
+#define IN_GAME_OBJECTIVES_H
+#include <ultra64.h>
+#include "types.h"
+
+void objectivesAutocomplete(void);
+
+void objectivesReset(void);
+void tagInsert(struct tag *tag);
+void briefingInsert(struct briefingobj *obj);
+void objectiveInsert(struct objective *objective);
+void objectiveAddRoomEnteredCriteria(struct criteria_roomentered *criteria);
+void objectiveAddMultiroomEnteredCriteria(struct criteria_multiroomentered *criteria);
+void objectiveAddHolographCriteria(struct criteria_holograph *criteria);
+
+u32 xorBaffbeff(u32 value);
+u32 xorBabeffff(u32 value);
+u32 xorBoobless(u32 value);
+void tagsAllocatePtrs(void);
+s32 objGetTagNum(struct defaultobj *obj);
+s32 objectiveGetCount(void);
+u32 objectiveGetDifficultyBits(s32 index);
+s32 objectiveCheck(s32 index);
+bool objectiveIsAllComplete(void);
+void objectivesDisableChecking(void);
+void objectivesShowHudmsg(char *buffer, s32 hudmsgtype);
+void objectivesCheckAll(void);
+void objectiveCheckRoomEntered(s32 currentroom);
+void objectiveCheckMultiroomEntered(s32 arg0, s16 *requiredrooms);
+void objectiveCheckHolograph(f32 sqdist);
+struct prop *chopperGetTargetProp(struct chopperobj *heli);
+struct defaultobj *objFindByTagId(s32 tag_id);
+struct tag *tagFindById(s32 tag_id);
+
+#endif

src/include/game/prop.h

@@ -1,5 +1,5 @@
-#ifndef IN_GAME_GAME_0601B0_H
-#define IN_GAME_GAME_0601B0_H
+#ifndef IN_GAME_PROP_H
+#define IN_GAME_PROP_H
 #include <ultra64.h>
 #include "types.h"
 

src/include/game/room.h

@@ -1,5 +1,5 @@
-#ifndef IN_GAME_GAME_157DB0_H
-#define IN_GAME_GAME_157DB0_H
+#ifndef IN_GAME_ROOM_H
+#define IN_GAME_ROOM_H
 #include <ultra64.h>
 #include "types.h"
 
@@ -32,7 +32,7 @@ f32 currentPlayerGetScaleBg2Gfx(void);
 void currentPlayerSetScaleBg2Gfx(f32 arg0);
 void func0f15c920(void);
 void func0f15ca00(void);
-Gfx *func0f15cae0(Gfx *gdl);
+Gfx *bgRender(Gfx *gdl);
 Gfx *func0f15cb74(Gfx *gdl);
 u32 func0f15cbb4(void);
 Gfx *currentPlayerSetScissor(Gfx *gdl, s32 viewleft, s32 viewtop, s32 viewright, s32 viewbottom);

src/include/game/sight.h

@@ -1,5 +1,5 @@
-#ifndef _IN_GAME_GAME_0D7070_H
-#define _IN_GAME_GAME_0D7070_H
+#ifndef _IN_GAME_SIGHT_H
+#define _IN_GAME_SIGHT_H
 #include <ultra64.h>
 #include "types.h"
 

src/include/game/smoke/free.h

@@ -1,8 +0,0 @@
-#ifndef _IN_GAME_SMOKE_FREE_H
-#define _IN_GAME_SMOKE_FREE_H
-#include <ultra64.h>
-#include "types.h"
-
-void smokeFree(void);
-
-#endif

src/include/game/smoke/reset.h

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

src/include/game/sparks/sparks.h

@@ -6,6 +6,6 @@
 u32 func0f12f6c0(void);
 void sparkgroupEnsureFreeSparkSlot(struct sparkgroup *group);
 void sparksCreate(s32 room, struct prop *prop, struct coord *pos, struct coord *arg3, s32 arg4, s32 arg5);
-Gfx *func0f130044(Gfx *gdl);
+Gfx *sparksRender(Gfx *gdl);
 
 #endif

src/include/game/texture.h

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

src/include/game/title.h

@@ -48,7 +48,7 @@ void titleExit(void);
 void titleInitFromAiCmd(u32 arg0);
 bool func0f01ad5c(void);
 void func0f01adb8(void);
-void func0f01ae30(void);
+void titleTickOld(void);
 Gfx *titleRender(Gfx *gdl);
 void titleExitLegal(void);
 s32 getNumPlayers(void);

src/include/game/weather/weather.h

@@ -16,6 +16,6 @@ void weatherConfigureSnow(u32 intensity);
 bool weatherIsRoomWeatherProof(u32 param_1);
 u32 weatherRenderRain(void);
 u32 weatherRenderSnow(void);
-void weatherFree(void);
+void weatherReset(void);
 
 #endif

src/include/types.h

@@ -1384,7 +1384,7 @@ struct objective { // objtype 0x17
 	/*0x04*/ s32 index;
 	/*0x08*/ u32 text;
 	/*0x0c*/ u16 unk0c;
-	/*0x0e*/ u8 unk0e;
+	/*0x0e*/ u8 flags;
 	/*0x0f*/ s8 difficulties;
 };
 
@@ -4489,14 +4489,14 @@ struct mpscenario {
 	void (*initfunc)(void);
 	s32 (*unk08)(void);
 	void (*resetfunc)(void);
-	void (*unk10)(void);
+	void (*tickfunc)(void);
 	void (*unk14)(struct chrdata *chr);
 	void *unk18;
 	void (*killfunc)(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
 	Gfx *(*radarfunc)(Gfx *gdl);
 	bool (*radar2func)(Gfx **gdl, struct prop *prop);
 	bool (*highlightfunc)(struct prop *prop, u32 *colour);
-	bool (*unk2c)(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop, f32 *arg4);
+	bool (*spawnfunc)(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop, f32 *arg4);
 	s32 (*maxteamsfunc)(void);
 	bool (*isroomhighlightedfunc)(s16 room);
 	void (*unk38)(s16 arg0, s32 *arg1, s32 *arg2, s32 *arg3);