en_mm and object_mm OK (#735)

* almost done

* progress

* OK

* update mm2

* delete asm

* whitespace

* Update assets/xml/objects/object_mm.xml

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Mm/z_en_mm.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* name data

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
fig02
2021-03-28 19:18:41 -04:00
committed by GitHub
parent 11e5be77d5
commit 7f3be6e37f
27 changed files with 648 additions and 1515 deletions
-34
View File
@@ -1,34 +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_Mm_InitVars
.word 0x01620400, 0x00000019, 0x013C0000, 0x00000320
.word EnMm_Init
.word EnMm_Destroy
.word EnMm_Update
.word EnMm_Draw
glabel D_80AAEAE0
.word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x0012003F, 0x00000000, 0x00000000
glabel D_80AAEB0C
.word 0x00000000, 0x00000000, 0xFF000000
glabel D_80AAEB18
.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
glabel D_80AAEB38
.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_80AAEBA8
.word 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000001, 0x00000001, 0x00000003, 0x00000002, 0x00000001, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000
glabel D_80AAEBE8
.word 0x30F40FA0
glabel D_80AAEBEC
.word 0x06000E30, 0x06000C30
glabel D_80AAEBF4
.word 0x43480000, 0x44480000, 0x00000000
-13
View File
@@ -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_80AAECA0
.incbin "baserom/ovl_En_Mm", 0x1530, 0x000001B0