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

fixed merge conflict

Browse source
This commit is contained in:
shawlucas 2020-03-21 18:13:55 -07:00
commit 08b73fe685
54 changed files with 833 additions and 1447 deletions
Download patch file Download diff file Expand all files Collapse all files

28
data/overlays/actors/z_en_dog.data.s
View file

@ -1,28 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purposee registers
.section .data
glabel En_Dog_InitVars
.word 0x019B0400, 0x00000000, 0x016B0000, 0x00000290
.word EnDog_Init
.word EnDog_Destroy
.word EnDog_Update
.word EnDog_Draw
glabel D_809FBF10
.word 0x06000939, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x00100014, 0x00000000, 0x00000000
glabel D_809FBF3C
.word 0x00000000, 0x00000000, 0x32000000
glabel D_809FBF48
.word 0x06001368, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0x00000000, 0x06001368, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC0C00000, 0x06000D78, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC0C00000, 0x06000278, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC0C00000, 0x06001150, 0x3F800000, 0x00000000, 0x40800000, 0x02000000, 0xC0C00000, 0x06001150, 0x3F800000, 0x40A00000, 0x41C80000, 0x04000000, 0xC0C00000, 0x06000928, 0x3F800000, 0x00000000, 0x40C00000, 0x02000000, 0xC0C00000, 0x06000C28, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC0C00000
glabel D_809FC008
.word 0x00000003, 0x00000005, 0x00000002
glabel D_809FC014
.word 0x00000028, 0x00000050, 0x00000014
glabel D_809FC020
.word 0xFFFFC800, 0x96643200, 0x00000000, 0x00000000

11
data/overlays/actors/z_en_dog.reloc.s
View file

@ -1,11 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purposee registers
.section .rodata
glabel D_809FC080
.incbin "baserom/ovl_En_Dog", 0x10B0, 0x00000150

33
data/overlays/actors/z_en_dog.rodata.s
View file

@ -1,33 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purposee registers
.section .rodata
glabel D_809FC030
.asciz "../z_en_dog.c"
.balign 4
glabel D_809FC040
.asciz "../z_en_dog.c"
.balign 4
glabel jtbl_809FC050
.word L809FB178
.word L809FB184
.word L809FB190
.word L809FB19C
.word L809FB1B0
.word L809FB1A8
glabel jtbl_809FC068
.word L809FB260
.word L809FB270
.word L809FB280
.word L809FB1E8
.word L809FB288
.word L809FB224