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

EnNy OK (#624)

Browse source 
* get data in

* Match Init and one other

* match some more

* match a bunch more

* merge master

* OK

* Some naming done

* OBJECT_NY almost done. waiting on ZAP changes

* Remove ASM

* Cleanup

* Commit before merge

* fix damage table

* Change comment
This commit is contained in:
louist103 2021-01-31 15:32:55 -05:00 • committed by GitHub
parent a25ae3a584
commit 45a21b0ac7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 576 additions and 1814 deletions
Download patch file Download diff file Expand all files Collapse all files

33
data/overlays/actors/z_en_ny.data.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 purpose registers
.section .data
.balign 16
glabel En_Ny_InitVars
.word 0x00EC0500, 0x00000005, 0x00E50000, 0x000002B8
.word EnNy_Init
.word EnNy_Destroy
.word EnNy_Update
.word EnNy_Draw
glabel D_80ABE330
.word 0x00000000, 0xFFCFFFFF, 0x04080000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x00000000, 0x00000000, 0x000F0064
glabel D_80ABE354
.word 0x0A110939, 0x10000000, 0x00000001
.word D_80ABE330
glabel D_80ABE364
.word 0x000000F2, 0x00F2F212, 0x00F2F424, 0xF2F2E400, 0x00240000, 0x000000F4, 0xF200F8F4, 0x00000000
glabel D_80ABE384
.word 0x89170028, 0x801F0002, 0x304C001E
glabel D_80ABE390
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80ABE39C
.word 0x00000000, 0x3DCCCCCD, 0x00000000
glabel D_80ABE3A8
.word 0x40A00000, 0x00000000, 0x00000000, 0xC0A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x40A00000, 0x00000000, 0x00000000, 0xC0A00000, 0x00000000, 0x00000000

13
data/overlays/actors/z_en_ny.reloc.s
View file

@ -1,13 +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 purpose registers
.section .rodata
.balign 16
glabel D_80ABE4F0
.incbin "baserom/ovl_En_Ny", 0x1940, 0x000001B0