gijs
/
ogrebattle64
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrated `rodata` for `segment_song`

This commit is contained in:
gijs 2023-09-26 23:10:16 +02:00
parent 2688fc498a
commit 1fe21e35fe
3 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
splat.yaml
View File

@ -370,12 +370,12 @@ segments:
# Complete
find_file_boundaries: False
subsegments:
- [0x3F1B0, asm, "ob_knotty_chess"]
- [0x3FE70, asm, "ob_voracious_expansion"]
- [0x3F1B0, c, "_ob_knotty_chess"]
- [0x3FE70, c, "_ob_voracious_expansion"]
- [0x40640, data]
- [0x40E10, rodata, "ob_knotty_chess"]
- [0x40E10, .rodata, "_ob_knotty_chess"]
- { start: 0x40E80, type: bss, vram: 0x800EB8F0 }

36
src/segment_song/ob_knotty_chess.c → src/segment_song/_ob_knotty_chess.c
View File

@ -23,13 +23,13 @@ void func_800E9C20(void)
}
INCLUDE_ASM(const s32, "segment_song/ob_knotty_chess", func_800E9CEC);
INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", func_800E9CEC);
INCLUDE_ASM(const s32, "segment_song/ob_knotty_chess", func_800E9E34);
INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", func_800E9E34);
INCLUDE_ASM(const s32, "segment_song/ob_knotty_chess", func_800EA0E4);
INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", func_800EA0E4);
INCLUDE_ASM(const s32, "segment_song/ob_knotty_chess", func_800EA1C8);
INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", func_800EA1C8);
/* 3F94C 800EA3BC */
void func_800EA3BC(SomethingMusic* arg0) {
@ -75,7 +75,7 @@ void func_800EA3E4(SomethingMusic* arg0) {
arg0->field_0x40 = arg0->field_0x2c;
}
INCLUDE_ASM(const s32, "segment_song/ob_knotty_chess", __load_song);
INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", __load_song);
/* 3FAF8 800EA568 */
void func_800EA568(SomethingMusic* arg0) {
@ -96,7 +96,7 @@ void func_800EA568(SomethingMusic* arg0) {
arg0->field_0x20 = arg0->field_0x2c;
}
INCLUDE_ASM(const s32, "segment_song/ob_knotty_chess", func_800EA604);
INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", func_800EA604);
/* 3FC40 800EA6B0 */
void func_800EA6B0(SomethingMusic* arg0, s32 arg1, s32 arg2) {
@ -105,26 +105,26 @@ void func_800EA6B0(SomethingMusic* arg0, s32 arg1, s32 arg2) {
arg0->field_0x4c = 1;
}
INCLUDE_ASM(const s32, "segment_song/ob_knotty_chess", func_800EA6C8);
INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", func_800EA6C8);
INCLUDE_ASM(const s32, "segment_song/ob_knotty_chess", func_800EA714);
INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", func_800EA714);
INCLUDE_ASM(const s32, "segment_song/ob_knotty_chess", func_800EA76C);
INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", func_800EA76C);
INCLUDE_ASM(const s32, "segment_song/ob_knotty_chess", func_800EA7AC);
INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", func_800EA7AC);
INCLUDE_ASM(const s32, "segment_song/ob_knotty_chess", func_800EA7E4);
INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", func_800EA7E4);
INCLUDE_ASM(const s32, "segment_song/ob_knotty_chess", func_800EA838);
INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", func_800EA838);
INCLUDE_ASM(const s32, "segment_song/ob_knotty_chess", func_800EA850);
INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", func_800EA850);
INCLUDE_ASM(const s32, "segment_song/ob_knotty_chess", func_800EA86C);
INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", func_800EA86C);
INCLUDE_ASM(const s32, "segment_song/ob_knotty_chess", func_800EA884);
INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", func_800EA884);
INCLUDE_ASM(const s32, "segment_song/ob_knotty_chess", func_800EA89C);
INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", func_800EA89C);
INCLUDE_ASM(const s32, "segment_song/ob_knotty_chess", func_800EA8B4);
INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", func_800EA8B4);
INCLUDE_ASM(const s32, "segment_song/ob_knotty_chess", func_800EA8CC);
INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", func_800EA8CC);

15
src/segment_song/_ob_voracious_expansion.c Normal file
View File

@ -0,0 +1,15 @@
#include "common.h"
INCLUDE_ASM(const s32, "segment_song/_ob_voracious_expansion", func_800EA8E0);
INCLUDE_ASM(const s32, "segment_song/_ob_voracious_expansion", func_800EA924);
INCLUDE_ASM(const s32, "segment_song/_ob_voracious_expansion", func_800EA9BC);
INCLUDE_ASM(const s32, "segment_song/_ob_voracious_expansion", func_800EAB40);
INCLUDE_ASM(const s32, "segment_song/_ob_voracious_expansion", func_800EAC24);
INCLUDE_ASM(const s32, "segment_song/_ob_voracious_expansion", func_800EAF1C);
INCLUDE_ASM(const s32, "segment_song/_ob_voracious_expansion", func_800EB028);