From 86feae85c118ec9c4e5d104eb0dc129d04c5248b Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 6 May 2023 22:28:50 +1000 Subject: [PATCH] Remove unused global variables --- src/game/bg.c | 5 - src/game/bgbss.c | 7 -- src/game/body.c | 1 - src/game/bodyreset.c | 2 - src/game/bondgrab.c | 4 - src/game/bondgun.c | 79 ------------- src/game/bondgunreset.c | 1 - src/game/bondview.c | 3 - src/game/bossfile.c | 1 - src/game/cheats.c | 37 ------ src/game/chr.c | 9 -- src/game/chraction.c | 11 -- src/game/credits.c | 13 -- src/game/dlights.c | 6 - src/game/dyntex.c | 12 -- src/game/env.c | 4 - src/game/explosions.c | 3 - src/game/file.c | 1 - src/game/filelist.c | 2 - src/game/filemgr.c | 1 - src/game/game_13c510.c | 3 - src/game/game_1531a0.c | 7 -- src/game/gfxmemory.c | 1 - src/game/gunfx.c | 6 - src/game/invitems.c | 93 --------------- src/game/lv.c | 8 -- src/game/menu.c | 4 - src/game/menuitem.c | 2 - src/game/modeldata/general.c | 15 --- src/game/modeldata/robot.c | 13 -- src/game/mplayer/mplayer.c | 11 -- src/game/music.c | 11 -- src/game/nbomb.c | 1 - src/game/objectives.c | 1 - src/game/options.c | 6 - src/game/pad.c | 2 - src/game/pak.c | 43 ------- src/game/player.c | 27 ----- src/game/portal.c | 1 - src/game/prop.c | 3 - src/game/propobj.c | 79 ------------- src/game/propobjbss.c | 5 - src/game/propsnd.c | 12 -- src/game/setup.c | 7 -- src/game/sky.c | 1 - src/game/smokeinit.c | 7 -- src/game/sparks.c | 8 -- src/game/splat.c | 2 - src/game/tex.c | 27 ----- src/game/texdecompress.c | 4 - src/game/title.c | 33 ------ src/game/trainingmenus.c | 37 ------ src/game/utils.c | 16 --- src/game/wallhit.c | 1 - src/game/weather.c | 1 - src/game/weatherreset.c | 3 - src/include/bss.h | 4 - src/include/data.h | 13 -- src/lib/audiomgr.c | 14 --- src/lib/boot.c | 7 -- src/lib/collision.c | 6 - src/lib/dma.c | 1 - src/lib/joy.c | 5 - src/lib/lib_2fc60.c | 3 - src/lib/main.c | 8 -- src/lib/model.c | 1 - src/lib/modelasm.s | 1 - src/lib/mp3/decoder.c | 216 ---------------------------------- src/lib/mp3/main.c | 1 - src/lib/naudio/n_drvrNew.c | 10 -- src/lib/naudio/n_sndplayer.c | 1 - src/lib/sched.c | 3 - src/lib/snd.c | 11 -- src/lib/tlb.s | 3 - src/lib/ultra/io/piacs.c | 1 - src/lib/ultra/io/pimgr.c | 1 - src/lib/ultra/io/siacs.c | 1 - src/lib/ultra/io/vimgr.c | 1 - src/lib/ultra/os/initialize.c | 3 - src/lib/vm.c | 3 - tools/ai2asm/ai2asm.py | 20 +--- 81 files changed, 5 insertions(+), 1036 deletions(-) diff --git a/src/game/bg.c b/src/game/bg.c index 3b87e615f..afe7ca3e4 100644 --- a/src/game/bg.c +++ b/src/game/bg.c @@ -88,7 +88,6 @@ s16 g_ActiveRoomNums[350]; s32 g_NumActiveRooms; u16 g_BgUnloadDelay240; u16 g_BgUnloadDelay240_2; -u32 var800a4bf4; s16 g_GlareRooms[100]; u32 *g_BgPrimaryData2; struct bgroom *g_BgRooms; @@ -113,8 +112,6 @@ u8 *var8007fc08 = NULL; s16 var8007fc0c = 0; s16 var8007fc10 = 0; s32 g_NumRoomsWithGlares = 0; -u32 var8007fc18 = 0x01000100; -u32 var8007fc1c = 0x00000000; s32 g_CamRoom = 0x00000001; struct var800a4640_00 *var8007fc24 = &var800a4640.unk2d0; s32 var8007fc28 = 0; @@ -653,8 +650,6 @@ Gfx *func0f158d9c(Gfx *gdl, struct xraydata *xraydata, s16 arg2[3], s16 arg3[3], } u32 var8007fc54 = 0; -bool g_BgCmdStack[20] = {0}; -s32 g_BgCmdStackIndex = 0; u32 g_BgCmdResult = BGRESULT_TRUE; Gfx *bg0f1598b4(Gfx *gdl, Gfx *gdl2, struct gfxvtx *vertices, s16 arg3[3]) diff --git a/src/game/bgbss.c b/src/game/bgbss.c index 00c033c13..f1eb3918b 100644 --- a/src/game/bgbss.c +++ b/src/game/bgbss.c @@ -5,17 +5,10 @@ f32 var800a6470[16 * 3]; -u32 var800a6530; -u32 var800a6534; struct var800a6538 var800a6538[16]; u32 g_BgRoomTestsDisabled; -u32 var800a65bc; struct screenbox var800a65c0; struct screenbox g_PortalScreenBbox; -u32 g_BgCmdThrowing; -s32 g_BgNumLightsChecksum; -s32 g_BgLightsOffsetChecksum; -u32 var800a65dc; u32 g_FogEnabled; u32 var800a65e4; struct coord *var800a65e8; diff --git a/src/game/body.c b/src/game/body.c index e0f8c5698..443012001 100644 --- a/src/game/body.c +++ b/src/game/body.c @@ -25,7 +25,6 @@ #include "types.h" s32 g_NumActiveHeadsPerGender; -u32 var8009cd24; u32 g_ActiveMaleHeads[8]; u32 g_ActiveFemaleHeads[8]; diff --git a/src/game/bodyreset.c b/src/game/bodyreset.c index 642cd11b3..52d9fa229 100644 --- a/src/game/bodyreset.c +++ b/src/game/bodyreset.c @@ -18,8 +18,6 @@ struct stageheadlimit g_StageHeadLimits[3] = { { STAGE_ESCAPE, 5 }, }; -u32 var80061708 = 0x00000000; -u32 var8006170c = 0x00000000; void bodiesReset(s32 stagenum) { diff --git a/src/game/bondgrab.c b/src/game/bondgrab.c index 1686cd65a..4ac7568f1 100644 --- a/src/game/bondgrab.c +++ b/src/game/bondgrab.c @@ -18,11 +18,7 @@ #include "types.h" struct prop *var8009de70; -u32 var8009de74; struct coord var8009de78; -u32 var8009de84; -u32 var8009de88; -u32 var8009de8c; bool var80070e80 = false; diff --git a/src/game/bondgun.c b/src/game/bondgun.c index 9db4b20a0..f427b249a 100644 --- a/src/game/bondgun.c +++ b/src/game/bondgun.c @@ -71,33 +71,14 @@ s32 var8009d0d8; s32 var8009d0dc; struct sndstate *g_BgunAudioHandles[4]; s32 var8009d0f0[3]; -u32 var8009d0fc; -u32 var8009d100; -u32 var8009d104; -u32 var8009d108; -u32 var8009d10c; -u32 var8009d110; -u32 var8009d114; -u32 var8009d118; -u32 var8009d11c; -u32 var8009d120; -u32 var8009d124; -u32 var8009d128; -u32 var8009d12c; -u32 var8009d130; -u32 var8009d134; -u32 var8009d138; -u32 var8009d13c; f32 var8009d140; struct hand *var8009d144; s32 var8009d148; -u32 var8009d14c; struct fireslot g_Fireslots[NUM_FIRESLOTS]; Lights1 var80070090 = gdSPDefLights1(0x96, 0x96, 0x96, 0xff, 0xff, 0xff, 0xb2, 0x4d, 0x2e); u32 var800700a8 = 0x00025800; -u32 var800700ac = 0x0001e000; u16 g_CartFileNums[] = { FILE_GCARTRIDGE, @@ -106,21 +87,6 @@ u16 g_CartFileNums[] = { FILE_GCARTSHELL, }; -u32 var800700b8 = 0x00000000; - -char var800700bc[][10] = { - { 'i','d','l','e' }, // "idle" - { 'p','r','e','p','a','r','e' }, // "prepare" - { 'c','a','n','t','u','s','e' }, // "cantuse" - { 'n','o','a','m','m','o' }, // "noammo" - { 'u','s','e','2' }, // "use2" - { 'c','h','a','n','g','e' }, // "change" - { 'u','p','g','r','a','d','e' }, // "upgrade" - { 'c','h','a','n','g','e','f','n' }, // "changefn" - { 'i','d','l','e','s','t','u','c','k' }, // "idlestuck" - { 'x','x','x' }, // "xxx" -}; - struct modelfiledata *g_GunModeldefs[0x5e]; // All weapon IDs struct modelfiledata *g_HandModeldefs[4]; // 4 players, or P1/P2/disguised/unused struct modelfiledata *g_CartModeldefs[4]; // 4 types of casings @@ -2070,8 +2036,6 @@ s32 bgunGetMinClipQty(s32 weaponnum, s32 funcnum) } -u32 var8007012c = 0x00000000; -u32 var80070130 = 0x00000000; bool bgunTickIncAttackingClose(s32 handnum, struct hand *hand) { @@ -3118,27 +3082,6 @@ void bgunUpdateBlend(struct hand *hand, s32 handnum) hand->dampup.z = hand->dampupsum.z * (PAL ? 0.01529997587204f : 0.012799978f); } -u32 var80070158 = 0x04e50764; -u32 var8007015c = 0x05360529; -u32 var80070160 = 0x0531052a; -u32 var80070164 = 0x052b052c; -u32 var80070168 = 0x052c052d; -u32 var8007016c = 0x052b052b; -u32 var80070170 = 0x052e052f; -u32 var80070174 = 0x052f0530; -u32 var80070178 = 0x05310532; -u32 var8007017c = 0x05320533; -u32 var80070180 = 0x05340535; -u32 var80070184 = 0x05360537; -u32 var80070188 = 0x05380530; -u32 var8007018c = 0x0539053a; -u32 var80070190 = 0x0532053b; -u32 var80070194 = 0x05310766; -u32 var80070198 = 0x07670768; -u32 var8007019c = 0x0769076a; -u32 var800701a0 = 0x076b076c; -u32 var800701a4 = 0x076d0000; -u32 var800701a8 = 0x0000ffff; void bgun0f09d8dc(f32 breathing, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { @@ -5860,11 +5803,6 @@ s32 bgunCreateModelCmdList(struct model *model, struct modelnode *nodearg, s32 * return len; } -u32 var800701ec = 0x00000000; -u32 var800701f0 = 0x00000000; -u32 var800701f4 = 0x00000000; -u32 var800701f8 = 0x00000000; -u32 var800701fc = 0x00000000; struct guncmd var80070200[2] = { { GUNCMD_PLAYANIMATION, 0, ANIM_0434, 10000 }, @@ -7541,23 +7479,6 @@ s32 bgunAllocateFireslot(void) return index; } -u32 var8007029c = 0x00000000; -u32 var800702a0 = 0x00000001; -u32 var800702a4 = 0x00000003; -u32 var800702a8 = 0x00000000; -u32 var800702ac = 0x00000000; -u32 var800702b0 = 0x00000000; -u32 var800702b4 = 0x00000000; -u32 var800702b8 = 0x00000000; -u32 var800702bc = 0x00000000; -u32 var800702c0 = 0x00000000; -u32 var800702c4 = 0x00000000; -u32 var800702c8 = 0x00000000; -u32 var800702cc = 0x00000000; -u32 var800702d0 = 0x00000000; -u32 var800702d4 = 0x00000000; -u32 var800702d8 = 0x00000000; -u32 var800702dc = 0x00000001; void bgunRender(Gfx **gdlptr) { diff --git a/src/game/bondgunreset.c b/src/game/bondgunreset.c index 431844fae..b256d3eeb 100644 --- a/src/game/bondgunreset.c +++ b/src/game/bondgunreset.c @@ -8,7 +8,6 @@ #include "data.h" #include "types.h" -extern u32 var800700ac; void bgunReset(void) { diff --git a/src/game/bondview.c b/src/game/bondview.c index d02a3e26a..04a643407 100644 --- a/src/game/bondview.c +++ b/src/game/bondview.c @@ -34,9 +34,6 @@ u8 var8007f844 = 0; u8 var8007f848 = 0; s32 g_IrBinocularRadius = PAL ? 102 : 90; s32 var8007f850 = 3; -u32 var8007f854 = 0x00000000; -u32 var8007f858 = 0xb8000000; -u32 var8007f85c = 0x00000000; Gfx *bviewDrawIrRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2) { diff --git a/src/game/bossfile.c b/src/game/bossfile.c index afe84b725..2e82cc0c0 100644 --- a/src/game/bossfile.c +++ b/src/game/bossfile.c @@ -19,7 +19,6 @@ #include "data.h" #include "types.h" -u8 var800a22d0[0x5b]; u8 g_AltTitleUnlocked; u8 g_AltTitleEnabled; diff --git a/src/game/cheats.c b/src/game/cheats.c index ef511d94b..001f1a2a6 100644 --- a/src/game/cheats.c +++ b/src/game/cheats.c @@ -344,43 +344,6 @@ s32 cheatMenuHandleDialog(s32 operation, struct menudialogdef *dialogdef, union return 0; } -struct menuitem g_CheatsWarningMenuItems[] = { - { - MENUITEMTYPE_LABEL, - 0, - 0, - L_MPMENU_479, // "If you activate any cheats, then you will be unable to progress further in the game while those cheats are active." - 0, - NULL, - }, - { - MENUITEMTYPE_SELECTABLE, - 0, - MENUITEMFLAG_SELECTABLE_CLOSESDIALOG | MENUITEMFLAG_SELECTABLE_CENTRE, - L_MPMENU_480, // "OK" - 0, - NULL, - }, - { - MENUITEMTYPE_SELECTABLE, - 0, - MENUITEMFLAG_SELECTABLE_CLOSESDIALOG | MENUITEMFLAG_SELECTABLE_CENTRE, - L_MPMENU_481, // "Cancel" - 0, - NULL, - }, - { MENUITEMTYPE_END }, -}; - -struct menudialogdef g_CheatsWarningMenuDialog = { - MENUDIALOGTYPE_SUCCESS, - L_MPMENU_478, // "Warning" - g_CheatsWarningMenuItems, - NULL, - 0, - NULL, -}; - /** * NTSC Beta uses g_StringPointer while newer versions use g_CheatMarqueeString. * diff --git a/src/game/chr.c b/src/game/chr.c index abd254e43..e18159dc0 100644 --- a/src/game/chr.c +++ b/src/game/chr.c @@ -49,16 +49,11 @@ #include "types.h" void *var8009ccc0[20]; -s32 g_NumChrs; s16 g_ChrIndexesByChrnum[240]; struct chrdata *g_CurModelChr; struct var80062960 *var80062960 = NULL; s32 var80062964 = 0; -s32 g_SelectedAnimNum = 0; -u32 var80062978 = 0x00000000; -u32 var8006297c = 0; -u32 var80062980 = 0; s32 g_NextChrnum = 200; struct chrdata *g_ChrSlots = NULL; @@ -2054,10 +2049,6 @@ void chrTickPoisoned(struct chrdata *chr) } f32 var800629e8 = 1; -u32 var800629ec = 0x00000000; -u32 var800629f0 = 0x00000000; -u32 var800629f4 = 0x00000000; -u32 var800629f8 = 0x00000000; bool chrTickBeams(struct prop *prop) { diff --git a/src/game/chraction.c b/src/game/chraction.c index 521cf98d3..dbc96870a 100644 --- a/src/game/chraction.c +++ b/src/game/chraction.c @@ -56,11 +56,6 @@ #include "types.h" s32 g_RecentQuipsPlayed[5]; -u32 var8009cd84; -u32 var8009cd88; -u32 var8009cd8c; -u32 var8009cd90; -u32 var8009cd94; u8 g_RecentQuipsIndex; f32 g_EnemyAccuracyScale = 1; @@ -1149,12 +1144,6 @@ struct attackanimconfig g_AttackAnimDualRun = { ANIM_006E, 0, 0, 0, 0, - struct attackanimconfig g_AttackAnimDualCrossedWalk = { ANIM_006D, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }; struct attackanimconfig g_AttackAnimDualCrossedRun = { ANIM_006F, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }; -struct attackanimconfig var80067c50[] = { - { ANIM_0057, 0, 0, 1.5707963705063, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }, - { ANIM_0056, 0, 0, 4.7123889923096, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }, - { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -}; - struct attackanimconfig var80067d28[] = { ANIM_SNIPING_GETDOWN, 0, 0, 0, 0, 236, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }; struct attackanimconfig var80067d70[] = { diff --git a/src/game/credits.c b/src/game/credits.c index 4441e56ea..207c04424 100644 --- a/src/game/credits.c +++ b/src/game/credits.c @@ -476,19 +476,6 @@ Gfx *creditsDrawBackground(Gfx *gdl) return gdl; } -u32 var8007f3dc = 0x00000000; -u32 var8007f3e0 = 0x00000000; -u32 var8007f3e4 = 0x00000000; -u32 var8007f3e8 = 0x00000001; -u32 var8007f3ec = 0x00000000; -u32 var8007f3f0 = 0x00000000; -u32 var8007f3f4 = 0x010301f4; -u32 var8007f3f8 = 0x008888ff; -u32 var8007f3fc = 0x00ff88ff; -u32 var8007f400 = 0x00ff8888; -u32 var8007f404 = 0x006666ff; -u32 var8007f408 = 0x41f00000; -u32 var8007f40c = 0x41f00000; u32 g_CreditColourPalette[][4] = { { 0x0000ffff, 0x0044ffff, 0x0088ffff, 0x00ffffff }, diff --git a/src/game/dlights.c b/src/game/dlights.c index 360048311..98c7c076f 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -31,7 +31,6 @@ s32 *var8009cad0; -u32 var8009cad4; s32 *var8009cad8; s32 g_NumPortals; s32 var8009cae0; @@ -44,7 +43,6 @@ u8 var8009caef; u8 var8009caf0; struct var80061420 *var80061420 = NULL; -u32 var80061424 = 0x00000000; struct coord *var80061428 = NULL; u16 **var8006142c = NULL; u16 **var80061430 = NULL; @@ -53,13 +51,9 @@ bool *var80061438 = NULL; f32 var8006143c = 50; u32 var80061440 = 0x00000000; u32 var80061444 = 1; -u32 var80061448 = 0x00000000; bool g_IsSwitchingGoggles = false; -u32 var80061450 = 0x00000000; -u32 var80061454 = 0xffffffff; s32 var80061458 = 0x00000000; -u32 var8006145c = 0x00000000; Lights1 var80061460 = gdSPDefLights1(0x96, 0x96, 0x96, 0xff, 0xff, 0xff, 0x4d, 0x4d, 0x2e); diff --git a/src/game/dyntex.c b/src/game/dyntex.c index a5e0be48b..8bac5e9d8 100644 --- a/src/game/dyntex.c +++ b/src/game/dyntex.c @@ -399,18 +399,6 @@ void dyntexReset(void) if (size1); } -u32 var8007f704 = 0x0000001d; -u32 var8007f708 = 0x0000004a; -u32 var8007f70c = 0x00000006; -u32 var8007f710 = 0x00000006; -u32 var8007f714 = 0x00000038; -u32 var8007f718 = 0x000003d5; -u32 var8007f71c = 0x00000018; -u32 var8007f720 = 0x00000018; -u32 var8007f724 = 0x00000034; -u32 var8007f728 = 0x000002f7; -u32 var8007f72c = 0x00000012; -u32 var8007f730 = 0x00000012; bool dyntexHasRoom(void) { diff --git a/src/game/env.c b/src/game/env.c index 8f01e8db2..3cd3ea3e6 100644 --- a/src/game/env.c +++ b/src/game/env.c @@ -9,7 +9,6 @@ #include "types.h" struct coord var800a65f0; -u32 var800a65fc; struct var800a6600 var800a6600; f32 var800a6618; @@ -21,11 +20,8 @@ struct envtype1 *g_EnvTransitionTo; f32 var80081050 = MAXFLOAT; f32 var80081054 = 0; struct environment g_Env = {900, 1000}; -u32 var800810a8 = 0; -u32 var800810ac = 0; // lensflare, r, g, b, x, y, z, texture size, orb size -struct sun suns_00[] = { 1, 0xff, 0xff, 0xff, -1000000, 200000, 50000, 20, 48 }; struct sun suns_area51[] = { 0, 0xff, 0xe0, 0x80, -200000, 310000, 1000000, 20, 48 }; struct sun suns_villa[] = { 1, 0xff, 0xff, 0xff, -1000000, 200000, 50000, 20, 48 }; struct sun suns_ci[] = { 1, 0xff, 0xff, 0xff, 400000, 600000, -1000000, 20, 48 }; diff --git a/src/game/explosions.c b/src/game/explosions.c index 3178ed8b9..dd987aa20 100644 --- a/src/game/explosions.c +++ b/src/game/explosions.c @@ -34,9 +34,6 @@ s32 g_MaxExplosions; s32 g_ExplosionShakeTotalTimer = 0; s32 g_ExplosionShakeIntensityTimer = 0; f32 g_ExplosionDamageTxScale = 1; -u32 var8007e4ac = 0x0000004b; -u32 var8007e4b0 = 0x000001e0; -u32 var8007e4b4 = 0x000000a8; struct explosiontype g_ExplosionTypes[NUM_EXPLOSIONTYPES] = { // rangeh diff --git a/src/game/file.c b/src/game/file.c index 0750559b3..f67393fba 100644 --- a/src/game/file.c +++ b/src/game/file.c @@ -2065,7 +2065,6 @@ extern void *_filenamesSegmentRomStart; struct fileinfo g_FileInfo[NUM_FILES]; -u32 var800aa570; u32 g_FileTable[] = { /*0x0000*/ 0, diff --git a/src/game/filelist.c b/src/game/filelist.c index c82bf0989..f871ff277 100644 --- a/src/game/filelist.c +++ b/src/game/filelist.c @@ -25,8 +25,6 @@ s32 var800a2330[5]; struct filelist *g_FileLists[] = { NULL, NULL, NULL, NULL }; bool var80075bd0[] = { true, true, true, true }; -bool var80075be0[] = { false, false, false, false }; -u32 var80075bf0 = false; void func0f110bf8(void) { diff --git a/src/game/filemgr.c b/src/game/filemgr.c index 9b5e475fc..5bb9a4528 100644 --- a/src/game/filemgr.c +++ b/src/game/filemgr.c @@ -28,7 +28,6 @@ struct fileguid g_FilemgrFileToDelete; s32 g_FilemgrLastPakError; struct gamefile g_GameFile; -u32 var800a22bc; struct fileguid g_GameFileGuid; // These might be able to be removed by relocating their symbols diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c index a2fa68fcf..6030aa488 100644 --- a/src/game/game_13c510.c +++ b/src/game/game_13c510.c @@ -18,9 +18,6 @@ #include "types.h" u8 *var800a41a0; -u32 var800a41a4; -u32 var800a41a8; -u32 var800a41ac; void artifactsClear(void) { diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index 8a2ef52ff..b3d4e7f3f 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -101,16 +101,9 @@ u16 var8007fb5c[] = { 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, }; -u16 var8007fb7c[] = { - 0xff00, 0xff00, 0xff00, 0xff00, 0xff00, 0xff00, 0xff00, 0xff00, - 0xff00, 0xff18, 0xff30, 0xff5c, 0xff88, 0xffb4, 0xffd8, 0xffff, -}; - bool var8007fb9c = false; s32 var8007fba0 = 0; s32 var8007fba4 = -1; -u32 var8007fba8 = 0x00000000; -u32 var8007fbb0 = 0x00000064; void textSetRotation90(bool rotated) { diff --git a/src/game/gfxmemory.c b/src/game/gfxmemory.c index 6b6b9baa9..034e7cc46 100644 --- a/src/game/gfxmemory.c +++ b/src/game/gfxmemory.c @@ -36,7 +36,6 @@ */ u8 *g_GfxBuffers[3]; -u32 var800aa58c; u8 *g_VtxBuffers[3]; u8 *g_GfxMemPos; u8 g_GfxActiveBufferIndex; diff --git a/src/game/gunfx.c b/src/game/gunfx.c index 4c8713385..5ac8a1f10 100644 --- a/src/game/gunfx.c +++ b/src/game/gunfx.c @@ -304,12 +304,6 @@ Gfx *beamRenderGeneric(Gfx *gdl, struct textureconfig *texconfig, return gdl; } -u32 var8007050c = 0x00000000; -u32 var80070510 = 0x00000000; -u32 var80070514 = 0x00000000; -u32 var80070518 = 0x00000000; -u32 var8007051c = 0x00000000; -u32 var80070520 = 0x00000000; Gfx *beamRender(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3) { diff --git a/src/game/invitems.c b/src/game/invitems.c index 9545bb59e..73f0ec98b 100644 --- a/src/game/invitems.c +++ b/src/game/invitems.c @@ -147,28 +147,6 @@ struct invaimsettings invaimsettings_heavy = { INVAIMFLAG_AUTOAIM | INVAIMFLAG_ACCURATESINGLESHOT, // flags }; -struct weaponfunc_shootsingle invfunc_00011160 = { - INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN_085, // name - 0, // unused - 0, // ammoindex - &invnoisesettings_default, - NULL, // fire animation - 0, // flags - &invrecoilsettings_default, - 0, // recoverytime60 - 1, // damage - 6, // spread - 6, 18, 2, 8, - 5, // recoildist - 2, // recoilangle - 0, // slidemax - 4, // impactforce - 4, // duration60 - SFX_8039, // shootsound - 1, // penetration -}; - struct inventory_ammo invammo_default = { AMMOTYPE_RIFLE, CASING_RIFLE, @@ -1171,11 +1149,6 @@ struct guncmd invanim_mauler_reload[] = { gunscript_end }; -struct guncmd invanim_unused_8007c0bc[] = { - gunscript_playanimation(ANIM_03F6, 0, 10000) - gunscript_end -}; - struct weaponfunc_shootsingle invfunc_mauler_singleshot = { INVENTORYFUNCTYPE_SHOOT_SINGLE, L_GUN_085, // name @@ -2186,11 +2159,6 @@ struct guncmd invanim_k7avenger_unequip[] = { gunscript_end }; -struct guncmd invanim_unused_8007ce6c[] = { - gunscript_playanimation(ANIM_00E8, 0, 10000) - gunscript_end -}; - struct invaimsettings invaimsettings_k7avenger = { 20, 3, @@ -2916,11 +2884,6 @@ struct weapon invitem_slayer = { WEAPONFLAG_AICANUSE | WEAPONFLAG_DUALFLIP | WEAPONFLAG_00000040 | WEAPONFLAG_TRACKTIMEUSED | WEAPONFLAG_00002000 | WEAPONFLAG_00004000 | WEAPONFLAG_HASHANDS | WEAPONFLAG_02000000, }; -struct gunviscmd gunviscmds_unused_8006d890[] = { - gunviscmd_sethidden(MODELPART_0029) - gunviscmd_end -}; - struct guncmd invanim_devastator_shoot[] = { gunscript_playanimation(ANIM_GUN_DEVASTATOR_SHOOT, 0, 10000) gunscript_end @@ -3315,33 +3278,6 @@ struct weapon invitem_ecmmine = { WEAPONFLAG_THROWABLE | WEAPONFLAG_ONEHANDED | WEAPONFLAG_AICANUSE | WEAPONFLAG_00000040 | WEAPONFLAG_00002000 | WEAPONFLAG_HASHANDS | WEAPONFLAG_DETERMINER_S_AN | WEAPONFLAG_DETERMINER_F_AN | WEAPONFLAG_UNDROPPABLE, }; -// Some unfinished Reaper-like gun. The name is "Timed Mine". The primary -// function is detonate (and it works). It can't shoot. -struct weapon invitem_unused_8007dd88 = { - FILE_GSKMINIGUN, // hi model - FILE_GSKMINIGUNLOD, // lo model - NULL, // equip animation - NULL, // unequip animation - NULL, // pritosec animation - NULL, // sectopri animation - { &invfunc_remotemine_detonate, NULL }, // functions - NULL, // pri ammo - NULL, // sec ammo - &invaimsettings_default, - 1, // muzzlez - 0, // posx - -39.5, // posy - -55.5, // posz - 1, // sway - NULL, // gunviscmds - NULL, // part visibility - L_GUN_038, // short name - L_GUN_038, // name - L_GUN_000, // manufacturer - L_GUN_000, // description - WEAPONFLAG_ONEHANDED | WEAPONFLAG_00000040 | WEAPONFLAG_UNDROPPABLE, -}; - struct gunviscmd gunviscmds_grenade[] = { gunviscmd_sethidden(MODELPART_0035) gunviscmd_end @@ -4622,11 +4558,6 @@ struct weaponfunc invfunc_briefcase_use = { 0, // flags }; -struct gunviscmd gunviscmds_unused_8006edcc[] = { - { 0, 0x001e, 0, 0x0002, 0x0001 }, - gunviscmd_end -}; - struct weapon invitem_briefcase2 = { FILE_GFALCON2LOD, // hi model FILE_GFALCON2LOD, // lo model @@ -4818,12 +4749,6 @@ struct guncmd invanim_combatknife_throw[] = { gunscript_end }; -struct guncmd invanim_unused_8007f05c[] = { - gunscript_playanimation(ANIM_041C, 0, 10000) - gunscript_waittime(22, 1) - gunscript_end -}; - struct guncmd invanim_combatknife_reload[] = { gunscript_include(2, invanim_combatknife_sectopri) gunscript_include(0, invanim_combatknife_pritosec) @@ -5448,11 +5373,6 @@ struct guncmd invanim_datauplink_unequip[] = { gunscript_end }; -struct guncmd invanim_unused_8007f794[] = { - gunscript_playanimation(ANIM_043B, 0, 10000) - gunscript_end -}; - struct weaponfunc_special invfunc_datauplink_primary = { INVENTORYFUNCTYPE_SPECIAL, L_GUN_141, // name @@ -5619,19 +5539,6 @@ struct weapon invitem_bolt = { 0, // flags }; -struct weaponfunc_special invfunc_unused_8006f9a4 = { - INVENTORYFUNCTYPE_SPECIAL, - L_GUN_144, // "Place Explosives" - 0, // unused - -1, // ammoindex - &invnoisesettings_silent, - NULL, // fire animation - FUNCFLAG_NOMUZZLEFLASH | FUNCFLAG_AUTOSWITCHUNSELECTABLE, - HANDATTACKTYPE_UPLINK, - 30, // recoverytime60 - 0, // soundnum (unused) -}; - struct weapon invitem_skedarbomb = { FILE_PSKEDARBOMB, // hi model FILE_PSKEDARBOMB, // lo model diff --git a/src/game/lv.c b/src/game/lv.c index f13976cb1..7c7610e22 100644 --- a/src/game/lv.c +++ b/src/game/lv.c @@ -100,14 +100,12 @@ #include "types.h" struct sndstate *g_MiscSfxAudioHandles[3]; -u32 var800aa5bc; s32 g_MiscSfxActiveTypes[3]; struct stagetableentry *g_CurrentStage; u32 var80084010 = 0; bool var80084014 = false; f32 var80084018 = 1; -u32 var8008401c = 0x00000001; s32 g_Difficulty = DIFF_A; @@ -1669,13 +1667,7 @@ Gfx *lvRender(Gfx *gdl) u32 g_CutsceneTime240_60 = 0; -u32 var800840a8 = 0; -u32 var800840ac = 0; -u32 var800840b0 = 0; -u32 var800840b4 = 0; -u32 var800840b8 = 0; -u32 var800840bc = 0; void lvResetSoloHandicaps(void) { diff --git a/src/game/menu.c b/src/game/menu.c index 56cd60646..0a879cee8 100644 --- a/src/game/menu.c +++ b/src/game/menu.c @@ -52,9 +52,7 @@ char g_CheatMarqueeString[252]; u8 *g_BlurBuffer; s32 var8009dfc0; -u32 var8009dfc4; struct briefing g_Briefing; -u32 var8009dfe4; struct missionconfig g_MissionConfig; struct menu g_Menus[4]; struct menudata g_MenuData; @@ -339,7 +337,6 @@ Gfx *menuRenderBanner(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, bool big, s32 ms return gdl; } -u32 var80071464 = 0; struct menudfc *func0f0f1338(struct menuitem *item) { @@ -3365,7 +3362,6 @@ Gfx *menuRenderDialogs(Gfx *gdl) return gdl; } -u32 var800714e8 = 0; void func0f0f8bb4(struct menu840 *arg0, u32 arg1, u32 arg2) { diff --git a/src/game/menuitem.c b/src/game/menuitem.c index b4690aea0..d1b98322d 100644 --- a/src/game/menuitem.c +++ b/src/game/menuitem.c @@ -30,8 +30,6 @@ s32 g_ScissorX2 = 0; s32 g_ScissorY1 = 0; s32 g_ScissorY2 = 0; -s32 var800711a0 = 0; -s32 var800711a4 = 0; s32 g_LineHeight = LINEHEIGHT; u8 g_KeyboardKeys[5][10] = { diff --git a/src/game/modeldata/general.c b/src/game/modeldata/general.c index 63354faee..0cd3157a1 100644 --- a/src/game/modeldata/general.c +++ b/src/game/modeldata/general.c @@ -1300,18 +1300,3 @@ s8 g_PropExplosionTypes[] = { 0xff, }; -u32 var8007bff8 = 0x00000000; -u32 var8007bffc = 0x00000000; -u32 var8007c000 = 0x00000000; -u32 var8007c004 = 0x00000000; -u32 var8007c008 = 0x00000000; -u32 var8007c00c = 0x00000000; -u32 var8007c010 = 0xf8f4f1e0; -u32 var8007c014 = 0x473f41dd; -u32 var8007c018 = 0xa510c9c6; -u32 var8007c01c = 0xbcae0bd1; -u32 var8007c020 = 0x0ff73a30; -u32 var8007c024 = 0x724083b7; -u32 var8007c028 = 0xffffffff; -u32 var8007c02c = 0xffffffff; -u32 var8007c030 = 0xffffffff; diff --git a/src/game/modeldata/robot.c b/src/game/modeldata/robot.c index c37972428..6521770c3 100644 --- a/src/game/modeldata/robot.c +++ b/src/game/modeldata/robot.c @@ -218,16 +218,3 @@ struct headorbody g_HeadsAndBodies[] = { { /*0x0096*/ 0, 0, 0, HEADBODYTYPE_FEMALE, 159, FILE_CDARK_NEGOTIATOR, 1, 0.95305162668228, 0, FILE_GHAND_JOAF1 }, { /*0x0097*/ 0, 0, 0, HEADBODYTYPE_DEFAULT, 0, 0, 1, 0, 0, FILE_GCOMBATHANDSLOD }, }; - -// [headnum][hattype] -struct hatposition var8007dae4[1][6] = { - { - // HEAD_SHAUN - { -0.070299997925758, 0.49189999699593, -0.83359998464584, 1.072811961174, 1.0883259773254, 0.92612099647522 }, - { -0.10000000149012, 0.42750000953674, -0.48249998688698, 1.0333679914474, 0.96552097797394, 0.92990499734879 }, - { 0.18000000715256, 0, 0, 1.0722140073776, 1, 1 }, - { 0.23700000345707, 0.97699999809265, -0.43999999761581, 1.1784629821777, 1.1406099796295, 1.1434650421143 }, - { -0.090300001204014, 0.23190000653267, 0.12639999389648, 0.99080002307892, 1.0199999809265, 0.84659999608994 }, - { 0, 0.14849999547005, 0.37929999828339, 1.1548000574112, 0.99190002679825, 0.95139998197556 }, - } -}; diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c index ab620e667..ba675a924 100644 --- a/src/game/mplayer/mplayer.c +++ b/src/game/mplayer/mplayer.c @@ -33,14 +33,12 @@ struct chrdata *g_MpAllChrPtrs[MAX_MPCHRS]; struct mpchrconfig *g_MpAllChrConfigPtrs[MAX_MPCHRS]; s32 g_MpNumChrs; -u32 var800ac534; struct mpbotconfig g_BotConfigsArray[MAX_BOTS]; u8 g_MpSimulantDifficultiesPerNumPlayers[MAX_BOTS][4]; struct mpplayerconfig g_PlayerConfigsArray[6]; u8 g_AmBotCommands[16]; struct mpsetup g_MpSetup; struct bossfile g_BossFile; -u32 var800acc1c; struct mplockinfo g_MpLockInfo; struct modelfiledata *var800acc28[18]; @@ -1496,15 +1494,6 @@ void mpCalculatePlayerTitle(struct mpplayerconfig *mpplayer) } -struct mphead g_MpBeauHeads[NUM_MPBEAUHEADS] = { - // head, require feature - { HEAD_BEAU2, 0 }, - { HEAD_BEAU3, 0 }, - { HEAD_BEAU4, 0 }, - { HEAD_BEAU5, 0 }, - { HEAD_BEAU6, 0 }, -}; - struct mphead g_MpHeads[NUM_MPHEADS] = { // head, require feature { /*0x00*/ HEAD_DARK_COMBAT, 0 }, diff --git a/src/game/music.c b/src/game/music.c index 0d2b2d34e..a3ff1e20a 100644 --- a/src/game/music.c +++ b/src/game/music.c @@ -42,17 +42,6 @@ s32 g_MusicAge60 = 0; // The current age of the MP track being playe s32 g_MusicLife60 = TICKS(120); // The max age of any MP track (this value is changed in MP code) s32 g_MusicSilenceTimer60 = 0; // Counts down the 2 second silence between MP track changes -char *var80084100[] = { - "null", - "leveltune", - "nrgtune,watchtune,mpdeathtune", - "ambience", - "NULL", - "playing", - "paused", -}; - - u16 musicGetVolume(void) { u32 volume; diff --git a/src/game/nbomb.c b/src/game/nbomb.c index 2a86c8bad..0a6d7de1d 100644 --- a/src/game/nbomb.c +++ b/src/game/nbomb.c @@ -27,7 +27,6 @@ s16 var8009cb00; s32 var8009cb04; struct nbomb g_Nbombs[6]; -u32 var8009cbf8; bool g_NbombsActive = false; f32 var80061644 = 100; diff --git a/src/game/objectives.c b/src/game/objectives.c index aa981b495..4f60777ff 100644 --- a/src/game/objectives.c +++ b/src/game/objectives.c @@ -29,7 +29,6 @@ struct tag *g_TagsLinkedList; struct briefingobj *g_BriefingObjs; struct criteria_holograph *g_HolographCriterias; s32 g_NumTags; -u32 var8009d0cc; bool g_ObjectivesDirty; bool g_AnyObjectiveFailed; diff --git a/src/game/options.c b/src/game/options.c index ac708ff99..60e93837a 100644 --- a/src/game/options.c +++ b/src/game/options.c @@ -10,12 +10,6 @@ u8 g_InGameSubtitles = 1; u8 g_CutsceneSubtitles = 0; -u32 var8007fa98 = 0x00000000; -u32 var8007fa9c = 0x00000001; -u32 var8007faa0 = 0x00000000; -u32 var8007faa4 = 0x00000001; -u32 var8007faa8 = 0x00000001; -u32 var8007faac = 0x00000001; s32 g_ScreenSize = SCREENSIZE_FULL; s32 g_ScreenRatio = SCREENRATIO_NORMAL; u8 g_ScreenSplit = SCREENSPLIT_HORIZONTAL; diff --git a/src/game/pad.c b/src/game/pad.c index f9ee23693..42a4f664b 100644 --- a/src/game/pad.c +++ b/src/game/pad.c @@ -7,8 +7,6 @@ struct padsfileheader *g_PadsFile; struct pad *g_Pads; -u32 var800a2358; -u32 var800a235c; u16 *g_CoverFlags; s32 *g_CoverRooms; struct covercandidate *g_CoverCandidates; diff --git a/src/game/pak.c b/src/game/pak.c index b7a1acbb8..53e0da039 100644 --- a/src/game/pak.c +++ b/src/game/pak.c @@ -131,57 +131,17 @@ const char g_N64FontCodeMap[] = "\0************** 0123456789ABCDEFGHIJKLMNOPQRST struct pak g_Paks[5]; -u32 var800a317c; - OSPfs g_Pfses[4]; -u32 var800a3320; -u32 var800a3324; -u32 var800a3328; -u32 var800a332c; -u32 var800a3330; -u32 var800a3334; -u32 var800a3338; -u32 var800a333c; -u32 var800a3340; -u32 var800a3344; -u32 var800a3348; -u32 var800a334c; -u32 var800a3350; -u32 var800a3354; -u32 var800a3358; -u32 var800a335c; -u32 var800a3360; -u32 var800a3364; -u32 var800a3368; -u32 var800a336c; -u32 var800a3370; -u32 var800a3374; -u32 var800a3378; -u32 var800a337c; -u32 var800a3380; -u32 var800a3384; // This is likely g_DebugCutsceneLabelPtrs and/or g_DebugCutsceneLabelBuffers // but with reduced lengths -u32 var800a3388; -u32 var800a338c; -u32 var800a3390; -u32 var800a3394; -u32 var800a3398; -u32 var800a339c; u16 var80075cb0 = ROM_COMPANYCODE; char var80075cb4[] = "PerfDark"; char var80075cc0[] = "PerfDark"; -u32 var80075ccc = 0x00000400; u32 g_PakHasEeprom = false; -u32 var80075cd4 = 0x00000000; -u32 var80075cd8 = 0x00000000; -u32 g_PakDebugForceCrc = 0; -u32 g_PakDebugForceScrub = 0; u32 g_PakDebugPakCache = 1; -u32 g_PakDebugPakInit = 0; char g_PakNoteGameName[] = { N64CHAR('P'), @@ -204,7 +164,6 @@ char g_PakNoteGameName[] = { char g_PakNoteExtName[] = {0, 0, 0, 0}; -u32 var80075d0c = 0x00000000; u8 var80075d10 = 0; bool var80075d14 = true; @@ -2703,8 +2662,6 @@ bool pak0f11ce00(s8 device, u16 arg1, char *arg2, s32 arg3, bool arg4) return result; } -u32 var80075d58 = 0x00000000; -u32 var80075d5c = 0x00000000; void pakRumble(s32 device, f32 numsecs, s32 onduration, s32 offduration) { diff --git a/src/game/player.c b/src/game/player.c index 5e04d1c08..a13be075e 100644 --- a/src/game/player.c +++ b/src/game/player.c @@ -84,7 +84,6 @@ f32 g_WarpType3Height; f32 g_WarpType3MoreHeight; u32 g_WarpType3Pad; s32 g_WarpType2HasDirection; -u32 g_WarpType2Arg2; s32 g_CutsceneCurAnimFrame60; s32 g_CutsceneCurAnimFrame240; @@ -96,7 +95,6 @@ bool g_CutsceneSkipRequested; f32 g_CutsceneCurTotalFrame60f; s32 var8009de2c; f32 g_CutsceneBarFrac; // 0 when bars across the top and bottom, 1 when fullscreen -u32 var8009de34; s16 g_SpawnPoints[MAX_SPAWNPOINTS]; s32 g_NumSpawnPoints; @@ -121,32 +119,7 @@ struct vimode g_ViModes[] = { { 400, 300, 400, 1, 2, 300, 0, 300, 0, 300, 0 }, // unused }; -u32 var800706d0 = 0x00000000; -u32 var800706d4 = 0x00000000; -u32 var800706d8 = 0x00000000; -u32 var800706dc = 0x00000000; -u32 var800706e0 = 0x00000000; -u32 var800706e4 = 0xbf800000; -u32 var800706e8 = 0x00000000; -u32 var800706ec = 0x3f800000; -u32 var800706f0 = 0x00000000; -u32 var800706f4 = 0x00000000; -u32 var800706f8 = 0x3f800000; -u32 var800706fc = 0x00000000; -u32 var80070700 = 0x00000000; -u32 var80070704 = 0x3f800000; -u32 var80070708 = 0x00000000; -u32 var8007070c = 0x00000000; -u32 var80070710 = 0x00000000; -u32 var80070714 = 0x00000000; -u32 var80070718 = 0x00000000; -u32 var8007071c = 0x00000000; -u32 var80070720 = 0x00000000; -u32 var80070724 = 0x00000000; -u32 var80070728 = 0x3f800000; s32 var8007072c = 1; -u32 var80070730 = 0xffffffff; -u32 var80070734 = 0xffffffff; u32 var80070738 = 0; u32 var8007073c = 0; struct gecreditsdata *g_CurrentGeCreditsData = NULL; diff --git a/src/game/portal.c b/src/game/portal.c index bb270a0a7..147b55f78 100644 --- a/src/game/portal.c +++ b/src/game/portal.c @@ -61,7 +61,6 @@ struct roomacousticdata *g_RoomAcousticData; -u32 var8009dd74; struct var8009dd78 var8009dd78[10]; u16 *g_PortalXluFracs; s32 g_NumPortalXluFracs; diff --git a/src/game/prop.c b/src/game/prop.c index 5d3a952dc..8a74c07a0 100644 --- a/src/game/prop.c +++ b/src/game/prop.c @@ -45,9 +45,6 @@ struct prop *g_InteractProp; s32 var8009cdac; s32 var8009cdb0; -u32 var8009cdb4; -u32 var8009cdb8; -u32 var8009cdbc; f32 g_AutoAimScale = 1; diff --git a/src/game/propobj.c b/src/game/propobj.c index 8b61db0dc..261679290 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -8865,7 +8865,6 @@ void autogunTickShoot(struct prop *autogunprop) } } -u32 var80069cc0 = 0x00000000; void chopperInitMatrices(struct prop *prop) { @@ -11058,84 +11057,6 @@ u32 g_TvCmdlist1D[] = { tvcmd_restart(), }; -u32 var8006a4dc[] = { - tvcmd_settexture(52), - tvcmd_setcolour(0xffffffff, 1), - tvcmd_pause(5), - tvcmd_settexture(53), - tvcmd_pause(5), - tvcmd_settexture(54), - tvcmd_pause(5), - tvcmd_settexture(55), - tvcmd_pause(5), - tvcmd_restart(), -}; - -u32 var8006a52c[] = { - tvcmd_settexture(79), - tvcmd_setcolour(0xffffffff, 1), - tvcmd_pause(5), - tvcmd_settexture(80), - tvcmd_pause(5), - tvcmd_settexture(81), - tvcmd_pause(5), - tvcmd_settexture(82), - tvcmd_pause(5), - tvcmd_restart(), -}; - -u32 var8006a57c[] = { - tvcmd_settexture(56), - tvcmd_setcolour(0xffffffff, 1), - tvcmd_pause(10), - tvcmd_settexture(57), - tvcmd_pause(10), - tvcmd_settexture(58), - tvcmd_pause(10), - tvcmd_settexture(59), - tvcmd_pause(10), - tvcmd_restart(), -}; - -u32 var8006a5cc[] = { - tvcmd_settexture(60), - tvcmd_setcolour(0xffffffff, 1), - tvcmd_pause(15), - tvcmd_settexture(61), - tvcmd_pause(15), - tvcmd_restart(), -}; - -u32 var8006a5fc[] = { - tvcmd_settexture(62), - tvcmd_setcolour(0xffffffff, 1), - tvcmd_pause(10), - tvcmd_settexture(63), - tvcmd_pause(10), - tvcmd_settexture(64), - tvcmd_pause(10), - tvcmd_settexture(65), - tvcmd_pause(10), - tvcmd_settexture(66), - tvcmd_pause(10), - tvcmd_restart(), -}; - -u32 var8006a65c[] = { - tvcmd_settexture(67), - tvcmd_setcolour(0xffffffff, 1), - tvcmd_pause(10), - tvcmd_settexture(68), - tvcmd_pause(10), - tvcmd_settexture(69), - tvcmd_pause(10), - tvcmd_settexture(70), - tvcmd_pause(10), - tvcmd_settexture(71), - tvcmd_pause(10), - tvcmd_restart(), -}; - u32 g_TvCmdlist25[] = { tvcmd_settexture(83), tvcmd_setcolour(0xffffffff, 1), diff --git a/src/game/propobjbss.c b/src/game/propobjbss.c index 955886560..b1fe369d3 100644 --- a/src/game/propobjbss.c +++ b/src/game/propobjbss.c @@ -6,12 +6,7 @@ struct model *g_EmbedModel; struct modelnode *g_EmbedNode; struct coord var8009ce78; -u32 var8009ce84; struct coord var8009ce88; -u32 var8009ce94; struct tvscreen var8009ce98; -u32 var8009cf0c; struct tvscreen var8009cf10; -u32 var8009cf84; struct tvscreen var8009cf88; -u32 var8009cffc[12]; diff --git a/src/game/propsnd.c b/src/game/propsnd.c index 3b51543e5..42f6e7488 100644 --- a/src/game/propsnd.c +++ b/src/game/propsnd.c @@ -21,22 +21,10 @@ struct audiochannel *g_AudioChannels = NULL; u32 g_AudioPrevUuid = 0x00000000; -s8 var8006ae18 = 0; -s8 var8006ae1c = 0; -s8 var8006ae20 = 0; -s8 var8006ae24 = 0; -s8 var8006ae28 = 0; u32 var8006ae2c = 0x00000000; -u32 var8006ae30 = 0x00000000; u32 var8006ae34 = 0x00000000; -u32 var8006ae38 = 0x00000000; -u32 var8006ae40 = 0x00000000; -bool var8006ae44 = false; -u32 var8006ae48 = 0x00000001; -u32 var8006ae4c = 0x00000000; s16 var8006ae50 = -1; -u32 var8006ae54 = 0x000003e7; bool func0f092610(struct prop *prop, s32 arg1) { diff --git a/src/game/setup.c b/src/game/setup.c index dd2994055..783c22575 100644 --- a/src/game/setup.c +++ b/src/game/setup.c @@ -39,9 +39,6 @@ #include "types.h" s32 var8009cc30; -u32 var8009cc34; -u32 var8009cc38; -u32 var8009cc3c; struct tvscreen var80061a80 = { g_TvCmdlist00, // cmdlist @@ -169,11 +166,7 @@ struct tvscreen var80061b68 = { 0, // colinc }; -u32 var80061bdc = 0x00000000; f32 g_DoorScale = 1; -u32 var80061be4 = 0x00000000; -u32 var80061be8 = 0x00000000; -u32 var80061bec = 0x00000000; void propsReset(void) { diff --git a/src/game/sky.c b/src/game/sky.c index 69bb52c1a..7dc532831 100644 --- a/src/game/sky.c +++ b/src/game/sky.c @@ -21,7 +21,6 @@ u32 g_SkyStageNum; bool g_SkyLightningActive; Mtxf var800a33a8; struct coord g_SunPositions[3]; // relative to centre screen, with a huge scale -u32 var800a340c; f32 g_SunScreenXPositions[4]; f32 g_SunScreenYPositions[4]; diff --git a/src/game/smokeinit.c b/src/game/smokeinit.c index 66dddada1..61ec322c8 100644 --- a/src/game/smokeinit.c +++ b/src/game/smokeinit.c @@ -8,13 +8,6 @@ // These three gfx arrays probably don't belong here, // but there's no obvious place for them to live. -Gfx var80061360[] = { - gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), - gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_OFF), - gsSPSetGeometryMode(G_SHADE | G_SHADING_SMOOTH), - gsSPEndDisplayList(), -}; - Gfx var80061380[] = { gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_OFF), diff --git a/src/game/sparks.c b/src/game/sparks.c index 6fa0f51d5..0882da2f3 100644 --- a/src/game/sparks.c +++ b/src/game/sparks.c @@ -16,16 +16,8 @@ struct spark g_Sparks[100]; s32 g_NextSparkIndex; -u32 var800a3fc4; struct sparkgroup g_SparkGroups[10]; s32 g_NextSparkGroupIndex; -u32 var800a4134; -u32 var800a4138; -u32 var800a413c; -u32 var800a4140; -u32 var800a4144; -u32 var800a4148; -u32 var800a414c; struct sparktype g_SparkTypes[] = { // weight diff --git a/src/game/splat.c b/src/game/splat.c index 63f51ecd9..f2458fe03 100644 --- a/src/game/splat.c +++ b/src/game/splat.c @@ -36,9 +36,7 @@ struct splatdata { }; f32 var8007f8a0 = 0.15; -f32 var8007f8a4 = 3; f32 var8007f8a8 = 12; -s32 var8007f8ac = 8; f32 g_SplatMaxDistance = 180; f32 var8007f8b4 = 5; f32 var8007f8b8 = 50; diff --git a/src/game/tex.c b/src/game/tex.c index f45bd7e41..f52ba0139 100644 --- a/src/game/tex.c +++ b/src/game/tex.c @@ -10,7 +10,6 @@ #include "types.h" s32 g_TexLutMode; -u32 var800ab5b4; struct var800ab5b8 var800ab5b8[8]; struct var800ab718 var800ab718[8]; @@ -149,33 +148,7 @@ struct surfacetype *g_SurfaceTypes[] = { /*14*/ &g_SurfaceTypeDeepWater, }; -char *var80084494[] = { - "default", - "stone", - "wood", - "metal", - "glass", - "shallow water", - "snow", - "dirt", - "mud", - "tile", - "metalobj", - "chr", - "glass xlu", - "no hit", - "deep water", -}; - - bool var800844d0 = false; -u32 var800844d4 = 0x00000000; -u32 var800844d8 = 0x00000000; -u32 var800844dc = 0x00000000; -u32 var800844e0 = 0x00000103; -u32 var800844e4 = 0x00000000; -u32 var800844e8 = 0x00000000; -u32 var800844ec = 0x00000000; void tex0f173a08(void) { diff --git a/src/game/texdecompress.c b/src/game/texdecompress.c index fc13a8e89..7bee25c49 100644 --- a/src/game/texdecompress.c +++ b/src/game/texdecompress.c @@ -11,7 +11,6 @@ #include "types.h" struct texture *g_Textures; -u32 var800aabc4; struct texpool g_TexSharedPool; struct texcacheitem g_TexCacheItems[150]; s32 g_TexCacheCount; @@ -19,7 +18,6 @@ s32 g_TexNumToLoad; u8 *var800ab540; u32 var800ab544; s32 var800ab548; -u32 var800ab54c; u32 g_TexBase; u8 *g_TextureConfigSegment; s32 g_TexNumConfigs; @@ -45,8 +43,6 @@ struct textureconfig *g_TexSparkConfigs; struct textureconfig *g_TexGeneralConfigs; struct textureconfig *g_TexRadarConfigs; -u32 var800841b0 = 0x0006ddd0; -u32 var800841b4 = 0x00000000; // The number of channels, excluding 1-bit alpha channels. s32 g_TexFormatNumChannels[] = { 4, 3, 3, 3, 2, 2, 1, 1, 1, 1, 1, 1, 1 }; diff --git a/src/game/title.c b/src/game/title.c index beaaaac6f..a63f77d09 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -31,7 +31,6 @@ #include "string.h" u8 *var8009cca0; -u32 var8009cca4; struct gfxvtx *var8009cca8[2]; u32 *var8009ccb0[2]; u32 var8009ccb8; @@ -45,9 +44,6 @@ s32 g_TitleNextMode = -1; u32 g_TitleDelayedTimer = 2; s32 g_TitleDelayedMode = -1; s32 g_TitleTimer = 0; -u32 var800624c8 = 0x00000000; -u32 var800624cc = 0x00000000; -u32 var800624d0 = 0x00000000; u32 var800624d4 = 0x00000000; u32 var800624d8 = 0x00000000; u32 var800624dc = 0x00000000; @@ -59,40 +55,17 @@ u32 var800624f0 = 0x00000000; s32 var800624f4 = 1; struct model *g_TitleModel = NULL; struct model *g_TitleModelNLogo2 = NULL; -u32 var80062500 = 0x00000000; -u32 var80062504 = 0x00000000; struct model *g_TitleModelPdTwo = NULL; struct model *g_TitleModelPdThree = NULL; -u32 var80062510 = 0x00000000; -u32 var80062514 = 0x00000000; -u32 var80062518 = 0x96969600; -u32 var8006251c = 0x96969600; -u32 var80062520 = 0xffffff00; -u32 var80062524 = 0xffffff00; -u32 var80062528 = 0x4d4d2e00; -u32 var8006252c = 0x00000000; Lights1 var80062530 = gdSPDefLights1(0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); -Lights1 var80062548 = gdSPDefLights1(0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); Lights1 var80062560 = gdSPDefLights1(0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); Lights1 var80062578 = gdSPDefLights1(0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x7f); Lights1 var80062590 = gdSPDefLights1(0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); Lights1 var800625a8 = gdSPDefLights1(0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x7f); -u32 var800625c0 = 0x00000000; -u32 var800625c4 = 0x00000000; -u32 var800625c8 = 0xffffff00; -u32 var800625cc = 0xffffff00; -u32 var800625d0 = 0x00007f00; -u32 var800625d4 = 0x00000000; -u32 var800625d8 = 0x00000000; -u32 var800625dc = 0x00000000; -u32 var800625e0 = 0xffffff00; -u32 var800625e4 = 0xffffff00; -u32 var800625e8 = 0x00007f00; -u32 var800625ec = 0x00000000; char *mpPlayerGetWeaponOfChoiceName(u32 playernum, u32 slot) { @@ -1179,7 +1152,6 @@ Gfx *titleRenderPdLogo(Gfx *gdl) return gdl; } -struct sndstate *g_TitleAudioHandle = NULL; void titleInitNintendoLogo(void) { @@ -1589,11 +1561,6 @@ Gfx *titleRenderRareLogo(Gfx *gdl) } s32 g_NumPlayers = 0; -u32 var80062928 = 0x00000000; -u32 var8006292c = 0x00000001; -u32 var80062930 = 0x00000001; -u32 var80062934 = 0x00000001; -u32 var80062938 = 0x00000000; s32 getNumPlayers(void) { diff --git a/src/game/trainingmenus.c b/src/game/trainingmenus.c index 494097fa1..a46883c9a 100644 --- a/src/game/trainingmenus.c +++ b/src/game/trainingmenus.c @@ -1311,43 +1311,6 @@ struct menudialogdef g_BioListMenuDialog = { NULL, }; -struct menuitem g_NowSafeMenuItems[] = { - { - MENUITEMTYPE_LABEL, - 0, - MENUITEMFLAG_SELECTABLE_CENTRE, - L_MPMENU_437, // "It is now safe to turn off your computer." - 0, - NULL, - }, - { - MENUITEMTYPE_SEPARATOR, - 0, - 0, - 0, - 0, - NULL, - }, - { - MENUITEMTYPE_SELECTABLE, - 0, - MENUITEMFLAG_SELECTABLE_CLOSESDIALOG, - L_MPMENU_438, // "Cancel" - 0, - NULL, - }, - { MENUITEMTYPE_END }, -}; - -struct menudialogdef g_NowSafeMenuDialog = { - MENUDIALOGTYPE_DEFAULT, - L_MPMENU_436, // "Cheats" - g_NowSafeMenuItems, - NULL, - MENUDIALOGFLAG_DISABLERESIZE, - NULL, -}; - s32 ciCharacterProfileMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { u32 bodynum = ciGetChrBioBodynumBySlot(g_ChrBioSlot); diff --git a/src/game/utils.c b/src/game/utils.c index c156756eb..fdab28fd9 100644 --- a/src/game/utils.c +++ b/src/game/utils.c @@ -9,31 +9,15 @@ void *var800ac0d0; -u32 var800ac0d4; -u32 var800ac0d8; -u32 var800ac0dc; -u32 var800ac0e0; -u32 var800ac0e4; u8 *var800ac0e8[4]; u32 var800ac0f8[4]; -f32 var800845d0 = 999999; f32 var800845d4 = 0.00001f; -s32 var800845d8 = 1; struct coord var800845dc = {0, 0, 0}; -u32 var800845e8 = 0x00000000; -u32 var800845ec = 0x3f800000; -u32 var800845f0 = 0x00000000; struct coord var800845f4 = {0, 0, 1}; -u32 var80084600 = 0x3f800000; -u32 var80084604 = 0x00000000; -u32 var80084608 = 0x00000000; -u32 var8008460c = 0xffffffff; u8 *var80084610 = NULL; u8 *var80084614 = NULL; u8 *var80084618 = NULL; -u32 var8008461c = 0x00000004; -u32 var80084620 = 0x00000000; u32 align4(u32 arg0) { diff --git a/src/game/wallhit.c b/src/game/wallhit.c index 89eab85b4..926233b19 100644 --- a/src/game/wallhit.c +++ b/src/game/wallhit.c @@ -36,7 +36,6 @@ s32 var8007f740 = 0; u8 g_WallhitBloodColour[4] = {0x40, 0x0a, 0x0a, 0x00}; f32 var8007f748 = 1; f32 var8007f74c = 1; -u32 var8007f750 = 0; f32 var8007f754 = 0; f32 var8007f758 = 0; diff --git a/src/game/weather.c b/src/game/weather.c index f4124a673..308e8f79e 100644 --- a/src/game/weather.c +++ b/src/game/weather.c @@ -256,7 +256,6 @@ void weatherSetIntensity(s32 intensity) g_WeatherData->intensity = intensity; } -u32 g_SnowSpeedExtra; void weatherTickRain(struct weatherdata *weather) { \ diff --git a/src/game/weatherreset.c b/src/game/weatherreset.c index 3bba7cc86..cfa0c3e56 100644 --- a/src/game/weatherreset.c +++ b/src/game/weatherreset.c @@ -7,9 +7,6 @@ #include "types.h" s32 g_WeatherActive = false; -u32 var800623f4 = 0x00000000; -u32 var800623f8 = 0x00000000; -u32 var800623fc = 0x00000000; void weatherReset(void) { diff --git a/src/include/bss.h b/src/include/bss.h index 3fa4dd900..19cb0065c 100644 --- a/src/include/bss.h +++ b/src/include/bss.h @@ -86,7 +86,6 @@ extern Mtx *var8009cc84; extern Mtx *var8009cc88; extern u8 *var8009cca0; extern void *var8009ccc0[20]; -extern s32 g_NumChrs; extern s16 *g_Chrnums; extern s16 *g_ChrIndexes; extern s32 g_NumActiveHeadsPerGender; @@ -226,9 +225,6 @@ extern struct var800a6538 var800a6538[16]; extern u32 g_BgRoomTestsDisabled; extern struct screenbox var800a65c0; extern struct screenbox g_PortalScreenBbox; -extern u32 g_BgCmdThrowing; -extern s32 g_BgNumLightsChecksum; -extern s32 g_BgLightsOffsetChecksum; extern u32 g_FogEnabled; extern u32 var800a65e4; extern struct coord *var800a65e8; diff --git a/src/include/data.h b/src/include/data.h index ac087dea0..9b83a215d 100644 --- a/src/include/data.h +++ b/src/include/data.h @@ -97,7 +97,6 @@ extern bool g_ModelDistanceDisabled; extern f32 g_ModelDistanceScale; extern bool var8005efbc; extern f32 var8005efc0; -extern u8 var8005efb0_2; extern u32 var8005efd0; extern bool var8005efd8_2; extern bool var8005efdc; @@ -149,7 +148,6 @@ extern OSViMode osViModeMpalLan1; extern OSViMode osViModeNtscLan1; extern char ldigs[]; extern char udigs[]; -extern Gfx var80061360[]; extern Gfx var80061380[]; extern Gfx var800613a0[]; extern f32 g_20SecIntervalFrac; @@ -181,10 +179,7 @@ extern bool g_WeatherTickEnabled; extern struct var80062960 *var80062960; extern f32 var80062968; extern bool var8006296c; -extern s32 g_SelectedAnimNum; extern u32 var80062974; -extern u32 var80062978; -extern u32 var8006297c; extern s32 g_NextChrnum; extern s16 g_ChrIndexesByChrnum[240]; extern struct chrdata *g_ChrSlots; @@ -210,7 +205,6 @@ extern f32 g_EnemyAccuracyScale; extern f32 g_PlayerDamageRxScale; extern f32 g_PlayerDamageTxScale; extern f32 g_AttackWalkDurationScale; -extern s32 g_NumChrsSeenPlayerRecently2; extern struct animtablerow g_DeathAnimsHumanGun[]; extern struct animtablerow g_AnimTableHumanSlumped[]; extern struct animtable *g_AnimTablesByRace[]; @@ -280,18 +274,12 @@ extern u32 g_TvCmdlist00[]; extern u32 var8006aaa0[]; extern u32 var8006aae4[]; extern struct audiochannel *g_AudioChannels; -extern s8 var8006ae18; -extern s8 var8006ae1c; -extern s8 var8006ae20; -extern s8 var8006ae24; -extern s8 var8006ae28; extern s32 g_ObjectiveLastIndex; extern bool g_ObjectiveChecksDisabled; extern u16 var8006ae90[]; extern u16 var8006af0c[]; extern u16 var8006af8c[]; extern struct weapon *g_Weapons[]; -extern u32 var800700ac; extern bool g_CasingsActive; extern s32 g_MaxModels; extern s32 g_MaxAnims; @@ -445,7 +433,6 @@ extern struct skeleton g_SkelDrCaroll; extern struct skeleton g_Skel22; extern struct skeleton g_SkelRobot; extern struct headorbody g_HeadsAndBodies[]; -extern struct hatposition var8007dae4[1][6]; extern f32 g_SkyCloudOffset; extern f32 g_SkyWindSpeed; extern f32 g_SunAlphaFracs[]; diff --git a/src/lib/audiomgr.c b/src/lib/audiomgr.c index 998ae0821..c508566ac 100644 --- a/src/lib/audiomgr.c +++ b/src/lib/audiomgr.c @@ -10,26 +10,12 @@ #include "data.h" #include "types.h" -u32 var80091560; -u32 var80091564; u64 var80091568; u64 var80091570; u64 var80091578; u64 var80091580; u64 var80091588; u64 var80091590; -u32 var80091598; -u32 var8009159c; -u32 var800915a0; -u32 var800915a4; -u32 var800915a8; -u32 var800915ac; -u32 var800915b0; -u32 var800915b4; -u32 var800915b8; -u32 var800915bc; -u32 var800915c0; -u32 var800915c4; AMAudioMgr g_AudioManager; OSScClient var800918d0; u32 var800918dc; diff --git a/src/lib/boot.c b/src/lib/boot.c index d2967ac33..a01cbff3f 100644 --- a/src/lib/boot.c +++ b/src/lib/boot.c @@ -20,19 +20,12 @@ OSThread g_MainThread; OSThread g_SchedThread; OSMesgQueue g_SchedMesgQueue; OSMesg var8008db48[32]; -u32 var8008dbcc; OSScClient var8008dca8; u32 g_OsMemSize; -u32 var8005ce00 = 0; -u32 var8005ce04 = 0; -u32 var8005ce08 = 0; -u32 var8005ce0c = 0; u8 *g_StackLeftAddrs[7] = {0}; u8 *g_StackRightAddrs[7] = {0}; u8 *g_StackAllocatedPos = (u8 *) K0BASE + 4 * 1024 * 1024 - FRAMEBUFFER_SIZE; -u32 var8005ce4c = 0x00000002; -u32 var8005ce50 = 0x10000000; extern OSSched g_Sched; diff --git a/src/lib/collision.c b/src/lib/collision.c index 557ea60ee..f29b7fa21 100644 --- a/src/lib/collision.c +++ b/src/lib/collision.c @@ -30,23 +30,17 @@ s32 var8009a8ac; f32 var8009a8b0; s32 var8009a8b4; struct coord g_CdEdgeVtx1; -s32 var8009a8c4; struct coord g_CdEdgeVtx2; struct prop *g_CdObstacleProp; s32 var8009a8d8; -s32 var8009a8dc; struct coord g_CdObstaclePos; s32 var8009a8ec; f32 var8009a8f0; bool g_CdHasSavedPos; struct coord g_CdPos1; -s32 var8009a904; struct coord g_CdPos2; -s32 var8009a914; struct geoblock g_CdSavedBlock; struct geo *g_CdObstacleGeo; -s32 var8009a968; -s32 var8009a96c; s32 var8005f030 = 0; bool g_CdHasSavedBlock = false; diff --git a/src/lib/dma.c b/src/lib/dma.c index 889c143af..9297d7958 100644 --- a/src/lib/dma.c +++ b/src/lib/dma.c @@ -6,7 +6,6 @@ #include "types.h" volatile u32 g_DmaNumSlotsBusy; -u32 var80094ae4; OSIoMesg g_DmaIoMsgs[32]; volatile u8 g_DmaSlotsBusy[32]; OSMesg g_DmaMesgs[32]; diff --git a/src/lib/joy.c b/src/lib/joy.c index 99285614c..ee5eb9c30 100644 --- a/src/lib/joy.c +++ b/src/lib/joy.c @@ -45,8 +45,6 @@ OSMesg var80099f18[2]; OSMesgQueue g_JoyStartCyclicPollingDoneMesgQueue; OSContStatus var80099f38[4]; u8 g_JoyPfsStates[100]; -u32 var80099fac; -u32 var80099fb0; bool g_JoyBusy = false; u32 var8005ee68 = 0; @@ -58,11 +56,8 @@ bool g_JoyNeedsInit = true; u32 g_JoyCyclicPollDisableCount = 0; u32 var8005eec0 = 1; s32 g_JoyNextPfsStateIndex = 0; -s32 var8005eed0 = 0; -u32 var8005eed4 = 0; -u8 var8005eed8 = 0; bool var8005eedc = true; s32 var8005eee0 = 0; diff --git a/src/lib/lib_2fc60.c b/src/lib/lib_2fc60.c index 8b1d7d807..11b5adf2f 100644 --- a/src/lib/lib_2fc60.c +++ b/src/lib/lib_2fc60.c @@ -34,10 +34,7 @@ typedef struct oscData_s { } oscData; oscData *freeOscStateList; -u32 var8009b874; oscData oscStates[60]; -u32 var8009c2c8; -u32 var8009c2cc; N_ALSndPlayer var8009c2d0; ALMicroTime updateOsc(void *oscState, f32 *updateVal); diff --git a/src/lib/main.c b/src/lib/main.c index 88866fe03..c41b3dd77 100644 --- a/src/lib/main.c +++ b/src/lib/main.c @@ -71,8 +71,6 @@ extern u8 g_LvStatsPage; bool var8005d9b0 = false; s32 g_StageNum = STAGE_TITLE; u32 g_MainMemaHeapSize = 1024 * 300; -bool var8005d9bc = false; -s32 var8005d9c0 = 0; s32 var8005d9c4 = 0; u32 g_MainNumGfxTasks = 0; bool g_MainIsEndscreen = false; @@ -372,12 +370,6 @@ void mainInit(void) var8005dd18 = 0; } -u32 var8005dd3c = 0x00000000; -u32 var8005dd40 = 0x00000000; -u32 var8005dd44 = 0x00000000; -u32 var8005dd48 = 0x00000000; -u32 var8005dd4c = 0x00000000; -u32 var8005dd50 = 0x00000000; s32 g_MainChangeToStageNum = -1; bool g_MainIsDebugMenuOpen = false; diff --git a/src/lib/model.c b/src/lib/model.c index ae545f04c..181b1071c 100644 --- a/src/lib/model.c +++ b/src/lib/model.c @@ -18,7 +18,6 @@ #include "data.h" #include "types.h" -u32 var8005efb0 = 0; bool g_ModelDistanceDisabled = false; f32 g_ModelDistanceScale = 1; diff --git a/src/lib/modelasm.s b/src/lib/modelasm.s index 1f6c52ca4..349ca4793 100644 --- a/src/lib/modelasm.s +++ b/src/lib/modelasm.s @@ -27,7 +27,6 @@ glabel var8005ef5c glabel var8005ef7c .word 0x00000000 -glabel var8005ef80 .word model00019be0+0x84 .word model00019be0+0x90 .word model00019be0+0xa8 diff --git a/src/lib/mp3/decoder.c b/src/lib/mp3/decoder.c index 81f62eb01..754ac3abe 100644 --- a/src/lib/mp3/decoder.c +++ b/src/lib/mp3/decoder.c @@ -1857,222 +1857,6 @@ const u32 var70059754[2][4] = { { 44100, 48000, 32000, 44100 }, }; -const u32 var70059774[] = {0xbd03ba34}; -const u32 var70059778[] = {0x3dd41398}; -const u32 var7005977c[] = {0xbe3aec8d}; -const u32 var70059780[] = {0x3e8890b4}; -const u32 var70059784[] = {0xbeb50508}; -const u32 var70059788[] = {0x3ee17918}; -const u32 var7005978c[] = {0xbf0649c3}; -const u32 var70059790[] = {0x3f1a8273}; -const u32 var70059794[] = {0xbf2cc954}; -const u32 var70059798[] = {0x3f3c902e}; -const u32 var7005979c[] = {0xbf495c64}; -const u32 var700597a0[] = {0x3f52ca58}; -const u32 var700597a4[] = {0xbf5890a3}; -const u32 var700597a8[] = {0x3f5a8284}; -const u32 var700597ac[] = {0xbf5890a3}; -const u32 var700597b0[] = {0x3f52ca47}; -const u32 var700597b4[] = {0xbf495c64}; -const u32 var700597b8[] = {0x3f3c902e}; -const u32 var700597bc[] = {0xbf2cc954}; -const u32 var700597c0[] = {0x3f1a8273}; -const u32 var700597c4[] = {0xbf0649d4}; -const u32 var700597c8[] = {0x3ee1793a}; -const u32 var700597cc[] = {0xbeb504e6}; -const u32 var700597d0[] = {0x3e8890b4}; -const u32 var700597d4[] = {0xbe3aecd0}; -const u32 var700597d8[] = {0x3dd41398}; -const u32 var700597dc[] = {0xbd03ba34}; -const u32 var700597e0[] = {0xbcf168f9}; -const u32 var700597e4[] = {0x3da2bb66}; -const u32 var700597e8[] = {0xbdee2b06}; -const u32 var700597ec[] = {0x3e0e2ef5}; -const u32 var700597f0[] = {0xbe15f5f1}; -const u32 var700597f4[] = {0x3e0e2ef5}; -const u32 var700597f8[] = {0xbdee2b06}; -const u32 var700597fc[] = {0x3da2bb66}; -const u32 var70059800[] = {0xbcf168f9}; -const u32 var70059804[] = {0xbd03ba34}; -const u32 var70059808[] = {0x3dd41398}; -const u32 var7005980c[] = {0xbe3aec8d}; -const u32 var70059810[] = {0x3e8890b4}; -const u32 var70059814[] = {0xbeb50508}; -const u32 var70059818[] = {0x3ee17918}; -const u32 var7005981c[] = {0xbf0649c3}; -const u32 var70059820[] = {0x3f1a8273}; -const u32 var70059824[] = {0xbf2cc954}; -const u32 var70059828[] = {0x3f3c902e}; -const u32 var7005982c[] = {0xbf495c64}; -const u32 var70059830[] = {0x3f52ca58}; -const u32 var70059834[] = {0xbf5890a3}; -const u32 var70059838[] = {0x3f5a8284}; -const u32 var7005983c[] = {0xbf5890a3}; -const u32 var70059840[] = {0x3f52ca47}; -const u32 var70059844[] = {0xbf495c64}; -const u32 var70059848[] = {0x3f3c902e}; -const u32 var7005984c[] = {0xbf2cf377}; -const u32 var70059850[] = {0x3f1bd7c3}; -const u32 var70059854[] = {0xbf098c7e}; -const u32 var70059858[] = {0x3eec6a5d}; -const u32 var7005985c[] = {0xbec3ef07}; -const u32 var70059860[] = {0x3e99f623}; -const u32 var70059864[] = {0xbe5bbcf5}; -const u32 var70059868[] = {0x3df6f7e4}; -const u32 var7005986c[] = {0xbd0dbf05}; -const u32 var70059870[] = {0xbcd987c6}; -const u32 var70059874[] = {0x3d4c985f}; -const u32 var70059878[] = {0xbce76ea4}; -const u32 var7005987c[] = {0x00000000}; -const u32 var70059880[] = {0x00000000}; -const u32 var70059884[] = {0x00000000}; -const u32 var70059888[] = {0x00000000}; -const u32 var7005988c[] = {0x00000000}; -const u32 var70059890[] = {0x00000000}; -const u32 var70059894[] = {0xbdd41398}; -const u32 var70059898[] = {0x3eb50508}; -const u32 var7005989c[] = {0xbf1a8273}; -const u32 var700598a0[] = {0x3f495c64}; -const u32 var700598a4[] = {0xbf5a8284}; -const u32 var700598a8[] = {0x3f495c64}; -const u32 var700598ac[] = {0xbf1a8273}; -const u32 var700598b0[] = {0x3eb504e6}; -const u32 var700598b4[] = {0xbdd41398}; -const u32 var700598b8[] = {0xbda2bb66}; -const u32 var700598bc[] = {0x3e15f5f1}; -const u32 var700598c0[] = {0xbda2bb66}; -const u32 var700598c4[] = {0x00000000}; -const u32 var700598c8[] = {0x00000000}; -const u32 var700598cc[] = {0x00000000}; -const u32 var700598d0[] = {0x00000000}; -const u32 var700598d4[] = {0x00000000}; -const u32 var700598d8[] = {0x00000000}; -const u32 var700598dc[] = {0x00000000}; -const u32 var700598e0[] = {0x00000000}; -const u32 var700598e4[] = {0x00000000}; -const u32 var700598e8[] = {0x00000000}; -const u32 var700598ec[] = {0x00000000}; -const u32 var700598f0[] = {0x00000000}; -const u32 var700598f4[] = {0x00000000}; -const u32 var700598f8[] = {0x00000000}; -const u32 var700598fc[] = {0x00000000}; -const u32 var70059900[] = {0x00000000}; -const u32 var70059904[] = {0x00000000}; -const u32 var70059908[] = {0x00000000}; -const u32 var7005990c[] = {0x00000000}; -const u32 var70059910[] = {0x00000000}; -const u32 var70059914[] = {0x00000000}; -const u32 var70059918[] = {0x00000000}; -const u32 var7005991c[] = {0x00000000}; -const u32 var70059920[] = {0x00000000}; -const u32 var70059924[] = {0x00000000}; -const u32 var70059928[] = {0x00000000}; -const u32 var7005992c[] = {0x00000000}; -const u32 var70059930[] = {0x00000000}; -const u32 var70059934[] = {0x00000000}; -const u32 var70059938[] = {0x00000000}; -const u32 var7005993c[] = {0xbe027d89}; -const u32 var70059940[] = {0x3ec24207}; -const u32 var70059944[] = {0xbf1bb1d1}; -const u32 var70059948[] = {0x3f4ae7b4}; -const u32 var7005994c[] = {0xbf6a7d67}; -const u32 var70059950[] = {0x3f77cb2e}; -const u32 var70059954[] = {0xbf7426cc}; -const u32 var70059958[] = {0x3f6c8366}; -const u32 var7005995c[] = {0xbf631327}; -const u32 var70059960[] = {0x3f57e879}; -const u32 var70059964[] = {0xbf4b192f}; -const u32 var70059968[] = {0x3f3cbe2f}; -const u32 var7005996c[] = {0xbf2cc954}; -const u32 var70059970[] = {0x3f1a8273}; -const u32 var70059974[] = {0xbf0649d4}; -const u32 var70059978[] = {0x3ee1793a}; -const u32 var7005997c[] = {0xbeb504e6}; -const u32 var70059980[] = {0x3e8890b4}; -const u32 var70059984[] = {0xbe3aecd0}; -const u32 var70059988[] = {0x3dd41398}; -const u32 var7005998c[] = {0xbd03ba34}; -const u32 var70059990[] = {0xbcf168f9}; -const u32 var70059994[] = {0x3da2bb66}; -const u32 var70059998[] = {0xbdee2b06}; -const u32 var7005999c[] = {0x3e0e2ef5}; -const u32 var700599a0[] = {0xbe15f5f1}; -const u32 var700599a4[] = {0x3e0e2ef5}; -const u32 var700599a8[] = {0xbdee2b06}; -const u32 var700599ac[] = {0x3da2bb66}; -const u32 var700599b0[] = {0xbcf168f9}; -const u32 var700599b4[] = {0xbe327e95}; -const u32 var700599b8[] = {0xbf0483ed}; -const u32 var700599bc[] = {0xbf586174}; -const u32 var700599c0[] = {0xbf92d5e9}; -const u32 var700599c4[] = {0xbfb504f7}; -const u32 var700599c8[] = {0xbfd1b3f2}; -const u32 var700599cc[] = {0xbfe803cd}; -const u32 var700599d0[] = {0xbff746ed}; -const u32 var700599d4[] = {0xbfff069a}; -const u32 var700599d8[] = {0x3e327e95}; -const u32 var700599dc[] = {0x3f0483ed}; -const u32 var700599e0[] = {0x3f586174}; -const u32 var700599e4[] = {0x3f92d5e9}; -const u32 var700599e8[] = {0x3fb504f7}; -const u32 var700599ec[] = {0x3fd1b3f2}; -const u32 var700599f0[] = {0x3fe803cd}; -const u32 var700599f4[] = {0x3ff746ed}; -const u32 var700599f8[] = {0x3fff069a}; -const u32 var700599fc[] = {0xbe327e95}; -const u32 var70059a00[] = {0xbf0483ed}; -const u32 var70059a04[] = {0xbf586174}; -const u32 var70059a08[] = {0xbf92d5e9}; -const u32 var70059a0c[] = {0xbfb504f7}; -const u32 var70059a10[] = {0xbfd1b3f2}; -const u32 var70059a14[] = {0xbfe803cd}; -const u32 var70059a18[] = {0xbff746ed}; -const u32 var70059a1c[] = {0xbfff069a}; -const u32 var70059a20[] = {0x3e327e95}; -const u32 var70059a24[] = {0x3f0483ed}; -const u32 var70059a28[] = {0x3f586174}; -const u32 var70059a2c[] = {0x3f92d5e9}; -const u32 var70059a30[] = {0x3fb504f7}; -const u32 var70059a34[] = {0x3fd1b3f2}; -const u32 var70059a38[] = {0x3fe803cd}; -const u32 var70059a3c[] = {0x3ff746ed}; -const u32 var70059a40[] = {0x3fff069a}; -const u32 var70059a44[] = {0xbf0483ed}; -const u32 var70059a48[] = {0xbfb504d5}; -const u32 var70059a4c[] = {0xbff746dc}; -const u32 var70059a50[] = {0x3f0483ed}; -const u32 var70059a54[] = {0x3fb504d5}; -const u32 var70059a58[] = {0x3ff746dc}; -const u32 var70059a5c[] = {0x00000000}; -const u32 var70059a60[] = {0x00000000}; -const u32 var70059a64[] = {0x00000000}; -const u32 var70059a68[] = {0x00000000}; -const u32 var70059a6c[] = {0x00000000}; -const u32 var70059a70[] = {0x00000000}; -const u32 var70059a74[] = {0x00000000}; -const u32 var70059a78[] = {0x00000000}; -const u32 var70059a7c[] = {0x00000000}; -const u32 var70059a80[] = {0x00000000}; -const u32 var70059a84[] = {0x00000000}; -const u32 var70059a88[] = {0x00000000}; -const u32 var70059a8c[] = {0xbe327e95}; -const u32 var70059a90[] = {0xbf0483ed}; -const u32 var70059a94[] = {0xbf586174}; -const u32 var70059a98[] = {0xbf92d5e9}; -const u32 var70059a9c[] = {0xbfb504f7}; -const u32 var70059aa0[] = {0xbfd1b3f2}; -const u32 var70059aa4[] = {0xbfe803cd}; -const u32 var70059aa8[] = {0xbff746ed}; -const u32 var70059aac[] = {0xbfff069a}; -const u32 var70059ab0[] = {0x3e327e95}; -const u32 var70059ab4[] = {0x3f0483ed}; -const u32 var70059ab8[] = {0x3f586174}; -const u32 var70059abc[] = {0x3f92d5e9}; -const u32 var70059ac0[] = {0x3fb504f7}; -const u32 var70059ac4[] = {0x3fd1b3f2}; -const u32 var70059ac8[] = {0x3fe803cd}; -const u32 var70059acc[] = {0x3ff746ed}; -const u32 var70059ad0[] = {0x3fff069a}; extern struct mp3decfourbytes *var8009c650[]; extern f32 *var8009c6d8; diff --git a/src/lib/mp3/main.c b/src/lib/mp3/main.c index 479087509..bfe6f4a1e 100644 --- a/src/lib/mp3/main.c +++ b/src/lib/mp3/main.c @@ -16,7 +16,6 @@ struct mp3decfourbytes var8009c650[34]; f32 *var8009c6d8; f32 *var8009c6dc; -u32 var8005f700 = 0; u32 var8005f704 = 0; s32 mp3main00043dd0(struct asistream *stream) diff --git a/src/lib/naudio/n_drvrNew.c b/src/lib/naudio/n_drvrNew.c index 89b497d59..40ef6a059 100644 --- a/src/lib/naudio/n_drvrNew.c +++ b/src/lib/naudio/n_drvrNew.c @@ -17,16 +17,6 @@ f32 atan2f(f32 x, f32 z); #endif -s32 SMALLROOM_PARAMS_N[26] = { - /* sections length */ - 3, 55 ms, - /* chorus chorus filter - input output fbcoef ffcoef gain rate depth coef */ - 0 ms, 29.6 ms, 9830, -9830, 0, 0, 0, 0, - 10.4 ms, 20.8 ms, 3276, -3276, 0x3fff, 0, 0, 0, - 0 ms, 33 ms, 5000, 0, 0, 0, 0, 0x5000, -}; - s32 BIGROOM_PARAMS_N[10] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/src/lib/naudio/n_sndplayer.c b/src/lib/naudio/n_sndplayer.c index 95cf186c3..25f5a03db 100644 --- a/src/lib/naudio/n_sndplayer.c +++ b/src/lib/naudio/n_sndplayer.c @@ -8,7 +8,6 @@ #include "data.h" #include "types.h" -u32 var8009c330; s16 *var8009c334; struct sndstate *g_SndpAllocStatesHead = NULL; diff --git a/src/lib/sched.c b/src/lib/sched.c index f093476ca..65826aec2 100644 --- a/src/lib/sched.c +++ b/src/lib/sched.c @@ -31,7 +31,6 @@ OSViMode var8008dd68[2]; u32 var8008de08; s32 var8008de0c; s32 var8008de10; -u32 var8008de14; OSTimer g_SchedRspTimer; u8 g_ScBottleneck = ' '; @@ -43,8 +42,6 @@ s32 g_ViUnblackTimer = 3; s32 g_ViShakeDirection = 1; s32 g_ViShakeIntensity = 0; s32 g_ViShakeTimer = 0; -u32 var8005cea0 = 0; -u32 var8005cea4 = 0; bool g_SchedIsFirstTask = true; static void __scExec(OSSched *sc, OSScTask *t) diff --git a/src/lib/snd.c b/src/lib/snd.c index bead13fcb..6a317bca7 100644 --- a/src/lib/snd.c +++ b/src/lib/snd.c @@ -37,7 +37,6 @@ struct curmp3 { s32 g_NumSounds; u32 *g_ALSoundRomOffsets; s32 g_SndMaxFxBusses; -u32 var80094eac; struct curmp3 g_SndCurMp3; struct seqinstance g_SeqInstances[3]; ALHeap g_SndHeap; @@ -50,7 +49,6 @@ ALIGNED16 struct sndcache g_SndCache; const char g_SndGuardString[] = "RUSSES SOUND GUARD STRING"; bool g_SndDisabled = false; -u32 var8005dda4 = 0x00000000; s32 g_SndNosediveVolume = 0; s32 g_SndNosediveAge240 = -1; @@ -69,7 +67,6 @@ bool g_SndMp3Enabled = false; s32 var8005ddd4 = 0; s32 var8005ddd8 = 0; -s32 var8005dddc = 0; u8 *g_SndGuardStringPtr = NULL; @@ -655,14 +652,6 @@ struct audioconfig g_AudioConfigs[] = { { /*63*/ 400, 1000, 1200, -1, 100, -1, 0, 0 }, }; -u32 var8005ecd8 = 0x00000000; -u32 var8005ecdc = 0x00000000; -u32 var8005ece0 = 0x00000000; -u32 var8005ece4 = 0x00000000; -u32 var8005ece8 = 0x00000000; -u32 var8005ecec = 0x00000000; -u32 var8005ecf0 = 0x00000000; -u32 var8005ecf4 = 0x00000000; s16 var8005ecf8[] = { 0x6665, diff --git a/src/lib/tlb.s b/src/lib/tlb.s index 237666371..94414ee28 100644 --- a/src/lib/tlb.s +++ b/src/lib/tlb.s @@ -8,7 +8,6 @@ .bss .balign 4 -glabel var8008ae20 .space 4 glabel g_VmStateTable @@ -29,10 +28,8 @@ glabel var8008ae38 glabel var8008be38 .space 0x1400 -glabel var8008d238 .space 0x20 -glabel var8008d258 .space 4 glabel var8008d25c diff --git a/src/lib/ultra/io/piacs.c b/src/lib/ultra/io/piacs.c index 380574f7c..c1dced341 100644 --- a/src/lib/ultra/io/piacs.c +++ b/src/lib/ultra/io/piacs.c @@ -1,7 +1,6 @@ #include OSMesg piAccessBuf; -u32 var8009c7a4; OSMesgQueue __osPiAccessQueue; u32 __osPiAccessQueueEnabled = 0; diff --git a/src/lib/ultra/io/pimgr.c b/src/lib/ultra/io/pimgr.c index ad6af29e8..07935b52e 100644 --- a/src/lib/ultra/io/pimgr.c +++ b/src/lib/ultra/io/pimgr.c @@ -12,7 +12,6 @@ s32 osPiRawStartDma(s32 direction, u32 devAddr, void *dramAddr, u32 size); s32 osEPiRawStartDma(OSPiHandle *handle, s32 direction, u32 devAddr, void *dramAddr, u32 size); OSDevMgr __osPiDevMgr = {0}; -OSPiHandle *__osPiTable = NULL; OSPiHandle *__osCurrentHandle[2] = { &CartRomHandle, &LeoDiskHandle }; void osCreatePiManager(OSPri pri, OSMesgQueue *cmdQ, OSMesg *cmdBuf, s32 cmdMsgCnt) diff --git a/src/lib/ultra/io/siacs.c b/src/lib/ultra/io/siacs.c index 09f10862e..f982a5cba 100644 --- a/src/lib/ultra/io/siacs.c +++ b/src/lib/ultra/io/siacs.c @@ -1,7 +1,6 @@ #include OSMesg siAccessBuf; -u32 var8009c7c4; OSMesgQueue __osSiAccessQueue; u32 __osSiAccessQueueEnabled = 0; diff --git a/src/lib/ultra/io/vimgr.c b/src/lib/ultra/io/vimgr.c index f91d42468..dcf9828d6 100644 --- a/src/lib/ultra/io/vimgr.c +++ b/src/lib/ultra/io/vimgr.c @@ -10,7 +10,6 @@ OSThread viThread; char viThreadStack[512]; OSMesgQueue viEventQueue; OSMesg viEventBuf[5]; -u32 var8009025c; OSIoMesg viRetraceMsg; OSIoMesg viCounterMsg; diff --git a/src/lib/ultra/os/initialize.c b/src/lib/ultra/os/initialize.c index e03c78848..4cf1605ef 100644 --- a/src/lib/ultra/os/initialize.c +++ b/src/lib/ultra/os/initialize.c @@ -24,9 +24,6 @@ s32 osViClock = VI_NTSC_CLOCK; u32 _osShutdown = 0; u32 __osGlobalIntMask = OS_IM_ALL; -u32 var8005cf74 = 0; -u32 var8005cf78 = 0; -u32 var8005cf7c = 0; void osInitialize(void) { diff --git a/src/lib/vm.c b/src/lib/vm.c index 2a019a881..d9fa8c5be 100644 --- a/src/lib/vm.c +++ b/src/lib/vm.c @@ -74,16 +74,13 @@ u8 *g_VmMarker; u32 g_VmRamEnd; u32 g_VmStateTableEnd; -u32 var8005cf80 = 0; s32 g_VmNumPages = 0; -u32 var8005cf88 = 0; extern u8 _gameSegmentStart; extern u8 _gameSegmentEnd; extern u8 _gamezipSegmentRomStart; -extern u32 var8008ae20; extern u32 *g_VmStateTable; extern u8 g_VmInitialised; extern u32 g_VmZipBuffer; diff --git a/tools/ai2asm/ai2asm.py b/tools/ai2asm/ai2asm.py index 1057af4ff..75d503335 100755 --- a/tools/ai2asm/ai2asm.py +++ b/tools/ai2asm/ai2asm.py @@ -326,25 +326,15 @@ class App(): def ai_configure_environment(self, params): if params[2] == 0: - self.emit('li', ['$v0', params[3]]) - self.emit('lui', ['$a0', '%hi(var8006ae18)']) - self.emit('sb', ['$v0', '%lo(var8006ae18)($a0)']) + pass elif params[2] == 1: - self.emit('li', ['$v0', params[3]]) - self.emit('lui', ['$a0', '%hi(var8006ae1c)']) - self.emit('sb', ['$v0', '%lo(var8006ae1c)($a0)']) + pass elif params[2] == 2: - self.emit('li', ['$v0', params[3]]) - self.emit('lui', ['$a0', '%hi(var8006ae20)']) - self.emit('sb', ['$v0', '%lo(var8006ae20)($a0)']) + pass elif params[2] == 3: - self.emit('li', ['$v0', params[3]]) - self.emit('lui', ['$a0', '%hi(var8006ae24)']) - self.emit('sb', ['$v0', '%lo(var8006ae24)($a0)']) + pass elif params[2] == 4: - self.emit('li', ['$v0', params[3]]) - self.emit('lui', ['$a0', '%hi(var8006ae28)']) - self.emit('sb', ['$v0', '%lo(var8006ae28)($a0)']) + pass elif params[2] == 5: self.emit('li', ['$a0', '0x%04x' % self.u16(params, 0)]) self.emit('li', ['$a1', '0x4000'])