From bc8e3745c70784e0c425fbbf9a10a11720fce1de Mon Sep 17 00:00:00 2001 From: engineer124 <47598039+engineer124@users.noreply.github.com> Date: Sat, 12 Dec 2020 03:55:41 +1100 Subject: [PATCH] moved rodata for Iceblock (#525) --- .../ovl_Bg_Gnd_Iceblock/BgGndIceblock_Init.s | 25 ++++ .../ovl_Bg_Gnd_Iceblock/func_80879C04.s | 6 + .../ovl_Bg_Gnd_Iceblock/func_80879D4C.s | 27 ++++ .../ovl_Bg_Gnd_Iceblock/func_80879D98.s | 65 ++++++++++ .../BgSpot08Iceblock_Init.s | 22 ++++ .../BgSpot08Iceblock_Update.s | 6 + .../ovl_Bg_Spot08_Iceblock/func_808B0968.s | 10 ++ .../ovl_Bg_Spot08_Iceblock/func_808B09F0.s | 51 ++++++++ .../ovl_Bg_Spot08_Iceblock/func_808B0AE0.s | 12 ++ .../ovl_Bg_Spot08_Iceblock/func_808B0C44.s | 6 + .../ovl_Bg_Spot08_Iceblock/func_808B0CE0.s | 12 ++ .../actors/z_bg_gnd_iceblock.rodata.s | 122 ------------------ .../actors/z_bg_spot08_iceblock.rodata.s | 106 --------------- spec | 2 - 14 files changed, 242 insertions(+), 230 deletions(-) delete mode 100644 data/overlays/actors/z_bg_gnd_iceblock.rodata.s delete mode 100644 data/overlays/actors/z_bg_spot08_iceblock.rodata.s diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Init.s index 85114d6185..71eb3ed87b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Init.s @@ -1,3 +1,28 @@ +.rdata +glabel D_8087A790 + .asciz "../z_bg_gnd_iceblock.c" + .balign 4 + +glabel D_8087A7A8 + .asciz "thisx->world.position.x = %f\n" + .balign 4 + +glabel D_8087A7C8 + .asciz "0" + .balign 4 + +glabel D_8087A7CC + .asciz "../z_bg_gnd_iceblock.c" + .balign 4 + +.late_rodata +glabel D_8087A7E4 + .float 2792.0 + +glabel D_8087A7E8 + .float 3032.0 + +.text glabel BgGndIceblock_Init /* 00000 80879AA0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00004 80879AA4 AFA50034 */ sw $a1, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879C04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879C04.s index 858da77bd4..72ce05ced2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879C04.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879C04.s @@ -1,3 +1,9 @@ +.late_rodata + +glabel D_8087A7EC + .float 2552.0 + +.text glabel func_80879C04 /* 00164 80879C04 3C0E8088 */ lui $t6, %hi(D_8087A758) ## $t6 = 80880000 /* 00168 80879C08 25CEA758 */ addiu $t6, $t6, %lo(D_8087A758) ## $t6 = 8087A758 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D4C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D4C.s index 1cd2c29028..1312128e72 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D4C.s @@ -1,3 +1,30 @@ +.late_rodata + +glabel jtbl_8087A7F0 + .word L80879D7C + .word L80879D7C + .word L80879D8C + .word L80879D8C + .word L80879D8C + .word L80879D7C + .word L80879D8C + .word L80879D8C + .word L80879D84 + .word L80879D8C + .word L80879D8C + .word L80879D8C + .word L80879D8C + .word L80879D7C + .word L80879D8C + .word L80879D8C + .word L80879D7C + .word L80879D8C + .word L80879D8C + .word L80879D8C + .word L80879D7C + .word L80879D7C + +.text glabel func_80879D4C /* 002AC 80879D4C 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 002B0 80879D50 3C0F8088 */ lui $t7, %hi(D_8087AC40) ## $t7 = 80880000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D98.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D98.s index 8c596de518..d80c00ceb6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D98.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D98.s @@ -1,3 +1,68 @@ +.late_rodata + +glabel jtbl_8087A848 + .word L80879DE8 + .word L80879DE8 + .word L8087A0B8 + .word L8087A0B8 + .word L80879DFC + .word L8087A0B8 + .word L8087A0B8 + .word L8087A0B8 + .word L80879E38 + .word L8087A0B8 + .word L8087A0B8 + .word L80879E4C + .word L8087A0B8 + .word L8087A0B8 + .word L8087A0B8 + .word L80879E60 + .word L80879E60 + +glabel jtbl_8087A88C + .word L80879EB0 + .word L80879EB0 + .word L8087A0B8 + .word L8087A0B8 + .word L8087A0B8 + .word L80879EC4 + .word L8087A0B8 + .word L80879EC4 + .word L8087A0B8 + .word L80879ED8 + .word L8087A0B8 + .word L8087A0B8 + .word L80879EEC + .word L80879EEC + .word L8087A0B8 + .word L80879F00 + .word L80879F14 + +glabel jtbl_8087A8D0 + .word L80879F7C + .word L80879F90 + .word L8087A0B8 + .word L80879FA4 + .word L8087A0B8 + .word L8087A0B8 + .word L80879FB8 + .word L8087A0B8 + .word L80879FCC + .word L80879FE0 + +glabel jtbl_8087A8F8 + .word L8087A034 + .word L8087A048 + .word L8087A0B8 + .word L8087A05C + .word L8087A0B8 + .word L8087A05C + .word L8087A0B8 + .word L8087A0B8 + .word L8087A070 + .word L8087A084 + +.text glabel func_80879D98 /* 002F8 80879D98 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 002FC 80879D9C AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Init.s index 85d675285b..098c28999a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Init.s @@ -1,3 +1,25 @@ +.rdata + +glabel D_808B17C4 + .asciz "(spot08 流氷)(arg_data 0x%04x)\n" + .balign 4 + +.late_rodata + +glabel D_808B1890 + .float 65535.5 + +glabel D_808B1894 + .float 65535.5 + +glabel jtbl_808B1898 + .word L808B1308 + .word L808B1308 + .word L808B1318 + .word L808B1328 + .word L808B133C + +.text glabel BgSpot08Iceblock_Init /* 007F4 808B1154 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 007F8 808B1158 AFB00018 */ sw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Update.s index 10dcb7380f..45d7d2a237 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Update.s @@ -1,3 +1,9 @@ +.late_rodata + +glabel D_808B18AC + .float 0.05 + +.text glabel BgSpot08Iceblock_Update /* 00C34 808B1594 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00C38 808B1598 AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0968.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0968.s index 9374268fb1..062c574433 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0968.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0968.s @@ -1,3 +1,13 @@ +.rdata +glabel D_808B1710 + .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_808B1750 + .asciz "../z_bg_spot08_iceblock.c" + .balign 4 + +.text glabel func_808B0968 /* 00008 808B0968 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0000C 808B096C AFBF0024 */ sw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B09F0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B09F0.s index 053ee9fce7..b11dd96d1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B09F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B09F0.s @@ -1,3 +1,54 @@ +.rdata + +glabel D_808B176C + .asciz "Error : arg_data 設定ミスです。(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_808B17A8 + .asciz "../z_bg_spot08_iceblock.c" + .balign 4 + +.late_rodata + +glabel jtbl_808B17E4 + .word L808B0A74 + .word L808B0A50 + .word L808B0A50 + .word L808B0A74 + .word L808B0A50 + .word L808B0A50 + .word L808B0A50 + .word L808B0A50 + .word L808B0A50 + .word L808B0A50 + .word L808B0A50 + .word L808B0A50 + .word L808B0A50 + .word L808B0A50 + .word L808B0A50 + .word L808B0A74 + .word L808B0A74 + .word L808B0A74 + .word L808B0A50 + .word L808B0A74 + .word L808B0A50 + .word L808B0A50 + .word L808B0A50 + .word L808B0A50 + .word L808B0A50 + .word L808B0A50 + .word L808B0A50 + .word L808B0A50 + .word L808B0A50 + .word L808B0A50 + .word L808B0A50 + .word L808B0A74 + .word L808B0A50 + .word L808B0A50 + .word L808B0A74 + .word L808B0A74 + +.text glabel func_808B09F0 /* 00090 808B09F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00094 808B09F4 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0AE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0AE0.s index 7efa24487c..ac60034f7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0AE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0AE0.s @@ -1,3 +1,15 @@ +.late_rodata + +glabel D_808B1874 + .float 0.15 + +glabel D_808B1878 + .float 0.2 + +glabel D_808B187C + .float 0.4 + +.text glabel func_808B0AE0 /* 00180 808B0AE0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00184 808B0AE4 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0C44.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0C44.s index 4fb9c18840..e526e63719 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0C44.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0C44.s @@ -1,3 +1,9 @@ +.late_rodata + +glabel D_808B1880 + .float 0.001 + +.text glabel func_808B0C44 /* 002E4 808B0C44 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 002E8 808B0C48 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0CE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0CE0.s index 73af6ec69d..378bb35eb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0CE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0CE0.s @@ -1,3 +1,15 @@ +.late_rodata + +glabel D_808B1884 + .float 0.0016 + +glabel D_808B1888 + .float 0.0016 + +glabel D_808B188C + .float 9.58738019108e-05 + +.text glabel func_808B0CE0 /* 00380 808B0CE0 27BDFF18 */ addiu $sp, $sp, 0xFF18 ## $sp = FFFFFF18 /* 00384 808B0CE4 AFBF001C */ sw $ra, 0x001C($sp) diff --git a/data/overlays/actors/z_bg_gnd_iceblock.rodata.s b/data/overlays/actors/z_bg_gnd_iceblock.rodata.s deleted file mode 100644 index bbb06557d5..0000000000 --- a/data/overlays/actors/z_bg_gnd_iceblock.rodata.s +++ /dev/null @@ -1,122 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_8087A790 - .asciz "../z_bg_gnd_iceblock.c" - .balign 4 - -glabel D_8087A7A8 - .asciz "thisx->world.position.x = %f\n" - .balign 4 - -glabel D_8087A7C8 - .asciz "0" - .balign 4 - -glabel D_8087A7CC - .asciz "../z_bg_gnd_iceblock.c" - .balign 4 - -glabel D_8087A7E4 - .float 2792.0 - -glabel D_8087A7E8 - .float 3032.0 - -glabel D_8087A7EC - .float 2552.0 - -glabel jtbl_8087A7F0 - .word L80879D7C - .word L80879D7C - .word L80879D8C - .word L80879D8C - .word L80879D8C - .word L80879D7C - .word L80879D8C - .word L80879D8C - .word L80879D84 - .word L80879D8C - .word L80879D8C - .word L80879D8C - .word L80879D8C - .word L80879D7C - .word L80879D8C - .word L80879D8C - .word L80879D7C - .word L80879D8C - .word L80879D8C - .word L80879D8C - .word L80879D7C - .word L80879D7C - -glabel jtbl_8087A848 - .word L80879DE8 - .word L80879DE8 - .word L8087A0B8 - .word L8087A0B8 - .word L80879DFC - .word L8087A0B8 - .word L8087A0B8 - .word L8087A0B8 - .word L80879E38 - .word L8087A0B8 - .word L8087A0B8 - .word L80879E4C - .word L8087A0B8 - .word L8087A0B8 - .word L8087A0B8 - .word L80879E60 - .word L80879E60 - -glabel jtbl_8087A88C - .word L80879EB0 - .word L80879EB0 - .word L8087A0B8 - .word L8087A0B8 - .word L8087A0B8 - .word L80879EC4 - .word L8087A0B8 - .word L80879EC4 - .word L8087A0B8 - .word L80879ED8 - .word L8087A0B8 - .word L8087A0B8 - .word L80879EEC - .word L80879EEC - .word L8087A0B8 - .word L80879F00 - .word L80879F14 - -glabel jtbl_8087A8D0 - .word L80879F7C - .word L80879F90 - .word L8087A0B8 - .word L80879FA4 - .word L8087A0B8 - .word L8087A0B8 - .word L80879FB8 - .word L8087A0B8 - .word L80879FCC - .word L80879FE0 - -glabel jtbl_8087A8F8 - .word L8087A034 - .word L8087A048 - .word L8087A0B8 - .word L8087A05C - .word L8087A0B8 - .word L8087A05C - .word L8087A0B8 - .word L8087A0B8 - .word L8087A070 - .word L8087A084 - diff --git a/data/overlays/actors/z_bg_spot08_iceblock.rodata.s b/data/overlays/actors/z_bg_spot08_iceblock.rodata.s deleted file mode 100644 index f783be9ae9..0000000000 --- a/data/overlays/actors/z_bg_spot08_iceblock.rodata.s +++ /dev/null @@ -1,106 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_808B1710 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808B1750 - .asciz "../z_bg_spot08_iceblock.c" - .balign 4 - -glabel D_808B176C - .asciz "Error : arg_data 設定ミスです。(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808B17A8 - .asciz "../z_bg_spot08_iceblock.c" - .balign 4 - -glabel D_808B17C4 - .asciz "(spot08 流氷)(arg_data 0x%04x)\n" - .balign 4 - -glabel jtbl_808B17E4 - .word L808B0A74 - .word L808B0A50 - .word L808B0A50 - .word L808B0A74 - .word L808B0A50 - .word L808B0A50 - .word L808B0A50 - .word L808B0A50 - .word L808B0A50 - .word L808B0A50 - .word L808B0A50 - .word L808B0A50 - .word L808B0A50 - .word L808B0A50 - .word L808B0A50 - .word L808B0A74 - .word L808B0A74 - .word L808B0A74 - .word L808B0A50 - .word L808B0A74 - .word L808B0A50 - .word L808B0A50 - .word L808B0A50 - .word L808B0A50 - .word L808B0A50 - .word L808B0A50 - .word L808B0A50 - .word L808B0A50 - .word L808B0A50 - .word L808B0A50 - .word L808B0A50 - .word L808B0A74 - .word L808B0A50 - .word L808B0A50 - .word L808B0A74 - .word L808B0A74 - -glabel D_808B1874 - .float 0.15 - -glabel D_808B1878 - .float 0.2 - -glabel D_808B187C - .float 0.4 - -glabel D_808B1880 - .float 0.001 - -glabel D_808B1884 - .float 0.0016 - -glabel D_808B1888 - .float 0.0016 - -glabel D_808B188C - .float 9.58738019108e-05 - -glabel D_808B1890 - .float 65535.5 - -glabel D_808B1894 - .float 65535.5 - -glabel jtbl_808B1898 - .word L808B1308 - .word L808B1308 - .word L808B1318 - .word L808B1328 - .word L808B133C - -glabel D_808B18AC - .float 0.05 - diff --git a/spec b/spec index b62be1fdbe..1e4b426b32 100644 --- a/spec +++ b/spec @@ -718,7 +718,6 @@ beginseg name "ovl_Bg_Gnd_Iceblock" include "build/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.o" include "build/data/overlays/actors/z_bg_gnd_iceblock.data.o" - include "build/data/overlays/actors/z_bg_gnd_iceblock.rodata.o" include "build/data/overlays/actors/z_bg_gnd_iceblock.bss.o" include "build/data/overlays/actors/z_bg_gnd_iceblock.reloc.o" endseg @@ -1239,7 +1238,6 @@ beginseg name "ovl_Bg_Spot08_Iceblock" include "build/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.o" include "build/data/overlays/actors/z_bg_spot08_iceblock.data.o" - include "build/data/overlays/actors/z_bg_spot08_iceblock.rodata.o" include "build/data/overlays/actors/z_bg_spot08_iceblock.reloc.o" endseg