diff options
Diffstat (limited to 'arm9/modules/05/asm/module_05.s')
| -rw-r--r-- | arm9/modules/05/asm/module_05.s | 180 |
1 files changed, 90 insertions, 90 deletions
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index cbfe382b..3cefdc1e 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -744,10 +744,10 @@ MOD05_021D7B38: ; 0x021D7B38 thumb_func_start MOD05_021D7B5C MOD05_021D7B5C: ; 0x021D7B5C - ldr r3, _021D7B60 ; =0x02009FA1 + ldr r3, _021D7B60 ; =FUN_02009FA0 bx r3 .balign 4, 0 -_021D7B60: .word 0x02009FA1 +_021D7B60: .word FUN_02009FA0 thumb_func_start MOD05_021D7B64 MOD05_021D7B64: ; 0x021D7B64 @@ -1207,10 +1207,10 @@ MOD05_021D7F40: ; 0x021D7F40 thumb_func_start MOD05_021D7F44 MOD05_021D7F44: ; 0x021D7F44 - ldr r3, _021D7F48 ; =0x02016A19 + ldr r3, _021D7F48 ; =FUN_02016A18 bx r3 .balign 4, 0 -_021D7F48: .word 0x02016A19 +_021D7F48: .word FUN_02016A18 thumb_func_start MOD05_021D7F4C MOD05_021D7F4C: ; 0x021D7F4C @@ -1278,11 +1278,11 @@ _021D7FBC: thumb_func_start MOD05_021D7FD0 MOD05_021D7FD0: ; 0x021D7FD0 - ldr r3, _021D7FD8 ; =0x0201B5CD + ldr r3, _021D7FD8 ; =FUN_0201B5CC ldr r0, [r0, #0x10] bx r3 nop -_021D7FD8: .word 0x0201B5CD +_021D7FD8: .word FUN_0201B5CC thumb_func_start MOD05_021D7FDC MOD05_021D7FDC: ; 0x021D7FDC @@ -3238,12 +3238,12 @@ MOD05_021D8F90: ; 0x021D8F90 thumb_func_start MOD05_021D8F9C MOD05_021D8F9C: ; 0x021D8F9C - ldr r3, _021D8FA4 ; =0x0224C24D + ldr r3, _021D8FA4 ; =MOD06_0224C24C add r1, r0, #0 ldr r0, [r1, #0xc] bx r3 .balign 4, 0 -_021D8FA4: .word 0x0224C24D +_021D8FA4: .word MOD06_0224C24C thumb_func_start MOD05_021D8FA8 MOD05_021D8FA8: ; 0x021D8FA8 @@ -5724,11 +5724,11 @@ _021DA21A: MOD05_021DA220: ; 0x021DA220 mov r1, #0xad lsl r1, r1, #2 - ldr r3, _021DA22C ; =0x02006875 + ldr r3, _021DA22C ; =FUN_02006874 ldr r0, [r0, r1] bx r3 nop -_021DA22C: .word 0x02006875 +_021DA22C: .word FUN_02006874 thumb_func_start MOD05_021DA230 MOD05_021DA230: ; 0x021DA230 @@ -6243,10 +6243,10 @@ MOD05_021DA5B8: ; 0x021DA5B8 thumb_func_start MOD05_021DA5C8 MOD05_021DA5C8: ; 0x021DA5C8 - ldr r3, _021DA5CC ; =0x02016A19 + ldr r3, _021DA5CC ; =FUN_02016A18 bx r3 .balign 4, 0 -_021DA5CC: .word 0x02016A19 +_021DA5CC: .word FUN_02016A18 thumb_func_start MOD05_021DA5D0 MOD05_021DA5D0: ; 0x021DA5D0 @@ -9476,10 +9476,10 @@ _021DBE94: .word MOD05_021EFAAC thumb_func_start MOD05_021DBE98 MOD05_021DBE98: ; 0x021DBE98 - ldr r3, _021DBE9C ; =0x02050E2D + ldr r3, _021DBE9C ; =FUN_02050E2C bx r3 .balign 4, 0 -_021DBE9C: .word 0x02050E2D +_021DBE9C: .word FUN_02050E2C thumb_func_start MOD05_021DBEA0 MOD05_021DBEA0: ; 0x021DBEA0 @@ -9505,10 +9505,10 @@ _021DBEC0: .word MOD05_021EFB14 thumb_func_start MOD05_021DBEC4 MOD05_021DBEC4: ; 0x021DBEC4 - ldr r3, _021DBEC8 ; =0x02050E11 + ldr r3, _021DBEC8 ; =FUN_02050E10 bx r3 .balign 4, 0 -_021DBEC8: .word 0x02050E11 +_021DBEC8: .word FUN_02050E10 thumb_func_start MOD05_021DBECC MOD05_021DBECC: ; 0x021DBECC @@ -10288,12 +10288,12 @@ _021DC470: .word MOD05_021DC474 thumb_func_start MOD05_021DC474 MOD05_021DC474: ; 0x021DC474 - ldr r3, _021DC47C ; =0x0201FDED + ldr r3, _021DC47C ; =FUN_0201FDEC add r1, #0xf4 ldr r0, [r1] bx r3 .balign 4, 0 -_021DC47C: .word 0x0201FDED +_021DC47C: .word FUN_0201FDEC thumb_func_start MOD05_021DC480 MOD05_021DC480: ; 0x021DC480 @@ -20312,13 +20312,13 @@ _021E127E: thumb_func_start MOD05_021E1290 MOD05_021E1290: ; 0x021E1290 - ldr r3, _021E129C ; =0x0200CA99 + ldr r3, _021E129C ; =FUN_0200CA98 add r1, r0, #0 ldr r0, _021E12A0 ; =MOD05_021E12A4 mov r2, #0x80 bx r3 nop -_021E129C: .word 0x0200CA99 +_021E129C: .word FUN_0200CA98 _021E12A0: .word MOD05_021E12A4 thumb_func_start MOD05_021E12A4 @@ -21231,10 +21231,10 @@ _021E1986: thumb_func_start MOD05_021E198C MOD05_021E198C: ; 0x021E198C - ldr r3, _021E1990 ; =0x02058E91 + ldr r3, _021E1990 ; =FUN_02058E90 bx r3 .balign 4, 0 -_021E1990: .word 0x02058E91 +_021E1990: .word FUN_02058E90 thumb_func_start MOD05_021E1994 MOD05_021E1994: ; 0x021E1994 @@ -25672,14 +25672,14 @@ _021E3BFC: .word 0xFFFF1FFF thumb_func_start MOD05_021E3C00 MOD05_021E3C00: ; 0x021E3C00 - ldr r3, _021E3C0C ; =0x0200CA99 + ldr r3, _021E3C0C ; =FUN_0200CA98 mov r2, #1 add r1, r0, #0 ldr r0, _021E3C10 ; =MOD05_021E3C14 lsl r2, r2, #0xa bx r3 .balign 4, 0 -_021E3C0C: .word 0x0200CA99 +_021E3C0C: .word FUN_0200CA98 _021E3C10: .word MOD05_021E3C14 thumb_func_start MOD05_021E3C14 @@ -26334,10 +26334,10 @@ MOD05_021E4140: ; 0x021E4140 thumb_func_start MOD05_021E4158 MOD05_021E4158: ; 0x021E4158 - ldr r3, _021E415C ; =0x02016A19 + ldr r3, _021E415C ; =FUN_02016A18 bx r3 .balign 4, 0 -_021E415C: .word 0x02016A19 +_021E415C: .word FUN_02016A18 thumb_func_start MOD05_021E4160 MOD05_021E4160: ; 0x021E4160 @@ -26452,10 +26452,10 @@ MOD05_021E4220: ; 0x021E4220 thumb_func_start MOD05_021E4238 MOD05_021E4238: ; 0x021E4238 - ldr r3, _021E423C ; =0x02016A19 + ldr r3, _021E423C ; =FUN_02016A18 bx r3 .balign 4, 0 -_021E423C: .word 0x02016A19 +_021E423C: .word FUN_02016A18 thumb_func_start MOD05_021E4240 MOD05_021E4240: ; 0x021E4240 @@ -26859,10 +26859,10 @@ _021E452A: thumb_func_start MOD05_021E4534 MOD05_021E4534: ; 0x021E4534 - ldr r3, _021E4538 ; =0x02016A19 + ldr r3, _021E4538 ; =FUN_02016A18 bx r3 .balign 4, 0 -_021E4538: .word 0x02016A19 +_021E4538: .word FUN_02016A18 thumb_func_start MOD05_021E453C MOD05_021E453C: ; 0x021E453C @@ -27610,14 +27610,14 @@ _021E4ACC: .word 0x0400006C thumb_func_start MOD05_021E4AD0 MOD05_021E4AD0: ; 0x021E4AD0 - ldr r3, _021E4ADC ; =0x0200CA99 + ldr r3, _021E4ADC ; =FUN_0200CA98 mov r2, #1 add r1, r0, #0 ldr r0, _021E4AE0 ; =MOD05_021E4AB8 lsl r2, r2, #0xa bx r3 .balign 4, 0 -_021E4ADC: .word 0x0200CA99 +_021E4ADC: .word FUN_0200CA98 _021E4AE0: .word MOD05_021E4AB8 thumb_func_start MOD05_021E4AE4 @@ -27772,10 +27772,10 @@ MOD05_021E4BE8: ; 0x021E4BE8 thumb_func_start MOD05_021E4C00 MOD05_021E4C00: ; 0x021E4C00 - ldr r3, _021E4C04 ; =0x02016A19 + ldr r3, _021E4C04 ; =FUN_02016A18 bx r3 .balign 4, 0 -_021E4C04: .word 0x02016A19 +_021E4C04: .word FUN_02016A18 thumb_func_start MOD05_021E4C08 MOD05_021E4C08: ; 0x021E4C08 @@ -27822,27 +27822,27 @@ MOD05_021E4C34: ; 0x021E4C34 thumb_func_start MOD05_021E4C48 MOD05_021E4C48: ; 0x021E4C48 - ldr r3, _021E4C50 ; =0x020066F5 + ldr r3, _021E4C50 ; =FUN_020066F4 ldr r0, [r0, #0x20] bx r3 nop -_021E4C50: .word 0x020066F5 +_021E4C50: .word FUN_020066F4 thumb_func_start MOD05_021E4C54 MOD05_021E4C54: ; 0x021E4C54 - ldr r3, _021E4C5C ; =0x020067D1 + ldr r3, _021E4C5C ; =FUN_020067D0 ldr r0, [r0, #0x20] bx r3 nop -_021E4C5C: .word 0x020067D1 +_021E4C5C: .word FUN_020067D0 thumb_func_start MOD05_021E4C60 MOD05_021E4C60: ; 0x021E4C60 - ldr r3, _021E4C68 ; =0x02006775 + ldr r3, _021E4C68 ; =FUN_02006774 ldr r0, [r0, #0x20] bx r3 nop -_021E4C68: .word 0x02006775 +_021E4C68: .word FUN_02006774 thumb_func_start MOD05_021E4C6C MOD05_021E4C6C: ; 0x021E4C6C @@ -28079,10 +28079,10 @@ _021E4DDE: thumb_func_start MOD05_021E4DE4 MOD05_021E4DE4: ; 0x021E4DE4 - ldr r3, _021E4DE8 ; =0x02064521 + ldr r3, _021E4DE8 ; =FUN_02064520 bx r3 .balign 4, 0 -_021E4DE8: .word 0x02064521 +_021E4DE8: .word FUN_02064520 thumb_func_start MOD05_021E4DEC MOD05_021E4DEC: ; 0x021E4DEC @@ -28513,11 +28513,11 @@ _021E5106: thumb_func_start MOD05_021E5114 MOD05_021E5114: ; 0x021E5114 ldr r0, [r0, #0x28] - ldr r3, _021E511C ; =0x02020FF1 + ldr r3, _021E511C ; =FUN_02020FF0 ldr r0, [r0, #0x18] bx r3 .balign 4, 0 -_021E511C: .word 0x02020FF1 +_021E511C: .word FUN_02020FF0 thumb_func_start MOD05_021E5120 MOD05_021E5120: ; 0x021E5120 @@ -30435,10 +30435,10 @@ _021E5FD4: .word MOD05_021F5430 thumb_func_start MOD05_021E5FD8 MOD05_021E5FD8: ; 0x021E5FD8 - ldr r3, _021E5FDC ; =0x020553D5 + ldr r3, _021E5FDC ; =FUN_020553D4 bx r3 .balign 4, 0 -_021E5FDC: .word 0x020553D5 +_021E5FDC: .word FUN_020553D4 thumb_func_start MOD05_021E5FE0 MOD05_021E5FE0: ; 0x021E5FE0 @@ -30576,11 +30576,11 @@ _021E60D2: thumb_func_start MOD05_021E610C MOD05_021E610C: ; 0x021E610C - ldr r3, _021E6114 ; =0x020556C9 + ldr r3, _021E6114 ; =FUN_020556C8 mov r1, #1 bx r3 nop -_021E6114: .word 0x020556C9 +_021E6114: .word FUN_020556C8 thumb_func_start MOD05_021E6118 MOD05_021E6118: ; 0x021E6118 @@ -32839,12 +32839,12 @@ _021E72CC: thumb_func_start MOD05_021E72DC MOD05_021E72DC: ; 0x021E72DC - ldr r3, _021E72E4 ; =0x02016A8D + ldr r3, _021E72E4 ; =FUN_02016A8C add r1, r0, #0 mov r0, #4 bx r3 .balign 4, 0 -_021E72E4: .word 0x02016A8D +_021E72E4: .word FUN_02016A8C thumb_func_start MOD05_021E72E8 MOD05_021E72E8: ; 0x021E72E8 @@ -33116,12 +33116,12 @@ _021E74E8: thumb_func_start MOD05_021E74F8 MOD05_021E74F8: ; 0x021E74F8 - ldr r3, _021E7500 ; =0x02016A8D + ldr r3, _021E7500 ; =FUN_02016A8C add r1, r0, #0 mov r0, #4 bx r3 .balign 4, 0 -_021E7500: .word 0x02016A8D +_021E7500: .word FUN_02016A8C thumb_func_start MOD05_021E7504 MOD05_021E7504: ; 0x021E7504 @@ -33157,12 +33157,12 @@ _021E7532: str r0, [r1, #0x10] _021E7536: ldr r0, [r1] - ldr r3, _021E7540 ; =0x02055305 + ldr r3, _021E7540 ; =FUN_02055304 ldr r0, [r0, #0x38] ldr r1, [r1, #0x10] bx r3 .balign 4, 0 -_021E7540: .word 0x02055305 +_021E7540: .word FUN_02055304 thumb_func_start MOD05_021E7544 MOD05_021E7544: ; 0x021E7544 @@ -34048,10 +34048,10 @@ MOD05_021E7C00: ; 0x021E7C00 thumb_func_start MOD05_021E7C14 MOD05_021E7C14: ; 0x021E7C14 - ldr r3, _021E7C18 ; =0x02016A19 + ldr r3, _021E7C18 ; =FUN_02016A18 bx r3 .balign 4, 0 -_021E7C18: .word 0x02016A19 +_021E7C18: .word FUN_02016A18 thumb_func_start MOD05_021E7C1C MOD05_021E7C1C: ; 0x021E7C1C @@ -36434,14 +36434,14 @@ _021E8E50: .word 0x04000010 thumb_func_start MOD05_021E8E54 MOD05_021E8E54: ; 0x021E8E54 - ldr r3, _021E8E60 ; =0x0200CA61 + ldr r3, _021E8E60 ; =FUN_0200CA60 mov r2, #1 add r1, r0, #0 ldr r0, _021E8E64 ; =MOD05_021E8E68 lsl r2, r2, #0xa bx r3 .balign 4, 0 -_021E8E60: .word 0x0200CA61 +_021E8E60: .word FUN_0200CA60 _021E8E64: .word MOD05_021E8E68 thumb_func_start MOD05_021E8E68 @@ -45836,11 +45836,11 @@ MOD05_021EDA98: ; 0x021EDA98 thumb_func_start MOD05_021EDAE8 MOD05_021EDAE8: ; 0x021EDAE8 - ldr r3, _021EDAF0 ; =0x0201F745 + ldr r3, _021EDAF0 ; =FUN_0201F744 ldr r0, [r1, #0x20] bx r3 nop -_021EDAF0: .word 0x0201F745 +_021EDAF0: .word FUN_0201F744 thumb_func_start MOD05_021EDAF4 MOD05_021EDAF4: ; 0x021EDAF4 @@ -54282,10 +54282,10 @@ _021F1C18: .word MOD05_021F1CA4 thumb_func_start MOD05_021F1C1C MOD05_021F1C1C: ; 0x021F1C1C - ldr r3, _021F1C20 ; =0x02058629 + ldr r3, _021F1C20 ; =FUN_02058628 bx r3 .balign 4, 0 -_021F1C20: .word 0x02058629 +_021F1C20: .word FUN_02058628 thumb_func_start MOD05_021F1C24 MOD05_021F1C24: ; 0x021F1C24 @@ -56743,10 +56743,10 @@ MOD05_021F2E40: ; 0x021F2E40 thumb_func_start MOD05_021F2E68 MOD05_021F2E68: ; 0x021F2E68 - ldr r3, _021F2E6C ; =0x0201F23D + ldr r3, _021F2E6C ; =FUN_0201F23C bx r3 .balign 4, 0 -_021F2E6C: .word 0x0201F23D +_021F2E6C: .word FUN_0201F23C thumb_func_start MOD05_021F2E70 MOD05_021F2E70: ; 0x021F2E70 @@ -57964,12 +57964,12 @@ _021F37C2: thumb_func_start MOD05_021F37D0 MOD05_021F37D0: ; 0x021F37D0 - ldr r3, _021F37D8 ; =0x02016A8D + ldr r3, _021F37D8 ; =FUN_02016A8C add r1, r0, #0 ldr r0, [r1] bx r3 .balign 4, 0 -_021F37D8: .word 0x02016A8D +_021F37D8: .word FUN_02016A8C thumb_func_start MOD05_021F37DC MOD05_021F37DC: ; 0x021F37DC @@ -59235,13 +59235,13 @@ _021F4180: thumb_func_start MOD05_021F4184 MOD05_021F4184: ; 0x021F4184 - ldr r3, _021F4190 ; =0x02006865 + ldr r3, _021F4190 ; =FUN_02006864 add r2, r1, #0 mov r1, #0x1c ldr r2, [r2] bx r3 nop -_021F4190: .word 0x02006865 +_021F4190: .word FUN_02006864 thumb_func_start MOD05_021F4194 MOD05_021F4194: ; 0x021F4194 @@ -59250,10 +59250,10 @@ MOD05_021F4194: ; 0x021F4194 mov r1, #0xc mul r1, r2 ldr r2, [r3, #0x10] - ldr r3, _021F41A4 ; =0x02006865 + ldr r3, _021F41A4 ; =FUN_02006864 bx r3 nop -_021F41A4: .word 0x02006865 +_021F41A4: .word FUN_02006864 thumb_func_start MOD05_021F41A8 MOD05_021F41A8: ; 0x021F41A8 @@ -59262,10 +59262,10 @@ MOD05_021F41A8: ; 0x021F41A8 mov r1, #0xc mul r1, r2 ldr r2, [r3, #0x14] - ldr r3, _021F41B8 ; =0x02006865 + ldr r3, _021F41B8 ; =FUN_02006864 bx r3 nop -_021F41B8: .word 0x02006865 +_021F41B8: .word FUN_02006864 thumb_func_start MOD05_021F41BC MOD05_021F41BC: ; 0x021F41BC @@ -59274,41 +59274,41 @@ MOD05_021F41BC: ; 0x021F41BC mov r1, #0xc mul r1, r2 ldr r2, [r3, #4] - ldr r3, _021F41CC ; =0x02006865 + ldr r3, _021F41CC ; =FUN_02006864 bx r3 nop -_021F41CC: .word 0x02006865 +_021F41CC: .word FUN_02006864 thumb_func_start MOD05_021F41D0 MOD05_021F41D0: ; 0x021F41D0 add r3, r1, #0 ldr r1, [r2, #0xc] ldr r2, [r3, #8] - ldr r3, _021F41DC ; =0x02006865 + ldr r3, _021F41DC ; =FUN_02006864 lsl r1, r1, #2 bx r3 .balign 4, 0 -_021F41DC: .word 0x02006865 +_021F41DC: .word FUN_02006864 thumb_func_start MOD05_021F41E0 MOD05_021F41E0: ; 0x021F41E0 add r3, r1, #0 ldr r1, [r2, #0x14] ldr r2, [r3, #0xc] - ldr r3, _021F41EC ; =0x02006865 + ldr r3, _021F41EC ; =FUN_02006864 bx r3 nop -_021F41EC: .word 0x02006865 +_021F41EC: .word FUN_02006864 thumb_func_start MOD05_021F41F0 MOD05_021F41F0: ; 0x021F41F0 add r3, r1, #0 ldr r1, [r2, #0x10] ldr r2, [r3, #0x18] - ldr r3, _021F41FC ; =0x02006865 + ldr r3, _021F41FC ; =FUN_02006864 bx r3 nop -_021F41FC: .word 0x02006865 +_021F41FC: .word FUN_02006864 thumb_func_start MOD05_021F4200 MOD05_021F4200: ; 0x021F4200 @@ -60336,12 +60336,12 @@ MOD05_021F491C: ; 0x021F491C thumb_func_start MOD05_021F4968 MOD05_021F4968: ; 0x021F4968 ldr r2, [r1, #0x14] - ldr r3, _021F4974 ; =0x02016B45 + ldr r3, _021F4974 ; =FUN_02016B44 add r1, r1, r2 sub r1, r1, r0 bx r3 nop -_021F4974: .word 0x02016B45 +_021F4974: .word FUN_02016B44 thumb_func_start MOD05_021F4978 MOD05_021F4978: ; 0x021F4978 @@ -62106,21 +62106,21 @@ _021F5696: thumb_func_start MOD05_021F569C MOD05_021F569C: ; 0x021F569C - ldr r3, _021F56A4 ; =0x02017FE5 + ldr r3, _021F56A4 ; =FUN_02017FE4 mov r0, #2 mov r1, #0 bx r3 .balign 4, 0 -_021F56A4: .word 0x02017FE5 +_021F56A4: .word FUN_02017FE4 thumb_func_start MOD05_021F56A8 MOD05_021F56A8: ; 0x021F56A8 - ldr r3, _021F56B0 ; =0x02017FE5 + ldr r3, _021F56B0 ; =FUN_02017FE4 mov r0, #2 ldr r1, _021F56B4 ; =0x00007FFF bx r3 .balign 4, 0 -_021F56B0: .word 0x02017FE5 +_021F56B0: .word FUN_02017FE4 _021F56B4: .word 0x00007FFF thumb_func_start MOD05_021F56B8 @@ -62710,10 +62710,10 @@ _021F5B30: thumb_func_start MOD05_021F5B34 MOD05_021F5B34: ; 0x021F5B34 - ldr r3, _021F5B38 ; =0x02016A19 + ldr r3, _021F5B38 ; =FUN_02016A18 bx r3 .balign 4, 0 -_021F5B38: .word 0x02016A19 +_021F5B38: .word FUN_02016A18 thumb_func_start MOD05_021F5B3C MOD05_021F5B3C: ; 0x021F5B3C @@ -63791,13 +63791,13 @@ _021F62F2: thumb_func_start MOD05_021F62FC MOD05_021F62FC: ; 0x021F62FC - ldr r3, _021F6308 ; =0x0201EFE1 + ldr r3, _021F6308 ; =FUN_0201EFE0 add r1, r0, #0 ldr r0, [r1, #0x20] ldr r1, [r1, #0x30] bx r3 nop -_021F6308: .word 0x0201EFE1 +_021F6308: .word FUN_0201EFE0 thumb_func_start MOD05_021F630C MOD05_021F630C: ; 0x021F630C |