From 5c21de55e65b31ffd3f0abca6940f1e37e9869e8 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 11 Nov 2022 23:23:38 +1000 Subject: [PATCH] Remove stub files --- ld/gamefiles.ntsc-final.inc | 20 ---------------- src/game/file.c | 6 +---- src/game/lv.c | 6 ----- src/game/stubs/game_000840.c | 10 -------- src/game/stubs/game_000850.c | 11 --------- src/game/stubs/game_000860.c | 11 --------- src/game/stubs/game_000870.c | 11 --------- src/game/stubs/game_0008e0.c | 11 --------- src/game/stubs/game_0008f0.c | 11 --------- src/game/stubs/game_000900.c | 11 --------- src/game/stubs/game_000910.c | 11 --------- src/game/stubs/game_00b180.c | 6 ----- src/game/stubs/game_00b200.c | 10 -------- src/game/stubs/game_013540.c | 10 -------- src/game/stubs/game_015260.c | 11 --------- src/game/stubs/game_015270.c | 11 --------- src/game/stubs/game_0153f0.c | 10 -------- src/game/stubs/game_015400.c | 11 --------- src/game/stubs/game_015410.c | 11 --------- src/game/stubs/game_102230.c | 10 -------- src/game/stubs/game_11eff0.c | 10 -------- src/game/stubs/game_175f50.c | 26 --------------------- src/game/stubs/game_176000.c | 45 ------------------------------------ src/lib/main.c | 12 ---------- 24 files changed, 1 insertion(+), 301 deletions(-) delete mode 100644 src/game/stubs/game_000840.c delete mode 100644 src/game/stubs/game_000850.c delete mode 100644 src/game/stubs/game_000860.c delete mode 100644 src/game/stubs/game_000870.c delete mode 100644 src/game/stubs/game_0008e0.c delete mode 100644 src/game/stubs/game_0008f0.c delete mode 100644 src/game/stubs/game_000900.c delete mode 100644 src/game/stubs/game_000910.c delete mode 100644 src/game/stubs/game_00b180.c delete mode 100644 src/game/stubs/game_00b200.c delete mode 100644 src/game/stubs/game_013540.c delete mode 100644 src/game/stubs/game_015260.c delete mode 100644 src/game/stubs/game_015270.c delete mode 100644 src/game/stubs/game_0153f0.c delete mode 100644 src/game/stubs/game_015400.c delete mode 100644 src/game/stubs/game_015410.c delete mode 100644 src/game/stubs/game_102230.c delete mode 100644 src/game/stubs/game_11eff0.c delete mode 100644 src/game/stubs/game_175f50.c delete mode 100644 src/game/stubs/game_176000.c diff --git a/ld/gamefiles.ntsc-final.inc b/ld/gamefiles.ntsc-final.inc index dbcdc3cde..767e994d3 100644 --- a/ld/gamefiles.ntsc-final.inc +++ b/ld/gamefiles.ntsc-final.inc @@ -3,22 +3,12 @@ build/ROMID/game/raceinit.o (section); \ build/ROMID/game/bodyinit.o (section); \ build/ROMID/game/race.o (section); \ - build/ROMID/game/stubs/game_000840.o (section); \ - build/ROMID/game/stubs/game_000850.o (section); \ - build/ROMID/game/stubs/game_000860.o (section); \ - build/ROMID/game/stubs/game_000870.o (section); \ build/ROMID/game/smokeinit.o (section); \ - build/ROMID/game/stubs/game_0008e0.o (section); \ - build/ROMID/game/stubs/game_0008f0.o (section); \ - build/ROMID/game/stubs/game_000900.o (section); \ - build/ROMID/game/stubs/game_000910.o (section); \ build/ROMID/game/dlights.o (section); \ build/ROMID/game/footstep.o (section); \ build/ROMID/game/game_006900.o (section); \ build/ROMID/game/nbomb.o (section); \ - build/ROMID/game/stubs/game_00b180.o (section); \ build/ROMID/game/texinit.o (section); \ - build/ROMID/game/stubs/game_00b200.o (section); \ build/ROMID/game/challengeinit.o (section); \ build/ROMID/game/langreset.o (section); \ build/ROMID/game/getitlereset.o (section); \ @@ -42,7 +32,6 @@ build/ROMID/game/smokereset.o (section); \ build/ROMID/game/sparksreset.o (section); \ build/ROMID/game/weatherreset.o (section); \ - build/ROMID/game/stubs/game_013540.o (section); \ build/ROMID/game/wallhitreset.o (section); \ build/ROMID/game/shardsreset.o (section); \ build/ROMID/game/surfacereset.o (section); \ @@ -59,13 +48,8 @@ build/ROMID/game/propobjstop.o (section); \ build/ROMID/game/propsndstop.o (section); \ build/ROMID/game/objectivesstop.o (section); \ - build/ROMID/game/stubs/game_015260.o (section); \ - build/ROMID/game/stubs/game_015270.o (section); \ build/ROMID/game/explosionsstop.o (section); \ build/ROMID/game/smokestop.o (section); \ - build/ROMID/game/stubs/game_0153f0.o (section); \ - build/ROMID/game/stubs/game_015400.o (section); \ - build/ROMID/game/stubs/game_015410.o (section); \ build/ROMID/game/shardsstop.o (section); \ build/ROMID/game/bondgunstop.o (section); \ build/ROMID/game/getitle.o (section); \ @@ -131,7 +115,6 @@ build/ROMID/game/menuitem.o (section); \ build/ROMID/game/menu.o (section); \ build/ROMID/game/activemenu.o (section); \ - build/ROMID/game/stubs/game_102230.o (section); \ build/ROMID/game/mainmenu.o (section); \ build/ROMID/game/cheats.o (section); \ build/ROMID/game/filemgr.o (section); \ @@ -144,7 +127,6 @@ build/ROMID/game/padhalllv.o (section); \ build/ROMID/game/pad.o (section); \ build/ROMID/game/pak.o (section); \ - build/ROMID/game/stubs/game_11eff0.o (section); \ build/ROMID/ailists/gailistsasm.o (section); \ build/ROMID/game/modeldata/general.o (section); \ build/ROMID/game/modeldata/basic.o (section); \ @@ -198,10 +180,8 @@ build/ROMID/game/texdecompress.o (section); \ build/ROMID/game/texreset.o (section); \ build/ROMID/game/tex.o (section); \ - build/ROMID/game/stubs/game_175f50.o (section); \ build/ROMID/game/game_175f90.o (section); \ build/ROMID/game/buildtime.o (section); \ - build/ROMID/game/stubs/game_176000.o (section); \ build/ROMID/game/game_176080.o (section); \ build/ROMID/game/stagemusic.o (section); \ build/ROMID/game/utils.o (section); \ diff --git a/src/game/file.c b/src/game/file.c index 7c2c6f335..ebee8ce2b 100644 --- a/src/game/file.c +++ b/src/game/file.c @@ -4184,11 +4184,7 @@ u32 fileGetInflatedSize(s32 filenum) romaddr = *romaddrptr; ptr = (u8 *) ((u32) &buffer[0x10] & ~0xf); - if (romaddr == 0) { - stub0f175f58(file0f166ea8(&g_FileTable[filenum]), ptr, 16); - } else { - dmaExec(ptr, romaddr, 0x40); - } + dmaExec(ptr, romaddr, 0x40); if (rzipIs1173(ptr)) { return (ptr[2] << 16) | (ptr[3] << 8) | ptr[4]; diff --git a/src/game/lv.c b/src/game/lv.c index 3e6c2e72b..0637f0a18 100644 --- a/src/game/lv.c +++ b/src/game/lv.c @@ -373,7 +373,6 @@ void lvReset(s32 stagenum) func0f0099a4(); boltbeamsReset(); lasersightsReset(); - stub0f013540(); shardsReset(); frReset(); @@ -2118,21 +2117,16 @@ void lvStop(void) if (g_Vars.stagenum < NUM_STAGES) { s32 bank = langGetLangBankIndexFromStagenum(g_Vars.stagenum); langClearBank(bank); - stub0f015270(); } chrmgrStop(); explosionsStop(); smokeStop(); - stub0f015400(); - stub0f015410(); shardsStop(); - stub0f0153f0(); propsStop(); objsStop(); weatherStop(); objectivesStop(); - stub0f015260(); bgunStop(); propsndStop(); musicStop(); diff --git a/src/game/stubs/game_000840.c b/src/game/stubs/game_000840.c deleted file mode 100644 index efc0731fd..000000000 --- a/src/game/stubs/game_000840.c +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include "constants.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -void stub0f000840(void) -{ - // empty -} diff --git a/src/game/stubs/game_000850.c b/src/game/stubs/game_000850.c deleted file mode 100644 index 28d267108..000000000 --- a/src/game/stubs/game_000850.c +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include "constants.h" -#include "game/stubs/game_000850.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -void stub0f000850(void) -{ - // empty -} diff --git a/src/game/stubs/game_000860.c b/src/game/stubs/game_000860.c deleted file mode 100644 index a2443e664..000000000 --- a/src/game/stubs/game_000860.c +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include "constants.h" -#include "game/stubs/game_000860.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -void stub0f000860(void) -{ - // empty -} diff --git a/src/game/stubs/game_000870.c b/src/game/stubs/game_000870.c deleted file mode 100644 index d4ceeeca8..000000000 --- a/src/game/stubs/game_000870.c +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include "constants.h" -#include "game/stubs/game_000870.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -void stub0f000870(void) -{ - // empty -} diff --git a/src/game/stubs/game_0008e0.c b/src/game/stubs/game_0008e0.c deleted file mode 100644 index eb3381ea2..000000000 --- a/src/game/stubs/game_0008e0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include "constants.h" -#include "game/stubs/game_0008e0.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -void stub0f0008e0(void) -{ - // empty -} diff --git a/src/game/stubs/game_0008f0.c b/src/game/stubs/game_0008f0.c deleted file mode 100644 index 138049d20..000000000 --- a/src/game/stubs/game_0008f0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include "constants.h" -#include "game/stubs/game_0008f0.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -void stub0f0008f0(void) -{ - // empty -} diff --git a/src/game/stubs/game_000900.c b/src/game/stubs/game_000900.c deleted file mode 100644 index b72ff8289..000000000 --- a/src/game/stubs/game_000900.c +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include "constants.h" -#include "game/stubs/game_000900.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -void stub0f000900(void) -{ - // empty -} diff --git a/src/game/stubs/game_000910.c b/src/game/stubs/game_000910.c deleted file mode 100644 index eacfbd23a..000000000 --- a/src/game/stubs/game_000910.c +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include "constants.h" -#include "game/stubs/game_000910.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -void stub0f000910(void) -{ - // empty -} diff --git a/src/game/stubs/game_00b180.c b/src/game/stubs/game_00b180.c deleted file mode 100644 index d36ee9bd3..000000000 --- a/src/game/stubs/game_00b180.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -void stub0f00b180(void) -{ - // empty -} diff --git a/src/game/stubs/game_00b200.c b/src/game/stubs/game_00b200.c deleted file mode 100644 index cb2315b02..000000000 --- a/src/game/stubs/game_00b200.c +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include "constants.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -void stub0f00b200(void) -{ - // empty -} diff --git a/src/game/stubs/game_013540.c b/src/game/stubs/game_013540.c deleted file mode 100644 index 5c267256e..000000000 --- a/src/game/stubs/game_013540.c +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include "constants.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -void stub0f013540(void) -{ - // empty -} diff --git a/src/game/stubs/game_015260.c b/src/game/stubs/game_015260.c deleted file mode 100644 index 52228ab3b..000000000 --- a/src/game/stubs/game_015260.c +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include "constants.h" -#include "game/stubs/game_015260.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -void stub0f015260(void) -{ - // empty -} diff --git a/src/game/stubs/game_015270.c b/src/game/stubs/game_015270.c deleted file mode 100644 index 5f8e83d69..000000000 --- a/src/game/stubs/game_015270.c +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include "constants.h" -#include "game/stubs/game_015270.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -void stub0f015270(void) -{ - // empty -} diff --git a/src/game/stubs/game_0153f0.c b/src/game/stubs/game_0153f0.c deleted file mode 100644 index 6207d2de4..000000000 --- a/src/game/stubs/game_0153f0.c +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include "constants.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -void stub0f0153f0(void) -{ - // empty -} diff --git a/src/game/stubs/game_015400.c b/src/game/stubs/game_015400.c deleted file mode 100644 index 2b3a647d1..000000000 --- a/src/game/stubs/game_015400.c +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include "constants.h" -#include "game/stubs/game_015400.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -void stub0f015400(void) -{ - // empty -} diff --git a/src/game/stubs/game_015410.c b/src/game/stubs/game_015410.c deleted file mode 100644 index 06cec9126..000000000 --- a/src/game/stubs/game_015410.c +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include "constants.h" -#include "game/stubs/game_015410.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -void stub0f015410(void) -{ - // empty -} diff --git a/src/game/stubs/game_102230.c b/src/game/stubs/game_102230.c deleted file mode 100644 index 1f9b5ed9d..000000000 --- a/src/game/stubs/game_102230.c +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include "constants.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -void stub0f102230(void) -{ - // empty -} diff --git a/src/game/stubs/game_11eff0.c b/src/game/stubs/game_11eff0.c deleted file mode 100644 index ead9728d3..000000000 --- a/src/game/stubs/game_11eff0.c +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include "constants.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -bool stub0f11eff0(s32 arg0) -{ - return arg0; -} diff --git a/src/game/stubs/game_175f50.c b/src/game/stubs/game_175f50.c deleted file mode 100644 index fcaf5344e..000000000 --- a/src/game/stubs/game_175f50.c +++ /dev/null @@ -1,26 +0,0 @@ -#include -#include "constants.h" -#include "game/stubs/game_175f50.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -void stub0f175f50(void) -{ - // empty -} - -void stub0f175f58(s32 arg0, u8 *addr, u32 numwords) -{ - // empty -} - -bool stub0f175f68(s32 arg0, s32 arg1) -{ - return false; -} - -void stub0f175f78(s32 arg0, s32 arg1, s32 arg2) -{ - // empty -} diff --git a/src/game/stubs/game_176000.c b/src/game/stubs/game_176000.c deleted file mode 100644 index cb7b280ab..000000000 --- a/src/game/stubs/game_176000.c +++ /dev/null @@ -1,45 +0,0 @@ -#include -#include "constants.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -s32 stub0f176000(s32 arg0) -{ - return arg0; -} - -s32 stub0f176008(s32 arg0, s32 arg1, s32 arg2, s32 arg3) -{ - return arg0; -} - -s32 stub0f17601c(s32 arg0, s32 arg1, s32 arg2, s32 arg3) -{ - return arg0; -} - -s32 stub0f176030(s32 arg0, s32 arg1, s32 arg2, s32 arg3) -{ - return arg0; -} - -s32 stub0f176044(s32 arg0, s32 arg1, s32 arg2, s32 arg3) -{ - return arg0; -} - -void stub0f176058(f32 arg0) -{ - // empty -} - -s32 stub0f176060(s32 arg0, s32 arg1, s32 arg2, s32 arg3) -{ - return arg0; -} - -void stub0f176074(void) -{ - // empty -} diff --git a/src/lib/main.c b/src/lib/main.c index a3d25cb52..89f53b34e 100644 --- a/src/lib/main.c +++ b/src/lib/main.c @@ -346,8 +346,6 @@ void mainInit(void) vmInit(); func0f1a78b0(); filesInit(); - stub0f175f50(); - func0f175f90(); if (var8005d9b0) { argSetString(" -ml0 -me0 -mgfx100 -mvtx50 -mt700 -ma400"); @@ -370,23 +368,13 @@ void mainInit(void) textInit(); playermgrInit(); frametimeInit(); - stub0f00b200(); profileInit(); - stub0f000870(); smokesInit(); - stub0f0008e0(); - stub0f0008f0(); - stub0f000900(); - stub0f00b180(); - stub0f000910(); - stub0f000840(); mpInit(); paksInit(); animsInit(); racesInit(); bodiesInit(); - stub0f000850(); - stub0f000860(); titleInit(); viConfigureForLegal(); viBlack(true);