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

Obj_Hamishi OK (#539)

Browse source 
* obj_hamishi OK

* Update src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* made suggested changes

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Zelllll 2020-12-20 12:39:06 -06:00 • committed by GitHub
parent 5c8e745645
commit 06ceb6ad40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 173 additions and 609 deletions
Download patch file Download diff file Expand all files Collapse all files

26
data/overlays/actors/z_obj_hamishi.data.s
View file

@ -1,26 +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 Obj_Hamishi_InitVars
.word 0x01D20600, 0x00000000, 0x00020000, 0x000001A8
.word ObjHamishi_Init
.word ObjHamishi_Destroy
.word ObjHamishi_Update
.word ObjHamishi_Draw
glabel D_80B93750
.word 0x0C000D39, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x4FC1FFF6, 0x00000000, 0x00010100, 0x00320046, 0x00000000, 0x00000000
glabel D_80B9377C
.word 0x0000000C, 0x003CFF00
glabel D_80B93784
.word 0x00910087, 0x00730055, 0x004B0035, 0x002D0028, 0x00230000
glabel D_80B93798
.word 0xC8500190, 0xB0F407D0, 0xB0F800FA, 0x30FC01F4, 0x00000000, 0x00000000

13
data/overlays/actors/z_obj_hamishi.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_80B937F0
.incbin "baserom/ovl_Obj_Hamishi", 0x860, 0x00000070