mirror of
https://github.com/pret/pmd-sky.git
synced 2026-04-26 08:35:04 -05:00
Decomped sub_0205B584
Decomped by @slaw-22
This commit is contained in:
parent
bc0e52acfb
commit
acf270cedd
|
|
@ -360,7 +360,6 @@
|
||||||
.public sub_02048624
|
.public sub_02048624
|
||||||
.public sub_02048644
|
.public sub_02048644
|
||||||
.public sub_0204872C
|
.public sub_0204872C
|
||||||
.public sub_02048C3C
|
|
||||||
.public sub_0204A1A4
|
.public sub_0204A1A4
|
||||||
.public sub_0204D018
|
.public sub_0204D018
|
||||||
.public sub_0204E210
|
.public sub_0204E210
|
||||||
|
|
@ -1,22 +1,8 @@
|
||||||
.include "asm/macros.inc"
|
.include "asm/macros.inc"
|
||||||
.include "main_0205B584.inc"
|
.include "main_0205B5A8.inc"
|
||||||
|
|
||||||
.text
|
.text
|
||||||
|
|
||||||
arm_func_start sub_0205B584
|
|
||||||
sub_0205B584: ; 0x0205B584
|
|
||||||
stmdb sp!, {r4, lr}
|
|
||||||
ldr r1, _0205B5A4 ; =_022B57BC
|
|
||||||
mov r4, r0
|
|
||||||
ldr r0, [r1]
|
|
||||||
str r0, [r4]
|
|
||||||
bl sub_02048C3C
|
|
||||||
str r0, [r4, #4]
|
|
||||||
ldmia sp!, {r4, pc}
|
|
||||||
.align 2, 0
|
|
||||||
_0205B5A4: .word _022B57BC
|
|
||||||
arm_func_end sub_0205B584
|
|
||||||
|
|
||||||
arm_func_start sub_0205B5A8
|
arm_func_start sub_0205B5A8
|
||||||
sub_0205B5A8: ; 0x0205B5A8
|
sub_0205B5A8: ; 0x0205B5A8
|
||||||
stmdb sp!, {r3, r4, r5, r6, r7, r8, lr}
|
stmdb sp!, {r3, r4, r5, r6, r7, r8, lr}
|
||||||
|
|
@ -10,5 +10,6 @@ struct unkStruct_0205B560 {
|
||||||
|
|
||||||
void sub_0205B554(struct unkStruct_0205B560 *v1, struct unkStruct_0205B560 *v2);
|
void sub_0205B554(struct unkStruct_0205B560 *v1, struct unkStruct_0205B560 *v2);
|
||||||
bool8 sub_0205B560(struct unkStruct_0205B560 *v1, struct unkStruct_0205B560 *v2);
|
bool8 sub_0205B560(struct unkStruct_0205B560 *v1, struct unkStruct_0205B560 *v2);
|
||||||
|
void sub_0205B584(struct unkStruct_0205B560 *ptr);
|
||||||
|
|
||||||
#endif //PMDSKY_MAIN_0205B554_H
|
#endif //PMDSKY_MAIN_0205B554_H
|
||||||
|
|
|
||||||
2
main.lsf
2
main.lsf
|
|
@ -146,7 +146,7 @@ Static main
|
||||||
Object src/main_0205B440.o
|
Object src/main_0205B440.o
|
||||||
Object asm/main_0205B478.o
|
Object asm/main_0205B478.o
|
||||||
Object src/main_0205B554.o
|
Object src/main_0205B554.o
|
||||||
Object asm/main_0205B584.o
|
Object asm/main_0205B5A8.o
|
||||||
Object src/dungeon_init_2.o
|
Object src/dungeon_init_2.o
|
||||||
Object asm/main_0206A750.o
|
Object asm/main_0206A750.o
|
||||||
Object src/main_0206C98C.o
|
Object src/main_0206C98C.o
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,8 @@
|
||||||
#include "main_0205B554.h"
|
#include "main_0205B554.h"
|
||||||
|
|
||||||
|
extern u32 sub_02048C3C(void);
|
||||||
|
extern u32 _022B57BC;
|
||||||
|
|
||||||
void sub_0205B554(struct unkStruct_0205B560 *v1, struct unkStruct_0205B560 *v2)
|
void sub_0205B554(struct unkStruct_0205B560 *v1, struct unkStruct_0205B560 *v2)
|
||||||
{
|
{
|
||||||
sub_0205B560(v1, v2);
|
sub_0205B560(v1, v2);
|
||||||
|
|
@ -14,3 +17,9 @@ bool8 sub_0205B560(struct unkStruct_0205B560 *v1, struct unkStruct_0205B560 *v2)
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void sub_0205B584(struct unkStruct_0205B560 *ptr)
|
||||||
|
{
|
||||||
|
ptr->unk0 = _022B57BC;
|
||||||
|
ptr->unk1 = sub_02048C3C();
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user