diff --git a/data/unknown_05CEF0.rodata.s b/data/unknown_05CEF0.rodata.s deleted file mode 100644 index eb3a3cd2..00000000 --- a/data/unknown_05CEF0.rodata.s +++ /dev/null @@ -1,32 +0,0 @@ -.include "macros.inc" - -.macro .aligned_text ascii - .asciz "\ascii" - .balign 4 -.endm - -.section .rodata - -glabel D_800E6A10 -.word 0x3FD33333 - -glabel D_800E6A14 -.word 0x33333333 - -glabel D_800E6A18 -.word 0xBFB99999 - -glabel D_800E6A1C -.word 0x9999999A - -glabel D_800E6A20 -.word 0x3FB99999 - -glabel D_800E6A24 -.word 0x9999999A - -glabel D_800E6A28 -.word 0x4085E000 - -glabel D_800E6A2C -.word 0x00000000 diff --git a/data/unknown_05DCD0.rodata.s b/data/unknown_05DCD0.rodata.s deleted file mode 100644 index 838ae7dc..00000000 --- a/data/unknown_05DCD0.rodata.s +++ /dev/null @@ -1,82 +0,0 @@ -.include "macros.inc" - -.macro .aligned_text ascii - .asciz "\ascii" - .balign 4 -.endm - -.section .rodata - -glabel D_800E6A30 -.word 0x3FD33333 - -glabel D_800E6A34 -.word 0x33333333 - -glabel D_800E6A38 -.word 0xBFB99999 - -glabel D_800E6A3C -.word 0x9999999A - -glabel D_800E6A40 -.word 0x3FB99999 - -glabel D_800E6A44 -.word 0x9999999A - -glabel D_800E6A48 -.word 0x4085E000 - -glabel D_800E6A4C -.word 0x00000000 - -glabel D_800E6A50 -.word 0x3FD33333 - -glabel D_800E6A54 -.word 0x33333333 - -glabel D_800E6A58 -.word 0xBFD33333 - -glabel D_800E6A5C -.word 0x33333333 - -glabel D_800E6A60 -.word 0x3FD147AE - -glabel D_800E6A64 -.word 0x147AE148 - -glabel D_800E6A68 -.word 0x3FDCCCCC - -glabel D_800E6A6C -.word 0xCCCCCCCD - -glabel D_800E6A70 -.word 0x8005DBEC -.word 0x8005DC10 -.word 0x8005DC48 -.word 0x8005DC64 -.word 0x8005DCBC -.word 0x8005DCE8 - -glabel D_800E6A88 -.word 0xBFB99999 - -glabel D_800E6A8C -.word 0x9999999A - -glabel D_800E6A90 -.word 0x3FB99999 - -glabel D_800E6A94 -.word 0x9999999A - -glabel D_800E6A98 -.word 0x4085E000 - -glabel D_800E6A9C -.word 0x00000000 diff --git a/src/unknown_05CEF0.c b/src/unknown_05CEF0.c index d9f998b9..71f76806 100644 --- a/src/unknown_05CEF0.c +++ b/src/unknown_05CEF0.c @@ -15,6 +15,15 @@ s16 D_800DCDE0[16] = { /*******************************/ +/************ .rodata ************/ + +const DoubleLiteral D_800E6A10 = { 0.3 }; +const DoubleLiteral D_800E6A18 = { -0.1 }; +const DoubleLiteral D_800E6A20 = { 0.1 }; +const DoubleLiteral D_800E6A28 = { 700.0 }; + +/*********************************/ + GLOBAL_ASM("asm/non_matchings/unknown_05CEF0/func_8005C2F0.s") GLOBAL_ASM("asm/non_matchings/unknown_05CEF0/func_8005C364.s") GLOBAL_ASM("asm/non_matchings/unknown_05CEF0/func_8005CA78.s") diff --git a/src/unknown_05DCD0.c b/src/unknown_05DCD0.c index 64c60118..5836dd7f 100644 --- a/src/unknown_05DCD0.c +++ b/src/unknown_05DCD0.c @@ -22,6 +22,29 @@ s16 D_800DCE20[16] = { /*******************************/ +/************ .rodata ************/ + +const DoubleLiteral D_800E6A30 = { 0.3 }; +const DoubleLiteral D_800E6A38 = { -0.1 }; +const DoubleLiteral D_800E6A40 = { 0.1 }; +const DoubleLiteral D_800E6A48 = { 700.0 }; +const DoubleLiteral D_800E6A50 = { 0.3 }; +const DoubleLiteral D_800E6A58 = { -0.3 }; +const DoubleLiteral D_800E6A60 = { 0.27 }; +const DoubleLiteral D_800E6A68 = { 0.45 }; + +// Jump table in func_8005D820 +const u32 D_800E6A70[] = { + 0x8005DBEC, 0x8005DC10, 0x8005DC48, 0x8005DC64, + 0x8005DCBC, 0x8005DCE8 +}; + +const DoubleLiteral D_800E6A88 = { -0.1 }; +const DoubleLiteral D_800E6A90 = { 0.1 }; +const DoubleLiteral D_800E6A98 = { 700.0 }; + +/*********************************/ + GLOBAL_ASM("asm/non_matchings/unknown_05DCD0/func_8005D0D0.s") GLOBAL_ASM("asm/non_matchings/unknown_05DCD0/func_8005D820.s") GLOBAL_ASM("asm/non_matchings/unknown_05DCD0/func_8005E204.s")