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

En_Torch2 (#486)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* Oh boy more giant functions

* now functional, but not equivalent

* Now only non-matching

* cleaned up illusion room

* much closer. static variables still suck though

* much closer. static variables still suck though

* some docs and cleanup. matching is horrible.

* static varaibles are a troublesome  lot

* ifdef

* merge ZAP

* merge again

* small cleanup

* small fixes

* swordstate

* resolve conflict

* comments and such

Co-authored-by: fig <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
This commit is contained in:
petrie911 2020-12-28 19:56:24 -06:00 • committed by GitHub
parent 1e6bd7f623
commit 42f2d38b8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 1148 additions and 949 deletions
Download patch file Download diff file Expand all files Collapse all files

60
data/overlays/actors/z_en_torch2.bss.s
View file

@ -1,60 +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_80B20130
.space 0x02
glabel D_80B20132
.space 0x01
glabel D_80B20133
.space 0x03
glabel D_80B20136
.space 0x02
glabel D_80B20138
.space 0x01
glabel D_80B20139
.space 0x03
glabel D_80B2013C
.space 0x02
glabel D_80B2013E
.space 0x01
glabel D_80B2013F
.space 0x03
glabel D_80B20142
.space 0x06
glabel D_80B20148
.space 0x08
glabel D_80B20150
.space 0x04
glabel D_80B20154
.space 0x04
glabel D_80B20158
.space 0x04
glabel D_80B2015C
.space 0x01
glabel D_80B2015D
.space 0x01
glabel D_80B2015E
.space 0x01
glabel D_80B2015F
.space 0x01
glabel D_80B20160
.space 0x01
glabel D_80B20161
.space 0x01
glabel D_80B20162
.space 0x01
glabel D_80B20163
.space 0x01
glabel D_80B20164
.space 0x01
glabel D_80B20165
.space 0x0B

32
data/overlays/actors/z_en_torch2.data.s
View file

@ -1,32 +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 En_Torch2_InitVars
.word 0x00330900, 0x00000035, 0x00200000, 0x00000A94
.word EnTorch2_Init
.word EnTorch2_Destroy
.word EnTorch2_Update
.word EnTorch2_Draw
glabel D_80B1F9F0
.word 0x00000000
glabel D_80B1F9F4
.word 0x00000000
glabel D_80B1F9F8
.word 0x00000000
glabel D_80B1F9FC
.word 0x00000000
glabel D_80B1FA00
.word 0x00000000
glabel D_80B1FA04
.word 0x00000000
glabel D_80B1FA08
.word 0x10020102, 0x10020210, 0x01020402, 0x02020202, 0x02E260D3, 0x00000104, 0x02020804, 0x00000400, 0x00000000, 0x00000000