From 214d0923a4074cb66d9ebf13095f29c555e29f0a Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sun, 30 May 2021 14:49:29 -0500 Subject: [PATCH] Moved .rodata in unknown_05F690 from asm to C. --- data/unknown_05F690.rodata.s | 74 ------------------------------------ src/unknown_05F690.c | 26 +++++++++++++ 2 files changed, 26 insertions(+), 74 deletions(-) delete mode 100644 data/unknown_05F690.rodata.s diff --git a/data/unknown_05F690.rodata.s b/data/unknown_05F690.rodata.s deleted file mode 100644 index be4ca171..00000000 --- a/data/unknown_05F690.rodata.s +++ /dev/null @@ -1,74 +0,0 @@ -.include "macros.inc" - -.macro .aligned_text ascii - .asciz "\ascii" - .balign 4 -.endm - -.section .rodata - -glabel D_800E6AB0 -.word 0x3FD33333 - -glabel D_800E6AB4 -.word 0x33333333 - -glabel D_800E6AB8 -.word 0xBFD33333 - -glabel D_800E6ABC -.word 0x33333333 - -glabel D_800E6AC0 -.word 0x3FD99999 - -glabel D_800E6AC4 -.word 0x9999999A - -glabel D_800E6AC8 -.word 0x3FDCCCCC - -glabel D_800E6ACC -.word 0xCCCCCCCD - -glabel D_800E6AD0 -.word 0x8005EE9C -.word 0x8005EEC0 -.word 0x8005EEF8 -.word 0x8005EF14 -.word 0x8005EF6C -.word 0x8005EF98 - -glabel D_800E6AE8 -.word 0xBFB99999 - -glabel D_800E6AEC -.word 0x9999999A - -glabel D_800E6AF0 -.word 0x3FB99999 - -glabel D_800E6AF4 -.word 0x9999999A -.word 0x00000000 -.word 0x00000000 - -glabel D_800E6B00 -.word 0x3FD33333 - -glabel D_800E6B04 -.word 0x33333333 - -glabel D_800E6B08 -.word 0xBFD33333 - -glabel D_800E6B0C -.word 0x33333333 - -glabel D_800E6B10 -.word 0x3FD99999 - -glabel D_800E6B14 -.word 0x9999999A -.word 0x00000000 -.word 0x00000000 diff --git a/src/unknown_05F690.c b/src/unknown_05F690.c index 5d67e307..a01b4021 100644 --- a/src/unknown_05F690.c +++ b/src/unknown_05F690.c @@ -26,6 +26,32 @@ s32 D_800DCEA4 = 1980; /*******************************/ +/************ .rodata ************/ + +const DoubleLiteral D_800E6AB0 = { 0.3 }; +const DoubleLiteral D_800E6AB8 = { -0.3 }; +const DoubleLiteral D_800E6AC0 = { 0.4 }; +const DoubleLiteral D_800E6AC8 = { 0.45 }; + +// Jump table in func_8005EA90 +const u32 D_800E6AD0[] = { + 0x8005EE9C, 0x8005EEC0, 0x8005EEF8, 0x8005EF14, + 0x8005EF6C, 0x8005EF98 +}; + +const DoubleLiteral D_800E6AE8 = { -0.1 }; +const DoubleLiteral D_800E6AF0 = { 0.1 }; + +// This is probably just file boundary padding. +const DoubleLiteral D_800E6AF8 = { 0.0 }; + +const DoubleLiteral D_800E6B00 = { 0.3 }; +const DoubleLiteral D_800E6B08 = { -0.3 }; +const DoubleLiteral D_800E6B10 = { 0.4 }; + + +/*********************************/ + GLOBAL_ASM("asm/non_matchings/unknown_05F690/func_8005EA90.s") GLOBAL_ASM("asm/non_matchings/unknown_05F690/func_8005F310.s") GLOBAL_ASM("asm/non_matchings/unknown_05F690/func_8005F850.s")