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

Bg_Haka_Sgami OK (#532)

Browse source 
* spinning scythe trap, 4/6 matching

* fixed typo

* Almost matched sgami init

* Matched sgami Init

* starting to clean up func_8087E858

* func_8087E858 half-way done

* Scythe matched

* update scythe

* Removed asm files

* Delete z_bg_haka_sgami.reloc.s

* Update src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c

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

* Update src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c

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

* Update src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c

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

* Update z_bg_haka_sgami.c

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Zelllll 2020-12-19 03:59:35 -06:00 • committed by GitHub
parent 3369d0657d
commit eadf85f17c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 236 additions and 749 deletions
Download patch file Download diff file Expand all files Collapse all files

66
data/overlays/actors/z_bg_haka_sgami.data.s
View file

@ -1,66 +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 Bg_Haka_Sgami_InitVars
.word 0x00B10600, 0x00000011, 0x00010000, 0x00000338
.word BgHakaSgami_Init
.word BgHakaSgami_Destroy
.word BgHakaSgami_Update
.word 0x00000000
glabel D_8087EE60
.word 0x02000000, 0x20000000, 0x00040000, 0x00000000, 0x00000000, 0x01000000, 0x43B68000, 0x42340000, 0x41D80000, 0x43020000, 0x42340000, 0x43160000, 0x43910000, 0x42340000, 0x43110000, 0x02000000, 0x20000000, 0x00040000, 0x00000000, 0x00000000, 0x01000000, 0x437A0000, 0x42340000, 0x42B40000, 0x42480000, 0x42340000, 0x42A00000, 0x43200000, 0x42340000, 0x43200000, 0x02000000, 0x20000000, 0x00040000, 0x00000000, 0x00000000, 0x01000000, 0xC3988000, 0x42040000, 0xC0E00000, 0xC35C0000, 0x42040000, 0x42200000, 0xC3020000, 0x42040000, 0xC0A00000, 0x02000000, 0x20000000, 0x00040000, 0x00000000, 0x00000000, 0x01000000, 0xC33E0000, 0x42040000, 0x42200000, 0xC1F00000, 0x42040000, 0x41700000, 0xC28C0000, 0x42040000, 0xC1F00000
glabel D_8087EF50
.word 0x0A110000, 0x20020000, 0x00000004
glabel D_8087EF5C
.word D_8087EE60
glabel D_8087EF60
.word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00500082, 0x00000000, 0x00000000
glabel D_8087EF8C
.word 0x00000050, 0x0082FF00
glabel D_8087EF94
.word 0xB0F803E8, 0x801F0004, 0x48500064
glabel D_8087EFA0
.byte 0xFA
glabel D_8087EFA1
.byte 0xFA
glabel D_8087EFA2
.byte 0xFA
glabel D_8087EFA3
.byte 0xC8
glabel D_8087EFA4
.byte 0xC8
glabel D_8087EFA5
.byte 0xC8
glabel D_8087EFA6
.byte 0xC8
glabel D_8087EFA7
.byte 0x82
glabel D_8087EFA8
.byte 0xC8
glabel D_8087EFA9
.byte 0xC8
glabel D_8087EFAA
.byte 0xC8
glabel D_8087EFAB
.byte 0x3C
glabel D_8087EFAC
.byte 0x96
glabel D_8087EFAD
.byte 0x96
glabel D_8087EFAE
.byte 0x96
glabel D_8087EFAF
.byte 0x14
glabel D_8087EFB0
.word 0xC1A00000, 0x42480000, 0x43020000, 0xC2480000, 0x42040000, 0x41A00000
glabel D_8087EFC8
.word 0x43BE0000, 0x42480000, 0x42480000, 0x439B0000, 0x42040000, 0x00000000

13
data/overlays/actors/z_bg_haka_sgami.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_8087EFF0
.incbin "baserom/ovl_Bg_Haka_Sgami", 0xB10, 0x00000110