1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-04-08 23:56:26 +00:00

Remove hard-coded pointers in several files (#186)

* fix hard-coded pointers in code_800DACC0.data.s

* fix hard coded pointer in code_800E11F0.data.s

* fix hard coded pointers in code_800EC960.data.s

* remove fixed pointers in code_800F7260.data.s

* fix hard coded pointers in code_800F9280.data.s

* remove accidental comment

* fix hard coded jump table in Camera_Unique9.s
This commit is contained in:
krimtonz 2020-06-04 16:51:14 -05:00 committed by GitHub
parent d6fc300ed2
commit c78d93ad78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 584 additions and 364 deletions

View file

@ -3240,12 +3240,12 @@ glabel func_800DD9F4
/* B54BBC 800DDA1C 8CC30008 */ lw $v1, 8($a2)
/* B54BC0 800DDA20 00073040 */ sll $a2, $a3, 1
/* B54BC4 800DDA24 24C6000F */ addiu $a2, $a2, 0xf
/* B54BC8 800DDA28 3C078013 */ lui $a3, %hi(D_8012F0B0) # $a3, 0x8013
/* B54BC8 800DDA28 3C078013 */ lui $a3, %hi(gWaveSamples+0x18) # $a3, 0x8013
/* B54BCC 800DDA2C 02002025 */ move $a0, $s0
/* B54BD0 800DDA30 2401FFF0 */ li $at, -16
/* B54BD4 800DDA34 00C13024 */ and $a2, $a2, $at
/* B54BD8 800DDA38 26100008 */ addiu $s0, $s0, 8
/* B54BDC 800DDA3C 8CE7F0B0 */ lw $a3, %lo(D_8012F0B0)($a3)
/* B54BDC 800DDA3C 8CE7F0B0 */ lw $a3, %lo(gWaveSamples+0x20)($a3)
/* B54BE0 800DDA40 0C036F44 */ jal func_800DBD10
/* B54BE4 800DDA44 24050580 */ li $a1, 1408
/* B54BE8 800DDA48 3C038013 */ lui $v1, %hi(gWaveSamples) # $v1, 0x8013

View file

@ -4798,7 +4798,7 @@ glabel func_800E5000
/* B5C5F4 800E5454 000FC040 */ sll $t8, $t7, 1
/* B5C5F8 800E5458 3C0F800E */ lui $t7, %hi(func_800E4FE0) # $t7, 0x800e
/* B5C5FC 800E545C 25EF4FE0 */ addiu $t7, %lo(func_800E4FE0) # addiu $t7, $t7, 0x4fe0
/* B5C600 800E5460 3C018013 */ lui $at, %hi(D_8012F0B0) # $at, 0x8013
/* B5C600 800E5460 3C018013 */ lui $at, %hi(gWaveSamples) # $at, 0x8013
/* B5C604 800E5464 3C068015 */ lui $a2, %hi(D_80155C70) # $a2, 0x8015
/* B5C608 800E5468 3C0A8015 */ lui $t2, %hi(D_80155F50) # $t2, 0x8015
/* B5C60C 800E546C 24C65C70 */ addiu $a2, %lo(D_80155C70) # addiu $a2, $a2, 0x5c70
@ -4815,7 +4815,7 @@ glabel func_800E5000
/* B5C638 800E5498 316DFFF0 */ andi $t5, $t3, 0xfff0
/* B5C63C 800E549C AE4B297C */ sw $t3, 0x297c($s2)
/* B5C640 800E54A0 01AF7021 */ addu $t6, $t5, $t7
/* B5C644 800E54A4 AC2EF0B0 */ sw $t6, %lo(D_8012F0B0)($at)
/* B5C644 800E54A4 AC2EF0B0 */ sw $t6, %lo(gWaveSamples+0x20)($at)
/* B5C648 800E54A8 8E5828B8 */ lw $t8, 0x28b8($s2)
/* B5C64C 800E54AC 8E5028A4 */ lw $s0, 0x28a4($s2)
/* B5C650 800E54B0 01465823 */ subu $t3, $t2, $a2

View file

@ -462,9 +462,9 @@ glabel func_800E8F00
/* B600A8 800E8F08 240E0001 */ li $t6, 1
/* B600AC 800E8F0C A08E00B0 */ sb $t6, 0xb0($a0)
/* B600B0 800E8F10 AC8000A0 */ sw $zero, 0xa0($a0)
/* B600B4 800E8F14 3C0F8013 */ lui $t7, %hi(D_8012F098) # $t7, 0x8013
/* B600B4 800E8F14 3C0F8013 */ lui $t7, %hi(gWaveSamples) # $t7, 0x8013
/* B600B8 800E8F18 E484003C */ swc1 $f4, 0x3c($a0)
/* B600BC 800E8F1C 8DEFF098 */ lw $t7, %lo(D_8012F098)($t7)
/* B600BC 800E8F1C 8DEFF098 */ lw $t7, %lo(gWaveSamples+0x8)($t7)
/* B600C0 800E8F20 8C980044 */ lw $t8, 0x44($a0)
/* B600C4 800E8F24 AC8F00A4 */ sw $t7, 0xa4($a0)
/* B600C8 800E8F28 8F190050 */ lw $t9, 0x50($t8)

View file

@ -52,30 +52,30 @@ glabel D_8013A250
.float 182.041672 # 32768 / PI
glabel jtbl_8013A254
.word 0x80053B74 # 1
.word 0x80053C60 # 2
.word 0x80053F00 # 3
.word 0x80053E60 # 4
.word 0x800541C8
.word 0x800541C8
.word 0x800541C8
.word 0x800541C8
.word 0x80053D18 # 9
.word 0x80053D18 # 10
.word 0x80053F54 # 11
.word 0x80053F54 # 12
.word 0x80053FE4 # 13
.word 0x800541C8
.word 0x80053A0C # 15
.word 0x80053AF4 # 16
.word 0x800541C8
.word 0x80054180 # 17
.word 0x80054150 # 18
.word 0x800541C8
.word 0x80053A68 # 20
.word 0x800541C8
.word 0x800541C8
.word 0x80054140 # 23
.word L80053B74 # 1
.word L80053C60 # 2
.word L80053F00 # 3
.word L80053E60 # 4
.word L800541C8
.word L800541C8
.word L800541C8
.word L800541C8
.word L80053D18 # 9
.word L80053D18 # 10
.word L80053F54 # 11
.word L80053F54 # 12
.word L80053FE4 # 13
.word L800541C8
.word L80053A0C # 15
.word L80053AF4 # 16
.word L800541C8
.word L80054180 # 17
.word L80054150 # 18
.word L800541C8
.word L80053A68 # 20
.word L800541C8
.word L800541C8
.word L80054140 # 23
glabel D_8013A2B4
.float 182.041672 # 32768 / PI
@ -922,6 +922,8 @@ glabel Camera_Unique9
/* ACABA0 80053A00 8C2DA254 */ lw $t5, %lo(jtbl_8013A254)($at)
/* ACABA4 80053A04 01A00008 */ jr $t5
/* ACABA8 80053A08 00000000 */ nop
glabel L80053A0C
/* ACABAC 80053A0C 8FAE0030 */ lw $t6, 0x30($sp)
/* ACABB0 80053A10 8E180004 */ lw $t8, 4($s0)
/* ACABB4 80053A14 2626005C */ addiu $a2, $s1, 0x5c
@ -945,6 +947,8 @@ glabel Camera_Unique9
/* ACABFC 80053A5C A62E014C */ sh $t6, 0x14c($s1)
/* ACAC00 80053A60 100001DE */ b .L800541DC
/* ACAC04 80053A64 A62C015A */ sh $t4, 0x15a($s1)
glabel L80053A68
/* ACAC08 80053A68 860F0038 */ lh $t7, 0x38($s0)
/* ACAC0C 80053A6C 26070004 */ addiu $a3, $s0, 4
/* ACAC10 80053A70 26020010 */ addiu $v0, $s0, 0x10
@ -983,6 +987,8 @@ glabel Camera_Unique9
/* ACAC88 80053AE8 860A0034 */ lh $t2, 0x34($s0)
/* ACAC8C 80053AEC 100001BB */ b .L800541DC
/* ACAC90 80053AF0 A62A015A */ sh $t2, 0x15a($s1)
glabel L80053AF4
/* ACAC94 80053AF4 860C0038 */ lh $t4, 0x38($s0)
/* ACAC98 80053AF8 26070004 */ addiu $a3, $s0, 4
/* ACAC9C 80053AFC 26020010 */ addiu $v0, $s0, 0x10
@ -1018,6 +1024,8 @@ glabel Camera_Unique9
/* ACAD08 80053B68 860E0034 */ lh $t6, 0x34($s0)
/* ACAD0C 80053B6C 1000019B */ b .L800541DC
/* ACAD10 80053B70 A62E015A */ sh $t6, 0x15a($s1)
glabel L80053B74
/* ACAD14 80053B74 26070004 */ addiu $a3, $s0, 4
/* ACAD18 80053B78 260F0010 */ addiu $t7, $s0, 0x10
/* ACAD1C 80053B7C AFAF0024 */ sw $t7, 0x24($sp)
@ -1077,6 +1085,8 @@ glabel Camera_Unique9
/* ACADF4 80053C54 A7AE00EA */ sh $t6, 0xea($sp)
/* ACADF8 80053C58 1000001A */ b .L80053CC4
/* ACADFC 80053C5C 8E180000 */ lw $t8, ($s0)
glabel L80053C60
/* ACAE00 80053C60 860F003C */ lh $t7, 0x3c($s0)
/* ACAE04 80053C64 3C013F80 */ li $at, 0x3F800000 # 0.000000
/* ACAE08 80053C68 44813000 */ mtc1 $at, $f6
@ -1124,6 +1134,8 @@ glabel Camera_Unique9
/* ACAEAC 80053D0C 8D86000C */ lw $a2, 0xc($t4)
/* ACAEB0 80053D10 E620007C */ swc1 $f0, 0x7c($s1)
/* ACAEB4 80053D14 8E030000 */ lw $v1, ($s0)
glabel L80053D18
/* ACAEB8 80053D18 860D003C */ lh $t5, 0x3c($s0)
/* ACAEBC 80053D1C 3C013F80 */ li $at, 0x3F800000 # 0.000000
/* ACAEC0 80053D20 44819000 */ mtc1 $at, $f18
@ -1208,6 +1220,8 @@ glabel Camera_Unique9
/* ACAFF4 80053E54 A622015A */ sh $v0, 0x15a($s1)
/* ACAFF8 80053E58 100000E0 */ b .L800541DC
/* ACAFFC 80053E5C 2626005C */ addiu $a2, $s1, 0x5c
glabel L80053E60
/* ACB000 80053E60 26070004 */ addiu $a3, $s0, 4
/* ACB004 80053E64 260E0010 */ addiu $t6, $s0, 0x10
/* ACB008 80053E68 AFAE0024 */ sw $t6, 0x24($sp)
@ -1248,6 +1262,8 @@ glabel Camera_Unique9
/* ACB094 80053EF4 27A600E4 */ addiu $a2, $sp, 0xe4
/* ACB098 80053EF8 10000016 */ b .L80053F54
/* ACB09C 80053EFC 8E030000 */ lw $v1, ($s0)
glabel L80053F00
/* ACB0A0 80053F00 C60C0010 */ lwc1 $f12, 0x10($s0)
/* ACB0A4 80053F04 C62E0074 */ lwc1 $f14, 0x74($s1)
/* ACB0A8 80053F08 8C66000C */ lw $a2, 0xc($v1)
@ -1269,6 +1285,8 @@ glabel Camera_Unique9
/* ACB0E8 80053F48 8DA6000C */ lw $a2, 0xc($t5)
/* ACB0EC 80053F4C E620007C */ swc1 $f0, 0x7c($s1)
/* ACB0F0 80053F50 8E030000 */ lw $v1, ($s0)
glabel L80053F54
.L80053F54:
/* ACB0F4 80053F54 C60C0004 */ lwc1 $f12, 4($s0)
/* ACB0F8 80053F58 C62E0050 */ lwc1 $f14, 0x50($s1)
@ -1306,6 +1324,8 @@ glabel Camera_Unique9
/* ACB178 80053FD8 A622015A */ sh $v0, 0x15a($s1)
/* ACB17C 80053FDC 1000007F */ b .L800541DC
/* ACB180 80053FE0 2626005C */ addiu $a2, $s1, 0x5c
glabel L80053FE4
/* ACB184 80053FE4 C60C0004 */ lwc1 $f12, 4($s0)
/* ACB188 80053FE8 C62E0050 */ lwc1 $f14, 0x50($s1)
/* ACB18C 80053FEC 8C66000C */ lw $a2, 0xc($v1)
@ -1396,10 +1416,14 @@ glabel Camera_Unique9
/* ACB2D4 80054134 A622015A */ sh $v0, 0x15a($s1)
/* ACB2D8 80054138 10000028 */ b .L800541DC
/* ACB2DC 8005413C 2626005C */ addiu $a2, $s1, 0x5c
glabel L80054140
/* ACB2E0 80054140 860E0034 */ lh $t6, 0x34($s0)
/* ACB2E4 80054144 2626005C */ addiu $a2, $s1, 0x5c
/* ACB2E8 80054148 10000024 */ b .L800541DC
/* ACB2EC 8005414C A60E0036 */ sh $t6, 0x36($s0)
glabel L80054150
/* ACB2F0 80054150 86220162 */ lh $v0, 0x162($s1)
/* ACB2F4 80054154 00002825 */ move $a1, $zero
/* ACB2F8 80054158 04410003 */ bgez $v0, .L80054168
@ -1413,6 +1437,8 @@ glabel Camera_Unique9
/* ACB314 80054174 030A6021 */ addu $t4, $t8, $t2
/* ACB318 80054178 0C016813 */ jal Camera_ChangeMode
/* ACB31C 8005417C 8D840790 */ lw $a0, 0x790($t4)
glabel L80054180
/* ACB320 80054180 86220162 */ lh $v0, 0x162($s1)
/* ACB324 80054184 8FAF0034 */ lw $t7, 0x34($sp)
/* ACB328 80054188 04410003 */ bgez $v0, .L80054198
@ -1432,6 +1458,8 @@ glabel Camera_Unique9
/* ACB35C 800541BC 8DF80008 */ lw $t8, 8($t7)
/* ACB360 800541C0 0C016B99 */ jal func_8005AE64
/* ACB364 800541C4 AE380064 */ sw $t8, 0x64($s1)
glabel L800541C8
.L800541C8:
/* ACB368 800541C8 862A0164 */ lh $t2, 0x164($s1)
/* ACB36C 800541CC 2626005C */ addiu $a2, $s1, 0x5c

View file

@ -25,7 +25,28 @@ glabel D_8012DE1C
.incbin "baserom.z64", 0xBA4FBC, 0x210
glabel D_8012E02C
.incbin "baserom.z64", 0xBA51CC, 0xE64
.incbin "baserom.z64", 0xBA51CC, 0x64
glabel D_8012E090
.incbin "baserom.z64", 0xBA5230, 0x200
glabel D_8012E290
.incbin "baserom.z64", 0xBA5430, 0x200
glabel D_8012E490
.incbin "baserom.z64", 0xBA5630, 0x200
glabel D_8012E690
.incbin "baserom.z64", 0xBA5830, 0x200
glabel D_8012E890
.incbin "baserom.z64", 0xBA5A30, 0x200
glabel D_8012EA90
.incbin "baserom.z64", 0xBA5C30, 0x200
glabel D_8012EC90
.incbin "baserom.z64", 0xBA5E30, 0x200
glabel D_8012EE90
.incbin "baserom.z64", 0xBA6030, 0x200

View file

@ -187,7 +187,28 @@ glabel D_8016BABC
.space 0x4
glabel D_8016BAC0
.space 0xEE0
.space 0x10
glabel D_8016BAD0
.space 0x1B0
glabel D_8016BC80
.space 0x240
glabel D_8016BEC0
.space 0x420
glabel D_8016C2E0
.space 0x3C0
glabel D_8016C6A0
.space 0x180
glabel D_8016C820
.space 0x90
glabel D_8016C8B0
.space 0xF0
glabel D_8016C9A0
.space 0x1800

View file

@ -10,13 +10,15 @@
.balign 16
glabel gWaveSamples
.incbin "baserom.z64", 0xBA6230, 0x8
glabel D_8012F098
.incbin "baserom.z64", 0xBA6238, 0x18
glabel D_8012F0B0
.incbin "baserom.z64", 0xBA6250, 0x4
.word D_8012E090
.word D_8012E290
.word D_8012E490
.word D_8012E690
.word D_8012E890
.word D_8012EA90
.word D_8012EC90
.word D_8012EE90
.word D_8012EE90
glabel D_8012F0B4
.incbin "baserom.z64", 0xBA6254, 0x200

View file

@ -10,7 +10,7 @@
.balign 16
glabel D_801304D0
.incbin "baserom.z64", 0xBA7670, 0x4
.word osEPiStartDma
glabel D_801304D4
.incbin "baserom.z64", 0xBA7674, 0x4

View file

@ -235,16 +235,25 @@ glabel D_80130F80
.incbin "baserom.z64", 0xBA8120, 0x180
glabel D_80131100
.incbin "baserom.z64", 0xBA82A0, 0x60C
.incbin "baserom.z64", 0xBA82A0, 0x600
glabel D_80131700
.incbin "baserom.z64", 0xBA88A0, 0xC
glabel D_8013170C
.incbin "baserom.z64", 0xBA88AC, 0x134
.incbin "baserom.z64", 0xBA88AC, 0x94
glabel D_801317A0
.incbin "baserom.z64", 0xBA8940, 0xA0
glabel D_80131840
.incbin "baserom.z64", 0xBA89E0, 0x14
.word D_80130F80
glabel D_80131844
.incbin "baserom.z64", 0xBA89E4, 0x10
glabel D_80131854
.incbin "baserom.z64", 0xBA89F4, 0x4
.word D_80131844
glabel D_80131858
.incbin "baserom.z64", 0xBA89F8, 0x4
@ -286,13 +295,13 @@ glabel D_8013188C
.incbin "baserom.z64", 0xBA8A2C, 0x358
glabel D_80131BE4
.incbin "baserom.z64", 0xBA8D84, 0x4
.word D_80131884
glabel D_80131BE8
.incbin "baserom.z64", 0xBA8D88, 0x4
.word D_80131700
glabel D_80131BEC
.incbin "baserom.z64", 0xBA8D8C, 0x4
.word D_801317A0
glabel D_80131BF0
.incbin "baserom.z64", 0xBA8D90, 0x10
@ -457,7 +466,35 @@ glabel D_80131F68
.incbin "baserom.z64", 0xBA9108, 0x4
glabel D_80131F6C
.incbin "baserom.z64", 0xBA910C, 0x13B0
.incbin "baserom.z64", 0xBA910C, 0x4
glabel D_80131F70
.incbin "baserom.z64", 0xBA9110, 0x7CC
glabel D_8013273C
.incbin "baserom.z64", 0xBA98DC, 0x380
glabel D_80132ABC
.incbin "baserom.z64", 0xBA9C5C, 0x140
glabel D_80132BFC
.incbin "baserom.z64", 0xBA9D9C, 0x3E0
glabel D_80132FDC
.incbin "baserom.z64", 0xBAA17C, 0x120
glabel D_801330FC
.incbin "baserom.z64", 0xBAA29C, 0x20
glabel D_8013311C
.incbin "baserom.z64", 0xBAA2BC, 0x200
glabel D_8013331C
.incbin "baserom.z64", 0xBAA4BC, 0x24
.word D_8013273C
.word D_80132ABC
.word D_80132BFC
.word D_80131F70
.word D_80132FDC
.word D_801330FC
.word D_8013311C
.incbin "baserom.z64", 0xBAA4D8, 0x8

View file

@ -28,7 +28,13 @@ glabel D_801333A4
.incbin "baserom.z64", 0xBAA544, 0x4
glabel D_801333A8
.incbin "baserom.z64", 0xBAA548, 0x1C
.word D_8016BAD0
.word D_8016BC80
.word D_8016BEC0
.word D_8016C2E0
.word D_8016C6A0
.word D_8016C820
.word D_8016C8B0
glabel D_801333C4
.incbin "baserom.z64", 0xBAA564, 0x8

View file

@ -28,7 +28,40 @@ glabel D_80133414
.incbin "baserom.z64", 0xBAA5B4, 0x4
glabel D_80133418
.incbin "baserom.z64", 0xBAA5B8, 0x3B0
.incbin "baserom.z64", 0xBAA5B8, 0x8
glabel D_80133420
.incbin "baserom.z64", 0xBAA5C0, 0x48
glabel D_80133468
.incbin "baserom.z64", 0xBAA608, 0x48
glabel D_801334B0
.incbin "baserom.z64", 0xBAA650, 0x90
glabel D_80133540
.incbin "baserom.z64", 0xBAA6E0, 0x48
glabel D_80133588
.incbin "baserom.z64", 0xBAA728, 0x48
glabel D_801335D0
.incbin "baserom.z64", 0xBAA770, 0x48
glabel D_80133618
.incbin "baserom.z64", 0xBAA7B8, 0x48
glabel D_80133660
.incbin "baserom.z64", 0xBAA800, 0x48
glabel D_801336A8
.incbin "baserom.z64", 0xBAA848, 0x48
glabel D_801336F0
.incbin "baserom.z64", 0xBAA890, 0x48
glabel D_80133738
.incbin "baserom.z64", 0xBAA8D8, 0x90
glabel D_801337C8
.incbin "baserom.z64", 0xBAA968, 0x5
@ -37,4 +70,76 @@ glabel D_801337CD
.incbin "baserom.z64", 0xBAA96D, 0x1
glabel D_801337CE
.incbin "baserom.z64", 0xBAA96E, 0x3F2
.incbin "baserom.z64", 0xBAA96E, 0x6
glabel D_801337D4
.word D_80133420
.incbin "baserom.z64", 0xBAA978, 0x34
glabel D_8013380C
.word D_80133468
.incbin "baserom.z64", 0xBAA9B0, 0x34
glabel D_80133844
.word D_801334B0
.incbin "baserom.z64", 0xBAA9E8, 0x34
glabel D_8013387C
.word D_80133540
.incbin "baserom.z64", 0xBAAA20, 0x34
glabel D_801338B4
.word D_80133588
.incbin "baserom.z64", 0xBAAA58, 0x34
glabel D_801338EC
.word D_801335D0
.incbin "baserom.z64", 0xBAAA90, 0x34
glabel D_80133924
.word D_80133618
.incbin "baserom.z64", 0xBAAAC8, 0x34
glabel D_8013395C
.word D_80133660
.incbin "baserom.z64", 0xBAAB00, 0x34
glabel D_80133994
.word D_801336A8
.incbin "baserom.z64", 0xBAAB38, 0x34
glabel D_801339CC
.word D_80133660
.incbin "baserom.z64", 0xBAAB70, 0x34
glabel D_80133A04
.word D_801336F0
.incbin "baserom.z64", 0xBAABA8, 0x34
glabel D_80133A3C
.word D_80133738
.incbin "baserom.z64", 0xBAABE0, 0x34
glabel D_80133A74
.word D_80133738
.incbin "baserom.z64", 0xBAAC18, 0x34
glabel D_80133AAC
.word D_80133420
.incbin "baserom.z64", 0xBAAC50, 0x34
glabel D_80133AE4
.word D_80133660
.incbin "baserom.z64", 0xBAAC88, 0x34
glabel D_80133B1C
.word D_80133420
.incbin "baserom.z64", 0xBAACC0, 0x34
glabel D_80133B54
.word D_80133420
.incbin "baserom.z64", 0xBAACF8, 0x34
glabel D_80133B8C
.word D_801334B0
.incbin "baserom.z64", 0xBAAD30, 0x30