diff --git a/docs/piracychecks.md b/docs/piracychecks.md index 7cb949e29..22d5aa654 100644 --- a/docs/piracychecks.md +++ b/docs/piracychecks.md @@ -70,7 +70,7 @@ The decomp project wraps all decompiled piracy checks in `#if PIRACYCHECKS` stat --- -### coreGetSlowMotionType +### lvGetSlowMotionType **When Called:** On each tick when unpaused. @@ -78,11 +78,11 @@ The decomp project wraps all decompiled piracy checks in `#if PIRACYCHECKS` stat **Payload:** Corrupts the rspboot microcode, causing a crash. -### coreLoadStage +### lvInit **When Called:** When loading any stage (including title screen). -**What It Checks:** Checksums `coreGetSlowMotionType` to make sure it hasn't been modified. +**What It Checks:** Checksums `lvGetSlowMotionType` to make sure it hasn't been modified. **Payload:** Writes 16 bytes of data to the start of EEPROM. Unsure what this does, but it's probably corrupting it. @@ -90,7 +90,7 @@ The decomp project wraps all decompiled piracy checks in `#if PIRACYCHECKS` stat **When Called:** When loading any stage that uses the eyespy. -**What It Checks:** Checksums `coreLoadStage` to make sure it hasn't been modified. +**What It Checks:** Checksums `lvInit` to make sure it hasn't been modified. **Payload:** Nops `func00012914` entirely. Unsure what effect this has. This means any time that function is called it'll flow into the following function, which just returns. diff --git a/ld/gamefiles.ntsc-beta.inc b/ld/gamefiles.ntsc-beta.inc index 18f8d9dd3..fe7e30d48 100644 --- a/ld/gamefiles.ntsc-beta.inc +++ b/ld/gamefiles.ntsc-beta.inc @@ -161,8 +161,8 @@ build/ROMID/game/game_152fa0.o (section); \ build/ROMID/game/game_1531a0.o (section); \ build/ROMID/game/game_1577f0.o (section); \ - build/ROMID/game/room.o (section); \ - build/ROMID/game/roombss.o (section); \ + build/ROMID/game/bg.o (section); \ + build/ROMID/game/bgbss.o (section); \ build/ROMID/game/game_165360.o (section); \ build/ROMID/game/game_1655c0.o (section); \ build/ROMID/game/game_165670.o (section); \ @@ -170,11 +170,11 @@ build/ROMID/game/game_1668e0.o (section); \ build/ROMID/game/file.o (section); \ build/ROMID/game/gfxmemory.o (section); \ - build/ROMID/game/core.o (section); \ + build/ROMID/game/lv.o (section); \ build/ROMID/game/timing.o (section); \ build/ROMID/game/music.o (section); \ build/ROMID/game/lang.o (section); \ - build/ROMID/game/texture.o (section); \ + build/ROMID/game/texdecompress.o (section); \ build/ROMID/game/game_173520.o (section); \ build/ROMID/game/game_173a00.o (section); \ build/ROMID/game/stubs/game_175f50.o (section); \ diff --git a/ld/gamefiles.ntsc-final.inc b/ld/gamefiles.ntsc-final.inc index 732402f20..7852399ff 100644 --- a/ld/gamefiles.ntsc-final.inc +++ b/ld/gamefiles.ntsc-final.inc @@ -160,8 +160,8 @@ build/ROMID/game/game_152fa0.o (section); \ build/ROMID/game/game_1531a0.o (section); \ build/ROMID/game/game_1577f0.o (section); \ - build/ROMID/game/room.o (section); \ - build/ROMID/game/roombss.o (section); \ + build/ROMID/game/bg.o (section); \ + build/ROMID/game/bgbss.o (section); \ build/ROMID/game/game_165360.o (section); \ build/ROMID/game/game_1655c0.o (section); \ build/ROMID/game/game_165670.o (section); \ @@ -169,11 +169,11 @@ build/ROMID/game/game_1668e0.o (section); \ build/ROMID/game/file.o (section); \ build/ROMID/game/gfxmemory.o (section); \ - build/ROMID/game/core.o (section); \ + build/ROMID/game/lv.o (section); \ build/ROMID/game/timing.o (section); \ build/ROMID/game/music.o (section); \ build/ROMID/game/lang.o (section); \ - build/ROMID/game/texture.o (section); \ + build/ROMID/game/texdecompress.o (section); \ build/ROMID/game/game_173520.o (section); \ build/ROMID/game/game_173a00.o (section); \ build/ROMID/game/stubs/game_175f50.o (section); \ diff --git a/ld/gamefiles.pal-final.inc b/ld/gamefiles.pal-final.inc index 732402f20..7852399ff 100644 --- a/ld/gamefiles.pal-final.inc +++ b/ld/gamefiles.pal-final.inc @@ -160,8 +160,8 @@ build/ROMID/game/game_152fa0.o (section); \ build/ROMID/game/game_1531a0.o (section); \ build/ROMID/game/game_1577f0.o (section); \ - build/ROMID/game/room.o (section); \ - build/ROMID/game/roombss.o (section); \ + build/ROMID/game/bg.o (section); \ + build/ROMID/game/bgbss.o (section); \ build/ROMID/game/game_165360.o (section); \ build/ROMID/game/game_1655c0.o (section); \ build/ROMID/game/game_165670.o (section); \ @@ -169,11 +169,11 @@ build/ROMID/game/game_1668e0.o (section); \ build/ROMID/game/file.o (section); \ build/ROMID/game/gfxmemory.o (section); \ - build/ROMID/game/core.o (section); \ + build/ROMID/game/lv.o (section); \ build/ROMID/game/timing.o (section); \ build/ROMID/game/music.o (section); \ build/ROMID/game/lang.o (section); \ - build/ROMID/game/texture.o (section); \ + build/ROMID/game/texdecompress.o (section); \ build/ROMID/game/game_173520.o (section); \ build/ROMID/game/game_173a00.o (section); \ build/ROMID/game/stubs/game_175f50.o (section); \ diff --git a/ld/libfiles.ntsc-beta.inc b/ld/libfiles.ntsc-beta.inc index 0e6d23b2d..d9d4eea83 100644 --- a/ld/libfiles.ntsc-beta.inc +++ b/ld/libfiles.ntsc-beta.inc @@ -1,5 +1,5 @@ #define LIBFILES(section) \ - build/ROMID/lib/entry.o (section); \ + build/ROMID/lib/boot.o (section); \ build/ROMID/lib/segments.o (section); \ build/ROMID/lib/init.o (section); \ build/ROMID/lib/sched.o (section); \ @@ -34,7 +34,7 @@ build/ROMID/lib/lib_0c000.o (section); \ build/ROMID/lib/dma.o (section); \ build/ROMID/lib/main.o (section); \ - build/ROMID/lib/lib_0e9d0.o (section); \ + build/ROMID/lib/snd.o (section); \ build/ROMID/lib/lib_11420.o (section); \ build/ROMID/lib/memory.o (section); \ build/ROMID/lib/lib_126b0.o (section); \ @@ -46,7 +46,7 @@ build/ROMID/lib/lib_13750.o (section); \ build/ROMID/lib/lib_13790.o (section); \ build/ROMID/lib/lib_13820.o (section); \ - build/ROMID/lib/controller.o (section); \ + build/ROMID/lib/joy.o (section); \ build/ROMID/lib/lib_15850.o (section); \ build/ROMID/lib/gvars.o (section); \ build/ROMID/lib/lib_159b0.o (section); \ diff --git a/ld/libfiles.ntsc-final.inc b/ld/libfiles.ntsc-final.inc index 0aa356da6..303fe8e36 100644 --- a/ld/libfiles.ntsc-final.inc +++ b/ld/libfiles.ntsc-final.inc @@ -1,5 +1,5 @@ #define LIBFILES(section) \ - build/ROMID/lib/entry.o (section); \ + build/ROMID/lib/boot.o (section); \ build/ROMID/lib/segments.o (section); \ build/ROMID/lib/init.o (section); \ build/ROMID/lib/sched.o (section); \ @@ -33,7 +33,7 @@ build/ROMID/lib/lib_0c000.o (section); \ build/ROMID/lib/dma.o (section); \ build/ROMID/lib/main.o (section); \ - build/ROMID/lib/lib_0e9d0.o (section); \ + build/ROMID/lib/snd.o (section); \ build/ROMID/lib/lib_11420.o (section); \ build/ROMID/lib/memory.o (section); \ build/ROMID/lib/lib_126b0.o (section); \ @@ -45,7 +45,7 @@ build/ROMID/lib/lib_13750.o (section); \ build/ROMID/lib/lib_13790.o (section); \ build/ROMID/lib/lib_13820.o (section); \ - build/ROMID/lib/controller.o (section); \ + build/ROMID/lib/joy.o (section); \ build/ROMID/lib/lib_15850.o (section); \ build/ROMID/lib/gvars.o (section); \ build/ROMID/lib/lib_159b0.o (section); \ diff --git a/ld/libfiles.pal-final.inc b/ld/libfiles.pal-final.inc index 9fd9addd3..cb8beca6a 100644 --- a/ld/libfiles.pal-final.inc +++ b/ld/libfiles.pal-final.inc @@ -1,5 +1,5 @@ #define LIBFILES(section) \ - build/ROMID/lib/entry.o (section); \ + build/ROMID/lib/boot.o (section); \ build/ROMID/lib/segments.o (section); \ build/ROMID/lib/init.o (section); \ build/ROMID/lib/sched.o (section); \ @@ -33,7 +33,7 @@ build/ROMID/lib/lib_0c000.o (section); \ build/ROMID/lib/dma.o (section); \ build/ROMID/lib/main.o (section); \ - build/ROMID/lib/lib_0e9d0.o (section); \ + build/ROMID/lib/snd.o (section); \ build/ROMID/lib/lib_11420.o (section); \ build/ROMID/lib/memory.o (section); \ build/ROMID/lib/lib_126b0.o (section); \ @@ -45,7 +45,7 @@ build/ROMID/lib/lib_13750.o (section); \ build/ROMID/lib/lib_13790.o (section); \ build/ROMID/lib/lib_13820.o (section); \ - build/ROMID/lib/controller.o (section); \ + build/ROMID/lib/joy.o (section); \ build/ROMID/lib/lib_15850.o (section); \ build/ROMID/lib/gvars.o (section); \ build/ROMID/lib/lib_159b0.o (section); \ diff --git a/src/game/activemenu/tick.c b/src/game/activemenu/tick.c index c72183d72..86a1531be 100644 --- a/src/game/activemenu/tick.c +++ b/src/game/activemenu/tick.c @@ -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) diff --git a/src/game/room.c b/src/game/bg.c similarity index 99% rename from src/game/room.c rename to src/game/bg.c index 71244ea5a..add8f1ae4 100644 --- a/src/game/room.c +++ b/src/game/bg.c @@ -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" diff --git a/src/game/roombss.c b/src/game/bgbss.c similarity index 100% rename from src/game/roombss.c rename to src/game/bgbss.c diff --git a/src/game/bondbike.c b/src/game/bondbike.c index 5eb949010..87a83d237 100644 --- a/src/game/bondbike.c +++ b/src/game/bondbike.c @@ -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 diff --git a/src/game/bondeyespy.c b/src/game/bondeyespy.c index f2ab24bc9..e8b8a3ce6 100644 --- a/src/game/bondeyespy.c +++ b/src/game/bondeyespy.c @@ -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 diff --git a/src/game/bondmove.c b/src/game/bondmove.c index cfdc7888d..b327eab38 100644 --- a/src/game/bondmove.c +++ b/src/game/bondmove.c @@ -18,15 +18,15 @@ #include "game/bondcutscene.h" #include "game/bondhead.h" #include "game/game_127910.h" -#include "game/room.h" -#include "game/core.h" +#include "game/bg.h" +#include "game/lv.h" #include "game/mplayer/ingame.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/rng.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" @@ -1190,7 +1190,7 @@ glabel var7f1ad8e4 /* f0c8c14: 0300a825 */ or $s5,$t8,$zero /* f0c8c18: 00182600 */ sll $a0,$t8,0x18 /* f0c8c1c: 0004ce03 */ sra $t9,$a0,0x18 -/* f0c8c20: 0c005384 */ jal contGetStickX +/* f0c8c20: 0c005384 */ jal joyGetStickX /* f0c8c24: 03202025 */ or $a0,$t9,$zero /* f0c8c28: 0002a600 */ sll $s4,$v0,0x18 /* f0c8c2c: 00144603 */ sra $t0,$s4,0x18 @@ -1202,7 +1202,7 @@ glabel var7f1ad8e4 /* f0c8c3c: 12200008 */ beqz $s1,.L0f0c8c60 /* f0c8c40: 00152600 */ sll $a0,$s5,0x18 /* f0c8c44: 00044e03 */ sra $t1,$a0,0x18 -/* f0c8c48: 0c0053ae */ jal contGetStickY +/* f0c8c48: 0c0053ae */ jal joyGetStickY /* f0c8c4c: 01202025 */ or $a0,$t1,$zero /* f0c8c50: 00029e00 */ sll $s3,$v0,0x18 /* f0c8c54: 00135603 */ sra $t2,$s3,0x18 @@ -1216,7 +1216,7 @@ glabel var7f1ad8e4 /* f0c8c6c: 00152600 */ sll $a0,$s5,0x18 /* f0c8c70: 00045e03 */ sra $t3,$a0,0x18 /* f0c8c74: 01602025 */ or $a0,$t3,$zero -/* f0c8c78: 0c0053d8 */ jal contGetButtons +/* f0c8c78: 0c0053d8 */ jal joyGetButtons /* f0c8c7c: 3405ffff */ dli $a1,0xffff /* f0c8c80: 10000002 */ b .L0f0c8c8c /* f0c8c84: a7a201a2 */ sh $v0,0x1a2($sp) @@ -1227,7 +1227,7 @@ glabel var7f1ad8e4 /* f0c8c90: 00152600 */ sll $a0,$s5,0x18 /* f0c8c94: 00046603 */ sra $t4,$a0,0x18 /* f0c8c98: 01802025 */ or $a0,$t4,$zero -/* f0c8c9c: 0c005408 */ jal contGetButtonsPressedThisFrame +/* f0c8c9c: 0c005408 */ jal joyGetButtonsPressedThisFrame /* f0c8ca0: 3405ffff */ dli $a1,0xffff /* f0c8ca4: 10000002 */ b .L0f0c8cb0 /* f0c8ca8: a7a201a0 */ sh $v0,0x1a0($sp) @@ -1246,7 +1246,7 @@ glabel var7f1ad8e4 /* f0c8cd4: 0004ce03 */ sra $t9,$a0,0x18 /* f0c8cd8: a7b8019e */ sh $t8,0x19e($sp) /* f0c8cdc: 03202025 */ or $a0,$t9,$zero -/* f0c8ce0: 0c0053d8 */ jal contGetButtons +/* f0c8ce0: 0c0053d8 */ jal joyGetButtons /* f0c8ce4: 3405ffff */ dli $a1,0xffff /* f0c8ce8: 00508824 */ and $s1,$v0,$s0 /* f0c8cec: 97a901a2 */ lhu $t1,0x1a2($sp) @@ -1264,7 +1264,7 @@ glabel var7f1ad8e4 /* f0c8d1c: 01c87825 */ or $t7,$t6,$t0 /* f0c8d20: acaf1c40 */ sw $t7,0x1c40($a1) .L0f0c8d24: -/* f0c8d24: 0c005207 */ jal contGetNumSamples +/* f0c8d24: 0c005207 */ jal joyGetNumSamples /* f0c8d28: 00000000 */ nop /* f0c8d2c: 0040b025 */ or $s6,$v0,$zero /* f0c8d30: 0fc322aa */ jal bmoveResetMoveData @@ -1421,12 +1421,12 @@ glabel var7f1ad8e4 /* f0c8f4c: 00147603 */ sra $t6,$s4,0x18 /* f0c8f50: 00047e03 */ sra $t7,$a0,0x18 /* f0c8f54: 01c0a025 */ or $s4,$t6,$zero -/* f0c8f58: 0c005384 */ jal contGetStickX +/* f0c8f58: 0c005384 */ jal joyGetStickX /* f0c8f5c: 01e02025 */ or $a0,$t7,$zero /* f0c8f60: 00142600 */ sll $a0,$s4,0x18 /* f0c8f64: 0004c603 */ sra $t8,$a0,0x18 /* f0c8f68: a3a200e9 */ sb $v0,0xe9($sp) -/* f0c8f6c: 0c0053ae */ jal contGetStickY +/* f0c8f6c: 0c0053ae */ jal joyGetStickY /* f0c8f70: 03002025 */ or $a0,$t8,$zero /* f0c8f74: 00028600 */ sll $s0,$v0,0x18 /* f0c8f78: 00142600 */ sll $a0,$s4,0x18 @@ -1434,13 +1434,13 @@ glabel var7f1ad8e4 /* f0c8f80: 00044603 */ sra $t0,$a0,0x18 /* f0c8f84: 03208025 */ or $s0,$t9,$zero /* f0c8f88: 01002025 */ or $a0,$t0,$zero -/* f0c8f8c: 0c0053d8 */ jal contGetButtons +/* f0c8f8c: 0c0053d8 */ jal joyGetButtons /* f0c8f90: 3405ffff */ dli $a1,0xffff /* f0c8f94: 00142600 */ sll $a0,$s4,0x18 /* f0c8f98: 00044e03 */ sra $t1,$a0,0x18 /* f0c8f9c: a7a200e6 */ sh $v0,0xe6($sp) /* f0c8fa0: 01202025 */ or $a0,$t1,$zero -/* f0c8fa4: 0c005408 */ jal contGetButtonsPressedThisFrame +/* f0c8fa4: 0c005408 */ jal joyGetButtonsPressedThisFrame /* f0c8fa8: 3405ffff */ dli $a1,0xffff /* f0c8fac: 8e4b0284 */ lw $t3,0x284($s2) /* f0c8fb0: 340affff */ dli $t2,0xffff @@ -1460,7 +1460,7 @@ glabel var7f1ad8e4 /* f0c8fe8: 00047e03 */ sra $t7,$a0,0x18 /* f0c8fec: a7ae00da */ sh $t6,0xda($sp) /* f0c8ff0: 01e02025 */ or $a0,$t7,$zero -/* f0c8ff4: 0c0053d8 */ jal contGetButtons +/* f0c8ff4: 0c0053d8 */ jal joyGetButtons /* f0c8ff8: 3405ffff */ dli $a1,0xffff /* f0c8ffc: 97b900e6 */ lhu $t9,0xe6($sp) /* f0c9000: 97a900e4 */ lhu $t1,0xe4($sp) @@ -1587,7 +1587,7 @@ glabel var7f1ad8e4 /* f0c91ac: 02002025 */ or $a0,$s0,$zero /* f0c91b0: afa3004c */ sw $v1,0x4c($sp) /* f0c91b4: afa70048 */ sw $a3,0x48($sp) -/* f0c91b8: 0c00529e */ jal contGetButtonsOnSample +/* f0c91b8: 0c00529e */ jal joyGetButtonsOnSample /* f0c91bc: 33262000 */ andi $a2,$t9,0x2000 /* f0c91c0: 8fa3004c */ lw $v1,0x4c($sp) /* f0c91c4: 8fa70048 */ lw $a3,0x48($sp) @@ -1607,7 +1607,7 @@ glabel var7f1ad8e4 /* f0c91f4: 8e4c0284 */ lw $t4,0x284($s2) /* f0c91f8: ad8b0120 */ sw $t3,0x120($t4) .L0f0c91fc: -/* f0c91fc: 0fc5b364 */ jal coreIsPaused +/* f0c91fc: 0fc5b364 */ jal lvIsPaused /* f0c9200: 00000000 */ nop /* f0c9204: 54400243 */ bnezl $v0,.L0f0c9b14 /* f0c9208: 8e450284 */ lw $a1,0x284($s2) @@ -1629,7 +1629,7 @@ glabel var7f1ad8e4 /* f0c9244: 01c02825 */ or $a1,$t6,$zero /* f0c9248: afa3004c */ sw $v1,0x4c($sp) /* f0c924c: afa70048 */ sw $a3,0x48($sp) -/* f0c9250: 0c0052d4 */ jal contGetButtonsPressedOnSample +/* f0c9250: 0c0052d4 */ jal joyGetButtonsPressedOnSample /* f0c9254: 31e62000 */ andi $a2,$t7,0x2000 /* f0c9258: 8fa3004c */ lw $v1,0x4c($sp) /* f0c925c: 10400005 */ beqz $v0,.L0f0c9274 @@ -1815,7 +1815,7 @@ glabel var7f1ad8e4 /* f0c94e4: 00057603 */ sra $t6,$a1,0x18 /* f0c94e8: 01c02825 */ or $a1,$t6,$zero /* f0c94ec: 02002025 */ or $a0,$s0,$zero -/* f0c94f0: 0c00529e */ jal contGetButtonsOnSample +/* f0c94f0: 0c00529e */ jal joyGetButtonsOnSample /* f0c94f4: 3226ffff */ andi $a2,$s1,0xffff /* f0c94f8: 14400009 */ bnez $v0,.L0f0c9520 /* f0c94fc: 02002025 */ or $a0,$s0,$zero @@ -1823,7 +1823,7 @@ glabel var7f1ad8e4 /* f0c9504: 00142e00 */ sll $a1,$s4,0x18 /* f0c9508: 00057e03 */ sra $t7,$a1,0x18 /* f0c950c: 01e02825 */ or $a1,$t7,$zero -/* f0c9510: 0c00529e */ jal contGetButtonsOnSample +/* f0c9510: 0c00529e */ jal joyGetButtonsOnSample /* f0c9514: 33068000 */ andi $a2,$t8,0x8000 /* f0c9518: 50400028 */ beqzl $v0,.L0f0c95bc /* f0c951c: 8e490284 */ lw $t1,0x284($s2) @@ -1836,7 +1836,7 @@ glabel var7f1ad8e4 /* f0c9534: 14200031 */ bnez $at,.L0f0c95fc /* f0c9538: 02002025 */ or $a0,$s0,$zero /* f0c953c: 83a500ef */ lb $a1,0xef($sp) -/* f0c9540: 0c0052d4 */ jal contGetButtonsPressedOnSample +/* f0c9540: 0c0052d4 */ jal joyGetButtonsPressedOnSample /* f0c9544: afa6004c */ sw $a2,0x4c($sp) /* f0c9548: 10400006 */ beqz $v0,.L0f0c9564 /* f0c954c: 8fa6004c */ lw $a2,0x4c($sp) @@ -1851,7 +1851,7 @@ glabel var7f1ad8e4 /* f0c956c: 85f8024c */ lh $t8,0x24c($t7) /* f0c9570: 07020023 */ bltzl $t8,.L0f0c9600 /* f0c9574: 26100001 */ addiu $s0,$s0,0x1 -/* f0c9578: 0c00529e */ jal contGetButtonsOnSample +/* f0c9578: 0c00529e */ jal joyGetButtonsOnSample /* f0c957c: 83a500ef */ lb $a1,0xef($sp) /* f0c9580: 5440001f */ bnezl $v0,.L0f0c9600 /* f0c9584: 26100001 */ addiu $s0,$s0,0x1 @@ -1877,7 +1877,7 @@ glabel var7f1ad8e4 /* f0c95cc: 02002025 */ or $a0,$s0,$zero /* f0c95d0: 97ab00ea */ lhu $t3,0xea($sp) /* f0c95d4: 83a500ef */ lb $a1,0xef($sp) -/* f0c95d8: 0c00529e */ jal contGetButtonsOnSample +/* f0c95d8: 0c00529e */ jal joyGetButtonsOnSample /* f0c95dc: 31662000 */ andi $a2,$t3,0x2000 /* f0c95e0: 54400005 */ bnezl $v0,.L0f0c95f8 /* f0c95e4: 8e4d0284 */ lw $t5,0x284($s2) @@ -1906,7 +1906,7 @@ glabel var7f1ad8e4 /* f0c9628: 0005c603 */ sra $t8,$a1,0x18 /* f0c962c: 8fa60044 */ lw $a2,0x44($sp) /* f0c9630: 03002825 */ or $a1,$t8,$zero -/* f0c9634: 0c00529e */ jal contGetButtonsOnSample +/* f0c9634: 0c00529e */ jal joyGetButtonsOnSample /* f0c9638: 02002025 */ or $a0,$s0,$zero /* f0c963c: 14400009 */ bnez $v0,.L0f0c9664 /* f0c9640: 02002025 */ or $a0,$s0,$zero @@ -1914,7 +1914,7 @@ glabel var7f1ad8e4 /* f0c9648: 00142e00 */ sll $a1,$s4,0x18 /* f0c964c: 0005ce03 */ sra $t9,$a1,0x18 /* f0c9650: 03202825 */ or $a1,$t9,$zero -/* f0c9654: 0c00529e */ jal contGetButtonsOnSample +/* f0c9654: 0c00529e */ jal joyGetButtonsOnSample /* f0c9658: 31064000 */ andi $a2,$t0,0x4000 /* f0c965c: 5040003e */ beqzl $v0,.L0f0c9758 /* f0c9660: 8e450284 */ lw $a1,0x284($s2) @@ -1927,7 +1927,7 @@ glabel var7f1ad8e4 /* f0c9678: 2881ffff */ slti $at,$a0,-1 /* f0c967c: 5420002f */ bnezl $at,.L0f0c973c /* f0c9680: 2881fffe */ slti $at,$a0,-2 -/* f0c9684: 0c0052d4 */ jal contGetButtonsPressedOnSample +/* f0c9684: 0c0052d4 */ jal joyGetButtonsPressedOnSample /* f0c9688: 02002025 */ or $a0,$s0,$zero /* f0c968c: 5040000e */ beqzl $v0,.L0f0c96c8 /* f0c9690: 8e450284 */ lw $a1,0x284($s2) @@ -2065,14 +2065,14 @@ glabel var7f1ad8e4 /* f0c9864: 00057603 */ sra $t6,$a1,0x18 /* f0c9868: 11a0002e */ beqz $t5,.L0f0c9924 /* f0c986c: 02002025 */ or $a0,$s0,$zero -/* f0c9870: 0c005241 */ jal contGetStickYOnSample +/* f0c9870: 0c005241 */ jal joyGetStickYOnSample /* f0c9874: 01c02825 */ or $a1,$t6,$zero /* f0c9878: 2841001f */ slti $at,$v0,0x1f /* f0c987c: 14200011 */ bnez $at,.L0f0c98c4 /* f0c9880: 02002025 */ or $a0,$s0,$zero /* f0c9884: 00142e00 */ sll $a1,$s4,0x18 /* f0c9888: 00057e03 */ sra $t7,$a1,0x18 -/* f0c988c: 0c005270 */ jal contGetStickYOnSampleIndex +/* f0c988c: 0c005270 */ jal joyGetStickYOnSampleIndex /* f0c9890: 01e02825 */ or $a1,$t7,$zero /* f0c9894: 2841001f */ slti $at,$v0,0x1f /* f0c9898: 1020000a */ beqz $at,.L0f0c98c4 @@ -2092,14 +2092,14 @@ glabel var7f1ad8e4 /* f0c98c4: 00142e00 */ sll $a1,$s4,0x18 /* f0c98c8: 0005ce03 */ sra $t9,$a1,0x18 /* f0c98cc: 03202825 */ or $a1,$t9,$zero -/* f0c98d0: 0c005241 */ jal contGetStickYOnSample +/* f0c98d0: 0c005241 */ jal joyGetStickYOnSample /* f0c98d4: 02002025 */ or $a0,$s0,$zero /* f0c98d8: 2841ffe2 */ slti $at,$v0,-30 /* f0c98dc: 10200011 */ beqz $at,.L0f0c9924 /* f0c98e0: 02002025 */ or $a0,$s0,$zero /* f0c98e4: 00142e00 */ sll $a1,$s4,0x18 /* f0c98e8: 00054603 */ sra $t0,$a1,0x18 -/* f0c98ec: 0c005270 */ jal contGetStickYOnSampleIndex +/* f0c98ec: 0c005270 */ jal joyGetStickYOnSampleIndex /* f0c98f0: 01002825 */ or $a1,$t0,$zero /* f0c98f4: 2841ffe2 */ slti $at,$v0,-30 /* f0c98f8: 1420000a */ bnez $at,.L0f0c9924 @@ -2182,7 +2182,7 @@ glabel var7f1ad8e4 /* f0c9a08: afa40234 */ sw $a0,0x234($sp) /* f0c9a0c: 00142600 */ sll $a0,$s4,0x18 /* f0c9a10: 00044603 */ sra $t0,$a0,0x18 -/* f0c9a14: 0c0053ae */ jal contGetStickY +/* f0c9a14: 0c0053ae */ jal joyGetStickY /* f0c9a18: 01002025 */ or $a0,$t0,$zero /* f0c9a1c: 2844ffe2 */ slti $a0,$v0,-30 .L0f0c9a20: @@ -2268,7 +2268,7 @@ glabel var7f1ad8e4 /* f0c9b2c: 31252000 */ andi $a1,$t1,0x2000 /* f0c9b30: 11000007 */ beqz $t0,.L0f0c9b50 /* f0c9b34: 00000000 */ nop -/* f0c9b38: 0c0053d8 */ jal contGetButtons +/* f0c9b38: 0c0053d8 */ jal joyGetButtons /* f0c9b3c: 83a400ef */ lb $a0,0xef($sp) /* f0c9b40: 14400003 */ bnez $v0,.L0f0c9b50 /* f0c9b44: 00000000 */ nop @@ -2285,7 +2285,7 @@ glabel var7f1ad8e4 /* f0c9b6c: 12e0000d */ beqz $s7,.L0f0c9ba4 /* f0c9b70: 97ac00ea */ lhu $t4,0xea($sp) /* f0c9b74: 83a400ef */ lb $a0,0xef($sp) -/* f0c9b78: 0c005408 */ jal contGetButtonsPressedThisFrame +/* f0c9b78: 0c005408 */ jal joyGetButtonsPressedThisFrame /* f0c9b7c: 31852000 */ andi $a1,$t4,0x2000 /* f0c9b80: 10400008 */ beqz $v0,.L0f0c9ba4 /* f0c9b84: 00000000 */ nop @@ -2309,7 +2309,7 @@ glabel var7f1ad8e4 /* f0c9bc4: 02e02025 */ or $a0,$s7,$zero /* f0c9bc8: 97aa00ea */ lhu $t2,0xea($sp) /* f0c9bcc: 83a400ef */ lb $a0,0xef($sp) -/* f0c9bd0: 0c0053d8 */ jal contGetButtons +/* f0c9bd0: 0c0053d8 */ jal joyGetButtons /* f0c9bd4: 31452000 */ andi $a1,$t2,0x2000 /* f0c9bd8: 0002202b */ sltu $a0,$zero,$v0 /* f0c9bdc: 5080000f */ beqzl $a0,.L0f0c9c1c @@ -2373,7 +2373,7 @@ glabel var7f1ad8e4 /* f0c9ca4: 01802825 */ or $a1,$t4,$zero /* f0c9ca8: 02002025 */ or $a0,$s0,$zero /* f0c9cac: afa3004c */ sw $v1,0x4c($sp) -/* f0c9cb0: 0c00529e */ jal contGetButtonsOnSample +/* f0c9cb0: 0c00529e */ jal joyGetButtonsOnSample /* f0c9cb4: afa70048 */ sw $a3,0x48($sp) /* f0c9cb8: 8fa3004c */ lw $v1,0x4c($sp) /* f0c9cbc: 8fa70048 */ lw $a3,0x48($sp) @@ -2393,7 +2393,7 @@ glabel var7f1ad8e4 /* f0c9cec: 8e480284 */ lw $t0,0x284($s2) /* f0c9cf0: ad190120 */ sw $t9,0x120($t0) .L0f0c9cf4: -/* f0c9cf4: 0fc5b364 */ jal coreIsPaused +/* f0c9cf4: 0fc5b364 */ jal lvIsPaused /* f0c9cf8: 00000000 */ nop /* f0c9cfc: 544002ba */ bnezl $v0,.L0f0ca7e8 /* f0c9d00: 8e450284 */ lw $a1,0x284($s2) @@ -2417,7 +2417,7 @@ glabel var7f1ad8e4 /* f0c9d44: 01803025 */ or $a2,$t4,$zero /* f0c9d48: 01402825 */ or $a1,$t2,$zero /* f0c9d4c: afa3004c */ sw $v1,0x4c($sp) -/* f0c9d50: 0c0052d4 */ jal contGetButtonsPressedOnSample +/* f0c9d50: 0c0052d4 */ jal joyGetButtonsPressedOnSample /* f0c9d54: afa70048 */ sw $a3,0x48($sp) /* f0c9d58: 8fa3004c */ lw $v1,0x4c($sp) /* f0c9d5c: 10400005 */ beqz $v0,.L0f0c9d74 @@ -2475,7 +2475,7 @@ glabel var7f1ad8e4 /* f0c9e1c: 30cf0202 */ andi $t7,$a2,0x202 /* f0c9e20: 01e03025 */ or $a2,$t7,$zero /* f0c9e24: 01c02825 */ or $a1,$t6,$zero -/* f0c9e28: 0c005326 */ jal contCountButtonsOnSpecificSamples +/* f0c9e28: 0c005326 */ jal joyCountButtonsOnSpecificSamples /* f0c9e2c: 02002025 */ or $a0,$s0,$zero /* f0c9e30: 00152e00 */ sll $a1,$s5,0x18 /* f0c9e34: 02203025 */ or $a2,$s1,$zero @@ -2484,7 +2484,7 @@ glabel var7f1ad8e4 /* f0c9e40: afa201dc */ sw $v0,0x1dc($sp) /* f0c9e44: 03002825 */ or $a1,$t8,$zero /* f0c9e48: 03203025 */ or $a2,$t9,$zero -/* f0c9e4c: 0c005326 */ jal contCountButtonsOnSpecificSamples +/* f0c9e4c: 0c005326 */ jal joyCountButtonsOnSpecificSamples /* f0c9e50: 02002025 */ or $a0,$s0,$zero /* f0c9e54: afa201e0 */ sw $v0,0x1e0($sp) /* f0c9e58: 8e450284 */ lw $a1,0x284($s2) @@ -2581,7 +2581,7 @@ glabel var7f1ad8e4 /* f0c9fa0: 30cb0202 */ andi $t3,$a2,0x202 /* f0c9fa4: 01603025 */ or $a2,$t3,$zero /* f0c9fa8: 01402825 */ or $a1,$t2,$zero -/* f0c9fac: 0c005326 */ jal contCountButtonsOnSpecificSamples +/* f0c9fac: 0c005326 */ jal joyCountButtonsOnSpecificSamples /* f0c9fb0: 02002025 */ or $a0,$s0,$zero /* f0c9fb4: 00152e00 */ sll $a1,$s5,0x18 /* f0c9fb8: 02203025 */ or $a2,$s1,$zero @@ -2590,7 +2590,7 @@ glabel var7f1ad8e4 /* f0c9fc4: afa201dc */ sw $v0,0x1dc($sp) /* f0c9fc8: 01802825 */ or $a1,$t4,$zero /* f0c9fcc: 01a03025 */ or $a2,$t5,$zero -/* f0c9fd0: 0c005326 */ jal contCountButtonsOnSpecificSamples +/* f0c9fd0: 0c005326 */ jal joyCountButtonsOnSpecificSamples /* f0c9fd4: 02002025 */ or $a0,$s0,$zero /* f0c9fd8: afa201e0 */ sw $v0,0x1e0($sp) /* f0c9fdc: 8e450284 */ lw $a1,0x284($s2) @@ -2752,7 +2752,7 @@ glabel var7f1ad8e4 /* f0ca21c: 00056603 */ sra $t4,$a1,0x18 /* f0ca220: 8fa6003c */ lw $a2,0x3c($sp) /* f0ca224: 01802825 */ or $a1,$t4,$zero -/* f0ca228: 0c00529e */ jal contGetButtonsOnSample +/* f0ca228: 0c00529e */ jal joyGetButtonsOnSample /* f0ca22c: 02002025 */ or $a0,$s0,$zero /* f0ca230: 5040002d */ beqzl $v0,.L0f0ca2e8 /* f0ca234: 8e4f0284 */ lw $t7,0x284($s2) @@ -2767,7 +2767,7 @@ glabel var7f1ad8e4 /* f0ca258: 02913024 */ and $a2,$s4,$s1 /* f0ca25c: 30d8ffff */ andi $t8,$a2,0xffff /* f0ca260: 03003025 */ or $a2,$t8,$zero -/* f0ca264: 0c0052d4 */ jal contGetButtonsPressedOnSample +/* f0ca264: 0c0052d4 */ jal joyGetButtonsPressedOnSample /* f0ca268: afb8004c */ sw $t8,0x4c($sp) /* f0ca26c: 10400006 */ beqz $v0,.L0f0ca288 /* f0ca270: 8fa6004c */ lw $a2,0x4c($sp) @@ -2784,7 +2784,7 @@ glabel var7f1ad8e4 /* f0ca298: 02002025 */ or $a0,$s0,$zero /* f0ca29c: 05620026 */ bltzl $t3,.L0f0ca338 /* f0ca2a0: 26100001 */ addiu $s0,$s0,0x1 -/* f0ca2a4: 0c00529e */ jal contGetButtonsOnSample +/* f0ca2a4: 0c00529e */ jal joyGetButtonsOnSample /* f0ca2a8: 01802825 */ or $a1,$t4,$zero /* f0ca2ac: 54400022 */ bnezl $v0,.L0f0ca338 /* f0ca2b0: 26100001 */ addiu $s0,$s0,0x1 @@ -2813,7 +2813,7 @@ glabel var7f1ad8e4 /* f0ca304: 30c8ffff */ andi $t0,$a2,0xffff /* f0ca308: 0005ce03 */ sra $t9,$a1,0x18 /* f0ca30c: 03202825 */ or $a1,$t9,$zero -/* f0ca310: 0c00529e */ jal contGetButtonsOnSample +/* f0ca310: 0c00529e */ jal joyGetButtonsOnSample /* f0ca314: 01003025 */ or $a2,$t0,$zero /* f0ca318: 54400005 */ bnezl $v0,.L0f0ca330 /* f0ca31c: 8e490284 */ lw $t1,0x284($s2) @@ -2845,7 +2845,7 @@ glabel var7f1ad8e4 /* f0ca368: 00056e03 */ sra $t5,$a1,0x18 /* f0ca36c: 01a02825 */ or $a1,$t5,$zero /* f0ca370: 02002025 */ or $a0,$s0,$zero -/* f0ca374: 0c00529e */ jal contGetButtonsOnSample +/* f0ca374: 0c00529e */ jal joyGetButtonsOnSample /* f0ca378: 97a60046 */ lhu $a2,0x46($sp) /* f0ca37c: 50400040 */ beqzl $v0,.L0f0ca480 /* f0ca380: 8e450284 */ lw $a1,0x284($s2) @@ -2859,7 +2859,7 @@ glabel var7f1ad8e4 /* f0ca3a0: 1420002f */ bnez $at,.L0f0ca460 /* f0ca3a4: 01e02825 */ or $a1,$t7,$zero /* f0ca3a8: 02002025 */ or $a0,$s0,$zero -/* f0ca3ac: 0c0052d4 */ jal contGetButtonsPressedOnSample +/* f0ca3ac: 0c0052d4 */ jal joyGetButtonsPressedOnSample /* f0ca3b0: 03003025 */ or $a2,$t8,$zero /* f0ca3b4: 5040000e */ beqzl $v0,.L0f0ca3f0 /* f0ca3b8: 8e450284 */ lw $a1,0x284($s2) @@ -2987,7 +2987,7 @@ glabel var7f1ad8e4 /* f0ca568: 322a0404 */ andi $t2,$s1,0x404 /* f0ca56c: afaa0050 */ sw $t2,0x50($sp) /* f0ca570: 03202825 */ or $a1,$t9,$zero -/* f0ca574: 0c0052d4 */ jal contGetButtonsPressedOnSample +/* f0ca574: 0c0052d4 */ jal joyGetButtonsPressedOnSample /* f0ca578: 01003025 */ or $a2,$t0,$zero /* f0ca57c: 1040000b */ beqz $v0,.L0f0ca5ac /* f0ca580: 02002025 */ or $a0,$s0,$zero @@ -3007,7 +3007,7 @@ glabel var7f1ad8e4 /* f0ca5ac: 00152e00 */ sll $a1,$s5,0x18 /* f0ca5b0: 00056603 */ sra $t4,$a1,0x18 /* f0ca5b4: 01802825 */ or $a1,$t4,$zero -/* f0ca5b8: 0c0052d4 */ jal contGetButtonsPressedOnSample +/* f0ca5b8: 0c0052d4 */ jal joyGetButtonsPressedOnSample /* f0ca5bc: 97a60052 */ lhu $a2,0x52($sp) /* f0ca5c0: 5040000c */ beqzl $v0,.L0f0ca5f4 /* f0ca5c4: 8e4e0288 */ lw $t6,0x288($s2) @@ -3091,7 +3091,7 @@ glabel var7f1ad8e4 /* f0ca6d8: 00152600 */ sll $a0,$s5,0x18 /* f0ca6dc: 00046603 */ sra $t4,$a0,0x18 /* f0ca6e0: 01802025 */ or $a0,$t4,$zero -/* f0ca6e4: 0c0053d8 */ jal contGetButtons +/* f0ca6e4: 0c0053d8 */ jal joyGetButtons /* f0ca6e8: 31a50404 */ andi $a1,$t5,0x404 /* f0ca6ec: 0002202b */ sltu $a0,$zero,$v0 .L0f0ca6f0: @@ -4341,7 +4341,7 @@ glabel var7f1ad8e4 /* f0c8c14: 0300a825 */ or $s5,$t8,$zero /* f0c8c18: 00182600 */ sll $a0,$t8,0x18 /* f0c8c1c: 0004ce03 */ sra $t9,$a0,0x18 -/* f0c8c20: 0c005384 */ jal contGetStickX +/* f0c8c20: 0c005384 */ jal joyGetStickX /* f0c8c24: 03202025 */ or $a0,$t9,$zero /* f0c8c28: 0002a600 */ sll $s4,$v0,0x18 /* f0c8c2c: 00144603 */ sra $t0,$s4,0x18 @@ -4353,7 +4353,7 @@ glabel var7f1ad8e4 /* f0c8c3c: 12200008 */ beqz $s1,.L0f0c8c60 /* f0c8c40: 00152600 */ sll $a0,$s5,0x18 /* f0c8c44: 00044e03 */ sra $t1,$a0,0x18 -/* f0c8c48: 0c0053ae */ jal contGetStickY +/* f0c8c48: 0c0053ae */ jal joyGetStickY /* f0c8c4c: 01202025 */ or $a0,$t1,$zero /* f0c8c50: 00029e00 */ sll $s3,$v0,0x18 /* f0c8c54: 00135603 */ sra $t2,$s3,0x18 @@ -4367,7 +4367,7 @@ glabel var7f1ad8e4 /* f0c8c6c: 00152600 */ sll $a0,$s5,0x18 /* f0c8c70: 00045e03 */ sra $t3,$a0,0x18 /* f0c8c74: 01602025 */ or $a0,$t3,$zero -/* f0c8c78: 0c0053d8 */ jal contGetButtons +/* f0c8c78: 0c0053d8 */ jal joyGetButtons /* f0c8c7c: 3405ffff */ dli $a1,0xffff /* f0c8c80: 10000002 */ b .L0f0c8c8c /* f0c8c84: a7a201a2 */ sh $v0,0x1a2($sp) @@ -4378,7 +4378,7 @@ glabel var7f1ad8e4 /* f0c8c90: 00152600 */ sll $a0,$s5,0x18 /* f0c8c94: 00046603 */ sra $t4,$a0,0x18 /* f0c8c98: 01802025 */ or $a0,$t4,$zero -/* f0c8c9c: 0c005408 */ jal contGetButtonsPressedThisFrame +/* f0c8c9c: 0c005408 */ jal joyGetButtonsPressedThisFrame /* f0c8ca0: 3405ffff */ dli $a1,0xffff /* f0c8ca4: 10000002 */ b .L0f0c8cb0 /* f0c8ca8: a7a201a0 */ sh $v0,0x1a0($sp) @@ -4397,7 +4397,7 @@ glabel var7f1ad8e4 /* f0c8cd4: 0004ce03 */ sra $t9,$a0,0x18 /* f0c8cd8: a7b8019e */ sh $t8,0x19e($sp) /* f0c8cdc: 03202025 */ or $a0,$t9,$zero -/* f0c8ce0: 0c0053d8 */ jal contGetButtons +/* f0c8ce0: 0c0053d8 */ jal joyGetButtons /* f0c8ce4: 3405ffff */ dli $a1,0xffff /* f0c8ce8: 00508824 */ and $s1,$v0,$s0 /* f0c8cec: 97a901a2 */ lhu $t1,0x1a2($sp) @@ -4415,7 +4415,7 @@ glabel var7f1ad8e4 /* f0c8d1c: 01c87825 */ or $t7,$t6,$t0 /* f0c8d20: acaf1c40 */ sw $t7,0x1c40($a1) .L0f0c8d24: -/* f0c8d24: 0c005207 */ jal contGetNumSamples +/* f0c8d24: 0c005207 */ jal joyGetNumSamples /* f0c8d28: 00000000 */ nop /* f0c8d2c: 0040b025 */ or $s6,$v0,$zero /* f0c8d30: 0fc322aa */ jal bmoveResetMoveData @@ -4572,12 +4572,12 @@ glabel var7f1ad8e4 /* f0c8f4c: 00147603 */ sra $t6,$s4,0x18 /* f0c8f50: 00047e03 */ sra $t7,$a0,0x18 /* f0c8f54: 01c0a025 */ or $s4,$t6,$zero -/* f0c8f58: 0c005384 */ jal contGetStickX +/* f0c8f58: 0c005384 */ jal joyGetStickX /* f0c8f5c: 01e02025 */ or $a0,$t7,$zero /* f0c8f60: 00142600 */ sll $a0,$s4,0x18 /* f0c8f64: 0004c603 */ sra $t8,$a0,0x18 /* f0c8f68: a3a200e9 */ sb $v0,0xe9($sp) -/* f0c8f6c: 0c0053ae */ jal contGetStickY +/* f0c8f6c: 0c0053ae */ jal joyGetStickY /* f0c8f70: 03002025 */ or $a0,$t8,$zero /* f0c8f74: 00028600 */ sll $s0,$v0,0x18 /* f0c8f78: 00142600 */ sll $a0,$s4,0x18 @@ -4585,13 +4585,13 @@ glabel var7f1ad8e4 /* f0c8f80: 00044603 */ sra $t0,$a0,0x18 /* f0c8f84: 03208025 */ or $s0,$t9,$zero /* f0c8f88: 01002025 */ or $a0,$t0,$zero -/* f0c8f8c: 0c0053d8 */ jal contGetButtons +/* f0c8f8c: 0c0053d8 */ jal joyGetButtons /* f0c8f90: 3405ffff */ dli $a1,0xffff /* f0c8f94: 00142600 */ sll $a0,$s4,0x18 /* f0c8f98: 00044e03 */ sra $t1,$a0,0x18 /* f0c8f9c: a7a200e6 */ sh $v0,0xe6($sp) /* f0c8fa0: 01202025 */ or $a0,$t1,$zero -/* f0c8fa4: 0c005408 */ jal contGetButtonsPressedThisFrame +/* f0c8fa4: 0c005408 */ jal joyGetButtonsPressedThisFrame /* f0c8fa8: 3405ffff */ dli $a1,0xffff /* f0c8fac: 8e4b0284 */ lw $t3,0x284($s2) /* f0c8fb0: 340affff */ dli $t2,0xffff @@ -4611,7 +4611,7 @@ glabel var7f1ad8e4 /* f0c8fe8: 00047e03 */ sra $t7,$a0,0x18 /* f0c8fec: a7ae00da */ sh $t6,0xda($sp) /* f0c8ff0: 01e02025 */ or $a0,$t7,$zero -/* f0c8ff4: 0c0053d8 */ jal contGetButtons +/* f0c8ff4: 0c0053d8 */ jal joyGetButtons /* f0c8ff8: 3405ffff */ dli $a1,0xffff /* f0c8ffc: 97b900e6 */ lhu $t9,0xe6($sp) /* f0c9000: 97a900e4 */ lhu $t1,0xe4($sp) @@ -4738,7 +4738,7 @@ glabel var7f1ad8e4 /* f0c91ac: 02002025 */ or $a0,$s0,$zero /* f0c91b0: afa3004c */ sw $v1,0x4c($sp) /* f0c91b4: afa70048 */ sw $a3,0x48($sp) -/* f0c91b8: 0c00529e */ jal contGetButtonsOnSample +/* f0c91b8: 0c00529e */ jal joyGetButtonsOnSample /* f0c91bc: 33262000 */ andi $a2,$t9,0x2000 /* f0c91c0: 8fa3004c */ lw $v1,0x4c($sp) /* f0c91c4: 8fa70048 */ lw $a3,0x48($sp) @@ -4758,7 +4758,7 @@ glabel var7f1ad8e4 /* f0c91f4: 8e4c0284 */ lw $t4,0x284($s2) /* f0c91f8: ad8b0120 */ sw $t3,0x120($t4) .L0f0c91fc: -/* f0c91fc: 0fc5b364 */ jal coreIsPaused +/* f0c91fc: 0fc5b364 */ jal lvIsPaused /* f0c9200: 00000000 */ nop /* f0c9204: 54400243 */ bnezl $v0,.L0f0c9b14 /* f0c9208: 8e450284 */ lw $a1,0x284($s2) @@ -4780,7 +4780,7 @@ glabel var7f1ad8e4 /* f0c9244: 01c02825 */ or $a1,$t6,$zero /* f0c9248: afa3004c */ sw $v1,0x4c($sp) /* f0c924c: afa70048 */ sw $a3,0x48($sp) -/* f0c9250: 0c0052d4 */ jal contGetButtonsPressedOnSample +/* f0c9250: 0c0052d4 */ jal joyGetButtonsPressedOnSample /* f0c9254: 31e62000 */ andi $a2,$t7,0x2000 /* f0c9258: 8fa3004c */ lw $v1,0x4c($sp) /* f0c925c: 10400005 */ beqz $v0,.L0f0c9274 @@ -4966,7 +4966,7 @@ glabel var7f1ad8e4 /* f0c94e4: 00057603 */ sra $t6,$a1,0x18 /* f0c94e8: 01c02825 */ or $a1,$t6,$zero /* f0c94ec: 02002025 */ or $a0,$s0,$zero -/* f0c94f0: 0c00529e */ jal contGetButtonsOnSample +/* f0c94f0: 0c00529e */ jal joyGetButtonsOnSample /* f0c94f4: 3226ffff */ andi $a2,$s1,0xffff /* f0c94f8: 14400009 */ bnez $v0,.L0f0c9520 /* f0c94fc: 02002025 */ or $a0,$s0,$zero @@ -4974,7 +4974,7 @@ glabel var7f1ad8e4 /* f0c9504: 00142e00 */ sll $a1,$s4,0x18 /* f0c9508: 00057e03 */ sra $t7,$a1,0x18 /* f0c950c: 01e02825 */ or $a1,$t7,$zero -/* f0c9510: 0c00529e */ jal contGetButtonsOnSample +/* f0c9510: 0c00529e */ jal joyGetButtonsOnSample /* f0c9514: 33068000 */ andi $a2,$t8,0x8000 /* f0c9518: 50400028 */ beqzl $v0,.L0f0c95bc /* f0c951c: 8e490284 */ lw $t1,0x284($s2) @@ -4987,7 +4987,7 @@ glabel var7f1ad8e4 /* f0c9534: 14200031 */ bnez $at,.L0f0c95fc /* f0c9538: 02002025 */ or $a0,$s0,$zero /* f0c953c: 83a500ef */ lb $a1,0xef($sp) -/* f0c9540: 0c0052d4 */ jal contGetButtonsPressedOnSample +/* f0c9540: 0c0052d4 */ jal joyGetButtonsPressedOnSample /* f0c9544: afa6004c */ sw $a2,0x4c($sp) /* f0c9548: 10400006 */ beqz $v0,.L0f0c9564 /* f0c954c: 8fa6004c */ lw $a2,0x4c($sp) @@ -5002,7 +5002,7 @@ glabel var7f1ad8e4 /* f0c956c: 85f8024c */ lh $t8,0x24c($t7) /* f0c9570: 07020023 */ bltzl $t8,.L0f0c9600 /* f0c9574: 26100001 */ addiu $s0,$s0,0x1 -/* f0c9578: 0c00529e */ jal contGetButtonsOnSample +/* f0c9578: 0c00529e */ jal joyGetButtonsOnSample /* f0c957c: 83a500ef */ lb $a1,0xef($sp) /* f0c9580: 5440001f */ bnezl $v0,.L0f0c9600 /* f0c9584: 26100001 */ addiu $s0,$s0,0x1 @@ -5028,7 +5028,7 @@ glabel var7f1ad8e4 /* f0c95cc: 02002025 */ or $a0,$s0,$zero /* f0c95d0: 97ab00ea */ lhu $t3,0xea($sp) /* f0c95d4: 83a500ef */ lb $a1,0xef($sp) -/* f0c95d8: 0c00529e */ jal contGetButtonsOnSample +/* f0c95d8: 0c00529e */ jal joyGetButtonsOnSample /* f0c95dc: 31662000 */ andi $a2,$t3,0x2000 /* f0c95e0: 54400005 */ bnezl $v0,.L0f0c95f8 /* f0c95e4: 8e4d0284 */ lw $t5,0x284($s2) @@ -5057,7 +5057,7 @@ glabel var7f1ad8e4 /* f0c9628: 0005c603 */ sra $t8,$a1,0x18 /* f0c962c: 8fa60044 */ lw $a2,0x44($sp) /* f0c9630: 03002825 */ or $a1,$t8,$zero -/* f0c9634: 0c00529e */ jal contGetButtonsOnSample +/* f0c9634: 0c00529e */ jal joyGetButtonsOnSample /* f0c9638: 02002025 */ or $a0,$s0,$zero /* f0c963c: 14400009 */ bnez $v0,.L0f0c9664 /* f0c9640: 02002025 */ or $a0,$s0,$zero @@ -5065,7 +5065,7 @@ glabel var7f1ad8e4 /* f0c9648: 00142e00 */ sll $a1,$s4,0x18 /* f0c964c: 0005ce03 */ sra $t9,$a1,0x18 /* f0c9650: 03202825 */ or $a1,$t9,$zero -/* f0c9654: 0c00529e */ jal contGetButtonsOnSample +/* f0c9654: 0c00529e */ jal joyGetButtonsOnSample /* f0c9658: 31064000 */ andi $a2,$t0,0x4000 /* f0c965c: 5040003e */ beqzl $v0,.L0f0c9758 /* f0c9660: 8e450284 */ lw $a1,0x284($s2) @@ -5078,7 +5078,7 @@ glabel var7f1ad8e4 /* f0c9678: 2881ffff */ slti $at,$a0,-1 /* f0c967c: 5420002f */ bnezl $at,.L0f0c973c /* f0c9680: 2881fffe */ slti $at,$a0,-2 -/* f0c9684: 0c0052d4 */ jal contGetButtonsPressedOnSample +/* f0c9684: 0c0052d4 */ jal joyGetButtonsPressedOnSample /* f0c9688: 02002025 */ or $a0,$s0,$zero /* f0c968c: 5040000e */ beqzl $v0,.L0f0c96c8 /* f0c9690: 8e450284 */ lw $a1,0x284($s2) @@ -5216,14 +5216,14 @@ glabel var7f1ad8e4 /* f0c9864: 00057603 */ sra $t6,$a1,0x18 /* f0c9868: 11a0002e */ beqz $t5,.L0f0c9924 /* f0c986c: 02002025 */ or $a0,$s0,$zero -/* f0c9870: 0c005241 */ jal contGetStickYOnSample +/* f0c9870: 0c005241 */ jal joyGetStickYOnSample /* f0c9874: 01c02825 */ or $a1,$t6,$zero /* f0c9878: 2841001f */ slti $at,$v0,0x1f /* f0c987c: 14200011 */ bnez $at,.L0f0c98c4 /* f0c9880: 02002025 */ or $a0,$s0,$zero /* f0c9884: 00142e00 */ sll $a1,$s4,0x18 /* f0c9888: 00057e03 */ sra $t7,$a1,0x18 -/* f0c988c: 0c005270 */ jal contGetStickYOnSampleIndex +/* f0c988c: 0c005270 */ jal joyGetStickYOnSampleIndex /* f0c9890: 01e02825 */ or $a1,$t7,$zero /* f0c9894: 2841001f */ slti $at,$v0,0x1f /* f0c9898: 1020000a */ beqz $at,.L0f0c98c4 @@ -5243,14 +5243,14 @@ glabel var7f1ad8e4 /* f0c98c4: 00142e00 */ sll $a1,$s4,0x18 /* f0c98c8: 0005ce03 */ sra $t9,$a1,0x18 /* f0c98cc: 03202825 */ or $a1,$t9,$zero -/* f0c98d0: 0c005241 */ jal contGetStickYOnSample +/* f0c98d0: 0c005241 */ jal joyGetStickYOnSample /* f0c98d4: 02002025 */ or $a0,$s0,$zero /* f0c98d8: 2841ffe2 */ slti $at,$v0,-30 /* f0c98dc: 10200011 */ beqz $at,.L0f0c9924 /* f0c98e0: 02002025 */ or $a0,$s0,$zero /* f0c98e4: 00142e00 */ sll $a1,$s4,0x18 /* f0c98e8: 00054603 */ sra $t0,$a1,0x18 -/* f0c98ec: 0c005270 */ jal contGetStickYOnSampleIndex +/* f0c98ec: 0c005270 */ jal joyGetStickYOnSampleIndex /* f0c98f0: 01002825 */ or $a1,$t0,$zero /* f0c98f4: 2841ffe2 */ slti $at,$v0,-30 /* f0c98f8: 1420000a */ bnez $at,.L0f0c9924 @@ -5333,7 +5333,7 @@ glabel var7f1ad8e4 /* f0c9a08: afa40234 */ sw $a0,0x234($sp) /* f0c9a0c: 00142600 */ sll $a0,$s4,0x18 /* f0c9a10: 00044603 */ sra $t0,$a0,0x18 -/* f0c9a14: 0c0053ae */ jal contGetStickY +/* f0c9a14: 0c0053ae */ jal joyGetStickY /* f0c9a18: 01002025 */ or $a0,$t0,$zero /* f0c9a1c: 2844ffe2 */ slti $a0,$v0,-30 .L0f0c9a20: @@ -5419,7 +5419,7 @@ glabel var7f1ad8e4 /* f0c9b2c: 31252000 */ andi $a1,$t1,0x2000 /* f0c9b30: 11000007 */ beqz $t0,.L0f0c9b50 /* f0c9b34: 00000000 */ nop -/* f0c9b38: 0c0053d8 */ jal contGetButtons +/* f0c9b38: 0c0053d8 */ jal joyGetButtons /* f0c9b3c: 83a400ef */ lb $a0,0xef($sp) /* f0c9b40: 14400003 */ bnez $v0,.L0f0c9b50 /* f0c9b44: 00000000 */ nop @@ -5436,7 +5436,7 @@ glabel var7f1ad8e4 /* f0c9b6c: 12e0000d */ beqz $s7,.L0f0c9ba4 /* f0c9b70: 97ac00ea */ lhu $t4,0xea($sp) /* f0c9b74: 83a400ef */ lb $a0,0xef($sp) -/* f0c9b78: 0c005408 */ jal contGetButtonsPressedThisFrame +/* f0c9b78: 0c005408 */ jal joyGetButtonsPressedThisFrame /* f0c9b7c: 31852000 */ andi $a1,$t4,0x2000 /* f0c9b80: 10400008 */ beqz $v0,.L0f0c9ba4 /* f0c9b84: 00000000 */ nop @@ -5460,7 +5460,7 @@ glabel var7f1ad8e4 /* f0c9bc4: 02e02025 */ or $a0,$s7,$zero /* f0c9bc8: 97aa00ea */ lhu $t2,0xea($sp) /* f0c9bcc: 83a400ef */ lb $a0,0xef($sp) -/* f0c9bd0: 0c0053d8 */ jal contGetButtons +/* f0c9bd0: 0c0053d8 */ jal joyGetButtons /* f0c9bd4: 31452000 */ andi $a1,$t2,0x2000 /* f0c9bd8: 0002202b */ sltu $a0,$zero,$v0 /* f0c9bdc: 5080000f */ beqzl $a0,.L0f0c9c1c @@ -5524,7 +5524,7 @@ glabel var7f1ad8e4 /* f0c9ca4: 01802825 */ or $a1,$t4,$zero /* f0c9ca8: 02002025 */ or $a0,$s0,$zero /* f0c9cac: afa3004c */ sw $v1,0x4c($sp) -/* f0c9cb0: 0c00529e */ jal contGetButtonsOnSample +/* f0c9cb0: 0c00529e */ jal joyGetButtonsOnSample /* f0c9cb4: afa70048 */ sw $a3,0x48($sp) /* f0c9cb8: 8fa3004c */ lw $v1,0x4c($sp) /* f0c9cbc: 8fa70048 */ lw $a3,0x48($sp) @@ -5544,7 +5544,7 @@ glabel var7f1ad8e4 /* f0c9cec: 8e480284 */ lw $t0,0x284($s2) /* f0c9cf0: ad190120 */ sw $t9,0x120($t0) .L0f0c9cf4: -/* f0c9cf4: 0fc5b364 */ jal coreIsPaused +/* f0c9cf4: 0fc5b364 */ jal lvIsPaused /* f0c9cf8: 00000000 */ nop /* f0c9cfc: 544002ba */ bnezl $v0,.L0f0ca7e8 /* f0c9d00: 8e450284 */ lw $a1,0x284($s2) @@ -5568,7 +5568,7 @@ glabel var7f1ad8e4 /* f0c9d44: 01803025 */ or $a2,$t4,$zero /* f0c9d48: 01402825 */ or $a1,$t2,$zero /* f0c9d4c: afa3004c */ sw $v1,0x4c($sp) -/* f0c9d50: 0c0052d4 */ jal contGetButtonsPressedOnSample +/* f0c9d50: 0c0052d4 */ jal joyGetButtonsPressedOnSample /* f0c9d54: afa70048 */ sw $a3,0x48($sp) /* f0c9d58: 8fa3004c */ lw $v1,0x4c($sp) /* f0c9d5c: 10400005 */ beqz $v0,.L0f0c9d74 @@ -5626,7 +5626,7 @@ glabel var7f1ad8e4 /* f0c9e1c: 30cf0202 */ andi $t7,$a2,0x202 /* f0c9e20: 01e03025 */ or $a2,$t7,$zero /* f0c9e24: 01c02825 */ or $a1,$t6,$zero -/* f0c9e28: 0c005326 */ jal contCountButtonsOnSpecificSamples +/* f0c9e28: 0c005326 */ jal joyCountButtonsOnSpecificSamples /* f0c9e2c: 02002025 */ or $a0,$s0,$zero /* f0c9e30: 00152e00 */ sll $a1,$s5,0x18 /* f0c9e34: 02203025 */ or $a2,$s1,$zero @@ -5635,7 +5635,7 @@ glabel var7f1ad8e4 /* f0c9e40: afa201dc */ sw $v0,0x1dc($sp) /* f0c9e44: 03002825 */ or $a1,$t8,$zero /* f0c9e48: 03203025 */ or $a2,$t9,$zero -/* f0c9e4c: 0c005326 */ jal contCountButtonsOnSpecificSamples +/* f0c9e4c: 0c005326 */ jal joyCountButtonsOnSpecificSamples /* f0c9e50: 02002025 */ or $a0,$s0,$zero /* f0c9e54: afa201e0 */ sw $v0,0x1e0($sp) /* f0c9e58: 8e450284 */ lw $a1,0x284($s2) @@ -5732,7 +5732,7 @@ glabel var7f1ad8e4 /* f0c9fa0: 30cb0202 */ andi $t3,$a2,0x202 /* f0c9fa4: 01603025 */ or $a2,$t3,$zero /* f0c9fa8: 01402825 */ or $a1,$t2,$zero -/* f0c9fac: 0c005326 */ jal contCountButtonsOnSpecificSamples +/* f0c9fac: 0c005326 */ jal joyCountButtonsOnSpecificSamples /* f0c9fb0: 02002025 */ or $a0,$s0,$zero /* f0c9fb4: 00152e00 */ sll $a1,$s5,0x18 /* f0c9fb8: 02203025 */ or $a2,$s1,$zero @@ -5741,7 +5741,7 @@ glabel var7f1ad8e4 /* f0c9fc4: afa201dc */ sw $v0,0x1dc($sp) /* f0c9fc8: 01802825 */ or $a1,$t4,$zero /* f0c9fcc: 01a03025 */ or $a2,$t5,$zero -/* f0c9fd0: 0c005326 */ jal contCountButtonsOnSpecificSamples +/* f0c9fd0: 0c005326 */ jal joyCountButtonsOnSpecificSamples /* f0c9fd4: 02002025 */ or $a0,$s0,$zero /* f0c9fd8: afa201e0 */ sw $v0,0x1e0($sp) /* f0c9fdc: 8e450284 */ lw $a1,0x284($s2) @@ -5903,7 +5903,7 @@ glabel var7f1ad8e4 /* f0ca21c: 00056603 */ sra $t4,$a1,0x18 /* f0ca220: 8fa6003c */ lw $a2,0x3c($sp) /* f0ca224: 01802825 */ or $a1,$t4,$zero -/* f0ca228: 0c00529e */ jal contGetButtonsOnSample +/* f0ca228: 0c00529e */ jal joyGetButtonsOnSample /* f0ca22c: 02002025 */ or $a0,$s0,$zero /* f0ca230: 5040002d */ beqzl $v0,.L0f0ca2e8 /* f0ca234: 8e4f0284 */ lw $t7,0x284($s2) @@ -5918,7 +5918,7 @@ glabel var7f1ad8e4 /* f0ca258: 02913024 */ and $a2,$s4,$s1 /* f0ca25c: 30d8ffff */ andi $t8,$a2,0xffff /* f0ca260: 03003025 */ or $a2,$t8,$zero -/* f0ca264: 0c0052d4 */ jal contGetButtonsPressedOnSample +/* f0ca264: 0c0052d4 */ jal joyGetButtonsPressedOnSample /* f0ca268: afb8004c */ sw $t8,0x4c($sp) /* f0ca26c: 10400006 */ beqz $v0,.L0f0ca288 /* f0ca270: 8fa6004c */ lw $a2,0x4c($sp) @@ -5935,7 +5935,7 @@ glabel var7f1ad8e4 /* f0ca298: 02002025 */ or $a0,$s0,$zero /* f0ca29c: 05620026 */ bltzl $t3,.L0f0ca338 /* f0ca2a0: 26100001 */ addiu $s0,$s0,0x1 -/* f0ca2a4: 0c00529e */ jal contGetButtonsOnSample +/* f0ca2a4: 0c00529e */ jal joyGetButtonsOnSample /* f0ca2a8: 01802825 */ or $a1,$t4,$zero /* f0ca2ac: 54400022 */ bnezl $v0,.L0f0ca338 /* f0ca2b0: 26100001 */ addiu $s0,$s0,0x1 @@ -5964,7 +5964,7 @@ glabel var7f1ad8e4 /* f0ca304: 30c8ffff */ andi $t0,$a2,0xffff /* f0ca308: 0005ce03 */ sra $t9,$a1,0x18 /* f0ca30c: 03202825 */ or $a1,$t9,$zero -/* f0ca310: 0c00529e */ jal contGetButtonsOnSample +/* f0ca310: 0c00529e */ jal joyGetButtonsOnSample /* f0ca314: 01003025 */ or $a2,$t0,$zero /* f0ca318: 54400005 */ bnezl $v0,.L0f0ca330 /* f0ca31c: 8e490284 */ lw $t1,0x284($s2) @@ -5996,7 +5996,7 @@ glabel var7f1ad8e4 /* f0ca368: 00056e03 */ sra $t5,$a1,0x18 /* f0ca36c: 01a02825 */ or $a1,$t5,$zero /* f0ca370: 02002025 */ or $a0,$s0,$zero -/* f0ca374: 0c00529e */ jal contGetButtonsOnSample +/* f0ca374: 0c00529e */ jal joyGetButtonsOnSample /* f0ca378: 97a60046 */ lhu $a2,0x46($sp) /* f0ca37c: 50400040 */ beqzl $v0,.L0f0ca480 /* f0ca380: 8e450284 */ lw $a1,0x284($s2) @@ -6010,7 +6010,7 @@ glabel var7f1ad8e4 /* f0ca3a0: 1420002f */ bnez $at,.L0f0ca460 /* f0ca3a4: 01e02825 */ or $a1,$t7,$zero /* f0ca3a8: 02002025 */ or $a0,$s0,$zero -/* f0ca3ac: 0c0052d4 */ jal contGetButtonsPressedOnSample +/* f0ca3ac: 0c0052d4 */ jal joyGetButtonsPressedOnSample /* f0ca3b0: 03003025 */ or $a2,$t8,$zero /* f0ca3b4: 5040000e */ beqzl $v0,.L0f0ca3f0 /* f0ca3b8: 8e450284 */ lw $a1,0x284($s2) @@ -6138,7 +6138,7 @@ glabel var7f1ad8e4 /* f0ca568: 322a0404 */ andi $t2,$s1,0x404 /* f0ca56c: afaa0050 */ sw $t2,0x50($sp) /* f0ca570: 03202825 */ or $a1,$t9,$zero -/* f0ca574: 0c0052d4 */ jal contGetButtonsPressedOnSample +/* f0ca574: 0c0052d4 */ jal joyGetButtonsPressedOnSample /* f0ca578: 01003025 */ or $a2,$t0,$zero /* f0ca57c: 1040000b */ beqz $v0,.L0f0ca5ac /* f0ca580: 02002025 */ or $a0,$s0,$zero @@ -6158,7 +6158,7 @@ glabel var7f1ad8e4 /* f0ca5ac: 00152e00 */ sll $a1,$s5,0x18 /* f0ca5b0: 00056603 */ sra $t4,$a1,0x18 /* f0ca5b4: 01802825 */ or $a1,$t4,$zero -/* f0ca5b8: 0c0052d4 */ jal contGetButtonsPressedOnSample +/* f0ca5b8: 0c0052d4 */ jal joyGetButtonsPressedOnSample /* f0ca5bc: 97a60052 */ lhu $a2,0x52($sp) /* f0ca5c0: 5040000c */ beqzl $v0,.L0f0ca5f4 /* f0ca5c4: 8e4e0288 */ lw $t6,0x288($s2) @@ -6242,7 +6242,7 @@ glabel var7f1ad8e4 /* f0ca6d8: 00152600 */ sll $a0,$s5,0x18 /* f0ca6dc: 00046603 */ sra $t4,$a0,0x18 /* f0ca6e0: 01802025 */ or $a0,$t4,$zero -/* f0ca6e4: 0c0053d8 */ jal contGetButtons +/* f0ca6e4: 0c0053d8 */ jal joyGetButtons /* f0ca6e8: 31a50404 */ andi $a1,$t5,0x404 /* f0ca6ec: 0002202b */ sltu $a0,$zero,$v0 .L0f0ca6f0: @@ -7492,7 +7492,7 @@ glabel var7f1ad8e4 /* f0c6470: 0300a825 */ or $s5,$t8,$zero /* f0c6474: 00182600 */ sll $a0,$t8,0x18 /* f0c6478: 0004ce03 */ sra $t9,$a0,0x18 -/* f0c647c: 0c00573c */ jal contGetStickX +/* f0c647c: 0c00573c */ jal joyGetStickX /* f0c6480: 03202025 */ or $a0,$t9,$zero /* f0c6484: 0002a600 */ sll $s4,$v0,0x18 /* f0c6488: 00144603 */ sra $t0,$s4,0x18 @@ -7504,7 +7504,7 @@ glabel var7f1ad8e4 /* f0c6498: 12200008 */ beqz $s1,.NB0f0c64bc /* f0c649c: 00152600 */ sll $a0,$s5,0x18 /* f0c64a0: 00044e03 */ sra $t1,$a0,0x18 -/* f0c64a4: 0c005766 */ jal contGetStickY +/* f0c64a4: 0c005766 */ jal joyGetStickY /* f0c64a8: 01202025 */ or $a0,$t1,$zero /* f0c64ac: 00029e00 */ sll $s3,$v0,0x18 /* f0c64b0: 00135603 */ sra $t2,$s3,0x18 @@ -7518,7 +7518,7 @@ glabel var7f1ad8e4 /* f0c64c8: 00152600 */ sll $a0,$s5,0x18 /* f0c64cc: 00045e03 */ sra $t3,$a0,0x18 /* f0c64d0: 01602025 */ or $a0,$t3,$zero -/* f0c64d4: 0c005790 */ jal contGetButtons +/* f0c64d4: 0c005790 */ jal joyGetButtons /* f0c64d8: 3405ffff */ dli $a1,0xffff /* f0c64dc: 10000002 */ beqz $zero,.NB0f0c64e8 /* f0c64e0: a7a201a2 */ sh $v0,0x1a2($sp) @@ -7529,7 +7529,7 @@ glabel var7f1ad8e4 /* f0c64ec: 00152600 */ sll $a0,$s5,0x18 /* f0c64f0: 00046603 */ sra $t4,$a0,0x18 /* f0c64f4: 01802025 */ or $a0,$t4,$zero -/* f0c64f8: 0c0057c0 */ jal contGetButtonsPressedThisFrame +/* f0c64f8: 0c0057c0 */ jal joyGetButtonsPressedThisFrame /* f0c64fc: 3405ffff */ dli $a1,0xffff /* f0c6500: 10000002 */ beqz $zero,.NB0f0c650c /* f0c6504: a7a201a0 */ sh $v0,0x1a0($sp) @@ -7548,7 +7548,7 @@ glabel var7f1ad8e4 /* f0c6530: 0004ce03 */ sra $t9,$a0,0x18 /* f0c6534: a7b8019e */ sh $t8,0x19e($sp) /* f0c6538: 03202025 */ or $a0,$t9,$zero -/* f0c653c: 0c005790 */ jal contGetButtons +/* f0c653c: 0c005790 */ jal joyGetButtons /* f0c6540: 3405ffff */ dli $a1,0xffff /* f0c6544: 00508824 */ and $s1,$v0,$s0 /* f0c6548: 97a901a2 */ lhu $t1,0x1a2($sp) @@ -7566,7 +7566,7 @@ glabel var7f1ad8e4 /* f0c6578: 01c87825 */ or $t7,$t6,$t0 /* f0c657c: acaf1c40 */ sw $t7,0x1c40($a1) .NB0f0c6580: -/* f0c6580: 0c0055bf */ jal contGetNumSamples +/* f0c6580: 0c0055bf */ jal joyGetNumSamples /* f0c6584: 00000000 */ sll $zero,$zero,0x0 /* f0c6588: 0040b025 */ or $s6,$v0,$zero /* f0c658c: 0fc318c1 */ jal bmoveResetMoveData @@ -7723,12 +7723,12 @@ glabel var7f1ad8e4 /* f0c67a8: 00147603 */ sra $t6,$s4,0x18 /* f0c67ac: 00047e03 */ sra $t7,$a0,0x18 /* f0c67b0: 01c0a025 */ or $s4,$t6,$zero -/* f0c67b4: 0c00573c */ jal contGetStickX +/* f0c67b4: 0c00573c */ jal joyGetStickX /* f0c67b8: 01e02025 */ or $a0,$t7,$zero /* f0c67bc: 00142600 */ sll $a0,$s4,0x18 /* f0c67c0: 0004c603 */ sra $t8,$a0,0x18 /* f0c67c4: a3a200e9 */ sb $v0,0xe9($sp) -/* f0c67c8: 0c005766 */ jal contGetStickY +/* f0c67c8: 0c005766 */ jal joyGetStickY /* f0c67cc: 03002025 */ or $a0,$t8,$zero /* f0c67d0: 00028600 */ sll $s0,$v0,0x18 /* f0c67d4: 00142600 */ sll $a0,$s4,0x18 @@ -7736,13 +7736,13 @@ glabel var7f1ad8e4 /* f0c67dc: 00044603 */ sra $t0,$a0,0x18 /* f0c67e0: 03208025 */ or $s0,$t9,$zero /* f0c67e4: 01002025 */ or $a0,$t0,$zero -/* f0c67e8: 0c005790 */ jal contGetButtons +/* f0c67e8: 0c005790 */ jal joyGetButtons /* f0c67ec: 3405ffff */ dli $a1,0xffff /* f0c67f0: 00142600 */ sll $a0,$s4,0x18 /* f0c67f4: 00044e03 */ sra $t1,$a0,0x18 /* f0c67f8: a7a200e6 */ sh $v0,0xe6($sp) /* f0c67fc: 01202025 */ or $a0,$t1,$zero -/* f0c6800: 0c0057c0 */ jal contGetButtonsPressedThisFrame +/* f0c6800: 0c0057c0 */ jal joyGetButtonsPressedThisFrame /* f0c6804: 3405ffff */ dli $a1,0xffff /* f0c6808: 8e4b0284 */ lw $t3,0x284($s2) /* f0c680c: 340affff */ dli $t2,0xffff @@ -7762,7 +7762,7 @@ glabel var7f1ad8e4 /* f0c6844: 00047e03 */ sra $t7,$a0,0x18 /* f0c6848: a7ae00da */ sh $t6,0xda($sp) /* f0c684c: 01e02025 */ or $a0,$t7,$zero -/* f0c6850: 0c005790 */ jal contGetButtons +/* f0c6850: 0c005790 */ jal joyGetButtons /* f0c6854: 3405ffff */ dli $a1,0xffff /* f0c6858: 97b900e6 */ lhu $t9,0xe6($sp) /* f0c685c: 97a900e4 */ lhu $t1,0xe4($sp) @@ -7889,7 +7889,7 @@ glabel var7f1ad8e4 /* f0c6a08: 02002025 */ or $a0,$s0,$zero /* f0c6a0c: afa3004c */ sw $v1,0x4c($sp) /* f0c6a10: afa70048 */ sw $a3,0x48($sp) -/* f0c6a14: 0c005656 */ jal contGetButtonsOnSample +/* f0c6a14: 0c005656 */ jal joyGetButtonsOnSample /* f0c6a18: 33262000 */ andi $a2,$t9,0x2000 /* f0c6a1c: 8fa3004c */ lw $v1,0x4c($sp) /* f0c6a20: 8fa70048 */ lw $a3,0x48($sp) @@ -7909,7 +7909,7 @@ glabel var7f1ad8e4 /* f0c6a50: 8e4c0284 */ lw $t4,0x284($s2) /* f0c6a54: ad8b0120 */ sw $t3,0x120($t4) .NB0f0c6a58: -/* f0c6a58: 0fc59ed0 */ jal coreIsPaused +/* f0c6a58: 0fc59ed0 */ jal lvIsPaused /* f0c6a5c: 00000000 */ sll $zero,$zero,0x0 /* f0c6a60: 54400243 */ bnezl $v0,.NB0f0c7370 /* f0c6a64: 8e450284 */ lw $a1,0x284($s2) @@ -7931,7 +7931,7 @@ glabel var7f1ad8e4 /* f0c6aa0: 01c02825 */ or $a1,$t6,$zero /* f0c6aa4: afa3004c */ sw $v1,0x4c($sp) /* f0c6aa8: afa70048 */ sw $a3,0x48($sp) -/* f0c6aac: 0c00568c */ jal contGetButtonsPressedOnSample +/* f0c6aac: 0c00568c */ jal joyGetButtonsPressedOnSample /* f0c6ab0: 31e62000 */ andi $a2,$t7,0x2000 /* f0c6ab4: 8fa3004c */ lw $v1,0x4c($sp) /* f0c6ab8: 10400005 */ beqz $v0,.NB0f0c6ad0 @@ -8117,7 +8117,7 @@ glabel var7f1ad8e4 /* f0c6d40: 00057603 */ sra $t6,$a1,0x18 /* f0c6d44: 01c02825 */ or $a1,$t6,$zero /* f0c6d48: 02002025 */ or $a0,$s0,$zero -/* f0c6d4c: 0c005656 */ jal contGetButtonsOnSample +/* f0c6d4c: 0c005656 */ jal joyGetButtonsOnSample /* f0c6d50: 3226ffff */ andi $a2,$s1,0xffff /* f0c6d54: 14400009 */ bnez $v0,.NB0f0c6d7c /* f0c6d58: 02002025 */ or $a0,$s0,$zero @@ -8125,7 +8125,7 @@ glabel var7f1ad8e4 /* f0c6d60: 00142e00 */ sll $a1,$s4,0x18 /* f0c6d64: 00057e03 */ sra $t7,$a1,0x18 /* f0c6d68: 01e02825 */ or $a1,$t7,$zero -/* f0c6d6c: 0c005656 */ jal contGetButtonsOnSample +/* f0c6d6c: 0c005656 */ jal joyGetButtonsOnSample /* f0c6d70: 33068000 */ andi $a2,$t8,0x8000 /* f0c6d74: 50400028 */ beqzl $v0,.NB0f0c6e18 /* f0c6d78: 8e490284 */ lw $t1,0x284($s2) @@ -8138,7 +8138,7 @@ glabel var7f1ad8e4 /* f0c6d90: 14200031 */ bnez $at,.NB0f0c6e58 /* f0c6d94: 02002025 */ or $a0,$s0,$zero /* f0c6d98: 83a500ef */ lb $a1,0xef($sp) -/* f0c6d9c: 0c00568c */ jal contGetButtonsPressedOnSample +/* f0c6d9c: 0c00568c */ jal joyGetButtonsPressedOnSample /* f0c6da0: afa6004c */ sw $a2,0x4c($sp) /* f0c6da4: 10400006 */ beqz $v0,.NB0f0c6dc0 /* f0c6da8: 8fa6004c */ lw $a2,0x4c($sp) @@ -8153,7 +8153,7 @@ glabel var7f1ad8e4 /* f0c6dc8: 85f8024c */ lh $t8,0x24c($t7) /* f0c6dcc: 07020023 */ bltzl $t8,.NB0f0c6e5c /* f0c6dd0: 26100001 */ addiu $s0,$s0,0x1 -/* f0c6dd4: 0c005656 */ jal contGetButtonsOnSample +/* f0c6dd4: 0c005656 */ jal joyGetButtonsOnSample /* f0c6dd8: 83a500ef */ lb $a1,0xef($sp) /* f0c6ddc: 5440001f */ bnezl $v0,.NB0f0c6e5c /* f0c6de0: 26100001 */ addiu $s0,$s0,0x1 @@ -8179,7 +8179,7 @@ glabel var7f1ad8e4 /* f0c6e28: 02002025 */ or $a0,$s0,$zero /* f0c6e2c: 97ab00ea */ lhu $t3,0xea($sp) /* f0c6e30: 83a500ef */ lb $a1,0xef($sp) -/* f0c6e34: 0c005656 */ jal contGetButtonsOnSample +/* f0c6e34: 0c005656 */ jal joyGetButtonsOnSample /* f0c6e38: 31662000 */ andi $a2,$t3,0x2000 /* f0c6e3c: 54400005 */ bnezl $v0,.NB0f0c6e54 /* f0c6e40: 8e4d0284 */ lw $t5,0x284($s2) @@ -8208,7 +8208,7 @@ glabel var7f1ad8e4 /* f0c6e84: 0005c603 */ sra $t8,$a1,0x18 /* f0c6e88: 8fa60044 */ lw $a2,0x44($sp) /* f0c6e8c: 03002825 */ or $a1,$t8,$zero -/* f0c6e90: 0c005656 */ jal contGetButtonsOnSample +/* f0c6e90: 0c005656 */ jal joyGetButtonsOnSample /* f0c6e94: 02002025 */ or $a0,$s0,$zero /* f0c6e98: 14400009 */ bnez $v0,.NB0f0c6ec0 /* f0c6e9c: 02002025 */ or $a0,$s0,$zero @@ -8216,7 +8216,7 @@ glabel var7f1ad8e4 /* f0c6ea4: 00142e00 */ sll $a1,$s4,0x18 /* f0c6ea8: 0005ce03 */ sra $t9,$a1,0x18 /* f0c6eac: 03202825 */ or $a1,$t9,$zero -/* f0c6eb0: 0c005656 */ jal contGetButtonsOnSample +/* f0c6eb0: 0c005656 */ jal joyGetButtonsOnSample /* f0c6eb4: 31064000 */ andi $a2,$t0,0x4000 /* f0c6eb8: 5040003e */ beqzl $v0,.NB0f0c6fb4 /* f0c6ebc: 8e450284 */ lw $a1,0x284($s2) @@ -8229,7 +8229,7 @@ glabel var7f1ad8e4 /* f0c6ed4: 2881ffff */ slti $at,$a0,-1 /* f0c6ed8: 5420002f */ bnezl $at,.NB0f0c6f98 /* f0c6edc: 2881fffe */ slti $at,$a0,-2 -/* f0c6ee0: 0c00568c */ jal contGetButtonsPressedOnSample +/* f0c6ee0: 0c00568c */ jal joyGetButtonsPressedOnSample /* f0c6ee4: 02002025 */ or $a0,$s0,$zero /* f0c6ee8: 5040000e */ beqzl $v0,.NB0f0c6f24 /* f0c6eec: 8e450284 */ lw $a1,0x284($s2) @@ -8367,14 +8367,14 @@ glabel var7f1ad8e4 /* f0c70c0: 00057603 */ sra $t6,$a1,0x18 /* f0c70c4: 11a0002e */ beqz $t5,.NB0f0c7180 /* f0c70c8: 02002025 */ or $a0,$s0,$zero -/* f0c70cc: 0c0055f9 */ jal contGetStickYOnSample +/* f0c70cc: 0c0055f9 */ jal joyGetStickYOnSample /* f0c70d0: 01c02825 */ or $a1,$t6,$zero /* f0c70d4: 2841001f */ slti $at,$v0,0x1f /* f0c70d8: 14200011 */ bnez $at,.NB0f0c7120 /* f0c70dc: 02002025 */ or $a0,$s0,$zero /* f0c70e0: 00142e00 */ sll $a1,$s4,0x18 /* f0c70e4: 00057e03 */ sra $t7,$a1,0x18 -/* f0c70e8: 0c005628 */ jal contGetStickYOnSampleIndex +/* f0c70e8: 0c005628 */ jal joyGetStickYOnSampleIndex /* f0c70ec: 01e02825 */ or $a1,$t7,$zero /* f0c70f0: 2841001f */ slti $at,$v0,0x1f /* f0c70f4: 1020000a */ beqz $at,.NB0f0c7120 @@ -8394,14 +8394,14 @@ glabel var7f1ad8e4 /* f0c7120: 00142e00 */ sll $a1,$s4,0x18 /* f0c7124: 0005ce03 */ sra $t9,$a1,0x18 /* f0c7128: 03202825 */ or $a1,$t9,$zero -/* f0c712c: 0c0055f9 */ jal contGetStickYOnSample +/* f0c712c: 0c0055f9 */ jal joyGetStickYOnSample /* f0c7130: 02002025 */ or $a0,$s0,$zero /* f0c7134: 2841ffe2 */ slti $at,$v0,-30 /* f0c7138: 10200011 */ beqz $at,.NB0f0c7180 /* f0c713c: 02002025 */ or $a0,$s0,$zero /* f0c7140: 00142e00 */ sll $a1,$s4,0x18 /* f0c7144: 00054603 */ sra $t0,$a1,0x18 -/* f0c7148: 0c005628 */ jal contGetStickYOnSampleIndex +/* f0c7148: 0c005628 */ jal joyGetStickYOnSampleIndex /* f0c714c: 01002825 */ or $a1,$t0,$zero /* f0c7150: 2841ffe2 */ slti $at,$v0,-30 /* f0c7154: 1420000a */ bnez $at,.NB0f0c7180 @@ -8484,7 +8484,7 @@ glabel var7f1ad8e4 /* f0c7264: afa40234 */ sw $a0,0x234($sp) /* f0c7268: 00142600 */ sll $a0,$s4,0x18 /* f0c726c: 00044603 */ sra $t0,$a0,0x18 -/* f0c7270: 0c005766 */ jal contGetStickY +/* f0c7270: 0c005766 */ jal joyGetStickY /* f0c7274: 01002025 */ or $a0,$t0,$zero /* f0c7278: 2844ffe2 */ slti $a0,$v0,-30 .NB0f0c727c: @@ -8570,7 +8570,7 @@ glabel var7f1ad8e4 /* f0c7388: 31252000 */ andi $a1,$t1,0x2000 /* f0c738c: 11000007 */ beqz $t0,.NB0f0c73ac /* f0c7390: 00000000 */ sll $zero,$zero,0x0 -/* f0c7394: 0c005790 */ jal contGetButtons +/* f0c7394: 0c005790 */ jal joyGetButtons /* f0c7398: 83a400ef */ lb $a0,0xef($sp) /* f0c739c: 14400003 */ bnez $v0,.NB0f0c73ac /* f0c73a0: 00000000 */ sll $zero,$zero,0x0 @@ -8587,7 +8587,7 @@ glabel var7f1ad8e4 /* f0c73c8: 12e0000d */ beqz $s7,.NB0f0c7400 /* f0c73cc: 97ac00ea */ lhu $t4,0xea($sp) /* f0c73d0: 83a400ef */ lb $a0,0xef($sp) -/* f0c73d4: 0c0057c0 */ jal contGetButtonsPressedThisFrame +/* f0c73d4: 0c0057c0 */ jal joyGetButtonsPressedThisFrame /* f0c73d8: 31852000 */ andi $a1,$t4,0x2000 /* f0c73dc: 10400008 */ beqz $v0,.NB0f0c7400 /* f0c73e0: 00000000 */ sll $zero,$zero,0x0 @@ -8611,7 +8611,7 @@ glabel var7f1ad8e4 /* f0c7420: 02e02025 */ or $a0,$s7,$zero /* f0c7424: 97aa00ea */ lhu $t2,0xea($sp) /* f0c7428: 83a400ef */ lb $a0,0xef($sp) -/* f0c742c: 0c005790 */ jal contGetButtons +/* f0c742c: 0c005790 */ jal joyGetButtons /* f0c7430: 31452000 */ andi $a1,$t2,0x2000 /* f0c7434: 0002202b */ sltu $a0,$zero,$v0 /* f0c7438: 5080000f */ beqzl $a0,.NB0f0c7478 @@ -8675,7 +8675,7 @@ glabel var7f1ad8e4 /* f0c7500: 01802825 */ or $a1,$t4,$zero /* f0c7504: 02002025 */ or $a0,$s0,$zero /* f0c7508: afa3004c */ sw $v1,0x4c($sp) -/* f0c750c: 0c005656 */ jal contGetButtonsOnSample +/* f0c750c: 0c005656 */ jal joyGetButtonsOnSample /* f0c7510: afa70048 */ sw $a3,0x48($sp) /* f0c7514: 8fa3004c */ lw $v1,0x4c($sp) /* f0c7518: 8fa70048 */ lw $a3,0x48($sp) @@ -8695,7 +8695,7 @@ glabel var7f1ad8e4 /* f0c7548: 8e480284 */ lw $t0,0x284($s2) /* f0c754c: ad190120 */ sw $t9,0x120($t0) .NB0f0c7550: -/* f0c7550: 0fc59ed0 */ jal coreIsPaused +/* f0c7550: 0fc59ed0 */ jal lvIsPaused /* f0c7554: 00000000 */ sll $zero,$zero,0x0 /* f0c7558: 544002ba */ bnezl $v0,.NB0f0c8044 /* f0c755c: 8e450284 */ lw $a1,0x284($s2) @@ -8719,7 +8719,7 @@ glabel var7f1ad8e4 /* f0c75a0: 01803025 */ or $a2,$t4,$zero /* f0c75a4: 01402825 */ or $a1,$t2,$zero /* f0c75a8: afa3004c */ sw $v1,0x4c($sp) -/* f0c75ac: 0c00568c */ jal contGetButtonsPressedOnSample +/* f0c75ac: 0c00568c */ jal joyGetButtonsPressedOnSample /* f0c75b0: afa70048 */ sw $a3,0x48($sp) /* f0c75b4: 8fa3004c */ lw $v1,0x4c($sp) /* f0c75b8: 10400005 */ beqz $v0,.NB0f0c75d0 @@ -8777,7 +8777,7 @@ glabel var7f1ad8e4 /* f0c7678: 30cf0202 */ andi $t7,$a2,0x202 /* f0c767c: 01e03025 */ or $a2,$t7,$zero /* f0c7680: 01c02825 */ or $a1,$t6,$zero -/* f0c7684: 0c0056de */ jal contCountButtonsOnSpecificSamples +/* f0c7684: 0c0056de */ jal joyCountButtonsOnSpecificSamples /* f0c7688: 02002025 */ or $a0,$s0,$zero /* f0c768c: 00152e00 */ sll $a1,$s5,0x18 /* f0c7690: 02203025 */ or $a2,$s1,$zero @@ -8786,7 +8786,7 @@ glabel var7f1ad8e4 /* f0c769c: afa201dc */ sw $v0,0x1dc($sp) /* f0c76a0: 03002825 */ or $a1,$t8,$zero /* f0c76a4: 03203025 */ or $a2,$t9,$zero -/* f0c76a8: 0c0056de */ jal contCountButtonsOnSpecificSamples +/* f0c76a8: 0c0056de */ jal joyCountButtonsOnSpecificSamples /* f0c76ac: 02002025 */ or $a0,$s0,$zero /* f0c76b0: afa201e0 */ sw $v0,0x1e0($sp) /* f0c76b4: 8e450284 */ lw $a1,0x284($s2) @@ -8883,7 +8883,7 @@ glabel var7f1ad8e4 /* f0c77fc: 30cb0202 */ andi $t3,$a2,0x202 /* f0c7800: 01603025 */ or $a2,$t3,$zero /* f0c7804: 01402825 */ or $a1,$t2,$zero -/* f0c7808: 0c0056de */ jal contCountButtonsOnSpecificSamples +/* f0c7808: 0c0056de */ jal joyCountButtonsOnSpecificSamples /* f0c780c: 02002025 */ or $a0,$s0,$zero /* f0c7810: 00152e00 */ sll $a1,$s5,0x18 /* f0c7814: 02203025 */ or $a2,$s1,$zero @@ -8892,7 +8892,7 @@ glabel var7f1ad8e4 /* f0c7820: afa201dc */ sw $v0,0x1dc($sp) /* f0c7824: 01802825 */ or $a1,$t4,$zero /* f0c7828: 01a03025 */ or $a2,$t5,$zero -/* f0c782c: 0c0056de */ jal contCountButtonsOnSpecificSamples +/* f0c782c: 0c0056de */ jal joyCountButtonsOnSpecificSamples /* f0c7830: 02002025 */ or $a0,$s0,$zero /* f0c7834: afa201e0 */ sw $v0,0x1e0($sp) /* f0c7838: 8e450284 */ lw $a1,0x284($s2) @@ -9054,7 +9054,7 @@ glabel var7f1ad8e4 /* f0c7a78: 00056603 */ sra $t4,$a1,0x18 /* f0c7a7c: 8fa6003c */ lw $a2,0x3c($sp) /* f0c7a80: 01802825 */ or $a1,$t4,$zero -/* f0c7a84: 0c005656 */ jal contGetButtonsOnSample +/* f0c7a84: 0c005656 */ jal joyGetButtonsOnSample /* f0c7a88: 02002025 */ or $a0,$s0,$zero /* f0c7a8c: 5040002d */ beqzl $v0,.NB0f0c7b44 /* f0c7a90: 8e4f0284 */ lw $t7,0x284($s2) @@ -9069,7 +9069,7 @@ glabel var7f1ad8e4 /* f0c7ab4: 02913024 */ and $a2,$s4,$s1 /* f0c7ab8: 30d8ffff */ andi $t8,$a2,0xffff /* f0c7abc: 03003025 */ or $a2,$t8,$zero -/* f0c7ac0: 0c00568c */ jal contGetButtonsPressedOnSample +/* f0c7ac0: 0c00568c */ jal joyGetButtonsPressedOnSample /* f0c7ac4: afb8004c */ sw $t8,0x4c($sp) /* f0c7ac8: 10400006 */ beqz $v0,.NB0f0c7ae4 /* f0c7acc: 8fa6004c */ lw $a2,0x4c($sp) @@ -9086,7 +9086,7 @@ glabel var7f1ad8e4 /* f0c7af4: 02002025 */ or $a0,$s0,$zero /* f0c7af8: 05620026 */ bltzl $t3,.NB0f0c7b94 /* f0c7afc: 26100001 */ addiu $s0,$s0,0x1 -/* f0c7b00: 0c005656 */ jal contGetButtonsOnSample +/* f0c7b00: 0c005656 */ jal joyGetButtonsOnSample /* f0c7b04: 01802825 */ or $a1,$t4,$zero /* f0c7b08: 54400022 */ bnezl $v0,.NB0f0c7b94 /* f0c7b0c: 26100001 */ addiu $s0,$s0,0x1 @@ -9115,7 +9115,7 @@ glabel var7f1ad8e4 /* f0c7b60: 30c8ffff */ andi $t0,$a2,0xffff /* f0c7b64: 0005ce03 */ sra $t9,$a1,0x18 /* f0c7b68: 03202825 */ or $a1,$t9,$zero -/* f0c7b6c: 0c005656 */ jal contGetButtonsOnSample +/* f0c7b6c: 0c005656 */ jal joyGetButtonsOnSample /* f0c7b70: 01003025 */ or $a2,$t0,$zero /* f0c7b74: 54400005 */ bnezl $v0,.NB0f0c7b8c /* f0c7b78: 8e490284 */ lw $t1,0x284($s2) @@ -9147,7 +9147,7 @@ glabel var7f1ad8e4 /* f0c7bc4: 00056e03 */ sra $t5,$a1,0x18 /* f0c7bc8: 01a02825 */ or $a1,$t5,$zero /* f0c7bcc: 02002025 */ or $a0,$s0,$zero -/* f0c7bd0: 0c005656 */ jal contGetButtonsOnSample +/* f0c7bd0: 0c005656 */ jal joyGetButtonsOnSample /* f0c7bd4: 97a60046 */ lhu $a2,0x46($sp) /* f0c7bd8: 50400040 */ beqzl $v0,.NB0f0c7cdc /* f0c7bdc: 8e450284 */ lw $a1,0x284($s2) @@ -9161,7 +9161,7 @@ glabel var7f1ad8e4 /* f0c7bfc: 1420002f */ bnez $at,.NB0f0c7cbc /* f0c7c00: 01e02825 */ or $a1,$t7,$zero /* f0c7c04: 02002025 */ or $a0,$s0,$zero -/* f0c7c08: 0c00568c */ jal contGetButtonsPressedOnSample +/* f0c7c08: 0c00568c */ jal joyGetButtonsPressedOnSample /* f0c7c0c: 03003025 */ or $a2,$t8,$zero /* f0c7c10: 5040000e */ beqzl $v0,.NB0f0c7c4c /* f0c7c14: 8e450284 */ lw $a1,0x284($s2) @@ -9289,7 +9289,7 @@ glabel var7f1ad8e4 /* f0c7dc4: 322a0404 */ andi $t2,$s1,0x404 /* f0c7dc8: afaa0050 */ sw $t2,0x50($sp) /* f0c7dcc: 03202825 */ or $a1,$t9,$zero -/* f0c7dd0: 0c00568c */ jal contGetButtonsPressedOnSample +/* f0c7dd0: 0c00568c */ jal joyGetButtonsPressedOnSample /* f0c7dd4: 01003025 */ or $a2,$t0,$zero /* f0c7dd8: 1040000b */ beqz $v0,.NB0f0c7e08 /* f0c7ddc: 02002025 */ or $a0,$s0,$zero @@ -9309,7 +9309,7 @@ glabel var7f1ad8e4 /* f0c7e08: 00152e00 */ sll $a1,$s5,0x18 /* f0c7e0c: 00056603 */ sra $t4,$a1,0x18 /* f0c7e10: 01802825 */ or $a1,$t4,$zero -/* f0c7e14: 0c00568c */ jal contGetButtonsPressedOnSample +/* f0c7e14: 0c00568c */ jal joyGetButtonsPressedOnSample /* f0c7e18: 97a60052 */ lhu $a2,0x52($sp) /* f0c7e1c: 5040000c */ beqzl $v0,.NB0f0c7e50 /* f0c7e20: 8e4e0288 */ lw $t6,0x288($s2) @@ -9393,7 +9393,7 @@ glabel var7f1ad8e4 /* f0c7f34: 00152600 */ sll $a0,$s5,0x18 /* f0c7f38: 00046603 */ sra $t4,$a0,0x18 /* f0c7f3c: 01802025 */ or $a0,$t4,$zero -/* f0c7f40: 0c005790 */ jal contGetButtons +/* f0c7f40: 0c005790 */ jal joyGetButtons /* f0c7f44: 31a50404 */ andi $a1,$t5,0x404 /* f0c7f48: 0002202b */ sltu $a0,$zero,$v0 .NB0f0c7f4c: @@ -10637,16 +10637,16 @@ glabel var7f1ad8e4 // contpad1 = optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex); // // // 8c10 -// c1stickx = arg0 ? contGetStickX(contpad1) : 0; +// c1stickx = arg0 ? joyGetStickX(contpad1) : 0; // // // 8c3c -// c1sticky = arg1 ? contGetStickY(contpad1) : 0; +// c1sticky = arg1 ? joyGetStickY(contpad1) : 0; // // // 8c68 -// sp1a2 = arg2 ? contGetButtons(contpad1, 0xffff) : 0; +// sp1a2 = arg2 ? joyGetButtons(contpad1, 0xffff) : 0; // // // 8c8c -// sp1a0 = arg2 ? contGetButtonsPressedThisFrame(contpad1, 0xffff) : 0; +// sp1a0 = arg2 ? joyGetButtonsPressedThisFrame(contpad1, 0xffff) : 0; // // // 8cb0 // c1allowedbuttons = 0xffff; @@ -10654,13 +10654,13 @@ glabel var7f1ad8e4 // // if (c1inhibitedbuttons) { // c1allowedbuttons = ~c1inhibitedbuttons; -// inhibitedbuttons = contGetButtons(contpad1, 0xffff) & (c1inhibitedbuttons & 0xffff); +// inhibitedbuttons = joyGetButtons(contpad1, 0xffff) & (c1inhibitedbuttons & 0xffff); // sp1a2 &= ~inhibitedbuttons; // sp1a0 &= ~inhibitedbuttons; // g_Vars.currentplayer->joybutinhibit = (g_Vars.currentplayer->joybutinhibit & 0xffff0000) | inhibitedbuttons; // } // -// numsamples = contGetNumSamples(); +// numsamples = joyGetNumSamples(); // bmoveResetMoveData(&movedata); // // // 8d3c @@ -10729,13 +10729,13 @@ glabel var7f1ad8e4 // // 8f38 // contpad2 = optionsGetContpadNum2(g_Vars.currentplayerstats->mpindex); // shifted to s8 and stored in s4 // // s4 shifted to s8 and stored in a0 for next jal -// c2stickx = contGetStickX(contpad2); // sb v0,0xe9(sp) +// c2stickx = joyGetStickX(contpad2); // sb v0,0xe9(sp) // // s4 shifted to s8 and stored in a0 for next jal -// c2sticky = contGetStickY(contpad2); // shifted to s8 and stored in s0 +// c2sticky = joyGetStickY(contpad2); // shifted to s8 and stored in s0 // // s4 shifted to s8 and stored in a0 for next jal -// spe6 = contGetButtons(contpad2, 0xffff); // sh v0,0xe6(sp) +// spe6 = joyGetButtons(contpad2, 0xffff); // sh v0,0xe6(sp) // // s4 shifted to s8 and stored in a0 for next jal -// spe4 = contGetButtonsPressedThisFrame(contpad2, 0xffff); // sh v0,0xe4(sp) +// spe4 = joyGetButtonsPressedThisFrame(contpad2, 0xffff); // sh v0,0xe4(sp) // c2stickx2 = c2stickx; // s3 = spe9 // c2sticky2 = c2sticky; // a0 = s0 // @@ -10745,7 +10745,7 @@ glabel var7f1ad8e4 // // 8fac // if (c2inhibitedbuttons) { // c2allowedbuttons = ~c2inhibitedbuttons; -// inhibitedbuttons = contGetButtons(contpad2, 0xffff) & c2inhibitedbuttons; +// inhibitedbuttons = joyGetButtons(contpad2, 0xffff) & c2inhibitedbuttons; // spe6 &= ~inhibitedbuttons; // spe4 &= ~inhibitedbuttons; // g_Vars.currentplayer->joybutinhibit = (g_Vars.currentplayer->joybutinhibit & 0xffff) | (inhibitedbuttons << 16); @@ -10814,7 +10814,7 @@ glabel var7f1ad8e4 // // 9170 // if (optionsGetAimControl(g_Vars.currentplayerstats->mpindex) == AIMCONTROL_HOLD) { // for (i = 0; i < numsamples; i++) { -// sp14c[i] = arg2 && contGetButtonsOnSample(i, aimpad, aimallowedbuttons & Z_TRIG); +// sp14c[i] = arg2 && joyGetButtonsOnSample(i, aimpad, aimallowedbuttons & Z_TRIG); // spfc[i] = !sp14c[i]; // } // @@ -10822,11 +10822,11 @@ glabel var7f1ad8e4 // } // // // 91fc -// if (coreIsPaused() == false) { +// if (lvIsPaused() == false) { // // 920c // if (optionsGetAimControl(g_Vars.currentplayerstats->mpindex) != AIMCONTROL_HOLD) { // for (i = 0; i < numsamples; i++) { -// if (arg2 && contGetButtonsPressedOnSample(i, aimpad, aimallowedbuttons & Z_TRIG)) { +// if (arg2 && joyGetButtonsPressedOnSample(i, aimpad, aimallowedbuttons & Z_TRIG)) { // g_Vars.currentplayer->insightaimmode = !g_Vars.currentplayer->insightaimmode; // } // @@ -10907,16 +10907,16 @@ glabel var7f1ad8e4 // } // } else { // for (i = 0; i < numsamples; i++) { -// if (contGetButtonsOnSample(i, contpad1, c1allowedbuttons & A_BUTTON) -// || contGetButtonsOnSample(i, contpad2, c2allowedbuttons & A_BUTTON)) { +// if (joyGetButtonsOnSample(i, contpad1, c1allowedbuttons & A_BUTTON) +// || joyGetButtonsOnSample(i, contpad2, c2allowedbuttons & A_BUTTON)) { // if (g_Vars.currentplayer->invdowntime > -2) { -// if (contGetButtonsPressedOnSample(i, shootpad, shootallowedbuttons & Z_TRIG)) { +// if (joyGetButtonsPressedOnSample(i, shootpad, shootallowedbuttons & Z_TRIG)) { // movedata.weaponbackoffset++; // g_Vars.currentplayer->invdowntime = -1; // } // // if (g_Vars.currentplayer->invdowntime > -1 -// && contGetButtonsOnSample(i, shootpad, shootallowedbuttons & Z_TRIG) == 0) { +// && joyGetButtonsOnSample(i, shootpad, shootallowedbuttons & Z_TRIG) == 0) { // if (g_Vars.currentplayer->invdowntime > 15) { // amOpen(); // g_Vars.currentplayer->invdowntime = -1; @@ -10927,7 +10927,7 @@ glabel var7f1ad8e4 // } // } else { // if (g_Vars.currentplayer->invdowntime > 0 && -// (!arg2 || contGetButtonsOnSample(i, shootpad, shootallowedbuttons & Z_TRIG) == 0)) { +// (!arg2 || joyGetButtonsOnSample(i, shootpad, shootallowedbuttons & Z_TRIG) == 0)) { // movedata.weaponforwardoffset++; // } // @@ -10940,10 +10940,10 @@ glabel var7f1ad8e4 // // 9608 // if (arg2) { // for (i = 0; i < numsamples; i++) { -// if (contGetButtonsOnSample(i, contpad1, c1allowedbuttons & B_BUTTON) -// || contGetButtonsOnSample(i, contpad2, c2allowedbuttons & B_BUTTON)) { +// if (joyGetButtonsOnSample(i, contpad1, c1allowedbuttons & B_BUTTON) +// || joyGetButtonsOnSample(i, contpad2, c2allowedbuttons & B_BUTTON)) { // if (g_Vars.currentplayer->usedowntime >= -1) { -// if (contGetButtonsPressedOnSample(i, shootpad, shootallowedbuttons & Z_TRIG) +// if (joyGetButtonsPressedOnSample(i, shootpad, shootallowedbuttons & Z_TRIG) // && g_Vars.currentplayer->usedowntime > -1 // && currentPlayerConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, 1, 0)) { // g_Vars.currentplayer->usedowntime = -3; @@ -11008,7 +11008,7 @@ glabel var7f1ad8e4 // if (arg2) { // for (i = 0; i < numsamples; i++) { // if (sp1a8 == 0 && sp14c[i]) { -// if (contGetStickYOnSample(i, contpad2) > 30 && contGetStickYOnSampleIndex(i, contpad2) <= 30) { +// if (joyGetStickYOnSample(i, contpad2) > 30 && joyGetStickYOnSampleIndex(i, contpad2) <= 30) { // if (movedata.crouchdown) { // movedata.crouchdown--; // } else { @@ -11018,7 +11018,7 @@ glabel var7f1ad8e4 // g_Vars.currentplayer->aimtaptime = -1; // } // -// if (contGetStickYOnSample(i, contpad2) < -30 && contGetStickYOnSampleIndex(i, contpad2) >= -30) { +// if (joyGetStickYOnSample(i, contpad2) < -30 && joyGetStickYOnSampleIndex(i, contpad2) >= -30) { // if (movedata.crouchup) { // movedata.crouchup--; // } else { @@ -11057,7 +11057,7 @@ glabel var7f1ad8e4 // && g_Vars.coopplayernum < 0) { // movedata.eyesshut = g_Vars.currentplayer->insightaimmode // && !sp1a8 -// && contGetStickY(contpad2) < -30; +// && joyGetStickY(contpad2) < -30; // } // // // 9a24 @@ -11095,20 +11095,20 @@ glabel var7f1ad8e4 // movedata.unk58 = g_Vars.currentplayer->insightaimmode; // // if (g_Vars.currentplayer->waitforzrelease -// && contGetButtons(shootpad, shootallowedbuttons & Z_TRIG) == 0) { +// && joyGetButtons(shootpad, shootallowedbuttons & Z_TRIG) == 0) { // g_Vars.currentplayer->waitforzrelease = false; // } // // if (weaponHasFlag(handGetWeaponNum(HAND_RIGHT), WEAPONFLAG_80000000)) { // if (arg2 -// && contGetButtonsPressedThisFrame(shootpad, shootallowedbuttons & Z_TRIG) +// && joyGetButtonsPressedThisFrame(shootpad, shootallowedbuttons & Z_TRIG) // && g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED) { // movedata.btapcount++; // } // } else { // movedata.triggeron = g_Vars.currentplayer->waitforzrelease == false // && arg2 -// && contGetButtons(shootpad, shootallowedbuttons & Z_TRIG) +// && joyGetButtons(shootpad, shootallowedbuttons & Z_TRIG) // && g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED // && (sp1a2 & A_BUTTON) == 0 // && (spe6 & A_BUTTON) == 0; @@ -11135,7 +11135,7 @@ glabel var7f1ad8e4 // // 9c60 // if (optionsGetAimControl(g_Vars.currentplayerstats->mpindex) == AIMCONTROL_HOLD) { // for (i = 0; i < numsamples; i++) { -// sp14c[i] = arg2 && contGetButtonsOnSample(i, contpad1, aimbuttons & c1allowedbuttons); +// sp14c[i] = arg2 && joyGetButtonsOnSample(i, contpad1, aimbuttons & c1allowedbuttons); // spfc[i] = !sp14c[i]; // } // @@ -11143,11 +11143,11 @@ glabel var7f1ad8e4 // } // // // 9cf4 -// if (coreIsPaused() == false) { +// if (lvIsPaused() == false) { // // 9d04 // if (optionsGetAimControl(g_Vars.currentplayerstats->mpindex) != AIMCONTROL_HOLD) { // for (i = 0; i < numsamples; i++) { -// if (arg2 && contGetButtonsPressedOnSample(i, contpad1, aimbuttons & c1allowedbuttons)) { +// if (arg2 && joyGetButtonsPressedOnSample(i, contpad1, aimbuttons & c1allowedbuttons)) { // g_Vars.currentplayer->insightaimmode = !g_Vars.currentplayer->insightaimmode; // } // @@ -11171,8 +11171,8 @@ glabel var7f1ad8e4 // // Side stepping // if (g_Vars.currentplayer->insightaimmode == false) { // if (arg2) { -// movedata.digitalstepleft = contCountButtonsOnSpecificSamples(spfc, contpad1, c1allowedbuttons & (L_JPAD | L_CBUTTONS)); -// movedata.digitalstepright = contCountButtonsOnSpecificSamples(spfc, contpad1, c1allowedbuttons & (R_JPAD | R_CBUTTONS)); +// movedata.digitalstepleft = joyCountButtonsOnSpecificSamples(spfc, contpad1, c1allowedbuttons & (L_JPAD | L_CBUTTONS)); +// movedata.digitalstepright = joyCountButtonsOnSpecificSamples(spfc, contpad1, c1allowedbuttons & (R_JPAD | R_CBUTTONS)); // } // } else { // // This doesn't appear to be r-leaning. @@ -11214,8 +11214,8 @@ glabel var7f1ad8e4 // } // // if (!g_Vars.currentplayer->insightaimmode && arg2) { -// movedata.digitalstepleft = contCountButtonsOnSpecificSamples(spfc, contpad1, c1allowedbuttons & (L_JPAD | L_CBUTTONS)); -// movedata.digitalstepright = contCountButtonsOnSpecificSamples(spfc, contpad1, c1allowedbuttons & (R_JPAD | R_CBUTTONS)); +// movedata.digitalstepleft = joyCountButtonsOnSpecificSamples(spfc, contpad1, c1allowedbuttons & (L_JPAD | L_CBUTTONS)); +// movedata.digitalstepright = joyCountButtonsOnSpecificSamples(spfc, contpad1, c1allowedbuttons & (R_JPAD | R_CBUTTONS)); // } // // movedata.digitalstepforward = false; @@ -11286,14 +11286,14 @@ glabel var7f1ad8e4 // } // } else { // for (i = 0; i < numsamples; i++) { -// if (contGetButtonsOnSample(i, contpad1, invbuttons & c1allowedbuttons)) { +// if (joyGetButtonsOnSample(i, contpad1, invbuttons & c1allowedbuttons)) { // if (g_Vars.currentplayer->invdowntime > -2) { -// if (contGetButtonsPressedOnSample(i, contpad1, shootbuttons & c1allowedbuttons)) { +// if (joyGetButtonsPressedOnSample(i, contpad1, shootbuttons & c1allowedbuttons)) { // movedata.weaponbackoffset++; // g_Vars.currentplayer->invdowntime = -1; // } // -// if (g_Vars.currentplayer->invdowntime >= 0 && contGetButtonsOnSample(i, contpad1, shootbuttons & c1allowedbuttons) == 0) { +// if (g_Vars.currentplayer->invdowntime >= 0 && joyGetButtonsOnSample(i, contpad1, shootbuttons & c1allowedbuttons) == 0) { // // Holding A and haven't pressed Z // if (g_Vars.currentplayer->invdowntime > 15) { // amOpen(); @@ -11306,7 +11306,7 @@ glabel var7f1ad8e4 // } else { // // Wasn't holding A on this sample // if (g_Vars.currentplayer->invdowntime > 0 && -// (!arg2 || contGetButtonsOnSample(i, contpad1, shootbuttons & c1allowedbuttons) == 0)) { +// (!arg2 || joyGetButtonsOnSample(i, contpad1, shootbuttons & c1allowedbuttons) == 0)) { // // But was on previous sample, so cycle weapon // movedata.weaponforwardoffset++; // } @@ -11321,9 +11321,9 @@ glabel var7f1ad8e4 // // a340 // if (arg2) { // for (i = 0; i < numsamples; i++) { -// if (contGetButtonsOnSample(i, contpad1, c1allowedbuttons & B_BUTTON)) { +// if (joyGetButtonsOnSample(i, contpad1, c1allowedbuttons & B_BUTTON)) { // if (g_Vars.currentplayer->usedowntime >= -1) { -// if (contGetButtonsPressedOnSample(i, contpad1, shootbuttons & c1allowedbuttons) +// if (joyGetButtonsPressedOnSample(i, contpad1, shootbuttons & c1allowedbuttons) // && g_Vars.currentplayer->usedowntime >= 0 // && currentPlayerConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, 1, 0)) { // g_Vars.currentplayer->usedowntime = -3; @@ -11386,7 +11386,7 @@ glabel var7f1ad8e4 // if (arg2) { // for (i = 0; i < numsamples; i++) { // if (sp1a8 == 0 && sp14c[i]) { -// if (contGetButtonsPressedOnSample(i, contpad1, c1allowedbuttons & (U_JPAD | U_CBUTTONS))) { +// if (joyGetButtonsPressedOnSample(i, contpad1, c1allowedbuttons & (U_JPAD | U_CBUTTONS))) { // if (movedata.crouchdown) { // movedata.crouchdown--; // } else { @@ -11396,7 +11396,7 @@ glabel var7f1ad8e4 // g_Vars.currentplayer->aimtaptime = -1; // } // -// if (contGetButtonsPressedOnSample(i, contpad1, c1allowedbuttons & (D_JPAD | D_CBUTTONS))) { +// if (joyGetButtonsPressedOnSample(i, contpad1, c1allowedbuttons & (D_JPAD | D_CBUTTONS))) { // if (movedata.crouchup) { // movedata.crouchup--; // } else { @@ -11437,7 +11437,7 @@ glabel var7f1ad8e4 // && g_Vars.coopplayernum <= -1) { // movedata.eyesshut = g_Vars.currentplayer->insightaimmode // && sp1a8 == 0 -// && contGetButtons(contpad1, c1allowedbuttons & (D_JPAD | D_CBUTTONS)); +// && joyGetButtons(contpad1, c1allowedbuttons & (D_JPAD | D_CBUTTONS)); // } // // if (handGetWeaponNum(HAND_RIGHT) == WEAPON_FARSIGHTXR20) { @@ -12022,7 +12022,7 @@ void bmoveTick(bool arg0, bool arg1, bool arg2, bool arg3) sound = chrChooseFootstepSound(chr, distance > 10); if (sound != -1) { - func00010718(0, 0, 0x7fff, 0x40, sound, 1, 1, -1, 1); + snd00010718(0, 0, 0x7fff, 0x40, sound, 1, 1, -1, 1); } } } diff --git a/src/game/bondview.c b/src/game/bondview.c index 84286deb8..dfb23826f 100644 --- a/src/game/bondview.c +++ b/src/game/bondview.c @@ -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; diff --git a/src/game/bondwalk.c b/src/game/bondwalk.c index 38e4b6baf..b59ad605f 100644 --- a/src/game/bondwalk.c +++ b/src/game/bondwalk.c @@ -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) { diff --git a/src/game/camdraw.c b/src/game/camdraw.c index 6ea83ddfd..59460435a 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -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" diff --git a/src/game/casing/tick.c b/src/game/casing/tick.c index 20d78ba48..0717ac6e3 100644 --- a/src/game/casing/tick.c +++ b/src/game/casing/tick.c @@ -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 diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index fc897a7c2..8a1117cde 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -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" diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index 56ef8e39b..df367e3fc 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -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; diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index bc9f28df8..d764d8b60 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -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; } diff --git a/src/game/credits.c b/src/game/credits.c index 3c12d83b4..a7e40074d 100644 --- a/src/game/credits.c +++ b/src/game/credits.c @@ -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); // } // diff --git a/src/game/dlights.c b/src/game/dlights.c index e237a3270..6d402459f 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -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) diff --git a/src/game/endscreen.c b/src/game/endscreen.c index 8c499c9c2..8ae8c8dcd 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -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; diff --git a/src/game/explosions/explosions.c b/src/game/explosions/explosions.c index 6bd1200ff..a07ea6d1b 100644 --- a/src/game/explosions/explosions.c +++ b/src/game/explosions/explosions.c @@ -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" diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c index a064e728a..2bb487bd4 100644 --- a/src/game/game_005fd0.c +++ b/src/game/game_005fd0.c @@ -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" diff --git a/src/game/game_006900.c b/src/game/game_006900.c index 604f24d17..be1ca8d31 100644 --- a/src/game/game_006900.c +++ b/src/game/game_006900.c @@ -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" diff --git a/src/game/game_006bd0.c b/src/game/game_006bd0.c index 4e04c64a7..f12c32433 100644 --- a/src/game/game_006bd0.c +++ b/src/game/game_006bd0.c @@ -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" diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 5703a30ab..4310da816 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -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; } diff --git a/src/game/game_0125a0.c b/src/game/game_0125a0.c index fa479644c..3eca64a1a 100644 --- a/src/game/game_0125a0.c +++ b/src/game/game_0125a0.c @@ -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" diff --git a/src/game/game_012aa0.c b/src/game/game_012aa0.c index da0a9e3c2..b6ab4fcc4 100644 --- a/src/game/game_012aa0.c +++ b/src/game/game_012aa0.c @@ -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" diff --git a/src/game/game_013cf0.c b/src/game/game_013cf0.c index 04a368500..ad57d7c4e 100644 --- a/src/game/game_013cf0.c +++ b/src/game/game_013cf0.c @@ -1,7 +1,7 @@ #include #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" diff --git a/src/game/game_013ee0.c b/src/game/game_013ee0.c index d5daef7c3..eaf814930 100644 --- a/src/game/game_013ee0.c +++ b/src/game/game_013ee0.c @@ -1,7 +1,7 @@ #include #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" diff --git a/src/game/game_0150a0.c b/src/game/game_0150a0.c index a16443673..54140777c 100644 --- a/src/game/game_0150a0.c +++ b/src/game/game_0150a0.c @@ -1,7 +1,7 @@ #include #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)) { diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index 70f54617b..de6898c48 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -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) { diff --git a/src/game/game_02cde0.c b/src/game/game_02cde0.c index b29c621a4..ebfdd4818 100644 --- a/src/game/game_02cde0.c +++ b/src/game/game_02cde0.c @@ -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; diff --git a/src/game/game_091e10.c b/src/game/game_091e10.c index 7a302a604..265f8f15e 100644 --- a/src/game/game_091e10.c +++ b/src/game/game_091e10.c @@ -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" diff --git a/src/game/game_092610.c b/src/game/game_092610.c index c23e635fc..ebe4f18ff 100644 --- a/src/game/game_092610.c +++ b/src/game/game_092610.c @@ -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) diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index 2368db78e..74aae4c58 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -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)); diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c index 67dab328f..c546f3c0a 100644 --- a/src/game/game_0b3350.c +++ b/src/game/game_0b3350.c @@ -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" diff --git a/src/game/game_0b4950.c b/src/game/game_0b4950.c index 7d24949a2..7af462728 100644 --- a/src/game/game_0b4950.c +++ b/src/game/game_0b4950.c @@ -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" diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 1a27cccee..60db6e3e6 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -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" diff --git a/src/game/game_0b69d0.c b/src/game/game_0b69d0.c index 462f95ecf..7ab6c7fe9 100644 --- a/src/game/game_0b69d0.c +++ b/src/game/game_0b69d0.c @@ -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; diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index ba236b61e..383b169be 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -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) diff --git a/src/game/game_102240.c b/src/game/game_102240.c index 2d1a12f47..cf28b7b1d 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -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; } } diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index 05f942171..6c746476b 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -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 diff --git a/src/game/game_110680.c b/src/game/game_110680.c index d45f8cac9..5e2008828 100644 --- a/src/game/game_110680.c +++ b/src/game/game_110680.c @@ -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; diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c index 8a1f693a0..e08a97664 100644 --- a/src/game/game_13c510.c +++ b/src/game/game_13c510.c @@ -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" diff --git a/src/game/game_165670.c b/src/game/game_165670.c index a7255f4a8..6529bc2a6 100644 --- a/src/game/game_165670.c +++ b/src/game/game_165670.c @@ -1,7 +1,7 @@ #include #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" diff --git a/src/game/game_1657c0.c b/src/game/game_1657c0.c index 93179e155..eb0a40394 100644 --- a/src/game/game_1657c0.c +++ b/src/game/game_1657c0.c @@ -1,7 +1,7 @@ #include #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" diff --git a/src/game/game_173520.c b/src/game/game_173520.c index 45a0ba182..7587cd9b7 100644 --- a/src/game/game_173520.c +++ b/src/game/game_173520.c @@ -1,7 +1,7 @@ #include #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" diff --git a/src/game/game_173a00.c b/src/game/game_173a00.c index 1afccefab..29297fbda 100644 --- a/src/game/game_173a00.c +++ b/src/game/game_173a00.c @@ -1,7 +1,7 @@ #include #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" diff --git a/src/game/game_190260.c b/src/game/game_190260.c index de90edc57..205689e2c 100644 --- a/src/game/game_190260.c +++ b/src/game/game_190260.c @@ -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" diff --git a/src/game/game_1a7560.c b/src/game/game_1a7560.c index 845b6d4b2..bc845bee7 100644 --- a/src/game/game_1a7560.c +++ b/src/game/game_1a7560.c @@ -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" diff --git a/src/game/gamefile.c b/src/game/gamefile.c index 48ca51967..2960581f4 100644 --- a/src/game/gamefile.c +++ b/src/game/gamefile.c @@ -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 diff --git a/src/game/hudmsg.c b/src/game/hudmsg.c index d0291e580..b7367956c 100644 --- a/src/game/hudmsg.c +++ b/src/game/hudmsg.c @@ -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) diff --git a/src/game/core.c b/src/game/lv.c similarity index 96% rename from src/game/core.c rename to src/game/lv.c index b861954fb..f5580372e 100644 --- a/src/game/core.c +++ b/src/game/lv.c @@ -72,11 +72,11 @@ #include "game/game_13c510.h" #include "game/bondview.h" #include "game/game_1531a0.h" -#include "game/room.h" +#include "game/bg.h" #include "game/game_165670.h" -#include "game/core.h" +#include "game/lv.h" #include "game/music.h" -#include "game/texture.h" +#include "game/texdecompress.h" #include "game/game_176080.h" #include "game/mplayer/setup.h" #include "game/mplayer/scenarios.h" @@ -92,12 +92,12 @@ #include "game/wallhit.h" #include "bss.h" #include "lib/args.h" -#include "lib/controller.h" +#include "lib/joy.h" #include "lib/lib_06440.h" #include "lib/lib_09a80.h" #include "lib/lib_09a80.h" #include "lib/main.h" -#include "lib/lib_0e9d0.h" +#include "lib/snd.h" #include "lib/lib_11420.h" #include "lib/rng.h" #include "lib/lib_16110.h" @@ -177,13 +177,13 @@ void setVar80084040(u32 value) var80084040 = value; } -void func0f167af8(void) +void lv0f167af8(void) { g_Vars.lockscreen = 0; g_Vars.unk0004d8 = -1; } -void coreStopAllMiscSfx(void) +void lvStopAllMiscSfx(void) { s32 i; @@ -193,7 +193,7 @@ void coreStopAllMiscSfx(void) } } -s32 coreGetMiscSfxIndex(u32 type) +s32 lvGetMiscSfxIndex(u32 type) { s32 i; @@ -207,20 +207,20 @@ s32 coreGetMiscSfxIndex(u32 type) } #if VERSION >= VERSION_NTSC_1_0 -void coreSetMiscSfxState(u32 type, bool play) +void lvSetMiscSfxState(u32 type, bool play) { if (play) { - if (coreGetMiscSfxIndex(type) == -1) { - s32 index = coreGetMiscSfxIndex(-1); + if (lvGetMiscSfxIndex(type) == -1) { + s32 index = lvGetMiscSfxIndex(-1); if (index != -1 && g_MiscSfxAudioHandles[index] == NULL) { - audioStart(var80095200, g_MiscSfxSounds[type], &g_MiscSfxAudioHandles[index], -1, -1, -1, -1, -1); + sndStart(var80095200, g_MiscSfxSounds[type], &g_MiscSfxAudioHandles[index], -1, -1, -1, -1, -1); g_MiscSfxActiveTypes[index] = type; } } } else { u32 stack; - s32 index = coreGetMiscSfxIndex(type); + s32 index = lvGetMiscSfxIndex(type); if (index != -1) { audioStop(g_MiscSfxAudioHandles[index]); @@ -230,16 +230,16 @@ void coreSetMiscSfxState(u32 type, bool play) } #else GLOBAL_ASM( -glabel coreSetMiscSfxState +glabel lvSetMiscSfxState /* f1624c4: 27bdffc0 */ addiu $sp,$sp,-64 /* f1624c8: 10a00027 */ beqz $a1,.NB0f162568 /* f1624cc: afbf0024 */ sw $ra,0x24($sp) -/* f1624d0: 0fc58922 */ jal coreGetMiscSfxIndex +/* f1624d0: 0fc58922 */ jal lvGetMiscSfxIndex /* f1624d4: afa40040 */ sw $a0,0x40($sp) /* f1624d8: 2401ffff */ addiu $at,$zero,-1 /* f1624dc: 54410036 */ bnel $v0,$at,.NB0f1625b8 /* f1624e0: 8fbf0024 */ lw $ra,0x24($sp) -/* f1624e4: 0fc58922 */ jal coreGetMiscSfxIndex +/* f1624e4: 0fc58922 */ jal lvGetMiscSfxIndex /* f1624e8: 2404ffff */ addiu $a0,$zero,-1 /* f1624ec: 2401ffff */ addiu $at,$zero,-1 /* f1624f0: 10410030 */ beq $v0,$at,.NB0f1625b4 @@ -264,7 +264,7 @@ glabel coreSetMiscSfxState /* f16253c: 84a568a6 */ lh $a1,0x68a6($a1) /* f162540: 8c848180 */ lw $a0,-0x7e80($a0) /* f162544: 2407ffff */ addiu $a3,$zero,-1 -/* f162548: 0c004338 */ jal audioStart +/* f162548: 0c004338 */ jal sndStart /* f16254c: e7a40014 */ swc1 $f4,0x14($sp) /* f162550: 8fa30030 */ lw $v1,0x30($sp) /* f162554: 8fab0040 */ lw $t3,0x40($sp) @@ -273,7 +273,7 @@ glabel coreSetMiscSfxState /* f162560: 10000014 */ beqz $zero,.NB0f1625b4 /* f162564: ac2bee70 */ sw $t3,-0x1190($at) .NB0f162568: -/* f162568: 0fc58922 */ jal coreGetMiscSfxIndex +/* f162568: 0fc58922 */ jal lvGetMiscSfxIndex /* f16256c: 00000000 */ sll $zero,$zero,0x0 /* f162570: 2401ffff */ addiu $at,$zero,-1 /* f162574: 1041000f */ beq $v0,$at,.NB0f1625b4 @@ -301,21 +301,21 @@ glabel coreSetMiscSfxState ); #endif -void coreUpdateMiscSfx(void) +void lvUpdateMiscSfx(void) { s32 i; if (g_Vars.lvupdate240 == 0) { for (i = 0; i != ARRAYCOUNT(g_MiscSfxActiveTypes); i++) { - coreSetMiscSfxState(i, false); + lvSetMiscSfxState(i, false); } } else { bool usingboost = g_Vars.speedpillon - && coreGetSlowMotionType() == SLOWMOTION_OFF + && lvGetSlowMotionType() == SLOWMOTION_OFF && g_Vars.in_cutscene == false; bool usingrocket; - coreSetMiscSfxState(MISCSFX_BOOSTHEARTBEAT, usingboost); + lvSetMiscSfxState(MISCSFX_BOOSTHEARTBEAT, usingboost); usingrocket = false; @@ -325,8 +325,8 @@ void coreUpdateMiscSfx(void) } } - coreSetMiscSfxState(MISCSFX_SLAYERROCKETHUM, usingrocket); - coreSetMiscSfxState(MISCSFX_SLAYERROCKETBEEP, usingrocket); + lvSetMiscSfxState(MISCSFX_SLAYERROCKETHUM, usingrocket); + lvSetMiscSfxState(MISCSFX_SLAYERROCKETBEEP, usingrocket); } if (g_Vars.lvupdate240 == 0 && g_MiscAudioHandle && audioIsPlaying(g_MiscAudioHandle)) { @@ -335,14 +335,14 @@ void coreUpdateMiscSfx(void) } #if VERSION >= VERSION_NTSC_1_0 -void coreLoadStage(s32 stagenum) +void lvInit(s32 stagenum) { - coreCancelFade(); + lvCancelFade(); var80084014 = false; var80084010 = 0; - func00013900(); + joy00013900(); g_Vars.unk0004d8 = 10; g_Vars.unk0004d1 = 0; @@ -467,7 +467,7 @@ void coreLoadStage(s32 stagenum) smokeInit(); sparksInit(); weatherInit(); - coreStopAllMiscSfx(); + lvStopAllMiscSfx(); switch (g_Vars.stagenum) { case STAGE_ESCAPE: @@ -533,7 +533,7 @@ void coreLoadStage(s32 stagenum) } func0f11a2e4(); - func0000eadc(); + snd0000eadc(); if (stagenum == STAGE_BOOTPAKMENU) { pakPushPakMenuDialog(); @@ -550,13 +550,13 @@ void coreLoadStage(s32 stagenum) func0f011124(false); var80084018 = 1; bbufResetIndexes(); - coreSetPaused(0); + lvSetPaused(0); #if PIRACYCHECKS { u32 checksum = 0; - s32 *i = (s32 *)&coreGetSlowMotionType; - s32 *end = (s32 *)&coreTick; + s32 *i = (s32 *)&lvGetSlowMotionType; + s32 *end = (s32 *)&lvTick; while (i < end) { checksum += *i; @@ -578,80 +578,80 @@ void coreLoadStage(s32 stagenum) } #else GLOBAL_ASM( -glabel coreLoadStage +glabel lvInit .late_rodata glabel var7f1b1ed8nc -.word coreLoadStage+0x38c +.word lvInit+0x38c glabel var7f1b1edcnc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1ee0nc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1ee4nc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1ee8nc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1eecnc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1ef0nc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1ef4nc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1ef8nc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1efcnc -.word coreLoadStage+0x38c +.word lvInit+0x38c glabel var7f1b1f00nc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1f04nc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1f08nc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1f0cnc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1f10nc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1f14nc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1f18nc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1f1cnc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1f20nc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1f24nc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1f28nc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1f2cnc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1f30nc -.word coreLoadStage+0x38c +.word lvInit+0x38c glabel var7f1b1f34nc -.word coreLoadStage+0x38c +.word lvInit+0x38c glabel var7f1b1f38nc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1f3cnc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1f40nc -.word coreLoadStage+0x394 +.word lvInit+0x394 glabel var7f1b1f44nc -.word coreLoadStage+0x38c +.word lvInit+0x38c .text /* f1627b8: 27bdffe0 */ addiu $sp,$sp,-32 /* f1627bc: afbf001c */ sw $ra,0x1c($sp) /* f1627c0: afb10018 */ sw $s1,0x18($sp) /* f1627c4: afb00014 */ sw $s0,0x14($sp) -/* f1627c8: 0fc58c64 */ jal coreCancelFade +/* f1627c8: 0fc58c64 */ jal lvCancelFade /* f1627cc: afa40020 */ sw $a0,0x20($sp) /* f1627d0: 3c018008 */ lui $at,0x8008 /* f1627d4: ac206874 */ sw $zero,0x6874($at) /* f1627d8: 3c018008 */ lui $at,0x8008 -/* f1627dc: 0c005812 */ jal func000150c4 +/* f1627dc: 0c005812 */ jal joy000150c4 /* f1627e0: ac206870 */ sw $zero,0x6870($at) /* f1627e4: 10400008 */ beqz $v0,.NB0f162808 /* f1627e8: 3c057f1b */ lui $a1,0x7f1b /* f1627ec: 24a51e20 */ addiu $a1,$a1,0x1e20 -/* f1627f0: 0c00581b */ jal func000150e8 +/* f1627f0: 0c00581b */ jal joy000150e8 /* f1627f4: 240402f8 */ addiu $a0,$zero,0x2f8 /* f1627f8: 3c11800a */ lui $s1,0x800a /* f1627fc: 2631e6c0 */ addiu $s1,$s1,-6464 @@ -858,7 +858,7 @@ glabel var7f1b1f44nc /* f162aec: 00000000 */ sll $zero,$zero,0x0 /* f162af0: 0fc04bf0 */ jal weatherInit /* f162af4: 00000000 */ sll $zero,$zero,0x0 -/* f162af8: 0fc58914 */ jal coreStopAllMiscSfx +/* f162af8: 0fc58914 */ jal lvStopAllMiscSfx /* f162afc: 00000000 */ sll $zero,$zero,0x0 /* f162b00: 8e2204b4 */ lw $v0,0x4b4($s1) /* f162b04: 28410035 */ slti $at,$v0,0x35 @@ -1050,7 +1050,7 @@ glabel var7f1b1f44nc .NB0f162da0: /* f162da0: 0fc4506d */ jal func0f11a2e4 /* f162da4: 00000000 */ sll $zero,$zero,0x0 -/* f162da8: 0c003ca1 */ jal func0000eadc +/* f162da8: 0c003ca1 */ jal snd0000eadc /* f162dac: 00000000 */ sll $zero,$zero,0x0 /* f162db0: 8fab0020 */ lw $t3,0x20($sp) /* f162db4: 2401005b */ addiu $at,$zero,0x5b @@ -1081,7 +1081,7 @@ glabel var7f1b1f44nc /* f162e0c: 3c018008 */ lui $at,0x8008 /* f162e10: 0c0009d6 */ jal bbufResetIndexes /* f162e14: e42a6878 */ swc1 $f10,0x6878($at) -/* f162e18: 0fc59ebc */ jal coreSetPaused +/* f162e18: 0fc59ebc */ jal lvSetPaused /* f162e1c: 00002025 */ or $a0,$zero,$zero /* f162e20: 8fbf001c */ lw $ra,0x1c($sp) /* f162e24: 8fb00014 */ lw $s0,0x14($sp) @@ -1091,7 +1091,7 @@ glabel var7f1b1f44nc ); #endif -void coreConfigureFade(u32 color, s16 num_frames) +void lvConfigureFade(u32 color, s16 num_frames) { g_FadeNumFrames = num_frames; g_FadePrevColour = g_FadeColour; @@ -1107,7 +1107,7 @@ void coreConfigureFade(u32 color, s16 num_frames) g_FadeDelay = 2; } -Gfx *coreRenderFade(Gfx *gdl) +Gfx *lvRenderFade(Gfx *gdl) { u32 colour = g_FadeColour; u32 inset = 0; @@ -1158,12 +1158,12 @@ Gfx *coreRenderFade(Gfx *gdl) return func0f153838(gdl); } -bool coreIsFadeActive(void) +bool lvIsFadeActive(void) { return g_FadeFrac >= 0; } -void coreCancelFade(void) +void lvCancelFade(void) { g_FadeNumFrames = 0; g_FadeFrac = -1; @@ -1172,7 +1172,7 @@ void coreCancelFade(void) g_FadeDelay = 0; } -bool coreCheckCmpFollowThreat(struct threat *threat, s32 index) +bool lvCheckCmpFollowThreat(struct threat *threat, s32 index) { f32 sp76; f32 sp72; @@ -1526,7 +1526,7 @@ glabel var7f1b1f68 ); #endif -void coreFindThreatsForProp(struct prop *prop, bool inchild, struct coord *playerpos, bool *activeslots, f32 *distances) +void lvFindThreatsForProp(struct prop *prop, bool inchild, struct coord *playerpos, bool *activeslots, f32 *distances) { bool condition = true; struct defaultobj *obj; @@ -1646,11 +1646,11 @@ void coreFindThreatsForProp(struct prop *prop, bool inchild, struct coord *playe } if (prop->child) { - coreFindThreatsForProp(prop->child, true, playerpos, activeslots, distances); + lvFindThreatsForProp(prop->child, true, playerpos, activeslots, distances); } if (inchild && prop->next) { - coreFindThreatsForProp(prop->next, inchild, playerpos, activeslots, distances); + lvFindThreatsForProp(prop->next, inchild, playerpos, activeslots, distances); } } @@ -1711,7 +1711,7 @@ void func0f168f24(struct prop *prop, bool inchild, struct coord *playerpos, s32 } } -void coreFindThreats(void) +void lvFindThreats(void) { s32 i; struct prop *prop; @@ -1748,7 +1748,7 @@ void coreFindThreats(void) prop = *propptr; if (prop) { - coreFindThreatsForProp(prop, false, &campos, activeslots, distances); + lvFindThreatsForProp(prop, false, &campos, activeslots, distances); } propptr--; @@ -1760,7 +1760,7 @@ struct coord coreRender_spd4 = {0, 0, 0}; s8 coreRender_spd0[] = {30, 0, 0, 0}; GLOBAL_ASM( -glabel coreRender +glabel lvRender .late_rodata glabel var7f1b8e64pf .word 0x3f866666 @@ -1895,7 +1895,7 @@ glabel var7f1b8e7cpf /* f16a4b8: 016e6025 */ or $t4,$t3,$t6 /* f16a4bc: 0fc06bf9 */ jal titleRender /* f16a4c0: ae2c0004 */ sw $t4,0x4($s1) -/* f16a4c4: 0fc5a557 */ jal coreRenderFade +/* f16a4c4: 0fc5a557 */ jal lvRenderFade /* f16a4c8: 00402025 */ move $a0,$v0 /* f16a4cc: 100005e8 */ b .PF0f16bc70 /* f16a4d0: 00409825 */ move $s3,$v0 @@ -2622,7 +2622,7 @@ glabel var7f1b8e7cpf /* f16af5c: 3c050008 */ lui $a1,0x8 /* f16af60: 10400005 */ beqz $v0,.PF0f16af78 /* f16af64: 00000000 */ nop -/* f16af68: 0fc5a851 */ jal coreFindThreats +/* f16af68: 0fc5a851 */ jal lvFindThreats /* f16af6c: 00000000 */ nop /* f16af70: 10000033 */ b .PF0f16b040 /* f16af74: 8e500284 */ lw $s0,0x284($s2) @@ -2654,7 +2654,7 @@ glabel var7f1b8e7cpf /* f16afd8: 8e440284 */ lw $a0,0x284($s2) .PF0f16afdc: /* f16afdc: 02e02825 */ move $a1,$s7 -/* f16afe0: 0fc5a620 */ jal coreCheckCmpFollowThreat +/* f16afe0: 0fc5a620 */ jal lvCheckCmpFollowThreat /* f16afe4: 24841624 */ addiu $a0,$a0,0x1624 /* f16afe8: 54400004 */ bnezl $v0,.PF0f16affc /* f16afec: 00008825 */ move $s1,$zero @@ -2667,7 +2667,7 @@ glabel var7f1b8e7cpf /* f16b000: 8e4a0284 */ lw $t2,0x284($s2) /* f16b004: 02202825 */ move $a1,$s1 /* f16b008: 01502021 */ addu $a0,$t2,$s0 -/* f16b00c: 0fc5a620 */ jal coreCheckCmpFollowThreat +/* f16b00c: 0fc5a620 */ jal lvCheckCmpFollowThreat /* f16b010: 24841630 */ addiu $a0,$a0,0x1630 /* f16b014: 14400007 */ bnez $v0,.PF0f16b034 /* f16b018: 26310001 */ addiu $s1,$s1,0x1 @@ -2710,7 +2710,7 @@ glabel var7f1b8e7cpf /* f16b0a4: afb70010 */ sw $s7,0x10($sp) /* f16b0a8: e7b40014 */ swc1 $f20,0x14($sp) /* f16b0ac: afb70018 */ sw $s7,0x18($sp) -/* f16b0b0: 0c0041a0 */ jal audioStart +/* f16b0b0: 0c0041a0 */ jal sndStart /* f16b0b4: afb7001c */ sw $s7,0x1c($sp) /* f16b0b8: 10000053 */ b .PF0f16b208 /* f16b0bc: 8e500284 */ lw $s0,0x284($s2) @@ -2730,7 +2730,7 @@ glabel var7f1b8e7cpf /* f16b0f0: afb70010 */ sw $s7,0x10($sp) /* f16b0f4: e7b40014 */ swc1 $f20,0x14($sp) /* f16b0f8: afb70018 */ sw $s7,0x18($sp) -/* f16b0fc: 0c0041a0 */ jal audioStart +/* f16b0fc: 0c0041a0 */ jal sndStart /* f16b100: afb7001c */ sw $s7,0x1c($sp) /* f16b104: 8e500284 */ lw $s0,0x284($s2) /* f16b108: 240b001c */ li $t3,0x1c @@ -2763,7 +2763,7 @@ glabel var7f1b8e7cpf /* f16b170: afb70010 */ sw $s7,0x10($sp) /* f16b174: e7b40014 */ swc1 $f20,0x14($sp) /* f16b178: afb70018 */ sw $s7,0x18($sp) -/* f16b17c: 0c0041a0 */ jal audioStart +/* f16b17c: 0c0041a0 */ jal sndStart /* f16b180: afb7001c */ sw $s7,0x1c($sp) .PF0f16b184: /* f16b184: 10000020 */ b .PF0f16b208 @@ -2928,7 +2928,7 @@ glabel var7f1b8e7cpf /* f16b3d8: afb70010 */ sw $s7,0x10($sp) /* f16b3dc: e7b40014 */ swc1 $f20,0x14($sp) /* f16b3e0: afb70018 */ sw $s7,0x18($sp) -/* f16b3e4: 0c0041a0 */ jal audioStart +/* f16b3e4: 0c0041a0 */ jal sndStart /* f16b3e8: afb7001c */ sw $s7,0x1c($sp) .PF0f16b3ec: /* f16b3ec: 3c188008 */ lui $t8,0x8008 @@ -2973,7 +2973,7 @@ glabel var7f1b8e7cpf /* f16b484: afb70010 */ sw $s7,0x10($sp) /* f16b488: e7b40014 */ swc1 $f20,0x14($sp) /* f16b48c: afb70018 */ sw $s7,0x18($sp) -/* f16b490: 0c0041a0 */ jal audioStart +/* f16b490: 0c0041a0 */ jal sndStart /* f16b494: afb7001c */ sw $s7,0x1c($sp) .PF0f16b498: /* f16b498: 3c188008 */ lui $t8,0x8008 @@ -3000,7 +3000,7 @@ glabel var7f1b8e7cpf /* f16b4e8: afb70010 */ sw $s7,0x10($sp) /* f16b4ec: e7b40014 */ swc1 $f20,0x14($sp) /* f16b4f0: afb70018 */ sw $s7,0x18($sp) -/* f16b4f4: 0c0041a0 */ jal audioStart +/* f16b4f4: 0c0041a0 */ jal sndStart /* f16b4f8: afb7001c */ sw $s7,0x1c($sp) .PF0f16b4fc: /* f16b4fc: 12000005 */ beqz $s0,.PF0f16b514 @@ -3124,7 +3124,7 @@ glabel var7f1b8e7cpf /* f16b6a8: 8e4a0464 */ lw $t2,0x464($s2) /* f16b6ac: 55400015 */ bnezl $t2,.PF0f16b704 /* f16b6b0: 2861000d */ slti $at,$v1,0xd -/* f16b6b4: 0fc5b180 */ jal coreGetSlowMotionType +/* f16b6b4: 0fc5b180 */ jal lvGetSlowMotionType /* f16b6b8: 00000000 */ nop /* f16b6bc: 10400003 */ beqz $v0,.PF0f16b6cc /* f16b6c0: 3c048009 */ lui $a0,0x8009 @@ -3142,7 +3142,7 @@ glabel var7f1b8e7cpf /* f16b6e8: afb70010 */ sw $s7,0x10($sp) /* f16b6ec: e7b40014 */ swc1 $f20,0x14($sp) /* f16b6f0: afb70018 */ sw $s7,0x18($sp) -/* f16b6f4: 0c0041a0 */ jal audioStart +/* f16b6f4: 0c0041a0 */ jal sndStart /* f16b6f8: afb7001c */ sw $s7,0x1c($sp) /* f16b6fc: 8e430460 */ lw $v1,0x460($s2) /* f16b700: 2861000d */ slti $at,$v1,0xd @@ -3433,7 +3433,7 @@ glabel var7f1b8e7cpf .PF0f16bb1c: /* f16bb1c: 0fc619de */ jal func0f185774 /* f16bb20: 02602025 */ move $a0,$s3 -/* f16bb24: 0fc5a557 */ jal coreRenderFade +/* f16bb24: 0fc5a557 */ jal lvRenderFade /* f16bb28: 00402025 */ move $a0,$v0 /* f16bb2c: 3c0f8009 */ lui $t7,0x8009 /* f16bb30: 91ef8d54 */ lbu $t7,-0x72ac($t7) @@ -3590,7 +3590,7 @@ glabel var7f1b8e7cpf /* f16bd5c: 920b0000 */ lbu $t3,0x0($s0) /* f16bd60: 00002025 */ move $a0,$zero /* f16bd64: 316cff01 */ andi $t4,$t3,0xff01 -/* f16bd68: 0fc5b6fd */ jal coreSetDifficulty +/* f16bd68: 0fc5b6fd */ jal lvSetDifficulty /* f16bd6c: a20c0000 */ sb $t4,0x0($s0) /* f16bd70: 825904d4 */ lb $t9,0x4d4($s2) /* f16bd74: 00197080 */ sll $t6,$t9,0x2 @@ -3693,7 +3693,7 @@ glabel var7f1b8e7cpf * - random static in the Infiltration intro cutscene * - combat boost activation and reverting */ -Gfx *coreRender(Gfx *gdl) +Gfx *lvRender(Gfx *gdl) { gSPSegment(gdl++, 0x00, 0x00000000); @@ -3718,7 +3718,7 @@ Gfx *coreRender(Gfx *gdl) (viGetViewTop() + viGetViewHeight()) * 4.0f); gdl = titleRender(gdl); - gdl = coreRenderFade(gdl); + gdl = lvRenderFade(gdl); } else if (g_Vars.stagenum == STAGE_BOOTPAKMENU) { gSPClipRatio(gdl++, FRUSTRATIO_2); gSPDisplayList(gdl++, &var800613a0); @@ -3930,7 +3930,7 @@ Gfx *coreRender(Gfx *gdl) } if (handHasFunctionFlags(&g_Vars.currentplayer->hands[0].base, FUNCFLAG_00080000)) { - coreFindThreats(); + lvFindThreats(); } else if (weaponHasFlag(handGetWeaponNum(HAND_RIGHT), WEAPONFLAG_AIMTRACK)) { s32 j; @@ -3938,12 +3938,12 @@ Gfx *coreRender(Gfx *gdl) && g_Vars.currentplayer->lookingatprop.prop && bmoveIsInSightAimMode()) { func0f1a0924(g_Vars.currentplayer->lookingatprop.prop); - } else if (coreCheckCmpFollowThreat(&g_Vars.currentplayer->lookingatprop, -1) == 0) { + } else if (lvCheckCmpFollowThreat(&g_Vars.currentplayer->lookingatprop, -1) == 0) { g_Vars.currentplayer->lookingatprop.prop = NULL; } for (j = 0; j < ARRAYCOUNT(g_Vars.currentplayer->cmpfollowprops); j++) { - if (!coreCheckCmpFollowThreat(&g_Vars.currentplayer->cmpfollowprops[j], j)) { + if (!lvCheckCmpFollowThreat(&g_Vars.currentplayer->cmpfollowprops[j], j)) { g_Vars.currentplayer->cmpfollowprops[j].unk04 = -1; g_Vars.currentplayer->cmpfollowprops[j].unk08 = -2; } @@ -3956,12 +3956,12 @@ Gfx *coreRender(Gfx *gdl) && g_Vars.currentplayer->eyespy->camerabuttonheld) { if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) { objectiveCheckHolograph(400); - audioStart(var80095200, SFX_CAMSPY_SHUTTER, 0, -1, -1, -1, -1, -1); + sndStart(var80095200, SFX_CAMSPY_SHUTTER, 0, -1, -1, -1, -1, -1); } else if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) { if (g_Vars.currentplayer->eyespydarts) { // Fire dart struct coord direction; - audioStart(var80095200, SFX_DRUGSPY_FIREDART, 0, -1, -1, -1, -1, -1); + sndStart(var80095200, SFX_DRUGSPY_FIREDART, 0, -1, -1, -1, -1, -1); g_Vars.currentplayer->eyespydarts--; direction.x = g_Vars.currentplayer->eyespy->look.x; @@ -3972,7 +3972,7 @@ Gfx *coreRender(Gfx *gdl) &g_Vars.currentplayer->eyespy->prop->pos, &direction, WEAPON_TRANQUILIZER, NULL); } else { // No dart ammo - audioStart(var80095200, SFX_DRUGSPY_FIREEMPTY, 0, -1, -1, -1, -1, -1); + sndStart(var80095200, SFX_DRUGSPY_FIREEMPTY, 0, -1, -1, -1, -1, -1); } } else { // EYESPYMODE_BOMBSPY struct coord spd4 = {0, 0, 0}; @@ -4086,7 +4086,7 @@ Gfx *coreRender(Gfx *gdl) cutscenehasstatic = true; if (g_CutsceneStaticAudioHandle == NULL) { - audioStart(var80095200, SFX_INFIL_STATIC_LONG, &g_CutsceneStaticAudioHandle, -1, -1, -1, -1, -1); + sndStart(var80095200, SFX_INFIL_STATIC_LONG, &g_CutsceneStaticAudioHandle, -1, -1, -1, -1, -1); } g_CutsceneStaticTimer -= g_Vars.diffframe60; @@ -4101,7 +4101,7 @@ Gfx *coreRender(Gfx *gdl) if (g_CutsceneStaticTimer < 15) { if (g_CutsceneStaticActive == false) { g_CutsceneStaticActive = true; - audioStart(var80095200, SFX_INFIL_STATIC_MEDIUM, NULL, -1, -1, -1, -1, -1); + sndStart(var80095200, SFX_INFIL_STATIC_MEDIUM, NULL, -1, -1, -1, -1, -1); } cutscenestatic = 225 - g_CutsceneStaticTimer * 10; @@ -4111,7 +4111,7 @@ Gfx *coreRender(Gfx *gdl) // to the main static above if (random() % 60 == 1) { cutscenestatic = 255; - audioStart(var80095200, SFX_INFIL_STATIC_SHORT, NULL, -1, -1, -1, -1, -1); + sndStart(var80095200, SFX_INFIL_STATIC_SHORT, NULL, -1, -1, -1, -1, -1); } if (cutscenestatic) { @@ -4163,7 +4163,7 @@ Gfx *coreRender(Gfx *gdl) || (g_Vars.speedpillwant && !g_Vars.speedpillon) || (!g_Vars.speedpillwant && g_Vars.speedpillon)) { if (g_Vars.speedpillchange == 30 && !g_Vars.speedpillwant) { - audioStart(var80095200, coreGetSlowMotionType() ? SFX_JO_BOOST_ACTIVATE : SFX_JO_BOOST_REVERT, 0, -1, -1, -1, -1, -1); + sndStart(var80095200, lvGetSlowMotionType() ? SFX_JO_BOOST_ACTIVATE : SFX_JO_BOOST_REVERT, 0, -1, -1, -1, -1, -1); } if (g_Vars.speedpillchange < 15) { @@ -4269,7 +4269,7 @@ Gfx *coreRender(Gfx *gdl) } gdl = func0f185774(gdl); - gdl = coreRenderFade(gdl); + gdl = lvRenderFade(gdl); if (g_FrIsValidWeapon) { gdl = frRenderHud(gdl); @@ -4342,7 +4342,7 @@ Gfx *coreRender(Gfx *gdl) setNumPlayers(1); titleSetNextMode(TITLEMODE_SKIP); g_MissionConfig.difficulty = DIFF_A; - coreSetDifficulty(DIFF_A); + lvSetDifficulty(DIFF_A); g_MissionConfig.stageindex = g_Cutscenes[g_Vars.unk0004d4].mission; g_MissionConfig.stagenum = g_Cutscenes[g_Vars.unk0004d4].stage; titleSetNextStage(g_Cutscenes[g_Vars.unk0004d4].stage); @@ -4363,7 +4363,7 @@ Gfx *coreRender(Gfx *gdl) } #else GLOBAL_ASM( -glabel coreRender +glabel lvRender .late_rodata glabel var7f1b1fbcnb .word 0x3f866666 @@ -4498,7 +4498,7 @@ glabel var7f1b1fd4nb /* f164208: 032b6025 */ or $t4,$t9,$t3 /* f16420c: 0fc06b08 */ jal titleRender /* f164210: ae8c0004 */ sw $t4,0x4($s4) -/* f164214: 0fc58ba8 */ jal coreRenderFade +/* f164214: 0fc58ba8 */ jal lvRenderFade /* f164218: 00402025 */ or $a0,$v0,$zero /* f16421c: 1000069c */ beqz $zero,.NB0f165c90 /* f164220: 00409825 */ or $s3,$v0,$zero @@ -5210,7 +5210,7 @@ glabel var7f1b1fd4nb /* f164c6c: 3c050008 */ lui $a1,0x8 /* f164c70: 10400005 */ beqz $v0,.NB0f164c88 /* f164c74: 00000000 */ sll $zero,$zero,0x0 -/* f164c78: 0fc58fa5 */ jal coreFindThreats +/* f164c78: 0fc58fa5 */ jal lvFindThreats /* f164c7c: 00000000 */ sll $zero,$zero,0x0 /* f164c80: 10000034 */ beqz $zero,.NB0f164d54 /* f164c84: 8e500284 */ lw $s0,0x284($s2) @@ -5242,7 +5242,7 @@ glabel var7f1b1fd4nb /* f164ce8: 8e440284 */ lw $a0,0x284($s2) .NB0f164cec: /* f164cec: 02802825 */ or $a1,$s4,$zero -/* f164cf0: 0fc58c71 */ jal coreCheckCmpFollowThreat +/* f164cf0: 0fc58c71 */ jal lvCheckCmpFollowThreat /* f164cf4: 24841624 */ addiu $a0,$a0,0x1624 /* f164cf8: 54400004 */ bnezl $v0,.NB0f164d0c /* f164cfc: 00008825 */ or $s1,$zero,$zero @@ -5255,7 +5255,7 @@ glabel var7f1b1fd4nb /* f164d10: 8e4a0284 */ lw $t2,0x284($s2) /* f164d14: 02202825 */ or $a1,$s1,$zero /* f164d18: 01502021 */ addu $a0,$t2,$s0 -/* f164d1c: 0fc58c71 */ jal coreCheckCmpFollowThreat +/* f164d1c: 0fc58c71 */ jal lvCheckCmpFollowThreat /* f164d20: 24841630 */ addiu $a0,$a0,0x1630 /* f164d24: 14400008 */ bnez $v0,.NB0f164d48 /* f164d28: 26310001 */ addiu $s1,$s1,0x1 @@ -5300,7 +5300,7 @@ glabel var7f1b1fd4nb /* f164dbc: afb40010 */ sw $s4,0x10($sp) /* f164dc0: e7b40014 */ swc1 $f20,0x14($sp) /* f164dc4: afb40018 */ sw $s4,0x18($sp) -/* f164dc8: 0c004338 */ jal audioStart +/* f164dc8: 0c004338 */ jal sndStart /* f164dcc: afb4001c */ sw $s4,0x1c($sp) /* f164dd0: 10000053 */ beqz $zero,.NB0f164f20 /* f164dd4: 8e500284 */ lw $s0,0x284($s2) @@ -5320,7 +5320,7 @@ glabel var7f1b1fd4nb /* f164e08: afb40010 */ sw $s4,0x10($sp) /* f164e0c: e7b40014 */ swc1 $f20,0x14($sp) /* f164e10: afb40018 */ sw $s4,0x18($sp) -/* f164e14: 0c004338 */ jal audioStart +/* f164e14: 0c004338 */ jal sndStart /* f164e18: afb4001c */ sw $s4,0x1c($sp) /* f164e1c: 8e500284 */ lw $s0,0x284($s2) /* f164e20: 240b001c */ addiu $t3,$zero,0x1c @@ -5353,7 +5353,7 @@ glabel var7f1b1fd4nb /* f164e88: afb40010 */ sw $s4,0x10($sp) /* f164e8c: e7b40014 */ swc1 $f20,0x14($sp) /* f164e90: afb40018 */ sw $s4,0x18($sp) -/* f164e94: 0c004338 */ jal audioStart +/* f164e94: 0c004338 */ jal sndStart /* f164e98: afb4001c */ sw $s4,0x1c($sp) .NB0f164e9c: /* f164e9c: 10000020 */ beqz $zero,.NB0f164f20 @@ -5683,7 +5683,7 @@ glabel var7f1b1fd4nb /* f165368: afb40010 */ sw $s4,0x10($sp) /* f16536c: e7b40014 */ swc1 $f20,0x14($sp) /* f165370: afb40018 */ sw $s4,0x18($sp) -/* f165374: 0c004338 */ jal audioStart +/* f165374: 0c004338 */ jal sndStart /* f165378: afb4001c */ sw $s4,0x1c($sp) .NB0f16537c: /* f16537c: 3c0c8008 */ lui $t4,0x8008 @@ -5728,7 +5728,7 @@ glabel var7f1b1fd4nb /* f165414: afb40010 */ sw $s4,0x10($sp) /* f165418: e7b40014 */ swc1 $f20,0x14($sp) /* f16541c: afb40018 */ sw $s4,0x18($sp) -/* f165420: 0c004338 */ jal audioStart +/* f165420: 0c004338 */ jal sndStart /* f165424: afb4001c */ sw $s4,0x1c($sp) .NB0f165428: /* f165428: 3c0c8008 */ lui $t4,0x8008 @@ -5755,7 +5755,7 @@ glabel var7f1b1fd4nb /* f165478: afb40010 */ sw $s4,0x10($sp) /* f16547c: e7b40014 */ swc1 $f20,0x14($sp) /* f165480: afb40018 */ sw $s4,0x18($sp) -/* f165484: 0c004338 */ jal audioStart +/* f165484: 0c004338 */ jal sndStart /* f165488: afb4001c */ sw $s4,0x1c($sp) .NB0f16548c: /* f16548c: 12000005 */ beqz $s0,.NB0f1654a4 @@ -5860,7 +5860,7 @@ glabel var7f1b1fd4nb /* f1655f0: 8e4d0464 */ lw $t5,0x464($s2) /* f1655f4: 55a00015 */ bnezl $t5,.NB0f16564c /* f1655f8: 2861000f */ slti $at,$v1,0xf -/* f1655fc: 0fc599a0 */ jal coreGetSlowMotionType +/* f1655fc: 0fc599a0 */ jal lvGetSlowMotionType /* f165600: 00000000 */ sll $zero,$zero,0x0 /* f165604: 10400003 */ beqz $v0,.NB0f165614 /* f165608: 3c04800a */ lui $a0,0x800a @@ -5878,7 +5878,7 @@ glabel var7f1b1fd4nb /* f165630: afb40010 */ sw $s4,0x10($sp) /* f165634: e7b40014 */ swc1 $f20,0x14($sp) /* f165638: afb40018 */ sw $s4,0x18($sp) -/* f16563c: 0c004338 */ jal audioStart +/* f16563c: 0c004338 */ jal sndStart /* f165640: afb4001c */ sw $s4,0x1c($sp) /* f165644: 8e430460 */ lw $v1,0x460($s2) /* f165648: 2861000f */ slti $at,$v1,0xf @@ -6168,7 +6168,7 @@ glabel var7f1b1fd4nb /* f165a5c: 00402025 */ or $a0,$v0,$zero /* f165a60: 00409825 */ or $s3,$v0,$zero .NB0f165a64: -/* f165a64: 0fc58ba8 */ jal coreRenderFade +/* f165a64: 0fc58ba8 */ jal lvRenderFade /* f165a68: 02602025 */ or $a0,$s3,$zero /* f165a6c: 0fc5ff45 */ jal func0f185774 /* f165a70: 00402025 */ or $a0,$v0,$zero @@ -6396,7 +6396,7 @@ glabel var7f1b1fd4nb /* f165d9c: 920c0000 */ lbu $t4,0x0($s0) /* f165da0: 00002025 */ or $a0,$zero,$zero /* f165da4: 318bff01 */ andi $t3,$t4,0xff01 -/* f165da8: 0fc59ed6 */ jal coreSetDifficulty +/* f165da8: 0fc59ed6 */ jal lvSetDifficulty /* f165dac: a20b0000 */ sb $t3,0x0($s0) /* f165db0: 825804d4 */ lb $t8,0x4d4($s2) /* f165db4: 03150019 */ multu $t8,$s5 @@ -6507,7 +6507,7 @@ u32 var800840b4 = 0; u32 var800840b8 = 0; u32 var800840bc = 0; -void coreUpdateSoloHandicaps(void) +void lvUpdateSoloHandicaps(void) { if (g_Vars.antiplayernum >= 0) { if (g_Difficulty == DIFF_A) { @@ -6676,7 +6676,7 @@ s32 sub54321(s32 value) } #endif -void coreUpdateCutsceneTime(void) +void lvUpdateCutsceneTime(void) { if (g_Vars.in_cutscene) { g_CutsceneTime240_60 += g_Vars.lvupdate240_60; @@ -6688,7 +6688,7 @@ void coreUpdateCutsceneTime(void) #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel coreGetSlowMotionType +glabel lvGetSlowMotionType /* f16b854: 27bdffd0 */ addiu $sp,$sp,-48 /* f16b858: afbf0014 */ sw $ra,0x14($sp) /* f16b85c: 3c04b000 */ lui $a0,0xb000 @@ -6769,7 +6769,7 @@ glabel coreGetSlowMotionType ); #elif VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel coreGetSlowMotionType +glabel lvGetSlowMotionType /* f16b854: 27bdffd0 */ addiu $sp,$sp,-48 /* f16b858: afbf0014 */ sw $ra,0x14($sp) /* f16b85c: 3c04b000 */ lui $a0,0xb000 @@ -6850,7 +6850,7 @@ glabel coreGetSlowMotionType ); #else // Can't match the antipiracy part (used in ntsc-1.0 and above) -s32 coreGetSlowMotionType(void) +s32 lvGetSlowMotionType(void) { #if PIRACYCHECKS u32 addr = sub54321(0xb0000a5c + 54321); @@ -6898,7 +6898,7 @@ s32 coreGetSlowMotionType(void) #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel coreTick +glabel lvTick .late_rodata glabel var7f1b8ed0pf .word 0x3f99999a @@ -6910,7 +6910,7 @@ glabel var7f1b8ed0pf /* f16c728: afb30038 */ sw $s3,0x38($sp) /* f16c72c: afb20034 */ sw $s2,0x34($sp) /* f16c730: afb10030 */ sw $s1,0x30($sp) -/* f16c734: 0fc5b6cc */ jal coreCheckPauseStateChanged +/* f16c734: 0fc5b6cc */ jal lvCheckPauseStateChanged /* f16c738: afb0002c */ sw $s0,0x2c($sp) /* f16c73c: 3c14800a */ lui $s4,0x800a /* f16c740: 2694a510 */ addiu $s4,$s4,-23280 @@ -6928,7 +6928,7 @@ glabel var7f1b8ed0pf .PF0f16c76c: /* f16c76c: 14400013 */ bnez $v0,.PF0f16c7bc /* f16c770: 00000000 */ nop -/* f16c774: 0c004db2 */ jal func00013938 +/* f16c774: 0c004db2 */ jal joy00013938 /* f16c778: 00000000 */ nop /* f16c77c: 8e8204b4 */ lw $v0,0x4b4($s4) /* f16c780: 2401005a */ li $at,0x5a @@ -7036,7 +7036,7 @@ glabel var7f1b8ed0pf /* f16c8e0: 5420ffde */ bnezl $at,.PF0f16c85c /* f16c8e4: 8cce0064 */ lw $t6,0x64($a2) .PF0f16c8e8: -/* f16c8e8: 0fc5b6f7 */ jal coreIsPaused +/* f16c8e8: 0fc5b6f7 */ jal lvIsPaused /* f16c8ec: 00000000 */ nop /* f16c8f0: 10400003 */ beqz $v0,.PF0f16c900 /* f16c8f4: 00000000 */ nop @@ -7124,7 +7124,7 @@ glabel var7f1b8ed0pf /* f16ca14: 100000d4 */ b .PF0f16cd68 /* f16ca18: 8e830034 */ lw $v1,0x34($s4) .PF0f16ca1c: -/* f16ca1c: 0fc5b180 */ jal coreGetSlowMotionType +/* f16ca1c: 0fc5b180 */ jal lvGetSlowMotionType /* f16ca20: 00000000 */ nop /* f16ca24: 8e8f0040 */ lw $t7,0x40($s4) /* f16ca28: 24010002 */ li $at,0x2 @@ -7411,98 +7411,98 @@ glabel var7f1b8ed0pf /* f16cdec: 0fc37e77 */ jal hudmsgsTick /* f16cdf0: 00000000 */ nop /* f16cdf4: 00002025 */ move $a0,$zero -/* f16cdf8: 0c00536a */ jal contGetButtonsPressedThisFrame +/* f16cdf8: 0c00536a */ jal joyGetButtonsPressedThisFrame /* f16cdfc: 3405ffff */ li $a1,0xffff /* f16ce00: 1440005c */ bnez $v0,.PF0f16cf74 /* f16ce04: 00000000 */ nop -/* f16ce08: 0c0052e6 */ jal contGetStickX +/* f16ce08: 0c0052e6 */ jal joyGetStickX /* f16ce0c: 00002025 */ move $a0,$zero /* f16ce10: 2841000b */ slti $at,$v0,0xb /* f16ce14: 10200057 */ beqz $at,.PF0f16cf74 /* f16ce18: 00000000 */ nop -/* f16ce1c: 0c0052e6 */ jal contGetStickX +/* f16ce1c: 0c0052e6 */ jal joyGetStickX /* f16ce20: 00002025 */ move $a0,$zero /* f16ce24: 2841fff6 */ slti $at,$v0,-10 /* f16ce28: 14200052 */ bnez $at,.PF0f16cf74 /* f16ce2c: 00000000 */ nop -/* f16ce30: 0c005310 */ jal contGetStickY +/* f16ce30: 0c005310 */ jal joyGetStickY /* f16ce34: 00002025 */ move $a0,$zero /* f16ce38: 2841000b */ slti $at,$v0,0xb /* f16ce3c: 1020004d */ beqz $at,.PF0f16cf74 /* f16ce40: 00000000 */ nop -/* f16ce44: 0c005310 */ jal contGetStickY +/* f16ce44: 0c005310 */ jal joyGetStickY /* f16ce48: 00002025 */ move $a0,$zero /* f16ce4c: 2841fff6 */ slti $at,$v0,-10 /* f16ce50: 14200048 */ bnez $at,.PF0f16cf74 /* f16ce54: 24040001 */ li $a0,0x1 -/* f16ce58: 0c00536a */ jal contGetButtonsPressedThisFrame +/* f16ce58: 0c00536a */ jal joyGetButtonsPressedThisFrame /* f16ce5c: 3405ffff */ li $a1,0xffff /* f16ce60: 14400044 */ bnez $v0,.PF0f16cf74 /* f16ce64: 00000000 */ nop -/* f16ce68: 0c0052e6 */ jal contGetStickX +/* f16ce68: 0c0052e6 */ jal joyGetStickX /* f16ce6c: 24040001 */ li $a0,0x1 /* f16ce70: 2841000b */ slti $at,$v0,0xb /* f16ce74: 1020003f */ beqz $at,.PF0f16cf74 /* f16ce78: 00000000 */ nop -/* f16ce7c: 0c0052e6 */ jal contGetStickX +/* f16ce7c: 0c0052e6 */ jal joyGetStickX /* f16ce80: 24040001 */ li $a0,0x1 /* f16ce84: 2841fff6 */ slti $at,$v0,-10 /* f16ce88: 1420003a */ bnez $at,.PF0f16cf74 /* f16ce8c: 00000000 */ nop -/* f16ce90: 0c005310 */ jal contGetStickY +/* f16ce90: 0c005310 */ jal joyGetStickY /* f16ce94: 24040001 */ li $a0,0x1 /* f16ce98: 2841000b */ slti $at,$v0,0xb /* f16ce9c: 10200035 */ beqz $at,.PF0f16cf74 /* f16cea0: 00000000 */ nop -/* f16cea4: 0c005310 */ jal contGetStickY +/* f16cea4: 0c005310 */ jal joyGetStickY /* f16cea8: 24040001 */ li $a0,0x1 /* f16ceac: 2841fff6 */ slti $at,$v0,-10 /* f16ceb0: 14200030 */ bnez $at,.PF0f16cf74 /* f16ceb4: 24040002 */ li $a0,0x2 -/* f16ceb8: 0c00536a */ jal contGetButtonsPressedThisFrame +/* f16ceb8: 0c00536a */ jal joyGetButtonsPressedThisFrame /* f16cebc: 3405ffff */ li $a1,0xffff /* f16cec0: 1440002c */ bnez $v0,.PF0f16cf74 /* f16cec4: 00000000 */ nop -/* f16cec8: 0c0052e6 */ jal contGetStickX +/* f16cec8: 0c0052e6 */ jal joyGetStickX /* f16cecc: 24040002 */ li $a0,0x2 /* f16ced0: 2841000b */ slti $at,$v0,0xb /* f16ced4: 10200027 */ beqz $at,.PF0f16cf74 /* f16ced8: 00000000 */ nop -/* f16cedc: 0c0052e6 */ jal contGetStickX +/* f16cedc: 0c0052e6 */ jal joyGetStickX /* f16cee0: 24040002 */ li $a0,0x2 /* f16cee4: 2841fff6 */ slti $at,$v0,-10 /* f16cee8: 14200022 */ bnez $at,.PF0f16cf74 /* f16ceec: 00000000 */ nop -/* f16cef0: 0c005310 */ jal contGetStickY +/* f16cef0: 0c005310 */ jal joyGetStickY /* f16cef4: 24040002 */ li $a0,0x2 /* f16cef8: 2841000b */ slti $at,$v0,0xb /* f16cefc: 1020001d */ beqz $at,.PF0f16cf74 /* f16cf00: 00000000 */ nop -/* f16cf04: 0c005310 */ jal contGetStickY +/* f16cf04: 0c005310 */ jal joyGetStickY /* f16cf08: 24040002 */ li $a0,0x2 /* f16cf0c: 2841fff6 */ slti $at,$v0,-10 /* f16cf10: 14200018 */ bnez $at,.PF0f16cf74 /* f16cf14: 24040003 */ li $a0,0x3 -/* f16cf18: 0c00536a */ jal contGetButtonsPressedThisFrame +/* f16cf18: 0c00536a */ jal joyGetButtonsPressedThisFrame /* f16cf1c: 3405ffff */ li $a1,0xffff /* f16cf20: 14400014 */ bnez $v0,.PF0f16cf74 /* f16cf24: 00000000 */ nop -/* f16cf28: 0c0052e6 */ jal contGetStickX +/* f16cf28: 0c0052e6 */ jal joyGetStickX /* f16cf2c: 24040003 */ li $a0,0x3 /* f16cf30: 2841000b */ slti $at,$v0,0xb /* f16cf34: 1020000f */ beqz $at,.PF0f16cf74 /* f16cf38: 00000000 */ nop -/* f16cf3c: 0c0052e6 */ jal contGetStickX +/* f16cf3c: 0c0052e6 */ jal joyGetStickX /* f16cf40: 24040003 */ li $a0,0x3 /* f16cf44: 2841fff6 */ slti $at,$v0,-10 /* f16cf48: 1420000a */ bnez $at,.PF0f16cf74 /* f16cf4c: 00000000 */ nop -/* f16cf50: 0c005310 */ jal contGetStickY +/* f16cf50: 0c005310 */ jal joyGetStickY /* f16cf54: 24040003 */ li $a0,0x3 /* f16cf58: 2841000b */ slti $at,$v0,0xb /* f16cf5c: 10200005 */ beqz $at,.PF0f16cf74 /* f16cf60: 00000000 */ nop -/* f16cf64: 0c005310 */ jal contGetStickY +/* f16cf64: 0c005310 */ jal joyGetStickY /* f16cf68: 24040003 */ li $a0,0x3 /* f16cf6c: 2841fff6 */ slti $at,$v0,-10 /* f16cf70: 1020000e */ beqz $at,.PF0f16cfac @@ -7536,98 +7536,98 @@ glabel var7f1b8ed0pf /* f16cfd4: 00002025 */ move $a0,$zero /* f16cfd8: 15e0006b */ bnez $t7,.PF0f16d188 /* f16cfdc: 00000000 */ nop -/* f16cfe0: 0c00533a */ jal contGetButtons +/* f16cfe0: 0c00533a */ jal joyGetButtons /* f16cfe4: 3405ffff */ li $a1,0xffff /* f16cfe8: 14400063 */ bnez $v0,.PF0f16d178 /* f16cfec: 00000000 */ nop -/* f16cff0: 0c0052e6 */ jal contGetStickX +/* f16cff0: 0c0052e6 */ jal joyGetStickX /* f16cff4: 00002025 */ move $a0,$zero /* f16cff8: 2841000a */ slti $at,$v0,0xa /* f16cffc: 1020005e */ beqz $at,.PF0f16d178 /* f16d000: 00000000 */ nop -/* f16d004: 0c0052e6 */ jal contGetStickX +/* f16d004: 0c0052e6 */ jal joyGetStickX /* f16d008: 00002025 */ move $a0,$zero /* f16d00c: 2841fff7 */ slti $at,$v0,-9 /* f16d010: 14200059 */ bnez $at,.PF0f16d178 /* f16d014: 00000000 */ nop -/* f16d018: 0c005310 */ jal contGetStickY +/* f16d018: 0c005310 */ jal joyGetStickY /* f16d01c: 00002025 */ move $a0,$zero /* f16d020: 2841000a */ slti $at,$v0,0xa /* f16d024: 10200054 */ beqz $at,.PF0f16d178 /* f16d028: 00000000 */ nop -/* f16d02c: 0c005310 */ jal contGetStickY +/* f16d02c: 0c005310 */ jal joyGetStickY /* f16d030: 00002025 */ move $a0,$zero /* f16d034: 2841fff7 */ slti $at,$v0,-9 /* f16d038: 1420004f */ bnez $at,.PF0f16d178 /* f16d03c: 24040001 */ li $a0,0x1 -/* f16d040: 0c00533a */ jal contGetButtons +/* f16d040: 0c00533a */ jal joyGetButtons /* f16d044: 3405ffff */ li $a1,0xffff /* f16d048: 1440004b */ bnez $v0,.PF0f16d178 /* f16d04c: 00000000 */ nop -/* f16d050: 0c0052e6 */ jal contGetStickX +/* f16d050: 0c0052e6 */ jal joyGetStickX /* f16d054: 24040001 */ li $a0,0x1 /* f16d058: 2841000a */ slti $at,$v0,0xa /* f16d05c: 10200046 */ beqz $at,.PF0f16d178 /* f16d060: 00000000 */ nop -/* f16d064: 0c0052e6 */ jal contGetStickX +/* f16d064: 0c0052e6 */ jal joyGetStickX /* f16d068: 24040001 */ li $a0,0x1 /* f16d06c: 2841fff7 */ slti $at,$v0,-9 /* f16d070: 14200041 */ bnez $at,.PF0f16d178 /* f16d074: 00000000 */ nop -/* f16d078: 0c005310 */ jal contGetStickY +/* f16d078: 0c005310 */ jal joyGetStickY /* f16d07c: 24040001 */ li $a0,0x1 /* f16d080: 2841000a */ slti $at,$v0,0xa /* f16d084: 1020003c */ beqz $at,.PF0f16d178 /* f16d088: 00000000 */ nop -/* f16d08c: 0c005310 */ jal contGetStickY +/* f16d08c: 0c005310 */ jal joyGetStickY /* f16d090: 24040001 */ li $a0,0x1 /* f16d094: 2841fff7 */ slti $at,$v0,-9 /* f16d098: 14200037 */ bnez $at,.PF0f16d178 /* f16d09c: 24040002 */ li $a0,0x2 -/* f16d0a0: 0c00533a */ jal contGetButtons +/* f16d0a0: 0c00533a */ jal joyGetButtons /* f16d0a4: 3405ffff */ li $a1,0xffff /* f16d0a8: 14400033 */ bnez $v0,.PF0f16d178 /* f16d0ac: 00000000 */ nop -/* f16d0b0: 0c0052e6 */ jal contGetStickX +/* f16d0b0: 0c0052e6 */ jal joyGetStickX /* f16d0b4: 24040002 */ li $a0,0x2 /* f16d0b8: 2841000a */ slti $at,$v0,0xa /* f16d0bc: 1020002e */ beqz $at,.PF0f16d178 /* f16d0c0: 00000000 */ nop -/* f16d0c4: 0c0052e6 */ jal contGetStickX +/* f16d0c4: 0c0052e6 */ jal joyGetStickX /* f16d0c8: 24040002 */ li $a0,0x2 /* f16d0cc: 2841fff7 */ slti $at,$v0,-9 /* f16d0d0: 14200029 */ bnez $at,.PF0f16d178 /* f16d0d4: 00000000 */ nop -/* f16d0d8: 0c005310 */ jal contGetStickY +/* f16d0d8: 0c005310 */ jal joyGetStickY /* f16d0dc: 24040002 */ li $a0,0x2 /* f16d0e0: 2841000a */ slti $at,$v0,0xa /* f16d0e4: 10200024 */ beqz $at,.PF0f16d178 /* f16d0e8: 00000000 */ nop -/* f16d0ec: 0c005310 */ jal contGetStickY +/* f16d0ec: 0c005310 */ jal joyGetStickY /* f16d0f0: 24040002 */ li $a0,0x2 /* f16d0f4: 2841fff7 */ slti $at,$v0,-9 /* f16d0f8: 1420001f */ bnez $at,.PF0f16d178 /* f16d0fc: 24040003 */ li $a0,0x3 -/* f16d100: 0c00533a */ jal contGetButtons +/* f16d100: 0c00533a */ jal joyGetButtons /* f16d104: 3405ffff */ li $a1,0xffff /* f16d108: 1440001b */ bnez $v0,.PF0f16d178 /* f16d10c: 00000000 */ nop -/* f16d110: 0c0052e6 */ jal contGetStickX +/* f16d110: 0c0052e6 */ jal joyGetStickX /* f16d114: 24040003 */ li $a0,0x3 /* f16d118: 2841000a */ slti $at,$v0,0xa /* f16d11c: 10200016 */ beqz $at,.PF0f16d178 /* f16d120: 00000000 */ nop -/* f16d124: 0c0052e6 */ jal contGetStickX +/* f16d124: 0c0052e6 */ jal joyGetStickX /* f16d128: 24040003 */ li $a0,0x3 /* f16d12c: 2841fff7 */ slti $at,$v0,-9 /* f16d130: 14200011 */ bnez $at,.PF0f16d178 /* f16d134: 00000000 */ nop -/* f16d138: 0c005310 */ jal contGetStickY +/* f16d138: 0c005310 */ jal joyGetStickY /* f16d13c: 24040003 */ li $a0,0x3 /* f16d140: 2841000a */ slti $at,$v0,0xa /* f16d144: 1020000c */ beqz $at,.PF0f16d178 /* f16d148: 00000000 */ nop -/* f16d14c: 0c005310 */ jal contGetStickY +/* f16d14c: 0c005310 */ jal joyGetStickY /* f16d150: 24040003 */ li $a0,0x3 /* f16d154: 2841fff7 */ slti $at,$v0,-9 /* f16d158: 14200007 */ bnez $at,.PF0f16d178 @@ -7795,7 +7795,7 @@ glabel var7f1b8ed0pf /* f16d3a0: 8e0c0000 */ lw $t4,0x0($s0) /* f16d3a4: 55800021 */ bnezl $t4,.PF0f16d42c /* f16d3a8: 8e8e0034 */ lw $t6,0x34($s4) -/* f16d3ac: 0fc5b6f7 */ jal coreIsPaused +/* f16d3ac: 0fc5b6f7 */ jal lvIsPaused /* f16d3b0: 00000000 */ nop /* f16d3b4: 1440001c */ bnez $v0,.PF0f16d428 /* f16d3b8: 3c0d8008 */ lui $t5,0x8008 @@ -7824,7 +7824,7 @@ glabel var7f1b8ed0pf /* f16d414: afb80010 */ sw $t8,0x10($sp) /* f16d418: 24067fff */ li $a2,0x7fff /* f16d41c: 24070040 */ li $a3,0x40 -/* f16d420: 0c004125 */ jal func00010718 +/* f16d420: 0c004125 */ jal snd00010718 /* f16d424: e7a80014 */ swc1 $f8,0x14($sp) .PF0f16d428: /* f16d428: 8e8e0034 */ lw $t6,0x34($s4) @@ -8081,11 +8081,11 @@ glabel var7f1b8ed0pf /* f16d7a4: 10000062 */ b .PF0f16d930 /* f16d7a8: 8fbf0044 */ lw $ra,0x44($sp) .PF0f16d7ac: -/* f16d7ac: 0fc5b16f */ jal coreUpdateCutsceneTime +/* f16d7ac: 0fc5b16f */ jal lvUpdateCutsceneTime /* f16d7b0: 00000000 */ nop /* f16d7b4: 0fc4a79b */ jal func0f12939c /* f16d7b8: 00000000 */ nop -/* f16d7bc: 0fc5af9f */ jal coreUpdateSoloHandicaps +/* f16d7bc: 0fc5af9f */ jal lvUpdateSoloHandicaps /* f16d7c0: 00000000 */ nop /* f16d7c4: 0fc07678 */ jal func0f01d8c0 /* f16d7c8: 00000000 */ nop @@ -8115,9 +8115,9 @@ glabel var7f1b8ed0pf /* f16d824: 0fc027af */ jal nbombsTick /* f16d828: 00000000 */ nop .PF0f16d82c: -/* f16d82c: 0fc5a302 */ jal coreUpdateMiscSfx +/* f16d82c: 0fc5a302 */ jal lvUpdateMiscSfx /* f16d830: 00000000 */ nop -/* f16d834: 0c003f01 */ jal func0000fe88 +/* f16d834: 0c003f01 */ jal snd0000fe88 /* f16d838: 00000000 */ nop /* f16d83c: 0fc474a7 */ jal pakExecuteDebugOperations /* f16d840: 00000000 */ nop @@ -8195,12 +8195,12 @@ glabel var7f1b8ed0pf /* f16d94c: 27bd0290 */ addiu $sp,$sp,0x290 ); #elif VERSION >= VERSION_NTSC_1_0 -void coreTick(void) +void lvTick(void) { s32 j; s32 i; - coreCheckPauseStateChanged(); + lvCheckPauseStateChanged(); if (g_Vars.unk0004e4) { func0f11c54c(); @@ -8209,7 +8209,7 @@ void coreTick(void) if (g_Vars.unk0004d8 > 0) { g_Vars.unk0004d8--; } else if (g_Vars.unk0004d8 == 0) { - func00013938(); + joy00013938(); if (g_Vars.stagenum == STAGE_TITLE || g_Vars.stagenum == STAGE_BOOTPAKMENU @@ -8233,7 +8233,7 @@ void coreTick(void) g_Vars.players[j]->hands[HAND_RIGHT].unk0cec = 0; } - if (coreIsPaused()) { + if (lvIsPaused()) { g_Vars.lvupdate240 = 0; } else if (mpIsPaused()) { g_Vars.lvupdate240 = 0; @@ -8242,7 +8242,7 @@ void coreTick(void) g_Vars.players[j]->joybutinhibit = 0xefffefff; } } else { - s32 slowmo = coreGetSlowMotionType(); + s32 slowmo = lvGetSlowMotionType(); g_Vars.lvupdate240 = g_Vars.diffframe240; if (slowmo == SLOWMOTION_ON) { @@ -8319,26 +8319,26 @@ void coreTick(void) speedpillTick(); hudmsgsTick(); - if ((contGetButtonsPressedThisFrame(0, 0xffff) != 0 - || contGetStickX(0) > 10 - || contGetStickX(0) < -10 - || contGetStickY(0) > 10 - || contGetStickY(0) < -10 - || contGetButtonsPressedThisFrame(1, 0xffff) != 0 - || contGetStickX(1) > 10 - || contGetStickX(1) < -10 - || contGetStickY(1) > 10 - || contGetStickY(1) < -10 - || contGetButtonsPressedThisFrame(2, 0xffff) != 0 - || contGetStickX(2) > 10 - || contGetStickX(2) < -10 - || contGetStickY(2) > 10 - || contGetStickY(2) < -10 - || contGetButtonsPressedThisFrame(3, 0xffff) != 0 - || contGetStickX(3) > 10 - || contGetStickX(3) < -10 - || contGetStickY(3) > 10 - || contGetStickY(3) < -10) && var800624a4) { + if ((joyGetButtonsPressedThisFrame(0, 0xffff) != 0 + || joyGetStickX(0) > 10 + || joyGetStickX(0) < -10 + || joyGetStickY(0) > 10 + || joyGetStickY(0) < -10 + || joyGetButtonsPressedThisFrame(1, 0xffff) != 0 + || joyGetStickX(1) > 10 + || joyGetStickX(1) < -10 + || joyGetStickY(1) > 10 + || joyGetStickY(1) < -10 + || joyGetButtonsPressedThisFrame(2, 0xffff) != 0 + || joyGetStickX(2) > 10 + || joyGetStickX(2) < -10 + || joyGetStickY(2) > 10 + || joyGetStickY(2) < -10 + || joyGetButtonsPressedThisFrame(3, 0xffff) != 0 + || joyGetStickX(3) > 10 + || joyGetStickX(3) < -10 + || joyGetStickY(3) > 10 + || joyGetStickY(3) < -10) && var800624a4) { if (g_Vars.stagenum != STAGE_TITLE) { titleSetNextMode(TITLEMODE_SKIP); mainSetStageNum(STAGE_TITLE); @@ -8348,26 +8348,26 @@ void coreTick(void) } if (g_Vars.stagenum < STAGE_TITLE && !var800624a4 && !g_Vars.in_cutscene) { - if (contGetButtons(0, 0xffff) == 0 - && contGetStickX(0) < 10 - && contGetStickX(0) > -10 - && contGetStickY(0) < 10 - && contGetStickY(0) > -10 - && contGetButtons(1, 0xffff) == 0 - && contGetStickX(1) < 10 - && contGetStickX(1) > -10 - && contGetStickY(1) < 10 - && contGetStickY(1) > -10 - && contGetButtons(2, 0xffff) == 0 - && contGetStickX(2) < 10 - && contGetStickX(2) > -10 - && contGetStickY(2) < 10 - && contGetStickY(2) > -10 - && contGetButtons(3, 0xffff) == 0 - && contGetStickX(3) < 10 - && contGetStickX(3) > -10 - && contGetStickY(3) < 10 - && contGetStickY(3) > -10) { + if (joyGetButtons(0, 0xffff) == 0 + && joyGetStickX(0) < 10 + && joyGetStickX(0) > -10 + && joyGetStickY(0) < 10 + && joyGetStickY(0) > -10 + && joyGetButtons(1, 0xffff) == 0 + && joyGetStickX(1) < 10 + && joyGetStickX(1) > -10 + && joyGetStickY(1) < 10 + && joyGetStickY(1) > -10 + && joyGetButtons(2, 0xffff) == 0 + && joyGetStickX(2) < 10 + && joyGetStickX(2) > -10 + && joyGetStickY(2) < 10 + && joyGetStickY(2) > -10 + && joyGetButtons(3, 0xffff) == 0 + && joyGetStickX(3) < 10 + && joyGetStickX(3) > -10 + && joyGetStickY(3) < 10 + && joyGetStickY(3) > -10) { var800624b0 += g_Vars.diffframe60; } else { var800624b0 = 0; @@ -8403,9 +8403,9 @@ void coreTick(void) // Sound alarm at 10 seconds remaining if (nexttime >= g_MpTimeLimit60 - 600 && g_MiscAudioHandle == NULL - && !coreIsPaused() + && !lvIsPaused() && nexttime < g_MpTimeLimit60) { - func00010718(&g_MiscAudioHandle, 0, 0x7fff, 0x40, 163, 1, 1, -1, 1); + snd00010718(&g_MiscAudioHandle, 0, 0x7fff, 0x40, 163, 1, 1, -1, 1); } } @@ -8485,9 +8485,9 @@ void coreTick(void) func00011d84(); func0f01d860(); } else { - coreUpdateCutsceneTime(); + lvUpdateCutsceneTime(); func0f12939c(); - coreUpdateSoloHandicaps(); + lvUpdateSoloHandicaps(); func0f01d8c0(); func0f01d990(); casingsTick(); @@ -8504,8 +8504,8 @@ void coreTick(void) nbombsTick(); } - coreUpdateMiscSfx(); - func0000fe88(); + lvUpdateMiscSfx(); + snd0000fe88(); pakExecuteDebugOperations(); lightingTick(); func0f0b2904(); @@ -8542,7 +8542,7 @@ void coreTick(void) } #else GLOBAL_ASM( -glabel coreTick +glabel lvTick /* f166724: 27bdfd70 */ addiu $sp,$sp,-656 /* f166728: afbf0044 */ sw $ra,0x44($sp) /* f16672c: afb50040 */ sw $s5,0x40($sp) @@ -8550,7 +8550,7 @@ glabel coreTick /* f166734: afb30038 */ sw $s3,0x38($sp) /* f166738: afb20034 */ sw $s2,0x34($sp) /* f16673c: afb10030 */ sw $s1,0x30($sp) -/* f166740: 0fc59ea5 */ jal coreCheckPauseStateChanged +/* f166740: 0fc59ea5 */ jal lvCheckPauseStateChanged /* f166744: afb0002c */ sw $s0,0x2c($sp) /* f166748: 3c14800a */ lui $s4,0x800a /* f16674c: 2694e6c0 */ addiu $s4,$s4,-6464 @@ -8562,12 +8562,12 @@ glabel coreTick .NB0f166764: /* f166764: 14400018 */ bnez $v0,.NB0f1667c8 /* f166768: 00000000 */ sll $zero,$zero,0x0 -/* f16676c: 0c005812 */ jal func000150c4 +/* f16676c: 0c005812 */ jal joy000150c4 /* f166770: 00000000 */ sll $zero,$zero,0x0 /* f166774: 14400004 */ bnez $v0,.NB0f166788 /* f166778: 24040cce */ addiu $a0,$zero,0xcce /* f16677c: 3c057f1b */ lui $a1,0x7f1b -/* f166780: 0c005834 */ jal func00015144 +/* f166780: 0c005834 */ jal joy00015144 /* f166784: 24a51e98 */ addiu $a1,$a1,0x1e98 .NB0f166788: /* f166788: 8e8204b4 */ lw $v0,0x4b4($s4) @@ -8676,7 +8676,7 @@ glabel coreTick /* f1668ec: 5420ffde */ bnezl $at,.NB0f166868 /* f1668f0: 8ccd0064 */ lw $t5,0x64($a2) .NB0f1668f4: -/* f1668f4: 0fc59ed0 */ jal coreIsPaused +/* f1668f4: 0fc59ed0 */ jal lvIsPaused /* f1668f8: 00000000 */ sll $zero,$zero,0x0 /* f1668fc: 10400003 */ beqz $v0,.NB0f16690c /* f166900: 00000000 */ sll $zero,$zero,0x0 @@ -8764,7 +8764,7 @@ glabel coreTick /* f166a20: 100000d4 */ beqz $zero,.NB0f166d74 /* f166a24: 8e830034 */ lw $v1,0x34($s4) .NB0f166a28: -/* f166a28: 0fc599a0 */ jal coreGetSlowMotionType +/* f166a28: 0fc599a0 */ jal lvGetSlowMotionType /* f166a2c: 00000000 */ sll $zero,$zero,0x0 /* f166a30: 8e8e0040 */ lw $t6,0x40($s4) /* f166a34: 24010002 */ addiu $at,$zero,0x2 @@ -9048,98 +9048,98 @@ glabel coreTick /* f166dec: 0fc37207 */ jal hudmsgsTick /* f166df0: 00000000 */ sll $zero,$zero,0x0 /* f166df4: 00002025 */ or $a0,$zero,$zero -/* f166df8: 0c0057c0 */ jal contGetButtonsPressedThisFrame +/* f166df8: 0c0057c0 */ jal joyGetButtonsPressedThisFrame /* f166dfc: 3405ffff */ dli $a1,0xffff /* f166e00: 1440005c */ bnez $v0,.NB0f166f74 /* f166e04: 00000000 */ sll $zero,$zero,0x0 -/* f166e08: 0c00573c */ jal contGetStickX +/* f166e08: 0c00573c */ jal joyGetStickX /* f166e0c: 00002025 */ or $a0,$zero,$zero /* f166e10: 2841000b */ slti $at,$v0,0xb /* f166e14: 10200057 */ beqz $at,.NB0f166f74 /* f166e18: 00000000 */ sll $zero,$zero,0x0 -/* f166e1c: 0c00573c */ jal contGetStickX +/* f166e1c: 0c00573c */ jal joyGetStickX /* f166e20: 00002025 */ or $a0,$zero,$zero /* f166e24: 2841fff6 */ slti $at,$v0,-10 /* f166e28: 14200052 */ bnez $at,.NB0f166f74 /* f166e2c: 00000000 */ sll $zero,$zero,0x0 -/* f166e30: 0c005766 */ jal contGetStickY +/* f166e30: 0c005766 */ jal joyGetStickY /* f166e34: 00002025 */ or $a0,$zero,$zero /* f166e38: 2841000b */ slti $at,$v0,0xb /* f166e3c: 1020004d */ beqz $at,.NB0f166f74 /* f166e40: 00000000 */ sll $zero,$zero,0x0 -/* f166e44: 0c005766 */ jal contGetStickY +/* f166e44: 0c005766 */ jal joyGetStickY /* f166e48: 00002025 */ or $a0,$zero,$zero /* f166e4c: 2841fff6 */ slti $at,$v0,-10 /* f166e50: 14200048 */ bnez $at,.NB0f166f74 /* f166e54: 24040001 */ addiu $a0,$zero,0x1 -/* f166e58: 0c0057c0 */ jal contGetButtonsPressedThisFrame +/* f166e58: 0c0057c0 */ jal joyGetButtonsPressedThisFrame /* f166e5c: 3405ffff */ dli $a1,0xffff /* f166e60: 14400044 */ bnez $v0,.NB0f166f74 /* f166e64: 00000000 */ sll $zero,$zero,0x0 -/* f166e68: 0c00573c */ jal contGetStickX +/* f166e68: 0c00573c */ jal joyGetStickX /* f166e6c: 24040001 */ addiu $a0,$zero,0x1 /* f166e70: 2841000b */ slti $at,$v0,0xb /* f166e74: 1020003f */ beqz $at,.NB0f166f74 /* f166e78: 00000000 */ sll $zero,$zero,0x0 -/* f166e7c: 0c00573c */ jal contGetStickX +/* f166e7c: 0c00573c */ jal joyGetStickX /* f166e80: 24040001 */ addiu $a0,$zero,0x1 /* f166e84: 2841fff6 */ slti $at,$v0,-10 /* f166e88: 1420003a */ bnez $at,.NB0f166f74 /* f166e8c: 00000000 */ sll $zero,$zero,0x0 -/* f166e90: 0c005766 */ jal contGetStickY +/* f166e90: 0c005766 */ jal joyGetStickY /* f166e94: 24040001 */ addiu $a0,$zero,0x1 /* f166e98: 2841000b */ slti $at,$v0,0xb /* f166e9c: 10200035 */ beqz $at,.NB0f166f74 /* f166ea0: 00000000 */ sll $zero,$zero,0x0 -/* f166ea4: 0c005766 */ jal contGetStickY +/* f166ea4: 0c005766 */ jal joyGetStickY /* f166ea8: 24040001 */ addiu $a0,$zero,0x1 /* f166eac: 2841fff6 */ slti $at,$v0,-10 /* f166eb0: 14200030 */ bnez $at,.NB0f166f74 /* f166eb4: 24040002 */ addiu $a0,$zero,0x2 -/* f166eb8: 0c0057c0 */ jal contGetButtonsPressedThisFrame +/* f166eb8: 0c0057c0 */ jal joyGetButtonsPressedThisFrame /* f166ebc: 3405ffff */ dli $a1,0xffff /* f166ec0: 1440002c */ bnez $v0,.NB0f166f74 /* f166ec4: 00000000 */ sll $zero,$zero,0x0 -/* f166ec8: 0c00573c */ jal contGetStickX +/* f166ec8: 0c00573c */ jal joyGetStickX /* f166ecc: 24040002 */ addiu $a0,$zero,0x2 /* f166ed0: 2841000b */ slti $at,$v0,0xb /* f166ed4: 10200027 */ beqz $at,.NB0f166f74 /* f166ed8: 00000000 */ sll $zero,$zero,0x0 -/* f166edc: 0c00573c */ jal contGetStickX +/* f166edc: 0c00573c */ jal joyGetStickX /* f166ee0: 24040002 */ addiu $a0,$zero,0x2 /* f166ee4: 2841fff6 */ slti $at,$v0,-10 /* f166ee8: 14200022 */ bnez $at,.NB0f166f74 /* f166eec: 00000000 */ sll $zero,$zero,0x0 -/* f166ef0: 0c005766 */ jal contGetStickY +/* f166ef0: 0c005766 */ jal joyGetStickY /* f166ef4: 24040002 */ addiu $a0,$zero,0x2 /* f166ef8: 2841000b */ slti $at,$v0,0xb /* f166efc: 1020001d */ beqz $at,.NB0f166f74 /* f166f00: 00000000 */ sll $zero,$zero,0x0 -/* f166f04: 0c005766 */ jal contGetStickY +/* f166f04: 0c005766 */ jal joyGetStickY /* f166f08: 24040002 */ addiu $a0,$zero,0x2 /* f166f0c: 2841fff6 */ slti $at,$v0,-10 /* f166f10: 14200018 */ bnez $at,.NB0f166f74 /* f166f14: 24040003 */ addiu $a0,$zero,0x3 -/* f166f18: 0c0057c0 */ jal contGetButtonsPressedThisFrame +/* f166f18: 0c0057c0 */ jal joyGetButtonsPressedThisFrame /* f166f1c: 3405ffff */ dli $a1,0xffff /* f166f20: 14400014 */ bnez $v0,.NB0f166f74 /* f166f24: 00000000 */ sll $zero,$zero,0x0 -/* f166f28: 0c00573c */ jal contGetStickX +/* f166f28: 0c00573c */ jal joyGetStickX /* f166f2c: 24040003 */ addiu $a0,$zero,0x3 /* f166f30: 2841000b */ slti $at,$v0,0xb /* f166f34: 1020000f */ beqz $at,.NB0f166f74 /* f166f38: 00000000 */ sll $zero,$zero,0x0 -/* f166f3c: 0c00573c */ jal contGetStickX +/* f166f3c: 0c00573c */ jal joyGetStickX /* f166f40: 24040003 */ addiu $a0,$zero,0x3 /* f166f44: 2841fff6 */ slti $at,$v0,-10 /* f166f48: 1420000a */ bnez $at,.NB0f166f74 /* f166f4c: 00000000 */ sll $zero,$zero,0x0 -/* f166f50: 0c005766 */ jal contGetStickY +/* f166f50: 0c005766 */ jal joyGetStickY /* f166f54: 24040003 */ addiu $a0,$zero,0x3 /* f166f58: 2841000b */ slti $at,$v0,0xb /* f166f5c: 10200005 */ beqz $at,.NB0f166f74 /* f166f60: 00000000 */ sll $zero,$zero,0x0 -/* f166f64: 0c005766 */ jal contGetStickY +/* f166f64: 0c005766 */ jal joyGetStickY /* f166f68: 24040003 */ addiu $a0,$zero,0x3 /* f166f6c: 2841fff6 */ slti $at,$v0,-10 /* f166f70: 1020000e */ beqz $at,.NB0f166fac @@ -9173,98 +9173,98 @@ glabel coreTick /* f166fd4: 00002025 */ or $a0,$zero,$zero /* f166fd8: 15c0006b */ bnez $t6,.NB0f167188 /* f166fdc: 00000000 */ sll $zero,$zero,0x0 -/* f166fe0: 0c005790 */ jal contGetButtons +/* f166fe0: 0c005790 */ jal joyGetButtons /* f166fe4: 3405ffff */ dli $a1,0xffff /* f166fe8: 14400063 */ bnez $v0,.NB0f167178 /* f166fec: 00000000 */ sll $zero,$zero,0x0 -/* f166ff0: 0c00573c */ jal contGetStickX +/* f166ff0: 0c00573c */ jal joyGetStickX /* f166ff4: 00002025 */ or $a0,$zero,$zero /* f166ff8: 2841000a */ slti $at,$v0,0xa /* f166ffc: 1020005e */ beqz $at,.NB0f167178 /* f167000: 00000000 */ sll $zero,$zero,0x0 -/* f167004: 0c00573c */ jal contGetStickX +/* f167004: 0c00573c */ jal joyGetStickX /* f167008: 00002025 */ or $a0,$zero,$zero /* f16700c: 2841fff7 */ slti $at,$v0,-9 /* f167010: 14200059 */ bnez $at,.NB0f167178 /* f167014: 00000000 */ sll $zero,$zero,0x0 -/* f167018: 0c005766 */ jal contGetStickY +/* f167018: 0c005766 */ jal joyGetStickY /* f16701c: 00002025 */ or $a0,$zero,$zero /* f167020: 2841000a */ slti $at,$v0,0xa /* f167024: 10200054 */ beqz $at,.NB0f167178 /* f167028: 00000000 */ sll $zero,$zero,0x0 -/* f16702c: 0c005766 */ jal contGetStickY +/* f16702c: 0c005766 */ jal joyGetStickY /* f167030: 00002025 */ or $a0,$zero,$zero /* f167034: 2841fff7 */ slti $at,$v0,-9 /* f167038: 1420004f */ bnez $at,.NB0f167178 /* f16703c: 24040001 */ addiu $a0,$zero,0x1 -/* f167040: 0c005790 */ jal contGetButtons +/* f167040: 0c005790 */ jal joyGetButtons /* f167044: 3405ffff */ dli $a1,0xffff /* f167048: 1440004b */ bnez $v0,.NB0f167178 /* f16704c: 00000000 */ sll $zero,$zero,0x0 -/* f167050: 0c00573c */ jal contGetStickX +/* f167050: 0c00573c */ jal joyGetStickX /* f167054: 24040001 */ addiu $a0,$zero,0x1 /* f167058: 2841000a */ slti $at,$v0,0xa /* f16705c: 10200046 */ beqz $at,.NB0f167178 /* f167060: 00000000 */ sll $zero,$zero,0x0 -/* f167064: 0c00573c */ jal contGetStickX +/* f167064: 0c00573c */ jal joyGetStickX /* f167068: 24040001 */ addiu $a0,$zero,0x1 /* f16706c: 2841fff7 */ slti $at,$v0,-9 /* f167070: 14200041 */ bnez $at,.NB0f167178 /* f167074: 00000000 */ sll $zero,$zero,0x0 -/* f167078: 0c005766 */ jal contGetStickY +/* f167078: 0c005766 */ jal joyGetStickY /* f16707c: 24040001 */ addiu $a0,$zero,0x1 /* f167080: 2841000a */ slti $at,$v0,0xa /* f167084: 1020003c */ beqz $at,.NB0f167178 /* f167088: 00000000 */ sll $zero,$zero,0x0 -/* f16708c: 0c005766 */ jal contGetStickY +/* f16708c: 0c005766 */ jal joyGetStickY /* f167090: 24040001 */ addiu $a0,$zero,0x1 /* f167094: 2841fff7 */ slti $at,$v0,-9 /* f167098: 14200037 */ bnez $at,.NB0f167178 /* f16709c: 24040002 */ addiu $a0,$zero,0x2 -/* f1670a0: 0c005790 */ jal contGetButtons +/* f1670a0: 0c005790 */ jal joyGetButtons /* f1670a4: 3405ffff */ dli $a1,0xffff /* f1670a8: 14400033 */ bnez $v0,.NB0f167178 /* f1670ac: 00000000 */ sll $zero,$zero,0x0 -/* f1670b0: 0c00573c */ jal contGetStickX +/* f1670b0: 0c00573c */ jal joyGetStickX /* f1670b4: 24040002 */ addiu $a0,$zero,0x2 /* f1670b8: 2841000a */ slti $at,$v0,0xa /* f1670bc: 1020002e */ beqz $at,.NB0f167178 /* f1670c0: 00000000 */ sll $zero,$zero,0x0 -/* f1670c4: 0c00573c */ jal contGetStickX +/* f1670c4: 0c00573c */ jal joyGetStickX /* f1670c8: 24040002 */ addiu $a0,$zero,0x2 /* f1670cc: 2841fff7 */ slti $at,$v0,-9 /* f1670d0: 14200029 */ bnez $at,.NB0f167178 /* f1670d4: 00000000 */ sll $zero,$zero,0x0 -/* f1670d8: 0c005766 */ jal contGetStickY +/* f1670d8: 0c005766 */ jal joyGetStickY /* f1670dc: 24040002 */ addiu $a0,$zero,0x2 /* f1670e0: 2841000a */ slti $at,$v0,0xa /* f1670e4: 10200024 */ beqz $at,.NB0f167178 /* f1670e8: 00000000 */ sll $zero,$zero,0x0 -/* f1670ec: 0c005766 */ jal contGetStickY +/* f1670ec: 0c005766 */ jal joyGetStickY /* f1670f0: 24040002 */ addiu $a0,$zero,0x2 /* f1670f4: 2841fff7 */ slti $at,$v0,-9 /* f1670f8: 1420001f */ bnez $at,.NB0f167178 /* f1670fc: 24040003 */ addiu $a0,$zero,0x3 -/* f167100: 0c005790 */ jal contGetButtons +/* f167100: 0c005790 */ jal joyGetButtons /* f167104: 3405ffff */ dli $a1,0xffff /* f167108: 1440001b */ bnez $v0,.NB0f167178 /* f16710c: 00000000 */ sll $zero,$zero,0x0 -/* f167110: 0c00573c */ jal contGetStickX +/* f167110: 0c00573c */ jal joyGetStickX /* f167114: 24040003 */ addiu $a0,$zero,0x3 /* f167118: 2841000a */ slti $at,$v0,0xa /* f16711c: 10200016 */ beqz $at,.NB0f167178 /* f167120: 00000000 */ sll $zero,$zero,0x0 -/* f167124: 0c00573c */ jal contGetStickX +/* f167124: 0c00573c */ jal joyGetStickX /* f167128: 24040003 */ addiu $a0,$zero,0x3 /* f16712c: 2841fff7 */ slti $at,$v0,-9 /* f167130: 14200011 */ bnez $at,.NB0f167178 /* f167134: 00000000 */ sll $zero,$zero,0x0 -/* f167138: 0c005766 */ jal contGetStickY +/* f167138: 0c005766 */ jal joyGetStickY /* f16713c: 24040003 */ addiu $a0,$zero,0x3 /* f167140: 2841000a */ slti $at,$v0,0xa /* f167144: 1020000c */ beqz $at,.NB0f167178 /* f167148: 00000000 */ sll $zero,$zero,0x0 -/* f16714c: 0c005766 */ jal contGetStickY +/* f16714c: 0c005766 */ jal joyGetStickY /* f167150: 24040003 */ addiu $a0,$zero,0x3 /* f167154: 2841fff7 */ slti $at,$v0,-9 /* f167158: 14200007 */ bnez $at,.NB0f167178 @@ -9405,7 +9405,7 @@ glabel coreTick /* f167334: 8e0c0000 */ lw $t4,0x0($s0) /* f167338: 55800019 */ bnezl $t4,.NB0f1673a0 /* f16733c: 8e8c0034 */ lw $t4,0x34($s4) -/* f167340: 0fc59ed0 */ jal coreIsPaused +/* f167340: 0fc59ed0 */ jal lvIsPaused /* f167344: 00000000 */ sll $zero,$zero,0x0 /* f167348: 14400014 */ bnez $v0,.NB0f16739c /* f16734c: 3c0d8008 */ lui $t5,0x8008 @@ -9426,7 +9426,7 @@ glabel coreTick /* f167388: afaf0018 */ sw $t7,0x18($sp) /* f16738c: afae0010 */ sw $t6,0x10($sp) /* f167390: 24070040 */ addiu $a3,$zero,0x40 -/* f167394: 0c0042bf */ jal func00010718 +/* f167394: 0c0042bf */ jal snd00010718 /* f167398: e7a40014 */ swc1 $f4,0x14($sp) .NB0f16739c: /* f16739c: 8e8c0034 */ lw $t4,0x34($s4) @@ -9681,11 +9681,11 @@ glabel coreTick /* f167710: 10000062 */ beqz $zero,.NB0f16789c /* f167714: 8fbf0044 */ lw $ra,0x44($sp) .NB0f167718: -/* f167718: 0fc5998f */ jal coreUpdateCutsceneTime +/* f167718: 0fc5998f */ jal lvUpdateCutsceneTime /* f16771c: 00000000 */ sll $zero,$zero,0x0 /* f167720: 0fc48ff7 */ jal func0f12939c /* f167724: 00000000 */ sll $zero,$zero,0x0 -/* f167728: 0fc597c1 */ jal coreUpdateSoloHandicaps +/* f167728: 0fc597c1 */ jal lvUpdateSoloHandicaps /* f16772c: 00000000 */ sll $zero,$zero,0x0 /* f167730: 0fc07568 */ jal func0f01d8c0 /* f167734: 00000000 */ sll $zero,$zero,0x0 @@ -9715,9 +9715,9 @@ glabel coreTick /* f167790: 0fc026dd */ jal nbombsTick /* f167794: 00000000 */ sll $zero,$zero,0x0 .NB0f167798: -/* f167798: 0fc58971 */ jal coreUpdateMiscSfx +/* f167798: 0fc58971 */ jal lvUpdateMiscSfx /* f16779c: 00000000 */ sll $zero,$zero,0x0 -/* f1677a0: 0c0040f6 */ jal func0000fe88 +/* f1677a0: 0c0040f6 */ jal snd0000fe88 /* f1677a4: 00000000 */ sll $zero,$zero,0x0 /* f1677a8: 0fc45920 */ jal pakExecuteDebugOperations /* f1677ac: 00000000 */ sll $zero,$zero,0x0 @@ -9796,7 +9796,7 @@ glabel coreTick ); #endif -void coreRecordDistanceMoved(void) +void lvRecordDistanceMoved(void) { f32 xdiff; f32 zdiff; @@ -9815,7 +9815,7 @@ void coreRecordDistanceMoved(void) g_Vars.currentplayerstats->distance += sqrtf(xdiff * xdiff + zdiff * zdiff); } -void coreUnloadStage(void) +void lvReset(void) { func0f11dcb0(1); @@ -9862,7 +9862,7 @@ void coreUnloadStage(void) #endif } -void coreCheckPauseStateChanged(void) +void lvCheckPauseStateChanged(void) { u32 paused = mpIsPaused(); @@ -9877,30 +9877,30 @@ void coreCheckPauseStateChanged(void) var80084010 = paused; } -void coreSetPaused(bool paused) +void lvSetPaused(bool paused) { if (paused) { func0f11deb8(); - func0000fe20(); + snd0000fe20(); } else { - func0000fe50(); + snd0000fe50(); func0f11df38(); } var80084014 = paused; } -bool coreIsPaused(void) +bool lvIsPaused(void) { return var80084014; } -s32 coreGetDifficulty(void) +s32 lvGetDifficulty(void) { return g_Difficulty; } -void coreSetDifficulty(s32 difficulty) +void lvSetDifficulty(s32 difficulty) { if (difficulty < DIFF_A || difficulty > DIFF_PD) { difficulty = DIFF_A; @@ -9909,27 +9909,27 @@ void coreSetDifficulty(s32 difficulty) g_Difficulty = difficulty; } -void coreSetMpTimeLimit60(u32 limit) +void lvSetMpTimeLimit60(u32 limit) { g_MpTimeLimit60 = limit; } -void coreSetMpScoreLimit(u32 limit) +void lvSetMpScoreLimit(u32 limit) { g_MpScoreLimit = limit; } -void coreSetMpTeamScoreLimit(u32 limit) +void lvSetMpTeamScoreLimit(u32 limit) { g_MpTeamScoreLimit = limit; } -f32 coreGetStageTimeInSeconds(void) +f32 lvGetStageTimeInSeconds(void) { return g_StageTimeElapsed1f; } -s32 coreGetStageTime60(void) +s32 lvGetStageTime60(void) { return g_StageTimeElapsed60; } diff --git a/src/game/menu/items.c b/src/game/menu/items.c index 30103f8ac..8420f3165 100644 --- a/src/game/menu/items.c +++ b/src/game/menu/items.c @@ -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, diff --git a/src/game/mplayer/ingame.c b/src/game/mplayer/ingame.c index 64a759d83..2d616ca7d 100644 --- a/src/game/mplayer/ingame.c +++ b/src/game/mplayer/ingame.c @@ -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; diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c index f7fa537bc..5856858dc 100644 --- a/src/game/mplayer/mplayer.c +++ b/src/game/mplayer/mplayer.c @@ -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); } } diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c index 143ecff61..00d8c77dc 100644 --- a/src/game/mplayer/scenarios.c +++ b/src/game/mplayer/scenarios.c @@ -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 diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c index d95e1ea51..b8c0de5d3 100644 --- a/src/game/mplayer/setup.c +++ b/src/game/mplayer/setup.c @@ -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); } } diff --git a/src/game/music.c b/src/game/music.c index 6570cf556..c4ce2bf7e 100644 --- a/src/game/music.c +++ b/src/game/music.c @@ -1,12 +1,12 @@ #include #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; } diff --git a/src/game/nbomb.c b/src/game/nbomb.c index c9109d9a7..6dd1febe1 100644 --- a/src/game/nbomb.c +++ b/src/game/nbomb.c @@ -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; diff --git a/src/game/objectives/objectives.c b/src/game/objectives/objectives.c index 54bea4ee9..c2a93d99a 100644 --- a/src/game/objectives/objectives.c +++ b/src/game/objectives/objectives.c @@ -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++; } } diff --git a/src/game/padhalllv.c b/src/game/padhalllv.c index a869b9512..9bef4308e 100644 --- a/src/game/padhalllv.c +++ b/src/game/padhalllv.c @@ -1,7 +1,7 @@ #include #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" diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index 469137294..762485799 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -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: diff --git a/src/game/prop.c b/src/game/prop.c index b5cc34551..88f988e4c 100644 --- a/src/game/prop.c +++ b/src/game/prop.c @@ -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 diff --git a/src/game/propobj.c b/src/game/propobj.c index 7d146b1bb..3b47587ad 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -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) diff --git a/src/game/sight.c b/src/game/sight.c index 465d6b65f..d59d11e91 100644 --- a/src/game/sight.c +++ b/src/game/sight.c @@ -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]; diff --git a/src/game/smoke/smoke.c b/src/game/smoke/smoke.c index f74c4cd6a..078dda3cc 100644 --- a/src/game/smoke/smoke.c +++ b/src/game/smoke/smoke.c @@ -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" diff --git a/src/game/splat.c b/src/game/splat.c index e2f832ffa..945f7ab06 100644 --- a/src/game/splat.c +++ b/src/game/splat.c @@ -1,7 +1,7 @@ #include #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" diff --git a/src/game/texture.c b/src/game/texdecompress.c similarity index 99% rename from src/game/texture.c rename to src/game/texdecompress.c index d82adf4b6..33fb2c652 100644 --- a/src/game/texture.c +++ b/src/game/texdecompress.c @@ -1,7 +1,7 @@ #include #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" diff --git a/src/game/title.c b/src/game/title.c index e4a079f35..888bc9bfc 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -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) { diff --git a/src/game/training/menus.c b/src/game/training/menus.c index ad427944e..06b787dec 100644 --- a/src/game/training/menus.c +++ b/src/game/training/menus.c @@ -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" diff --git a/src/game/training/training.c b/src/game/training/training.c index 89cdaf2fc..f489a5482 100644 --- a/src/game/training/training.c +++ b/src/game/training/training.c @@ -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) { diff --git a/src/game/weather/weather.c b/src/game/weather/weather.c index 9ace5bd6c..08a7d38bd 100644 --- a/src/game/weather/weather.c +++ b/src/game/weather/weather.c @@ -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 diff --git a/src/include/game/room.h b/src/include/game/bg.h similarity index 98% rename from src/include/game/room.h rename to src/include/game/bg.h index 3d9ed73d9..6ae400f7d 100644 --- a/src/include/game/room.h +++ b/src/include/game/bg.h @@ -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 #include "data.h" #include "types.h" diff --git a/src/include/game/core.h b/src/include/game/core.h deleted file mode 100644 index b37eb3397..000000000 --- a/src/include/game/core.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef _IN_GAME_CORE_H -#define _IN_GAME_CORE_H -#include -#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 diff --git a/src/include/game/lv.h b/src/include/game/lv.h new file mode 100644 index 000000000..c849cd1c4 --- /dev/null +++ b/src/include/game/lv.h @@ -0,0 +1,41 @@ +#ifndef _IN_GAME_LV_H +#define _IN_GAME_LV_H +#include +#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 diff --git a/src/include/game/texture.h b/src/include/game/texdecompress.h similarity index 93% rename from src/include/game/texture.h rename to src/include/game/texdecompress.h index 5afce1d6a..3bd026f47 100644 --- a/src/include/game/texture.h +++ b/src/include/game/texdecompress.h @@ -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 #include "data.h" #include "types.h" diff --git a/src/include/lib/entry.h b/src/include/lib/boot.h similarity index 76% rename from src/include/lib/entry.h rename to src/include/lib/boot.h index 392cf4f6a..216e00ac1 100644 --- a/src/include/lib/entry.h +++ b/src/include/lib/boot.h @@ -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 void boot(void); diff --git a/src/include/lib/controller.h b/src/include/lib/controller.h deleted file mode 100644 index ea2281d45..000000000 --- a/src/include/lib/controller.h +++ /dev/null @@ -1,57 +0,0 @@ -#ifndef _IN_LIB_CONTROLLER_H -#define _IN_LIB_CONTROLLER_H -#include -#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 diff --git a/src/include/lib/joy.h b/src/include/lib/joy.h new file mode 100644 index 000000000..2b5e58545 --- /dev/null +++ b/src/include/lib/joy.h @@ -0,0 +1,57 @@ +#ifndef _IN_LIB_JOY_H +#define _IN_LIB_JOY_H +#include +#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 diff --git a/src/include/lib/lib_0e9d0.h b/src/include/lib/lib_0e9d0.h deleted file mode 100644 index 7830e5d5c..000000000 --- a/src/include/lib/lib_0e9d0.h +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef _IN_LIB_LIB_0E9D0_H -#define _IN_LIB_LIB_0E9D0_H -#include -#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 diff --git a/src/include/lib/snd.h b/src/include/lib/snd.h new file mode 100644 index 000000000..cfd30a020 --- /dev/null +++ b/src/include/lib/snd.h @@ -0,0 +1,46 @@ +#ifndef _IN_LIB_SND_H +#define _IN_LIB_SND_H +#include +#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 diff --git a/src/include/types.h b/src/include/types.h index cb56b46a2..432c4bc36 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -6762,7 +6762,7 @@ struct contsample { OSContPad pads[4]; }; -struct contdata { +struct joydata { struct contsample samples[20]; s32 curlast; s32 curstart; diff --git a/src/lib/entry.c b/src/lib/boot.c similarity index 99% rename from src/lib/entry.c rename to src/lib/boot.c index bc2911acc..acedf1a17 100644 --- a/src/lib/entry.c +++ b/src/lib/boot.c @@ -1,5 +1,5 @@ #include -#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" diff --git a/src/lib/init.c b/src/lib/init.c index de894125a..188575932 100644 --- a/src/lib/init.c +++ b/src/lib/init.c @@ -1,5 +1,5 @@ #include -#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" diff --git a/src/lib/controller.c b/src/lib/joy.c similarity index 76% rename from src/lib/controller.c rename to src/lib/joy.c index 64045ed3f..c7ba7e1f8 100644 --- a/src/lib/controller.c +++ b/src/lib/joy.c @@ -3,7 +3,7 @@ #include "game/pak/pak.h" #include "bss.h" #include "lib/main.h" -#include "lib/controller.h" +#include "lib/joy.h" #include "lib/lib_4f5e0.h" #include "data.h" #include "types.h" @@ -11,7 +11,7 @@ /** * PD uses use a separate thread (than the main game) for controller polling. * This thread polls the controllers as frequently as possible and stores its - * results inside g_ContData->samples. This allows the main thread to access a + * results inside g_JoyData->samples. This allows the main thread to access a * history of controller states since the last rendered frame. For example, * under laggy conditions the player might press and release a button between * two frames and the main thread can tell that this has happened even if the @@ -32,8 +32,8 @@ * sample in the next partition. */ -struct contdata g_ContData[2]; -s32 g_ContDisableCooldown[4]; +struct joydata g_JoyData[2]; +s32 g_JoyDisableCooldown[4]; OSMesgQueue var80099e78; OSMesg var80099e90; u32 var80099e94; @@ -58,33 +58,33 @@ OSMesg var80099f18; u32 var80099f1c; OSMesgQueue var80099f20; OSContStatus var80099f38[4]; -u8 g_ContPfsStates[100]; +u8 g_JoyPfsStates[100]; u32 var80099fac; u32 var80099fb0; const char var70054080[] = "joyReset\n"; const char var7005408c[] = "joyReset: doing nothing\n"; -struct contdata *g_ContDataPtr = &g_ContData[0]; -bool g_ContBusy = false; +struct joydata *g_JoyDataPtr = &g_JoyData[0]; +bool g_JoyBusy = false; u32 var8005ee68 = 0; // Number of times per pad that different inputs were attempted to be read // when controller was disconnected or not ready. -u32 g_ContBadReadsStickX[4] = {0}; -u32 g_ContBadReadsStickY[4] = {0}; -u32 g_ContBadReadsButtons[4] = {0}; -u32 g_ContBadReadsButtonsPressed[4] = {0}; +u32 g_JoyBadReadsStickX[4] = {0}; +u32 g_JoyBadReadsStickY[4] = {0}; +u32 g_JoyBadReadsButtons[4] = {0}; +u32 g_JoyBadReadsButtonsPressed[4] = {0}; -u8 g_ConnectedControllers = 0; -bool g_ContQueuesCreated = false; -bool g_ContInitDone = false; -bool g_ContNeedsInit = true; +u8 g_JoyConnectedControllers = 0; +bool g_JoyQueuesCreated = false; +bool g_JoyInitDone = false; +bool g_JoyNeedsInit = true; u32 var8005eebc = 0; u32 var8005eec0 = 1; s32 (*var8005eec4)(struct contsample *samples, s32 samplenum) = NULL; void (*var8005eec8)(struct contsample *samples, s32 samplenum, s32 samplenum2) = NULL; -s32 g_ContNextPfsStateIndex = 0; +s32 g_JoyNextPfsStateIndex = 0; u32 var8005eed0 = 0; u32 var8005eed4 = 0; u8 var8005eed8 = 0; @@ -96,61 +96,61 @@ u32 var8005eeec = 0; u32 var8005eef0 = 1; #if VERSION >= VERSION_NTSC_1_0 -void func00013900(void) +void joy00013900(void) { if (var8005eef0) { - func000150e8(); + joy000150e8(); var8005eef0 = false; } } -void func00013938(void) +void joy00013938(void) { if (!var8005eef0) { - func00015144(); + joy00015144(); var8005eef0 = true; } } -void func00013974(u32 value) +void joy00013974(u32 value) { var8005eeec = value; } #endif #if VERSION >= VERSION_NTSC_1_0 -u32 func00013980(void) +u32 joy00013980(void) { return var8005eeec; } #endif #if VERSION >= VERSION_NTSC_1_0 -void func0001398c(s32 value) +void joy0001398c(s32 value) { var8005eee4 = var8005eee0 = value * 11000; } #else GLOBAL_ASM( -glabel func0001398c +glabel joy0001398c /* 14a70: 3c018006 */ lui $at,0x8006 /* 14a74: 03e00008 */ jr $ra /* 14a78: ac2412bc */ sw $a0,0x12bc($at) ); #endif -void func000139c8(void) +void joy000139c8(void) { #if VERSION >= VERSION_NTSC_1_0 - func0001398c(10); + joy0001398c(10); #else - func0001398c(30); + joy0001398c(30); #endif } #if VERSION < VERSION_NTSC_1_0 // Same function as the one a couple above, just relocated -u32 func00013980(void) +u32 joy00013980(void) { #if VERSION >= VERSION_NTSC_1_0 return var8005eeec; @@ -162,23 +162,23 @@ u32 func00013980(void) #if VERSION >= VERSION_NTSC_1_0 /** - * Remove an item from the beginning of the g_ContPfsStates array, + * Remove an item from the beginning of the g_JoyPfsStates array, * shift the rest of the array back and return the removed item. */ -s32 contShiftPfsStates(void) +s32 joyShiftPfsStates(void) { s32 pfsstate = 0; s32 i; - if (g_ContNextPfsStateIndex) { - pfsstate = g_ContPfsStates[0]; + if (g_JoyNextPfsStateIndex) { + pfsstate = g_JoyPfsStates[0]; - if (g_ContNextPfsStateIndex > 1) { - for (i = 0; i < g_ContNextPfsStateIndex; i++) { - g_ContPfsStates[i] = g_ContPfsStates[i + 1]; + if (g_JoyNextPfsStateIndex > 1) { + for (i = 0; i < g_JoyNextPfsStateIndex; i++) { + g_JoyPfsStates[i] = g_JoyPfsStates[i + 1]; } - g_ContNextPfsStateIndex--; + g_JoyNextPfsStateIndex--; } } @@ -187,15 +187,15 @@ s32 contShiftPfsStates(void) #endif #if VERSION >= VERSION_NTSC_1_0 -void contRecordPfsState(u8 pfsstate) +void joyRecordPfsState(u8 pfsstate) { - if (g_ContNextPfsStateIndex + 1 >= 100) { - contShiftPfsStates(); + if (g_JoyNextPfsStateIndex + 1 >= 100) { + joyShiftPfsStates(); } - if (g_ContNextPfsStateIndex == 0 || pfsstate != g_ContPfsStates[g_ContNextPfsStateIndex - 1]) { - g_ContPfsStates[g_ContNextPfsStateIndex] = pfsstate; - g_ContNextPfsStateIndex++; + if (g_JoyNextPfsStateIndex == 0 || pfsstate != g_JoyPfsStates[g_JoyNextPfsStateIndex - 1]) { + g_JoyPfsStates[g_JoyNextPfsStateIndex] = pfsstate; + g_JoyNextPfsStateIndex++; } } #endif @@ -205,7 +205,7 @@ void contRecordPfsState(u8 pfsstate) * Scan controllers for controller paks, but only under certain conditions. * Seems to be timer based, or can be forced by passing 2 as arg0. */ -void contCheckPfs(s32 arg0) +void joyCheckPfs(s32 arg0) { static u32 thiscount = 0; // 8005eef4 static u32 prevcount = 0; // 8005eef8 @@ -236,18 +236,18 @@ void contCheckPfs(s32 arg0) var8005eee8++; if (arg0) { - func000150e8(); + joy000150e8(); } osPfsIsPlug(&var80099e78, &bitpattern); if (arg0) { - func00015144(); + joy00015144(); } bitpattern |= 0x10; - contRecordPfsState(bitpattern); + joyRecordPfsState(bitpattern); var8005eee4 = var8005eee0; } @@ -265,21 +265,21 @@ void contCheckPfs(s32 arg0) #if VERSION >= VERSION_NTSC_1_0 /** - * "Temporarily" because the next time contCheckPfs runs, the true state will be + * "Temporarily" because the next time joyCheckPfs runs, the true state will be * recorded. * * Note that var8005eed8 is always zero, so this record will suggest that this * pak is the only one connected. */ -void contSetPfsTemporarilyPlugged(s8 index) +void joySetPfsTemporarilyPlugged(s8 index) { u8 bitpattern = var8005eed8 & ~(1 << index); - contRecordPfsState(bitpattern); + joyRecordPfsState(bitpattern); } #else GLOBAL_ASM( -glabel contSetPfsTemporarilyPlugged +glabel joySetPfsTemporarilyPlugged /* 14aa8: 3c028006 */ lui $v0,0x8006 /* 14aac: 244212c4 */ addiu $v0,$v0,0x12c4 /* 14ab0: 00047600 */ sll $t6,$a0,0x18 @@ -295,7 +295,7 @@ glabel contSetPfsTemporarilyPlugged ); #endif -void contSystemInit(void) +void joySystemInit(void) { s32 i; s32 j; @@ -308,28 +308,28 @@ void contSystemInit(void) osSetEventMesg(OS_EVENT_SI, &var80099e78, NULL); - g_ContQueuesCreated = true; + g_JoyQueuesCreated = true; var8005eec4 = NULL; var8005eec8 = NULL; for (i = 0; i < 2; i++) { - g_ContData[i].curlast = 0; - g_ContData[i].curstart = 0; - g_ContData[i].nextlast = 0; - g_ContData[i].nextsecondlast = 0; - g_ContData[i].unk200 = -1; + g_JoyData[i].curlast = 0; + g_JoyData[i].curstart = 0; + g_JoyData[i].nextlast = 0; + g_JoyData[i].nextsecondlast = 0; + g_JoyData[i].unk200 = -1; for (j = 0; j < 4; j++) { - g_ContData[i].samples[0].pads[j].button = 0; - g_ContData[i].samples[0].pads[j].stick_x = 0; - g_ContData[i].samples[0].pads[j].stick_y = 0; - g_ContData[i].samples[0].pads[j].errno = 0; + g_JoyData[i].samples[0].pads[j].button = 0; + g_JoyData[i].samples[0].pads[j].stick_x = 0; + g_JoyData[i].samples[0].pads[j].stick_y = 0; + g_JoyData[i].samples[0].pads[j].errno = 0; } } for (i = 0; i < 4; i++) { - g_ContDisableCooldown[i] = 0; + g_JoyDisableCooldown[i] = 0; } } @@ -341,24 +341,24 @@ void contSystemInit(void) * progressing past endscreens if they are holding buttons when they are * started. */ -void contDisableTemporarily(void) +void joyDisableTemporarily(void) { s32 i; for (i = 0; i < 4; i++) { - g_ContDisableCooldown[i] = PALDOWN(60); + g_JoyDisableCooldown[i] = PALDOWN(60); } } -void func00013dfc(void) +void joy00013dfc(void) { OSMesg msg; - if (g_ContQueuesCreated) { + if (g_JoyQueuesCreated) { osSendMesg(&var80099ec0, &msg, OS_MESG_NOBLOCK); osRecvMesg(&var80099ee0, &msg, OS_MESG_BLOCK); - func00013e84(); + joy00013e84(); osSendMesg(&var80099f00, &msg, OS_MESG_NOBLOCK); osRecvMesg(&var80099f20, &msg, OS_MESG_BLOCK); @@ -367,21 +367,21 @@ void func00013dfc(void) } } -void func00013e84(void) +void joy00013e84(void) { static u8 var8005ef00 = 0xff; // osContInit should be called only once. The first time this function is // called it'll take the first branch here, and all subsequent calls will // take the second branch. - if (g_ContNeedsInit) { + if (g_JoyNeedsInit) { s32 i; - g_ContNeedsInit = false; - osContInit(&var80099e78, &g_ConnectedControllers, var80099f38); - g_ContInitDone = true; + g_JoyNeedsInit = false; + osContInit(&var80099e78, &g_JoyConnectedControllers, var80099f38); + g_JoyInitDone = true; for (i = 0; i < 4; i++) { - func000153c4(i, 0); + joy000153c4(i, 0); } } else { u32 slots = 0xf; @@ -397,20 +397,20 @@ void func00013e84(void) } } - g_ConnectedControllers = slots; + g_JoyConnectedControllers = slots; } - if (var8005ef00 != g_ConnectedControllers) { + if (var8005ef00 != g_JoyConnectedControllers) { s32 i = 0; s32 index = 0; for (; i < 4; i++) { - if (g_ConnectedControllers & (1 << i)) { + if (g_JoyConnectedControllers & (1 << i)) { g_Vars.playertojoymap[index++] = i; } } - var8005ef00 = g_ConnectedControllers; + var8005ef00 = g_JoyConnectedControllers; } } @@ -418,12 +418,12 @@ s8 contGetFreeSlot(void) { s32 i; - if (g_ContDataPtr->unk200 >= 0) { - return g_ContDataPtr->unk200; + if (g_JoyDataPtr->unk200 >= 0) { + return g_JoyDataPtr->unk200; } for (i = 0; i < 4; i++) { - if ((g_ConnectedControllers & (1 << i)) == 0) { + if ((g_JoyConnectedControllers & (1 << i)) == 0) { return i; } } @@ -431,9 +431,9 @@ s8 contGetFreeSlot(void) return 4; } -u32 contGetConnectedControllers(void) +u32 joyGetConnectedControllers(void) { - return g_ConnectedControllers; + return g_JoyConnectedControllers; } #if VERSION < VERSION_NTSC_1_0 @@ -456,41 +456,41 @@ glabel func00014eb0nb ); #endif -void contConsumeSamples(struct contdata *contdata) +void joyConsumeSamples(struct joydata *joydata) { s8 i; s32 samplenum; u16 buttons1; u16 buttons2; - contdata->curstart = contdata->curlast; - contdata->curlast = contdata->nextlast; + joydata->curstart = joydata->curlast; + joydata->curlast = joydata->nextlast; for (i = 0; i < 4; i++) { - contdata->buttonspressed[i] = 0; - contdata->buttonsreleased[i] = 0; + joydata->buttonspressed[i] = 0; + joydata->buttonsreleased[i] = 0; - if (contdata->curlast != contdata->curstart) { - samplenum = (contdata->curstart + 1) % 20; while (true) { - buttons1 = contdata->samples[samplenum].pads[i].button; - buttons2 = contdata->samples[(samplenum + 19) % 20].pads[i].button; + if (joydata->curlast != joydata->curstart) { + samplenum = (joydata->curstart + 1) % 20; while (true) { + buttons1 = joydata->samples[samplenum].pads[i].button; + buttons2 = joydata->samples[(samplenum + 19) % 20].pads[i].button; - contdata->buttonspressed[i] |= buttons1 & ~buttons2; - contdata->buttonsreleased[i] |= ~buttons1 & buttons2; + joydata->buttonspressed[i] |= buttons1 & ~buttons2; + joydata->buttonsreleased[i] |= ~buttons1 & buttons2; - if (g_ContDisableCooldown[i] > 0) { - if (contdata->samples[samplenum].pads[i].button == 0 - && contdata->samples[samplenum].pads[i].stick_x < 15 - && contdata->samples[samplenum].pads[i].stick_x > -15 - && contdata->samples[samplenum].pads[i].stick_y < 15 - && contdata->samples[samplenum].pads[i].stick_y > -15) { - g_ContDisableCooldown[i] = 0; + if (g_JoyDisableCooldown[i] > 0) { + if (joydata->samples[samplenum].pads[i].button == 0 + && joydata->samples[samplenum].pads[i].stick_x < 15 + && joydata->samples[samplenum].pads[i].stick_x > -15 + && joydata->samples[samplenum].pads[i].stick_y < 15 + && joydata->samples[samplenum].pads[i].stick_y > -15) { + g_JoyDisableCooldown[i] = 0; } else { - g_ContDisableCooldown[i]--; + g_JoyDisableCooldown[i]--; } } - if (samplenum == contdata->curlast) { + if (samplenum == joydata->curlast) { break; } @@ -519,7 +519,7 @@ glabel func0001509cnb /* 150d0: 0319082a */ slt $at,$t8,$t9 /* 150d4: 1020000d */ beqz $at,.NB0001510c /* 150d8: 00000000 */ sll $zero,$zero,0x0 -/* 150dc: 0c005332 */ jal func00013e84 +/* 150dc: 0c005332 */ jal joy00013e84 /* 150e0: ac400000 */ sw $zero,0x0($v0) /* 150e4: 3c04800a */ lui $a0,0x800a /* 150e8: 3c058006 */ lui $a1,0x8006 @@ -546,7 +546,7 @@ glabel func0001509cnb * The use of the static variable suggests that the function is able to be * called recursively, but its behaviour should not be run when recursing. */ -void func00014238(void) +void joy00014238(void) { static bool doingit = false; s32 i; @@ -555,13 +555,13 @@ void func00014238(void) doingit = true; for (i = 0; i < 4; i++) { - if (func000155f4(i) == 13) { + if (joy000155f4(i) == 13) { func0f116db0(i, 11); } } if (var8005eec4 == NULL) { - func0001561c(); + joy0001561c(); } doingit = false; @@ -570,7 +570,7 @@ void func00014238(void) u32 var8005ef08 = 0; -void contDebugJoy(void) +void joyDebugJoy(void) { #if VERSION >= VERSION_NTSC_1_0 func0000db30("debugjoy", &var8005ef08); @@ -580,38 +580,38 @@ void contDebugJoy(void) #if VERSION >= VERSION_NTSC_1_0 if (g_Vars.paksconnected) { - contCheckPfs(1); + joyCheckPfs(1); } #endif if (var8005eec4) { - g_ContData[1].nextlast = var8005eec4(g_ContData[1].samples, g_ContData[1].curlast); - contConsumeSamples(&g_ContData[1]); + g_JoyData[1].nextlast = var8005eec4(g_JoyData[1].samples, g_JoyData[1].curlast); + joyConsumeSamples(&g_JoyData[1]); } - contConsumeSamples(&g_ContData[0]); + joyConsumeSamples(&g_JoyData[0]); if (var8005eec8) { - var8005eec8(g_ContData[0].samples, g_ContData[0].curstart, g_ContData[0].curlast); + var8005eec8(g_JoyData[0].samples, g_JoyData[0].curstart, g_JoyData[0].curlast); } - if (func000150c4() && var8005eec0 && contGetNumSamples() <= 0) { + if (joy000150c4() && var8005eec0 && joyGetNumSamples() <= 0) { #if VERSION >= VERSION_NTSC_FINAL - func000150e8(); - func00014238(); - func00015144(); - contConsumeSamples(&g_ContData[0]); + joy000150e8(); + joy00014238(); + joy00015144(); + joyConsumeSamples(&g_JoyData[0]); #elif VERSION >= VERSION_NTSC_1_0 - func000150e8(); - func00015144(); - contConsumeSamples(&g_ContData[0]); - func00014238(); + joy000150e8(); + joy00015144(); + joyConsumeSamples(&g_JoyData[0]); + joy00014238(); #else - func000150e8(500, "joy.c"); - func00014238(); + joy000150e8(500, "joy.c"); + joy00014238(); func0001509cnb(); - func00015144(507, "joy.c"); - contConsumeSamples(&g_ContData[0]); + joy00015144(507, "joy.c"); + joyConsumeSamples(&g_JoyData[0]); #endif } } @@ -633,45 +633,45 @@ const char var70055958nb[] = "joy.c"; const char var70055960nb[] = "joy.c"; #endif -s32 contStartReadData(OSMesgQueue *mq) +s32 joyStartReadData(OSMesgQueue *mq) { return osContStartReadData(mq); } -void contReadData(void) +void joyReadData(void) { - s32 index = (g_ContData[0].nextlast + 1) % 20; + s32 index = (g_JoyData[0].nextlast + 1) % 20; - if (index == g_ContData[0].curstart) { + if (index == g_JoyData[0].curstart) { // If the sample queue is full, don't overwrite the oldest sample. // Instead, overwrite the most recent. - index = g_ContData[0].nextlast; + index = g_JoyData[0].nextlast; } - osContGetReadData(g_ContData[0].samples[index].pads); + osContGetReadData(g_JoyData[0].samples[index].pads); - g_ContData[0].nextlast = index; - g_ContData[0].nextsecondlast = (g_ContData[0].nextlast + 19) % 20; + g_JoyData[0].nextlast = index; + g_JoyData[0].nextsecondlast = (g_JoyData[0].nextlast + 19) % 20; } #if VERSION >= VERSION_NTSC_1_0 -void contPoll(void) +void joyPoll(void) { OSMesg msg; s8 i; if (osRecvMesg(&var80099ec0, &msg, OS_MESG_NOBLOCK) == 0) { - if (g_ContBusy) { + if (g_JoyBusy) { osRecvMesg(&var80099e78, &msg, OS_MESG_BLOCK); - g_ContBusy = false; - contReadData(); + g_JoyBusy = false; + joyReadData(); // Check if error state has changed for any controller for (i = 0; i < 4; i++) { - if ((g_ContData[0].samples[g_ContData[0].nextlast].pads[i].errno == 0 && g_ContData[0].samples[g_ContData[0].nextsecondlast].pads[i].errno != 0) - || (g_ContData[0].samples[g_ContData[0].nextlast].pads[i].errno != 0 && g_ContData[0].samples[g_ContData[0].nextsecondlast].pads[i].errno == 0)) { - func00013e84(); + if ((g_JoyData[0].samples[g_JoyData[0].nextlast].pads[i].errno == 0 && g_JoyData[0].samples[g_JoyData[0].nextsecondlast].pads[i].errno != 0) + || (g_JoyData[0].samples[g_JoyData[0].nextlast].pads[i].errno != 0 && g_JoyData[0].samples[g_JoyData[0].nextsecondlast].pads[i].errno == 0)) { + joy00013e84(); break; } } @@ -681,7 +681,7 @@ void contPoll(void) var8005ee68++; - contCheckPfs(0); + joyCheckPfs(0); return; } @@ -689,40 +689,40 @@ void contPoll(void) var8005ee68--; if (var8005ee68 == 0) { - contStartReadData(&var80099e78); - g_ContBusy = true; + joyStartReadData(&var80099e78); + g_JoyBusy = true; } osSendMesg(&var80099f20, &msg, OS_MESG_NOBLOCK); return; } - if (g_ContInitDone) { + if (g_JoyInitDone) { if (var8005ee68) { - contCheckPfs(0); + joyCheckPfs(0); return; } if (osRecvMesg(&var80099e78, &msg, OS_MESG_NOBLOCK) == 0) { static s32 count = 0; - g_ContBusy = false; - contReadData(); + g_JoyBusy = false; + joyReadData(); // Check if error state has changed for any controller for (i = 0; i < 4; i++) { - if ((g_ContData[0].samples[g_ContData[0].nextlast].pads[i].errno == 0 && g_ContData[0].samples[g_ContData[0].nextsecondlast].pads[i].errno != 0) - || (g_ContData[0].samples[g_ContData[0].nextlast].pads[i].errno != 0 && g_ContData[0].samples[g_ContData[0].nextsecondlast].pads[i].errno == 0)) { - func00013e84(); + if ((g_JoyData[0].samples[g_JoyData[0].nextlast].pads[i].errno == 0 && g_JoyData[0].samples[g_JoyData[0].nextsecondlast].pads[i].errno != 0) + || (g_JoyData[0].samples[g_JoyData[0].nextlast].pads[i].errno != 0 && g_JoyData[0].samples[g_JoyData[0].nextsecondlast].pads[i].errno == 0)) { + joy00013e84(); break; } } - func00014238(); - contCheckPfs(0); + joy00014238(); + joyCheckPfs(0); - contStartReadData(&var80099e78); - g_ContBusy = true; + joyStartReadData(&var80099e78); + g_JoyBusy = true; count++; @@ -730,11 +730,11 @@ void contPoll(void) s32 i; for (i = 0; i < 4; i++) { - if (g_ContBadReadsStickX[i] || g_ContBadReadsStickY[i] || g_ContBadReadsButtons[i] || g_ContBadReadsButtonsPressed[i]) { - g_ContBadReadsStickX[i] = 0; - g_ContBadReadsStickY[i] = 0; - g_ContBadReadsButtons[i] = 0; - g_ContBadReadsButtonsPressed[i] = 0; + if (g_JoyBadReadsStickX[i] || g_JoyBadReadsStickY[i] || g_JoyBadReadsButtons[i] || g_JoyBadReadsButtonsPressed[i]) { + g_JoyBadReadsStickX[i] = 0; + g_JoyBadReadsStickY[i] = 0; + g_JoyBadReadsButtons[i] = 0; + g_JoyBadReadsButtonsPressed[i] = 0; } } @@ -745,7 +745,7 @@ void contPoll(void) } #else GLOBAL_ASM( -glabel contPoll +glabel joyPoll /* 1536c: 3c028006 */ lui $v0,0x8006 /* 15370: 244212c0 */ addiu $v0,$v0,0x12c0 /* 15374: 8c4e0000 */ lw $t6,0x0($v0) @@ -768,7 +768,7 @@ glabel contPoll /* 153b8: 0c0126b0 */ jal osRecvMesg /* 153bc: 24060001 */ addiu $a2,$zero,0x1 /* 153c0: 3c018006 */ lui $at,0x8006 -/* 153c4: 0c0054bc */ jal contReadData +/* 153c4: 0c0054bc */ jal joyReadData /* 153c8: ac201254 */ sw $zero,0x1254($at) /* 153cc: 3c19800a */ lui $t9,0x800a /* 153d0: 8f39e3a8 */ lw $t9,-0x1c58($t9) @@ -811,7 +811,7 @@ glabel contPoll /* 1545c: 55400006 */ bnezl $t2,.NB00015478 /* 15460: 00055e00 */ sll $t3,$a1,0x18 .NB00015464: -/* 15464: 0c005332 */ jal func00013e84 +/* 15464: 0c005332 */ jal joy00013e84 /* 15468: 00000000 */ sll $zero,$zero,0x0 /* 1546c: 10000006 */ beqz $zero,.NB00015488 /* 15470: 00000000 */ sll $zero,$zero,0x0 @@ -848,7 +848,7 @@ glabel contPoll /* 154dc: 25f8ffff */ addiu $t8,$t7,-1 /* 154e0: 17000006 */ bnez $t8,.NB000154fc /* 154e4: ac780000 */ sw $t8,0x0($v1) -/* 154e8: 0c0054b4 */ jal contStartReadData +/* 154e8: 0c0054b4 */ jal joyStartReadData /* 154ec: 2484e5d8 */ addiu $a0,$a0,-6696 /* 154f0: 24080001 */ addiu $t0,$zero,0x1 /* 154f4: 3c018006 */ lui $at,0x8006 @@ -877,7 +877,7 @@ glabel contPoll /* 15548: 00003025 */ or $a2,$zero,$zero /* 1554c: 14400064 */ bnez $v0,.NB000156e0 /* 15550: 3c018006 */ lui $at,0x8006 -/* 15554: 0c0054bc */ jal contReadData +/* 15554: 0c0054bc */ jal joyReadData /* 15558: ac201254 */ sw $zero,0x1254($at) /* 1555c: 3c0b800a */ lui $t3,0x800a /* 15560: 8d6be3a8 */ lw $t3,-0x1c58($t3) @@ -920,7 +920,7 @@ glabel contPoll /* 155ec: 55c00006 */ bnezl $t6,.NB00015608 /* 155f0: 00057e00 */ sll $t7,$a1,0x18 .NB000155f4: -/* 155f4: 0c005332 */ jal func00013e84 +/* 155f4: 0c005332 */ jal joy00013e84 /* 155f8: 00000000 */ sll $zero,$zero,0x0 /* 155fc: 10000006 */ beqz $zero,.NB00015618 /* 15600: 00000000 */ sll $zero,$zero,0x0 @@ -932,12 +932,12 @@ glabel contPoll /* 15610: 1420ffde */ bnez $at,.NB0001558c /* 15614: 00000000 */ sll $zero,$zero,0x0 .NB00015618: -/* 15618: 0c005449 */ jal func00014238 +/* 15618: 0c005449 */ jal joy00014238 /* 1561c: 00000000 */ sll $zero,$zero,0x0 /* 15620: 0c005427 */ jal func0001509cnb /* 15624: 00000000 */ sll $zero,$zero,0x0 /* 15628: 3c04800a */ lui $a0,0x800a -/* 1562c: 0c0054b4 */ jal contStartReadData +/* 1562c: 0c0054b4 */ jal joyStartReadData /* 15630: 2484e5d8 */ addiu $a0,$a0,-6696 /* 15634: 3c038006 */ lui $v1,0x8006 /* 15638: 8c6312dc */ lw $v1,0x12dc($v1) @@ -994,92 +994,92 @@ glabel contPoll ); #endif -void func00014810(bool value) +void joy00014810(bool value) { var8005eec0 = value; } -s32 contGetNumSamples(void) +s32 joyGetNumSamples(void) { - return (g_ContDataPtr->curlast - g_ContDataPtr->curstart + 20) % 20; + return (g_JoyDataPtr->curlast - g_JoyDataPtr->curstart + 20) % 20; } -s32 contGetStickXOnSample(s32 samplenum, s8 contpadnum) +s32 joyGetStickXOnSample(s32 samplenum, s8 contpadnum) { - if (g_ContDataPtr->unk200 < 0 && (g_ConnectedControllers >> contpadnum & 1) == 0) { - g_ContBadReadsStickX[contpadnum]++; + if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { + g_JoyBadReadsStickX[contpadnum]++; return 0; } - if (g_ContDisableCooldown[contpadnum] > 0) { + if (g_JoyDisableCooldown[contpadnum] > 0) { return 0; } - return g_ContDataPtr->samples[(g_ContDataPtr->curstart + samplenum + 1) % 20].pads[contpadnum].stick_x; + return g_JoyDataPtr->samples[(g_JoyDataPtr->curstart + samplenum + 1) % 20].pads[contpadnum].stick_x; } -s32 contGetStickYOnSample(s32 samplenum, s8 contpadnum) +s32 joyGetStickYOnSample(s32 samplenum, s8 contpadnum) { - if (g_ContDataPtr->unk200 < 0 && (g_ConnectedControllers >> contpadnum & 1) == 0) { - g_ContBadReadsStickY[contpadnum]++; + if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { + g_JoyBadReadsStickY[contpadnum]++; return 0; } - if (g_ContDisableCooldown[contpadnum] > 0) { + if (g_JoyDisableCooldown[contpadnum] > 0) { return 0; } - return g_ContDataPtr->samples[(g_ContDataPtr->curstart + samplenum + 1) % 20].pads[contpadnum].stick_y; + return g_JoyDataPtr->samples[(g_JoyDataPtr->curstart + samplenum + 1) % 20].pads[contpadnum].stick_y; } -s32 contGetStickYOnSampleIndex(s32 samplenum, s8 contpadnum) +s32 joyGetStickYOnSampleIndex(s32 samplenum, s8 contpadnum) { - if (g_ContDataPtr->unk200 < 0 && (g_ConnectedControllers >> contpadnum & 1) == 0) { - g_ContBadReadsStickY[contpadnum]++; + if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { + g_JoyBadReadsStickY[contpadnum]++; return 0; } - if (g_ContDisableCooldown[contpadnum] > 0) { + if (g_JoyDisableCooldown[contpadnum] > 0) { return 0; } - return g_ContDataPtr->samples[(g_ContDataPtr->curstart + samplenum) % 20].pads[contpadnum].stick_y; + return g_JoyDataPtr->samples[(g_JoyDataPtr->curstart + samplenum) % 20].pads[contpadnum].stick_y; } -u16 contGetButtonsOnSample(s32 samplenum, s8 contpadnum, u16 mask) +u16 joyGetButtonsOnSample(s32 samplenum, s8 contpadnum, u16 mask) { u16 button; - if (g_ContDataPtr->unk200 < 0 && (g_ConnectedControllers >> contpadnum & 1) == 0) { - g_ContBadReadsButtons[contpadnum]++; + if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { + g_JoyBadReadsButtons[contpadnum]++; return 0; } - if (g_ContDisableCooldown[contpadnum] > 0) { + if (g_JoyDisableCooldown[contpadnum] > 0) { return 0; } - button = g_ContDataPtr->samples[(g_ContDataPtr->curstart + samplenum + 1) % 20].pads[contpadnum].button; + button = g_JoyDataPtr->samples[(g_JoyDataPtr->curstart + samplenum + 1) % 20].pads[contpadnum].button; return button & mask; } -u16 contGetButtonsPressedOnSample(s32 samplenum, s8 contpadnum, u16 mask) +u16 joyGetButtonsPressedOnSample(s32 samplenum, s8 contpadnum, u16 mask) { u16 button1; u16 button2; - if (g_ContDataPtr->unk200 < 0 && (g_ConnectedControllers >> contpadnum & 1) == 0) { - g_ContBadReadsButtonsPressed[contpadnum]++; + if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { + g_JoyBadReadsButtonsPressed[contpadnum]++; return 0; } - if (g_ContDisableCooldown[contpadnum] > 0) { + if (g_JoyDisableCooldown[contpadnum] > 0) { return 0; } - button1 = g_ContDataPtr->samples[(g_ContDataPtr->curstart + samplenum + 1) % 20].pads[contpadnum].button; - button2 = g_ContDataPtr->samples[(g_ContDataPtr->curstart + samplenum) % 20].pads[contpadnum].button; + button1 = g_JoyDataPtr->samples[(g_JoyDataPtr->curstart + samplenum + 1) % 20].pads[contpadnum].button; + button2 = g_JoyDataPtr->samples[(g_JoyDataPtr->curstart + samplenum) % 20].pads[contpadnum].button; return (button1 & ~button2) & mask; } @@ -1091,34 +1091,34 @@ u16 contGetButtonsPressedOnSample(s32 samplenum, s8 contpadnum, u16 mask) * For example, if checksamples[5] is nonzero and a button was pressed on * samplenum 5 which matches the mask, count is incremented. */ -s32 contCountButtonsOnSpecificSamples(u32 *checksamples, s8 contpadnum, u16 mask) +s32 joyCountButtonsOnSpecificSamples(u32 *checksamples, s8 contpadnum, u16 mask) { s32 count = 0; s32 index = 0; s32 i; u16 button; - if (g_ContDataPtr->unk200 < 0 && (g_ConnectedControllers >> contpadnum & 1) == 0) { - g_ContBadReadsButtons[contpadnum]++; + if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { + g_JoyBadReadsButtons[contpadnum]++; return 0; } - if (g_ContDisableCooldown[contpadnum] > 0) { + if (g_JoyDisableCooldown[contpadnum] > 0) { return 0; } - i = (g_ContDataPtr->curstart + 1) % 20; + i = (g_JoyDataPtr->curstart + 1) % 20; while (true) { if (checksamples == NULL || checksamples[index]) { - button = g_ContDataPtr->samples[i].pads[contpadnum].button; + button = g_JoyDataPtr->samples[i].pads[contpadnum].button; if (button & mask) { count++; } } - if (i == g_ContDataPtr->curlast) { + if (i == g_JoyDataPtr->curlast) { break; } @@ -1129,60 +1129,60 @@ s32 contCountButtonsOnSpecificSamples(u32 *checksamples, s8 contpadnum, u16 mask return count; } -s8 contGetStickX(s8 contpadnum) +s8 joyGetStickX(s8 contpadnum) { - if (g_ContDataPtr->unk200 < 0 && (g_ConnectedControllers >> contpadnum & 1) == 0) { - g_ContBadReadsStickX[contpadnum]++; + if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { + g_JoyBadReadsStickX[contpadnum]++; return 0; } - if (g_ContDisableCooldown[contpadnum] > 0) { + if (g_JoyDisableCooldown[contpadnum] > 0) { return 0; } - return g_ContDataPtr->samples[g_ContDataPtr->curlast].pads[contpadnum].stick_x; + return g_JoyDataPtr->samples[g_JoyDataPtr->curlast].pads[contpadnum].stick_x; } -s8 contGetStickY(s8 contpadnum) +s8 joyGetStickY(s8 contpadnum) { - if (g_ContDataPtr->unk200 < 0 && (g_ConnectedControllers >> contpadnum & 1) == 0) { - g_ContBadReadsStickY[contpadnum]++; + if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { + g_JoyBadReadsStickY[contpadnum]++; return 0; } - if (g_ContDisableCooldown[contpadnum] > 0) { + if (g_JoyDisableCooldown[contpadnum] > 0) { return 0; } - return g_ContDataPtr->samples[g_ContDataPtr->curlast].pads[contpadnum].stick_y; + return g_JoyDataPtr->samples[g_JoyDataPtr->curlast].pads[contpadnum].stick_y; } -u16 contGetButtons(s8 contpadnum, u16 mask) +u16 joyGetButtons(s8 contpadnum, u16 mask) { - if (g_ContDataPtr->unk200 < 0 && (g_ConnectedControllers >> contpadnum & 1) == 0) { - g_ContBadReadsButtons[contpadnum]++; + if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { + g_JoyBadReadsButtons[contpadnum]++; return 0; } - if (g_ContDisableCooldown[contpadnum] > 0) { + if (g_JoyDisableCooldown[contpadnum] > 0) { return 0; } - return g_ContDataPtr->samples[g_ContDataPtr->curlast].pads[contpadnum].button & mask; + return g_JoyDataPtr->samples[g_JoyDataPtr->curlast].pads[contpadnum].button & mask; } -u16 contGetButtonsPressedThisFrame(s8 contpadnum, u16 mask) +u16 joyGetButtonsPressedThisFrame(s8 contpadnum, u16 mask) { - if (g_ContDataPtr->unk200 < 0 && (g_ConnectedControllers >> contpadnum & 1) == 0) { - g_ContBadReadsButtonsPressed[contpadnum]++; + if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { + g_JoyBadReadsButtonsPressed[contpadnum]++; return 0; } - if (g_ContDisableCooldown[contpadnum] > 0) { + if (g_JoyDisableCooldown[contpadnum] > 0) { return 0; } - return g_ContDataPtr->buttonspressed[contpadnum] & mask; + return g_JoyDataPtr->buttonspressed[contpadnum] & mask; } #if VERSION < VERSION_NTSC_1_0 @@ -1234,12 +1234,12 @@ glabel func00015fa4nb ); #endif -s32 func000150c4(void) +s32 joy000150c4(void) { return var8005eebc ? false : true; } -void func000150e8( +void joy000150e8( #if VERSION >= VERSION_NTSC_1_0 void #else @@ -1257,7 +1257,7 @@ void func000150e8( var8005eebc++; } -void func00015144( +void joy00015144( #if VERSION >= VERSION_NTSC_1_0 void #else @@ -1304,7 +1304,7 @@ glabel func00016154nb ); #endif -void func0001519c(void) +void joy0001519c(void) { s32 i; @@ -1321,7 +1321,7 @@ void func0001519c(void) } #if VERSION >= VERSION_NTSC_1_0 -void func000152d0(s8 playernum, s32 *arg1, s32 *arg2) +void joy000152d0(s8 playernum, s32 *arg1, s32 *arg2) { if (g_Vars.normmplayerisrunning) { *arg1 = g_Vars.playerstats[playernum].mpindex; @@ -1341,14 +1341,14 @@ void func000152d0(s8 playernum, s32 *arg1, s32 *arg2) #endif #if VERSION >= VERSION_NTSC_1_0 -void func000153c4(s8 arg0, s32 arg1) +void joy000153c4(s8 arg0, s32 arg1) { u32 stack; if (arg0 != 4) { if (var800a2380[arg0].unk000 != 2 && var800a2380[arg0].unk000 != 3) { if (arg1) { - func000150e8(); + joy000150e8(); } if (func0004f854(&var80099e78, arg0 == 4 ? NULL : &var800a3180[arg0], arg0) == 0) { @@ -1358,7 +1358,7 @@ void func000153c4(s8 arg0, s32 arg1) } if (arg1) { - func00015144(); + joy00015144(); } if (var800a2380[arg0].unk004 != 6 && var800a2380[arg0].unk004 != 7) { @@ -1375,7 +1375,7 @@ void func000153c4(s8 arg0, s32 arg1) } #else GLOBAL_ASM( -glabel func000153c4 +glabel joy000153c4 /* 162b0: 27bdffd8 */ addiu $sp,$sp,-40 /* 162b4: 00047600 */ sll $t6,$a0,0x18 /* 162b8: 000e7e03 */ sra $t7,$t6,0x18 @@ -1408,7 +1408,7 @@ glabel func000153c4 /* 16324: 2404041e */ addiu $a0,$zero,0x41e /* 16328: 3c057005 */ lui $a1,0x7005 /* 1632c: 24a55958 */ addiu $a1,$a1,0x5958 -/* 16330: 0c00581b */ jal func000150e8 +/* 16330: 0c00581b */ jal joy000150e8 /* 16334: afa60024 */ sw $a2,0x24($sp) /* 16338: 8fa60024 */ lw $a2,0x24($sp) .NB0001633c: @@ -1494,7 +1494,7 @@ glabel func000153c4 /* 16454: 3c057005 */ lui $a1,0x7005 /* 16458: 51000004 */ beqzl $t0,.NB0001646c /* 1645c: 8fa3001c */ lw $v1,0x1c($sp) -/* 16460: 0c005834 */ jal func00015144 +/* 16460: 0c005834 */ jal joy00015144 /* 16464: 24a55960 */ addiu $a1,$a1,0x5960 /* 16468: 8fa3001c */ lw $v1,0x1c($sp) .NB0001646c: @@ -1519,17 +1519,17 @@ glabel func000153c4 ); #endif -s32 func000155b4(s8 index) +s32 joy000155b4(s8 index) { return var800a2380[index].unk010; } -s32 func000155f4(s8 index) +s32 joy000155f4(s8 index) { - return func000155b4(index); + return joy000155b4(index); } -void func0001561c(void) +void joy0001561c(void) { s32 i; diff --git a/src/lib/lib_070d0.c b/src/lib/lib_070d0.c index 7119f0263..9346e3661 100644 --- a/src/lib/lib_070d0.c +++ b/src/lib/lib_070d0.c @@ -1,5 +1,5 @@ #include -#include "lib/entry.h" +#include "lib/boot.h" #include "constants.h" #include "bss.h" #include "lib/lib_074f0.h" diff --git a/src/lib/lib_0c000.c b/src/lib/lib_0c000.c index 6615b5f53..61669e2c8 100644 --- a/src/lib/lib_0c000.c +++ b/src/lib/lib_0c000.c @@ -1,7 +1,7 @@ #include #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" diff --git a/src/lib/lib_11420.c b/src/lib/lib_11420.c index 76bee4910..4724dd4d4 100644 --- a/src/lib/lib_11420.c +++ b/src/lib/lib_11420.c @@ -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) diff --git a/src/lib/lib_233c0.c b/src/lib/lib_233c0.c index e146d8ac6..62142aad4 100644 --- a/src/lib/lib_233c0.c +++ b/src/lib/lib_233c0.c @@ -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" diff --git a/src/lib/lib_24e40.c b/src/lib/lib_24e40.c index 1347a721d..a38445274 100644 --- a/src/lib/lib_24e40.c +++ b/src/lib/lib_24e40.c @@ -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" diff --git a/src/lib/lib_317f0.c b/src/lib/lib_317f0.c index 11794a1db..ec25b0cb1 100644 --- a/src/lib/lib_317f0.c +++ b/src/lib/lib_317f0.c @@ -1,7 +1,7 @@ #include #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) diff --git a/src/lib/lib_34030.c b/src/lib/lib_34030.c index a4f9e5e9d..d794b6336 100644 --- a/src/lib/lib_34030.c +++ b/src/lib/lib_34030.c @@ -1,7 +1,7 @@ #include #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" diff --git a/src/lib/lib_34240.c b/src/lib/lib_34240.c index e66c1280c..769639a9c 100644 --- a/src/lib/lib_34240.c +++ b/src/lib/lib_34240.c @@ -1,7 +1,7 @@ #include #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 diff --git a/src/lib/main.c b/src/lib/main.c index 6a4dceba5..d8789bdb3 100644 --- a/src/lib/main.c +++ b/src/lib/main.c @@ -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; diff --git a/src/lib/model.c b/src/lib/model.c index 8eae47b73..034b8e5ce 100644 --- a/src/lib/model.c +++ b/src/lib/model.c @@ -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" diff --git a/src/lib/reset.c b/src/lib/reset.c index b82b75c1f..b65361cbf 100644 --- a/src/lib/reset.c +++ b/src/lib/reset.c @@ -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 diff --git a/src/lib/sched.c b/src/lib/sched.c index 8953d5137..864201206 100644 --- a/src/lib/sched.c +++ b/src/lib/sched.c @@ -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); } diff --git a/src/lib/lib_0e9d0.c b/src/lib/snd.c similarity index 98% rename from src/lib/lib_0e9d0.c rename to src/lib/snd.c index 7e2b05352..7acb3792f 100644 --- a/src/lib/lib_0e9d0.c +++ b/src/lib/snd.c @@ -1,12 +1,12 @@ #include #include "constants.h" #include "game/file.h" -#include "game/core.h" +#include "game/lv.h" #include "game/music.h" #include "bss.h" #include "lib/lib_074f0.h" #include "lib/dma.h" -#include "lib/lib_0e9d0.h" +#include "lib/snd.h" #include "lib/memory.h" #include "lib/rng.h" #include "lib/lib_2faf0.h" @@ -681,7 +681,7 @@ u32 var8005edec = 0xffffffff; GLOBAL_ASM( -glabel func0000e9d0 +glabel snd0000e9d0 /* e9d0: 3c028009 */ lui $v0,%hi(var80094eb4) /* e9d4: 03e00008 */ jr $ra /* e9d8: 8c424eb4 */ lw $v0,%lo(var80094eb4)($v0) @@ -689,7 +689,7 @@ glabel func0000e9d0 #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel func0000e9dc +glabel snd0000e9dc /* e9dc: 27bdffe8 */ addiu $sp,$sp,-24 /* e9e0: afbf0014 */ sw $ra,0x14($sp) /* e9e4: 0c00cfb1 */ jal func00033ec4 @@ -710,7 +710,7 @@ glabel func0000e9dc ); #else GLOBAL_ASM( -glabel func0000e9dc +glabel snd0000e9dc /* f1bc: 27bdffe8 */ addiu $sp,$sp,-24 /* f1c0: afbf0014 */ sw $ra,0x14($sp) /* f1c4: 0c00d4af */ jal func00033ec4 @@ -724,7 +724,7 @@ glabel func0000e9dc #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel audioSetSfxVolume +glabel sndSetSfxVolume /* ea1c: 27bdffe0 */ addiu $sp,$sp,-32 /* ea20: afb10018 */ sw $s1,0x18($sp) /* ea24: 3091ffff */ andi $s1,$a0,0xffff @@ -755,7 +755,7 @@ glabel audioSetSfxVolume ); #else GLOBAL_ASM( -glabel audioSetSfxVolume +glabel sndSetSfxVolume /* f1dc: 27bdffe0 */ addiu $sp,$sp,-32 /* f1e0: afb10018 */ sw $s1,0x18($sp) /* f1e4: afb00014 */ sw $s0,0x14($sp) @@ -784,7 +784,7 @@ glabel audioSetSfxVolume #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel func0000ea80 +glabel snd0000ea80 /* ea80: 27bdffe0 */ addiu $sp,$sp,-32 /* ea84: afb10018 */ sw $s1,0x18($sp) /* ea88: 3091ffff */ andi $s1,$a0,0xffff @@ -813,7 +813,7 @@ glabel func0000ea80 ); #else GLOBAL_ASM( -glabel func0000ea80 +glabel snd0000ea80 /* f234: 27bdffe0 */ addiu $sp,$sp,-32 /* f238: afb10018 */ sw $s1,0x18($sp) /* f23c: afb00014 */ sw $s0,0x14($sp) @@ -839,7 +839,7 @@ glabel func0000ea80 #endif GLOBAL_ASM( -glabel func0000eadc +glabel snd0000eadc /* eadc: 3c028009 */ lui $v0,%hi(var80094eb0) /* eae0: 24424eb0 */ addiu $v0,$v0,%lo(var80094eb0) /* eae4: 944e0000 */ lhu $t6,0x0($v0) @@ -864,7 +864,7 @@ glabel func0000eadc #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel func0000eb2c +glabel snd0000eb2c /* eb2c: 27bdfe90 */ addiu $sp,$sp,-368 /* eb30: afb20028 */ sw $s2,0x28($sp) /* eb34: 03a09025 */ or $s2,$sp,$zero @@ -995,7 +995,7 @@ glabel func0000eb2c ); #else GLOBAL_ASM( -glabel func0000eb2c +glabel snd0000eb2c /* f2d4: 27bdfe90 */ addiu $sp,$sp,-368 /* f2d8: afb20028 */ sw $s2,0x28($sp) /* f2dc: 03a09025 */ or $s2,$sp,$zero @@ -1129,7 +1129,7 @@ glabel func0000eb2c #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel func0000ed14 +glabel snd0000ed14 /* ed14: 3c038009 */ lui $v1,%hi(var80095210) /* ed18: 3c068009 */ lui $a2,%hi(var80095210) /* ed1c: 24c65210 */ addiu $a2,$a2,%lo(var80095210) @@ -1159,7 +1159,7 @@ glabel func0000ed14 #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel func0000ed68 +glabel snd0000ed68 /* ed68: 27bdff10 */ addiu $sp,$sp,-240 /* ed6c: afb20020 */ sw $s2,0x20($sp) /* ed70: afb1001c */ sw $s1,0x1c($sp) @@ -1238,7 +1238,7 @@ glabel func0000ed68 ); #else GLOBAL_ASM( -glabel func0000ed68 +glabel snd0000ed68 /* f4c0: 27bdff90 */ addiu $sp,$sp,-112 /* f4c4: 3c0e007c */ lui $t6,0x7c /* f4c8: afa50074 */ sw $a1,0x74($sp) @@ -1279,7 +1279,7 @@ glabel func0000ed68 #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel func0000ee88 +glabel snd0000ee88 /* ee88: 27bdff10 */ addiu $sp,$sp,-240 /* ee8c: afb20020 */ sw $s2,0x20($sp) /* ee90: afb1001c */ sw $s1,0x1c($sp) @@ -1358,7 +1358,7 @@ glabel func0000ee88 ); #else GLOBAL_ASM( -glabel func0000ee88 +glabel snd0000ee88 /* f54c: 27bdff90 */ addiu $sp,$sp,-112 /* f550: 3c0e007c */ lui $t6,0x7c /* f554: afa50074 */ sw $a1,0x74($sp) @@ -1400,7 +1400,7 @@ glabel func0000ee88 #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel func0000efa8 +glabel snd0000efa8 /* efa8: 27bdfd10 */ addiu $sp,$sp,-752 /* efac: afb20020 */ sw $s2,0x20($sp) /* efb0: afb1001c */ sw $s1,0x1c($sp) @@ -1483,7 +1483,7 @@ glabel func0000efa8 ); #else GLOBAL_ASM( -glabel func0000efa8 +glabel snd0000efa8 /* f5dc: 27bdfe90 */ addiu $sp,$sp,-368 /* f5e0: 3c0e007c */ lui $t6,0x7c /* f5e4: afa50174 */ sw $a1,0x174($sp) @@ -1527,7 +1527,7 @@ glabel func0000efa8 #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel func0000f0d4 +glabel snd0000f0d4 /* f0d4: 27bdff10 */ addiu $sp,$sp,-240 /* f0d8: afb40028 */ sw $s4,0x28($sp) /* f0dc: 0080a025 */ or $s4,$a0,$zero @@ -1622,7 +1622,7 @@ glabel func0000f0d4 ); #else GLOBAL_ASM( -glabel func0000f0d4 +glabel snd0000f0d4 /* f670: 27bdff90 */ addiu $sp,$sp,-112 /* f674: afbf0014 */ sw $ra,0x14($sp) /* f678: afa50074 */ sw $a1,0x74($sp) @@ -1678,7 +1678,7 @@ glabel func0000f0d4 #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel func0000f228 +glabel snd0000f228 /* f228: 27bdff08 */ addiu $sp,$sp,-248 /* f22c: afb20020 */ sw $s2,0x20($sp) /* f230: afb1001c */ sw $s1,0x1c($sp) @@ -1755,11 +1755,11 @@ glabel func0000f228 /* f340: 15600009 */ bnez $t3,.L0000f368 /* f344: ac4a046c */ sw $t2,0x46c($v0) /* f348: 8e040010 */ lw $a0,0x10($s0) -/* f34c: 0c003bea */ jal func0000efa8 +/* f34c: 0c003bea */ jal snd0000efa8 /* f350: 97a500fe */ lhu $a1,0xfe($sp) /* f354: ae020010 */ sw $v0,0x10($s0) /* f358: 8e04000c */ lw $a0,0xc($s0) -/* f35c: 0c003c35 */ jal func0000f0d4 +/* f35c: 0c003c35 */ jal snd0000f0d4 /* f360: 97a500fe */ lhu $a1,0xfe($sp) /* f364: ae02000c */ sw $v0,0xc($s0) .L0000f368: @@ -1775,7 +1775,7 @@ glabel func0000f228 ); #else GLOBAL_ASM( -glabel func0000f228 +glabel snd0000f228 /* f72c: 27bdff88 */ addiu $sp,$sp,-120 /* f730: 3c0e007c */ lui $t6,0x7c /* f734: afa5007c */ sw $a1,0x7c($sp) @@ -1817,12 +1817,12 @@ glabel func0000f228 /* f7c4: 15e0000b */ bnez $t7,.NB0000f7f4 /* f7c8: ac4e046c */ sw $t6,0x46c($v0) /* f7cc: 8c640010 */ lw $a0,0x10($v1) -/* f7d0: 0c003d77 */ jal func0000efa8 +/* f7d0: 0c003d77 */ jal snd0000efa8 /* f7d4: afa30018 */ sw $v1,0x18($sp) /* f7d8: 8fa30018 */ lw $v1,0x18($sp) /* f7dc: 97a5007e */ lhu $a1,0x7e($sp) /* f7e0: ac620010 */ sw $v0,0x10($v1) -/* f7e4: 0c003d9c */ jal func0000f0d4 +/* f7e4: 0c003d9c */ jal snd0000f0d4 /* f7e8: 8c64000c */ lw $a0,0xc($v1) /* f7ec: 8fa30018 */ lw $v1,0x18($sp) /* f7f0: ac62000c */ sw $v0,0xc($v1) @@ -1835,7 +1835,7 @@ glabel func0000f228 ); #endif -void audioSetSoundMode(s32 mode) +void sndSetSoundMode(s32 mode) { s32 i; @@ -1871,7 +1871,7 @@ void audioSetSoundMode(s32 mode) #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel func0000f49c +glabel snd0000f49c /* f49c: 27bdff50 */ addiu $sp,$sp,-176 /* f4a0: afb00014 */ sw $s0,0x14($sp) /* f4a4: 00048400 */ sll $s0,$a0,0x10 @@ -1882,7 +1882,7 @@ glabel func0000f49c /* f4b8: 00047c03 */ sra $t7,$a0,0x10 /* f4bc: 01c08025 */ or $s0,$t6,$zero /* f4c0: afb10018 */ sw $s1,0x18($sp) -/* f4c4: 0c003ee8 */ jal func0000fba0 +/* f4c4: 0c003ee8 */ jal snd0000fba0 /* f4c8: 01e02025 */ or $a0,$t7,$zero /* f4cc: 10400003 */ beqz $v0,.L0000f4dc /* f4d0: 3c088009 */ lui $t0,%hi(var80095210) @@ -1958,15 +1958,15 @@ glabel func0000f49c /* f5d0: 0c003513 */ jal dmaExecHighPriority /* f5d4: 30f1ffff */ andi $s1,$a3,0xffff /* f5d8: 8e040000 */ lw $a0,0x0($s0) -/* f5dc: 0c003b5a */ jal func0000ed68 +/* f5dc: 0c003b5a */ jal snd0000ed68 /* f5e0: 3225ffff */ andi $a1,$s1,0xffff /* f5e4: ae020000 */ sw $v0,0x0($s0) /* f5e8: 8e040008 */ lw $a0,0x8($s0) -/* f5ec: 0c003c8a */ jal func0000f228 +/* f5ec: 0c003c8a */ jal snd0000f228 /* f5f0: 3225ffff */ andi $a1,$s1,0xffff /* f5f4: ae020008 */ sw $v0,0x8($s0) /* f5f8: 8e040004 */ lw $a0,0x4($s0) -/* f5fc: 0c003ba2 */ jal func0000ee88 +/* f5fc: 0c003ba2 */ jal snd0000ee88 /* f600: 3225ffff */ andi $a1,$s1,0xffff /* f604: 8e010000 */ lw $at,0x0($s0) /* f608: 3c088009 */ lui $t0,%hi(var80095210) @@ -2003,7 +2003,7 @@ glabel func0000f49c ); #else GLOBAL_ASM( -glabel func0000f49c +glabel snd0000f49c /* f918: 27bdff50 */ addiu $sp,$sp,-176 /* f91c: afb00014 */ sw $s0,0x14($sp) /* f920: 00048400 */ sll $s0,$a0,0x10 @@ -2014,7 +2014,7 @@ glabel func0000f49c /* f934: 00047c03 */ sra $t7,$a0,0x10 /* f938: 01c08025 */ or $s0,$t6,$zero /* f93c: afb10018 */ sw $s1,0x18($sp) -/* f940: 0c00400e */ jal func0000fba0 +/* f940: 0c00400e */ jal snd0000fba0 /* f944: 01e02025 */ or $a0,$t7,$zero /* f948: 10400003 */ beqz $v0,.NB0000f958 /* f94c: 3c08800a */ lui $t0,0x800a @@ -2095,15 +2095,15 @@ glabel func0000f49c /* fa60: 0c00366e */ jal dmaExecHighPriority /* fa64: 30f1ffff */ andi $s1,$a3,0xffff /* fa68: 8e040000 */ lw $a0,0x0($s0) -/* fa6c: 0c003d30 */ jal func0000ed68 +/* fa6c: 0c003d30 */ jal snd0000ed68 /* fa70: 3225ffff */ andi $a1,$s1,0xffff /* fa74: ae020000 */ sw $v0,0x0($s0) /* fa78: 8e040008 */ lw $a0,0x8($s0) -/* fa7c: 0c003dcb */ jal func0000f228 +/* fa7c: 0c003dcb */ jal snd0000f228 /* fa80: 3225ffff */ andi $a1,$s1,0xffff /* fa84: ae020008 */ sw $v0,0x8($s0) /* fa88: 8e040004 */ lw $a0,0x4($s0) -/* fa8c: 0c003d53 */ jal func0000ee88 +/* fa8c: 0c003d53 */ jal snd0000ee88 /* fa90: 3225ffff */ andi $a1,$s1,0xffff /* fa94: 8e010000 */ lw $at,0x0($s0) /* fa98: 3c08800a */ lui $t0,0x800a @@ -2143,7 +2143,7 @@ glabel func0000f49c #endif GLOBAL_ASM( -glabel func0000f67c +glabel snd0000f67c /* f67c: 27bdffc0 */ addiu $sp,$sp,-64 /* f680: 3c198009 */ lui $t9,%hi(var800951f0) /* f684: afbf001c */ sw $ra,0x1c($sp) @@ -2258,7 +2258,7 @@ glabel func0000f7b8 #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel func0000f804 +glabel snd0000f804 /* f564: 3c0e8009 */ lui $t6,0x8009 /* f568: 91ce1040 */ lbu $t6,0x1040($t6) /* f56c: 27bdff60 */ addiu $sp,$sp,-160 @@ -2335,7 +2335,7 @@ glabel func0000f804 /* f678: 24a537c0 */ addiu $a1,$a1,0x37c0 /* f67c: 0c004bb0 */ jal strcpy /* f680: 00402025 */ move $a0,$v0 -/* f684: 0c003a23 */ jal func0000eb2c +/* f684: 0c003a23 */ jal snd0000eb2c /* f688: 00000000 */ nop /* f68c: 3c0900cf */ lui $t1,0xcf /* f690: 3c0a00cf */ lui $t2,0xcf @@ -2482,7 +2482,7 @@ glabel func0000f804 /* f8b0: 3c108009 */ lui $s0,0x8009 /* f8b4: 26105428 */ addiu $s0,$s0,0x5428 .PF0000f8b8: -/* f8b8: 0c003cf7 */ jal func0000f67c +/* f8b8: 0c003cf7 */ jal snd0000f67c /* f8bc: 02002025 */ move $a0,$s0 /* f8c0: 3c0e8009 */ lui $t6,0x8009 /* f8c4: 25ce5740 */ addiu $t6,$t6,0x5740 @@ -2500,7 +2500,7 @@ glabel func0000f804 /* f8f4: 0c002405 */ jal amgrStartThread /* f8f8: 00000000 */ nop /* f8fc: 3c048006 */ lui $a0,0x8006 -/* f900: 0c003c3b */ jal audioSetSoundMode +/* f900: 0c003c3b */ jal sndSetSoundMode /* f904: 8c84da6c */ lw $a0,-0x2594($a0) /* f908: 8fbf0024 */ lw $ra,0x24($sp) .PF0000f90c: @@ -2511,7 +2511,7 @@ glabel func0000f804 ); #else GLOBAL_ASM( -glabel func0000f804 +glabel snd0000f804 /* f804: 3c0e8009 */ lui $t6,%hi(g_Is4Mb) /* f808: 91ce0af0 */ lbu $t6,%lo(g_Is4Mb)($t6) /* f80c: 27bdff70 */ addiu $sp,$sp,-144 @@ -2588,7 +2588,7 @@ glabel func0000f804 /* f918: 24a53b20 */ addiu $a1,$a1,%lo(var70053b20) /* f91c: 0c004c4c */ jal strcpy /* f920: 00402025 */ or $a0,$v0,$zero -/* f924: 0c003acb */ jal func0000eb2c +/* f924: 0c003acb */ jal snd0000eb2c /* f928: 00000000 */ nop /* f92c: 3c0900d0 */ lui $t1,0xd0 /* f930: 3c0a00d0 */ lui $t2,0xd0 @@ -2728,7 +2728,7 @@ glabel func0000f804 /* fb34: 3c108009 */ lui $s0,%hi(var80094ed8) /* fb38: 26104ed8 */ addiu $s0,$s0,%lo(var80094ed8) .L0000fb3c: -/* fb3c: 0c003d9f */ jal func0000f67c +/* fb3c: 0c003d9f */ jal snd0000f67c /* fb40: 02002025 */ or $a0,$s0,$zero /* fb44: 3c0b8009 */ lui $t3,%hi(var800951f0) /* fb48: 256b51f0 */ addiu $t3,$t3,%lo(var800951f0) @@ -2746,7 +2746,7 @@ glabel func0000f804 /* fb78: 0c00243b */ jal amgrStartThread /* fb7c: 00000000 */ nop /* fb80: 3c048006 */ lui $a0,%hi(g_SoundMode) -/* fb84: 0c003ce3 */ jal audioSetSoundMode +/* fb84: 0c003ce3 */ jal sndSetSoundMode /* fb88: 8c84ddcc */ lw $a0,%lo(g_SoundMode)($a0) /* fb8c: 8fbf0024 */ lw $ra,0x24($sp) .L0000fb90: @@ -2758,7 +2758,7 @@ glabel func0000f804 #endif GLOBAL_ASM( -glabel func0000fba0 +glabel snd0000fba0 /* fba0: 27bdfff8 */ addiu $sp,$sp,-8 /* fba4: a7a40004 */ sh $a0,0x4($sp) /* fba8: 8fa20004 */ lw $v0,0x4($sp) @@ -2771,7 +2771,7 @@ glabel func0000fba0 ); GLOBAL_ASM( -glabel func0000fbc4 +glabel snd0000fbc4 /* fbc4: 3c0e8006 */ lui $t6,%hi(g_Silent) /* fbc8: 8dcedda0 */ lw $t6,%lo(g_Silent)($t6) /* fbcc: 27bdffe8 */ addiu $sp,$sp,-24 @@ -2812,7 +2812,7 @@ glabel func0000fbc4 #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel func0000fc48 +glabel snd0000fc48 /* fc48: 27bdebb8 */ addiu $sp,$sp,-5192 /* fc4c: afb00018 */ sw $s0,0x18($sp) /* fc50: 00808025 */ or $s0,$a0,$zero @@ -2879,10 +2879,10 @@ glabel func0000fc48 /* fd34: 8e0400f8 */ lw $a0,0xf8($s0) /* fd38: 0c00e6f8 */ jal func00039be0 /* fd3c: 02002825 */ or $a1,$s0,$zero -/* fd40: 0c003f5d */ jal func0000fd74 +/* fd40: 0c003f5d */ jal snd0000fd74 /* fd44: 02002025 */ or $a0,$s0,$zero /* fd48: 02002025 */ or $a0,$s0,$zero -/* fd4c: 0c003f67 */ jal func0000fd9c +/* fd4c: 0c003f67 */ jal snd0000fd9c /* fd50: 3045ffff */ andi $a1,$v0,0xffff /* fd54: 0c00e70c */ jal func00039c30 /* fd58: 8e0400f8 */ lw $a0,0xf8($s0) @@ -2896,7 +2896,7 @@ glabel func0000fc48 ); #else GLOBAL_ASM( -glabel func0000fc48 +glabel snd0000fc48 /* 100e0: 27bdeaf8 */ addiu $sp,$sp,-5384 /* 100e4: afb00058 */ sw $s0,0x58($sp) /* 100e8: 00808025 */ or $s0,$a0,$zero @@ -3010,10 +3010,10 @@ glabel func0000fc48 /* 10284: 8e0400f8 */ lw $a0,0xf8($s0) /* 10288: 0c00ebec */ jal func00039be0 /* 1028c: 02002825 */ or $a1,$s0,$zero -/* 10290: 0c0040b1 */ jal func0000fd74 +/* 10290: 0c0040b1 */ jal snd0000fd74 /* 10294: 02002025 */ or $a0,$s0,$zero /* 10298: 02002025 */ or $a0,$s0,$zero -/* 1029c: 0c0040bb */ jal func0000fd9c +/* 1029c: 0c0040bb */ jal snd0000fd9c /* 102a0: 3045ffff */ andi $a1,$v0,0xffff /* 102a4: 0c00ec00 */ jal func00039c30 /* 102a8: 8e0400f8 */ lw $a0,0xf8($s0) @@ -3028,7 +3028,7 @@ glabel func0000fc48 #endif GLOBAL_ASM( -glabel func0000fd74 +glabel snd0000fd74 /* fd74: 3c0e8006 */ lui $t6,%hi(g_Silent) /* fd78: 8dcedda0 */ lw $t6,%lo(g_Silent)($t6) /* fd7c: 24037fff */ addiu $v1,$zero,0x7fff @@ -3043,7 +3043,7 @@ glabel func0000fd74 ); GLOBAL_ASM( -glabel func0000fd9c +glabel snd0000fd9c /* fd9c: 3c0f8006 */ lui $t7,%hi(g_Silent) /* fda0: 8defdda0 */ lw $t7,%lo(g_Silent)($t7) /* fda4: 27bdffe8 */ addiu $sp,$sp,-24 @@ -3079,13 +3079,13 @@ glabel func0000fd9c /* fe14: 00000000 */ nop ); -void func0000fe18(void) +void snd0000fe18(void) { // empty } GLOBAL_ASM( -glabel func0000fe20 +glabel snd0000fe20 /* fe20: 3c0e8006 */ lui $t6,%hi(var8005ddd0) /* fe24: 8dceddd0 */ lw $t6,%lo(var8005ddd0)($t6) /* fe28: 27bdffe8 */ addiu $sp,$sp,-24 @@ -3102,7 +3102,7 @@ glabel func0000fe20 ); GLOBAL_ASM( -glabel func0000fe50 +glabel snd0000fe50 /* fe50: 3c0e8006 */ lui $t6,%hi(var8005ddd0) /* fe54: 8dceddd0 */ lw $t6,%lo(var8005ddd0)($t6) /* fe58: 27bdffe8 */ addiu $sp,$sp,-24 @@ -3122,10 +3122,10 @@ glabel func0000fe50 #if PAL GLOBAL_ASM( -glabel func0000fe88 +glabel snd0000fe88 /* fe88: 27bdeb98 */ addiu $sp,$sp,-5224 /* fe8c: afbf002c */ sw $ra,0x2c($sp) -/* fe90: 0c003b45 */ jal func0000ed14 +/* fe90: 0c003b45 */ jal snd0000ed14 /* fe94: afb00028 */ sw $s0,0x28($sp) /* fe98: 0c012230 */ jal osGetThreadPri /* fe9c: 00002025 */ or $a0,$zero,$zero @@ -3229,7 +3229,7 @@ glabel func0000fe88 /* 10004: 24010031 */ addiu $at,$zero,0x31 /* 10008: 54410006 */ bnel $v0,$at,.L00010024 /* 1000c: 24010019 */ addiu $at,$zero,0x19 -/* 10010: 0c004384 */ jal func00010e10 +/* 10010: 0c004384 */ jal snd00010e10 /* 10014: 00000000 */ nop /* 10018: 10000006 */ b .L00010034 /* 1001c: 00000000 */ nop @@ -3237,7 +3237,7 @@ glabel func0000fe88 .L00010024: /* 10024: 14410003 */ bne $v0,$at,.L00010034 /* 10028: 00000000 */ nop -/* 1002c: 0c004447 */ jal func0001111c +/* 1002c: 0c004447 */ jal snd0001111c /* 10030: 00000000 */ nop .L00010034: /* 10034: 3c0a800a */ lui $t2,%hi(g_Vars+0x2ac) @@ -3257,22 +3257,22 @@ glabel func0000fe88 /* 1006c: 10000001 */ b .L00010074 /* 10070: 00408025 */ or $s0,$v0,$zero .L00010074: -/* 10074: 0c003a77 */ jal func0000e9dc +/* 10074: 0c003a77 */ jal snd0000e9dc /* 10078: 00000000 */ nop /* 1007c: 1202000d */ beq $s0,$v0,.L000100b4 /* 10080: 00000000 */ nop -/* 10084: 0c003aa0 */ jal func0000ea80 +/* 10084: 0c003aa0 */ jal snd0000ea80 /* 10088: 3204ffff */ andi $a0,$s0,0xffff /* 1008c: 10000009 */ b .L000100b4 /* 10090: 00000000 */ nop .L00010094: -/* 10094: 0c003a77 */ jal func0000e9dc +/* 10094: 0c003a77 */ jal snd0000e9dc /* 10098: 00000000 */ nop /* 1009c: 3c048006 */ lui $a0,%hi(g_SfxVolume) /* 100a0: 9484ddc8 */ lhu $a0,%lo(g_SfxVolume)($a0) /* 100a4: 10820003 */ beq $a0,$v0,.L000100b4 /* 100a8: 00000000 */ nop -/* 100ac: 0c003aa0 */ jal func0000ea80 +/* 100ac: 0c003aa0 */ jal snd0000ea80 /* 100b0: 00000000 */ nop .L000100b4: /* 100b4: 3c048006 */ lui $a0,%hi(var8005dde0) @@ -3458,7 +3458,7 @@ glabel func0000fe88 /* 10324: 87a50050 */ lh $a1,0x50($sp) /* 10328: 00003025 */ or $a2,$zero,$zero /* 1032c: 2407ffff */ addiu $a3,$zero,-1 -/* 10330: 0c004241 */ jal audioStart +/* 10330: 0c004241 */ jal sndStart /* 10334: e7a40014 */ swc1 $f4,0x14($sp) .L00010338: /* 10338: 8fbf002c */ lw $ra,0x2c($sp) @@ -3470,10 +3470,10 @@ glabel func0000fe88 ); #elif VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel func0000fe88 +glabel snd0000fe88 /* fe88: 27bdeb98 */ addiu $sp,$sp,-5224 /* fe8c: afbf002c */ sw $ra,0x2c($sp) -/* fe90: 0c003b45 */ jal func0000ed14 +/* fe90: 0c003b45 */ jal snd0000ed14 /* fe94: afb00028 */ sw $s0,0x28($sp) /* fe98: 0c012230 */ jal osGetThreadPri /* fe9c: 00002025 */ or $a0,$zero,$zero @@ -3577,7 +3577,7 @@ glabel func0000fe88 /* 10004: 24010031 */ addiu $at,$zero,0x31 /* 10008: 54410006 */ bnel $v0,$at,.L00010024 /* 1000c: 24010019 */ addiu $at,$zero,0x19 -/* 10010: 0c004384 */ jal func00010e10 +/* 10010: 0c004384 */ jal snd00010e10 /* 10014: 00000000 */ nop /* 10018: 10000006 */ b .L00010034 /* 1001c: 00000000 */ nop @@ -3585,7 +3585,7 @@ glabel func0000fe88 .L00010024: /* 10024: 14410003 */ bne $v0,$at,.L00010034 /* 10028: 00000000 */ nop -/* 1002c: 0c004447 */ jal func0001111c +/* 1002c: 0c004447 */ jal snd0001111c /* 10030: 00000000 */ nop .L00010034: /* 10034: 3c0a800a */ lui $t2,%hi(g_Vars+0x2ac) @@ -3605,22 +3605,22 @@ glabel func0000fe88 /* 1006c: 10000001 */ b .L00010074 /* 10070: 00408025 */ or $s0,$v0,$zero .L00010074: -/* 10074: 0c003a77 */ jal func0000e9dc +/* 10074: 0c003a77 */ jal snd0000e9dc /* 10078: 00000000 */ nop /* 1007c: 1202000d */ beq $s0,$v0,.L000100b4 /* 10080: 00000000 */ nop -/* 10084: 0c003aa0 */ jal func0000ea80 +/* 10084: 0c003aa0 */ jal snd0000ea80 /* 10088: 3204ffff */ andi $a0,$s0,0xffff /* 1008c: 10000009 */ b .L000100b4 /* 10090: 00000000 */ nop .L00010094: -/* 10094: 0c003a77 */ jal func0000e9dc +/* 10094: 0c003a77 */ jal snd0000e9dc /* 10098: 00000000 */ nop /* 1009c: 3c048006 */ lui $a0,%hi(g_SfxVolume) /* 100a0: 9484ddc8 */ lhu $a0,%lo(g_SfxVolume)($a0) /* 100a4: 10820003 */ beq $a0,$v0,.L000100b4 /* 100a8: 00000000 */ nop -/* 100ac: 0c003aa0 */ jal func0000ea80 +/* 100ac: 0c003aa0 */ jal snd0000ea80 /* 100b0: 00000000 */ nop .L000100b4: /* 100b4: 3c048006 */ lui $a0,%hi(var8005dde0) @@ -3806,7 +3806,7 @@ glabel func0000fe88 /* 10324: 87a50050 */ lh $a1,0x50($sp) /* 10328: 00003025 */ or $a2,$zero,$zero /* 1032c: 2407ffff */ addiu $a3,$zero,-1 -/* 10330: 0c004241 */ jal audioStart +/* 10330: 0c004241 */ jal sndStart /* 10334: e7a40014 */ swc1 $f4,0x14($sp) .L00010338: /* 10338: 8fbf002c */ lw $ra,0x2c($sp) @@ -3818,7 +3818,7 @@ glabel func0000fe88 ); #else GLOBAL_ASM( -glabel func0000fe88 +glabel snd0000fe88 /* 103d8: 3c0e8006 */ lui $t6,0x8006 /* 103dc: 8dcef6c0 */ lw $t6,-0x940($t6) /* 103e0: 27bdffc0 */ addiu $sp,$sp,-64 @@ -3834,7 +3834,7 @@ glabel func0000fe88 /* 10408: 24010031 */ addiu $at,$zero,0x31 /* 1040c: 54410006 */ bnel $v0,$at,.NB00010428 /* 10410: 24010019 */ addiu $at,$zero,0x19 -/* 10414: 0c004474 */ jal func00010e10 +/* 10414: 0c004474 */ jal snd00010e10 /* 10418: 00000000 */ sll $zero,$zero,0x0 /* 1041c: 10000006 */ beqz $zero,.NB00010438 /* 10420: 00000000 */ sll $zero,$zero,0x0 @@ -3842,7 +3842,7 @@ glabel func0000fe88 .NB00010428: /* 10428: 14410003 */ bne $v0,$at,.NB00010438 /* 1042c: 00000000 */ sll $zero,$zero,0x0 -/* 10430: 0c004537 */ jal func0001111c +/* 10430: 0c004537 */ jal snd0001111c /* 10434: 00000000 */ sll $zero,$zero,0x0 .NB00010438: /* 10438: 3c18800a */ lui $t8,0x800a @@ -3862,22 +3862,22 @@ glabel func0000fe88 /* 10470: 10000001 */ beqz $zero,.NB00010478 /* 10474: 00408025 */ or $s0,$v0,$zero .NB00010478: -/* 10478: 0c003c6f */ jal func0000e9dc +/* 10478: 0c003c6f */ jal snd0000e9dc /* 1047c: 00000000 */ sll $zero,$zero,0x0 /* 10480: 1202000d */ beq $s0,$v0,.NB000104b8 /* 10484: 00000000 */ sll $zero,$zero,0x0 -/* 10488: 0c003c8d */ jal func0000ea80 +/* 10488: 0c003c8d */ jal snd0000ea80 /* 1048c: 3204ffff */ andi $a0,$s0,0xffff /* 10490: 10000009 */ beqz $zero,.NB000104b8 /* 10494: 00000000 */ sll $zero,$zero,0x0 .NB00010498: -/* 10498: 0c003c6f */ jal func0000e9dc +/* 10498: 0c003c6f */ jal snd0000e9dc /* 1049c: 00000000 */ sll $zero,$zero,0x0 /* 104a0: 3c048006 */ lui $a0,0x8006 /* 104a4: 9484f6e8 */ lhu $a0,-0x918($a0) /* 104a8: 10820003 */ beq $a0,$v0,.NB000104b8 /* 104ac: 00000000 */ sll $zero,$zero,0x0 -/* 104b0: 0c003c8d */ jal func0000ea80 +/* 104b0: 0c003c8d */ jal snd0000ea80 /* 104b4: 00000000 */ sll $zero,$zero,0x0 .NB000104b8: /* 104b8: 3c048006 */ lui $a0,0x8006 @@ -4069,7 +4069,7 @@ glabel func0000fe88 /* 10740: 87a50034 */ lh $a1,0x34($sp) /* 10744: 00003025 */ or $a2,$zero,$zero /* 10748: 2407ffff */ addiu $a3,$zero,-1 -/* 1074c: 0c004338 */ jal audioStart +/* 1074c: 0c004338 */ jal sndStart /* 10750: e7a40014 */ swc1 $f4,0x14($sp) .NB00010754: /* 10754: 8fbf002c */ lw $ra,0x2c($sp) @@ -4091,14 +4091,14 @@ glabel func0001034c ); GLOBAL_ASM( -glabel func00010360 +glabel snd00010360 /* 10360: 3c028006 */ lui $v0,%hi(g_Silent) /* 10364: 03e00008 */ jr $ra /* 10368: 8c42dda0 */ lw $v0,%lo(g_Silent)($v0) ); GLOBAL_ASM( -glabel func0001036c +glabel snd0001036c /* 1036c: 3c0e8006 */ lui $t6,%hi(g_Silent) /* 10370: 8dcedda0 */ lw $t6,%lo(g_Silent)($t6) /* 10374: 27bdffd0 */ addiu $sp,$sp,-48 @@ -4133,7 +4133,7 @@ glabel func0001036c /* 103e8: afa9001c */ sw $t1,0x1c($sp) /* 103ec: 00003025 */ or $a2,$zero,$zero /* 103f0: 2407ffff */ addiu $a3,$zero,-1 -/* 103f4: 0c004241 */ jal audioStart +/* 103f4: 0c004241 */ jal sndStart /* 103f8: e7a40014 */ swc1 $f4,0x14($sp) .L000103fc: /* 103fc: 8fbf0024 */ lw $ra,0x24($sp) @@ -4144,7 +4144,7 @@ glabel func0001036c #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel audioIsFiltered +glabel sndIsFiltered /* 1040c: 3c0e800a */ lui $t6,%hi(g_Vars+0x4e3) /* 10410: 91cea4a3 */ lbu $t6,%lo(g_Vars+0x4e3)($t6) /* 10414: 27bdfff8 */ addiu $sp,$sp,-8 @@ -4188,7 +4188,7 @@ glabel audioIsFiltered ); #else GLOBAL_ASM( -glabel audioIsFiltered +glabel sndIsFiltered /* 10828: 3c0e800a */ lui $t6,0x800a /* 1082c: 91ceeba3 */ lbu $t6,-0x145d($t6) /* 10830: 27bdfff8 */ addiu $sp,$sp,-8 @@ -4221,7 +4221,7 @@ glabel audioIsFiltered // Mismatch because goal is doing something funky with the audio_id. // It stores a halfword on the stack, then reads it back as a full word. -//bool audioIsFiltered(s32 audio_id) +//bool sndIsFiltered(s32 audio_id) //{ // // 418 // if (g_Vars.langfilteron) { @@ -4251,7 +4251,7 @@ glabel audioIsFiltered #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel audioAdjust +glabel sndAdjust /* 104a0: 27bdffd8 */ addiu $sp,$sp,-40 /* 104a4: 8faf0048 */ lw $t7,0x48($sp) /* 104a8: 240effff */ addiu $t6,$zero,-1 @@ -4353,7 +4353,7 @@ glabel audioAdjust /* 10604: 10c80013 */ beq $a2,$t0,.L00010654 /* 10608: 00000000 */ nop /* 1060c: afa60030 */ sw $a2,0x30($sp) -/* 10610: 0c003a77 */ jal func0000e9dc +/* 10610: 0c003a77 */ jal snd0000e9dc /* 10614: afa70034 */ sw $a3,0x34($sp) /* 10618: 8fa60030 */ lw $a2,0x30($sp) /* 1061c: 24017fff */ addiu $at,$zero,0x7fff @@ -4430,7 +4430,7 @@ glabel audioAdjust ); #else GLOBAL_ASM( -glabel audioAdjust +glabel sndAdjust /* 10890: 27bdffd8 */ addiu $sp,$sp,-40 /* 10894: 8faf0048 */ lw $t7,0x48($sp) /* 10898: 240effff */ addiu $t6,$zero,-1 @@ -4530,7 +4530,7 @@ glabel audioAdjust /* 109e8: 10c90013 */ beq $a2,$t1,.NB00010a38 /* 109ec: 00000000 */ sll $zero,$zero,0x0 /* 109f0: afa60030 */ sw $a2,0x30($sp) -/* 109f4: 0c003c6f */ jal func0000e9dc +/* 109f4: 0c003c6f */ jal snd0000e9dc /* 109f8: afa70034 */ sw $a3,0x34($sp) /* 109fc: 8fa60030 */ lw $a2,0x30($sp) /* 10a00: 24017fff */ addiu $at,$zero,0x7fff @@ -4609,7 +4609,7 @@ glabel audioAdjust #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel func00010718 +glabel snd00010718 /* 10718: 27bdffc0 */ addiu $sp,$sp,-64 /* 1071c: afbf0024 */ sw $ra,0x24($sp) /* 10720: afa40040 */ sw $a0,0x40($sp) @@ -4730,7 +4730,7 @@ glabel func00010718 /* 108cc: afa8001c */ sw $t0,0x1c($sp) /* 108d0: afad0010 */ sw $t5,0x10($sp) /* 108d4: e7a40014 */ swc1 $f4,0x14($sp) -/* 108d8: 0c004241 */ jal audioStart +/* 108d8: 0c004241 */ jal sndStart /* 108dc: afb80018 */ sw $t8,0x18($sp) /* 108e0: afa20034 */ sw $v0,0x34($sp) /* 108e4: 00002025 */ or $a0,$zero,$zero @@ -4744,7 +4744,7 @@ glabel func00010718 ); #else GLOBAL_ASM( -glabel func00010718 +glabel snd00010718 /* 10afc: 27bdffc0 */ addiu $sp,$sp,-64 /* 10b00: afbf0024 */ sw $ra,0x24($sp) /* 10b04: afa40040 */ sw $a0,0x40($sp) @@ -4863,7 +4863,7 @@ glabel func00010718 /* 10ca8: afa8001c */ sw $t0,0x1c($sp) /* 10cac: afad0010 */ sw $t5,0x10($sp) /* 10cb0: e7a40014 */ swc1 $f4,0x14($sp) -/* 10cb4: 0c004338 */ jal audioStart +/* 10cb4: 0c004338 */ jal sndStart /* 10cb8: afaf0018 */ sw $t7,0x18($sp) /* 10cbc: afa20034 */ sw $v0,0x34($sp) /* 10cc0: 00002025 */ or $a0,$zero,$zero @@ -4879,7 +4879,7 @@ glabel func00010718 #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel audioStart +glabel sndStart /* 10904: 27bdffb8 */ addiu $sp,$sp,-72 /* 10908: 8fae0064 */ lw $t6,0x64($sp) /* 1090c: 2402ffff */ addiu $v0,$zero,-1 @@ -4960,7 +4960,7 @@ glabel audioStart /* 10a0c: a3a5003e */ sb $a1,0x3e($sp) /* 10a10: a3a8003d */ sb $t0,0x3d($sp) /* 10a14: a3a9003f */ sb $t1,0x3f($sp) -/* 10a18: 0c003ee8 */ jal func0000fba0 +/* 10a18: 0c003ee8 */ jal snd0000fba0 /* 10a1c: e7a00034 */ swc1 $f0,0x34($sp) /* 10a20: 8fa3002c */ lw $v1,0x2c($sp) /* 10a24: 87a40040 */ lh $a0,0x40($sp) @@ -4972,7 +4972,7 @@ glabel audioStart /* 10a3c: c7a00034 */ lwc1 $f0,0x34($sp) /* 10a40: 97a5003a */ lhu $a1,0x3a($sp) /* 10a44: 01003025 */ or $a2,$t0,$zero -/* 10a48: 0c0042b9 */ jal func00010ae4 +/* 10a48: 0c0042b9 */ jal snd00010ae4 /* 10a4c: 00003825 */ or $a3,$zero,$zero /* 10a50: 8faa0050 */ lw $t2,0x50($sp) /* 10a54: 11400002 */ beqz $t2,.L00010a60 @@ -5020,7 +5020,7 @@ glabel audioStart ); #else GLOBAL_ASM( -glabel audioStart +glabel sndStart /* 10ce0: 27bdffb8 */ addiu $sp,$sp,-72 /* 10ce4: 8fae0064 */ lw $t6,0x64($sp) /* 10ce8: 2402ffff */ addiu $v0,$zero,-1 @@ -5101,7 +5101,7 @@ glabel audioStart /* 10de8: a3a5003e */ sb $a1,0x3e($sp) /* 10dec: a3a8003d */ sb $t0,0x3d($sp) /* 10df0: a3a9003f */ sb $t1,0x3f($sp) -/* 10df4: 0c00400e */ jal func0000fba0 +/* 10df4: 0c00400e */ jal snd0000fba0 /* 10df8: e7a00034 */ swc1 $f0,0x34($sp) /* 10dfc: 8fa3002c */ lw $v1,0x2c($sp) /* 10e00: 87a40040 */ lh $a0,0x40($sp) @@ -5113,7 +5113,7 @@ glabel audioStart /* 10e18: c7a00034 */ lwc1 $f0,0x34($sp) /* 10e1c: 97a5003a */ lhu $a1,0x3a($sp) /* 10e20: 01003025 */ or $a2,$t0,$zero -/* 10e24: 0c0043a9 */ jal func00010ae4 +/* 10e24: 0c0043a9 */ jal snd00010ae4 /* 10e28: 00003825 */ or $a3,$zero,$zero /* 10e2c: 8faa0050 */ lw $t2,0x50($sp) /* 10e30: 11400002 */ beqz $t2,.NB00010e3c @@ -5154,7 +5154,7 @@ glabel audioStart #endif GLOBAL_ASM( -glabel func00010ae4 +glabel snd00010ae4 /* 10ae4: 27bdffd8 */ addiu $sp,$sp,-40 /* 10ae8: 3c188006 */ lui $t8,%hi(g_Silent) /* 10aec: 8f18dda0 */ lw $t8,%lo(g_Silent)($t8) @@ -5265,7 +5265,7 @@ glabel func00010ae4 .L00010c74: /* 10c74: afa5002c */ sw $a1,0x2c($sp) .L00010c78: -/* 10c78: 0c003a77 */ jal func0000e9dc +/* 10c78: 0c003a77 */ jal snd0000e9dc /* 10c7c: afa60030 */ sw $a2,0x30($sp) /* 10c80: 8fa8002c */ lw $t0,0x2c($sp) /* 10c84: 24017fff */ addiu $at,$zero,0x7fff @@ -5354,7 +5354,7 @@ glabel func00010ae4 #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel envPlayNosedive +glabel sndPlayNosedive /* 10b2c: 00047080 */ sll $t6,$a0,0x2 /* 10b30: 01c47023 */ subu $t6,$t6,$a0 /* 10b34: 000e70c0 */ sll $t6,$t6,0x3 @@ -5372,7 +5372,7 @@ glabel envPlayNosedive ); #else GLOBAL_ASM( -glabel envPlayNosedive +glabel sndPlayNosedive /* 10db0: 00047100 */ sll $t6,$a0,0x4 /* 10db4: 01c47023 */ subu $t6,$t6,$a0 /* 10db8: 000e7100 */ sll $t6,$t6,0x4 @@ -5389,7 +5389,7 @@ glabel envPlayNosedive #endif GLOBAL_ASM( -glabel envStopNosedive +glabel sndStopNosedive /* 10de0: 3c028006 */ lui $v0,%hi(var8005ddac) /* 10de4: 2442ddac */ addiu $v0,$v0,%lo(var8005ddac) /* 10de8: 8c4e0000 */ lw $t6,0x0($v0) @@ -5407,7 +5407,7 @@ glabel envStopNosedive #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel func00010e10 +glabel snd00010e10 /* 10e10: 3c038006 */ lui $v1,%hi(var8005ddac) /* 10e14: 2463ddac */ addiu $v1,$v1,%lo(var8005ddac) /* 10e18: 8c620000 */ lw $v0,0x0($v1) @@ -5438,7 +5438,7 @@ glabel func00010e10 /* 10e7c: 8c460000 */ lw $a2,0x0($v0) /* 10e80: c4323c84 */ lwc1 $f18,%lo(var70053c84)($at) /* 10e84: 46120000 */ add.s $f0,$f0,$f18 -/* 10e88: 0fc5b364 */ jal coreIsPaused +/* 10e88: 0fc5b364 */ jal lvIsPaused /* 10e8c: e7a00034 */ swc1 $f0,0x34($sp) /* 10e90: 3c08800a */ lui $t0,%hi(g_Vars) /* 10e94: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) @@ -5472,7 +5472,7 @@ glabel func00010e10 /* 10f00: 2484ddc0 */ addiu $a0,$a0,%lo(var8005ddc0) /* 10f04: afac0010 */ sw $t4,0x10($sp) /* 10f08: e7a00014 */ swc1 $f0,0x14($sp) -/* 10f0c: 0c004128 */ jal audioAdjust +/* 10f0c: 0c004128 */ jal sndAdjust /* 10f10: afa00018 */ sw $zero,0x18($sp) /* 10f14: 10000066 */ b .L000110b0 /* 10f18: 8fbf002c */ lw $ra,0x2c($sp) @@ -5504,7 +5504,7 @@ glabel func00010e10 /* 10f78: 24c6ddc0 */ addiu $a2,$a2,%lo(var8005ddc0) /* 10f7c: 2407ffff */ addiu $a3,$zero,-1 /* 10f80: e7a00034 */ swc1 $f0,0x34($sp) -/* 10f84: 0c004241 */ jal audioStart +/* 10f84: 0c004241 */ jal sndStart /* 10f88: e7a40014 */ swc1 $f4,0x14($sp) /* 10f8c: 3c08800a */ lui $t0,%hi(g_Vars) /* 10f90: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) @@ -5538,7 +5538,7 @@ glabel func00010e10 /* 10ff8: afae0010 */ sw $t6,0x10($sp) /* 10ffc: 24070040 */ addiu $a3,$zero,0x40 /* 11000: e7a00014 */ swc1 $f0,0x14($sp) -/* 11004: 0c004128 */ jal audioAdjust +/* 11004: 0c004128 */ jal sndAdjust /* 11008: afa00018 */ sw $zero,0x18($sp) /* 1100c: 10000028 */ b .L000110b0 /* 11010: 8fbf002c */ lw $ra,0x2c($sp) @@ -5571,7 +5571,7 @@ glabel func00010e10 /* 11074: 2484ddc0 */ addiu $a0,$a0,%lo(var8005ddc0) /* 11078: afab0010 */ sw $t3,0x10($sp) /* 1107c: afa00018 */ sw $zero,0x18($sp) -/* 11080: 0c004128 */ jal audioAdjust +/* 11080: 0c004128 */ jal sndAdjust /* 11084: e7a80014 */ swc1 $f8,0x14($sp) /* 11088: 10000009 */ b .L000110b0 /* 1108c: 8fbf002c */ lw $ra,0x2c($sp) @@ -5592,7 +5592,7 @@ glabel func00010e10 ); #else GLOBAL_ASM( -glabel func00010e10 +glabel snd00010e10 /* 10e10: 3c038006 */ lui $v1,%hi(var8005ddac) /* 10e14: 2463ddac */ addiu $v1,$v1,%lo(var8005ddac) /* 10e18: 8c620000 */ lw $v0,0x0($v1) @@ -5623,7 +5623,7 @@ glabel func00010e10 /* 10e7c: 8c460000 */ lw $a2,0x0($v0) /* 10e80: c4323c84 */ lwc1 $f18,%lo(var70053c84)($at) /* 10e84: 46120000 */ add.s $f0,$f0,$f18 -/* 10e88: 0fc5b364 */ jal coreIsPaused +/* 10e88: 0fc5b364 */ jal lvIsPaused /* 10e8c: e7a00034 */ swc1 $f0,0x34($sp) /* 10e90: 3c08800a */ lui $t0,%hi(g_Vars) /* 10e94: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) @@ -5657,7 +5657,7 @@ glabel func00010e10 /* 10f00: 2484ddc0 */ addiu $a0,$a0,%lo(var8005ddc0) /* 10f04: afac0010 */ sw $t4,0x10($sp) /* 10f08: e7a00014 */ swc1 $f0,0x14($sp) -/* 10f0c: 0c004128 */ jal audioAdjust +/* 10f0c: 0c004128 */ jal sndAdjust /* 10f10: afa00018 */ sw $zero,0x18($sp) /* 10f14: 10000066 */ b .L000110b0 /* 10f18: 8fbf002c */ lw $ra,0x2c($sp) @@ -5689,7 +5689,7 @@ glabel func00010e10 /* 10f78: 24c6ddc0 */ addiu $a2,$a2,%lo(var8005ddc0) /* 10f7c: 2407ffff */ addiu $a3,$zero,-1 /* 10f80: e7a00034 */ swc1 $f0,0x34($sp) -/* 10f84: 0c004241 */ jal audioStart +/* 10f84: 0c004241 */ jal sndStart /* 10f88: e7a40014 */ swc1 $f4,0x14($sp) /* 10f8c: 3c08800a */ lui $t0,%hi(g_Vars) /* 10f90: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) @@ -5723,7 +5723,7 @@ glabel func00010e10 /* 10ff8: afae0010 */ sw $t6,0x10($sp) /* 10ffc: 24070040 */ addiu $a3,$zero,0x40 /* 11000: e7a00014 */ swc1 $f0,0x14($sp) -/* 11004: 0c004128 */ jal audioAdjust +/* 11004: 0c004128 */ jal sndAdjust /* 11008: afa00018 */ sw $zero,0x18($sp) /* 1100c: 10000028 */ b .L000110b0 /* 11010: 8fbf002c */ lw $ra,0x2c($sp) @@ -5756,7 +5756,7 @@ glabel func00010e10 /* 11074: 2484ddc0 */ addiu $a0,$a0,%lo(var8005ddc0) /* 11078: afab0010 */ sw $t3,0x10($sp) /* 1107c: afa00018 */ sw $zero,0x18($sp) -/* 11080: 0c004128 */ jal audioAdjust +/* 11080: 0c004128 */ jal sndAdjust /* 11084: e7a80014 */ swc1 $f8,0x14($sp) /* 11088: 10000009 */ b .L000110b0 /* 1108c: 8fbf002c */ lw $ra,0x2c($sp) @@ -5779,7 +5779,7 @@ glabel func00010e10 #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel envPlayUfoHum +glabel sndPlayUfoHum /* 10e40: 00047080 */ sll $t6,$a0,0x2 /* 10e44: 01c47023 */ subu $t6,$t6,$a0 /* 10e48: 000e70c0 */ sll $t6,$t6,0x3 @@ -5797,7 +5797,7 @@ glabel envPlayUfoHum ); #else GLOBAL_ASM( -glabel envPlayUfoHum +glabel sndPlayUfoHum /* 110bc: 00047100 */ sll $t6,$a0,0x4 /* 110c0: 01c47023 */ subu $t6,$t6,$a0 /* 110c4: 000e7100 */ sll $t6,$t6,0x4 @@ -5814,7 +5814,7 @@ glabel envPlayUfoHum #endif GLOBAL_ASM( -glabel envStopUfoHum +glabel sndStopUfoHum /* 110ec: 3c028006 */ lui $v0,%hi(var8005ddb8) /* 110f0: 2442ddb8 */ addiu $v0,$v0,%lo(var8005ddb8) /* 110f4: 8c4e0000 */ lw $t6,0x0($v0) @@ -5832,7 +5832,7 @@ glabel envStopUfoHum #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel func0001111c +glabel snd0001111c /* 1111c: 3c038006 */ lui $v1,%hi(var8005ddb8) /* 11120: 2463ddb8 */ addiu $v1,$v1,%lo(var8005ddb8) /* 11124: 8c620000 */ lw $v0,0x0($v1) @@ -5884,7 +5884,7 @@ glabel func0001111c /* 111d8: 46128102 */ mul.s $f4,$f16,$f18 /* 111dc: 460c2000 */ add.s $f0,$f4,$f12 .L000111e0: -/* 111e0: 0fc5b364 */ jal coreIsPaused +/* 111e0: 0fc5b364 */ jal lvIsPaused /* 111e4: e7a00034 */ swc1 $f0,0x34($sp) /* 111e8: 3c08800a */ lui $t0,%hi(g_Vars) /* 111ec: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) @@ -5918,7 +5918,7 @@ glabel func0001111c /* 11258: 2484ddc4 */ addiu $a0,$a0,%lo(var8005ddc4) /* 1125c: afac0010 */ sw $t4,0x10($sp) /* 11260: e7a00014 */ swc1 $f0,0x14($sp) -/* 11264: 0c004128 */ jal audioAdjust +/* 11264: 0c004128 */ jal sndAdjust /* 11268: afa00018 */ sw $zero,0x18($sp) /* 1126c: 10000067 */ b .L0001140c /* 11270: 8fbf002c */ lw $ra,0x2c($sp) @@ -5950,7 +5950,7 @@ glabel func0001111c /* 112d0: 24c6ddc4 */ addiu $a2,$a2,%lo(var8005ddc4) /* 112d4: 2407ffff */ addiu $a3,$zero,-1 /* 112d8: e7a00034 */ swc1 $f0,0x34($sp) -/* 112dc: 0c004241 */ jal audioStart +/* 112dc: 0c004241 */ jal sndStart /* 112e0: e7a80014 */ swc1 $f8,0x14($sp) /* 112e4: 3c08800a */ lui $t0,%hi(g_Vars) /* 112e8: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) @@ -5985,7 +5985,7 @@ glabel func0001111c /* 11354: afae0010 */ sw $t6,0x10($sp) /* 11358: 24070040 */ addiu $a3,$zero,0x40 /* 1135c: e7a00014 */ swc1 $f0,0x14($sp) -/* 11360: 0c004128 */ jal audioAdjust +/* 11360: 0c004128 */ jal sndAdjust /* 11364: afa00018 */ sw $zero,0x18($sp) /* 11368: 10000028 */ b .L0001140c /* 1136c: 8fbf002c */ lw $ra,0x2c($sp) @@ -6018,7 +6018,7 @@ glabel func0001111c /* 113d0: 2484ddc4 */ addiu $a0,$a0,%lo(var8005ddc4) /* 113d4: afab0010 */ sw $t3,0x10($sp) /* 113d8: afa00018 */ sw $zero,0x18($sp) -/* 113dc: 0c004128 */ jal audioAdjust +/* 113dc: 0c004128 */ jal sndAdjust /* 113e0: e7a60014 */ swc1 $f6,0x14($sp) /* 113e4: 10000009 */ b .L0001140c /* 113e8: 8fbf002c */ lw $ra,0x2c($sp) @@ -6039,7 +6039,7 @@ glabel func0001111c ); #else GLOBAL_ASM( -glabel func0001111c +glabel snd0001111c /* 1111c: 3c038006 */ lui $v1,%hi(var8005ddb8) /* 11120: 2463ddb8 */ addiu $v1,$v1,%lo(var8005ddb8) /* 11124: 8c620000 */ lw $v0,0x0($v1) @@ -6091,7 +6091,7 @@ glabel func0001111c /* 111d8: 46128102 */ mul.s $f4,$f16,$f18 /* 111dc: 460c2000 */ add.s $f0,$f4,$f12 .L000111e0: -/* 111e0: 0fc5b364 */ jal coreIsPaused +/* 111e0: 0fc5b364 */ jal lvIsPaused /* 111e4: e7a00034 */ swc1 $f0,0x34($sp) /* 111e8: 3c08800a */ lui $t0,%hi(g_Vars) /* 111ec: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) @@ -6125,7 +6125,7 @@ glabel func0001111c /* 11258: 2484ddc4 */ addiu $a0,$a0,%lo(var8005ddc4) /* 1125c: afac0010 */ sw $t4,0x10($sp) /* 11260: e7a00014 */ swc1 $f0,0x14($sp) -/* 11264: 0c004128 */ jal audioAdjust +/* 11264: 0c004128 */ jal sndAdjust /* 11268: afa00018 */ sw $zero,0x18($sp) /* 1126c: 10000067 */ b .L0001140c /* 11270: 8fbf002c */ lw $ra,0x2c($sp) @@ -6157,7 +6157,7 @@ glabel func0001111c /* 112d0: 24c6ddc4 */ addiu $a2,$a2,%lo(var8005ddc4) /* 112d4: 2407ffff */ addiu $a3,$zero,-1 /* 112d8: e7a00034 */ swc1 $f0,0x34($sp) -/* 112dc: 0c004241 */ jal audioStart +/* 112dc: 0c004241 */ jal sndStart /* 112e0: e7a80014 */ swc1 $f8,0x14($sp) /* 112e4: 3c08800a */ lui $t0,%hi(g_Vars) /* 112e8: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) @@ -6192,7 +6192,7 @@ glabel func0001111c /* 11354: afae0010 */ sw $t6,0x10($sp) /* 11358: 24070040 */ addiu $a3,$zero,0x40 /* 1135c: e7a00014 */ swc1 $f0,0x14($sp) -/* 11360: 0c004128 */ jal audioAdjust +/* 11360: 0c004128 */ jal sndAdjust /* 11364: afa00018 */ sw $zero,0x18($sp) /* 11368: 10000028 */ b .L0001140c /* 1136c: 8fbf002c */ lw $ra,0x2c($sp) @@ -6225,7 +6225,7 @@ glabel func0001111c /* 113d0: 2484ddc4 */ addiu $a0,$a0,%lo(var8005ddc4) /* 113d4: afab0010 */ sw $t3,0x10($sp) /* 113d8: afa00018 */ sw $zero,0x18($sp) -/* 113dc: 0c004128 */ jal audioAdjust +/* 113dc: 0c004128 */ jal sndAdjust /* 113e0: e7a60014 */ swc1 $f6,0x14($sp) /* 113e4: 10000009 */ b .L0001140c /* 113e8: 8fbf002c */ lw $ra,0x2c($sp) diff --git a/tools/patchpiracysums b/tools/patchpiracysums index 83f77ce58..1c7ee39db 100755 --- a/tools/patchpiracysums +++ b/tools/patchpiracysums @@ -190,8 +190,8 @@ class Tool: self.patch(algo03, 'propobjHandlePickupByAibot', 'func0f08e2ac') self.patch(algo04, 'chrUncloak', 'propobjHandlePickupByAibot') self.patch(algo05, 'func0f028590', 'func00002078') - self.patch(algo06, 'coreLoadStage', 'coreGetSlowMotionType') - self.patch(algo07, 'propAllocateEyespy', 'coreLoadStage') + self.patch(algo06, 'lvInit', 'lvGetSlowMotionType') + self.patch(algo07, 'propAllocateEyespy', 'lvInit') self.patch(algo08, 'chrConsiderGrenadeThrow', 'bgInit') self.patch(algo09, 'func0f09e144', 'tagsAllocatePtrs') self.patch(algo10, 'explosionAlertChrs', 'func0f084cf0')