mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

23
data/code_800D7CD0.data.s
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

23
data/code_800DACC0.bss.s
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

16
data/code_800DACC0.data.s
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

2
data/code_800E11F0.data.s
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

55
data/code_800EC960.data.s
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

8
data/code_800F7260.data.s
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

109
data/code_800F9280.data.s
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