Match sub_8007A78 and nullsub_157

This commit is contained in:
Kermalis 2023-08-07 10:14:52 -04:00
parent c419a607d0
commit e414e4c113
4 changed files with 13 additions and 30 deletions

View File

@ -5,34 +5,6 @@
.text
thumb_func_start sub_8007A78
sub_8007A78:
push {r4-r6,lr}
sub sp, 0x8
adds r4, r0, 0
adds r5, r1, 0
adds r6, r2, 0
ldr r1, [sp, 0x18]
ldr r0, _08007A9C
str r3, [sp]
str r1, [sp, 0x4]
adds r1, r4, 0
adds r2, r5, 0
adds r3, r6, 0
bl sub_8007AA4
add sp, 0x8
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_08007A9C: .4byte gUnknown_2027370
thumb_func_end sub_8007A78
thumb_func_start nullsub_157
nullsub_157:
bx lr
thumb_func_end nullsub_157
thumb_func_start sub_8007AA4
sub_8007AA4:
push {r4-r7,lr}

View File

@ -33,6 +33,7 @@ void sub_80073B8(s32);
void sub_80073E0(s32);
void sub_80078A4(u32, s32, s32, u32, u32);
void sub_800792C(u32, s32, s32, u32, u32);
void sub_8007A78(u32, u32, u32, u32, u32);
// text.s
extern struct unkChar *GetCharacter(u32);

View File

@ -50,7 +50,6 @@ extern u8 *gUnknown_80D49BC[];
extern u8 gUnknown_80DC524[];
extern void sub_8008C54(u32);
extern void sub_8092578(u8 *buffer, u8 index, u8 r2);
void sub_8007A78(u32, u32, u32, u32, u32);
extern void sub_8021878(void);
extern void sub_8021894(void);

View File

@ -9,6 +9,7 @@ extern const u32 gUnknown_80B8814[];
extern const struct unkStruct_80B8824 gUnknown_80B8824;
// text.s
extern void sub_8007AA4(struct UnkTextStruct1 *, u32, u32, u32, u32, u32);
extern void sub_8008C6C(struct UnkTextStruct1 *, u32);
void nullsub_129(u32, s32, s32, u32, u32);
@ -2160,4 +2161,14 @@ void sub_8007958(struct UnkTextStruct1 *a0, u32 a1, s32 x, s32 y, s32 a4, u32 co
"_08007A70: .4byte gUnknown_80B85DC\n"
"_08007A74: .4byte 0x11111111");
}
#endif // NONMATCHING
#endif // NONMATCHING
void sub_8007A78(u32 a0, u32 a1, u32 a2, u32 a3, u32 a4)
{
sub_8007AA4(gUnknown_2027370, a0, a1, a2, a3, a4);
}
// Unused
void nullsub_157()
{
}