diff --git a/splat.yaml b/splat.yaml index 2d57447..85b0cca 100644 --- a/splat.yaml +++ b/splat.yaml @@ -52,7 +52,7 @@ segments: subsegments: - [0x1060, c, "main"] - [0x4AC0, asm] - - [0x5FC0, asm, "5FC0"] + - [0x5FC0, c, "_ob_overconfident_mother"] - [0x68E0, asm] - [0x8700, asm] - [0xA370, asm, "lha"] @@ -83,7 +83,7 @@ segments: - [0x11440, asm] - [0x11480, asm] - - [0x114F0, asm, "libmus/player_api"] + - [0x114F0, asm, "libmus/player"] - [0x12530, asm] - [0x155C0, asm] diff --git a/src/1C0E0.c b/src/1C0E0.c deleted file mode 100644 index d701df3..0000000 --- a/src/1C0E0.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "common.h" - -#include - -/* 1C0E0 8008BCE0 */ -s32 func_8008BCE0(void** arg0) { - // Use of `__osDisableInt()` and `__osRestoreInt()` - // suggest that this is an library function. - - void* temp_v1; - u32 mask; - - mask = __osDisableInt(); - temp_v1 = D_800AA41C; - D_800AA41C = arg0; - *arg0 = temp_v1; - __osRestoreInt(mask); - return 0; -} diff --git a/src/5FC0.c b/src/5FC0.c deleted file mode 100644 index d45cf8f..0000000 --- a/src/5FC0.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(const s32, "5FC0", __calls_loads_overlay_array); - -INCLUDE_ASM(const s32, "5FC0", func_80076150); - -/* 6588 80076188 */ -u8* func_80076188(void) { - return &D_800A872C; -} - -/* 6594 80076194 */ -void func_80076194(void) { - D_800C4C26 = 0xFFFE; -} - -/* 65A4 800761A4 */ -void func_800761A4(void) { - func_80073164(0, 1, 1, 0x80, 1, 0x100, 0x2000); -} - - -INCLUDE_ASM(const s32, "5FC0", __loads_overlay_array); - -INCLUDE_ASM(const s32, "5FC0", func_80076324); - -INCLUDE_ASM(const s32, "5FC0", __get_overlay_index); diff --git a/src/_ob_overconfident_mother.c b/src/_ob_overconfident_mother.c new file mode 100644 index 0000000..3eb900c --- /dev/null +++ b/src/_ob_overconfident_mother.c @@ -0,0 +1,27 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "_ob_overconfident_mother", __calls_loads_overlay_array); + +INCLUDE_ASM(const s32, "_ob_overconfident_mother", func_80076150); + +/* 6588 80076188 */ +u8* func_80076188(void) { + return &D_800A872C; +} + +/* 6594 80076194 */ +void func_80076194(void) { + D_800C4C26 = 0xFFFE; +} + +/* 65A4 800761A4 */ +void func_800761A4(void) { + func_80073164(0, 1, 1, 0x80, 1, 0x100, 0x2000); +} + + +INCLUDE_ASM(const s32, "_ob_overconfident_mother", __loads_overlay_array); + +INCLUDE_ASM(const s32, "_ob_overconfident_mother", func_80076324); + +INCLUDE_ASM(const s32, "_ob_overconfident_mother", __get_overlay_index);