diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index d11d689..e79053e 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -349,7 +349,7 @@ DISPLAY_LIST_801B3618 = 0x801B3618; // rom:0x100658 LIGHTS_801869A0 = 0x801869A0; // rom:0x5C8A0 size:40 -__SOMETHING_WITH_GFX = 0x800E9BE0; // size:0x18 +__SOMETHING_WITH_GFX = 0x800E9BE0; // size:4 __MAYBE_DISPLAY_LIST = 0x801B8430; // rom:0x1EE930 diff --git a/splat.yaml b/splat.yaml index 98e7da8..2fc8e76 100644 --- a/splat.yaml +++ b/splat.yaml @@ -63,8 +63,12 @@ segments: subsegments: - [0x1060, c, "main"] - [0x4AC0, c, "_ob_overconfident_mother"] - - [0x5FC0, c, "_ob_rabid_jar"] - + # - [0x5FC0, c, "_ob_rabid_jar"] + - [0x5FC0, asm, "_ob_rabid_jar"] + - [0x68E0, asm] + - [0x8700, asm] + - [0xA370, asm] + # Needs string fixing - [0xB0B0, asm, "_ob_creepy_middle"] @@ -343,8 +347,12 @@ segments: - [0x3E100, data] - - [0x3E330, .rodata, "_ob_rabid_jar"] - - [0x3E460, rodata] + # - [0x3E330, .rodata, "_ob_rabid_jar"] + - [0x3E330, rodata] + # - [0x3E388, rodata] + # - [0x3E3A8, rodata] + # - [0x3E438, rodata] + # - [0x3E460, rodata] - [0x3E4A0, rodata, "_ob_creepy_middle"] - [0x3E7A0, .rodata, "_ob_spooky_degree"] - [0x3E7C0, .rodata, "_ob_ambitious_fold"] @@ -352,7 +360,7 @@ segments: - [0x3E7F0, .rodata, "_ob_soft_coach"] - [0x3E800, .rodata, "_ob_slippery_expansion"] - [0x3E810, rodata, "libmus/player"] - # - [0x3E8F0, rodata] + - [0x3E8F0, rodata] - [0x3E900, rodata, "16100"] - [0x3E930, rodata, "161A0"] - [0x3E9A0, rodata, "177B0"] @@ -371,6 +379,7 @@ segments: - [0x3EE20, rodata, "libultra/os/exceptasm"] - [0x3EE70, rodata, "libultra/gu/libm_vals"] - [0x3EE80, rodata, "libc/xprintf"] + - [0x3EEA0, rodata] - [0x3F000, rodata, "libc/xlitob"] - [0x3F070, rodata, "2CDA0"] - [0x3F0C0, rodata, "2CEF0"] @@ -382,6 +391,7 @@ segments: - { start: 0x3F1B0, type: bss, vram: 0x800AEDB0 } + # - [0x3F1B0, bin] - type: code name: segment_song dir: segment_song @@ -514,7 +524,7 @@ segments: - [0x6E1B0, data, "gfx/_ob_quarrelsome_spot"] - [0x6E250, data] - - [0x6E520, rodata] + - [0x6E520, rodata, "overlay_69900/ob_ancient_ball"] - [0x6E610, rodata] - { start: 0x6E660, type: bss, vram: 0x8019C8D0 } @@ -753,16 +763,16 @@ segments: symbol_name_format: overlay_14EBE0_$VRAM_$ROM exclusive_ram_id: test_overlapping subsegments: - - [0x14EBE0, c, "_ob_phobic_spot"] - - [0x151F40, c, "_ob_touted_bedroom"] - - [0x15DF10, c, "_ob_daily_account"] - - [0x15DF70, c, "_ob_gaudy_line"] - - [0x15E670, c, "_ob_devilish_crayon"] + - [0x14EBE0, asm, "_ob_phobic_spot"] + - [0x151F40, asm, "_ob_touted_bedroom"] + - [0x15DF10, asm, "_ob_daily_account"] + - [0x15DF70, asm, "_ob_gaudy_line"] + - [0x15E670, asm, "_ob_devilish_crayon"] - [0x15FBF0, data] - - [0x165E50, .rodata, "_ob_touted_bedroom"] - - [0x165FB0, .rodata, "_ob_devilish_crayon"] + - [0x165E50, rodata, "_ob_touted_bedroom"] + - [0x165FB0, rodata, "_ob_devilish_crayon"] - { start: 0x165FC0, type: bss, vram: 0x80214E50 } @@ -1403,20 +1413,20 @@ segments: symbol_name_format: overlay_286BD0_$VRAM_$ROM exclusive_ram_id: test_overlapping subsegments: - - [0x286BD0, c, "_ob_pathetic_action"] - - [0x289780, c, "_ob_childlike_cherry"] - - [0x28A7B0, c, "_ob_future_flesh"] - - [0x296CE0, c, "_ob_painstaking_mouth"] - - [0x299D50, c, "_ob_early_ghost"] + - [0x286BD0, asm, "_ob_pathetic_action"] + - [0x289780, asm, "_ob_childlike_cherry"] + - [0x28A7B0, asm, "_ob_future_flesh"] + - [0x296CE0, asm, "_ob_painstaking_mouth"] + - [0x299D50, asm, "_ob_early_ghost"] - [0x299D80, data, "data_299D80"] - - [0x29A070, .rodata, "_ob_pathetic_action"] - - [0x29A0A0, .rodata, "_ob_childlike_cherry"] - - [0x29A0C0, .rodata, "_ob_future_flesh"] - - [0x29A1A0, rodata] + - [0x29A070, rodata, "_ob_pathetic_action"] + - [0x29A0A0, rodata, "_ob_childlike_cherry"] + - [0x29A0C0, rodata, "_ob_future_flesh"] + # - [0x29A1A0, rodata, "_ob_future_flesh"] - [0x29A2E0, rodata] - - [0x29A3B0, .rodata, "_ob_painstaking_mouth"] + - [0x29A3B0, rodata, "_ob_painstaking_mouth"] - { start: 0x29A4C0, type: bss, vram: 0x8023E580 } diff --git a/src/_ob_rabid_jar.c b/src/_ob_rabid_jar.c index 0d52c29..4935b8b 100644 --- a/src/_ob_rabid_jar.c +++ b/src/_ob_rabid_jar.c @@ -1,487 +1,487 @@ -#include "common.h" -#include "os_message.h" +// #include "common.h" +// #include "os_message.h" -typedef struct { - s32 field_0x0; - u8 field_0x4[0xA0]; - s32 field_0x8; -} SomethingMalloc; +// typedef struct { +// s32 field_0x0; +// u8 field_0x4[0xA0]; +// s32 field_0x8; +// } SomethingMalloc; -extern SomethingMalloc D_800E8300[]; +// extern SomethingMalloc D_800E8300[]; -extern s32* D_800C4804; -extern s32 D_800C480A; -extern s32 D_800C49D2; -extern s32* D_800C4AD4; -extern s32* D_800C4B24; -extern s32 D_800C4B28; -extern s32* D_800C4BAC; -extern s32 D_800C4BB0; -extern s32 D_800C4BD0; -extern s32* D_800C4BDC; -extern s32* D_800C4BE0; -extern s32* D_800C4BE8; -extern s32* D_800C4C0C; -extern s32* D_800C4C4C; -extern s32 D_800E797C; -extern s32 D_800E79BC; -extern s32* D_800E7A08; -extern s32 D_800E7A24; -extern s32* D_800E7D6C; -extern s32 D_800E8100; -extern s32* D_800E8108; -extern s32* D_800E9BC0; -extern s32 __CONTROLLER_0_BUTTON; -extern s32 __MAIN_START_BUT_CHECK; -extern u8 __SOMETHING_WITH_GFX; +// extern s32* D_800C4804; +// extern s32 D_800C480A; +// extern s32 D_800C49D2; +// extern s32* D_800C4AD4; +// extern s32* D_800C4B24; +// extern s32 D_800C4B28; +// extern s32* D_800C4BAC; +// extern s32 D_800C4BB0; +// extern s32 D_800C4BD0; +// extern s32* D_800C4BDC; +// extern s32* D_800C4BE0; +// extern s32* D_800C4BE8; +// extern s32* D_800C4C0C; +// extern s32* D_800C4C4C; +// extern s32 D_800E797C; +// extern s32 D_800E79BC; +// extern s32* D_800E7A08; +// extern s32 D_800E7A24; +// extern s32* D_800E7D6C; +// extern s32 D_800E8100; +// extern s32* D_800E8108; +// extern s32* D_800E9BC0; +// extern s32 __CONTROLLER_0_BUTTON; +// extern s32 __MAIN_START_BUT_CHECK; +// extern u8 __SOMETHING_WITH_GFX; -extern u16 D_800C4C10[6]; +// extern u16 D_800C4C10[6]; -extern struct { - s16 field_0x0; - s8 field_0x2; - s8 field_0x3; - s8 field_0x4; -} D_800AF0A0; +// extern struct { +// s16 field_0x0; +// s8 field_0x2; +// s8 field_0x3; +// s8 field_0x4; +// } D_800AF0A0; -extern s32 D_800AF0B0; -extern s16 D_800C49D0; -extern s32 D_800C4C20; -extern s32 D_800E79A0; +// extern s32 D_800AF0B0; +// extern s16 D_800C49D0; +// extern s32 D_800C4C20; +// extern s32 D_800E79A0; -extern u8 D_800E82C8[0x3F0]; +// extern u8 D_800E82C8[0x3F0]; -extern s16 D_800AF0A6[4]; -extern void* D_800AF090[4]; -extern void* D_800C47F0[4]; +// extern s16 D_800AF0A6[4]; +// extern void* D_800AF090[4]; +// extern void* D_800C47F0[4]; -extern void func_8007819C(); -extern s32 func_80173B60(s32); +// extern void func_8007819C(); +// extern s32 func_80173B60(s32); -extern OSMesgQueue obUnpackQueue; +// extern OSMesgQueue obUnpackQueue; -void UnpackProc(void*); +// void UnpackProc(void*); -INCLUDE_ASM(const s32, "_ob_rabid_jar", __calls_loads_overlay_array); +// INCLUDE_ASM(const s32, "_ob_rabid_jar", __calls_loads_overlay_array); -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076150); +// INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076150); -/* 6550 80076150 */ -// s8 func_80076150(u16 arg0) { -// switch (arg0) { -// case 3: -// case 4: -// case 5: -// case 6: -// case 7: -// case 10: -// case 11: -// case 15: -// case 18: -// case 23: -// return 0; -// default: -// return 1; -// } +// /* 6550 80076150 */ +// // s8 func_80076150(u16 arg0) { +// // switch (arg0) { +// // case 3: +// // case 4: +// // case 5: +// // case 6: +// // case 7: +// // case 10: +// // case 11: +// // case 15: +// // case 18: +// // case 23: +// // return 0; +// // default: +// // return 1; +// // } +// // } + +// /* 6588 80076188 */ +// OverlaySomething* func_80076188(void) { +// return &D_800A872C; // } -/* 6588 80076188 */ -OverlaySomething* func_80076188(void) { - return &D_800A872C; -} - -/* 6594 80076194 */ -void func_80076194(void) { - __maybeBlockingRetraceFunc = 0xFFFE; -} - -/* 65A4 800761A4 */ -void func_800761A4(void) { - func_80073164(0, 1, 1, 0x80, 1, 0x100, 0x2000); -} - -INCLUDE_ASM(const s32, "_ob_rabid_jar", __loads_overlay_array); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076324); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", __get_overlay_index); - -/* 68E0 800764E0 */ -void func_800764E0(void) { - u16 i; - - osGetTime(); - bzero(D_800E82C8, sizeof(D_800E82C8)); - bzero(D_800C4C10, sizeof(D_800C4C10)); - - D_800C4C20 = 1; - D_800E79A0 = 8; - D_800C49D0 = 0; - D_800AF0B0 = 0; - D_800AF0A0.field_0x0 = 0; - D_800AF0A0.field_0x3 = 0; - D_800AF0A0.field_0x2 = 0; - D_800AF0A0.field_0x4 = 0; - - for(i = 0; i < 4; i++) { - D_800AF0A6[i] = 0; - D_800AF090[i] = &D_800AF0A0; - } - - obSetCurrentTime(osGetTime()); - - D_800AF0B0 = func_80173B60(D_800AF0B0); - func_8007819C(); -} - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_800765D8); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076AE8); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076DC8); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076E00); - -/* 722C 80076E2C */ -void func_80076E2C(void) { - D_800AF0B0 = func_80173B60(D_800AF0B0); -} - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076E58); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076EAC); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076F00); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076F5C); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007705C); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80077160); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80077200); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80077288); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80077314); - -/* 7768 80077368 */ -s32 UnusedMallocNo(s32 arg0) { - s32 var_a1; - SomethingMalloc** var_v1; - - var_a1 = 0; - var_v1 = &D_800E8300[arg0]; -loop_1: - if (*var_v1 != 0) { - var_a1 += 1; - var_v1 += 1; - if (var_a1 >= 10) { - osSyncPrintf("UnusedMallocNo(): 空きがない！\n"); - while(1); - } - goto loop_1; - } - return var_a1; -} - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_800773D4); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007740C); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007745C); - -/* 7894 80077494 */ -void func_80077494(s32 arg0) { - if (arg0 == D_800C4C10[0]) { - D_800C4BE0 = D_800C47F0; - D_800E8108 = &__MAIN_START_BUT_CHECK; - D_800C4BDC = &D_800E8100; - D_800C4804 = &D_800C4BD0; - D_800C4C0C = &D_800E79BC; - D_800C4BE8 = &D_800C49D2; - D_800C4AD4 = &D_800E7A24; - D_800E9BC0 = &D_800E797C; - D_800E7A08 = &D_800C480A; - D_800C4BAC = &__SOMETHING_WITH_GFX + 4; - D_800C4B24 = &D_800C4B28; - D_800E7D6C = &D_800C4BB0; - D_800C4C4C = &__CONTROLLER_0_BUTTON; - } else { - D_800C4BE0 = D_800AF090; - D_800E8108 = &D_800AF0A6; - D_800C4BDC = &D_800AF0A6; - D_800C4804 = &D_800AF0A6; - D_800C4C0C = &D_800AF0A6; - D_800C4BE8 = &D_800AF0A6; - D_800C4AD4 = &D_800AF0A6; - D_800E9BC0 = &D_800AF0A6; - D_800E7A08 = &D_800AF0A6; - D_800C4BAC = &D_800AF0A6; - D_800C4B24 = &D_800AF0A6; - D_800E7D6C = &D_800AF0A6; - D_800C4C4C = &D_800AF0A6; - } -} - - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_800775EC); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80077BF8); - -void func_80077F80(void) { } - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80077F88); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_800780D4); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80078164); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007819C); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_800782EC); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80078300); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007834C); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80078658); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80078674); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007896C); - -// s32 func_8007338C(); /* extern */ -// extern s32 D_800E8210; - -// /* 8D6C 8007896C */ -// void func_8007896C(s16 arg0, s16 arg1, s16 arg2, s16 arg3) { -// s16 ulx; -// s16 uly; -// s16 lrx; -// s16 lry; -// // s32 temp_a0; -// -// lry = arg0; -// lrx = arg1; -// ulx = arg2; -// uly = arg3; -// if (func_8007338C() != 0) { -// if (arg0 < 0) { -// lry = 0; -// } else if (arg0 >= 320) { -// lry = 319; -// } -// if (lrx < 0) { -// lrx = 0; -// } else if (lrx >= 320) { -// lrx = 319; -// } -// if (ulx < 0) { -// ulx = 0; -// } else if (ulx >= 320) { -// ulx = 319; -// } -// if (uly < 0) { -// uly = 0; -// } else if (uly >= 240) { -// uly = 239; -// } -// -// gDPPipeSync(obPtrDisplayList++); -// -// // obPtrDisplayList = temp_v0 + 8; -// // temp_v0->unk8 = 0xE200001C; -// // temp_v0->unkC = 0; -// gDPSetRenderMode(obPtrDisplayList++, G_RM_NOOP, G_RM_NOOP2); -// -// gDPPipeSync(obPtrDisplayList++); -// gDPPipeSync(obPtrDisplayList++); -// gDPPipeSync(obPtrDisplayList++); -// -// // obPtrDisplayList = temp_v0 + 0x28; -// // temp_v0->unk28 = 0xE3000A01; -// // temp_v0->unk2C = 0x00300000; -// gDPSetCycleType(obPtrDisplayList++, G_CYC_FILL); -// -// // obPtrDisplayList = temp_v0 + 0x30; -// // temp_v0->unk30 = 0xE7000000U; -// // temp_v0->unk34 = 0; -// gDPPipeSync(obPtrDisplayList++); -// -// // obPtrDisplayList = temp_v0 + 0x38; -// // temp_v0->unk38 = 0xFE000000; -// // temp_v0->unk3C = temp_a0; -// gDPSetDepthImage(obPtrDisplayList++, D_800C4B20 - 0x80000000); -// -// // obPtrDisplayList = temp_v0 + 0x40; -// // temp_v0->unk40 = 0xFF10013F; -// // temp_v0->unk44 = temp_a0; -// gDPSetColorImage(obPtrDisplayList++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, D_800C4B20 - 0x80000000); -// -// // obPtrDisplayList = temp_v0 + 0x48; -// // temp_v0->unk48 = 0xF7000000; -// // temp_v0->unk4C = 0xFFFCFFFC; -// gDPSetFillColor(obPtrDisplayList++, 0xFFFCFFFC); -// -// // obPtrDisplayList = temp_v0 + 0x50; -// // temp_v0->unk50 = 0xE7000000U; -// // temp_v0->unk54 = 0; -// gDPPipeSync(obPtrDisplayList++); -// -// // obPtrDisplayList = temp_v0 + 0x58; -// // temp_v0->unk58 = (s32) (((ulx & 0x3FF) << 0xE) | (((uly & 0x3FF) * 4) | 0xF6000000)); -// // temp_v0->unk5C = (s32) (((lry & 0x3FF) << 0xE) | ((lrx & 0x3FF) * 4)); -// gDPFillRectangle(obPtrDisplayList++, ulx, uly, lrx, lry); -// -// // obPtrDisplayList = temp_v0 + 0x60; -// // temp_v0->unk60 = 0xE7000000U; -// // temp_v0->unk64 = 0; -// gDPPipeSync(obPtrDisplayList++); -// -// // obPtrDisplayList = temp_v0 + 0x68; -// // temp_v0->unk68 = 0xE7000000U; -// // temp_v0->unk6C = 0; -// gDPPipeSync(obPtrDisplayList++); -// -// // obPtrDisplayList = temp_v0 + 0x70; -// // temp_v0->unk70 = 0xE7000000U; -// // temp_v0->unk74 = 0; -// gDPPipeSync(obPtrDisplayList++); -// -// // obPtrDisplayList = temp_v0 + 0x78; -// // temp_v0->unk78 = 0xE7000000U; -// // temp_v0->unk7C = 0; -// gDPPipeSync(obPtrDisplayList++); -// -// // obPtrDisplayList = temp_v0 + 0x80; -// // temp_v0->unk80 = 0xFF10013F; -// // temp_v0->unk84 = (s32) (D_800E8210 - 0x80000000); -// gDPSetColorImage(obPtrDisplayList++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, D_800E8210 - 0x80000000); -// -// // obPtrDisplayList = temp_v0 + 0x88; -// // temp_v0->unk88 = 0xE7000000U; -// // temp_v0->unk8C = 0; -// gDPPipeSync(obPtrDisplayList++); -// -// // obPtrDisplayList = temp_v0 + 0x90; -// // temp_v0->unk90 = 0xE7000000U; -// // temp_v0->unk94 = 0; -// gDPPipeSync(obPtrDisplayList++); -// -// // obPtrDisplayList = temp_v0 + 0x98; -// // temp_v0->unk98 = 0xE3000A01; -// // temp_v0->unk9C = 0; -// gDPSetCycleType(obPtrDisplayList++, G_CYC_1CYCLE); -// -// // obPtrDisplayList = temp_v0 + 0xA0; -// // temp_v0->unkA0 = 0xE7000000U; -// // temp_v0->unkA4 = 0; -// gDPPipeSync(obPtrDisplayList++); -// -// // obPtrDisplayList = temp_v0 + 0xA8; -// } +// /* 6594 80076194 */ +// void func_80076194(void) { +// __maybeBlockingRetraceFunc = 0xFFFE; // } -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80078C6C); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079028); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007913C); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079358); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079380); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007938C); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079618); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079850); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_800798AC); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079950); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079AFC); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079BD8); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079CB4); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079D60); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079D98); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079DF8); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079E50); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079E9C); - -/* A29C 80079E9C */ -// Arg_800712C4* func_80079E9C(Arg_800712C4* arg0) { -// Arg_800712C4* var_s0; - -// var_s0 = arg0; -// if (var_s0 != NULL) { -// var_s0->field_0x10 = func_80079E9C(var_s0->field_0x10); -// var_s0->field_0x14 = func_80079E9C(var_s0->field_0x14); -// func_800712C4(var_s0->field_0x4); -// func_800712C4(var_s0); -// var_s0 = NULL; -// } -// return var_s0; +// /* 65A4 800761A4 */ +// void func_800761A4(void) { +// func_80073164(0, 1, 1, 0x80, 1, 0x100, 0x2000); // } -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079EF4); +// INCLUDE_ASM(const s32, "_ob_rabid_jar", __loads_overlay_array); -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079F70); +// INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076324); -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007A070); +// INCLUDE_ASM(const s32, "_ob_rabid_jar", __get_overlay_index); -INCLUDE_ASM(const s32, "_ob_rabid_jar", Unpack); +// /* 68E0 800764E0 */ +// void func_800764E0(void) { +// u16 i; -/* ABE0 8007A7E0 */ -u32 __read_u32_le(u8* arg0) { - return (arg0[0] << 24) | (arg0[1] << 16) | (arg0[2] << 8) | arg0[3]; -} - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007A80C); - -INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007AB30); - -/* AF7C 8007AB7C */ -void obSendUnpackMesg(OBUnpackMesg* msg) { - msg->format = 1; - osSendMesg(&obUnpackQueue, msg, OS_MESG_BLOCK); -} - -extern OSThread obThreadUnpackProc; -extern OBUnpackMesg obUnpackMesgBuf[8]; - -extern DECLARE_STACK(obStackUnpackProc, 0x80); - -/* AFAC 8007ABAC */ -void obUnpackThreadStart(OSId id, OSPri priority) { - osCreateMesgQueue(&obUnpackQueue, (OSMesg)&obUnpackMesgBuf, 8); +// osGetTime(); +// bzero(D_800E82C8, sizeof(D_800E82C8)); +// bzero(D_800C4C10, sizeof(D_800C4C10)); - osCreateThread(&obThreadUnpackProc, id, UnpackProc, NULL, STACK_START(obStackUnpackProc), priority); - osStartThread(&obThreadUnpackProc); -} +// D_800C4C20 = 1; +// D_800E79A0 = 8; +// D_800C49D0 = 0; +// D_800AF0B0 = 0; +// D_800AF0A0.field_0x0 = 0; +// D_800AF0A0.field_0x3 = 0; +// D_800AF0A0.field_0x2 = 0; +// D_800AF0A0.field_0x4 = 0; + +// for(i = 0; i < 4; i++) { +// D_800AF0A6[i] = 0; +// D_800AF090[i] = &D_800AF0A0; +// } -/* B030 8007AC30 */ -void UnpackProc(void* __unused) { - OBUnpackMesg *msg = NULL; +// obSetCurrentTime(osGetTime()); + +// D_800AF0B0 = func_80173B60(D_800AF0B0); +// func_8007819C(); +// } - while(1) { - osRecvMesg(&obUnpackQueue, (OSMesg)&msg, 1); - if (msg->format == 1) { - Unpack(msg->buffer, msg->size); - osSendMesg(msg->queue, msg, OS_MESG_BLOCK); - } else { - osSyncPrintf("UnpackProc: no supported format %d\n", msg->format); - } - } -} +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_800765D8); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076AE8); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076DC8); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076E00); + +// // /* 722C 80076E2C */ +// // void func_80076E2C(void) { +// // D_800AF0B0 = func_80173B60(D_800AF0B0); +// // } + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076E58); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076EAC); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076F00); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076F5C); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007705C); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80077160); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80077200); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80077288); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80077314); + +// // /* 7768 80077368 */ +// // s32 UnusedMallocNo(s32 arg0) { +// // s32 var_a1; +// // SomethingMalloc** var_v1; + +// // var_a1 = 0; +// // var_v1 = &D_800E8300[arg0]; +// // loop_1: +// // if (*var_v1 != 0) { +// // var_a1 += 1; +// // var_v1 += 1; +// // if (var_a1 >= 10) { +// // osSyncPrintf("UnusedMallocNo(): 空きがない！\n"); +// // while(1); +// // } +// // goto loop_1; +// // } +// // return var_a1; +// // } + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_800773D4); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007740C); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007745C); + +// // /* 7894 80077494 */ +// // void func_80077494(s32 arg0) { +// // if (arg0 == D_800C4C10[0]) { +// // D_800C4BE0 = D_800C47F0; +// // D_800E8108 = &__MAIN_START_BUT_CHECK; +// // D_800C4BDC = &D_800E8100; +// // D_800C4804 = &D_800C4BD0; +// // D_800C4C0C = &D_800E79BC; +// // D_800C4BE8 = &D_800C49D2; +// // D_800C4AD4 = &D_800E7A24; +// // D_800E9BC0 = &D_800E797C; +// // D_800E7A08 = &D_800C480A; +// // D_800C4BAC = &__SOMETHING_WITH_GFX + 4; +// // D_800C4B24 = &D_800C4B28; +// // D_800E7D6C = &D_800C4BB0; +// // D_800C4C4C = &__CONTROLLER_0_BUTTON; +// // } else { +// // D_800C4BE0 = D_800AF090; +// // D_800E8108 = &D_800AF0A6; +// // D_800C4BDC = &D_800AF0A6; +// // D_800C4804 = &D_800AF0A6; +// // D_800C4C0C = &D_800AF0A6; +// // D_800C4BE8 = &D_800AF0A6; +// // D_800C4AD4 = &D_800AF0A6; +// // D_800E9BC0 = &D_800AF0A6; +// // D_800E7A08 = &D_800AF0A6; +// // D_800C4BAC = &D_800AF0A6; +// // D_800C4B24 = &D_800AF0A6; +// // D_800E7D6C = &D_800AF0A6; +// // D_800C4C4C = &D_800AF0A6; +// // } +// // } + + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_800775EC); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80077BF8); + +// // void func_80077F80(void) { } + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80077F88); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_800780D4); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80078164); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007819C); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_800782EC); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80078300); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007834C); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80078658); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80078674); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007896C); + +// // // s32 func_8007338C(); /* extern */ +// // // extern s32 D_800E8210; + +// // // /* 8D6C 8007896C */ +// // // void func_8007896C(s16 arg0, s16 arg1, s16 arg2, s16 arg3) { +// // // s16 ulx; +// // // s16 uly; +// // // s16 lrx; +// // // s16 lry; +// // // // s32 temp_a0; +// // // +// // // lry = arg0; +// // // lrx = arg1; +// // // ulx = arg2; +// // // uly = arg3; +// // // if (func_8007338C() != 0) { +// // // if (arg0 < 0) { +// // // lry = 0; +// // // } else if (arg0 >= 320) { +// // // lry = 319; +// // // } +// // // if (lrx < 0) { +// // // lrx = 0; +// // // } else if (lrx >= 320) { +// // // lrx = 319; +// // // } +// // // if (ulx < 0) { +// // // ulx = 0; +// // // } else if (ulx >= 320) { +// // // ulx = 319; +// // // } +// // // if (uly < 0) { +// // // uly = 0; +// // // } else if (uly >= 240) { +// // // uly = 239; +// // // } +// // // +// // // gDPPipeSync(obPtrDisplayList++); +// // // +// // // // obPtrDisplayList = temp_v0 + 8; +// // // // temp_v0->unk8 = 0xE200001C; +// // // // temp_v0->unkC = 0; +// // // gDPSetRenderMode(obPtrDisplayList++, G_RM_NOOP, G_RM_NOOP2); +// // // +// // // gDPPipeSync(obPtrDisplayList++); +// // // gDPPipeSync(obPtrDisplayList++); +// // // gDPPipeSync(obPtrDisplayList++); +// // // +// // // // obPtrDisplayList = temp_v0 + 0x28; +// // // // temp_v0->unk28 = 0xE3000A01; +// // // // temp_v0->unk2C = 0x00300000; +// // // gDPSetCycleType(obPtrDisplayList++, G_CYC_FILL); +// // // +// // // // obPtrDisplayList = temp_v0 + 0x30; +// // // // temp_v0->unk30 = 0xE7000000U; +// // // // temp_v0->unk34 = 0; +// // // gDPPipeSync(obPtrDisplayList++); +// // // +// // // // obPtrDisplayList = temp_v0 + 0x38; +// // // // temp_v0->unk38 = 0xFE000000; +// // // // temp_v0->unk3C = temp_a0; +// // // gDPSetDepthImage(obPtrDisplayList++, D_800C4B20 - 0x80000000); +// // // +// // // // obPtrDisplayList = temp_v0 + 0x40; +// // // // temp_v0->unk40 = 0xFF10013F; +// // // // temp_v0->unk44 = temp_a0; +// // // gDPSetColorImage(obPtrDisplayList++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, D_800C4B20 - 0x80000000); +// // // +// // // // obPtrDisplayList = temp_v0 + 0x48; +// // // // temp_v0->unk48 = 0xF7000000; +// // // // temp_v0->unk4C = 0xFFFCFFFC; +// // // gDPSetFillColor(obPtrDisplayList++, 0xFFFCFFFC); +// // // +// // // // obPtrDisplayList = temp_v0 + 0x50; +// // // // temp_v0->unk50 = 0xE7000000U; +// // // // temp_v0->unk54 = 0; +// // // gDPPipeSync(obPtrDisplayList++); +// // // +// // // // obPtrDisplayList = temp_v0 + 0x58; +// // // // temp_v0->unk58 = (s32) (((ulx & 0x3FF) << 0xE) | (((uly & 0x3FF) * 4) | 0xF6000000)); +// // // // temp_v0->unk5C = (s32) (((lry & 0x3FF) << 0xE) | ((lrx & 0x3FF) * 4)); +// // // gDPFillRectangle(obPtrDisplayList++, ulx, uly, lrx, lry); +// // // +// // // // obPtrDisplayList = temp_v0 + 0x60; +// // // // temp_v0->unk60 = 0xE7000000U; +// // // // temp_v0->unk64 = 0; +// // // gDPPipeSync(obPtrDisplayList++); +// // // +// // // // obPtrDisplayList = temp_v0 + 0x68; +// // // // temp_v0->unk68 = 0xE7000000U; +// // // // temp_v0->unk6C = 0; +// // // gDPPipeSync(obPtrDisplayList++); +// // // +// // // // obPtrDisplayList = temp_v0 + 0x70; +// // // // temp_v0->unk70 = 0xE7000000U; +// // // // temp_v0->unk74 = 0; +// // // gDPPipeSync(obPtrDisplayList++); +// // // +// // // // obPtrDisplayList = temp_v0 + 0x78; +// // // // temp_v0->unk78 = 0xE7000000U; +// // // // temp_v0->unk7C = 0; +// // // gDPPipeSync(obPtrDisplayList++); +// // // +// // // // obPtrDisplayList = temp_v0 + 0x80; +// // // // temp_v0->unk80 = 0xFF10013F; +// // // // temp_v0->unk84 = (s32) (D_800E8210 - 0x80000000); +// // // gDPSetColorImage(obPtrDisplayList++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, D_800E8210 - 0x80000000); +// // // +// // // // obPtrDisplayList = temp_v0 + 0x88; +// // // // temp_v0->unk88 = 0xE7000000U; +// // // // temp_v0->unk8C = 0; +// // // gDPPipeSync(obPtrDisplayList++); +// // // +// // // // obPtrDisplayList = temp_v0 + 0x90; +// // // // temp_v0->unk90 = 0xE7000000U; +// // // // temp_v0->unk94 = 0; +// // // gDPPipeSync(obPtrDisplayList++); +// // // +// // // // obPtrDisplayList = temp_v0 + 0x98; +// // // // temp_v0->unk98 = 0xE3000A01; +// // // // temp_v0->unk9C = 0; +// // // gDPSetCycleType(obPtrDisplayList++, G_CYC_1CYCLE); +// // // +// // // // obPtrDisplayList = temp_v0 + 0xA0; +// // // // temp_v0->unkA0 = 0xE7000000U; +// // // // temp_v0->unkA4 = 0; +// // // gDPPipeSync(obPtrDisplayList++); +// // // +// // // // obPtrDisplayList = temp_v0 + 0xA8; +// // // } +// // // } + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80078C6C); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079028); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007913C); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079358); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079380); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007938C); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079618); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079850); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_800798AC); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079950); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079AFC); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079BD8); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079CB4); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079D60); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079D98); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079DF8); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079E50); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079E9C); + +// // /* A29C 80079E9C */ +// // // Arg_800712C4* func_80079E9C(Arg_800712C4* arg0) { +// // // Arg_800712C4* var_s0; + +// // // var_s0 = arg0; +// // // if (var_s0 != NULL) { +// // // var_s0->field_0x10 = func_80079E9C(var_s0->field_0x10); +// // // var_s0->field_0x14 = func_80079E9C(var_s0->field_0x14); +// // // func_800712C4(var_s0->field_0x4); +// // // func_800712C4(var_s0); +// // // var_s0 = NULL; +// // // } +// // // return var_s0; +// // // } + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079EF4); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80079F70); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007A070); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", Unpack); + +// // /* ABE0 8007A7E0 */ +// // u32 __read_u32_le(u8* arg0) { +// // return (arg0[0] << 24) | (arg0[1] << 16) | (arg0[2] << 8) | arg0[3]; +// // } + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007A80C); + +// // INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007AB30); + +// // /* AF7C 8007AB7C */ +// // void obSendUnpackMesg(OBUnpackMesg* msg) { +// // msg->format = 1; +// // osSendMesg(&obUnpackQueue, msg, OS_MESG_BLOCK); +// // } + +// // extern OSThread obThreadUnpackProc; +// // extern OBUnpackMesg obUnpackMesgBuf[8]; + +// // extern DECLARE_STACK(obStackUnpackProc, 0x80); + +// // /* AFAC 8007ABAC */ +// // void obUnpackThreadStart(OSId id, OSPri priority) { +// // osCreateMesgQueue(&obUnpackQueue, (OSMesg)&obUnpackMesgBuf, 8); + +// // osCreateThread(&obThreadUnpackProc, id, UnpackProc, NULL, STACK_START(obStackUnpackProc), priority); +// // osStartThread(&obThreadUnpackProc); +// // } + +// // /* B030 8007AC30 */ +// // void UnpackProc(void* __unused) { +// // OBUnpackMesg *msg = NULL; + +// // while(1) { +// // osRecvMesg(&obUnpackQueue, (OSMesg)&msg, 1); +// // if (msg->format == 1) { +// // Unpack(msg->buffer, msg->size); +// // osSendMesg(msg->queue, msg, OS_MESG_BLOCK); +// // } else { +// // osSyncPrintf("UnpackProc: no supported format %d\n", msg->format); +// // } +// // } +// // } diff --git a/src/overlay_14EBE0/_ob_daily_account.c b/src/overlay_14EBE0/_ob_daily_account.c deleted file mode 100644 index 8add333..0000000 --- a/src/overlay_14EBE0/_ob_daily_account.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_daily_account", func_overlay_14EBE0_8020CDA0_15DF10); diff --git a/src/overlay_14EBE0/_ob_devilish_crayon.c b/src/overlay_14EBE0/_ob_devilish_crayon.c deleted file mode 100644 index a976211..0000000 --- a/src/overlay_14EBE0/_ob_devilish_crayon.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020D500_15E670); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020D5E4_15E754); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020D780_15E8F0); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020DAA8_15EC18); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020DDD0_15EF40); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020E0F0_15F260); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020E394_15F504); - -INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_devilish_crayon", D_overlay_14EBE0_80214E40_165FB0); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020E524_15F694); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020E6C8_15F838); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020E7F4_15F964); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020E9A4_15FB14); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020E9E0_15FB50); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020EA18_15FB88); diff --git a/src/overlay_14EBE0/_ob_gaudy_line.c b/src/overlay_14EBE0/_ob_gaudy_line.c deleted file mode 100644 index 5566df9..0000000 --- a/src/overlay_14EBE0/_ob_gaudy_line.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_gaudy_line", func_overlay_14EBE0_8020CE00_15DF70); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_gaudy_line", func_overlay_14EBE0_8020CE0C_15DF7C); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_gaudy_line", func_overlay_14EBE0_8020CE8C_15DFFC); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_gaudy_line", func_overlay_14EBE0_8020CEBC_15E02C); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_gaudy_line", func_overlay_14EBE0_8020D210_15E380); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_gaudy_line", func_overlay_14EBE0_8020D328_15E498); diff --git a/src/overlay_14EBE0/_ob_phobic_spot.c b/src/overlay_14EBE0/_ob_phobic_spot.c deleted file mode 100644 index 0c913eb..0000000 --- a/src/overlay_14EBE0/_ob_phobic_spot.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_801FDA70_14EBE0); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_801FE190_14F300); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_801FE28C_14F3FC); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_801FF3E0_150550); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_801FFEEC_15105C); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_802001A8_151318); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_802004C4_151634); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_8020078C_1518FC); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_80200A38_151BA8); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_80200AC0_151C30); diff --git a/src/overlay_14EBE0/_ob_touted_bedroom.c b/src/overlay_14EBE0/_ob_touted_bedroom.c deleted file mode 100644 index f4c1a97..0000000 --- a/src/overlay_14EBE0/_ob_touted_bedroom.c +++ /dev/null @@ -1,163 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80200DD0_151F40); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80200F70_1520E0); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020122C_15239C); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_802012D8_152448); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80201384_1524F4); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_802014C8_152638); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020153C_1526AC); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_802017C0_152930); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80201A44_152BB4); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80201AFC_152C6C); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80201B68_152CD8); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80201C7C_152DEC); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80201D1C_152E8C); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80201D9C_152F0C); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80201E4C_152FBC); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80202140_1532B0); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80202434_1535A4); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80202728_153898); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_802027DC_15394C); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80202840_1539B0); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_802028A4_153A14); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80202928_153A98); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020296C_153ADC); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80202B70_153CE0); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80202E10_153F80); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80202F54_1540C4); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80203050_1541C0); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80203524_154694); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80203558_1546C8); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80203D9C_154F0C); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80203FA4_155114); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80204050_1551C0); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80204120_155290); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80204210_155380); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020439C_15550C); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80204B34_155CA4); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80204B58_155CC8); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80204B80_155CF0); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80204BA4_155D14); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80204BE8_155D58); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80204C3C_155DAC); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020521C_15638C); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80205D20_156E90); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80205DC8_156F38); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80205F2C_15709C); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80206340_1574B0); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80206C70_157DE0); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80206D78_157EE8); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80206DBC_157F2C); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80206DE4_157F54); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80206EB4_158024); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80207068_1581D8); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80207210_158380); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80207380_1584F0); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020746C_1585DC); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020753C_1586AC); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020766C_1587DC); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80207C94_158E04); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020808C_1591FC); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80208304_159474); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80208920_159A90); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80208A3C_159BAC); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80208ADC_159C4C); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80208BE4_159D54); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80208E64_159FD4); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020C284_15D3F4); - -INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020C7F4_15D964); - -INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214D10_165E80); - -INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214D30_165EA0); - -INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214D54_165EC4); - -INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214D84_165EF4); - -INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214D9C_165F0C); - -INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214DB4_165F24); - -INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214DC4_165F34); - -INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214DD4_165F44); - -INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214DE4_165F54); - -INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214E0C_165F7C); - -INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214E1C_165F8C); - -INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214E24_165F94); - -INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214E2C_165F9C); - -INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214E34_165FA4); diff --git a/src/overlay_286BD0/_ob_childlike_cherry.c b/src/overlay_286BD0/_ob_childlike_cherry.c deleted file mode 100644 index 7a3c059..0000000 --- a/src/overlay_286BD0/_ob_childlike_cherry.c +++ /dev/null @@ -1,21 +0,0 @@ -#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); diff --git a/src/overlay_286BD0/_ob_early_ghost.c b/src/overlay_286BD0/_ob_early_ghost.c deleted file mode 100644 index 7729177..0000000 --- a/src/overlay_286BD0/_ob_early_ghost.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_early_ghost", func_overlay_286BD0_8023DE10_299D50); diff --git a/src/overlay_286BD0/_ob_future_flesh.c b/src/overlay_286BD0/_ob_future_flesh.c deleted file mode 100644 index f778daa..0000000 --- a/src/overlay_286BD0/_ob_future_flesh.c +++ /dev/null @@ -1,179 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022E870_28A7B0); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022E8D4_28A814); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022E90C_28A84C); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022E978_28A8B8); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022E984_28A8C4); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022EA9C_28A9DC); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022EB0C_28AA4C); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022EC34_28AB74); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022ECBC_28ABFC); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022ED48_28AC88); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022ED9C_28ACDC); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022EDEC_28AD2C); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022EEB4_28ADF4); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F024_28AF64); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F148_28B088); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F1A0_28B0E0); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F264_28B1A4); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F2D8_28B218); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F324_28B264); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F408_28B348); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F5C4_28B504); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F848_28B788); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F864_28B7A4); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F998_28B8D8); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022FB60_28BAA0); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022FC54_28BB94); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022FCD4_28BC14); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022FD78_28BCB8); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802300A8_28BFE8); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802300D4_28C014); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80230360_28C2A0); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80230ADC_28CA1C); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80231098_28CFD8); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802311B0_28D0F0); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80231D58_28DC98); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80231EAC_28DDEC); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80231F04_28DE44); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802320C0_28E000); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802321FC_28E13C); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80232E20_28ED60); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023324C_28F18C); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802339D8_28F918); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80233DA8_28FCE8); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80233F38_28FE78); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80234078_28FFB8); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802344D0_290410); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802348A8_2907E8); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802348B8_2907F8); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802348D0_290810); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802348E0_290820); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023498C_2908CC); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80234B38_290A78); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80234D10_290C50); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80234DB8_290CF8); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80234E10_290D50); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023519C_2910DC); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802351C4_291104); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802351F0_291130); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80235254_291194); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80235914_291854); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802359B4_2918F4); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802372C8_293208); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802376B8_2935F8); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80237B7C_293ABC); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80238910_294850); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80238A00_294940); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80238C4C_294B8C); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80238D14_294C54); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80238EC4_294E04); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023906C_294FAC); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802390AC_294FEC); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80239160_2950A0); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80239394_2952D4); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802394A0_2953E0); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80239570_2954B0); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80239634_295574); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802396F0_295630); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802397B8_2956F8); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80239B14_295A54); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80239C5C_295B9C); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80239E30_295D70); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80239EE0_295E20); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023A398_2962D8); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023A42C_29636C); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023A5D8_296518); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023A814_296754); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023AA70_2969B0); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023AB74_296AB4); - -INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023AD10_296C50); diff --git a/src/overlay_286BD0/_ob_painstaking_mouth.c b/src/overlay_286BD0/_ob_painstaking_mouth.c deleted file mode 100644 index 7d56bb2..0000000 --- a/src/overlay_286BD0/_ob_painstaking_mouth.c +++ /dev/null @@ -1,63 +0,0 @@ -#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); diff --git a/src/overlay_286BD0/_ob_pathetic_action.c b/src/overlay_286BD0/_ob_pathetic_action.c deleted file mode 100644 index 6a4f9fc..0000000 --- a/src/overlay_286BD0/_ob_pathetic_action.c +++ /dev/null @@ -1,27 +0,0 @@ -#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);