summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arm9/asm/CARD_backup.s17
-rw-r--r--arm9/asm/CARD_common.s5
-rw-r--r--arm9/asm/save.s22
-rw-r--r--arm9/asm/scrcmd.s2
-rw-r--r--arm9/asm/scrcmd_12.s2
-rw-r--r--arm9/asm/scrcmd_18.s63
-rw-r--r--arm9/asm/scrcmd_7.s2
-rw-r--r--arm9/asm/scrcmd_9.s2
-rw-r--r--arm9/asm/unk_02022504.s14
-rw-r--r--arm9/asm/unk_020377F0.s2
-rw-r--r--arm9/asm/unk_02038C78.s26
-rw-r--r--arm9/asm/unk_02047500.s2
-rw-r--r--arm9/asm/unk_020484A8.s6
-rw-r--r--arm9/asm/unk_0204A01C.s60
-rw-r--r--arm9/asm/unk_02060CCC.s2
-rw-r--r--arm9/asm/unk_0206ABC4.s4
-rw-r--r--arm9/asm/unk_0206C700.s2
-rw-r--r--arm9/global.inc60
-rw-r--r--arm9/modules/05/asm/mod05_021D80E8.s8
-rw-r--r--arm9/modules/05/asm/module_05.s8
-rw-r--r--arm9/modules/06/asm/module_06.s4
-rw-r--r--arm9/modules/11/asm/module_11_thumb2.s2
-rw-r--r--arm9/src/pokemon.c10
-rw-r--r--include/pokemon.h2
24 files changed, 163 insertions, 164 deletions
diff --git a/arm9/asm/CARD_backup.s b/arm9/asm/CARD_backup.s
index ddbb5c63..32e6bc2a 100644
--- a/arm9/asm/CARD_backup.s
+++ b/arm9/asm/CARD_backup.s
@@ -24,10 +24,10 @@ _020D6DA8: .word cardi_common
arm_func_start CARD_TryWaitBackupAsync
CARD_TryWaitBackupAsync: ; 0x020D6DAC
- ldr ip, _020D6DB4 ; =FUN_020D6714
+ ldr ip, _020D6DB4 ; =CARDi_TryWaitAsync
bx r12
.balign 4
-_020D6DB4: .word FUN_020D6714
+_020D6DB4: .word CARDi_TryWaitAsync
arm_func_start CARD_WaitBackupAsync
CARD_WaitBackupAsync: ; 0x020D6DB8
@@ -250,14 +250,11 @@ _020D7094:
cmp r7, #0x3
addls pc, pc, r7, lsl #0x2
b _020D7124
-_020D70A0:
- b _020D70B0
-_020D70A4:
- b _020D70D4
-_020D70A8:
- b _020D70D4
-_020D70AC:
- b _020D710C
+ ; jump table
+ b _020D70B0 ; case 0
+ b _020D70D4 ; case 1
+ b _020D70D4 ; case 2
+ b _020D710C ; case 3
_020D70B0:
mov r1, r5
add r0, r9, #0x120
diff --git a/arm9/asm/CARD_common.s b/arm9/asm/CARD_common.s
index 37c24188..42bce178 100644
--- a/arm9/asm/CARD_common.s
+++ b/arm9/asm/CARD_common.s
@@ -68,9 +68,8 @@ CARD_GetResultCode: ; 0x020D6700
.balign 4
_020D6710: .word cardi_common
-;CARDi_TryWaitAsync?
- arm_func_start FUN_020D6714
-FUN_020D6714: ; 0x020D6714
+ arm_func_start CARDi_TryWaitAsync
+CARDi_TryWaitAsync: ; 0x020D6714
ldr r0, _020D672C ; =cardi_common
ldr r0, [r0, #0x114]
ands r0, r0, #0x4
diff --git a/arm9/asm/save.s b/arm9/asm/save.s
index fc900362..b825978e 100644
--- a/arm9/asm/save.s
+++ b/arm9/asm/save.s
@@ -1898,8 +1898,8 @@ FUN_020232B4: ; 0x020232B4
bx lr
.balign 4
- thumb_func_start FUN_020232BC
-FUN_020232BC: ; 0x020232BC
+ thumb_func_start WriteSaveFileToFlash
+WriteSaveFileToFlash: ; 0x020232BC
push {r3-r7, lr}
sub sp, #0x8
add r7, r0, #0x0
@@ -2051,8 +2051,8 @@ _020233FC: .word UNK_020EE6D8
_02023400: .word UNK_020EE6E0
_02023404: .word 0x000204A0
- thumb_func_start FUN_02023408
-FUN_02023408: ; 0x02023408
+ thumb_func_start ReadSaveFileFromFlash
+ReadSaveFileFromFlash: ; 0x02023408
push {r4-r7, lr}
sub sp, #0x14
add r5, r0, #0x0
@@ -2308,7 +2308,7 @@ _02023608:
str r3, [sp, #0x0]
mov r1, #0x1
str r1, [sp, #0x4]
- mov r0, #0x6
+ mov r0, #0x6 ; CARD_REQ_READ_BACKUP
str r0, [sp, #0x8]
str r1, [sp, #0xc]
add r0, r5, #0x0
@@ -2338,8 +2338,8 @@ _02023652:
.balign 4
_02023658: .word UNK_021C59C8
- thumb_func_start FUN_0202365C
-FUN_0202365C: ; 0x0202365C
+ thumb_func_start FlashWriteCommandCallback
+FlashWriteCommandCallback: ; 0x0202365C
ldr r0, _02023664 ; =UNK_021C59C8
mov r1, #0x1
str r1, [r0, #0x4]
@@ -2368,7 +2368,7 @@ _02023684:
mov r0, #0x0
str r0, [sp, #0x0]
str r0, [sp, #0x4]
- mov r1, #0x6
+ mov r1, #0x6 ; CARD_REQ_READ_BACKUP
str r1, [sp, #0x8]
mov r1, #0x1
str r1, [sp, #0xc]
@@ -2389,13 +2389,13 @@ _020236B2:
str r1, [sp, #0x0]
mov r0, #0x1
str r0, [sp, #0x4]
- mov r0, #0x7
+ mov r0, #0x7 ; CARD_REQ_WRITE_BACKUP
str r0, [sp, #0x8]
mov r0, #0xa
str r0, [sp, #0xc]
mov r0, #0x2
str r0, [sp, #0x10]
- ldr r3, _020236E0 ; =FUN_0202365C
+ ldr r3, _020236E0 ; =FlashWriteCommandCallback
add r0, r6, #0x0
add r1, r5, #0x0
add r2, r7, #0x0
@@ -2405,7 +2405,7 @@ _020236B2:
pop {r3-r7, pc}
.balign 4
_020236DC: .word UNK_021C59C8
-_020236E0: .word FUN_0202365C
+_020236E0: .word FlashWriteCommandCallback
thumb_func_start WaitFlashWrite
WaitFlashWrite: ; 0x020236E4
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s
index 8eb78baf..5d9225bd 100644
--- a/arm9/asm/scrcmd.s
+++ b/arm9/asm/scrcmd.s
@@ -11772,7 +11772,7 @@ FUN_0203F760: ; 0x0203F760
mov r1, #0x20
ldr r0, [r0, #0xc]
add r2, sp, #0x0
- bl FUN_02022534
+ bl LoadSaveFile
ldr r1, [sp, #0x0]
add r4, r0, #0x0
cmp r1, #0x0
diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s
index 325e85b5..a04f57b9 100644
--- a/arm9/asm/scrcmd_12.s
+++ b/arm9/asm/scrcmd_12.s
@@ -305,7 +305,7 @@ FUN_02042F28: ; 0x02042F28
ldr r1, [r1, #0xc]
ldr r2, _02042F44 ; =0x000001EA
mov r0, #0x20
- bl FUN_0204A0C8
+ bl GiveEgg
add sp, #0x8
pop {r3, pc}
.balign 4
diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s
index c4fa299c..c5765553 100644
--- a/arm9/asm/scrcmd_18.s
+++ b/arm9/asm/scrcmd_18.s
@@ -3,8 +3,8 @@
.text
- thumb_func_start FUN_020442BC
-FUN_020442BC: ; 0x020442BC
+ thumb_func_start ScrCmd_givemon
+ScrCmd_givemon: ; 0x020442BC
push {r4-r7, lr}
sub sp, #0x14
add r4, r0, #0x0
@@ -60,15 +60,18 @@ FUN_020442BC: ; 0x020442BC
ldr r2, [sp, #0xc]
mov r0, #0xb
lsr r3, r3, #0x18
- bl FUN_0204A048
+ bl GiveMon
strh r0, [r4, #0x0]
mov r0, #0x0
add sp, #0x14
pop {r4-r7, pc}
.balign 4
- thumb_func_start FUN_0204434C
-FUN_0204434C: ; 0x0204434C
+ 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
@@ -110,8 +113,8 @@ _020443A2:
mov r0, #0x0
pop {r4-r6, pc}
- thumb_func_start FUN_020443A8
-FUN_020443A8: ; 0x020443A8
+ thumb_func_start ScrCmd_checkpartymonotid
+ScrCmd_checkpartymonotid: ; 0x020443A8
push {r3-r7, lr}
add r4, r0, #0x0
add r0, #0x80
@@ -159,8 +162,8 @@ _0204440E:
mov r0, #0x0
pop {r3-r7, pc}
- thumb_func_start FUN_02044414
-FUN_02044414: ; 0x02044414
+ thumb_func_start ScrCmd_giveegg
+ScrCmd_giveegg: ; 0x02044414
push {r4-r7, lr}
sub sp, #0xc
add r5, r0, #0x0
@@ -206,7 +209,7 @@ FUN_02044414: ; 0x02044414
add r0, r4, #0x0
mov r2, #0x1
add r3, r7, #0x0
- bl MOD05_021ECF14
+ bl MOD05_SetEggStats
add r0, r6, #0x0
add r1, r4, #0x0
bl AddMonToParty
@@ -218,8 +221,8 @@ _02044494:
pop {r4-r7, pc}
.balign 4
- thumb_func_start FUN_0204449C
-FUN_0204449C: ; 0x0204449C
+ thumb_func_start ScrCmd_setpartymonmove
+ScrCmd_setpartymonmove: ; 0x0204449C
push {r3-r7, lr}
add r5, r0, #0x0
bl ScriptReadHalfword
@@ -252,13 +255,13 @@ FUN_0204449C: ; 0x0204449C
add r1, r4, #0x0
add r2, r6, #0x0
add r3, r7, #0x0
- bl FUN_0204A120
+ bl PartyMonSetMoveInSlot
mov r0, #0x0
pop {r3-r7, pc}
.balign 4
- thumb_func_start FUN_020444F4
-FUN_020444F4: ; 0x020444F4
+ thumb_func_start ScrCmd_partymonhasmove
+ScrCmd_partymonhasmove: ; 0x020444F4
push {r3-r7, lr}
add r4, r0, #0x0
add r1, r4, #0x0
@@ -332,8 +335,8 @@ _02044592:
pop {r3-r7, pc}
.balign 4
- thumb_func_start FUN_02044598
-FUN_02044598: ; 0x02044598
+ thumb_func_start ScrCmd_findpartymonwithmove
+ScrCmd_findpartymonwithmove: ; 0x02044598
push {r3-r7, lr}
sub sp, #0x8
add r4, r0, #0x0
@@ -420,8 +423,8 @@ _02044648:
_02044650: .word 0x00000006
_02044654: .word 0x00000000
- thumb_func_start FUN_02044658
-FUN_02044658: ; 0x02044658
+ thumb_func_start ScrCmd_survivepsn
+ScrCmd_survivepsn: ; 0x02044658
push {r4-r6, lr}
add r5, r0, #0x0
bl ScriptReadHalfword
@@ -445,13 +448,13 @@ FUN_02044658: ; 0x02044658
bl SavArray_PlayerParty_get
add r1, r6, #0x0
bl GetPartyMonByIndex
- bl FUN_0204A32C
+ bl SurvivePoisoning
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
- thumb_func_start FUN_0204469C
-FUN_0204469C: ; 0x0204469C
+ thumb_func_start ScrCmd_countpartymonsatorbelowlevel
+ScrCmd_countpartymonsatorbelowlevel: ; 0x0204469C
push {r4-r7, lr}
sub sp, #0xc
add r4, r0, #0x0
@@ -520,8 +523,8 @@ _02044726:
add sp, #0xc
pop {r4-r7, pc}
- thumb_func_start FUN_02044730
-FUN_02044730: ; 0x02044730
+ thumb_func_start ScrCmd_getpartymonlevel
+ScrCmd_getpartymonlevel: ; 0x02044730
push {r4-r6, lr}
add r5, r0, #0x0
add r1, r5, #0x0
@@ -562,8 +565,8 @@ _02044786:
pop {r4-r6, pc}
.balign 4
- thumb_func_start FUN_0204478C
-FUN_0204478C: ; 0x0204478C
+ thumb_func_start ScrCmd_getpartymonnature
+ScrCmd_getpartymonnature: ; 0x0204478C
push {r4-r6, lr}
add r6, r0, #0x0
add r1, r6, #0x0
@@ -615,8 +618,8 @@ _020447F2:
pop {r4-r6, pc}
.balign 4
- thumb_func_start FUN_02044800
-FUN_02044800: ; 0x02044800
+ thumb_func_start ScrCmd_findpartymonwithnature
+ScrCmd_findpartymonwithnature: ; 0x02044800
push {r3-r7, lr}
sub sp, #0x8
add r4, r0, #0x0
@@ -680,8 +683,8 @@ _0204487E:
_02044884: .word 0x000000FF
_02044888: .word 0x00000000
- thumb_func_start FUN_0204488C
-FUN_0204488C: ; 0x0204488C
+ thumb_func_start ScrCmd_getpartymonfriendship
+ScrCmd_getpartymonfriendship: ; 0x0204488C
push {r4-r6, lr}
add r5, r0, #0x0
add r1, r5, #0x0
diff --git a/arm9/asm/scrcmd_7.s b/arm9/asm/scrcmd_7.s
index 1a6a6584..7ae38f49 100644
--- a/arm9/asm/scrcmd_7.s
+++ b/arm9/asm/scrcmd_7.s
@@ -591,7 +591,7 @@ FUN_02041B70: ; 0x02041B70
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
bl SavArray_PlayerParty_get
- bl FUN_0204A248
+ bl HasEnoughAlivePokemonForDoubleBattle
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
diff --git a/arm9/asm/scrcmd_9.s b/arm9/asm/scrcmd_9.s
index 944243af..5c723f9a 100644
--- a/arm9/asm/scrcmd_9.s
+++ b/arm9/asm/scrcmd_9.s
@@ -549,7 +549,7 @@ FUN_02042288: ; 0x02042288
ldr r0, [r0, #0xc]
add r4, r1, #0x0
bl SavArray_PlayerParty_get
- bl FUN_0204A20C
+ bl GetFirstNonEggInParty
bl FUN_020690E4
add r2, r0, #0x0
add r0, r4, #0x0
diff --git a/arm9/asm/unk_02022504.s b/arm9/asm/unk_02022504.s
index 8aa31ef0..6e6c0d06 100644
--- a/arm9/asm/unk_02022504.s
+++ b/arm9/asm/unk_02022504.s
@@ -35,19 +35,19 @@ FUN_02022528: ; 0x02022528
nop
_02022530: .word SavArray_get
- thumb_func_start FUN_02022534
-FUN_02022534: ; 0x02022534
+ thumb_func_start LoadSaveFile
+LoadSaveFile: ; 0x02022534
push {r3, lr}
add r3, r2, #0x0
mov r2, #0x0
- bl FUN_02023408
+ bl ReadSaveFileFromFlash
pop {r3, pc}
- thumb_func_start FUN_02022540
-FUN_02022540: ; 0x02022540
- ldr r3, _02022548 ; =FUN_020232BC
+ thumb_func_start SaveGame
+SaveGame: ; 0x02022540
+ ldr r3, _02022548 ; =WriteSaveFileToFlash
add r2, r1, #0x0
mov r1, #0x0
bx r3
.balign 4
-_02022548: .word FUN_020232BC
+_02022548: .word WriteSaveFileToFlash
diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s
index 5f7dd028..3c5fc486 100644
--- a/arm9/asm/unk_020377F0.s
+++ b/arm9/asm/unk_020377F0.s
@@ -2253,7 +2253,7 @@ FUN_02038824: ; 0x02038824
ldr r0, [r5, #0xc]
mov r1, #0xb
add r2, sp, #0x0
- bl FUN_02022534
+ bl LoadSaveFile
ldr r1, [sp, #0x0]
add r4, r0, #0x0
cmp r1, #0x2
diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index 8eb56920..352c4094 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -299,11 +299,11 @@ gScriptCmdTable: ; 0x020F355C
.word FUN_0203B81C
.word FUN_0203B85C
.word FUN_0203B8A0
- .word FUN_020442BC
- .word FUN_02044414
- .word FUN_0204449C
- .word FUN_020444F4
- .word FUN_02044598
+ .word ScrCmd_givemon
+ .word ScrCmd_giveegg
+ .word ScrCmd_setpartymonmove
+ .word ScrCmd_partymonhasmove
+ .word ScrCmd_findpartymonwithmove
.word FUN_0203BB34
.word FUN_0203BB80
.word FUN_0203BB84
@@ -557,8 +557,8 @@ gScriptCmdTable: ; 0x020F355C
.word FUN_0203BA3C
.word FUN_0203BAB0
.word FUN_0203BAF4
- .word FUN_0204434C
- .word FUN_020443A8
+ .word ScrCmd_getpartyspecies
+ .word ScrCmd_checkpartymonotid
.word FUN_02044B2C
.word FUN_02044B84
.word FUN_02044C0C
@@ -590,7 +590,7 @@ gScriptCmdTable: ; 0x020F355C
.word FUN_0203DF84
.word FUN_0203DFA8
.word FUN_0203DFE0
- .word FUN_0204488C
+ .word ScrCmd_getpartymonfriendship
.word FUN_020448D4
.word FUN_020449A4
.word FUN_02044034
@@ -651,8 +651,8 @@ gScriptCmdTable: ; 0x020F355C
.word FUN_0204539C
.word FUN_020452B4
.word FUN_02045308
- .word FUN_0204469C
- .word FUN_02044658
+ .word ScrCmd_countpartymonsatorbelowlevel
+ .word ScrCmd_survivepsn
.word FUN_0203BC2C
.word FUN_02039A10
.word ScrCmd_message_from
@@ -679,8 +679,8 @@ gScriptCmdTable: ; 0x020F355C
.word FUN_0203E6C4
.word FUN_0203E6FC
.word FUN_0203E72C
- .word FUN_0204478C
- .word FUN_02044800
+ .word ScrCmd_getpartymonnature
+ .word ScrCmd_findpartymonwithnature
.word FUN_0203E744
.word FUN_02044158
.word FUN_0204416C
@@ -781,7 +781,7 @@ gScriptCmdTable: ; 0x020F355C
.word FUN_0203F2E4
.word FUN_02043C28
.word FUN_0203F31C
- .word FUN_02044730
+ .word ScrCmd_getpartymonlevel
.word FUN_0203F348
.word FUN_0203F38C
.word FUN_0203F39C
diff --git a/arm9/asm/unk_02047500.s b/arm9/asm/unk_02047500.s
index 04d99ac3..905cf7b1 100644
--- a/arm9/asm/unk_02047500.s
+++ b/arm9/asm/unk_02047500.s
@@ -239,7 +239,7 @@ _02047662:
FUN_02047668: ; 0x02047668
push {r4, lr}
mov r4, #0x1e
- bl FUN_0204A1D8
+ bl GetFirstAliveMonInParty_CrashIfNone
mov r1, #0x5
mov r2, #0x0
bl GetMonData
diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s
index 36b0d359..1d7ad0d5 100644
--- a/arm9/asm/unk_020484A8.s
+++ b/arm9/asm/unk_020484A8.s
@@ -29,7 +29,7 @@ FUN_020484A8: ; 0x020484A8
add r6, r1, #0x0
mov r1, #0xb
add r2, sp, #0x0
- bl FUN_02022534
+ bl LoadSaveFile
add r4, r0, #0x0
ldr r0, [sp, #0x0]
cmp r0, #0x1
@@ -51,7 +51,7 @@ _020484CC:
bl FUN_0202B050
ldr r0, [r5, #0xc]
add r1, r4, #0x0
- bl FUN_02022540
+ bl SaveGame
add r0, r4, #0x0
bl FreeToHeap
add sp, #0x14
@@ -309,7 +309,7 @@ FUN_02048694: ; 0x02048694
_0204871E:
ldr r0, [r4, #0xc]
bl SavArray_PlayerParty_get
- bl FUN_0204A25C
+ bl GiveAllMonsTheSinnohChampRibbon
ldr r0, [sp, #0x8]
bl FUN_020377B0
ldr r0, [sp, #0x4]
diff --git a/arm9/asm/unk_0204A01C.s b/arm9/asm/unk_0204A01C.s
index d66ec174..49ac1fa6 100644
--- a/arm9/asm/unk_0204A01C.s
+++ b/arm9/asm/unk_0204A01C.s
@@ -3,8 +3,8 @@
.text
- thumb_func_start FUN_0204A01C
-FUN_0204A01C: ; 0x0204A01C
+ thumb_func_start MonNotFaintedOrEgg
+MonNotFaintedOrEgg: ; 0x0204A01C
push {r4, lr}
mov r1, #0xa2
mov r2, #0x0
@@ -28,8 +28,8 @@ _0204A042:
pop {r4, pc}
.balign 4
- thumb_func_start FUN_0204A048
-FUN_0204A048: ; 0x0204A048
+ thumb_func_start GiveMon
+GiveMon: ; 0x0204A048
push {r3-r7, lr}
sub sp, #0x20
add r6, r1, #0x0
@@ -86,8 +86,8 @@ _0204A0BC:
add sp, #0x20
pop {r3-r7, pc}
- thumb_func_start FUN_0204A0C8
-FUN_0204A0C8: ; 0x0204A0C8
+ thumb_func_start GiveEgg
+GiveEgg: ; 0x0204A0C8
push {r4-r7, lr}
sub sp, #0xc
add r4, r1, #0x0
@@ -113,7 +113,7 @@ FUN_0204A0C8: ; 0x0204A0C8
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r7, #0x0
- bl MOD05_021ECF14
+ bl MOD05_SetEggStats
add r0, r6, #0x0
add r1, r4, #0x0
bl AddMonToParty
@@ -125,8 +125,8 @@ FUN_0204A0C8: ; 0x0204A0C8
pop {r4-r7, pc}
.balign 4
- thumb_func_start FUN_0204A120
-FUN_0204A120: ; 0x0204A120
+ thumb_func_start PartyMonSetMoveInSlot
+PartyMonSetMoveInSlot: ; 0x0204A120
push {r3-r5, lr}
add r5, r2, #0x0
add r4, r3, #0x0
@@ -134,12 +134,12 @@ FUN_0204A120: ; 0x0204A120
lsl r2, r5, #0x18
add r1, r4, #0x0
lsr r2, r2, #0x18
- bl FUN_020697CC
+ bl MonSetMoveInSlot
pop {r3-r5, pc}
.balign 4
- thumb_func_start FUN_0204A138
-FUN_0204A138: ; 0x0204A138
+ thumb_func_start GetIdxOfFirstPartyMonWithMove
+GetIdxOfFirstPartyMonWithMove: ; 0x0204A138
push {r3-r7, lr}
str r0, [sp, #0x0]
add r5, r1, #0x0
@@ -194,8 +194,8 @@ _0204A1A2:
pop {r3-r7, pc}
.balign 4
- thumb_func_start FUN_0204A1A8
-FUN_0204A1A8: ; 0x0204A1A8
+ thumb_func_start CountAlivePokemon
+CountAlivePokemon: ; 0x0204A1A8
push {r3-r7, lr}
add r7, r0, #0x0
bl GetPartyCount
@@ -208,7 +208,7 @@ _0204A1BA:
add r0, r7, #0x0
add r1, r4, #0x0
bl GetPartyMonByIndex
- bl FUN_0204A01C
+ bl MonNotFaintedOrEgg
cmp r0, #0x0
beq _0204A1CC
add r5, r5, #0x1
@@ -221,8 +221,8 @@ _0204A1D2:
pop {r3-r7, pc}
.balign 4
- thumb_func_start FUN_0204A1D8
-FUN_0204A1D8: ; 0x0204A1D8
+ thumb_func_start GetFirstAliveMonInParty_CrashIfNone
+GetFirstAliveMonInParty_CrashIfNone: ; 0x0204A1D8
push {r3-r7, lr}
add r6, r0, #0x0
bl GetPartyCount
@@ -235,7 +235,7 @@ _0204A1E8:
add r1, r4, #0x0
bl GetPartyMonByIndex
add r7, r0, #0x0
- bl FUN_0204A01C
+ bl MonNotFaintedOrEgg
cmp r0, #0x0
beq _0204A1FE
add r0, r7, #0x0
@@ -249,8 +249,8 @@ _0204A204:
mov r0, #0x0
pop {r3-r7, pc}
- thumb_func_start FUN_0204A20C
-FUN_0204A20C: ; 0x0204A20C
+ thumb_func_start GetFirstNonEggInParty
+GetFirstNonEggInParty: ; 0x0204A20C
push {r3-r7, lr}
add r6, r0, #0x0
bl GetPartyCount
@@ -282,10 +282,10 @@ _0204A240:
.balign 4
_0204A244: .word 0x00000000
- thumb_func_start FUN_0204A248
-FUN_0204A248: ; 0x0204A248
+ thumb_func_start HasEnoughAlivePokemonForDoubleBattle
+HasEnoughAlivePokemonForDoubleBattle: ; 0x0204A248
push {r3, lr}
- bl FUN_0204A1A8
+ bl CountAlivePokemon
cmp r0, #0x2
blt _0204A256
mov r0, #0x1
@@ -295,8 +295,8 @@ _0204A256:
pop {r3, pc}
.balign 4
- thumb_func_start FUN_0204A25C
-FUN_0204A25C: ; 0x0204A25C
+ thumb_func_start GiveAllMonsTheSinnohChampRibbon
+GiveAllMonsTheSinnohChampRibbon: ; 0x0204A25C
push {r3-r7, lr}
mov r2, #0x1
add r1, sp, #0x0
@@ -329,8 +329,8 @@ _0204A298:
pop {r3-r7, pc}
.balign 4
- thumb_func_start FUN_0204A29C
-FUN_0204A29C: ; 0x0204A29C
+ thumb_func_start ApplyPoisonStep
+ApplyPoisonStep: ; 0x0204A29C
push {r3-r7, lr}
sub sp, #0x10
mov r7, #0x0
@@ -347,7 +347,7 @@ _0204A2B4:
add r1, r4, #0x0
bl GetPartyMonByIndex
add r5, r0, #0x0
- bl FUN_0204A01C
+ bl MonNotFaintedOrEgg
cmp r0, #0x0
beq _0204A308
add r0, r5, #0x0
@@ -404,8 +404,8 @@ _0204A324:
pop {r3-r7, pc}
.balign 4
- thumb_func_start FUN_0204A32C
-FUN_0204A32C: ; 0x0204A32C
+ thumb_func_start SurvivePoisoning
+SurvivePoisoning: ; 0x0204A32C
push {r3-r4, lr}
sub sp, #0x4
mov r1, #0x9f
diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s
index 98c412a7..2aab6169 100644
--- a/arm9/asm/unk_02060CCC.s
+++ b/arm9/asm/unk_02060CCC.s
@@ -2173,7 +2173,7 @@ FUN_02061C5C: ; 0x02061C5C
ldr r0, [r5, #0xc]
add r4, r1, #0x0
bl SavArray_PlayerParty_get
- bl FUN_0204A20C
+ bl GetFirstNonEggInParty
add r1, sp, #0x8
add r2, sp, #0x4
add r3, sp, #0x4
diff --git a/arm9/asm/unk_0206ABC4.s b/arm9/asm/unk_0206ABC4.s
index ddce6b39..9d8b12d8 100644
--- a/arm9/asm/unk_0206ABC4.s
+++ b/arm9/asm/unk_0206ABC4.s
@@ -535,7 +535,7 @@ _0206AFB0:
lsl r2, r6, #0x18
ldr r0, [sp, #0x40]
lsr r2, r2, #0x18
- bl FUN_020697CC
+ bl MonSetMoveInSlot
add r6, r6, #0x1
add r7, r7, #0x2
cmp r6, #0x4
@@ -717,7 +717,7 @@ _0206B120:
lsl r2, r6, #0x18
ldr r0, [sp, #0x40]
lsr r2, r2, #0x18
- bl FUN_020697CC
+ bl MonSetMoveInSlot
add r6, r6, #0x1
add r7, r7, #0x2
cmp r6, #0x4
diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s
index 0cf92670..5bd309ce 100644
--- a/arm9/asm/unk_0206C700.s
+++ b/arm9/asm/unk_0206C700.s
@@ -1744,7 +1744,7 @@ _0206D560:
ldrh r1, [r1, #0x0]
ldrb r2, [r2, #0x0]
ldr r0, [r4, #0x28]
- bl FUN_020697CC
+ bl MonSetMoveInSlot
add r0, r4, #0x0
mov r1, #0x14
add r0, #0x66
diff --git a/arm9/global.inc b/arm9/global.inc
index aacbb88b..6f468e66 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -1431,8 +1431,8 @@
.extern FUN_02022510
.extern FUN_0202251C
.extern FUN_02022528
-.extern FUN_02022534
-.extern FUN_02022540
+.extern LoadSaveFile
+.extern SaveGame
.extern SaveBlock2_new
.extern FUN_020225F8
.extern SavArray_get
@@ -1451,8 +1451,8 @@
.extern FUN_02022840
.extern FUN_02022854
.extern FUN_0202287C
-.extern FUN_020232BC
-.extern FUN_02023408
+.extern WriteSaveFileToFlash
+.extern ReadSaveFileFromFlash
.extern FUN_0202376C
.extern FUN_02023770
.extern FUN_02023788
@@ -3320,19 +3320,19 @@
.extern FUN_02044158
.extern FUN_0204416C
.extern FUN_02044198
-.extern FUN_020442BC
-.extern FUN_0204434C
-.extern FUN_020443A8
-.extern FUN_02044414
-.extern FUN_0204449C
-.extern FUN_020444F4
-.extern FUN_02044598
-.extern FUN_02044658
-.extern FUN_0204469C
-.extern FUN_02044730
-.extern FUN_0204478C
-.extern FUN_02044800
-.extern FUN_0204488C
+.extern ScrCmd_givemon
+.extern ScrCmd_getpartyspecies
+.extern ScrCmd_checkpartymonotid
+.extern ScrCmd_giveegg
+.extern ScrCmd_setpartymonmove
+.extern ScrCmd_partymonhasmove
+.extern ScrCmd_findpartymonwithmove
+.extern ScrCmd_survivepsn
+.extern ScrCmd_countpartymonsatorbelowlevel
+.extern ScrCmd_getpartymonlevel
+.extern ScrCmd_getpartymonnature
+.extern ScrCmd_findpartymonwithnature
+.extern ScrCmd_getpartymonfriendship
.extern FUN_020448D4
.extern FUN_020449A4
.extern FUN_02044A0C
@@ -3500,16 +3500,16 @@
.extern FUN_02049EA4
.extern FUN_02049F98
.extern FUN_02049FFC
-.extern FUN_0204A048
-.extern FUN_0204A0C8
-.extern FUN_0204A120
-.extern FUN_0204A138
-.extern FUN_0204A1D8
-.extern FUN_0204A20C
-.extern FUN_0204A248
-.extern FUN_0204A25C
-.extern FUN_0204A29C
-.extern FUN_0204A32C
+.extern GiveMon
+.extern GiveEgg
+.extern PartyMonSetMoveInSlot
+.extern GetIdxOfFirstPartyMonWithMove
+.extern GetFirstAliveMonInParty_CrashIfNone
+.extern GetFirstNonEggInParty
+.extern HasEnoughAlivePokemonForDoubleBattle
+.extern GiveAllMonsTheSinnohChampRibbon
+.extern ApplyPoisonStep
+.extern SurvivePoisoning
.extern FUN_0204A368
.extern FUN_0204A390
.extern FUN_0204A3A4
@@ -4792,7 +4792,7 @@
.extern GetEggSpecies
.extern FUN_02069698
.extern FUN_02069708
-.extern FUN_020697CC
+.extern MonSetMoveInSlot
.extern FUN_02069818
.extern FUN_020698E0
.extern FUN_020698E8
@@ -5804,7 +5804,7 @@
.extern FUN_020C5E04
.extern FUN_020C6034
.extern FUN_020C605C
-.extern FUN_020D6714
+.extern CARDi_TryWaitAsync
.extern FUN_020D9564
.extern FX_Atan
.extern FX_Atan2
@@ -6489,7 +6489,7 @@
.extern MOD05_021EC854
.extern MOD05_021EC864
.extern MOD05_021ECD64
-.extern MOD05_021ECF14
+.extern MOD05_SetEggStats
.extern MOD05_021ED0CC
.extern MOD05_021ED378
.extern MOD05_021ED49C
diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s
index 81ff471b..f1a29149 100644
--- a/arm9/modules/05/asm/mod05_021D80E8.s
+++ b/arm9/modules/05/asm/mod05_021D80E8.s
@@ -319,7 +319,7 @@ _021D8342:
bne _021D8384
ldr r0, [r4, #0xc]
bl SavArray_PlayerParty_get
- bl FUN_0204A248
+ bl HasEnoughAlivePokemonForDoubleBattle
add r6, r0, #0
ldr r0, [r4, #0xc]
bl SavArray_Flags_get
@@ -387,7 +387,7 @@ _021D83E4:
ldr r0, [r4, #0xc]
bl SavArray_PlayerParty_get
mov r1, #0x7f
- bl FUN_0204A138
+ bl GetIdxOfFirstPartyMonWithMove
cmp r0, #0xff
beq _021D83F8
mov r0, #2
@@ -1473,7 +1473,7 @@ _021D8C88:
ldr r0, [r5, #0xc]
bl SavArray_PlayerParty_get
mov r1, #0x39
- bl FUN_0204A138
+ bl GetIdxOfFirstPartyMonWithMove
cmp r0, #0xff
beq _021D8CE0
ldr r0, _021D8D1C ; =0x00002714
@@ -1899,7 +1899,7 @@ _021D903E:
lsl r1, r1, #0x10
add r0, r4, #0
lsr r1, r1, #0x10
- bl FUN_0204A29C
+ bl ApplyPoisonStep
cmp r0, #0
beq _021D9060
cmp r0, #1
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index cb2a013d..a6ee875d 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -3914,10 +3914,10 @@ _021E497A:
mov r6, #0
_021E4980:
ldr r0, [r5, #4]
- bl FUN_0204A1D8
+ bl GetFirstAliveMonInParty_CrashIfNone
add r7, r0, #0
ldr r0, [r5, #8]
- bl FUN_0204A1D8
+ bl GetFirstAliveMonInParty_CrashIfNone
str r0, [sp]
add r0, r7, #0
mov r1, #0xa0
@@ -20875,8 +20875,8 @@ _021ECF08: .word 0x0000013A
_021ECF0C: .word 0x00000139
_021ECF10: .word 0x000001EA
- thumb_func_start MOD05_021ECF14
-MOD05_021ECF14: ; 0x021ECF14
+ thumb_func_start MOD05_SetEggStats
+MOD05_SetEggStats: ; 0x021ECF14
push {r0, r1, r2, r3}
push {r4, r5, r6, lr}
sub sp, #0x20
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 5ba98611..0e2dd1b6 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -4864,7 +4864,7 @@ _0223BA42:
cmp r0, #0
bne _0223BA8C
add r0, r7, #0
- bl FUN_0204A1D8
+ bl GetFirstAliveMonInParty_CrashIfNone
mov r1, #1
str r1, [sp, #0x34]
mov r1, #0xa0
@@ -5646,7 +5646,7 @@ _0223C0CE:
cmp r0, #0
bne _0223C118
add r0, r6, #0
- bl FUN_0204A1D8
+ bl GetFirstAliveMonInParty_CrashIfNone
mov r1, #1
str r1, [sp, #0x2c]
mov r1, #0xa0
diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s
index 06169afb..b33bacf9 100644
--- a/arm9/modules/11/asm/module_11_thumb2.s
+++ b/arm9/modules/11/asm/module_11_thumb2.s
@@ -24516,7 +24516,7 @@ _0223B1F6:
add r0, r6, #0
lsr r1, r1, #0x10
lsr r2, r2, #0x18
- bl FUN_020697CC
+ bl MonSetMoveInSlot
ldr r1, [r4, #4]
ldr r0, _0223B2D8 ; =0x0000219C
add r2, r1, r7
diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c
index 05df8811..dbf86d8a 100644
--- a/arm9/src/pokemon.c
+++ b/arm9/src/pokemon.c
@@ -32,7 +32,7 @@ u8 CalcShininessByOtIdAndPersonality(u32 otid, u32 pid);
void InitBoxMonMoveset(struct BoxPokemon * boxmon);
u32 FUN_020696A8(struct BoxPokemon * boxmon, u16 move);
void FUN_02069718(struct BoxPokemon * boxmon, u16 move);
-void FUN_020697D4(struct BoxPokemon * boxmon, u16 move, u8 slot);
+void BoxMonSetMoveInSlot(struct BoxPokemon * boxmon, u16 move, u8 slot);
void FUN_020698E8(struct BoxPokemon * boxmon, int slot1, int slot2);
s8 FUN_02069BD0(struct BoxPokemon * boxmon, int flavor);
s8 FUN_02069BE4(u32 personality, int flavor);
@@ -2825,7 +2825,7 @@ u32 FUN_020696A8(struct BoxPokemon * boxmon, u16 move)
cur_move = (u16)GetBoxMonData(boxmon, MON_DATA_MOVE1 + i, NULL);
if (cur_move == MOVE_NONE)
{
- FUN_020697D4(boxmon, move, (u8)i);
+ BoxMonSetMoveInSlot(boxmon, move, (u8)i);
ret = move;
break;
}
@@ -2873,12 +2873,12 @@ void FUN_02069718(struct BoxPokemon * boxmon, u16 move)
ReleaseBoxMonLock(boxmon, decry);
}
-void FUN_020697CC(struct Pokemon * pokemon, u16 move, u8 slot)
+void MonSetMoveInSlot(struct Pokemon * pokemon, u16 move, u8 slot)
{
- FUN_020697D4(&pokemon->box, move, slot);
+ BoxMonSetMoveInSlot(&pokemon->box, move, slot);
}
-void FUN_020697D4(struct BoxPokemon * boxmon, u16 move, u8 slot)
+void BoxMonSetMoveInSlot(struct BoxPokemon * boxmon, u16 move, u8 slot)
{
u8 ppUp;
u8 pp;
diff --git a/include/pokemon.h b/include/pokemon.h
index 1ab3c401..d3be0c34 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -273,7 +273,7 @@ BOOL FUN_020690E8(struct Pokemon * pokemon);
u32 FUN_02069698(struct Pokemon * pokemon, u16 move);
void FUN_02069708(struct Pokemon * pokemon, u16 move);
void FUN_02069718(struct BoxPokemon * boxmon, u16 move);
-void FUN_020697CC(struct Pokemon * pokemon, u16 move, u8 slot);
+void MonSetMoveInSlot(struct Pokemon * pokemon, u16 move, u8 slot);
u32 FUN_02069818(struct Pokemon * pokemon, u32 * r5, u16 * sp0);
void FUN_020698E0(struct Pokemon * pokemon, int slot1, int slot2);
void FUN_020698E8(struct BoxPokemon * boxmon, int slot1, int slot2);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 15:53:53 +0000