mirror of
https://github.com/izzy2lost/Diddy-Kong-Racing.git
synced 2026-06-19 01:16:26 -07:00
Merge pull request #97 from DavidSM64/rodata_globalasm
Moved most of .rodata into GLOBAL_ASM
This commit is contained in:
@@ -272,6 +272,7 @@ $(BUILD_DIR)/lib/src/unknown_0C91A0.o : OPT_FLAGS := -O1
|
||||
$(BUILD_DIR)/lib/src/unknown_0D29F0.o: OPT_FLAGS := -O1
|
||||
$(BUILD_DIR)/lib/src/unknown_0CDE90.o: OPT_FLAGS := -O1
|
||||
$(BUILD_DIR)/lib/src/unknown_0D3160.o: OPT_FLAGS := -O1
|
||||
$(BUILD_DIR)/lib/src/unknown_0D3360.o: OPT_FLAGS := -O1
|
||||
$(BUILD_DIR)/lib/src/unknown_0D5EC0.o: OPT_FLAGS := -O1
|
||||
$(BUILD_DIR)/lib/src/unknown_0C9C90.o: OPT_FLAGS := -O2 -Wo,-loopunroll,0
|
||||
$(BUILD_DIR)/lib/src/osCreateThread.o : OPT_FLAGS := -O1
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
.late_rodata
|
||||
glabel D_800E49E0
|
||||
.float 46875.0
|
||||
glabel D_800E49E4
|
||||
.float 46875.0
|
||||
glabel D_800E49E8
|
||||
.float 120000.0
|
||||
|
||||
.text
|
||||
glabel func_800015F8
|
||||
/* 0021F8 800015F8 27BDFFE8 */ addiu $sp, $sp, -0x18
|
||||
/* 0021FC 800015FC AFBF0014 */ sw $ra, 0x14($sp)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
.late_rodata
|
||||
glabel D_800E4BF0
|
||||
.float 10000.0
|
||||
|
||||
.text
|
||||
glabel func_80004B40
|
||||
/* 005740 80004B40 27BDFFA8 */ addiu $sp, $sp, -0x58
|
||||
/* 005744 80004B44 AFB30024 */ sw $s3, 0x24($sp)
|
||||
|
||||
@@ -1,3 +1,30 @@
|
||||
.late_rodata
|
||||
glabel D_800E4BF8
|
||||
.double 0.4
|
||||
glabel D_800E4C00
|
||||
.float 10000.0
|
||||
.word 0 # Padding
|
||||
glabel D_800E4C08
|
||||
.double 0.05
|
||||
glabel D_800E4C10
|
||||
.double 0.95
|
||||
glabel D_800E4C18
|
||||
.double 0.13
|
||||
glabel D_800E4C20
|
||||
.double 0.3
|
||||
glabel D_800E4C28
|
||||
.double 0.02
|
||||
glabel D_800E4C30
|
||||
.double 0.01
|
||||
glabel D_800E4C38
|
||||
.float 0.4
|
||||
.word 0 # Padding
|
||||
glabel D_800E4C40
|
||||
.double 0.005
|
||||
glabel D_800E4C48
|
||||
.double -0.1
|
||||
|
||||
.text
|
||||
glabel func_80005254
|
||||
/* 005E54 80005254 27BDFF60 */ addiu $sp, $sp, -0xa0
|
||||
/* 005E58 80005258 3C088012 */ lui $t0, %hi(D_80119C3C) # $t0, 0x8012
|
||||
|
||||
@@ -1,3 +1,18 @@
|
||||
.late_rodata
|
||||
glabel D_800E4C50
|
||||
.double 0.05
|
||||
glabel D_800E4C58
|
||||
.double 0.95
|
||||
glabel D_800E4C60
|
||||
.double 0.3
|
||||
glabel D_800E4C68
|
||||
.double 6.5534
|
||||
glabel D_800E4C70
|
||||
.float 6.5534
|
||||
glabel D_800E4C74
|
||||
.float 10000.0
|
||||
|
||||
.text
|
||||
glabel func_80005D08
|
||||
/* 006908 80005D08 27BDFFC8 */ addiu $sp, $sp, -0x38
|
||||
/* 00690C 80005D0C AFBF0014 */ sw $ra, 0x14($sp)
|
||||
|
||||
@@ -1,3 +1,17 @@
|
||||
.late_rodata
|
||||
glabel D_800E4C78
|
||||
.float 10000.0
|
||||
.word 0 # Padding
|
||||
glabel D_800E4C80
|
||||
.double 0.05
|
||||
glabel D_800E4C88
|
||||
.double 0.95
|
||||
glabel D_800E4C90
|
||||
.double 6.5534
|
||||
glabel D_800E4C98
|
||||
.float 6.5534
|
||||
|
||||
.text
|
||||
glabel func_800063EC
|
||||
/* 006FEC 800063EC 27BDFFD0 */ addiu $sp, $sp, -0x30
|
||||
/* 006FF0 800063F0 AFBF0014 */ sw $ra, 0x14($sp)
|
||||
|
||||
@@ -1,3 +1,17 @@
|
||||
.late_rodata
|
||||
glabel D_800E4CA0
|
||||
.double 1731.23404
|
||||
glabel D_800E4CA8
|
||||
.double 0.8
|
||||
glabel D_800E4CB0
|
||||
.float 0.8
|
||||
.word 0 # Padding
|
||||
glabel D_800E4CB8
|
||||
.double -0.8
|
||||
glabel D_800E4CC0
|
||||
.float -0.8
|
||||
|
||||
.text
|
||||
glabel func_80006BFC
|
||||
/* 0077FC 80006BFC 27BDFFB8 */ addiu $sp, $sp, -0x48
|
||||
/* 007800 80006C00 AFBF0014 */ sw $ra, 0x14($sp)
|
||||
|
||||
@@ -1,3 +1,25 @@
|
||||
.late_rodata
|
||||
glabel D_800E4CC4
|
||||
.float 2250000.0
|
||||
glabel D_800E4CC8
|
||||
.double 0.05
|
||||
glabel D_800E4CD0
|
||||
.float 1500.0
|
||||
glabel D_800E4CD4
|
||||
.float 0.05
|
||||
glabel D_800E4CD8
|
||||
.double 0.05
|
||||
glabel D_800E4CE0
|
||||
.float 2250000.0
|
||||
.word 0 # Padding
|
||||
glabel D_800E4CE8
|
||||
.double 0.8
|
||||
glabel D_800E4CF0
|
||||
.float 1500.0
|
||||
glabel D_800E4CF4
|
||||
.float 0.05
|
||||
|
||||
.text
|
||||
glabel func_80006FC8
|
||||
/* 007BC8 80006FC8 27BDFF38 */ addiu $sp, $sp, -0xc8
|
||||
/* 007BCC 80006FCC AFB70064 */ sw $s7, 0x64($sp)
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
.late_rodata
|
||||
glabel D_800E4CF8
|
||||
.double 0.001
|
||||
|
||||
.text
|
||||
glabel func_80007FA4
|
||||
/* 008BA4 80007FA4 3C013F80 */ li $at, 0x3F800000 # 1.000000
|
||||
/* 008BA8 80007FA8 44818000 */ mtc1 $at, $f16
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
.late_rodata
|
||||
glabel D_800E4F10
|
||||
.float -100000.0
|
||||
|
||||
.text
|
||||
glabel func_80008174
|
||||
/* 008D74 80008174 27BDFFC0 */ addiu $sp, $sp, -0x40
|
||||
/* 008D78 80008178 3C038012 */ lui $v1, %hi(D_80119C4C) # $v1, 0x8012
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
.late_rodata
|
||||
glabel D_800E4F14
|
||||
.float 999999.0
|
||||
|
||||
.text
|
||||
glabel func_80008438
|
||||
/* 009038 80008438 27BDFD98 */ addiu $sp, $sp, -0x268
|
||||
/* 00903C 8000843C AFBF006C */ sw $ra, 0x6c($sp)
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
.late_rodata
|
||||
glabel D_800E4F18
|
||||
.double -100000.0
|
||||
|
||||
.text
|
||||
glabel func_800099EC
|
||||
/* 00A5EC 800099EC 308E00FF */ andi $t6, $a0, 0xff
|
||||
/* 00A5F0 800099F0 000E7880 */ sll $t7, $t6, 2
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
.late_rodata
|
||||
glabel D_800E4F20
|
||||
.double -100000.0
|
||||
|
||||
.text
|
||||
glabel func_80009AB4
|
||||
/* 00A6B4 80009AB4 308E00FF */ andi $t6, $a0, 0xff
|
||||
/* 00A6B8 80009AB8 000E7880 */ sll $t7, $t6, 2
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
.late_rodata
|
||||
glabel D_800E5E60
|
||||
.double 250.0
|
||||
|
||||
.text
|
||||
glabel func_8002581C
|
||||
/* 02641C 8002581C 27BDFF40 */ addiu $sp, $sp, -0xc0
|
||||
/* 026420 80025820 3C0E8012 */ lui $t6, %hi(D_8011D474) # $t6, 0x8012
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
.late_rodata
|
||||
glabel D_800E5E68
|
||||
.double -300.0
|
||||
glabel D_800E5E70
|
||||
.double 300.0
|
||||
|
||||
.text
|
||||
glabel func_80026070
|
||||
/* 026C70 80026070 27BDFF70 */ addiu $sp, $sp, -0x90
|
||||
/* 026C74 80026074 AFBF001C */ sw $ra, 0x1c($sp)
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
.late_rodata
|
||||
glabel D_800E5E78
|
||||
.double 300.0
|
||||
glabel D_800E5E80
|
||||
.double -300.0
|
||||
glabel D_800E5E88
|
||||
.double -300.0
|
||||
|
||||
.text
|
||||
glabel func_80026430
|
||||
/* 027030 80026430 27BDFEF0 */ addiu $sp, $sp, -0x110
|
||||
/* 027034 80026434 3C0E8012 */ lui $t6, %hi(D_8011D49E) # $t6, 0x8012
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
.late_rodata
|
||||
glabel D_800E5E90
|
||||
.double -0.1
|
||||
glabel D_800E5E98
|
||||
.double -0.1
|
||||
|
||||
.text
|
||||
glabel func_80027568
|
||||
/* 028168 80027568 27BDFF18 */ addiu $sp, $sp, -0xe8
|
||||
/* 02816C 8002756C AFBF0044 */ sw $ra, 0x44($sp)
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
.late_rodata
|
||||
glabel D_800E5EA0
|
||||
.double 1000.0
|
||||
|
||||
.text
|
||||
glabel func_80028FAC
|
||||
/* 029BAC 80028FAC 27BDFE90 */ addiu $sp, $sp, -0x170
|
||||
/* 029BB0 80028FB0 AFBF003C */ sw $ra, 0x3c($sp)
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
.late_rodata
|
||||
glabel D_800E5EA8
|
||||
.double 1000.0
|
||||
|
||||
.text
|
||||
glabel func_8002A5F8
|
||||
/* 02B1F8 8002A5F8 27BDFF88 */ addiu $sp, $sp, -0x78
|
||||
/* 02B1FC 8002A5FC AFB30040 */ sw $s3, 0x40($sp)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user