summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/code_801AFA4.s51
-rw-r--r--asm/code_801B3C0.s35
-rw-r--r--asm/code_8040094.s2
-rw-r--r--asm/code_80428A0.s2
-rw-r--r--asm/code_80521D0.s8
-rw-r--r--asm/code_8057824.s18
-rw-r--r--asm/code_8070D04.s79
-rw-r--r--asm/code_8071518.s196
-rw-r--r--asm/code_80718D8.s49
-rw-r--r--asm/code_80739DC.s185
-rw-r--r--asm/code_8075BA4.s52
-rw-r--r--asm/code_80848F0.s247
-rw-r--r--asm/code_8086A3C.s46
-rw-r--r--asm/code_80958E8.s16
-rw-r--r--asm/jirachi_wish.s34
-rw-r--r--asm/memory_1.s45
-rw-r--r--asm/rescue_password_menu.s2
-rw-r--r--asm/wonder_mail_2.s327
-rw-r--r--asm/wonder_mail_3.s580
19 files changed, 85 insertions, 1889 deletions
diff --git a/asm/code_801AFA4.s b/asm/code_801AFA4.s
deleted file mode 100644
index 7485f58..0000000
--- a/asm/code_801AFA4.s
+++ /dev/null
@@ -1,51 +0,0 @@
- .include "constants/gba_constants.inc"
- .include "asm/macros.inc"
-
- .syntax unified
-
- .text
-
- thumb_func_start sub_801B374
-sub_801B374:
- push {r4-r6,lr}
- lsls r0, 24
- lsrs r0, 24
- ldr r1, _0801B3A8
- ldr r4, [r1]
- bl GetItemMove
- lsls r0, 16
- lsrs r6, r0, 16
- movs r5, 0
-_0801B388:
- ldrh r0, [r4]
- lsrs r0, 1
- movs r1, 0x1
- ands r0, r1
- cmp r0, 0
- beq _0801B3AC
- movs r0, 0x8
- ldrsh r1, [r4, r0]
- adds r0, r6, 0
- bl CanMonLearnMove
- lsls r0, 24
- cmp r0, 0
- beq _0801B3AC
- movs r0, 0
- b _0801B3BA
- .align 2, 0
-_0801B3A8: .4byte gRecruitedPokemonRef
-_0801B3AC:
- adds r5, 0x1
- adds r4, 0x58
- movs r0, 0xCE
- lsls r0, 1
- cmp r5, r0
- ble _0801B388
- movs r0, 0x1
-_0801B3BA:
- pop {r4-r6}
- pop {r1}
- bx r1
- thumb_func_end sub_801B374
-
- .align 2,0
diff --git a/asm/code_801B3C0.s b/asm/code_801B3C0.s
index 173e4d6..435b731 100644
--- a/asm/code_801B3C0.s
+++ b/asm/code_801B3C0.s
@@ -465,7 +465,7 @@ sub_801BEEC:
lsls r0, 16
asrs r5, r0, 16
adds r0, r5, 0
- bl sub_801C5F0
+ bl HasNoAvailIQSkills
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0
@@ -854,7 +854,7 @@ _0801C1EA:
adds r0, 0x20
adds r1, 0x28
ldrb r1, [r1]
- bl sub_808EBF4
+ bl ToggleIQSkill
movs r0, 0x1
bl sub_801BFB4
b _0801C21E
@@ -899,7 +899,7 @@ sub_801C244:
lsls r0, 16
asrs r0, 16
adds r4, r0, 0
- bl sub_801C5F0
+ bl HasNoAvailIQSkills
lsls r0, 24
cmp r0, 0
beq _0801C25E
@@ -1349,33 +1349,4 @@ _0801C5E8: .4byte gUnknown_80DBE1C
_0801C5EC: .4byte gUnknown_203B23C
thumb_func_end sub_801C4C8
- thumb_func_start sub_801C5F0
-sub_801C5F0:
- push {lr}
- sub sp, 0x18
- lsls r0, 16
- asrs r0, 16
- ldr r2, _0801C614
- movs r1, 0x58
- muls r1, r0
- ldr r0, [r2]
- adds r0, r1
- movs r2, 0x14
- ldrsh r1, [r0, r2]
- mov r0, sp
- bl GetNumAvailableIQSkills
- cmp r0, 0
- beq _0801C618
- movs r0, 0
- b _0801C61A
- .align 2, 0
-_0801C614: .4byte gRecruitedPokemonRef
-_0801C618:
- movs r0, 0x1
-_0801C61A:
- add sp, 0x18
- pop {r1}
- bx r1
- thumb_func_end sub_801C5F0
-
.align 2,0
diff --git a/asm/code_8040094.s b/asm/code_8040094.s
index b4488f1..34ae163 100644
--- a/asm/code_8040094.s
+++ b/asm/code_8040094.s
@@ -445,7 +445,7 @@ _0804049E:
beq _080404C4
_080404B2:
adds r0, r4, 0
- bl sub_8045104
+ bl GetTrapData
ldr r1, _080404FC
ldrb r0, [r0]
adds r0, r1
diff --git a/asm/code_80428A0.s b/asm/code_80428A0.s
index 6fc7011..bb8af3b 100644
--- a/asm/code_80428A0.s
+++ b/asm/code_80428A0.s
@@ -2422,7 +2422,7 @@ _08043E6E:
cmp r0, 0x2
bne _08043EA0
adds r0, r4, 0
- bl sub_8045104
+ bl GetTrapData
adds r1, r0, 0
ldrb r0, [r1]
cmp r0, 0x1B
diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s
index 0ff1da5..5156376 100644
--- a/asm/code_80521D0.s
+++ b/asm/code_80521D0.s
@@ -690,8 +690,8 @@ sub_80528F4:
bx r0
thumb_func_end sub_80528F4
- thumb_func_start sub_8052910
-sub_8052910:
+ thumb_func_start DisplayDungeonDialogue
+DisplayDungeonDialogue:
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -987,7 +987,7 @@ _08052B72:
bx r0
.align 2, 0
_08052B88: .4byte gUnknown_80F7AEA
- thumb_func_end sub_8052910
+ thumb_func_end DisplayDungeonDialogue
thumb_func_start sub_8052B8C
sub_8052B8C:
@@ -4954,7 +4954,7 @@ _08054F40:
adds r1, r5, 0
mov r2, r8
mov r3, r9
- bl sub_805BEA0
+ bl LuminousOrbAction
b _080554BA
_08054F4E:
adds r0, r7, 0
diff --git a/asm/code_8057824.s b/asm/code_8057824.s
index c2cf874..c623f0d 100644
--- a/asm/code_8057824.s
+++ b/asm/code_8057824.s
@@ -9158,14 +9158,14 @@ sub_805BE90:
bx r1
thumb_func_end sub_805BE90
- thumb_func_start sub_805BEA0
-sub_805BEA0:
+ thumb_func_start LuminousOrbAction
+LuminousOrbAction:
push {lr}
- bl sub_804002C
+ bl HandleLuminousOrbAction
movs r0, 0x1
pop {r1}
bx r1
- thumb_func_end sub_805BEA0
+ thumb_func_end LuminousOrbAction
thumb_func_start sub_805BEAC
sub_805BEAC:
@@ -9353,7 +9353,7 @@ _0805BFF0:
cmp r0, 0x2
bne _0805C028
adds r0, r4, 0
- bl sub_8045104
+ bl GetTrapData
ldrb r0, [r0]
cmp r0, 0x11
beq _0805C028
@@ -14721,7 +14721,7 @@ _0805EEB8:
.4byte _0805EF52
_0805EED0:
adds r0, r4, 0
- bl sub_8045104
+ bl GetTrapData
adds r6, r0, 0
movs r0, 0
mov r8, r0
@@ -19934,7 +19934,7 @@ _08061994:
bl sub_8083654
ldrb r1, [r0, 0x9]
add r0, sp, 0x4
- bl sub_808EB0C
+ bl GetAvailTacticsforLvl
movs r6, 0x1
negs r6, r6
movs r1, 0
@@ -20947,7 +20947,7 @@ _08062198:
ldr r0, [sp, 0x11C]
adds r0, 0x8C
adds r1, r6, 0
- bl sub_808EBF4
+ bl ToggleIQSkill
b _080621BA
.align 2, 0
_080621AC: .4byte 0x00000133
@@ -25618,7 +25618,7 @@ _080646C4:
movs r1, 0
bl sub_803ECB4
adds r0, r4, 0
- bl sub_8045104
+ bl GetTrapData
adds r4, r0, 0
ldrb r1, [r4]
mov r0, r10
diff --git a/asm/code_8070D04.s b/asm/code_8070D04.s
index cc3c9f2..d995bdc 100644
--- a/asm/code_8070D04.s
+++ b/asm/code_8070D04.s
@@ -5,63 +5,6 @@
.text
- thumb_func_start CannotAttack
-CannotAttack:
- push {lr}
- adds r3, r0, 0
- lsls r1, 24
- ldr r2, [r3, 0x70]
- cmp r1, 0
- bne _08070D22
- adds r0, r2, 0
- adds r0, 0xA8
- ldrb r0, [r0]
- cmp r0, 0x2
- beq _08070D22
- cmp r0, 0x4
- beq _08070D22
- cmp r0, 0
- bne _08070D64
-_08070D22:
- adds r0, r2, 0
- adds r0, 0xB0
- ldrb r0, [r0]
- cmp r0, 0x1
- beq _08070D64
- cmp r0, 0x3
- beq _08070D64
- cmp r0, 0x4
- beq _08070D64
- cmp r0, 0x6
- beq _08070D64
- adds r0, r2, 0
- adds r0, 0xBC
- ldrb r0, [r0]
- cmp r0, 0x1
- beq _08070D64
- cmp r0, 0x3
- beq _08070D64
- cmp r0, 0x7
- beq _08070D64
- adds r0, r2, 0
- adds r0, 0xAC
- ldrb r0, [r0]
- cmp r0, 0x4
- beq _08070D64
- adds r0, r3, 0
- bl ShouldAvoidEnemies
- lsls r0, 24
- cmp r0, 0
- bne _08070D64
- movs r0, 0
- b _08070D66
-_08070D64:
- movs r0, 0x1
-_08070D66:
- pop {r1}
- bx r1
- thumb_func_end CannotAttack
-
thumb_func_start CannotMoveForward
CannotMoveForward:
push {r4-r6,lr}
@@ -972,26 +915,4 @@ _0807146A:
bx r1
thumb_func_end IsAtJunction
- thumb_func_start ShouldAvoidFirstHit
-ShouldAvoidFirstHit:
- push {r4,lr}
- lsls r1, 24
- lsrs r4, r1, 24
- movs r1, 0x3
- bl HasTactic
- lsls r0, 24
- cmp r0, 0
- beq _0807148A
- cmp r4, 0
- beq _0807148A
- movs r0, 0x1
- b _0807148C
-_0807148A:
- movs r0, 0
-_0807148C:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end ShouldAvoidFirstHit
-
.align 2, 0
diff --git a/asm/code_8071518.s b/asm/code_8071518.s
index 7c80895..2aac9db 100644
--- a/asm/code_8071518.s
+++ b/asm/code_8071518.s
@@ -5,29 +5,6 @@
.text
- thumb_func_start ShouldAvoidEnemies_2
-ShouldAvoidEnemies_2:
- push {r4,r5,lr}
- adds r4, r0, 0
- lsls r1, 24
- lsrs r5, r1, 24
- bl ShouldAvoidEnemies
- lsls r0, 24
- cmp r0, 0
- bne _0807152E
- movs r0, 0
- b _08071538
-_0807152E:
- adds r0, r4, 0
- adds r1, r5, 0
- bl CheckRunAwayVisualFlag
- movs r0, 0x1
-_08071538:
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end ShouldAvoidEnemies_2
-
thumb_func_start CheckRunAwayVisualFlag
CheckRunAwayVisualFlag:
push {r4-r7,lr}
@@ -269,177 +246,4 @@ _080716E4:
bx r1
thumb_func_end sub_807167C
- thumb_func_start sub_80716E8
-sub_80716E8:
- push {r4,r5,lr}
- adds r5, r0, 0
- adds r4, r1, 0
- lsls r2, 24
- lsrs r2, 24
- ldr r0, [r4, 0x70]
- adds r0, 0xC4
- ldrb r0, [r0]
- cmp r0, 0x2
- bne _08071720
- cmp r2, 0
- beq _08071714
- ldr r0, _08071718
- movs r2, 0
- bl SetMessageArgument
- ldr r0, _0807171C
- ldr r2, [r0]
- adds r0, r5, 0
- adds r1, r4, 0
- bl sub_80522F4
-_08071714:
- movs r0, 0x1
- b _08071722
- .align 2, 0
-_08071718: .4byte gAvailablePokemonNames
-_0807171C: .4byte gUnknown_80FC2FC
-_08071720:
- movs r0, 0
-_08071722:
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end sub_80716E8
-
- thumb_func_start sub_8071728
-sub_8071728:
- push {r4-r6,lr}
- adds r6, r0, 0
- adds r4, r1, 0
- lsls r2, 24
- lsrs r2, 24
- adds r5, r2, 0
- ldr r0, [r4, 0x70]
- adds r0, 0xC4
- ldrb r0, [r0]
- cmp r0, 0xE
- bne _08071758
- cmp r2, 0
- beq _0807178E
- ldr r0, _08071750
- movs r2, 0
- bl SetMessageArgument
- ldr r0, _08071754
- b _08071784
- .align 2, 0
-_08071750: .4byte gAvailablePokemonNames
-_08071754: .4byte gUnknown_80FC31C
-_08071758:
- adds r0, r4, 0
- movs r1, 0xF
- bl HasAbility
- lsls r0, 24
- cmp r0, 0
- bne _08071774
- adds r0, r4, 0
- movs r1, 0x18
- bl HasAbility
- lsls r0, 24
- cmp r0, 0
- beq _0807179C
-_08071774:
- cmp r5, 0
- beq _0807178E
- ldr r0, _08071794
- adds r1, r4, 0
- movs r2, 0
- bl SetMessageArgument
- ldr r0, _08071798
-_08071784:
- ldr r2, [r0]
- adds r0, r6, 0
- adds r1, r4, 0
- bl sub_80522F4
-_0807178E:
- movs r0, 0x1
- b _0807179E
.align 2, 0
-_08071794: .4byte gAvailablePokemonNames
-_08071798: .4byte gUnknown_80FCEFC
-_0807179C:
- movs r0, 0
-_0807179E:
- pop {r4-r6}
- pop {r1}
- bx r1
- thumb_func_end sub_8071728
-
- thumb_func_start sub_80717A4
-sub_80717A4:
- push {r4-r7,lr}
- mov r7, r9
- mov r6, r8
- push {r6,r7}
- mov r8, r0
- lsls r1, 16
- lsrs r1, 16
- mov r9, r1
- ldr r6, [r0, 0x70]
- adds r0, r6, 0
- adds r0, 0xA8
- ldrb r0, [r0]
- cmp r0, 0x1
- beq _080717CE
- cmp r0, 0x5
- beq _080717CE
- cmp r0, 0x3
- beq _080717CE
- b _08071816
-_080717CA:
- movs r0, 0x1
- b _08071818
-_080717CE:
- movs r7, 0
- movs r0, 0x8C
- lsls r0, 1
- adds r4, r6, r0
- adds r5, r4, 0
-_080717D8:
- ldrb r1, [r4]
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- beq _0807180C
- ldrb r0, [r6, 0x7]
- cmp r0, 0
- bne _080717F0
- movs r0, 0x4
- ands r0, r1
- cmp r0, 0
- beq _0807180C
-_080717F0:
- mov r0, r8
- adds r1, r5, 0
- movs r2, 0x1
- bl sub_805744C
- lsls r0, 24
- cmp r0, 0
- beq _0807180C
- ldrb r0, [r4, 0x4]
- cmp r0, 0
- beq _0807180C
- ldrh r0, [r4, 0x2]
- cmp r0, r9
- beq _080717CA
-_0807180C:
- adds r4, 0x8
- adds r5, 0x8
- adds r7, 0x1
- cmp r7, 0x3
- ble _080717D8
-_08071816:
- movs r0, 0
-_08071818:
- pop {r3,r4}
- mov r8, r3
- mov r9, r4
- pop {r4-r7}
- pop {r1}
- bx r1
- thumb_func_end sub_80717A4
-
- .align 2, 0 \ No newline at end of file
diff --git a/asm/code_80718D8.s b/asm/code_80718D8.s
index 8fb9e78..35f9c8b 100644
--- a/asm/code_80718D8.s
+++ b/asm/code_80718D8.s
@@ -721,7 +721,7 @@ _08071E4C:
beq _08071E68
ldrb r1, [r6, 0x9]
add r0, sp, 0x74
- bl sub_808EB48
+ bl GetAvailTacticsforLvl_Bool
_08071E68:
movs r0, 0x10
ldrsh r2, [r6, r0]
@@ -863,7 +863,7 @@ _08071F7A:
beq _08071FCA
ldrb r1, [r6, 0x9]
add r0, sp, 0x80
- bl sub_808EB48
+ bl GetAvailTacticsforLvl_Bool
movs r4, 0
add r7, sp, 0x74
add r5, sp, 0x80
@@ -958,7 +958,7 @@ _08072036:
beq _0807204C
add r0, sp, 0xC
ldrb r1, [r5, 0x9]
- bl sub_808EB48
+ bl GetAvailTacticsforLvl_Bool
_0807204C:
movs r0, 0x10
ldrsh r2, [r5, r0]
@@ -1045,7 +1045,7 @@ _080720E6:
add r4, sp, 0x18
ldrb r1, [r5, 0x9]
adds r0, r4, 0
- bl sub_808EB48
+ bl GetAvailTacticsforLvl_Bool
movs r6, 0
add r7, sp, 0xC
_080720FA:
@@ -3694,45 +3694,4 @@ _08073604: .4byte gUnknown_80FCF50
_08073608: .4byte 0x00000165
thumb_func_end sub_807348C
- thumb_func_start sub_807360C
-sub_807360C:
- push {r4,r5,lr}
- movs r5, 0
-_08073610:
- ldr r0, _08073650
- ldr r0, [r0]
- lsls r1, r5, 2
- ldr r2, _08073654
- adds r0, r2
- adds r0, r1
- ldr r4, [r0]
- adds r0, r4, 0
- bl EntityExists
- lsls r0, 24
- cmp r0, 0
- beq _08073644
- ldr r0, [r4, 0x70]
- movs r2, 0xA9
- lsls r2, 1
- adds r1, r0, r2
- ldrb r0, [r1]
- cmp r0, 0
- beq _08073644
- movs r0, 0
- strb r0, [r1]
- adds r0, r4, 0
- adds r1, r4, 0
- bl sub_8077274
-_08073644:
- adds r5, 0x1
- cmp r5, 0x13
- ble _08073610
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_08073650: .4byte gDungeonGlobalData
-_08073654: .4byte 0x000135cc
- thumb_func_end sub_807360C
-
.align 2, 0
diff --git a/asm/code_80739DC.s b/asm/code_80739DC.s
index 18efc16..cfee489 100644
--- a/asm/code_80739DC.s
+++ b/asm/code_80739DC.s
@@ -3697,7 +3697,7 @@ _08075770:
.4byte _0807580C
_08075788:
adds r0, r5, 0
- bl sub_8045104
+ bl GetTrapData
adds r7, r0, 0
movs r0, 0
mov r8, r0
@@ -3772,185 +3772,4 @@ _0807580C:
bx r0
thumb_func_end sub_8075708
- thumb_func_start sub_8075818
-sub_8075818:
- push {r4-r6,lr}
- adds r4, r0, 0
- ldr r6, [r4, 0x70]
- bl EntityExists
- lsls r0, 24
- cmp r0, 0
- beq _080758F6
- adds r0, r4, 0
- bl sub_8045128
- adds r5, r0, 0
- adds r0, r4, 0
- movs r1, 0xD
- bl HasIQSkill
- lsls r0, 24
- cmp r0, 0
- beq _08075848
- ldrh r1, [r5]
- movs r0, 0x3
- ands r0, r1
- cmp r0, 0
- beq _080758F2
-_08075848:
- ldr r4, [r5, 0x14]
- cmp r4, 0
- beq _080758F6
- adds r0, r4, 0
- bl GetEntityType
- cmp r0, 0x5
- bhi _080758F6
- lsls r0, 2
- ldr r1, _08075864
- adds r0, r1
- ldr r0, [r0]
- mov pc, r0
- .align 2, 0
-_08075864: .4byte _08075868
- .align 2, 0
-_08075868:
- .4byte _080758F6
- .4byte _080758F6
- .4byte _08075880
- .4byte _080758BE
- .4byte _080758F6
- .4byte _080758F6
-_08075880:
- adds r0, r4, 0
- bl sub_8045104
- movs r1, 0
- ldrb r0, [r0, 0x1]
- cmp r0, 0
- bne _080758A0
- adds r0, r4, 0
- adds r0, 0x20
- ldrb r0, [r0]
- cmp r0, 0
- beq _080758B8
- ldrb r0, [r6, 0x6]
- cmp r0, 0
- bne _080758B8
- b _080758F2
-_080758A0:
- cmp r0, 0x1
- bne _080758AC
- ldrb r0, [r6, 0x6]
- cmp r0, 0
- beq _080758B8
- b _080758F2
-_080758AC:
- cmp r0, 0x2
- bne _080758B8
- ldrb r0, [r6, 0x6]
- cmp r0, 0
- bne _080758B8
- movs r1, 0x1
-_080758B8:
- cmp r1, 0
- beq _080758F6
- b _080758F2
-_080758BE:
- ldrb r0, [r6, 0x7]
- cmp r0, 0
- bne _080758F6
- adds r0, r6, 0
- adds r0, 0x60
- ldrb r1, [r0]
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- bne _080758F6
- ldrh r1, [r5]
- movs r0, 0x3
- ands r0, r1
- cmp r0, 0
- bne _080758E2
- ldrb r0, [r6, 0x6]
- cmp r0, 0
- bne _080758F6
-_080758E2:
- adds r0, r4, 0
- bl GetItemData
- ldrb r1, [r0]
- movs r0, 0x2
- ands r0, r1
- cmp r0, 0
- bne _080758F6
-_080758F2:
- movs r0, 0x1
- b _080758F8
-_080758F6:
- movs r0, 0
-_080758F8:
- pop {r4-r6}
- pop {r1}
- bx r1
- thumb_func_end sub_8075818
-
- thumb_func_start sub_8075900
-sub_8075900:
- push {r4-r6,lr}
- adds r4, r0, 0
- lsls r1, 24
- lsrs r6, r1, 24
- bl EntityExists
- lsls r0, 24
- cmp r0, 0
- beq _0807597A
- ldr r0, [r4, 0x70]
- ldrb r0, [r0, 0x6]
- cmp r0, 0
- bne _0807597A
- bl sub_8044B28
- lsls r0, 24
- cmp r0, 0
- bne _0807597A
- ldr r5, _08075980
- ldr r0, [r5]
- ldr r1, _08075984
- adds r0, r1
- ldrb r0, [r0]
- cmp r0, 0
- bne _0807597A
- adds r0, r4, 0
- bl sub_8045128
- ldrh r1, [r0]
- movs r0, 0x40
- ands r0, r1
- cmp r0, 0
- beq _0807597A
- bl GetLeaderEntity
- ldr r1, _08075988
- ldr r1, [r1]
- bl SendMessage
- ldr r0, [r5]
- ldr r1, _0807598C
- adds r0, r1
- movs r1, 0x1
- strb r1, [r0]
- adds r0, r4, 0
- adds r1, r6, 0
- bl sub_807AB38
- movs r0, 0
- bl sub_8041888
- adds r0, r4, 0x4
- bl sub_803F428
- lsls r0, 24
- cmp r0, 0
- beq _0807597A
- movs r0, 0x78
- movs r1, 0x39
- bl sub_803E708
-_0807597A:
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_08075980: .4byte gDungeonGlobalData
-_08075984: .4byte 0x00000671
-_08075988: .4byte gUnknown_80FE308
-_0807598C: .4byte 0x00000672
- thumb_func_end sub_8075900
+ .align 2,0
diff --git a/asm/code_8075BA4.s b/asm/code_8075BA4.s
index 19928c2..dc265cb 100644
--- a/asm/code_8075BA4.s
+++ b/asm/code_8075BA4.s
@@ -5,48 +5,6 @@
.text
- thumb_func_start sub_8075BA4
-sub_8075BA4:
- push {r4,r5,lr}
- adds r5, r0, 0
- lsls r1, 24
- ldr r4, [r5, 0x70]
- cmp r1, 0
- beq _08075BD0
- adds r0, r4, 0
- adds r0, 0xBC
- ldrb r0, [r0]
- cmp r0, 0x4
- bne _08075BD0
- adds r0, r4, 0
- adds r0, 0x46
- ldrb r1, [r0]
- adds r1, 0x4
- movs r2, 0x7
- ands r1, r2
- strb r1, [r0]
- adds r0, r5, 0
- bl TargetTileInFront
- b _08075BEC
-_08075BD0:
- adds r0, r4, 0
- adds r0, 0xBC
- ldrb r0, [r0]
- cmp r0, 0x2
- bne _08075BEC
- movs r0, 0x8
- bl DungeonRandomCapped
- adds r1, r4, 0
- adds r1, 0x46
- strb r0, [r1]
- adds r0, r5, 0
- bl TargetTileInFront
-_08075BEC:
- pop {r4,r5}
- pop {r0}
- bx r0
- thumb_func_end sub_8075BA4
-
thumb_func_start sub_8075BF4
sub_8075BF4:
push {r4-r7,lr}
@@ -20350,10 +20308,10 @@ _0807FD12:
cmp r0, 0x2
bne _0807FD6E
ldr r0, [r6, 0x14]
- bl sub_8045104
+ bl GetTrapData
strb r5, [r0]
ldr r0, [r6, 0x14]
- bl sub_8045104
+ bl GetTrapData
mov r1, r8
strb r1, [r0, 0x1]
ldr r0, [r6, 0x14]
@@ -20566,7 +20524,7 @@ _0807FECE:
b _080801B4
_0807FED8:
mov r0, r10
- bl sub_8045104
+ bl GetTrapData
mov r8, r0
ldr r0, _0807FF58
mov r2, r8
@@ -22129,7 +22087,7 @@ sub_8080B00:
cmp r0, 0x2
bne _08080B26
adds r0, r4, 0
- bl sub_8045104
+ bl GetTrapData
strb r5, [r0]
_08080B26:
bl sub_8049ED4
@@ -22305,7 +22263,7 @@ _08080C6A:
cmp r0, 0x2
bne _08080CC8
adds r0, r5, 0
- bl sub_8045104
+ bl GetTrapData
adds r4, r0, 0
adds r0, r6, 0
adds r1, r4, 0
diff --git a/asm/code_80848F0.s b/asm/code_80848F0.s
index 8b1c811..189480c 100644
--- a/asm/code_80848F0.s
+++ b/asm/code_80848F0.s
@@ -798,251 +798,4 @@ _08085858: .4byte gAdjacentTileOffsets
_0808585C: .4byte 0x000135cc
thumb_func_end sub_80857B8
- thumb_func_start sub_8085860
-sub_8085860:
- push {r4,r5,lr}
- adds r4, r0, 0
- adds r5, r1, 0
- movs r0, 0
- bl sub_803F4A0
- lsls r0, r4, 1
- adds r0, r4
- lsls r0, 11
- movs r1, 0xC0
- lsls r1, 4
- adds r0, r1
- lsls r1, r5, 1
- adds r1, r5
- lsls r1, 11
- movs r2, 0x80
- lsls r2, 5
- adds r1, r2
- bl sub_803F878
- pop {r4,r5}
- pop {r0}
- bx r0
- thumb_func_end sub_8085860
-
- thumb_func_start sub_8085890
-sub_8085890:
- push {r4,r5,lr}
- adds r4, r0, 0
- adds r5, r1, 0
- movs r0, 0
- bl sub_803F4A0
- adds r0, r4, 0
- adds r1, r5, 0
- bl sub_803F878
- pop {r4,r5}
- pop {r0}
- bx r0
- thumb_func_end sub_8085890
-
- thumb_func_start sub_80858AC
-sub_80858AC:
- push {r4-r7,lr}
- mov r7, r9
- mov r6, r8
- push {r6,r7}
- adds r7, r0, 0
- adds r4, r1, 0
- bl sub_803F994
- adds r6, r0, 0
- bl sub_803F9B0
- adds r5, r0, 0
- ldr r0, [r7]
- subs r0, r6
- adds r1, r4, 0
- bl __divsi3
- mov r9, r0
- ldr r0, [r7, 0x4]
- subs r0, r5
- adds r1, r4, 0
- bl __divsi3
- mov r8, r0
- movs r0, 0
- bl sub_803F4A0
- cmp r4, 0
- ble _080858FE
-_080858E6:
- add r6, r9
- add r5, r8
- adds r0, r6, 0
- adds r1, r5, 0
- bl sub_803F878
- movs r0, 0x46
- bl sub_803E46C
- subs r4, 0x1
- cmp r4, 0
- bne _080858E6
-_080858FE:
- ldr r0, [r7]
- ldr r1, [r7, 0x4]
- bl sub_803F878
- movs r0, 0x46
- bl sub_803E46C
- pop {r3,r4}
- mov r8, r3
- mov r9, r4
- pop {r4-r7}
- pop {r0}
- bx r0
- thumb_func_end sub_80858AC
-
- thumb_func_start SetFacingDirection
-SetFacingDirection:
- push {r4,lr}
- ldr r3, [r0, 0x70]
- movs r4, 0x7
- adds r2, r1, 0
- ands r2, r4
- adds r3, 0x46
- strb r2, [r3]
- bl sub_806CE68
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end SetFacingDirection
-
- thumb_func_start sub_8085930
-sub_8085930:
- push {r4-r7,lr}
- adds r6, r0, 0
- movs r5, 0
- movs r0, 0x7
- adds r7, r6, 0
- ands r7, r0
-_0808593C:
- ldr r0, _0808596C
- ldr r0, [r0]
- lsls r1, r5, 2
- ldr r2, _08085970
- adds r0, r2
- adds r0, r1
- ldr r4, [r0]
- adds r0, r4, 0
- bl EntityExists
- lsls r0, 24
- cmp r0, 0
- beq _08085982
- cmp r6, 0x7
- ble _08085974
- movs r0, 0x8
- bl RandomCapped
- adds r1, r0, 0
- adds r0, r4, 0
- bl sub_806CE68
- b _08085982
- .align 2, 0
-_0808596C: .4byte gDungeonGlobalData
-_08085970: .4byte 0x0001357c
-_08085974:
- ldr r0, [r4, 0x70]
- adds r0, 0x46
- strb r7, [r0]
- adds r0, r4, 0
- adds r1, r6, 0
- bl sub_806CE68
-_08085982:
- adds r5, 0x1
- cmp r5, 0x3
- ble _0808593C
- movs r5, 0
- movs r0, 0x7
- adds r7, r6, 0
- ands r7, r0
-_08085990:
- ldr r0, _080859CC
- ldr r0, [r0]
- lsls r1, r5, 2
- ldr r2, _080859D0
- adds r0, r2
- adds r0, r1
- ldr r4, [r0]
- adds r0, r4, 0
- bl EntityExists
- lsls r0, 24
- cmp r0, 0
- beq _080859E2
- ldr r1, [r4, 0x70]
- adds r0, r1, 0
- adds r0, 0xA4
- ldrb r0, [r0]
- cmp r0, 0x2
- bne _080859E2
- cmp r6, 0x7
- ble _080859D4
- movs r0, 0x8
- bl RandomCapped
- adds r1, r0, 0
- adds r0, r4, 0
- bl sub_806CE68
- b _080859E2
- .align 2, 0
-_080859CC: .4byte gDungeonGlobalData
-_080859D0: .4byte 0x0001358c
-_080859D4:
- adds r0, r1, 0
- adds r0, 0x46
- strb r7, [r0]
- adds r0, r4, 0
- adds r1, r6, 0
- bl sub_806CE68
-_080859E2:
- adds r5, 0x1
- cmp r5, 0xF
- ble _08085990
- pop {r4-r7}
- pop {r0}
- bx r0
- thumb_func_end sub_8085930
-
- thumb_func_start sub_80859F0
-sub_80859F0:
- push {r4-r7,lr}
- adds r6, r0, 0
- movs r5, 0
- movs r0, 0x7
- adds r7, r6, 0
- ands r7, r0
-_080859FC:
- ldr r0, _08085A2C
- ldr r0, [r0]
- lsls r1, r5, 2
- ldr r2, _08085A30
- adds r0, r2
- adds r0, r1
- ldr r4, [r0]
- adds r0, r4, 0
- bl EntityExists
- lsls r0, 24
- cmp r0, 0
- beq _08085A42
- cmp r6, 0x7
- ble _08085A34
- movs r0, 0x8
- bl RandomCapped
- adds r1, r0, 0
- adds r0, r4, 0
- bl sub_806CE68
- b _08085A42
- .align 2, 0
-_08085A2C: .4byte gDungeonGlobalData
-_08085A30: .4byte 0x0001358c
-_08085A34:
- ldr r0, [r4, 0x70]
- adds r0, 0x46
- strb r7, [r0]
- adds r0, r4, 0
- adds r1, r6, 0
- bl sub_806CE68
-_08085A42:
- adds r5, 0x1
- cmp r5, 0xF
- ble _080859FC
- pop {r4-r7}
- pop {r0}
- bx r0
- thumb_func_end sub_80859F0
-
.align 2, 0
diff --git a/asm/code_8086A3C.s b/asm/code_8086A3C.s
index ae72ef7..d0cd7dc 100644
--- a/asm/code_8086A3C.s
+++ b/asm/code_8086A3C.s
@@ -68,12 +68,12 @@ TeamMeaniesPreFightDialogue:
movs r1, 0x46
bl sub_803E708
ldr r0, _08087048
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
ldr r0, _0808704C
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -81,27 +81,27 @@ TeamMeaniesPreFightDialogue:
movs r0, 0xA
bl sub_8083E88
ldr r0, _08087050
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
ldr r0, _08087054
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
ldr r0, _08087058
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
ldr r0, _0808705C
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
ldr r0, _08087060
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -131,12 +131,12 @@ TeamMeaniesReFightDialogue:
adds r5, r0, 0
bl sub_8086448
ldr r0, _08087118
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
ldr r0, _0808711C
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -145,12 +145,12 @@ TeamMeaniesReFightDialogue:
movs r1, 0x46
bl sub_803E708
ldr r0, _08087120
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
ldr r0, _08087124
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -177,9 +177,9 @@ TeamMeaniesReFightDialogue:
movs r1, 0x46
bl sub_803E708
ldr r0, _08087128
- bl sub_8052910
+ bl DisplayDungeonDialogue
ldr r0, _0808712C
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -493,7 +493,7 @@ ZapdosPreFightDialogue:
movs r3, 0x6
bl sub_80869E4
ldr r0, _08087470
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -508,7 +508,7 @@ ZapdosPreFightDialogue:
movs r3, 0x4
bl sub_80869E4
ldr r0, _08087474
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -519,7 +519,7 @@ ZapdosPreFightDialogue:
lsls r0, 1
bl PlaySoundEffect
ldr r0, _08087478
- bl sub_8052910
+ bl DisplayDungeonDialogue
ldr r0, [sp, 0x68]
bl sub_8087704
movs r0, 0x9
@@ -529,7 +529,7 @@ ZapdosPreFightDialogue:
movs r2, 0x4
bl sub_806CDD4
ldr r0, _0808747C
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -599,12 +599,12 @@ _0808748E:
movs r3, 0x4
bl sub_80869E4
ldr r0, _08087518
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0x3C
movs r1, 0x46
bl sub_803E708
ldr r0, _0808751C
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -655,28 +655,28 @@ _0808752A:
movs r3, 0x3
bl sub_80869E4
ldr r0, _080875B0
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
movs r0, 0x3
bl sub_808775C
ldr r0, _080875B4
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
movs r0, 0x1
bl sub_808775C
ldr r0, _080875B8
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
movs r0, 0x2
bl sub_808775C
ldr r0, _080875BC
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
diff --git a/asm/code_80958E8.s b/asm/code_80958E8.s
index dfcbae4..b8d3c7a 100644
--- a/asm/code_80958E8.s
+++ b/asm/code_80958E8.s
@@ -602,7 +602,7 @@ sub_8095F8C:
_08095F92:
lsls r0, r4, 24
lsrs r0, 24
- bl CheckMailSlot
+ bl IsMailSlotEmpty
lsls r0, 24
cmp r0, 0
bne _08095FA2
@@ -666,8 +666,8 @@ sub_8095FE8:
_08095FFC: .4byte gUnknown_203B490
thumb_func_end sub_8095FE8
- thumb_func_start CheckMailSlot
-CheckMailSlot:
+ thumb_func_start IsMailSlotEmpty
+IsMailSlotEmpty:
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -689,7 +689,7 @@ _08096020:
_08096022:
pop {r1}
bx r1
- thumb_func_end CheckMailSlot
+ thumb_func_end IsMailSlotEmpty
thumb_func_start sub_8096028
sub_8096028:
@@ -1994,7 +1994,7 @@ GetNumAcceptedJobs:
_080969B2:
lsls r0, r4, 24
lsrs r0, 24
- bl CheckJobSlot
+ bl IsJobSlotEmpty
lsls r0, 24
cmp r0, 0
bne _080969C2
@@ -2155,8 +2155,8 @@ sub_8096AB4:
_08096AC8: .4byte gUnknown_203B490
thumb_func_end sub_8096AB4
- thumb_func_start CheckJobSlot
-CheckJobSlot:
+ thumb_func_start IsJobSlotEmpty
+IsJobSlotEmpty:
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2179,7 +2179,7 @@ _08096AF0:
_08096AF2:
pop {r1}
bx r1
- thumb_func_end CheckJobSlot
+ thumb_func_end IsJobSlotEmpty
thumb_func_start sub_8096AF8
sub_8096AF8:
diff --git a/asm/jirachi_wish.s b/asm/jirachi_wish.s
index cc21bd0..f641862 100644
--- a/asm/jirachi_wish.s
+++ b/asm/jirachi_wish.s
@@ -55,7 +55,7 @@ JirachiWish:
movs r1, 0x46
bl sub_803E708
ldr r0, _0808B844
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -67,7 +67,7 @@ JirachiWish:
adds r0, r6, 0
bl sub_80862BC
ldr r0, _0808B84C
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0x79
bl sub_8083E88
movs r0, 0xA
@@ -80,14 +80,14 @@ JirachiWish:
lsls r0, 1
bl PlaySoundEffect
ldr r0, _0808B850
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
adds r0, r6, 0
bl SpriteLookAroundEffect
ldr r0, _0808B854
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -109,7 +109,7 @@ _0808B692:
cmp r2, 0x1
bne _0808B754
ldr r0, _0808B864
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -187,7 +187,7 @@ _0808B754:
cmp r0, 0x2
bne _0808B80A
ldr r0, _0808B874
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -276,7 +276,7 @@ _0808B80A:
cmp r4, 0x3A
bne _0808B87C
ldr r0, _0808B878
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -304,7 +304,7 @@ _0808B874: .4byte gUnknown_8105974
_0808B878: .4byte gUnknown_8105A08
_0808B87C:
ldr r0, _0808BA30
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -316,7 +316,7 @@ _0808B87C:
movs r0, 0
strb r0, [r1]
ldr r0, _0808BA38
- bl sub_8052910
+ bl DisplayDungeonDialogue
adds r0, r4, 0
bl UnlockFriendArea
movs r0, 0xD4
@@ -331,13 +331,13 @@ _0808B87C:
movs r2, 0
bl sub_8092578
ldr r0, _0808BA44
- bl sub_8052910
+ bl DisplayDungeonDialogue
_0808B8CA:
mov r0, r9
cmp r0, 0x4
bne _0808B98E
ldr r0, _0808BA48
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -417,7 +417,7 @@ _0808B970:
movs r0, 0
strb r0, [r1]
ldr r0, _0808BA58
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -426,7 +426,7 @@ _0808B98E:
cmp r0, 0x5
bne _0808B9F8
ldr r0, _0808BA5C
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -438,7 +438,7 @@ _0808B98E:
movs r0, 0
strb r0, [r1]
ldr r0, _0808BA60
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -454,7 +454,7 @@ _0808B98E:
movs r1, 0x46
bl sub_803E708
ldr r0, _0808BA64
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
@@ -466,14 +466,14 @@ _0808B98E:
strb r1, [r0]
_0808B9F8:
ldr r0, _0808BA70
- bl sub_8052910
+ bl DisplayDungeonDialogue
adds r0, r6, 0
bl sub_808BC20
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
ldr r0, _0808BA74
- bl sub_8052910
+ bl DisplayDungeonDialogue
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
diff --git a/asm/memory_1.s b/asm/memory_1.s
index f289567..97833ca 100644
--- a/asm/memory_1.s
+++ b/asm/memory_1.s
@@ -5,51 +5,6 @@
.text
- thumb_func_start MemoryLocate_LocalCreate
-MemoryLocate_LocalCreate:
- push {r4-r7,lr}
- sub sp, 0xC
- adds r4, r0, 0
- adds r5, r1, 0
- adds r7, r2, 0
- adds r6, r3, 0
- cmp r4, 0
- bne _08003412
- ldr r4, =gMainHeapDescriptor
-_08003412:
- adds r0, r4, 0
- movs r1, 0x9
- adds r2, r5, 0
- bl MemorySearchFromBack
- adds r1, r0, 0
- cmp r1, 0
- bge _08003438
- ldr r0, =gUnknown_80B7F88
- ldr r1, =gLocalCreateErrorMessage
- adds r2, r5, 0
- bl FatalError
- .align 2, 0
- .pool
-_08003438:
- str r6, [sp]
- adds r0, r4, 0
- movs r2, 0x9
- adds r3, r5, 0
- bl _LocateSetBack
- ldr r1, [r0, 0xC]
- str r1, [sp, 0x4]
- ldr r0, [r0, 0x10]
- str r0, [sp, 0x8]
- add r0, sp, 0x4
- adds r1, r7, 0
- bl DoCreateSubHeap
- str r4, [r0, 0x4]
- add sp, 0xC
- pop {r4-r7}
- pop {r1}
- bx r1
- thumb_func_end MemoryLocate_LocalCreate
-
thumb_func_start DoCreateSubHeap
DoCreateSubHeap:
push {r4,lr}
diff --git a/asm/rescue_password_menu.s b/asm/rescue_password_menu.s
index 88fcd49..44675db 100644
--- a/asm/rescue_password_menu.s
+++ b/asm/rescue_password_menu.s
@@ -721,7 +721,7 @@ sub_8039068:
adds r0, r5, 0
adds r0, 0x22
ldrb r0, [r0]
- bl sub_8092040
+ bl IsInvalidItemReward
lsls r0, 24
cmp r0, 0
beq _080390B4
diff --git a/asm/wonder_mail_2.s b/asm/wonder_mail_2.s
index d8428b8..dd6f99f 100644
--- a/asm/wonder_mail_2.s
+++ b/asm/wonder_mail_2.s
@@ -5,319 +5,6 @@
.text
- thumb_func_start sub_802BCC4
-sub_802BCC4:
- push {r4,lr}
- ldr r4, _0802BCDC
- ldr r0, [r4]
- ldrb r0, [r0, 0x4]
- bl GetPokemonMailText
- adds r3, r0, 0
- ldr r1, [r4]
- movs r0, 0
- str r0, [r1, 0xC]
- str r3, [r1, 0x10]
- b _0802BD08
- .align 2, 0
-_0802BCDC: .4byte gUnknown_203B2D4
-_0802BCE0:
- cmp r0, 0x23
- bne _0802BD06
- ldrb r2, [r3, 0x1]
- cmp r2, 0x50
- beq _0802BCF0
- adds r1, r3, 0x2
- cmp r2, 0x70
- bne _0802BD02
-_0802BCF0:
- ldr r0, [r4]
- ldr r1, [r0, 0xC]
- adds r1, 0x1
- str r1, [r0, 0xC]
- lsls r1, 2
- adds r0, 0x10
- adds r0, r1
- adds r1, r3, 0x2
- str r1, [r0]
-_0802BD02:
- adds r3, r1, 0
- b _0802BD08
-_0802BD06:
- adds r3, 0x1
-_0802BD08:
- ldrb r0, [r3]
- cmp r0, 0
- bne _0802BCE0
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_802BCC4
-
- thumb_func_start sub_802BD14
-sub_802BD14:
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- adds r6, r0, 0
- adds r4, r1, 0
- mov r8, r2
- bl HasNoMailinMailbox
- lsls r0, 24
- cmp r0, 0
- beq _0802BD2E
- movs r0, 0
- b _0802BDD4
-_0802BD2E:
- ldr r5, _0802BDE0
- ldr r0, [r5]
- cmp r0, 0
- bne _0802BD40
- movs r0, 0xA4
- movs r1, 0x8
- bl MemoryAlloc
- str r0, [r5]
-_0802BD40:
- ldr r0, [r5]
- str r6, [r0, 0x38]
- lsls r1, r6, 1
- adds r1, r6
- lsls r1, 3
- adds r1, 0x40
- adds r1, r0, r1
- str r1, [r0, 0x3C]
- adds r0, 0x40
- bl sub_8006518
- ldr r1, [r5]
- ldr r2, [r1, 0x38]
- lsls r0, r2, 1
- adds r0, r2
- lsls r0, 3
- adds r1, r0
- adds r1, 0x40
- ldr r0, _0802BDE4
- ldm r0!, {r2,r3,r7}
- stm r1!, {r2,r3,r7}
- ldm r0!, {r2,r3,r7}
- stm r1!, {r2,r3,r7}
- ldr r2, [r5]
- ldr r1, [r2, 0x3C]
- adds r0, r2, 0
- adds r0, 0xA0
- str r0, [r1, 0x14]
- cmp r4, 0
- beq _0802BD8E
- ldr r1, [r2, 0x38]
- lsls r0, r1, 1
- adds r0, r1
- lsls r0, 3
- adds r1, r2, 0
- adds r1, 0x48
- adds r1, r0
- ldr r0, [r4]
- str r0, [r1]
-_0802BD8E:
- ldr r0, [r5]
- ldr r0, [r0, 0x3C]
- mov r1, r8
- bl sub_8012D34
- bl ResetUnusedInputStruct
- ldr r0, [r5]
- adds r0, 0x40
- movs r1, 0x1
- movs r2, 0x1
- bl sub_800641C
- ldr r4, [r5]
- adds r4, 0x4
- bl sub_802C0B8
- adds r1, r0, 0
- adds r0, r4, 0
- mov r2, r8
- adds r3, r6, 0
- bl sub_8013848
- ldr r0, [r5]
- ldr r1, _0802BDE8
- ldrh r1, [r1]
- strh r1, [r0, 0x1C]
- adds r0, 0x4
- bl sub_8013984
- bl sub_802BF30
- bl CreateMailMenu
- movs r0, 0x1
-_0802BDD4:
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r1}
- bx r1
- .align 2, 0
-_0802BDE0: .4byte gUnknown_203B2D8
-_0802BDE4: .4byte gUnknown_80DFC74
-_0802BDE8: .4byte gUnknown_203B2DC
- thumb_func_end sub_802BD14
-
- thumb_func_start sub_802BDEC
-sub_802BDEC:
- push {lr}
- lsls r0, 24
- cmp r0, 0
- bne _0802BE08
- ldr r0, _0802BE04
- ldr r0, [r0]
- adds r0, 0x4
- bl sub_8013660
- movs r0, 0
- b _0802BE6E
- .align 2, 0
-_0802BE04: .4byte gUnknown_203B2D8
-_0802BE08:
- ldr r0, _0802BE20
- ldr r0, [r0]
- adds r0, 0x4
- bl GetKeyPress
- cmp r0, 0x2
- beq _0802BE2A
- cmp r0, 0x2
- bgt _0802BE24
- cmp r0, 0x1
- beq _0802BE34
- b _0802BE48
- .align 2, 0
-_0802BE20: .4byte gUnknown_203B2D8
-_0802BE24:
- cmp r0, 0x4
- beq _0802BE3E
- b _0802BE48
-_0802BE2A:
- movs r0, 0x1
- bl PlayMenuSoundEffect
- movs r0, 0x2
- b _0802BE6E
-_0802BE34:
- movs r0, 0
- bl PlayMenuSoundEffect
- movs r0, 0x3
- b _0802BE6E
-_0802BE3E:
- movs r0, 0x4
- bl PlayMenuSoundEffect
- movs r0, 0x4
- b _0802BE6E
-_0802BE48:
- ldr r0, _0802BE60
- ldr r0, [r0]
- adds r0, 0x4
- movs r1, 0x1
- bl sub_80138B8
- lsls r0, 24
- cmp r0, 0
- bne _0802BE64
- movs r0, 0
- b _0802BE6E
- .align 2, 0
-_0802BE60: .4byte gUnknown_203B2D8
-_0802BE64:
- bl sub_802BF30
- bl CreateMailMenu
- movs r0, 0x1
-_0802BE6E:
- pop {r1}
- bx r1
- thumb_func_end sub_802BDEC
-
- thumb_func_start sub_802BE74
-sub_802BE74:
- ldr r0, _0802BE90
- ldr r1, [r0]
- movs r0, 0x22
- ldrsh r2, [r1, r0]
- movs r3, 0x20
- ldrsh r0, [r1, r3]
- muls r0, r2
- movs r3, 0x1C
- ldrsh r2, [r1, r3]
- adds r0, r2
- adds r1, r0
- ldrb r0, [r1]
- bx lr
- .align 2, 0
-_0802BE90: .4byte gUnknown_203B2D8
- thumb_func_end sub_802BE74
-
- thumb_func_start sub_802BE94
-sub_802BE94:
- push {r4,r5,lr}
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- bl ResetUnusedInputStruct
- ldr r5, _0802BED8
- ldr r0, [r5]
- adds r0, 0x40
- movs r1, 0
- movs r2, 0
- bl sub_800641C
- bl sub_802C0B8
- adds r1, r0, 0
- ldr r0, [r5]
- strh r1, [r0, 0x26]
- adds r0, 0x4
- bl sub_8013984
- bl sub_802BF30
- bl CreateMailMenu
- cmp r4, 0
- beq _0802BED2
- ldr r0, [r5]
- adds r0, 0x4
- bl AddMenuCursorSprite
-_0802BED2:
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_0802BED8: .4byte gUnknown_203B2D8
- thumb_func_end sub_802BE94
-
- thumb_func_start sub_802BEDC
-sub_802BEDC:
- push {r4,r5,lr}
- ldr r4, _0802BF24
- ldr r2, [r4]
- cmp r2, 0
- beq _0802BF1C
- ldr r1, _0802BF28
- ldrh r0, [r2, 0x1C]
- strh r0, [r1]
- ldr r0, [r2, 0x38]
- lsls r1, r0, 1
- adds r1, r0
- lsls r1, 3
- adds r1, r2, r1
- adds r1, 0x40
- ldr r0, _0802BF2C
- ldm r0!, {r2,r3,r5}
- stm r1!, {r2,r3,r5}
- ldm r0!, {r2,r3,r5}
- stm r1!, {r2,r3,r5}
- bl ResetUnusedInputStruct
- ldr r0, [r4]
- adds r0, 0x40
- movs r1, 0x1
- movs r2, 0x1
- bl sub_800641C
- ldr r0, [r4]
- bl MemoryFree
- movs r0, 0
- str r0, [r4]
-_0802BF1C:
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_0802BF24: .4byte gUnknown_203B2D8
-_0802BF28: .4byte gUnknown_203B2DC
-_0802BF2C: .4byte gUnknown_80DFC5C
- thumb_func_end sub_802BEDC
-
thumb_func_start sub_802BF30
sub_802BF30:
push {r4,lr}
@@ -505,15 +192,15 @@ _0802C09A:
_0802C0B4: .4byte gUnknown_203B2D8
thumb_func_end CreateMailMenu
- thumb_func_start sub_802C0B8
-sub_802C0B8:
+ thumb_func_start CountEmptyMailSlots
+CountEmptyMailSlots:
push {r4,r5,lr}
movs r5, 0
movs r4, 0
_0802C0BE:
lsls r0, r4, 24
lsrs r0, 24
- bl CheckMailSlot
+ bl IsMailSlotEmpty
lsls r0, 24
cmp r0, 0
bne _0802C0D6
@@ -532,7 +219,7 @@ _0802C0D6:
bx r1
.align 2, 0
_0802C0E4: .4byte gUnknown_203B2D8
- thumb_func_end sub_802C0B8
+ thumb_func_end CountEmptyMailSlots
thumb_func_start HasNoMailinMailbox
HasNoMailinMailbox:
@@ -541,7 +228,7 @@ HasNoMailinMailbox:
_0802C0EC:
lsls r0, r4, 24
lsrs r0, 24
- bl CheckMailSlot
+ bl IsMailSlotEmpty
lsls r0, 24
cmp r0, 0
bne _0802C0FE
@@ -1452,7 +1139,7 @@ sub_802C80C:
_0802C812:
lsls r0, r4, 24
lsrs r0, 24
- bl CheckJobSlot
+ bl IsJobSlotEmpty
lsls r0, 24
cmp r0, 0
bne _0802C82A
@@ -1480,7 +1167,7 @@ HasNoAcceptedJobs:
_0802C840:
lsls r0, r4, 24
lsrs r0, 24
- bl CheckJobSlot
+ bl IsJobSlotEmpty
lsls r0, 24
cmp r0, 0
bne _0802C852
diff --git a/asm/wonder_mail_3.s b/asm/wonder_mail_3.s
index cd6126f..2423107 100644
--- a/asm/wonder_mail_3.s
+++ b/asm/wonder_mail_3.s
@@ -733,584 +733,4 @@ _0802DB1C:
_0802DB24: .4byte gUnknown_203B490
thumb_func_end sub_802DADC
- thumb_func_start sub_802DB28
-sub_802DB28:
- push {r4-r6,lr}
- sub sp, 0x8
- adds r2, r1, 0
- lsls r0, 24
- lsrs r6, r0, 24
- lsls r2, 24
- lsrs r2, 24
- mov r0, sp
- adds r1, r6, 0
- bl sub_8096AF8
- mov r0, sp
- ldrb r0, [r0]
- cmp r0, 0
- bne _0802DB4A
- movs r0, 0
- b _0802DBC6
-_0802DB4A:
- bl ResetUnusedInputStruct
- movs r0, 0
- movs r1, 0x1
- movs r2, 0x1
- bl sub_800641C
- ldr r4, _0802DBD0
- movs r0, 0xA8
- movs r1, 0x8
- bl MemoryAlloc
- str r0, [r4]
- adds r0, 0x30
- movs r5, 0
- strb r6, [r0]
- adds r0, r6, 0
- bl sub_8096AB4
- ldr r1, [r4]
- str r0, [r1, 0x34]
- bl sub_8096EEC
- ldr r1, [r4]
- ldr r0, [r1, 0x34]
- adds r1, 0x8
- bl sub_803C21C
- ldr r0, [r4]
- ldr r0, [r0, 0x34]
- movs r1, 0xC
- ldrsh r0, [r0, r1]
- bl GetDialogueSpriteDataPtr
- ldr r1, [r4]
- str r0, [r1, 0x38]
- str r5, [r1, 0x3C]
- adds r1, 0x44
- strb r5, [r1]
- ldr r0, [r4]
- adds r0, 0x45
- strb r5, [r0]
- ldr r0, [r4]
- adds r0, 0x46
- strb r5, [r0]
- ldr r2, [r4]
- adds r1, r2, 0
- adds r1, 0x40
- movs r0, 0x2
- strh r0, [r1]
- adds r1, 0x2
- movs r0, 0x8
- strh r0, [r1]
- ldr r0, [r2, 0x38]
- cmp r0, 0
- beq _0802DBBE
- ldr r0, [r0, 0x4]
- str r0, [r2, 0x3C]
-_0802DBBE:
- movs r0, 0
- bl sub_802DC28
- movs r0, 0x1
-_0802DBC6:
- add sp, 0x8
- pop {r4-r6}
- pop {r1}
- bx r1
- .align 2, 0
-_0802DBD0: .4byte gUnknown_203B2FC
- thumb_func_end sub_802DB28
-
- thumb_func_start sub_802DBD4
-sub_802DBD4:
- push {lr}
- ldr r0, _0802DBEC
- ldr r0, [r0]
- ldr r1, [r0]
- cmp r1, 0x6
- beq _0802DBF0
- cmp r1, 0x7
- bne _0802DBF6
- ldr r0, [r0, 0x34]
- strb r1, [r0]
- movs r0, 0x3
- b _0802DBFC
- .align 2, 0
-_0802DBEC: .4byte gUnknown_203B2FC
-_0802DBF0:
- bl sub_802DE44
- b _0802DBFA
-_0802DBF6:
- bl sub_802DE60
-_0802DBFA:
- movs r0, 0
-_0802DBFC:
- pop {r1}
- bx r1
- thumb_func_end sub_802DBD4
-
- thumb_func_start sub_802DC00
-sub_802DC00:
- push {r4,lr}
- ldr r4, _0802DC24
- ldr r0, [r4]
- cmp r0, 0
- beq _0802DC1E
- ldr r0, [r0, 0x38]
- cmp r0, 0
- beq _0802DC14
- bl CloseFile
-_0802DC14:
- ldr r0, [r4]
- bl MemoryFree
- movs r0, 0
- str r0, [r4]
-_0802DC1E:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_0802DC24: .4byte gUnknown_203B2FC
- thumb_func_end sub_802DC00
-
- thumb_func_start sub_802DC28
-sub_802DC28:
- push {lr}
- ldr r1, _0802DC3C
- ldr r1, [r1]
- str r0, [r1]
- bl sub_802DC40
- bl sub_802DC9C
- pop {r0}
- bx r0
- .align 2, 0
-_0802DC3C: .4byte gUnknown_203B2FC
- thumb_func_end sub_802DC28
-
- thumb_func_start sub_802DC40
-sub_802DC40:
- push {r4-r7,lr}
- ldr r4, _0802DC94
- ldr r0, [r4]
- adds r0, 0x48
- bl sub_8006518
- ldr r0, [r4]
- ldr r0, [r0]
- cmp r0, 0
- beq _0802DC58
- cmp r0, 0x7
- bne _0802DC7A
-_0802DC58:
- mov r12, r4
- ldr r4, _0802DC98
- movs r3, 0
- movs r2, 0x3
-_0802DC60:
- mov r0, r12
- ldr r1, [r0]
- adds r1, r3
- adds r1, 0x48
- adds r0, r4, 0
- ldm r0!, {r5-r7}
- stm r1!, {r5-r7}
- ldm r0!, {r5-r7}
- stm r1!, {r5-r7}
- adds r3, 0x18
- subs r2, 0x1
- cmp r2, 0
- bge _0802DC60
-_0802DC7A:
- bl ResetUnusedInputStruct
- ldr r0, _0802DC94
- ldr r0, [r0]
- adds r0, 0x48
- movs r1, 0x1
- movs r2, 0x1
- bl sub_800641C
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_0802DC94: .4byte gUnknown_203B2FC
-_0802DC98: .4byte gUnknown_80E016C
- thumb_func_end sub_802DC40
-
- thumb_func_start sub_802DC9C
-sub_802DC9C:
- push {r4,r5,lr}
- ldr r1, _0802DCB8
- ldr r0, [r1]
- ldr r0, [r0]
- adds r5, r1, 0
- cmp r0, 0x7
- bls _0802DCAC
- b _0802DE3E
-_0802DCAC:
- lsls r0, 2
- ldr r1, _0802DCBC
- adds r0, r1
- ldr r0, [r0]
- mov pc, r0
- .align 2, 0
-_0802DCB8: .4byte gUnknown_203B2FC
-_0802DCBC: .4byte _0802DCC0
- .align 2, 0
-_0802DCC0:
- .4byte _0802DCE0
- .4byte _0802DDDC
- .4byte _0802DDE4
- .4byte _0802DDEC
- .4byte _0802DDFC
- .4byte _0802DDF4
- .4byte _0802DE34
- .4byte _0802DE3E
-_0802DCE0:
- ldr r0, _0802DD60
- ldr r1, [r5]
- ldr r1, [r1, 0x34]
- movs r2, 0xC
- ldrsh r1, [r1, r2]
- bl CopyYellowSpeciesNametoBuffer
- ldr r4, _0802DD64
- ldr r0, [r5]
- ldr r0, [r0, 0x34]
- movs r2, 0xC
- ldrsh r1, [r0, r2]
- adds r0, r4, 0
- bl CopyYellowSpeciesNametoBuffer
- ldr r0, [r5]
- ldr r0, [r0, 0x34]
- movs r1, 0xC
- ldrsh r0, [r0, r1]
- bl GetMonSpecies
- adds r1, r0, 0
- ldr r2, _0802DD68
- adds r0, r4, r2
- bl strcpy
- ldr r0, [r5]
- ldr r0, [r0, 0x34]
- movs r1, 0xE
- ldrsh r0, [r0, r1]
- bl GetMonSpecies
- adds r1, r0, 0
- ldr r2, _0802DD6C
- adds r4, r2
- adds r0, r4, 0
- bl strcpy
- ldr r0, [r5]
- ldr r0, [r0, 0x34]
- movs r1, 0xC
- ldrsh r0, [r0, r1]
- bl UnlockExclusivePokemon
- ldr r0, _0802DD70
- ldr r1, [r5]
- ldr r1, [r1, 0x34]
- ldrb r1, [r1, 0x10]
- movs r2, 0
- bl sub_8090DC4
- ldr r1, [r5]
- movs r0, 0x6
- str r0, [r1, 0x4]
- ldr r0, [r1, 0x34]
- ldrb r0, [r0, 0x1]
- cmp r0, 0x4
- bhi _0802DDD4
- lsls r0, 2
- ldr r1, _0802DD74
- adds r0, r1
- ldr r0, [r0]
- mov pc, r0
- .align 2, 0
-_0802DD60: .4byte gUnknown_202E5D8
-_0802DD64: .4byte gUnknown_202E1C8
-_0802DD68: .4byte 0xfffffdd0
-_0802DD6C: .4byte 0xfffffe20
-_0802DD70: .4byte gUnknown_202DE58
-_0802DD74: .4byte _0802DD78
- .align 2, 0
-_0802DD78:
- .4byte _0802DDD4
- .4byte _0802DD9C
- .4byte _0802DDB8
- .4byte _0802DD94
- .4byte _0802DD8C
-_0802DD8C:
- movs r0, 0x5
- bl sub_802DC28
- b _0802DE3E
-_0802DD94:
- movs r0, 0x4
- bl sub_802DC28
- b _0802DE3E
-_0802DD9C:
- movs r0, 0x2
- bl sub_802DC28
- ldr r0, _0802DDB4
- ldr r0, [r0]
- ldr r0, [r0, 0x34]
- movs r2, 0xE
- ldrsh r0, [r0, r2]
- bl UnlockExclusivePokemon
- b _0802DE3E
- .align 2, 0
-_0802DDB4: .4byte gUnknown_203B2FC
-_0802DDB8:
- movs r0, 0x3
- bl sub_802DC28
- ldr r0, _0802DDD0
- ldr r0, [r0]
- ldr r0, [r0, 0x34]
- movs r1, 0xE
- ldrsh r0, [r0, r1]
- bl UnlockExclusivePokemon
- b _0802DE3E
- .align 2, 0
-_0802DDD0: .4byte gUnknown_203B2FC
-_0802DDD4:
- movs r0, 0x1
- bl sub_802DC28
- b _0802DE3E
-_0802DDDC:
- ldr r0, _0802DDE0
- b _0802DE1C
- .align 2, 0
-_0802DDE0: .4byte gWonderMailClientThanksForRescuingMe
-_0802DDE4:
- ldr r0, _0802DDE8
- b _0802DE1C
- .align 2, 0
-_0802DDE8: .4byte gWonderMailClientThanksForRescuingThem
-_0802DDEC:
- ldr r0, _0802DDF0
- b _0802DE1C
- .align 2, 0
-_0802DDF0: .4byte gWonderMailClientEscorted
-_0802DDF4:
- ldr r0, _0802DDF8
- b _0802DE1C
- .align 2, 0
-_0802DDF8: .4byte gWonderMailClientItemDelivered1
-_0802DDFC:
- ldr r0, [r5]
- ldr r0, [r0, 0x34]
- ldrb r0, [r0, 0x10]
- bl FindItemInInventory
- adds r1, r0, 0
- movs r0, 0x1
- negs r0, r0
- cmp r1, r0
- beq _0802DE1A
- adds r0, r1, 0
- bl ShiftItemsDownFrom
- bl FillInventoryGaps
-_0802DE1A:
- ldr r0, _0802DE2C
-_0802DE1C:
- ldr r2, [r5]
- adds r2, 0x38
- ldr r3, _0802DE30
- movs r1, 0
- bl sub_80141B4
- b _0802DE3E
- .align 2, 0
-_0802DE2C: .4byte gWonderMailClientItemDelivered2
-_0802DE30: .4byte 0x0000010d
-_0802DE34:
- ldr r0, [r5]
- adds r0, 0x8
- movs r1, 0x1
- bl sub_802F204
-_0802DE3E:
- pop {r4,r5}
- pop {r0}
- bx r0
- thumb_func_end sub_802DC9C
-
- thumb_func_start sub_802DE44
-sub_802DE44:
- push {lr}
- bl sub_802F298
- cmp r0, 0x1
- bls _0802DE5C
- cmp r0, 0x3
- bhi _0802DE5C
- bl sub_802F2C0
- movs r0, 0x7
- bl sub_802DC28
-_0802DE5C:
- pop {r0}
- bx r0
- thumb_func_end sub_802DE44
-
- thumb_func_start sub_802DE60
-sub_802DE60:
- push {lr}
- sub sp, 0x4
- mov r0, sp
- bl sub_80144A4
- cmp r0, 0
- bne _0802DE78
- ldr r0, _0802DE80
- ldr r0, [r0]
- ldr r0, [r0, 0x4]
- bl sub_802DC28
-_0802DE78:
- add sp, 0x4
- pop {r0}
- bx r0
- .align 2, 0
-_0802DE80: .4byte gUnknown_203B2FC
- thumb_func_end sub_802DE60
-
- thumb_func_start sub_802DE84
-sub_802DE84:
- push {r4,r5,lr}
- adds r5, r0, 0
- ldr r4, _0802DED8
- movs r0, 0x7C
- movs r1, 0x8
- bl MemoryAlloc
- str r0, [r4]
- str r5, [r0, 0xC]
- bl sub_801317C
- ldr r0, [r4]
- ldr r1, [r0, 0xC]
- ldr r2, [r1]
- str r2, [r0, 0x10]
- lsls r1, r2, 1
- adds r1, r2
- lsls r1, 3
- adds r1, 0x18
- adds r1, r0, r1
- str r1, [r0, 0x14]
- adds r0, 0x18
- bl sub_8006518
- ldr r1, [r4]
- ldr r2, [r1, 0x10]
- lsls r0, r2, 1
- adds r0, r2
- lsls r0, 3
- adds r1, r0
- adds r1, 0x18
- ldr r0, _0802DEDC
- ldm r0!, {r2-r4}
- stm r1!, {r2-r4}
- ldm r0!, {r2-r4}
- stm r1!, {r2-r4}
- bl sub_802DF14
- movs r0, 0x1
- pop {r4,r5}
- pop {r1}
- bx r1
- .align 2, 0
-_0802DED8: .4byte gUnknown_203B300
-_0802DEDC: .4byte gUnknown_80E0264
- thumb_func_end sub_802DE84
-
- thumb_func_start sub_802DEE0
-sub_802DEE0:
- push {lr}
- ldr r0, _0802DF00
- ldr r0, [r0]
- ldr r1, [r0, 0x10]
- bl sub_8012A64
- cmp r0, 0x1
- beq _0802DF04
- cmp r0, 0x2
- bne _0802DF0E
- movs r0, 0x1
- bl PlayMenuSoundEffect
- movs r0, 0x2
- b _0802DF10
- .align 2, 0
-_0802DF00: .4byte gUnknown_203B300
-_0802DF04:
- movs r0, 0
- bl PlayMenuSoundEffect
- movs r0, 0x3
- b _0802DF10
-_0802DF0E:
- movs r0, 0
-_0802DF10:
- pop {r1}
- bx r1
- thumb_func_end sub_802DEE0
-
- thumb_func_start sub_802DF14
-sub_802DF14:
- push {lr}
- bl sub_802DF6C
- bl sub_802DF88
- pop {r0}
- bx r0
- thumb_func_end sub_802DF14
-
- thumb_func_start sub_802DF24
-sub_802DF24:
- push {r4,r5,lr}
- ldr r4, _0802DF64
- ldr r2, [r4]
- cmp r2, 0
- beq _0802DF5E
- ldr r0, [r2, 0x10]
- lsls r1, r0, 1
- adds r1, r0
- lsls r1, 3
- adds r1, r2, r1
- adds r1, 0x18
- ldr r0, _0802DF68
- ldm r0!, {r2,r3,r5}
- stm r1!, {r2,r3,r5}
- ldm r0!, {r2,r3,r5}
- stm r1!, {r2,r3,r5}
- bl ResetUnusedInputStruct
- ldr r0, [r4]
- adds r0, 0x18
- movs r1, 0x1
- movs r2, 0x1
- bl sub_800641C
- ldr r0, [r4]
- bl MemoryFree
- movs r0, 0
- str r0, [r4]
-_0802DF5E:
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_0802DF64: .4byte gUnknown_203B300
-_0802DF68: .4byte gUnknown_80E0248
- thumb_func_end sub_802DF24
-
- thumb_func_start sub_802DF6C
-sub_802DF6C:
- push {lr}
- bl ResetUnusedInputStruct
- ldr r0, _0802DF84
- ldr r0, [r0]
- adds r0, 0x18
- movs r1, 0x1
- movs r2, 0x1
- bl sub_800641C
- pop {r0}
- bx r0
- .align 2, 0
-_0802DF84: .4byte gUnknown_203B300
- thumb_func_end sub_802DF6C
-
- thumb_func_start sub_802DF88
-sub_802DF88:
- push {r4,lr}
- ldr r4, _0802DFAC
- ldr r0, [r4]
- ldr r0, [r0, 0x10]
- bl sub_80073B8
- ldr r0, [r4]
- ldr r0, [r0, 0xC]
- bl CreateRescueDescription
- ldr r0, [r4]
- ldr r0, [r0, 0x10]
- bl sub_80073E0
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_0802DFAC: .4byte gUnknown_203B300
- thumb_func_end sub_802DF88
-
.align 2,0
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 17:33:33 +0000