diff options
Diffstat (limited to 'arm9')
| -rw-r--r-- | arm9/asm/pokemon.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arm9/asm/pokemon.s b/arm9/asm/pokemon.s index 31efcbaf..ec6ac699 100644 --- a/arm9/asm/pokemon.s +++ b/arm9/asm/pokemon.s @@ -4693,7 +4693,7 @@ FUN_02068B70: ; 0x02068B70 mov r1, #0x5 mov r2, #0x0 bl GetBoxMonDataEncrypted - ldr r1, _02068BFC ; =0x000001EA + ldr r1, _02068BFC ; =SPECIES_MANAPHY cmp r0, r1 bne _02068BC6 mov r0, #0x1 @@ -4724,7 +4724,7 @@ _02068BD8: pop {r4-r7, pc} nop _02068BF8: .word SPECIES_EGG -_02068BFC: .word 0x000001EA +_02068BFC: .word SPECIES_MANAPHY thumb_func_start FUN_02068C00 FUN_02068C00: ; 0x02068C00 @@ -5013,7 +5013,7 @@ _02068DE2: strh r2, [r4, #0x2] add r1, r3, r1 strh r1, [r4, #0x4] - ldr r1, _02068E10 ; =0x00000147 + ldr r1, _02068E10 ; =SPECIES_SPINDA cmp r0, r1 bne _02068E06 cmp r5, #0x2 @@ -5027,8 +5027,8 @@ _02068E06: pop {r4-r7} bx lr nop -_02068E0C: .word 0x000001A5 -_02068E10: .word 0x00000147 +_02068E0C: .word SPECIES_CHERRIM +_02068E10: .word SPECIES_SPINDA thumb_func_start FUN_02068E14 FUN_02068E14: ; 0x02068E14 @@ -5063,7 +5063,7 @@ FUN_02068E1C: ; 0x02068E1C mov r1, #0x5 mov r2, #0x0 bl GetBoxMonDataEncrypted - ldr r1, _02068E84 ; =0x000001EA + ldr r1, _02068E84 ; =SPECIES_MANAPHY cmp r0, r1 bne _02068E5E mov r3, #0x1 @@ -5093,7 +5093,7 @@ _02068E84: .word 0x000001EA thumb_func_start FUN_02068E88 FUN_02068E88: ; 0x02068E88 push {r3-r5, lr} - ldr r4, _02068FDC ; =0x000001A5 + ldr r4, _02068FDC ; =SPECIES_CHERRIM cmp r0, r4 bgt _02068ED6 bge _02068F54 @@ -5291,7 +5291,7 @@ _02068FCA: ldrb r0, [r0, #0x0] pop {r3-r5, pc} nop -_02068FDC: .word 0x000001A5 +_02068FDC: .word SPECIES_CHERRIM thumb_func_start FUN_02068FE0 FUN_02068FE0: ; 0x02068FE0 |