diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-14 10:48:45 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-15 11:41:45 -0400 |
commit | 154b07917927bd37d7780e1a8bc8f307dad8d70c (patch) | |
tree | 004219bc1b62d65a388865f14660c2e1eafdc36b /arm9/asm | |
parent | 62afe08422b65aef839d74ec248d67d48be6bf55 (diff) |
Name some script mon related routines
Diffstat (limited to 'arm9/asm')
-rw-r--r-- | arm9/asm/CARD_backup.s | 17 | ||||
-rw-r--r-- | arm9/asm/CARD_common.s | 5 | ||||
-rw-r--r-- | arm9/asm/save.s | 22 | ||||
-rw-r--r-- | arm9/asm/scrcmd.s | 2 | ||||
-rw-r--r-- | arm9/asm/scrcmd_12.s | 2 | ||||
-rw-r--r-- | arm9/asm/scrcmd_18.s | 63 | ||||
-rw-r--r-- | arm9/asm/scrcmd_7.s | 2 | ||||
-rw-r--r-- | arm9/asm/scrcmd_9.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_02022504.s | 14 | ||||
-rw-r--r-- | arm9/asm/unk_020377F0.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_02038C78.s | 26 | ||||
-rw-r--r-- | arm9/asm/unk_02047500.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_020484A8.s | 6 | ||||
-rw-r--r-- | arm9/asm/unk_0204A01C.s | 60 | ||||
-rw-r--r-- | arm9/asm/unk_02060CCC.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_0206ABC4.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_0206C700.s | 2 |
17 files changed, 116 insertions, 117 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 |