From 8cb139c2b9233c8b2c3a2122c7689ff2620fb511 Mon Sep 17 00:00:00 2001 From: gijs Date: Tue, 26 Sep 2023 19:46:15 +0200 Subject: [PATCH] Enabled a lot of `rodata` migration on `segment_obdata` --- splat.yaml | 34 +-- src/segment_obdata/_ob_awful_bells.c | 28 +++ src/segment_obdata/_ob_driven_channel.c | 3 + src/segment_obdata/_ob_fierce_selection.c | 199 ++++++++++++++++ src/segment_obdata/_ob_hallowed_class.c | 17 ++ src/segment_obdata/_ob_hard_hands.c | 13 ++ src/segment_obdata/_ob_hunky_silver.c | 185 --------------- src/segment_obdata/_ob_lame_store.c | 17 ++ src/segment_obdata/_ob_pithy_collar.c | 14 ++ src/segment_obdata/_ob_tall_hill.c | 13 ++ src/segment_obdata/_ob_ugliest_snow.c | 9 + src/segment_obdata/_ob_worthless_drawer.c | 273 ---------------------- 12 files changed, 332 insertions(+), 473 deletions(-) create mode 100644 src/segment_obdata/_ob_awful_bells.c create mode 100644 src/segment_obdata/_ob_driven_channel.c create mode 100644 src/segment_obdata/_ob_fierce_selection.c create mode 100644 src/segment_obdata/_ob_hallowed_class.c create mode 100644 src/segment_obdata/_ob_hard_hands.c delete mode 100644 src/segment_obdata/_ob_hunky_silver.c create mode 100644 src/segment_obdata/_ob_lame_store.c create mode 100644 src/segment_obdata/_ob_pithy_collar.c create mode 100644 src/segment_obdata/_ob_tall_hill.c create mode 100644 src/segment_obdata/_ob_ugliest_snow.c delete mode 100644 src/segment_obdata/_ob_worthless_drawer.c diff --git a/splat.yaml b/splat.yaml index 6b113f2..ee0987b 100644 --- a/splat.yaml +++ b/splat.yaml @@ -387,26 +387,28 @@ segments: # Complete find_file_boundaries: False subsegments: - - [0x40E80, asm, "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"] - - [0x42C90, asm, "segment_obdata/_ob_lame_store"] - - [0x43100, asm, "segment_obdata/_ob_fierce_selection"] + - [0x40E80, c, "segment_obdata/_ob_blushing_ship"] + - [0x41C20, c, "segment_obdata/_ob_hard_hands"] + - [0x420D0, c, "segment_obdata/_ob_awful_bells"] + - [0x42C30, c, "segment_obdata/_ob_ugliest_snow"] + - [0x42C90, c, "segment_obdata/_ob_lame_store"] + - [0x43100, c, "segment_obdata/_ob_fierce_selection"] # - [0x43100, c, "class"] # - [0x44340, c, "ability"] # - [0x45480, c, "equipment"] - - [0x45CB0, asm, "segment_obdata/_ob_tall_hill"] + - [0x45CB0, c, "segment_obdata/_ob_tall_hill"] + # Not sure - [0x46090, asm, "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"] - - [0x514B0, asm, "segment_obdata/_ob_squeamish_mask"] - - [0x5A030, asm, "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"] + + - [0x514B0, c, "segment_obdata/_ob_squeamish_mask"] + - [0x5A030, c, "segment_obdata/_ob_utopian_queen"] + - [0x5AFF0, c, "segment_obdata/_ob_pithy_collar"] + - [0x5C060, c, "segment_obdata/_ob_hallowed_class"] + - [0x5C1D0, c, "segment_obdata/_ob_driven_channel"] - [0x5C210, .data, "segment_obdata/vpres"] - [0x5C280, .data, "gfx/dpfillrect"] @@ -442,13 +444,15 @@ segments: - [0x65C50, data] - [0x65CC0, data] - - [0x65D60, rodata, "segment_obdata/_ob_blushing_ship"] + - [0x65D60, .rodata, "segment_obdata/_ob_blushing_ship"] - [0x65DD0, rodata, "data/class_ability"] - [0x66310, rodata, "data/item"] + # Problematic - [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"] + + - [0x66D00, .rodata, "segment_obdata/_ob_squeamish_mask"] + - [0x66DA0, .rodata, "segment_obdata/_ob_utopian_queen"] - { start: 0x66E10, type: bss, vram: 0x80190F10 } diff --git a/src/segment_obdata/_ob_awful_bells.c b/src/segment_obdata/_ob_awful_bells.c new file mode 100644 index 0000000..49a5442 --- /dev/null +++ b/src/segment_obdata/_ob_awful_bells.c @@ -0,0 +1,28 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "segment_obdata/_ob_awful_bells", func_8016C1D0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_awful_bells", func_8016C268); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_awful_bells", func_8016C3C4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_awful_bells", func_8016C528); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_awful_bells", func_8016C5BC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_awful_bells", func_8016C70C); + +void func_8016C814(void) { +} + +INCLUDE_ASM(const s32, "segment_obdata/_ob_awful_bells", func_8016C81C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_awful_bells", func_8016C900); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_awful_bells", func_8016C9FC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_awful_bells", func_8016CB08); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_awful_bells", func_8016CB44); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_awful_bells", func_8016CC2C); diff --git a/src/segment_obdata/_ob_driven_channel.c b/src/segment_obdata/_ob_driven_channel.c new file mode 100644 index 0000000..9d94ed5 --- /dev/null +++ b/src/segment_obdata/_ob_driven_channel.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "segment_obdata/_ob_driven_channel", func_801862D0); diff --git a/src/segment_obdata/_ob_fierce_selection.c b/src/segment_obdata/_ob_fierce_selection.c new file mode 100644 index 0000000..76d3cf3 --- /dev/null +++ b/src/segment_obdata/_ob_fierce_selection.c @@ -0,0 +1,199 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D200); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D254); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D2A8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D2FC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D350); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D3A4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D3F8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D44C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D4A0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D4F4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D548); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D59C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D5F0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D644); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D698); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D6EC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D740); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D794); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D7E8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D83C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D890); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D8E4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D938); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D98C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016D9E0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016DA34); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016DA88); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016DADC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016DB30); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016DB84); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_field_0x2c); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_ability_front); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_ability_front_hitcount); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_ability_middle); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_ability_middle_hitcount); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_ability_back); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_ability_back_hitcount); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_field_0x4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_gender); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_leadership_rank); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_global_flag); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_item_upper_left); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_item_upper_right); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_item_lower_left); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_item_lower_right); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_ability_front_name); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_ability_middle_name); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_ability_back_name); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_name); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_ability); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", class_get_ability_hitcount); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obAbilityGetName); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", ability_get_field_0x4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obAbilityGetElement); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016E50C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016EA34); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", character_get_item); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", __character_handle_levelup); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", __character_initialise); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obItemGetName); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", item_get_field_0x4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", item_get_field_0x5); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", item_get_field_0x8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", item_get_field_0x9); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", equipment_get_field_0x1b); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", equipment_get_field_0x1c); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentGetName); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentGetType); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentGetElement); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", equipment_get_field_0x6); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentGetBuyPrice); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", equipment_get_field_0x10); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentGetStrength); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentGetVitality); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentGetIntelligence); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentGetMentality); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentGetAgility); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentGetDexterity); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentGetResistanceStrike); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentGetResistanceWind); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentGetResistanceFire); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentGetResistanceEarth); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentGetResistanceWater); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentGetResistanceVirtue); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentGetResistanceBane); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", equipment_get_field_0x18_b68); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", equipment_get_field_0x18_b46); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", equipment_get_field_0x18_b24); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", equipment_get_field_0x18_b12); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", equipment_get_field_0x19_b68); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", equipment_get_field_0x19_b46); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", equipment_get_field_0x19_b24); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", equipment_get_field_0x19_b12); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", equipment_get_field_0x1a_b7); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentIsWeapon); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentGetFirstWeapon); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", obEquipmentGetFirstSpellbook); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016FBE0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_fierce_selection", func_8016FCEC); diff --git a/src/segment_obdata/_ob_hallowed_class.c b/src/segment_obdata/_ob_hallowed_class.c new file mode 100644 index 0000000..7541278 --- /dev/null +++ b/src/segment_obdata/_ob_hallowed_class.c @@ -0,0 +1,17 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hallowed_class", func_80186160); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hallowed_class", func_80186178); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hallowed_class", func_80186190); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hallowed_class", func_80186210); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hallowed_class", func_80186240); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hallowed_class", func_80186284); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hallowed_class", func_80186290); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hallowed_class", func_801862A8); diff --git a/src/segment_obdata/_ob_hard_hands.c b/src/segment_obdata/_ob_hard_hands.c new file mode 100644 index 0000000..e4dcaa1 --- /dev/null +++ b/src/segment_obdata/_ob_hard_hands.c @@ -0,0 +1,13 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hard_hands", func_8016BD20); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hard_hands", func_8016BF80); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hard_hands", func_8016BFC0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hard_hands", __maybe_get_used_character_slots); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hard_hands", func_8016C0C8); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_hard_hands", func_8016C150); diff --git a/src/segment_obdata/_ob_hunky_silver.c b/src/segment_obdata/_ob_hunky_silver.c deleted file mode 100644 index 07f9976..0000000 --- a/src/segment_obdata/_ob_hunky_silver.c +++ /dev/null @@ -1,185 +0,0 @@ -#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_lame_store.c b/src/segment_obdata/_ob_lame_store.c new file mode 100644 index 0000000..afff48e --- /dev/null +++ b/src/segment_obdata/_ob_lame_store.c @@ -0,0 +1,17 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "segment_obdata/_ob_lame_store", func_8016CD90); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_lame_store", func_8016CDCC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_lame_store", func_8016CDF4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_lame_store", func_8016CE40); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_lame_store", func_8016CEC4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_lame_store", func_8016CF64); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_lame_store", func_8016D068); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_lame_store", func_8016D100); diff --git a/src/segment_obdata/_ob_pithy_collar.c b/src/segment_obdata/_ob_pithy_collar.c new file mode 100644 index 0000000..2f729ac --- /dev/null +++ b/src/segment_obdata/_ob_pithy_collar.c @@ -0,0 +1,14 @@ +#include "common.h" + +void func_801850F0(void) { +} + +void func_801850F8(void) { +} + +void func_80185100(void) { +} + +INCLUDE_ASM(const s32, "segment_obdata/_ob_pithy_collar", func_80185108); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_pithy_collar", func_80185964); diff --git a/src/segment_obdata/_ob_tall_hill.c b/src/segment_obdata/_ob_tall_hill.c new file mode 100644 index 0000000..37e15cf --- /dev/null +++ b/src/segment_obdata/_ob_tall_hill.c @@ -0,0 +1,13 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "segment_obdata/_ob_tall_hill", func_8016FDB0); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_tall_hill", func_8016FDFC); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_tall_hill", func_8016FE78); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_tall_hill", func_8016FEF4); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_tall_hill", func_8016FF5C); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_tall_hill", func_80170030); diff --git a/src/segment_obdata/_ob_ugliest_snow.c b/src/segment_obdata/_ob_ugliest_snow.c new file mode 100644 index 0000000..90e7864 --- /dev/null +++ b/src/segment_obdata/_ob_ugliest_snow.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "segment_obdata/_ob_ugliest_snow", __get_compared_osTvType); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_ugliest_snow", __reset_compared_osTvType); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_ugliest_snow", func_8016CD50); + +INCLUDE_ASM(const s32, "segment_obdata/_ob_ugliest_snow", __inc_compared_osTvType); diff --git a/src/segment_obdata/_ob_worthless_drawer.c b/src/segment_obdata/_ob_worthless_drawer.c deleted file mode 100644 index 7862572..0000000 --- a/src/segment_obdata/_ob_worthless_drawer.c +++ /dev/null @@ -1,273 +0,0 @@ -#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);