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

ovl_Item_Etcetera OK (#281)

Browse source 
* started item_etcetera

* ovl_Item_Etcetera OK

* z_item_etcetera cleanup

* fixed

* removed padding

* z_item_etcetera updates

* made suggested changes

* change member in enum
This commit is contained in:
Lucas Shaw 2020-07-28 21:17:26 -07:00 • committed by GitHub
parent b35f2007ad
commit c3421dda0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 207 additions and 643 deletions
Download patch file Download diff file Expand all files Collapse all files

38
data/overlays/actors/z_item_etcetera.data.s
View file

@ -1,38 +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 Item_Etcetera_InitVars
.word 0x010F0600, 0x00000010, 0x00010000, 0x00000160
.word ItemEtcetera_Init
.word ItemEtcetera_Destroy
.word ItemEtcetera_Update
.word 0x00000000
glabel D_80B85D20
.word 0x00C6010B, 0x00DC00BE, 0x00DB00DB, 0x00AA0158, 0x017F017F, 0x017F017F, 0x00BD00AA
glabel D_80B85D3C
.word 0x00000044, 0x002B0015, 0x0029002A, 0x0001005F, 0x006C006D, 0x006E0070, 0x00130001
glabel D_80B85D58
.word 0x000F0015, 0x002A0030, 0x00370038, 0x00420058, 0x00000000, 0x00000000, 0x00000000
glabel D_80B85D74
.word 0x00000000
glabel D_80B85D78
.word 0x3E4CCCCD
glabel D_80B85D7C
.word 0x00000000
glabel D_80B85D80
.word 0x00000000
glabel D_80B85D84
.word 0x3D4CCCCD, 0x00000000
glabel D_80B85D8C
.word 0xFFFFFF00
glabel D_80B85D90
.word 0xFF323200, 0x00000000, 0x00000000, 0x00000000

13
data/overlays/actors/z_item_etcetera.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_80B85E70
.incbin "baserom/ovl_Item_Etcetera", 0x880, 0x00000170