From 32490cd77d6ce17c7f674f28112f2faac6696372 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 17 Oct 2022 17:19:53 +1000 Subject: [PATCH] ntsc-beta: Decompile gamefileSave --- src/game/gamefile.c | 480 +------------------------------------------- src/game/lv.c | 79 -------- 2 files changed, 11 insertions(+), 548 deletions(-) diff --git a/src/game/gamefile.c b/src/game/gamefile.c index 208d96c69..3dd2182cc 100644 --- a/src/game/gamefile.c +++ b/src/game/gamefile.c @@ -371,10 +371,9 @@ s32 gamefileLoad(s32 device) return -1; } -#if VERSION >= VERSION_NTSC_1_0 s32 gamefileSave(s32 device, s32 fileid, u16 deviceserial) { - u32 stack; + u32 value; s32 newfileid; s32 ret; s32 i; @@ -469,9 +468,16 @@ s32 gamefileSave(s32 device, s32 fileid, u16 deviceserial) savebufferOr(&buffer, g_GameFile.totaltime, 32); savebufferOr(&buffer, g_GameFile.autodifficulty, 2); savebufferOr(&buffer, g_GameFile.autostageindex, 5); - savebufferOr(&buffer, (u32)(VOLUME(g_SfxVolume) >> 7) >> 2, 6); - savebufferOr(&buffer, (u32)(optionsGetMusicVolume() >> 7) >> 2, 6); - savebufferOr(&buffer, g_SoundMode, 2); + + value = VOLUME(g_SfxVolume) >> 7; + savebufferOr(&buffer, value >> 2, 6); + + value = optionsGetMusicVolume() >> 7; + savebufferOr(&buffer, value >> 2, 6); + + value = g_SoundMode; + savebufferOr(&buffer, value, 2); + savebufferOr(&buffer, optionsGetControlMode(p1index), 3); savebufferOr(&buffer, optionsGetControlMode(p2index), 3); @@ -522,470 +528,6 @@ s32 gamefileSave(s32 device, s32 fileid, u16 deviceserial) return -1; } -#else -GLOBAL_ASM( -glabel gamefileSave -/* f10a380: 27bdfeb8 */ addiu $sp,$sp,-328 -/* f10a384: afb4002c */ sw $s4,0x2c($sp) -/* f10a388: 3c14800a */ lui $s4,0x800a -/* f10a38c: 2694e6c0 */ addiu $s4,$s4,-6464 -/* f10a390: 8e820298 */ lw $v0,0x298($s4) -/* f10a394: afbf0034 */ sw $ra,0x34($sp) -/* f10a398: afb50030 */ sw $s5,0x30($sp) -/* f10a39c: afb30028 */ sw $s3,0x28($sp) -/* f10a3a0: afb20024 */ sw $s2,0x24($sp) -/* f10a3a4: afb10020 */ sw $s1,0x20($sp) -/* f10a3a8: afb0001c */ sw $s0,0x1c($sp) -/* f10a3ac: afa40148 */ sw $a0,0x148($sp) -/* f10a3b0: afa5014c */ sw $a1,0x14c($sp) -/* f10a3b4: 04410005 */ bgez $v0,.NB0f10a3cc -/* f10a3b8: afa60150 */ sw $a2,0x150($sp) -/* f10a3bc: 8e8e029c */ lw $t6,0x29c($s4) -/* f10a3c0: 24110004 */ addiu $s1,$zero,0x4 -/* f10a3c4: 05c00003 */ bltz $t6,.NB0f10a3d4 -/* f10a3c8: 00000000 */ sll $zero,$zero,0x0 -.NB0f10a3cc: -/* f10a3cc: 10000001 */ beqz $zero,.NB0f10a3d4 -/* f10a3d0: 00008825 */ or $s1,$zero,$zero -.NB0f10a3d4: -/* f10a3d4: 04410005 */ bgez $v0,.NB0f10a3ec -/* f10a3d8: 24120001 */ addiu $s2,$zero,0x1 -/* f10a3dc: 8e8f029c */ lw $t7,0x29c($s4) -/* f10a3e0: 24130005 */ addiu $s3,$zero,0x5 -/* f10a3e4: 05e00003 */ bltz $t7,.NB0f10a3f4 -/* f10a3e8: 00000000 */ sll $zero,$zero,0x0 -.NB0f10a3ec: -/* f10a3ec: 10000001 */ beqz $zero,.NB0f10a3f4 -/* f10a3f0: 24130001 */ addiu $s3,$zero,0x1 -.NB0f10a3f4: -/* f10a3f4: 3c018007 */ lui $at,0x8007 -/* f10a3f8: ac327f70 */ sw $s2,0x7f70($at) -/* f10a3fc: 0fc5339c */ jal optionsGetForwardPitch -/* f10a400: 02202025 */ or $a0,$s1,$zero -/* f10a404: 3c10800a */ lui $s0,0x800a -/* f10a408: 26106704 */ addiu $s0,$s0,0x6704 -/* f10a40c: 02002825 */ or $a1,$s0,$zero -/* f10a410: 00002025 */ or $a0,$zero,$zero -/* f10a414: 0fc460eb */ jal pakSetBitflag -/* f10a418: 00403025 */ or $a2,$v0,$zero -/* f10a41c: 0fc533a5 */ jal optionsGetAutoAim -/* f10a420: 02202025 */ or $a0,$s1,$zero -/* f10a424: 02402025 */ or $a0,$s2,$zero -/* f10a428: 02002825 */ or $a1,$s0,$zero -/* f10a42c: 0fc460eb */ jal pakSetBitflag -/* f10a430: 00403025 */ or $a2,$v0,$zero -/* f10a434: 0fc533b7 */ jal optionsGetAimControl -/* f10a438: 02202025 */ or $a0,$s1,$zero -/* f10a43c: 24040002 */ addiu $a0,$zero,0x2 -/* f10a440: 02002825 */ or $a1,$s0,$zero -/* f10a444: 0fc460eb */ jal pakSetBitflag -/* f10a448: 00403025 */ or $a2,$v0,$zero -/* f10a44c: 0fc533c0 */ jal optionsGetSightOnScreen -/* f10a450: 02202025 */ or $a0,$s1,$zero -/* f10a454: 24040003 */ addiu $a0,$zero,0x3 -/* f10a458: 02002825 */ or $a1,$s0,$zero -/* f10a45c: 0fc460eb */ jal pakSetBitflag -/* f10a460: 00403025 */ or $a2,$v0,$zero -/* f10a464: 0fc533ae */ jal optionsGetLookAhead -/* f10a468: 02202025 */ or $a0,$s1,$zero -/* f10a46c: 24040004 */ addiu $a0,$zero,0x4 -/* f10a470: 02002825 */ or $a1,$s0,$zero -/* f10a474: 0fc460eb */ jal pakSetBitflag -/* f10a478: 00403025 */ or $a2,$v0,$zero -/* f10a47c: 0fc533c9 */ jal optionsGetAmmoOnScreen -/* f10a480: 02202025 */ or $a0,$s1,$zero -/* f10a484: 24040005 */ addiu $a0,$zero,0x5 -/* f10a488: 02002825 */ or $a1,$s0,$zero -/* f10a48c: 0fc460eb */ jal pakSetBitflag -/* f10a490: 00403025 */ or $a2,$v0,$zero -/* f10a494: 0fc53405 */ jal optionsGetHeadRoll -/* f10a498: 02202025 */ or $a0,$s1,$zero -/* f10a49c: 24040009 */ addiu $a0,$zero,0x9 -/* f10a4a0: 02002825 */ or $a1,$s0,$zero -/* f10a4a4: 0fc460eb */ jal pakSetBitflag -/* f10a4a8: 00403025 */ or $a2,$v0,$zero -/* f10a4ac: 0fc533d2 */ jal optionsGetShowGunFunction -/* f10a4b0: 02202025 */ or $a0,$s1,$zero -/* f10a4b4: 2404000a */ addiu $a0,$zero,0xa -/* f10a4b8: 02002825 */ or $a1,$s0,$zero -/* f10a4bc: 0fc460eb */ jal pakSetBitflag -/* f10a4c0: 00403025 */ or $a2,$v0,$zero -/* f10a4c4: 0fc533db */ jal optionsGetAlwaysShowTarget -/* f10a4c8: 02202025 */ or $a0,$s1,$zero -/* f10a4cc: 24040015 */ addiu $a0,$zero,0x15 -/* f10a4d0: 02002825 */ or $a1,$s0,$zero -/* f10a4d4: 0fc460eb */ jal pakSetBitflag -/* f10a4d8: 00403025 */ or $a2,$v0,$zero -/* f10a4dc: 0fc533e4 */ jal optionsGetShowZoomRange -/* f10a4e0: 02202025 */ or $a0,$s1,$zero -/* f10a4e4: 24040017 */ addiu $a0,$zero,0x17 -/* f10a4e8: 02002825 */ or $a1,$s0,$zero -/* f10a4ec: 0fc460eb */ jal pakSetBitflag -/* f10a4f0: 00403025 */ or $a2,$v0,$zero -/* f10a4f4: 0fc533f6 */ jal optionsGetShowMissionTime -/* f10a4f8: 02202025 */ or $a0,$s1,$zero -/* f10a4fc: 2404001a */ addiu $a0,$zero,0x1a -/* f10a500: 02002825 */ or $a1,$s0,$zero -/* f10a504: 0fc460eb */ jal pakSetBitflag -/* f10a508: 00403025 */ or $a2,$v0,$zero -/* f10a50c: 0fc533ed */ jal optionsGetPaintball -/* f10a510: 02202025 */ or $a0,$s1,$zero -/* f10a514: 24040020 */ addiu $a0,$zero,0x20 -/* f10a518: 02002825 */ or $a1,$s0,$zero -/* f10a51c: 0fc460eb */ jal pakSetBitflag -/* f10a520: 00403025 */ or $a2,$v0,$zero -/* f10a524: 0fc5339c */ jal optionsGetForwardPitch -/* f10a528: 02602025 */ or $a0,$s3,$zero -/* f10a52c: 2404000c */ addiu $a0,$zero,0xc -/* f10a530: 02002825 */ or $a1,$s0,$zero -/* f10a534: 0fc460eb */ jal pakSetBitflag -/* f10a538: 00403025 */ or $a2,$v0,$zero -/* f10a53c: 0fc533a5 */ jal optionsGetAutoAim -/* f10a540: 02602025 */ or $a0,$s3,$zero -/* f10a544: 2404000d */ addiu $a0,$zero,0xd -/* f10a548: 02002825 */ or $a1,$s0,$zero -/* f10a54c: 0fc460eb */ jal pakSetBitflag -/* f10a550: 00403025 */ or $a2,$v0,$zero -/* f10a554: 0fc533b7 */ jal optionsGetAimControl -/* f10a558: 02602025 */ or $a0,$s3,$zero -/* f10a55c: 2404000e */ addiu $a0,$zero,0xe -/* f10a560: 02002825 */ or $a1,$s0,$zero -/* f10a564: 0fc460eb */ jal pakSetBitflag -/* f10a568: 00403025 */ or $a2,$v0,$zero -/* f10a56c: 0fc533c0 */ jal optionsGetSightOnScreen -/* f10a570: 02602025 */ or $a0,$s3,$zero -/* f10a574: 2404000f */ addiu $a0,$zero,0xf -/* f10a578: 02002825 */ or $a1,$s0,$zero -/* f10a57c: 0fc460eb */ jal pakSetBitflag -/* f10a580: 00403025 */ or $a2,$v0,$zero -/* f10a584: 0fc533ae */ jal optionsGetLookAhead -/* f10a588: 02602025 */ or $a0,$s3,$zero -/* f10a58c: 24040010 */ addiu $a0,$zero,0x10 -/* f10a590: 02002825 */ or $a1,$s0,$zero -/* f10a594: 0fc460eb */ jal pakSetBitflag -/* f10a598: 00403025 */ or $a2,$v0,$zero -/* f10a59c: 0fc533c9 */ jal optionsGetAmmoOnScreen -/* f10a5a0: 02602025 */ or $a0,$s3,$zero -/* f10a5a4: 24040011 */ addiu $a0,$zero,0x11 -/* f10a5a8: 02002825 */ or $a1,$s0,$zero -/* f10a5ac: 0fc460eb */ jal pakSetBitflag -/* f10a5b0: 00403025 */ or $a2,$v0,$zero -/* f10a5b4: 0fc53405 */ jal optionsGetHeadRoll -/* f10a5b8: 02602025 */ or $a0,$s3,$zero -/* f10a5bc: 24040012 */ addiu $a0,$zero,0x12 -/* f10a5c0: 02002825 */ or $a1,$s0,$zero -/* f10a5c4: 0fc460eb */ jal pakSetBitflag -/* f10a5c8: 00403025 */ or $a2,$v0,$zero -/* f10a5cc: 0fc533d2 */ jal optionsGetShowGunFunction -/* f10a5d0: 02602025 */ or $a0,$s3,$zero -/* f10a5d4: 24040013 */ addiu $a0,$zero,0x13 -/* f10a5d8: 02002825 */ or $a1,$s0,$zero -/* f10a5dc: 0fc460eb */ jal pakSetBitflag -/* f10a5e0: 00403025 */ or $a2,$v0,$zero -/* f10a5e4: 0fc533db */ jal optionsGetAlwaysShowTarget -/* f10a5e8: 02602025 */ or $a0,$s3,$zero -/* f10a5ec: 24040016 */ addiu $a0,$zero,0x16 -/* f10a5f0: 02002825 */ or $a1,$s0,$zero -/* f10a5f4: 0fc460eb */ jal pakSetBitflag -/* f10a5f8: 00403025 */ or $a2,$v0,$zero -/* f10a5fc: 0fc533e4 */ jal optionsGetShowZoomRange -/* f10a600: 02602025 */ or $a0,$s3,$zero -/* f10a604: 24040018 */ addiu $a0,$zero,0x18 -/* f10a608: 02002825 */ or $a1,$s0,$zero -/* f10a60c: 0fc460eb */ jal pakSetBitflag -/* f10a610: 00403025 */ or $a2,$v0,$zero -/* f10a614: 0fc533f6 */ jal optionsGetShowMissionTime -/* f10a618: 02602025 */ or $a0,$s3,$zero -/* f10a61c: 2404001b */ addiu $a0,$zero,0x1b -/* f10a620: 02002825 */ or $a1,$s0,$zero -/* f10a624: 0fc460eb */ jal pakSetBitflag -/* f10a628: 00403025 */ or $a2,$v0,$zero -/* f10a62c: 0fc533ed */ jal optionsGetPaintball -/* f10a630: 02602025 */ or $a0,$s3,$zero -/* f10a634: 24040021 */ addiu $a0,$zero,0x21 -/* f10a638: 02002825 */ or $a1,$s0,$zero -/* f10a63c: 0fc460eb */ jal pakSetBitflag -/* f10a640: 00403025 */ or $a2,$v0,$zero -/* f10a644: 0fc53588 */ jal optionsGetScreenSplit -/* f10a648: 00000000 */ sll $zero,$zero,0x0 -/* f10a64c: 24040019 */ addiu $a0,$zero,0x19 -/* f10a650: 02002825 */ or $a1,$s0,$zero -/* f10a654: 0fc460eb */ jal pakSetBitflag -/* f10a658: 00403025 */ or $a2,$v0,$zero -/* f10a65c: 0fc53582 */ jal optionsGetScreenRatio -/* f10a660: 00000000 */ sll $zero,$zero,0x0 -/* f10a664: 24040007 */ addiu $a0,$zero,0x7 -/* f10a668: 02002825 */ or $a1,$s0,$zero -/* f10a66c: 0fc460eb */ jal pakSetBitflag -/* f10a670: 00403025 */ or $a2,$v0,$zero -/* f10a674: 0fc5351c */ jal optionsGetEffectiveScreenSize -/* f10a678: 00000000 */ sll $zero,$zero,0x0 -/* f10a67c: 00523026 */ xor $a2,$v0,$s2 -/* f10a680: 2cc60001 */ sltiu $a2,$a2,0x1 -/* f10a684: 24040006 */ addiu $a0,$zero,0x6 -/* f10a688: 0fc460eb */ jal pakSetBitflag -/* f10a68c: 02002825 */ or $a1,$s0,$zero -/* f10a690: 0fc5351c */ jal optionsGetEffectiveScreenSize -/* f10a694: 00000000 */ sll $zero,$zero,0x0 -/* f10a698: 24150002 */ addiu $s5,$zero,0x2 -/* f10a69c: 00553026 */ xor $a2,$v0,$s5 -/* f10a6a0: 2cc60001 */ sltiu $a2,$a2,0x1 -/* f10a6a4: 24040008 */ addiu $a0,$zero,0x8 -/* f10a6a8: 0fc460eb */ jal pakSetBitflag -/* f10a6ac: 02002825 */ or $a1,$s0,$zero -/* f10a6b0: 3c188007 */ lui $t8,0x8007 -/* f10a6b4: 8f182d88 */ lw $t8,0x2d88($t8) -/* f10a6b8: 24040022 */ addiu $a0,$zero,0x22 -/* f10a6bc: 02002825 */ or $a1,$s0,$zero -/* f10a6c0: 02583026 */ xor $a2,$s2,$t8 -/* f10a6c4: 0fc460eb */ jal pakSetBitflag -/* f10a6c8: 2cc60001 */ sltiu $a2,$a2,0x1 -/* f10a6cc: 0fc533ff */ jal optionsGetInGameSubtitles -/* f10a6d0: 00000000 */ sll $zero,$zero,0x0 -/* f10a6d4: 2404000b */ addiu $a0,$zero,0xb -/* f10a6d8: 02002825 */ or $a1,$s0,$zero -/* f10a6dc: 0fc460eb */ jal pakSetBitflag -/* f10a6e0: 00403025 */ or $a2,$v0,$zero -/* f10a6e4: 0fc53402 */ jal optionsGetCutsceneSubtitles -/* f10a6e8: 00000000 */ sll $zero,$zero,0x0 -/* f10a6ec: 24040014 */ addiu $a0,$zero,0x14 -/* f10a6f0: 02002825 */ or $a1,$s0,$zero -/* f10a6f4: 0fc460eb */ jal pakSetBitflag -/* f10a6f8: 00403025 */ or $a2,$v0,$zero -/* f10a6fc: 24040040 */ addiu $a0,$zero,0x40 -/* f10a700: 02002825 */ or $a1,$s0,$zero -/* f10a704: 0fc460eb */ jal pakSetBitflag -/* f10a708: 928604e3 */ lbu $a2,0x4e3($s4) -/* f10a70c: 0fc5351c */ jal optionsGetEffectiveScreenSize -/* f10a710: 00000000 */ sll $zero,$zero,0x0 -/* f10a714: 50400002 */ beqzl $v0,.NB0f10a720 -/* f10a718: 8e990450 */ lw $t9,0x450($s4) -/* f10a71c: 8e990450 */ lw $t9,0x450($s4) -.NB0f10a720: -/* f10a720: 2404001f */ addiu $a0,$zero,0x1f -/* f10a724: 02002825 */ or $a1,$s0,$zero -/* f10a728: 02593026 */ xor $a2,$s2,$t9 -/* f10a72c: 0fc460eb */ jal pakSetBitflag -/* f10a730: 2cc60001 */ sltiu $a2,$a2,0x1 -/* f10a734: 8e880448 */ lw $t0,0x448($s4) -/* f10a738: 2404001c */ addiu $a0,$zero,0x1c -/* f10a73c: 02002825 */ or $a1,$s0,$zero -/* f10a740: 02483026 */ xor $a2,$s2,$t0 -/* f10a744: 0fc460eb */ jal pakSetBitflag -/* f10a748: 2cc60001 */ sltiu $a2,$a2,0x1 -/* f10a74c: 8e890454 */ lw $t1,0x454($s4) -/* f10a750: 2404001d */ addiu $a0,$zero,0x1d -/* f10a754: 02002825 */ or $a1,$s0,$zero -/* f10a758: 02493026 */ xor $a2,$s2,$t1 -/* f10a75c: 0fc460eb */ jal pakSetBitflag -/* f10a760: 2cc60001 */ sltiu $a2,$a2,0x1 -/* f10a764: 8e8a044c */ lw $t2,0x44c($s4) -/* f10a768: 2404001e */ addiu $a0,$zero,0x1e -/* f10a76c: 02002825 */ or $a1,$s0,$zero -/* f10a770: 024a3026 */ xor $a2,$s2,$t2 -/* f10a774: 0fc460eb */ jal pakSetBitflag -/* f10a778: 2cc60001 */ sltiu $a2,$a2,0x1 -/* f10a77c: 8fab0148 */ lw $t3,0x148($sp) -/* f10a780: 27b4004c */ addiu $s4,$sp,0x4c -/* f10a784: 2402ffff */ addiu $v0,$zero,-1 -/* f10a788: 056000ae */ bltz $t3,.NB0f10aa44 -/* f10a78c: 00000000 */ sll $zero,$zero,0x0 -/* f10a790: 0fc34ad1 */ jal savebufferClear -/* f10a794: 02802025 */ or $a0,$s4,$zero -/* f10a798: 3c12800a */ lui $s2,0x800a -/* f10a79c: 265266f0 */ addiu $s2,$s2,0x66f0 -/* f10a7a0: 02402825 */ or $a1,$s2,$zero -/* f10a7a4: 0fc34b23 */ jal func0f0d55a4 -/* f10a7a8: 02802025 */ or $a0,$s4,$zero -/* f10a7ac: 9245000b */ lbu $a1,0xb($s2) -/* f10a7b0: 02802025 */ or $a0,$s4,$zero -/* f10a7b4: 24060005 */ addiu $a2,$zero,0x5 -/* f10a7b8: 000560c2 */ srl $t4,$a1,0x3 -/* f10a7bc: 0fc34a9e */ jal savebufferOr -/* f10a7c0: 01802825 */ or $a1,$t4,$zero -/* f10a7c4: 02802025 */ or $a0,$s4,$zero -/* f10a7c8: 8e450010 */ lw $a1,0x10($s2) -/* f10a7cc: 0fc34a9e */ jal savebufferOr -/* f10a7d0: 24060020 */ addiu $a2,$zero,0x20 -/* f10a7d4: 8e450008 */ lw $a1,0x8($s2) -/* f10a7d8: 02802025 */ or $a0,$s4,$zero -/* f10a7dc: 24060002 */ addiu $a2,$zero,0x2 -/* f10a7e0: 30ad0007 */ andi $t5,$a1,0x7 -/* f10a7e4: 0fc34a9e */ jal savebufferOr -/* f10a7e8: 01a02825 */ or $a1,$t5,$zero -/* f10a7ec: 02802025 */ or $a0,$s4,$zero -/* f10a7f0: 9245000c */ lbu $a1,0xc($s2) -/* f10a7f4: 0fc34a9e */ jal savebufferOr -/* f10a7f8: 24060005 */ addiu $a2,$zero,0x5 -/* f10a7fc: 3c078006 */ lui $a3,0x8006 -/* f10a800: 94e7f6e8 */ lhu $a3,-0x918($a3) -/* f10a804: 02802025 */ or $a0,$s4,$zero -/* f10a808: 24060006 */ addiu $a2,$zero,0x6 -/* f10a80c: 000771c3 */ sra $t6,$a3,0x7 -/* f10a810: 0fc34a9e */ jal savebufferOr -/* f10a814: 000e2882 */ srl $a1,$t6,0x2 -/* f10a818: 0fc5358f */ jal optionsGetMusicVolume -/* f10a81c: 00000000 */ sll $zero,$zero,0x0 -/* f10a820: 000229c3 */ sra $a1,$v0,0x7 -/* f10a824: 00057882 */ srl $t7,$a1,0x2 -/* f10a828: 01e02825 */ or $a1,$t7,$zero -/* f10a82c: 02802025 */ or $a0,$s4,$zero -/* f10a830: 0fc34a9e */ jal savebufferOr -/* f10a834: 24060006 */ addiu $a2,$zero,0x6 -/* f10a838: 3c078006 */ lui $a3,0x8006 -/* f10a83c: 8ce5f6ec */ lw $a1,-0x914($a3) -/* f10a840: 02802025 */ or $a0,$s4,$zero -/* f10a844: 0fc34a9e */ jal savebufferOr -/* f10a848: 24060002 */ addiu $a2,$zero,0x2 -/* f10a84c: 0fc53380 */ jal optionsGetControlMode -/* f10a850: 02202025 */ or $a0,$s1,$zero -/* f10a854: 02802025 */ or $a0,$s4,$zero -/* f10a858: 00402825 */ or $a1,$v0,$zero -/* f10a85c: 0fc34a9e */ jal savebufferOr -/* f10a860: 24060003 */ addiu $a2,$zero,0x3 -/* f10a864: 0fc53380 */ jal optionsGetControlMode -/* f10a868: 02602025 */ or $a0,$s3,$zero -/* f10a86c: 02802025 */ or $a0,$s4,$zero -/* f10a870: 00402825 */ or $a1,$v0,$zero -/* f10a874: 0fc34a9e */ jal savebufferOr -/* f10a878: 24060003 */ addiu $a2,$zero,0x3 -/* f10a87c: 3c10800a */ lui $s0,0x800a -/* f10a880: 3c11800a */ lui $s1,0x800a -/* f10a884: 263166fa */ addiu $s1,$s1,0x66fa -/* f10a888: 261066f0 */ addiu $s0,$s0,0x66f0 -/* f10a88c: 02802025 */ or $a0,$s4,$zero -.NB0f10a890: -/* f10a890: 92050014 */ lbu $a1,0x14($s0) -/* f10a894: 0fc34a9e */ jal savebufferOr -/* f10a898: 24060008 */ addiu $a2,$zero,0x8 -/* f10a89c: 26100001 */ addiu $s0,$s0,0x1 -/* f10a8a0: 0211082b */ sltu $at,$s0,$s1 -/* f10a8a4: 5420fffa */ bnezl $at,.NB0f10a890 -/* f10a8a8: 02802025 */ or $a0,$s4,$zero -/* f10a8ac: 02802025 */ or $a0,$s4,$zero -/* f10a8b0: 9645001e */ lhu $a1,0x1e($s2) -/* f10a8b4: 0fc34a9e */ jal savebufferOr -/* f10a8b8: 24060010 */ addiu $a2,$zero,0x10 -/* f10a8bc: 3c15800a */ lui $s5,0x800a -/* f10a8c0: 26b566f0 */ addiu $s5,$s5,0x66f0 -/* f10a8c4: 24130006 */ addiu $s3,$zero,0x6 -/* f10a8c8: 00008825 */ or $s1,$zero,$zero -.NB0f10a8cc: -/* f10a8cc: 02a09025 */ or $s2,$s5,$zero -.NB0f10a8d0: -/* f10a8d0: 02802025 */ or $a0,$s4,$zero -/* f10a8d4: 96450020 */ lhu $a1,0x20($s2) -/* f10a8d8: 0fc34a9e */ jal savebufferOr -/* f10a8dc: 2406000c */ addiu $a2,$zero,0xc -/* f10a8e0: 26310002 */ addiu $s1,$s1,0x2 -/* f10a8e4: 1633fffa */ bne $s1,$s3,.NB0f10a8d0 -/* f10a8e8: 26520002 */ addiu $s2,$s2,0x2 -/* f10a8ec: 3c18800a */ lui $t8,0x800a -/* f10a8f0: 2718676e */ addiu $t8,$t8,0x676e -/* f10a8f4: 26b50006 */ addiu $s5,$s5,0x6 -/* f10a8f8: 02b8082b */ sltu $at,$s5,$t8 -/* f10a8fc: 5420fff3 */ bnezl $at,.NB0f10a8cc -/* f10a900: 00008825 */ or $s1,$zero,$zero -/* f10a904: 00008825 */ or $s1,$zero,$zero -/* f10a908: 24120005 */ addiu $s2,$zero,0x5 -/* f10a90c: 24100001 */ addiu $s0,$zero,0x1 -.NB0f10a910: -/* f10a910: 02202025 */ or $a0,$s1,$zero -.NB0f10a914: -/* f10a914: 0fc65912 */ jal challengeIsCompletedByAnyPlayerWithNumPlayers -/* f10a918: 02002825 */ or $a1,$s0,$zero -/* f10a91c: 02802025 */ or $a0,$s4,$zero -/* f10a920: 00402825 */ or $a1,$v0,$zero -/* f10a924: 0fc34a9e */ jal savebufferOr -/* f10a928: 24060001 */ addiu $a2,$zero,0x1 -/* f10a92c: 26100001 */ addiu $s0,$s0,0x1 -/* f10a930: 5612fff8 */ bnel $s0,$s2,.NB0f10a914 -/* f10a934: 02202025 */ or $a0,$s1,$zero -/* f10a938: 26310001 */ addiu $s1,$s1,0x1 -/* f10a93c: 2a21001e */ slti $at,$s1,0x1e -/* f10a940: 5420fff3 */ bnezl $at,.NB0f10a910 -/* f10a944: 24100001 */ addiu $s0,$zero,0x1 -/* f10a948: 3c10800a */ lui $s0,0x800a -/* f10a94c: 3c11800a */ lui $s1,0x800a -/* f10a950: 263166fc */ addiu $s1,$s1,0x66fc -/* f10a954: 261066f0 */ addiu $s0,$s0,0x66f0 -/* f10a958: 02802025 */ or $a0,$s4,$zero -.NB0f10a95c: -/* f10a95c: 8e0500a0 */ lw $a1,0xa0($s0) -/* f10a960: 0fc34a9e */ jal savebufferOr -/* f10a964: 24060015 */ addiu $a2,$zero,0x15 -/* f10a968: 26100004 */ addiu $s0,$s0,0x4 -/* f10a96c: 0211082b */ sltu $at,$s0,$s1 -/* f10a970: 5420fffa */ bnezl $at,.NB0f10a95c -/* f10a974: 02802025 */ or $a0,$s4,$zero -/* f10a978: 3c10800a */ lui $s0,0x800a -/* f10a97c: 3c12800a */ lui $s2,0x800a -/* f10a980: 3c11800a */ lui $s1,0x800a -/* f10a984: 263166f8 */ addiu $s1,$s1,0x66f8 -/* f10a988: 265266f9 */ addiu $s2,$s2,0x66f9 -/* f10a98c: 261066f0 */ addiu $s0,$s0,0x66f0 -.NB0f10a990: -/* f10a990: 16110003 */ bne $s0,$s1,.NB0f10a9a0 -/* f10a994: 02802025 */ or $a0,$s4,$zero -/* f10a998: 10000002 */ beqz $zero,.NB0f10a9a4 -/* f10a99c: 24060002 */ addiu $a2,$zero,0x2 -.NB0f10a9a0: -/* f10a9a0: 24060008 */ addiu $a2,$zero,0x8 -.NB0f10a9a4: -/* f10a9a4: 0fc34a9e */ jal savebufferOr -/* f10a9a8: 920500ac */ lbu $a1,0xac($s0) -/* f10a9ac: 26100001 */ addiu $s0,$s0,0x1 -/* f10a9b0: 0212082b */ sltu $at,$s0,$s2 -/* f10a9b4: 1420fff6 */ bnez $at,.NB0f10a990 -/* f10a9b8: 00000000 */ sll $zero,$zero,0x0 -/* f10a9bc: 3c10800a */ lui $s0,0x800a -/* f10a9c0: 3c11800a */ lui $s1,0x800a -/* f10a9c4: 263166f4 */ addiu $s1,$s1,0x66f4 -/* f10a9c8: 261066f0 */ addiu $s0,$s0,0x66f0 -/* f10a9cc: 02802025 */ or $a0,$s4,$zero -.NB0f10a9d0: -/* f10a9d0: 920500b5 */ lbu $a1,0xb5($s0) -/* f10a9d4: 0fc34a9e */ jal savebufferOr -/* f10a9d8: 24060008 */ addiu $a2,$zero,0x8 -/* f10a9dc: 26100001 */ addiu $s0,$s0,0x1 -/* f10a9e0: 5611fffb */ bnel $s0,$s1,.NB0f10a9d0 -/* f10a9e4: 02802025 */ or $a0,$s4,$zero -/* f10a9e8: 0fc34aeb */ jal func0f0d54c4 -/* f10a9ec: 02802025 */ or $a0,$s4,$zero -/* f10a9f0: 27b90140 */ addiu $t9,$sp,0x140 -/* f10a9f4: afb90010 */ sw $t9,0x10($sp) -/* f10a9f8: 83a4014b */ lb $a0,0x14b($sp) -/* f10a9fc: 8fa5014c */ lw $a1,0x14c($sp) -/* f10aa00: 24060080 */ addiu $a2,$zero,0x80 -/* f10aa04: 27a70050 */ addiu $a3,$sp,0x50 -/* f10aa08: 0fc442fb */ jal pakSaveAtGuid -/* f10aa0c: afa00014 */ sw $zero,0x14($sp) -/* f10aa10: 3c01800a */ lui $at,0x800a -/* f10aa14: 14400009 */ bnez $v0,.NB0f10aa3c -/* f10aa18: ac2266e8 */ sw $v0,0x66e8($at) -/* f10aa1c: 8fa80140 */ lw $t0,0x140($sp) -/* f10aa20: 97a90152 */ lhu $t1,0x152($sp) -/* f10aa24: 3c03800a */ lui $v1,0x800a -/* f10aa28: 246367b0 */ addiu $v1,$v1,0x67b0 -/* f10aa2c: 00001025 */ or $v0,$zero,$zero -/* f10aa30: ac680000 */ sw $t0,0x0($v1) -/* f10aa34: 10000003 */ beqz $zero,.NB0f10aa44 -/* f10aa38: a4690004 */ sh $t1,0x4($v1) -.NB0f10aa3c: -/* f10aa3c: 10000001 */ beqz $zero,.NB0f10aa44 -/* f10aa40: 2402ffff */ addiu $v0,$zero,-1 -.NB0f10aa44: -/* f10aa44: 8fbf0034 */ lw $ra,0x34($sp) -/* f10aa48: 8fb0001c */ lw $s0,0x1c($sp) -/* f10aa4c: 8fb10020 */ lw $s1,0x20($sp) -/* f10aa50: 8fb20024 */ lw $s2,0x24($sp) -/* f10aa54: 8fb30028 */ lw $s3,0x28($sp) -/* f10aa58: 8fb4002c */ lw $s4,0x2c($sp) -/* f10aa5c: 8fb50030 */ lw $s5,0x30($sp) -/* f10aa60: 03e00008 */ jr $ra -/* f10aa64: 27bd0148 */ addiu $sp,$sp,0x148 -); -#endif void gamefileGetOverview(char *arg0, char *name, u8 *stage, u8 *difficulty, u32 *time) { diff --git a/src/game/lv.c b/src/game/lv.c index b4496f77a..02f4c28a6 100644 --- a/src/game/lv.c +++ b/src/game/lv.c @@ -950,83 +950,6 @@ void lvFindThreats(void) } } -//Gfx *lvPrintI(Gfx *gdl, s32 *x, s32 *y, char *name, u32 value) -//{ -// char buffer[64]; -// -// sprintf(buffer, "%s: %u\n", name, value); -// gdl = textRender(gdl, x, y, buffer, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0x00ff00a0, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0); -// -// return gdl; -//} -// -//Gfx *lvPrintH(Gfx *gdl, s32 *x, s32 *y, char *name, u32 value) -//{ -// char buffer[64]; -// -// sprintf(buffer, "%s: %08x\n", name, value); -// gdl = textRender(gdl, x, y, buffer, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0x00ff00a0, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0); -// -// return gdl; -//} -// -//Gfx *lvPrintF(Gfx *gdl, s32 *x, s32 *y, char *name, f32 value) -//{ -// char buffer[64]; -// -// sprintf(buffer, "%s: %s%s%.1f\n", name, "", "", value); -// gdl = textRender(gdl, x, y, buffer, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0x00ff00a0, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0); -// -// return gdl; -//} -// -//Gfx *lvPrint(Gfx *gdl) -//{ -// static u32 times[60] = {0}; -// static s32 index = 0; -// -// times[index++] = g_Vars.diffframet / 1000; -// -// if (index >= 60) { -// index = 0; -// } -// -// if (g_FontHandelGothicXs) { -// char buffer[64]; -// s32 x = 10; -// s32 y = 10; -// -// gdl = text0f153628(gdl); -// -// gdl = lvPrintI(gdl, &x, &y, "diffframe60", g_Vars.diffframe60 ); -// gdl = lvPrintF(gdl, &x, &y, "diffframe60f", g_Vars.diffframe60f ); -// gdl = lvPrintI(gdl, &x, &y, "lvframe60", g_Vars.lvframe60 ); -// gdl = lvPrintI(gdl, &x, &y, "lvframenum", g_Vars.lvframenum ); -// gdl = lvPrintF(gdl, &x, &y, "diffframe60freal", g_Vars.diffframe60freal ); -// gdl = lvPrintH(gdl, &x, &y, "prevframestartt", g_Vars.prevframestartt ); -// gdl = lvPrintH(gdl, &x, &y, "thisframestartt", g_Vars.thisframestartt ); -// gdl = lvPrintH(gdl, &x, &y, "diffframet", g_Vars.diffframet ); -// gdl = lvPrintI(gdl, &x, &y, "lostframetime60t", g_Vars.lostframetime60t ); -// gdl = lvPrintI(gdl, &x, &y, "lostframetime240t", g_Vars.lostframetime240t ); -// gdl = lvPrintI(gdl, &x, &y, "lvframe240", g_Vars.lvframe240 ); -// gdl = lvPrintI(gdl, &x, &y, "lvupdate240", g_Vars.lvupdate240 ); -// gdl = lvPrintI(gdl, &x, &y, "lvupdate60", g_Vars.lvupdate60 ); -// gdl = lvPrintI(gdl, &x, &y, "lvupdate240rem", g_Vars.lvupdate240rem ); -// gdl = lvPrintI(gdl, &x, &y, "diffframe240", g_Vars.diffframe240 ); -// gdl = lvPrintF(gdl, &x, &y, "lvupdate60f", g_Vars.lvupdate60f ); -// gdl = lvPrintF(gdl, &x, &y, "diffframe240f", g_Vars.diffframe240f ); -// gdl = lvPrintF(gdl, &x, &y, "lvupdate60freal", g_Vars.lvupdate60freal ); -// gdl = lvPrintF(gdl, &x, &y, "lvupdate60frealprev", g_Vars.lvupdate60frealprev); -// gdl = lvPrintI(gdl, &x, &y, "prevframestart240", g_Vars.prevframestart240 ); -// gdl = lvPrintI(gdl, &x, &y, "thisframestart240", g_Vars.thisframestart240 ); -// gdl = lvPrintF(gdl, &x, &y, "diffframe240freal", g_Vars.diffframe240freal ); -// -// gdl = text0f153780(gdl); -// } -// -// return gdl; -//} - /** * Renders a complete frame for all players, and also does some other game logic * that really doesn't belong here. @@ -1801,8 +1724,6 @@ Gfx *lvRender(Gfx *gdl) } #endif - //gdl = lvPrint(gdl); - return gdl; }