summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorEllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>2021-01-14 19:28:36 +0000
committerGitHub <noreply@github.com>2021-01-14 14:28:36 -0500
commit65e956a272a63d193fcefa916d95d5fe791ec072 (patch)
tree137525bf8736a1c247a07adfde17ec91abb1778c /data
parent3b4a1c23d609c6a67437047fe5dda1bfd86efb57 (diff)
DemoExt OK and documented (#586)
* OK * all functions and variables named * delete asm * data inlined * Merge remote-tracking branch 'upstream/master' into demo_ext * addressed review comments * formatter * addressed review comments
Diffstat (limited to 'data')
-rw-r--r--data/overlays/actors/z_demo_ext.data.s26
-rw-r--r--data/overlays/actors/z_demo_ext.reloc.s13
2 files changed, 0 insertions, 39 deletions
diff --git a/data/overlays/actors/z_demo_ext.data.s b/data/overlays/actors/z_demo_ext.data.s
deleted file mode 100644
index 714827ad8..000000000
--- a/data/overlays/actors/z_demo_ext.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_80977C70
- .word func_80977854
-.word func_80977874
-.word func_809778AC
-glabel D_80977C7C
- .word func_80977944
-.word func_80977950
-glabel Demo_Ext_InitVars
- .word 0x01180400, 0x00000010, 0x005A0000, 0x00000184
-.word DemoExt_Init
-.word DemoExt_Destroy
-.word DemoExt_Update
-.word DemoExt_Draw
-.word 0x00000000, 0x00000000, 0x00000000
-
diff --git a/data/overlays/actors/z_demo_ext.reloc.s b/data/overlays/actors/z_demo_ext.reloc.s
deleted file mode 100644
index b847d7b18..000000000
--- a/data/overlays/actors/z_demo_ext.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_80977D90
- .incbin "baserom/ovl_Demo_Ext", 0xA00, 0x000000B0