diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-13 11:26:10 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-13 11:26:10 -0400 |
commit | e81dfc98e26bece01763110254648d7c20cb198d (patch) | |
tree | 90b72a7eaf35e112bfb52c3941b80e35f04397ec /arm9/modules | |
parent | 0747fe684c46d010d8917c4257dd1f1a52241385 (diff) |
through SetBoxMonDataInternal
Diffstat (limited to 'arm9/modules')
-rw-r--r-- | arm9/modules/05/asm/module_05.s | 2 | ||||
-rw-r--r-- | arm9/modules/14/asm/module_14.s | 4 | ||||
-rw-r--r-- | arm9/modules/83/asm/module_83.s | 122 |
3 files changed, 64 insertions, 64 deletions
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 442a394e..cb8c25bd 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -43401,7 +43401,7 @@ MOD05_021EC744: ; 0x021EC744 add r0, r4, #0 mov r1, #8 add r2, sp, #0 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r4, #0 bl CalcBoxMonLevelEncrypted add r4, r0, #0 diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 7b09367a..e8b7dfbc 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -9557,7 +9557,7 @@ MOD14_021DC1AC: ; 0x021DC1AC ldr r0, [r4, #0x4c] mov r1, #0xb add r2, sp, #0 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r4, #0 bl MOD14_021DC3CC cmp r0, #0 @@ -9623,7 +9623,7 @@ _021DC24A: ldr r0, [r4] mov r1, #6 add r2, sp, #0x1c - bl SetBoxMonDataEncrypted + bl SetBoxMonData _021DC254: ldr r0, [r4] mov r1, #5 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 21f1b081..1dbf90c3 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -21876,7 +21876,7 @@ MOD83_02237F6C: ; 0x02237F6C add r0, r4, #0 mov r1, #0 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0xb mov r2, #0 @@ -21887,7 +21887,7 @@ MOD83_02237F6C: ; 0x02237F6C add r0, r4, #0 mov r1, #5 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0xc mov r2, #0 @@ -21903,7 +21903,7 @@ _02237FCE: add r0, r4, #0 mov r1, #6 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #1 mov r2, #0 @@ -21912,7 +21912,7 @@ _02237FCE: add r0, r4, #0 mov r1, #7 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x19 mov r2, #0 @@ -21921,13 +21921,13 @@ _02237FCE: add r0, r4, #0 mov r1, #8 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData mov r0, #0x46 str r0, [sp, #8] add r0, r4, #0 mov r1, #9 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 add r1, r4, #0 bl MOD83_02237F04 @@ -21935,7 +21935,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0xa add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #8 mov r2, #0 @@ -21944,7 +21944,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0xb add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #3 mov r2, #0 @@ -21953,7 +21953,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0xc add r2, sp, #4 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x1a mov r2, #0 @@ -21962,7 +21962,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0xd add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x1b mov r2, #0 @@ -21971,7 +21971,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0xe add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x1c mov r2, #0 @@ -21980,7 +21980,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0xf add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x1d mov r2, #0 @@ -21989,7 +21989,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x10 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x1e mov r2, #0 @@ -21998,7 +21998,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x11 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x1f mov r2, #0 @@ -22007,7 +22007,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x12 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x16 mov r2, #0 @@ -22016,7 +22016,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x13 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x17 mov r2, #0 @@ -22025,7 +22025,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x14 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x18 mov r2, #0 @@ -22034,7 +22034,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x15 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x21 mov r2, #0 @@ -22043,7 +22043,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x16 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x2f mov r2, #0 @@ -22052,7 +22052,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x17 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x30 mov r2, #0 @@ -22061,7 +22061,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x18 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData mov r5, #0 add r7, r5, #0 _0223815E: @@ -22075,7 +22075,7 @@ _0223815E: add r0, r4, #0 add r1, #0x36 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x15 mov r2, #0 @@ -22090,7 +22090,7 @@ _0223815E: add r0, r4, #0 add r1, #0x3e add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r1, r5, #0 add r0, r4, #0 add r1, #0x42 @@ -22101,7 +22101,7 @@ _0223815E: add r0, r4, #0 add r1, #0x3a add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r5, r5, #1 add r7, r7, #2 cmp r5, #4 @@ -22114,7 +22114,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x46 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x28 mov r2, #0 @@ -22123,7 +22123,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x47 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x29 mov r2, #0 @@ -22132,7 +22132,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x48 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x2a mov r2, #0 @@ -22141,7 +22141,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x49 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x2b mov r2, #0 @@ -22150,7 +22150,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x4a add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x2c mov r2, #0 @@ -22159,7 +22159,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x4b add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x2d mov r2, #0 @@ -22168,7 +22168,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x4c add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x32 mov r2, #0 @@ -22186,7 +22186,7 @@ _0223826C: add r0, r4, #0 add r1, #0x4e add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r5, r5, #1 cmp r5, r7 blt _0223826C @@ -22208,7 +22208,7 @@ _02238298: add r0, r4, #0 add r1, #0x52 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r5, r5, #1 cmp r5, r7 blt _02238298 @@ -22230,7 +22230,7 @@ _022382C4: add r0, r4, #0 add r1, #0x56 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r5, r5, #1 cmp r5, r7 blt _022382C4 @@ -22252,7 +22252,7 @@ _022382F0: add r0, r4, #0 add r1, #0x5a add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r5, r5, #1 cmp r5, r7 blt _022382F0 @@ -22274,7 +22274,7 @@ _0223831C: add r0, r4, #0 add r1, #0x5e add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r5, r5, #1 cmp r5, r7 blt _0223831C @@ -22287,7 +22287,7 @@ _02238332: add r0, r4, #0 mov r1, #0x62 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x44 mov r2, #0 @@ -22296,7 +22296,7 @@ _02238332: add r0, r4, #0 mov r1, #0x63 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x45 mov r2, #0 @@ -22305,7 +22305,7 @@ _02238332: add r0, r4, #0 mov r1, #0x64 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x46 mov r2, #0 @@ -22314,7 +22314,7 @@ _02238332: add r0, r4, #0 mov r1, #0x65 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x47 mov r2, #0 @@ -22323,7 +22323,7 @@ _02238332: add r0, r4, #0 mov r1, #0x66 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x48 mov r2, #0 @@ -22332,7 +22332,7 @@ _02238332: add r0, r4, #0 mov r1, #0x67 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x49 mov r2, #0 @@ -22341,7 +22341,7 @@ _02238332: add r0, r4, #0 mov r1, #0x68 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x4a mov r2, #0 @@ -22350,7 +22350,7 @@ _02238332: add r0, r4, #0 mov r1, #0x69 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x4b mov r2, #0 @@ -22359,7 +22359,7 @@ _02238332: add r0, r4, #0 mov r1, #0x6a add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x4c mov r2, #0 @@ -22368,7 +22368,7 @@ _02238332: add r0, r4, #0 mov r1, #0x6b add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x4d mov r2, #0 @@ -22377,7 +22377,7 @@ _02238332: add r0, r4, #0 mov r1, #0x6c add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x4e mov r2, #0 @@ -22386,7 +22386,7 @@ _02238332: add r0, r4, #0 mov r1, #0x6d add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x50 mov r2, #0 @@ -22395,14 +22395,14 @@ _02238332: add r0, r4, #0 mov r1, #0x6e add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r4, #0 bl GetBoxMonGenderEncrypted str r0, [sp, #8] add r0, r4, #0 mov r1, #0x6f add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r4, #0 mov r1, #5 mov r2, #0 @@ -22436,7 +22436,7 @@ _02238332: add r0, r4, #0 mov r1, #0x70 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData _022384AE: add r0, r4, #0 mov r1, #5 @@ -22481,7 +22481,7 @@ _022384F4: add r0, r4, #0 mov r1, #0x70 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData _022384FE: add r0, r6, #0 mov r1, #2 @@ -22495,7 +22495,7 @@ _022384FE: add r0, r4, #0 mov r1, #0x75 add r2, sp, #0xc - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #3 mov r2, #0 @@ -22509,7 +22509,7 @@ _022384FE: add r0, r4, #0 mov r1, #0x4d add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData _0223853E: add r0, r6, #0 mov r1, #0x25 @@ -22519,7 +22519,7 @@ _0223853E: add r0, r4, #0 mov r1, #0x79 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #7 add r2, sp, #0x24 @@ -22532,7 +22532,7 @@ _0223853E: add r0, r4, #0 mov r1, #0x8f add r2, sp, #0xc - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x23 mov r2, #0 @@ -22541,7 +22541,7 @@ _0223853E: add r0, r4, #0 mov r1, #0x98 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x22 mov r2, #0 @@ -22550,7 +22550,7 @@ _0223853E: add r0, r4, #0 mov r1, #0x99 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x26 mov r2, #0 @@ -22559,7 +22559,7 @@ _0223853E: add r0, r4, #0 mov r1, #0x9a add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x24 mov r2, #0 @@ -22568,7 +22568,7 @@ _0223853E: add r0, r4, #0 mov r1, #0x9b add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData add r0, r6, #0 mov r1, #0x31 mov r2, #0 @@ -22577,7 +22577,7 @@ _0223853E: add r0, r4, #0 mov r1, #0x9c add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetBoxMonData ldr r1, [sp] add r0, r4, #0 bl TryEncryptBoxMon |