izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed stuff

Browse Source
This commit is contained in:
David
2023-10-27 10:59:29 -05:00
parent e9225eaea3
commit f9b5d8e4a4
7 changed files with 334 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/menu/func_8007FFEC.s
+2 -2
View File
@@ -334,9 +334,9 @@ glabel func_8007FFEC
/* 0810F4 800804F4 AC201DB4 */ sw $zero, %lo(D_800E1DB4)($at)
/* 0810F8 800804F8 3C01800E */ lui $at, %hi(gWoodPanelCount) # $at, 0x800e
/* 0810FC 800804FC AC201DB8 */ sw $zero, %lo(gWoodPanelCount)($at)
/* 081100 80080500 3C01800E */ lui $at, %hi(D_800E1DBC) # $at, 0x800e
/* 081100 80080500 3C01800E */ lui $at, %hi(gWoodPanelAllocCount) # $at, 0x800e
/* 081104 80080504 8FBF001C */ lw $ra, 0x1c($sp)
/* 081108 80080508 AC301DBC */ sw $s0, %lo(D_800E1DBC)($at)
/* 081108 80080508 AC301DBC */ sw $s0, %lo(gWoodPanelAllocCount)($at)
/* 08110C 8008050C 8FB00018 */ lw $s0, 0x18($sp)
/* 081110 80080510 03E00008 */ jr $ra
/* 081114 80080514 27BD0050 */ addiu $sp, $sp, 0x50
asm/non_matchings/menu/menu_ghost_data_init.s
+4 -4
View File
@@ -27,12 +27,12 @@ glabel menu_ghost_data_init
/* 09A6C0 80099AC0 0C02658F */ jal func_8009963C
/* 09A6C4 80099AC4 00000000 */ nop
.L80099AC8:
/* 09A6C8 80099AC8 3C04800E */ lui $a0, %hi(D_800E1708) # $a0, 0x800e
/* 09A6C8 80099AC8 3C04800E */ lui $a0, %hi(gGhostDataObjectIndices) # $a0, 0x800e
/* 09A6CC 80099ACC 0C02719D */ jal func_8009C674
/* 09A6D0 80099AD0 24841708 */ addiu $a0, %lo(D_800E1708) # addiu $a0, $a0, 0x1708
/* 09A6D4 80099AD4 3C04800E */ lui $a0, %hi(D_800E174C) # $a0, 0x800e
/* 09A6D0 80099AD0 24841708 */ addiu $a0, %lo(gGhostDataObjectIndices) # addiu $a0, $a0, 0x1708
/* 09A6D4 80099AD4 3C04800E */ lui $a0, %hi(gGhostDataImageIndices) # $a0, 0x800e
/* 09A6D8 80099AD8 0C027229 */ jal allocate_menu_images
/* 09A6DC 80099ADC 2484174C */ addiu $a0, %lo(D_800E174C) # addiu $a0, $a0, 0x174c
/* 09A6DC 80099ADC 2484174C */ addiu $a0, %lo(gGhostDataImageIndices) # addiu $a0, $a0, 0x174c
/* 09A6E0 80099AE0 0C03105C */ jal load_font
/* 09A6E4 80099AE4 24040002 */ li $a0, 2
/* 09A6E8 80099AE8 3C028012 */ lui $v0, %hi(gMenuObjects) # $v0, 0x8012
asm/non_matchings/menu/menu_track_select_init.s
+4 -4
View File
@@ -153,10 +153,10 @@ glabel menu_track_select_init
/* 08F5E4 8008E9E4 24A50970 */ addiu $a1, %lo(gTrackSelectBgTriangles) # addiu $a1, $a1, 0x970
/* 08F5E8 8008E9E8 ACA20000 */ sw $v0, ($a1)
/* 08F5EC 8008E9EC 244B0280 */ addiu $t3, $v0, 0x280
/* 08F5F0 8008E9F0 3C01800E */ lui $at, %hi(D_800E0974) # $at, 0x800e
/* 08F5F4 8008E9F4 AC2B0974 */ sw $t3, %lo(D_800E0974)($at)
/* 08F5F0 8008E9F0 3C01800E */ lui $at, %hi(gTrackSelectBgTriangles+4) # $at, 0x800e
/* 08F5F4 8008E9F4 AC2B0974 */ sw $t3, %lo(gTrackSelectBgTriangles+4)($at)
/* 08F5F8 8008E9F8 8CAC0004 */ lw $t4, 4($a1)
/* 08F5FC 8008E9FC 3C01800E */ lui $at, %hi(D_800E096C) # $at, 0x800e
/* 08F5FC 8008E9FC 3C01800E */ lui $at, %hi(gTrackSelectBgVertices+4) # $at, 0x800e
/* 08F600 8008EA00 258D0280 */ addiu $t5, $t4, 0x280
/* 08F604 8008EA04 AC2D0968 */ sw $t5, %lo(gTrackSelectBgVertices)($at)
/* 08F608 8008EA08 3C0E800E */ lui $t6, %hi(gTrackSelectBgVertices) # $t6, 0x800e
@@ -164,7 +164,7 @@ glabel menu_track_select_init
/* 08F610 8008EA10 3C03800E */ lui $v1, %hi(gTrackSelectBgVertices) # $v1, 0x800e
/* 08F614 8008EA14 3C08800E */ lui $t0, %hi(gTrackSelectBgTriangles) # $t0, 0x800e
/* 08F618 8008EA18 25CF0320 */ addiu $t7, $t6, 0x320
/* 08F61C 8008EA1C AC2F096C */ sw $t7, %lo(D_800E096C)($at)
/* 08F61C 8008EA1C AC2F096C */ sw $t7, %lo(gTrackSelectBgVertices+4)($at)
/* 08F620 8008EA20 2404FF60 */ li $a0, -160
/* 08F624 8008EA24 25080970 */ addiu $t0, %lo(gTrackSelectBgTriangles) # addiu $t0, $t0, 0x970
/* 08F628 8008EA28 24630968 */ addiu $v1, %lo(gTrackSelectBgVertices) # addiu $v1, $v1, 0x968
asm/non_matchings/menu/render_track_select_setup_ui.s
+6 -6
View File
@@ -499,8 +499,8 @@ glabel render_track_select_setup_ui
/* 092288 80091688 0C01E2AE */ jal render_textured_rectangle
/* 09228C 8009168C AFB8001C */ sw $t8, 0x1c($sp)
/* 092290 80091690 8FB70080 */ lw $s7, 0x80($sp)
/* 092294 80091694 3C10800E */ lui $s0, %hi(D_800E0648) # $s0, 0x800e
/* 092298 80091698 26100648 */ addiu $s0, %lo(D_800E0648) # addiu $s0, $s0, 0x648
/* 092294 80091694 3C10800E */ lui $s0, %hi(gTrackSelectTTImage) # $s0, 0x800e
/* 092298 80091698 26100648 */ addiu $s0, %lo(gTrackSelectTTImage) # addiu $s0, $s0, 0x648
/* 09229C 8009169C 26F70097 */ addiu $s7, $s7, 0x97
.L800916A0:
/* 0922A0 800916A0 3C0E800E */ lui $t6, %hi(gTracksMenuTimeTrialHighlightIndex) # $t6, 0x800e
@@ -556,11 +556,11 @@ glabel render_track_select_setup_ui
/* 092358 80091758 01C20019 */ multu $t6, $v0
/* 09235C 8009175C 3C19800E */ lui $t9, %hi(gTracksMenuPlayerNamePositions) # $t9, 0x800e
/* 092360 80091760 27390688 */ addiu $t9, %lo(gTracksMenuPlayerNamePositions) # addiu $t9, $t9, 0x688
/* 092364 80091764 3C11800E */ lui $s1, %hi(D_800E0660) # $s1, 0x800e
/* 092364 80091764 3C11800E */ lui $s1, %hi(gTrackSelectPlayerImage) # $s1, 0x800e
/* 092368 80091768 3C128012 */ lui $s2, %hi(D_801269C4) # $s2, 0x8012
/* 09236C 8009176C 0040B825 */ move $s7, $v0
/* 092370 80091770 265269C4 */ addiu $s2, %lo(D_801269C4) # addiu $s2, $s2, 0x69c4
/* 092374 80091774 26310660 */ addiu $s1, %lo(D_800E0660) # addiu $s1, $s1, 0x660
/* 092374 80091774 26310660 */ addiu $s1, %lo(gTrackSelectPlayerImage) # addiu $s1, $s1, 0x660
/* 092378 80091778 0000A825 */ move $s5, $zero
/* 09237C 8009177C 00009812 */ mflo $s3
/* 092380 80091780 00137840 */ sll $t7, $s3, 1
@@ -793,7 +793,7 @@ glabel render_track_select_setup_ui
.L80091AC8:
/* 0926C8 80091AC8 3C0C800E */ lui $t4, %hi(gTracksMenuTimeTrialHighlightIndex) # $t4, 0x800e
/* 0926CC 80091ACC 8D8C0414 */ lw $t4, %lo(gTracksMenuTimeTrialHighlightIndex)($t4)
/* 0926D0 80091AD0 3C05800E */ lui $a1, %hi(D_800E0648) # $a1, 0x800e
/* 0926D0 80091AD0 3C05800E */ lui $a1, %hi(gTrackSelectTTImage) # $a1, 0x800e
/* 0926D4 80091AD4 01960019 */ multu $t4, $s6
/* 0926D8 80091AD8 8FC90000 */ lw $t1, ($fp)
/* 0926DC 80091ADC 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
@@ -809,7 +809,7 @@ glabel render_track_select_setup_ui
/* 092704 80091B04 00006812 */ mflo $t5
/* 092708 80091B08 000DC080 */ sll $t8, $t5, 2
/* 09270C 80091B0C 00B82821 */ addu $a1, $a1, $t8
/* 092710 80091B10 8CA50648 */ lw $a1, %lo(D_800E0648)($a1)
/* 092710 80091B10 8CA50648 */ lw $a1, %lo(gTrackSelectTTImage)($a1)
/* 092714 80091B14 0C01E2AE */ jal render_textured_rectangle
/* 092718 80091B18 AFA9001C */ sw $t1, 0x1c($sp)
/* 09271C 80091B1C 3C02800E */ lui $v0, %hi(gNumberOfActivePlayers) # $v0, 0x800e
lib/src/mips1/al/alSynStartVoiceParams.h
+2 -2
View File
@@ -5,11 +5,11 @@
#include "audio_internal.h"
// Can be changed in the "Audio Options" menu.
enum StereoPanMode {
typedef enum StereoPanMode {
STEREO,
MONO,
HEADPHONES
};
} StereoPanMode;
void set_stereo_pan_mode(s32 panMode);
s32 modify_panning(s32 pan);
rename.sh
+9 -6
View File
@@ -2,19 +2,22 @@
shopt -s globstar
if [ "$#" -le "2" ];
if [ "$#" -lt "2" ];
then
echo "usage: $0 old_name new_name"
exit 1
fi
# If the 3rd argument is "--check", then make sure the new symbol doesn't already exist!
if [ "$3" == "--check" ];
if [ "$#" -gt "2" ];
then
if grep -rlq "$2" asm/**/*.s src/**/*.{c,h} lib/**/*.{c,s} include/*.h undefined_syms.txt dkr.ld;
# If the 3rd argument is "--check", then make sure the new symbol doesn't already exist!
if [ "$3" == "--check" ];
then
echo "$2 already exist"
exit 1
if grep -rlq "$2" asm/**/*.s src/**/*.{c,h} lib/**/*.{c,s} include/*.h undefined_syms.txt dkr.ld;
then
echo "$2 already exist"
exit 1
fi
fi
fi
src/menu.c
+307 -160
View File
File diff suppressed because it is too large Load Diff