From fb938eada97e211193fc0836d3039bbe3abe126c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 7 Jun 2020 21:09:35 -0400 Subject: Name more routines in pokemon.s --- arm9/modules/05/asm/module_05.s | 10 ++++---- arm9/modules/06/asm/module_06.s | 18 +++++++------- arm9/modules/09/asm/module_09.s | 4 ++-- arm9/modules/11/asm/module_11.s | 52 ++++++++++++++++++++--------------------- arm9/modules/14/asm/module_14.s | 8 +++---- arm9/modules/16/asm/module_16.s | 18 +++++++------- arm9/modules/28/asm/module_28.s | 2 +- arm9/modules/35/asm/module_35.s | 2 +- arm9/modules/39/asm/module_39.s | 2 +- arm9/modules/65/asm/module_65.s | 2 +- arm9/modules/71/asm/module_71.s | 2 +- arm9/modules/80/asm/module_80.s | 6 ++--- arm9/modules/81/asm/module_81.s | 2 +- arm9/modules/83/asm/module_83.s | 10 ++++---- 14 files changed, 69 insertions(+), 69 deletions(-) (limited to 'arm9/modules') diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index b6c8c3b5..5f07ebe7 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -44333,7 +44333,7 @@ _021ECE8C: lsl r1, r0, #1 add r0, sp, #0xc ldrh r0, [r0, r1] - bl FUN_02069558 + bl ReadFromPersonalPmsNarc add r4, r0, #0 cmp r4, #0x1d bne _021ECEBC @@ -44403,7 +44403,7 @@ MOD05_021ECF14: ; 0x021ECF14 add r0, r6, #0 mov r1, #0x13 add r4, r3, #0 - bl FUN_02068678 + bl GetMonBaseStat add r1, sp, #0x10 strb r0, [r1] mov r0, #0 @@ -44514,7 +44514,7 @@ MOD05_021ED00C: ; 0x021ED00C mov r1, #0x13 add r5, r2, #0 add r6, r3, #0 - bl FUN_02068678 + bl GetMonBaseStat add r1, sp, #0x14 strb r0, [r1] add r0, r5, #0 @@ -44783,11 +44783,11 @@ _021ED228: stmia r7!, {r0} ldrh r0, [r4] mov r1, #0x16 - bl FUN_02068678 + bl GetMonBaseStat strh r0, [r6] ldrh r0, [r4] mov r1, #0x17 - bl FUN_02068678 + bl GetMonBaseStat strh r0, [r6, #2] ldr r0, [sp] add r5, r5, #4 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 0656aec0..a6a14d1d 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -6567,7 +6567,7 @@ MOD06_0223C854: ; 0x0223C854 bne _0223C8BE ldr r0, [sp, #0x10] mov r1, #0x12 - bl FUN_02068678 + bl GetMonBaseStat cmp r0, #0 beq _0223C8E0 cmp r0, #0xfe @@ -6690,7 +6690,7 @@ MOD06_0223C968: ; 0x0223C968 add r0, r7, #0 mov r1, #0x12 mov r6, #1 - bl FUN_02068678 + bl GetMonBaseStat cmp r0, #0 beq _0223C996 cmp r0, #0xfe @@ -7320,14 +7320,14 @@ _0223CE6A: str r0, [sp, #0xc] ldr r0, [r6, r0] mov r1, #6 - bl FUN_02068678 + bl GetMonBaseStat lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp, #8] ldr r0, [sp, #0xc] mov r1, #7 ldr r0, [r6, r0] - bl FUN_02068678 + bl GetMonBaseStat lsl r0, r0, #0x18 lsr r1, r0, #0x18 ldr r0, [sp, #8] @@ -22165,7 +22165,7 @@ _022445A6: mov r2, #0 bl FUN_020671BC mov r1, #0x32 - bl FUN_02068758 + bl GetMonExpByLevel str r0, [sp, #8] add r0, r4, #0 mov r1, #8 @@ -22672,7 +22672,7 @@ _0224499C: ldrh r0, [r5] lsl r0, r0, #0x15 lsr r0, r0, #0x15 - bl FUN_02068678 + bl GetMonBaseStat cmp r0, #0 beq _022449E0 ldr r2, [r5, #0x10] @@ -22688,7 +22688,7 @@ _022449CC: mov r1, #0x18 lsl r0, r0, #0x15 lsr r0, r0, #0x15 - bl FUN_02068678 + bl GetMonBaseStat add r1, r5, #0 add r1, #0x20 strb r0, [r1] @@ -22698,7 +22698,7 @@ _022449E0: mov r1, #0x18 lsl r0, r0, #0x15 lsr r0, r0, #0x15 - bl FUN_02068678 + bl GetMonBaseStat add r1, r5, #0 add r1, #0x20 strb r0, [r1] @@ -23233,7 +23233,7 @@ MOD06_02244DC4: ; 0x02244DC4 str r1, [r7, r0] add r0, r4, #0 mov r1, #0x12 - bl FUN_02068678 + bl GetMonBaseStat lsl r0, r0, #0x18 lsr r0, r0, #0x18 beq _02244DEC diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index 7c980707..f03d3e57 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -2588,7 +2588,7 @@ _022132C2: ldrh r0, [r4, #8] lsl r1, r1, #0x19 lsr r1, r1, #0x19 - bl FUN_02068758 + bl GetMonExpByLevel str r0, [r4, #0x24] ldrb r0, [r6, r5] lsl r0, r0, #0x19 @@ -2604,7 +2604,7 @@ _0221335A: add r1, r1, #1 add r4, r0, r5 ldrh r0, [r4, #8] - bl FUN_02068758 + bl GetMonExpByLevel _02213366: str r0, [r4, #0x28] ldr r0, [r4, #4] diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s index 466a8905..7be295ce 100644 --- a/arm9/modules/11/asm/module_11.s +++ b/arm9/modules/11/asm/module_11.s @@ -12644,7 +12644,7 @@ _022339C6: lsl r0, r0, #6 ldrh r0, [r1, r0] mov r1, #9 - bl FUN_02068678 + bl GetMonBaseStat lsl r0, r0, #0x10 lsr r1, r0, #0x10 ldr r2, [r5, #0x74] @@ -20687,7 +20687,7 @@ _02237900: ldr r0, [sp, #4] add r1, r6, #0 mov r2, #1 - bl FUN_02068654 + bl GetMonBaseStat_HandleUnownOrArceus ldr r1, _02237AB0 ; =0x00002144 ldr r2, _02237AB4 ; =0x00003044 str r0, [r5, r1] @@ -20719,7 +20719,7 @@ _02237900: mov r2, #2 lsl r1, r1, #0x1b lsr r1, r1, #0x1b - bl FUN_02068654 + bl GetMonBaseStat_HandleUnownOrArceus add r1, r0, #0 ldr r0, _02237AB0 ; =0x00002144 ldr r0, [r5, r0] @@ -27984,7 +27984,7 @@ MOD11_0223B2DC: ; 0x0223B2DC add r0, r2, #0 mov r1, #5 mov r4, #0 - bl FUN_0206851C + bl AllocAndLoadMonPersonal add r7, r0, #0 ldr r0, [sp] ldr r1, [sp, #4] @@ -28063,7 +28063,7 @@ _0223B37A: ; jump table _0223B386: add r0, r7, #0 mov r1, #0xa - bl FUN_02068538 + bl GetPersonalAttr lsl r0, r0, #0x10 asr r4, r0, #0x10 cmp r5, #0x79 @@ -28075,7 +28075,7 @@ _0223B386: _0223B39E: add r0, r7, #0 mov r1, #0xb - bl FUN_02068538 + bl GetPersonalAttr lsl r0, r0, #0x10 asr r4, r0, #0x10 cmp r5, #0x74 @@ -28087,7 +28087,7 @@ _0223B39E: _0223B3B6: add r0, r7, #0 mov r1, #0xc - bl FUN_02068538 + bl GetPersonalAttr lsl r0, r0, #0x10 asr r4, r0, #0x10 cmp r5, #0x75 @@ -28099,7 +28099,7 @@ _0223B3B6: _0223B3CE: add r0, r7, #0 mov r1, #0xd - bl FUN_02068538 + bl GetPersonalAttr lsl r0, r0, #0x10 asr r4, r0, #0x10 cmp r5, #0x78 @@ -28111,7 +28111,7 @@ _0223B3CE: _0223B3E6: add r0, r7, #0 mov r1, #0xe - bl FUN_02068538 + bl GetPersonalAttr lsl r0, r0, #0x10 asr r4, r0, #0x10 cmp r5, #0x76 @@ -28123,7 +28123,7 @@ _0223B3E6: _0223B3FE: add r0, r7, #0 mov r1, #0xf - bl FUN_02068538 + bl GetPersonalAttr lsl r0, r0, #0x10 asr r4, r0, #0x10 cmp r5, #0x77 @@ -28195,7 +28195,7 @@ _0223B45A: b _0223B35E _0223B48C: add r0, r7, #0 - bl FUN_02068640 + bl FreeMonPersonal add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} nop @@ -29533,7 +29533,7 @@ _0223BFEE: lsl r0, r0, #6 ldrh r0, [r1, r0] mov r1, #8 - bl FUN_02068678 + bl GetMonBaseStat ldr r1, _0223C200 ; =0x0000311C ldr r2, _0223C204 ; =0x0225DCF0 ldrb r1, [r4, r1] @@ -29554,7 +29554,7 @@ _0223C026: lsl r0, r0, #6 ldrh r0, [r1, r0] mov r1, #8 - bl FUN_02068678 + bl GetMonBaseStat str r0, [sp] _0223C03A: ldr r1, [r4, #0x6c] @@ -72923,7 +72923,7 @@ MOD11_02250F94: ; 0x02250F94 lsl r0, r0, #0x10 lsr r0, r0, #0x10 mov r1, #0x1a - bl FUN_02068678 + bl GetMonBaseStat ldr r2, _0225100C ; =0x0225E830 lsl r1, r5, #1 ldrb r2, [r2, r1] @@ -81124,7 +81124,7 @@ _022550D0: _022550EA: ldr r0, [sp, #0x10] ldr r1, [sp, #0xc] - bl FUN_02068758 + bl GetMonExpByLevel mov r1, #0xc0 mul r1, r4 add r2, r5, r1 @@ -81135,11 +81135,11 @@ _022550EA: str r0, [sp, #0x1c] ldr r0, [sp, #0x10] add r1, r1, #1 - bl FUN_02068758 + bl GetMonExpByLevel add r5, r0, #0 ldr r0, [sp, #0x10] ldr r1, [sp, #0xc] - bl FUN_02068758 + bl GetMonExpByLevel sub r0, r5, r0 str r0, [sp, #0x20] ldrh r1, [r7, r6] @@ -82432,7 +82432,7 @@ _02255B04: _02255B12: add r0, r7, #0 add r1, r6, #0 - bl FUN_02068758 + bl GetMonExpByLevel ldr r1, _02255B64 ; =0x00002DA4 add r2, r5, r4 ldr r1, [r2, r1] @@ -82440,11 +82440,11 @@ _02255B12: str r0, [sp, #0x18] add r0, r7, #0 add r1, r6, #1 - bl FUN_02068758 + bl GetMonExpByLevel add r4, r0, #0 add r0, r7, #0 add r1, r6, #0 - bl FUN_02068758 + bl GetMonExpByLevel sub r0, r4, r0 str r0, [sp, #0x1c] mov r0, #0x14 @@ -82494,7 +82494,7 @@ MOD11_02255B68: ; 0x02255B68 add r1, r6, #0 str r0, [sp, #0x10] add r0, r7, #0 - bl FUN_02068758 + bl GetMonExpByLevel mov r1, #0xc0 mul r1, r4 add r2, r5, r1 @@ -82504,11 +82504,11 @@ MOD11_02255B68: ; 0x02255B68 str r0, [sp, #0x14] add r0, r7, #0 add r1, r6, #1 - bl FUN_02068758 + bl GetMonExpByLevel add r5, r0, #0 add r0, r7, #0 add r1, r6, #0 - bl FUN_02068758 + bl GetMonExpByLevel sub r0, r5, r0 str r0, [sp, #0x18] mov r0, #0x10 @@ -83183,7 +83183,7 @@ _022560BA: _022560D4: ldr r0, [sp, #0xc] ldr r1, [sp, #8] - bl FUN_02068758 + bl GetMonExpByLevel mov r1, #0xc0 mul r1, r4 add r2, r5, r1 @@ -83194,11 +83194,11 @@ _022560D4: str r0, [sp, #0x18] ldr r0, [sp, #0xc] add r1, r1, #1 - bl FUN_02068758 + bl GetMonExpByLevel add r5, r0, #0 ldr r0, [sp, #0xc] ldr r1, [sp, #8] - bl FUN_02068758 + bl GetMonExpByLevel sub r0, r5, r0 str r0, [sp, #0x1c] ldrh r1, [r7, r6] diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 22ebe973..79050eac 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -9216,7 +9216,7 @@ MOD14_021DBEAC: ; 0x021DBEAC strb r0, [r4, #0xf] ldrh r0, [r4, #4] mov r1, #9 - bl FUN_0206851C + bl AllocAndLoadMonPersonal add r7, r0, #0 add r0, r5, #0 mov r1, #8 @@ -9225,7 +9225,7 @@ MOD14_021DBEAC: ; 0x021DBEAC add r2, r0, #0 ldrh r1, [r4, #4] add r0, r7, #0 - bl FUN_02068824 + bl CalcMonLevelInternal strb r0, [r4, #0xa] add r0, r5, #0 mov r1, #0xb @@ -9320,7 +9320,7 @@ _021DBFB8: ldr r2, [r4, #0x24] bl FUN_0200A8E0 add r0, r7, #0 - bl FUN_02068640 + bl FreeMonPersonal ldr r1, [sp] add r0, r5, #0 bl FUN_02066A94 @@ -21843,7 +21843,7 @@ _021E204A: lsr r1, r0, #0x10 add r0, r7, #0 mov r2, #0x1b - bl FUN_02068654 + bl GetMonBaseStat_HandleUnownOrArceus lsl r0, r0, #0x18 lsr r1, r0, #0x18 b _021E20AA diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index ffd7eb1f..34107e9c 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -30379,12 +30379,12 @@ MOD16_021E5554: ; 0x021E5554 ldr r1, [sp, #0x30] add r0, r7, #0 mov r2, #6 - bl FUN_02068654 + bl GetMonBaseStat_HandleUnownOrArceus add r6, r0, #0 ldr r1, [sp, #0x30] add r0, r7, #0 mov r2, #7 - bl FUN_02068654 + bl GetMonBaseStat_HandleUnownOrArceus add r7, r0, #0 add r0, r6, #0 bl MOD16_021E563C @@ -32759,7 +32759,7 @@ MOD16_021E66F4: ; 0x021E66F4 add r4, r1, #0 mov r1, #0x12 add r5, r0, #0 - bl FUN_02068678 + bl GetMonBaseStat cmp r0, #0 bne _021E6708 mov r0, #1 @@ -51949,11 +51949,11 @@ MOD16_021EF6E0: ; 0x021EF6E0 mov r1, #6 str r2, [sp] str r3, [sp, #4] - bl FUN_02068678 + bl GetMonBaseStat add r4, r0, #0 ldr r0, [sp, #0x60] mov r1, #7 - bl FUN_02068678 + bl GetMonBaseStat add r6, r0, #0 add r0, r4, #0 bl MOD16_021E563C @@ -55170,11 +55170,11 @@ _021F0F88: add r7, r5, r3 ldrh r0, [r7, r6] mov r1, #0x18 - bl FUN_02068678 + bl GetMonBaseStat add r4, r0, #0 ldrh r0, [r7, r6] mov r1, #0x19 - bl FUN_02068678 + bl GetMonBaseStat add r6, r0, #0 cmp r4, #0 beq _021F0FC2 @@ -55281,12 +55281,12 @@ _021F1046: ldrh r0, [r6, r1] str r1, [sp] mov r1, #0x18 - bl FUN_02068678 + bl GetMonBaseStat add r4, r0, #0 ldr r0, [sp] mov r1, #0x19 ldrh r0, [r6, r0] - bl FUN_02068678 + bl GetMonBaseStat cmp r4, #0 beq _021F108C cmp r0, #0 diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s index 8a9f5379..a839daf7 100644 --- a/arm9/modules/28/asm/module_28.s +++ b/arm9/modules/28/asm/module_28.s @@ -760,7 +760,7 @@ _02254DDC: _02254DE0: ldrh r0, [r4, #8] mov r1, #0x1c - bl FUN_02068678 + bl GetMonBaseStat mov r1, #0x59 lsl r1, r1, #2 strb r0, [r5, r1] diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s index 135c8922..727fced8 100644 --- a/arm9/modules/35/asm/module_35.s +++ b/arm9/modules/35/asm/module_35.s @@ -925,7 +925,7 @@ _02254F00: beq _02254F36 ldrh r0, [r6, #0x1c] mov r1, #0x1c - bl FUN_02068678 + bl GetMonBaseStat cmp r0, #0 ldr r0, [r7, #0x24] beq _02254F30 diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s index 29b974a0..42fc9155 100644 --- a/arm9/modules/39/asm/module_39.s +++ b/arm9/modules/39/asm/module_39.s @@ -1008,7 +1008,7 @@ MOD39_02254FA4: ; 0x02254FA4 _02254FBA: add r0, r7, #0 mov r1, #0x1c - bl FUN_02068678 + bl GetMonBaseStat cmp r0, #0 beq _02254FCA mov r1, #4 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index 437fc4a6..1b712f1c 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -3388,7 +3388,7 @@ MOD65_021D8F34: ; 0x021D8F34 strb r0, [r1] ldrh r0, [r4, #0x34] mov r1, #0x1c - bl FUN_02068678 + bl GetMonBaseStat mov r1, #1 eor r1, r0 add r0, r4, #0 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index 8a04256d..92db112b 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -1387,7 +1387,7 @@ MOD71_0222E118: ; 0x0222E118 cmp r0, #0 beq _0222E18E mov r1, #0x1c - bl FUN_02068678 + bl GetMonBaseStat strh r0, [r4, #0xa] _0222E18E: cmp r6, #0 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index c8b610a8..61091d0c 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -6811,7 +6811,7 @@ _02230BD4: cmp r0, #0 beq _02230C04 mov r1, #0x12 - bl FUN_02068678 + bl GetMonBaseStat mov r1, #0xfe lsl r1, r1, #4 ldr r2, [r4, r1] @@ -7821,7 +7821,7 @@ _0223138C: bl MOD80_02233EA4 add r0, r5, #0 mov r1, #0x12 - bl FUN_02068678 + bl GetMonBaseStat mov r1, #0xfe lsl r1, r1, #4 ldr r2, [r4, r1] @@ -12478,7 +12478,7 @@ _0223398C: bl FUN_020054C8 add r0, r5, #0 mov r1, #0x12 - bl FUN_02068678 + bl GetMonBaseStat mov r1, #0xfe lsl r1, r1, #4 ldr r2, [r4, r1] diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 2398e91b..f852db8d 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -199,7 +199,7 @@ MOD81_02237FE8: ; 0x02237FE8 mov r2, #0 bl FUN_020672BC mov r1, #0x1c - bl FUN_02068678 + bl GetMonBaseStat cmp r0, #0 bne _02238000 mov r0, #1 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 411e6c20..400b4083 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -21798,7 +21798,7 @@ MOD83_02237EDC: ; 0x02237EDC add r1, r0, #0 lsl r0, r4, #0x10 lsr r0, r0, #0x10 - bl FUN_02068800 + bl CalcMonLevel pop {r3, r4, r5, pc} thumb_func_end MOD83_02237EDC @@ -21819,7 +21819,7 @@ MOD83_02237F04: ; 0x02237F04 add r6, r0, #0 add r0, r5, #0 mov r1, #0x19 - bl FUN_02068678 + bl GetMonBaseStat cmp r0, #0 beq _02237F5E ldr r2, _02237F68 ; =0x0223B4C0 @@ -21830,7 +21830,7 @@ _02237F32: bne _02237F42 add r0, r5, #0 mov r1, #0x18 - bl FUN_02068678 + bl GetMonBaseStat b _02237F4A _02237F42: add r4, r4, #1 @@ -21845,12 +21845,12 @@ _02237F4A: bne _02237F66 add r0, r5, #0 mov r1, #0x18 - bl FUN_02068678 + bl GetMonBaseStat pop {r4, r5, r6, pc} _02237F5E: add r0, r5, #0 mov r1, #0x18 - bl FUN_02068678 + bl GetMonBaseStat _02237F66: pop {r4, r5, r6, pc} .align 2, 0 -- cgit v1.2.3