gijs
/
ogrebattle64
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged old `_ob_overconfident_mother` with `_ob_rabid_jar`

This commit is contained in:
gijs 2023-09-29 18:54:56 +02:00
parent dccd234f4a
commit 9e1dd54094
2 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/_ob_rabid_jar.c
View File

@ -12,11 +12,20 @@ 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);
INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076188); /* 6588 80076188 */
u32* func_80076188(void) {
return &D_800A872C;
}
INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076194); /* 6594 80076194 */
void func_80076194(void) {
D_800C4C26 = 0xFFFE;
}
INCLUDE_ASM(const s32, "_ob_rabid_jar", func_800761A4); /* 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", __loads_overlay_array);

26
src/bk_ob_overconfident_mother.c
View File

@ -1,26 +0,0 @@
#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 */
u32* 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);