Don't call no-op functions

ld/gamefiles.ntsc-final.inc

@@ -195,7 +195,6 @@
 	build/ROMID/game/botinv.o (section); \
 	build/ROMID/game/botact.o (section); \
 	build/ROMID/game/mplayer/mpaicommands.o (section); \
-	build/ROMID/game/vmstats.o (section); \
 	build/ROMID/game/botroom.o (section); \
 	build/ROMID/game/challenge.o (section); \
 	build/ROMID/game/training.o (section); \

src/game/bg.c

@@ -1528,9 +1528,6 @@ void bgBuildTables(s32 stagenum)
 		g_Rooms[i].unk4e_04 = 0;
 	}
 
-	func0f15c880(g_Stages[g_StageIndex].unk14);
-	chr0f028490(g_Stages[g_StageIndex].unk14);
-
 	for (i = 0; i < 4; i++) {
 		g_Vars.playerstats[i].scale_bg2gfx = g_Stages[g_StageIndex].unk18;
 	}
@@ -1850,8 +1847,6 @@ void bgBuildTables(s32 stagenum)
 		}
 	}
 
-	envSetStageNum(stagenum);
-
 	var8007fc10 = 200;
 
 	wallhitReset();
@@ -1865,11 +1860,6 @@ void bgStop(void)
 	mtx00016748(1);
 }
 
-void func0f15c880(f32 arg0)
-{
-	// empty
-}
-
 f32 func0f15c888(void)
 {
 	return g_Stages[g_StageIndex].unk1c / g_Stages[g_StageIndex].unk14;
@@ -6021,11 +6011,6 @@ s32 func0f164e70(s32 arg0, s32 arg1, s32 arg2)
 	return arg0;
 }
 
-void func0f164e80(s32 arg0, s32 arg1)
-{
-	// empty
-}
-
 f32 var8007fcb4 = 0;
 
 s32 bg0f164e8c(struct coord *arg0, struct coord *arg1)

src/game/body.c

@@ -592,11 +592,6 @@ struct prop *bodyAllocateEyespy(struct pad *pad, s16 room)
 	return NULL;
 }
 
-void body0f02ddbf(void)
-{
-	// empty
-}
-
 /**
  * Tweak the head's Y offset to suit the body.
  *

src/game/bondcutscene.c

@@ -28,8 +28,3 @@ void bcutsceneInit(void)
 		}
 	}
 }
-
-void bcutsceneTick(void)
-{
-	// empty
-}

src/game/bondgun.c

@@ -7507,10 +7507,6 @@ void bgunTickGameplay2(void)
 	u32 stack[3];
 	s32 i;
 
-	if (g_Vars.currentplayernum == 0) {
-		projectilesDebug();
-	}
-
 	if (player->gunctrl.unk1583_06) {
 		// empty
 	} else {

src/game/bondmove.c

@@ -1911,8 +1911,6 @@ void bmoveTick(bool allowc1x, bool allowc1y, bool allowc1buttons, bool ignorec2)
 		bbikeTick();
 	} else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_GRAB) {
 		bgrabTick();
-	} else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_CUTSCENE) {
-		bcutsceneTick();
 	} else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_WALK) {
 		bwalkTick();
 	}

src/game/bondview.c

@@ -1619,11 +1619,6 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl)
 	return gdl;
 }
 
-void bview0f1572f8(void)
-{
-	// empty
-}
-
 u8 var8007f878 = 0;
 
 Gfx *bviewDrawNvLens(Gfx *gdl)
@@ -1685,14 +1680,6 @@ Gfx *bviewDrawNvLens(Gfx *gdl)
 	return gdl;
 }
 
-/**
- * Night vision doesn't have binoculars.
- */
-Gfx *bviewDrawNvBinoculars(Gfx *gdl)
-{
-	return gdl;
-}
-
 Gfx *bviewDrawIrLens(Gfx *gdl)
 {
 	s32 i;
@@ -2188,11 +2175,6 @@ Gfx *bviewDrawIrBinoculars(Gfx *gdl)
 	return gdl;
 }
 
