summaryrefslogtreecommitdiff
path: root/arm9/asm
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-06-22 18:31:25 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2021-06-22 18:31:25 -0400
commit629470e19d0b6dbb4e6a13fcc32a6a26692de7f4 (patch)
treedab541c9e598b11bc3d7ee3a6027cabcba822c56 /arm9/asm
parent3de127d797a8183d4e2d68f9e8da0ba5d336cfd1 (diff)
parentd192b6951f54d1397ded3db03b5e486ec679ac6f (diff)
Merge remote-tracking branch 'origin/master' into pikalax_work
Diffstat (limited to 'arm9/asm')
-rw-r--r--arm9/asm/scrcmd_18.s1801
-rw-r--r--arm9/asm/unk_02001B80.s14
-rw-r--r--arm9/asm/unk_020023C0.s1123
-rw-r--r--arm9/asm/unk_020051F4.s6
-rw-r--r--arm9/asm/unk_02014590.s2
-rw-r--r--arm9/asm/unk_02035068.s6
-rw-r--r--arm9/asm/unk_02038C78.s48
-rw-r--r--arm9/asm/unk_02046030.s4
-rw-r--r--arm9/asm/unk_020484A8.s2
-rw-r--r--arm9/asm/unk_02048904.s4
-rw-r--r--arm9/asm/unk_0204C1B4.s4
-rw-r--r--arm9/asm/unk_0204CB20.s8
-rw-r--r--arm9/asm/unk_02050E48.s6
-rw-r--r--arm9/asm/unk_02052EE8.s2
-rw-r--r--arm9/asm/unk_02053750.s8
-rw-r--r--arm9/asm/unk_020557F4.s36
-rw-r--r--arm9/asm/unk_0205AD98.s4
-rw-r--r--arm9/asm/unk_020607D4.s4
-rw-r--r--arm9/asm/unk_020647A4.s8
-rw-r--r--arm9/asm/unk_020653EC.s14
-rw-r--r--arm9/asm/unk_0206C700.s14
-rw-r--r--arm9/asm/unk_0206E2F0.s375
-rw-r--r--arm9/asm/unk_0206F3FC.s72
-rw-r--r--arm9/asm/unk_02072548.s4
-rw-r--r--arm9/asm/unk_02073DA8.s4
-rw-r--r--arm9/asm/unk_0207550C.s18
-rw-r--r--arm9/asm/unk_020772F0.s32
-rw-r--r--arm9/asm/unk_02079C70.s46
-rw-r--r--arm9/asm/unk_0207F95C.s2
-rw-r--r--arm9/asm/unk_02080C38.s2
-rw-r--r--arm9/asm/unk_020828BC.s6
-rw-r--r--arm9/asm/unk_02084098.s2
-rw-r--r--arm9/asm/unk_02086FA8.s16
-rw-r--r--arm9/asm/unk_02088AAC.s345
-rw-r--r--arm9/asm/unk_0208A338.s6
35 files changed, 202 insertions, 3846 deletions
diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s
deleted file mode 100644
index 0101d717..00000000
--- a/arm9/asm/scrcmd_18.s
+++ /dev/null
@@ -1,1801 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- .text
-
- thumb_func_start ScrCmd_GetPartySpecies
-ScrCmd_GetPartySpecies: ; 0x0204434C
- ; getpartyspecies XXXX, YYYY
- ; Sets var YYYY to species of mon in party slot XXXX.
- ; If mon is an egg, the value is SPECIES_NONE.
- push {r4-r6, lr}
- add r4, r0, #0x0
- add r1, r4, #0x0
- add r1, #0x80
- ldr r5, [r1, #0x0]
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r4, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- add r6, r0, #0x0
- add r0, r4, #0x0
- bl ScriptReadHalfword
- add r4, #0x80
- add r1, r0, #0x0
- ldr r0, [r4, #0x0]
- bl GetVarPointer
- add r4, r0, #0x0
- ldr r0, [r5, #0xc]
- bl SavArray_PlayerParty_get
- ldrh r1, [r6, #0x0]
- bl GetPartyMonByIndex
- mov r1, #0x4c
- mov r2, #0x0
- add r5, r0, #0x0
- bl GetMonData
- cmp r0, #0x0
- bne _020443A0
- add r0, r5, #0x0
- mov r1, #0x5
- mov r2, #0x0
- bl GetMonData
- b _020443A2
-_020443A0:
- mov r0, #0x0
-_020443A2:
- strh r0, [r4, #0x0]
- mov r0, #0x0
- pop {r4-r6, pc}
-
- thumb_func_start ScrCmd_CheckPartyMonOTID
-ScrCmd_CheckPartyMonOTID: ; 0x020443A8
- push {r3-r7, lr}
- add r4, r0, #0x0
- add r0, #0x80
- ldr r5, [r0, #0x0]
- add r0, r5, #0x0
- bl ScriptEnvironment_GetSav2Ptr
- bl Sav2_PlayerData_GetProfileAddr
- add r7, r0, #0x0
- add r0, r4, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r4, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- add r6, r0, #0x0
- add r0, r4, #0x0
- bl ScriptReadHalfword
- add r4, #0x80
- add r1, r0, #0x0
- ldr r0, [r4, #0x0]
- bl GetVarPointer
- add r4, r0, #0x0
- ldr r0, [r5, #0xc]
- bl SavArray_PlayerParty_get
- ldrh r1, [r6, #0x0]
- bl GetPartyMonByIndex
- mov r1, #0x7
- mov r2, #0x0
- bl GetMonData
- lsl r0, r0, #0x10
- lsr r5, r0, #0x10
- add r0, r7, #0x0
- bl PlayerProfile_GetTrainerID
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
- cmp r5, r0
- bne _0204440C
- mov r0, #0x0
- b _0204440E
-_0204440C:
- mov r0, #0x1
-_0204440E:
- strh r0, [r4, #0x0]
- mov r0, #0x0
- pop {r3-r7, pc}
-
- thumb_func_start ScrCmd_GiveEgg
-ScrCmd_GiveEgg: ; 0x02044414
- push {r4-r7, lr}
- sub sp, #0xc
- add r5, r0, #0x0
- add r0, #0x80
- ldr r4, [r0, #0x0]
- ldr r0, [r4, #0xc]
- bl Sav2_PlayerData_GetProfileAddr
- add r7, r0, #0x0
- add r0, r5, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl VarGet
- str r0, [sp, #0x8]
- add r0, r5, #0x0
- bl ScriptReadHalfword
- add r5, #0x80
- add r1, r0, #0x0
- ldr r0, [r5, #0x0]
- bl VarGet
- add r5, r0, #0x0
- ldr r0, [r4, #0xc]
- bl SavArray_PlayerParty_get
- add r6, r0, #0x0
- bl GetPartyCount
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- cmp r0, #0x6
- bhs _02044494
- mov r0, #0xb
- bl AllocMonZeroed
- add r4, r0, #0x0
- bl ZeroMonData
- mov r0, #0x1
- add r1, r5, #0x0
- bl FUN_02015CF8
- mov r1, #0x3
- str r1, [sp, #0x0]
- str r0, [sp, #0x4]
- ldr r1, [sp, #0x8]
- add r0, r4, #0x0
- mov r2, #0x1
- add r3, r7, #0x0
- bl MOD05_SetEggStats
- add r0, r6, #0x0
- add r1, r4, #0x0
- bl AddMonToParty
- add r0, r4, #0x0
- bl FreeToHeap
-_02044494:
- mov r0, #0x0
- add sp, #0xc
- pop {r4-r7, pc}
- .balign 4
-
- thumb_func_start ScrCmd_SetPartyMonMove
-ScrCmd_SetPartyMonMove: ; 0x0204449C
- push {r3-r7, lr}
- add r5, r0, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl VarGet
- add r4, r0, #0x0
- add r0, r5, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl VarGet
- add r6, r0, #0x0
- add r0, r5, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl VarGet
- add r5, #0x80
- add r7, r0, #0x0
- ldr r0, [r5, #0x0]
- ldr r0, [r0, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r4, #0x0
- add r2, r6, #0x0
- add r3, r7, #0x0
- bl PartyMonSetMoveInSlot
- mov r0, #0x0
- pop {r3-r7, pc}
- .balign 4
-
- thumb_func_start ScrCmd_PartyMonHasMove
-ScrCmd_PartyMonHasMove: ; 0x020444F4
- push {r3-r7, lr}
- add r4, r0, #0x0
- add r1, r4, #0x0
- add r1, #0x80
- ldr r7, [r1, #0x0]
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r4, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- add r6, r0, #0x0
- add r0, r4, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r4, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl VarGet
- add r5, r0, #0x0
- add r0, r4, #0x0
- bl ScriptReadHalfword
- add r4, #0x80
- add r1, r0, #0x0
- ldr r0, [r4, #0x0]
- bl VarGet
- add r4, r0, #0x0
- ldr r0, [r7, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r4, #0x0
- bl GetPartyMonByIndex
- mov r2, #0x0
- mov r1, #0x4c
- add r4, r0, #0x0
- strh r2, [r6, #0x0]
- bl GetMonData
- cmp r0, #0x0
- beq _02044556
- mov r0, #0x0
- pop {r3-r7, pc}
-_02044556:
- add r0, r4, #0x0
- mov r1, #0x36
- mov r2, #0x0
- bl GetMonData
- cmp r5, r0
- beq _0204458E
- add r0, r4, #0x0
- mov r1, #0x37
- mov r2, #0x0
- bl GetMonData
- cmp r5, r0
- beq _0204458E
- add r0, r4, #0x0
- mov r1, #0x38
- mov r2, #0x0
- bl GetMonData
- cmp r5, r0
- beq _0204458E
- add r0, r4, #0x0
- mov r1, #0x39
- mov r2, #0x0
- bl GetMonData
- cmp r5, r0
- bne _02044592
-_0204458E:
- mov r0, #0x1
- strh r0, [r6, #0x0]
-_02044592:
- mov r0, #0x0
- pop {r3-r7, pc}
- .balign 4
-
- thumb_func_start ScrCmd_FindPartyMonWithMove
-ScrCmd_FindPartyMonWithMove: ; 0x02044598
- push {r3-r7, lr}
- sub sp, #0x8
- add r4, r0, #0x0
- add r1, r4, #0x0
- add r1, #0x80
- ldr r1, [r1, #0x0]
- str r1, [sp, #0x4]
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r4, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- str r0, [sp, #0x0]
- add r0, r4, #0x0
- bl ScriptReadHalfword
- add r4, #0x80
- add r1, r0, #0x0
- ldr r0, [r4, #0x0]
- bl VarGet
- add r5, r0, #0x0
- ldr r0, [sp, #0x4]
- ldr r0, [r0, #0xc]
- bl SavArray_PlayerParty_get
- bl GetPartyCount
- lsl r0, r0, #0x18
- lsr r7, r0, #0x18
- ldr r1, _02044650 ; =0x00000006
- ldr r0, [sp, #0x0]
- ldr r6, _02044654 ; =0x00000000
- strh r1, [r0, #0x0]
- beq _02044648
-_020445E4:
- ldr r0, [sp, #0x4]
- ldr r0, [r0, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r6, #0x0
- bl GetPartyMonByIndex
- mov r1, #0x4c
- mov r2, #0x0
- add r4, r0, #0x0
- bl GetMonData
- cmp r0, #0x0
- bne _0204463E
- add r0, r4, #0x0
- mov r1, #0x36
- mov r2, #0x0
- bl GetMonData
- cmp r5, r0
- beq _02044638
- add r0, r4, #0x0
- mov r1, #0x37
- mov r2, #0x0
- bl GetMonData
- cmp r5, r0
- beq _02044638
- add r0, r4, #0x0
- mov r1, #0x38
- mov r2, #0x0
- bl GetMonData
- cmp r5, r0
- beq _02044638
- add r0, r4, #0x0
- mov r1, #0x39
- mov r2, #0x0
- bl GetMonData
- cmp r5, r0
- bne _0204463E
-_02044638:
- ldr r0, [sp, #0x0]
- strh r6, [r0, #0x0]
- b _02044648
-_0204463E:
- add r0, r6, #0x1
- lsl r0, r0, #0x18
- lsr r6, r0, #0x18
- cmp r6, r7
- blo _020445E4
-_02044648:
- mov r0, #0x0
- add sp, #0x8
- pop {r3-r7, pc}
- nop
-_02044650: .word 0x00000006
-_02044654: .word 0x00000000
-
- thumb_func_start ScrCmd_SurvivePsn
-ScrCmd_SurvivePsn: ; 0x02044658
- push {r4-r6, lr}
- add r5, r0, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- add r4, r0, #0x0
- add r0, r5, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl VarGet
- add r5, #0x80
- add r6, r0, #0x0
- ldr r0, [r5, #0x0]
- ldr r0, [r0, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r6, #0x0
- bl GetPartyMonByIndex
- bl SurvivePoisoning
- strh r0, [r4, #0x0]
- mov r0, #0x0
- pop {r4-r6, pc}
-
- thumb_func_start ScrCmd_CountPartyMonsAtOrBelowLevel
-ScrCmd_CountPartyMonsAtOrBelowLevel: ; 0x0204469C
- push {r4-r7, lr}
- sub sp, #0xc
- add r4, r0, #0x0
- add r1, r4, #0x0
- add r1, #0x80
- ldr r7, [r1, #0x0]
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r4, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- str r0, [sp, #0x4]
- add r0, r4, #0x0
- bl ScriptReadHalfword
- add r4, #0x80
- add r1, r0, #0x0
- ldr r0, [r4, #0x0]
- bl VarGet
- str r0, [sp, #0x0]
- ldr r0, [r7, #0xc]
- bl SavArray_PlayerParty_get
- bl GetPartyCount
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- str r0, [sp, #0x8]
- mov r4, #0x0
- ldr r0, [sp, #0x4]
- add r5, r4, #0x0
- strh r4, [r0, #0x0]
- ldr r0, [sp, #0x8]
- cmp r0, #0x0
- bls _02044726
-_020446EA:
- ldr r0, [r7, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r4, #0x0
- bl GetPartyMonByIndex
- mov r1, #0x4c
- mov r2, #0x0
- add r6, r0, #0x0
- bl GetMonData
- cmp r0, #0x0
- bne _0204471A
- add r0, r6, #0x0
- mov r1, #0xa0
- mov r2, #0x0
- bl GetMonData
- ldr r1, [sp, #0x0]
- cmp r0, r1
- bhi _0204471A
- add r0, r5, #0x1
- lsl r0, r0, #0x18
- lsr r5, r0, #0x18
-_0204471A:
- add r0, r4, #0x1
- lsl r0, r0, #0x18
- lsr r4, r0, #0x18
- ldr r0, [sp, #0x8]
- cmp r4, r0
- blo _020446EA
-_02044726:
- ldr r0, [sp, #0x4]
- strh r5, [r0, #0x0]
- mov r0, #0x0
- add sp, #0xc
- pop {r4-r7, pc}
-
- thumb_func_start ScrCmd_GetPartyMonLevel
-ScrCmd_GetPartyMonLevel: ; 0x02044730
- push {r4-r6, lr}
- add r5, r0, #0x0
- add r1, r5, #0x0
- add r1, #0x80
- ldr r6, [r1, #0x0]
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- add r4, r0, #0x0
- add r0, r5, #0x0
- bl ScriptReadHalfword
- add r5, #0x80
- add r1, r0, #0x0
- ldr r0, [r5, #0x0]
- bl VarGet
- add r5, r0, #0x0
- ldr r0, [r6, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r5, #0x0
- bl GetPartyMonByIndex
- mov r2, #0x0
- mov r1, #0x4c
- add r5, r0, #0x0
- strh r2, [r4, #0x0]
- bl GetMonData
- cmp r0, #0x0
- bne _02044786
- add r0, r5, #0x0
- mov r1, #0xa0
- mov r2, #0x0
- bl GetMonData
- strh r0, [r4, #0x0]
-_02044786:
- mov r0, #0x0
- pop {r4-r6, pc}
- .balign 4
-
- thumb_func_start ScrCmd_GetPartyMonNature
-ScrCmd_GetPartyMonNature: ; 0x0204478C
- push {r4-r6, lr}
- add r6, r0, #0x0
- add r1, r6, #0x0
- add r1, #0x80
- ldr r5, [r1, #0x0]
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r6, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- add r4, r0, #0x0
- add r0, r6, #0x0
- bl ScriptReadHalfword
- add r6, #0x80
- add r1, r0, #0x0
- ldr r0, [r6, #0x0]
- bl VarGet
- add r6, r0, #0x0
- ldr r0, [r5, #0xc]
- bl SavArray_PlayerParty_get
- bl GetPartyCount
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- cmp r6, r0
- blt _020447D2
- mov r0, #0x0
- strh r0, [r4, #0x0]
- pop {r4-r6, pc}
-_020447D2:
- ldr r0, [r5, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r6, #0x0
- bl GetPartyMonByIndex
- mov r1, #0x4c
- mov r2, #0x0
- add r5, r0, #0x0
- bl GetMonData
- cmp r0, #0x0
- beq _020447F2
- mov r0, #0x0
- strh r0, [r4, #0x0]
- pop {r4-r6, pc}
-_020447F2:
- add r0, r5, #0x0
- bl GetMonNature
- strh r0, [r4, #0x0]
- mov r0, #0x0
- pop {r4-r6, pc}
- .balign 4
-
- thumb_func_start ScrCmd_FindPartyMonWithNature
-ScrCmd_FindPartyMonWithNature: ; 0x02044800
- push {r3-r7, lr}
- sub sp, #0x8
- add r4, r0, #0x0
- add r1, r4, #0x0
- add r1, #0x80
- ldr r7, [r1, #0x0]
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r4, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- str r0, [sp, #0x4]
- add r0, r4, #0x0
- bl ScriptReadHalfword
- add r4, #0x80
- add r1, r0, #0x0
- ldr r0, [r4, #0x0]
- bl VarGet
- str r0, [sp, #0x0]
- ldr r0, [r7, #0xc]
- bl SavArray_PlayerParty_get
- bl GetPartyCount
- lsl r0, r0, #0x18
- lsr r6, r0, #0x18
- ldr r1, _02044884 ; =0x000000FF
- ldr r0, [sp, #0x4]
- ldr r5, _02044888 ; =0x00000000
- strh r1, [r0, #0x0]
- beq _0204487E
-_02044848:
- ldr r0, [r7, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r5, #0x0
- bl GetPartyMonByIndex
- mov r1, #0x4c
- mov r2, #0x0
- add r4, r0, #0x0
- bl GetMonData
- cmp r0, #0x0
- bne _02044874
- add r0, r4, #0x0
- bl GetMonNature
- ldr r1, [sp, #0x0]
- cmp r1, r0
- bne _02044874
- ldr r0, [sp, #0x4]
- strh r5, [r0, #0x0]
- b _0204487E
-_02044874:
- add r0, r5, #0x1
- lsl r0, r0, #0x18
- lsr r5, r0, #0x18
- cmp r5, r6
- blo _02044848
-_0204487E:
- mov r0, #0x0
- add sp, #0x8
- pop {r3-r7, pc}
- .balign 4
-_02044884: .word 0x000000FF
-_02044888: .word 0x00000000
-
- thumb_func_start ScrCmd_GetPartyMonFriendship
-ScrCmd_GetPartyMonFriendship: ; 0x0204488C
- push {r4-r6, lr}
- add r5, r0, #0x0
- add r1, r5, #0x0
- add r1, #0x80
- ldr r4, [r1, #0x0]
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- add r6, r0, #0x0
- add r0, r5, #0x0
- bl ScriptReadHalfword
- add r5, #0x80
- add r1, r0, #0x0
- ldr r0, [r5, #0x0]
- bl VarGet
- add r5, r0, #0x0
- ldr r0, [r4, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r5, #0x0
- bl GetPartyMonByIndex
- mov r1, #0x9
- mov r2, #0x0
- bl GetMonData
- strh r0, [r6, #0x0]
- mov r0, #0x0
- pop {r4-r6, pc}
-
- thumb_func_start ScrCmd_Unk01BA
-ScrCmd_Unk01BA: ; 0x020448D4
- push {r3-r7, lr}
- sub sp, #0x8
- add r5, r0, #0x0
- add r1, r5, #0x0
- add r1, #0x80
- ldr r6, [r1, #0x0]
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl VarGet
- add r4, r0, #0x0
- add r0, r5, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl VarGet
- add r5, #0x80
- str r0, [sp, #0x0]
- ldr r0, [r5, #0x0]
- ldr r0, [r0, #0x1c]
- ldr r0, [r0, #0x0]
- bl MapHeader_GetMapSec
- add r7, r0, #0x0
- ldr r0, [r6, #0xc]
- bl SavArray_PlayerParty_get
- ldr r1, [sp, #0x0]
- bl GetPartyMonByIndex
- mov r1, #0x9
- mov r2, #0x0
- add r5, r0, #0x0
- bl GetMonData
- add r1, sp, #0x4
- strh r0, [r1, #0x0]
- cmp r4, #0x0
- beq _02044982
- add r0, r5, #0x0
- mov r1, #0x6
- mov r2, #0x0
- bl GetMonData
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
- mov r1, #0x1
- mov r2, #0xb
- bl GetItemAttr
- cmp r0, #0x34
- bne _0204495A
- mov r0, #0x96
- mul r0, r4
- mov r1, #0x64
- bl _s32_div_f
- lsl r0, r0, #0x10
- lsr r4, r0, #0x10
-_0204495A:
- add r0, r5, #0x0
- mov r1, #0x9a
- mov r2, #0x0
- bl GetMonData
- cmp r0, #0xb
- bne _0204496E
- add r0, r4, #0x1
- lsl r0, r0, #0x10
- lsr r4, r0, #0x10
-_0204496E:
- add r0, r5, #0x0
- mov r1, #0x97
- mov r2, #0x0
- bl GetMonData
- cmp r7, r0
- bne _02044982
- add r0, r4, #0x1
- lsl r0, r0, #0x10
- lsr r4, r0, #0x10
-_02044982:
- add r0, sp, #0x4
- ldrh r1, [r0, #0x0]
- add r1, r1, r4
- strh r1, [r0, #0x0]
- ldrh r1, [r0, #0x0]
- cmp r1, #0xff
- bls _02044994
- mov r1, #0xff
- strh r1, [r0, #0x0]
-_02044994:
- add r0, r5, #0x0
- mov r1, #0x9
- add r2, sp, #0x4
- bl SetMonData
- mov r0, #0x0
- add sp, #0x8
- pop {r3-r7, pc}
-
- thumb_func_start ScrCmd_Unk01BB
-ScrCmd_Unk01BB: ; 0x020449A4
- push {r3-r6, lr}
- sub sp, #0x4
- add r5, r0, #0x0
- add r1, r5, #0x0
- add r1, #0x80
- ldr r6, [r1, #0x0]
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl VarGet
- add r4, r0, #0x0
- add r0, r5, #0x0
- bl ScriptReadHalfword
- add r5, #0x80
- add r1, r0, #0x0
- ldr r0, [r5, #0x0]
- bl VarGet
- add r5, r0, #0x0
- ldr r0, [r6, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r5, #0x0
- bl GetPartyMonByIndex
- mov r1, #0x9
- mov r2, #0x0
- add r5, r0, #0x0
- bl GetMonData
- add r1, sp, #0x0
- strh r0, [r1, #0x0]
- ldrh r0, [r1, #0x0]
- cmp r4, r0
- bls _020449F8
- mov r0, #0x0
- b _020449FA
-_020449F8:
- sub r0, r0, r4
-_020449FA:
- strh r0, [r1, #0x0]
- add r0, r5, #0x0
- mov r1, #0x9
- add r2, sp, #0x0
- bl SetMonData
- mov r0, #0x0
- add sp, #0x4
- pop {r3-r6, pc}
-
- thumb_func_start ScrCmd_Unk0281
-ScrCmd_Unk0281: ; 0x02044A0C
- push {r3-r7, lr}
- add r5, r0, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl VarGet
- add r7, r0, #0x0
- add r0, r5, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl VarGet
- add r4, r0, #0x0
- add r0, r5, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- add r5, #0x80
- add r6, r0, #0x0
- ldr r0, [r5, #0x0]
- ldr r0, [r0, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r7, #0x0
- bl GetPartyMonByIndex
- add r4, #0x13
- add r1, r4, #0x0
- mov r2, #0x0
- bl GetMonData
- strh r0, [r6, #0x0]
- mov r0, #0x0
- pop {r3-r7, pc}
- .balign 4
-
- thumb_func_start ScrCmd_Unk0247
-ScrCmd_Unk0247: ; 0x02044A6C
- push {r3-r5, lr}
- add r5, r0, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- add r5, #0x80
- add r4, r0, #0x0
- ldr r0, [r5, #0x0]
- ldr r0, [r0, #0xc]
- bl FUN_02054DEC
- strh r0, [r4, #0x0]
- mov r0, #0x0
- pop {r3-r5, pc}
- .balign 4
-
- thumb_func_start ScrCmd_Unk0248
-ScrCmd_Unk0248: ; 0x02044A94
- push {r3-r7, lr}
- add r5, r0, #0x0
- add r1, r5, #0x0
- add r1, #0x80
- ldr r4, [r1, #0x0]
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- add r6, r0, #0x0
- add r0, r5, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- add r7, r0, #0x0
- add r0, r5, #0x0
- bl ScriptReadHalfword
- add r5, #0x80
- add r1, r0, #0x0
- ldr r0, [r5, #0x0]
- bl VarGet
- add r5, r0, #0x0
- ldr r0, [r4, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r5, #0x0
- bl GetPartyMonByIndex
- add r4, r0, #0x0
- mov r1, #0xb0
- mov r2, #0x0
- bl GetMonData
- strh r0, [r6, #0x0]
- add r0, r4, #0x0
- mov r1, #0xb1
- mov r2, #0x0
- bl GetMonData
- strh r0, [r7, #0x0]
- mov r0, #0x0
- pop {r3-r7, pc}
- .balign 4
-
- thumb_func_start ScrCmd_Unk0177
-ScrCmd_Unk0177: ; 0x02044B00
- push {r3-r5, lr}
- add r5, r0, #0x0
- add r1, r5, #0x0
- add r1, #0x80
- ldr r4, [r1, #0x0]
- bl ScriptReadHalfword
- add r5, #0x80
- add r1, r0, #0x0
- ldr r0, [r5, #0x0]
- bl GetVarPointer
- add r5, r0, #0x0
- ldr r0, [r4, #0xc]
- bl SavArray_PlayerParty_get
- bl GetPartyCount
- strh r0, [r5, #0x0]
- mov r0, #0x0
- pop {r3-r5, pc}
- .balign 4
-
- thumb_func_start ScrCmd_Unk019A
-ScrCmd_Unk019A: ; 0x02044B2C
- push {r3-r7, lr}
- add r4, r0, #0x0
- add r1, r4, #0x0
- add r1, #0x80
- ldr r6, [r1, #0x0]
- bl ScriptReadHalfword
- add r4, #0x80
- add r1, r0, #0x0
- ldr r0, [r4, #0x0]
- bl GetVarPointer
- str r0, [sp, #0x0]
- ldr r0, [r6, #0xc]
- bl SavArray_PlayerParty_get
- bl GetPartyCount
- mov r5, #0x0
- add r7, r0, #0x0
- add r4, r5, #0x0
- cmp r7, #0x0
- ble _02044B7A
-_02044B5A:
- ldr r0, [r6, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r5, #0x0
- bl GetPartyMonByIndex
- mov r1, #0x4c
- mov r2, #0x0
- bl GetMonData
- cmp r0, #0x0
- bne _02044B74
- add r4, r4, #0x1
-_02044B74:
- add r5, r5, #0x1
- cmp r5, r7
- blt _02044B5A
-_02044B7A:
- ldr r0, [sp, #0x0]
- strh r4, [r0, #0x0]
- mov r0, #0x0
- pop {r3-r7, pc}
- .balign 4
-
- thumb_func_start ScrCmd_Unk019B
-ScrCmd_Unk019B: ; 0x02044B84
- push {r4-r7, lr}
- sub sp, #0xc
- add r4, r0, #0x0
- add r1, r4, #0x0
- add r1, #0x80
- ldr r7, [r1, #0x0]
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r4, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- str r0, [sp, #0x4]
- add r0, r4, #0x0
- bl ScriptReadHalfword
- add r4, #0x80
- add r1, r0, #0x0
- ldr r0, [r4, #0x0]
- bl VarGet
- str r0, [sp, #0x0]
- ldr r0, [r7, #0xc]
- bl SavArray_PlayerParty_get
- bl GetPartyCount
- mov r5, #0x0
- add r4, r5, #0x0
- str r0, [sp, #0x8]
- cmp r0, #0x0
- ble _02044C00
-_02044BC8:
- ldr r0, [sp, #0x0]
- cmp r5, r0
- beq _02044BF8
- ldr r0, [r7, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r5, #0x0
- bl GetPartyMonByIndex
- mov r1, #0x4c
- mov r2, #0x0
- add r6, r0, #0x0
- bl GetMonData
- cmp r0, #0x0
- bne _02044BF8
- add r0, r6, #0x0
- mov r1, #0xa2
- mov r2, #0x0
- bl GetMonData
- cmp r0, #0x0
- beq _02044BF8
- add r4, r4, #0x1
-_02044BF8:
- ldr r0, [sp, #0x8]
- add r5, r5, #0x1
- cmp r5, r0
- blt _02044BC8
-_02044C00:
- ldr r0, [sp, #0x4]
- strh r4, [r0, #0x0]
- mov r0, #0x0
- add sp, #0xc
- pop {r4-r7, pc}
- .balign 4
-
- thumb_func_start ScrCmd_Unk019C
-ScrCmd_Unk019C: ; 0x02044C0C
- push {r4-r7, lr}
- sub sp, #0xc
- add r4, r0, #0x0
- add r1, r4, #0x0
- add r1, #0x80
- ldr r7, [r1, #0x0]
- bl ScriptReadHalfword
- add r4, #0x80
- add r1, r0, #0x0
- ldr r0, [r4, #0x0]
- bl GetVarPointer
- str r0, [sp, #0x0]
- ldr r0, [r7, #0xc]
- bl GetStoragePCPointer
- str r0, [sp, #0x4]
- ldr r0, [r7, #0xc]
- bl SavArray_PlayerParty_get
- bl GetPartyCount
- mov r5, #0x0
- add r4, r5, #0x0
- str r0, [sp, #0x8]
- cmp r0, #0x0
- ble _02044C76
-_02044C44:
- ldr r0, [r7, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r5, #0x0
- bl GetPartyMonByIndex
- mov r1, #0x4c
- mov r2, #0x0
- add r6, r0, #0x0
- bl GetMonData
- cmp r0, #0x0
- bne _02044C6E
- add r0, r6, #0x0
- mov r1, #0xa2
- mov r2, #0x0
- bl GetMonData
- cmp r0, #0x0
- beq _02044C6E
- add r4, r4, #0x1
-_02044C6E:
- ldr r0, [sp, #0x8]
- add r5, r5, #0x1
- cmp r5, r0
- blt _02044C44
-_02044C76:
- ldr r0, [sp, #0x4]
- bl PCStorage_CountMonsInAllBoxes
- add r1, r4, r0
- ldr r0, [sp, #0x0]
- strh r1, [r0, #0x0]
- mov r0, #0x0
- add sp, #0xc
- pop {r4-r7, pc}
-
- thumb_func_start ScrCmd_Unk019D
-ScrCmd_Unk019D: ; 0x02044C88
- push {r3-r7, lr}
- add r4, r0, #0x0
- add r1, r4, #0x0
- add r1, #0x80
- ldr r6, [r1, #0x0]
- bl ScriptReadHalfword
- add r4, #0x80
- add r1, r0, #0x0
- ldr r0, [r4, #0x0]
- bl GetVarPointer
- str r0, [sp, #0x0]
- ldr r0, [r6, #0xc]
- bl SavArray_PlayerParty_get
- bl GetPartyCount
- mov r5, #0x0
- add r7, r0, #0x0
- add r4, r5, #0x0
- cmp r7, #0x0
- ble _02044CD6
-_02044CB6:
- ldr r0, [r6, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r5, #0x0
- bl GetPartyMonByIndex
- mov r1, #0x4c
- mov r2, #0x0
- bl GetMonData
- cmp r0, #0x0
- beq _02044CD0
- add r4, r4, #0x1
-_02044CD0:
- add r5, r5, #0x1
- cmp r5, r7
- blt _02044CB6
-_02044CD6:
- ldr r0, [sp, #0x0]
- strh r4, [r0, #0x0]
- mov r0, #0x0
- pop {r3-r7, pc}
- .balign 4
-
- thumb_func_start ScrCmd_Unk0119
-ScrCmd_Unk0119: ; 0x02044CE0
- push {r3-r7, lr}
- add r4, r0, #0x0
- add r1, r4, #0x0
- add r1, #0x80
- ldr r5, [r1, #0x0]
- bl ScriptReadHalfword
- add r4, #0x80
- add r1, r0, #0x0
- ldr r0, [r4, #0x0]
- bl GetVarPointer
- str r0, [sp, #0x0]
- ldr r0, [r5, #0xc]
- bl SavArray_PlayerParty_get
- bl GetPartyCount
- lsl r0, r0, #0x10
- lsr r6, r0, #0x10
- ldr r4, _02044D40 ; =0x00000000
- ldr r0, [sp, #0x0]
- strh r4, [r0, #0x0]
- beq _02044D3C
- mov r7, #0x99
-_02044D12:
- ldr r0, [r5, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r4, #0x0
- bl GetPartyMonByIndex
- add r1, r7, #0x0
- mov r2, #0x0
- bl GetMonData
- cmp r0, #0x0
- beq _02044D32
- ldr r0, [sp, #0x0]
- mov r1, #0x1
- strh r1, [r0, #0x0]
- b _02044D3C
-_02044D32:
- add r0, r4, #0x1
- lsl r0, r0, #0x10
- lsr r4, r0, #0x10
- cmp r4, r6
- blo _02044D12
-_02044D3C:
- mov r0, #0x0
- pop {r3-r7, pc}
- .balign 4
-_02044D40: .word 0x00000000
-
- thumb_func_start ScrCmd_Unk011A
-ScrCmd_Unk011A: ; 0x02044D44
- push {r4-r6, lr}
- add r5, r0, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl VarGet
- add r6, r0, #0x0
- add r0, r5, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- add r5, #0x80
- add r4, r0, #0x0
- ldr r0, [r5, #0x0]
- ldr r0, [r0, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r6, #0x0
- bl GetPartyMonByIndex
- mov r1, #0x6f
- mov r2, #0x0
- bl GetMonData
- strh r0, [r4, #0x0]
- mov r0, #0x0
- pop {r4-r6, pc}
-
- thumb_func_start ScrCmd_Unk01C8
-ScrCmd_Unk01C8: ; 0x02044D8C
- push {r4-r6, lr}
- add r4, r0, #0x0
- add r1, r4, #0x0
- add r1, #0x80
- ldr r6, [r1, #0x0]
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r4, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- add r5, r0, #0x0
- add r0, r4, #0x0
- bl ScriptReadHalfword
- add r4, #0x80
- add r1, r0, #0x0
- ldr r0, [r4, #0x0]
- bl VarGet
- add r4, r0, #0x0
- ldr r0, [r6, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r4, #0x0
- bl GetPartyMonByIndex
- mov r1, #0x4c
- mov r2, #0x0
- add r6, r0, #0x0
- bl GetMonData
- cmp r0, #0x0
- beq _02044DDA
- mov r0, #0x0
- strh r0, [r5, #0x0]
- pop {r4-r6, pc}
-_02044DDA:
- mov r4, #0x0
- add r0, r6, #0x0
- mov r1, #0x36
- add r2, r4, #0x0
- bl GetMonData
- cmp r0, #0x0
- beq _02044DF0
- add r0, r4, #0x1
- lsl r0, r0, #0x18
- lsr r4, r0, #0x18
-_02044DF0:
- add r0, r6, #0x0
- mov r1, #0x37
- mov r2, #0x0
- bl GetMonData
- cmp r0, #0x0
- beq _02044E04
- add r0, r4, #0x1
- lsl r0, r0, #0x18
- lsr r4, r0, #0x18
-_02044E04:
- add r0, r6, #0x0
- mov r1, #0x38
- mov r2, #0x0
- bl GetMonData
- cmp r0, #0x0
- beq _02044E18
- add r0, r4, #0x1
- lsl r0, r0, #0x18
- lsr r4, r0, #0x18
-_02044E18:
- add r0, r6, #0x0
- mov r1, #0x39
- mov r2, #0x0
- bl GetMonData
- cmp r0, #0x0
- beq _02044E2C
- add r0, r4, #0x1
- lsl r0, r0, #0x18
- lsr r4, r0, #0x18
-_02044E2C:
- strh r4, [r5, #0x0]
- mov r0, #0x0
- pop {r4-r6, pc}
- .balign 4
-
- thumb_func_start ScrCmd_Unk01C9
-ScrCmd_Unk01C9: ; 0x02044E34
- push {r4-r6, lr}
- add r4, r0, #0x0
- add r1, r4, #0x0
- add r1, #0x80
- ldr r5, [r1, #0x0]
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r4, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl VarGet
- add r6, r0, #0x0
- add r0, r4, #0x0
- bl ScriptReadHalfword
- add r4, #0x80
- add r1, r0, #0x0
- ldr r0, [r4, #0x0]
- bl VarGet
- add r4, r0, #0x0
- ldr r0, [r5, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r6, #0x0
- bl GetPartyMonByIndex
- add r1, r4, #0x0
- bl FUN_020699A4
- mov r0, #0x0
- pop {r4-r6, pc}
-
- thumb_func_start ScrCmd_Unk01CA
-ScrCmd_Unk01CA: ; 0x02044E78
- push {r3-r7, lr}
- add r4, r0, #0x0
- add r1, r4, #0x0
- add r1, #0x80
- ldr r5, [r1, #0x0]
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r4, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- add r6, r0, #0x0
- add r0, r4, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r4, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl VarGet
- add r7, r0, #0x0
- add r0, r4, #0x0
- bl ScriptReadHalfword
- add r4, #0x80
- add r1, r0, #0x0
- ldr r0, [r4, #0x0]
- bl VarGet
- add r4, r0, #0x0
- ldr r0, [r5, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r7, #0x0
- bl GetPartyMonByIndex
- add r4, #0x36
- add r1, r4, #0x0
- mov r2, #0x0
- bl GetMonData
- strh r0, [r6, #0x0]
- mov r0, #0x0
- pop {r3-r7, pc}
- .balign 4
-
- thumb_func_start ScrCmd_Unk01EE
-ScrCmd_Unk01EE: ; 0x02044ED8
- push {r4-r6, lr}
- add r5, r0, #0x0
- add r1, r5, #0x0
- add r1, #0x80
- ldr r4, [r1, #0x0]
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- add r6, r0, #0x0
- add r0, r5, #0x0
- bl ScriptReadHalfword
- add r5, #0x80
- add r1, r0, #0x0
- ldr r0, [r5, #0x0]
- bl VarGet
- add r5, r0, #0x0
- ldr r0, [r4, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r5, #0x0
- bl GetPartyMonByIndex
- mov r1, #0x6
- mov r2, #0x0
- bl GetMonData
- strh r0, [r6, #0x0]
- mov r0, #0x0
- pop {r4-r6, pc}
-
- thumb_func_start ScrCmd_Unk01F0
-ScrCmd_Unk01F0: ; 0x02044F20
- push {r3-r5, lr}
- add r5, r0, #0x0
- add r1, r5, #0x0
- add r1, #0x80
- ldr r4, [r1, #0x0]
- bl ScriptReadHalfword
- add r5, #0x80
- add r1, r0, #0x0
- ldr r0, [r5, #0x0]
- bl VarGet
- add r5, r0, #0x0
- ldr r0, [r4, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r5, #0x0
- bl GetPartyMonByIndex
- mov r2, #0x0
- add r1, sp, #0x0
- strh r2, [r1, #0x0]
- mov r1, #0x6
- add r2, sp, #0x0
- bl SetMonData
- mov r0, #0x0
- pop {r3-r5, pc}
-
- thumb_func_start ScrCmd_Unk01C0
-ScrCmd_Unk01C0: ; 0x02044F58
- push {r3-r7, lr}
- sub sp, #0x8
- add r4, r0, #0x0
- add r1, r4, #0x0
- add r1, #0x80
- ldr r7, [r1, #0x0]
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r4, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- str r0, [sp, #0x4]
- add r0, r4, #0x0
- bl ScriptReadHalfword
- add r4, #0x80
- add r1, r0, #0x0
- ldr r0, [r4, #0x0]
- bl VarGet
- str r0, [sp, #0x0]
- ldr r0, [r7, #0xc]
- bl SavArray_PlayerParty_get
- bl GetPartyCount
- lsl r0, r0, #0x18
- lsr r6, r0, #0x18
- ldr r5, _02044FE4 ; =0x00000000
- ldr r0, [sp, #0x4]
- strh r5, [r0, #0x0]
- beq _02044FDE
-_02044F9E:
- ldr r0, [r7, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r5, #0x0
- bl GetPartyMonByIndex
- mov r1, #0x4c
- mov r2, #0x0
- add r4, r0, #0x0
- bl GetMonData
- cmp r0, #0x0
- bne _02044FD4
- add r0, r4, #0x0
- mov r1, #0x5
- mov r2, #0x0
- bl GetMonData
- lsl r0, r0, #0x10
- lsr r1, r0, #0x10
- ldr r0, [sp, #0x0]
- cmp r0, r1
- bne _02044FD4
- ldr r0, [sp, #0x4]
- mov r1, #0x1
- strh r1, [r0, #0x0]
- b _02044FDE
-_02044FD4:
- add r0, r5, #0x1
- lsl r0, r0, #0x18
- lsr r5, r0, #0x18
- cmp r5, r6
- blo _02044F9E
-_02044FDE:
- mov r0, #0x0
- add sp, #0x8
- pop {r3-r7, pc}
- .balign 4
-_02044FE4: .word 0x00000000
-
- thumb_func_start ScrCmd_Unk022E
-ScrCmd_Unk022E: ; 0x02044FE8
- push {r3-r7, lr}
- add r5, r0, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- str r0, [sp, #0x0]
- add r0, r5, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl VarGet
- add r5, #0x80
- add r4, r0, #0x0
- ldr r0, [r5, #0x0]
- ldr r0, [r0, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r4, #0x0
- bl GetPartyMonByIndex
- mov r4, #0x0
- add r6, r0, #0x0
- add r5, r4, #0x0
- add r7, r4, #0x0
-_0204502A:
- lsl r0, r4, #0x18
- lsr r0, r0, #0x18
- add r1, r7, #0x0
- bl FUN_0207FC5C
- add r1, r0, #0x0
- add r0, r6, #0x0
- mov r2, #0x0
- bl GetMonData
- cmp r0, #0x0
- beq _02045048
- add r0, r5, #0x1
- lsl r0, r0, #0x10
- lsr r5, r0, #0x10
-_02045048:
- add r0, r4, #0x1
- lsl r0, r0, #0x10
- lsr r4, r0, #0x10
- cmp r4, #0x50
- blo _0204502A
- ldr r0, [sp, #0x0]
- strh r5, [r0, #0x0]
- mov r0, #0x0
- pop {r3-r7, pc}
- .balign 4
-
- thumb_func_start ScrCmd_Unk022F
-ScrCmd_Unk022F: ; 0x0204505C
- push {r3-r7, lr}
- sub sp, #0x10
- add r4, r0, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r4, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- str r0, [sp, #0x0]
- add r0, r4, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- ldr r0, [r0, #0xc]
- bl SavArray_PlayerParty_get
- bl GetPartyCount
- lsl r0, r0, #0x10
- add r4, #0x80
- lsr r6, r0, #0x10
- ldr r0, [r4, #0x0]
- ldr r0, [r0, #0xc]
- bl SavArray_PlayerParty_get
- str r0, [sp, #0xc]
- mov r0, #0x0
- str r0, [sp, #0x8]
- str r0, [sp, #0x4]
-_0204509A:
- mov r5, #0x0
- cmp r6, #0x0
- bls _020450E8
- ldr r0, [sp, #0x8]
- lsl r0, r0, #0x18
- lsr r7, r0, #0x18
-_020450A6:
- ldr r0, [sp, #0xc]
- add r1, r5, #0x0
- bl GetPartyMonByIndex
- mov r1, #0x4c
- mov r2, #0x0
- add r4, r0, #0x0
- bl GetMonData
- cmp r0, #0x0
- bne _020450E8
- add r0, r7, #0x0
- mov r1, #0x0
- bl FUN_0207FC5C
- add r1, r0, #0x0
- add r0, r4, #0x0
- mov r2, #0x0
- bl GetMonData
- cmp r0, #0x0
- beq _020450DE
- ldr r0, [sp, #0x4]
- add r0, r0, #0x1
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
- str r0, [sp, #0x4]
- b _020450E8
-_020450DE:
- add r0, r5, #0x1
- lsl r0, r0, #0x10
- lsr r5, r0, #0x10
- cmp r5, r6
- blo _020450A6
-_020450E8:
- ldr r0, [sp, #0x8]
- add r0, r0, #0x1
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
- str r0, [sp, #0x8]
- cmp r0, #0x50
- blo _0204509A
- ldr r1, [sp, #0x4]
- ldr r0, [sp, #0x0]
- strh r1, [r0, #0x0]
- mov r0, #0x0
- add sp, #0x10
- pop {r3-r7, pc}
- .balign 4
-
- thumb_func_start ScrCmd_Unk0230
-ScrCmd_Unk0230: ; 0x02045104
- push {r3-r7, lr}
- add r5, r0, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- add r4, r0, #0x0
- add r0, r5, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl VarGet
- add r7, r0, #0x0
- add r0, r5, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl VarGet
- add r5, #0x80
- add r6, r0, #0x0
- ldr r0, [r5, #0x0]
- ldr r0, [r0, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r7, #0x0
- bl GetPartyMonByIndex
- add r5, r0, #0x0
- lsl r0, r6, #0x18
- lsr r0, r0, #0x18
- mov r1, #0x0
- bl FUN_0207FC5C
- add r1, r0, #0x0
- add r0, r5, #0x0
- mov r2, #0x0
- bl GetMonData
- strh r0, [r4, #0x0]
- mov r0, #0x0
- pop {r3-r7, pc}
- .balign 4
-
- thumb_func_start ScrCmd_Unk0231
-ScrCmd_Unk0231: ; 0x02045170
- push {r3-r6, lr}
- sub sp, #0x4
- add r5, r0, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl VarGet
- add r6, r0, #0x0
- add r0, r5, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl VarGet
- add r4, r0, #0x0
- mov r1, #0x1
- add r0, sp, #0x0
- add r5, #0x80
- strb r1, [r0, #0x0]
- ldr r0, [r5, #0x0]
- ldr r0, [r0, #0xc]
- bl SavArray_PlayerParty_get
- add r1, r6, #0x0
- bl GetPartyMonByIndex
- add r5, r0, #0x0
- lsl r0, r4, #0x18
- lsr r0, r0, #0x18
- mov r1, #0x0
- bl FUN_0207FC5C
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r2, sp, #0x0
- bl SetMonData
- mov r0, #0x0
- add sp, #0x4
- pop {r3-r6, pc}
- .balign 4
-
- thumb_func_start ScrCmd_Unk02B7
-ScrCmd_Unk02B7: ; 0x020451D0
- push {r3-r7, lr}
- sub sp, #0x8
- add r4, r0, #0x0
- bl ScriptReadHalfword
- add r1, r0, #0x0
- add r0, r4, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- bl GetVarPointer
- str r0, [sp, #0x0]
- add r0, r4, #0x0
- add r0, #0x80
- ldr r0, [r0, #0x0]
- ldr r0, [r0, #0xc]
- bl SavArray_PlayerParty_get
- bl GetPartyCount
- lsl r0, r0, #0x10
- add r4, #0x80
- lsr r6, r0, #0x10
- ldr r0, [r4, #0x0]
- ldr r0, [r0, #0xc]
- bl SavArray_PlayerParty_get
- add r7, r0, #0x0
- mov r0, #0x0
- str r0, [sp, #0x4]
-_0204520C:
- mov r5, #0x0
- cmp r6, #0x0
- bls _0204524C
-_02045212:
- add r0, r7, #0x0
- add r1, r5, #0x0
- bl GetPartyMonByIndex
- mov r1, #0x4c
- mov r2, #0x0
- add r4, r0, #0x0
- bl GetMonData
- cmp r0, #0x0
- beq _02045242
- add r0, r4, #0x0
- mov r1, #0x3
- mov r2, #0x0
- bl GetMonData
- cmp r0, #0x0
- beq _02045242
- ldr r0, [sp, #0x0]
- mov r1, #0x1
- strh r1, [r0, #0x0]
- add sp, #0x8
- mov r0, #0x0
- pop {r3-r7, pc}
-_02045242:
- add r0, r5, #0x1
- lsl r0, r0, #0x10
- lsr r5, r0, #0x10
- cmp r5, r6
- blo _02045212
-_0204524C:
- ldr r0, [sp, #0x4]
- add r0, r0, #0x1
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
- str r0, [sp, #0x4]
- cmp r0, #0x50
- blo _0204520C
- ldr r1, [sp, #0x0]
- mov r0, #0x0
- strh r0, [r1, #0x0]
- add sp, #0x8
- pop {r3-r7, pc}
-
- thumb_func_start ScrCmd_Unk00A0
-ScrCmd_Unk00A0: ; 0x02045264
- mov r0, #0x0
- bx lr
diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s
index a8cd984f..5ddfa9ab 100644
--- a/arm9/asm/unk_02001B80.s
+++ b/arm9/asm/unk_02001B80.s
@@ -141,7 +141,7 @@ FUN_02001C78: ; 0x02001C78
tst r3, r5
beq _02001C9E
ldr r0, _02001D28 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
ldrb r0, [r4, #0x15]
ldr r1, [r4, #0x0]
lsl r0, r0, #0x3
@@ -153,7 +153,7 @@ _02001C9E:
tst r3, r2
beq _02001CAE
ldr r0, _02001D28 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
sub r0, r5, #0x3
pop {r3-r5, pc}
_02001CAE:
@@ -237,7 +237,7 @@ FUN_02001D2C: ; 0x02001D2C
tst r6, r3
beq _02001D54
ldr r0, _02001DD8 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
ldrb r0, [r4, #0x15]
ldr r1, [r4, #0x0]
lsl r0, r0, #0x3
@@ -249,7 +249,7 @@ _02001D54:
tst r6, r5
beq _02001D66
ldr r0, _02001DD8 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x1
mvn r0, r0
pop {r4-r6, pc}
@@ -338,7 +338,7 @@ _02001DF0: ; jump table (using 16-bit offset)
.short _02001E44 - _02001DF0 - 2; case 5
_02001DFC:
ldr r0, _02001E58 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
ldrb r0, [r4, #0x15]
ldr r1, [r4, #0x0]
lsl r0, r0, #0x3
@@ -347,7 +347,7 @@ _02001DFC:
pop {r4, pc}
_02001E0E:
ldr r0, _02001E58 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x1
mvn r0, r0
pop {r4, pc}
@@ -433,7 +433,7 @@ _02001E7C:
add r0, r5, #0x0
bl FUN_02002080
add r0, r6, #0x0
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x1
add sp, #0xc
pop {r4-r7, pc}
diff --git a/arm9/asm/unk_020023C0.s b/arm9/asm/unk_020023C0.s
deleted file mode 100644
index dc0c45ef..00000000
--- a/arm9/asm/unk_020023C0.s
+++ /dev/null
@@ -1,1123 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- .section .bss
-
- .extern gMain
- .extern gMain
-
- .global gTextFlags
-gTextFlags: ; 0x02106FC4
- .space 0x4
-
- .section .rodata
-
- .global UNK_020ECB50
-UNK_020ECB50: ; 0x020ECB50
- .byte 0x00, 0x01, 0x02, 0x01
-
- .text
-
- thumb_func_start RenderText
-RenderText: ; 0x020023C0
- push {r3-r6, lr}
- sub sp, #0xc
- add r4, r0, #0x0
- add r1, r4, #0x0
- add r1, #0x24
- ldrb r1, [r1, #0x0]
- add r6, r4, #0x0
- add r6, #0x1c
- cmp r1, #0x6
- bls _020023D6
- b _02002838
-_020023D6:
- add r1, r1, r1
- add r1, pc
- ldrh r1, [r1, #0x6]
- lsl r1, r1, #0x10
- asr r1, r1, #0x10
- add pc, r1
-_020023E2: ; jump table (using 16-bit offset)
- .short _020023F0 - _020023E2 - 2; case 0
- .short _02002742 - _020023E2 - 2; case 1
- .short _0200275C - _020023E2 - 2; case 2
- .short _02002786 - _020023E2 - 2; case 3
- .short _020027B6 - _020023E2 - 2; case 4
- .short _0200280C - _020023E2 - 2; case 5
- .short _02002818 - _020023E2 - 2; case 6
-_020023F0:
- ldr r0, _02002658 ; =gMain
- ldr r1, [r0, #0x44]
- mov r0, #0x3
- tst r0, r1
- beq _02002402
- ldrb r0, [r6, #0x0]
- lsl r0, r0, #0x1b
- lsr r0, r0, #0x1f
- bne _02002414
-_02002402:
- ldr r0, _0200265C ; =gMain + 0x40
- ldrh r0, [r0, #0x22]
- cmp r0, #0x0
- beq _02002432
- ldr r0, _02002660 ; =gTextFlags
- ldrb r0, [r0, #0x0]
- lsl r0, r0, #0x1b
- lsr r0, r0, #0x1f
- beq _02002432
-_02002414:
- add r0, r4, #0x0
- mov r1, #0x0
- add r0, #0x26
- strb r1, [r0, #0x0]
- add r0, r4, #0x0
- add r0, #0x25
- ldrb r0, [r0, #0x0]
- lsl r0, r0, #0x19
- lsr r0, r0, #0x19
- beq _02002432
- ldr r1, _02002660 ; =gTextFlags
- mov r0, #0x40
- ldrb r2, [r1, #0x0]
- orr r0, r2
- strb r0, [r1, #0x0]
-_02002432:
- add r0, r4, #0x0
- add r0, #0x26
- ldrb r0, [r0, #0x0]
- cmp r0, #0x0
- beq _0200248C
- add r0, r4, #0x0
- add r0, #0x25
- ldrb r0, [r0, #0x0]
- lsl r0, r0, #0x19
- lsr r0, r0, #0x19
- beq _0200248C
- add r0, r4, #0x0
- add r0, #0x26
- ldrb r0, [r0, #0x0]
- sub r1, r0, #0x1
- add r0, r4, #0x0
- add r0, #0x26
- strb r1, [r0, #0x0]
- ldr r0, _02002660 ; =gTextFlags
- ldrb r0, [r0, #0x0]
- lsl r1, r0, #0x1f
- lsr r1, r1, #0x1f
- beq _02002486
- ldr r1, _02002658 ; =gMain
- ldr r2, [r1, #0x48]
- mov r1, #0x3
- tst r1, r2
- bne _02002478
- ldr r1, _0200265C ; =gMain + 0x40
- ldrh r1, [r1, #0x20]
- cmp r1, #0x0
- beq _02002486
- lsl r0, r0, #0x1b
- lsr r0, r0, #0x1f
- beq _02002486
-_02002478:
- ldrb r1, [r6, #0x0]
- mov r0, #0x10
- add r4, #0x26
- orr r0, r1
- strb r0, [r6, #0x0]
- mov r0, #0x0
- strb r0, [r4, #0x0]
-_02002486:
- add sp, #0xc
- mov r0, #0x3
- pop {r3-r6, pc}
-_0200248C:
- add r0, r4, #0x0
- add r0, #0x25
- ldrb r0, [r0, #0x0]
- lsl r0, r0, #0x19
- lsr r1, r0, #0x19
- add r0, r4, #0x0
- add r0, #0x26
- strb r1, [r0, #0x0]
- ldr r0, [r4, #0x0]
- ldrh r5, [r0, #0x0]
- add r0, r0, #0x2
- str r0, [r4, #0x0]
- mov r0, #0xf1
- lsl r0, r0, #0x8
- cmp r5, r0
- bne _020024B0
- bl GF_AssertFail
-_020024B0:
- ldr r0, _02002664 ; =0x0000F0FD
- cmp r5, r0
- bgt _020024DA
- bge _0200250E
- ldr r1, _02002668 ; =0x000025BD \f
- cmp r5, r1
- bgt _020024D0
- sub r0, r1, #0x1 ; \r
- cmp r5, r0
- blt _020024CE
- bne _020024C8
- b _020026D8
-_020024C8:
- cmp r5, r1
- bne _020024CE
- b _020026EC
-_020024CE:
- b _02002700
-_020024D0:
- mov r0, #0xe
- lsl r0, r0, #0xc
- cmp r5, r0
- beq _020024F2
- b _02002700
-_020024DA:
- ldr r0, _0200266C ; =0x0000FFFE EXT_CTRL_CODE_BEGIN
- cmp r5, r0
- bgt _020024E4
- beq _0200251A
- b _02002700
-_020024E4:
- add r0, r0, #0x1 ; =0x0000FFFF EOS
- cmp r5, r0
- beq _020024EC
- b _02002700
-_020024EC:
- add sp, #0xc
- mov r0, #0x1
- pop {r3-r6, pc}
-_020024F2:
- ldrb r0, [r4, #0xa]
- mov r1, #0x1
- strb r0, [r4, #0xc]
- ldrb r0, [r4, #0x9]
- bl GetFontAttribute
- ldrb r1, [r4, #0xf]
- ldrb r2, [r4, #0xd]
- add sp, #0xc
- add r0, r1, r0
- add r0, r2, r0
- strb r0, [r4, #0xd]
- mov r0, #0x2
- pop {r3-r6, pc}
-_0200250E:
- ldr r0, [r4, #0x0]
- add sp, #0xc
- add r0, r0, #0x2
- str r0, [r4, #0x0]
- mov r0, #0x2
- pop {r3-r6, pc}
-_0200251A:
- ldr r0, [r4, #0x0]
- sub r0, r0, #0x2
- str r0, [r4, #0x0]
- bl MsgArray_GetControlCode
- lsl r0, r0, #0x10
- ldr r1, _02002670 ; =0x0000FE06
- lsr r0, r0, #0x10
- cmp r0, r1
- bgt _02002552
- blt _02002532
- b _02002678
-_02002532:
- mov r1, #0x2
- lsl r1, r1, #0x8
- sub r1, r0, r1
- cmp r1, #0x4
- bhi _0200255C
- add r1, r1, r1
- add r1, pc
- ldrh r1, [r1, #0x6]
- lsl r1, r1, #0x10
- asr r1, r1, #0x10
- add pc, r1
-_02002548: ; jump table (using 16-bit offset)
- .short _020025B4 - _02002548 - 2; case 0x200
- .short _020025DE - _02002548 - 2; case 0x201
- .short _02002600 - _02002548 - 2; case 0x202
- .short _02002618 - _02002548 - 2; case 0x203
- .short _02002624 - _02002548 - 2; case 0x204
-_02002552:
- mov r1, #0xff
- lsl r1, r1, #0x8
- cmp r0, r1
- bgt _0200255E
- beq _02002566
-_0200255C:
- b _020026CA
-_0200255E:
- add r1, r1, #0x1
- cmp r0, r1
- beq _02002630
- b _020026CA
-_02002566:
- ldr r0, [r4, #0x0]
- mov r1, #0x0
- bl MsgArray_ControlCodeGetField
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
- cmp r0, #0xff
- bne _02002596
- ldrb r0, [r4, #0x11]
- ldrb r2, [r4, #0x17]
- sub r1, r0, #0x1
- lsr r0, r1, #0x1f
- add r0, r1, r0
- asr r0, r0, #0x1
- add r0, #0x64
- strb r0, [r4, #0x17]
- cmp r2, #0x64
- blo _02002644
- cmp r2, #0x6b
- bhs _02002644
- sub r2, #0x64
- lsl r0, r2, #0x10
- lsr r0, r0, #0x10
- b _0200259E
-_02002596:
- cmp r0, #0x64
- blo _0200259E
- strb r0, [r4, #0x17]
- b _020026CA
-_0200259E:
- lsl r1, r0, #0x1
- add r0, r1, #0x1
- strb r0, [r4, #0x11]
- add r0, r1, #0x2
- strb r0, [r4, #0x13]
- ldrb r0, [r4, #0x11]
- ldrb r1, [r4, #0x12]
- ldrb r2, [r4, #0x13]
- bl GenerateFontHalfRowLookupTable
- b _020026CA
-_020025B4:
- ldr r0, [r4, #0x0]
- mov r1, #0x0
- bl MsgArray_ControlCodeGetField
- lsl r0, r0, #0x10
- lsr r3, r0, #0x10
- ldrb r1, [r4, #0xc]
- ldrb r2, [r4, #0xd]
- add r0, r4, #0x0
- bl FUN_0201C1EC
- add r0, r4, #0x0
- add r0, #0x25
- ldrb r0, [r0, #0x0]
- lsl r0, r0, #0x18
- lsr r0, r0, #0x1f
- beq _020026CA
- ldr r0, [r4, #0x4]
- bl CopyWindowToVram
- b _020026CA
-_020025DE:
- ldr r0, [r4, #0x0]
- mov r1, #0x0
- bl MsgArray_ControlCodeGetField
- add r1, r4, #0x0
- add r1, #0x26
- strb r0, [r1, #0x0]
- ldr r0, [r4, #0x0]
- bl MsgArray_SkipControlCode
- str r0, [r4, #0x0]
- mov r0, #0x6
- add r4, #0x24
- strb r0, [r4, #0x0]
- add sp, #0xc
- mov r0, #0x3
- pop {r3-r6, pc}
-_02002600:
- ldr r0, [r4, #0x0]
- mov r1, #0x0
- bl MsgArray_ControlCodeGetField
- strh r0, [r4, #0x2a]
- ldr r0, [r4, #0x0]
- bl MsgArray_SkipControlCode
- str r0, [r4, #0x0]
- add sp, #0xc
- mov r0, #0x3
- pop {r3-r6, pc}
-_02002618:
- ldr r0, [r4, #0x0]
- mov r1, #0x0
- bl MsgArray_ControlCodeGetField
- strb r0, [r4, #0xc]
- b _020026CA
-_02002624:
- ldr r0, [r4, #0x0]
- mov r1, #0x0
- bl MsgArray_ControlCodeGetField
- strb r0, [r4, #0xd]
- b _020026CA
-_02002630:
- ldr r0, [r4, #0x0]
- mov r1, #0x0
- bl MsgArray_ControlCodeGetField
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
- cmp r0, #0x64
- beq _02002646
- cmp r0, #0xc8
- beq _0200264E
-_02002644:
- b _020026CA
-_02002646:
- mov r0, #0x0
- strh r0, [r4, #0x14]
- strb r0, [r4, #0x16]
- b _020026CA
-_0200264E:
- ldr r0, _02002674 ; =0x0000FFFC
- strh r0, [r4, #0x14]
- mov r0, #0x0
- strb r0, [r4, #0x16]
- b _020026CA
- .balign 4
-_02002658: .word gMain
-_0200265C: .word gMain + 0x40
-_02002660: .word gTextFlags
-_02002664: .word 0x0000F0FD
-_02002668: .word 0x000025BD
-_0200266C: .word 0x0000FFFE
-_02002670: .word 0x0000FE06
-_02002674: .word 0x0000FFFC
-_02002678:
- ldr r0, [r4, #0x0]
- mov r1, #0x0
- bl MsgArray_ControlCodeGetField
- lsl r0, r0, #0x10
- lsr r1, r0, #0x10
- mov r0, #0xfe
- lsl r0, r0, #0x8
- cmp r1, r0
- beq _020026AE
- add r0, r0, #0x1
- cmp r1, r0
- bne _020026CA
- add r0, r4, #0x0
- mov r1, #0x2
- add r0, #0x24
- strb r1, [r0, #0x0]
- add r0, r4, #0x0
- bl FUN_0200284C
- ldr r0, [r4, #0x0]
- bl MsgArray_SkipControlCode
- str r0, [r4, #0x0]
- add sp, #0xc
- mov r0, #0x3
- pop {r3-r6, pc}
-_020026AE:
- add r0, r4, #0x0
- mov r1, #0x3
- add r0, #0x24
- strb r1, [r0, #0x0]
- add r0, r4, #0x0
- bl FUN_0200284C
- ldr r0, [r4, #0x0]
- bl MsgArray_SkipControlCode
- str r0, [r4, #0x0]
- add sp, #0xc
- mov r0, #0x3
- pop {r3-r6, pc}
-_020026CA:
- ldr r0, [r4, #0x0]
- bl MsgArray_SkipControlCode
- str r0, [r4, #0x0]
- add sp, #0xc
- mov r0, #0x2
- pop {r3-r6, pc}
-_020026D8:
- add r0, r4, #0x0
- mov r1, #0x2
- add r0, #0x24
- strb r1, [r0, #0x0]
- add r0, r4, #0x0
- bl FUN_0200284C
- add sp, #0xc
- mov r0, #0x3
- pop {r3-r6, pc}
-_020026EC:
- add r0, r4, #0x0
- mov r1, #0x3
- add r0, #0x24
- strb r1, [r0, #0x0]
- add r0, r4, #0x0
- bl FUN_0200284C
- add sp, #0xc
- mov r0, #0x3
- pop {r3-r6, pc}
-_02002700:
- ldrb r0, [r6, #0x0]
- add r1, r5, #0x0
- lsl r0, r0, #0x1c
- lsr r0, r0, #0x1c
- bl FUN_02002D94
- add r5, r0, #0x0
- ldrb r0, [r4, #0xc]
- add r2, r5, #0x0
- add r3, r5, #0x0
- str r0, [sp, #0x0]
- ldrb r0, [r4, #0xd]
- add r2, #0x80
- add r3, #0x81
- str r0, [sp, #0x4]
- ldrh r0, [r4, #0x14]
- add r1, r5, #0x0
- str r0, [sp, #0x8]
- ldrb r2, [r2, #0x0]
- ldrb r3, [r3, #0x0]
- ldr r0, [r4, #0x4]
- bl CopyGlyphToWindow
- add r5, #0x80
- ldrb r1, [r5, #0x0]
- ldrb r0, [r4, #0xe]
- ldrb r2, [r4, #0xc]
- add sp, #0xc
- add r0, r1, r0
- add r0, r2, r0
- strb r0, [r4, #0xc]
- mov r0, #0x0
- pop {r3-r6, pc}
-_02002742:
- bl FUN_02002B3C
- cmp r0, #0x0
- beq _02002756
- add r0, r4, #0x0
- bl FUN_02002A00
- mov r0, #0x0
- add r4, #0x24
- strb r0, [r4, #0x0]
-_02002756:
- add sp, #0xc
- mov r0, #0x3
- pop {r3-r6, pc}
-_0200275C:
- bl FUN_02002B18
- cmp r0, #0x0
- beq _02002780
- add r0, r4, #0x0
- bl FUN_02002A00
- ldrb r1, [r4, #0x12]
- ldr r0, [r4, #0x4]
- bl FillWindowPixelBuffer
- ldrb r0, [r4, #0xa]
- strb r0, [r4, #0xc]
- ldrb r0, [r4, #0xb]
- strb r0, [r4, #0xd]
- mov r0, #0x0
- add r4, #0x24
- strb r0, [r4, #0x0]
-_02002780:
- add sp, #0xc
- mov r0, #0x3
- pop {r3-r6, pc}
-_02002786:
- bl FUN_02002B18
- cmp r0, #0x0
- beq _020027B0
- add r0, r4, #0x0
- bl FUN_02002A00
- ldrb r0, [r4, #0x9]
- mov r1, #0x1
- bl GetFontAttribute
- ldrb r1, [r4, #0xf]
- add r1, r1, r0
- add r0, r4, #0x0
- add r0, #0x27
- strb r1, [r0, #0x0]
- ldrb r0, [r4, #0xa]
- strb r0, [r4, #0xc]
- mov r0, #0x4
- add r4, #0x24
- strb r0, [r4, #0x0]
-_020027B0:
- add sp, #0xc
- mov r0, #0x3
- pop {r3-r6, pc}
-_020027B6:
- add r0, #0x27
- ldrb r2, [r0, #0x0]
- cmp r2, #0x0
- beq _02002800
- cmp r2, #0x4
- ldrb r5, [r4, #0x12]
- bge _020027D8
- lsl r3, r5, #0x4
- orr r3, r5
- lsl r3, r3, #0x18
- ldr r0, [r4, #0x4]
- mov r1, #0x0
- lsr r3, r3, #0x18
- bl ScrollWindow
- mov r1, #0x0
- b _020027F2
-_020027D8:
- lsl r3, r5, #0x4
- orr r3, r5
- lsl r3, r3, #0x18
- ldr r0, [r4, #0x4]
- mov r1, #0x0
- mov r2, #0x4
- lsr r3, r3, #0x18
- bl ScrollWindow
- add r0, r4, #0x0
- add r0, #0x27
- ldrb r0, [r0, #0x0]
- sub r1, r0, #0x4
-_020027F2:
- add r0, r4, #0x0
- add r0, #0x27
- strb r1, [r0, #0x0]
- ldr r0, [r4, #0x4]
- bl CopyWindowToVram
- b _02002806
-_02002800:
- mov r0, #0x0
- add r4, #0x24
- strb r0, [r4, #0x0]
-_02002806:
- add sp, #0xc
- mov r0, #0x3
- pop {r3-r6, pc}
-_0200280C:
- mov r0, #0x0
- add r4, #0x24
- strb r0, [r4, #0x0]
- add sp, #0xc
- mov r0, #0x3
- pop {r3-r6, pc}
-_02002818:
- add r0, #0x26
- ldrb r0, [r0, #0x0]
- cmp r0, #0x0
- beq _0200282C
- add r0, r4, #0x0
- add r0, #0x26
- ldrb r0, [r0, #0x0]
- add r4, #0x26
- sub r0, r0, #0x1
- b _02002830
-_0200282C:
- mov r0, #0x0
- add r4, #0x24
-_02002830:
- add sp, #0xc
- strb r0, [r4, #0x0]
- mov r0, #0x3
- pop {r3-r6, pc}
-_02002838:
- mov r0, #0x1
- add sp, #0xc
- pop {r3-r6, pc}
- .balign 4
-
- thumb_func_start FUN_02002840
-FUN_02002840: ; 0x02002840
- ldr r1, _02002848 ; =gTextFlags
- strh r0, [r1, #0x2]
- bx lr
- nop
-_02002848: .word gTextFlags
-
- thumb_func_start FUN_0200284C
-FUN_0200284C: ; 0x0200284C
- ldr r1, _02002874 ; =gTextFlags
- add r0, #0x1c
- ldrb r1, [r1, #0x0]
- lsl r1, r1, #0x1d
- lsr r1, r1, #0x1f
- beq _02002862
- ldrb r2, [r0, #0x2]
- mov r1, #0xff
- bic r2, r1
- strb r2, [r0, #0x2]
- bx lr
-_02002862:
- ldrb r2, [r0, #0x1]
- mov r1, #0x60
- bic r2, r1
- strb r2, [r0, #0x1]
- ldrb r2, [r0, #0x1]
- mov r1, #0x1f
- bic r2, r1
- strb r2, [r0, #0x1]
- bx lr
- .balign 4
-_02002874: .word gTextFlags
-
- thumb_func_start FUN_02002878
-FUN_02002878: ; 0x02002878
- push {r4-r7, lr}
- sub sp, #0x2c
- add r5, r0, #0x0
- ldr r0, _020029F8 ; =gTextFlags
- add r4, r5, #0x0
- ldrb r0, [r0, #0x0]
- add r4, #0x1c
- lsl r0, r0, #0x1d
- lsr r0, r0, #0x1f
- beq _0200288E
- b _020029F4
-_0200288E:
- ldrb r0, [r4, #0x1]
- lsl r1, r0, #0x1b
- lsr r2, r1, #0x1b
- beq _020028AC
- mov r1, #0x1f
- add r2, #0xff
- bic r0, r1
- lsl r1, r2, #0x18
- lsr r2, r1, #0x18
- mov r1, #0x1f
- and r1, r2
- orr r0, r1
- add sp, #0x2c
- strb r0, [r4, #0x1]
- pop {r4-r7, pc}
-_020028AC:
- ldr r0, [r5, #0x4]
- bl GetWindowBgId
- str r0, [sp, #0x20]
- ldr r0, [r5, #0x4]
- bl GetWindowX
- str r0, [sp, #0x24]
- ldr r0, [r5, #0x4]
- bl GetWindowY
- str r0, [sp, #0x28]
- ldr r0, [r5, #0x4]
- bl GetWindowWidth
- ldr r1, _020029F8 ; =gTextFlags
- ldrh r6, [r1, #0x2]
- ldr r1, [sp, #0x28]
- add r7, r1, #0x2
- ldr r1, [sp, #0x24]
- add r2, r6, #0x0
- add r0, r1, r0
- str r0, [sp, #0x1c]
- add r0, r0, #0x1
- str r0, [sp, #0x18]
- lsl r0, r7, #0x18
- lsr r0, r0, #0x18
- str r0, [sp, #0x0]
- mov r0, #0x1
- str r0, [sp, #0x4]
- str r0, [sp, #0x8]
- mov r0, #0x10
- str r0, [sp, #0xc]
- add r2, #0x12
- mov r12, r2
- ldrb r2, [r4, #0x1]
- ldr r0, [r5, #0x4]
- ldr r1, [sp, #0x20]
- lsl r2, r2, #0x19
- lsr r3, r2, #0x1e
- ldr r2, _020029FC ; =UNK_020ECB50
- ldr r0, [r0, #0x0]
- ldrb r2, [r2, r3]
- mov r3, r12
- lsl r2, r2, #0x2
- add r2, r3, r2
- ldr r3, [sp, #0x18]
- lsl r2, r2, #0x10
- lsl r3, r3, #0x18
- lsr r2, r2, #0x10
- lsr r3, r3, #0x18
- bl FillBgTilemapRect
- ldr r0, [sp, #0x1c]
- ldr r1, [sp, #0x20]
- add r0, r0, #0x2
- str r0, [sp, #0x10]
- lsl r0, r7, #0x18
- lsr r0, r0, #0x18
- str r0, [sp, #0x0]
- mov r0, #0x1
- str r0, [sp, #0x4]
- str r0, [sp, #0x8]
- mov r0, #0x10
- str r0, [sp, #0xc]
- ldrb r2, [r4, #0x1]
- add r7, r6, #0x0
- ldr r0, [r5, #0x4]
- lsl r2, r2, #0x19
- lsr r3, r2, #0x1e
- ldr r2, _020029FC ; =UNK_020ECB50
- add r7, #0x13
- ldrb r2, [r2, r3]
- ldr r3, [sp, #0x10]
- ldr r0, [r0, #0x0]
- lsl r2, r2, #0x2
- add r2, r7, r2
- lsl r2, r2, #0x10
- lsl r3, r3, #0x18
- lsr r2, r2, #0x10
- lsr r3, r3, #0x18
- bl FillBgTilemapRect
- ldr r0, [sp, #0x28]
- add r7, r6, #0x0
- add r0, r0, #0x3
- str r0, [sp, #0x14]
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- str r0, [sp, #0x0]
- mov r0, #0x1
- str r0, [sp, #0x4]
- str r0, [sp, #0x8]
- mov r0, #0x10
- str r0, [sp, #0xc]
- ldrb r2, [r4, #0x1]
- ldr r0, [r5, #0x4]
- add r7, #0x14
- lsl r2, r2, #0x19
- lsr r3, r2, #0x1e
- ldr r2, _020029FC ; =UNK_020ECB50
- ldr r0, [r0, #0x0]
- ldrb r2, [r2, r3]
- ldr r3, [sp, #0x18]
- ldr r1, [sp, #0x20]
- lsl r2, r2, #0x2
- add r2, r7, r2
- lsl r2, r2, #0x10
- lsl r3, r3, #0x18
- lsr r2, r2, #0x10
- lsr r3, r3, #0x18
- bl FillBgTilemapRect
- ldr r0, [sp, #0x14]
- add r6, #0x15
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- str r0, [sp, #0x0]
- mov r0, #0x1
- str r0, [sp, #0x4]
- str r0, [sp, #0x8]
- mov r0, #0x10
- str r0, [sp, #0xc]
- ldrb r2, [r4, #0x1]
- ldr r0, [r5, #0x4]
- ldr r1, [sp, #0x20]
- lsl r2, r2, #0x19
- lsr r3, r2, #0x1e
- ldr r2, _020029FC ; =UNK_020ECB50
- ldr r0, [r0, #0x0]
- ldrb r2, [r2, r3]
- ldr r3, [sp, #0x10]
- lsl r2, r2, #0x2
- add r2, r6, r2
- lsl r2, r2, #0x10
- lsl r3, r3, #0x18
- lsr r2, r2, #0x10
- lsr r3, r3, #0x18
- bl FillBgTilemapRect
- ldr r0, [r5, #0x4]
- ldr r1, [sp, #0x20]
- ldr r0, [r0, #0x0]
- bl BgCommitTilemapBufferToVram
- ldrb r1, [r4, #0x1]
- mov r0, #0x1f
- bic r1, r0
- mov r0, #0x8
- orr r0, r1
- strb r0, [r4, #0x1]
- ldrb r2, [r4, #0x1]
- mov r1, #0x60
- add r0, r2, #0x0
- bic r0, r1
- lsl r1, r2, #0x19
- lsr r1, r1, #0x1e
- add r1, r1, #0x1
- lsl r1, r1, #0x18
- lsr r1, r1, #0x18
- lsl r1, r1, #0x1e
- lsr r1, r1, #0x19
- orr r0, r1
- strb r0, [r4, #0x1]
-_020029F4:
- add sp, #0x2c
- pop {r4-r7, pc}
- .balign 4
-_020029F8: .word gTextFlags
-_020029FC: .word UNK_020ECB50
-
- thumb_func_start FUN_02002A00
-FUN_02002A00: ; 0x02002A00
- push {r3-r7, lr}
- sub sp, #0x18
- add r5, r0, #0x0
- ldr r0, [r5, #0x4]
- bl GetWindowBgId
- str r0, [sp, #0x10]
- ldr r0, [r5, #0x4]
- bl GetWindowX
- str r0, [sp, #0x14]
- ldr r0, [r5, #0x4]
- bl GetWindowY
- add r6, r0, #0x0
- ldr r0, [r5, #0x4]
- bl GetWindowWidth
- ldr r1, _02002A90 ; =gTextFlags
- add r7, r6, #0x2
- ldrh r4, [r1, #0x2]
- ldr r1, [sp, #0x14]
- add r6, r1, r0
- lsl r0, r7, #0x18
- lsr r0, r0, #0x18
- str r0, [sp, #0x0]
- mov r0, #0x1
- str r0, [sp, #0x4]
- mov r0, #0x2
- str r0, [sp, #0x8]
- mov r0, #0x10
- str r0, [sp, #0xc]
- ldr r0, [r5, #0x4]
- add r2, r4, #0x0
- add r2, #0xa
- add r3, r6, #0x1
- lsl r2, r2, #0x10
- lsl r3, r3, #0x18
- ldr r0, [r0, #0x0]
- ldr r1, [sp, #0x10]
- lsr r2, r2, #0x10
- lsr r3, r3, #0x18
- bl FillBgTilemapRect
- lsl r0, r7, #0x18
- lsr r0, r0, #0x18
- str r0, [sp, #0x0]
- mov r0, #0x1
- str r0, [sp, #0x4]
- mov r0, #0x2
- str r0, [sp, #0x8]
- mov r0, #0x10
- str r0, [sp, #0xc]
- ldr r0, [r5, #0x4]
- add r4, #0xb
- add r3, r6, #0x2
- lsl r2, r4, #0x10
- lsl r3, r3, #0x18
- ldr r0, [r0, #0x0]
- ldr r1, [sp, #0x10]
- lsr r2, r2, #0x10
- lsr r3, r3, #0x18
- bl FillBgTilemapRect
- ldr r0, [r5, #0x4]
- ldr r1, [sp, #0x10]
- ldr r0, [r0, #0x0]
- bl BgCommitTilemapBufferToVram
- add sp, #0x18
- pop {r3-r7, pc}
- nop
-_02002A90: .word gTextFlags
-
- thumb_func_start FUN_02002A94
-FUN_02002A94: ; 0x02002A94
- push {r3, lr}
- ldr r0, _02002ACC ; =gMain
- ldr r1, [r0, #0x48]
- mov r0, #0x3
- tst r0, r1
- bne _02002AB2
- ldr r0, _02002AD0 ; =gMain + 0x40
- ldrh r0, [r0, #0x20]
- cmp r0, #0x0
- beq _02002AC6
- ldr r0, _02002AD4 ; =gTextFlags
- ldrb r0, [r0, #0x0]
- lsl r0, r0, #0x1b
- lsr r0, r0, #0x1f
- beq _02002AC6
-_02002AB2:
- ldr r0, _02002AD8 ; =0x000005DC
- bl FUN_020054C8
- ldr r1, _02002AD4 ; =gTextFlags
- mov r0, #0x80
- ldrb r2, [r1, #0x0]
- orr r0, r2
- strb r0, [r1, #0x0]
- mov r0, #0x1
- pop {r3, pc}
-_02002AC6:
- mov r0, #0x0
- pop {r3, pc}
- nop
-_02002ACC: .word gMain
-_02002AD0: .word gMain + 0x40
-_02002AD4: .word gTextFlags
-_02002AD8: .word 0x000005DC
-
- thumb_func_start FUN_02002ADC
-FUN_02002ADC: ; 0x02002ADC
- push {r4, lr}
- add r2, r0, #0x0
- add r2, #0x1c
- ldrb r1, [r2, #0x2]
- add r4, r1, #0x0
- cmp r4, #0x64
- bne _02002AEE
- mov r0, #0x1
- pop {r4, pc}
-_02002AEE:
- mov r3, #0xff
- bic r1, r3
- add r3, r4, #0x1
- lsl r3, r3, #0x18
- lsr r3, r3, #0x18
- lsl r3, r3, #0x18
- lsr r3, r3, #0x18
- orr r1, r3
- strb r1, [r2, #0x2]
- ldr r1, _02002B14 ; =gTextFlags
- ldrb r1, [r1, #0x0]
- lsl r1, r1, #0x1a
- lsr r1, r1, #0x1f
- beq _02002B10
- bl FUN_02002A94
- pop {r4, pc}
-_02002B10:
- mov r0, #0x0
- pop {r4, pc}
- .balign 4
-_02002B14: .word gTextFlags
-
- thumb_func_start FUN_02002B18
-FUN_02002B18: ; 0x02002B18
- push {r4, lr}
- ldr r1, _02002B38 ; =gTextFlags
- add r4, r0, #0x0
- ldrb r1, [r1, #0x0]
- lsl r1, r1, #0x1d
- lsr r1, r1, #0x1f
- beq _02002B2C
- bl FUN_02002ADC
- pop {r4, pc}
-_02002B2C:
- bl FUN_02002878
- add r0, r4, #0x0
- bl FUN_02002A94
- pop {r4, pc}
- .balign 4
-_02002B38: .word gTextFlags
-
- thumb_func_start FUN_02002B3C
-FUN_02002B3C: ; 0x02002B3C
- push {r3, lr}
- ldr r1, _02002B5C ; =gTextFlags
- ldrb r1, [r1, #0x0]
- lsl r1, r1, #0x1d
- lsr r1, r1, #0x1f
- beq _02002B52
- bl FUN_02002ADC
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- pop {r3, pc}
-_02002B52:
- bl FUN_02002A94
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- pop {r3, pc}
- .balign 4
-_02002B5C: .word gTextFlags
-
- thumb_func_start FUN_02002B60
-FUN_02002B60: ; 0x02002B60
- ldr r2, _02002B78 ; =gTextFlags
- mov r1, #0x1
- ldrb r3, [r2, #0x0]
- lsl r0, r0, #0x18
- bic r3, r1
- lsr r1, r0, #0x18
- mov r0, #0x1
- and r0, r1
- orr r0, r3
- strb r0, [r2, #0x0]
- bx lr
- nop
-_02002B78: .word gTextFlags
-
- thumb_func_start FUN_02002B7C
-FUN_02002B7C: ; 0x02002B7C
- push {r3-r4}
- ldr r1, _02002BB4 ; =gTextFlags
- mov r3, #0x4
- ldrb r2, [r1, #0x0]
- mov r4, #0x1
- bic r2, r3
- add r3, r0, #0x0
- and r3, r4
- lsl r3, r3, #0x18
- lsr r3, r3, #0x18
- lsl r3, r3, #0x1f
- lsr r3, r3, #0x1d
- orr r2, r3
- asr r0, r0, #0x1
- and r0, r4
- strb r2, [r1, #0x0]
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- lsl r0, r0, #0x1f
- ldrb r2, [r1, #0x0]
- mov r3, #0x20
- lsr r0, r0, #0x1a
- bic r2, r3
- orr r0, r2
- strb r0, [r1, #0x0]
- pop {r3-r4}
- bx lr
- nop
-_02002BB4: .word gTextFlags
-
- thumb_func_start FUN_02002BB8
-FUN_02002BB8: ; 0x02002BB8
- ldr r2, _02002BD0 ; =gTextFlags
- lsl r0, r0, #0x18
- ldrb r3, [r2, #0x0]
- lsr r0, r0, #0x18
- mov r1, #0x10
- lsl r0, r0, #0x1f
- bic r3, r1
- lsr r0, r0, #0x1b
- orr r0, r3
- strb r0, [r2, #0x0]
- bx lr
- nop
-_02002BD0: .word gTextFlags
-
- thumb_func_start FUN_02002BD4
-FUN_02002BD4: ; 0x02002BD4
- ldr r0, _02002BE0 ; =gTextFlags
- ldrb r0, [r0, #0x0]
- lsl r0, r0, #0x19
- lsr r0, r0, #0x1f
- bx lr
- nop
-_02002BE0: .word gTextFlags
-
- thumb_func_start FUN_02002BE4
-FUN_02002BE4: ; 0x02002BE4
- ldr r1, _02002BF0 ; =gTextFlags
- mov r0, #0x40
- ldrb r2, [r1, #0x0]
- bic r2, r0
- strb r2, [r1, #0x0]
- bx lr
- .balign 4
-_02002BF0: .word gTextFlags
-
- thumb_func_start FUN_02002BF4
-FUN_02002BF4: ; 0x02002BF4
- ldr r0, _02002C00 ; =gTextFlags
- ldrb r0, [r0, #0x0]
- lsl r0, r0, #0x18
- lsr r0, r0, #0x1f
- bx lr
- nop
-_02002C00: .word gTextFlags
-
- thumb_func_start FUN_02002C04
-FUN_02002C04: ; 0x02002C04
- ldr r1, _02002C10 ; =gTextFlags
- mov r0, #0x80
- ldrb r2, [r1, #0x0]
- bic r2, r0
- strb r2, [r1, #0x0]
- bx lr
- .balign 4
-_02002C10: .word gTextFlags
diff --git a/arm9/asm/unk_020051F4.s b/arm9/asm/unk_020051F4.s
index ea77f3ae..d6d06005 100644
--- a/arm9/asm/unk_020051F4.s
+++ b/arm9/asm/unk_020051F4.s
@@ -331,7 +331,7 @@ FUN_020054A8: ; 0x020054A8
push {r4-r6, lr}
add r5, r0, #0x0
add r4, r1, #0x0
- bl FUN_020054C8
+ bl PlaySE
add r6, r0, #0x0
ldr r1, _020054C4 ; =0x0000FFFF
add r0, r5, #0x0
@@ -342,8 +342,8 @@ FUN_020054A8: ; 0x020054A8
nop
_020054C4: .word 0x0000FFFF
- thumb_func_start FUN_020054C8
-FUN_020054C8: ; 0x020054C8
+ thumb_func_start PlaySE
+PlaySE: ; 0x020054C8
push {r4-r6, lr}
add r5, r0, #0x0
bl FUN_020048D0
diff --git a/arm9/asm/unk_02014590.s b/arm9/asm/unk_02014590.s
index 201e2a14..42aad43e 100644
--- a/arm9/asm/unk_02014590.s
+++ b/arm9/asm/unk_02014590.s
@@ -424,7 +424,7 @@ FUN_02014878: ; 0x02014878
add r2, #0x9a
strb r0, [r2, #0x0]
ldr r0, _020148A4 ; =0x000005E4
- bl FUN_020054C8
+ bl PlaySE
_020148A2:
pop {r4, pc}
.balign 4
diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s
index 245c750f..f2ef44dc 100644
--- a/arm9/asm/unk_02035068.s
+++ b/arm9/asm/unk_02035068.s
@@ -215,7 +215,7 @@ FUN_020351A0: ; 0x020351A0
push {r3-r5, lr}
add r5, r0, #0x0
ldr r0, _0203524C ; =0x000005FD
- bl FUN_020054C8
+ bl PlaySE
bl FUN_02035254
add r4, r0, #0x0
mov r0, #0x71
@@ -2326,9 +2326,9 @@ FUN_020362E4: ; 0x020362E4
bl FUN_0204652C
add r4, r0, #0x0
mov r0, #0xb
- bl BagView_new
+ bl BagView_New
str r0, [sp, #0x8]
- bl FUN_0206E308
+ bl BagView_sizeof
mov r1, #0x7e
lsl r1, r1, #0x2
add r2, r0, #0x0
diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index a2718433..e40bd803 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -430,8 +430,8 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_Unk0116
.word ScrCmd_Unk0117
.word ScrCmd_Unk0118
- .word ScrCmd_Unk0119
- .word ScrCmd_Unk011A
+ .word ScrCmd_CheckPartyForPokerus
+ .word ScrCmd_GetPartyMonGender
.word ScrCmd_Unk011B
.word ScrCmd_Unk011C
.word ScrCmd_Unk011D
@@ -524,7 +524,7 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_Unk0174
.word ScrCmd_Unk0175
.word ScrCmd_Unk0176
- .word ScrCmd_Unk0177
+ .word ScrCmd_CountPartyMons
.word ScrCmd_Unk0178
.word ScrCmd_Unk0179
.word ScrCmd_Unk017A
@@ -557,12 +557,12 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_Unk0195
.word ScrCmd_Unk0196
.word ScrCmd_Unk0197
- .word ScrCmd_GetPartySpecies
+ .word ScrCmd_GetPartyMonSpecies
.word ScrCmd_CheckPartyMonOTID
- .word ScrCmd_Unk019A
- .word ScrCmd_Unk019B
- .word ScrCmd_Unk019C
- .word ScrCmd_Unk019D
+ .word ScrCmd_CountPartyMons_OmitEggs
+ .word ScrCmd_CountAvailablePartyMons_IgnoreSlot
+ .word ScrCmd_CountAvailablePartyAndPCMons
+ .word ScrCmd_GetPartyEggCount
.word ScrCmd_Unk019E
.word ScrCmd_Unk019F
.word ScrCmd_Unk01A0
@@ -591,13 +591,13 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_Unk01B7
.word ScrCmd_Unk01B8
.word ScrCmd_GetPartyMonFriendship
- .word ScrCmd_Unk01BA
- .word ScrCmd_Unk01BB
+ .word ScrCmd_AddPartyMonFriendship
+ .word ScrCmd_SubtractPartyMonFriendship
.word ScrCmd_Unk01BC
.word ScrCmd_Unk01BD
.word ScrCmd_Unk01BE
.word ScrCmd_Unk01BF
- .word ScrCmd_Unk01C0
+ .word ScrCmd_CheckPartyForSpecies
.word ScrCmd_Unk01C1
.word ScrCmd_Unk01C2
.word ScrCmd_Unk01C3
@@ -605,9 +605,9 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_Unk01C5
.word ScrCmd_Unk01C6
.word ScrCmd_Unk01C7
- .word ScrCmd_Unk01C8
- .word ScrCmd_Unk01C9
- .word ScrCmd_Unk01CA
+ .word ScrCmd_CountPartyMonMoves
+ .word ScrCmd_ForgetPartyMonMove
+ .word ScrCmd_GetPartyMonMove
.word ScrCmd_GetPokemonMoveName
.word ScrCmd_Unk01CC
.word ScrCmd_Unk01CD
@@ -643,9 +643,9 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_Unk01EB
.word ScrCmd_Unk01EC
.word ScrCmd_Unk01ED
- .word ScrCmd_Unk01EE
+ .word ScrCmd_GetPartyMonHeldItem
.word ScrCmd_Unk01EF
- .word ScrCmd_Unk01F0
+ .word ScrCmd_ResetPartyMonHeldItem
.word ScrCmd_CountFossils
.word ScrCmd_Unk01F2
.word ScrCmd_Unk01F3
@@ -707,10 +707,10 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_Unk022B
.word ScrCmd_Unk022C
.word ScrCmd_Unk022D
- .word ScrCmd_Unk022E
- .word ScrCmd_Unk022F
- .word ScrCmd_Unk0230
- .word ScrCmd_Unk0231
+ .word ScrCmd_CountPartyMonRibbons
+ .word ScrCmd_CountTotalPartyRibbons
+ .word ScrCmd_PartyMonHasRibbon
+ .word ScrCmd_GivePartyMonRibbon
.word ScrCmd_GetRibbonName
.word ScrCmd_Unk0233
.word ScrCmd_Unk0234
@@ -732,8 +732,8 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_Unk0244
.word ScrCmd_Unk0245
.word ScrCmd_GameVersion
- .word ScrCmd_Unk0247
- .word ScrCmd_Unk0248
+ .word ScrCmd_GetLeadingPartyMonSlot
+ .word ScrCmd_GetPartyMonTypes
.word ScrCmd_GiveWallpaper
.word ScrCmd_Unk024A
.word ScrCmd_Unk024B
@@ -790,7 +790,7 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_Unk027E
.word ScrCmd_Unk027F
.word ScrCmd_Unk0280
- .word ScrCmd_Unk0281
+ .word ScrCmd_GetPartyMonContestCondition
.word ScrCmd_Unk0282
.word ScrCmd_SetVolume
.word ScrCmd_Unk0284
@@ -844,7 +844,7 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_Unk02B4
.word ScrCmd_Unk02B5
.word ScrCmd_Unk02B6
- .word ScrCmd_Unk02B7
+ .word ScrCmd_CheckPartyForBadEgg
.word ScrCmd_Unk02B8
.word ScrCmd_Unk02B9
.word ScrCmd_Unk02BA
diff --git a/arm9/asm/unk_02046030.s b/arm9/asm/unk_02046030.s
index 573fba7e..7dad9af5 100644
--- a/arm9/asm/unk_02046030.s
+++ b/arm9/asm/unk_02046030.s
@@ -138,7 +138,7 @@ _02046118:
mov r2, #0x11
bl FUN_0204C1B4
ldr r0, _0204620C ; =0x00000679
- bl FUN_020054C8
+ bl PlaySE
ldrb r0, [r4, #0x8]
add r0, r0, #0x1
strb r0, [r4, #0x8]
@@ -167,7 +167,7 @@ _02046160:
mov r2, #0x10
bl FUN_0204C1B4
ldr r0, _0204620C ; =0x00000679
- bl FUN_020054C8
+ bl PlaySE
ldrb r0, [r4, #0x8]
add r0, r0, #0x1
strb r0, [r4, #0x8]
diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s
index 7e896527..97e67111 100644
--- a/arm9/asm/unk_020484A8.s
+++ b/arm9/asm/unk_020484A8.s
@@ -183,7 +183,7 @@ _020485F6:
cmp r0, #0x0
beq _02048688
ldr r0, _02048690 ; =0x0000061B
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x12
str r0, [r5, #0x38]
ldr r0, [r4, #0x0]
diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s
index 501432c0..597444e9 100644
--- a/arm9/asm/unk_02048904.s
+++ b/arm9/asm/unk_02048904.s
@@ -930,7 +930,7 @@ _0204905C: ; jump table (using 16-bit offset)
.short _020490AE - _0204905C - 2; case 3
_02049064:
ldr r0, _020490BC ; =0x00000603
- bl FUN_020054C8
+ bl PlaySE
ldr r1, [r4, #0x4]
add r0, r6, #0x0
bl FUN_0204AD60
@@ -2806,7 +2806,7 @@ _02049F34: ; jump table (using 16-bit offset)
.short _02049F86 - _02049F34 - 2; case 3
_02049F3C:
ldr r0, _02049F94 ; =0x00000603
- bl FUN_020054C8
+ bl PlaySE
ldr r1, [r4, #0x4]
add r0, r6, #0x0
bl FUN_0204AD60
diff --git a/arm9/asm/unk_0204C1B4.s b/arm9/asm/unk_0204C1B4.s
index 4970ada1..7ca0881c 100644
--- a/arm9/asm/unk_0204C1B4.s
+++ b/arm9/asm/unk_0204C1B4.s
@@ -375,7 +375,7 @@ FUN_0204C468: ; 0x0204C468
b _0204C49C
_0204C484:
ldr r0, _0204C4A0 ; =0x00000603
- bl FUN_020054C8
+ bl PlaySE
add r0, r5, #0x0
bl FUN_0204AFC8
ldr r0, [r4, #0x4]
@@ -577,7 +577,7 @@ _0204C5FE:
b _0204C63C
_0204C61C:
ldr r0, _0204C640 ; =0x00000603
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x0
bl MOD05_021D7CA4
ldr r0, [r4, #0x4]
diff --git a/arm9/asm/unk_0204CB20.s b/arm9/asm/unk_0204CB20.s
index 88d8bf23..87fb50fc 100644
--- a/arm9/asm/unk_0204CB20.s
+++ b/arm9/asm/unk_0204CB20.s
@@ -5212,7 +5212,7 @@ _0204F2AA:
str r3, [sp, #0x4]
bl FUN_02004DCC
ldr r0, _0204F2D4 ; =0x000005F6
- bl FUN_020054C8
+ bl PlaySE
add sp, #0x8
pop {r4-r6, pc}
nop
@@ -5356,7 +5356,7 @@ _0204F3AC:
mov r2, #0x1
bl MOD18_0224DCB8
ldr r0, _0204F5F0 ; =0x00000625
- bl FUN_020054C8
+ bl PlaySE
b _0204F410
_0204F3FC:
bl FUN_02031190
@@ -5401,7 +5401,7 @@ _0204F41A:
ldr r0, _0204F5F8 ; =0x00000425
bl FUN_0200521C
ldr r0, _0204F5F0 ; =0x00000625
- bl FUN_020054C8
+ bl PlaySE
b _0204F480
_0204F46C:
bl FUN_02031190
@@ -5504,7 +5504,7 @@ _0204F4D2:
_0204F54A:
bl FUN_0204F7E4
ldr r0, _0204F60C ; =0x0000062B
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
bl FUN_020269A0
add r1, sp, #0x8
diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s
index 7a921b4a..ae7380b7 100644
--- a/arm9/asm/unk_02050E48.s
+++ b/arm9/asm/unk_02050E48.s
@@ -1946,7 +1946,7 @@ _02051DA2:
tst r1, r0
beq _02051DC8
ldr r0, _02051E20 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x81
ldrsb r1, [r4, r0]
add r4, #0x80
@@ -1966,7 +1966,7 @@ _02051DC8:
tst r0, r1
beq _02051DDA
ldr r0, _02051E20 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add sp, #0x8
mov r0, #0x2
pop {r4, pc}
@@ -1976,7 +1976,7 @@ _02051DDA:
pop {r4, pc}
_02051DE0:
ldr r0, _02051E20 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
ldr r0, [r4, #0x7c]
mov r1, #0x10
str r1, [sp, #0x0]
diff --git a/arm9/asm/unk_02052EE8.s b/arm9/asm/unk_02052EE8.s
index 6ecb7e68..c17a3187 100644
--- a/arm9/asm/unk_02052EE8.s
+++ b/arm9/asm/unk_02052EE8.s
@@ -646,7 +646,7 @@ FUN_0205339C: ; 0x0205339C
beq _0205343C
_020533CC:
ldr r0, _02053440 ; =0x0000064F
- bl FUN_020054C8
+ bl PlaySE
ldrb r1, [r5, #0x8]
add r0, r4, #0x0
bl FUN_02057634
diff --git a/arm9/asm/unk_02053750.s b/arm9/asm/unk_02053750.s
index d20950c3..18959ed6 100644
--- a/arm9/asm/unk_02053750.s
+++ b/arm9/asm/unk_02053750.s
@@ -329,7 +329,7 @@ _02053912:
add r3, r0, #0x0
bl FUN_0200E1D0
ldr r0, _020539F0 ; =0x0000062F
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x5f
mov r1, #0x1
lsl r0, r0, #0x2
@@ -354,7 +354,7 @@ _0205396E:
cmp r0, #0x0
beq _020539EA
ldr r0, _020539F4 ; =0x00000631
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x6
lsl r0, r0, #0x6
ldr r1, [r4, r0]
@@ -464,7 +464,7 @@ _02053A4E:
bl FUN_02053F38
mov r0, #0x63
lsl r0, r0, #0x4
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x5f
mov r1, #0x1
lsl r0, r0, #0x2
@@ -660,7 +660,7 @@ _02053BD6:
cmp r0, #0x0
beq _02053C8C
ldr r0, _02053C94 ; =0x00000632
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x6
lsl r0, r0, #0x6
ldr r1, [r4, r0]
diff --git a/arm9/asm/unk_020557F4.s b/arm9/asm/unk_020557F4.s
index 539dc91b..b3bd5347 100644
--- a/arm9/asm/unk_020557F4.s
+++ b/arm9/asm/unk_020557F4.s
@@ -236,21 +236,21 @@ _020559A6:
cmp r0, #0x1
bne _020559B8
ldr r0, _02055A24 ; =0x0000061F
- bl FUN_020054C8
+ bl PlaySE
_020559B8:
add r0, r5, #0x0
bl FUN_02054AF0
cmp r0, #0x1
bne _020559C8
ldr r0, _02055A28 ; =0x00000641
- bl FUN_020054C8
+ bl PlaySE
_020559C8:
add r0, r5, #0x0
bl FUN_0205483C
cmp r0, #0x1
bne _020559D8
ldr r0, _02055A2C ; =0x00000642
- bl FUN_020054C8
+ bl PlaySE
_020559D8:
add r0, r5, #0x0
bl FUN_02054830
@@ -263,7 +263,7 @@ _020559D8:
cmp r0, #0x1
beq _020559F8
ldr r0, _02055A30 ; =0x00000655
- bl FUN_020054C8
+ bl PlaySE
_020559F8:
add r0, r4, #0x0
bl FUN_020586F0
@@ -280,7 +280,7 @@ _020559F8:
bne _02055A20
_02055A1A:
ldr r0, _02055A34 ; =0x00000653
- bl FUN_020054C8
+ bl PlaySE
_02055A20:
pop {r4-r6, pc}
nop
@@ -723,7 +723,7 @@ FUN_02055DAC: ; 0x02055DAC
bl FUN_020584D4
add r4, r0, #0x0
ldr r0, _02055EF4 ; =0x00000654
- bl FUN_020054C8
+ bl PlaySE
cmp r4, #0x0
bne _02055E62
add r0, r5, #0x0
@@ -868,7 +868,7 @@ FUN_02055EF8: ; 0x02055EF8
cmp r0, #0x1
bne _02055F22
ldr r0, _02055F40 ; =0x00000656
- bl FUN_020054C8
+ bl PlaySE
add r0, r5, #0x0
add r1, r4, #0x0
mov r2, #0x5f
@@ -903,7 +903,7 @@ FUN_02055F44: ; 0x02055F44
cmp r0, #0x1
bne _02055F6E
ldr r0, _02055F8C ; =0x00000656
- bl FUN_020054C8
+ bl PlaySE
add r0, r5, #0x0
add r1, r4, #0x0
mov r2, #0x5e
@@ -1356,7 +1356,7 @@ _020562CA:
tst r0, r4
bne _020562DC
ldr r0, _02056380 ; =0x00000601
- bl FUN_020054C8
+ bl PlaySE
_020562DC:
ldr r1, [sp, #0x0]
add r0, r6, #0x0
@@ -1417,7 +1417,7 @@ _02056356:
tst r0, r4
bne _02056364
ldr r0, _02056380 ; =0x00000601
- bl FUN_020054C8
+ bl PlaySE
_02056364:
ldr r1, [sp, #0x0]
add r0, r6, #0x0
@@ -1513,11 +1513,11 @@ _02056412:
cmp r4, #0x0
bne _02056426
ldr r0, _02056430 ; =0x0000061C
- bl FUN_020054C8
+ bl PlaySE
pop {r3-r5, pc}
_02056426:
ldr r0, _02056434 ; =0x00000619
- bl FUN_020054C8
+ bl PlaySE
_0205642C:
pop {r3-r5, pc}
nop
@@ -1841,7 +1841,7 @@ _02056680:
tst r0, r4
bne _020566A0
ldr r0, _02056700 ; =0x00000601
- bl FUN_020054C8
+ bl PlaySE
_020566A0:
ldr r1, [sp, #0x0]
add r0, r6, #0x0
@@ -1961,7 +1961,7 @@ _0205678C:
tst r0, r4
bne _020567AA
ldr r0, _020567E0 ; =0x00000601
- bl FUN_020054C8
+ bl PlaySE
_020567AA:
add r0, r7, #0x0
add r1, r6, #0x0
@@ -2220,7 +2220,7 @@ _02056994:
tst r0, r4
bne _020569AA
ldr r0, _02056A78 ; =0x00000601
- bl FUN_020054C8
+ bl PlaySE
_020569AA:
add r0, r6, #0x0
add r1, r7, #0x0
@@ -2266,7 +2266,7 @@ _020569EC:
tst r0, r4
bne _02056A14
ldr r0, _02056A78 ; =0x00000601
- bl FUN_020054C8
+ bl PlaySE
_02056A14:
add r0, r6, #0x0
add r1, r7, #0x0
@@ -2388,7 +2388,7 @@ _02056B04:
tst r0, r4
bne _02056B22
ldr r0, _02056B58 ; =0x00000601
- bl FUN_020054C8
+ bl PlaySE
_02056B22:
add r0, r7, #0x0
add r1, r6, #0x0
@@ -3280,7 +3280,7 @@ _020571E8:
tst r0, r1
bne _02057244
ldr r0, _02057250 ; =0x00000601
- bl FUN_020054C8
+ bl PlaySE
b _02057244
_020571FC:
cmp r6, #0x5
diff --git a/arm9/asm/unk_0205AD98.s b/arm9/asm/unk_0205AD98.s
index ddcbaf43..1a853e6c 100644
--- a/arm9/asm/unk_0205AD98.s
+++ b/arm9/asm/unk_0205AD98.s
@@ -1229,7 +1229,7 @@ _0205B5EA:
add r0, r5, #0x0
bl FUN_02058700
ldr r0, _0205B618 ; =0x0000060B
- bl FUN_020054C8
+ bl PlaySE
pop {r3-r7, pc}
nop
_0205B614: .word 0x00010004
@@ -1334,7 +1334,7 @@ _0205B6B8:
add r0, r5, #0x0
bl FUN_02058700
ldr r0, _0205B700 ; =0x00000647
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x1
add sp, #0x18
pop {r3-r5, pc}
diff --git a/arm9/asm/unk_020607D4.s b/arm9/asm/unk_020607D4.s
index 84ef467a..d5b014bf 100644
--- a/arm9/asm/unk_020607D4.s
+++ b/arm9/asm/unk_020607D4.s
@@ -146,7 +146,7 @@ _020608EC:
strb r0, [r4, #0x0]
_020608F0:
ldr r0, _0206091C ; =0x000006DD
- bl FUN_020054C8
+ bl PlaySE
b _0206090A
_020608F8:
bl GF_AssertFail
@@ -298,7 +298,7 @@ _020609EC:
mov r2, #0x0
bl MOD05_021DA4EC
ldr r0, _02060B08 ; =0x000006DE
- bl FUN_020054C8
+ bl PlaySE
b _02060B00
_02060A2C:
ldr r0, [r5, #0x50]
diff --git a/arm9/asm/unk_020647A4.s b/arm9/asm/unk_020647A4.s
index eddad586..8f0d664f 100644
--- a/arm9/asm/unk_020647A4.s
+++ b/arm9/asm/unk_020647A4.s
@@ -519,7 +519,7 @@ _02064B2E:
mov r1, #0x1
bl FUN_0205557C
ldr r0, _02064B6C ; =0x0000061A
- bl FUN_020054C8
+ bl PlaySE
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -636,7 +636,7 @@ _02064C24:
mov r1, #0x1
bl FUN_0205557C
ldr r0, _02064C60 ; =0x0000061A
- bl FUN_020054C8
+ bl PlaySE
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -661,11 +661,11 @@ FUN_02064C64: ; 0x02064C64
cmp r0, #0x0
bne _02064C72
ldr r0, _02064C7C ; =0x00000611
- bl FUN_020054C8
+ bl PlaySE
pop {r3, pc}
_02064C72:
ldr r0, _02064C80 ; =0x00000614
- bl FUN_020054C8
+ bl PlaySE
pop {r3, pc}
nop
_02064C7C: .word 0x00000611
diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s
index cfddf2f5..8fa3df67 100644
--- a/arm9/asm/unk_020653EC.s
+++ b/arm9/asm/unk_020653EC.s
@@ -165,14 +165,14 @@ _020654EE:
add r0, r5, #0x0
bl FUN_02065FE4
ldr r0, _02065550 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
pop {r3-r5, pc}
_0206550A:
mov r0, #0x1
tst r0, r1
beq _02065542
ldr r0, _02065550 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
mov r1, #0x1
mvn r1, r1
cmp r4, r1
@@ -268,14 +268,14 @@ FUN_020655B0: ; 0x020655B0
add r0, r4, #0x0
bl FUN_02065FE4
ldr r0, _02065644 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
pop {r4-r6, pc}
_020655DE:
mov r1, #0x1
tst r0, r1
beq _02065634
ldr r0, _02065644 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add r0, r5, #0x2
cmp r0, #0x5
bhi _0206562C
@@ -1225,7 +1225,7 @@ FUN_02065D4C: ; 0x02065D4C
cmp r6, #0x0
bne _02065D7E
ldr r0, _02065DD4 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
_02065D7E:
add r0, sp, #0x0
ldrh r0, [r0, #0x2]
@@ -1401,7 +1401,7 @@ FUN_02065EE4: ; 0x02065EE4
cmp r2, #0x0
bne _02065EF0
ldr r0, _02065EF4 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
_02065EF0:
pop {r3, pc}
nop
@@ -2068,7 +2068,7 @@ _02066426:
add r3, r2, #0x0
bl FillWindowPixelRect
mov r0, #0x1
- bl FUN_02002B60
+ bl TextFlags_SetCanABSpeedUpPrint
mov r0, #0x0
bl FUN_02002B7C
cmp r4, #0x0
diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s
index e7ebe1cf..e742f202 100644
--- a/arm9/asm/unk_0206C700.s
+++ b/arm9/asm/unk_0206C700.s
@@ -238,7 +238,7 @@ FUN_0206C700: ; 0x0206C700
mov r2, #0x0
bl FUN_0200CA44
mov r0, #0x1
- bl FUN_02002B60
+ bl TextFlags_SetCanABSpeedUpPrint
bl FUN_02033E74
add r0, r4, #0x0
add sp, #0x24
@@ -335,7 +335,7 @@ FUN_0206C92C: ; 0x0206C92C
add r0, r4, #0x0
bl FreeToHeap
mov r0, #0x0
- bl FUN_02002B60
+ bl TextFlags_SetCanABSpeedUpPrint
pop {r4, pc}
thumb_func_start FUN_0206C9C0
@@ -746,7 +746,7 @@ _0206CCCE:
bl GF_AssertFail
_0206CD16:
ldr r0, _0206CE24 ; =0x000005F9
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
mov r1, #0x28
add r0, #0x66
@@ -811,7 +811,7 @@ _0206CD5A:
mov r1, #0xb
bl FUN_0206E0AC
ldr r0, _0206CE28 ; =0x000005FA
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
mov r1, #0x10
add r0, #0x70
@@ -892,7 +892,7 @@ _0206CE2C:
add r2, #0xf3
bl FUN_02007558
ldr r0, _0206D1C8 ; =0x000005FB
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
mov r1, #0x0
add r0, #0x70
@@ -968,7 +968,7 @@ _0206CEB0:
mov r3, #0x3
bl FUN_02007E98
ldr r0, _0206D1D4 ; =0x000005FC
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
add r0, #0x64
ldrb r0, [r0, #0x0]
@@ -2723,7 +2723,7 @@ _0206DDE4:
b _0206DDFA
_0206DDEC:
ldr r0, _0206DE04 ; =0x000005E6
- bl FUN_020054C8
+ bl PlaySE
b _0206DDFA
_0206DDF4:
ldr r0, _0206DE08 ; =0x00000483
diff --git a/arm9/asm/unk_0206E2F0.s b/arm9/asm/unk_0206E2F0.s
deleted file mode 100644
index d7460439..00000000
--- a/arm9/asm/unk_0206E2F0.s
+++ /dev/null
@@ -1,375 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- .text
-
- thumb_func_start BagView_new
-BagView_new: ; 0x0206E2F0
- push {r4, lr}
- mov r1, #0x78
- bl AllocFromHeap
- mov r1, #0x0
- mov r2, #0x78
- add r4, r0, #0x0
- bl memset
- add r0, r4, #0x0
- pop {r4, pc}
- .balign 4
-
- thumb_func_start FUN_0206E308
-FUN_0206E308: ; 0x0206E308
- mov r0, #0x78
- bx lr
-
- thumb_func_start FUN_0206E30C
-FUN_0206E30C: ; 0x0206E30C
- add r0, #0x65
- strb r1, [r0, #0x0]
- bx lr
- .balign 4
-
- thumb_func_start FUN_0206E314
-FUN_0206E314: ; 0x0206E314
- push {r4-r6, lr}
- add r4, r1, #0x0
- add r1, r2, #0x0
- add r5, r0, #0x0
- add r6, r3, #0x0
- bl FUN_0206E30C
- str r4, [r5, #0x0]
- str r6, [r5, #0x6c]
- mov r0, #0x0
- add r5, #0x66
- strh r0, [r5, #0x0]
- pop {r4-r6, pc}
- .balign 4
-
- thumb_func_start BagView_setitem
-BagView_setitem: ; 0x0206E330
- push {r3-r4}
- mov r4, #0xc
- mul r4, r3
- add r0, r0, r4
- str r1, [r0, #0x4]
- strb r2, [r0, #0xc]
- pop {r3-r4}
- bx lr
-
- thumb_func_start FUN_0206E340
-FUN_0206E340: ; 0x0206E340
- add r1, r0, #0x0
- add r1, #0x76
- ldrh r2, [r1, #0x0]
- mov r1, #0x1
- add r0, #0x76
- bic r2, r1
- mov r1, #0x1
- orr r1, r2
- strh r1, [r0, #0x0]
- bx lr
-
- thumb_func_start FUN_0206E354
-FUN_0206E354: ; 0x0206E354
- str r1, [r0, #0x70]
- bx lr
-
- thumb_func_start FUN_0206E358
-FUN_0206E358: ; 0x0206E358
- add r0, #0x74
- strb r1, [r0, #0x0]
- bx lr
- .balign 4
-
- thumb_func_start FUN_0206E360
-FUN_0206E360: ; 0x0206E360
- add r2, r0, #0x0
- add r2, #0x76
- ldrh r3, [r2, #0x0]
- ldr r2, _0206E378 ; =0xFFFF0001
- lsl r1, r1, #0x11
- and r2, r3
- lsr r1, r1, #0x10
- orr r1, r2
- add r0, #0x76
- strh r1, [r0, #0x0]
- bx lr
- nop
-_0206E378: .word 0xFFFF0001
-
- thumb_func_start FUN_0206E37C
-FUN_0206E37C: ; 0x0206E37C
- add r0, #0x66
- ldrh r0, [r0, #0x0]
- bx lr
- .balign 4
-
- thumb_func_start FUN_0206E384
-FUN_0206E384: ; 0x0206E384
- add r0, #0x68
- ldrh r0, [r0, #0x0]
- bx lr
- .balign 4
-
- thumb_func_start FUN_0206E38C
-FUN_0206E38C: ; 0x0206E38C
- add r0, #0x74
- ldrb r0, [r0, #0x0]
- bx lr
- .balign 4
-
- thumb_func_start FUN_0206E394
-FUN_0206E394: ; 0x0206E394
- add r0, #0x75
- ldrb r0, [r0, #0x0]
- bx lr
- .balign 4
-
- thumb_func_start FUN_0206E39C
-FUN_0206E39C: ; 0x0206E39C
- push {r3, lr}
- bl Sav2_PlayerData_GetCoinsAddr
- bl CheckCoins
- pop {r3, pc}
-
- thumb_func_start FUN_0206E3A8
-FUN_0206E3A8: ; 0x0206E3A8
- push {r4-r6, lr}
- bl Sav2_SealCase_get
- add r6, r0, #0x0
- mov r5, #0x0
- mov r4, #0x1
-_0206E3B4:
- add r0, r6, #0x0
- add r1, r4, #0x0
- bl FUN_02029E2C
- add r4, r4, #0x1
- add r5, r5, r0
- cmp r4, #0x50
- bls _0206E3B4
- add r0, r5, #0x0
- pop {r4-r6, pc}
-
- thumb_func_start FUN_0206E3C8
-FUN_0206E3C8: ; 0x0206E3C8
- push {r3, lr}
- bl FUN_02027E24
- bl FUN_0202708C
- bl FUN_02027168
- pop {r3, pc}
-
- thumb_func_start FUN_0206E3D8
-FUN_0206E3D8: ; 0x0206E3D8
- push {r3, lr}
- bl FUN_02027E24
- bl FUN_0202708C
- bl FUN_02027184
- pop {r3, pc}
-
- thumb_func_start FUN_0206E3E8
-FUN_0206E3E8: ; 0x0206E3E8
- push {r3, lr}
- bl FUN_0202A8D8
- mov r1, #0x0
- add r2, r1, #0x0
- bl FUN_0202A3B4
- pop {r3, pc}
-
- thumb_func_start FUN_0206E3F8
-FUN_0206E3F8: ; 0x0206E3F8
- push {r4-r7, lr}
- sub sp, #0xc
- add r7, r0, #0x0
- str r1, [sp, #0x8]
- add r5, r2, #0x0
- add r4, r3, #0x0
- mov r0, #0x0
- mov r1, #0x1a
- mov r2, #0x7
- bl NewMsgDataFromNarc
- add r6, r0, #0x0
- add r0, r4, #0x0
- bl ScrStrBufs_new
- add r4, r0, #0x0
- cmp r5, #0x0
- bne _0206E428
- add r0, r6, #0x0
- mov r1, #0x63
- bl NewString_ReadMsgData
- add r5, r0, #0x0
- b _0206E4FA
-_0206E428:
- mov r1, #0x1b
- lsl r1, r1, #0x4 ; ITEM_POINT_CARD
- cmp r5, r1
- bne _0206E454
- add r0, r6, #0x0
- mov r1, #0x61
- bl NewString_ReadMsgData
- add r5, r0, #0x0
- add r0, r7, #0x0
- bl FUN_0206E3E8
- mov r1, #0x0
- add r2, r0, #0x0
- str r1, [sp, #0x0]
- mov r0, #0x1
- str r0, [sp, #0x4]
- add r0, r4, #0x0
- mov r3, #0x4
- bl BufferIntegerAsString
- b _0206E4FA
-_0206E454:
- add r2, r1, #0x2 ; ITEM_SEAL_CASE
- cmp r5, r2
- bne _0206E47E
- add r0, r6, #0x0
- mov r1, #0x5c
- bl NewString_ReadMsgData
- add r5, r0, #0x0
- add r0, r7, #0x0
- bl FUN_0206E3A8
- mov r1, #0x0
- add r2, r0, #0x0
- str r1, [sp, #0x0]
- mov r0, #0x1
- str r0, [sp, #0x4]
- add r0, r4, #0x0
- mov r3, #0x4
- bl BufferIntegerAsString
- b _0206E4FA
-_0206E47E:
- add r2, r1, #0x3 ; ITEM_FASHION_CASE
- cmp r5, r2
- bne _0206E4C0
- add r0, r6, #0x0
- mov r1, #0x5d
- bl NewString_ReadMsgData
- add r5, r0, #0x0
- add r0, r7, #0x0
- bl FUN_0206E3C8
- mov r1, #0x0
- add r2, r0, #0x0
- str r1, [sp, #0x0]
- mov r0, #0x1
- str r0, [sp, #0x4]
- add r0, r4, #0x0
- mov r3, #0x3
- bl BufferIntegerAsString
- add r0, r7, #0x0
- bl FUN_0206E3D8
- add r2, r0, #0x0
- mov r0, #0x0
- str r0, [sp, #0x0]
- mov r1, #0x1
- add r0, r4, #0x0
- mov r3, #0x2
- str r1, [sp, #0x4]
- bl BufferIntegerAsString
- b _0206E4FA
-_0206E4C0:
- add r1, #0xc ; ITEM_COIN_CASE
- cmp r5, r1
- bne _0206E4EA
- add r0, r6, #0x0
- mov r1, #0x39
- bl NewString_ReadMsgData
- add r5, r0, #0x0
- add r0, r7, #0x0
- bl FUN_0206E39C
- mov r1, #0x0
- add r2, r0, #0x0
- str r1, [sp, #0x0]
- mov r0, #0x1
- str r0, [sp, #0x4]
- add r0, r4, #0x0
- mov r3, #0x5
- bl BufferIntegerAsString
- b _0206E4FA
-_0206E4EA:
- bl ScrStrBufs_delete
- add r0, r6, #0x0
- bl DestroyMsgData
- add sp, #0xc
- mov r0, #0x0
- pop {r4-r7, pc}
-_0206E4FA:
- ldr r1, [sp, #0x8]
- add r0, r4, #0x0
- add r2, r5, #0x0
- bl StringExpandPlaceholders
- add r0, r5, #0x0
- bl String_dtor
- add r0, r4, #0x0
- bl ScrStrBufs_delete
- add r0, r6, #0x0
- bl DestroyMsgData
- mov r0, #0x1
- add sp, #0xc
- pop {r4-r7, pc}
-
- thumb_func_start FUN_0206E51C
-FUN_0206E51C: ; 0x0206E51C
- push {r3-r7, lr}
- add r5, r1, #0x0
- str r0, [sp, #0x0]
- ldr r4, [sp, #0x18]
- cmp r3, #0x1
- beq _0206E52E
- cmp r3, #0x2
- beq _0206E54C
- b _0206E56A
-_0206E52E:
- mov r0, #0x1
- mov r1, #0x1a
- mov r2, #0x7
- add r3, r4, #0x0
- bl NewMsgDataFromNarc
- add r4, r0, #0x0
- mov r1, #0x38
- add r2, r5, #0x0
- bl ReadMsgDataIntoString
- add r0, r4, #0x0
- bl DestroyMsgData
- pop {r3-r7, pc}
-_0206E54C:
- mov r0, #0x1
- mov r1, #0x1a
- mov r2, #0x7
- add r3, r4, #0x0
- bl NewMsgDataFromNarc
- add r4, r0, #0x0
- mov r1, #0x6f
- add r2, r5, #0x0
- bl ReadMsgDataIntoString
- add r0, r4, #0x0
- bl DestroyMsgData
- pop {r3-r7, pc}
-_0206E56A:
- mov r0, #0x1
- mov r1, #0x1a
- mov r2, #0xc7
- add r3, r4, #0x0
- bl NewMsgDataFromNarc
- add r7, r0, #0x0
- add r0, r4, #0x0
- bl ScrStrBufs_new
- add r4, r0, #0x0
- add r0, r7, #0x0
- mov r1, #0x24
- bl NewString_ReadMsgData
- add r6, r0, #0x0
- ldr r2, [sp, #0x0]
- add r0, r4, #0x0
- mov r1, #0x0
- bl BufferPlayersName
- add r0, r4, #0x0
- add r1, r5, #0x0
- add r2, r6, #0x0
- bl StringExpandPlaceholders
- add r0, r6, #0x0
- bl String_dtor
- add r0, r4, #0x0
- bl ScrStrBufs_delete
- add r0, r7, #0x0
- bl DestroyMsgData
- pop {r3-r7, pc}
- .balign 4
diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s
index 66967f99..c504af1a 100644
--- a/arm9/asm/unk_0206F3FC.s
+++ b/arm9/asm/unk_0206F3FC.s
@@ -837,7 +837,7 @@ FUN_0206F9A4: ; 0x0206F9A4
tst r0, r1
beq _0206F9BA
ldr r0, _0206F9C4 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x1b
pop {r3, pc}
_0206F9BA:
@@ -3138,7 +3138,7 @@ _02070C6E:
mov r2, #0x1
bl FUN_020713EC
ldr r0, _02070CD8 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
cmp r4, #0x6
bhs _02070CA6
add r0, r5, #0x0
@@ -3338,7 +3338,7 @@ _02070DCC:
add r0, r0, #0x1
strb r1, [r5, r0]
ldr r0, _02070E58 ; =0x000005E4
- bl FUN_020054C8
+ bl PlaySE
cmp r4, #0x6
beq _02070E3C
cmp r4, #0x7
@@ -3525,7 +3525,7 @@ _02070FAE:
cmp r1, #0x7
bne _02070FC6
ldr r0, _020710B4 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _020710B8 ; =0x00000B23
ldrb r0, [r4, r0]
lsl r0, r0, #0x18
@@ -3544,7 +3544,7 @@ _02070FC6:
bne _02070FE0
_02070FD6:
ldr r0, _020710B4 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x0
pop {r4, pc}
_02070FE0:
@@ -3562,12 +3562,12 @@ _02070FE8:
cmp r0, #0x0
bne _02071002
ldr r0, _020710B4 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x0
pop {r4, pc}
_02071002:
ldr r0, _020710C0 ; =0x000005F2
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x5
pop {r4, pc}
_0207100C:
@@ -3582,19 +3582,19 @@ _0207100C:
cmp r1, #0x0
bne _02071030
add r0, #0x38
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
bl FUN_020710C4
mov r0, #0x0
pop {r4, pc}
_02071030:
add r0, #0x4e
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x5
pop {r4, pc}
_0207103A:
add r0, #0x38
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
bl FUN_020710C4
mov r0, #0x0
@@ -3611,7 +3611,7 @@ _0207104A:
lsr r0, r0, #0x1f
bne _0207106E
ldr r0, _020710B4 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _020710B0 ; =0x00000B25
mov r1, #0x7
strb r1, [r4, r0]
@@ -3645,7 +3645,7 @@ _0207108E:
cmp r1, #0x0
beq _020710AA
ldr r0, _020710C0 ; =0x000005F2
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x5
_020710AA:
pop {r4, pc}
@@ -4210,7 +4210,7 @@ FUN_020714D0: ; 0x020714D0
tst r1, r2
beq _0207150C
ldr r0, _02071554 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _02071558 ; =0x00000B25
ldrb r1, [r4, r0]
cmp r1, #0x6
@@ -4236,7 +4236,7 @@ _0207150C:
tst r1, r2
beq _02071522
ldr r0, _02071554 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
bl FUN_02074538
mov r0, #0x3
@@ -4348,7 +4348,7 @@ _020715EA:
mov r1, #0x13
strb r1, [r4, r0]
ldr r0, _02071740 ; =0x000005F2
- bl FUN_020054C8
+ bl PlaySE
add sp, #0x8
mov r0, #0x14
pop {r3-r5, pc}
@@ -4419,7 +4419,7 @@ _02071630:
mov r1, #0x13
strb r1, [r4, r0]
ldr r0, _02071740 ; =0x000005F2
- bl FUN_020054C8
+ bl PlaySE
add sp, #0x8
mov r0, #0x14
pop {r3-r5, pc}
@@ -4432,7 +4432,7 @@ _02071692:
mov r1, #0x13
strb r1, [r4, r0]
ldr r0, _02071740 ; =0x000005F2
- bl FUN_020054C8
+ bl PlaySE
add sp, #0x8
mov r0, #0x14
pop {r3-r5, pc}
@@ -4445,7 +4445,7 @@ _020716AE:
mov r1, #0x13
strb r1, [r4, r0]
ldr r0, _02071740 ; =0x000005F2
- bl FUN_020054C8
+ bl PlaySE
add sp, #0x8
mov r0, #0x14
pop {r3-r5, pc}
@@ -4474,7 +4474,7 @@ _020716EA:
mov r1, #0x13
strb r1, [r4, r0]
ldr r0, _02071740 ; =0x000005F2
- bl FUN_020054C8
+ bl PlaySE
add sp, #0x8
mov r0, #0x14
pop {r3-r5, pc}
@@ -4487,7 +4487,7 @@ _02071706:
mov r1, #0x13
strb r1, [r4, r0]
ldr r0, _02071740 ; =0x000005F2
- bl FUN_020054C8
+ bl PlaySE
add sp, #0x8
mov r0, #0x14
pop {r3-r5, pc}
@@ -4498,7 +4498,7 @@ _02071722:
add r0, #0x38
add r1, #0x23
strb r2, [r1, #0x0]
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x1b
add sp, #0x8
pop {r3-r5, pc}
@@ -4831,7 +4831,7 @@ _02071994:
cmp r1, #0x6
blo _020719B8
ldr r0, _02071C20 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
bl FUN_02074538
add sp, #0x8
@@ -4848,7 +4848,7 @@ _020719B8:
b _02071A26
_020719CA:
ldr r0, _02071C24 ; =0x000005EC
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _02071C28 ; =0x000005C8
mov r1, #0x1
ldr r0, [r4, r0]
@@ -4879,7 +4879,7 @@ _020719FA:
b _02071A26
_02071A08:
ldr r0, _02071C20 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _02071C18 ; =0x00000B2A
mov r1, #0x1
strh r1, [r4, r0]
@@ -4888,7 +4888,7 @@ _02071A08:
pop {r4-r6, pc}
_02071A1A:
ldr r0, _02071C34 ; =0x000005F2
- bl FUN_020054C8
+ bl PlaySE
add sp, #0x8
mov r0, #0x1a
pop {r4-r6, pc}
@@ -4899,7 +4899,7 @@ _02071A26:
tst r0, r1
beq _02071A42
ldr r0, _02071C20 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
bl FUN_02074538
add sp, #0x8
@@ -4936,7 +4936,7 @@ _02071A7A:
b _02071C12
_02071A7C:
ldr r0, _02071C24 ; =0x000005EC
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _02071C28 ; =0x000005C8
mov r1, #0x1
ldr r0, [r4, r0]
@@ -4974,7 +4974,7 @@ _02071ABA:
pop {r4-r6, pc}
_02071AC6:
ldr r0, _02071C34 ; =0x000005F2
- bl FUN_020054C8
+ bl PlaySE
add sp, #0x8
mov r0, #0x1a
pop {r4-r6, pc}
@@ -4987,7 +4987,7 @@ _02071AD2:
b _02071C12
_02071ADE:
ldr r0, _02071C20 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x89
lsl r0, r0, #0x2
add r0, r4, r0
@@ -5016,7 +5016,7 @@ _02071B0C:
cmp r0, #0x1
bne _02071C12
ldr r0, _02071C24 ; =0x000005EC
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _02071C18 ; =0x00000B2A
mov r1, #0x3
strh r1, [r4, r0]
@@ -5107,7 +5107,7 @@ _02071BE0:
tst r0, r1
beq _02071C12
ldr r0, _02071C20 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x89
lsl r0, r0, #0x2
add r0, r4, r0
@@ -5284,7 +5284,7 @@ FUN_02071D48: ; 0x02071D48
lsr r0, r0, #0x1f
bne _02071D92
ldr r0, _02071DE8 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x3
pop {r4, pc}
_02071D72:
@@ -5297,12 +5297,12 @@ _02071D72:
cmp r0, #0x0
bne _02071D8C
ldr r0, _02071DE8 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x0
pop {r4, pc}
_02071D8C:
ldr r0, _02071DEC ; =0x000005F2
- bl FUN_020054C8
+ bl PlaySE
_02071D92:
mov r0, #0x5
pop {r4, pc}
@@ -5316,7 +5316,7 @@ _02071D96:
lsr r0, r0, #0x1f
bne _02071DB6
ldr r0, _02071DE8 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _02071DE4 ; =0x00000B25
mov r1, #0x7
strb r1, [r4, r0]
@@ -5340,7 +5340,7 @@ _02071DBA:
cmp r1, #0x0
beq _02071DDE
ldr r0, _02071DEC ; =0x000005F2
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x5
_02071DDE:
pop {r4, pc}
diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s
index 0ac5ab20..92121142 100644
--- a/arm9/asm/unk_02072548.s
+++ b/arm9/asm/unk_02072548.s
@@ -1658,7 +1658,7 @@ FUN_0207322C: ; 0x0207322C
sub sp, #0xc
add r4, r0, #0x0
mov r0, #0x1
- bl FUN_02002B60
+ bl TextFlags_SetCanABSpeedUpPrint
mov r0, #0x0
bl FUN_02002B7C
ldr r0, _0207326C ; =0x000005A4
@@ -1713,7 +1713,7 @@ _020732A0:
pop {r3, pc}
_020732A6:
ldr r0, _020732C4 ; =0x000005E6
- bl FUN_020054C8
+ bl PlaySE
b _020732BE
_020732AE:
ldr r0, _020732C8 ; =0x00000483
diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s
index 44777340..8a959bef 100644
--- a/arm9/asm/unk_02073DA8.s
+++ b/arm9/asm/unk_02073DA8.s
@@ -1127,7 +1127,7 @@ _020746F2: ; jump table (using 16-bit offset)
_020746FC:
mov r0, #0x6a
lsl r0, r0, #0x4
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _0207482C ; =0x00000305
mov r1, #0x1
strb r1, [r4, r0]
@@ -1171,7 +1171,7 @@ _0207475C:
bl FUN_02074AF4
mov r0, #0x6a
lsl r0, r0, #0x4
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _0207482C ; =0x00000305
mov r1, #0x3
strb r1, [r4, r0]
diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s
index 956538f3..ee3ba62f 100644
--- a/arm9/asm/unk_0207550C.s
+++ b/arm9/asm/unk_0207550C.s
@@ -1020,7 +1020,7 @@ FUN_02075D20: ; 0x02075D20
mov r2, #0x1
bl FUN_020731E8
ldr r0, _02075DB4 ; =0x000005EC
- bl FUN_020054C8
+ bl PlaySE
ldr r1, _02075DB8 ; =FUN_02075CE4
ldr r0, _02075DBC ; =0x00000B14
str r1, [r5, r0]
@@ -1349,7 +1349,7 @@ _02076062:
ldr r0, _02076098 ; =0x00000B14
str r1, [r5, r0]
ldr r0, _0207609C ; =0x000005EC
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x5
add sp, #0xc
pop {r4-r7, pc}
@@ -1634,7 +1634,7 @@ _02076212:
mov r2, #0x1
bl FUN_02073CB4
ldr r0, _020763FC ; =0x000005EC
- bl FUN_020054C8
+ bl PlaySE
sub r0, r7, #0x3
ldrb r1, [r4, r0]
add r1, r1, #0x1
@@ -1712,7 +1712,7 @@ _02076360:
tst r0, r1
beq _020763D6
ldr r0, _02076408 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _020763E0 ; =0x00000B25
ldrb r5, [r4, r0]
add r0, r4, #0x0
@@ -2011,7 +2011,7 @@ _02076612:
tst r0, r1
beq _020766A8
ldr r0, _02076874 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
bl FUN_020734C0
ldr r0, _0207686C ; =0x00000B27
@@ -2025,7 +2025,7 @@ _0207663C:
tst r0, r1
beq _020766A8
ldr r0, _02076874 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
bl FUN_0207363C
ldr r0, _0207686C ; =0x00000B27
@@ -2039,7 +2039,7 @@ _0207665A:
tst r0, r1
beq _020766A8
ldr r0, _02076874 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
bl FUN_020736F4
ldr r0, _0207686C ; =0x00000B27
@@ -2180,7 +2180,7 @@ _02076780:
tst r0, r1
beq _02076868
ldr r0, _02076874 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _0207686C ; =0x00000B27
mov r1, #0x3
strb r1, [r4, r0]
@@ -3394,7 +3394,7 @@ _0207716A:
ldrh r1, [r1, #0x24]
bl Bag_TakeItem
ldr r0, _0207723C ; =0x000005EC
- bl FUN_020054C8
+ bl PlaySE
b _02077204
_020771F6:
ldr r2, _02077240 ; =0x0000069C
diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s
index adf8cadd..cdf9258d 100644
--- a/arm9/asm/unk_020772F0.s
+++ b/arm9/asm/unk_020772F0.s
@@ -1050,7 +1050,7 @@ _020775E0:
cmp r0, #0x0
bne _02077636
ldr r0, _020776B8 ; =0x000005E2
- bl FUN_020054C8
+ bl PlaySE
ldr r1, _020776BC ; =0x000004A8
mov r2, #0x0
ldr r0, [r4, r1]
@@ -1191,7 +1191,7 @@ _020776F8:
add r0, #0x3a
bl FUN_0207916C
ldr r0, _020777C4 ; =0x0000069E
- bl FUN_020054C8
+ bl PlaySE
_0207771E:
mov r2, #0x49
lsl r2, r2, #0x4
@@ -1209,7 +1209,7 @@ _0207771E:
add r0, #0x3a
bl FUN_0207916C
ldr r0, _020777C4 ; =0x0000069E
- bl FUN_020054C8
+ bl PlaySE
b _020777B8
_02077746:
mov r2, #0x1
@@ -3308,7 +3308,7 @@ _02078820:
ldr r0, [sp, #0x10]
bl FUN_02078B88
ldr r0, _02078890 ; =0x0000069B
- bl FUN_020054C8
+ bl PlaySE
_0207887E:
add sp, #0x28
pop {r3-r7, pc}
@@ -3829,7 +3829,7 @@ FUN_02078C98: ; 0x02078C98
tst r0, r1
beq _02078CC0
ldr r0, _02078D74 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0xd3
lsl r0, r0, #0x2
ldr r0, [r5, r0]
@@ -3844,7 +3844,7 @@ _02078CC0:
tst r0, r1
beq _02078CE0
ldr r0, _02078D74 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0xd3
lsl r0, r0, #0x2
ldr r0, [r5, r0]
@@ -3859,7 +3859,7 @@ _02078CE0:
tst r0, r1
beq _02078D00
ldr r0, _02078D74 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0xd3
lsl r0, r0, #0x2
ldr r0, [r5, r0]
@@ -3874,7 +3874,7 @@ _02078D00:
tst r0, r1
beq _02078D20
ldr r0, _02078D74 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0xd3
lsl r0, r0, #0x2
ldr r0, [r5, r0]
@@ -3889,7 +3889,7 @@ _02078D20:
tst r0, r1
beq _02078D46
ldr r0, _02078D74 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0xd3
lsl r0, r0, #0x2
ldr r0, [r5, r0]
@@ -4579,7 +4579,7 @@ _0207924A:
str r2, [sp, #0xc]
bl FUN_02078E7C
ldr r0, _02079544 ; =0x000005EB
- bl FUN_020054C8
+ bl PlaySE
b _02079526
_0207927C:
add r0, r4, #0x0
@@ -4615,7 +4615,7 @@ _0207927C:
str r2, [sp, #0xc]
bl FUN_02078E7C
ldr r0, _02079544 ; =0x000005EB
- bl FUN_020054C8
+ bl PlaySE
b _02079526
_020792CA:
mov r3, #0x56
@@ -4653,7 +4653,7 @@ _020792CA:
add r1, r1, #0x1
str r1, [r4, r0]
ldr r0, _02079544 ; =0x000005EB
- bl FUN_020054C8
+ bl PlaySE
b _02079526
_0207931C:
mov r2, #0x46
@@ -4679,7 +4679,7 @@ _0207931C:
add r0, r0, #0x1
str r0, [r2, r1]
ldr r0, _02079548 ; =0x0000069E
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0xd3
lsl r0, r0, #0x2
ldr r0, [r4, r0]
@@ -4765,7 +4765,7 @@ _020793BC:
add r1, r1, #0x1
str r1, [r4, r0]
ldr r0, _02079558 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0xd3
lsl r0, r0, #0x2
ldr r0, [r4, r0]
@@ -4785,7 +4785,7 @@ _0207940E:
cmp r0, #0x0
bne _02079454
ldr r0, _02079560 ; =0x000005E2
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _02079564 ; =0x000004A8
ldr r1, [r4, r0]
add r1, r1, #0x1
@@ -4862,7 +4862,7 @@ _02079470:
add r0, r4, r0
bl FUN_02079710
ldr r0, _02079544 ; =0x000005EB
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0xd3
lsl r0, r0, #0x2
ldr r0, [r4, r0]
diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s
index f69ef230..3bbacdab 100644
--- a/arm9/asm/unk_02079C70.s
+++ b/arm9/asm/unk_02079C70.s
@@ -864,7 +864,7 @@ _0207A376:
beq _0207A394
sub r3, #0xb2
add r0, r3, #0x0
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x93
lsl r0, r0, #0x2
ldr r0, [r4, r0]
@@ -888,7 +888,7 @@ _0207A394:
bne _0207A3BE
sub r3, #0xb2
add r0, r3, #0x0
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
bl FUN_0207C23C
pop {r4-r6, pc}
@@ -898,7 +898,7 @@ _0207A3BE:
cmp r1, #0x3
bne _0207A3D6
add r0, #0x10
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _0207A444 ; =0x0000068E
mov r1, #0x0
strb r1, [r4, r0]
@@ -908,7 +908,7 @@ _0207A3D6:
cmp r1, #0x5
bne _0207A3EA
add r0, #0x10
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _0207A444 ; =0x0000068E
mov r1, #0x0
strb r1, [r4, r0]
@@ -923,7 +923,7 @@ _0207A3EA:
cmp r1, #0x0
beq _0207A420
sub r0, #0xaf
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _0207A444 ; =0x0000068E
mov r1, #0x0
strb r1, [r4, r0]
@@ -933,7 +933,7 @@ _0207A408:
cmp r1, #0x7
bne _0207A420
sub r0, #0xaf
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x93
lsl r0, r0, #0x2
ldr r0, [r4, r0]
@@ -1027,7 +1027,7 @@ FUN_0207A498: ; 0x0207A498
cmp r0, #0x1
bne _0207A4BE
ldr r0, _0207A56C ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
bl FUN_0207B8D8
_0207A4BE:
@@ -1042,7 +1042,7 @@ _0207A4C2:
cmp r0, #0x1
bne _0207A4DE
ldr r0, _0207A56C ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
bl FUN_0207B8D8
_0207A4DE:
@@ -1059,7 +1059,7 @@ _0207A4E2:
cmp r1, #0x4
bne _0207A510
add r0, #0xf
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _0207A574 ; =0x0000068E
mov r1, #0x0
strb r1, [r4, r0]
@@ -1080,7 +1080,7 @@ _0207A510:
cmp r1, #0x1
beq _0207A542
sub r0, #0xb0
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
bl FUN_0207CBE8
ldr r2, _0207A570 ; =0x0000068D
@@ -1101,7 +1101,7 @@ _0207A542:
tst r0, r2
beq _0207A564
ldr r0, _0207A578 ; =0x0000069C
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _0207A574 ; =0x0000068E
mov r1, #0x0
strb r1, [r4, r0]
@@ -1139,7 +1139,7 @@ FUN_0207A57C: ; 0x0207A57C
cmp r0, #0x1
bne _0207A5A2
ldr r0, _0207A648 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
bl FUN_0207B8D8
_0207A5A2:
@@ -1154,7 +1154,7 @@ _0207A5A6:
cmp r0, #0x1
bne _0207A5C2
ldr r0, _0207A648 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
bl FUN_0207B8D8
_0207A5C2:
@@ -1180,7 +1180,7 @@ _0207A5C6:
cmp r2, r1
beq _0207A618
sub r0, #0xb0
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
bl FUN_0207B9C0
ldr r1, _0207A64C ; =0x0000068D
@@ -1198,7 +1198,7 @@ _0207A5C6:
b _0207A61E
_0207A618:
ldr r0, _0207A650 ; =0x000005DD
- bl FUN_020054C8
+ bl PlaySE
_0207A61E:
mov r0, #0x7
pop {r4, pc}
@@ -1207,7 +1207,7 @@ _0207A622:
tst r0, r2
beq _0207A63E
ldr r0, _0207A650 ; =0x000005DD
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x43
lsl r0, r0, #0x4
ldr r0, [r4, r0]
@@ -1256,7 +1256,7 @@ _0207A67E:
cmp r0, #0x1
bne _0207A69C
ldr r0, _0207A754 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
bl FUN_0207B8D8
_0207A69C:
@@ -1271,7 +1271,7 @@ _0207A6A0:
cmp r0, #0x1
bne _0207A6BC
ldr r0, _0207A754 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0x0
bl FUN_0207B8D8
_0207A6BC:
@@ -1282,7 +1282,7 @@ _0207A6C0:
tst r0, r2
beq _0207A72C
ldr r0, _0207A758 ; =0x000005DD
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _0207A75C ; =0x0000068D
ldrb r0, [r4, r0]
lsl r0, r0, #0x1c
@@ -1333,7 +1333,7 @@ _0207A72C:
tst r0, r2
beq _0207A74C
ldr r0, _0207A758 ; =0x000005DD
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x93
lsl r0, r0, #0x2
ldr r1, [r4, r0]
@@ -1441,7 +1441,7 @@ _0207A7F0:
tst r0, r1
beq _0207A808
ldr r0, _0207A810 ; =0x000005DD
- bl FUN_020054C8
+ bl PlaySE
ldr r0, _0207A814 ; =0x0000068E
mov r1, #0x0
strb r1, [r4, r0]
@@ -2679,7 +2679,7 @@ _0207B1D0:
cmp r4, r0
beq _0207B1F4
ldr r0, _0207B1FC ; =0x000005E1
- bl FUN_020054C8
+ bl PlaySE
add r0, r5, #0x0
bl FUN_0207FA38
add r0, r5, #0x0
@@ -4611,7 +4611,7 @@ _0207C14A:
beq _0207C160
_0207C15A:
ldr r0, _0207C1D4 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
_0207C160:
ldr r1, _0207C1D0 ; =0x00000697
add r0, r5, #0x0
diff --git a/arm9/asm/unk_0207F95C.s b/arm9/asm/unk_0207F95C.s
index 6c0cc9bf..4934c2fb 100644
--- a/arm9/asm/unk_0207F95C.s
+++ b/arm9/asm/unk_0207F95C.s
@@ -318,7 +318,7 @@ FUN_0207FB28: ; 0x0207FB28
_0207FB4A:
sub r1, #0xab
add r0, r1, #0x0
- bl FUN_020054C8
+ bl PlaySE
add r0, r5, #0x0
bl FUN_0207FA38
ldr r1, _0207FBFC ; =0x00000696
diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s
index b8693e4a..4f43b41e 100644
--- a/arm9/asm/unk_02080C38.s
+++ b/arm9/asm/unk_02080C38.s
@@ -3394,7 +3394,7 @@ FUN_0208251C: ; 0x0208251C
mov r3, #0x3f
bl FUN_0200A208
ldr r0, _0208259C ; =0x000005F8
- bl FUN_020054C8
+ bl PlaySE
ldrb r0, [r4, #0xa]
add r0, r0, #0x1
strb r0, [r4, #0xa]
diff --git a/arm9/asm/unk_020828BC.s b/arm9/asm/unk_020828BC.s
index 4e216093..74c231ea 100644
--- a/arm9/asm/unk_020828BC.s
+++ b/arm9/asm/unk_020828BC.s
@@ -1641,7 +1641,7 @@ FUN_020833D4: ; 0x020833D4
cmp r0, #0x0
bne _020833EE
mov r0, #0x1
- bl FUN_02002B60
+ bl TextFlags_SetCanABSpeedUpPrint
mov r0, #0x3
bl FUN_02002B7C
mov r0, #0x1
@@ -1651,7 +1651,7 @@ _020833EE:
mov r0, #0x1
bl FUN_02002B7C
mov r0, #0x0
- bl FUN_02002B60
+ bl TextFlags_SetCanABSpeedUpPrint
mov r0, #0x0
bl FUN_02002BB8
pop {r3, pc}
@@ -1661,7 +1661,7 @@ _020833EE:
FUN_02083404: ; 0x02083404
push {r3, lr}
mov r0, #0x0
- bl FUN_02002B60
+ bl TextFlags_SetCanABSpeedUpPrint
mov r0, #0x0
bl FUN_02002B7C
mov r0, #0x0
diff --git a/arm9/asm/unk_02084098.s b/arm9/asm/unk_02084098.s
index 20023b86..bb06cec2 100644
--- a/arm9/asm/unk_02084098.s
+++ b/arm9/asm/unk_02084098.s
@@ -175,7 +175,7 @@ FUN_020840CC: ; 0x020840CC
add r1, r0, #0x0
bl FUN_020334E8
ldr r0, _02084110 ; =0x00000658
- bl FUN_020054C8
+ bl PlaySE
pop {r3-r5, pc}
.balign 4
_0208410C: .word 0x00004A34
diff --git a/arm9/asm/unk_02086FA8.s b/arm9/asm/unk_02086FA8.s
index 85a3ea7f..17c66660 100644
--- a/arm9/asm/unk_02086FA8.s
+++ b/arm9/asm/unk_02086FA8.s
@@ -644,7 +644,7 @@ _020874BC:
cmp r0, #0x19
blt _020874DC
ldr r0, _020874E0 ; =0x00000714
- bl FUN_020054C8
+ bl PlaySE
ldr r0, [r4, #0x64]
add r0, r0, #0x1
str r0, [r4, #0x64]
@@ -688,7 +688,7 @@ _0208750E:
cmp r0, #0x2
bne _0208754C
ldr r0, _02087550 ; =0x00000714
- bl FUN_020054C8
+ bl PlaySE
ldr r0, [r4, #0x6c]
mov r1, #0x2
bl FUN_0200C61C
@@ -737,7 +737,7 @@ _0208756A:
cmp r5, #0x1
bne _0208758C
ldr r0, _020875A8 ; =0x00000714
- bl FUN_020054C8
+ bl PlaySE
ldr r0, [r4, #0x6c]
mov r1, #0x3
bl FUN_0200C61C
@@ -790,7 +790,7 @@ _020875CE:
cmp r5, #0x1
bne _020875F0
ldr r0, _0208760C ; =0x00000714
- bl FUN_020054C8
+ bl PlaySE
ldr r0, [r4, #0x6c]
mov r1, #0x4
bl FUN_0200C61C
@@ -865,7 +865,7 @@ _02087658:
mov r1, #0x5
bl FUN_0200C61C
ldr r0, _02087818 ; =0x00000707
- bl FUN_020054C8
+ bl PlaySE
ldr r0, [r4, #0x40]
mov r1, #0x2
bl FUN_02086B70
@@ -1121,15 +1121,15 @@ _02087874:
b _0208789A
_02087884:
ldr r0, _02087A0C ; =0x00000806
- bl FUN_020054C8
+ bl PlaySE
b _0208789A
_0208788C:
ldr r0, _02087A10 ; =0x000007AA
- bl FUN_020054C8
+ bl PlaySE
b _0208789A
_02087894:
ldr r0, _02087A14 ; =0x00000815
- bl FUN_020054C8
+ bl PlaySE
_0208789A:
ldr r0, [r4, #0x60]
add r0, r0, #0x1
diff --git a/arm9/asm/unk_02088AAC.s b/arm9/asm/unk_02088AAC.s
deleted file mode 100644
index 1d8fe8cc..00000000
--- a/arm9/asm/unk_02088AAC.s
+++ /dev/null
@@ -1,345 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- .section .rodata
-
- .global UNK_020FD6F4
-UNK_020FD6F4: ; 0x020FD6F4
- .byte 0x04, 0xFF, 0x00, 0x00
-
- .global UNK_020FD6F8
-UNK_020FD6F8: ; 0x020FD6F8
- .word MOD75_021E6BA0, MOD75_021E6D6C, MOD75_021E6F00, SDK_OVERLAY_MODULE_75_ID
-
- .global UNK_020FD708
-UNK_020FD708: ; 0x020FD708
- .word MOD73_021D74F0, MOD73_021D758C, MOD73_021D7640, SDK_OVERLAY_MODULE_73_ID
-
- .global UNK_020FD718
-UNK_020FD718: ; 0x020FD718
- .word MOD68_021D74E0, MOD68_021D75D8, MOD68_021D762C, SDK_OVERLAY_MODULE_68_ID
-
- .text
-
- thumb_func_start FUN_02088AAC
-FUN_02088AAC: ; 0x02088AAC
- push {r4, lr}
- add r4, r1, #0x0
- ldr r1, [r4, #0x0]
- cmp r1, #0x5
- bhi _02088AF6
- add r1, r1, r1
- add r1, pc
- ldrh r1, [r1, #0x6]
- lsl r1, r1, #0x10
- asr r1, r1, #0x10
- add pc, r1
-_02088AC2: ; jump table (using 16-bit offset)
- .short _02088ACE - _02088AC2 - 2; case 0
- .short _02088AD6 - _02088AC2 - 2; case 1
- .short _02088ADE - _02088AC2 - 2; case 2
- .short _02088AE6 - _02088AC2 - 2; case 3
- .short _02088AEE - _02088AC2 - 2; case 4
- .short _02088AF2 - _02088AC2 - 2; case 5
-_02088ACE:
- bl FUN_02088B4C
- str r0, [r4, #0x0]
- b _02088AF6
-_02088AD6:
- bl FUN_02088BA8
- str r0, [r4, #0x0]
- b _02088AF6
-_02088ADE:
- bl FUN_02088C3C
- str r0, [r4, #0x0]
- b _02088AF6
-_02088AE6:
- bl FUN_02088CDC
- str r0, [r4, #0x0]
- b _02088AF6
-_02088AEE:
- mov r0, #0x1
- pop {r4, pc}
-_02088AF2:
- mov r0, #0x4
- pop {r4, pc}
-_02088AF6:
- mov r0, #0x0
- pop {r4, pc}
- .balign 4
-
- thumb_func_start FUN_02088AFC
-FUN_02088AFC: ; 0x02088AFC
- push {r3-r5, lr}
- sub sp, #0x10
- ldr r5, _02088B24 ; =UNK_020FD708
- add r3, sp, #0x0
- add r4, r0, #0x0
- add r2, r3, #0x0
- ldmia r5!, {r0-r1}
- stmia r3!, {r0-r1}
- ldmia r5!, {r0-r1}
- stmia r3!, {r0-r1}
- add r0, r2, #0x0
- ldr r2, [r4, #0x0]
- add r1, r4, #0x0
- bl OverlayManager_new
- str r0, [r4, #0x1c]
- mov r0, #0x2
- add sp, #0x10
- pop {r3-r5, pc}
- nop
-_02088B24: .word UNK_020FD708
-
- thumb_func_start FUN_02088B28
-FUN_02088B28: ; 0x02088B28
- push {r4, lr}
- add r4, r0, #0x0
- add r0, #0x1c
- bl FUN_0208898C
- cmp r0, #0x0
- bne _02088B3A
- mov r0, #0x2
- pop {r4, pc}
-_02088B3A:
- ldr r0, [r4, #0x20]
- cmp r0, #0x1
- bne _02088B44
- mov r0, #0x0
- pop {r4, pc}
-_02088B44:
- mov r0, #0x3
- pop {r4, pc}
-
- thumb_func_start FUN_02088B48
-FUN_02088B48: ; 0x02088B48
- mov r0, #0x4
- bx lr
-
- thumb_func_start FUN_02088B4C
-FUN_02088B4C: ; 0x02088B4C
- push {r3-r5, lr}
- sub sp, #0x10
- ldr r3, _02088BA0 ; =UNK_020FD6F8
- add r2, sp, #0x0
- add r5, r0, #0x0
- ldmia r3!, {r0-r1}
- stmia r2!, {r0-r1}
- ldmia r3!, {r0-r1}
- stmia r2!, {r0-r1}
- ldr r0, [r5, #0x10]
- ldr r1, _02088BA4 ; =UNK_020FD6F4
- ldr r0, [r0, #0x14]
- ldr r2, [r5, #0x0]
- bl CreateBagView
- add r4, r0, #0x0
- ldrh r0, [r5, #0x6]
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- cmp r0, #0x1
- bne _02088B7A
- mov r2, #0x5
- b _02088B7C
-_02088B7A:
- mov r2, #0x4
-_02088B7C:
- ldr r1, [r5, #0x10]
- lsl r2, r2, #0x18
- ldr r1, [r1, #0xc]
- ldr r3, [r5, #0xc]
- add r0, r4, #0x0
- lsr r2, r2, #0x18
- bl FUN_0206E314
- ldr r2, [r5, #0x0]
- add r0, sp, #0x0
- add r1, r4, #0x0
- bl OverlayManager_new
- str r0, [r5, #0x1c]
- str r4, [r5, #0x18]
- mov r0, #0x1
- add sp, #0x10
- pop {r3-r5, pc}
- .balign 4
-_02088BA0: .word UNK_020FD6F8
-_02088BA4: .word UNK_020FD6F4
-
- thumb_func_start FUN_02088BA8
-FUN_02088BA8: ; 0x02088BA8
- push {r3-r5, lr}
- add r4, r0, #0x0
- add r0, #0x1c
- bl FUN_0208898C
- cmp r0, #0x0
- bne _02088BBA
- mov r0, #0x1
- pop {r3-r5, pc}
-_02088BBA:
- ldr r0, [r4, #0x0]
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- bl BagView_new
- add r5, r0, #0x0
- bl FUN_0206E308
- add r2, r0, #0x0
- ldr r1, [r4, #0x18]
- add r0, r5, #0x0
- bl memcpy
- ldr r0, [r4, #0x18]
- bl FreeToHeap
- mov r0, #0x0
- str r0, [r4, #0x18]
- add r0, r5, #0x0
- bl FUN_0206E37C
- str r0, [r4, #0x8]
- add r0, r5, #0x0
- bl FreeToHeap
- add r0, r5, #0x0
- bl FUN_0206E384
- cmp r0, #0x5
- bhi _02088C16
- add r0, r0, r0
- add r0, pc
- ldrh r0, [r0, #0x6]
- lsl r0, r0, #0x10
- asr r0, r0, #0x10
- add pc, r0
-_02088C02: ; jump table (using 16-bit offset)
- .short _02088C1E - _02088C02 - 2; case 0
- .short _02088C0E - _02088C02 - 2; case 1
- .short _02088C1E - _02088C02 - 2; case 2
- .short _02088C1E - _02088C02 - 2; case 3
- .short _02088C1E - _02088C02 - 2; case 4
- .short _02088C12 - _02088C02 - 2; case 5
-_02088C0E:
- mov r0, #0x2
- pop {r3-r5, pc}
-_02088C12:
- mov r0, #0x5
- pop {r3-r5, pc}
-_02088C16:
- bl GF_AssertFail
- mov r0, #0x95
- str r0, [r4, #0x8]
-_02088C1E:
- ldr r0, [r4, #0x10]
- ldr r1, [r4, #0x8]
- ldr r0, [r0, #0x14]
- lsl r1, r1, #0x10
- ldr r3, [r4, #0x0]
- lsr r1, r1, #0x10
- mov r2, #0x1
- bl Bag_TakeItem
- cmp r0, #0x0
- bne _02088C38
- bl GF_AssertFail
-_02088C38:
- mov r0, #0x4
- pop {r3-r5, pc}
-
- thumb_func_start FUN_02088C3C
-FUN_02088C3C: ; 0x02088C3C
- push {r3-r7, lr}
- sub sp, #0x18
- add r5, r0, #0x0
- ldr r0, [r5, #0x10]
- ldr r3, _02088CD8 ; =UNK_020FD718
- ldr r0, [r0, #0x14]
- add r2, sp, #0x8
- str r0, [sp, #0x0]
- ldmia r3!, {r0-r1}
- stmia r2!, {r0-r1}
- ldmia r3!, {r0-r1}
- stmia r2!, {r0-r1}
- ldr r0, [r5, #0x0]
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- bl FUN_020851B8
- str r0, [r5, #0x18]
- ldr r1, [r5, #0x8]
- mov r2, #0x1
- lsl r1, r1, #0x10
- lsr r1, r1, #0x10
- bl FUN_020851DC
- mov r6, #0x0
- add r4, r6, #0x0
-_02088C70:
- add r0, r4, #0x0
- bl BerryToItemId
- lsl r0, r0, #0x18
- lsr r7, r0, #0x18
- ldr r0, [sp, #0x0]
- ldr r3, [r5, #0x0]
- add r1, r7, #0x0
- mov r2, #0x1
- bl Bag_HasItem
- cmp r0, #0x1
- bne _02088C9A
- ldr r0, [r5, #0x18]
- add r1, r7, #0x0
- mov r2, #0x0
- bl FUN_020851DC
- add r0, r6, #0x1
- lsl r0, r0, #0x18
- lsr r6, r0, #0x18
-_02088C9A:
- add r0, r4, #0x1
- lsl r0, r0, #0x18
- lsr r4, r0, #0x18
- cmp r4, #0x40
- blo _02088C70
- add r3, sp, #0x4
- ldr r0, [r5, #0xc]
- mov r1, #0x4
- add r2, sp, #0x4
- add r3, #0x1
- bl FUN_0206F17C
- add r2, sp, #0x4
- ldrb r1, [r2, #0x1]
- add r3, r6, #0x2
- lsl r3, r3, #0x18
- ldrb r2, [r2, #0x0]
- ldr r0, [r5, #0x18]
- lsr r3, r3, #0x18
- bl FUN_020851F8
- ldr r1, [r5, #0x18]
- ldr r2, [r5, #0x0]
- add r0, sp, #0x8
- bl OverlayManager_new
- str r0, [r5, #0x1c]
- mov r0, #0x3
- add sp, #0x18
- pop {r3-r7, pc}
- nop
-_02088CD8: .word UNK_020FD718
-
- thumb_func_start FUN_02088CDC
-FUN_02088CDC: ; 0x02088CDC
- push {r3-r4, lr}
- sub sp, #0x4
- add r4, r0, #0x0
- add r0, #0x1c
- bl FUN_0208898C
- cmp r0, #0x0
- bne _02088CF2
- add sp, #0x4
- mov r0, #0x3
- pop {r3-r4, pc}
-_02088CF2:
- add r1, sp, #0x0
- ldr r0, [r4, #0x18]
- add r1, #0x1
- add r2, sp, #0x0
- bl FUN_0208524C
- add r3, sp, #0x0
- ldrb r2, [r3, #0x0]
- ldrb r3, [r3, #0x1]
- ldr r0, [r4, #0xc]
- mov r1, #0x4
- bl FUN_0206F190
- ldr r0, [r4, #0x18]
- bl FreeToHeap
- mov r0, #0x0
- str r0, [r4, #0x18]
- add sp, #0x4
- pop {r3-r4, pc}
- .balign 4
diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s
index 3df63ca5..7cd4ef75 100644
--- a/arm9/asm/unk_0208A338.s
+++ b/arm9/asm/unk_0208A338.s
@@ -742,7 +742,7 @@ _0208A928:
tst r1, r0
beq _0208A93A
ldr r0, _0208A994 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add sp, #0x8
ldr r0, [r4, #0x5c]
pop {r4, pc}
@@ -751,7 +751,7 @@ _0208A93A:
tst r0, r1
beq _0208A94E
ldr r0, _0208A994 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
ldr r0, [r4, #0x60]
add sp, #0x8
sub r0, r0, #0x1
@@ -781,7 +781,7 @@ _0208A954:
ldr r0, [r4, #0x68]
bl CopyWindowPixelsToVram_TextMode
ldr r0, _0208A994 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x0
mvn r0, r0
add sp, #0x8