summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorEllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>2021-09-24 23:35:42 +0100
committerGitHub <noreply@github.com>2021-09-24 18:35:42 -0400
commit16471bb68d096289afb979a12c6cf1dc7e9a50a6 (patch)
tree66c4804aac9e283dce0eb3f8ca468cae71c8ee5a /data
parent8e318d257e5ac7653314db861c9cf346e54fa624 (diff)
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain * cleanup * a few more functions done, 11 remain * finally all updated * another function matched * another action finished * damage table * death action done * started very large action func * more progress on long action funcs * large action func matched * 5 functions remain * another large action finished * start another action, doesn't match yet * a few new functions, neither match * done working on this for now * Correct one nonmatching, fix compiler warnings * Two functions left * one left * remove remaining gotos * OK * Delete outdated comment * namefixer * Flag macros * audio, dmgeff, some colour * Import symbols from object, reloc, name a few things * Rest of object done * Named a few more things, add action enum * Name body parts and another couple of actions * Last few names * Delete asm * Format * undefined_syms, mods where possible * Correct parent to EnEncount1 * Review * Last newline * louis and Dragorn's reviews * Format * More review * Put back to isInvisible and or, as in EnGeldB * Remove if (0)s in func_8009728C and change pointer arithmetic cast * More review * Unname headRot, make "fallthrough" case clearer, other review * Format * Even more review * Rephrase Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
Diffstat (limited to 'data')
-rw-r--r--data/overlays/actors/z_en_wf.data.s41
-rw-r--r--data/overlays/actors/z_en_wf.reloc.s13
2 files changed, 0 insertions, 54 deletions
diff --git a/data/overlays/actors/z_en_wf.data.s b/data/overlays/actors/z_en_wf.data.s
deleted file mode 100644
index 32c8f10d6..000000000
--- a/data/overlays/actors/z_en_wf.data.s
+++ /dev/null
@@ -1,41 +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_80B37990
- .word 0x00000000, 0xFFCFFFFF, 0x00040000, 0x00000000, 0x00000000, 0x01000000, 0x0F000000, 0x00000000, 0x000F0064, 0x00000000, 0xFFCFFFFF, 0x00040000, 0x00000000, 0x00000000, 0x01000000, 0x15000000, 0x00000000, 0x000F0064, 0x01000000, 0x00000000, 0x00000000, 0xFFC1FFFF, 0x00000000, 0x00050100, 0x11000320, 0x00000000, 0x00190064, 0x01000000, 0x00000000, 0x00000000, 0xFFC1FFFF, 0x00000000, 0x00050100, 0x0C000000, 0x00000000, 0x001E0064
-glabel D_80B37A20
- .word 0x09110D39, 0x10000000, 0x00000004
-.word D_80B37990
-glabel D_80B37A30
- .word 0x05000900, 0x00010000, 0x01000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010000, 0x00140032, 0x00000000, 0x00000000
-glabel D_80B37A5C
- .word 0x05000900, 0x00010000, 0x01000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010000, 0x000F0014, 0xFFF10000, 0x00000000
-glabel D_80B37A88
- .word 0x10020102, 0x10020210, 0x010204E4, 0x02020202, 0x02E460D3, 0x00000104, 0x02020804, 0x00000400
-glabel En_Wf_InitVars
- .word 0x01AF0500, 0x00000015, 0x01830000, 0x000004DC
-.word EnWf_Init
-.word EnWf_Destroy
-.word EnWf_Update
-.word EnWf_Draw
-glabel D_80B37AC8
- .word 0xB04C07D0, 0x386CF448
-glabel D_80B37AD0
- .word 0x00000000, 0x3F000000, 0x00000000
-glabel D_80B37ADC
- .word 0x44960000, 0x00000000, 0x00000000
-glabel D_80B37AE8
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_80B37AF4
- .word 0x06007B68, 0x06008368, 0x06008568, 0x06008368
-glabel D_80B37B04
- .word 0x06000300, 0x060027D8, 0x060029D8, 0x060027D8, 0x00000000, 0x00000000, 0x00000000
-
diff --git a/data/overlays/actors/z_en_wf.reloc.s b/data/overlays/actors/z_en_wf.reloc.s
deleted file mode 100644
index 7431ec0bb..000000000
--- a/data/overlays/actors/z_en_wf.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_80B37C60
- .incbin "baserom/ovl_En_Wf", 0x3FB0, 0x00000400