diff options
| author | EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> | 2021-05-02 17:41:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-02 18:41:05 +0200 |
| commit | ce44541d334b2b3161c780c5a4cbae16aa964787 (patch) | |
| tree | 967788a307d85eff78c7f916d477eebc65933c77 /data | |
| parent | 2ee1fd4668c04899bf9f4a6b474d503d012e1f94 (diff) | |
EnFish, OK and documented (#795)
* 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
Diffstat (limited to 'data')
| -rw-r--r-- | data/overlays/actors/z_en_fish.data.s | 35 | ||||
| -rw-r--r-- | data/overlays/actors/z_en_fish.reloc.s | 13 |
2 files changed, 0 insertions, 48 deletions
diff --git a/data/overlays/actors/z_en_fish.data.s b/data/overlays/actors/z_en_fish.data.s deleted file mode 100644 index 5e7ea544c..000000000 --- a/data/overlays/actors/z_en_fish.data.s +++ /dev/null @@ -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 - diff --git a/data/overlays/actors/z_en_fish.reloc.s b/data/overlays/actors/z_en_fish.reloc.s deleted file mode 100644 index b4b0c6fc2..000000000 --- a/data/overlays/actors/z_en_fish.reloc.s +++ /dev/null @@ -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 |