Remove cheats

ld/gamefiles.ntsc-final.inc

@@ -131,7 +131,6 @@
 	build/ROMID/game/activemenu.o (section); \
 	build/ROMID/game/stubs/game_102230.o (section); \
 	build/ROMID/game/mainmenu.o (section); \
-	build/ROMID/game/cheats.o (section); \
 	build/ROMID/game/filemgr.o (section); \
 	build/ROMID/game/fmb.o (section); \
 	build/ROMID/game/gamefile.o (section); \

src/game/body.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/cheats.h"
 #include "game/chraction.h"
 #include "game/chr.h"
 #include "game/body.h"
@@ -165,10 +164,6 @@ struct model *body0f02ce8c(s32 bodynum, s32 headnum, struct modelfiledata *bodyf
 	struct modelnode *node = NULL;
 	u32 stack[2];
 
-	if (cheatIsActive(CHEAT_DKMODE)) {
-		scale *= 0.8f;
-	}
-
 	if (bodyfiledata == NULL) {
 		if (g_HeadsAndBodies[bodynum].filedata == NULL) {
 			g_HeadsAndBodies[bodynum].filedata = modeldefLoadToNew(g_HeadsAndBodies[bodynum].filenum);
@@ -213,20 +208,6 @@ struct model *body0f02ce8c(s32 bodynum, s32 headnum, struct modelfiledata *bodyf
 						scale *= 2.0f * frac - 0.05f + 1.0f;
 					}
 				}
-
-				if (!isplayer) {
-					if (cheatIsActive(CHEAT_SMALLCHARACTERS)) {
-						scale *= 0.4f;
-					}
-
-					if (cheatIsActive(CHEAT_DKMODE)) {
-						scale *= 1.25f;
-					}
-				} else {
-					if (cheatIsActive(CHEAT_SMALLJO)) {
-						scale *= 0.4f;
-					}
-				}
 			}
 		} else if (bodyfiledata->skel == &g_SkelSkedar) {
 			if (g_HeadsAndBodies[bodynum].canvaryheight && varyheight && bodynum == BODY_SKEDAR) {
@@ -473,12 +454,6 @@ void bodyAllocateChr(s32 stagenum, struct packedchr *packed, s32 cmdindex)
 
 			chr->flags = packed->flags;
 			chr->flags2 = packed->flags2;
-
-			if (cheatIsActive(CHEAT_MARQUIS)) {
-				chr->flags2 &= ~CHRFLAG1_NOHANDCOMBAT;
-				chr->flags2 |= CHRFLAG1_HANDCOMBATONLY;
-			}
-
 			chr->team = packed->team;
 			chr->squadron = packed->squadron;
 			chr->aibot = NULL;

src/game/bodyreset.c

@@ -1,7 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/body.h"
-#include "game/cheats.h"
 #include "game/game_00b820.h"
 #include "game/playerreset.h"
 #include "game/setuputils.h"
@@ -303,13 +302,8 @@ void bodiesReset(s32 stagenum)
 	}
 
 	// Male heads
-	if (cheatIsActive(CHEAT_TEAMHEADSONLY)) {
-		headsavailablelist = g_MaleGuardTeamHeads;
-		headsavailablelen = g_NumMaleGuardTeamHeads;
-	} else {
-		headsavailablelist = g_MaleGuardHeads;
-		headsavailablelen = g_NumMaleGuardHeads;
-	}
+	headsavailablelist = g_MaleGuardHeads;
+	headsavailablelen = g_NumMaleGuardHeads;
 
 	for (i = 0; i < g_NumActiveHeadsPerGender; i++) {
 		do {
@@ -327,13 +321,8 @@ void bodiesReset(s32 stagenum)
 	}
 
 	// Female heads
-	if (cheatIsActive(CHEAT_TEAMHEADSONLY)) {
-		headsavailablelist = g_FemaleGuardTeamHeads;
-		headsavailablelen = g_NumFemaleGuardTeamHeads;
-	} else {
-		headsavailablelist = g_FemaleGuardHeads;
-		headsavailablelen = g_NumFemaleGuardHeads;
-	}
+	headsavailablelist = g_FemaleGuardHeads;
+	headsavailablelen = g_NumFemaleGuardHeads;
 
 	for (i = 0; i < g_NumActiveHeadsPerGender; i++) {
 		do {

src/game/bondgrab.c

@@ -2,7 +2,6 @@
 #include "constants.h"
 #include "game/bondgrab.h"
 #include "game/bondmove.h"
-#include "game/cheats.h"
 #include "game/chraction.h"
 #include "game/debug.h"
 #include "game/prop.h"
@@ -1086,13 +1085,6 @@ void bgrab0f0ce924(void)
 		sp84 = g_Vars.currentplayer->headpos.x;
 		sp80 = g_Vars.currentplayer->headpos.z;
 
-#if VERSION >= VERSION_NTSC_1_0
-		if (cheatIsActive(CHEAT_SMALLJO)) {
-			sp84 *= 0.4f;
-			sp80 *= 0.4f;
-		}
-#endif
-
 		sp74.x += (sp80 * g_Vars.currentplayer->bond2.unk00.f[0] - sp84 * g_Vars.currentplayer->bond2.unk00.f[2]) * g_Vars.lvupdate60freal;
 		sp74.z += (sp80 * g_Vars.currentplayer->bond2.unk00.f[2] + sp84 * g_Vars.currentplayer->bond2.unk00.f[0]) * g_Vars.lvupdate60freal;
 

src/game/bondgun.c

@@ -1,7 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/bondmove.h"
-#include "game/cheats.h"
 #include "game/chraction.h"
 #include "game/inv.h"
 #include "game/game_006900.h"
@@ -2404,10 +2403,6 @@ bool bgunTickIncAttackingClose(s32 handnum, struct hand *hand)
 			}
 		}
 
-		if (cheatIsActive(CHEAT_HURRICANEFISTS)) {
-			hand->stateminor = 2;
-		}
-
 		return false;
 	}
 
@@ -2416,10 +2411,6 @@ bool bgunTickIncAttackingClose(s32 handnum, struct hand *hand)
 			return true;
 		}
 
-		if (cheatIsActive(CHEAT_HURRICANEFISTS) && hand->gset.weaponnum == WEAPON_UNARMED) {
-			return true;
-		}
-
 		if (hand->stateframes > TICKS(60)) {
 			return true;
 		}
@@ -11788,27 +11779,6 @@ void bgunTickGameplay(bool triggeron)
 		bgunTickHand(HAND_RIGHT);
 		bgunTickHand(HAND_LEFT);
 		bgunTickSwitch();
