diff options
| author | Stardust Sauce <35093523+StardustSauce@users.noreply.github.com> | 2021-08-11 10:35:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-11 10:35:17 -0400 |
| commit | 70ec8c42fc33616efbca70403f2e3f09885d5532 (patch) | |
| tree | d4baa3875265a1deecc8feb8c3abac296418fdd3 /data | |
| parent | d17f9f14c564ed7ad53254f132bc3daf030da7dd (diff) | |
ObJ_Lift OK (#883)
* ObJ_Lift decompiled and matching.
* Update src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Implemented suggestions
* Decorrected mask in z_obj_lift per suggestion
* Update src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c
* review
* unused asm
* review
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
Diffstat (limited to 'data')
| -rw-r--r-- | data/overlays/actors/z_obj_lift.data.s | 28 | ||||
| -rw-r--r-- | data/overlays/actors/z_obj_lift.reloc.s | 13 |
2 files changed, 0 insertions, 41 deletions
diff --git a/data/overlays/actors/z_obj_lift.data.s b/data/overlays/actors/z_obj_lift.data.s deleted file mode 100644 index 882f07264..000000000 --- a/data/overlays/actors/z_obj_lift.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 Obj_Lift_InitVars - .word 0x012C0100, 0x00000010, 0x011D0000, 0x00000170 -.word ObjLift_Init -.word ObjLift_Destroy -.word ObjLift_Update -.word ObjLift_Draw -glabel D_80B969C0 - .word 0x0000000A, 0x0014001E, 0x00280032, 0x003C0000 -glabel D_80B969D0 - .word 0x0078FF88, 0x00780000, 0x00780078, 0x0000FF88, 0x00000000, 0x00000078, 0xFF88FF88, 0xFF880000, 0xFF880078 -glabel D_80B969F4 - .word 0xB86CFDA8, 0xB870C568, 0xB0F407D0, 0xB0F801F4, 0x30FC07D0 -glabel D_80B96A08 - .word 0x3DCCCCCD, 0x3D4CCCCD -glabel D_80B96A10 - .word 0xC1900000, 0xC1100000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_obj_lift.reloc.s b/data/overlays/actors/z_obj_lift.reloc.s deleted file mode 100644 index b22164f79..000000000 --- a/data/overlays/actors/z_obj_lift.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_80B96AB0 - .incbin "baserom/ovl_Obj_Lift", 0x9E0, 0x000000F0 |