summaryrefslogtreecommitdiff
path: root/src/code_8048480.c
diff options
context:
space:
mode:
authorSeth Barberee <seth.barberee@gmail.com>2020-11-02 10:47:57 -0600
committerSeth Barberee <seth.barberee@gmail.com>2020-11-02 10:47:57 -0600
commit4dee2a71d4085a15fc2b01371b060e08e2745970 (patch)
tree4d3139e1eeeac6b01603b599b50bd8d14b4db3e2 /src/code_8048480.c
parent9d383609e21adfc35004cdf87f9231039c701b23 (diff)
fix nonmatching.. needed a volatile
Diffstat (limited to 'src/code_8048480.c')
-rw-r--r--src/code_8048480.c20
1 files changed, 2 insertions, 18 deletions
diff --git a/src/code_8048480.c b/src/code_8048480.c
index 13415f5..aac957a 100644
--- a/src/code_8048480.c
+++ b/src/code_8048480.c
@@ -24,27 +24,11 @@ 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;
+ volatile 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)