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

Fixed building again

This commit is contained in:
gijs 2023-09-24 00:36:29 +02:00
parent a96d1bb002
commit 240d653e1e
4 changed files with 58 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
splat.yaml
View File

@ -367,48 +367,56 @@ segments:
- type: code - type: code
name: segment_obdata name: segment_obdata
dir: segment_obdata
start: 0x40E80 start: 0x40E80
vram: 0x8016AF80 vram: 0x8016AF80
bss_size: 0x6C60 bss_size: 0x6C60
subsegments: subsegments:
- [0x40E80, asm, "ob_blushing_ship"] - [0x40E80, asm, "segment_obdata/ob_blushing_ship"]
- [0x420D0, asm, "ob_awful_bells"] - [0x420D0, asm, "segment_obdata/ob_awful_bells"]
- [0x42C30, asm, "ob_ugliest_snow"] - [0x42C30, asm, "segment_obdata/ob_ugliest_snow"]
- [0x42C90, asm, "ob_lame_store"] - [0x42C90, asm, "segment_obdata/ob_lame_store"]
- [0x43100, asm, "ob_fierce_selection"] - [0x43100, asm, "segment_obdata/ob_fierce_selection"]
# - [0x43100, c, "class"] # - [0x43100, c, "class"]
# - [0x44340, c, "ability"] # - [0x44340, c, "ability"]
# - [0x45480, c, "equipment"] # - [0x45480, c, "equipment"]
- [0x45CB0, asm, "ob_tall_hill"] - [0x45CB0, asm, "segment_obdata/ob_tall_hill"]
- [0x46090, asm, "ob_hunky_silver"] - [0x46090, asm, "segment_obdata/ob_hunky_silver"]
- [0x49510, asm, "ob_safe_songs"] - [0x49510, asm, "segment_obdata/ob_safe_songs"]
- [0x495E0, asm, "ob_abandoned_shape"] - [0x495E0, asm, "segment_obdata/ob_abandoned_shape"]
- [0x49820, asm, "ob_hardy_thrill"] - [0x49820, asm, "segment_obdata/ob_hardy_thrill"]
- [0x49A30, asm, "ob_worthless_drawer"] - [0x49A30, asm, "segment_obdata/ob_worthless_drawer"]
- [0x4D5C0, asm, "ob_blessed_magic"] - [0x4D5C0, asm, "segment_obdata/ob_blessed_magic"]
# - [0x4EF10, c, "ob_pumped_books"] # - [0x4EF10, c, "ob_pumped_books"]
- [0x4EF10, asm, "ob_pumped_books"] - [0x4EF10, asm, "segment_obdata/ob_pumped_books"]
- [0x514B0, asm, "ob_squeamish_mask"] - [0x514B0, asm, "segment_obdata/ob_squeamish_mask"]
- [0x5AFF0, asm, "ob_pithy_collar"] - [0x5AFF0, asm, "segment_obdata/ob_pithy_collar"]
- [0x5C060, asm, "ob_hallowed_class"] - [0x5C060, asm, "segment_obdata/ob_hallowed_class"]
- [0x5C1D0, asm, "ob_driven_channel"] - [0x5C1D0, asm, "segment_obdata/ob_driven_channel"]
- type: data - [0x5C210, data, "gfx/ob_deft_toys"]
start: 0x5C210 - [0x5CE70, .data, "data/strategy"]
subsegments: - [0x5CEF0, data]
- [0x5C210, data] - [0x5D560, data]
- [0x5CE70, data] - [0x613B0, data, "data/item"]
- [0x647F0, data, "data/character_name"]
- [0x64BE0, data]
- [0x652E0, data, "gfx/ob_dazzling_squirrel"]
- [0x65380, data]
- [0x65970, data, "gfx/ob_thundering_truck"]
- [0x659E0, data]
- [0x65B80, data, "gfx/ob_genial_crib"]
- [0x65C50, data]
- [0x65CC0, data]
# - [0x5C210, .data, "dl"] # - [0x5C210, .data, "dl"]
# - [0x5CE70, .data, "strategy.data"] # - [0x5CE70, .data, "strategy.data"]
# - [0x5D560, .data, "data"] # - [0x5D560, .data, "data"]
- [0x65D60, rodata, "ob_blushing_ship"] - [0x65D60, rodata, "segment_obdata/ob_blushing_ship"]
- [0x66570, rodata, "ob_hunky_silver"] - [0x66570, rodata, "segment_obdata/ob_hunky_silver"]
- [0x66B60, rodata, "ob_worthless_drawer"] - [0x66B60, rodata, "segment_obdata/ob_worthless_drawer"]
- [0x66B80, rodata, "ob_pumped_books"] - [0x66B80, rodata, "segment_obdata/ob_pumped_books"]
- [0x66D00, rodata, "ob_squeamish_mask"] - [0x66D00, rodata, "segment_obdata/ob_squeamish_mask"]
- { start: 0x66E10, type: bss, vram: 0x80190F10 } - { start: 0x66E10, type: bss, vram: 0x80190F10 }

0
src/strategy.data.c → src/data/strategy.c
View File

36
src/segment_song/ob_knotty_chess.c
View File

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

8
symbol_addrs.txt
View File

@ -200,10 +200,10 @@ STR_CANNOT_BE_USED = 0x8021DF80; // rom:0x1B2290
STR_PETRIFICATION = 0x8021DFA0; // rom:0x1B22B0 STR_PETRIFICATION = 0x8021DFA0; // rom:0x1B22B0
obStrategyName = 0x80186FC4; // rom:0x5CEC4 size:16 obStrategyName = 0x80186FC4; // rom:0x5CEC4 size:16
obStrategyNameAutonomous = 0x80186F70; // rom:0x5CE70 type:asciz //obStrategyNameAutonomous = 0x80186F70; // rom:0x5CE70 type:asciz
obStrategyNameAttackStrongest = 0x80186F80; // rom:0x5CE80 type:asciz //obStrategyNameAttackStrongest = 0x80186F80; // rom:0x5CE80 type:asciz
obStrategyNameAttackLeader = 0x80186F94; // rom:0x5CE94 type:asciz //obStrategyNameAttackLeader = 0x80186F94; // rom:0x5CE94 type:asciz
obStrategyNameAttackWeakest = 0x80186FA8; // rom:0x5CEA8 type:asciz //obStrategyNameAttackWeakest = 0x80186FA8; // rom:0x5CEA8 type:asciz
obElementName = 0x80187BD4; // rom:0x5DAD4 type:u32 obElementName = 0x80187BD4; // rom:0x5DAD4 type:u32
obElementNamePhysical = 0x80187660; // rom:0x5D560 type:asciz obElementNamePhysical = 0x80187660; // rom:0x5D560 type:asciz