diff options
| author | AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> | 2021-01-30 18:29:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-30 13:29:37 -0500 |
| commit | 3db87244b4b5b10e6b3af608b76b53eca5ddd2f2 (patch) | |
| tree | f4aa6985861d372b5933fc6590f4703b2f3ef926 /data | |
| parent | 6f6270100bdccd38448d51efe382da0a0f32f282 (diff) | |
EnTrap OK (#615)
* Manual migration of work to new branch due to screwing up git
* removing unused asm
* formatting
* Fixing a comment
* Adding a missing sound define
Diffstat (limited to 'data')
| -rw-r--r-- | data/overlays/actors/z_en_trap.data.s | 20 | ||||
| -rw-r--r-- | data/overlays/actors/z_en_trap.reloc.s | 13 |
2 files changed, 0 insertions, 33 deletions
diff --git a/data/overlays/actors/z_en_trap.data.s b/data/overlays/actors/z_en_trap.data.s deleted file mode 100644 index 5a8e3b991..000000000 --- a/data/overlays/actors/z_en_trap.data.s +++ /dev/null @@ -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 - diff --git a/data/overlays/actors/z_en_trap.reloc.s b/data/overlays/actors/z_en_trap.reloc.s deleted file mode 100644 index cb18bc783..000000000 --- a/data/overlays/actors/z_en_trap.reloc.s +++ /dev/null @@ -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 |