diff options
| author | gamestabled <55638330+gamestabled@users.noreply.github.com> | 2021-01-15 16:00:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 16:00:01 -0500 |
| commit | ed4d8af39e4b0cbdffad394c64cab95a8a055235 (patch) | |
| tree | e4393a52215f7633dcfe3beac7df7d750d55bf27 /data | |
| parent | 11a021a9a590729fbf1b29689b7efee123efce56 (diff) | |
Shopnuts (#577)
* matched functions, still need data
* shopnuts OK
* cleaned up some things in hintnuts by comparing to shopnuts
* merge with new animation stuff
* fixing merge 2
* suggested changes
* missed a DECR
* suggestions
Diffstat (limited to 'data')
| -rw-r--r-- | data/overlays/actors/z_en_shopnuts.data.s | 24 | ||||
| -rw-r--r-- | data/overlays/actors/z_en_shopnuts.reloc.s | 13 |
2 files changed, 0 insertions, 37 deletions
diff --git a/data/overlays/actors/z_en_shopnuts.data.s b/data/overlays/actors/z_en_shopnuts.data.s deleted file mode 100644 index 00d58bfc8..000000000 --- a/data/overlays/actors/z_en_shopnuts.data.s +++ /dev/null @@ -1,24 +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_Shopnuts_InitVars - .word 0x01950500, 0x00000005, 0x01680000, 0x000002BC -.word EnShopnuts_Init -.word EnShopnuts_Destroy -.word EnShopnuts_Update -.word EnShopnuts_Draw -glabel D_80AFB4E0 - .word 0x06000939, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x00140028, 0x00000000, 0x00000000 -glabel D_80AFB50C - .word 0x01000014, 0x0028FE00 -glabel D_80AFB514 - .word 0x8917004E, 0xB06CFFFF, 0x304C0A28 - diff --git a/data/overlays/actors/z_en_shopnuts.reloc.s b/data/overlays/actors/z_en_shopnuts.reloc.s deleted file mode 100644 index 91ad6389a..000000000 --- a/data/overlays/actors/z_en_shopnuts.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_80AFB570 - .incbin "baserom/ovl_En_Shopnuts", 0xE50, 0x00000120 |