1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 14:34:32 +00:00

ovl_Magic_Dark (#495)

* merge upstream

* Merge upstream

* Small formatting

* Data section

* MagicDark_Draw

* Gross match of func_80B874E4

* Add func_8005A9CC to functions.h

* Work on func_80B87A18

* func_80B8772C

* Remove comment

* Work on func_80B87A18

* Correct fp constant

* Add regalloc comment ;(

* Move negatives to numbers

* Stupid casts >:(

* Use this->actor when possible

* It's so close

* Use cast + 0xFF

* func_80B87A18

* Delete asm and replace globalCtx2

* Update spec

* static everything

* Name scale

* Use decimal for alpha

* Name some stuff

* Delete reloc

* Name orbOffset

* Name some functions

* Make unused data colors (because it probably is)

* Change >= to >

* Use clamps

* Name MagicDark_DimLighting

* Name gfx

* Rename prototype params

* Cleanup

* Funny cast

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
This commit is contained in:
Sirius902 2020-12-01 18:36:39 -08:00 committed by GitHub
parent 1bb13b8c70
commit 09fe32e198
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 328 additions and 858 deletions

3
spec
View file

@ -3367,8 +3367,7 @@ endseg
beginseg
name "ovl_Magic_Dark"
include "build/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.o"
include "build/data/overlays/actors/z_magic_dark.data.o"
include "build/data/overlays/actors/z_magic_dark.reloc.o"
include "build/src/overlays/actors/ovl_Magic_Dark/ovl_Magic_Dark_reloc.o"
endseg
beginseg