-
-		if (cheatIsActive(CHEAT_UNLIMITEDAMMONORELOADS)) {
-			s32 i;
-			struct weapon *weapon;
-			struct hand *lhand = &g_Vars.currentplayer->hands[HAND_LEFT];
-			struct hand *rhand = &g_Vars.currentplayer->hands[HAND_RIGHT];
-
-			weapon = weaponFindById(rhand->gset.weaponnum);
-
-			for (i = 0; i != 2; i++) {
-				if (weapon && weapon->ammos[i] &&
-						bgunAmmotypeAllowsUnlimitedAmmo(weapon->ammos[i]->type)) {
-					rhand->loadedammo[i] = rhand->clipsizes[i];
-					lhand->loadedammo[i] = lhand->clipsizes[i];
-				}
-			}
-
-			bgunGiveMaxAmmo(false);
-		} else if (cheatIsActive(CHEAT_UNLIMITEDAMMO)) {
-			bgunGiveMaxAmmo(false);
-		}
 	}
 
 	bgunDecreaseNoiseRadius();

src/game/bondmove.c

@@ -5,7 +5,6 @@
 #include "game/bondgrab.h"
 #include "game/bondmove.h"
 #include "game/bondwalk.h"
-#include "game/cheats.h"
 #include "game/chraction.h"
 #include "game/footstep.h"
 #include "game/game_006900.h"
@@ -2034,30 +2033,6 @@ void bmove0f0cc19c(struct coord *arg)
 		g_Vars.currentplayer->bond2.unk10.y += -(1.0f - g_Vars.currentplayer->vv_cosverta) * g_Vars.currentplayer->bondleandown;
 	}
 
-	if (cheatIsActive(CHEAT_SMALLJO)) {
-		if (g_Vars.currentplayer->bondmovemode == MOVEMODE_BIKE) {
-			mult = g_Vars.currentplayer->bondentert * 0.6f + 0.4f;
-		} else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_WALK && g_Vars.currentplayer->walkinitmove) {
-			mult = (1.0f - g_Vars.currentplayer->walkinitt) * 0.6f + 0.4f;
-			g_Vars.currentplayer->bond2.unk10.y += (g_Vars.currentplayer->crouchoffsetreal - g_Vars.currentplayer->crouchoffsetrealsmall) * g_Vars.currentplayer->walkinitt;
-		} else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_WALK) {
-			mult = 0.4f;
-			g_Vars.currentplayer->bond2.unk10.y += (g_Vars.currentplayer->crouchoffsetreal - g_Vars.currentplayer->crouchoffsetrealsmall);
-		} else {
-			mult = 0.4f;
-		}
-
-		g_Vars.currentplayer->bond2.unk10.y = (g_Vars.currentplayer->bond2.unk10.y - g_Vars.currentplayer->vv_manground) * mult;
-
-#if VERSION < VERSION_NTSC_1_0
-		if (g_Vars.currentplayer->bond2.unk10.y < 30) {
-			g_Vars.currentplayer->bond2.unk10.y = 30;
-		}
-#endif
-
-		g_Vars.currentplayer->bond2.unk10.y += g_Vars.currentplayer->vv_manground;
-	}
-
 #if VERSION >= VERSION_NTSC_1_0
 	min = g_Vars.currentplayer->vv_ground + 10;
 

src/game/bondwalk.c

@@ -2,7 +2,6 @@
 #include "constants.h"
 #include "game/bondmove.h"
 #include "game/bondwalk.h"
-#include "game/cheats.h"
 #include "game/chraction.h"
 #include "game/debug.h"
 #include "game/footstep.h"
@@ -1152,13 +1151,8 @@ void bwalkUpdateCrouchOffsetReal(void)
 		g_Vars.currentplayer->crouchoffsetreal = g_Vars.currentplayer->crouchoffset * g_Vars.currentplayer->vv_eyeheight * (1.0f / 159.0f);
 	}
 
-	if (cheatIsActive(CHEAT_SMALLJO)) {
-		g_Vars.currentplayer->crouchoffsetsmall = 69.0f - g_Vars.currentplayer->vv_eyeheight;
-		g_Vars.currentplayer->crouchoffsetrealsmall = 69.0f - g_Vars.currentplayer->vv_eyeheight;
-	} else {
-		g_Vars.currentplayer->crouchoffsetsmall = g_Vars.currentplayer->crouchoffset;
-		g_Vars.currentplayer->crouchoffsetrealsmall = g_Vars.currentplayer->crouchoffsetreal;
-	}
+	g_Vars.currentplayer->crouchoffsetsmall = g_Vars.currentplayer->crouchoffset;
+	g_Vars.currentplayer->crouchoffsetrealsmall = g_Vars.currentplayer->crouchoffsetreal;
 }
 
 void bwalkUpdateCrouchOffset(void)
@@ -1426,12 +1420,6 @@ void bwalk0f0c69b8(void)
 		spc0 *= 1.25f;
 	}
 
