summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorZelllll <56516451+Zelllll@users.noreply.github.com>2021-01-21 09:21:05 -0600
committerGitHub <noreply@github.com>2021-01-21 10:21:05 -0500
commitd73976503126d10a82016f8f72fac4092dff1932 (patch)
tree5cf50bc07828f498e05e7b3d0cb1a7179d687ac2 /data
parent3f669bea1e23a4d781f0419846543ab442aab88b (diff)
Bg_Haka_Zou OK (#598)
* started init, not matched yet * all except init matched * haka_zou OK * haka_zou done * fix jenkins problem * various improvements * removed unused asm * fixed things * fixed new dyna names * more dyna fixes * ok now????? * this better build OK * applied roman's suggestions * function renames Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com>
Diffstat (limited to 'data')
-rw-r--r--data/overlays/actors/z_bg_haka_zou.data.s26
-rw-r--r--data/overlays/actors/z_bg_haka_zou.reloc.s13
2 files changed, 0 insertions, 39 deletions
diff --git a/data/overlays/actors/z_bg_haka_zou.data.s b/data/overlays/actors/z_bg_haka_zou.data.s
deleted file mode 100644
index 67e92d53e..000000000
--- a/data/overlays/actors/z_bg_haka_zou.data.s
+++ /dev/null
@@ -1,26 +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_808835F0
- .word 0x0A000900, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000000, 0x00010000, 0x0005003C, 0x00000000, 0x00000000
-glabel D_8088361C
- .word 0x00000000, 0x00000000, 0x00000000
-glabel Bg_Haka_Zou_InitVars
- .word 0x00BE0600, 0x00000010, 0x00010000, 0x000001B8
-.word BgHakaZou_Init
-.word BgHakaZou_Destroy
-.word BgHakaZou_Update
-.word 0x00000000
-glabel D_80883648
- .word 0xB86CFC18, 0x48500064
-glabel D_80883650
- .word 0x060064E0, 0x06005CE0, 0x06000A10, 0x06005CE0
-
diff --git a/data/overlays/actors/z_bg_haka_zou.reloc.s b/data/overlays/actors/z_bg_haka_zou.reloc.s
deleted file mode 100644
index 9d2a97cc0..000000000
--- a/data/overlays/actors/z_bg_haka_zou.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_80883680
- .incbin "baserom/ovl_Bg_Haka_Zou", 0x10C0, 0x00000110