diff options
| author | Parker Burnett <burnettparker@gmail.com> | 2021-02-12 17:29:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 17:29:05 -0500 |
| commit | 43bba20796dd620552cc6dc6b317bbf3856d230a (patch) | |
| tree | 3e594e6d2eb752b7d447b2d841b7d42dea81bb04 /data | |
| parent | bcf2694f937703c6429aee5ba8ed5959e8b4b444 (diff) | |
Bg haka huta OK (#682)
* starting haka_huta with new changes
* matched last func, deleting asm
* added changes from review
Diffstat (limited to 'data')
| -rw-r--r-- | data/overlays/actors/z_bg_haka_huta.data.s | 30 | ||||
| -rw-r--r-- | data/overlays/actors/z_bg_haka_huta.reloc.s | 13 |
2 files changed, 0 insertions, 43 deletions
diff --git a/data/overlays/actors/z_bg_haka_huta.data.s b/data/overlays/actors/z_bg_haka_huta.data.s deleted file mode 100644 index ae305b14a..000000000 --- a/data/overlays/actors/z_bg_haka_huta.data.s +++ /dev/null @@ -1,30 +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 Bg_Haka_Huta_InitVars - .word 0x00BD0100, 0x00000010, 0x008D0000, 0x0000016C -.word BgHakaHuta_Init -.word BgHakaHuta_Destroy -.word BgHakaHuta_Update -.word BgHakaHuta_Draw -glabel D_8087D940 - .word 0x48500064 -glabel D_8087D944 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_8087D950 - .word 0x1E1432FF -glabel D_8087D954 - .word 0x000000FF -glabel D_8087D958 - .word 0x41F00000, 0x00000000, 0x00000000 -glabel D_8087D964 - .word 0x3D05729B, 0x3EA6CF42, 0xBF71E4F7 - diff --git a/data/overlays/actors/z_bg_haka_huta.reloc.s b/data/overlays/actors/z_bg_haka_huta.reloc.s deleted file mode 100644 index 4f4158482..000000000 --- a/data/overlays/actors/z_bg_haka_huta.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_8087D980 - .incbin "baserom/ovl_Bg_Haka_Huta", 0x9C0, 0x000000C0 |