From a074165247198a90d4b95111e708746618e2f921 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sun, 30 May 2021 15:40:00 -0500 Subject: [PATCH] Moved .rodata in unknown_07B870 from asm to C. --- data/unknown_07B870.rodata.s | 20 -------------------- src/unknown_07B870.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 20 deletions(-) delete mode 100644 data/unknown_07B870.rodata.s diff --git a/data/unknown_07B870.rodata.s b/data/unknown_07B870.rodata.s deleted file mode 100644 index cd3977cc..00000000 --- a/data/unknown_07B870.rodata.s +++ /dev/null @@ -1,20 +0,0 @@ -.include "macros.inc" - -.macro .aligned_text ascii - .asciz "\ascii" - .balign 4 -.endm - -.section .rodata - -.aligned_text "Error: Texture no %x out of range on load. !!\n" -.aligned_text "TEX Error: Palette memory overflow!!\n" -.aligned_text "TEX Error: TexTab overflow!!\n" -.aligned_text "texFreeTexture: NULL tex!!\n" -.aligned_text "TEX Error: Tryed to deallocate non-existent texture!!\n" -.aligned_text "SRPBUF overflow!!\n" -.aligned_text "Error: Sprite table overflow!!\n" -.aligned_text "texFreeSprite: NULL sprite!!\n" -.aligned_text "TEXSPR Error: Tryed to deallocate non-existent sprite!!\n" - -.word 0x00000000 diff --git a/src/unknown_07B870.c b/src/unknown_07B870.c index 1a9c1428..c304859e 100644 --- a/src/unknown_07B870.c +++ b/src/unknown_07B870.c @@ -466,6 +466,21 @@ u32 D_800DF410[] = { /*******************************/ + +/************ .rodata ************/ + +const char D_800E7B30[] = "Error: Texture no %x out of range on load. !!\n"; +const char D_800E7B60[] = "TEX Error: Palette memory overflow!!\n"; +const char D_800E7B88[] = "TEX Error: TexTab overflow!!\n"; +const char D_800E7BA8[] = "texFreeTexture: NULL tex!!\n"; +const char D_800E7BC4[] = "TEX Error: Tryed to deallocate non-existent texture!!\n"; +const char D_800E7BFC[] = "SRPBUF overflow!!\n"; +const char D_800E7C10[] = "Error: Sprite table overflow!!\n"; +const char D_800E7C30[] = "texFreeSprite: NULL sprite!!\n"; +const char D_800E7C50[] = "TEXSPR Error: Tryed to deallocate non-existent sprite!!\n"; + +/*********************************/ + /************ .bss ************/ extern s32 D_80126338;