diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-13 13:49:41 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-13 13:49:41 -0400 |
commit | 321da97e6fdd66192484ca9aa60581b69fb3e7a4 (patch) | |
tree | 8d3793df30bb480a9c682846042184d8c83ec1d8 /arm9/modules | |
parent | f93a6043eb52c63d1a64a3e9f10c113d4e5acc02 (diff) |
Through ModifyStatByNature
Diffstat (limited to 'arm9/modules')
-rw-r--r-- | arm9/modules/05/asm/module_05.s | 4 | ||||
-rw-r--r-- | arm9/modules/14/asm/module_14.s | 28 | ||||
-rw-r--r-- | arm9/modules/27/asm/module_27.s | 4 | ||||
-rw-r--r-- | arm9/modules/35/asm/module_35.s | 4 | ||||
-rw-r--r-- | arm9/modules/69/asm/module_69.s | 6 | ||||
-rw-r--r-- | arm9/modules/71/asm/module_71.s | 4 | ||||
-rw-r--r-- | arm9/modules/80/asm/module_80.s | 16 | ||||
-rw-r--r-- | arm9/modules/81/asm/module_81.s | 4 | ||||
-rw-r--r-- | arm9/modules/83/asm/module_83.s | 4 |
9 files changed, 37 insertions, 37 deletions
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index cb8c25bd..736c4f38 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -43403,7 +43403,7 @@ MOD05_021EC744: ; 0x021EC744 add r2, sp, #0 bl SetBoxMonData add r0, r4, #0 - bl CalcBoxMonLevelEncrypted + bl CalcBoxMonLevel add r4, r0, #0 add r0, r7, #0 bl FreeToHeap @@ -43416,7 +43416,7 @@ MOD05_021EC78C: ; 0x021EC78C add r5, r0, #0 bl FUN_02023C7C add r6, r0, #0 - bl CalcBoxMonLevelEncrypted + bl CalcBoxMonLevel lsl r0, r0, #0x18 lsr r4, r0, #0x18 add r0, r5, #0 diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index e8b7dfbc..0b764ed1 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -4713,7 +4713,7 @@ _021D9B9E: add r1, r6, #0 bl FUN_0206B9B0 add r4, r0, #0 - bl TryDecryptMon + bl AcquireMonLock add r7, r0, #0 add r0, r4, #0 mov r1, #0xac @@ -4731,7 +4731,7 @@ _021D9B9E: _021D9BD2: add r0, r4, #0 add r1, r7, #0 - bl TryEncryptMon + bl ReleaseMonLock cmp r5, #2 blt _021D9BE4 add sp, #8 @@ -5455,7 +5455,7 @@ MOD14_021DA168: ; 0x021DA168 mov r1, #0 add r5, r0, #0 str r1, [sp, #4] - bl TryDecryptBoxMon + bl AcquireBoxMonLock str r0, [sp] add r0, r5, #0 mov r1, #0xac @@ -5483,7 +5483,7 @@ _021DA1A2: _021DA1A8: ldr r1, [sp] add r0, r5, #0 - bl TryEncryptBoxMon + bl ReleaseBoxMonLock ldr r0, [sp, #4] add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -9189,7 +9189,7 @@ MOD14_021DBEAC: ; 0x021DBEAC add r0, r5, #0 add r6, r2, #0 add r4, #0x4c - bl TryDecryptBoxMon + bl AcquireBoxMonLock str r0, [sp] str r5, [r7, #0x4c] add r0, r5, #0 @@ -9323,7 +9323,7 @@ _021DBFB8: bl FreeMonPersonal ldr r1, [sp] add r0, r5, #0 - bl TryEncryptBoxMon + bl ReleaseBoxMonLock pop {r3, r4, r5, r6, r7, pc} thumb_func_start MOD14_021DBFF4 @@ -9371,7 +9371,7 @@ _021DC034: mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r5, r0] - bl TryDecryptMon + bl AcquireMonLock add r6, r0, #0 mov r0, #0x1a lsl r0, r0, #4 @@ -9489,7 +9489,7 @@ _021DC034: lsl r0, r0, #4 ldr r0, [r5, r0] add r1, r6, #0 - bl TryEncryptMon + bl ReleaseMonLock add r0, r7, #0 add r0, #0xa4 ldrb r0, [r0] @@ -18859,7 +18859,7 @@ MOD14_021E0940: ; 0x021E0940 str r2, [sp, #8] str r3, [sp, #0xc] ldr r4, [sp, #0x64] - bl TryDecryptBoxMon + bl AcquireBoxMonLock lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x10] @@ -18971,7 +18971,7 @@ _021E0A36: bl MOD14_021E0B54 ldr r1, [sp, #0x10] add r0, r6, #0 - bl TryEncryptBoxMon + bl ReleaseBoxMonLock add sp, #0x44 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -18987,7 +18987,7 @@ MOD14_021E0A60: ; 0x021E0A60 str r2, [sp, #8] add r7, r3, #0 ldr r4, [sp, #0x70] - bl TryDecryptBoxMon + bl AcquireBoxMonLock str r0, [sp, #0x14] add r0, r6, #0 mov r1, #0x4c @@ -19079,7 +19079,7 @@ _021E0B28: bl MOD14_021E0B54 ldr r1, [sp, #0x14] add r0, r6, #0 - bl TryEncryptBoxMon + bl ReleaseBoxMonLock add sp, #0x40 pop {r3, r4, r5, r6, r7, pc} nop @@ -21819,7 +21819,7 @@ _021E204A: bl FUN_0206B5E4 add r4, r4, #1 add r5, r0, #0 - bl TryDecryptBoxMon + bl AcquireBoxMonLock lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x1c] @@ -21876,7 +21876,7 @@ _021E20AA: _021E20C8: ldr r1, [sp, #0x1c] add r0, r5, #0 - bl TryEncryptBoxMon + bl ReleaseBoxMonLock ldr r0, [sp, #0x24] add r6, r6, #2 add r0, r0, #1 diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s index 58b7d707..ee9a4bd1 100644 --- a/arm9/modules/27/asm/module_27.s +++ b/arm9/modules/27/asm/module_27.s @@ -305,7 +305,7 @@ _02254A62: add r1, r6, #0 bl FUN_0206B9B0 add r4, r0, #0 - bl TryDecryptMon + bl AcquireMonLock add r7, r0, #0 add r0, r4, #0 bl FUN_0206B688 @@ -354,7 +354,7 @@ _02254ABE: strb r0, [r5, #0x13] add r0, r4, #0 add r1, r7, #0 - bl TryEncryptMon + bl ReleaseMonLock ldr r0, [sp] add r6, r6, #1 ldr r0, [r0] diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s index 5ef1d37f..760c2f64 100644 --- a/arm9/modules/35/asm/module_35.s +++ b/arm9/modules/35/asm/module_35.s @@ -330,7 +330,7 @@ _02254A7A: str r0, [sp, #8] bl FUN_02023C7C add r4, r0, #0 - bl TryDecryptBoxMon + bl AcquireBoxMonLock str r0, [sp, #0xc] add r0, r4, #0 bl FUN_0206B688 @@ -353,7 +353,7 @@ _02254A7A: str r0, [r5, #0x14] ldr r1, [sp, #0xc] add r0, r4, #0 - bl TryEncryptBoxMon + bl ReleaseBoxMonLock ldr r0, [sp] add r7, r7, #1 ldrb r0, [r0] diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index 2e724605..3199be5d 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -2360,7 +2360,7 @@ MOD69_0222E8FC: ; 0x0222E8FC mov r1, #0 bl FUN_0200AC60 ldr r0, [r4, #0x24] - bl CalcMonLevelEncrypted + bl CalcMonLevel add r2, r0, #0 mov r0, #0 str r0, [sp] @@ -4037,7 +4037,7 @@ MOD69_0222F6C4: ; 0x0222F6C4 add r5, r0, #0 add r0, r4, #0 add r6, r2, #0 - bl TryDecryptMon + bl AcquireMonLock str r0, [sp] add r0, r4, #0 mov r1, #0x79 @@ -4124,7 +4124,7 @@ _0222F778: _0222F77A: ldr r1, [sp] add r0, r4, #0 - bl TryEncryptMon + bl ReleaseMonLock add r0, r5, #0 pop {r3, r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index 3e877d49..bc13fe8f 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -1343,7 +1343,7 @@ MOD71_0222E118: ; 0x0222E118 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 add r4, r1, #0 - bl TryDecryptMon + bl AcquireMonLock add r7, r0, #0 add r0, r5, #0 mov r1, #0x9a @@ -1382,7 +1382,7 @@ MOD71_0222E118: ; 0x0222E118 add r6, r0, #0 add r0, r5, #0 add r1, r7, #0 - bl TryEncryptMon + bl ReleaseMonLock ldrh r0, [r4] cmp r0, #0 beq _0222E18E diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 4762946f..ffa44bd8 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -10777,7 +10777,7 @@ MOD80_02232BD4: ; 0x02232BD4 MOD80_02232C2C: ; 0x02232C2C push {r4, lr} add r4, r1, #0 - bl CalcBoxMonLevelEncrypted + bl CalcBoxMonLevel strb r0, [r4, #3] pop {r4, pc} thumb_func_end MOD80_02232C2C @@ -10832,7 +10832,7 @@ MOD80_02232C88: ; 0x02232C88 add r7, r2, #0 add r6, r3, #0 ldr r4, [sp, #0x40] - bl TryDecryptBoxMon + bl AcquireBoxMonLock add r0, r5, #0 mov r1, #0xab mov r2, #0 @@ -10874,7 +10874,7 @@ MOD80_02232C88: ; 0x02232C88 _02232CF2: add r0, r5, #0 mov r1, #1 - bl TryEncryptBoxMon + bl ReleaseBoxMonLock ldr r0, [sp, #0x1c] cmp r0, #0 beq _02232D60 @@ -11266,7 +11266,7 @@ MOD80_02233018: ; 0x02233018 push {r3, r4, r5, r6, r7, lr} add r7, r0, #0 mov r4, #0 - bl TryDecryptBoxMon + bl AcquireBoxMonLock ldr r5, _02233050 ; =0x02237220 str r0, [sp] add r6, r4, #0 @@ -11282,7 +11282,7 @@ _02233028: blt _02233028 ldr r1, [sp] add r0, r7, #0 - bl TryEncryptBoxMon + bl ReleaseBoxMonLock cmp r4, #0 beq _0223304C mov r0, #1 @@ -11397,7 +11397,7 @@ MOD80_022330E4: ; 0x022330E4 add r0, sp, #0 strb r1, [r0, #2] add r0, r5, #0 - bl CalcBoxMonLevelEncrypted + bl CalcBoxMonLevel add r1, sp, #0 strb r0, [r1, #3] add r0, sp, #0 @@ -11433,7 +11433,7 @@ MOD80_0223311C: ; 0x0223311C add r0, r5, #0 add r0, #0xbc ldr r0, [r0] - bl CalcBoxMonLevelEncrypted + bl CalcBoxMonLevel add r1, sp, #0 strb r0, [r1, #9] add r0, r4, #0 @@ -13381,7 +13381,7 @@ MOD80_022340DC: ; 0x022340DC bl GetBoxMonData add r6, r0, #1 ldr r0, [sp, #0xc] - bl CalcBoxMonLevelEncrypted + bl CalcBoxMonLevel str r0, [sp, #0x10] add r0, r4, #0 mov r1, #0x64 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index abe12301..82f5fbd1 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -999,7 +999,7 @@ _0223860E: ldr r4, [r0, #4] _02238610: add r0, r4, #0 - bl TryDecryptBoxMon + bl AcquireBoxMonLock str r0, [sp, #0x20] add r0, sp, #0x34 add r1, r4, #0 @@ -1051,7 +1051,7 @@ _02238648: bl FUN_02017E14 ldr r1, [sp, #0x20] add r0, r4, #0 - bl TryEncryptBoxMon + bl ReleaseBoxMonLock add r0, r7, #0 bl FreeToHeap _02238690: diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 1dbf90c3..bd2f6d2f 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -21866,7 +21866,7 @@ MOD83_02237F6C: ; 0x02237F6C add r0, r4, #0 bl ZeroBoxMonData add r0, r4, #0 - bl TryDecryptBoxMon + bl AcquireBoxMonLock mov r1, #0 str r0, [sp] add r0, r6, #0 @@ -22580,7 +22580,7 @@ _0223853E: bl SetBoxMonData ldr r1, [sp] add r0, r4, #0 - bl TryEncryptBoxMon + bl ReleaseBoxMonLock add sp, #0x30 pop {r3, r4, r5, r6, r7, pc} nop |