diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-26 09:09:16 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-26 09:09:16 -0400 |
| commit | c7a27c188361ac6cb261b3e86792560d4b295483 (patch) | |
| tree | 670f27a5166c099ef8f7454a256270bf94662fb1 /arm9/modules/13 | |
| parent | 42afbf282d1995ec1970370abd200d7eb6baf8a7 (diff) | |
| parent | 981bf953cbf711eca70d31ccec297ac38501ffd8 (diff) | |
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/modules/13')
| -rw-r--r-- | arm9/modules/13/asm/module_13_thumb.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm9/modules/13/asm/module_13_thumb.s b/arm9/modules/13/asm/module_13_thumb.s index aeec3a10..e8acb2b6 100644 --- a/arm9/modules/13/asm/module_13_thumb.s +++ b/arm9/modules/13/asm/module_13_thumb.s @@ -373,7 +373,7 @@ MOD13_02217530: ; 0x02217530 pop {r3} bx r3 _0221756A: - ldr r5, _02217590 ; =0x021C8F04 + ldr r5, _02217590 ; =CPSMyIp ldr r0, [r5] cmp r0, #0 bne _02217580 @@ -392,7 +392,7 @@ _02217580: bx r3 nop _0221758C: .word MOD13_0223F7C8 -_02217590: .word 0x021C8F04 +_02217590: .word CPSMyIp thumb_func_start MOD13_02217594 MOD13_02217594: ; 0x02217594 |