mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-09 00:00:44 +00:00
Code Issues Projects Releases Wiki Activity

ovl_En_Okuta (#470)

Browse source 
* merge upstream

* Merge upstream

* Migrate data

* Progress

* Progress

* Progress

* Cleanup data

* Match EnOkuta_Update

* EnOkuta_Draw

* func_80AC25D8

* Work on func_80AC2350

* Name EnOkuta_OverrideLimbDraw

* More progress

* More progress

* Progress

* Progress

* func_80AC2350

* func_80AC1938

* Use LINK_IS_ADULT

* func_80AC1B80

* Name some stuff

* Update spec and remove asm

* Name EnOkuta_SpawnSplash

* Name more stuff

* Name EnOkuta_Appear

* Name ColliderInits

* Reorder comparison to make more sense

* Name some Octorock related functions

* Name some projectile stuff

* Reorder comparison

* Convert remaining uses of unk_194 to decimal

* Name some more stuff

* Rename some wait functions to have 'to'

* Consolidate timers

* Name some more stuff

* Change EnOkuta_SetupWaitToAppear to take this

* Name jumpHeight

* Name this->scale

* Name shots

* Name _SetupWaitToShoot and _SetupShoot

* Name more stuff (might change)

* Name EnOkuta_ColliderCheck for now

* Replace some floating point constants

* Change name to make a bit more sense

* Rename mouth to snout

* Just rename parameter to scale

* Fun magic number I guess

* Remove several returns

* Cleanup

* Update src/overlays/actors/ovl_En_Okuta/z_en_okuta.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Okuta/z_en_okuta.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Clang format

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Sirius902 2020-11-23 17:50:13 -07:00 • committed by GitHub
parent 9a9025f01c
commit 89f89ac5ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 645 additions and 2597 deletions
Download patch file Download diff file Expand all files Collapse all files

44
data/overlays/actors/z_en_okuta.data.s
View file

@ -1,44 +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_Okuta_InitVars
.word 0x000E0500, 0x00000005, 0x00070000, 0x000003BC
.word EnOkuta_Init
.word EnOkuta_Destroy
.word EnOkuta_Update
.word EnOkuta_Draw
glabel D_80AC2820
.word 0x0A110939, 0x20010000, 0x00000000, 0xFFCFFFFF, 0x00080000, 0xFFCFFFFF, 0x00000000, 0x09010100, 0x000D0014, 0x00000000, 0x00000000
glabel D_80AC284C
.word 0x00000939, 0x10010000, 0x01000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100
glabel D_80AC286C
.byte 0x00, 0x14
glabel D_80AC286E
.byte 0x00, 0x28, 0xFF, 0xE2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
glabel D_80AC2878
.word 0x0100000F, 0x003C6400
glabel D_80AC2880
.word 0x00020102, 0x01020202, 0x01020402, 0x34020202, 0x02000000, 0x00000104, 0x02020804, 0x00000400
glabel D_80AC28A0
.word 0x89170042, 0x304C1964
glabel D_80AC28A8
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80AC28B4
.word 0xFFFFFFFF
glabel D_80AC28B8
.word 0x969696FF
glabel D_80AC28BC
.word 0x00000000, 0xBF000000, 0x00000000
glabel D_80AC28C8
.word 0xFFFFFFFF
glabel D_80AC28CC
.word 0x96969600

13
data/overlays/actors/z_en_okuta.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_80AC2990
.incbin "baserom/ovl_En_Okuta", 0x2330, 0x00000310