mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-10-20 13:40:02 +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
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

5
spec
View file

@ -3007,8 +3007,11 @@ endseg
beginseg
name "ovl_En_Stream"
include "build/src/overlays/actors/ovl_En_Stream/z_en_stream.o"
include "build/data/overlays/actors/z_en_stream.data.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_En_Stream/ovl_En_Stream_reloc.o"
#else
include "build/data/overlays/actors/z_en_stream.reloc.o"
#endif
endseg
beginseg