diff options
| author | red031000 <rubenru09@aol.com> | 2020-07-09 19:36:07 +0100 |
|---|---|---|
| committer | red031000 <rubenru09@aol.com> | 2020-07-09 19:36:07 +0100 |
| commit | 6da3d1ea0f1317c385af0f77c8cf77c9ea8077d6 (patch) | |
| tree | 3f4b4083bece34b7d51cda591cfd51ca54bb19a4 /arm9/modules/53 | |
| parent | 3133c4bc2dd1b9675e9f465eaf163d497fdcedc6 (diff) | |
address issues + module 54
Diffstat (limited to 'arm9/modules/53')
| -rw-r--r-- | arm9/modules/53/asm/module_53.s | 52 |
1 files changed, 30 insertions, 22 deletions
diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 226cefed..d46aaf36 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -222,7 +222,7 @@ _021D76D2: lsl r0, r0, #2 ldr r0, [r4, r0] lsl r2, r0, #3 - ldr r0, _021D7754 ; =0x021D98A0 + ldr r0, _021D7754 ; =MOD53_021D98A0 ldr r2, [r0, r2] cmp r2, #0 beq _021D76E8 @@ -256,11 +256,11 @@ _021D7718: lsl r0, r0, #2 ldr r0, [r4, r0] lsl r3, r0, #3 - ldr r0, _021D7754 ; =0x021D98A0 + ldr r0, _021D7754 ; =MOD53_021D98A0 ldr r2, [r0, r3] cmp r2, #0 beq _021D7744 - ldr r0, _021D7760 ; =0x021D98A4 + ldr r0, _021D7760 ; =MOD53_021D98A0 + 4 ldr r0, [r0, r3] cmp r0, #0 beq _021D7744 @@ -284,7 +284,7 @@ _021D7750: .word 0x000093B4 _021D7754: .word MOD53_021D98A0 _021D7758: .word 0x000E0D0F _021D775C: .word 0x00004374 -_021D7760: .word MOD53_021D98A4 +_021D7760: .word MOD53_021D98A0 + 4 thumb_func_end MOD53_021D7654 thumb_func_start MOD53_021D7764 @@ -3907,7 +3907,7 @@ MOD53_021D93E8: ; 0x021D93E8 pop {r3, r4} bx lr _021D9404: - ldr r1, _021D9418 ; =0x021D98A4 + ldr r1, _021D9418 ; =MOD53_021D98A0 + 4 lsl r4, r2, #3 ldr r1, [r1, r4] cmp r1, #0 @@ -3918,7 +3918,7 @@ _021D9412: pop {r3, r4} bx lr nop -_021D9418: .word MOD53_021D98A4 +_021D9418: .word MOD53_021D98A0 + 4 thumb_func_end MOD53_021D93E8 thumb_func_start MOD53_021D941C @@ -4147,21 +4147,29 @@ MOD53_021D9648: ; 0x021D9648 .data .global MOD53_021D98A0 MOD53_021D98A0: ; 0x021D98A0 - .byte 0x00, 0x00, 0x00, 0x00 - - .global MOD53_021D98A4 -MOD53_021D98A4: ; 0x021D98A4 - .word 0x01, MOD53_021D8494, 0x00, MOD53_021D84EC - .word 0x00, MOD53_021D84F8, 0x00, MOD53_021D8424 - .word 0x00, MOD53_021D852C, 0x01, MOD53_021D857C - .word 0x01, MOD53_021D86E0, 0x01, MOD53_021D8704 - .word 0x01, MOD53_021D879C, 0x01, MOD53_021D87D8 - .word 0x01, MOD53_021D87F8, 0x01, MOD53_021D8824 - .word 0x01, MOD53_021D8860, 0x01, MOD53_021D88B0 - .word 0x01, MOD53_021D896C, 0x01, MOD53_021D89A0 - .word 0x01, MOD53_021D89C8, 0x01, MOD53_021D8A08 - .word 0x01, MOD53_021D8A0C, 0x01, MOD53_021D8A2C - .word 0x01, MOD53_021D8A50, 0x01, MOD53_021D8AB0 - .word 0x01, MOD53_021D8AF8, 0x01 + .word 0x00000000, 0x01 + .word MOD53_021D8494, 0x00 + .word MOD53_021D84EC, 0x00 + .word MOD53_021D84F8, 0x00 + .word MOD53_021D8424, 0x00 + .word MOD53_021D852C, 0x01 + .word MOD53_021D857C, 0x01 + .word MOD53_021D86E0, 0x01 + .word MOD53_021D8704, 0x01 + .word MOD53_021D879C, 0x01 + .word MOD53_021D87D8, 0x01 + .word MOD53_021D87F8, 0x01 + .word MOD53_021D8824, 0x01 + .word MOD53_021D8860, 0x01 + .word MOD53_021D88B0, 0x01 + .word MOD53_021D896C, 0x01 + .word MOD53_021D89A0, 0x01 + .word MOD53_021D89C8, 0x01 + .word MOD53_021D8A08, 0x01 + .word MOD53_021D8A0C, 0x01 + .word MOD53_021D8A2C, 0x01 + .word MOD53_021D8A50, 0x01 + .word MOD53_021D8AB0, 0x01 + .word MOD53_021D8AF8, 0x01 .bss |