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

En_Bb (Bubble (flying skull)) (#551)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* bubbles!

* match

* stuff

* more names

* let's go

* SFX error

* fixes

* also formatting

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.c

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

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.c

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

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.c

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

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.h

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

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.h

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

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.h

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

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.h

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

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
petrie911 2020-12-29 15:06:20 -06:00 • committed by GitHub
parent 94d51ce86f
commit e4d88bf942
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 1244 additions and 4170 deletions
Download patch file Download diff file Expand all files Collapse all files

53
data/overlays/actors/z_en_bb.data.s
View file

@ -1,53 +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_809BBA80
.word 0xF00201A2, 0xF0E2A2F0, 0x010204E2, 0xC4B40000, 0x00609383, 0xA0A00104, 0x02020804, 0x6000A400
glabel D_809BBAA0
.word 0xD0D0D0A2, 0xD0E2A2D0, 0xD0E2E4E2, 0x94E2E4E2, 0xE2609360, 0xA0A001E4, 0xE202E8E4, 0x6000A400
glabel D_809BBAC0
.word 0xF0E2E1A2, 0xF0E2A2F0, 0xE1E2E454, 0xE2E2E4E2, 0xE2746060, 0xA0A0E1E4, 0xE2E2E8E4, 0x6000A400
glabel En_Bb_InitVars
.word 0x00690500, 0x01000015, 0x005D0000, 0x00000328
.word EnBb_Init
.word EnBb_Destroy
.word EnBb_Update
.word EnBb_Draw
glabel D_809BBB00
.word 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x00000000, 0xFF880000, 0x0004012C
glabel D_809BBB24
.word 0x03110909, 0x10000000, 0x00000001
.word D_809BBB00
glabel D_809BBB34
.word 0x304C000A
glabel D_809BBB38
.word 0x00000000, 0x3F000000, 0x00000000
glabel D_809BBB44
.word 0x00000000, 0x00000000, 0x00000000
glabel D_809BBB50
.word 0x00000000, 0x00000000, 0x00000000
glabel D_809BBB5C
.word 0x00000000, 0x00000000, 0x00000000
glabel D_809BBB68
.word 0x00000000, 0x00000000, 0x00000000
glabel D_809BBB74
.word 0x00000000, 0xBF19999A, 0x00000000
glabel D_809BBB80
.word 0x0000FFFF
glabel D_809BBB84
.word 0x00000000
glabel D_809BBB88
.word 0x41500000, 0x41200000, 0x00000000, 0x40A00000, 0x41C80000, 0x40A00000, 0xC0A00000, 0x41C80000, 0x40A00000, 0xC1500000, 0x41200000, 0x00000000, 0x40A00000, 0x41C80000, 0xC0A00000, 0xC0A00000, 0x41C80000, 0xC0A00000, 0x00000000, 0x41200000, 0xC1500000, 0x40A00000, 0x00000000, 0x40A00000, 0x40A00000, 0x00000000, 0xC0A00000, 0x00000000, 0x41200000, 0x41500000, 0xC0A00000, 0x00000000, 0x40A00000, 0xC0A00000, 0x00000000, 0xC0A00000
glabel D_809BBC18
.word 0x00000000, 0x459C4000, 0x00000000
glabel D_809BBC24
.word 0x00000000, 0x44FA0000, 0x00000000

13
data/overlays/actors/z_en_bb.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_809BBD10
.incbin "baserom/ovl_En_Bb", 0x3A30, 0x00000320