-Gfx *bview0f148b38(Gfx *gdl)
-{
-	return gdl;
-}
-
 void bviewSetMotionBlur(u32 bluramount)
 {
 	var8007f840 = 0;

src/game/bondwalk.c

@@ -611,11 +611,6 @@ s32 bwalk0f0c4a5c(struct coord *arg0, struct coord *arg1, struct coord *arg2, s3
 	return false;
 }
 
-void bwalk0f0c4d98(void)
-{
-	// empty
-}
-
 void bwalkUpdateSpeedSideways(f32 targetspeed, f32 accelspeed, s32 mult)
 {
 	if (g_Vars.normmplayerisrunning) {
@@ -1151,8 +1146,6 @@ void bwalk0f0c63bc(struct coord *arg0, u32 arg1, s32 types)
 	g_Vars.currentplayer->bondonturret = false;
 	g_Vars.currentplayer->autocrouchpos = CROUCHPOS_STAND;
 
-	bwalk0f0c4d98();
-
 	if (bwalk0f0c4764(arg0, &sp100, &sp88, types) == CDRESULT_COLLISION) {
 		struct coord sp76;
 		struct coord sp64;
@@ -1160,10 +1153,6 @@ void bwalk0f0c63bc(struct coord *arg0, u32 arg1, s32 types)
 		s32 result = bwalk0f0c47d0(arg0, &sp100, &sp88, &sp76, &sp64, types);
 
 		if (result >= CDRESULT_NOCOLLISION || result <= CDRESULT_ERROR) {
-			if (result >= CDRESULT_NOCOLLISION) {
-				bwalk0f0c4d98();
-			}
-
 			if (arg1
 					&& bwalk0f0c494c(arg0, &sp100, &sp88, types) <= CDRESULT_COLLISION
 					&& bwalk0f0c4a5c(arg0, &sp100, &sp88, types) <= CDRESULT_COLLISION) {
@@ -1173,9 +1162,7 @@ void bwalk0f0c63bc(struct coord *arg0, u32 arg1, s32 types)
 			struct coord sp48;
 			struct coord sp36;
 
-			if (bwalk0f0c47d0(arg0, &sp76, &sp64, &sp48, &sp36, types) >= CDRESULT_NOCOLLISION) {
-				bwalk0f0c4d98();
-			}
+			bwalk0f0c47d0(arg0, &sp76, &sp64, &sp48, &sp36, types);
 
 			if (arg1
 					&& bwalk0f0c494c(arg0, &sp76, &sp64, types) <= CDRESULT_COLLISION
@@ -1185,8 +1172,6 @@ void bwalk0f0c63bc(struct coord *arg0, u32 arg1, s32 types)
 			}
 		}
 	}
-
-	bwalk0f0c4d98();
 }
 
 void bwalkUpdatePrevPos(void)

src/game/bossfile.c

@@ -41,11 +41,6 @@ bool bossfileLoadFull(void)
 	return true;
 }
 
-void func0f1106ec(void)
-{
-	// empty
-}
-
 void func0f1106f4(u8 *dst)
 {
 	bcopy(var800a22d0, dst, sizeof(var800a22d0));

src/game/botinv.c

@@ -348,11 +348,6 @@ bool botinvGiveProp(struct chrdata *chr, struct prop *prop)
 	return result;
 }
 
-void botinv0f198060(u32 arg0)
-{
-	// empty
-}
-
 /**
  * Score all weapons in the match's weaponset by themselves and write them to
  * the 3 array pointers, ordered by score1 descending.

src/game/camera.c

@@ -22,11 +22,6 @@ f32 var8009dd5c;
 struct coord var8009dd60;
 f32 var8009dd6c;
 
-void cam0f0b4950(void)
-{
-	// empty
-}
-
 void camSetScreenSize(f32 width, f32 height)
 {
 	struct player *player = g_Vars.currentplayer;

src/game/chr.c

@@ -4441,11 +4441,6 @@ void chrHit(struct shotdata *shotdata, struct hit *hit)
 	}
 }
 
-void chr0f028490(f32 arg1)
-{
-	// empty
-}
-
 void chr0f028498(bool value)
 {
 	var8006296c = value;

src/game/chraction.c

@@ -7510,11 +7510,6 @@ bool chrTryPunch(struct chrdata *chr, u8 reverse)
 	return false;
 }
 
-void func0f03c03c(void)
-{
-	// empty
-}
-
 /**
  * Verifies that the given chr struct is actually an eyespy and returns the
  * eyespy struct.
@@ -10950,11 +10945,6 @@ bool chrDetectDangerousObject(struct chrdata *chr, u8 flags)
 	return false;
 }
 
-void chrTickBondDie(struct chrdata *chr)
-{
-	// empty
-}
-
 bool func0f043f2c(struct chrdata *chr, struct coord *runpos, u32 arg2, f32 *turnspeed)
 {
 	struct prop *prop = chr->prop;
@@ -12760,7 +12750,6 @@ void chraTick(struct chrdata *chr)
 				case ACT_SURPRISED:       chrTickSurprised(chr);       break;
 				case ACT_STARTALARM:      chrTickStartAlarm(chr);      break;
 				case ACT_THROWGRENADE:    chrTickThrowGrenade(chr);    break;
-				case ACT_BONDDIE:         chrTickBondDie(chr);         break;
 				case ACT_DRUGGEDCOMINGUP: chrTickDruggedComingUp(chr); break;
 				case ACT_DRUGGEDDROP:     chrTickDruggedDrop(chr);     break;
 				case ACT_DRUGGEDKO:       chrTickDruggedKo(chr);       break;
@@ -14487,11 +14476,6 @@ bool chrIsPropPresetBlockingSightToTarget(struct chrdata *chr)
 	return result;
 }
 
-void func0f04b740(void)
-{
-	// empty
-}
-
 bool chrMoveToPos(struct chrdata *chr, struct coord *pos, s16 *rooms, f32 angle, bool allowonscreen)
 {
 	struct coord pos2;
@@ -15213,11 +15197,6 @@ bool audioWasNotPlayedRecently(s16 audioid)
 	return true;
 }
 
-Gfx *chrsRenderChrStats(Gfx *gdl, s16 *rooms)
-{
-	return gdl;
-}
-
 void chrToggleModelPart(struct chrdata *chr, s32 partnum)
 {
 	if (chr && chr->model && chr->model->filedata) {

src/game/credits.c

@@ -1563,11 +1563,6 @@ Gfx *creditsDrawSlide(Gfx *gdl)
 	return gdl;
 }
 
-void credits0f13ae04(Mtxf *mtx)
-{
-	// empty
-}
-
 void creditsTick(void)
 {
 	s32 i;

src/game/dlights.c

@@ -1412,11 +1412,6 @@ void lightsTick(void)
 	}
 }
 
-void func0f004384(void)
-{
-	// empty
-}
-
 void roomAdjustLighting(s32 roomnum, s32 start, s32 limit)
 {
 	if (var80061420 && !(g_Rooms[roomnum].flags & ROOMFLAG_OUTDOORS ? 1 : 0)) {

src/game/dyntex.c

@@ -412,11 +412,6 @@ u32 var8007f728 = 0x000002f7;
 u32 var8007f72c = 0x00000012;
 u32 var8007f730 = 0x00000012;
 
-void dyntex0f13c4e8(void)
-{
-	// empty
-}
-
 bool dyntexHasRoom(void)
 {
 	return g_DyntexCurRoom >= 0;

src/game/env.c

@@ -120,11 +120,6 @@ struct envtype2 g_EnvironmentsType2[] = {
 	{ 0 },
 };
 
-void env0f1657c0(s32 arg0, s32 arg1)
-{
-	// empty
-}
-
 struct environment *envGetCurrent(void)
 {
 	return &g_Env;
@@ -283,11 +278,6 @@ void envDisableSky(void)
 	g_Env.skybluefrac = 0;
 }
 
-void envSetStageNum(s32 stagenum)
-{
-	// empty
-}
-
 void envChooseAndApply(s32 stagenum, bool allowoverride)
 {
 	struct envtype2 *finalenv = NULL;

src/game/filelist.c

@@ -28,11 +28,6 @@ bool var80075bd0[] = { true, true, true, true };
 bool var80075be0[] = { false, false, false, false };
 u32 var80075bf0 = false;
 
-void func0f110bf0(void)
-{
-	// empty
-}
-
 void func0f110bf8(void)
 {
 	s32 i;

src/game/game_00b820.c

@@ -126,8 +126,3 @@ void stageAllocateBgChrs(void)
 	g_TeamList = mempAlloc(0x210, MEMPOOL_STAGE);
 	g_SquadronList = mempAlloc(0x220, MEMPOOL_STAGE);
 }
-
-void func0f00c230(void)
-{
-	// empty
-}

src/game/game_0b0fd0.c

@@ -305,16 +305,6 @@ bool weaponHasAmmoFlag(s32 weaponnum, s32 funcnum, u32 flag)
 	return false;
 }
 
-void func0f0b18ac(s32 arg0)
-{
-	// empty
-}
-
-void func0f0b18b4(s32 arg0)
-{
-	// empty
-}
-
 s32 currentPlayerGetDeviceState(s32 weaponnum)
 {
 	struct weapon *weapon = weaponFindById(weaponnum);

src/game/game_1531a0.c

@@ -113,11 +113,6 @@ s32 var8007fba4 = -1;
 u32 var8007fba8 = 0x00000000;
 u32 var8007fbb0 = 0x00000064;
 
-void textInit(void)
-{
-	// empty
-}
-
 void text0f1531a8(s32 arg0)
 {
 	var8007fac4 = -arg0;

src/game/game_175f90.c

@@ -7,11 +7,6 @@
 #include "data.h"
 #include "types.h"
 
-void func0f175f90(void)
-{
-	// empty
-}
-
 void func0f175f98(void)
 {
 	func0f167330();

src/game/lv.c

@@ -423,7 +423,6 @@ void lvReset(s32 stagenum)
 		mpCalculateTeamIsOnlyAi();
 	}
 
-	paksReset();
 	sndResetCurMp3();
 
 	if (stagenum == STAGE_BOOTPAKMENU) {
@@ -2036,7 +2035,6 @@ void lvTick(void)
 		PROFILE(PROFILEMARKER_LVT_SHARDS, shardsTick());
 		PROFILE(PROFILEMARKER_LVT_SPARKS, sparksTick());
 		PROFILE(PROFILEMARKER_LVT_WALLHITS, wallhitsTick());
-		PROFILE(PROFILEMARKER_LVT_SPLATS, splatsTick());
 
 		profileStart(PROFILEMARKER_LVT_WEATHER);
 		if (g_WeatherActive) {

src/game/menu.c

@@ -1988,7 +1988,6 @@ Gfx *menuRenderModels(Gfx *gdl, struct menu840 *thing, s32 arg2)
 			mtx4MultMtx4(&sp310, &sp350, &sp244);
 
 			if (arg2 == 3) {
-				credits0f13ae04(&sp1c4);
 				mtx4MultMtx4(&sp1c4, &sp244, &sp184);
 				mtx4MultMtx4(&sp184, &sp204, &thing->unk014);
 			} else {
@@ -3442,8 +3441,6 @@ void menuReset(void)
 {
 	s32 i;
 
-	func0f110bf0();
-
 	var8009dfc0 = 0;
 
 	g_BlurBuffer = mempAlloc(0x4b00, MEMPOOL_STAGE);

src/game/menuitem.c

@@ -3055,11 +3055,6 @@ void menuitemMarqueeInit(union menuitemdata *data)
 	data->marquee.unk06 = 0;
 }
 
-Gfx *menuitem07Render(Gfx *gdl)
-{
-	return gdl;
-}
-
 Gfx *menuitemRankingRender(Gfx *gdl, struct menurendercontext *context)
 {
 	struct ranking rankings[MAX_MPCHRS];
@@ -3971,7 +3966,6 @@ Gfx *menuitemRender(Gfx *gdl, struct menurendercontext *context)
 	case MENUITEMTYPE_METER:       return menuitemMeterRender(gdl, context);
 	case MENUITEMTYPE_SEPARATOR:   return menuitemSeparatorRender(gdl, context);
 	case MENUITEMTYPE_OBJECTIVES:  return menuitemObjectivesRender(gdl, context);
-	case MENUITEMTYPE_07:          return menuitem07Render(gdl);
 	case MENUITEMTYPE_DROPDOWN:    return menuitemDropdownRender(gdl, context);
 	case MENUITEMTYPE_KEYBOARD:    return menuitemKeyboardRender(gdl, context);
 	case MENUITEMTYPE_RANKING:     return menuitemRankingRender(gdl, context);

src/game/mplayer/scenarios/capturethecase.inc

@@ -153,16 +153,6 @@ s32 ctcNumProps(void)
 	return 4;
 }
 
-void ctcTick(void)
-{
-	// empty
-}
-
-void ctcTickChr(struct chrdata *chr)
-{
-	if (chr);
-}
-
 void ctcInitProps(void)
 {
 	struct mpchrconfig *mpchr;

src/game/mplayer/scenarios/popacap.inc

@@ -343,11 +343,6 @@ void pacCalculatePlayerScore(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score
 	*arg3 = mpchr->numdeaths;
 }
 
-Gfx *pacRadarExtra(Gfx *gdl)
-{
-	return gdl;
-}
-
 bool pacRadarChr(Gfx **gdl, struct prop *prop)
 {
 	struct scenariodata_pac *data = &g_ScenarioData.pac;

src/game/music.c

@@ -634,8 +634,3 @@ void musicTickAmbient(void)
 		musicStartAmbient(1);
 	}
 }
-
-void func0f16e1cc(void)
-{
-	// empty
-}

src/game/pak.c

@@ -221,11 +221,6 @@ u32 pakAlign(s8 device, u32 size)
 	return pakGetBlockSize(device) == 0x20 ? align32(size) : align16(size);
 }
 
-void pak0f116650(void)
-{
-	// empty
-}
-
 s32 pakGetAlignedFileLenByBodyLen(s8 device, u32 bodylen)
 {
 	return pakAlign(device, sizeof(struct pakfileheader) + bodylen);
@@ -326,11 +321,6 @@ void pak0f116984(s8 arg0, u8 *arg1, u8 *arg2)
 	pak0f116bdc(arg0, arg1, arg2);
 }
 
-void pak0f11698c(s8 device)
-{
-	// empty
-}
-
 void pak0f116994(void)
 {
 	if (g_Vars.stagenum == STAGE_BOOTPAKMENU) {
@@ -338,11 +328,6 @@ void pak0f116994(void)
 	}
 }
 
-void pak0f1169bc(u32 arg0, u32 arg1)
-{
-	// empty
-}
-
 void pak0f1169c8(s8 device, s32 arg1)
 {
 	u8 prevvalue = g_Vars.paksconnected;
@@ -1258,11 +1243,6 @@ u32 pak0f118674(s8 device, u32 filetype, s32 *outfileid)
 	return 4;
 }
 
-void pak0f1189d0(void)
-{
-	// empty
-}
-
 void paksInit(void)
 {
 	u8 prevvalue = g_Vars.paksconnected;
@@ -2117,11 +2097,6 @@ void pakMergeBlanks(s8 device)
 	}
 }
 
-void paksReset(void)
-{
-	// empty
-}
-
 s32 pakGetUnk014(s8 device)
 {
 	return g_Paks[device].unk014;
@@ -3135,16 +3110,6 @@ void gbpakHandleError(u32 err)
 	}
 }
 
-void pak0f11cbc8(void)
-{
-	// empty
-}
-
-void pak0f11cbd0(void)
-{
-	// empty
-}
-
 bool gbpakRead(s8 device, u16 address, u8 *buffer, u16 size)
 {
 	s32 result = osGbpakReadWrite(PFS(device), OS_READ, address, buffer, size);
@@ -3292,7 +3257,6 @@ bool gbpak0f11cef8(s8 device)
 		if (pak->unk2b9);
 
 		pak0f11d118(sp2c, pak->unk2b9, 0);
-		pak0f11d174(device, sp2c);
 
 		sp2c[0] |= 1;
 
@@ -3306,11 +3270,6 @@ bool gbpak0f11cef8(s8 device)
 	return true;
 }
 
-void pak0f11d110(void)
-{
-	// empty
-}
-
 void pak0f11d118(u8 *arg0, u8 arg1, u32 arg2)
 {
 	arg0[0] = 2;
@@ -3323,10 +3282,6 @@ void pak0f11d118(u8 *arg0, u8 arg1, u32 arg2)
 	pak0f11d214(&arg0[6], arg2);
 }
 
-void pak0f11d174(s8 device, u8 *arg1)
-{
-}
-
 void pak0f11d214(u8 *arg0, u32 arg1)
 {
 	const f32 spa8[][4] = {
@@ -3440,11 +3395,6 @@ void pak0f11d620(s8 device)
 	}
 }
 
-void pak0f11d678(void)
-{
-	// empty
-}
-
 bool gbpak0f11d680(s8 device, bool arg1)
 {
 	u32 offset = 0;
@@ -3727,11 +3677,6 @@ s32 pak0f11df84(s32 arg0)
 	return arg0;
 }
 
-void pakDumpPak(void)
-{
-	// empty
-}
-
 void pak0f117f94nb(s8 device);
 
 void pak0f11df94(s8 device)
@@ -3896,11 +3841,6 @@ void pak0f11df94(s8 device)
 	}
 }
 
-void pak0f11e3b4(void)
-{
-	// empty
-}
-
 void pak0f11e3bc(s8 device)
 {
 	g_Paks[device].unk008 = 0;

src/game/player.c

@@ -4268,7 +4268,6 @@ Gfx *playerRenderHud(Gfx *gdl)
 				&& (!g_Vars.currentplayer->eyespy || (g_Vars.currentplayer->eyespy && !g_Vars.currentplayer->eyespy->active))
 				&& ((g_Vars.currentplayer->devicesactive & ~g_Vars.currentplayer->devicesinhibit) & DEVICE_NIGHTVISION)) {
 			gdl = bviewDrawNvLens(gdl);
-			gdl = bviewDrawNvBinoculars(gdl);
 		} else if (g_Vars.currentplayer->isdead == false
 				&& g_InCutscene == 0
 				&& (!g_Vars.currentplayer->eyespy || (g_Vars.currentplayer->eyespy && !g_Vars.currentplayer->eyespy->active))

src/game/prop.c

@@ -3110,11 +3110,6 @@ void propsDefragRoomProps(void)
 	}
 }
 
-void func0f0661fc(void)
-{
-	// empty
-}
-
 void propGetBbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin)
 {
 	if (prop->type == PROPTYPE_CHR) {

src/game/propobj.c

@@ -18148,23 +18148,6 @@ Gfx *countdownTimerRender(Gfx *gdl)
 	return gdl;
 }
 
-void projectilesDebug(void)
-{
-	s32 i;
-
-	for (i = 0; i < g_MaxProjectiles; i++) {
-		if (g_Projectiles[i].flags) {
-			// empty
-		}
-	}
-
-	for (i = 0; i < g_MaxWeaponSlots; i++) {
-		if (g_WeaponSlots[i].weaponnum) {
-			// empty
-		}
-	}
-}
-
 const char var7f1aa16c[] = "ALARM : PAN 1 = %d (%s%f)";
 const char var7f1aa188[] = "";
 const char var7f1aa18c[] = "ALARM : DIR 1 = %d";
@@ -18571,8 +18554,3 @@ void objSetModelPartVisible(struct defaultobj *obj, s32 partnum, bool visible)
 		}
 	}
 }
-
-Gfx *func0f091e04(Gfx *gdl, u32 arg1)
-{
-	return gdl;
-}

src/game/propsnd.c

@@ -30,7 +30,6 @@ u32 var8006ae2c = 0x00000000;
 u32 var8006ae30 = 0x00000000;
 u32 var8006ae34 = 0x00000000;
 u32 var8006ae38 = 0x00000000;
-bool g_PropsndPrintChannels = false;
 
 u32 var8006ae40 = 0x00000000;
 bool var8006ae44 = false;
@@ -154,15 +153,6 @@ void func0f092a98(s32 channelnum)
 	}
 }
 
-void propsndPrintChannel(struct audiochannel *channel)
-{
-	s32 i;
-
-	for (i = 0; channel->rooms[i] != -1; i++) {
-		// empty
-	}
-}
-
 s32 propsndGetSubtitleOpacity(s32 channelnum)
 {
 	if (channelnum == -1) {
@@ -408,10 +398,6 @@ void propsndTickChannel(s32 channelnum)
 		}
 	}
 
-	if (var8006ae44 && (channel->flags2 & AUDIOCHANNELFLAG2_0004)) {
-		propsndPrintChannel(channel);
-	}
-
 	channel->flags &= ~AUDIOCHANNELFLAG_1000;
 	channel->flags &= ~AUDIOCHANNELFLAG_4000;
 }
@@ -1210,11 +1196,6 @@ u32 propsnd0f095264(u32 arg0, u32 arg1)
 	return arg0;
 }
 
-void propsnd0f095270(void)
-{
-	// empty
-}
-
 /**
  * Get the duration for an MP3 file by channel number.
  *

src/game/sight.c

@@ -54,16 +54,6 @@ bool sightIsPropFriendly(struct prop *prop)
 	return chrCompareTeams(g_Vars.currentplayer->prop->chr, prop->chr, COMPARE_FRIENDS);
 }
 
-void sight0f0d715c(void)
-{
-	// empty
-}
-
-Gfx *sight0f0d7164(Gfx *gdl)
-{
-	return gdl;
-}
-
 /**
  * Return true if the given prop can be added to the target list.
  */

src/game/splat.c

@@ -366,11 +366,6 @@ bool splat0f149274(f32 arg0, struct prop *chrprop, struct shotdata *shotdata, f3
 	return false;
 }
 
-void splatsTick(void)
-{
-	// empty
-}
-
 void splat0f14986c(struct splatdata *splat)
 {
 	f32 spac;

src/game/tex.c

@@ -180,11 +180,6 @@ u32 var800844e4 = 0x00000000;
 u32 var800844e8 = 0x00000000;
 u32 var800844ec = 0x00000000;
 
-void tex0f173a00(void)
-{
-	// empty
-}
-
 void tex0f173a08(void)
 {
 	s32 i;

src/game/texdecompress.c

@@ -110,11 +110,6 @@ s32 g_TexFormatLutModes[] = {
 	G_TT_IA16,
 };
 
-void func0f16e810(u32 arg0)
-{
-	// empty
-}
-
 /**
  * Inflate images (levels of detail) from a zlib-compressed texture.
  *

src/game/timing.c

@@ -50,13 +50,3 @@ void frametimeCalculate(void)
 
 	frametimeApply(diffframe60, diffframe240, count);
 }
-
-void func0f16cf8c(s32 arg0)
-{
-	// empty
-}
-
-void func0f16cf94(void)
-{
-	// empty
-}

src/game/title.c

@@ -146,11 +146,6 @@ void titleInitLegal(void)
 	g_TitleFastForward = false;
 }
 
-void titleExitLegal(void)
-{
-	// empty
-}
-
 void titleTickLegal(void)
 {
 	viSetFovY(60);
@@ -1798,11 +1793,6 @@ void titleInitNoController(void)
 	g_TitleTimer = 0;
 }
 
-void titleExitNoController(void)
-{
-	// empty
-}
-
 void titleTickNoController(void)
 {
 	viSetFovY(60);
@@ -1892,9 +1882,6 @@ void titleTick(void)
 		g_TitleDelayedMode = g_TitleNextMode;
 
 		switch (g_TitleMode) {
-		case TITLEMODE_LEGAL:
-			titleExitLegal();
-			break;
 		case TITLEMODE_CHECKCONTROLLERS:
 			titleExitCheckControllers();
 			break;
@@ -1907,9 +1894,6 @@ void titleTick(void)
 		case TITLEMODE_RARELOGO:
 			titleExitRareLogo();
 			break;
-		case TITLEMODE_NOCONTROLLER:
-			titleExitNoController();
-			break;
 		}
 
 		if (g_TitleMode != TITLEMODE_CHECKCONTROLLERS) {
@@ -2016,9 +2000,6 @@ bool titleIsKeepingMode(void)
 void titleExit(void)
 {
 	switch (g_TitleMode) {
-	case TITLEMODE_LEGAL:
-		titleExitLegal();
-		break;
 	case TITLEMODE_CHECKCONTROLLERS:
 		titleExitCheckControllers();
 		break;
@@ -2031,9 +2012,6 @@ void titleExit(void)
 	case TITLEMODE_RARELOGO:
 		titleExitRareLogo();
 		break;
-	case TITLEMODE_NOCONTROLLER:
-		titleExitNoController();
-		break;
 	case TITLEMODE_RAREPRESENTS1:
 	case TITLEMODE_RAREPRESENTS2:
 		titleExitRarePresents();

src/game/utils.c

@@ -420,11 +420,6 @@ void func0f1779f0(u32 arg0, u32 arg1, u32 arg2, u32 arg3)
 	}
 }
 
-void func0f177a10(u32 arg0)
-{
-	// empty
-}
-
 void func0f177a14(u32 arg0, u32 arg1, u32 arg2, u32 arg3)
 {
 	u32 stack[2];
@@ -434,11 +429,6 @@ void func0f177a14(u32 arg0, u32 arg1, u32 arg2, u32 arg3)
 	}
 }
 
-void func0f177a30(u32 arg0)
-{
-	// empty
-}
-
 void func0f177a38(u32 arg0, u32 arg1, u32 arg2, u32 arg3)
 {
 	u32 stack[2];

src/game/vmstats.c

@@ -1,10 +0,0 @@
-#include <ultra64.h>
-#include "constants.h"
-#include "bss.h"
-#include "lib/vm.h"
-#include "data.h"
-#include "types.h"
-
-void vmPrintStatsIfEnabled(void)
-{
-}

src/game/wallhit.c

@@ -1455,8 +1455,3 @@ void wallhitRemoveOldestWoundedSplatByChr(struct prop *chrprop)
 		wallhitFade(&g_Wallhits[oldestindex], TICKS(120));
 	}
 }
-
-Gfx *wallhit0f141814(Gfx *gdl, s32 arg1)
-{
-	return gdl;
-}

src/lib/collision.c

@@ -3956,16 +3956,6 @@ bool cd0002f02c(struct geoblock *block, s16 *rooms, s32 types)
 	return result;
 }
 
-Gfx *cdRender(Gfx *gdl, u32 arg1, u32 arg2, u32 arg3)
-{
-	return gdl;
-}
-
-void cd0002f2fc(u32 arg0, u32 arg1)
-{
-	// empty
-}
-
 bool cdIsNearlyInSightWithFlags(struct coord *viewpos, s16 *rooms, struct coord *targetpos, f32 distance, s32 types, u16 geoflags)
 {
 	struct coord diff;

src/lib/lib_034d0.c

@@ -1,16 +1,2 @@
 #include <ultra64.h>
 
-void func000034d0(void)
-{
-	// empty
-}
-
-void func000034d8(void)
-{
-	// empty
-}
-
-void func000034e0(Gfx **gdl)
-{
-	// empty
-}

src/lib/lib_15850.c

@@ -1,6 +1,2 @@
 #include <ultra64.h>
 
-void func00014850(void)
-{
-	// empty
-}

src/lib/main.c

@@ -191,8 +191,6 @@ void mainInit(void)
 	dmaInit();
 	amgrInit();
 	varsInit();
-	mempInit();
-	memaInit();
 	viConfigureForLogos();
 	var8005d9b0 = 1;
 	joyInit();
@@ -360,15 +358,11 @@ void mainInit(void)
 
 	challengesInit();
 	utilsInit();
-	func000034d0();
 	texInit();
 	lvInit();
 	cheatsInit();
-	func0000e9c0();
-	textInit();
 	playermgrInit();
 	frametimeInit();
-	profileInit();
 	smokesInit();
 	mpInit();
 	paksInit();
@@ -613,9 +607,7 @@ void mainTick(void)
 
 	if (g_MainChangeToStageNum < 0 && g_MainNumGfxTasks < 2) {
 		frametimeCalculate();
-		profile00009a98();
 		profileReset();
-		func000034d8();
 		joyDebugJoy();
 
 		if (g_MainGameLogicEnabled) {
@@ -647,8 +639,6 @@ void mainTick(void)
 
 			PROFILE(PROFILEMARKER_LVRENDER, gdl = lvRender(gdl));
 
-			func000034e0(&gdl);
-
 			profileEnd(PROFILEMARKER_CPU);
 
 #if PROFILING
@@ -668,8 +658,6 @@ void mainTick(void)
 
 		rdpCreateTask(gdlstart, gdl, 0, &msg);
 		g_MainNumGfxTasks++;
-		memaPrint();
-		func0f16cf94();
 	}
 }
 
@@ -735,8 +723,3 @@ void func0000e990(void)
 	objectivesDisableChecking();
 	mainEndStage();
 }
-
-void func0000e9c0(void)
-{
-	// empty
-}

src/lib/mema.c

@@ -204,11 +204,6 @@ void _memaFree(s32 addr, s32 size)
 	curr->size = size;
 }
 
-void memaInit(void)
-{
-	// empty
-}
-
 void memaReset(void *heapaddr, u32 heapsize)
 {
 	struct memaspace *space;
@@ -232,45 +227,6 @@ void memaReset(void *heapaddr, u32 heapsize)
 	g_MemaHeap.spaces[0].size = g_MemaHeapSize = heapsize;
 }
 
-/**
- * Example printout of figures:
- *
- *     Mem Info
- *     memp: MP_LF_LEV
- *      F: 0 722352
- *      S: 972080 3668704
- *      Over: 2946352
- *     memp: MP_LF_ETER
- *      F: 0 0
- *      S: 601728 0
- *     mema:
- *      LF: 391728
- *     Audio Free: 13184
- *
- * Where two figures are shown in one line, the left refers to onboard memory
- * and the right refers to expansion pak memory.
- *
- * F means free.
- * S means size.
- *
- * "Over" shows how much it's over 4MB, if they were to try to fit the game into
- * onboard memory only. This shows "Free" if under 4MB.
- *
- * The ETER (permanent) pool has 0 free space because it's shrunk to fit once
- * the permanent allocations are done during startup. This pool fits entirely
- * in onboard memory, so the expansion size is 0.
- */
-void memaPrint(void)
-{
-	s32 onboard;
-	s32 expansion;
-	s32 line = 1;
-	s32 over;
-	char buffer[124];
-
-	memaDefragPass(&g_MemaHeap);
-}
-
 extern u8 g_LvOom;
 
 void *memaAlloc(u32 size)
@@ -382,11 +338,6 @@ void memaFree(void *addr, s32 size)
 	_memaFree((u32)addr, size);
 }
 
-void mema00012cd4(void)
-{
-	// empty
-}
-
 /**
  * Find and return the largest amount of contiguous free space in the pool.
  * ie. the biggest allocation that mema can currently make.

src/lib/memp.c

@@ -53,11 +53,6 @@ struct memorypool {
 struct memorypool g_MempOnboardPools[9];
 struct memorypool g_MempExpansionPools[9];
 
-void mempInit(void)
-{
-	// empty
-}
-
 /**
  * Initialise memp by initialising the banks and pools.
  *
@@ -215,11 +210,6 @@ s32 mempRealloc(void *allocation, s32 newsize, u8 poolnum)
 	return 1;
 }
 
-void memp000124cc(void)
-{
-	// empty
-}
-
 /**
  * Return the amount of free space in the given pool and bank.
  */

src/lib/mp3.c

@@ -152,11 +152,6 @@ void func00037f5c(s32 arg0, bool arg1)
 	}
 }
 
-void func00037fa8(s32 arg0, s32 arg1)
-{
-	// empty
-}
-
 s32 func00037fc0(s32 arg0, Acmd **cmd)
 {
 	s32 i;

src/lib/profile.c

@@ -8,21 +8,6 @@
 
 #define NUM_SAMPLES 32
 
-void profileInit(void)
-{
-	// empty
-}
-
-void profileTick(void)
-{
-	// empty
-}
-
-void profile00009a98(void)
-{
-	// empty
-}
-
 #ifdef PROFILING
 // [x][x][0] is the current ticks tally (for multiple start + stops within one frame)
 // [x][x][1] is the start time
@@ -260,14 +245,4 @@ Gfx *profileRender(Gfx *gdl)
 
 	return gdl;
 }
-#else
-void profileReset(void)
-{
-	// empty
-}
-
-Gfx *profileRender(Gfx *gdl)
-{
-	return gdl;
-}
 #endif

src/lib/sched.c

@@ -241,7 +241,6 @@ void __scHandleRetrace(OSSched *sc)
 	}
 
 	joysTick();
