summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_script_commands.s2
-rw-r--r--asm/easy_chat.s4
-rw-r--r--asm/main_menu.s4
-rw-r--r--asm/pokedex.s282
-rw-r--r--asm/pokedex_screen.s20
-rw-r--r--asm/pokemon_size_record.s2
-rw-r--r--asm/save_menu_util.s4
-rw-r--r--asm/start_menu.s2
-rw-r--r--asm/trainer_card.s14
9 files changed, 26 insertions, 308 deletions
diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s
index 42d1f653d..7d93cba64 100644
--- a/asm/battle_script_commands.s
+++ b/asm/battle_script_commands.s
@@ -30322,7 +30322,7 @@ _0802C8E8:
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
- bl sub_8088E38
+ bl GetPokedexHeightWeight
ldrh r1, [r4]
lsls r0, 16
lsrs r0, 16
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index 0ec71e087..604929f1f 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -51,7 +51,7 @@ start_menu_is_selected_item_valid: @ 80BD754
cmp r0, 0x15
bne _080BD76C
movs r0, 0
- bl pokedex_count
+ bl GetNationalPokedexCount
lsls r0, 16
lsrs r0, 16
b _080BD782
@@ -1054,7 +1054,7 @@ sub_80BDE88: @ 80BDE88
ldr r1, [r4]
movs r0, 0
strh r0, [r1]
- bl pokedex_count
+ bl GetNationalPokedexCount
lsls r0, 16
cmp r0, 0
beq _080BDEB0
diff --git a/asm/main_menu.s b/asm/main_menu.s
index f88fea21a..fed088ff3 100644
--- a/asm/main_menu.s
+++ b/asm/main_menu.s
@@ -1504,13 +1504,13 @@ sub_800CF3C: @ 800CF3C
cmp r0, 0
beq _0800CF64
movs r0, 0x1
- bl pokedex_count
+ bl GetNationalPokedexCount
b _0800CF6A
.align 2, 0
_0800CF60: .4byte 0x00000829
_0800CF64:
movs r0, 0x1
- bl sub_8088EDC
+ bl GetKantoPokedexCount
_0800CF6A:
lsls r0, 16
lsrs r6, r0, 16
diff --git a/asm/pokedex.s b/asm/pokedex.s
deleted file mode 100644
index 69ca5adcf..000000000
--- a/asm/pokedex.s
+++ /dev/null
@@ -1,282 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .syntax unified
-
- .text
-
- thumb_func_start sub_8088E20
-sub_8088E20: @ 8088E20
- adds r1, r0, 0
- lsls r1, 16
- lsrs r1, 16
- lsls r0, r1, 3
- adds r0, r1
- lsls r0, 2
- ldr r1, _08088E34 @ =gUnknown_844E850
- adds r0, r1
- bx lr
- .align 2, 0
-_08088E34: .4byte gUnknown_844E850
- thumb_func_end sub_8088E20
-
- thumb_func_start sub_8088E38
-sub_8088E38: @ 8088E38
- push {lr}
- lsls r0, 16
- lsrs r2, r0, 16
- lsls r1, 24
- lsrs r1, 24
- cmp r1, 0
- beq _08088E4E
- cmp r1, 0x1
- beq _08088E60
- movs r0, 0x1
- b _08088E6C
-_08088E4E:
- ldr r0, _08088E5C @ =gUnknown_844E850
- lsls r1, r2, 3
- adds r1, r2
- lsls r1, 2
- adds r1, r0
- ldrh r0, [r1, 0xC]
- b _08088E6C
- .align 2, 0
-_08088E5C: .4byte gUnknown_844E850
-_08088E60:
- ldr r0, _08088E70 @ =gUnknown_844E850
- lsls r1, r2, 3
- adds r1, r2
- lsls r1, 2
- adds r1, r0
- ldrh r0, [r1, 0xE]
-_08088E6C:
- pop {r1}
- bx r1
- .align 2, 0
-_08088E70: .4byte gUnknown_844E850
- thumb_func_end sub_8088E38
-
- thumb_func_start GetSetPokedexFlag
-GetSetPokedexFlag: @ 8088E74
- push {lr}
- lsls r0, 16
- lsrs r0, 16
- lsls r1, 24
- lsrs r1, 24
- movs r2, 0
- bl sub_8104AB0
- lsls r0, 24
- asrs r0, 24
- pop {r1}
- bx r1
- thumb_func_end GetSetPokedexFlag
-
- thumb_func_start pokedex_count
-pokedex_count: @ 8088E8C
- push {r4-r7,lr}
- lsls r0, 24
- lsrs r6, r0, 24
- movs r5, 0
- movs r0, 0
- ldr r7, _08088EA4 @ =0x00000181
-_08088E98:
- cmp r6, 0
- beq _08088EA8
- cmp r6, 0x1
- beq _08088EB2
- adds r4, r0, 0x1
- b _08088ECA
- .align 2, 0
-_08088EA4: .4byte 0x00000181
-_08088EA8:
- adds r4, r0, 0x1
- lsls r0, r4, 16
- lsrs r0, 16
- movs r1, 0
- b _08088EBA
-_08088EB2:
- adds r4, r0, 0x1
- lsls r0, r4, 16
- lsrs r0, 16
- movs r1, 0x1
-_08088EBA:
- bl GetSetPokedexFlag
- lsls r0, 24
- cmp r0, 0
- beq _08088ECA
- adds r0, r5, 0x1
- lsls r0, 16
- lsrs r5, r0, 16
-_08088ECA:
- lsls r0, r4, 16
- lsrs r0, 16
- cmp r0, r7
- bls _08088E98
- adds r0, r5, 0
- pop {r4-r7}
- pop {r1}
- bx r1
- thumb_func_end pokedex_count
-
- thumb_func_start sub_8088EDC
-sub_8088EDC: @ 8088EDC
- push {r4-r6,lr}
- lsls r0, 24
- lsrs r6, r0, 24
- movs r5, 0
- movs r0, 0
-_08088EE6:
- cmp r6, 0
- beq _08088EF2
- cmp r6, 0x1
- beq _08088EFC
- adds r4, r0, 0x1
- b _08088F14
-_08088EF2:
- adds r4, r0, 0x1
- lsls r0, r4, 16
- lsrs r0, 16
- movs r1, 0
- b _08088F04
-_08088EFC:
- adds r4, r0, 0x1
- lsls r0, r4, 16
- lsrs r0, 16
- movs r1, 0x1
-_08088F04:
- bl GetSetPokedexFlag
- lsls r0, 24
- cmp r0, 0
- beq _08088F14
- adds r0, r5, 0x1
- lsls r0, 16
- lsrs r5, r0, 16
-_08088F14:
- lsls r0, r4, 16
- lsrs r0, 16
- cmp r0, 0x96
- bls _08088EE6
- adds r0, r5, 0
- pop {r4-r6}
- pop {r1}
- bx r1
- thumb_func_end sub_8088EDC
-
- thumb_func_start sub_8088F24
-sub_8088F24: @ 8088F24
- push {r4,lr}
- movs r0, 0
-_08088F28:
- adds r0, 0x1
- lsls r0, 16
- lsrs r4, r0, 16
- adds r0, r4, 0
- bl HoennToNationalOrder
- lsls r0, 16
- lsrs r0, 16
- movs r1, 0x1
- bl GetSetPokedexFlag
- lsls r0, 24
- cmp r0, 0
- bne _08088F48
- movs r0, 0
- b _08088F50
-_08088F48:
- adds r0, r4, 0
- cmp r0, 0xC7
- bls _08088F28
- movs r0, 0x1
-_08088F50:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_8088F24
-
- thumb_func_start sub_8088F58
-sub_8088F58: @ 8088F58
- push {r4,lr}
- movs r0, 0
-_08088F5C:
- adds r0, 0x1
- lsls r0, 16
- lsrs r4, r0, 16
- adds r0, r4, 0
- movs r1, 0x1
- bl GetSetPokedexFlag
- lsls r0, 24
- cmp r0, 0
- bne _08088F74
- movs r0, 0
- b _08088F7C
-_08088F74:
- adds r0, r4, 0
- cmp r0, 0x95
- bls _08088F5C
- movs r0, 0x1
-_08088F7C:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_8088F58
-
- thumb_func_start HasAllKantoMons
-HasAllKantoMons: @ 8088F84
- push {r4,r5,lr}
- movs r0, 0
-_08088F88:
- adds r0, 0x1
- lsls r0, 16
- lsrs r4, r0, 16
- adds r0, r4, 0
- movs r1, 0x1
- bl GetSetPokedexFlag
- lsls r0, 24
- cmp r0, 0
- beq _08088FD6
- adds r0, r4, 0
- cmp r0, 0x95
- bls _08088F88
- movs r0, 0x97
-_08088FA4:
- adds r0, 0x1
- lsls r0, 16
- lsrs r4, r0, 16
- adds r0, r4, 0
- movs r1, 0x1
- bl GetSetPokedexFlag
- lsls r0, 24
- cmp r0, 0
- beq _08088FD6
- adds r0, r4, 0
- cmp r0, 0xF7
- bls _08088FA4
- movs r0, 0xFB
- ldr r5, _08088FDC @ =0x0000017f
-_08088FC2:
- adds r0, 0x1
- lsls r0, 16
- lsrs r4, r0, 16
- adds r0, r4, 0
- movs r1, 0x1
- bl GetSetPokedexFlag
- lsls r0, 24
- cmp r0, 0
- bne _08088FE0
-_08088FD6:
- movs r0, 0
- b _08088FE8
- .align 2, 0
-_08088FDC: .4byte 0x0000017f
-_08088FE0:
- adds r0, r4, 0
- cmp r0, r5
- bls _08088FC2
- movs r0, 0x1
-_08088FE8:
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end HasAllKantoMons
-
- .align 2, 0 @ Don't pad with nop.
diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s
index 268b65fd8..b9c18d201 100644
--- a/asm/pokedex_screen.s
+++ b/asm/pokedex_screen.s
@@ -6230,7 +6230,7 @@ sub_8105800: @ 8105800
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r2, _08105860 @ =gUnknown_844E850
+ ldr r2, _08105860 @ =gPokedexEntries
adds r5, r1, r2
movs r4, 0
movs r1, 0x1
@@ -6260,7 +6260,7 @@ _08105840:
bls _08105840
b _08105878
.align 2, 0
-_08105860: .4byte gUnknown_844E850
+_08105860: .4byte gPokedexEntries
_08105864:
movs r1, 0xAC
_08105866:
@@ -6331,7 +6331,7 @@ sub_81058C4: @ 81058C4
mov r8, r3
adds r0, r1, 0
bl SpeciesToNationalPokedexNum
- ldr r2, _08105974 @ =gUnknown_844E850
+ ldr r2, _08105974 @ =gPokedexEntries
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -6395,7 +6395,7 @@ _0810593A:
strb r0, [r1]
b _08105998
.align 2, 0
-_08105974: .4byte gUnknown_844E850
+_08105974: .4byte gPokedexEntries
_08105978: .4byte gUnknown_8415F98
_0810597C: .4byte 0x00002710
_08105980:
@@ -6514,7 +6514,7 @@ sub_8105A3C: @ 8105A3C
mov r9, r3
adds r0, r1, 0
bl SpeciesToNationalPokedexNum
- ldr r2, _08105ACC @ =gUnknown_844E850
+ ldr r2, _08105ACC @ =gPokedexEntries
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -6565,7 +6565,7 @@ _08105AAC:
strb r5, [r4]
b _08105ADC
.align 2, 0
-_08105ACC: .4byte gUnknown_844E850
+_08105ACC: .4byte gPokedexEntries
_08105AD0: .4byte 0x000186a0
_08105AD4: .4byte 0x000011b8
_08105AD8:
@@ -6825,7 +6825,7 @@ sub_8105CB0: @ 8105CB0
lsls r0, 24
cmp r0, 0
beq _08105D5C
- ldr r1, _08105D44 @ =gUnknown_844E850
+ ldr r1, _08105D44 @ =gPokedexEntries
lsls r0, r4, 3
adds r0, r4
lsls r0, 2
@@ -6876,7 +6876,7 @@ sub_8105CB0: @ 8105CB0
lsrs r5, r0, 24
b _08105D4A
.align 2, 0
-_08105D44: .4byte gUnknown_844E850
+_08105D44: .4byte gPokedexEntries
_08105D48:
movs r5, 0
_08105D4A:
@@ -7874,7 +7874,7 @@ _08106534:
adds r0, r1
lsls r0, 2
add r0, r10
- ldr r1, _081066C8 @ =gUnknown_844E850
+ ldr r1, _081066C8 @ =gPokedexEntries
ldr r2, [sp, 0x18]
lsls r4, r2, 3
adds r4, r2
@@ -7979,7 +7979,7 @@ _081066B8: .4byte gUnknown_203ACF0
_081066BC: .4byte gUnknown_8452368
_081066C0: .4byte 0x0000ffff
_081066C4: .4byte gSprites
-_081066C8: .4byte gUnknown_844E850
+_081066C8: .4byte gPokedexEntries
_081066CC: .4byte gSaveBlock2Ptr
_081066D0:
ldr r0, [r7]
diff --git a/asm/pokemon_size_record.s b/asm/pokemon_size_record.s
index ac1f2a017..cb87652fa 100644
--- a/asm/pokemon_size_record.s
+++ b/asm/pokemon_size_record.s
@@ -128,7 +128,7 @@ GetMonSize: @ 80A0770
lsls r0, 16
lsrs r0, 16
movs r1, 0
- bl sub_8088E38
+ bl GetPokedexHeightWeight
lsls r0, 16
lsrs r7, r0, 16
adds r0, r6, 0
diff --git a/asm/save_menu_util.s b/asm/save_menu_util.s
index 129d08921..2d2866914 100644
--- a/asm/save_menu_util.s
+++ b/asm/save_menu_util.s
@@ -59,11 +59,11 @@ _080F8034:
cmp r0, 0
beq _080F8044
movs r0, 0x1
- bl pokedex_count
+ bl GetNationalPokedexCount
b _080F804A
_080F8044:
movs r0, 0x1
- bl sub_8088EDC
+ bl GetKantoPokedexCount
_080F804A:
adds r1, r0, 0
lsls r1, 16
diff --git a/asm/start_menu.s b/asm/start_menu.s
index f7ea9a712..40a678a01 100644
--- a/asm/start_menu.s
+++ b/asm/start_menu.s
@@ -820,7 +820,7 @@ sub_806F3CC: @ 806F3CC
cmp r1, r0
bne _0806F408
movs r0, 0
- bl pokedex_count
+ bl GetNationalPokedexCount
lsls r0, 16
cmp r0, 0
bne _0806F408
diff --git a/asm/trainer_card.s b/asm/trainer_card.s
index 85797d38f..803f3841d 100644
--- a/asm/trainer_card.s
+++ b/asm/trainer_card.s
@@ -973,7 +973,7 @@ _080897EE:
ldr r0, _08089890 @ =0x00000829
bl FlagGet
strb r0, [r5, 0x2]
- bl sub_8088F24
+ bl HasAllHoennMons
strb r0, [r5, 0x3]
bl sub_808A0E0
strh r0, [r5, 0xC]
@@ -1062,7 +1062,7 @@ _080898BA:
mov r0, r8
strb r0, [r5, 0x1]
_080898BE:
- bl sub_8088F58
+ bl HasAllKantoMons
lsls r0, 16
cmp r0, 0
beq _080898CE
@@ -1070,7 +1070,7 @@ _080898BE:
adds r0, 0x1
strb r0, [r5, 0x1]
_080898CE:
- bl HasAllKantoMons
+ bl HasAllMons
lsls r0, 16
cmp r0, 0
beq _080898DE
@@ -1115,9 +1115,9 @@ _08089918:
movs r0, 0x1
strb r0, [r5, 0x1]
_0808991C:
- bl sub_8088F58
- strb r0, [r5, 0x3]
bl HasAllKantoMons
+ strb r0, [r5, 0x3]
+ bl HasAllMons
adds r6, r5, 0
adds r6, 0x4D
strb r0, [r6]
@@ -2043,11 +2043,11 @@ sub_808A0E0: @ 808A0E0
cmp r0, 0
bne _0808A0F2
movs r0, 0x1
- bl sub_8088EDC
+ bl GetKantoPokedexCount
b _0808A0F8
_0808A0F2:
movs r0, 0x1
- bl pokedex_count
+ bl GetNationalPokedexCount
_0808A0F8:
lsls r0, 16
lsrs r0, 16
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 12:12:48 +0000