summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorZelllll <56516451+Zelllll@users.noreply.github.com>2021-02-12 19:51:59 -0600
committerGitHub <noreply@github.com>2021-02-12 20:51:59 -0500
commit4d306260338ec4ebef7c7a7e3e22311efdff9724 (patch)
treeddddf87d15878bba68356fe7b968284c8031487a /data
parent6d01247f3400c42a06780f7ceae0a7b4a730539c (diff)
Bg_Breakwall OK and documented (#684)
* cleanup breakwall * fix mistake in header * make some data static * reloc stuffs * ready for pr * Remove asm * Update src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * fix petrie's stuff * fixed all feedback * Update src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Diffstat (limited to 'data')
-rw-r--r--data/overlays/actors/z_bg_breakwall.data.s38
-rw-r--r--data/overlays/actors/z_bg_breakwall.reloc.s13
2 files changed, 0 insertions, 51 deletions
diff --git a/data/overlays/actors/z_bg_breakwall.data.s b/data/overlays/actors/z_bg_breakwall.data.s
deleted file mode 100644
index 96cde1ec2..000000000
--- a/data/overlays/actors/z_bg_breakwall.data.s
+++ /dev/null
@@ -1,38 +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 Bg_Breakwall_InitVars
- .word 0x00590100, 0x00000010, 0x00010000, 0x000001F0
-.word BgBreakwall_Init
-.word BgBreakwall_Destroy
-.word BgBreakwall_Update
-.word 0x00000000
-glabel D_80870760
- .word 0x0A002900, 0x20030000, 0x00000000, 0x00000048, 0x00000000, 0x00000048, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
-glabel D_808707B0
- .word 0x06000118, 0x06000040, 0x00000000, 0x06000118, 0x06000040, 0x00000000
-glabel D_808707C8
- .word 0x060264A8, 0x06025BD0, 0x01000000
-glabel D_808707D4
- .word 0x06025B64, 0x00000000, 0xFF000000
-glabel D_808707E0
- .word 0xC8500064, 0xB0F40FA0, 0xB0F80190, 0x30FC0190
-glabel D_808707F0
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_808707FC
- .word 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0xC0000000, 0x00000000
-glabel D_80870814
- .word 0x3B83126F, 0x3B83126F, 0x3B83126F, 0x3B83126F, 0x3B83126F, 0x3B83126F, 0x3B83126F, 0x3B83126F, 0x3B83126F, 0x3B83126F, 0x3B83126F, 0x3B83126F
-glabel D_80870844
- .word 0x42200000, 0x41700000, 0x00000000, 0x41F00000, 0x42640000, 0x00000000, 0x42480000, 0x42640000, 0x00000000, 0x42200000, 0x428C0000, 0x00000000, 0x425C0000, 0xC1700000, 0x00000000, 0x41F00000, 0xC2000000, 0x00000000, 0x42480000, 0xC2000000, 0x00000000, 0x41A00000, 0xC1200000, 0x00000000, 0xC2200000, 0x41600000, 0x00000000, 0xC2480000, 0x42640000, 0x00000000, 0xC1F00000, 0x42640000, 0x00000000, 0xC2200000, 0x428C0000, 0x00000000, 0xC25C0000, 0xC1700000, 0x00000000, 0xC25C0000, 0xC2000000, 0x00000000, 0xC1F00000, 0xC2000000, 0x00000000, 0xC1A00000, 0xC1200000, 0x00000000
-glabel D_80870904
- .word 0x44480000, 0x44C80000, 0x42C80000, 0xC4480000, 0x44C80000, 0x42C80000, 0x44480000, 0x00000000, 0x42C80000, 0xC4480000, 0x00000000, 0x42C80000, 0x41200000, 0x00000000, 0x41200000, 0xC1200000, 0x00000000, 0x41200000, 0x41200000, 0x00000000, 0xC1200000, 0xC1200000, 0x00000000, 0xC1200000, 0x00000000, 0x00000000, 0x00000000
-
diff --git a/data/overlays/actors/z_bg_breakwall.reloc.s b/data/overlays/actors/z_bg_breakwall.reloc.s
deleted file mode 100644
index da8509250..000000000
--- a/data/overlays/actors/z_bg_breakwall.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_808709C0
- .incbin "baserom/ovl_Bg_Breakwall", 0xDE0, 0x000000F0