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

EnMThunder, 1 nonmatching (#604)

Browse source 
* Data migrated, all but Draw matched

* Draw likely equivalent
but serious regalloc issues,
and that last Gfx_TwoTexScroll is being very stubborn

* Merge remote-tracking branch 'upstream/master' into Thunder

* some improvements, set up to PR as nonmatching

* spec

* corrected header

* added function to functions.h

* delete asm

* Added new collider init

Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
EllipticEllipsis 2021-01-21 05:47:38 +00:00 • committed by GitHub
parent be84e1f0f8
commit 0e76c84c45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 387 additions and 1014 deletions
Download patch file Download diff file Expand all files Collapse all files

28
data/overlays/actors/z_en_m_thunder.data.s
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 En_M_Thunder_InitVars
.word 0x00570700, 0x00000000, 0x00010000, 0x000001CC
.word EnMThunder_Init
.word EnMThunder_Destroy
.word EnMThunder_Update
.word EnMThunder_Draw
glabel D_80AA0420
.word 0x0A090000, 0x10010000, 0x02000000, 0x00000001, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x19010100, 0x00C800C8, 0x00000000, 0x00000000
glabel D_80AA044C
.word 0x01000000, 0x00400000, 0x00800000
glabel D_80AA0458
.word 0x08000000, 0x02000000, 0x04000000
glabel D_80AA0464
.word 0x182F182E, 0x182F182E
glabel D_80AA046C
.word 0x3DCCCCCD, 0x3E19999A, 0x3E4CCCCD, 0x3E800000, 0x3E99999A, 0x3E800000, 0x3E4CCCCD, 0x3E19999A, 0x00000000