diff options
author | Seth Barberee <seth.barberee@gmail.com> | 2020-10-25 22:52:36 -0500 |
---|---|---|
committer | Seth Barberee <seth.barberee@gmail.com> | 2020-10-25 22:52:36 -0500 |
commit | bad9c1bf1f0260db29a2762f92ea21b3280ca114 (patch) | |
tree | 093c2b9839df3d10e9dbf0625d49a23949fbb812 /src/code_8048480.c | |
parent | 69bf0084ce09c7e021596eab4b84ccc149745933 (diff) |
some more func work
Diffstat (limited to 'src/code_8048480.c')
-rw-r--r-- | src/code_8048480.c | 44 |
1 files changed, 43 insertions, 1 deletions
diff --git a/src/code_8048480.c b/src/code_8048480.c index 7033590..13415f5 100644 --- a/src/code_8048480.c +++ b/src/code_8048480.c @@ -3,7 +3,11 @@ extern void sub_807D148(u32 r0, u32 r1, u32 r2, u32 r3); extern void sub_8075FCC(void); extern void sub_8077AE4(u32 r0, u32 r1, u32 r2); -extern void sub_8072008(u32 r0, u32 r1, u32 r2, u32 r3); +extern void sub_8072008(u32 r0, u32 r1, u32 r2, u8 r3); +extern void sub_8076D10(void); +extern void sub_80522F4(u32 r0, u32 r1, u32 r2); +extern void sub_807232C(u32 r0, u32 r1, u32 r2); +extern u32 gUnknown_80F89F4; void sub_8048480(u32 r0, u32 r1) { @@ -19,3 +23,41 @@ void sub_804849C(u32 r0, u32 r1) { sub_8077AE4(r0, r1, 1); } + +#ifndef NONMATCHING +NAKED +#endif +void sub_80484A8(u32 r0, u32 r1) +{ +#ifdef NONMATCHING + // TODO missing something on the stack + u32 *temp; + *temp = 1; + sub_8072008(r0, r1, 1, 1); +#else + asm_unified("\tpush {lr}\n" + "\tsub sp, 0x4\n" + "\tmovs r2, 0x1\n" + "\tstr r2, [sp]\n" + "\tmovs r3, 0x1\n" + "\tbl sub_8072008\n" + "\tadd sp, 0x4\n" + "\tpop {r0}\n" + "\tbx r0"); +#endif +} + +void sub_80484BC(void) +{ + sub_8076D10(); +} + +void sub_80484C8(u32 r0, u32 r1) +{ + sub_80522F4(r0, r1, gUnknown_80F89F4); +} + +void sub_80484DC(u32 r0, u32 r1) +{ + sub_807232C(r0, r1, 1); +} |