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

DoorKiller OK (#631)

Browse source 
* Init done

* slight tweak

* Destroy done

* func_80995020

* func_809951C4 done

* started func_80995A84

* func_80995A84, func_80995284, func_809952B8 done

* started the mess that is func_80995368

* most functions done except for 3 trouble cases

* func_80995368 done

* func_809958E4 done

* fully matching. Documentation and cleanup to come

* fixed fake matches

* documentation progress

* More documentation

* getting close on tidying up everything

* Finalised documentation and made some comments and name changes in player and other door files

* formatting and final touches to comments

* pr stuff

* merge master

* merge

* format

* remove unused asm after merge

* review

* \n

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

35
data/overlays/actors/z_door_killer.data.s
View file

@ -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 Door_Killer_InitVars
.word 0x01C10100, 0x00000010, 0x018E0000, 0x00000284
.word DoorKiller_Init
.word DoorKiller_Destroy
.word DoorKiller_Update
.word 0x00000000
glabel D_80995FB0
.word 0x09110900, 0x10010000, 0x00000000, 0xFFCFFFFF, 0x00100000, 0x0001FFEE, 0x00000000, 0x01010000, 0x00140064, 0x00000000, 0x00000000
glabel D_80995FDC
.word 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00640064
glabel D_80996000
.word 0x0A000900, 0x00000000, 0x00000001
.word D_80995FDC
glabel D_80996010
.word 0x002C0000
glabel D_80996014
.word 0x0600E5A0, 0x00590000, 0x060035C0, 0x01870000, 0x06000000, 0x00010000, gWoodenDoorTex
glabel D_80996030
.word 0x00000000, 0x00000000, 0x00000000
glabel D_8099603C
.word 0x00000000, 0x3F800000, 0x00000000
glabel D_80996048
.word 0x06001250, 0x06001550, 0x060017B8, 0x06001A58, 0x00000000, 0x00000000

13
data/overlays/actors/z_door_killer.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_80996100
.incbin "baserom/ovl_Door_Killer", 0x14B0, 0x000001A0