diff options
| author | PikalaxALT <pikalax1@gmail.com> | 2017-09-20 23:18:20 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalax1@gmail.com> | 2017-09-20 23:18:20 -0400 |
| commit | 27903a102b3b99da6fb8f0a18957598bff65b428 (patch) | |
| tree | e9666a04c3fd57eedd27a341a94fcf57150fd822 /asm/trader.s | |
| parent | 54bd2c17812bd399fa6e857332c3bdacc1df71b3 (diff) | |
| parent | 40c1e81d03f4e4fc21675564ca5b879a577a399e (diff) | |
Merge branch 'master' into berry_fix_program
Diffstat (limited to 'asm/trader.s')
| -rw-r--r-- | asm/trader.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/trader.s b/asm/trader.s index e93bceccb..877d17382 100644 --- a/asm/trader.s +++ b/asm/trader.s @@ -87,7 +87,7 @@ sub_8133A78: @ 8133A78 ldr r0, [r0] str r0, [sp, 0xC] str r1, [sp, 0x10] - ldr r1, =gUnknown_085EB7EA + ldr r1, =gText_Exit movs r0, 0x1 movs r2, 0 bl GetStringWidth @@ -193,7 +193,7 @@ _08133B94: cmp r5, 0x3 bls _08133B3C ldrb r0, [r7, 0x6] - ldr r2, =gUnknown_085EB7EA + ldr r2, =gText_Exit lsls r1, r5, 4 adds r1, 0x1 lsls r1, 24 |