mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-09-01 09:43:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix ROM and function pointers in overlays (#88)

Browse Source 
* Fix ROM pointers in overlays

ROM pointers are fewer but much harder to find so hopefully this is all of them.

* Fix function pointers in overlay data
This commit is contained in:
Roman971
2020-04-22 19:44:11 +02:00
committed by GitHub
parent 3c440ef7f1
commit 26b8e77f99
9 changed files with 126 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/overlays/actors/z_en_girla.data.s
+36 -36
View File
@@ -69,23 +69,23 @@ glabel D_80A3C658
glabel D_80A3C668
.word 0x70B670B5, 0x70B470B7, 0x70BB0000
glabel D_80A3C674
.word 0x00BB0011, 0x8002ED80, 0x000F0005, 0x00B2007F, 0x00000063
.word 0x00BB0011, func_8002ED80, 0x000F0005, 0x00B2007F, 0x00000063
.word func_80A3ABF8
.word func_80A3B714
.word func_80A3BB6C
.word 0x00D80025, 0x8002EBCC, 0x003C001E, 0x00C1009B, 0x0000004A
.word 0x00D80025, func_8002EBCC, 0x003C001E, 0x00C1009B, 0x0000004A
.word func_80A3AAA8
.word func_80A3B634
.word func_80A3BB6C
.word 0x00D80026, 0x8002EBCC, 0x005A0032, 0x00B0007D, 0x0000004B
.word 0x00D80026, func_8002EBCC, 0x005A0032, 0x00B0007D, 0x0000004B
.word func_80A3AAA8
.word func_80A3B634
.word func_80A3BB6C
.word 0x00CE001F, 0x8002EBCC, 0x00190005, 0x00A3008B, 0x00000001
.word 0x00CE001F, func_8002EBCC, 0x00190005, 0x00A3008B, 0x00000001
.word func_80A3AB58
.word func_80A3B678
.word func_80A3BB6C
.word 0x00BB0011, 0x8002ED80, 0x001E000A, 0x00A20087, 0x00000064
.word 0x00BB0011, func_8002ED80, 0x001E000A, 0x00A20087, 0x00000064
.word func_80A3ABF8
.word func_80A3B714
.word func_80A3BB6C
@@ -93,35 +93,35 @@ glabel D_80A3C674
.word func_80A3ACAC
.word func_80A3B780
.word func_80A3BB6C
.word 0x00CE001F, 0x8002EBCC, 0x0032000A, 0x00B1007C, 0x00000066
.word 0x00CE001F, func_8002EBCC, 0x0032000A, 0x00B1007C, 0x00000066
.word func_80A3AB58
.word func_80A3B678
.word func_80A3BB6C
.word 0x00F4003E, 0x8002ED80, 0x00C80001, 0x00B3007E, 0x0000006C
.word 0x00F4003E, func_8002ED80, 0x00C80001, 0x00B3007E, 0x0000006C
.word func_80A3AD60
.word 0x00000000
.word func_80A3BB6C
.word 0x00EB0037, 0x8002EBCC, 0x001E0001, 0x00A5008E, 0x00000010
.word 0x00EB0037, func_8002EBCC, 0x001E0001, 0x00A5008E, 0x00000010
.word func_80A3ADD4
.word func_80A3BA40
.word func_80A3BB6C
.word 0x00EB0036, 0x8002EBCC, 0x001E0001, 0x00A6008F, 0x00000011
.word 0x00EB0036, func_8002EBCC, 0x001E0001, 0x00A6008F, 0x00000011
.word func_80A3AE48
.word func_80A3BA40
.word func_80A3BB6C
.word 0x00EB0038, 0x8002EBCC, 0x003C0001, 0x00A70090, 0x00000012
.word 0x00EB0038, func_8002EBCC, 0x003C0001, 0x00A70090, 0x00000012
.word func_80A3AEBC
.word func_80A3BA40
.word func_80A3BB6C
.word 0x00F80042, 0x8002EBCC, 0x03E80001, 0x00A80091, 0x00000028
.word 0x00F80042, func_8002EBCC, 0x03E80001, 0x00A80091, 0x00000028
.word func_80A3AF30
.word func_80A3B7BC
.word func_80A3BB6C
.word 0x00DC002B, 0x8002EBCC, 0x00500001, 0x00A90092, 0x0000002A
.word 0x00DC002B, func_8002EBCC, 0x00500001, 0x00A90092, 0x0000002A
.word func_80A3AFC4
.word func_80A3B800
.word func_80A3BB6C
.word 0x00CB001C, 0x8002EBCC, 0x00280001, 0x009F0089, 0x00000029
.word 0x00CB001C, func_8002EBCC, 0x00280001, 0x009F0089, 0x00000029
.word func_80A3B040
.word func_80A3B83C
.word func_80A3BB6C
@@ -143,7 +143,7 @@ glabel D_80A3C674
.word func_80A3B250
.word func_80A3B92C
.word func_80A3BB6C
.word 0x00DA0028, 0x8002EBCC, 0x00640001, 0x00AE0099, 0x00000047
.word 0x00DA0028, func_8002EBCC, 0x00640001, 0x00AE0099, 0x00000047
.word func_80A3B2AC
.word func_80A3B968
.word func_80A3BB6C
@@ -153,59 +153,59 @@ glabel D_80A3C674
.word func_80A3B308
.word func_80A3B9A4
.word func_80A3BB6C
.word 0x00DA0028, 0x8002EBCC, 0x27100001, 0x00B50085, 0x00000000
.word 0x00DA0028, func_8002EBCC, 0x27100001, 0x00B50085, 0x00000000
.word func_80A3B318
.word func_80A3B9D4
.word func_80A3BB6C
.word 0x00D90027, 0x8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003
.word 0x00D90027, func_8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003
.word func_80A3B328
.word 0x00000000
.word func_80A3BC6C
.word 0x00D90027, 0x8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B
.word 0x00D90027, func_8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B
.word func_80A3B328
.word 0x00000000
.word func_80A3BC6C
.word 0x00D90027, 0x8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B
.word 0x00D90027, func_8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B
.word func_80A3B328
.word 0x00000000
.word func_80A3BC6C
.word 0x00D90027, 0x8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003
.word 0x00D90027, func_8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003
.word func_80A3B328
.word 0x00000000
.word func_80A3BC6C
.word 0x00D90027, 0x8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003
.word 0x00D90027, func_8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003
.word func_80A3B328
.word 0x00000000
.word func_80A3BC6C
.word 0x00D90027, 0x8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B
.word 0x00D90027, func_8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B
.word func_80A3B328
.word 0x00000000
.word func_80A3BC6C
.word 0x00D90027, 0x8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B
.word 0x00D90027, func_8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B
.word func_80A3B328
.word 0x00000000
.word func_80A3BC6C
.word 0x00D90027, 0x8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003
.word 0x00D90027, func_8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003
.word func_80A3B328
.word 0x00000000
.word func_80A3BC6C
.word 0x01190047, 0x8002EBCC, 0x001E001E, 0x00DF00DE, 0x00000069
.word 0x01190047, func_8002EBCC, 0x001E001E, 0x00DF00DE, 0x00000069
.word func_80A3B3A8
.word func_80A3BA04
.word func_80A3BB6C
.word 0x01340030, 0x8002EBCC, 0x00000001, 0x70B270BE, 0x0000001A
.word 0x01340030, func_8002EBCC, 0x00000001, 0x70B270BE, 0x0000001A
.word func_80A3B3A8
.word func_80A3BA04
.word func_80A3BB6C
.word 0x01350031, 0x8002EBCC, 0x00000001, 0x70B170BD, 0x00000018
.word 0x01350031, func_8002EBCC, 0x00000001, 0x70B170BD, 0x00000018
.word func_80A3B3A8
.word func_80A3BA04
.word func_80A3BB6C
.word 0x0136004E, 0x8002EBCC, 0x00000001, 0x70B070BC, 0x00000017
.word 0x0136004E, func_8002EBCC, 0x00000001, 0x70B070BC, 0x00000017
.word func_80A3B3A8
.word func_80A3BA04
.word func_80A3BB6C
.word 0x0137004F, 0x8002EBCC, 0x00000001, 0x70B370BF, 0x0000001B
.word 0x0137004F, func_8002EBCC, 0x00000001, 0x70B370BF, 0x0000001B
.word func_80A3B3A8
.word func_80A3BA04
.word func_80A3BB6C
@@ -227,9 +227,9 @@ glabel D_80A3C674
.word func_80A3B3A8
.word func_80A3BA04
.word func_80A3BB6C
.word 0x01480058, 0x8002EBCC, 0x00000000, 0x00BD70C2, 0x00000053
.word 0x01480058, func_8002EBCC, 0x00000000, 0x00BD70C2, 0x00000053
.word func_80A3B454
.word 0x00000000, 0x00000000, 0x01730066, 0x8002EBCC, 0x012C0001, 0x00B900B8, 0x0000006E
.word 0x00000000, 0x00000000, 0x01730066, func_8002EBCC, 0x012C0001, 0x00B900B8, 0x0000006E
.word func_80A3B464
.word func_80A3BA40
.word func_80A3BB6C
@@ -257,27 +257,27 @@ glabel D_80A3C674
.word func_80A3B5C0
.word func_80A3BA40
.word func_80A3BB6C
.word 0x00D80024, 0x8002EBCC, 0x0014000A, 0x00A0008A, 0x00000049
.word 0x00D80024, func_8002EBCC, 0x0014000A, 0x00A0008A, 0x00000049
.word func_80A3AAA8
.word func_80A3B634
.word func_80A3BB6C
.word 0x00CE001F, 0x8002EBCC, 0x00500014, 0x001C0006, 0x00000067
.word 0x00CE001F, func_8002EBCC, 0x00500014, 0x001C0006, 0x00000067
.word func_80A3AB58
.word func_80A3B678
.word func_80A3BB6C
.word 0x00CE001F, 0x8002EBCC, 0x0078001E, 0x001D001E, 0x00000068
.word 0x00CE001F, func_8002EBCC, 0x0078001E, 0x001D001E, 0x00000068
.word func_80A3AB58
.word func_80A3B678
.word func_80A3BB6C
.word 0x00CE001F, 0x8002EBCC, 0x00230005, 0x00CB00CA, 0x00000001
.word 0x00CE001F, func_8002EBCC, 0x00230005, 0x00CB00CA, 0x00000001
.word func_80A3AB58
.word func_80A3B678
.word func_80A3BB6C
.word 0x00EB0037, 0x8002EBCC, 0x00280001, 0x00640062, 0x00000010
.word 0x00EB0037, func_8002EBCC, 0x00280001, 0x00640062, 0x00000010
.word func_80A3ADD4
.word func_80A3BA40
.word func_80A3BB6C
.word 0x00EB0037, 0x8002EBCC, 0x00320001, 0x00650063, 0x00000010
.word 0x00EB0037, func_8002EBCC, 0x00320001, 0x00650063, 0x00000010
.word func_80A3ADD4
.word func_80A3BA40
.word func_80A3BB6C
data/overlays/actors/z_en_viewer.data.s
+1 -1
View File
@@ -25,7 +25,7 @@ glabel D_80B2CFB0
.word func_80B2A300
.word func_80B2A448
glabel D_80B2CFC0
.word 0x00000000, 0x8002B5EC, 0x8002B644
.word 0x00000000, ActorShadow_DrawFunc_Circle, ActorShadow_DrawFunc_Squiggly
glabel D_80B2CFCC
.word 0x00000000
glabel D_80B2CFD0
data/overlays/actors/z_obj_makeoshihiki.data.s
+1 -1
View File
@@ -18,5 +18,5 @@ glabel D_80B988F0
glabel D_80B98948
.word 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000001
glabel D_80B98960
.word 0x8002CBB4, 0x8002CB74, 0x00000000, 0x00000000
.word Flags_UnsetSwitch, Flags_SetSwitch, 0x00000000, 0x00000000