mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-10 17:00:19 +00:00
Code Issues Projects Releases Wiki Activity

Remove some unaligned fake symbols (#535)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* a few fake syms

* two more

* format
This commit is contained in:
petrie911 2020-12-16 21:10:42 -06:00 • committed by GitHub
parent 5632df406b
commit 6e78efd0c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 60 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

4
data/overlays/actors/z_bg_hidan_rock.data.s
View file

@ -20,9 +20,7 @@ glabel Bg_Hidan_Rock_InitVars
.word BgHidanRock_Update
.word BgHidanRock_Draw
glabel D_8088BF8C
.byte 0x0A, 0x11, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x2D
glabel D_8088BFAE
.byte 0x00, 0x4D, 0xFF, 0xD8, 0x0C, 0xEE, 0x00, 0x78, 0x00, 0x00
.byte 0x0A, 0x11, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x00, 0x4D, 0xFF, 0xD8, 0x0C, 0xEE, 0x00, 0x78, 0x00, 0x00
glabel D_8088BFB8
.word 0xC8500064, 0x386CFDA8
glabel D_8088BFC0

6
data/overlays/actors/z_bg_ice_shelter.data.s
View file

@ -28,11 +28,7 @@ glabel D_80891738
glabel D_80891764
.word 0x002F0021, 0x002C0029, 0x00640000
glabel D_80891770
.byte 0x00, 0x50
glabel D_80891772
.byte 0x00, 0x36, 0x00, 0x5A, 0x00, 0x3C
glabel D_80891778
.word 0x00C80000
.byte 0x00, 0x50, 0x00, 0x36, 0x00, 0x5A, 0x00, 0x3C, 0x00, 0xC8, 0x00, 0x00
glabel D_8089177C
.word 0xB0F404B0, 0xB0F801F4, 0x30FC03E8
glabel D_80891788

4
data/overlays/actors/z_bg_jya_ironobj.data.s
View file

@ -17,9 +17,7 @@ glabel Bg_Jya_Ironobj_InitVars
glabel D_808994A4
.word 0x06000240, 0x06001050
glabel D_808994AC
.byte 0x0A, 0x00, 0x11, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
glabel D_808994D6
.byte 0x00, 0x00, 0x87, 0x00, 0x40, 0x00, 0xC0, 0x00, 0x00, 0x00
.byte 0x0A, 0x00, 0x11, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, 0x00, 0x40, 0x00, 0xC0, 0x00, 0x00, 0x00
glabel D_808994E0
.word 0x00050008, 0x000B000E, 0x00110014, 0x0017001A
glabel D_808994F0

12
data/overlays/actors/z_demo_6k.data.s
View file

@ -22,9 +22,9 @@ glabel D_809692F8
glabel D_8096930C
.word 0x3F800000, 0x3F851EB8, 0x3F800000, 0x3F75C28F
glabel D_8096931C
.byte 0x3F, 0x8C, 0xCC, 0xCD, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x66
glabel D_80969326
.byte 0x66, 0x66, 0x3F, 0x4C, 0xCC, 0xCD, 0x01, 0x13, 0x01, 0x13, 0x01, 0x13, 0x01, 0x13, 0x01, 0x13, 0x01, 0x13
.byte 0x3F, 0x8C, 0xCC, 0xCD, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x4C, 0xCC, 0xCD
glabel D_8096932C
.byte 0x01, 0x13, 0x01, 0x13, 0x01, 0x13, 0x01, 0x13, 0x01, 0x13, 0x01, 0x13
glabel D_80969338
.word 0x00000000
glabel D_8096933C
@ -38,11 +38,7 @@ glabel D_80969348
glabel D_80969350
.word 0xFFFFFF00
glabel D_80969354
.byte 0xFF
glabel D_80969355
.byte 0x96
glabel D_80969356
.byte 0x00, 0x00
.byte 0xFF, 0x96, 0x00, 0x00
glabel D_80969358
.word 0x00000000
glabel D_8096935C

8
data/overlays/actors/z_en_dekubaba.data.s
View file

@ -25,13 +25,9 @@ glabel D_809E8FC8
glabel D_809E8FD8
.word 0x02000019, 0x0019FF00
glabel D_809E8FE0
.byte 0x10, 0x02, 0x01, 0x02, 0xE2, 0x02, 0x02, 0x02, 0xF1, 0xF2, 0xF4, 0x24, 0x02, 0x02, 0x02, 0x02, 0x02, 0x24, 0x00, 0x00, 0x00, 0x00, 0xF1, 0xF4, 0xF2, 0xF2, 0xF8
glabel D_809E8FFB
.byte 0xF4, 0x00, 0x00, 0x04, 0x00
.byte 0x10, 0x02, 0x01, 0x02, 0xE2, 0x02, 0x02, 0x02, 0xF1, 0xF2, 0xF4, 0x24, 0x02, 0x02, 0x02, 0x02, 0x02, 0x24, 0x00, 0x00, 0x00, 0x00, 0xF1, 0xF4, 0xF2, 0xF2, 0xF8, 0xF4, 0x00, 0x00, 0x04, 0x00
glabel D_809E9000
.byte 0x10, 0x02, 0x01, 0x02, 0xE2, 0x02, 0x02, 0x10, 0xF1, 0xF2, 0xF4, 0x24, 0x02, 0x02, 0x02, 0x02, 0x02, 0x24, 0x00, 0x00, 0x00, 0x00, 0xF1, 0xF4, 0xF2, 0xF2, 0xF8
glabel D_809E901B
.byte 0xF4, 0x00, 0x00, 0x04, 0x00
.byte 0x10, 0x02, 0x01, 0x02, 0xE2, 0x02, 0x02, 0x10, 0xF1, 0xF2, 0xF4, 0x24, 0x02, 0x02, 0x02, 0x02, 0x02, 0x24, 0x00, 0x00, 0x00, 0x00, 0xF1, 0xF4, 0xF2, 0xF2, 0xF8, 0xF4, 0x00, 0x00, 0x04, 0x00
glabel D_809E9020
.word 0x304C05DC
glabel D_809E9024

4
data/overlays/actors/z_en_eiyer.data.s
View file

@ -16,9 +16,7 @@ glabel En_Eiyer_InitVars
.word EnEiyer_Update
.word EnEiyer_Draw
glabel D_80A01970
.byte 0x00, 0x11, 0x09, 0x39, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x01, 0x00, 0x00, 0x1B
glabel D_80A01992
.byte 0x00, 0x11, 0xFF, 0xF6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x11, 0x09, 0x39, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x01, 0x00, 0x00, 0x1B, 0x00, 0x11, 0xFF, 0xF6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
glabel D_80A0199C
.word 0x0200002D, 0x000F6400
glabel D_80A019A4

4
data/overlays/actors/z_en_weiyer.data.s
View file

@ -16,9 +16,7 @@ glabel En_Weiyer_InitVars
.word EnWeiyer_Update
.word EnWeiyer_Draw
glabel D_80B33A90
.byte 0x00, 0x10, 0x09, 0x39, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x00, 0x08, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x01, 0x00, 0x00, 0x10
glabel D_80B33AB2
.byte 0x00, 0x0A, 0xFF, 0xFA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x10, 0x09, 0x39, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x00, 0x08, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x01, 0x00, 0x00, 0x10, 0x00, 0x0A, 0xFF, 0xFA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
glabel D_80B33ABC
.word 0x0200002D, 0x000F6400
glabel D_80B33AC4

4
data/overlays/actors/z_en_wood02.data.s
View file

@ -20,9 +20,7 @@ glabel D_80B3BF00
glabel D_80B3BF2C
.word 0x4430C000, 0x44034000, 0x43FF0000, 0x43FA0000, 0x440D8000, 0x430D0000
glabel D_80B3BF44
.byte 0x1F, 0xFF, 0x4C, 0x9E, 0x77, 0xF5, 0xA5, 0xC9, 0xD6, 0xC3
glabel D_80B3BF4E
.byte 0xA0, 0x00
.byte 0x1F, 0xFF, 0x4C, 0x9E, 0x77, 0xF5, 0xA5, 0xC9, 0xD6, 0xC3, 0xA0, 0x00
glabel D_80B3BF50
.word 0x304C15E0
glabel D_80B3BF54