summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_2.s6
-rw-r--r--asm/battle_4.s8
-rw-r--r--asm/battle_tower.s4
-rw-r--r--asm/contest_link_80C2020.s2
-rw-r--r--asm/easy_chat.s2
-rw-r--r--asm/egg_hatch.s4
-rw-r--r--asm/evolution_scene.s12
-rw-r--r--asm/mystery_event_script.s4
-rw-r--r--asm/pokedex.s18
-rw-r--r--asm/trade.s4
-rw-r--r--asm/tv.s4
11 files changed, 34 insertions, 34 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s
index f1c865a49..7d199fff2 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -3074,7 +3074,7 @@ _080114FE:
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
- bl sub_8090D90
+ bl GetNationalPokedexFlag
b _08011588
.align 2, 0
_08011530: .4byte gBaseStats
@@ -3105,7 +3105,7 @@ _0801154C:
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
- bl sub_8090D90
+ bl GetNationalPokedexFlag
movs r0, 0
bl dp01_build_cmdbuf_x04_4_4_4
ldrb r0, [r4]
@@ -3550,7 +3550,7 @@ _080118DE:
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
- bl sub_8090D90
+ bl GetNationalPokedexFlag
_08011912:
ldrb r0, [r4]
adds r0, 0x1
diff --git a/asm/battle_4.s b/asm/battle_4.s
index 0581d1e7d..aed5058b4 100644
--- a/asm/battle_4.s
+++ b/asm/battle_4.s
@@ -13392,7 +13392,7 @@ sub_8022784: @ 8022784
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
- bl sub_8090D90
+ bl GetNationalPokedexFlag
_080227D0:
ldr r2, _08022824 @ =gUnknown_02024C0C
ldr r1, _08022828 @ =gBitTable
@@ -31340,7 +31340,7 @@ _0802B73C:
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
- bl sub_8090D90
+ bl GetNationalPokedexFlag
lsls r0, 24
movs r4, 0xA
cmp r0, 0
@@ -31657,7 +31657,7 @@ sub_802B9E0: @ 802B9E0
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
- bl sub_8090D90
+ bl GetNationalPokedexFlag
lsls r0, 24
cmp r0, 0
beq _0802BA2C
@@ -31688,7 +31688,7 @@ _0802BA2C:
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
- bl sub_8090D90
+ bl GetNationalPokedexFlag
ldrb r0, [r6]
adds r2, r0, 0
muls r2, r5
diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index 9dfce6c1c..c50903de5 100644
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -1522,7 +1522,7 @@ _081350AE:
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
- bl sub_8090D90
+ bl GetNationalPokedexFlag
lsls r0, 24
cmp r0, 0
beq _081350C6
@@ -1555,7 +1555,7 @@ AppendBattleTowerBannedSpeciesName: @ 81350E0
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
- bl sub_8090D90
+ bl GetNationalPokedexFlag
lsls r0, 24
cmp r0, 0
beq _081351E6
diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s
index 672eb4c1a..7bd7de240 100644
--- a/asm/contest_link_80C2020.s
+++ b/asm/contest_link_80C2020.s
@@ -1601,7 +1601,7 @@ _080C2D42:
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
- bl sub_8090D90
+ bl GetNationalPokedexFlag
adds r5, 0x40
subs r4, 0x1
cmp r4, 0
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index b9f27b895..d1106ab0d 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -9975,7 +9975,7 @@ _080EAE50:
lsls r0, 16
lsrs r0, 16
movs r1, 0
- bl sub_8090D90
+ bl GetNationalPokedexFlag
b _080EAE7C
_080EAE62:
ldr r0, _080EAE74 @ =gUnknown_083DB694
diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s
index 90ae6aaf7..aa16203dc 100644
--- a/asm/egg_hatch.s
+++ b/asm/egg_hatch.s
@@ -46,10 +46,10 @@ AddHatchedMonToParty: @ 80429EC
lsrs r4, 16
adds r0, r4, 0
movs r1, 0x2
- bl sub_8090D90
+ bl GetNationalPokedexFlag
adds r0, r4, 0
movs r1, 0x3
- bl sub_8090D90
+ bl GetNationalPokedexFlag
ldr r1, _08042AA4 @ =gStringVar1
adds r0, r5, 0
bl pokemon_get_nick
diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s
index 404270195..002cf6527 100644
--- a/asm/evolution_scene.s
+++ b/asm/evolution_scene.s
@@ -1233,13 +1233,13 @@ _08112354:
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
- bl sub_8090D90
+ bl GetNationalPokedexFlag
ldrh r0, [r4, 0xC]
bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
- bl sub_8090D90
+ bl GetNationalPokedexFlag
adds r0, r5, 0
movs r1, 0xB
bl GetMonData
@@ -1739,13 +1739,13 @@ _081127BE:
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
- bl sub_8090D90
+ bl GetNationalPokedexFlag
ldrh r0, [r4, 0x10]
bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
- bl sub_8090D90
+ bl GetNationalPokedexFlag
movs r0, 0xE
bl IncrementGameStat
b _08112FD0
@@ -3047,13 +3047,13 @@ _08113316:
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
- bl sub_8090D90
+ bl GetNationalPokedexFlag
ldrh r0, [r4, 0x10]
bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
- bl sub_8090D90
+ bl GetNationalPokedexFlag
movs r0, 0xE
bl IncrementGameStat
b _08113B3A
diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s
index 93abd97bc..02b6a0a48 100644
--- a/asm/mystery_event_script.s
+++ b/asm/mystery_event_script.s
@@ -667,10 +667,10 @@ _0812668C:
lsrs r4, 16
adds r0, r4, 0
movs r1, 0x2
- bl sub_8090D90
+ bl GetNationalPokedexFlag
adds r0, r4, 0
movs r1, 0x3
- bl sub_8090D90
+ bl GetNationalPokedexFlag
_081266C6:
adds r0, r7, 0
movs r1, 0xC
diff --git a/asm/pokedex.s b/asm/pokedex.s
index 8fd971840..6416bf938 100644
--- a/asm/pokedex.s
+++ b/asm/pokedex.s
@@ -756,8 +756,8 @@ _08090D88:
_08090D8C: .4byte gPokedexEntries
thumb_func_end GetPokedexHeightWeight
- thumb_func_start sub_8090D90
-sub_8090D90: @ 8090D90
+ thumb_func_start GetNationalPokedexFlag
+GetNationalPokedexFlag: @ 8090D90
push {r4-r7,lr}
lsls r0, 16
lsls r1, 24
@@ -951,7 +951,7 @@ _08090F0A:
bx r1
.align 2, 0
_08090F14: .4byte gSaveBlock2
- thumb_func_end sub_8090D90
+ thumb_func_end GetNationalPokedexFlag
thumb_func_start GetNationalPokedexCount
GetNationalPokedexCount: @ 8090F18
@@ -982,7 +982,7 @@ _08090F3E:
lsrs r0, 16
movs r1, 0x1
_08090F46:
- bl sub_8090D90
+ bl GetNationalPokedexFlag
lsls r0, 24
cmp r0, 0
beq _08090F56
@@ -1032,7 +1032,7 @@ _08090F90:
lsrs r0, 16
movs r1, 0x1
_08090FA0:
- bl sub_8090D90
+ bl GetNationalPokedexFlag
lsls r0, 24
cmp r0, 0
beq _08090FB0
@@ -1063,7 +1063,7 @@ _08090FC4:
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
- bl sub_8090D90
+ bl GetNationalPokedexFlag
lsls r0, 24
cmp r0, 0
bne _08090FE4
@@ -1090,7 +1090,7 @@ _08090FF8:
lsrs r4, r0, 16
adds r0, r4, 0
movs r1, 0x1
- bl sub_8090D90
+ bl GetNationalPokedexFlag
lsls r0, 24
cmp r0, 0
beq _08091046
@@ -1104,7 +1104,7 @@ _08091014:
lsrs r4, r0, 16
adds r0, r4, 0
movs r1, 0x1
- bl sub_8090D90
+ bl GetNationalPokedexFlag
lsls r0, 24
cmp r0, 0
beq _08091046
@@ -1119,7 +1119,7 @@ _08091032:
lsrs r4, r0, 16
adds r0, r4, 0
movs r1, 0x1
- bl sub_8090D90
+ bl GetNationalPokedexFlag
lsls r0, 24
cmp r0, 0
bne _08091050
diff --git a/asm/trade.s b/asm/trade.s
index 756423ee7..61bf2ea3e 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -7560,10 +7560,10 @@ sub_804BA18: @ 804BA18
lsrs r4, 16
adds r0, r4, 0
movs r1, 0x2
- bl sub_8090D90
+ bl GetNationalPokedexFlag
adds r0, r4, 0
movs r1, 0x3
- bl sub_8090D90
+ bl GetNationalPokedexFlag
_0804BA5A:
pop {r4}
pop {r0}
diff --git a/asm/tv.s b/asm/tv.s
index ca2e5e410..dc52f7f2e 100644
--- a/asm/tv.s
+++ b/asm/tv.s
@@ -3456,7 +3456,7 @@ _080BF6B2:
lsls r0, 16
lsrs r0, 16
movs r1, 0
- bl sub_8090D90
+ bl GetNationalPokedexFlag
lsls r0, 24
asrs r0, 24
cmp r0, 0x1
@@ -5178,7 +5178,7 @@ sub_80C03C8: @ 80C03C8
lsls r0, 16
lsrs r0, 16
movs r1, 0
- bl sub_8090D90
+ bl GetNationalPokedexFlag
lsls r0, 24
asrs r2, r0, 24
cmp r2, 0
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 03:33:47 +0000