From 515065c717e32db4020a34296145f6380d78dd82 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sun, 30 May 2021 15:52:11 -0500 Subject: [PATCH] Moved .rodata in unknown_062930 from asm to unknown_05F690.c. --- data/unknown_062930.rodata.s | 20 -------------------- src/unknown_05F690.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 data/unknown_062930.rodata.s diff --git a/data/unknown_062930.rodata.s b/data/unknown_062930.rodata.s deleted file mode 100644 index fa69915c..00000000 --- a/data/unknown_062930.rodata.s +++ /dev/null @@ -1,20 +0,0 @@ -.include "macros.inc" - -.macro .aligned_text ascii - .asciz "\ascii" - .balign 4 -.endm - -.section .rodata - -# I am not sure if this is in the correct file. It is hard to tell without any glabels. - -.aligned_text "Error: Model no. out of range on load. !!\n" -.aligned_text "TEXTURE ERROR!!\n%d,%d\n" -.aligned_text "Error: Model table overflow!!\n" -.aligned_text "WARNING :: createModelInstance called with NULL pointer\n" -.aligned_text "ModFreeModel : NULL mod_inst!!\n" -.aligned_text "MOD Error: Tryed to deallocate non-existent model!!\n" - -.word 0x00000000 -.word 0x00000000 diff --git a/src/unknown_05F690.c b/src/unknown_05F690.c index a01b4021..c09fcd4a 100644 --- a/src/unknown_05F690.c +++ b/src/unknown_05F690.c @@ -49,6 +49,17 @@ const DoubleLiteral D_800E6B00 = { 0.3 }; const DoubleLiteral D_800E6B08 = { -0.3 }; const DoubleLiteral D_800E6B10 = { 0.4 }; +// This is another file boundary. +const DoubleLiteral D_800E6B18 = { 0.0 }; + +// I am not sure where these go. It is hard to tell without any glabels. +// Need to figure out which file handles creating models. +const char D_800E6B20[] = "Error: Model no. out of range on load. !!\n"; +const char D_800E6B4C[] = "TEXTURE ERROR!!\n%d,%d\n"; +const char D_800E6B64[] = "Error: Model table overflow!!\n"; +const char D_800E6B84[] = "WARNING :: createModelInstance called with NULL pointer\n"; +const char D_800E6BC0[] = "ModFreeModel : NULL mod_inst!!\n"; +const char D_800E6BE0[] = "MOD Error: Tryed to deallocate non-existent model!!\n"; /*********************************/