From 1ac9479caeccca1b4f03436a0cd7c91ee58cd505 Mon Sep 17 00:00:00 2001 From: mzxrules Date: Sun, 25 Apr 2021 19:36:43 -0400 Subject: z_bg_mizu_movebg and object_mizu_objects (#747) * OK a few functions * BgMizuMovebg_Draw OK, make tweaks to bg_mizu_bwall * migrate data * create mizu_objects, defines for water temple water level * clean up some code * implement most suggestions * review * review2 * formatting Co-authored-by: Fig02 --- data/overlays/actors/z_bg_mizu_movebg.bss.s | 14 ------------- data/overlays/actors/z_bg_mizu_movebg.data.s | 30 ---------------------------- 2 files changed, 44 deletions(-) delete mode 100644 data/overlays/actors/z_bg_mizu_movebg.bss.s delete mode 100644 data/overlays/actors/z_bg_mizu_movebg.data.s (limited to 'data') diff --git a/data/overlays/actors/z_bg_mizu_movebg.bss.s b/data/overlays/actors/z_bg_mizu_movebg.bss.s deleted file mode 100644 index c834016af..000000000 --- a/data/overlays/actors/z_bg_mizu_movebg.bss.s +++ /dev/null @@ -1,14 +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 .bss - -.balign 16 - -glabel D_8089EE40 - .space 0x10 - diff --git a/data/overlays/actors/z_bg_mizu_movebg.data.s b/data/overlays/actors/z_bg_mizu_movebg.data.s deleted file mode 100644 index 6a64e460e..000000000 --- a/data/overlays/actors/z_bg_mizu_movebg.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_Mizu_Movebg_InitVars - .word 0x00640100, 0x00000010, 0x00590000, 0x00000188 -.word BgMizuMovebg_Init -.word BgMizuMovebg_Destroy -.word BgMizuMovebg_Update -.word BgMizuMovebg_Draw -glabel D_8089EB40 - .word 0xC2E66667, 0xC2E66667, 0xC2E66667, 0x00000000 -glabel D_8089EB50 - .word 0x06000190, 0x06000680, 0x06000C20, 0x06002E10, 0x06002E10, 0x06002E10, 0x06002E10, 0x060011F0 -glabel D_8089EB70 - .word 0x060003F0, 0x06000998, 0x06000ED0, 0x06003590, 0x06003590, 0x06003590, 0x06003590, 0x060015F8 -glabel D_8089EB90 - .word 0xB0F805DC, 0xB0FC044C, 0xB0F403E8, 0x48500064 -glabel D_8089EBA0 - .word 0x00000000, 0x42A00000, 0x41B80000 -glabel D_8089EBAC - .word 0x00000000, 0x42A00000, 0x41B80000, 0x00000000, 0x00000000 - -- cgit v1.2.3