-#if VERSION >= VERSION_NTSC_1_0
-	if (cheatIsActive(CHEAT_SMALLJO)) {
-		spc0 *= 0.4f;
-	}
-#endif
-
 	if (g_Vars.currentplayer->walkinitmove) {
 		g_Vars.currentplayer->walkinitt += g_Vars.lvupdate60freal * (1.0f / 60.0f);
 
@@ -1546,12 +1534,6 @@ void bwalk0f0c69b8(void)
 		mult = var80075c00[1].unk0c * 0.5f * g_Vars.lvupdate60freal;
 		spe0 = (g_Vars.currentplayer->speedsideways * spc0 + spc4) * mult;
 
-#if VERSION >= VERSION_NTSC_1_0
-		if (cheatIsActive(CHEAT_SMALLJO)) {
-			spe0 /= 0.4f;
-		}
-#endif
-
 		bmove0f0cc654(maxspeed, g_Vars.currentplayer->speedforwards * spc0 + spc8, spe0);
 
 		g_Vars.currentplayer->gunspeed = maxspeed;
@@ -1559,12 +1541,6 @@ void bwalk0f0c69b8(void)
 		spdc = g_Vars.currentplayer->headpos.x;
 		spd8 = g_Vars.currentplayer->headpos.z;
 
-#if VERSION >= VERSION_NTSC_1_0
-		if (cheatIsActive(CHEAT_SMALLJO)) {
-			spdc *= 0.4f;
-		}
-#endif
-
 		spcc.f[0] += (spd8 * g_Vars.currentplayer->bond2.unk00.f[0] - spdc * g_Vars.currentplayer->bond2.unk00.f[2]) * g_Vars.lvupdate60freal;
 		spcc.f[2] += (spd8 * g_Vars.currentplayer->bond2.unk00.f[2] + spdc * g_Vars.currentplayer->bond2.unk00.f[0]) * g_Vars.lvupdate60freal;
 		spcc.f[0] += spb4;

src/game/bossfile.c

@@ -2,7 +2,6 @@
 #include "constants.h"
 #include "constants.h"
 #include "game/camdraw.h"
-#include "game/cheats.h"
 #include "game/player.h"
 #include "game/savebuffer.h"
 #include "game/bossfile.h"

src/game/challenge.c

@@ -807,14 +807,7 @@ void challengeConsiderMarkingComplete(void)
 {
 	bool result = challengeIsCompleteForEndscreen();
 
-#if VERSION == VERSION_PAL_BETA
-	if ((g_CheatsActiveBank0 == 0 && g_CheatsActiveBank1 == 0) && (result || debugIsSetCompleteEnabled()))
-#elif VERSION >= VERSION_NTSC_1_0
-	if (g_CheatsActiveBank0 == 0 && g_CheatsActiveBank1 == 0 && result)
-#else
-	if (result && g_CheatsActiveBank0 == 0 && g_CheatsActiveBank1 == 0)
-#endif
-	{
+	if (result) {
 		u32 prevplayernum;
 		s32 i;
 

src/game/chr.c

@@ -2,7 +2,6 @@
 #include "lib/sched.h"
 #include "constants.h"
 #include "game/bondmove.h"
-#include "game/cheats.h"
 #include "game/chraction.h"
 #include "game/debug.h"
 #include "game/chr.h"
@@ -1070,11 +1069,6 @@ void chrInit(struct prop *prop)
 	chr->invalidmove = 0;
 	chr->lastmoveok60 = g_Vars.lvframe60;
 	chr->visionrange = 250;
-
-	if (cheatIsActive(CHEAT_PERFECTDARKNESS)) {
-		chr->visionrange = 4;
-	}
-
 	chr->shotbondsum = 0;
 	chr->damage = 0;
 	chr->sumground = 0;
@@ -1310,10 +1304,6 @@ struct prop *chrAllocate(struct model *model, struct coord *pos, s16 *rooms, f32
 
 	if (prop) {
 		prop = chr0f020b14(prop, model, pos, rooms, faceangle);
-
-		if (cheatIsActive(CHEAT_ENEMYSHIELDS)) {
-			chrSetShield(prop->chr, 8);
-		}
 	}
 
 	return prop;
@@ -1635,14 +1625,6 @@ void chrHandleJointPositioned(s32 joint, Mtxf *mtx)
 			neckjoint = -1;
 		}
 
-		if (cheatIsActive(CHEAT_DKMODE) && CHRRACE(g_CurModelChr) == RACE_HUMAN) {
-			if (joint == neckjoint) {
-				scale = 4.0f;
-			} else if (joint == lshoulderjoint || joint == rshoulderjoint) {
-				scale = 2.5f;
-			}
-		}
-
 		if (joint == lshoulderjoint || joint == rshoulderjoint || joint == waistjoint || joint == neckjoint) {
 			xrot = 0.0f;
 			yrot = 0.0f;
@@ -2582,10 +2564,6 @@ s32 chrTick(struct prop *prop)
 			chr->hidden |= CHRHFLAG_00800000;
 		}
 
-		if (cheatIsActive(CHEAT_DKMODE)) {
-			modelSetDistanceScale(0.3125f);
-		}
-
 		g_ModelJointPositionedFunc = &chrHandleJointPositioned;
 		g_CurModelChr = chr;
 
@@ -3504,10 +3482,6 @@ Gfx *chrRender(struct prop *prop, Gfx *gdl, bool xlupass)
 							shadowalpha = shadowalpha * (400 - gaptoground) * 0.004f;
 						}
 
-						if (cheatIsActive(CHEAT_SMALLCHARACTERS)) {
-							radius *= 0.4f;
-						}
-
 						gdl = gfxRenderRadialShadow(gdl, prop->pos.x, chr->ground, prop->pos.z, chrGetInverseTheta(chr), radius, 0xffffff00 | shadowalpha);
 					}
 				}

src/game/dlights.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/cheats.h"
 #include "game/dlights.h"
 #include "game/gfxmemory.h"
 #include "game/propsnd.h"
@@ -412,26 +411,9 @@ void roomInitLights(s32 roomnum)
 
 	room->flags |= ROOMFLAG_DIRTY;
 
-#if VERSION < VERSION_NTSC_1_0
-	if (cheatIsActive(CHEAT_PERFECTDARKNESS) && (room->flags & ROOMFLAG_RENDERALWAYS) == 0) {
-		room->lightop = LIGHTOP_1;
-		room->unk60 = 0.0f;
-	}
-#endif
-
 	light = (struct light *)&g_BgLightsFileData[(u32)g_Rooms[roomnum].lightindex * 0x22];
 
 	for (i = 0; i < room->numlights; i++) {
-#if VERSION < VERSION_NTSC_1_0
-		if (cheatIsActive(CHEAT_PERFECTDARKNESS)) {
-			light->unk04 = 0;
-			light->unk05_00 = (random() % 2) ? true : false;
-			light->healthy = false;
-			light->on = false;
-			light->sparking = false;
-			light->vulnerable = false;
-		} else
-#endif
 		{
 			light->unk04 = g_Rooms[roomnum].unk4a;
 			light->unk05_00 = true;
@@ -919,7 +901,7 @@ void roomSetLightsOn(s32 roomnum, s32 enable)
 
 void roomSetLighting(s32 roomnum, s32 operation, u8 arg2, u8 arg3, u8 arg4)
 {
-	if (cheatIsActive(CHEAT_PERFECTDARKNESS) == false) {
+	{
 		g_Rooms[roomnum].lightop = operation;
 
 		switch (operation) {
@@ -1826,11 +1808,6 @@ void func0f0037ac(void)
 	f32 average;
 	u32 stack;
 
-#if VERSION >= VERSION_NTSC_1_0
-	if (cheatIsActive(CHEAT_PERFECTDARKNESS)) {
-		func0f00372c();
-	}
-#else
 	static s32 prevtickmode = 0;
 
 	if (prevtickmode != g_Vars.tickmode) {
@@ -1840,7 +1817,6 @@ void func0f0037ac(void)
 
 		prevtickmode = g_Vars.tickmode;
 	}
-#endif
 
 	if (var80061420 == NULL) {
 		return;

src/game/filelist.c

@@ -2,7 +2,6 @@
 #include "constants.h"
 #include "constants.h"
 #include "game/camdraw.h"
-#include "game/cheats.h"
 #include "game/player.h"
 #include "game/savebuffer.h"
 #include "game/filelist.h"

src/game/game_00b820.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/cheats.h"
 #include "game/game_00b820.h"
 #include "game/playerreset.h"
 #include "game/body.h"

src/game/game_0b0fd0.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/cheats.h"
 #include "game/inv.h"
 #include "game/bondgun.h"
 #include "game/game_0b0fd0.h"
@@ -581,10 +580,6 @@ u32 currentPlayerGetSight(void)
 		return SIGHT_NONE;
 	}
 
-	if (cheatIsActive(CHEAT_CLASSICSIGHT)) {
-		return SIGHT_CLASSIC;
-	}
-
 	switch (g_Vars.currentplayer->hands[HAND_RIGHT].gset.weaponnum) {
 	case WEAPON_HORIZONSCANNER:
 		return SIGHT_NONE;

src/game/gamefile.c

@@ -2,7 +2,6 @@
 #include "constants.h"
 #include "constants.h"
 #include "game/camdraw.h"
-#include "game/cheats.h"
 #include "game/player.h"
 #include "game/savebuffer.h"
 #include "game/bg.h"
@@ -284,7 +283,6 @@ s32 gamefileLoad(s32 device)
 		g_FilemgrLastPakError = ret;
 
 		if (ret == 0) {
-			cheatsInit();
 			savebufferReadString(&buffer, g_GameFile.name, 0);
 			g_GameFile.thumbnail = savebufferReadBits(&buffer, 5);
 			g_GameFile.totaltime = savebufferReadBits(&buffer, 32);

src/game/inv.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/cheats.h"
 #include "game/bondgun.h"
 #include "game/game_0b0fd0.h"
 #include "game/inv.h"
@@ -449,17 +448,6 @@ bool invGiveProp(struct prop *prop)
 {
 	struct invitem *item;
 
-	// Don't add duplicate night vision to inventory
-	// (night vision is already there when using perfect darkness)
-	// Note that this check doesn't work on Investigation because it uses the
-	// IR specs model. See bug note in Investigation's setup file (setupear.c).
-	if (cheatIsActive(CHEAT_PERFECTDARKNESS)
-			&& prop->type == PROPTYPE_OBJ
-			&& prop->obj
-			&& prop->obj->modelnum == MODEL_CHRNIGHTSIGHT) {
-		return true;
-	}
-
 	item = invFindUnusedSlot();
 
 	if (item) {
@@ -508,10 +496,6 @@ s32 invGiveWeaponsByProp(struct prop *prop)
 			weaponnum = weapon->weaponnum;
 			otherweaponnum;
 
-			if (cheatIsActive(CHEAT_PERFECTDARKNESS) && weaponnum == WEAPON_NIGHTVISION) {
-				return 1;
-			}
-
 			if (invGiveSingleWeapon(weaponnum)) {
 				numgiven = 1;
 			}

src/game/invreset.c

@@ -1,7 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "constants.h"
-#include "game/cheats.h"
 #include "game/inv.h"
 #include "bss.h"
 #include "lib/memp.h"
@@ -12,11 +11,7 @@ void invReset(void)
 {
 	s32 i;
 
-	if (PLAYERCOUNT() == 1 && g_Vars.normmplayerisrunning == false) {
-		g_Vars.currentplayer->equipallguns = cheatIsActive(CHEAT_ALLGUNS);
-	} else {
-		g_Vars.currentplayer->equipallguns = false;
-	}
+	g_Vars.currentplayer->equipallguns = false;
 
 	for (i = 0; i != 10; i++) {
 		g_Vars.currentplayer->gunheldarr[i].totaltime240_60 = -1;

src/game/lv.c

@@ -12,7 +12,6 @@
 #include "game/bondview.h"
 #include "game/camdraw.h"
 #include "game/casing.h"
-#include "game/cheats.h"
 #include "game/chr.h"
 #include "game/chraction.h"
 #include "game/credits.h"
@@ -256,8 +255,6 @@ void lvReset(s32 stagenum)
 	g_Vars.paksconnected = 0;
 	g_Vars.stagenum = stagenum;
 
-	cheatsReset();
-
 	var80084040 = true;
 	g_Vars.lvframenum = 0;
 	var80084050 = 0;
@@ -2031,16 +2028,6 @@ s32 lvGetSlowMotionType(void)
 		if (g_MpSetup.options & MPOPTION_SLOWMOTION_SMART) {
 			return SLOWMOTION_SMART;
 		}
-	} else {
-		if (cheatIsActive(CHEAT_SLOMO)) {
-			return SLOWMOTION_ON;
-		}
-		if (debugGetSlowMotion() == SLOWMOTION_ON) {
-			return SLOWMOTION_ON;
-		}
-		if (debugGetSlowMotion() == SLOWMOTION_SMART) {
-			return SLOWMOTION_SMART;
-		}
 	}
 
 	return SLOWMOTION_OFF;

src/game/mainmenu.c

@@ -1,7 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/bossfile.h"
-#include "game/cheats.h"
 #include "game/setup.h"
 #include "game/title.h"
 #include "game/pdmode.h"
@@ -2110,58 +2109,6 @@ struct menuitem g_2PMissionOptionsVMenuItems[] = {
 	{ MENUITEMTYPE_END },
 };
 
-struct menuitem g_CiOptionsMenuItems[] = {
-	{
-		MENUITEMTYPE_SELECTABLE,
-		0,
-		MENUITEMFLAG_SELECTABLE_OPENSDIALOG | MENUITEMFLAG_BIGFONT,
-		0x000056b5,
-		0x00000001,
-		(void *)&g_AudioOptionsMenuDialog,
-	},
-	{
-		MENUITEMTYPE_SELECTABLE,
-		0,
-		MENUITEMFLAG_SELECTABLE_OPENSDIALOG | MENUITEMFLAG_BIGFONT,
-		0x000056b6,
-		0x00000002,
-		(void *)&g_VideoOptionsMenuDialog,
-	},
-	{
-		MENUITEMTYPE_SELECTABLE,
-		0,
-		MENUITEMFLAG_SELECTABLE_OPENSDIALOG | MENUITEMFLAG_BIGFONT,
-		0x000056b7,
-		0x00000003,
-		(void *)&g_CiControlOptionsMenuDialog,
-	},
-	{
-		MENUITEMTYPE_SELECTABLE,
-		0,
-		MENUITEMFLAG_SELECTABLE_OPENSDIALOG | MENUITEMFLAG_BIGFONT,
-		0x000056b8,
-		0x00000004,
-		(void *)&g_CiDisplayMenuDialog,
-	},
-	{
-		MENUITEMTYPE_SELECTABLE,
-		0,
-		MENUITEMFLAG_SELECTABLE_OPENSDIALOG | MENUITEMFLAG_BIGFONT,
-		0x000056b9,
-		0x00000005,
-		(void *)&g_CheatsMenuDialog,
-	},
-	{
-		MENUITEMTYPE_SELECTABLE,
-		0,
-		MENUITEMFLAG_SELECTABLE_OPENSDIALOG | MENUITEMFLAG_BIGFONT,
-		0x00005679,
-		0x00000006,
-		(void *)&g_CinemaMenuDialog,
-	},
-	{ MENUITEMTYPE_END },
-};
-
 struct menudialogdef g_SoloMissionOptionsMenuDialog = {
 	MENUDIALOGTYPE_DEFAULT,
 	L_OPTIONS_180, // "Options"
@@ -2171,42 +2118,6 @@ struct menudialogdef g_SoloMissionOptionsMenuDialog = {
 	&g_SoloMissionBriefingMenuDialog,
 };
 
-struct menudialogdef g_CiOptionsViaPcMenuDialog = {
-	MENUDIALOGTYPE_DEFAULT,
-	L_OPTIONS_180, // "Options"
-	g_CiOptionsMenuItems,
-	menudialog0010559c,
-	0,
-	NULL,
-};
-
-struct menudialogdef g_CiOptionsViaPauseMenuDialog = {
-	MENUDIALOGTYPE_DEFAULT,
-	L_OPTIONS_180, // "Options"
-	g_CiOptionsMenuItems,
-	menudialog0010559c,
-	0,
-	NULL,
-};
-
-struct menudialogdef g_2PMissionOptionsHMenuDialog = {
-	MENUDIALOGTYPE_DEFAULT,
-	L_OPTIONS_180, // "Options"
-	g_2PMissionOptionsHMenuItems,
-	menudialog0010559c,
-	0,
-	&g_2PMissionBriefingHMenuDialog,
-};
-
-struct menudialogdef g_2PMissionOptionsVMenuDialog = {
-	MENUDIALOGTYPE_DEFAULT,
-	L_OPTIONS_180, // "Options"
-	g_2PMissionOptionsVMenuItems,
-	menudialog0010559c,
-	0,
-	&g_2PMissionBriefingVMenuDialog,
-};
-
 u8 var80072d88 = 255;
 
 char *invMenuTextPrimaryFunction(struct menuitem *item)

src/game/modelmgrreset.c

@@ -2,7 +2,6 @@
 #include "constants.h"
 #include "constants.h"
 #include "game/bondmove.h"
-#include "game/cheats.h"
 #include "game/inv.h"
 #include "game/playerreset.h"
 #include "game/chr.h"

src/game/mplayer/ingame.c

@@ -770,9 +770,7 @@ void mpPushEndscreenDialog(u32 arg0, u32 playernum)
 
 	if (g_MpSetup.options & MPOPTION_TEAMSENABLED) {
 		if (g_BossFile.locktype == MPLOCKTYPE_CHALLENGE) {
-			if (g_CheatsActiveBank0 || g_CheatsActiveBank1) {
-				menuPushRootDialog(&g_MpEndscreenChallengeCheatedMenuDialog, MENUROOT_MPENDSCREEN);
-			} else if (challengeIsCompleteForEndscreen()) {
+			if (challengeIsCompleteForEndscreen()) {
 				menuPushRootDialog(&g_MpEndscreenChallengeCompletedMenuDialog, MENUROOT_MPENDSCREEN);
 			} else {
 				menuPushRootDialog(&g_MpEndscreenChallengeFailedMenuDialog, MENUROOT_MPENDSCREEN);

src/game/mplayer/mplayer.c

@@ -2282,7 +2282,7 @@ void mpCalculateAwards(void)
 
 		mpplayer->medals = 0;
 
-		if (!g_CheatsActiveBank0 && !g_CheatsActiveBank1) {
+		{
 			mpplayer->kills += metrics[i].numkills;
 			mpplayer->deaths += metrics[i].numdeaths;
 			mpplayer->gamesplayed++;
@@ -2549,7 +2549,7 @@ void mpCalculateAwards(void)
 			}
 		}
 
-		if (!g_CheatsActiveBank0 && !g_CheatsActiveBank1) {
+		{
 			if (mostkillsplayer < 4 && mostkillsplayer >= 0) {
 				struct mpplayerconfig *mpplayer = (struct mpplayerconfig *)MPCHR(mostkillsplayer);
 				mpplayer->medals |= MEDAL_KILLMASTER;
@@ -2565,7 +2565,7 @@ void mpCalculateAwards(void)
 	}
 
 	// Calculate Headshot and Accuracy medals
-	if (!g_CheatsActiveBank0 && !g_CheatsActiveBank1 && playercount >= 2) {
+	if (playercount >= 2) {
 		s32 mostheadshotvalue = 0;
 		f32 mostaccuratevalue = 0.5f;
 		s32 mostheadshotplayer = -1;

src/game/mpstats.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/cheats.h"
 #include "game/inv.h"
 #include "game/bondgun.h"
 #include "game/game_0b0fd0.h"

src/game/options.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/cheats.h"
 #include "game/mainmenu.h"
 #include "game/music.h"
 #include "game/options.h"
@@ -252,22 +251,6 @@ s32 optionsGetEffectiveScreenSize(void)
 				|| g_Menus[g_MpPlayerNum].curdialog->definition == &g_SoloMissionControlStyleMenuDialog) {
 			return SCREENSIZE_FULL;
 		}
-
-#if VERSION >= VERSION_JPN_FINAL
-		if (g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsFunMenuDialog
-				|| g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsGameplayMenuDialog
-				|| g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsSoloWeaponsMenuDialog
-				|| g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsClassicWeaponsMenuDialog
-				|| g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsWeaponsMenuDialog
-				|| g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsBuddiesMenuDialog
-				|| g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsMenuDialog
-				|| g_Menus[g_MpPlayerNum].curdialog->definition == &g_AcceptMissionMenuDialog
-				|| g_Menus[g_MpPlayerNum].curdialog->definition == &g_PreAndPostMissionBriefingMenuDialog
-				|| g_Menus[g_MpPlayerNum].curdialog->definition == &g_RetryMissionMenuDialog
-				|| g_Menus[g_MpPlayerNum].curdialog->definition == &g_NextMissionMenuDialog) {
-			return SCREENSIZE_FULL;
-		}
-#endif
 	}
 
 	if (PLAYERCOUNT() >= 2 || g_MenuData.root == MENUROOT_MPSETUP) {

src/game/player.c

@@ -2,7 +2,6 @@
 #include "constants.h"
 #include "game/bondeyespy.h"
 #include "game/bondmove.h"
-#include "game/cheats.h"
 #include "game/chraction.h"
 #include "game/floor.h"
 #include "game/inv.h"
@@ -951,15 +950,6 @@ void playerSpawn(void)
 	invGiveSingleWeapon(WEAPON_UNARMED);
 	playerSetShieldFrac(0);
 
-	if (cheatIsActive(CHEAT_JOSHIELD)) {
-		playerSetShieldFrac(1);
-	}
-
-	if (cheatIsActive(CHEAT_SUPERSHIELD)) {
-		playerSetShieldFrac(1);
-		g_Vars.currentplayer->armourscale = 2;
-	}
-
 	if (g_Vars.mplayerisrunning) {
 		if (g_Vars.antiplayernum >= 0 && g_Vars.currentplayer == g_Vars.anti) {
 			numsqdists = 0;
@@ -1170,12 +1160,6 @@ void playerChooseBodyAndHead(s32 *bodynum, s32 *headnum, s32 *arg2)
 	outfit = g_Vars.currentplayer->bondtype;
 	solo = !(g_Vars.coopplayernum >= 0) || (g_Vars.currentplayer != g_Vars.coop);
 
-	if (cheatIsActive(CHEAT_PLAYASELVIS)) {
-		*bodynum = BODY_THEKING;
-		*headnum = HEAD_ELVIS;
-		return;
-	}
-
 	if (g_Vars.stagenum == STAGE_VILLA && lvGetDifficulty() >= DIFF_PA) {
 		outfit = OUTFIT_NEGOTIATOR;
 	}
@@ -4821,16 +4805,6 @@ bool playerIsHealthVisible(void)
 	return g_Vars.currentplayer->healthshowmode != HEALTHSHOWMODE_HIDDEN;
 }
 
-// Never called
-void playerSetInvincible(bool enable)
-{
-	if (enable) {
-		cheatActivate(CHEAT_INVINCIBLE);
-	} else {
-		cheatDeactivate(CHEAT_INVINCIBLE);
-	}
-}
-
 void playerSetBondVisible(bool visible)
 {
 	g_Vars.bondvisible = visible;

src/game/playermgr.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/cheats.h"
 #include "game/bondgun.h"
 #include "game/player.h"
 #include "game/playermgr.h"
@@ -539,7 +538,7 @@ void playermgrAllocatePlayer(s32 index)
 	g_Vars.players[index]->equipcuritem = 0;
 
 	g_Vars.players[index]->angleoffset = 0;
-	g_Vars.players[index]->invincible = cheatIsActive(CHEAT_INVINCIBLE);
+	g_Vars.players[index]->invincible = 0;
 	g_Vars.players[index]->healthdamagetype = 7;
 	g_Vars.players[index]->vv_height = 1;
 	g_Vars.players[index]->vv_eyeheight = 1;

src/game/playerreset.c

@@ -2,7 +2,6 @@
 #include "constants.h"
 #include "constants.h"
 #include "game/bondmove.h"
-#include "game/cheats.h"
 #include "game/inv.h"
 #include "game/playerreset.h"
 #include "game/chr.h"
@@ -170,118 +169,6 @@ void playerReset(void)
 
 	invGiveSingleWeapon(WEAPON_UNARMED);
 
-	if (cheatIsActive(CHEAT_TRENTSMAGNUM)) {
-		invGiveSingleWeapon(WEAPON_DY357LX);
-		bgunSetAmmoQuantity(AMMOTYPE_MAGNUM, 80);
-	}
-
-	if (cheatIsActive(CHEAT_FARSIGHT)) {
-		invGiveSingleWeapon(WEAPON_FARSIGHT);
-		bgunSetAmmoQuantity(AMMOTYPE_FARSIGHT, 80);
-	}
-
-	if (cheatIsActive(CHEAT_CLOAKINGDEVICE)) {
-		invGiveSingleWeapon(WEAPON_CLOAKINGDEVICE);
-#if VERSION >= VERSION_PAL_FINAL
-		bgunSetAmmoQuantity(AMMOTYPE_CLOAK, TICKS(7200));
-#else
-		bgunSetAmmoQuantity(AMMOTYPE_CLOAK, 7200);
-#endif
-	}
-
-	if (cheatIsActive(CHEAT_PERFECTDARKNESS)) {
-		invGiveSingleWeapon(WEAPON_NIGHTVISION);
-	}
-
-	if (cheatIsActive(CHEAT_RTRACKER)) {
-		invGiveSingleWeapon(WEAPON_RTRACKER);
-	}
-
-	if (cheatIsActive(CHEAT_ROCKETLAUNCHER)) {
-		invGiveSingleWeapon(WEAPON_ROCKETLAUNCHER);
-		bgunSetAmmoQuantity(AMMOTYPE_ROCKET, 10);
-	}
-
-	if (cheatIsActive(CHEAT_SNIPERRIFLE)) {
-		invGiveSingleWeapon(WEAPON_SNIPERRIFLE);
-		bgunSetAmmoQuantity(AMMOTYPE_RIFLE, 200);
-	}
-
-	if (cheatIsActive(CHEAT_XRAYSCANNER)) {
-		invGiveSingleWeapon(WEAPON_XRAYSCANNER);
-	}
-
-	if (cheatIsActive(CHEAT_SUPERDRAGON)) {
-		invGiveSingleWeapon(WEAPON_SUPERDRAGON);
-		bgunSetAmmoQuantity(AMMOTYPE_RIFLE, 200);
-		bgunSetAmmoQuantity(AMMOTYPE_DEVASTATOR, 20);
-	}
-
-	if (cheatIsActive(CHEAT_LAPTOPGUN)) {
-		invGiveSingleWeapon(WEAPON_LAPTOPGUN);
-		bgunSetAmmoQuantity(AMMOTYPE_SMG, 200);
-	}
-
-	if (cheatIsActive(CHEAT_PHOENIX)) {
-		invGiveSingleWeapon(WEAPON_PHOENIX);
-		bgunSetAmmoQuantity(AMMOTYPE_PISTOL, 200);
-	}
-
-#if VERSION >= VERSION_NTSC_1_0
-	if (cheatIsActive(CHEAT_PSYCHOSISGUN) || cheatIsActive(CHEAT_ALLGUNS)) {
-		bgunSetAmmoQuantity(AMMOTYPE_PSYCHOSIS, 4);
-
-		if (cheatIsActive(CHEAT_PSYCHOSISGUN)) {
-			invGiveSingleWeapon(WEAPON_PSYCHOSISGUN);
-		}
-	}
-#else
-	if (cheatIsActive(CHEAT_PSYCHOSISGUN)) {
-		invGiveSingleWeapon(WEAPON_PSYCHOSISGUN);
-		bgunSetAmmoQuantity(AMMOTYPE_PSYCHOSIS, 4);
-	}
-#endif
-
-	if (cheatIsActive(CHEAT_PP9I)) {
-		invGiveSingleWeapon(WEAPON_PP9I);
-		bgunSetAmmoQuantity(AMMOTYPE_PISTOL, 200);
-	}
-
-	if (cheatIsActive(CHEAT_CC13)) {
-		invGiveSingleWeapon(WEAPON_CC13);
-		bgunSetAmmoQuantity(AMMOTYPE_RIFLE, 200);
-	}
-
-	if (cheatIsActive(CHEAT_KL01313)) {
-		invGiveSingleWeapon(WEAPON_KL01313);
-		bgunSetAmmoQuantity(AMMOTYPE_SMG, 200);
-	}
-
-	if (cheatIsActive(CHEAT_KF7SPECIAL)) {
-		invGiveSingleWeapon(WEAPON_KF7SPECIAL);
-		bgunSetAmmoQuantity(AMMOTYPE_RIFLE, 200);
-	}
-
-	if (cheatIsActive(CHEAT_ZZT)) {
-		invGiveSingleWeapon(WEAPON_ZZT);
-		bgunSetAmmoQuantity(AMMOTYPE_SMG, 200);
-	}
-
-	if (cheatIsActive(CHEAT_DMC)) {
-		invGiveSingleWeapon(WEAPON_DMC);
-		bgunSetAmmoQuantity(AMMOTYPE_SMG, 200);
-	}
-
-	if (cheatIsActive(CHEAT_AR53)) {
-		invGiveSingleWeapon(WEAPON_AR53);
-		bgunSetAmmoQuantity(AMMOTYPE_RIFLE, 200);
-	}
-
-	if (cheatIsActive(CHEAT_RCP45)) {
-		invGiveSingleWeapon(WEAPON_RCP45);
-		bgunSetAmmoQuantity(AMMOTYPE_SMG, 200);
-	}
-
 	if (!hasdefaultweapon) {
 		g_DefaultWeapons[HAND_RIGHT] = WEAPON_UNARMED;
 	}

src/game/portal.c

@@ -2,7 +2,6 @@
 #include "constants.h"
 #include "game/bondeyespy.h"
 #include "game/bondmove.h"
-#include "game/cheats.h"
 #include "game/chraction.h"
 #include "game/inv.h"
 #include "game/nbomb.h"

src/game/propobj.c

@@ -2,7 +2,6 @@
 #include "constants.h"
 #include "game/bondmove.h"
 #include "game/bondwalk.h"
-#include "game/cheats.h"
 #include "game/chraction.h"
 #include "game/debug.h"
 #include "game/dlights.h"
@@ -1598,12 +1597,7 @@ void propCalculateShadeColour(struct prop *prop, u8 *nextcol, u16 floorcol)
 		nextcol[3] = 0xff;
 	}
 
-#if VERSION >= VERSION_NTSC_1_0
-	if (obj == NULL || (obj->flags & OBJFLAG_IGNOREROOMCOLOUR) == 0 || cheatIsActive(CHEAT_PERFECTDARKNESS))
-#else
-	if (obj == NULL || (obj->flags & OBJFLAG_IGNOREROOMCOLOUR) == 0)
-#endif
-	{
+	if (obj == NULL || (obj->flags & OBJFLAG_IGNOREROOMCOLOUR) == 0) {
 		s32 shade = func0f068fc8(prop, 0);
 
 		roomr = shade;
@@ -18185,11 +18179,7 @@ s32 objTestForPickup(struct prop *prop)
 		}
 
 		if (invHasSingleWeaponExcAllGuns(weapon->weaponnum) && bgunGetAmmoTypeForWeapon(weapon->weaponnum, FUNC_PRIMARY)) {
-			if (cheatIsActive(CHEAT_UNLIMITEDAMMO) || cheatIsActive(CHEAT_UNLIMITEDAMMONORELOADS)) {
-				maybe = false;
-			} else {
-				maybe = bgunGetAmmoQtyForWeapon(weapon->weaponnum, FUNC_PRIMARY) >= bgunGetAmmoCapacityForWeapon(weapon->weaponnum, FUNC_PRIMARY);
-			}
+			maybe = bgunGetAmmoQtyForWeapon(weapon->weaponnum, FUNC_PRIMARY) >= bgunGetAmmoCapacityForWeapon(weapon->weaponnum, FUNC_PRIMARY);
 
 			if (weapon->weaponnum == WEAPON_SUPERDRAGON) {
 				if (bgunGetAmmoQtyForWeapon(weapon->weaponnum, FUNC_SECONDARY) < bgunGetAmmoCapacityForWeapon(weapon->weaponnum, FUNC_SECONDARY)) {
@@ -18308,28 +18298,19 @@ s32 objTestForPickup(struct prop *prop)
 		f32 ydiff = prop->pos.y - playerprop->pos.y;
 		f32 zdiff = prop->pos.z - playerprop->pos.z;
 		f32 range;
-		bool usebigrange;
 		bool pickup;
 		u32 stack;
 
-		usebigrange = (obj->flags3 & OBJFLAG3_ONSHELF)
-			&& (cheatIsActive(CHEAT_SMALLJO) || cheatIsActive(CHEAT_PLAYASELVIS));
-
 		if (g_Vars.currentplayer->magnetattracttime >= 60) {
 			pickup = xdiff * xdiff + zdiff * zdiff <= 350 * 350 && ydiff >= -500 && ydiff <= 500;
 		} else {
-			if (usebigrange) {
-				range = 200 * 200;
-			} else {
-				range = 100 * 100;
-			}
+			range = 100 * 100;
 
 			pickup = xdiff * xdiff + zdiff * zdiff <= range && ydiff >= -200 && ydiff <= 200;
 		}
 
 		if (pickup
 				&& (obj->flags2 & OBJFLAG2_PICKUPWITHOUTLOS) == 0
-				&& !usebigrange
 				&& cdTestLos05(&playerprop->pos, playerprop->rooms, &prop->pos, prop->rooms,
 					CDTYPE_DOORS | CDTYPE_BG,
 					GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT | GEOFLAG_BLOCK_SHOOT) == false) {
@@ -19190,11 +19171,7 @@ struct autogunobj *laptopDeploy(s32 modelnum, struct gset *gset, struct chrdata
 					laptop->ammoquantity = qty;
 				}
 
-				if (cheatIsActive(CHEAT_UNLIMITEDAMMOLAPTOP)) {
-					laptop->ammoquantity = 255;
-				} else {
-					qty -= laptop->ammoquantity;
-				}
+				qty -= laptop->ammoquantity;
 
 				bgunSetAmmoQtyForWeapon(WEAPON_LAPTOPGUN, FUNC_PRIMARY, qty);
 				setCurrentPlayerNum(prevplayernum);

src/game/proptick.c

@@ -2,7 +2,6 @@
 #include "lib/sched.h"
 #include "constants.h"
 #include "game/bondmove.h"
-#include "game/cheats.h"
 #include "game/chraction.h"
 #include "game/debug.h"
 #include "game/chr.h"

src/game/radar.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/cheats.h"
 #include "game/chraction.h"
 #include "game/atan2f.h"
 #include "game/game_0b2150.h"
@@ -435,8 +434,7 @@ Gfx *radarRenderRTrackedProps(Gfx *gdl)
 		case PROPTYPE_WEAPON:
 			obj = prop->obj;
 
-			if ((obj->flags3 & OBJFLAG3_RTRACKED_YELLOW) ||
-					(cheatIsActive(CHEAT_RTRACKER) && (obj->flags3 & OBJFLAG3_RTRACKED_BLUE))) {
+			if (obj->flags3 & OBJFLAG3_RTRACKED_YELLOW) {
 				dist1.x = prop->pos.x - playerpos->x;
 				dist1.y = prop->pos.y - playerpos->y;
 				dist1.z = prop->pos.z - playerpos->z;

src/game/setup.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/cheats.h"
 #include "game/game_00b820.h"
 #include "game/setup.h"
 #include "game/objectives.h"
@@ -624,82 +623,8 @@ void setupPlaceWeapon(struct weaponobj *weapon, s32 cmdindex)
 		struct chrdata *chr = chrFindByLiteralId(weapon->base.pad);
 
 		if (chr && chr->prop && chr->model) {
-			if (cheatIsActive(CHEAT_MARQUIS)) {
-				// NTSC 1.0 and newer simplifies the Marquis logic
-#if VERSION >= VERSION_NTSC_1_0
-				weapon->base.flags &= ~OBJFLAG_DEACTIVATED;
-				weapon->base.flags |= OBJFLAG_WEAPON_AICANNOTUSE;
-				modelmgrLoadProjectileModeldefs(weapon->weaponnum);
-				func0f08b25c(weapon, chr);
-#else
-				if (g_Vars.stagenum == STAGE_INVESTIGATION
-						&& lvGetDifficulty() == DIFF_PA
-						&& weapon->weaponnum == WEAPON_K7AVENGER) {
-					modelmgrLoadProjectileModeldefs(weapon->weaponnum);
-					func0f08b25c(weapon, chr);
-				} else if (g_Vars.stagenum == STAGE_ATTACKSHIP) {
-					weapon->base.flags &= ~OBJFLAG_DEACTIVATED;
-					weapon->base.flags |= OBJFLAG_WEAPON_AICANNOTUSE;
-					modelmgrLoadProjectileModeldefs(weapon->weaponnum);
-					func0f08b25c(weapon, chr);
-				} else {
-					weapon->weaponnum = WEAPON_NONE;
-				}
-#endif
-			} else {
-				if (cheatIsActive(CHEAT_ENEMYROCKETS)) {
-					switch (weapon->weaponnum) {
-					case WEAPON_FALCON2:
-					case WEAPON_FALCON2_SILENCER:
-					case WEAPON_FALCON2_SCOPE:
-					case WEAPON_MAGSEC4:
-					case WEAPON_MAULER:
-					case WEAPON_PHOENIX:
-					case WEAPON_DY357MAGNUM:
-					case WEAPON_DY357LX:
-					case WEAPON_CMP150:
-					case WEAPON_CYCLONE:
-					case WEAPON_CALLISTO:
-					case WEAPON_RCP120:
-					case WEAPON_LAPTOPGUN:
-					case WEAPON_DRAGON:
-					case WEAPON_AR34:
-					case WEAPON_SUPERDRAGON:
-					case WEAPON_SHOTGUN:
-					case WEAPON_REAPER:
-					case WEAPON_SNIPERRIFLE:
-					case WEAPON_FARSIGHT:
-					case WEAPON_DEVASTATOR:
-					case WEAPON_ROCKETLAUNCHER:
-					case WEAPON_SLAYER:
-					case WEAPON_COMBATKNIFE:
-					case WEAPON_CROSSBOW:
-					case WEAPON_TRANQUILIZER:
-					case WEAPON_GRENADE:
-					case WEAPON_NBOMB:
-					case WEAPON_TIMEDMINE:
-					case WEAPON_PROXIMITYMINE:
-					case WEAPON_REMOTEMINE:
-						weapon->weaponnum = WEAPON_ROCKETLAUNCHER;
-						weapon->base.modelnum = MODEL_CHRDYROCKET;
-						weapon->base.extrascale = 256;
-						break;
-					case WEAPON_K7AVENGER:
-						// Don't replace the K7 guard's weapon in Investigation
-						// because it would make an objective impossible.
-						// @bug: It's still replaced on PD mode difficulty.
-						if (g_Vars.stagenum != STAGE_INVESTIGATION || lvGetDifficulty() != DIFF_PA) {
-							weapon->weaponnum = WEAPON_ROCKETLAUNCHER;
-							weapon->base.modelnum = MODEL_CHRDYROCKET;
-							weapon->base.extrascale = 256;
-						}
-						break;
-					}
-				}
-
-				modelmgrLoadProjectileModeldefs(weapon->weaponnum);
-				func0f08b25c(weapon, chr);
-			}
+			modelmgrLoadProjectileModeldefs(weapon->weaponnum);
+			func0f08b25c(weapon, chr);
 		}
 	} else {
 		bool giveweapon = true;

src/include/bss.h

@@ -175,10 +175,6 @@ extern struct menu g_Menus[4];
 extern struct menudata g_MenuData;
 extern struct activemenu g_AmMenus[4];
 extern s32 g_AmIndex;
-extern u32 g_CheatsActiveBank0;
-extern u32 g_CheatsActiveBank1;
-extern u32 g_CheatsEnabledBank0;
-extern u32 g_CheatsEnabledBank1;
 extern s32 g_FilemgrLastPakError;
 extern struct gamefile g_GameFile;
 extern struct fileguid g_GameFileGuid;

src/include/data.h

@@ -286,14 +286,11 @@ extern struct menudialogdef g_CiControlStylePlayer2MenuDialog;
 extern struct menudialogdef g_ChangeAgentMenuDialog;
 extern struct menudialogdef g_2PMissionOptionsHMenuDialog;
 extern struct menudialogdef g_2PMissionOptionsVMenuDialog;
-extern struct menudialogdef g_FrWeaponsAvailableMenuDialog;
 extern struct menudialogdef g_SoloMissionPauseMenuDialog;
 extern struct menudialogdef g_2PMissionPauseHMenuDialog;
 extern struct menudialogdef g_2PMissionPauseVMenuDialog;
-extern struct cutscene g_Cutscenes[];
 extern struct menudialogdef g_CiMenuViaPcMenuDialog;
 extern struct menudialogdef g_CiMenuViaPauseMenuDialog;
-extern struct menudialogdef g_CheatsMenuDialog;
 extern struct menudialogdef g_PakChoosePakMenuDialog;
 extern struct menudialogdef g_FilemgrFileSelect4MbMenuDialog;
 extern struct menudialogdef g_MpQuickGo4MbMenuDialog;

src/include/game/cheats.h

@@ -1,32 +0,0 @@
-#ifndef IN_GAME_CHEATS_H
-#define IN_GAME_CHEATS_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-extern struct menudialogdef g_CheatsMenuDialog;
-extern struct menudialogdef g_CheatsFunMenuDialog;
-extern struct menudialogdef g_CheatsGameplayMenuDialog;
-extern struct menudialogdef g_CheatsSoloWeaponsMenuDialog;
-extern struct menudialogdef g_CheatsClassicWeaponsMenuDialog;
-extern struct menudialogdef g_CheatsWeaponsMenuDialog;
-extern struct menudialogdef g_CheatsBuddiesMenuDialog;
-
-u32 cheatIsUnlocked(s32 cheat_id);
-bool cheatIsActive(s32 cheat_id);
-void cheatActivate(s32 cheat_id);
-void cheatDeactivate(s32 cheat_id);
-void cheatsInit(void);
-void cheatsReset(void);
-char *cheatGetNameIfUnlocked(struct menuitem *item);
-char *cheatGetMarquee(struct menuitem *item);
-s32 cheatGetByTimedStageIndex(s32 stage_index, s32 difficulty);
-s32 cheatGetByCompletedStageIndex(s32 stage_index);
-s32 cheatGetTime(s32 cheat_id);
-char *cheatGetName(s32 cheat_id);
-s32 cheatMenuHandleDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
-s32 cheatCheckboxMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
-s32 cheatMenuHandleBuddyCheckbox(s32 operation, struct menuitem *item, union handlerdata *data);
-s32 cheatMenuHandleTurnOffAllCheats(s32 operation, struct menuitem *item, union handlerdata *data);
-
-#endif

src/lib/main.c

@@ -4,7 +4,6 @@
 #include "lib/vars.h"
 #include "constants.h"
 #include "game/camdraw.h"
-#include "game/cheats.h"
 #include "game/debug.h"
 #include "game/file.h"
 #include "game/lang.h"
@@ -540,7 +539,6 @@ void mainInit(void)
 	texInit();
 	langInit();
 	lvInit();
-	cheatsInit();
 	func0000e9c0();
 	textInit();
 	dhudInit();