From db78c062303b3e999ff81a82fceae57d24331803 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sat, 29 May 2021 22:14:53 -0500 Subject: [PATCH] Moved .rodata in unknown_080240 from asm to C. --- data/unknown_080240.rodata.s | 13 ------------- src/unknown_080240.c | 4 +--- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 data/unknown_080240.rodata.s diff --git a/data/unknown_080240.rodata.s b/data/unknown_080240.rodata.s deleted file mode 100644 index e29848b2..00000000 --- a/data/unknown_080240.rodata.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macros.inc" - -.macro .aligned_text ascii - .asciz "\ascii" - .balign 4 -.endm - -.section .rodata - -glabel D_800E7C90 -.aligned_text "SCREEN: No out of range!!\n" - -.word 0x00000000 diff --git a/src/unknown_080240.c b/src/unknown_080240.c index c9262c71..510b4b4a 100644 --- a/src/unknown_080240.c +++ b/src/unknown_080240.c @@ -15,8 +15,6 @@ Gfx D_800DF440[] = { /*******************************/ -extern s32 D_800E7C90; - u32 func_8007F640(s32 arg0) { u32 someAddr; s32 count, start, size; @@ -37,7 +35,7 @@ u32 func_8007F640(s32 arg0) { return 0x80100000; } else { if (arg0 < 0 || arg0 >= count) { - func_800C9D54(&D_800E7C90); + func_800C9D54("SCREEN: No out of range!!\n"); arg0 = 0; }