diff options
| author | emilybrooks <emilybrooksemilybrooks@gmail.com> | 2021-02-02 14:41:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-02 16:41:03 -0500 |
| commit | 7eaf57be59e7d8d3583214916edf3f2cd6c4a10b (patch) | |
| tree | 936e330013f678225a672182e71c89e873df7508 /data | |
| parent | cce6880bc043086e41e34bc2abdf1790a06b9d66 (diff) | |
ovl_en_mm2 OK (#636)
* decompiled ovl_en_mm2
* resolved conflicts
* add back huta
* review suggestions
* review 2 suggestions
Co-authored-by: Fig02 <fig02srl@gmail.com>
Diffstat (limited to 'data')
| -rw-r--r-- | data/overlays/actors/z_en_mm2.data.s | 28 | ||||
| -rw-r--r-- | data/overlays/actors/z_en_mm2.reloc.s | 13 |
2 files changed, 0 insertions, 41 deletions
diff --git a/data/overlays/actors/z_en_mm2.data.s b/data/overlays/actors/z_en_mm2.data.s deleted file mode 100644 index 49891a9e9..000000000 --- a/data/overlays/actors/z_en_mm2.data.s +++ /dev/null @@ -1,28 +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_Mm2_InitVars - .word 0x01D40400, 0x00000019, 0x013C0000, 0x000002BC -.word EnMm2_Init -.word EnMm2_Destroy -.word EnMm2_Update -.word EnMm2_Draw -glabel D_80AAFAC0 - .word 0x0A000939, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00010100, 0x0012003F, 0x00000000, 0x00000000 -glabel D_80AAFAEC - .word 0x06000718, 0x3F800000, 0x00000000, 0xC0E00000, 0x06006940, 0xBF800000, 0x02000000, 0xC0E00000, 0x06006C50, 0x3F800000, 0x00000000, 0xC0E00000, 0x06006940, 0x3F800000, 0x02000000, 0xC0E00000, 0x06000468, 0x3F800000, 0x00000000, 0xC0E00000, 0x060073A0, 0x3F800000, 0x00000000, 0xC1400000, 0x06008060, 0x3F800000, 0x00000000, 0xC1400000 -glabel D_80AAFB5C - .word 0x30F40FA0 -glabel D_80AAFB60 - .word 0x06000E30, 0x06000C30 -glabel D_80AAFB68 - .word 0x43480000, 0x44480000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_mm2.reloc.s b/data/overlays/actors/z_en_mm2.reloc.s deleted file mode 100644 index 6c7f59ea0..000000000 --- a/data/overlays/actors/z_en_mm2.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_80AAFC10 - .incbin "baserom/ovl_En_Mm2", 0xDC0, 0x00000110 |