Migrate `rodata` for `overlay_2AE3C0`

This commit is contained in:
gijs 2023-09-26 21:36:42 +02:00
parent b17f8d0fed
commit fda5b9afd9
5 changed files with 253 additions and 16 deletions

View File

@ -1435,23 +1435,22 @@ segments:
# - [0x2AE340, rodata] # - [0x2AE340, rodata]
# - type: code - type: code
# dir: overlay_2AE3C0 dir: overlay_2AE3C0
# start: 0x2AE3C0 start: 0x2AE3C0
# vram: 0x802395C0 vram: 0x802395C0
# bss_size: 0x0 bss_size: 0x0
# symbol_name_format: overlay_2AE3C0_$VRAM_$ROM symbol_name_format: overlay_2AE3C0_$VRAM_$ROM
# exclusive_ram_id: test_overlapping exclusive_ram_id: test_overlapping
# subsegments: subsegments:
# - [0x2AE3C0, asm] - [0x2AE3C0, c, "_ob_foamy_wilderness"]
# - [0x2B5230, asm] - [0x2B0D30, c, "_ob_alert_glass"]
# - [0x2B6F40, asm] - [0x2B6F40, c, "_ob_okay_pies"]
# - [0x2B8610, asm] - [0x2B8610, c, "_ob_limping_expert"]
# - [0x2B89C0, rodata] - [0x2B89C0, .rodata, "_ob_foamy_wilderness"]
# - [0x2B89F0, rodata] - [0x2B8A90, .rodata, "_ob_alert_glass"]
# - [0x2B8A90, rodata] - [0x2B8B40, .rodata, "_ob_okay_pies"]
# - [0x2B8B40, rodata]
- [0x2B8BA0, bin, "n64_ptr_tables_v2_00"] - [0x2B8BA0, bin, "n64_ptr_tables_v2_00"]
- [0x2BF250, bin, "n64_wave_table_00"] # N64 WaveTable - [0x2BF250, bin, "n64_wave_table_00"] # N64 WaveTable

View File

@ -0,0 +1,137 @@
#include "common.h"
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023BF30_2B0D30);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023C08C_2B0E8C);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023C214_2B1014);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023C228_2B1028);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023C38C_2B118C);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023C71C_2B151C);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023C7E4_2B15E4);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023C8E4_2B16E4);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023C9FC_2B17FC);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023CBD8_2B19D8);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023CE64_2B1C64);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023D178_2B1F78);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023D2C4_2B20C4);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023D318_2B2118);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023D374_2B2174);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023D3B4_2B21B4);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023D4A4_2B22A4);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023D6F0_2B24F0);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023D7DC_2B25DC);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023DA68_2B2868);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023E500_2B3300);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023E694_2B3494);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023E904_2B3704);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023E954_2B3754);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023E998_2B3798);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023EAA0_2B38A0);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023EAD0_2B38D0);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023EF30_2B3D30);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023EF9C_2B3D9C);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023F108_2B3F08);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023F1E4_2B3FE4);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023F304_2B4104);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023F81C_2B461C);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023F9D0_2B47D0);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023FADC_2B48DC);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023FB90_2B4990);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023FD88_2B4B88);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023FE14_2B4C14);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8023FF58_2B4D58);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_802401A0_2B4FA0);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_802401B4_2B4FB4);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_80240244_2B5044);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8024026C_2B506C);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_80240430_2B5230);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8024049C_2B529C);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8024075C_2B555C);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_802408A8_2B56A8);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8024098C_2B578C);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_802409C4_2B57C4);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_802409E0_2B57E0);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_80240AE0_2B58E0);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_80240CA8_2B5AA8);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_80240F58_2B5D58);
INCLUDE_RODATA(const s32, "overlay_2AE3C0/_ob_alert_glass", D_overlay_2AE3C0_80243CE8_2B8AE8);
INCLUDE_RODATA(const s32, "overlay_2AE3C0/_ob_alert_glass", D_overlay_2AE3C0_80243CF8_2B8AF8);
INCLUDE_RODATA(const s32, "overlay_2AE3C0/_ob_alert_glass", D_overlay_2AE3C0_80243D00_2B8B00);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_80240F8C_2B5D8C);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_80241230_2B6030);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8024136C_2B616C);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_80241610_2B6410);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_802416AC_2B64AC);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_802417B8_2B65B8);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_8024189C_2B669C);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_80241AB4_2B68B4);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_80241B64_2B6964);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_80241ED0_2B6CD0);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_80242030_2B6E30);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_alert_glass", func_overlay_2AE3C0_802420DC_2B6EDC);

