From 0c9d8794c5b3397d5c701b079c4b7aeda08c1e91 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 30 Nov 2022 17:21:09 -0500 Subject: [PATCH] renamed dmacopy2 to dmacopy_doubleword --- asm/math_util.s | 2 +- asm/math_util/{dmacopy2.s => dmacopy_doubleword.s} | 2 +- src/game.c | 2 +- src/game.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename asm/math_util/{dmacopy2.s => dmacopy_doubleword.s} (93%) diff --git a/asm/math_util.s b/asm/math_util.s index c6583ede..78cb3c29 100644 --- a/asm/math_util.s +++ b/asm/math_util.s @@ -47,7 +47,7 @@ .include "asm/math_util/calc_dyn_lighting_for_level_segment.s" # UNUSED .include "asm/math_util/area_triangle_2d.s" # Floating Point Math with sqrt .include "asm/math_util/set_breakpoint.s" # UNUSED - -.include "asm/math_util/dmacopy2.s" # Uses mips3 instructions to copy data from s64 values arg0 to arg1 in a loop +.include "asm/math_util/dmacopy_doubleword.s" # Uses mips3 instructions to copy data from s64 values arg0 to arg1 in a loop .section .data diff --git a/asm/math_util/dmacopy2.s b/asm/math_util/dmacopy_doubleword.s similarity index 93% rename from asm/math_util/dmacopy2.s rename to asm/math_util/dmacopy_doubleword.s index 62a49b42..cea9cd5e 100644 --- a/asm/math_util/dmacopy2.s +++ b/asm/math_util/dmacopy_doubleword.s @@ -1,4 +1,4 @@ -glabel dmacopy2 +glabel dmacopy_doubleword .L80070B04: /* 071704 80070B04 DC880000 */ ld $t0, ($a0) /* 071708 80070B08 DC890008 */ ld $t1, 8($a0) diff --git a/src/game.c b/src/game.c index 538d2835..1ec0f99e 100644 --- a/src/game.c +++ b/src/game.c @@ -1002,7 +1002,7 @@ void main_game_loop(void) { if (osTvType == TV_TYPE_PAL) { framebufferSize = (s32)((SCREEN_WIDTH * SCREEN_HEIGHT * 2) * 1.1f); } - dmacopy2(gVideoLastFramebuffer, (s32)gVideoCurrFramebuffer, (s32)gVideoCurrFramebuffer + framebufferSize); + dmacopy_doubleword(gVideoLastFramebuffer, (s32)gVideoCurrFramebuffer, (s32)gVideoCurrFramebuffer + framebufferSize); } // tempLogicUpdateRate will be set to a value 2 or higher, based on the framerate. // the mul factor is hardcapped at 6, which happens at 10FPS. The mul factor diff --git a/src/game.h b/src/game.h index b5bb1f62..e0f4bd39 100644 --- a/src/game.h +++ b/src/game.h @@ -79,7 +79,7 @@ extern s32 gVideoLastDepthBuffer; void f32_matrix_to_s16_matrix(Matrix *, Matrix *); //math_util void f32_matrix_from_position(Matrix *, f32, f32, f32); //From math_util -void dmacopy2(s32 videoLastFrameBuffer, s32 VideoCurrFrameBuffer, s32 size); +void dmacopy_doubleword(s32 videoLastFrameBuffer, s32 VideoCurrFrameBuffer, s32 size); s16 func_8006ABB4(s32 arg0); s32 func_8006B018(s8 arg0);