diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_frontier_1.s | 8 | ||||
| -rw-r--r-- | asm/easy_chat.s | 4 | ||||
| -rw-r--r-- | asm/main_menu.s | 4 | ||||
| -rw-r--r-- | asm/pokedex.s | 24 | ||||
| -rw-r--r-- | asm/start_menu.s | 2 | ||||
| -rw-r--r-- | asm/trainer_card.s | 4 |
6 files changed, 23 insertions, 23 deletions
diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s index 60ac46859..6ea5ba051 100644 --- a/asm/battle_frontier_1.s +++ b/asm/battle_frontier_1.s @@ -15923,11 +15923,11 @@ sub_8197080: @ 8197080 b _0819715C _081970A2: movs r0, 0 - bl sub_80C0844 + bl GetHoennPokedexCount lsls r0, 16 lsrs r4, r0, 16 movs r0, 0x1 - bl sub_80C0844 + bl GetHoennPokedexCount lsls r0, 16 lsrs r6, r0, 16 ldr r0, =gStringVar1 @@ -15977,11 +15977,11 @@ _081970A2: strb r6, [r5] adds r5, 0x1 movs r0, 0 - bl pokedex_count + bl GetNationalPokedexCount lsls r0, 16 lsrs r4, r0, 16 movs r0, 0x1 - bl pokedex_count + bl GetNationalPokedexCount lsls r0, 16 lsrs r6, r0, 16 mov r0, r10 diff --git a/asm/easy_chat.s b/asm/easy_chat.s index db2ffac14..0cbe1f1ae 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -9252,7 +9252,7 @@ start_menu_is_selected_item_valid: @ 811EA6C cmp r0, 0 bne _0811EA84 movs r0, 0 - bl pokedex_count + bl GetNationalPokedexCount lsls r0, 16 lsrs r0, 16 b _0811EA9A @@ -10369,7 +10369,7 @@ sub_811F2D4: @ 811F2D4 movs r5, 0 strh r5, [r0] movs r0, 0 - bl pokedex_count + bl GetNationalPokedexCount lsls r0, 16 cmp r0, 0 beq _0811F2FC diff --git a/asm/main_menu.s b/asm/main_menu.s index 48d1411c5..d5a69d503 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -4654,12 +4654,12 @@ fmt_pokedex: @ 8031F7C cmp r0, 0 beq _08031FA4 movs r0, 0x1 - bl pokedex_count + bl GetNationalPokedexCount b _08031FAA .pool _08031FA4: movs r0, 0x1 - bl sub_80C0844 + bl GetHoennPokedexCount _08031FAA: lsls r0, 16 lsrs r7, r0, 16 diff --git a/asm/pokedex.s b/asm/pokedex.s index cb40f0eda..d28b54651 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -443,24 +443,24 @@ _080BB65E: cmp r0, 0 bne _080BB6D0 movs r0, 0 - bl sub_80C0844 + bl GetHoennPokedexCount ldr r1, [r4] ldr r2, =0x0000061a adds r1, r2 strh r0, [r1] movs r0, 0x1 - bl sub_80C0844 + bl GetHoennPokedexCount b _080BB6E4 .pool _080BB6D0: movs r0, 0 - bl pokedex_count + bl GetNationalPokedexCount ldr r1, [r4] ldr r2, =0x0000061a adds r1, r2 strh r0, [r1] movs r0, 0x1 - bl pokedex_count + bl GetNationalPokedexCount _080BB6E4: ldr r1, [r4] ldr r3, =0x0000061c @@ -5058,7 +5058,7 @@ _080BDF4C: movs r1, 0x1 bl StartSpriteAnim movs r0, 0 - bl sub_80C0844 + bl GetHoennPokedexCount lsls r0, 16 lsrs r6, r0, 16 movs r0, 0 @@ -5283,7 +5283,7 @@ _080BE198: lsrs r1, 24 bl StartSpriteAnim movs r0, 0x1 - bl sub_80C0844 + bl GetHoennPokedexCount lsls r0, 16 lsrs r6, r0, 16 movs r0, 0 @@ -9597,8 +9597,8 @@ _080C07E8: .pool thumb_func_end GetSetPokedexFlag - thumb_func_start pokedex_count -pokedex_count: @ 80C07F4 + thumb_func_start GetNationalPokedexCount +GetNationalPokedexCount: @ 80C07F4 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 @@ -9641,10 +9641,10 @@ _080C0832: pop {r4-r7} pop {r1} bx r1 - thumb_func_end pokedex_count + thumb_func_end GetNationalPokedexCount - thumb_func_start sub_80C0844 -sub_80C0844: @ 80C0844 + thumb_func_start GetHoennPokedexCount +GetHoennPokedexCount: @ 80C0844 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 @@ -9691,7 +9691,7 @@ _080C088C: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_80C0844 + thumb_func_end GetHoennPokedexCount thumb_func_start sub_80C089C sub_80C089C: @ 80C089C diff --git a/asm/start_menu.s b/asm/start_menu.s index 23ac3710a..a57bbddc3 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -418,7 +418,7 @@ _0809FAFE: cmp r1, r0 bne _0809FB34 movs r0, 0 - bl pokedex_count + bl GetNationalPokedexCount lsls r0, 16 cmp r0, 0 beq _0809FBA0 diff --git a/asm/trainer_card.s b/asm/trainer_card.s index d7c96054d..a56dbd157 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -1925,11 +1925,11 @@ sub_80C376C: @ 80C376C cmp r0, 0 bne _080C377E movs r0, 0x1 - bl sub_80C0844 + bl GetHoennPokedexCount b _080C3784 _080C377E: movs r0, 0x1 - bl pokedex_count + bl GetNationalPokedexCount _080C3784: lsls r0, 16 lsrs r0, 16 |