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

EnFish, OK and documented (#795)

Browse source 
* Matching

* Some naming

* spec

* Name another function

* Name animations, clarify use of GI_MAX and GI_NONE

* Documented bottle range functions

* Simplify squared distance function in EnIceHono, actor descriptions

* Functions for dropped fish

* More naming

* Change 65535.5f to (0xFFFF + 0.5f)

* Change 65535.5f to (0xFFFF + 0.5f)

* name phases

* Named other types, Docile functions

* Naming complete

* delete asm

* format, remove outdated comment

* Fix a few DrawFlexOpa arguments

* Review changes

* Change back to original playSound

* Function comments per review
This commit is contained in:
EllipticEllipsis 2021-05-02 17:41:05 +01:00 • committed by GitHub
parent 2ee1fd4668
commit ce44541d33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
63 changed files with 812 additions and 2426 deletions
Download patch file Download diff file Expand all files Collapse all files

35
data/overlays/actors/z_en_fish.data.s
View file

@ -1,35 +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 D_80A17010
.word 0x00000000
glabel D_80A17014
.word 0x00000000
glabel D_80A17018
.word 0x00000000
glabel D_80A1701C
.word 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00050064
glabel D_80A17040
.word 0x0A000039, 0x10000000, 0x00000001
.word D_80A1701C
glabel En_Fish_InitVars
.word 0x00210700, 0x00000000, 0x00010000, 0x00000254
.word EnFish_Init
.word EnFish_Destroy
.word EnFish_Update
.word EnFish_Draw
glabel D_80A17070
.word 0xC850000A, 0xB0F40384, 0xB0F80028, 0x30FC02BC
glabel D_80A17080
.word 0x00000000, 0x3D23D70A, 0x3DB851EC
glabel D_80A1708C
.word 0x3F000000, 0x3DCCCCCD, 0x3E19999A, 0x00000000, 0x00000000

13
data/overlays/actors/z_en_fish.reloc.s
View file

@ -1,13 +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 .rodata
.balign 16
glabel D_80A17200
.incbin "baserom/ovl_En_Fish", 0x1F80, 0x00000310