summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorLucas Shaw <49287729+shawlucas@users.noreply.github.com>2020-12-02 13:00:24 -0700
committerGitHub <noreply@github.com>2020-12-02 15:00:24 -0500
commita9dc74770909068ef23a6a6ad5158cd426794d4e (patch)
tree8985f182808314c8dc73364ae4ba2ab04e8179d3 /data
parenta7b63232280b9820371b6cb135a9921e7c81b302 (diff)
ovl_En_Gm OK (#407)
* im tired so done for tonight * decompiled * z_en_gm remove reloc * added description * weird formatting fixed * MTXMODE_APPLY * Made suggested changes * update * review 2 Co-authored-by: fig <fig02srl@gmail.com>
Diffstat (limited to 'data')
-rw-r--r--data/overlays/actors/z_en_gm.data.s24
-rw-r--r--data/overlays/actors/z_en_gm.reloc.s13
2 files changed, 0 insertions, 37 deletions
diff --git a/data/overlays/actors/z_en_gm.data.s b/data/overlays/actors/z_en_gm.data.s
deleted file mode 100644
index cde400712..000000000
--- a/data/overlays/actors/z_en_gm.data.s
+++ /dev/null
@@ -1,24 +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_Gm_InitVars
- .word 0x013D0400, 0x00000019, 0x00C90000, 0x000002D0
-.word EnGm_Init
-.word EnGm_Destroy
-.word EnGm_Update
-.word 0x00000000
-glabel D_80A3E350
- .word 0x0A000039, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00640078, 0x00000000, 0x00000000
-glabel D_80A3E37C
- .word 0x801F0005, 0x304C001E
-glabel D_80A3E384
- .word 0x0600CE80, 0x0600D280, 0x0600D680
-
diff --git a/data/overlays/actors/z_en_gm.reloc.s b/data/overlays/actors/z_en_gm.reloc.s
deleted file mode 100644
index 6c22f1a5b..000000000
--- a/data/overlays/actors/z_en_gm.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_80A3E440
- .incbin "baserom/ovl_En_Gm", 0xD60, 0x00000130