diff options
| author | petrie911 <69443847+petrie911@users.noreply.github.com> | 2021-03-27 14:50:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-27 15:50:26 -0400 |
| commit | cf78de2b1106c5fb720550f29d81d5ceeaff44f5 (patch) | |
| tree | cd05419e8a3759eefc600a8e4a2573a609663e14 /data | |
| parent | 8b57f36d32b9b5e5e53f77dfc6291a1fdfc32b67 (diff) | |
Obj_Mure3 OK (#720)
* matched
* format
* review
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig02 <fig02srl@gmail.com>
Diffstat (limited to 'data')
| -rw-r--r-- | data/overlays/actors/z_obj_mure3.data.s | 26 | ||||
| -rw-r--r-- | data/overlays/actors/z_obj_mure3.reloc.s | 13 |
2 files changed, 0 insertions, 39 deletions
diff --git a/data/overlays/actors/z_obj_mure3.data.s b/data/overlays/actors/z_obj_mure3.data.s deleted file mode 100644 index 04f3fd3f8..000000000 --- a/data/overlays/actors/z_obj_mure3.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 Obj_Mure3_InitVars - .word 0x01AB0100, 0x00000000, 0x00010000, 0x00000170 -.word ObjMure3_Init -.word ObjMure3_Destroy -.word ObjMure3_Update -.word 0x00000000 -glabel D_80B9B0C0 - .word 0x00050005, 0x00070000 -glabel D_80B9B0C8 - .word 0xB0F40064, 0xB0F80708, 0x30FC0064 -glabel D_80B9B0D4 - .word func_80B9A9D0 -.word func_80B9AA90 -.word func_80B9ABA0 - diff --git a/data/overlays/actors/z_obj_mure3.reloc.s b/data/overlays/actors/z_obj_mure3.reloc.s deleted file mode 100644 index 3adc0f19c..000000000 --- a/data/overlays/actors/z_obj_mure3.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_80B9B0F0 - .incbin "baserom/ovl_Obj_Mure3", 0x720, 0x00000090 |