mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-06-27 18:02:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename mplayer files

Browse Source
This commit is contained in:
Ryan Dwyer
2021-01-02 15:57:09 +10:00
parent ebd90be449
commit 85fd14a12e
51 changed files with 2597 additions and 2531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ld/gamefiles.inc
+5 -4
View File
@@ -168,10 +168,11 @@
build/ROMID/game/game_176000.o (section); \
build/ROMID/game/game_176080.o (section); \
build/ROMID/game/utils.o (section); \
build/ROMID/game/game_177e00.o (section); \
build/ROMID/game/game_179060.o (section); \
build/ROMID/game/game_17f930.o (section); \
build/ROMID/game/mplayer.o (section); \
build/ROMID/game/mplayer/ingame.o (section); \
build/ROMID/game/mplayer/setup.o (section); \
build/ROMID/game/mplayer/scenarios.o (section); \
build/ROMID/game/mplayer/options.o (section); \
build/ROMID/game/mplayer/mplayer.o (section); \
build/ROMID/game/data/data_02da90.o (section); \
build/ROMID/game/radar.o (section); \
build/ROMID/game/game_190260.o (section); \
src/game/activemenu/activemenu.c
+1 -1
View File
@@ -24,7 +24,7 @@
#include "game/gfxmemory.h"
#include "game/training.h"
#include "game/lang.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
src/game/bondmove.c
+2 -2
View File
@@ -27,8 +27,8 @@
#include "game/game_127910.h"
#include "game/game_157db0.h"
#include "game/core.h"
#include "game/game_177e00.h"
#include "game/mplayer.h"
#include "game/mplayer/ingame.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "game/propobj.h"
#include "gvars/gvars.h"
src/game/chr/chr.c
+2 -2
View File
@@ -33,10 +33,10 @@
#include "game/game_157db0.h"
#include "game/game_165670.h"
#include "game/game_166e40.h"
#include "game/game_179060.h"
#include "game/mplayer/setup.h"
#include "game/game_190260.h"
#include "game/game_1999b0.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pad.h"
#include "game/propobj.h"
#include "game/splat.h"
src/game/chr/chraction.c
+1 -1
View File
@@ -37,7 +37,7 @@
#include "game/game_190260.h"
#include "game/game_197600.h"
#include "game/game_1999b0.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pad.h"
#include "game/padhalllv.h"
#include "game/pak/pak.h"
src/game/core.c
+3 -3
View File
@@ -89,12 +89,12 @@
#include "game/music.h"
#include "game/game_16e810.h"
#include "game/game_176080.h"
#include "game/game_179060.h"
#include "game/game_17f930.h"
#include "game/mplayer/setup.h"
#include "game/mplayer/scenarios.h"
#include "game/game_19aa80.h"
#include "game/training.h"
#include "game/lang.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pak/pak.h"
#include "game/propobj.h"
#include "game/sparks/tick.h"
src/game/data/data_0160b0.c
+1 -1
View File
@@ -6,7 +6,7 @@
#include "game/game_107fb0.h"
#include "game/endscreen.h"
#include "game/utils.h"
#include "game/game_177e00.h"
#include "game/mplayer/ingame.h"
#include "game/game_1a3340.h"
#include "gvars/gvars.h"
#include "game/data/data_000000.h"
src/game/data/data_01a3a0.c
+3 -3
View File
@@ -9,9 +9,9 @@
#include "game/pak/pak.h"
#include "game/utils.h"
#include "game/endscreen.h"
#include "game/game_177e00.h"
#include "game/game_179060.h"
#include "game/game_17f930.h"
#include "game/mplayer/ingame.h"
#include "game/mplayer/setup.h"
#include "game/mplayer/scenarios.h"
#include "game/game_1a3340.h"
#include "gvars/gvars.h"
#include "game/data/data_0160b0.h"
src/game/data/data_020df0.c
+3 -3
View File
@@ -9,9 +9,9 @@
#include "game/timing.h"
#include "game/game_173a00.h"
#include "game/utils.h"
#include "game/game_177e00.h"
#include "game/game_179060.h"
#include "game/game_17f930.h"
#include "game/mplayer/ingame.h"
#include "game/mplayer/setup.h"
#include "game/mplayer/scenarios.h"
#include "game/game_1a3340.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
src/game/data/data_0258c0.c
+3 -3
View File
@@ -9,9 +9,9 @@
#include "game/timing.h"
#include "game/game_173a00.h"
#include "game/utils.h"
#include "game/game_177e00.h"
#include "game/game_179060.h"
#include "game/game_17f930.h"
#include "game/mplayer/ingame.h"
#include "game/mplayer/setup.h"
#include "game/mplayer/scenarios.h"
#include "game/game_1a3340.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
src/game/data/data_02a0e0.c
+3 -3
View File
@@ -9,9 +9,9 @@
#include "game/timing.h"
#include "game/game_173a00.h"
#include "game/utils.h"
#include "game/game_177e00.h"
#include "game/game_179060.h"
#include "game/game_17f930.h"
#include "game/mplayer/ingame.h"
#include "game/mplayer/setup.h"
#include "game/mplayer/scenarios.h"
#include "game/game_1a3340.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_02a0e0.h"
src/game/data/data_02da90.c
+3 -3
View File
@@ -9,9 +9,9 @@
#include "game/timing.h"
#include "game/game_173a00.h"
#include "game/utils.h"
#include "game/game_177e00.h"
#include "game/game_179060.h"
#include "game/game_17f930.h"
#include "game/mplayer/ingame.h"
#include "game/mplayer/setup.h"
#include "game/mplayer/scenarios.h"
#include "game/game_1a3340.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
src/game/data/data_02e820.c
+3 -3
View File
@@ -9,9 +9,9 @@
#include "game/timing.h"
#include "game/game_173a00.h"
#include "game/utils.h"
#include "game/game_177e00.h"
#include "game/game_179060.h"
#include "game/game_17f930.h"
#include "game/mplayer/ingame.h"
#include "game/mplayer/setup.h"
#include "game/mplayer/scenarios.h"
#include "game/game_1a3340.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
src/game/dlights.c
+1 -1
View File
@@ -18,7 +18,7 @@
#include "game/game_166e40.h"
#include "game/core.h"
#include "game/game_176080.h"
#include "game/game_17f930.h"
#include "game/mplayer/scenarios.h"
#include "game/propobj.h"
#include "game/utils.h"
#include "game/wallhit.h"
src/game/endscreen.c
+1 -1
View File
@@ -23,7 +23,7 @@
#include "game/endscreen.h"
#include "game/game_1655c0.h"
#include "game/core.h"
#include "game/game_177e00.h"
#include "game/mplayer/ingame.h"
#include "game/game_19aa80.h"
#include "game/gamefile.h"
#include "game/lang.h"
src/game/explosions/explosions.c
+1 -1
View File
@@ -19,7 +19,7 @@
#include "game/game_157db0.h"
#include "game/game_1668e0.h"
#include "game/game_166e40.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/propobj.h"
#include "game/utils.h"
#include "game/wallhit.h"
src/game/game_00b210.c
+1 -1
View File
@@ -8,7 +8,7 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/game_19aa80.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "gvars/gvars.h"
#include "types.h"
src/game/game_00c490.c
+2 -2
View File
@@ -30,10 +30,10 @@
#include "game/game_1655c0.h"
#include "game/game_166e40.h"
#include "game/core.h"
#include "game/game_17f930.h"
#include "game/mplayer/scenarios.h"
#include "game/game_19aa80.h"
#include "game/lang.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pad.h"
#include "game/propobj.h"
#include "gvars/gvars.h"
src/game/game_011110.c
+2 -2
View File
@@ -20,8 +20,8 @@
#include "game/game_0b63b0.h"
#include "game/game_111600.h"
#include "game/game_1655c0.h"
#include "game/game_17f930.h"
#include "game/mplayer.h"
#include "game/mplayer/scenarios.h"
#include "game/mplayer/mplayer.h"
#include "game/pad.h"
#include "gvars/gvars.h"
#include "lib/lib_121e0.h"
src/game/game_0147d0.c
+1 -1
View File
@@ -12,7 +12,7 @@
#include "game/game_02cde0.h"
#include "game/game_0601b0.h"
#include "game/game_197600.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "gvars/gvars.h"
#include "lib/lib_121e0.h"
#include "lib/lib_12dc0.h"
src/game/game_01bea0.c
+3 -3
View File
@@ -21,12 +21,12 @@
#include "game/game_127910.h"
#include "game/core.h"
#include "game/music.h"
#include "game/game_177e00.h"
#include "game/game_179060.h"
#include "game/mplayer/ingame.h"
#include "game/mplayer/setup.h"
#include "game/game_19aa80.h"
#include "game/training.h"
#include "game/gamefile.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/main.h"
src/game/game_02cde0.c
+1 -1
View File
@@ -16,7 +16,7 @@
#include "game/game_0b28d0.h"
#include "game/core.h"
#include "game/game_1a3340.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pad.h"
#include "game/propobj.h"
#include "gvars/gvars.h"
src/game/game_092610.c
+1 -1
View File
@@ -14,7 +14,7 @@
#include "game/game_0dcdb0.h"
#include "game/game_166e40.h"
#include "game/core.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pad.h"
#include "gvars/gvars.h"
#include "lib/lib_0e9d0.h"
src/game/game_097ba0.c
+1 -1
View File
@@ -39,7 +39,7 @@
#include "game/training.h"
#include "game/game_1a3340.h"
#include "game/lang.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pak/pak.h"
#include "game/pdoptions.h"
#include "game/propobj.h"
src/game/game_0b0420.c
+2 -2
View File
@@ -14,10 +14,10 @@
#include "game/game_0b63b0.h"
#include "game/game_0dcdb0.h"
#include "game/game_127910.h"
#include "game/game_179060.h"
#include "game/mplayer/setup.h"
#include "game/game_197600.h"
#include "game/lang.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "gvars/gvars.h"
#include "lib/lib_13130.h"
src/game/game_0b63b0.c
+3 -3
View File
@@ -45,12 +45,12 @@
#include "game/core.h"
#include "game/music.h"
#include "game/game_16e810.h"
#include "game/game_177e00.h"
#include "game/game_17f930.h"
#include "game/mplayer/ingame.h"
#include "game/mplayer/scenarios.h"
#include "game/radar.h"
#include "game/training.h"
#include "game/game_1a3340.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pad.h"
#include "game/pak/pak.h"
#include "game/pdoptions.h"
src/game/game_0dcdb0.c
+1 -1
View File
@@ -17,7 +17,7 @@
#include "game/game_127910.h"
#include "game/game_1531a0.h"
#include "game/core.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "game/propobj.h"
#include "gvars/gvars.h"
src/game/game_0f09f0.c
+2 -2
View File
@@ -27,13 +27,13 @@
#include "game/core.h"
#include "game/music.h"
#include "game/game_16e810.h"
#include "game/game_179060.h"
#include "game/mplayer/setup.h"
#include "game/game_19aa80.h"
#include "game/game_1a3340.h"
#include "game/game_1a78b0.h"
#include "game/gamefile.h"
#include "game/lang.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pak/pak.h"
#include "game/pdoptions.h"
#include "game/propobj.h"
src/game/game_102240.c
+2 -2
View File
@@ -25,12 +25,12 @@
#include "game/game_111600.h"
#include "game/game_1531a0.h"
#include "game/core.h"
#include "game/game_177e00.h"
#include "game/mplayer/ingame.h"
#include "game/game_19aa80.h"
#include "game/training.h"
#include "game/gamefile.h"
#include "game/lang.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
src/game/game_107fb0.c
+1 -1
View File
@@ -14,7 +14,7 @@
#include "game/game_1531a0.h"
#include "game/gamefile.h"
#include "game/lang.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pak/pak.h"
#include "game/utils.h"
#include "gvars/gvars.h"
src/game/game_10c9c0.c
+1 -1
View File
@@ -10,7 +10,7 @@
#include "game/game_0f09f0.h"
#include "game/game_10c9c0.h"
#include "game/game_19aa80.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "gvars/gvars.h"
#include "types.h"
src/game/game_176080.c
+1 -1
View File
@@ -10,7 +10,7 @@
#include "game/data/data_02da90.h"
#include "game/game_0b63b0.h"
#include "game/game_176080.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
src/game/game_190260.c
+3 -3
View File
@@ -18,15 +18,15 @@
#include "game/game_0b63b0.h"
#include "game/game_127910.h"
#include "game/game_157db0.h"
#include "game/game_179060.h"
#include "game/game_17f930.h"
#include "game/mplayer/setup.h"
#include "game/mplayer/scenarios.h"
#include "game/radar.h"
#include "game/game_190260.h"
#include "game/game_197600.h"
#include "game/game_1999b0.h"
#include "game/game_19aa80.h"
#include "game/lang.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pad.h"
#include "game/padhalllv.h"
#include "game/propobj.h"
src/game/game_197600.c
+2 -2
View File
@@ -13,11 +13,11 @@
#include "game/ceil.h"
#include "game/game_0b0420.h"
#include "game/game_127910.h"
#include "game/game_179060.h"
#include "game/mplayer/setup.h"
#include "game/game_190260.h"
#include "game/game_197600.h"
#include "game/game_1999b0.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/propobj.h"
#include "gvars/gvars.h"
#include "lib/lib_12dc0.h"
src/game/game_19aa80.c
+2 -2
View File
@@ -13,12 +13,12 @@
#include "game/game_0601b0.h"
#include "game/game_096750.h"
#include "game/game_127910.h"
#include "game/game_179060.h"
#include "game/mplayer/setup.h"
#include "game/game_190260.h"
#include "game/game_19aa80.h"
#include "game/training.h"
#include "game/lang.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pad.h"
#include "gvars/gvars.h"
#include "lib/lib_0d0a0.h"
src/game/game_1a3340.c
+1 -1
View File
@@ -24,7 +24,7 @@
#include "game/training.h"
#include "game/game_1a3340.h"
#include "game/lang.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
src/game/gamefile.c
+1 -1
View File
@@ -16,7 +16,7 @@
#include "game/game_19aa80.h"
#include "game/training.h"
#include "game/gamefile.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pak/pak.h"
#include "game/pdoptions.h"
#include "game/utils.h"
src/game/menu/items.c
+1 -1
View File
@@ -20,7 +20,7 @@
#include "game/game_19aa80.h"
#include "game/training.h"
#include "game/lang.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
src/game/game_177e00.c → src/game/mplayer/ingame.c
+2 -2
View File
@@ -16,10 +16,10 @@
#include "game/game_0f09f0.h"
#include "game/game_107fb0.h"
#include "game/core.h"
#include "game/game_177e00.h"
#include "game/mplayer/ingame.h"
#include "game/game_19aa80.h"
#include "game/lang.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "gvars/gvars.h"
#include "lib/main.h"
src/game/mplayer.c → src/game/mplayer/mplayer.c
+3 -3
View File
@@ -20,11 +20,11 @@
#include "game/game_1531a0.h"
#include "game/core.h"
#include "game/music.h"
#include "game/game_179060.h"
#include "game/game_17f930.h"
#include "game/mplayer/setup.h"
#include "game/mplayer/scenarios.h"
#include "game/game_19aa80.h"
#include "game/lang.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pak/pak.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
src/game/mplayer/options.c
+2262
View File
File diff suppressed because it is too large Load Diff
src/game/game_17f930.c → src/game/mplayer/scenarios.c
+3 -2436
View File
File diff suppressed because it is too large Load Diff
src/game/game_179060.c → src/game/mplayer/setup.c
+219 -3
View File
@@ -15,11 +15,11 @@
#include "game/game_107fb0.h"
#include "game/game_1531a0.h"
#include "game/music.h"
#include "game/game_179060.h"
#include "game/game_17f930.h"
#include "game/mplayer/setup.h"
#include "game/mplayer/scenarios.h"
#include "game/game_19aa80.h"
#include "game/lang.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
@@ -6336,3 +6336,219 @@ s32 menuhandlerMpQuickTeamOption(u32 operation, struct menuitem *item, union han
return 0;
}
s32 menudialogCombatSimulator(u32 operation, struct menudialog *dialog, union handlerdata *data)
{
if (operation == MENUOP_OPEN) {
g_Vars.unk000494[0] = 0;
g_Vars.unk000494[1] = 0;
g_Vars.unk000494[2] = 0;
g_Vars.unk000494[3] = 0;
}
if (g_Menus[g_MpPlayerNum].curframe
&& g_Menus[g_MpPlayerNum].curframe->dialog == &g_CombatSimulatorMenuDialog
&& operation == MENUOP_TICK) {
g_Vars.unk000490 = 2;
g_Vars.mpquickteam = MPQUICKTEAM_5;
g_Vars.unk00049c = 0;
mpClearCurrentChallenge();
mpRemoveLock();
}
return false;
}
s32 menuhandlerMpAdvancedSetup(u32 operation, struct menuitem *item, union handlerdata *data)
{
if (operation == MENUOP_SET) {
func0f0f820c(&menudialog_mpgamesetup3, 3);
}
return 0;
}
GLOBAL_ASM(
glabel func0f17fa28
/* f17fa28: 27bdffb8 */ addiu $sp,$sp,-72
/* f17fa2c: afbf003c */ sw $ra,0x3c($sp)
/* f17fa30: 3c1f8007 */ lui $ra,%hi(g_MpPlayerNum)
/* f17fa34: 27ff1448 */ addiu $ra,$ra,%lo(g_MpPlayerNum)
/* f17fa38: 8fee0000 */ lw $t6,0x0($ra)
/* f17fa3c: afbe0038 */ sw $s8,0x38($sp)
/* f17fa40: afb70034 */ sw $s7,0x34($sp)
/* f17fa44: afb60030 */ sw $s6,0x30($sp)
/* f17fa48: afb5002c */ sw $s5,0x2c($sp)
/* f17fa4c: afb40028 */ sw $s4,0x28($sp)
/* f17fa50: afb30024 */ sw $s3,0x24($sp)
/* f17fa54: afb20020 */ sw $s2,0x20($sp)
/* f17fa58: afb1001c */ sw $s1,0x1c($sp)
/* f17fa5c: 3c118008 */ lui $s1,%hi(menudialog_mpsavesetupname)
/* f17fa60: 3c128008 */ lui $s2,%hi(menudialog_mpsavesetup)
/* f17fa64: 3c138008 */ lui $s3,%hi(g_MpAddSimulantMenuDialog)
/* f17fa68: 3c148008 */ lui $s4,%hi(g_MpChangeSimulantMenuDialog)
/* f17fa6c: 3c158008 */ lui $s5,%hi(g_MpEditSimulantMenuDialog)
/* f17fa70: 3c168008 */ lui $s6,%hi(menudialog_mpcombatoptions)
/* f17fa74: 3c178008 */ lui $s7,%hi(menudialog_mpbriefcaseoptions)
/* f17fa78: 3c1e8008 */ lui $s8,%hi(menudialog_mpcaptureoptions)
/* f17fa7c: 3c098008 */ lui $t1,%hi(menudialog_mppopacapoptions)
/* f17fa80: 3c088008 */ lui $t0,%hi(menudialog_mphackeroptions)
/* f17fa84: 3c078008 */ lui $a3,%hi(menudialog_mphilloptions)
/* f17fa88: afb00018 */ sw $s0,0x18($sp)
/* f17fa8c: 24e76ce0 */ addiu $a3,$a3,%lo(menudialog_mphilloptions)
/* f17fa90: 25086dfc */ addiu $t0,$t0,%lo(menudialog_mphackeroptions)
/* f17fa94: 25296f80 */ addiu $t1,$t1,%lo(menudialog_mppopacapoptions)
/* f17fa98: 27de6b48 */ addiu $s8,$s8,%lo(menudialog_mpcaptureoptions)
/* f17fa9c: 26f769d4 */ addiu $s7,$s7,%lo(menudialog_mpbriefcaseoptions)
/* f17faa0: 26d668b8 */ addiu $s6,$s6,%lo(menudialog_mpcombatoptions)
/* f17faa4: 26b5592c */ addiu $s5,$s5,%lo(g_MpEditSimulantMenuDialog)
/* f17faa8: 26945834 */ addiu $s4,$s4,%lo(g_MpChangeSimulantMenuDialog)
/* f17faac: 2673581c */ addiu $s3,$s3,%lo(g_MpAddSimulantMenuDialog)
/* f17fab0: 26524d80 */ addiu $s2,$s2,%lo(menudialog_mpsavesetup)
/* f17fab4: 26314cdc */ addiu $s1,$s1,%lo(menudialog_mpsavesetupname)
/* f17fab8: 00001025 */ or $v0,$zero,$zero
/* f17fabc: afae0040 */ sw $t6,0x40($sp)
/* f17fac0: 0002c0c0 */ sll $t8,$v0,0x3
.L0f17fac4:
/* f17fac4: 0302c023 */ subu $t8,$t8,$v0
/* f17fac8: 0018c080 */ sll $t8,$t8,0x2
/* f17facc: 0302c021 */ addu $t8,$t8,$v0
/* f17fad0: 0018c0c0 */ sll $t8,$t8,0x3
/* f17fad4: 0302c023 */ subu $t8,$t8,$v0
/* f17fad8: 0018c100 */ sll $t8,$t8,0x4
/* f17fadc: 3c19800a */ lui $t9,%hi(g_Menus+0x4f8)
/* f17fae0: afe20000 */ sw $v0,0x0($ra)
/* f17fae4: 0338c821 */ addu $t9,$t9,$t8
/* f17fae8: 8f39e4f8 */ lw $t9,%lo(g_Menus+0x4f8)($t9)
/* f17faec: 5320005f */ beqzl $t9,.L0f17fc6c
/* f17faf0: 24420001 */ addiu $v0,$v0,0x1
/* f17faf4: afa20044 */ sw $v0,0x44($sp)
/* f17faf8: 8fe20000 */ lw $v0,0x0($ra)
.L0f17fafc:
/* f17fafc: 3c0f800a */ lui $t7,%hi(g_Menus)
/* f17fb00: 25efe000 */ addiu $t7,$t7,%lo(g_Menus)
/* f17fb04: 000270c0 */ sll $t6,$v0,0x3
/* f17fb08: 01c27023 */ subu $t6,$t6,$v0
/* f17fb0c: 000e7080 */ sll $t6,$t6,0x2
/* f17fb10: 01c27021 */ addu $t6,$t6,$v0
/* f17fb14: 000e70c0 */ sll $t6,$t6,0x3
/* f17fb18: 01c27023 */ subu $t6,$t6,$v0
/* f17fb1c: 000e7100 */ sll $t6,$t6,0x4
/* f17fb20: 01cfc021 */ addu $t8,$t6,$t7
/* f17fb24: 870d04f4 */ lh $t5,0x4f4($t8)
/* f17fb28: 24100001 */ addiu $s0,$zero,0x1
/* f17fb2c: 00005025 */ or $t2,$zero,$zero
/* f17fb30: 19a0003e */ blez $t5,.L0f17fc2c
/* f17fb34: 0002c8c0 */ sll $t9,$v0,0x3
/* f17fb38: 0322c823 */ subu $t9,$t9,$v0
/* f17fb3c: 0019c880 */ sll $t9,$t9,0x2
/* f17fb40: 0322c821 */ addu $t9,$t9,$v0
/* f17fb44: 0019c8c0 */ sll $t9,$t9,0x3
/* f17fb48: 0322c823 */ subu $t9,$t9,$v0
/* f17fb4c: 0019c900 */ sll $t9,$t9,0x4
/* f17fb50: 032f6021 */ addu $t4,$t9,$t7
/* f17fb54: 01805825 */ or $t3,$t4,$zero
.L0f17fb58:
/* f17fb58: 81620478 */ lb $v0,0x478($t3)
/* f17fb5c: 000a7080 */ sll $t6,$t2,0x2
/* f17fb60: 01ca7023 */ subu $t6,$t6,$t2
/* f17fb64: 1840002d */ blez $v0,.L0f17fc1c
/* f17fb68: 00002025 */ or $a0,$zero,$zero
/* f17fb6c: 000e70c0 */ sll $t6,$t6,0x3
/* f17fb70: 018e2821 */ addu $a1,$t4,$t6
/* f17fb74: 00023080 */ sll $a2,$v0,0x2
.L0f17fb78:
/* f17fb78: 8ca30464 */ lw $v1,0x464($a1)
/* f17fb7c: 24840004 */ addiu $a0,$a0,0x4
/* f17fb80: 0086082a */ slt $at,$a0,$a2
/* f17fb84: 10600023 */ beqz $v1,.L0f17fc14
/* f17fb88: 00000000 */ nop
/* f17fb8c: 8c620000 */ lw $v0,0x0($v1)
/* f17fb90: 14510002 */ bne $v0,$s1,.L0f17fb9c
/* f17fb94: 00000000 */ nop
/* f17fb98: 00008025 */ or $s0,$zero,$zero
.L0f17fb9c:
/* f17fb9c: 14520002 */ bne $v0,$s2,.L0f17fba8
/* f17fba0: 00000000 */ nop
/* f17fba4: 00008025 */ or $s0,$zero,$zero
.L0f17fba8:
/* f17fba8: 14530002 */ bne $v0,$s3,.L0f17fbb4
/* f17fbac: 00000000 */ nop
/* f17fbb0: 00008025 */ or $s0,$zero,$zero
.L0f17fbb4:
/* f17fbb4: 14540002 */ bne $v0,$s4,.L0f17fbc0
/* f17fbb8: 00000000 */ nop
/* f17fbbc: 00008025 */ or $s0,$zero,$zero
.L0f17fbc0:
/* f17fbc0: 14550002 */ bne $v0,$s5,.L0f17fbcc
/* f17fbc4: 00000000 */ nop
/* f17fbc8: 00008025 */ or $s0,$zero,$zero
.L0f17fbcc:
/* f17fbcc: 14560002 */ bne $v0,$s6,.L0f17fbd8
/* f17fbd0: 00000000 */ nop
/* f17fbd4: 00008025 */ or $s0,$zero,$zero
.L0f17fbd8:
/* f17fbd8: 14570002 */ bne $v0,$s7,.L0f17fbe4
/* f17fbdc: 00000000 */ nop
/* f17fbe0: 00008025 */ or $s0,$zero,$zero
.L0f17fbe4:
/* f17fbe4: 145e0002 */ bne $v0,$s8,.L0f17fbf0
/* f17fbe8: 00000000 */ nop
/* f17fbec: 00008025 */ or $s0,$zero,$zero
.L0f17fbf0:
/* f17fbf0: 14470002 */ bne $v0,$a3,.L0f17fbfc
/* f17fbf4: 00000000 */ nop
/* f17fbf8: 00008025 */ or $s0,$zero,$zero
.L0f17fbfc:
/* f17fbfc: 14480002 */ bne $v0,$t0,.L0f17fc08
/* f17fc00: 00000000 */ nop
/* f17fc04: 00008025 */ or $s0,$zero,$zero
.L0f17fc08:
/* f17fc08: 14490002 */ bne $v0,$t1,.L0f17fc14
/* f17fc0c: 00000000 */ nop
/* f17fc10: 00008025 */ or $s0,$zero,$zero
.L0f17fc14:
/* f17fc14: 1420ffd8 */ bnez $at,.L0f17fb78
/* f17fc18: 24a50004 */ addiu $a1,$a1,0x4
.L0f17fc1c:
/* f17fc1c: 254a0001 */ addiu $t2,$t2,0x1
/* f17fc20: 014d082a */ slt $at,$t2,$t5
/* f17fc24: 1420ffcc */ bnez $at,.L0f17fb58
/* f17fc28: 256b0018 */ addiu $t3,$t3,0x18
.L0f17fc2c:
/* f17fc2c: 1600000b */ bnez $s0,.L0f17fc5c
/* f17fc30: 00000000 */ nop
/* f17fc34: 0fc3cdb7 */ jal menuPopDialog
/* f17fc38: 00000000 */ nop
/* f17fc3c: 3c078008 */ lui $a3,%hi(menudialog_mphilloptions)
/* f17fc40: 3c088008 */ lui $t0,%hi(menudialog_mphackeroptions)
/* f17fc44: 3c098008 */ lui $t1,%hi(menudialog_mppopacapoptions)
/* f17fc48: 3c1f8007 */ lui $ra,%hi(g_MpPlayerNum)
/* f17fc4c: 27ff1448 */ addiu $ra,$ra,%lo(g_MpPlayerNum)
/* f17fc50: 25296f80 */ addiu $t1,$t1,%lo(menudialog_mppopacapoptions)
/* f17fc54: 25086dfc */ addiu $t0,$t0,%lo(menudialog_mphackeroptions)
/* f17fc58: 24e76ce0 */ addiu $a3,$a3,%lo(menudialog_mphilloptions)
.L0f17fc5c:
/* f17fc5c: 5200ffa7 */ beqzl $s0,.L0f17fafc
/* f17fc60: 8fe20000 */ lw $v0,0x0($ra)
/* f17fc64: 8fa20044 */ lw $v0,0x44($sp)
/* f17fc68: 24420001 */ addiu $v0,$v0,0x1
.L0f17fc6c:
/* f17fc6c: 24010004 */ addiu $at,$zero,0x4
/* f17fc70: 5441ff94 */ bnel $v0,$at,.L0f17fac4
/* f17fc74: 0002c0c0 */ sll $t8,$v0,0x3
/* f17fc78: 8fb80040 */ lw $t8,0x40($sp)
/* f17fc7c: 8fb00018 */ lw $s0,0x18($sp)
/* f17fc80: 8fb1001c */ lw $s1,0x1c($sp)
/* f17fc84: aff80000 */ sw $t8,0x0($ra)
/* f17fc88: 8fbf003c */ lw $ra,0x3c($sp)
/* f17fc8c: 8fb20020 */ lw $s2,0x20($sp)
/* f17fc90: 8fb30024 */ lw $s3,0x24($sp)
/* f17fc94: 8fb40028 */ lw $s4,0x28($sp)
/* f17fc98: 8fb5002c */ lw $s5,0x2c($sp)
/* f17fc9c: 8fb60030 */ lw $s6,0x30($sp)
/* f17fca0: 8fb70034 */ lw $s7,0x34($sp)
/* f17fca4: 8fbe0038 */ lw $s8,0x38($sp)
/* f17fca8: 03e00008 */ jr $ra
/* f17fcac: 27bd0048 */ addiu $sp,$sp,0x48
);
src/game/propobj.c
+3 -3
View File
@@ -52,13 +52,13 @@
#include "game/game_165670.h"
#include "game/gfxmemory.h"
#include "game/core.h"
#include "game/game_179060.h"
#include "game/game_17f930.h"
#include "game/mplayer/setup.h"
#include "game/mplayer/scenarios.h"
#include "game/game_190260.h"
#include "game/game_1999b0.h"
#include "game/training.h"
#include "game/lang.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pad.h"
#include "game/pdoptions.h"
#include "game/propobj.h"
src/game/radar.c
+1 -1
View File
@@ -14,7 +14,7 @@
#include "game/game_0b3350.h"
#include "game/game_152fa0.h"
#include "game/game_1531a0.h"
#include "game/game_17f930.h"
#include "game/mplayer/scenarios.h"
#include "game/radar.h"
#include "game/pdoptions.h"
#include "gvars/gvars.h"
src/include/game/game_177e00.h → src/include/game/mplayer/ingame.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef _IN_GAME_GAME_177E00_H
#define _IN_GAME_GAME_177E00_H
#ifndef _IN_GAME_MPLAYER_INGAME_H
#define _IN_GAME_MPLAYER_INGAME_H
#include <ultra64.h>
#include "types.h"
src/include/game/mplayer.h → src/include/game/mplayer/mplayer.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef IN_GAME_MPLAYER_H
#define IN_GAME_MPLAYER_H
#ifndef IN_GAME_MPLAYER_MPLAYER_H
#define IN_GAME_MPLAYER_MPLAYER_H
#include <ultra64.h>
#include "types.h"
src/include/game/mplayer/options.h
+20
View File
@@ -0,0 +1,20 @@
#ifndef _IN_GAME_MPLAYER_OPTIONS_H
#define _IN_GAME_MPLAYER_OPTIONS_H
#include <ultra64.h>
#include "types.h"
s32 menuhandlerMpOpenOptions(u32 operation, struct menuitem *item, union handlerdata *data);
void scenarioCallback40(s32 *arg0);
void scenarioCallback44(s32 *arg0);
void scenarioInit(void);
s32 scenarioCallback08(void);
void scenarioReset(void);
void scenarioCallback10(void);
void scenarioCallback14(struct chrdata *chr);
Gfx *scenarioRadar(Gfx *gdl);
bool scenarioRadar2(Gfx **gdl, struct prop *prop);
f32 scenarioCallback2c(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop);
s32 scenarioGetMaxTeams(void);
void scenarioCallback38(s16 arg0, s32 *arg1, s32 *arg2, s32 *arg3);
#endif
src/include/game/game_17f930.h → src/include/game/mplayer/scenarios.h
+2 -6
View File
@@ -1,12 +1,8 @@
#ifndef _IN_GAME_GAME_17F9300_H
#define _IN_GAME_GAME_17F9300_H
#ifndef _IN_GAME_MPLAYER_SCENARIOS_H
#define _IN_GAME_MPLAYER_SCENARIOS_H
#include <ultra64.h>
#include "types.h"
s32 menudialogCombatSimulator(u32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menuhandlerMpAdvancedSetup(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpDisplayTeam(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpOneHitKills(u32 operation, struct menuitem *item, union handlerdata *data);
void scenarioHtbInit(void);
s32 scenarioHtbCallback08(void);
void scenarioHtbReset(void);
src/include/game/game_179060.h → src/include/game/mplayer/setup.h
+6 -2
View File
@@ -1,5 +1,5 @@
#ifndef _IN_GAME_GAME_179060_H
#define _IN_GAME_GAME_179060_H
#ifndef _IN_GAME_MPLAYER_SETUP_H
#define _IN_GAME_MPLAYER_SETUP_H
#include <ultra64.h>
#include "types.h"
@@ -172,5 +172,9 @@ s32 menudialogMpQuickGo(u32 operation, struct menudialog *dialog, union handlerd
s32 menuhandlerMpFinishedSetup(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerQuickTeamSeparator(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpQuickTeamOption(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menudialogCombatSimulator(u32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menuhandlerMpAdvancedSetup(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpDisplayTeam(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpOneHitKills(u32 operation, struct menuitem *item, union handlerdata *data);
#endif
src/lib/main.c
+1 -1
View File
@@ -42,7 +42,7 @@
#include "game/game_175f90.h"
#include "game/game_176080.h"
#include "game/game_1a78b0.h"
#include "game/mplayer.h"
#include "game/mplayer/mplayer.h"
#include "game/pak/pak.h"
#include "game/splat.h"
#include "game/utils.h"