diff options
| author | kroemker <lk1994@gmx.net> | 2020-09-27 03:06:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-26 21:06:30 -0400 |
| commit | 0dca636f4a678535dd6fa3d41f7f1bd7b3137cbc (patch) | |
| tree | e6f45fee566ec6526c75a75e8ff67b52e7a6214f /data | |
| parent | c864ce0de2012c686a4db83f0e21f83c1759d3f9 (diff) | |
BgMizuWater OK (#359)
* BgMizuWater OK
* Renaming
* Fix formatting
* Cleanup, use new gfx functions
* Fix stack issue
* PR fixes
* Apply suggestions from code review
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* PR fixes
* More PR fixes
* Fix formatting
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Diffstat (limited to 'data')
| -rw-r--r-- | data/overlays/actors/z_bg_mizu_water.data.s | 27 | ||||
| -rw-r--r-- | data/overlays/actors/z_bg_mizu_water.reloc.s | 13 |
2 files changed, 0 insertions, 40 deletions
diff --git a/data/overlays/actors/z_bg_mizu_water.data.s b/data/overlays/actors/z_bg_mizu_water.data.s deleted file mode 100644 index 0adc3b63d..000000000 --- a/data/overlays/actors/z_bg_mizu_water.data.s +++ /dev/null @@ -1,27 +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 D_808A0510 - .word 0x00000000 -glabel D_808A0514 - .word 0x00000000, 0x0000001E, 0x00000000, 0x0000001D, 0xFFFFFEC0, 0x0000001C, 0xFFFFFCF4 -glabel Bg_Mizu_Water_InitVars - .word 0x00650100, 0x00000030, 0x00590000, 0x00000160 -.word BgMizuWater_Init -.word BgMizuWater_Destroy -.word BgMizuWater_Update -.word BgMizuWater_Draw -.word 0x00000000, 0x42DC0000 -glabel D_808A0558 - .word 0x00000002, 0x00000003, 0x00000005, 0x00000007, 0x0000000C, 0x00000014, 0x00000015, 0x00000016 -glabel D_808A0578 - .word 0x40500001, 0x00000000 - diff --git a/data/overlays/actors/z_bg_mizu_water.reloc.s b/data/overlays/actors/z_bg_mizu_water.reloc.s deleted file mode 100644 index 9f5ea8caa..000000000 --- a/data/overlays/actors/z_bg_mizu_water.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_808A0640 - .incbin "baserom/ovl_Bg_Mizu_Water", 0xD90, 0x00000140 |