summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorAnghelo Carvajal <angheloalf95@gmail.com>2021-02-14 15:37:22 -0500
committerGitHub <noreply@github.com>2021-02-14 15:37:22 -0500
commit5bc23f58f80cdce021008ec798c6ac3e5f4a6bf0 (patch)
tree6ca88dc4a45a49310d1bc5f1a54c473425154f7c /data
parent97cfe4979740b05a2c6d78735e81bfb4787f531b (diff)
ovl_En_Anubice_Fire OK (#687)
* init, destroy and other func Signed-off-by: angie <angheloalf95@gmail.com> * func_809B2B48 Signed-off-by: angie <angheloalf95@gmail.com> * EnAnubiceFire_Update Signed-off-by: angie <angheloalf95@gmail.com> * EnAnubiceFire_Draw NON_MATCHING Signed-off-by: angie <angheloalf95@gmail.com> * import data Signed-off-by: angie <angheloalf95@gmail.com> * inline some static variables Signed-off-by: angie <angheloalf95@gmail.com> * EnAnubiceFire_Draw Signed-off-by: angie <angheloalf95@gmail.com> * func_809B27D8 Signed-off-by: angie <angheloalf95@gmail.com> * final cleanup Signed-off-by: angie <angheloalf95@gmail.com> * ups Signed-off-by: angie <angheloalf95@gmail.com> * changes requested by @petrie911 Signed-off-by: angie <angheloalf95@gmail.com> * changes requested by @Roman971 Signed-off-by: angie <angheloalf95@gmail.com> * I somehow forgot to delete that file Signed-off-by: angie <angheloalf95@gmail.com> * i don't know what to put in this message Signed-off-by: angie <angheloalf95@gmail.com>
Diffstat (limited to 'data')
-rw-r--r--data/overlays/actors/z_en_anubice_fire.data.s44
-rw-r--r--data/overlays/actors/z_en_anubice_fire.reloc.s13
2 files changed, 0 insertions, 57 deletions
diff --git a/data/overlays/actors/z_en_anubice_fire.data.s b/data/overlays/actors/z_en_anubice_fire.data.s
deleted file mode 100644
index bd3260570..000000000
--- a/data/overlays/actors/z_en_anubice_fire.data.s
+++ /dev/null
@@ -1,44 +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_Anubice_Fire_InitVars
- .word 0x00E10500, 0x00000010, 0x00D60000, 0x000001F4
-.word EnAnubiceFire_Init
-.word EnAnubiceFire_Destroy
-.word EnAnubiceFire_Update
-.word EnAnubiceFire_Draw
-glabel D_809B31E0
- .word 0x0A110900, 0x10010000, 0x00000000, 0xFFCFFFFF, 0x01040000, 0xFFCFFFFF, 0x00000000, 0x01010000, 0x00000000, 0x00000000, 0x00000000
-glabel D_809B320C
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_809B3218
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_809B3224
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_809B3230
- .word 0xFFFF00FF
-glabel D_809B3234
- .word 0xFF0000FF
-glabel D_809B3238
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_809B3244
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_809B3250
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_809B325C
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_809B3268
- .word 0xFFFF00FF
-glabel D_809B326C
- .word 0xFF0000FF
-glabel D_809B3270
- .word gDust4Tex, gDust5Tex, gDust6Tex, gDust7Tex, gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex
-
diff --git a/data/overlays/actors/z_en_anubice_fire.reloc.s b/data/overlays/actors/z_en_anubice_fire.reloc.s
deleted file mode 100644
index 6b730bf17..000000000
--- a/data/overlays/actors/z_en_anubice_fire.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_809B3300
- .incbin "baserom/ovl_En_Anubice_Fire", 0xD60, 0x00000100