mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-17 21:03:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename entry.c to boot.c, controller.c to joy.c, core.c to lv.c, texture.c to texdecompress.c, room.c to bg.c, lib_0e9d0.c to snd.c and associated functions

Browse Source
This commit is contained in:
Ryan Dwyer
2021-03-24 20:03:37 +10:00
parent 31f1573a6e
commit 9d4f2ffd2a
103 changed files with 1942 additions and 1942 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/activemenu/tick.c
+19 -19
View File
@@ -8,7 +8,7 @@
#include "game/game_127910.h"
#include "game/options.h"
#include "bss.h"
#include "lib/controller.h"
#include "lib/joy.h"
#include "data.h"
#include "types.h"
@@ -38,17 +38,17 @@ void amTick(void)
if (g_Vars.currentplayer->activemenumode != AMMODE_CLOSED) {
s32 controlmode = optionsGetControlMode(g_Vars.currentplayerstats->mpindex);
s8 contpadnum = optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex);
s32 numsamples = contGetNumSamples();
s32 numsamples = joyGetNumSamples();
s32 j;
for (j = 0; j < numsamples; j++) {
s8 gotonextscreen = false;
s8 cstickx = contGetStickXOnSample(j, contpadnum);
s8 csticky = contGetStickYOnSample(j, contpadnum);
s8 cstickx = joyGetStickXOnSample(j, contpadnum);
s8 csticky = joyGetStickYOnSample(j, contpadnum);
s8 absstickx;
s8 abssticky;
u16 buttonsstate = contGetButtonsOnSample(j, contpadnum, 0xffff);
u16 buttonspressed = contGetButtonsPressedOnSample(j, contpadnum, 0xffff);
u16 buttonsstate = joyGetButtonsOnSample(j, contpadnum, 0xffff);
u16 buttonspressed = joyGetButtonsPressedOnSample(j, contpadnum, 0xffff);
bool stickpushed = false;
s32 slotnum;
bool stayopen;
@@ -142,10 +142,10 @@ void amTick(void)
|| controlmode == CONTROLMODE_22
|| controlmode == CONTROLMODE_21) {
s8 contpadnum2 = optionsGetContpadNum2(g_Vars.currentplayerstats->mpindex);
s8 cstickx2 = contGetStickXOnSample(j, contpadnum2);
s8 csticky2 = contGetStickYOnSample(j, contpadnum2);
u16 buttonsstate2 = contGetButtonsOnSample(j, contpadnum2, 0xffff);
u16 buttonspressed2 = contGetButtonsPressedOnSample(j, contpadnum2, 0xffff);
s8 cstickx2 = joyGetStickXOnSample(j, contpadnum2);
s8 csticky2 = joyGetStickYOnSample(j, contpadnum2);
u16 buttonsstate2 = joyGetButtonsOnSample(j, contpadnum2, 0xffff);
u16 buttonspressed2 = joyGetButtonsPressedOnSample(j, contpadnum2, 0xffff);
if (g_Vars.currentplayer->activemenumode == AMMODE_EDIT) {
buttonsstate2 = buttonsstate2 & A_BUTTON;
@@ -544,7 +544,7 @@ glabel var7f1a224cnb
/* f01b040: afa200d4 */ sw $v0,0xd4($sp)
/* f01b044: 0fc5338e */ jal optionsGetContpadNum1
/* f01b048: 8de40070 */ lw $a0,0x70($t7)
/* f01b04c: 0c0055bf */ jal contGetNumSamples
/* f01b04c: 0c0055bf */ jal joyGetNumSamples
/* f01b050: a3a200d3 */ sb $v0,0xd3($sp)
/* f01b054: 1840022a */ blez $v0,.NB0f01b900
/* f01b058: afa200cc */ sw $v0,0xcc($sp)
@@ -556,25 +556,25 @@ glabel var7f1a224cnb
/* f01b06c: 24150001 */ addiu $s5,$zero,0x1
/* f01b070: 24140001 */ addiu $s4,$zero,0x1
/* f01b074: afa000b0 */ sw $zero,0xb0($sp)
/* f01b078: 0c0055ca */ jal contGetStickXOnSample
/* f01b078: 0c0055ca */ jal joyGetStickXOnSample
/* f01b07c: afa000ac */ sw $zero,0xac($sp)
/* f01b080: 0002b600 */ sll $s6,$v0,0x18
/* f01b084: 0016c603 */ sra $t8,$s6,0x18
/* f01b088: 0300b025 */ or $s6,$t8,$zero
/* f01b08c: 03c02025 */ or $a0,$s8,$zero
/* f01b090: 0c0055f9 */ jal contGetStickYOnSample
/* f01b090: 0c0055f9 */ jal joyGetStickYOnSample
/* f01b094: 83a500d3 */ lb $a1,0xd3($sp)
/* f01b098: 0002be00 */ sll $s7,$v0,0x18
/* f01b09c: 0017ce03 */ sra $t9,$s7,0x18
/* f01b0a0: 0320b825 */ or $s7,$t9,$zero
/* f01b0a4: 03c02025 */ or $a0,$s8,$zero
/* f01b0a8: 83a500d3 */ lb $a1,0xd3($sp)
/* f01b0ac: 0c005656 */ jal contGetButtonsOnSample
/* f01b0ac: 0c005656 */ jal joyGetButtonsOnSample
/* f01b0b0: 3406ffff */ dli $a2,0xffff
/* f01b0b4: 3051ffff */ andi $s1,$v0,0xffff
/* f01b0b8: 03c02025 */ or $a0,$s8,$zero
/* f01b0bc: 83a500d3 */ lb $a1,0xd3($sp)
/* f01b0c0: 0c00568c */ jal contGetButtonsPressedOnSample
/* f01b0c0: 0c00568c */ jal joyGetButtonsPressedOnSample
/* f01b0c4: 3406ffff */ dli $a2,0xffff
/* f01b0c8: 3c08800a */ lui $t0,0x800a
/* f01b0cc: 8d0866a8 */ lw $t0,0x66a8($t0)
@@ -721,7 +721,7 @@ glabel var7f1a224cnb
/* f01b2b4: 00056603 */ sra $t4,$a1,0x18
/* f01b2b8: 01608025 */ or $s0,$t3,$zero
/* f01b2bc: 01802825 */ or $a1,$t4,$zero
/* f01b2c0: 0c0055ca */ jal contGetStickXOnSample
/* f01b2c0: 0c0055ca */ jal joyGetStickXOnSample
/* f01b2c4: 03c02025 */ or $a0,$s8,$zero
/* f01b2c8: 00029600 */ sll $s2,$v0,0x18
/* f01b2cc: 00102e00 */ sll $a1,$s0,0x18
@@ -729,7 +729,7 @@ glabel var7f1a224cnb
/* f01b2d4: 00057603 */ sra $t6,$a1,0x18
/* f01b2d8: 01a09025 */ or $s2,$t5,$zero
/* f01b2dc: 01c02825 */ or $a1,$t6,$zero
/* f01b2e0: 0c0055f9 */ jal contGetStickYOnSample
/* f01b2e0: 0c0055f9 */ jal joyGetStickYOnSample
/* f01b2e4: 03c02025 */ or $a0,$s8,$zero
/* f01b2e8: 00029e00 */ sll $s3,$v0,0x18
/* f01b2ec: 00102e00 */ sll $a1,$s0,0x18
@@ -738,14 +738,14 @@ glabel var7f1a224cnb
/* f01b2f8: 01e09825 */ or $s3,$t7,$zero
/* f01b2fc: 03002825 */ or $a1,$t8,$zero
/* f01b300: 03c02025 */ or $a0,$s8,$zero
/* f01b304: 0c005656 */ jal contGetButtonsOnSample
/* f01b304: 0c005656 */ jal joyGetButtonsOnSample
/* f01b308: 3406ffff */ dli $a2,0xffff
/* f01b30c: 00102e00 */ sll $a1,$s0,0x18
/* f01b310: 0005ce03 */ sra $t9,$a1,0x18
/* f01b314: 3051ffff */ andi $s1,$v0,0xffff
/* f01b318: 03202825 */ or $a1,$t9,$zero
/* f01b31c: 03c02025 */ or $a0,$s8,$zero
/* f01b320: 0c00568c */ jal contGetButtonsPressedOnSample
/* f01b320: 0c00568c */ jal joyGetButtonsPressedOnSample
/* f01b324: 3406ffff */ dli $a2,0xffff
/* f01b328: 3c08800a */ lui $t0,0x800a
/* f01b32c: 8d08e944 */ lw $t0,-0x16bc($t0)
src/game/room.c → src/game/bg.c
+3 -3
View File
@@ -17,14 +17,14 @@
#include "game/game_13b670.h"
#include "game/game_13c510.h"
#include "game/game_1531a0.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/game_165360.h"
#include "game/game_1655c0.h"
#include "game/game_1657c0.h"
#include "game/game_1668e0.h"
#include "game/file.h"
#include "game/core.h"
#include "game/texture.h"
#include "game/lv.h"
#include "game/texdecompress.h"
#include "game/game_173a00.h"
#include "game/wallhit.h"
#include "bss.h"
src/game/roombss.c → src/game/bgbss.c
View File
src/game/bondbike.c
+10 -10
View File
@@ -12,7 +12,7 @@
#include "game/game_0b3350.h"
#include "game/game_0b69d0.h"
#include "game/bondhead.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/objectives.h"
#include "game/options.h"
#include "game/propobj.h"
@@ -256,19 +256,19 @@ glabel var7f1adb74
/* f0d2738: 14400011 */ bnez $v0,.L0f0d2780
/* f0d273c: 8fa70060 */ lw $a3,0x60($sp)
.L0f0d2740:
/* f0d2740: 0fc5b364 */ jal coreIsPaused
/* f0d2740: 0fc5b364 */ jal lvIsPaused
/* f0d2744: 00000000 */ nop
/* f0d2748: 1440000d */ bnez $v0,.L0f0d2780
/* f0d274c: 8fa70060 */ lw $a3,0x60($sp)
/* f0d2750: 00002025 */ or $a0,$zero,$zero
/* f0d2754: 83a5005b */ lb $a1,0x5b($sp)
/* f0d2758: 0c005326 */ jal contCountButtonsOnSpecificSamples
/* f0d2758: 0c005326 */ jal joyCountButtonsOnSpecificSamples
/* f0d275c: 24060202 */ addiu $a2,$zero,0x202
/* f0d2760: 8fac0060 */ lw $t4,0x60($sp)
/* f0d2764: 00002025 */ or $a0,$zero,$zero
/* f0d2768: 24060101 */ addiu $a2,$zero,0x101
/* f0d276c: ad820028 */ sw $v0,0x28($t4)
/* f0d2770: 0c005326 */ jal contCountButtonsOnSpecificSamples
/* f0d2770: 0c005326 */ jal joyCountButtonsOnSpecificSamples
/* f0d2774: 83a5005b */ lb $a1,0x5b($sp)
/* f0d2778: 8fa70060 */ lw $a3,0x60($sp)
/* f0d277c: ace2002c */ sw $v0,0x2c($a3)
@@ -596,19 +596,19 @@ glabel var7f1adb74
/* f0d2738: 14400011 */ bnez $v0,.L0f0d2780
/* f0d273c: 8fa70060 */ lw $a3,0x60($sp)
.L0f0d2740:
/* f0d2740: 0fc5b364 */ jal coreIsPaused
/* f0d2740: 0fc5b364 */ jal lvIsPaused
/* f0d2744: 00000000 */ nop
/* f0d2748: 1440000d */ bnez $v0,.L0f0d2780
/* f0d274c: 8fa70060 */ lw $a3,0x60($sp)
/* f0d2750: 00002025 */ or $a0,$zero,$zero
/* f0d2754: 83a5005b */ lb $a1,0x5b($sp)
/* f0d2758: 0c005326 */ jal contCountButtonsOnSpecificSamples
/* f0d2758: 0c005326 */ jal joyCountButtonsOnSpecificSamples
/* f0d275c: 24060202 */ addiu $a2,$zero,0x202
/* f0d2760: 8fac0060 */ lw $t4,0x60($sp)
/* f0d2764: 00002025 */ or $a0,$zero,$zero
/* f0d2768: 24060101 */ addiu $a2,$zero,0x101
/* f0d276c: ad820028 */ sw $v0,0x28($t4)
/* f0d2770: 0c005326 */ jal contCountButtonsOnSpecificSamples
/* f0d2770: 0c005326 */ jal joyCountButtonsOnSpecificSamples
/* f0d2774: 83a5005b */ lb $a1,0x5b($sp)
/* f0d2778: 8fa70060 */ lw $a3,0x60($sp)
/* f0d277c: ace2002c */ sw $v0,0x2c($a3)
@@ -889,9 +889,9 @@ glabel var7f1adb74
// || optionsGetControlMode(g_Vars.currentplayerstats->mpindex) == CONTROLMODE_14
// || optionsGetControlMode(g_Vars.currentplayerstats->mpindex) == CONTROLMODE_13
// || optionsGetControlMode(g_Vars.currentplayerstats->mpindex) == CONTROLMODE_11)
// && !coreIsPaused()) {
// data->digitalstepleft = contCountButtonsOnSpecificSamples(0, contnum, L_JPAD | L_CBUTTONS);
// data->digitalstepright = contCountButtonsOnSpecificSamples(0, contnum, R_JPAD | R_CBUTTONS);
// && !lvIsPaused()) {
// data->digitalstepleft = joyCountButtonsOnSpecificSamples(0, contnum, L_JPAD | L_CBUTTONS);
// data->digitalstepright = joyCountButtonsOnSpecificSamples(0, contnum, R_JPAD | R_CBUTTONS);
// }
//
// // Forward/back
src/game/bondeyespy.c
+35 -35
View File
@@ -16,7 +16,7 @@
#include "game/propobj.h"
#include "bss.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"
#include "lib/lib_24e40.h"
@@ -651,7 +651,7 @@ bool eyespyTryLaunch(void)
// Launch successful
g_Vars.currentplayer->eyespy->initialised = true;
audioStart(var80095200, SFX_DETONATE, 0, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_DETONATE, 0, -1, -1, -1, -1, -1);
launched = true;
@@ -751,10 +751,10 @@ glabel var7f1adb00
/* f0d0f08: 00022600 */ sll $a0,$v0,0x18
/* f0d0f0c: 00047e03 */ sra $t7,$a0,0x18
/* f0d0f10: a3a200c3 */ sb $v0,0xc3($sp)
/* f0d0f14: 0c0052e6 */ jal contGetStickX
/* f0d0f14: 0c0052e6 */ jal joyGetStickX
/* f0d0f18: 01e02025 */ move $a0,$t7
/* f0d0f1c: 83a400c3 */ lb $a0,0xc3($sp)
/* f0d0f20: 0c005310 */ jal contGetStickY
/* f0d0f20: 0c005310 */ jal joyGetStickY
/* f0d0f24: a3a200c2 */ sb $v0,0xc2($sp)
/* f0d0f28: 8fae00e8 */ lw $t6,0xe8($sp)
/* f0d0f2c: 00023e00 */ sll $a3,$v0,0x18
@@ -767,7 +767,7 @@ glabel var7f1adb00
/* f0d0f48: a3bf00c2 */ sb $ra,0xc2($sp)
/* f0d0f4c: 83a400c3 */ lb $a0,0xc3($sp)
/* f0d0f50: 3405ffff */ li $a1,0xffff
/* f0d0f54: 0c00533a */ jal contGetButtons
/* f0d0f54: 0c00533a */ jal joyGetButtons
/* f0d0f58: a3b900c0 */ sb $t9,0xc0($sp)
/* f0d0f5c: 3c09800a */ lui $t1,0x800a
/* f0d0f60: 2529a510 */ addiu $t1,$t1,-23280
@@ -814,11 +814,11 @@ glabel var7f1adb00
/* f0d0ffc: 000f2600 */ sll $a0,$t7,0x18
/* f0d1000: 0004c603 */ sra $t8,$a0,0x18
/* f0d1004: afaf0074 */ sw $t7,0x74($sp)
/* f0d1008: 0c0052e6 */ jal contGetStickX
/* f0d1008: 0c0052e6 */ jal joyGetStickX
/* f0d100c: 03002025 */ move $a0,$t8
/* f0d1010: 83a40077 */ lb $a0,0x77($sp)
/* f0d1014: a3a200c1 */ sb $v0,0xc1($sp)
/* f0d1018: 0c005310 */ jal contGetStickY
/* f0d1018: 0c005310 */ jal joyGetStickY
/* f0d101c: afa4003c */ sw $a0,0x3c($sp)
/* f0d1020: 8faf00e8 */ lw $t7,0xe8($sp)
/* f0d1024: 00023600 */ sll $a2,$v0,0x18
@@ -839,7 +839,7 @@ glabel var7f1adb00
/* f0d1060: a3a700c0 */ sb $a3,0xc0($sp)
/* f0d1064: a7a800bc */ sh $t0,0xbc($sp)
/* f0d1068: a3aa00c1 */ sb $t2,0xc1($sp)
/* f0d106c: 0c00533a */ jal contGetButtons
/* f0d106c: 0c00533a */ jal joyGetButtons
/* f0d1070: afab00b0 */ sw $t3,0xb0($sp)
/* f0d1074: 3c09800a */ lui $t1,0x800a
/* f0d1078: 2529a510 */ addiu $t1,$t1,-23280
@@ -1955,7 +1955,7 @@ glabel var7f1adb00
/* f0d207c: 00002825 */ move $a1,$zero
/* f0d2080: 24063e80 */ li $a2,0x3e80
/* f0d2084: 24070040 */ li $a3,0x40
/* f0d2088: 0c004125 */ jal func00010718
/* f0d2088: 0c004125 */ jal snd00010718
/* f0d208c: e7a60014 */ swc1 $f6,0x14($sp)
/* f0d2090: 3c09800a */ lui $t1,0x800a
/* f0d2094: 2529a510 */ addiu $t1,$t1,-23280
@@ -1976,7 +1976,7 @@ glabel var7f1adb00
/* f0d20d0: 00002825 */ move $a1,$zero
/* f0d20d4: 24063e80 */ li $a2,0x3e80
/* f0d20d8: 24070040 */ li $a3,0x40
/* f0d20dc: 0c004125 */ jal func00010718
/* f0d20dc: 0c004125 */ jal snd00010718
/* f0d20e0: e7a40014 */ swc1 $f4,0x14($sp)
/* f0d20e4: 3c09800a */ lui $t1,0x800a
/* f0d20e8: 2529a510 */ addiu $t1,$t1,-23280
@@ -1997,7 +1997,7 @@ glabel var7f1adb00
/* f0d2124: 00002825 */ move $a1,$zero
/* f0d2128: 24063e80 */ li $a2,0x3e80
/* f0d212c: 24070040 */ li $a3,0x40
/* f0d2130: 0c004125 */ jal func00010718
/* f0d2130: 0c004125 */ jal snd00010718
/* f0d2134: e7aa0014 */ swc1 $f10,0x14($sp)
/* f0d2138: 3c09800a */ lui $t1,0x800a
/* f0d213c: 2529a510 */ addiu $t1,$t1,-23280
@@ -2018,7 +2018,7 @@ glabel var7f1adb00
/* f0d2178: 00002825 */ move $a1,$zero
/* f0d217c: 24063e80 */ li $a2,0x3e80
/* f0d2180: 24070040 */ li $a3,0x40
/* f0d2184: 0c004125 */ jal func00010718
/* f0d2184: 0c004125 */ jal snd00010718
/* f0d2188: e7a80014 */ swc1 $f8,0x14($sp)
/* f0d218c: 3c09800a */ lui $t1,0x800a
/* f0d2190: 2529a510 */ addiu $t1,$t1,-23280
@@ -2038,7 +2038,7 @@ glabel var7f1adb00
/* f0d21c8: 240500f2 */ li $a1,0xf2
/* f0d21cc: 00003025 */ move $a2,$zero
/* f0d21d0: 2407ffff */ li $a3,-1
/* f0d21d4: 0c0041a0 */ jal audioStart
/* f0d21d4: 0c0041a0 */ jal sndStart
/* f0d21d8: e7a60014 */ swc1 $f6,0x14($sp)
/* f0d21dc: 3c09800a */ lui $t1,0x800a
/* f0d21e0: 2529a510 */ addiu $t1,$t1,-23280
@@ -2364,10 +2364,10 @@ glabel var7f1adb00
/* f0d0968: 00022600 */ sll $a0,$v0,0x18
/* f0d096c: 00047e03 */ sra $t7,$a0,0x18
/* f0d0970: a3a200c3 */ sb $v0,0xc3($sp)
/* f0d0974: 0c005384 */ jal contGetStickX
/* f0d0974: 0c005384 */ jal joyGetStickX
/* f0d0978: 01e02025 */ or $a0,$t7,$zero
/* f0d097c: 83a400c3 */ lb $a0,0xc3($sp)
/* f0d0980: 0c0053ae */ jal contGetStickY
/* f0d0980: 0c0053ae */ jal joyGetStickY
/* f0d0984: a3a200c2 */ sb $v0,0xc2($sp)
/* f0d0988: 8fae00e8 */ lw $t6,0xe8($sp)
/* f0d098c: 00023e00 */ sll $a3,$v0,0x18
@@ -2380,7 +2380,7 @@ glabel var7f1adb00
/* f0d09a8: a3bf00c2 */ sb $ra,0xc2($sp)
/* f0d09ac: 83a400c3 */ lb $a0,0xc3($sp)
/* f0d09b0: 3405ffff */ dli $a1,0xffff
/* f0d09b4: 0c0053d8 */ jal contGetButtons
/* f0d09b4: 0c0053d8 */ jal joyGetButtons
/* f0d09b8: a3b900c0 */ sb $t9,0xc0($sp)
/* f0d09bc: 3c09800a */ lui $t1,%hi(g_Vars)
/* f0d09c0: 25299fc0 */ addiu $t1,$t1,%lo(g_Vars)
@@ -2427,11 +2427,11 @@ glabel var7f1adb00
/* f0d0a5c: 000f2600 */ sll $a0,$t7,0x18
/* f0d0a60: 0004c603 */ sra $t8,$a0,0x18
/* f0d0a64: afaf0074 */ sw $t7,0x74($sp)
/* f0d0a68: 0c005384 */ jal contGetStickX
/* f0d0a68: 0c005384 */ jal joyGetStickX
/* f0d0a6c: 03002025 */ or $a0,$t8,$zero
/* f0d0a70: 83a40077 */ lb $a0,0x77($sp)
/* f0d0a74: a3a200c1 */ sb $v0,0xc1($sp)
/* f0d0a78: 0c0053ae */ jal contGetStickY
/* f0d0a78: 0c0053ae */ jal joyGetStickY
/* f0d0a7c: afa4003c */ sw $a0,0x3c($sp)
/* f0d0a80: 8faf00e8 */ lw $t7,0xe8($sp)
/* f0d0a84: 00023600 */ sll $a2,$v0,0x18
@@ -2452,7 +2452,7 @@ glabel var7f1adb00
/* f0d0ac0: a3a700c0 */ sb $a3,0xc0($sp)
/* f0d0ac4: a7a800bc */ sh $t0,0xbc($sp)
/* f0d0ac8: a3aa00c1 */ sb $t2,0xc1($sp)
/* f0d0acc: 0c0053d8 */ jal contGetButtons
/* f0d0acc: 0c0053d8 */ jal joyGetButtons
/* f0d0ad0: afab00b0 */ sw $t3,0xb0($sp)
/* f0d0ad4: 3c09800a */ lui $t1,%hi(g_Vars)
/* f0d0ad8: 25299fc0 */ addiu $t1,$t1,%lo(g_Vars)
@@ -3567,7 +3567,7 @@ glabel var7f1adb00
/* f0d1ad8: 00002825 */ or $a1,$zero,$zero
/* f0d1adc: 24063e80 */ addiu $a2,$zero,0x3e80
/* f0d1ae0: 24070040 */ addiu $a3,$zero,0x40
/* f0d1ae4: 0c0041c6 */ jal func00010718
/* f0d1ae4: 0c0041c6 */ jal snd00010718
/* f0d1ae8: e7a40014 */ swc1 $f4,0x14($sp)
/* f0d1aec: 3c09800a */ lui $t1,%hi(g_Vars)
/* f0d1af0: 25299fc0 */ addiu $t1,$t1,%lo(g_Vars)
@@ -3588,7 +3588,7 @@ glabel var7f1adb00
/* f0d1b2c: 00002825 */ or $a1,$zero,$zero
/* f0d1b30: 24063e80 */ addiu $a2,$zero,0x3e80
/* f0d1b34: 24070040 */ addiu $a3,$zero,0x40
/* f0d1b38: 0c0041c6 */ jal func00010718
/* f0d1b38: 0c0041c6 */ jal snd00010718
/* f0d1b3c: e7aa0014 */ swc1 $f10,0x14($sp)
/* f0d1b40: 3c09800a */ lui $t1,%hi(g_Vars)
/* f0d1b44: 25299fc0 */ addiu $t1,$t1,%lo(g_Vars)
@@ -3609,7 +3609,7 @@ glabel var7f1adb00
/* f0d1b80: 00002825 */ or $a1,$zero,$zero
/* f0d1b84: 24063e80 */ addiu $a2,$zero,0x3e80
/* f0d1b88: 24070040 */ addiu $a3,$zero,0x40
/* f0d1b8c: 0c0041c6 */ jal func00010718
/* f0d1b8c: 0c0041c6 */ jal snd00010718
/* f0d1b90: e7a80014 */ swc1 $f8,0x14($sp)
/* f0d1b94: 3c09800a */ lui $t1,%hi(g_Vars)
/* f0d1b98: 25299fc0 */ addiu $t1,$t1,%lo(g_Vars)
@@ -3630,7 +3630,7 @@ glabel var7f1adb00
/* f0d1bd4: 00002825 */ or $a1,$zero,$zero
/* f0d1bd8: 24063e80 */ addiu $a2,$zero,0x3e80
/* f0d1bdc: 24070040 */ addiu $a3,$zero,0x40
/* f0d1be0: 0c0041c6 */ jal func00010718
/* f0d1be0: 0c0041c6 */ jal snd00010718
/* f0d1be4: e7a60014 */ swc1 $f6,0x14($sp)
/* f0d1be8: 3c09800a */ lui $t1,%hi(g_Vars)
/* f0d1bec: 25299fc0 */ addiu $t1,$t1,%lo(g_Vars)
@@ -3650,7 +3650,7 @@ glabel var7f1adb00
/* f0d1c24: 240500f2 */ addiu $a1,$zero,0xf2
/* f0d1c28: 00003025 */ or $a2,$zero,$zero
/* f0d1c2c: 2407ffff */ addiu $a3,$zero,-1
/* f0d1c30: 0c004241 */ jal audioStart
/* f0d1c30: 0c004241 */ jal sndStart
/* f0d1c34: e7a40014 */ swc1 $f4,0x14($sp)
/* f0d1c38: 3c09800a */ lui $t1,%hi(g_Vars)
/* f0d1c3c: 25299fc0 */ addiu $t1,$t1,%lo(g_Vars)
@@ -3976,10 +3976,10 @@ glabel var7f1adb00
/* f0ce0f4: 00022600 */ sll $a0,$v0,0x18
/* f0ce0f8: 00047e03 */ sra $t7,$a0,0x18
/* f0ce0fc: a3a200c3 */ sb $v0,0xc3($sp)
/* f0ce100: 0c00573c */ jal contGetStickX
/* f0ce100: 0c00573c */ jal joyGetStickX
/* f0ce104: 01e02025 */ or $a0,$t7,$zero
/* f0ce108: a3a200c2 */ sb $v0,0xc2($sp)
/* f0ce10c: 0c005766 */ jal contGetStickY
/* f0ce10c: 0c005766 */ jal joyGetStickY
/* f0ce110: 83a400c3 */ lb $a0,0xc3($sp)
/* f0ce114: 8fb900e8 */ lw $t9,0xe8($sp)
/* f0ce118: 00023e00 */ sll $a3,$v0,0x18
@@ -3990,7 +3990,7 @@ glabel var7f1adb00
/* f0ce12c: 03003825 */ or $a3,$t8,$zero
/* f0ce130: 83a400c3 */ lb $a0,0xc3($sp)
/* f0ce134: 3405ffff */ dli $a1,0xffff
/* f0ce138: 0c005790 */ jal contGetButtons
/* f0ce138: 0c005790 */ jal joyGetButtons
/* f0ce13c: a3b800c0 */ sb $t8,0xc0($sp)
/* f0ce140: 3c09800a */ lui $t1,0x800a
/* f0ce144: 2529e6c0 */ addiu $t1,$t1,-6464
@@ -4033,11 +4033,11 @@ glabel var7f1adb00
/* f0ce1d0: 000e2600 */ sll $a0,$t6,0x18
/* f0ce1d4: 00047e03 */ sra $t7,$a0,0x18
/* f0ce1d8: afae0074 */ sw $t6,0x74($sp)
/* f0ce1dc: 0c00573c */ jal contGetStickX
/* f0ce1dc: 0c00573c */ jal joyGetStickX
/* f0ce1e0: 01e02025 */ or $a0,$t7,$zero
/* f0ce1e4: 83a40077 */ lb $a0,0x77($sp)
/* f0ce1e8: a3a200c1 */ sb $v0,0xc1($sp)
/* f0ce1ec: 0c005766 */ jal contGetStickY
/* f0ce1ec: 0c005766 */ jal joyGetStickY
/* f0ce1f0: afa4003c */ sw $a0,0x3c($sp)
/* f0ce1f4: 8fae00e8 */ lw $t6,0xe8($sp)
/* f0ce1f8: 00023600 */ sll $a2,$v0,0x18
@@ -4056,7 +4056,7 @@ glabel var7f1adb00
/* f0ce22c: a3a700c0 */ sb $a3,0xc0($sp)
/* f0ce230: a7a800bc */ sh $t0,0xbc($sp)
/* f0ce234: a3ac00c1 */ sb $t4,0xc1($sp)
/* f0ce238: 0c005790 */ jal contGetButtons
/* f0ce238: 0c005790 */ jal joyGetButtons
/* f0ce23c: afad00b0 */ sw $t5,0xb0($sp)
/* f0ce240: 3c09800a */ lui $t1,0x800a
/* f0ce244: 2529e6c0 */ addiu $t1,$t1,-6464
@@ -5198,7 +5198,7 @@ glabel var7f1adb00
/* f0cf2a4: 00002825 */ or $a1,$zero,$zero
/* f0cf2a8: 24063e80 */ addiu $a2,$zero,0x3e80
/* f0cf2ac: 24070040 */ addiu $a3,$zero,0x40
/* f0cf2b0: 0c0042bf */ jal func00010718
/* f0cf2b0: 0c0042bf */ jal snd00010718
/* f0cf2b4: e7a40014 */ swc1 $f4,0x14($sp)
/* f0cf2b8: 3c09800a */ lui $t1,0x800a
/* f0cf2bc: 2529e6c0 */ addiu $t1,$t1,-6464
@@ -5219,7 +5219,7 @@ glabel var7f1adb00
/* f0cf2f8: 00002825 */ or $a1,$zero,$zero
/* f0cf2fc: 24063e80 */ addiu $a2,$zero,0x3e80
/* f0cf300: 24070040 */ addiu $a3,$zero,0x40
/* f0cf304: 0c0042bf */ jal func00010718
/* f0cf304: 0c0042bf */ jal snd00010718
/* f0cf308: e7aa0014 */ swc1 $f10,0x14($sp)
/* f0cf30c: 3c09800a */ lui $t1,0x800a
/* f0cf310: 2529e6c0 */ addiu $t1,$t1,-6464
@@ -5240,7 +5240,7 @@ glabel var7f1adb00
/* f0cf34c: 00002825 */ or $a1,$zero,$zero
/* f0cf350: 24063e80 */ addiu $a2,$zero,0x3e80
/* f0cf354: 24070040 */ addiu $a3,$zero,0x40
/* f0cf358: 0c0042bf */ jal func00010718
/* f0cf358: 0c0042bf */ jal snd00010718
/* f0cf35c: e7a80014 */ swc1 $f8,0x14($sp)
/* f0cf360: 3c09800a */ lui $t1,0x800a
/* f0cf364: 2529e6c0 */ addiu $t1,$t1,-6464
@@ -5261,7 +5261,7 @@ glabel var7f1adb00
/* f0cf3a0: 00002825 */ or $a1,$zero,$zero
/* f0cf3a4: 24063e80 */ addiu $a2,$zero,0x3e80
/* f0cf3a8: 24070040 */ addiu $a3,$zero,0x40
/* f0cf3ac: 0c0042bf */ jal func00010718
/* f0cf3ac: 0c0042bf */ jal snd00010718
/* f0cf3b0: e7a60014 */ swc1 $f6,0x14($sp)
/* f0cf3b4: 3c09800a */ lui $t1,0x800a
/* f0cf3b8: 2529e6c0 */ addiu $t1,$t1,-6464
@@ -5281,7 +5281,7 @@ glabel var7f1adb00
/* f0cf3f0: 240500f2 */ addiu $a1,$zero,0xf2
/* f0cf3f4: 00003025 */ or $a2,$zero,$zero
/* f0cf3f8: 2407ffff */ addiu $a3,$zero,-1
/* f0cf3fc: 0c004338 */ jal audioStart
/* f0cf3fc: 0c004338 */ jal sndStart
/* f0cf400: e7a40014 */ swc1 $f4,0x14($sp)
/* f0cf404: 3c09800a */ lui $t1,0x800a
/* f0cf408: 2529e6c0 */ addiu $t1,$t1,-6464
src/game/bondmove.c
+186 -186
View File
File diff suppressed because it is too large Load Diff
src/game/bondview.c
+16 -16
View File
@@ -3760,25 +3760,25 @@ glabel var7f1b5f58
/* f145e68: 00047e03 */ sra $t7,$a0,0x18
/* f145e6c: 01c08025 */ move $s0,$t6
/* f145e70: 01e02025 */ move $a0,$t7
/* f145e74: 0c00533a */ jal contGetButtons
/* f145e74: 0c00533a */ jal joyGetButtons
/* f145e78: 3405ffff */ li $a1,0xffff
/* f145e7c: 00102600 */ sll $a0,$s0,0x18
/* f145e80: 0004c603 */ sra $t8,$a0,0x18
/* f145e84: 03002025 */ move $a0,$t8
/* f145e88: 3051ffff */ andi $s1,$v0,0xffff
/* f145e8c: 0c00536a */ jal contGetButtonsPressedThisFrame
/* f145e8c: 0c00536a */ jal joyGetButtonsPressedThisFrame
/* f145e90: 3405ffff */ li $a1,0xffff
/* f145e94: 00102600 */ sll $a0,$s0,0x18
/* f145e98: 0004ce03 */ sra $t9,$a0,0x18
/* f145e9c: 3053ffff */ andi $s3,$v0,0xffff
/* f145ea0: 0c0052e6 */ jal contGetStickX
/* f145ea0: 0c0052e6 */ jal joyGetStickX
/* f145ea4: 03202025 */ move $a0,$t9
/* f145ea8: 0002ae00 */ sll $s5,$v0,0x18
/* f145eac: 00102600 */ sll $a0,$s0,0x18
/* f145eb0: 00047e03 */ sra $t7,$a0,0x18
/* f145eb4: 00157603 */ sra $t6,$s5,0x18
/* f145eb8: 01c0a825 */ move $s5,$t6
/* f145ebc: 0c005310 */ jal contGetStickY
/* f145ebc: 0c005310 */ jal joyGetStickY
/* f145ec0: 01e02025 */ move $a0,$t7
/* f145ec4: 02801825 */ move $v1,$s4
/* f145ec8: 26940008 */ addiu $s4,$s4,0x8
@@ -7742,23 +7742,23 @@ glabel var7f1b5f58
/* f1451ac: 0004c603 */ sra $t8,$a0,0x18
/* f1451b0: 01c08025 */ or $s0,$t6,$zero
/* f1451b4: 03002025 */ or $a0,$t8,$zero
/* f1451b8: 0c0053d8 */ jal contGetButtons
/* f1451b8: 0c0053d8 */ jal joyGetButtons
/* f1451bc: 3405ffff */ dli $a1,0xffff
/* f1451c0: 00102600 */ sll $a0,$s0,0x18
/* f1451c4: 00047e03 */ sra $t7,$a0,0x18
/* f1451c8: 01e02025 */ or $a0,$t7,$zero
/* f1451cc: 3051ffff */ andi $s1,$v0,0xffff
/* f1451d0: 0c005408 */ jal contGetButtonsPressedThisFrame
/* f1451d0: 0c005408 */ jal joyGetButtonsPressedThisFrame
/* f1451d4: 3405ffff */ dli $a1,0xffff
/* f1451d8: 00102600 */ sll $a0,$s0,0x18
/* f1451dc: 0004ce03 */ sra $t9,$a0,0x18
/* f1451e0: 3052ffff */ andi $s2,$v0,0xffff
/* f1451e4: 0c005384 */ jal contGetStickX
/* f1451e4: 0c005384 */ jal joyGetStickX
/* f1451e8: 03202025 */ or $a0,$t9,$zero
/* f1451ec: 00102600 */ sll $a0,$s0,0x18
/* f1451f0: 00047603 */ sra $t6,$a0,0x18
/* f1451f4: 01c02025 */ or $a0,$t6,$zero
/* f1451f8: 0c0053ae */ jal contGetStickY
/* f1451f8: 0c0053ae */ jal joyGetStickY
/* f1451fc: a3a20251 */ sb $v0,0x251($sp)
/* f145200: 02a01825 */ or $v1,$s5,$zero
/* f145204: 26b50008 */ addiu $s5,$s5,0x8
@@ -11538,23 +11538,23 @@ glabel var7f1b5f58
/* f13fad0: 0004c603 */ sra $t8,$a0,0x18
/* f13fad4: 03208025 */ or $s0,$t9,$zero
/* f13fad8: 03002025 */ or $a0,$t8,$zero
/* f13fadc: 0c005790 */ jal contGetButtons
/* f13fadc: 0c005790 */ jal joyGetButtons
/* f13fae0: 3405ffff */ dli $a1,0xffff
/* f13fae4: 00102600 */ sll $a0,$s0,0x18
/* f13fae8: 00047e03 */ sra $t7,$a0,0x18
/* f13faec: 01e02025 */ or $a0,$t7,$zero
/* f13faf0: 3051ffff */ andi $s1,$v0,0xffff
/* f13faf4: 0c0057c0 */ jal contGetButtonsPressedThisFrame
/* f13faf4: 0c0057c0 */ jal joyGetButtonsPressedThisFrame
/* f13faf8: 3405ffff */ dli $a1,0xffff
/* f13fafc: 00102600 */ sll $a0,$s0,0x18
/* f13fb00: 00047603 */ sra $t6,$a0,0x18
/* f13fb04: 3052ffff */ andi $s2,$v0,0xffff
/* f13fb08: 0c00573c */ jal contGetStickX
/* f13fb08: 0c00573c */ jal joyGetStickX
/* f13fb0c: 01c02025 */ or $a0,$t6,$zero
/* f13fb10: 00102600 */ sll $a0,$s0,0x18
/* f13fb14: 0004ce03 */ sra $t9,$a0,0x18
/* f13fb18: 03202025 */ or $a0,$t9,$zero
/* f13fb1c: 0c005766 */ jal contGetStickY
/* f13fb1c: 0c005766 */ jal joyGetStickY
/* f13fb20: a3a2023d */ sb $v0,0x23d($sp)
/* f13fb24: 02a01825 */ or $v1,$s5,$zero
/* f13fb28: 26b50008 */ addiu $s5,$s5,0x8
@@ -14045,10 +14045,10 @@ glabel var7f1b5f58
// // 5190
// {
// s8 contpadnum = optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex);
// u16 buttonsdown = contGetButtons(contpadnum, 0xffff);
// u16 buttonsthisframe = contGetButtonsPressedThisFrame(contpadnum, 0xffff);
// s8 cstickx = contGetStickX(contpadnum); // 251
// s8 csticky = contGetStickY(contpadnum);
// u16 buttonsdown = joyGetButtons(contpadnum, 0xffff);
// u16 buttonsthisframe = joyGetButtonsPressedThisFrame(contpadnum, 0xffff);
// s8 cstickx = joyGetStickX(contpadnum); // 251
// s8 csticky = joyGetStickY(contpadnum);
// s32 xpos;
// s32 tmpval;
// u8 brightness;
src/game/bondwalk.c
+4 -4
View File
@@ -17,7 +17,7 @@
#include "game/game_127910.h"
#include "game/propobj.h"
#include "bss.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/lib_233c0.h"
@@ -945,7 +945,7 @@ glabel bwalkCalculateNewPositionWithPush
/* f0c43a8: 240500f2 */ addiu $a1,$zero,0xf2
/* f0c43ac: 00003025 */ or $a2,$zero,$zero
/* f0c43b0: 2407ffff */ addiu $a3,$zero,-1
/* f0c43b4: 0c004241 */ jal audioStart
/* f0c43b4: 0c004241 */ jal sndStart
/* f0c43b8: e7a80014 */ swc1 $f8,0x14($sp)
/* f0c43bc: 100000e5 */ b .L0f0c4754
/* f0c43c0: 8fbf0024 */ lw $ra,0x24($sp)
@@ -1288,7 +1288,7 @@ glabel bwalkCalculateNewPositionWithPush
/* f0c43a8: 240500f2 */ addiu $a1,$zero,0xf2
/* f0c43ac: 00003025 */ or $a2,$zero,$zero
/* f0c43b0: 2407ffff */ addiu $a3,$zero,-1
/* f0c43b4: 0c004241 */ jal audioStart
/* f0c43b4: 0c004241 */ jal sndStart
/* f0c43b8: e7a80014 */ swc1 $f8,0x14($sp)
/* f0c43bc: 100000e5 */ b .L0f0c4754
/* f0c43c0: 8fbf0024 */ lw $ra,0x24($sp)
@@ -1570,7 +1570,7 @@ glabel bwalkCalculateNewPositionWithPush
// func0f03417c(g_Vars.currentplayer->prop->chr, 0.4f, &sp90, 0, g_Vars.currentplayer->prop);
//
// // Laser zap sound
// audioStart(var80095200, SFX_PICKUP_LASER, 0, -1, -1, -1, -1, -1);
// sndStart(var80095200, SFX_PICKUP_LASER, 0, -1, -1, -1, -1, -1);
// }
// }
// } else if (obstacle->type == PROPTYPE_CHR) {
src/game/camdraw.c
+1 -1
View File
@@ -4,7 +4,7 @@
#include "game/game_0b3350.h"
#include "game/game_0f09f0.h"
#include "game/stubs/game_102230.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/lang.h"
#include "game/pak/pak.h"
#include "game/splat.h"
src/game/casing/tick.c
+3 -3
View File
@@ -2,7 +2,7 @@
#include "constants.h"
#include "game/casing.h"
#include "bss.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/lib_317f0.h"
@@ -116,7 +116,7 @@ glabel casingTick
/* f01db68: 02003025 */ or $a2,$s0,$zero
/* f01db6c: 24058051 */ addiu $a1,$zero,-32687
/* f01db70: 2407ffff */ addiu $a3,$zero,-1
/* f01db74: 0c004241 */ jal audioStart
/* f01db74: 0c004241 */ jal sndStart
/* f01db78: e7a60014 */ swc1 $f6,0x14($sp)
/* f01db7c: 8e040000 */ lw $a0,0x0($s0)
/* f01db80: 24050010 */ addiu $a1,$zero,0x10
@@ -358,7 +358,7 @@ glabel casingTick
/* f01db68: 02003025 */ or $a2,$s0,$zero
/* f01db6c: 24058051 */ addiu $a1,$zero,-32687
/* f01db70: 2407ffff */ addiu $a3,$zero,-1
/* f01db74: 0c004241 */ jal audioStart
/* f01db74: 0c004241 */ jal sndStart
/* f01db78: e7a60014 */ swc1 $f6,0x14($sp)
/* f01db7c: 8e040000 */ lw $a0,0x0($s0)
/* f01db80: 24050010 */ addiu $a1,$zero,0x10
src/game/chr/chr.c
+1 -1
View File
@@ -23,7 +23,7 @@
#include "game/explosions/explosions.h"
#include "game/smoke/smoke.h"
#include "game/sparks/sparks.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/game_165670.h"
#include "game/file.h"
#include "game/mplayer/setup.h"
src/game/chr/chraction.c
+17 -17
View File
@@ -24,11 +24,11 @@
#include "game/game_127910.h"
#include "game/explosions/explosions.h"
#include "game/sparks/sparks.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/game_1655c0.h"
#include "game/game_165670.h"
#include "game/game_1657c0.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/game_190260.h"
#include "game/game_197600.h"
#include "game/game_1999b0.h"
@@ -42,7 +42,7 @@
#include "bss.h"
#include "lib/main.h"
#include "lib/model.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
@@ -4829,14 +4829,14 @@ glabel var7f1a8d44
/* f031c60: 10000010 */ b .L0f031ca4
/* f031c64: afa000d4 */ sw $zero,0xd4($sp)
.L0f031c68:
/* f031c68: 0fc5b367 */ jal coreGetDifficulty
/* f031c68: 0fc5b367 */ jal lvGetDifficulty
/* f031c6c: 00000000 */ nop
/* f031c70: 14400003 */ bnez $v0,.L0f031c80
/* f031c74: 24190002 */ addiu $t9,$zero,0x2
/* f031c78: 1000000a */ b .L0f031ca4
/* f031c7c: afb900d4 */ sw $t9,0xd4($sp)
.L0f031c80:
/* f031c80: 0fc5b367 */ jal coreGetDifficulty
/* f031c80: 0fc5b367 */ jal lvGetDifficulty
/* f031c84: 00000000 */ nop
/* f031c88: 24010001 */ addiu $at,$zero,0x1
/* f031c8c: 14410004 */ bne $v0,$at,.L0f031ca0
@@ -6041,14 +6041,14 @@ glabel var7f1a8d44
/* f031c60: 10000010 */ b .L0f031ca4
/* f031c64: afa000d4 */ sw $zero,0xd4($sp)
.L0f031c68:
/* f031c68: 0fc5b367 */ jal coreGetDifficulty
/* f031c68: 0fc5b367 */ jal lvGetDifficulty
/* f031c6c: 00000000 */ nop
/* f031c70: 14400003 */ bnez $v0,.L0f031c80
/* f031c74: 24190002 */ addiu $t9,$zero,0x2
/* f031c78: 1000000a */ b .L0f031ca4
/* f031c7c: afb900d4 */ sw $t9,0xd4($sp)
.L0f031c80:
/* f031c80: 0fc5b367 */ jal coreGetDifficulty
/* f031c80: 0fc5b367 */ jal lvGetDifficulty
/* f031c84: 00000000 */ nop
/* f031c88: 24010001 */ addiu $at,$zero,0x1
/* f031c8c: 14410004 */ bne $v0,$at,.L0f031ca0
@@ -7251,14 +7251,14 @@ glabel var7f1a8d44
/* f03159c: 10000010 */ beqz $zero,.NB0f0315e0
/* f0315a0: afa000d4 */ sw $zero,0xd4($sp)
.NB0f0315a4:
/* f0315a4: 0fc59ed3 */ jal coreGetDifficulty
/* f0315a4: 0fc59ed3 */ jal lvGetDifficulty
/* f0315a8: 00000000 */ sll $zero,$zero,0x0
/* f0315ac: 14400003 */ bnez $v0,.NB0f0315bc
/* f0315b0: 24190002 */ addiu $t9,$zero,0x2
/* f0315b4: 1000000a */ beqz $zero,.NB0f0315e0
/* f0315b8: afb900d4 */ sw $t9,0xd4($sp)
.NB0f0315bc:
/* f0315bc: 0fc59ed3 */ jal coreGetDifficulty
/* f0315bc: 0fc59ed3 */ jal lvGetDifficulty
/* f0315c0: 00000000 */ sll $zero,$zero,0x0
/* f0315c4: 24010001 */ addiu $at,$zero,0x1
/* f0315c8: 14410004 */ bne $v0,$at,.NB0f0315dc
@@ -10442,7 +10442,7 @@ glabel func0f0338e0
/* f033f00: afa80018 */ sw $t0,0x18($sp)
/* f033f04: afaf0010 */ sw $t7,0x10($sp)
/* f033f08: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f033f0c: 0c004241 */ jal audioStart
/* f033f0c: 0c004241 */ jal sndStart
/* f033f10: e7a00014 */ swc1 $f0,0x14($sp)
/* f033f14: 1000001f */ b .L0f033f94
/* f033f18: 8fbf0044 */ lw $ra,0x44($sp)
@@ -10904,7 +10904,7 @@ glabel func0f0338e0
/* f033f00: afa80018 */ sw $t0,0x18($sp)
/* f033f04: afaf0010 */ sw $t7,0x10($sp)
/* f033f08: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f033f0c: 0c004241 */ jal audioStart
/* f033f0c: 0c004241 */ jal sndStart
/* f033f10: e7a00014 */ swc1 $f0,0x14($sp)
/* f033f14: 1000001f */ b .L0f033f94
/* f033f18: 8fbf0044 */ lw $ra,0x44($sp)
@@ -11682,7 +11682,7 @@ glabel var7f1a8d98
/* f034e88: 3c04800a */ lui $a0,0x800a
/* f034e8c: 8084a79f */ lb $a0,-0x5861($a0)
/* f034e90: 27a500e0 */ addiu $a1,$sp,0xe0
/* f034e94: 0c005416 */ jal func000152d0
/* f034e94: 0c005416 */ jal joy000152d0
/* f034e98: 27a600dc */ addiu $a2,$sp,0xdc
/* f034e9c: 8fa400e0 */ lw $a0,0xe0($sp)
/* f034ea0: 3c053e80 */ lui $a1,0x3e80
@@ -12574,7 +12574,7 @@ glabel var7f1a8d98
/* f035b64: 25f80001 */ addiu $t8,$t7,0x1
/* f035b68: a21802ff */ sb $t8,0x2ff($s0)
.PF0f035b6c:
/* f035b6c: 0fc5b6f7 */ jal coreIsPaused
/* f035b6c: 0fc5b6f7 */ jal lvIsPaused
/* f035b70: 00000000 */ nop
/* f035b74: 14400005 */ bnez $v0,.PF0f035b8c
/* f035b78: 8fad00f4 */ lw $t5,0xf4($sp)
@@ -13819,7 +13819,7 @@ glabel var7f1a8d98
/* f034d20: 3c04800a */ lui $a0,%hi(g_Vars+0x28f)
/* f034d24: 8084a24f */ lb $a0,%lo(g_Vars+0x28f)($a0)
/* f034d28: 27a500e0 */ addiu $a1,$sp,0xe0
/* f034d2c: 0c0054b4 */ jal func000152d0
/* f034d2c: 0c0054b4 */ jal joy000152d0
/* f034d30: 27a600dc */ addiu $a2,$sp,0xdc
/* f034d34: 8fa400e0 */ lw $a0,0xe0($sp)
/* f034d38: 3c053e80 */ lui $a1,0x3e80
@@ -14711,7 +14711,7 @@ glabel var7f1a8d98
/* f0359fc: 25f80001 */ addiu $t8,$t7,0x1
/* f035a00: a21802ff */ sb $t8,0x2ff($s0)
.L0f035a04:
/* f035a04: 0fc5b364 */ jal coreIsPaused
/* f035a04: 0fc5b364 */ jal lvIsPaused
/* f035a08: 00000000 */ nop
/* f035a0c: 14400005 */ bnez $v0,.L0f035a24
/* f035a10: 8fad00f4 */ lw $t5,0xf4($sp)
@@ -16878,7 +16878,7 @@ glabel var7f1a8d98
/* f03536c: 254b0001 */ addiu $t3,$t2,0x1
/* f035370: a20b02ff */ sb $t3,0x2ff($s0)
.NB0f035374:
/* f035374: 0fc59ed0 */ jal coreIsPaused
/* f035374: 0fc59ed0 */ jal lvIsPaused
/* f035378: 00000000 */ sll $zero,$zero,0x0
/* f03537c: 14400005 */ bnez $v0,.NB0f035394
/* f035380: 8faf00fc */ lw $t7,0xfc($sp)
@@ -32674,7 +32674,7 @@ void robotAttack(struct chrdata *chr)
chr->unk348->unk08 = -1;
chr->unk348->unk0c = 0.85f;
if ((coreGetDifficulty() == DIFF_PA) * 0.2f) {
if ((lvGetDifficulty() == DIFF_PA) * 0.2f) {
chr->unk348->unk10 = 2.0f;
} else {
chr->unk348->unk10 = 1.0f;
src/game/chr/chraicommands.c
+31 -31
View File
@@ -26,11 +26,11 @@
#include "game/explosions/explosions.h"
#include "game/smoke/smoke.h"
#include "game/weather/weather.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/game_1655c0.h"
#include "game/game_165670.h"
#include "game/game_1657c0.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/music.h"
#include "game/training/training.h"
#include "game/gamefile.h"
@@ -42,7 +42,7 @@
#include "bss.h"
#include "lib/main.h"
#include "lib/model.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/lib_11420.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
@@ -2593,7 +2593,7 @@ bool aiIfObjectiveComplete(void)
if (cmd[2] < objectiveGetCount() &&
objectiveCheck(cmd[2]) == OBJECTIVE_COMPLETE &&
objectiveGetDifficultyBits(cmd[2]) & (1 << coreGetDifficulty())) {
objectiveGetDifficultyBits(cmd[2]) & (1 << lvGetDifficulty())) {
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]);
} else {
g_Vars.aioffset += 4;
@@ -2611,7 +2611,7 @@ bool aiIfObjectiveFailed(void)
if (cmd[2] < objectiveGetCount() &&
objectiveCheck(cmd[2]) == OBJECTIVE_FAILED &&
objectiveGetDifficultyBits(cmd[2]) & (1 << coreGetDifficulty())) {
objectiveGetDifficultyBits(cmd[2]) & (1 << lvGetDifficulty())) {
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]);
} else {
g_Vars.aioffset += 4;
@@ -2853,7 +2853,7 @@ bool aiIfDifficultyLessThan(void)
{
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
if (coreGetDifficulty() < cmd[2]) {
if (lvGetDifficulty() < cmd[2]) {
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]);
} else {
g_Vars.aioffset += 4;
@@ -2869,7 +2869,7 @@ bool aiIfDifficultyGreaterThan(void)
{
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
if (coreGetDifficulty() > cmd[2]) {
if (lvGetDifficulty() > cmd[2]) {
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]);
} else {
g_Vars.aioffset += 4;
@@ -2885,7 +2885,7 @@ bool aiIfStageTimerLessThan(void)
{
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
f32 target = (f32)(cmd[3] | (cmd[2] << 8));
f32 time = coreGetStageTimeInSeconds();
f32 time = lvGetStageTimeInSeconds();
if (time < target) {
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]);
@@ -2903,7 +2903,7 @@ bool aiIfStageTimerGreaterThan(void)
{
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
f32 target = (f32)(cmd[3] | (cmd[2] << 8));
f32 time = coreGetStageTimeInSeconds();
f32 time = lvGetStageTimeInSeconds();
if (time > target) {
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]);
@@ -4280,7 +4280,7 @@ bool aiTryEquipWeapon(void)
prop = chrGiveWeapon(g_Vars.chrdata, MODEL_CHRDYROCKET, WEAPON_ROCKETLAUNCHER, flags);
break;
case WEAPON_K7AVENGER:
if (g_Vars.stagenum == STAGE_INVESTIGATION && coreGetDifficulty() == DIFF_PA) {
if (g_Vars.stagenum == STAGE_INVESTIGATION && lvGetDifficulty() == DIFF_PA) {
prop = chrGiveWeapon(g_Vars.chrdata, model, cmd[4], flags);
} else {
prop = chrGiveWeapon(g_Vars.chrdata, MODEL_CHRDYROCKET, WEAPON_ROCKETLAUNCHER, flags);
@@ -4419,7 +4419,7 @@ glabel var7f1a3ff0nb
/* f054d58: 24010033 */ addiu $at,$zero,0x33
/* f054d5c: 14410011 */ bne $v0,$at,.NB0f054da4
/* f054d60: 00000000 */ sll $zero,$zero,0x0
/* f054d64: 0fc59ed3 */ jal coreGetDifficulty
/* f054d64: 0fc59ed3 */ jal lvGetDifficulty
/* f054d68: afa30018 */ sw $v1,0x18($sp)
/* f054d6c: 24010002 */ addiu $at,$zero,0x2
/* f054d70: 8fa30018 */ lw $v1,0x18($sp)
@@ -4470,7 +4470,7 @@ glabel var7f1a3ff0nb
/* f054e1c: 24010033 */ addiu $at,$zero,0x33
/* f054e20: 1721000e */ bne $t9,$at,.NB0f054e5c
/* f054e24: 00000000 */ sll $zero,$zero,0x0
/* f054e28: 0fc59ed3 */ jal coreGetDifficulty
/* f054e28: 0fc59ed3 */ jal lvGetDifficulty
/* f054e2c: 00000000 */ sll $zero,$zero,0x0
/* f054e30: 24010002 */ addiu $at,$zero,0x2
/* f054e34: 14410009 */ bne $v0,$at,.NB0f054e5c
@@ -4833,7 +4833,7 @@ glabel aiSpeak
/* f0561a0: 87a4003e */ lh $a0,0x3e($sp)
/* f0561a4: 11e00009 */ beqz $t7,.L0f0561cc
/* f0561a8: 00000000 */ nop
/* f0561ac: 0c004103 */ jal audioIsFiltered
/* f0561ac: 0c004103 */ jal sndIsFiltered
/* f0561b0: afa70030 */ sw $a3,0x30($sp)
/* f0561b4: 14400005 */ bnez $v0,.L0f0561cc
/* f0561b8: 8fa70030 */ lw $a3,0x30($sp)
@@ -4883,7 +4883,7 @@ glabel aiSpeak
// channelnum = audioPlayFromProp(cmd[7], audio_id, 0, g_Vars.chrdata->prop, 9, 512);
// }
//
// if (text && !audioIsFiltered(audio_id)) {
// if (text && !sndIsFiltered(audio_id)) {
// func0f0de160(text, 6, cmd[8], channelnum);
// }
//
@@ -7993,7 +7993,7 @@ glabel var7f1a9d64
/* f05aa8c: 0fc5bdaa */ jal langGet
/* f05aa90: 84849362 */ lh $a0,-0x6c9e($a0)
/* f05aa94: afa20080 */ sw $v0,0x80($sp)
/* f05aa98: 0c004062 */ jal audioIsFiltered
/* f05aa98: 0c004062 */ jal sndIsFiltered
/* f05aa9c: 87a400a4 */ lh $a0,0xa4($sp)
/* f05aaa0: 144000c4 */ bnez $v0,.PF0f05adb4
/* f05aaa4: 8fa40080 */ lw $a0,0x80($sp)
@@ -8016,7 +8016,7 @@ glabel var7f1a9d64
/* f05aae4: 0fc5bdaa */ jal langGet
/* f05aae8: 84849362 */ lh $a0,-0x6c9e($a0)
/* f05aaec: afa20080 */ sw $v0,0x80($sp)
/* f05aaf0: 0c004062 */ jal audioIsFiltered
/* f05aaf0: 0c004062 */ jal sndIsFiltered
/* f05aaf4: 87a400a4 */ lh $a0,0xa4($sp)
/* f05aaf8: 144000ae */ bnez $v0,.PF0f05adb4
/* f05aafc: 8fa40080 */ lw $a0,0x80($sp)
@@ -8184,7 +8184,7 @@ glabel var7f1a9d64
/* f05ad58: 0fc5bdaa */ jal langGet
/* f05ad5c: 84849360 */ lh $a0,-0x6ca0($a0)
/* f05ad60: afa20080 */ sw $v0,0x80($sp)
/* f05ad64: 0c004062 */ jal audioIsFiltered
/* f05ad64: 0c004062 */ jal sndIsFiltered
/* f05ad68: 87a400a4 */ lh $a0,0xa4($sp)
/* f05ad6c: 14400011 */ bnez $v0,.PF0f05adb4
/* f05ad70: 8fa40080 */ lw $a0,0x80($sp)
@@ -8654,7 +8654,7 @@ glabel var7f1a9d64
/* f05a888: 0fc5b9f1 */ jal langGet
/* f05a88c: 84849682 */ lh $a0,%lo(g_SpecialQuipBank+0x16a)($a0)
/* f05a890: afa20080 */ sw $v0,0x80($sp)
/* f05a894: 0c004103 */ jal audioIsFiltered
/* f05a894: 0c004103 */ jal sndIsFiltered
/* f05a898: 87a400a4 */ lh $a0,0xa4($sp)
/* f05a89c: 144000c4 */ bnez $v0,.L0f05abb0
/* f05a8a0: 8fa40080 */ lw $a0,0x80($sp)
@@ -8677,7 +8677,7 @@ glabel var7f1a9d64
/* f05a8e0: 0fc5b9f1 */ jal langGet
/* f05a8e4: 84849682 */ lh $a0,%lo(g_SpecialQuipBank+0x16a)($a0)
/* f05a8e8: afa20080 */ sw $v0,0x80($sp)
/* f05a8ec: 0c004103 */ jal audioIsFiltered
/* f05a8ec: 0c004103 */ jal sndIsFiltered
/* f05a8f0: 87a400a4 */ lh $a0,0xa4($sp)
/* f05a8f4: 144000ae */ bnez $v0,.L0f05abb0
/* f05a8f8: 8fa40080 */ lw $a0,0x80($sp)
@@ -8845,7 +8845,7 @@ glabel var7f1a9d64
/* f05ab54: 0fc5b9f1 */ jal langGet
/* f05ab58: 84849680 */ lh $a0,%lo(g_SpecialQuipBank+0x168)($a0)
/* f05ab5c: afa20080 */ sw $v0,0x80($sp)
/* f05ab60: 0c004103 */ jal audioIsFiltered
/* f05ab60: 0c004103 */ jal sndIsFiltered
/* f05ab64: 87a400a4 */ lh $a0,0xa4($sp)
/* f05ab68: 14400011 */ bnez $v0,.L0f05abb0
/* f05ab6c: 8fa40080 */ lw $a0,0x80($sp)
@@ -9708,14 +9708,14 @@ glabel var7f1a9d64
//
// text = langGet(g_QuipTexts[cmd[8] - 1][1 + column]);
//
// if (!audioIsFiltered(audioid)) {
// if (!sndIsFiltered(audioid)) {
// // 8ac
// hudmsgCreateViaPresetWithColour(text, 6, cmd[9]);
// }
// } else if (cmd[8]) {
// text = langGet(g_QuipTexts[cmd[8] - 1][1 + g_Vars.chrdata->tude]);
//
// if (!audioIsFiltered(audioid)) {
// if (!sndIsFiltered(audioid)) {
// // 904
// hudmsgCreateViaPresetWithColour(text, 6, cmd[9]);
// }
@@ -9769,7 +9769,7 @@ glabel var7f1a9d64
// if (cmd[8]) {
// text = langGet(g_QuipTexts[cmd[8] - 1][i]);
//
// if (!audioIsFiltered(audioid)) {
// if (!sndIsFiltered(audioid)) {
// // b78
// hudmsgCreateViaPresetWithColour(text, 6, cmd[9]);
// }
@@ -12012,7 +12012,7 @@ bool aiChrBeginOrEndTeleport(void)
osSetThreadPri(0, audiopri + 1);
#endif
handle = audioStart(var80095200, SFX_RELOAD_FARSIGHT, NULL, -1, -1, -1, -1, -1);
handle = sndStart(var80095200, SFX_RELOAD_FARSIGHT, NULL, -1, -1, -1, -1, -1);
if (handle) {
func00033e50(handle, 16, *(u32 *)&fvalue);
@@ -12063,7 +12063,7 @@ bool aiIfChrTeleportFullWhite(void)
osSetThreadPri(0, audiopri + 1);
#endif
handle = audioStart(var80095200, SFX_FIRE_SHOTGUN, NULL, -1, -1, -1, -1, -1);
handle = sndStart(var80095200, SFX_FIRE_SHOTGUN, NULL, -1, -1, -1, -1, -1);
if (handle) {
func00033e50(handle, 16, *(u32 *)&fvalue);
@@ -12189,7 +12189,7 @@ bool aiFadeScreen(void)
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
u32 color = (cmd[3] << 16) | (cmd[4] << 8) | cmd[5] | (cmd[2] << 24);
s16 num_frames = (cmd[7] | (cmd[6] << 8));
coreConfigureFade(color, num_frames);
lvConfigureFade(color, num_frames);
g_Vars.aioffset += 8;
return false;
@@ -12202,7 +12202,7 @@ bool aiIfFadeComplete(void)
{
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
if (coreIsFadeActive() == false) {
if (lvIsFadeActive() == false) {
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]);
} else {
g_Vars.aioffset += 3;
@@ -12484,7 +12484,7 @@ bool aiConfigureEnvironment(void)
}
break;
case AIENVCMD_PLAYNOSEDIVE:
envPlayNosedive(value);
sndPlayNosedive(value);
break;
case AIENVCMD_0B:
func0001190c();
@@ -12493,13 +12493,13 @@ bool aiConfigureEnvironment(void)
roomSetLightsFaulty(room_id, value);
break;
case AIENVCMD_STOPNOSEDIVE:
envStopNosedive();
sndStopNosedive();
break;
case AIENVCMD_PLAYUFOHUM:
envPlayUfoHum(value);
sndPlayUfoHum(value);
break;
case AIENVCMD_STOPUFOHUM:
envStopUfoHum();
sndStopUfoHum();
break;
}
src/game/credits.c
+23 -23
View File
@@ -11,7 +11,7 @@
#include "game/game_1531a0.h"
#include "game/file.h"
#include "game/gfxmemory.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/music.h"
#include "game/lang.h"
#include "bss.h"
@@ -849,7 +849,7 @@ glabel var7f1b5824
/* f138a78: 00000000 */ nop
/* f138a7c: 4500000d */ bc1f .L0f138ab4
/* f138a80: 00000000 */ nop
/* f138a84: 0c0053d8 */ jal contGetButtons
/* f138a84: 0c0053d8 */ jal joyGetButtons
/* f138a88: 24050030 */ addiu $a1,$zero,0x30
/* f138a8c: 14400009 */ bnez $v0,.L0f138ab4
/* f138a90: 00000000 */ nop
@@ -880,7 +880,7 @@ glabel var7f1b5824
/* f138aec: 00000000 */ nop
/* f138af0: 4502000e */ bc1fl .L0f138b2c
/* f138af4: 00002025 */ or $a0,$zero,$zero
/* f138af8: 0c0053d8 */ jal contGetButtons
/* f138af8: 0c0053d8 */ jal joyGetButtons
/* f138afc: 24050030 */ addiu $a1,$zero,0x30
/* f138b00: 5440000a */ bnezl $v0,.L0f138b2c
/* f138b04: 00002025 */ or $a0,$zero,$zero
@@ -894,7 +894,7 @@ glabel var7f1b5824
/* f138b24: 00000000 */ nop
/* f138b28: 00002025 */ or $a0,$zero,$zero
.L0f138b2c:
/* f138b2c: 0c005408 */ jal contGetButtonsPressedThisFrame
/* f138b2c: 0c005408 */ jal joyGetButtonsPressedThisFrame
/* f138b30: 24050010 */ addiu $a1,$zero,0x10
/* f138b34: 10400014 */ beqz $v0,.L0f138b88
/* f138b38: 00000000 */ nop
@@ -1195,7 +1195,7 @@ glabel var7f1b5824
/* f138a78: 00000000 */ nop
/* f138a7c: 4500000d */ bc1f .L0f138ab4
/* f138a80: 00000000 */ nop
/* f138a84: 0c0053d8 */ jal contGetButtons
/* f138a84: 0c0053d8 */ jal joyGetButtons
/* f138a88: 24050030 */ addiu $a1,$zero,0x30
/* f138a8c: 14400009 */ bnez $v0,.L0f138ab4
/* f138a90: 00000000 */ nop
@@ -1226,7 +1226,7 @@ glabel var7f1b5824
/* f138aec: 00000000 */ nop
/* f138af0: 4502000e */ bc1fl .L0f138b2c
/* f138af4: 00002025 */ or $a0,$zero,$zero
/* f138af8: 0c0053d8 */ jal contGetButtons
/* f138af8: 0c0053d8 */ jal joyGetButtons
/* f138afc: 24050030 */ addiu $a1,$zero,0x30
/* f138b00: 5440000a */ bnezl $v0,.L0f138b2c
/* f138b04: 00002025 */ or $a0,$zero,$zero
@@ -1240,7 +1240,7 @@ glabel var7f1b5824
/* f138b24: 00000000 */ nop
/* f138b28: 00002025 */ or $a0,$zero,$zero
.L0f138b2c:
/* f138b2c: 0c005408 */ jal contGetButtonsPressedThisFrame
/* f138b2c: 0c005408 */ jal joyGetButtonsPressedThisFrame
/* f138b30: 24050010 */ addiu $a1,$zero,0x10
/* f138b34: 10400014 */ beqz $v0,.L0f138b88
/* f138b38: 00000000 */ nop
@@ -1791,17 +1791,17 @@ glabel var7f1b5824
// g_CreditsData->unk41f5 = -1;
// }
// } else {
// if (random() * (1.0f / U32_MAX) < 0.007f && contGetButtons(0, L_TRIG | R_TRIG) == 0) {
// if (random() * (1.0f / U32_MAX) < 0.007f && joyGetButtons(0, L_TRIG | R_TRIG) == 0) {
// g_CreditsData->unk41f5 = random() % 4;
// g_CreditsData->unk41f8 = 0;
// }
// }
//
// if (random() * (1.0f / U32_MAX) < 0.002f && contGetButtons(0, L_TRIG | R_TRIG) == 0) {
// if (random() * (1.0f / U32_MAX) < 0.002f && joyGetButtons(0, L_TRIG | R_TRIG) == 0) {
// g_CreditsData->unk41fc = random() % 5;
// }
//
// if (contGetButtonsPressedThisFrame(0, R_TRIG)) {
// if (joyGetButtonsPressedThisFrame(0, R_TRIG)) {
// g_CreditsData->unk41fc = random() % 5;
//
// if (g_CreditsData->unk41f5 < 0) {
@@ -4804,7 +4804,7 @@ void creditsTick(void)
s32 i;
static u32 var8007f6d8 = 0xffff;
if (contGetButtonsPressedThisFrame(0, L_TRIG)) {
if (joyGetButtonsPressedThisFrame(0, L_TRIG)) {
creditsCreatePendingBgLayers(0xffffffff);
}
@@ -4842,7 +4842,7 @@ void creditsTick(void)
if (g_CreditsData->slidesenabled) {
creditsTickSlide();
} else if (random() * (1.0f / U32_MAX) < 0.01f && !contGetButtons(0, L_TRIG | R_TRIG)) {
} else if (random() * (1.0f / U32_MAX) < 0.01f && !joyGetButtons(0, L_TRIG | R_TRIG)) {
creditsCreatePendingBgLayers(0xffffffff);
}
@@ -4924,7 +4924,7 @@ glabel var7f1afe70nb
/* f1359f8: 24040058 */ addiu $a0,$zero,0x58
/* f1359fc: 00002025 */ or $a0,$zero,$zero
.NB0f135a00:
/* f135a00: 0c005790 */ jal contGetButtons
/* f135a00: 0c005790 */ jal joyGetButtons
/* f135a04: 24050010 */ addiu $a1,$zero,0x10
/* f135a08: 1440000f */ bnez $v0,.NB0f135a48
/* f135a0c: 24052000 */ addiu $a1,$zero,0x2000
@@ -4943,7 +4943,7 @@ glabel var7f1afe70nb
/* f135a40: 01836821 */ addu $t5,$t4,$v1
/* f135a44: ac2d872c */ sw $t5,-0x78d4($at)
.NB0f135a48:
/* f135a48: 0c0057c0 */ jal contGetButtonsPressedThisFrame
/* f135a48: 0c0057c0 */ jal joyGetButtonsPressedThisFrame
/* f135a4c: 00002025 */ or $a0,$zero,$zero
/* f135a50: 3c0e800b */ lui $t6,0x800b
/* f135a54: 8dce872c */ lw $t6,-0x78d4($t6)
@@ -4964,7 +4964,7 @@ glabel var7f1afe70nb
/* f135a8c: 00002025 */ or $a0,$zero,$zero
/* f135a90: 460a3403 */ div.s $f16,$f6,$f10
/* f135a94: 24050010 */ addiu $a1,$zero,0x10
/* f135a98: 0c005790 */ jal contGetButtons
/* f135a98: 0c005790 */ jal joyGetButtons
/* f135a9c: e4308720 */ swc1 $f16,-0x78e0($at)
/* f135aa0: 5440002c */ bnezl $v0,.NB0f135b54
/* f135aa4: 8fbf001c */ lw $ra,0x1c($sp)
@@ -5305,7 +5305,7 @@ glabel var7f1b5948
/* f13bfb0: 00002025 */ move $a0,$zero
/* f13bfb4: 51800018 */ beqzl $t4,.PF0f13c018
/* f13bfb8: 8fbf001c */ lw $ra,0x1c($sp)
/* f13bfbc: 0c00536a */ jal contGetButtonsPressedThisFrame
/* f13bfbc: 0c00536a */ jal joyGetButtonsPressedThisFrame
/* f13bfc0: 3405ffcf */ li $a1,0xffcf
/* f13bfc4: 10400013 */ beqz $v0,.PF0f13c014
/* f13bfc8: 240d0026 */ li $t5,0x26
@@ -5323,7 +5323,7 @@ glabel var7f1b5948
/* f13bff8: ac22a7a8 */ sw $v0,-0x5858($at)
/* f13bffc: 3c01800a */ lui $at,0x800a
/* f13c000: ac22a7ac */ sw $v0,-0x5854($at)
/* f13c004: 0fc5b6fd */ jal coreSetDifficulty
/* f13c004: 0fc5b6fd */ jal lvSetDifficulty
/* f13c008: 00002025 */ move $a0,$zero
/* f13c00c: 0c002779 */ jal func00009ec4
/* f13c010: 24040001 */ li $a0,0x1
@@ -5614,7 +5614,7 @@ glabel var7f1b5948
/* f13b44c: 00002025 */ or $a0,$zero,$zero
/* f13b450: 51800018 */ beqzl $t4,.L0f13b4b4
/* f13b454: 8fbf001c */ lw $ra,0x1c($sp)
/* f13b458: 0c005408 */ jal contGetButtonsPressedThisFrame
/* f13b458: 0c005408 */ jal joyGetButtonsPressedThisFrame
/* f13b45c: 3405ffcf */ dli $a1,0xffcf
/* f13b460: 10400013 */ beqz $v0,.L0f13b4b0
/* f13b464: 240d0026 */ addiu $t5,$zero,0x26
@@ -5632,7 +5632,7 @@ glabel var7f1b5948
/* f13b494: ac22a258 */ sw $v0,%lo(g_Vars+0x298)($at)
/* f13b498: 3c01800a */ lui $at,%hi(g_Vars+0x29c)
/* f13b49c: ac22a25c */ sw $v0,%lo(g_Vars+0x29c)($at)
/* f13b4a0: 0fc5b36a */ jal coreSetDifficulty
/* f13b4a0: 0fc5b36a */ jal lvSetDifficulty
/* f13b4a4: 00002025 */ or $a0,$zero,$zero
/* f13b4a8: 0c0027b1 */ jal func00009ec4
/* f13b4ac: 24040001 */ addiu $a0,$zero,0x1
@@ -5923,7 +5923,7 @@ glabel var7f1b5948
/* 7f135f4c: 00002025 */ or $a0,$zero,$zero
/* 7f135f50: 51800018 */ beqzl $t4,.NB7f135fb4
/* 7f135f54: 8fbf001c */ lw $ra,0x1c($sp)
/* 7f135f58: 0c005790 */ jal contGetButtons
/* 7f135f58: 0c005790 */ jal joyGetButtons
/* 7f135f5c: 3405ffff */ dli $a1,0xffff
/* 7f135f60: 10400013 */ beqz $v0,.NB7f135fb0
/* 7f135f64: 240d0026 */ addiu $t5,$zero,0x26
@@ -5941,7 +5941,7 @@ glabel var7f1b5948
/* 7f135f94: ac22e958 */ sw $v0,-0x16a8($at)
/* 7f135f98: 3c01800a */ lui $at,0x800a
/* 7f135f9c: ac22e95c */ sw $v0,-0x16a4($at)
/* 7f135fa0: 0fc59ed6 */ jal coreSetDifficulty
/* 7f135fa0: 0fc59ed6 */ jal lvSetDifficulty
/* 7f135fa4: 00002025 */ or $a0,$zero,$zero
/* 7f135fa8: 0c00281a */ jal func00009ec4
/* 7f135fac: 24040001 */ addiu $a0,$zero,0x1
@@ -6053,7 +6053,7 @@ glabel var7f1b5948
// }
// }
//
// if (g_CreditsUsingAltTitle && contGetButtonsPressedThisFrame(0, 0xffcf)) {
// if (g_CreditsUsingAltTitle && joyGetButtonsPressedThisFrame(0, 0xffcf)) {
// g_TitleNextStage = STAGE_CITRAINING;
//
// setNumPlayers(1);
@@ -6063,7 +6063,7 @@ glabel var7f1b5948
// g_Vars.coopplayernum = -1;
// g_Vars.antiplayernum = -1;
//
// coreSetDifficulty(DIFF_A);
// lvSetDifficulty(DIFF_A);
// func00009ec4(1);
// }
//
src/game/dlights.c
+6 -6
View File
@@ -7,16 +7,16 @@
#include "game/game_0b69d0.h"
#include "game/smoke/smoke.h"
#include "game/sparks/sparks.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/file.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/game_176080.h"
#include "game/mplayer/scenarios.h"
#include "game/propobj.h"
#include "game/utils.h"
#include "game/wallhit.h"
#include "bss.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/memory.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
@@ -6093,7 +6093,7 @@ glabel func0f005bb0
/* f005e5c: 31ae0001 */ andi $t6,$t5,0x1
/* f005e60: 11c0003c */ beqz $t6,.L0f005f54
/* f005e64: 00000000 */ nop
/* f005e68: 0fc5b364 */ jal coreIsPaused
/* f005e68: 0fc5b364 */ jal lvIsPaused
/* f005e6c: 00000000 */ nop
/* f005e70: 14400038 */ bnez $v0,.L0f005f54
/* f005e74: 3c08800a */ lui $t0,%hi(g_Vars+0x284)
@@ -6113,7 +6113,7 @@ glabel func0f005bb0
/* f005eac: afb80018 */ sw $t8,0x18($sp)
/* f005eb0: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f005eb4: afaf0010 */ sw $t7,0x10($sp)
/* f005eb8: 0c004241 */ jal audioStart
/* f005eb8: 0c004241 */ jal sndStart
/* f005ebc: e7a40014 */ swc1 $f4,0x14($sp)
/* f005ec0: 3c08800a */ lui $t0,%hi(g_Vars+0x284)
/* f005ec4: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0)
@@ -6137,7 +6137,7 @@ glabel func0f005bb0
/* f005f08: afab0010 */ sw $t3,0x10($sp)
/* f005f0c: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f005f10: 2407ffff */ addiu $a3,$zero,-1
/* f005f14: 0c004241 */ jal audioStart
/* f005f14: 0c004241 */ jal sndStart
/* f005f18: e7a60014 */ swc1 $f6,0x14($sp)
/* f005f1c: 10000028 */ b .L0f005fc0
/* f005f20: 8fbf0024 */ lw $ra,0x24($sp)
src/game/endscreen.c
+10 -10
View File
@@ -15,7 +15,7 @@
#include "game/game_107fb0.h"
#include "game/endscreen.h"
#include "game/game_1655c0.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/mplayer/ingame.h"
#include "game/game_19aa80.h"
#include "game/gamefile.h"
@@ -378,7 +378,7 @@ glabel func0f10d730
/* f108798: 31e400ff */ andi $a0,$t7,0xff
/* f10879c: 8e040000 */ lw $a0,0x0($s0)
/* f1087a0: 0004c642 */ srl $t8,$a0,0x19
/* f1087a4: 0fc59ed6 */ jal coreSetDifficulty
/* f1087a4: 0fc59ed6 */ jal lvSetDifficulty
/* f1087a8: 03002025 */ or $a0,$t8,$zero
/* f1087ac: 0fc06945 */ jal titleSetNextMode
/* f1087b0: 24040005 */ addiu $a0,$zero,0x5
@@ -565,7 +565,7 @@ void endscreenHandleContinue(s32 context)
setNumPlayers(1);
}
coreSetDifficulty(g_MissionConfig.difficulty);
lvSetDifficulty(g_MissionConfig.difficulty);
titleSetNextMode(TITLEMODE_SKIP);
mainSetStageNum(g_MissionConfig.stagenum);
func00009ec4(true);
@@ -574,7 +574,7 @@ void endscreenHandleContinue(s32 context)
// Commit to starting credits
g_MissionConfig.stagenum = STAGE_CREDITS;
titleSetNextStage(g_MissionConfig.stagenum);
coreSetDifficulty(g_MissionConfig.difficulty);
lvSetDifficulty(g_MissionConfig.difficulty);
titleSetNextMode(TITLEMODE_SKIP);
mainSetStageNum(g_MissionConfig.stagenum);
func00009ec4(true);
@@ -798,7 +798,7 @@ glabel menudialogSolo2PEndscreenCompleted
/* f108b10: 246327a8 */ addiu $v1,$v1,0x27a8
/* f108b14: 8c640000 */ lw $a0,0x0($v1)
/* f108b18: 00045642 */ srl $t2,$a0,0x19
/* f108b1c: 0fc59ed6 */ jal coreSetDifficulty
/* f108b1c: 0fc59ed6 */ jal lvSetDifficulty
/* f108b20: 01402025 */ or $a0,$t2,$zero
/* f108b24: 0fc06945 */ jal titleSetNextMode
/* f108b28: 24040005 */ addiu $a0,$zero,0x5
@@ -1648,7 +1648,7 @@ glabel endscreenPrepare
.L0f10ec84:
/* f10ec84: 54610008 */ bnel $v1,$at,.L0f10eca8
/* f10ec88: 8fbf0014 */ lw $ra,0x14($sp)
/* f10ec8c: 0fc5b350 */ jal coreSetPaused
/* f10ec8c: 0fc5b350 */ jal lvSetPaused
/* f10ec90: 24040001 */ addiu $a0,$zero,0x1
/* f10ec94: 3c18800a */ lui $t8,%hi(g_Vars+0x284)
/* f10ec98: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8)
@@ -1865,7 +1865,7 @@ glabel endscreenPrepare
.NB0f1091e8:
/* f1091e8: 54610008 */ bnel $v1,$at,.NB0f10920c
/* f1091ec: 8fbf0014 */ lw $ra,0x14($sp)
/* f1091f0: 0fc59ebc */ jal coreSetPaused
/* f1091f0: 0fc59ebc */ jal lvSetPaused
/* f1091f4: 24040001 */ addiu $a0,$zero,0x1
/* f1091f8: 3c0f800a */ lui $t7,0x800a
/* f1091fc: 8defe944 */ lw $t7,-0x16bc($t7)
@@ -2039,7 +2039,7 @@ glabel endscreenPrepare
// }
//
// if (g_MenuData.root == MENUROOT_ENDSCREEN) {
// coreSetPaused(true);
// lvSetPaused(true);
// g_Vars.currentplayer->pausemode = PAUSEMODE_PAUSED;
// }
//}
@@ -2084,7 +2084,7 @@ void soloPushCoopModeEndscreen(void)
{
u32 prevplayernum = g_MpPlayerNum;
coreSetPaused(true);
lvSetPaused(true);
g_MpPlayerNum = g_Vars.currentplayerstats->mpindex;
@@ -2228,7 +2228,7 @@ void soloPushAntiModeEndscreen(void)
{
u32 prevplayernum = g_MpPlayerNum;
coreSetPaused(true);
lvSetPaused(true);
g_MpPlayerNum = g_Vars.currentplayerstats->mpindex;
src/game/explosions/explosions.c
+1 -1
View File
@@ -10,7 +10,7 @@
#include "game/game_0b4950.h"
#include "game/explosions/explosions.h"
#include "game/smoke/smoke.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/game_1668e0.h"
#include "game/file.h"
#include "game/gfxmemory.h"
src/game/game_005fd0.c
+1 -1
View File
@@ -3,7 +3,7 @@
#include "game/debug.h"
#include "game/game_006900.h"
#include "game/game_092610.h"
#include "game/room.h"
#include "game/bg.h"
#include "bss.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
src/game/game_006900.c
+1 -1
View File
@@ -3,7 +3,7 @@
#include "game/debug.h"
#include "game/game_006900.h"
#include "game/game_092610.h"
#include "game/room.h"
#include "game/bg.h"
#include "bss.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
src/game/game_006bd0.c
+2 -2
View File
@@ -11,12 +11,12 @@
#include "game/atan2f.h"
#include "game/game_0b3350.h"
#include "game/game_0d4690.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/file.h"
#include "game/gfxmemory.h"
#include "bss.h"
#include "lib/lib_09a80.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
src/game/game_00c490.c
+11 -11
View File
@@ -17,10 +17,10 @@
#include "game/atan2f.h"
#include "game/inventory/inventory.h"
#include "game/game_127910.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/game_1655c0.h"
#include "game/file.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/mplayer/scenarios.h"
#include "game/game_19aa80.h"
#include "game/lang.h"
@@ -915,7 +915,7 @@ void weaponAssignToHome(struct weaponobj *weapon, s32 cmdindex)
func0f08b25c(weapon, chr);
#else
if (g_Vars.stagenum == STAGE_INVESTIGATION
&& coreGetDifficulty() == DIFF_PA
&& lvGetDifficulty() == DIFF_PA
&& weapon->weaponnum == WEAPON_K7AVENGER) {
weaponLoadProjectileModels(weapon->weaponnum);
func0f08b25c(weapon, chr);
@@ -970,7 +970,7 @@ void weaponAssignToHome(struct weaponobj *weapon, s32 cmdindex)
// Don't replace the K7 guard's weapon in Investigation
// because it would make an objective impossible.
// @bug: It's still replaced on PD mode difficulty.
if (g_Vars.stagenum != STAGE_INVESTIGATION || coreGetDifficulty() != DIFF_PA) {
if (g_Vars.stagenum != STAGE_INVESTIGATION || lvGetDifficulty() != DIFF_PA) {
weapon->weaponnum = WEAPON_ROCKETLAUNCHER;
weapon->base.modelnum = MODEL_CHRDYROCKET;
weapon->base.extrascale = 256;
@@ -2449,13 +2449,13 @@ glabel func0f00e980
/* f00ea38: 02589821 */ addu $s3,$s2,$t8
/* f00ea3c: 52600040 */ beqzl $s3,.L0f00eb40
/* f00ea40: 8fbf0034 */ lw $ra,0x34($sp)
/* f00ea44: 0fc5b367 */ jal coreGetDifficulty
/* f00ea44: 0fc5b367 */ jal lvGetDifficulty
/* f00ea48: 24160001 */ addiu $s6,$zero,0x1
/* f00ea4c: 14400002 */ bnez $v0,.L0f00ea58
/* f00ea50: 00000000 */ nop
/* f00ea54: 24160003 */ addiu $s6,$zero,0x3
.L0f00ea58:
/* f00ea58: 0fc5b367 */ jal coreGetDifficulty
/* f00ea58: 0fc5b367 */ jal lvGetDifficulty
/* f00ea5c: 00000000 */ nop
/* f00ea60: 24010001 */ addiu $at,$zero,0x1
/* f00ea64: 14410002 */ bne $v0,$at,.L0f00ea70
@@ -2584,13 +2584,13 @@ glabel func0f00e980
/* f00ea38: 02589821 */ addu $s3,$s2,$t8
/* f00ea3c: 52600040 */ beqzl $s3,.L0f00eb40
/* f00ea40: 8fbf0034 */ lw $ra,0x34($sp)
/* f00ea44: 0fc5b367 */ jal coreGetDifficulty
/* f00ea44: 0fc5b367 */ jal lvGetDifficulty
/* f00ea48: 24160001 */ addiu $s6,$zero,0x1
/* f00ea4c: 14400002 */ bnez $v0,.L0f00ea58
/* f00ea50: 00000000 */ nop
/* f00ea54: 24160003 */ addiu $s6,$zero,0x3
.L0f00ea58:
/* f00ea58: 0fc5b367 */ jal coreGetDifficulty
/* f00ea58: 0fc5b367 */ jal lvGetDifficulty
/* f00ea5c: 00000000 */ nop
/* f00ea60: 24010001 */ addiu $at,$zero,0x1
/* f00ea64: 14410002 */ bne $v0,$at,.L0f00ea70
@@ -2894,7 +2894,7 @@ void setupParseObjects(s32 stagenum)
u32 diffflag = 0;
s32 index;
diffflag |= 1 << (coreGetDifficulty() + 4);
diffflag |= 1 << (lvGetDifficulty() + 4);
if (g_Vars.mplayerisrunning) {
if (PLAYERCOUNT() == 2) {
@@ -3349,11 +3349,11 @@ void setupParseObjects(s32 stagenum)
briefingInsert(briefing);
if (coreGetDifficulty() == DIFF_A) {
if (lvGetDifficulty() == DIFF_A) {
wanttype = BRIEFINGTYPE_TEXT_A;
}
if (coreGetDifficulty() == DIFF_SA) {
if (lvGetDifficulty() == DIFF_SA) {
wanttype = BRIEFINGTYPE_TEXT_SA;
}
src/game/game_0125a0.c
+1 -1
View File
@@ -3,7 +3,7 @@
#include "game/game_0125a0.h"
#include "game/game_013ee0.h"
#include "game/bondhead.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/pad.h"
#include "bss.h"
#include "lib/lib_159b0.h"
src/game/game_012aa0.c
+1 -1
View File
@@ -3,7 +3,7 @@
#include "game/game_0125a0.h"
#include "game/game_013ee0.h"
#include "game/bondhead.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/pad.h"
#include "bss.h"
#include "lib/lib_159b0.h"
src/game/game_013cf0.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_013cf0.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/file.h"
#include "bss.h"
#include "data.h"
src/game/game_013ee0.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_013ee0.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/pad.h"
#include "bss.h"
#include "lib/memory.h"
src/game/game_0150a0.c
+2 -2
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "bss.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/lib_317f0.h"
#include "data.h"
#include "types.h"
@@ -12,7 +12,7 @@ void func0f0150a0(void)
for (i = 0; i < (IS4MB() ? 30 : 40); i++) {
if (g_AudioChannels[i].flags & AUDIOCHANNELFLAG_0010) {
func0000fbc4(g_AudioChannels[i].soundnum26);
snd0000fbc4(g_AudioChannels[i].soundnum26);
g_AudioChannels[i].flags &= ~AUDIOCHANNELFLAG_0010;
g_AudioChannels[i].flags &= ~AUDIOCHANNELFLAG_0002;
} else if (g_AudioChannels[i].audiohandle && audioIsPlaying(g_AudioChannels[i].audiohandle)) {
src/game/game_01bea0.c
+27 -27
View File
@@ -11,7 +11,7 @@
#include "game/game_102240.h"
#include "game/endscreen.h"
#include "game/game_127910.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/music.h"
#include "game/mplayer/ingame.h"
#include "game/mplayer/setup.h"
@@ -22,7 +22,7 @@
#include "bss.h"
#include "lib/lib_09a80.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "data.h"
#include "types.h"
@@ -40,7 +40,7 @@ void func0f01bea0(void)
if (var80062944) {
var80062944 = 0;
var80062948 = 0;
func000139c8();
joy000139c8();
func0f110bf8();
}
}
@@ -441,7 +441,7 @@ glabel var7f1a863c
/* f01c4e4: 24058098 */ li $a1,-32616
/* f01c4e8: 00003025 */ move $a2,$zero
/* f01c4ec: 2407ffff */ li $a3,-1
/* f01c4f0: 0c0041a0 */ jal audioStart
/* f01c4f0: 0c0041a0 */ jal sndStart
/* f01c4f4: e7b00014 */ swc1 $f16,0x14($sp)
/* f01c4f8: 3c0e8009 */ lui $t6,0x8009
/* f01c4fc: 91ce1040 */ lbu $t6,0x1040($t6)
@@ -648,7 +648,7 @@ glabel var7f1a863c
/* f01c7c8: 02717821 */ addu $t7,$s3,$s1
.PF0f01c7cc:
/* f01c7cc: 03202025 */ move $a0,$t9
/* f01c7d0: 0c00536a */ jal contGetButtonsPressedThisFrame
/* f01c7d0: 0c00536a */ jal joyGetButtonsPressedThisFrame
/* f01c7d4: 3405ffff */ li $a1,0xffff
/* f01c7d8: 8eae0004 */ lw $t6,0x4($s5)
/* f01c7dc: 2401000b */ li $at,0xb
@@ -721,7 +721,7 @@ glabel var7f1a863c
/* f01c8d0: 8c845750 */ lw $a0,0x5750($a0)
/* f01c8d4: 2407ffff */ li $a3,-1
/* f01c8d8: afa80058 */ sw $t0,0x58($sp)
/* f01c8dc: 0c0041a0 */ jal audioStart
/* f01c8dc: 0c0041a0 */ jal sndStart
/* f01c8e0: e7b20014 */ swc1 $f18,0x14($sp)
/* f01c8e4: 8fa80058 */ lw $t0,0x58($sp)
.PF0f01c8e8:
@@ -820,7 +820,7 @@ glabel var7f1a863c
/* f01ca2c: 3c04800b */ lui $a0,0x800b
/* f01ca30: 00982021 */ addu $a0,$a0,$t8
/* f01ca34: 8084cd9d */ lb $a0,-0x3263($a0)
/* f01ca38: 0c00536a */ jal contGetButtonsPressedThisFrame
/* f01ca38: 0c00536a */ jal joyGetButtonsPressedThisFrame
/* f01ca3c: 3405ffff */ li $a1,0xffff
/* f01ca40: 304d4000 */ andi $t5,$v0,0x4000
/* f01ca44: 51a0005c */ beqzl $t5,.PF0f01cbb8
@@ -1135,7 +1135,7 @@ glabel var7f1a863c
/* f01ce8c: 330400ff */ andi $a0,$t8,0xff
/* f01ce90: 8e440000 */ lw $a0,0x0($s2)
/* f01ce94: 00047e42 */ srl $t7,$a0,0x19
/* f01ce98: 0fc5b6fd */ jal coreSetDifficulty
/* f01ce98: 0fc5b6fd */ jal lvSetDifficulty
/* f01ce9c: 01e02025 */ move $a0,$t7
/* f01cea0: 0fc06a32 */ jal titleSetNextMode
/* f01cea4: 24040005 */ li $a0,0x5
@@ -1252,7 +1252,7 @@ glabel var7f1a863c
/* f01d03c: 8c845750 */ lw $a0,0x5750($a0)
/* f01d040: 00003025 */ move $a2,$zero
/* f01d044: 2407ffff */ li $a3,-1
/* f01d048: 0c0041a0 */ jal audioStart
/* f01d048: 0c0041a0 */ jal sndStart
/* f01d04c: e7a40014 */ swc1 $f4,0x14($sp)
/* f01d050: 8ea30004 */ lw $v1,0x4($s5)
.PF0f01d054:
@@ -2218,7 +2218,7 @@ glabel var7f1a863c
/* f01c414: 24058098 */ addiu $a1,$zero,-32616
/* f01c418: 00003025 */ or $a2,$zero,$zero
/* f01c41c: 2407ffff */ addiu $a3,$zero,-1
/* f01c420: 0c004241 */ jal audioStart
/* f01c420: 0c004241 */ jal sndStart
/* f01c424: e7b00014 */ swc1 $f16,0x14($sp)
/* f01c428: 3c188009 */ lui $t8,%hi(g_Is4Mb)
/* f01c42c: 93180af0 */ lbu $t8,%lo(g_Is4Mb)($t8)
@@ -2425,7 +2425,7 @@ glabel var7f1a863c
/* f01c6f8: 0271c821 */ addu $t9,$s3,$s1
.L0f01c6fc:
/* f01c6fc: 01c02025 */ or $a0,$t6,$zero
/* f01c700: 0c005408 */ jal contGetButtonsPressedThisFrame
/* f01c700: 0c005408 */ jal joyGetButtonsPressedThisFrame
/* f01c704: 3405ffff */ dli $a1,0xffff
/* f01c708: 8eb80004 */ lw $t8,0x4($s5)
/* f01c70c: 2401000b */ addiu $at,$zero,0xb
@@ -2498,7 +2498,7 @@ glabel var7f1a863c
/* f01c800: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f01c804: 2407ffff */ addiu $a3,$zero,-1
/* f01c808: afa80058 */ sw $t0,0x58($sp)
/* f01c80c: 0c004241 */ jal audioStart
/* f01c80c: 0c004241 */ jal sndStart
/* f01c810: e7b20014 */ swc1 $f18,0x14($sp)
/* f01c814: 8fa80058 */ lw $t0,0x58($sp)
.L0f01c818:
@@ -2597,7 +2597,7 @@ glabel var7f1a863c
/* f01c95c: 3c04800b */ lui $a0,%hi(g_MpPlayers+0x45)
/* f01c960: 008d2021 */ addu $a0,$a0,$t5
/* f01c964: 8084c7fd */ lb $a0,%lo(g_MpPlayers+0x45)($a0)
/* f01c968: 0c005408 */ jal contGetButtonsPressedThisFrame
/* f01c968: 0c005408 */ jal joyGetButtonsPressedThisFrame
/* f01c96c: 3405ffff */ dli $a1,0xffff
/* f01c970: 304f4000 */ andi $t7,$v0,0x4000
/* f01c974: 51e0005c */ beqzl $t7,.L0f01cae8
@@ -2912,7 +2912,7 @@ glabel var7f1a863c
/* f01cdbc: 31a400ff */ andi $a0,$t5,0xff
/* f01cdc0: 8e440000 */ lw $a0,0x0($s2)
/* f01cdc4: 0004ce42 */ srl $t9,$a0,0x19
/* f01cdc8: 0fc5b36a */ jal coreSetDifficulty
/* f01cdc8: 0fc5b36a */ jal lvSetDifficulty
/* f01cdcc: 03202025 */ or $a0,$t9,$zero
/* f01cdd0: 0fc069f9 */ jal titleSetNextMode
/* f01cdd4: 24040005 */ addiu $a0,$zero,0x5
@@ -3029,7 +3029,7 @@ glabel var7f1a863c
/* f01cf6c: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f01cf70: 00003025 */ or $a2,$zero,$zero
/* f01cf74: 2407ffff */ addiu $a3,$zero,-1
/* f01cf78: 0c004241 */ jal audioStart
/* f01cf78: 0c004241 */ jal sndStart
/* f01cf7c: e7a40014 */ swc1 $f4,0x14($sp)
/* f01cf80: 8ea30004 */ lw $v1,0x4($s5)
.L0f01cf84:
@@ -3990,7 +3990,7 @@ glabel var7f1a863c
/* f01c100: 24058098 */ addiu $a1,$zero,-32616
/* f01c104: 00003025 */ or $a2,$zero,$zero
/* f01c108: 2407ffff */ addiu $a3,$zero,-1
/* f01c10c: 0c004338 */ jal audioStart
/* f01c10c: 0c004338 */ jal sndStart
/* f01c110: e7b00014 */ swc1 $f16,0x14($sp)
/* f01c114: 3c188009 */ lui $t8,0x8009
/* f01c118: 931830e0 */ lbu $t8,0x30e0($t8)
@@ -4197,7 +4197,7 @@ glabel var7f1a863c
/* f01c3e4: 0271c821 */ addu $t9,$s3,$s1
.NB0f01c3e8:
/* f01c3e8: 01c02025 */ or $a0,$t6,$zero
/* f01c3ec: 0c0057c0 */ jal contGetButtonsPressedThisFrame
/* f01c3ec: 0c0057c0 */ jal joyGetButtonsPressedThisFrame
/* f01c3f0: 3405ffff */ dli $a1,0xffff
/* f01c3f4: 8eb80004 */ lw $t8,0x4($s5)
/* f01c3f8: 2401000b */ addiu $at,$zero,0xb
@@ -4267,7 +4267,7 @@ glabel var7f1a863c
/* f01c4e0: 2405809a */ addiu $a1,$zero,-32614
/* f01c4e4: 00003025 */ or $a2,$zero,$zero
/* f01c4e8: 2407ffff */ addiu $a3,$zero,-1
/* f01c4ec: 0c004338 */ jal audioStart
/* f01c4ec: 0c004338 */ jal sndStart
/* f01c4f0: e7b20014 */ swc1 $f18,0x14($sp)
/* f01c4f4: 1000001a */ beqz $zero,.NB0f01c560
/* f01c4f8: 32191000 */ andi $t9,$s0,0x1000
@@ -4364,7 +4364,7 @@ glabel var7f1a863c
/* f01c638: 3c04800b */ lui $a0,0x800b
/* f01c63c: 008d2021 */ addu $a0,$a0,$t5
/* f01c640: 808410ad */ lb $a0,0x10ad($a0)
/* f01c644: 0c0057c0 */ jal contGetButtonsPressedThisFrame
/* f01c644: 0c0057c0 */ jal joyGetButtonsPressedThisFrame
/* f01c648: 3405ffff */ dli $a1,0xffff
/* f01c64c: 304f4000 */ andi $t7,$v0,0x4000
/* f01c650: 51e0005c */ beqzl $t7,.NB0f01c7c4
@@ -4680,7 +4680,7 @@ glabel var7f1a863c
/* f01ca9c: 31a400ff */ andi $a0,$t5,0xff
/* f01caa0: 8e440000 */ lw $a0,0x0($s2)
/* f01caa4: 0004ce42 */ srl $t9,$a0,0x19
/* f01caa8: 0fc59ed6 */ jal coreSetDifficulty
/* f01caa8: 0fc59ed6 */ jal lvSetDifficulty
/* f01caac: 03202025 */ or $a0,$t9,$zero
/* f01cab0: 0fc06945 */ jal titleSetNextMode
/* f01cab4: 24040005 */ addiu $a0,$zero,0x5
@@ -4797,7 +4797,7 @@ glabel var7f1a863c
/* f01cc4c: 8c848180 */ lw $a0,-0x7e80($a0)
/* f01cc50: 00003025 */ or $a2,$zero,$zero
/* f01cc54: 2407ffff */ addiu $a3,$zero,-1
/* f01cc58: 0c004338 */ jal audioStart
/* f01cc58: 0c004338 */ jal sndStart
/* f01cc5c: e7a40014 */ swc1 $f4,0x14($sp)
/* f01cc60: 8ea30004 */ lw $v1,0x4($s5)
.NB0f01cc64:
@@ -5588,7 +5588,7 @@ glabel var7f1a863c
//
// if (g_MpSetup.chrslots & 0xf) {
// // Explosion sound
// audioStart(var80095200, SFX_EXPLOSION_8098, 0, -1, -1, -1, -1, -1);
// sndStart(var80095200, SFX_EXPLOSION_8098, 0, -1, -1, -1, -1, -1);
//
// // c444
// currentPlayerPause(IS4MB() ? MENUROOT_4MBMAINMENU : MENUROOT_MPSETUP);
@@ -5678,7 +5678,7 @@ glabel var7f1a863c
// // c6dc
// if (g_MenuData.root == MENUROOT_MPSETUP || g_MenuData.root == MENUROOT_4MBMAINMENU) {
// s32 pass2;
// u16 buttons = contGetButtonsPressedThisFrame(i, 0xffff);
// u16 buttons = joyGetButtonsPressedThisFrame(i, 0xffff);
//
// // c714
// if (g_MenuData.root == MENUROOT_4MBMAINMENU) {
@@ -5710,7 +5710,7 @@ glabel var7f1a863c
// if (g_Vars.unk000490 == 2) {
// if (g_Vars.unk000494[i] == 0) {
// // Explosion sound
// audioStart(var80095200, SFX_EXPLOSION_809A, 0, -1, -1, -1, -1, -1);
// sndStart(var80095200, SFX_EXPLOSION_809A, 0, -1, -1, -1, -1, -1);
// }
//
// g_Vars.unk000494[i] = 1;
@@ -5758,7 +5758,7 @@ glabel var7f1a863c
// }
//
// if (g_MenuData.root == MENUROOT_MPENDSCREEN) {
// u16 buttons2 = contGetButtonsPressedThisFrame(g_MpPlayers[i].base.unk45, 0xffff);
// u16 buttons2 = joyGetButtonsPressedThisFrame(g_MpPlayers[i].base.unk45, 0xffff);
//
// if (buttons2 & B_BUTTON) {
// s32 playernum = -1;
@@ -5880,7 +5880,7 @@ glabel var7f1a863c
// g_MissionConfig.stageindex++;
// g_MissionConfig.stagenum = g_StageNames[g_MissionConfig.stageindex].stagenum;
// titleSetNextStage(g_MissionConfig.stagenum);
// coreSetDifficulty(g_MissionConfig.difficulty);
// lvSetDifficulty(g_MissionConfig.difficulty);
// titleSetNextMode(TITLEMODE_SKIP);
// mainSetStageNum(g_MissionConfig.stagenum);
// } else {
@@ -5926,7 +5926,7 @@ glabel var7f1a863c
// if (g_MenuData.root == MENUROOT_MPSETUP || g_MenuData.root == MENUROOT_4MBMAINMENU) {
// pass = true;
// // Explosion sound
// audioStart(var80095200, SFX_EXPLOSION_8098, 0, -1, -1, -1, -1, -1);
// sndStart(var80095200, SFX_EXPLOSION_8098, 0, -1, -1, -1, -1, -1);
// }
//
// if (g_MenuData.root == MENUROOT_MAINMENU || g_MenuData.root == MENUROOT_TRAINING) {
src/game/game_02cde0.c
+6 -6
View File
@@ -7,7 +7,7 @@
#include "game/prop.h"
#include "game/atan2f.h"
#include "game/game_0b28d0.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/game_1a7560.h"
#include "game/mplayer/mplayer.h"
#include "game/pad.h"
@@ -611,7 +611,7 @@ glabel chrUnpack
/* f02d5a4: 304a0020 */ andi $t2,$v0,0x20
/* f02d5a8: 51400007 */ beqzl $t2,.L0f02d5c8
/* f02d5ac: 304b0040 */ andi $t3,$v0,0x40
/* f02d5b0: 0fc5b367 */ jal coreGetDifficulty
/* f02d5b0: 0fc5b367 */ jal lvGetDifficulty
/* f02d5b4: 00000000 */ nop
/* f02d5b8: 50400013 */ beqzl $v0,.L0f02d608
/* f02d5bc: 3c0dffff */ lui $t5,0xffff
@@ -620,7 +620,7 @@ glabel chrUnpack
.L0f02d5c8:
/* f02d5c8: 51600008 */ beqzl $t3,.L0f02d5ec
/* f02d5cc: 304c0080 */ andi $t4,$v0,0x80
/* f02d5d0: 0fc5b367 */ jal coreGetDifficulty
/* f02d5d0: 0fc5b367 */ jal lvGetDifficulty
/* f02d5d4: 00000000 */ nop
/* f02d5d8: 24010001 */ addiu $at,$zero,0x1
/* f02d5dc: 5041000a */ beql $v0,$at,.L0f02d608
@@ -630,7 +630,7 @@ glabel chrUnpack
.L0f02d5ec:
/* f02d5ec: 5180016b */ beqzl $t4,.L0f02db9c
/* f02d5f0: 8fbf002c */ lw $ra,0x2c($sp)
/* f02d5f4: 0fc5b367 */ jal coreGetDifficulty
/* f02d5f4: 0fc5b367 */ jal lvGetDifficulty
/* f02d5f8: 00000000 */ nop
/* f02d5fc: 24010002 */ addiu $at,$zero,0x2
/* f02d600: 14410165 */ bne $v0,$at,.L0f02db98
@@ -1047,8 +1047,8 @@ struct prop *propAllocateEyespy(struct pad *pad, s16 room)
#if PIRACYCHECKS
{
u32 checksum = 0;
s32 *ptr = (s32 *)&coreLoadStage;
s32 *end = (s32 *)&coreConfigureFade;
s32 *ptr = (s32 *)&lvInit;
s32 *end = (s32 *)&lvConfigureFade;
while (ptr < end) {
checksum <<= 1;
src/game/game_091e10.c
+1 -1
View File
@@ -3,7 +3,7 @@
#include "game/prop.h"
#include "game/game_091e10.h"
#include "game/game_0b28d0.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/game_1a7560.h"
#include "game/propobj.h"
#include "bss.h"
src/game/game_092610.c
+30 -30
View File
@@ -6,11 +6,11 @@
#include "game/atan2f.h"
#include "game/hudmsg.h"
#include "game/file.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/mplayer/mplayer.h"
#include "game/pad.h"
#include "bss.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/rng.h"
#include "lib/lib_16110.h"
#include "lib/lib_317f0.h"
@@ -373,7 +373,7 @@ void func0f092a98(s32 channelnum)
}
if ((channel->flags & AUDIOCHANNELFLAG_0010)) {
func0000fbc4(channel->soundnum26);
snd0000fbc4(channel->soundnum26);
} else if (channel->audiohandle && audioIsPlaying(channel->audiohandle)) {
audioStop(channel->audiohandle);
}
@@ -536,7 +536,7 @@ glabel var7f1ab740
/* f092b88: 306e0010 */ andi $t6,$v1,0x10
/* f092b8c: 51c001e2 */ beqzl $t6,.PF0f093318
/* f092b90: 860e0028 */ lh $t6,0x28($s0)
/* f092b94: 0c0039cc */ jal func0000e9d0
/* f092b94: 0c0039cc */ jal snd0000e9d0
/* f092b98: 00000000 */ nop
/* f092b9c: 504001de */ beqzl $v0,.PF0f093318
/* f092ba0: 860e0028 */ lh $t6,0x28($s0)
@@ -792,7 +792,7 @@ glabel var7f1ab740
/* f092f24: afa50048 */ sw $a1,0x48($sp)
.PF0f092f28:
/* f092f28: afa80040 */ sw $t0,0x40($sp)
/* f092f2c: 0fc5b6f7 */ jal coreIsPaused
/* f092f2c: 0fc5b6f7 */ jal lvIsPaused
/* f092f30: e7b2003c */ swc1 $f18,0x3c($sp)
/* f092f34: 3c09800a */ lui $t1,0x800a
/* f092f38: 2529a510 */ addiu $t1,$t1,-23280
@@ -1018,7 +1018,7 @@ glabel var7f1ab740
/* f093238: 10000001 */ b .PF0f093240
/* f09323c: 24070001 */ li $a3,0x1
.PF0f093240:
/* f093240: 0c004218 */ jal func00010ae4
/* f093240: 0c004218 */ jal snd00010ae4
/* f093244: 86040026 */ lh $a0,0x26($s0)
/* f093248: 10000021 */ b .PF0f0932d0
/* f09324c: 96030030 */ lhu $v1,0x30($s0)
@@ -1037,7 +1037,7 @@ glabel var7f1ab740
/* f09327c: 920d001a */ lbu $t5,0x1a($s0)
/* f093280: afac0020 */ sw $t4,0x20($sp)
/* f093284: afa8001c */ sw $t0,0x1c($sp)
/* f093288: 0c004125 */ jal func00010718
/* f093288: 0c004125 */ jal snd00010718
/* f09328c: afad0018 */ sw $t5,0x18($sp)
/* f093290: 1000000f */ b .PF0f0932d0
/* f093294: 96030030 */ lhu $v1,0x30($s0)
@@ -1053,7 +1053,7 @@ glabel var7f1ab740
/* f0932b8: afa8001c */ sw $t0,0x1c($sp)
/* f0932bc: 01c03025 */ move $a2,$t6
/* f0932c0: 8fa70044 */ lw $a3,0x44($sp)
/* f0932c4: 0c004125 */ jal func00010718
/* f0932c4: 0c004125 */ jal snd00010718
/* f0932c8: afb80018 */ sw $t8,0x18($sp)
/* f0932cc: 96030030 */ lhu $v1,0x30($s0)
.PF0f0932d0:
@@ -1071,7 +1071,7 @@ glabel var7f1ab740
/* f0932f8: 30650010 */ andi $a1,$v1,0x10
/* f0932fc: 8fa60048 */ lw $a2,0x48($sp)
/* f093300: 8fa70044 */ lw $a3,0x44($sp)
/* f093304: 0c004087 */ jal audioAdjust
/* f093304: 0c004087 */ jal sndAdjust
/* f093308: afad0018 */ sw $t5,0x18($sp)
/* f09330c: 10000026 */ b .PF0f0933a8
/* f093310: 00000000 */ nop
@@ -1084,7 +1084,7 @@ glabel var7f1ab740
/* f093328: 306f0010 */ andi $t7,$v1,0x10
/* f09332c: 51e00015 */ beqzl $t7,.PF0f093384
/* f093330: 8e0b0000 */ lw $t3,0x0($s0)
/* f093334: 0c0039cc */ jal func0000e9d0
/* f093334: 0c0039cc */ jal snd0000e9d0
/* f093338: 00000000 */ nop
/* f09333c: 5440000e */ bnezl $v0,.PF0f093378
/* f093340: 240a0001 */ li $t2,0x1
@@ -1187,7 +1187,7 @@ glabel var7f1ab740
/* f092c88: 306e0010 */ andi $t6,$v1,0x10
/* f092c8c: 51c001e6 */ beqzl $t6,.L0f093428
/* f092c90: 860f0028 */ lh $t7,0x28($s0)
/* f092c94: 0c003a74 */ jal func0000e9d0
/* f092c94: 0c003a74 */ jal snd0000e9d0
/* f092c98: 00000000 */ nop
/* f092c9c: 504001e2 */ beqzl $v0,.L0f093428
/* f092ca0: 860f0028 */ lh $t7,0x28($s0)
@@ -1446,7 +1446,7 @@ glabel var7f1ab740
/* f093034: afa50048 */ sw $a1,0x48($sp)
.L0f093038:
/* f093038: afa80040 */ sw $t0,0x40($sp)
/* f09303c: 0fc5b364 */ jal coreIsPaused
/* f09303c: 0fc5b364 */ jal lvIsPaused
/* f093040: e7b2003c */ swc1 $f18,0x3c($sp)
/* f093044: 3c09800a */ lui $t1,%hi(g_Vars)
/* f093048: 25299fc0 */ addiu $t1,$t1,%lo(g_Vars)
@@ -1672,7 +1672,7 @@ glabel var7f1ab740
/* f093348: 10000001 */ b .L0f093350
/* f09334c: 24070001 */ addiu $a3,$zero,0x1
.L0f093350:
/* f093350: 0c0042b9 */ jal func00010ae4
/* f093350: 0c0042b9 */ jal snd00010ae4
/* f093354: 86040026 */ lh $a0,0x26($s0)
/* f093358: 10000021 */ b .L0f0933e0
/* f09335c: 96030030 */ lhu $v1,0x30($s0)
@@ -1691,7 +1691,7 @@ glabel var7f1ab740
/* f09338c: 920e001a */ lbu $t6,0x1a($s0)
/* f093390: afad0020 */ sw $t5,0x20($sp)
/* f093394: afa8001c */ sw $t0,0x1c($sp)
/* f093398: 0c0041c6 */ jal func00010718
/* f093398: 0c0041c6 */ jal snd00010718
/* f09339c: afae0018 */ sw $t6,0x18($sp)
/* f0933a0: 1000000f */ b .L0f0933e0
/* f0933a4: 96030030 */ lhu $v1,0x30($s0)
@@ -1707,7 +1707,7 @@ glabel var7f1ab740
/* f0933c8: afa8001c */ sw $t0,0x1c($sp)
/* f0933cc: 01e03025 */ or $a2,$t7,$zero
/* f0933d0: 8fa70044 */ lw $a3,0x44($sp)
/* f0933d4: 0c0041c6 */ jal func00010718
/* f0933d4: 0c0041c6 */ jal snd00010718
/* f0933d8: afb90018 */ sw $t9,0x18($sp)
/* f0933dc: 96030030 */ lhu $v1,0x30($s0)
.L0f0933e0:
@@ -1725,7 +1725,7 @@ glabel var7f1ab740
/* f093408: 30650010 */ andi $a1,$v1,0x10
/* f09340c: 8fa60048 */ lw $a2,0x48($sp)
/* f093410: 8fa70044 */ lw $a3,0x44($sp)
/* f093414: 0c004128 */ jal audioAdjust
/* f093414: 0c004128 */ jal sndAdjust
/* f093418: afae0018 */ sw $t6,0x18($sp)
/* f09341c: 10000026 */ b .L0f0934b8
/* f093420: 00000000 */ nop
@@ -1738,7 +1738,7 @@ glabel var7f1ab740
/* f093438: 30780010 */ andi $t8,$v1,0x10
/* f09343c: 53000015 */ beqzl $t8,.L0f093494
/* f093440: 8e0c0000 */ lw $t4,0x0($s0)
/* f093444: 0c003a74 */ jal func0000e9d0
/* f093444: 0c003a74 */ jal snd0000e9d0
/* f093448: 00000000 */ nop
/* f09344c: 5440000e */ bnezl $v0,.L0f093488
/* f093450: 240b0001 */ addiu $t3,$zero,0x1
@@ -1832,7 +1832,7 @@ glabel var7f1ab740
/* f0912b4: 306b0010 */ andi $t3,$v1,0x10
/* f0912b8: 516001af */ beqzl $t3,.NB0f091978
/* f0912bc: 96030030 */ lhu $v1,0x30($s0)
/* f0912c0: 0c003c6c */ jal func0000e9d0
/* f0912c0: 0c003c6c */ jal snd0000e9d0
/* f0912c4: 00000000 */ sll $zero,$zero,0x0
/* f0912c8: 504001ab */ beqzl $v0,.NB0f091978
/* f0912cc: 96030030 */ lhu $v1,0x30($s0)
@@ -2096,7 +2096,7 @@ glabel var7f1ab740
/* f09166c: afa50048 */ sw $a1,0x48($sp)
.NB0f091670:
/* f091670: afa80040 */ sw $t0,0x40($sp)
/* f091674: 0fc59ed0 */ jal coreIsPaused
/* f091674: 0fc59ed0 */ jal lvIsPaused
/* f091678: e7b2003c */ swc1 $f18,0x3c($sp)
/* f09167c: 8fa80040 */ lw $t0,0x40($sp)
/* f091680: 1440002f */ bnez $v0,.NB0f091740
@@ -2277,7 +2277,7 @@ glabel var7f1ab740
/* f0918e8: 10000001 */ beqz $zero,.NB0f0918f0
/* f0918ec: 24070001 */ addiu $a3,$zero,0x1
.NB0f0918f0:
/* f0918f0: 0c0043a9 */ jal func00010ae4
/* f0918f0: 0c0043a9 */ jal snd00010ae4
/* f0918f4: 86040026 */ lh $a0,0x26($s0)
/* f0918f8: 1000000d */ beqz $zero,.NB0f091930
/* f0918fc: 960f0030 */ lhu $t7,0x30($s0)
@@ -2291,7 +2291,7 @@ glabel var7f1ab740
/* f091918: afa8001c */ sw $t0,0x1c($sp)
/* f09191c: 8fa60048 */ lw $a2,0x48($sp)
/* f091920: 8fa70044 */ lw $a3,0x44($sp)
/* f091924: 0c0042bf */ jal func00010718
/* f091924: 0c0042bf */ jal snd00010718
/* f091928: afae0018 */ sw $t6,0x18($sp)
/* f09192c: 960f0030 */ lhu $t7,0x30($s0)
.NB0f091930:
@@ -2309,7 +2309,7 @@ glabel var7f1ab740
/* f091958: 30650010 */ andi $a1,$v1,0x10
/* f09195c: 8fa60048 */ lw $a2,0x48($sp)
/* f091960: 8fa70044 */ lw $a3,0x44($sp)
/* f091964: 0c004224 */ jal audioAdjust
/* f091964: 0c004224 */ jal sndAdjust
/* f091968: afaa0018 */ sw $t2,0x18($sp)
/* f09196c: 10000021 */ beqz $zero,.NB0f0919f4
/* f091970: 00000000 */ sll $zero,$zero,0x0
@@ -2318,7 +2318,7 @@ glabel var7f1ab740
/* f091978: 306c0010 */ andi $t4,$v1,0x10
/* f09197c: 51800014 */ beqzl $t4,.NB0f0919d0
/* f091980: 8e0f0000 */ lw $t7,0x0($s0)
/* f091984: 0c003c6c */ jal func0000e9d0
/* f091984: 0c003c6c */ jal snd0000e9d0
/* f091988: 00000000 */ sll $zero,$zero,0x0
/* f09198c: 54400018 */ bnezl $v0,.NB0f0919f0
/* f091990: 24190001 */ addiu $t9,$zero,0x1
@@ -3312,7 +3312,7 @@ glabel var7f1ab748
/* f093e34: 331907ff */ andi $t9,$t8,0x7ff
/* f093e38: a619002c */ sh $t9,0x2c($s0)
/* f093e3c: 8604002c */ lh $a0,0x2c($s0)
/* f093e40: 0c004103 */ jal audioIsFiltered
/* f093e40: 0c004103 */ jal sndIsFiltered
/* f093e44: afa900d0 */ sw $t1,0xd0($sp)
/* f093e48: 8fa300dc */ lw $v1,0xdc($sp)
/* f093e4c: 2407ffff */ addiu $a3,$zero,-1
@@ -3395,7 +3395,7 @@ glabel var7f1ab748
.L0f093f60:
/* f093f60: 358d1000 */ ori $t5,$t4,0x1000
/* f093f64: a60d0030 */ sh $t5,0x30($s0)
/* f093f68: 0c003ee8 */ jal func0000fba0
/* f093f68: 0c003ee8 */ jal snd0000fba0
/* f093f6c: 87a400ba */ lh $a0,0xba($sp)
/* f093f70: 10400014 */ beqz $v0,.L0f093fc4
/* f093f74: 00000000 */ nop
@@ -3830,7 +3830,7 @@ glabel var7f1a5a9cnb
/* f092290: 96180030 */ lhu $t8,0x30($s0)
/* f092294: 37191000 */ ori $t9,$t8,0x1000
/* f092298: a6190030 */ sh $t9,0x30($s0)
/* f09229c: 0c00400e */ jal func0000fba0
/* f09229c: 0c00400e */ jal snd0000fba0
/* f0922a0: 87a400c2 */ lh $a0,0xc2($sp)
/* f0922a4: 10400008 */ beqz $v0,.NB0f0922c8
/* f0922a8: 00000000 */ sll $zero,$zero,0x0
@@ -4031,7 +4031,7 @@ glabel var7f1a5a9cnb
// channel->soundnum26 = spac.packed;
// channel->unk2c = spac.bits3.id;
//
// if (audioIsFiltered(channel->unk2c)) {
// if (sndIsFiltered(channel->unk2c)) {
// channel->flags2 |= AUDIOCHANNELFLAG2_0020;
// }
//
@@ -4072,7 +4072,7 @@ glabel var7f1a5a9cnb
//
// channel->flags |= AUDIOCHANNELFLAG_1000;
//
// if (func0000fba0(soundnum)) {
// if (snd0000fba0(soundnum)) {
// channel->flags |= AUDIOCHANNELFLAG_0010;
//
// prevpri = osGetThreadPri(0);
@@ -5473,7 +5473,7 @@ glabel var7f1ab788
/* f095198: 0fc2535e */ jal func0f094d78
/* f09519c: e7a80010 */ swc1 $f8,0x10($sp)
/* f0951a0: 00408025 */ or $s0,$v0,$zero
/* f0951a4: 0c003ee8 */ jal func0000fba0
/* f0951a4: 0c003ee8 */ jal snd0000fba0
/* f0951a8: 87a4007a */ lh $a0,0x7a($sp)
/* f0951ac: 3c013f80 */ lui $at,0x3f80
/* f0951b0: 44815000 */ mtc1 $at,$f10
@@ -5489,7 +5489,7 @@ glabel var7f1ab788
/* f0951d8: 8fa6004c */ lw $a2,0x4c($sp)
/* f0951dc: 02003825 */ or $a3,$s0,$zero
/* f0951e0: afad0010 */ sw $t5,0x10($sp)
/* f0951e4: 0c004128 */ jal audioAdjust
/* f0951e4: 0c004128 */ jal sndAdjust
/* f0951e8: e7aa0014 */ swc1 $f10,0x14($sp)
/* f0951ec: 8fbf0034 */ lw $ra,0x34($sp)
/* f0951f0: 8fb00030 */ lw $s0,0x30($sp)
src/game/game_097ba0.c
+86 -86
View File
@@ -27,8 +27,8 @@
#include "game/smoke/smoke.h"
#include "game/game_1531a0.h"
#include "game/file.h"
#include "game/core.h"
#include "game/texture.h"
#include "game/lv.h"
#include "game/texdecompress.h"
#include "game/game_176080.h"
#include "game/training/training.h"
#include "game/training/training.h"
@@ -41,7 +41,7 @@
#include "lib/lib_09a80.h"
#include "lib/main.h"
#include "lib/model.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
@@ -336,7 +336,7 @@ glabel func0f097ba0
/* f097bb4: afa00030 */ sw $zero,0x30($sp)
/* f097bb8: 8084a24f */ lb $a0,%lo(g_Vars+0x28f)($a0)
/* f097bbc: 27a5002c */ addiu $a1,$sp,0x2c
/* f097bc0: 0c0054b4 */ jal func000152d0
/* f097bc0: 0c0054b4 */ jal joy000152d0
/* f097bc4: 27a60028 */ addiu $a2,$sp,0x28
/* f097bc8: 3c0e800a */ lui $t6,%hi(g_Vars+0x288)
/* f097bcc: 8dcea248 */ lw $t6,%lo(g_Vars+0x288)($t6)
@@ -1473,7 +1473,7 @@ glabel var7f1ad3acpf
/* f098820: 24070040 */ li $a3,0x40
/* f098824: 00008825 */ move $s1,$zero
/* f098828: afae0010 */ sw $t6,0x10($sp)
/* f09882c: 0c004125 */ jal func00010718
/* f09882c: 0c004125 */ jal snd00010718
/* f098830: e7a60014 */ swc1 $f6,0x14($sp)
/* f098834: 8fa80078 */ lw $t0,0x78($sp)
/* f098838: 10000028 */ b .PF0f0988dc
@@ -1494,7 +1494,7 @@ glabel var7f1ad3acpf
/* f098870: 24067fff */ li $a2,0x7fff
/* f098874: 24070040 */ li $a3,0x40
/* f098878: afa90010 */ sw $t1,0x10($sp)
/* f09887c: 0c004125 */ jal func00010718
/* f09887c: 0c004125 */ jal snd00010718
/* f098880: e7aa0014 */ swc1 $f10,0x14($sp)
/* f098884: 8fa80078 */ lw $t0,0x78($sp)
/* f098888: 10000014 */ b .PF0f0988dc
@@ -1951,7 +1951,7 @@ glabel var7f1ac1b0
/* f0987ac: 24070040 */ addiu $a3,$zero,0x40
/* f0987b0: 00008825 */ or $s1,$zero,$zero
/* f0987b4: afad0010 */ sw $t5,0x10($sp)
/* f0987b8: 0c0041c6 */ jal func00010718
/* f0987b8: 0c0041c6 */ jal snd00010718
/* f0987bc: e7b20014 */ swc1 $f18,0x14($sp)
/* f0987c0: 10000026 */ b .L0f09885c
/* f0987c4: 8fa80070 */ lw $t0,0x70($sp)
@@ -1970,7 +1970,7 @@ glabel var7f1ac1b0
/* f0987f4: 24067fff */ addiu $a2,$zero,0x7fff
/* f0987f8: 24070040 */ addiu $a3,$zero,0x40
/* f0987fc: afb90010 */ sw $t9,0x10($sp)
/* f098800: 0c0041c6 */ jal func00010718
/* f098800: 0c0041c6 */ jal snd00010718
/* f098804: e7a60014 */ swc1 $f6,0x14($sp)
/* f098808: 10000014 */ b .L0f09885c
/* f09880c: 8fa80070 */ lw $t0,0x70($sp)
@@ -2422,7 +2422,7 @@ glabel var7f1ac1b0
/* f09680c: 8c848180 */ lw $a0,-0x7e80($a0)
/* f096810: 00003025 */ or $a2,$zero,$zero
/* f096814: 2407ffff */ addiu $a3,$zero,-1
/* f096818: 0c004338 */ jal audioStart
/* f096818: 0c004338 */ jal sndStart
/* f09681c: e7b20014 */ swc1 $f18,0x14($sp)
/* f096820: 8fa80068 */ lw $t0,0x68($sp)
/* f096824: 1220001c */ beqz $s1,.NB0f096898
@@ -5025,7 +5025,7 @@ glabel var7f1ac31c
/* f09a1a4: 2405804f */ addiu $a1,$zero,-32689
/* f09a1a8: 00003025 */ or $a2,$zero,$zero
/* f09a1ac: 2407ffff */ addiu $a3,$zero,-1
/* f09a1b0: 0c004241 */ jal audioStart
/* f09a1b0: 0c004241 */ jal sndStart
/* f09a1b4: e7a40014 */ swc1 $f4,0x14($sp)
.L0f09a1b8:
/* f09a1b8: 8e0e001c */ lw $t6,0x1c($s0)
@@ -5685,7 +5685,7 @@ glabel var7f1ac31c
/* f09a1a4: 2405804f */ addiu $a1,$zero,-32689
/* f09a1a8: 00003025 */ or $a2,$zero,$zero
/* f09a1ac: 2407ffff */ addiu $a3,$zero,-1
/* f09a1b0: 0c004241 */ jal audioStart
/* f09a1b0: 0c004241 */ jal sndStart
/* f09a1b4: e7a40014 */ swc1 $f4,0x14($sp)
.L0f09a1b8:
/* f09a1b8: 8e0e001c */ lw $t6,0x1c($s0)
@@ -6343,7 +6343,7 @@ glabel var7f1ac31c
/* f09a1a4: 2405804f */ addiu $a1,$zero,-32689
/* f09a1a8: 00003025 */ or $a2,$zero,$zero
/* f09a1ac: 2407ffff */ addiu $a3,$zero,-1
/* f09a1b0: 0c004241 */ jal audioStart
/* f09a1b0: 0c004241 */ jal sndStart
/* f09a1b4: e7a40014 */ swc1 $f4,0x14($sp)
.L0f09a1b8:
/* f09a1b8: 8e0e001c */ lw $t6,0x1c($s0)
@@ -7175,7 +7175,7 @@ glabel var7f1ac320
/* f09aa88: 01602825 */ or $a1,$t3,$zero
/* f09aa8c: 260601cc */ addiu $a2,$s0,0x1cc
/* f09aa90: 2407ffff */ addiu $a3,$zero,-1
/* f09aa94: 0c004241 */ jal audioStart
/* f09aa94: 0c004241 */ jal sndStart
/* f09aa98: e7a80014 */ swc1 $f8,0x14($sp)
/* f09aa9c: 10000018 */ b .L0f09ab00
/* f09aaa0: 00402025 */ or $a0,$v0,$zero
@@ -7200,7 +7200,7 @@ glabel var7f1ac320
/* f09aae8: 01e02825 */ or $a1,$t7,$zero
/* f09aaec: 260601d0 */ addiu $a2,$s0,0x1d0
/* f09aaf0: 2407ffff */ addiu $a3,$zero,-1
/* f09aaf4: 0c004241 */ jal audioStart
/* f09aaf4: 0c004241 */ jal sndStart
/* f09aaf8: e7aa0014 */ swc1 $f10,0x14($sp)
/* f09aafc: 00402025 */ or $a0,$v0,$zero
.L0f09ab00:
@@ -7505,7 +7505,7 @@ glabel var7f1ac320
/* f09aa88: 01602825 */ or $a1,$t3,$zero
/* f09aa8c: 260601cc */ addiu $a2,$s0,0x1cc
/* f09aa90: 2407ffff */ addiu $a3,$zero,-1
/* f09aa94: 0c004241 */ jal audioStart
/* f09aa94: 0c004241 */ jal sndStart
/* f09aa98: e7a80014 */ swc1 $f8,0x14($sp)
/* f09aa9c: 10000018 */ b .L0f09ab00
/* f09aaa0: 00402025 */ or $a0,$v0,$zero
@@ -7530,7 +7530,7 @@ glabel var7f1ac320
/* f09aae8: 01e02825 */ or $a1,$t7,$zero
/* f09aaec: 260601d0 */ addiu $a2,$s0,0x1d0
/* f09aaf0: 2407ffff */ addiu $a3,$zero,-1
/* f09aaf4: 0c004241 */ jal audioStart
/* f09aaf4: 0c004241 */ jal sndStart
/* f09aaf8: e7aa0014 */ swc1 $f10,0x14($sp)
/* f09aafc: 00402025 */ or $a0,$v0,$zero
.L0f09ab00:
@@ -7826,7 +7826,7 @@ glabel var7f1ac320
/* f098aa0: 01602825 */ or $a1,$t3,$zero
/* f098aa4: 260601cc */ addiu $a2,$s0,0x1cc
/* f098aa8: 2407ffff */ addiu $a3,$zero,-1
/* f098aac: 0c004338 */ jal audioStart
/* f098aac: 0c004338 */ jal sndStart
/* f098ab0: e7a80014 */ swc1 $f8,0x14($sp)
/* f098ab4: 10000018 */ beqz $zero,.NB0f098b18
/* f098ab8: 00402025 */ or $a0,$v0,$zero
@@ -7851,7 +7851,7 @@ glabel var7f1ac320
/* f098b00: 01e02825 */ or $a1,$t7,$zero
/* f098b04: 260601d0 */ addiu $a2,$s0,0x1d0
/* f098b08: 2407ffff */ addiu $a3,$zero,-1
/* f098b0c: 0c004338 */ jal audioStart
/* f098b0c: 0c004338 */ jal sndStart
/* f098b10: e7aa0014 */ swc1 $f10,0x14($sp)
/* f098b14: 00402025 */ or $a0,$v0,$zero
.NB0f098b18:
@@ -10181,7 +10181,7 @@ glabel var7f1ac480
/* f09bad4: 24058080 */ addiu $a1,$zero,-32640
/* f09bad8: 00003025 */ or $a2,$zero,$zero
/* f09badc: 2407ffff */ addiu $a3,$zero,-1
/* f09bae0: 0c004241 */ jal audioStart
/* f09bae0: 0c004241 */ jal sndStart
/* f09bae4: e7a60014 */ swc1 $f6,0x14($sp)
/* f09bae8: 10400004 */ beqz $v0,.L0f09bafc
/* f09baec: 00402025 */ or $a0,$v0,$zero
@@ -10217,7 +10217,7 @@ glabel var7f1ac480
/* f09bb60: 24058052 */ addiu $a1,$zero,-32686
/* f09bb64: 00003025 */ or $a2,$zero,$zero
/* f09bb68: 2407ffff */ addiu $a3,$zero,-1
/* f09bb6c: 0c004241 */ jal audioStart
/* f09bb6c: 0c004241 */ jal sndStart
/* f09bb70: e7aa0014 */ swc1 $f10,0x14($sp)
/* f09bb74: 10400004 */ beqz $v0,.L0f09bb88
/* f09bb78: 00402025 */ or $a0,$v0,$zero
@@ -10244,7 +10244,7 @@ glabel var7f1ac480
/* f09bbc4: 24058052 */ addiu $a1,$zero,-32686
/* f09bbc8: 00003025 */ or $a2,$zero,$zero
/* f09bbcc: 2407ffff */ addiu $a3,$zero,-1
/* f09bbd0: 0c004241 */ jal audioStart
/* f09bbd0: 0c004241 */ jal sndStart
/* f09bbd4: e7b00014 */ swc1 $f16,0x14($sp)
.L0f09bbd8:
/* f09bbd8: 8e0e000c */ lw $t6,0xc($s0)
@@ -10574,7 +10574,7 @@ glabel var7f1ac480
/* f09bad4: 24058080 */ addiu $a1,$zero,-32640
/* f09bad8: 00003025 */ or $a2,$zero,$zero
/* f09badc: 2407ffff */ addiu $a3,$zero,-1
/* f09bae0: 0c004241 */ jal audioStart
/* f09bae0: 0c004241 */ jal sndStart
/* f09bae4: e7a60014 */ swc1 $f6,0x14($sp)
/* f09bae8: 10400004 */ beqz $v0,.L0f09bafc
/* f09baec: 00402025 */ or $a0,$v0,$zero
@@ -10610,7 +10610,7 @@ glabel var7f1ac480
/* f09bb60: 24058052 */ addiu $a1,$zero,-32686
/* f09bb64: 00003025 */ or $a2,$zero,$zero
/* f09bb68: 2407ffff */ addiu $a3,$zero,-1
/* f09bb6c: 0c004241 */ jal audioStart
/* f09bb6c: 0c004241 */ jal sndStart
/* f09bb70: e7aa0014 */ swc1 $f10,0x14($sp)
/* f09bb74: 10400004 */ beqz $v0,.L0f09bb88
/* f09bb78: 00402025 */ or $a0,$v0,$zero
@@ -10637,7 +10637,7 @@ glabel var7f1ac480
/* f09bbc4: 24058052 */ addiu $a1,$zero,-32686
/* f09bbc8: 00003025 */ or $a2,$zero,$zero
/* f09bbcc: 2407ffff */ addiu $a3,$zero,-1
/* f09bbd0: 0c004241 */ jal audioStart
/* f09bbd0: 0c004241 */ jal sndStart
/* f09bbd4: e7b00014 */ swc1 $f16,0x14($sp)
.L0f09bbd8:
/* f09bbd8: 8e0e000c */ lw $t6,0xc($s0)
@@ -10958,7 +10958,7 @@ glabel var7f1ac480
/* f099abc: 00003025 */ or $a2,$zero,$zero
/* f099ac0: 2407ffff */ addiu $a3,$zero,-1
/* f099ac4: e7a4003c */ swc1 $f4,0x3c($sp)
/* f099ac8: 0c004338 */ jal audioStart
/* f099ac8: 0c004338 */ jal sndStart
/* f099acc: e7a60014 */ swc1 $f6,0x14($sp)
/* f099ad0: 10400004 */ beqz $v0,.NB0f099ae4
/* f099ad4: 00402025 */ or $a0,$v0,$zero
@@ -10982,7 +10982,7 @@ glabel var7f1ac480
/* f099b18: 00003025 */ or $a2,$zero,$zero
/* f099b1c: 2407ffff */ addiu $a3,$zero,-1
/* f099b20: e7a80034 */ swc1 $f8,0x34($sp)
/* f099b24: 0c004338 */ jal audioStart
/* f099b24: 0c004338 */ jal sndStart
/* f099b28: e7aa0014 */ swc1 $f10,0x14($sp)
/* f099b2c: 10400015 */ beqz $v0,.NB0f099b84
/* f099b30: 00402025 */ or $a0,$v0,$zero
@@ -11005,7 +11005,7 @@ glabel var7f1ac480
/* f099b70: 24058052 */ addiu $a1,$zero,-32686
/* f099b74: 00003025 */ or $a2,$zero,$zero
/* f099b78: 2407ffff */ addiu $a3,$zero,-1
/* f099b7c: 0c004338 */ jal audioStart
/* f099b7c: 0c004338 */ jal sndStart
/* f099b80: e7b00014 */ swc1 $f16,0x14($sp)
.NB0f099b84:
/* f099b84: 8e0e000c */ lw $t6,0xc($s0)
@@ -11999,7 +11999,7 @@ glabel var7f1ac5ec
/* f09c734: 24050002 */ addiu $a1,$zero,0x2
/* f09c738: 00003025 */ or $a2,$zero,$zero
/* f09c73c: 2407ffff */ addiu $a3,$zero,-1
/* f09c740: 0c004241 */ jal audioStart
/* f09c740: 0c004241 */ jal sndStart
/* f09c744: e7a80014 */ swc1 $f8,0x14($sp)
/* f09c748: 10400004 */ beqz $v0,.L0f09c75c
/* f09c74c: 00402025 */ or $a0,$v0,$zero
@@ -12025,7 +12025,7 @@ glabel var7f1ac5ec
/* f09c798: 240500f2 */ addiu $a1,$zero,0xf2
/* f09c79c: 00003025 */ or $a2,$zero,$zero
/* f09c7a0: 2407ffff */ addiu $a3,$zero,-1
/* f09c7a4: 0c004241 */ jal audioStart
/* f09c7a4: 0c004241 */ jal sndStart
/* f09c7a8: e7b00014 */ swc1 $f16,0x14($sp)
/* f09c7ac: 10000090 */ b .L0f09c9f0
/* f09c7b0: 8e0e001c */ lw $t6,0x1c($s0)
@@ -12042,7 +12042,7 @@ glabel var7f1ac5ec
/* f09c7dc: 240500e9 */ addiu $a1,$zero,0xe9
/* f09c7e0: 00003025 */ or $a2,$zero,$zero
/* f09c7e4: 2407ffff */ addiu $a3,$zero,-1
/* f09c7e8: 0c004241 */ jal audioStart
/* f09c7e8: 0c004241 */ jal sndStart
/* f09c7ec: e7aa0014 */ swc1 $f10,0x14($sp)
/* f09c7f0: 1000007f */ b .L0f09c9f0
/* f09c7f4: 8e0e001c */ lw $t6,0x1c($s0)
@@ -12061,7 +12061,7 @@ glabel var7f1ac5ec
/* f09c828: afa90010 */ sw $t1,0x10($sp)
/* f09c82c: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f09c830: 2407ffff */ addiu $a3,$zero,-1
/* f09c834: 0c004241 */ jal audioStart
/* f09c834: 0c004241 */ jal sndStart
/* f09c838: e7b20014 */ swc1 $f18,0x14($sp)
/* f09c83c: 1000006c */ b .L0f09c9f0
/* f09c840: 8e0e001c */ lw $t6,0x1c($s0)
@@ -12078,7 +12078,7 @@ glabel var7f1ac5ec
/* f09c86c: 240500eb */ addiu $a1,$zero,0xeb
/* f09c870: 00003025 */ or $a2,$zero,$zero
/* f09c874: 2407ffff */ addiu $a3,$zero,-1
/* f09c878: 0c004241 */ jal audioStart
/* f09c878: 0c004241 */ jal sndStart
/* f09c87c: e7a40014 */ swc1 $f4,0x14($sp)
/* f09c880: 1000005b */ b .L0f09c9f0
/* f09c884: 8e0e001c */ lw $t6,0x1c($s0)
@@ -12107,7 +12107,7 @@ glabel var7f1ac5ec
/* f09c8e0: 240500e8 */ addiu $a1,$zero,0xe8
/* f09c8e4: 00003025 */ or $a2,$zero,$zero
/* f09c8e8: 2407ffff */ addiu $a3,$zero,-1
/* f09c8ec: 0c004241 */ jal audioStart
/* f09c8ec: 0c004241 */ jal sndStart
/* f09c8f0: e7a80014 */ swc1 $f8,0x14($sp)
/* f09c8f4: 10400004 */ beqz $v0,.L0f09c908
/* f09c8f8: 00402025 */ or $a0,$v0,$zero
@@ -12145,7 +12145,7 @@ glabel var7f1ac5ec
/* f09c974: 240500e8 */ addiu $a1,$zero,0xe8
/* f09c978: 00003025 */ or $a2,$zero,$zero
/* f09c97c: 2407ffff */ addiu $a3,$zero,-1
/* f09c980: 0c004241 */ jal audioStart
/* f09c980: 0c004241 */ jal sndStart
/* f09c984: e7aa0014 */ swc1 $f10,0x14($sp)
/* f09c988: 10400004 */ beqz $v0,.L0f09c99c
/* f09c98c: 00402025 */ or $a0,$v0,$zero
@@ -12172,7 +12172,7 @@ glabel var7f1ac5ec
/* f09c9d8: 240500e8 */ addiu $a1,$zero,0xe8
/* f09c9dc: 00003025 */ or $a2,$zero,$zero
/* f09c9e0: 2407ffff */ addiu $a3,$zero,-1
/* f09c9e4: 0c004241 */ jal audioStart
/* f09c9e4: 0c004241 */ jal sndStart
/* f09c9e8: e7b20014 */ swc1 $f18,0x14($sp)
.L0f09c9ec:
/* f09c9ec: 8e0e001c */ lw $t6,0x1c($s0)
@@ -12965,7 +12965,7 @@ glabel var7f1ac5ec
/* f09c734: 24050002 */ addiu $a1,$zero,0x2
/* f09c738: 00003025 */ or $a2,$zero,$zero
/* f09c73c: 2407ffff */ addiu $a3,$zero,-1
/* f09c740: 0c004241 */ jal audioStart
/* f09c740: 0c004241 */ jal sndStart
/* f09c744: e7a80014 */ swc1 $f8,0x14($sp)
/* f09c748: 10400004 */ beqz $v0,.L0f09c75c
/* f09c74c: 00402025 */ or $a0,$v0,$zero
@@ -12991,7 +12991,7 @@ glabel var7f1ac5ec
/* f09c798: 240500f2 */ addiu $a1,$zero,0xf2
/* f09c79c: 00003025 */ or $a2,$zero,$zero
/* f09c7a0: 2407ffff */ addiu $a3,$zero,-1
/* f09c7a4: 0c004241 */ jal audioStart
/* f09c7a4: 0c004241 */ jal sndStart
/* f09c7a8: e7b00014 */ swc1 $f16,0x14($sp)
/* f09c7ac: 10000090 */ b .L0f09c9f0
/* f09c7b0: 8e0e001c */ lw $t6,0x1c($s0)
@@ -13008,7 +13008,7 @@ glabel var7f1ac5ec
/* f09c7dc: 240500e9 */ addiu $a1,$zero,0xe9
/* f09c7e0: 00003025 */ or $a2,$zero,$zero
/* f09c7e4: 2407ffff */ addiu $a3,$zero,-1
/* f09c7e8: 0c004241 */ jal audioStart
/* f09c7e8: 0c004241 */ jal sndStart
/* f09c7ec: e7aa0014 */ swc1 $f10,0x14($sp)
/* f09c7f0: 1000007f */ b .L0f09c9f0
/* f09c7f4: 8e0e001c */ lw $t6,0x1c($s0)
@@ -13027,7 +13027,7 @@ glabel var7f1ac5ec
/* f09c828: afa90010 */ sw $t1,0x10($sp)
/* f09c82c: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f09c830: 2407ffff */ addiu $a3,$zero,-1
/* f09c834: 0c004241 */ jal audioStart
/* f09c834: 0c004241 */ jal sndStart
/* f09c838: e7b20014 */ swc1 $f18,0x14($sp)
/* f09c83c: 1000006c */ b .L0f09c9f0
/* f09c840: 8e0e001c */ lw $t6,0x1c($s0)
@@ -13044,7 +13044,7 @@ glabel var7f1ac5ec
/* f09c86c: 240500eb */ addiu $a1,$zero,0xeb
/* f09c870: 00003025 */ or $a2,$zero,$zero
/* f09c874: 2407ffff */ addiu $a3,$zero,-1
/* f09c878: 0c004241 */ jal audioStart
/* f09c878: 0c004241 */ jal sndStart
/* f09c87c: e7a40014 */ swc1 $f4,0x14($sp)
/* f09c880: 1000005b */ b .L0f09c9f0
/* f09c884: 8e0e001c */ lw $t6,0x1c($s0)
@@ -13073,7 +13073,7 @@ glabel var7f1ac5ec
/* f09c8e0: 240500e8 */ addiu $a1,$zero,0xe8
/* f09c8e4: 00003025 */ or $a2,$zero,$zero
/* f09c8e8: 2407ffff */ addiu $a3,$zero,-1
/* f09c8ec: 0c004241 */ jal audioStart
/* f09c8ec: 0c004241 */ jal sndStart
/* f09c8f0: e7a80014 */ swc1 $f8,0x14($sp)
/* f09c8f4: 10400004 */ beqz $v0,.L0f09c908
/* f09c8f8: 00402025 */ or $a0,$v0,$zero
@@ -13111,7 +13111,7 @@ glabel var7f1ac5ec
/* f09c974: 240500e8 */ addiu $a1,$zero,0xe8
/* f09c978: 00003025 */ or $a2,$zero,$zero
/* f09c97c: 2407ffff */ addiu $a3,$zero,-1
/* f09c980: 0c004241 */ jal audioStart
/* f09c980: 0c004241 */ jal sndStart
/* f09c984: e7aa0014 */ swc1 $f10,0x14($sp)
/* f09c988: 10400004 */ beqz $v0,.L0f09c99c
/* f09c98c: 00402025 */ or $a0,$v0,$zero
@@ -13138,7 +13138,7 @@ glabel var7f1ac5ec
/* f09c9d8: 240500e8 */ addiu $a1,$zero,0xe8
/* f09c9dc: 00003025 */ or $a2,$zero,$zero
/* f09c9e0: 2407ffff */ addiu $a3,$zero,-1
/* f09c9e4: 0c004241 */ jal audioStart
/* f09c9e4: 0c004241 */ jal sndStart
/* f09c9e8: e7b20014 */ swc1 $f18,0x14($sp)
.L0f09c9ec:
/* f09c9ec: 8e0e001c */ lw $t6,0x1c($s0)
@@ -13920,7 +13920,7 @@ glabel var7f1ac5ec
/* f09a6bc: 00003025 */ or $a2,$zero,$zero
/* f09a6c0: 2407ffff */ addiu $a3,$zero,-1
/* f09a6c4: e7a60044 */ swc1 $f6,0x44($sp)
/* f09a6c8: 0c004338 */ jal audioStart
/* f09a6c8: 0c004338 */ jal sndStart
/* f09a6cc: e7a80014 */ swc1 $f8,0x14($sp)
/* f09a6d0: 1040008d */ beqz $v0,.NB0f09a908
/* f09a6d4: 00402025 */ or $a0,$v0,$zero
@@ -13942,7 +13942,7 @@ glabel var7f1ac5ec
/* f09a714: 240500f2 */ addiu $a1,$zero,0xf2
/* f09a718: 00003025 */ or $a2,$zero,$zero
/* f09a71c: 2407ffff */ addiu $a3,$zero,-1
/* f09a720: 0c004338 */ jal audioStart
/* f09a720: 0c004338 */ jal sndStart
/* f09a724: e7b00014 */ swc1 $f16,0x14($sp)
/* f09a728: 10000078 */ beqz $zero,.NB0f09a90c
/* f09a72c: 8e0e001c */ lw $t6,0x1c($s0)
@@ -13959,7 +13959,7 @@ glabel var7f1ac5ec
/* f09a758: 240500e9 */ addiu $a1,$zero,0xe9
/* f09a75c: 00003025 */ or $a2,$zero,$zero
/* f09a760: 2407ffff */ addiu $a3,$zero,-1
/* f09a764: 0c004338 */ jal audioStart
/* f09a764: 0c004338 */ jal sndStart
/* f09a768: e7aa0014 */ swc1 $f10,0x14($sp)
/* f09a76c: 10000067 */ beqz $zero,.NB0f09a90c
/* f09a770: 8e0e001c */ lw $t6,0x1c($s0)
@@ -13978,7 +13978,7 @@ glabel var7f1ac5ec
/* f09a7a4: afa90010 */ sw $t1,0x10($sp)
/* f09a7a8: 8c848180 */ lw $a0,-0x7e80($a0)
/* f09a7ac: 2407ffff */ addiu $a3,$zero,-1
/* f09a7b0: 0c004338 */ jal audioStart
/* f09a7b0: 0c004338 */ jal sndStart
/* f09a7b4: e7b20014 */ swc1 $f18,0x14($sp)
/* f09a7b8: 10000054 */ beqz $zero,.NB0f09a90c
/* f09a7bc: 8e0e001c */ lw $t6,0x1c($s0)
@@ -13995,7 +13995,7 @@ glabel var7f1ac5ec
/* f09a7e8: 240500eb */ addiu $a1,$zero,0xeb
/* f09a7ec: 00003025 */ or $a2,$zero,$zero
/* f09a7f0: 2407ffff */ addiu $a3,$zero,-1
/* f09a7f4: 0c004338 */ jal audioStart
/* f09a7f4: 0c004338 */ jal sndStart
/* f09a7f8: e7a40014 */ swc1 $f4,0x14($sp)
/* f09a7fc: 10000043 */ beqz $zero,.NB0f09a90c
/* f09a800: 8e0e001c */ lw $t6,0x1c($s0)
@@ -14015,7 +14015,7 @@ glabel var7f1ac5ec
/* f09a838: 00003025 */ or $a2,$zero,$zero
/* f09a83c: 2407ffff */ addiu $a3,$zero,-1
/* f09a840: e7a6003c */ swc1 $f6,0x3c($sp)
/* f09a844: 0c004338 */ jal audioStart
/* f09a844: 0c004338 */ jal sndStart
/* f09a848: e7a80014 */ swc1 $f8,0x14($sp)
/* f09a84c: 1040002e */ beqz $v0,.NB0f09a908
/* f09a850: 00402025 */ or $a0,$v0,$zero
@@ -14040,7 +14040,7 @@ glabel var7f1ac5ec
/* f09a89c: 00003025 */ or $a2,$zero,$zero
/* f09a8a0: 2407ffff */ addiu $a3,$zero,-1
/* f09a8a4: e7b00034 */ swc1 $f16,0x34($sp)
/* f09a8a8: 0c004338 */ jal audioStart
/* f09a8a8: 0c004338 */ jal sndStart
/* f09a8ac: e7aa0014 */ swc1 $f10,0x14($sp)
/* f09a8b0: 10400015 */ beqz $v0,.NB0f09a908
/* f09a8b4: 00402025 */ or $a0,$v0,$zero
@@ -14063,7 +14063,7 @@ glabel var7f1ac5ec
/* f09a8f4: 240500e8 */ addiu $a1,$zero,0xe8
/* f09a8f8: 00003025 */ or $a2,$zero,$zero
/* f09a8fc: 2407ffff */ addiu $a3,$zero,-1
/* f09a900: 0c004338 */ jal audioStart
/* f09a900: 0c004338 */ jal sndStart
/* f09a904: e7b20014 */ swc1 $f18,0x14($sp)
.NB0f09a908:
/* f09a908: 8e0e001c */ lw $t6,0x1c($s0)
@@ -22919,7 +22919,7 @@ void func0f0a1528(void)
if (ctrl->weaponnum == WEAPON_DISGUISE40 || ctrl->weaponnum == WEAPON_DISGUISE41) {
struct chrdata *chr = player->prop->chr;
audioStart(var80095200, SFX_DISGUISE_ON, 0, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_DISGUISE_ON, 0, -1, -1, -1, -1, -1);
g_Vars.currentplayer->disguised = true;
@@ -25952,7 +25952,7 @@ glabel var7f1ac8b8
/* f0a3d24: afb80010 */ sw $t8,0x10($sp)
/* f0a3d28: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f0a3d2c: 2407ffff */ addiu $a3,$zero,-1
/* f0a3d30: 0c004241 */ jal audioStart
/* f0a3d30: 0c004241 */ jal sndStart
/* f0a3d34: e7a80014 */ swc1 $f8,0x14($sp)
/* f0a3d38: 8e03074c */ lw $v1,0x74c($s0)
.L0f0a3d3c:
@@ -26265,7 +26265,7 @@ glabel var7f1ac8b8
/* f0a3d24: afb80010 */ sw $t8,0x10($sp)
/* f0a3d28: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f0a3d2c: 2407ffff */ addiu $a3,$zero,-1
/* f0a3d30: 0c004241 */ jal audioStart
/* f0a3d30: 0c004241 */ jal sndStart
/* f0a3d34: e7a80014 */ swc1 $f8,0x14($sp)
/* f0a3d38: 8e03074c */ lw $v1,0x74c($s0)
.L0f0a3d3c:
@@ -26922,7 +26922,7 @@ glabel func0f0a4334
/* f0a43a0: afa80010 */ sw $t0,0x10($sp)
/* f0a43a4: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f0a43a8: 2407ffff */ addiu $a3,$zero,-1
/* f0a43ac: 0c004241 */ jal audioStart
/* f0a43ac: 0c004241 */ jal sndStart
/* f0a43b0: e7a40014 */ swc1 $f4,0x14($sp)
.L0f0a43b4:
/* f0a43b4: 3c013f80 */ lui $at,0x3f80
@@ -26997,7 +26997,7 @@ glabel func0f0a4334
/* f0a43a0: afa80010 */ sw $t0,0x10($sp)
/* f0a43a4: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f0a43a8: 2407ffff */ addiu $a3,$zero,-1
/* f0a43ac: 0c004241 */ jal audioStart
/* f0a43ac: 0c004241 */ jal sndStart
/* f0a43b0: e7a40014 */ swc1 $f4,0x14($sp)
.L0f0a43b4:
/* f0a43b4: 3c013f80 */ lui $at,0x3f80
@@ -32162,7 +32162,7 @@ glabel var7f1aca84
/* f0a6b3c: afac0018 */ sw $t4,0x18($sp)
/* f0a6b40: afab0010 */ sw $t3,0x10($sp)
/* f0a6b44: 8ea40000 */ lw $a0,0x0($s5)
/* f0a6b48: 0c004241 */ jal audioStart
/* f0a6b48: 0c004241 */ jal sndStart
/* f0a6b4c: e7ba0014 */ swc1 $f26,0x14($sp)
/* f0a6b50: 8e03074c */ lw $v1,0x74c($s0)
.L0f0a6b54:
@@ -36021,7 +36021,7 @@ glabel var7f1aca94
/* f0a803c: afab0010 */ sw $t3,0x10($sp)
/* f0a8040: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f0a8044: 2407ffff */ addiu $a3,$zero,-1
/* f0a8048: 0c004241 */ jal audioStart
/* f0a8048: 0c004241 */ jal sndStart
/* f0a804c: e7a60014 */ swc1 $f6,0x14($sp)
/* f0a8050: 8faf00bc */ lw $t7,0xbc($sp)
/* f0a8054: 00002825 */ or $a1,$zero,$zero
@@ -36040,7 +36040,7 @@ glabel var7f1aca94
/* f0a8088: afa8001c */ sw $t0,0x1c($sp)
/* f0a808c: afac0018 */ sw $t4,0x18($sp)
/* f0a8090: afb90010 */ sw $t9,0x10($sp)
/* f0a8094: 0c004128 */ jal audioAdjust
/* f0a8094: 0c004128 */ jal sndAdjust
/* f0a8098: e7a80014 */ swc1 $f8,0x14($sp)
.L0f0a809c:
/* f0a809c: 8fa900b0 */ lw $t1,0xb0($sp)
@@ -36155,7 +36155,7 @@ glabel var7f1aca94
/* f0a8228: 8fa600bc */ lw $a2,0xbc($sp)
/* f0a822c: 2407ffff */ addiu $a3,$zero,-1
/* f0a8230: afa30094 */ sw $v1,0x94($sp)
/* f0a8234: 0c004241 */ jal audioStart
/* f0a8234: 0c004241 */ jal sndStart
/* f0a8238: e7aa0014 */ swc1 $f10,0x14($sp)
/* f0a823c: 8faa00bc */ lw $t2,0xbc($sp)
/* f0a8240: 8fa30094 */ lw $v1,0x94($sp)
@@ -36176,7 +36176,7 @@ glabel var7f1aca94
/* f0a827c: afae0018 */ sw $t6,0x18($sp)
/* f0a8280: afa30094 */ sw $v1,0x94($sp)
/* f0a8284: afab0010 */ sw $t3,0x10($sp)
/* f0a8288: 0c004128 */ jal audioAdjust
/* f0a8288: 0c004128 */ jal sndAdjust
/* f0a828c: e7b00014 */ swc1 $f16,0x14($sp)
/* f0a8290: 8fa30094 */ lw $v1,0x94($sp)
.L0f0a8294:
@@ -36247,7 +36247,7 @@ glabel var7f1aca94
/* f0a8388: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f0a838c: 8fa600bc */ lw $a2,0xbc($sp)
/* f0a8390: 2407ffff */ addiu $a3,$zero,-1
/* f0a8394: 0c004241 */ jal audioStart
/* f0a8394: 0c004241 */ jal sndStart
/* f0a8398: e7b20014 */ swc1 $f18,0x14($sp)
.L0f0a839c:
/* f0a839c: 8fb900bc */ lw $t9,0xbc($sp)
@@ -36392,7 +36392,7 @@ glabel var7f1aca94
/* f0a5c4c: 8c848180 */ lw $a0,-0x7e80($a0)
/* f0a5c50: 2407ffff */ addiu $a3,$zero,-1
/* f0a5c54: afab0010 */ sw $t3,0x10($sp)
/* f0a5c58: 0c004338 */ jal audioStart
/* f0a5c58: 0c004338 */ jal sndStart
/* f0a5c5c: e7a60014 */ swc1 $f6,0x14($sp)
/* f0a5c60: 240e0064 */ addiu $t6,$zero,0x64
/* f0a5c64: 10000061 */ beqz $zero,.NB0f0a5dec
@@ -36419,7 +36419,7 @@ glabel var7f1aca94
/* f0a5cb0: afaf0010 */ sw $t7,0x10($sp)
/* f0a5cb4: 8c848180 */ lw $a0,-0x7e80($a0)
/* f0a5cb8: 2407ffff */ addiu $a3,$zero,-1
/* f0a5cbc: 0c004338 */ jal audioStart
/* f0a5cbc: 0c004338 */ jal sndStart
/* f0a5cc0: e7a80014 */ swc1 $f8,0x14($sp)
/* f0a5cc4: 240a05f6 */ addiu $t2,$zero,0x5f6
/* f0a5cc8: 240b0001 */ addiu $t3,$zero,0x1
@@ -36470,7 +36470,7 @@ glabel var7f1aca94
/* f0a5d74: 8c848180 */ lw $a0,-0x7e80($a0)
/* f0a5d78: 2407ffff */ addiu $a3,$zero,-1
/* f0a5d7c: a7a500a6 */ sh $a1,0xa6($sp)
/* f0a5d80: 0c004338 */ jal audioStart
/* f0a5d80: 0c004338 */ jal sndStart
/* f0a5d84: e7aa0014 */ swc1 $f10,0x14($sp)
/* f0a5d88: 10000019 */ beqz $zero,.NB0f0a5df0
/* f0a5d8c: 8fab00ac */ lw $t3,0xac($sp)
@@ -36496,7 +36496,7 @@ glabel var7f1aca94
/* f0a5dd8: 8fa600ac */ lw $a2,0xac($sp)
/* f0a5ddc: 2407ffff */ addiu $a3,$zero,-1
/* f0a5de0: e7b00014 */ swc1 $f16,0x14($sp)
/* f0a5de4: 0c004338 */ jal audioStart
/* f0a5de4: 0c004338 */ jal sndStart
/* f0a5de8: a7a500a6 */ sh $a1,0xa6($sp)
.NB0f0a5dec:
/* f0a5dec: 8fab00ac */ lw $t3,0xac($sp)
@@ -36543,7 +36543,7 @@ glabel var7f1aca94
/* f0a5e84: 8fa600ac */ lw $a2,0xac($sp)
/* f0a5e88: 2407ffff */ addiu $a3,$zero,-1
/* f0a5e8c: afa3008c */ sw $v1,0x8c($sp)
/* f0a5e90: 0c004338 */ jal audioStart
/* f0a5e90: 0c004338 */ jal sndStart
/* f0a5e94: e7a40014 */ swc1 $f4,0x14($sp)
/* f0a5e98: 240e0064 */ addiu $t6,$zero,0x64
/* f0a5e9c: 8fa3008c */ lw $v1,0x8c($sp)
@@ -36587,7 +36587,7 @@ glabel var7f1aca94
/* f0a5f24: 87a50092 */ lh $a1,0x92($sp)
/* f0a5f28: 8fa600ac */ lw $a2,0xac($sp)
/* f0a5f2c: 2407ffff */ addiu $a3,$zero,-1
/* f0a5f30: 0c004338 */ jal audioStart
/* f0a5f30: 0c004338 */ jal sndStart
/* f0a5f34: e7a60014 */ swc1 $f6,0x14($sp)
/* f0a5f38: 1000003f */ beqz $zero,.NB0f0a6038
/* f0a5f3c: 24030001 */ addiu $v1,$zero,0x1
@@ -36612,7 +36612,7 @@ glabel var7f1aca94
/* f0a5f80: 24058079 */ addiu $a1,$zero,-32647
/* f0a5f84: 8fa600ac */ lw $a2,0xac($sp)
/* f0a5f88: 2407ffff */ addiu $a3,$zero,-1
/* f0a5f8c: 0c004338 */ jal audioStart
/* f0a5f8c: 0c004338 */ jal sndStart
/* f0a5f90: e7a80014 */ swc1 $f8,0x14($sp)
/* f0a5f94: 10000028 */ beqz $zero,.NB0f0a6038
/* f0a5f98: 24030001 */ addiu $v1,$zero,0x1
@@ -36654,7 +36654,7 @@ glabel var7f1aca94
/* f0a6020: 8c848180 */ lw $a0,-0x7e80($a0)
/* f0a6024: 2407ffff */ addiu $a3,$zero,-1
/* f0a6028: a7a50092 */ sh $a1,0x92($sp)
/* f0a602c: 0c004338 */ jal audioStart
/* f0a602c: 0c004338 */ jal sndStart
/* f0a6030: e7aa0014 */ swc1 $f10,0x14($sp)
/* f0a6034: 8fa3008c */ lw $v1,0x8c($sp)
.NB0f0a6038:
@@ -36743,7 +36743,7 @@ glabel var7f1aca94
/* f0a616c: afad0010 */ sw $t5,0x10($sp)
/* f0a6170: 8c848180 */ lw $a0,-0x7e80($a0)
/* f0a6174: a7a5005e */ sh $a1,0x5e($sp)
/* f0a6178: 0c004338 */ jal audioStart
/* f0a6178: 0c004338 */ jal sndStart
/* f0a617c: e7b20014 */ swc1 $f18,0x14($sp)
.NB0f0a6180:
/* f0a6180: 8fb800ac */ lw $t8,0xac($sp)
@@ -36780,7 +36780,7 @@ void func0f0a8404(struct coord *pos, s16 *rooms, s32 arg2)
struct audiohandle **handle = func0f0a7d5c();
if (handle) {
audioStart(var80095200, SFX_PUNCH_GLASS, handle, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_PUNCH_GLASS, handle, -1, -1, -1, -1, -1);
if (*handle) {
func0f09505c(*handle, pos, 400, 2500, 3000, rooms, SFX_PUNCH_GLASS, 0x7fff, 0);
@@ -36879,7 +36879,7 @@ glabel var7f1acaa0
/* f0a85f8: 8fa600a4 */ lw $a2,0xa4($sp)
/* f0a85fc: 2407ffff */ addiu $a3,$zero,-1
/* f0a8600: e7a40014 */ swc1 $f4,0x14($sp)
/* f0a8604: 0c004241 */ jal audioStart
/* f0a8604: 0c004241 */ jal sndStart
/* f0a8608: a7a50096 */ sh $a1,0x96($sp)
/* f0a860c: 1000005f */ b .L0f0a878c
/* f0a8610: 24030001 */ addiu $v1,$zero,0x1
@@ -36904,7 +36904,7 @@ glabel var7f1acaa0
/* f0a8654: 24058079 */ addiu $a1,$zero,-32647
/* f0a8658: 8fa600a4 */ lw $a2,0xa4($sp)
/* f0a865c: 2407ffff */ addiu $a3,$zero,-1
/* f0a8660: 0c004241 */ jal audioStart
/* f0a8660: 0c004241 */ jal sndStart
/* f0a8664: e7a60014 */ swc1 $f6,0x14($sp)
/* f0a8668: 10000048 */ b .L0f0a878c
/* f0a866c: 24030001 */ addiu $v1,$zero,0x1
@@ -36940,7 +36940,7 @@ glabel var7f1acaa0
/* f0a86dc: 240580aa */ addiu $a1,$zero,-32598
/* f0a86e0: 8fa600a4 */ lw $a2,0xa4($sp)
/* f0a86e4: 2407ffff */ addiu $a3,$zero,-1
/* f0a86e8: 0c004241 */ jal audioStart
/* f0a86e8: 0c004241 */ jal sndStart
/* f0a86ec: e7a80014 */ swc1 $f8,0x14($sp)
/* f0a86f0: 10000026 */ b .L0f0a878c
/* f0a86f4: 24030001 */ addiu $v1,$zero,0x1
@@ -36980,7 +36980,7 @@ glabel var7f1acaa0
/* f0a8774: 8fa600a4 */ lw $a2,0xa4($sp)
/* f0a8778: 2407ffff */ addiu $a3,$zero,-1
/* f0a877c: a7a50096 */ sh $a1,0x96($sp)
/* f0a8780: 0c004241 */ jal audioStart
/* f0a8780: 0c004241 */ jal sndStart
/* f0a8784: e7aa0014 */ swc1 $f10,0x14($sp)
/* f0a8788: 8fa30090 */ lw $v1,0x90($sp)
.L0f0a878c:
@@ -37061,7 +37061,7 @@ glabel var7f1acaa0
/* f0a88a4: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f0a88a8: 8fa600a4 */ lw $a2,0xa4($sp)
/* f0a88ac: 2407ffff */ addiu $a3,$zero,-1
/* f0a88b0: 0c004241 */ jal audioStart
/* f0a88b0: 0c004241 */ jal sndStart
/* f0a88b4: e7b20014 */ swc1 $f18,0x14($sp)
.L0f0a88b8:
/* f0a88b8: 8faa00a4 */ lw $t2,0xa4($sp)
@@ -37170,7 +37170,7 @@ glabel var7f1acaa0
/* f0a63ac: 8c848180 */ lw $a0,-0x7e80($a0)
/* f0a63b0: 2407ffff */ addiu $a3,$zero,-1
/* f0a63b4: e7a40014 */ swc1 $f4,0x14($sp)
/* f0a63b8: 0c004338 */ jal audioStart
/* f0a63b8: 0c004338 */ jal sndStart
/* f0a63bc: a7a50092 */ sh $a1,0x92($sp)
/* f0a63c0: 1000005d */ beqz $zero,.NB0f0a6538
/* f0a63c4: 24030001 */ addiu $v1,$zero,0x1
@@ -37195,7 +37195,7 @@ glabel var7f1acaa0
/* f0a6408: 24058079 */ addiu $a1,$zero,-32647
/* f0a640c: 8fa6009c */ lw $a2,0x9c($sp)
/* f0a6410: 2407ffff */ addiu $a3,$zero,-1
/* f0a6414: 0c004338 */ jal audioStart
/* f0a6414: 0c004338 */ jal sndStart
/* f0a6418: e7a60014 */ swc1 $f6,0x14($sp)
/* f0a641c: 10000046 */ beqz $zero,.NB0f0a6538
/* f0a6420: 24030001 */ addiu $v1,$zero,0x1
@@ -37229,7 +37229,7 @@ glabel var7f1acaa0
/* f0a6488: 240580aa */ addiu $a1,$zero,-32598
/* f0a648c: 8fa6009c */ lw $a2,0x9c($sp)
/* f0a6490: 2407ffff */ addiu $a3,$zero,-1
/* f0a6494: 0c004338 */ jal audioStart
/* f0a6494: 0c004338 */ jal sndStart
/* f0a6498: e7a80014 */ swc1 $f8,0x14($sp)
/* f0a649c: 10000026 */ beqz $zero,.NB0f0a6538
/* f0a64a0: 24030001 */ addiu $v1,$zero,0x1
@@ -37269,7 +37269,7 @@ glabel var7f1acaa0
/* f0a6520: 8fa6009c */ lw $a2,0x9c($sp)
/* f0a6524: 2407ffff */ addiu $a3,$zero,-1
/* f0a6528: a7a50092 */ sh $a1,0x92($sp)
/* f0a652c: 0c004338 */ jal audioStart
/* f0a652c: 0c004338 */ jal sndStart
/* f0a6530: e7aa0014 */ swc1 $f10,0x14($sp)
/* f0a6534: 8fa3008c */ lw $v1,0x8c($sp)
.NB0f0a6538:
@@ -37347,7 +37347,7 @@ glabel var7f1acaa0
/* f0a6644: 8c848180 */ lw $a0,-0x7e80($a0)
/* f0a6648: 8fa6009c */ lw $a2,0x9c($sp)
/* f0a664c: 2407ffff */ addiu $a3,$zero,-1
/* f0a6650: 0c004338 */ jal audioStart
/* f0a6650: 0c004338 */ jal sndStart
/* f0a6654: e7b20014 */ swc1 $f18,0x14($sp)
.NB0f0a6658:
/* f0a6658: 8fab009c */ lw $t3,0x9c($sp)
@@ -44355,9 +44355,9 @@ void cboostAdd(s32 amount)
}
if (!g_Vars.speedpillwant) {
u32 sound = coreGetSlowMotionType() ? SFX_JO_BOOST_REVERT : SFX_JO_BOOST_ACTIVATE;
u32 sound = lvGetSlowMotionType() ? SFX_JO_BOOST_REVERT : SFX_JO_BOOST_ACTIVATE;
audioStart(var80095200, sound, 0, -1, -1, -1, -1, -1);
sndStart(var80095200, sound, 0, -1, -1, -1, -1, -1);
}
g_Vars.speedpillwant = true;
@@ -44375,7 +44375,7 @@ void cboostSubtract(s32 amount)
void cboostBoost(void)
{
if (coreGetSlowMotionType() != SLOWMOTION_OFF) {
if (lvGetSlowMotionType() != SLOWMOTION_OFF) {
cboostSubtract(PALDOWN(1200));
} else {
cboostAdd(PALDOWN(600));
@@ -44384,7 +44384,7 @@ void cboostBoost(void)
void cboostRevert(void)
{
if (coreGetSlowMotionType() != SLOWMOTION_OFF) {
if (lvGetSlowMotionType() != SLOWMOTION_OFF) {
cboostAdd(PALDOWN(1200));
} else {
cboostSubtract(PALDOWN(600));
src/game/game_0b3350.c
+2 -2
View File
@@ -3,8 +3,8 @@
#include "game/atan2f.h"
#include "game/game_0b3350.h"
#include "game/game_127910.h"
#include "game/room.h"
#include "game/texture.h"
#include "game/bg.h"
#include "game/texdecompress.h"
#include "game/game_173a00.h"
#include "bss.h"
#include "lib/lib_16110.h"
src/game/game_0b4950.c
+2 -2
View File
@@ -3,8 +3,8 @@
#include "game/atan2f.h"
#include "game/game_0b3350.h"
#include "game/game_127910.h"
#include "game/room.h"
#include "game/texture.h"
#include "game/bg.h"
#include "game/texdecompress.h"
#include "game/game_173a00.h"
#include "bss.h"
#include "lib/lib_16110.h"
src/game/game_0b63b0.c
+4 -4
View File
@@ -30,14 +30,14 @@
#include "game/explosions/explosions.h"
#include "game/bondview.h"
#include "game/game_1531a0.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/game_1655c0.h"
#include "game/game_165670.h"
#include "game/game_1668e0.h"
#include "game/gfxmemory.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/music.h"
#include "game/texture.h"
#include "game/texdecompress.h"
#include "game/mplayer/ingame.h"
#include "game/mplayer/scenarios.h"
#include "game/radar.h"
@@ -52,7 +52,7 @@
#include "bss.h"
#include "lib/lib_09a80.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/memory.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
src/game/game_0b69d0.c
+110 -110
View File
@@ -32,14 +32,14 @@
#include "game/explosions/explosions.h"
#include "game/bondview.h"
#include "game/game_1531a0.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/game_1655c0.h"
#include "game/game_165670.h"
#include "game/game_1668e0.h"
#include "game/gfxmemory.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/music.h"
#include "game/texture.h"
#include "game/texdecompress.h"
#include "game/mplayer/ingame.h"
#include "game/mplayer/scenarios.h"
#include "game/radar.h"
@@ -53,10 +53,10 @@
#include "game/splat.h"
#include "game/mpstats.h"
#include "bss.h"
#include "lib/controller.h"
#include "lib/joy.h"
#include "lib/lib_09a80.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/memory.h"
#include "lib/model.h"
#include "lib/rng.h"
@@ -1626,7 +1626,7 @@ void currentPlayerChooseBodyAndHead(s32 *bodynum, s32 *headnum, s32 *arg2)
return;
}
if (g_Vars.stagenum == STAGE_VILLA && coreGetDifficulty() >= DIFF_PA) {
if (g_Vars.stagenum == STAGE_VILLA && lvGetDifficulty() >= DIFF_PA) {
outfit = OUTFIT_NEGOTIATOR;
}
@@ -3603,7 +3603,7 @@ void cameraDoAnimation(s16 animnum)
if ((!var800624a4 && g_Vars.unk0004d3 == 0)
|| g_Vars.in_cutscene == 0
|| var8009de24 == 0) {
contDisableTemporarily();
joyDisableTemporarily();
if (g_Vars.tickmode != TICKMODE_CUTSCENE) {
var8009de24 = 0;
@@ -3680,7 +3680,7 @@ glabel var7f1ae89cpf
/* f0ba818: 00047e03 */ sra $t7,$a0,0x18
/* f0ba81c: 12000005 */ beqz $s0,.PF0f0ba834
/* f0ba820: 01e02025 */ move $a0,$t7
/* f0ba824: 0c00533a */ jal contGetButtons
/* f0ba824: 0c00533a */ jal joyGetButtons
/* f0ba828: 3405ffff */ li $a1,0xffff
/* f0ba82c: 10000002 */ b .PF0f0ba838
/* f0ba830: a7a2013c */ sh $v0,0x13c($sp)
@@ -4068,7 +4068,7 @@ glabel var7f1ad5dc
/* f0ba2d8: 00047e03 */ sra $t7,$a0,0x18
/* f0ba2dc: 12000005 */ beqz $s0,.L0f0ba2f4
/* f0ba2e0: 01e02025 */ or $a0,$t7,$zero
/* f0ba2e4: 0c0053d8 */ jal contGetButtons
/* f0ba2e4: 0c0053d8 */ jal joyGetButtons
/* f0ba2e8: 3405ffff */ dli $a1,0xffff
/* f0ba2ec: 10000002 */ b .L0f0ba2f8
/* f0ba2f0: a7a2010c */ sh $v0,0x10c($sp)
@@ -4448,7 +4448,7 @@ glabel var7f1ad5dc
/* f0b7fb4: 00047e03 */ sra $t7,$a0,0x18
/* f0b7fb8: 12000005 */ beqz $s0,.NB0f0b7fd0
/* f0b7fbc: 01e02025 */ or $a0,$t7,$zero
/* f0b7fc0: 0c005790 */ jal contGetButtons
/* f0b7fc0: 0c005790 */ jal joyGetButtons
/* f0b7fc4: 3405ffff */ dli $a1,0xffff
/* f0b7fc8: 10000002 */ beqz $zero,.NB0f0b7fd4
/* f0b7fcc: a7a2010c */ sh $v0,0x10c($sp)
@@ -4947,7 +4947,7 @@ void currentPlayerTickPauseMenu(void)
if (opened) {
struct trainingdata *data = dtGetData();
coreSetPaused(true);
lvSetPaused(true);
g_Vars.currentplayer->pausemode = PAUSEMODE_PAUSED;
if ((g_GlobalMenuRoot == MENUROOT_MAINMENU || g_GlobalMenuRoot == MENUROOT_TRAINING)
@@ -4973,7 +4973,7 @@ void currentPlayerTickPauseMenu(void)
g_Vars.currentplayer->pausetime60 += g_Vars.diffframe60;
if (g_Vars.currentplayer->pausetime60 >= 20) {
coreSetPaused(false);
lvSetPaused(false);
g_Vars.currentplayer->pausemode = PAUSEMODE_UNPAUSED;
musicResumeAfterUnpause();
}
@@ -4993,7 +4993,7 @@ void currentPlayerPause(s32 root)
void func0f0baf38(void)
{
if (g_Vars.currentplayer->pausemode == PAUSEMODE_PAUSED) {
coreSetPaused(false);
lvSetPaused(false);
musicResumeAfterUnpause();
g_Vars.currentplayer->pausemode = PAUSEMODE_UNPAUSED;
}
@@ -6827,7 +6827,7 @@ glabel var7f1ad6ac
/* f0be314: 00047603 */ sra $t6,$a0,0x18
/* f0be318: 11e00005 */ beqz $t7,.PF0f0be330
/* f0be31c: 01c02025 */ move $a0,$t6
/* f0be320: 0c00533a */ jal contGetButtons
/* f0be320: 0c00533a */ jal joyGetButtons
/* f0be324: 3405ffff */ li $a1,0xffff
/* f0be328: 10000002 */ b .PF0f0be334
/* f0be32c: 3043ffff */ andi $v1,$v0,0xffff
@@ -6930,14 +6930,14 @@ glabel var7f1ad6ac
/* f0be494: 240580ab */ li $a1,-32597
/* f0be498: 00003025 */ move $a2,$zero
/* f0be49c: 2407ffff */ li $a3,-1
/* f0be4a0: 0c0041a0 */ jal audioStart
/* f0be4a0: 0c0041a0 */ jal sndStart
/* f0be4a4: e7a80014 */ swc1 $f8,0x14($sp)
/* f0be4a8: 8e700284 */ lw $s0,0x284($s3)
.PF0f0be4ac:
/* f0be4ac: 2411ffdf */ li $s1,-33
/* f0be4b0: a611024c */ sh $s1,0x24c($s0)
.PF0f0be4b4:
/* f0be4b4: 0fc5b6f7 */ jal coreIsPaused
/* f0be4b4: 0fc5b6f7 */ jal lvIsPaused
/* f0be4b8: 2411ffdf */ li $s1,-33
/* f0be4bc: 50400004 */ beqzl $v0,.PF0f0be4d0
/* f0be4c0: 8e700284 */ lw $s0,0x284($s3)
@@ -7338,19 +7338,19 @@ glabel var7f1ad6ac
.PF0f0bea90:
/* f0bea90: 00047603 */ sra $t6,$a0,0x18
/* f0bea94: 01c02025 */ move $a0,$t6
/* f0bea98: 0c00533a */ jal contGetButtons
/* f0bea98: 0c00533a */ jal joyGetButtons
/* f0bea9c: 3405c000 */ li $a1,0xc000
/* f0beaa0: 1440000c */ bnez $v0,.PF0f0bead4
/* f0beaa4: 00152600 */ sll $a0,$s5,0x18
/* f0beaa8: 0004ce03 */ sra $t9,$a0,0x18
/* f0beaac: 03202025 */ move $a0,$t9
/* f0beab0: 0c00533a */ jal contGetButtons
/* f0beab0: 0c00533a */ jal joyGetButtons
/* f0beab4: 3405c000 */ li $a1,0xc000
/* f0beab8: 14400006 */ bnez $v0,.PF0f0bead4
/* f0beabc: 00152600 */ sll $a0,$s5,0x18
/* f0beac0: 00044e03 */ sra $t1,$a0,0x18
/* f0beac4: 01202025 */ move $a0,$t1
/* f0beac8: 0c00533a */ jal contGetButtons
/* f0beac8: 0c00533a */ jal joyGetButtons
/* f0beacc: 24052000 */ li $a1,0x2000
/* f0bead0: 10400002 */ beqz $v0,.PF0f0beadc
.PF0f0bead4:
@@ -7360,7 +7360,7 @@ glabel var7f1ad6ac
/* f0beadc: 00122600 */ sll $a0,$s2,0x18
/* f0beae0: 00046603 */ sra $t4,$a0,0x18
/* f0beae4: 01802025 */ move $a0,$t4
/* f0beae8: 0c00536a */ jal contGetButtonsPressedThisFrame
/* f0beae8: 0c00536a */ jal joyGetButtonsPressedThisFrame
/* f0beaec: 24052000 */ li $a1,0x2000
/* f0beaf0: 1040001e */ beqz $v0,.PF0f0beb6c
/* f0beaf4: 240b0001 */ li $t3,0x1
@@ -7369,19 +7369,19 @@ glabel var7f1ad6ac
.PF0f0beb00:
/* f0beb00: 00122600 */ sll $a0,$s2,0x18
/* f0beb04: 00046e03 */ sra $t5,$a0,0x18
/* f0beb08: 0c00533a */ jal contGetButtons
/* f0beb08: 0c00533a */ jal joyGetButtons
/* f0beb0c: 01a02025 */ move $a0,$t5
/* f0beb10: 1440000c */ bnez $v0,.PF0f0beb44
/* f0beb14: 00152600 */ sll $a0,$s5,0x18
/* f0beb18: 0004c603 */ sra $t8,$a0,0x18
/* f0beb1c: 03002025 */ move $a0,$t8
/* f0beb20: 0c00533a */ jal contGetButtons
/* f0beb20: 0c00533a */ jal joyGetButtons
/* f0beb24: 3405c000 */ li $a1,0xc000
/* f0beb28: 14400006 */ bnez $v0,.PF0f0beb44
/* f0beb2c: 00122600 */ sll $a0,$s2,0x18
/* f0beb30: 00047e03 */ sra $t7,$a0,0x18
/* f0beb34: 01e02025 */ move $a0,$t7
/* f0beb38: 0c00533a */ jal contGetButtons
/* f0beb38: 0c00533a */ jal joyGetButtons
/* f0beb3c: 24052000 */ li $a1,0x2000
/* f0beb40: 10400002 */ beqz $v0,.PF0f0beb4c
.PF0f0beb44:
@@ -7391,7 +7391,7 @@ glabel var7f1ad6ac
/* f0beb4c: 00152600 */ sll $a0,$s5,0x18
/* f0beb50: 0004ce03 */ sra $t9,$a0,0x18
/* f0beb54: 03202025 */ move $a0,$t9
/* f0beb58: 0c00536a */ jal contGetButtonsPressedThisFrame
/* f0beb58: 0c00536a */ jal joyGetButtonsPressedThisFrame
/* f0beb5c: 24052000 */ li $a1,0x2000
/* f0beb60: 10400002 */ beqz $v0,.PF0f0beb6c
/* f0beb64: 24090001 */ li $t1,0x1
@@ -7399,12 +7399,12 @@ glabel var7f1ad6ac
.PF0f0beb6c:
/* f0beb6c: 00122600 */ sll $a0,$s2,0x18
/* f0beb70: 00045603 */ sra $t2,$a0,0x18
/* f0beb74: 0c0052e6 */ jal contGetStickX
/* f0beb74: 0c0052e6 */ jal joyGetStickX
/* f0beb78: 01402025 */ move $a0,$t2
/* f0beb7c: 00122600 */ sll $a0,$s2,0x18
/* f0beb80: 00046603 */ sra $t4,$a0,0x18
/* f0beb84: a3a2023d */ sb $v0,0x23d($sp)
/* f0beb88: 0c005310 */ jal contGetStickY
/* f0beb88: 0c005310 */ jal joyGetStickY
/* f0beb8c: 01802025 */ move $a0,$t4
/* f0beb90: 10000002 */ b .PF0f0beb9c
/* f0beb94: a3a2023c */ sb $v0,0x23c($sp)
@@ -7413,13 +7413,13 @@ glabel var7f1ad6ac
/* f0beb9c: 00122600 */ sll $a0,$s2,0x18
/* f0beba0: 00046e03 */ sra $t5,$a0,0x18
/* f0beba4: 01a02025 */ move $a0,$t5
/* f0beba8: 0c00533a */ jal contGetButtons
/* f0beba8: 0c00533a */ jal joyGetButtons
/* f0bebac: 24051000 */ li $a1,0x1000
/* f0bebb0: 14400006 */ bnez $v0,.PF0f0bebcc
/* f0bebb4: 00152600 */ sll $a0,$s5,0x18
/* f0bebb8: 0004c603 */ sra $t8,$a0,0x18
/* f0bebbc: 03002025 */ move $a0,$t8
/* f0bebc0: 0c00533a */ jal contGetButtons
/* f0bebc0: 0c00533a */ jal joyGetButtons
/* f0bebc4: 24051000 */ li $a1,0x1000
/* f0bebc8: 10400044 */ beqz $v0,.PF0f0becdc
.PF0f0bebcc:
@@ -7444,7 +7444,7 @@ glabel var7f1ad6ac
.PF0f0bec10:
/* f0bec10: 00045603 */ sra $t2,$a0,0x18
/* f0bec14: 01402025 */ move $a0,$t2
/* f0bec18: 0c00536a */ jal contGetButtonsPressedThisFrame
/* f0bec18: 0c00536a */ jal joyGetButtonsPressedThisFrame
/* f0bec1c: 34058000 */ li $a1,0x8000
/* f0bec20: 10400003 */ beqz $v0,.PF0f0bec30
/* f0bec24: 00122600 */ sll $a0,$s2,0x18
@@ -7453,7 +7453,7 @@ glabel var7f1ad6ac
.PF0f0bec30:
/* f0bec30: 00045e03 */ sra $t3,$a0,0x18
/* f0bec34: 01602025 */ move $a0,$t3
/* f0bec38: 0c00533a */ jal contGetButtons
/* f0bec38: 0c00533a */ jal joyGetButtons
/* f0bec3c: 24056030 */ li $a1,0x6030
/* f0bec40: 10400012 */ beqz $v0,.PF0f0bec8c
/* f0bec44: 240d0001 */ li $t5,0x1
@@ -7462,7 +7462,7 @@ glabel var7f1ad6ac
.PF0f0bec50:
/* f0bec50: 00122600 */ sll $a0,$s2,0x18
/* f0bec54: 0004c603 */ sra $t8,$a0,0x18
/* f0bec58: 0c00536a */ jal contGetButtonsPressedThisFrame
/* f0bec58: 0c00536a */ jal joyGetButtonsPressedThisFrame
/* f0bec5c: 03002025 */ move $a0,$t8
/* f0bec60: 10400003 */ beqz $v0,.PF0f0bec70
/* f0bec64: 00122600 */ sll $a0,$s2,0x18
@@ -7471,7 +7471,7 @@ glabel var7f1ad6ac
.PF0f0bec70:
/* f0bec70: 00047603 */ sra $t6,$a0,0x18
/* f0bec74: 01c02025 */ move $a0,$t6
/* f0bec78: 0c00533a */ jal contGetButtons
/* f0bec78: 0c00533a */ jal joyGetButtons
/* f0bec7c: 3405c030 */ li $a1,0xc030
/* f0bec80: 10400002 */ beqz $v0,.PF0f0bec8c
/* f0bec84: 24190001 */ li $t9,0x1
@@ -7479,12 +7479,12 @@ glabel var7f1ad6ac
.PF0f0bec8c:
/* f0bec8c: 00122600 */ sll $a0,$s2,0x18
/* f0bec90: 00044e03 */ sra $t1,$a0,0x18
/* f0bec94: 0c0052e6 */ jal contGetStickX
/* f0bec94: 0c0052e6 */ jal joyGetStickX
/* f0bec98: 01202025 */ move $a0,$t1
/* f0bec9c: 00122600 */ sll $a0,$s2,0x18
/* f0beca0: 00045603 */ sra $t2,$a0,0x18
/* f0beca4: a3a2023d */ sb $v0,0x23d($sp)
/* f0beca8: 0c005310 */ jal contGetStickY
/* f0beca8: 0c005310 */ jal joyGetStickY
/* f0becac: 01402025 */ move $a0,$t2
/* f0becb0: 10000002 */ b .PF0f0becbc
/* f0becb4: a3a2023c */ sb $v0,0x23c($sp)
@@ -7493,7 +7493,7 @@ glabel var7f1ad6ac
/* f0becbc: 00122600 */ sll $a0,$s2,0x18
/* f0becc0: 00045e03 */ sra $t3,$a0,0x18
/* f0becc4: 01602025 */ move $a0,$t3
/* f0becc8: 0c00533a */ jal contGetButtons
/* f0becc8: 0c00533a */ jal joyGetButtons
/* f0beccc: 24051000 */ li $a1,0x1000
/* f0becd0: 10400002 */ beqz $v0,.PF0f0becdc
/* f0becd4: 240d0001 */ li $t5,0x1
@@ -8722,7 +8722,7 @@ glabel var7f1ad6ac
/* f0bfecc: 8d240070 */ lw $a0,0x70($t1)
/* f0bfed0: 00028600 */ sll $s0,$v0,0x18
/* f0bfed4: 00105603 */ sra $t2,$s0,0x18
/* f0bfed8: 0fc5b6f7 */ jal coreIsPaused
/* f0bfed8: 0fc5b6f7 */ jal lvIsPaused
/* f0bfedc: 01408025 */ move $s0,$t2
/* f0bfee0: 1440002c */ bnez $v0,.PF0f0bff94
/* f0bfee4: 8fac0330 */ lw $t4,0x330($sp)
@@ -8730,7 +8730,7 @@ glabel var7f1ad6ac
/* f0bfeec: 00102600 */ sll $a0,$s0,0x18
/* f0bfef0: 00045e03 */ sra $t3,$a0,0x18
/* f0bfef4: 01602025 */ move $a0,$t3
/* f0bfef8: 0c00536a */ jal contGetButtonsPressedThisFrame
/* f0bfef8: 0c00536a */ jal joyGetButtonsPressedThisFrame
/* f0bfefc: 3405f030 */ li $a1,0xf030
/* f0bff00: 10400024 */ beqz $v0,.PF0f0bff94
/* f0bff04: 240d0002 */ li $t5,0x2
@@ -9228,7 +9228,7 @@ glabel var7f1ad6ac
/* f0bdda8: 00047e03 */ sra $t7,$a0,0x18
/* f0bddac: 13000005 */ beqz $t8,.L0f0bddc4
/* f0bddb0: 01e02025 */ or $a0,$t7,$zero
/* f0bddb4: 0c0053d8 */ jal contGetButtons
/* f0bddb4: 0c0053d8 */ jal joyGetButtons
/* f0bddb8: 3405ffff */ dli $a1,0xffff
/* f0bddbc: 10000002 */ b .L0f0bddc8
/* f0bddc0: 3043ffff */ andi $v1,$v0,0xffff
@@ -9331,14 +9331,14 @@ glabel var7f1ad6ac
/* f0bdf28: 240580ab */ addiu $a1,$zero,-32597
/* f0bdf2c: 00003025 */ or $a2,$zero,$zero
/* f0bdf30: 2407ffff */ addiu $a3,$zero,-1
/* f0bdf34: 0c004241 */ jal audioStart
/* f0bdf34: 0c004241 */ jal sndStart
/* f0bdf38: e7a80014 */ swc1 $f8,0x14($sp)
/* f0bdf3c: 8e700284 */ lw $s0,0x284($s3)
.L0f0bdf40:
/* f0bdf40: 2411ffd8 */ addiu $s1,$zero,-40
/* f0bdf44: a611024c */ sh $s1,0x24c($s0)
.L0f0bdf48:
/* f0bdf48: 0fc5b364 */ jal coreIsPaused
/* f0bdf48: 0fc5b364 */ jal lvIsPaused
/* f0bdf4c: 2411ffd8 */ addiu $s1,$zero,-40
/* f0bdf50: 50400004 */ beqzl $v0,.L0f0bdf64
/* f0bdf54: 8e700284 */ lw $s0,0x284($s3)
@@ -9739,19 +9739,19 @@ glabel var7f1ad6ac
.L0f0be524:
/* f0be524: 00047e03 */ sra $t7,$a0,0x18
/* f0be528: 01e02025 */ or $a0,$t7,$zero
/* f0be52c: 0c0053d8 */ jal contGetButtons
/* f0be52c: 0c0053d8 */ jal joyGetButtons
/* f0be530: 3405c000 */ dli $a1,0xc000
/* f0be534: 1440000c */ bnez $v0,.L0f0be568
/* f0be538: 00152600 */ sll $a0,$s5,0x18
/* f0be53c: 00044e03 */ sra $t1,$a0,0x18
/* f0be540: 01202025 */ or $a0,$t1,$zero
/* f0be544: 0c0053d8 */ jal contGetButtons
/* f0be544: 0c0053d8 */ jal joyGetButtons
/* f0be548: 3405c000 */ dli $a1,0xc000
/* f0be54c: 14400006 */ bnez $v0,.L0f0be568
/* f0be550: 00152600 */ sll $a0,$s5,0x18
/* f0be554: 00045603 */ sra $t2,$a0,0x18
/* f0be558: 01402025 */ or $a0,$t2,$zero
/* f0be55c: 0c0053d8 */ jal contGetButtons
/* f0be55c: 0c0053d8 */ jal joyGetButtons
/* f0be560: 24052000 */ addiu $a1,$zero,0x2000
/* f0be564: 10400002 */ beqz $v0,.L0f0be570
.L0f0be568:
@@ -9761,7 +9761,7 @@ glabel var7f1ad6ac
/* f0be570: 00122600 */ sll $a0,$s2,0x18
/* f0be574: 00046e03 */ sra $t5,$a0,0x18
/* f0be578: 01a02025 */ or $a0,$t5,$zero
/* f0be57c: 0c005408 */ jal contGetButtonsPressedThisFrame
/* f0be57c: 0c005408 */ jal joyGetButtonsPressedThisFrame
/* f0be580: 24052000 */ addiu $a1,$zero,0x2000
/* f0be584: 1040001e */ beqz $v0,.L0f0be600
/* f0be588: 240c0001 */ addiu $t4,$zero,0x1
@@ -9770,19 +9770,19 @@ glabel var7f1ad6ac
.L0f0be594:
/* f0be594: 00122600 */ sll $a0,$s2,0x18
/* f0be598: 00047603 */ sra $t6,$a0,0x18
/* f0be59c: 0c0053d8 */ jal contGetButtons
/* f0be59c: 0c0053d8 */ jal joyGetButtons
/* f0be5a0: 01c02025 */ or $a0,$t6,$zero
/* f0be5a4: 1440000c */ bnez $v0,.L0f0be5d8
/* f0be5a8: 00152600 */ sll $a0,$s5,0x18
/* f0be5ac: 0004ce03 */ sra $t9,$a0,0x18
/* f0be5b0: 03202025 */ or $a0,$t9,$zero
/* f0be5b4: 0c0053d8 */ jal contGetButtons
/* f0be5b4: 0c0053d8 */ jal joyGetButtons
/* f0be5b8: 3405c000 */ dli $a1,0xc000
/* f0be5bc: 14400006 */ bnez $v0,.L0f0be5d8
/* f0be5c0: 00122600 */ sll $a0,$s2,0x18
/* f0be5c4: 0004c603 */ sra $t8,$a0,0x18
/* f0be5c8: 03002025 */ or $a0,$t8,$zero
/* f0be5cc: 0c0053d8 */ jal contGetButtons
/* f0be5cc: 0c0053d8 */ jal joyGetButtons
/* f0be5d0: 24052000 */ addiu $a1,$zero,0x2000
/* f0be5d4: 10400002 */ beqz $v0,.L0f0be5e0
.L0f0be5d8:
@@ -9792,7 +9792,7 @@ glabel var7f1ad6ac
/* f0be5e0: 00152600 */ sll $a0,$s5,0x18
/* f0be5e4: 00044e03 */ sra $t1,$a0,0x18
/* f0be5e8: 01202025 */ or $a0,$t1,$zero
/* f0be5ec: 0c005408 */ jal contGetButtonsPressedThisFrame
/* f0be5ec: 0c005408 */ jal joyGetButtonsPressedThisFrame
/* f0be5f0: 24052000 */ addiu $a1,$zero,0x2000
/* f0be5f4: 10400002 */ beqz $v0,.L0f0be600
/* f0be5f8: 240a0001 */ addiu $t2,$zero,0x1
@@ -9800,12 +9800,12 @@ glabel var7f1ad6ac
.L0f0be600:
/* f0be600: 00122600 */ sll $a0,$s2,0x18
/* f0be604: 00045e03 */ sra $t3,$a0,0x18
/* f0be608: 0c005384 */ jal contGetStickX
/* f0be608: 0c005384 */ jal joyGetStickX
/* f0be60c: 01602025 */ or $a0,$t3,$zero
/* f0be610: 00122600 */ sll $a0,$s2,0x18
/* f0be614: 00046e03 */ sra $t5,$a0,0x18
/* f0be618: a3a2023d */ sb $v0,0x23d($sp)
/* f0be61c: 0c0053ae */ jal contGetStickY
/* f0be61c: 0c0053ae */ jal joyGetStickY
/* f0be620: 01a02025 */ or $a0,$t5,$zero
/* f0be624: 10000002 */ b .L0f0be630
/* f0be628: a3a2023c */ sb $v0,0x23c($sp)
@@ -9814,13 +9814,13 @@ glabel var7f1ad6ac
/* f0be630: 00122600 */ sll $a0,$s2,0x18
/* f0be634: 00047603 */ sra $t6,$a0,0x18
/* f0be638: 01c02025 */ or $a0,$t6,$zero
/* f0be63c: 0c0053d8 */ jal contGetButtons
/* f0be63c: 0c0053d8 */ jal joyGetButtons
/* f0be640: 24051000 */ addiu $a1,$zero,0x1000
/* f0be644: 14400006 */ bnez $v0,.L0f0be660
/* f0be648: 00152600 */ sll $a0,$s5,0x18
/* f0be64c: 0004ce03 */ sra $t9,$a0,0x18
/* f0be650: 03202025 */ or $a0,$t9,$zero
/* f0be654: 0c0053d8 */ jal contGetButtons
/* f0be654: 0c0053d8 */ jal joyGetButtons
/* f0be658: 24051000 */ addiu $a1,$zero,0x1000
/* f0be65c: 10400044 */ beqz $v0,.L0f0be770
.L0f0be660:
@@ -9845,7 +9845,7 @@ glabel var7f1ad6ac
.L0f0be6a4:
/* f0be6a4: 00045e03 */ sra $t3,$a0,0x18
/* f0be6a8: 01602025 */ or $a0,$t3,$zero
/* f0be6ac: 0c005408 */ jal contGetButtonsPressedThisFrame
/* f0be6ac: 0c005408 */ jal joyGetButtonsPressedThisFrame
/* f0be6b0: 34058000 */ dli $a1,0x8000
/* f0be6b4: 10400003 */ beqz $v0,.L0f0be6c4
/* f0be6b8: 00122600 */ sll $a0,$s2,0x18
@@ -9854,7 +9854,7 @@ glabel var7f1ad6ac
.L0f0be6c4:
/* f0be6c4: 00046603 */ sra $t4,$a0,0x18
/* f0be6c8: 01802025 */ or $a0,$t4,$zero
/* f0be6cc: 0c0053d8 */ jal contGetButtons
/* f0be6cc: 0c0053d8 */ jal joyGetButtons
/* f0be6d0: 24056030 */ addiu $a1,$zero,0x6030
/* f0be6d4: 10400012 */ beqz $v0,.L0f0be720
/* f0be6d8: 240e0001 */ addiu $t6,$zero,0x1
@@ -9863,7 +9863,7 @@ glabel var7f1ad6ac
.L0f0be6e4:
/* f0be6e4: 00122600 */ sll $a0,$s2,0x18
/* f0be6e8: 0004ce03 */ sra $t9,$a0,0x18
/* f0be6ec: 0c005408 */ jal contGetButtonsPressedThisFrame
/* f0be6ec: 0c005408 */ jal joyGetButtonsPressedThisFrame
/* f0be6f0: 03202025 */ or $a0,$t9,$zero
/* f0be6f4: 10400003 */ beqz $v0,.L0f0be704
/* f0be6f8: 00122600 */ sll $a0,$s2,0x18
@@ -9872,7 +9872,7 @@ glabel var7f1ad6ac
.L0f0be704:
/* f0be704: 00047e03 */ sra $t7,$a0,0x18
/* f0be708: 01e02025 */ or $a0,$t7,$zero
/* f0be70c: 0c0053d8 */ jal contGetButtons
/* f0be70c: 0c0053d8 */ jal joyGetButtons
/* f0be710: 3405c030 */ dli $a1,0xc030
/* f0be714: 10400002 */ beqz $v0,.L0f0be720
/* f0be718: 24090001 */ addiu $t1,$zero,0x1
@@ -9880,12 +9880,12 @@ glabel var7f1ad6ac
.L0f0be720:
/* f0be720: 00122600 */ sll $a0,$s2,0x18
/* f0be724: 00045603 */ sra $t2,$a0,0x18
/* f0be728: 0c005384 */ jal contGetStickX
/* f0be728: 0c005384 */ jal joyGetStickX
/* f0be72c: 01402025 */ or $a0,$t2,$zero
/* f0be730: 00122600 */ sll $a0,$s2,0x18
/* f0be734: 00045e03 */ sra $t3,$a0,0x18
/* f0be738: a3a2023d */ sb $v0,0x23d($sp)
/* f0be73c: 0c0053ae */ jal contGetStickY
/* f0be73c: 0c0053ae */ jal joyGetStickY
/* f0be740: 01602025 */ or $a0,$t3,$zero
/* f0be744: 10000002 */ b .L0f0be750
/* f0be748: a3a2023c */ sb $v0,0x23c($sp)
@@ -9894,7 +9894,7 @@ glabel var7f1ad6ac
/* f0be750: 00122600 */ sll $a0,$s2,0x18
/* f0be754: 00046603 */ sra $t4,$a0,0x18
/* f0be758: 01802025 */ or $a0,$t4,$zero
/* f0be75c: 0c0053d8 */ jal contGetButtons
/* f0be75c: 0c0053d8 */ jal joyGetButtons
/* f0be760: 24051000 */ addiu $a1,$zero,0x1000
/* f0be764: 10400002 */ beqz $v0,.L0f0be770
/* f0be768: 240e0001 */ addiu $t6,$zero,0x1
@@ -11123,7 +11123,7 @@ glabel var7f1ad6ac
/* f0bf960: 8d440070 */ lw $a0,0x70($t2)
/* f0bf964: 00028600 */ sll $s0,$v0,0x18
/* f0bf968: 00105e03 */ sra $t3,$s0,0x18
/* f0bf96c: 0fc5b364 */ jal coreIsPaused
/* f0bf96c: 0fc5b364 */ jal lvIsPaused
/* f0bf970: 01608025 */ or $s0,$t3,$zero
/* f0bf974: 1440002c */ bnez $v0,.L0f0bfa28
/* f0bf978: 8fad0330 */ lw $t5,0x330($sp)
@@ -11131,7 +11131,7 @@ glabel var7f1ad6ac
/* f0bf980: 00102600 */ sll $a0,$s0,0x18
/* f0bf984: 00046603 */ sra $t4,$a0,0x18
/* f0bf988: 01802025 */ or $a0,$t4,$zero
/* f0bf98c: 0c005408 */ jal contGetButtonsPressedThisFrame
/* f0bf98c: 0c005408 */ jal joyGetButtonsPressedThisFrame
/* f0bf990: 3405f030 */ dli $a1,0xf030
/* f0bf994: 10400024 */ beqz $v0,.L0f0bfa28
/* f0bf998: 240e0002 */ addiu $t6,$zero,0x2
@@ -11693,14 +11693,14 @@ glabel var7f1ad6ac
/* f0bbb04: 240580ab */ addiu $a1,$zero,-32597
/* f0bbb08: 00003025 */ or $a2,$zero,$zero
/* f0bbb0c: 2407ffff */ addiu $a3,$zero,-1
/* f0bbb10: 0c004338 */ jal audioStart
/* f0bbb10: 0c004338 */ jal sndStart
/* f0bbb14: e7a80014 */ swc1 $f8,0x14($sp)
/* f0bbb18: 8e680284 */ lw $t0,0x284($s3)
.NB0f0bbb1c:
/* f0bbb1c: 2410ffd8 */ addiu $s0,$zero,-40
/* f0bbb20: a510024c */ sh $s0,0x24c($t0)
.NB0f0bbb24:
/* f0bbb24: 0fc59ed0 */ jal coreIsPaused
/* f0bbb24: 0fc59ed0 */ jal lvIsPaused
/* f0bbb28: 2410ffd8 */ addiu $s0,$zero,-40
/* f0bbb2c: 50400004 */ beqzl $v0,.NB0f0bbb40
/* f0bbb30: 8e680284 */ lw $t0,0x284($s3)
@@ -12098,19 +12098,19 @@ glabel var7f1ad6ac
.NB0f0bc0f8:
/* f0bc0f8: 0004c603 */ sra $t8,$a0,0x18
/* f0bc0fc: 03002025 */ or $a0,$t8,$zero
/* f0bc100: 0c005790 */ jal contGetButtons
/* f0bc100: 0c005790 */ jal joyGetButtons
/* f0bc104: 3405c000 */ dli $a1,0xc000
/* f0bc108: 1440000c */ bnez $v0,.NB0f0bc13c
/* f0bc10c: 00152600 */ sll $a0,$s5,0x18
/* f0bc110: 00044e03 */ sra $t1,$a0,0x18
/* f0bc114: 01202025 */ or $a0,$t1,$zero
/* f0bc118: 0c005790 */ jal contGetButtons
/* f0bc118: 0c005790 */ jal joyGetButtons
/* f0bc11c: 3405c000 */ dli $a1,0xc000
/* f0bc120: 14400006 */ bnez $v0,.NB0f0bc13c
/* f0bc124: 00152600 */ sll $a0,$s5,0x18
/* f0bc128: 0004ce03 */ sra $t9,$a0,0x18
/* f0bc12c: 03202025 */ or $a0,$t9,$zero
/* f0bc130: 0c005790 */ jal contGetButtons
/* f0bc130: 0c005790 */ jal joyGetButtons
/* f0bc134: 24052000 */ addiu $a1,$zero,0x2000
/* f0bc138: 10400002 */ beqz $v0,.NB0f0bc144
.NB0f0bc13c:
@@ -12120,7 +12120,7 @@ glabel var7f1ad6ac
/* f0bc144: 00122600 */ sll $a0,$s2,0x18
/* f0bc148: 00045e03 */ sra $t3,$a0,0x18
/* f0bc14c: 01602025 */ or $a0,$t3,$zero
/* f0bc150: 0c0057c0 */ jal contGetButtonsPressedThisFrame
/* f0bc150: 0c0057c0 */ jal joyGetButtonsPressedThisFrame
/* f0bc154: 24052000 */ addiu $a1,$zero,0x2000
/* f0bc158: 1040001e */ beqz $v0,.NB0f0bc1d4
/* f0bc15c: 240f0001 */ addiu $t7,$zero,0x1
@@ -12129,19 +12129,19 @@ glabel var7f1ad6ac
.NB0f0bc168:
/* f0bc168: 00122600 */ sll $a0,$s2,0x18
/* f0bc16c: 00046603 */ sra $t4,$a0,0x18
/* f0bc170: 0c005790 */ jal contGetButtons
/* f0bc170: 0c005790 */ jal joyGetButtons
/* f0bc174: 01802025 */ or $a0,$t4,$zero
/* f0bc178: 1440000c */ bnez $v0,.NB0f0bc1ac
/* f0bc17c: 00152600 */ sll $a0,$s5,0x18
/* f0bc180: 00046e03 */ sra $t5,$a0,0x18
/* f0bc184: 01a02025 */ or $a0,$t5,$zero
/* f0bc188: 0c005790 */ jal contGetButtons
/* f0bc188: 0c005790 */ jal joyGetButtons
/* f0bc18c: 3405c000 */ dli $a1,0xc000
/* f0bc190: 14400006 */ bnez $v0,.NB0f0bc1ac
/* f0bc194: 00122600 */ sll $a0,$s2,0x18
/* f0bc198: 00047603 */ sra $t6,$a0,0x18
/* f0bc19c: 01c02025 */ or $a0,$t6,$zero
/* f0bc1a0: 0c005790 */ jal contGetButtons
/* f0bc1a0: 0c005790 */ jal joyGetButtons
/* f0bc1a4: 24052000 */ addiu $a1,$zero,0x2000
/* f0bc1a8: 10400002 */ beqz $v0,.NB0f0bc1b4
.NB0f0bc1ac:
@@ -12151,7 +12151,7 @@ glabel var7f1ad6ac
/* f0bc1b4: 00152600 */ sll $a0,$s5,0x18
/* f0bc1b8: 00044e03 */ sra $t1,$a0,0x18
/* f0bc1bc: 01202025 */ or $a0,$t1,$zero
/* f0bc1c0: 0c0057c0 */ jal contGetButtonsPressedThisFrame
/* f0bc1c0: 0c0057c0 */ jal joyGetButtonsPressedThisFrame
/* f0bc1c4: 24052000 */ addiu $a1,$zero,0x2000
/* f0bc1c8: 10400002 */ beqz $v0,.NB0f0bc1d4
/* f0bc1cc: 24190001 */ addiu $t9,$zero,0x1
@@ -12159,12 +12159,12 @@ glabel var7f1ad6ac
.NB0f0bc1d4:
/* f0bc1d4: 00122600 */ sll $a0,$s2,0x18
/* f0bc1d8: 00045603 */ sra $t2,$a0,0x18
/* f0bc1dc: 0c00573c */ jal contGetStickX
/* f0bc1dc: 0c00573c */ jal joyGetStickX
/* f0bc1e0: 01402025 */ or $a0,$t2,$zero
/* f0bc1e4: 00122600 */ sll $a0,$s2,0x18
/* f0bc1e8: 00045e03 */ sra $t3,$a0,0x18
/* f0bc1ec: a3a20241 */ sb $v0,0x241($sp)
/* f0bc1f0: 0c005766 */ jal contGetStickY
/* f0bc1f0: 0c005766 */ jal joyGetStickY
/* f0bc1f4: 01602025 */ or $a0,$t3,$zero
/* f0bc1f8: 10000002 */ beqz $zero,.NB0f0bc204
/* f0bc1fc: a3a20240 */ sb $v0,0x240($sp)
@@ -12173,13 +12173,13 @@ glabel var7f1ad6ac
/* f0bc204: 00122600 */ sll $a0,$s2,0x18
/* f0bc208: 00046603 */ sra $t4,$a0,0x18
/* f0bc20c: 01802025 */ or $a0,$t4,$zero
/* f0bc210: 0c005790 */ jal contGetButtons
/* f0bc210: 0c005790 */ jal joyGetButtons
/* f0bc214: 24051000 */ addiu $a1,$zero,0x1000
/* f0bc218: 14400006 */ bnez $v0,.NB0f0bc234
/* f0bc21c: 00152600 */ sll $a0,$s5,0x18
/* f0bc220: 00046e03 */ sra $t5,$a0,0x18
/* f0bc224: 01a02025 */ or $a0,$t5,$zero
/* f0bc228: 0c005790 */ jal contGetButtons
/* f0bc228: 0c005790 */ jal joyGetButtons
/* f0bc22c: 24051000 */ addiu $a1,$zero,0x1000
/* f0bc230: 10400044 */ beqz $v0,.NB0f0bc344
.NB0f0bc234:
@@ -12204,7 +12204,7 @@ glabel var7f1ad6ac
.NB0f0bc278:
/* f0bc278: 00045603 */ sra $t2,$a0,0x18
/* f0bc27c: 01402025 */ or $a0,$t2,$zero
/* f0bc280: 0c0057c0 */ jal contGetButtonsPressedThisFrame
/* f0bc280: 0c0057c0 */ jal joyGetButtonsPressedThisFrame
/* f0bc284: 34058000 */ dli $a1,0x8000
/* f0bc288: 10400003 */ beqz $v0,.NB0f0bc298
/* f0bc28c: 00122600 */ sll $a0,$s2,0x18
@@ -12213,7 +12213,7 @@ glabel var7f1ad6ac
.NB0f0bc298:
/* f0bc298: 00047e03 */ sra $t7,$a0,0x18
/* f0bc29c: 01e02025 */ or $a0,$t7,$zero
/* f0bc2a0: 0c005790 */ jal contGetButtons
/* f0bc2a0: 0c005790 */ jal joyGetButtons
/* f0bc2a4: 24056030 */ addiu $a1,$zero,0x6030
/* f0bc2a8: 10400012 */ beqz $v0,.NB0f0bc2f4
/* f0bc2ac: 240c0001 */ addiu $t4,$zero,0x1
@@ -12222,7 +12222,7 @@ glabel var7f1ad6ac
.NB0f0bc2b8:
/* f0bc2b8: 00122600 */ sll $a0,$s2,0x18
/* f0bc2bc: 00046e03 */ sra $t5,$a0,0x18
/* f0bc2c0: 0c0057c0 */ jal contGetButtonsPressedThisFrame
/* f0bc2c0: 0c0057c0 */ jal joyGetButtonsPressedThisFrame
/* f0bc2c4: 01a02025 */ or $a0,$t5,$zero
/* f0bc2c8: 10400003 */ beqz $v0,.NB0f0bc2d8
/* f0bc2cc: 00122600 */ sll $a0,$s2,0x18
@@ -12231,7 +12231,7 @@ glabel var7f1ad6ac
.NB0f0bc2d8:
/* f0bc2d8: 0004c603 */ sra $t8,$a0,0x18
/* f0bc2dc: 03002025 */ or $a0,$t8,$zero
/* f0bc2e0: 0c005790 */ jal contGetButtons
/* f0bc2e0: 0c005790 */ jal joyGetButtons
/* f0bc2e4: 3405c030 */ dli $a1,0xc030
/* f0bc2e8: 10400002 */ beqz $v0,.NB0f0bc2f4
/* f0bc2ec: 24090001 */ addiu $t1,$zero,0x1
@@ -12239,12 +12239,12 @@ glabel var7f1ad6ac
.NB0f0bc2f4:
/* f0bc2f4: 00122600 */ sll $a0,$s2,0x18
/* f0bc2f8: 0004ce03 */ sra $t9,$a0,0x18
/* f0bc2fc: 0c00573c */ jal contGetStickX
/* f0bc2fc: 0c00573c */ jal joyGetStickX
/* f0bc300: 03202025 */ or $a0,$t9,$zero
/* f0bc304: 00122600 */ sll $a0,$s2,0x18
/* f0bc308: 00045603 */ sra $t2,$a0,0x18
/* f0bc30c: a3a20241 */ sb $v0,0x241($sp)
/* f0bc310: 0c005766 */ jal contGetStickY
/* f0bc310: 0c005766 */ jal joyGetStickY
/* f0bc314: 01402025 */ or $a0,$t2,$zero
/* f0bc318: 10000002 */ beqz $zero,.NB0f0bc324
/* f0bc31c: a3a20240 */ sb $v0,0x240($sp)
@@ -12253,7 +12253,7 @@ glabel var7f1ad6ac
/* f0bc324: 00122600 */ sll $a0,$s2,0x18
/* f0bc328: 00047e03 */ sra $t7,$a0,0x18
/* f0bc32c: 01e02025 */ or $a0,$t7,$zero
/* f0bc330: 0c005790 */ jal contGetButtons
/* f0bc330: 0c005790 */ jal joyGetButtons
/* f0bc334: 24051000 */ addiu $a1,$zero,0x1000
/* f0bc338: 10400002 */ beqz $v0,.NB0f0bc344
/* f0bc33c: 240c0001 */ addiu $t4,$zero,0x1
@@ -13486,7 +13486,7 @@ glabel var7f1ad6ac
/* f0bd54c: 8d240070 */ lw $a0,0x70($t1)
/* f0bd550: 00028600 */ sll $s0,$v0,0x18
/* f0bd554: 0010ce03 */ sra $t9,$s0,0x18
/* f0bd558: 0fc59ed0 */ jal coreIsPaused
/* f0bd558: 0fc59ed0 */ jal lvIsPaused
/* f0bd55c: 03208025 */ or $s0,$t9,$zero
/* f0bd560: 1440002c */ bnez $v0,.NB0f0bd614
/* f0bd564: 8faa0330 */ lw $t2,0x330($sp)
@@ -13494,7 +13494,7 @@ glabel var7f1ad6ac
/* f0bd56c: 00102600 */ sll $a0,$s0,0x18
/* f0bd570: 00045e03 */ sra $t3,$a0,0x18
/* f0bd574: 01602025 */ or $a0,$t3,$zero
/* f0bd578: 0c0057c0 */ jal contGetButtonsPressedThisFrame
/* f0bd578: 0c0057c0 */ jal joyGetButtonsPressedThisFrame
/* f0bd57c: 3405f030 */ dli $a1,0xf030
/* f0bd580: 10400024 */ beqz $v0,.NB0f0bd614
/* f0bd584: 240f0002 */ addiu $t7,$zero,0x2
@@ -13749,7 +13749,7 @@ glabel var7f1ad6ac
// // dd8c
// if (eyespy->active) {
// s8 contpad1 = optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex);
// u16 buttons = param_1 ? contGetButtons(contpad1, 0xffff) : 0;
// u16 buttons = param_1 ? joyGetButtons(contpad1, 0xffff) : 0;
//
// if (g_Vars.currentplayer->isdead == false
// && g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED
@@ -13788,7 +13788,7 @@ glabel var7f1ad6ac
// eyespy->camerashuttertime = 0;
// eyespy->startuptimer60 = 0;
// eyespy->prop->chr->soundtimer = 10;
// audioStart(var80095200, SFX_DETONATE, NULL, -1, -1, -1, -1, -1);
// sndStart(var80095200, SFX_DETONATE, NULL, -1, -1, -1, -1, -1);
// }
//
// g_Vars.currentplayer->invdowntime = -40;
@@ -13797,7 +13797,7 @@ glabel var7f1ad6ac
// }
//
// // df48
// if (coreIsPaused()) {
// if (lvIsPaused()) {
// func0f0bace0();
// }
//
@@ -13958,65 +13958,65 @@ glabel var7f1ad6ac
// if (g_PlayersWithControl[g_Vars.currentplayernum]) {
// if (mode == CONTROLMODE_21 || mode == CONTROLMODE_22) {
// // e52c
// if (contGetButtons(contpad1, A_BUTTON | B_BUTTON)
// || contGetButtons(contpad2, A_BUTTON | B_BUTTON)
// || contGetButtons(contpad2, Z_TRIG)) {
// if (joyGetButtons(contpad1, A_BUTTON | B_BUTTON)
// || joyGetButtons(contpad2, A_BUTTON | B_BUTTON)
// || joyGetButtons(contpad2, Z_TRIG)) {
// // 568
// slow = true;
// }
//
// // e57c
// if (contGetButtonsPressedThisFrame(contpad1, Z_TRIG)) {
// if (joyGetButtonsPressedThisFrame(contpad1, Z_TRIG)) {
// explode = true;
// }
// } else {
// if (contGetButtons(contpad1, A_BUTTON | B_BUTTON)
// || contGetButtons(contpad2, A_BUTTON | B_BUTTON)
// || contGetButtons(contpad1, Z_TRIG)) {
// if (joyGetButtons(contpad1, A_BUTTON | B_BUTTON)
// || joyGetButtons(contpad2, A_BUTTON | B_BUTTON)
// || joyGetButtons(contpad1, Z_TRIG)) {
// slow = true;
// }
//
// if (contGetButtonsPressedThisFrame(contpad2, Z_TRIG)) {
// if (joyGetButtonsPressedThisFrame(contpad2, Z_TRIG)) {
// explode = true;
// }
// }
//
// cStack243 = contGetStickX(contpad1);
// cStack244 = contGetStickY(contpad1);
// cStack243 = joyGetStickX(contpad1);
// cStack244 = joyGetStickY(contpad1);
// } else {
// slow = true;
// }
//
// if (contGetButtons(contpad1, START_BUTTON) || contGetButtons(contpad2, START_BUTTON)) {
// if (joyGetButtons(contpad1, START_BUTTON) || joyGetButtons(contpad2, START_BUTTON)) {
// pause = true;
// }
// } else {
// if (g_PlayersWithControl[g_Vars.currentplayernum]) {
// if (mode == CONTROLMODE_13 || mode == CONTROLMODE_14) {
// if (contGetButtonsPressedThisFrame(contpad1, A_BUTTON)) {
// if (joyGetButtonsPressedThisFrame(contpad1, A_BUTTON)) {
// explode = true;
// }
//
// if (contGetButtons(contpad1, B_BUTTON | Z_TRIG | L_TRIG | R_TRIG)) {
// if (joyGetButtons(contpad1, B_BUTTON | Z_TRIG | L_TRIG | R_TRIG)) {
// slow = true;
// }
// } else {
// if (contGetButtonsPressedThisFrame(contpad1, Z_TRIG)) {
// if (joyGetButtonsPressedThisFrame(contpad1, Z_TRIG)) {
// explode = true;
// }
//
// if (contGetButtons(contpad1, A_BUTTON | B_BUTTON | L_TRIG | R_TRIG)) {
// if (joyGetButtons(contpad1, A_BUTTON | B_BUTTON | L_TRIG | R_TRIG)) {
// slow = true;
// }
// }
//
// cStack243 = contGetStickX(contpad1);
// cStack244 = contGetStickY(contpad1);
// cStack243 = joyGetStickX(contpad1);
// cStack244 = joyGetStickY(contpad1);
// } else {
// slow = true;
// }
//
// if (contGetButtons(contpad1, START_BUTTON)) {
// if (joyGetButtons(contpad1, START_BUTTON)) {
// pause = true;
// }
// }
@@ -14560,9 +14560,9 @@ glabel var7f1ad6ac
// if (var8007074c != 0) {
// u32 contpad1 = optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex);
//
// if (coreIsPaused() == false
// if (lvIsPaused() == false
// && param_1
// && contGetButtonsPressedThisFrame(contpad1, A_BUTTON | B_BUTTON | Z_TRIG | START_BUTTON | L_TRIG | R_TRIG)) {
// && joyGetButtonsPressedThisFrame(contpad1, A_BUTTON | B_BUTTON | Z_TRIG | START_BUTTON | L_TRIG | R_TRIG)) {
// var8007074c = 2;
//
// if (currentPlayerIsFadeComplete()) {
@@ -15871,7 +15871,7 @@ Gfx *func0f0c07c8(Gfx *gdl)
if (g_Vars.antiplayernum >= 0 && g_Vars.currentplayer == g_Vars.anti) {
// Anti
if (contGetButtons(optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex), 0xb000) && !mpIsPaused()) {
if (joyGetButtons(optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex), 0xb000) && !mpIsPaused()) {
g_Vars.currentplayer->dostartnewlife = true;
}
} else {
@@ -15884,7 +15884,7 @@ Gfx *func0f0c07c8(Gfx *gdl)
f32 stealhealth;
f32 shield;
canrestart = contGetButtons(optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex), 0xb000)
canrestart = joyGetButtons(optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex), 0xb000)
&& !mpIsPaused();
// Get ready to respawn.
@@ -15991,7 +15991,7 @@ Gfx *func0f0c07c8(Gfx *gdl)
}
}
if (contGetButtons(optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex), 0xb000)
if (joyGetButtons(optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex), 0xb000)
&& !mpIsPaused()
&& g_NumReasonsToEndMpMatch == 0) {
canrestart = true;
src/game/game_0f09f0.c
+22 -22
View File
@@ -18,9 +18,9 @@
#include "game/credits.h"
#include "game/game_1531a0.h"
#include "game/file.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/music.h"
#include "game/texture.h"
#include "game/texdecompress.h"
#include "game/mplayer/setup.h"
#include "game/game_19aa80.h"
#include "game/training/training.h"
@@ -34,7 +34,7 @@
#include "bss.h"
#include "lib/lib_09a80.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/memory.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
@@ -200,7 +200,7 @@ void menuPlaySound(s32 menusound)
osSetThreadPri(0, osGetThreadPri(&g_AudioManager.thread) + 1);
#endif
handle = audioStart(var80095200, sound, NULL, -1, -1, -1, -1, -1);
handle = sndStart(var80095200, sound, NULL, -1, -1, -1, -1, -1);
if (handle && flag1) {
func00033e50(handle, 16, *(s32 *)&speed);
@@ -2139,7 +2139,7 @@ glabel var7f1b3610pf
/* f0f235c: 1140000d */ beqz $t2,.PF0f0f2394
/* f0f2360: 00000000 */ nop
/* f0f2364: afa30034 */ sw $v1,0x34($sp)
/* f0f2368: 0fc5b6fa */ jal coreGetDifficulty
/* f0f2368: 0fc5b6fa */ jal lvGetDifficulty
/* f0f236c: afa40038 */ sw $a0,0x38($sp)
/* f0f2370: 8fa30034 */ lw $v1,0x34($sp)
/* f0f2374: 240b0001 */ li $t3,0x1
@@ -2701,7 +2701,7 @@ glabel var7f1b28c0
/* f0f1c08: 11a0000d */ beqz $t5,.L0f0f1c40
/* f0f1c0c: 00000000 */ nop
/* f0f1c10: afa30034 */ sw $v1,0x34($sp)
/* f0f1c14: 0fc5b367 */ jal coreGetDifficulty
/* f0f1c14: 0fc5b367 */ jal lvGetDifficulty
/* f0f1c18: afa40038 */ sw $a0,0x38($sp)
/* f0f1c1c: 8fa30034 */ lw $v1,0x34($sp)
/* f0f1c20: 240e0001 */ addiu $t6,$zero,0x1
@@ -3267,7 +3267,7 @@ glabel var7f1acbecnb
/* f0ee824: 1180000d */ beqz $t4,.NB0f0ee85c
/* f0ee828: 00000000 */ sll $zero,$zero,0x0
/* f0ee82c: afa30030 */ sw $v1,0x30($sp)
/* f0ee830: 0fc59ed3 */ jal coreGetDifficulty
/* f0ee830: 0fc59ed3 */ jal lvGetDifficulty
/* f0ee834: afa40038 */ sw $a0,0x38($sp)
/* f0ee838: 8fa30030 */ lw $v1,0x30($sp)
/* f0ee83c: 240d0001 */ addiu $t5,$zero,0x1
@@ -9351,7 +9351,7 @@ glabel var7f1b2948
/* f0f11c4: 0c006f63 */ jal modelGetRootPosition
/* f0f11c8: 27a502a0 */ addiu $a1,$sp,0x2a0
/* f0f11cc: 00002025 */ or $a0,$zero,$zero
/* f0f11d0: 0c005790 */ jal contGetButtons
/* f0f11d0: 0c005790 */ jal joyGetButtons
/* f0f11d4: 24050020 */ addiu $a1,$zero,0x20
/* f0f11d8: 10400003 */ beqz $v0,.NB0f0f11e8
/* f0f11dc: 8fa40040 */ lw $a0,0x40($sp)
@@ -16605,7 +16605,7 @@ void func0f0f85e0(struct menudialog *dialog, s32 root)
}
menuPushRootDialog(dialog, root);
coreSetPaused(true);
lvSetPaused(true);
g_Vars.currentplayer->pausemode = PAUSEMODE_PAUSED;
}
@@ -21952,22 +21952,22 @@ glabel var7f1b2ac8
/* f0fb060: afab00f0 */ sw $t3,0xf0($sp)
/* f0fb064: afaa00f4 */ sw $t2,0xf4($sp)
/* f0fb068: afa90128 */ sw $t1,0x128($sp)
/* f0fb06c: 0c0052e6 */ jal contGetStickX
/* f0fb06c: 0c0052e6 */ jal joyGetStickX
/* f0fb070: afa80124 */ sw $t0,0x124($sp)
/* f0fb074: 00028600 */ sll $s0,$v0,0x18
/* f0fb078: 0010c603 */ sra $t8,$s0,0x18
/* f0fb07c: 03008025 */ move $s0,$t8
/* f0fb080: 0c005310 */ jal contGetStickY
/* f0fb080: 0c005310 */ jal joyGetStickY
/* f0fb084: 82640003 */ lb $a0,0x3($s3)
/* f0fb088: 00028e00 */ sll $s1,$v0,0x18
/* f0fb08c: 0011ce03 */ sra $t9,$s1,0x18
/* f0fb090: 03208825 */ move $s1,$t9
/* f0fb094: 82640003 */ lb $a0,0x3($s3)
/* f0fb098: 0c00533a */ jal contGetButtons
/* f0fb098: 0c00533a */ jal joyGetButtons
/* f0fb09c: 3405ffff */ li $a1,0xffff
/* f0fb0a0: 3052ffff */ andi $s2,$v0,0xffff
/* f0fb0a4: 82640003 */ lb $a0,0x3($s3)
/* f0fb0a8: 0c00536a */ jal contGetButtonsPressedThisFrame
/* f0fb0a8: 0c00536a */ jal joyGetButtonsPressedThisFrame
/* f0fb0ac: 3405ffff */ li $a1,0xffff
/* f0fb0b0: 304e8000 */ andi $t6,$v0,0x8000
/* f0fb0b4: 8fa80124 */ lw $t0,0x124($sp)
@@ -23003,22 +23003,22 @@ glabel var7f1b2ac8
/* f0fa924: afab00f0 */ sw $t3,0xf0($sp)
/* f0fa928: afaa00f4 */ sw $t2,0xf4($sp)
/* f0fa92c: afa90128 */ sw $t1,0x128($sp)
/* f0fa930: 0c005384 */ jal contGetStickX
/* f0fa930: 0c005384 */ jal joyGetStickX
/* f0fa934: afa80124 */ sw $t0,0x124($sp)
/* f0fa938: 00028600 */ sll $s0,$v0,0x18
/* f0fa93c: 0010c603 */ sra $t8,$s0,0x18
/* f0fa940: 03008025 */ or $s0,$t8,$zero
/* f0fa944: 0c0053ae */ jal contGetStickY
/* f0fa944: 0c0053ae */ jal joyGetStickY
/* f0fa948: 82640003 */ lb $a0,0x3($s3)
/* f0fa94c: 00028e00 */ sll $s1,$v0,0x18
/* f0fa950: 0011ce03 */ sra $t9,$s1,0x18
/* f0fa954: 03208825 */ or $s1,$t9,$zero
/* f0fa958: 82640003 */ lb $a0,0x3($s3)
/* f0fa95c: 0c0053d8 */ jal contGetButtons
/* f0fa95c: 0c0053d8 */ jal joyGetButtons
/* f0fa960: 3405ffff */ dli $a1,0xffff
/* f0fa964: 3052ffff */ andi $s2,$v0,0xffff
/* f0fa968: 82640003 */ lb $a0,0x3($s3)
/* f0fa96c: 0c005408 */ jal contGetButtonsPressedThisFrame
/* f0fa96c: 0c005408 */ jal joyGetButtonsPressedThisFrame
/* f0fa970: 3405ffff */ dli $a1,0xffff
/* f0fa974: 304e8000 */ andi $t6,$v0,0x8000
/* f0fa978: 8fa80124 */ lw $t0,0x124($sp)
@@ -24918,7 +24918,7 @@ glabel var7f1b2afc
/* f0fcb4c: 02f28821 */ addu $s1,$s7,$s2
/* f0fcb50: 0fc5609a */ jal textMeasure
/* f0fcb54: afae0010 */ sw $t6,0x10($sp)
/* f0fcb58: 0c004f75 */ jal contGetConnectedControllers
/* f0fcb58: 0c004f75 */ jal joyGetConnectedControllers
/* f0fcb5c: 00000000 */ nop
/* f0fcb60: 3c18800b */ lui $t8,0x800b
/* f0fcb64: 9718d13e */ lhu $t8,-0x2ec2($t8)
@@ -25907,7 +25907,7 @@ glabel var7f1b2afc
/* f0fc3e0: 02f28821 */ addu $s1,$s7,$s2
/* f0fc3e4: 0fc55cbe */ jal textMeasure
/* f0fc3e8: afaf0010 */ sw $t7,0x10($sp)
/* f0fc3ec: 0c005013 */ jal contGetConnectedControllers
/* f0fc3ec: 0c005013 */ jal joyGetConnectedControllers
/* f0fc3f0: 00000000 */ nop
/* f0fc3f4: 3c19800b */ lui $t9,%hi(g_MpSetup+0x16)
/* f0fc3f8: 9739cb9e */ lhu $t9,%lo(g_MpSetup+0x16)($t9)
@@ -26893,7 +26893,7 @@ glabel var7f1b2afc
/* f0f8b30: 02f28821 */ addu $s1,$s7,$s2
/* f0f8b34: 0fc54655 */ jal textMeasure
/* f0f8b38: afaf0010 */ sw $t7,0x10($sp)
/* f0f8b3c: 0c0053a4 */ jal contGetConnectedControllers
/* f0f8b3c: 0c0053a4 */ jal joyGetConnectedControllers
/* f0f8b40: 00000000 */ sll $zero,$zero,0x0
/* f0f8b44: 3c09800b */ lui $t1,0x800b
/* f0f8b48: 9529144e */ lhu $t1,0x144e($t1)
@@ -27492,7 +27492,7 @@ s32 menudialog000fcd48(s32 operation, struct menudialog *dialog, union handlerda
if (operation == MENUOP_TICK) {
if (g_Menus[g_MpPlayerNum].curframe
&& g_Menus[g_MpPlayerNum].curframe->dialog == dialog
&& func000155b4(g_Menus[g_MpPlayerNum].savedevice) == 0) {
&& joy000155b4(g_Menus[g_MpPlayerNum].savedevice) == 0) {
func0f0f3704(&g_PakRemovedMenuDialog);
}
}
@@ -27594,7 +27594,7 @@ glabel func0f0fce8c
/* f0fcf58: 00e02025 */ or $a0,$a3,$zero
/* f0fcf5c: 0fc3e0cc */ jal menuPushRootDialog
/* f0fcf60: 24050002 */ addiu $a1,$zero,0x2
/* f0fcf64: 0fc5b350 */ jal coreSetPaused
/* f0fcf64: 0fc5b350 */ jal lvSetPaused
/* f0fcf68: 24040001 */ addiu $a0,$zero,0x1
/* f0fcf6c: 3c06800a */ lui $a2,%hi(g_Vars)
/* f0fcf70: 24c69fc0 */ addiu $a2,$a2,%lo(g_Vars)
src/game/game_102240.c
+21 -21
View File
@@ -15,7 +15,7 @@
#include "game/game_107fb0.h"
#include "game/inventory/inventory.h"
#include "game/game_1531a0.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/mplayer/ingame.h"
#include "game/game_19aa80.h"
#include "game/training/training.h"
@@ -26,7 +26,7 @@
#include "bss.h"
#include "lib/lib_09a80.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "data.h"
#include "types.h"
@@ -206,7 +206,7 @@ s32 menuhandlerSoundMode(s32 operation, struct menuitem *item, union handlerdata
case MENUOP_GETOPTIONTEXT:
return (s32) langGet(options[data->dropdown.value]);
case MENUOP_SET:
audioSetSoundMode(data->dropdown.value);
sndSetSoundMode(data->dropdown.value);
g_Vars.modifiedfiles |= MODFILE_SOLO;
break;
case MENUOP_GETOPTIONVALUE:
@@ -686,7 +686,7 @@ s32 menuhandlerSfxVolume(s32 operation, struct menuitem *item, union handlerdata
data->slider.value = VOLUME(g_SfxVolume);
break;
case MENUOP_SET:
audioSetSfxVolume(data->slider.value);
sndSetSfxVolume(data->slider.value);
g_Vars.modifiedfiles |= MODFILE_SOLO;
}
@@ -769,7 +769,7 @@ s32 menuhandlerAcceptMission(s32 operation, struct menuitem *item, union handler
setNumPlayers(1);
}
coreSetDifficulty(g_MissionConfig.difficulty);
lvSetDifficulty(g_MissionConfig.difficulty);
titleSetNextMode(TITLEMODE_SKIP);
mainSetStageNum(g_MissionConfig.stagenum);
@@ -877,7 +877,7 @@ s32 menuhandlerAcceptPdModeSettings(s32 operation, struct menuitem *item, union
g_MissionConfig.pdmodedamagef = func0f1036ac(g_MissionConfig.pdmodedamage, PDMODEPROP_DAMAGE);
g_MissionConfig.pdmodeaccuracyf = func0f1036ac(g_MissionConfig.pdmodeaccuracy, PDMODEPROP_ACCURACY);
g_MissionConfig.difficulty = DIFF_PA;
coreSetDifficulty(g_MissionConfig.difficulty);
lvSetDifficulty(g_MissionConfig.difficulty);
menuPopDialog();
menuPopDialog();
menuPushDialog(&g_AcceptMissionMenuDialog);
@@ -1513,7 +1513,7 @@ s32 menuhandlerSoloDifficulty(s32 operation, struct menuitem *item, union handle
case MENUOP_SET:
g_MissionConfig.pdmode = false;
g_MissionConfig.difficulty = item->param;
coreSetDifficulty(g_MissionConfig.difficulty);
lvSetDifficulty(g_MissionConfig.difficulty);
menuPopDialog();
menuPushDialog(&g_AcceptMissionMenuDialog);
break;
@@ -1717,7 +1717,7 @@ glabel menuhandlerCoopBuddy
/* f104304: 0fc41023 */ jal getMaxAiBuddies
/* f104308: 00000000 */ nop
/* f10430c: afa20030 */ sw $v0,0x30($sp)
/* f104310: 0c005013 */ jal contGetConnectedControllers
/* f104310: 0c005013 */ jal joyGetConnectedControllers
/* f104314: afa0002c */ sw $zero,0x2c($sp)
/* f104318: 30490002 */ andi $t1,$v0,0x2
/* f10431c: 11200002 */ beqz $t1,.L0f104328
@@ -1730,7 +1730,7 @@ glabel menuhandlerCoopBuddy
/* f104334: 10000035 */ b .L0f10440c
/* f104338: ad8b0000 */ sw $t3,0x0($t4)
.L0f10433c:
/* f10433c: 0c005013 */ jal contGetConnectedControllers
/* f10433c: 0c005013 */ jal joyGetConnectedControllers
/* f104340: afa30028 */ sw $v1,0x28($sp)
/* f104344: 304d0002 */ andi $t5,$v0,0x2
/* f104348: 11a00002 */ beqz $t5,.L0f104354
@@ -1748,7 +1748,7 @@ glabel menuhandlerCoopBuddy
/* f104374: 10000027 */ b .L0f104414
/* f104378: 8fbf0014 */ lw $ra,0x14($sp)
.L0f10437c:
/* f10437c: 0c005013 */ jal contGetConnectedControllers
/* f10437c: 0c005013 */ jal joyGetConnectedControllers
/* f104380: afa30024 */ sw $v1,0x24($sp)
/* f104384: 30490002 */ andi $t1,$v0,0x2
/* f104388: 11200002 */ beqz $t1,.L0f104394
@@ -1766,7 +1766,7 @@ glabel menuhandlerCoopBuddy
/* f1043b4: 10000015 */ b .L0f10440c
/* f1043b8: ac590458 */ sw $t9,0x458($v0)
.L0f1043bc:
/* f1043bc: 0c005013 */ jal contGetConnectedControllers
/* f1043bc: 0c005013 */ jal joyGetConnectedControllers
/* f1043c0: afa50020 */ sw $a1,0x20($sp)
/* f1043c4: 30580002 */ andi $t8,$v0,0x2
/* f1043c8: 8fa30020 */ lw $v1,0x20($sp)
@@ -1835,7 +1835,7 @@ glabel menuhandlerCoopBuddy
/* f100090: afa00038 */ sw $zero,0x38($sp)
/* f100094: 000b6642 */ srl $t4,$t3,0x19
/* f100098: 012c4023 */ subu $t0,$t1,$t4
/* f10009c: 0c0053a4 */ jal contGetConnectedControllers
/* f10009c: 0c0053a4 */ jal joyGetConnectedControllers
/* f1000a0: afa80030 */ sw $t0,0x30($sp)
/* f1000a4: 304d0002 */ andi $t5,$v0,0x2
/* f1000a8: 8fa70038 */ lw $a3,0x38($sp)
@@ -1882,7 +1882,7 @@ glabel menuhandlerCoopBuddy
/* f100134: 10000035 */ beqz $zero,.NB0f10020c
/* f100138: ad6a0000 */ sw $t2,0x0($t3)
.NB0f10013c:
/* f10013c: 0c0053a4 */ jal contGetConnectedControllers
/* f10013c: 0c0053a4 */ jal joyGetConnectedControllers
/* f100140: afa30028 */ sw $v1,0x28($sp)
/* f100144: 304c0002 */ andi $t4,$v0,0x2
/* f100148: 11800002 */ beqz $t4,.NB0f100154
@@ -1900,7 +1900,7 @@ glabel menuhandlerCoopBuddy
/* f100174: 10000027 */ beqz $zero,.NB0f100214
/* f100178: 8fbf0014 */ lw $ra,0x14($sp)
.NB0f10017c:
/* f10017c: 0c0053a4 */ jal contGetConnectedControllers
/* f10017c: 0c0053a4 */ jal joyGetConnectedControllers
/* f100180: afa30024 */ sw $v1,0x24($sp)
/* f100184: 304a0002 */ andi $t2,$v0,0x2
/* f100188: 11400002 */ beqz $t2,.NB0f100194
@@ -1918,7 +1918,7 @@ glabel menuhandlerCoopBuddy
/* f1001b4: 10000015 */ beqz $zero,.NB0f10020c
/* f1001b8: ac580458 */ sw $t8,0x458($v0)
.NB0f1001bc:
/* f1001bc: 0c0053a4 */ jal contGetConnectedControllers
/* f1001bc: 0c0053a4 */ jal joyGetConnectedControllers
/* f1001c0: afa90020 */ sw $t1,0x20($sp)
/* f1001c4: 304e0002 */ andi $t6,$v0,0x2
/* f1001c8: 8fa30020 */ lw $v1,0x20($sp)
@@ -2031,7 +2031,7 @@ s32 menuhandlerCoopDifficulty(s32 operation, struct menuitem *item, union handle
case MENUOP_SET:
g_MissionConfig.pdmode = false;
g_MissionConfig.difficulty = item->param;
coreSetDifficulty(g_MissionConfig.difficulty);
lvSetDifficulty(g_MissionConfig.difficulty);
menuPopDialog();
menuPushDialog(&g_CoopOptionsMenuDialog);
break;
@@ -2068,7 +2068,7 @@ s32 menuhandlerAntiDifficulty(s32 operation, struct menuitem *item, union handle
case MENUOP_SET:
g_MissionConfig.pdmode = false;
g_MissionConfig.difficulty = item->param;
coreSetDifficulty(g_MissionConfig.difficulty);
lvSetDifficulty(g_MissionConfig.difficulty);
menuPopDialog();
menuPushDialog(&g_AntiOptionsMenuDialog);
}
@@ -4969,7 +4969,7 @@ char *invMenuTextWeaponDescription(struct menuitem *item)
if (g_InventoryWeapon == WEAPON_NECKLACE
&& g_Vars.stagenum == STAGE_ATTACKSHIP
&& coreGetDifficulty() >= DIFF_PA) {
&& lvGetDifficulty() >= DIFF_PA) {
#if VERSION >= VERSION_NTSC_1_0
// Phrases included here to assist people searching the code for them:
// CDV780322
@@ -5444,11 +5444,11 @@ s32 soloMenuDialogPauseStatus(s32 operation, struct menudialog *dialog, union ha
s32 wanttype = BRIEFINGTYPE_TEXT_PA;
s32 i;
if (coreGetDifficulty() == DIFF_A) {
if (lvGetDifficulty() == DIFF_A) {
wanttype = BRIEFINGTYPE_TEXT_A;
}
if (coreGetDifficulty() == DIFF_SA) {
if (lvGetDifficulty() == DIFF_SA) {
wanttype = BRIEFINGTYPE_TEXT_SA;
}
@@ -5765,7 +5765,7 @@ s32 menuhandlerMainMenuCooperative(s32 operation, struct menuitem *item, union h
s32 menuhandlerMainMenuCounterOperative(s32 operation, struct menuitem *item, union handlerdata *data)
{
if (operation == MENUOP_CHECKDISABLED) {
if ((contGetConnectedControllers() & 2) == 0) {
if ((joyGetConnectedControllers() & 2) == 0) {
return true;
}
}
src/game/game_107fb0.c
+5 -5
View File
@@ -2472,7 +2472,7 @@ s32 pakChoosePakMenuDialog(s32 operation, struct menudialog *dialog, union handl
{
switch (operation) {
case MENUOP_OPEN:
func0001398c(3);
joy0001398c(3);
g_Menus[g_MpPlayerNum].data.pak.unke24 = 0;
break;
case MENUOP_TICK:
@@ -2490,7 +2490,7 @@ s32 pakChoosePakMenuDialog(s32 operation, struct menudialog *dialog, union handl
}
}
}
func000139c8();
joy000139c8();
break;
}
@@ -2521,9 +2521,9 @@ glabel pakChoosePakMenuDialog
/* f106b44: 10000036 */ beqz $zero,.NB0f106c20
/* f106b48: 8fbf0034 */ lw $ra,0x34($sp)
.NB0f106b4c:
/* f106b4c: 0c00529c */ jal func0001398c
/* f106b4c: 0c00529c */ jal joy0001398c
/* f106b50: 24040003 */ addiu $a0,$zero,0x3
/* f106b54: 0c00529c */ jal func0001398c
/* f106b54: 0c00529c */ jal joy0001398c
/* f106b58: 2404ffff */ addiu $a0,$zero,-1
/* f106b5c: 3c128007 */ lui $s2,0x8007
/* f106b60: 26523af0 */ addiu $s2,$s2,0x3af0
@@ -2573,7 +2573,7 @@ glabel pakChoosePakMenuDialog
.NB0f106c04:
/* f106c04: 5616ffee */ bnel $s0,$s6,.NB0f106bc0
/* f106c08: 8e480000 */ lw $t0,0x0($s2)
/* f106c0c: 0c00529f */ jal func000139c8
/* f106c0c: 0c00529f */ jal joy000139c8
/* f106c10: 00000000 */ sll $zero,$zero,0x0
/* f106c14: 0fc44b4a */ jal func0f1189d0
/* f106c18: 00000000 */ sll $zero,$zero,0x0
src/game/game_110680.c
+3 -3
View File
@@ -5,7 +5,7 @@
#include "game/cheats.h"
#include "game/game_0b69d0.h"
#include "game/game_0d4690.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/game_19aa80.h"
#include "game/training/training.h"
#include "game/gamefile.h"
@@ -15,7 +15,7 @@
#include "game/utils.h"
#include "bss.h"
#include "lib/lib_0bfb0.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/lib_126b0.h"
#include "lib/lib_4b170.h"
#include "data.h"
@@ -620,7 +620,7 @@ void func0f110c5c(s32 listnum, u8 filetype)
g_FileLists[listnum]->filetype = filetype;
if (var80062944 == 0) {
func0001398c(3);
joy0001398c(3);
}
var80062944 = 1;
src/game/game_13c510.c
+1 -1
View File
@@ -6,7 +6,7 @@
#include "game/game_0b3350.h"
#include "game/game_11f000.h"
#include "game/game_13c510.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/game_1655c0.h"
#include "game/game_165670.h"
#include "game/game_1668e0.h"
src/game/game_165670.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_0b3350.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/game_165670.h"
#include "bss.h"
#include "lib/lib_09a80.h"
src/game/game_1657c0.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_0b3350.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/game_165670.h"
#include "bss.h"
#include "lib/lib_09a80.h"
src/game/game_173520.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_0b3350.h"
#include "game/texture.h"
#include "game/texdecompress.h"
#include "bss.h"
#include "lib/lib_074f0.h"
#include "lib/dma.h"
src/game/game_173a00.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_13b670.h"
#include "game/texture.h"
#include "game/texdecompress.h"
#include "game/game_173a00.h"
#include "bss.h"
#include "data.h"
src/game/game_190260.c
+1 -1
View File
@@ -10,7 +10,7 @@
#include "game/game_0b0fd0.h"
#include "game/game_0b69d0.h"
#include "game/game_127910.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/mplayer/setup.h"
#include "game/mplayer/scenarios.h"
#include "game/radar.h"
src/game/game_1a7560.c
+1 -1
View File
@@ -11,7 +11,7 @@
#include "game/inventory/inventory.h"
#include "game/game_1531a0.h"
#include "game/file.h"
#include "game/texture.h"
#include "game/texdecompress.h"
#include "game/game_173a00.h"
#include "game/game_1a7560.h"
#include "game/lang.h"
src/game/gamefile.c
+10 -10
View File
@@ -5,7 +5,7 @@
#include "game/cheats.h"
#include "game/game_0b69d0.h"
#include "game/game_0d4690.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/game_19aa80.h"
#include "game/training/training.h"
#include "game/gamefile.h"
@@ -15,7 +15,7 @@
#include "game/utils.h"
#include "bss.h"
#include "lib/lib_0bfb0.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/lib_126b0.h"
#include "lib/lib_4b170.h"
#include "data.h"
@@ -522,11 +522,11 @@ glabel savefileLoadDefaults
/* f11012c: 3308ff07 */ andi $t0,$t8,0xff07
/* f110130: 310900f8 */ andi $t1,$t0,0xf8
/* f110134: a048000b */ sb $t0,0xb($v0)
/* f110138: 0c0039df */ jal audioSetSfxVolume
/* f110138: 0c0039df */ jal sndSetSfxVolume
/* f11013c: a049000b */ sb $t1,0xb($v0)
/* f110140: 0fc54f08 */ jal optionsSetMusicVolume
/* f110144: 24045000 */ li $a0,0x5000
/* f110148: 0c003c3b */ jal audioSetSoundMode
/* f110148: 0c003c3b */ jal sndSetSoundMode
/* f11014c: 24040001 */ li $a0,0x1
/* f110150: 02202025 */ move $a0,$s1
/* f110154: 0fc54cf7 */ jal optionsSetControlMode
@@ -799,9 +799,9 @@ void savefileLoadDefaults(struct savefile_solo *file)
file->autodifficulty = 0;
file->autostageindex = 0;
file->totaltime = 0;
audioSetSfxVolume(0x5000);
sndSetSfxVolume(0x5000);
optionsSetMusicVolume(0x5000);
audioSetSoundMode(SOUNDMODE_STEREO);
sndSetSoundMode(SOUNDMODE_STEREO);
optionsSetControlMode(player1, CONTROLMODE_11);
optionsSetControlMode(player2, CONTROLMODE_11);
savefileClearAllFlags(&file->flags);
@@ -1007,7 +1007,7 @@ glabel func0f10fac8
/* f10fc20: 00a02025 */ or $a0,$a1,$zero
.L0f10fc24:
/* f10fc24: 000441c0 */ sll $t0,$a0,0x7
/* f10fc28: 0c003a87 */ jal audioSetSfxVolume
/* f10fc28: 0c003a87 */ jal sndSetSfxVolume
/* f10fc2c: 3104ffff */ andi $a0,$t0,0xffff
/* f10fc30: 02802025 */ or $a0,$s4,$zero
/* f10fc34: 0fc354fe */ jal savefileGetInteger
@@ -1025,7 +1025,7 @@ glabel func0f10fac8
/* f10fc60: 02802025 */ or $a0,$s4,$zero
/* f10fc64: 0fc354fe */ jal savefileGetInteger
/* f10fc68: 24050002 */ addiu $a1,$zero,0x2
/* f10fc6c: 0c003ce3 */ jal audioSetSoundMode
/* f10fc6c: 0c003ce3 */ jal sndSetSoundMode
/* f10fc70: 00402025 */ or $a0,$v0,$zero
/* f10fc74: 02802025 */ or $a0,$s4,$zero
/* f10fc78: 0fc354fe */ jal savefileGetInteger
@@ -1280,7 +1280,7 @@ glabel func0f10fac8
/* f10a150: 00a02025 */ or $a0,$a1,$zero
.NB0f10a154:
/* f10a154: 000441c0 */ sll $t0,$a0,0x7
/* f10a158: 0c003c77 */ jal audioSetSfxVolume
/* f10a158: 0c003c77 */ jal sndSetSfxVolume
/* f10a15c: 3104ffff */ andi $a0,$t0,0xffff
/* f10a160: 02602025 */ or $a0,$s3,$zero
/* f10a164: 0fc34ab8 */ jal savefileGetInteger
@@ -1298,7 +1298,7 @@ glabel func0f10fac8
/* f10a190: 02602025 */ or $a0,$s3,$zero
/* f10a194: 0fc34ab8 */ jal savefileGetInteger
/* f10a198: 24050002 */ addiu $a1,$zero,0x2
/* f10a19c: 0c003e02 */ jal audioSetSoundMode
/* f10a19c: 0c003e02 */ jal sndSetSoundMode
/* f10a1a0: 00402025 */ or $a0,$v0,$zero
/* f10a1a4: 02602025 */ or $a0,$s3,$zero
/* f10a1a8: 0fc34ab8 */ jal savefileGetInteger
src/game/hudmsg.c
+8 -8
View File
@@ -9,13 +9,13 @@
#include "game/game_0e0770.h"
#include "game/game_127910.h"
#include "game/game_1531a0.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/mplayer/mplayer.h"
#include "game/options.h"
#include "game/propobj.h"
#include "bss.h"
#include "lib/lib_09a80.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/memory.h"
#include "lib/lib_16110.h"
#include "data.h"
@@ -4991,7 +4991,7 @@ glabel var7f1af1e0
.PF0f0dfdb8:
/* f0dfdb8: 57200038 */ bnezl $t9,.PF0f0dfe9c
/* f0dfdbc: 9602001c */ lhu $v0,0x1c($s0)
/* f0dfdc0: 0fc5b6f7 */ jal coreIsPaused
/* f0dfdc0: 0fc5b6f7 */ jal lvIsPaused
/* f0dfdc4: 00000000 */ nop
/* f0dfdc8: 54400034 */ bnezl $v0,.PF0f0dfe9c
/* f0dfdcc: 9602001c */ lhu $v0,0x1c($s0)
@@ -5047,7 +5047,7 @@ glabel var7f1af1e0
/* f0dfe84: afb90010 */ sw $t9,0x10($sp)
/* f0dfe88: afaa0018 */ sw $t2,0x18($sp)
/* f0dfe8c: afab001c */ sw $t3,0x1c($sp)
/* f0dfe90: 0c0041a0 */ jal audioStart
/* f0dfe90: 0c0041a0 */ jal sndStart
/* f0dfe94: e7a40014 */ swc1 $f4,0x14($sp)
.PF0f0dfe98:
/* f0dfe98: 9602001c */ lhu $v0,0x1c($s0)
@@ -5474,7 +5474,7 @@ glabel var7f1aded8
.L0f0df75c:
/* f0df75c: 55600038 */ bnezl $t3,.L0f0df840
/* f0df760: 9602001c */ lhu $v0,0x1c($s0)
/* f0df764: 0fc5b364 */ jal coreIsPaused
/* f0df764: 0fc5b364 */ jal lvIsPaused
/* f0df768: 00000000 */ nop
/* f0df76c: 54400034 */ bnezl $v0,.L0f0df840
/* f0df770: 9602001c */ lhu $v0,0x1c($s0)
@@ -5530,7 +5530,7 @@ glabel var7f1aded8
/* f0df828: afab0010 */ sw $t3,0x10($sp)
/* f0df82c: afac0018 */ sw $t4,0x18($sp)
/* f0df830: afad001c */ sw $t5,0x1c($sp)
/* f0df834: 0c004241 */ jal audioStart
/* f0df834: 0c004241 */ jal sndStart
/* f0df838: e7a40014 */ swc1 $f4,0x14($sp)
.L0f0df83c:
/* f0df83c: 9602001c */ lhu $v0,0x1c($s0)
@@ -5903,7 +5903,7 @@ glabel var7f1aded8
.NB0f0dcb50:
/* f0dcb50: 55800033 */ bnezl $t4,.NB0f0dcc20
/* f0dcb54: 9602001c */ lhu $v0,0x1c($s0)
/* f0dcb58: 0fc59ed0 */ jal coreIsPaused
/* f0dcb58: 0fc59ed0 */ jal lvIsPaused
/* f0dcb5c: 00000000 */ sll $zero,$zero,0x0
/* f0dcb60: 5440002f */ bnezl $v0,.NB0f0dcc20
/* f0dcb64: 9602001c */ lhu $v0,0x1c($s0)
@@ -5954,7 +5954,7 @@ glabel var7f1aded8
/* f0dcc08: afac0010 */ sw $t4,0x10($sp)
/* f0dcc0c: afad0018 */ sw $t5,0x18($sp)
/* f0dcc10: afae001c */ sw $t6,0x1c($sp)
/* f0dcc14: 0c004338 */ jal audioStart
/* f0dcc14: 0c004338 */ jal sndStart
/* f0dcc18: e7a40014 */ swc1 $f4,0x14($sp)
.NB0f0dcc1c:
/* f0dcc1c: 9602001c */ lhu $v0,0x1c($s0)
src/game/core.c → src/game/lv.c
+294 -294
View File
File diff suppressed because it is too large Load Diff
src/game/menu/items.c
+2 -2
View File
@@ -9,7 +9,7 @@
#include "game/game_0f09f0.h"
#include "game/game_102240.h"
#include "game/game_1531a0.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/game_19aa80.h"
#include "game/training/training.h"
#include "game/lang.h"
@@ -5959,7 +5959,7 @@ Gfx *menuRenderItemObjectives(Gfx *gdl, struct menurendercontext *context)
for (i = 0; i < 6; i++) {
if (g_Briefing.objectivenames[i]
&& g_Briefing.objectivedifficulties[i] & (1 << coreGetDifficulty())) {
&& g_Briefing.objectivedifficulties[i] & (1 << lvGetDifficulty())) {
gdl = menuRenderObjective(gdl,
context->frame,
i, position, context->x, y, context->width, context->height,
src/game/mplayer/ingame.c
+3 -3
View File
@@ -8,7 +8,7 @@
#include "game/game_0f09f0.h"
#include "game/game_102240.h"
#include "game/game_107fb0.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/mplayer/ingame.h"
#include "game/game_19aa80.h"
#include "game/lang.h"
@@ -192,9 +192,9 @@ char *menutextPauseOrUnpause(s32 arg0)
char *menutextMatchTime(s32 arg0)
{
#if PAL
formatTime(g_StringPointer, coreGetStageTime60() * 60 / 50, 3);
formatTime(g_StringPointer, lvGetStageTime60() * 60 / 50, 3);
#else
formatTime(g_StringPointer, coreGetStageTime60(), 3);
formatTime(g_StringPointer, lvGetStageTime60(), 3);
#endif
return g_StringPointer;
src/game/mplayer/mplayer.c
+7 -7
View File
@@ -10,7 +10,7 @@
#include "game/game_0f09f0.h"
#include "game/game_127910.h"
#include "game/game_1531a0.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/music.h"
#include "game/mplayer/setup.h"
#include "game/mplayer/scenarios.h"
@@ -671,21 +671,21 @@ s32 mpCalculateTeamScoreLimit(void)
void mpApplyLimits(void)
{
if (g_MpSetup.timelimit >= 60) {
coreSetMpTimeLimit60(0);
lvSetMpTimeLimit60(0);
} else {
coreSetMpTimeLimit60(SECSTOTIME60((g_MpSetup.timelimit + 1) * 60));
lvSetMpTimeLimit60(SECSTOTIME60((g_MpSetup.timelimit + 1) * 60));
}
if (g_MpSetup.scorelimit >= 100) {
coreSetMpScoreLimit(0);
lvSetMpScoreLimit(0);
} else {
coreSetMpScoreLimit(g_MpSetup.scorelimit + 1);
lvSetMpScoreLimit(g_MpSetup.scorelimit + 1);
}
if (g_MpSetup.teamscorelimit >= 400) {
coreSetMpTeamScoreLimit(0);
lvSetMpTeamScoreLimit(0);
} else {
coreSetMpTeamScoreLimit(mpCalculateTeamScoreLimit() + 1);
lvSetMpTeamScoreLimit(mpCalculateTeamScoreLimit() + 1);
}
}
src/game/mplayer/scenarios.c
+16 -16
View File
@@ -26,7 +26,7 @@
#include "game/propobj.h"
#include "bss.h"
#include "lib/lib_09a80.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/memory.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
@@ -935,7 +935,7 @@ void scenarioHtbCallback14(struct chrdata *chr)
chr->aibot->unk0a0 += g_Vars.lvupdate240;
if (chr->aibot->unk0a0 >= PALDOWN(7200)) {
audioStart(var80095200, SFX_MP_SCOREPOINT, NULL, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_MP_SCOREPOINT, NULL, -1, -1, -1, -1, -1);
var800ac500[mpPlayerGetIndex(chr)]->unk3e++;
chr->aibot->unk0a0 = 0;
}
@@ -947,7 +947,7 @@ void scenarioHtbCallback14(struct chrdata *chr)
g_Vars.currentplayerstats->tokenheldtime += g_Vars.lvupdate240;
if (g_Vars.currentplayerstats->tokenheldtime >= PALDOWN(7200)) {
audioStart(var80095200, SFX_MP_SCOREPOINT, NULL, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_MP_SCOREPOINT, NULL, -1, -1, -1, -1, -1);
var800ac500[g_Vars.currentplayernum]->unk3e++;
func0f0ddfa4(langGet(L_MPWEAPONS_024), 9, 1); // "1 Point!"
g_Vars.currentplayerstats->tokenheldtime = 0;
@@ -2935,7 +2935,7 @@ glabel var7f1b8950
/* f1830f4: 8c845750 */ lw $a0,0x5750($a0)
/* f1830f8: 2407ffff */ li $a3,-1
/* f1830fc: 00008825 */ move $s1,$zero
/* f183100: 0c0041a0 */ jal audioStart
/* f183100: 0c0041a0 */ jal sndStart
/* f183104: e7a40014 */ swc1 $f4,0x14($sp)
/* f183108: a6700004 */ sh $s0,0x4($s3)
/* f18310c: a6600006 */ sh $zero,0x6($s3)
@@ -3078,7 +3078,7 @@ glabel var7f1b8950
/* f1832fc: 00003025 */ move $a2,$zero
/* f183300: 2407ffff */ li $a3,-1
/* f183304: 00009025 */ move $s2,$zero
/* f183308: 0c0041a0 */ jal audioStart
/* f183308: 0c0041a0 */ jal sndStart
/* f18330c: e7a60014 */ swc1 $f6,0x14($sp)
/* f183310: 3c03800b */ lui $v1,0x800b
/* f183314: 8c63cad0 */ lw $v1,-0x3530($v1)
@@ -3627,7 +3627,7 @@ glabel var7f1b8950
/* f1820f0: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f1820f4: 2407ffff */ addiu $a3,$zero,-1
/* f1820f8: 00008825 */ or $s1,$zero,$zero
/* f1820fc: 0c004241 */ jal audioStart
/* f1820fc: 0c004241 */ jal sndStart
/* f182100: e7a40014 */ swc1 $f4,0x14($sp)
/* f182104: a6700004 */ sh $s0,0x4($s3)
/* f182108: a6600006 */ sh $zero,0x6($s3)
@@ -3768,7 +3768,7 @@ glabel var7f1b8950
/* f1822f0: 00003025 */ or $a2,$zero,$zero
/* f1822f4: 2407ffff */ addiu $a3,$zero,-1
/* f1822f8: 00009025 */ or $s2,$zero,$zero
/* f1822fc: 0c004241 */ jal audioStart
/* f1822fc: 0c004241 */ jal sndStart
/* f182300: e7a60014 */ swc1 $f6,0x14($sp)
/* f182304: 3c03800b */ lui $v1,%hi(g_MpNumPlayers)
/* f182308: 8c63c530 */ lw $v1,%lo(g_MpNumPlayers)($v1)
@@ -5438,7 +5438,7 @@ glabel var7f1b8960
/* f18358c: 00002825 */ or $a1,$zero,$zero
/* f183590: 24067fff */ addiu $a2,$zero,0x7fff
/* f183594: 24070040 */ addiu $a3,$zero,0x40
/* f183598: 0c0041c6 */ jal func00010718
/* f183598: 0c0041c6 */ jal snd00010718
/* f18359c: e7a40014 */ swc1 $f4,0x14($sp)
.L0f1835a0:
/* f1835a0: 26100001 */ addiu $s0,$s0,0x1
@@ -5639,7 +5639,7 @@ glabel var7f1b8960
/* f18387c: 00002825 */ or $a1,$zero,$zero
/* f183880: 24067fff */ addiu $a2,$zero,0x7fff
/* f183884: 24070040 */ addiu $a3,$zero,0x40
/* f183888: 0c0041c6 */ jal func00010718
/* f183888: 0c0041c6 */ jal snd00010718
/* f18388c: e7a80014 */ swc1 $f8,0x14($sp)
.L0f183890:
/* f183890: 3c01800b */ lui $at,%hi(g_ScenarioData)
@@ -5694,7 +5694,7 @@ glabel var7f1b8960
/* f183950: 00002825 */ or $a1,$zero,$zero
/* f183954: 24067fff */ addiu $a2,$zero,0x7fff
/* f183958: 24070040 */ addiu $a3,$zero,0x40
/* f18395c: 0c0041c6 */ jal func00010718
/* f18395c: 0c0041c6 */ jal snd00010718
/* f183960: e7aa0014 */ swc1 $f10,0x14($sp)
/* f183964: 8fa2006c */ lw $v0,0x6c($sp)
.L0f183968:
@@ -5869,7 +5869,7 @@ glabel var7f1b8960
/* f18358c: 00002825 */ or $a1,$zero,$zero
/* f183590: 24067fff */ addiu $a2,$zero,0x7fff
/* f183594: 24070040 */ addiu $a3,$zero,0x40
/* f183598: 0c0041c6 */ jal func00010718
/* f183598: 0c0041c6 */ jal snd00010718
/* f18359c: e7a40014 */ swc1 $f4,0x14($sp)
.L0f1835a0:
/* f1835a0: 26100001 */ addiu $s0,$s0,0x1
@@ -6070,7 +6070,7 @@ glabel var7f1b8960
/* f18387c: 00002825 */ or $a1,$zero,$zero
/* f183880: 24067fff */ addiu $a2,$zero,0x7fff
/* f183884: 24070040 */ addiu $a3,$zero,0x40
/* f183888: 0c0041c6 */ jal func00010718
/* f183888: 0c0041c6 */ jal snd00010718
/* f18388c: e7a80014 */ swc1 $f8,0x14($sp)
.L0f183890:
/* f183890: 3c01800b */ lui $at,%hi(g_ScenarioData)
@@ -6125,7 +6125,7 @@ glabel var7f1b8960
/* f183950: 00002825 */ or $a1,$zero,$zero
/* f183954: 24067fff */ addiu $a2,$zero,0x7fff
/* f183958: 24070040 */ addiu $a3,$zero,0x40
/* f18395c: 0c0041c6 */ jal func00010718
/* f18395c: 0c0041c6 */ jal snd00010718
/* f183960: e7aa0014 */ swc1 $f10,0x14($sp)
/* f183964: 8fa2006c */ lw $v0,0x6c($sp)
.L0f183968:
@@ -10508,7 +10508,7 @@ glabel chrGiveBriefcase
/* f187cf4: 240505b8 */ li $a1,0x5b8
/* f187cf8: 00003025 */ move $a2,$zero
/* f187cfc: 2407ffff */ li $a3,-1
/* f187d00: 0c0041a0 */ jal audioStart
/* f187d00: 0c0041a0 */ jal sndStart
/* f187d04: e7a40014 */ swc1 $f4,0x14($sp)
/* f187d08: 0fc24454 */ jal func0f091250
/* f187d0c: 24040057 */ li $a0,0x57
@@ -11193,7 +11193,7 @@ glabel chrGiveBriefcase
/* f186cf0: 240505b8 */ addiu $a1,$zero,0x5b8
/* f186cf4: 00003025 */ or $a2,$zero,$zero
/* f186cf8: 2407ffff */ addiu $a3,$zero,-1
/* f186cfc: 0c004241 */ jal audioStart
/* f186cfc: 0c004241 */ jal sndStart
/* f186d00: e7a40014 */ swc1 $f4,0x14($sp)
/* f186d04: 0fc24494 */ jal func0f091250
/* f186d08: 24040057 */ addiu $a0,$zero,0x57
@@ -11896,7 +11896,7 @@ glabel chrGiveBriefcase
/* f181140: 240505b8 */ addiu $a1,$zero,0x5b8
/* f181144: 00003025 */ or $a2,$zero,$zero
/* f181148: 2407ffff */ addiu $a3,$zero,-1
/* f18114c: 0c004338 */ jal audioStart
/* f18114c: 0c004338 */ jal sndStart
/* f181150: e7a40014 */ swc1 $f4,0x14($sp)
/* f181154: 0fc23e12 */ jal func0f091250
/* f181158: 24040056 */ addiu $a0,$zero,0x56
src/game/mplayer/setup.c
+2 -2
View File
@@ -16,7 +16,7 @@
#include "game/mplayer/mplayer.h"
#include "game/options.h"
#include "bss.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/lib_09a80.h"
#include "lib/rng.h"
#include "data.h"
@@ -8217,6 +8217,6 @@ void func0f17fcb0(s32 silent)
if (!silent) {
// Explosion sound
audioStart(var80095200, SFX_EXPLOSION_809A, NULL, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_EXPLOSION_809A, NULL, -1, -1, -1, -1, -1);
}
}
src/game/music.c
+4 -4
View File
@@ -1,12 +1,12 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_0f09f0.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/music.h"
#include "game/options.h"
#include "game/game_176080.h"
#include "bss.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/lib_11420.h"
#include "data.h"
#include "types.h"
@@ -104,7 +104,7 @@ void musicSetVolume(u16 volume)
for (i = 0; i < ARRAYCOUNT(var800aaa38); i++) {
if (var800aaa38[i].tracktype != 0 && var800aaa38[i].tracktype != TRACKTYPE_AMBIENT) {
func0000fd9c(&var80094ed8[i], volume);
snd0000fd9c(&var80094ed8[i], volume);
}
}
@@ -313,7 +313,7 @@ bool musicIsAnyPlayerInAmbientRoom(void)
return false;
}
if (coreIsPaused()) {
if (lvIsPaused()) {
return false;
}
src/game/nbomb.c
+7 -7
View File
@@ -12,12 +12,12 @@
#include "game/game_0b3350.h"
#include "game/game_0b4950.h"
#include "game/game_0d4690.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/file.h"
#include "game/gfxmemory.h"
#include "bss.h"
#include "lib/lib_09a80.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
@@ -3749,7 +3749,7 @@ void nbombsTick(void)
if (youngest240 < PALDOWN(350)) {
if (g_Vars.lvupdate240 != 0) {
if (g_NbombAudioHandle == 0) {
audioStart(var80095200, SFX_SHIP_HUM, &g_NbombAudioHandle, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_SHIP_HUM, &g_NbombAudioHandle, -1, -1, -1, -1, -1);
}
somevalue = 32767;
@@ -3856,7 +3856,7 @@ void nbombCreate(struct coord *pos, struct prop *prop)
// Newer versions only play audio if the handles are null,
// while ntsc-beta clears the handles then plays them unconditionally.
if (g_Nbombs[index].audiohandle20 == NULL) {
audioStart(var80095200, SFX_LAUNCH_ROCKET, &g_Nbombs[index].audiohandle20, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_LAUNCH_ROCKET, &g_Nbombs[index].audiohandle20, -1, -1, -1, -1, -1);
if (g_Nbombs[index].audiohandle20) {
union audioparam param;
@@ -3866,7 +3866,7 @@ void nbombCreate(struct coord *pos, struct prop *prop)
}
if (g_Nbombs[index].audiohandle24 == NULL) {
audioStart(var80095200, SFX_LAUNCH_ROCKET, &g_Nbombs[index].audiohandle24, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_LAUNCH_ROCKET, &g_Nbombs[index].audiohandle24, -1, -1, -1, -1, -1);
if (g_Nbombs[index].audiohandle24) {
union audioparam param;
@@ -3878,7 +3878,7 @@ void nbombCreate(struct coord *pos, struct prop *prop)
g_Nbombs[index].audiohandle20 = NULL;
g_Nbombs[index].audiohandle24 = NULL;
audioStart(var80095200, SFX_LAUNCH_ROCKET, &g_Nbombs[index].audiohandle20, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_LAUNCH_ROCKET, &g_Nbombs[index].audiohandle20, -1, -1, -1, -1, -1);
if (g_Nbombs[index].audiohandle20) {
union audioparam param;
@@ -3886,7 +3886,7 @@ void nbombCreate(struct coord *pos, struct prop *prop)
func00033e50(g_Nbombs[index].audiohandle20, 16, param.s32);
}
audioStart(var80095200, SFX_LAUNCH_ROCKET, &g_Nbombs[index].audiohandle24, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_LAUNCH_ROCKET, &g_Nbombs[index].audiohandle24, -1, -1, -1, -1, -1);
if (g_Nbombs[index].audiohandle24) {
union audioparam param;
src/game/objectives/objectives.c
+4 -4
View File
@@ -10,7 +10,7 @@
#include "game/hudmsg.h"
#include "game/inventory/inventory.h"
#include "game/game_127910.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/training/training.h"
#include "game/lang.h"
#include "game/propobj.h"
@@ -345,7 +345,7 @@ bool objectiveIsAllComplete(void)
for (i = 0; i < objectiveGetCount(); i++) {
u32 diffbits = objectiveGetDifficultyBits(i);
if ((1 << coreGetDifficulty() & diffbits) &&
if ((1 << lvGetDifficulty() & diffbits) &&
objectiveCheck(i) != OBJECTIVE_COMPLETE) {
return false;
}
@@ -390,7 +390,7 @@ void objectivesCheckAll(void)
if (g_ObjectiveStatuses[i] != status) {
g_ObjectiveStatuses[i] = status;
if (objectiveGetDifficultyBits(i) & (1 << coreGetDifficulty())) {
if (objectiveGetDifficultyBits(i) & (1 << lvGetDifficulty())) {
sprintf(buffer, "%s %d: ", langGet(L_MISC_044), availableindex + 1); // "Objective"
#if VERSION >= VERSION_NTSC_1_0
@@ -421,7 +421,7 @@ void objectivesCheckAll(void)
}
}
if (objectiveGetDifficultyBits(i) & (1 << coreGetDifficulty())) {
if (objectiveGetDifficultyBits(i) & (1 << lvGetDifficulty())) {
availableindex++;
}
}
src/game/padhalllv.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/prop.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/pad.h"
#include "game/padhalllv.h"
#include "bss.h"
src/game/pak/pak.c
+129 -129
View File
@@ -7,7 +7,7 @@
#include "game/pak/pak.h"
#include "game/utils.h"
#include "bss.h"
#include "lib/controller.h"
#include "lib/joy.h"
#include "lib/lib_06100.h"
#include "lib/lib_06330.h"
#include "lib/lib_06440.h"
@@ -338,7 +338,7 @@ void func0f116bdc(s8 device, u8 *arg1, u8 *arg2)
void func0f116c2c(s8 index)
{
contSetPfsTemporarilyPlugged(index);
joySetPfsTemporarilyPlugged(index);
}
u16 func0f116c54(s8 device)
@@ -390,16 +390,16 @@ s32 func0f116e84(s8 device, u16 company_code, u32 game_code, char *game_name, ch
if (func0f116b5c(device)) {
#if VERSION >= VERSION_NTSC_1_0
func000150e8();
joy000150e8();
#else
func000150e8(123, "pak.c");
joy000150e8(123, "pak.c");
#endif
result = func0f117e00(device == SAVEDEVICE_GAMEPAK ? NULL : &var800a3180[device],
company_code, game_code, game_name, ext_name);
#if VERSION >= VERSION_NTSC_1_0
func00015144();
joy00015144();
#else
func00015144(123, "pak.c");
joy00015144(123, "pak.c");
#endif
if (func0f11c39c(result, device, 1, VERSION >= VERSION_NTSC_FINAL ? 825 : 822)) {
@@ -1221,15 +1221,15 @@ void pakDumpEeprom(void)
u8 buffer[2048];
#if VERSION >= VERSION_NTSC_1_0
func000150e8();
joy000150e8();
#else
func000150e8(1098, "pak.c");
joy000150e8(1098, "pak.c");
#endif
osEepromLongRead(&var80099e78, 0, buffer, 2048);
#if VERSION >= VERSION_NTSC_1_0
func00015144();
joy00015144();
#else
func00015144(1100, "pak.c");
joy00015144(1100, "pak.c");
#endif
pakDumpBuffer(buffer, 2048, "EEPROM DUMP");
@@ -1590,7 +1590,7 @@ s32 func0f117b4c(s32 arg0, s32 arg1, u8 operation, u32 address, u32 len, u8 *buf
u32 newaddress;
#if VERSION >= VERSION_NTSC_1_0
contCheckPfs(2);
joyCheckPfs(2);
#endif
if (arg0) {
@@ -1627,15 +1627,15 @@ s32 func0f117c0c(s32 arg0, s32 *arg1, s32 *arg2)
s32 result;
#if VERSION >= VERSION_NTSC_1_0
func000150e8();
joy000150e8();
#else
func000150e8(1308, "pak.c");
joy000150e8(1308, "pak.c");
#endif
result = func000508d0(arg0, arg1, arg2);
#if VERSION >= VERSION_NTSC_1_0
func00015144();
joy00015144();
#else
func00015144(1310, "pak.c");
joy00015144(1310, "pak.c");
#endif
return result;
@@ -1657,15 +1657,15 @@ s32 func0f117c80(struct var800a3180 *arg0, s32 *arg1)
s32 result;
#if VERSION >= VERSION_NTSC_1_0
func000150e8();
joy000150e8();
#else
func000150e8(1337, "pak.c");
joy000150e8(1337, "pak.c");
#endif
result = func0004ce60(arg0, arg1);
#if VERSION >= VERSION_NTSC_1_0
func00015144();
joy00015144();
#else
func00015144(1339, "pak.c");
joy00015144(1339, "pak.c");
#endif
return result;
@@ -1686,15 +1686,15 @@ s32 func0f117ce4(s32 arg0, s32 arg1, OSPfsState *note)
s32 result;
#if VERSION >= VERSION_NTSC_1_0
func000150e8();
joy000150e8();
#else
func000150e8(1363, "pak.c");
joy000150e8(1363, "pak.c");
#endif
result = func00050a00(arg0, arg1, note);
#if VERSION >= VERSION_NTSC_1_0
func00015144();
joy00015144();
#else
func00015144(1365, "pak.c");
joy00015144(1365, "pak.c");
#endif
return result;
@@ -1789,15 +1789,15 @@ s32 func0f117ec0(struct var800a3180 *arg0, u16 company_code, u32 game_code, u8 *
s32 result;
#if VERSION >= VERSION_NTSC_1_0
func000150e8();
joy000150e8();
#else
func000150e8(1496, "pak.c");
joy000150e8(1496, "pak.c");
#endif
result = func00006550(arg0, company_code, game_code, game_name, ext_name, numbytes);
#if VERSION >= VERSION_NTSC_1_0
func00015144();
joy00015144();
#else
func00015144(1498, "pak.c");
joy00015144(1498, "pak.c");
#endif
return result;
@@ -2938,7 +2938,7 @@ void func0f1189d8(void)
}
pakProbeEeprom();
contRecordPfsState(0x10);
joyRecordPfsState(0x10);
g_Vars.paksconnected = 0x10;
@@ -6600,14 +6600,14 @@ glabel pakCorrupt
/* f119e20: 0fc464da */ jal func0f119368
/* f119e24: 02803025 */ or $a2,$s4,$zero
/* f119e28: 00538021 */ addu $s0,$v0,$s3
/* f119e2c: 0c00543a */ jal func000150e8
/* f119e2c: 0c00543a */ jal joy000150e8
/* f119e30: 26100030 */ addiu $s0,$s0,0x30
/* f119e34: 02a02025 */ or $a0,$s5,$zero
/* f119e38: 320500ff */ andi $a1,$s0,0xff
/* f119e3c: 02c03025 */ or $a2,$s6,$zero
/* f119e40: 0c001910 */ jal osEepromLongWrite
/* f119e44: 24070008 */ addiu $a3,$zero,0x8
/* f119e48: 0c005451 */ jal func00015144
/* f119e48: 0c005451 */ jal joy00015144
/* f119e4c: 00000000 */ sll $zero,$zero,0x0
/* f119e50: 8e580004 */ lw $t8,0x4($s2)
/* f119e54: 26520004 */ addiu $s2,$s2,0x4
@@ -6651,9 +6651,9 @@ glabel pakCorrupt
// address += i * 8;
// address += 0x30;
//
// func000150e8();
// joy000150e8();
// osEepromLongWrite(&var80099e78, address, buffer8, 8);
// func00015144();
// joy00015144();
// }
//}
#endif
@@ -7367,15 +7367,15 @@ s32 func0f11a504(s8 arg0, s32 arg1, s32 arg2, u8 operation, u32 address, u32 len
len = func0f1165f8(arg0, len);
#if VERSION >= VERSION_NTSC_1_0
func000150e8();
joy000150e8();
#else
func000150e8(3096, "pak.c");
joy000150e8(3096, "pak.c");
#endif
result = func0f117b4c(arg1, arg2, operation, address, len, buffer);
#if VERSION >= VERSION_NTSC_1_0
func00015144();
joy00015144();
#else
func00015144(3098, "pak.c");
joy00015144(3098, "pak.c");
#endif
return result;
@@ -7737,7 +7737,7 @@ glabel func0f11a7dc
/* f11a7ec: afbf001c */ sw $ra,0x1c($sp)
/* f11a7f0: 01c08825 */ or $s1,$t6,$zero
/* f11a7f4: afb00014 */ sw $s0,0x14($sp)
/* f11a7f8: 0c00543a */ jal func000150e8
/* f11a7f8: 0c00543a */ jal joy000150e8
/* f11a7fc: afa40050 */ sw $a0,0x50($sp)
/* f11a800: 24010004 */ addiu $at,$zero,0x4
/* f11a804: 16210003 */ bne $s1,$at,.L0f11a814
@@ -7768,7 +7768,7 @@ glabel func0f11a7dc
/* f11a860: 8e05029c */ lw $a1,0x29c($s0)
/* f11a864: 0fc45f39 */ jal func0f117ce4
/* f11a868: 27a6002c */ addiu $a2,$sp,0x2c
/* f11a86c: 0c005451 */ jal func00015144
/* f11a86c: 0c005451 */ jal joy00015144
/* f11a870: afa20028 */ sw $v0,0x28($sp)
/* f11a874: 00112e00 */ sll $a1,$s1,0x18
/* f11a878: 00054e03 */ sra $t1,$a1,0x18
@@ -7818,7 +7818,7 @@ glabel func0f11a7dc
/* f1146ac: 01c08825 */ or $s1,$t6,$zero
/* f1146b0: afb00014 */ sw $s0,0x14($sp)
/* f1146b4: 24a5e304 */ addiu $a1,$a1,-7420
/* f1146b8: 0c00581b */ jal func000150e8
/* f1146b8: 0c00581b */ jal joy000150e8
/* f1146bc: 24040caa */ addiu $a0,$zero,0xcaa
/* f1146c0: 24010004 */ addiu $at,$zero,0x4
/* f1146c4: 16210003 */ bne $s1,$at,.NB0f1146d4
@@ -7850,7 +7850,7 @@ glabel func0f11a7dc
/* f114724: 3c057f1b */ lui $a1,0x7f1b
/* f114728: afa20028 */ sw $v0,0x28($sp)
/* f11472c: 24a5e30c */ addiu $a1,$a1,-7412
/* f114730: 0c005834 */ jal func00015144
/* f114730: 0c005834 */ jal joy00015144
/* f114734: 24040cac */ addiu $a0,$zero,0xcac
/* f114738: 00112e00 */ sll $a1,$s1,0x18
/* f11473c: 00054e03 */ sra $t1,$a1,0x18
@@ -7901,7 +7901,7 @@ glabel func0f1147b8nb
/* f1147d0: 3c057f1b */ lui $a1,0x7f1b
/* f1147d4: 01c08025 */ or $s0,$t6,$zero
/* f1147d8: 24a5e39c */ addiu $a1,$a1,-7268
/* f1147dc: 0c00581b */ jal func000150e8
/* f1147dc: 0c00581b */ jal joy000150e8
/* f1147e0: 24040cc8 */ addiu $a0,$zero,0xcc8
/* f1147e4: 24010004 */ addiu $at,$zero,0x4
/* f1147e8: 16010003 */ bne $s0,$at,.NB0f1147f8
@@ -7924,7 +7924,7 @@ glabel func0f1147b8nb
/* f114824: 3c057f1b */ lui $a1,0x7f1b
/* f114828: afa20020 */ sw $v0,0x20($sp)
/* f11482c: 24a5e3a4 */ addiu $a1,$a1,-7260
/* f114830: 0c005834 */ jal func00015144
/* f114830: 0c005834 */ jal joy00015144
/* f114834: 24040cca */ addiu $a0,$zero,0xcca
/* f114838: 00102e00 */ sll $a1,$s0,0x18
/* f11483c: 0005ce03 */ sra $t9,$a1,0x18
@@ -8008,7 +8008,7 @@ glabel func0f11a8f4
/* f11a980: 100000b9 */ beqz $zero,.L0f11ac68
/* f11a984: 00001025 */ or $v0,$zero,$zero
.L0f11a988:
/* f11a988: 0c00543a */ jal func000150e8
/* f11a988: 0c00543a */ jal joy000150e8
/* f11a98c: 00000000 */ sll $zero,$zero,0x0
/* f11a990: 24010004 */ addiu $at,$zero,0x4
/* f11a994: 16210003 */ bne $s1,$at,.L0f11a9a4
@@ -8036,7 +8036,7 @@ glabel func0f11a8f4
/* f11a9e4: 34c64445 */ ori $a2,$a2,_gamecode
/* f11a9e8: 0fc45f96 */ jal func0f117e58
/* f11a9ec: afaf0010 */ sw $t7,0x10($sp)
/* f11a9f0: 0c005451 */ jal func00015144
/* f11a9f0: 0c005451 */ jal joy00015144
/* f11a9f4: afa20048 */ sw $v0,0x48($sp)
/* f11a9f8: 8fa40048 */ lw $a0,0x48($sp)
/* f11a9fc: 00112e00 */ sll $a1,$s1,0x18
@@ -8060,7 +8060,7 @@ glabel func0f11a8f4
/* f11aa40: 000a58c0 */ sll $t3,$t2,0x3
/* f11aa44: 016a5823 */ subu $t3,$t3,$t2
/* f11aa48: 000b5a80 */ sll $t3,$t3,0xa
/* f11aa4c: 0c00543a */ jal func000150e8
/* f11aa4c: 0c00543a */ jal joy000150e8
/* f11aa50: afab0044 */ sw $t3,0x44($sp)
/* f11aa54: 24010004 */ addiu $at,$zero,0x4
/* f11aa58: 16210003 */ bne $s1,$at,.L0f11aa68
@@ -8089,7 +8089,7 @@ glabel func0f11a8f4
/* f11aaac: afaf0014 */ sw $t7,0x14($sp)
/* f11aab0: 0fc45f64 */ jal func0f117d90
/* f11aab4: afb80018 */ sw $t8,0x18($sp)
/* f11aab8: 0c005451 */ jal func00015144
/* f11aab8: 0c005451 */ jal joy00015144
/* f11aabc: afa20048 */ sw $v0,0x48($sp)
/* f11aac0: 920802b8 */ lbu $t0,0x2b8($s0)
/* f11aac4: 00112e00 */ sll $a1,$s1,0x18
@@ -8258,7 +8258,7 @@ glabel func0f11a8f4
/* f11a700: 100000b9 */ beqz $zero,.L0f11a9e8_2
/* f11a704: 00001025 */ or $v0,$zero,$zero
.L0f11a708_2:
/* f11a708: 0c00543a */ jal func000150e8
/* f11a708: 0c00543a */ jal joy000150e8
/* f11a70c: 00000000 */ sll $zero,$zero,0x0
/* f11a710: 24010004 */ addiu $at,$zero,0x4
/* f11a714: 16210003 */ bne $s1,$at,.L0f11a724_2
@@ -8286,7 +8286,7 @@ glabel func0f11a8f4
/* f11a764: 34c64445 */ ori $a2,$a2,_gamecode
/* f11a768: 0fc45f76 */ jal func0f117e58
/* f11a76c: afaf0010 */ sw $t7,0x10($sp)
/* f11a770: 0c005451 */ jal func00015144
/* f11a770: 0c005451 */ jal joy00015144
/* f11a774: afa2004c */ sw $v0,0x4c($sp)
/* f11a778: 8fa4004c */ lw $a0,0x4c($sp)
/* f11a77c: 00112e00 */ sll $a1,$s1,0x18
@@ -8310,7 +8310,7 @@ glabel func0f11a8f4
/* f11a7c0: 000a58c0 */ sll $t3,$t2,0x3
/* f11a7c4: 016a5823 */ subu $t3,$t3,$t2
/* f11a7c8: 000b5a80 */ sll $t3,$t3,0xa
/* f11a7cc: 0c00543a */ jal func000150e8
/* f11a7cc: 0c00543a */ jal joy000150e8
/* f11a7d0: afab0048 */ sw $t3,0x48($sp)
/* f11a7d4: 24010004 */ addiu $at,$zero,0x4
/* f11a7d8: 16210003 */ bne $s1,$at,.L0f11a7e8_2
@@ -8339,7 +8339,7 @@ glabel func0f11a8f4
/* f11a82c: afaf0014 */ sw $t7,0x14($sp)
/* f11a830: 0fc45f44 */ jal func0f117d90
/* f11a834: afb80018 */ sw $t8,0x18($sp)
/* f11a838: 0c005451 */ jal func00015144
/* f11a838: 0c005451 */ jal joy00015144
/* f11a83c: afa2004c */ sw $v0,0x4c($sp)
/* f11a840: 920802b8 */ lbu $t0,0x2b8($s0)
/* f11a844: 00112e00 */ sll $a1,$s1,0x18
@@ -8500,7 +8500,7 @@ glabel func0f11a8f4
/* f114934: 01602025 */ or $a0,$t3,$zero
/* f114938: 3c057f1b */ lui $a1,0x7f1b
/* f11493c: 24a5e3d4 */ addiu $a1,$a1,-7212
/* f114940: 0c00581b */ jal func000150e8
/* f114940: 0c00581b */ jal joy000150e8
/* f114944: 24040cf7 */ addiu $a0,$zero,0xcf7
/* f114948: 24010004 */ addiu $at,$zero,0x4
/* f11494c: 16210003 */ bne $s1,$at,.NB0f11495c
@@ -8531,7 +8531,7 @@ glabel func0f11a8f4
/* f1149a8: 3c057f1b */ lui $a1,0x7f1b
/* f1149ac: afa20040 */ sw $v0,0x40($sp)
/* f1149b0: 24a5e3dc */ addiu $a1,$a1,-7204
/* f1149b4: 0c005834 */ jal func00015144
/* f1149b4: 0c005834 */ jal joy00015144
/* f1149b8: 24040cf9 */ addiu $a0,$zero,0xcf9
/* f1149bc: 8fa40040 */ lw $a0,0x40($sp)
/* f1149c0: 00112e00 */ sll $a1,$s1,0x18
@@ -8558,7 +8558,7 @@ glabel func0f11a8f4
/* f114a0c: 000950c0 */ sll $t2,$t1,0x3
/* f114a10: 01495023 */ subu $t2,$t2,$t1
/* f114a14: 000a5280 */ sll $t2,$t2,0xa
/* f114a18: 0c00581b */ jal func000150e8
/* f114a18: 0c00581b */ jal joy000150e8
/* f114a1c: afaa003c */ sw $t2,0x3c($sp)
/* f114a20: 24010004 */ addiu $at,$zero,0x4
/* f114a24: 16210003 */ bne $s1,$at,.NB0f114a34
@@ -8590,7 +8590,7 @@ glabel func0f11a8f4
/* f114a84: 3c057f1b */ lui $a1,0x7f1b
/* f114a88: afa20040 */ sw $v0,0x40($sp)
/* f114a8c: 24a5e3ec */ addiu $a1,$a1,-7188
/* f114a90: 0c005834 */ jal func00015144
/* f114a90: 0c005834 */ jal joy00015144
/* f114a94: 24040d0a */ addiu $a0,$zero,0xd0a
/* f114a98: 921902b8 */ lbu $t9,0x2b8($s0)
/* f114a9c: 00112e00 */ sll $a1,$s1,0x18
@@ -8707,7 +8707,7 @@ glabel func0f11ac7c
/* f11ac90: 01c08025 */ or $s0,$t6,$zero
/* f11ac94: afa40030 */ sw $a0,0x30($sp)
/* f11ac98: afa0002c */ sw $zero,0x2c($sp)
/* f11ac9c: 0c00543a */ jal func000150e8
/* f11ac9c: 0c00543a */ jal joy000150e8
/* f11aca0: afa00024 */ sw $zero,0x24($sp)
/* f11aca4: 24010004 */ addiu $at,$zero,0x4
/* f11aca8: 16010003 */ bne $s0,$at,.L0f11acb8
@@ -8912,7 +8912,7 @@ glabel func0f11ac7c
/* f11af8c: 00000000 */ sll $zero,$zero,0x0
/* f11af90: afa0002c */ sw $zero,0x2c($sp)
.L0f11af94:
/* f11af94: 0c005451 */ jal func00015144
/* f11af94: 0c005451 */ jal joy00015144
/* f11af98: 00000000 */ sll $zero,$zero,0x0
/* f11af9c: 8fbf001c */ lw $ra,0x1c($sp)
/* f11afa0: 8fa2002c */ lw $v0,0x2c($sp)
@@ -8939,7 +8939,7 @@ glabel func0f114c08nb
.NB0f114c34:
/* f114c34: 3c057f1b */ lui $a1,0x7f1b
/* f114c38: 24a5e464 */ addiu $a1,$a1,-7068
/* f114c3c: 0c00581b */ jal func000150e8
/* f114c3c: 0c00581b */ jal joy000150e8
/* f114c40: 24040d6a */ addiu $a0,$zero,0xd6a
/* f114c44: 24010004 */ addiu $at,$zero,0x4
/* f114c48: 16010003 */ bne $s0,$at,.NB0f114c58
@@ -8970,7 +8970,7 @@ glabel func0f114c08nb
/* f114ca4: 24010004 */ addiu $at,$zero,0x4
/* f114ca8: 3c057f1b */ lui $a1,0x7f1b
/* f114cac: 24a5e46c */ addiu $a1,$a1,-7060
/* f114cb0: 0c005834 */ jal func00015144
/* f114cb0: 0c005834 */ jal joy00015144
/* f114cb4: 24040d6f */ addiu $a0,$zero,0xd6f
/* f114cb8: 10000041 */ beqz $zero,.NB0f114dc0
/* f114cbc: 24020001 */ addiu $v0,$zero,0x1
@@ -9003,7 +9003,7 @@ glabel func0f114c08nb
/* f114d1c: 24010004 */ addiu $at,$zero,0x4
/* f114d20: 3c057f1b */ lui $a1,0x7f1b
/* f114d24: 24a5e474 */ addiu $a1,$a1,-7052
/* f114d28: 0c005834 */ jal func00015144
/* f114d28: 0c005834 */ jal joy00015144
/* f114d2c: 24040d78 */ addiu $a0,$zero,0xd78
/* f114d30: 10000023 */ beqz $zero,.NB0f114dc0
/* f114d34: 24020001 */ addiu $v0,$zero,0x1
@@ -9036,13 +9036,13 @@ glabel func0f114c08nb
/* f114d94: 24040d86 */ addiu $a0,$zero,0xd86
/* f114d98: 3c057f1b */ lui $a1,0x7f1b
/* f114d9c: 24a5e47c */ addiu $a1,$a1,-7044
/* f114da0: 0c005834 */ jal func00015144
/* f114da0: 0c005834 */ jal joy00015144
/* f114da4: 24040d81 */ addiu $a0,$zero,0xd81
/* f114da8: 10000005 */ beqz $zero,.NB0f114dc0
/* f114dac: 24020001 */ addiu $v0,$zero,0x1
.NB0f114db0:
/* f114db0: 3c057f1b */ lui $a1,0x7f1b
/* f114db4: 0c005834 */ jal func00015144
/* f114db4: 0c005834 */ jal joy00015144
/* f114db8: 24a5e484 */ addiu $a1,$a1,-7036
/* f114dbc: 00001025 */ or $v0,$zero,$zero
.NB0f114dc0:
@@ -9115,7 +9115,7 @@ glabel func0f114dd4nb
/* f114ea8: 12210034 */ beq $s1,$at,.NB0f114f7c
/* f114eac: 24040dba */ addiu $a0,$zero,0xdba
/* f114eb0: 3c057f1b */ lui $a1,0x7f1b
/* f114eb4: 0c00581b */ jal func000150e8
/* f114eb4: 0c00581b */ jal joy000150e8
/* f114eb8: 24a5e48c */ addiu $a1,$a1,-7028
/* f114ebc: 24010004 */ addiu $at,$zero,0x4
/* f114ec0: 16210003 */ bne $s1,$at,.NB0f114ed0
@@ -9138,7 +9138,7 @@ glabel func0f114dd4nb
/* f114efc: 3c057f1b */ lui $a1,0x7f1b
/* f114f00: afa20020 */ sw $v0,0x20($sp)
/* f114f04: 24a5e494 */ addiu $a1,$a1,-7020
/* f114f08: 0c005834 */ jal func00015144
/* f114f08: 0c005834 */ jal joy00015144
/* f114f0c: 24040dbc */ addiu $a0,$zero,0xdbc
/* f114f10: 00112e00 */ sll $a1,$s1,0x18
/* f114f14: 00054e03 */ sra $t1,$a1,0x18
@@ -10513,7 +10513,7 @@ glabel func0f11b86c
/* f11b9f0: 26030010 */ addiu $v1,$s0,0x10
/* f11b9f4: 00401825 */ or $v1,$v0,$zero
.L0f11b9f8:
/* f11b9f8: 0c00543a */ jal func000150e8
/* f11b9f8: 0c00543a */ jal joy000150e8
/* f11b9fc: afa30104 */ sw $v1,0x104($sp)
/* f11ba00: 8fad0104 */ lw $t5,0x104($sp)
/* f11ba04: 00008025 */ or $s0,$zero,$zero
@@ -10605,7 +10605,7 @@ glabel func0f11b86c
/* f11bb48: 2407112a */ addiu $a3,$zero,_val7f11bb48
/* f11bb4c: 5440000b */ bnezl $v0,.L0f11bb7c
/* f11bb50: 2e010010 */ sltiu $at,$s0,0x10
/* f11bb54: 0c005451 */ jal func00015144
/* f11bb54: 0c005451 */ jal joy00015144
/* f11bb58: 00000000 */ sll $zero,$zero,0x0
/* f11bb5c: 24010001 */ addiu $at,$zero,0x1
/* f11bb60: 16610003 */ bne $s3,$at,.L0f11bb70
@@ -10632,7 +10632,7 @@ glabel func0f11b86c
/* f11bba0: 560aff9c */ bnel $s0,$t2,.L0f11ba14
/* f11bba4: 00112600 */ sll $a0,$s1,0x18
.L0f11bba8:
/* f11bba8: 0c005451 */ jal func00015144
/* f11bba8: 0c005451 */ jal joy00015144
/* f11bbac: 00000000 */ sll $zero,$zero,0x0
/* f11bbb0: 00001025 */ or $v0,$zero,$zero
.L0f11bbb4:
@@ -10760,7 +10760,7 @@ glabel func0f11b86c
.NB0f115970:
/* f115970: 3c057f1b */ lui $a1,0x7f1b
/* f115974: 24a5e544 */ addiu $a1,$a1,-6844
/* f115978: 0c00581b */ jal func000150e8
/* f115978: 0c00581b */ jal joy000150e8
/* f11597c: afa30108 */ sw $v1,0x108($sp)
/* f115980: 8fab0108 */ lw $t3,0x108($sp)
/* f115984: 00008025 */ or $s0,$zero,$zero
@@ -10851,7 +10851,7 @@ glabel func0f11b86c
/* f115ac4: 1440000b */ bnez $v0,.NB0f115af4
/* f115ac8: 3c057f1b */ lui $a1,0x7f1b
/* f115acc: 24a5e54c */ addiu $a1,$a1,-6836
/* f115ad0: 0c005834 */ jal func00015144
/* f115ad0: 0c005834 */ jal joy00015144
/* f115ad4: 24040fc0 */ addiu $a0,$zero,0xfc0
/* f115ad8: 24010001 */ addiu $at,$zero,0x1
/* f115adc: 16610003 */ bne $s3,$at,.NB0f115aec
@@ -10879,7 +10879,7 @@ glabel func0f11b86c
.NB0f115b24:
/* f115b24: 3c057f1b */ lui $a1,0x7f1b
/* f115b28: 24a5e554 */ addiu $a1,$a1,-6828
/* f115b2c: 0c005834 */ jal func00015144
/* f115b2c: 0c005834 */ jal joy00015144
/* f115b30: 24040fd6 */ addiu $a0,$zero,0xfd6
/* f115b34: 00001025 */ or $v0,$zero,$zero
.NB0f115b38:
@@ -11207,7 +11207,7 @@ glabel func0f11bc54
/* f11c028: 00000000 */ sll $zero,$zero,0x0
/* f11c02c: 24430001 */ addiu $v1,$v0,0x1
.L0f11c030:
/* f11c030: 0c00543a */ jal func000150e8
/* f11c030: 0c00543a */ jal joy000150e8
/* f11c034: afa30098 */ sw $v1,0x98($sp)
/* f11c038: 0000f025 */ or $s8,$zero,$zero
.L0f11c03c:
@@ -11324,7 +11324,7 @@ glabel func0f11bc54
/* f11c1d0: 24071286 */ addiu $a3,$zero,_val7f11c1d0
/* f11c1d4: 5440000b */ bnezl $v0,.L0f11c204
/* f11c1d8: 8fb80098 */ lw $t8,0x98($sp)
/* f11c1dc: 0c005451 */ jal func00015144
/* f11c1dc: 0c005451 */ jal joy00015144
/* f11c1e0: 00000000 */ sll $zero,$zero,0x0
/* f11c1e4: 24010001 */ addiu $at,$zero,0x1
/* f11c1e8: 16010003 */ bne $s0,$at,.L0f11c1f8
@@ -11346,7 +11346,7 @@ glabel func0f11bc54
/* f11c214: 24010002 */ addiu $at,$zero,0x2
/* f11c218: 17c1ff88 */ bne $s8,$at,.L0f11c03c
/* f11c21c: 00000000 */ sll $zero,$zero,0x0
/* f11c220: 0c005451 */ jal func00015144
/* f11c220: 0c005451 */ jal joy00015144
/* f11c224: 00000000 */ sll $zero,$zero,0x0
/* f11c228: 3c0d8007 */ lui $t5,%hi(g_PakDebugPakCache)
/* f11c22c: 8dad5ce8 */ lw $t5,%lo(g_PakDebugPakCache)($t5)
@@ -11655,7 +11655,7 @@ glabel func0f11bc54
/* f115fa0: 24430001 */ addiu $v1,$v0,0x1
.NB0f115fa4:
/* f115fa4: 24a5e60c */ addiu $a1,$a1,-6644
/* f115fa8: 0c00581b */ jal func000150e8
/* f115fa8: 0c00581b */ jal joy000150e8
/* f115fac: afa30098 */ sw $v1,0x98($sp)
/* f115fb0: 0000f025 */ or $s8,$zero,$zero
.NB0f115fb4:
@@ -11773,7 +11773,7 @@ glabel func0f11bc54
/* f11614c: 1440000b */ bnez $v0,.NB0f11617c
/* f116150: 3c057f1b */ lui $a1,0x7f1b
/* f116154: 24a5e614 */ addiu $a1,$a1,-6636
/* f116158: 0c005834 */ jal func00015144
/* f116158: 0c005834 */ jal joy00015144
/* f11615c: 2404111c */ addiu $a0,$zero,0x111c
/* f116160: 24010001 */ addiu $at,$zero,0x1
/* f116164: 16010003 */ bne $s0,$at,.NB0f116174
@@ -11796,7 +11796,7 @@ glabel func0f11bc54
/* f116198: 00000000 */ sll $zero,$zero,0x0
/* f11619c: 3c057f1b */ lui $a1,0x7f1b
/* f1161a0: 24a5e61c */ addiu $a1,$a1,-6628
/* f1161a4: 0c005834 */ jal func00015144
/* f1161a4: 0c005834 */ jal joy00015144
/* f1161a8: 24041129 */ addiu $a0,$zero,0x1129
/* f1161ac: 3c0d8008 */ lui $t5,0x8008
/* f1161b0: 8dad80b0 */ lw $t5,-0x7f50($t5)
@@ -11861,7 +11861,7 @@ glabel pakRepair
/* f11c2f8: 24010013 */ addiu $at,$zero,0x13
/* f11c2fc: 50a10023 */ beql $a1,$at,.L0f11c38c
/* f11c300: 00001025 */ or $v0,$zero,$zero
/* f11c304: 0c00543a */ jal func000150e8
/* f11c304: 0c00543a */ jal joy000150e8
/* f11c308: afa2001c */ sw $v0,0x1c($sp)
/* f11c30c: 83a2002b */ lb $v0,0x2b($sp)
/* f11c310: 24010004 */ addiu $at,$zero,0x4
@@ -11880,7 +11880,7 @@ glabel pakRepair
.L0f11c340:
/* f11c340: 0c0135bc */ jal func0004d6f0
/* f11c344: 00a02025 */ or $a0,$a1,$zero
/* f11c348: 0c005451 */ jal func00015144
/* f11c348: 0c005451 */ jal joy00015144
/* f11c34c: afa20024 */ sw $v0,0x24($sp)
/* f11c350: 8fa40024 */ lw $a0,0x24($sp)
/* f11c354: 24090002 */ addiu $t1,$zero,0x2
@@ -11930,7 +11930,7 @@ glabel pakRepair
/* f11627c: 10a10023 */ beq $a1,$at,.NB0f11630c
/* f116280: 24041149 */ addiu $a0,$zero,0x1149
/* f116284: 3c057f1b */ lui $a1,0x7f1b
/* f116288: 0c00581b */ jal func000150e8
/* f116288: 0c00581b */ jal joy000150e8
/* f11628c: 24a5e624 */ addiu $a1,$a1,-6620
/* f116290: 83a2002b */ lb $v0,0x2b($sp)
/* f116294: 24010004 */ addiu $at,$zero,0x4
@@ -11952,7 +11952,7 @@ glabel pakRepair
/* f1162cc: 3c057f1b */ lui $a1,0x7f1b
/* f1162d0: afa20024 */ sw $v0,0x24($sp)
/* f1162d4: 24a5e62c */ addiu $a1,$a1,-6612
/* f1162d8: 0c005834 */ jal func00015144
/* f1162d8: 0c005834 */ jal joy00015144
/* f1162dc: 2404114b */ addiu $a0,$zero,0x114b
/* f1162e0: 8fa40024 */ lw $a0,0x24($sp)
/* f1162e4: 240a0002 */ addiu $t2,$zero,0x2
@@ -12330,7 +12330,7 @@ glabel func0f11c54c
/* f11c594: 31f8000f */ andi $t8,$t7,0xf
/* f11c598: 13000013 */ beqz $t8,.L0f11c5e8
/* f11c59c: 00000000 */ sll $zero,$zero,0x0
/* f11c5a0: 0c004e5d */ jal func00013974
/* f11c5a0: 0c004e5d */ jal joy00013974
/* f11c5a4: 00002025 */ or $a0,$zero,$zero
/* f11c5a8: 964204e4 */ lhu $v0,0x4e4($s2)
/* f11c5ac: 3059000f */ andi $t9,$v0,0xf
@@ -12350,7 +12350,7 @@ glabel func0f11c54c
/* f11c5e0: 10000034 */ beqz $zero,.L0f11c6b4
/* f11c5e4: a64b04e4 */ sh $t3,0x4e4($s2)
.L0f11c5e8:
/* f11c5e8: 0c004eae */ jal contCheckPfs
/* f11c5e8: 0c004eae */ jal joyCheckPfs
/* f11c5ec: 24040002 */ addiu $a0,$zero,0x2
/* f11c5f0: 00008025 */ or $s0,$zero,$zero
/* f11c5f4: 24130004 */ addiu $s3,$zero,0x4
@@ -12390,13 +12390,13 @@ glabel func0f11c54c
/* f11c670: 26100001 */ addiu $s0,$s0,0x1
/* f11c674: 5613ffe1 */ bnel $s0,$s3,.L0f11c5fc
/* f11c678: 964204e4 */ lhu $v0,0x4e4($s2)
/* f11c67c: 0c004e60 */ jal func00013980
/* f11c67c: 0c004e60 */ jal joy00013980
/* f11c680: 00000000 */ sll $zero,$zero,0x0
/* f11c684: 54400006 */ bnezl $v0,.L0f11c6a0
/* f11c688: 2404ffff */ addiu $a0,$zero,-1
/* f11c68c: 0c004e5d */ jal func00013974
/* f11c68c: 0c004e5d */ jal joy00013974
/* f11c690: 24040001 */ addiu $a0,$zero,0x1
/* f11c694: 0c004e72 */ jal func000139c8
/* f11c694: 0c004e72 */ jal joy000139c8
/* f11c698: 00000000 */ sll $zero,$zero,0x0
/* f11c69c: 2404ffff */ addiu $a0,$zero,-1
.L0f11c6a0:
@@ -12478,10 +12478,10 @@ void pakExecuteDebugOperations(void)
if (g_PakDebugPakInit) {
s32 device = g_PakDebugPakInit - 1;
func000150e8();
joy000150e8();
func0f117b04(&var80099e78, (device == SAVEDEVICE_GAMEPAK ? NULL : &var800a3180[device]), device, 0);
func00015144();
joy00015144();
g_PakDebugPakInit = false;
}
@@ -12521,7 +12521,7 @@ GLOBAL_ASM(
glabel pakExecuteDebugOperations
/* f116480: 27bdffe0 */ addiu $sp,$sp,-32
/* f116484: afbf001c */ sw $ra,0x1c($sp)
/* f116488: 0fc59ed0 */ jal coreIsPaused
/* f116488: 0fc59ed0 */ jal lvIsPaused
/* f11648c: afb00018 */ sw $s0,0x18($sp)
/* f116490: 0fc60e8c */ jal mpIsPaused
/* f116494: 00000000 */ sll $zero,$zero,0x0
@@ -12569,7 +12569,7 @@ glabel pakExecuteDebugOperations
/* f116538: 3c057f1b */ lui $a1,0x7f1b
/* f11653c: 10400019 */ beqz $v0,.NB0f1165a4
/* f116540: 2450ffff */ addiu $s0,$v0,-1
/* f116544: 0c00581b */ jal func000150e8
/* f116544: 0c00581b */ jal joy000150e8
/* f116548: 24a5e700 */ addiu $a1,$a1,-6400
/* f11654c: 24010004 */ addiu $at,$zero,0x4
/* f116550: 16010003 */ bne $s0,$at,.NB0f116560
@@ -12591,7 +12591,7 @@ glabel pakExecuteDebugOperations
/* f116588: 02003025 */ or $a2,$s0,$zero
/* f11658c: 3c057f1b */ lui $a1,0x7f1b
/* f116590: 24a5e708 */ addiu $a1,$a1,-6392
/* f116594: 0c005834 */ jal func00015144
/* f116594: 0c005834 */ jal joy00015144
/* f116598: 240411d0 */ addiu $a0,$zero,0x11d0
/* f11659c: 3c018008 */ lui $at,0x8008
/* f1165a0: ac2080b4 */ sw $zero,-0x7f4c($at)
@@ -12892,7 +12892,7 @@ glabel func0f11ca30
/* f11cac4: 02801825 */ or $v1,$s4,$zero
/* f11cac8: 16f40005 */ bne $s7,$s4,.L0f11cae0
/* f11cacc: 02c09025 */ or $s2,$s6,$zero
/* f11cad0: 0c004e7a */ jal contShiftPfsStates
/* f11cad0: 0c004e7a */ jal joyShiftPfsStates
/* f11cad4: 00000000 */ sll $zero,$zero,0x0
/* f11cad8: 305400ff */ andi $s4,$v0,0xff
/* f11cadc: 02801825 */ or $v1,$s4,$zero
@@ -12958,7 +12958,7 @@ glabel func0f11ca30
/* f116678: 24010006 */ addiu $at,$zero,0x6
/* f11667c: 11c10030 */ beq $t6,$at,.NB0f116740
/* f116680: afbf0014 */ sw $ra,0x14($sp)
/* f116684: 0c0052a7 */ jal func00013980
/* f116684: 0c0052a7 */ jal joy00013980
/* f116688: 00000000 */ sll $zero,$zero,0x0
/* f11668c: 3c0d8008 */ lui $t5,0x8008
/* f116690: 25ad80d0 */ addiu $t5,$t5,-32560
@@ -15194,7 +15194,7 @@ void func0f11dcb0(s32 arg0)
if (value);
if (value != 2 && value != 3) {
func000153c4(i, arg0);
joy000153c4(i, arg0);
}
}
}
@@ -15216,7 +15216,7 @@ glabel func0f11dd58
/* f11dd84: afb00014 */ sw $s0,0x14($sp)
/* f11dd88: 01e02025 */ or $a0,$t7,$zero
/* f11dd8c: 27a50040 */ addiu $a1,$sp,0x40
/* f11dd90: 0c0054b4 */ jal func000152d0
/* f11dd90: 0c0054b4 */ jal joy000152d0
/* f11dd94: 27a60044 */ addiu $a2,$sp,0x44
/* f11dd98: 3c12800a */ lui $s2,%hi(var800a2380)
/* f11dd9c: 26522380 */ addiu $s2,$s2,%lo(var800a2380)
@@ -15239,7 +15239,7 @@ glabel func0f11dd58
/* f11dddc: 8c790000 */ lw $t9,0x0($v1)
/* f11dde0: 56390004 */ bnel $s1,$t9,.L0f11ddf4
/* f11dde4: 26100004 */ addiu $s0,$s0,0x4
/* f11dde8: 0c0054f1 */ jal func000153c4
/* f11dde8: 0c0054f1 */ jal joy000153c4
/* f11ddec: ac740004 */ sw $s4,0x4($v1)
/* f11ddf0: 26100004 */ addiu $s0,$s0,0x4
.L0f11ddf4:
@@ -15278,7 +15278,7 @@ glabel func0f11dd58
/* f117a60: 15010004 */ bne $t0,$at,.NB0f117a74
/* f117a64: 24090006 */ addiu $t1,$zero,0x6
/* f117a68: ac490004 */ sw $t1,0x4($v0)
/* f117a6c: 0c0058ac */ jal func000153c4
/* f117a6c: 0c0058ac */ jal joy000153c4
/* f117a70: 24050001 */ addiu $a1,$zero,0x1
.NB0f117a74:
/* f117a74: 8fbf0014 */ lw $ra,0x14($sp)
@@ -15299,7 +15299,7 @@ glabel func0f11de20
/* f11de34: 00047e03 */ sra $t7,$a0,0x18
/* f11de38: 01e02025 */ or $a0,$t7,$zero
/* f11de3c: 27a50028 */ addiu $a1,$sp,0x28
/* f11de40: 0c0054b4 */ jal func000152d0
/* f11de40: 0c0054b4 */ jal joy000152d0
/* f11de44: 27a6002c */ addiu $a2,$sp,0x2c
/* f11de48: 3c06800a */ lui $a2,%hi(var800a2380)
/* f11de4c: 24c62380 */ addiu $a2,$a2,%lo(var800a2380)
@@ -15387,7 +15387,7 @@ glabel func0f11deb8
/* f11def8: 164e0004 */ bne $s2,$t6,.L0f11df0c
/* f11defc: 01e02025 */ or $a0,$t7,$zero
/* f11df00: ae330004 */ sw $s3,0x4($s1)
/* f11df04: 0c0054f1 */ jal func000153c4
/* f11df04: 0c0054f1 */ jal joy000153c4
/* f11df08: 02402825 */ or $a1,$s2,$zero
.L0f11df0c:
/* f11df0c: 26100001 */ addiu $s0,$s0,0x1
@@ -15619,11 +15619,11 @@ glabel var7f1b4fd8
/* f11e10c: 24090005 */ addiu $t1,$zero,0x5
/* f11e110: 1000008e */ beqz $zero,.L0f11e34c
/* f11e114: ae090010 */ sw $t1,0x10($s0)
/* f11e118: 0c00543a */ jal func000150e8
/* f11e118: 0c00543a */ jal joy000150e8
/* f11e11c: 00000000 */ sll $zero,$zero,0x0
/* f11e120: 0fc46a3d */ jal func0f11a8f4
/* f11e124: 83a40023 */ lb $a0,0x23($sp)
/* f11e128: 0c005451 */ jal func00015144
/* f11e128: 0c005451 */ jal joy00015144
/* f11e12c: 00000000 */ sll $zero,$zero,0x0
/* f11e130: 10000087 */ beqz $zero,.L0f11e350
/* f11e134: 8e0a02b8 */ lw $t2,0x2b8($s0)
@@ -15987,11 +15987,11 @@ glabel var7f1b4fd8
.L0f11def4:
/* f11def4: 1000009f */ beqz $zero,.L0f11e174
/* f11def8: ac6f0010 */ sw $t7,0x10($v1)
/* f11defc: 0c00543a */ jal func000150e8
/* f11defc: 0c00543a */ jal joy000150e8
/* f11df00: 00000000 */ sll $zero,$zero,0x0
/* f11df04: 0fc4699d */ jal func0f11a8f4
/* f11df08: 83a40023 */ lb $a0,0x23($sp)
/* f11df0c: 0c005451 */ jal func00015144
/* f11df0c: 0c005451 */ jal joy00015144
/* f11df10: 00000000 */ sll $zero,$zero,0x0
/* f11df14: 10000098 */ beqz $zero,.L0f11e178
/* f11df18: 8fbf0014 */ lw $ra,0x14($sp)
@@ -16331,7 +16331,7 @@ glabel var7f1af164nb
/* f117d44: 24a5ece4 */ addiu $a1,$a1,-4892
/* f117d48: 2404171a */ addiu $a0,$zero,0x171a
/* f117d4c: afa3001c */ sw $v1,0x1c($sp)
/* f117d50: 0c00581b */ jal func000150e8
/* f117d50: 0c00581b */ jal joy000150e8
/* f117d54: a3a6002b */ sb $a2,0x2b($sp)
/* f117d58: 83a6002b */ lb $a2,0x2b($sp)
/* f117d5c: 24010004 */ addiu $at,$zero,0x4
@@ -16356,7 +16356,7 @@ glabel var7f1af164nb
/* f117da0: 3c057f1b */ lui $a1,0x7f1b
/* f117da4: 24a5ecec */ addiu $a1,$a1,-4884
/* f117da8: 2404171c */ addiu $a0,$zero,0x171c
/* f117dac: 0c005834 */ jal func00015144
/* f117dac: 0c005834 */ jal joy00015144
/* f117db0: afa20024 */ sw $v0,0x24($sp)
/* f117db4: 8fa60024 */ lw $a2,0x24($sp)
/* f117db8: 8fa3001c */ lw $v1,0x1c($sp)
@@ -16393,7 +16393,7 @@ glabel var7f1af164nb
/* f117e30: 3c057f1b */ lui $a1,0x7f1b
/* f117e34: 24a5ecf4 */ addiu $a1,$a1,-4876
/* f117e38: afa3001c */ sw $v1,0x1c($sp)
/* f117e3c: 0c00581b */ jal func000150e8
/* f117e3c: 0c00581b */ jal joy000150e8
/* f117e40: a3a6002b */ sb $a2,0x2b($sp)
/* f117e44: 83a6002b */ lb $a2,0x2b($sp)
/* f117e48: 00062600 */ sll $a0,$a2,0x18
@@ -16402,7 +16402,7 @@ glabel var7f1af164nb
/* f117e54: 01602025 */ or $a0,$t3,$zero
/* f117e58: 3c057f1b */ lui $a1,0x7f1b
/* f117e5c: 24a5ecfc */ addiu $a1,$a1,-4868
/* f117e60: 0c005834 */ jal func00015144
/* f117e60: 0c005834 */ jal joy00015144
/* f117e64: 2404174a */ addiu $a0,$zero,0x174a
/* f117e68: 8fa3001c */ lw $v1,0x1c($sp)
/* f117e6c: 240c000d */ addiu $t4,$zero,0xd
@@ -16679,17 +16679,17 @@ void pakProbeEeprom(void)
s32 type;
#if VERSION >= VERSION_NTSC_1_0
func000150e8();
joy000150e8();
#else
func000150e8(6199, "pak.c");
joy000150e8(6199, "pak.c");
#endif
type = osEepromProbe(&var80099e78);
#if VERSION >= VERSION_NTSC_1_0
func00015144();
joy00015144();
#else
func00015144(6201, "pak.c");
joy00015144(6201, "pak.c");
#endif
if (type == EEPROM_TYPE_16K) {
@@ -16708,17 +16708,17 @@ s32 pakReadEeprom(u8 address, u8 *buffer, u32 len)
s32 result;
#if VERSION >= VERSION_NTSC_1_0
func000150e8();
joy000150e8();
#else
func000150e8(6234, "pak.c");
joy000150e8(6234, "pak.c");
#endif
result = osEepromLongRead(&var80099e78, address, buffer, len);
#if VERSION >= VERSION_NTSC_1_0
func00015144();
joy00015144();
#else
func00015144(6236, "pak.c");
joy00015144(6236, "pak.c");
#endif
return result == 0 ? 0 : 0x81;
@@ -16729,17 +16729,17 @@ s32 pakWriteEeprom(u8 address, u8 *buffer, u32 len)
s32 result;
#if VERSION >= VERSION_NTSC_1_0
func000150e8();
joy000150e8();
#else
func000150e8(6269, "pak.c");
joy000150e8(6269, "pak.c");
#endif
result = osEepromLongWrite(&var80099e78, address, buffer, len);
#if VERSION >= VERSION_NTSC_1_0
func00015144();
joy00015144();
#else
func00015144(6271, "pak.c");
joy00015144(6271, "pak.c");
#endif
return result == 0 ? 0 : 0x82;
@@ -16930,7 +16930,7 @@ s32 func0f11e844(s8 device)
return 0;
}
func000150e8();
joy000150e8();
value = func00050d60(device == SAVEDEVICE_GAMEPAK ? NULL : &var800a3180[device], sp38, &sp37);
@@ -16979,7 +16979,7 @@ s32 func0f11e844(s8 device)
}
}
func00015144();
joy00015144();
if (sp24) {
return sp2c;
@@ -17007,7 +17007,7 @@ glabel func0f11e844
/* f1186c8: afa40080 */ sw $a0,0x80($sp)
/* f1186cc: 3c057f1b */ lui $a1,0x7f1b
/* f1186d0: 24a5ee7c */ addiu $a1,$a1,-4484
/* f1186d4: 0c00581b */ jal func000150e8
/* f1186d4: 0c00581b */ jal joy000150e8
/* f1186d8: 24041b85 */ addiu $a0,$zero,0x1b85
/* f1186dc: 83a20083 */ lb $v0,0x83($sp)
/* f1186e0: 3c0f800a */ lui $t7,0x800a
@@ -17026,7 +17026,7 @@ glabel func0f11e844
/* f118714: 13010006 */ beq $t8,$at,.NB0f118730
/* f118718: 27a5002f */ addiu $a1,$sp,0x2f
/* f11871c: 3c057f1b */ lui $a1,0x7f1b
/* f118720: 0c005834 */ jal func00015144
/* f118720: 0c005834 */ jal joy00015144
/* f118724: 24a5ee84 */ addiu $a1,$a1,-4476
/* f118728: 100000a3 */ beqz $zero,.NB0f1189b8
/* f11872c: 00001025 */ or $v0,$zero,$zero
@@ -17051,7 +17051,7 @@ glabel func0f11e844
/* f11876c: 93a3002f */ lbu $v1,0x2f($sp)
/* f118770: 3c057f1b */ lui $a1,0x7f1b
/* f118774: 24a5ee8c */ addiu $a1,$a1,-4468
/* f118778: 0c005834 */ jal func00015144
/* f118778: 0c005834 */ jal joy00015144
/* f11877c: 24041b91 */ addiu $a0,$zero,0x1b91
/* f118780: 1000008d */ beqz $zero,.NB0f1189b8
/* f118784: 00001025 */ or $v0,$zero,$zero
@@ -17081,7 +17081,7 @@ glabel func0f11e844
/* f1187d4: 14400006 */ bnez $v0,.NB0f1187f0
/* f1187d8: 24041b9f */ addiu $a0,$zero,0x1b9f
/* f1187dc: 3c057f1b */ lui $a1,0x7f1b
/* f1187e0: 0c005834 */ jal func00015144
/* f1187e0: 0c005834 */ jal joy00015144
/* f1187e4: 24a5ee94 */ addiu $a1,$a1,-4460
/* f1187e8: 10000073 */ beqz $zero,.NB0f1189b8
/* f1187ec: 00001025 */ or $v0,$zero,$zero
@@ -17089,7 +17089,7 @@ glabel func0f11e844
/* f1187f0: 14400006 */ bnez $v0,.NB0f11880c
/* f1187f4: 24041ba6 */ addiu $a0,$zero,0x1ba6
/* f1187f8: 3c057f1b */ lui $a1,0x7f1b
/* f1187fc: 0c005834 */ jal func00015144
/* f1187fc: 0c005834 */ jal joy00015144
/* f118800: 24a5ee9c */ addiu $a1,$a1,-4452
/* f118804: 1000006c */ beqz $zero,.NB0f1189b8
/* f118808: 00001025 */ or $v0,$zero,$zero
@@ -17115,7 +17115,7 @@ glabel func0f11e844
/* f11884c: 83ae0083 */ lb $t6,0x83($sp)
/* f118850: 3c057f1b */ lui $a1,0x7f1b
/* f118854: 24a5eea4 */ addiu $a1,$a1,-4444
/* f118858: 0c005834 */ jal func00015144
/* f118858: 0c005834 */ jal joy00015144
/* f11885c: 24041bad */ addiu $a0,$zero,0x1bad
/* f118860: 10000055 */ beqz $zero,.NB0f1189b8
/* f118864: 00001025 */ or $v0,$zero,$zero
@@ -17142,7 +17142,7 @@ glabel func0f11e844
/* f1188ac: 97a80074 */ lhu $t0,0x74($sp)
/* f1188b0: 3c057f1b */ lui $a1,0x7f1b
/* f1188b4: 24a5eeac */ addiu $a1,$a1,-4436
/* f1188b8: 0c005834 */ jal func00015144
/* f1188b8: 0c005834 */ jal joy00015144
/* f1188bc: 24041bb8 */ addiu $a0,$zero,0x1bb8
/* f1188c0: 1000003d */ beqz $zero,.NB0f1189b8
/* f1188c4: 00001025 */ or $v0,$zero,$zero
@@ -17171,7 +17171,7 @@ glabel func0f11e844
/* f118918: 356d0020 */ ori $t5,$t3,0x20
/* f11891c: 31ae00ef */ andi $t6,$t5,0xef
/* f118920: a04d02b8 */ sb $t5,0x2b8($v0)
/* f118924: 0c005834 */ jal func00015144
/* f118924: 0c005834 */ jal joy00015144
/* f118928: a04e02b8 */ sb $t6,0x2b8($v0)
.NB0f11892c:
/* f11892c: 3c188008 */ lui $t8,0x8008
@@ -17201,14 +17201,14 @@ glabel func0f11e844
/* f118988: a04b02b8 */ sb $t3,0x2b8($v0)
/* f11898c: 3c057f1b */ lui $a1,0x7f1b
/* f118990: 24a5eebc */ addiu $a1,$a1,-4420
/* f118994: 0c005834 */ jal func00015144
/* f118994: 0c005834 */ jal joy00015144
/* f118998: 24041bdf */ addiu $a0,$zero,0x1bdf
/* f11899c: 10000006 */ beqz $zero,.NB0f1189b8
/* f1189a0: 24020002 */ addiu $v0,$zero,0x2
.NB0f1189a4:
/* f1189a4: 3c057f1b */ lui $a1,0x7f1b
/* f1189a8: 24a5eec4 */ addiu $a1,$a1,-4412
/* f1189ac: 0c005834 */ jal func00015144
/* f1189ac: 0c005834 */ jal joy00015144
/* f1189b0: 24041be4 */ addiu $a0,$zero,0x1be4
/* f1189b4: 00001025 */ or $v0,$zero,$zero
.NB0f1189b8:
src/game/prop.c
+6 -6
View File
@@ -19,7 +19,7 @@
#include "game/explosions/explosions.h"
#include "game/smoke/smoke.h"
#include "game/sparks/sparks.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/game_190260.h"
#include "game/training/training.h"
#include "game/pad.h"
@@ -28,7 +28,7 @@
#include "game/wallhit.h"
#include "game/mpstats.h"
#include "bss.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
@@ -547,7 +547,7 @@ glabel var7f1a9e50
/* f060b14: 01002825 */ or $a1,$t0,$zero
/* f060b18: 00003025 */ or $a2,$zero,$zero
/* f060b1c: 2407ffff */ addiu $a3,$zero,-1
/* f060b20: 0c004241 */ jal audioStart
/* f060b20: 0c004241 */ jal sndStart
/* f060b24: e7a00014 */ swc1 $f0,0x14($sp)
/* f060b28: 10400004 */ beqz $v0,.L0f060b3c
/* f060b2c: 00402025 */ or $a0,$v0,$zero
@@ -698,7 +698,7 @@ glabel var7f1a9e50
/* f05fda8: 01002825 */ or $a1,$t0,$zero
/* f05fdac: 00003025 */ or $a2,$zero,$zero
/* f05fdb0: 2407ffff */ addiu $a3,$zero,-1
/* f05fdb4: 0c004338 */ jal audioStart
/* f05fdb4: 0c004338 */ jal sndStart
/* f05fdb8: e7a00014 */ swc1 $f0,0x14($sp)
/* f05fdbc: 10400019 */ beqz $v0,.NB0f05fe24
/* f05fdc0: 00402025 */ or $a0,$v0,$zero
@@ -848,7 +848,7 @@ glabel var7f1a9e5c
/* f060d1c: 01002825 */ or $a1,$t0,$zero
/* f060d20: 00003025 */ or $a2,$zero,$zero
/* f060d24: 2407ffff */ addiu $a3,$zero,-1
/* f060d28: 0c004241 */ jal audioStart
/* f060d28: 0c004241 */ jal sndStart
/* f060d2c: e7a00014 */ swc1 $f0,0x14($sp)
/* f060d30: 10400004 */ beqz $v0,.L0f060d44
/* f060d34: 00402025 */ or $a0,$v0,$zero
@@ -1005,7 +1005,7 @@ glabel var7f1a9e5c
/* f05ffb0: 01202825 */ or $a1,$t1,$zero
/* f05ffb4: 00003025 */ or $a2,$zero,$zero
/* f05ffb8: 2407ffff */ addiu $a3,$zero,-1
/* f05ffbc: 0c004338 */ jal audioStart
/* f05ffbc: 0c004338 */ jal sndStart
/* f05ffc0: e7a00014 */ swc1 $f0,0x14($sp)
/* f05ffc4: 10400019 */ beqz $v0,.NB0f06002c
/* f05ffc8: 00402025 */ or $a0,$v0,$zero
src/game/propobj.c
+38 -38
View File
@@ -38,11 +38,11 @@
#include "game/smoke/smoke.h"
#include "game/sparks/sparks.h"
#include "game/game_1531a0.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/game_1655c0.h"
#include "game/game_165670.h"
#include "game/gfxmemory.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/mplayer/setup.h"
#include "game/mplayer/scenarios.h"
#include "game/mpstats.h"
@@ -60,7 +60,7 @@
#include "lib/lib_09a80.h"
#include "lib/dma.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/memory.h"
#include "lib/model.h"
#include "lib/rng.h"
@@ -11944,7 +11944,7 @@ glabel func0f06e87c
/* f06e924: 3406ffff */ dli $a2,0xffff
/* f06e928: 0fc249af */ jal func0f0926bc
/* f06e92c: 8e040014 */ lw $a0,0x14($s0)
/* f06e930: 0fc5b364 */ jal coreIsPaused
/* f06e930: 0fc5b364 */ jal lvIsPaused
/* f06e934: 00000000 */ nop
/* f06e938: 1440001f */ bnez $v0,.L0f06e9b8
/* f06e93c: 3c01bf80 */ lui $at,0xbf80
@@ -12036,7 +12036,7 @@ glabel func0f06e87c
/* f06e924: 3406ffff */ dli $a2,0xffff
/* f06e928: 0fc249af */ jal func0f0926bc
/* f06e92c: 8e040014 */ lw $a0,0x14($s0)
/* f06e930: 0fc5b364 */ jal coreIsPaused
/* f06e930: 0fc5b364 */ jal lvIsPaused
/* f06e934: 00000000 */ nop
/* f06e938: 1440001f */ bnez $v0,.L0f06e9b8
/* f06e93c: 3c01bf80 */ lui $at,0xbf80
@@ -37829,7 +37829,7 @@ glabel var7f1aa5a8
.text
/* f079f1c: 27bdfe68 */ addiu $sp,$sp,-408
/* f079f20: afbf0044 */ sw $ra,0x44($sp)
/* f079f24: 0fc5b364 */ jal coreIsPaused
/* f079f24: 0fc5b364 */ jal lvIsPaused
/* f079f28: afa40198 */ sw $a0,0x198($sp)
/* f079f2c: 14400363 */ bnez $v0,.L0f07acbc
/* f079f30: 8fae0198 */ lw $t6,0x198($sp)
@@ -38791,7 +38791,7 @@ glabel var7f1aa5a8
.text
/* f079f1c: 27bdfe68 */ addiu $sp,$sp,-408
/* f079f20: afbf0044 */ sw $ra,0x44($sp)
/* f079f24: 0fc5b364 */ jal coreIsPaused
/* f079f24: 0fc5b364 */ jal lvIsPaused
/* f079f28: afa40198 */ sw $a0,0x198($sp)
/* f079f2c: 14400363 */ bnez $v0,.L0f07acbc
/* f079f30: 8fae0198 */ lw $t6,0x198($sp)
@@ -47982,7 +47982,7 @@ s32 objTick(struct prop *prop)
struct chopperobj *chopper = (struct chopperobj *)obj;
if (!chopper->dead) {
if (!coreIsPaused()) {
if (!lvIsPaused()) {
if (chopper->attackmode == 3) {
// empty
} else if (chopper->attackmode == 2) {
@@ -62635,13 +62635,13 @@ bool propobjInteract(struct prop *prop)
if (handled) {
// Typing sound
audioStart(var80095200, SFX_TYPING_8118, NULL, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_TYPING_8118, NULL, -1, -1, -1, -1, -1);
}
func0f0fd494(&prop->pos);
} else if (obj->type == OBJTYPE_ALARM) {
// Button press sound
audioStart(var80095200, SFX_PRESS_SWITCH, NULL, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_PRESS_SWITCH, NULL, -1, -1, -1, -1, -1);
if (alarmIsActive()) {
alarmDeactivate();
@@ -63640,7 +63640,7 @@ void ammotypePlayPickupSound(u32 ammotype)
case AMMOTYPE_CLOAK:
case AMMOTYPE_BOOST:
case AMMOTYPE_TOKEN:
audioStart(var80095200, SFX_PICKUP_AMMO, NULL, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_PICKUP_AMMO, NULL, -1, -1, -1, -1, -1);
break;
case AMMOTYPE_REMOTE_MINE:
case AMMOTYPE_PROXY_MINE:
@@ -63649,10 +63649,10 @@ void ammotypePlayPickupSound(u32 ammotype)
case AMMOTYPE_MICROCAMERA:
case AMMOTYPE_PLASTIQUE:
case AMMOTYPE_ECM_MINE:
audioStart(var80095200, SFX_PICKUP_MINE, NULL, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_PICKUP_MINE, NULL, -1, -1, -1, -1, -1);
break;
case AMMOTYPE_KNIFE:
audioStart(var80095200, SFX_PICKUP_KNIFE, NULL, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_PICKUP_KNIFE, NULL, -1, -1, -1, -1, -1);
break;
}
}
@@ -63717,7 +63717,7 @@ void func0f087d10(s32 weaponnum)
sound = SFX_PICKUP_GUN;
}
audioStart(var80095200, sound, NULL, -1, -1, -1, -1, -1);
sndStart(var80095200, sound, NULL, -1, -1, -1, -1, -1);
}
void ammotypeGetPickupMessage(char *dst, s32 ammotype, s32 qty)
@@ -64321,7 +64321,7 @@ glabel var7f1aae70
/* f0888e4: afac0010 */ sw $t4,0x10($sp)
/* f0888e8: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f0888ec: 2407ffff */ addiu $a3,$zero,-1
/* f0888f0: 0c004241 */ jal audioStart
/* f0888f0: 0c004241 */ jal sndStart
/* f0888f4: e7a40014 */ swc1 $f4,0x14($sp)
.L0f0888f8:
/* f0888f8: 8faf00a4 */ lw $t7,0xa4($sp)
@@ -64401,7 +64401,7 @@ glabel var7f1aae70
/* f088a10: afad0010 */ sw $t5,0x10($sp)
/* f088a14: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f088a18: 2407ffff */ addiu $a3,$zero,-1
/* f088a1c: 0c004241 */ jal audioStart
/* f088a1c: 0c004241 */ jal sndStart
/* f088a20: e7a40014 */ swc1 $f4,0x14($sp)
.L0f088a24:
/* f088a24: 24180001 */ addiu $t8,$zero,0x1
@@ -64680,7 +64680,7 @@ glabel var7f1aae70
/* f088e0c: afad0010 */ sw $t5,0x10($sp)
/* f088e10: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f088e14: 2407ffff */ addiu $a3,$zero,-1
/* f088e18: 0c004241 */ jal audioStart
/* f088e18: 0c004241 */ jal sndStart
/* f088e1c: e7a60014 */ swc1 $f6,0x14($sp)
.L0f088e20:
/* f088e20: 8faf00a4 */ lw $t7,0xa4($sp)
@@ -64772,7 +64772,7 @@ glabel var7f1aae70
/* f088f50: afb80010 */ sw $t8,0x10($sp)
/* f088f54: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f088f58: 2407ffff */ addiu $a3,$zero,-1
/* f088f5c: 0c004241 */ jal audioStart
/* f088f5c: 0c004241 */ jal sndStart
/* f088f60: e7a80014 */ swc1 $f8,0x14($sp)
.L0f088f64:
/* f088f64: 8faa00a4 */ lw $t2,0xa4($sp)
@@ -64968,7 +64968,7 @@ glabel var7f1aae70
/* f0888e4: afac0010 */ sw $t4,0x10($sp)
/* f0888e8: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f0888ec: 2407ffff */ addiu $a3,$zero,-1
/* f0888f0: 0c004241 */ jal audioStart
/* f0888f0: 0c004241 */ jal sndStart
/* f0888f4: e7a40014 */ swc1 $f4,0x14($sp)
.L0f0888f8:
/* f0888f8: 8faf00a4 */ lw $t7,0xa4($sp)
@@ -65048,7 +65048,7 @@ glabel var7f1aae70
/* f088a10: afad0010 */ sw $t5,0x10($sp)
/* f088a14: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f088a18: 2407ffff */ addiu $a3,$zero,-1
/* f088a1c: 0c004241 */ jal audioStart
/* f088a1c: 0c004241 */ jal sndStart
/* f088a20: e7a40014 */ swc1 $f4,0x14($sp)
.L0f088a24:
/* f088a24: 24180001 */ addiu $t8,$zero,0x1
@@ -65327,7 +65327,7 @@ glabel var7f1aae70
/* f088e0c: afad0010 */ sw $t5,0x10($sp)
/* f088e10: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f088e14: 2407ffff */ addiu $a3,$zero,-1
/* f088e18: 0c004241 */ jal audioStart
/* f088e18: 0c004241 */ jal sndStart
/* f088e1c: e7a60014 */ swc1 $f6,0x14($sp)
.L0f088e20:
/* f088e20: 8faf00a4 */ lw $t7,0xa4($sp)
@@ -65419,7 +65419,7 @@ glabel var7f1aae70
/* f088f50: afb80010 */ sw $t8,0x10($sp)
/* f088f54: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f088f58: 2407ffff */ addiu $a3,$zero,-1
/* f088f5c: 0c004241 */ jal audioStart
/* f088f5c: 0c004241 */ jal sndStart
/* f088f60: e7a80014 */ swc1 $f8,0x14($sp)
.L0f088f64:
/* f088f64: 8faa00a4 */ lw $t2,0xa4($sp)
@@ -65492,7 +65492,7 @@ glabel var7f1aae70
// switch (obj->type) {
// case 0x04: // f0888b4 - key
// if (g_Vars.in_cutscene == false) {
// audioStart(var80095200, SFX_PICKUP_KEYCARD, NULL, -1, -1, -1, -1, -1);
// sndStart(var80095200, SFX_PICKUP_KEYCARD, NULL, -1, -1, -1, -1, -1);
// }
//
// if (showhudmsg) {
@@ -65531,7 +65531,7 @@ glabel var7f1aae70
// }
//
// if (g_Vars.in_cutscene == false) {
// audioStart(var80095200, SFX_PICKUP_AMMO, NULL, -1, -1, -1, -1, -1);
// sndStart(var80095200, SFX_PICKUP_AMMO, NULL, -1, -1, -1, -1, -1);
// }
//
// sp148[1] = 1;
@@ -65682,7 +65682,7 @@ glabel var7f1aae70
// currentPlayerSetShieldFrac(shield->amount);
//
// if (g_Vars.in_cutscene == false) {
// audioStart(var80095200, SFX_PICKUP_SHIELD, NULL, -1, -1, -1, -1, -1);
// sndStart(var80095200, SFX_PICKUP_SHIELD, NULL, -1, -1, -1, -1, -1);
// }
//
// if (showhudmsg) {
@@ -65748,7 +65748,7 @@ glabel var7f1aae70
// case 0x2f: // f088f20
// default:
// if (g_Vars.in_cutscene == false) {
// audioStart(var80095200, SFX_PICKUP_KEYCARD, NULL, -1, -1, -1, -1, -1);
// sndStart(var80095200, SFX_PICKUP_KEYCARD, NULL, -1, -1, -1, -1, -1);
// }
//
// if (showhudmsg) {
@@ -67939,7 +67939,7 @@ void playerActivateRemoteMineDetonator(s32 playernum)
{
var80069910 |= 1 << playernum;
audioStart(var80095200, SFX_DETONATE, 0, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_DETONATE, 0, -1, -1, -1, -1, -1);
playerDetonateRemoteMines(playernum);
}
@@ -75067,7 +75067,7 @@ glabel var7f1ab19c
/* f090658: afaa0018 */ sw $t2,0x18($sp)
/* f09065c: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f090660: afa90010 */ sw $t1,0x10($sp)
/* f090664: 0c004241 */ jal audioStart
/* f090664: 0c004241 */ jal sndStart
/* f090668: e7a60014 */ swc1 $f6,0x14($sp)
/* f09066c: 3c018007 */ lui $at,%hi(var800698e4)
/* f090670: c42098e4 */ lwc1 $f0,%lo(var800698e4)($at)
@@ -75116,7 +75116,7 @@ glabel var7f1ab19c
/* f090714: 8d089900 */ lw $t0,%lo(var80069900)($t0)
/* f090718: 15000016 */ bnez $t0,.L0f090774
/* f09071c: 00000000 */ nop
/* f090720: 0fc5b364 */ jal coreIsPaused
/* f090720: 0fc5b364 */ jal lvIsPaused
/* f090724: 00000000 */ nop
/* f090728: 14400012 */ bnez $v0,.L0f090774
/* f09072c: 24090037 */ addiu $t1,$zero,0x37
@@ -75135,7 +75135,7 @@ glabel var7f1ab19c
/* f090760: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f090764: 24050037 */ addiu $a1,$zero,0x37
/* f090768: 2407ffff */ addiu $a3,$zero,-1
/* f09076c: 0c004241 */ jal audioStart
/* f09076c: 0c004241 */ jal sndStart
/* f090770: e7a40014 */ swc1 $f4,0x14($sp)
.L0f090774:
/* f090774: 3c048007 */ lui $a0,%hi(var80069900)
@@ -75257,7 +75257,7 @@ glabel var7f1ab19c
/* f090658: afaa0018 */ sw $t2,0x18($sp)
/* f09065c: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f090660: afa90010 */ sw $t1,0x10($sp)
/* f090664: 0c004241 */ jal audioStart
/* f090664: 0c004241 */ jal sndStart
/* f090668: e7a60014 */ swc1 $f6,0x14($sp)
/* f09066c: 3c018007 */ lui $at,%hi(var800698e4)
/* f090670: c42098e4 */ lwc1 $f0,%lo(var800698e4)($at)
@@ -75306,7 +75306,7 @@ glabel var7f1ab19c
/* f090714: 8d089900 */ lw $t0,%lo(var80069900)($t0)
/* f090718: 15000016 */ bnez $t0,.L0f090774
/* f09071c: 00000000 */ nop
/* f090720: 0fc5b364 */ jal coreIsPaused
/* f090720: 0fc5b364 */ jal lvIsPaused
/* f090724: 00000000 */ nop
/* f090728: 14400012 */ bnez $v0,.L0f090774
/* f09072c: 24090037 */ addiu $t1,$zero,0x37
@@ -75325,7 +75325,7 @@ glabel var7f1ab19c
/* f090760: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f090764: 24050037 */ addiu $a1,$zero,0x37
/* f090768: 2407ffff */ addiu $a3,$zero,-1
/* f09076c: 0c004241 */ jal audioStart
/* f09076c: 0c004241 */ jal sndStart
/* f090770: e7a40014 */ swc1 $f4,0x14($sp)
.L0f090774:
/* f090774: 3c048007 */ lui $a0,%hi(var80069900)
@@ -76089,7 +76089,7 @@ void alarmTick(void)
default: sound = SFX_ALARM_DEFAULT; break;
}
if (!coreIsPaused()) {
if (!lvIsPaused()) {
if (g_AlarmAudioHandle) {
// The sound is currently playing. Cycle between the left/right
// speaker for stereo or headphone mode.
@@ -76109,11 +76109,11 @@ void alarmTick(void)
g_AlarmSpeakerDirection *= -1;
}
audioAdjust(&g_AlarmAudioHandle, 0, 0x7fff, g_AlarmSpeakerWeight, -1, -1, 0, -1, 1);
sndAdjust(&g_AlarmAudioHandle, 0, 0x7fff, g_AlarmSpeakerWeight, -1, -1, 0, -1, 1);
} else {
// The alarm finished, or this is the first one.
// Start the sound again.
audioStart(var80095200, sound, &g_AlarmAudioHandle, -1, -1, -1, -1, -1);
sndStart(var80095200, sound, &g_AlarmAudioHandle, -1, -1, -1, -1, -1);
}
}
@@ -76460,7 +76460,7 @@ glabel var7f1ab214
/* f0912e4: afa40200 */ sw $a0,0x200($sp)
/* f0912e8: afa50204 */ sw $a1,0x204($sp)
/* f0912ec: afa60208 */ sw $a2,0x208($sp)
/* f0912f0: 0fc5b364 */ jal coreIsPaused
/* f0912f0: 0fc5b364 */ jal lvIsPaused
/* f0912f4: afa7020c */ sw $a3,0x20c($sp)
/* f0912f8: 1440029e */ bnez $v0,.L0f091d74
/* f0912fc: 8fa30208 */ lw $v1,0x208($sp)
@@ -77189,7 +77189,7 @@ glabel var7f1ab214
/* f0912e4: afa40200 */ sw $a0,0x200($sp)
/* f0912e8: afa50204 */ sw $a1,0x204($sp)
/* f0912ec: afa60208 */ sw $a2,0x208($sp)
/* f0912f0: 0fc5b364 */ jal coreIsPaused
/* f0912f0: 0fc5b364 */ jal lvIsPaused
/* f0912f4: afa7020c */ sw $a3,0x20c($sp)
/* f0912f8: 1440029e */ bnez $v0,.L0f091d74
/* f0912fc: 8fa30208 */ lw $v1,0x208($sp)
src/game/sight.c
+4 -4
View File
@@ -16,7 +16,7 @@
#include "bss.h"
#include "lib/lib_09a80.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "data.h"
#include "types.h"
@@ -248,7 +248,7 @@ void sightTick(bool sighton)
if (g_Vars.currentplayer->lookingatprop.prop != g_Vars.currentplayer->cmpfollowprops[0].prop) {
struct audiohandle *handle;
handle = func00010718(&handle, 0, 0x7fff, 0x40, 7, 1, 1, -1, 1);
handle = snd00010718(&handle, 0, 0x7fff, 0x40, 7, 1, 1, -1, 1);
threat = &g_Vars.currentplayer->cmpfollowprops[0];
@@ -274,7 +274,7 @@ void sightTick(bool sighton)
if (index >= 0) {
struct audiohandle *handle;
handle = func00010718(&handle, 0, 0x7fff, 0x40, 7, 1, 1, -1, 1);
handle = snd00010718(&handle, 0, 0x7fff, 0x40, 7, 1, 1, -1, 1);
threat = &g_Vars.currentplayer->cmpfollowprops[index];
@@ -297,7 +297,7 @@ void sightTick(bool sighton)
if (index >= 0) {
struct audiohandle *handle;
handle = func00010718(&handle, 0, 0x7fff, 0x40, 7, 1, 1, -1, 1);
handle = snd00010718(&handle, 0, 0x7fff, 0x40, 7, 1, 1, -1, 1);
threat = &g_Vars.currentplayer->cmpfollowprops[index];
src/game/smoke/smoke.c
+1 -1
View File
@@ -5,7 +5,7 @@
#include "game/game_0b3350.h"
#include "game/game_0b4950.h"
#include "game/smoke/smoke.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/game_1668e0.h"
#include "game/file.h"
#include "game/propobj.h"
src/game/splat.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/smoke/smoke.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/propobj.h"
#include "game/splat.h"
#include "game/utils.h"
src/game/texture.c → src/game/texdecompress.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_0b3350.h"
#include "game/texture.h"
#include "game/texdecompress.h"
#include "bss.h"
#include "lib/lib_074f0.h"
#include "lib/dma.h"
src/game/title.c
+23 -23
View File
@@ -11,18 +11,18 @@
#include "game/bondview.h"
#include "game/game_1531a0.h"
#include "game/file.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/music.h"
#include "game/training/training.h"
#include "game/game_1a7560.h"
#include "game/lang.h"
#include "game/propobj.h"
#include "bss.h"
#include "lib/controller.h"
#include "lib/joy.h"
#include "lib/lib_09a80.h"
#include "lib/main.h"
#include "lib/model.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/lib_159b0.h"
#include "lib/lib_16110.h"
#include "lib/lib_317f0.h"
@@ -465,7 +465,7 @@ void titleTickCheckControllers(void)
viSetUseZBuf(false);
if (g_TitleTimer > 6) {
if ((contGetConnectedControllers() & 1) == 0) {
if ((joyGetConnectedControllers() & 1) == 0) {
titleSetNextMode(TITLEMODE_NOCONTROLLER);
} else {
titleSetNextMode(TITLEMODE_RARELOGO);
@@ -1672,7 +1672,7 @@ glabel titleInitPdLogo
/* f01701c: 24100001 */ addiu $s0,$zero,0x1
/* f017020: 3c018006 */ lui $at,%hi(var800624f4)
/* f017024: ac3024f4 */ sw $s0,%lo(var800624f4)($at)
/* f017028: 0c005204 */ jal func00014810
/* f017028: 0c005204 */ jal joy00014810
/* f01702c: 00002025 */ or $a0,$zero,$zero
/* f017030: 3c188006 */ lui $t8,%hi(var800624a8)
/* f017034: 8f1824a8 */ lw $t8,%lo(var800624a8)($t8)
@@ -1778,7 +1778,7 @@ glabel titleInitPdLogo
// var8009ccb8 = 0;
// var800624f4 = 1;
//
// func00014810(false);
// joy00014810(false);
//
// var80062730 = 1;
// var80062734 = 0;
@@ -1796,7 +1796,7 @@ void titleExitPdLogo(void)
modelFree(var80062508);
modelFree(var8006250c);
func00014810(true);
joy00014810(true);
}
void titleTickPdLogo(void)
@@ -1821,7 +1821,7 @@ void titleTickPdLogo(void)
g_Vars.coopplayernum = -1;
g_Vars.antiplayernum = -1;
coreSetDifficulty(DIFF_A);
lvSetDifficulty(DIFF_A);
func00009ec4(true);
} else {
titleSetNextMode(TITLEMODE_SKIP);
@@ -1831,7 +1831,7 @@ void titleTickPdLogo(void)
titleSetNextMode(TITLEMODE_SKIP);
}
if (contGetButtonsPressedThisFrame(0, 0xffff)) {
if (joyGetButtonsPressedThisFrame(0, 0xffff)) {
var800624a8 = var800624ac = 1;
if (g_TitleTimer < PALDOWN(549)) {
@@ -5113,7 +5113,7 @@ glabel var7f1a8468
void titleInitRarePresents(void)
{
g_TitleTimer = 0;
func00014810(false);
joy00014810(false);
g_TitleAudioHandle = NULL;
}
@@ -5124,7 +5124,7 @@ void titleExitRarePresents(void)
}
g_TitleAudioHandle = NULL;
func00014810(true);
joy00014810(true);
}
void titleTickRarePresents(void)
@@ -5138,7 +5138,7 @@ void titleTickRarePresents(void)
if (g_TitleTimer > PALDOWN(300)) {
titleSetNextMode(TITLEMODE_PDLOGO);
} else if (contGetButtonsPressedThisFrame(0, 0xffff)) {
} else if (joyGetButtonsPressedThisFrame(0, 0xffff)) {
titleSetNextMode(TITLEMODE_SKIP);
}
}
@@ -5301,7 +5301,7 @@ Gfx *titleRenderRarePresents(Gfx *gdl)
if (var80062868) {
if (g_TitleAudioHandle == NULL) {
audioStart(var80095200, SFX_TITLE_RAREPRESENTS, &g_TitleAudioHandle, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_TITLE_RAREPRESENTS, &g_TitleAudioHandle, -1, -1, -1, -1, -1);
}
} else {
if (g_TitleAudioHandle) {
@@ -5353,14 +5353,14 @@ void titleInitNintendoLogo(void)
modelSetUnk14(g_TitleModel, 1);
modelSetRootPosition(g_TitleModel, &coord);
var800624f4 = 1;
func00014810(false);
joy00014810(false);
}
}
void titleExitNintendoLogo(void)
{
modelFree(g_TitleModel);
func00014810(true);
joy00014810(true);
}
u32 var8006287c = 0x00000000;
@@ -5396,7 +5396,7 @@ void titleTickNintendoLogo(void)
g_TitleTimer += g_Vars.lvupdate240_60;
}
if (contGetButtonsPressedThisFrame(0, 0xffff)) {
if (joyGetButtonsPressedThisFrame(0, 0xffff)) {
if (osResetType == RESET_TYPE_NMI) {
var800624a8 = 1;
titleSetNextMode(TITLEMODE_PDLOGO);
@@ -6037,7 +6037,7 @@ void titleInitRareLogo(void)
var800624f4 = 1;
func0f16d3d0();
func00014810(false);
joy00014810(false);
if (var800624a4 == false && g_Is4Mb != true) {
var800624a4 = true;
@@ -6048,7 +6048,7 @@ void titleInitRareLogo(void)
void titleExitRareLogo(void)
{
modelFree(g_TitleModel);
func00014810(true);
joy00014810(true);
}
u32 var800628d4 = 0x00000000;
@@ -6095,7 +6095,7 @@ void titleTickRareLogo(void)
g_TitleTimer += g_Vars.lvupdate240_60;
if (contGetButtonsPressedThisFrame(0, 0xffff)) {
if (joyGetButtonsPressedThisFrame(0, 0xffff)) {
if (osResetType == RESET_TYPE_NMI) {
var800624a8 = 1;
titleSetNextMode(TITLEMODE_PDLOGO);
@@ -7010,7 +7010,7 @@ void titleInitSkip(void)
g_Vars.coopplayernum = -1;
g_Vars.antiplayernum = -1;
coreSetDifficulty(DIFF_A);
lvSetDifficulty(DIFF_A);
func00009ec4(true);
}
@@ -7039,7 +7039,7 @@ glabel titleRenderNoController
/* f01a510: 27bdff98 */ addiu $sp,$sp,-104
/* f01a514: afbf003c */ sw $ra,0x3c($sp)
/* f01a518: afb00038 */ sw $s0,0x38($sp)
/* f01a51c: 0c005013 */ jal contGetConnectedControllers
/* f01a51c: 0c005013 */ jal joyGetConnectedControllers
/* f01a520: 00808025 */ or $s0,$a0,$zero
/* f01a524: 0fc06bf0 */ jal func0f01afc0
/* f01a528: 02002025 */ or $a0,$s0,$zero
@@ -7244,7 +7244,7 @@ glabel titleRenderNoController
// u16 stack[6];
//
// // This was likely printed to console
// contGetConnectedControllers();
// joyGetConnectedControllers();
//
// gdl = func0f01afc0(gdl);
// gdl = func0f153628(gdl);
@@ -7528,7 +7528,7 @@ void func0f01adb8(void)
void titleTickOld(void)
{
if (titleIsKeepingMode()) {
func00014810(false);
joy00014810(false);
if (g_TitleDelayedTimer == 0) {
switch (g_TitleMode) {
src/game/training/menus.c
+1 -1
View File
@@ -11,7 +11,7 @@
#include "game/inventory/inventory.h"
#include "game/game_1531a0.h"
#include "game/file.h"
#include "game/texture.h"
#include "game/texdecompress.h"
#include "game/game_173a00.h"
#include "game/training/menus.h"
#include "game/training/training.h"
src/game/training/training.c
+16 -16
View File
@@ -15,7 +15,7 @@
#include "game/inventory/inventory.h"
#include "game/explosions/explosions.h"
#include "game/game_1531a0.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/training/menus.h"
#include "game/training/training.h"
#include "game/gamefile.h"
@@ -28,7 +28,7 @@
#include "lib/lib_09a80.h"
#include "lib/dma.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/memory.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
@@ -405,7 +405,7 @@ void frInitLighting(void)
g_FrData.donelighting = true;
audioStart(var80095200, SFX_FR_LIGHTSON, NULL, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_FR_LIGHTSON, NULL, -1, -1, -1, -1, -1);
}
chrSetStageFlag(NULL, STAGEFLAG_CI_IN_TRAINING);
@@ -424,7 +424,7 @@ void frRestoreLighting(void)
g_FrData.donelighting = false;
audioStart(var80095200, SFX_FR_LIGHTSOFF, NULL, -1, -1, -1, -1, -1);
sndStart(var80095200, SFX_FR_LIGHTSOFF, NULL, -1, -1, -1, -1, -1);
}
}
@@ -3171,7 +3171,7 @@ glabel var7f1b94e4
/* f1a0c6c: 240505db */ li $a1,0x5db
/* f1a0c70: 00003025 */ move $a2,$zero
/* f1a0c74: 2407ffff */ li $a3,-1
/* f1a0c78: 0c0041a0 */ jal audioStart
/* f1a0c78: 0c0041a0 */ jal sndStart
/* f1a0c7c: e7b80014 */ swc1 $f24,0x14($sp)
/* f1a0c80: 3c048009 */ lui $a0,0x8009
/* f1a0c84: 248496e8 */ addiu $a0,$a0,-26904
@@ -3192,7 +3192,7 @@ glabel var7f1b94e4
/* f1a0cbc: 240505dc */ li $a1,0x5dc
/* f1a0cc0: 00003025 */ move $a2,$zero
/* f1a0cc4: 2407ffff */ li $a3,-1
/* f1a0cc8: 0c0041a0 */ jal audioStart
/* f1a0cc8: 0c0041a0 */ jal sndStart
/* f1a0ccc: e7b80014 */ swc1 $f24,0x14($sp)
/* f1a0cd0: 3c048009 */ lui $a0,0x8009
/* f1a0cd4: 248495cc */ addiu $a0,$a0,-27188
@@ -3413,7 +3413,7 @@ glabel var7f1b94e4
/* f1a0fe0: 240505d4 */ li $a1,0x5d4
/* f1a0fe4: 00003025 */ move $a2,$zero
/* f1a0fe8: 2407ffff */ li $a3,-1
/* f1a0fec: 0c0041a0 */ jal audioStart
/* f1a0fec: 0c0041a0 */ jal sndStart
/* f1a0ff0: e7b80014 */ swc1 $f24,0x14($sp)
/* f1a0ff4: 8ea30464 */ lw $v1,0x464($s5)
.PF0f1a0ff8:
@@ -4271,7 +4271,7 @@ glabel var7f1b94e4
/* f19fb58: 240505db */ addiu $a1,$zero,0x5db
/* f19fb5c: 00003025 */ or $a2,$zero,$zero
/* f19fb60: 2407ffff */ addiu $a3,$zero,-1
/* f19fb64: 0c004241 */ jal audioStart
/* f19fb64: 0c004241 */ jal sndStart
/* f19fb68: e7b80014 */ swc1 $f24,0x14($sp)
/* f19fb6c: 3c048009 */ lui $a0,%hi(g_FrFailedMenuDialog)
/* f19fb70: 24849198 */ addiu $a0,$a0,%lo(g_FrFailedMenuDialog)
@@ -4292,7 +4292,7 @@ glabel var7f1b94e4
/* f19fba8: 240505dc */ addiu $a1,$zero,0x5dc
/* f19fbac: 00003025 */ or $a2,$zero,$zero
/* f19fbb0: 2407ffff */ addiu $a3,$zero,-1
/* f19fbb4: 0c004241 */ jal audioStart
/* f19fbb4: 0c004241 */ jal sndStart
/* f19fbb8: e7b80014 */ swc1 $f24,0x14($sp)
/* f19fbbc: 3c048009 */ lui $a0,%hi(g_FrCompletedMenuDialog)
/* f19fbc0: 2484907c */ addiu $a0,$a0,%lo(g_FrCompletedMenuDialog)
@@ -4513,7 +4513,7 @@ glabel var7f1b94e4
/* f19fecc: 240505d4 */ addiu $a1,$zero,0x5d4
/* f19fed0: 00003025 */ or $a2,$zero,$zero
/* f19fed4: 2407ffff */ addiu $a3,$zero,-1
/* f19fed8: 0c004241 */ jal audioStart
/* f19fed8: 0c004241 */ jal sndStart
/* f19fedc: e7b80014 */ swc1 $f24,0x14($sp)
/* f19fee0: 8ea30464 */ lw $v1,0x464($s5)
.L0f19fee4:
@@ -5430,7 +5430,7 @@ glabel var7f1b94e4
/* f199c08: 240505db */ addiu $a1,$zero,0x5db
/* f199c0c: 00003025 */ or $a2,$zero,$zero
/* f199c10: 2407ffff */ addiu $a3,$zero,-1
/* f199c14: 0c004338 */ jal audioStart
/* f199c14: 0c004338 */ jal sndStart
/* f199c18: e7b80014 */ swc1 $f24,0x14($sp)
/* f199c1c: 3c048009 */ lui $a0,0x8009
/* f199c20: 2484b908 */ addiu $a0,$a0,-18168
@@ -5451,7 +5451,7 @@ glabel var7f1b94e4
/* f199c58: 240505dc */ addiu $a1,$zero,0x5dc
/* f199c5c: 00003025 */ or $a2,$zero,$zero
/* f199c60: 2407ffff */ addiu $a3,$zero,-1
/* f199c64: 0c004338 */ jal audioStart
/* f199c64: 0c004338 */ jal sndStart
/* f199c68: e7b80014 */ swc1 $f24,0x14($sp)
/* f199c6c: 3c048009 */ lui $a0,0x8009
/* f199c70: 2484b7ec */ addiu $a0,$a0,-18452
@@ -5626,7 +5626,7 @@ glabel var7f1b94e4
/* f199ed4: 240505d4 */ addiu $a1,$zero,0x5d4
/* f199ed8: 00003025 */ or $a2,$zero,$zero
/* f199edc: 2407ffff */ addiu $a3,$zero,-1
/* f199ee0: 0c004338 */ jal audioStart
/* f199ee0: 0c004338 */ jal sndStart
/* f199ee4: e7b80014 */ swc1 $f24,0x14($sp)
/* f199ee8: 8ea30464 */ lw $v1,0x464($s5)
.NB0f199eec:
@@ -6420,11 +6420,11 @@ glabel var7f1b94e4
// func0f0f85e0(&g_FrTrainingInfoPreGameMenuDialog, MENUROOT_TRAINING);
// break;
// case FRMENUTYPE_FAILED:
// audioStart(var80095200, SFX_TRAINING_FAIL, NULL, -1, -1, -1, -1, -1);
// sndStart(var80095200, SFX_TRAINING_FAIL, NULL, -1, -1, -1, -1, -1);
// func0f0f85e0(&g_FrFailedMenuDialog, MENUROOT_TRAINING);
// break;
// case FRMENUTYPE_COMPLETED:
// audioStart(var80095200, SFX_TRAINING_COMPLETE, NULL, -1, -1, -1, -1, -1);
// sndStart(var80095200, SFX_TRAINING_COMPLETE, NULL, -1, -1, -1, -1, -1);
// func0f0f85e0(&g_FrCompletedMenuDialog, MENUROOT_TRAINING);
// func0f1094e4(&g_FilemgrLoadedMainFile, 0, 0);
// break;
@@ -6537,7 +6537,7 @@ glabel var7f1b94e4
// if (g_FrData.numshots == 0) {
// if (g_FrData.donealarm == false && g_FrData.timetaken > -180) {
// g_FrData.donealarm = true;
// audioStart(var80095200, SFX_FR_ALARM, NULL, -1, -1, -1, -1, -1);
// sndStart(var80095200, SFX_FR_ALARM, NULL, -1, -1, -1, -1, -1);
// }
//
// if (!g_FrData.donelighting && g_FrData.timetaken > -225) {
src/game/weather/weather.c
+8 -8
View File
@@ -4,12 +4,12 @@
#include "game/game_0b3350.h"
#include "game/sparks/sparks.h"
#include "game/weather/weather.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/file.h"
#include "game/core.h"
#include "game/lv.h"
#include "bss.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/memory.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"
@@ -319,20 +319,20 @@ void weatherTickRain(struct weatherdata *weather)
iVar10 = weather->unk58[i].unk00 * 32767.0f * weather->unk88;
if (coreIsPaused()) {
if (lvIsPaused()) {
iVar10 = 0;
}
if (iVar10 > 0) {
if (weather->audiohandles[i] == 0 && sounds[i] >= 0) {
weather->unkf8 = sounds[i];
audioStart(var80095200, weather->unkf8, &weather->audiohandles[i], -1,
sndStart(var80095200, weather->unkf8, &weather->audiohandles[i], -1,
-1, -1, -1, -1);
}
if (weather->audiohandles[i] != 0) {
if (audioIsPlaying(weather->audiohandles[i])) {
audioAdjust(&weather->audiohandles[i], 0, iVar10 * 3 / 4, -1,
sndAdjust(&weather->audiohandles[i], 0, iVar10 * 3 / 4, -1,
weather->unkf8, 1, 1, -1, 1);
}
}
@@ -1509,7 +1509,7 @@ glabel var7f1b5780
/* f1337e8: afad0018 */ sw $t5,0x18($sp)
/* f1337ec: afac0010 */ sw $t4,0x10($sp)
/* f1337f0: 8c845200 */ lw $a0,%lo(var80095200)($a0)
/* f1337f4: 0c004241 */ jal audioStart
/* f1337f4: 0c004241 */ jal sndStart
/* f1337f8: e7aa0014 */ swc1 $f10,0x14($sp)
/* f1337fc: 8faf0dec */ lw $t7,0xdec($sp)
/* f133800: 3c013f80 */ lui $at,0x3f80
@@ -1544,7 +1544,7 @@ glabel var7f1b5780
/* f13386c: afaf001c */ sw $t7,0x1c($sp)
/* f133870: afb80018 */ sw $t8,0x18($sp)
/* f133874: afae0010 */ sw $t6,0x10($sp)
/* f133878: 0c004128 */ jal audioAdjust
/* f133878: 0c004128 */ jal sndAdjust
/* f13387c: e7a40014 */ swc1 $f4,0x14($sp)
/* f133880: 8fb90dec */ lw $t9,0xdec($sp)
/* f133884: 24050010 */ addiu $a1,$zero,0x10
src/include/game/room.h → src/include/game/bg.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef IN_GAME_ROOM_H
#define IN_GAME_ROOM_H
#ifndef IN_GAME_BG_H
#define IN_GAME_BG_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
src/include/game/core.h
-41
View File
@@ -1,41 +0,0 @@
#ifndef _IN_GAME_CORE_H
#define _IN_GAME_CORE_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
u32 getVar80084040(void);
void func0f167af8(void);
void coreStopAllMiscSfx(void);
s32 coreGetMiscSfxIndex(u32 arg0);
void coreSetMiscSfxState(u32 type, bool play);
void coreUpdateMiscSfx(void);
void coreLoadStage(s32 stagenum);
Gfx *coreRenderFade(Gfx *gdl);
void coreCancelFade(void);
bool coreCheckCmpFollowThreat(struct threat *threat, s32 index);
void coreFindThreatsForProp(struct prop *prop, bool inchild, struct coord *playerpos, s32 *activeslots, f32 *param_5);
void func0f168f24(struct prop *prop, bool inchild, struct coord *playerpos, s32 *activeslots, f32 *distances);
void coreFindThreats(void);
Gfx *coreRender(Gfx *gdl);
void coreUpdateSoloHandicaps(void);
s32 sub54321(s32 value);
void coreUpdateCutsceneTime(void);
s32 coreGetSlowMotionType(void);
void coreTick(void);
void coreRecordDistanceMoved(void);
void coreCheckPauseStateChanged(void);
void coreSetPaused(bool paused);
void coreConfigureFade(u32 color, s16 num_frames);
bool coreIsFadeActive(void);
void coreUnloadStage(void);
bool coreIsPaused(void);
s32 coreGetDifficulty(void);
void coreSetDifficulty(s32 difficulty);
void coreSetMpTimeLimit60(u32 limit);
void coreSetMpScoreLimit(u32 limit);
void coreSetMpTeamScoreLimit(u32 limit);
f32 coreGetStageTimeInSeconds(void);
s32 coreGetStageTime60(void);
#endif
src/include/game/lv.h
+41
View File
@@ -0,0 +1,41 @@
#ifndef _IN_GAME_LV_H
#define _IN_GAME_LV_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
u32 getVar80084040(void);
void lv0f167af8(void);
void lvStopAllMiscSfx(void);
s32 lvGetMiscSfxIndex(u32 arg0);
void lvSetMiscSfxState(u32 type, bool play);
void lvUpdateMiscSfx(void);
void lvInit(s32 stagenum);
Gfx *lvRenderFade(Gfx *gdl);
void lvCancelFade(void);
bool lvCheckCmpFollowThreat(struct threat *threat, s32 index);
void lvFindThreatsForProp(struct prop *prop, bool inchild, struct coord *playerpos, s32 *activeslots, f32 *param_5);
void func0f168f24(struct prop *prop, bool inchild, struct coord *playerpos, s32 *activeslots, f32 *distances);
void lvFindThreats(void);
Gfx *lvRender(Gfx *gdl);
void lvUpdateSoloHandicaps(void);
s32 sub54321(s32 value);
void lvUpdateCutsceneTime(void);
s32 lvGetSlowMotionType(void);
void lvTick(void);
void lvRecordDistanceMoved(void);
void lvCheckPauseStateChanged(void);
void lvSetPaused(bool paused);
void lvConfigureFade(u32 color, s16 num_frames);
bool lvIsFadeActive(void);
void lvReset(void);
bool lvIsPaused(void);
s32 lvGetDifficulty(void);
void lvSetDifficulty(s32 difficulty);
void lvSetMpTimeLimit60(u32 limit);
void lvSetMpScoreLimit(u32 limit);
void lvSetMpTeamScoreLimit(u32 limit);
f32 lvGetStageTimeInSeconds(void);
s32 lvGetStageTime60(void);
#endif
src/include/game/texture.h → src/include/game/texdecompress.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef IN_GAME_TEXTURE_H
#define IN_GAME_TEXTURE_H
#ifndef IN_GAME_TEXDECOMPRESS_H
#define IN_GAME_TEXDECOMPRESS_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
src/include/lib/entry.h → src/include/lib/boot.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef _IN_BOOT_ENTRY_H
#define _IN_BOOT_ENTRY_H
#ifndef _IN_LIB_BOOT_H
#define _IN_LIB_BOOT_H
#include <ultra64.h>
void boot(void);
src/include/lib/controller.h
-57
View File
@@ -1,57 +0,0 @@
#ifndef _IN_LIB_CONTROLLER_H
#define _IN_LIB_CONTROLLER_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
void func00013900(void);
void func00013938(void);
void func00013974(u32 value);
u32 func00013980(void);
void func0001398c(s32 value);
void func000139c8(void);
s32 contShiftPfsStates(void);
void contRecordPfsState(u8 pfsstate);
void contCheckPfs(s32 arg0);
void contSetPfsTemporarilyPlugged(s8 index);
void contSystemInit(void);
void contDisableTemporarily(void);
void func00013dfc(void);
void func00013e84(void);
u32 contGetConnectedControllers(void);
void contConsumeSamples(struct contdata *contdata);
void func00014238(void);
void contDebugJoy(void);
s32 contStartReadData(OSMesgQueue *mq);
void contReadData(void);
void contPoll(void);
void func00014810(bool value);
s32 contGetNumSamples(void);
s32 contGetStickXOnSample(s32 samplenum, s8 contpadnum);
s32 contGetStickYOnSample(s32 samplenum, s8 contpadnum);
s32 contGetStickYOnSampleIndex(s32 samplenum, s8 contpadnum);
u16 contGetButtonsOnSample(s32 samplenum, s8 contpadnum, u16 mask);
u16 contGetButtonsPressedOnSample(s32 samplenum, s8 contpadnum, u16 mask);
s32 contCountButtonsOnSpecificSamples(u32 *arg0, s8 contpadnum, u16 mask);
s8 contGetStickX(s8 contpadnum);
s8 contGetStickY(s8 contpadnum);
u16 contGetButtons(s8 contpadnum, u16 mask);
u16 contGetButtonsPressedThisFrame(s8 contpadnum, u16 mask);
s32 func000150c4(void);
#if VERSION >= VERSION_NTSC_1_0
void func000150e8(void);
void func00015144(void);
#else
void func000150e8(s32 line, char *file);
void func00015144(s32 line, char *file);
#endif
void func0001519c(void);
void func000152d0(s8 playernum, s32 *arg1, s32 *arg2);
void func000153c4(s8 arg0, s32 arg1);
s32 func000155b4(s8 index);
s32 func000155f4(s8 index);
void func0001561c(void);
#endif
src/include/lib/joy.h
+57
View File
@@ -0,0 +1,57 @@
#ifndef _IN_LIB_JOY_H
#define _IN_LIB_JOY_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
void joy00013900(void);
void joy00013938(void);
void joy00013974(u32 value);
u32 joy00013980(void);
void joy0001398c(s32 value);
void joy000139c8(void);
s32 joyShiftPfsStates(void);
void joyRecordPfsState(u8 pfsstate);
void joyCheckPfs(s32 arg0);
void joySetPfsTemporarilyPlugged(s8 index);
void joySystemInit(void);
void joyDisableTemporarily(void);
void joy00013dfc(void);
void joy00013e84(void);
u32 joyGetConnectedControllers(void);
void joyConsumeSamples(struct joydata *joydata);
void joy00014238(void);
void joyDebugJoy(void);
s32 joyStartReadData(OSMesgQueue *mq);
void joyReadData(void);
void joyPoll(void);
void joy00014810(bool value);
s32 joyGetNumSamples(void);
s32 joyGetStickXOnSample(s32 samplenum, s8 contpadnum);
s32 joyGetStickYOnSample(s32 samplenum, s8 contpadnum);
s32 joyGetStickYOnSampleIndex(s32 samplenum, s8 contpadnum);
u16 joyGetButtonsOnSample(s32 samplenum, s8 contpadnum, u16 mask);
u16 joyGetButtonsPressedOnSample(s32 samplenum, s8 contpadnum, u16 mask);
s32 joyCountButtonsOnSpecificSamples(u32 *arg0, s8 contpadnum, u16 mask);
s8 joyGetStickX(s8 contpadnum);
s8 joyGetStickY(s8 contpadnum);
u16 joyGetButtons(s8 contpadnum, u16 mask);
u16 joyGetButtonsPressedThisFrame(s8 contpadnum, u16 mask);
s32 joy000150c4(void);
#if VERSION >= VERSION_NTSC_1_0
void joy000150e8(void);
void joy00015144(void);
#else
void joy000150e8(s32 line, char *file);
void joy00015144(s32 line, char *file);
#endif
void joy0001519c(void);
void joy000152d0(s8 playernum, s32 *arg1, s32 *arg2);
void joy000153c4(s8 arg0, s32 arg1);
s32 joy000155b4(s8 index);
s32 joy000155f4(s8 index);
void joy0001561c(void);
#endif
src/include/lib/lib_0e9d0.h
-46
View File
@@ -1,46 +0,0 @@
#ifndef _IN_LIB_LIB_0E9D0_H
#define _IN_LIB_LIB_0E9D0_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
bool audioIsFiltered(s32 audioid);
u32 func0000e9d0(void);
u32 func0000e9dc(void);
void audioSetSfxVolume(u16 volume);
u32 func0000ea80(void);
void func0000eadc(void);
u32 func0000eb2c(void);
u32 func0000ed14(void);
u32 func0000ed68(void);
u32 func0000ee88(void);
u32 func0000efa8(void);
u32 func0000f0d4(void);
u32 func0000f228(void);
void audioSetSoundMode(s32 mode);
u32 func0000f49c(void);
u32 func0000f67c(void);
u32 func0000f804(void);
bool func0000fba0(s32 soundnum);
void func0000fbc4(s16 arg0);
u32 func0000fc48(void);
u32 func0000fd74(void);
void func0000fd9c(struct var80094ed8 *arg0, u16 volume);
void func0000fe18(void);
void func0000fe20(void);
void func0000fe50(void);
void func0000fe88(void);
u32 func00010360(void);
u32 func0001036c(void);
void audioAdjust(struct audiohandle **handle, u32 arg1, u32 arg2, s32 speakerweight, s16 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8);
struct audiohandle *func00010718(struct audiohandle **handle, s32 arg1, s32 arg2, s32 arg3, s32 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8);
struct audiohandle *audioStart(s32 arg0, s16 sound, struct audiohandle **handle, s32 arg3, s32 arg4, f32 arg5, s32 arg6, s32 arg7);
u32 func00010ae4(void);
void envPlayNosedive(s32 room_id);
void envStopNosedive(void);
u32 func00010e10(void);
void envPlayUfoHum(s32 value);
void envStopUfoHum(void);
u32 func0001111c(void);
#endif
src/include/lib/snd.h
+46
View File
@@ -0,0 +1,46 @@
#ifndef _IN_LIB_SND_H
#define _IN_LIB_SND_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
bool sndIsFiltered(s32 audioid);
u32 snd0000e9d0(void);
u32 snd0000e9dc(void);
void sndSetSfxVolume(u16 volume);
u32 snd0000ea80(void);
void snd0000eadc(void);
u32 snd0000eb2c(void);
u32 snd0000ed14(void);
u32 snd0000ed68(void);
u32 snd0000ee88(void);
u32 snd0000efa8(void);
u32 snd0000f0d4(void);
u32 snd0000f228(void);
void sndSetSoundMode(s32 mode);
u32 snd0000f49c(void);
u32 snd0000f67c(void);
u32 snd0000f804(void);
bool snd0000fba0(s32 soundnum);
void snd0000fbc4(s16 arg0);
u32 snd0000fc48(void);
u32 snd0000fd74(void);
void snd0000fd9c(struct var80094ed8 *arg0, u16 volume);
void snd0000fe18(void);
void snd0000fe20(void);
void snd0000fe50(void);
void snd0000fe88(void);
u32 snd00010360(void);
u32 snd0001036c(void);
void sndAdjust(struct audiohandle **handle, u32 arg1, u32 arg2, s32 speakerweight, s16 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8);
struct audiohandle *snd00010718(struct audiohandle **handle, s32 arg1, s32 arg2, s32 arg3, s32 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8);
struct audiohandle *sndStart(s32 arg0, s16 sound, struct audiohandle **handle, s32 arg3, s32 arg4, f32 arg5, s32 arg6, s32 arg7);
u32 snd00010ae4(void);
void sndPlayNosedive(s32 room_id);
void sndStopNosedive(void);
u32 snd00010e10(void);
void sndPlayUfoHum(s32 value);
void sndStopUfoHum(void);
u32 snd0001111c(void);
#endif
src/include/types.h
+1 -1
View File
@@ -6762,7 +6762,7 @@ struct contsample {
OSContPad pads[4];
};
struct contdata {
struct joydata {
struct contsample samples[20];
s32 curlast;
s32 curstart;
src/lib/entry.c → src/lib/boot.c
+2 -2
View File
@@ -1,5 +1,5 @@
#include <ultra64.h>
#include "lib/entry.h"
#include "lib/boot.h"
#include "constants.h"
#include "game/game_0e0770.h"
#include "bss.h"
@@ -8,7 +8,7 @@
#include "lib/lib_09660.h"
#include "lib/lib_0c000.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/lib_13710.h"
#include "lib/lib_13750.h"
#include "lib/lib_2fa00.h"
src/lib/init.c
+2 -2
View File
@@ -1,5 +1,5 @@
#include <ultra64.h>
#include "lib/entry.h"
#include "lib/boot.h"
#include "lib/init.h"
#include "lib/reset.h"
#include "lib/segments.h"
@@ -11,7 +11,7 @@
#include "lib/lib_09660.h"
#include "lib/lib_0c000.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/lib_13710.h"
#include "lib/lib_13750.h"
#include "lib/lib_2fa00.h"
src/lib/controller.c → src/lib/joy.c
+238 -238
View File
File diff suppressed because it is too large Load Diff
src/lib/lib_070d0.c
+1 -1
View File
@@ -1,5 +1,5 @@
#include <ultra64.h>
#include "lib/entry.h"
#include "lib/boot.h"
#include "constants.h"
#include "bss.h"
#include "lib/lib_074f0.h"
src/lib/lib_0c000.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "bss.h"
#include "lib/entry.h"
#include "lib/boot.h"
#include "lib/lib_09660.h"
#include "lib/lib_0c000.h"
#include "lib/lib_2fa00.h"
src/lib/lib_11420.c
+3 -3
View File
@@ -3,7 +3,7 @@
#include "game/music.h"
#include "game/game_176080.h"
#include "bss.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/lib_11420.h"
#include "lib/lib_38d10.h"
#include "lib/lib_39c80.h"
@@ -142,13 +142,13 @@ glabel var70053fd8
/* 11540: 8e2400f8 */ lw $a0,0xf8($s1)
/* 11544: 14400014 */ bnez $v0,.L00011598
/* 11548: 02202025 */ or $a0,$s1,$zero
/* 1154c: 0c003f12 */ jal func0000fc48
/* 1154c: 0c003f12 */ jal snd0000fc48
/* 11550: 8ea50004 */ lw $a1,0x4($s5)
/* 11554: 10400014 */ beqz $v0,.L000115a8
/* 11558: 02202025 */ or $a0,$s1,$zero
/* 1155c: 96a50010 */ lhu $a1,0x10($s5)
/* 11560: 240c0002 */ addiu $t4,$zero,0x2
/* 11564: 0c003f67 */ jal func0000fd9c
/* 11564: 0c003f67 */ jal snd0000fd9c
/* 11568: afac0044 */ sw $t4,0x44($sp)
/* 1156c: 3c0e800b */ lui $t6,%hi(var800aaa38)
/* 11570: 25ceaa38 */ addiu $t6,$t6,%lo(var800aaa38)
src/lib/lib_233c0.c
+1 -1
View File
@@ -2,7 +2,7 @@
#include "constants.h"
#include "game/prop.h"
#include "game/game_1531a0.h"
#include "game/room.h"
#include "game/bg.h"
#include "bss.h"
#include "lib/dma.h"
#include "lib/memory.h"
src/lib/lib_24e40.c
+1 -1
View File
@@ -2,7 +2,7 @@
#include "constants.h"
#include "game/prop.h"
#include "game/game_1531a0.h"
#include "game/room.h"
#include "game/bg.h"
#include "bss.h"
#include "lib/dma.h"
#include "lib/memory.h"
src/lib/lib_317f0.c
+5 -5
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "bss.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/lib_2faf0.h"
#include "lib/lib_2fc60.h"
#include "lib/lib_30ce0.h"
@@ -4068,7 +4068,7 @@ glabel func00033820
/* 33838: afa00058 */ sw $zero,0x58($sp)
/* 3383c: a7a0004e */ sh $zero,0x4e($sp)
/* 33840: afa00040 */ sw $zero,0x40($sp)
/* 33844: 0c0040d8 */ jal func00010360
/* 33844: 0c0040d8 */ jal snd00010360
/* 33848: 00000000 */ nop
/* 3384c: 10400003 */ beqz $v0,.L0003385c
/* 33850: 00000000 */ nop
@@ -4079,7 +4079,7 @@ glabel func00033820
/* 33860: 11c000a2 */ beqz $t6,.L00033aec
/* 33864: 00000000 */ nop
.L00033868:
/* 33868: 0c003d27 */ jal func0000f49c
/* 33868: 0c003d27 */ jal snd0000f49c
/* 3386c: 87a40066 */ lh $a0,0x66($sp)
/* 33870: afa20050 */ sw $v0,0x50($sp)
/* 33874: 8fa40060 */ lw $a0,0x60($sp)
@@ -4276,7 +4276,7 @@ glabel func00033820
/* 34dc8: afa00058 */ sw $zero,0x58($sp)
/* 34dcc: a7a0004e */ sh $zero,0x4e($sp)
/* 34dd0: afa00040 */ sw $zero,0x40($sp)
/* 34dd4: 0c0041df */ jal func00010360
/* 34dd4: 0c0041df */ jal snd00010360
/* 34dd8: 00000000 */ sll $zero,$zero,0x0
/* 34ddc: 10400003 */ beqz $v0,.NB00034dec
/* 34de0: 00000000 */ sll $zero,$zero,0x0
@@ -4287,7 +4287,7 @@ glabel func00033820
/* 34df0: 11c0009d */ beqz $t6,.NB00035068
/* 34df4: 00000000 */ sll $zero,$zero,0x0
.NB00034df8:
/* 34df8: 0c003e46 */ jal func0000f49c
/* 34df8: 0c003e46 */ jal snd0000f49c
/* 34dfc: 87a40066 */ lh $a0,0x66($sp)
/* 34e00: afa20050 */ sw $v0,0x50($sp)
/* 34e04: 8fa40060 */ lw $a0,0x60($sp)
src/lib/lib_34030.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "bss.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/lib_2faf0.h"
#include "lib/lib_2fc60.h"
#include "lib/lib_30ce0.h"
src/lib/lib_34240.c
+3 -3
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "bss.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/lib_2faf0.h"
#include "lib/lib_2fc60.h"
#include "lib/lib_30ce0.h"
@@ -3575,7 +3575,7 @@ glabel func00035110
.L0003672c:
/* 3672c: 1000021f */ b .L00036fac
/* 36730: 00000000 */ nop
/* 36734: 0c0040db */ jal func0001036c
/* 36734: 0c0040db */ jal snd0001036c
/* 36738: 93a400bf */ lbu $a0,0xbf($sp)
/* 3673c: 1000021b */ b .L00036fac
/* 36740: 00000000 */ nop
@@ -5802,7 +5802,7 @@ glabel func00035110
.L0003672c:
/* 3672c: 1000021f */ b .L00036fac
/* 36730: 00000000 */ nop
/* 36734: 0c0040db */ jal func0001036c
/* 36734: 0c0040db */ jal snd0001036c
/* 36738: 93a400bf */ lbu $a0,0xbf($sp)
/* 3673c: 1000021b */ b .L00036fac
/* 36740: 00000000 */ nop
src/lib/main.c
+63 -63
View File
@@ -28,7 +28,7 @@
#include "game/game_127910.h"
#include "game/game_1531a0.h"
#include "game/gfxmemory.h"
#include "game/core.h"
#include "game/lv.h"
#include "game/timing.h"
#include "game/music.h"
#include "game/stubs/game_175f50.h"
@@ -49,7 +49,7 @@
#include "lib/lib_0c000.h"
#include "lib/dma.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/memory.h"
#include "lib/lib_126b0.h"
#include "lib/lib_13750.h"
@@ -316,7 +316,7 @@ glabel mainInit
/* d2a8: 0c00bcc2 */ jal rmonIsDisabled
/* d2ac: 00000000 */ nop
/* d2b0: 3c018006 */ lui $at,0x8006
/* d2b4: 0c004e87 */ jal contSystemInit
/* d2b4: 0c004e87 */ jal joySystemInit
/* d2b8: ac22d650 */ sw $v0,-0x29b0($at)
/* d2bc: 27a41498 */ addiu $a0,$sp,0x1498
/* d2c0: 27a514d4 */ addiu $a1,$sp,0x14d4
@@ -344,7 +344,7 @@ glabel mainInit
/* d314: 24010001 */ li $at,0x1
/* d318: 56010006 */ bnel $s0,$at,.PF0000d334
/* d31c: 2a010002 */ slti $at,$s0,0x2
/* d320: 0c004ee1 */ jal func00013dfc
/* d320: 0c004ee1 */ jal joy00013dfc
/* d324: 00000000 */ nop
/* d328: 10000007 */ b .PF0000d348
/* d32c: 26100001 */ addiu $s0,$s0,0x1
@@ -352,7 +352,7 @@ glabel mainInit
.PF0000d334:
/* d334: 54200004 */ bnezl $at,.PF0000d348
/* d338: 26100001 */ addiu $s0,$s0,0x1
/* d33c: 0c00501e */ jal contDebugJoy
/* d33c: 0c00501e */ jal joyDebugJoy
/* d340: 00000000 */ nop
/* d344: 26100001 */ addiu $s0,$s0,0x1
.PF0000d348:
@@ -369,19 +369,19 @@ glabel mainInit
/* d370: 3c018006 */ lui $at,0x8006
/* d374: ac2bd650 */ sw $t3,-0x29b0($at)
.PF0000d378:
/* d378: 0c00533a */ jal contGetButtons
/* d378: 0c00533a */ jal joyGetButtons
/* d37c: 24051000 */ li $a1,0x1000
/* d380: 1440000f */ bnez $v0,.PF0000d3c0
/* d384: 24040001 */ li $a0,0x1
/* d388: 0c00533a */ jal contGetButtons
/* d388: 0c00533a */ jal joyGetButtons
/* d38c: 24051000 */ li $a1,0x1000
/* d390: 1440000b */ bnez $v0,.PF0000d3c0
/* d394: 24040002 */ li $a0,0x2
/* d398: 0c00533a */ jal contGetButtons
/* d398: 0c00533a */ jal joyGetButtons
/* d39c: 24051000 */ li $a1,0x1000
/* d3a0: 14400007 */ bnez $v0,.PF0000d3c0
/* d3a4: 24040003 */ li $a0,0x3
/* d3a8: 0c00533a */ jal contGetButtons
/* d3a8: 0c00533a */ jal joyGetButtons
/* d3ac: 24051000 */ li $a1,0x1000
/* d3b0: 14400003 */ bnez $v0,.PF0000d3c0
/* d3b4: 3c018006 */ lui $at,0x8006
@@ -622,7 +622,7 @@ glabel mainInit
/* d718: 00000000 */ nop
/* d71c: 0fc00000 */ jal func0f000000
/* d720: 00000000 */ nop
/* d724: 0fc5a29e */ jal func0f167af8
/* d724: 0fc5a29e */ jal lv0f167af8
/* d728: 00000000 */ nop
/* d72c: 0fc41f77 */ jal cheatsDisableAll
/* d730: 00000000 */ nop
@@ -719,7 +719,7 @@ glabel mainInit
/* d568: 0c00be82 */ jal rmonIsDisabled
/* d56c: 00000000 */ nop
/* d570: 3c018006 */ lui $at,%hi(var8005d9b0)
/* d574: 0c004f25 */ jal contSystemInit
/* d574: 0c004f25 */ jal joySystemInit
/* d578: ac22d9b0 */ sw $v0,%lo(var8005d9b0)($at)
/* d57c: 27a41490 */ addiu $a0,$sp,0x1490
/* d580: 27a514cc */ addiu $a1,$sp,0x14cc
@@ -747,7 +747,7 @@ glabel mainInit
/* d5d4: 24010001 */ addiu $at,$zero,0x1
/* d5d8: 56010006 */ bnel $s0,$at,.L0000d5f4
/* d5dc: 2a010002 */ slti $at,$s0,0x2
/* d5e0: 0c004f7f */ jal func00013dfc
/* d5e0: 0c004f7f */ jal joy00013dfc
/* d5e4: 00000000 */ nop
/* d5e8: 10000007 */ b .L0000d608
/* d5ec: 26100001 */ addiu $s0,$s0,0x1
@@ -755,7 +755,7 @@ glabel mainInit
.L0000d5f4:
/* d5f4: 54200004 */ bnezl $at,.L0000d608
/* d5f8: 26100001 */ addiu $s0,$s0,0x1
/* d5fc: 0c0050bc */ jal contDebugJoy
/* d5fc: 0c0050bc */ jal joyDebugJoy
/* d600: 00000000 */ nop
/* d604: 26100001 */ addiu $s0,$s0,0x1
.L0000d608:
@@ -772,19 +772,19 @@ glabel mainInit
/* d630: 3c018006 */ lui $at,%hi(var8005d9b0)
/* d634: ac2bd9b0 */ sw $t3,%lo(var8005d9b0)($at)
.L0000d638:
/* d638: 0c0053d8 */ jal contGetButtons
/* d638: 0c0053d8 */ jal joyGetButtons
/* d63c: 24051000 */ addiu $a1,$zero,0x1000
/* d640: 14400010 */ bnez $v0,.L0000d684
/* d644: 24040001 */ addiu $a0,$zero,0x1
/* d648: 0c0053d8 */ jal contGetButtons
/* d648: 0c0053d8 */ jal joyGetButtons
/* d64c: 24051000 */ addiu $a1,$zero,0x1000
/* d650: 1440000c */ bnez $v0,.L0000d684
/* d654: 24040002 */ addiu $a0,$zero,0x2
/* d658: 0c0053d8 */ jal contGetButtons
/* d658: 0c0053d8 */ jal joyGetButtons
/* d65c: 24051000 */ addiu $a1,$zero,0x1000
/* d660: 14400008 */ bnez $v0,.L0000d684
/* d664: 24040003 */ addiu $a0,$zero,0x3
/* d668: 0c0053d8 */ jal contGetButtons
/* d668: 0c0053d8 */ jal joyGetButtons
/* d66c: 24051000 */ addiu $a1,$zero,0x1000
/* d670: 14400004 */ bnez $v0,.L0000d684
/* d674: 3c108006 */ lui $s0,%hi(g_DoBootPakMenu)
@@ -1025,7 +1025,7 @@ glabel mainInit
/* d9dc: 00000000 */ nop
/* d9e0: 0fc00000 */ jal func0f000000
/* d9e4: 00000000 */ nop
/* d9e8: 0fc59ebe */ jal func0f167af8
/* d9e8: 0fc59ebe */ jal lv0f167af8
/* d9ec: 00000000 */ nop
/* d9f0: 0fc41d3b */ jal cheatsDisableAll
/* d9f4: 00000000 */ nop
@@ -1116,7 +1116,7 @@ glabel mainInit
/* dad0: 0c00c456 */ jal rmonIsDisabled
/* dad4: 00000000 */ sll $zero,$zero,0x0
/* dad8: 3c018006 */ lui $at,0x8006
/* dadc: 0c0052b6 */ jal contSystemInit
/* dadc: 0c0052b6 */ jal joySystemInit
/* dae0: ac22f2d0 */ sw $v0,-0xd30($at)
/* dae4: 27b11498 */ addiu $s1,$sp,0x1498
/* dae8: 27b214d4 */ addiu $s2,$sp,0x14d4
@@ -1144,7 +1144,7 @@ glabel mainInit
/* db3c: 24010001 */ addiu $at,$zero,0x1
/* db40: 56010006 */ bnel $s0,$at,.NB0000db5c
/* db44: 2a010002 */ slti $at,$s0,0x2
/* db48: 0c005310 */ jal func00013dfc
/* db48: 0c005310 */ jal joy00013dfc
/* db4c: 00000000 */ sll $zero,$zero,0x0
/* db50: 10000007 */ beqz $zero,.NB0000db70
/* db54: 26100001 */ addiu $s0,$s0,0x1
@@ -1152,7 +1152,7 @@ glabel mainInit
.NB0000db5c:
/* db5c: 54200004 */ bnezl $at,.NB0000db70
/* db60: 26100001 */ addiu $s0,$s0,0x1
/* db64: 0c005477 */ jal contDebugJoy
/* db64: 0c005477 */ jal joyDebugJoy
/* db68: 00000000 */ sll $zero,$zero,0x0
/* db6c: 26100001 */ addiu $s0,$s0,0x1
.NB0000db70:
@@ -1180,19 +1180,19 @@ glabel mainInit
/* dbbc: 1000ffff */ beqz $zero,.NB0000dbbc
/* dbc0: 00000000 */ sll $zero,$zero,0x0
.NB0000dbc4:
/* dbc4: 0c005790 */ jal contGetButtons
/* dbc4: 0c005790 */ jal joyGetButtons
/* dbc8: 24051000 */ addiu $a1,$zero,0x1000
/* dbcc: 1440009e */ bnez $v0,.NB0000de48
/* dbd0: 24040001 */ addiu $a0,$zero,0x1
/* dbd4: 0c005790 */ jal contGetButtons
/* dbd4: 0c005790 */ jal joyGetButtons
/* dbd8: 24051000 */ addiu $a1,$zero,0x1000
/* dbdc: 1440009a */ bnez $v0,.NB0000de48
/* dbe0: 24040002 */ addiu $a0,$zero,0x2
/* dbe4: 0c005790 */ jal contGetButtons
/* dbe4: 0c005790 */ jal joyGetButtons
/* dbe8: 24051000 */ addiu $a1,$zero,0x1000
/* dbec: 14400096 */ bnez $v0,.NB0000de48
/* dbf0: 24040003 */ addiu $a0,$zero,0x3
/* dbf4: 0c005790 */ jal contGetButtons
/* dbf4: 0c005790 */ jal joyGetButtons
/* dbf8: 24051000 */ addiu $a1,$zero,0x1000
/* dbfc: 14400092 */ bnez $v0,.NB0000de48
/* dc00: 3c0b8006 */ lui $t3,0x8006
@@ -1398,7 +1398,7 @@ glabel mainInit
/* deec: 00000000 */ sll $zero,$zero,0x0
/* def0: 0fc00000 */ jal func0f000000
/* def4: 00000000 */ sll $zero,$zero,0x0
/* def8: 0fc5890e */ jal func0f167af8
/* def8: 0fc5890e */ jal lv0f167af8
/* defc: 00000000 */ sll $zero,$zero,0x0
/* df00: 0fc40c5b */ jal cheatsDisableAll
/* df04: 00000000 */ sll $zero,$zero,0x0
@@ -1503,7 +1503,7 @@ const char var70053aa0[] = " -ml0 -me0 -mgfx100 -mvtx50 -mt700 -ma400";
// func00013758();
// func00009ab0();
// var8005d9b0 = rmonIsDisabled();
// contSystemInit();
// joySystemInit();
// osCreateMesgQueue(&queue, &msg, 1);
//
// for (i = 0; i < 4; i++) {
@@ -1511,9 +1511,9 @@ const char var70053aa0[] = " -ml0 -me0 -mgfx100 -mvtx50 -mt700 -ma400";
// osRecvMesg(&queue, &msg, OS_MESG_BLOCK);
//
// if (i == 1) {
// func00013dfc();
// joy00013dfc();
// } else if (i >= 2) {
// contDebugJoy();
// joyDebugJoy();
// }
// }
//
@@ -1522,10 +1522,10 @@ const char var70053aa0[] = " -ml0 -me0 -mgfx100 -mvtx50 -mt700 -ma400";
// }
//
// // If holding start on any controller, open boot pak menu
// if (contGetButtons(0, START_BUTTON) == 0
// && contGetButtons(1, START_BUTTON) == 0
// && contGetButtons(2, START_BUTTON) == 0
// && contGetButtons(3, START_BUTTON) == 0) {
// if (joyGetButtons(0, START_BUTTON) == 0
// && joyGetButtons(1, START_BUTTON) == 0
// && joyGetButtons(2, START_BUTTON) == 0
// && joyGetButtons(3, START_BUTTON) == 0) {
// g_DoBootPakMenu = false;
// } else {
// g_DoBootPakMenu = true;
@@ -1646,7 +1646,7 @@ const char var70053aa0[] = " -ml0 -me0 -mgfx100 -mvtx50 -mt700 -ma400";
// func000034d0();
// loadTextureList();
// func0f000000();
// func0f167af8();
// lv0f167af8();
// cheatsDisableAll();
// func0000e9c0();
// func0f1531a0();
@@ -1723,7 +1723,7 @@ void mainEntry(void)
{
mainInit();
func0002f8a0();
func0000f804();
snd0000f804();
while (true) {
mainLoop();
@@ -1766,7 +1766,7 @@ void mainLoop(void)
func0f01b148(0);
if (argFindByPrefix(1, "-hard")) {
coreSetDifficulty(argFindByPrefix(1, "-hard")[0] - '0');
lvSetDifficulty(argFindByPrefix(1, "-hard")[0] - '0');
}
}
}
@@ -1929,10 +1929,10 @@ void mainLoop(void)
}
gfxInitMemory();
func00013dfc();
joy00013dfc();
func00013798();
func0f17608c(g_StageNum);
coreLoadStage(g_StageNum);
lvInit(g_StageNum);
func00009c3c(g_StageNum);
frametimeCalculate();
func00009a90();
@@ -1967,7 +1967,7 @@ void mainLoop(void)
}
}
coreUnloadStage();
lvReset();
memDisablePool(MEMPOOL_STAGE);
memDisablePool(MEMPOOL_7);
func0f1672f0(4);
@@ -2094,7 +2094,7 @@ glabel mainLoop
/* e1e4: 0c004e18 */ jal argFindByPrefix
/* e1e8: 24a5512c */ addiu $a1,$a1,0x512c
/* e1ec: 90440000 */ lbu $a0,0x0($v0)
/* e1f0: 0fc59ed6 */ jal coreSetDifficulty
/* e1f0: 0fc59ed6 */ jal lvSetDifficulty
/* e1f4: 2484ffd0 */ addiu $a0,$a0,-48
.NB0000e1f8:
/* e1f8: 3c028006 */ lui $v0,0x8006
@@ -2458,7 +2458,7 @@ glabel mainLoop
.NB0000e708:
/* e708: 0fc58724 */ jal gfxInitMemory
/* e70c: 00000000 */ sll $zero,$zero,0x0
/* e710: 0c005310 */ jal func00013dfc
/* e710: 0c005310 */ jal joy00013dfc
/* e714: 00000000 */ sll $zero,$zero,0x0
/* e718: 0c005049 */ jal func00014124nb
/* e71c: 00000000 */ sll $zero,$zero,0x0
@@ -2466,7 +2466,7 @@ glabel mainLoop
/* e724: 0fc5c34b */ jal func0f17608c
/* e728: 8c84f2d4 */ lw $a0,-0xd2c($a0)
/* e72c: 3c048006 */ lui $a0,0x8006
/* e730: 0fc589ee */ jal coreLoadStage
/* e730: 0fc589ee */ jal lvInit
/* e734: 8c84f2d4 */ lw $a0,-0xd2c($a0)
/* e738: 3c048006 */ lui $a0,0x8006
/* e73c: 0c002778 */ jal func00009c3c
@@ -2557,7 +2557,7 @@ glabel mainLoop
/* e86c: 55c0ffca */ bnezl $t6,.NB0000e798
/* e870: 02602025 */ or $a0,$s3,$zero
.NB0000e874:
/* e874: 0fc59e56 */ jal coreUnloadStage
/* e874: 0fc59e56 */ jal lvReset
/* e878: 00000000 */ sll $zero,$zero,0x0
/* e87c: 0c004acc */ jal memDisablePool
/* e880: 24040004 */ addiu $a0,$zero,0x4
@@ -2604,7 +2604,7 @@ void mainTick(void)
func00009a90();
func00009aa0(0x20000);
func000034d8();
contDebugJoy();
joyDebugJoy();
func00001b28(0);
if (var8005d9c8) {
@@ -2613,7 +2613,7 @@ void mainTick(void)
gDPSetTile(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
gDPSetTile(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_4b, 0, 0x0100, 6, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
coreTick();
lvTick();
randomisePlayerOrder();
if (g_StageNum < STAGE_TITLE) {
@@ -2627,11 +2627,11 @@ void mainTick(void)
g_Vars.currentplayer->viewx, g_Vars.currentplayer->viewy);
}
coreRecordDistanceMoved();
lvRecordDistanceMoved();
}
}
gdl = coreRender(gdl);
gdl = lvRender(gdl);
func000034e0(&gdl);
if (debug0f11ed70() >= 2) {
@@ -2699,7 +2699,7 @@ glabel mainTick
/* e988: 3c040002 */ lui $a0,0x2
/* e98c: 0c000dbe */ jal func000034d8
/* e990: 00000000 */ sll $zero,$zero,0x0
/* e994: 0c005477 */ jal contDebugJoy
/* e994: 0c005477 */ jal joyDebugJoy
/* e998: 00000000 */ sll $zero,$zero,0x0
/* e99c: 0c00073e */ jal func00001b28
/* e9a0: 00002025 */ or $a0,$zero,$zero
@@ -2728,26 +2728,26 @@ glabel mainTick
/* e9fc: 8d08f678 */ lw $t0,-0x988($t0)
/* ea00: 15000006 */ bnez $t0,.NB0000ea1c
/* ea04: 00002025 */ or $a0,$zero,$zero
/* ea08: 0c005790 */ jal contGetButtons
/* ea08: 0c005790 */ jal joyGetButtons
/* ea0c: 2405000c */ addiu $a1,$zero,0xc
/* ea10: 2401000c */ addiu $at,$zero,0xc
/* ea14: 1441001a */ bne $v0,$at,.NB0000ea80
/* ea18: 00002025 */ or $a0,$zero,$zero
.NB0000ea1c:
/* ea1c: 0c00573c */ jal contGetStickX
/* ea1c: 0c00573c */ jal joyGetStickX
/* ea20: 00002025 */ or $a0,$zero,$zero
/* ea24: 00028e00 */ sll $s1,$v0,0x18
/* ea28: 00114e03 */ sra $t1,$s1,0x18
/* ea2c: 01208825 */ or $s1,$t1,$zero
/* ea30: 0c005766 */ jal contGetStickY
/* ea30: 0c005766 */ jal joyGetStickY
/* ea34: 00002025 */ or $a0,$zero,$zero
/* ea38: a3a2003b */ sb $v0,0x3b($sp)
/* ea3c: 00002025 */ or $a0,$zero,$zero
/* ea40: 0c005790 */ jal contGetButtons
/* ea40: 0c005790 */ jal joyGetButtons
/* ea44: 3405ffff */ dli $a1,0xffff
/* ea48: 3050ffff */ andi $s0,$v0,0xffff
/* ea4c: 00002025 */ or $a0,$zero,$zero
/* ea50: 0c0057c0 */ jal contGetButtonsPressedThisFrame
/* ea50: 0c0057c0 */ jal joyGetButtonsPressedThisFrame
/* ea54: 3405ffff */ dli $a1,0xffff
/* ea58: 00112600 */ sll $a0,$s1,0x18
/* ea5c: 00045603 */ sra $t2,$a0,0x18
@@ -2760,7 +2760,7 @@ glabel mainTick
/* ea78: 10000021 */ beqz $zero,.NB0000eb00
/* ea7c: ac22f678 */ sw $v0,-0x988($at)
.NB0000ea80:
/* ea80: 0c005790 */ jal contGetButtons
/* ea80: 0c005790 */ jal joyGetButtons
/* ea84: 24051000 */ addiu $a1,$zero,0x1000
/* ea88: 14400005 */ bnez $v0,.NB0000eaa0
/* ea8c: 3c0b8008 */ lui $t3,0x8008
@@ -2769,20 +2769,20 @@ glabel mainTick
/* ea98: 10000019 */ beqz $zero,.NB0000eb00
/* ea9c: ac2b86f0 */ sw $t3,-0x7910($at)
.NB0000eaa0:
/* eaa0: 0c00573c */ jal contGetStickX
/* eaa0: 0c00573c */ jal joyGetStickX
/* eaa4: 00002025 */ or $a0,$zero,$zero
/* eaa8: 00028e00 */ sll $s1,$v0,0x18
/* eaac: 00116603 */ sra $t4,$s1,0x18
/* eab0: 01808825 */ or $s1,$t4,$zero
/* eab4: 0c005766 */ jal contGetStickY
/* eab4: 0c005766 */ jal joyGetStickY
/* eab8: 00002025 */ or $a0,$zero,$zero
/* eabc: a3a2003b */ sb $v0,0x3b($sp)
/* eac0: 00002025 */ or $a0,$zero,$zero
/* eac4: 0c005790 */ jal contGetButtons
/* eac4: 0c005790 */ jal joyGetButtons
/* eac8: 3405ffff */ dli $a1,0xffff
/* eacc: 3050ffff */ andi $s0,$v0,0xffff
/* ead0: 00002025 */ or $a0,$zero,$zero
/* ead4: 0c0057c0 */ jal contGetButtonsPressedThisFrame
/* ead4: 0c0057c0 */ jal joyGetButtonsPressedThisFrame
/* ead8: 3405ffff */ dli $a1,0xffff
/* eadc: 00112600 */ sll $a0,$s1,0x18
/* eae0: 00046e03 */ sra $t5,$a0,0x18
@@ -2794,7 +2794,7 @@ glabel mainTick
/* eaf8: 3c018006 */ lui $at,0x8006
/* eafc: ac22f678 */ sw $v0,-0x988($at)
.NB0000eb00:
/* eb00: 0fc599c9 */ jal coreTick
/* eb00: 0fc599c9 */ jal lvTick
/* eb04: 00000000 */ sll $zero,$zero,0x0
/* eb08: 0fc48e7f */ jal randomisePlayerOrder
/* eb0c: 00000000 */ sll $zero,$zero,0x0
@@ -2864,7 +2864,7 @@ glabel mainTick
/* ebf4: 0c002feb */ jal viSetFovAspectAndSize
/* ebf8: 84470632 */ lh $a3,0x632($v0)
.NB0000ebfc:
/* ebfc: 0fc59e2f */ jal coreRecordDistanceMoved
/* ebfc: 0fc59e2f */ jal lvRecordDistanceMoved
/* ec00: 00000000 */ sll $zero,$zero,0x0
/* ec04: 8e0d006c */ lw $t5,0x6c($s0)
/* ec08: 26310001 */ addiu $s1,$s1,0x1
@@ -2901,7 +2901,7 @@ glabel mainTick
/* ec74: 1420ffca */ bnez $at,.NB0000eba0
/* ec78: 00000000 */ sll $zero,$zero,0x0
.NB0000ec7c:
/* ec7c: 0fc59012 */ jal coreRender
/* ec7c: 0fc59012 */ jal lvRender
/* ec80: 8fa40094 */ lw $a0,0x94($sp)
/* ec84: afa20094 */ sw $v0,0x94($sp)
/* ec88: 0c000dc0 */ jal func000034e0
@@ -3043,13 +3043,13 @@ glabel mainTick
void mainEndStage(void)
{
envStopNosedive();
sndStopNosedive();
if (var8005d9d0 == 0) {
#if VERSION >= VERSION_NTSC_1_0
func0f11c6d0();
#endif
contDisableTemporarily();
joyDisableTemporarily();
if (g_Vars.coopplayernum >= 0) {
s32 prevplayernum = g_Vars.currentplayernum;
src/lib/model.c
+1 -1
View File
@@ -6,7 +6,7 @@
#include "game/floor.h"
#include "game/ceil.h"
#include "game/game_0b3350.h"
#include "game/room.h"
#include "game/bg.h"
#include "game/file.h"
#include "bss.h"
#include "lib/rng.h"
src/lib/reset.c
+2 -2
View File
@@ -99,7 +99,7 @@ glabel resetproc
/* 2f08: 1420ffed */ bnez $at,.PF00002ec0
/* 2f0c: 00000000 */ nop
.PF00002f10:
/* 2f10: 0c0053c9 */ jal func0001519c
/* 2f10: 0c0053c9 */ jal joy0001519c
/* 2f14: 00000000 */ nop
.PF00002f18:
/* 2f18: 1000ffff */ b .PF00002f18
@@ -198,7 +198,7 @@ glabel resetproc
/* 2f30: 00000000 */ nop
.L00002f34:
/* 2f34: 3c048006 */ lui $a0,%hi(osViModeTable+0xa0)
/* 2f38: 0c005467 */ jal func0001519c
/* 2f38: 0c005467 */ jal joy0001519c
/* 2f3c: 2484f7b0 */ addiu $a0,$a0,%lo(osViModeTable+0xa0)
.L00002f40:
/* 2f40: 1000ffff */ b .L00002f40
src/lib/sched.c
+3 -3
View File
@@ -10,7 +10,7 @@
#include "lib/lib_09660.h"
#include "lib/lib_0c000.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
#include "lib/snd.h"
#include "lib/lib_13710.h"
#include "lib/lib_13750.h"
#include "lib/lib_2fa00.h"
@@ -284,8 +284,8 @@ void func00002078(OSSched *sc)
func00009ed4();
}
contPoll();
func0000fe18();
joyPoll();
snd0000fe18();
func00001b98(sc->frameCount);
}
src/lib/lib_0e9d0.c → src/lib/snd.c
+138 -138
View File
File diff suppressed because it is too large Load Diff