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

Partially migrated `rodata` for `overlay_286BD0`

This commit is contained in:
gijs 2023-09-26 22:42:16 +02:00
parent a7cb4b67b8
commit 2688fc498a
4 changed files with 132 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
splat.yaml
View File

@ -1365,27 +1365,29 @@ segments:
# - { start: 0x286BD0, type: bss, vram: 0x8022AC00 } # - { start: 0x286BD0, type: bss, vram: 0x8022AC00 }
# - type: code - type: code
# dir: overlay_286BD0 dir: overlay_286BD0
# start: 0x286BD0 start: 0x286BD0
# vram: 0x8022AC90 vram: 0x8022AC90
# bss_size: 0x90 bss_size: 0x90
# symbol_name_format: overlay_286BD0_$VRAM_$ROM symbol_name_format: overlay_286BD0_$VRAM_$ROM
# exclusive_ram_id: test_overlapping exclusive_ram_id: test_overlapping
# subsegments: subsegments:
# - [0x286BD0, asm] - [0x286BD0, c, "_ob_pathetic_action"]
# - [0x289780, asm] - [0x289780, c, "_ob_childlike_cherry"]
# - [0x28A7B0, asm] - [0x28A7B0, asm, "_ob_future_flesh"]
# - [0x296CE0, asm] - [0x296CE0, c, "_ob_painstaking_mouth"]
- [0x299D50, asm]
# - [0x299D80, rodata] - [0x299D80, data, "data_299D80"]
# - [0x299F80, rodata]
# - [0x29A030, rodata]
# - [0x29A0A0, rodata]
# - [0x29A2E0, rodata]
# - [0x29A3B0, rodata]
# # - { start: 0x29A4C0, type: bss, vram: 0x8023E580 } - [0x29A070, .rodata, "_ob_pathetic_action"]
- [0x29A0A0, .rodata, "_ob_childlike_cherry"]
- [0x29A0C0, rodata, "_ob_future_flesh"]
- [0x29A2E0, rodata, "data_299D80"]
- [0x29A3B0, .rodata, "_ob_painstaking_mouth"]
- { start: 0x29A4C0, type: bss, vram: 0x8023E580 }
- type: code - type: code
dir: overlay_29A4C0 dir: overlay_29A4C0

21
src/overlay_286BD0/_ob_childlike_cherry.c Normal file
View File

@ -0,0 +1,21 @@
#include "common.h"
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_childlike_cherry", func_overlay_286BD0_8022D840_289780);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_childlike_cherry", func_overlay_286BD0_8022DDC4_289D04);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_childlike_cherry", func_overlay_286BD0_8022DDE4_289D24);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_childlike_cherry", func_overlay_286BD0_8022DF48_289E88);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_childlike_cherry", func_overlay_286BD0_8022DF8C_289ECC);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_childlike_cherry", func_overlay_286BD0_8022E3D0_28A310);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_childlike_cherry", func_overlay_286BD0_8022E5F4_28A534);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_childlike_cherry", func_overlay_286BD0_8022E738_28A678);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_childlike_cherry", func_overlay_286BD0_8022E7A4_28A6E4);
INCLUDE_RODATA(const s32, "overlay_286BD0/_ob_childlike_cherry", D_overlay_286BD0_8023E178_29A0B8);

63
src/overlay_286BD0/_ob_painstaking_mouth.c Normal file
View File

@ -0,0 +1,63 @@
#include "common.h"
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023ADA0_296CE0);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023AE70_296DB0);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023B058_296F98);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023B0CC_29700C);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023B15C_29709C);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023B1EC_29712C);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023B274_2971B4);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023B45C_29739C);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023B5A8_2974E8);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023B704_297644);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023B85C_29779C);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023B9B4_2978F4);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023BB10_297A50);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023BBCC_297B0C);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023BC1C_297B5C);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023BD2C_297C6C);
INCLUDE_RODATA(const s32, "overlay_286BD0/_ob_painstaking_mouth", D_overlay_286BD0_8023E470_29A3B0);
INCLUDE_RODATA(const s32, "overlay_286BD0/_ob_painstaking_mouth", D_overlay_286BD0_8023E484_29A3C4);
INCLUDE_RODATA(const s32, "overlay_286BD0/_ob_painstaking_mouth", D_overlay_286BD0_8023E498_29A3D8);
INCLUDE_RODATA(const s32, "overlay_286BD0/_ob_painstaking_mouth", D_overlay_286BD0_8023E4AC_29A3EC);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023BD88_297CC8);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023C9D4_298914);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023CA08_298948);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023CC30_298B70);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023D2D8_299218);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023D3E4_299324);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023D480_2993C0);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023D4AC_2993EC);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023D800_299740);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023DB88_299AC8);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_painstaking_mouth", func_overlay_286BD0_8023DD68_299CA8);

27
src/overlay_286BD0/_ob_pathetic_action.c Normal file
View File

@ -0,0 +1,27 @@
#include "common.h"
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_pathetic_action", func_overlay_286BD0_8022AC90_286BD0);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_pathetic_action", func_overlay_286BD0_8022B5EC_28752C);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_pathetic_action", func_overlay_286BD0_8022B980_2878C0);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_pathetic_action", func_overlay_286BD0_8022B9B4_2878F4);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_pathetic_action", func_overlay_286BD0_8022BAB8_2879F8);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_pathetic_action", func_overlay_286BD0_8022BB0C_287A4C);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_pathetic_action", func_overlay_286BD0_8022BB64_287AA4);
INCLUDE_RODATA(const s32, "overlay_286BD0/_ob_pathetic_action", D_overlay_286BD0_8023E130_29A070);
INCLUDE_RODATA(const s32, "overlay_286BD0/_ob_pathetic_action", D_overlay_286BD0_8023E138_29A078);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_pathetic_action", func_overlay_286BD0_8022C078_287FB8);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_pathetic_action", func_overlay_286BD0_8022D4A4_2893E4);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_pathetic_action", func_overlay_286BD0_8022D5C4_289504);
INCLUDE_ASM(const s32, "overlay_286BD0/_ob_pathetic_action", func_overlay_286BD0_8022D618_289558);