mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-09-21 04:24:43 +00:00
Code Issues Projects Releases Wiki Activity

moved rodata for Iceblock (#525)

Browse Source
This commit is contained in:
engineer124 2020-12-12 03:55:41 +11:00 committed by GitHub
parent 51b204f8e1
commit bc8e3745c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 242 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Init.s
View File

@ -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)

6
asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879C04.s
View File

@ -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

27
asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D4C.s
View File

@ -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

65
asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D98.s
View File

@ -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)

22
asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Init.s
View File

@ -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)

6
asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Update.s
View File

@ -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)

10
asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0968.s
View File

@ -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)

51
asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B09F0.s
View File

@ -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)

12
asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0AE0.s
View File

@ -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)

6
asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0C44.s
View File

@ -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)

12
asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0CE0.s
View File

@ -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)

122
data/overlays/actors/z_bg_gnd_iceblock.rodata.s
View File

@ -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

106
data/overlays/actors/z_bg_spot08_iceblock.rodata.s
View File

@ -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

2
spec
View File

@ -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