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

EnEncount2 and EnFireRock OK (#659)

Browse source 
* first two funcs done

* fixing struct var name due to external use

* func_80A07CA4 done

* started EnEncount2_Update

* EnEncount2_Update done

* Encount2 done!

* EnFireRock_Init done (but will only match once initvars are uncommented

* progress

* 4 funcs left

* Fully matching

* minor formatting

* renames

* change structs back to normal

* formatting

* removing unused comments

* even more formatting stuff

* removed unused asm

* pr stuff

* pr stuff

* added newline at end of file

* some merge suggestions

* more pr stuff

* review

Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
AdamKiddle 2021-03-14 14:39:41 +00:00 • committed by GitHub
parent 8e0fa07a7e
commit ca5a9aa7d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 755 additions and 2752 deletions
Download patch file Download diff file Expand all files Collapse all files

18
data/overlays/actors/z_en_encount2.data.s
View file

@ -1,18 +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_Encount2_InitVars
.word 0x00B40500, 0x00000030, 0x00920000, 0x00000A20
.word EnEncount2_Init
.word 0x00000000
.word EnEncount2_Update
.word EnEncount2_Draw

13
data/overlays/actors/z_en_encount2.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_80A08D80
.incbin "baserom/ovl_En_Encount2", 0x13F0, 0x00000120

22
data/overlays/actors/z_en_fire_rock.data.s
View file

@ -1,22 +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_Fire_Rock_InitVars
.word 0x00B50500, 0x00000030, 0x00920000, 0x000001E0
.word EnFireRock_Init
.word EnFireRock_Destroy
.word EnFireRock_Update
.word EnFireRock_Draw
glabel D_80A12CA0
.word 0x0C110900, 0x20010000, 0x00000000, 0xFFCFFFFF, 0x09080000, 0xFFCFFFFF, 0x00000000, 0x01010000, 0x001E001E, 0xFFF60000, 0x00000000
glabel D_80A12CCC
.word 0x0C110900, 0x20010000, 0x00000000, 0xFFCFFFFF, 0x01080000, 0xFFCFFFFF, 0x00000000, 0x01010000, 0x001E001E, 0xFFF60000, 0x00000000, 0x00000000, 0x00000000

13
data/overlays/actors/z_en_fire_rock.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_80A12EF0
.incbin "baserom/ovl_En_Fire_Rock", 0x12D0, 0x00000180