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

En_Stream (vortex) 7/8 matching, 1 equivalent (#512)

Browse source 
* EnStream_Init OK

* func_80B0B7A0 OK

* EnStream_Destroy OK

* EnStream_Update OK

* Make func_80B0B7A0 take this instead of thisx like other SetupActions

* func_80B0BAC8 OK

* func_80B0B934 OK

* func_80B0B81C not OK, but very close and I give up

* EnStream_Draw OK

* Delete unused ASM and do a little cleanup

* Provide better names for functions

* Make the file buildable when NONMATCHING is used

* Flip comparisons in EnStream_SuckPlayer as per review

* NONMATCHING -> NON_MATCHING

* Remove & for function pointers

* Type D_06000950 and remove the & in Draw

* Remove unnecessary "struct"

* Remove unnecessary forward declaration

* Make func_80B0B81C take Vec3f*, not PosRot*

* Use the generated reloc when NON_MATCHING

* Move func_80B0B81C forward declare to the else block
This commit is contained in:
Tom Overton 2020-12-11 22:14:26 -08:00 • committed by GitHub
parent f05a584dea
commit 3062045acd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 118 additions and 325 deletions
Download patch file Download diff file Expand all files Collapse all files

20
data/overlays/actors/z_en_stream.data.s
View file

@ -1,20 +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_Stream_InitVars
.word 0x01600100, 0x00000010, 0x013B0000, 0x00000158
.word EnStream_Init
.word EnStream_Destroy
.word EnStream_Update
.word EnStream_Draw
glabel D_80B0BCC0
.word 0x48500014, 0x00000000, 0x00000000, 0x00000000