View File

@ -0,0 +1,57 @@
#include "common.h"
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_802395C0_2AE3C0);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_802396DC_2AE4DC);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_80239710_2AE510);
INCLUDE_RODATA(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", D_overlay_2AE3C0_80243BC0_2B89C0);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_80239758_2AE558);
INCLUDE_RODATA(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", D_overlay_2AE3C0_80243C00_2B8A00);
INCLUDE_RODATA(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", D_overlay_2AE3C0_80243C0C_2B8A0C);
INCLUDE_RODATA(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", D_overlay_2AE3C0_80243C18_2B8A18);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_80239854_2AE654);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_80239CA8_2AEAA8);
INCLUDE_RODATA(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", D_overlay_2AE3C0_80243C40_2B8A40);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_80239D48_2AEB48);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_8023A1B8_2AEFB8);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_8023A5EC_2AF3EC);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_8023A670_2AF470);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_8023A7C4_2AF5C4);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_8023A7F4_2AF5F4);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_8023A8C0_2AF6C0);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_8023A98C_2AF78C);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_8023AA54_2AF854);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_8023AA84_2AF884);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_8023AB3C_2AF93C);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_8023AC68_2AFA68);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_8023AE68_2AFC68);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_8023B6FC_2B04FC);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_8023BA84_2B0884);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", func_overlay_2AE3C0_8023BDDC_2B0BDC);
INCLUDE_RODATA(const s32, "overlay_2AE3C0/_ob_foamy_wilderness", D_overlay_2AE3C0_80243C78_2B8A78);

View File

@ -0,0 +1,7 @@
#include "common.h"
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_limping_expert", func_overlay_2AE3C0_80243810_2B8610);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_limping_expert", func_overlay_2AE3C0_8024387C_2B867C);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_limping_expert", func_overlay_2AE3C0_80243AC8_2B88C8);

View File

@ -0,0 +1,37 @@
#include "common.h"
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_okay_pies", func_overlay_2AE3C0_80242140_2B6F40);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_okay_pies", func_overlay_2AE3C0_802421E4_2B6FE4);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_okay_pies", func_overlay_2AE3C0_80242298_2B7098);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_okay_pies", func_overlay_2AE3C0_8024250C_2B730C);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_okay_pies", func_overlay_2AE3C0_80242624_2B7424);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_okay_pies", func_overlay_2AE3C0_80242B50_2B7950);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_okay_pies", func_overlay_2AE3C0_80242D40_2B7B40);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_okay_pies", func_overlay_2AE3C0_80242F28_2B7D28);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_okay_pies", func_overlay_2AE3C0_80242F50_2B7D50);
INCLUDE_RODATA(const s32, "overlay_2AE3C0/_ob_okay_pies", D_overlay_2AE3C0_80243D58_2B8B58);
INCLUDE_RODATA(const s32, "overlay_2AE3C0/_ob_okay_pies", D_overlay_2AE3C0_80243D68_2B8B68);
INCLUDE_RODATA(const s32, "overlay_2AE3C0/_ob_okay_pies", D_overlay_2AE3C0_80243D78_2B8B78);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_okay_pies", func_overlay_2AE3C0_802430DC_2B7EDC);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_okay_pies", func_overlay_2AE3C0_80243490_2B8290);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_okay_pies", func_overlay_2AE3C0_802434E4_2B82E4);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_okay_pies", func_overlay_2AE3C0_80243594_2B8394);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_okay_pies", func_overlay_2AE3C0_802437B8_2B85B8);
INCLUDE_ASM(const s32, "overlay_2AE3C0/_ob_okay_pies", func_overlay_2AE3C0_80243800_2B8600);