Game-Decompilation/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2024-11-23 21:30:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Move these two functions into pss where they belong

Browse Source
This commit is contained in:
PikalaxALT 2021-12-24 10:55:05 -05:00
parent 59a531d6cc
commit e27d502252
2 changed files with 15 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
asm/unk_02074120.s
View File

@ -45,56 +45,6 @@ _020FFE2E:
.text
thumb_func_start sub_02074120
sub_02074120: ; 0x02074120
mov r0, #1
lsl r0, r0, #0xc
bx lr
.balign 4, 0
thumb_func_end sub_02074120
thumb_func_start sub_02074128
sub_02074128: ; 0x02074128
push {r3, r4, r5, r6, r7, lr}
sub sp, #8
str r0, [sp]
mov r0, #0
str r0, [sp, #4]
add r7, r0, #0
_02074134:
ldr r0, [sp, #4]
mov r4, #0
lsl r1, r0, #0xc
ldr r0, [sp]
add r6, r0, r1
_0207413E:
mov r0, #0xff
add r5, r6, r4
lsl r0, r0, #4
ldrb r0, [r5, r0]
cmp r0, #0
beq _0207414E
bl GF_AssertFail
_0207414E:
mov r0, #0xff
lsl r0, r0, #4
strb r7, [r5, r0]
add r0, r4, #1
lsl r0, r0, #0x18
lsr r4, r0, #0x18
cmp r4, #0x10
blo _0207413E
ldr r0, [sp, #4]
add r0, r0, #1
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #4]
cmp r0, #0x12
blo _02074134
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
thumb_func_end sub_02074128
thumb_func_start sub_02074170
sub_02074170: ; 0x02074170
push {r3, r4, r5, r6, r7, lr}

15
src/pokemon_storage_system.c
View File

@ -347,3 +347,18 @@ void PCStorage_ResetBoxModifiedFlags(PC_STORAGE* storage) {
u32 PCStorage_GetBoxModifiedFlags(PC_STORAGE* storage) {
return storage->boxModifiedFlag;
}
u32 sub_02074120(void) {
return sizeof(PC_BOX);
}
void sub_02074128(PC_STORAGE* storage) {
u8 i, j;
for (i = 0; i < NUM_BOXES; i++) {
for (j = 0; j < 16; j++) {
GF_ASSERT(storage->boxes[i].unk_FF0[j] == 0);
storage->boxes[i].unk_FF0[j] = 0;
}
}
}