z_en_fd, z_en_fd_fire, and z_en_fw (#415)

* EnFd OK

* decompile En_Fd_Fire, document some of En_Fd

* fw wip

* match a few more of ovl_en_fw, properly organize data

* Ovl_En_Fw OK

* Documentation, formatting.

* change Color_RGBA8_n to Color_RGBA8

* PR updates

* fix errors with merge

* review

* dunno why jenkins failed

* review

Co-authored-by: fig <fig02srl@gmail.com>

6 files changed, 0 insertions, 165 deletions

diff --git a/data/overlays/actors/z_en_fd.data.s b/data/overlays/actors/z_en_fd.data.s
deleted file mode 100644
index a60ce7f48..000000000
--- a/data/overlays/actors/z_en_fd.data.s
+++ /dev/null
@@ -1,53 +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_Fd_InitVars
- .word 0x00990500, 0x00000215, 0x009E0000, 0x000031E0
-.word EnFd_Init
-.word EnFd_Destroy
-.word EnFd_Update
-.word EnFd_Draw
-glabel D_80A0DE20
- .word 0x00000000, 0xFFCFFFFF, 0x01040000, 0x00040088, 0x00000000, 0x01050100, 0x15000640, 0x00000000, 0x0005012C, 0x00000000, 0xFFCFFFFF, 0x01040000, 0x00040008, 0x00000000, 0x01010100, 0x0C000640, 0x00000000, 0x00050190, 0x00000000, 0xFFCFFFFF, 0x01040000, 0x00040008, 0x00000000, 0x01010100, 0x0E000320, 0x00000000, 0x0004012C, 0x00000000, 0xFFCFFFFF, 0x01040000, 0x00040008, 0x00000000, 0x01010100, 0x0F000640, 0x00000000, 0x0004012C, 0x00000000, 0xFFCFFFFF, 0x01040000, 0x00040008, 0x00000000, 0x01010100, 0x100007D0, 0x00000000, 0x0004012C, 0x00000000, 0xFFCFFFFF, 0x01040000, 0x00040008, 0x00000000, 0x01010100, 0x11000320, 0x00000000, 0x0004012C, 0x00000000, 0xFFCFFFFF, 0x01040000, 0x00040008, 0x00000000, 0x01010100, 0x12000640, 0x00000000, 0x0004012C, 0x00000000, 0xFFCFFFFF, 0x01040000, 0x00040008, 0x00000000, 0x01010100, 0x130007D0, 0x00000000, 0x0004012C, 0x00000000, 0xFFCFFFFF, 0x01040000, 0x00040008, 0x00000000, 0x01010100, 0x04000898, 0x00000000, 0x00040190, 0x00000000, 0xFFCFFFFF, 0x01040000, 0x00040008, 0x00000000, 0x01010100, 0x04001388, 0x00000000, 0x0004012C, 0x00000000, 0xFFCFFFFF, 0x01040000, 0x00040008, 0x00000000, 0x01010100, 0x08000898, 0x00000000, 0x00040190, 0x00000000, 0xFFCFFFFF, 0x01040000, 0x00040008, 0x00000000, 0x01010100, 0x08001388, 0x00000000, 0x0004012C
-glabel D_80A0DFD0
- .word 0x0A110939, 0x10000000, 0x0000000C
-.word D_80A0DE20
-glabel D_80A0DFE0
- .word 0x18000002, 0x00190019, 0xFF000000
-glabel D_80A0DFEC
- .word 0x060010B4, 0x3F800000, 0x00000000, 0xBF800000, 0x03000000, 0x00000000, 0x06005C64, 0x3F800000, 0x00000000, 0xBF800000, 0x03000000, 0xC1200000, 0x06006044, 0x00000000, 0x00000000, 0xBF800000, 0x03000000, 0xC1200000, 0x06006A18, 0x3F800000, 0x00000000, 0xBF800000, 0x01000000, 0xC1200000, 0x06006B64, 0x00000000, 0x00000000, 0xBF800000, 0x03000000, 0xC1200000
-glabel D_80A0E064
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_80A0E070
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_80A0E07C
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_80A0E088
- .word 0x45D48000, 0x00000000, 0x00000000
-glabel D_80A0E094
- .word 0x45D48000, 0x00000000, 0x00000000
-glabel D_80A0E0A0
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_80A0E0AC
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_80A0E0B8
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_80A0E0C4
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_80A0E0D0
- .word 0xFFFFC8FF, 0xC8C8C8FF, 0xFFFF00FF
-glabel D_80A0E0DC
- .word 0x00FF00FF, 0x0000FFFF, 0xFF0000FF
-glabel D_80A0E0E8
- .word 0xFF800000, 0xFF000000, 0xFFFF0000, 0xFF000000
-glabel D_80A0E0F8
- .word 0x040539B0, 0x040535B0, 0x040531B0, 0x04052DB0, 0x040529B0, 0x040525B0, 0x040521B0, 0x04051DB0, 0x00000000, 0x00000000
-
diff --git a/data/overlays/actors/z_en_fd.reloc.s b/data/overlays/actors/z_en_fd.reloc.s
deleted file mode 100644
index a2ac29c1d..000000000
--- a/data/overlays/actors/z_en_fd.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_80A0E1F0
-    .incbin "baserom/ovl_En_Fd", 0x2B30, 0x000002C0
diff --git a/data/overlays/actors/z_en_fd_fire.data.s b/data/overlays/actors/z_en_fd_fire.data.s
deleted file mode 100644
index 2466d30fc..000000000
--- a/data/overlays/actors/z_en_fd_fire.data.s
+++ /dev/null
@@ -1,36 +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_Fd_Fire_InitVars
- .word 0x00A30500, 0x00000015, 0x00030000, 0x000001AC
-.word EnFdFire_Init
-.word EnFdFire_Destroy
-.word EnFdFire_Update
-.word EnFdFire_Draw
-glabel D_80A0F030
- .word 0x0A110939, 0x10010000, 0x00000000, 0xFFCFFFFF, 0x01080000, 0x0D840008, 0x00000000, 0x01010100, 0x000C002E, 0x00000000, 0x00000000
-glabel D_80A0F05C
- .word 0x01000000, 0x00000000, 0xFF000000
-glabel D_80A0F068
- .word 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000400, 0x00000000, 0x00000000, 0x00000000
-glabel D_80A0F088
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_80A0F094
- .word 0x00000000, 0x43520000, 0x42700000, 0x43870000, 0x42F00000, 0x43A50000, 0x43340000, 0x41F00000, 0x43700000, 0x42B40000, 0x43960000, 0x43160000
-glabel D_80A0F0C4
- .word 0xFFFF00FF, 0xFFFFFFFF
-glabel D_80A0F0CC
- .word 0xFF0A00FF, 0x000AFFFF
-glabel D_80A0F0D4
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_80A0F0E0
- .word 0x00000000, 0x00000000, 0x00000000, 0x00000000
-
diff --git a/data/overlays/actors/z_en_fd_fire.reloc.s b/data/overlays/actors/z_en_fd_fire.reloc.s
deleted file mode 100644
index 157e8cf48..000000000
--- a/data/overlays/actors/z_en_fd_fire.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_80A0F150
-    .incbin "baserom/ovl_En_Fd_Fire", 0xCA0, 0x00000110
diff --git a/data/overlays/actors/z_en_fw.data.s b/data/overlays/actors/z_en_fw.data.s
deleted file mode 100644
index 39c0e13d3..000000000
--- a/data/overlays/actors/z_en_fw.data.s
+++ /dev/null
@@ -1,37 +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_Fw_InitVars
- .word 0x00AB0500, 0x00000215, 0x009E0000, 0x00000700
-.word EnFw_Init
-.word EnFw_Destroy
-.word EnFw_Update
-.word EnFw_Draw
-glabel D_80A1FB60
- .word 0x00000000, 0x00000000, 0x00040000, 0xFFCFFFFE, 0x00000000, 0x00050100, 0x020004B0, 0x00000000, 0x00100064
-glabel D_80A1FB84
- .word 0x06110939, 0x10000000, 0x00000001
-.word D_80A1FB60
-glabel D_80A1FB94
- .word 0x08000002, 0x00190019, 0xFF000000
-glabel D_80A1FBA0
- .word 0x06006CF8, 0x00000000, 0x00000000, 0xBF800000, 0x03000000, 0x00000000, 0x06007CD0, 0x3F800000, 0x00000000, 0xBF800000, 0x03000000, 0xC1000000, 0x06007DC8, 0x3F800000, 0x00000000, 0xBF800000, 0x01000000, 0xC1000000
-glabel D_80A1FBE8
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_80A1FBF4
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_80A1FC00
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_80A1FC0C
- .word 0x00000000, 0x00000000, 0x00000000
-glabel D_80A1FC18
- .word 0x040539B0, 0x040535B0, 0x040531B0, 0x04052DB0, 0x040529B0, 0x040525B0, 0x040521B0, 0x04051DB0, 0x00000000, 0x00000000
-
diff --git a/data/overlays/actors/z_en_fw.reloc.s b/data/overlays/actors/z_en_fw.reloc.s
deleted file mode 100644
index 3ab54d03b..000000000
--- a/data/overlays/actors/z_en_fw.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_80A1FC90
-    .incbin "baserom/ovl_En_Fw", 0x16F0, 0x00000130