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

EnTrap OK (#615)

Browse source 
* Manual migration of work to new branch due to screwing up git

* removing unused asm

* formatting

* Fixing a comment

* Adding a missing sound define
This commit is contained in:
AdamKiddle 2021-01-30 18:29:37 +00:00 • committed by GitHub
parent 6f6270100b
commit 3db87244b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 382 additions and 1329 deletions
Download patch file Download diff file Expand all files Collapse all files

20
data/overlays/actors/z_en_trap.data.s
View file

@ -1,20 +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_Trap_InitVars
.word 0x00800100, 0x00000010, 0x00850000, 0x000001EC
.word EnTrap_Init
.word EnTrap_Destroy
.word EnTrap_Update
.word EnTrap_Draw
glabel D_80B25830
.word 0x00000935, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0x00001000, 0x00000000, 0x00010100, 0x001E0014, 0x00000000, 0x00000000, 0x00000000

13
data/overlays/actors/z_en_trap.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_80B25880
.incbin "baserom/ovl_En_Trap", 0x1220, 0x00000070