summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arm9/arm9.lsf2
-rw-r--r--arm9/asm/pokemon_storage_system.s (renamed from arm9/asm/unk_0206B16C.s)130
-rw-r--r--arm9/asm/save.s10
-rw-r--r--arm9/asm/scrcmd.s8
-rw-r--r--arm9/asm/scrcmd_13.s2
-rw-r--r--arm9/asm/scrcmd_18.s2
-rw-r--r--arm9/asm/scrcmd_4.s2
-rw-r--r--arm9/asm/scrcmd_5.s2
-rw-r--r--arm9/asm/unk_0200AA80.s2
-rw-r--r--arm9/asm/unk_0204653C.s2
-rw-r--r--arm9/asm/unk_020484A8.s2
-rw-r--r--arm9/asm/unk_020772F0.s4
-rw-r--r--arm9/global.inc50
-rw-r--r--arm9/modules/09/asm/module_09.s2
-rw-r--r--arm9/modules/11/asm/module_11_thumb2.s10
-rw-r--r--arm9/modules/14/asm/module_14.s90
-rw-r--r--arm9/modules/80/asm/module_80.s32
-rw-r--r--arm9/src/pokemon.c2
-rw-r--r--include/pokemon.h2
19 files changed, 178 insertions, 178 deletions
diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf
index 09d9d737..a90100e4 100644
--- a/arm9/arm9.lsf
+++ b/arm9/arm9.lsf
@@ -246,7 +246,7 @@ Static arm9
Object pokemon.o
Object waza.o
Object unk_0206ABC4.o
- Object unk_0206B16C.o
+ Object pokemon_storage_system.o
Object unk_0206B688.o
Object party.o
Object unk_0206BB28.o
diff --git a/arm9/asm/unk_0206B16C.s b/arm9/asm/pokemon_storage_system.s
index 1e7eb1f4..472e04b3 100644
--- a/arm9/asm/unk_0206B16C.s
+++ b/arm9/asm/pokemon_storage_system.s
@@ -3,22 +3,22 @@
.text
- thumb_func_start FUN_0206B16C
-FUN_0206B16C: ; 0x0206B16C
+ thumb_func_start PCStorage_init
+PCStorage_init: ; 0x0206B16C
push {r3, lr}
- bl FUN_0206B180
- bl FUN_02022830
+ bl PCStorage_InitializeBoxes
+ bl SaveSetDirtyBit
pop {r3, pc}
- thumb_func_start FUN_0206B178
-FUN_0206B178: ; 0x0206B178
+ thumb_func_start PCStorage_sizeof
+PCStorage_sizeof: ; 0x0206B178
ldr r0, _0206B17C ; =0x000121C8
bx lr
.balign 4
_0206B17C: .word 0x000121C8
- thumb_func_start FUN_0206B180
-FUN_0206B180: ; 0x0206B180
+ thumb_func_start PCStorage_InitializeBoxes
+PCStorage_InitializeBoxes: ; 0x0206B180
push {r3-r7, lr}
str r0, [sp, #0x0]
mov r7, #0x0
@@ -90,8 +90,8 @@ _0206B200: .word 0x000121B4
_0206B204: .word 0x000121C6
_0206B208: .word 0x00011EE4
- thumb_func_start FUN_0206B20C
-FUN_0206B20C: ; 0x0206B20C
+ thumb_func_start PCStorage_PlaceMonInFirstEmptySlotInAnyBox
+PCStorage_PlaceMonInFirstEmptySlotInAnyBox: ; 0x0206B20C
push {r3-r7, lr}
add r5, r0, #0x0
ldr r4, [r5, #0x0]
@@ -99,14 +99,14 @@ FUN_0206B20C: ; 0x0206B20C
mov r7, #0x0
_0206B216:
add r0, r6, #0x0
- bl FUN_0206AAB4
+ bl RestoreBoxMonPP
add r0, r5, #0x0
add r1, r4, #0x0
add r2, r6, #0x0
- bl FUN_0206B244
+ bl PCStorage_PlaceMonInBoxFirstEmptySlot
cmp r0, #0x0
beq _0206B232
- bl FUN_02022830
+ bl SaveSetDirtyBit
mov r0, #0x1
pop {r3-r7, pc}
_0206B232:
@@ -121,15 +121,15 @@ _0206B23A:
mov r0, #0x0
pop {r3-r7, pc}
- thumb_func_start FUN_0206B244
-FUN_0206B244: ; 0x0206B244
+ thumb_func_start PCStorage_PlaceMonInBoxFirstEmptySlot
+PCStorage_PlaceMonInBoxFirstEmptySlot: ; 0x0206B244
push {r3-r7, lr}
sub sp, #0x8
add r6, r0, #0x0
add r0, r2, #0x0
add r5, r1, #0x0
str r2, [sp, #0x0]
- bl FUN_0206AAB4
+ bl RestoreBoxMonPP
mov r0, #0x0
mvn r0, r0
cmp r5, r0
@@ -165,7 +165,7 @@ _0206B28A:
str r2, [sp, #0x0]
stmia r4!, {r0-r1}
bne _0206B28A
- bl FUN_02022830
+ bl SaveSetDirtyBit
add sp, #0x8
mov r0, #0x1
pop {r3-r7, pc}
@@ -179,15 +179,15 @@ _0206B2A0:
pop {r3-r7, pc}
.balign 4
- thumb_func_start FUN_0206B2B0
-FUN_0206B2B0: ; 0x0206B2B0
+ thumb_func_start PCStorage_PlaceMonInBoxByIndexPair
+PCStorage_PlaceMonInBoxByIndexPair: ; 0x0206B2B0
push {r3-r7, lr}
add r7, r3, #0x0
add r5, r0, #0x0
add r0, r7, #0x0
add r4, r1, #0x0
add r6, r2, #0x0
- bl FUN_0206AAB4
+ bl RestoreBoxMonPP
mov r0, #0x0
mvn r0, r0
cmp r4, r0
@@ -212,7 +212,7 @@ _0206B2E4:
stmia r3!, {r0-r1}
sub r2, r2, #0x1
bne _0206B2E4
- bl FUN_02022830
+ bl SaveSetDirtyBit
mov r0, #0x1
pop {r3-r7, pc}
_0206B2F4:
@@ -220,8 +220,8 @@ _0206B2F4:
mov r0, #0x0
pop {r3-r7, pc}
- thumb_func_start FUN_0206B2FC
-FUN_0206B2FC: ; 0x0206B2FC
+ thumb_func_start PCStorage_DeleteBoxMonByIndexPair
+PCStorage_DeleteBoxMonByIndexPair: ; 0x0206B2FC
push {r3, lr}
mov r3, #0x0
mvn r3, r3
@@ -242,19 +242,19 @@ _0206B308:
mul r0, r2
add r0, r1, r0
bl ZeroBoxMonData
- bl FUN_02022830
+ bl SaveSetDirtyBit
pop {r3, pc}
_0206B32A:
bl ErrorHandling
pop {r3, pc}
- thumb_func_start FUN_0206B330
-FUN_0206B330: ; 0x0206B330
+ thumb_func_start PCStorage_GetActiveBox
+PCStorage_GetActiveBox: ; 0x0206B330
ldr r0, [r0, #0x0]
bx lr
- thumb_func_start FUN_0206B334
-FUN_0206B334: ; 0x0206B334
+ thumb_func_start PCStorage_FindFirstBoxWithEmptySlot
+PCStorage_FindFirstBoxWithEmptySlot: ; 0x0206B334
push {r3-r7, lr}
sub sp, #0x8
str r0, [sp, #0x0]
@@ -299,8 +299,8 @@ _0206B374:
pop {r3-r7, pc}
.balign 4
- thumb_func_start FUN_0206B384
-FUN_0206B384: ; 0x0206B384
+ thumb_func_start PCStorage_FindFirstEmptySlot
+PCStorage_FindFirstEmptySlot: ; 0x0206B384
push {r3-r7, lr}
add r6, r1, #0x0
str r2, [sp, #0x0]
@@ -355,8 +355,8 @@ _0206B3DE:
pop {r3-r7, pc}
.balign 4
- thumb_func_start FUN_0206B3E4
-FUN_0206B3E4: ; 0x0206B3E4
+ thumb_func_start PCStorage_CountMonsAndEggsInAllBoxes
+PCStorage_CountMonsAndEggsInAllBoxes: ; 0x0206B3E4
push {r3-r7, lr}
sub sp, #0x8
mov r6, #0x0
@@ -394,20 +394,20 @@ _0206B406:
add sp, #0x8
pop {r3-r7, pc}
- thumb_func_start FUN_0206B428
-FUN_0206B428: ; 0x0206B428
+ thumb_func_start PCStorage_SetActiveBox
+PCStorage_SetActiveBox: ; 0x0206B428
push {r3, lr}
cmp r1, #0x12
bhs _0206B436
str r1, [r0, #0x0]
- bl FUN_02022830
+ bl SaveSetDirtyBit
pop {r3, pc}
_0206B436:
bl ErrorHandling
pop {r3, pc}
- thumb_func_start FUN_0206B43C
-FUN_0206B43C: ; 0x0206B43C
+ thumb_func_start PCStorage_GetBoxWallpaper
+PCStorage_GetBoxWallpaper: ; 0x0206B43C
push {r3, lr}
cmp r1, #0x12
bhs _0206B44A
@@ -422,8 +422,8 @@ _0206B44A:
nop
_0206B454: .word 0x000121B4
- thumb_func_start FUN_0206B458
-FUN_0206B458: ; 0x0206B458
+ thumb_func_start PCStorage_SetBoxWallpaper
+PCStorage_SetBoxWallpaper: ; 0x0206B458
push {r3, lr}
mov r3, #0x0
mvn r3, r3
@@ -438,7 +438,7 @@ _0206B464:
add r1, r0, r1
ldr r0, _0206B480 ; =0x000121B4
strb r2, [r1, r0]
- bl FUN_02022830
+ bl SaveSetDirtyBit
pop {r3, pc}
_0206B478:
bl ErrorHandling
@@ -446,8 +446,8 @@ _0206B478:
nop
_0206B480: .word 0x000121B4
- thumb_func_start FUN_0206B484
-FUN_0206B484: ; 0x0206B484
+ thumb_func_start PCStorage_GetBoxName
+PCStorage_GetBoxName: ; 0x0206B484
push {r3, lr}
add r3, r0, #0x0
mov r0, #0x0
@@ -472,8 +472,8 @@ _0206B4A8:
nop
_0206B4B0: .word 0x00011EE4
- thumb_func_start FUN_0206B4B4
-FUN_0206B4B4: ; 0x0206B4B4
+ thumb_func_start PCStorage_SetBoxName
+PCStorage_SetBoxName: ; 0x0206B4B4
push {r3, lr}
add r3, r0, #0x0
mov r0, #0x0
@@ -492,14 +492,14 @@ _0206B4C2:
add r1, r3, r2
mov r2, #0x14
bl CopyStringToU16Array
- bl FUN_02022830
+ bl SaveSetDirtyBit
_0206B4DC:
pop {r3, pc}
nop
_0206B4E0: .word 0x00011EE4
- thumb_func_start FUN_0206B4E4
-FUN_0206B4E4: ; 0x0206B4E4
+ thumb_func_start PCStorage_CountMonsAndEggsInBox
+PCStorage_CountMonsAndEggsInBox: ; 0x0206B4E4
push {r3-r7, lr}
mov r2, #0x0
mvn r2, r2
@@ -537,8 +537,8 @@ _0206B520:
mov r0, #0x0
pop {r3-r7, pc}
- thumb_func_start FUN_0206B528
-FUN_0206B528: ; 0x0206B528
+ thumb_func_start PCStorage_CountMonsInBox
+PCStorage_CountMonsInBox: ; 0x0206B528
push {r3-r7, lr}
mov r2, #0x0
mvn r2, r2
@@ -583,8 +583,8 @@ _0206B572:
pop {r3-r7, pc}
.balign 4
- thumb_func_start FUN_0206B57C
-FUN_0206B57C: ; 0x0206B57C
+ thumb_func_start PCStorage_CountMonsInAllBoxes
+PCStorage_CountMonsInAllBoxes: ; 0x0206B57C
push {r4-r6, lr}
mov r5, #0x0
add r6, r0, #0x0
@@ -592,7 +592,7 @@ FUN_0206B57C: ; 0x0206B57C
_0206B584:
add r0, r6, #0x0
add r1, r5, #0x0
- bl FUN_0206B528
+ bl PCStorage_CountMonsInBox
add r5, r5, #0x1
add r4, r4, r0
cmp r5, #0x12
@@ -600,8 +600,8 @@ _0206B584:
add r0, r4, #0x0
pop {r4-r6, pc}
- thumb_func_start FUN_0206B598
-FUN_0206B598: ; 0x0206B598
+ thumb_func_start PCStorage_SetBoxMonDataByIndexPair
+PCStorage_SetBoxMonDataByIndexPair: ; 0x0206B598
push {r3-r7, lr}
add r4, r1, #0x0
add r5, r0, #0x0
@@ -636,12 +636,12 @@ _0206B5C4:
ldr r2, [sp, #0x18]
add r1, r7, #0x0
bl SetBoxMonData
- bl FUN_02022830
+ bl SaveSetDirtyBit
pop {r3-r7, pc}
.balign 4
- thumb_func_start FUN_0206B5E4
-FUN_0206B5E4: ; 0x0206B5E4
+ thumb_func_start PCStorage_GetMonByIndexPair
+PCStorage_GetMonByIndexPair: ; 0x0206B5E4
push {r4-r6, lr}
add r4, r1, #0x0
add r5, r0, #0x0
@@ -674,8 +674,8 @@ _0206B60E:
add r0, r1, r0
pop {r4-r6, pc}
- thumb_func_start FUN_0206B620
-FUN_0206B620: ; 0x0206B620
+ thumb_func_start PCStorage_UnlockBonusWallpaper
+PCStorage_UnlockBonusWallpaper: ; 0x0206B620
push {r3-r5, lr}
add r4, r1, #0x0
add r5, r0, #0x0
@@ -689,13 +689,13 @@ _0206B62E:
lsl r1, r4
orr r1, r2
strb r1, [r5, r0]
- bl FUN_02022830
+ bl SaveSetDirtyBit
pop {r3-r5, pc}
.balign 4
_0206B640: .word 0x000121C6
- thumb_func_start FUN_0206B644
-FUN_0206B644: ; 0x0206B644
+ thumb_func_start PCStorage_IsBonusWallpaperUnlocked
+PCStorage_IsBonusWallpaperUnlocked: ; 0x0206B644
push {r3-r5, lr}
add r4, r1, #0x0
add r5, r0, #0x0
@@ -716,8 +716,8 @@ _0206B662:
.balign 4
_0206B664: .word 0x000121C6
- thumb_func_start FUN_0206B668
-FUN_0206B668: ; 0x0206B668
+ thumb_func_start PCStorage_CountUnlockedBonusWallpapers
+PCStorage_CountUnlockedBonusWallpapers: ; 0x0206B668
push {r4-r6, lr}
mov r4, #0x0
add r6, r0, #0x0
@@ -725,7 +725,7 @@ FUN_0206B668: ; 0x0206B668
_0206B670:
add r0, r6, #0x0
add r1, r4, #0x0
- bl FUN_0206B644
+ bl PCStorage_IsBonusWallpaperUnlocked
cmp r0, #0x0
beq _0206B67E
add r5, r5, #0x1
diff --git a/arm9/asm/save.s b/arm9/asm/save.s
index b825978e..a29733dc 100644
--- a/arm9/asm/save.s
+++ b/arm9/asm/save.s
@@ -53,7 +53,7 @@ UNK_020EE700: ; 0x020EE700
.word 0x20, 0x00, FUN_0202BE98, FUN_0202BEA0
.word 0x21, 0x00, FUN_0202C0E0, FUN_0202C0E4
.word 0x22, 0x00, FUN_02013B28, FUN_02013B2C
- .word 0x23, 0x01, FUN_0206B178, FUN_0206B16C
+ .word 0x23, 0x01, PCStorage_sizeof, PCStorage_init
.section .bss
@@ -450,13 +450,13 @@ _02022826:
pop {r4, pc}
.balign 4
- thumb_func_start FUN_0202282C
-FUN_0202282C: ; 0x0202282C
+ thumb_func_start SaveGetDirtyBit
+SaveGetDirtyBit: ; 0x0202282C
ldr r0, [r0, #0xc]
bx lr
- thumb_func_start FUN_02022830
-FUN_02022830: ; 0x02022830
+ thumb_func_start SaveSetDirtyBit
+SaveSetDirtyBit: ; 0x02022830
ldr r0, _0202283C ; =UNK_021C59C8
mov r1, #0x1
ldr r0, [r0, #0x0]
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s
index 4fa6f75b..6c2d8674 100644
--- a/arm9/asm/scrcmd.s
+++ b/arm9/asm/scrcmd.s
@@ -7082,7 +7082,7 @@ _0203D1EC:
b _0203D210
_0203D1FC:
add r0, r5, #0x0
- bl FUN_0202282C
+ bl SaveGetDirtyBit
cmp r0, #0x0
beq _0203D20C
mov r0, #0x2
@@ -10381,7 +10381,7 @@ _0203EC7E:
_0203EC88:
add r0, r6, #0x0
add r1, r5, #0x0
- bl FUN_0206B644
+ bl PCStorage_IsBonusWallpaperUnlocked
cmp r0, #0x0
beq _0203EC98
mov r0, #0x0
@@ -10389,7 +10389,7 @@ _0203EC88:
_0203EC98:
add r0, r6, #0x0
add r1, r5, #0x0
- bl FUN_0206B620
+ bl PCStorage_UnlockBonusWallpaper
add r0, r5, #0x1
_0203ECA2:
strh r0, [r4, #0x0]
@@ -10513,7 +10513,7 @@ FUN_0203ED70: ; 0x0203ED70
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
bl FUN_02022510
- bl FUN_0206B3E4
+ bl PCStorage_CountMonsAndEggsInAllBoxes
lsl r0, r0, #0x10
lsr r1, r0, #0x10
mov r0, #0x87
diff --git a/arm9/asm/scrcmd_13.s b/arm9/asm/scrcmd_13.s
index c9a5bc2d..57061f8b 100644
--- a/arm9/asm/scrcmd_13.s
+++ b/arm9/asm/scrcmd_13.s
@@ -125,7 +125,7 @@ _0204395C:
bl FUN_020690E4
add r1, r0, #0x0
ldr r0, [sp, #0x8]
- bl FUN_0206B20C
+ bl PCStorage_PlaceMonInFirstEmptySlotInAnyBox
cmp r0, #0x0
bne _0204398C
bl ErrorHandling
diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s
index c5765553..f37a8c62 100644
--- a/arm9/asm/scrcmd_18.s
+++ b/arm9/asm/scrcmd_18.s
@@ -1148,7 +1148,7 @@ _02044C6E:
blt _02044C44
_02044C76:
ldr r0, [sp, #0x4]
- bl FUN_0206B57C
+ bl PCStorage_CountMonsInAllBoxes
add r1, r4, r0
ldr r0, [sp, #0x0]
strh r1, [r0, #0x0]
diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s
index 55341882..e5e930b2 100644
--- a/arm9/asm/scrcmd_4.s
+++ b/arm9/asm/scrcmd_4.s
@@ -357,7 +357,7 @@ FUN_02040964: ; 0x02040964
add r2, r1, #0x0
ldr r0, [sp, #0x0]
add r1, r7, #0x0
- bl FUN_0206B5E4
+ bl PCStorage_GetMonByIndexPair
add r2, r0, #0x0
ldr r0, [r6, #0x0]
add r1, r4, #0x0
diff --git a/arm9/asm/scrcmd_5.s b/arm9/asm/scrcmd_5.s
index e69b3a3e..d001fb33 100644
--- a/arm9/asm/scrcmd_5.s
+++ b/arm9/asm/scrcmd_5.s
@@ -128,7 +128,7 @@ _02041290:
ldr r0, [sp, #0x20]
ldr r1, [sp, #0x10]
add r2, r5, #0x0
- bl FUN_0206B5E4
+ bl PCStorage_GetMonByIndexPair
mov r1, #0x5
mov r2, #0x0
add r4, r0, #0x0
diff --git a/arm9/asm/unk_0200AA80.s b/arm9/asm/unk_0200AA80.s
index ace139f6..aa06782f 100644
--- a/arm9/asm/unk_0200AA80.s
+++ b/arm9/asm/unk_0200AA80.s
@@ -1266,7 +1266,7 @@ FUN_0200B410: ; 0x0200B410
add r4, r1, #0x0
ldr r2, [r5, #0xc]
add r1, r3, #0x0
- bl FUN_0206B484
+ bl PCStorage_GetBoxName
ldr r2, [r5, #0xc]
add r0, r5, #0x0
add r1, r4, #0x0
diff --git a/arm9/asm/unk_0204653C.s b/arm9/asm/unk_0204653C.s
index 33ce011d..eaeb9036 100644
--- a/arm9/asm/unk_0204653C.s
+++ b/arm9/asm/unk_0204653C.s
@@ -1021,7 +1021,7 @@ _02046D5C:
bl SavArray_PlayerParty_get
add r5, r0, #0x0
ldr r0, [sp, #0x8]
- bl FUN_0206B334
+ bl PCStorage_FindFirstBoxWithEmptySlot
cmp r0, #0x12
bne _02046D8C
add r0, r5, #0x0
diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s
index 1d7ad0d5..48f457be 100644
--- a/arm9/asm/unk_020484A8.s
+++ b/arm9/asm/unk_020484A8.s
@@ -160,7 +160,7 @@ _020485C0:
ldr r0, [r6, #0xc]
bl SavArray_PlayerParty_get
bl FUN_02085140
- bl FUN_02022830
+ bl SaveSetDirtyBit
ldr r0, [r6, #0xc]
bl FUN_02022720
add r7, r0, #0x0
diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s
index 32c718a6..863b9270 100644
--- a/arm9/asm/unk_020772F0.s
+++ b/arm9/asm/unk_020772F0.s
@@ -1786,10 +1786,10 @@ FUN_02077E90: ; 0x02077E90
lsl r0, r0, #0x6
str r1, [r5, r0]
ldr r0, [r4, #0x48]
- bl FUN_0206B330
+ bl PCStorage_GetActiveBox
add r6, r0, #0x0
ldr r0, [r4, #0x48]
- bl FUN_0206B334
+ bl PCStorage_FindFirstBoxWithEmptySlot
str r0, [sp, #0x10]
mov r0, #0x5a
lsl r0, r0, #0x2
diff --git a/arm9/global.inc b/arm9/global.inc
index 16b7e5e2..a58567af 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -1446,8 +1446,8 @@
.extern FUN_02022800
.extern FUN_02022804
.extern FUN_0202280C
-.extern FUN_0202282C
-.extern FUN_02022830
+.extern SaveGetDirtyBit
+.extern SaveSetDirtyBit
.extern FUN_02022840
.extern FUN_02022854
.extern FUN_0202287C
@@ -4832,7 +4832,7 @@
.extern FUN_0206A9AC
.extern FUN_0206AA30
.extern FUN_0206AA84
-.extern FUN_0206AAB4
+.extern RestoreBoxMonPP
.extern LoadAllWazaTbl
.extern GetWazaAttr
.extern WazaGetMaxPp
@@ -4844,28 +4844,28 @@
.extern FUN_0206ADE0
.extern FUN_0206ADF0
.extern FUN_0206AE00
-.extern FUN_0206B16C
-.extern FUN_0206B178
-.extern FUN_0206B20C
-.extern FUN_0206B244
-.extern FUN_0206B2B0
-.extern FUN_0206B2FC
-.extern FUN_0206B330
-.extern FUN_0206B334
-.extern FUN_0206B384
-.extern FUN_0206B3E4
-.extern FUN_0206B428
-.extern FUN_0206B43C
-.extern FUN_0206B458
-.extern FUN_0206B484
-.extern FUN_0206B4B4
-.extern FUN_0206B4E4
-.extern FUN_0206B57C
-.extern FUN_0206B598
-.extern FUN_0206B5E4
-.extern FUN_0206B620
-.extern FUN_0206B644
-.extern FUN_0206B668
+.extern PCStorage_init
+.extern PCStorage_sizeof
+.extern PCStorage_PlaceMonInFirstEmptySlotInAnyBox
+.extern PCStorage_PlaceMonInBoxFirstEmptySlot
+.extern PCStorage_PlaceMonInBoxByIndexPair
+.extern PCStorage_DeleteBoxMonByIndexPair
+.extern PCStorage_GetActiveBox
+.extern PCStorage_FindFirstBoxWithEmptySlot
+.extern PCStorage_FindFirstEmptySlot
+.extern PCStorage_CountMonsAndEggsInAllBoxes
+.extern PCStorage_SetActiveBox
+.extern PCStorage_GetBoxWallpaper
+.extern PCStorage_SetBoxWallpaper
+.extern PCStorage_GetBoxName
+.extern PCStorage_SetBoxName
+.extern PCStorage_CountMonsAndEggsInBox
+.extern PCStorage_CountMonsInAllBoxes
+.extern PCStorage_SetBoxMonDataByIndexPair
+.extern PCStorage_GetMonByIndexPair
+.extern PCStorage_UnlockBonusWallpaper
+.extern PCStorage_IsBonusWallpaperUnlocked
+.extern PCStorage_CountUnlockedBonusWallpapers
.extern FUN_0206B688
.extern FUN_0206B6C8
.extern FUN_0206B6D4
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s
index 571d34b6..4ff7de8f 100644
--- a/arm9/modules/09/asm/module_09.s
+++ b/arm9/modules/09/asm/module_09.s
@@ -13510,7 +13510,7 @@ _02218DF2:
cmp r0, #6
bne _02218E32
add r0, r4, #0
- bl FUN_0206B334
+ bl PCStorage_FindFirstBoxWithEmptySlot
cmp r0, #0x12
bne _02218E32
ldr r0, [r5, #0x10]
diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s
index 1154f46d..a87f7d23 100644
--- a/arm9/modules/11/asm/module_11_thumb2.s
+++ b/arm9/modules/11/asm/module_11_thumb2.s
@@ -22671,7 +22671,7 @@ MOD11_0223A3B4: ; 0x0223A3B4
cmp r0, #6
bne _0223A3E0
ldr r0, [r5, #0x64]
- bl FUN_0206B334
+ bl PCStorage_FindFirstBoxWithEmptySlot
cmp r0, #0x12
beq _0223A3F0
_0223A3E0:
@@ -25801,14 +25801,14 @@ _0223BD1E:
ldr r0, [r4]
bl MOD11_02230290
str r0, [sp, #0x1c]
- bl FUN_0206B330
+ bl PCStorage_GetActiveBox
str r0, [sp, #0x18]
ldr r0, [sp, #0x1c]
- bl FUN_0206B334
+ bl PCStorage_FindFirstBoxWithEmptySlot
str r0, [sp, #0x14]
ldr r0, [sp, #0x1c]
ldr r1, [sp, #0x14]
- bl FUN_0206B428
+ bl PCStorage_SetActiveBox
mov r5, #0
_0223BD3E:
add r1, r5, #0
@@ -25830,7 +25830,7 @@ _0223BD3E:
add r2, r0, #0
ldr r0, [sp, #0x1c]
ldr r1, [sp, #0x14]
- bl FUN_0206B244
+ bl PCStorage_PlaceMonInBoxFirstEmptySlot
ldr r0, [r4, #0x28]
cmp r0, #0x16
bne _0223BDD0
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index 4bd53150..21e68458 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -1865,13 +1865,13 @@ _021D8428:
mov r0, #0x12
lsl r0, r0, #4
ldr r0, [r4, r0]
- bl FUN_0206B330
+ bl PCStorage_GetActiveBox
add r1, r0, #0
mov r0, #0x12
lsl r0, r0, #4
ldr r0, [r4, r0]
mov r2, #0
- bl FUN_0206B5E4
+ bl PCStorage_GetMonByIndexPair
mov r1, #0x4b
lsl r1, r1, #2
str r0, [r4, r1]
@@ -3187,7 +3187,7 @@ _021D8F12:
ldr r0, [r5, r1]
add r1, #0xa1
ldrsb r1, [r5, r1]
- bl FUN_0206B428
+ bl PCStorage_SetActiveBox
mov r0, #0x45
lsl r0, r0, #2
ldr r0, [r5, r0]
@@ -3403,7 +3403,7 @@ _021D90B0:
mov r1, #0
mvn r1, r1
sub r2, #0xa
- bl FUN_0206B458
+ bl PCStorage_SetBoxWallpaper
mov r1, #0x12
lsl r1, r1, #4
ldr r1, [r4, r1]
@@ -3756,7 +3756,7 @@ _021D9396:
mov r0, #0x12
lsl r0, r0, #4
ldr r0, [r4, r0]
- bl FUN_0206B428
+ bl PCStorage_SetActiveBox
mov r0, #0x45
lsl r0, r0, #2
ldr r0, [r4, r0]
@@ -3772,7 +3772,7 @@ _021D93BC:
mov r0, #0x12
lsl r0, r0, #4
ldr r0, [r4, r0]
- bl FUN_0206B428
+ bl PCStorage_SetActiveBox
mov r0, #0x45
lsl r0, r0, #2
ldr r0, [r4, r0]
@@ -3865,7 +3865,7 @@ _021D9488:
ldr r0, [r0]
mvn r1, r1
add r2, r7, r2
- bl FUN_0206B5E4
+ bl PCStorage_GetMonByIndexPair
mov r1, #0xab
mov r2, #0
bl GetBoxMonData
@@ -5297,7 +5297,7 @@ _021DA042:
ldrb r1, [r1, #2]
ldr r0, [r0, #0x14]
ldr r2, [sp, #0xc]
- bl FUN_0206B5E4
+ bl PCStorage_GetMonByIndexPair
mov r1, #0xab
mov r2, #0
add r7, r0, #0
@@ -5550,7 +5550,7 @@ _021DA1FE:
mov r0, #0x12
lsl r0, r0, #4
ldr r0, [r4, r0]
- bl FUN_0206B330
+ bl PCStorage_GetActiveBox
mov r2, #0x12
lsl r2, r2, #4
add r1, r0, #0
@@ -5558,7 +5558,7 @@ _021DA1FE:
add r2, #8
ldr r2, [r4, r2]
ldr r2, [r2, #0x18]
- bl FUN_0206B484
+ bl PCStorage_GetBoxName
mov r1, #0x4a
lsl r1, r1, #2
ldr r0, _021DA2C0 ; =MOD14_020FA5FC
@@ -5582,7 +5582,7 @@ _021DA256:
mov r0, #0x12
lsl r0, r0, #4
ldr r0, [r4, r0]
- bl FUN_0206B330
+ bl PCStorage_GetActiveBox
add r5, r0, #0
mov r0, #0x21
lsl r0, r0, #4
@@ -5600,7 +5600,7 @@ _021DA256:
ldr r2, [r4, r2]
add r1, r5, #0
ldr r2, [r2, #0x18]
- bl FUN_0206B4B4
+ bl PCStorage_SetBoxName
mov r0, #0x12
lsl r0, r0, #4
add r1, r4, #0
@@ -5684,7 +5684,7 @@ _021DA334:
mov r0, #0x12
lsl r0, r0, #4
ldr r0, [r5, r0]
- bl FUN_0206B330
+ bl PCStorage_GetActiveBox
mov r0, #0x21
lsl r0, r0, #4
ldr r0, [r5, r0]
@@ -6765,7 +6765,7 @@ _021DABFE:
mov r0, #0x12
lsl r0, r0, #4
ldr r0, [r5, r0]
- bl FUN_0206B428
+ bl PCStorage_SetActiveBox
add r0, r5, #0
bl MOD14_021DB934
mov r0, #0x45
@@ -6958,7 +6958,7 @@ _021DAD6C:
lsl r0, r0, #4
ldr r0, [r4, r0]
add r1, r6, #0
- bl FUN_0206B428
+ bl PCStorage_SetActiveBox
add r0, r4, #0
bl MOD14_021DB934
add r0, r4, #0
@@ -7816,7 +7816,7 @@ MOD14_021DB49C: ; 0x021DB49C
push {r3, r4, r5, lr}
add r4, r1, #0
add r5, r0, #0
- bl FUN_0206B330
+ bl PCStorage_GetActiveBox
strb r0, [r4]
mov r0, #0x14
mov r1, #9
@@ -7936,12 +7936,12 @@ MOD14_021DB580: ; 0x021DB580
add r4, r1, #0
ldrb r1, [r4]
add r5, r0, #0
- bl FUN_0206B43C
+ bl PCStorage_GetBoxWallpaper
strb r0, [r4, #1]
ldrb r1, [r4]
ldr r2, [r4, #4]
add r0, r5, #0
- bl FUN_0206B484
+ bl PCStorage_GetBoxName
pop {r3, r4, r5, pc}
.align 2, 0
@@ -7954,7 +7954,7 @@ MOD14_021DB59C: ; 0x021DB59C
add r0, r1, #0
ldrb r1, [r2]
add r4, #0x40
- bl FUN_0206B43C
+ bl PCStorage_GetBoxWallpaper
strb r0, [r4, #1]
pop {r4, pc}
.align 2, 0
@@ -8486,7 +8486,7 @@ _021DB95C:
ldrsb r2, [r4, r2]
ldr r0, [r5]
sub r1, r1, #1
- bl FUN_0206B5E4
+ bl PCStorage_GetMonByIndexPair
str r0, [r4]
b _021DB998
_021DB96C:
@@ -8647,7 +8647,7 @@ MOD14_021DBA5C: ; 0x021DBA5C
ldrsb r2, [r5, r2]
ldr r0, [r7, r0]
mvn r1, r1
- bl FUN_0206B2FC
+ bl PCStorage_DeleteBoxMonByIndexPair
mov r0, #0
b _021DBAB6
_021DBA98:
@@ -8735,7 +8735,7 @@ _021DBB36:
ldr r0, [r7, r0]
mvn r1, r1
add r2, r4, #0
- bl FUN_0206B5E4
+ bl PCStorage_GetMonByIndexPair
mov r1, #0xab
mov r2, #0
str r0, [sp, #0x20]
@@ -8752,7 +8752,7 @@ _021DBB36:
ldr r0, [r7, r0]
mvn r1, r1
add r2, r4, #0
- bl FUN_0206B2FC
+ bl PCStorage_DeleteBoxMonByIndexPair
ldr r0, [sp, #0x10]
add r5, r5, r0
ldr r0, [sp, #0xc]
@@ -8859,7 +8859,7 @@ MOD14_021DBC00: ; 0x021DBC00
ldr r0, [r5, r0]
ldr r3, [r4]
mvn r1, r1
- bl FUN_0206B2B0
+ bl PCStorage_PlaceMonInBoxByIndexPair
mov r0, #0x12
mov r2, #7
lsl r0, r0, #4
@@ -8867,7 +8867,7 @@ MOD14_021DBC00: ; 0x021DBC00
ldrsb r2, [r6, r2]
ldr r0, [r5, r0]
mvn r1, r1
- bl FUN_0206B5E4
+ bl PCStorage_GetMonByIndexPair
add r1, r0, #0
b _021DBC8A
_021DBC42:
@@ -8950,7 +8950,7 @@ _021DBCCA:
ldr r0, [r7, r0]
mvn r1, r1
add r3, r4, #0
- bl FUN_0206B2B0
+ bl PCStorage_PlaceMonInBoxByIndexPair
ldr r0, [sp, #4]
add r5, r5, #1
add r4, r4, r0
@@ -8966,7 +8966,7 @@ _021DBCF4:
mov r1, #0
ldr r0, [r7, r0]
mvn r1, r1
- bl FUN_0206B5E4
+ bl PCStorage_GetMonByIndexPair
add r1, r0, #0
ldr r0, [sp]
bl MOD14_021DC1A8
@@ -9026,7 +9026,7 @@ MOD14_021DBD34: ; 0x021DBD34
ldr r0, [r5, r0]
mvn r1, r1
add r3, r7, r6
- bl FUN_0206B2B0
+ bl PCStorage_PlaceMonInBoxByIndexPair
mov r0, #0
strb r0, [r4, #0xb]
b _021DBDC8
@@ -9076,7 +9076,7 @@ MOD14_021DBDD8: ; 0x021DBDD8
lsl r0, r0, #4
ldr r0, [r4, r0]
ldr r2, [r4, #0x14]
- bl FUN_0206B244
+ bl PCStorage_PlaceMonInBoxFirstEmptySlot
cmp r0, #0
beq _021DBDFA
mov r0, #1
@@ -9100,7 +9100,7 @@ MOD14_021DBE00: ; 0x021DBE00
ldr r0, [r5, r0]
ldr r2, [r5, #8]
add r4, #8
- bl FUN_0206B244
+ bl PCStorage_PlaceMonInBoxFirstEmptySlot
cmp r0, #0
beq _021DBE30
mov r0, #0x49
@@ -9146,7 +9146,7 @@ MOD14_021DBE4C: ; 0x021DBE4C
ldrsb r2, [r4, r2]
ldr r0, [r5, r0]
mvn r1, r1
- bl FUN_0206B2FC
+ bl PCStorage_DeleteBoxMonByIndexPair
b _021DBE7E
_021DBE70:
mov r0, #0x49
@@ -9566,7 +9566,7 @@ MOD14_021DC1AC: ; 0x021DC1AC
bl MOD14_021DC3F4
cmp r0, #1
bne _021DC1E2
- bl FUN_02022830
+ bl SaveSetDirtyBit
_021DC1E2:
add sp, #4
pop {r3, r4, pc}
@@ -9617,7 +9617,7 @@ _021DC218:
ldr r0, [r6, r0]
mvn r1, r1
mov r3, #6
- bl FUN_0206B598
+ bl PCStorage_SetBoxMonDataByIndexPair
b _021DC254
_021DC24A:
ldr r0, [r4]
@@ -14329,7 +14329,7 @@ _021DE5FE:
ldr r0, [sp, #0x30]
ldr r1, [r1, #0x30]
add r2, r4, #0
- bl FUN_0206B5E4
+ bl PCStorage_GetMonByIndexPair
mov r1, #0xab
mov r2, #0
str r0, [sp, #0x34]
@@ -14430,7 +14430,7 @@ _021DE6D0:
ldr r0, [sp, #8]
ldr r1, [sp, #4]
add r2, r6, #0
- bl FUN_0206B5E4
+ bl PCStorage_GetMonByIndexPair
mov r1, #5
mov r2, #0
add r7, r0, #0
@@ -14889,7 +14889,7 @@ MOD14_021DEA50: ; 0x021DEA50
ldr r0, _021DEB14 ; =0x00005988
ldr r0, [r5, r0]
ldr r0, [r0]
- bl FUN_0206B330
+ bl PCStorage_GetActiveBox
mov r4, #0
str r0, [sp, #0x1c]
add r0, r5, #0
@@ -14904,7 +14904,7 @@ _021DEA70:
ldr r0, [r5, r0]
add r2, r4, #0
ldr r0, [r0]
- bl FUN_0206B5E4
+ bl PCStorage_GetMonByIndexPair
mov r1, #0xab
mov r2, #0
str r0, [sp, #0x20]
@@ -15021,7 +15021,7 @@ _021DEB5C:
ldr r0, [r0, #0x40]
add r2, r4, #0
ldr r0, [r0]
- bl FUN_0206B5E4
+ bl PCStorage_GetMonByIndexPair
mov r1, #5
mov r2, #0
str r0, [sp, #0x2c]
@@ -21783,7 +21783,7 @@ MOD14_021E1FF8: ; 0x021E1FF8
bl MOD14_021DC44C
ldr r1, [sp, #0xc]
str r0, [sp, #0x28]
- bl FUN_0206B43C
+ bl PCStorage_GetBoxWallpaper
add r0, #0xd0
lsl r0, r0, #0x18
lsr r1, r0, #0x18
@@ -21816,7 +21816,7 @@ _021E204A:
ldr r0, [sp, #0x28]
ldr r1, [sp, #0xc]
add r2, r4, #0
- bl FUN_0206B5E4
+ bl PCStorage_GetMonByIndexPair
add r4, r4, #1
add r5, r0, #0
bl AcquireBoxMonLock
@@ -22178,7 +22178,7 @@ _021E2322:
ldr r0, [r6, #0xc]
bl MOD14_021DC44C
add r1, r4, #0
- bl FUN_0206B4E4
+ bl PCStorage_CountMonsAndEggsInBox
add r1, r5, #0
add r1, #0x94
add r4, r4, #1
@@ -22250,7 +22250,7 @@ MOD14_021E2394: ; 0x021E2394
ldr r1, [r1]
ldr r2, [r5, r2]
ldr r4, [r5, #0x10]
- bl FUN_0206B484
+ bl PCStorage_GetBoxName
ldr r1, _021E23F0 ; =0x00004BFC
mov r0, #0
ldr r1, [r5, r1]
@@ -27049,7 +27049,7 @@ _021E47AE:
ldr r0, [r0]
ldr r2, [r2]
add r1, r4, #0
- bl FUN_0206B484
+ bl PCStorage_GetBoxName
mov r0, #0x68
str r0, [sp]
mov r0, #0x10
@@ -30100,7 +30100,7 @@ MOD14_021E5FC8: ; 0x021E5FC8
mov r1, #7
bl MOD14_021E613C
add r0, r6, #0
- bl FUN_0206B668
+ bl PCStorage_CountUnlockedBonusWallpapers
add r6, r0, #0
beq _021E600E
add r0, r4, #0
@@ -30168,7 +30168,7 @@ _021E607A:
_021E607C:
ldr r0, [sp]
add r1, r5, #0
- bl FUN_0206B644
+ bl PCStorage_IsBonusWallpaperUnlocked
cmp r0, #0
beq _021E60A0
cmp r4, #0
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index 9fa71b61..d8d72189 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -2434,7 +2434,7 @@ MOD80_0222E87C: ; 0x0222E87C
ldr r0, [r4]
sub r1, r1, #1
ldr r0, [r0, #0xc]
- bl FUN_0206B4E4
+ bl PCStorage_CountMonsAndEggsInBox
ldr r1, _0222E8B8 ; =0x00001008
ldrh r2, [r4, r1]
add r0, r2, r0
@@ -10966,7 +10966,7 @@ _02232DB0:
ldr r0, [sp, #0x20]
ldr r1, [sp, #0x10]
add r2, r4, #0
- bl FUN_0206B5E4
+ bl PCStorage_GetMonByIndexPair
ldr r2, [r5, r6]
lsl r1, r4, #2
add r1, r2, r1
@@ -10987,7 +10987,7 @@ _02232DD0:
ldr r1, [sp, #0x10]
add r2, r4, #0
add r7, r5, r6
- bl FUN_0206B5E4
+ bl PCStorage_GetMonByIndexPair
ldr r1, [sp, #0x1c]
str r4, [sp]
str r1, [sp, #4]
@@ -11026,7 +11026,7 @@ _02232E22:
ldr r0, [sp, #0x20]
ldr r1, [sp, #0x10]
ldr r2, [r5, r2]
- bl FUN_0206B484
+ bl PCStorage_GetBoxName
b _02232F22
_02232E3A:
ldr r0, [r5]
@@ -11237,7 +11237,7 @@ _02232FEA:
add r0, r7, #0
add r1, r6, #0
add r2, r4, #0
- bl FUN_0206B5E4
+ bl PCStorage_GetMonByIndexPair
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
thumb_func_end MOD80_02232FB8
@@ -15852,7 +15852,7 @@ MOD80_02235398: ; 0x02235398
MOD80_022353B4: ; 0x022353B4
push {r3, r4, r5, lr}
add r4, r0, #0
- bl FUN_02022830
+ bl SaveSetDirtyBit
ldr r0, [r4]
mov r1, #2
ldr r0, [r0, #0x20]
@@ -15940,7 +15940,7 @@ _02235450: .word 0x00000FE6
MOD80_02235454: ; 0x02235454
push {r4, lr}
add r4, r0, #0
- bl FUN_02022830
+ bl SaveSetDirtyBit
ldr r0, [r4]
mov r1, #2
ldr r0, [r0, #0x20]
@@ -16074,7 +16074,7 @@ MOD80_02235534: ; 0x02235534
ldrh r1, [r1]
ldrh r2, [r2]
ldr r0, [r0, #0xc]
- bl FUN_0206B5E4
+ bl PCStorage_GetMonByIndexPair
add r1, r4, #0
bl FUN_02069A64
add r2, r5, #0
@@ -16092,7 +16092,7 @@ MOD80_02235534: ; 0x02235534
ldrh r1, [r1]
ldrh r2, [r2]
ldr r0, [r0, #0xc]
- bl FUN_0206B2FC
+ bl PCStorage_DeleteBoxMonByIndexPair
add r0, r4, #0
bl FreeToHeap
b _022355DC
@@ -16203,14 +16203,14 @@ _02235664:
add r1, sp, #0x20
ldr r0, [r0, #0xc]
add r2, sp, #4
- bl FUN_0206B384
+ bl PCStorage_FindFirstEmptySlot
add r0, r4, #0
bl FUN_020690E4
add r2, r0, #0
ldr r0, [r5]
ldr r1, [sp, #0x20]
ldr r0, [r0, #0xc]
- bl FUN_0206B244
+ bl PCStorage_PlaceMonInBoxFirstEmptySlot
add r0, r5, #0
ldr r1, [sp, #0x20]
add r0, #0xcc
@@ -16282,14 +16282,14 @@ _02235706:
add r1, sp, #0x20
ldr r0, [r0, #0xc]
add r2, sp, #4
- bl FUN_0206B384
+ bl PCStorage_FindFirstEmptySlot
add r0, r4, #0
bl FUN_020690E4
add r2, r0, #0
ldr r0, [r5]
ldr r1, [sp, #0x20]
ldr r0, [r0, #0xc]
- bl FUN_0206B244
+ bl PCStorage_PlaceMonInBoxFirstEmptySlot
add r0, r5, #0
ldr r1, [sp, #0x20]
add r0, #0xcc
@@ -17735,19 +17735,19 @@ _02236248:
ldr r0, [r0, #0xc]
ldr r1, [r1]
ldr r2, [r2]
- bl FUN_0206B2FC
+ bl PCStorage_DeleteBoxMonByIndexPair
ldr r0, [r5]
add r1, sp, #4
ldr r0, [r0, #0xc]
add r2, sp, #0
- bl FUN_0206B384
+ bl PCStorage_FindFirstEmptySlot
add r0, r4, #0
bl FUN_020690E4
add r2, r0, #0
ldr r0, [r5]
ldr r1, [sp, #4]
ldr r0, [r0, #0xc]
- bl FUN_0206B244
+ bl PCStorage_PlaceMonInBoxFirstEmptySlot
add sp, #8
pop {r3, r4, r5, pc}
thumb_func_end MOD80_02236218
diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c
index 20784ff6..3db6796a 100644
--- a/arm9/src/pokemon.c
+++ b/arm9/src/pokemon.c
@@ -3725,7 +3725,7 @@ void FUN_0206AA84(struct Pokemon * pokemon)
SetMonData(pokemon, MON_DATA_SEAL_COORDS, sp1);
}
-void FUN_0206AAB4(struct BoxPokemon * boxmon)
+void RestoreBoxMonPP(struct BoxPokemon * boxmon)
{
int i;
u8 pp;
diff --git a/include/pokemon.h b/include/pokemon.h
index 1ef26f85..ed62c18e 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -305,6 +305,6 @@ u16 GetLegendaryMon(u32 idx);
BOOL FUN_0206A998(struct Pokemon * pokemon);
BOOL FUN_0206A9AC(struct BoxPokemon * boxmon, struct PlayerData * sb2, u32 heap_id);
void FUN_0206AA84(struct Pokemon * pokemon);
-void FUN_0206AAB4(struct BoxPokemon * boxmon);
+void RestoreBoxMonPP(struct BoxPokemon * boxmon);
#endif //POKEDIAMOND_POKEMON_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 15:47:59 +0000