From d447556e907fcb2a8aeb8424060c484dea02280b Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sun, 30 May 2021 16:34:04 -0500 Subject: [PATCH] Moved .rodata in unknown_072E50 from asm to C. --- data/unknown_072E50.rodata.s | 117 ----------------------------------- src/unknown_072E50.c | 47 ++++++++++++++ 2 files changed, 47 insertions(+), 117 deletions(-) delete mode 100644 data/unknown_072E50.rodata.s diff --git a/data/unknown_072E50.rodata.s b/data/unknown_072E50.rodata.s deleted file mode 100644 index e4ac95b7..00000000 --- a/data/unknown_072E50.rodata.s +++ /dev/null @@ -1,117 +0,0 @@ -.include "macros.inc" - -.macro .aligned_text ascii - .asciz "\ascii" - .balign 4 -.endm - -.section .rodata - -.aligned_text "Region = %d loc = %x size = %x\t" -.aligned_text "FREE" -.aligned_text "ALLOCATED" -.aligned_text "ALLOCATED,FIXED" -.aligned_text "\n" -.aligned_text "\n" -.aligned_text "Region number = %d\t" -.aligned_text "maxSlots = %d\t" -.aligned_text "slotsUsed = %d\t" -.aligned_text "loc = %x\t" -.aligned_text "size = %x\n" -.aligned_text "\n" - -glabel D_800E7630 -.aligned_text "DKRACING-ADV" - -glabel D_800E7640 -.aligned_text "DKRACING-ADV" - -glabel D_800E7650 -.aligned_text "DKRACING-TIMES" - -glabel D_800E7660 -.aligned_text "DKRACING-TIMES" - -glabel D_800E7670 -.aligned_text "DKRACING-ADV" - -glabel D_800E7680 -.aligned_text "DKRACING-ADV" - -glabel D_800E7690 -.aligned_text "DKRACING-TIMES" - -glabel D_800E76A0 -.aligned_text "DKRACING-TIMES" - -.aligned_text "WARNING : No Eprom\n" -.aligned_text "WARNING : No Eprom\n" -.aligned_text "WARNING : No Eprom\n" -.aligned_text "WARNING : No Eprom\n" -.aligned_text "WARNING : No Eprom\n" -.aligned_text "WARNING : No Eprom\n" -.aligned_text "WARNING : No Eprom\n" - -glabel D_800E773C -.aligned_text "DKRACING-GHOSTS" - -glabel D_800E774C -.word 0x00000000 - -.aligned_text "warning: corrupt ghost\n" - -glabel D_800E7768 -.aligned_text "DKRACING-GHOSTS" - -glabel D_800E7778 -.word 0x00000000 - -glabel D_800E777C -.aligned_text "DKRACING-GHOSTS" - -glabel D_800E778C -.word 0x00000000 - -glabel D_800E7790 -.aligned_text "DKRACING-GHOSTS" - -glabel D_800E77A0 -.word 0x00000000 - -glabel D_800E77A4 -.aligned_text "DKRACING-GHOSTS" - -glabel D_800E77B4 -.word 0x00000000 - -glabel D_800E77B8 -.aligned_text "DKRACING-GHOSTS" - -glabel D_800E77C8 -.word 0x00000000 - -glabel D_800E77CC -.aligned_text "DKRACING-GHOSTS" - -glabel D_800E77DC -.word 0x00000000 - -glabel D_800E77E0 -.word 0x3FB99999 - -glabel D_800E77E4 -.word 0x9999999A - -glabel D_800E77E8 -.word 0x400CCCCC - -glabel D_800E77EC -.word 0xCCCCCCCD - -glabel D_800E77F0 -.word 0x407EA000 - -glabel D_800E77F4 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 diff --git a/src/unknown_072E50.c b/src/unknown_072E50.c index f6ad31ab..585fced0 100644 --- a/src/unknown_072E50.c +++ b/src/unknown_072E50.c @@ -13,6 +13,53 @@ s32 D_800DE48C = 0; /*******************************/ +/************ .rodata ************/ + +const char D_800E7590[] = "Region = %d loc = %x size = %x\t"; +const char D_800E75B4[] = "FREE"; +const char D_800E75BC[] = "ALLOCATED"; +const char D_800E75C8[] = "ALLOCATED,FIXED"; +const char D_800E75D8[] = "\n"; +const char D_800E75DC[] = "\n"; +const char D_800E75E0[] = "Region number = %d\t"; +const char D_800E75F4[] = "maxSlots = %d\t"; +const char D_800E7604[] = "slotsUsed = %d\t"; +const char D_800E7614[] = "loc = %x\t"; +const char D_800E7620[] = "size = %x\n"; +const char D_800E762C[] = "\n"; + +const char D_800E7630[] = "DKRACING-ADV"; +const char D_800E7640[] = "DKRACING-ADV"; +const char D_800E7650[] = "DKRACING-TIMES"; +const char D_800E7660[] = "DKRACING-TIMES"; +const char D_800E7670[] = "DKRACING-ADV"; +const char D_800E7680[] = "DKRACING-ADV"; +const char D_800E7690[] = "DKRACING-TIMES"; +const char D_800E76A0[] = "DKRACING-TIMES"; + +const char D_800E76B0[] = "WARNING : No Eprom\n"; +const char D_800E76C4[] = "WARNING : No Eprom\n"; +const char D_800E76D8[] = "WARNING : No Eprom\n"; +const char D_800E76EC[] = "WARNING : No Eprom\n"; +const char D_800E7700[] = "WARNING : No Eprom\n"; +const char D_800E7714[] = "WARNING : No Eprom\n"; +const char D_800E7728[] = "WARNING : No Eprom\n"; + +const char D_800E773C[] = "DKRACING-GHOSTS\0"; +const char D_800E7750[] = "warning: corrupt ghost\n"; +const char D_800E7768[] = "DKRACING-GHOSTS\0"; +const char D_800E777C[] = "DKRACING-GHOSTS\0"; +const char D_800E7790[] = "DKRACING-GHOSTS\0"; +const char D_800E77A4[] = "DKRACING-GHOSTS\0"; +const char D_800E77B8[] = "DKRACING-GHOSTS\0"; +const char D_800E77CC[] = "DKRACING-GHOSTS\0"; + +const DoubleLiteral D_800E77E0 = { 0.1 }; +const DoubleLiteral D_800E77E8 = { 3.6 }; +const DoubleLiteral D_800E77F0 = { 490.0 }; + +/*********************************/ + /************ .bss ************/ extern s32 D_80124010;