summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorAnghelo Carvajal <angheloalf95@gmail.com>2021-02-12 17:33:03 -0500
committerGitHub <noreply@github.com>2021-02-12 17:33:03 -0500
commit0b2a4e9d7fd5448c5f7939714f177cc0c2faafef (patch)
tree8a4f2821dbc29de30571b7c36d2596e69e6113a4 /data
parentd373661acd288b952dbb69824017307ac228501b (diff)
ovl_Bg_Hidan_Rock OK (#657)
* void BgHidanRock_Init(Actor *thisx, GlobalContext *globalCtx) Signed-off-by: angie <angheloalf95@gmail.com> * small functions Signed-off-by: angie <angheloalf95@gmail.com> * BgHidanRock_Destroy Signed-off-by: angie <angheloalf95@gmail.com> * BgHidanRock_Update Signed-off-by: angie <angheloalf95@gmail.com> * BgHidanRock_Draw Signed-off-by: angie <angheloalf95@gmail.com> * func_8088B69C Signed-off-by: angie <angheloalf95@gmail.com> * func_8088B79C Signed-off-by: angie <angheloalf95@gmail.com> * func_8088B990 Signed-off-by: angie <angheloalf95@gmail.com> * func_8088B268 and move data Signed-off-by: angie <angheloalf95@gmail.com> * func_8088BC40 Signed-off-by: angie <angheloalf95@gmail.com> * erase reloc Signed-off-by: angie <angheloalf95@gmail.com> * a bit of cleanup Signed-off-by: angie <angheloalf95@gmail.com> * ups Signed-off-by: angie <angheloalf95@gmail.com> * another bit of cleanup Signed-off-by: angie <angheloalf95@gmail.com> * Changes requested by @petrie911 Signed-off-by: Anghelo <angheloalf95@gmail.com> * More changes requested by @petrie911 Signed-off-by: angie <angheloalf95@gmail.com> * fix some types Signed-off-by: angie <angheloalf95@gmail.com>
Diffstat (limited to 'data')
-rw-r--r--data/overlays/actors/z_bg_hidan_rock.data.s30
-rw-r--r--data/overlays/actors/z_bg_hidan_rock.reloc.s13
2 files changed, 0 insertions, 43 deletions
diff --git a/data/overlays/actors/z_bg_hidan_rock.data.s b/data/overlays/actors/z_bg_hidan_rock.data.s
deleted file mode 100644
index 2edd59862..000000000
--- a/data/overlays/actors/z_bg_hidan_rock.data.s
+++ /dev/null
@@ -1,30 +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 D_8088BF60
- .word 0x454EE000, 0x42F00000
-glabel D_8088BF68
- .word 0x00000000
-glabel Bg_Hidan_Rock_InitVars
- .word 0x00430100, 0x00000000, 0x002C0000, 0x000001C8
-.word BgHidanRock_Init
-.word BgHidanRock_Destroy
-.word BgHidanRock_Update
-.word BgHidanRock_Draw
-glabel D_8088BF8C
- .byte 0x0A, 0x11, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x00, 0x4D, 0xFF, 0xD8, 0x0C, 0xEE, 0x00, 0x78, 0x00, 0x00
-glabel D_8088BFB8
- .word 0xC8500064, 0x386CFDA8
-glabel D_8088BFC0
- .word 0x00000000
-glabel D_8088BFC4
- .word 0x06012120, 0x060128A0, 0x06013020, 0x060137A0, 0x06013F20, 0x060146A0, 0x06014E20, 0x060155A0, 0x00000000, 0x00000000, 0x00000000
-
diff --git a/data/overlays/actors/z_bg_hidan_rock.reloc.s b/data/overlays/actors/z_bg_hidan_rock.reloc.s
deleted file mode 100644
index 49b95f658..000000000
--- a/data/overlays/actors/z_bg_hidan_rock.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_8088C060
- .incbin "baserom/ovl_Bg_Hidan_Rock", 0xFE0, 0x000001A0