From 6ea6204c631b5c2752c819e314be58e26f1abcd1 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Fri, 4 Jun 2021 21:45:46 -0500 Subject: [PATCH] Moved rodata from C to GLOBAL_ASM in unknown_0B8920 --- .../unknown_0B8920/func_800B82B4.s | 7 +++++++ .../unknown_0B8920/func_800BF634.s | 19 +++++++++++++++++++ src/unknown_0B8920.c | 11 ----------- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/asm/non_matchings/unknown_0B8920/func_800B82B4.s b/asm/non_matchings/unknown_0B8920/func_800B82B4.s index fa0f7406..ddd79fb5 100644 --- a/asm/non_matchings/unknown_0B8920/func_800B82B4.s +++ b/asm/non_matchings/unknown_0B8920/func_800B82B4.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_800E92A0 +.float 10000.0 +glabel D_800E92A4 +.float -10000.0 + +.text glabel func_800B82B4 /* 0B8EB4 800B82B4 27BDFF90 */ addiu $sp, $sp, -0x70 /* 0B8EB8 800B82B8 AFBF0044 */ sw $ra, 0x44($sp) diff --git a/asm/non_matchings/unknown_0B8920/func_800BF634.s b/asm/non_matchings/unknown_0B8920/func_800BF634.s index b5319fca..3ea08062 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BF634.s +++ b/asm/non_matchings/unknown_0B8920/func_800BF634.s @@ -1,3 +1,22 @@ +.late_rodata +glabel D_800E92A8 +.float 6.64 +glabel D_800E92AC +.float 89128.961 +glabel D_800E92B0 +.float 6.5333333 +glabel D_800E92B4 +.float 89128.961 +glabel D_800E92B8 +.float 6.64 +glabel D_800E92BC +.float 89128.961 +glabel D_800E92C0 +.float 6.5333333 +glabel D_800E92C4 +.float 89128.961 + +.text glabel func_800BF634 /* 0C0234 800BF634 3C03800E */ lui $v1, %hi(D_800E3190) # $v1, 0x800e /* 0C0238 800BF638 24633190 */ addiu $v1, %lo(D_800E3190) # addiu $v1, $v1, 0x3190 diff --git a/src/unknown_0B8920.c b/src/unknown_0B8920.c index 1990f103..155b07b4 100644 --- a/src/unknown_0B8920.c +++ b/src/unknown_0B8920.c @@ -112,17 +112,6 @@ const char D_800E91E4[] = "\nError :: can not remove a wave swell object which d const char D_800E9228[] = "\nError :: more than eight swells overlap on column %d."; const char D_800E9260[] = "\nError :: can not add another wave swell, reached limit of %d."; -const FloatLiteral D_800E92A0 = { 10000.0f }; -const FloatLiteral D_800E92A4 = { -10000.0f }; -const FloatLiteral D_800E92A8 = { 6.64f }; -const FloatLiteral D_800E92AC = { 89128.961f }; -const FloatLiteral D_800E92B0 = { 6.5333333f }; -const FloatLiteral D_800E92B4 = { 89128.961f}; -const FloatLiteral D_800E92B8 = { 6.64f }; -const FloatLiteral D_800E92BC = { 89128.961f }; -const FloatLiteral D_800E92C0 = { 6.5333333f }; -const FloatLiteral D_800E92C4 = { 89128.961f }; - /*********************************/ /************ .bss ************/