summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorpetrie911 <69443847+petrie911@users.noreply.github.com>2020-12-31 18:56:02 -0600
committerGitHub <noreply@github.com>2020-12-31 19:56:02 -0500
commit7daadc5ea123485ebfa9c6ea461c5c6cc566df87 (patch)
tree2c7a11c9298ce5193f5f0b2162328cdb9fe5c123 /data
parent600bad1f20e259b70708944b045d3f4407b673bf (diff)
En_Ex_Item (#567)
* first go * match * vt * docs * one last thing * formatted * bowling, why not * header * Update src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * press FFFF Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Diffstat (limited to 'data')
-rw-r--r--data/overlays/actors/z_en_ex_item.data.s22
-rw-r--r--data/overlays/actors/z_en_ex_item.reloc.s13
2 files changed, 0 insertions, 35 deletions
diff --git a/data/overlays/actors/z_en_ex_item.data.s b/data/overlays/actors/z_en_ex_item.data.s
deleted file mode 100644
index e4d8e8d1b..000000000
--- a/data/overlays/actors/z_en_ex_item.data.s
+++ /dev/null
@@ -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_Ex_Item_InitVars
- .word 0x01680600, 0x00000030, 0x00010000, 0x00000184
-.word EnExItem_Init
-.word EnExItem_Destroy
-.word EnExItem_Update
-.word EnExItem_Draw
-glabel D_80A09E00
- .word 0x00630064, 0x00650000
-glabel D_80A09E08
- .word 0x0403F140, 0x00000000
-
diff --git a/data/overlays/actors/z_en_ex_item.reloc.s b/data/overlays/actors/z_en_ex_item.reloc.s
deleted file mode 100644
index cfd096bb9..000000000
--- a/data/overlays/actors/z_en_ex_item.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_80A0A180
- .incbin "baserom/ovl_En_Ex_Item", 0x12E0, 0x00000290