diff options
Diffstat (limited to 'arm9/modules/18/asm/module_18.s')
| -rw-r--r-- | arm9/modules/18/asm/module_18.s | 164 |
1 files changed, 82 insertions, 82 deletions
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index f6e4bcea..3c1d52e4 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -6785,10 +6785,10 @@ _0223CB58: .word 0x00000808 thumb_func_start MOD18_0223CB5C MOD18_0223CB5C: ; 0x0223CB5C - ldr r3, _0223CB60 ; =0x0204F7FD + ldr r3, _0223CB60 ; =FUN_0204F7FC bx r3 .align 2, 0 -_0223CB60: .word 0x0204F7FD +_0223CB60: .word FUN_0204F7FC thumb_func_end MOD18_0223CB5C thumb_func_start MOD18_0223CB64 @@ -11161,10 +11161,10 @@ _0223ECD8: .word 0x022513A0 thumb_func_start MOD18_0223ECDC MOD18_0223ECDC: ; 0x0223ECDC - ldr r3, _0223ECE0 ; =0x0204F7FD + ldr r3, _0223ECE0 ; =FUN_0204F7FC bx r3 .align 2, 0 -_0223ECE0: .word 0x0204F7FD +_0223ECE0: .word FUN_0204F7FC thumb_func_end MOD18_0223ECDC thumb_func_start MOD18_0223ECE4 @@ -13519,20 +13519,20 @@ MOD18_0223FE98: ; 0x0223FE98 thumb_func_start MOD18_0223FEAC MOD18_0223FEAC: ; 0x0223FEAC - ldr r3, _0223FEB4 ; =0x0204E759 + ldr r3, _0223FEB4 ; =FUN_0204E758 mov r1, #2 bx r3 nop -_0223FEB4: .word 0x0204E759 +_0223FEB4: .word FUN_0204E758 thumb_func_end MOD18_0223FEAC thumb_func_start MOD18_0223FEB8 MOD18_0223FEB8: ; 0x0223FEB8 - ldr r3, _0223FEC0 ; =0x0204E759 + ldr r3, _0223FEC0 ; =FUN_0204E758 mov r1, #2 bx r3 nop -_0223FEC0: .word 0x0204E759 +_0223FEC0: .word FUN_0204E758 thumb_func_end MOD18_0223FEB8 thumb_func_start MOD18_0223FEC4 @@ -13549,82 +13549,82 @@ MOD18_0223FEC4: ; 0x0223FEC4 thumb_func_start MOD18_0223FED8 MOD18_0223FED8: ; 0x0223FED8 - ldr r3, _0223FEE0 ; =0x0204E179 + ldr r3, _0223FEE0 ; =FUN_0204E178 mov r1, #0 add r2, r1, #0 bx r3 .align 2, 0 -_0223FEE0: .word 0x0204E179 +_0223FEE0: .word FUN_0204E178 thumb_func_end MOD18_0223FED8 thumb_func_start MOD18_0223FEE4 MOD18_0223FEE4: ; 0x0223FEE4 - ldr r3, _0223FEEC ; =0x0204E179 + ldr r3, _0223FEEC ; =FUN_0204E178 mov r1, #1 mov r2, #0 bx r3 .align 2, 0 -_0223FEEC: .word 0x0204E179 +_0223FEEC: .word FUN_0204E178 thumb_func_end MOD18_0223FEE4 thumb_func_start MOD18_0223FEF0 MOD18_0223FEF0: ; 0x0223FEF0 - ldr r3, _0223FEF8 ; =0x0204E179 + ldr r3, _0223FEF8 ; =FUN_0204E178 mov r1, #2 mov r2, #0 bx r3 .align 2, 0 -_0223FEF8: .word 0x0204E179 +_0223FEF8: .word FUN_0204E178 thumb_func_end MOD18_0223FEF0 thumb_func_start MOD18_0223FEFC MOD18_0223FEFC: ; 0x0223FEFC - ldr r3, _0223FF04 ; =0x0204E179 + ldr r3, _0223FF04 ; =FUN_0204E178 mov r1, #3 mov r2, #0 bx r3 .align 2, 0 -_0223FF04: .word 0x0204E179 +_0223FF04: .word FUN_0204E178 thumb_func_end MOD18_0223FEFC thumb_func_start MOD18_0223FF08 MOD18_0223FF08: ; 0x0223FF08 - ldr r3, _0223FF10 ; =0x0204E179 + ldr r3, _0223FF10 ; =FUN_0204E178 mov r1, #0 mov r2, #1 bx r3 .align 2, 0 -_0223FF10: .word 0x0204E179 +_0223FF10: .word FUN_0204E178 thumb_func_end MOD18_0223FF08 thumb_func_start MOD18_0223FF14 MOD18_0223FF14: ; 0x0223FF14 - ldr r3, _0223FF1C ; =0x0204E179 + ldr r3, _0223FF1C ; =FUN_0204E178 mov r1, #1 add r2, r1, #0 bx r3 .align 2, 0 -_0223FF1C: .word 0x0204E179 +_0223FF1C: .word FUN_0204E178 thumb_func_end MOD18_0223FF14 thumb_func_start MOD18_0223FF20 MOD18_0223FF20: ; 0x0223FF20 - ldr r3, _0223FF28 ; =0x0204E179 + ldr r3, _0223FF28 ; =FUN_0204E178 mov r1, #2 mov r2, #1 bx r3 .align 2, 0 -_0223FF28: .word 0x0204E179 +_0223FF28: .word FUN_0204E178 thumb_func_end MOD18_0223FF20 thumb_func_start MOD18_0223FF2C MOD18_0223FF2C: ; 0x0223FF2C - ldr r3, _0223FF34 ; =0x0204E179 + ldr r3, _0223FF34 ; =FUN_0204E178 mov r1, #3 mov r2, #1 bx r3 .align 2, 0 -_0223FF34: .word 0x0204E179 +_0223FF34: .word FUN_0204E178 thumb_func_end MOD18_0223FF2C thumb_func_start MOD18_0223FF38 @@ -18630,11 +18630,11 @@ _022425C4: .word 0x022513A0 thumb_func_start MOD18_022425C8 MOD18_022425C8: ; 0x022425C8 - ldr r3, _022425D0 ; =0x0204E759 + ldr r3, _022425D0 ; =FUN_0204E758 mov r1, #2 bx r3 nop -_022425D0: .word 0x0204E759 +_022425D0: .word FUN_0204E758 thumb_func_end MOD18_022425C8 thumb_func_start MOD18_022425D4 @@ -20189,11 +20189,11 @@ _0224321C: .word 0x022513A0 thumb_func_start MOD18_02243220 MOD18_02243220: ; 0x02243220 - ldr r3, _02243228 ; =0x0204E759 + ldr r3, _02243228 ; =FUN_0204E758 mov r1, #2 bx r3 nop -_02243228: .word 0x0204E759 +_02243228: .word FUN_0204E758 thumb_func_end MOD18_02243220 thumb_func_start MOD18_0224322C @@ -20943,11 +20943,11 @@ _02243808: .word 0x022513A0 thumb_func_start MOD18_0224380C MOD18_0224380C: ; 0x0224380C - ldr r3, _02243814 ; =0x0204E759 + ldr r3, _02243814 ; =FUN_0204E758 mov r1, #2 bx r3 nop -_02243814: .word 0x0204E759 +_02243814: .word FUN_0204E758 thumb_func_end MOD18_0224380C thumb_func_start MOD18_02243818 @@ -21213,11 +21213,11 @@ _02243A14: .word 0x022513A0 thumb_func_start MOD18_02243A18 MOD18_02243A18: ; 0x02243A18 - ldr r3, _02243A20 ; =0x0204E759 + ldr r3, _02243A20 ; =FUN_0204E758 mov r1, #2 bx r3 nop -_02243A20: .word 0x0204E759 +_02243A20: .word FUN_0204E758 thumb_func_end MOD18_02243A18 thumb_func_start MOD18_02243A24 @@ -24592,10 +24592,10 @@ _022453DC: .word 0x00001284 thumb_func_start MOD18_022453E0 MOD18_022453E0: ; 0x022453E0 - ldr r3, _022453E4 ; =0x0204F7FD + ldr r3, _022453E4 ; =FUN_0204F7FC bx r3 .align 2, 0 -_022453E4: .word 0x0204F7FD +_022453E4: .word FUN_0204F7FC thumb_func_end MOD18_022453E0 thumb_func_start MOD18_022453E8 @@ -26007,11 +26007,11 @@ _02245F18: .word 0x000013E6 thumb_func_start MOD18_02245F1C MOD18_02245F1C: ; 0x02245F1C - ldr r3, _02245F24 ; =0x020311DD + ldr r3, _02245F24 ; =FUN_020311DC mov r0, #0x38 bx r3 nop -_02245F24: .word 0x020311DD +_02245F24: .word FUN_020311DC thumb_func_end MOD18_02245F1C thumb_func_start MOD18_02245F28 @@ -31952,22 +31952,22 @@ _02248E68: .word 0x00002710 thumb_func_start MOD18_02248E6C MOD18_02248E6C: ; 0x02248E6C - ldr r3, _02248E74 ; =0x02030C4D + ldr r3, _02248E74 ; =FUN_02030C4C mov r0, #0x4b add r1, r2, #0 bx r3 .align 2, 0 -_02248E74: .word 0x02030C4D +_02248E74: .word FUN_02030C4C thumb_func_end MOD18_02248E6C thumb_func_start MOD18_02248E78 MOD18_02248E78: ; 0x02248E78 - ldr r3, _02248E80 ; =0x02030C4D + ldr r3, _02248E80 ; =FUN_02030C4C mov r0, #0x4c add r1, r2, #0 bx r3 .align 2, 0 -_02248E80: .word 0x02030C4D +_02248E80: .word FUN_02030C4C thumb_func_end MOD18_02248E78 thumb_func_start MOD18_02248E84 @@ -32040,12 +32040,12 @@ MOD18_02248EF0: ; 0x02248EF0 thumb_func_start MOD18_02248EF4 MOD18_02248EF4: ; 0x02248EF4 - ldr r3, _02248EFC ; =0x02030C4D + ldr r3, _02248EFC ; =FUN_02030C4C mov r0, #0x4e add r1, r2, #0 bx r3 .align 2, 0 -_02248EFC: .word 0x02030C4D +_02248EFC: .word FUN_02030C4C thumb_func_end MOD18_02248EF4 thumb_func_start MOD18_02248F00 @@ -32114,12 +32114,12 @@ MOD18_02248F74: ; 0x02248F74 thumb_func_start MOD18_02248F78 MOD18_02248F78: ; 0x02248F78 - ldr r3, _02248F80 ; =0x02030C4D + ldr r3, _02248F80 ; =FUN_02030C4C mov r0, #0x50 add r1, r2, #0 bx r3 .align 2, 0 -_02248F80: .word 0x02030C4D +_02248F80: .word FUN_02030C4C thumb_func_end MOD18_02248F78 thumb_func_start MOD18_02248F84 @@ -32612,12 +32612,12 @@ _02249324: .word 0x022513F8 thumb_func_start MOD18_02249328 MOD18_02249328: ; 0x02249328 ldr r0, _02249330 ; =0x022513F8 - ldr r3, _02249334 ; =0x02016A19 + ldr r3, _02249334 ; =FUN_02016A18 ldr r0, [r0] bx r3 .align 2, 0 _02249330: .word 0x022513F8 -_02249334: .word 0x02016A19 +_02249334: .word FUN_02016A18 thumb_func_end MOD18_02249328 thumb_func_start MOD18_02249338 @@ -32823,26 +32823,26 @@ _0224949C: .word 0x022513F8 MOD18_022494A0: ; 0x022494A0 add r1, r0, #0 ldr r0, _022494AC ; =0x022513F8 - ldr r3, _022494B0 ; =0x02026299 + ldr r3, _022494B0 ; =FUN_02026298 ldr r0, [r0] ldr r0, [r0] bx r3 .align 2, 0 _022494AC: .word 0x022513F8 -_022494B0: .word 0x02026299 +_022494B0: .word FUN_02026298 thumb_func_end MOD18_022494A0 thumb_func_start MOD18_022494B4 MOD18_022494B4: ; 0x022494B4 add r1, r0, #0 ldr r0, _022494C0 ; =0x022513F8 - ldr r3, _022494C4 ; =0x02025FD9 + ldr r3, _022494C4 ; =FUN_02025FD8 ldr r0, [r0] ldr r0, [r0] bx r3 .align 2, 0 _022494C0: .word 0x022513F8 -_022494C4: .word 0x02025FD9 +_022494C4: .word FUN_02025FD8 thumb_func_end MOD18_022494B4 thumb_func_start MOD18_022494C8 @@ -34102,7 +34102,7 @@ MOD18_02249EF4: ; 0x02249EF4 str r1, [r0, r2] ldr r1, _02249F24 ; =MOD18_02249EBC str r1, [r0, #0x60] - ldr r1, _02249F28 ; =0x020260ED + ldr r1, _02249F28 ; =FUN_020260EC bx r3 nop _02249F14: .word MOD18_022493C8 @@ -34110,7 +34110,7 @@ _02249F18: .word MOD18_022493F4 _02249F1C: .word MOD18_0224940C _02249F20: .word MOD18_02249F8C _02249F24: .word MOD18_02249EBC -_02249F28: .word 0x020260ED +_02249F28: .word FUN_020260EC thumb_func_end MOD18_02249EF4 thumb_func_start MOD18_02249F2C @@ -34145,7 +34145,7 @@ MOD18_02249F2C: ; 0x02249F2C ldr r0, [r4, r0] add r1, #0x1c strh r0, [r4, r1] - ldr r1, _02249F88 ; =0x020260ED + ldr r1, _02249F88 ; =FUN_020260EC add r0, r4, #0 bl MOD18_02249F8C pop {r4, pc} @@ -34154,7 +34154,7 @@ _02249F78: .word MOD18_022493C8 _02249F7C: .word MOD18_022493F4 _02249F80: .word MOD18_0224940C _02249F84: .word MOD18_02249EBC -_02249F88: .word 0x020260ED +_02249F88: .word FUN_020260EC thumb_func_end MOD18_02249F2C thumb_func_start MOD18_02249F8C @@ -35487,7 +35487,7 @@ MOD18_0224AA4C: ; 0x0224AA4C ldr r0, [r4, r0] add r1, #0x1c strh r0, [r4, r1] - ldr r1, _0224AAA0 ; =0x02025FFD + ldr r1, _0224AAA0 ; =FUN_02025FFC add r0, r4, #0 bl MOD18_0224AB08 pop {r4, pc} @@ -35495,7 +35495,7 @@ MOD18_0224AA4C: ; 0x0224AA4C _0224AA94: .word MOD18_02249378 _0224AA98: .word MOD18_0224938C _0224AA9C: .word MOD18_0224A9B4 -_0224AAA0: .word 0x02025FFD +_0224AAA0: .word FUN_02025FFC thumb_func_end MOD18_0224AA4C thumb_func_start MOD18_0224AAA4 @@ -35512,14 +35512,14 @@ MOD18_0224AAA4: ; 0x0224AAA4 str r1, [r0, #0x60] mov r1, #0 str r1, [r0, #0x64] - ldr r1, _0224AAD0 ; =0x02025FFD + ldr r1, _0224AAD0 ; =FUN_02025FFC bx r3 .align 2, 0 _0224AAC0: .word MOD18_02249378 _0224AAC4: .word MOD18_0224938C _0224AAC8: .word MOD18_0224A9B4 _0224AACC: .word MOD18_0224AB08 -_0224AAD0: .word 0x02025FFD +_0224AAD0: .word FUN_02025FFC thumb_func_end MOD18_0224AAA4 thumb_func_start MOD18_0224AAD4 @@ -35536,7 +35536,7 @@ MOD18_0224AAD4: ; 0x0224AAD4 str r1, [r0, #0x60] ldr r1, _0224AB00 ; =MOD18_0224A9EC str r1, [r0, #0x64] - ldr r1, _0224AB04 ; =0x02025E21 + ldr r1, _0224AB04 ; =FUN_02025E20 bx r3 .align 2, 0 _0224AAF0: .word MOD18_0224934C @@ -35544,7 +35544,7 @@ _0224AAF4: .word MOD18_02249360 _0224AAF8: .word MOD18_0224A9B4 _0224AAFC: .word MOD18_0224AB08 _0224AB00: .word MOD18_0224A9EC -_0224AB04: .word 0x02025E21 +_0224AB04: .word FUN_02025E20 thumb_func_end MOD18_0224AAD4 thumb_func_start MOD18_0224AB08 @@ -36307,11 +36307,11 @@ _0224B118: thumb_func_start MOD18_0224B11C MOD18_0224B11C: ; 0x0224B11C - ldr r3, _0224B124 ; =0x0204F775 + ldr r3, _0224B124 ; =FUN_0204F774 mov r0, #0x40 bx r3 nop -_0224B124: .word 0x0204F775 +_0224B124: .word FUN_0204F774 thumb_func_end MOD18_0224B11C thumb_func_start MOD18_0224B128 @@ -40932,11 +40932,11 @@ MOD18_0224D734: ; 0x0224D734 add r3, r1, #0 add r1, r2, #0 add r2, r3, #0 - ldr r3, _0224D740 ; =0x02030BC5 + ldr r3, _0224D740 ; =FUN_02030BC4 mov r0, #0x52 bx r3 .align 2, 0 -_0224D740: .word 0x02030BC5 +_0224D740: .word FUN_02030BC4 thumb_func_end MOD18_0224D734 thumb_func_start MOD18_0224D744 @@ -40990,10 +40990,10 @@ _0224D790: .word 0x022513FC thumb_func_start MOD18_0224D794 MOD18_0224D794: ; 0x0224D794 - ldr r3, _0224D798 ; =0x0204F7FD + ldr r3, _0224D798 ; =FUN_0204F7FC bx r3 .align 2, 0 -_0224D798: .word 0x0204F7FD +_0224D798: .word FUN_0204F7FC thumb_func_end MOD18_0224D794 thumb_func_start MOD18_0224D79C @@ -42024,11 +42024,11 @@ MOD18_0224DF40: ; 0x0224DF40 thumb_func_start MOD18_0224DF54 MOD18_0224DF54: ; 0x0224DF54 - ldr r3, _0224DF5C ; =0x0200B7A9 + ldr r3, _0224DF5C ; =FUN_0200B7A8 ldr r0, [r0, #0x28] bx r3 nop -_0224DF5C: .word 0x0200B7A9 +_0224DF5C: .word FUN_0200B7A8 thumb_func_end MOD18_0224DF54 thumb_func_start MOD18_0224DF60 @@ -42156,12 +42156,12 @@ _0224E018: .word 0x0225074A thumb_func_start MOD18_0224E01C MOD18_0224E01C: ; 0x0224E01C - ldr r3, _0224E024 ; =0x02016999 + ldr r3, _0224E024 ; =FUN_02016998 mov r0, #4 mov r1, #0x44 bx r3 .align 2, 0 -_0224E024: .word 0x02016999 +_0224E024: .word FUN_02016998 thumb_func_end MOD18_0224E01C thumb_func_start MOD18_0224E028 @@ -42194,10 +42194,10 @@ _0224E058: .word 0x000003D9 thumb_func_start MOD18_0224E05C MOD18_0224E05C: ; 0x0224E05C - ldr r3, _0224E060 ; =0x02016A19 + ldr r3, _0224E060 ; =FUN_02016A18 bx r3 .align 2, 0 -_0224E060: .word 0x02016A19 +_0224E060: .word FUN_02016A18 thumb_func_end MOD18_0224E05C thumb_func_start MOD18_0224E064 @@ -42508,12 +42508,12 @@ _0224E2CC: thumb_func_start MOD18_0224E2D8 MOD18_0224E2D8: ; 0x0224E2D8 - ldr r3, _0224E2E0 ; =0x02016999 + ldr r3, _0224E2E0 ; =FUN_02016998 mov r0, #4 mov r1, #0x4c bx r3 .align 2, 0 -_0224E2E0: .word 0x02016999 +_0224E2E0: .word FUN_02016998 thumb_func_end MOD18_0224E2D8 thumb_func_start MOD18_0224E2E4 @@ -42555,10 +42555,10 @@ MOD18_0224E314: ; 0x0224E314 thumb_func_start MOD18_0224E320 MOD18_0224E320: ; 0x0224E320 - ldr r3, _0224E324 ; =0x02016A19 + ldr r3, _0224E324 ; =FUN_02016A18 bx r3 .align 2, 0 -_0224E324: .word 0x02016A19 +_0224E324: .word FUN_02016A18 thumb_func_end MOD18_0224E320 thumb_func_start MOD18_0224E328 @@ -42930,7 +42930,7 @@ _0224E5CE: ldr r0, _0224E6A0 ; =MOD18_0224E3F0 str r7, [sp, #0x4c] str r0, [sp, #0x34] - ldr r0, _0224E6A4 ; =0x02025E21 + ldr r0, _0224E6A4 ; =FUN_02025E20 str r0, [sp] str r7, [sp, #4] mov r0, #1 @@ -42978,7 +42978,7 @@ _0224E694: .word 0x00000115 _0224E698: .word 0x022507D0 _0224E69C: .word MOD18_0224E2B4 _0224E6A0: .word MOD18_0224E3F0 -_0224E6A4: .word 0x02025E21 +_0224E6A4: .word FUN_02025E20 thumb_func_end MOD18_0224E430 thumb_func_start MOD18_0224E6A8 @@ -43142,13 +43142,13 @@ _0224E776: thumb_func_start MOD18_0224E7E4 MOD18_0224E7E4: ; 0x0224E7E4 add r2, r0, #0 - ldr r3, _0224E7F0 ; =0x021E7C81 + ldr r3, _0224E7F0 ; =MOD05_021E7C80 add r2, #0xa0 add r0, r1, #0 ldr r1, [r2] bx r3 .align 2, 0 -_0224E7F0: .word 0x021E7C81 +_0224E7F0: .word MOD05_021E7C80 thumb_func_end MOD18_0224E7E4 thumb_func_start MOD18_0224E7F4 @@ -45659,11 +45659,11 @@ _0224FBC4: .word 0x02251350 thumb_func_start MOD18_0224FBC8 MOD18_0224FBC8: ; 0x0224FBC8 - ldr r3, _0224FBD0 ; =0x02016A19 + ldr r3, _0224FBD0 ; =FUN_02016A18 ldr r0, [r0, #0x54] bx r3 nop -_0224FBD0: .word 0x02016A19 +_0224FBD0: .word FUN_02016A18 thumb_func_end MOD18_0224FBC8 thumb_func_start MOD18_0224FBD4 |