diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
| commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
| tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /asm/mon_markings.s | |
| parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'asm/mon_markings.s')
| -rw-r--r-- | asm/mon_markings.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/mon_markings.s b/asm/mon_markings.s index 7c927399f..1624fddca 100644 --- a/asm/mon_markings.s +++ b/asm/mon_markings.s @@ -480,7 +480,7 @@ sub_811FC80: @ 811FC80 adds r0, 0x1E strh r5, [r0] add r1, sp, 0x20 - ldr r0, =gUnknown_08DC9628 + ldr r0, =gPokenavConditionMarker_Gfx str r0, [sp, 0x20] movs r0, 0xC8 lsls r0, 2 @@ -503,7 +503,7 @@ sub_811FC80: @ 811FC80 add r0, sp, 0x34 strh r6, [r0] add r1, sp, 0x38 - ldr r0, =gUnknown_08DC9608 + ldr r0, =gPokenavConditionMarker_Pal str r0, [sp, 0x38] adds r0, r6, 0x1 strh r0, [r1, 0x4] |