Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-08-09 12:08:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

small cleanup + another func

Browse Source
This commit is contained in:
red031000 2020-12-05 22:31:04 +00:00
parent 8c4c85d47a
commit 87be48c985
No known key found for this signature in database
GPG Key ID: A3C87CFF2DC536C2
3 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arm9/modules/21/asm/mod21_02254A6C_asm.s
View File

@ -5,22 +5,7 @@
.extern MOD21_02254B4C
.extern MOD21_02254B60
thumb_func_start MOD21_02254BF4
MOD21_02254BF4: ; 0x02254BF4
push {r3, r4, r5, lr}
add r5, r1, #0
add r0, r5, #0
bl MOD20_022538A0
add r4, r0, #0
bl MOD21_02254C5C
ldr r0, [r4, #4]
mov r1, #6
bl FUN_02017CD0
add r0, r5, #0
bl MOD21_02254B4C
pop {r3, r4, r5, pc}
thumb_func_end MOD21_02254BF4
.extern MOD21_02254BF4
thumb_func_start MOD21_02254C14
MOD21_02254C14: ; 0x02254C14

1
arm9/modules/21/include/mod21_02254A6C.h
View File

@ -26,5 +26,6 @@ BOOL MOD21_02254B34(void *param0, u32 param1);
BOOL MOD21_02254B40(void *param0);
BOOL MOD21_02254B4C(void *param0);
BOOL MOD21_02254B60(u32 param0, void *param1);
BOOL MOD21_02254BF4(u32 param0, void *param1);
#endif //POKEDIAMOND_MOD21_02254A6C_H

13
arm9/modules/21/src/mod21_02254A6C_src.c
View File

@ -100,11 +100,20 @@ THUMB_FUNC BOOL MOD21_02254B60(u32 param0, void *param1)
u32 r2 = reg_GXS_DB_DISPCNT;
vu32 tmp = r3; //unused? wtf
u32 r0 = ~0x1F00 & r2;
r2 = r3 << 0x13;
r3 = r2 >> 0x1b;
r2 = r3 << 19; //cast with shift? can't replicate both though
r3 = r2 >> 27;
r2 = 4 | r3;
r2 <<= 8;
r0 |= r2;
reg_GXS_DB_DISPCNT = r0;
return MOD21_02254B4C(param1);
}
THUMB_FUNC BOOL MOD21_02254BF4(u32 param0, void *param1)
{
#pragma unused (param0)
UnkStruct02254B60 *strct = MOD20_022538A0(param1);
MOD21_02254C5C(strct);
FUN_02017CD0(strct->Unk04, 6);
return MOD21_02254B4C(param1);
}