summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/code_80521D0.s4
-rw-r--r--asm/code_809D148.s2
-rw-r--r--asm/exclusive_pokemon.s12
-rw-r--r--asm/wonder_mail_1.s280
4 files changed, 12 insertions, 286 deletions
diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s
index a2e7f3d..8e13cf1 100644
--- a/asm/code_80521D0.s
+++ b/asm/code_80521D0.s
@@ -39946,7 +39946,7 @@ _080665BE:
b _08066704
_080665D0:
adds r0, r6, 0
- bl sub_80981DC
+ bl IsExclusivePokemonUnlocked
lsls r0, 24
cmp r0, 0
bne _080665DE
@@ -48621,7 +48621,7 @@ sub_806AA0C:
lsls r1, 24
lsrs r5, r1, 24
adds r0, r4, 0
- bl sub_80981DC
+ bl IsExclusivePokemonUnlocked
lsls r0, 24
cmp r0, 0
beq _0806AA56
diff --git a/asm/code_809D148.s b/asm/code_809D148.s
index fa42327..2ca52f3 100644
--- a/asm/code_809D148.s
+++ b/asm/code_809D148.s
@@ -8841,7 +8841,7 @@ _080A1CCC:
cmp r5, r0
beq _080A1CA4
adds r0, r5, 0
- bl sub_80981DC
+ bl IsExclusivePokemonUnlocked
lsls r0, 24
cmp r0, 0
beq _080A1CA4
diff --git a/asm/exclusive_pokemon.s b/asm/exclusive_pokemon.s
index f52efbc..593b931 100644
--- a/asm/exclusive_pokemon.s
+++ b/asm/exclusive_pokemon.s
@@ -338,8 +338,8 @@ _080981D4:
_080981D8: .4byte gUnknown_203B498
thumb_func_end sub_80981A0
- thumb_func_start sub_80981DC
-sub_80981DC:
+ thumb_func_start IsExclusivePokemonUnlocked
+IsExclusivePokemonUnlocked:
push {r4,r5,lr}
lsls r0, 16
asrs r3, r0, 16
@@ -369,10 +369,10 @@ _0809820E:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_80981DC
+ thumb_func_end IsExclusivePokemonUnlocked
- thumb_func_start sub_8098214
-sub_8098214:
+ thumb_func_start UnlockExclusivePokemon
+UnlockExclusivePokemon:
push {r4-r6,lr}
lsls r0, 16
asrs r3, r0, 16
@@ -400,7 +400,7 @@ _08098232:
.align 2, 0
_08098240: .4byte gUnknown_203B498
_08098244: .4byte gExclusivePokemon
- thumb_func_end sub_8098214
+ thumb_func_end UnlockExclusivePokemon
thumb_func_start sub_8098248
sub_8098248:
diff --git a/asm/wonder_mail_1.s b/asm/wonder_mail_1.s
index c0407c9..5bd22cf 100644
--- a/asm/wonder_mail_1.s
+++ b/asm/wonder_mail_1.s
@@ -5,280 +5,6 @@
.text
- thumb_func_start sub_802A50C
-sub_802A50C:
- push {r4,r5,lr}
- sub sp, 0x44
- bl sub_80154F0
- adds r4, r0, 0
- add r0, sp, 0x14
- movs r1, 0
- movs r2, 0x30
- bl MemoryFill8
- cmp r4, 0x2
- bne _0802A526
- b _0802A660
-_0802A526:
- cmp r4, 0x3
- beq _0802A52C
- b _0802A680
-_0802A52C:
- ldr r0, _0802A54C
- ldr r1, [r0]
- adds r1, 0x8
- movs r0, 0x20
- add r2, sp, 0x14
- bl sub_8039068
- subs r0, 0x7
- cmp r0, 0x11
- bls _0802A542
- b _0802A654
-_0802A542:
- lsls r0, 2
- ldr r1, _0802A550
- adds r0, r1
- ldr r0, [r0]
- mov pc, r0
- .align 2, 0
-_0802A54C: .4byte gUnknown_203B2C4
-_0802A550: .4byte _0802A554
- .align 2, 0
-_0802A554:
- .4byte _0802A654
- .4byte _0802A654
- .4byte _0802A654
- .4byte _0802A654
- .4byte _0802A5F0
- .4byte _0802A654
- .4byte _0802A654
- .4byte _0802A654
- .4byte _0802A654
- .4byte _0802A654
- .4byte _0802A59C
- .4byte _0802A654
- .4byte _0802A654
- .4byte _0802A5D8
- .4byte _0802A654
- .4byte _0802A654
- .4byte _0802A654
- .4byte _0802A618
-_0802A59C:
- ldr r0, _0802A5CC
- ldr r3, _0802A5D0
- movs r2, 0
- str r2, [sp]
- movs r1, 0x4
- str r1, [sp, 0x4]
- str r2, [sp, 0x8]
- ldr r1, _0802A5D4
- ldr r1, [r1]
- movs r2, 0x84
- lsls r2, 3
- adds r1, r2
- str r1, [sp, 0xC]
- movs r1, 0xC
- str r1, [sp, 0x10]
- movs r1, 0
- movs r2, 0x7
- bl sub_8014248
- movs r0, 0x28
- bl sub_802B2BC
- b _0802A654
- .align 2, 0
-_0802A5CC: .4byte gUnknown_80DF1C0
-_0802A5D0: .4byte gUnknown_80DEE44
-_0802A5D4: .4byte gUnknown_203B2C4
-_0802A5D8:
- ldr r0, _0802A5E8
- ldr r1, _0802A5EC
- ldr r2, [r1]
- movs r3, 0x84
- lsls r3, 3
- adds r2, r3
- b _0802A5FC
- .align 2, 0
-_0802A5E8: .4byte gUnknown_80DF208
-_0802A5EC: .4byte gUnknown_203B2C4
-_0802A5F0:
- ldr r0, _0802A60C
- ldr r1, _0802A610
- ldr r2, [r1]
- movs r4, 0x84
- lsls r4, 3
- adds r2, r4
-_0802A5FC:
- ldr r3, _0802A614
- movs r1, 0
- bl sub_80141B4
- movs r0, 0x1F
- bl sub_802B2BC
- b _0802A654
- .align 2, 0
-_0802A60C: .4byte gUnknown_80DF0A0
-_0802A610: .4byte gUnknown_203B2C4
-_0802A614: .4byte 0x0000010d
-_0802A618:
- ldr r1, [sp, 0x24]
- movs r0, 0x4
- bl sub_809539C
- lsls r0, 24
- lsrs r0, 24
- bl sub_8095228
- adds r2, r0, 0
- add r1, sp, 0x14
- ldm r1!, {r3-r5}
- stm r2!, {r3-r5}
- ldm r1!, {r3-r5}
- stm r2!, {r3-r5}
- ldm r1!, {r3-r5}
- stm r2!, {r3-r5}
- ldm r1!, {r3-r5}
- stm r2!, {r3-r5}
- movs r1, 0x6
- strb r1, [r0]
- ldr r0, _0802A65C
- ldr r0, [r0]
- movs r5, 0x86
- lsls r5, 3
- adds r0, r5
- ldr r1, [sp, 0x24]
- str r1, [r0]
- movs r0, 0x21
- bl sub_802B2BC
-_0802A654:
- bl sub_80155F0
- b _0802A680
- .align 2, 0
-_0802A65C: .4byte gUnknown_203B2C4
-_0802A660:
- bl sub_80155F0
- bl ResetUnusedInputStruct
- ldr r0, _0802A688
- ldr r0, [r0]
- movs r1, 0xEF
- lsls r1, 2
- adds r0, r1
- movs r1, 0x1
- movs r2, 0x1
- bl sub_800641C
- movs r0, 0x1
- bl sub_802B2BC
-_0802A680:
- add sp, 0x44
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_0802A688: .4byte gUnknown_203B2C4
- thumb_func_end sub_802A50C
-
- thumb_func_start sub_802A68C
-sub_802A68C:
- push {lr}
- sub sp, 0x4
- mov r0, sp
- bl sub_80144A4
- cmp r0, 0
- bne _0802A6AE
- bl sub_8012600
- lsls r0, 24
- cmp r0, 0
- bne _0802A6AE
- bl sub_8012750
- movs r0, 0xD
- bl sub_802B2BC
-_0802A6AE:
- add sp, 0x4
- pop {r0}
- bx r0
- thumb_func_end sub_802A68C
-
- thumb_func_start sub_802A6B4
-sub_802A6B4:
- push {r4,lr}
- sub sp, 0x4
- mov r0, sp
- bl sub_80144A4
- cmp r0, 0
- bne _0802A6E8
- bl sub_8012600
- lsls r0, 24
- cmp r0, 0
- bne _0802A6E8
- bl sub_8012744
- adds r4, r0, 0
- bl sub_8012750
- cmp r4, 0
- bne _0802A6E2
- movs r0, 0x20
- bl sub_802B2BC
- b _0802A6E8
-_0802A6E2:
- movs r0, 0x3
- bl sub_802B2BC
-_0802A6E8:
- add sp, 0x4
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_802A6B4
-
- thumb_func_start sub_802A6F0
-sub_802A6F0:
- push {lr}
- sub sp, 0x4
- mov r0, sp
- bl sub_80144A4
- cmp r0, 0
- bne _0802A710
- movs r0, 0x18
- bl sub_802B2BC
- movs r0, 0x1
- bl sub_8011C28
- movs r0, 0
- bl sub_8012574
-_0802A710:
- add sp, 0x4
- pop {r0}
- bx r0
- thumb_func_end sub_802A6F0
-
- thumb_func_start sub_802A718
-sub_802A718:
- push {lr}
- sub sp, 0x4
- mov r0, sp
- bl sub_80144A4
- cmp r0, 0
- bne _0802A738
- movs r0, 0x25
- bl sub_802B2BC
- movs r0, 0x1
- bl sub_8011C28
- movs r0, 0
- bl sub_8012574
-_0802A738:
- add sp, 0x4
- pop {r0}
- bx r0
- thumb_func_end sub_802A718
-
- thumb_func_start sub_802A740
-sub_802A740:
- push {lr}
- sub sp, 0x4
- mov r0, sp
- bl sub_80144A4
- cmp r0, 0
- bne _0802A754
- movs r0, 0x1E
- bl sub_802B2BC
-_0802A754:
- add sp, 0x4
- pop {r0}
- bx r0
- thumb_func_end sub_802A740
-
thumb_func_start sub_802A75C
sub_802A75C:
push {lr}
@@ -7130,7 +6856,7 @@ _0802DCE0:
ldr r0, [r0, 0x34]
movs r1, 0xC
ldrsh r0, [r0, r1]
- bl sub_8098214
+ bl UnlockExclusivePokemon
ldr r0, _0802DD70
ldr r1, [r5]
ldr r1, [r1, 0x34]
@@ -7179,7 +6905,7 @@ _0802DD9C:
ldr r0, [r0, 0x34]
movs r2, 0xE
ldrsh r0, [r0, r2]
- bl sub_8098214
+ bl UnlockExclusivePokemon
b _0802DE3E
.align 2, 0
_0802DDB4: .4byte gUnknown_203B2FC
@@ -7191,7 +6917,7 @@ _0802DDB8:
ldr r0, [r0, 0x34]
movs r1, 0xE
ldrsh r0, [r0, r1]
- bl sub_8098214
+ bl UnlockExclusivePokemon
b _0802DE3E
.align 2, 0
_0802DDD0: .4byte gUnknown_203B2FC
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 04:54:12 +0000