summaryrefslogtreecommitdiff
path: root/asm/pokemon_storage_system.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/pokemon_storage_system.s')
-rw-r--r--[-rwxr-xr-x]asm/pokemon_storage_system.s94
1 files changed, 47 insertions, 47 deletions
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index 94245f93b..24e041b7f 100755..100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -211,7 +211,7 @@ _080C72AC:
bl sub_81973A4
movs r0, 0
movs r1, 0
- bl sub_81973C4
+ bl NewMenuHelpers_DrawDialogueFrame
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
@@ -233,7 +233,7 @@ _080C72AC:
movs r0, 0
movs r1, 0x1
movs r3, 0xFF
- bl AddTextPrinterParametrized
+ bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -245,7 +245,7 @@ _080C72AC:
b _080C7318
.pool
_080C730C:
- bl sub_80ABDFC
+ bl IsWeatherNotFadingIn
lsls r0, 24
cmp r0, 0
bne _080C7318
@@ -339,7 +339,7 @@ _080C7392:
movs r0, 0
movs r1, 0x1
movs r3, 0
- bl AddTextPrinterParametrized
+ bl AddTextPrinterParameterized
b _080C756A
.pool
_080C73D0:
@@ -406,7 +406,7 @@ _080C7428:
_080C745C:
movs r0, 0x1
movs r1, 0
- bl fade_screen
+ bl FadeScreen
movs r0, 0x4
strh r0, [r5, 0x8]
b _080C756A
@@ -509,7 +509,7 @@ _080C7532:
movs r0, 0
movs r1, 0x1
movs r3, 0
- bl AddTextPrinterParametrized
+ bl AddTextPrinterParameterized
strh r4, [r5, 0x8]
b _080C756A
.pool
@@ -627,7 +627,7 @@ sub_80C75FC: @ 80C75FC
lsrs r4, 24
adds r0, r4, 0
movs r1, 0
- bl sub_81973FC
+ bl NewMenuHelpers_DrawStdWindowFrame
adds r0, r4, 0
movs r1, 0x5
mov r2, r8
@@ -657,7 +657,7 @@ sub_80C7678: @ 80C7678
ldr r1, =gFieldCallback
ldr r0, =mapldr_0808C6D8
str r0, [r1]
- ldr r0, =c2_exit_to_overworld_2_switch
+ ldr r0, =CB2_ReturnToField
bl SetMainCallback2
pop {r0}
bx r0
@@ -1106,7 +1106,7 @@ sub_80C7958: @ 80C7958
ldrh r0, [r3]
adds r0, 0x1
strh r0, [r1]
- ldr r0, =gUnknown_08571710
+ ldr r0, =sSpriteAnimTable_8571710
str r0, [sp, 0xC]
movs r4, 0
_080C7A10:
@@ -1837,7 +1837,7 @@ _080C805E:
movs r0, 0x1
movs r1, 0xB
movs r2, 0xE0
- bl sub_809882C
+ bl LoadUserWindowBorderGfx
b _080C8198
.pool
_080C808C:
@@ -2201,7 +2201,7 @@ _080C83CC:
ldr r1, =0x00000ce6
adds r0, r1
ldrh r0, [r0]
- bl itemid_is_mail
+ bl ItemIsMail
lsls r0, 24
cmp r0, 0
beq _080C83F4
@@ -2304,7 +2304,7 @@ _080C84C8:
ldr r1, =0x00000ce6
adds r0, r1
ldrh r0, [r0]
- bl itemid_is_mail
+ bl ItemIsMail
lsls r0, 24
cmp r0, 0
beq _080C84F8
@@ -2874,7 +2874,7 @@ _080C8A0C:
ldr r2, =0x00000ce6
adds r0, r2
ldrh r0, [r0]
- bl itemid_is_mail
+ bl ItemIsMail
lsls r0, 24
cmp r0, 0
bne _080C8A8C
@@ -2913,7 +2913,7 @@ _080C8A7C:
ldr r2, =0x00000ce6
adds r0, r1, r2
ldrh r0, [r0]
- bl itemid_is_mail
+ bl ItemIsMail
lsls r0, 24
cmp r0, 0
beq _080C8A98
@@ -3409,7 +3409,7 @@ _080C8F0C:
adds r0, 0x1
strb r0, [r1]
_080C8F22:
- bl sub_8198C58
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -3661,7 +3661,7 @@ _080C914E:
ldr r1, =0x00000ce6
adds r0, r1
ldrh r0, [r0]
- bl itemid_is_mail
+ bl ItemIsMail
lsls r0, 24
cmp r0, 0
bne _080C9168
@@ -3943,7 +3943,7 @@ _080C93E4:
ldr r1, =0x00000ce6
adds r0, r1
ldrh r0, [r0]
- bl itemid_is_mail
+ bl ItemIsMail
lsls r0, 24
cmp r0, 0
bne _080C9404
@@ -4133,7 +4133,7 @@ _080C9584:
b _080C9664
.pool
_080C95A4:
- bl sub_8198C58
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -4927,7 +4927,7 @@ _080C9C78:
b _080C9CAA
.pool
_080C9C8C:
- bl sub_8198C58
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -5058,7 +5058,7 @@ _080C9DAC:
b _080C9DE0
.pool
_080C9DC0:
- bl sub_8198C58
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -5343,7 +5343,7 @@ sub_80CA044: @ 80CA044
movs r0, 0
movs r2, 0x4
bl InitBgsFromTemplates
- ldr r1, =gUnknown_08DD2FE8
+ ldr r1, =gPSSMenu_Gfx
movs r0, 0
str r0, [sp]
movs r0, 0x1
@@ -5393,7 +5393,7 @@ _080CA0C2:
thumb_func_start sub_80CA0C8
sub_80CA0C8: @ 80CA0C8
push {lr}
- ldr r0, =gUnknown_08572744
+ ldr r0, =gWaveformSpritePalette
bl LoadSpritePalette
pop {r0}
bx r0
@@ -5498,7 +5498,7 @@ sub_80CA154: @ 80CA154
sub_80CA1C4: @ 80CA1C4
push {r4,lr}
sub sp, 0x8
- ldr r0, =gUnknown_0857274C
+ ldr r0, =gWaveformSpriteSheet
ldr r1, [r0, 0x4]
ldr r0, [r0]
str r0, [sp]
@@ -6104,7 +6104,7 @@ sub_80CA704: @ 80CA704
ldr r1, [r4]
adds r1, 0xB0
bl LZ77UnCompWram
- ldr r0, =gUnknown_08DD36A8
+ ldr r0, =gPSSMenu_Pal
movs r1, 0x10
movs r2, 0x20
bl LoadPalette
@@ -6712,7 +6712,7 @@ sub_80CAC1C: @ 80CAC1C
movs r0, 0x1
movs r1, 0x2
movs r2, 0xD0
- bl sub_809882C
+ bl LoadUserWindowBorderGfx
movs r0, 0x20
str r0, [sp]
movs r0, 0x14
@@ -6737,7 +6737,7 @@ sub_80CAC58: @ 80CAC58
sub sp, 0xC
lsls r0, 24
lsrs r6, r0, 24
- bl sub_81AFBF0
+ bl DynamicPlaceholderTextUtil_Reset
ldr r1, =gUnknown_0857276C
lsls r0, r6, 3
adds r0, r1
@@ -6774,7 +6774,7 @@ _080CACB8:
adds r1, r2
_080CACC0:
movs r0, 0
- bl sub_81AFC0C
+ bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
b _080CAD30
.pool
_080CACD0:
@@ -6817,7 +6817,7 @@ _080CAD16:
ldr r0, =0x000021eb
adds r1, r0
movs r0, 0
- bl sub_81AFC0C
+ bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
_080CAD30:
ldr r5, =gUnknown_02039D08
ldr r0, [r5]
@@ -6827,7 +6827,7 @@ _080CAD30:
lsls r1, r6, 3
adds r1, r2
ldr r1, [r1]
- bl sub_81AFC28
+ bl DynamicPlaceholderTextUtil_ExpandPlaceholders
movs r0, 0x1
movs r1, 0x11
bl FillWindowPixelBuffer
@@ -7034,7 +7034,7 @@ _080CAEFA:
thumb_func_start sub_80CAF04
sub_80CAF04: @ 80CAF04
push {r4-r6,lr}
- bl sub_80D2F04
+ bl LoadMonIconPalettes
movs r2, 0
ldr r3, =gUnknown_02039D08
ldr r5, =0x00000b08
@@ -9124,7 +9124,7 @@ _080CBF80:
adds r1, r3
ldr r0, [r1]
ldr r2, [r0]
- ldr r0, =gUnknown_0857291C
+ ldr r0, =gSpriteAffineAnimTable_857291C
str r0, [r2, 0x10]
ldr r0, [r1]
ldr r0, [r0]
@@ -10135,7 +10135,7 @@ _080CC7E6:
lsls r0, r1, 1
adds r0, r1
lsls r0, 2
- ldr r1, =gUnknown_085775B8
+ ldr r1, =gWallpaperTable
adds r6, r0, r1
ldr r0, [r6, 0x4]
ldr r1, [r7]
@@ -10646,7 +10646,7 @@ _080CCC70:
adds r1, r6, r1
lsls r1, 16
asrs r1, 16
- ldr r0, =gUnknown_0857B0A8
+ ldr r0, =gSpriteTemplate_857B0A8
movs r2, 0x1C
movs r3, 0x18
bl CreateSprite
@@ -10720,7 +10720,7 @@ sub_80CCCFC: @ 80CCCFC
ldr r0, =0x00030200
str r0, [r3, 0x4]
add r1, sp, 0x4
- ldr r0, =gUnknown_0857B0A8
+ ldr r0, =gSpriteTemplate_857B0A8
ldm r0!, {r5-r7}
stm r1!, {r5-r7}
ldm r0!, {r5-r7}
@@ -14810,7 +14810,7 @@ _080CF020:
beq _080CF0AC
ldr r3, =0x00000d65
adds r4, r3
- bl ItemId_GetItem
+ bl ItemId_GetName
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
@@ -16168,7 +16168,7 @@ sub_80CFB44: @ 80CFB44
.pool
_080CFB8C:
ldrh r0, [r1]
- bl itemid_is_mail
+ bl ItemIsMail
lsls r0, 24
cmp r0, 0
bne _080CFBA4
@@ -16197,7 +16197,7 @@ _080CFBAC:
.pool
_080CFBCC:
ldrh r0, [r1]
- bl itemid_is_mail
+ bl ItemIsMail
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -16240,14 +16240,14 @@ sub_80CFC14: @ 80CFC14
push {r4-r6,lr}
sub sp, 0x2C
mov r1, sp
- ldr r0, =gUnknown_0857B9E4
+ ldr r0, =gHandCursorSpriteSheets
ldm r0!, {r2-r4}
stm r1!, {r2-r4}
ldm r0!, {r2,r3,r5}
stm r1!, {r2,r3,r5}
add r4, sp, 0x18
adds r1, r4, 0
- ldr r0, =gUnknown_0857B9FC
+ ldr r0, =gHandCursorSpritePalettes
ldm r0!, {r2,r3,r5}
stm r1!, {r2,r3,r5}
ldr r0, [r0]
@@ -16279,7 +16279,7 @@ sub_80CFC14: @ 80CFC14
adds r2, r4, 0
adds r3, r5, 0
bl sub_80CD444
- ldr r0, =gUnknown_0857BA50
+ ldr r0, =gSpriteTemplate_857BA50
movs r2, 0
ldrsh r1, [r4, r2]
movs r3, 0
@@ -16353,7 +16353,7 @@ _080CFD3C:
movs r3, 0x15
movs r4, 0x2
_080CFD40:
- ldr r0, =gUnknown_0857BA68
+ ldr r0, =gSpriteTemplate_857BA68
movs r1, 0
movs r2, 0
bl CreateSprite
@@ -18324,7 +18324,7 @@ sub_80D0C60: @ 80D0C60
orrs r0, r1
str r0, [r2, 0x4]
mov r1, sp
- ldr r0, =gUnknown_0857BC70
+ ldr r0, =gSpriteTemplate_857BC70
ldm r0!, {r4-r6}
stm r1!, {r4-r6}
ldm r0!, {r4-r6}
@@ -19057,7 +19057,7 @@ sub_80D12B8: @ 80D12B8
ldr r1, =0x00002234
adds r0, r1
ldrh r0, [r0]
- bl ItemId_GetItem
+ bl ItemId_GetName
pop {r1}
bx r1
.pool
@@ -21048,8 +21048,8 @@ _080D220C:
bx r1
thumb_func_end sub_80D214C
- thumb_func_start sub_80D2218
-sub_80D2218: @ 80D2218
+ thumb_func_start CheckFreePokemonStorageSpace
+CheckFreePokemonStorageSpace: @ 80D2218
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -21095,7 +21095,7 @@ _080D2262:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_80D2218
+ thumb_func_end CheckFreePokemonStorageSpace
thumb_func_start sub_80D2270
sub_80D2270: @ 80D2270
@@ -21660,7 +21660,7 @@ sub_80D2644: @ 80D2644
mov r2, r9
ldr r1, [r2]
adds r5, r1
- ldr r2, =gUnknown_0857BC88
+ ldr r2, =gSpriteTemplate_857BC88
lsls r4, 2
lsls r1, r0, 4
adds r4, r1
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 14:47:30 +0000