summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorRoman971 <32455037+Roman971@users.noreply.github.com>2020-12-18 01:12:22 +0100
committerGitHub <noreply@github.com>2020-12-17 19:12:22 -0500
commit83e53bbaf255c9936414f6b249dcec46cef8471b (patch)
tree723feb17a0e559b60ad8ea1d10ef39056d9ba04c /data
parent0376242365c15345f7ab33edfab7408877164a92 (diff)
Fix some non matchings in actors and parameter (#540)
* Fix some non matchings in actors and parameter - `EnTuboTrap_HandleImpact` from `z_en_tubo_trap.c` (fully matching) - `func_80ADA35C` from `z_en_po_sisters.c` (fully matching) - `func_80B0B81C` from `z_en_stream.c` (fully matching) - `Item_Give` from `z_parameter.c` (1 non matching left) * Rectify bss ordering comment
Diffstat (limited to 'data')
-rw-r--r--data/overlays/actors/z_en_po_sisters.reloc.s13
-rw-r--r--data/overlays/actors/z_en_stream.reloc.s13
-rw-r--r--data/overlays/actors/z_en_tubo_trap.reloc.s6
3 files changed, 0 insertions, 32 deletions
diff --git a/data/overlays/actors/z_en_po_sisters.reloc.s b/data/overlays/actors/z_en_po_sisters.reloc.s
deleted file mode 100644
index 2475779ca..000000000
--- a/data/overlays/actors/z_en_po_sisters.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_80ADD8D0
- .incbin "baserom/ovl_En_Po_Sisters", 0x4940, 0x00000480
diff --git a/data/overlays/actors/z_en_stream.reloc.s b/data/overlays/actors/z_en_stream.reloc.s
deleted file mode 100644
index 528f9246d..000000000
--- a/data/overlays/actors/z_en_stream.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_80B0BD20
- .incbin "baserom/ovl_En_Stream", 0x580, 0x00000090
diff --git a/data/overlays/actors/z_en_tubo_trap.reloc.s b/data/overlays/actors/z_en_tubo_trap.reloc.s
deleted file mode 100644
index 30b0dde60..000000000
--- a/data/overlays/actors/z_en_tubo_trap.reloc.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.section .rodata
-
-.balign 16
-
-D_80B265E0:
-.incbin "baserom/ovl_En_Tubo_Trap", 0xCF0, 0x000000D0