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

z_bg_jya_ironobj and object_jya_iron OK (#676)

Browse source 
* z_bg_jya_ironobj OK

* decompile object_jya_iron, clean up code

* implement requested changes
This commit is contained in:
mzxrules 2021-02-13 19:10:40 -05:00 • committed by GitHub
parent f9886c1097
commit d615ec4f31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 246 additions and 966 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,40 +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
.word 0x00000000
glabel Bg_Jya_Ironobj_InitVars
.word 0x01690600, 0x00000000, 0x016C0000, 0x000001B4
.word BgJyaIronobj_Init
.word BgJyaIronobj_Destroy
.word BgJyaIronobj_Update
.word BgJyaIronobj_Draw
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, 0x00, 0x00, 0x87, 0x00, 0x40, 0x00, 0xC0, 0x00, 0x00, 0x00
glabel D_808994E0
.word 0x00050008, 0x000B000E, 0x00110014, 0x0017001A
glabel D_808994F0
.word 0x0012001A, 0x0022002A, 0x0032003C, 0x00460050
glabel D_80899500
.word 0x0030002A, 0x00240020, 0x001C0018, 0x00140010
glabel D_80899510
.word 0x00050008, 0x000B000E, 0x00110014, 0x0017001A
glabel D_80899520
.word 0x0012001A, 0x0022002A, 0x0032003C, 0x00460050
glabel D_80899530
.word 0x0030002A, 0x00240020, 0x001C0018, 0x00140010
glabel D_80899540
.word 0xC8500064, 0xB0F403E8, 0xB0F801F4, 0x30FC03E8
glabel D_80899550
.word 0x06000D48, 0x06001430
glabel D_80899558
.word func_80898920
.word func_80898DB4

13
data/overlays/actors/z_bg_jya_ironobj.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_80899620
.incbin "baserom/ovl_Bg_Jya_Ironobj", 0xD80, 0x00000120