Game-Decompilation/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2024-11-23 21:19:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

some more func work

Browse Source
This commit is contained in:
Seth Barberee 2020-10-25 22:52:36 -05:00
parent 69bf0084ce
commit bad9c1bf1f
2 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
asm/code_8048480.s
View File

@ -5,48 +5,6 @@
.text
thumb_func_start sub_80484A8
sub_80484A8:
push {lr}
sub sp, 0x4
movs r2, 0x1
str r2, [sp]
movs r3, 0x1
bl sub_8072008
add sp, 0x4
pop {r0}
bx r0
thumb_func_end sub_80484A8
thumb_func_start sub_80484BC
sub_80484BC:
push {lr}
bl sub_8076D10
pop {r0}
bx r0
thumb_func_end sub_80484BC
thumb_func_start sub_80484C8
sub_80484C8:
push {lr}
ldr r2, _080484D8
ldr r2, [r2]
bl sub_80522F4
pop {r0}
bx r0
.align 2, 0
_080484D8: .4byte gUnknown_80F89F4
thumb_func_end sub_80484C8
thumb_func_start sub_80484DC
sub_80484DC:
push {lr}
movs r2, 0x1
bl sub_807232C
pop {r0}
bx r0
thumb_func_end sub_80484DC
thumb_func_start sub_80484E8
sub_80484E8:
push {r4,r5,lr}

44
src/code_8048480.c
View File

@ -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);
}