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

Moved rodata from C to GLOBAL_ASM in unknown_003260

Browse Source
This commit is contained in:
David Benepe
2021-06-05 14:39:54 -05:00
parent b0e4a1ad38
commit b835ec3ffd
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/unknown_003260/_handleEvent.s
+13 -2
View File
@@ -1,3 +1,8 @@
.late_rodata
glabel jpt_800E4BB0
.word L800035C4, L80003A0C, L80004090, L80003B2C, L80004090, L80004090, L80004090, L80003C8C, L80004090, L80004090, L80004090, L80004090, L80004090, L80004090, L80004090, L80003BA4
.text
glabel _handleEvent
/* 004070 80003470 27BDFF30 */ addiu $sp, $sp, -0xd0
/* 004074 80003474 AFBE0038 */ sw $fp, 0x38($sp)
@@ -84,12 +89,13 @@ glabel _handleEvent
/* 0041A0 800035A0 2D210010 */ sltiu $at, $t1, 0x10
/* 0041A4 800035A4 102002BA */ beqz $at, .L80004090
/* 0041A8 800035A8 00094880 */ sll $t1, $t1, 2
/* 0041AC 800035AC 3C01800E */ lui $at, %hi(D_800E4BB0) # $at, 0x800e
/* 0041AC 800035AC 3C01800E */ lui $at, %hi(jpt_800E4BB0) # $at, 0x800e
/* 0041B0 800035B0 00290821 */ addu $at, $at, $t1
/* 0041B4 800035B4 8C294BB0 */ lw $t1, %lo(D_800E4BB0)($at)
/* 0041B4 800035B4 8C294BB0 */ lw $t1, %lo(jpt_800E4BB0)($at)
/* 0041B8 800035B8 00000000 */ nop
/* 0041BC 800035BC 01200008 */ jr $t1
/* 0041C0 800035C0 00000000 */ nop
glabel L800035C4
/* 0041C4 800035C4 9222003F */ lbu $v0, 0x3f($s1)
/* 0041C8 800035C8 24010005 */ li $at, 5
/* 0041CC 800035CC 10410004 */ beq $v0, $at, .L800035E0
@@ -386,6 +392,7 @@ glabel _handleEvent
/* 004604 80003A04 100001A3 */ b .L80004094
/* 004608 80003A08 01601025 */ move $v0, $t3
.L80003A0C:
glabel L80003A0C
/* 00460C 80003A0C 24011000 */ li $at, 4096
.L80003A10:
/* 004610 80003A10 14610006 */ bne $v1, $at, .L80003A2C
@@ -466,6 +473,7 @@ glabel _handleEvent
.L80003B24:
/* 004724 80003B24 1000015B */ b .L80004094
/* 004728 80003B28 306202D1 */ andi $v0, $v1, 0x2d1
glabel L80003B2C
/* 00472C 80003B2C 8EAA0008 */ lw $t2, 8($s5)
/* 004730 80003B30 922B003F */ lbu $t3, 0x3f($s1)
/* 004734 80003B34 A22A003C */ sb $t2, 0x3c($s1)
@@ -500,6 +508,7 @@ glabel _handleEvent
/* 004798 80003B98 304D02D1 */ andi $t5, $v0, 0x2d1
/* 00479C 80003B9C 1000013D */ b .L80004094
/* 0047A0 80003BA0 01A01025 */ move $v0, $t5
glabel L80003BA4
/* 0047A4 80003BA4 C6A40008 */ lwc1 $f4, 8($s5)
/* 0047A8 80003BA8 9229003F */ lbu $t1, 0x3f($s1)
/* 0047AC 80003BAC E624002C */ swc1 $f4, 0x2c($s1)
@@ -566,6 +575,7 @@ glabel _handleEvent
/* 004880 80003C80 304902D1 */ andi $t1, $v0, 0x2d1
/* 004884 80003C84 10000103 */ b .L80004094
/* 004888 80003C88 01201025 */ move $v0, $t1
glabel L80003C8C
/* 00488C 80003C8C 8EB80008 */ lw $t8, 8($s5)
/* 004890 80003C90 922E003F */ lbu $t6, 0x3f($s1)
/* 004894 80003C94 A6380034 */ sh $t8, 0x34($s1)
@@ -835,6 +845,7 @@ glabel _handleEvent
/* 004C88 80004088 10000002 */ b .L80004094
/* 004C8C 8000408C 01A01025 */ move $v0, $t5
.L80004090:
glabel L80004090
/* 004C90 80004090 306202D1 */ andi $v0, $v1, 0x2d1
.L80004094:
/* 004C94 80004094 8FA30074 */ lw $v1, 0x74($sp)
src/unknown_003260.c
+1 -9
View File
@@ -113,15 +113,7 @@ const char D_800E4B34[] = "Sound state allocate failed - sndId %d\n";
const char D_800E4B5C[] = "Don't worry - game should cope OK\n";
const char D_800E4B80[] = "WARNING: Attempt to stop NULL sound aborted\n";
// Jump table for _handleEvent
const u32 D_800E4BB0[] = {
0x800035C4, 0x80003A0C, 0x80004090, 0x80003B2C,
0x80004090, 0x80004090, 0x80004090, 0x80003C8C,
0x80004090, 0x80004090, 0x80004090, 0x80004090,
0x80004090, 0x80004090, 0x80004090, 0x80003BA4
};
/*******************************/
/*********************************/
/************ .bss ************/