diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-03 16:22:45 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-03 16:22:45 +0100 |
| commit | 56f960f67679071712dd7d2cd6140eb8833e7344 (patch) | |
| tree | 18f9af70a8a591117a7f0a7845d86462537f777c /asm | |
| parent | b5ecdfa404a34c66fdf9f96342a2de0f173e6e73 (diff) | |
| parent | 397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/pokemon_storage_system.s | 12 | ||||
| -rw-r--r-- | asm/pokenav.s | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 7670d867d..69c6d9e4f 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -87,8 +87,8 @@ _08095B66: bx r1 thumb_func_end sub_8095B24 - thumb_func_start sub_8095B6C -sub_8095B6C: @ 8095B6C + thumb_func_start GetNumValidDaycarePartyMons +GetNumValidDaycarePartyMons: @ 8095B6C push {r4-r6,lr} movs r5, 0 movs r6, 0 @@ -124,7 +124,7 @@ _08095B9A: bx r1 .align 2, 0 _08095BB0: .4byte gPlayerParty - thumb_func_end sub_8095B6C + thumb_func_end GetNumValidDaycarePartyMons thumb_func_start CountAlivePartyMonsExceptOne CountAlivePartyMonsExceptOne: @ 8095BB4 @@ -174,8 +174,8 @@ _08095BF6: _08095C0C: .4byte gPlayerParty thumb_func_end CountAlivePartyMonsExceptOne - thumb_func_start sub_8095C10 -sub_8095C10: @ 8095C10 + thumb_func_start CountAlivePartyMonsExceptSelectedOne +CountAlivePartyMonsExceptSelectedOne: @ 8095C10 push {lr} ldr r0, _08095C24 @ =gSpecialVar_0x8004 ldrb r0, [r0] @@ -186,7 +186,7 @@ sub_8095C10: @ 8095C10 bx r1 .align 2, 0 _08095C24: .4byte gSpecialVar_0x8004 - thumb_func_end sub_8095C10 + thumb_func_end CountAlivePartyMonsExceptSelectedOne thumb_func_start StorageSystemGetPartySize StorageSystemGetPartySize: @ 8095C28 diff --git a/asm/pokenav.s b/asm/pokenav.s index 066d16d5d..83ceed00f 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -4038,7 +4038,7 @@ sub_80F2598: @ 80F2598 asrs r1, 24 lsls r1, 16 lsrs r1, 16 - bl sub_8082C0C + bl DoesSomeoneWantRematchIn cmp r0, 0x1 bne _080F2618 ldr r0, _080F25FC @ =gSpriteSheet_PokenavBlueLight |