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

z_obj_kibako2 (large wooden crate) OK (#582)

Browse source 
* Migrate data to C

* Partially decompile Init

* func_80B959D0 OK

* ObjKibako2_Destroy OK

* ObjKibako2_Update OK

* ObjKibako2_Draw OK

* func_80B95CA4 OK

* ObjKibako2_Init OK

* func_80B95DFC

* func_80B95ED4 OK

* func_80B95A28 OK

* Name functions

* Delete unused asm and update spec

* Fixup math post rebase

* Name statics

* Clean up variable names

* Run formatter

* xzDistFromLink -> xzDistToLink

* Respond to feedback in ObjKibako2_Break

* Type sp2C as a CollisionHeader* and initalize it when declaring it

* Respond to remaining review feedback

* Respond to review feedback from Roman
This commit is contained in:
Tom Overton 2021-01-14 10:22:48 -08:00 • committed by GitHub
parent 3e5f6b3485
commit 3b4a1c23d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 140 additions and 488 deletions
Download patch file Download diff file Expand all files Collapse all files

22
data/overlays/actors/z_obj_kibako2.data.s
View file

@ -1,22 +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_Kibako2_InitVars
.word 0x01A00100, 0x00000000, 0x01700000, 0x000001B8
.word ObjKibako2_Init
.word ObjKibako2_Destroy
.word ObjKibako2_Update
.word ObjKibako2_Draw
glabel D_80B95FD0
.word 0x0A000900, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x40000040, 0x00000000, 0x00010000, 0x001F0030, 0x00000000, 0x00000000
glabel D_80B95FFC
.word 0xC8500064, 0xB0F40BB8, 0xB0F801F4, 0x30FC03E8, 0x00000000

13
data/overlays/actors/z_obj_kibako2.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_80B96050
.incbin "baserom/ovl_Obj_Kibako2", 0x680, 0x00000080