-	snd0000fe18();
 }
 
 extern struct sndcache g_SndCache;
@@ -257,8 +256,6 @@ void __scHandleTasks(OSSched *sc)
 	OSScTask    *sp = 0;
 	OSScTask    *dp = 0;
 
-	profileTick();
-
 	/**
 	 * Read the task command queue and schedule tasks
 	 */

src/lib/snd.c

@@ -1415,11 +1415,6 @@ bool snd0000fbc4(s16 arg0)
 	return true;
 }
 
-void snd0000fc40(s32 arg0)
-{
-	// empty
-}
-
 bool seqPlay(struct seqinstance *seq, s32 tracknum)
 {
 	u32 stack;
@@ -1490,11 +1485,6 @@ void seqSetVolume(struct seqinstance *seq, u16 volume)
 	}
 }
 
-void snd0000fe18(void)
-{
-	// empty
-}
-
 void snd0000fe20(void)
 {
 	if (g_SndMp3Enabled) {
@@ -1509,11 +1499,6 @@ void snd0000fe50(void)
 	}
 }
 
-void snd0000fe80(void)
-{
-	// empty
-}
-
 void sndTick(void)
 {
 	struct sndstate *stateptrs[64];

src/lib/vi.c

@@ -814,23 +814,3 @@ Gfx *viSetFillColour(Gfx *gdl, s32 r, s32 g, s32 b)
 
 	return gdl;
 }
-
-void viGrabJpg16(void)
-{
-	// empty
-}
-
-void viGrabJpg32(void)
-{
-	// empty
-}
-
-void viGrabRgb16(void)
-{
-	// empty
-}
-
-void viGrabRgb32(void)
-{
-	// empty
-}