From 197963c3304f2603bfce69dcfd4b087fc059345b Mon Sep 17 00:00:00 2001 From: gijs Date: Mon, 25 Sep 2023 23:47:45 +0200 Subject: [PATCH] Added more `rodata` segments --- splat.yaml | 34 ++- src/data/strategy.c | 12 +- src/segment_obdata/_ob_blushing_ship.c | 33 +++ src/segment_obdata/_ob_hunky_silver.c | 185 +++++++++++++++ src/segment_obdata/_ob_squeamish_mask.c | 116 +++++++++ src/segment_obdata/_ob_utopian_queen.c | 13 ++ src/segment_obdata/_ob_worthless_drawer.c | 273 ++++++++++++++++++++++ 7 files changed, 640 insertions(+), 26 deletions(-) create mode 100644 src/segment_obdata/_ob_blushing_ship.c create mode 100644 src/segment_obdata/_ob_hunky_silver.c create mode 100644 src/segment_obdata/_ob_squeamish_mask.c create mode 100644 src/segment_obdata/_ob_utopian_queen.c create mode 100644 src/segment_obdata/_ob_worthless_drawer.c diff --git a/splat.yaml b/splat.yaml index c41641a..9e9cc40 100644 --- a/splat.yaml +++ b/splat.yaml @@ -381,9 +381,9 @@ segments: vram: 0x8016AF80 bss_size: 0x6C60 # Complete - # find_file_boundaries: False + find_file_boundaries: False subsegments: - - [0x40E80, asm, "segment_obdata/_ob_blushing_ship"] + - [0x40E80, c, "segment_obdata/_ob_blushing_ship"] - [0x41C20, asm, "segment_obdata/_ob_hard_hands"] - [0x420D0, asm, "segment_obdata/_ob_awful_bells"] - [0x42C30, asm, "segment_obdata/_ob_ugliest_snow"] @@ -393,17 +393,13 @@ segments: # - [0x44340, c, "ability"] # - [0x45480, c, "equipment"] - [0x45CB0, asm, "segment_obdata/_ob_tall_hill"] - - [0x46090, asm, "segment_obdata/_ob_hunky_silver"] + - [0x46090, c, "segment_obdata/_ob_hunky_silver"] - [0x49510, asm, "segment_obdata/_ob_safe_songs"] - [0x495E0, asm, "segment_obdata/_ob_abandoned_shape"] - [0x49820, asm, "segment_obdata/_ob_hardy_thrill"] - - [0x49A30, asm, "segment_obdata/_ob_worthless_drawer"] - - [0x4D5C0, asm, "segment_obdata/_ob_blessed_magic"] - - [0x4EF10, asm, "segment_obdata/_ob_pumped_books"] - - [0x514B0, asm, "segment_obdata/_ob_squeamish_mask"] - - [0x564D0, asm, "segment_obdata/_ob_empty_quill"] - - [0x5A030, asm, "segment_obdata/_ob_utopian_queen"] - - [0x5AC70, asm, "segment_obdata/_ob_mint_plantation"] + - [0x49A30, c, "segment_obdata/_ob_worthless_drawer"] + - [0x514B0, c, "segment_obdata/_ob_squeamish_mask"] + - [0x5A030, c, "segment_obdata/_ob_utopian_queen"] - [0x5AFF0, asm, "segment_obdata/_ob_pithy_collar"] - [0x5C060, asm, "segment_obdata/_ob_hallowed_class"] - [0x5C1D0, asm, "segment_obdata/_ob_driven_channel"] @@ -419,7 +415,7 @@ segments: - [0x5CCD0, .data, "gfx/_ob_aspiring_shade"] - [0x5CD20, .data, "gfx/_ob_exciting_skirt"] - [0x5CD70, .data, "gfx/_ob_shy_yak"] - - [0x5CE70, data, "data/strategy"] + - [0x5CE70, .data, "data/strategy"] - [0x5CEF0, data] - [0x5CF00, data] - [0x5CF20, data] @@ -442,15 +438,13 @@ segments: - [0x65C50, data] - [0x65CC0, data] - - [0x65D60, rodata, "segment_obdata/_ob_blushing_ship"] - - [0x65DD0, rodata] - - [0x66310, rodata] - - [0x663C0, rodata] - - [0x66570, rodata, "segment_obdata/_ob_hunky_silver"] - - [0x66B60, rodata, "segment_obdata/_ob_worthless_drawer"] - - [0x66B80, rodata, "segment_obdata/_ob_pumped_books"] - - [0x66D00, rodata, "segment_obdata/_ob_squeamish_mask"] - - [0x66DA0, rodata, "segment_obdata/_ob_utopian_queen"] + - [0x65D60, .rodata, "segment_obdata/_ob_blushing_ship"] + - [0x65DD0, rodata, "data/class_ability"] + - [0x66310, rodata, "data/item"] + - [0x665C0, .rodata, "segment_obdata/_ob_hunky_silver"] + - [0x66B60, .rodata, "segment_obdata/_ob_worthless_drawer"] + - [0x66D00, .rodata, "segment_obdata/_ob_squeamish_mask"] + - [0x66DA0, .rodata, "segment_obdata/_ob_utopian_queen"] - { start: 0x66E10, type: bss, vram: 0x80190F10 } diff --git a/src/data/strategy.c b/src/data/strategy.c index 673fd0e..5f66138 100644 --- a/src/data/strategy.c +++ b/src/data/strategy.c @@ -4,22 +4,22 @@ #include "str_decorate.h" /* 5CE70 80186F70 */ -char* const obStrategyNameAutonomous = DECORATE("Autonomous"); +char obStrategyNameAutonomous[] = DECORATE("Autonomous"); /* 5CE80 80186F80 */ -char* const obStrategyNameAttackStrongest = DECORATE("Attack" NEWLINE INDENT "Strongest"); +char obStrategyNameAttackStrongest[] = DECORATE("Attack" NEWLINE INDENT "Strongest"); /* 5CE94 80186F94 */ -char* const obStrategyNameAttackLeader = DECORATE("Attack" NEWLINE INDENT "Leader"); +char obStrategyNameAttackLeader[] = DECORATE("Attack" NEWLINE INDENT "Leader"); /* 5CEA8 80186FA8 */ -char* const obStrategyNameAttackWeakest = DECORATE("Attack" NEWLINE INDENT "Weakest"); +char obStrategyNameAttackWeakest[] = DECORATE("Attack" NEWLINE INDENT "Weakest"); /* 5CEBC 80186FBC */ -const u8 D_80186FBC[] = { 0x07, 0x02, 0x06, 0x03, 0x05, 0x04, 0x01, 0x00 }; +u8 D_80186FBC[] = { 0x07, 0x02, 0x06, 0x03, 0x05, 0x04, 0x01, 0x00 }; /* 5CEC4 80186FC4 */ -char* const obStrategyName[] = { +char* obStrategyName[] = { obStrategyNameAutonomous, obStrategyNameAttackStrongest, obStrategyNameAttackLeader, diff --git a/src/segment_obdata/_ob_blushing_ship.c b/src/segment_obdata/_ob_blushing_ship.c new file mode 100644 index 0000000..3eaec21 --- /dev/null +++ b/src/segment_obdata/_ob_blushing_ship.c @@ -0,0 +1,33 @@ +#include "common.h" + +void func_8016AF80(void) { +} + +void func_8016AF88(void) { +} + +INCLUDE_ASM(const s32, "segment_obdata/_ob_blushing_ship", func_8016AF90); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_blushing_ship", func_8016B070); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_blushing_ship", func_8016B088); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_blushing_ship", func_8016B0F4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_blushing_ship", func_8016B198); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_blushing_ship", func_8016B6FC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_blushing_ship", func_8016B738); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_blushing_ship", func_8016B774); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_blushing_ship", func_8016BA10); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_blushing_ship", func_8016BA6C); + +INCLUDE_RODATA(const s32, "segment_obdata/_ob_blushing_ship", D_8018FEAC); + +INCLUDE_RODATA(const s32, "segment_obdata/_ob_blushing_ship", D_8018FEB8); + +INCLUDE_RODATA(const s32, "segment_obdata/_ob_blushing_ship", D_8018FEBC); diff --git a/src/segment_obdata/_ob_hunky_silver.c b/src/segment_obdata/_ob_hunky_silver.c new file mode 100644 index 0000000..07f9976 --- /dev/null +++ b/src/segment_obdata/_ob_hunky_silver.c @@ -0,0 +1,185 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170190); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801701B8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801701D4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801701F0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_8017020C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170228); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170244); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170268); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_8017028C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801702B0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801702D4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801702F8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170318); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170338); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_8017034C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_8017035C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170370); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170380); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170390); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801703B0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801703D0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801703F4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170414); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170424); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170434); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_8017043C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170458); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170474); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_8017049C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801704B8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801704D8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170504); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170530); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_8017055C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_8017057C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_8017059C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801705AC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801705BC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801705D0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801705EC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_8017060C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170620); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170634); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170648); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170668); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_8017067C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170690); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801706A4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801706C0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801706DC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801706F0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170704); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170718); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_8017072C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170740); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170754); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170774); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170794); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801707F4); + +INCLUDE_RODATA(const s32, "segment_obdata/_ob_hunky_silver", D_801906C0); + +INCLUDE_RODATA(const s32, "segment_obdata/_ob_hunky_silver", D_801906C4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170838); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80170954); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80171B94); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80171ED8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80171FE0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80172124); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_8017223C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_8017230C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80172368); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80172394); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801725B4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801725C0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80172610); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80172800); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801728EC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_8017293C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_8017298C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801729CC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80172A0C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80172A28); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80172B10); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80172B68); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80172BBC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80172BF0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80172C44); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801730BC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801731EC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801732E0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801733A0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_80173490); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hunky_silver", func_801734D4); diff --git a/src/segment_obdata/_ob_squeamish_mask.c b/src/segment_obdata/_ob_squeamish_mask.c new file mode 100644 index 0000000..a615b33 --- /dev/null +++ b/src/segment_obdata/_ob_squeamish_mask.c @@ -0,0 +1,116 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017B5B0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017B5BC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", __get_overlay_info_71280_65C8C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", __setup_overlay_79730); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", __setup_overlay_87200); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", __setup_overlay_71280_51674); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017B838); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017B9A8); + +void func_8017BA2C(void) { +} + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017BA34); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", __setup_overlay_71280_51940); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017BB08); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017BB34); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017BB50); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017BD48); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017BDC0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017BED4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017BF10); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017BFB0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017C074); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017C24C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017C29C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017C2FC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017C384); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017C4B4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017C584); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017CBE8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017D6D0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017E264); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017E80C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017EAE8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017EC84); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017EE64); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017EF24); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017F010); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017F114); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017F214); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017F334); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017F36C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017F3C0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017F408); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017F490); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017F554); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017FAF8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017FC28); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_801805B4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_801805D0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", __handle_name_input); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_80180B1C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_80180BDC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_80181498); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_801814AC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_80181504); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_801818A0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_80181C2C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_80182578); + +INCLUDE_RODATA(const s32, "segment_obdata/_ob_squeamish_mask", D_80190E4C); diff --git a/src/segment_obdata/_ob_utopian_queen.c b/src/segment_obdata/_ob_utopian_queen.c new file mode 100644 index 0000000..62e5a8f --- /dev/null +++ b/src/segment_obdata/_ob_utopian_queen.c @@ -0,0 +1,13 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "segment_obdata/_ob_utopian_queen", func_80184130); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_utopian_queen", func_801841F4); + +INCLUDE_RODATA(const s32, "segment_obdata/_ob_utopian_queen", D_80190EB8); + +INCLUDE_RODATA(const s32, "segment_obdata/_ob_utopian_queen", D_80190EBC); + +INCLUDE_RODATA(const s32, "segment_obdata/_ob_utopian_queen", D_80190EE8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_utopian_queen", func_80184D70); diff --git a/src/segment_obdata/_ob_worthless_drawer.c b/src/segment_obdata/_ob_worthless_drawer.c new file mode 100644 index 0000000..7862572 --- /dev/null +++ b/src/segment_obdata/_ob_worthless_drawer.c @@ -0,0 +1,273 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80173B30); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80173B40); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80173B50); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80173B60); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80173BA0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80173BE0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80173C54); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80173D14); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80173D4C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80173D84); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80173DBC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80174138); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80174250); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_801758C0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_801768D4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80176948); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80176C6C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80176F90); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_801772C0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_801776C0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_801776CC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_801776F4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177700); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177728); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177734); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017798C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_801779B0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_801779DC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", __returns_GLOBAL_with_inc_timer); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", __calls_resets_menu_timer); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", __calls_inc_menu_timer); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177B40); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177B5C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", __get_overlay_info_23B220); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", __setup_overlay_23B220); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177CC0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177D04); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177D20); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177D74); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177D80); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177DAC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177DE8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177E20); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177E4C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177E58); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177E74); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177EA0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177EBC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177ED8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177EE4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177F00); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177F1C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177F38); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177F54); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177F60); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177F7C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177FB4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80177FD0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178014); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178038); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178054); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178060); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017806C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017809C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_801780CC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_801780E8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", __get_overlay_info_213B10); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", __setup_overlay_213B10); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178250); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178280); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017829C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", __get_overlay_info_2447A0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", __setup_overlay_2447A0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_801783A8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_801783D8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_801783F4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178410); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178444); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178460); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017846C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_801784BC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017850C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178534); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178548); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178898); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178900); + +void func_8017892C(void) { +} + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178934); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178B20); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178B5C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178BF4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178C64); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178C90); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178CCC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178D10); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178D3C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178DFC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178E30); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80178E60); + +void func_80179010(void) { +} + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80179018); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80179034); + +void func_80179050(void) { +} + +void func_80179058(void) { +} + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80179060); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017907C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_801792BC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_801792E8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80179328); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80179354); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_801793AC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_801793E4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_801794C8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017996C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_80179F04); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017A704); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017A714); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017A720); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017A8E8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017A94C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017A9B0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017AA18); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017AAF4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017AC08); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017AD3C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017ADE8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017AE20); + +INCLUDE_RODATA(const s32, "segment_obdata/_ob_worthless_drawer", D_80190C80); + +INCLUDE_RODATA(const s32, "segment_obdata/_ob_worthless_drawer", D_80190C88); + +INCLUDE_RODATA(const s32, "segment_obdata/_ob_worthless_drawer", D_80190D00); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017B098); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017B500); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017B550); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_worthless_drawer", func_8017B58C);