diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-18 21:04:35 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-18 21:04:35 -0400 |
| commit | 59c3967986896308a8316fb92d725a664e4a48dc (patch) | |
| tree | 8b591b0c3e7c6b355a262e6a81b6217c7dcd94d6 /arm9/modules/80/asm | |
| parent | ffc909a19c8640993b247f067f8ab678dbb5f32f (diff) | |
Rename routines related to the pokemon storage system
Diffstat (limited to 'arm9/modules/80/asm')
| -rw-r--r-- | arm9/modules/80/asm/module_80.s | 32 |
1 files changed, 16 insertions, 16 deletions
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 |