diff options
| author | Zelllll <56516451+Zelllll@users.noreply.github.com> | 2021-01-31 13:59:50 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-31 14:59:50 -0500 |
| commit | dde70e3c663f581b342897eaae8ed11447010a6f (patch) | |
| tree | f28b42e4e49577dee432385110eafda574190aac /data | |
| parent | 3e322f5d35a1012b483ffa6f438347ea2a82b4bb (diff) | |
En_Dodojr (Baby Dodongo) OK (#609)
* some functions finished
* some more progress
* a bit more progress
* more functions done, one wip
* 2 functions remain
* one function remains
* actor mostly done, still one function left
* some progress, still not equivalent
* dodojr OK
* dodojr ready
* correct actor struct
* Update src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* builds OK now
Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Diffstat (limited to 'data')
| -rw-r--r-- | data/overlays/actors/z_en_dodojr.data.s | 44 | ||||
| -rw-r--r-- | data/overlays/actors/z_en_dodojr.reloc.s | 13 |
2 files changed, 0 insertions, 57 deletions
diff --git a/data/overlays/actors/z_en_dodojr.data.s b/data/overlays/actors/z_en_dodojr.data.s deleted file mode 100644 index 3ccf6fc73..000000000 --- a/data/overlays/actors/z_en_dodojr.data.s +++ /dev/null @@ -1,44 +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_Dodojr_InitVars - .word 0x002F0500, 0x00000005, 0x001F0000, 0x000002C0 -.word EnDodojr_Init -.word EnDodojr_Destroy -.word EnDodojr_Update -.word EnDodojr_Draw -glabel D_809F7EB0 - .word 0x06110939, 0x10010000, 0x00000000, 0xFFCFFFFF, 0x00080000, 0xFFC5FFFF, 0x00000000, 0x01010100, 0x00120014, 0x00000000, 0x00000000 -glabel D_809F7EDC - .word 0x01000002, 0x00190019, 0xFF000000 -glabel D_809F7EE8 - .word 0xAA825AFF -glabel D_809F7EEC - .word 0x643C1400 -glabel D_809F7EF0 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809F7EFC - .word 0x00000000, 0x3E99999A, 0x00000000 -glabel D_809F7F08 - .word 0xAA825AFF -glabel D_809F7F0C - .word 0x643C1400 -glabel D_809F7F10 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809F7F1C - .word 0x00000000, 0x3E99999A, 0x00000000 -glabel D_809F7F28 - .word 0x47C34F80, 0x47C34F80, 0x47C34F80 -glabel D_809F7F34 - .word 0x00000000, 0x43520000, 0x42700000, 0x43870000, 0x42F00000, 0x43A50000, 0x43340000, 0x41F00000, 0x43700000, 0x42B40000, 0x43960000, 0x43160000 -glabel D_809F7F64 - .word 0x43F00000, 0x441B0000, 0x00000000 - diff --git a/data/overlays/actors/z_en_dodojr.reloc.s b/data/overlays/actors/z_en_dodojr.reloc.s deleted file mode 100644 index 6941af72d..000000000 --- a/data/overlays/actors/z_en_dodojr.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_809F7FA0 - .incbin "baserom/ovl_En_Dodojr", 0x1BE0, 0x000002B0 |