1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 15:30:14 +00:00

Obj_Syokudai (#412)

* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* torches

* Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* cleanup

* Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* small cleanup

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
petrie911 2020-10-04 07:54:09 -05:00 committed by GitHub
parent a52743e8cd
commit 4ac8e70f5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 263 additions and 880 deletions

View file

@ -1,14 +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 .bss
.balign 16
glabel D_80B9FF90
.space 0x10

View file

@ -1,28 +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_Syokudai_InitVars
.word 0x005E0600, 0x00000410, 0x00A40000, 0x000001FC
.word ObjSyokudai_Init
.word ObjSyokudai_Destroy
.word ObjSyokudai_Update
.word ObjSyokudai_Draw
glabel D_80B9FE10
.word 0x09000D39, 0x20010000, 0x02000000, 0x00100000, 0x00000000, 0xEE01FFFF, 0x00000000, 0x00050100, 0x000C002D, 0x00000000, 0x00000000
glabel D_80B9FE3C
.word 0x0A000900, 0x00010000, 0x02000000, 0x00000000, 0x00000000, 0x00020820, 0x00000000, 0x00010000, 0x000F002D, 0x002D0000, 0x00000000
glabel D_80B9FE68
.word 0xC85003E8, 0xB0F40FA0, 0xB0F80320, 0x30FC0320
glabel D_80B9FE78
.word 0x090B0B00
glabel D_80B9FE7C
.word 0x060003A0, 0x06000B90, 0x06000870, 0x00000000, 0x00000000

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_80B9FEF0
.incbin "baserom/ovl_Obj_Syokudai", 0xC40, 0x000000A0